diff --git a/poppler-24.05.0/.clang-tidy b/poppler-24.05.0/.clang-tidy new file mode 100644 index 0000000000000000000000000000000000000000..6fe69b4ad5bd916aabd03499797ed900ea351fa1 --- /dev/null +++ b/poppler-24.05.0/.clang-tidy @@ -0,0 +1,8 @@ +--- +Checks: '-*,performance-*,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,readability-braces-around-statements,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,modernize-use-emplace,modernize-use-bool-literals,modernize-redundant-void-arg,modernize-loop-convert,google-explicit-constructor,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation,-bugprone-sizeof-expression,-bugprone-branch-clone,-bugprone-reserved-identifier,-bugprone-suspicious-include,-performance-no-int-to-ptr,-bugprone-easily-swappable-parameters,-bugprone-implicit-widening-of-multiplication-result,-bugprone-assignment-in-if-condition,-bugprone-unchecked-optional-access' +WarningsAsErrors: '*' +HeaderFilterRegex: '.' +AnalyzeTemporaryDtors: false +FormatStyle: none +User: user +... diff --git a/poppler-24.05.0/.git-blame-ignore-revs b/poppler-24.05.0/.git-blame-ignore-revs new file mode 100644 index 0000000000000000000000000000000000000000..c9af862ff44959c8e019491362dec03221471b02 --- /dev/null +++ b/poppler-24.05.0/.git-blame-ignore-revs @@ -0,0 +1,8 @@ +# _clang_format added +814fbda28cc8a37fed3134c2db8da28f86fb5ee0 +# readability-braces-around-statements added +f7466e31408ba884c44728f7da04227863177241 +# clang-format-14 wanted a bit of reformat +a94a444e5acff86e04d1688d862e81a82108cf03 +# clang-format-15 wanted a bit of reformat also +b5aa09403e0f106f51292683c1841908167337ea diff --git a/poppler-24.05.0/.gitlab-ci.yml b/poppler-24.05.0/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..13e64ad36fac2d07e9d49bb9e4b0f79c97516826 --- /dev/null +++ b/poppler-24.05.0/.gitlab-ci.yml @@ -0,0 +1,253 @@ +image: debian:unstable + +stages: + - build + - document + - publish + +before_script: + - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list + - apt-get update + - apt-get build-dep --yes --no-install-recommends poppler + - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libgtk-3-dev libbrotli-dev libboost-container-dev qt6-base-dev + - echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen + - locale-gen + +variables: + LANG: en_US.UTF-8 + LANGUAGE: en_US:en + LC_ALL: en_US.UTF-8 + DEBIAN_FRONTEND: noninteractive + TEST_DATA_URL: https://gitlab.freedesktop.org/${CI_PROJECT_NAMESPACE}/test.git + UPSTREAM_TEST_DATA_URL: https://gitlab.freedesktop.org/poppler/test.git + +cache: + key: "$CI_JOB_NAME" + paths: + - build/ + +clang_format: + stage: build + before_script: + - apt-get update + - apt-get install --yes --no-install-recommends git clang-format-16 + script: + - find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name "*.cc" \) -exec clang-format-16 -i {} \; + - git diff --exit-code + +build: + stage: build + script: + - apt-get update + - bash do-the-gnupg-2.4-dance.sh $PWD/build/gnupg/ + - git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data + - mkdir -p build && cd build + - cmake -G Ninja -DTESTDATADIR=$PWD/../test-data -DCMAKE_PREFIX_PATH=$PWD/gnupg .. + - ninja -j ${FDO_CI_CONCURRENT} + - ctest --output-on-failure + +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 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 + - clang++-16 -fPIC -shared -o goostring-format-checker.so $srcdir/test/goostring-format-checker/goostring-format-checker.cc -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-16/include/ + - echo "We disable Qt6 tests since Qt6 exposes std::string in its ABI which makes it not build in this CI since we're using libc++ but Qt6 in debian is build with libstdc++" + - CC=clang-16 CXX=clang++-16 cmake -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang $PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang goostring-format-checker -Werror -Wno-deprecated-declarations" -DTESTDATADIR=$srcdir/test-data -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_QT6_TESTS=OFF -DENABLE_GPGME=OFF $srcdir + - make -j ${FDO_CI_CONCURRENT} + - ctest --output-on-failure + - echo "This is a complex way of not running clang-tidy over autogenerated files, unfortunately -DCMAKE_CXX_CLANG_TIDY doesn't support that https://gitlab.kitware.com/cmake/cmake/-/issues/19772" + - cat compile_commands.json | jq '[.[] | select(.file | contains("'"$srcdir"'"))]' > compile_commands.aux.json + - cp compile_commands.aux.json compile_commands.json + - echo "Cheat a bit and remove the moc includes so that we don't lint autogenerated code" + - echo "Maybe we can replace this with NOLINTBEGIN in the future https://github.com/llvm/llvm-project/issues/56983" + - find $srcdir/qt* -name *.cpp -exec sed -E -i '/#include .*moc"$/d' {} \; + - cp "$srcdir/.clang-tidy" . + - run-clang-tidy-16 + +build_ubuntu_22_04: + stage: build + image: ubuntu:22.04 + before_script: + - apt-get update + - apt-get install --yes --no-install-recommends build-essential cmake ninja-build libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev ca-certificates libcurl4-nss-dev liblcms2-dev libboost-container-dev libtiff-dev wget p7zip-full git qt6-base-dev + script: + - git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data + - mkdir -p build && cd build + - cmake -G Ninja -DENABLE_GPGME=OFF -DTESTDATADIR=$PWD/../test-data -DCMAKE_PREFIX_PATH=$PWD/../6.2.0/gcc_64/lib/cmake .. + - ninja + - ctest --output-on-failure + +build_mingw64_fedora40: + stage: build + image: fedora:40 + before_script: + - dnf install -y 'dnf-command(builddep)' + - dnf builddep -y mingw64-poppler + - dnf -y install glibc-langpack-en make ninja-build mingw64-boost mingw64-curl mingw64-qt6-qtbase mingw64-gcc-c++ cmake-rpm-macros + script: + - mkdir -p build && cd build + - mingw64-cmake -DENABLE_NSS3=OFF -DENABLE_GPGME=OFF -G Ninja .. + - ninja + +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: + - mkdir -p build && cd build + - 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_qt515: + stage: build + image: invent-registry.kde.org/sysadmin/ci-images/android-qt515 + before_script: + - echo "workaround for ECM Android toolchain wanting all binaries to be shared libraries" + - sed -i -e 's/ //g' /opt/nativetooling/share/ECM/toolchain/Android.cmake + script: + - mkdir -p build && cd build + - 'ANDROID_ARCH_ABI=armeabi-v7a cmake -G Ninja .. + -DCMAKE_ANDROID_API=28 + -DCMAKE_PREFIX_PATH="/home/user/android-arm-clang" + -DCMAKE_BUILD_TYPE=debug + -DCMAKE_POSITION_INDEPENDENT_CODE=OFF + -DENABLE_DCTDECODER=unmaintained + -DENABLE_LIBOPENJPEG=unmaintained + -DENABLE_BOOST=OFF + -DENABLE_LCMS=OFF + -DENABLE_LIBCURL=OFF + -DENABLE_LIBTIFF=OFF + -DENABLE_QT6=OFF + -DENABLE_NSS3=OFF + -DENABLE_GPGME=OFF + -DCMAKE_CXX_FLAGS="-Werror -Wno-deprecated-declarations" + -DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake' + - ninja -j ${FDO_CI_CONCURRENT} + +build_qt5_android_qt515_generic: + stage: build + image: invent-registry.kde.org/sysadmin/ci-images/android-qt515 + before_script: + - echo "workaround for ECM Android toolchain wanting all binaries to be shared libraries" + - sed -i -e 's/ //g' /opt/nativetooling/share/ECM/toolchain/Android.cmake + script: + - mkdir -p build && cd build + - 'ANDROID_ARCH_ABI=armeabi-v7a cmake -G Ninja .. + -DCMAKE_ANDROID_API=28 + -DCMAKE_PREFIX_PATH="/home/user/android-arm-clang" + -DCMAKE_BUILD_TYPE=debug + -DCMAKE_POSITION_INDEPENDENT_CODE=OFF + -DENABLE_DCTDECODER=unmaintained + -DENABLE_LIBOPENJPEG=unmaintained + -DENABLE_BOOST=OFF + -DENABLE_LCMS=OFF + -DENABLE_LIBCURL=OFF + -DENABLE_LIBTIFF=OFF + -DENABLE_QT6=OFF + -DENABLE_NSS3=OFF + -DENABLE_GPGME=OFF + -DFONT_CONFIGURATION=generic + -DCMAKE_CXX_FLAGS="-Werror -Wno-deprecated-declarations" + -DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake' + - ninja -j ${FDO_CI_CONCURRENT} + +build_qt6_android: + stage: build + image: invent-registry.kde.org/sysadmin/ci-images/android-qt65 + before_script: + - echo "workaround for ECM Android toolchain wanting all binaries to be shared libraries" + - sed -i -e 's/ //g' /opt/nativetooling/share/ECM/toolchain/Android.cmake + script: + - mkdir -p build && cd build + - 'ANDROID_ARCH_ABI=arm64-v8a cmake -G Ninja .. + -DCMAKE_ANDROID_API=29 + -DCMAKE_PREFIX_PATH="/home/user/android-arm-clang" + -DCMAKE_BUILD_TYPE=debug + -DCMAKE_POSITION_INDEPENDENT_CODE=OFF + -DENABLE_DCTDECODER=unmaintained + -DENABLE_LIBOPENJPEG=unmaintained + -DENABLE_BOOST=OFF + -DENABLE_LCMS=OFF + -DENABLE_LIBCURL=OFF + -DENABLE_LIBTIFF=OFF + -DENABLE_QT5=OFF + -DENABLE_NSS3=OFF + -DENABLE_GPGME=OFF + -DCMAKE_CXX_FLAGS="-Werror -Wno-deprecated-declarations" + -DCMAKE_TOOLCHAIN_FILE=/home/user/android-arm-clang/lib/cmake/Qt6/qt.toolchain.cmake + -DQT_CHAINLOAD_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake' + - ninja -j ${FDO_CI_CONCURRENT} + +qt5_docs: + only: + - master + stage: document + variables: + QT_SELECT: qt5 + script: + - apt-get install --yes --no-install-recommends doxygen graphviz qtchooser qttools5-dev-tools + - cd qt5/src + - doxygen + cache: {} + artifacts: + paths: + - qt5/src/APIDOCS-html + +qt6_docs: + only: + - master + stage: document + script: + - apt-get install --yes --no-install-recommends doxygen graphviz qt6-documentation-tools + - cd qt6/src + - ( cat Doxyfile ; echo "QHG_LOCATION=/usr/lib/qt6/bin/qhelpgenerator" ) | doxygen - + cache: {} + artifacts: + paths: + - qt6/src/APIDOCS-html + +cpp_docs: + only: + - master + stage: document + script: + - apt-get install --yes --no-install-recommends doxygen graphviz + - cd cpp + - doxygen + cache: {} + artifacts: + paths: + - cpp/APIDOCS-html + +glib_docs: + only: + - master + stage: document + script: + - apt-get install --yes --no-install-recommends gtk-doc-tools + - mkdir -p build && cd build + - cmake -G Ninja -DENABLE_GTK_DOC=YES -DENABLE_GPGME=OFF .. + - ninja -j ${FDO_CI_CONCURRENT} glib-docs + cache: {} + artifacts: + paths: + - build/glib/reference/html + +trigger_pages: + only: + - master + stage: publish + image: alpine:latest + before_script: + - apk --update upgrade + - apk add curl ca-certificates + script: + - 'curl --request POST --form "token=$WEB_PAGE_TRIGGER" --form ref=master https://gitlab.freedesktop.org/api/v4/projects/poppler%2Fpoppler-web-page/trigger/pipeline' + cache: {} diff --git a/poppler-24.05.0/.gitlab/merge_request_templates/merge_request_template.md b/poppler-24.05.0/.gitlab/merge_request_templates/merge_request_template.md new file mode 100644 index 0000000000000000000000000000000000000000..050286e7dbf874751d8caaf35ad56d639cdd50d2 --- /dev/null +++ b/poppler-24.05.0/.gitlab/merge_request_templates/merge_request_template.md @@ -0,0 +1,3 @@ +Please make sure you check the "Allow commits from members who can merge to the target branch" option at the bottom of the page. + +Makes our life much easier since we can rebase and merge from the web user interface. diff --git a/poppler-24.05.0/AUTHORS b/poppler-24.05.0/AUTHORS new file mode 100644 index 0000000000000000000000000000000000000000..a785e403211f34fbcc5959fe6b1a273f5a246502 --- /dev/null +++ b/poppler-24.05.0/AUTHORS @@ -0,0 +1,5 @@ +xpdf is written by Derek Noonburg + +libpoppler is a fork of xpdf-3.00 + +Current Maintainer: Albert Astals Cid diff --git a/poppler-24.05.0/CMakeLists.txt b/poppler-24.05.0/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..35df6d2924fb54c673d13be82032c582d61ff923 --- /dev/null +++ b/poppler-24.05.0/CMakeLists.txt @@ -0,0 +1,930 @@ +cmake_minimum_required(VERSION 3.22.0 FATAL_ERROR) + +project(poppler) + +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) + +include(PopplerDefaults) +include(PopplerMacros) +# Ensure that the user-provided C_FLAGS are used for try_compile() calls. +# This is needed since PopplerMacros.cmake clears CMAKE_C_FLAGS and if +# CMAKE_TRY_COMPILE_CONFIGURATION is empty CMake only uses the flags +# specified in CMAKE_C_FLAGS (https://gitlab.kitware.com/cmake/cmake/-/issues/22414 +# and https://gitlab.kitware.com/cmake/cmake/-/issues/19512). +# We therefore have to explicitly set CMAKE_TRY_COMPILE_CONFIGURATION until we +# depend on a CMake release that includes a fix for those issues. +# This is set after including PopplerMacros since that sets the default +# CMAKE_BUILD_TYPE and also sets _CMAKE_BUILD_TYPE_UPPER. +set(CMAKE_TRY_COMPILE_CONFIGURATION "${_CMAKE_BUILD_TYPE_UPPER}") + +include(MacroOptionalFindPackage) +find_package(PkgConfig) +include(TestBigEndian) +test_big_endian(WORDS_BIGENDIAN) +include(CheckFileOffsetBits) +CHECK_FILE_OFFSET_BITS() + +include(GenerateExportHeader) +include(GNUInstallDirs) +include(CMakePushCheckState) + +set(ENABLE_FUZZER FALSE) + +find_package (ECM 1.6.0 QUIET NO_MODULE) +if (ECM_FOUND) + include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake") + + if(ECM_ENABLE_SANITIZERS MATCHES fuzzer) + set(ENABLE_FUZZER TRUE) + endif() +endif() + +set(POPPLER_MAJOR_VERSION "24") +set(POPPLER_MINOR_VERSION_STRING "05") +# 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 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_C_STANDARD 11) +set(CMAKE_C_EXTENSIONS OFF) +set(CMAKE_LINK_DEPENDS_NO_SHARED TRUE) +set(CMAKE_C_VISIBILITY_PRESET hidden) +set(CMAKE_CXX_VISIBILITY_PRESET hidden) +set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) + + +# command line switches +option(ENABLE_UNSTABLE_API_ABI_HEADERS "Install API/ABI unstable xpdf headers." OFF) +option(BUILD_GTK_TESTS "Whether to compile the GTK+ test programs." ON) +option(BUILD_QT5_TESTS "Whether to compile the Qt5 test programs." ON) +option(BUILD_QT6_TESTS "Whether to compile the Qt6 test programs." ON) +option(BUILD_CPP_TESTS "Whether to compile the CPP test programs." ON) +option(BUILD_MANUAL_TESTS "Whether to compile manual test programs." ON) +option(ENABLE_BOOST "Use boost (for Splash backend performance)." ON) +option(ENABLE_UTILS "Compile poppler command line utils." ON) +option(ENABLE_CPP "Compile poppler cpp wrapper." ON) +option(ENABLE_GLIB "Compile poppler glib wrapper." ON) +option(ENABLE_GOBJECT_INTROSPECTION "Whether to generate GObject introspection." ON) +option(ENABLE_GTK_DOC "Whether to generate glib API documentation." OFF) +option(ENABLE_QT5 "Compile poppler qt5 wrapper." ON) +option(ENABLE_QT6 "Compile poppler qt6 wrapper." ON) +set(ENABLE_LIBOPENJPEG "openjpeg2" CACHE STRING "Use libopenjpeg for JPX streams. Possible values: openjpeg2, unmaintained, none. 'unmaintained' gives you the internal unmaintained decoder. Use at your own risk. 'none' compiles no JPX decoder at all. Default: openjpeg2") +set(ENABLE_DCTDECODER "libjpeg" CACHE STRING "Use libjpeg for DCT streams. Possible values: libjpeg, unmaintained, none. will use libjpeg if available or fail if not. 'unmaintained' gives you the internal unmaintained decoder. Use at your own risk. 'none' compiles no DCT decoder at all. Default: libjpeg") +option(ENABLE_LCMS "Use LCMS for color management." ON) +option(ENABLE_LIBCURL "Build libcurl based HTTP support." ON) +option(ENABLE_LIBTIFF "Build code to write images as TIFF (pdfimages/pdftocairo/etc)." ON) +option(ENABLE_NSS3 "Build the NSS backend for cryptographic support" ON) +option(ENABLE_GPGME "Build the GPG backend for cryptographic support" ON) +option(ENABLE_ZLIB_UNCOMPRESS "Use zlib to uncompress flate streams (not totally safe)." OFF) +option(USE_FLOAT "Use single precision arithmetic in the Splash backend" OFF) +option(BUILD_SHARED_LIBS "Build poppler as a shared library" ON) +option(RUN_GPERF_IF_PRESENT "Run gperf if it is found" ON) +if(WIN32) + option(ENABLE_RELOCATABLE "Do not hardcode the poppler library location (on Windows)." ON) +else() + set(ENABLE_RELOCATABLE OFF) +endif() +option(EXTRA_WARN "Enable extra compile warnings" OFF) + +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + +set(TESTDATADIR "${CMAKE_SOURCE_DIR}/../test" CACHE STRING "Specify test data dir.") +if(NOT (EXISTS ${TESTDATADIR} AND EXISTS ${TESTDATADIR}/test-poppler.c)) + message(WARNING " + No test data found in $testdatadir. + You will not be able to run 'make test' successfully. + + The test data is not included in the source packages + and is also not part of the main git repository. Instead, + you can checkout the test data from its own git + repository with: + + git clone git://git.freedesktop.org/git/poppler/test + + You should checkout the test data as a sibling of your + poppler source folder or specify the location of your + checkout with -DTESTDATADIR=/path/to/checkoutdir/test. + ") +endif() + +if(WIN32) + set(_default_fontconfiguration "win32") +elseif(ANDROID) + set(_default_fontconfiguration "android") +else() + set(_default_fontconfiguration "fontconfig") +endif() +set(FONT_CONFIGURATION "${_default_fontconfiguration}" CACHE STRING "The font configuration backend (win32|android|generic|fontconfig).") +string(TOLOWER "${FONT_CONFIGURATION}" font_configuration) +set(WITH_FONTCONFIGURATION_WIN32 OFF) +set(WITH_FONTCONFIGURATION_FONTCONFIG OFF) +set(WITH_FONTCONFIGURATION_ANDROID OFF) +if(font_configuration STREQUAL "win32") + set(WITH_FONTCONFIGURATION_WIN32 ON) +elseif(font_configuration STREQUAL "fontconfig") + set(WITH_FONTCONFIGURATION_FONTCONFIG ON) +elseif(font_configuration STREQUAL "android") + set(WITH_FONTCONFIGURATION_ANDROID ON) +elseif(font_configuration STREQUAL "generic") + message(STATUS "no win32, android, or fontconfig specific code") +else() + message(FATAL_ERROR "Invalid font configuration setting: ${FONT_CONFIGURATION}") +endif() + +# Enable these unconditionally. +set(OPI_SUPPORT ON) +set(TEXTOUT_WORD_LIST ON) + +# setting the minimum required versions for some components +set(CAIRO_VERSION "1.16.0") +set(GLIB_REQUIRED "2.72") +set(GTK_REQUIRED "3.24") +set(GDK_PIXBUF_REQUIRED "2.40") +set(FREETYPE_VERSION "2.11") +set(FONTCONFIG_VERSION "2.13") + +find_package(Freetype ${FREETYPE_VERSION} REQUIRED) +if(WITH_FONTCONFIGURATION_FONTCONFIG) + find_package(Fontconfig ${FONTCONFIG_VERSION} REQUIRED) +elseif(WITH_FONTCONFIGURATION_ANDROID) + find_library(Androidlib NAMES android REQUIRED) +endif() + +macro(find_soft_mandatory_package _enable_option _package_name _package_version) + if(${_enable_option}) + find_package(${_package_name} ${_package_version}) + if(NOT ${_package_name}_FOUND) + MESSAGE(FATAL_ERROR "Could not find the ${_package_version} version of ${_package_name}. If you're not interested in the features it provides set the cmake ${_enable_option} option to OFF") + endif() + endif() +endmacro() + +find_soft_mandatory_package(ENABLE_NSS3 NSS3 3.68) +find_soft_mandatory_package(ENABLE_GPGME Gpgmepp 1.19) +find_soft_mandatory_package(ENABLE_LIBTIFF TIFF 4.3) + +macro_optional_find_package(JPEG) +macro_optional_find_package(PNG) +if(ENABLE_DCTDECODER STREQUAL "libjpeg") + if(JPEG_FOUND) + include(CheckCSourceCompiles) + set(_save_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}") + set(CMAKE_REQUIRED_LIBRARIES JPEG::JPEG) + check_c_source_compiles(" + #include + #include + #include + int main() { struct jpeg_decompress_struct info; jpeg_mem_src(&info, 0, 0); return 0; }" HAVE_JPEG_MEM_SRC) + set(CMAKE_REQUIRED_LIBRARIES "${_save_CMAKE_REQUIRED_LIBRARIES}") + + if(NOT HAVE_JPEG_MEM_SRC) + message(FATAL_ERROR "Your libjpeg is too old. Poppler needs one that provides jpeg_mem_src. That is provided in libjpeg >= 8 or libjpeg-turbo >= 1.1.0. You can \ +also decide to use the internal unmaintained DCT decoder or none at all.\n\ +Possible options are: -DENABLE_DCTDECODER=libjpeg, -DENABLE_DCTDECODER=none, \ +-DENABLE_DCTDECODER=unmaintained") + endif() + + set(ENABLE_LIBJPEG ${JPEG_FOUND}) + else() + message(STATUS "Could NOT find libjpeg.") + message(FATAL_ERROR "Install libjpeg before trying to build poppler. You can \ +also decide to use the internal unmaintained DCT decoder or none at all.\n\ +Possible options are: -DENABLE_DCTDECODER=libjpeg, -DENABLE_DCTDECODER=none, \ +-DENABLE_DCTDECODER=unmaintained") + endif() + set(HAVE_DCT_DECODER ON) +elseif(ENABLE_DCTDECODER STREQUAL "unmaintained") + set(ENABLE_LIBJPEG OFF) + set(HAVE_DCT_DECODER ON) +elseif(ENABLE_DCTDECODER STREQUAL "none") + set(ENABLE_LIBJPEG OFF) + set(HAVE_DCT_DECODER OFF) +else() + message(FATAL_ERROR "Invalid ENABLE_DCTDECODER value.") +endif() + +set(QT5_VERSION "5.15") +find_soft_mandatory_package(ENABLE_QT5 Qt5Core ${QT5_VERSION}) +find_soft_mandatory_package(ENABLE_QT5 Qt5Gui ${QT5_VERSION}) +find_soft_mandatory_package(ENABLE_QT5 Qt5Xml ${QT5_VERSION}) +find_soft_mandatory_package(ENABLE_QT5 Qt5Widgets ${QT5_VERSION}) +find_soft_mandatory_package(ENABLE_QT5 Qt5Test ${QT5_VERSION}) + +set(QT6_VERSION "6.2") +SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON) +find_soft_mandatory_package(ENABLE_QT6 Qt6Core ${QT6_VERSION}) +find_soft_mandatory_package(ENABLE_QT6 Qt6Gui ${QT6_VERSION}) +find_soft_mandatory_package(ENABLE_QT6 Qt6Widgets ${QT6_VERSION}) +find_soft_mandatory_package(ENABLE_QT6 Qt6Test ${QT6_VERSION}) + +# Check for Cairo rendering backend +macro_optional_find_package(Cairo ${CAIRO_VERSION}) + +find_package(Boost 1.74.0) +if(Boost_FOUND) + set(USE_BOOST_HEADERS ON) +elseif(ENABLE_BOOST) + message(FATAL_ERROR "-- Boost recommended for Splash. Use ENABLE_BOOST=OFF to skip.") +endif() + +if(CAIRO_FOUND) + set(HAVE_CAIRO ${CAIRO_FOUND}) + set(CAIRO_FEATURE "#define POPPLER_HAS_CAIRO 1") + set(CAIRO_REQ "cairo") + set(POPPLER_GLIB_DISABLE_DEPRECATED "") + set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "") + if(ENABLE_GLIB) + macro_optional_find_package(GLIB) + if(NOT GLIB_FOUND) + set(ENABLE_GLIB OFF) + endif() + endif() + if(ENABLE_GLIB) + if(ENABLE_GOBJECT_INTROSPECTION) + # Check for introspection + macro_optional_find_package(GObjectIntrospection 1.72.0) + set(HAVE_INTROSPECTION ${INTROSPECTION_FOUND}) + endif() + set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED") + set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DG_DISABLE_SINGLE_INCLUDES") + macro_optional_find_package(GTK) + endif() +else() + set(CAIRO_FEATURE "#undef POPPLER_HAS_CAIRO") + set(ENABLE_GLIB OFF) +endif() + +# GTK API docs require both the gtk-doc package & python3 support +if(ENABLE_GTK_DOC) + # Stop the build & raise an error if the package is missing + find_package(GtkDoc) + if(NOT GtkDoc_FOUND) + message(FATAL_ERROR "Install the gtk-doc package to generate GTK API documentation, or set ENABLE_GTK_DOC to Off.") + endif() + # NOTE: The FindPythonInterp module is deprecated, but the newer FindPython3 module requires CMake >=3.12 + find_package(PythonInterp 3) + # Also bail out with an error if Python3 is missing + if(NOT PYTHONINTERP_FOUND) + message(FATAL_ERROR "Install python3 in order to generate GTK API documentation, or set ENABLE_GTK_DOC to Off.") + endif() +endif() + +if(ENABLE_CPP) + cmake_push_check_state() + find_package(Iconv REQUIRED) + set(CMAKE_REQUIRED_LIBRARIES Iconv::Iconv) + check_cxx_source_compiles(" + #include + int main(){ + iconv_t conv = 0; + const char* in = 0; + size_t ilen = 0; + char* out = 0; + size_t olen = 0; + iconv(conv, &in, &ilen, &out, &olen); + return 0; + } + " ICONV_SECOND_ARGUMENT_IS_CONST) + cmake_pop_check_state() + if(ICONV_SECOND_ARGUMENT_IS_CONST) + set(ICONV_CONST "const") + endif() +endif() +find_package(ZLIB REQUIRED) + +set(WITH_OPENJPEG FALSE) +if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2") + find_package(OpenJPEG) + set(WITH_OPENJPEG ${OpenJPEG_FOUND}) + if(NOT OpenJPEG_FOUND OR OPENJPEG_MAJOR_VERSION VERSION_LESS 2) + message(STATUS "Could NOT find openjpeg2.") + message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You \ +can also decide to use the internal unmaintained JPX decoder or none at all.\n\ +Possible options are: -DENABLE_LIBOPENJPEG=openjpeg2, -DENABLE_LIBOPENJPEG=none, \ +-DENABLE_LIBOPENJPEG=unmaintained,") + endif() + set(HAVE_JPX_DECODER ON) +elseif(ENABLE_LIBOPENJPEG STREQUAL "unmaintained") + set(WITH_OPENJPEG OFF) + set(HAVE_JPX_DECODER ON) +elseif(ENABLE_LIBOPENJPEG STREQUAL "none") + set(WITH_OPENJPEG OFF) + set(HAVE_JPX_DECODER OFF) +else() + message(FATAL_ERROR "Invalid ENABLE_LIBOPENJPEG value: ${ENABLE_LIBOPENJPEG}") +endif() +set(ENABLE_LIBOPENJPEG "${WITH_OPENJPEG}") + +find_soft_mandatory_package(ENABLE_LCMS LCMS2 2.9) +set(USE_CMS ${ENABLE_LCMS}) + +find_soft_mandatory_package(ENABLE_LIBCURL CURL 7.68) +set(POPPLER_HAS_CURL_SUPPORT ${ENABLE_LIBCURL}) + +if(MINGW) + # Use mingw's ansi stdio extensions + add_definitions(-D__USE_MINGW_ANSI_STDIO=1) +endif() +if(WITH_FONTCONFIGURATION_WIN32) + if(MINGW) + # Set the minimum required Internet Explorer version to 5.0 + add_definitions(-D_WIN32_IE=0x0500) + endif() +endif() +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/fofi + ${CMAKE_CURRENT_SOURCE_DIR}/goo + ${CMAKE_CURRENT_SOURCE_DIR}/poppler + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/poppler +) + +if(PNG_FOUND) + set(ENABLE_LIBPNG ON) +endif() + +set(SIGNATURE_BACKENDS "") +if(ENABLE_NSS3) + list(APPEND SIGNATURE_BACKENDS "NSS") +endif() +if(ENABLE_GPGME) + list(APPEND SIGNATURE_BACKENDS "GPG") +endif() + +list(LENGTH SIGNATURE_BACKENDS _signing_backends_count) +if (_signing_backends_count GREATER 0) + if (NOT DEFAULT_SIGNATURE_BACKEND) + # If not specified at compiletime, we take the first one added. + # This means that the order we append them to the list is significant + list(GET SIGNATURE_BACKENDS 0 DEFAULT_SIGNATURE_BACKEND) + endif() + set(ENABLE_SIGNATURES ON) +endif() +if (NOT DEFAULT_SIGNATURE_BACKEND) + set(DEFAULT_SIGNATURE_BACKEND "None") +endif() + +# Recent versions of poppler-data install a .pc file. +# Use it to determine the encoding data path, if available. +# Default to the same prefix otherwise. +pkg_check_modules(POPPLER_DATA poppler-data) +if(POPPLER_DATA_FOUND) + execute_process(COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=poppler_datadir poppler-data + RESULT_VARIABLE _result_var + OUTPUT_VARIABLE _output_var OUTPUT_STRIP_TRAILING_WHITESPACE) + if(_result_var STREQUAL "0" AND NOT _output_var STREQUAL "") + set(POPPLER_DATADIR "${_output_var}") + endif() +endif() +if(NOT DEFINED POPPLER_DATADIR) + set(POPPLER_DATADIR "${CMAKE_INSTALL_PREFIX}/share/poppler") +endif() + +if(EXTRA_WARN) + set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${DEFAULT_COMPILE_WARNINGS_EXTRA} ${CMAKE_CXX_FLAGS}") +else() + set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${DEFAULT_COMPILE_WARNINGS} ${CMAKE_CXX_FLAGS}") +endif() + +include(ConfigureChecks.cmake) +configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) +configure_file(poppler/poppler-config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler/poppler-config.h) + +find_program(GPERF gperf) +find_program(SED sed) + +set(poppler_SRCS + goo/GooString.cc + goo/GooTimer.cc + goo/ImgWriter.cc + goo/JpegWriter.cc + goo/NetPBMWriter.cc + goo/PNGWriter.cc + goo/TiffWriter.cc + goo/ft_utils.cc + goo/gbase64.cc + goo/gbasename.cc + goo/gfile.cc + goo/glibc.cc + goo/glibc_strtok_r.cc + goo/grandom.cc + goo/gstrtod.cc + fofi/FoFiBase.cc + fofi/FoFiEncodings.cc + fofi/FoFiTrueType.cc + fofi/FoFiType1.cc + fofi/FoFiType1C.cc + fofi/FoFiIdentifier.cc + poppler/Annot.cc + poppler/AnnotStampImageHelper.cc + poppler/Array.cc + poppler/CachedFile.cc + poppler/Catalog.cc + poppler/CharCodeToUnicode.cc + poppler/CMap.cc + poppler/CryptoSignBackend.cc + poppler/DateInfo.cc + poppler/Decrypt.cc + poppler/Dict.cc + poppler/Error.cc + poppler/FDPDFDocBuilder.cc + poppler/FILECacheLoader.cc + poppler/FileSpec.cc + poppler/FlateEncoder.cc + poppler/FontEncodingTables.cc + poppler/Form.cc + poppler/FontInfo.cc + poppler/Function.cc + poppler/Gfx.cc + poppler/GfxFont.cc + poppler/GfxState.cc + poppler/GlobalParams.cc + poppler/Hints.cc + poppler/ImageEmbeddingUtils.cc + poppler/JArithmeticDecoder.cc + poppler/JBIG2Stream.cc + poppler/JSInfo.cc + poppler/Lexer.cc + poppler/Link.cc + poppler/Linearization.cc + poppler/LocalPDFDocBuilder.cc + poppler/MarkedContentOutputDev.cc + poppler/NameToCharCode.cc + poppler/Object.cc + poppler/OptionalContent.cc + poppler/Outline.cc + poppler/OutputDev.cc + poppler/Page.cc + poppler/PageTransition.cc + poppler/Parser.cc + poppler/PDFDoc.cc + poppler/PDFDocBuilder.cc + poppler/PDFDocEncoding.cc + poppler/PDFDocFactory.cc + poppler/ProfileData.cc + poppler/PreScanOutputDev.cc + poppler/PSTokenizer.cc + poppler/SignatureInfo.cc + poppler/Stream.cc + poppler/StructTreeRoot.cc + poppler/StructElement.cc + poppler/UnicodeMap.cc + poppler/UnicodeMapFuncs.cc + poppler/UnicodeTypeTable.cc + poppler/UTF.cc + poppler/XRef.cc + poppler/PSOutputDev.cc + poppler/TextOutputDev.cc + poppler/PageLabelInfo.cc + poppler/SecurityHandler.cc + poppler/Sound.cc + poppler/ViewerPreferences.cc + poppler/Movie.cc + poppler/Rendition.cc + poppler/CertificateInfo.cc + poppler/BBoxOutputDev.cc + poppler/SplashOutputDev.cc + splash/Splash.cc + splash/SplashBitmap.cc + splash/SplashClip.cc + splash/SplashFTFont.cc + splash/SplashFTFontEngine.cc + splash/SplashFTFontFile.cc + splash/SplashFont.cc + splash/SplashFontEngine.cc + splash/SplashFontFile.cc + splash/SplashFontFileID.cc + splash/SplashPath.cc + splash/SplashPattern.cc + splash/SplashScreen.cc + splash/SplashState.cc + splash/SplashXPath.cc + splash/SplashXPathScanner.cc +) +set(poppler_LIBS Freetype::Freetype ZLIB::ZLIB) +if(FONTCONFIG_FOUND) + set(poppler_LIBS ${poppler_LIBS} Fontconfig::Fontconfig) +endif() + +if(Androidlib) + set(poppler_LIBS ${poppler_LIBS} ${Androidlib}) +endif() + +if(JPEG_FOUND) + set(poppler_SRCS ${poppler_SRCS} + poppler/DCTStream.cc + ) + set(poppler_LIBS ${poppler_LIBS} JPEG::JPEG) +endif() +if(ENABLE_ZLIB_UNCOMPRESS) + set(poppler_SRCS ${poppler_SRCS} + poppler/FlateStream.cc + ) +endif() +if(ENABLE_LIBCURL) + set(poppler_SRCS ${poppler_SRCS} + poppler/CurlCachedFile.cc + poppler/CurlPDFDocBuilder.cc + ) + set(poppler_LIBS ${poppler_LIBS} CURL::libcurl) +endif() +if (ENABLE_NSS3) + set(poppler_SRCS ${poppler_SRCS} + poppler/NSSCryptoSignBackend.cc + ) + set(poppler_LIBS ${poppler_LIBS} PkgConfig::NSS3) +endif() +if (ENABLE_GPGME) + set(poppler_SRCS ${poppler_SRCS} + poppler/GPGMECryptoSignBackend.cc + ) + set(poppler_LIBS ${poppler_LIBS} Gpgmepp) +endif() +if (OpenJPEG_FOUND) + set(poppler_SRCS ${poppler_SRCS} + poppler/JPEG2000Stream.cc + ) + set(poppler_LIBS ${poppler_LIBS} openjp2) +else () + set(poppler_SRCS ${poppler_SRCS} + poppler/JPXStream.cc + ) +endif() +if(USE_CMS) + set(poppler_LIBS ${poppler_LIBS} ${LCMS2_LIBRARIES}) +endif() +if(WIN32) + # use clean APIs + add_definitions(-DWIN32_LEAN_AND_MEAN) + # gdi32 is needed under win32 + set(poppler_LIBS ${poppler_LIBS} gdi32) +endif() +if(PNG_FOUND) + set(poppler_LIBS ${poppler_LIBS} PNG::PNG) +endif() +if(ENABLE_LIBTIFF) + set(poppler_LIBS ${poppler_LIBS} TIFF::TIFF) +endif() +if(Boost_FOUND) + set(poppler_LIBS ${poppler_LIBS} Boost::boost) +endif() + +if (GPERF AND SED AND RUN_GPERF_IF_PRESENT) + macro(ADD_GPERF_FILE input) + add_custom_command(OUTPUT poppler/${input}.c + COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_BINARY_DIR}/poppler/${input}.c + COMMAND ${GPERF} poppler/${input}.gperf > ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c + COMMAND ${SED} -i -e "s#${GPERF}#gperf#" ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c + COMMAND clang-format -i ${CMAKE_CURRENT_SOURCE_DIR}/poppler/${input}.pregenerated.c || true + DEPENDS poppler/${input}.gperf + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + + set(poppler_SRCS ${poppler_SRCS} + poppler/${input}.c + ) + endmacro() +else() + macro(ADD_GPERF_FILE input) + set(poppler_SRCS ${poppler_SRCS} + poppler/${input}.pregenerated.c + ) + endmacro() +endif() + +ADD_GPERF_FILE(CourierWidths) +ADD_GPERF_FILE(CourierBoldWidths) +ADD_GPERF_FILE(CourierBoldObliqueWidths) +ADD_GPERF_FILE(CourierObliqueWidths) +ADD_GPERF_FILE(HelveticaWidths) +ADD_GPERF_FILE(HelveticaBoldWidths) +ADD_GPERF_FILE(HelveticaBoldObliqueWidths) +ADD_GPERF_FILE(HelveticaObliqueWidths) +ADD_GPERF_FILE(SymbolWidths) +ADD_GPERF_FILE(TimesBoldWidths) +ADD_GPERF_FILE(TimesBoldItalicWidths) +ADD_GPERF_FILE(TimesItalicWidths) +ADD_GPERF_FILE(TimesRomanWidths) +ADD_GPERF_FILE(ZapfDingbatsWidths) + +set(POPPLER_SOVERSION_NUMBER "137") + +set(LINKER_SCRIPT "${CMAKE_BINARY_DIR}/libpoppler.map") +configure_file( + "${CMAKE_SOURCE_DIR}/poppler/libpoppler.map.in" + ${LINKER_SCRIPT}) + +if(MSVC) +add_definitions(-D_CRT_SECURE_NO_WARNINGS) +endif() +add_library(poppler ${poppler_SRCS} ${LINKER_SCRIPT}) +if (OpenJPEG_FOUND) + # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed + # target openjp2 may lack interface include directories + target_include_directories(poppler SYSTEM PRIVATE ${OPENJPEG_INCLUDE_DIRS}) +endif() +if(USE_CMS) + target_include_directories(poppler SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) +endif() +generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") +set_target_properties(poppler PROPERTIES + VERSION ${POPPLER_SOVERSION_NUMBER}.0.0 + SOVERSION ${POPPLER_SOVERSION_NUMBER}) + +if(UNIX AND (NOT APPLE)) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/linkerscript_test.map "VERS_1 {\nglobal:\n *;};\n") + + # once we require cmake 3.18, + # the next set of lines can be changed + # to the check_linker_flags function instead + include(CheckCXXSourceCompiles) + set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) + set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/linkerscript_test.map) + check_cxx_source_compiles(" + int main(int, char**) { + return 0; + } + " SUPPORT_VERSION_SCRIPT) + set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) + + file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/linkerscript_test.map) + if (SUPPORT_VERSION_SCRIPT) + set_target_properties(poppler PROPERTIES LINK_OPTIONS LINKER:--version-script=${LINKER_SCRIPT}) + endif() +endif() +if(MINGW AND BUILD_SHARED_LIBS) + get_target_property(POPPLER_SOVERSION poppler SOVERSION) + set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") +endif() +target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS}) +install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +if(ENABLE_UNSTABLE_API_ABI_HEADERS) + install(FILES + poppler/Annot.h + poppler/AnnotStampImageHelper.h + poppler/Array.h + poppler/CachedFile.h + poppler/Catalog.h + poppler/CharCodeToUnicode.h + poppler/CMap.h + poppler/DateInfo.h + poppler/Decrypt.h + poppler/Dict.h + poppler/Error.h + poppler/FDPDFDocBuilder.h + poppler/FILECacheLoader.h + poppler/FileSpec.h + poppler/FontEncodingTables.h + poppler/FontInfo.h + poppler/Form.h + poppler/Function.h + poppler/Gfx.h + poppler/GfxFont.h + poppler/GfxState.h + poppler/GfxState_helpers.h + poppler/GlobalParams.h + poppler/Hints.h + poppler/HashAlgorithm.h + poppler/JArithmeticDecoder.h + poppler/JBIG2Stream.h + poppler/JSInfo.h + poppler/Lexer.h + poppler/Link.h + poppler/Linearization.h + poppler/LocalPDFDocBuilder.h + poppler/MarkedContentOutputDev.h + poppler/Movie.h + poppler/NameToCharCode.h + poppler/Object.h + poppler/OptionalContent.h + poppler/Outline.h + poppler/OutputDev.h + poppler/Page.h + poppler/PageTransition.h + poppler/Parser.h + poppler/PDFDoc.h + poppler/PDFDocBuilder.h + poppler/PDFDocEncoding.h + poppler/PDFDocFactory.h + poppler/PopplerCache.h + poppler/ProfileData.h + poppler/PreScanOutputDev.h + poppler/PSTokenizer.h + poppler/Rendition.h + poppler/CertificateInfo.h + poppler/SignatureInfo.h + poppler/Stream-CCITT.h + poppler/Stream.h + poppler/StructElement.h + poppler/StructTreeRoot.h + poppler/UnicodeMap.h + poppler/UnicodeMapFuncs.h + poppler/UnicodeMapTables.h + poppler/UnicodeTypeTable.h + poppler/UnicodeCClassTables.h + poppler/UnicodeCompTables.h + poppler/UnicodeDecompTables.h + poppler/ViewerPreferences.h + poppler/XRef.h + poppler/CharTypes.h + poppler/ErrorCodes.h + poppler/NameToUnicodeTable.h + poppler/PSOutputDev.h + poppler/TextOutputDev.h + poppler/SecurityHandler.h + poppler/BBoxOutputDev.h + poppler/UTF.h + poppler/Sound.h + ${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h + ${CMAKE_CURRENT_BINARY_DIR}/poppler/poppler-config.h + poppler/SplashOutputDev.h + DESTINATION include/poppler) + install(FILES + goo/GooTimer.h + goo/GooString.h + goo/gmem.h + goo/gdir.h + goo/gfile.h + goo/ImgWriter.h + goo/GooCheckedOps.h + goo/GooLikely.h + goo/gstrtod.h + goo/grandom.h + DESTINATION include/poppler/goo) + if(PNG_FOUND) + install(FILES + goo/PNGWriter.h + DESTINATION include/poppler/goo) + endif() + if(ENABLE_LIBTIFF) + install(FILES + goo/TiffWriter.h + DESTINATION include/poppler/goo) + endif() + if(JPEG_FOUND) + install(FILES + goo/JpegWriter.h + DESTINATION include/poppler/goo) + endif() + install(FILES + fofi/FoFiBase.h + fofi/FoFiEncodings.h + fofi/FoFiTrueType.h + fofi/FoFiType1.h + fofi/FoFiType1C.h + fofi/FoFiIdentifier.h + DESTINATION include/poppler/fofi) + if(ENABLE_LIBCURL) + install(FILES + poppler/CurlCachedFile.h + poppler/CurlPDFDocBuilder.h + DESTINATION include/poppler) + endif() + if(OpenJPEG_FOUND) + install(FILES + poppler/JPEG2000Stream.h + DESTINATION include/poppler) + else() + install(FILES + poppler/JPXStream.h + DESTINATION include/poppler) + endif() + install(FILES + splash/Splash.h + splash/SplashBitmap.h + splash/SplashClip.h + splash/SplashErrorCodes.h + splash/SplashFTFont.h + splash/SplashFTFontEngine.h + splash/SplashFTFontFile.h + splash/SplashFont.h + splash/SplashFontEngine.h + splash/SplashFontFile.h + splash/SplashFontFileID.h + splash/SplashGlyphBitmap.h + splash/SplashMath.h + splash/SplashPath.h + splash/SplashPattern.h + splash/SplashScreen.h + splash/SplashState.h + splash/SplashTypes.h + splash/SplashXPath.h + splash/SplashXPathScanner.h + DESTINATION include/poppler/splash) + if(CAIRO_FOUND) + install(FILES + poppler/CairoFontEngine.h + poppler/CairoOutputDev.h + poppler/CairoRescaleBox.h + DESTINATION include/poppler) + endif() +endif() + + +if(ENABLE_UTILS) + add_subdirectory(utils) +endif() +if(ENABLE_GLIB) + add_subdirectory(glib) +endif() +if (BUILD_MANUAL_TESTS) + add_subdirectory(test) +endif() +if(ENABLE_QT5) + add_subdirectory(qt5) +endif() +if(ENABLE_QT6) + add_subdirectory(qt6) +endif() +if(ENABLE_CPP) + add_subdirectory(cpp) +endif() + +# Configure "Requires" field & install .pc files for packagers +set(PC_REQUIRES "") +set(PC_REQUIRES_PRIVATE "Requires.private: poppler = ${POPPLER_VERSION}") + +if(PKG_CONFIG_EXECUTABLE) + poppler_create_install_pkgconfig(poppler.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + if(ENABLE_QT5) + poppler_create_install_pkgconfig(poppler-qt5.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + if(ENABLE_QT6) + poppler_create_install_pkgconfig(poppler-qt6.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + if(ENABLE_GLIB) + poppler_create_install_pkgconfig(poppler-glib.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + if(ENABLE_CPP) + poppler_create_install_pkgconfig(poppler-cpp.pc ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() +else() + MESSAGE(STATUS ".pc files will not be installed becasue of missing 'pkg-config'!") +endif() + +# Summarize build options & display warnings for user +message("Building Poppler with support for:") +show_end_message("font configuration" ${font_configuration}) +show_end_message_yesno("use boost (Splash)" ENABLE_BOOST) +show_end_message_yesno("cairo output" CAIRO_FOUND) +show_end_message_yesno("qt5 wrapper" ENABLE_QT5) +show_end_message_yesno("qt6 wrapper" ENABLE_QT6) +show_end_message_yesno("glib wrapper" ENABLE_GLIB) +show_end_message_yesno(" introspection" INTROSPECTION_FOUND) +show_end_message_yesno(" gtk-doc" ENABLE_GTK_DOC) +show_end_message_yesno("cpp wrapper" ENABLE_CPP) +show_end_message_yesno("use libjpeg" ENABLE_LIBJPEG) +show_end_message_yesno("use libpng" ENABLE_LIBPNG) +show_end_message_yesno("use libtiff" ENABLE_LIBTIFF) +show_end_message_yesno("use zlib uncompress" ENABLE_ZLIB_UNCOMPRESS) +show_end_message_yesno("use nss3" ENABLE_NSS3) +show_end_message_yesno("use gpg" ENABLE_GPGME) +show_end_message(" default signature backend" ${DEFAULT_SIGNATURE_BACKEND}) +show_end_message_yesno("use curl" ENABLE_LIBCURL) +show_end_message_yesno("use libopenjpeg2" WITH_OPENJPEG) +show_end_message_yesno("use lcms2" USE_CMS) +show_end_message_yesno("command line utils" ENABLE_UTILS) +show_end_message_yesno("fuzz target" ENABLE_FUZZER) +show_end_message("test data dir" ${TESTDATADIR}) + +if(NOT ENABLE_LIBJPEG AND HAVE_DCT_DECODER) + message("Warning: Using libjpeg is recommended. The internal DCT decoder is unmaintained.") +endif() + +if(NOT HAVE_DCT_DECODER) + message("Warning: You're not compiling any DCT decoder. Some files will fail to display properly.") +endif() + +if(ENABLE_ZLIB_UNCOMPRESS) + message("Warning: Using zlib is not totally safe") +endif() + +if(NOT WITH_OPENJPEG AND HAVE_JPX_DECODER) + message("Warning: Using libopenjpeg2 is recommended. The internal JPX decoder is unmaintained.") +endif() + +if(NOT HAVE_JPX_DECODER) + message("Warning: You're not compiling any JPX decoder. Some files will fail to display properly.") +endif() + +if(NOT ENABLE_BOOST) + message("Warning: Use of boost is recommended for better performance.") +endif() + +set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${POPPLER_VERSION}) +add_custom_target(dist + COMMAND + COMMAND git log --stat | fmt --split-only > ${CMAKE_BINARY_DIR}/ChangeLog + COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar + COMMAND tar -C ${CMAKE_BINARY_DIR} -rf ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar ChangeLog --transform='s,,${ARCHIVE_NAME}/,' --owner root:0 --group root:0 + COMMAND tar -C ${CMAKE_BINARY_DIR} -rf ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar glib/reference/html --transform='s,,${ARCHIVE_NAME}/,' --owner root:0 --group root:0 + COMMAND xz -9 ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) diff --git a/poppler-24.05.0/COPYING b/poppler-24.05.0/COPYING new file mode 100644 index 0000000000000000000000000000000000000000..d511905c1647a1e311e8b20d5930a37a9c2531cd --- /dev/null +++ b/poppler-24.05.0/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 of the License, 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. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/poppler-24.05.0/COPYING3 b/poppler-24.05.0/COPYING3 new file mode 100644 index 0000000000000000000000000000000000000000..94a9ed024d3859793618152ea559a168bbcbb5e2 --- /dev/null +++ b/poppler-24.05.0/COPYING3 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 3 of the License, 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, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/poppler-24.05.0/ChangeLog b/poppler-24.05.0/ChangeLog new file mode 100644 index 0000000000000000000000000000000000000000..29541c043d57d347998044eb8a2607dfcdc3f68e --- /dev/null +++ b/poppler-24.05.0/ChangeLog @@ -0,0 +1,104213 @@ +commit 14191296ae72398638d2a4af67d783ee120a998c +Author: Albert Astals Cid +Date: Wed May 1 19:42:56 2024 +0200 + + poppler 24.05.0 + + CMakeLists.txt | 2 +- + NEWS | 28 ++++++++++++++++++++++++++++ + cpp/CMakeLists.txt | 2 +- + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/CMakeLists.txt | 2 +- + qt6/src/Doxyfile | 2 +- + 8 files changed, 35 insertions(+), 7 deletions(-) + +commit 2f11d814e54d1329985c2f60b7b6fe2d1882a9a6 +Author: Albert Astals Cid +Date: Tue Apr 23 14:15:24 2024 +0200 + + Update (C) + + poppler/Catalog.cc | 2 +- + poppler/PDFDoc.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit fe9fe140aee72a41a2add7db7f7b0dae7cb55700 +Author: Albert Astals Cid +Date: Mon Apr 22 14:22:08 2024 +0200 + + signing: Fix modifying the AcroForm dict when it's embedded in + the Catalog + + poppler/Catalog.cc | 1 + + poppler/PDFDoc.cc | 2 ++ + 2 files changed, 3 insertions(+) + +commit eac1adcbc2246fd1ad22e8336d050a71cbf03804 +Author: Albert Astals Cid +Date: Mon Apr 22 19:32:24 2024 +0200 + + Update nss to the actual release version of Ubuntu 22.04 + + CMakeLists.txt | 2 +- + cmake/modules/FindNSS3.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ad67d43e7786eaf364c20f76c68810ad254a994d +Author: Albert Astals Cid +Date: Mon Apr 22 15:56:54 2024 +0200 + + Increase android-qt images + + Allows us increasing the min freetype + + .gitlab-ci.yml | 16 ++++++++-------- + CMakeLists.txt | 2 +- + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit b81b2851feb114c2896ee0a441fe492500f0b3ca +Author: Albert Astals Cid +Date: Mon Apr 22 15:21:09 2024 +0200 + + Increase Minimum supported base to that provided by Ubuntu 22.04 + + .gitlab-ci.yml | 10 +++------- + CMakeLists.txt | 14 +++++++------- + cmake/modules/FindNSS3.cmake | 2 +- + qt5/CMakeLists.txt | 2 +- + utils/CMakeLists.txt | 7 +------ + 5 files changed, 13 insertions(+), 22 deletions(-) + +commit 06e0b89c2f64580eaac5e09a729b52668b09c106 +Author: Albert Astals Cid +Date: Mon Apr 22 10:17:03 2024 +0200 + + Fix crash in broken files + + oss-fuzz/57874 + + poppler/Object.h | 18 +++++++++++++++++- + poppler/XRef.cc | 12 +++++++++++- + poppler/XRef.h | 4 +++- + 3 files changed, 31 insertions(+), 3 deletions(-) + +commit fd98a72b6a72bb6e395ef70ae2527477496db6f5 +Author: Albert Astals Cid +Date: Mon Apr 22 10:53:15 2024 +0200 + + Fix crash in TextStringToUtf8 + + utf16ToUtf8 expects a null ended string + + poppler/UTF.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 103fc977d30fa6b3df8d3a018e970230e9661933 +Author: Ömer Fadıl USTA +Date: Mon Apr 22 08:56:26 2024 +0000 + + Add Missing headers to fix compile problems + + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 87fc0028b69acd8f5679a9fe213f94d081fa28e3 +Author: Albert Astals Cid +Date: Mon Apr 22 10:14:27 2024 +0200 + + Update (C) + + glib/poppler-form-field.cc | 2 +- + poppler/CryptoSignBackend.h | 2 +- + poppler/Form.cc | 2 +- + poppler/Form.h | 2 +- + poppler/GPGMECryptoSignBackend.cc | 3 ++- + poppler/GPGMECryptoSignBackend.h | 3 ++- + poppler/NSSCryptoSignBackend.cc | 2 +- + poppler/NSSCryptoSignBackend.h | 2 +- + poppler/SignatureInfo.cc | 2 +- + poppler/SignatureInfo.h | 2 +- + qt5/src/poppler-form.cc | 2 +- + qt5/src/poppler-form.h | 2 +- + qt5/tests/check_signature_basics.cpp | 2 +- + qt6/src/poppler-form.cc | 2 +- + qt6/src/poppler-form.h | 2 +- + qt6/tests/check_signature_basics.cpp | 2 +- + 16 files changed, 18 insertions(+), 16 deletions(-) + +commit d40bb7e308c9e3299e50d3e2880229cd6272587e +Author: Sune Vuorela +Date: Sun Apr 21 17:31:19 2024 +0000 + + Async api for certificate validation + + glib/poppler-form-field.cc | 7 +-- + poppler/CryptoSignBackend.h | 6 ++- + poppler/Form.cc | 51 ++++++++++++++++--- + poppler/Form.h | 23 +++++++-- + poppler/GPGMECryptoSignBackend.cc | 77 ++++++++++++++++++++++------ + poppler/GPGMECryptoSignBackend.h | 6 ++- + poppler/NSSCryptoSignBackend.cc | 63 +++++++++++++++++------ + poppler/NSSCryptoSignBackend.h | 7 ++- + poppler/SignatureInfo.cc | 10 ---- + poppler/SignatureInfo.h | 3 -- + qt5/src/poppler-form.cc | 98 + +++++++++++++++++++++++++----------- + qt5/src/poppler-form.h | 63 +++++++++++++++++++++-- + qt5/tests/check_signature_basics.cpp | 6 ++- + qt5/tests/poppler-forms.cpp | 7 ++- + qt6/src/poppler-form.cc | 98 + +++++++++++++++++++++++++----------- + qt6/src/poppler-form.h | 63 +++++++++++++++++++++-- + qt6/tests/check_signature_basics.cpp | 6 ++- + qt6/tests/poppler-forms.cpp | 2 + + utils/pdfsig.cc | 15 +++++- + 19 files changed, 477 insertions(+), 134 deletions(-) + +commit e6879d35f23e436b4fc1a55b957998a834cf1691 +Author: Albert Astals Cid +Date: Sun Apr 21 11:00:20 2024 +0200 + + Increase version + + This way people building from master can adapt to the new API already + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7bddce7e20ac14024ec84762668fca98a3e2c7c2 +Author: Oliver Sander +Date: Sat Apr 20 06:46:11 2024 +0200 + + Remove redundant conditional + + The condition u[i] < 0x7F was checked twice. + + utils/HtmlOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5aa5d29c32b404cdc4c8d1a67b3b1bc8f068976d +Author: Albert Astals Cid +Date: Sat Apr 20 16:46:55 2024 +0200 + + Update (C) + + poppler/PageLabelInfo.cc | 1 + + poppler/TextOutputDev.cc | 2 +- + poppler/UTF.h | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +commit 2ce8812b658e5710ad907bb5d372c64bd61b6d57 +Author: Albert Astals Cid +Date: Wed Apr 10 01:28:46 2024 +0200 + + cpp: Fix crash extracting text and font in some files + + Issue reported and patch suggestion by Samad Koita and Aviral Agarwal + + Fixes issue #1477 + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 941666ce0c8e20087d6c006f7bc09ecd0ec84e8f +Author: Albert Astals Cid +Date: Sat Apr 20 12:57:54 2024 +0200 + + Fix build after rebase + + poppler/PSOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 081352cf9fa600c68ee1bebc457cee88fed6f94d +Author: Sune Vuorela +Date: Wed Apr 3 14:30:12 2024 +0200 + + pdftops: Write compliant ps header + + According to the postscript spec, only DSC Comments are allowed in the + header. + + %%Creator is the header for the software used to generate the + postscript + file, which is pdftops in this case, and not as such the generator for + the pdf file. I've chosen to, if available, keep the pdf creator as a + substring in the %%Creator field. + + Originates in + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1068307 + + poppler/PSOutputDev.cc | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit c5684e7697a070d7ecdf4114788ae76d57ef18b2 +Author: Stefan Brüns +Date: Tue Apr 9 21:02:39 2024 +0200 + + Add tests for fakebold text + + qt5/tests/check_actualtext.cpp | 61 + ++++++++++++++++++++++++++++++++++++++++++ + qt6/tests/check_actualtext.cpp | 61 + ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 122 insertions(+) + +commit 05121ab78f8208aa3d35cf5ccf96e84092089acc +Author: Oliver Sander +Date: Wed Apr 17 10:23:11 2024 +0200 + + Move move prependUnicodeMarker to UTF.h + + ... and rename it to prependUnicodeByteOrderMark. + + Now all unicode code has moved from GooString.h to UTF.h. + + glib/poppler-document.cc | 2 +- + goo/GooString.cc | 5 ----- + goo/GooString.h | 2 -- + poppler/Annot.cc | 12 ++++++------ + poppler/Form.cc | 6 +++--- + poppler/UTF.h | 6 ++++++ + 6 files changed, 16 insertions(+), 17 deletions(-) + +commit 1f06dca08c32ed18c3030530d98a0e30d41dd7a2 +Author: Oliver Sander +Date: Wed Apr 17 09:23:46 2024 +0200 + + Move method GooString::hasUnicodeMarkerLE to UTF.h + + ... and rename it to hasUnicodeByteOrderMarkLE. + + This allows to replace GooString by std::string in a few places. + (In a future commit) + + cpp/poppler-private.cpp | 2 +- + glib/poppler-document.cc | 2 +- + goo/GooString.h | 3 --- + poppler/UTF.cc | 2 +- + poppler/UTF.h | 11 ++++++++++- + qt5/src/poppler-private.cc | 2 +- + qt6/src/poppler-private.cc | 2 +- + 7 files changed, 15 insertions(+), 9 deletions(-) + +commit 98fabb298b0e8eaef9193bbce68c99c85473a314 +Author: Oliver Sander +Date: Mon Apr 8 07:50:40 2024 +0200 + + Move method GooString::hasUnicodeMarker to UTF.h + + ... and rename it to hasUnicodeByteOrderMark. + + This allows to replace GooString by std::string in a few places. + (In a future commit) + + cpp/poppler-private.cpp | 4 +++- + glib/poppler-document.cc | 8 ++++---- + goo/GooString.h | 2 -- + poppler/Annot.cc | 23 ++++++++++++----------- + poppler/Form.cc | 15 ++++++++------- + poppler/PDFDoc.cc | 4 ++-- + poppler/PageLabelInfo.cc | 4 ++-- + poppler/PageLabelInfo_p.h | 5 +++-- + poppler/UTF.cc | 6 +++--- + poppler/UTF.h | 6 ++++++ + qt5/src/poppler-private.cc | 5 +++-- + qt5/tests/check_pagelabelinfo.cpp | 2 +- + qt5/tests/check_strings.cpp | 4 +++- + qt6/src/poppler-private.cc | 5 +++-- + qt6/tests/check_pagelabelinfo.cpp | 2 +- + qt6/tests/check_strings.cpp | 3 ++- + utils/pdfdetach.cc | 9 +++++---- + utils/pdftohtml.cc | 5 +++-- + 18 files changed, 64 insertions(+), 48 deletions(-) + +commit c60e2ce44ae1c0af902c5139a4570d36e1b602cc +Author: Albert Astals Cid +Date: Wed Apr 10 01:07:52 2024 +0200 + + Update (C) + + poppler/Annot.cc | 2 +- + poppler/Form.cc | 2 +- + poppler/GfxFont.cc | 1 + + qt5/src/poppler-page.cc | 1 + + qt6/src/poppler-page.cc | 1 + + 5 files changed, 5 insertions(+), 2 deletions(-) + +commit a4f034830da8045981523fdad9f54b545bfd529e +Author: Nicolas Fella +Date: Mon Apr 8 16:29:23 2024 +0200 + + Fix text position in drawSignatureFieldText + + When centering vertically we calculate the y offset based on the + height of the text and the annotation + + When doing that we must ignore the border width, otherwise the text + is offset downwards + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 750bb558f094c8f25e53f212049fa83ee8f705b9 +Author: Nicolas Fella +Date: Mon Apr 8 17:10:48 2024 +0200 + + Take border into account also for height when determining signature + font size + + The border reduces the available height, so take it into account + for the height too, not only the width + + poppler/Form.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 58f721067044baeee1ac56cdc679cc5e97dcbd69 +Author: Stefan Brüns +Date: Sat Mar 30 19:24:12 2024 +0100 + + Fix Qt text extraction for Landscape/Seascape pages + + TextOutputDev::getText expects rotated coordinates, e.g. the correct + bounds for an A4 Landscape page are {0, 0, 842, 595}. + + qt5/src/poppler-page.cc | 6 +++++- + qt5/tests/check_actualtext.cpp | 1 - + qt6/src/poppler-page.cc | 6 +++++- + qt6/tests/check_actualtext.cpp | 1 - + 4 files changed, 10 insertions(+), 4 deletions(-) + +commit 7ecb49e8cf696e836663afa159c4ae809b3861a7 +Author: Stefan Brüns +Date: Sat Mar 30 19:20:38 2024 +0100 + + Cover Landscape etc in Qt Page::text tests + + Currently, the "Lanscape" with default page rectangle test fails, + as the + page orientation is not taken into account. + + (Seascape is also incorrect, but as the text lies inside the unrotated + A4 cropbox rectangle (bottom left), the text is extracted.) + + qt5/tests/check_actualtext.cpp | 50 + ++++++++++++++++++++++++++++++++++++++++++ + qt6/tests/check_actualtext.cpp | 50 + ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 100 insertions(+) + +commit 0f1ad3e4c1e4baacaec1771af23e4706a2d25cff +Author: Stefan Brüns +Date: Sat Mar 30 14:21:24 2024 +0100 + + Extend unit tests for Qt Page::text functionality + + The unit tests only covered extraction from the whole page, make sure + the various cases for smaller selections are also covered. + + qt5/tests/check_actualtext.cpp | 35 ++++++++++++++++++++++++++++++----- + qt6/tests/check_actualtext.cpp | 35 ++++++++++++++++++++++++++++++----- + 2 files changed, 60 insertions(+), 10 deletions(-) + +commit a741a6ef9062ba3733f0cab7a6b1d55bec2b53df +Author: Nelson Benítez León +Date: Sat Apr 6 21:52:05 2024 +0100 + + Assume "Adobe-Identity" for character collection + + When 'CIDSystemInfo' dictionary is absent or + has invalid content, instead of aborting the font + because we cannot read the character collection, + let's assume in that case character collection + to be "Adobe-Identity". + + Fixes #1465 - Does not show text of Apple-edited PDFs + + poppler/GfxFont.cc | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +commit bc3f42f45a15848aba686e7b493747c1a62b7c41 +Author: Albert Astals Cid +Date: Fri Apr 5 13:58:52 2024 +0200 + + Update (C) + + goo/GooString.cc | 2 +- + goo/GooString.h | 2 +- + poppler/Form.cc | 2 +- + poppler/GfxFont.cc | 2 +- + poppler/GlobalParams.cc | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +commit 088d83e45c53afeb7124f741e9539a28c7240686 +Author: Oliver Sander +Date: Thu Apr 4 11:54:22 2024 +0200 + + Remove method GooString::clear + + Use std::string::clear instead. The only difference between the two + is that GooString::clear returns the empty string, whereas + std::string::clear does not. But apparently this feature of + GooString::clear was not used anywhere. + + goo/GooString.h | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit fbb64544e5ea25ac9b1bd25b48043d074efe9cd9 +Author: Oliver Sander +Date: Thu Apr 4 10:06:56 2024 +0200 + + Remove GooString::startsWith and GooString::endsWith + + Starting with C++20, the std::string class has methods + starts_with and ends_with, which do the same thing. + Use those instead. + + goo/GooString.cc | 10 ---------- + goo/GooString.h | 8 +++----- + poppler/Form.cc | 4 ++-- + poppler/GfxFont.cc | 2 +- + poppler/GlobalParams.cc | 6 +++--- + 5 files changed, 9 insertions(+), 21 deletions(-) + +commit 508affb41a197895ce6af32d2404b8c7b812a70f +Author: Albert Astals Cid +Date: Wed Apr 3 22:28:36 2024 +0200 + + Update (C) + + cpp/poppler-global.h | 1 + + 1 file changed, 1 insertion(+) + +commit 7f62fdb0c120f5e9d4add5b8a985e145f2b7371d +Author: Albert Astals Cid +Date: Sun Mar 31 17:52:28 2024 +0200 + + pdfdetach: find -> starts_with + + utils/pdfdetach.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b4ac7d9af7cb5edfcfcbda035ed8b8c218ba8564 +Author: LinuxUserGD +Date: Wed Apr 3 15:21:15 2024 +0200 + + Change type to `std::basic_string` + Deprecated `char_traits` template has been removed in LLVM 19 + + cpp/poppler-global.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ff055f872aa31a548e1d73f4ea0d9394ba39d62c +Author: Stefan Brüns +Date: Mon Apr 1 16:56:26 2024 +0200 + + Regenerate pot/po files only if input has changed + + A custom target with ALL is always generated, even if the + files/outputs + specified with DPENDS are not changed. + + This can be solved by generating the POT files with a custom_command. + The target triggers evaluation of the custom_command, but the + latter will + only be run if the dependencies have changed. + + Fixes #1479 + + utils/po/CMakeLists.txt | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 0aa1fe5c30a6c467c91bad8d81bd6c2f57fcb726 +Author: Albert Astals Cid +Date: Mon Apr 1 09:49:15 2024 +0200 + + poppler 24.04.0 + + CMakeLists.txt | 4 ++-- + NEWS | 16 ++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 21 insertions(+), 5 deletions(-) + +commit 199ccde44be1879bf5caa8bcbc050c1ef0327849 +Author: Nelson Benítez León +Date: Sat Mar 9 00:48:59 2024 +0000 + + reset clipping path when the state is restored + + According to the specification, see NOTE 2 in + https://opensource.adobe.com/dc-acrobat-sdk-docs/pdfstandards/PDF32000_2008.pdf#G7.3882161 + + it appears that the clipping path should be reset + when the restore (Q) operator is encountered. + + Fixes #739 + + poppler/Gfx.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0d5431dba10c531b6e6897e088c1c6ccec84ef55 +Author: Albert Astals Cid +Date: Sun Mar 31 17:50:50 2024 +0200 + + CI: Update the hack to change c++ standard to 23 in the clang build + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d8ae3ba659c71b4f5913ecf74d525461bb831366 +Author: Albert Astals Cid +Date: Sun Feb 4 14:06:00 2024 +0100 + + Require C++20 + + I want to use std::string::starts_with + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1446d1fd2186e6573e737406c02a54c36fe1ad71 +Author: Albert Astals Cid +Date: Sun Mar 31 17:12:43 2024 +0200 + + CI: Use Fedora for clazy, it's newer and built against a newer clang + + .gitlab-ci.yml | 10 +++++++--- + poppler/FlateEncoder.cc | 2 +- + qt6/tests/check_search.cpp | 4 ++-- + 3 files changed, 10 insertions(+), 6 deletions(-) + +commit 80e0519077f74e2591d45e70801f6c3f2fe2c362 +Author: Albert Astals Cid +Date: Sun Mar 31 17:02:34 2024 +0200 + + qt: Include less files + + qt5/tests/check_actualtext.cpp | 2 +- + qt5/tests/check_annotations.cpp | 2 +- + qt5/tests/check_attachments.cpp | 2 +- + qt5/tests/check_cidfontswidthsbuilder.cpp | 2 +- + qt5/tests/check_dateConversion.cpp | 2 +- + qt5/tests/check_distinguished_name_parser.cpp | 2 +- + qt5/tests/check_fonts.cpp | 2 +- + qt5/tests/check_forms.cpp | 2 +- + qt5/tests/check_goostring.cpp | 2 +- + qt5/tests/check_internal_outline.cpp | 3 ++- + qt5/tests/check_lexer.cpp | 2 +- + qt5/tests/check_links.cpp | 2 +- + qt5/tests/check_metadata.cpp | 2 +- + qt5/tests/check_object.cpp | 2 +- + qt5/tests/check_optcontent.cpp | 2 +- + qt5/tests/check_outline.cpp | 2 +- + qt5/tests/check_overprint.cpp | 2 +- + qt5/tests/check_pagelabelinfo.cpp | 2 +- + qt5/tests/check_pagelayout.cpp | 2 +- + qt5/tests/check_pagemode.cpp | 2 +- + qt5/tests/check_password.cpp | 2 +- + qt5/tests/check_permissions.cpp | 2 +- + qt5/tests/check_search.cpp | 2 +- + qt5/tests/check_signature_basics.cpp | 2 +- + qt5/tests/check_strings.cpp | 2 +- + qt5/tests/check_stroke_opacity.cpp | 2 +- + qt5/tests/check_utf8document.cpp | 2 +- + qt5/tests/check_utf_conversion.cpp | 2 +- + qt6/tests/check_actualtext.cpp | 2 +- + qt6/tests/check_annotations.cpp | 2 +- + qt6/tests/check_attachments.cpp | 2 +- + qt6/tests/check_cidfontswidthsbuilder.cpp | 2 +- + qt6/tests/check_dateConversion.cpp | 2 +- + qt6/tests/check_distinguished_name_parser.cpp | 2 +- + qt6/tests/check_fonts.cpp | 2 +- + qt6/tests/check_forms.cpp | 2 +- + qt6/tests/check_goostring.cpp | 2 +- + qt6/tests/check_internal_outline.cpp | 3 ++- + qt6/tests/check_lexer.cpp | 2 +- + qt6/tests/check_links.cpp | 2 +- + qt6/tests/check_metadata.cpp | 2 +- + qt6/tests/check_object.cpp | 2 +- + qt6/tests/check_optcontent.cpp | 2 +- + qt6/tests/check_outline.cpp | 2 +- + qt6/tests/check_overprint.cpp | 2 +- + qt6/tests/check_pagelabelinfo.cpp | 2 +- + qt6/tests/check_pagelayout.cpp | 2 +- + qt6/tests/check_pagemode.cpp | 2 +- + qt6/tests/check_password.cpp | 2 +- + qt6/tests/check_permissions.cpp | 2 +- + qt6/tests/check_search.cpp | 2 +- + qt6/tests/check_signature_basics.cpp | 2 +- + qt6/tests/check_strings.cpp | 2 +- + qt6/tests/check_stroke_opacity.cpp | 2 +- + qt6/tests/check_utf8document.cpp | 2 +- + qt6/tests/check_utf_conversion.cpp | 2 +- + 56 files changed, 58 insertions(+), 56 deletions(-) + +commit ec2427b7cb92cda6cd7bc9b1d3117552a65d518e +Author: Albert Astals Cid +Date: Sun Mar 31 16:32:36 2024 +0200 + + CI: Use fedora 40 + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d7e54f88c981f26b9477b2330070dccbdbbbdb55 +Author: Albert Astals Cid +Date: Sun Mar 31 11:42:11 2024 +0200 + + Update (C) + + poppler/TextOutputDev.cc | 3 ++- + poppler/TextOutputDev.h | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit f26b292412a9266aab46deb2ce1ffc4d016cc573 +Author: Stefan Brüns +Date: Thu Mar 28 02:37:09 2024 +0100 + + Reduce worst case algorithmic complexity of TextBlock::coalesce + + The old algorithm restarts the inner loop for the RHS word from the + beginning on each match, i.e. the worst case complexity approaches + O(N^3), while O(N^2) is obviously sufficient for a pairwise compare of + all words. Fortunately, O(N^2) is hardly ever happening, as the + inner N + is limited by a) the maxBaseIdx, b) removing duplicates from the set. + + For some pathological cases this changes the runtime from minutes to + seconds. + + See poppler#1173. + + poppler/TextOutputDev.cc | 109 + ++++++++++++++++++++++++++--------------------- + 1 file changed, 60 insertions(+), 49 deletions(-) + +commit 835987362d9873cf98cc3f86959910ff2107a509 +Author: Stefan Brüns +Date: Sun Mar 24 00:31:52 2024 +0100 + + Reduce TextWord space and allocation overhead + + Currently, the word characters are allocated as a struct of arrays, + e.g. text and charcode are allocated separately. + + This causes some space (6 pointers, 6 malloc chunk management + words (size_t/flags), alignment, ...) and runtime overhead (6 allocs/ + frees per word). + + Changing this to an array of struct reduces this overhead. It + also allows + to be more conservative with allocations, as resizing is less + costly, i.e. + starting with a single character allocation instead of 16. It is + also more + efficient, as most accesses affect multiple or all attributes, i.e. + values in the same or neighboring CPU cache lines. + + Using a std::vector instead of separate raw arrays also reduces code + and manual data management. + + The "charPos end index" and trailing "edge" attributes are no + longer stored as an additional entry entry in the array, but as + dedicated + data members, `charPosEnd` and `edgeEnd`. + + The memory saving is most notably for short words, but even for words + with 16 characters there are small savings, and still less allocations + (1 + 4 allocations instead of 6. Growing is fairly cheap, as the + CharInfo + struct is trivially copyable.) + + See poppler#1173. + + poppler/TextOutputDev.cc | 378 + ++++++++++++++++++++++------------------------- + poppler/TextOutputDev.h | 42 +++--- + 2 files changed, 197 insertions(+), 223 deletions(-) + +commit e803b3714a44001ac1e001d948ae505b24086b66 +Author: Albert Astals Cid +Date: Thu Feb 8 00:36:51 2024 +0100 + + Fix clang-tidy-17 "unnecessary temporary object created while calling + emplace_back" + + Says modernize-use-emplace + + No need to pass the c, we will set it later so we can just use the + default constructed CharCodeToUnicodeString + + poppler/CharCodeToUnicode.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9ace4f33e38fe24add87dc4e7c2a43e1441f2bec +Author: Nelson Benítez León +Date: Tue Mar 12 21:37:46 2024 +0000 + + Fix text search across lines between paragraphs + + This commit fixes the "across lines" text + search feature of TextPage::findText() when + the match happens from the last line of a + paragraph to the first line of next paragraph. + + Includes tests for this bug. + + Fixes #1475 + Fixes https://gitlab.gnome.org/GNOME/evince/-/issues/2001 + + poppler/TextOutputDev.cc | 60 + +++++++++++++++++++++++++++------------------- + qt5/tests/check_search.cpp | 7 ++++++ + qt6/tests/check_search.cpp | 7 ++++++ + 3 files changed, 50 insertions(+), 24 deletions(-) + +commit 7a435135a1bfb8c3f9f5984d88bbe5dd8977335a +Author: Nelson Benítez León +Date: Sat Mar 23 12:40:07 2024 +0000 + + Fix regression on issue #157 + + Redo the fix for issue #157 which is about doing + transparent selection for glyphless documents (eg. + tesseract scanned documents) because it stopped + working after commit 29f32a47 + + poppler/TextOutputDev.cc | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +commit a10901554010bc5bbc0f24a8d14fdcdecc1b8367 +Author: Albert Astals Cid +Date: Thu Mar 28 00:05:28 2024 +0100 + + Update (C) + + qt5/src/poppler-sound.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 10377f9df110aaeb8d68df4d01f049d9cc9f9c21 +Author: Albert Astals Cid +Date: Wed Mar 27 00:43:01 2024 +0100 + + qt6: Fix crash in SoundObject::data + + qt6/src/poppler-sound.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6a7f14bd867bc7215e1c94d27fb00c84c88a1db9 +Author: Albert Astals Cid +Date: Tue Mar 5 00:41:43 2024 +0100 + + Revert "CI: Switch debian to testing" + + This reverts commit 9c2cf5608a21b6fb9be4e0c7918d13cd2b652c23. + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 99f5416d9bfb6a34bbc5cbcb368e258b98fd3f08 +Author: Josep M. Ferrer +Date: Fri Mar 1 15:09:08 2024 +0100 + + pdfsig: Catalan translation + + utils/po/ca/CMakeLists.txt | 4 ++++ + utils/po/ca/pdfsig.po | 26 ++++++++++++++++++++++++++ + 2 files changed, 30 insertions(+) + +commit 9c2cf5608a21b6fb9be4e0c7918d13cd2b652c23 +Author: Albert Astals Cid +Date: Sun Mar 3 18:39:00 2024 +0100 + + CI: Switch debian to testing + + unstable is broken at the moment + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 481ee336d15bdf6b2b6084dddcd1617b032d2cd5 +Author: Albert Astals Cid +Date: Sun Mar 3 12:16:11 2024 +0100 + + poppler 24.03.0 + + CMakeLists.txt | 4 ++-- + NEWS | 12 ++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 17 insertions(+), 5 deletions(-) + +commit 23a3e5144e9fe5329b99b26879856e9ca3db769d +Author: Albert Astals Cid +Date: Sun Mar 3 15:36:15 2024 +0100 + + Fix srcdir=builddir build + + cmake will create folders which so we need to ignore those + + utils/po/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 840fc7637d93d40e09c7792086c96ba94811fb1f +Author: Albert Astals Cid +Date: Fri Mar 1 10:27:55 2024 +0100 + + Fix translations on non glibc platforms + + utils/CMakeLists.txt | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 0ad01ca51e6b6e061ba85db5b906dfc299dba8e1 +Author: Albert Astals Cid +Date: Thu Feb 22 09:19:57 2024 +0100 + + Update (C) + + poppler/XRef.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a9266633d203432234ab2dab621f61374eed2d66 +Author: Nelson Benítez León +Date: Wed Feb 21 19:56:46 2024 +0000 + + Fix regression on encrypted files being repaired + + Some encrypted files which need repairing (see + links below) failed to open due to a regression + introduced in commit b3e86dbdba where an 'if + condition' was added that's hit by encrypted files + which need repairing. + + The removal of this 'if condition' does not affect + the original buggy file that commit b3e86dbdba + targeted[1]. + + This commit also adds Qt5 and Qt6 tests for opening + an encrypted pdf file affected by this issue. + + Fixes #1447 + Fixes https://gitlab.gnome.org/GNOME/evince/-/issues/1889 + + Regression issue: + https://bugs.freedesktop.org/show_bug.cgi?id=14303 + + [1] which can be found in this duplicate: + https://bugs.freedesktop.org/show_bug.cgi?id=14399 + + poppler/XRef.cc | 2 +- + qt5/tests/check_password.cpp | 13 +++++++++++++ + qt6/tests/check_password.cpp | 10 ++++++++++ + 3 files changed, 24 insertions(+), 1 deletion(-) + +commit 87fab6144828cf52fbefb484ef7024c06ceaf6b1 +Author: Albert Astals Cid +Date: Thu Feb 22 00:23:16 2024 +0100 + + Update (C) + + poppler/Gfx.cc | 2 +- + poppler/SplashOutputDev.cc | 2 +- + poppler/Stream.cc | 2 +- + splash/Splash.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 3d8dac5ec9f1cdedada07c4c2fc02e43d5e14f9e +Author: Even Rouault +Date: Tue Feb 20 20:44:04 2024 +0100 + + Gfx::doImage(): avoid integer overflow if width * height > INT_MAX + + Related to https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=66523 + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8d66d756dad4fbde0cd1b8b0f1ce8b08caa7a19d +Author: Even Rouault +Date: Tue Feb 20 20:43:11 2024 +0100 + + SplashOutputDev::drawImageMask(): early break if getLine() fails + + Related to https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=66523 + + poppler/SplashOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 6a4d5323efd9651ab2ee5a0f921bdeb55fa61b0b +Author: Even Rouault +Date: Tue Feb 20 20:42:28 2024 +0100 + + ImageStream::getLine(): check that imgLine is not null + + Related to https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=66523 + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 30acc0bbd2c773b2709aa9138e94729439fb3025 +Author: Even Rouault +Date: Tue Feb 20 20:41:51 2024 +0100 + + Splash.cpp scaleXXXX() functions: use gmalloc[n]_checkoverflow to + avoid abort() on large memory allocations + + Related to https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=66523 + + splash/Splash.cc | 151 + ++++++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 132 insertions(+), 19 deletions(-) + +commit 1c7c2bae76d684bc4c8cd27f203b76009f49a848 +Author: Even Rouault +Date: Tue Feb 20 21:14:50 2024 +0100 + + Fix read-heap-buffer-overflow in Splash::blitTransparent() in + splashModeMono8 case + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=64471 + + ``` + $ utils/pdftoppm + clusterfuzz-testcase-minimized-gdal_fuzzer-6127122829410304 + [...] + ================================================================= + ==1758602==ERROR: AddressSanitizer: heap-buffer-overflow on + address 0x602000024cd5 at pc 0x7fd5850e977d bp 0x7ffe0e007430 sp + 0x7ffe0e007428 + READ of size 1 at 0x602000024cd5 thread T0 + #0 0x7fd5850e977c in Splash::blitTransparent(SplashBitmap*, + int, int, int, int, int, int) + /home/even/poppler/splash/Splash.cc:5778:24 + #1 0x7fd58505e19d in + SplashOutputDev::beginTransparencyGroup(GfxState*, + double const*, GfxColorSpace*, bool, bool, bool) + /home/even/poppler/poppler/SplashOutputDev.cc:3998:17 + #2 0x7fd5850451c3 in + SplashOutputDev::setSoftMaskFromImageMask(GfxState*, + Object*, Stream*, int, int, bool, bool, double*) + /home/even/poppler/poppler/SplashOutputDev.cc:2692:5 + #3 0x7fd584c3f6a7 in Gfx::doPatternImageMask(Object*, Stream*, + int, int, bool, bool) /home/even/poppler/poppler/Gfx.cc:1964:10 + #4 0x7fd584c5cc26 in Gfx::doImage(Object*, Stream*, bool) + /home/even/poppler/poppler/Gfx.cc:4304:17 + #5 0x7fd584c1827a in Gfx::opBeginImage(Object*, int) + /home/even/poppler/poppler/Gfx.cc:4900:9 + #6 0x7fd584c32abe in Gfx::execOp(Object*, Object*, int) + /home/even/poppler/poppler/Gfx.cc:811:5 + #7 0x7fd584c316ef in Gfx::go(bool) + /home/even/poppler/poppler/Gfx.cc:686:13 + #8 0x7fd584c30f76 in Gfx::display(Object*, bool) + /home/even/poppler/poppler/Gfx.cc:647:5 + #9 0x7fd58506713d in SplashOutputDev::tilingPatternFill(GfxState*, + Gfx*, Catalog*, GfxTilingPattern*, double + const*, int, int, int, int, double, double) + /home/even/poppler/poppler/SplashOutputDev.cc:4424:10 + #10 0x7fd584c3b41b in Gfx::doTilingPatternFill(GfxTilingPattern*, + bool, bool, bool) /home/even/poppler/poppler/Gfx.cc:2176:53 + #11 0x7fd584c36188 in Gfx::doPatternFill(bool) + /home/even/poppler/poppler/Gfx.cc:1895:9 + #12 0x7fd584c16d93 in Gfx::opFillStroke(Object*, int) + /home/even/poppler/poppler/Gfx.cc:1794:17 + #13 0x7fd584c32abe in Gfx::execOp(Object*, Object*, int) + /home/even/poppler/poppler/Gfx.cc:811:5 + #14 0x7fd584c316ef in Gfx::go(bool) + /home/even/poppler/poppler/Gfx.cc:686:13 + #15 0x7fd584c30f76 in Gfx::display(Object*, bool) + /home/even/poppler/poppler/Gfx.cc:647:5 + #16 0x7fd584de61b9 in Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool + (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/even/poppler/poppler/Page.cc:593:14 + #17 0x7fd584dfd5fc in PDFDoc::displayPageSlice(OutputDev*, + int, double, double, int, bool, bool, bool, int, int, int, int, + bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/even/poppler/poppler/PDFDoc.cc:633:24 + #18 0x4cc9c6 in savePageSlice(PDFDoc*, SplashOutputDev*, + int, int, int, int, int, double, double, char*) + /home/even/poppler/utils/pdftoppm.cc:293:10 + #19 0x4cb932 in main /home/even/poppler/utils/pdftoppm.cc:695:9 + #20 0x7fd5841ef082 in __libc_start_main + /build/glibc-wuryBv/glibc-2.31/csu/../csu/libc-start.c:308:16 + #21 0x41d61d in _start + (/home/even/poppler/build/utils/pdftoppm+0x41d61d) + + 0x602000024cd5 is located 1 bytes to the right of 4-byte region + [0x602000024cd0,0x602000024cd4) + allocated by thread T0 here: + #0 0x495d5d in malloc + (/home/even/poppler/build/utils/pdftoppm+0x495d5d) + #1 0x7fd5849f1d54 in gmalloc(unsigned long, bool) + /home/even/poppler/goo/gmem.h:44:19 + #2 0x7fd5849f0ed0 in gmallocn(int, int, bool) + /home/even/poppler/goo/gmem.h:121:12 + #3 0x7fd584c1384d in gmallocn_checkoverflow(int, int) + /home/even/poppler/goo/gmem.h:126:12 + #4 0x7fd5850f7ec5 in SplashBitmap::SplashBitmap(int, int, int, + SplashColorMode, bool, bool, std::vector > const*) + /home/even/poppler/splash/SplashBitmap.cc:111:28 + #5 0x7fd585066631 in SplashOutputDev::tilingPatternFill(GfxState*, + Gfx*, Catalog*, GfxTilingPattern*, double + const*, int, int, int, int, double, double) + /home/even/poppler/poppler/SplashOutputDev.cc:4398:18 + #6 0x7fd584c3b41b in Gfx::doTilingPatternFill(GfxTilingPattern*, + bool, bool, bool) /home/even/poppler/poppler/Gfx.cc:2176:53 + #7 0x7fd584c36188 in Gfx::doPatternFill(bool) + /home/even/poppler/poppler/Gfx.cc:1895:9 + #8 0x7fd584c16d93 in Gfx::opFillStroke(Object*, int) + /home/even/poppler/poppler/Gfx.cc:1794:17 + #9 0x7fd584c32abe in Gfx::execOp(Object*, Object*, int) + /home/even/poppler/poppler/Gfx.cc:811:5 + #10 0x7fd584c316ef in Gfx::go(bool) + /home/even/poppler/poppler/Gfx.cc:686:13 + #11 0x7fd584c30f76 in Gfx::display(Object*, bool) + /home/even/poppler/poppler/Gfx.cc:647:5 + #12 0x7fd584de61b9 in Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool + (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/even/poppler/poppler/Page.cc:593:14 + #13 0x7fd584dfd5fc in PDFDoc::displayPageSlice(OutputDev*, + int, double, double, int, bool, bool, bool, int, int, int, int, + bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/even/poppler/poppler/PDFDoc.cc:633:24 + #14 0x4cc9c6 in savePageSlice(PDFDoc*, SplashOutputDev*, + int, int, int, int, int, double, double, char*) + /home/even/poppler/utils/pdftoppm.cc:293:10 + #15 0x4cb932 in main /home/even/poppler/utils/pdftoppm.cc:695:9 + #16 0x7fd5841ef082 in __libc_start_main + /build/glibc-wuryBv/glibc-2.31/csu/../csu/libc-start.c:308:16 + + SUMMARY: AddressSanitizer: heap-buffer-overflow + /home/even/poppler/splash/Splash.cc:5778:24 in + Splash::blitTransparent(SplashBitmap*, int, int, int, int, int, int) + ``` + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a938d58fb5b7ab43447f972ce238618fe2534ccd +Author: Albert Astals Cid +Date: Sun Feb 18 19:25:43 2024 +0100 + + Update (C) + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 1 + + poppler/DateInfo.cc | 1 + + poppler/DateInfo.h | 1 + + poppler/Form.cc | 2 +- + utils/pdfsig.cc | 2 +- + 6 files changed, 6 insertions(+), 3 deletions(-) + +commit a7f1652ebdb78a4757565a91b62294ad7333ec75 +Author: Erich E. Hoover +Date: Thu Feb 8 11:07:24 2024 -0700 + + pdfsig: Sign form signature fields with an appearance + + utils/CMakeLists.txt | 7 +++++++ + utils/pdfsig.1 | 3 +++ + utils/pdfsig.cc | 33 ++++++++++++++++++++++++++++++++- + utils/po/CMakeLists.txt | 26 ++++++++++++++++++++++++++ + utils/po/pdfsig.pot | 26 ++++++++++++++++++++++++++ + 5 files changed, 94 insertions(+), 1 deletion(-) + +commit 53b98e8d3c7783b4340e6006e7641fa6b0ffe3ec +Author: Erich E. Hoover +Date: Mon Aug 15 10:04:17 2022 -0600 + + DateInfo: Add timeToStringWithFormat for using a custom format string + + poppler/DateInfo.cc | 33 +++++++++++++++++++++++++-------- + poppler/DateInfo.h | 6 ++++++ + 2 files changed, 31 insertions(+), 8 deletions(-) + +commit 7b189dc13c1e8de7df23326ce5b2ff93b76dc712 +Author: Erich E. Hoover +Date: Wed Oct 26 11:33:48 2022 -0600 + + Form: Allow signDocumentWithAppearance to autocalculate the font size + + poppler/Form.cc | 34 +++++++++++++++++++++++++++++++++- + 1 file changed, 33 insertions(+), 1 deletion(-) + +commit 4a278246628850d5b7dc0ee3f6cbc9d38999e85a +Author: Erich E. Hoover +Date: Wed Oct 26 11:34:21 2022 -0600 + + Annot: Pull out the font size calculator into a separate routine + + poppler/Annot.cc | 54 + +++++++++++++++++++++++++++++++----------------------- + poppler/Annot.h | 2 ++ + 2 files changed, 33 insertions(+), 23 deletions(-) + +commit 4b109c2fdcd1d170d329178dd2f33ae55cc3fef0 +Author: Albert Astals Cid +Date: Thu Feb 15 23:28:06 2024 +0100 + + Update (C) + + utils/ImageOutputDev.cc | 1 + + utils/ImageOutputDev.h | 1 + + utils/pdfimages.cc | 1 + + 3 files changed, 3 insertions(+) + +commit 90726f1e54c3be924f8a0419fc6fca4657127d89 +Author: Sebastian J. Bronner +Date: Thu Feb 15 22:27:08 2024 +0000 + + Enable pdfimages to print filenames to stdout. + + Add a command line option -print-filenames so that after writing each + imaage to file, pdfimages will print the filename to stdout. This + is in + line with the --batch-print option of scanimage and the + stream_filelist + parameter of tesseract. It allows easy parallelization of different + stages of an image processing pipeline. + + utils/ImageOutputDev.cc | 5 +++++ + utils/ImageOutputDev.h | 4 ++++ + utils/pdfimages.1 | 3 +++ + utils/pdfimages.cc | 3 +++ + 4 files changed, 15 insertions(+) + +commit 2934e3127adaff049224c741ddaeef8de832c6ab +Author: Albert Astals Cid +Date: Tue Feb 13 22:59:19 2024 +0100 + + Update (C) + + poppler/Gfx.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a4da948c19990e299dd336a30d32760ce90b0136 +Author: Nelson Benítez León +Date: Tue Feb 13 10:28:22 2024 +0000 + + Gfx::doImage: skip drawing image when it has singular matrix + + otherwise it will result in broken output in Cairo backend. + + Splash backend already works fine for this case because + it checks for singular matrix in Splash::drawImage(). + + This commit adds that check early in Gfx::doImage() + which fixes the Cairo backend and for Splash backend + means a perf improvement by avoiding lot of color + computation and image preparation done in + SplashOutputDev::draw{Image,ImageMask,MaskedImage,softMaskedImage} + prior to calling Splash::drawImage which is the one + that checks singular matrix and skips. + + Note: singular matrix case is not mentioned in PDF spec + but Xpdf and other pdf readers de-facto do as in here + i.e. skip drawing an image when it has a singular (non + invertible) matrix. + + Fixes issue #1114 + + poppler/Gfx.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 0672a083a5f8e0c5ca53f7cf0dd967ce78b26fd1 +Author: Albert Astals Cid +Date: Thu Feb 8 19:00:01 2024 +0100 + + Update (C) + + poppler/FileSpec.cc | 1 + + poppler/FileSpec.h | 1 + + utils/pdfdetach.cc | 3 ++- + 3 files changed, 4 insertions(+), 1 deletion(-) + +commit d169ac132d36ba1459000a27cada084e1633859a +Author: Albert Astals Cid +Date: Sun Feb 4 10:31:43 2024 +0100 + + Use std::filesystem + + utils/pdfdetach.cc | 40 ++++++++++++++++++++++++---------------- + 1 file changed, 24 insertions(+), 16 deletions(-) + +commit d8e7a8a9dd4ddd642c35f5fd1538396be2a68aa9 +Author: Sune Vuorela +Date: Fri Jun 30 15:25:14 2023 +0200 + + Fix directory traversal in pdfdetach + + A carefully crafted pdf file could lead to writing files in wrong + places + of the file system by using pdfdetach. + + Thanks to jwilk for spotting the issue. + + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1026908 + + poppler/FileSpec.cc | 4 ++-- + poppler/FileSpec.h | 2 +- + utils/pdfdetach.cc | 66 + ++++++++++++++++++++++++++--------------------------- + 3 files changed, 35 insertions(+), 37 deletions(-) + +commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083 +Author: Albert Astals Cid +Date: Thu Feb 8 00:57:02 2024 +0100 + + Use an enum for Function getType + + poppler/Function.cc | 4 ++-- + poppler/Function.h | 29 ++++++++++++++++------------- + poppler/PSOutputDev.cc | 12 ++++++------ + 3 files changed, 24 insertions(+), 21 deletions(-) + +commit 925b104c33f5a1a546c72794d30a6deb918998f7 +Author: Sune Vuorela +Date: Fri Feb 2 11:18:42 2024 +0100 + + Use more vectors and less owning pointers + length + + Also remove a couple of unreferenced functions. + + poppler/CharCodeToUnicode.cc | 175 + ++++++++----------------------------------- + poppler/CharCodeToUnicode.h | 16 +--- + 2 files changed, 35 insertions(+), 156 deletions(-) + +commit d44142d3bb95997af339ebe7d30d2180fe74d6f4 +Author: Sune Vuorela +Date: Mon Feb 5 10:43:01 2024 +0100 + + Microoptimization in parsehex + + parsehex is quite a hot codepath when loading documents. + + Various experiments shown that this let the compiler generate slightly + faster code. + + poppler/CharCodeToUnicode.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 7e66b9afe16e7eb559655d7c400cf4c1e6e04d26 +Author: Sune Vuorela +Date: Fri Feb 2 10:36:44 2024 +0100 + + inline UnicodeIsValid + + While profiling document loading, a lot was hitting this function; try + let the compiler be smarter. + + poppler/UTF.cc | 5 ----- + poppler/UTF.h | 5 ++++- + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit 5ad744922aeed83ecf2bbdb83c783bbfc23b4192 +Author: Albert Astals Cid +Date: Thu Feb 1 23:44:27 2024 +0100 + + poppler 24.02.0 + + CMakeLists.txt | 4 ++-- + NEWS | 11 +++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 16 insertions(+), 5 deletions(-) + +commit c80ae496d04ebcc94d480e5ba9a1d35a32f03719 +Author: Albert Astals Cid +Date: Thu Feb 1 20:20:52 2024 +0100 + + Update (C) + + cpp/poppler-toc.cpp | 1 + + glib/poppler-document.cc | 1 + + poppler/CharCodeToUnicode.cc | 1 + + poppler/CharCodeToUnicode.h | 1 + + poppler/DateInfo.cc | 1 + + poppler/JSInfo.cc | 1 + + poppler/Outline.cc | 1 + + poppler/Outline.h | 1 + + poppler/TextOutputDev.cc | 1 + + poppler/UTF.cc | 2 +- + poppler/UTF.h | 2 +- + qt5/src/poppler-outline.cc | 1 + + qt5/src/poppler-private.cc | 1 + + qt5/src/poppler-private.h | 1 + + qt6/src/poppler-outline.cc | 1 + + qt6/src/poppler-private.cc | 1 + + qt6/src/poppler-private.h | 1 + + utils/HtmlFonts.cc | 1 + + utils/HtmlFonts.h | 1 + + utils/HtmlOutputDev.cc | 1 + + utils/HtmlOutputDev.h | 1 + + utils/pdfinfo.cc | 1 + + utils/pdfsig.cc | 2 +- + utils/pdftohtml.cc | 1 + + 24 files changed, 24 insertions(+), 3 deletions(-) + +commit fc1c711cb5f769546c6b31cc688bf0ee7f0c1dbc +Author: Sune Vuorela +Date: Thu Feb 1 19:11:03 2024 +0000 + + More unicode vectors; fewer raw pointers + + cpp/poppler-toc.cpp | 5 +- + glib/poppler-document.cc | 3 +- + poppler/CharCodeToUnicode.cc | 113 + ++++++++++++----------------------- + poppler/CharCodeToUnicode.h | 12 ++-- + poppler/DateInfo.cc | 10 ++-- + poppler/JSInfo.cc | 9 +-- + poppler/Outline.cc | 12 +--- + poppler/Outline.h | 7 +-- + poppler/TextOutputDev.cc | 8 +-- + poppler/UTF.cc | 78 +++++++++++------------- + poppler/UTF.h | 11 ++-- + qt5/src/poppler-outline.cc | 2 +- + qt5/src/poppler-private.cc | 13 ++-- + qt5/src/poppler-private.h | 1 + + qt5/tests/check_internal_outline.cpp | 6 +- + qt5/tests/check_utf8document.cpp | 3 +- + qt5/tests/check_utf_conversion.cpp | 24 ++++---- + qt6/src/poppler-outline.cc | 2 +- + qt6/src/poppler-private.cc | 5 ++ + qt6/src/poppler-private.h | 1 + + qt6/tests/check_internal_outline.cpp | 6 +- + qt6/tests/check_utf8document.cpp | 3 +- + qt6/tests/check_utf_conversion.cpp | 24 ++++---- + utils/HtmlFonts.cc | 4 +- + utils/HtmlFonts.h | 2 +- + utils/HtmlOutputDev.cc | 38 ++++++------ + utils/HtmlOutputDev.h | 2 +- + utils/pdfinfo.cc | 8 +-- + utils/pdfsig.cc | 8 +-- + utils/pdftohtml.cc | 25 +++----- + 30 files changed, 187 insertions(+), 258 deletions(-) + +commit e56d7d7d325928e4db43043eec9c290ef0e690e3 +Author: Albert Astals Cid +Date: Wed Jan 31 23:46:47 2024 +0100 + + Update (C) + + poppler/GlobalParams.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c1443b5fdb62c5d02e448933aaeac7a080831cde +Author: Keyu Tao +Date: Wed Jan 3 12:47:17 2024 +0800 + + Use FcPatternGetCharSet to fast skip fonts in + findSystemFontFileForUChar + + poppler/GlobalParams.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit af05d3064f459550a361b3f30e3efb0598546948 +Author: Albert Astals Cid +Date: Thu Jan 25 23:51:05 2024 +0100 + + Fix setting annotpolygon interior color to empty + + poppler/Annot.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit b0d437040cbfa65604d98a30bb2158edf2a2c053 +Author: Albert Astals Cid +Date: Thu Jan 25 23:49:53 2024 +0100 + + Fix saving annotgeometry interior color when it's empty + + KDE bug #479732 + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 362e45c7865835a7b249dee4e63b17110f1fb6bb +Author: Nelson Benítez León +Date: Thu Jan 25 16:58:17 2024 +0000 + + Remove unneeded comment + + poppler/Stream.h | 1 - + 1 file changed, 1 deletion(-) + +commit 2b2d5bc0a7351895c662958105dac11adfecf794 +Author: Albert Astals Cid +Date: Thu Jan 25 23:49:11 2024 +0100 + + Update (C) + + poppler/JBIG2Stream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 42004cb3278f75403c12bc38bae147937c16ea90 +Author: Nelson Benítez León +Date: Thu Jan 25 16:23:23 2024 +0000 + + Fix small oversight from b8de1a191 + + There was one 'bytecounter increase' case + that was not imported from the Xpdf code. + + That caused some JPEG streams fail to + render when hitting that codepath, like + the file 'p1.blank_with_poppler.pdf' + posted on issue #1319 + + Fixes #1319 + + poppler/JBIG2Stream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a93aa6acf6efe14a5f0494552b0e56db5085df35 +Author: Albert Astals Cid +Date: Thu Jan 25 00:12:23 2024 +0100 + + Add a few const and reduce variable scopes + + utils/ImageOutputDev.h | 4 ++-- + utils/pdfimages.cc | 14 +++++--------- + 2 files changed, 7 insertions(+), 11 deletions(-) + +commit 7c9dfc10fd7b3ee3bdd1a71ab932ffd93dfebeba +Author: Albert Astals Cid +Date: Thu Jan 25 00:13:22 2024 +0100 + + Update (C) + + poppler/XRef.h | 2 +- + utils/ImageOutputDev.cc | 1 + + utils/ImageOutputDev.h | 1 + + utils/pdfimages.cc | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +commit b20632277c6352306651f5625ec43172c470a55c +Author: Fernando Herrera +Date: Wed Jan 24 22:33:02 2024 +0000 + + pdfimages: return exit code 2 when error opening output files + + Issue #1460 + + utils/ImageOutputDev.cc | 8 +++++++- + utils/ImageOutputDev.h | 8 ++++++-- + utils/pdfimages.cc | 5 +++-- + 3 files changed, 16 insertions(+), 5 deletions(-) + +commit 25ffb7b7ac82d8d2b394514149014142a5160096 +Author: Sune Vuorela +Date: Wed Jan 24 10:58:27 2024 +0100 + + Make stream compression non-optional + + Requires the users to think if their stream is compressed or not + and if it is a good idea to compress or not, rather than default to + 'not + compressed' + + poppler/XRef.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit c7ad20c2eac29d01bdeff12ac0c936ed882ed826 +Author: Albert Astals Cid +Date: Tue Jan 23 23:47:56 2024 +0100 + + Update (C) + + poppler/ImageEmbeddingUtils.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 90485ab0a42cb2ec9adcea1308ca11dc2e09572f +Author: Sune Vuorela +Date: Tue Jan 23 22:44:06 2024 +0000 + + Compress images when added + + poppler/ImageEmbeddingUtils.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6a4c667ee4096ba06e46d86bfc2b18a67e346303 +Author: Albert Astals Cid +Date: Tue Jan 23 00:02:05 2024 +0100 + + Update (C) + + poppler/TextOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 2158361781699bf6dad451ac1a929f8f328c7413 +Author: Adam Sampson +Date: Thu Jan 18 00:01:15 2024 +0000 + + TextPage::takeText: reset actualText for the new page + + actualText has an internal pointer to the TextPage it's writing to, so + if you called takeText and then continued to output more pages to the + TextOutputDev, their text would be written to the page you'd taken + rather than the new one. + + poppler/TextOutputDev.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 87963f675f3532073c1d71c7ba298289485bc7f7 +Author: Albert Astals Cid +Date: Tue Jan 2 22:40:38 2024 +0100 + + poppler 24.01.0 + + CMakeLists.txt | 4 ++-- + NEWS | 7 +++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 12 insertions(+), 5 deletions(-) + +commit 38b471d3796efd4a7a01c5a31c1e40606f355213 +Author: Albert Astals Cid +Date: Tue Jan 2 22:36:39 2024 +0100 + + Welcome 2024 + + poppler/poppler-config.h.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f1c69969e031687e6d991677dda021a2a4db48e3 +Author: Albert Astals Cid +Date: Fri Dec 29 17:29:56 2023 +0100 + + Fix infinite loop in HorizontalTextLayouter if there's not enough + space to layout text #2 + + Happens only if the first chracter we're asking to draw can't be drawn + with the given font and we need to find a new one and the given + available space is negative (as said this function must always + layout at + least one character) + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8a9f1d3a84a9f3d66cd353b7fe1aef0b65a37c08 +Author: Albert Astals Cid +Date: Thu Dec 28 18:35:21 2023 +0100 + + Fix infinite loop in HorizontalTextLayouter if there's not enough + space to layout text + + Happens only if the first chracter we're asking to draw can't be drawn + with the given font and we need to find a new one + + poppler/Annot.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4be9ecdadcacf52dc0e413c30d09a61384a36166 +Author: Albert Astals Cid +Date: Sat Dec 23 01:00:02 2023 +0100 + + Update (C) + + poppler/FontInfo.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 4fb6a9bc495fa7059e7eed8adb5d46bed44809be +Author: suzuki toshiya +Date: Fri Dec 8 17:16:38 2023 +0900 + + Initialize FontInfo::embRef by Ref::INVALID() for Type3 font. + + poppler/FontInfo.cc | 1 + + 1 file changed, 1 insertion(+) + +commit afaddf1be66aed2931a146bb6555225c82cceacd +Author: Albert Astals Cid +Date: Thu Dec 14 00:48:45 2023 +0100 + + NSSCryptoSignBackend: Don't crash on certain documents + + poppler/NSSCryptoSignBackend.cc | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit 37023cdfc15600cd58303147dc99254c119c51c4 +Author: Albert Astals Cid +Date: Wed Dec 13 23:08:44 2023 +0100 + + Update (C) + + poppler/JPEG2000Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6fa6d41d046e440165e899a84a38da2c1ec146ed +Author: Albert Astals Cid +Date: Sun Dec 10 23:44:42 2023 +0100 + + CI: Add android generic build + + .gitlab-ci.yml | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +commit cf9210568ebd45de13e2f225090df1c9bdfa8248 +Author: Albert Astals Cid +Date: Sun Dec 10 23:49:15 2023 +0100 + + Fix build on Android with generic font configuration + + poppler/GlobalParams.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3d870122d70c3b3327d93eb761eb14003cc745a7 +Author: Albert Astals Cid +Date: Sun Dec 10 22:40:58 2023 +0100 + + We require an openjpeg >= 2.1 + + poppler/JPEG2000Stream.cc | 15 --------------- + 1 file changed, 15 deletions(-) + +commit 4634bfdaeb46bb981413f247b1cfe82674a5f113 +Author: Albert Astals Cid +Date: Sat Dec 9 01:17:21 2023 +0100 + + CI: Fix build_clang16_libcpp + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6748cfc84ffef2bfa2328f1da7c70a99d93e0807 +Author: Albert Astals Cid +Date: Fri Dec 1 10:31:59 2023 +0100 + + poppler 23.12.0 + + CMakeLists.txt | 2 +- + NEWS | 5 +++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 9 insertions(+), 4 deletions(-) + +commit 84b359b82ee5b10ae714a0fbf3fda53f73e88722 +Author: Albert Astals Cid +Date: Thu Sep 28 00:27:54 2023 +0200 + + Rewrite FoFiType1::parse to be more flexible + + Previous code needed Encoding to be at the start of it's own line + + The file at issue #1422 doesn't have that and most of the other + renderers show it correctly so we should do the same. + + Also the code should be easier to understand now, and probably + faster since we're not copying string around like before + + fofi/FoFiType1.cc | 295 + ++++++++++++++++++++--------------------------------- + fofi/FoFiType1.h | 12 +-- + poppler/GfxFont.cc | 9 +- + 3 files changed, 120 insertions(+), 196 deletions(-) + +commit 0c53de52deb1328d4d45ab3dfc742acb6386a369 +Author: Albert Astals Cid +Date: Thu Nov 9 23:56:12 2023 +0100 + + Update (C) + + poppler/Object.h | 1 + + utils/pdfunite.cc | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 73c7458073429371ef3a9ed4f7edd6060d1f822d +Author: Oliver Sander +Date: Fri Nov 3 09:04:58 2023 +0100 + + Lexer: Allocate strings on the stack, not on the heap + + Makes the code easier to read, and possibly even a bit faster, too. + + poppler/Lexer.cc | 60 + +++++++++++++++++++++----------------------------------- + 1 file changed, 22 insertions(+), 38 deletions(-) + +commit 6d37f787abc05a658d342d42995c5df167c5e5b9 +Author: Oliver Sander +Date: Fri Nov 3 15:30:15 2023 +0100 + + Object: Add constructor from r-value std::string + + This can simplify the calling code when the string to use + is stack-allocated. + + Unfortunately, the new constructor has to do a heap allocation + internally, because Object stores a pointer to a string, + not a string value. + + With the new constructor, construction of Object objects from + std::initializer_list is now ambiguous. This leads to compiler + errors in a few places where {num, gen} is used to initialize + an Object with a Ref object. The patch replaces this construction + by Ref{num, gen}, which fixes the problem. + + poppler/Object.h | 5 +++++ + qt5/tests/check_optcontent.cpp | 4 ++-- + qt6/tests/check_optcontent.cpp | 4 ++-- + utils/pdfunite.cc | 8 ++++---- + 4 files changed, 13 insertions(+), 8 deletions(-) + +commit 975d6998b0ad979e81ea133be493bbf7be113fc7 +Author: Albert Astals Cid +Date: Wed Nov 1 22:47:06 2023 +0100 + + poppler 23.11.0 + + CMakeLists.txt | 4 ++-- + NEWS | 10 ++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 15 insertions(+), 5 deletions(-) + +commit 3caa03d36f78ddeac1a8571a2e789afdfb5f154d +Author: Albert Astals Cid +Date: Sun Oct 22 17:13:38 2023 +0200 + + Update (C) + + poppler/CairoOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 4e86f71b98c45bae7b2304eca630cf2ae24c216d +Author: Albert Astals Cid +Date: Sun Oct 22 17:11:01 2023 +0200 + + Simple GooString -> std::string change + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 4 ++-- + poppler/Form.cc | 2 +- + poppler/Form.h | 2 +- + poppler/Link.cc | 6 +++--- + poppler/Link.h | 4 ++-- + 6 files changed, 10 insertions(+), 10 deletions(-) + +commit 9e174595d0e891188275420cf045ddf423a1ecbc +Author: Albert Astals Cid +Date: Wed Oct 11 18:23:07 2023 +0200 + + Fix crash on broken files + + Bug #1441 + + poppler/CairoOutputDev.cc | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) + +commit f0adfa56e54480f6e41baa89eb6e9b931d6a8359 +Author: Anton Thomasson +Date: Sun Sep 24 21:47:16 2023 +0200 + + Use internal downscaling algorithm if image exceeds Cairo's maximum + dimensions. + + poppler/CairoOutputDev.cc | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) + +commit 4d45d3304a94bc70d5f8a74dcc30b24dc7e54a45 +Author: Albert Astals Cid +Date: Sun Oct 22 16:47:57 2023 +0200 + + Use RefRecursionChecker instead std::set + + Much simpler code + + poppler/Catalog.cc | 26 +++++++++----------------- + poppler/Catalog.h | 4 ++-- + 2 files changed, 11 insertions(+), 19 deletions(-) + +commit c45800a26a1c7c511cb088b2078c7beff3701f63 +Author: Albert Astals Cid +Date: Wed Oct 18 01:17:33 2023 +0200 + + Update (C) + + goo/GooString.cc | 2 +- + poppler/PDFDoc.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 611a0cc0f0a4a866a84dcbd4870d30a9b2566365 +Author: Oliver Sander +Date: Sun Oct 15 18:22:12 2023 +0200 + + Remove method GooString::hasJustUnicodeMarker + + Because it is used only once, and writing "== unicodeByteOrderMark" + instead is just as short and readable. + + goo/GooString.h | 3 +-- + poppler/PDFDoc.cc | 4 ++-- + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit 28e70bc0fafe1499b107d5965f1e8c7a59b4c4a5 +Author: Oliver Sander +Date: Sun Oct 15 20:54:16 2023 +0200 + + Move the method sanitizedName from GooString to PDFDoc + + Because it is only used by the PDFDoc class, and it does not seem + to be generic enough for a GooString method. + + Also, this patch modifies the method to return the string as a + std::string object by value, rather than as a pointer to a + heap-allocated GooString object. This saves one heap allocation. + + goo/GooString.cc | 17 ----------------- + goo/GooString.h | 5 ----- + poppler/PDFDoc.cc | 25 +++++++++++++++++++------ + poppler/PDFDoc.h | 5 +++++ + 4 files changed, 24 insertions(+), 28 deletions(-) + +commit c89b933f3bd235c6f95b420fdcfe5ca7df900c09 +Author: Albert Astals Cid +Date: Sat Oct 14 00:27:15 2023 +0200 + + Update (C) + + poppler/Annot.h | 2 +- + poppler/Gfx.cc | 2 +- + poppler/MarkedContentOutputDev.cc | 2 +- + poppler/MarkedContentOutputDev.h | 2 +- + poppler/OutputDev.h | 2 +- + poppler/Page.cc | 2 +- + poppler/Page.h | 2 +- + poppler/StructElement.cc | 2 +- + poppler/StructElement.h | 2 +- + poppler/UTF.cc | 2 +- + poppler/UTF.h | 2 +- + utils/pdftocairo.cc | 2 +- + 12 files changed, 12 insertions(+), 12 deletions(-) + +commit 760242166a8dacff674b2039ba27d823f0c27bac +Author: Adrian Johnson +Date: Thu Oct 12 22:21:33 2023 +0000 + + pdftocairo: EPS output should not contain %%PageOrientation + + utils/pdftocairo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b4052d02b44e8e412316a8dca1a99f9714e5aa8e +Author: Adrian Johnson +Date: Mon Oct 2 12:25:22 2023 +1030 + + cairo: write document logical structure if output is pdf + + Cairo 1.18 can create a tagged pdf. Add support to CairoOutputDev to + copy the logical structure from the input pdf if available. + + Added setLogicalStructure() to enable. + + Added -struct option to pdftocairo to enable. + + poppler/Annot.h | 2 +- + poppler/CairoOutputDev.cc | 472 + +++++++++++++++++++++++++++++++++++++- + poppler/CairoOutputDev.h | 50 ++++ + poppler/Gfx.cc | 4 +- + poppler/MarkedContentOutputDev.cc | 4 +- + poppler/MarkedContentOutputDev.h | 4 +- + poppler/OutputDev.h | 4 +- + poppler/Page.cc | 9 + + poppler/Page.h | 5 + + poppler/StructElement.cc | 9 + + poppler/StructElement.h | 5 +- + poppler/UTF.cc | 32 +++ + poppler/UTF.h | 5 + + utils/pdftocairo.1 | 4 + + utils/pdftocairo.cc | 46 +++- + 15 files changed, 635 insertions(+), 20 deletions(-) + +commit 48914b5d5fc12ae96d4f3ac3fc9c6fd08a1d6496 +Author: Albert Astals Cid +Date: Mon Oct 2 21:39:58 2023 +0200 + + poppler 23.10.0 + + CMakeLists.txt | 4 ++-- + NEWS | 10 ++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 15 insertions(+), 5 deletions(-) + +commit a678acd1224e40140980ec05b117e3fcded36246 +Author: Sune Vuorela +Date: Fri Sep 29 13:49:03 2023 +0200 + + Check if linker supports version scripts + + This is at least not fully supported on solaris. + + CMakeLists.txt | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +commit 6789f6fb2774940c2b60d71850826f0dad988167 +Author: Albert Astals Cid +Date: Thu Sep 28 00:57:00 2023 +0200 + + CI: Use fedora 39 + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0832cb20ebb224aed388ab3d6ff90e5e2cbe394e +Author: Albert Astals Cid +Date: Thu Sep 28 00:42:05 2023 +0200 + + CI: Use clang 16 + + .gitlab-ci.yml | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit c673208da4144429f2e43b4ad47c349ebda38691 +Author: Albert Astals Cid +Date: Wed Sep 27 19:09:02 2023 +0200 + + FoFiType1::parse: Also keep parsing if !gotMatrix + + We probably forgot to add it in + 876021b1aa16ad38767a91e1be31c392f368fde2 + + fofi/FoFiType1.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bbf225296bcb698713fda0d144e9d86ea2e28c55 +Author: Albert Astals Cid +Date: Tue Sep 26 22:55:30 2023 +0200 + + Use RefRecursionChecker in StructElement + + poppler/StructElement.cc | 11 +++++------ + poppler/StructElement.h | 8 ++++---- + poppler/StructTreeRoot.cc | 6 +++--- + 3 files changed, 12 insertions(+), 13 deletions(-) + +commit 1f8500587a5970879ddc282d0ae041991db6e6a6 +Author: Albert Astals Cid +Date: Mon Sep 25 17:34:12 2023 +0200 + + CI: Add android Qt6 CI + + .gitlab-ci.yml | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit a28fdcb8c7247d3b84363e0f5de82e493a50b185 +Author: Albert Astals Cid +Date: Mon Sep 25 18:37:13 2023 +0200 + + Update (C) + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d0440bf2b525dcb3372802a5b5b621a3e2d5be6e +Author: Albert Astals Cid +Date: Mon Sep 25 18:07:34 2023 +0200 + + Use zu for printf + size_t + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 991470945f8f09b4a675e45df1223110eac1a9d8 +Author: Adrian Johnson +Date: Mon Sep 25 10:27:10 2023 +0000 + + cairo: update type 3 fonts for cairo 1.18 api + + poppler/CairoFontEngine.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 60dc1dd072565f0999519ead607f2b4e93feb8b5 +Author: Albert Astals Cid +Date: Mon Sep 25 11:38:16 2023 +0200 + + CI: -DENABLE_GPGME=OFF for glib_docs + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8646a6aa2cb60644b56dc6e6e3b3af30ba920245 +Author: Albert Astals Cid +Date: Tue Aug 15 23:44:59 2023 +0200 + + Make a few more dependencies soft-mandatory + + they can be disabled via cmake option + + .gitlab-ci.yml | 16 +++++++---- + CMakeLists.txt | 86 + ++++++++++++++++++++++++++-------------------------------- + 2 files changed, 49 insertions(+), 53 deletions(-) + +commit 49cc0c4ccbc7776454cd5c7dd4136f52e3d545c8 +Author: Albert Astals Cid +Date: Wed Sep 20 22:25:35 2023 +0200 + + Update (C) + + poppler/Annot.cc | 2 +- + poppler/FontInfo.cc | 2 +- + poppler/FontInfo.h | 2 +- + poppler/Object.h | 2 +- + poppler/PageLabelInfo.cc | 2 +- + poppler/PageLabelInfo.h | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +commit e899dc75eb692f7496b9b4d683916c3626eadc02 +Author: Albert Astals Cid +Date: Wed Sep 20 22:20:55 2023 +0200 + + FontInfoScanner::scanFonts: Fix infinite recursion on broken files + + poppler/FontInfo.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 8ba682b1a5d53efe975849a260e78715da74263c +Author: Albert Astals Cid +Date: Wed Sep 20 22:20:13 2023 +0200 + + Introduce RefRecursionChecker + + poppler/Annot.cc | 17 +++-------------- + poppler/FontInfo.cc | 15 +++++---------- + poppler/FontInfo.h | 2 +- + poppler/Object.h | 22 ++++++++++++++++++++++ + poppler/PageLabelInfo.cc | 14 +++++--------- + poppler/PageLabelInfo.h | 2 +- + 6 files changed, 37 insertions(+), 35 deletions(-) + +commit 77573e1a706f861ca4677ea36dbdcc0a9fb50a99 +Author: Albert Astals Cid +Date: Wed Sep 20 00:32:15 2023 +0200 + + Fix DCTStream getting stuck in some broken files + + Fixes #1430 + + poppler/DCTStream.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit e6be3e11ada80291d5f9aa74dbe1604ff20c7cd1 +Author: Albert Astals Cid +Date: Mon Sep 18 23:41:53 2023 +0200 + + Update (C) + + poppler/XRef.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 6591a88c05285a7678dd8e7299d064f052096665 +Author: Albert Astals Cid +Date: Tue Sep 12 23:08:51 2023 +0200 + + PDFDoc::savePageAs: Use more unique_ptr + + poppler/PDFDoc.cc | 65 + ++++++++++++++++++++++--------------------------------- + 1 file changed, 26 insertions(+), 39 deletions(-) + +commit d37735a209da2b8b62e18afc7ab0f7db8a28f965 +Author: Even Rouault +Date: Fri Sep 8 17:36:29 2023 +0200 + + XRef::reserve(): fix use-after-free and integer overflow on large + XRref /Size + + This fixes two issues: + + - when using greallocn(), and the reallocation failed, the previous + 'entries' array was unexpectedly freed, causing later use-after-free + + ``` + $ (ulimit -v 1000000; valgrind ./utils/pdftoppm -png test.pdf) + Out of memory + ==1251090== Invalid read of size 4 + ==1251090== at 0x49F685B: Object::free() (poppler/Object.cc:115) + ==1251090== by 0x4A339BB: ~Object (poppler/Object.h:171) + ==1251090== by 0x4A339BB: XRef::resize(int) (poppler/XRef.cc:459) + ==1251090== by 0x4A32E20: XRef::constructXRef(bool*, bool) + (poppler/XRef.cc:877) + ==1251090== by 0x4A32CD4: XRef::XRef(BaseStream*, long + long, long long, bool*, bool, std::function const&) + (poppler/XRef.cc:318) + ==1251090== by 0x4A00531: PDFDoc::setup(std::optional + const&, std::optional const&, std::function + const&) (poppler/PDFDoc.cc:247) + ==1251090== by 0x4A002DB: PDFDoc::PDFDoc(std::unique_ptr >&&, std::optional const&, + std::optional const&, void*, std::function const&) + (poppler/PDFDoc.cc:161) + ==1251090== by 0x49F49EA: LocalPDFDocBuilder::buildPDFDoc(GooString + const&, std::optional const&, std::optional + const&, void*) (poppler/LocalPDFDocBuilder.cc:0) + ==1251090== by 0x4A1B1E5: PDFDocFactory::createPDFDoc(GooString + const&, std::optional const&, std::optional + const&, void*) (poppler/PDFDocFactory.cc:62) + ==1251090== by 0x4035CA: main (utils/pdftoppm.cc:503) + ==1251090== Address 0x6698648 is 24 bytes inside a block of size + 40,960 free'd + ==1251090== at 0x483CA3F: free (in + /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) + ==1251090== by 0x4927B1C: greallocn(void*, int, int, bool, bool) + (goo/gmem.h:0) + ==1251090== by 0x4A33A13: greallocn_checkoverflow (goo/gmem.h:185) + ==1251090== by 0x4A33A13: reserve (poppler/XRef.cc:430) + ==1251090== by 0x4A33A13: XRef::resize(int) (poppler/XRef.cc:446) + ==1251090== by 0x4A32CB5: XRef::XRef(BaseStream*, long + long, long long, bool*, bool, std::function const&) + (poppler/XRef.cc:317) + ==1251090== by 0x4A00531: PDFDoc::setup(std::optional + const&, std::optional const&, std::function + const&) (poppler/PDFDoc.cc:247) + ==1251090== by 0x4A002DB: PDFDoc::PDFDoc(std::unique_ptr >&&, std::optional const&, + std::optional const&, void*, std::function const&) + (poppler/PDFDoc.cc:161) + ==1251090== by 0x49F49EA: LocalPDFDocBuilder::buildPDFDoc(GooString + const&, std::optional const&, std::optional + const&, void*) (poppler/LocalPDFDocBuilder.cc:0) + ==1251090== by 0x4A1B1E5: PDFDocFactory::createPDFDoc(GooString + const&, std::optional const&, std::optional + const&, void*) (poppler/PDFDocFactory.cc:62) + ==1251090== by 0x4035CA: main (utils/pdftoppm.cc:503) + ==1251090== Block was alloc'd at + ==1251090== at 0x483B7F3: malloc (in + /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) + ==1251090== by 0x4927ACD: grealloc (goo/gmem.h:77) + ==1251090== by 0x4927ACD: greallocn(void*, int, int, bool, bool) + (goo/gmem.h:174) + ==1251090== by 0x4A33A13: greallocn_checkoverflow (goo/gmem.h:185) + ==1251090== by 0x4A33A13: reserve (poppler/XRef.cc:430) + ==1251090== by 0x4A33A13: XRef::resize(int) (poppler/XRef.cc:446) + ==1251090== by 0x4A3344E: XRef::constructXRef(bool*, bool) + (poppler/XRef.cc:979) + ==1251090== by 0x4A32BF9: XRef::XRef(BaseStream*, long + long, long long, bool*, bool, std::function const&) + (poppler/XRef.cc:304) + ==1251090== by 0x4A00531: PDFDoc::setup(std::optional + const&, std::optional const&, std::function + const&) (poppler/PDFDoc.cc:247) + ==1251090== by 0x4A002DB: PDFDoc::PDFDoc(std::unique_ptr >&&, std::optional const&, + std::optional const&, void*, std::function const&) + (poppler/PDFDoc.cc:161) + ==1251090== by 0x49F49EA: LocalPDFDocBuilder::buildPDFDoc(GooString + const&, std::optional const&, std::optional + const&, void*) (poppler/LocalPDFDocBuilder.cc:0) + ==1251090== by 0x4A1B1E5: PDFDocFactory::createPDFDoc(GooString + const&, std::optional const&, std::optional + const&, void*) (poppler/PDFDocFactory.cc:62) + ==1251090== by 0x4035CA: main (utils/pdftoppm.cc:503) + ``` + + - the logic to exponentially resize the capacity of the array was + relying on undefined behaviour of overflow of int. Change that to + explictely test the value of the capacity before multiplying by 2. + + poppler/XRef.cc | 26 +++++++++++++++++++------- + 1 file changed, 19 insertions(+), 7 deletions(-) + +commit c44c25ea36a0bf33b6ba46d16ab922dcc13f591e +Author: Albert Astals Cid +Date: Mon Sep 11 23:37:06 2023 +0200 + + PDFDoc::savePageAs: Return cleanly if page is not a dict + + poppler/PDFDoc.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 1223c1eb42c62d1587d929b8c72ad8513f0e4b7d +Author: Albert Astals Cid +Date: Tue Sep 12 22:45:48 2023 +0200 + + CI: unbreak mingw + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cc2fd7c39f1fddd233336099c031bff6bc0d9828 +Author: Sune Vuorela +Date: Thu Sep 7 16:06:40 2023 +0200 + + More supported gnupg releases + + The upcoming 2.2.42 version will have the bugfixes backported for pdf + signatures to work. + + poppler/GPGMECryptoSignBackend.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 3f2e643c4e1c4295c7521681216a90bb02518748 +Author: Albert Astals Cid +Date: Wed Sep 6 22:15:18 2023 +0200 + + FormField::getFullyQualifiedName: Fix infinite loop on malformed files + + poppler/Form.cc | 52 +++++++++++++++++++++++++++++----------------------- + 1 file changed, 29 insertions(+), 23 deletions(-) + +commit d253013a0ce0dd0cf79070dd718377b3b3afc7ce +Author: Albert Astals Cid +Date: Wed Sep 6 21:54:30 2023 +0200 + + Update (C) + + utils/pdfsig.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ba2441bcbf0b4a7b2aaa080ce3a9a1d04d80e64 +Author: Oliver Sander +Date: Sat Jun 17 09:26:15 2023 +0200 + + Let method utf8ToUtf16WithBom return a std::string object + + Rather than a std::unique_ptr to a GooString. This avoids a heap + allocation. + + glib/poppler-document.cc | 4 ++-- + poppler/Lexer.cc | 5 +++-- + poppler/UTF.cc | 10 +++++----- + poppler/UTF.h | 9 ++++++--- + qt5/tests/check_utf_conversion.cpp | 4 ++-- + qt6/tests/check_utf_conversion.cpp | 4 ++-- + utils/pdfattach.cc | 10 +++++----- + utils/pdfsig.cc | 4 ++-- + 8 files changed, 27 insertions(+), 23 deletions(-) + +commit 6e2c0fe0434cfadc3d161e7cd348212f644b725e +Author: Albert Astals Cid +Date: Tue Sep 5 23:15:14 2023 +0200 + + poppler 23.09.0 + + CMakeLists.txt | 4 ++-- + NEWS | 20 ++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/CMakeLists.txt | 2 +- + qt6/src/Doxyfile | 2 +- + 7 files changed, 27 insertions(+), 7 deletions(-) + +commit 73985c62006b7faa0fd46a1bc83e578809da7ae2 +Author: Albert Astals Cid +Date: Tue Sep 5 20:21:55 2023 +0200 + + Update (C) + + qt5/src/poppler-ps-converter.cc | 1 + + qt5/src/poppler-qt5.h | 1 + + qt6/src/poppler-ps-converter.cc | 1 + + qt6/src/poppler-qt6.h | 1 + + 4 files changed, 4 insertions(+) + +commit 309cee09f2f199dd70d066fad63a9b730881d151 +Author: Albert Astals Cid +Date: Tue Sep 5 09:49:31 2023 +0200 + + CI: Use non deprecated variable + + Hopefully this fixes the problem with wrong caches being picked up + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 00b7f3471ec8d9e40d8f713b30cd8378fe7cf06f +Author: Albert Astals Cid +Date: Tue Sep 5 00:47:52 2023 +0200 + + PDFDoc::savePageAs: Return cleanly if Catalog Pages is not a dict + + poppler/PDFDoc.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 27acee72fd3da6ce3d2027f7758d22b98022ccd4 +Author: Kevin Ottens +Date: Wed Aug 30 15:56:06 2023 +0200 + + Allow to force a rasterized overprint preview during PS conversion + + qt5/src/poppler-ps-converter.cc | 14 ++++++++++++++ + qt5/src/poppler-qt5.h | 13 ++++++++++++- + qt6/src/poppler-ps-converter.cc | 14 ++++++++++++++ + qt6/src/poppler-qt6.h | 13 ++++++++++++- + 4 files changed, 52 insertions(+), 2 deletions(-) + +commit 785a87baa33059d6293c8764e863b1bd7f9ffaf9 +Author: Albert Astals Cid +Date: Tue Sep 5 00:09:42 2023 +0200 + + Update (C) + + goo/GooString.cc | 1 + + poppler/Lexer.cc | 1 + + poppler/NameToUnicodeTable.h | 2 +- + 3 files changed, 3 insertions(+), 1 deletion(-) + +commit e121f3d29f2bdbf44d9e4d67729c1423dbc1db82 +Author: Even Rouault +Date: Wed Aug 30 22:42:05 2023 +0200 + + GooString::appendfv(): emit warning on strings > 2 GB + + goo/GooString.cc | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit b8dc27ac07dfea0141211124944b835c35c0d626 +Author: Even Rouault +Date: Mon Aug 28 10:50:04 2023 +0200 + + GooString::appendfv(): avoid int overflow on strings > 2 GB + + goo/GooString.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4202ea8077e16ef62d4955086e80e4347e3f61c4 +Author: Even Rouault +Date: Mon Aug 28 10:45:04 2023 +0200 + + Lexer: limit max name token length to 1 MB. + + Currently there is no hard limit to the maximum length of a name, + which + may cause the ``n`` variable to overflow INT_MAX (mostly unnoticed + unless building with -ftrapv), but later when drawing a page + using such + invalid huge name, ``len = strlen(str)`` at line 417 of GooString.cc, + invoked by ``error(errSyntaxError, -1, "XObject '{0:s}' is unknown", + name)`` in Gfx.cc::334, overflows to a negative value, which causes an + invalid length exception in ``append(str, len)`` at GooString.cc:445 + + Thus we limit the maximum length of a name to 1 MB which is way beyond + what the spec allows. + + poppler/Lexer.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 38692ffde1dd8f1321f10ed3d962283cd96662e0 +Author: Vincent Lefevre +Date: Wed Aug 30 14:17:07 2023 +0200 + + Add ToUnicode support for similarequal + + For \simeq, TeX generates /similarequal instead of Adobe's + /asymptoticallyequal; so similarequal needs to be supported too. + + In TeX Live 2023: + texmf-dist/fonts/map/glyphlist/glyphlist.txt (Adobe Glyph List) + contains + asymptoticallyequal;2243 + but texmf-dist/fonts/map/glyphlist/texglyphlist.txt (Extensions to the + Adobe Glyph List for TeX fonts and encodings) contains + similarequal;2243 + As a consequence, texmf-dist/tex/generic/pdftex/glyphtounicode.tex + contains both + \pdfglyphtounicode{asymptoticallyequal}{2243} + \pdfglyphtounicode{similarequal}{2243} + + NameToUnicodeTable.h already has + { 0x2243, "asymptoticallyequal" } + so one just needs to add the missing + { 0x2243, "similarequal" } + + poppler/NameToUnicodeTable.h | 1 + + 1 file changed, 1 insertion(+) + +commit 67bd938e9c6b75bd34e0231fd50b567b118e69af +Author: Albert Astals Cid +Date: Wed Aug 30 11:11:45 2023 +0200 + + Add (C) + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3fd5a6f4dfc5c6388d896ac72ffa9584c753ef22 +Author: Sune Vuorela +Date: Thu Aug 10 16:36:03 2023 +0200 + + Fix digital signatures for NeedAppearance=true + + Always write out the appearance streams for signatures. Several pdf + readers can't create it + - firefox pdf viewer + - ghostscript + - ourselves + Also, annotations without appearance streams are deprecated in pdf2.0. + + Also, if appearance streams exists for a digital signature, don't + regenerate it, as that results is an empty visual representation, + and it + might also fiddle with the signature valudation + + It is not completely clear from the standard if this is 100% + conforming + behavior, but NeedAppearance should be set to true if some annotatinos + are without appearance streams; it is not really described what should + happen if NeedAppearances is true and some annotations are with + appearance streams. + + poppler/Annot.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 2368e099c9cd36d8156a2d188d6cab1883410ff7 +Author: Albert Astals Cid +Date: Wed Aug 23 16:32:08 2023 +0200 + + Update (C) + + poppler/GlobalParams.cc | 1 + + poppler/GlobalParams.h | 1 + + qt5/src/poppler-private.cc | 1 + + qt6/src/poppler-private.cc | 1 + + 4 files changed, 4 insertions(+) + +commit bdaa042978b0bd3e6bcbc1879263597837336715 +Author: Shivodit Gill +Date: Wed Aug 23 12:34:09 2023 +0000 + + Add Android-specific font matching functionality to Poppler + + CMakeLists.txt | 16 +++-- + config.h.cmake | 3 + + poppler/GlobalParams.cc | 161 + ++++++++++++++++++++++++++++++++++++++++++++- + poppler/GlobalParams.h | 4 +- + qt5/src/Mainpage.dox | 19 ++++++ + qt5/src/poppler-private.cc | 33 +++++++++- + qt6/src/Mainpage.dox | 20 ++++++ + qt6/src/poppler-private.cc | 32 +++++++++ + 8 files changed, 281 insertions(+), 7 deletions(-) + +commit 7da36fe953d67c9a14a42bfda28d44cd3bf1880c +Author: Albert Astals Cid +Date: Wed Aug 9 18:59:48 2023 +0200 + + Revert "CI: fedora mingw qt6 is borked again :/" + + This reverts commit 9f1885168bd380583390a805b580af1604a3990b. + + .gitlab-ci.yml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 7dedced88e354625ef3f4dc09c9732a4d91cf5d7 +Author: Sune Vuorela +Date: Wed Aug 2 22:39:27 2023 +0000 + + Provide the key location for certificates you can sign with + + poppler/CertificateInfo.cc | 11 ++++++++++- + poppler/CertificateInfo.h | 19 +++++++++++++++++++ + poppler/GPGMECryptoSignBackend.cc | 7 +++++++ + qt5/src/poppler-form.cc | 23 +++++++++++++++++++++++ + qt5/src/poppler-form.h | 25 +++++++++++++++++++++++++ + qt6/src/poppler-form.cc | 23 +++++++++++++++++++++++ + qt6/src/poppler-form.h | 25 +++++++++++++++++++++++++ + utils/pdfsig.cc | 18 +++++++++++++++++- + 8 files changed, 149 insertions(+), 2 deletions(-) + +commit 1f1823045d71cc2f00ef43320cd181adf68a9d9f +Author: Sune Vuorela +Date: Tue Jul 18 10:07:50 2023 +0200 + + Don't look up same glyph multiple times + + When iterating over the unicode codepoints, no need to check + the fonts + if they still contains the same glyph as we already checked. + + poppler/Form.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 6e96ac9d2f5003e27bb2772ea71d76f0d2c30ebe +Author: Albert Astals Cid +Date: Tue Aug 1 23:51:42 2023 +0200 + + poppler 23.08.0 + + CMakeLists.txt | 2 +- + NEWS | 16 ++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 6 files changed, 21 insertions(+), 5 deletions(-) + +commit 9f1885168bd380583390a805b580af1604a3990b +Author: Albert Astals Cid +Date: Tue Aug 1 20:14:39 2023 +0200 + + CI: fedora mingw qt6 is borked again :/ + + .gitlab-ci.yml | 12 ------------ + 1 file changed, 12 deletions(-) + +commit 9c98812e8c68401c201719ce0c7a5ea67cd00f5d +Author: Marek Kasik +Date: Thu Jul 27 17:03:41 2023 +0200 + + glib: Add new members to PopplerCertificateInfo + + These new members of the structure can be used to show more detailed + info about + who signed the document and more info about issuer of the certificate. + + Add PopplerCertificateInfo to PopplerSignatureInfo to be able + to get certificate info of the signature. + + glib/poppler-form-field.cc | 214 + ++++++++++++++++++++++++++++++++++-- + glib/poppler-form-field.h | 18 ++- + glib/reference/poppler-sections.txt | 10 ++ + glib/reference/poppler.types | 1 + + 4 files changed, 230 insertions(+), 13 deletions(-) + +commit eb3adcd80ec3ac2d7e2c5e56aec49f9e8aab0ba2 +Author: Albert Astals Cid +Date: Sun Jul 23 16:11:33 2023 +0200 + + Update (C) + + poppler/Catalog.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d8d63630427ca39da995e148fc1a80010c1804f9 +Author: Ilaï Deutel +Date: Wed Jul 19 19:07:54 2023 -0400 + + Fix float-cast-overflow error in Catalog + + This error was triggered when running the page_label_fuzzer using + https://github.com/mozilla/pdf.js/blob/master/test/pdfs/poppler-67295-0.pdf + as an input. + + The fix avoids extraneous casts in Catalog.cc: + + - Before: + - int -> double -> int + - long long -> double -> int + - double -> int + - After: + - int (no cast) + - long long -> int + - double -> int + + poppler/Catalog.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 0e57662f92847931e3a2ed6cee32f552b996a100 +Author: Sune Vuorela +Date: Thu Jul 6 12:06:36 2023 +0200 + + Mark pdf file argument as required; make documentation match code + + utils/pdftotext.1 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 823de0858dff673f4ecdbad3386a702b5e0ec3b8 +Author: Sune Vuorela +Date: Thu Jul 6 09:07:28 2023 +0200 + + Version symbols in poppler core + + This prevents crashes and collisions in the case where two poppler + core + libraries are in the same process. + + The likely case is if an application is linked to both poppler core + and a stable frontend, and poppler is updated and the application + is not yet recompiled against the newer poppler core, then the newer + frontend pulls in newer poppler core while the application pulls + in the + older poppler core and that leads to crashes. In general, this can be + fixed by versioning the symbols to prevent mix and match of symbols. + + Patch by Andreas Metzler + + CMakeLists.txt | 17 +++++++++++++++-- + poppler/libpoppler.map.in | 4 ++++ + 2 files changed, 19 insertions(+), 2 deletions(-) + +commit fb198157f32f15e17595730ab82d03d81cdb8010 +Author: Albert Astals Cid +Date: Sun Jul 16 16:31:15 2023 +0200 + + Update (C) + + poppler/XRef.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 22c68e52fd8f761cd1b3f38253fcae00055b02f9 +Author: Ilaï Deutel +Date: Thu Jul 13 14:03:56 2023 -0400 + + Fix use-of-uninitialized-value in XRef + + Attribute `keyLength` of `XRef` is not initialized on object + creation, and is subsequently used, for instance in `XRef::fetch` + ([poppler/XRef.cc:1214](https://gitlab.freedesktop.org/poppler/poppler/-/blob/e0148dbc9a0189d1ee982a1b3e763930e086b919/poppler/XRef.cc#L1214)). + This was flagged by running `MemorySanitizer`. + + poppler/XRef.cc | 1 + + 1 file changed, 1 insertion(+) + +commit e0148dbc9a0189d1ee982a1b3e763930e086b919 +Author: Thomas Freitag +Date: Wed Jul 12 14:42:25 2023 +0000 + + avoid bogus memory allocation size in doTilingPatternFill + + poppler/SplashOutputDev.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 4ff8402775aeae27cecb9b372eda7909a3524b20 +Author: Albert Astals Cid +Date: Mon Jul 10 20:53:31 2023 +0200 + + Update (C) + + poppler/GfxState.cc | 2 +- + poppler/SplashOutputDev.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 5726aff3cd2b5a2f84200d75ff8b875f8827c6c5 +Author: Thomas Freitag +Date: Mon Jul 10 09:08:01 2023 +0000 + + GWG 19.2 - DeviceN Overprint (White): + + poppler/GfxState.cc | 2 +- + poppler/SplashOutputDev.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ee2af17e916e6310ab25b92a638df380b18a24ee +Author: Sune Vuorela +Date: Wed Jul 5 17:30:46 2023 +0200 + + Remove unused constructor parameter + + poppler/GPGMECryptoSignBackend.cc | 6 +++--- + poppler/GPGMECryptoSignBackend.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit e54d8611d979f0034f81f1c51c2dfcd14200038d +Author: Jan-Michael Brummer +Date: Tue Jul 4 10:53:15 2023 +0200 + + Improve poppler_get_available_signing_certificates + + Remove #ifdef and error handling + + Fixes: https://gitlab.freedesktop.org/poppler/poppler/-/issues/1412 + + glib/poppler-form-field.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 639efb3d3b08fb10fb84976cb6db98ea929e9486 +Author: Albert Astals Cid +Date: Mon Jul 3 23:05:08 2023 +0200 + + poppler 23.07.0 + + CMakeLists.txt | 4 ++-- + NEWS | 26 ++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 4 ++-- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 6 files changed, 33 insertions(+), 7 deletions(-) + +commit 1b1036cf4ef1bfd70f300da3534375d02195fe32 +Author: Albert Astals Cid +Date: Mon Jul 3 21:05:14 2023 +0200 + + Update (C) + + poppler/Gfx.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c40bec5715075c12e7158639c638baa95bfcf2e8 +Author: Anton Thomasson +Date: Mon Jun 19 22:04:38 2023 +0200 + + Don't abort command when restore runs in to a state guard + + Fixes #1395 + + poppler/Gfx.cc | 1 - + 1 file changed, 1 deletion(-) + +commit c46203cb5a9c57ba039658d305d6ed8e450d51e8 +Author: Albert Astals Cid +Date: Mon Jul 3 15:25:27 2023 +0200 + + Add a few new NSS enums to ConvertHashTypeFromNss + + poppler/NSSCryptoSignBackend.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit ed7a7887050dd0095ebca2ec7b511f3131242efa +Author: Sune Vuorela +Date: Mon Jul 3 12:40:56 2023 +0200 + + MSVC still unhappy with unicode bits in unicode test + + qt5/tests/check_utf8document.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit badfea70ce6d81ce7c9ce0a671c80f53d92a4b83 +Author: Sune Vuorela +Date: Fri Jun 30 15:04:42 2023 +0200 + + MSVC unhappy with utf8 in QStringLiteral + + qt5/tests/check_utf8document.cpp | 10 +++++----- + qt6/tests/check_utf8document.cpp | 10 +++++----- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit fac65b3c791b6a1bb3fa83d122b9fce9a6a93ee7 +Author: Jan-Michael Brummer +Date: Fri Jun 30 11:50:29 2023 +0200 + + Remove g_auto functions + + glib/demo/signature.c | 9 ++++++--- + glib/poppler-document.cc | 3 ++- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit fa28ba42105b04aef25968e1a31eefeec2c48f4e +Author: Albert Astals Cid +Date: Fri Jun 30 00:03:28 2023 +0200 + + Update (C) + + poppler/GlobalParams.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b4f802c88e0642f0f1271cb4a23cd279e699f38d +Author: Sune Vuorela +Date: Wed Jun 28 15:49:24 2023 +0200 + + Improve message on invalid cid font collection + + Hopefully fixes #1408 + + poppler/GlobalParams.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bdd922b7caaa965828e0e45a6cde0b1585c9740e +Author: Jan-Michael Brummer +Date: Wed Oct 5 08:20:13 2022 +0200 + + Signatures: Add signing API to glib part + + Rectangle corrections by Marek Kasik + + glib/CMakeLists.txt | 6 + + glib/demo/CMakeLists.txt | 1 + + glib/demo/main.c | 4 +- + glib/demo/signature.c | 437 ++++++++++++++ + glib/demo/signature.h | 31 + + glib/poppler-document.cc | 98 ++++ + glib/poppler-document.h | 5 + + glib/poppler-form-field.cc | 1088 + +++++++++++++++++++++++++++++++++++ + glib/poppler-form-field.h | 114 ++++ + glib/poppler.h | 5 +- + glib/reference/poppler-sections.txt | 51 ++ + glib/reference/poppler.types | 2 + + 12 files changed, 1840 insertions(+), 2 deletions(-) + +commit d1e86894cbb617c64b84fe18cae7294b1cb45eed +Author: Albert Astals Cid +Date: Thu Jun 29 00:35:56 2023 +0200 + + Update (C) + + qt5/src/poppler-page.cc | 1 + + qt6/src/poppler-page.cc | 1 + + 2 files changed, 2 insertions(+) + +commit d9d1550a3e337e041cf2801dfcb0366fcb5b16d0 +Author: Albert Astals Cid +Date: Wed Jun 28 00:47:14 2023 +0200 + + Update (C) + + poppler/PDFDoc.cc | 2 +- + poppler/PSOutputDev.cc | 1 + + poppler/PSOutputDev.h | 1 + + poppler/XRef.cc | 1 + + poppler/XRef.h | 1 + + 5 files changed, 5 insertions(+), 1 deletion(-) + +commit 7d87c7d2c6ca4f814f87329534a17dbf30203313 +Author: Sune Vuorela +Date: Tue Jun 27 22:11:29 2023 +0000 + + Allow for stream compression and compress font streams in forms + + CMakeLists.txt | 21 ++++----------------- + config.h.cmake | 3 --- + poppler/Form.cc | 6 +++--- + poppler/PDFDoc.cc | 28 ++++++++++++++++++---------- + poppler/PSOutputDev.cc | 29 ++++++----------------------- + poppler/PSOutputDev.h | 11 +---------- + poppler/XRef.cc | 13 ++++++++++--- + poppler/XRef.h | 11 +++++++++-- + poppler/poppler-config.h.cmake | 5 ----- + 9 files changed, 51 insertions(+), 76 deletions(-) + +commit 2c403ec533ad9ad821c37e3f80f8f361ce9cdea8 +Author: Albert Astals Cid +Date: Mon Jun 26 00:51:22 2023 +0200 + + Fix crash if CERT_ExtractPublicKey doesn't return a public key + + Fixes KDE Bug #471422 + + poppler/NSSCryptoSignBackend.cc | 40 + ++++++++++++++++++++++------------------ + 1 file changed, 22 insertions(+), 18 deletions(-) + +commit 6ebe45e8dceae11d02c74df47c34f4490a45a15e +Author: Kevin Ottens +Date: Wed Jun 21 15:10:48 2023 +0200 + + Don't crash when overprint preview is enabled with the Qt bindings + + When overprint preview is enabled, the image data row size changes + during conversion to XBGR. The Qt bindings were assuming this row + size was constant which led to badly broken QImages at conversion + time (generating garbage if displayed or even crashing). + + This commit simply add regression tests for the case and gets the + row size after bitmap conversion. + + qt5/src/poppler-page.cc | 8 ++++---- + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/check_overprint.cpp | 41 + +++++++++++++++++++++++++++++++++++++++++ + qt6/src/poppler-page.cc | 8 ++++---- + qt6/tests/CMakeLists.txt | 1 + + qt6/tests/check_overprint.cpp | 38 ++++++++++++++++++++++++++++++++++++++ + 6 files changed, 89 insertions(+), 8 deletions(-) + +commit f0d648c3f0cb69121d0115d468401d58255ad0cf +Author: Albert Astals Cid +Date: Fri Jun 16 11:36:53 2023 +0200 + + Update (C) + + poppler/UTF.cc | 1 + + poppler/UTF.h | 1 + + 2 files changed, 2 insertions(+) + +commit 7b199526e6f7bb5a28e8ddd017e23ae51b85b9f6 +Author: Sune Vuorela +Date: Wed Jun 14 16:13:23 2023 +0200 + + Cryptosign: OCSP and AIA: Document + + Document how the backends interacts with the OCSP and AIA flags, + and ensure the implementation matches. + + poppler/GPGMECryptoSignBackend.cc | 2 +- + qt5/src/poppler-form.h | 12 ++++++++++++ + qt6/src/poppler-form.h | 12 ++++++++++++ + 3 files changed, 25 insertions(+), 1 deletion(-) + +commit b8c55037fcfc0d3910cad5a4e65b3161bd5ea585 +Author: Oliver Sander +Date: Wed Jun 14 14:11:52 2023 +0200 + + Store PSOutPaperSize objects by value + + This simplifies the code, and saves a few heap allocations. + + poppler/PSOutputDev.cc | 35 ++++++++--------------------------- + poppler/PSOutputDev.h | 14 ++++++++++++-- + 2 files changed, 20 insertions(+), 29 deletions(-) + +commit b2ae26814909047b27f30cffaed225b5bb9f96e9 +Author: Oliver Sander +Date: Wed Jun 14 13:23:54 2023 +0200 + + Store PSOutPaperSize::name as std::string + + Rather than as a pointer to a GooString + + Safer and simpler code, and less memory allocations. + + poppler/PSOutputDev.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 9306058027b24b926e98da9651df9d56e5f744b0 +Author: Oliver Sander +Date: Wed Jun 14 11:16:13 2023 +0200 + + Store the paperSizes vector of PSOutputDev as object + + Rather than storing a pointer and allocating the std::vector + on the heap. + + This simplifies the code and saves a few heap allocations. + + poppler/PSOutputDev.cc | 28 +++++++++++----------------- + poppler/PSOutputDev.h | 4 ++-- + 2 files changed, 13 insertions(+), 19 deletions(-) + +commit e885124ab3b071b7fbb2f001e4a9a88b7e758605 +Author: Even Rouault +Date: Thu Jun 15 20:25:24 2023 +0200 + + utf8ToUtf16(): fix out-of-bounds write + + Fixes a regression introduced by recent + 9183da4fcb8d06360ed51f7f1131a14300008735 commit which caused the + following Valgrind error: + + ``` + $ valgrind utils/pdftoppm /tmp/test.pdf + ==3735668== Memcheck, a memory error detector + ==3735668== Copyright (C) 2002-2017, and GNU GPL'd, by Julian Seward + et al. + ==3735668== Using Valgrind-3.15.0 and LibVEX; rerun with -h for + copyright info + ==3735668== Command: utils/pdftoppm /tmp/test.pdf + ==3735668== + Syntax Warning: May not be a PDF file (continuing anyway) + Syntax Error: Unterminated string + ==3735668== Invalid write of size 2 + ==3735668== at 0x4A3570C: utf8ToUtf16(char const*, unsigned short*, + int, int) (poppler/UTF.cc:353) + ==3735668== by 0x4A3584C: utf8ToUtf16(char const*, int*) + (poppler/UTF.cc:368) + ==3735668== by 0x4A358D4: + utf8ToUtf16WithBom(std::__cxx11::basic_string, std::allocator > const&) + (poppler/UTF.cc:379) + ==3735668== by 0x49F2C97: Lexer::getObj(int) (poppler/Lexer.cc:424) + ==3735668== by 0x4A035C2: Parser::Parser(XRef*, Stream*, bool) + (poppler/Parser.cc:50) + ==3735668== by 0x49F888B: Linearization::Linearization(BaseStream*) + (poppler/Linearization.cc:28) + ==3735668== by 0x4A06D8D: getLinearization (poppler/PDFDoc.cc:648) + ==3735668== by 0x4A06D8D: PDFDoc::isLinearized(bool) + (poppler/PDFDoc.cc:700) + ==3735668== by 0x4A0518D: PDFDoc::getStartXRef(bool) + (poppler/PDFDoc.cc:2003) + ==3735668== by 0x4A04BB8: PDFDoc::setup(std::optional + const&, std::optional const&, std::function + const&) (poppler/PDFDoc.cc:246) + ==3735668== by 0x4A04AAB: PDFDoc::PDFDoc(std::unique_ptr >&&, std::optional const&, + std::optional const&, void*, std::function const&) + (poppler/PDFDoc.cc:160) + ==3735668== by 0x49F93EA: LocalPDFDocBuilder::buildPDFDoc(GooString + const&, std::optional const&, std::optional + const&, void*) (poppler/LocalPDFDocBuilder.cc:0) + ==3735668== by 0x4A1FBB5: PDFDocFactory::createPDFDoc(GooString + const&, std::optional const&, std::optional + const&, void*) (poppler/PDFDocFactory.cc:62) + ==3735668== Address 0x669cf54 is 0 bytes after a block of size + 148 alloc'd + ==3735668== at 0x483B7F3: malloc (in + /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) + ==3735668== by 0x4A35815: gmalloc (goo/gmem.h:44) + ==3735668== by 0x4A35815: gmallocn (goo/gmem.h:121) + ==3735668== by 0x4A35815: utf8ToUtf16(char const*, int*) + (poppler/UTF.cc:367) + ==3735668== by 0x4A358D4: + utf8ToUtf16WithBom(std::__cxx11::basic_string, std::allocator > const&) + (poppler/UTF.cc:379) + ==3735668== by 0x49F2C97: Lexer::getObj(int) (poppler/Lexer.cc:424) + ==3735668== by 0x4A035C2: Parser::Parser(XRef*, Stream*, bool) + (poppler/Parser.cc:50) + ==3735668== by 0x49F888B: Linearization::Linearization(BaseStream*) + (poppler/Linearization.cc:28) + ==3735668== by 0x4A06D8D: getLinearization (poppler/PDFDoc.cc:648) + ==3735668== by 0x4A06D8D: PDFDoc::isLinearized(bool) + (poppler/PDFDoc.cc:700) + ==3735668== by 0x4A0518D: PDFDoc::getStartXRef(bool) + (poppler/PDFDoc.cc:2003) + ==3735668== by 0x4A04BB8: PDFDoc::setup(std::optional + const&, std::optional const&, std::function + const&) (poppler/PDFDoc.cc:246) + ==3735668== by 0x4A04AAB: PDFDoc::PDFDoc(std::unique_ptr >&&, std::optional const&, + std::optional const&, void*, std::function const&) + (poppler/PDFDoc.cc:160) + ==3735668== by 0x49F93EA: LocalPDFDocBuilder::buildPDFDoc(GooString + const&, std::optional const&, std::optional + const&, void*) (poppler/LocalPDFDocBuilder.cc:0) + ==3735668== by 0x4A1FBB5: PDFDocFactory::createPDFDoc(GooString + const&, std::optional const&, std::optional + const&, void*) (poppler/PDFDocFactory.cc:62) + ``` + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=59840 + + poppler/UTF.cc | 2 +- + poppler/UTF.h | 2 +- + qt5/tests/check_utf_conversion.cpp | 2 +- + qt6/tests/check_utf_conversion.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit cd99989705824202d157c33d48c998e9818ea2f3 +Author: Sune Vuorela +Date: Mon Jun 12 14:19:18 2023 +0200 + + Revert "Remove poppler mingw CI until it's fixed again" + + This reverts commit 2dcbf58328e5acaafaa73dc2e601e5737c685789. + + .gitlab-ci.yml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 8eea66b804c2651be4d91eed4b0992cc0c6f3e47 +Author: Albert Astals Cid +Date: Wed Jun 14 22:13:17 2023 +0200 + + PSOutputDev::writePSFmt is GOOSTRING_FORMAT + + poppler/PSOutputDev.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 79ba5720ea8067b43d79c5dc100116cee75ccdbe +Author: Oliver Sander +Date: Wed Jun 14 11:08:42 2023 +0200 + + Remove method Hints::getPageRanges + + It is not used. + + poppler/Hints.cc | 41 ----------------------------------------- + poppler/Hints.h | 1 - + 2 files changed, 42 deletions(-) + +commit 222982849168a8aa0a78cb2a4fa2b903f2f74146 +Author: Albert Astals Cid +Date: Wed Jun 14 00:33:00 2023 +0200 + + Update (C) + + poppler/Lexer.cc | 1 + + poppler/UTF.cc | 1 + + poppler/UTF.h | 1 + + 3 files changed, 3 insertions(+) + +commit 9183da4fcb8d06360ed51f7f1131a14300008735 +Author: Sune Vuorela +Date: Tue Jun 13 22:24:24 2023 +0000 + + Fix reading of utf8-with-bom files + + poppler/Lexer.cc | 27 ++++++++++++------- + poppler/UTF.cc | 3 +++ + poppler/UTF.h | 11 ++++++++ + qt5/tests/CMakeLists.txt | 3 ++- + qt5/tests/check_utf8document.cpp | 57 + ++++++++++++++++++++++++++++++++++++++++ + qt6/tests/CMakeLists.txt | 1 + + qt6/tests/check_utf8document.cpp | 57 + ++++++++++++++++++++++++++++++++++++++++ + 7 files changed, 148 insertions(+), 11 deletions(-) + +commit 7cf6cd7b9a0fc496738c245421eea54ec669448d +Author: Sune Vuorela +Date: Mon Jun 12 12:22:13 2023 +0200 + + Describe signature dump format in manual page + + fixes #215 + + utils/pdfsig.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 19679f2873369117204c3e555967a5c9ed9187d6 +Author: Sune Vuorela +Date: Fri Jun 9 16:30:47 2023 +0200 + + Fix build without NSS + + Happened as a mismerge during !1394 + + utils/pdfsig.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f67c0187430b04b8f575686357a1669142e2949e +Author: Sune Vuorela +Date: Fri Jun 9 16:27:37 2023 +0200 + + Fix 32bit build. + + Resolves !1402. + Thanks, Thomas + + poppler/GPGMECryptoSignBackend.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 8d4764b498d4f9798e9aaedbce5e442d382acb0a +Author: Sune Vuorela +Date: Tue Jun 6 16:02:25 2023 +0000 + + pdfsig: Allow show and select backend + + utils/CMakeLists.txt | 6 ++++-- + utils/pdfsig.1 | 8 +++++++- + utils/pdfsig.cc | 52 + +++++++++++++++++++++++++++++++++++++++++++++++++--- + 3 files changed, 60 insertions(+), 6 deletions(-) + +commit def45c82b36ec393fbaf16d9873db23bc9659b80 +Author: Sune Vuorela +Date: Mon Jun 5 12:36:44 2023 +0200 + + Don't fail signature basics tests if backend is not configured + + qt5/tests/check_signature_basics.cpp | 22 +++++++++++++++++----- + qt6/tests/check_signature_basics.cpp | 22 +++++++++++++++++----- + 2 files changed, 34 insertions(+), 10 deletions(-) + +commit f0373f62df9cb6b7bff29150344fddfe1e8361c5 +Author: Albert Astals Cid +Date: Mon Jun 5 12:12:40 2023 +0200 + + poppler 23.06.0 + + CMakeLists.txt | 4 ++-- + NEWS | 23 +++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/CMakeLists.txt | 2 +- + qt6/src/Doxyfile | 2 +- + 7 files changed, 30 insertions(+), 7 deletions(-) + +commit fa00b3fbbd62c5b6b5383d9997a9d5c30827b386 +Author: Sune Vuorela +Date: Mon Jun 5 11:09:09 2023 +0200 + + Fix cornercase crash in weird pdfsig setups + + This fixes a potential crash in setups where at least one + cryptographic + signature backend is compiled in, but none is functional. + + utils/pdfsig.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit c002bee1f2010d13c85a46e6816920ecdccb3015 +Author: Sune Vuorela +Date: Thu May 25 13:21:08 2023 +0200 + + Store embedded fonts widths table more effective + + Some non-scientific experiments: + A single 8k pdf document with okular adding a simple typewriter + annotation with content "aoeu" in approximately the same place grows + without this patch to 894k. With this patch, it grows to 649k. + + For comparison, if one doesn't embed the widths content at all, + the same + process grew to 638k + + While this isn't ground breaking gains, it is still some improvement. + + poppler/CIDFontsWidthsBuilder.h | 190 + ++++++++++++++++++++++++++++++ + poppler/Form.cc | 36 +++++- + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/check_cidfontswidthsbuilder.cpp | 100 ++++++++++++++++ + qt6/tests/CMakeLists.txt | 1 + + qt6/tests/check_cidfontswidthsbuilder.cpp | 100 ++++++++++++++++ + 6 files changed, 423 insertions(+), 5 deletions(-) + +commit 2dcbf58328e5acaafaa73dc2e601e5737c685789 +Author: Albert Astals Cid +Date: Mon Jun 5 00:56:51 2023 +0200 + + Remove poppler mingw CI until it's fixed again + + https://bugzilla.redhat.com/show_bug.cgi?id=2212050 + + .gitlab-ci.yml | 12 ------------ + 1 file changed, 12 deletions(-) + +commit 981210b9dcc47ce2209ae7091cf6df87c958b6b2 +Author: Sune Vuorela +Date: Tue May 30 22:06:20 2023 +0000 + + Rename NSS CryptoSign backend classes and files in line with GPG + backend. + + CMakeLists.txt | 2 +- + poppler/CryptoSignBackend.cc | 2 +- + ...SignatureHandler.cc => NSSCryptoSignBackend.cc} | 58 + +++++++++++++--------- + .../{SignatureHandler.h => NSSCryptoSignBackend.h} | 32 ++++++------ + qt5/src/poppler-form.cc | 8 +-- + qt6/src/poppler-form.cc | 8 +-- + utils/pdfsig.cc | 8 +-- + 7 files changed, 63 insertions(+), 55 deletions(-) + +commit c6dd11d89a08a6e4ab93d31b6d5d89a9153d9a91 +Author: Albert Astals Cid +Date: Sun May 28 01:00:51 2023 +0200 + + Update (C) + + poppler/GfxFont.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 333b04802a3a9dbdb0d0e0caec553fd1037c4c92 +Author: Khaled Hosny +Date: Mon May 8 18:35:10 2023 +0300 + + Try harder to get Type 3 font name + + There is no BaseFont in Type 3 fonts, so we first try + fontDescriptor’s + FontName, but fontDescriptor is optional so we then try the Name key. + + Fixes #1396 + + poppler/GfxFont.cc | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit 82fc01784dcfc3e22ee0053e4ecfa9b500119b19 +Author: Albert Astals Cid +Date: Thu May 25 12:25:57 2023 +0200 + + Update (C) + + qt5/src/poppler-form.h | 1 + + qt6/src/poppler-form.h | 1 + + 2 files changed, 2 insertions(+) + +commit 83630a0ecf3db671c820b80f584e45ab9927c3fe +Author: Sune Vuorela +Date: Wed May 24 23:04:24 2023 +0000 + + Qt frontend code for selecting cryptosign backend + + qt5/src/poppler-form.cc | 88 + ++++++++++++++++++++++++++++++++++++++++++++++++ + qt5/src/poppler-form.h | 55 +++++++++++++++++++++++++++++- + qt6/src/poppler-form.cc | 89 + +++++++++++++++++++++++++++++++++++++++++++++++++ + qt6/src/poppler-form.h | 54 +++++++++++++++++++++++++++++- + 4 files changed, 284 insertions(+), 2 deletions(-) + +commit a2b249f8a5bc6f8fe23d02f6e04cbfd132a46629 +Author: Albert Astals Cid +Date: Tue May 23 00:07:23 2023 +0200 + + Update (C) + + poppler/CairoFontEngine.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 6f7c8d24aa699327917772fb04b7cb52ab5803f5 +Author: Ilia Kats +Date: Mon May 22 11:48:04 2023 +0200 + + fix segfault in _free_type3_font_info + + The destructor of Gfx calls methods of outputDev, so it needs to be + deleted first + + poppler/CairoFontEngine.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 33672ca1b6670f7378e24f6d475438f7f5d86b05 +Author: Sune Vuorela +Date: Mon May 22 19:53:08 2023 +0000 + + Fix crash with weird hashing used for signatures + + poppler/SignatureHandler.cc | 15 ++++++++++++--- + poppler/SignatureHandler.h | 7 ++++++- + 2 files changed, 18 insertions(+), 4 deletions(-) + +commit 4efd2f9f8175cb5d448809b56f67524df6e220aa +Author: Sune Vuorela +Date: Tue Apr 11 13:39:36 2023 +0200 + + Cryptosign backend using gpgme (gpgsm) for all your signature needs + + CMakeLists.txt | 9 +- + config.h.cmake | 3 + + poppler/CryptoSignBackend.cc | 18 ++ + poppler/CryptoSignBackend.h | 3 +- + poppler/GPGMECryptoSignBackend.cc | 387 + +++++++++++++++++++++++++++++++++++ + poppler/GPGMECryptoSignBackend.h | 57 ++++++ + qt5/tests/check_signature_basics.cpp | 52 ++++- + qt6/tests/check_signature_basics.cpp | 50 ++++- + 8 files changed, 557 insertions(+), 22 deletions(-) + +commit 9065bd7d5fb9f9554235eafe8a67d0f67ea25faf +Author: Sune Vuorela +Date: Mon May 1 15:40:39 2023 +0200 + + Set certificate info a bit earlier; that way we also get it if + signature validation fails + + poppler/Form.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 266a2fd0a8cce584e0ffad0bc06670ed7136fc19 +Author: Sune Vuorela +Date: Mon Mar 27 11:11:24 2023 +0200 + + Add function to get specific element from the DN parse result + + poppler/DistinguishedNameParser.h | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 395a5b7e5a8efa049a0eb3a4bbff41737aaf5fc1 +Author: Sune Vuorela +Date: Fri Mar 10 13:00:09 2023 +0100 + + Parser for Distinguished Names in certificates + + Not all crypto libraries exposes the fields parsed, so we wil need our + own. + + Derived from KDE's libkleo, but improved and has added test coverage + + poppler/DistinguishedNameParser.h | 311 + ++++++++++++++++++++++++++ + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/check_distinguished_name_parser.cpp | 165 ++++++++++++++ + qt6/tests/CMakeLists.txt | 1 + + qt6/tests/check_distinguished_name_parser.cpp | 161 +++++++++++++ + 5 files changed, 639 insertions(+) + +commit 720fcc1f1b7c2d13894ce4dfee4f68a40384d91b +Author: Sune Vuorela +Date: Wed Mar 22 19:22:40 2023 +0100 + + Let's try get in a bit of gnupg + + A script to build a gnupg2.4.1 + A gpgme that is hardcoded to use the above gnupg + And enough CMake to see we can find it. + + .gitlab-ci.yml | 4 +++- + CMakeLists.txt | 10 ++++++++-- + do-the-gnupg-2.4-dance.sh | 51 + +++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 62 insertions(+), 3 deletions(-) + +commit f07d64831252a9cb7775d12e5ce9b663aaae63d5 +Author: Albert Astals Cid +Date: Sat May 13 13:16:29 2023 +0200 + + symbol.ttf is not a good Symbol font + + Add the URW++ font names for a proper Symbol replacement + + poppler/GlobalParamsWin.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 591235c8b6c65a2eee88991b9ae73490fd9afdfe +Author: Albert Astals Cid +Date: Wed May 17 22:42:05 2023 +0200 + + OutlineItem::open: Fix crash on malformed files + + Fixes #1399 + + poppler/Outline.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit db6d86238a86116f4ef809d6fd19ed859c36b5c1 +Author: Sune Vuorela +Date: Tue May 16 15:29:04 2023 +0200 + + Lookup with same rules as inserting them + + Inserting fonts happens without a trailing space if font style + is empty. + Apply teh same rules when lookin up. + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6b70f3fc046cc0107ca3a1da0faa33e7bbb50255 +Author: Albert Astals Cid +Date: Tue May 16 23:12:57 2023 +0200 + + Update (C) + + goo/JpegWriter.cc | 1 + + poppler/ImageEmbeddingUtils.cc | 1 + + 2 files changed, 2 insertions(+) + +commit 2986f06c7cc9d64a506ebe861b8bf38f73386e86 +Author: Jordan Abrahams-Whitehead +Date: Tue May 16 18:52:19 2023 +0000 + + Add missing #include prior to jpeglib.h + + Fixes #1398 + + goo/JpegWriter.cc | 2 +- + poppler/ImageEmbeddingUtils.cc | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 26199bd53fbe7a0d5b00f8586e66d6702e324e5e +Author: Albert Astals Cid +Date: Fri May 5 00:29:40 2023 +0200 + + Look for fonts in both windows font dir and poppler fonts dir + + poppler/GlobalParamsWin.cc | 201 + +++++++++++++++++++++++---------------------- + 1 file changed, 104 insertions(+), 97 deletions(-) + +commit 8aaf78b06373e2a641e565c3b9da31ac3a25b7d8 +Author: Sune Vuorela +Date: Fri May 12 21:12:43 2023 +0200 + + Skip font lookup for nonprintable characters + + This is at least one cause for + https://bugs.kde.org/show_bug.cgi?id=469664 + + poppler/Form.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 6fd2c2e6f50b6b8f47c554c8e7e3076cd81a7554 +Author: Albert Astals Cid +Date: Fri May 12 16:22:24 2023 +0200 + + Update (C) + + qt5/src/poppler-embeddedfile.cc | 1 + + qt6/src/poppler-embeddedfile.cc | 1 + + 2 files changed, 2 insertions(+) + +commit beb63c33457ed41033fb071eb25bb61e393280f6 +Author: Andre Heinecke +Date: Fri May 5 15:09:00 2023 +0200 + + Fix crash when signing existing signature + + On windows, helvetica is not available and that makes poppler + crash, so + fix crash and add fallback to arial. + + This has already been implemented for "new" signatures, both the + fallback and the crash in + 09fdfecea3a13d30b5c52e1258d17549739d9ea8 and + a563801e1a6be5e70645472d82f4ba8534b454d1 + + Refactor the fallback code to be reusable and use the same crash + guard. + + poppler/Form.cc | 25 +++++++++++++++++++++++-- + poppler/Form.h | 4 ++++ + poppler/PDFDoc.cc | 21 +-------------------- + 3 files changed, 28 insertions(+), 22 deletions(-) + +commit aefd09f9eb69b91ae2cae0351280aaa66742dd84 +Author: Sune Vuorela +Date: Thu May 11 16:43:41 2023 +0200 + + Convert embedded files to bytearray a bit smarter + + The current behavior also triggers a runtime warning per byte: + "Using QByteRef with an index pointing outside the valid range of + a QByteArray. The corresponding behavior is deprecated, and will + be changed in a future version of Qt." + + This will keep an extra copy of the data around during convertion, + but that's probably okay. + + qt5/src/poppler-embeddedfile.cc | 11 ++--------- + qt6/src/poppler-embeddedfile.cc | 14 ++------------ + 2 files changed, 4 insertions(+), 21 deletions(-) + +commit 47856547b9b56c037049e48453f9ae65aa266a26 +Author: Albert Astals Cid +Date: Fri May 5 00:22:18 2023 +0200 + + GooString -> std::string + + poppler/GlobalParamsWin.cc | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit 1e4488b2b44a56b35dee8e0bf9e33453523eb2ed +Author: Albert Astals Cid +Date: Thu May 4 00:21:46 2023 +0200 + + FontInfo: Make it return proper information about font substitution + + GfxFont::locateFont is what the output devices use, which is more + complex than just findSystemFontFile so use that + + poppler/FontInfo.cc | 8 +++----- + poppler/GfxFont.cc | 6 +++--- + poppler/GfxFont.h | 3 ++- + poppler/GlobalParams.cc | 8 ++++---- + poppler/GlobalParams.h | 2 +- + 5 files changed, 13 insertions(+), 14 deletions(-) + +commit 6a566e417b7c261252c8d3d83dd9b1c366f83194 +Author: Albert Astals Cid +Date: Thu May 4 14:05:45 2023 +0200 + + Fix memory leak when looking for fonts in Windows + + poppler/GlobalParams.cc | 6 +++--- + poppler/GlobalParams.h | 4 ++-- + poppler/GlobalParamsWin.cc | 21 +++++++++------------ + 3 files changed, 14 insertions(+), 17 deletions(-) + +commit adf710eecf475dd7c64d7b904f7414ec3098491f +Author: Albert Astals Cid +Date: Tue May 2 21:43:28 2023 +0200 + + poppler 23.05.0 + + CMakeLists.txt | 4 ++-- + NEWS | 8 ++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 13 insertions(+), 5 deletions(-) + +commit 91505b388ccb1902f86b7d9ec5baf22e879200b6 +Author: Albert Astals Cid +Date: Tue May 2 21:33:41 2023 +0200 + + Update (C) + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 62f2eb80fb2a4d4c656e7583584aa73fbc1de511 +Author: Albert Astals Cid +Date: Sun Apr 30 11:31:43 2023 +0200 + + Form::ensureFontsForAllCharacters: Create resources if there's not one + + Fixes #1383 + + poppler/Form.cc | 21 ++++++++++++++++----- + poppler/Form.h | 10 ++++++---- + 2 files changed, 22 insertions(+), 9 deletions(-) + +commit 0864da5b1063c3ddba7e68a567cc56ed3474f8b2 +Author: Albert Astals Cid +Date: Sun Apr 30 10:28:40 2023 +0200 + + Don't include an empty space at the end of the font name if there's + no style + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2b437604157a34546f7340cc383d7cfaa292ede5 +Author: Albert Astals Cid +Date: Sun Apr 30 10:26:36 2023 +0200 + + Do not hardcode Noto Sans as FontName + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c5bc25a0094b3fd10e8eea5296a006a4f530a771 +Author: Nicolas Fella +Date: Fri Apr 28 18:51:59 2023 +0200 + + Set SigFlags when signing unsigned signature + + When creating a new signature we change SigFlags to indicate that + there are now signatures + + However when signing an existing unsigned signature form that + doesn't happen + + This breaks working on the file in Acrobat reader, e.g. it doesn't + show the signatures panel and can't save amendments to the file + + Fixes https://bugs.kde.org/show_bug.cgi?id=461371 + + poppler/Form.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 39d0009741465344f8a30a3129081cd18bb378bb +Author: Sune Vuorela +Date: Fri Apr 14 17:12:24 2023 +0200 + + API fixup: Use optional instead of a 'None' backend + + Let's fix the cryptosign backend code before release. + + poppler/CryptoSignBackend.cc | 13 +++++++------ + poppler/CryptoSignBackend.h | 3 +-- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit 2cf3cf58ed9f70b99e6ee93c57bb434a52a0e857 +Author: Albert Astals Cid +Date: Thu Apr 27 11:50:45 2023 +0200 + + Check overflow in nvals correctly + + poppler/Stream.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit abc60c57be8f0dfb5b3b7b47ed9a086df9010503 +Author: Albert Astals Cid +Date: Sat Apr 22 16:35:09 2023 +0200 + + CI: Update Fedora to 38 + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cc5ac1665aa3056d1f90a12e12d24a02536647e0 +Author: Sune Vuorela +Date: Mon Mar 27 10:40:19 2023 +0200 + + Adapt signature code to the backend interface + + Also set the signature info a bit later; + gpgme only gives us the info after the validateSignature call + + CMakeLists.txt | 25 +++++++++++++ + config.h.cmake | 6 ++++ + poppler/Form.cc | 87 + +++++++++++++++++++++++---------------------- + poppler/Form.h | 8 +++-- + poppler/SignatureHandler.cc | 56 +++++++++++++++-------------- + poppler/SignatureHandler.h | 45 ++++++++++++----------- + qt5/src/poppler-form.cc | 30 ++++++++-------- + qt6/src/poppler-form.cc | 30 ++++++++-------- + utils/pdfsig.cc | 3 +- + 9 files changed, 168 insertions(+), 122 deletions(-) + +commit cb96047d029e2145191d79b7ece17b4a215794cd +Author: Sune Vuorela +Date: Thu Mar 23 16:40:59 2023 +0100 + + Backending infrastructure + + poppler/CryptoSignBackend.cc | 97 + +++++++++++++++++++++++++++++++++++++++++ + poppler/CryptoSignBackend.h | 101 + +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 198 insertions(+) + +commit 1be35ee8b2d6418dfafc6a8a9bbf6d70eafb2d2e +Author: Albert Astals Cid +Date: Wed Apr 5 00:19:04 2023 +0200 + + Fix stack overflow in PostScriptFunction::parseCode + + By using a pointer instead of a variable things are on the heap. + + Fixes issue #1381 + + poppler/Function.cc | 40 +++++++++++++++++++++------------------- + poppler/Function.h | 2 +- + 2 files changed, 22 insertions(+), 20 deletions(-) + +commit 8354c73ea0516a9d4a4bdf68da5c5392498b286d +Author: Oliver Sander +Date: Sun Apr 2 14:38:53 2023 +0200 + + Make filterPSName return std::string + + Rather than a pointer to GooString. This saves one memory allocation. + + poppler/PSOutputDev.cc | 41 +++++++++++++++++------------------------ + poppler/PSOutputDev.h | 2 +- + 2 files changed, 18 insertions(+), 25 deletions(-) + +commit 013ab299d7041691760fbf8626cb4125e6a5a459 +Author: Albert Astals Cid +Date: Mon Apr 3 17:10:13 2023 +0200 + + Update (C) + + poppler/GfxFont.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 341687022c6f34d6979bfebe34b8655679198d68 +Author: Albert Astals Cid +Date: Sun Apr 2 12:19:44 2023 +0200 + + GfxCIDFont::getCodeToGIDMap: Fix uninitialized memory reads + + Only initialize tumap when we're actually going to fill it + + poppler/GfxFont.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4c6da80ab5a54df72c0243d32a3976b683441d5e +Author: Albert Astals Cid +Date: Sun Apr 2 11:26:06 2023 +0200 + + poppler 23.04.0 + + CMakeLists.txt | 4 ++-- + NEWS | 12 ++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 17 insertions(+), 5 deletions(-) + +commit 23994cf44ac8a11b0dfbf159df669bbe1ac78dc3 +Author: Oliver Sander +Date: Wed Mar 29 12:31:18 2023 +0200 + + Use std::vector for the fontIDs array + + This makes the code safer and easier to read. + + poppler/PSOutputDev.cc | 24 ++++++------------------ + poppler/PSOutputDev.h | 6 ++---- + 2 files changed, 8 insertions(+), 22 deletions(-) + +commit 09aed1a65e703ec419980506d12578ca4149f58d +Author: Oliver Sander +Date: Wed Mar 29 08:36:49 2023 +0200 + + Use std::string for psFileName, instead of GooString + + This simplifies the memory and error handling a little bit. + + utils/pdftops.cc | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) + +commit 770b0e130183104e30eb9138a68be187a689737b +Author: Albert Astals Cid +Date: Tue Mar 28 12:34:10 2023 +0200 + + CI: fix mingw + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 098d2d497b3d8cbc4fdf9eb68385bfbe2ee3e711 +Author: Sune Vuorela +Date: Mon Mar 27 17:52:28 2023 +0200 + + Fix crash in bad signature verification + + If the signature existing but too wrong for us to understand, we might + not get the hashContext object created, so guard against that. + + This is fallout from 08c0766e9d. + + Note the SignHandler does not need the same guards; the hashContext is + always present. + + poppler/SignatureHandler.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 08c0766e9d7ab08cdc7ef380ce9c190ae87d789b +Author: Sune Vuorela +Date: Fri Mar 3 08:22:13 2023 +0100 + + Split signature handler for signing and verification + + Only a little bit of the class state was shared between the signing + and verification functions, so split it in the shared hashing bits + and a class for signing and one for verification + + Also clean up a little bit of the memory handling + + poppler/Form.cc | 8 +-- + poppler/Form.h | 4 +- + poppler/SignatureHandler.cc | 125 + +++++++++++++++++++------------------------- + poppler/SignatureHandler.h | 64 +++++++++++++++-------- + qt5/src/poppler-form.cc | 2 +- + qt6/src/poppler-form.cc | 2 +- + 6 files changed, 105 insertions(+), 100 deletions(-) + +commit e7fa64daa62bd09839d9d52413600889d76ae936 +Author: Albert Astals Cid +Date: Mon Mar 27 11:42:08 2023 +0200 + + clang-format-15 reformat to ignore-revs file + + .git-blame-ignore-revs | 2 ++ + 1 file changed, 2 insertions(+) + +commit b5aa09403e0f106f51292683c1841908167337ea +Author: Albert Astals Cid +Date: Wed Oct 12 11:59:27 2022 +0200 + + clang 15 + + .clang-tidy | 2 +- + .gitlab-ci.yml | 20 ++-- + README.contributors | 2 +- + glib/poppler-document.cc | 2 +- + goo/gfile.h | 10 +- + poppler/CairoOutputDev.h | 104 ++++--------------- + poppler/Gfx.h | 10 +- + poppler/GfxState.h | 65 +++--------- + poppler/GlobalParams.cc | 6 +- + poppler/OutputDev.h | 107 ++++--------------- + poppler/PDFDoc.h | 260 + ++++++++++------------------------------------ + poppler/PSOutputDev.h | 155 ++++++--------------------- + poppler/SplashOutputDev.h | 15 +-- + poppler/TextOutputDev.h | 125 +++++----------------- + qt5/src/poppler-private.h | 5 +- + qt6/src/poppler-private.h | 5 +- + splash/Splash.h | 15 +-- + test/cairo-thread-test.cc | 2 +- + test/perf-test.cc | 2 +- + utils/InMemoryFile.h | 5 +- + 20 files changed, 195 insertions(+), 722 deletions(-) + +commit af911848aa1e3c4bdb90558dc9c8aef2d6498cdf +Author: Albert Astals Cid +Date: Sun Mar 26 23:48:13 2023 +0200 + + Update (C) + + poppler/Page.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac5cc0244f1131687f7699115e3c1be415c55409 +Author: Albert Astals Cid +Date: Sun Mar 26 23:37:42 2023 +0200 + + Fix leak when calling addAnnot on malformed files + + oss-fuzz/57464 + + poppler/Page.cc | 13 ++++++++++--- + poppler/Page.h | 4 ++-- + 2 files changed, 12 insertions(+), 5 deletions(-) + +commit d5d23b3bcc4cbfbe58bdfa3e2c82555aa72c4117 +Author: Albert Astals Cid +Date: Fri Mar 24 23:52:02 2023 +0100 + + Update (C) + + poppler/Page.cc | 2 +- + poppler/XRef.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d07818d63677ccd2ea68b580ee45085597681a36 +Author: Albert Astals Cid +Date: Thu Mar 23 19:22:21 2023 +0100 + + Page::removeAnnot: Reorder code to fix memory leak + + We were removing the annot object from the xref, then calling + removeReferencedObjects + that in some cases calls setModifiedObject on the xref with that same + annot object, which is wrong, we can't modify an object that isn't + there + anymore + + poppler/Page.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 96a953dbde5339798ca583a5ced2e6f0384351e7 +Author: Albert Astals Cid +Date: Thu Mar 23 19:21:16 2023 +0100 + + XRef: Add a warning if calling setModifiedObject on empty ref + + poppler/XRef.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit ea5e64f139094ec93b2261d51a61c8a8b9b57e44 +Author: Albert Astals Cid +Date: Fri Mar 17 00:14:56 2023 +0100 + + PDFDoc::sign: Fix memory issue when signing fails + + Issue #1372 + + poppler/PDFDoc.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 3d38bd6abacc607e492361f8febf381065913d36 +Author: Sune Vuorela +Date: Thu Mar 23 09:38:47 2023 +0000 + + Fix use of dangling memory + + g_strdup is a macro and thus the intermediate getSignerName() value + would be destructed after the first line of code in the macro + + glib/poppler-form-field.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f8d8753fecdb8b4e572d3aec6c654c5efb498b44 +Author: Sune Vuorela +Date: Thu Mar 16 09:45:02 2023 +0100 + + Split HashContext to separate class + + Then we only need one place to do the endHash and memory handling. + + poppler/SignatureHandler.cc | 94 + ++++++++++++++++++++------------------------- + poppler/SignatureHandler.h | 27 +++++++++---- + 2 files changed, 60 insertions(+), 61 deletions(-) + +commit 3a3965a5cc7f20fd0d6cbfe92a45b3999456d7a0 +Author: Sune Vuorela +Date: Tue Mar 14 09:47:51 2023 +0100 + + Remove need for dual signing of data + + Instead of creating a placeholder signature of dummy data, just use + dummy data as a placeholder and then pad the real signature with + zeroes + to fit in the same size as the dummy data. + + This is also kind of what the pdf specification suggests. + + It also ensures that for certain smart card setups requiring + a distinct + pin per signature will only be asked once. + + poppler/Form.cc | 30 +++++++++++++++--------------- + poppler/Form.h | 2 +- + poppler/SignatureHandler.cc | 7 +------ + poppler/SignatureHandler.h | 6 +++++- + 4 files changed, 22 insertions(+), 23 deletions(-) + +commit 22b794c0535a0f3331428b570d348ee51ca980b8 +Author: Sune Vuorela +Date: Wed Mar 22 17:02:53 2023 +0100 + + Minor hardening + + I'm not sure how, but I succeded creating a null certificate info ptr, + so better guard that for being safe. + + If getting the start/end fails, the objStart/objEnd might not be + initialized, so guard against that. The document would be quite + malformed to get here in the first place. + + poppler/Form.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 7608a427558e54ec401e6f5600ee0e9f4cf6f392 +Author: Sune Vuorela +Date: Wed Mar 22 19:10:37 2023 +0100 + + CI: Use FDO_CI_CONCURRENT + + the freedesktop.org ci system suggests to not use more parallel jobs + than whatever is put in that variable to avoid killing the systems. + + .gitlab-ci.yml | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit fbc26317d9bd869452d4d3da0ba05077ae619748 +Author: Albert Astals Cid +Date: Tue Mar 21 23:12:03 2023 +0100 + + pdfsig: Support --help + + utils/pdfsig.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 9ff937311f0764e5f339fbbe15899a9dd6e006f0 +Author: Albert Astals Cid +Date: Mon Mar 20 14:37:32 2023 +0100 + + Update (C) + + poppler/Form.h | 1 + + poppler/PDFDoc.cc | 1 + + poppler/PDFDoc.h | 1 + + 3 files changed, 3 insertions(+) + +commit e5a3052390b5912b19c749e91babfe3d83004184 +Author: Sune Vuorela +Date: Thu Mar 16 10:20:22 2023 +0100 + + Use vector, not malloc/free for signature data + + poppler/Form.cc | 6 +++--- + poppler/SignatureHandler.cc | 7 +++---- + poppler/SignatureHandler.h | 3 ++- + 3 files changed, 8 insertions(+), 8 deletions(-) + +commit 5ccac116d19c29bc543849a1540921b55c313aa8 +Author: Sune Vuorela +Date: Mon Mar 20 12:07:24 2023 +0100 + + pdfsig -dump - allow holes in signature list + + It is perfectly possible to have e.g. 4 signature slots and only + currently a signature in slot first and last slot. pdfsig should + be able + to dump all of them, but it considers a missing signature a stop + condition. It can just continue and get all of actual ones out. + + utils/pdfsig.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 2b53d5a8ccb7350c00ef135ab40ca3562099265c +Author: Sune Vuorela +Date: Mon Mar 20 11:48:42 2023 +0100 + + Fixup for 8787103a43 + + Some codepaths was overlooked; might lead to crashes in pdfsig. + + Also clean up the Qt checkpassword functions; they aren't crashers + though. + + qt5/src/poppler-form.cc | 4 ++-- + qt6/src/poppler-form.cc | 2 +- + utils/pdfsig.cc | 3 +-- + 3 files changed, 4 insertions(+), 5 deletions(-) + +commit 8787103a43732440e1994c6c72d99a4717af8b95 +Author: Sune Vuorela +Date: Fri Mar 17 14:08:42 2023 +0100 + + Switch some const char* to std string + + Also move the weirdness (empty password is nullptr) close to usage, + rather than have it as far away as possible. + + poppler/Form.cc | 14 +++++++------- + poppler/Form.h | 8 ++++---- + poppler/PDFDoc.cc | 6 +++--- + poppler/PDFDoc.h | 6 +++--- + poppler/SignatureHandler.cc | 8 ++++---- + poppler/SignatureHandler.h | 4 ++-- + qt5/src/poppler-form.cc | 5 ++--- + qt6/src/poppler-form.cc | 7 +++---- + utils/pdfsig.cc | 3 +-- + 9 files changed, 29 insertions(+), 32 deletions(-) + +commit b39c8cd2bc7757b3c1c4756de345702f852a4706 +Author: Sune Vuorela +Date: Fri Mar 17 14:24:51 2023 +0100 + + Add const to a few signature methods + + poppler/SignatureHandler.cc | 8 ++++---- + poppler/SignatureHandler.h | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit ede53de1654afe86e25fa22c7e9d50003a217d5a +Author: Sune Vuorela +Date: Mon Mar 13 14:48:21 2023 +0100 + + Valgrind cleanup of signing + + signing_cert is owned by us while verifying, but the data we were + writing to it while signing was not (directly) owned by us, so don't + free it. Or well. Don't write it to a class member. + + poppler/SignatureHandler.cc | 30 +++++++++++++++++++----------- + poppler/SignatureHandler.h | 2 +- + 2 files changed, 20 insertions(+), 12 deletions(-) + +commit fc802d21df3c70f721c0353ab8862a4632c8018e +Author: Sune Vuorela +Date: Thu Mar 16 09:54:54 2023 +0100 + + Make standalone methods standalone + + In previous commits, these functions has been made fully standalone, + so + now make it obvious. + + poppler/SignatureHandler.cc | 10 +++++++--- + poppler/SignatureHandler.h | 3 --- + 2 files changed, 7 insertions(+), 6 deletions(-) + +commit e4f80d6461cc26e2dd1494ab2bf548e3382a5153 +Author: Sune Vuorela +Date: Wed Mar 15 12:22:00 2023 +0100 + + Simple signature tests + + Document some of the fields we can extract. + + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/check_signature_basics.cpp | 133 + +++++++++++++++++++++++++++++++++++ + qt6/tests/CMakeLists.txt | 1 + + qt6/tests/check_signature_basics.cpp | 133 + +++++++++++++++++++++++++++++++++++ + 4 files changed, 268 insertions(+) + +commit e18bdd936d9da551506715f8f7e36c13599c9728 +Author: Albert Astals Cid +Date: Thu Mar 16 00:53:10 2023 +0100 + + SignatureHandler::validateSignature: Use the actual hash length + + It's going to be the same size, but this is more proper + + poppler/SignatureHandler.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 829d03cccd77312886e0bc215366cfe600e65044 +Author: Sune Vuorela +Date: Mon Mar 13 14:05:59 2023 +0100 + + Switch second digest buffer to not leak memory + + poppler/SignatureHandler.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit a691d8d5e6ce169325542b7912d61a215f412f28 +Author: Sune Vuorela +Date: Mon Mar 13 13:51:55 2023 +0100 + + Don't manually handle the digest buffer memory + + Also fix length and content comparison to happen in the right order + + poppler/SignatureHandler.cc | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) + +commit cfea6a76be067a37710f181480e94cee9b63f578 +Author: Albert Astals Cid +Date: Wed Mar 15 00:38:22 2023 +0100 + + Update (C) + + poppler/CairoFontEngine.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit fb5da5c231102f1577fb257581f9a8588e0dda5e +Author: Pablo Correa Gómez +Date: Mon Mar 13 22:20:11 2023 +0100 + + CairoFontEngine: remove unused variables from type3_font_info_t + + poppler/CairoFontEngine.cc | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit 479a069a859f44a6cbcd3add6d00afea9bc26b95 +Author: Frederic Germain +Date: Tue Mar 7 16:37:10 2023 +0100 + + CairoFontEngine: improve type3 font rendering + + Cache Gfx context + Some PDFs takes time to load, this would improve from a + few seconds loading time to instant display + + Coauthored-by: Pablo Correa Gomez + + poppler/CairoFontEngine.cc | 42 + +++++++++++++++++++++++++++--------------- + 1 file changed, 27 insertions(+), 15 deletions(-) + +commit fb49889fea6e6003d8b8e2d65de0ce58d6229d54 +Author: Sune Vuorela +Date: Mon Mar 13 13:56:59 2023 +0100 + + Simplify temp_certs memory handling + + poppler/SignatureHandler.cc | 20 ++++++++++++++------ + poppler/SignatureHandler.h | 1 - + 2 files changed, 14 insertions(+), 7 deletions(-) + +commit fcb7b90ddbd6135e3fbf1032de07bc5b0e351df2 +Author: Sune Vuorela +Date: Mon Mar 13 14:28:08 2023 +0100 + + nss created message was leaked on most errors + + Use a unique_ptr to ensure it is being destructed properly + + poppler/SignatureHandler.cc | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +commit 01ff2af0ee61c45bf4728a1d6ff4327aa2889d21 +Author: Albert Astals Cid +Date: Mon Mar 13 15:49:09 2023 +0100 + + Update (C) + + utils/pdftocairo.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 2cd82736e2db45e9a06baba1478439637172a76e +Author: Albert Astals Cid +Date: Mon Mar 13 15:45:41 2023 +0100 + + Update (C) + + poppler/CertificateInfo.cc | 1 + + poppler/CertificateInfo.h | 1 + + 2 files changed, 2 insertions(+) + +commit bd533d75bb171dada6fa9e9fdc5bdc3e42824b97 +Author: Sune Vuorela +Date: Mon Mar 13 14:21:23 2023 +0100 + + Put the arenapool in a unique_ptr + + Also allocate it a bit earlier to use it for a few other entries that + might otherwise else be leaked in certain error conditions + + poppler/SignatureHandler.cc | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +commit 7b50d9f0374aa5d0ea653a0d024b315e16625839 +Author: Sune Vuorela +Date: Mon Mar 13 14:02:27 2023 +0100 + + Put HASHContext in a unique_ptr rather than manually manage it + with freeing + + poppler/SignatureHandler.cc | 19 ++++++------------- + poppler/SignatureHandler.h | 6 +++++- + 2 files changed, 11 insertions(+), 14 deletions(-) + +commit c630bb95af5790d8d438d7e3b1dae8bf9e4a1541 +Author: Anton Thomasson +Date: Sun Mar 12 10:10:03 2023 +0100 + + pdftocairo: Don't do things based on first page + + Remember document initialization status instead. + This prevents a segfault where even/odd rendering forgets to run + beginDocument as the "first" page is not to be rendered. + + utils/pdftocairo.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 90da1d7b9ee200a0006bd9a103a3da10e2022e3b +Author: Albert Astals Cid +Date: Fri Mar 10 23:27:51 2023 +0100 + + Fix memory leak in GlobalParams::findSystemFontFileForFamilyAndStyle + + poppler/GlobalParams.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit b46e395c39700325cd6d717f0cf459274a44a1a9 +Author: Sune Vuorela +Date: Fri Mar 10 14:10:32 2023 +0100 + + Simplify certificate and signature info + + More stuff can be defaulted. + + poppler/CertificateInfo.cc | 25 ------------------------- + poppler/CertificateInfo.h | 18 +++++++++--------- + poppler/SignatureInfo.cc | 22 +--------------------- + poppler/SignatureInfo.h | 13 ++++++------- + 4 files changed, 16 insertions(+), 62 deletions(-) + +commit 96067bdbc2307decacc8d526795fd2dacf617f5d +Author: Albert Astals Cid +Date: Wed Mar 8 23:07:14 2023 +0100 + + Update (C) + + glib/poppler-form-field.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c335934c1c30ab3ec1dd963f4646ae88d5790172 +Author: Sune Vuorela +Date: Tue Mar 7 15:30:55 2023 +0100 + + Use std::string for strings + + not manual strdup/free + + glib/poppler-form-field.cc | 2 +- + poppler/SignatureInfo.cc | 28 +++++++++------------------- + poppler/SignatureInfo.h | 12 ++++++------ + qt5/src/poppler-form.cc | 4 ++-- + qt6/src/poppler-form.cc | 4 ++-- + utils/pdfsig.cc | 4 ++-- + 6 files changed, 22 insertions(+), 32 deletions(-) + +commit 89bf50a84ebbca98916384d7dd3614225f02d2cb +Author: Albert Astals Cid +Date: Wed Mar 8 01:15:33 2023 +0100 + + Update (C) + + poppler/Form.cc | 3 ++- + poppler/Form.h | 2 +- + poppler/PDFDoc.cc | 2 +- + poppler/SignatureHandler.cc | 2 ++ + poppler/SignatureHandler.h | 1 + + poppler/SignatureInfo.cc | 1 + + poppler/SignatureInfo.h | 1 + + qt5/src/poppler-form.cc | 3 ++- + qt6/src/poppler-form.cc | 3 ++- + utils/pdfsig.cc | 3 ++- + 10 files changed, 15 insertions(+), 6 deletions(-) + +commit d367fe8d40b3d3d19285cd36c1a76447feea22db +Author: Albert Astals Cid +Date: Sat Mar 4 01:19:51 2023 +0100 + + Remove unused digestName parameter + + poppler/Form.cc | 10 +++++----- + poppler/Form.h | 8 ++++---- + poppler/PDFDoc.cc | 2 +- + qt5/src/poppler-form.cc | 2 +- + qt6/src/poppler-form.cc | 2 +- + utils/pdfsig.cc | 8 +++++++- + 6 files changed, 19 insertions(+), 13 deletions(-) + +commit 6051948976b63ffa02a93afc9aaea18d2733a4f9 +Author: Sune Vuorela +Date: Thu Mar 2 14:41:48 2023 +0100 + + Remove unused static method + + poppler/SignatureHandler.cc | 15 --------------- + poppler/SignatureHandler.h | 2 -- + 2 files changed, 17 deletions(-) + +commit 7af9565c492205cdad27c08478168d9e53349f83 +Author: Sune Vuorela +Date: Thu Mar 2 14:17:15 2023 +0100 + + Remove unused constructor + + poppler/SignatureHandler.cc | 6 ------ + poppler/SignatureHandler.h | 1 - + 2 files changed, 7 deletions(-) + +commit f688173900f3c29e802a3c140bdaa9d48d6c7118 +Author: Sune Vuorela +Date: Thu Mar 2 12:48:19 2023 +0100 + + Remove unused ASN bits + + poppler/SignatureHandler.cc | 64 + --------------------------------------------- + 1 file changed, 64 deletions(-) + +commit 64c7f8b3b67902274684f6541c0a931001a6fa20 +Author: Sune Vuorela +Date: Thu Mar 2 12:23:10 2023 +0100 + + Remove unused code + + poppler/SignatureHandler.h | 13 ------------- + 1 file changed, 13 deletions(-) + +commit c109770d59cb81d3dc8f3ab8a3ab7795e3583478 +Author: Ingo Klöcker +Date: Thu Mar 2 13:18:45 2023 +0000 + + add const + + poppler/SignatureHandler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 56fc0b14214feb50c377c725bc55d53738881532 +Author: Sune Vuorela +Date: Thu Mar 2 12:02:44 2023 +0100 + + Keep nss types in signature class + + If one wants the ability to use a different library for signing and + verification than nss, it is a good idea to not directly expose + the NSS + types to the rest of poppler. + + poppler/Form.cc | 2 +- + poppler/HashAlgorithm.h | 25 +++++++++++ + poppler/SignatureHandler.cc | 106 + ++++++++++++++++++++++++++++++++++++-------- + poppler/SignatureHandler.h | 11 ++--- + poppler/SignatureInfo.cc | 14 ++---- + poppler/SignatureInfo.h | 7 +-- + qt5/src/poppler-form.cc | 20 +++++---- + qt6/src/poppler-form.cc | 20 +++++---- + utils/pdfsig.cc | 14 +++--- + 9 files changed, 157 insertions(+), 62 deletions(-) + +commit 051c2601ecc35864cad6172db8387b64951cf859 +Author: Albert Astals Cid +Date: Wed Mar 1 22:15:25 2023 +0100 + + poppler 23.03.0 + + CMakeLists.txt | 2 +- + NEWS | 8 ++++---- + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 8 insertions(+), 8 deletions(-) + +commit 083662257ff626d6d3454a37b70928a62990c7ad +Author: Albert Astals Cid +Date: Sat Feb 4 11:32:08 2023 +0100 + + Update (C) + + goo/PNGWriter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 329ec39cb876f0d4137eff4fbb5e4ce37601b71a +Author: Albert Astals Cid +Date: Thu Feb 2 23:43:52 2023 +0100 + + PngWriter: Fix uninitialized memory use + + When just created and deleted without having called init() + + goo/PNGWriter.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 7673e1fd712416a5d65406d7447a1c3d5ada057b +Author: Albert Astals Cid +Date: Wed Feb 1 17:42:42 2023 +0100 + + poppler 23.02.0 + + CMakeLists.txt | 2 +- + NEWS | 16 +++++++++++++++- + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 19 insertions(+), 5 deletions(-) + +commit 06a0e17bd9387da0a9737f6ce945482930d98341 +Author: Albert Astals Cid +Date: Thu Jan 26 19:07:58 2023 +0100 + + Update (C) + + poppler/CairoOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 1327646900994c033155100adf7bbaad7654ff50 +Author: Artemy Gordon +Date: Thu Jan 26 18:01:09 2023 +0000 + + Add handling matte entry in cairo backend + + poppler/CairoOutputDev.cc | 47 + ++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 42 insertions(+), 5 deletions(-) + +commit 5f76a61237db0fe26bb2ac41ac41d20670d985a3 +Author: Albert Astals Cid +Date: Thu Jan 26 00:27:47 2023 +0100 + + Update (C) + + poppler/CairoFontEngine.cc | 2 +- + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 53115a05b7b4480ef06165199c8f1cb3982ab13d +Author: Adrian Johnson +Date: Tue Jan 3 10:13:52 2023 +1030 + + Fix cairo rendering of color type 3 fonts + + The bug fix in 448f03cf needs to be disabled for color fonts. + + poppler/CairoFontEngine.cc | 2 +- + poppler/CairoOutputDev.cc | 6 +++--- + poppler/CairoOutputDev.h | 12 +++++++++--- + 3 files changed, 13 insertions(+), 7 deletions(-) + +commit da39bd930fee9369071a97b93ffe3ea0987acedc +Author: Tobias Deiminger +Date: Tue Jan 3 00:25:57 2023 +0100 + + Point out pdfsig supports PKCS#11 URIs as nickname + + NSS "just works" with PKCS#11 URIs since 3.39. See + https://bugzilla.mozilla.org/show_bug.cgi?id=1475274 + for details. + + IMO we should expose that as feature. It's a standardized NSS-agnostic + way to identify certificate objects, and allows to disambiguate + certificates in any case. + + utils/pdfsig.1 | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 63bfacc89576345722cf3cefb962861aa7d159b8 +Author: Tobias Deiminger +Date: Wed Jan 4 21:26:12 2023 +0100 + + Fix "NSS could not shutdown" + + SignatureHandler never freed it's signing certificate. This left + an internal NSS reference that prevented cleanup of the NSS cache, + causing "NSS could not shutdown". + + NSS maintains an internal in-memory cache, where content is reference + counted. PK11_MakeCertFromHandle increases the issuerAndSn count. + CERT_DestroyCertificate decreases it. NSS tries to destruct the + cache in + NSS_Shutdown, which we've scheduled with atexit. There it detects a + remaining reference. + + Fixes #1326. + + poppler/SignatureHandler.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 924ef4264cdb0eca97185d7fc1791bcf32279933 +Author: Albert Astals Cid +Date: Mon Jan 9 22:52:01 2023 +0100 + + Update (C) + + poppler/SignatureHandler.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 4f8c8297d7190480500cdafe52c8777202229b30 +Author: Tobias Deiminger +Date: Mon Jan 9 21:00:06 2023 +0100 + + Fix segfault on wrong nssdir + + If SignatureHandler was used with a custom DB directory, but that + directory didn't exist or contained no valid DB, NSS crashed on + subsequent calls. + + We can prevent crashes by calling NSS_NoDB_Init (as it's already + done in + the default-DB case). + + Fixes #1331. + + poppler/SignatureHandler.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 4259ff0c2067d302f97d87221a442eec8e88d45c +Author: Albert Astals Cid +Date: Sun Jan 1 13:24:17 2023 +0100 + + poppler 23.01.0 + + CMakeLists.txt | 4 ++-- + NEWS | 18 ++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 23 insertions(+), 5 deletions(-) + +commit 2e3bf1476558d11a72b9f3e574eb28bb6ab2ad66 +Author: Albert Astals Cid +Date: Sun Jan 1 13:11:30 2023 +0100 + + Welcome 2023 + + poppler/poppler-config.h.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7f0276bbc5f7f7b4fefa956d8893ee23c13226e2 +Author: Albert Astals Cid +Date: Sat Dec 31 01:01:08 2022 +0100 + + CI: Cheat a bit in the build_clang14_libcpp build + + .gitlab-ci.yml | 3 ++- + qt6/tests/CMakeLists.txt | 4 +++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 43e2da4ade60f7e6c62b4d70f15d603327ca7b2b +Author: Albert Astals Cid +Date: Fri Dec 30 23:49:15 2022 +0100 + + Update (C) + + poppler/CairoOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 7d14f465a6441f3df4389df375b154687e1fdb6b +Author: Zachary Travis +Date: Fri Aug 13 20:33:35 2021 -0700 + + Ignore text rendering mode for type3 fonts + + poppler/CairoOutputDev.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit f9d958ddee1e9a77d41c80793fd20ce5299f08ef +Author: Albert Astals Cid +Date: Tue Dec 27 09:38:55 2022 +0100 + + Gfx::opBeginMarkedContent: Support Span with Name + + Issue #1327 + + poppler/Gfx.cc | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit 7dda4190b273edb2c5d74b7f5bc7cc77c49c9dbb +Author: Albert Astals Cid +Date: Wed Dec 14 23:12:56 2022 +0100 + + Update (C) + + poppler/SplashOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eac1066f60df2442c5508fb1601fa6a331cac7a0 +Author: Thomas Freitag +Date: Wed Dec 14 22:05:33 2022 +0000 + + Splash: avoid problems because of implicit rounding in non-separable + blend modes + + Splash uses unsigned char to store color pixel. But in non-separable + blend modes int and in some calculations float values are used. To + avoid rounding problems because of implicit rounding calculations + are now done with int values and when storing int values in unsigned + char variables clamp is used! + + poppler/SplashOutputDev.cc | 51 + ++++++++++++++++------------------------------ + 1 file changed, 17 insertions(+), 34 deletions(-) + +commit 065dca3816db3979dfacdc2f8592abed2ff6859a +Author: Albert Astals Cid +Date: Tue Dec 13 22:31:20 2022 +0100 + + FoFiType1::parse: Be more flexible parsing the encoding content + + Don't force it to be on a single line. + + Fixes #1324 + + fofi/FoFiType1.cc | 203 + ++++++++++++++++++++++++++++++------------------------ + 1 file changed, 113 insertions(+), 90 deletions(-) + +commit a9e1987591ed3896e18a81d0b66f65adf66f41cb +Author: Albert Astals Cid +Date: Tue Dec 13 00:48:59 2022 +0100 + + Remove unused FoFiType1::load function + + fofi/FoFiType1.cc | 11 ----------- + fofi/FoFiType1.h | 5 +---- + 2 files changed, 1 insertion(+), 15 deletions(-) + +commit a563801e1a6be5e70645472d82f4ba8534b454d1 +Author: Albert Astals Cid +Date: Mon Dec 12 23:40:24 2022 +0100 + + PDFDoc::sign: Find Arial to sign if Helvetica isn't found + + At least on my Windows install Helvetica isn't found and signing thus + fails + + poppler/PDFDoc.cc | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +commit 09fdfecea3a13d30b5c52e1258d17549739d9ea8 +Author: Albert Astals Cid +Date: Mon Dec 12 23:28:55 2022 +0100 + + PDFDoc::sign: Fix crash if font can't be found + + poppler/PDFDoc.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 6a19713ca8473c14905bd25d719757df5987d93b +Author: Albert Astals Cid +Date: Sun Dec 4 11:43:16 2022 +0100 + + cmake: A more bit of include tweaking + + test/CMakeLists.txt | 5 ----- + utils/CMakeLists.txt | 2 -- + 2 files changed, 7 deletions(-) + +commit 49a883dfac1a92fd959a1421627279aec26dcbb9 +Author: Albert Astals Cid +Date: Sun Dec 4 03:57:01 2022 +0100 + + cmake: Make sure cairo includes are complete + + cmake/modules/FindCairo.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9bd49f486ed8442943a08cfee42136a5575c6a1b +Author: Albert Astals Cid +Date: Sun Dec 4 03:22:52 2022 +0100 + + cmake: Add CAIRO_INCLUDE_DIRS to the appropriate targets + + glib/CMakeLists.txt | 1 + + test/CMakeLists.txt | 3 +++ + utils/CMakeLists.txt | 1 + + 3 files changed, 5 insertions(+) + +commit 821784a6f08adfbb5211d665389acc275e035e84 +Author: Albert Astals Cid +Date: Sun Dec 4 03:02:30 2022 +0100 + + cmake: Add missing LCMS2_INCLUDE_DIR + + qt5/src/CMakeLists.txt | 1 + + qt6/src/CMakeLists.txt | 1 + + utils/CMakeLists.txt | 3 +++ + 3 files changed, 5 insertions(+) + +commit 77d1660d6b6777a434a4c09f6c781999ab7ce0a8 +Author: Albert Astals Cid +Date: Sun Dec 4 02:42:15 2022 +0100 + + cmake: include dirs via target_include_directories + + instead of include_directories + + CMakeLists.txt | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit b1fe3a03c0bfdc4df6d8dd5d128b928d3cb2ea89 +Author: Albert Astals Cid +Date: Sun Dec 4 02:20:27 2022 +0100 + + cmake: nss: Fix typo and remove "deprecated" variables + + cmake/modules/FindNSS3.cmake | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 46b185c25472cb1cb90b9f83229a920fd638fd02 +Author: Albert Astals Cid +Date: Sun Dec 4 02:17:56 2022 +0100 + + Increase our minimum supported NSS to that of Ubuntu 20.04 too + + cmake/modules/FindNSS3.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2944c16a1ac7da0aaf9cb351ff664585968d8356 +Author: Albert Astals Cid +Date: Fri Dec 2 22:55:51 2022 +0100 + + Fix crash on broken documents + + Issue #1320 + + splash/Splash.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 54c93aade58b60699c0bf2c7962c274b6e6f7772 +Author: Albert Astals Cid +Date: Thu Dec 1 22:56:16 2022 +0100 + + Qt6: Less deprecated functions + + qt6/src/poppler-annotation.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 40c737a450153bdde180e0ee6e069a08c8e04dc4 +Author: Albert Astals Cid +Date: Thu Dec 1 22:08:40 2022 +0100 + + CI: Install Qt 6.2 in build_ubuntu_20_04 + + now that the other systems ship Qt 6.3 or newer we need at least + one CI + with our minimum required Qt + + .gitlab-ci.yml | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit df3746fa4c9413422bb70dbbb61108922a7fddc9 +Author: Albert Astals Cid +Date: Fri Jul 29 00:58:42 2022 +0200 + + cmake: Check we have a new enough libjpeg + + CMakeLists.txt | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit d5ea5a24124badf2b32a7d08dd2c06a4a40f93fb +Author: Albert Astals Cid +Date: Tue Mar 8 14:32:54 2022 +0100 + + Increase Minimum supported base to that provided by Ubuntu 20.04 + + .gitlab-ci.yml | 4 +-- + CMakeLists.txt | 58 + +++++++++++++++++++--------------- + cmake/modules/FindFontconfig.cmake | 52 ------------------------------- + cmake/modules/FindIconv.cmake | 64 + -------------------------------------- + cpp/CMakeLists.txt | 3 +- + poppler/GfxFont.cc | 14 ++++----- + qt5/CMakeLists.txt | 2 +- + 7 files changed, 44 insertions(+), 153 deletions(-) + +commit df568263c51950ceed6f1fb42f80e99a2614c275 +Author: Albert Astals Cid +Date: Thu Dec 1 21:19:03 2022 +0100 + + poppler 22.12.0 + + CMakeLists.txt | 4 ++-- + NEWS | 4 ++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 9 insertions(+), 5 deletions(-) + +commit 198dc1d0674c0a462668e6868c35b1ee0e731005 +Author: Albert Astals Cid +Date: Wed Sep 7 01:12:35 2022 +0200 + + Form::addFontToDefaultResources: Be stubborn in finding a font we + can use + + Fixes #1272 + + poppler/Form.cc | 14 ++++++++++--- + poppler/GlobalParams.cc | 52 + ++++++++++++++++++++++++++-------------------- + poppler/GlobalParams.h | 6 +++--- + poppler/GlobalParamsWin.cc | 4 ++-- + 4 files changed, 46 insertions(+), 30 deletions(-) + +commit a5952ab70716a2d4f792a943c2dcf3068f1d6885 +Author: Jeremy Bicha +Date: Wed Nov 2 15:03:24 2022 +0100 + + Revert "CI: Fix Debian brokenness" + + This reverts commit 8fcaa7c622d24761a9ecb3922f95d072077d6f34. + + Debian's systemd 252-2 fixed the bug in 252-1 + + .gitlab-ci.yml | 1 - + 1 file changed, 1 deletion(-) + +commit 8fcaa7c622d24761a9ecb3922f95d072077d6f34 +Author: Albert Astals Cid +Date: Tue Nov 1 10:11:41 2022 +0100 + + CI: Fix Debian brokenness + + .gitlab-ci.yml | 1 + + 1 file changed, 1 insertion(+) + +commit cc665f757af6b87dd245d36e079dd44d8d2d2182 +Author: Albert Astals Cid +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 +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 +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 +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 +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 +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 +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 +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 +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 +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 +Date: Mon Oct 3 18:11:20 2022 +0200 + + poppler 22.10.0 + + CMakeLists.txt | 4 ++-- + NEWS | 18 ++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 23 insertions(+), 5 deletions(-) + +commit 0ee0a90061abdd8858b1b6141f0e705088df29e9 +Author: Albert Astals Cid +Date: Tue Sep 27 01:07:13 2022 +0200 + + SplashOutputDev::tilingPatternFill: Properly restore CTM on failure + + Fixes issue #1292 + + poppler/SplashOutputDev.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 315ab3006fb24bf47b595343e6a3e90995f2a588 +Author: Albert Astals Cid +Date: Sat Sep 17 10:28:00 2022 +0200 + + CI: Update Fedora CI to 37, it's close enough to the release date + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 098b8622cc804c9fd41e2a56fbb2e116226b22b3 +Author: Albert Astals Cid +Date: Thu Sep 15 23:32:48 2022 +0200 + + Update (C) + + goo/GooString.cc | 2 +- + goo/GooString.h | 2 +- + poppler/PDFDoc.cc | 2 +- + poppler/PDFDoc.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit d6b7ef8794bad35366257e2644843f686326f4df +Author: Oliver Sander +Date: Thu Sep 15 16:19:19 2022 +0200 + + Remove the psmode argument from GooString::sanitizedName + + It is always 'false'. + + goo/GooString.cc | 12 +----------- + goo/GooString.h | 3 +-- + poppler/PDFDoc.cc | 4 ++-- + 3 files changed, 4 insertions(+), 15 deletions(-) + +commit 48974ec48f6e42084d0ff98f546e7211949f5d39 +Author: Oliver Sander +Date: Thu Sep 15 16:02:07 2022 +0200 + + Fix typos in method names + + 'dictionary' has only one 'n'. + + poppler/PDFDoc.cc | 24 ++++++++++++------------ + poppler/PDFDoc.h | 4 ++-- + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit be94b9c1d46db29592817d4afda63d9733b70b36 +Author: Albert Astals Cid +Date: Tue Sep 13 22:32:10 2022 +0200 + + pdftotext: Simplify memory handling + + utils/pdftotext.cc | 112 + ++++++++++++++++++++--------------------------------- + 1 file changed, 43 insertions(+), 69 deletions(-) + +commit 7441d79e31de909954675a76d33ccb25147cf0ff +Author: Claes Nästén +Date: Tue Jan 18 21:26:29 2022 +0100 + + Replace parts of font parsing code with std::string alternative + + strndup is not available on all platforms, instead of adding a compat + variant use std::string functionality for parsing instead. + + poppler/GlobalParams.cc | 80 + ++++++++++++++++++++++--------------------------- + 1 file changed, 36 insertions(+), 44 deletions(-) + +commit 2cd23e7e6de1e854e22c7fd666a9167a58662211 +Author: Albert Astals Cid +Date: Wed Sep 7 01:03:57 2022 +0200 + + Update (C) + + utils/pdftocairo.cc | 1 + + utils/pdftoppm.cc | 1 + + 2 files changed, 2 insertions(+) + +commit 756ab7a061f505722a92efdeb61765311d00e313 +Author: Albert Astals Cid +Date: Thu Jul 21 19:41:22 2022 +0200 + + JBIG2Stream::readPatternDictSeg: Protect against some overflow + + poppler/JBIG2Stream.cc | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit 119af9e894a928d9bad7d4f9e1681e54c9923439 +Author: James Cloos +Date: Tue Aug 9 23:37:07 2022 +0200 + + Avoid round-off errors when determining raster dimensions. + + The code in pdftoppm.cc and pdftocairo.cc carefully avoided overflow + when converting page sizes from points to pixels. + + This worked well when the math was performed at extended precision, + as is done when using x387 opcodes, but could lead to results too + large by a ulp when computed without extra precision. + + The code then needs to call ceil(3) to round fractional results up + to the next larger integer, resulting in an off-by-one error if the + computed size is even one ulp more than an integer. + + The initial size is already a multiple of 72, so rearranging the math + to multiply before dividing by 72 avoids that imprecision. + + Issue #253 + + utils/pdftocairo.cc | 2 +- + utils/pdftoppm.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit d06eb33d1668ca3a08055bd033d8f5ea725e5be7 +Author: Albert Astals Cid +Date: Fri Aug 12 23:29:01 2022 +0200 + + qt: Also take into account flagNoView when getting/setting the + visible status + + KDE bug #456313 + + qt5/src/poppler-form.cc | 10 +++++++++- + qt6/src/poppler-form.cc | 10 +++++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) + +commit 9e0d0e65261384bde8cb7f1932738bbeb19d3292 +Author: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> +Date: Thu Sep 1 13:18:39 2022 +0800 + + Fix `sed` invocation. + + The current `sed` call works only for GNU sed. We can fix that + by using + the `-e` flag. + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4602cac96104b74037862e223bb774be26bfd67c +Author: Albert Astals Cid +Date: Thu Sep 1 00:30:57 2022 +0200 + + poppler 22.09.0 + + CMakeLists.txt | 4 ++-- + NEWS | 19 +++++++++++++++++++ + cpp/CMakeLists.txt | 2 +- + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 6 files changed, 25 insertions(+), 6 deletions(-) + +commit 0c9bfb401780d6e05adba58e03c3dbdfa44c9895 +Author: Oliver Sander +Date: Wed Aug 31 11:07:14 2022 +0200 + + Store 'gfx' as a std::unique_ptr + + Otherwise it will leak if charProc is not a stream (line 488). + + Found by + + https://sonarcloud.io/project/overview?id=tsdgeos_poppler_mirror + + poppler/CairoFontEngine.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 9a3d991e62ba936495780007132299d73f3d603b +Author: Oliver Sander +Date: Wed Aug 31 11:05:18 2022 +0200 + + Fix copy'n'paste bug in the check for bounding box correctness + + Found by + + https://sonarcloud.io/project/overview?id=tsdgeos_poppler_mirror + + glib/tests/CMakeLists.txt | 2 +- + glib/tests/check_bb.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit c4cc5650067d4aca26091d187fb464eaee54bef0 +Author: Oliver Sander +Date: Tue Aug 30 14:30:34 2022 +0200 + + Store destination_private in a std::unique_ptr + + This simplifies the code a bit. + + It also fixes a 'code smell' found by + + https://sonarcloud.io/project/overview?id=tsdgeos_poppler_mirror + + cpp/poppler-destination.cpp | 16 +++------------- + cpp/poppler-destination.h | 4 +++- + 2 files changed, 6 insertions(+), 14 deletions(-) + +commit eb6b42a12a81cdf84b64db9e4e44b5158dcb8a3a +Author: Oliver Sander +Date: Tue Aug 30 14:26:43 2022 +0200 + + Make noncopyable objects move-assignable + + Move-assignment needs to be allowed explicitly, because + otherwise derived classes that implement operator=(&&) + will try to use noncopyable::operator=(&), which is + not allowed. + + cpp/poppler-global.cpp | 3 +++ + cpp/poppler-global.h | 2 ++ + 2 files changed, 5 insertions(+) + +commit 4f7ae5bbcf10e8eec44e08b885504a1115fb05a4 +Author: Albert Astals Cid +Date: Wed Aug 31 00:05:27 2022 +0200 + + Update (C) + + poppler/Annot.cc | 1 + + poppler/PDFDoc.cc | 1 + + poppler/SignatureHandler.cc | 1 + + 3 files changed, 3 insertions(+) + +commit 5c3cbea4044fed263fe5e34d911e9db85d55bdf4 +Author: Erich E. Hoover +Date: Thu Aug 4 10:31:16 2022 -0600 + + SignatureHandler: Fix getSignerName when signing_cert is available + but CMSSignerInfo is not + + poppler/SignatureHandler.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 8452b0dee6b5267e785bf6dea4d7b537a4cfb637 +Author: Erich E. Hoover +Date: Sat Jul 30 15:40:08 2022 -0600 + + Form: When signing with an appearance, ensure that a Form exists + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2beb458226509c3babd78e658e1a8ac72ccfb2b8 +Author: Erich E. Hoover +Date: Sat Jul 30 10:27:23 2022 -0600 + + Annot: Fix applying signatures to fields that are not part of a form + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 977dd2171fc3cf91d4a9d5855e379c39df8ee77e +Author: Erich E. Hoover +Date: Fri Jul 29 17:04:36 2022 -0600 + + PDFDoc: Fix finding signature fields not associated with a form + + poppler/PDFDoc.cc | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit 6b5437a07535d5fd07c114e71c2cbff9b2a2f454 +Author: Albert Astals Cid +Date: Mon Aug 29 00:45:19 2022 +0200 + + Fix memory leak in TextStringToUTF8 + + utils/pdfsig.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 27354e9d9696ee2bc063910a6c9a6b27c5184a52 +Author: Albert Astals Cid +Date: Thu Aug 25 00:14:22 2022 +0200 + + JBIG2Stream: Fix crash on broken file + + https://github.com/jeffssh/CVE-2021-30860 + + Thanks to David Warren for the heads up + + poppler/JBIG2Stream.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 619bfc1f280eed11523e6f8756460ed2598769b9 +Author: Albert Astals Cid +Date: Tue Aug 23 22:31:24 2022 +0200 + + cmake: Better linking against GTK3 + + glib/demo/CMakeLists.txt | 7 ------- + glib/tests/CMakeLists.txt | 7 +------ + test/CMakeLists.txt | 9 ++------- + 3 files changed, 3 insertions(+), 20 deletions(-) + +commit 5bec49749b9a2a9b4779a977f673531b42470264 +Author: Albert Astals Cid +Date: Fri Aug 19 22:20:17 2022 +0200 + + We can use isnan now + + poppler/Function.cc | 4 ++-- + poppler/MarkedContentOutputDev.cc | 6 +++--- + poppler/TextOutputDev.cc | 3 +-- + 3 files changed, 6 insertions(+), 7 deletions(-) + +commit 03c7bbd6216cbfac257243b59453084f5f52e354 +Author: Albert Astals Cid +Date: Fri Aug 19 18:52:11 2022 +0200 + + JBIG2Stream::readHalftoneRegionSeg: Fix potential memory leak + + poppler/JBIG2Stream.cc | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit d1b1535af673170c5e094b924dd3cc122890270e +Author: Albert Astals Cid +Date: Fri Aug 19 18:41:38 2022 +0200 + + pdfunite: Fix potential memory leak of docs + + utils/pdfunite.cc | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +commit 99889f51e95169c4946f3bbd74adb317bf3b64a9 +Author: Albert Astals Cid +Date: Fri Aug 19 18:38:06 2022 +0200 + + glib: Fix two potential memory leaks in + poppler_document_create_dests_tree + + glib/poppler-document.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit efb68686784f0c58668b7ced990fd173e09346db +Author: Albert Astals Cid +Date: Thu Aug 18 23:41:24 2022 +0200 + + pdfunite: Don't crash in broken documents + + utils/pdfunite.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit b976740c3dfb8e29ee716a9ab19ba5bb4106f5a0 +Author: Albert Astals Cid +Date: Fri Aug 19 13:41:27 2022 +0200 + + CI: remove workarounds for cmake 3.24.0 + + now that they have 3.24.1 + + .gitlab-ci.yml | 4 ++-- + CMakeLists.txt | 6 ------ + qt5/tests/CMakeLists.txt | 24 ------------------------ + qt6/tests/CMakeLists.txt | 24 ------------------------ + 4 files changed, 2 insertions(+), 56 deletions(-) + +commit c569e5d819de1e53813ebd8409e57c297d069537 +Author: Albert Astals Cid +Date: Sat Aug 13 18:55:57 2022 +0200 + + Add (C) + + poppler/PDFDoc.h | 1 + + 1 file changed, 1 insertion(+) + +commit 4564a002bcb6094cc460bc0d5ddff9423fe6dd28 +Author: crt +Date: Sat Aug 13 16:53:11 2022 +0000 + + pdfunite: Fix crash on broken files + + poppler/PDFDoc.cc | 6 +++++- + poppler/PDFDoc.h | 2 +- + utils/pdfunite.cc | 9 ++++++++- + 3 files changed, 14 insertions(+), 3 deletions(-) + +commit c9c5eb782a8820f328dc32bcaf74d7f0b2cb6d7a +Author: Oliver Sander +Date: Sun Aug 7 10:49:00 2022 +0200 + + Use std::vector to store dash patterns + + Makes the code more readable. + + poppler/Annot.cc | 73 + +++++++++++-------------------------------- + poppler/Annot.h | 6 ++-- + poppler/CairoOutputDev.cc | 8 ++--- + poppler/Gfx.cc | 33 ++++++------------- + poppler/GfxState.cc | 16 ++-------- + poppler/GfxState.h | 11 +++---- + poppler/PSOutputDev.cc | 8 ++--- + poppler/PreScanOutputDev.cc | 6 ++-- + poppler/SplashOutputDev.cc | 9 ++---- + qt5/src/QPainterOutputDev.cc | 10 +++--- + qt5/src/poppler-annotation.cc | 15 +++++---- + qt6/src/QPainterOutputDev.cc | 10 +++--- + qt6/src/poppler-annotation.cc | 11 ++----- + 13 files changed, 67 insertions(+), 149 deletions(-) + +commit b8aaf51d69938412f9cca215d3825f53931706d6 +Author: Albert Astals Cid +Date: Tue Aug 9 00:21:00 2022 +0200 + + Workaround cmake 3.24.0 warning-y code + + https://gitlab.kitware.com/cmake/cmake/-/issues/23823 + + .gitlab-ci.yml | 6 ++---- + CMakeLists.txt | 6 ++++++ + qt5/tests/CMakeLists.txt | 24 ++++++++++++++++++++++++ + qt6/tests/CMakeLists.txt | 24 ++++++++++++++++++++++++ + 4 files changed, 56 insertions(+), 4 deletions(-) + +commit 6ea5c63b7d8a1728f178b3a5d377bca3a17f7447 +Author: Albert Astals Cid +Date: Sun Aug 7 13:20:13 2022 +0200 + + clang-format-14 reformat to ignore-revs file + + .git-blame-ignore-revs | 2 ++ + 1 file changed, 2 insertions(+) + +commit a94a444e5acff86e04d1688d862e81a82108cf03 +Author: Albert Astals Cid +Date: Fri Jul 29 16:31:10 2022 +0200 + + CI: clang 13 -> 14 + + .gitlab-ci.yml | 19 ++-- + README.contributors | 2 +- + goo/gfile.h | 10 +- + poppler/CairoOutputDev.h | 100 ++++++++++++++---- + poppler/Gfx.h | 10 +- + poppler/GfxState.h | 65 +++++++++--- + poppler/GlobalParams.cc | 5 +- + poppler/OutputDev.h | 107 +++++++++++++++---- + poppler/PDFDoc.h | 260 + ++++++++++++++++++++++++++++++++++++---------- + poppler/PSOutputDev.h | 155 +++++++++++++++++++++------ + poppler/SplashOutputDev.h | 15 ++- + poppler/TextOutputDev.h | 125 +++++++++++++++++----- + qt5/src/poppler-private.h | 5 +- + qt6/src/poppler-private.h | 5 +- + splash/Splash.h | 15 ++- + utils/InMemoryFile.h | 5 +- + 16 files changed, 715 insertions(+), 188 deletions(-) + +commit 1abe4a246adc4b655b7e2bf9a00c537d8d360329 +Author: Albert Astals Cid +Date: Sat Aug 6 11:50:40 2022 +0200 + + Save copying data in SplashState::setLineDash + + poppler/SplashOutputDev.cc | 6 +++--- + splash/Splash.cc | 35 ++++++++++++----------------------- + splash/Splash.h | 6 ++---- + splash/SplashState.cc | 27 ++++----------------------- + splash/SplashState.h | 9 ++++----- + 5 files changed, 25 insertions(+), 58 deletions(-) + +commit 58e30f9aac59437c438b973bedc6a7982349c63a +Author: Oliver Sander +Date: Sat Aug 6 09:53:52 2022 +0200 + + Do not truncate line dash patterns with more than 20 entries + + Because otherwise files with longer patterns will not render + correctly. One example is the file in + + https://gitlab.freedesktop.org/poppler/poppler/-/issues/1281 + + Fixes: 1281 + + poppler/SplashOutputDev.cc | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 56a7f817567d65ce62bea03af27c0e60340116f4 +Author: Albert Astals Cid +Date: Fri Aug 5 23:24:30 2022 +0200 + + CI: workaround cmake 3.24.0 issues + + https://gitlab.kitware.com/cmake/cmake/-/issues/23823 + + .gitlab-ci.yml | 2 ++ + 1 file changed, 2 insertions(+) + +commit da27bb857f733ac0cd2115ba90b802d5e4382bc6 +Author: Albert Astals Cid +Date: Thu Aug 4 01:41:46 2022 +0200 + + pdfsig: signatureNumber doesn't need to be global anymore + + utils/pdfsig.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7a08fc031c7ef42f6aeb1b3d034c9627cba701a7 +Author: Albert Astals Cid +Date: Thu Aug 4 01:40:50 2022 +0200 + + Update (C) + + poppler/Form.cc | 1 + + utils/pdfsig.cc | 1 + + 2 files changed, 2 insertions(+) + +commit 64ccb8d248611fd1d7aef279d08ea7589a4e1fcb +Author: Erich E. Hoover +Date: Mon Aug 1 16:02:05 2022 -0600 + + pdfsig: Add support for specifying signature by field name + + utils/pdfsig.1 | 4 ++-- + utils/pdfsig.cc | 32 +++++++++++++++++++++++++++++++- + 2 files changed, 33 insertions(+), 3 deletions(-) + +commit ec71a5dc45039f2a8352b99803e98c148a2679a8 +Author: Erich E. Hoover +Date: Fri Jul 29 10:12:53 2022 -0600 + + pdfsig: List signature field names when listing signature information + + utils/pdfsig.cc | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +commit 41af89601202f7973a6044f31ed14eba05c77f9a +Author: Erich E. Hoover +Date: Tue Aug 2 14:12:06 2022 -0600 + + Fix convertToUtf16 so it does not add the Unicode marker to the + output string + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0c42f7482ca3ab9ec6945c4975b8fb6f0a2cb7cc +Author: Albert Astals Cid +Date: Tue Aug 2 23:18:41 2022 +0200 + + Fix error() string formatting + + poppler/Form.cc | 18 +++++++++--------- + poppler/GlobalParams.cc | 4 ++-- + 2 files changed, 11 insertions(+), 11 deletions(-) + +commit 12853d22e9d0527c10ada02666aef629db3e5e7c +Author: Albert Astals Cid +Date: Mon Aug 1 23:06:48 2022 +0200 + + 22.08.0 + + CMakeLists.txt | 4 ++-- + NEWS | 6 ++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 11 insertions(+), 5 deletions(-) + +commit 78e939131f868e3ea6541ee1c096d82cd548e706 +Author: Albert Astals Cid +Date: Mon Aug 1 21:33:25 2022 +0200 + + Fix infinite recursion in broken files + + oss-fuzz/49702 + + poppler/Annot.cc | 31 +++++++++++++++++++++++++++---- + 1 file changed, 27 insertions(+), 4 deletions(-) + +commit a89c3c27e02e9c300aa667c966d91fdf787c7d0a +Author: Albert Astals Cid +Date: Sat Jul 30 19:13:31 2022 +0200 + + Merge Form DR into widget DR + + Fixes #1189 + Fixes #1267 + + poppler/Annot.cc | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +commit e57106ffc5b2589e6d1e11182f1ff9e5370848f2 +Author: Albert Astals Cid +Date: Mon Aug 1 00:00:11 2022 +0200 + + Update clang used for clazy + + .gitlab-ci.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8677500399fc2548fa816b619580c2c07915a98c +Author: Albert Astals Cid +Date: Fri Jul 29 23:28:35 2022 +0200 + + pdfseparate: Account for XRef::add failing because we run out + of memory + + Fixes #1278 + + poppler/PDFDoc.cc | 63 + ++++++++++++++++++++++++++++++++++++++++++------------- + poppler/PDFDoc.h | 6 +++--- + poppler/XRef.cc | 11 ++++++++-- + poppler/XRef.h | 4 ++-- + 4 files changed, 62 insertions(+), 22 deletions(-) + +commit ae6be1946e4eefd0d4f798930f9dfbb6fe332959 +Author: Albert Astals Cid +Date: Fri Jul 29 22:52:57 2022 +0200 + + Update (C) + + and fix format, somehow i landed this without waiting for CI results, + bad bad Albert + + utils/pdfunite.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 4631115647c1e4f0482ffe0491c2f38d2231337b +Author: crt +Date: Fri Jul 29 20:51:11 2022 +0000 + + Check isDict before calling getDict + + Issue #1276 + + utils/pdfunite.cc | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit cb1f2a685461b60e05d503165d05ea6c557ff277 +Author: Albert Astals Cid +Date: Fri Jul 29 20:59:28 2022 +0200 + + JBIG2Stream: Fix crash on broken files + + oss-fuzz/49406 + + poppler/JBIG2Stream.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 8f874169e5d43418873b40e86954b86c01f7ba99 +Author: Albert Astals Cid +Date: Fri Jul 29 16:26:20 2022 +0200 + + Generate qt6 docs + + .gitlab-ci.yml | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit b443f529a1a35b9d5028cb95c6dcc0111e1acec1 +Author: Albert Astals Cid +Date: Fri Jul 29 00:25:33 2022 +0200 + + Update (C) + + poppler/CairoFontEngine.cc | 1 + + poppler/PDFDoc.cc | 1 + + 2 files changed, 2 insertions(+) + +commit 2e3c53b71f78b13f2afdb122c2d59243de70ac45 +Author: Albert Astals Cid +Date: Thu Jul 28 01:10:27 2022 +0200 + + Fix leak in early return check that was just introduced + + poppler/PDFDoc.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit dcd5bd8238ea448addd102ff045badd0aca1b990 +Author: crt +Date: Wed Jul 27 08:40:02 2022 +0000 + + pdfseparate: Check XRef's Catalog for being a Dict + + poppler/PDFDoc.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit b96437128742e87a7603fa2a4d74baeda8368fba +Author: Marcel Fabian Krüger +Date: Thu Jul 21 23:47:39 2022 +0200 + + Support Type3 charprocs having Resources in Cairo + + In !955 the same was done for OutputDevs with + interpretType3Chars()=true, + this adds similar handling to CairoFontEngine. + + poppler/CairoFontEngine.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit bb1651334abc11495fa0326c8d562243d2a4b055 +Author: Albert Astals Cid +Date: Mon Jul 4 20:09:04 2022 +0200 + + poppler 22.07.0 + + CMakeLists.txt | 2 +- + NEWS | 14 ++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 6 files changed, 19 insertions(+), 5 deletions(-) + +commit 16812b7f41ea2a7299449415aae89d3d812b6b47 +Author: Albert Astals Cid +Date: Mon Jul 4 00:18:22 2022 +0200 + + Update (C) + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a0e4ff30be462cae010d22d291ab282f5d86a5e3 +Author: Nelson Benítez León +Date: Wed May 11 21:07:30 2022 -0400 + + glib: add support for stamp annotation + + Creates new PopplerAnnotStamp type with the + following public api: + + PopplerAnnot *poppler_annot_stamp_new(PopplerDocument *doc, + PopplerRectangle *rect); + PopplerAnnotStampIcon poppler_annot_stamp_get_icon(PopplerAnnotStamp + *poppler_annot); + void poppler_annot_stamp_set_icon(PopplerAnnotStamp *poppler_annot, + PopplerAnnotStampIcon icon); + gboolean poppler_annot_stamp_set_custom_image(PopplerAnnotStamp + *poppler_annot, cairo_surface_t *image, GError **error); + + Updates poppler-glib-demo to test PopplerAnnotStamp + including the custom image support. + + glib/demo/annots.c | 171 ++++++++++++++++++++- + glib/poppler-annot.cc | 288 + ++++++++++++++++++++++++++++++++++++ + glib/poppler-annot.h | 35 +++++ + glib/poppler-page.cc | 3 + + glib/poppler-private.h | 2 + + glib/poppler.h | 1 + + glib/reference/poppler-sections.txt | 10 ++ + glib/reference/poppler.types | 1 + + 8 files changed, 507 insertions(+), 4 deletions(-) + +commit 40762b05b73ec790c8cbe33ab76770f181f67aee +Author: Nelson Benítez León +Date: Sun Jun 19 19:28:52 2022 -0400 + + Form.cc: Fix crash in Form::ensureFontsForAllCharacters() + + code was assuming that defaultResources->lookupFont() would + never return null. + + Fixes #1258 + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 188aa1f8547e945752344e4e2294d4eafa167018 +Author: Fabian Keßler +Date: Mon Jun 20 18:55:31 2022 +0000 + + Fixes 2 MSVC compilation bugs + + glib/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a59bd7fa60609beb0e59eef0706ffe69f98e5beb +Author: Albert Astals Cid +Date: Fri Jun 17 19:50:31 2022 +0200 + + Update (C) + + poppler/NameToUnicodeTable.h | 1 + + 1 file changed, 1 insertion(+) + +commit 9f938008f64bba382095fe6044a786950e059bae +Author: Vincent Lefevre +Date: Fri Jun 17 17:51:02 2022 +0200 + + Add ToUnicode support for lessorequalslant and greaterorequalslant + + Character names lessorequalslant and greaterorequalslant are generated + from \leqslant and \geqslant in LaTeX with the amssymb package. They + correspond to the Unicode characters + U+2A7D LESS-THAN OR SLANTED EQUAL TO + U+2A7E GREATER-THAN OR SLANTED EQUAL TO + + poppler/NameToUnicodeTable.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8a14a2dd6fb837944a4465646b8154d75fe6c3cc +Author: Albert Astals Cid +Date: Thu Jun 16 19:18:21 2022 +0200 + + Make the pregenerated contents more stable + + by running sed to remove the path from gperf command line + + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 727b334b00e1e298badcca94700369a13846f822 +Author: Fabian Keßler +Date: Thu Jun 16 17:15:11 2022 +0000 + + Run gperf as the full path found by find_program + + instead of relying it being in the path + + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e7e9721b120876cddf16fc98a605ecb49dc44620 +Author: Albert Astals Cid +Date: Tue May 24 17:11:05 2022 +0200 + + Annot: Fix first lines of Annotations sometimes being cut off + + What we're calculating in those two places is the top left corner for + where to draw the character substracting the descent doesn't make any + sense. + + Bug #1246 + + poppler/Annot.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit da226d346e691f7545d995d6761d43e08855a3b7 +Author: Adrian Johnson +Date: Sat Jun 11 20:36:13 2022 +0930 + + CairoFontEnginer: increment font_face reference when retrieving from + the cache + + since ~CairoFont() will decrement the reference count + + poppler/CairoFontEngine.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 184efabbaed7250903169627fbbaeb505ee2f51a +Author: Albert Astals Cid +Date: Mon Jun 6 11:23:51 2022 +0200 + + Signatures: Don't crash if the signature doesn't have a common name + + Fixes KDE bug #454782 + + poppler/SignatureHandler.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 32fa2888eaaaaf80e5d2338cb8cb8b773ccfd4d3 +Author: Albert Astals Cid +Date: Wed Jun 1 17:00:51 2022 +0200 + + poppler 22.06.0 + + CMakeLists.txt | 4 ++-- + NEWS | 15 +++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 20 insertions(+), 5 deletions(-) + +commit b4a961ecdaeb66daf603980cc294e17968ef5037 +Author: Albert Astals Cid +Date: Wed Jun 1 00:39:55 2022 +0200 + + Update (C) + + poppler/Form.cc | 2 +- + qt5/src/QPainterOutputDev.cc | 2 +- + qt6/src/QPainterOutputDev.cc | 2 +- + splash/SplashFTFontFile.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit d24ff1963429f409d5286632108d46d34ae3f2b1 +Author: Adrian Johnson +Date: Wed May 11 08:32:24 2022 +0930 + + Make FT support UTF-8 filenames on windows + + CMakeLists.txt | 17 ++++++----- + goo/ft_utils.cc | 71 + ++++++++++++++++++++++++++++++++++++++++++++ + goo/ft_utils.h | 25 ++++++++++++++++ + poppler/CairoFontEngine.cc | 3 +- + poppler/Form.cc | 5 ++-- + qt5/src/QPainterOutputDev.cc | 3 +- + qt6/src/QPainterOutputDev.cc | 3 +- + splash/SplashFTFontFile.cc | 7 +++-- + 8 files changed, 118 insertions(+), 16 deletions(-) + +commit 2edb75336aaea52007d3d2e2f3f4566978a948a4 +Author: Albert Astals Cid +Date: Wed Jun 1 00:28:18 2022 +0200 + + Update (C) + + utils/HtmlOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit ae13fd1f561125be152f3249ca87c8259b22ca6a +Author: Brian Rosenfield +Date: Tue May 31 21:21:16 2022 +0000 + + Fix type 3 font size initialization in pdftohtml using font + bounding box + + utils/HtmlOutputDev.cc | 50 + +++++++++++++++++++++++++++++--------------------- + 1 file changed, 29 insertions(+), 21 deletions(-) + +commit f33cdde7e0e6a6352d724033cc9801c964487bc6 +Author: Adrian Johnson +Date: Sat May 14 12:47:23 2022 +0930 + + Refactor CairoFontEngine caching + + poppler/CairoFontEngine.cc | 421 + ++++++++++++++++++--------------------------- + poppler/CairoFontEngine.h | 44 +++-- + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 2 +- + 4 files changed, 204 insertions(+), 265 deletions(-) + +commit 7c822d062fe5602475f82746d0fd5961a70a831a +Author: Albert Astals Cid +Date: Wed May 25 17:59:26 2022 +0200 + + test: Fix finding cairo headers on compile time + + test/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +commit ea8c6fe95ef63e0f6d6502d2521c0a0dac17cc1d +Author: Albert Astals Cid +Date: Wed May 25 14:51:22 2022 +0200 + + Make gcc a bit happier + + cpp/poppler-page.h | 6 +++--- + qt5/src/QPainterOutputDev.cc | 3 ++- + qt6/src/QPainterOutputDev.cc | 3 ++- + 3 files changed, 7 insertions(+), 5 deletions(-) + +commit a8ffdc092dff15a7729d4ec2e5a1476dc1030172 +Author: Adrian Johnson +Date: Tue May 24 19:12:48 2022 +0930 + + Add cairo thread test + + test/CMakeLists.txt | 21 ++ + test/cairo-thread-test.cc | 561 + ++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 582 insertions(+) + +commit 3d8e5e005fb553147c2a4a6d7327c98896221faa +Author: Albert Astals Cid +Date: Mon May 9 00:44:16 2022 +0200 + + pdfattach: Assume filename is utf8 encoded + + Which is the encoding most [linux] OS use + + Fixes issue #1079 + + utils/pdfattach.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit b700e0b254ed35b672b85bb86d6a81877fe30e10 +Author: Albert Astals Cid +Date: Tue May 17 00:52:04 2022 +0200 + + Forms: Fix crash in forms with their own DR + + When adding potentially missing fonts to the PDF file because we have + written a letter like ħ that is not available on the form font, + if the + form has their own DR, we also need to add the font to that DR + Font dict + and not only to the global Form one (in theory we would only have + to add + it to the particular form one and not to the global, but it's easier + this way and it's not like we're adding the data twice, we're just + adding the Ref to two dicts) + + poppler/Form.cc | 52 + ++++++++++++++++++++++++++++++++----------- + poppler/Form.h | 16 +++++++++---- + poppler/PDFDoc.cc | 2 +- + qt5/src/poppler-annotation.cc | 2 +- + qt6/src/poppler-annotation.cc | 2 +- + 5 files changed, 54 insertions(+), 20 deletions(-) + +commit 4139f79cf8c4e3f529570c9a300491c36f9100e8 +Author: Albert Astals Cid +Date: Fri May 13 01:31:00 2022 +0200 + + TextPage::coalesce: Fix crash on broken files + + oss-fuzz/47350 + + poppler/TextOutputDev.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 4eeb3380ea77d277ace735f191f303564a25a0e3 +Author: Albert Astals Cid +Date: Thu May 12 22:42:02 2022 +0200 + + greallocn: Make gcc 12.1 happier + + Without this hint that bytes is always going to be > 0 we got + a million + of warnings like + + In function ‘void gfree(void*)’, + inlined from ‘void* greallocn(void*, int, int, bool, bool)’ + at goo/gmem.h:178:14, + inlined from ‘void CharCodeToUnicode::setMapping(CharCode, + Unicode*, int)’ at poppler/CharCodeToUnicode.cc:648:60: + goo/gmem.h:65:14: warning: pointer used after ‘void free(void*)’ + [-Wuse-after-free] + 65 | std::free(p); + | ~~~~~~~~~^~~ + In function ‘void gfree(void*)’, + inlined from ‘void* grealloc(void*, size_t, bool)’ at + goo/gmem.h:73:14, + inlined from ‘void* greallocn(void*, int, int, bool, bool)’ + at goo/gmem.h:174:27, + inlined from ‘void CharCodeToUnicode::setMapping(CharCode, + Unicode*, int)’ at poppler/CharCodeToUnicode.cc:648:60: + goo/gmem.h:65:14: note: call to ‘void free(void*)’ here + 65 | std::free(p); + | ~~~~~~~~~^~~ + + goo/gmem.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e7f0fd89d937d28a77539fb9782a2b59eb51e5a8 +Author: Albert Astals Cid +Date: Thu May 12 22:38:40 2022 +0200 + + NetPBMWriter: Change destructor + + Makes gcc 12.1 happier, i think it was a gcc bug anyway, but the new + code is a bit "better" anyway, the warning i was getting is + + In file included from utils/ImageOutputDev.cc:44: + In destructor ‘virtual NetPBMWriter::~NetPBMWriter()’, + inlined from ‘virtual NetPBMWriter::~NetPBMWriter()’ at + goo/NetPBMWriter.h:41:31, + inlined from ‘void ImageOutputDev::writeImage(GfxState*, + Object*, Stream*, int, int, GfxImageColorMap*, bool)’ at + utils/ImageOutputDev.cc:636:16: + goo/NetPBMWriter.h:41:31: warning: array subscript + ‘NetPBMWriter[0]’ is partly outside array bounds of ‘ImgWriter + [2]’ [-Warray-bounds] + 41 | ~NetPBMWriter() override {}; + | ^ + utils/ImageOutputDev.cc: In member function ‘void + ImageOutputDev::writeImage(GfxState*, Object*, Stream*, int, int, + GfxImageColorMap*, bool)’: + utils/ImageOutputDev.cc:620:57: note: object of size 16 allocated + by ‘operator new’ + 620 | writer = new PNGWriter(PNGWriter::MONOCHROME); + | ^ + utils/ImageOutputDev.cc:623:51: note: object of size 16 allocated + by ‘operator new’ + 623 | writer = new PNGWriter(PNGWriter::GRAY); + | ^ + utils/ImageOutputDev.cc:627:52: note: object of size 16 allocated + by ‘operator new’ + 627 | writer = new PNGWriter(PNGWriter::RGB48); + | ^ + utils/ImageOutputDev.cc:630:50: note: object of size 16 allocated + by ‘operator new’ + 630 | writer = new PNGWriter(PNGWriter::RGB); + | ^ + + goo/NetPBMWriter.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cf5034d83593dae25890d8cb58159491683629f6 +Author: Albert Astals Cid +Date: Thu May 12 22:35:33 2022 +0200 + + Update (C) + + poppler/CairoOutputDev.cc | 2 +- + poppler/GfxState.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b2f48cfc89b0ef73e0eed56ca819bf6add04eb96 +Author: Albert Astals Cid +Date: Wed May 4 00:13:56 2022 +0200 + + Fix uninitialized memory read on broken files + + fofi/FoFiType1C.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 5b476757e70c79e8dca5fe2a3fb69cbbbfe710a9 +Author: Albert Astals Cid +Date: Fri Apr 22 17:50:04 2022 +0200 + + GetWindowsFontDir: Simply call SHGetFolderPathA + + Instead of all the dance with loading various different dlls + + We don't support terribly old Windows that don't even have + SHGetFolderPathA + + poppler/GlobalParamsWin.cc | 34 +++------------------------------- + 1 file changed, 3 insertions(+), 31 deletions(-) + +commit 29f32a477f0f75ee44df890acac377a2eed314c6 +Author: Adrian Johnson +Date: Fri Apr 22 16:15:09 2022 +0930 + + cairo: preserve text color when drawing type 3 glyphs + + Type 3 glyphs (that don't override the color) should be painted with + the current graphics state color when the text operator is invoked. + + poppler/CairoFontEngine.cc | 11 +++- + poppler/CairoOutputDev.cc | 154 + ++++++++++++++++++++++++++++++--------------- + poppler/CairoOutputDev.h | 21 +++++-- + poppler/GfxState.h | 2 + + 4 files changed, 130 insertions(+), 58 deletions(-) + +commit 27672cc02a6dd07849bf83a298597e083831ec49 +Author: Albert Astals Cid +Date: Wed May 4 23:25:49 2022 +0200 + + JBIGStream: Fix unint memory read on broken files + + oss-fuzz/47224 + + poppler/JBIG2Stream.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 09db9f0d7ff30f3a9eac1b682d1d38cb809fa940 +Author: Albert Astals Cid +Date: Thu May 5 23:17:36 2022 +0200 + + Update (C) + + cpp/poppler-global.h | 1 + + 1 file changed, 1 insertion(+) + +commit 5d543e801d304e4cdbe12506f62c340d509f12f3 +Author: Tobias C. Berner +Date: Thu May 5 04:59:42 2022 +0000 + + Fix c_time usage + + In 2656d986d01da5aea4f51c75e4deee569ca88064 the time type was switched + to time_t, without including the necessary ctime header. + + cpp/poppler-global.h | 1 + + 1 file changed, 1 insertion(+) + +commit d2dd9c322542eb7ea9e3e0b8324b33b3af9d8b1e +Author: Albert Astals Cid +Date: Tue May 3 22:18:46 2022 +0200 + + poppler 22.05.0 + + CMakeLists.txt | 4 ++-- + NEWS | 20 ++++++++++++++++++++ + cpp/CMakeLists.txt | 2 +- + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 6 files changed, 26 insertions(+), 6 deletions(-) + +commit ac9b736c3f20704a41db9102589fa259abb26891 +Author: Albert Astals Cid +Date: Tue May 3 00:16:00 2022 +0200 + + Fix rendering regression introduced in + 5f915d46c99ecbc0c026b86de50f9e0243391a01 + + We can't assume "Fields" needs to exist, there's other things + there like + NeedAppearances that are valid without Fields + + The bug in Catalog::addFormToAcroForm remains, but will need to + wait to + get fixed on next release + + poppler/Catalog.cc | 6 ------ + 1 file changed, 6 deletions(-) + +commit 133d0b06c61fae2b1ad1cb4164d10eddba589049 +Author: Albert Astals Cid +Date: Sat Apr 30 10:03:39 2022 +0200 + + Update (C) + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8ce9069f5dff8636373c546f33495908a963777e +Author: Nelson Benítez León +Date: Sat Apr 23 18:14:37 2022 -0400 + + fix multiline find_text() bug in two column docs + + Fix for a bug in double column documents where some + single line matches are wrongly returned as being + multiline matches. + + Includes test case for the bug. + + glib/poppler-page.cc | 6 +++--- + poppler/TextOutputDev.cc | 6 ++++++ + qt5/tests/check_search.cpp | 22 ++++++++++++++++++++++ + qt6/tests/check_search.cpp | 22 ++++++++++++++++++++++ + 4 files changed, 53 insertions(+), 3 deletions(-) + +commit 309004931712476b0ee751fc60224a87c14daf56 +Author: Nelson Benítez León +Date: Mon Apr 18 20:03:49 2022 -0400 + + fix bug in multiline find_text() + + which caused some false positives being returned. + + Includes test case for the bug. + + See original comment about this bug: + https://gitlab.gnome.org/GNOME/evince/-/merge_requests/159#note_1431380 + + poppler/TextOutputDev.cc | 3 ++- + qt5/tests/check_search.cpp | 5 +++++ + qt6/tests/check_search.cpp | 5 +++++ + 3 files changed, 12 insertions(+), 1 deletion(-) + +commit 85b487c5f71ab0352fcda9ea86cca16f959004b0 +Author: Albert Astals Cid +Date: Mon Apr 25 20:56:05 2022 +0200 + + Update (C) + + utils/HtmlOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 44533caf6b74ec3d531eb7ceec6ed2a31b24079a +Author: Adrian Johnson +Date: Mon Apr 25 19:46:22 2022 +0930 + + HtmlOutputDev: don't use png.h + + It is not needed. Fixes mingw build that was failing with png.h + not found. + + utils/HtmlOutputDev.cc | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit 8ed7d5633db76df10ef340edc31f1cc868e3ab02 +Author: Albert Astals Cid +Date: Fri Apr 22 13:47:18 2022 +0200 + + Rework GetWindowsFontDir + + goo/GooString.h | 5 +++++ + poppler/GlobalParams.cc | 2 +- + poppler/GlobalParamsWin.cc | 39 +++++++++++++++++---------------------- + 3 files changed, 23 insertions(+), 23 deletions(-) + +commit 74f11fbcffda7679d1b2e16f82668d482677ab8c +Author: Albert Astals Cid +Date: Fri Apr 22 11:12:37 2022 +0200 + + Stream: Fix two types to hold what the are stored to + + poppler/Stream.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 67190c0a05045d3c3eef4d5f0eaeb4435eb59c7c +Author: Albert Astals Cid +Date: Wed Apr 20 19:58:56 2022 +0200 + + CI: -Werror for the Android builder + + .gitlab-ci.yml | 1 + + poppler/GfxState.cc | 2 ++ + poppler/GlobalParams.cc | 4 ++++ + 3 files changed, 7 insertions(+) + +commit 2656d986d01da5aea4f51c75e4deee569ca88064 +Author: Albert Astals Cid +Date: Sat Apr 2 22:21:35 2022 +0200 + + cpp: Use time_t for time + + The existing time_type is unsigned int which suffers from the Y2K38 + problem + + cpp/poppler-document.cpp | 136 + +++++++++++++++++++++++++++++++++++++++++- + cpp/poppler-document.h | 20 ++++--- + cpp/poppler-embedded-file.cpp | 26 +++++++- + cpp/poppler-embedded-file.h | 8 ++- + cpp/poppler-global.cpp | 11 +++- + cpp/poppler-global.h | 6 +- + cpp/tests/poppler-dump.cpp | 8 +-- + 7 files changed, 195 insertions(+), 20 deletions(-) + +commit bd7bc10636ce20159133f846dfc337f2ab92b5ed +Author: Albert Astals Cid +Date: Mon Apr 18 19:34:52 2022 +0200 + + CI: Update mingw to fedora 36 + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 368465a8ce191a5756abae90d49ca861fae104e7 +Author: Albert Astals Cid +Date: Fri Apr 15 10:43:31 2022 +0200 + + Update (C) + + poppler/Form.cc | 1 + + poppler/Form.h | 1 + + qt5/src/poppler-form.cc | 1 + + qt6/src/poppler-form.cc | 1 + + 4 files changed, 4 insertions(+) + +commit 10d74ff226b8b7e930a75b050664272df30c2aba +Author: Alexander Sulfrian +Date: Thu Apr 14 00:43:58 2022 +0200 + + qt: Pass leftFontSize down to + `FormWidgetSignature::signDocumentWithAppearence` + + A similar issue for `PDFDoc::sign` was already fixed in: + 864466a6753014106448f1a6c0000aa68bedf101 + + poppler/Form.cc | 3 ++- + poppler/Form.h | 2 +- + qt5/src/poppler-form.cc | 5 +++-- + qt6/src/poppler-form.cc | 5 +++-- + 4 files changed, 9 insertions(+), 6 deletions(-) + +commit 6a4bbacbfa0c914162ffb23cc759a9adafc9e295 +Author: Albert Astals Cid +Date: Thu Apr 14 01:23:55 2022 +0200 + + Fix crash in very badly damaged documents when adding a freetext + annotation + + oss-fuzz/46497 + + poppler/Catalog.cc | 9 +++++++-- + poppler/Catalog.h | 1 + + qt5/src/poppler-annotation.cc | 18 ++++++++++-------- + qt6/src/poppler-annotation.cc | 18 ++++++++++-------- + 4 files changed, 28 insertions(+), 18 deletions(-) + +commit 7ff9c7847a0f64a5db026ecbefbb14b37938f2d2 +Author: Pablo Rodríguez <1425-ousia@users.noreply.gitlab.freedesktop.org> +Date: Wed Apr 13 15:26:28 2022 +0000 + + Correct typo in `poppler-structure-element.cc` + + glib/poppler-structure-element.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3ca9992ad4660d979491829048a6da84be192671 +Author: Albert Astals Cid +Date: Fri Apr 8 11:26:29 2022 +0200 + + MSVC: Fix conversion warnings + + Make the conversions from double to int/char explicit, we want them + + splash/Splash.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit b1ad047408152e4a36f170728b6e97784fa48395 +Author: Albert Astals Cid +Date: Fri Apr 8 11:21:09 2022 +0200 + + MSVC: type conversion warning fix + + Don't support adding fonts bigger than INT_MAX + + poppler/Form.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 6f9f838341173667d2a253df64f1706392649564 +Author: Albert Astals Cid +Date: Fri Apr 8 11:18:57 2022 +0200 + + MSVC: type warning fixes + + outBuf is 16384 long so we can cast its ptrdiff_t to int fine + + poppler/FlateEncoder.cc | 8 ++++---- + poppler/JBIG2Stream.cc | 13 ++++++------- + 2 files changed, 10 insertions(+), 11 deletions(-) + +commit 23c70adb7671c174ee5084eb28cd0100f8877065 +Author: Albert Astals Cid +Date: Fri Apr 8 11:15:41 2022 +0200 + + MSVC: type conversion warnings + + int to size_t + float to double + + utils/HtmlLinks.cc | 6 +++--- + utils/HtmlLinks.h | 6 +++--- + utils/HtmlOutputDev.cc | 4 ++-- + 3 files changed, 8 insertions(+), 8 deletions(-) + +commit 0ccae23433365297acb391471cc783be03d33c30 +Author: Albert Astals Cid +Date: Fri Apr 8 10:47:01 2022 +0200 + + MSVC: More warning fixes + + * Add casts that convert between types but we know the value + inside the + bigger type will be small enough + * Some ceil/round/floor -> int cast + * Add forced casts because the destination type is needed + * Add some casts (distance between characters in an user option + will be + int) which potentially could be wrong, but noone is going to write + such a long parameter in the command line + + fofi/FoFiType1.cc | 6 +++--- + goo/grandom.cc | 3 ++- + utils/pdftocairo-win32.cc | 24 ++++++++++++------------ + utils/pdftocairo.cc | 6 +++--- + utils/pdftoppm.cc | 4 ++-- + 5 files changed, 22 insertions(+), 21 deletions(-) + +commit bea57d66fdba3c51b60fc6899481f6eb156c3b50 +Author: Albert Astals Cid +Date: Thu Apr 7 13:52:47 2022 +0200 + + FoFiOutputFunc: Use size_t instead of int + + fofi/FoFiBase.h | 4 ++-- + poppler/PSOutputDev.cc | 2 +- + qt5/src/poppler-ps-converter.cc | 4 ++-- + qt6/src/poppler-ps-converter.cc | 4 ++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +commit 85e5dfb062a19cf0b4ee531746a941f6dadf1cdd +Author: Albert Astals Cid +Date: Thu Apr 7 13:50:37 2022 +0200 + + easier to understand definition for FoFiOutputFunc + + fofi/FoFiBase.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5973e32c9366f000c48d4a4f939abf2699faf145 +Author: Albert Astals Cid +Date: Thu Apr 7 13:49:33 2022 +0200 + + PSOutputFunc -> FoFiOutputFunc + + poppler/PSOutputDev.cc | 8 ++++---- + poppler/PSOutputDev.h | 9 ++++----- + 2 files changed, 8 insertions(+), 9 deletions(-) + +commit fae5ec7071c928a6163924ecdc6719806710b975 +Author: Albert Astals Cid +Date: Thu Mar 24 17:43:39 2022 +0100 + + AnnotAppearanceBuilder::drawText: Make dx, dy const + + poppler/Annot.cc | 45 ++++++++++++++++++++++----------------------- + 1 file changed, 22 insertions(+), 23 deletions(-) + +commit 487e62541df7ebc2278e84b7b1e3b021e86facc5 +Author: Albert Astals Cid +Date: Wed Apr 6 14:58:26 2022 +0200 + + ImgWriter::init: take double for dpi instead of int + + In pdftoppm/pdftocairo the dpi are doubles, so pass them down + as doubles + as much as we can until we need to convert them to ints (in some + formats + like Tiff, we don't even need to do it since dpi is also a double) + + goo/ImgWriter.h | 4 ++-- + goo/JpegWriter.cc | 15 +++++++++++---- + goo/JpegWriter.h | 4 ++-- + goo/NetPBMWriter.cc | 4 ++-- + goo/NetPBMWriter.h | 4 ++-- + goo/PNGWriter.cc | 18 +++++++++++++++--- + goo/PNGWriter.h | 4 ++-- + goo/TiffWriter.cc | 8 ++++---- + goo/TiffWriter.h | 4 ++-- + splash/SplashBitmap.cc | 8 ++++---- + splash/SplashBitmap.h | 8 ++++---- + 11 files changed, 50 insertions(+), 31 deletions(-) + +commit bcec8308c5c7ce7a781097dbd5669603b66b3e6a +Author: Albert Astals Cid +Date: Wed Apr 6 14:36:45 2022 +0200 + + Fix warning when compiling on FreeBSD + + utils/InMemoryFile.cc | 2 +- + utils/InMemoryFile.h | 7 +++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit 0b474ffb990a8285a6d3c2bf157b32b2264fb140 +Author: Albert Astals Cid +Date: Wed Mar 23 13:35:01 2022 +0100 + + Forms: Make sure we embedd fonts as needed + + And a bit of refactoring :) + + poppler/Annot.cc | 433 + +++++++++++++++++++++++++++++++------------------------ + poppler/Annot.h | 8 +- + poppler/Form.cc | 33 +++-- + 3 files changed, 275 insertions(+), 199 deletions(-) + +commit db7865c6a38dd9d26d8b16ab2727fcec311efad8 +Author: Albert Astals Cid +Date: Wed Mar 23 13:35:01 2022 +0100 + + Signatures: Make sure we embed the needed fonts + + poppler/Annot.cc | 213 + +++++++++++++++++++++++++----------------------------- + poppler/Annot.h | 3 +- + poppler/Form.cc | 25 +++++-- + poppler/Form.h | 6 +- + poppler/PDFDoc.cc | 10 ++- + 5 files changed, 131 insertions(+), 126 deletions(-) + +commit 5f915d46c99ecbc0c026b86de50f9e0243391a01 +Author: Albert Astals Cid +Date: Tue Feb 22 16:01:19 2022 +0100 + + Annotations: Make sure we embed fonts for the FreeText annots + + poppler/Annot.cc | 194 +++++++++++++++++++++++---- + poppler/Annot.h | 7 +- + poppler/Catalog.cc | 66 +++++---- + poppler/Catalog.h | 2 + + poppler/Dict.cc | 10 ++ + poppler/Dict.h | 7 +- + poppler/Form.cc | 301 + +++++++++++++++++++++++++++++++++++++++++- + poppler/Form.h | 26 +++- + poppler/GlobalParams.cc | 117 ++++++++++++++++ + poppler/GlobalParams.h | 28 ++++ + poppler/GlobalParamsWin.cc | 47 +++++++ + poppler/PDFDoc.cc | 2 + + qt5/src/poppler-annotation.cc | 68 +++++++--- + qt6/src/poppler-annotation.cc | 69 ++++++---- + 14 files changed, 842 insertions(+), 102 deletions(-) + +commit 8a06776bc89ae8f4fa1655befb6d3a24e161150b +Author: Albert Astals Cid +Date: Tue Apr 5 16:50:56 2022 +0200 + + cpp: MSVC warning fixes + + Cast from time_t to time_type because they are not the same type + anymore on systems that are protected from the Y2K38 problem + + Actual fix for that coming in a different patch + + cpp/poppler-document.cpp | 6 +++--- + cpp/poppler-embedded-file.cpp | 4 ++-- + cpp/poppler-global.cpp | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit d55f9ee33ea3a7d233b9e40a548345bc0ca7653f +Author: Albert Astals Cid +Date: Tue Apr 5 16:40:38 2022 +0200 + + cpp: Add page_transition::durationReal + + The duration is really a double, so add a function that doesn't turns + that double into an int + + cpp/poppler-page-transition.cpp | 7 ++++++- + cpp/poppler-page-transition.h | 5 +++-- + 2 files changed, 9 insertions(+), 3 deletions(-) + +commit 069f5c9c1e165aedbf9cf44813bff7ee70c9fd45 +Author: Albert Astals Cid +Date: Tue Apr 5 16:28:24 2022 +0200 + + Update (C) + + poppler/CairoFontEngine.cc | 2 +- + poppler/CairoFontEngine.h | 2 +- + poppler/CairoOutputDev.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 7f2b2964297e4d381b43ad5710540fedfe216a2c +Author: Adrian Johnson +Date: Sat Mar 19 17:59:39 2022 +1030 + + Fix clang warning + + poppler/CairoFontEngine.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 61f6d6d1492b9a8bfa19dfe4bfa4a7294a9a29bd +Author: Adrian Johnson +Date: Sat Mar 19 15:06:58 2022 +1030 + + Cairo color type 3 fonts + + Fixes #729 + Fixes #944 + + poppler/CairoFontEngine.cc | 26 +++++++++++++++++++++++--- + poppler/CairoOutputDev.cc | 7 +++++++ + poppler/CairoOutputDev.h | 2 ++ + 3 files changed, 32 insertions(+), 3 deletions(-) + +commit 5e57fc6025fdf9374cf77549265a2ccb9c91fbf8 +Author: Albert Astals Cid +Date: Sat Apr 2 01:27:36 2022 +0200 + + More MSVC fixes + + All the casts are protected by ifs that check the cast is in range or + fails otherwise + + poppler/XRef.cc | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit f5aca2bea7481aecefd3062ab0f45820f24f4152 +Author: Albert Astals Cid +Date: Sat Apr 2 01:12:37 2022 +0200 + + Silence MSVC warning + + We know it's < 24576 so the cast is fine + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 846249c2102d12d74739555483232088f55610cf +Author: Albert Astals Cid +Date: Sat Apr 2 01:01:57 2022 +0200 + + Make MSVC happy + + poppler/SecurityHandler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 42225a1413629c7f3ab8d495267ab9deca485bef +Author: Albert Astals Cid +Date: Sat Apr 2 00:47:12 2022 +0200 + + Protect against abnormally long strings + + poppler/PageLabelInfo_p.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit e7adc2c5fa0559d8dea76c67e37f7be3f50237a0 +Author: Albert Astals Cid +Date: Sat Apr 2 00:36:03 2022 +0200 + + More GooString to size_t where it makes some sense + + goo/GooString.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 9037292ae440fdb959252264da7cd58db16322c0 +Author: Albert Astals Cid +Date: Sat Apr 2 00:25:38 2022 +0200 + + No reason to limit how much we can append in GooString::append + + goo/GooString.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit da5040330f6cdf4aaf88bddd125be22bebb4d214 +Author: Albert Astals Cid +Date: Sat Apr 2 00:24:41 2022 +0200 + + Fix MSVC warning + + poppler/GfxState.cc | 8 ++++---- + poppler/ImageEmbeddingUtils.cc | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit eecd243425f51b2fecc8e58cccb4c183e3181976 +Author: Albert Astals Cid +Date: Sat Apr 2 00:16:58 2022 +0200 + + protect against big files + + poppler/ImageEmbeddingUtils.cc | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit 2cf97eaa7a8ed9b1305b2e132b8324d5fc3c582f +Author: Albert Astals Cid +Date: Sat Apr 2 00:00:33 2022 +0200 + + Cast the proper addition + + apologies, it's late :/ + + poppler/DCTStream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit deb36a4e808a08b990413bf688acd72cc007aa45 +Author: Albert Astals Cid +Date: Fri Apr 1 23:47:08 2022 +0200 + + Make MSVC happy + + limit is always > than current + and after the if we know that left is < nChars + + poppler/DCTStream.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1e9e4619671a14ff3d137f013f04f7e6904c5d2e +Author: Albert Astals Cid +Date: Fri Apr 1 23:43:12 2022 +0200 + + JPEG2000Stream: Some wrangling with the data types + + I think this is more correct, and also makes MSVC happier + + poppler/JPEG2000Stream.cc | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) + +commit 5c977b6619b6dbb60da223e38ad601a7bd6b3a26 +Author: Albert Astals Cid +Date: Fri Apr 1 23:04:26 2022 +0200 + + Use CURLINFO_CONTENT_LENGTH_DOWNLOAD_T instead of + CURLINFO_CONTENT_LENGTH_DOWNLOAD + + As the own curl documetnation says "returns a more sensible variable + type" + + poppler/CurlCachedFile.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 695d1a6d6d64fad8303ca653666a96f9f880c46e +Author: Albert Astals Cid +Date: Fri Apr 1 22:43:40 2022 +0200 + + Move MSVC warning silencing + + The static_casts are fine because the surrounding code makes sure they + are in range + The int -> intptr_t makes sense and the surrounding code is already + goffset so that should be all good + + goo/glibc.cc | 3 ++- + poppler/DateInfo.cc | 4 ++-- + poppler/Form.cc | 6 +++--- + poppler/XRef.cc | 2 +- + 4 files changed, 8 insertions(+), 7 deletions(-) + +commit ea4beb12266344ab149e9124f5792d871c85b21d +Author: Albert Astals Cid +Date: Fri Apr 1 21:58:43 2022 +0200 + + Silence MSVC warning + + poppler/GfxState.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 64f9c8d0adefde789e6a16f01db7ba4e0f3f6fc5 +Author: Albert Astals Cid +Date: Fri Apr 1 16:57:48 2022 +0200 + + Fix typo of d35e11a8f84d396a9d9ef43ef852d377adc3830a + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 17cb4acb1f2a37504c0268003b33e92e98df4d53 +Author: Albert Astals Cid +Date: Fri Apr 1 16:52:47 2022 +0200 + + Export base classes of exported classes + + Fixes MSVC warning 4275 + + fofi/FoFiBase.h | 2 +- + poppler/Annot.h | 2 +- + poppler/Form.h | 2 +- + poppler/GfxState.h | 2 +- + splash/SplashPattern.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +commit 3608d950c0f90bcb64062fca30fb08ec918f02e1 +Author: Albert Astals Cid +Date: Fri Apr 1 16:49:36 2022 +0200 + + We don't need this define anymore + + The define is provided by config.h + + poppler/GlobalParams.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit d35e11a8f84d396a9d9ef43ef852d377adc3830a +Author: Albert Astals Cid +Date: Fri Apr 1 16:26:25 2022 +0200 + + Annots: Just return the std::vector instead of two getters + + Simpler code to use and solves the int vs size_t mismatch by not + having a + type involved at all + + glib/poppler-page.cc | 5 +---- + poppler/Annot.cc | 4 ++-- + poppler/Annot.h | 5 ++--- + poppler/FontInfo.cc | 4 ++-- + poppler/Form.cc | 7 +++---- + poppler/JSInfo.cc | 14 +++++++------- + poppler/Link.cc | 3 +-- + poppler/PSOutputDev.cc | 4 ++-- + poppler/Page.cc | 17 ++++------------- + qt5/src/poppler-annotation.cc | 10 ++-------- + qt6/src/poppler-annotation.cc | 10 ++-------- + utils/pdfdetach.cc | 4 +--- + 12 files changed, 29 insertions(+), 58 deletions(-) + +commit af3e1e1a3577c4e1c66cbe69ebdc6a632038e299 +Author: Albert Astals Cid +Date: Fri Apr 1 16:03:46 2022 +0200 + + Link: Just return the std::vector instead of two getters + + Simpler code to use and solves the int vs size_t mismatch by not + having a + type involved at all + + glib/poppler-page.cc | 5 +---- + poppler/Link.h | 4 +--- + poppler/Page.cc | 4 ++-- + utils/HtmlOutputDev.cc | 4 ++-- + utils/pdfinfo.cc | 3 +-- + 5 files changed, 7 insertions(+), 13 deletions(-) + +commit 72cf19694952a8899f33fda1c448417d0a8d996a +Author: Luis Landeiro +Date: Fri Apr 1 13:33:08 2022 +0000 + + pdftotext: added TSV mode + + utils/pdftotext.1 | 4 ++ + utils/pdftotext.cc | 136 + ++++++++++++++++++++++++++++++++++++++++++++++------- + 2 files changed, 123 insertions(+), 17 deletions(-) + +commit bd6f20a62131baafcae40cbdb8475116f666f84f +Author: Albert Astals Cid +Date: Fri Apr 1 14:55:28 2022 +0200 + + Poppler 22.04.0 + + CMakeLists.txt | 4 ++-- + NEWS | 28 ++++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 33 insertions(+), 5 deletions(-) + +commit 8942ba12781560e59e3a2f1a2185c34a697f5fee +Author: Albert Astals Cid +Date: Thu Mar 31 15:23:38 2022 +0200 + + Fix regression caused by d72c22caf28cbe8cf1e268f8ff741d7e1330df63 + + poppler/CairoFontEngine.cc | 31 ++++++++++++++++--------------- + 1 file changed, 16 insertions(+), 15 deletions(-) + +commit e60280ae8ff3ccfa4da434835e59b682af7ece6b +Author: Albert Astals Cid +Date: Wed Mar 30 23:45:23 2022 +0200 + + CI: make the libcpp build use C++23 + + Needs a small cast in the qt5 demo viewer to make the addition of two + different enums "ok" + + It will help us make sure we don't do things like std::string s = + nullptr; (since that is not possible on C++23) + + And also helps us future proof in case something else comes up + + .gitlab-ci.yml | 2 ++ + qt5/demos/viewer.cpp | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 593499015c9255a72e63da4ae94cbd25ba55498d +Author: Albert Astals Cid +Date: Wed Mar 30 23:47:27 2022 +0200 + + (C) of last commits + + poppler/GlobalParams.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 48bbbfefcb608b04c427d288c876c1eb19813590 +Author: Albert Astals Cid +Date: Wed Mar 30 23:20:05 2022 +0200 + + Fix crash introduced in dbbaa1651dc168f71054e3dd9ef91e33c960bfb7 + + poppler/Link.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c513b069e7bfae1542945cb8ac6095f5976313bc +Author: Even Rouault +Date: Sat Mar 26 23:38:15 2022 +0100 + + GlobalParams::setupBaseFonts(): fix memory leaks related to GooString + + poppler/GlobalParams.cc | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) + +commit 404edfd151b814c7c4e771eda5826e65ee7c5f84 +Author: Albert Astals Cid +Date: Sun Mar 27 22:37:15 2022 +0200 + + Change GfxFont name into an optional std::string + + glib/poppler-structure-element.cc | 10 ++++-- + poppler/FontInfo.cc | 8 ++--- + poppler/GfxFont.cc | 70 + ++++++++++++++++++--------------------- + poppler/GfxFont.h | 10 +++--- + poppler/GlobalParams.cc | 20 +++++------ + poppler/GlobalParamsWin.cc | 6 ++-- + poppler/PSOutputDev.cc | 12 +++---- + poppler/TextOutputDev.cc | 2 +- + utils/HtmlFonts.cc | 6 ++-- + 9 files changed, 70 insertions(+), 74 deletions(-) + +commit 1ee63109e19975be931c607e04faff72e0f43888 +Author: Albert Astals Cid +Date: Wed Mar 30 16:27:24 2022 +0200 + + Remove the url from the CachedFileLoader::init function + + It was unused everywhere except in CurlCachedFileLoader, but there we + can just pass it in the constructor. + + The use in one of the two glib cases was a memory leak + + glib/poppler-cached-file-loader.cc | 7 +++---- + glib/poppler-cached-file-loader.h | 4 ++-- + glib/poppler-document.cc | 4 ++-- + poppler/CachedFile.cc | 10 ++++------ + poppler/CachedFile.h | 9 ++++----- + poppler/CurlCachedFile.cc | 12 +++++------- + poppler/CurlCachedFile.h | 8 ++++---- + poppler/CurlPDFDocBuilder.cc | 2 +- + poppler/FDPDFDocBuilder.cc | 2 +- + poppler/FILECacheLoader.cc | 4 ++-- + poppler/FILECacheLoader.h | 4 ++-- + 11 files changed, 30 insertions(+), 36 deletions(-) + +commit 01c4d1a3a6535c46017ad71f9cc52171b1026e23 +Author: Albert Astals Cid +Date: Wed Mar 30 16:05:20 2022 +0200 + + Convert CharCodeToUnicode tag to optional string + + poppler/CharCodeToUnicode.cc | 24 +++++++++--------------- + poppler/CharCodeToUnicode.h | 9 +++++---- + 2 files changed, 14 insertions(+), 19 deletions(-) + +commit dbbaa1651dc168f71054e3dd9ef91e33c960bfb7 +Author: Albert Astals Cid +Date: Wed Mar 30 15:55:53 2022 +0200 + + Move Catalog baseURI to optional string + + poppler/Catalog.cc | 6 +----- + poppler/Catalog.h | 7 ++++--- + poppler/Link.cc | 8 ++++---- + poppler/Link.h | 7 ++++--- + 4 files changed, 13 insertions(+), 15 deletions(-) + +commit d72c22caf28cbe8cf1e268f8ff741d7e1330df63 +Author: Albert Astals Cid +Date: Sat Mar 26 23:16:51 2022 +0100 + + Fix regression caused by a6b2442e37cc00534bcdca7c83366a0fa0501157 + + File regressed is + https://bugs.freedesktop.org/attachment.cgi?id=118361 + + The old code did different things in nullptr compared to empty buffer + so we need + to have the same semantics, use an optional for that + + poppler/CairoFontEngine.cc | 28 ++++++++++++++-------------- + poppler/GfxFont.cc | 16 ++++++++-------- + poppler/GfxFont.h | 2 +- + poppler/PSOutputDev.cc | 36 ++++++++++++++++++------------------ + poppler/SplashOutputDev.cc | 6 +++--- + qt5/src/QPainterOutputDev.cc | 18 +++++++++--------- + qt6/src/QPainterOutputDev.cc | 18 +++++++++--------- + 7 files changed, 62 insertions(+), 62 deletions(-) + +commit 022b361d431185f384456451c4bebe04a9fd1140 +Author: Albert Astals Cid +Date: Wed Mar 30 13:48:43 2022 +0200 + + Make GooString::format[v] return an unique_ptr + + fofi/FoFiTrueType.cc | 47 ++++-------------- + fofi/FoFiType1C.cc | 103 + ++++------------------------------------ + glib/poppler-document.cc | 6 +-- + goo/GooString.cc | 8 ++-- + goo/GooString.h | 5 +- + poppler/Annot.cc | 6 +-- + poppler/CurlCachedFile.cc | 6 +-- + poppler/Error.cc | 4 +- + poppler/PSOutputDev.cc | 48 ++++++++----------- + qt5/tests/check_annotations.cpp | 3 +- + qt5/tests/check_goostring.cpp | 28 +++++------ + qt6/tests/check_annotations.cpp | 3 +- + qt6/tests/check_goostring.cpp | 28 +++++------ + utils/HtmlOutputDev.cc | 75 ++++++++++++----------------- + utils/HtmlOutputDev.h | 6 +-- + utils/pdfsig.cc | 6 +-- + utils/pdftohtml.cc | 5 +- + 17 files changed, 118 insertions(+), 269 deletions(-) + +commit f7f4ae85648fae49221c357fe496f650ae982983 +Author: Albert Astals Cid +Date: Tue Mar 29 15:23:19 2022 +0200 + + Rename variable, it's actually the number of cells + + poppler/Annot.cc | 22 +++++++++++----------- + poppler/Annot.h | 2 +- + 2 files changed, 12 insertions(+), 12 deletions(-) + +commit 246deb36a4e6db3418ccc3bc9e5926bb7776ec88 +Author: Albert Astals Cid +Date: Mon Mar 28 23:23:14 2022 +0200 + + Port PSOutputDev::filterPSName to std::string + + poppler/PSOutputDev.cc | 21 +++++++++------------ + poppler/PSOutputDev.h | 4 ++-- + 2 files changed, 11 insertions(+), 14 deletions(-) + +commit d8e69c587e343191e568d92b877708518cba2db5 +Author: Albert Astals Cid +Date: Mon Mar 28 19:18:40 2022 +0200 + + Update (C) + + goo/GooString.h | 1 + + 1 file changed, 1 insertion(+) + +commit 7e402f251caa15d1eae1d61b7b81ef1ddd43856e +Author: Albert Astals Cid +Date: Mon Mar 28 17:14:50 2022 +0200 + + CI: We can go back to debian:unstable now + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5bebbe59a1e971dfd6b2f1f76d51dc544239ffb6 +Author: Albert Astals Cid +Date: Tue Feb 22 16:01:19 2022 +0100 + + GooString: Introduce string_view ends/startsWith functions + + goo/GooString.cc | 18 ++---------------- + goo/GooString.h | 3 +++ + 2 files changed, 5 insertions(+), 16 deletions(-) + +commit 7d31fc4128f3e62ddeb1e9acb15a78ca7e10a82f +Author: Albert Astals Cid +Date: Sun Mar 27 22:29:14 2022 +0200 + + One/Two more GooString to std::string + + poppler/GfxFont.cc | 8 ++++---- + poppler/GlobalParams.cc | 8 ++++---- + poppler/GlobalParams.h | 2 +- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit 6299164caa78bc3b90154f9580a17e1aa112b5cd +Author: Christian Persch +Date: Sun Mar 27 23:10:13 2022 +0200 + + glib: Fix mem leak in poppler_document_new_from_fd + + Someone needs to own the GooFile that's referenced by FileStream. Add + a + simple OwningFileStream class that does that. + + Fixes: https://gitlab.freedesktop.org/poppler/poppler/-/issues/1227 + + glib/poppler-document.cc | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +commit 426f149c57627277d0d8a7e7ee7a39c4802e7714 +Author: Albert Astals Cid +Date: Mon Mar 28 12:37:49 2022 +0200 + + CI: switch to debian testing while they fix the python migration mess + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit eefc8ef6fd0a355cc83c2ac099ec81636f9a823a +Author: Albert Astals Cid +Date: Sun Mar 27 22:27:14 2022 +0200 + + Remove unused function + + poppler/GfxFont.cc | 11 ----------- + poppler/GfxFont.h | 3 --- + 2 files changed, 14 deletions(-) + +commit 9fed160477ad1c860b917b9a80f6a63adfb04d30 +Author: Albert Astals Cid +Date: Sun Mar 27 12:32:43 2022 +0200 + + Fix memory leak + + format is a static function that returns a new goostring, appendf is + what we want + + poppler/Annot.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 5269ce104dc44fd06e1a4c54408a5fbcacf47fc9 +Author: Albert Astals Cid +Date: Sat Mar 26 17:12:41 2022 +0100 + + We don't need to force STATIC on MSVC anymore + + Also we don't need to link to the "wrong" library either + + CMakeLists.txt | 4 +--- + cpp/tests/CMakeLists.txt | 3 --- + qt5/src/CMakeLists.txt | 3 --- + qt5/tests/CMakeLists.txt | 6 ------ + qt6/src/CMakeLists.txt | 3 --- + qt6/tests/CMakeLists.txt | 6 ------ + 6 files changed, 1 insertion(+), 24 deletions(-) + +commit 80d43c4ba95fedb9ac0208f808a31de928eaf281 +Author: Even Rouault +Date: Sat Mar 26 16:06:31 2022 +0000 + + GooString: only export non-inline methods, not the whole class + + Fixes MSVC build as a shared library + + goo/GooString.h | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 6f62a002967246cf6f702568ef0dd3436640e5f7 +Author: Albert Astals Cid +Date: Fri Mar 25 18:20:02 2022 +0100 + + Simplify code by ensuring there's always Tm in daToks + + poppler/Annot.cc | 42 +++++++++++++++--------------------------- + 1 file changed, 15 insertions(+), 27 deletions(-) + +commit 3b0611bf6c5be8649591c119f389e243b38f7d91 +Author: Albert Astals Cid +Date: Fri Mar 25 18:10:18 2022 +0100 + + Remove checks for tfPos being >= 0 + + If it was not, we wouldn't reach this, font would have been null and + returned earlier in the function + + poppler/Annot.cc | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +commit 8105e7cbc20953e0e0aced218431b6e4f5b64936 +Author: Albert Astals Cid +Date: Fri Mar 25 15:46:45 2022 +0100 + + AnnotAppearanceBuilder::drawText: Use FormFieldText::tokenizeDA + + Makes for simpler code + + poppler/Annot.cc | 87 + ++++++++++++++++---------------------------------------- + 1 file changed, 25 insertions(+), 62 deletions(-) + +commit cc16a3dfcab2ba93b62551ae6498333b1387b266 +Author: Albert Astals Cid +Date: Thu Mar 24 17:25:58 2022 +0100 + + More variable improvements in AnnotAppearanceBuilder::drawText + + poppler/Annot.cc | 133 + ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 67 insertions(+), 66 deletions(-) + +commit 0f2d213debaed1d0671dd0086588848463e80046 +Author: Albert Astals Cid +Date: Thu Mar 24 16:23:21 2022 +0100 + + Annot::drawText: Move combMaxLen to the end since it's only used once + + poppler/Annot.cc | 16 ++++++++-------- + poppler/Annot.h | 4 ++-- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit 8c09ef74a249044eccf0688b0d845067b1eaeb75 +Author: Albert Astals Cid +Date: Thu Mar 24 16:19:46 2022 +0100 + + Rename comb to combMaxLen + + Makes it clearer what it is + + poppler/Annot.cc | 35 ++++++++++++++++------------------- + poppler/Annot.h | 2 +- + 2 files changed, 17 insertions(+), 20 deletions(-) + +commit 99f3b11e8f91983d78054b3c5c5bcb8356035e29 +Author: Albert Astals Cid +Date: Thu Mar 24 16:08:35 2022 +0100 + + Unify 2 enums and a set of defines into an enum + + glib/poppler-annot.cc | 6 ++--- + poppler/Annot.cc | 57 + ++++++++++++++++++++----------------------- + poppler/Annot.h | 27 ++++++++++---------- + poppler/Form.cc | 12 ++++----- + poppler/Form.h | 7 ------ + qt5/src/poppler-annotation.cc | 4 +-- + qt5/src/poppler-form.cc | 6 ++--- + qt6/src/poppler-annotation.cc | 16 ++++++------ + qt6/src/poppler-form.cc | 6 ++--- + 9 files changed, 66 insertions(+), 75 deletions(-) + +commit 8848c8f1498a290410c31622aee808021c624bb0 +Author: Albert Astals Cid +Date: Thu Mar 24 15:50:07 2022 +0100 + + AnnotAppearanceBuilder::drawText: Merge 4 bools into a flags variable + + Makes for much easier reading on the calling side + + Also drop the defaultFallback variable, it was ever only used to pass + ZapfDingbats when also passing the forceZapfDingbats variable + + poppler/Annot.cc | 35 ++++++++++++++++++++++------------- + poppler/Annot.h | 13 +++++++++++-- + 2 files changed, 33 insertions(+), 15 deletions(-) + +commit 69f561ab964dfed94d347164d644365173afecba +Author: Albert Astals Cid +Date: Wed Mar 16 00:03:12 2022 +0100 + + regtest: Add a command to download files + + regtest/commands/download-files.py | 69 + ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 69 insertions(+) + +commit c73a83c33ff0152de030120ca66e10a9b3941bcf +Author: Albert Astals Cid +Date: Fri Mar 18 22:31:17 2022 +0100 + + Trigger xref rebuild properly + + Make DummyXRefEntry have the same internals as a non intialized entry, + specially the object type + + Fixes #1231 + + poppler/XRef.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 48c6eee27a7a6439507dc28df983f1d55efa6a9a +Author: Albert Astals Cid +Date: Thu Mar 17 17:50:55 2022 +0100 + + Write unicode strings using PDF hexadecimal strings + + As far as I can see our old way of doing it was correct but when + saving + contents like + 我不会复印 + ( i'm sure this is going to break, so check it on + https://bugs.kde.org/show_bug.cgi?id=378186 ) + + Adobe Reader would not read the string back correctly. + mupdf works both with the old and the new code + + poppler/PDFDoc.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 86e3c1e9be7997e31f7998e831eeb33d6dfef84b +Author: Albert Astals Cid +Date: Sat Mar 19 00:26:43 2022 +0100 + + Update (C) + + fofi/FoFiBase.cc | 1 + + fofi/FoFiBase.h | 1 + + fofi/FoFiTrueType.cc | 1 + + fofi/FoFiTrueType.h | 1 + + fofi/FoFiType1.cc | 1 + + fofi/FoFiType1.h | 1 + + fofi/FoFiType1C.cc | 1 + + fofi/FoFiType1C.h | 1 + + poppler/JPEG2000Stream.cc | 1 + + poppler/Stream.h | 2 +- + 10 files changed, 10 insertions(+), 1 deletion(-) + +commit a6b2442e37cc00534bcdca7c83366a0fa0501157 +Author: Oliver Sander +Date: Mon Mar 14 10:56:27 2022 +0100 + + Store font data in a std::vector + + This simplifies various method signatures, because the data array and + its size do not have to be passed around separately, anymore. + + Also, using a std::vector makes tracking the ownership much easier. + + poppler/CairoFontEngine.cc | 63 + ++++++++++++++++---------------------------- + poppler/Gfx.cc | 6 ++--- + poppler/GfxFont.cc | 20 +++++++------- + poppler/GfxFont.h | 2 +- + poppler/GfxState.cc | 7 ++--- + poppler/JPEG2000Stream.cc | 12 ++++----- + poppler/PSOutputDev.cc | 49 +++++++++++++--------------------- + poppler/SplashOutputDev.cc | 14 +++++----- + poppler/Stream.h | 16 ++++++----- + qt5/src/QPainterOutputDev.cc | 25 ++++++++---------- + qt6/src/QPainterOutputDev.cc | 25 ++++++++---------- + splash/SplashFTFontFile.cc | 6 ++--- + splash/SplashFontFile.cc | 23 +++------------- + splash/SplashFontFile.h | 6 ++--- + 14 files changed, 106 insertions(+), 168 deletions(-) + +commit d3b0fd9a76e1f6ace83b50f8c1bc9db096a8fbc7 +Author: Oliver Sander +Date: Mon Mar 14 11:43:37 2022 +0100 + + Simplify method _ft_new_face_uncached + + It is only called if there is no font in memory (font_data == + nullptr). + + Therefore, there is no need to pass font_data to the method. + + poppler/CairoFontEngine.cc | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) + +commit 6da92d028268aa92ed955905551bcc6c5acb26e4 +Author: Oliver Sander +Date: Mon Mar 14 09:59:02 2022 +0100 + + Pass around font memory buffers as unsigned char + + In FoFiBase, the memory buffer for fonts is stored as unsigned char. + At the same time, the code in Stream hands out memory as unsigned + char. + Yet, the pointers to this memory is then casted to signed char, + and passed around as that. + + This commit removes some of this casting, and uses more unsigned + chars. + + fofi/FoFiBase.cc | 4 ++-- + fofi/FoFiBase.h | 2 +- + fofi/FoFiTrueType.cc | 16 ++++++++-------- + fofi/FoFiTrueType.h | 4 ++-- + fofi/FoFiType1.cc | 6 +++--- + fofi/FoFiType1.h | 4 ++-- + fofi/FoFiType1C.cc | 10 ++++------ + fofi/FoFiType1C.h | 4 ++-- + poppler/CairoFontEngine.cc | 10 +++++----- + poppler/GfxFont.cc | 8 +++----- + poppler/GfxFont.h | 2 +- + poppler/PSOutputDev.cc | 12 ++++++------ + poppler/SplashOutputDev.cc | 2 +- + qt5/src/QPainterOutputDev.cc | 6 +++--- + splash/SplashFontFile.cc | 8 ++++++++ + splash/SplashFontFile.h | 1 + + 16 files changed, 52 insertions(+), 47 deletions(-) + +commit a246b6f16b990b1e448265e390dc718f0c5eb927 +Author: Albert Astals Cid +Date: Thu Mar 17 16:50:13 2022 +0100 + + CI: Use the qt6 provided by debian + + Means increasing our minimum requirement to 6.2, but honestly + if you're + on Qt6 there's no reason not to use that one. + + .gitlab-ci.yml | 20 ++++---------------- + CMakeLists.txt | 2 +- + 2 files changed, 5 insertions(+), 17 deletions(-) + +commit 45f43fddfe823170c6d1f0bb92efb3179b8d1feb +Author: Albert Astals Cid +Date: Thu Mar 17 16:47:34 2022 +0100 + + Make cidToGIDLen unsigned + + Ideally we'd make it a vector, but it's all a bit convoluted, + so settle + for unsigned int for now + + poppler/GfxFont.cc | 2 +- + poppler/GfxFont.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 98f948365cb141f4ca9707d3ea8f74d928dc4dfc +Author: Albert Astals Cid +Date: Thu Mar 17 16:32:21 2022 +0100 + + Move AnnotAppearanceBuilder::writeString to std::string + + poppler/Annot.cc | 22 +++++++++------------- + poppler/Annot.h | 2 +- + 2 files changed, 10 insertions(+), 14 deletions(-) + +commit 9c1c8dcdae6eef00651d2189ff2288752eac52c0 +Author: Albert Astals Cid +Date: Thu Mar 17 15:55:30 2022 +0100 + + Form: Don't store stuff we don't use + + poppler/Catalog.cc | 2 +- + poppler/Form.cc | 8 ++++---- + poppler/Form.h | 6 +----- + 3 files changed, 6 insertions(+), 10 deletions(-) + +commit 11c63a7bb9bfc2c997883ba81ff5f39f81697704 +Author: Oliver Sander +Date: Wed Mar 16 09:20:31 2022 +0000 + + Rewrite Cairo font caching without hashing the entire font + + poppler/CairoFontEngine.cc | 134 + +++++++++++++++------------------------------ + 1 file changed, 44 insertions(+), 90 deletions(-) + +commit 98a2253cb56a73a8b9658ae4e1fb06430feed7f2 +Author: Albert Astals Cid +Date: Tue Mar 15 22:58:59 2022 +0100 + + Limit complaining about missing ID for encrypted files + + Fixes #1228 + + poppler/PDFDoc.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 6551e1676265f8ae0b7aab4da87f25bc7e281bae +Author: Albert Astals Cid +Date: Tue Mar 15 16:45:33 2022 +0100 + + Fix crash caused by efe7d77838896ddcefb838f382628ae31be54d99 + + splash/SplashFontFile.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 4f1f202f9e4db08f6dd2ba9c6a96decbefb10899 +Author: Albert Astals Cid +Date: Tue Mar 15 15:56:42 2022 +0100 + + Update (C) + + splash/SplashFTFontFile.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit efe7d77838896ddcefb838f382628ae31be54d99 +Author: Oliver Sander +Date: Tue Mar 15 11:03:58 2022 +0100 + + Use std::string for filename in SplashFontSrc + + poppler/SplashOutputDev.cc | 14 +++++++------- + splash/SplashFTFontFile.cc | 6 +++--- + splash/SplashFontFile.cc | 8 ++------ + splash/SplashFontFile.h | 7 ++++--- + 4 files changed, 16 insertions(+), 19 deletions(-) + +commit 27a6d29018817a2263d69aadeb965dee3f5bc927 +Author: Oliver Sander +Date: Tue Mar 15 10:51:46 2022 +0100 + + Remove the deleteSrc variable from SplashFontSrc + + The way SplashFontSrc is used the variable is always equal + to !isFile. + + poppler/SplashOutputDev.cc | 4 ++-- + splash/SplashFontFile.cc | 20 ++++++-------------- + splash/SplashFontFile.h | 6 +++--- + 3 files changed, 11 insertions(+), 19 deletions(-) + +commit d6f3aabff3442d3a78de13917e8222d7896e526a +Author: Oliver Sander +Date: Tue Mar 15 10:47:01 2022 +0100 + + Remove method SplashFontSrc::setFile(const char *file, bool del) + + It is never used. + + splash/SplashFontFile.cc | 7 ------- + splash/SplashFontFile.h | 1 - + 2 files changed, 8 deletions(-) + +commit 81044c64b9ed9a10ae82a28bac753060bdfdac74 +Author: Albert Astals Cid +Date: Tue Mar 15 15:14:32 2022 +0100 + + Hints::readTables: bail out if we run out of file when reading + + Fixes #1230 + + poppler/Hints.cc | 24 +++++++++++++++++------- + 1 file changed, 17 insertions(+), 7 deletions(-) + +commit 5e2271f8ca858b5aa80a7988b9f404a74a5abaa4 +Author: Albert Astals Cid +Date: Tue Mar 15 15:00:25 2022 +0100 + + cpp: Remove no longer needed const_cast + + cpp/poppler-document.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 946aaf446503e2036a7f1323c2ff9e5d2465f6f1 +Author: Albert Astals Cid +Date: Tue Mar 15 14:24:26 2022 +0100 + + cpp: Remove bit size qualifier from format variable + + The standard doesn't guarantee if the types of enums is going to be + signed or not, specifically MSVC uses unsigned so you can't store all + the enums in just 3 bits + + Fixes #1229 + + cpp/poppler-image-private.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4561600ad379f564d6e89ba9120c3b8550e82b3b +Author: Albert Astals Cid +Date: Tue Mar 15 14:15:48 2022 +0100 + + Update (C) + + utils/pdftotext.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 24eb205af26a187e571b00011963977eb9de77dc +Author: kVdNi +Date: Sun Mar 13 18:26:47 2022 +0100 + + pdftotext now prints creation and modification date when using + htmlmeta param + + Partially addressing poppler/poppler#136. When using the -htmlmeta + command line parameter, the meta tags for CreationDate and ModDate are + now showing the ISO formatted timestamps of the PDF instead of showing + always empty values. + Implementation of date parsing based on the implementation inside + pdfinfo.cc. + + utils/pdftotext.cc | 29 +++++++++++++++++++++-------- + 1 file changed, 21 insertions(+), 8 deletions(-) + +commit faa45adef0c4745ca4e8ba784e1559fda5e1fa8f +Author: Albert Astals Cid +Date: Tue Mar 15 00:03:41 2022 +0100 + + Update (C) from last commit + + fofi/FoFiTrueType.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c612cba087668456b254e861724fbe9809181f16 +Author: Zachary Travis +Date: Sun Mar 13 22:52:59 2022 -0700 + + Add support for format 13 as well + + fofi/FoFiTrueType.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 1e9f1f69ad235536b64e757ce2e6429e47a508af +Author: Zachary Travis +Date: Sun Mar 13 20:49:21 2022 -0700 + + Type 2 cmap + + fofi/FoFiTrueType.cc | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 4781a9c0b287555c017c2f08d22bfab014c8acdb +Author: Albert Astals Cid +Date: Mon Mar 14 00:28:45 2022 +0100 + + Update .git-blame-ignore-revs + + .git-blame-ignore-revs | 2 ++ + 1 file changed, 2 insertions(+) + +commit f7466e31408ba884c44728f7da04227863177241 +Author: Albert Astals Cid +Date: Thu Mar 3 00:28:43 2022 +0100 + + Add readability-braces-around-statements + + .clang-tidy | 8 + + .gitlab-ci.yml | 17 +- + cpp/poppler-document.cpp | 3 +- + cpp/poppler-global.cpp | 3 +- + cpp/poppler-image.cpp | 3 +- + cpp/poppler-page.cpp | 19 +- + cpp/tests/poppler-dump.cpp | 11 +- + fofi/FoFiTrueType.cc | 24 +- + fofi/FoFiType1.cc | 27 +- + fofi/FoFiType1C.cc | 6 +- + glib/demo/annots.c | 68 ++-- + glib/demo/attachments.c | 15 +- + glib/demo/find.c | 43 ++- + glib/demo/fonts.c | 25 +- + glib/demo/forms.c | 12 +- + glib/demo/images.c | 9 +- + glib/demo/info.cc | 3 +- + glib/demo/layers.c | 15 +- + glib/demo/links.c | 6 +- + glib/demo/outline.c | 6 +- + glib/demo/page.c | 8 +- + glib/demo/print.c | 6 +- + glib/demo/render.c | 26 +- + glib/demo/selections.c | 63 ++-- + glib/demo/taggedstruct.c | 16 +- + glib/demo/text.c | 12 +- + glib/demo/transitions.c | 12 +- + glib/demo/utils.c | 26 +- + glib/poppler-action.cc | 90 +++-- + glib/poppler-annot.cc | 30 +- + glib/poppler-attachment.cc | 21 +- + glib/poppler-cached-file-loader.cc | 15 +- + glib/poppler-date.cc | 3 +- + glib/poppler-document.cc | 183 +++++++---- + glib/poppler-form-field.cc | 25 +- + glib/poppler-input-stream.cc | 3 +- + glib/poppler-layer.cc | 9 +- + glib/poppler-media.cc | 3 +- + glib/poppler-page.cc | 102 ++++-- + glib/poppler-structure-element.cc | 100 ++++-- + glib/poppler.cc | 6 +- + glib/tests/check_bb.c | 3 +- + glib/tests/check_text.c | 6 +- + glib/tests/pdfdrawbb.c | 15 +- + goo/GooString.cc | 9 +- + goo/GooTimer.cc | 6 +- + goo/NetPBMWriter.cc | 6 +- + goo/PNGWriter.cc | 5 +- + goo/gfile.cc | 27 +- + goo/gstrtod.cc | 32 +- + poppler/Annot.cc | 448 ++++++++++++++++--------- + poppler/AnnotStampImageHelper.cc | 3 +- + poppler/BBoxOutputDev.cc | 34 +- + poppler/CMap.cc | 3 +- + poppler/CachedFile.cc | 36 +- + poppler/CairoFontEngine.cc | 38 ++- + poppler/CairoOutputDev.cc | 364 ++++++++++++++------- + poppler/CairoRescaleBox.cc | 6 +- + poppler/Catalog.cc | 94 ++++-- + poppler/CharCodeToUnicode.cc | 6 +- + poppler/CurlCachedFile.cc | 3 +- + poppler/DCTStream.cc | 37 ++- + poppler/DateInfo.cc | 21 +- + poppler/Decrypt.cc | 15 +- + poppler/Dict.cc | 3 +- + poppler/FDPDFDocBuilder.cc | 14 +- + poppler/FILECacheLoader.cc | 3 +- + poppler/FileSpec.cc | 27 +- + poppler/FontInfo.cc | 9 +- + poppler/Form.cc | 328 ++++++++++++------- + poppler/Function.cc | 12 +- + poppler/Gfx.cc | 157 +++++---- + poppler/GfxFont.cc | 118 ++++--- + poppler/GfxState.cc | 203 ++++++++---- + poppler/GlobalParams.cc | 112 ++++--- + poppler/Hints.cc | 69 ++-- + poppler/JBIG2Stream.cc | 27 +- + poppler/JPEG2000Stream.cc | 54 +-- + poppler/JSInfo.cc | 9 +- + poppler/Lexer.cc | 35 +- + poppler/Lexer.h | 3 +- + poppler/Linearization.cc | 3 +- + poppler/Link.cc | 18 +- + poppler/MarkedContentOutputDev.cc | 53 ++- + poppler/MarkedContentOutputDev.h | 3 +- + poppler/Movie.cc | 13 +- + poppler/Object.cc | 3 +- + poppler/Object.h | 3 +- + poppler/OptionalContent.cc | 6 +- + poppler/Outline.cc | 5 +- + poppler/Outline.h | 5 +- + poppler/OutputDev.cc | 6 +- + poppler/PDFDoc.cc | 104 +++--- + poppler/PSOutputDev.cc | 93 ++++-- + poppler/Page.cc | 50 ++- + poppler/PageLabelInfo.cc | 14 +- + poppler/PageLabelInfo_p.h | 27 +- + poppler/PageTransition.cc | 38 ++- + poppler/Parser.cc | 28 +- + poppler/PreScanOutputDev.cc | 6 +- + poppler/ProfileData.cc | 6 +- + poppler/Rendition.cc | 23 +- + poppler/SignatureHandler.cc | 168 ++++++---- + poppler/Sound.cc | 3 +- + poppler/SplashOutputDev.cc | 224 ++++++++----- + poppler/Stream.cc | 238 +++++++++----- + poppler/Stream.h | 11 +- + poppler/StructElement.cc | 119 ++++--- + poppler/StructElement.h | 12 +- + poppler/StructTreeRoot.cc | 9 +- + poppler/TextOutputDev.cc | 295 +++++++++++------ + poppler/UTF.cc | 58 ++-- + poppler/UnicodeMap.cc | 3 +- + poppler/UnicodeTypeTable.cc | 70 ++-- + poppler/ViewerPreferences.cc | 6 +- + poppler/XRef.cc | 76 +++-- + qt5/demos/pageview.cpp | 9 +- + qt5/demos/toc.cpp | 11 +- + qt5/src/QPainterOutputDev.cc | 6 +- + qt5/src/poppler-annotation.cc | 655 + ++++++++++++++++++++++++------------- + qt5/src/poppler-document.cc | 51 ++- + qt5/src/poppler-embeddedfile.cc | 6 +- + qt5/src/poppler-fontinfo.cc | 3 +- + qt5/src/poppler-form.cc | 73 +++-- + qt5/src/poppler-link-extractor.cc | 6 +- + qt5/src/poppler-link.cc | 33 +- + qt5/src/poppler-media.cc | 25 +- + qt5/src/poppler-optcontent.cc | 3 +- + qt5/src/poppler-outline.cc | 3 +- + qt5/src/poppler-page.cc | 73 +++-- + qt5/src/poppler-pdf-converter.cc | 8 +- + qt5/src/poppler-private.cc | 21 +- + qt5/src/poppler-private.h | 9 +- + qt5/src/poppler-ps-converter.cc | 23 +- + qt5/src/poppler-sound.cc | 6 +- + qt5/tests/check_annotations.cpp | 3 +- + qt5/tests/check_fonts.cpp | 18 +- + qt5/tests/check_forms.cpp | 21 +- + qt5/tests/check_utf_conversion.cpp | 9 +- + qt5/tests/poppler-forms.cpp | 8 +- + qt5/tests/poppler-page-labels.cpp | 9 +- + qt5/tests/poppler-texts.cpp | 3 +- + qt5/tests/test-poppler-qt5.cpp | 3 +- + qt6/demos/pageview.cpp | 9 +- + qt6/demos/toc.cpp | 11 +- + qt6/src/QPainterOutputDev.cc | 6 +- + qt6/src/poppler-annotation.cc | 368 +++++++++++++-------- + qt6/src/poppler-document.cc | 36 +- + qt6/src/poppler-embeddedfile.cc | 9 +- + qt6/src/poppler-fontinfo.cc | 3 +- + qt6/src/poppler-form.cc | 73 +++-- + qt6/src/poppler-link-extractor.cc | 6 +- + qt6/src/poppler-link.cc | 33 +- + qt6/src/poppler-media.cc | 25 +- + qt6/src/poppler-optcontent.cc | 3 +- + qt6/src/poppler-outline.cc | 3 +- + qt6/src/poppler-page.cc | 73 +++-- + qt6/src/poppler-pdf-converter.cc | 8 +- + qt6/src/poppler-private.cc | 6 +- + qt6/src/poppler-private.h | 9 +- + qt6/src/poppler-ps-converter.cc | 23 +- + qt6/src/poppler-sound.cc | 6 +- + qt6/tests/check_annotations.cpp | 3 +- + qt6/tests/check_fonts.cpp | 18 +- + qt6/tests/check_forms.cpp | 21 +- + qt6/tests/check_utf_conversion.cpp | 9 +- + qt6/tests/poppler-forms.cpp | 8 +- + qt6/tests/poppler-page-labels.cpp | 9 +- + qt6/tests/poppler-texts.cpp | 3 +- + qt6/tests/test-poppler-qt6.cpp | 3 +- + splash/Splash.cc | 195 +++++++---- + splash/SplashBitmap.cc | 36 +- + splash/SplashFTFont.cc | 3 +- + splash/SplashFTFontFile.cc | 18 +- + splash/SplashFont.cc | 3 +- + splash/SplashFontEngine.cc | 18 +- + splash/SplashFontFile.cc | 12 +- + splash/SplashMath.h | 5 +- + splash/SplashPath.cc | 12 +- + splash/SplashScreen.cc | 3 +- + splash/SplashScreen.h | 6 +- + splash/SplashState.cc | 3 +- + splash/SplashTypes.h | 15 +- + splash/SplashXPath.cc | 3 +- + splash/SplashXPathScanner.cc | 15 +- + test/gtk-test.cc | 18 +- + test/pdf-fullrewrite.cc | 6 +- + test/pdf-inspector.cc | 13 +- + test/perf-test.cc | 176 ++++++---- + utils/HtmlFonts.cc | 25 +- + utils/HtmlLinks.cc | 9 +- + utils/HtmlOutputDev.cc | 188 +++++++---- + utils/HtmlUtils.h | 6 +- + utils/ImageOutputDev.cc | 99 +++--- + utils/InMemoryFile.cc | 3 +- + utils/parseargs.cc | 45 ++- + utils/pdfdetach.cc | 18 +- + utils/pdffonts.cc | 3 +- + utils/pdfimages.cc | 12 +- + utils/pdfinfo.cc | 23 +- + utils/pdfseparate.cc | 6 +- + utils/pdfsig.cc | 3 +- + utils/pdftocairo.cc | 185 +++++++---- + utils/pdftohtml.cc | 31 +- + utils/pdftoppm.cc | 45 ++- + utils/pdftops.cc | 8 +- + utils/pdftotext.cc | 21 +- + utils/pdfunite.cc | 12 +- + 208 files changed, 5501 insertions(+), 2964 deletions(-) + +commit 451acd97906681da4b385c8bb52a5dc971abb7fc +Author: Albert Astals Cid +Date: Fri Mar 4 19:45:56 2022 +0100 + + Make GooFile::open return an unique_ptr + + Sadly uncovers a memory leak on poppler_document_new_from_fd + + glib/poppler-document.cc | 5 +++-- + goo/gfile.cc | 14 +++++++------- + goo/gfile.h | 10 ++++++---- + poppler/GlobalParamsWin.cc | 8 +++----- + poppler/PDFDoc.cc | 7 +++---- + poppler/PDFDoc.h | 2 +- + 6 files changed, 23 insertions(+), 23 deletions(-) + +commit e5bcd52d20fd3451d299a11793231202e7c24f78 +Author: Albert Astals Cid +Date: Thu Mar 10 14:44:13 2022 +0100 + + Update (C) of previous commit + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 2 +- + poppler/BBoxOutputDev.cc | 1 + + poppler/CairoFontEngine.h | 1 + + poppler/CairoOutputDev.cc | 2 +- + poppler/Gfx.cc | 2 +- + poppler/Gfx.h | 2 +- + poppler/GfxState.cc | 2 +- + poppler/GfxState.h | 2 +- + poppler/MarkedContentOutputDev.cc | 1 + + poppler/MarkedContentOutputDev.h | 1 + + poppler/PSOutputDev.cc | 2 +- + poppler/PreScanOutputDev.cc | 1 + + poppler/SplashOutputDev.cc | 2 +- + poppler/TextOutputDev.cc | 2 +- + poppler/TextOutputDev.h | 2 +- + qt5/src/QPainterOutputDev.cc | 2 +- + qt6/src/QPainterOutputDev.cc | 2 +- + utils/HtmlFonts.cc | 2 +- + utils/HtmlFonts.h | 1 + + utils/HtmlOutputDev.cc | 2 +- + 21 files changed, 21 insertions(+), 15 deletions(-) + +commit 6388c277453f59336bfe5af45f0a5dbb161947bc +Author: Oliver Sander +Date: Fri Jan 7 09:46:47 2022 +0100 + + Replace hand-coded reference counting in GfxFont by std::shared_ptr + + poppler/Annot.cc | 70 + ++++++++++++++++++--------------------- + poppler/Annot.h | 2 +- + poppler/BBoxOutputDev.cc | 3 +- + poppler/CairoFontEngine.cc | 30 ++++++----------- + poppler/CairoFontEngine.h | 4 +-- + poppler/CairoOutputDev.cc | 2 +- + poppler/FontInfo.cc | 5 ++- + poppler/Gfx.cc | 18 ++++------ + poppler/Gfx.h | 6 ++-- + poppler/GfxFont.cc | 35 +++----------------- + poppler/GfxFont.h | 18 +++------- + poppler/GfxState.cc | 12 ++----- + poppler/GfxState.h | 6 ++-- + poppler/MarkedContentOutputDev.cc | 13 ++------ + poppler/MarkedContentOutputDev.h | 16 ++++----- + poppler/PSOutputDev.cc | 7 ++-- + poppler/PreScanOutputDev.cc | 2 +- + poppler/SplashOutputDev.cc | 6 ++-- + poppler/TextOutputDev.cc | 11 ++---- + poppler/TextOutputDev.h | 2 +- + qt5/src/QPainterOutputDev.cc | 30 ++++++++--------- + qt6/src/QPainterOutputDev.cc | 30 ++++++++--------- + utils/HtmlFonts.cc | 8 ++--- + utils/HtmlFonts.h | 2 +- + utils/HtmlOutputDev.cc | 9 +++-- + 25 files changed, 133 insertions(+), 214 deletions(-) + +commit ccff89e218b13c1edfbbef0166f4b5da66ae3b57 +Author: Albert Astals Cid +Date: Wed Mar 9 23:46:17 2022 +0100 + + Update (C) of previous commit + + splash/SplashFTFontEngine.cc | 2 +- + splash/SplashFTFontEngine.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit a736a7f3dc480691bf5425dc6a118773593e1b03 +Author: Albert Astals Cid +Date: Wed Mar 9 17:58:35 2022 +0100 + + Require the min freetype of our minimum linux base + + Simplifies SplashFTFontEngine a bit + + CMakeLists.txt | 3 ++- + splash/SplashFTFontEngine.cc | 62 + ++------------------------------------------ + splash/SplashFTFontEngine.h | 1 - + 3 files changed, 4 insertions(+), 62 deletions(-) + +commit d55227d2533ae52d08823bd135bb3608b3b779a3 +Author: Albert Astals Cid +Date: Tue Mar 8 15:22:39 2022 +0100 + + Fix easy warning when building on mingw + + test/gtk-test.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 9e2dc642c5235037a8912512e67a6124ca69a2fa +Author: Albert Astals Cid +Date: Tue Mar 8 15:03:20 2022 +0100 + + CI: Install libtiff-dev for ubuntu + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8d051716029f056bf9b395269fb88c7322a3345c +Author: Albert Astals Cid +Date: Tue Mar 8 14:53:07 2022 +0100 + + If you want to build the cpp frontend iconv is required + + If you don't have iconv, you can set -DENABLE_CPP=OFF on compile time + + Also remove HAVE_ICONV that is not used anywhere + + CMakeLists.txt | 4 +--- + config.h.cmake | 3 --- + 2 files changed, 1 insertion(+), 6 deletions(-) + +commit a16189a8ba5c86389acf41822b78a569d5f666d9 +Author: Albert Astals Cid +Date: Tue Mar 8 14:29:04 2022 +0100 + + glib: Fix returning c_str() of temporal strings + + They go out of scope as soon as the function returns + + glib/poppler-document.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6e1fe42a6a3c3f7b7cfb259f7de3d8a1de279016 +Author: Albert Astals Cid +Date: Mon Mar 7 16:24:06 2022 +0100 + + GooString: Add lowercase helpers for std::string + + goo/GooString.cc | 17 ++++++++++++++--- + goo/GooString.h | 6 +++++- + 2 files changed, 19 insertions(+), 4 deletions(-) + +commit 3ecb7663c5f787c4ef877d8e0884036e4fb236f2 +Author: Oliver Sander +Date: Tue Mar 8 10:02:42 2022 +0100 + + Store GfxFontDict::fonts in a std::vector + + poppler/GfxFont.cc | 23 ++++++++--------------- + poppler/GfxFont.h | 5 ++--- + 2 files changed, 10 insertions(+), 18 deletions(-) + +commit 34ecd262997ebe6a9eb3b1abdf38d76428a23adf +Author: Oliver Sander +Date: Tue Mar 8 09:51:03 2022 +0100 + + Make method getWMode const + + poppler/GfxFont.cc | 4 ++-- + poppler/GfxFont.h | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit b41c92c66885ad5849db8337c104ff1e7ee64b60 +Author: Albert Astals Cid +Date: Mon Mar 7 16:15:25 2022 +0100 + + Annot::getRect: Return a const & instead of a pointer + + Makes it clear the result is never null + + glib/poppler-annot.cc | 22 ++++++++++------------ + glib/poppler-page.cc | 11 +++++------ + poppler/Annot.h | 2 +- + qt5/src/poppler-annotation.cc | 8 ++++---- + qt6/src/poppler-annotation.cc | 8 ++++---- + 5 files changed, 24 insertions(+), 27 deletions(-) + +commit 3d4db6773c46ac4f5df1bdb212a276db51f8d371 +Author: Albert Astals Cid +Date: Fri Mar 4 20:03:04 2022 +0100 + + Move makeFileDescriptorCloexec inside the #if its used in + + goo/gfile.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 773e2d4a42757c440855f6260b9dcf15cf85a74a +Author: Oliver Sander +Date: Mon Mar 7 14:29:32 2022 +0100 + + Let type3_font_info_t have a constructor that takes all information + + poppler/CairoFontEngine.cc | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit 47ba2b0dfc7a997ba159a39769ff0edf99e08cdc +Author: Oliver Sander +Date: Mon Mar 7 14:22:12 2022 +0100 + + Use new/delete for class type3_font_info_t + + In a later commit I want to change type3_font_info_t and make it + contain types with non-trivial destructors. However, these + destructors are only called when the destructor of type3_font_info_t + is called. And this only happens if type3_font_info_t is deleted + with 'delete', not with 'free'. + + poppler/CairoFontEngine.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit f5ff8e1a96a40688221cc2800afb17b3ee5c7063 +Author: Albert Astals Cid +Date: Sun Mar 6 17:08:13 2022 +0100 + + Update (C) + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 894b47409ecbecca8735da63629030e14aa520ca +Author: ANaumann85 <42870-ANaumann85@users.noreply.gitlab.freedesktop.org> +Date: Sun Mar 6 16:06:11 2022 +0000 + + Fix underline sometimes being drawn only partially + + poppler/Annot.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 35f06568f51c8dd9fb936b74db766169b91de630 +Author: Albert Astals Cid +Date: Thu Mar 3 16:39:06 2022 +0100 + + FoFiTrueType: Parse CFF2 fonts too + + fofi/FoFiTrueType.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1c1553142de667a10949ac17d9f9f609f1a23832 +Author: Albert Astals Cid +Date: Thu Mar 3 17:30:15 2022 +0100 + + qt: Add qWarnings for non supported scenarios + + qt5/src/poppler-annotation.cc | 2 ++ + qt6/src/poppler-annotation.cc | 2 ++ + 2 files changed, 4 insertions(+) + +commit 26f56c073bdcccb5780e8cc3226ff2a2df6fe97d +Author: Albert Astals Cid +Date: Tue Mar 1 23:28:47 2022 +0100 + + qt: Handle SaveAs named action + + qt5/src/poppler-annotation.cc | 3 +++ + qt5/src/poppler-link.h | 5 +++-- + qt5/src/poppler-page.cc | 7 +++++-- + qt6/src/poppler-link.h | 5 +++-- + qt6/src/poppler-page.cc | 7 +++++-- + 5 files changed, 19 insertions(+), 8 deletions(-) + +commit 4e8d336cc5b7bc848afd50bbe8211e5837f298a4 +Author: Albert Astals Cid +Date: Wed Mar 2 16:53:33 2022 +0100 + + qt: Add a few "don't do anything if you're setting the same value + we already have" + + qt5/src/poppler-annotation.cc | 6 ++++++ + qt6/src/poppler-annotation.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +commit ca724daf21a60900e6bb3d44e7b88c64990e4a21 +Author: Albert Astals Cid +Date: Wed Mar 2 16:44:56 2022 +0100 + + qt: Annotations, don't change the text color when changing the font + + qt5/src/poppler-annotation.cc | 3 +-- + qt5/src/poppler-annotation.h | 4 ++-- + qt6/src/poppler-annotation.cc | 3 +-- + qt6/src/poppler-annotation.h | 3 ++- + 4 files changed, 6 insertions(+), 7 deletions(-) + +commit 26fb316af4dcfb5d909b44e63fd7991f16e11d0a +Author: Albert Astals Cid +Date: Tue Mar 1 17:44:00 2022 +0100 + + AnnotMarkup::setLabel: Take a unique_ptr + + This was double deleting on the glib side + + glib/poppler-annot.cc | 5 +---- + poppler/Annot.cc | 4 ++-- + poppler/Annot.h | 2 +- + qt5/src/poppler-annotation.cc | 4 +--- + qt6/src/poppler-annotation.cc | 4 +--- + 5 files changed, 6 insertions(+), 13 deletions(-) + +commit bd24fb667c0deb220aa7e05cbf2b1807b57fff9b +Author: Albert Astals Cid +Date: Tue Mar 1 17:41:29 2022 +0100 + + Annot::setContents: Take a unique_ptr + + This was double deleting on the glib side + + glib/poppler-annot.cc | 5 +---- + poppler/Annot.cc | 12 ++++++------ + poppler/Annot.h | 6 +++--- + qt5/src/poppler-annotation.cc | 4 +--- + qt6/src/poppler-annotation.cc | 4 +--- + 5 files changed, 12 insertions(+), 19 deletions(-) + +commit 8e710e54806d85b901d6d3d3d79818b6e8e44b5d +Author: Albert Astals Cid +Date: Tue Mar 1 22:50:27 2022 +0100 + + poppler 22.03.0 + + CMakeLists.txt | 4 ++-- + NEWS | 17 +++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 22 insertions(+), 5 deletions(-) + +commit 1dbb74f24bb5d6d1f000993c62f3916dfa67d15e +Author: Oliver Sander +Date: Sat Feb 26 17:54:32 2022 +0100 + + Import improved line join handling from xpdf 4.02 + + The imported code from the makeStrokePath method seems much more + sophisticated than what is currently in poppler. In particular, + it fixes + + https://gitlab.freedesktop.org/poppler/poppler/-/issues/1212 + + Also, at least for the test file from that bug, the makeStrokePath + implementation from xpdf constructs a path with only a bit more + than half the number of points than the current poppler + implementation. + Therefore, importing the xpdf code may improve rendering efficiency. + + README-XPDF | 2 +- + poppler/poppler-config.h.cmake | 4 +- + splash/Splash.cc | 100 + +++++++++++++++++++++++++++++++++++++---- + 3 files changed, 94 insertions(+), 12 deletions(-) + +commit 5b2a4b46f642acc0db97910045475d340be57466 +Author: Albert Astals Cid +Date: Tue Feb 22 16:07:50 2022 +0100 + + qt: Store QFont as an optional + + This way we can know whether the font has been set externally or not + + qt5/src/poppler-annotation.cc | 18 +++++++++++++----- + qt6/src/poppler-annotation.cc | 18 +++++++++++++----- + 2 files changed, 26 insertions(+), 10 deletions(-) + +commit ad96231cca9390713183cf899d5a62b81d1767eb +Author: Albert Astals Cid +Date: Tue Feb 22 15:07:11 2022 +0100 + + qt: Remove unneeded unique_ptr constructor + + convertQColor already returns an unique_ptr + + qt5/src/poppler-annotation.cc | 4 ++-- + qt6/src/poppler-annotation.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 7a5b40bb7e55e0e9b5f30db8f51fae6f7f8cf128 +Author: Albert Astals Cid +Date: Tue Feb 22 00:05:59 2022 +0100 + + Update (C) + + poppler/GlobalParams.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6f2e2fde31825a8cd3256fc918e8b48d7a050be2 +Author: Stefan Löffler +Date: Mon Feb 21 23:03:21 2022 +0000 + + Fix poppler_localdir for relocatable Windows builds + + It was working by pure change, since sizeof(retval) is either 4 or 8 + so sizeof(retval)-20 is a negative number and that wrapped to a huge + number when cast to unsigned so we were lucky it did not overflow + the given char * + + poppler/GlobalParams.cc | 54 + ++++++++++++++++++++++++------------------------- + 1 file changed, 26 insertions(+), 28 deletions(-) + +commit 64d538895f0631e32e3494de6d9aad1aaf51b55a +Author: Albert Astals Cid +Date: Mon Feb 21 23:02:04 2022 +0100 + + Update (C) of last commit + + poppler/FontInfo.cc | 2 +- + poppler/FontInfo.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 996dfb015f5567cdaf191c127c2cf804f852d80b +Author: Oliver Sander +Date: Fri Feb 18 10:46:57 2022 +0100 + + Store the strings in FontInfo in std::optional + + This saves some memory allocations, because the strings are now + stored by value rather than by a pointer pointing to the heap. + + Also, the costum copy constructor can be replaced by the default + one with this change. + + glib/poppler-document.cc | 17 +++++++---------- + poppler/FontInfo.cc | 34 +++++----------------------------- + poppler/FontInfo.h | 18 +++++++++--------- + 3 files changed, 21 insertions(+), 48 deletions(-) + +commit ee937d16bbc9f8375fd670b10477d813b1a832ed +Author: Albert Astals Cid +Date: Wed Feb 16 23:47:29 2022 +0100 + + We don't use pthreads anymore, cleanup cmake stuff around it + + Well, there's some pthread code still in pdftoppm but it's "test" + related, and should just be ported to C++11 threads + + CMakeLists.txt | 10 ---------- + glib/CMakeLists.txt | 3 --- + test/CMakeLists.txt | 4 ---- + utils/CMakeLists.txt | 3 --- + 4 files changed, 20 deletions(-) + +commit b9181a5a99b2cbea568b3bc15f4fc0f648358577 +Author: Albert Astals Cid +Date: Thu Feb 10 16:36:07 2022 +0100 + + CMap: Turn manual refcounting into using shared_ptr + + poppler/CMap.cc | 79 + +++++++++++-------------------------------------- + poppler/CMap.h | 20 ++++++------- + poppler/GfxFont.cc | 9 ++---- + poppler/GfxFont.h | 5 ++-- + poppler/GlobalParams.cc | 2 +- + poppler/GlobalParams.h | 4 +-- + 6 files changed, 35 insertions(+), 84 deletions(-) + +commit 4f2abd3efa1ee013d7e672bad5a2fe58610cdc1d +Author: Albert Astals Cid +Date: Tue Feb 15 18:43:16 2022 +0100 + + PDFDoc: Make passwords std::optional instead of pointers + + Makes it clearer that we're not taking ownership of them + + cpp/poppler-document.cpp | 12 +++------- + glib/poppler-document.cc | 52 + +++++++++++----------------------------- + poppler/CurlPDFDocBuilder.cc | 2 +- + poppler/CurlPDFDocBuilder.h | 4 ++-- + poppler/FDPDFDocBuilder.cc | 4 ++-- + poppler/FDPDFDocBuilder.h | 4 ++-- + poppler/Form.cc | 12 +++++----- + poppler/Form.h | 8 +++---- + poppler/LocalPDFDocBuilder.cc | 2 +- + poppler/LocalPDFDocBuilder.h | 4 ++-- + poppler/PDFDoc.cc | 12 +++++----- + poppler/PDFDoc.h | 13 +++++----- + poppler/PDFDocBuilder.h | 4 ++-- + poppler/PDFDocFactory.cc | 2 +- + poppler/PDFDocFactory.h | 4 ++-- + poppler/SecurityHandler.cc | 9 ++++--- + poppler/SecurityHandler.h | 10 ++++---- + qt5/src/poppler-document.cc | 14 +++++------ + qt5/src/poppler-form.cc | 9 ++++--- + qt5/src/poppler-pdf-converter.cc | 6 ++--- + qt5/src/poppler-private.h | 13 +++------- + qt6/src/poppler-document.cc | 14 +++++------ + qt6/src/poppler-form.cc | 9 ++++--- + qt6/src/poppler-pdf-converter.cc | 6 ++--- + qt6/src/poppler-private.h | 13 +++------- + test/image-embedding.cc | 3 ++- + test/pdf-fullrewrite.cc | 10 ++++---- + test/pdf-inspector.cc | 2 +- + test/perf-test.cc | 4 ++-- + utils/pdfattach.cc | 2 +- + utils/pdfdetach.cc | 16 +++---------- + utils/pdffonts.cc | 10 ++++---- + utils/pdfimages.cc | 18 ++++---------- + utils/pdfinfo.cc | 18 ++++---------- + utils/pdfseparate.cc | 4 ++-- + utils/pdfsig.cc | 10 ++++---- + utils/pdftocairo.cc | 16 ++++--------- + utils/pdftohtml.cc | 18 ++++---------- + utils/pdftoppm.cc | 19 ++++----------- + utils/pdftops.cc | 18 ++++---------- + utils/pdftotext.cc | 18 ++++---------- + utils/pdfunite.cc | 2 +- + 42 files changed, 153 insertions(+), 277 deletions(-) + +commit 608c6eaf32252f3798ff0a91d3be5d52fdcdacc0 +Author: Kai Pastor +Date: Fri Feb 11 08:30:23 2022 +0100 + + Use Freetype::Freetype + + CMakeLists.txt | 4 +--- + glib/CMakeLists.txt | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt6/src/CMakeLists.txt | 2 +- + test/CMakeLists.txt | 2 +- + utils/CMakeLists.txt | 2 +- + 6 files changed, 6 insertions(+), 8 deletions(-) + +commit d3a4b3f94a007e39d625d3b88ef8d2d9a370d678 +Author: Kai Pastor +Date: Fri Feb 11 08:29:53 2022 +0100 + + Concentrate Fontconfig CMake setup + + CMakeLists.txt | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 9f9c55f9ad249b004a341c2df6cd8ff920083b5d +Author: Kai Pastor +Date: Fri Feb 11 08:24:04 2022 +0100 + + Concentrate JPEG CMake setup + + CMakeLists.txt | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 6c2126b3149b9ff07e0322fb59ba29d628c21dfc +Author: Kai Pastor +Date: Fri Feb 11 08:19:32 2022 +0100 + + Concentrate OpenJPEG CMake setup + + CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 314f71d4c509ea431a09efc5e302f01be6382654 +Author: Kai Pastor +Date: Fri Feb 11 08:18:01 2022 +0100 + + Concentrate LCMS CMake setup + + CMakeLists.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit bdb43ae4d7000e86bb90ab099ee22be3d9798d24 +Author: Kai Pastor +Date: Fri Feb 11 07:58:32 2022 +0100 + + Don't use CURL_INCLUDE_DIRS with CURL::libcurl + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 401845240f5a7b265961a77103a01da25e711054 +Author: Kai Pastor +Date: Fri Feb 11 07:57:23 2022 +0100 + + Use output variable from CMake find modules + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 651c533e92e3315f89764857094d71652f3349e0 +Author: Albert Astals Cid +Date: Mon Feb 14 15:58:07 2022 +0100 + + pdfimages: Fix the wrong Stream being passed for drawMaskedImage + + utils/ImageOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 07889cdfd8a261dc5ae6eb72c26a8a3ec2e35930 +Author: Albert Astals Cid +Date: Tue Feb 15 17:14:44 2022 +0100 + + Make PDFDoc constructor take the filename as unique_ptr + + Makes it clear that it will own the given GooString + + cpp/poppler-document-private.h | 4 ++-- + cpp/poppler-document.cpp | 8 ++++---- + glib/poppler-document.cc | 7 ++----- + poppler/CurlPDFDocBuilder.cc | 4 ++-- + poppler/Form.cc | 9 ++++----- + poppler/Form.h | 2 +- + poppler/LocalPDFDocBuilder.cc | 9 ++++----- + poppler/PDFDoc.cc | 16 ++++++++-------- + poppler/PDFDoc.h | 8 ++++---- + poppler/PDFDocFactory.cc | 5 ++--- + qt5/src/poppler-private.h | 3 +-- + qt5/tests/check_optcontent.cpp | 6 ++---- + qt6/src/poppler-private.h | 3 +-- + qt6/tests/check_optcontent.cpp | 6 ++---- + test/pdf-fullrewrite.cc | 13 +++---------- + test/pdf-inspector.cc | 7 ++----- + test/perf-test.cc | 16 +++------------- + utils/pdfseparate.cc | 5 ++--- + utils/pdfunite.cc | 5 ++--- + 19 files changed, 51 insertions(+), 85 deletions(-) + +commit 47256c3c2905ade19f21224cb48ff5bb7de43a03 +Author: Albert Astals Cid +Date: Tue Feb 15 16:44:20 2022 +0100 + + Change PDFDoc::save from pointer to reference + + Makes it clear it's not going to be destructed and that it can't + be null + + cpp/poppler-document.cpp | 4 ++-- + glib/poppler-document.cc | 6 ++---- + poppler/Form.cc | 2 +- + poppler/PDFDoc.cc | 20 ++++++++++---------- + poppler/PDFDoc.h | 6 +++--- + qt5/tests/check_internal_outline.cpp | 16 ++++++++-------- + qt6/tests/check_internal_outline.cpp | 16 ++++++++-------- + test/pdf-fullrewrite.cc | 3 ++- + utils/pdfattach.cc | 4 ++-- + utils/pdfseparate.cc | 7 ++----- + 10 files changed, 40 insertions(+), 44 deletions(-) + +commit e3a4636aad98b2abbb6e6e87f20f8d0156c82ac0 +Author: Albert Astals Cid +Date: Tue Feb 15 15:45:48 2022 +0100 + + Make Movie::copy return an unique_ptr + + poppler/Annot.cc | 2 +- + poppler/Movie.cc | 6 +++--- + poppler/Movie.h | 6 ++++-- + qt5/src/poppler-movie.cc | 6 +++--- + qt6/src/poppler-movie.cc | 6 +++--- + 5 files changed, 14 insertions(+), 12 deletions(-) + +commit 5390a119a3cdf58ea03effac83910cd35eab23f6 +Author: Albert Astals Cid +Date: Thu Feb 10 14:53:30 2022 +0100 + + HtmlOutputDev: Remove useless GooString + + utils/HtmlOutputDev.cc | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 7a429c3cf9fba67ee736a52aa4f12e0c177f1405 +Author: Albert Astals Cid +Date: Thu Feb 10 14:44:13 2022 +0100 + + Remove LinkDest::copy + + The class is perfectly copyable by the default compiler provided copy + constructor + + poppler/Link.cc | 21 +-------------------- + poppler/Link.h | 7 +------ + utils/HtmlOutputDev.cc | 8 ++++---- + 3 files changed, 6 insertions(+), 30 deletions(-) + +commit 4d145b54616a247a80d8a85c4df98851628cfcfc +Author: Albert Astals Cid +Date: Thu Feb 10 12:52:45 2022 +0100 + + Use the "superior" C++17 std::scoped_lock + + poppler/Annot.cc | 2 +- + poppler/Array.cc | 4 ++-- + poppler/CairoFontEngine.cc | 4 ++-- + poppler/Catalog.cc | 2 +- + poppler/Dict.cc | 4 ++-- + poppler/GlobalParams.cc | 12 ++++++------ + poppler/GlobalParamsWin.cc | 4 ++-- + poppler/PDFDoc.cc | 2 +- + poppler/Page.cc | 4 ++-- + poppler/XRef.cc | 4 ++-- + 10 files changed, 21 insertions(+), 21 deletions(-) + +commit eb10061228457efa89bee693e5fb285290d81dfc +Author: Albert Astals Cid +Date: Thu Feb 10 12:00:22 2022 +0100 + + Update (C) of previous commits + + poppler/Error.cc | 2 +- + poppler/UTF.cc | 2 +- + poppler/UTF.h | 2 +- + poppler/UnicodeMap.cc | 2 +- + poppler/UnicodeMap.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +commit 88f158d3fd1e298ef425fafe84456f67c7f9a17c +Author: Albert Astals Cid +Date: Thu Feb 10 11:49:26 2022 +0100 + + Make UnicodeMap::parse return an unique_ptr + + poppler/UnicodeMap.cc | 26 ++++++++++---------------- + poppler/UnicodeMap.h | 9 +++------ + 2 files changed, 13 insertions(+), 22 deletions(-) + +commit 838e5ecf576b41323f657cdc5f8779bcc7d843c8 +Author: Albert Astals Cid +Date: Thu Feb 10 11:32:34 2022 +0100 + + Make utf8ToUtf16WithBom return a unique_ptr + + poppler/UTF.cc | 4 ++-- + poppler/UTF.h | 3 ++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 7e0bf20c1aa7859565b0c6d3b1f78efcce949617 +Author: Albert Astals Cid +Date: Thu Feb 10 11:15:11 2022 +0100 + + Error: Save newing/deleting a GooString + + poppler/Error.cc | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +commit beb5519f723cd84d8d4afa989118df5fffbe50fb +Author: Albert Astals Cid +Date: Wed Feb 9 18:56:51 2022 +0100 + + Make Catalog::embeddedFile return an unique_ptr + + cpp/poppler-document.cpp | 6 ++-- + cpp/poppler-embedded-file-private.h | 16 +++++----- + cpp/poppler-embedded-file.cpp | 13 +++----- + glib/poppler-document.cc | 7 ++--- + poppler/Catalog.cc | 12 +++---- + poppler/Catalog.h | 4 +-- + qt5/src/poppler-annotation.cc | 10 +++--- + qt5/src/poppler-embeddedfile-private.h | 10 ++---- + qt5/src/poppler-embeddedfile.cc | 10 ++---- + qt5/src/poppler-private.h | 7 +++-- + qt6/src/poppler-annotation.cc | 10 +++--- + qt6/src/poppler-embeddedfile-private.h | 10 ++---- + qt6/src/poppler-embeddedfile.cc | 10 ++---- + qt6/src/poppler-private.h | 7 +++-- + utils/pdfdetach.cc | 57 + ++++++++++++---------------------- + 15 files changed, 70 insertions(+), 119 deletions(-) + +commit 49ee0593c690bada2f17370dcf5b8f387998c040 +Author: Albert Astals Cid +Date: Wed Feb 9 15:41:30 2022 +0100 + + PDFDoc: Remove useless checks in destructor + + poppler/PDFDoc.cc | 36 +++++++++--------------------------- + 1 file changed, 9 insertions(+), 27 deletions(-) + +commit f5d3f401be27c2e57a9eb962a9edea35b3ba9574 +Author: Albert Astals Cid +Date: Wed Feb 9 15:19:07 2022 +0100 + + Remove ViewerPreferences::init + + By having the initialization directly in the member definition we make + sure that if ever we introduce a new constructor we will not forget to + call init() + + poppler/ViewerPreferences.cc | 13 +------------ + poppler/ViewerPreferences.h | 12 ++++++------ + 2 files changed, 7 insertions(+), 18 deletions(-) + +commit 0eb4b4b578f02bbfd507039ab1077cbb1fde5aef +Author: Albert Astals Cid +Date: Wed Feb 9 14:58:55 2022 +0100 + + Remove PDFDoc::init + + By having the initialization directly in the member definition we make + sure that if ever we introduce a new constructor we will not forget to + call init() + + poppler/PDFDoc.cc | 67 + +++++++++---------------------------------------------- + poppler/PDFDoc.h | 36 +++++++++++++++--------------- + 2 files changed, 28 insertions(+), 75 deletions(-) + +commit 85fc5394a8fd785486a7c73630d320f459a7a281 +Author: Albert Astals Cid +Date: Tue Feb 8 14:54:01 2022 +0100 + + qt: Change typedefs to using + + Much easier to understand + + qt5/src/poppler-qt5.h | 8 ++++---- + qt6/src/poppler-qt6.h | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit b02ecd63f279691913aa58ecf3524db95dc565aa +Author: Albert Astals Cid +Date: Fri Feb 4 00:24:47 2022 +0100 + + Windows: Better way to access Mozilla appdata + + poppler/SignatureHandler.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 373bad5cd0a8996beed271228e9131833a7ba8ce +Author: Albert Astals Cid +Date: Wed Feb 2 20:22:21 2022 +0100 + + Be more resiliant against env variables not being set + + getenv can return null so don't crash (constructing a std::string from + null is not good) if that happens + + poppler/SignatureHandler.cc | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit 652ff5ea5ec6df2c4343ff730dee5e7893138104 +Author: Albert Astals Cid +Date: Wed Feb 2 20:20:22 2022 +0100 + + Fix getting the home dir in Windows + + poppler/SignatureHandler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b8dab63b747b61de6678d6e8cd852daebd44c27e +Author: Albert Astals Cid +Date: Mon Jan 24 00:50:30 2022 +0100 + + Improve PDFDoc::getSignatureFields + + glib/poppler-document.cc | 2 +- + poppler/PDFDoc.cc | 49 + +++++++++++++++++++----------------------------- + poppler/PDFDoc.h | 1 - + 3 files changed, 20 insertions(+), 32 deletions(-) + +commit 57c948fa0656ef3ec3cbf24581460da4a9441106 +Author: Albert Astals Cid +Date: Tue Feb 1 23:30:47 2022 +0100 + + Popppler 22.02.0 + + CMakeLists.txt | 4 ++-- + NEWS | 26 ++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/CMakeLists.txt | 2 +- + qt6/src/Doxyfile | 2 +- + 8 files changed, 34 insertions(+), 8 deletions(-) + +commit 602f39aa5c00f2dd2a61f1b4a781720ae3bc6070 +Author: Albert Astals Cid +Date: Tue Feb 1 23:19:00 2022 +0100 + + Windows: Fix path where to look for firefox NSS DB + + poppler/SignatureHandler.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit b2f14ccbf4e5aef7489d2da45c03cacf8db67953 +Author: Albert Astals Cid +Date: Tue Feb 1 15:35:47 2022 +0100 + + qt5: cleanup todos, we already require that qt version since a while + + qt5/demos/navigationtoolbar.cpp | 11 ++++------- + qt5/demos/viewer.cpp | 17 ++++++----------- + qt5/src/poppler-optcontent.cc | 15 ++++----------- + 3 files changed, 14 insertions(+), 29 deletions(-) + +commit bcdb1219e302103b5676e007893a88c3707be26e +Author: Albert Astals Cid +Date: Tue Feb 1 15:22:47 2022 +0100 + + Use default X509CertificateInfo::EntityInfo operator= + + poppler/CertificateInfo.cc | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +commit a06839fe32b95af3caa5479218d80d705d8d78a5 +Author: Albert Astals Cid +Date: Mon Jan 31 21:38:42 2022 +0100 + + AnnotAppearanceCharacs: Also initialize position when !dict + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit ceba74e5a372f3b48cffd30fa6d30a8ff3b13556 +Author: Albert Astals Cid +Date: Mon Jan 31 21:34:02 2022 +0100 + + Fix leak introduced in 953c9c762f346236d856327833f3a550b993138a + + fofi/FoFiTrueType.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e9d5731ba254f35e2d94b628c51e48c50a945271 +Author: Fabrice Fontaine +Date: Mon Jan 24 09:28:20 2022 +0100 + + glib/CMakeLists.txt: allow the user to configure + INTROSPECTION_COMPILER_ARGS + + Allow the user to add its own parameters such as + --includedir=$(STAGING_DIR)/usr/share/gir-1.0 to + INTROSPECTION_COMPILER_ARGS to avoid the following build failure when + cross-compiling with buildroot: + + [ 98%] Generating Poppler-0.18.typelib + Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or + use --includedir + error parsing file + /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: + Failed to parse included gir GObject-2.0 + If the above error message is about missing .so libraries, then + setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. + Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" + + Fixes: + - + http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e + + Signed-off-by: Fabrice Fontaine + + glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b3f93644de4941bdbd532a7d8f82cd652dfbeadf +Author: Albert Astals Cid +Date: Sat Jan 29 00:19:47 2022 +0100 + + Update (C) + + poppler/PDFDoc.cc | 1 + + poppler/PDFDoc.h | 1 + + qt5/src/poppler-pdf-converter.cc | 1 + + qt6/src/poppler-pdf-converter.cc | 1 + + utils/pdfsig.cc | 1 + + 5 files changed, 5 insertions(+) + +commit 864466a6753014106448f1a6c0000aa68bedf101 +Author: Felix Jung +Date: Fri Jan 28 23:16:13 2022 +0000 + + qt: Pass leftFontSize down to `PDFDoc::signsign` so it's actually used + + poppler/PDFDoc.cc | 5 +++-- + poppler/PDFDoc.h | 4 ++-- + qt5/src/poppler-pdf-converter.cc | 2 +- + qt6/src/poppler-pdf-converter.cc | 2 +- + utils/pdfsig.cc | 2 +- + 5 files changed, 8 insertions(+), 7 deletions(-) + +commit 2ac091c8c1fefe21caf1c2d032c57f90c6674844 +Author: Marek Kasik +Date: Tue Jan 25 15:58:05 2022 +0100 + + glib: New method for getting all signature fields + + This commit adds new method poppler_document_get_signature_fields() + which returns GList of all signature fields for the document. + This is needed as some documents have signature fields which are not + associated to any page and hence are unaccessible now. + + glib/poppler-document.cc | 32 ++++++++++++++++++++++++++++++-- + glib/poppler-document.h | 4 +++- + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 34 insertions(+), 3 deletions(-) + +commit 277f5de9684b3392f0d585bd36ad1a5e9e9e9ed7 +Author: Albert Astals Cid +Date: Tue Jan 4 15:21:10 2022 +0100 + + [qt] Add FormFieldSignature::sign + + poppler/Annot.cc | 61 + +++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 7 ++++++ + poppler/Form.cc | 49 +++++++++++++++++++++++++++++++++++++++ + poppler/Form.h | 7 ++++++ + qt5/src/poppler-form.cc | 31 +++++++++++++++++++++++-- + qt5/src/poppler-form.h | 22 +++++++++++++++++- + qt6/src/poppler-form.cc | 31 +++++++++++++++++++++++-- + qt6/src/poppler-form.h | 22 +++++++++++++++++- + 8 files changed, 224 insertions(+), 6 deletions(-) + +commit 5e7f4bd726f82e632f14c21261277f9f944fd918 +Author: Albert Astals Cid +Date: Mon Jan 3 14:40:10 2022 +0100 + + Add a way to detect unsigned FormFieldSignature + + Adobe Acrobat creates those when you're creating a field to ask + someone else to sign the document + + poppler/Form.cc | 4 +++- + poppler/Form.h | 3 ++- + qt5/src/poppler-form.cc | 3 +++ + qt5/src/poppler-form.h | 3 ++- + qt6/src/poppler-form.cc | 3 +++ + qt6/src/poppler-form.h | 3 ++- + utils/pdfsig.cc | 13 ++++++++++--- + 7 files changed, 25 insertions(+), 7 deletions(-) + +commit d70e614b146b47066609c40ebba0e5c92ee6d487 +Author: Albert Astals Cid +Date: Fri Jan 21 00:09:38 2022 +0100 + + Revert e2ec957c0174a36396c3e8c194f44a1f300a950f + + Until we depend on a newer gcc (>= 9.1) + + We still support gcc 8 and it seems it's not super obvious to use it + there, might need linking to an extra library in some platforms, + and honestly for the 1 warning on MSVC that this fixes + it's not worth the effort to figure out how to link to that lib + + See Issue 1203 for more info. + + splash/SplashFontFile.cc | 16 +++------------- + 1 file changed, 3 insertions(+), 13 deletions(-) + +commit 4d2fa9808f48733432ead92f7a45be2974bc1984 +Author: Albert Astals Cid +Date: Wed Jan 19 15:27:50 2022 +0100 + + Fix glib compilation on MSVC + + glib-mkenums is a python script and you can't tell Windows to + run those, + so tell windows to run python with glib-mkenums as script to run + + glib/CMakeLists.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 14baf9772df781be96d04c40fe1c56615b301fe3 +Author: Albert Astals Cid +Date: Thu Jan 20 23:17:00 2022 +0100 + + pdfsig: Fix compile with MSVC + + utils/pdfsig.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 799848525e9f07b8ff7de1fb6d41cb082de364e6 +Author: Albert Astals Cid +Date: Tue Jan 18 15:41:56 2022 +0100 + + SignatureHandler: Fix crashes on Windows + + We should not use SEC_ASN1_XTRN since on Windows that means + SEC_ASN1_DYNAMIC which means the third parameter is a function. + + IssuerSerialTemplate is not a function + + SECOID_AlgorithmIDTemplate was a function, but that was also a mistake + since it's defined as a template in secoid.h + + poppler/SignatureHandler.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 66100be4fa629d03634c6461c084a72926473ce8 +Author: Albert Astals Cid +Date: Mon Jan 17 23:25:20 2022 +0100 + + FindNSS3: Improve documentation and remove "wrong" MSVC check + + cmake/modules/FindNSS3.cmake | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit cbaee79177ff09d91bdc3dd3d2497ecac80f969f +Author: Albert Astals Cid +Date: Mon Jan 17 16:37:02 2022 +0100 + + Fix including gdir.h in Windows + + goo/gdir.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit b3ca5e58c3839b34c45319848db6b19af344a7f3 +Author: Albert Astals Cid +Date: Mon Jan 17 16:11:14 2022 +0100 + + Use GDir in getDefaultFirefoxCertDB_Linux + + goo/gdir.h | 4 ++++ + poppler/SignatureHandler.cc | 44 + +++++++++++++++----------------------------- + 2 files changed, 19 insertions(+), 29 deletions(-) + +commit ee974518464914b0e52549044a244863fd4342f7 +Author: Albert Astals Cid +Date: Mon Jan 17 15:55:57 2022 +0100 + + Make GDir::getNextEntry return a unique pointer + + goo/gdir.h | 6 ++++-- + goo/gfile.cc | 13 ++++++------- + poppler/GlobalParams.cc | 8 ++------ + 3 files changed, 12 insertions(+), 15 deletions(-) + +commit 90d1dd7bae03b9af063554f240d0f684912755c0 +Author: Nelson Benítez León +Date: Sat Jan 8 13:24:41 2022 -0400 + + glib: try with utf8 password if latin1 fails + + when opening encrypted files in below functions. + + poppler_document_new_from_file(): + poppler_document_new_from_data(): + poppler_document_new_from_bytes(): + poppler_document_new_from_stream(): + poppler_document_new_from_fd(): + + Poppler-glib converts password to latin1 before opening, + but as shown in issue #824 there could be files encrypted + with a UTF8 password, and other pdf viewers handle this + well, so let's do the same and try with UTF-8 if latin1 + fails. Note: we originally receive the password in UTF-8 + from GTK. + + Thanks @aacid for clue about how this was fixed in Okular side. + + Fixes issue #824 + + glib/poppler-document.cc | 47 + +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 47 insertions(+) + +commit 4d921bd83945b803f1ea3724d1d841e2138e2a05 +Author: Albert Astals Cid +Date: Thu Jan 13 17:34:05 2022 +0100 + + SignatureHandler: Access CERT_NameTemplate in a Windows/Android + compatible way + + poppler/SignatureHandler.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6a869a8115c0fc914f91317b2dcd7fdf0b839611 +Author: Albert Astals Cid +Date: Wed Jan 12 19:41:32 2022 +0100 + + Update (C) + + qt5/src/poppler-pdf-converter.cc | 1 + + qt5/src/poppler-qt5.h | 1 + + qt6/src/poppler-pdf-converter.cc | 1 + + qt6/src/poppler-qt6.h | 1 + + 4 files changed, 4 insertions(+) + +commit 327cd87e489fd2be39bdb5bad394ce33be247dde +Author: Martin +Date: Wed Jan 12 00:21:13 2022 +0000 + + [qt] Add PDFConverter::NewSignatureData::imagePath + + qt5/src/poppler-pdf-converter.cc | 14 +++++++++++++- + qt5/src/poppler-qt5.h | 11 +++++++++++ + qt6/src/poppler-pdf-converter.cc | 14 +++++++++++++- + qt6/src/poppler-qt6.h | 11 +++++++++++ + 4 files changed, 48 insertions(+), 2 deletions(-) + +commit e4bf68a684590ab17a7342030fd863dc15d3f507 +Author: Albert Astals Cid +Date: Tue Jan 11 00:31:05 2022 +0100 + + Add (C) + + poppler/Annot.cc | 1 + + poppler/Annot.h | 1 + + 2 files changed, 2 insertions(+) + +commit 95fe93b32e740c48c9c8eac3ec59a72dcf3f6f41 +Author: Martin +Date: Mon Jan 10 23:09:08 2022 +0000 + + AnnotAppearanceBuilder: Also use the image when there is left + signature text + + poppler/Annot.cc | 50 +++++++++++++++++++++++++------------------------- + poppler/Annot.h | 3 +-- + 2 files changed, 26 insertions(+), 27 deletions(-) + +commit 3e5737bfa1fc00dd6ee6895f19cab6d4c768421a +Author: Marek Kasik +Date: Fri Jan 7 14:48:33 2022 +0100 + + PDFDoc: Count only signature fields in getNumSignatureFields + + Previous version returned number of all fields instead of just + the ones + with signatures. + + poppler/PDFDoc.cc | 27 +++++++++++++++++++++++++-- + 1 file changed, 25 insertions(+), 2 deletions(-) + +commit bdcde37d2ca87b2b193d269b63cd9eff6b047286 +Author: Albert Astals Cid +Date: Wed Jan 5 23:58:01 2022 +0100 + + Update (C) of commit-1 + + qt5/src/poppler-pdf-converter.cc | 2 +- + qt5/src/poppler-qt5.h | 2 +- + qt6/src/poppler-pdf-converter.cc | 2 +- + qt6/src/poppler-qt6.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit dcf7b6c11b0a5e2c19c88b1e2525fd9532e1e2dd +Author: Albert Astals Cid +Date: Wed Jan 5 16:45:31 2022 +0100 + + Make DefaultAppearance::toAppearanceString return a std::string + + poppler/Annot.cc | 12 ++++++------ + poppler/Annot.h | 4 ++-- + poppler/PDFDoc.cc | 6 +++--- + qt5/tests/check_annotations.cpp | 2 +- + qt6/tests/check_annotations.cpp | 2 +- + 5 files changed, 13 insertions(+), 13 deletions(-) + +commit 902ef7b20b7b7b6d434e45b3f06d2ac8b3e8ba54 +Author: Albert Astals Cid +Date: Wed Dec 29 19:26:15 2021 +0100 + + qt: Allow passing the document password when signing + + We need it since in the middle of the signing process we need + to reopen + the document we just created to do some final modifications + + qt5/src/poppler-pdf-converter.cc | 27 ++++++++++++++++++++++++++- + qt5/src/poppler-qt5.h | 20 ++++++++++++++++++++ + qt6/src/poppler-pdf-converter.cc | 27 ++++++++++++++++++++++++++- + qt6/src/poppler-qt6.h | 20 ++++++++++++++++++++ + 4 files changed, 92 insertions(+), 2 deletions(-) + +commit 4d3c2cb33bb0b71697fee27fc0ed6da4ba81bb53 +Author: Oliver Sander +Date: Fri Dec 31 11:29:16 2021 +0100 + + Remove a bit of duplicate code + + poppler/GfxFont.cc | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +commit 953c9c762f346236d856327833f3a550b993138a +Author: Oliver Sander +Date: Thu Dec 30 10:46:46 2021 +0100 + + Let FoFiTrueType::make and ...::load return std::unique_ptr + + Because these methods do release the object ownership. + + fofi/FoFiTrueType.cc | 18 ++++++++---------- + fofi/FoFiTrueType.h | 5 +++-- + poppler/CairoFontEngine.cc | 15 +++++++-------- + poppler/PSOutputDev.cc | 30 +++++++++--------------------- + poppler/SplashOutputDev.cc | 9 ++++----- + qt5/src/QPainterOutputDev.cc | 6 +++--- + qt6/src/QPainterOutputDev.cc | 6 +++--- + splash/SplashFTFontEngine.cc | 3 +-- + 8 files changed, 38 insertions(+), 54 deletions(-) + +commit 9389df54ca8f9c182153aa13eb1109ea98fb307c +Author: Oliver Sander +Date: Wed Dec 29 13:25:13 2021 +0100 + + Allocate GfxFontLoc object on the stack + + Compared to the heap storage used previously, this saves one layer + of indirection and the heap memory management. + + The new code uses C++17's std::optional class to model the + 'no fontLoc' value previously encoded by 'nullptr'. + + poppler/CairoFontEngine.cc | 6 +-- + poppler/GfxFont.cc | 114 + ++++++++++++++++++++++--------------------- + poppler/GfxFont.h | 12 +++-- + poppler/PSOutputDev.cc | 10 ++-- + poppler/SplashOutputDev.cc | 11 ++--- + qt5/src/QPainterOutputDev.cc | 6 +-- + qt6/src/QPainterOutputDev.cc | 6 +-- + 7 files changed, 80 insertions(+), 85 deletions(-) + +commit 9451ca15dc63b908786e93f86f84862b11fc45dd +Author: Oliver Sander +Date: Fri Dec 31 11:32:20 2021 +0100 + + Store 'path' as std::string in GfxFontLoc + + ...instead of as GooString*. This avoids some heap allocations. + + To simplify interaction with the rest of the code, the GfxFontLoc + class gets two new methods 'setPath' and 'pathAsGooString'. + These methods are intended to be temporary. Avoiding them now + would mean having to change too much calling code. + + poppler/CairoFontEngine.cc | 5 ++--- + poppler/GfxFont.cc | 36 ++++++++++++++++++++---------------- + poppler/GfxFont.h | 13 +++++++++---- + poppler/PSOutputDev.cc | 8 ++++---- + poppler/SplashOutputDev.cc | 6 +++--- + qt5/src/QPainterOutputDev.cc | 12 ++++++------ + qt6/src/QPainterOutputDev.cc | 12 ++++++------ + 7 files changed, 50 insertions(+), 42 deletions(-) + +commit f5e53b3c81b7adf41457436dd924fc849b14ddd6 +Author: Oliver Sander +Date: Wed Dec 29 13:46:08 2021 +0100 + + Remove spurious double include + + poppler/CairoFontEngine.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 170a36e41921ed11699b230205d6e269f5f62806 +Author: Oliver Sander +Date: Fri Dec 31 11:21:43 2021 +0100 + + Make a few GooString* arguments const + + poppler/PSOutputDev.cc | 6 +++--- + poppler/PSOutputDev.h | 6 +++--- + splash/SplashFontFile.cc | 2 +- + splash/SplashFontFile.h | 2 +- + 4 files changed, 8 insertions(+), 8 deletions(-) + +commit 16a34e9dfffa9ad1e32459bd05455f25b02a772f +Author: Albert Astals Cid +Date: Wed Jan 5 13:53:28 2022 +0100 + + poppler 22.01.0 + + CMakeLists.txt | 6 +++--- + NEWS | 20 ++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 26 insertions(+), 6 deletions(-) + +commit 5f52816b85c82eb41fdd4f4bf4020f8a679e931d +Author: Albert Astals Cid +Date: Mon Jan 3 14:51:10 2022 +0100 + + Make FormFieldSignature::getCheckedSignature return an optional + + poppler/Form.cc | 12 ++++++------ + poppler/Form.h | 7 ++++--- + qt5/src/poppler-form.cc | 5 ++--- + qt6/src/poppler-form.cc | 5 ++--- + utils/pdfsig.cc | 6 ++---- + 5 files changed, 16 insertions(+), 19 deletions(-) + +commit 9f5e62f4c4fb69338b66f4a590cba6f2926c3a31 +Author: Albert Astals Cid +Date: Mon Jan 3 15:02:27 2022 +0100 + + pdfsig: Fix signing with -sign if nss password is needed + + utils/pdfsig.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit c2063dce78088987a57eb501f9d5a315db610e55 +Author: Albert Astals Cid +Date: Mon Jan 3 14:23:21 2022 +0100 + + Welcome 2022 + + poppler/poppler-config.h.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e1613d72c8440b79c0d8c5822bec99eca7fa29af +Author: Albert Astals Cid +Date: Wed Dec 29 17:40:11 2021 +0100 + + pdfsig: Fix signing documents with owner/user password + + poppler/Form.cc | 9 +++++---- + poppler/Form.h | 5 +++-- + poppler/PDFDoc.cc | 4 ++-- + poppler/PDFDoc.h | 2 +- + utils/pdfsig.cc | 2 +- + 5 files changed, 12 insertions(+), 10 deletions(-) + +commit 405b7ce25e8e557d98dd299f6ecd8f1b795bf50a +Author: Albert Astals Cid +Date: Wed Dec 29 11:27:35 2021 +0100 + + pdfsig: Add support for listing signatures of documents with passwords + + Adding signatures to documents with passwords still doesn't work + + utils/pdfsig.cc | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit eae2b1f08c87979385c9c0d0ad4b4f7a3f6e0802 +Author: Christian Persch +Date: Wed Dec 8 13:13:29 2021 +0100 + + glib: Remove FD-taking functions on windows + + They don't compile, and are not useful on windows anyway. Remove the + functions completely, not just stub out their implementation, since + otherwise the API contract of consuming the FD would be violated. + + https://gitlab.freedesktop.org/poppler/poppler/-/issues/1180 + + glib/poppler-attachment.cc | 4 ++++ + glib/poppler-attachment.h | 2 ++ + glib/poppler-document.cc | 19 ++++++++++++++----- + glib/poppler-document.h | 6 ++++++ + glib/poppler-media.cc | 4 ++++ + glib/poppler-media.h | 2 ++ + test/gtk-test.cc | 7 ++++++- + 7 files changed, 38 insertions(+), 6 deletions(-) + +commit 87b2436275c19b23dd3b50c5ed2cc83cc0a514f6 +Author: Albert Astals Cid +Date: Tue Dec 14 12:37:20 2021 +0100 + + LinkResetForm: Also understand strings in the Fields field + + poppler/Link.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 4aca8d65fd073667433e4426c5c08d7e9ea68d64 +Author: Nelson Benítez León +Date: Tue Dec 14 01:14:19 2021 +0000 + + poppler/Form.cc: fix crash when calling Form::reset() + + caused by calling compare() with a negative 'pos' + argument. + + Fixes issue https://gitlab.gnome.org/GNOME/evince/-/issues/1694 + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 21a074b69ec9911fac9ed42b30853dad0bee5cca +Author: Albert Astals Cid +Date: Sun Dec 12 12:42:14 2021 +0100 + + Update (C) + + poppler/ImageEmbeddingUtils.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3ea6bca90d87d3f91556205c4e58ca425c6ac437 +Author: Marco Genasci +Date: Sun Dec 12 10:23:37 2021 +0100 + + Include setjmp.h when WITH_JPEG=yes and WITH_PNG=no + + poppler/ImageEmbeddingUtils.cc | 1 + + 1 file changed, 1 insertion(+) + +commit e73a2b3a0a93f60c4e90933f930f506df20935bd +Author: Albert Astals Cid +Date: Fri Dec 10 10:42:22 2021 +0100 + + PSOutputDev::startPage: Fix potential integer overflow + + poppler/PSOutputDev.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit c99378fe823256383810941123c1e1478369340a +Author: Albert Astals Cid +Date: Wed Dec 8 01:07:14 2021 +0100 + + PDFDoc::getDocInfoStringEntry return a unique_ptr + + Makes clear that the ownership is transferred + + glib/poppler-document.cc | 68 + +++++++++++++++------------------------------ + poppler/PDFDoc.cc | 31 ++++++++------------- + poppler/PDFDoc.h | 21 +++++++------- + qt5/src/poppler-document.cc | 40 +++++++++++++------------- + qt6/src/poppler-document.cc | 40 +++++++++++++------------- + 5 files changed, 84 insertions(+), 116 deletions(-) + +commit fd5c40370d3b950ad8d44760e03c1da443c2d262 +Author: Albert Astals Cid +Date: Wed Dec 8 00:40:04 2021 +0100 + + Remove Object::takeString + + it's a micro optimization used in non-hot paths and is not even + correct + due to how GooStrings inside Objects are shared, so just kill it and + copy a few strings in those non-hot paths + + poppler/Object.h | 13 ------------- + poppler/PDFDoc.cc | 2 +- + poppler/StructElement.cc | 12 ++++++------ + 3 files changed, 7 insertions(+), 20 deletions(-) + +commit f20d9e5f739b7c8dce74ebc60a6dd1e06106c12e +Author: Nelson Benítez León +Date: Sun Jul 11 14:08:58 2021 -0400 + + TextOutputDev: require more spacing between columns + + Require more spacing for adjacent text to be + considered a separate column of text. + + We do that by increasing 'minColSpacing1' parameter, + which marks the distance, within which, an adjacent + word will be pulled to the current block. + + We provide a way to tweak the default value: + double getMinColSpacing1(); + void setMinColSpacing1(double val); + + Fixes issue #1093 + + poppler/TextOutputDev.cc | 14 +++++++++++--- + poppler/TextOutputDev.h | 6 ++++++ + utils/pdftotext.1 | 3 +++ + utils/pdftotext.cc | 9 +++++++++ + 4 files changed, 29 insertions(+), 3 deletions(-) + +commit ccfeabf5c7fe91469a4cdbfe1e533e4bd39963e6 +Author: Christian Persch +Date: Tue Dec 7 17:55:28 2021 +0100 + + glib: Plug some mem leaks + + This code leaked a GooString each time it was called. + + ==1018012== 56 (32 direct, 24 indirect) bytes in 1 blocks are + definitely lost in loss record 11,042 of 19,178 + ==1018012== at 0x4841FF5: operator new(unsigned long) + (vg_replace_malloc.c:422) + ==1018012== by 0x1EFE8DA5: copy (GooString.h:104) + ==1018012== by 0x1EFE8DA5: Object::copy() const (Object.cc:52) + ==1018012== by 0x1EFE8EE8: Object::fetch(XRef*, int) const + (Object.cc:78) + ==1018012== by 0x1EF6C0C7: Dict::lookup(char const*, int) const + (Dict.cc:167) + ==1018012== by 0x1EFF5592: dictLookup (Object.h:622) + ==1018012== by 0x1EFF5592: PDFDoc::getDocInfoStringEntry(char + const*) (PDFDoc.cc:779) + ==1018012== by 0x1EA00E71: getDocInfoCreatDate (PDFDoc.h:277) + ==1018012== by 0x1EA00E71: poppler_document_get_creation_date_time + (poppler-document.cc:1596) + + glib/poppler-document.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 202c2abec530919d19048406cb1605c75c643019 +Author: Albert Astals Cid +Date: Tue Dec 7 17:46:35 2021 +0100 + + Update (C) + + poppler/SignatureHandler.h | 1 + + 1 file changed, 1 insertion(+) + +commit ef18170e6ec6e117df4d24497b16dd8cc8b42ca3 +Author: Marek Kasik +Date: Tue Dec 7 11:46:13 2021 +0000 + + SignatureHandler: Return std::string in getSignerName() + + poppler/Form.cc | 6 +----- + poppler/SignatureHandler.cc | 10 +++++----- + poppler/SignatureHandler.h | 2 +- + 3 files changed, 7 insertions(+), 11 deletions(-) + +commit 172c1bbe6d15c0096f869fea35b6a83b8622fb32 +Author: Christian Persch +Date: Fri Dec 3 13:22:40 2021 +0100 + + glib: Replace use of deprecated g_time_zone_new() + + Use g_time_zone_new_identifier() instead. + + glib/poppler-document.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 8351fa3fd29dc69566afe4704c503433be21f26c +Author: Christian Persch +Date: Fri Dec 3 13:22:40 2021 +0100 + + glib: Replace use of deprecated g_memdup + + g_memdup() is deprecated. Replace it with straight malloc + + memcpy. This + fixes two compile warnings with newer glib (>= 2.68). + + glib/poppler-document.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit bb3f7206b3f1cde757384474414a91cdfd3bcb63 +Author: Christian Persch +Date: Fri Dec 3 13:03:30 2021 +0100 + + glib: Close file descriptors on error + + When fdopen fails, the file descriptor must be closed manually so it + doesn't leak. + + glib/poppler-attachment.cc | 1 + + glib/poppler-media.cc | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 274626018dc7693cb98f8e2538c44b19bc9b7c11 +Author: Albert Astals Cid +Date: Thu Dec 2 20:08:58 2021 +0100 + + Fix crash in Splash::gouraudTriangleShadedFill + + When bDirectBlit is true and the three triangle vertices don't have + the same color we don't have to delete blitTarget + + Fixes issue #1183 + + splash/Splash.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit d8032e79f45bb37e00c2d61cff8c21d6f1052d78 +Author: Albert Astals Cid +Date: Thu Dec 2 20:16:34 2021 +0100 + + GfxSeparationColorSpace: Check validity of colorspace and function + + Fixes issue #1184 + + poppler/GfxState.cc | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit 310a336a73827e387adf65a372463db93128d210 +Author: Christian Persch +Date: Fri Dec 3 01:03:34 2021 +0100 + + glib: Include glib.h before using defines from it + + Include glib.h which provides G_OS_WIN32. + + https://gitlab.freedesktop.org/poppler/poppler/-/issues/1180 + + glib/poppler-document.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit e0da51ccb7f5bdfd5a1da63d4294738a881acd26 +Author: Albert Astals Cid +Date: Wed Dec 1 23:50:15 2021 +0100 + + Update (C) of last patch + + poppler/GlobalParams.cc | 2 ++ + poppler/GlobalParamsWin.cc | 2 ++ + 2 files changed, 4 insertions(+) + +commit e9f634e789e52f4027f54165af0dea856e0dadac +Author: sunderme +Date: Wed Dec 1 18:31:22 2021 +0000 + + allow local (relative to dll) fonts dir on windows + + poppler/GlobalParams.cc | 50 + +++++++++++++++++++++++++++++++++++----------- + poppler/GlobalParamsWin.cc | 4 ++-- + 2 files changed, 40 insertions(+), 14 deletions(-) + +commit e2ec957c0174a36396c3e8c194f44a1f300a950f +Author: Albert Astals Cid +Date: Fri Nov 19 01:31:06 2021 +0100 + + Use std::filesystem::remove instead of unlink + + MSVC is all annoying about unlink() being the wrong name, so use + C++17! + + splash/SplashFontFile.cc | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit 4b6d5121830cee30278fe3c7c84685e3805eb14b +Author: Albert Astals Cid +Date: Wed Dec 1 15:48:56 2021 +0100 + + poppler 21.12.0 + + CMakeLists.txt | 4 ++-- + NEWS | 17 +++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 6 files changed, 23 insertions(+), 6 deletions(-) + +commit a527e6bff642a0276467d8e0245b0ddaf60635bc +Author: Albert Astals Cid +Date: Wed Dec 1 11:35:00 2021 +0100 + + Add note of when we can remove the __GNUC__ checks + + goo/GooCheckedOps.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit f4364adf48b0217297021beed3eaf59a64ec5f45 +Author: Albert Astals Cid +Date: Wed Dec 1 11:23:50 2021 +0100 + + Make checkedMultiply work for long long in MSVC + + goo/GooCheckedOps.h | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 27466086ec5c4ca1a15684d034b6a27e76fe8ba6 +Author: Albert Astals Cid +Date: Tue Nov 30 00:24:28 2021 +0100 + + PngEmbedder::embedImage: Make sure we don't overflow doing the + multiplications + + poppler/ImageEmbeddingUtils.cc | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +commit d1be2ba7a8e324d09646bbb0355574feaa6d98ca +Author: Albert Astals Cid +Date: Tue Nov 30 00:07:25 2021 +0100 + + Fix memory leak when embedders are not available + + poppler/ImageEmbeddingUtils.cc | 52 + ++++++++++++++++-------------------------- + 1 file changed, 20 insertions(+), 32 deletions(-) + +commit 9fa129877a47a807f48d15dd6b5cee28734514d7 +Author: Albert Astals Cid +Date: Tue Nov 30 00:11:26 2021 +0100 + + ImageEmbeddingUtils::embed: Return early if filesize < 0 + + filesize uses lseek which returns -1 on errror, so be sure to return + early if that happens + + poppler/ImageEmbeddingUtils.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit ff8aab1b2a16246f7c61ce5599eda0ba03298031 +Author: Christian Persch +Date: Tue Nov 30 00:17:43 2021 +0100 + + glib: Close the file descriptor on fdopen error + + ... and *not* the (nullptr) file. + + https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/995 + + glib/poppler-document.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 30eb3508c0b698901234db2e4752d369741393b4 +Author: Georgiy Sgibnev +Date: Mon Nov 29 16:17:44 2021 +0300 + + New unit-tests for the image embedding API (for the error handling) + + test/CMakeLists.txt | 123 + +++++++++++++++++++++++++++--------------------- + test/image-embedding.cc | 12 +++-- + 2 files changed, 78 insertions(+), 57 deletions(-) + +commit 766018f43cdf611351bbdf5d929354c723b5ba72 +Author: Albert Astals Cid +Date: Thu Nov 25 23:42:40 2021 +0100 + + Properly initialize filterRemovalForbidden + + poppler/Stream.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3cc01af0655b5cf9afc967e57abd9000b2dc4e3c +Author: Albert Astals Cid +Date: Fri Nov 26 00:14:52 2021 +0100 + + Update (C) + + poppler/PDFDoc.cc | 1 + + poppler/PDFDoc.h | 1 + + 2 files changed, 2 insertions(+) + +commit 7b7b3f8018d652a0e8f38a69e28d535d98843df8 +Author: Marek Kasik +Date: Thu Nov 25 22:31:01 2021 +0000 + + Add validation of signatures API to glib frontend + + glib/demo/forms.c | 19 ++- + glib/poppler-document.cc | 22 +++ + glib/poppler-document.h | 7 +- + glib/poppler-form-field.cc | 303 + ++++++++++++++++++++++++++++++++++++ + glib/poppler-form-field.h | 92 +++++++++++ + glib/poppler-private.h | 1 + + glib/poppler.h | 2 + + glib/reference/poppler-sections.txt | 22 +++ + glib/reference/poppler.types | 4 + + poppler/Form.cc | 8 +- + poppler/PDFDoc.cc | 10 ++ + poppler/PDFDoc.h | 1 + + poppler/SignatureHandler.cc | 9 +- + poppler/SignatureInfo.cc | 6 +- + poppler/SignatureInfo.h | 4 +- + 15 files changed, 502 insertions(+), 8 deletions(-) + +commit 1ad64ccfa2315087ea5508d1550f816bc65fd982 +Author: Marek Kasik +Date: Thu Nov 25 13:52:10 2021 +0100 + + glib: Fix a warning about missing element-type annotation + + There was a missing colon right after argument name. + + glib/poppler-document.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bcabe82f358548e0a705743ff338212a5b05e13a +Author: Albert Astals Cid +Date: Wed Nov 24 23:34:17 2021 +0100 + + Update (C) + + poppler/FlateEncoder.cc | 1 + + poppler/Form.cc | 1 + + qt5/src/poppler-qiodeviceoutstream-private.h | 1 + + qt5/src/poppler-qiodeviceoutstream.cc | 1 + + qt6/src/poppler-qiodeviceoutstream-private.h | 1 + + qt6/src/poppler-qiodeviceoutstream.cc | 1 + + 6 files changed, 6 insertions(+) + +commit 70980eaf611c21a5f12a7edbe332e223f3b874f1 +Author: Even Rouault +Date: Wed Nov 24 16:53:29 2021 +0100 + + poppler-qiodeviceoutstream: add printf format attribute for GCC + + Solves + ``` + /home/even/poppler/qt5/src/poppler-qiodeviceoutstream.cc: In + function ‘int Poppler::poppler_vasprintf(char**, const char*, + __va_list_tag*)’: + /home/even/poppler/qt5/src/poppler-qiodeviceoutstream.cc:49:62: + warning: function ‘int Poppler::poppler_vasprintf(char**, const + char*, __va_list_tag*)’ might be a candidate for ‘gnu_printf’ + format attribute [-Wsuggest-attribute=format] + 49 | const size_t size = vsnprintf(nullptr, 0, format, ap_copy) + + 1; + | ^ + ``` + + qt5/src/poppler-qiodeviceoutstream-private.h | 2 +- + qt5/src/poppler-qiodeviceoutstream.cc | 2 ++ + qt6/src/poppler-qiodeviceoutstream-private.h | 2 +- + qt6/src/poppler-qiodeviceoutstream.cc | 2 ++ + 4 files changed, 6 insertions(+), 2 deletions(-) + +commit 4b6a530539bb29ac057d2ac6d8f74d2ca78a3f2a +Author: Even Rouault +Date: Wed Nov 24 15:46:09 2021 +0100 + + Form.cc: fix -Wstringop-truncation warning + + gcc 9.3.0 (Ubuntu 20.04) with CMAKE_BUILD_TYPE=Debug emits + ``` + /usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:34: warning: + ‘char* __builtin_strncpy(char*, const char*, long unsigned int)’ + output may be truncated copying 10 bytes from a string of length 49 + [-Wstringop-truncation] + 106 | return __builtin___strncpy_chk (__dest, __src, __len, + __bos (__dest)); + | + ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ``` + + In that situation this is a false positive. But using memcpy() makes + things clearer as the copied string cannot be shorter than 10 + bytes due + to how it is composed before (an integer value followed by more + than 10 + spaces). + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c702589307896c7d6f5f4cfdf63535761ad1ad23 +Author: Even Rouault +Date: Wed Nov 24 16:14:24 2021 +0100 + + FlateEncoder.cc: fix -Wzero-as-null-pointer-constant warnings + + Use nullptr instead of Z_NULL. zlib.h defines Z_NULL as 0, so using + nullptr is safe now, and for the future, as zlib.h can't really + change its definition to something that would be fundammentaly + different + from expressing a null pointer. + + poppler/FlateEncoder.cc | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit e0c5c126dd25025bf3cfb39b92b0c71478ab307c +Author: Albert Astals Cid +Date: Mon Nov 22 17:10:02 2021 +0100 + + Rename registerResourceForWidget to make it more generic + + poppler/Annot.cc | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +commit ca9716dd9c475649a5ea4e412c3b15a6e95bdfc5 +Author: Albert Astals Cid +Date: Mon Nov 22 17:08:34 2021 +0100 + + registerResourceForWidget use set instead of add + + In case resourcesDict has a resourceType of non Dict type we want to + overwrite it + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 14aca8b62d197db6bcbc92faf7f398ac9a598011 +Author: Albert Astals Cid +Date: Mon Nov 22 17:04:55 2021 +0100 + + XRef::addIndirectObject: Change param from const * to const & + + Makes it harder to do mistakes when using it + + poppler/Annot.cc | 8 ++++---- + poppler/AnnotStampImageHelper.cc | 3 ++- + poppler/Catalog.cc | 9 ++++----- + poppler/FileSpec.cc | 5 ++--- + poppler/Form.cc | 2 +- + poppler/Outline.cc | 4 ++-- + poppler/PDFDoc.cc | 2 +- + poppler/Page.cc | 6 +++--- + poppler/XRef.cc | 9 ++++----- + poppler/XRef.h | 2 +- + 10 files changed, 24 insertions(+), 26 deletions(-) + +commit d46f01d8dbcda3e92c164e9b10788977e72ed403 +Author: Albert Astals Cid +Date: Mon Nov 22 17:04:11 2021 +0100 + + Update (C) + + poppler/Annot.h | 1 + + poppler/Stream.cc | 1 + + poppler/Stream.h | 1 + + 3 files changed, 3 insertions(+) + +commit d1070d73747d3c8771175c43e214f84537b65037 +Author: Georgiy Sgibnev +Date: Fri Jul 23 13:45:44 2021 +0300 + + Image embedding API + + CMakeLists.txt | 1 + + poppler/Annot.cc | 29 ++- + poppler/Annot.h | 3 +- + poppler/Form.cc | 10 + + poppler/Form.h | 5 + + poppler/ImageEmbeddingUtils.cc | 407 + +++++++++++++++++++++++++++++++++++++++++ + poppler/ImageEmbeddingUtils.h | 36 ++++ + poppler/PDFDoc.cc | 20 +- + poppler/PDFDoc.h | 5 +- + poppler/Stream.cc | 10 + + poppler/Stream.h | 8 + + poppler/XRef.cc | 15 ++ + poppler/XRef.h | 7 + + test/CMakeLists.txt | 67 +++++++ + test/image-embedding.cc | 106 +++++++++++ + 15 files changed, 723 insertions(+), 6 deletions(-) + +commit d6a34e2ca8b74cfdf9a1d58edb072e0aee26b233 +Author: Albert Astals Cid +Date: Thu Nov 18 23:27:24 2021 +0100 + + AnnotWidget::generateFieldAppearance: Do not modify the Form DR dict + + poppler/Annot.cc | 2 +- + poppler/Array.cc | 11 +++++++++++ + poppler/Array.h | 2 ++ + poppler/Dict.cc | 12 ++++++++++++ + poppler/Dict.h | 2 ++ + poppler/Object.cc | 32 ++++++++++++++++++++++++++++++++ + poppler/Object.h | 7 ++++++- + 7 files changed, 66 insertions(+), 2 deletions(-) + +commit 97fe0bc48a72265b689560bbd4a5d3c2e8b120a6 +Author: Albert Astals Cid +Date: Fri Nov 19 09:42:27 2021 +0100 + + Fix compile on MSVC #2 + + glib/poppler-document.cc | 4 ++-- + poppler/PSOutputDev.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 5eecc8aaa146a838cbc95a6f19bbeac82fa6164f +Author: Albert Astals Cid +Date: Fri Nov 19 01:05:13 2021 +0100 + + Fix compile on MSVC + + poppler/FDPDFDocBuilder.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1c3c1b2e85acf7a9d84bd53d696623146c549ace +Author: Albert Astals Cid +Date: Fri Nov 19 00:19:25 2021 +0100 + + Update (C) + + goo/gfile.cc | 2 +- + goo/gfile.h | 2 +- + poppler/FDPDFDocBuilder.cc | 1 + + poppler/FDPDFDocBuilder.h | 1 + + poppler/FILECacheLoader.cc | 1 + + poppler/FILECacheLoader.h | 1 + + poppler/PDFDocFactory.cc | 1 + + poppler/PSOutputDev.cc | 2 +- + poppler/PSOutputDev.h | 1 + + poppler/Stream.h | 1 + + 10 files changed, 10 insertions(+), 3 deletions(-) + +commit 5914c1d6e8a8dddbb176f37552a4efb27445b909 +Author: Christian Persch +Date: Sat Nov 13 11:03:48 2021 +0100 + + glib: Add APIs to save to file descriptor + + glib/poppler-attachment.cc | 46 +++++++++++++++++++- + glib/poppler-attachment.h | 2 + + glib/poppler-document.cc | 86 + ++++++++++++++++++++++++++++++++++++- + glib/poppler-document.h | 4 ++ + glib/poppler-media.cc | 47 +++++++++++++++++++- + glib/poppler-media.h | 2 + + glib/poppler-page.cc | 9 +++- + glib/poppler-private.h | 1 + + glib/reference/poppler-sections.txt | 4 ++ + poppler/PSOutputDev.cc | 43 +++++++++++++++++++ + poppler/PSOutputDev.h | 4 ++ + 11 files changed, 243 insertions(+), 5 deletions(-) + +commit c3f1ece62ac52587308e44d3e170d864372875f2 +Author: Christian Persch +Date: Sat Nov 13 11:03:48 2021 +0100 + + glib: Add poppler_document_new_from_fd + + While it's already possible to create a PopplerDocument + for STDIN by using fd://0 as the URI, it was not yet possible + to create a PopplerDocument from a file descriptor. + + This adds poppler_document_new_from_fd(), which accepts + a readable FD for a regular file, or for STDIN. + + Add a --fd option to test/gtk-test to test this. When used, + gtk-test arguments are FD numbers instead of filenames or URIs. + To test, use e.g. + + $ 3 +Date: Sat Nov 13 11:03:48 2021 +0100 + + glib: docs: Add index for new API + + glib/reference/poppler-docs.sgml | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 7db45fac4947e99c9f1985dfa3c82bd612d64cb0 +Author: Christian Persch +Date: Sat Nov 13 11:03:48 2021 +0100 + + glib: docs: Add missing API indices for new symbols + + glib/reference/poppler-docs.sgml | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit ff1b0aa530a1eb5b64119f3129434981bfc12e8e +Author: Christian Persch +Date: Sat Nov 13 11:03:48 2021 +0100 + + build: Rename StdinPDFDocBuilder to FileDescriptorPDFDocBuilder + + ... since it's not for just stdin anymore. + + CMakeLists.txt | 4 ++-- + poppler/{StdinPDFDocBuilder.cc => FDPDFDocBuilder.cc} | 12 ++++++------ + poppler/{StdinPDFDocBuilder.h => FDPDFDocBuilder.h} | 14 +++++++------- + poppler/PDFDocFactory.cc | 4 ++-- + 4 files changed, 17 insertions(+), 17 deletions(-) + +commit 661debdf700d7a13a8373f681e3729fcbb6aa573 +Author: Christian Persch +Date: Sat Nov 13 11:03:48 2021 +0100 + + build: Rename StdinCacheLoader to FILECacheLoader + + ... since it's not for just stdin anymore. + + CMakeLists.txt | 4 ++-- + poppler/{StdinCachedFile.cc => FILECacheLoader.cc} | 12 +++++------- + poppler/{StdinCachedFile.h => FILECacheLoader.h} | 14 +++++++------- + poppler/StdinPDFDocBuilder.cc | 4 ++-- + 4 files changed, 16 insertions(+), 18 deletions(-) + +commit 19a8e85d7d903fbc826416252b4fbce1644c65f8 +Author: Christian Persch +Date: Sat Nov 13 11:03:48 2021 +0100 + + poppler: Make StdinCacheLoader more generic + + Despite its name, StdinCacheLoader really works with any FILE*, + not just + stdin. Add a constructor taking a FILE* to set the file it + operates on. + + This will be used in glib/ in a subsequent commit. + + poppler/StdinCachedFile.cc | 13 ++++++++++--- + poppler/StdinCachedFile.h | 8 ++++++++ + poppler/StdinPDFDocBuilder.cc | 32 ++++++++++++++++++++++++++------ + poppler/StdinPDFDocBuilder.h | 5 ++++- + 4 files changed, 48 insertions(+), 10 deletions(-) + +commit dc50059c757ae5c58b45755dc4f035e620679252 +Author: Christian Persch +Date: Sat Nov 13 11:03:48 2021 +0100 + + poppler: Export StdinCacheLoader and FileStream + + They will be used in glib/ in a subsequent commit. + + poppler/StdinCachedFile.h | 2 +- + poppler/Stream.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b01d37e14138de096212ae283840b580718966e7 +Author: Christian Persch +Date: Sat Nov 13 11:03:48 2021 +0100 + + gfile: Add GooFile constructor taking a file descriptor + + goo/gfile.cc | 7 ++++++- + goo/gfile.h | 3 +++ + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 153df8e9b5262795db43d47642a7df77d8fbedcb +Author: Albert Astals Cid +Date: Sun Nov 7 23:20:56 2021 +0100 + + Make GooFile::open take a std::string instead of a GooString + + goo/gfile.cc | 10 +++++----- + goo/gfile.h | 3 ++- + poppler/GlobalParamsWin.cc | 2 +- + poppler/PDFDoc.cc | 4 ++-- + utils/pdfattach.cc | 6 +++--- + 5 files changed, 13 insertions(+), 12 deletions(-) + +commit 89beb709b39f6b9645f27e7390b2464c5864c43b +Author: Albert Astals Cid +Date: Sun Nov 7 00:43:04 2021 +0100 + + Update (C) + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e8d7d11838dc16cdc6141c026def43710c8b326 +Author: Adrian Johnson +Date: Mon Oct 4 07:42:38 2021 +1030 + + Fix de-duping of Flate images + + poppler/CairoOutputDev.cc | 34 ++++++++++++++++++---------------- + 1 file changed, 18 insertions(+), 16 deletions(-) + +commit 6d72d8242cafe92d5c0c6a04b51f7e85108c450a +Author: Albert Astals Cid +Date: Fri Nov 5 10:50:11 2021 +0100 + + Fix crash on broken files when using non-default + ENABLE_ZLIB_UNCOMPRESS + + Fixes issue #393 + + poppler/FlateStream.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 33c9b192ac32e7e95a825aa3ff4e18561f0dc80b +Author: Albert Astals Cid +Date: Mon Nov 1 11:31:49 2021 +0100 + + Update (C) + + chpe's ones are from the cairo_t commit last month + + poppler/CairoOutputDev.cc | 1 + + poppler/CairoOutputDev.h | 1 + + utils/HtmlOutputDev.cc | 1 + + utils/pdftocairo.cc | 1 + + 4 files changed, 4 insertions(+) + +commit 6b6eb10938115394f81ab737fee65749a42a2d10 +Author: Albert Astals Cid +Date: Sat Oct 30 02:02:39 2021 +0200 + + TextOutputDev improvements + + Vectors don't need to be a pointer + and they can contain unique_ptr too + + Make pools be an array of unique_ptr too + + Makes for easier memory management + + poppler/TextOutputDev.cc | 87 + ++++++++++++------------------------------------ + poppler/TextOutputDev.h | 10 +++--- + 2 files changed, 27 insertions(+), 70 deletions(-) + +commit 28a523d6485d3be3c2a606cc942c34536cd26b50 +Author: Christopher Hasse +Date: Mon Sep 13 01:21:20 2021 -0500 + + Update pdftohtml duplicate detection + + The delta values used now are the same as the ones used in + pdftotext, which have proven to be much more reliable. + Additionally the search range on the xaxis for duplicate strings has + been increased, which seems to vastly improve the ability to find + duplicates. This algorithm can now properly detect duplicates as shown + in #321. + + utils/HtmlOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 94448a433c8690cb782ca9783d22e411e8d80e8d +Author: Christopher Hasse +Date: Sun Sep 12 03:53:08 2021 -0500 + + pdftohtml: Reduce sensitivity of duplicate detection + + fixes #1117 + + In some fonts, strings such as "ll" or "ff" are placed close enough + together to trigger duplicate detection in pdftohtml. This commit + makes + the detection algorithm less sensitive to reduce the false positives + while still maintaining the original function of the code. + + Prior to this commit, if a character's `xMax` is less than 20% of its + height away from the following character's `xMax`, it is treated as a + duplicate and removed. This commit changes that value to 17.5%, which + will reduce the number of false positives without introducing too many + false negatives. + + utils/HtmlOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3f8b9e92aade630b90943fd3936bdaa089e0603d +Author: Albert Astals Cid +Date: Sun Sep 26 19:22:12 2021 +0200 + + Increase C++ standard to 17 + + And make it required + + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 76f4d2e764f0fdb089678d1db3967391eb2f4077 +Author: Albert Astals Cid +Date: Mon Nov 1 10:16:38 2021 +0100 + + Poppler 21.11.0 + + CMakeLists.txt | 4 ++-- + NEWS | 21 +++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 26 insertions(+), 5 deletions(-) + +commit 352170ad66fe14c1d1dc9435be7f5770710db9c3 +Author: Albert Astals Cid +Date: Mon Nov 1 00:40:56 2021 +0100 + + Remove check for field being null + + We're already using it unconditionally a few lines above + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b15bf352a39208876b2e6f28c809290ccdf08eb8 +Author: Albert Astals Cid +Date: Mon Nov 1 00:35:21 2021 +0100 + + StructElement::parseChild: Fix memory leak + + poppler/StructElement.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9af5896fcf8d3c426cd958c662765411f05c1498 +Author: Albert Astals Cid +Date: Sat Oct 30 01:31:33 2021 +0200 + + Add const to NameTree::getName + + poppler/Catalog.cc | 4 ++-- + poppler/Catalog.h | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 03f80c64305157fbebff73cd57f582086e2cafdf +Author: Albert Astals Cid +Date: Sat Oct 30 01:16:10 2021 +0200 + + Make makeWordList return a unique_ptr + + poppler/TextOutputDev.cc | 6 +++--- + poppler/TextOutputDev.h | 4 ++-- + qt5/src/poppler-page.cc | 7 ++----- + qt6/src/poppler-page.cc | 7 ++----- + utils/pdftotext.cc | 5 ++--- + 5 files changed, 11 insertions(+), 18 deletions(-) + +commit c66a781cac176a525a7d6e2042f50f89892a2f2a +Author: Albert Astals Cid +Date: Sat Oct 30 01:08:42 2021 +0200 + + Make getLinks return a unique_ptr + + Fixes a leak in pdfinfo + + poppler/PDFDoc.cc | 4 ++-- + poppler/PDFDoc.h | 2 +- + poppler/Page.cc | 14 +++++--------- + poppler/Page.h | 4 ++-- + utils/HtmlOutputDev.cc | 3 +-- + utils/pdfinfo.cc | 2 +- + 6 files changed, 12 insertions(+), 17 deletions(-) + +commit b0571a9e87f05785a9643b38768c711f0064b763 +Author: Albert Astals Cid +Date: Sat Oct 30 00:58:27 2021 +0200 + + Remove two mutables that aren't really needed + + glib/poppler-structure-element.cc | 44 + +++++++++++++++++++-------------------- + poppler/StructElement.h | 6 +++--- + 2 files changed, 25 insertions(+), 25 deletions(-) + +commit 4b2d2d0232098f57ae7e4504a4fd9397bf74f768 +Author: Albert Astals Cid +Date: Sat Oct 30 00:53:34 2021 +0200 + + Make function return std::unique if caller owns the pointer + + poppler/StructElement.h | 2 +- + utils/pdfinfo.cc | 3 +-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit fa14391c97b8a35844a943102c0c579964301aff +Author: Albert Astals Cid +Date: Fri Oct 29 16:46:11 2021 +0200 + + Move another GlobalParam to the OutputDevs where it belongs + + poppler/GlobalParams.cc | 7 ------- + poppler/GlobalParams.h | 3 --- + poppler/PSOutputDev.cc | 6 +++--- + poppler/PSOutputDev.h | 2 ++ + poppler/SplashOutputDev.h | 3 +-- + utils/pdftoppm.cc | 11 ++++++++--- + utils/pdftops.cc | 6 +++--- + 7 files changed, 17 insertions(+), 21 deletions(-) + +commit 3a82fc29f025fcb1ab4b41d519efb916ba297c6f +Author: Albert Astals Cid +Date: Fri Oct 29 16:30:09 2021 +0200 + + Move two variables from GlobalParams to PSOutputDev + + Only place they are ever used + + poppler/GlobalParams.cc | 26 -------------------------- + poppler/GlobalParams.h | 6 ------ + poppler/PSOutputDev.cc | 2 +- + poppler/PSOutputDev.h | 4 ++++ + utils/pdftops.cc | 14 +++++++------- + 5 files changed, 12 insertions(+), 40 deletions(-) + +commit c297b22e096cd853973d8d670be383d9e38b96a8 +Author: Albert Astals Cid +Date: Fri Oct 29 16:13:13 2021 +0200 + + Change GlobalParams::getEncodingNames to something saner + + poppler/GlobalParams.cc | 8 ++++---- + poppler/GlobalParams.h | 2 +- + utils/printencodings.cc | 12 +++++------- + 3 files changed, 10 insertions(+), 12 deletions(-) + +commit 5b18fb371d41a6f551f04caf418d1140062c4870 +Author: Albert Astals Cid +Date: Fri Oct 29 15:48:42 2021 +0200 + + determineFallbackFont: Change parameter from GooString * to + std::string + + poppler/Annot.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit f897e21bc6e6823ed2912d8a496469eed41ca1da +Author: Albert Astals Cid +Date: Fri Oct 29 15:39:39 2021 +0200 + + Change some std::vector * to std::vector + + If we always new and always delete them, no need to have a pointer + + poppler/GlobalParams.cc | 28 +++++++++++----------------- + poppler/GlobalParams.h | 2 +- + poppler/GlobalParamsWin.cc | 4 ++-- + utils/HtmlLinks.cc | 23 ++++++++--------------- + utils/HtmlLinks.h | 12 ++++++------ + utils/HtmlOutputDev.cc | 34 +++++++++++++++------------------- + utils/HtmlOutputDev.h | 10 +++++----- + 7 files changed, 48 insertions(+), 65 deletions(-) + +commit 406c83c465ddae11d98dcd2f9033b0cd0b262255 +Author: Albert Astals Cid +Date: Fri Oct 29 15:09:27 2021 +0200 + + FormFieldText::tokenizeDA: Return a vector of strings instead of a + vector of pointers + + Makes it for simpler memory management + + poppler/Annot.cc | 25 +++++++++++-------------- + poppler/Form.cc | 33 +++++++++++---------------------- + poppler/Form.h | 4 ++-- + 3 files changed, 24 insertions(+), 38 deletions(-) + +commit aba39d21302dcf53af6961cf6739c510532c683c +Author: Albert Astals Cid +Date: Fri Oct 29 14:52:03 2021 +0200 + + No need to new a vector that we always end deleting later + + poppler/Annot.cc | 142 + ++++++++++++++++++++++--------------------------------- + poppler/Form.cc | 9 ++-- + 2 files changed, 60 insertions(+), 91 deletions(-) + +commit 94d9d102f77312d808b7b65112d0a530a7ca4a12 +Author: Albert Astals Cid +Date: Fri Oct 29 14:34:13 2021 +0200 + + Port a few functions from GooString to std::string + + goo/GooString.h | 3 ++- + poppler/Annot.cc | 2 +- + poppler/DateInfo.cc | 4 ++-- + poppler/Form.cc | 18 +++++++++--------- + poppler/Form.h | 2 +- + poppler/JSInfo.cc | 4 ++-- + poppler/Outline.cc | 4 ++-- + poppler/TextOutputDev.cc | 2 +- + poppler/UTF.cc | 22 +++++++++++----------- + poppler/UTF.h | 6 +++--- + qt5/tests/check_utf_conversion.cpp | 16 ++++++++-------- + qt6/tests/check_utf_conversion.cpp | 16 ++++++++-------- + utils/pdfinfo.cc | 2 +- + utils/pdfsig.cc | 4 ++-- + 14 files changed, 53 insertions(+), 52 deletions(-) + +commit ce644167f258e5a2f53e26976514a14866c77365 +Author: Albert Astals Cid +Date: Tue Oct 26 23:40:41 2021 +0200 + + CI: Enable -Werror in the clang 13 builder too + + We have it on the clazy builder too, but unfortunately clazy is still + built against clang 11 in debian:unstable so we get less coverage + there + + .gitlab-ci.yml | 2 +- + glib/poppler-cached-file-loader.cc | 4 +--- + poppler/CairoOutputDev.cc | 3 --- + 3 files changed, 2 insertions(+), 7 deletions(-) + +commit 967a1a1ab038baf03c6f4b5faffc106dec559ce6 +Author: Albert Astals Cid +Date: Tue Oct 26 23:02:28 2021 +0200 + + CI: Use clang 13 + + bugprone-implicit-widening-of-multiplication-result may be nice to + enable one day, together with gcc's -Wconversion ^_^ + + .gitlab-ci.yml | 18 +++++++++--------- + README.contributors | 2 +- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit b8fd5b275b7f0ed1f9460db16e7c5a569ded3d35 +Author: Albert Astals Cid +Date: Tue Oct 26 22:56:56 2021 +0200 + + CI: Also compile the qt6 frontend code in mingw + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 09e2384245ea44c98254fd629c1a7b68a0b2a5aa +Author: Albert Astals Cid +Date: Tue Oct 26 22:34:52 2021 +0200 + + CI: Use fedora 35 for the mingw builder + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f18e9f9f1eb562e4bbc23c413c522996696e90df +Author: Albert Astals Cid +Date: Tue Oct 26 22:28:26 2021 +0200 + + Fix crash in malformed files + + poppler/JBIG2Stream.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit fa27a6349e2795503e46720cce6c4b19996990d7 +Author: Albert Astals Cid +Date: Sun Oct 24 23:26:36 2021 +0200 + + refine PageLabelInfo::labelToIndex + intervals without style + + poppler/PageLabelInfo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7341d579cdd58ef28f67af76dc8f9a2c4592bef2 +Author: Albert Astals Cid +Date: Sun Oct 24 23:13:27 2021 +0200 + + PageLabelInfo::labelToIndex: work on some special no style intervals + + If the interval is length 1 we can assume the index is the base of the + interval + + Fixes bug #1161 + + poppler/PageLabelInfo.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit a973ccdf0ea93022401c6c5cedcdfcaa5cd26866 +Author: Albert Astals Cid +Date: Fri Oct 22 22:53:37 2021 +0200 + + Remove remmnats of external ps cid bit-16 fonts + + poppler/GfxFont.cc | 4 ---- + poppler/GfxFont.h | 4 ---- + poppler/PSOutputDev.cc | 18 ------------------ + qt5/src/QPainterOutputDev.cc | 4 ++-- + qt6/src/QPainterOutputDev.cc | 4 ++-- + 5 files changed, 4 insertions(+), 30 deletions(-) + +commit dd373dcee45653390042107ed45a616b6234ea77 +Author: Albert Astals Cid +Date: Fri Oct 22 22:25:24 2021 +0200 + + Some const changes in GfxFont & friends + + poppler/GfxFont.cc | 6 ++---- + poppler/GfxFont.h | 10 +++++----- + 2 files changed, 7 insertions(+), 9 deletions(-) + +commit 81bcacd21f864d37f94d719b70b7faeb433652b8 +Author: Albert Astals Cid +Date: Fri Oct 22 17:41:48 2021 +0200 + + Ignore Adobe-Identity for non embedded CID fonts + + As far as I understand it is a "this should not work scenario", + but seems other renderers accept it, so do the same + + poppler/GfxFont.cc | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 4edef6b3de6e262852fda6423fbbe23a16f09389 +Author: Albert Astals Cid +Date: Fri Oct 22 17:46:46 2021 +0200 + + Move GfxFont::tag to be a std::string + + No need for it to be a GooString * + + poppler/Gfx.cc | 2 +- + poppler/GfxFont.cc | 4 +--- + poppler/GfxFont.h | 8 ++++---- + 3 files changed, 6 insertions(+), 8 deletions(-) + +commit 757b566fc14b3d9e33b50387afe9dced709006b2 +Author: Albert Astals Cid +Date: Fri Oct 22 17:38:17 2021 +0200 + + Don't crash if the GooString * is null + + goo/GooString.cc | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit 24d0445aa4bf0795aff955dbaf1b585f090d3d2b +Author: Albert Astals Cid +Date: Mon Oct 18 17:51:37 2021 +0200 + + Support Type3 charprocs having Resources dicts + + Doesn't seem to be standard but Adobe supports it so... + + Fixes #1150 + + poppler/Gfx.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 9604005a4e81ebc6bed2c90aa2044dc1cf064dfd +Author: Albert Astals Cid +Date: Wed Oct 13 22:19:09 2021 +0200 + + Don't say a font is not monospace because the widths are all X and 0 + + poppler/GfxFont.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 72902cfa13aecb1827c2a9bba971154253657ecd +Author: Albert Astals Cid +Date: Fri Oct 15 19:02:17 2021 +0200 + + Fix Android CI + + .gitlab-ci.yml | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +commit 8fc71482b4ef9ceabe6159708dd2747e2648dd7d +Author: Georgiy Sgibnev +Date: Wed Oct 6 11:47:34 2021 +0300 + + The field rendering logic should take into account not only AcroForm's + DR but also field's DR + + poppler/Annot.cc | 31 +++++++++++++++++++++++++++---- + 1 file changed, 27 insertions(+), 4 deletions(-) + +commit a246536f330eb6151a63cb1e86c6e0a7398fff64 +Author: Albert Astals Cid +Date: Mon Oct 11 23:19:18 2021 +0200 + + qt6: remove useless ifdef + + qt6/src/poppler-annotation.cc | 6 ------ + 1 file changed, 6 deletions(-) + +commit ba6de4c34675c9788d601c3aca3d52b08970d220 +Author: Albert Astals Cid +Date: Mon Oct 11 22:13:20 2021 +0200 + + Update (C) + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a4e927b99e48b783980ceb12c2c7747dcec4cc13 +Author: Marek Kasik +Date: Wed Oct 6 16:45:48 2021 +0200 + + TextOutputDev: Respect orientation when selecting words + + Take rotation of text lines into account when visiting + selection. This works for text rotated by multiples of + 90 degrees. + + Issue #499 + + poppler/TextOutputDev.cc | 175 + ++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 142 insertions(+), 33 deletions(-) + +commit 3c265bb77f17abaf6031e09cb96833e5b3d128b8 +Author: Adrian Johnson +Date: Mon Oct 11 07:04:36 2021 +1030 + + Form is not always a ref + + poppler/Gfx.cc | 5 +++-- + poppler/OutputDev.h | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 090f89ff26dbea6c82b052502842093c5a954c75 +Author: Albert Astals Cid +Date: Mon Oct 11 16:26:57 2021 +0200 + + qt6: Require Qt 6.1 + + Since the CI is now failing to compile with 6.0 + + .gitlab-ci.yml | 30 +++++++++++++++--------------- + CMakeLists.txt | 2 +- + 2 files changed, 16 insertions(+), 16 deletions(-) + +commit acd8b7c3bb6c3b35e7c79cc91b52dbb09e5ad9e3 +Author: Albert Astals Cid +Date: Sun Oct 10 11:00:20 2021 +0200 + + Update (C) + + poppler/Gfx.cc | 2 +- + poppler/MarkedContentOutputDev.cc | 1 + + poppler/MarkedContentOutputDev.h | 1 + + poppler/OutputDev.h | 2 +- + poppler/StructElement.cc | 2 +- + poppler/StructElement.h | 1 + + 6 files changed, 6 insertions(+), 3 deletions(-) + +commit 32f27b888d0e89cd40c086bd8d70381ee474078c +Author: Adrian Johnson +Date: Mon Oct 4 10:53:54 2021 +1030 + + StructElement: support MCID in XObjects + + poppler/Gfx.cc | 2 ++ + poppler/MarkedContentOutputDev.cc | 25 +++++++++++++++++++++++-- + poppler/MarkedContentOutputDev.h | 8 +++++++- + poppler/OutputDev.h | 2 ++ + poppler/StructElement.cc | 15 ++++++++++++--- + poppler/StructElement.h | 3 ++- + 6 files changed, 48 insertions(+), 7 deletions(-) + +commit 95b6c0ddfca22de51fa8197c9273fd8d7fdc4683 +Author: Albert Astals Cid +Date: Tue Sep 28 23:44:10 2021 +0200 + + pdftohtml: document what zoom means in regard to DPI + + utils/pdftohtml.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c498cfe5a6292f2c696178b69e6fb275f1a4a4da +Author: Adrian Johnson +Date: Fri Oct 1 09:24:03 2021 +0000 + + pdfinfo: add -url option to print all URLs in a PDF + + utils/pdfinfo.1 | 6 ++++++ + utils/pdfinfo.cc | 24 ++++++++++++++++++++++++ + 2 files changed, 30 insertions(+) + +commit e0a0f50a278df6bc1d3618e685494244d7139783 +Author: Christian Persch +Date: Thu Sep 30 16:38:42 2021 +0200 + + poppler: cairo: Don't override the antialias settings from the cairo_t + + This partially reverts commit 853e9499, which made CairoOutputDev + store + the antialias setting, and applying it to its cairo context. + + Instead, just copy the antialias (and font antialias) setting from the + passed cairo context to newly created contexts. That way, the + application + can control the antialias settings. + + Use this in pdftocairo to implement its -antialias option. + + Fixes: + https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/282 + https://bugs.freedesktop.org/show_bug.cgi?id=94977 + https://gitlab.freedesktop.org/poppler/poppler/merge_requests/89 + + poppler/CairoOutputDev.cc | 26 +++++++------------------- + poppler/CairoOutputDev.h | 4 +--- + utils/pdftocairo.cc | 10 +++++++++- + 3 files changed, 17 insertions(+), 23 deletions(-) + +commit c7f3f602f8aa648feed2aee8f17c540c19dc1cca +Author: Albert Astals Cid +Date: Fri Oct 1 09:51:25 2021 +0200 + + Poppler 21.10.0 + + CMakeLists.txt | 4 ++-- + NEWS | 28 ++++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/CMakeLists.txt | 2 +- + qt6/src/Doxyfile | 2 +- + 7 files changed, 35 insertions(+), 7 deletions(-) + +commit 015fabcd763f862983a1d57077fb6f73e64937ed +Author: Christian Persch +Date: Thu Sep 30 17:48:24 2021 +0200 + + glib: Remove incorrect deprecation + + PopplerAttachment is a non-deprecated object, and + PopplerAttachmentClass + is its object class structure. While it was probably not intended + to be + public, an object's class struct cannot be deprecated-for the object's + instance struct. Remove the erroneous deprecation from commit + e7fa274dd7c0bd5e66a3b68329d7d56541bb839b. + + glib/poppler-attachment.h | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +commit f08341bf5b776165923d8110e287b1b8eda26c9c +Author: Albert Astals Cid +Date: Mon Sep 27 19:43:09 2021 +0200 + + Update (C) + + poppler/Form.cc | 1 + + poppler/Form.h | 1 + + poppler/SignatureHandler.cc | 1 + + poppler/SignatureHandler.h | 1 + + qt5/src/poppler-form.cc | 1 + + qt5/src/poppler-form.h | 1 + + qt6/src/poppler-form.cc | 1 + + qt6/src/poppler-form.h | 1 + + utils/pdfsig.cc | 1 + + 9 files changed, 9 insertions(+) + +commit e5516f8c1827862a7e650dd850b0e919a2d6c51e +Author: Theofilos Intzoglou +Date: Mon Sep 27 10:07:05 2021 +0000 + + Add support for AIA fetching to verify certificates + + poppler/Form.cc | 8 ++++---- + poppler/Form.h | 4 ++-- + poppler/SignatureHandler.cc | 12 +++++++++--- + poppler/SignatureHandler.h | 2 +- + qt5/src/poppler-form.cc | 2 +- + qt5/src/poppler-form.h | 3 ++- + qt6/src/poppler-form.cc | 2 +- + qt6/src/poppler-form.h | 3 ++- + utils/pdfsig.1 | 3 +++ + utils/pdfsig.cc | 4 +++- + 10 files changed, 28 insertions(+), 15 deletions(-) + +commit bf92b981ece533e814d10bc2bae20c8d4f96bdf4 +Author: Albert Astals Cid +Date: Sun Sep 26 19:16:31 2021 +0200 + + Make Catalog::readMetadata return an unique_ptr + + Makes ownership much clearer + + glib/poppler-document.cc | 5 ++--- + poppler/Catalog.cc | 8 ++++---- + poppler/Catalog.h | 2 +- + poppler/PDFDoc.h | 2 +- + qt5/src/poppler-document.cc | 5 ++--- + qt6/src/poppler-document.cc | 5 ++--- + utils/pdfinfo.cc | 8 +++----- + 7 files changed, 15 insertions(+), 20 deletions(-) + +commit 66890c1cbf9c2a37b3bb9ec36562e78d88fb5348 +Author: Adrian Johnson +Date: Sun Sep 26 19:41:39 2021 +0930 + + pdfinfo: add metadata flags + + utils/pdfinfo.1 | 12 ++++++ + utils/pdfinfo.cc | 115 + +++++++++++++++++++++++++++++++++---------------------- + 2 files changed, 82 insertions(+), 45 deletions(-) + +commit 3b8a01589cc8f0e96b4e405050f5c73fc665752e +Author: Albert Astals Cid +Date: Sat Sep 25 18:53:53 2021 +0200 + + Fix copy&paste mistake of previous commit + + Found by Claude Heiland-Allen + + poppler/SplashOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 07ce486444556f4d3b103e41219913f087d20ed2 +Author: Albert Astals Cid +Date: Sat Sep 25 12:47:37 2021 +0200 + + Splash: Fix pattern whose values are not 0 but close enough + + They were causing the resulting calculation to be bad + + The new code looks "weird" as it basically just talkes the max + value out + of 2 values in the matrix, but i've played with different values + and it + works fine and the test suite can't find any rendering + regression either + + Issue #1138 + + poppler/SplashOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d90f153e70b5a2f58d48c3381e7e26a40a891047 +Author: Albert Astals Cid +Date: Mon Sep 20 14:41:13 2021 +0200 + + SignatureHandler::validateCertificate: Add option to not do OCSP + revocaction check + + OCSP contacts the internet so we may not want to do it either because + the device doesn't have internet or because we don't want to "leak" + information that we're validating something. + + poppler/Form.cc | 8 ++++---- + poppler/Form.h | 4 ++-- + poppler/SignatureHandler.cc | 10 +++++++--- + poppler/SignatureHandler.h | 4 ++-- + qt5/src/poppler-form.cc | 2 +- + qt5/src/poppler-form.h | 1 + + qt6/src/poppler-form.cc | 2 +- + qt6/src/poppler-form.h | 1 + + utils/pdfsig.1 | 10 ++++++++-- + utils/pdfsig.cc | 4 +++- + 10 files changed, 30 insertions(+), 16 deletions(-) + +commit 6bdf5710b0fb13bddc1d31c32d6622516221151d +Author: Albert Astals Cid +Date: Mon Sep 20 11:45:05 2021 +0200 + + pdfsig: Don't infinite loop if the NSS password given is wrong + + utils/pdfsig.cc | 37 ++++++++++++++++++++++++++----------- + 1 file changed, 26 insertions(+), 11 deletions(-) + +commit 03cc342c2a06ff7550dd6ce9180c64d92f75a8ce +Author: Albert Astals Cid +Date: Mon Sep 20 09:34:47 2021 +0200 + + CI: Also compile the curl-dependent code on build_mingw64_fedora33 + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e9e6fe93e89f9a29f10d843e23b8bbe79c54d9bc +Author: Albert Astals Cid +Date: Thu Sep 16 12:05:07 2021 +0200 + + pdfsig: You can now add signatures from pdfsig + + Issue #1073 + + utils/pdfsig.1 | 22 ++++++++++-- + utils/pdfsig.cc | 108 + ++++++++++++++++++++++++++++++++++++++++++++++++-------- + 2 files changed, 113 insertions(+), 17 deletions(-) + +commit 62f014c45dce190df32313b35ec76f5329321c7f +Author: Albert Astals Cid +Date: Thu Sep 16 13:43:00 2021 +0200 + + pdfsig: fix typo in man page + + Thanks Adrian Johnson for the heads up + + utils/pdfsig.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 431d2e6c9e367f8fada13205d527b38282200207 +Author: Albert Astals Cid +Date: Thu Sep 16 12:33:52 2021 +0200 + + PDFDoc::sign: make page be 1 indexed like on the PDFDoc functions + + poppler/PDFDoc.cc | 2 +- + qt5/src/poppler-pdf-converter.cc | 2 +- + qt6/src/poppler-pdf-converter.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 609992087a1e9ba85e24e76f59235b06149c7354 +Author: Oliver Sander +Date: Wed Sep 15 15:12:24 2021 +0200 + + Store GfxFont::encodingName by value, in a std::string + + Storing by value saves various heap allocations. Using std::string + instead of GooString brings the code closer to standard C++. + + glib/poppler-document.cc | 9 ++++----- + poppler/FontInfo.cc | 7 +++---- + poppler/FontInfo.h | 6 +++--- + poppler/GfxFont.cc | 25 +++++++++++-------------- + poppler/GfxFont.h | 5 +++-- + utils/pdffonts.cc | 4 ++-- + 6 files changed, 26 insertions(+), 30 deletions(-) + +commit a646ed9b0a544b87d4998a7209b340970db6a53d +Author: Albert Astals Cid +Date: Thu Sep 16 12:07:47 2021 +0200 + + Update (C) + + poppler/PDFDoc.cc | 1 + + poppler/PDFDoc.h | 1 + + qt5/src/poppler-private.h | 1 + + qt6/src/poppler-private.h | 1 + + utils/pdfsig.cc | 1 + + 5 files changed, 5 insertions(+) + +commit a03ec4540bb7cf5aa462b818c335965c4f7f1d2a +Author: Georgiy Sgibnev +Date: Thu Sep 16 10:04:45 2021 +0000 + + Correct encoding of signature's properties Reason & Location + Qt API + + poppler/Form.cc | 16 ++++++++++------ + poppler/Form.h | 12 +++++++----- + poppler/PDFDoc.cc | 4 ++-- + poppler/PDFDoc.h | 4 +++- + poppler/UTF.cc | 23 +++++++++++++++++++++++ + poppler/UTF.h | 7 +++++++ + qt5/src/poppler-pdf-converter.cc | 28 ++++++++++++++++++++++++++-- + qt5/src/poppler-private.h | 2 ++ + qt5/src/poppler-qt5.h | 21 +++++++++++++++++++++ + qt5/tests/check_utf_conversion.cpp | 5 +++++ + qt6/src/poppler-pdf-converter.cc | 30 +++++++++++++++++++++++++++--- + qt6/src/poppler-private.h | 2 ++ + qt6/src/poppler-qt6.h | 21 +++++++++++++++++++++ + qt6/tests/check_utf_conversion.cpp | 5 +++++ + utils/pdfsig.cc | 9 +++++---- + 15 files changed, 166 insertions(+), 23 deletions(-) + +commit 5960933f6e22df200e4d6bc6edb799e38b06df42 +Author: Albert Astals Cid +Date: Wed Sep 15 17:55:41 2021 +0200 + + Move the code to sign a document from the qt frontend to PDFDoc + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 2 +- + poppler/PDFDoc.cc | 71 + ++++++++++++++++++++++++++++++++++++++++ + poppler/PDFDoc.h | 3 ++ + qt5/src/poppler-pdf-converter.cc | 70 + ++------------------------------------- + qt6/src/poppler-pdf-converter.cc | 70 + ++------------------------------------- + 6 files changed, 82 insertions(+), 136 deletions(-) + +commit 5cc48423fe42202ba5a0744eaa33193cbb85eab4 +Author: Albert Astals Cid +Date: Thu Sep 16 10:23:25 2021 +0200 + + pdfsig: Rework the param check flow + + It's easier to understand now + + utils/pdfsig.cc | 71 + ++++++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 48 insertions(+), 23 deletions(-) + +commit 4eb0f56a92113de45e4ec0e10e90f23d4a9227bc +Author: Albert Astals Cid +Date: Thu Sep 16 10:06:26 2021 +0200 + + pdfsig: setNSSDir needs to be called before + getAvailableSigningCertificates + + utils/pdfsig.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7e267e09a4927c45ff5a38e7d62340c94772e9a2 +Author: Albert Astals Cid +Date: Thu Sep 16 09:34:58 2021 +0200 + + pdfsig: Add a way to list certificate nicknames + + Otherwise it may be a bit hard to figure out what needs to be + passed to + the -nick function when signing + + utils/pdfsig.1 | 6 ++++++ + utils/pdfsig.cc | 36 +++++++++++++++++++++++++++++++++++- + 2 files changed, 41 insertions(+), 1 deletion(-) + +commit b7021c2f409af1537b653488a3cbc2b01476b8ce +Author: Albert Astals Cid +Date: Thu Sep 16 00:03:41 2021 +0200 + + Update (C) + + poppler/UTF.cc | 2 +- + poppler/UTF.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b10e715b6a12d63922e428512d2d14682fd1cefc +Author: Adrian Johnson +Date: Thu Sep 16 06:59:14 2021 +0930 + + Ignore custom metadata that is not a string + + utils/pdfinfo.cc | 32 +++++++++++++++++--------------- + 1 file changed, 17 insertions(+), 15 deletions(-) + +commit 2bcf030e294cddf47abb63d53944b5e932848917 +Author: Adrian Johnson +Date: Wed Sep 15 22:31:10 2021 +0930 + + pdfinfo: Add -custom option to print custom metadata + + poppler/UTF.cc | 436 + +++++++++---------------------------------------------- + poppler/UTF.h | 10 ++ + utils/pdfinfo.1 | 3 + + utils/pdfinfo.cc | 68 +++++++++ + 4 files changed, 148 insertions(+), 369 deletions(-) + +commit 904af9ab0c32309e0ccb845837180c5c4afba0ff +Author: Albert Astals Cid +Date: Wed Sep 15 00:36:05 2021 +0200 + + Properly scale the default stamps to the bbox we want + + poppler/Annot.cc | 66 + +++++++++++++++++++++------- + poppler/annot_stamp_approved.h | 4 ++ + poppler/annot_stamp_as_is.h | 4 ++ + poppler/annot_stamp_confidential.h | 4 ++ + poppler/annot_stamp_departmental.h | 4 ++ + poppler/annot_stamp_draft.h | 4 ++ + poppler/annot_stamp_experimental.h | 4 ++ + poppler/annot_stamp_expired.h | 4 ++ + poppler/annot_stamp_final.h | 4 ++ + poppler/annot_stamp_for_comment.h | 4 ++ + poppler/annot_stamp_for_public_release.h | 4 ++ + poppler/annot_stamp_not_approved.h | 4 ++ + poppler/annot_stamp_not_for_public_release.h | 4 ++ + poppler/annot_stamp_sold.h | 4 ++ + poppler/annot_stamp_top_secret.h | 4 ++ + 15 files changed, 107 insertions(+), 15 deletions(-) + +commit 5cd0e95e19ec3ba031a65dda618f8f068304ee01 +Author: Mahmoud Khalil +Date: Wed Jun 9 21:47:17 2021 +0200 + + Add default appearance for the well known stamp names + + Adds support for the standard annotations icon like Approved, Draft, + Experimental, etc. + + Here's what has been done, in order to generate the AP streams: + + * I used inkscape to modify Okular's stamps.svg file in order to + extract each icon + * Used cairosvg to convert the icon into a PDF file + * Used qpdf to extract the uncompressed stream of the AP and embed + that into the new .h files + + poppler/Annot.cc | 89 ++++- + poppler/Annot.h | 3 +- + poppler/annot_stamp_approved.h | 339 +++++++++++++++++++ + poppler/annot_stamp_as_is.h | 130 ++++++++ + poppler/annot_stamp_confidential.h | 188 +++++++++++ + poppler/annot_stamp_departmental.h | 466 + +++++++++++++++++++++++++++ + poppler/annot_stamp_draft.h | 135 ++++++++ + poppler/annot_stamp_experimental.h | 384 ++++++++++++++++++++++ + poppler/annot_stamp_expired.h | 243 ++++++++++++++ + poppler/annot_stamp_final.h | 116 +++++++ + poppler/annot_stamp_for_comment.h | 223 +++++++++++++ + poppler/annot_stamp_for_public_release.h | 299 +++++++++++++++++ + poppler/annot_stamp_not_approved.h | 394 ++++++++++++++++++++++ + poppler/annot_stamp_not_for_public_release.h | 333 +++++++++++++++++++ + poppler/annot_stamp_sold.h | 113 +++++++ + poppler/annot_stamp_top_secret.h | 359 +++++++++++++++++++++ + 16 files changed, 3807 insertions(+), 7 deletions(-) + +commit b151180cd5a30b19a2d7a81e67c1be418facd4fb +Author: Albert Astals Cid +Date: Mon Sep 13 23:22:52 2021 +0200 + + Update (C) + + goo/gmem.h | 1 + + 1 file changed, 1 insertion(+) + +commit 247119e3db4a19d57000f15d350165343b0e9092 +Author: Even Rouault +Date: Mon Sep 13 22:52:50 2021 +0200 + + greallocn(checkoverflow = true, free_p = true): if memory allocation + fails, free the previous pointer to avoid memory leak + + goo/gmem.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 2549552043acf0a98f64360853ce37e6e045c35a +Author: Even Rouault +Date: Mon Sep 13 15:03:45 2021 +0200 + + Splash::gouraudTriangleShadedFill(): relax assertion threshold + + On the reproducer file of + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38626, the 1e-9 + threshold is hit. Relaxing it to 1e-7 avoids the assertion. + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a1901ee99bf46beac43d129bb3f6ad2f9ed758af +Author: Albert Astals Cid +Date: Sun Sep 12 22:29:40 2021 +0200 + + Misc annotation stamp improvements + + Mark a few variables/functions as const + Remove unused function from AnnotStampImageHelper.h + Remove unneded GooString from AnnotStamp::generateStampAppearance + Set pointer to null after delete in AnnotStamp::clearCustomImage + only invalidate appearance in AnnotStamp::clearCustomImage if we + did something + Add since markers to the new public API + + poppler/Annot.cc | 16 ++++++++-------- + poppler/Annot.h | 4 ++-- + poppler/AnnotStampImageHelper.h | 5 ++--- + qt5/src/poppler-annotation.cc | 10 +++++----- + qt5/src/poppler-annotation.h | 8 ++++++++ + qt6/src/poppler-annotation.cc | 10 +++++----- + qt6/src/poppler-annotation.h | 8 ++++++++ + 7 files changed, 38 insertions(+), 23 deletions(-) + +commit 3fa04293eb7005526c762ddab28e020fd2808aca +Author: Albert Astals Cid +Date: Sun Sep 12 22:17:45 2021 +0200 + + Update (C) + + poppler/Annot.cc | 1 + + poppler/Annot.h | 1 + + qt5/src/poppler-annotation-private.h | 1 + + qt5/src/poppler-annotation.cc | 1 + + qt5/src/poppler-annotation.h | 1 + + qt6/src/poppler-annotation-private.h | 1 + + qt6/src/poppler-annotation.cc | 1 + + qt6/src/poppler-annotation.h | 1 + + 8 files changed, 8 insertions(+) + +commit 3ad10c30433f19da65f638326336865504fb972a +Author: Mahmoud Khalil +Date: Sun Sep 12 20:14:24 2021 +0000 + + Improve support for custom stamp annotations + + This commit improves Poppler support for custom stamp + annotations, by adding a new class called AnnotStampImageHelper in + Poppler core. + + The new class takes image data and create an Image + XObject in the document, the AnnotStamp class has been modified to + support the new helper class and to reference the created XObject. + + This new implementation has been exposed in the qt5 wrapper as well + as the + qt6 one, in which the extraction of the QImage data has been handled. + + A new API for preserving the annotation AP stream has been exposed + using + the qt wrapper as well, so that users are able to temporarily + store it. + + CMakeLists.txt | 2 + + poppler/Annot.cc | 127 +++++++++++++++++++--- + poppler/Annot.h | 13 ++- + poppler/AnnotStampImageHelper.cc | 77 +++++++++++++ + poppler/AnnotStampImageHelper.h | 69 ++++++++++++ + qt5/src/poppler-annotation-private.h | 12 +++ + qt5/src/poppler-annotation.cc | 204 + +++++++++++++++++++++++++++++++++++ + qt5/src/poppler-annotation.h | 41 +++++++ + qt6/src/poppler-annotation-private.h | 12 +++ + qt6/src/poppler-annotation.cc | 204 + +++++++++++++++++++++++++++++++++++ + qt6/src/poppler-annotation.h | 41 +++++++ + 11 files changed, 789 insertions(+), 13 deletions(-) + +commit 736337fdab52ba77e1877347adff595136f74d73 +Author: Thomas Huxhorn +Date: Sun Aug 29 12:18:57 2021 +0200 + + save the trouble of remembering to delete the pointer + + qt5/src/poppler-page.cc | 11 ++++------- + qt6/src/poppler-page.cc | 11 ++++------- + 2 files changed, 8 insertions(+), 14 deletions(-) + +commit f70e352429e3b565262251b1150e77e8638bed6c +Author: Albert Astals Cid +Date: Thu Sep 2 00:04:17 2021 +0200 + + 21.09.0 + + CMakeLists.txt | 4 ++-- + NEWS | 12 ++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 17 insertions(+), 5 deletions(-) + +commit 3cbd833a560eaa8f2d284c3de2033247777b2e6a +Author: Albert Astals Cid +Date: Tue Aug 31 00:15:51 2021 +0200 + + Remove unused SplashPath::copy + + splash/SplashPath.cc | 18 ------------------ + splash/SplashPath.h | 5 ----- + 2 files changed, 23 deletions(-) + +commit f8bcfde24f52e66dd98b8ae62057742bd3add35e +Author: Alex Richardson +Date: Tue Jul 13 15:16:31 2021 +0100 + + cmake: correctly forward user-provided flags to try_compile() + + Poppler overrides the user-provided CMAKE_{C,CXX}_FLAGS and appends + them + to the per-configuration variables instead. This behaviour currently + causes cross-compilation checks to fail since a CMake issue means + these + these per-configuration flags are no passed to try_compile() commands. + In my case the flags specified in the toolchain file (as part of + CMAKE_{C,CXX}_FLAGS_INIT) are absolutely required to compile + successfully + since a missing `-mabi=/-march=` flag will result in a linker error + due to + trying to link incompatible libraries. If + CMAKE_TRY_COMPILE_CONFIGURATION + is empty CMake will no propagate the per-configuration flags to + try_compile() so we have to to set the value explicitly. + + This is an upstream CMake issue: + See https://gitlab.kitware.com/cmake/cmake/-/issues/22414 and + https://gitlab.kitware.com/cmake/cmake/-/issues/19512. + + CMakeLists.txt | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 53ecbfc9af7a490ad49353b1e2b5011a66c0f100 +Author: Alex Richardson +Date: Tue Jul 13 15:04:36 2021 +0100 + + Always append to CMAKE_{C,CXX}_FLAGS_${CMAKE_BUILD_TYPE} + + Currently the user/toolchain-provided CMAKE_{C,CXX}_FLAGS can be lost + if the user selects a CMAKE_BUILD_TYPE that is not handled by + PopplerMacros.cmake. To avoid this problem use a foreach() loop over + all known build types plus the current CMAKE_BUILD_TYPE that appends + to the per-configuration flags. + + cmake/modules/PopplerMacros.cmake | 87 + +++++++++++++++++++++++---------------- + 1 file changed, 52 insertions(+), 35 deletions(-) + +commit a1678b91e2d1b1b38ff38897bc1540f2b57a7ebc +Author: Alex Richardson +Date: Mon Jul 12 17:44:07 2021 +0100 + + Call cmake_minium_required() before project() + + See CMake documentation: + ``` + Call the cmake_minimum_required() command at the beginning of the + top-level + CMakeLists.txt file even before calling the project() command. It is + important to establish version and policy settings before invoking + other + commands whose behavior they may affect. See also policy CMP0000. + ``` + + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e8003bd8cde3b4b6b2954ad7370d3ece71607673 +Author: Albert Astals Cid +Date: Sun Aug 29 22:51:06 2021 +0200 + + Update (C) + + goo/JpegWriter.cc | 1 + + poppler/StdinCachedFile.cc | 1 + + poppler/TextOutputDev.cc | 1 + + utils/pdftocairo.cc | 1 + + utils/pdftoppm.cc | 1 + + 5 files changed, 5 insertions(+) + +commit e2183097ad35038bb7266f181578020edf7cd08d +Author: Peter Williams +Date: Wed Aug 18 10:39:21 2021 -0400 + + Fix up setmode calls + + To compile and work correctly on both Cygwin and MSVC, we should + always + call the function `_setmode` and check for either `_WIN32` or + `__CYGWIN__` being defined. This fixes the MSVC build and corrects + some + behavior handling output to stdout on Cygwin. + + poppler/StdinCachedFile.cc | 8 ++++---- + poppler/TextOutputDev.cc | 8 ++++---- + utils/pdftocairo.cc | 14 ++++++++++---- + utils/pdftoppm.cc | 8 ++++---- + 4 files changed, 22 insertions(+), 16 deletions(-) + +commit db9aa98fb14f3e88f8ab9fd6fc5043a45ccba3fd +Author: Peter Williams +Date: Wed Aug 18 10:38:11 2021 -0400 + + Map str{n,}casecmp to supported names on MSVC + + config.h.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +commit e5cfc6977f716c4d42df4598cdd958fd865ed1a0 +Author: Peter Williams +Date: Wed Aug 18 10:36:54 2021 -0400 + + JpegWriter: include poppler/Error.h sooner + + This is needed to avoid a symbol redefinition error on Windows/MSVC. + + goo/JpegWriter.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6aff5bbbfe06c70314ba7ea936d98aed0e48331f +Author: Albert Astals Cid +Date: Sat Aug 21 21:46:00 2021 +0200 + + CI: Enable google-explicit-constructor + + I was doing some refactoring before and was hit by one of the + constructors being magically called when i didn't want that. + + Since we don't really on it (was just used in some of the explicit + type + conversions) I think it makes sense to enable + + And 2 small qt6 clang-tidy fixes because we don't have qt6 on + the clang-tidy CI yet + + There's 2 potentially source incompatible changes in the qt frontend, + but i really really hope noone was using the constructors that way + + .gitlab-ci.yml | 2 +- + cpp/poppler-destination.h | 4 +- + cpp/poppler-document.h | 4 +- + cpp/poppler-embedded-file-private.h | 4 +- + cpp/poppler-embedded-file.h | 3 +- + cpp/poppler-font-private.h | 3 +- + cpp/poppler-font.h | 3 +- + cpp/poppler-global.cpp | 12 +++--- + cpp/poppler-global.h | 5 ++- + cpp/poppler-image.cpp | 4 +- + cpp/poppler-page-transition.cpp | 4 +- + cpp/poppler-page-transition.h | 3 +- + cpp/poppler-page.h | 4 +- + fofi/FoFiIdentifier.cc | 4 +- + goo/JpegWriter.h | 4 +- + goo/NetPBMWriter.h | 4 +- + goo/PNGWriter.h | 4 +- + goo/TiffWriter.h | 4 +- + goo/gdir.h | 4 +- + goo/gfile.h | 4 +- + poppler/Annot.h | 38 +++++++++--------- + poppler/Array.h | 4 +- + poppler/CairoFontEngine.cc | 14 ++++--- + poppler/CairoFontEngine.h | 4 +- + poppler/Catalog.h | 2 +- + poppler/CharCodeToUnicode.h | 4 +- + poppler/Dict.h | 6 +-- + poppler/FileSpec.h | 6 +-- + poppler/FlateEncoder.h | 2 +- + poppler/FontInfo.h | 4 +- + poppler/Function.h | 12 +++--- + poppler/Gfx.cc | 2 +- + poppler/GfxState.cc | 2 +- + poppler/GfxState.h | 24 +++++------ + poppler/GlobalParams.h | 6 +-- + poppler/Hints.cc | 4 +- + poppler/JArithmeticDecoder.h | 4 +- + poppler/JBIG2Stream.cc | 4 +- + poppler/JPEG2000Stream.h | 2 +- + poppler/JSInfo.h | 4 +- + poppler/Linearization.h | 4 +- + poppler/Link.h | 30 +++++++------- + poppler/MarkedContentOutputDev.h | 4 +- + poppler/Movie.h | 4 +- + poppler/OptionalContent.h | 6 +-- + poppler/PDFDoc.h | 4 +- + poppler/PDFDocFactory.h | 4 +- + poppler/PageTransition.h | 4 +- + poppler/PopplerCache.h | 4 +- + poppler/PreScanOutputDev.h | 2 +- + poppler/Rendition.h | 4 +- + poppler/SecurityHandler.h | 4 +- + poppler/Sound.h | 4 +- + poppler/SplashOutputDev.cc | 2 +- + poppler/Stream.cc | 2 +- + poppler/Stream.h | 24 +++++------ + poppler/StructElement.h | 6 +-- + poppler/TextOutputDev.cc | 4 +- + poppler/TextOutputDev.h | 8 ++-- + poppler/UnicodeMap.h | 4 +- + poppler/ViewerPreferences.h | 3 +- + poppler/XRef.h | 6 +-- + qt5/demos/abstractinfodock.h | 3 +- + qt5/demos/embeddedfiles.h | 3 +- + qt5/demos/fonts.h | 3 +- + qt5/demos/info.h | 3 +- + qt5/demos/metadata.h | 3 +- + qt5/demos/navigationtoolbar.h | 4 +- + qt5/demos/optcontent.h | 3 +- + qt5/demos/pageview.h | 3 +- + qt5/demos/permissions.h | 3 +- + qt5/demos/thumbnails.h | 3 +- + qt5/demos/toc.h | 4 +- + qt5/demos/viewer.h | 3 +- + qt5/src/QPainterOutputDev.h | 4 +- + qt5/src/poppler-annotation.h | 60 + ++++++++++++++-------------- + qt5/src/poppler-embeddedfile-private.h | 4 +- + qt5/src/poppler-form.cc | 4 +- + qt5/src/poppler-form.h | 10 ++--- + qt5/src/poppler-link-extractor-private.h | 3 +- + qt5/src/poppler-link-private.h | 4 +- + qt5/src/poppler-link.cc | 14 +++---- + qt5/src/poppler-link.h | 14 +++---- + qt5/src/poppler-media.cc | 4 +- + qt5/src/poppler-media.h | 4 +- + qt5/src/poppler-optcontent-private.h | 6 +-- + qt5/src/poppler-optcontent.h | 4 +- + qt5/src/poppler-page-transition.cc | 4 +- + qt5/src/poppler-page-transition.h | 4 +- + qt5/src/poppler-private.h | 4 +- + qt5/src/poppler-qiodeviceoutstream-private.h | 3 +- + qt5/src/poppler-qt5.h | 20 +++++----- + qt5/tests/check_actualtext.cpp | 2 +- + qt5/tests/check_annotations.cpp | 2 +- + qt5/tests/check_attachments.cpp | 2 +- + qt5/tests/check_dateConversion.cpp | 2 +- + qt5/tests/check_fonts.cpp | 2 +- + qt5/tests/check_forms.cpp | 4 +- + qt5/tests/check_goostring.cpp | 2 +- + qt5/tests/check_internal_outline.cpp | 2 +- + qt5/tests/check_lexer.cpp | 2 +- + qt5/tests/check_links.cpp | 2 +- + qt5/tests/check_metadata.cpp | 2 +- + qt5/tests/check_object.cpp | 2 +- + qt5/tests/check_optcontent.cpp | 2 +- + qt5/tests/check_outline.cpp | 2 +- + qt5/tests/check_pagelabelinfo.cpp | 2 +- + qt5/tests/check_pagelayout.cpp | 2 +- + qt5/tests/check_pagemode.cpp | 2 +- + qt5/tests/check_password.cpp | 2 +- + qt5/tests/check_permissions.cpp | 2 +- + qt5/tests/check_search.cpp | 2 +- + qt5/tests/check_strings.cpp | 2 +- + qt5/tests/check_stroke_opacity.cpp | 2 +- + qt5/tests/check_utf_conversion.cpp | 2 +- + qt5/tests/stress-threads-qt5.cpp | 2 +- + qt5/tests/test-password-qt5.cpp | 2 +- + qt6/demos/abstractinfodock.h | 3 +- + qt6/demos/embeddedfiles.h | 3 +- + qt6/demos/fonts.h | 3 +- + qt6/demos/info.h | 3 +- + qt6/demos/metadata.h | 3 +- + qt6/demos/navigationtoolbar.h | 4 +- + qt6/demos/optcontent.h | 3 +- + qt6/demos/pageview.h | 3 +- + qt6/demos/permissions.h | 3 +- + qt6/demos/thumbnails.h | 3 +- + qt6/demos/toc.h | 4 +- + qt6/demos/viewer.h | 3 +- + qt6/src/QPainterOutputDev.h | 4 +- + qt6/src/poppler-annotation.h | 36 ++++++++--------- + qt6/src/poppler-embeddedfile-private.h | 4 +- + qt6/src/poppler-form.cc | 4 +- + qt6/src/poppler-form.h | 10 ++--- + qt6/src/poppler-link-extractor-private.h | 3 +- + qt6/src/poppler-link-private.h | 4 +- + qt6/src/poppler-link.cc | 12 +++--- + qt6/src/poppler-link.h | 14 +++---- + qt6/src/poppler-media.cc | 4 +- + qt6/src/poppler-media.h | 4 +- + qt6/src/poppler-optcontent-private.h | 6 +-- + qt6/src/poppler-optcontent.h | 4 +- + qt6/src/poppler-page-transition.cc | 4 +- + qt6/src/poppler-page-transition.h | 4 +- + qt6/src/poppler-private.h | 4 +- + qt6/src/poppler-qiodeviceoutstream-private.h | 3 +- + qt6/src/poppler-qt6.h | 20 +++++----- + qt6/tests/check_actualtext.cpp | 2 +- + qt6/tests/check_annotations.cpp | 2 +- + qt6/tests/check_attachments.cpp | 2 +- + qt6/tests/check_dateConversion.cpp | 2 +- + qt6/tests/check_fonts.cpp | 2 +- + qt6/tests/check_forms.cpp | 4 +- + qt6/tests/check_goostring.cpp | 2 +- + qt6/tests/check_internal_outline.cpp | 2 +- + qt6/tests/check_lexer.cpp | 2 +- + qt6/tests/check_links.cpp | 2 +- + qt6/tests/check_metadata.cpp | 2 +- + qt6/tests/check_object.cpp | 2 +- + qt6/tests/check_optcontent.cpp | 2 +- + qt6/tests/check_outline.cpp | 2 +- + qt6/tests/check_pagelabelinfo.cpp | 2 +- + qt6/tests/check_pagelayout.cpp | 2 +- + qt6/tests/check_pagemode.cpp | 2 +- + qt6/tests/check_password.cpp | 2 +- + qt6/tests/check_permissions.cpp | 2 +- + qt6/tests/check_search.cpp | 2 +- + qt6/tests/check_strings.cpp | 2 +- + qt6/tests/check_stroke_opacity.cpp | 2 +- + qt6/tests/check_utf_conversion.cpp | 2 +- + qt6/tests/stress-threads-qt6.cpp | 2 +- + qt6/tests/test-password-qt6.cpp | 2 +- + splash/SplashClip.h | 2 +- + splash/SplashPath.h | 2 +- + splash/SplashPattern.h | 2 +- + splash/SplashScreen.h | 4 +- + splash/SplashState.h | 2 +- + utils/HtmlOutputDev.h | 4 +- + 178 files changed, 456 insertions(+), 422 deletions(-) + +commit 646a1519d965895a4126b4e5f6fee2102d9c38a6 +Author: Albert Astals Cid +Date: Fri Aug 27 15:45:27 2021 +0200 + + CI: Include qt6 on the clang-tidy and clazy builders + + .gitlab-ci.yml | 12 ++++++++++-- + qt6/src/poppler-link.cc | 2 +- + qt6/src/poppler-page.cc | 2 +- + qt6/src/poppler-private.h | 1 - + 4 files changed, 12 insertions(+), 5 deletions(-) + +commit 875be6054ff85261e254268a77cf47ebb9c539e9 +Author: Albert Astals Cid +Date: Fri Aug 27 13:33:05 2021 +0200 + + SplashClip: we don't need to keep the paths around + + Since we never used them for anything ^_^ + + Saves yet another 40% in file from issue #1126 + + splash/Splash.cc | 6 +++--- + splash/SplashClip.cc | 45 + ++++++++++++-------------------------------- + splash/SplashClip.h | 1 - + splash/SplashXPath.cc | 8 -------- + splash/SplashXPath.h | 4 ---- + splash/SplashXPathScanner.cc | 20 ++++++++++---------- + splash/SplashXPathScanner.h | 4 ++-- + 7 files changed, 27 insertions(+), 61 deletions(-) + +commit 849e4bbbdcffe8c7ec4fe319f7cf1fbbd8c84949 +Author: Albert Astals Cid +Date: Fri Aug 27 02:12:27 2021 +0200 + + Splash: huge speed improvement in save/restore heavy files + + 27 secs to 2 secs in file from issue #1126 in my computer + + When copying the SplashClip we don't need to copy the scanners, we can + just share the same pointers since once created the scanners can't + change. + + splash/SplashClip.cc | 13 +++---------- + splash/SplashClip.h | 5 ++++- + splash/SplashXPathScanner.cc | 11 ----------- + splash/SplashXPathScanner.h | 6 ------ + 4 files changed, 7 insertions(+), 28 deletions(-) + +commit 0f78fc2fc29463af7340fa5c7efac6f82dbba26b +Author: Albert Astals Cid +Date: Fri Aug 27 02:02:52 2021 +0200 + + Every function in SplashXPathScanner is const + + splash/SplashXPathScanner.cc | 12 ++++++------ + splash/SplashXPathScanner.h | 16 ++++++++-------- + 2 files changed, 14 insertions(+), 14 deletions(-) + +commit d6c4d5d98f016d552c54bc86c42883d660adb70c +Author: Albert Astals Cid +Date: Fri Aug 27 02:01:05 2021 +0200 + + SplashXPathScanner: Don't keep the SplashXPath around + + we don't need it + + splash/SplashXPathScanner.cc | 8 +++----- + splash/SplashXPathScanner.h | 5 ++--- + 2 files changed, 5 insertions(+), 8 deletions(-) + +commit f39941016fcd5af3c510112e9224c2c19c504ef4 +Author: Albert Astals Cid +Date: Fri Aug 27 00:57:49 2021 +0200 + + Update (C) + + poppler/SplashOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f51d2519590369107c27d0f3a078819e1df889fb +Author: Even Rouault +Date: Wed Aug 25 21:52:26 2021 +0200 + + SplashOutputDev::drawImage(): Fix abort() in failed gmallocn + + Fail following crash on reproducer test case of + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27810 + + Crash stack on ``pdftoppm -png + clusterfuzz-testcase-minimized-gdal_fuzzer-5753490332450816.fuzz`` is: + ``` + 0 __GI_raise (sig=sig@entry=6) at + ../sysdeps/unix/sysv/linux/raise.c:50 + 1 0x00007ffff7746859 in __GI_abort () at abort.c:79 + 2 0x00007ffff7cff44e in gmallocn (count=count@entry=1073741824, + size=size@entry=3, checkoverflow=checkoverflow@entry=false) at + /home/even/poppler/goo/gmem.h:116 + 3 0x00007ffff7e584d4 in SplashOutputDev::drawImage + (this=0x5555555b6b00, state=0x5555555bb360, ref=, str=0x5555555dc6e0, width=19, height=, + colorMap=0x7fffffffd2c0, + interpolate=false, maskColors=0x0, inlineImg=false) at + /home/even/poppler/poppler/SplashOutputDev.cc:3286 + 4 0x00007ffff7d764a6 in Gfx::doImage + (this=this@entry=0x5555555b9460, ref=ref@entry=0x7fffffffd820, + str=, inlineImg=inlineImg@entry=false) at + /home/even/poppler/poppler/Gfx.cc:4563 + 5 0x00007ffff7d773ca in Gfx::opXObject (this=0x5555555b9460, + args=, numArgs=) at + /home/even/poppler/poppler/Gfx.cc:4105 + 6 0x00007ffff7d70dc7 in Gfx::go (this=this@entry=0x5555555b9460, + topLevel=topLevel@entry=true) at /home/even/poppler/poppler/Gfx.cc:681 + 0x00007ffff7d711f5 in Gfx::display (this=this@entry=0x5555555b9460, + obj=obj@entry=0x7fffffffdc00, topLevel=topLevel@entry=true) + at /home/even/poppler/poppler/Gfx.cc:642 + 8 0x00007ffff7dd2758 in Page::displaySlice (this=0x5555555b5ff0, + out=0x5555555b6b00, hDPI=, vDPI=, + rotate=, useMediaBox=, + crop=, sliceX=, sliceY=0, + sliceW=230, sliceH=230, printing=false, abortCheckCbk=0x0, + abortCheckCbkData=0x0, + annotDisplayDecideCbk=0x55555555a110 <::_FUN(Annot *, void *)>, annotDisplayDecideCbkData=0x0, + copyXRef=false) at /home/even/poppler/poppler/Page.cc:576 + 9 0x000055555555a633 in savePageSlice (doc=, + splashOut=0x5555555b6b00, pg=1, x=, y=, + w=, h=, pg_w=, + pg_h=, ppmFile=0x0) at + /home/even/poppler/utils/pdftoppm.cc:288 + 10 0x0000555555559232 in main (argc=, argv=) at /home/even/poppler/utils/pdftoppm.cc:684 + ``` + + poppler/SplashOutputDev.cc | 70 + ++++++++++++++++++++++++++-------------------- + 1 file changed, 39 insertions(+), 31 deletions(-) + +commit c92e079ea2954abc6b7005a802ea464ccfae9581 +Author: Albert Astals Cid +Date: Thu Aug 26 01:10:26 2021 +0200 + + Update (C) + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 63c052ec2d4286560075c857261518089c92c315 +Author: Georgiy Sgibnev +Date: Mon Aug 23 11:23:03 2021 +0300 + + Correct decoding of signature's properties Reason & Location + + poppler/Form.cc | 5 +++-- + poppler/SignatureInfo.cc | 21 +++++++-------------- + poppler/SignatureInfo.h | 14 ++++++++------ + qt5/src/poppler-form.cc | 5 +++-- + qt6/src/poppler-form.cc | 5 +++-- + 5 files changed, 24 insertions(+), 26 deletions(-) + +commit 69b2bb9bb0b9ed52f25f4471ee161a4ce15deb23 +Author: Even Rouault +Date: Sat Aug 21 00:05:55 2021 +0200 + + JBIG2Stream.cc: use gmallocn_checkoverflow() instead of gmallocn() + + This should hopefully fix the crash of + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=29638 + (on the GDAL project in its PDF driver), although I didn't manage to + reproduce it with the reproducer attached to the ticket + + The mentioned stack trace was: + + ``` + 0 0xf7ef2b19 in [vdso] + 1 0xf7cc1d08 in raise + 2 0xf7cc3206 in abort + 3 0xbec0a39 in gmalloc(unsigned int, bool) + gdal/poppler/goo/gmem.h:52:5 + 4 0xbef9a06 in gmallocn(int, int, bool) gdal/poppler/goo/gmem.h:119:12 + 5 0xc211923 in JBIG2Stream::readSymbolDictSeg(unsigned + int, unsigned int, unsigned int*, unsigned int) + gdal/poppler/poppler/JBIG2Stream.cc:1650:37 + 6 0xc20e607 in JBIG2Stream::readSegments() + gdal/poppler/poppler/JBIG2Stream.cc:1331:18 + 7 0xc20d72f in JBIG2Stream::reset() + gdal/poppler/poppler/JBIG2Stream.cc:1171:5 + ``` + + poppler/JBIG2Stream.cc | 26 +++++++++++++++++++++----- + 1 file changed, 21 insertions(+), 5 deletions(-) + +commit a9eb92b611f97fe2eb92c4aa9a650b64d66095e0 +Author: Albert Astals Cid +Date: Sat Aug 21 12:11:35 2021 +0200 + + splash: Make the copy() functions const + + poppler/SplashOutputDev.h | 8 ++++---- + splash/SplashBitmap.cc | 8 ++++---- + splash/SplashBitmap.h | 21 ++++++++++++--------- + splash/SplashClip.cc | 4 ++-- + splash/SplashClip.h | 6 +++--- + splash/SplashPath.cc | 4 ++-- + splash/SplashPath.h | 6 +++--- + splash/SplashPattern.cc | 4 ++-- + splash/SplashPattern.h | 8 ++++---- + splash/SplashScreen.cc | 4 ++-- + splash/SplashScreen.h | 6 +++--- + splash/SplashState.cc | 4 ++-- + splash/SplashState.h | 6 +++--- + splash/SplashXPath.cc | 4 ++-- + splash/SplashXPath.h | 6 +++--- + splash/SplashXPathScanner.cc | 2 +- + splash/SplashXPathScanner.h | 6 +++--- + 17 files changed, 55 insertions(+), 52 deletions(-) + +commit aaf857abd10c961ab26c97559dffe7183b8a5a82 +Author: Albert Astals Cid +Date: Sat Aug 21 11:55:28 2021 +0200 + + Update (C) + + splash/SplashClip.cc | 2 +- + splash/SplashXPathScanner.cc | 2 +- + splash/SplashXPathScanner.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit bfe82d7c2dba2ec3c97855232b75bde29cbdff44 +Author: Thomas Freitag +Date: Fri Aug 20 15:36:49 2021 +0200 + + instead of creating new scanner just copy the existing ones + + splash/SplashClip.cc | 10 +--------- + splash/SplashXPathScanner.cc | 12 ++++++++++++ + splash/SplashXPathScanner.h | 6 ++++++ + 3 files changed, 19 insertions(+), 9 deletions(-) + +commit dd507d1a460470298b749802285fce216226f417 +Author: Albert Astals Cid +Date: Sat Aug 21 11:38:11 2021 +0200 + + Revert 73a236b23de3c0337bed0f89cb713c7831e2ad05 + + It causes rendering regressions + + poppler/JBIG2Stream.cc | 26 +++++--------------------- + 1 file changed, 5 insertions(+), 21 deletions(-) + +commit 73a236b23de3c0337bed0f89cb713c7831e2ad05 +Author: Even Rouault +Date: Sat Aug 21 00:05:55 2021 +0200 + + JBIG2Stream.cc: use gmallocn_checkoverflow() instead of gmallocn() + + This should hopefully fix the crash of + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=29638 + (on the GDAL project in its PDF driver), although I didn't manage to + reproduce it with the reproducer attached to the ticket + + The mentioned stack trace was: + + ``` + 0 0xf7ef2b19 in [vdso] + 1 0xf7cc1d08 in raise + 2 0xf7cc3206 in abort + 3 0xbec0a39 in gmalloc(unsigned int, bool) + gdal/poppler/goo/gmem.h:52:5 + 4 0xbef9a06 in gmallocn(int, int, bool) gdal/poppler/goo/gmem.h:119:12 + 5 0xc211923 in JBIG2Stream::readSymbolDictSeg(unsigned + int, unsigned int, unsigned int*, unsigned int) + gdal/poppler/poppler/JBIG2Stream.cc:1650:37 + 6 0xc20e607 in JBIG2Stream::readSegments() + gdal/poppler/poppler/JBIG2Stream.cc:1331:18 + 7 0xc20d72f in JBIG2Stream::reset() + gdal/poppler/poppler/JBIG2Stream.cc:1171:5 + ``` + + poppler/JBIG2Stream.cc | 26 +++++++++++++++++++++----- + 1 file changed, 21 insertions(+), 5 deletions(-) + +commit 61b4a485429c0aac1759e1422e9b0429f3c98543 +Author: Albert Astals Cid +Date: Wed Aug 11 23:28:48 2021 +0200 + + Update (C) + + splash/Splash.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 001f17def990e3ec1687fe1cc13c58b7df5b7745 +Author: Even Rouault +Date: Tue Aug 10 12:36:59 2021 +0200 + + Splash::gouraudTriangleShadedFill(): relax assertion threshold + + On the reproducer file of + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34505, the 1e-10 + threshold is hit. Relaxing it to 1e-9 avoids the assertion. + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 56822eb116b6f8a5c6c30cffd2991956ff62e142 +Author: Albert Astals Cid +Date: Sat Aug 7 23:41:46 2021 +0200 + + Fix the build_clang12_libcpp CI + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4aaabeca58ebf0d398975b5569610651e451b542 +Author: Albert Astals Cid +Date: Sun Aug 1 17:19:17 2021 +0200 + + Poppler 21.08.0 + + CMakeLists.txt | 4 ++-- + NEWS | 23 +++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/CMakeLists.txt | 2 +- + qt6/src/Doxyfile | 2 +- + 6 files changed, 29 insertions(+), 6 deletions(-) + +commit 76e31d6cefe0404f6d88f249c444ed2318958715 +Author: Albert Astals Cid +Date: Fri Jul 30 00:51:49 2021 +0200 + + Update (C) + + poppler/DateInfo.cc | 2 +- + poppler/DateInfo.h | 2 +- + qt5/src/poppler-document.cc | 2 +- + qt6/src/poppler-document.cc | 2 +- + utils/pdfinfo.cc | 2 +- + utils/pdftohtml.cc | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +commit 2636e51212b99359cc940b806d645a9e43c33d74 +Author: Adrian Johnson +Date: Fri Jul 2 22:09:07 2021 +0930 + + Date string may be in unicode + + glib/poppler-document.cc | 2 +- + poppler/DateInfo.cc | 19 ++++++++++++---- + poppler/DateInfo.h | 2 +- + qt5/src/poppler-document.cc | 3 ++- + qt6/src/poppler-document.cc | 3 ++- + utils/pdfinfo.cc | 55 + +++++++++++++++++++++------------------------ + utils/pdftohtml.cc | 3 +-- + 7 files changed, 47 insertions(+), 40 deletions(-) + +commit fc3afe21523b3fdc3a27254a3ef8139a82d35385 +Author: Oliver Sander +Date: Thu Jul 15 11:01:33 2021 +0200 + + Use additional samples to test for constant parts of an axial gradient + + The method doAxialShFill does adaptive sampling of gradients. + If the gradient color is found to be the same at two consecutive + sampling locations then the gradient is concluded to be constant + between the two locations. + + Of course, this conclusion may be wrong; one instance of this + happening is + + https://gitlab.freedesktop.org/poppler/poppler/-/issues/938 + + This patch fixes rendering of the test file in issue 938 by doing + one more sampling when a part of the gradient is suspected to be + constant. Of course it is easily possible to create gradients + also misrender with the additional sampling point. Should such + gradients ever appear in actual non-synthetic documents the code + can now easily handle yet more sample points. + + Fixes: https://gitlab.freedesktop.org/poppler/poppler/-/issues/938 + + poppler/Gfx.cc | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +commit f35567dc6033cf8f856f5694af058fda2528cbe7 +Author: Albert Astals Cid +Date: Mon Jul 19 23:00:27 2021 +0200 + + Fix XRef::copy when we have modified objects + + poppler/XRef.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit ef8c8ca8500ce9de91a5903b8561e3e02a81888e +Author: Albert Astals Cid +Date: Thu Jul 22 17:54:47 2021 +0200 + + Support reading the Version from the Catalog + + Fixes #1097 + + poppler/Catalog.cc | 11 ++++++++++- + poppler/Catalog.h | 8 +++++++- + poppler/PDFDoc.cc | 8 ++++---- + poppler/PDFDoc.h | 27 ++++++++++++++++++++------- + 4 files changed, 41 insertions(+), 13 deletions(-) + +commit c61f0c0afdf2ae48db1f0b15cf1cc0023d88c203 +Author: Albert Astals Cid +Date: Wed Jul 21 21:44:54 2021 +0200 + + GfxCIDFont::getNextChar: Also set ox and oy to 0 on the non cmap case + + Otherwise we may end up using uninitized values + + oss-fuzz/36396 + + poppler/GfxFont.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c85a85423e3fe0c914d0a5b3f3e9e3ba3205fb79 +Author: Hib Eris +Date: Fri Jul 16 15:25:52 2021 +0200 + + Validate input from page offset hints table + + Fixes: https://gitlab.freedesktop.org/poppler/poppler/-/issues/343 + + poppler/Hints.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 87422fcfc35959235aea74e78bc58a1b1a5c116f +Author: Albert Astals Cid +Date: Sun Jul 18 00:43:22 2021 +0200 + + Update (C) + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9998ae596bd26cc7b61f176dda0fcee6e1dd346b +Author: Oliver Sander +Date: Thu Jul 15 15:46:43 2021 +0200 + + Replace a local bubble sort implementation by std::sort + + This makes the code a bit shorter. + + poppler/Gfx.cc | 21 +++------------------ + 1 file changed, 3 insertions(+), 18 deletions(-) + +commit 3d49757055dbcd2876c0b26ee00a7bd780541938 +Author: Albert Astals Cid +Date: Thu Jul 15 22:19:30 2021 +0200 + + Update (C) + + qt5/src/poppler-document.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 13c95f251bf47068a3c083bf038cab86fea7f570 +Author: Oliver Sander +Date: Fri Jul 9 11:55:24 2021 +0200 + + Make getPdfVersion return a dedicated version object + + That's a bit more modern than the old way where pointers to two + integers had to be passed to the method. + + With the new method you can write + + auto pdfVersion = doc->getPdfVersion(); + // access numbers as pdfVersion.major and pdfVersion.minor + + instead of + + int major, minor; + doc->getPdfVersion(&major, &minor); + + With C++17 you can even write + + auto [major, minor] = doc->getPdfVersion(); + + The new method is put alongside the old one in the Qt5 interface. + It replaces the old one in the Qt6 interface. + + qt5/src/poppler-document.cc | 5 +++++ + qt5/src/poppler-qt5.h | 20 +++++++++++++++++++- + qt5/tests/check_metadata.cpp | 7 +++---- + qt5/tests/stress-poppler-dir.cpp | 7 +++++-- + qt5/tests/stress-poppler-qt5.cpp | 4 ++-- + qt5/tests/test-password-qt5.cpp | 5 ++--- + qt5/tests/test-poppler-qt5.cpp | 5 ++--- + qt6/src/poppler-document.cc | 7 ++----- + qt6/src/poppler-qt6.h | 14 +++++++++----- + qt6/tests/check_metadata.cpp | 7 +++---- + qt6/tests/stress-poppler-dir.cpp | 4 ++-- + qt6/tests/stress-poppler-qt6.cpp | 4 ++-- + qt6/tests/test-password-qt6.cpp | 5 ++--- + qt6/tests/test-poppler-qt6.cpp | 5 ++--- + 14 files changed, 60 insertions(+), 39 deletions(-) + +commit fdb83a88ce196413a874c3e0fb6fbd200b56393c +Author: Nelson Benítez León +Date: Mon Jul 5 15:42:44 2021 -0400 + + glib: mimick TextSelectionDumper logic change for spaceAfter + + Commit d6cccfb8d814d89c51c9e65563be2e475f46212b caused + issue #1100 because that change in the TextSelectionDumper + logic *must be mimicked* in poppler_page_get_text_layout_for_area() + and in poppler_page_get_text_attributes_for_area() because + all those functions must be consistent with each other in + the way they traverse and extract the text from the PDF. + + Otherwise, wrong results may happen when using them + to map between graphical coordinates of text glyphs and + their corresponding positions in the text obtained from + poppler_page_get_text() (which uses TextSelectionDumper + to extract the text). + + Fixes issue #1100 + + glib/poppler-page.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit e2f7f5e8eae0cb13d88af4400d68697c6e6bf5ed +Author: Nelson Benítez León +Date: Sat Jul 10 00:13:46 2021 -0400 + + Add glib test for issue #1100 + + glib/tests/check_text.c | 43 ++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 42 insertions(+), 1 deletion(-) + +commit eea6b4f9caa7555009d959de51acb81037b2a465 +Author: Albert Astals Cid +Date: Sat Jul 10 23:59:35 2021 +0200 + + AnnotAppearanceBuilder::drawListBox: Fix memory leak on error + condition + + oss-fuzz/35996 + + poppler/Annot.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 5977890bb79798ec3ad48b9806d760a1d2746990 +Author: Albert Astals Cid +Date: Thu Jul 8 23:07:07 2021 +0200 + + Update (C) + + qt5/src/poppler-qt5.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab409a6ec85dc7511dbe8ea6b2e4d7897f36670b +Author: Oliver Sander +Date: Thu Jul 8 20:56:49 2021 +0200 + + Document that a document has to outlive its pages + + Because the Page objects handed out by Document objects store a + pointer to the document. If the Document object is deleted + before a Page object it handed out, that Page object will have + a stale pointer. + + qt5/src/poppler-qt5.h | 5 +++++ + qt6/src/poppler-qt6.h | 5 +++++ + 2 files changed, 10 insertions(+) + +commit 1d23101ccebe14261c6afc024ea14f29d209e760 +Author: Albert Astals Cid +Date: Wed Jul 7 01:05:57 2021 +0200 + + Update (C) + + poppler/Annot.cc | 1 + + poppler/Annot.h | 1 + + poppler/Catalog.cc | 1 + + poppler/Catalog.h | 1 + + poppler/Outline.cc | 1 + + poppler/Outline.h | 1 + + poppler/PDFDoc.cc | 1 + + qt5/src/poppler-pdf-converter.cc | 1 + + qt6/src/poppler-pdf-converter.cc | 1 + + 9 files changed, 9 insertions(+) + +commit fa494b780ab69ef04ba7447ab6d8fc3b46373e59 +Author: RM +Date: Mon May 3 12:22:16 2021 -0400 + + Modify internal API to allow addition and modification of outlines + into a PDF. Tests in the qt5/qt6 directories. + + duplicate qt5 outline test in qt6 directory + + poppler/Catalog.cc | 37 +++ + poppler/Catalog.h | 2 + + poppler/Outline.cc | 469 + +++++++++++++++++++++++++++++++++-- + poppler/Outline.h | 62 +++-- + poppler/PDFDoc.cc | 2 +- + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/check_internal_outline.cpp | 436 + ++++++++++++++++++++++++++++++++ + qt6/tests/CMakeLists.txt | 1 + + qt6/tests/check_internal_outline.cpp | 436 + ++++++++++++++++++++++++++++++++ + 9 files changed, 1402 insertions(+), 44 deletions(-) + +commit e674ca6453f3f20c4bf0cb463222a97c99221dd6 +Author: Zachary Travis +Date: Tue Jul 6 22:53:22 2021 +0000 + + Create fallback fonts as needed. + + If a PDF form field value uses a font that is not in the resources + dictionary, a warning is logged and the field value is ignored/not + displayed. It's unclear whether this behavior is strictly valid based + on the PDF spec (since typically font references, even to base fonts, + require a corresponding font dictionary) but Acrobat seems to display + the content anyway. + + poppler/Annot.cc | 126 + +++++++++++++++++++-------------------- + poppler/Annot.h | 17 +++--- + qt5/src/poppler-pdf-converter.cc | 4 +- + qt6/src/poppler-pdf-converter.cc | 4 +- + 4 files changed, 71 insertions(+), 80 deletions(-) + +commit f2a6c6fe06ba2279f8509c56a11d649f02d1500c +Author: Albert Astals Cid +Date: Sun Jul 4 22:02:08 2021 +0200 + + JBIG2Stream: Fix regression caused by + 2b2808719d2c91283ae358381391bb0b37d9061d + + poppler/JBIG2Stream.cc | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +commit fcdff7bb19e2ac0fab6505f17e0c18c8faa86323 +Author: Uli Schlachter +Date: Thu Jul 1 16:20:39 2021 +0200 + + Better error messages when libopenjpeg2 is not found + + When I run "cmake -DENABLE_DCTDECODER=none -DENABLE_BOOST=OFF" on my + system, I get the following output: + + -- Found Iconv: /usr/lib/x86_64-linux-gnu/libc.so + CMake Warning at CMakeLists.txt:252 (find_package): + By not providing "FindOpenJPEG.cmake" in CMAKE_MODULE_PATH + this project has + asked CMake to find a package configuration file provided by + "OpenJPEG", + but CMake did not find one. + + Could not find a package configuration file provided by + "OpenJPEG" with any + of the following names: + + OpenJPEGConfig.cmake + openjpeg-config.cmake + + Add the installation prefix of "OpenJPEG" to CMAKE_PREFIX_PATH + or set + "OpenJPEG_DIR" to a directory containing one of the above + files. If + "OpenJPEG" provides a separate development package or SDK, + be sure it has + been installed. + + CMake Error at CMakeLists.txt:255 (message): + Install libopenjpeg2 before trying to build poppler. You can + also decide + to use the internal unmaintained JPX decoder or none at all. + + -- Configuring incomplete, errors occurred! + See also "/tmp/poppler/build/CMakeFiles/CMakeOutput.log". + See also "/tmp/poppler/build/CMakeFiles/CMakeError.log". + + To figure out what exactly to do now, I have to read some + CMakeLists.txt. This commit improves the situation by producing the + following output instead: + + -- Found Iconv: /usr/lib/x86_64-linux-gnu/libc.so + CMake Warning at CMakeLists.txt:254 (find_package): + By not providing "FindOpenJPEG.cmake" in CMAKE_MODULE_PATH + this project has + asked CMake to find a package configuration file provided by + "OpenJPEG", + but CMake did not find one. + + Could not find a package configuration file provided by + "OpenJPEG" with any + of the following names: + + OpenJPEGConfig.cmake + openjpeg-config.cmake + + Add the installation prefix of "OpenJPEG" to CMAKE_PREFIX_PATH + or set + "OpenJPEG_DIR" to a directory containing one of the above + files. If + "OpenJPEG" provides a separate development package or SDK, + be sure it has + been installed. + + -- Could NOT find openjpeg2. + CMake Error at CMakeLists.txt:258 (message): + Install libopenjpeg2 before trying to build poppler. You can + also decide + to use the internal unmaintained JPX decoder or none at all. + + Possible options are: -DENABLE_LIBOPENJPEG=openjpeg2, + -DENABLE_LIBOPENJPEG=none, -DENABLE_LIBOPENJPEG=unmaintained, + + -- Configuring incomplete, errors occurred! + See also "/tmp/poppler/build/CMakeFiles/CMakeOutput.log". + See also "/tmp/poppler/build/CMakeFiles/CMakeError.log". + + Signed-off-by: Uli Schlachter + + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 27ea06e3443ff0cc2250b26e5f3f170a6f531568 +Author: Uli Schlachter +Date: Thu Jul 1 16:20:33 2021 +0200 + + Better error message when libjpeg is not found + + When I run cmake on my system, I get the following output: + + -- Checking for module 'nss>=3.19' + -- Package 'nss', required by 'virtual:world', not found + -- Could NOT find NSS3 (missing: NSS3_LIBRARIES NSS3_CFLAGS) + CMake Error at CMakeLists.txt:149 (message): + Install libjpeg before trying to build poppler. You can also + decide to use + the internal unmaintained DCT decoder or none at all. + + -- Configuring incomplete, errors occurred! + See also "/tmp/poppler/build/CMakeFiles/CMakeOutput.log". + See also "/tmp/poppler/build/CMakeFiles/CMakeError.log". + + Being (badly) trained in CMake errors, I see "Could NOT find NSS3" and + conclude that this is the problem. I do not even read the actual error + message. + + This commit improves the situation by producing the following output + instead: + + -- Checking for module 'nss>=3.19' + -- Package 'nss', required by 'virtual:world', not found + -- Could NOT find NSS3 (missing: NSS3_LIBRARIES NSS3_CFLAGS) + -- Could NOT find libjpeg. + CMake Error at CMakeLists.txt:150 (message): + Install libjpeg before trying to build poppler. You can also + decide to use + the internal unmaintained DCT decoder or none at all. + + Possible options are: -DENABLE_DCTDECODER=libjpeg, + -DENABLE_DCTDECODER=none, -DENABLE_DCTDECODER=unmaintained + + -- Configuring incomplete, errors occurred! + See also "/tmp/poppler/build/CMakeFiles/CMakeOutput.log". + See also "/tmp/poppler/build/CMakeFiles/CMakeError.log". + + This also explicitly lists the possible values for the parameter + that I + figured out by reading the code around CMakeLists.txt:151. + + Signed-off-by: Uli Schlachter + + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 77e545351b7ac359e19422e8158ff00f6dd597d3 +Author: Albert Astals Cid +Date: Fri Jul 2 23:07:57 2021 +0200 + + poppler 21.07.0 + + CMakeLists.txt | 4 ++-- + NEWS | 10 ++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 15 insertions(+), 5 deletions(-) + +commit a822ba0e4f7240309eaa180230facbceb6d0e08a +Author: Albert Astals Cid +Date: Fri Jul 2 23:03:23 2021 +0200 + + Update (C) + + poppler/CairoOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 2b2808719d2c91283ae358381391bb0b37d9061d +Author: Oliver Sander +Date: Thu Jul 1 21:35:38 2021 +0200 + + JBIG2Stream: Do not abort if size-0 allocations returns nullptr + + The JBIG2SymbolDict constructor gets a size parameter, and it + allocates + memory for a bitmap of that size. Bug report 535 + + https://gitlab.freedesktop.org/poppler/poppler/-/issues/535 + + has a file where this size is 0. In that case, the call to + gmallocn_checkoverflow returns nullptr, and subsequent calls to + JBIG2SymbolDict::isOk return false. This is then interpreted + as an error, and the JBIG2 processing is aborted. For the + test file mentioned above this happens in line 1807. + + I don't know whether such a file with a size-0 symbol dict + is malformed or not. However, the test file renders just fine + if the 'failing' allocation is simply ignored. This patch + therefore relaxes the isOk method a little. A JBIG2SymbolDict + object is now deemed 'ok' either if it holds a bitmap (that was + the previous test) *or if it has size 0*. + + This fixes + + https://gitlab.freedesktop.org/poppler/poppler/-/issues/535 + + poppler/JBIG2Stream.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 571d8138cb9ccc9ac04219a6a552d8c78e93ad88 +Author: Uli Schlachter +Date: Sat Jun 26 12:00:50 2021 +0200 + + ~CairoOutputDev(): Free textClipPath + + The textClipPath member is set in CairoOutputDev::endString() + and freed + in CairoOutputDev::endTextObject(). However, if endTextObject() is not + called for whatever reason, the path will just be leaked. + + This adds code to the destructor to free this. + + This fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=32326 + + Testing done: + + $ wget -O testcase + 'https://oss-fuzz.com/download?testcase_id=6659952325296128' + [...] + $ cmake .. -G Ninja -DENABLE_DCTDECODER=unmaintained + -DENABLE_BOOST=OFF -DENABLE_LIBOPENJPEG=unmaintained && ninja + [...] + $ git describe + poppler-21.06.1-5-gb7c40059 + $ valgrind --leak-check=full ./utils/pdftocairo testcase -png foo + [...] + ==104075== + ==104075== HEAP SUMMARY: + ==104075== in use at exit: 28,292 bytes in 55 blocks + ==104075== total heap usage: 6,114 allocs, 6,059 frees, 1,617,444 + bytes allocated + ==104075== + ==104075== 24 bytes in 1 blocks are definitely lost in loss record + 4 of 37 + ==104075== at 0x483877F: malloc (in + /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so) + ==104075== by 0x48AE748: ??? (in + /usr/lib/x86_64-linux-gnu/libcairo.so.2.11600.0) + ==104075== by 0x118995: endString (CairoOutputDev.cc:1474) + ==104075== by 0x118995: CairoOutputDev::endString(GfxState*) + (CairoOutputDev.cc:1412) + ==104075== by 0x4B97295: Gfx::doShowText(GooString const*) + (Gfx.cc:4010) + ==104075== by 0x4B97CB4: Gfx::opShowSpaceText(Object*, int) + (Gfx.cc:3793) + ==104075== by 0x4B8D866: Gfx::go(bool) (Gfx.cc:681) + ==104075== by 0x4B8DCFA: display (Gfx.cc:642) + ==104075== by 0x4B8DCFA: Gfx::display(Object*, bool) (Gfx.cc:622) + ==104075== by 0x4BE1A83: Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool (*)(void*), + void*, bool (*)(Annot*, void*), void*, bool) (Page.cc:576) + ==104075== by 0x11317C: renderPage (pdftocairo.cc:669) + ==104075== by 0x11317C: main (pdftocairo.cc:1183) + ==104075== + ==104075== LEAK SUMMARY: + ==104075== definitely lost: 24 bytes in 1 blocks + ==104075== indirectly lost: 0 bytes in 0 blocks + ==104075== possibly lost: 0 bytes in 0 blocks + ==104075== still reachable: 28,268 bytes in 54 blocks + ==104075== suppressed: 0 bytes in 0 blocks + ==104075== Reachable blocks (those to which a pointer was found) + are not shown. + ==104075== To see them, rerun with: --leak-check=full + --show-leak-kinds=all + ==104075== + ==104075== For lists of detected and suppressed errors, rerun with: -s + ==104075== ERROR SUMMARY: 1 errors from 1 contexts (suppressed: + 0 from 0) + $ git checkout cairo-leak-textClipPath && git describe && ninja + Zu Branch 'cairo-leak-textClipPath' gewechselt + poppler-21.06.1-6-g8df6f8d2 + $ valgrind --leak-check=full ./utils/pdftocairo testcase -png foo + [...] + ==104263== + ==104263== HEAP SUMMARY: + ==104263== in use at exit: 28,268 bytes in 54 blocks + ==104263== total heap usage: 6,114 allocs, 6,060 frees, 1,617,444 + bytes allocated + ==104263== + ==104263== LEAK SUMMARY: + ==104263== definitely lost: 0 bytes in 0 blocks + ==104263== indirectly lost: 0 bytes in 0 blocks + ==104263== possibly lost: 0 bytes in 0 blocks + ==104263== still reachable: 28,268 bytes in 54 blocks + ==104263== suppressed: 0 bytes in 0 blocks + ==104263== Reachable blocks (those to which a pointer was found) + are not shown. + ==104263== To see them, rerun with: --leak-check=full + --show-leak-kinds=all + ==104263== + ==104263== For lists of detected and suppressed errors, rerun with: -s + ==104263== ERROR SUMMARY: 0 errors from 0 contexts (suppressed: + 0 from 0) + + As you (might) see, before this commit, there is a "definitely lost" + leak of 24 bytes with this test case. After this commit, this leak is + gone. + + Signed-off-by: Uli Schlachter + + poppler/CairoOutputDev.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit c11fbf5a732a041a26359dc7fef103ac44a2346f +Author: Albert Astals Cid +Date: Sun Jun 27 00:47:48 2021 +0200 + + cmake: set C standard to 11 without extensions + + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit b7c400592b5b08d4759b6c45bdd4ff87af75fe46 +Author: Albert Astals Cid +Date: Wed Jun 16 23:03:24 2021 +0200 + + Update (C) of previous commits + + cpp/poppler-page-renderer.cpp | 1 + + poppler/PSOutputDev.cc | 3 ++- + poppler/PSOutputDev.h | 1 + + poppler/Stream.cc | 1 + + poppler/Stream.h | 1 + + qt5/src/poppler-document.cc | 1 + + qt5/src/poppler-page.cc | 1 + + qt5/src/poppler-private.h | 1 + + qt6/src/poppler-document.cc | 1 + + qt6/src/poppler-page.cc | 1 + + qt6/src/poppler-private.h | 1 + + utils/pdftohtml.cc | 1 + + utils/pdftops.cc | 1 + + 13 files changed, 14 insertions(+), 1 deletion(-) + +commit ce0bd9bf6f41fb058519c99128205da569d83b7c +Author: Hubert Figuiere +Date: Wed Jun 16 20:50:49 2021 +0000 + + Remove ENABLE_SPLASH and HAVE_SPLASH (always true) + + CMakeLists.txt | 117 + +++++++++++++++++------------------------ + INSTALL | 2 +- + cpp/poppler-page-renderer.cpp | 18 +------ + poppler/PSOutputDev.cc | 37 ++++--------- + poppler/PSOutputDev.h | 10 +--- + poppler/Stream.cc | 6 +-- + poppler/Stream.h | 4 -- + poppler/poppler-config.h.cmake | 5 -- + qt5/src/poppler-document.cc | 2 - + qt5/src/poppler-page.cc | 12 ++--- + qt5/src/poppler-private.h | 4 +- + qt6/src/poppler-document.cc | 2 - + qt6/src/poppler-page.cc | 12 ++--- + qt6/src/poppler-private.h | 4 +- + test/CMakeLists.txt | 22 ++++---- + utils/CMakeLists.txt | 26 +++++---- + utils/pdftohtml.cc | 19 +------ + utils/pdftops.cc | 24 ++------- + 18 files changed, 102 insertions(+), 224 deletions(-) + +commit 77eb02c23be27ce66b7f99bcd136356e20a0a12d +Author: Philipp Knechtges +Date: Sat Jun 12 22:16:43 2021 +0200 + + PSOutputDev: fix off-by-one error for image masking in L1/L2 output + + Fixes issue #1088 + + poppler/PSOutputDev.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 557b86db954d2cbcb9665cec0ea6edb7b0da9e75 +Author: Albert Astals Cid +Date: Mon Jun 14 21:53:09 2021 +0200 + + Form: make sure quadding has a valid value + + poppler/Form.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 9bcf967b5eadee7c36b32d1595c884c3130339a1 +Author: Albert Astals Cid +Date: Tue Jun 15 00:37:54 2021 +0200 + + CI: switch mingw CI to fedora 33 + + fedora 34 is giving weird errors around libjpeg + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b782d4be006c184c49c6b46bec1d23dd28f1683a +Author: Albert Astals Cid +Date: Thu Jun 3 22:42:20 2021 +0200 + + poppler 21.06.1 + + CMakeLists.txt | 2 +- + NEWS | 4 ++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 8 insertions(+), 4 deletions(-) + +commit b9314b06c7e458f26e7ca0d55b071f4eb1dced58 +Author: Nelson Benítez León +Date: Wed Jun 2 15:25:47 2021 +0100 + + glib: fix poppler_rectangle_free() regression + + Regression from e3fed321f230a4a91df873e6d9a213ba8dad6694 + + Fixes issue #1087 + + glib/poppler-page.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 07edd3d3933549578f91f5744ea5d82feadeb3f6 +Author: Albert Astals Cid +Date: Tue Jun 1 23:07:40 2021 +0200 + + poppler 21.06.0 + + CMakeLists.txt | 4 ++-- + NEWS | 20 ++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/CMakeLists.txt | 2 +- + qt6/src/Doxyfile | 2 +- + 7 files changed, 27 insertions(+), 7 deletions(-) + +commit b4146c1bb021b48dba20ee343d8c3058ba4d756c +Author: Albert Astals Cid +Date: Sun May 30 00:14:52 2021 +0200 + + Move the ownerKey/userKey padding to the correct place + + poppler/SecurityHandler.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit dc587846bff99b07dc351d2d21e5b6908c99afdb +Author: Albert Astals Cid +Date: Sat May 29 01:31:02 2021 +0200 + + pad ownerKey/userKey if < 32 + + Inspired by xpdf + + poppler/SecurityHandler.cc | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 9293e4bf9f6fa6513ddd51fe3426c39b54b1a49d +Author: Albert Astals Cid +Date: Thu May 27 23:30:46 2021 +0200 + + Don't force ownerKey and userKey to be exacly 32 chars long + + The spec says that they have to be this long, but then when + calculating + the hashes says "if it is longer, cut it, if it is shorter, add these + characters" (and we implement that) so it's a bit of spec mismatch. + + Fixes issue #1083 + + poppler/SecurityHandler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c59a6ffe3d4168d40e8ee95801c09069a32c34d4 +Author: Albert Astals Cid +Date: Tue May 25 23:59:30 2021 +0200 + + uintx -> uintx_t + + The non _t types were provided by libtiff and are now deprecated + + goo/TiffWriter.cc | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 9700352e67fc35d3202a39b7dd593485d01d175d +Author: Albert Astals Cid +Date: Tue May 25 23:11:00 2021 +0200 + + Update (C) of last commit + + poppler/SecurityHandler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ed802a62ef42e7e19d632278c2ccb405c9db1a24 +Author: Albert Astals Cid +Date: Tue May 25 11:41:27 2021 +0200 + + Be a bit more verbose when we think Invalid encryption key length + is wrong + + poppler/SecurityHandler.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit ad785d73c400a7681511b13ccd5d6de4b6cfa360 +Author: Albert Astals Cid +Date: Thu May 20 22:40:00 2021 +0200 + + Update (C) + + qt6/demos/documentobserver.cpp | 1 + + qt6/demos/pageview.cpp | 1 + + qt6/demos/thumbnails.cpp | 1 + + qt6/demos/viewer.cpp | 2 +- + qt6/demos/viewer.h | 1 + + qt6/src/poppler-annotation-private.h | 1 + + qt6/src/poppler-annotation.h | 1 + + qt6/src/poppler-document.cc | 2 +- + qt6/src/poppler-link-private.h | 2 +- + qt6/src/poppler-page-private.h | 1 + + qt6/src/poppler-page.cc | 3 +-- + qt6/src/poppler-private.h | 2 +- + 12 files changed, 12 insertions(+), 6 deletions(-) + +commit 8f9115bf4475866eef160af06d17bcd0087cdaed +Author: Albert Astals Cid +Date: Fri May 14 21:05:04 2021 +0200 + + Remove OutlineItem::close + + It was only used in the Outline destructor and in HtmlOutputDev but + there it was kind of pointless + + poppler/Outline.cc | 20 +++++++------------- + poppler/Outline.h | 3 +-- + utils/HtmlOutputDev.cc | 2 -- + 3 files changed, 8 insertions(+), 17 deletions(-) + +commit 90bcd4967e82534f3c141c2c14cf292d6813bbd8 +Author: Albert Astals Cid +Date: Thu May 20 14:21:24 2021 +0200 + + Cast to the actual type we're storing in + + Fixes a warning in gcc 11 + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 45717a50c52ab13f405584eab4e1c586bd39a0ce +Author: Oliver Sander +Date: Wed May 19 21:58:33 2021 +0000 + + Use std::unique_ptr in the Qt6 interface + + qt6/demos/documentobserver.cpp | 2 +- + qt6/demos/pageview.cpp | 3 +- + qt6/demos/thumbnails.cpp | 3 +- + qt6/demos/viewer.cpp | 15 ++--- + qt6/demos/viewer.h | 4 +- + qt6/src/poppler-annotation-private.h | 6 +- + qt6/src/poppler-annotation.cc | 92 + +++++++++++++-------------- + qt6/src/poppler-annotation.h | 15 ++--- + qt6/src/poppler-document.cc | 46 +++++++------- + qt6/src/poppler-form.cc | 28 ++++---- + qt6/src/poppler-form.h | 8 +-- + qt6/src/poppler-link-extractor-private.h | 8 ++- + qt6/src/poppler-link-extractor.cc | 16 ++--- + qt6/src/poppler-link-private.h | 2 +- + qt6/src/poppler-link.cc | 14 ++-- + qt6/src/poppler-link.h | 4 +- + qt6/src/poppler-page-private.h | 4 +- + qt6/src/poppler-page.cc | 106 + +++++++++++++++---------------- + qt6/src/poppler-private.h | 2 +- + qt6/src/poppler-qt6.h | 94 + ++++++++++----------------- + qt6/tests/check_actualtext.cpp | 22 ++----- + qt6/tests/check_annotations.cpp | 27 +++----- + qt6/tests/check_attachments.cpp | 27 ++------ + qt6/tests/check_fonts.cpp | 63 ++++++------------ + qt6/tests/check_forms.cpp | 68 ++++++++++---------- + qt6/tests/check_links.cpp | 64 +++++++------------ + qt6/tests/check_metadata.cpp | 91 ++++++-------------------- + qt6/tests/check_optcontent.cpp | 20 ++---- + qt6/tests/check_pagelayout.cpp | 15 +---- + qt6/tests/check_pagemode.cpp | 25 ++------ + qt6/tests/check_password.cpp | 40 +++--------- + qt6/tests/check_permissions.cpp | 5 +- + qt6/tests/check_search.cpp | 30 ++++----- + qt6/tests/check_stroke_opacity.cpp | 2 +- + qt6/tests/poppler-attachments.cpp | 3 +- + qt6/tests/poppler-fonts.cpp | 3 +- + qt6/tests/poppler-forms.cpp | 19 +++--- + qt6/tests/poppler-page-labels.cpp | 3 +- + qt6/tests/poppler-texts.cpp | 6 +- + qt6/tests/stress-poppler-dir.cpp | 7 +- + qt6/tests/stress-poppler-qt6.cpp | 6 +- + qt6/tests/stress-threads-qt6.cpp | 47 ++++++-------- + qt6/tests/test-password-qt6.cpp | 22 +++---- + qt6/tests/test-poppler-qt6.cpp | 36 ++++------- + qt6/tests/test-render-to-file.cpp | 6 +- + 45 files changed, 433 insertions(+), 696 deletions(-) + +commit a89965b44f6a8b1bdf05d36380b9f883877fbdd2 +Author: Albert Astals Cid +Date: Sat May 15 00:26:42 2021 +0200 + + Update (C) + + poppler/PDFDoc.cc | 1 + + poppler/PDFDoc.h | 1 + + poppler/XRef.cc | 1 + + poppler/XRef.h | 1 + + qt5/demos/viewer.cpp | 1 + + qt5/demos/viewer.h | 1 + + qt5/src/poppler-document.cc | 1 + + qt5/src/poppler-private.cc | 1 + + qt5/src/poppler-private.h | 1 + + qt5/src/poppler-qt5.h | 1 + + qt6/demos/viewer.cpp | 1 + + qt6/demos/viewer.h | 1 + + qt6/src/poppler-document.cc | 1 + + qt6/src/poppler-private.cc | 1 + + qt6/src/poppler-private.h | 1 + + qt6/src/poppler-qt6.h | 1 + + 16 files changed, 16 insertions(+) + +commit 2254e62a7e2fe3a4144251e47c7578ce3b717bc9 +Author: Mahmoud Khalil +Date: Wed Jan 27 21:14:57 2021 +0200 + + Provides the `wasReconstructed` value to caller + + Modifies the Poppler backend library to call a callback method + submitted + by callers in case a XRef reconstruction occurs, as well as, providing + an API for setting the callback from the qt5/qt6 frontend so that + users + be able to set callback and check whether it has already happened or + not. + + FIXES #416 + + poppler/PDFDoc.cc | 20 ++++++++++---------- + poppler/PDFDoc.h | 8 ++++---- + poppler/XRef.cc | 8 +++++++- + poppler/XRef.h | 5 ++++- + qt5/demos/viewer.cpp | 21 +++++++++++++++++++++ + qt5/demos/viewer.h | 2 ++ + qt5/src/poppler-document.cc | 10 ++++++++++ + qt5/src/poppler-private.cc | 13 +++++++++++++ + qt5/src/poppler-private.h | 19 +++++++++++++++---- + qt5/src/poppler-qt5.h | 17 +++++++++++++++++ + qt6/demos/viewer.cpp | 21 +++++++++++++++++++++ + qt6/demos/viewer.h | 2 ++ + qt6/src/poppler-document.cc | 10 ++++++++++ + qt6/src/poppler-private.cc | 13 +++++++++++++ + qt6/src/poppler-private.h | 19 +++++++++++++++---- + qt6/src/poppler-qt6.h | 17 +++++++++++++++++ + 16 files changed, 181 insertions(+), 24 deletions(-) + +commit 541e7778520bb99bd4c07ffcf62143ee3de406ff +Author: Albert Astals Cid +Date: Fri May 14 21:32:44 2021 +0200 + + Mark two Stream::isFoo functions as const + + poppler/DCTStream.cc | 4 ++-- + poppler/DCTStream.h | 4 ++-- + poppler/Decrypt.cc | 4 ++-- + poppler/Decrypt.h | 4 ++-- + poppler/FlateEncoder.h | 6 ++--- + poppler/FlateStream.cc | 4 ++-- + poppler/FlateStream.h | 4 ++-- + poppler/JBIG2Stream.cc | 2 +- + poppler/JBIG2Stream.h | 4 ++-- + poppler/JPEG2000Stream.cc | 2 +- + poppler/JPEG2000Stream.h | 4 ++-- + poppler/JPXStream.cc | 4 ++-- + poppler/JPXStream.h | 4 ++-- + poppler/PSOutputDev.cc | 4 ++-- + poppler/Stream.cc | 20 ++++++++-------- + poppler/Stream.h | 58 + +++++++++++++++++++++++------------------------ + 16 files changed, 66 insertions(+), 66 deletions(-) + +commit 5e543fceba7ffc370d3523715568cdd05da194c7 +Author: Albert Astals Cid +Date: Fri May 14 20:51:31 2021 +0200 + + Update (C) of previous commit + + poppler/Annot.h | 2 +- + qt5/src/poppler-pdf-converter.cc | 2 +- + qt6/src/poppler-pdf-converter.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 5acd6659559907e3cfbfbcd8a8e94c66f38596f0 +Author: Albert Astals Cid +Date: Tue Apr 13 17:00:12 2021 +0200 + + Fancier left/right signature visual representation + + poppler/Annot.cc | 77 + +++++++++++++++++++++++++++++----------- + poppler/Annot.h | 1 + + poppler/Form.cc | 20 +++++++++++ + poppler/Form.h | 8 +++++ + qt5/src/poppler-pdf-converter.cc | 25 +++++++++++++ + qt5/src/poppler-qt5.h | 18 ++++++++++ + qt6/src/poppler-pdf-converter.cc | 25 +++++++++++++ + qt6/src/poppler-qt6.h | 18 ++++++++++ + 8 files changed, 172 insertions(+), 20 deletions(-) + +commit 26f8a7d1bc9c6cd511989d74fdb54f233b25d663 +Author: Hubert Figuière +Date: Tue May 11 19:43:55 2021 -0400 + + make boost opt-out if building splash + + https://gitlab.freedesktop.org/poppler/poppler/-/issues/1080 + + .gitlab-ci.yml | 7 ++++--- + CMakeLists.txt | 9 +++++++-- + 2 files changed, 11 insertions(+), 5 deletions(-) + +commit 2e8ad35f95965459ebef9a20ba1a98f7fe982e26 +Author: Albert Astals Cid +Date: Wed May 12 23:39:14 2021 +0200 + + FoFiTrueType::cvtSfnts: Protect against integer overflow + + oss-fuzz/34214 + + fofi/FoFiTrueType.cc | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 60eae9d0cfc05bd14f3081e4bb128de868fc5e93 +Author: Albert Astals Cid +Date: Sun May 9 22:46:46 2021 +0200 + + FoFiTrueType::cvtSfnts: Protect against integer overflow + + oss-fuzz/34113 + + fofi/FoFiTrueType.cc | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit 4ef3535bffedd217707ea16f2ba415dbcdc1ed41 +Author: Albert Astals Cid +Date: Sat May 8 01:11:57 2021 +0200 + + qt: Don't assert when trying to invert singular matrices + + oss-fuzz/33611 + + qt5/src/poppler-annotation-helper.h | 9 +++++++-- + qt6/src/poppler-annotation-helper.h | 9 +++++++-- + 2 files changed, 14 insertions(+), 4 deletions(-) + +commit 10306f08f903a69ff79c727194dc230f4353fb51 +Author: Albert Astals Cid +Date: Sat May 8 01:10:47 2021 +0200 + + Update (C) of previous commit + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5dbe101b7c3561aedf33872e218b8d1b6984f623 +Author: Albert Astals Cid +Date: Sat May 8 00:54:13 2021 +0200 + + Restore setting the Encoding in createAnnotDrawFont + + It was removed in 9db685f379c1c9195b5f0c9a693e7a581e6b214f and as + far as + i remember the reason was that signatures created with that hung Adobe + Reader, but I can't reproduce it anymore and on top of that is causing + regressions when rendering PDF files (Issue #1070) so restore it. + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 7961ff99df6db70319548b07249194cabfc74783 +Author: Albert Astals Cid +Date: Sun May 2 21:36:32 2021 +0200 + + Poppler 21.05.0 + + CMakeLists.txt | 4 ++-- + NEWS | 19 +++++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/CMakeLists.txt | 2 +- + qt6/src/Doxyfile | 2 +- + 8 files changed, 27 insertions(+), 8 deletions(-) + +commit 17b2b174d1e867588b4fe839fb0e7194bca60a52 +Author: Albert Astals Cid +Date: Wed Apr 28 00:07:06 2021 +0200 + + Update (C) of previous commits + + poppler/TextOutputDev.h | 2 +- + qt5/src/poppler-page-private.h | 2 +- + qt5/src/poppler-qt5.h | 2 +- + qt6/src/poppler-page-private.h | 2 +- + qt6/src/poppler-qt6.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +commit efa43f709a83f5401aa4d99a9412c8ea249663ea +Author: Albert Astals Cid +Date: Tue Apr 27 21:36:57 2021 +0200 + + CI: Use fedora 34 for mingw + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e3fed321f230a4a91df873e6d9a213ba8dad6694 +Author: Nelson Benítez León +Date: Sun Apr 25 22:24:50 2021 +0000 + + find, glib: Enhance find to support multi-line matching + + On the backend side, adds 3 new parameters to TextPage::findText(), + one bool to enable the feature, one out PDFRectangle to store + the part of the match that falls on the next line, and one out + bool to inform whether hyphen was present and ignored at end of + the previous match part. + + For the glib binding, this extends the public PopplerRectangle + struct by new members to hold additional information about + whether the rectangle belongs to a group of rectangles for the + same match, and whether a hyphen was ignored at the end of the + line. Since PopplerRectangle is public ABI, this is done by making + the public PopplerRectangle API return the enlarged struct, and + internally casting to the new struct when required, the new + members are accessible only via accessor functions. + + For Qt5 Qt6 bindings, this commit only implements the new flag + Poppler::Page::AcrossLines (but no new function and no new + return data type) and if this flag is passed, the returned + list of rectangles will also include rectangles for the + second part of across-line matches. + + This minimum Qt bindings still allows for the creation of + tests for this feature (using the Qt test framework) which + this commit *do includes*. But a more complete binding (with + a new return type that includes 'matchContinued' and 'ignoredHypen' + boolean fields) is left to do for qt backend maintainers + if they want to use this feature in eg. Okular. + + So, as mentioned, this commit incorporates tests for the + implemented across-line matching feature, and the tests do + also check for two included aspects of this feature, which are: + + - Ignoring hyphen character while matching when 1) it's the + last character of the line and 2) its corresponding matching + character in the search term is not an hyphen too. + + - Any whitespace characters in the search term will be allowed + to match on the logic position where the lines split (i.e. what + would normally be the newline character in a text file, but + PDF text does not include newline characters between lines). + + Regarding the enhancement to findText() function which implements + matching across lines, just two more notes: + + - It won't match on text spanning more than two lines, i.e. it + only matches text spanning from end of one line to start of + next line. + + - It does not supports finding backwards, if findText() receives + both and parameters as true, it + will ignore the parameter. Implementing + with backwards direction is possible, but + it will make an already complex function like findText() to be + even more complex, for little gain as eg. Evince does not even + use the parameter of findText(). + + Fixes poppler issues #744 and #755 + Related Evince issue https://gitlab.gnome.org/GNOME/evince/issues/333 + + glib/demo/find.c | 83 +++++++++++----- + glib/poppler-page.cc | 144 +++++++++++++++++++++++++--- + glib/poppler-page.h | 4 + + glib/poppler-private.h | 19 ++++ + glib/poppler.h | 7 +- + glib/reference/poppler-sections.txt | 2 + + poppler/TextOutputDev.cc | 182 + +++++++++++++++++++++++++++++------- + poppler/TextOutputDev.h | 15 +++ + qt5/src/poppler-page-private.h | 4 +- + qt5/src/poppler-page.cc | 39 ++++++-- + qt5/src/poppler-qt5.h | 12 ++- + qt5/tests/check_search.cpp | 128 ++++++++++++++++++++----- + qt6/src/poppler-page-private.h | 4 +- + qt6/src/poppler-page.cc | 35 +++++-- + qt6/src/poppler-qt6.h | 12 ++- + qt6/tests/check_search.cpp | 85 +++++++++++++++++ + 16 files changed, 652 insertions(+), 123 deletions(-) + +commit 60fec72677af099e7865a09398263d2508944ad2 +Author: Albert Astals Cid +Date: Thu Apr 22 19:13:00 2021 +0200 + + CI: rename clazy CI to make it clear it uses a new C compiler + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d5ab9b5dbf0024f269001fcea87f4d01a44c2ec6 +Author: Albert Astals Cid +Date: Wed Apr 21 16:42:09 2021 +0200 + + CI: Use clang-12 + + Disable new performance-no-int-to-ptr clang-tidy check since it + triggers + too many issues deep in too many places + + .gitlab-ci.yml | 18 +++++++++--------- + README.contributors | 2 +- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit aad32f4999eb3fb6aa5b8d0485af9fabc98bb01a +Author: Albert Astals Cid +Date: Wed Apr 21 23:54:27 2021 +0200 + + GfxShading::init: Fix assert in broken files + + Fixes issue #1071 + + poppler/GfxState.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit e43a3d9cff01c7d2b6374b3aa340882528da9c85 +Author: Albert Astals Cid +Date: Tue Apr 13 16:06:48 2021 +0200 + + qt: Allow to pass the border width when signing + + qt5/src/poppler-pdf-converter.cc | 13 ++++++++++++- + qt5/src/poppler-qt5.h | 14 +++++++++++++- + qt6/src/poppler-pdf-converter.cc | 13 ++++++++++++- + qt6/src/poppler-qt6.h | 14 +++++++++++++- + 4 files changed, 50 insertions(+), 4 deletions(-) + +commit d672fbe5c1f22c69e30824d7cb896e6b8fb560eb +Author: Albert Astals Cid +Date: Tue Apr 13 13:59:47 2021 +0200 + + qt: Make sure new signatures are always properly oriented + + With the old code if it the page we were adding a signature was + landscape and then rotated 90 degrees to look like portrait + (relatively + common on scanned documents) the text would appear wrongly oriented + + qt5/src/poppler-pdf-converter.cc | 5 +++-- + qt6/src/poppler-pdf-converter.cc | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit 3554a152a9badfde6c02bb0001755a7e9c830b32 +Author: Albert Astals Cid +Date: Fri Apr 16 22:49:29 2021 +0200 + + Prevent integer overflow PSOutputDev::checkPageSlice + + oss-fuzz/33333 + + poppler/PSOutputDev.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 0e732883671754fff843c9e869bdc43f4ab6d4db +Author: Albert Astals Cid +Date: Thu Apr 1 17:27:57 2021 +0200 + + pdftoppm: Fix regression when using single scaleTo + + Fixes #1062 + + utils/pdftoppm.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit b770a55a47278f4104fc410034577cc4ea0434a6 +Author: Albert Astals Cid +Date: Tue Apr 13 17:59:34 2021 +0200 + + qt: QStringToUnicodeGooString don't produce a "fake empty" string + + if the input string is empty, just return an empty GooString, not a + GooString with only the unicode marker + + qt5/src/poppler-private.cc | 4 ++++ + qt5/tests/check_strings.cpp | 12 +++++++++--- + qt6/src/poppler-private.cc | 4 ++++ + qt6/tests/check_strings.cpp | 12 +++++++++--- + 4 files changed, 26 insertions(+), 6 deletions(-) + +commit be9960e86db051a4eabf30e0ab216168b8ce7b59 +Author: Albert Astals Cid +Date: Wed Apr 14 00:02:11 2021 +0200 + + PSOutputDev::setupResources: Fix infinite recursion call on broken + files + + Issue #1065 + + poppler/PSOutputDev.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 8859bffbc14342f2a630212110a24f105dc819f9 +Author: Albert Astals Cid +Date: Tue Apr 13 17:23:30 2021 +0200 + + Annot: Make things more const correct + + poppler/Annot.cc | 5 +++-- + poppler/Annot.h | 3 ++- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit db1bf17777068a34e7586236efefb74a42460932 +Author: Volker Krause +Date: Sun Apr 11 10:54:57 2021 +0000 + + Allow to disable building manual tests + + This is consistent with all the other test programs, and helps in + environments where building regular executables doesn't work out of + the box, such as the Android x86 32bit environment I have here. + + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 2ed4cd66401bc1d9683c94238e9024218d7be3ba +Author: Albert Astals Cid +Date: Wed Apr 7 00:14:59 2021 +0200 + + TextOutputDev: Fix crash in malformed file + + oss-fuzz/32952 + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d7aa275b0bca86ae174e7e504dd269df2a0234cf +Author: Evangelos Foutras +Date: Tue Apr 6 09:56:55 2021 +0300 + + Export SplashFont* symbols used by Scribus + + Scribus 1.5.6.1 compiled against poppler 21.04.0 was unable to + load its + PDF importer plugin without these classes being exported by + libpoppler: + + - SplashFontFileID + - SplashFontEngine + - SplashFontSrc + + splash/SplashFontEngine.h | 3 ++- + splash/SplashFontFile.h | 3 ++- + splash/SplashFontFileID.h | 4 +++- + 3 files changed, 7 insertions(+), 3 deletions(-) + +commit 83a39c7be2148acdb267ba9a03aba991b50c3437 +Author: Albert Astals Cid +Date: Thu Apr 1 19:14:48 2021 +0200 + + Poppler 21.04.0 + + CMakeLists.txt | 4 ++-- + NEWS | 32 ++++++++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 6 files changed, 38 insertions(+), 6 deletions(-) + +commit 104fc940ca3c3eb8b706abd11d35be83dbcd0c3b +Author: Albert Astals Cid +Date: Mon Mar 29 19:12:23 2021 +0200 + + pdfimages: Do not assert in "too big images" + + Fixes #1061 + + utils/ImageOutputDev.cc | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit 29c3fc62d4997bb514d4748cca264fc6868cb52d +Author: Albert Astals Cid +Date: Sun Mar 28 17:23:47 2021 +0200 + + Update (C) + + poppler/Form.cc | 2 +- + poppler/Form.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 40cc13db621f2f49f55c4e4390bf2e862cc05d41 +Author: Nelson Benítez León +Date: Tue Mar 9 16:47:27 2021 -0400 + + Forms: fix unclicking standalone form buttons + + We can find pdf forms that eg. have three related + radio buttons where their *only* relationship is + having the same full qualified name. + + Such a form is supported by Adobe Reader and + produced by LaTeX through TeXStudio. So, when + clicking one such radio button, Poppler failed + to unclick the other radio buttons as they are + not children nor parent of the clicked one (which + is the ordinary way to set radio button groups + as per the PDF standard). + + So, when clicking a radio button, let's add support + to find other radio buttons in the same page that + are only related by having same fully qualified name + (these may be in standalone or normal fields). + + Where trying to find where PDF standard covers this + special case of related radio buttons, the closest + thing we can find is section "Field names" inside + chapter "8.6.2 Field Dictionaries" in 1.7 PDF spec. + + Issue #1034 + + poppler/Form.cc | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- + poppler/Form.h | 2 +- + poppler/Page.h | 2 ++ + 3 files changed, 53 insertions(+), 3 deletions(-) + +commit c8d66bee757d7b0c8858115cd7772ed88bf1fe01 +Author: Albert Astals Cid +Date: Sun Mar 28 16:25:51 2021 +0200 + + Update (C) + + poppler/Gfx.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 12a47e31bfa7d00d04f1ef436fe19092feb34501 +Author: Steve Rosenhamer +Date: Sun Mar 28 14:23:13 2021 +0000 + + Implement rendering of Masks of Image subtype. + + Issue #1058 + + poppler/Gfx.cc | 47 +++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 41 insertions(+), 6 deletions(-) + +commit bdd110b45a38e8a4f80f522892e4c4a9e432abd5 +Author: Christian Persch +Date: Fri Mar 26 18:17:25 2021 +0100 + + glib: Remove incorrecly used volatile from enum type registration code + + glib/poppler-enums.c.template | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 47de887d7658cfd68df44b3acf710971054f957b +Author: Christian Persch +Date: Fri Mar 26 18:17:25 2021 +0100 + + glib: Use stock glib macro to define boxed type + + Poppler already depends on a sufficiently new glib version, so we can + simply use G_DEFINE_BOXED_TYPE instead of defining our own macro. + + glib/poppler-action.cc | 4 ++-- + glib/poppler-annot.cc | 2 +- + glib/poppler-document.cc | 6 +++--- + glib/poppler-page.cc | 20 ++++++++++---------- + glib/poppler-private.h | 15 --------------- + glib/poppler-structure-element.cc | 4 ++-- + 6 files changed, 18 insertions(+), 33 deletions(-) + +commit 56453310d4241a917a4d2ff27fa76c2878f87508 +Author: Marek Kasik +Date: Fri Mar 26 13:10:19 2021 +0100 + + utils: New paragraph for "-sign" in pdfsig.1 + + Create new paragraph for "-sign" option in pdfsig.1 man page. + + utils/pdfsig.1 | 1 + + 1 file changed, 1 insertion(+) + +commit 42dde686bf5a674401850b2d3fdd2bc7467e9a66 +Author: Albert Astals Cid +Date: Mon Mar 22 00:03:59 2021 +0100 + + qt: Fix memory leak when QImage constructor "fails" + + qt5/src/poppler-page.cc | 8 ++++++-- + qt6/src/poppler-page.cc | 8 ++++++-- + 2 files changed, 12 insertions(+), 4 deletions(-) + +commit 57836ce2210183704f685ccc6b1820e16859a0c7 +Author: Albert Astals Cid +Date: Tue Mar 16 09:08:53 2021 +0100 + + Fix rendering of text in some files + + Update CMap::addCIDs from xpdf 3.04 + + Fixes issue #1052 + + poppler/CMap.cc | 48 ++++++++++++++++++++++++------------------------ + 1 file changed, 24 insertions(+), 24 deletions(-) + +commit 81bee89c88d632ce6de878d338dd53a8150ea8aa +Author: Clément Pit-Claudel +Date: Mon Mar 15 20:43:38 2021 +0000 + + [glib] Expose more fields from MediaRendition in PopplerMedia + + glib/poppler-media.cc | 61 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-media.h | 6 ++++ + glib/reference/poppler-sections.txt | 3 ++ + 3 files changed, 70 insertions(+) + +commit e07f3e2e6a6df4ece88873ecbdbaf558f8910091 +Author: Nelson Benítez León +Date: Sat Mar 13 13:41:04 2021 -0400 + + refactor Page::getFormWidgets() to use unique_ptr + + Refactor Page::getFormWidgets() to return + std::unique_ptr so to avoid + possible leaks in API users who forget + to delete object. + + glib/poppler-document.cc | 3 +-- + glib/poppler-page.cc | 5 +---- + poppler/Page.cc | 6 +++--- + poppler/Page.h | 4 ++-- + qt5/src/poppler-page.cc | 6 ++---- + qt6/src/poppler-page.cc | 6 ++---- + 6 files changed, 11 insertions(+), 19 deletions(-) + +commit 7578e04f8d48d307e82764e05ab13f6612180641 +Author: Nelson Benítez León +Date: Sun Feb 28 23:44:43 2021 -0400 + + TextSelectionDumper: fix word order for RTL text + + This is used by glib backend (Evince). + + Fixes issue #53 + + poppler/TextOutputDev.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 6267bf4dadf85842f73e32cf8abf056f150d1bf2 +Author: Albert Astals Cid +Date: Tue Mar 9 19:54:38 2021 +0100 + + Update (C) + + poppler/Form.h | 2 +- + qt5/src/poppler-document.cc | 2 +- + qt6/src/poppler-document.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 59d5036451cc55f57e15e4ae1538024c62452978 +Author: Albert Astals Cid +Date: Tue Mar 9 17:53:00 2021 +0100 + + qt: Fix crash in files with malformed signatures + + For signatures we need the formwidget, so even if they don't have the + Subtype Widget create one when asked for signatures in the document + + Fixes KDE bug #433909 + + poppler/Form.cc | 12 ++++++++++++ + poppler/Form.h | 2 ++ + qt5/src/poppler-document.cc | 2 +- + qt6/src/poppler-document.cc | 2 +- + 4 files changed, 16 insertions(+), 2 deletions(-) + +commit ce1fcd4352f920a59d965310440be18ff48acb8f +Author: Albert Astals Cid +Date: Sun Jan 17 18:31:19 2021 +0100 + + Hide symbols by default + + Use cmake for better import/export defines + + CMakeLists.txt | 7 +++++ + cpp/CMakeLists.txt | 2 ++ + cpp/poppler-global.h | 14 +-------- + fofi/FoFiTrueType.h | 3 +- + fofi/FoFiType1C.h | 4 ++- + glib/CMakeLists.txt | 8 ++--- + glib/poppler-macros.h | 33 -------------------- + goo/GooString.h | 4 ++- + goo/GooTimer.h | 4 ++- + goo/ImgWriter.h | 4 ++- + goo/JpegWriter.h | 3 +- + goo/NetPBMWriter.h | 3 +- + goo/PNGWriter.h | 3 +- + goo/TiffWriter.h | 3 +- + goo/gbase64.h | 4 ++- + goo/gbasename.h | 3 +- + goo/gfile.h | 15 ++++----- + goo/glibc.h | 7 +++-- + goo/gstrtod.h | 4 ++- + poppler/Annot.h | 67 + ++++++++++++++++++++-------------------- + poppler/Array.h | 3 +- + poppler/BBoxOutputDev.h | 2 +- + poppler/CachedFile.h | 7 +++-- + poppler/Catalog.h | 5 +-- + poppler/CertificateInfo.h | 3 +- + poppler/DateInfo.h | 7 +++-- + poppler/Dict.h | 3 +- + poppler/Error.h | 5 +-- + poppler/FileSpec.h | 7 +++-- + poppler/FontInfo.h | 5 +-- + poppler/Form.h | 17 +++++----- + poppler/Function.h | 2 +- + poppler/Gfx.h | 5 +-- + poppler/GfxFont.h | 9 +++--- + poppler/GfxState.h | 27 ++++++++-------- + poppler/GlobalParams.h | 7 +++-- + poppler/JSInfo.h | 4 +-- + poppler/Lexer.h | 2 +- + poppler/Link.h | 13 ++++---- + poppler/MarkedContentOutputDev.h | 3 +- + poppler/Movie.h | 3 +- + poppler/Object.h | 3 +- + poppler/OptionalContent.h | 5 +-- + poppler/Outline.h | 3 +- + poppler/OutputDev.h | 3 +- + poppler/PDFDoc.h | 3 +- + poppler/PDFDocEncoding.h | 5 +-- + poppler/PDFDocFactory.h | 3 +- + poppler/PSOutputDev.h | 3 +- + poppler/Page.h | 3 +- + poppler/PageTransition.h | 2 +- + poppler/Parser.h | 2 +- + poppler/Rendition.h | 2 +- + poppler/SignatureHandler.h | 3 +- + poppler/SignatureInfo.h | 4 ++- + poppler/Sound.h | 2 +- + poppler/SplashOutputDev.h | 3 +- + poppler/Stream.h | 19 ++++++------ + poppler/StructElement.h | 5 +-- + poppler/TextOutputDev.h | 13 ++++---- + poppler/UTF.h | 17 +++++----- + poppler/UnicodeMap.h | 3 +- + poppler/UnicodeMapFuncs.h | 2 +- + poppler/UnicodeTypeTable.h | 5 +-- + poppler/XRef.h | 3 +- + qt5/demos/CMakeLists.txt | 1 + + qt5/src/CMakeLists.txt | 3 +- + qt5/src/poppler-export.h | 20 ------------ + qt5/tests/CMakeLists.txt | 1 + + qt6/demos/CMakeLists.txt | 1 + + qt6/src/CMakeLists.txt | 3 +- + qt6/src/poppler-export.h | 20 ------------ + qt6/tests/CMakeLists.txt | 1 + + splash/Splash.h | 3 +- + splash/SplashBitmap.h | 3 +- + splash/SplashPath.h | 3 +- + splash/SplashPattern.h | 3 +- + 77 files changed, 251 insertions(+), 261 deletions(-) + +commit d1e5c5b29214d82f43eb72d51b2df5184fcbbe33 +Author: Albert Astals Cid +Date: Wed Feb 3 00:26:26 2021 +0100 + + Require the newer glib&friends provided by the new base CI + + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0b34c18882ee3920c5ab9e9b953b3bb642f1b198 +Author: Albert Astals Cid +Date: Wed Feb 3 00:24:11 2021 +0100 + + Require the newer qt5 provided by the new base CI + + CMakeLists.txt | 2 +- + qt5/CMakeLists.txt | 2 +- + qt5/src/poppler-annotation.cc | 4 ++-- + qt5/src/poppler-form.cc | 6 +++--- + qt5/tests/poppler-forms.cpp | 6 +----- + 5 files changed, 8 insertions(+), 12 deletions(-) + +commit e85ba5cc74f283398fb97e0c568c43970bf29fa3 +Author: Albert Astals Cid +Date: Wed Feb 3 00:11:05 2021 +0100 + + Require the newer cmake provided by the new base CI + + CMakeLists.txt | 9 ++------- + cmake/modules/FindGLIB.cmake | 6 +----- + cmake/modules/FindGTK.cmake | 6 +----- + cmake/modules/FindNSS3.cmake | 6 +----- + glib/CMakeLists.txt | 6 +----- + glib/demo/CMakeLists.txt | 6 +----- + glib/tests/CMakeLists.txt | 9 ++------- + 7 files changed, 9 insertions(+), 39 deletions(-) + +commit 73c1e61b183db17692b3ddec51f1859ed4030765 +Author: Albert Astals Cid +Date: Wed Feb 3 00:06:47 2021 +0100 + + Increase our supported Linux to >= ubuntu 18.04 + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a9662d36c2faa6f8590ccd7c99758de6dcf4e324 +Author: Albert Astals Cid +Date: Mon Mar 1 19:33:25 2021 +0100 + + Poppler 21.03.0 + + CMakeLists.txt | 4 ++-- + NEWS | 26 ++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/Doxyfile | 2 +- + 5 files changed, 31 insertions(+), 5 deletions(-) + +commit 1d91d03325662ca368cf5da77d09012998e7720e +Author: Nelson Benítez León +Date: Mon Mar 1 00:22:26 2021 -0400 + + glib/poppler-structure-element: fix memleak + + in convert_doubles_array(), which was not + assigning the allocated memory to the + out variable. + + This means this function was never returning + anything until now, which means there's probably + no users of this function in the wild (certainly + not in Evince). + + Issue #1049 + + glib/poppler-structure-element.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 6a81075c91277d7106bccba66dea0c0bca7be536 +Author: Albert Astals Cid +Date: Mon Mar 1 00:45:24 2021 +0100 + + pdftoppm: Compile fix for the unsupported UTILS_USE_PTHREADS define + + utils/pdftoppm.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9514dceca09af53cf5e920ec76edb3937f87e6ad +Author: Albert Astals Cid +Date: Sat Feb 20 22:37:50 2021 +0100 + + Make TextSelectionSizer a bit easier to understand standalone + + Nothing really changes because it's only used in one place and that + place called getRegion so there's no leak but looking at the class + standalone one could think that one would get a leak if getRegion was + not called. + + poppler/TextOutputDev.cc | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit 31734dcb365e2b69d88c86ddaee3bd62af97fade +Author: Albert Astals Cid +Date: Fri Feb 26 00:19:58 2021 +0100 + + strtok -> strtok_r + + Otherwise we have threading issues if two threads are doing strtok at + the same time + + Fixes issue #1050 + + fofi/FoFiType1.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 03b6705006e563c95cfcad47fa3d3c4c2e248651 +Author: Albert Astals Cid +Date: Sat Feb 20 23:05:22 2021 +0100 + + poppler_annot_free_text_get_callout_line: Fix wrong static cast + + static_cast always "suceeds" so it makes no sense using it to check if + the callout is multiline or not + + glib/poppler-annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7d7e09cf815c94bb3e50e6ef957dc81a14964f2f +Author: Albert Astals Cid +Date: Sat Feb 20 23:11:29 2021 +0100 + + JPEG2000Stream.cc: Remove useless two if (priv->image) + + We're already inside an if (priv->image) check + + poppler/JPEG2000Stream.cc | 34 ++++++++++++++++------------------ + 1 file changed, 16 insertions(+), 18 deletions(-) + +commit 5161fa6f1ff9f7d2c19b5326aed6ad2858c30476 +Author: Albert Astals Cid +Date: Sat Feb 20 22:30:14 2021 +0100 + + Fix memory leak in broken file in JBIG2Stream::readGenericBitmap + + It could happen that codingLine succeeds but refLine fails because + we're + just on the edge of the allocatable memory so free codingLine just in + case + + poppler/JBIG2Stream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3746704a810fc9a67a91444da300e0683d452e6d +Author: Albert Astals Cid +Date: Sat Feb 20 22:25:06 2021 +0100 + + Gfx: Make clear neither printCommands nor profileCommands change + + poppler/Gfx.cc | 6 ++---- + poppler/Gfx.h | 4 ++-- + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit a622a5a88242fc99c3ce37879337b980458fc4e6 +Author: Albert Astals Cid +Date: Sat Feb 20 22:22:03 2021 +0100 + + Mark Object::streamGetChar[s] as non const + + Calling them twice in a row will potentially return different + things, so + I would say probably don't qualify as const + + poppler/Object.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 5d08242584215a5ccf6201b94ca00d96f48c9c54 +Author: Albert Astals Cid +Date: Sat Feb 20 22:19:08 2021 +0100 + + Fix leak in case of fread failing + + poppler/Form.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 61d052e9aade5bec68b07fad7c0fc7521f8e86a9 +Author: Albert Astals Cid +Date: Sat Feb 20 21:46:19 2021 +0100 + + Make getMin return the min, not the max ^_^ + + poppler/ProfileData.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 94e310e85049ffec92217aa5ac5959dec217fa25 +Author: Albert Astals Cid +Date: Sun Feb 14 12:17:31 2021 +0100 + + Update (C) + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d6cccfb8d814d89c51c9e65563be2e475f46212b +Author: Nelson Benítez León +Date: Mon Feb 8 14:06:15 2021 -0400 + + TextSelectionDumper: Fix getText() for space after word + + Fix TextSelectionDumper::getText() (which is + currently only used by the glib frontend) to + not default to add a space after word in the + case the word is explicitly set to not carry + that space by means of the 'spaceAfter' TextWord + field. + + Fixes issue #1042 + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e7fa274dd7c0bd5e66a3b68329d7d56541bb839b +Author: Kyle Auble +Date: Sat Nov 28 13:42:13 2020 -0500 + + glib: Add deprecation guards for compiler + + glib/poppler-attachment.h | 10 ++++++---- + glib/poppler-document.h | 2 +- + glib/poppler-page.cc | 5 ++++- + glib/poppler-page.h | 4 ++-- + 4 files changed, 13 insertions(+), 8 deletions(-) + +commit db52669444284b8ab00cbb12574496f489b2e093 +Author: Kyle Auble +Date: Wed Oct 28 00:49:42 2020 -0400 + + glib: Update more gtk-doc comments + + Expanding the note for poppler_document_new_from_data() fixes #550. + Formally deprecating it also closes #100 as moot. + + glib/poppler-document.cc | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) + +commit 4d3d3e31c8b1ae0a4169214a0e3f085a8f01f7a9 +Author: Kyle Auble +Date: Tue Oct 27 23:46:09 2020 -0400 + + glib: Deprecate unintentionally public class + + Fixes #33 by settling PopplerAttachmentClass (item 3). + + glib/poppler-attachment.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 133fb388029ec6e124e74b3a4111da20abe9ce7e +Author: Kyle Auble +Date: Tue Oct 27 22:51:59 2020 -0400 + + glib: Document a recently added struct + + glib/poppler-action.h | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +commit f58525e501684358a377b6412ea514a2ed8af333 +Author: Evan Nemerson +Date: Thu Feb 14 03:55:01 2013 -0800 + + glib: add documentation for PopplerActions + + Resolves most of #33 (items 1 & 2) + + Signed-off-by: Kyle Auble + + glib/poppler-action.h | 95 + +++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 93 insertions(+), 2 deletions(-) + +commit e21c83650f15a197b286f8eed8c7d723c6900925 +Author: Oliver Sander +Date: Wed Feb 10 21:36:51 2021 +0100 + + pdftoppm: Fix rounding bug in computation of output bitmap size + + When a specific output image size was requested, the code would use + that size to compute the target resolution, and then use the + resolution to get the image size back. In finite-precision + arithmetic the resulting image size is not necessarily an + integer, and a subsequent call to `ceil` then sometimes lead to + an image size that was 1 larger than what was explicitly + requested. + + Fix this by using a given image size directly, without converting + it to resolution and back. + + BUG: https://gitlab.freedesktop.org/poppler/poppler/issues/927 + + utils/pdftoppm.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 5528ab8a5c274fb8da938bff9ed51e492a39a12b +Author: Albert Astals Cid +Date: Fri Feb 12 14:30:25 2021 +0100 + + pdfseparate: Remove exitCode variable + + utils/pdfseparate.cc | 31 ++++++++++++------------------- + 1 file changed, 12 insertions(+), 19 deletions(-) + +commit 2cc34b8e14649381fc1d8b90c0a861f7fe2c08e3 +Author: Albert Astals Cid +Date: Fri Feb 12 14:27:24 2021 +0100 + + pdftoppm: Remove exitcode variable + + utils/pdftoppm.cc | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) + +commit f51a042ace89c6fa69948356da6f7422a1e9a88b +Author: Albert Astals Cid +Date: Fri Feb 12 14:23:53 2021 +0100 + + pdfunite: remove exitCode variable + + utils/pdfunite.cc | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit 63177bca2e15ce1d75b1e14581664d49c1bf8ed9 +Author: Albert Astals Cid +Date: Sat Feb 13 11:36:01 2021 +0100 + + Update (C) + + utils/pdftoppm.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 282b9ea0c0db18ed8177e2123996569d232c12a0 +Author: Nelson Benítez León +Date: Fri Feb 12 11:47:38 2021 -0400 + + glib: keep same visual appearance between displayed and copied text + + When copying text from displayed document to the clipboard, + we want a normalization that preserves 'canonical equivalence' + i.e. that the text after normalization is not visually + different than the original text. Our previous normalization + was just preserving unicode 'compatibility'. + + Relevant documentation: + * https://www.win.tue.nl/~aeb/linux/uc/nfc_vs_nfd.html + * https://en.wikipedia.org/wiki/Unicode_equivalence + * + https://developer.gnome.org/glib/stable/glib-Unicode-Manipulation.html#g-utf8-normalize + + Issue #724 + + glib/demo/selections.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 2e62feafbc5095cedf948aefdf771d328d978de9 +Author: Albert Astals Cid +Date: Fri Feb 12 14:16:09 2021 +0100 + + Improve well formed check for shading functions + + poppler/GfxState.cc | 191 + ++++++++++++++++++++++++++++++++++++++++++++-------- + poppler/GfxState.h | 16 ++++- + 2 files changed, 176 insertions(+), 31 deletions(-) + +commit 4d45cf37f3f74fdf6b02be73a051631abcf0e665 +Author: Diogo Kollross +Date: Fri Feb 12 14:15:03 2021 +0000 + + pdftoppm: Add -progress option + + utils/pdftoppm.1 | 6 ++++++ + utils/pdftoppm.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +commit 33ae035d03e56e4f37ebb33ac109bbb71084dc93 +Author: Oliver Sander +Date: Thu Feb 11 20:22:36 2021 +0100 + + Make PDFDocBuilder return a std::unique_ptr + + This make the memory ownership cleaner, and allows to simplify + a bit of error handling code in the `utils` directory. + + poppler/CurlPDFDocBuilder.cc | 5 +++-- + poppler/CurlPDFDocBuilder.h | 3 ++- + poppler/LocalPDFDocBuilder.cc | 7 ++++--- + poppler/LocalPDFDocBuilder.h | 3 ++- + poppler/PDFDoc.cc | 6 ++++-- + poppler/PDFDoc.h | 4 ++-- + poppler/PDFDocBuilder.h | 5 ++++- + poppler/PDFDocFactory.cc | 4 ++-- + poppler/PDFDocFactory.h | 6 ++++-- + poppler/StdinPDFDocBuilder.cc | 5 +++-- + poppler/StdinPDFDocBuilder.h | 3 ++- + utils/pdfdetach.cc | 5 ++--- + utils/pdfimages.cc | 30 +++++++++--------------------- + utils/pdfinfo.cc | 11 +++++------ + utils/pdftocairo.cc | 10 ++++------ + utils/pdftohtml.cc | 11 ++++------- + utils/pdftoppm.cc | 39 + +++++++++++++++------------------------ + utils/pdftops.cc | 30 ++++++++++++++---------------- + utils/pdftotext.cc | 9 ++++----- + 19 files changed, 89 insertions(+), 107 deletions(-) + +commit 22abc5e390c10fe09a82912b2636fa6b416980a7 +Author: Albert Astals Cid +Date: Wed Feb 10 00:47:49 2021 +0100 + + Add missing poppler-qt6.pc.cmake + + CMakeLists.txt | 3 +++ + poppler-qt6.pc.cmake | 12 ++++++++++++ + 2 files changed, 15 insertions(+) + +commit 97da689ccc6a1214e17c2f09d28d3d4ad05dfde6 +Author: Albert Astals Cid +Date: Tue Feb 9 00:56:51 2021 +0100 + + Update (C) + + utils/pdftotext.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 2f40575018d75a1412f5c4f8616dfe26d46f504e +Author: William Bader +Date: Mon Feb 8 23:29:05 2021 +0000 + + Add pdftotext -cropbox option + + utils/pdftotext.1 | 3 +++ + utils/pdftotext.cc | 14 ++++++++++---- + 2 files changed, 13 insertions(+), 4 deletions(-) + +commit c72a1c31b40322f660b6529e2dab077d3bf7b79b +Author: Albert Astals Cid +Date: Sun Feb 7 23:47:52 2021 +0100 + + PSOutputDev: Fix stack overflow in broken files + + oss-fuzz/29909 + + poppler/PSOutputDev.cc | 27 ++++++++++++++++++++++----- + poppler/PSOutputDev.h | 1 + + 2 files changed, 23 insertions(+), 5 deletions(-) + +commit 2589f3252fe304bd52be2a9322915c5397be4b09 +Author: Albert Astals Cid +Date: Sun Feb 7 23:37:56 2021 +0100 + + OutputDev:tilingPatternFill pass the GfxTilingPattern + + instead of lots of fields from it + + Makes the signature simpler :) + + poppler/CairoOutputDev.cc | 10 +++++++--- + poppler/CairoOutputDev.h | 11 +++-------- + poppler/Gfx.cc | 3 +-- + poppler/OutputDev.h | 5 ++--- + poppler/PSOutputDev.cc | 10 ++++++++-- + poppler/PSOutputDev.h | 5 ++--- + poppler/PreScanOutputDev.cc | 9 ++++----- + poppler/PreScanOutputDev.h | 5 ++--- + poppler/SplashOutputDev.cc | 11 +++++++---- + poppler/SplashOutputDev.h | 5 ++--- + utils/ImageOutputDev.cc | 5 ++--- + utils/ImageOutputDev.h | 5 ++--- + 12 files changed, 42 insertions(+), 42 deletions(-) + +commit 0ea6219dd1f2531d44eacfc584e331ecb4b46fb8 +Author: Albert Astals Cid +Date: Sun Feb 7 18:59:24 2021 +0100 + + CharCodeToUnicode::parseCMap1: Bring back the delete + + For some reason i deleted it on the previous commit + + poppler/CharCodeToUnicode.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 41f5acecf50aa6b16f95aca557dbcf6b49b8f394 +Author: Albert Astals Cid +Date: Sat Feb 6 23:58:07 2021 +0100 + + Fix parsing text in some broken pdf files + + Workaround imported from xpdf 4.02 + + Fixes issue #1040 + + poppler/CharCodeToUnicode.cc | 112 + ++++++++++++++++++++++++++++++++++++++++--- + poppler/CharCodeToUnicode.h | 5 +- + 2 files changed, 108 insertions(+), 9 deletions(-) + +commit 5b8f942fe4b9e0d3aeed3422b92362018d88429c +Author: Albert Astals Cid +Date: Wed Feb 3 22:05:42 2021 +0100 + + CI: new clang-format + + .gitlab-ci.yml | 4 ++-- + README.contributors | 2 +- + poppler/Annot.cc | 21 +++++++++++---------- + poppler/Catalog.cc | 8 ++++++-- + 4 files changed, 20 insertions(+), 15 deletions(-) + +commit b876a31407279329c75bc7ddf541c8c5af07152b +Author: Albert Astals Cid +Date: Mon Feb 1 22:23:11 2021 +0100 + + poppler 21.02.0 + + CMakeLists.txt | 4 ++-- + NEWS | 19 +++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 23 insertions(+), 4 deletions(-) + +commit 91de00020cdb7689692f3af3fde6decbdb22fc4e +Author: Albert Astals Cid +Date: Wed Jan 27 23:34:51 2021 +0100 + + Update (C) + + poppler/GfxState.cc | 2 +- + poppler/GfxState.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 129905529ddfe926b252d278b7a55dd83f432f55 +Author: Philipp Knechtges +Date: Wed May 27 22:24:57 2020 +0200 + + GfxCal*ColorSpace: introduce Bradford transform for chromatic + adaptation + + This brings the lcms2 code path and the non-lcms2 code path closer + to each + other in terms of color reproduction. + So far the following points were missing, which are now added in + this commit: + - Both code paths did either not adjust for a different source white + point at all (lcms2 code path) + or did some simple scaling. The code has now been adjusted to use + the Bradford transform + to adapt to either the D50 or D65 white point, depending on the + code path. + - The non-lcms2 code path so far used the square root as an + approximate gamma function. + The correct sRGB gamma function has now been added. + + poppler/GfxState.cc | 182 + +++++++++++++++++++++++++++++++++------------------- + poppler/GfxState.h | 3 - + 2 files changed, 115 insertions(+), 70 deletions(-) + +commit 222f96edc379d94661f5cab4c22c8cc9122d6e21 +Author: Albert Astals Cid +Date: Mon Jan 18 00:33:49 2021 +0100 + + qt: Fix regression in QIODeviceOutStream + MSVC + + vsnprintf actually works fine than qvsnprintf on MSVC nowadays so use + that + + qt5/src/poppler-qiodeviceoutstream.cc | 8 ++++---- + qt6/src/poppler-qiodeviceoutstream.cc | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit 7c6a8b90ebaf2d5aaad8d2643601e59fa2cc4a0e +Author: Albert Astals Cid +Date: Mon Jan 18 00:13:08 2021 +0100 + + Make checkedAdd work for long long in MSVC + + goo/GooCheckedOps.h | 22 +++++++++++++++++++++- + 1 file changed, 21 insertions(+), 1 deletion(-) + +commit 6fed4c9ff25fd99e164c94519128803db0593e96 +Author: Albert Astals Cid +Date: Sat Jan 16 12:31:36 2021 +0100 + + FoFiTrueType::cvtSfnts: Fix uninitialized memory read on broken files + + Initialize maxUsedGlyph after the early check returns + + oss-fuzz/29629 + + fofi/FoFiTrueType.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 051cae3b34226953aa0381f850e8e6eaa0b564bd +Author: Albert Astals Cid +Date: Sat Jan 16 00:11:37 2021 +0100 + + qt: Properly export NewSignatureData + + qt5/src/poppler-qt5.h | 4 ++-- + qt6/src/poppler-qt6.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit d776dafbd40e75f35d6a6fc6cb012f158ee1409d +Author: Albert Astals Cid +Date: Fri Jan 15 16:41:25 2021 +0100 + + Splash: fix uninitialized memory read on broken files + + oss-fuzz/23086 + + splash/Splash.cc | 47 +++++++++++++++++++++++++++++++---------------- + splash/Splash.h | 12 ++++++------ + 2 files changed, 37 insertions(+), 22 deletions(-) + +commit 4becde57a2fdfd095e400dd9ef64e64d5e94f858 +Author: Albert Astals Cid +Date: Fri Jan 15 16:08:15 2021 +0100 + + CCITTFaxStream: Fix uninitialized memory read in broken files + + oss-fuzz/8795 + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c0f34e983761b15e2c9d5fa6628f26fa7d362548 +Author: Albert Astals Cid +Date: Fri Jan 15 16:04:46 2021 +0100 + + Relax the check in Gfx::opSetFillGray + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 548fe49fa53ff0ff63bc1a437ab04908f866cb87 +Author: Albert Astals Cid +Date: Fri Jan 15 16:01:01 2021 +0100 + + Gfx::opSetFillRGBColor: Fix uninitialized memory read in bad files + + Make sure colorspace doesn't need more comps than we have + + oss-fuzz/29522 + + poppler/Gfx.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3252bc323c814eb010df011024f06597755b4b7d +Author: Albert Astals Cid +Date: Sun Jan 10 20:15:39 2021 +0100 + + Don't try to read xref at negative stream positions + + oss-fuzz/29460 + + poppler/XRef.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit fec79bfc7ed1573a8d92ac77bcb225dd032db296 +Author: Albert Astals Cid +Date: Sun Jan 10 19:45:23 2021 +0100 + + FoFiTrueType::cvtSfnts: Fix uninitialized memory read on broken files + + oss-fuzz/29386 + + fofi/FoFiTrueType.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit e68410e359da932c7f30d8f0a41a5496268b339c +Author: Albert Astals Cid +Date: Sat Jan 9 17:34:55 2021 +0100 + + Gfx::opSetFillGray: Make sure the colorspace is gray + + Otherwise we will end up doing an uninitialized memory read down the + road + + oss-fuzz/10040 + + poppler/Gfx.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9dcf1e396a240df50bcc05339855732d1535260b +Author: Albert Astals Cid +Date: Sat Jan 9 17:34:29 2021 +0100 + + Update (C) + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 60fb23c1d9530bb37558af38d4f616d984a42586 +Author: Albert Astals Cid +Date: Sat Jan 9 11:24:30 2021 +0100 + + XRef::readXRef: Improve overflow check + + oss-fuzz/11744 + + poppler/XRef.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit a8fdb464e8c1ccc920c064324d7289fa05c1cf1d +Author: Albert Astals Cid +Date: Fri Jan 8 16:27:50 2021 +0100 + + Also protect against malformed GfxPatchMeshShading + + oss-fuzz/11197 + + poppler/GfxState.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit f1b21278330a1a1f275f224a2ffd56dff45c5b4c +Author: Albert Astals Cid +Date: Fri Jan 8 16:12:28 2021 +0100 + + GfxDeviceNColorSpace: Shift the validity check to the constructor + + poppler/GfxState.cc | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit 2308e6fbb6f5afa20bb59ef3378fdb63de74c436 +Author: Albert Astals Cid +Date: Fri Jan 8 13:55:40 2021 +0100 + + Fix uninitialized memory read on broken files + + oss-fuzz/10059 + + poppler/GfxState.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 04035f915627a7e470a5509bccffedefb845d786 +Author: Albert Astals Cid +Date: Thu Jan 7 00:09:26 2021 +0100 + + JBIG2Stream: Protect against yet another potential overflow + + oss-fuzz/29335 + + poppler/JBIG2Stream.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 562770a741b9613b4e015b60e60d6ced1ac8926b +Author: Albert Astals Cid +Date: Thu Jan 7 00:04:25 2021 +0100 + + PSOutputDev: Fix memory leak on broken files + + oss-fuzz/29330 + + poppler/PSOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 5c28b47bb4e89d10f82d80d3664384149f8f768d +Author: Albert Astals Cid +Date: Wed Jan 6 12:08:39 2021 +0100 + + Fix leak introduced in 0e6c3ff9bb4390d2b426a4cddbb638c19811055d + + oss-fuzz/29305 + + poppler/GfxState.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 2b82271415000e776b54f0214d564d28170d9c6b +Author: Albert Astals Cid +Date: Wed Jan 6 00:06:03 2021 +0100 + + JBIG2Stream::readTextRegion: Fix yet another potential integer + overflow + + oss-fuzz/27783 + + poppler/JBIG2Stream.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit d0497325555d60c8c44f8945f5a99ab6a4d7c252 +Author: Albert Astals Cid +Date: Tue Jan 5 23:55:46 2021 +0100 + + Generalize the EOFStream wrapping EOFStream code + + poppler/Stream.cc | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +commit 6c9f9a491a221fb1fccfe758bc92308ff1a692d1 +Author: Albert Astals Cid +Date: Tue Jan 5 13:10:30 2021 +0100 + + FoFiType1C::cvtGlyph: Fix uninitialized memory read on broken files + + oss-fuzz/29269 + + fofi/FoFiType1C.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit d5ac5a3aef453a55c175cb091e304cc463dd0ef8 +Author: Albert Astals Cid +Date: Tue Jan 5 13:07:04 2021 +0100 + + Fix two k that should have been k+1 + + fofi/FoFiType1C.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0e6c3ff9bb4390d2b426a4cddbb638c19811055d +Author: Albert Astals Cid +Date: Tue Jan 5 00:09:43 2021 +0100 + + Check obj1 is a stream before getting the stream + + It seems we already did this check a few lines above, and indeed + we did, + but on very broken documents, if arr[1] is a Ref, getting objects may + end up in a reconstruct xref call which may end up changing the + type of + arr[1] the next time we ask for it + + oss-fuzz/29260 + + poppler/GfxState.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 3ac779d9a9d2c63433d3765c82a2724947d86a15 +Author: Albert Astals Cid +Date: Mon Jan 4 23:54:52 2021 +0100 + + FoFiTrueType::parse: If we don't have tables parsing didn't succeed + + oss-fuzz/29217 + + fofi/FoFiTrueType.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e4346ae34b24ce84a4aeae539f26cab49497450c +Author: Albert Astals Cid +Date: Mon Jan 4 23:39:54 2021 +0100 + + PSOutputDev: protect against potential divide by 0 + + oss-fuzz/29241 + + poppler/PSOutputDev.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 9bb28091b64c1b19dcdccb63d50593abc15f627a +Author: Albert Astals Cid +Date: Mon Jan 4 23:24:36 2021 +0100 + + JBIG2Stream::readSymbolDictSeg: Return early if one of the bitmaps + is null + + Doesn't seem to regress any of the valid files i have and saves some + broken ones that loop for hours + + poppler/JBIG2Stream.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit e126be08ea94d829a2d25aabb2ef79cc7bf65d4c +Author: Albert Astals Cid +Date: Mon Jan 4 18:05:44 2021 +0100 + + SplashXPathScanner: If any of the segments of the path is nan, + path is not valid + + Fixes crash in broken files #1022 + + splash/SplashXPathScanner.cc | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit 43126be585e587f6f571a0170f0f63098b82d064 +Author: Albert Astals Cid +Date: Sun Jan 3 22:33:30 2021 +0100 + + PSOutputDev: Fix memory leak on broken files + + oss-fuzz/29201 + + poppler/PSOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 8f599d8caf35911f168fd9dbc99a68dc1ac12a1c +Author: Oliver Sander +Date: Sun Jan 3 08:56:17 2021 +0100 + + JBIG2Stream: Store segments as std::unique_ptrs + + This makes the memory handling more error-proof, because + all necessary calls to 'delete' happen automatically. + + This patch introduces several calls to std::unique_ptr::release, + and hence break the explicit ownership chain established + by using std::unique_ptr. Not all of the calls are strictly + necessary, but without them the patch would get a lot + bigger than it is. Better keep that for another day. + + poppler/JBIG2Stream.cc | 125 + +++++++++++++++++++------------------------------ + poppler/JBIG2Stream.h | 18 ++++--- + 2 files changed, 56 insertions(+), 87 deletions(-) + +commit bc6acbfff6afa7d720abe7f79abe02e5a6591ef4 +Author: Albert Astals Cid +Date: Sun Jan 3 19:20:45 2021 +0100 + + PSOutputDev: fix a few integer overflows + + Now that we have oss-fuzz coverage i guess more will be coming + soon ^_^ + + oss-fuzz/29199 + + poppler/PSOutputDev.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit af267b33cc42ccb9d1a89e06fed1481657c4b3f0 +Author: Albert Astals Cid +Date: Sun Jan 3 12:25:01 2021 +0100 + + Update (C) + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 72183a3ff881316bb470cc0f6db08cf9ef044e53 +Author: Albert Astals Cid +Date: Sun Jan 3 12:10:55 2021 +0100 + + Don't wrap EOFStream in an EOFStream + + It's unneeded and can be relatively easily used to create stack + overflows + + oss-fuzz/29184 + + poppler/Stream.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit bae34cd97a94ff9aa7ad9458f04e494451828b0d +Author: Albert Astals Cid +Date: Sun Jan 3 01:42:06 2021 +0100 + + fuzz the ps converter code + + qt5/tests/fuzzing/qt_pdf_fuzzer.cc | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +commit 04aa2f7e416eb232821576fec7ed61b0b7273fbc +Author: Albert Astals Cid +Date: Sun Jan 3 01:06:39 2021 +0100 + + CI: Enable goostring-format-checker clang checker + + .gitlab-ci.yml | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4d58ff810bb977855c55d4de7d75899aa9ef55b7 +Author: Albert Astals Cid +Date: Sun Jan 3 01:05:01 2021 +0100 + + Change a few variables to types GooString::format knows about + + None of them is problematic, but being more strict let's use + enable the + goostring-format-checker clang plugin + + poppler/CurlCachedFile.cc | 6 +++--- + poppler/DateInfo.cc | 3 ++- + poppler/PSOutputDev.cc | 5 +++-- + 3 files changed, 8 insertions(+), 6 deletions(-) + +commit 6b4f07ad1b74a2fa715d76d9da9cef3a2670d92c +Author: Albert Astals Cid +Date: Sun Jan 3 01:02:53 2021 +0100 + + HtmlOutputDev: Fix error() parameter type + + This would cause a crash if that error() is ever called + + utils/HtmlOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3928dde50bfd44d340ef0cb302610cbcf9bece58 +Author: Albert Astals Cid +Date: Sun Jan 3 00:09:22 2021 +0100 + + Account for fread potentially failing + + poppler/Form.cc | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit ec9420b76c6a1dfc7101b03f475fa0c91fa49a47 +Author: Albert Astals Cid +Date: Sun Jan 3 00:04:17 2021 +0100 + + Account for Gfseek potentially failing + + poppler/Form.cc | 34 ++++++++++++++++++++++++++-------- + 1 file changed, 26 insertions(+), 8 deletions(-) + +commit 7e4ec140d1cc6bef375e38f3cf3f613dd7c88bbb +Author: Albert Astals Cid +Date: Sat Jan 2 23:53:32 2021 +0100 + + FormWidgetSignature::signDocument: Fix resource leak if something + goes wrong + + poppler/Form.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 43b5a94a610ce8fbb3d017bcdee85ac8f0be5ea4 +Author: Albert Astals Cid +Date: Sat Jan 2 23:43:58 2021 +0100 + + Fix potential memory leak in FormWidgetSignature::updateOffsets + + poppler/Form.cc | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +commit 27258358cd0b82a762382b8f0aafe06abd698484 +Author: Albert Astals Cid +Date: Sat Jan 2 23:36:06 2021 +0100 + + clang api changes + + test/goostring-format-checker/README | 2 +- + test/goostring-format-checker/goostring-format-checker.cc | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit db171f489ca532e48a1c44e2e3dfb9c069754582 +Author: Albert Astals Cid +Date: Sat Jan 2 23:03:29 2021 +0100 + + Fix memory leak if saving the file fails + + poppler/Form.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 0a1174ff7043cbdc7195a5df562a96bd0033cb95 +Author: Albert Astals Cid +Date: Sat Jan 2 22:15:39 2021 +0100 + + Rework a bit the "infinite" recursion detection of Gfx + + Instead of counting drawForm calls, count non toplevel display calls + + Remove a check from Gfx::doSoftMask which doesn't seem like it + would do + anything, let's hope the automatic fuzzer finds out if it does, + git log + says it comes from the xpdf3.02 merge + + This fixes issue #1021 + + poppler/Gfx.cc | 31 ++++++++++++------------------- + poppler/Gfx.h | 4 ++-- + 2 files changed, 14 insertions(+), 21 deletions(-) + +commit cc947b5de9fb83d602bd62d74fd691e3581bc47a +Author: Oliver Sander +Date: Sat Jan 2 12:21:34 2021 +0100 + + JBIG2Stream: Don't allocate codeTables on the heap + + The codeTables objects are of type std::vector, and therefore + consist of little more than a size and a data pointer. + Allocating them on the stack (i.e., as values) avoids one + indirection, avoids potential memory leaks, and makes the + code easier to read. + + poppler/JBIG2Stream.cc | 67 + +++++++++++++++++++++----------------------------- + 1 file changed, 28 insertions(+), 39 deletions(-) + +commit 3b82fb789116c805b0a69f6bf3a72466a1e87308 +Author: Albert Astals Cid +Date: Sat Jan 2 17:54:42 2021 +0100 + + poppler 21.01.0 + + CMakeLists.txt | 8 ++++---- + NEWS | 26 ++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt6/src/CMakeLists.txt | 2 +- + 6 files changed, 34 insertions(+), 8 deletions(-) + +commit da3ffc4ece56abfd4387ad30d0707d46a81396fb +Author: Albert Astals Cid +Date: Fri Jan 1 18:49:44 2021 +0100 + + Update (C) + + https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/742/diffs + was in 2020 + + poppler/JBIG2Stream.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 65c8152e0935dda215901a479abd8d5165aa0239 +Author: Albert Astals Cid +Date: Fri Jan 1 18:28:46 2021 +0100 + + Update (C) + + poppler/JBIG2Stream.cc | 2 +- + poppler/JBIG2Stream.h | 2 +- + poppler/Stream.cc | 2 +- + poppler/Stream.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit deb70d33df07dda0e97e1d551f013a3b008f830a +Author: Albert Astals Cid +Date: Fri Jan 1 17:57:59 2021 +0100 + + Welcome 2021 + + poppler/poppler-config.h.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b8de1a1914e76642cafbbfa436f31be22e53e54f +Author: Oliver Sander +Date: Fri Jan 1 16:57:13 2021 +0000 + + JBIG2Stream: Fix byte counting + + The JBIG2Stream::readSegments method contains a check for whether + the number of bytes read actually matches the official size + of the segment. This check would fail occasionally, because + apparently the bytes read were (sometimes) counted wrongly. + + Fix this by importing the corresponding explicit byte counting + code from xpdf-4.02. + + BUGS: https://gitlab.freedesktop.org/poppler/poppler/-/issues/1005 + + poppler/JBIG2Stream.cc | 83 + ++++++++++++++++++++++++++------------------------ + poppler/JBIG2Stream.h | 1 + + poppler/Stream.cc | 19 ++++++++++++ + poppler/Stream.h | 5 +++ + 4 files changed, 68 insertions(+), 40 deletions(-) + +commit 51151d41429de809235492bece87dd2d726c1a4e +Author: mrbax <12640-mrbax@users.noreply.gitlab.freedesktop.org> +Date: Sat Dec 12 22:08:47 2020 +0100 + + pdfimages: Account for rotation in PPI calculation + + Closes: https://gitlab.freedesktop.org/poppler/poppler/-/issues/3 + + utils/ImageOutputDev.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit cab257727998251bb29e9f150fd5df69d08a2758 +Author: Albert Astals Cid +Date: Wed Dec 23 19:29:10 2020 +0100 + + Stop using std::codecvt_utf16 in fromDecimal + + It's deprecated since C++17 and since we only care about numbers + we can + just remove the first byte of the utf16 and treat it as a regular + string + + ConfigureChecks.cmake | 1 - + config.h.cmake | 3 --- + poppler/PageLabelInfo.cc | 2 +- + poppler/PageLabelInfo_p.h | 45 + ++++++++++++++++++++------------------- + qt5/tests/check_pagelabelinfo.cpp | 10 ++------- + qt6/tests/check_pagelabelinfo.cpp | 10 ++------- + 6 files changed, 28 insertions(+), 43 deletions(-) + +commit 8846eb5d2e1466cf0aaa1f38d5452b60c47bd9dc +Author: Albert Astals Cid +Date: Wed Dec 30 17:37:41 2020 +0100 + + QIODeviceOutStream: allocate memory dynamically + + Instead of using a fixed size array. + + I've only seen this being problematic in oss-fuzz created files, + but I don't see why an actual file wouldn't create issues here too, + so even if this is a bit slower, be on the safe side. + + qt5/src/poppler-qiodeviceoutstream.cc | 20 +++++++++++++++----- + qt6/src/poppler-qiodeviceoutstream.cc | 20 +++++++++++++++----- + 2 files changed, 30 insertions(+), 10 deletions(-) + +commit 3cb5d2531fd63bf136b016462c627ad45919a7ca +Author: Oliver Sander +Date: Wed Dec 30 07:08:52 2020 +0100 + + Fix regression in JBIG2Stream.cc + + The recent commit 216ae4f058d2652f1795c7f840014cc69ee06408 + broke reading of certain JBIG2 images. This commit fixes + it again, by bringing the JBIG2Stream::reset() method + back in line with what xpdf-4.02 does. + + poppler/JBIG2Stream.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 72827b0c11dc18a7eb6fce89c0e9877a8f3fc820 +Author: Albert Astals Cid +Date: Tue Dec 29 23:50:05 2020 +0100 + + qt: Account for catalog potentially lacking AcroForm + + qt5/src/poppler-document.cc | 7 +++++-- + qt6/src/poppler-document.cc | 7 +++++-- + 2 files changed, 10 insertions(+), 4 deletions(-) + +commit 1a7f9af090a079367f162a9a6b347e8f88ea6c0f +Author: Albert Astals Cid +Date: Tue Dec 29 23:31:30 2020 +0100 + + Update (C) + + poppler/PDFDoc.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0f24db9612fafdc321e49f6ddfc6553284149724 +Author: Adam Sampson +Date: Sun Dec 27 17:42:21 2020 +0000 + + PDFDoc::setup: Always set errCode on failure + + When something goes wrong, this function should return false and set + errCode to indicate what went wrong. The two new checks added at + the top + didn't set errCode. + + poppler/PDFDoc.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 216ae4f058d2652f1795c7f840014cc69ee06408 +Author: Oliver Sander +Date: Mon Dec 21 18:18:51 2020 +0100 + + JBIG2Stream: Do not allocate std::vector objects on the heap + + This left-over from GooList times is just one pointless + layer of indirection. + + poppler/JBIG2Stream.cc | 50 + ++++++++++++++++++++++---------------------------- + poppler/JBIG2Stream.h | 4 ++-- + 2 files changed, 24 insertions(+), 30 deletions(-) + +commit 3fb0f4bdff02ccd178ba9fd58c449001c8b5c0ea +Author: Albert Astals Cid +Date: Sun Dec 27 19:41:15 2020 +0100 + + Fix integer overflow with broken files + + oss-fuzz/29020 + + poppler/JBIG2Stream.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 439440930cd4679076befe8850f39575869c4af1 +Author: Albert Astals Cid +Date: Sun Dec 27 00:52:08 2020 +0100 + + Update (C) + + poppler/Annot.cc | 1 + + poppler/XRef.cc | 1 + + utils/pdftoppm.cc | 1 + + 3 files changed, 3 insertions(+) + +commit 94fea737473dd513438b7fb89347c6f1273e61b3 +Author: Philipp Knechtges +Date: Wed Dec 2 01:04:47 2020 +0100 + + pdftoppm/pdftops: move shared ICC profile checks to their own file + + utils/CMakeLists.txt | 2 ++ + utils/pdftoppm.cc | 43 +++++++----------------------------------- + utils/pdftops.cc | 40 ++++----------------------------------- + utils/sanitychecks.cc | 52 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + utils/sanitychecks.h | 30 +++++++++++++++++++++++++++++ + 5 files changed, 95 insertions(+), 72 deletions(-) + +commit 3ea4508575167ec67583d3ed13efa100b8985b92 +Author: Philipp Knechtges +Date: Wed Sep 30 21:40:39 2020 +0200 + + pdftops: add options to set DeviceGray/DeviceRGB/DeviceCMYK to the CLI + + poppler/PSOutputDev.cc | 3 ++ + utils/pdftops.1 | 12 ++++++++ + utils/pdftops.cc | 82 + +++++++++++++++++++++++++++++++++++++++++++++++--- + 3 files changed, 92 insertions(+), 5 deletions(-) + +commit 66eab5dab46d84b11d3eaa3ee107cb370061e39e +Author: Philipp Knechtges +Date: Wed Sep 30 21:39:19 2020 +0200 + + PSOutputDev: allow ICCBased color spaces with invalid Ref to be + embedded + + poppler/PSOutputDev.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 0d6a3dd991efff3126a1cb9b4de21a2c6db6fb45 +Author: Philipp Knechtges +Date: Wed Sep 30 15:47:06 2020 +0200 + + pdftoppm: add options to set DeviceGray/DeviceRGB/DeviceCMYK to + the CLI + + utils/pdftoppm.1 | 12 +++++++++ + utils/pdftoppm.cc | 76 + +++++++++++++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 83 insertions(+), 5 deletions(-) + +commit 1feeda46eb7c02092855c8d609cd493d9cfee18a +Author: Philipp Knechtges +Date: Wed Sep 30 13:56:43 2020 +0200 + + Introduce options to set fallback DefaultGray/DefaultRGB/DefaultCMYK + color spaces to ICC profiles + + This will allow for a fully color-managed workflow in cases where + the pdf does not specify default + color spaces. + + poppler/Gfx.cc | 12 ++--- + poppler/GfxState.cc | 123 + ++++++++++++++++++++++++++++++++-------------------- + poppler/GfxState.h | 36 +++++++++++++++ + poppler/OutputDev.h | 34 +++++++++++++++ + 4 files changed, 153 insertions(+), 52 deletions(-) + +commit 5dc1f4876031f0dc9fc09c89691c30c99a6ec418 +Author: Nelson Benítez León +Date: Fri Dec 25 22:19:43 2020 -0400 + + Annots: check for form object + + before calling methods on it, because + by de-facto it's possible for a pdf + to have form fields but not have a + Catalog root Form object. + + Fixes crash from issue #1018 + + poppler/Annot.cc | 31 +++++++++++++++++++++---------- + 1 file changed, 21 insertions(+), 10 deletions(-) + +commit 8ba1a7c24f4e62783135face9a10b1fa6a764015 +Author: William Bader +Date: Fri Dec 25 02:23:37 2020 +0000 + + Avoid testing xrefHasChanges each iteration in + 407293bfb9108c9d9e2611a294b389ed9c593900 + + poppler/XRef.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit d87e3d78d6d2323b1236dede9ada5bc1d7c74af1 +Author: Albert Astals Cid +Date: Fri Dec 25 11:07:13 2020 +0100 + + Update (C) + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3a54ead84365fe41c07fa9c9f82c1afbb8f9c140 +Author: William Bader +Date: Fri Dec 25 01:57:37 2020 +0000 + + Place the faster colorspace test first in + 0cd75023d84baf9d996c0f55da5ea9bd4c2d3b33 + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e41020a290694c8cab589ab3858d4ac12d87f9cd +Author: Albert Astals Cid +Date: Thu Dec 24 11:05:44 2020 +0100 + + Update (C) + + poppler/GfxState.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0cd75023d84baf9d996c0f55da5ea9bd4c2d3b33 +Author: Thomas Freitag +Date: Thu Dec 24 09:41:03 2020 +0000 + + don't use colorspace2 optimization if caller wants the spot colorants + + poppler/GfxState.cc | 2 +- + poppler/GfxState.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 4f478daa6a9734b8f269a6586bdce2909844bb6f +Author: Albert Astals Cid +Date: Wed Dec 23 23:52:58 2020 +0100 + + Fix opening files by some generators that are a bit broken + + But Adobe opens it and it's easy to fix + + poppler/XRef.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 3cc28b66132e66ed2dfe13a9a285ac41ac7267d5 +Author: Albert Astals Cid +Date: Wed Dec 23 23:27:02 2020 +0100 + + FoFiType1C: Fix crashes with broken files + + fofi/FoFiType1C.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 629d8aa142c27a36cb2cd123c8391bcfbd3f3e23 +Author: Albert Astals Cid +Date: Wed Dec 23 00:01:46 2020 +0100 + + GfxCIDFont::GfxCIDFont: Fix Integer-overflow on broken files + + oss-fuzz/28884 + + poppler/GfxFont.cc | 30 ++++++++++++++++-------------- + 1 file changed, 16 insertions(+), 14 deletions(-) + +commit 1c0c2ce5ddee5fb7cf695dc6005ab84b9ae9eb9c +Author: Albert Astals Cid +Date: Tue Dec 22 23:10:27 2020 +0100 + + Update (C) + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 238dc045beeeb1eb619f3fb6cb699ba36813222d +Author: Albert Astals Cid +Date: Mon Dec 21 22:57:44 2020 +0100 + + Fix infinite looping in cvtGlyph with broken files + + fofi/FoFiType1C.cc | 20 +++++++++++++++----- + fofi/FoFiType1C.h | 4 +++- + 2 files changed, 18 insertions(+), 6 deletions(-) + +commit 4c81b06626a50af68f0cf1c0f77caf434e46f67d +Author: Thomas Freitag +Date: Mon Dec 21 08:39:39 2020 +0100 + + add white point correction when lcms is used + + poppler/GfxState.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 20cc0c2a59d330b44306ef21e6c191f4e3ddaff5 +Author: Albert Astals Cid +Date: Mon Dec 21 18:46:56 2020 +0100 + + Update (C) + + poppler/DCTStream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 11b2bc1b67a306af3ee5a731c95e856728b32bff +Author: Albert Astals Cid +Date: Mon Dec 21 18:37:01 2020 +0100 + + CI: Seems debian unstable clazy got fixed + + .gitlab-ci.yml | 1 - + 1 file changed, 1 deletion(-) + +commit 52808e8d56606d009a2cb15a1963fe87ff29e040 +Author: Albert Astals Cid +Date: Sun Dec 20 23:39:40 2020 +0100 + + CI: Use clazy from debian:testing for now, unstable is broken + + .gitlab-ci.yml | 1 + + 1 file changed, 1 insertion(+) + +commit ae614bf8ab42c9d0c7ac57ecdfdcbcfc4ff6c639 +Author: Albert Astals Cid +Date: Sun Dec 20 23:15:12 2020 +0100 + + Fix DCTStream::getChars we're reading past the buffer check + + I wonder how this had never crashed before :S + + Fixes #1011 + + poppler/DCTStream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e1f562582db4ed902989e23f7a02645a51da8e88 +Author: Albert Astals Cid +Date: Sat Dec 19 19:06:01 2020 +0100 + + Update (C) + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 009fab09ae7ec188b4ead67b006ac11d0f518b08 +Author: Oliver Sander +Date: Sat Dec 19 10:10:04 2020 +0100 + + JBIG2Reader: Handle segment type 51 ('end of file') + + Imported from xpdf-4.02. + + poppler/JBIG2Stream.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 6ec2556be99a908e4be7f775bafdb8e3b4cbd886 +Author: Oliver Sander +Date: Sat Dec 19 09:55:08 2020 +0100 + + JBIG2Reader: Fix binary constant + + When comparing the file JBIG2Reader.cc with what is in xpdf-4.02, + I noticed that a particular constant used in the method + readGenericBitmap differs in poppler and xpdf. I have no idea + what that constant is good for, but in a comment both poppler + and xpdf give the binary representation of that constant. + That binary number is identical in poppler and xpdf, and it + matches the value in xpdf, but is off-by-one in poppler. + This leads me to believe that the value in poppler wrong, + possibly a typo. + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c71de2436a390f6d6db4f8d0f29887bfa574df78 +Author: Albert Astals Cid +Date: Fri Dec 18 14:04:11 2020 +0100 + + qt: Mark file internal function as static + + qt5/src/poppler-annotation.cc | 2 +- + qt6/src/poppler-annotation.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 6133bc0f3a2cb3b2c185c81367cbac9d72f11bbd +Author: Albert Astals Cid +Date: Fri Dec 18 13:53:46 2020 +0100 + + qt: The signing code will be in 21.01 not 20.12 + + qt5/src/poppler-form.h | 14 +++++++------- + qt5/src/poppler-qt5.h | 4 ++-- + qt6/src/poppler-form.h | 14 +++++++------- + qt6/src/poppler-qt6.h | 4 ++-- + 4 files changed, 18 insertions(+), 18 deletions(-) + +commit fbc4d13d075ff30d6fccb5b81d8f3b8b19d673cb +Author: Albert Astals Cid +Date: Fri Dec 18 13:40:49 2020 +0100 + + qt6: Port the signing code from qt5 + + qt6/src/poppler-annotation-private.h | 4 +- + qt6/src/poppler-annotation-private.h.orig | 115 ---------------- + qt6/src/poppler-annotation.cc | 18 ++- + qt6/src/poppler-annotation.h | 2 + + qt6/src/poppler-document.cc | 2 + + qt6/src/poppler-form.cc | 119 +++++++++++++++- + qt6/src/poppler-form.h | 55 ++++++++ + qt6/src/poppler-pdf-converter.cc | 220 + +++++++++++++++++++++++++++++- + qt6/src/poppler-qt6.h | 83 +++++++++++ + 9 files changed, 489 insertions(+), 129 deletions(-) + +commit c38694aed09336232757316321d2fa84c5f2bf57 +Author: Albert Astals Cid +Date: Thu Dec 17 19:36:05 2020 +0100 + + Fix integer overflow on broken files + + oss-fuzz/28749 + + poppler/JBIG2Stream.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 407293bfb9108c9d9e2611a294b389ed9c593900 +Author: Albert Astals Cid +Date: Wed Dec 16 10:21:31 2020 +0100 + + Fix potential data loss if we try to fetch a non existing Ref after + modifying the document + + poppler/XRef.cc | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit b162c71038795a3bda642ba73d1ce619c3ad45ee +Author: Albert Astals Cid +Date: Sun Dec 13 23:33:48 2020 +0100 + + Update (C) + + poppler/DCTStream.cc | 1 + + poppler/DCTStream.h | 1 + + poppler/GfxState.cc | 1 + + 3 files changed, 3 insertions(+) + +commit f1c3ded779582aef5f2cbaf29bc5da7a8eae6f69 +Author: Lluís Batlle i Rossell +Date: Sun Dec 13 22:21:13 2020 +0000 + + Faster routines for jpeg decoding + + linux 'perf' indicated a bottleneck in getChars + + poppler/DCTStream.cc | 66 ++++++++++++++--------------- + poppler/DCTStream.h | 1 + + poppler/GfxState.cc | 116 + ++++++++++++++++++++++++++++++++------------------- + 3 files changed, 105 insertions(+), 78 deletions(-) + +commit 73105150eb36d295d5574564421638ce34277fd5 +Author: Albert Astals Cid +Date: Sat Dec 5 19:53:29 2020 +0100 + + CMap: remove unused function + + poppler/CMap.cc | 102 + ++---------------------------------------------- + poppler/CMap.h | 11 +----- + poppler/GlobalParams.cc | 4 +- + poppler/GlobalParams.h | 2 +- + 4 files changed, 9 insertions(+), 110 deletions(-) + +commit b0cb69a9a2c8df870371ad329b39d7ee9ae769c4 +Author: Albert Astals Cid +Date: Fri Dec 4 00:08:23 2020 +0100 + + AnnotWidget: Don't add two Resources dicts when form has + getDefaultResourcesObj + + Previously one was added in drawSignatureFieldText and another one + later generateFieldAppearance if it had default, now we pass the + default (or an empty one down) to the drawSignatureFieldText so that + it doesn't get duplicated. + + Also fix createAnnotDrawFont to check if there's a Font Dict before + adding it + + poppler/Annot.cc | 43 ++++++++++++++++++++++++------------------- + poppler/Annot.h | 4 ++-- + 2 files changed, 26 insertions(+), 21 deletions(-) + +commit af32e8c33e8372b8e500eb6163c92e4059350b74 +Author: Albert Astals Cid +Date: Mon Nov 30 14:32:48 2020 +0100 + + qt5: Add API to know if NSS support is built in + + Otherwise we can't know if getAvailableSigningCertificates returns + empty + because you don't have any signature or because you don't have NSS + support built in + + qt5/src/poppler-form.cc | 9 +++++++++ + qt5/src/poppler-form.h | 7 +++++++ + 2 files changed, 16 insertions(+) + +commit 49ec8c262b4b81c66f42a6d7b2960ce390cad7c4 +Author: Albert Astals Cid +Date: Thu Nov 26 23:53:49 2020 +0100 + + XRef: Fix wrong memory read on destruction + + when there's some objects that have been added and then removed + + poppler/XRef.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 013dbfaf9f08f000e7cc7e2972eb86d89b35f70f +Author: Albert Astals Cid +Date: Thu Nov 26 23:20:38 2020 +0100 + + qt5: more signature leak fixes + + qt5/src/poppler-pdf-converter.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 64e46de89d37ec9d3291998ec777fea3a4c6bac2 +Author: Albert Astals Cid +Date: Thu Nov 26 23:14:46 2020 +0100 + + qt5: Signing: Cleanup after signing + + We don't want to modify this document + + poppler/Catalog.cc | 25 +++++++++++++++++++++++++ + poppler/Catalog.h | 1 + + qt5/src/poppler-pdf-converter.cc | 17 +++++++++++++++-- + 3 files changed, 41 insertions(+), 2 deletions(-) + +commit 0ee37e9211ea46ab3885e58b75a4118c40e57484 +Author: Albert Astals Cid +Date: Thu Nov 26 22:21:48 2020 +0100 + + Fix a few memory leaks in the new signing code + + The Rect thing is so that Annot::initialize doesn't mark the annot as + not ok, and so Annots::appendAnnot keeps track of the annot and + deletes + it when necessary + + poppler/Form.cc | 10 ++++------ + poppler/SignatureHandler.cc | 14 ++++++++++---- + poppler/SignatureHandler.h | 2 +- + qt5/src/poppler-form.cc | 2 +- + qt5/src/poppler-pdf-converter.cc | 10 ++++++++-- + 5 files changed, 24 insertions(+), 14 deletions(-) + +commit f1e703c686afa4765ddaed8d256752903fd68924 +Author: Albert Astals Cid +Date: Thu Nov 26 17:44:30 2020 +0100 + + qt5: Add CertificateInfo::checkPassword + + qt5/src/poppler-form.cc | 15 +++++++++++++++ + qt5/src/poppler-form.h | 7 +++++++ + 2 files changed, 22 insertions(+) + +commit 9db685f379c1c9195b5f0c9a693e7a581e6b214f +Author: Albert Astals Cid +Date: Thu Oct 29 17:12:28 2020 +0100 + + Improvements to adding digital signatures + + * Fix the new document that was being created hanging Adobe Reader + - In particular using a Type0 font for the Annot "dummy" font was + not a great idea since Type0 fonts are kind of complex in which + they require descendant fonts, etc. so use a Type1 font + * Let the user set its own NSS dir + * Add a way to ask the user it's NSS password + * Let the user pass in the apperance of the signature instead of + hardcode it + * Remove the need to first create an "empty" widget annotation + and then + sign that one. We just say "we want to sign" and the widget + annotation will be created as process of that. That simplifies the + code quite a bit in which the old code had lots of "we're + creating an + AnnotWidget that is a generic class but we're making it to be a + Signature because we know later we will only use it for that" + + poppler/Annot.cc | 44 +------- + poppler/Annot.h | 7 +- + poppler/Catalog.cc | 3 +- + poppler/Catalog.h | 3 +- + poppler/Form.cc | 51 +++------- + poppler/Form.h | 7 +- + poppler/Object.h | 7 +- + poppler/SignatureHandler.cc | 58 +++++++---- + poppler/SignatureHandler.h | 11 +- + qt5/src/poppler-annotation-private.h | 4 +- + qt5/src/poppler-annotation.cc | 60 +++-------- + qt5/src/poppler-annotation.h | 8 +- + qt5/src/poppler-form.cc | 96 ++++++------------ + qt5/src/poppler-form.h | 45 +++++---- + qt5/src/poppler-pdf-converter.cc | 188 + ++++++++++++++++++++++++++++++++++- + qt5/src/poppler-qt5.h | 87 ++++++++++++++-- + 16 files changed, 415 insertions(+), 264 deletions(-) + +commit f5a42423811b1de5059d77f138586d1a4e4e5e46 +Author: Albert Astals Cid +Date: Wed Oct 21 16:36:27 2020 +0200 + + Make getAvailableSigningCertificates return an object and not + a pointer + + The code on the Okular side was forgetting to delete the pointers and + this class is cheap to copy + + qt5/src/poppler-form.cc | 6 +++--- + qt5/src/poppler-form.h | 3 ++- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit 098b15ac70f3f6e7dad6f736a820e8ad79b099e9 +Author: Albert Astals Cid +Date: Wed Oct 21 16:30:52 2020 +0200 + + Make getAvailableSigningCertificates static + + poppler/SignatureHandler.cc | 2 ++ + poppler/SignatureHandler.h | 3 ++- + qt5/src/poppler-form.cc | 4 ++-- + 3 files changed, 6 insertions(+), 3 deletions(-) + +commit cb211cf4bef9fa48e5b41e85db1a9a2fa4cf8f11 +Author: Thorsten Behrens +Date: Sat Feb 1 07:44:40 2020 +0100 + + Comment out TimeStamp structs for the moment + + TSA part of the signature currently not implemented, but lets + leave the struct definitions here for later. + + poppler/SignatureHandler.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 118d288f93884c669ee42cd76b9e891df792f55d +Author: Thorsten Behrens +Date: Thu Jan 30 05:32:55 2020 +0100 + + Use slightly more modern PPKMS filter + + Plus a simple border will do, too. + + poppler/Form.cc | 2 +- + qt5/src/poppler-annotation.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 506769dc4b10bda8866abd81cdc5fa8aeaf19012 +Author: Thorsten Behrens +Date: Tue Jan 28 22:58:42 2020 +0100 + + Fix PKCS signature generation + + * code from the LibreOffice under MPLv2 + * includes a load of extra metadata + * including the actual certificate + * while at it, hard-code SHA256 hash for all digests + + poppler/Form.cc | 2 +- + poppler/SignatureHandler.cc | 579 + +++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 551 insertions(+), 30 deletions(-) + +commit ea268e5ccb607ea29d2b1695753211bffbd9d9ae +Author: Thorsten Behrens +Date: Mon Jan 27 19:07:19 2020 +0100 + + Don't replace AcroForm fields, but add new ones + + Previously, adding new signatures always replaced the ones before + in the central Fields array. + + poppler/Catalog.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit a41f34120a526da2cbc53b3b88d7fa586a229c80 +Author: Thorsten Behrens +Date: Mon Jan 27 11:31:49 2020 +0100 + + Write /V and /DV dicts as indirect references + + Otherwise neither LibreOffice nor AcroRead will eat this. + + poppler/Form.cc | 10 ++++++---- + poppler/Form.h | 2 +- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit d1a720337ca34270729831c69513b057cfefb040 +Author: Thorsten Behrens +Date: Sat Jan 25 17:24:45 2020 +0100 + + Export setNSSDir to have that externally configurable + + qt5/src/poppler-form.cc | 14 ++++++++++++++ + qt5/src/poppler-form.h | 7 +++++++ + 2 files changed, 21 insertions(+) + +commit 5a8fad4e8354625de6ed086250292499a85fa13e +Author: Thorsten Behrens +Date: Mon Jan 20 18:19:49 2020 +0100 + + Make qt5/src/poppler-form.cc build w/o NSS + + qt5/src/poppler-form.cc | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +commit adf32c7f5d73c5effa6cb0f1faab282481a7bf5c +Author: Thorsten Behrens +Date: Mon Jan 20 06:29:55 2020 +0100 + + Render signature rect and signer content + + Thus far with hard-coded colors and patterns. Should perhaps be + configurable via poppler-qt... + + poppler/Annot.cc | 85 + +++++++++++++++++++++++++++++++++++++++---- + poppler/Annot.h | 12 ++++-- + poppler/Form.cc | 32 +++++++++++++++- + poppler/Form.h | 8 ++++ + poppler/SignatureHandler.cc | 22 +++++++---- + qt5/src/poppler-annotation.cc | 8 +++- + 6 files changed, 146 insertions(+), 21 deletions(-) + +commit 9a030a9607bfa32927f4af71cce6725e85e848e9 +Author: Thorsten Behrens +Date: Sun Jan 19 02:50:49 2020 +0100 + + Make sure setAcroForm() is called before using Form in any way + + poppler/Annot.cc | 3 +++ + poppler/Form.cc | 3 +++ + qt5/src/poppler-annotation.cc | 4 +--- + 3 files changed, 7 insertions(+), 3 deletions(-) + +commit 63e594c35be59380956b5317a68ec7d35c6258b6 +Author: Thorsten Behrens +Date: Sat Jan 18 15:53:27 2020 +0100 + + Consistently use CERT nickname to reference keys + + poppler/CertificateInfo.cc | 11 +++++++++++ + poppler/CertificateInfo.h | 4 ++++ + poppler/SignatureHandler.cc | 3 +++ + qt5/src/poppler-form.cc | 9 +++++++++ + qt5/src/poppler-form.h | 5 +++++ + 5 files changed, 32 insertions(+) + +commit 62e788d9fabde9bcf3499df56d472d8d19f1664e +Author: Thorsten Behrens +Date: Wed Dec 11 09:00:35 2019 +0100 + + Add getAvailableSigningCertificates() for NSS keys + + For GUI applications to display a choice of signing keys, return + vector of available (i.e. private-key-equipped) certificates queried + from NSS. + + Avoids more than one library per process to access NSS. + + (cherry picked from commit 4b3f734d108b392fd3120a190489cac2107c4e58) + + poppler/SignatureHandler.cc | 72 + +++++++++++++++++++++++++++++++++++++-------- + poppler/SignatureHandler.h | 5 +++- + qt5/src/poppler-form.cc | 37 ++++++++++++++++++----- + qt5/src/poppler-form.h | 4 +++ + 4 files changed, 98 insertions(+), 20 deletions(-) + +commit 768696dd549bcb66ac0fce6dd0076e243564ff6c +Author: Thorsten Behrens +Date: Wed Jan 15 16:25:23 2020 +0100 + + Actually create the FormField on adding signature + + poppler/Annot.cc | 20 +++----------------- + 1 file changed, 3 insertions(+), 17 deletions(-) + +commit 387da8558a66f4c37211f64d304d18ab1c86cdc4 +Author: Katarina Behrens +Date: Mon Dec 16 14:14:15 2019 +0100 + + Initialize formWidget in all ctors + + poppler/Annot.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit fd0029651e280e63766a31ecf6b53c46e1db1e6a +Author: Thorsten Behrens +Date: Mon Nov 18 03:10:11 2019 +0100 + + Fixup GooString + + goo/GooString.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 51d6f90a55754dfcb251851551e7b2cdbf69f5f5 +Author: Thorsten Behrens +Date: Mon Sep 30 21:17:15 2019 +0200 + + Move sign() method to PDFConvert + + qt5/src/poppler-document.cc | 11 +---------- + qt5/src/poppler-pdf-converter.cc | 21 +++++++++++++++++++++ + qt5/src/poppler-qt5.h | 18 ++++++++++++++++-- + 3 files changed, 38 insertions(+), 12 deletions(-) + +commit 0375add530dafaac9b6979cae582afcc9cbae5aa +Author: Thorsten Behrens +Date: Mon Sep 30 06:50:55 2019 +0200 + + Write signature binary ASN1 blob as hex string explicitely + + Avoid global hex string hack in PDFDoc::writeString(), rather + use object type when creating the signature field contents. + + poppler/Form.cc | 3 ++- + poppler/PDFDoc.cc | 10 +--------- + 2 files changed, 3 insertions(+), 10 deletions(-) + +commit d1479b4d6292637cdf80e1bbadbfb19e7247b94b +Author: Jakub Alba +Date: Mon Sep 30 06:46:25 2019 +0200 + + Introduce hex string as a new Object type + + Binary data is best written as a hex string - avoids lots of escaping + going on when we write it out again. In preparation for pdf ASN1 + signature writing. + + Co-authored-by: Thorsten Behrens + + poppler/Object.cc | 13 ++++++++++++- + poppler/Object.h | 32 ++++++++++++++++++++++++++++---- + poppler/PDFDoc.cc | 11 ++++++++++- + 3 files changed, 50 insertions(+), 6 deletions(-) + +commit 56df46f7c469d2633f1f35e12c10e169dc69588f +Author: Katarina Behrens +Date: Tue Aug 27 06:48:37 2019 +0200 + + Add certificateCN and password + + qt5/src/poppler-document.cc | 6 +++--- + qt5/src/poppler-qt5.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 7219a3825a30a7cdca505e0ff715e0ff020f66b0 +Author: Katarina Behrens +Date: Wed Aug 21 10:45:46 2019 +0200 + + Pass widget annotation to sign down the chain + + qt5/src/poppler-document.cc | 10 +++++++++- + qt5/src/poppler-qt5.h | 3 ++- + 2 files changed, 11 insertions(+), 2 deletions(-) + +commit d297b6b8a6a4d546cfbcda50a1c7c37eb79a3653 +Author: Katarina Behrens +Date: Wed Aug 21 10:44:42 2019 +0200 + + Expose form widget to the related widget annotation + + poppler/Annot.cc | 6 ++++-- + poppler/Annot.h | 2 ++ + qt5/src/poppler-annotation.cc | 19 +++++++++++++++++++ + qt5/src/poppler-annotation.h | 3 +++ + 4 files changed, 28 insertions(+), 2 deletions(-) + +commit 0c4942ef26adf1c874332de1379f7094206be225 +Author: Katarina Behrens +Date: Tue Aug 20 10:06:24 2019 +0200 + + Use different ctor to be able to set more annot properties + + qt5/src/poppler-annotation.cc | 6 ++++-- + qt5/src/poppler-annotation.h | 2 ++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 46583c7fb25653184fdde17a6e80d24357f5aa1e +Author: Hans-Ulrich Jüttner +Date: Thu Aug 17 15:53:44 2017 +0200 + + Added signing of PDF documents with digital signatures + + via Qt5 interface and pdfsig with parameter -s. + + Includes fix to write document then update byte offsets and sig + on disk + by Adrian Johnson + + Includes compile fixes by Oliver Sander and Albert Astals Cid + + Fixes bug #99416 + + goo/GooString.h | 2 + + poppler/Form.cc | 269 + +++++++++++++++++++++++++++++++++++++++++++- + poppler/Form.h | 19 ++++ + poppler/PDFDoc.cc | 9 ++ + poppler/SignatureHandler.cc | 104 +++++++++++++++-- + poppler/SignatureHandler.h | 20 ++++ + poppler/XRef.cc | 18 ++- + poppler/XRef.h | 7 +- + qt5/src/poppler-form.cc | 52 +++++++++ + qt5/src/poppler-form.h | 23 ++++ + utils/pdfsig.1 | 20 ++++ + utils/pdfsig.cc | 56 ++++++++- + 12 files changed, 578 insertions(+), 21 deletions(-) + +commit 0bc1e8ac0798e20c703cfb8288c4264900c13e74 +Author: Katarina Behrens +Date: Fri Aug 16 13:17:32 2019 +0200 + + Stub qt5 interface for signing the document + + qt5/src/poppler-document.cc | 3 +++ + qt5/src/poppler-qt5.h | 3 +++ + 2 files changed, 6 insertions(+) + +commit b837757eb7e53f93b5e91b10f33fdef8ab5da0bc +Author: Katarina Behrens +Date: Mon Aug 12 14:55:45 2019 +0200 + + Point to newly created signature field + + poppler/Annot.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit a350b27e102ecec0bb02d6c34a87e4dac1e2b382 +Author: Katarina Behrens +Date: Thu Aug 8 11:26:32 2019 +0200 + + Add default appearance and empty appearance stream + + poppler/Annot.cc | 26 +++++++++++++++++++++++++- + poppler/Annot.h | 2 +- + poppler/Catalog.cc | 8 ++++---- + qt5/src/poppler-annotation.cc | 6 ++---- + 4 files changed, 32 insertions(+), 10 deletions(-) + +commit b9f50732b9d3bc610fb054f910c04bcb1ff4944c +Author: Katarina Behrens +Date: Fri Jul 26 13:58:05 2019 +0200 + + Add basic signature field properties except for appearance + + poppler/Annot.cc | 4 ++++ + qt5/src/poppler-annotation.cc | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 3079f830b9c030e996d24c5697463eee2ff937b0 +Author: Katarina Behrens +Date: Thu Jul 25 14:47:33 2019 +0200 + + Add stub of signature field/widget annotation + + poppler/Annot.cc | 7 +++++++ + poppler/Annot.h | 2 ++ + poppler/Catalog.cc | 18 +++++++++++------- + poppler/Catalog.h | 2 +- + qt5/src/poppler-annotation.cc | 19 ++++++++++++++++++- + qt5/src/poppler-annotation.h | 3 ++- + 6 files changed, 41 insertions(+), 10 deletions(-) + +commit 3cae6146bf29b66a7282394dba89bb140aa1639b +Author: Katarina Behrens +Date: Wed Jul 24 17:03:24 2019 +0200 + + Add empty-ish AcroFields dictionary if not there yet + + poppler/Catalog.cc | 26 ++++++++++++++++++++++++++ + poppler/Catalog.h | 2 ++ + qt5/src/poppler-annotation.cc | 6 +++++- + 3 files changed, 33 insertions(+), 1 deletion(-) + +commit ac9e14b9eca50ec3ff25b2cdb4c97e3728ff1f47 +Author: Albert Astals Cid +Date: Sat Dec 12 19:25:41 2020 +0100 + + SplashOutputDev: Fix crash on broken files + + oss-fuzz/28582 + + poppler/SplashOutputDev.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit acf4c8e1d1253f2c82c8e5ac009534b52deec88d +Author: Albert Astals Cid +Date: Fri Dec 4 00:04:01 2020 +0100 + + Don't decrypt the Contents field of Sig dictionaries + + I could not find whre in the PDF spec says that this field in + particular + is not encrypted, but i think it makes sense because how you write it, + you have to reserve space first write the whole file, and then + calculate + the real signature and write it in the space you left blank before. + + If we encrypt the text, we can't know how long it'll be so we can't + calculate how much space to leave available. + + Also i have a pdf where the Contents field is not encrypted (but the + rest of the document is) and Adobe opens it fine, so that seems + to imply + this is the right thing to do. + + poppler/Parser.cc | 50 ++++++++++++++++++++++++++++++++++---------------- + poppler/Parser.h | 3 ++- + 2 files changed, 36 insertions(+), 17 deletions(-) + +commit 009ea8cbd43736594a1e598e68ffd0e0a0983d81 +Author: Albert Astals Cid +Date: Fri Dec 11 00:29:40 2020 +0100 + + Update (C) + + utils/pdftocairo.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 928df1f3cf1184e802d07ae444bc11ee084edadd +Author: Salvo Miosi +Date: Thu Dec 10 18:24:06 2020 +0100 + + pdftocairo: Setmode binary for windows + + utils/pdftocairo.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 4601e1d533a9c47e304b75435a104f5096a2b9a4 +Author: Philipp Knechtges +Date: Tue Dec 8 23:06:43 2020 +0100 + + Gfx: specifically use DeviceGray instead of DefaultGray for softmasks + + poppler/Gfx.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 32857374f02457b247b9f02f33c9342a1334526d +Author: Albert Astals Cid +Date: Tue Dec 8 12:30:01 2020 +0100 + + Enable bugprone-signed-char-misuse + + .gitlab-ci.yml | 2 +- + cpp/poppler-global.cpp | 5 +++-- + poppler/CharCodeToUnicode.cc | 6 +++--- + 3 files changed, 7 insertions(+), 6 deletions(-) + +commit 5d3e71c8215997a96d2ade7272217087f7e59fe2 +Author: Albert Astals Cid +Date: Sat Dec 5 23:14:09 2020 +0100 + + Poppler 20.12.1 + + CMakeLists.txt | 2 +- + NEWS | 9 +++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 12 insertions(+), 3 deletions(-) + +commit 5eb2dec26dbb575ca3eafd2509ceb1ca2aaa5fd1 +Author: Philipp Knechtges +Date: Thu Dec 3 17:02:49 2020 +0100 + + PSOutputDev: fixing two oversights in the rasterization code + + This fixes the issue with uninitalized memory valgrind shows in the + bug report + https://gitlab.freedesktop.org/poppler/poppler/-/issues/1002 . + + poppler/PSOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit bb599a7809edf73ecd48900bb9f103b0888be23e +Author: Albert Astals Cid +Date: Sat Dec 5 22:44:55 2020 +0100 + + CI: clang-tidy disable 3 new clang-tidy 11 warnings + + At least the unsigned char one needs investiagtion, but let's + unblock CI + for now + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d608992bd824bab766af038107e733ff47b0a8a0 +Author: Philipp Knechtges +Date: Wed Dec 2 01:04:25 2020 +0100 + + fix comment in parseargs.cc + + utils/parseargs.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 113a1f4cd1cdad64901bcd48485a459cd0ded3c6 +Author: Philipp Knechtges +Date: Wed Sep 30 18:05:56 2020 +0200 + + bugfix: add missing profile copy operation in + GfxICCBasedColorSpace::copy() + + poppler/GfxState.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 66a65f996f1f407e95643cf5ddc8818b8ea93c40 +Author: Albert Astals Cid +Date: Wed Dec 2 18:51:02 2020 +0100 + + cmake: Use the imported target for boost includes + + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 0f72f73357414ea79af774d4ce8f4fed80db3d98 +Author: Albert Astals Cid +Date: Wed Dec 2 18:29:45 2020 +0100 + + cmake: Use the new syntax to link in the Qt5 libs + + qt5/demos/CMakeLists.txt | 13 +------------ + qt5/src/CMakeLists.txt | 5 +---- + qt5/tests/CMakeLists.txt | 16 +++------------- + 3 files changed, 5 insertions(+), 29 deletions(-) + +commit 3ea3ad26bca27bd78f753f4296d4a544ed666e60 +Author: Albert Astals Cid +Date: Wed Dec 2 18:02:19 2020 +0100 + + cmake: We don't support gcc < 5 anymore + + cmake/modules/PopplerMacros.cmake | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit fbdf0cfc26cb686677e865b109a283b20231a2d3 +Author: Albert Astals Cid +Date: Wed Dec 2 01:05:16 2020 +0100 + + typo + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac5c7c1c7621bd64ebc0b1382d938d9ff727c8e9 +Author: Albert Astals Cid +Date: Wed Dec 2 00:56:38 2020 +0100 + + Prevent undefined storing of a too small float in an integer + + oss-fuzz/25488 + + splash/Splash.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 8766a45a1e101538724d2b767b3efd0ec210357c +Author: Albert Astals Cid +Date: Tue Dec 1 23:29:29 2020 +0100 + + Poppler 20.12.0 + + CMakeLists.txt | 4 ++-- + NEWS | 37 +++++++++++++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 41 insertions(+), 4 deletions(-) + +commit 11d97ec879bc3c846bac2ee6ddfc17d992c57f44 +Author: Albert Astals Cid +Date: Tue Dec 1 23:42:04 2020 +0100 + + Fix memory leak in 722f37f7ab39e6d3b7fffb69907433d25f30b5ef + + poppler/SplashOutputDev.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 57f9f7f1f9e2351b630e15f2667c44348ecb2476 +Author: Albert Astals Cid +Date: Tue Dec 1 22:46:33 2020 +0100 + + Move HAVE_SPLASH to poppler-config.h + + Now that HAVE_SPLASH is used in the the "public unsupported" + internal headers + + config.h.cmake | 3 --- + cpp/poppler-page-renderer.cpp | 2 ++ + poppler/poppler-config.h.cmake | 6 ++++++ + qt5/src/poppler-document.cc | 1 + + qt5/src/poppler-page.cc | 1 + + qt5/src/poppler-private.h | 1 + + qt6/src/poppler-document.cc | 1 + + qt6/src/poppler-page.cc | 1 + + qt6/src/poppler-private.h | 1 + + 9 files changed, 14 insertions(+), 3 deletions(-) + +commit 722f37f7ab39e6d3b7fffb69907433d25f30b5ef +Author: Tobias Deiminger +Date: Sun Nov 22 22:13:34 2020 +0100 + + Splash: Fix blitImage in uncolored tiling patterns + + Roughly spoken, SplashOutputDev::tilingPatternFill first renders a + pattern prototype into a temporary buffer, then draws multiple copies + of that buffer over the current background, enough copies to fill + a region. + + To draw the copies, we use either blitImage or drawImage. blitImage + is faster, but only works if the current transformation is simple + enough (no rotation, no skew, no reflection). Else we have to fallback + to drawImage. + + drawImage would generate the final pattern so that it colorizes a + greyscale prototype while fetching the prototype via tilingBitmapSrc + buffer accessor. blitImage on the other hand has no such accessor and + therefore no color to colorize. But we can get the same result if + we colorize the pattern prototype up front. + + This commit rearranges the code so that we can decide blitImage + vs. drawImage + early enough to make color mode of the prototype and copying + pattern color + from former Splash dependent on that decision. + + To test blitImage for uncolored tiling patterns, render + PDFJS-8741-p1-patternscaling.pdf from #983. + + To test drawImage for uncolored tiling patterns, render 745th page, + Figure L.9 – Uncoloured tiling pattern from PDF32000_2008.pdf. + + Fixes #983. + + poppler/SplashOutputDev.cc | 67 + +++++++++++++++++++++++++--------------------- + 1 file changed, 37 insertions(+), 30 deletions(-) + +commit 8ef16f82b1f0f085d9501978bb85a792f46d8ab2 +Author: Albert Astals Cid +Date: Sun Nov 29 19:41:45 2020 +0100 + + Be more strict in XRef::createDocInfoIfNeeded + + Info needs to be a Dict and an indirect object in the trailer dict + + oss-fuzz/28057 + + poppler/PDFDoc.cc | 11 +++-------- + poppler/PDFDoc.h | 7 ------- + poppler/XRef.cc | 17 +++++++++-------- + poppler/XRef.h | 5 +++-- + 4 files changed, 15 insertions(+), 25 deletions(-) + +commit 751deb8ae3df1bc316fa17c83ca573233586b41f +Author: Albert Astals Cid +Date: Sun Nov 29 00:01:48 2020 +0100 + + XRef::removeIndirectObject: Fix overflow of gen + + Also make the check in XRef::addIndirectObject that looks for a + free and + usable entry a bit more robust (!= to <) than 65535 + + oss-fuzz/28032 + + poppler/XRef.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 306df53be898aaebdbd5cd99947e4baef54ac1eb +Author: Albert Astals Cid +Date: Sat Nov 28 20:59:25 2020 +0100 + + Fix abort when searching for "bad" label names + + Give wstring_convert a error string so it does throw an exception when + it fails + + oss-fuzz/28002 + + poppler/PageLabelInfo_p.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d8fb21b78bc9f11d52491f90076737f484f69c7d +Author: Albert Astals Cid +Date: Sat Nov 28 20:23:43 2020 +0100 + + Fix crash when searching things of length 0 + + poppler/TextOutputDev.cc | 4 ++++ + qt5/tests/check_search.cpp | 1 + + qt6/tests/check_search.cpp | 1 + + 3 files changed, 6 insertions(+) + +commit 2386bf37f9022cb5a9d434e30e8d8d55f4916e55 +Author: Albert Astals Cid +Date: Sat Nov 28 01:31:05 2020 +0100 + + Protect against loops in the PageLabels Kids tree + + oss-fuzz/27991 + + poppler/PageLabelInfo.cc | 26 +++++++++++++++++++------- + poppler/PageLabelInfo.h | 4 ++-- + 2 files changed, 21 insertions(+), 9 deletions(-) + +commit de8abb8dd3fde0c0b3003ca460902b1517c32b4c +Author: Albert Astals Cid +Date: Sat Nov 28 01:06:37 2020 +0100 + + cpp: page::search: Fix invalid memory access if searching for the + empty string + + cpp/poppler-page.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +commit c48f469cd6755fb9fea7870d6b64aaf891cb2012 +Author: Albert Astals Cid +Date: Sat Nov 28 00:55:49 2020 +0100 + + qt5: Fix division by 0 in broken files + + oss-fuzz/27983 + + qt5/src/poppler-annotation.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit bce14c781b8066ad7e55020e8e2ade5363856854 +Author: Albert Astals Cid +Date: Sat Nov 28 00:34:52 2020 +0100 + + Fix crash in XRef::removeDocInfo() if Info is not a ref + + oss-fuzz/27968 + + poppler/XRef.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 691866a3e3de15774fbe825609ae472199573e9b +Author: Albert Astals Cid +Date: Fri Nov 27 14:53:53 2020 +0100 + + perf-test: Remove a bunch of code that was windows only + + I'm 99% sure no-one uses this and could be removed completely, + but let's + leave the part that actually works on linux too. + + ConfigureChecks.cmake | 2 - + config.h.cmake | 6 - + test/perf-test.cc | 371 + +------------------------------------------------- + 3 files changed, 3 insertions(+), 376 deletions(-) + +commit 8ea1bf3c1069530171493a6b2dd49ac1f20120fc +Author: Ceyhun Alp +Date: Thu Nov 26 15:59:51 2020 +0000 + + Replace malloc with calloc + + glib/tests/fuzzing/doc_attr_fuzzer.cc | 2 +- + glib/tests/fuzzing/find_text_fuzzer.cc | 2 +- + glib/tests/fuzzing/label_fuzzer.cc | 2 +- + glib/tests/fuzzing/util_fuzzer.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit e05e627a5f6e92cf1c1897c490851db176eb9999 +Author: Ceyhun Alp +Date: Mon Nov 9 11:31:58 2020 +0000 + + Clang format + + glib/tests/fuzzing/annot_fuzzer.cc | 2 +- + glib/tests/fuzzing/doc_attr_fuzzer.cc | 2 +- + glib/tests/fuzzing/find_text_fuzzer.cc | 2 +- + glib/tests/fuzzing/label_fuzzer.cc | 2 +- + glib/tests/fuzzing/pdf_draw_fuzzer.cc | 2 +- + glib/tests/fuzzing/util_fuzzer.cc | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +commit e09a603e2ff08ce50fc5a71146101bb4ce40c467 +Author: Ceyhun Alp +Date: Wed Nov 4 13:24:26 2020 +0000 + + Changing glib fuzzers from C to CPP + + ... + + replace c with cc - glib + + missing includes + + glib/tests/CMakeLists.txt | 12 + ++++++------ + glib/tests/fuzzing/{annot_fuzzer.c => annot_fuzzer.cc} | 4 ++-- + glib/tests/fuzzing/{doc_attr_fuzzer.c => doc_attr_fuzzer.cc} | 6 ++++-- + .../fuzzing/{find_text_fuzzer.c => find_text_fuzzer.cc} | 6 ++++-- + glib/tests/fuzzing/{label_fuzzer.c => label_fuzzer.cc} | 6 ++++-- + glib/tests/fuzzing/{pdf_draw_fuzzer.c => pdf_draw_fuzzer.cc} | 4 ++-- + glib/tests/fuzzing/{util_fuzzer.c => util_fuzzer.cc} | 6 ++++-- + 7 files changed, 26 insertions(+), 18 deletions(-) + +commit 44af15369a974b2b26a10fa3f4f99ba8e7542bd9 +Author: Ceyhun Alp +Date: Fri Oct 30 00:41:41 2020 +0000 + + Fixing null-terminated string parameters + + cpp/tests/fuzzing/doc_fuzzer.cc | 19 +++++++++++-------- + cpp/tests/fuzzing/page_label_fuzzer.cc | 16 ++++++++++++---- + cpp/tests/fuzzing/page_search_fuzzer.cc | 14 +++++++++++--- + cpp/tests/fuzzing/pdf_file_fuzzer.cc | 4 +--- + cpp/tests/fuzzing/pdf_fuzzer.cc | 25 +++---------------------- + glib/tests/fuzzing/find_text_fuzzer.c | 8 +++++++- + glib/tests/fuzzing/label_fuzzer.c | 2 +- + 7 files changed, 46 insertions(+), 42 deletions(-) + +commit 919a71e52110774f461cbe079a5ed65cf8f48c91 +Author: Ceyhun Alp +Date: Thu Oct 29 23:32:15 2020 +0000 + + Updating pdf_fuzzer with the version from OSS-Fuzz repository + + cpp/tests/CMakeLists.txt | 1 + + cpp/tests/{ => fuzzing}/pdf_fuzzer.cc | 10 ++++++++-- + 2 files changed, 9 insertions(+), 2 deletions(-) + +commit 1e73805f7d8d1ca453550d133d86f59305011e78 +Author: Ceyhun Alp +Date: Wed Oct 28 01:00:58 2020 +0000 + + Fixes from Michael's feedback + + cpp/tests/fuzzing/doc_fuzzer.cc | 16 +- + glib/tests/fuzzing/annot_fuzzer.c | 2 - + glib/tests/fuzzing/doc_attr_fuzzer.c | 20 +- + glib/tests/fuzzing/label_fuzzer.c | 8 +- + glib/tests/fuzzing/util_fuzzer.c | 16 +- + qt5/tests/fuzzing/FuzzedDataProvider.h | 409 + --------------------------------- + qt5/tests/fuzzing/fuzzer_temp_file.h | 82 ------- + qt5/tests/fuzzing/qt_annot_fuzzer.cc | 10 +- + 8 files changed, 48 insertions(+), 515 deletions(-) + +commit 48026f90fd07f3da886ce0079facec49f8022c07 +Author: Ceyhun Alp +Date: Fri Oct 23 11:02:20 2020 +0000 + + Fixing clang_format issues + + cpp/tests/fuzzing/FuzzedDataProvider.h | 538 + +++++++++++++++++--------------- + cpp/tests/fuzzing/doc_fuzzer.cc | 12 +- + cpp/tests/fuzzing/fuzzer_temp_file.h | 81 ++--- + cpp/tests/fuzzing/page_label_fuzzer.cc | 2 +- + cpp/tests/fuzzing/page_search_fuzzer.cc | 2 +- + glib/tests/fuzzing/annot_fuzzer.c | 3 +- + glib/tests/fuzzing/doc_attr_fuzzer.c | 3 +- + glib/tests/fuzzing/find_text_fuzzer.c | 3 +- + glib/tests/fuzzing/fuzzer_temp_file.h | 81 ++--- + glib/tests/fuzzing/label_fuzzer.c | 3 +- + glib/tests/fuzzing/pdf_draw_fuzzer.c | 4 +- + glib/tests/fuzzing/util_fuzzer.c | 3 +- + qt5/tests/fuzzing/FuzzedDataProvider.h | 538 + +++++++++++++++++--------------- + qt5/tests/fuzzing/fuzzer_temp_file.h | 81 ++--- + qt5/tests/fuzzing/qt_annot_fuzzer.cc | 6 +- + qt5/tests/fuzzing/qt_label_fuzzer.cc | 6 +- + qt5/tests/fuzzing/qt_pdf_fuzzer.cc | 6 +- + qt5/tests/fuzzing/qt_search_fuzzer.cc | 6 +- + qt5/tests/fuzzing/qt_textbox_fuzzer.cc | 6 +- + 19 files changed, 718 insertions(+), 666 deletions(-) + +commit 890de69dbe531484f687877124c080508b25a9f8 +Author: Ceyhun Alp +Date: Mon Oct 19 08:23:48 2020 +0000 + + Fuzzers for qt5 + cleaning up cpp and glib fuzzers + + cpp/tests/CMakeLists.txt | 2 +- + cpp/tests/fuzzing/FuzzedDataProvider.h | 387 + ++++++++++++++++++++++++++++++++ + cpp/tests/fuzzing/doc_fuzzer.cc | 46 ++++ + cpp/tests/fuzzing/page_label_fuzzer.cc | 18 -- + cpp/tests/fuzzing/page_search_fuzzer.cc | 18 -- + cpp/tests/fuzzing/pdf_file_fuzzer.cc | 18 -- + glib/tests/fuzzing/annot_fuzzer.c | 48 +++- + glib/tests/fuzzing/doc_attr_fuzzer.c | 1 - + glib/tests/fuzzing/find_text_fuzzer.c | 5 +- + glib/tests/fuzzing/label_fuzzer.c | 5 +- + glib/tests/fuzzing/pdf_draw_fuzzer.c | 31 ++- + glib/tests/fuzzing/util_fuzzer.c | 3 - + qt5/tests/CMakeLists.txt | 16 ++ + qt5/tests/fuzzing/FuzzedDataProvider.h | 387 + ++++++++++++++++++++++++++++++++ + qt5/tests/fuzzing/fuzzer_temp_file.h | 81 +++++++ + qt5/tests/fuzzing/qt_annot_fuzzer.cc | 46 ++++ + qt5/tests/fuzzing/qt_label_fuzzer.cc | 29 +++ + qt5/tests/fuzzing/qt_pdf_fuzzer.cc | 27 +++ + qt5/tests/fuzzing/qt_search_fuzzer.cc | 28 +++ + qt5/tests/fuzzing/qt_textbox_fuzzer.cc | 32 +++ + 20 files changed, 1150 insertions(+), 78 deletions(-) + +commit 8b991bcf392c6c7e8957f4e18f3ca9437fcf4797 +Author: Ceyhun Alp +Date: Mon Oct 12 23:05:37 2020 +0000 + + Fuzzers for glib + + glib/tests/CMakeLists.txt | 18 ++++++++ + glib/tests/fuzzing/annot_fuzzer.c | 38 ++++++++++++++++ + glib/tests/fuzzing/doc_attr_fuzzer.c | 23 ++++++++++ + glib/tests/fuzzing/find_text_fuzzer.c | 31 ++++++++++++++ + glib/tests/fuzzing/fuzzer_temp_file.h | 81 + +++++++++++++++++++++++++++++++++++ + glib/tests/fuzzing/label_fuzzer.c | 30 +++++++++++++ + glib/tests/fuzzing/pdf_draw_fuzzer.c | 61 ++++++++++++++++++++++++++ + glib/tests/fuzzing/util_fuzzer.c | 12 ++++++ + 8 files changed, 294 insertions(+) + +commit c6a50e4f2334d130061b03c31ad96387ba86dbea +Author: Ceyhun Alp +Date: Sat Oct 10 20:19:39 2020 +0000 + + Fuzzers for cpp + + cpp/tests/CMakeLists.txt | 3 ++ + cpp/tests/fuzzing/fuzzer_temp_file.h | 81 + +++++++++++++++++++++++++++++++++ + cpp/tests/fuzzing/page_label_fuzzer.cc | 51 +++++++++++++++++++++ + cpp/tests/fuzzing/page_search_fuzzer.cc | 53 +++++++++++++++++++++ + cpp/tests/fuzzing/pdf_file_fuzzer.cc | 57 +++++++++++++++++++++++ + 5 files changed, 245 insertions(+) + +commit e9253bda14b10059c734213e3ad88b5b1f8cc546 +Author: Albert Astals Cid +Date: Fri Nov 27 01:36:13 2020 +0100 + + Protect against invalid quadding values + + oss-fuzz/27915 + + poppler/Form.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 1fba0c2bd540e6100b9a64483101b135bfbcee13 +Author: Albert Astals Cid +Date: Wed Nov 25 19:05:10 2020 +0100 + + qt6: fix packages for CI + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7478ee80739ad0b064389bba04e9651d68bd0fa1 +Author: Albert Astals Cid +Date: Wed Nov 25 01:13:01 2020 +0100 + + Tweak Annot rendering code for when border width is 0 + + Fixes issue #997 + + poppler/Annot.cc | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +commit 3d69e0de6a136cde9844b63886294ae532bc50aa +Author: Albert Astals Cid +Date: Tue Nov 24 16:36:49 2020 +0100 + + timeToDateString: We forgot the ' after the minutes + + Adobe Reader seems to be particularly strict about this + + poppler/DateInfo.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit fb93776c423c166547d952bc199b14383a1d4d8d +Author: Albert Astals Cid +Date: Tue Nov 24 01:29:59 2020 +0100 + + Fix Annot border when C is present but empty -> transparent + + Issue #993 + + poppler/Gfx.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit aaf2e8083141fcea5dacbc6af6a679533ad8dc55 +Author: Albert Astals Cid +Date: Sun Nov 22 18:01:10 2020 +0100 + + Tweak the don't use Appearance stream if annot is typeHighlight + + After playing hand editing files and opening them in Adobe Reader i + *think* the condition is "if the appearance stream has a ExtGState in + its Resources dict, then use the appearance stream, otherwise draw it + ourselves + + glib/tests/CMakeLists.txt | 2 +- + poppler/Annot.cc | 28 +++++++++++++++++++++++++++- + poppler/Annot.h | 3 +++ + 3 files changed, 31 insertions(+), 2 deletions(-) + +commit cd145d56617e7e7501a0054f42b9068babed3dc5 +Author: Albert Astals Cid +Date: Fri Nov 20 09:13:34 2020 +0100 + + Fix rendering of some files + + StreamPredictor::getNextLine when predictori == 2 && nBits == 1 && + nComps == 1 + + Issue #976 + Issue #567 + + poppler/Stream.cc | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit 2c353300b65f3a89ddb9377a4ef8864bff8d49ab +Author: Albert Astals Cid +Date: Thu Nov 19 21:27:30 2020 +0100 + + GfxLabColorSpace::parse: Protect against division by 0 + + oss-fuzz/27619 + + poppler/GfxState.cc | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit 15960417f2fef7e8b94acda712e65e9b5383494c +Author: Albert Astals Cid +Date: Wed Nov 18 20:14:37 2020 +0100 + + JBIG2Stream::readTextRegion: Fix integer overflow on broken files + + poppler/JBIG2Stream.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 331f2f092b7cb3be97a1f5c0665d41cd10e85a8d +Author: Oliver Sander +Date: Sat Nov 14 22:03:25 2020 +0100 + + Fix annotation line width if no appearance stream or style are given + + When handling annotations without appearance stream, the behavior + of poppler deviated from what the pdf spec says: Poppler would + only take the boundary width from a border style (BS) dictionary + if the 'style (S)' field was also present, even though the spec + clearly says that both are optional, and does not mention + one depending on the other. + + This behavior was deliberate, because apparently Acroread 8 + did it that way. See the comment by Jeff Muizelaar in 28967940. + But it seems that Acroread behavior has changed, newer versions + do take the 'width' field into account even when there is no + 'style (S)' field. The Chromium pdf renderer does the same. + + So let's change the code back to following the spec rather + than an old version of Acroread. + + BUG: 988 + + poppler/Annot.cc | 23 +++++++++-------------- + 1 file changed, 9 insertions(+), 14 deletions(-) + +commit 5a65db3d992eeb8a4cd4b2531f3c59ad25940487 +Author: Albert Astals Cid +Date: Mon Nov 16 19:49:54 2020 +0100 + + JBIG2Stream::readCodeTableSeg: More overflow protection in broken + files + + poppler/JBIG2Stream.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit db5f849ab74798f3a0481d506331ef3244862314 +Author: Tobias Deiminger +Date: Sun Nov 15 13:08:56 2020 +0100 + + Splash: Fix wrong x adjustment during clipping + + If a line segment goes beyond the current clip region, + Splash::strokeNarrow + tries to cut off the segment line to the intersection of the + segment line + with the clip border. + + Therefore it has to calculate a new endpoint (=intersection point) + of the + segment. It does this by using the known segment slope dxdy. + + Required information (segment start, segment slope, clip border) + is known + in double precision. However the calculation used the integerized clip + border, which necessarily suffers from rounding errors. This error can + become very visible when we have a high dxdy (i.e, a flat-angle line). + + Use SplashClip::getYMin and SplashClip::getYMax instead of getYMinI + and getYMaxI, + and we get visibly correct results. + + Fixes #990. + + splash/Splash.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 72e7e1e826f64d72a2a47e1abd8bccceff5e0a67 +Author: Albert Astals Cid +Date: Sun Nov 15 22:10:44 2020 +0100 + + SampledFunction: Initialize cacheOut + + On some broken files m is 0 so every time we call + SampledFunction::transform we just return cachedOut, but it was never + initialized. We can solve it other ways but seems seems the least + expensive + + poppler/Function.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bf6909d2d9dc82d3014ce7659469c8e1cc37694c +Author: Albert Astals Cid +Date: Sun Nov 15 21:51:25 2020 +0100 + + JBIG2Stream::readSymbolDictSeg: Return early if one of the bitmaps + is null + + Doesn't seem to regress any of the valid files i have and saves some + very small looping for hours + + poppler/JBIG2Stream.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 2b26a3e80a5e8fecc1b94753a7cbe3d0369e7629 +Author: Albert Astals Cid +Date: Sun Nov 15 18:24:01 2020 +0100 + + Update (C) + + poppler/FontInfo.cc | 2 +- + poppler/GfxFont.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d0493e210b5cfa82228debc4c0ad7f405ee3acb8 +Author: Albert Astals Cid +Date: Sun Nov 15 12:43:30 2020 +0100 + + JBIG2Stream::readTextRegion: Make bitmap an unique_ptr + + Simplifies having to remember to add the delete on all those error + cases + + poppler/JBIG2Stream.cc | 19 ++++--------------- + 1 file changed, 4 insertions(+), 15 deletions(-) + +commit 95a4ee50304666f299890daa41fdb40ac8e38384 +Author: Albert Astals Cid +Date: Sun Nov 15 12:37:03 2020 +0100 + + Remove #if that was confusing clang-format + + Code looks better now + + poppler/JBIG2Stream.cc | 257 + +++++++++++++++++++++++++------------------------ + 1 file changed, 129 insertions(+), 128 deletions(-) + +commit 0986483fbd49b7bdf5f2e45bb03a7ebe6d3b8e65 +Author: Albert Astals Cid +Date: Mon Nov 9 01:20:18 2020 +0100 + + Use the font name without subset tag when querying for a system font + + i.e. if the font name is DDPJAD+Times-Roman look for a replacement + of Times-Roman + + Fixes issue #972 + + poppler/FontInfo.cc | 11 +---------- + poppler/GfxFont.cc | 27 +++++++++++++++++++++++++++ + poppler/GfxFont.h | 5 +++++ + poppler/GlobalParams.cc | 2 +- + 4 files changed, 34 insertions(+), 11 deletions(-) + +commit 91ac0038dd48b5da6382ef297eab5128f5266793 +Author: Albert Astals Cid +Date: Sat Nov 14 20:20:36 2020 +0100 + + Update (C) + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit bd41274e4537a321bb2ab1ae89eb72fa302a2062 +Author: Tobias Deiminger +Date: Fri Nov 13 09:55:26 2020 +0100 + + Draw better circles for circle annotations + + Because PDF spec has no built in circle operator, we can only + approximate + a circle by joining cubic bezier curve segments. + + We already did good approximation for line endings and radio + buttons by + setting distance of bezier control point to (4 * (sqrt(2) - 1) / 3) + * r. + But the older AnnotGeometry::draw code for subtype circle still used + an equivalent of 0.5 * r, which yields a visibly non-circular circle. + Fix it by using the bezierCircle define for AnnotGeometry too. + + Does minor refactoring by introducing + AnnotAppearanceBuilder::drawEllipse, + and forwarding drawCircle to it. typeSquare code is slightly + touched as + a consequence, but remains functionally unchanged. + + Also changes 'S' (stroke path) to 's' (close and stroke path). To my + understanding 'close and stroke' is the correct thing to do here, + it's in line with drawCircle and the original commit 6c4fa513 didn't + explain why it left the path open by using 'S'. + + Fixes #989. + + poppler/Annot.cc | 87 + +++++++++++++++++++++----------------------------------- + poppler/Annot.h | 1 + + 2 files changed, 34 insertions(+), 54 deletions(-) + +commit f4d640d7ad00b30797acce47299cf7a7a59ad505 +Author: Kyle Auble +Date: Thu Nov 12 19:46:15 2020 -0500 + + cmake: Remove redundant unit-test macro + + poppler_add_unittest was only used 3 times & effectively differed from + poppler_add_test by just a CMake add_test call. + + cmake/modules/PopplerMacros.cmake | 23 +++-------------------- + glib/tests/CMakeLists.txt | 3 ++- + qt5/tests/CMakeLists.txt | 3 ++- + qt6/tests/CMakeLists.txt | 3 ++- + 4 files changed, 9 insertions(+), 23 deletions(-) + +commit 85f6354f36d5d4f6bb7c1708f408d7522a9356d6 +Author: Kyle Auble +Date: Tue Nov 10 23:57:19 2020 -0500 + + Remove .pc files for private back-ends + + CMakeLists.txt | 6 ------ + poppler-cairo.pc.cmake | 8 -------- + poppler-glib.pc.cmake | 2 +- + poppler-splash.pc.cmake | 8 -------- + 4 files changed, 1 insertion(+), 23 deletions(-) + +commit 268696ebf5ff01164e8e530b625af327c09ff133 +Author: Kyle Auble +Date: Sun Nov 8 16:31:56 2020 -0500 + + cmake: Remove obsolete version-check macro + + Only used once to check pkgconfig >= 0.18 (released in 2005 at + latest). + + CMakeLists.txt | 17 ++--- + cmake/modules/MacroEnsureVersion.cmake | 117 + --------------------------------- + 2 files changed, 4 insertions(+), 130 deletions(-) + +commit 89f219c8f72b826d4c0ab4e3fc9a6962005d5151 +Author: Kyle Auble +Date: Sun Nov 8 16:31:00 2020 -0500 + + cmake: Remove obsolete bool-to-binary macro + + Only used once & no longer needed; CMake configure_file converts + True/False to def/undef transparently now. + + CMakeLists.txt | 21 +++++++++++---------- + cmake/modules/MacroBoolTo01.cmake | 20 -------------------- + 2 files changed, 11 insertions(+), 30 deletions(-) + +commit a01a75d66ddeeb9637475cb0d4a196a1c1838588 +Author: Albert Astals Cid +Date: Sat Nov 14 01:26:28 2020 +0100 + + gcc: Enable -fno-operator-names + + They are valid C++ but it's not what this project uses, it's a + matter of + uniformity (same reason we have clang-format for example) + + cmake/modules/PopplerMacros.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 388f1bc081bbd612c318ec9cf241911f0271f772 +Author: Albert Astals Cid +Date: Wed Nov 11 19:49:52 2020 +0100 + + JBIG2Stream::readTextRegion: Prevent integer overflow on broken files + + oss-fuzz/19177 + + poppler/JBIG2Stream.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 6e2177d24c5a320ce32029a7062089422f6ada21 +Author: Albert Astals Cid +Date: Mon Nov 2 22:52:28 2020 +0100 + + Update (C) + + poppler/PSOutputDev.h | 2 +- + poppler/Stream.cc | 1 + + poppler/Stream.h | 1 + + utils/pdftops.cc | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +commit 0a243dd9d20bc16f4e83af3e2043c0253b4e4625 +Author: Albert Astals Cid +Date: Mon Nov 2 22:21:52 2020 +0100 + + GfxFunctionShading::getColor: Fix buffer overrun in broken documents + + Issue #979 + + poppler/GfxState.cc | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit eaa1e07b591b975946f2f3f7262dd94deb9d54b3 +Author: Albert Astals Cid +Date: Mon Nov 2 00:03:04 2020 +0100 + + Move psLevel to PSOutputDev creation + + It's were it makes sense, not as part of GlobalParams that we're + sloooooooooowly trying to get rid of + + poppler/GlobalParams.cc | 13 ------------- + poppler/GlobalParams.h | 17 ----------------- + poppler/PSOutputDev.cc | 22 +++++++++++----------- + poppler/PSOutputDev.h | 19 +++++++++++++++---- + poppler/PreScanOutputDev.cc | 6 ++---- + poppler/PreScanOutputDev.h | 7 +++---- + utils/pdftops.cc | 8 +++----- + 7 files changed, 34 insertions(+), 58 deletions(-) + +commit 3c16e88f7c60ec4f49f856ba22d7f20cf626c7d4 +Author: Philipp Knechtges +Date: Mon Sep 28 15:39:12 2020 +0200 + + pdftops: fix wording in processcolorformat-related error messages + + utils/pdftops.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e4e261a013719a48bb26dbfc9c95dd177eea0557 +Author: Philipp Knechtges +Date: Mon Sep 28 15:33:09 2020 +0200 + + redact splashModeUndefined and as a substitute introduce a boolean + value where necessary + + poppler/PSOutputDev.cc | 4 ++-- + poppler/PSOutputDev.h | 8 +++++++- + splash/SplashTypes.h | 2 -- + utils/pdftops.cc | 20 ++++++++++++++------ + 4 files changed, 23 insertions(+), 11 deletions(-) + +commit 75abc683868d8933f10128074a4234afaf76e77f +Author: Philipp Knechtges +Date: Sun Sep 13 19:59:41 2020 +0200 + + PSOutputDev: use the DeviceN8 bitmap for rasterization with + CMYK-output + overprint + + This mostly mimics the pdftoppm behaviour. + + poppler/PSOutputDev.cc | 24 ++++++++++++--- + poppler/Stream.cc | 82 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Stream.h | 52 ++++++++++++++++++++++++++++++++ + 3 files changed, 153 insertions(+), 5 deletions(-) + +commit 0c772071baa74b11c66981f768dccf123f431ce1 +Author: Philipp Knechtges +Date: Sun Jun 7 21:42:57 2020 +0200 + + PSOutputDev/pdftops: for splashModeCMYK8 and language level >=2 + activate overprint emulation + + The overprint operands are always emitted for any language level >= + 2, such that it is just consistent + to activate overprint emulation during rasterization if it is quite + likely that the final device + supports this operation. + + poppler/PSOutputDev.cc | 6 +++++- + utils/pdftops.1 | 4 +++- + utils/pdftops.cc | 2 +- + 3 files changed, 9 insertions(+), 3 deletions(-) + +commit ccdee13835b66892355ebe1bb8d27556edee32be +Author: Philipp Knechtges +Date: Sun Jun 7 18:34:25 2020 +0200 + + PSOutputDev/pdftops: provide options to set the rasterization color + space and ICC profile + + Poppler so far has to assume some underlying color space. This commit + gives the user the + opportunity to specify this color space through two new options + in pdftops: + -processcolorformat + -processcolorprofile + + The former practically sets the underlying splash bitmap type during + rasterization, + while the latter sets the display profile of the used SplashOutputDev. + + poppler/OutputDev.h | 1 + + poppler/PSOutputDev.cc | 126 + +++++++++++++++++++++++++++++++++++++++---------- + poppler/PSOutputDev.h | 23 +++++++-- + splash/SplashTypes.h | 2 + + utils/CMakeLists.txt | 3 ++ + utils/pdftops.1 | 9 ++++ + utils/pdftops.cc | 91 +++++++++++++++++++++++++++++++++++ + 7 files changed, 226 insertions(+), 29 deletions(-) + +commit ef71527479bab01da0a8b7b7c6da3320d4bdffbe +Author: Albert Astals Cid +Date: Sun Nov 1 19:32:52 2020 +0100 + + Poppler 20.11.0 + + CMakeLists.txt | 4 ++-- + NEWS | 22 ++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 27 insertions(+), 5 deletions(-) + +commit 55a71830ac52ef55c899a1aa6935d935e888e1c7 +Author: Albert Astals Cid +Date: Sun Nov 1 18:58:53 2020 +0100 + + Fix comment as pointed out by Nelson + + poppler/Page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3a6c0f66cf3185658782d3001e778de44ebda8e7 +Author: Albert Astals Cid +Date: Fri Oct 30 15:44:13 2020 +0100 + + Dict: Save 8 bytes of memory + + It's not a lot, but Dict is used relatively often, so won't hurt + for a 1 + line code change + + poppler/Dict.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit af86c98f5732a65933911a906a4bca633457c8af +Author: Albert Astals Cid +Date: Fri Oct 30 16:04:53 2020 +0100 + + CI: Fix qt6 build + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 1ad3bc825185d6cb0bc922d0dafdc3815558011d +Author: Albert Astals Cid +Date: Thu Oct 29 19:46:09 2020 +0100 + + CI: Use debian:unstable instead of fedora:31 that has a newer clazy + + clazy is broken in fedora 32 and 33 and i'm tired of complaining + + .gitlab-ci.yml | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 6d7ed61dfa6a650078446d7a41ab95f2458cfd70 +Author: Albert Astals Cid +Date: Thu Oct 29 15:53:58 2020 +0100 + + const++ + + poppler/Annot.cc | 3 ++- + poppler/Annot.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit b4c83738d82ba0d34b050dc4e4cfec53fe02fcdd +Author: Albert Astals Cid +Date: Thu Oct 29 14:51:00 2020 +0100 + + cmake: Enable CMAKE_LINK_DEPENDS_NO_SHARED + + No need to relink libraries just because the .so it depends on + has been + rebuilt + + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 148e5424e6f0deb7680fdc9b25736888089b6b41 +Author: Albert Astals Cid +Date: Thu Oct 29 13:47:13 2020 +0100 + + clang: Warn about weak-vtables + + CMakeLists.txt | 1 + + cmake/modules/PopplerMacros.cmake | 1 + + glib/poppler-document.cc | 4 ++++ + poppler/Annot.cc | 4 ++++ + poppler/Annot.h | 3 ++- + poppler/CachedFile.cc | 4 +++- + poppler/CachedFile.h | 4 ++-- + poppler/CairoOutputDev.cc | 5 ++++- + poppler/JBIG2Stream.cc | 6 ++++-- + poppler/Link.cc | 2 ++ + poppler/Link.h | 1 + + poppler/PDFDocBuilder.cc | 13 +++++++++++++ + poppler/PDFDocBuilder.h | 4 ++-- + poppler/SplashOutputDev.cc | 4 +++- + poppler/Stream.cc | 10 ++++++++++ + poppler/Stream.h | 4 ++-- + poppler/TextOutputDev.cc | 4 +++- + poppler/XRef.cc | 2 ++ + poppler/XRef.h | 2 +- + qt5/src/poppler-annotation.cc | 14 ++++++++------ + qt5/src/poppler-link-private.h | 6 ++++-- + qt5/src/poppler-link.cc | 24 +++++++++++++++++++++++- + qt5/src/poppler-page.cc | 7 +++++++ + qt5/src/poppler-pdf-converter.cc | 5 ++++- + qt5/src/poppler-ps-converter.cc | 5 ++++- + qt6/src/poppler-annotation.cc | 12 +++++++----- + qt6/src/poppler-link-private.h | 6 ++++-- + qt6/src/poppler-link.cc | 29 ++++++++++++++++++++++++++++- + qt6/src/poppler-page.cc | 7 +++++++ + qt6/src/poppler-pdf-converter.cc | 5 ++++- + qt6/src/poppler-ps-converter.cc | 5 ++++- + splash/SplashPattern.cc | 7 +++++++ + splash/SplashPattern.h | 2 ++ + utils/pdftohtml.cc | 7 +++++-- + 34 files changed, 182 insertions(+), 37 deletions(-) + +commit 9625dfa3c22dcb9075e062912cdf8c60b379d7d8 +Author: Albert Astals Cid +Date: Thu Oct 29 14:29:11 2020 +0100 + + qt6: properly namespace enums to use the correct ones + + qt6/src/poppler-annotation.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1635cbced1c8fcf9a933324908502e7e45429ace +Author: Albert Astals Cid +Date: Thu Oct 29 14:22:11 2020 +0100 + + stress-threads-qt6: Remove unused seed + + qt6/tests/stress-threads-qt6.cpp | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 2706eca3ad3af99fa6551b9d6fcdc69eb0a0aa4e +Author: Albert Astals Cid +Date: Wed Oct 28 22:30:00 2020 +0100 + + More work on rendering of standalone Annot Widgets + + Issue #806 + + poppler/Annot.cc | 5 +++-- + poppler/Annot.h | 2 ++ + poppler/Page.cc | 4 +++- + 3 files changed, 8 insertions(+), 3 deletions(-) + +commit 09b30131df866b5d697ca10a84d5ce060714f8e5 +Author: Albert Astals Cid +Date: Mon Oct 26 22:31:05 2020 +0100 + + Update (C) + + utils/HtmlFonts.cc | 1 + + utils/HtmlFonts.h | 1 + + utils/HtmlOutputDev.cc | 1 + + 3 files changed, 3 insertions(+) + +commit 47550058463d181096770624aad811ae4eaf2688 +Author: Eddie Kohler +Date: Mon Oct 26 14:06:03 2020 -0400 + + HTML and XML output includes opacity. + + In HTML output, the opacity attribute is added to CSS. In XML output, + opacity is a separate XML attribute on . + + utils/HtmlFonts.cc | 20 +++++++++++++++----- + utils/HtmlFonts.h | 12 ++++++++---- + utils/HtmlOutputDev.cc | 2 +- + 3 files changed, 24 insertions(+), 10 deletions(-) + +commit 3e761a5035d5cdbcb861b3ad126942099d075d0e +Author: Albert Astals Cid +Date: Wed Oct 21 00:48:26 2020 +0200 + + Update (C) + + qt5/demos/viewer.cpp | 1 + + qt6/demos/viewer.cpp | 1 + + qt6/src/poppler-document.cc | 2 +- + 3 files changed, 3 insertions(+), 1 deletion(-) + +commit 99346560791c935f74d77405dd35bef0f5823d1b +Author: Oliver Sander +Date: Fri Oct 16 23:01:42 2020 +0200 + + Rename ArthurOutputDev to QPainterOutputDev + + The Qt rendering system hasn't been called 'Arthur' for a long time, + let's adapt the code to that. + + For backward compatibility, the ArthurBackend enum value remains + in the files poppler-qt5.h and poppler-qt6.h. These shouldn't be + used anymore. + + qt5/demos/viewer.cpp | 2 +- + qt5/src/CMakeLists.txt | 2 +- + .../{ArthurOutputDev.cc => QPainterOutputDev.cc} | 102 + ++++++++++----------- + .../src/QPainterOutputDev.h | 26 +++--- + qt5/src/poppler-document.cc | 7 +- + qt5/src/poppler-page.cc | 34 +++---- + qt5/src/poppler-qt5.h | 7 +- + qt5/tests/check_stroke_opacity.cpp | 2 +- + qt5/tests/test-poppler-qt5.cpp | 20 ++-- + qt5/tests/test-render-to-file.cpp | 10 +- + qt6/demos/viewer.cpp | 2 +- + qt6/src/CMakeLists.txt | 2 +- + .../{ArthurOutputDev.cc => QPainterOutputDev.cc} | 102 + ++++++++++----------- + .../src/QPainterOutputDev.h | 26 +++--- + qt6/src/poppler-document.cc | 4 +- + qt6/src/poppler-page.cc | 34 +++---- + qt6/src/poppler-qt6.h | 6 +- + qt6/tests/check_stroke_opacity.cpp | 2 +- + qt6/tests/test-poppler-qt6.cpp | 20 ++-- + qt6/tests/test-render-to-file.cpp | 10 +- + 20 files changed, 211 insertions(+), 209 deletions(-) + +commit 2a7b8555c043c50bfb56b7c361d211fd564a74b8 +Author: Albert Astals Cid +Date: Mon Oct 19 19:29:44 2020 +0200 + + Update (C) + + qt6/demos/pageview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 613c9ce5f503cdbd5f6a3daccbc26f3e5a162f59 +Author: Albert Astals Cid +Date: Mon Oct 19 17:38:16 2020 +0200 + + qt6: fix compile with newer qt6 code + + qt6/demos/pageview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8d0765e957f456725c39435d4ad395ad2f2518b4 +Author: Albert Astals Cid +Date: Sun Oct 18 19:46:20 2020 +0200 + + Switch the order of the checks to check for overflow first + + oss-fuzz/26481 + + fofi/FoFiBase.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 2fd2acd7f0e5710b8e7b1138b519549e7f3d6750 +Author: Kyle Auble +Date: Fri Oct 16 17:18:42 2020 -0400 + + cmake: Deduplicate _list_prefix macro + + The macro is only used after an identical version (_gir_list_prefix) + is included with GObjectIntrospectionMacros. + + glib/CMakeLists.txt | 14 +++----------- + 1 file changed, 3 insertions(+), 11 deletions(-) + +commit 8b7dec2843999f8c3d77d921bd58688fbf4ff313 +Author: Kyle Auble +Date: Sat Oct 10 16:51:12 2020 -0400 + + cmake: Finish making FindGTK more robust + + * Add CMake guards to fix #831 and close !605 + * Move pkg-config calls to FindGTK & parameterize GTK versions + + CMakeLists.txt | 2 ++ + cmake/modules/FindGTK.cmake | 6 +++++- + glib/demo/CMakeLists.txt | 9 ++++++--- + glib/tests/CMakeLists.txt | 12 ++++++++---- + 4 files changed, 21 insertions(+), 8 deletions(-) + +commit ec878dc540ce84aa010240d4795e2be2c3cc9caf +Author: John Hein +Date: Mon Aug 3 18:56:20 2020 -0600 + + cmake: Fix linker error when gtk is not in a default location + + Fix the following error when libgtk-3 (et. al.) is not installed in + a directory that is not a linker default location: + /usr/bin/ld: cannot find -lgtk-3 + + This change leverages pkg-config to add -L paths as well as the list + of gtk3 libraries (-lgtk-3, etc.) + + Signed-off-by: Kyle Auble + + glib/demo/CMakeLists.txt | 4 +++- + glib/tests/CMakeLists.txt | 7 +++++-- + 2 files changed, 8 insertions(+), 3 deletions(-) + +commit c67bd3fafe0cff41855b4a2fdf7a3eb98a05ea3e +Author: Albert Astals Cid +Date: Thu Oct 15 14:18:56 2020 +0200 + + Fix uninitialized memory read on broken files + + oss-fuzz/26264 + + poppler/SecurityHandler.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3d9dab78f7aacf3ad7e0946b3dc60101722df93e +Author: Albert Astals Cid +Date: Wed Oct 7 23:50:42 2020 +0200 + + FileSpec::getEmbeddedFile: Check fileSpec is a dict before calling + getDict + + Fixes #967 + + poppler/FileSpec.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d4be954367cb1ff6f372b74bbd8f186238ec86fc +Author: Albert Astals Cid +Date: Wed Oct 7 00:08:44 2020 +0200 + + cpp: Fix crashes in embedded file handling on broken files + + Fixes #966 + + cpp/poppler-embedded-file.cpp | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +commit 4fee2408dad1a2e872810eadec89cb07dc982312 +Author: Albert Astals Cid +Date: Tue Oct 6 01:08:16 2020 +0200 + + CI: qt6 try to account for the everchanging urls + + .gitlab-ci.yml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 6487612a84b4152c82aa4334a3ef2f1aa4dc7f6f +Author: Kyle Auble +Date: Sun Oct 4 16:38:59 2020 +0000 + + cmake: Remove python libraries check + + * FindPythonLibs is for C/C++ bindings, not typical python modules + * Also make comments & messages clearer + + CMakeLists.txt | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +commit 1ddb6aeff646e2df7b663c0186d4f9bc9859daba +Author: Albert Astals Cid +Date: Sun Oct 4 11:46:45 2020 +0200 + + CI: Update qt6 url + + .gitlab-ci.yml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 061bae27a04684bdb0a1b4a6c3a8adf7fddcb7db +Author: Kyle Auble +Date: Fri Oct 2 23:41:09 2020 +0000 + + cmake: Raise error level of missing gtk-doc deps + + CMakeLists.txt | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 327a7ce092397bc2ddb8a35eca52ab2b3f3bb858 +Author: Kyle Auble +Date: Fri Sep 4 15:07:36 2020 -0400 + + cmake: Reorganize GObject introspection config + + * Fixes #958, separating scanner args enables warnings + + glib/CMakeLists.txt | 38 +++++++++++++++++++++++--------------- + 1 file changed, 23 insertions(+), 15 deletions(-) + +commit ff2130725ce43604323931cf8a365dad9ba93036 +Author: Kyle Auble +Date: Sun Sep 6 20:03:16 2020 -0400 + + cmake: Add some checks for gtk-doc support + + * Fixes #956 (at least on Poppler's end) + * Explicitly check for gtk-doc package also + + CMakeLists.txt | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit c5d85017f5cbc6487327d3de73fbab1c64b6af50 +Author: Kyle Auble +Date: Fri Sep 4 18:32:06 2020 -0400 + + cmake: Note built-in Find<...> modules for later + + * See #955 for details + * FindGLIB: Also fix minor case-sensitivity warning + + cmake/modules/FindFontconfig.cmake | 2 ++ + cmake/modules/FindGLIB.cmake | 2 +- + cmake/modules/FindGTK.cmake | 2 ++ + cmake/modules/FindIconv.cmake | 4 ++++ + 4 files changed, 9 insertions(+), 1 deletion(-) + +commit d288ac9675684fe6fd0e8536a2255b8d341a8ad5 +Author: Albert Astals Cid +Date: Thu Oct 1 21:44:58 2020 +0200 + + Poppler 20.10.0 + + CMakeLists.txt | 4 ++-- + NEWS | 9 +++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 13 insertions(+), 4 deletions(-) + +commit 386555257158e1d170151b40dcea6bc90111e62f +Author: Albert Astals Cid +Date: Thu Oct 1 10:35:10 2020 +0200 + + CI: qt6: new tarballs + + .gitlab-ci.yml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit cfeb9525f0f9e4124de4b3d67de2f4667095366f +Author: Albert Astals Cid +Date: Fri Sep 25 01:21:53 2020 +0200 + + Fix undefined behaviour null pointer passed as argument 2, which is + declared to never be null + + Fixes issue #962 + + poppler/Decrypt.cc | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 2a3368e9c3c8b9a0031faef15041a8ca81f6710a +Author: Albert Astals Cid +Date: Fri Sep 25 01:17:24 2020 +0200 + + Fix undefined behaviour applying non-zero offset 1 to null pointer + + Fixes issue #963 + + poppler/GfxFont.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 613d5f2a7b18e332896ea7829166ce9ce3234ab4 +Author: Albert Astals Cid +Date: Fri Sep 25 01:36:41 2020 +0200 + + CI: Update qt6 + + .gitlab-ci.yml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 636d12b0f403d462af3652e4ebfd62d9fc7c58a8 +Author: Albert Astals Cid +Date: Fri Sep 18 01:26:40 2020 +0200 + + Fix compilation with new Qt6 snaptshot + + qt6/demos/viewer.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 8fd2a2781e3aaf798a4c28f450d778b57ae2b0b8 +Author: Albert Astals Cid +Date: Fri Sep 18 00:54:36 2020 +0200 + + CI: Update qt6 url again + + .gitlab-ci.yml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit eb7940e737633c17696aec78ecad92048d6163e5 +Author: Albert Astals Cid +Date: Wed Sep 16 00:04:01 2020 +0200 + + Filter out repeated forms + + Some files like the one from KDE bug 426467 has the same signature + repeated 23 times in the Fields field, just return it one + + poppler/Form.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 56cf80b2c53fa61d29b4718df092248a062c61e0 +Author: Albert Astals Cid +Date: Mon Sep 14 22:56:15 2020 +0200 + + Update (C) + + poppler/Stream.cc | 2 +- + poppler/Stream.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 12303bbdcc0cc72c6ff641140856f2c1f51041b8 +Author: William Bader +Date: Sun Sep 13 05:22:19 2020 +0100 + + Improve EmbedStream::reset error checking. + + poppler/Stream.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit e2ecddf3fc1f93a68b0ae535813f8b0d5ec672b5 +Author: William Bader +Date: Sun Sep 13 04:52:45 2020 +0100 + + Implement EmbedStream::reset() to fix pdftops -level1sep + -optimizecolorspace for in-line images. + + poppler/Stream.cc | 17 ++++++++++++++++- + poppler/Stream.h | 3 ++- + 2 files changed, 18 insertions(+), 2 deletions(-) + +commit 91d95545b48d3aec6220d943177b571466f9a116 +Author: Albert Astals Cid +Date: Tue Sep 8 13:04:51 2020 +0200 + + CI: update qt6 links + + .gitlab-ci.yml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit bb4d6c963e885aac34a1266bdb9d8371e80b3b27 +Author: Albert Astals Cid +Date: Sat Sep 5 22:02:00 2020 +0200 + + Update (C) + + splash/SplashPath.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c47713528f770ac89c90d662aae72c7e48c9497b +Author: Albert Astals Cid +Date: Sat Sep 5 21:26:37 2020 +0200 + + addStrokeAdjustHint(): fix crash in out-of-memory situation. + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25411 + + #0 0xf7ef8f19 in [vdso] + #1 0xf7ccdd08 in gsignal (/lib32/libc.so.6+0x2bd08) + #2 0xf7ccf206 in abort (/lib32/libc.so.6+0x2d206) + #3 0xbdb9c2e in grealloc(void*, unsigned int, bool) + gdal/poppler/goo/gmem.h:85:5 + #4 0xbdd9e11 in greallocn(void*, int, int, bool, bool) + gdal/poppler/goo/gmem.h:171:12 + #5 0xc012373 in SplashPath::addStrokeAdjustHint(int, int, int, + int) gdal/poppler/splash/SplashPath.cc:211:35 + #6 0xbfd156f in Splash::makeStrokePath(SplashPath*, double, + bool) gdal/poppler/splash/Splash.cc:5987:34 + #7 0xbfcaec2 in Splash::strokeWide(SplashPath*, double) + gdal/poppler/splash/Splash.cc:2028:13 + #8 0xbfc8a4d in Splash::stroke(SplashPath*) + /src/gdal/poppler/splash/Splash.cc + + Based on patch by Even Rouault + + splash/Splash.cc | 4 +++- + splash/SplashPath.cc | 10 ++++++++-- + 2 files changed, 11 insertions(+), 3 deletions(-) + +commit 92ebc6416ccce249a28fafda8123fe86c8aa6311 +Author: Albert Astals Cid +Date: Fri Sep 4 00:21:36 2020 +0200 + + Update (C) + + poppler/CairoFontEngine.cc | 1 + + splash/Splash.h | 1 + + 2 files changed, 2 insertions(+) + +commit 6e07b84aa54d79b25d9dc882bc9f4a0479b16832 +Author: Tobias Deiminger +Date: Wed Sep 2 18:01:08 2020 +0200 + + Splash: Rename Yd to Ydown, Xu to Xup, etc. + + Minor gift to new contributors. Makes methods intention more obvious. + + splash/Splash.cc | 50 +++++++++++++++++++++++++------------------------- + splash/Splash.h | 18 +++++++++--------- + 2 files changed, 34 insertions(+), 34 deletions(-) + +commit e79cbe0adcf7d1a0dbfc4a77a096d2fbab327f39 +Author: Michal +Date: Wed Sep 2 17:18:06 2020 +0000 + + evict just font faces owned solely by cache + + These are font faces with reference count 1. Their scaled fonts + were already evicted from cairo holdover cache. This should be more + functionally equivalent to old behaviour except that eviction is + done lazily and not eagerly. + + poppler/CairoFontEngine.cc | 40 +++++++++++++++++++++------------------- + 1 file changed, 21 insertions(+), 19 deletions(-) + +commit 2dbd1e0ac8102ec12eb6026df6708ef7c38fc05d +Author: Albert Astals Cid +Date: Tue Sep 1 22:53:33 2020 +0200 + + poppler 20.09.0 + + CMakeLists.txt | 2 +- + NEWS | 31 +++++++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 35 insertions(+), 4 deletions(-) + +commit b82d0e17fb8d26f87a51d79046364d141187bd61 +Author: Albert Astals Cid +Date: Tue Sep 1 22:45:32 2020 +0200 + + Fix memory leak introduced in 9e853438c5e9d56c07141220f2b30d7215ee9278 + + Thankfully coverity caught it before the release :) + + poppler/JBIG2Stream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit ee0bd54496376c18f25d1c863f583598d3ee2632 +Author: Martin Packman +Date: Sun Aug 30 22:37:48 2020 +0100 + + Add gitlab checkbox point to contributors doc + + As mentioned by @aacid in merge request comments. + + Also through general note about helpful title and descriptions. + + README.contributors | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit e5e63c5b65099392e95bedc0051bfe849c7b0d85 +Author: Albert Astals Cid +Date: Sun Aug 30 18:37:37 2020 +0200 + + Update (C) + + splash/Splash.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 6a7dae795d3a08497db4a680d6d15ae10df0c681 +Author: Tobias Deimigner +Date: Fri Aug 28 19:41:18 2020 +0200 + + Splash bilinear scaling: Don't try read behind end + + Source line iteration in Splash::scaleImageYuXuBilinear already tries + to prevent a read behind source image end, as the comment indicates it + and as it's conceptually reasonable. But the check for (currentSrcRow + < srcHeight) + is wrong and doesn't do what it claims. + + currentSrcRow will only ever increase to srcHeight - 1 after + scaledHeight iterations. Therefore the check always evaluates to + true, and src() is aways called. Intention was to prevented the line + fetch for the last run and leave line2 identical to line1 (the + "extra padding"). + + Nothing bad happened, because SplashOutputDev::imageSrc and + alphaImageSrc + gracefully handle the behind-end read. Should be corrected either. + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 78e6050a89d37a9d708eef92e15494d64d1a62c0 +Author: Albert Astals Cid +Date: Sat Aug 29 12:07:50 2020 +0200 + + CI: Update qt6 archives + + .gitlab-ci.yml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit a9fc7f0bcdcece62eda698016064a5f9e3acea24 +Author: Albert Astals Cid +Date: Sat Aug 29 12:30:34 2020 +0200 + + qt6: workaround QTBUG-86318 + + qt6/tests/stress-threads-qt6.cpp | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit 418a9373616c14e67a1f9792d4039e62c3f8feb9 +Author: Albert Astals Cid +Date: Sat Aug 29 12:12:41 2020 +0200 + + qt6: Remove unused include + + qt6/src/poppler-annotation.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 155d7201def1e2b337e408e0c86edf9e5093853a +Author: Albert Astals Cid +Date: Thu Aug 27 22:03:05 2020 +0200 + + Update (C) + + poppler/TextOutputDev.cc | 2 +- + poppler/TextOutputDev.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 375809c897a66f42880b9ed522df3cb6bad6c305 +Author: Nelson Benítez León +Date: Wed Aug 26 14:18:48 2020 -0400 + + TextSelectionPainter: support glyphless fonts + + in text selections, by: + + - Ignoring to draw characters with it. + - Painting the selection's background as transparent. + + Fixes issue #157 + + Based on inital work by Nelson Benitez and changed + to be not tesseract specific by Julian Andres Klode. + + poppler/TextOutputDev.cc | 35 ++++++++++++++++++++++++++++++----- + poppler/TextOutputDev.h | 1 + + 2 files changed, 31 insertions(+), 5 deletions(-) + +commit 55eb5c73e5fb609ba56dee28f74e53b2be28fbb7 +Author: Albert Astals Cid +Date: Wed Aug 26 22:37:31 2020 +0200 + + BaseMemStream::getChars: If we're past the end do nothing + + poppler/Stream.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit c09f01b1be772b39b3d160ebdd6d09eac06e375d +Author: Albert Astals Cid +Date: Tue Aug 25 23:13:32 2020 +0200 + + Update (C) + + qt5/src/poppler-private.cc | 2 +- + qt6/src/poppler-private.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 2b8692a5a52a8cd997e70f7912ad7cedeb34891b +Author: Albert Astals Cid +Date: Tue Aug 25 23:05:51 2020 +0200 + + qt: Clean as many null characters from the end as possible + + Not only one + + Fixes KDE bug #425791 + + qt5/src/poppler-private.cc | 4 ++-- + qt5/tests/check_strings.cpp | 9 +++++++++ + qt6/src/poppler-private.cc | 4 ++-- + qt6/tests/check_strings.cpp | 9 +++++++++ + 4 files changed, 22 insertions(+), 4 deletions(-) + +commit 4febe9d3ba3359005098b134e5bbe2ec434c87fd +Author: Albert Astals Cid +Date: Tue Aug 18 22:51:22 2020 +0200 + + qt5: Be a bit more stubborn converting dates that come from xml + + qt5/src/poppler-annotation.cc | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit 3023066f19509a8e5ced403d5afc804c4d6af238 +Author: Albert Astals Cid +Date: Tue Aug 18 22:38:43 2020 +0200 + + qt5/6: Make Annotation::setModification/CreationDate work on + existing annots + + With an autotest + + and bonus memory leak fixes for existing tests + + qt5/src/poppler-annotation.cc | 37 ++++++++++---------- + qt5/tests/check_annotations.cpp | 75 + +++++++++++++++++++++++++++++++++++++++++ + qt6/src/poppler-annotation.cc | 37 ++++++++++---------- + qt6/tests/check_annotations.cpp | 75 + +++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 190 insertions(+), 34 deletions(-) + +commit 7064bb38e918edd71d72cba5544b3f3ed73253cf +Author: Albert Astals Cid +Date: Tue Aug 18 21:50:18 2020 +0200 + + Fix clearing date in Annot setModified/setDate + + nullptr means nullptr not null string + + poppler/Annot.cc | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +commit e10b0a88bc8182710fd98a919740e349426386f4 +Author: Albert Astals Cid +Date: Sat Aug 22 21:55:10 2020 +0000 + + qt: MSVC test fixes + + qt5/tests/check_search.cpp | 68 + +++++++++++++++++++------------------- + qt5/tests/check_utf_conversion.cpp | 2 +- + 2 files changed, 35 insertions(+), 35 deletions(-) + +commit 307d6db4247e3b934b5d26059fcd217517c4a187 +Author: Albert Astals Cid +Date: Sat Aug 22 20:01:09 2020 +0200 + + Gfx::opSetExtGState: Fix memory leak on broken files + + While at it move definitions of i and funcs down where used, + also remove + the abuse of funcs[0] in one place and just declare a Function for it + + poppler/Gfx.cc | 40 ++++++++++++++++++++++------------------ + 1 file changed, 22 insertions(+), 18 deletions(-) + +commit cad2f028601d8d54277ce8a7876fad3250da0d45 +Author: Albert Astals Cid +Date: Fri Aug 21 22:20:12 2020 +0200 + + Update (C) + + poppler/GlobalParams.cc | 1 + + 1 file changed, 1 insertion(+) + +commit dccd9dbc25560681f0b429178bc96765ce1ae70a +Author: Kai Pastor +Date: Fri Aug 21 18:50:17 2020 +0000 + + Fix #elif statement + + WITH_FONTCONFIGURATION_WIN32 is either undefined or 1. + + poppler/GlobalParams.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 171bd475f0cc2c98ccd864adf3fd73ecfd4af7cd +Author: Albert Astals Cid +Date: Fri Aug 21 19:55:32 2020 +0200 + + qt6: Make inplaceAlign return an enum not an int + + qt6/src/poppler-annotation.cc | 34 +++++++++++++++++++++++++++------- + qt6/src/poppler-annotation.h | 11 ++++++++--- + 2 files changed, 35 insertions(+), 10 deletions(-) + +commit f9480192c02789e687156fd2c297980dde6461ac +Author: Albert Astals Cid +Date: Fri Aug 21 19:44:50 2020 +0200 + + qt6: Remove useless A_BASE enum value + + qt6/src/poppler-annotation.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit d1bb49c3368fa2c16c43abbc800566bb2905e429 +Author: Albert Astals Cid +Date: Fri Aug 21 19:44:27 2020 +0200 + + qt6: Make flags method actually return flags and not int + + qt6/src/poppler-annotation-private.h | 4 ++-- + qt6/src/poppler-annotation.cc | 20 +++++++++++--------- + qt6/src/poppler-annotation.h | 9 +++++---- + 3 files changed, 18 insertions(+), 15 deletions(-) + +commit 150e6efa0e9495ffceffbdfbff795bc9ccdf45f7 +Author: Albert Astals Cid +Date: Fri Aug 21 15:32:23 2020 +0200 + + qt: Document TextAnnotation::inplaceAlign + + qt5/src/poppler-annotation.h | 1 + + qt6/src/poppler-annotation.h | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 92b3edf32a9f7a3617681135290e9d2ba0205ffb +Author: Jason Crain +Date: Wed Feb 12 19:16:20 2020 -0700 + + glib: Add accessor functions for PopplerAttachment + + Issue #715 + + glib/demo/annots.c | 2 +- + glib/demo/attachments.c | 21 ++++++++++----- + glib/poppler-attachment.cc | 52 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-attachment.h | 20 +++++++++++--- + glib/reference/poppler-sections.txt | 4 +++ + 5 files changed, 87 insertions(+), 12 deletions(-) + +commit b13cd962b59e65846e3a9b18eee8a8b999b0291a +Author: Jason Crain +Date: Fri Jan 3 19:05:57 2020 -0700 + + glib: Deprecate PopplerDocument date properties + + PopplerDocument's creation-date and mod-date properties are 32-bit + unix + times, a.k.a. GTime, and will overflow in 2038. Deprecate these + properties and replace with creation-datetime and mod-datetime, which + are GDateTime instead, and add accessor functions. + + Fixes #765 + + glib/demo/info.cc | 12 +-- + glib/poppler-document.cc | 161 + +++++++++++++++++++++++++++++++++++- + glib/poppler-document.h | 8 ++ + glib/poppler-private.h | 1 + + glib/reference/poppler-sections.txt | 4 + + 5 files changed, 178 insertions(+), 8 deletions(-) + +commit c146da765689968ceb09921928152d5ecd5b0956 +Author: Jason Crain +Date: Fri Jan 3 18:42:21 2020 -0700 + + glib: Deprecate PopplerAttachment GTime fields + + GTime was deprecated in glib 2.62 and will overflow in 2038. + + The PopplerAttachment struct publicly uses GTime for the 'mtime' and + 'ctime' fields. Deprecate these two fields and add accessor functions, + poppler_attachment_get_ctime and poppler_attachment_get_mtime, which + retun GDateTime* instead. + + Fixes #765, Related to #715 + + glib/demo/attachments.c | 15 ++++++----- + glib/poppler-attachment.cc | 52 + ++++++++++++++++++++++++++++++++----- + glib/poppler-attachment.h | 16 ++++++++++++ + glib/poppler-document.cc | 36 +++++++++++++++++++++++++ + glib/poppler-private.h | 1 + + glib/reference/poppler-sections.txt | 2 ++ + 6 files changed, 110 insertions(+), 12 deletions(-) + +commit d7ead51f00e30d7f660ed5914acc26461beb057d +Author: Albert Astals Cid +Date: Wed Aug 19 18:34:44 2020 +0200 + + Pretend Opt in Choice forms is inheritable + + The spec doesn't say it is, but Adobe Reader acts like it is, + so emulate + its bug (or it's a bug in the spec) + + Fixes KDE bug #425520 + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 11f83d58fcbd08e648a6b40c2857218fb5ee02a2 +Author: Liam Morland +Date: Mon Aug 17 21:13:16 2020 -0400 + + pdftoppm: Document that PDF-file can be - to read it from stdin + + utils/pdftoppm.1 | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit d40cb7cc2e448abb4e3a075df0f47cd8dc9cd93f +Author: Liam Morland +Date: Mon Aug 17 21:12:25 2020 -0400 + + pdftotext: Document that PDF-file can be - to read it from stdin + + utils/pdftotext.1 | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 9f30c65b788ba13ae57cffdae8d6c24aec0244bf +Author: Liam Morland +Date: Mon Aug 17 21:11:22 2020 -0400 + + pdfinfo: Document that PDF-file can be - to read it from stdin + + utils/pdfinfo.1 | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 4ea3c7159b13b81d5e423adee027e57e4737006f +Author: Liam Morland +Date: Mon Aug 17 21:10:12 2020 -0400 + + pdffonts: Document that PDF-file can be - to read it from stdin + + utils/pdffonts.1 | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 9c181392389367715dd047feaaaaca9fecac8ada +Author: Liam Morland +Date: Tue Aug 18 01:02:57 2020 +0000 + + pdfimages: Document that PDF-file can be '-' to read it from stdin + + utils/pdfimages.1 | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 42e7905de47c514cec0aba0f0e2ceb4b5fcf5372 +Author: Liam Morland +Date: Tue Aug 18 00:59:28 2020 +0000 + + pdftohtml: Document that PDF-file can be '-' to read it from stdin + + utils/pdftohtml.1 | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 66afa7bfeae4e3cddcb6a9ae7426b6ace01590c5 +Author: Albert Astals Cid +Date: Tue Aug 11 00:14:00 2020 +0200 + + Update (C) + + poppler/JArithmeticDecoder.cc | 1 + + poppler/JArithmeticDecoder.h | 1 + + poppler/JBIG2Stream.cc | 2 +- + poppler/JBIG2Stream.h | 2 +- + 4 files changed, 4 insertions(+), 2 deletions(-) + +commit 8c4d5da844efd1b9e99ae0304d6625170a069d4b +Author: Even Rouault +Date: Sun Aug 9 19:09:27 2020 +0200 + + JBIG2: avoid potential undefined bit-wise shift + + poppler/JBIG2Stream.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 9e853438c5e9d56c07141220f2b30d7215ee9278 +Author: Even Rouault +Date: Sun Aug 9 19:07:11 2020 +0200 + + JBIG2: avoid abort() on large memory allocation + + Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24772 + + When numInputSyms + numNewSyms is large enough, a fatal out of memory + allocation can occur in JArithmeticDecoderStats() constructor per + + ``` + #0 0xf7f6bf19 in [vdso] + #1 0xf7d40d08 in gsignal (/lib32/libc.so.6+0x2bd08) + #2 0xf7d42206 in abort (/lib32/libc.so.6+0x2d206) + #3 0xbdc0049 in gmalloc(unsigned int, bool) + gdal/poppler/goo/gmem.h:52:5 + #4 0xbdf3c61 in gmallocn(int, int, bool) + gdal/poppler/goo/gmem.h:119:12 + #5 0xc1391fd in + JArithmeticDecoderStats::JArithmeticDecoderStats(int) + gdal/poppler/poppler/JArithmeticDecoder.cc:36:30 + #6 0xc1130d5 in JBIG2Stream::resetIntStats(int) + gdal/poppler/poppler/JBIG2Stream.cc:4052:25 + #7 0xc1083df in JBIG2Stream::readSymbolDictSeg(unsigned + int, unsigned int, unsigned int*, unsigned int) + gdal/poppler/poppler/JBIG2Stream.cc:1624:9 + #8 0xc105305 in JBIG2Stream::readSegments() + gdal/poppler/poppler/JBIG2Stream.cc:1318:18 + #9 0xc103f5a in JBIG2Stream::reset() + gdal/poppler/poppler/JBIG2Stream.cc:1142:5 + ``` + + Avoid it and return nicely. + + poppler/JArithmeticDecoder.cc | 6 ++++-- + poppler/JArithmeticDecoder.h | 1 + + poppler/JBIG2Stream.cc | 25 +++++++++++++++++++++---- + poppler/JBIG2Stream.h | 2 +- + 4 files changed, 27 insertions(+), 7 deletions(-) + +commit c063a74dd8ff9385165015b7d26f15658046b51c +Author: Liam Morland +Date: Sat Aug 8 17:47:08 2020 +0000 + + Document that PDF-file can be '-' to read it from stdin + + utils/pdftops.1 | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit bc42bcaa7d56c17901e4fd333d3afd91bab8c88f +Author: Albert Astals Cid +Date: Sat Aug 8 19:27:24 2020 +0200 + + Refine the entry type check + + Fixes KDE bug #424779 + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c3c3ae490dd4c5341eb15bd3abdac293cf442263 +Author: Albert Astals Cid +Date: Mon Aug 3 23:58:14 2020 +0200 + + Update (C) + + utils/pdftoppm.cc | 1 + + 1 file changed, 1 insertion(+) + +commit eb3447e579aeeb88847196e8bee359e1e737746f +Author: Stéfan van der Walt +Date: Mon Aug 3 21:57:16 2020 +0000 + + pdftoppm: report error and exit if output file cannot be written + + utils/pdftoppm.cc | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +commit 6307b5c229d11690b8ed9d11bdaec48cb470c51e +Author: Albert Astals Cid +Date: Sun Aug 2 20:25:13 2020 +0200 + + cmake: Remove stray support for lcms1 in pdftocairo + + utils/CMakeLists.txt | 3 --- + 1 file changed, 3 deletions(-) + +commit 446baf49e696001305ed2d3e57c157862a780370 +Author: Albert Astals Cid +Date: Sun Aug 2 20:22:57 2020 +0200 + + cmake: Modern way to link against libtiff + + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit bc5edcfba6ae88e989892f5d24c69d8ed719ab78 +Author: Albert Astals Cid +Date: Sun Aug 2 20:19:19 2020 +0200 + + cmake: Modern way to link against zlib + + CMakeLists.txt | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 1d83bd32487fc645b7c6dba132764448eb4b0272 +Author: Albert Astals Cid +Date: Sun Aug 2 20:12:28 2020 +0200 + + cmake: Modern way to link against libpng + + CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 175370fda156c1f19072f98bdd236ee4561e4620 +Author: Albert Astals Cid +Date: Sat Aug 1 18:40:32 2020 +0200 + + 20.08.0 + + CMakeLists.txt | 13 ++++++++----- + NEWS | 12 ++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 22 insertions(+), 7 deletions(-) + +commit 3a9bfd6ef981692b391e63c32725c12817a2d08f +Author: Jean Ghali +Date: Mon Jul 20 18:34:30 2020 +0200 + + Fix x86 + windows asm + + It broke during the clang-reformat + + splash/SplashMath.h | 40 +++++++++++++++++++++++++++++++--------- + 1 file changed, 31 insertions(+), 9 deletions(-) + +commit 95adf3ed13c963b166f8fca5332dac2c1e886fdd +Author: Albert Astals Cid +Date: Sat Jul 18 16:26:04 2020 +0200 + + Update (C) + + splash/SplashState.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 08b6fd0f11cb052a3674c1e91fee4a85f60d4e54 +Author: Peter Wang +Date: Thu Jul 16 11:16:03 2020 +1000 + + Splash: Set initial line width to 1 + + Fixes #674 + + The initial value of the line width graphics state parameter in PDF + is 1.0. + + splash/SplashState.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 39fe3635bd5bbbc15a1660dea2cbf85cb8517b6f +Author: Albert Astals Cid +Date: Thu Jul 16 19:14:13 2020 +0200 + + Update (C) + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4411426325e05228c57ae05a3849443b4da16b21 +Author: Thomas Freitag +Date: Thu Jul 16 16:57:27 2020 +0000 + + In case of sub-page objects: initialize clip max values considering + the render resolution + + Fixes #937 + + poppler/Gfx.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit a17296083cbbaf4a954429ec9b7a3b1de0c04904 +Author: Albert Astals Cid +Date: Mon Jul 13 22:18:44 2020 +0200 + + qt6: There's no AnnotationUtils class anymore + + qt6/src/poppler-annotation.h | 9 --------- + 1 file changed, 9 deletions(-) + +commit 1a389a50a7ee6a4df02e9dee70ccd7b47e31770a +Author: Albert Astals Cid +Date: Wed Jul 8 22:23:44 2020 +0200 + + GfxShading: Simplify holding the Function + + Make it be a vector of unique pointers. + + That way we don't have to worry to delete the pointers on error cases, + they are deleted automatically. + + This actually fixes some leaks because in some cases we were deleting + them on the error case but in some others we were not + + poppler/GfxState.cc | 228 + ++++++++++++++++++---------------------------------- + poppler/GfxState.h | 38 ++++----- + 2 files changed, 93 insertions(+), 173 deletions(-) + +commit ec8a43c8df29fdd6f1228276160898ccd9401c92 +Author: Albert Astals Cid +Date: Sat Jul 4 00:08:55 2020 +0200 + + Fix stack overflow with specially crafted files + + The file is not malformed per se, it just has a huge XRefStm chain + and we end up exhausting the stack space trying to parse them all. + + Having more than 4096 XRefStm seems like won't really happen on real + life so break the flow at that point + + Fixes #936 + + poppler/XRef.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 3a6c77bc21e4982619ade995564466fbc543d3ac +Author: Albert Astals Cid +Date: Mon Jul 13 22:16:36 2020 +0200 + + qt5: Mark AnnotationUtils as deprecated, it's gone in qt6 + + qt5/src/poppler-annotation.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 31731735e1176136b4f853762a4da59e61064f80 +Author: Albert Astals Cid +Date: Mon Jul 13 18:40:24 2020 +0200 + + Deprecated Document::toc in qt5 and remove it in qt6 + + Use Document::outline instead + + Allows us to not link to QtXml anymore in qt6 + + CMakeLists.txt | 6 ++-- + qt5/src/poppler-qt5.h | 2 +- + qt6/src/CMakeLists.txt | 2 +- + qt6/src/poppler-document.cc | 17 --------- + qt6/src/poppler-private.cc | 87 + --------------------------------------------- + qt6/src/poppler-private.h | 2 -- + qt6/src/poppler-qt6.h | 27 +------------- + 7 files changed, 6 insertions(+), 137 deletions(-) + +commit 79ee55abfb58c1f3b5f2e8dc68a403908484ef43 +Author: Albert Astals Cid +Date: Sat Jul 11 00:52:30 2020 +0200 + + 0.90.1 + + CMakeLists.txt | 2 +- + NEWS | 12 ++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 15 insertions(+), 3 deletions(-) + +commit 969562d387b3791c7bc192a213e74049e08c9395 +Author: Albert Astals Cid +Date: Sat Jul 11 00:41:13 2020 +0200 + + Fix UTF16LE support in TextStringToUCS4 + + Make test a bit more complex by using a nice checkbox + + Also copy the text to the qt6 folder + + poppler/UTF.cc | 2 +- + qt5/tests/check_utf_conversion.cpp | 36 ++++++++++++++++++++----------- + qt6/tests/check_utf_conversion.cpp | 44 + +++++++++++++++++++++++++++++++++++++- + 3 files changed, 68 insertions(+), 14 deletions(-) + +commit 8ee6907bd64b0eb77997ca05c2fc910d5225f4b5 +Author: Albert Astals Cid +Date: Fri Jul 10 23:09:44 2020 +0200 + + Update (C) + + poppler/UTF.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9a880ecd7d865a12b0f91f56285907bbb409f32f +Author: Nelson Benítez León +Date: Thu Jul 9 01:36:24 2020 -0400 + + Add test for UTF16LE string support + + Issue #941 + + qt5/tests/check_utf_conversion.cpp | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +commit 232cba307e8be35022426ba85f34198af7406899 +Author: Nelson Benítez León +Date: Thu Jul 9 01:37:20 2020 -0400 + + Make TextStringToUCS4() support UTF16-LE too + + UTF16-LE strings can 'de facto' appear on pdf's + (eg. title of Outline items) and Acrobat display + them fine, so let's support that so we don't + show an ugly 'ÿþ' at start of the text (Okular) + or even no text at all (Evince). + + Issue #941 + + Evince issue: + https://gitlab.gnome.org/GNOME/evince/-/issues/1444 + + poppler/UTF.cc | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit d3af7282507be3846c680a4f66b84b6b3e54853a +Author: Albert Astals Cid +Date: Fri Jul 10 17:14:17 2020 +0200 + + qt6: Drop the AnnotationUtils functions to store/read from xml + + Basically it's undocumented API, you'd have to read this very + same code + to know what to expect on the XML + + qt6/src/poppler-annotation.cc | 1102 + ----------------------------------------- + qt6/src/poppler-annotation.h | 58 --- + 2 files changed, 1160 deletions(-) + +commit b2fadd0f7c5346c07181dd3730bf8d8a255f55b0 +Author: Albert Astals Cid +Date: Thu Jul 9 00:28:48 2020 +0200 + + Fix conversion to PS in locales where decimal point is , + + The bug is only present in newer versions of lcms + + poppler/GfxState.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 2ec6bb9d0b1cfb3a1176e2b761b99c8e9d712642 +Author: Albert Astals Cid +Date: Wed Jul 8 00:52:17 2020 +0200 + + CI: image tweaks + + qt5_docs can go back to debian unstable + + clazy one still needs fedora 31, on fedora 32 clazy crashes, they are + investigating it + + .gitlab-ci.yml | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit c290052d1060dbc53b565f1a34f1375324e2a668 +Author: Albert Astals Cid +Date: Sat Jul 4 01:17:34 2020 +0200 + + CI: add missing dependency in freetype + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e225b4b804881de02a5d1beb3f3f908a8f8ddc3d +Author: Albert Astals Cid +Date: Tue Jun 16 09:26:54 2020 +0200 + + Qt6 frontend + + Basically a copy of qt5 to qt6 + + Tested with the tests and the demo, seems to work relatively well + + Changes: + * Changed a few QLinkedList to QVector, we don't need the features + that + QLinkedList provided + * Adapt code to QByteArray behaviour change in [] with indexes + past the + size + * Removed a few deprecated functions from our API + * Use more modern cmake syntax to link against the libraries + * QDate::toString is gone, use QLocale::toString with a date + * Use the QDateTime variants of secsSinceEpoch instead of time_t + + .gitlab-ci.yml | 8 +- + CMakeLists.txt | 14 + + qt6/.gitignore | 4 + + qt6/CMakeLists.txt | 11 + + qt6/demos/.gitignore | 4 + + qt6/demos/CMakeLists.txt | 25 + + qt6/demos/abstractinfodock.cpp | 52 + + qt6/demos/abstractinfodock.h | 48 + + qt6/demos/documentobserver.cpp | 45 + + qt6/demos/documentobserver.h | 53 + + qt6/demos/embeddedfiles.cpp | 73 + + qt6/demos/embeddedfiles.h | 44 + + qt6/demos/fonts.cpp | 67 + + qt6/demos/fonts.h | 43 + + qt6/demos/info.cpp | 67 + + qt6/demos/info.h | 43 + + qt6/demos/main_viewer.cpp | 33 + + qt6/demos/metadata.cpp | 45 + + qt6/demos/metadata.h | 43 + + qt6/demos/navigationtoolbar.cpp | 141 + + qt6/demos/navigationtoolbar.h | 66 + + qt6/demos/optcontent.cpp | 63 + + qt6/demos/optcontent.h | 47 + + qt6/demos/pageview.cpp | 96 + + qt6/demos/pageview.h | 53 + + qt6/demos/permissions.cpp | 61 + + qt6/demos/permissions.h | 43 + + qt6/demos/thumbnails.cpp | 79 + + qt6/demos/thumbnails.h | 48 + + qt6/demos/toc.cpp | 165 + + qt6/demos/toc.h | 45 + + qt6/demos/viewer.cpp | 311 ++ + qt6/demos/viewer.h | 73 + + qt6/src/.gitignore | 9 + + qt6/src/ArthurOutputDev.cc | 1155 +++++++ + qt6/src/ArthurOutputDev.h | 206 ++ + qt6/src/CMakeLists.txt | 68 + + qt6/src/Doxyfile | 1637 +++++++++ + qt6/src/Mainpage.dox | 85 + + qt6/src/poppler-annotation-helper.h | 73 + + qt6/src/poppler-annotation-private.h | 112 + + qt6/src/poppler-annotation-private.h.orig | 115 + + qt6/src/poppler-annotation.cc | 4636 + ++++++++++++++++++++++++++ + qt6/src/poppler-annotation.h | 1397 ++++++++ + qt6/src/poppler-base-converter.cc | 89 + + qt6/src/poppler-converter-private.h | 52 + + qt6/src/poppler-document.cc | 873 +++++ + qt6/src/poppler-embeddedfile-private.h | 44 + + qt6/src/poppler-embeddedfile.cc | 129 + + qt6/src/poppler-export.h | 20 + + qt6/src/poppler-fontinfo.cc | 153 + + qt6/src/poppler-form.cc | 1015 ++++++ + qt6/src/poppler-form.h | 755 +++++ + qt6/src/poppler-link-extractor-private.h | 56 + + qt6/src/poppler-link-extractor.cc | 81 + + qt6/src/poppler-link-private.h | 70 + + qt6/src/poppler-link.cc | 664 ++++ + qt6/src/poppler-link.h | 657 ++++ + qt6/src/poppler-media.cc | 154 + + qt6/src/poppler-media.h | 98 + + qt6/src/poppler-movie.cc | 106 + + qt6/src/poppler-optcontent-private.h | 133 + + qt6/src/poppler-optcontent.cc | 437 +++ + qt6/src/poppler-optcontent.h | 81 + + qt6/src/poppler-outline-private.h | 48 + + qt6/src/poppler-outline.cc | 183 + + qt6/src/poppler-page-private.h | 58 + + qt6/src/poppler-page-transition-private.h | 35 + + qt6/src/poppler-page-transition.cc | 100 + + qt6/src/poppler-page-transition.h | 142 + + qt6/src/poppler-page.cc | 882 +++++ + qt6/src/poppler-pdf-converter.cc | 103 + + qt6/src/poppler-private.cc | 291 ++ + qt6/src/poppler-private.h | 262 ++ + qt6/src/poppler-ps-converter.cc | 256 ++ + qt6/src/poppler-qiodeviceinstream-private.h | 48 + + qt6/src/poppler-qiodeviceinstream.cc | 59 + + qt6/src/poppler-qiodeviceoutstream-private.h | 47 + + qt6/src/poppler-qiodeviceoutstream.cc | 57 + + qt6/src/poppler-qt6.h | 2151 ++++++++++++ + qt6/src/poppler-sound.cc | 125 + + qt6/src/poppler-textbox.cc | 63 + + qt6/src/poppler-version.cpp | 40 + + qt6/src/poppler-version.h.in | 68 + + qt6/tests/.gitignore | 33 + + qt6/tests/CMakeLists.txt | 69 + + qt6/tests/README.unittest | 23 + + qt6/tests/check_actualtext.cpp | 57 + + qt6/tests/check_annotations.cpp | 194 ++ + qt6/tests/check_attachments.cpp | 154 + + qt6/tests/check_dateConversion.cpp | 104 + + qt6/tests/check_fonts.cpp | 235 ++ + qt6/tests/check_forms.cpp | 257 ++ + qt6/tests/check_goostring.cpp | 161 + + qt6/tests/check_lexer.cpp | 108 + + qt6/tests/check_links.cpp | 121 + + qt6/tests/check_metadata.cpp | 286 ++ + qt6/tests/check_object.cpp | 41 + + qt6/tests/check_optcontent.cpp | 453 +++ + qt6/tests/check_outline.cpp | 50 + + qt6/tests/check_pagelabelinfo.cpp | 72 + + qt6/tests/check_pagelayout.cpp | 50 + + qt6/tests/check_pagemode.cpp | 74 + + qt6/tests/check_password.cpp | 115 + + qt6/tests/check_permissions.cpp | 45 + + qt6/tests/check_search.cpp | 282 ++ + qt6/tests/check_strings.cpp | 228 ++ + qt6/tests/check_stroke_opacity.cpp | 96 + + qt6/tests/check_utf_conversion.cpp | 147 + + qt6/tests/poppler-attachments.cpp | 36 + + qt6/tests/poppler-fonts.cpp | 87 + + qt6/tests/poppler-forms.cpp | 272 ++ + qt6/tests/poppler-page-labels.cpp | 45 + + qt6/tests/poppler-texts.cpp | 37 + + qt6/tests/stress-poppler-dir.cpp | 66 + + qt6/tests/stress-poppler-qt6.cpp | 74 + + qt6/tests/stress-threads-qt6.cpp | 272 ++ + qt6/tests/test-password-qt6.cpp | 132 + + qt6/tests/test-poppler-qt6.cpp | 218 ++ + qt6/tests/test-render-to-file.cpp | 59 + + 120 files changed, 26942 insertions(+), 2 deletions(-) + +commit cd4feb323f005e3b0443572a1123683af5fab71b +Author: Albert Astals Cid +Date: Thu Jun 18 23:54:45 2020 +0200 + + Add .git-blame-ignore-revs and some instructions for clang-format + + .git-blame-ignore-revs | 2 ++ + README.contributors | 17 +++++++++++++++++ + hooks/pre-commit | 10 ++++++++++ + 3 files changed, 29 insertions(+) + +commit 9d9e20bdcdaf8d6da562e792b9e5672193e714e2 +Author: Albert Astals Cid +Date: Fri Jun 19 16:52:02 2020 +0200 + + Check clang-format at CI stage + + .gitlab-ci.yml | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 814fbda28cc8a37fed3134c2db8da28f86fb5ee0 +Author: Albert Astals Cid +Date: Fri Jul 3 23:51:42 2020 +0200 + + Run clang-format + + find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name + "*.cc" \) -exec clang-format -i {} \; + + If you reached this file doing a git blame, please see + README.contributors (instructions added 2 commits in the future to + this one) + + cmake/modules/CheckFileOffsetBits.c | 7 +- + cpp/poppler-destination-private.h | 3 +- + cpp/poppler-destination.cpp | 14 +- + cpp/poppler-destination.h | 8 +- + cpp/poppler-document-private.h | 16 +- + cpp/poppler-document.cpp | 91 +- + cpp/poppler-document.h | 30 +- + cpp/poppler-embedded-file-private.h | 7 +- + cpp/poppler-embedded-file.cpp | 13 +- + cpp/poppler-embedded-file.h | 3 +- + cpp/poppler-font-private.h | 24 +- + cpp/poppler-font.cpp | 28 +- + cpp/poppler-font.h | 9 +- + cpp/poppler-global.cpp | 59 +- + cpp/poppler-global.h | 70 +- + cpp/poppler-image-private.h | 5 +- + cpp/poppler-image.cpp | 59 +- + cpp/poppler-image.h | 8 +- + cpp/poppler-page-private.h | 8 +- + cpp/poppler-page-renderer.cpp | 103 +- + cpp/poppler-page-renderer.h | 14 +- + cpp/poppler-page-transition.cpp | 18 +- + cpp/poppler-page-transition.h | 14 +- + cpp/poppler-page.cpp | 113 +- + cpp/poppler-page.h | 43 +- + cpp/poppler-private.cpp | 5 +- + cpp/poppler-private.h | 16 +- + cpp/poppler-rectangle.cpp | 5 +- + cpp/poppler-rectangle.h | 74 +- + cpp/poppler-toc-private.h | 12 +- + cpp/poppler-toc.cpp | 37 +- + cpp/poppler-toc.h | 6 +- + cpp/tests/pdf_fuzzer.cc | 37 +- + cpp/tests/poppler-dump.cpp | 248 +- + cpp/tests/poppler-render.cpp | 22 +- + fofi/FoFiBase.cc | 289 +- + fofi/FoFiBase.h | 44 +- + fofi/FoFiEncodings.cc | 1882 +-- + fofi/FoFiEncodings.h | 4 +- + fofi/FoFiIdentifier.cc | 970 +- + fofi/FoFiIdentifier.h | 34 +- + fofi/FoFiTrueType.cc | 3261 ++-- + fofi/FoFiTrueType.h | 297 +- + fofi/FoFiType1.cc | 613 +- + fofi/FoFiType1.h | 50 +- + fofi/FoFiType1C.cc | 5136 +++--- + fofi/FoFiType1C.h | 406 +- + glib/demo/annots.c | 1528 +- + glib/demo/annots.h | 4 +- + glib/demo/attachments.c | 522 +- + glib/demo/attachments.h | 4 +- + glib/demo/find.c | 772 +- + glib/demo/find.h | 4 +- + glib/demo/fonts.c | 440 +- + glib/demo/fonts.h | 4 +- + glib/demo/forms.c | 904 +- + glib/demo/forms.h | 4 +- + glib/demo/images.c | 491 +- + glib/demo/images.h | 4 +- + glib/demo/info.cc | 447 +- + glib/demo/info.h | 6 +- + glib/demo/layers.c | 648 +- + glib/demo/layers.h | 6 +- + glib/demo/links.c | 433 +- + glib/demo/links.h | 4 +- + glib/demo/main.c | 553 +- + glib/demo/outline.c | 315 +- + glib/demo/outline.h | 6 +- + glib/demo/page.c | 524 +- + glib/demo/page.h | 4 +- + glib/demo/print.c | 268 +- + glib/demo/print.h | 4 +- + glib/demo/render.c | 686 +- + glib/demo/render.h | 4 +- + glib/demo/selections.c | 937 +- + glib/demo/selections.h | 4 +- + glib/demo/taggedstruct.c | 330 +- + glib/demo/taggedstruct.h | 4 +- + glib/demo/text.c | 915 +- + glib/demo/text.h | 4 +- + glib/demo/transitions.c | 434 +- + glib/demo/transitions.h | 4 +- + glib/demo/utils.c | 1000 +- + glib/demo/utils.h | 32 +- + glib/poppler-action.cc | 1088 +- + glib/poppler-action.h | 230 +- + glib/poppler-annot.cc | 1624 +- + glib/poppler-annot.h | 371 +- + glib/poppler-attachment.cc | 294 +- + glib/poppler-attachment.h | 44 +- + glib/poppler-cached-file-loader.cc | 120 +- + glib/poppler-cached-file-loader.h | 23 +- + glib/poppler-date.cc | 18 +- + glib/poppler-date.h | 3 +- + glib/poppler-document.cc | 3561 ++-- + glib/poppler-document.h | 381 +- + glib/poppler-form-field.cc | 504 +- + glib/poppler-form-field.h | 118 +- + glib/poppler-input-stream.cc | 36 +- + glib/poppler-input-stream.h | 29 +- + glib/poppler-layer.cc | 161 +- + glib/poppler-layer.h | 20 +- + glib/poppler-macros.h | 6 +- + glib/poppler-media.cc | 287 +- + glib/poppler-media.h | 29 +- + glib/poppler-movie.cc | 275 +- + glib/poppler-movie.h | 39 +- + glib/poppler-page.cc | 2688 ++- + glib/poppler-page.h | 299 +- + glib/poppler-private.h | 238 +- + glib/poppler-structure-element.cc | 1471 +- + glib/poppler-structure-element.h | 456 +- + glib/poppler.cc | 58 +- + glib/poppler.h | 158 +- + glib/tests/check_bb.c | 156 +- + glib/tests/check_text.c | 81 +- + glib/tests/pdfdrawbb.c | 237 +- + goo/GooCheckedOps.h | 65 +- + goo/GooLikely.h | 8 +- + goo/GooString.cc | 1077 +- + goo/GooString.h | 341 +- + goo/GooTimer.cc | 71 +- + goo/GooTimer.h | 34 +- + goo/ImgWriter.cc | 4 +- + goo/ImgWriter.h | 18 +- + goo/JpegWriter.cc | 215 +- + goo/JpegWriter.h | 47 +- + goo/NetPBMWriter.cc | 54 +- + goo/NetPBMWriter.h | 31 +- + goo/PNGWriter.cc | 257 +- + goo/PNGWriter.h | 47 +- + goo/TiffWriter.cc | 317 +- + goo/TiffWriter.h | 50 +- + goo/gbase64.cc | 32 +- + goo/gbase64.h | 14 +- + goo/gbasename.cc | 18 +- + goo/gbasename.h | 2 +- + goo/gdir.h | 50 +- + goo/gfile.cc | 633 +- + goo/gfile.h | 96 +- + goo/glibc.cc | 42 +- + goo/glibc.h | 3 +- + goo/glibc_strtok_r.cc | 46 +- + goo/gmem.h | 186 +- + goo/grandom.cc | 23 +- + goo/grandom.h | 2 +- + goo/gstrtod.cc | 210 +- + goo/gstrtod.h | 2 +- + poppler/Annot.cc | 11269 ++++++------- + poppler/Annot.h | 2342 +-- + poppler/Array.cc | 111 +- + poppler/Array.h | 62 +- + poppler/BBoxOutputDev.cc | 320 +- + poppler/BBoxOutputDev.h | 90 +- + poppler/BuiltinFont.h | 109 +- + poppler/BuiltinFontWidth.h | 4 +- + poppler/CMap.cc | 899 +- + poppler/CMap.h | 139 +- + poppler/CachedFile.cc | 354 +- + poppler/CachedFile.h | 121 +- + poppler/CairoFontEngine.cc | 1309 +- + poppler/CairoFontEngine.h | 93 +- + poppler/CairoOutputDev.cc | 6011 ++++--- + poppler/CairoOutputDev.h | 774 +- + poppler/CairoRescaleBox.cc | 275 +- + poppler/CairoRescaleBox.h | 22 +- + poppler/Catalog.cc | 1541 +- + poppler/Catalog.h | 375 +- + poppler/CertificateInfo.cc | 73 +- + poppler/CertificateInfo.h | 178 +- + poppler/CharCodeToUnicode.cc | 1108 +- + poppler/CharCodeToUnicode.h | 143 +- + poppler/CourierBoldObliqueWidths.pregenerated.c | 1718 +- + poppler/CourierBoldWidths.pregenerated.c | 1718 +- + poppler/CourierObliqueWidths.pregenerated.c | 1718 +- + poppler/CourierWidths.pregenerated.c | 1718 +- + poppler/CurlCachedFile.cc | 116 +- + poppler/CurlCachedFile.h | 21 +- + poppler/CurlPDFDocBuilder.cc | 23 +- + poppler/CurlPDFDocBuilder.h | 10 +- + poppler/DCTStream.cc | 393 +- + poppler/DCTStream.h | 58 +- + poppler/DateInfo.cc | 157 +- + poppler/Decrypt.cc | 3026 ++-- + poppler/Decrypt.h | 145 +- + poppler/Dict.cc | 270 +- + poppler/Dict.h | 136 +- + poppler/Error.cc | 75 +- + poppler/Error.h | 27 +- + poppler/ErrorCodes.h | 30 +- + poppler/FileSpec.cc | 424 +- + poppler/FileSpec.h | 90 +- + poppler/FlateEncoder.cc | 172 +- + poppler/FlateEncoder.h | 47 +- + poppler/FlateStream.cc | 192 +- + poppler/FlateStream.h | 55 +- + poppler/FontEncodingTables.cc | 3354 ++-- + poppler/FontInfo.cc | 329 +- + poppler/FontInfo.h | 117 +- + poppler/Form.cc | 3199 ++-- + poppler/Form.h | 872 +- + poppler/Function.cc | 2960 ++-- + poppler/Function.h | 288 +- + poppler/Gfx.cc | 9125 +++++----- + poppler/Gfx.h | 527 +- + poppler/GfxFont.cc | 4459 +++-- + poppler/GfxFont.h | 624 +- + poppler/GfxState.cc | 11435 +++++++------ + poppler/GfxState.h | 2454 +-- + poppler/GfxState_helpers.h | 104 +- + poppler/GlobalParams.cc | 1933 +-- + poppler/GlobalParams.h | 283 +- + poppler/GlobalParamsWin.cc | 714 +- + poppler/HelveticaBoldObliqueWidths.pregenerated.c | 1718 +- + poppler/HelveticaBoldWidths.pregenerated.c | 1668 +- + poppler/HelveticaObliqueWidths.pregenerated.c | 1718 +- + poppler/HelveticaWidths.pregenerated.c | 1718 +- + poppler/Hints.cc | 883 +- + poppler/Hints.h | 109 +- + poppler/JArithmeticDecoder.cc | 547 +- + poppler/JArithmeticDecoder.h | 145 +- + poppler/JBIG2Stream.cc | 7527 ++++----- + poppler/JBIG2Stream.h | 192 +- + poppler/JPEG2000Stream.cc | 581 +- + poppler/JPEG2000Stream.h | 48 +- + poppler/JPXStream.cc | 6040 ++++--- + poppler/JPXStream.h | 499 +- + poppler/JSInfo.cc | 381 +- + poppler/JSInfo.h | 52 +- + poppler/Lexer.cc | 1109 +- + poppler/Lexer.h | 106 +- + poppler/Linearization.cc | 248 +- + poppler/Linearization.h | 34 +- + poppler/Link.cc | 1357 +- + poppler/Link.h | 622 +- + poppler/LocalPDFDocBuilder.cc | 37 +- + poppler/LocalPDFDocBuilder.h | 9 +- + poppler/MarkedContentOutputDev.cc | 267 +- + poppler/MarkedContentOutputDev.h | 163 +- + poppler/Movie.cc | 426 +- + poppler/Movie.h | 123 +- + poppler/NameToCharCode.cc | 154 +- + poppler/NameToCharCode.h | 25 +- + poppler/NameToUnicodeTable.h | 8716 +++++----- + poppler/Object.cc | 271 +- + poppler/Object.h | 757 +- + poppler/OptionalContent.cc | 492 +- + poppler/OptionalContent.h | 104 +- + poppler/Outline.cc | 191 +- + poppler/Outline.h | 72 +- + poppler/OutputDev.cc | 206 +- + poppler/OutputDev.h | 518 +- + poppler/PDFDoc.cc | 3447 ++-- + poppler/PDFDoc.h | 633 +- + poppler/PDFDocBuilder.h | 26 +- + poppler/PDFDocEncoding.cc | 51 +- + poppler/PDFDocEncoding.h | 2 +- + poppler/PDFDocFactory.cc | 54 +- + poppler/PDFDocFactory.h | 29 +- + poppler/PSOutputDev.cc | 13950 + ++++++++-------- + poppler/PSOutputDev.h | 885 +- + poppler/PSTokenizer.cc | 212 +- + poppler/PSTokenizer.h | 25 +- + poppler/Page.cc | 1344 +- + poppler/Page.h | 410 +- + poppler/PageLabelInfo.cc | 311 +- + poppler/PageLabelInfo.h | 49 +- + poppler/PageLabelInfo_p.h | 280 +- + poppler/PageTransition.cc | 200 +- + poppler/PageTransition.h | 101 +- + poppler/Parser.cc | 550 +- + poppler/Parser.h | 64 +- + poppler/PopplerCache.h | 52 +- + poppler/PreScanOutputDev.cc | 487 +- + poppler/PreScanOutputDev.h | 237 +- + poppler/ProfileData.cc | 27 +- + poppler/ProfileData.h | 22 +- + poppler/Rendition.cc | 641 +- + poppler/Rendition.h | 189 +- + poppler/SecurityHandler.cc | 481 +- + poppler/SecurityHandler.h | 161 +- + poppler/SignatureHandler.cc | 617 +- + poppler/SignatureHandler.h | 64 +- + poppler/SignatureInfo.cc | 96 +- + poppler/SignatureInfo.h | 105 +- + poppler/Sound.cc | 156 +- + poppler/Sound.h | 66 +- + poppler/SplashOutputDev.cc | 8074 +++++---- + poppler/SplashOutputDev.h | 598 +- + poppler/StdinCachedFile.cc | 28 +- + poppler/StdinCachedFile.h | 9 +- + poppler/StdinPDFDocBuilder.cc | 21 +- + poppler/StdinPDFDocBuilder.h | 9 +- + poppler/Stream-CCITT.h | 674 +- + poppler/Stream.cc | 9227 +++++------ + poppler/Stream.h | 1972 ++- + poppler/StructElement.cc | 1751 +- + poppler/StructElement.h | 582 +- + poppler/StructTreeRoot.cc | 248 +- + poppler/StructTreeRoot.h | 107 +- + poppler/SymbolWidths.pregenerated.c | 806 +- + poppler/TextOutputDev.cc | 9504 ++++++----- + poppler/TextOutputDev.h | 1330 +- + poppler/TimesBoldItalicWidths.pregenerated.c | 1718 +- + poppler/TimesBoldWidths.pregenerated.c | 1718 +- + poppler/TimesItalicWidths.pregenerated.c | 1718 +- + poppler/TimesRomanWidths.pregenerated.c | 1718 +- + poppler/UTF.cc | 894 +- + poppler/UnicodeCClassTables.h | 2786 ++-- + poppler/UnicodeCompTables.h | 947 +- + poppler/UnicodeDecompTables.h | 16531 + ++++++++----------- + poppler/UnicodeMap.cc | 432 +- + poppler/UnicodeMap.h | 114 +- + poppler/UnicodeMapFuncs.cc | 114 +- + poppler/UnicodeMapTables.h | 393 +- + poppler/UnicodeTypeTable.cc | 2279 +-- + poppler/UnicodeTypeTable.h | 7 +- + poppler/ViewerPreferences.cc | 172 +- + poppler/ViewerPreferences.h | 107 +- + poppler/XRef.cc | 2760 ++-- + poppler/XRef.h | 487 +- + poppler/ZapfDingbatsWidths.pregenerated.c | 612 +- + qt5/demos/abstractinfodock.cpp | 8 +- + qt5/demos/documentobserver.cpp | 11 +- + qt5/demos/documentobserver.h | 6 +- + qt5/demos/embeddedfiles.cpp | 22 +- + qt5/demos/fonts.cpp | 10 +- + qt5/demos/info.cpp | 12 +- + qt5/demos/metadata.cpp | 8 +- + qt5/demos/navigationtoolbar.cpp | 8 +- + qt5/demos/optcontent.cpp | 13 +- + qt5/demos/pageview.cpp | 16 +- + qt5/demos/permissions.cpp | 24 +- + qt5/demos/thumbnails.cpp | 11 +- + qt5/demos/toc.cpp | 131 +- + qt5/demos/viewer.cpp | 31 +- + qt5/src/ArthurOutputDev.cc | 1723 +- + qt5/src/ArthurOutputDev.h | 288 +- + qt5/src/poppler-annotation-helper.h | 24 +- + qt5/src/poppler-annotation-private.h | 103 +- + qt5/src/poppler-annotation.cc | 4004 ++--- + qt5/src/poppler-annotation.h | 775 +- + qt5/src/poppler-base-converter.cc | 86 +- + qt5/src/poppler-converter-private.h | 24 +- + qt5/src/poppler-document.cc | 1331 +- + qt5/src/poppler-embeddedfile-private.h | 17 +- + qt5/src/poppler-embeddedfile.cc | 85 +- + qt5/src/poppler-export.h | 22 +- + qt5/src/poppler-fontinfo.cc | 130 +- + qt5/src/poppler-form.cc | 1162 +- + qt5/src/poppler-form.h | 1420 +- + qt5/src/poppler-link-extractor-private.h | 11 +- + qt5/src/poppler-link-extractor.cc | 67 +- + qt5/src/poppler-link-private.h | 39 +- + qt5/src/poppler-link.cc | 1219 +- + qt5/src/poppler-link.h | 1002 +- + qt5/src/poppler-media.cc | 175 +- + qt5/src/poppler-media.h | 26 +- + qt5/src/poppler-movie.cc | 77 +- + qt5/src/poppler-optcontent-private.h | 92 +- + qt5/src/poppler-optcontent.cc | 486 +- + qt5/src/poppler-optcontent.h | 49 +- + qt5/src/poppler-outline-private.h | 16 +- + qt5/src/poppler-outline.cc | 164 +- + qt5/src/poppler-page-private.h | 30 +- + qt5/src/poppler-page-transition-private.h | 5 +- + qt5/src/poppler-page-transition.cc | 53 +- + qt5/src/poppler-page-transition.h | 226 +- + qt5/src/poppler-page.cc | 1238 +- + qt5/src/poppler-pdf-converter.cc | 110 +- + qt5/src/poppler-private.cc | 419 +- + qt5/src/poppler-private.h | 358 +- + qt5/src/poppler-ps-converter.cc | 293 +- + qt5/src/poppler-qiodeviceinstream-private.h | 9 +- + qt5/src/poppler-qiodeviceinstream.cc | 18 +- + qt5/src/poppler-qiodeviceoutstream-private.h | 6 +- + qt5/src/poppler-qiodeviceoutstream.cc | 31 +- + qt5/src/poppler-qt5.h | 4065 ++--- + qt5/src/poppler-sound.cc | 115 +- + qt5/src/poppler-textbox.cc | 20 +- + qt5/tests/check_actualtext.cpp | 12 +- + qt5/tests/check_annotations.cpp | 236 +- + qt5/tests/check_attachments.cpp | 129 +- + qt5/tests/check_dateConversion.cpp | 91 +- + qt5/tests/check_fonts.cpp | 168 +- + qt5/tests/check_forms.cpp | 166 +- + qt5/tests/check_goostring.cpp | 93 +- + qt5/tests/check_lexer.cpp | 13 +- + qt5/tests/check_links.cpp | 86 +- + qt5/tests/check_metadata.cpp | 162 +- + qt5/tests/check_object.cpp | 31 +- + qt5/tests/check_optcontent.cpp | 417 +- + qt5/tests/check_outline.cpp | 62 +- + qt5/tests/check_pagelabelinfo.cpp | 23 +- + qt5/tests/check_pagelayout.cpp | 19 +- + qt5/tests/check_pagemode.cpp | 27 +- + qt5/tests/check_password.cpp | 73 +- + qt5/tests/check_permissions.cpp | 21 +- + qt5/tests/check_search.cpp | 345 +- + qt5/tests/check_strings.cpp | 169 +- + qt5/tests/check_stroke_opacity.cpp | 35 +- + qt5/tests/check_utf_conversion.cpp | 118 +- + qt5/tests/poppler-attachments.cpp | 39 +- + qt5/tests/poppler-fonts.cpp | 134 +- + qt5/tests/poppler-forms.cpp | 273 +- + qt5/tests/poppler-page-labels.cpp | 41 +- + qt5/tests/poppler-texts.cpp | 43 +- + qt5/tests/stress-poppler-dir.cpp | 95 +- + qt5/tests/stress-poppler-qt5.cpp | 99 +- + qt5/tests/stress-threads-qt5.cpp | 162 +- + qt5/tests/test-password-qt5.cpp | 103 +- + qt5/tests/test-poppler-qt5.cpp | 172 +- + qt5/tests/test-render-to-file.cpp | 36 +- + splash/Splash.cc | 11670 +++++++------ + splash/Splash.h | 598 +- + splash/SplashBitmap.cc | 1357 +- + splash/SplashBitmap.h | 147 +- + splash/SplashClip.cc | 652 +- + splash/SplashClip.h | 153 +- + splash/SplashErrorCodes.h | 24 +- + splash/SplashFTFont.cc | 712 +- + splash/SplashFTFont.h | 46 +- + splash/SplashFTFontEngine.cc | 190 +- + splash/SplashFTFontEngine.h | 49 +- + splash/SplashFTFontFile.cc | 165 +- + splash/SplashFTFontFile.h | 51 +- + splash/SplashFont.cc | 321 +- + splash/SplashFont.h | 118 +- + splash/SplashFontEngine.cc | 315 +- + splash/SplashFontEngine.h | 78 +- + splash/SplashFontFile.cc | 104 +- + splash/SplashFontFile.h | 76 +- + splash/SplashFontFileID.cc | 6 +- + splash/SplashFontFileID.h | 14 +- + splash/SplashGlyphBitmap.h | 13 +- + splash/SplashMath.h | 227 +- + splash/SplashPath.cc | 315 +- + splash/SplashPath.h | 133 +- + splash/SplashPattern.cc | 21 +- + splash/SplashPattern.h | 71 +- + splash/SplashScreen.cc | 577 +- + splash/SplashScreen.h | 78 +- + splash/SplashState.cc | 406 +- + splash/SplashState.h | 147 +- + splash/SplashTypes.h | 230 +- + splash/SplashXPath.cc | 736 +- + splash/SplashXPath.h | 96 +- + splash/SplashXPathScanner.cc | 855 +- + splash/SplashXPathScanner.h | 121 +- + .../goostring-format-checker.cc | 617 +- + test/gtk-test.cc | 506 +- + test/pdf-fullrewrite.cc | 517 +- + test/pdf-inspector.cc | 462 +- + test/pdf-operators.c | 150 +- + test/perf-test-preview-dummy.cc | 13 +- + test/perf-test-preview-win.cc | 109 +- + test/perf-test.cc | 304 +- + utils/HtmlFonts.cc | 496 +- + utils/HtmlFonts.h | 146 +- + utils/HtmlLinks.cc | 174 +- + utils/HtmlLinks.h | 64 +- + utils/HtmlOutputDev.cc | 2742 ++- + utils/HtmlOutputDev.h | 443 +- + utils/HtmlUtils.h | 27 +- + utils/ImageOutputDev.cc | 1138 +- + utils/ImageOutputDev.h | 232 +- + utils/InMemoryFile.cc | 42 +- + utils/InMemoryFile.h | 18 +- + utils/Win32Console.cc | 211 +- + utils/Win32Console.h | 39 +- + utils/numberofcharacters.h | 13 +- + utils/parseargs.cc | 332 +- + utils/parseargs.h | 48 +- + utils/pdfattach.cc | 145 +- + utils/pdfdetach.cc | 517 +- + utils/pdffonts.cc | 244 +- + utils/pdfimages.cc | 289 +- + utils/pdfinfo.cc | 1588 +- + utils/pdfseparate.cc | 240 +- + utils/pdfsig.cc | 282 +- + utils/pdftocairo-win32.cc | 847 +- + utils/pdftocairo-win32.h | 9 +- + utils/pdftocairo.cc | 1853 +-- + utils/pdftohtml.cc | 791 +- + utils/pdftoppm.cc | 988 +- + utils/pdftops.cc | 581 +- + utils/pdftotext.cc | 836 +- + utils/pdfunite.cc | 656 +- + utils/printencodings.cc | 16 +- + 489 files changed, 161041 insertions(+), 168881 deletions(-) + +commit 0d48722746b9702e219df58ad14cee6184a62bef +Author: Albert Astals Cid +Date: Fri Jul 3 23:26:44 2020 +0200 + + Tweak code that clang-format doesn't understand + + glib/poppler-document.h | 2 ++ + poppler/JBIG2Stream.cc | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit afa4803f79b32c47fc2d187198b9f710f5302df0 +Author: Albert Astals Cid +Date: Fri Jul 3 23:16:24 2020 +0200 + + Add _clang-format file + + + tweak to CMakeLists.txt + + CMakeLists.txt | 1 + + _clang-format | 77 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 78 insertions(+) + +commit db75242047c75336abe72b1a32fd907c0d319f71 +Author: Albert Astals Cid +Date: Thu Jul 2 22:32:15 2020 +0200 + + 0.90.0 + + CMakeLists.txt | 4 ++-- + NEWS | 26 ++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 32 insertions(+), 6 deletions(-) + +commit 42457a711e2168e66d3b55bcf32d4760aa2106b3 +Author: Albert Astals Cid +Date: Thu Jul 2 00:20:52 2020 +0200 + + FormPageWidgets: Initialize size + + poppler/Form.cc | 1 + + 1 file changed, 1 insertion(+) + +commit ae5377cc511d05afb12e325a5e953bfb78b7f9df +Author: Albert Astals Cid +Date: Tue Jun 30 21:55:47 2020 +0200 + + Update (C) + + poppler/JSInfo.cc | 1 + + poppler/JSInfo.h | 1 + + poppler/PDFDoc.cc | 1 + + poppler/PDFDoc.h | 1 + + 4 files changed, 4 insertions(+) + +commit 4b9a643e7308852f1bc6e5932287c313e14416a5 +Author: Nelson Benítez León +Date: Thu Jun 18 15:31:23 2020 -0400 + + Move utils/JSInfo.cc utils/JSInfo.h to core poppler + + and add new JSInfo::scanJS() variant that returns + immediately after finding JS. This variant is used + by newly added PDFDoc::hasJavascript() method which + is in turn used by newly added poppler-glib function + poppler_document_has_javascript() + + CMakeLists.txt | 2 ++ + glib/poppler-document.cc | 16 ++++++++++++++++ + glib/poppler-document.h | 3 +++ + glib/reference/poppler-sections.txt | 1 + + {utils => poppler}/JSInfo.cc | 30 ++++++++++++++++++++++++++++++ + {utils => poppler}/JSInfo.h | 4 ++++ + poppler/PDFDoc.cc | 7 +++++++ + poppler/PDFDoc.h | 2 ++ + utils/CMakeLists.txt | 4 ---- + 9 files changed, 65 insertions(+), 4 deletions(-) + +commit 69794176c8be5ebfa2a60d1261c8532695d18681 +Author: sgerwk +Date: Tue Jun 30 18:13:26 2020 +0000 + + fix boundingbox of type3 fonts + + glib/tests/CMakeLists.txt | 1 + + glib/tests/check_bb.c | 22 +++++++++++++------- + poppler/BBoxOutputDev.cc | 51 + ++++++++++++++++++++++++----------------------- + 3 files changed, 42 insertions(+), 32 deletions(-) + +commit 434d7a86d952cf6bc8b66eb5f71991847150d682 +Author: Nelson Benítez León +Date: Tue Jun 30 17:48:14 2020 +0000 + + poppler-glib: fix adding annots in rotated pages + + This commit adds support to poppler-glib to + correctly add annotations to pages that are + rotated. + + After this commit, annotations added through + Evince will be correctly positioned on rotated + pages (without any code change needed in Evince), + both for normal and 'flagNoRotate' type + annots and also for rotated pages that have a + cropbox set in. + + As per PDF spec, annotations in rotated pages + must be saved un-rotated, and the pdf client + will display them rotated according to the + rotation of the page they're in. + + Poppler-glib was not un-rotating them when + saving them in core poppler, we now do it + after this change, and poppler-glib will + continue to serve them to apps with page's + rotation applied, through the + poppler_page_get_annot_mapping() API. + + No new API has been added or changed as of + this commit. + + Evince issue: + https://gitlab.gnome.org/GNOME/evince/-/issues/1385 + + Poppler issue #256 + + glib/poppler-annot.cc | 86 +++++++++++++++++++++++--------- + glib/poppler-page.cc | 131 + ++++++++++++++++++++++++++++++++++++++++++++++++- + glib/poppler-private.h | 13 +++++ + 3 files changed, 204 insertions(+), 26 deletions(-) + +commit 53368f1717e88e40fe65d27e919c9abca11beac3 +Author: Albert Astals Cid +Date: Wed Jun 24 22:34:00 2020 +0200 + + CI: switch qt5_docs to debian testing temporarily + + qttools5-dev-tools can't be installed in unstable at this point + + .gitlab-ci.yml | 1 + + 1 file changed, 1 insertion(+) + +commit 513ed0761fa11e0c4b0d668c92f19ec0eb85cf46 +Author: Albert Astals Cid +Date: Tue Jun 23 00:34:51 2020 +0200 + + Small signature improvements + + Add unknown signature type, and default to that one instead of + adbe_pkcs7_detached + + Move the check for "can we validate" a bit to the bottom, this way on + some files like the one from #929 we can extract propertly some more + signature details + + poppler/Form.cc | 17 +++++++++-------- + poppler/Form.h | 3 ++- + qt5/src/poppler-form.cc | 3 +++ + qt5/src/poppler-form.h | 3 ++- + 4 files changed, 16 insertions(+), 10 deletions(-) + +commit e5001ae78d82624e4a1f07b1053c9db5e4643d48 +Author: Albert Astals Cid +Date: Mon Jun 22 19:34:02 2020 +0200 + + qt5: Document that Document::page can return nullptr + + qt5/src/poppler-qt5.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 94e00cbe5481a02e84fc29974c7d0089d847d3eb +Author: Albert Astals Cid +Date: Mon Jun 22 19:33:01 2020 +0200 + + qt5: demo: Fix crash on broken files + + qt5/demos/thumbnails.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ebb77e7a1fbb83c3ab7f9cd948d950bb5243f7c3 +Author: Albert Astals Cid +Date: Wed Jun 17 22:39:47 2020 +0200 + + Fix infinite loop in broken file + + oss-fuzz/23515 + + poppler/Catalog.cc | 20 ++++++++++++++------ + poppler/Catalog.h | 4 ++-- + 2 files changed, 16 insertions(+), 8 deletions(-) + +commit 1460bb960276ef5f62d08fa077515e628a91880d +Author: Albert Astals Cid +Date: Sun Jun 21 22:20:38 2020 +0200 + + Update (C) + + poppler/PSOutputDev.cc | 2 +- + poppler/PSOutputDev.h | 2 +- + qt5/src/poppler-ps-converter.cc | 1 + + utils/pdftops.cc | 2 +- + 4 files changed, 4 insertions(+), 3 deletions(-) + +commit 6faf2739245b4ab24a4d536953f7d0cb763c9823 +Author: William Bader +Date: Sun Jun 21 17:22:24 2020 +0000 + + Add a pdftops -rasterize option with values always, never, or + whenneeded + + glib/poppler-page.cc | 7 +++++-- + poppler/PSOutputDev.cc | 8 +++++--- + poppler/PSOutputDev.h | 13 ++++++++++--- + qt5/src/poppler-ps-converter.cc | 2 +- + utils/pdftops.1 | 5 +++++ + utils/pdftops.cc | 17 +++++++++++++++++ + 6 files changed, 43 insertions(+), 9 deletions(-) + +commit bf15ccd4861d10e2338d0b1b2a65f222eb4e9893 +Author: Corentin Noël +Date: Fri Jun 12 11:30:39 2020 +0200 + + glib: Several fixes to the documentation + + Add the missing symbols and make sure that the links are correct. + + glib/poppler-action.h | 2 +- + glib/poppler-document.cc | 6 +++--- + glib/reference/poppler-docs.sgml | 17 +++++++++++++++++ + glib/reference/poppler-sections.txt | 7 +++++++ + make-glib-api-docs | 2 +- + 5 files changed, 29 insertions(+), 5 deletions(-) + +commit 9c9c3df8f22a12569d5f7a8d8add7abf92e30446 +Author: Marek Kasik +Date: Mon Jun 8 17:27:28 2020 +0200 + + glib: Add ability to reset forms + + Add new PopplerActionType POPPLER_ACTION_RESET_FORM and + its handling to PopplerAction. + Add poppler_document_reset_form() to PopplerDocument. + + glib/demo/utils.c | 3 +++ + glib/poppler-action.cc | 34 + +++++++++++++++++++++++++++++++++ + glib/poppler-action.h | 15 ++++++++++++++- + glib/poppler-document.cc | 38 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-document.h | 5 +++++ + glib/reference/poppler-sections.txt | 1 + + 6 files changed, 95 insertions(+), 1 deletion(-) + +commit 4e0546d0d9dfc5b97c3abc58a8b1fe672fcd695c +Author: Albert Astals Cid +Date: Sun Jun 7 11:19:02 2020 +0200 + + CI: build lcms and libcurl on Ubuntu 16.04 + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e3a48759464806565cfd332a9dac0d0a9e9086ba +Author: Albert Astals Cid +Date: Sun Jun 7 11:18:27 2020 +0200 + + fix running cmake with cmake < 3.12 + + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit b58d77e92a6e627427073703e9120b2a94bde011 +Author: Albert Astals Cid +Date: Thu Jun 4 17:12:46 2020 +0200 + + qt5: make it clear we require Qt 5.5 + + Also disable deprecated code until 5.5 and disable later warnings + since + we can't fix them since most of the times they require a Qt newer than + 5.5. We'll tackle them when we increase the minimum Qt version + + CMakeLists.txt | 2 +- + qt5/CMakeLists.txt | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 6bf89c78447692ed781918b7cb3fadb21aa0cf89 +Author: Philipp Knechtges +Date: Sat May 30 19:18:53 2020 +0200 + + pdftoppm: add option to set display profile + + utils/CMakeLists.txt | 3 +++ + utils/pdftoppm.1 | 4 ++++ + utils/pdftoppm.cc | 55 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 62 insertions(+) + +commit a628cbb6da948bb3e508f120a4deb76257b96dd3 +Author: Albert Astals Cid +Date: Wed Jun 3 00:09:57 2020 +0200 + + Update (C) + + poppler/OutputDev.h | 1 + + poppler/Page.cc | 1 + + qt5/src/poppler-page.cc | 1 + + qt5/src/poppler-private.h | 1 + + 4 files changed, 4 insertions(+) + +commit 7257d33a3a938d5621aab0ed53b09c7ce797a646 +Author: Philipp Knechtges +Date: Fri May 22 18:23:09 2020 +0200 + + add a dummy GfxState to Page::loadThumb for proper color space + handling + + As far as I can tell this was the only remaining spot in the code + where + GfxColorSpace::parse was called without a properly initialized + GfxState. + + poppler/Page.cc | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +commit b2141b8921525141560b8e4ef5a351f505d7cf5b +Author: Philipp Knechtges +Date: Fri May 22 18:17:16 2020 +0200 + + cleanup displayprofile initialization + + There were a bunch of global variables that were used to initilize + the first version + of the display profiles. This code was removed, and all the static + initilization was moved + from GfxColorSpace to GfxState. Furthermore, for most "users" the + setting of the + display profile was moved from the static + GfxColorSpace::setDisplayProfile function + to the OutputDev class. The latter is now invoked early in the + initilization of Gfx + to set the initial state in the GfxState instance. + + poppler/Gfx.cc | 1 + + poppler/GfxState.cc | 157 + ++++++-------------------------------------- + poppler/GfxState.h | 9 +-- + poppler/OutputDev.h | 26 ++++---- + qt5/src/CMakeLists.txt | 3 + + qt5/src/poppler-document.cc | 23 +++++-- + qt5/src/poppler-page.cc | 8 +++ + qt5/src/poppler-private.h | 4 ++ + utils/pdftocairo.cc | 4 +- + 9 files changed, 70 insertions(+), 165 deletions(-) + +commit 7dc4f0b56057aa4facc7ba559998d6dac5042792 +Author: Philipp Knechtges +Date: Fri May 22 11:47:54 2020 +0200 + + remove sourceProfile variable from GfxColorTransform + + The sourceProfile variable was initially introduced in commit + 1f698b44564b0313c019557616866eae11bf2cc9 + for the Postscript CSA generation code. With the last commit this + code has been moved to GfxICCBasedColorSpace + anyway, so there is no use anymore for storing the profile in + GfxColorTransform. + + poppler/GfxState.cc | 19 +++++++++---------- + poppler/GfxState.h | 4 +--- + 2 files changed, 10 insertions(+), 13 deletions(-) + +commit 344f3e655cb0018421350c1a9916381d686025b6 +Author: Philipp Knechtges +Date: Fri May 22 11:39:28 2020 +0200 + + move Postscript CSA generation from GfxColorTransform to + GfxICCBasedColorSpace + + With proper ref counting for profiles in place, we can now let + GfxICCBasedColorSpace + directly generate the CSA rather than going through GfxColorTransform, + which in the + pre-ref-counting era had the sole ownership on the profiles. + + poppler/GfxState.cc | 83 + +++++++++++++++++++++++++---------------------------- + poppler/GfxState.h | 5 ++-- + 2 files changed, 42 insertions(+), 46 deletions(-) + +commit bf7e84cc2399969cc6a98bbcc689a90e20095f39 +Author: Hannah von Reth +Date: Tue Jun 2 12:46:44 2020 +0200 + + Use a more modern way to use curl + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d4bd6df9548cc7c84c2a49472803adeb0cb5b339 +Author: Albert Astals Cid +Date: Tue Jun 2 12:36:27 2020 +0200 + + Increase cmake version requirement to that of the minimum in our CI + + We wouldn't realize if we broke it with cmake 3.3 since we're not + testing it and cmake 3.5 is old enough + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9d996ed8218c33f616856389f6e252c7596350e8 +Author: Albert Astals Cid +Date: Wed May 27 23:23:59 2020 +0200 + + 0.89.0 + + CMakeLists.txt | 4 ++-- + NEWS | 17 +++++++++++++++++ + cpp/CMakeLists.txt | 2 +- + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 23 insertions(+), 6 deletions(-) + +commit e9279fecf6f53c60cc85f30dc38198d5675bbe9e +Author: Albert Astals Cid +Date: Tue May 26 23:48:17 2020 +0200 + + Make Link that are "Unknown destination type" be "no ok" + + otherwise we have uninitialized memory when asking for getKind() + + I mean we have it anyway, but it is understood that if isOk is + false any + further question you make is allowed to misbehave + + poppler/Link.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9429aac41fefdbb8b70d3c3233835875c78283ba +Author: Albert Astals Cid +Date: Sun May 24 00:33:20 2020 +0200 + + Update (C) + + poppler/Gfx.cc | 1 + + qt5/src/poppler-document.cc | 1 + + qt5/src/poppler-qt5.h | 1 + + utils/pdftocairo.cc | 1 + + 4 files changed, 4 insertions(+) + +commit e4ac9761a269805cc8510a11b47e2381ad668215 +Author: sgerwk +Date: Sat May 23 10:37:01 2020 +0200 + + include annotations in the bounding box + + glib/poppler-page.cc | 8 +++----- + glib/tests/CMakeLists.txt | 4 +++- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit cdf623865df5343425c2eaea49124c6b45529bea +Author: sgerwk +Date: Sat May 23 09:49:31 2020 +0200 + + use state->getClipBBox() instead of tracking the clipping box + + glib/poppler-page.cc | 2 +- + glib/tests/CMakeLists.txt | 6 ++-- + poppler/BBoxOutputDev.cc | 78 + ++++++++++++++++------------------------------- + poppler/BBoxOutputDev.h | 13 ++------ + 4 files changed, 34 insertions(+), 65 deletions(-) + +commit 5927e0b08f1ad6868d04cb209ee1e17b4ac07b70 +Author: Philipp Knechtges +Date: Sat May 23 18:12:46 2020 +0000 + + GfxState: substitute manual ref counting in GfxColorTransform by + a shared_ptr + + This patch as said replaces the manual ref counting in + GfxColorTransform. Along the lines + it also introduces another shared_ptr for cmsHPROFILEs, which is + named GfxLCMSProfilePtr. + + poppler/Gfx.cc | 4 +- + poppler/GfxState.cc | 314 + +++++++++++++++++++++----------------------- + poppler/GfxState.h | 55 ++++---- + qt5/src/poppler-document.cc | 6 +- + qt5/src/poppler-qt5.h | 11 +- + utils/pdftocairo.cc | 9 +- + 6 files changed, 195 insertions(+), 204 deletions(-) + +commit ae2fa0be65833e7598ef5e31c2f419c52ec26ad5 +Author: Albert Astals Cid +Date: Sat May 23 13:03:38 2020 +0200 + + cpp: Use push back instead of [] direct access + + Otherwise asking for tb_font_info->glyph_to_cache_index.size() always + returns 0 + + cpp/poppler-page.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 12dea6841940ce31630d60fa7c892da4597393aa +Author: Albert Astals Cid +Date: Thu May 21 23:53:07 2020 +0200 + + Update (C) + + poppler/GfxState.cc | 3 ++- + poppler/GfxState.h | 3 ++- + poppler/PSOutputDev.cc | 3 ++- + poppler/PSOutputDev.h | 2 +- + 4 files changed, 7 insertions(+), 4 deletions(-) + +commit cc0f7960fd9dc4cfda8dc15cb061f891e909b386 +Author: Philipp Knechtges +Date: Sun May 17 21:00:26 2020 +0200 + + only activate CSA support for the most recent lcms2 version + + Add a runtime check. + + poppler/GfxState.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 2334bea5208d0506e4eee02ed170abd7e73e2fe4 +Author: Philipp Knechtges +Date: Sun May 17 09:11:01 2020 +0200 + + make the clang/clazy/Ubuntu/Android pipelines happy + + poppler/GfxState.cc | 20 ++++++++++---------- + poppler/GfxState.h | 2 +- + poppler/PSOutputDev.cc | 2 +- + 3 files changed, 12 insertions(+), 12 deletions(-) + +commit 1f698b44564b0313c019557616866eae11bf2cc9 +Author: Adrian Johnson +Date: Sat May 16 22:08:32 2020 +0200 + + Use ICC profiles in PS output + + When printing PDFs that use ICC based colors, Poppler always uses + the alternate color space + in the PostScript output (usually DeviceRGB or DeviceCMYK). The + attached patch will use the + ICC profile color space in the PS output. Most of the patch is + modifying GfxColorTransform + and callers to store the source profile as well as the transform. The + GfxICCBasedColorSpace + class has a new method, getPostScriptCSA(), which uses the LCMS + function cmsGetPostScriptCSA() + to generate the CIEBased color space dictionary equivalent to the + ICC profile. + + Based on patch from issue #125. + + poppler/GfxState.cc | 114 + +++++++++++++++++++++++++++++++++++-------------- + poppler/GfxState.h | 12 +++++- + poppler/PSOutputDev.cc | 77 ++++++++++++++++++++++++--------- + poppler/PSOutputDev.h | 8 ++-- + 4 files changed, 153 insertions(+), 58 deletions(-) + +commit d5efac76267c7adf7636514280614efcc1ac3392 +Author: Philipp Knechtges +Date: Sat May 16 14:06:56 2020 +0200 + + Revert "GfxICCBasedColorSpace: Remove unused member variable" + + This reverts commit 8c8e0a143e975b16e6c437c03dc2267e7e8ff3fc. + + poppler/GfxState.cc | 8 +++++--- + poppler/GfxState.h | 6 ++++-- + 2 files changed, 9 insertions(+), 5 deletions(-) + +commit 846437d9a9e4dcca2d4e8dad6d395b47477c1707 +Author: Albert Astals Cid +Date: Tue May 19 23:34:20 2020 +0200 + + Update (C) + + cpp/poppler-font-private.h | 1 + + cpp/poppler-font.cpp | 1 + + cpp/poppler-font.h | 1 + + cpp/poppler-page-private.h | 3 ++- + cpp/poppler-page.cpp | 6 +++--- + cpp/poppler-page.h | 3 ++- + cpp/poppler-private.h | 4 ++-- + cpp/tests/poppler-dump.cpp | 2 +- + poppler/TextOutputDev.cc | 2 +- + poppler/TextOutputDev.h | 1 + + 10 files changed, 15 insertions(+), 9 deletions(-) + +commit 3189332012ca46998f8ffb872e7ed81c630c4c7a +Author: suzuki toshiya +Date: Sat May 16 04:54:55 2020 +0000 + + [cpp] separate the font info in text_box to another struct. + + * add new API, page::text_list(int opt_flag). The old one + taking no argument is kept for ABI compatibility. + The opt_flag is a bitmask-multiple of the new enum, + page::text_list_option_enum. + + * text_box.m_data->text_box_font is an unique pointer to + the storage (if text_list() requests the font info), or + just a null pointer (if text_list() does not request the + font info). + + * new option "--show-text-list-with-font" showing font + info, to tests/poppler-dump.cpp. "--show-text-list" + does not load the font info at all. + + Co-authored-by: Adam Reichold + Co-authored-by: Albert Astals Cid + + cpp/poppler-page.cpp | 101 + ++++++++++++++++++++++++++++++--------------- + cpp/poppler-page.h | 22 ++++++++++ + cpp/poppler-private.h | 30 +++++++++----- + cpp/tests/poppler-dump.cpp | 18 +++++--- + 4 files changed, 121 insertions(+), 50 deletions(-) + +commit 437553ecb26948f77c3dbf7ad29bca86ffff7f6e +Author: Albert Astals Cid +Date: Fri May 15 12:57:32 2020 +0000 + + [cpp] change page_private::init_font_info_cache() to a void method. + + We already have a boolean font_info_cache_initialized, no need to + guess the initialization result by the size of initialized cache. + + cpp/poppler-page-private.h | 2 +- + cpp/poppler-page.cpp | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 57de32198a4406eae18b80eed42e6050e2b48cca +Author: Albert Astals Cid +Date: Fri May 15 12:23:50 2020 +0000 + + [cpp] in poppler-page.h, add "since 0.89" comment to 3 new methods. + + cpp/poppler-page.h | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit 507027de297f43146f5bbebe8d098dededffc577 +Author: suzuki toshiya +Date: Tue May 5 10:11:49 2020 +0000 + + [cpp] introduce a boolean font_info_cache_initialized, to distinguish + an initialized-but-empty cache from the uninitialized cache + + Co-authored-by: Adam Reichold + + cpp/poppler-page-private.h | 1 + + cpp/poppler-page.cpp | 4 +++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 2cd79c7382888559d5d8dcc56a84572ac8a77086 +Author: Adam Reichold +Date: Tue May 5 01:22:29 2020 +0000 + + [cpp] construct a font_iterator instance in the local storage of + page_private::init_font_info_cache() method, instead of the heap + + cpp/poppler-page.cpp | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit 7279b4eb397667cd4553f5852286b3f3d73a1a83 +Author: Adam Reichold +Date: Mon May 4 11:51:55 2020 +0000 + + [cpp] remove wrong warning note for about the std::string object + returned by text_box::get_font_name() + + cpp/poppler-page.h | 4 ---- + 1 file changed, 4 deletions(-) + +commit af3805f0b60289c7f522da29f9375119a1cd778a +Author: Albert Astals Cid +Date: Mon May 4 04:32:27 2020 +0000 + + [cpp] new enum poppler::text_box::writing_mode_enum + + cpp/poppler-page.cpp | 15 +++++++++++++-- + cpp/poppler-page.h | 12 +++++++----- + cpp/poppler-private.h | 3 ++- + 3 files changed, 22 insertions(+), 8 deletions(-) + +commit 65053f43dbb83b66302bddda27732168fc74cca1 +Author: Albert Astals Cid +Date: Sun May 3 16:21:38 2020 +0000 + + [TextOutputDev] simplify TextFontInfo::matches(const Ref *ref) + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ea2e879d4e0e9a5d899adb82bbdaab9e505532c +Author: Albert Astals Cid +Date: Sun May 3 16:17:11 2020 +0000 + + [cpp] simplify the initialization of poppler::font_info_private.ref + and .emb_ref + + cpp/poppler-font-private.h | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 60400514324d6e5d0a1c50ce4af84320d350e967 +Author: suzuki toshiya +Date: Fri May 1 08:04:14 2020 +0000 + + [cpp] Add the font infos to the text_box object. + + cpp/CMakeLists.txt | 1 + + cpp/poppler-font-private.h | 84 + ++++++++++++++++++++++++++++++++++++++++++++++ + cpp/poppler-font.cpp | 56 ++++--------------------------- + cpp/poppler-font.h | 3 ++ + cpp/poppler-page-private.h | 4 +++ + cpp/poppler-page.cpp | 68 ++++++++++++++++++++++++++++++++++--- + cpp/poppler-page.h | 50 +++++++++++++++++++++++++++ + cpp/poppler-private.h | 22 ++++++++++++ + cpp/tests/poppler-dump.cpp | 4 +++ + poppler/TextOutputDev.cc | 4 +++ + poppler/TextOutputDev.h | 1 + + 11 files changed, 243 insertions(+), 54 deletions(-) + +commit bf33c25b0f1be07a9a3cedaf6773de22e4305b80 +Author: Albert Astals Cid +Date: Tue May 19 17:47:49 2020 +0200 + + Fix memory leak when failing to load some fonts + + poppler/SplashOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 562b5a33f6cc55c7bf342e39a9c7eea609cfbe43 +Author: Albert Astals Cid +Date: Tue May 19 11:39:17 2020 +0200 + + Move some variables declaration closer to where they are used + + poppler/SplashOutputDev.cc | 26 ++++++++++++++++---------- + 1 file changed, 16 insertions(+), 10 deletions(-) + +commit 0582ea9633d4597b98b3a9c9c7a8c673634aef29 +Author: Marek Kasik +Date: Mon May 18 18:02:43 2020 +0000 + + Add support for ResetForm action + + Add ability to reset FormField class, its descendants and Form + class. This takes hierarchy into account so that resetting a field + resets also its children. If exclude flag is specified then all + fields are reset except those which are listed in Fields key. + + FormFieldText set DV key as its V key if DV is available. Otherwise, + it just removes the V key. + + FormFieldChoice unselect selected items and set the default ones + if specified. + + FormFieldButton set default apearance state if it is available, + otherwise it just removes V key (and set the state to "Off" if it + is check button, which is what Adobe Reader does in this situation). + + FormFieldSignature is not reset. + + Add LinkResetForm class which stores information needed for resetting + of fields of forms. + + Issue #225 + + poppler/Form.cc | 225 + ++++++++++++++++++++++++++++++++++++++++++++++-- + poppler/Form.h | 24 ++++++ + poppler/Link.cc | 41 +++++++++ + poppler/Link.h | 28 ++++++ + qt5/src/poppler-page.cc | 4 + + 5 files changed, 314 insertions(+), 8 deletions(-) + +commit 62727d0119b4e1a6c000506f47673385f7eccd43 +Author: Albert Astals Cid +Date: Sun May 17 11:53:21 2020 +0200 + + Read CIDToGIDMap for all GfxCIDFont fonts + + Also revert my old hack to fix rendering of bug-poppler20605.pdf since + that was breaking the PS export. + + What my old hack did was force the font type to be one of those that + read the CIDToGIDMap, what the new fix does is actually just read the + CIDToGIDMap for all fonts + + poppler/GfxFont.cc | 32 +++++++++++++++----------------- + 1 file changed, 15 insertions(+), 17 deletions(-) + +commit 5cdb78fde50e3dc16006070b0884dfb6b23d964c +Author: Albert Astals Cid +Date: Thu May 14 00:22:33 2020 +0200 + + Fix crash in PDFDoc::getSignatureFields when there's no Forms at all + + poppler/PDFDoc.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 0f01638f044c247c2591f873f9f7558ed3c3b4ce +Author: Albert Astals Cid +Date: Wed May 13 23:12:43 2020 +0200 + + Update (C) + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9c3b18b8741f6e68711ce807459504493d6a0be0 +Author: Marek Kasik +Date: Fri Apr 6 15:06:46 2018 +0200 + + cairo: Fix tiling patterns when pattern cell is too far + + Rendering of tiling pattern which has pattern matrix moving pattern + cell + far away can fail on allocation of memory. This commit solves the + issue by + modifying of cairo pattern matrix so that its offset is closer to + the path + filled by the pattern. + + Fixes #190 + + poppler/CairoOutputDev.cc | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit 02ec7a70a7a3c654bd94898633f6552fc7eae8b9 +Author: Oliver Sander +Date: Tue Apr 28 09:07:41 2020 +0200 + + Add additional render tests + + The file stroke-alpha-pattern.pdf contains a third shape. + It is rendered correctly by all backends, but as the + infrastructure is in place we may as well add a quick + test for that. + + qt5/tests/check_stroke_opacity.cpp | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit d500783fafd9884415005a27641c9b4d49cfe3e4 +Author: Oliver Sander +Date: Tue Apr 28 08:21:25 2020 +0200 + + [cairo] Mention opacity when logging fill color stops + + poppler/CairoOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c2f914359cdc672288d6cd68f157921214e536fa +Author: Oliver Sander +Date: Tue Apr 28 08:19:26 2020 +0200 + + [cairo] Use stroke opacity when clipping to a stroke path + + Fixes: https://gitlab.freedesktop.org/poppler/poppler/issues/178 + + poppler/CairoOutputDev.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 7c890b37ac70394cb330e9d9615ad9532769c9e0 +Author: Oliver Sander +Date: Tue Apr 28 08:13:08 2020 +0200 + + Fix typo in variable name + + utils/pdftocairo.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit e10d9cbbc45f2fe470a4da801cb84e85a34d37aa +Author: Evgeny Stambulchik +Date: Sat May 9 22:55:10 2020 +0000 + + glib: Add poppler_movie_get_aspect + + NEWS | 2 +- + glib/demo/utils.c | 3 +++ + glib/poppler-movie.cc | 25 +++++++++++++++++++++++++ + glib/poppler-movie.h | 2 ++ + glib/reference/poppler-sections.txt | 3 ++- + 5 files changed, 33 insertions(+), 2 deletions(-) + +commit 2c17c9ed7e50ea15255c905170ab1da30b62b3c6 +Author: Oliver Sander +Date: Sat May 2 16:52:09 2020 +0200 + + Allow almost-singular tiling pattern matrices + + Issue https://gitlab.freedesktop.org/poppler/poppler/issues/894 + sports a file with a diagonal tiling pattern matrices with + diagonal entries in the range of 5e-4. While entries of this + size are unusual but okay, the determinant is below the rather + arbitrary threshold of 1e-6. Therefore, poppler decided that + the matrix is singular and aborts the rendering. + + Fix this by really only aborting if inverting the determinant + (which is the first thing that is being done with it) results + in a non-finite number. + + As a side effect the code now also allows pattern matrices + with a negative determinant. This does not seem to appear + in the wild all that often, but I didn't find anything + in the spec that rules it out. + + BUG: https://gitlab.freedesktop.org/poppler/poppler/issues/894 + + poppler/Gfx.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 448f8e9830cb0420728e844723770a8cfb3327c0 +Author: Albert Astals Cid +Date: Mon Apr 27 23:26:55 2020 +0200 + + Poppler 0.88.0 + + CMakeLists.txt | 4 ++-- + NEWS | 26 ++++++++++++++++++++++++++ + cpp/CMakeLists.txt | 2 +- + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 33 insertions(+), 7 deletions(-) + +commit b7aed3eb2950c1389ab81a2261eee2e2221050f6 +Author: Nelson Benítez León +Date: Sat Feb 29 22:05:18 2020 -0400 + + glib: implement rotation for 'flagNoRotate' annots + + previously poppler_page_get_annot_mapping() function + was ignoring to rotate annots flagged as 'flagNoRotate' + probably because they require a special rotation where + the annotation pivots on the upper left corner, as + described in PDF 1.7 spec "8.4.2 Annotation Flags" + NoRotate flag. + + Added support for that, while refactoring the code to + make it more readable. + + Fixes #767 + + glib/poppler-page.cc | 78 + +++++++++++++++++++++++++++++++++------------------- + 1 file changed, 50 insertions(+), 28 deletions(-) + +commit 33f3455711916dc9d42b95e168b26748b1acba57 +Author: Albert Astals Cid +Date: Thu Apr 23 23:47:42 2020 +0200 + + Update (C) year + + poppler/PDFDoc.cc | 2 +- + poppler/PDFDoc.h | 2 +- + poppler/SignatureInfo.cc | 2 +- + poppler/SignatureInfo.h | 2 +- + qt5/src/poppler-private.h | 2 +- + qt5/src/poppler-qt5.h | 2 +- + utils/pdfsig.cc | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +commit 12eeb475fbf3ee0bb43b96ea79d46a426ba809e7 +Author: Albert Astals Cid +Date: Fri Apr 10 00:31:40 2020 +0200 + + qt5: Add Document::signatures + + Returns all the signatures of a given document, this is better + than iterating over all the pages getting the form fields that + are of signature type since there's documents with signatures not + associated to a given page + + Fixes part of #895 + + qt5/src/poppler-document.cc | 16 ++++++++++++++++ + qt5/src/poppler-form.cc | 46 + +++++++++++++++++++++++---------------------- + qt5/src/poppler-private.h | 2 +- + qt5/src/poppler-qt5.h | 11 +++++++++++ + 4 files changed, 52 insertions(+), 23 deletions(-) + +commit ba311960d2486e07e66f59dd8d8a5f6e49a918d0 +Author: Albert Astals Cid +Date: Thu Apr 9 16:59:54 2020 +0200 + + pdfsig: Show also signatures that aren't attached to any page + + Move two methods from FormWidgetSignature to FormFieldSignature where + they actually belong + + Rename PDFDoc::getSignatureWidgets to getSignatureFields, making it go + through the FormsFields instead of the Page FormWidgets + + Remove the gotos from pdfsig code + + Add a few const here and there + + Fixes part of #895 + + poppler/Form.cc | 277 + ++++++++++++++++++++++++----------------------- + poppler/Form.h | 21 +++- + poppler/PDFDoc.cc | 39 ++++--- + poppler/PDFDoc.h | 2 +- + poppler/Page.cc | 1 + + poppler/SignatureInfo.cc | 12 +- + poppler/SignatureInfo.h | 14 +-- + utils/pdfsig.cc | 54 ++++----- + 8 files changed, 216 insertions(+), 204 deletions(-) + +commit 846575911483787a0fe28d76c4e9b51a644d7152 +Author: Oliver Sander +Date: Tue Apr 21 16:03:37 2020 +0200 + + [splash, arthur] Use stroking opacity when clipping to a stroke path + + When filling a region that is clipped to a stroke path, then the + stroking opacity shall be used rather than the fill opacity. + I couldn't find this in the spec, but it seems to be what + Acrobat does. + + BUG: https://gitlab.freedesktop.org/poppler/poppler/-/issues/178 + + poppler/SplashOutputDev.cc | 9 +++++++-- + qt5/src/ArthurOutputDev.cc | 5 ++++- + qt5/tests/check_stroke_opacity.cpp | 7 +++++++ + splash/Splash.cc | 8 +++++--- + splash/Splash.h | 6 +++++- + 5 files changed, 28 insertions(+), 7 deletions(-) + +commit 9e302b6bf42c5d8b48bc5b6c04621e52d52da3f2 +Author: Aleix Pol +Date: Sun Apr 19 22:51:21 2020 +0000 + + CI: android: adaptations to port to new version of the sdk + + .gitlab-ci.yml | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +commit 4fc44c017a4ba7775d3f8eea6bb959ac7c53031f +Author: Albert Astals Cid +Date: Mon Apr 20 00:13:28 2020 +0200 + + CI: back to debian:unstable + + Better to have newer compilers. etc to get "better" warnings + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6654288e6dc93f7495786388902e0934f809b6a5 +Author: sgerwk +Date: Sun Apr 19 20:07:26 2020 +0200 + + initialize the cairo surface to 1x1, is then changed page by page + + glib/tests/pdfdrawbb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d37869fc5ed9b8bf2a920058cf63779643d6b25f +Author: Albert Astals Cid +Date: Sat Apr 18 15:39:30 2020 +0200 + + Update (C) + + poppler/OutputDev.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8775587096dacd2757917e493f25ca038f169294 +Author: Oliver Sander +Date: Fri Apr 17 22:09:17 2020 +0200 + + [arthur] Implement the clipToStrokePath method + + qt5/src/ArthurOutputDev.cc | 18 ++++++++++++++++++ + qt5/src/ArthurOutputDev.h | 1 + + qt5/tests/check_stroke_opacity.cpp | 26 ++++++++++++++++++-------- + 3 files changed, 37 insertions(+), 8 deletions(-) + +commit 6c82422498a2d02fd8acea005e7d6fa843caa1d8 +Author: Oliver Sander +Date: Fri Apr 17 22:04:45 2020 +0200 + + Document the purpose of the clipToStrokePath method + + poppler/OutputDev.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 5ccc03f13b22c11d38f349b95c6d50dcfbaedb4b +Author: Oliver Sander +Date: Wed Apr 15 15:40:38 2020 +0200 + + [arthur] Set the opacity when filling with axial gradients + + qt5/src/ArthurOutputDev.cc | 5 +-- + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/check_stroke_opacity.cpp | 73 + ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 77 insertions(+), 2 deletions(-) + +commit 9cf9356d334c6a1fa8bc3f1466778541b8f9c276 +Author: Albert Astals Cid +Date: Sat Apr 11 00:04:02 2020 +0200 + + Update (C) of last commit + + qt5/src/ArthurOutputDev.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 162fdf21717a92428f4fc0c1bf7e86610b9ea703 +Author: Oliver Sander +Date: Fri Apr 10 22:01:00 2020 +0000 + + [arthur] Fix font hinting + + Previously, the ArthurOutputDev would always use the Qt default value + for the QFont hinting preference. At the same time, it contained + a custom enum type with various hinting levels that didn't do anything + at all. This patch removes the custom enum, uses + QFont::HintingPreference instead, and actually passes the chosen value + to the font renderer. + + qt5/src/ArthurOutputDev.cc | 6 +++--- + qt5/src/ArthurOutputDev.h | 14 ++------------ + qt5/src/poppler-page.cc | 19 +++++++++++++++++++ + 3 files changed, 24 insertions(+), 15 deletions(-) + +commit 17b01bd15db544dbca989938cbf870f6376a8b18 +Author: Nelson Benítez León +Date: Sat Mar 28 16:36:32 2020 -0400 + + PopplerFormField: add getter for alternative ui name + + There are pdf files which carry a tooltip string + in this field, so applications need this getter + to show it. API added is: + + gchar* + poppler_form_field_get_alternate_ui_name (PopplerFormField *field) + + Related Poppler issue #34 + + Related Evince issue: + https://gitlab.gnome.org/GNOME/evince/issues/842 + + glib/poppler-form-field.cc | 24 ++++++++++++++++++++++++ + glib/poppler-form-field.h | 2 ++ + glib/reference/poppler-docs.sgml | 5 +++++ + glib/reference/poppler-sections.txt | 1 + + 4 files changed, 32 insertions(+) + +commit 155f73bdd261622323491df4aebb840cde8bfee1 +Author: Albert Astals Cid +Date: Tue Apr 7 17:54:22 2020 +0200 + + Fix crash in destruction of standalone forms + + If we just give the Dict to Object() it doesn't increase the ref + so on destruction we do one unref too much (because we had done + one ref + too few) and crash + + poppler/Annot.h | 4 ++-- + poppler/Page.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 4098c6546d9be6ab93a817d52dd749b43aede868 +Author: Albert Astals Cid +Date: Tue Apr 7 17:27:16 2020 +0200 + + Fix test in MSVC + + For some reason MSVC doesn't like QStringLiteral with non ascii chars + + qt5/tests/check_forms.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4e3c9a89beab10613b27421d77d8e2deb73e82c7 +Author: Albert Astals Cid +Date: Tue Apr 7 00:09:22 2020 +0200 + + Update (C) of last commit + + poppler/Annot.h | 1 + + poppler/Form.cc | 2 +- + poppler/Form.h | 1 + + poppler/Page.cc | 1 + + poppler/Page.h | 1 + + 5 files changed, 5 insertions(+), 1 deletion(-) + +commit e4badf4d745b8e8f9a0a25b6c3cc97fbadbbb499 +Author: Nelson Benítez León +Date: Sat Mar 28 16:35:16 2020 -0400 + + support 'de facto' tooltip feature + + Most pdf readers implement a tooltip feature by + showing the string content of 'TU' field of a + widget annotation that is not linked to any + form field. + + Normally, widget annotations carry a reference to a + form field which are used together to implement the + different form widgets. But, the PDF spec does not + forbid standalone (i.e. not linked to any form field) + widget annotations, and the fact is they're been used + by most pdf readers to show a tooltip when the area + of that AnnotWidget is hovered. + + Some API added for this feature: + + bool FormField::isStandAlone() + void FormField::setStandAlone (bool value) + + A standalone FormField means it's not part of Catalog's + Field array, because of that we store them in a new + member inside Page class: + + std::vector standaloneFields; + + and send them alongside the rest of FormWidgets in the + existant API: + + FormPageWidgets *Page::getFormWidgets(); + + Poppler issue #34 + + Evince issue: + https://gitlab.gnome.org/GNOME/evince/issues/842 + + poppler/Annot.h | 1 + + poppler/Form.cc | 16 ++++++++++++++++ + poppler/Form.h | 9 ++++++++- + poppler/Page.cc | 48 + ++++++++++++++++++++++++++++++++++++++++++++++- + poppler/Page.h | 8 ++++++++ + qt5/tests/check_forms.cpp | 31 ++++++++++++++++++++++++++++++ + 6 files changed, 111 insertions(+), 2 deletions(-) + +commit e90fe93eef66e3a2d9c260343273dad8041c3716 +Author: Albert Astals Cid +Date: Wed Apr 1 23:59:02 2020 +0200 + + Update (C) of last commit + + poppler/BBoxOutputDev.cc | 12 +++++++++--- + poppler/BBoxOutputDev.h | 10 ++++++++++ + 2 files changed, 19 insertions(+), 3 deletions(-) + +commit 967a21b5c2bedd0c0debb74ae622edbc1a5b486a +Author: sgerwk +Date: Wed Apr 1 21:53:58 2020 +0000 + + bounding box of graphics in the page + + CMakeLists.txt | 2 + + glib/CMakeLists.txt | 1 + + glib/poppler-page.cc | 48 +++++++ + glib/poppler-page.h | 3 + + glib/reference/poppler-sections.txt | 1 + + glib/tests/CMakeLists.txt | 43 ++++++ + glib/tests/check_bb.c | 92 +++++++++++++ + glib/tests/check_text.c | 55 ++++++++ + glib/tests/pdfdrawbb.c | 143 ++++++++++++++++++++ + poppler/BBoxOutputDev.cc | 251 + ++++++++++++++++++++++++++++++++++++ + poppler/BBoxOutputDev.h | 73 +++++++++++ + 11 files changed, 712 insertions(+) + +commit 04c5fec1047a70ddb5f5ce6ccfc5d31b61d8460d +Author: Albert Astals Cid +Date: Tue Mar 31 23:50:53 2020 +0200 + + Add missing since + + cpp/poppler-page.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 98d6644607b976e0e5f2342629432f0074aeb453 +Author: Albert Astals Cid +Date: Tue Mar 31 23:49:41 2020 +0200 + + Add (C) from last commit + + cpp/poppler-page.cpp | 1 + + cpp/poppler-page.h | 1 + + cpp/tests/poppler-dump.cpp | 1 + + 3 files changed, 3 insertions(+) + +commit 1e098e9b272d57478a3f23a9a6b6bb1542740aaf +Author: Jiri Jakes +Date: Tue Mar 31 21:38:23 2020 +0000 + + cpp: Add non_raw_non_physical layout for page::text() + + cpp/poppler-page.cpp | 25 ++++++++++++------------- + cpp/poppler-page.h | 3 ++- + cpp/tests/poppler-dump.cpp | 4 +++- + 3 files changed, 17 insertions(+), 15 deletions(-) + +commit 1ff36d6428765185c645ff10df8044cbb961c2a5 +Author: Albert Astals Cid +Date: Mon Mar 30 23:27:33 2020 +0200 + + pdftohtml: Fix noRoundedCoordinates->noroundcoord in man page + + Fixes #901 + + utils/pdftohtml.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ba81433a112862fa628a1c3d11eb2379cc384f54 +Author: Albert Astals Cid +Date: Sun Mar 29 16:59:41 2020 +0200 + + Update (C) of last commit + + poppler/SplashOutputDev.cc | 2 +- + poppler/Stream.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 29cfa16d1f782fa9b5f7f48552183baf4991362a +Author: Thomas Freitag +Date: Sun Mar 29 12:48:51 2020 +0200 + + Handle 1 bit RGB images in ICC colorspace + + poppler/SplashOutputDev.cc | 2 +- + poppler/Stream.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 4b56adac660e9b0620f5345edb9eef5546de51f6 +Author: Albert Astals Cid +Date: Sat Mar 28 23:59:34 2020 +0100 + + Make some PDFRectangle methods const + + poppler/Page.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0e938b2f82fbb1cf129ee40c84a3081a10c39d0a +Author: Albert Astals Cid +Date: Sat Mar 28 15:41:37 2020 +0100 + + 0.87.0 + + CMakeLists.txt | 6 +++--- + NEWS | 15 +++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 21 insertions(+), 6 deletions(-) + +commit f19d6723313c0db1b63b8a04c0d2475422b875fb +Author: Albert Astals Cid +Date: Thu Mar 26 22:50:34 2020 +0100 + + Update (C) + + qt5/src/ArthurOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5e1a83dbdc065504291528554cb11ab8fabeb5f6 +Author: Oliver Sander +Date: Wed Mar 25 21:14:34 2020 +0100 + + Avoid division by zero in updateLineDash + + Qt measures dash patterns in terms of line width. + This means that you have to divide by the width, + which doesn't work if the line width is 'cosmetic', + i.e., zero. The Qt documentation states that this + case should be treated as if the line width + was 1 pixel. + + BUG: 695 + + qt5/src/ArthurOutputDev.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 170aa09affc7637cdc8087bb7ae8012b37a80025 +Author: Albert Astals Cid +Date: Wed Mar 18 17:51:18 2020 +0100 + + Simplify LinkRendition + + glib/poppler-action.cc | 2 +- + poppler/Link.cc | 2 +- + poppler/Link.h | 6 +----- + 3 files changed, 3 insertions(+), 7 deletions(-) + +commit 535db3f8c2d18b2a3c76794b5cc8d4d79f5aef70 +Author: Albert Astals Cid +Date: Thu Mar 26 22:30:17 2020 +0100 + + CI: Use debian testing while unstable is broken + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 388a7522beaa3abd9c7c0fb437dc3ca513d250b7 +Author: Albert Astals Cid +Date: Thu Mar 26 22:30:02 2020 +0100 + + Update (C) + + poppler/JPEG2000Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4382264f1b96e6ad6c9e481e4ceae3c22dbcd2f3 +Author: Albert Astals Cid +Date: Sun Mar 22 12:32:02 2020 +0100 + + Fix leak in broken files + + oss-fuzz/21330 + + poppler/JPEG2000Stream.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 5c601c40d84686134d90a0f862e2507bd628e188 +Author: Albert Astals Cid +Date: Tue Mar 17 23:39:53 2020 +0100 + + qt5: Add option to get choice for export value + + poppler/Form.cc | 5 +++++ + poppler/Form.h | 3 ++- + qt5/src/poppler-form.cc | 18 +++++++++++++++++- + qt5/src/poppler-form.h | 10 +++++++++- + 4 files changed, 33 insertions(+), 3 deletions(-) + +commit 4813adfada062a9161b55e412e3997b748123f7f +Author: Albert Astals Cid +Date: Thu Mar 19 17:17:04 2020 +0100 + + Some more const + + glib/demo/annots.c | 2 +- + splash/SplashFTFont.cc | 4 ++-- + splash/SplashScreen.cc | 8 ++++---- + splash/SplashScreen.h | 6 +++--- + utils/InMemoryFile.cc | 3 ++- + utils/pdfattach.cc | 4 ++-- + utils/pdfdetach.cc | 2 +- + 7 files changed, 15 insertions(+), 14 deletions(-) + +commit 81a86064c14a7fc25047b6040d65464e732cf501 +Author: Adam Reichold +Date: Wed Mar 18 11:39:50 2020 +0100 + + Fix vague linkage of Link* class vtables + + Due to falling back to the implicitly inline destructors, + some of the Link* classes had all their overridden methods + defined inline with made the linkage of their vtables vague. + + This change moves their destructors into a defined translation + unit thereby anchoring their vtables in the libpoppler DSO which + fixes issues using dynamic_cast when builing Poppler using Clang. + + poppler/Link.cc | 20 ++++++++++++++++++++ + poppler/Link.h | 20 +++++++++++++++++++- + 2 files changed, 39 insertions(+), 1 deletion(-) + +commit 80fa729be74bfcfbf9cf2208a55ad95bf113217b +Author: Albert Astals Cid +Date: Sat Mar 14 17:20:01 2020 +0100 + + Update (C) + + utils/HtmlOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 68b6dd2ecd868c1a757cb8b9273e2e26687e5229 +Author: Adam Reichold +Date: Sat Mar 14 14:49:17 2020 +0100 + + Replace dynamic_cast by static_cast where we already perform the + type checks explicitly before downcasting. + + glib/poppler-action.cc | 18 +++++++++--------- + utils/HtmlOutputDev.cc | 2 +- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit af5565087b63aebfbb20a155dd9318312f688f92 +Author: Alex Henrie +Date: Wed Mar 11 17:06:16 2020 -0600 + + Fix memory leak in HtmlOutputDev::getLinkDest + + utils/HtmlOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f1480aa0720b3f2d4d12b6e1b4370e2ced4c06f2 +Author: Albert Astals Cid +Date: Sun Mar 1 20:52:52 2020 +0100 + + Poppler 0.86.1 + + CMakeLists.txt | 4 ++-- + NEWS | 5 +++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 9 insertions(+), 4 deletions(-) + +commit 84c52530992f28fc0623747ee505baad7a9bb287 +Author: Albert Astals Cid +Date: Sun Mar 1 19:08:02 2020 +0100 + + Fix regression in URI link handling + + poppler/Link.cc | 1 + + qt5/tests/check_links.cpp | 23 +++++++++++++++++++++++ + 2 files changed, 24 insertions(+) + +commit b3cfbbf2679618d0c32670090717a6e2f70faf9c +Author: Oliver Sander +Date: Tue Feb 11 22:34:10 2020 +0100 + + Use std::unique_ptr for LinkGoto data members + + This makes it clear that these pointers are owning. + It makes the code slightly shorter, too. + + poppler/Link.cc | 60 + ++++++++++++--------------------------------------------- + poppler/Link.h | 37 ++++++++++++++--------------------- + 2 files changed, 26 insertions(+), 71 deletions(-) + +commit a9ba550caaaf89d35f8206463e1fe0d4ecfaa161 +Author: Albert Astals Cid +Date: Sat Feb 29 00:26:55 2020 +0100 + + Poppler 0.86.0 + + CMakeLists.txt | 4 ++-- + NEWS | 19 +++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 23 insertions(+), 4 deletions(-) + +commit bad6503c276f306170799cab2e98f53894c6e147 +Author: Albert Astals Cid +Date: Fri Feb 28 00:35:25 2020 +0100 + + Update (C) of last commit + + splash/SplashPattern.h | 2 +- + splash/SplashTypes.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 68af136fb2934a65f912d84a619c39c75d6d90b9 +Author: Albert Astals Cid +Date: Sat Feb 22 10:05:25 2020 +0100 + + Implement Splash::gouraudTriangleShadedFill for non parametrized + shadings + + Fixes #881 + + Unfortunately only implemented for shadings where the 3 vertices + of the + triangle have the same color for now since i got lost trying to + implement the coloring (and also have no pdf to check against) + + The reason this fixes #881 is because if + Splash::gouraudTriangleShadedFill + returns false because it doesn't natively support this shading, the + default rendering algorithm of Gfx.cc kicks in, and that rendering + what + does is render different triangles without them knowing they belong to + the same shading, meaning that if you have some opacity the edges + of the + triangles will overlap and and up having different color than the one + you really wanted + + poppler/SplashOutputDev.cc | 51 +++++---- + poppler/SplashOutputDev.h | 11 +- + splash/Splash.cc | 271 + +++++++++++++++++++++++++++++++++------------ + splash/SplashPattern.h | 7 +- + splash/SplashTypes.h | 7 ++ + 5 files changed, 246 insertions(+), 101 deletions(-) + +commit d4a7367d994483f05151892ee8f14e138e0731c7 +Author: Albert Astals Cid +Date: Wed Feb 26 22:54:41 2020 +0100 + + Update (C) of last commit + + poppler/Form.h | 2 +- + poppler/Outline.cc | 2 +- + poppler/Outline.h | 2 +- + qt5/src/poppler-annotation.cc | 2 +- + utils/JSInfo.h | 1 + + utils/pdftocairo.cc | 2 +- + utils/pdftoppm.cc | 2 +- + 7 files changed, 7 insertions(+), 6 deletions(-) + +commit 58dfc767964f133f9bf18b3c5eb641c090584967 +Author: Oliver Sander +Date: Tue Nov 26 17:02:56 2019 +0100 + + Handle LinkAction objects by std::unique_ptrs + + This clarifies the object ownership, and fixes various memory leaks. + + glib/poppler-form-field.cc | 8 +++--- + poppler/Annot.cc | 26 +++++++++--------- + poppler/Annot.h | 8 +++--- + poppler/Catalog.cc | 7 +++-- + poppler/Catalog.h | 2 +- + poppler/Form.cc | 2 +- + poppler/Form.h | 2 +- + poppler/Link.cc | 45 +++++++++++++++---------------- + poppler/Link.h | 6 ++--- + poppler/Outline.cc | 4 --- + poppler/Outline.h | 6 +++-- + poppler/Page.cc | 8 +++--- + poppler/Page.h | 4 ++- + qt5/src/poppler-annotation.cc | 5 ++-- + qt5/src/poppler-form.cc | 10 +++---- + qt5/src/poppler-page.cc | 6 ++--- + utils/JSInfo.cc | 62 + +++++++++++++++++++++---------------------- + 17 files changed, 104 insertions(+), 107 deletions(-) + +commit 35b7e926035c7d6852ed148b4dbe6d15e32f3fed +Author: Oliver Sander +Date: Fri Nov 22 14:32:44 2019 +0100 + + Revert "pdfinfo: Fix another leak" + + This reverts commit 4d799cdf9b9039b003de7d3baf05d858bc507a5a. + + When closing/deallocating a document, poppler should free all memory + used by that document internally. Freeing some of that memory + within pdfinfo is not a proper solution when valgrind shows leaks. + + utils/JSInfo.cc | 14 ++++++-------- + utils/JSInfo.h | 4 ++-- + 2 files changed, 8 insertions(+), 10 deletions(-) + +commit a11fc679a701879ffd8ba6ccbd4b0a08a03440e6 +Author: Oliver Sander +Date: Fri Nov 22 08:50:35 2019 +0100 + + Use a vector of unique_ptr for LinkAction::nextActionList + + This makes it clear that the vector owns the LinkAction objects. + + poppler/Link.cc | 14 +++++--------- + poppler/Link.h | 5 ++--- + qt5/src/poppler-page.cc | 4 ++-- + 3 files changed, 9 insertions(+), 14 deletions(-) + +commit afa0528e1dfaafeb09ad9fb52902b13b378e0250 +Author: Albert Astals Cid +Date: Sat Feb 22 01:00:05 2020 +0100 + + pdftoppm/pdftocairo: Fix more odd/even mismatch + + utils/pdftocairo.cc | 4 ++-- + utils/pdftoppm.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 90a1441809fc6ca8713022bf8cb5530e9a7ae832 +Author: Albert Astals Cid +Date: Sun Feb 23 18:23:23 2020 +0100 + + GooString: remove duplicated code + + goo/GooString.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit ae2660175df533bb93578f7f60a5375a431ad865 +Author: Albert Astals Cid +Date: Sun Feb 23 18:21:15 2020 +0100 + + Update (C) last commit + + goo/GooString.h | 2 +- + poppler/Annot.cc | 2 +- + poppler/Form.cc | 2 +- + poppler/PDFDocEncoding.h | 1 + + poppler/Sound.cc | 1 + + poppler/Sound.h | 1 + + qt5/src/poppler-private.cc | 2 +- + qt5/src/poppler-private.h | 2 +- + utils/JSInfo.cc | 1 + + 9 files changed, 9 insertions(+), 5 deletions(-) + +commit 3355e20b2849fc1be131095bc2fe5b0a02d41d5a +Author: Oliver Sander +Date: Wed Jan 29 09:41:35 2020 +0100 + + Implement fillGooString in terms of fillString + + This requires to add a method to GooString that allows access + as a mutable std::string&. + + goo/GooString.h | 1 + + poppler/Stream.h | 7 +------ + 2 files changed, 2 insertions(+), 6 deletions(-) + +commit 5804f51c7cf439432082b668ba8df3b0a6048caf +Author: Oliver Sander +Date: Mon Jan 27 17:33:49 2020 +0100 + + Use a std::string value in LinkURI + + glib/poppler-action.cc | 4 +--- + poppler/Link.cc | 40 +++++++++++++++------------------------- + poppler/Link.h | 10 ++++------ + qt5/src/poppler-page.cc | 2 +- + qt5/src/poppler-private.cc | 2 +- + utils/HtmlOutputDev.cc | 2 +- + 6 files changed, 23 insertions(+), 37 deletions(-) + +commit 06a658708d73b4e2d0bcb9f5572be9b2754368eb +Author: Oliver Sander +Date: Mon Jan 27 16:24:54 2020 +0100 + + Use a std::string value in LinkNamed + + glib/poppler-action.cc | 4 +--- + poppler/Link.cc | 11 +++-------- + poppler/Link.h | 9 ++++----- + qt5/src/poppler-page.cc | 26 +++++++++++++------------- + 4 files changed, 21 insertions(+), 29 deletions(-) + +commit 5d9a9c85bc27f7375a57f6c84913c8e0adcc38d1 +Author: Oliver Sander +Date: Mon Jan 27 16:11:16 2020 +0100 + + Use a std::string value in LinkMovie + + glib/poppler-action.cc | 9 +++------ + poppler/Link.cc | 13 ++++--------- + poppler/Link.h | 10 +++++----- + 3 files changed, 12 insertions(+), 20 deletions(-) + +commit 42eebb9bade006ceb602805c474bc9df5ef630b9 +Author: Oliver Sander +Date: Sat Jan 25 20:44:56 2020 +0100 + + Use a std::string value in LinkRendition + + poppler/Link.cc | 11 ++++------- + poppler/Link.h | 4 ++-- + utils/JSInfo.cc | 12 +++++------- + 3 files changed, 11 insertions(+), 16 deletions(-) + +commit 887d35751979d3441a18db00b99cfc5b6b8d958f +Author: Oliver Sander +Date: Sat Jan 25 17:29:54 2020 +0100 + + LinkSound: Store Sound in a std::unique_ptr + + Because the LinkSound class does own the pointer. + + poppler/Annot.cc | 2 +- + poppler/Link.cc | 4 ---- + poppler/Link.h | 6 ++---- + poppler/Sound.cc | 4 ++-- + poppler/Sound.h | 4 +++- + 5 files changed, 8 insertions(+), 12 deletions(-) + +commit 57c7c79df6105300f32b1f5d8775a2be8d1b96f9 +Author: Oliver Sander +Date: Sat Jan 25 17:29:28 2020 +0100 + + Do not include GooString.h + + It is not actually used. + + poppler/Sound.cc | 1 - + poppler/Sound.h | 1 - + 2 files changed, 2 deletions(-) + +commit 70ba56662286257a84d0d979c8f47eb3d3a5356b +Author: Oliver Sander +Date: Sat Jan 25 10:20:03 2020 +0100 + + Use a std::string value in LinkJavaScript + + glib/poppler-action.cc | 9 ++++----- + poppler/Link.cc | 15 +++++---------- + poppler/Link.h | 9 ++++----- + poppler/Stream.h | 11 +++++++++++ + qt5/src/poppler-page.cc | 2 +- + utils/JSInfo.cc | 7 ++++--- + 6 files changed, 29 insertions(+), 24 deletions(-) + +commit e9278387cbff75ce75a87a92bc297b53256bd3fc +Author: Oliver Sander +Date: Sat Jan 25 09:46:10 2020 +0100 + + Use a std::string value in LinkHide + + poppler/Link.cc | 9 +++------ + poppler/Link.h | 12 ++++++------ + 2 files changed, 9 insertions(+), 12 deletions(-) + +commit 9c8d05116e8d4fc26c5a9cd5a41aadb1f39b7f9f +Author: Oliver Sander +Date: Sun Jan 26 04:46:44 2020 +0100 + + Implement UnicodeParsedString for std::string + + goo/GooString.h | 2 ++ + poppler/Form.cc | 14 +++++++------- + poppler/PDFDocEncoding.h | 4 +++- + qt5/src/poppler-private.cc | 10 +++++++--- + qt5/src/poppler-private.h | 2 ++ + 5 files changed, 21 insertions(+), 11 deletions(-) + +commit be45004531235f4dc3cce92e5a24b7cff6c385c1 +Author: Oliver Sander +Date: Thu Jan 23 17:57:52 2020 +0100 + + Use a std::string value in LinkUnknown + + poppler/Link.cc | 6 +----- + poppler/Link.h | 10 ++++------ + 2 files changed, 5 insertions(+), 11 deletions(-) + +commit 9980bc8eb1e7e6a7e39e684622bce52f3637784b +Author: Alex Henrie +Date: Tue Jan 28 18:44:15 2020 -0700 + + Add case table for Adlam + + poppler/UnicodeTypeTable.cc | 156 + ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 156 insertions(+) + +commit bb9f1180f22515e619eb189e1e75f16e95ccc8d9 +Author: Alex Henrie +Date: Tue Jan 28 18:44:15 2020 -0700 + + Add case table for Medefaidrin + + poppler/UnicodeTypeTable.cc | 119 + ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 119 insertions(+) + +commit bbdf276b5cc202855cdb8715924b143dc0b15d4e +Author: Alex Henrie +Date: Tue Jan 28 18:44:15 2020 -0700 + + Add case table for Warang Citi + + poppler/UnicodeTypeTable.cc | 45 + +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + +commit e631f11fe666d2075297aaf8685dca91d1503cdc +Author: Alex Henrie +Date: Tue Jan 28 18:44:15 2020 -0700 + + Add case table for Old Hungarian + + poppler/UnicodeTypeTable.cc | 41 + +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 41 insertions(+) + +commit 700fe3b70406c5303e333a5626fe58343fc30d5d +Author: Albert Astals Cid +Date: Thu Feb 20 23:34:47 2020 +0100 + + Update (C) of previous commit + + poppler/Catalog.cc | 2 +- + poppler/Dict.cc | 2 +- + poppler/Dict.h | 2 +- + poppler/Stream.cc | 2 +- + poppler/Stream.h | 2 +- + poppler/XRef.cc | 2 +- + poppler/XRef.h | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +commit ddf97254576a88bd85fcc7b41876c90d1780504e +Author: Albert Astals Cid +Date: Sat Dec 7 00:18:53 2019 +0100 + + Make sure Base URI is encrypted if the document is before using it + + Otherwise we may be being targetted by a link content exfiltration + + poppler/Catalog.cc | 4 ++-- + poppler/Dict.cc | 17 +++++++++++++++++ + poppler/Dict.h | 3 +++ + poppler/Stream.cc | 8 ++++++++ + poppler/Stream.h | 7 +++++-- + poppler/XRef.cc | 29 +++++++++++++++++++++++++++++ + poppler/XRef.h | 4 ++++ + 7 files changed, 68 insertions(+), 4 deletions(-) + +commit bdafd6066df79e8183ee311fb086993c480b2c55 +Author: Albert Astals Cid +Date: Thu Feb 20 21:24:19 2020 +0100 + + CI: Ignore bugprone-sizeof-expression for clang-tidy + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dcce8cc11dd29180bcadbd182d3a8e6900bc08f8 +Author: Albert Astals Cid +Date: Mon Feb 17 01:08:30 2020 +0100 + + Remove dead code from GfxGouraudTriangleShading::getTriangle + + If we're asserting for !isParameterized, that means nFuncs == 0 + + poppler/GfxState.cc | 40 ++++------------------------------------ + 1 file changed, 4 insertions(+), 36 deletions(-) + +commit 16e1d0509be90a121b48e749cb330fe738f735eb +Author: Albert Astals Cid +Date: Sat Feb 15 17:19:52 2020 +0100 + + Update(C) + + And fix an include while it + + cpp/poppler-document.cpp | 2 +- + poppler/Catalog.cc | 1 + + poppler/Catalog.h | 6 ++---- + poppler/PDFDoc.h | 1 + + qt5/src/poppler-link.cc | 1 + + utils/HtmlOutputDev.cc | 2 +- + utils/pdfinfo.cc | 2 +- + 7 files changed, 8 insertions(+), 7 deletions(-) + +commit ef5a9f53959d71be273fb9ee0956f516f6d3d39c +Author: Oliver Sander +Date: Fri Feb 14 23:37:35 2020 +0100 + + Use std::unique_ptr to pass around LinkDest objects + + This provides no functional changes, but it makes the pointer + ownership easier to understand. + + cpp/poppler-document.cpp | 12 ++++-------- + glib/poppler-document.cc | 16 ++++++---------- + poppler/Catalog.cc | 17 ++++++++--------- + poppler/Catalog.h | 10 ++++++---- + poppler/PDFDoc.h | 2 +- + qt5/src/poppler-link.cc | 2 +- + utils/HtmlOutputDev.cc | 11 ++++------- + utils/pdfinfo.cc | 17 ++++++++--------- + 8 files changed, 38 insertions(+), 49 deletions(-) + +commit 5539aeba90d8e5b2ea78444495deaefc900d299c +Author: Albert Astals Cid +Date: Tue Feb 11 23:05:30 2020 +0100 + + Update (C) + + utils/pdfdetach.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b54e06d0f284fd2e72b01c7b7d619d16a69428b7 +Author: coeffier +Date: Fri Jan 31 15:07:53 2020 +0100 + + pdfdetach: add 'saveFile' option + + utils/pdfdetach.1 | 5 +++++ + utils/pdfdetach.cc | 20 ++++++++++++++++++-- + 2 files changed, 23 insertions(+), 2 deletions(-) + +commit 4ca0cde98c02794cfdd4982018d5104abbd09b59 +Author: Albert Astals Cid +Date: Thu Jan 30 22:31:46 2020 +0100 + + glib: Fix leak if poppler_document_new_from_file fails + + glib/poppler-document.cc | 24 ++++++++++++------------ + glib/poppler-private.h | 2 +- + 2 files changed, 13 insertions(+), 13 deletions(-) + +commit d27cf873b8db1ca2b20cdc16a724c63a42d6473d +Author: Nelson Benítez León +Date: Tue Oct 29 19:08:30 2019 -0400 + + poppler-page: minor optimization + + on poppler_page_get_annot_mapping(). + Let's retrieve the cropbox just once, + on the outside of the _for_ loop. + + glib/poppler-page.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit f5ff25788ef23041a498a98e0ba9718590d96db0 +Author: Nelson Benítez León +Date: Mon Oct 28 21:51:21 2019 -0400 + + glib: automatic handle of page's cropbox on annots + + Core poppler annot (Annot.cc) has cropbox offsets included + in the coordinates of the relevant fields (rect and + quadrilaterals fields). + + This commit makes poppler-glib API _not_ include cropbox + offsets when providing annot info to clients (by substracting + cropbox offsets from the read core Annot info) and in the same + way, assumes no cropbox offsets are included in the info + received from clients to create new annots (cropbox offsets will + be automatically added to the corresponding core poppler Annot). + + As a result of this, existent clients (like Evince) now automatically + work right for annotations placed in pages that have a cropbox. + + Poppler issue: poppler/poppler#129 + Evince issue: https://gitlab.gnome.org/GNOME/evince/issues/1280 + + glib/poppler-annot.cc | 109 + +++++++++++++++++++++++++++++++++++++++---------- + glib/poppler-page.cc | 55 +++++++++++++++++++++++++ + glib/poppler-private.h | 2 + + 3 files changed, 144 insertions(+), 22 deletions(-) + +commit 8ed4623c3aad7899114ddb9754e303c97ce64e50 +Author: Albert Astals Cid +Date: Wed Feb 5 21:25:46 2020 +0100 + + Update (C) + + qt5/src/poppler-document.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0bdf0d31d99a7becb1e36b5503213fe777673acb +Author: Albert Astals Cid +Date: Thu Jan 30 22:27:55 2020 +0100 + + qt5: Fix loading from iodevice + + qt5/src/poppler-document.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 2df04a397d51af7a50e0a11179b04503db2b2f10 +Author: Albert Astals Cid +Date: Wed Jan 29 23:26:58 2020 +0100 + + Poppler 0.85.0 + + CMakeLists.txt | 4 ++-- + NEWS | 21 +++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 26 insertions(+), 5 deletions(-) + +commit 2acfe30b35377447be80f9d06e2402d7aeaacdb2 +Author: Albert Astals Cid +Date: Wed Jan 29 00:16:43 2020 +0100 + + Update (C) of previous commits + + poppler/UnicodeTypeTable.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 715878e8906155045e6219018af433ec67be74cc +Author: Albert Astals Cid +Date: Tue Jan 28 23:53:04 2020 +0100 + + qt5: Add deseret lowercase search test + + Or at least i think this is the lowercase one, at least this is the + different case than the one on the actual file + + qt5/tests/check_search.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +commit b9c8632375e0c8a96dbf706e813ef1639dd297af +Author: Alex Henrie +Date: Thu Jan 23 20:01:57 2020 -0700 + + Add case table for Deseret and Osage + + Fixes #853 + + poppler/UnicodeTypeTable.cc | 52 + +++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 43 insertions(+), 9 deletions(-) + +commit ceb4206215367b51ff361593ad7ee1771bfe1e97 +Author: Albert Astals Cid +Date: Tue Jan 28 23:47:28 2020 +0100 + + qt5: add test to show that deseret search works + + The one with ignoring case doesn't work yet + + qt5/tests/check_search.cpp | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 2816a3597f4accadcfe982673b501264e8bdee21 +Author: Albert Astals Cid +Date: Tue Jan 28 23:42:31 2020 +0100 + + qt5: fix search for "complex" characters + + poppler internals want ucs4 not unicode + + based on a patch by Alex Henrie + + qt5/src/poppler-page.cc | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit e249d8965c0f39bd4dcb882048535a5272f66566 +Author: Albert Astals Cid +Date: Sat Jan 18 11:35:25 2020 +0100 + + Initialize StandardSecurityHandler::encAlgorithm + + Fixes uninitialized memory read on broken files + + poppler/SecurityHandler.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 1f82b0a455659a41b321c9a73c82a38fe4318159 +Author: Albert Astals Cid +Date: Fri Jan 17 17:39:17 2020 +0100 + + Remove unused SplashOutputDev variable/function + + poppler/SplashOutputDev.cc | 7 +------ + poppler/SplashOutputDev.h | 5 +---- + 2 files changed, 2 insertions(+), 10 deletions(-) + +commit f7c420c2859ec6774480e237d5a87af7e8807726 +Author: Albert Astals Cid +Date: Fri Jan 17 17:21:37 2020 +0100 + + Remove unused SplashOutputDev::setBitmapUpsideDown + + poppler/SplashOutputDev.cc | 1 - + poppler/SplashOutputDev.h | 7 +------ + 2 files changed, 1 insertion(+), 7 deletions(-) + +commit c9d50037bc860c680ba24877b8727c66c95380da +Author: Albert Astals Cid +Date: Wed Jan 15 09:58:22 2020 +0100 + + fofi: add some const + + fofi/FoFiTrueType.cc | 2 +- + fofi/FoFiTrueType.h | 4 ++-- + fofi/FoFiType1C.cc | 8 ++++---- + fofi/FoFiType1C.h | 10 +++++----- + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 4b063f84124a13f0561d871e43a08e0cf181ced5 +Author: Albert Astals Cid +Date: Sun Jan 12 23:44:25 2020 +0100 + + pdftoppm/pdftocairo: Fix -e/-o printing the wrong pages + + Fixes #873 + + utils/pdftocairo.cc | 6 +++--- + utils/pdftoppm.cc | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit a047dea62d28402e819d8ecacdaca95a18f2e3f1 +Author: Alexander Volkov +Date: Thu Sep 12 00:04:20 2019 +0300 + + qt5: Allow to load document from QIODevice + + Extract BaseSeekInputStream class from PopplerInputStream class + and inherit an introduced Poppler::QIODeviceInStream from it. + This allows to implement Poppler::Document::load(QIODevice *, ...) + overload. + + glib/poppler-input-stream.cc | 98 + ++----------------------- + glib/poppler-input-stream.h | 33 ++------- + poppler/Stream.cc | 107 + ++++++++++++++++++++++++++++ + poppler/Stream.h | 58 +++++++++++++++ + qt5/src/CMakeLists.txt | 1 + + qt5/src/poppler-document.cc | 17 ++++- + qt5/src/poppler-private.h | 16 +++++ + qt5/src/poppler-qiodeviceinstream-private.h | 49 +++++++++++++ + qt5/src/poppler-qiodeviceinstream.cc | 63 ++++++++++++++++ + qt5/src/poppler-qt5.h | 29 ++++++++ + qt5/tests/check_actualtext.cpp | 30 ++++++-- + 11 files changed, 376 insertions(+), 125 deletions(-) + +commit 0d31745f9f2ce6fe0ff01da507c13c393c4456a3 +Author: Albert Astals Cid +Date: Sun Jan 12 22:30:24 2020 +0100 + + Update (C) of last commit + + poppler/BuiltinFont.h | 2 +- + poppler/GlobalParamsWin.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 22a334bbf55c900b3efff12a3a676bd14b18decd +Author: Albert Astals Cid +Date: Sun Jan 12 02:22:33 2020 +0100 + + Use gperf for the BuiltinFonts hash table + + Instead of creating one by hand on runtime we create one at compile + time + + It's faster and lets us declare things as static const instead of just + static and also allows us to remove two init/destroy functions + + CMakeLists.txt | 42 +- + poppler/BuiltinFont.cc | 61 - + poppler/BuiltinFont.h | 85 +- + poppler/BuiltinFontTables.cc | 4298 + -------------------- + .../{BuiltinFontTables.h => BuiltinFontWidth.h} | 21 +- + poppler/CourierBoldObliqueWidths.gperf | 330 ++ + poppler/CourierBoldObliqueWidths.pregenerated.c | 995 +++++ + poppler/CourierBoldWidths.gperf | 330 ++ + poppler/CourierBoldWidths.pregenerated.c | 995 +++++ + poppler/CourierObliqueWidths.gperf | 330 ++ + poppler/CourierObliqueWidths.pregenerated.c | 995 +++++ + poppler/CourierWidths.gperf | 330 ++ + poppler/CourierWidths.pregenerated.c | 995 +++++ + poppler/GfxFont.cc | 16 +- + poppler/GlobalParams.cc | 5 - + poppler/GlobalParamsWin.cc | 1 - + poppler/HelveticaBoldObliqueWidths.gperf | 330 ++ + poppler/HelveticaBoldObliqueWidths.pregenerated.c | 995 +++++ + poppler/HelveticaBoldWidths.gperf | 331 ++ + poppler/HelveticaBoldWidths.pregenerated.c | 986 +++++ + poppler/HelveticaObliqueWidths.gperf | 330 ++ + poppler/HelveticaObliqueWidths.pregenerated.c | 995 +++++ + poppler/HelveticaWidths.gperf | 330 ++ + poppler/HelveticaWidths.pregenerated.c | 995 +++++ + poppler/SymbolWidths.gperf | 205 + + poppler/SymbolWidths.pregenerated.c | 595 +++ + poppler/TimesBoldItalicWidths.gperf | 330 ++ + poppler/TimesBoldItalicWidths.pregenerated.c | 995 +++++ + poppler/TimesBoldWidths.gperf | 330 ++ + poppler/TimesBoldWidths.pregenerated.c | 995 +++++ + poppler/TimesItalicWidths.gperf | 330 ++ + poppler/TimesItalicWidths.pregenerated.c | 995 +++++ + poppler/TimesRomanWidths.gperf | 330 ++ + poppler/TimesRomanWidths.pregenerated.c | 995 +++++ + poppler/ZapfDingbatsWidths.gperf | 217 + + poppler/ZapfDingbatsWidths.pregenerated.c | 614 +++ + 36 files changed, 17639 insertions(+), 4413 deletions(-) + +commit c80a00125180d396442d7559f6df65bdd1b5b98d +Author: Albert Astals Cid +Date: Fri Jan 10 00:46:22 2020 +0100 + + PSStack::copy: Fix integer overflow leading to potential crash + + in broken files + + Fixes issue #870 + + goo/GooCheckedOps.h | 11 ++++++++++- + poppler/Function.cc | 5 +++-- + 2 files changed, 13 insertions(+), 3 deletions(-) + +commit ca9b9cb264b2d2372a171dd8779ac5527dad2b12 +Author: Albert Astals Cid +Date: Fri Jan 10 00:30:37 2020 +0100 + + Fix crash on broken files + + TIL INT_MIN / -1 causes FPE + + Fixes issue #869 + + poppler/Function.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 12a657c5f787605602bb2ad9d79ef719bbf7678f +Author: Albert Astals Cid +Date: Thu Jan 9 14:58:15 2020 +0100 + + Remove getAuthData function that did "nothing" + + poppler/SecurityHandler.cc | 19 ++----------------- + poppler/SecurityHandler.h | 6 ------ + 2 files changed, 2 insertions(+), 23 deletions(-) + +commit ff404bdfcb5763ae5e219e075ca08b41c220f8ec +Author: Albert Astals Cid +Date: Thu Jan 9 14:39:14 2020 +0100 + + SecurityHandler: add const + + poppler/Parser.cc | 6 +++--- + poppler/Parser.h | 6 +++--- + poppler/SecurityHandler.cc | 2 +- + poppler/SecurityHandler.h | 34 +++++++++++++++++----------------- + 4 files changed, 24 insertions(+), 24 deletions(-) + +commit 409a8a36df099a27f75aefad97a11b354415ea06 +Author: Albert Astals Cid +Date: Thu Jan 9 14:34:12 2020 +0100 + + Remove forward declaration for struct that doesn't exist + + poppler/GlobalParams.h | 1 - + poppler/SecurityHandler.h | 1 - + 2 files changed, 2 deletions(-) + +commit 0aba2e2b13f27cfa88074258900d571c42751c0a +Author: Albert Astals Cid +Date: Tue Jan 7 23:58:37 2020 +0100 + + builtinFontSubst can be const + + poppler/BuiltinFontTables.cc | 16 +++++++++++++++- + poppler/BuiltinFontTables.h | 16 +++++++++++++++- + poppler/GfxFont.cc | 4 ++-- + 3 files changed, 32 insertions(+), 4 deletions(-) + +commit fad2b7341c6a0cb8f2e0ff2e856739cb389d21ef +Author: Albert Astals Cid +Date: Tue Jan 7 17:52:27 2020 +0100 + + More static -> static const + + fofi/FoFiTrueType.cc | 4 ++-- + fofi/FoFiType1C.cc | 6 +++--- + splash/Splash.cc | 6 +++--- + 3 files changed, 8 insertions(+), 8 deletions(-) + +commit 1bbf480deb1be03fb8c95604a250d4b4f64546d7 +Author: Albert Astals Cid +Date: Tue Jan 7 17:48:54 2020 +0100 + + Remove unused CompactFontTables.h file + + CMakeLists.txt | 1 - + poppler/CompactFontTables.h | 478 + -------------------------------------------- + 2 files changed, 479 deletions(-) + +commit d2617256819eac077a9537a1c8dbbb44661d6f62 +Author: Albert Astals Cid +Date: Tue Jan 7 17:44:32 2020 +0100 + + Mark some static arrays as const + + poppler/CharCodeToUnicode.cc | 4 ++-- + poppler/Decrypt.cc | 4 ++-- + poppler/NameToUnicodeTable.h | 6 +++--- + poppler/PSOutputDev.cc | 2 +- + poppler/TextOutputDev.cc | 2 +- + 5 files changed, 9 insertions(+), 9 deletions(-) + +commit 63ca4951f85b1f9d4a66d24d761e9984327bb20f +Author: Albert Astals Cid +Date: Wed Oct 30 23:36:35 2019 +0100 + + Introduce Object::getBoolWithDefaultValue + + makes code slightly more readable + + poppler/Annot.cc | 43 + +++++++---------------------------------- + poppler/Form.cc | 5 ++--- + poppler/Gfx.cc | 15 ++++----------- + poppler/GfxState.cc | 7 +++---- + poppler/Link.cc | 9 ++------- + poppler/Object.h | 6 +++++- + poppler/PageTransition.cc | 8 ++------ + poppler/ViewerPreferences.cc | 46 + +++++++++----------------------------------- + 8 files changed, 34 insertions(+), 105 deletions(-) + +commit dd0ea681efc1e0a476803be1260f7a7691c26534 +Author: David García Garzón +Date: Sun Jan 5 23:35:51 2020 +0000 + + qt5: Fix FormField::name encoding + + Also add a test for it + + qt5/src/poppler-form.cc | 2 +- + qt5/tests/check_forms.cpp | 18 ++++++++++++++++++ + 2 files changed, 19 insertions(+), 1 deletion(-) + +commit c4f8555b6a8085a6a5b3c18a8a21e8aab51fe6d9 +Author: Albert Astals Cid +Date: Sun Jan 5 01:20:37 2020 +0100 + + Make getUnicodeMap param a const & instead a const * + + Now you can write globalParams->getUnicodeMap("UTF-8") + which makes much more sense + + poppler/GlobalParams.cc | 15 +++++++-------- + poppler/GlobalParams.h | 6 +++--- + poppler/PSOutputDev.cc | 4 ++-- + poppler/UTF.cc | 3 +-- + poppler/UnicodeMap.cc | 22 +++++++++++----------- + poppler/UnicodeMap.h | 8 +++----- + 6 files changed, 27 insertions(+), 31 deletions(-) + +commit 7489b99bc0e8ee22538e5c4697f43181e74044c1 +Author: Albert Astals Cid +Date: Sun Jan 5 22:49:15 2020 +0100 + + Make HtmlFontAccu::Get const + + utils/HtmlFonts.h | 2 +- + utils/HtmlOutputDev.cc | 5 ++--- + utils/HtmlOutputDev.h | 4 ++-- + 3 files changed, 5 insertions(+), 6 deletions(-) + +commit 6b1ee539705f1ddf8e252f1589866862ad688bc2 +Author: Albert Astals Cid +Date: Sun Jan 5 22:43:52 2020 +0100 + + No need for HtmlFontAccu::accu to be a pointer at all + + utils/HtmlFonts.cc | 12 +++++------- + utils/HtmlFonts.h | 6 +++--- + 2 files changed, 8 insertions(+), 10 deletions(-) + +commit cb5bece4f51040cf1d3be5a32af83c989d9c7885 +Author: Albert Astals Cid +Date: Sun Jan 5 22:41:32 2020 +0100 + + pdftohtml: Don't substract -2 to font size without any reason + + utils/HtmlFonts.cc | 2 +- + utils/HtmlOutputDev.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit fb9ada7648cb3adb0b8791bab098de1e89c75226 +Author: Albert Astals Cid +Date: Sun Jan 5 22:40:12 2020 +0100 + + pdftohtml: Make HtmlFont::size an int + + It comes from a double so it could potentially be negative + + utils/HtmlFonts.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit a0e6c8ffca03d324846db8b099774aafaf64627f +Author: Albert Astals Cid +Date: Sun Jan 5 23:05:54 2020 +0100 + + Fix crash in unicodeToAscii7 + + Don't make Ascii7Map be static, otherwise it will cache the unicode + map + between globlParams and end up with a bad pointer + + If we find the constant searching of the unicode in globalparams is a + speed problem we need to apply a similar solution to the one we + did for + UTF8 + + poppler/UTF.cc | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +commit bc8250504b14655eb25d11336899bdcc032df18d +Author: Albert Astals Cid +Date: Sun Jan 5 22:32:55 2020 +0100 + + Update (C) + + qt5/src/poppler-form.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a9ef3cb7dd991ab935ad08f75ae4fc85bb594c78 +Author: David García Garzón +Date: Sun Jan 5 19:53:04 2020 +0100 + + Accepting UTF-16 uiNames for form fields + + qt5/src/poppler-form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9de38e9f0125dd5636e03847abc13e8a1c89d232 +Author: Albert Astals Cid +Date: Sun Jan 5 20:21:28 2020 +0100 + + Update last commit (C) + + poppler/MarkedContentOutputDev.cc | 2 +- + poppler/MarkedContentOutputDev.h | 2 +- + poppler/PSOutputDev.cc | 2 +- + poppler/TextOutputDev.cc | 2 +- + poppler/UnicodeMap.cc | 2 +- + poppler/UnicodeMap.h | 2 +- + utils/HtmlFonts.cc | 2 +- + utils/JSInfo.cc | 2 +- + utils/JSInfo.h | 2 +- + utils/pdfdetach.cc | 2 +- + utils/pdfinfo.cc | 2 +- + utils/pdftotext.cc | 2 +- + 12 files changed, 12 insertions(+), 12 deletions(-) + +commit eb5e7d9a62be5f76718115a058e2e3c4b32eb5ff +Author: Albert Astals Cid +Date: Sun Jan 5 01:20:37 2020 +0100 + + Remove UnicodeMap reference counting + + And make the cache just be "infinite", it's not like we support + that many maps or that there's so many used in a given session, + and if they are, well it's good we cached them + + All the unicode maps we support use about 2MB of memory, but + PSOutputDev + is the only one that loads "random" unicodeMaps so to load them all + you'd had to print lots of different documents with fonts with lots of + different font encodings, so it seems like a not very likely situation + and the code gets simplified a bit + + poppler/GlobalParams.cc | 8 ++--- + poppler/GlobalParams.h | 6 ++-- + poppler/MarkedContentOutputDev.cc | 2 -- + poppler/MarkedContentOutputDev.h | 2 +- + poppler/PSOutputDev.cc | 8 ++--- + poppler/TextOutputDev.cc | 21 ++++---------- + poppler/UTF.cc | 2 +- + poppler/UnicodeMap.cc | 61 + ++++++--------------------------------- + poppler/UnicodeMap.h | 16 ++++------ + utils/HtmlFonts.cc | 3 +- + utils/JSInfo.cc | 2 +- + utils/JSInfo.h | 4 +-- + utils/pdfdetach.cc | 3 +- + utils/pdfinfo.cc | 11 ++++--- + utils/pdftotext.cc | 7 ++--- + 15 files changed, 42 insertions(+), 114 deletions(-) + +commit f5c981d70acfcc5742dda677b619431c483045b2 +Author: Albert Astals Cid +Date: Sun Jan 5 01:04:58 2020 +0100 + + Use getUtf8Map otherwise the map pointer may go wrong + + glib/poppler-document.cc | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +commit 7f53fa0e0b7bfe2be2763da08fa09127c5ecfe4d +Author: Albert Astals Cid +Date: Sun Jan 5 00:46:04 2020 +0100 + + cpp: Make document_private() private just in case + + cpp/poppler-document-private.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 33fa0ebac9e4d247af19ffc5343769684608990d +Author: Albert Astals Cid +Date: Sun Jan 5 00:41:52 2020 +0100 + + Update (C) for previous commits + + cpp/poppler-document-private.h | 2 +- + cpp/poppler-document.cpp | 2 +- + cpp/poppler-global.cpp | 2 +- + cpp/poppler-private.cpp | 1 + + cpp/poppler-private.h | 2 +- + poppler/CairoOutputDev.cc | 3 ++- + poppler/CairoOutputDev.h | 1 + + poppler/Error.cc | 1 + + poppler/Error.h | 1 + + poppler/GlobalParams.cc | 2 +- + poppler/GlobalParams.h | 2 +- + qt5/src/poppler-document.cc | 2 +- + qt5/src/poppler-private.cc | 2 +- + qt5/src/poppler-private.h | 2 +- + test/perf-test.cc | 1 + + 15 files changed, 16 insertions(+), 10 deletions(-) + +commit 9e15cbae552be5a7b787a07e661ab849427537aa +Author: Michal +Date: Sat Jan 4 21:49:29 2020 +0000 + + make FT_Library initialisation thread-safe + + poppler/CairoOutputDev.cc | 7 ++----- + poppler/CairoOutputDev.h | 2 +- + 2 files changed, 3 insertions(+), 6 deletions(-) + +commit 9349ed71f9fabc8961cc1dd9ca57aca8be7939db +Author: Adam Reichold +Date: Sat Jan 4 09:40:03 2020 +0100 + + Make use of the memoizing UTF-8 UnicodemMap getter in + CairoOutputDev::drawChar. + + poppler/CairoOutputDev.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 5c7ec727e059738828ae61bafb5fe5f8b482b267 +Author: Adam Reichold +Date: Fri Jan 3 22:12:20 2020 +0100 + + Remove the error callback data pointer as none of the frontends make + use of it. + + cpp/poppler-document.cpp | 2 +- + cpp/poppler-private.cpp | 2 +- + cpp/poppler-private.h | 2 +- + glib/poppler-document.cc | 8 ++++---- + glib/poppler-private.h | 2 +- + glib/poppler.cc | 3 +-- + poppler/Error.cc | 6 ++---- + poppler/Error.h | 4 ++-- + poppler/GlobalParams.cc | 4 ++-- + poppler/GlobalParams.h | 2 +- + qt5/src/poppler-private.cc | 2 +- + qt5/src/poppler-private.h | 6 +++--- + test/perf-test.cc | 4 ++-- + 13 files changed, 22 insertions(+), 25 deletions(-) + +commit 6de0bba0b7d064195b27619667dbbcb7cd810647 +Author: Adam Reichold +Date: Fri Jan 3 22:05:53 2020 +0100 + + Make use of the GlobalParamsIniter to make the glib frontend + initialization thread safe. + + glib/poppler-document.cc | 31 +++++++++++++------------------ + glib/poppler-private.h | 3 +++ + glib/poppler.cc | 22 +++++++--------------- + 3 files changed, 23 insertions(+), 33 deletions(-) + +commit a8220105f964ee4102e4ee886df2d0b162b42ae6 +Author: Adam Reichold +Date: Fri Jan 3 21:51:25 2020 +0100 + + Reuse the GlobalParamsIniter in the qt5 frontend. + + poppler/GlobalParams.cc | 12 ++++++++++++ + poppler/GlobalParams.h | 4 ++++ + qt5/src/poppler-document.cc | 3 --- + qt5/src/poppler-private.cc | 30 ++---------------------------- + qt5/src/poppler-private.h | 12 ++++++------ + 5 files changed, 24 insertions(+), 37 deletions(-) + +commit 7daaa2925858ef1740ec38b25be7bf74c0aefa33 +Author: Adam Reichold +Date: Fri Jan 3 21:29:23 2020 +0100 + + Move the initer of the cpp frontend into the core to able to reuse + it for the qt5 and glib frontends. + + cpp/poppler-document-private.h | 21 ++----------- + cpp/poppler-document.cpp | 69 + +++++++++--------------------------------- + cpp/poppler-global.cpp | 2 +- + poppler/GlobalParams.cc | 40 ++++++++++++++++++++++++ + poppler/GlobalParams.h | 19 ++++++++++++ + 5 files changed, 77 insertions(+), 74 deletions(-) + +commit f2197842c8e7a8c4f7ee15eba1bd42379803e229 +Author: Adam Reichold +Date: Fri Jan 3 21:22:44 2020 +0100 + + Improve readability of Error module by using a type alias for the + error callback function pointer. + + poppler/Error.cc | 7 ++----- + poppler/Error.h | 6 +++--- + 2 files changed, 5 insertions(+), 8 deletions(-) + +commit 04debcf2a044d358aa8cd3694739db7d5471da0e +Author: Albert Astals Cid +Date: Sat Jan 4 11:37:01 2020 +0100 + + Update (C) of previous commits + + poppler/Link.cc | 2 +- + poppler/Link.h | 1 + + qt5/src/poppler-link-private.h | 1 + + qt5/src/poppler-link.h | 1 + + qt5/src/poppler-optcontent.cc | 2 +- + 5 files changed, 5 insertions(+), 2 deletions(-) + +commit 21a7a98ad926b2e0aa3646d0c07ff13df8777f8b +Author: Adam Reichold +Date: Sat Jan 4 09:31:03 2020 +0100 + + Remove LinkAction::setNextActions as this setter should not be used + outside of the ::parseAction method. + + poppler/Link.cc | 6 +----- + poppler/Link.h | 3 --- + 2 files changed, 1 insertion(+), 8 deletions(-) + +commit 0053b82841d37077b9b22ea393bb807fbe53eb64 +Author: Oliver Sander +Date: Fri Jan 3 17:54:17 2020 +0100 + + Deep-copy the LinkOCGAction object + + The convertLinkActionToLink method deep-copies every poppler + LinkAction + object into a Link object as used by the Qt5 frontend. With one + exception: LinkOCGState objects are not deep-copied, but pointers to + them are stored instead. This makes for a memory management that is + inconsistent, difficult to understand, and prone to memory errors. + The present patch introduces deep-copying for LinkOCGState objects + as well. + + qt5/src/poppler-link-private.h | 14 +++++++++++--- + qt5/src/poppler-link.h | 4 ++-- + qt5/src/poppler-optcontent.cc | 10 +++++----- + qt5/src/poppler-page.cc | 2 +- + 4 files changed, 19 insertions(+), 11 deletions(-) + +commit 80710e99b3d3cb9fe6a05f73f33ed122474c82ae +Author: Oliver Sander +Date: Fri Jan 3 17:15:22 2020 +0100 + + Make LinkAction::nextActions return a const reference + + ... rather than a pointer. This makes it clearer that the + result is borrowed, and should not be shallow-copied. + + poppler/Link.cc | 4 ++-- + poppler/Link.h | 2 +- + qt5/src/poppler-page.cc | 14 +++++--------- + 3 files changed, 8 insertions(+), 12 deletions(-) + +commit 1239f2dc9c621e6a1962a7ebe0cced9c333c202c +Author: Oliver Sander +Date: Fri Jan 3 17:10:02 2020 +0100 + + Make LinkAction::nextActionList a std::vector + + Rather than a pointer to a std::vector. This removes one + layer of indirection when accessing the vector. + + poppler/Link.cc | 34 +++++++++++++--------------------- + poppler/Link.h | 8 ++++---- + 2 files changed, 17 insertions(+), 25 deletions(-) + +commit d81d5ccfd29e12cadbd70642f65ca1516b4e5d04 +Author: Albert Astals Cid +Date: Fri Jan 3 16:55:36 2020 +0100 + + Make Sound::fileName a std::string + + Makes the code a bit simpler + + poppler/Sound.cc | 10 +++------- + poppler/Sound.h | 6 +++--- + qt5/src/poppler-sound.cc | 5 ++--- + 3 files changed, 8 insertions(+), 13 deletions(-) + +commit 4f16f53e2b2fc0b83bad9ffcb0c869200f06a406 +Author: Albert Astals Cid +Date: Fri Jan 3 14:11:01 2020 +0100 + + Make UnicodeMap::encodingName be a std::string + + poppler/GlobalParams.cc | 14 +++++++------- + poppler/GlobalParams.h | 2 +- + poppler/UnicodeMap.cc | 18 ++++++++---------- + poppler/UnicodeMap.h | 11 ++++++----- + 4 files changed, 22 insertions(+), 23 deletions(-) + +commit 00aea3562ec628266fe957bfdb8f1188e1beeb4b +Author: Albert Astals Cid +Date: Fri Jan 3 14:15:49 2020 +0100 + + Remove GlobalParams::getUnicodeMap2 + + GlobalParams::getUnicodeMap was just calling + GlobalParams::getUnicodeMap2 so move the code of this one to the other + one and save ourselves having one function that just calls the other + + poppler/GlobalParams.cc | 8 ++------ + poppler/GlobalParams.h | 3 +-- + 2 files changed, 3 insertions(+), 8 deletions(-) + +commit 6fdf76631cb98012a051f4659583d67c0d5e0fad +Author: Albert Astals Cid +Date: Fri Jan 3 13:51:56 2020 +0100 + + Mark 'in' in unicodeToAscii7 as const + + poppler/UTF.cc | 4 ++-- + poppler/UTF.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 98f5383030929c9b2895ffff9a561023b7de867f +Author: Albert Astals Cid +Date: Fri Jan 3 13:51:39 2020 +0100 + + Welcome 2020 + + poppler/poppler-config.h.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3f306b50f78e6e6d9ba9733fabff8e6c5567038a +Author: Albert Astals Cid +Date: Sat Dec 28 13:18:51 2019 +0100 + + Poppler 0.84.0 + + CMakeLists.txt | 4 ++-- + NEWS | 25 +++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 29 insertions(+), 4 deletions(-) + +commit 4c98b692962e49846d91e5c6673392f6ba2b8d61 +Author: Albert Astals Cid +Date: Sat Dec 28 12:44:54 2019 +0100 + + Update (C) + + utils/pdftoppm.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 72f5509211438a7e5e1f1e2290fb6cbda2b923c9 +Author: Hartmut Goebel +Date: Tue Dec 24 13:46:25 2019 +0000 + + pdfimages: Add error message if first page is larger then number + of pages. + + utils/pdfimages.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 7de14f43562f4064d7b4cf1264e6cc8a89e6f4f2 +Author: Sébastien Berthier +Date: Tue Dec 24 10:09:02 2019 +0100 + + pdftoppm: add -hide-annotations option + + utils/pdftoppm.1 | 3 +++ + utils/pdftoppm.cc | 10 +++++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit fabc00e32b8dd90d6cfe3b03613cb335b6760fd4 +Author: Albert Astals Cid +Date: Thu Dec 19 00:29:54 2019 +0100 + + Kill OCDisplayNode + + poppler/OptionalContent.cc | 120 + --------------------------------------------- + poppler/OptionalContent.h | 35 ------------- + 2 files changed, 155 deletions(-) + +commit 165bfbe220cd395a829deede92f3a0d4648d5ba6 +Author: Oliver Sander +Date: Mon Nov 25 10:14:24 2019 +0100 + + Use std::unique_ptr for m_formData + + To make it clear that it is an owning pointer. + + qt5/src/poppler-form.cc | 18 +++++++----------- + qt5/src/poppler-form.h | 5 +++-- + 2 files changed, 10 insertions(+), 13 deletions(-) + +commit d8a128ee91fb03c2513614bf262042b71441a789 +Author: Albert Astals Cid +Date: Mon Dec 23 09:45:34 2019 +0100 + + qVariantFromValue -> QVariant::fromValue + + qt5/demos/viewer.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit b278cab777aeb181c15cc5623f3fdf38347a5a57 +Author: Albert Astals Cid +Date: Mon Dec 23 09:43:29 2019 +0100 + + qt5: QTime + elapsed -> QElapsedTimer + + qt5/tests/stress-poppler-dir.cpp | 4 ++-- + qt5/tests/stress-poppler-qt5.cpp | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit a0289d279d5de130065bc7f35eb264d9ba42b682 +Author: Albert Astals Cid +Date: Sat Dec 21 09:56:38 2019 +0100 + + Splash::scaleImageYdXu: Protect against crash if srcWidth is too big + + oss-fuzz/19630 + + splash/Splash.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit ac4bbb3cefbe020bbe9af8ac361974c5c2dee3d3 +Author: Albert Astals Cid +Date: Fri Dec 20 00:25:34 2019 +0100 + + Splash: remove modified region book-keeping + + Noone uses it so it's a bit faster not to do it + + poppler/SplashOutputDev.cc | 9 ------ + poppler/SplashOutputDev.h | 6 ---- + splash/Splash.cc | 81 + ---------------------------------------------- + splash/Splash.h | 11 ------- + 4 files changed, 107 deletions(-) + +commit 42d5e54134ca82c96cb29e672e71e924d75526cf +Author: Oliver Sander +Date: Tue Dec 17 21:06:31 2019 +0100 + + Make StateList assignable + + Because it is already copy-constructible, and having one without + the other is weird. + + poppler/Link.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 62ae50571b1b0dca5369be76a962380b4c6e276a +Author: Oliver Sander +Date: Sat Dec 14 22:19:53 2019 +0100 + + LinkOCGState: Make stateList a std::vector of objects + + glib/poppler-action.cc | 8 ++++---- + poppler/Link.cc | 29 +++++++++-------------------- + poppler/Link.h | 8 ++++---- + qt5/src/poppler-optcontent.cc | 10 +++++----- + 4 files changed, 22 insertions(+), 33 deletions(-) + +commit bd8d88f0db6954aa5d4181c0a5b4d0e19a635359 +Author: Oliver Sander +Date: Sat Dec 14 21:48:07 2019 +0100 + + LinkOCGState: Replace std::vector* by std::vector + + glib/poppler-action.cc | 2 +- + poppler/Link.cc | 9 +-------- + poppler/Link.h | 6 +++--- + qt5/src/poppler-optcontent.cc | 4 ++-- + 4 files changed, 7 insertions(+), 14 deletions(-) + +commit 27958cb0c7ec165ab65433dd602387eb37eb7650 +Author: Oliver Sander +Date: Sat Dec 14 21:41:39 2019 +0100 + + StateList: Replace std::vector by std::vector + + A Ref is really just two ints. Let's not call malloc separately + for each of them. + + glib/poppler-action.cc | 6 +++--- + poppler/Link.cc | 10 ++-------- + poppler/Link.h | 2 +- + qt5/src/poppler-optcontent.cc | 6 +++--- + 4 files changed, 9 insertions(+), 15 deletions(-) + +commit a5a713621649d916508e8695169df9221b2b3f9d +Author: Oliver Sander +Date: Sat Dec 14 21:26:38 2019 +0100 + + LinkOCGState: Replace std::vector* by std::vector + + The LinkOCGState has a 'stateList' member, which previously was a + pointer to a std::vector. As a std::vector is little more than a + pointer itself, one may as well keep it directly within the + LinkOCGState object. This is what the patch does. + + glib/poppler-action.cc | 4 ++-- + poppler/Link.cc | 20 +++++++++----------- + poppler/Link.h | 7 ++++--- + qt5/src/poppler-optcontent.cc | 4 ++-- + 4 files changed, 17 insertions(+), 18 deletions(-) + +commit 39baa7d42966ebd67c2ac91ef1c1450965c37e87 +Author: Albert Astals Cid +Date: Sun Dec 8 23:38:13 2019 +0100 + + Update (C) + + poppler/Array.cc | 2 +- + poppler/Array.h | 2 +- + poppler/Page.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 8ee4f32cce32c3253c6be66d85d1191c1784bebd +Author: Adam Reichold +Date: Fri Dec 6 18:58:49 2019 +0100 + + Align signature of Array::copy with Dict::copy as a preparation for + implicit sharing + + poppler/Array.cc | 4 ++-- + poppler/Array.h | 2 +- + poppler/Page.cc | 10 ++++------ + 3 files changed, 7 insertions(+), 9 deletions(-) + +commit 3955fe7fae320f3122f663efa1d66a5296db7e6d +Author: Nelson Benítez León +Date: Fri Dec 6 18:42:49 2019 +0100 + + autotest for unicodeToAscii7 crasher + + Includes some small code tweaks by Albert Astals Cid + + qt5/tests/check_utf_conversion.cpp | 55 + ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 55 insertions(+) + +commit f7414ccb517fcadf8b0d8732d40c4abfb74cccba +Author: Albert Astals Cid +Date: Fri Dec 6 18:41:29 2019 +0100 + + Add the proper include so that Unicode is defined + + poppler/UnicodeTypeTable.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit f01d29372721fbbe7a0c761744a5b2bf83af761e +Author: Marek Kasik +Date: Fri Jul 19 14:04:30 2019 +0200 + + Allocate big enough buffer for text conversion + + Buffer for conversion from Unicode to ASCII7 can + be small in some cases leading to invalid writes + which can result in crash. + This commit increases size of the buffer. + + poppler/UTF.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac485b0309f5e51d74fdb7484b9f6a7f79448f52 +Author: Albert Astals Cid +Date: Thu Nov 28 16:31:32 2019 +0100 + + Move textEOL and textPageBreaks out of GlobalParams to TextOutputDev + + poppler/GlobalParams.cc | 35 ----------------------------------- + poppler/GlobalParams.h | 13 ------------- + poppler/TextOutputDev.cc | 18 ++++++++++-------- + poppler/TextOutputDev.h | 22 ++++++++++++++++++++-- + utils/pdftotext.cc | 26 +++++++++++++++++++------- + 5 files changed, 49 insertions(+), 65 deletions(-) + +commit af86c7460a1e3bfc63d2868306ed712fa432dcb1 +Author: Albert Astals Cid +Date: Fri Dec 6 00:43:45 2019 +0100 + + Update (C) + + utils/pdftocairo.cc | 1 + + utils/pdftoppm.cc | 2 ++ + 2 files changed, 3 insertions(+) + +commit d8da6fd3b4c92651092d0a73f54b244bb45e1711 +Author: Kris Jurka +Date: Wed Dec 4 22:51:16 2019 -0800 + + pdftoxxx: error out when even/odd selects 0 pages + + When page selection options and/or document length result in planned + output of a single page, further even/odd page selection can then + result in no pages being output. Error out instead of producing no + output which is confusing to the user. + + Closes: https://gitlab.freedesktop.org/poppler/poppler/issues/815 + + utils/pdftocairo.cc | 13 ++++++++++--- + utils/pdftoppm.cc | 11 +++++++++++ + 2 files changed, 21 insertions(+), 3 deletions(-) + +commit 311db0b2de9a63d240d19bb90ba95a78f7856388 +Author: corentinfoucault +Date: Thu Dec 5 12:03:56 2019 +0000 + + [PdfToPpm] Add an option to scale before rotate + + -scale-dimension-before-rotation + + utils/pdftoppm.1 | 3 +++ + utils/pdftoppm.cc | 22 ++++++++++++++++------ + 2 files changed, 19 insertions(+), 6 deletions(-) + +commit 5aa8552b283ed41c06fc38928bedbd5ec55ae7be +Author: Albert Astals Cid +Date: Wed Dec 4 23:28:19 2019 +0100 + + Update (C) of previous commit + + utils/pdfsig.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 6f81aa23e8745df604a60e334fe13ccec96d7c3c +Author: Nelson Efrain A. Cruz +Date: Wed Dec 4 09:18:48 2019 -0300 + + Changes value of exit code on dumping signatures error + + utils/pdfsig.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit ed8159b0ba705062b6bd8e5c624648642e696662 +Author: Nelson Efrain A. Cruz +Date: Tue Dec 3 13:24:48 2019 -0300 + + Fixes pdfsig exit code when dumping signatures + + utils/pdfsig.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 78840bb796384942a21f1d99de80cdaaafcd7f58 +Author: Thomas Fischer +Date: Thu Nov 21 21:19:44 2019 +0100 + + pdfinfo: improved paper size recognition + + Paper sizes of ISO 216, A Series were originally defined in + millimeters. + For example, A3 is defined to be 297mm x 420mm. However, depending on + source, the corresponding size in pts may vary between 1190pt + and 1191pt + for the longer edge. + + pdfinfo's formula to compute the length of the longer edge of an A3 + paper determines this length to be 1191.82pt. As the error margin + so far + was set to 1pt, A3 papers with edge length of 1190.8pt were not + recognized as A3. + + This patch makes the error margin depending on the paper size, setting + it at 0.3% of the longer edge's length. For A3 paper, the error + marging + (variable 'isoThreshold') thus becomes 3.58pt. + + Accordingly, the threshold for 'letter' paper has been raised + from 0.1pt + to 1pt. + + utils/pdfinfo.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 36bc1703a7252f3c6f0a6059cd99419152b60a6f +Author: Albert Astals Cid +Date: Tue Dec 3 23:38:36 2019 +0100 + + Fix calling a function on a null pointer + + It wasn't crashing but it's defenitely undefined behaviour. + + Now instead of calling copy that calls the constructor we call the + constructor directly, which deals fine with a null "other" to + be created + from + + Also some const + + poppler/JBIG2Stream.cc | 23 ++++++++++------------- + 1 file changed, 10 insertions(+), 13 deletions(-) + +commit 4163bccb07191da0e6e6fe2aaa78e01007261fe2 +Author: Albert Astals Cid +Date: Tue Dec 3 16:02:22 2019 +0100 + + Add some more const + + glib/poppler-action.cc | 4 +-- + poppler/GfxState.cc | 62 + ++++++++++++++++++++++---------------------- + poppler/GfxState.h | 64 + +++++++++++++++++++++++----------------------- + poppler/GlobalParams.cc | 44 ++++++++++++++++--------------- + poppler/GlobalParamsWin.cc | 2 +- + splash/SplashBitmap.cc | 2 +- + utils/pdffonts.cc | 4 +-- + 7 files changed, 92 insertions(+), 90 deletions(-) + +commit f9b6c772bf53e195871c687f7314c7001db6647b +Author: Albert Astals Cid +Date: Tue Dec 3 15:31:14 2019 +0100 + + Make HtmlMetaVar::toString const + + utils/HtmlOutputDev.cc | 4 ++-- + utils/HtmlOutputDev.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 5e3e46ecd7df3ee75cac7ee8216ee2d6d87d2665 +Author: Albert Astals Cid +Date: Fri Nov 29 17:50:28 2019 +0100 + + Enable modernize-loop-convert + + .gitlab-ci.yml | 2 +- + cpp/tests/poppler-dump.cpp | 8 ++++---- + cpp/tests/poppler-render.cpp | 6 +++--- + glib/poppler-action.cc | 6 ++---- + glib/poppler-cached-file-loader.cc | 8 ++++---- + glib/poppler-page.cc | 9 +++------ + glib/poppler-structure-element.cc | 4 ++-- + poppler/Annot.cc | 12 ++++++------ + poppler/CachedFile.cc | 10 +++++----- + poppler/Catalog.cc | 4 ++-- + poppler/CurlCachedFile.cc | 8 ++++---- + poppler/GfxFont.cc | 4 ++-- + poppler/GfxState.cc | 9 +++------ + poppler/GlobalParams.cc | 20 +++++++++----------- + poppler/JBIG2Stream.cc | 8 ++------ + poppler/PSOutputDev.cc | 6 ++---- + poppler/SplashOutputDev.cc | 3 +-- + poppler/StructElement.cc | 8 ++++---- + poppler/StructTreeRoot.cc | 4 ++-- + poppler/TextOutputDev.cc | 16 +++++----------- + poppler/XRef.cc | 7 +++---- + qt5/src/poppler-optcontent.cc | 21 +++++++++------------ + qt5/src/poppler-page.cc | 4 ++-- + qt5/src/poppler-private.cc | 3 +-- + splash/Splash.cc | 16 ++++++++-------- + splash/SplashBitmap.cc | 4 ++-- + splash/SplashState.cc | 11 +++++++---- + utils/HtmlOutputDev.cc | 13 +++++-------- + utils/pdftoppm.cc | 5 ++--- + utils/printencodings.cc | 5 ++--- + 30 files changed, 107 insertions(+), 137 deletions(-) + +commit f6071f61e433c333e2b34458314a263921ad5fa7 +Author: Albert Astals Cid +Date: Mon Dec 2 22:25:42 2019 +0100 + + enable modernize-redundant-void-arg + + No copyright, it's a mechanical change + + .gitlab-ci.yml | 2 +- + glib/poppler.cc | 2 +- + poppler/CairoFontEngine.cc | 2 +- + poppler/CairoFontEngine.h | 2 +- + poppler/TextOutputDev.cc | 4 ++-- + test/pdf-inspector.cc | 6 +++--- + test/perf-test-preview-dummy.cc | 8 ++++---- + test/perf-test.cc | 12 ++++++------ + 8 files changed, 19 insertions(+), 19 deletions(-) + +commit fc9f0f12e88a21e8f15e9b881351e8515c9b6179 +Author: Albert Astals Cid +Date: Mon Dec 2 22:17:52 2019 +0100 + + enable modernize-use-bool-literals + + No copyright, this is a mechanical change + + .gitlab-ci.yml | 2 +- + fofi/FoFiType1.cc | 2 +- + glib/poppler-page.cc | 2 +- + poppler/CairoOutputDev.cc | 2 +- + poppler/Catalog.cc | 2 +- + poppler/Function.cc | 10 +++++----- + poppler/GfxState.cc | 4 ++-- + poppler/JBIG2Stream.cc | 12 ++++++------ + poppler/Lexer.cc | 12 ++++++------ + poppler/PSTokenizer.cc | 2 +- + poppler/Rendition.cc | 2 +- + poppler/SplashOutputDev.cc | 6 +++--- + poppler/Stream.cc | 4 ++-- + poppler/TextOutputDev.cc | 6 +++--- + poppler/XRef.cc | 4 ++-- + test/perf-test.cc | 2 +- + utils/HtmlLinks.cc | 4 ++-- + utils/HtmlOutputDev.h | 2 +- + 18 files changed, 40 insertions(+), 40 deletions(-) + +commit 77aa3a007598c4c4836f45d355642d7240f7432b +Author: Albert Astals Cid +Date: Mon Dec 2 20:03:33 2019 +0100 + + Enable modernize-use-emplace + + Not claiming copyright since it's a mechanical change + + .gitlab-ci.yml | 2 +- + cpp/poppler-image.cpp | 10 +++++----- + cpp/poppler-page.cpp | 2 +- + poppler/ViewerPreferences.cc | 2 +- + 4 files changed, 8 insertions(+), 8 deletions(-) + +commit fb285d2c611c5111268d09460d6d58c5fff5bd34 +Author: Albert Astals Cid +Date: Mon Dec 2 19:44:23 2019 +0100 + + Enable modernize-use-equals-delete + + Not claiming copyright since the change is mechanical + + .gitlab-ci.yml | 2 +- + cpp/poppler-global.h | 6 +++--- + goo/JpegWriter.h | 6 +++--- + goo/PNGWriter.h | 6 +++--- + goo/TiffWriter.h | 6 +++--- + goo/gdir.h | 14 ++++++++------ + poppler/CertificateInfo.h | 6 +++--- + poppler/JPEG2000Stream.h | 6 ++++-- + poppler/SignatureInfo.h | 6 +++--- + 9 files changed, 31 insertions(+), 27 deletions(-) + +commit 53a4fbbbbbcb5d2a48a140b70af9d3177ebe02c2 +Author: Albert Astals Cid +Date: Mon Dec 2 19:36:51 2019 +0100 + + Enable modernize-use-override + + not claiming copyright for this since it's a mechanical change + + .gitlab-ci.yml | 2 +- + fofi/FoFiIdentifier.cc | 6 ++-- + fofi/FoFiTrueType.h | 2 +- + fofi/FoFiType1.h | 2 +- + fofi/FoFiType1C.h | 2 +- + glib/poppler-cached-file-loader.h | 2 +- + glib/poppler-input-stream.h | 2 +- + goo/JpegWriter.h | 2 +- + goo/NetPBMWriter.h | 2 +- + goo/PNGWriter.h | 2 +- + goo/TiffWriter.h | 2 +- + poppler/Annot.h | 38 +++++++++++------------ + poppler/CairoFontEngine.h | 4 +-- + poppler/CairoOutputDev.h | 4 +-- + poppler/CurlCachedFile.h | 2 +- + poppler/DCTStream.h | 2 +- + poppler/Decrypt.h | 6 ++-- + poppler/FlateEncoder.h | 2 +- + poppler/Form.h | 12 ++++---- + poppler/Function.h | 10 +++--- + poppler/GfxFont.h | 4 +-- + poppler/GfxState.h | 38 +++++++++++------------ + poppler/JBIG2Stream.cc | 8 ++--- + poppler/JBIG2Stream.h | 2 +- + poppler/JPEG2000Stream.h | 2 +- + poppler/Link.h | 24 +++++++-------- + poppler/MarkedContentOutputDev.h | 2 +- + poppler/PSOutputDev.cc | 2 +- + poppler/PSOutputDev.h | 2 +- + poppler/PreScanOutputDev.h | 2 +- + poppler/SecurityHandler.h | 2 +- + poppler/SplashOutputDev.cc | 2 +- + poppler/SplashOutputDev.h | 12 ++++---- + poppler/Stream.h | 46 + ++++++++++++++-------------- + poppler/TextOutputDev.cc | 6 ++-- + poppler/TextOutputDev.h | 2 +- + qt5/demos/abstractinfodock.h | 2 +- + qt5/demos/embeddedfiles.h | 2 +- + qt5/demos/fonts.h | 2 +- + qt5/demos/info.h | 2 +- + qt5/demos/metadata.h | 2 +- + qt5/demos/navigationtoolbar.h | 2 +- + qt5/demos/optcontent.h | 2 +- + qt5/demos/pageview.h | 2 +- + qt5/demos/permissions.h | 2 +- + qt5/demos/thumbnails.h | 2 +- + qt5/demos/toc.cpp | 2 +- + qt5/demos/toc.h | 2 +- + qt5/demos/viewer.h | 2 +- + qt5/src/ArthurOutputDev.h | 2 +- + qt5/src/poppler-annotation.cc | 12 ++++---- + qt5/src/poppler-annotation.h | 28 ++++++++--------- + qt5/src/poppler-form.h | 8 ++--- + qt5/src/poppler-link-extractor-private.h | 2 +- + qt5/src/poppler-link.cc | 4 +-- + qt5/src/poppler-link.h | 20 ++++++------ + qt5/src/poppler-optcontent.h | 2 +- + qt5/src/poppler-qiodeviceoutstream-private.h | 2 +- + qt5/src/poppler-qt5.h | 4 +-- + qt5/tests/test-password-qt5.cpp | 2 +- + qt5/tests/test-poppler-qt5.cpp | 2 +- + splash/SplashFTFont.h | 2 +- + splash/SplashFTFontFile.h | 2 +- + splash/SplashPattern.h | 2 +- + test/gtk-test.cc | 2 +- + utils/HtmlOutputDev.h | 2 +- + utils/ImageOutputDev.h | 2 +- + utils/pdftohtml.cc | 2 +- + 68 files changed, 195 insertions(+), 195 deletions(-) + +commit 3caf1a7a54372f74090caf284ddd3e8e94286d49 +Author: Albert Astals Cid +Date: Mon Dec 2 19:16:36 2019 +0100 + + Enable modernize-make-shared and modernize-make-unique + + .gitlab-ci.yml | 2 +- + cpp/poppler-image.cpp | 8 +++--- + poppler/Gfx.cc | 2 +- + poppler/OutputDev.cc | 2 +- + utils/pdfinfo.cc | 80 + +++++++++++++++++++++++++-------------------------- + 5 files changed, 47 insertions(+), 47 deletions(-) + +commit 2ad55c01e03a3fdb287dae73dbd37849498fa329 +Author: Albert Astals Cid +Date: Sun Dec 1 22:42:24 2019 +0100 + + Update (C) of last commit + + poppler/JBIG2Stream.cc | 1 + + poppler/JBIG2Stream.h | 1 + + 2 files changed, 2 insertions(+) + +commit f401ad7a29b95a39db0c2333b2c8f3573374140b +Author: Even Rouault +Date: Sun Dec 1 19:15:49 2019 +0000 + + JBIG2Stream: fix leak in reset() if called several times + + JBIG2Stream::reset() currently allocates new values for the + segments and globalSegments member variable. This causes a + memory leak if the method is called several times, which can + be triggered by the GDAL library that uses Poppler. + So add a freeSegments() method where we move the related cleanup + of close(), and call that method from reset() and close(). + + poppler/JBIG2Stream.cc | 16 +++++++++++----- + poppler/JBIG2Stream.h | 2 ++ + 2 files changed, 13 insertions(+), 5 deletions(-) + +commit 2a115270698e2f550536e7d69a1d022d5b67d89e +Author: Albert Astals Cid +Date: Sun Dec 1 13:15:23 2019 +0100 + + Move the clear for loops into a function + + And also call memset because it's clearer from "this is what i want" + point of view, compiler optimizers are smart enough to convert back + to a + loop if needed + + poppler/GfxState.cc | 33 +++++++++++---------------------- + poppler/GfxState.h | 4 ++++ + 2 files changed, 15 insertions(+), 22 deletions(-) + +commit 5be0c5cca3770b7096cfa7800fa8c419ced7e7e9 +Author: Albert Astals Cid +Date: Tue Nov 26 11:45:26 2019 +0100 + + Rework Hints::readTables a bit + + fail and return immediately if the length is 0 + also set ok to false in a few other "failed to read table" cases + + poppler/Hints.cc | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) + +commit 8d46550c4ff3d4a1923cfc4c42e3fd4d154a7624 +Author: William Bader +Date: Fri Nov 29 01:55:29 2019 -0500 + + Improve pdftops -optimizecolorspace by implementing the CMYK to K + conversion in more places. + This fixes the conversion of the PDF in poppler/poppler#833 + + poppler/PSOutputDev.cc | 181 + ++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 132 insertions(+), 49 deletions(-) + +commit 6e60cd8ef9696c12e4f33eb671013315b2b07790 +Author: Albert Astals Cid +Date: Sat Nov 30 02:04:22 2019 +0100 + + Links: Remove two unused functions + + Note: If you're one of the people using the internal API against our + wishes, you can still roll out these functions yourself + + poppler/Link.cc | 17 ----------------- + poppler/Link.h | 7 ------- + 2 files changed, 24 deletions(-) + +commit 82dc60155a015e5798db6f78a5f165dc7dd376c9 +Author: Albert Astals Cid +Date: Fri Nov 29 14:54:27 2019 +0100 + + Turn Links::links into a std::vector instead of ** + + poppler/Link.cc | 33 +++++++-------------------------- + poppler/Link.h | 5 ++--- + 2 files changed, 9 insertions(+), 29 deletions(-) + +commit 1c1d9a70013125f67518f398a2b5abf37ec43cdd +Author: Albert Astals Cid +Date: Fri Nov 29 17:20:10 2019 +0100 + + Enable modernize-deprecated-headers + + .gitlab-ci.yml | 2 +- + CMakeLists.txt | 2 +- + cpp/poppler-private.h | 2 +- + fofi/FoFiBase.cc | 4 ++-- + fofi/FoFiEncodings.cc | 2 +- + fofi/FoFiIdentifier.cc | 6 +++--- + fofi/FoFiTrueType.cc | 6 +++--- + fofi/FoFiTrueType.h | 2 +- + fofi/FoFiType1.cc | 6 +++--- + fofi/FoFiType1C.cc | 8 ++++---- + glib/demo/CMakeLists.txt | 1 + + glib/poppler-attachment.cc | 2 +- + glib/poppler-document.cc | 2 +- + glib/poppler-media.cc | 2 +- + glib/poppler-page.cc | 2 +- + glib/poppler-structure-element.cc | 2 +- + goo/GooTimer.cc | 2 +- + goo/ImgWriter.h | 2 +- + goo/PNGWriter.cc | 4 ++-- + goo/TiffWriter.cc | 2 +- + goo/gbasename.cc | 4 ++-- + goo/gfile.cc | 6 +++--- + goo/gfile.h | 8 ++++---- + goo/glibc.h | 2 +- + goo/glibc_strtok_r.cc | 2 +- + goo/gstrtod.cc | 8 ++++---- + poppler/Annot.cc | 8 ++++---- + poppler/BuiltinFont.cc | 4 ++-- + poppler/BuiltinFontTables.cc | 2 +- + poppler/CMap.cc | 8 ++++---- + poppler/CairoFontEngine.cc | 2 +- + poppler/CairoOutputDev.cc | 6 +++--- + poppler/CairoRescaleBox.cc | 10 +++++----- + poppler/Catalog.cc | 4 ++-- + poppler/CertificateInfo.cc | 4 ++-- + poppler/CertificateInfo.h | 2 +- + poppler/CharCodeToUnicode.cc | 4 ++-- + poppler/DCTStream.h | 12 ++++++------ + poppler/DateInfo.cc | 4 ++-- + poppler/DateInfo.h | 2 +- + poppler/Decrypt.cc | 2 +- + poppler/Error.cc | 6 +++--- + poppler/Error.h | 2 +- + poppler/FlateEncoder.h | 10 +++++----- + poppler/FlateStream.h | 10 +++++----- + poppler/FontEncodingTables.cc | 2 +- + poppler/FontInfo.cc | 10 +++++----- + poppler/Form.cc | 8 ++++---- + poppler/Form.h | 2 +- + poppler/Function.cc | 8 ++++---- + poppler/Gfx.cc | 10 +++++----- + poppler/GfxFont.cc | 12 ++++++------ + poppler/GfxState.cc | 6 +++--- + poppler/GfxState.h | 2 +- + poppler/GlobalParams.cc | 6 +++--- + poppler/GlobalParams.h | 4 ++-- + poppler/GlobalParamsWin.cc | 8 ++++---- + poppler/Hints.cc | 2 +- + poppler/Hints.h | 2 +- + poppler/JBIG2Stream.cc | 4 ++-- + poppler/JPXStream.cc | 2 +- + poppler/Lexer.cc | 10 +++++----- + poppler/Link.cc | 4 ++-- + poppler/Movie.cc | 2 +- + poppler/NameToCharCode.cc | 2 +- + poppler/NameToUnicodeTable.h | 2 +- + poppler/Object.cc | 2 +- + poppler/Object.h | 6 +++--- + poppler/OutputDev.cc | 2 +- + poppler/PDFDoc.cc | 18 +++++++++--------- + poppler/PDFDoc.h | 2 +- + poppler/PSOutputDev.cc | 12 ++++++------ + poppler/PSOutputDev.h | 2 +- + poppler/PSTokenizer.cc | 4 ++-- + poppler/Page.cc | 4 ++-- + poppler/PageLabelInfo.cc | 8 ++++---- + poppler/PageLabelInfo.h | 10 +++++----- + poppler/Parser.cc | 2 +- + poppler/PreScanOutputDev.cc | 2 +- + poppler/Rendition.cc | 2 +- + poppler/SecurityHandler.cc | 2 +- + poppler/SignatureInfo.cc | 4 ++-- + poppler/SignatureInfo.h | 2 +- + poppler/SplashOutputDev.cc | 2 +- + poppler/StdinCachedFile.cc | 2 +- + poppler/Stream.cc | 12 ++++++------ + poppler/StructElement.cc | 2 +- + poppler/StructTreeRoot.cc | 2 +- + poppler/TextOutputDev.cc | 10 +++++----- + poppler/TextOutputDev.h | 2 +- + poppler/UnicodeMap.cc | 4 ++-- + poppler/UnicodeTypeTable.cc | 2 +- + poppler/XRef.cc | 14 +++++++------- + poppler/poppler-config.h.cmake | 2 +- + qt5/src/ArthurOutputDev.cc | 4 ++-- + qt5/src/CMakeLists.txt | 3 +++ + qt5/src/poppler-form.cc | 4 ++-- + qt5/src/poppler-form.h | 2 +- + qt5/src/poppler-qiodeviceoutstream.cc | 2 +- + qt5/tests/stress-threads-qt5.cpp | 2 +- + splash/Splash.cc | 10 +++++----- + splash/Splash.h | 2 +- + splash/SplashBitmap.cc | 8 ++++---- + splash/SplashBitmap.h | 2 +- + splash/SplashClip.cc | 4 ++-- + splash/SplashFTFontEngine.cc | 2 +- + splash/SplashFont.cc | 4 ++-- + splash/SplashFontEngine.cc | 4 ++-- + splash/SplashFontFile.cc | 2 +- + splash/SplashMath.h | 2 +- + splash/SplashPath.cc | 2 +- + splash/SplashScreen.cc | 4 ++-- + splash/SplashScreen.h | 2 +- + splash/SplashState.cc | 2 +- + splash/SplashXPath.cc | 4 ++-- + splash/SplashXPathScanner.cc | 4 ++-- + test/gtk-test.cc | 2 +- + test/perf-test-preview-win.cc | 2 +- + test/perf-test.cc | 16 ++++++++-------- + utils/CMakeLists.txt | 2 ++ + utils/HtmlFonts.cc | 2 +- + utils/HtmlLinks.h | 4 ++-- + utils/HtmlOutputDev.cc | 14 +++++++------- + utils/HtmlOutputDev.h | 2 +- + utils/HtmlUtils.h | 2 +- + utils/ImageOutputDev.cc | 10 +++++----- + utils/ImageOutputDev.h | 2 +- + utils/InMemoryFile.cc | 2 +- + utils/InMemoryFile.h | 2 +- + utils/JSInfo.cc | 2 +- + utils/JSInfo.h | 2 +- + utils/Win32Console.h | 2 +- + utils/parseargs.cc | 10 +++++----- + utils/pdfdetach.cc | 2 +- + utils/pdffonts.cc | 8 ++++---- + utils/pdfimages.cc | 8 ++++---- + utils/pdfinfo.cc | 12 ++++++------ + utils/pdfseparate.cc | 10 +++++----- + utils/pdfsig.cc | 10 +++++----- + utils/pdftocairo.cc | 6 +++--- + utils/pdftohtml.cc | 10 +++++----- + utils/pdftoppm.cc | 6 +++--- + utils/pdftops.cc | 8 ++++---- + utils/pdftotext.cc | 8 ++++---- + 144 files changed, 343 insertions(+), 337 deletions(-) + +commit 5713d0da012b734a28234455dcf817d5be20a98f +Author: Albert Astals Cid +Date: Fri Nov 29 16:19:53 2019 +0100 + + Enable readability-string-compare + + .gitlab-ci.yml | 2 +- + poppler/GfxState.cc | 22 +++++++++++----------- + poppler/SplashOutputDev.cc | 8 ++++---- + utils/HtmlOutputDev.cc | 2 +- + 4 files changed, 17 insertions(+), 17 deletions(-) + +commit 42efcb738cd5924215249c55dd2d0ff7f517d6b5 +Author: Albert Astals Cid +Date: Fri Nov 29 15:45:37 2019 +0100 + + Enable readability-inconsistent-declaration-parameter-name + + .gitlab-ci.yml | 2 +- + cpp/poppler-document.h | 5 +++-- + cpp/poppler-image.cpp | 14 +++++++------- + goo/gbase64.h | 3 ++- + goo/gbasename.h | 3 ++- + poppler/Annot.cc | 12 ++++++------ + poppler/Annot.h | 12 ++++++------ + poppler/CachedFile.cc | 6 +++--- + poppler/CairoFontEngine.h | 12 ++++++------ + poppler/DateInfo.h | 4 ++-- + poppler/Form.cc | 36 ++++++++++++++++++------------------ + poppler/Form.h | 12 ++++++------ + poppler/GfxFont.cc | 8 ++++---- + poppler/GfxFont.h | 2 +- + poppler/GfxState.h | 6 +++--- + poppler/JPEG2000Stream.cc | 2 +- + poppler/Movie.h | 10 +++++----- + poppler/PDFDoc.h | 2 +- + poppler/PSOutputDev.cc | 4 ++-- + poppler/Sound.h | 6 +++--- + poppler/SplashOutputDev.cc | 2 +- + poppler/SplashOutputDev.h | 6 +++--- + poppler/StructElement.h | 2 +- + poppler/UTF.cc | 6 +++--- + poppler/UTF.h | 2 +- + poppler/UnicodeTypeTable.h | 5 +++-- + qt5/demos/navigationtoolbar.h | 5 +++-- + qt5/src/poppler-annotation.h | 10 +++++----- + qt5/src/poppler-link.cc | 2 +- + qt5/src/poppler-qt5.h | 20 ++++++++++---------- + splash/Splash.cc | 4 ++-- + splash/Splash.h | 4 ++-- + splash/SplashFTFontFile.h | 3 ++- + 33 files changed, 119 insertions(+), 113 deletions(-) + +commit ec2b036e0029e94183a87471c83577336bbaedda +Author: Albert Astals Cid +Date: Fri Nov 29 14:42:31 2019 +0100 + + Return early in operator= if we're assigning to ourselves + + Makes bugprone-unhandled-self-assignment happy + + cpp/poppler-image.cpp | 5 ++++- + qt5/src/poppler-outline.cc | 3 +++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 98dbe4becbebb96dc46a581dad338e84d747334e +Author: Jason Crain +Date: Tue Nov 26 23:44:30 2019 -0700 + + glib: Fix poppler_action_layer_copy function cast warning + + In our call to g_list_foreach, the GFunc callback type takes two + arguments, but we pass the g_object_ref function, which only + takes one, + so the compiler warns about an incompatible function cast. + + Fix this by using a for loop instead of g_list_foreach. + + glib/poppler-action.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 0e6790f1eb36786ce7832a0415162b6967e42128 +Author: Jason Crain +Date: Tue Nov 26 23:44:22 2019 -0700 + + glib: Fix return in poppler_page_get_text_attributes_for_area + + Since this function returns a GList*, it should return nullptr + on error, + not FALSE. + + glib/poppler-page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9b4503048e7d0eeb882aeea75140c2b6e3599c48 +Author: Jason Crain +Date: Tue Nov 26 23:44:15 2019 -0700 + + glib: Use g_list_free_full + + Use g_list_free_full instead of g_list_foreach followed by + g_list_free. + This fixes a compiler warning. + + The g_list_foreach function takes a "GFunc" callback, which takes two + arguments, but the free functions we pass only take one argument, + so the + compiler warns about an incompatible cast. Using g_list_free_full + fixes + this because it takes a "GDestroyNotify" callback, which takes one + argument. + + glib/poppler-action.cc | 6 ++---- + glib/poppler-document.cc | 10 +++------- + glib/poppler-page.cc | 18 ++++++------------ + 3 files changed, 11 insertions(+), 23 deletions(-) + +commit 1496a00af0cb5f4c39d255493501957ef6a7f7da +Author: Albert Astals Cid +Date: Thu Nov 28 15:59:57 2019 +0100 + + Move enableFreeType out of GlobalParams + + It's now moved to pdftoppm+SplashOutputDev that were the only users + + poppler/GlobalParams.cc | 11 ----------- + poppler/GlobalParams.h | 3 --- + poppler/SplashOutputDev.cc | 3 ++- + poppler/SplashOutputDev.h | 2 ++ + qt5/src/ArthurOutputDev.cc | 4 ---- + utils/pdftoppm.cc | 5 ++++- + 6 files changed, 8 insertions(+), 20 deletions(-) + +commit e8e577df239350fadbcc19e7a52a834d42624187 +Author: Albert Astals Cid +Date: Thu Nov 28 15:14:43 2019 +0100 + + Some more const + + poppler/CharCodeToUnicode.cc | 2 +- + poppler/CharCodeToUnicode.h | 2 +- + poppler/GlobalParams.cc | 32 ++++++++++++++++---------------- + poppler/GlobalParams.h | 22 +++++++++++----------- + poppler/GlobalParamsWin.cc | 6 +++--- + 5 files changed, 32 insertions(+), 32 deletions(-) + +commit 72a8d1bfbc2f1952275b71ae29dc1bc778241b57 +Author: Albert Astals Cid +Date: Thu Nov 28 00:46:03 2019 +0100 + + HtmlPage::dumpComplexHeaders: Fix memory leak + + We can't do + const std::string htmlEncoding = + HtmlOutputDev::mapEncodingToHtml(globalParams->getTextEncodingName())->toStr(); + since HtmlOutputDev::mapEncodingToHtml returned a GooString that + needed + deletion. + + It's all std::strings now + + poppler/GlobalParams.cc | 4 ++-- + poppler/GlobalParams.h | 2 +- + utils/HtmlOutputDev.cc | 30 ++++++++++++------------------ + utils/HtmlOutputDev.h | 5 ++--- + 4 files changed, 17 insertions(+), 24 deletions(-) + +commit 23685aab67b28b6158bce27628fe6fc58adaec1c +Author: Albert Astals Cid +Date: Thu Nov 28 00:52:25 2019 +0100 + + Make GfxFont constructor protected + + You're not supposed to create a GfxFont by itself + + poppler/GfxFont.h | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit dc429f039fe9db5989e14f57b4cc7395be4d506d +Author: Albert Astals Cid +Date: Wed Nov 27 23:29:05 2019 +0100 + + Poppler 0.83.0 + + CMakeLists.txt | 4 ++-- + NEWS | 18 ++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 22 insertions(+), 4 deletions(-) + +commit 7bd2d1b9db89af824d3be7ee2bbfd1ba7be5d408 +Author: Albert Astals Cid +Date: Wed Nov 27 22:56:46 2019 +0100 + + some more const + + poppler/CMap.cc | 4 ++-- + poppler/CMap.h | 10 +++++----- + poppler/CharCodeToUnicode.cc | 12 ++++++------ + poppler/CharCodeToUnicode.h | 12 ++++++------ + poppler/GfxFont.cc | 4 ++-- + poppler/GfxFont.h | 6 +++--- + poppler/NameToCharCode.cc | 18 ++++++++++++++++-- + poppler/NameToCharCode.h | 6 +++--- + poppler/PageTransition.h | 17 +++++++++-------- + 9 files changed, 52 insertions(+), 37 deletions(-) + +commit 8eb7a123c2ad226598de498cc37fa9b8dccdd3bd +Author: Albert Astals Cid +Date: Wed Nov 27 17:10:52 2019 +0100 + + FontInfo: Add some const + + glib/poppler-document.cc | 8 ++++---- + poppler/FontInfo.cc | 2 +- + poppler/FontInfo.h | 24 ++++++++++++------------ + 3 files changed, 17 insertions(+), 17 deletions(-) + +commit 7d570b79419750eb60a621c7c312c59910a3746c +Author: Albert Astals Cid +Date: Tue Nov 26 19:07:28 2019 +0100 + + Linearization: add const to functions + + poppler/Linearization.cc | 22 +++++++++++----------- + poppler/Linearization.h | 21 +++++++++++---------- + 2 files changed, 22 insertions(+), 21 deletions(-) + +commit 02fca4f88ecb6e961b0d19f3d5d77edf6fb36d16 +Author: Albert Astals Cid +Date: Tue Nov 26 19:05:52 2019 +0100 + + Update (C) + + poppler/Linearization.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 1e3b202760aad7737afe9a57d5f1acd66f6be2ee +Author: Even Rouault +Date: Tue Nov 26 16:53:01 2019 +0100 + + Do not recognized as linearized documents that lack a valid + Linearized dict + + Documents such as the one at + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=19098 + (under embargo at the time of writing) have the structure of the + Linearized dict + but lack valid integer object numbers. Poppler still manages to make + some sense + of that, but not recognizing such corrupted files as linearized + would help the + consumer (GDAL) that does admitedly nasty things around Poppler... + + poppler/Linearization.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 14280c6161108798cd7e60066bd012c87a308cf3 +Author: Albert Astals Cid +Date: Sun Nov 24 12:04:23 2019 +0100 + + Add const to TextOutputDev & friends + + glib/poppler-page.cc | 12 ++-- + poppler/GfxState.h | 2 +- + poppler/TextOutputDev.cc | 158 +++++++++++++++++++++--------------------- + poppler/TextOutputDev.h | 174 + +++++++++++++++++++++++------------------------ + poppler/UnicodeMap.cc | 2 +- + poppler/UnicodeMap.h | 2 +- + qt5/src/poppler-page.cc | 2 +- + utils/pdftotext.cc | 12 ++-- + 8 files changed, 182 insertions(+), 182 deletions(-) + +commit 73ddac6662bec52c08f06c739c623a868df5da68 +Author: Albert Astals Cid +Date: Sun Nov 24 10:37:25 2019 +0100 + + Remove useless virtual markers on override functions + + poppler/FlateStream.h | 16 ++++++++-------- + poppler/JPXStream.h | 16 ++++++++-------- + qt5/src/ArthurOutputDev.h | 6 +++--- + 3 files changed, 19 insertions(+), 19 deletions(-) + +commit a0fbc4c7ef978873ba5730958c9e1fa6aeea06c4 +Author: Albert Astals Cid +Date: Sun Nov 24 10:03:25 2019 +0100 + + Make Stream::getKind const + + glib/poppler-input-stream.h | 3 ++- + poppler/CachedFile.h | 4 ++-- + poppler/DCTStream.h | 4 ++-- + poppler/Decrypt.h | 2 +- + poppler/FlateEncoder.h | 4 ++-- + poppler/FlateStream.h | 4 ++-- + poppler/JBIG2Stream.h | 3 ++- + poppler/JPEG2000Stream.h | 4 ++-- + poppler/JPXStream.h | 16 +++++++++++++++- + poppler/PSOutputDev.cc | 2 +- + poppler/Stream.cc | 2 +- + poppler/Stream.h | 42 + +++++++++++++++++++++--------------------- + 12 files changed, 53 insertions(+), 37 deletions(-) + +commit db2faed91c0d809b5eb264edd41fef3b5a4a9568 +Author: Albert Astals Cid +Date: Sun Nov 24 10:15:52 2019 +0100 + + CI: savannah git is down, use tarballs + + .gitlab-ci.yml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit c017531fdebdd8a9d56c86ba89e861cc067000a2 +Author: Albert Astals Cid +Date: Sun Nov 24 09:52:54 2019 +0100 + + Update (C) of few past commits + + goo/GooString.cc | 1 + + goo/GooString.h | 1 + + make-glib-api-docs | 1 + + qt5/demos/navigationtoolbar.cpp | 1 + + 4 files changed, 4 insertions(+) + +commit 064bbe4be40300739ce8352658e4883534442128 +Author: Albert Astals Cid +Date: Sat Nov 23 08:13:21 2019 +0100 + + Add some const to GfxState & friends + + poppler/CairoOutputDev.cc | 7 ++- + poppler/CairoOutputDev.h | 4 +- + poppler/Gfx.cc | 6 +-- + poppler/GfxState.cc | 42 +++++++-------- + poppler/GfxState.h | 129 + +++++++++++++++++++++++---------------------- + poppler/PSOutputDev.cc | 12 ++--- + poppler/PSOutputDev.h | 2 +- + poppler/SplashOutputDev.cc | 5 +- + poppler/SplashOutputDev.h | 2 +- + poppler/TextOutputDev.cc | 12 ++--- + qt5/src/ArthurOutputDev.cc | 5 +- + 11 files changed, 109 insertions(+), 117 deletions(-) + +commit 1fa3cbd729bf16e06678b39d05be12d0ec6fa786 +Author: Albert Astals Cid +Date: Fri Nov 22 22:14:11 2019 +0100 + + make-glib-api-docs: switch to python3 + + Seems to work fine and python2 is dying anyway + + make-glib-api-docs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c646fca7d0e3837942c6e431673af0f79a52b276 +Author: Albert Astals Cid +Date: Fri Nov 22 21:53:50 2019 +0100 + + Remove Object::streamIs and Object::isStream(const char *) + + poppler/Object.h | 8 -------- + 1 file changed, 8 deletions(-) + +commit dc85457466acf5f9ce87988c812d47254ac74ad0 +Author: Albert Astals Cid +Date: Fri Nov 22 21:49:01 2019 +0100 + + Remove Object::streamGetLine + + poppler/Object.h | 4 ---- + 1 file changed, 4 deletions(-) + +commit 8090142cbc9fc2d5dd9b39c22c042cfe5b088fda +Author: Albert Astals Cid +Date: Fri Nov 22 18:55:04 2019 +0100 + + Remove Object::streamLookChar + + poppler/Object.h | 4 ---- + 1 file changed, 4 deletions(-) + +commit c59a2794b68f104fec15bb75af456793bf3c3d96 +Author: Albert Astals Cid +Date: Fri Nov 22 18:49:06 2019 +0100 + + qt5: trUtf8 -> tr (less warnings) + + qt5/demos/navigationtoolbar.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 57c142f62e36254c0eff671daac95c2aee28b801 +Author: Albert Astals Cid +Date: Fri Nov 22 18:40:27 2019 +0100 + + Remove Object::streamSetPos + + poppler/Lexer.h | 4 ++-- + poppler/Object.h | 3 --- + 2 files changed, 2 insertions(+), 5 deletions(-) + +commit df84cd5c349de7a46abf1d0f5431b4da2e5eed95 +Author: Albert Astals Cid +Date: Fri Nov 22 18:36:31 2019 +0100 + + Remove Object::streamGetPos + + poppler/Lexer.cc | 4 ++-- + poppler/Lexer.h | 6 +++--- + poppler/Object.h | 4 ---- + 3 files changed, 5 insertions(+), 9 deletions(-) + +commit 7671892300b0044b85ba289a7afb32e640b5b07d +Author: Oliver Sander +Date: Mon Nov 18 21:07:35 2019 +0100 + + Have more strings on the stack, rather than on the heap + + And replace some GooString with std::string while we're at it. + + utils/HtmlFonts.cc | 21 ++++++--------------- + utils/HtmlOutputDev.cc | 49 + +++++++++++++++++++------------------------------ + 2 files changed, 25 insertions(+), 45 deletions(-) + +commit d331bfe09816397d5f6c8ef9744c418bc6063fe9 +Author: Oliver Sander +Date: Mon Nov 18 21:06:59 2019 +0100 + + Allow to append a std::string + + This is helpful in situations that mix GooString and std::string. + + goo/GooString.h | 1 + + 1 file changed, 1 insertion(+) + +commit 99f99aa9d475b0640a6efa0aca922c7eaf5bfdc0 +Author: Albert Astals Cid +Date: Tue Nov 19 20:20:38 2019 +0000 + + fix comment + + goo/GooString.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1417e6825b525eb09b67fdd80ddbbd33ce6eb5dc +Author: Oliver Sander +Date: Mon Nov 18 21:46:45 2019 +0100 + + Remove GooString::upperCase + + It is never used. + + goo/GooString.cc | 10 ---------- + goo/GooString.h | 1 - + 2 files changed, 11 deletions(-) + +commit f2b00803ba4b030acae28c4560ccf011d7edfd4b +Author: Albert Astals Cid +Date: Mon Nov 18 21:58:37 2019 +0100 + + Update (C) of previous commit + + utils/HtmlFonts.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 66fd6879eb647e8349e9ea67258e2da8cf2ecf91 +Author: Oliver Sander +Date: Mon Nov 18 10:24:29 2019 +0100 + + Replace GooString::fromInt by std::to_string + + goo/GooString.cc | 9 --------- + goo/GooString.h | 3 --- + qt5/tests/check_goostring.cpp | 22 ---------------------- + utils/HtmlFonts.cc | 8 ++++---- + utils/HtmlOutputDev.cc | 8 ++++---- + 5 files changed, 8 insertions(+), 42 deletions(-) + +commit f8da50f8e44c3f76fd89d9db57b925052d2c9371 +Author: Albert Astals Cid +Date: Sun Nov 17 21:33:02 2019 +0100 + + Update (C) of previous commits + + cpp/poppler-document.cpp | 1 + + utils/pdfattach.cc | 1 + + utils/pdfimages.cc | 1 + + utils/pdfinfo.cc | 1 + + utils/pdfseparate.cc | 1 + + utils/pdfsig.cc | 1 + + utils/pdftocairo.cc | 1 + + utils/pdftohtml.cc | 1 + + utils/pdftoppm.cc | 1 + + utils/pdftops.cc | 1 + + utils/pdftotext.cc | 1 + + utils/pdfunite.cc | 1 + + 12 files changed, 12 insertions(+) + +commit 020d2d0e6fb097a24a34e2be6180e3eedefc68dd +Author: Oliver Sander +Date: Sat Nov 9 06:32:46 2019 +0100 + + Remove goto-based error handling in pdffonts.cc + + Now that globalParams is a unique_ptr, there is no need + for these gotos anymore. + + utils/pdffonts.cc | 17 +++++------------ + 1 file changed, 5 insertions(+), 12 deletions(-) + +commit c6479d6cb7b57fea9319f24f8ab46e54aea7235d +Author: Oliver Sander +Date: Sat Nov 2 21:31:30 2019 +0100 + + Remove obsolete label 'err1' + + utils/pdfdetach.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 759d190581f8ff069ecee9155313a8e69a2ca9c6 +Author: Oliver Sander +Date: Sat Nov 2 17:50:59 2019 +0100 + + Make globalParams a std::unique_ptr + + cpp/poppler-document.cpp | 5 ++--- + glib/poppler-document.cc | 8 ++++---- + poppler/GlobalParams.cc | 2 +- + poppler/GlobalParams.h | 3 ++- + qt5/src/poppler-private.cc | 4 ++-- + qt5/tests/check_optcontent.cpp | 8 ++++---- + qt5/tests/check_strings.cpp | 4 ++-- + test/gtk-test.cc | 4 +--- + test/pdf-fullrewrite.cc | 3 +-- + test/pdf-inspector.cc | 3 +-- + test/perf-test.cc | 3 +-- + utils/pdfattach.cc | 3 +-- + utils/pdfdetach.cc | 3 +-- + utils/pdffonts.cc | 3 +-- + utils/pdfimages.cc | 3 +-- + utils/pdfinfo.cc | 4 +--- + utils/pdfseparate.cc | 3 +-- + utils/pdfsig.cc | 3 +-- + utils/pdftocairo.cc | 3 +-- + utils/pdftohtml.cc | 4 +--- + utils/pdftoppm.cc | 3 +-- + utils/pdftops.cc | 3 +-- + utils/pdftotext.cc | 4 +--- + utils/pdfunite.cc | 3 +-- + 24 files changed, 34 insertions(+), 55 deletions(-) + +commit 8b4a2891d9e4ca8ac835527cc7d114ab08e89ea7 +Author: Albert Astals Cid +Date: Fri Nov 8 00:43:05 2019 +0100 + + Fix uninitialized memory use in JBIG2Stream::readTextRegionSeg + + When the unlikely condition triggers + + poppler/JBIG2Stream.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 409121ea8b65189bcc2c8541297cd4b51c69d322 +Author: Oliver Sander +Date: Tue Oct 29 10:35:58 2019 +0100 + + Do not include string.h, it is not used + + utils/pdffonts.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 1601933e08e72df51e3ea923a8a34c198a29e518 +Author: Oliver Sander +Date: Tue Oct 29 10:34:22 2019 +0100 + + Use std::unique_ptr for passwords + + utils/pdffonts.cc | 18 ++++-------------- + 1 file changed, 4 insertions(+), 14 deletions(-) + +commit f37f1565c0aa4efec2eaa912397f61952f5c3c7d +Author: Oliver Sander +Date: Tue Oct 29 10:30:19 2019 +0100 + + Use std::unique_ptr for PDFDoc + + utils/pdffonts.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit d1f627fefd6dc84bd37064a421fc0095dbfd21c0 +Author: Oliver Sander +Date: Tue Oct 29 10:25:59 2019 +0100 + + Use std::string for the filename + + ... and create it on the stack rather than on the heap. + Makes the code more readable. + + utils/pdffonts.cc | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +commit d89faa0f8ceddb81fc4430dec08023ac987ad0e4 +Author: Oliver Sander +Date: Tue Oct 29 10:24:48 2019 +0100 + + Remove the 'err0' error handling goto target + + It is used only once, and removing it allows me to move + variable declarations around more freely. + + utils/pdffonts.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 4102e37e3cc52d087c73593125b6a0db497c0f03 +Author: Albert Astals Cid +Date: Thu Nov 7 13:48:00 2019 +0100 + + CI: tweak the fedora builders + + .gitlab-ci.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 3ea23da616817fd18de2108d2ecef3da32e04853 +Author: Albert Astals Cid +Date: Thu Nov 7 13:05:47 2019 +0100 + + CI: we can go back to current fedora for clazy-ci + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 280c096521d92f6c165f53021110828ad0174c12 +Author: Albert Astals Cid +Date: Wed Oct 30 23:04:09 2019 +0100 + + Update (C) of previous commits + + poppler/Sound.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4c42f03f26dc9ceb31bcd8bf7c290f3bc87fd862 +Author: Albert Astals Cid +Date: Wed Oct 30 23:01:40 2019 +0100 + + qt5: remove a bunch of unused internal functions + + qt5/src/poppler-annotation-helper.h | 118 + ------------------------------------ + 1 file changed, 118 deletions(-) + +commit 647274f118222cce978b3a79a50ad222d003d133 +Author: Albert Astals Cid +Date: Sun Oct 27 17:37:58 2019 +0100 + + Introduce Object::getNumWithDefaultValue + + Is like getNum but instead of asserting if Object is not a num it + returns the given default value + + I find it much easier to read + rect->x1 = obj1.arrayGet(0).getNumWithDefaultValue(0); + than + (obj2 = obj1.arrayGet(0), obj2.isNum() ? rect->x1 = obj2.getNum() + : rect->x1 = 0); + + On top of it has the benefit of being slightly faster + + poppler/Annot.cc | 97 ++++++++---------------- + poppler/Gfx.cc | 4 +- + poppler/GfxState.cc | 214 + ++++++++++++++++++---------------------------------- + poppler/Object.h | 7 ++ + poppler/Sound.cc | 5 +- + 5 files changed, 111 insertions(+), 216 deletions(-) + +commit aa7827ab29377ef00c2dfbb16082617690375513 +Author: Albert Astals Cid +Date: Wed Oct 30 22:21:04 2019 +0100 + + Use Fedora 30 for clazy while they fix Fedora 31 + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bd3a71199b06d9fec69ff7d28e9c485628e997c8 +Author: Adriaan de Groot +Date: Sun Oct 27 20:27:59 2019 +0100 + + unicodeNormalizeNFKC: Make in const + + poppler/UnicodeTypeTable.cc | 5 +++-- + poppler/UnicodeTypeTable.h | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit 1071f5f804ff53466825efdc6eff5818053f007e +Author: Albert Astals Cid +Date: Fri Oct 25 23:22:11 2019 +0200 + + 0.82.0 + + CMakeLists.txt | 4 ++-- + NEWS | 16 ++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 21 insertions(+), 5 deletions(-) + +commit 36bd90e04f8434e51fd75901df030f0169c27df4 +Author: Albert Astals Cid +Date: Wed Oct 16 21:18:12 2019 +0200 + + Import md5 code from xpdf 4.02 + + Fixes issue 832 + + poppler/Decrypt.cc | 319 + ++++++++++++++++++++++++++++++----------------------- + 1 file changed, 179 insertions(+), 140 deletions(-) + +commit e076a478e4d2f7d6445215814c86e6ac4654f575 +Author: Oliver Sander +Date: Mon Oct 14 20:08:33 2019 +0200 + + Make FontInfo::scan return a std::vector object + + ... rather than a pointer to a std::vector. Given that a + std::vector is little more than a pointer and some size + information, there is no need to create std::vector objects + on the heap. Returning them by value is just as fast + (the vector content is not copied), and makes the code + more readable, too. + + cpp/poppler-font.cpp | 15 +++++-------- + glib/poppler-document.cc | 51 + +++++++++++++++++++++------------------------ + poppler/FontInfo.cc | 8 +++---- + poppler/FontInfo.h | 2 +- + qt5/src/poppler-fontinfo.cc | 13 ++++-------- + utils/pdffonts.cc | 14 +++---------- + 6 files changed, 41 insertions(+), 62 deletions(-) + +commit 8911527dc38908ee56626fc55d09041475cc5145 +Author: Oliver Sander +Date: Mon Oct 14 15:15:45 2019 +0200 + + Use a std::unique_ptr for XRef + + This makes memory handling a tiny bit more robust. + + poppler/FontInfo.cc | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 78379d8434646dc68d20e935a7e7da38705fa6cd +Author: Bohumir Zamecnik +Date: Fri Apr 12 13:47:52 2019 +0700 + + Install Cairo headers if Cairo has been found. + + Closes #83. + + CMakeLists.txt | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit b35a585063723a5ed3cd592ce907fe605678d1bd +Author: Simon McVittie +Date: Fri Oct 4 09:08:18 2019 +0100 + + Silence deprecation warnings for PopplerAttachment->ctime, ->mtime + + GTime is not Y2038-safe, and is now marked as deprecated. Don't + trigger + deprecation warnings for projects that include poppler headers but + do not otherwise use GTime. + + Part of #765. + + Signed-off-by: Simon McVittie + + glib/poppler-attachment.h | 3 +++ + 1 file changed, 3 insertions(+) + +commit 6c4f3ea4b11033bcafbecad69887d77c6d366ce7 +Author: Albert Astals Cid +Date: Sun Oct 20 19:28:23 2019 +0200 + + Update (C) + + poppler/CharCodeToUnicode.cc | 1 + + poppler/CharCodeToUnicode.h | 1 + + 2 files changed, 2 insertions(+) + +commit f197ca2dc7b5f70392e99e18917fb39f20cfc585 +Author: Albert Astals Cid +Date: Sun Oct 20 19:11:15 2019 +0200 + + CharCodeToUnicode::mapToUnicode: Make clear the data is const + + poppler/Annot.cc | 5 +++-- + poppler/CairoFontEngine.cc | 2 +- + poppler/CairoFontEngine.h | 4 ++-- + poppler/CairoOutputDev.cc | 4 ++-- + poppler/CairoOutputDev.h | 4 ++-- + poppler/CharCodeToUnicode.cc | 2 +- + poppler/CharCodeToUnicode.h | 2 +- + poppler/Gfx.cc | 2 +- + poppler/GfxFont.cc | 10 +++++----- + poppler/GfxFont.h | 6 +++--- + poppler/MarkedContentOutputDev.cc | 2 +- + poppler/MarkedContentOutputDev.h | 4 ++-- + poppler/OutputDev.cc | 2 +- + poppler/OutputDev.h | 4 ++-- + poppler/PSOutputDev.cc | 2 +- + poppler/PreScanOutputDev.cc | 2 +- + poppler/PreScanOutputDev.h | 2 +- + poppler/SplashOutputDev.cc | 4 ++-- + poppler/SplashOutputDev.h | 4 ++-- + poppler/TextOutputDev.cc | 6 +++--- + poppler/TextOutputDev.h | 8 ++++---- + qt5/src/ArthurOutputDev.cc | 2 +- + qt5/src/ArthurOutputDev.h | 2 +- + utils/HtmlOutputDev.cc | 4 ++-- + utils/HtmlOutputDev.h | 4 ++-- + utils/pdftohtml.cc | 6 +++--- + 26 files changed, 50 insertions(+), 49 deletions(-) + +commit 3d6e70f763285f4e72188309164099e2dc06559c +Author: corentin +Date: Fri Oct 18 16:29:55 2019 +0200 + + Add const in CharCodeToUnicode + + Function updated: + getLength + mapToUnicode + + poppler/CharCodeToUnicode.cc | 2 +- + poppler/CharCodeToUnicode.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 80de4789e70b69d913362566d2f84642eec9ac51 +Author: Albert Astals Cid +Date: Wed Oct 9 10:08:36 2019 +0200 + + Fix assert on malformed documents + + poppler/Form.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 498883b5397b3b951b5d41d17641ecf2ffe9b801 +Author: Albert Astals Cid +Date: Mon Oct 7 23:25:07 2019 +0200 + + Update (C) of previous commit + + poppler/SplashOutputDev.cc | 2 +- + splash/SplashClip.cc | 1 + + splash/SplashClip.h | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +commit 194e57f21e6a7fe2a5eb3cf687599978b09e03f9 +Author: Stefan Brüns +Date: Mon Oct 7 20:46:33 2019 +0200 + + Move the non-trivial part of the clip test to the implementation file + + This allows to only have a SplashXPathScanner forward declaration in + the header file. + + splash/SplashClip.cc | 15 +++++++++++++++ + splash/SplashClip.h | 21 +++------------------ + 2 files changed, 18 insertions(+), 18 deletions(-) + +commit 9d875adabdc94f50de78d72528d373b46a8ed280 +Author: Stefan Brüns +Date: Mon Oct 7 19:57:32 2019 +0200 + + Include SplashMath.h only where needed + + poppler/SplashOutputDev.cc | 1 + + splash/SplashClip.cc | 1 + + splash/SplashClip.h | 1 - + 3 files changed, 2 insertions(+), 1 deletion(-) + +commit d03f5ab76b0d0dee199b65fc801236a38830b5fc +Author: Even Rouault +Date: Sun Oct 6 12:52:31 2019 +0200 + + Do not override user-defined CMAKE_C[XX]_FLAGS for clang + + 337585e3d881c2c2c9099888b09902119dc05bf8 unconditionnaly + overrides any potential user-defined CMAKE_C[XX]_FLAGS. + This for example breaks the GDAL oss-fuzz builds which build Poppler + from source (see + https://github.com/OSGeo/gdal/blob/master/gdal/fuzzers/build.sh#L54) + + So do the same as the GCC path where we save input CMAKE_C[XX]_FLAGS + and reinject them in custom CMAKE_C{XX}_FLAGS_{build_configuration} + The values are identical to GCC, execpt for the _DEBUG configuration + where we remove '-O2 -fno-reorder-blocks -fno-schedule-insns + -fno-inline' + since clang does not support -fno-reorder-blocks and + -fno-schedule-insns, + so it is likely better to disable any optimization for proper + debugging. + + cmake/modules/PopplerMacros.cmake | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 337585e3d881c2c2c9099888b09902119dc05bf8 +Author: Albert Astals Cid +Date: Thu Oct 3 13:52:49 2019 +0200 + + Set our default cxx and c flags to clang too + + This code needs a bit of refactoring to share most of it between + gcc and + clang + + cmake/modules/PopplerMacros.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +commit 442be9e34a6af9295ccd487b3091a1abcd4a77ce +Author: Albert Astals Cid +Date: Thu Oct 3 13:37:10 2019 +0200 + + Enable a few more clang-tidy bugprone checks + + .gitlab-ci.yml | 2 +- + poppler/Annot.cc | 2 +- + qt5/src/poppler-annotation-private.h | 1 - + qt5/src/poppler-link.h | 6 +++--- + qt5/tests/check_object.cpp | 2 +- + 5 files changed, 6 insertions(+), 7 deletions(-) + +commit 095735fa1259a030da8c854ee8ff649fe907642d +Author: Albert Astals Cid +Date: Wed Oct 2 17:50:42 2019 +0200 + + Enable clang-tidy bugprone-too-small-loop-variable + + And fixes for it in the code + + .gitlab-ci.yml | 2 +- + cpp/tests/poppler-dump.cpp | 4 ++-- + glib/poppler-document.cc | 2 +- + poppler/Form.cc | 6 +++--- + poppler/PSOutputDev.cc | 6 +++--- + poppler/StructElement.cc | 4 ++-- + qt5/src/poppler-document.cc | 4 ++-- + splash/SplashXPathScanner.cc | 6 +++--- + 8 files changed, 17 insertions(+), 17 deletions(-) + +commit f92b2858aa393c8886c35f0db50cc1a3a9603589 +Author: Albert Astals Cid +Date: Wed Oct 2 09:31:54 2019 +0200 + + GfxCIDFont::getCodeToGIDMap: n is const and an int + + poppler/GfxFont.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 5094d45e7994a76ded27c469b5e5f156c6045758 +Author: Christian Persch +Date: Mon May 27 23:36:19 2019 +0200 + + glib: Add poppler_document_new_from_bytes + + This allows creating a PopplerDocument from data stored in a + GBytes. + + This is better than poppler_document_new_from_data() since the + document will keep a reference to the data, instead of having + to make sure manually that the data stays around as long as the + document exists. Also poppler_document_new_from_data() is buggy + in that it uses int for the data size instead of gsize. + + https://gitlab.freedesktop.org/poppler/poppler/issues/771 + + glib/poppler-document.cc | 59 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-document.h | 4 +++ + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 64 insertions(+) + +commit 144a07e4b4298e272c0d5e565ec587806da2ebbc +Author: Albert Astals Cid +Date: Tue Oct 1 17:45:10 2019 +0200 + + Use range for loops to iterate const arrays + + for (const TypeMapEntry &entry : typeMap) { + is much easier to read than + for (unsigned i = 0; i < sizeof(typeMap) / sizeof(typeMap[0]); + i++) { + + poppler/FontInfo.cc | 4 ++-- + poppler/GfxFont.cc | 4 ++-- + poppler/StructElement.cc | 24 ++++++++++++------------ + poppler/TextOutputDev.cc | 7 +++---- + 4 files changed, 19 insertions(+), 20 deletions(-) + +commit dbd3e82f648df57cf2b4c26a0bc016c983f79138 +Author: Albert Astals Cid +Date: Fri Sep 27 23:23:24 2019 +0200 + + Run clang-tidy on CI + + Only with the performance- checks enabled for now + + .gitlab-ci.yml | 4 ++-- + cpp/poppler-destination.cpp | 4 ++-- + cpp/poppler-destination.h | 5 +++-- + cpp/poppler-page.cpp | 6 +++--- + cpp/poppler-page.h | 6 +++--- + poppler/CertificateInfo.cc | 19 ++++++++++++++----- + poppler/CertificateInfo.h | 10 +++++----- + poppler/Object.h | 4 ++-- + poppler/PDFDoc.cc | 4 ++-- + qt5/src/poppler-annotation.cc | 2 +- + qt5/src/poppler-link.cc | 2 +- + qt5/src/poppler-outline.cc | 5 +++-- + qt5/src/poppler-qt5.h | 4 ++-- + splash/SplashPath.cc | 4 ++-- + splash/SplashPath.h | 4 ++-- + 15 files changed, 47 insertions(+), 36 deletions(-) + +commit 7b9aa28e5eb613e7a9d7c6c688aea4025a35543a +Author: Albert Astals Cid +Date: Sun Sep 29 17:59:52 2019 +0200 + + Also switch the const_cast in Stream + + This way we only const_cast in free() + + poppler/Stream.cc | 50 ++++++++++++++++++++++++++------------------------ + poppler/Stream.h | 4 ++-- + 2 files changed, 28 insertions(+), 26 deletions(-) + +commit e702c6508e9b2e8082d99683ba933e9679608251 +Author: Albert Astals Cid +Date: Sun Sep 29 17:41:44 2019 +0200 + + Move the const_cast from assignment to free + + The problem is that some of the times the pointers hold values + to const tables and some others hold values to dynamic memory. + + Instead of const_casting the const tables when needed and holding + a non + const pointer, we hold a const pointer and only const cast on free if + needed + + fofi/FoFiType1C.cc | 21 +++++++++++---------- + fofi/FoFiType1C.h | 2 +- + poppler/UnicodeMap.cc | 15 ++++++++------- + poppler/UnicodeMap.h | 4 ++-- + 4 files changed, 22 insertions(+), 20 deletions(-) + +commit facb696ee9d7654b2c60f2ebe3e09d71f11d384c +Author: Albert Astals Cid +Date: Sun Sep 29 17:36:25 2019 +0200 + + Update (C) from previous commit + + fofi/FoFiEncodings.cc | 1 + + fofi/FoFiEncodings.h | 1 + + fofi/FoFiType1C.cc | 1 + + poppler/Gfx.cc | 1 + + poppler/Gfx.h | 1 + + poppler/JArithmeticDecoder.cc | 14 ++++++++++++++ + poppler/JArithmeticDecoder.h | 1 + + poppler/JBIG2Stream.cc | 1 + + poppler/JBIG2Stream.h | 1 + + poppler/PDFDocEncoding.cc | 1 + + poppler/PDFDocEncoding.h | 1 + + poppler/Stream.cc | 1 + + poppler/Stream.h | 1 + + poppler/UnicodeMap.cc | 1 + + poppler/UnicodeMap.h | 1 + + poppler/UnicodeMapTables.h | 14 ++++++++++++++ + 16 files changed, 42 insertions(+) + +commit 7ee694c461e35639842b88a6ce4b8b828b733a63 +Author: Volker Krause +Date: Sun Sep 29 16:52:55 2019 +0200 + + Make some static data tables const + + This moves 14.4kB from .data to .rodata, and another 11.6kB from + .data to + .data.rel.ro. + + fofi/FoFiEncodings.cc | 6 ++--- + fofi/FoFiEncodings.h | 6 ++--- + fofi/FoFiType1C.cc | 6 ++--- + poppler/Gfx.cc | 6 ++--- + poppler/Gfx.h | 4 +-- + poppler/JArithmeticDecoder.cc | 8 +++--- + poppler/JArithmeticDecoder.h | 8 +++--- + poppler/JBIG2Stream.cc | 62 + +++++++++++++++++++++---------------------- + poppler/JBIG2Stream.h | 18 ++++++------- + poppler/PDFDocEncoding.cc | 2 +- + poppler/PDFDocEncoding.h | 2 +- + poppler/Stream.cc | 14 +++++----- + poppler/Stream.h | 6 ++--- + poppler/UnicodeMap.cc | 4 +-- + poppler/UnicodeMap.h | 2 +- + poppler/UnicodeMapTables.h | 8 +++--- + 16 files changed, 81 insertions(+), 81 deletions(-) + +commit 5242a057594f3e635727a3b2f482a3aace10a0e4 +Author: Albert Astals Cid +Date: Sun Sep 29 12:19:52 2019 +0200 + + pdf-inspector: Support builddir != srcdir + + test/CMakeLists.txt | 1 + + test/pdf-inspector.cc | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit cb7de47e8da8aef49b63647112c6d4b615137c8c +Author: Albert Astals Cid +Date: Fri Sep 27 22:17:48 2019 +0200 + + Update (C) of previous commit + + fofi/FoFiTrueType.cc | 2 +- + fofi/FoFiTrueType.h | 2 +- + fofi/FoFiType1C.cc | 2 +- + fofi/FoFiType1C.h | 2 +- + poppler/CharCodeToUnicode.cc | 2 +- + poppler/CharCodeToUnicode.h | 2 +- + poppler/DateInfo.cc | 2 +- + poppler/DateInfo.h | 2 +- + poppler/OutputDev.cc | 2 +- + poppler/OutputDev.h | 2 +- + poppler/PreScanOutputDev.cc | 2 +- + poppler/PreScanOutputDev.h | 2 +- + poppler/SplashOutputDev.h | 2 +- + poppler/UTF.cc | 2 +- + poppler/UTF.h | 1 + + qt5/src/ArthurOutputDev.h | 2 +- + splash/Splash.h | 2 +- + splash/SplashFont.cc | 2 +- + splash/SplashFont.h | 2 +- + splash/SplashTypes.h | 2 +- + utils/ImageOutputDev.h | 2 +- + 21 files changed, 21 insertions(+), 20 deletions(-) + +commit 120cfc0de67501988edc9ded58d2a534d0b5a70e +Author: Albert Astals Cid +Date: Fri Sep 27 18:03:30 2019 +0200 + + Add some const + + Suggested by clang-tidy readability-non-const-parameter check + + fofi/FoFiTrueType.cc | 4 ++-- + fofi/FoFiTrueType.h | 4 ++-- + fofi/FoFiType1C.cc | 4 ++-- + fofi/FoFiType1C.h | 4 ++-- + poppler/CairoOutputDev.cc | 8 ++++---- + poppler/CairoOutputDev.h | 4 ++-- + poppler/CairoRescaleBox.cc | 4 ++-- + poppler/CharCodeToUnicode.cc | 2 +- + poppler/CharCodeToUnicode.h | 2 +- + poppler/DateInfo.cc | 2 +- + poppler/DateInfo.h | 2 +- + poppler/Decrypt.cc | 34 + +++++++++++++++++----------------- + poppler/GfxState.cc | 18 +++++++++--------- + poppler/GfxState.h | 18 +++++++++--------- + poppler/OutputDev.cc | 2 +- + poppler/OutputDev.h | 2 +- + poppler/PSOutputDev.cc | 10 +++++----- + poppler/PSOutputDev.h | 10 +++++----- + poppler/PreScanOutputDev.cc | 2 +- + poppler/PreScanOutputDev.h | 2 +- + poppler/SplashOutputDev.cc | 4 ++-- + poppler/SplashOutputDev.h | 2 +- + poppler/UTF.cc | 2 +- + poppler/UTF.h | 2 +- + poppler/XRef.cc | 2 +- + poppler/XRef.h | 2 +- + qt5/src/ArthurOutputDev.cc | 2 +- + qt5/src/ArthurOutputDev.h | 2 +- + qt5/src/poppler-annotation-helper.h | 4 ++-- + splash/Splash.cc | 4 ++-- + splash/Splash.h | 4 ++-- + splash/SplashFont.cc | 2 +- + splash/SplashFont.h | 4 ++-- + splash/SplashTypes.h | 5 +++-- + utils/HtmlOutputDev.cc | 2 +- + utils/HtmlOutputDev.h | 2 +- + utils/ImageOutputDev.cc | 2 +- + utils/ImageOutputDev.h | 2 +- + 38 files changed, 94 insertions(+), 93 deletions(-) + +commit cec2397fc0542516cac16615f63ab89032806a2e +Author: Albert Astals Cid +Date: Fri Sep 27 16:56:33 2019 +0200 + + Annot: Protect against division by 0.0 + + poppler/Annot.cc | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 0e8ed9a34e04cc4e56b31f4057c267630c4a7656 +Author: Albert Astals Cid +Date: Mon Sep 23 10:01:18 2019 +0200 + + Annot: Fix uninitialized memory read on broken files + + By initializing width and charCount earlier in Annot::layoutText, + there's two early return that need the values to be initialized and + we were initializing them later in the function anyway so just + move the + block to the beginning of the function + + poppler/Annot.cc | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 39a8b10181d77fff8846df2cff236a3105dd03a5 +Author: Albert Astals Cid +Date: Sun Sep 22 17:56:22 2019 +0200 + + Poppler 0.81.0 + + CMakeLists.txt | 4 ++-- + NEWS | 8 ++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 12 insertions(+), 4 deletions(-) + +commit 1ef3b513164640390ffeb765ec0dcfa8d36f7262 +Author: Albert Astals Cid +Date: Sun Sep 22 11:33:31 2019 +0200 + + Update (C) of last commit + + poppler/CairoOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit fef3bbc1ef61fb8ee94dc12179d1f660e4016458 +Author: Marek Kasik +Date: Fri Sep 20 16:33:04 2019 +0200 + + CairoOutputDev: Check scaled dimensions for 0 + + Check scaledWidth and scaledHeight for 0 at + RescaleDrawImage::getSourceImage() + as is done on other places. Set the dimension to 1 if it is 0. + + Fixes issue #737 + + poppler/CairoOutputDev.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 72ecb16fb7cfd76aab00a5d664eb05833b85dd77 +Author: Albert Astals Cid +Date: Mon Sep 2 21:35:03 2019 +0200 + + CI: Don't force a particular libc++ version + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dc77116d0a27f70eeba4a0a4e8733759cd867f3d +Author: Albert Astals Cid +Date: Sun Sep 1 22:07:02 2019 +0200 + + SplashBitmap: Fix wrong width condition for splashModeDeviceN8 + + splash/SplashBitmap.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 335cb47a0e369fd6cf7af594801c2bcf5d74675a +Author: Albert Astals Cid +Date: Sat Aug 24 02:01:53 2019 +0200 + + GfxDeviceNColorSpace: Port to std::vector + + I was tired of having two constructors for GfxDeviceNColorSpace, both + taking GooString ** but one copying those strings and the other + keeping + them for itself. + + Moved to std::vector without much fallout in the rest of + the code + + goo/GooString.h | 3 +- + poppler/GfxState.cc | 78 + +++++++++++++++++++--------------------------- + poppler/GfxState.h | 11 +++---- + poppler/PSOutputDev.cc | 16 +++++----- + poppler/PSOutputDev.h | 2 +- + poppler/SplashOutputDev.cc | 8 ++--- + 6 files changed, 52 insertions(+), 66 deletions(-) + +commit a2f2f3b91fb007b0c17090d369179e7605c9a4b7 +Author: Albert Astals Cid +Date: Sat Aug 24 18:17:10 2019 +0200 + + GfxDeviceNColorSpace::parse: Only add to separationList if non null + + Fixes crash with bug-poppler85281.pdf + + poppler/GfxState.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 2e32545b1d2e31359775a65ef34e0385c9079126 +Author: Albert Astals Cid +Date: Fri Aug 23 00:11:45 2019 +0200 + + Always enable SPLASH_CMYK + + Doesn't seem to cause any speed regression and one ifdef less is + code easier + to maintain + + .gitlab-ci.yml | 2 +- + CMakeLists.txt | 4 -- + config.h.cmake | 3 - + poppler/PSOutputDev.cc | 2 - + poppler/SplashOutputDev.cc | 165 + +------------------------------------------- + poppler/SplashOutputDev.h | 2 - + qt5/src/poppler-document.cc | 4 -- + qt5/src/poppler-page.cc | 10 +-- + splash/Splash.cc | 75 +------------------- + splash/Splash.h | 13 +--- + splash/SplashBitmap.cc | 20 ------ + splash/SplashBitmap.h | 2 - + splash/SplashState.cc | 19 +---- + splash/SplashState.h | 2 - + splash/SplashTypes.h | 21 ++---- + utils/pdftoppm.cc | 15 +--- + utils/pdftops.cc | 6 -- + 17 files changed, 17 insertions(+), 348 deletions(-) + +commit 9d5af77a9538be2cb4fce2fc4601359bb41d3976 +Author: Albert Astals Cid +Date: Sat Aug 24 00:59:09 2019 +0200 + + Initialize BaseCryptStream::nextCharBuff on construction + + Otherwise if we construct a DecryptStream and next we call + lookupChar it + would use un-initialized memory + + poppler/Decrypt.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d2a37632661d1c8c29fa28a6e1a5d812508f4ea3 +Author: Albert Astals Cid +Date: Thu Aug 22 23:27:22 2019 +0200 + + 0.80.0 + + CMakeLists.txt | 4 ++-- + NEWS | 27 +++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 33 insertions(+), 6 deletions(-) + +commit e47daf60cfbbbf1b1501b32a80e5625e51be8eae +Author: Evgeny Stambulchik +Date: Wed Aug 21 21:57:14 2019 +0300 + + Make sure guint64 is not overflown + + glib/poppler-movie.cc | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 7866954b44b7c333b875e3cf5e4865802682e2d2 +Author: Evgeny Stambulchik +Date: Wed Aug 21 20:55:13 2019 +0300 + + Store PopplerMovie.volume as double, mapped to 0 - 1 + + glib/poppler-movie.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 52f70051f652de2ec1e1f8e83fbc090a7c9d0603 +Author: Evgeny Stambulchik +Date: Wed Aug 21 20:51:10 2019 +0300 + + PopplerMovieTime no longer used + + glib/reference/poppler-sections.txt | 1 - + 1 file changed, 1 deletion(-) + +commit f00b088072b4f4a8392a96e2243059ffdbbcc33b +Author: Albert Astals Cid +Date: Wed Aug 21 17:21:57 2019 +0200 + + GfxState: Move vars inside the ifdef they are used in + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 365a92e5ed21c642a45dfb75295b7dfa7fc4499a +Author: Evgeny Stambulchik +Date: Wed Aug 21 01:08:31 2019 +0300 + + Use guint64 for time-related values of movie objects (in ns) + + glib/demo/utils.c | 7 ++----- + glib/poppler-movie.cc | 50 + ++++++++++++++++++++++++++++++-------------------- + glib/poppler-movie.h | 20 ++------------------ + 3 files changed, 34 insertions(+), 43 deletions(-) + +commit 764dd94a7f5cac3426a58d3f7efbcf8d1b8c787f +Author: Evgeny Stambulchik +Date: Wed Aug 21 00:40:13 2019 +0300 + + Make poppler_movie_get_volume() return double 0.0-1.0 + + glib/demo/utils.c | 2 +- + glib/poppler-movie.cc | 6 +++--- + glib/poppler-movie.h | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 8c2c5c46aba84d714f6c8f779eda0646b31b956b +Author: Evgeny Stambulchik +Date: Wed Aug 21 00:33:16 2019 +0300 + + Rename poppler_movie_synchronous_play -> poppler_movie_is_synchronous + + glib/demo/utils.c | 2 +- + glib/poppler-movie.cc | 4 ++-- + glib/poppler-movie.h | 2 +- + glib/reference/poppler-sections.txt | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit b1df2588a8180d3aa027c25764377f28c8d94ce6 +Author: Evgeny Stambulchik +Date: Sat Jul 27 00:34:31 2019 +0300 + + Update Since: comments for new video APIs + + glib/poppler-movie.cc | 12 ++++++------ + glib/poppler-movie.h | 2 +- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit fc79087f2d26b355b4477155141578a59ff06620 +Author: Evgeny Stambulchik +Date: Fri Jul 5 02:02:26 2019 +0300 + + Change time-related Movie glib API's to return time as out + + Also, added Since: strings and completed missing API doc comments. + + glib/demo/utils.c | 4 ++-- + glib/poppler-movie.cc | 46 ++++++++++++++++++++++++++++++++++++---------- + glib/poppler-movie.h | 15 +++++++++++++-- + 3 files changed, 51 insertions(+), 14 deletions(-) + +commit 9a65ab0f43bf3fe1c60da0a0657ccdbaddaba1e5 +Author: Evgeny Stambulchik +Date: Fri Jul 5 01:11:25 2019 +0300 + + Update the Movie section in poppler-sections.txt + + glib/reference/poppler-sections.txt | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 2f55f4cc10cc7544b1c564ef28f84d470b2dbe05 +Author: Evgeny Stambulchik +Date: Thu Jun 20 00:07:07 2019 +0300 + + Implement missing Movie API's in the Glib bindings + + glib/demo/utils.c | 11 +++++- + glib/poppler-movie.cc | 104 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-movie.h | 17 +++++++++ + 3 files changed, 131 insertions(+), 1 deletion(-) + +commit c6dbde146a47e2c899b57923b370470eddeb90f7 +Author: Albert Astals Cid +Date: Wed Aug 21 13:00:17 2019 +0200 + + CI: Android move to the newer kdeorg sdk image + + .gitlab-ci.yml | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 7e19574b70edefa8161e57c33025987e58b27c03 +Author: Marek Kasik +Date: Wed Aug 21 11:40:53 2019 +0200 + + glib: Documentation fixes for viewer preferences + + Clarify documentation about returned values + of recently added viewer preferences. + + https://gitlab.freedesktop.org/poppler/poppler/issues/290 + + glib/poppler-document.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit a89b52e9eefa65a099f59e84080c9762a1d9d9a5 +Author: Marek Kasik +Date: Tue Aug 20 21:13:38 2019 +0200 + + glib: Return nullptr if n_ranges is nullptr + + Return nullptr if we don't have correct pointer for storing + number of ranges in poppler_document_get_print_page_ranges(). + + https://gitlab.freedesktop.org/poppler/poppler/issues/290 + + glib/poppler-document.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 5a61eb75ca807f050b5f436a32de768f63e6177e +Author: Marek Kasik +Date: Fri Aug 16 14:25:10 2019 +0200 + + glib: Use C struct for PopplerPageRange + + Boxed type is not needed so use just common C struct. + Use G_GNUC_MALLOC attribute on + poppler_document_get_print_page_ranges(). + + https://gitlab.freedesktop.org/poppler/poppler/issues/290 + + glib/poppler-document.cc | 57 + +++++------------------------------------------- + glib/poppler-document.h | 17 +++------------ + 2 files changed, 8 insertions(+), 66 deletions(-) + +commit 18afdb2eef77b39df78bdbf6c9b03f861779e433 +Author: Marek Kasik +Date: Wed Jun 12 19:01:29 2019 +0200 + + glib: Make PrintPageRange preference available in API + + Add poppler_document_get_print_page_ranges() so that applications + which + use poppler's glib frontend can access this preference. + + https://gitlab.freedesktop.org/poppler/poppler/issues/290 + + glib/poppler-document.cc | 44 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-document.h | 3 +++ + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 48 insertions(+) + +commit 40ec62ce12b18f13d84d14a102b8b7c8abafedab +Author: Marek Kasik +Date: Tue Jun 4 13:08:26 2019 +0200 + + glib: Add PopplerPageRange type + + This type will be used for getting of suggested page ranges from + opened document if it contains PrintPageRange viewer preference. + + https://gitlab.freedesktop.org/poppler/poppler/issues/290 + + glib/poppler-document.cc | 47 + +++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-document.h | 24 ++++++++++++++++++++++++ + glib/poppler.h | 1 + + 3 files changed, 72 insertions(+) + +commit a3394adb31e7f6e91bef6f52cfdddb132dc5e32d +Author: Marek Kasik +Date: Thu Feb 21 16:24:46 2019 +0100 + + glib: Make NumCopies preference available in API + + Add poppler_document_get_print_n_copies() so that applications which + use poppler's glib frontend can access this preference. + + https://gitlab.freedesktop.org/poppler/poppler/issues/290 + + glib/poppler-document.cc | 51 + ++++++++++++++++++++++++++++++++++++- + glib/poppler-document.h | 2 ++ + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 53 insertions(+), 1 deletion(-) + +commit 038340faee2892b558a255a3578966df3705f69e +Author: Marek Kasik +Date: Mon Jun 3 15:03:02 2019 +0200 + + glib: Make Duplex preference available in API + + Add poppler_document_get_print_duplex() function and + PopplerPrintDuplex enum so that applications which + use poppler's glib frontend can access this preference. + + https://gitlab.freedesktop.org/poppler/poppler/issues/290 + + glib/poppler-document.cc | 66 + +++++++++++++++++++++++++++++++++++-- + glib/poppler-document.h | 23 ++++++++++++- + glib/reference/poppler-sections.txt | 3 ++ + glib/reference/poppler.types | 1 + + 4 files changed, 90 insertions(+), 3 deletions(-) + +commit fb05cab36ec1c29ea1e2f727bba95db58b692a95 +Author: Marek Kasik +Date: Wed Jan 16 12:47:38 2019 +0100 + + glib: Make print scaling getter visible + + Prefix poppler_document_get_print_scaling with POPPLER_PUBLIC + in glib/poppler-document.h. + + glib/poppler-document.h | 1 + + 1 file changed, 1 insertion(+) + +commit 5b81ab6ce06f60daa63029a3eb12cd31d6852799 +Author: Adrian Bunk +Date: Tue Aug 20 21:00:40 2019 +0300 + + Remove USE_FIXEDPOINT support + + This was already non-compiling for some time. + + Closes #821 + + CMakeLists.txt | 7 -- + config.h.cmake | 3 - + goo/FixedPoint.cc | 145 --------------------------------- + goo/FixedPoint.h | 176 + ----------------------------------------- + poppler/poppler-config.h.cmake | 5 -- + splash/Splash.cc | 30 ------- + splash/SplashFTFont.cc | 69 ---------------- + splash/SplashMath.h | 53 ++----------- + splash/SplashTypes.h | 5 +- + splash/SplashXPath.cc | 22 ------ + 10 files changed, 7 insertions(+), 508 deletions(-) + +commit d70f77ee6a1bdee8b17f08f3066c0cd685853d21 +Author: Albert Astals Cid +Date: Tue Aug 13 10:55:09 2019 +0200 + + Decrypt: take a Ref instead of two int + + poppler/Decrypt.cc | 30 +++++++++++++++--------------- + poppler/Decrypt.h | 8 ++++---- + poppler/PDFDoc.cc | 10 +++++----- + poppler/Parser.cc | 4 ++-- + 4 files changed, 26 insertions(+), 26 deletions(-) + +commit 242c53687ef5f685bb39fcc2b07d34f1443d2c75 +Author: Albert Astals Cid +Date: Tue Aug 13 10:51:47 2019 +0200 + + PDFDoc: Add some overloads that take a Ref instead of two int + + poppler/PDFDoc.cc | 44 +++++++++++++++++++++++++------------------- + poppler/PDFDoc.h | 15 ++++++++++----- + 2 files changed, 35 insertions(+), 24 deletions(-) + +commit 3a4a593146e614c31628f9327b2bc1320ac8caa5 +Author: Albert Astals Cid +Date: Tue Aug 13 10:25:09 2019 +0200 + + XRef: add XRef::add overload that takes a Ref + + poppler/PDFDoc.cc | 18 +++++++++--------- + poppler/XRef.cc | 5 +++++ + poppler/XRef.h | 1 + + 3 files changed, 15 insertions(+), 9 deletions(-) + +commit 2930542f667ac187533ec899280df4b0b7ed0ba9 +Author: Albert Astals Cid +Date: Sat Aug 10 11:54:27 2019 +0200 + + GfxPatchMeshShading::parse: Fix abort on broken files + + poppler/GfxState.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit b7d1374c1eedc32669c1608f6213bea2d7e5fb7b +Author: Albert Astals Cid +Date: Thu Aug 8 19:27:09 2019 +0200 + + Update (C) of last commit + + qt5/src/poppler-fontinfo.cc | 1 + + qt5/src/poppler-private.h | 1 + + qt5/src/poppler-qt5.h | 1 + + 3 files changed, 3 insertions(+) + +commit 623983346bb2075d572aa2d8c1757bff5b807126 +Author: Jan Grulich +Date: Wed Aug 7 07:46:29 2019 +0200 + + Add subsitute-font information to Qt bindings + + qt5/src/poppler-fontinfo.cc | 5 +++++ + qt5/src/poppler-private.h | 2 ++ + qt5/src/poppler-qt5.h | 6 ++++++ + 3 files changed, 13 insertions(+) + +commit 98a5a25d88fd919e6267fbb7bd9ef0669889f16a +Author: Dan Shea +Date: Mon Aug 5 19:59:54 2019 +0200 + + Update (C) of previous commit + + poppler/TextOutputDev.cc | 1 + + poppler/TextOutputDev.h | 1 + + utils/pdftotext.cc | 1 + + 3 files changed, 3 insertions(+) + +commit 54f799e6fda99cf0cc826884247d92c6dc36d8e7 +Author: Dan Shea <7741-dshea@users.noreply.gitlab.freedesktop.org> +Date: Thu Aug 1 22:11:44 2019 +0000 + + Add pdftotext -nodiag flag to remove diagonal text on output + + poppler/TextOutputDev.cc | 39 +++++++++++++++++++++++++++++++++------ + poppler/TextOutputDev.h | 17 ++++++++++++----- + utils/pdftotext.1 | 5 +++++ + utils/pdftotext.cc | 7 +++++-- + 4 files changed, 55 insertions(+), 13 deletions(-) + +commit d706a9ae17bbc03cc2f0b19f89f84b39571df0a6 +Author: Albert Astals Cid +Date: Thu Aug 1 23:27:27 2019 +0200 + + GfxRadialShading::parse: Fix memory leak on broken files + + poppler/GfxState.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit f3502635eed45d8783c44fdc90487786c8fc4f23 +Author: João Netto +Date: Sat Jun 29 10:44:33 2019 -0300 + + Implemented support for modifying the text appearance stream text + + poppler/Annot.cc | 2 +- + poppler/Form.cc | 19 +++++++++++++++++++ + poppler/Form.h | 6 ++++++ + qt5/src/poppler-form.cc | 8 ++++++++ + qt5/src/poppler-form.h | 10 ++++++++++ + qt5/src/poppler-private.cc | 5 +++++ + qt5/src/poppler-private.h | 2 ++ + qt5/tests/check_forms.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ + 8 files changed, 91 insertions(+), 1 deletion(-) + +commit 355fd8d58ca0209284fe568b3add28f207e995c1 +Author: Stefan Brüns +Date: Mon Aug 27 02:29:20 2018 +0200 + + SplashXPathScanner: Optionally use small_vector from boost + + Currently, each row in the intersections vector is allocated + separately, + when the first intersection is added. + + To avoid these allocations for common simple polygons, + boost::container::small_vector<4, T> is used, which stores up to + 4 intersections inline. small_vector is a header-only class. + + For the documents from #57 (fdo#96728) and #24 (fdo#78728), the + runtime/memory is significantly reduced (according to /usr/bin/time + -v): + (1) $> pdftoppm -r 18 -aa no runsforever-poppler.pdf + (2) $> pdftoppm surf-types.pdf + + Before/After + runsforever-poppler | surf-types + User time (seconds): 2348.08 / 1773.53 | 7.76 / 5.02 + Maximum resident set size (kbytes): 46288 / 45896 | 14076 / 13748 + + CMakeLists.txt | 13 +++++++++++++ + poppler/poppler-config.h.cmake | 6 ++++++ + splash/SplashXPathScanner.cc | 2 ++ + splash/SplashXPathScanner.h | 14 ++++++++++++++ + 4 files changed, 35 insertions(+) + +commit 3348f4d3cdd625b47c3a63b86f9329df3363e29f +Author: João Netto +Date: Sat Jul 20 14:50:56 2019 -0300 + + These changes were implemented in 0.79 + + qt5/src/poppler-form.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 9bbecdecc8d75a59f270ea6d7af2f22fb201c29f +Author: Albert Astals Cid +Date: Fri Jul 19 00:57:07 2019 +0200 + + Update (C) of previous commit + + qt5/src/poppler-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ff01f747788e5dfee6a30153a88999e76c7f770b +Author: Albert Astals Cid +Date: Fri Jul 19 00:42:27 2019 +0200 + + qt5: Fix MSVC build (hopefully) + + qt5/src/poppler-private.cc | 4 ++-- + qt5/src/poppler-private.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit f390d834ecbfe1350f82467d44291d0f567942ee +Author: Albert Astals Cid +Date: Wed Jul 17 17:34:15 2019 +0200 + + Simplify GfxResources::lookupPattern + + by using the new Dict::lookup that returns the Ref if the object is a + Ref + + poppler/Gfx.cc | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +commit dfcd9b8ed7f164d1fa7eb964d0944a136f646d3f +Author: Albert Astals Cid +Date: Thu Jul 18 13:54:12 2019 +0200 + + CI: install glibc-langpack-en on fedora + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit aa0f0d718300b4244e0b662f391552d6d91dd84f +Author: Albert Astals Cid +Date: Wed Jul 17 17:45:12 2019 +0200 + + cmake: Mark external lib include dirs as SYSTEM + + this way -isystem is used instead of -I which is the correct thing + to do + + CMakeLists.txt | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit 8ac28200d29c84076fe8845ffacfcf8aa1d1a0f7 +Author: Albert Astals Cid +Date: Wed Jul 17 17:43:30 2019 +0200 + + qt5: Simplify code that creates an invalid Ref + + qt5/src/poppler-annotation.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 95f5088f2fef4f0a7440c30df648d44a3b247a40 +Author: Albert Astals Cid +Date: Wed Jul 17 00:53:17 2019 +0200 + + gfree: No need to check for p != nullptr, std::free already does that + + goo/gmem.h | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 15c89ce277bddab535e5ea17081f2a87b1bcbe8a +Author: Albert Astals Cid +Date: Wed Jul 17 00:46:05 2019 +0200 + + qt5: Page::textList: Fix leak when aborting extraction + + qt5/src/poppler-page.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a57e2d47049a7f0067381dfa0c490caf946b93e0 +Author: Albert Astals Cid +Date: Wed Jul 17 00:41:52 2019 +0200 + + Link: Fix memory leak on invalid files + + poppler/Link.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 1f244751732f4036e23476cd169f1e1e564b4cd5 +Author: Albert Astals Cid +Date: Tue Jul 16 00:34:02 2019 +0200 + + Poppler 0.79.0 + + CMakeLists.txt | 2 +- + NEWS | 16 ++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 20 insertions(+), 4 deletions(-) + +commit 68ef84e5968a4249c2162b839ca6d7975048a557 +Author: Albert Astals Cid +Date: Mon Jul 15 23:24:22 2019 +0200 + + JPXStream::init: ignore dict Length if clearly broken + + Fixes issue #805 + + poppler/JPEG2000Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b224e2f5739fe61de9fa69955d016725b2a4b78d +Author: Albert Astals Cid +Date: Mon Jul 15 22:11:09 2019 +0200 + + SplashOutputDev::tilingPatternFill: Fix crash on broken file + + Issue #802 + + poppler/SplashOutputDev.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 2d191b49ea074cc69ba4c68a572f26c8bdb55abd +Author: Albert Astals Cid +Date: Wed Jul 10 01:10:22 2019 +0200 + + Fix mistake on 093531cd0d0878b892d92ebc56c26936e5de3712 + + These i should have been j too + + poppler/TextOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bf7d1b7daa7c573237884f42f28d38ce335ea49b +Author: Albert Astals Cid +Date: Tue Jul 9 00:04:48 2019 +0200 + + Update (C) of last commit + + poppler/Annot.cc | 1 + + poppler/Annot.h | 1 + + qt5/src/poppler-form.cc | 1 + + qt5/src/poppler-form.h | 1 + + qt5/src/poppler-private.cc | 1 + + qt5/src/poppler-private.h | 1 + + 6 files changed, 6 insertions(+) + +commit 04e8309d18fa2f90ed93930e7eb689e523c7eb44 +Author: João Netto +Date: Mon Jul 8 20:43:19 2019 -0300 + + Added option to set the form available to print + + qt5/src/poppler-form.cc | 16 ++++++++++++++++ + qt5/src/poppler-form.h | 12 ++++++++++++ + qt5/tests/check_forms.cpp | 20 ++++++++++++++++++++ + 3 files changed, 48 insertions(+) + +commit 6afe59eb8bcb223d28eef5bb364ebb4d35ed0f59 +Author: João Netto +Date: Tue Jun 11 19:06:01 2019 -0300 + + Implemented support for setIcon by changing appearance + + Added test for setIcon + + Made changes to be more inline with API. + + poppler/Annot.cc | 13 +++++++++- + poppler/Annot.h | 1 + + qt5/src/poppler-form.cc | 58 + ++++++++++++++++++++++++++++++++++++++++++++ + qt5/src/poppler-form.h | 39 ++++++++++++++++++++++++++++++ + qt5/src/poppler-private.cc | 8 ++++++- + qt5/src/poppler-private.h | 8 +++++++ + qt5/tests/check_forms.cpp | 60 + ++++++++++++++++++++++++++++++++++++++++++++++ + 7 files changed, 185 insertions(+), 2 deletions(-) + +commit 37659c01087eb8b25a5a593268f1acf52e6624f7 +Author: Albert Astals Cid +Date: Thu Jul 4 11:06:24 2019 +0200 + + Account for verticesA possible overflow in + GfxGouraudTriangleShading::parse + + fixes oss-fuzz file abort + + poppler/GfxState.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit e69dc7a5a44c1c3fb97023d44e9e99a2bca75a46 +Author: Albert Astals Cid +Date: Wed Jul 3 16:18:43 2019 +0200 + + TextOuputDev: Fix crash when grealloc would overflow + + Introduces a new greallocn variant that doesn't free the pointer + passed + in case of error, since the pointer holds pointers inside, that would + lead to leak of all those pointers + + goo/gmem.h | 12 ++++++++---- + poppler/TextOutputDev.cc | 13 +++++++++---- + 2 files changed, 17 insertions(+), 8 deletions(-) + +commit ee7f64083109b18e09b50c0a35136060f7495dbe +Author: Albert Astals Cid +Date: Thu Jul 4 01:01:28 2019 +0200 + + Add a template asking people to check the merge option + + .gitlab/merge_request_templates/merge_request_template.md | 3 +++ + 1 file changed, 3 insertions(+) + +commit 8d2484c25564b67061031da5c900a8757e30dddc +Author: Federico Mena Quintero +Date: Wed Jul 3 20:26:59 2019 +0000 + + Turn README into README.md and expand it + + README | 39 ----------------------- + README.md | 107 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 107 insertions(+), 39 deletions(-) + +commit a8dd0a5909c8902881fc382fa52eda462905979d +Author: Albert Astals Cid +Date: Wed Jul 3 14:10:13 2019 +0200 + + qt5: replace deprecated qStableSort with std::stable_sort + + qt5/src/poppler-optcontent.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cf629d6f829d1371b86fc654891ca83533b0542e +Author: Albert Astals Cid +Date: Wed Jul 3 14:06:09 2019 +0200 + + QString::null is deprecated, use QString() + + qt5/src/poppler-page.cc | 2 +- + qt5/src/poppler-qt5.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 4ed864b2c412a3f887973c2873104169909bec1b +Author: Albert Astals Cid +Date: Wed Jul 3 14:02:23 2019 +0200 + + Update (C) after last commit + + poppler/Function.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 245abada13cf9841c5ad716e814799343f3562df +Author: Albert Astals Cid +Date: Mon Jul 1 12:00:12 2019 +0200 + + Change Function::getToken return a GooString instead of a pointer + + Makes the calling code simpler, also no need to check for null + since the + function was never returning null anyway + + Fixes a memory leak since some of the conditions were missing a delete + tok call + + poppler/Function.cc | 63 + ++++++++++++++++------------------------------------- + poppler/Function.h | 2 +- + 2 files changed, 20 insertions(+), 45 deletions(-) + +commit ccfaa9dc0f8929d9ec49d8f49ad017cdd06ee5cb +Author: Tobias Deiminger +Date: Mon Jul 1 23:23:01 2019 +0200 + + Add unit test for class DefaultAppearance + + qt5/tests/check_annotations.cpp | 40 + ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +commit 68b74ab18016520f755bf8bc35e9804fe378ad91 +Author: Tobias Deiminger +Date: Mon Jul 1 23:10:48 2019 +0200 + + Fix bad cast of GooString* to const char* in DefaultAppearance + + Casting GooString* to const char* was probably a reminder from a time + where GooString layout had been under poppler control. + Nowadays GooString derives from std::string and we must not rely upon + the memory layout. + + The bug leads to DefaultAppearance::getFontName() always returning an + invalid Object. The offending code is reachable via + AnnotFreeText::generateFreeTextAppearance. + + poppler/Annot.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 080a79b47c643ccf68d4be1b49ec6062d0b8ba36 +Author: Daniel Schaefer +Date: Thu Jun 27 18:11:44 2019 +0200 + + Convert all files to UTF-8 + + They were ISO-8859 before. + + README-XPDF | 2 +- + poppler/Function.cc | 2 +- + poppler/OutputDev.h | 4 ++-- + poppler/SplashOutputDev.h | 4 ++-- + splash/Splash.h | 2 +- + splash/SplashBitmap.cc | 2 +- + splash/SplashBitmap.h | 2 +- + 7 files changed, 9 insertions(+), 9 deletions(-) + +commit 6a9b1f794e7c86e61f2b642f401788659c5a93d6 +Author: Albert Astals Cid +Date: Thu Jun 27 00:36:41 2019 +0200 + + Poppler 0.78.0 + + CMakeLists.txt | 4 ++-- + NEWS | 21 +++++++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 26 insertions(+), 5 deletions(-) + +commit 67c6f6025fd441e60b3bdcedcfae7121d6f80b30 +Author: Albert Astals Cid +Date: Wed Jun 26 22:53:44 2019 +0200 + + Add Jose (C) and move error() message as discussed in gitlab + + poppler/Annot.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit a24536c619a463763517401045eaf251190c7db0 +Author: José Aliste +Date: Tue Jun 25 21:32:24 2019 -0400 + + Handle Ink annots without an InkList but with an AP + According to the pdf spec, the AP entry should take + precedence over the InkList entry. Thus, it is safe + to render Ink annots with an AP entry but missing + an InkList entry. This fixes rendering of some + Onyx Generated files. + + poppler/Annot.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit a4d3db87c3bae5e2a364c828479a6cbb0277069e +Author: Albert Astals Cid +Date: Sun Jun 9 20:18:54 2019 +0200 + + Add AnnotWidget::setFormAdditionalAction + + And the corresponding Form helper + + refactor the code that gets the char * from + Annot::FormAdditionalActionsType to a function + + poppler/Annot.cc | 36 ++++++++++++++++++++++++++++++++---- + poppler/Annot.h | 2 ++ + poppler/Form.cc | 7 +++++++ + poppler/Form.h | 3 ++- + 4 files changed, 43 insertions(+), 5 deletions(-) + +commit f5e49ed4c604e735ee26427eb1a46536938ed80c +Author: Albert Astals Cid +Date: Sun Jun 9 20:15:47 2019 +0200 + + Add LinkJavaScript::createObject + + Creates an Object that represents a a LinkJavaScript with the + given text + + poppler/Link.cc | 9 +++++++++ + poppler/Link.h | 2 ++ + 2 files changed, 11 insertions(+) + +commit 4867583bf4a26566fd20345c45280ea21254c89c +Author: Albert Astals Cid +Date: Sun Jun 9 18:43:24 2019 +0200 + + Annot: Move implementation of getFormAdditionalAction + + No idea why it was implemented as a static, it's not reused or + anything + + poppler/Annot.cc | 34 +++++++++++++++------------------- + 1 file changed, 15 insertions(+), 19 deletions(-) + +commit f4733c31389fe7fd3ef70af86df4eee865ba3660 +Author: Albert Astals Cid +Date: Fri Jun 21 19:46:51 2019 +0200 + + Enable shadow warning by default + + It's always a bad idea having multiple variables with the same name, + so complain if that happens + + cmake/modules/PopplerMacros.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5c22d88ecdd540dbec5d559d8659c02d54662303 +Author: Albert Astals Cid +Date: Fri Jun 21 20:05:56 2019 +0200 + + qt5: rename variable to fix shadow warning + + qt5/src/poppler-page.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 56582f515667074ea5d53b7eae1f9451756bb697 +Author: Albert Astals Cid +Date: Fri Jun 21 20:02:27 2019 +0200 + + Splash: Rename local variable to fix shadow warning + + splash/Splash.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 9de727a969896c5b43f2370c1fb3a1a011bc7ee3 +Author: Albert Astals Cid +Date: Fri Jun 21 19:41:30 2019 +0200 + + glib: Rename variable to make it more clear what it is + + also fixes shadow warning + + glib/poppler-page.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7095bc54cd3d11356870be48c10946dc55c350a8 +Author: Albert Astals Cid +Date: Fri Jun 21 19:29:57 2019 +0200 + + CairoOuputDev: Rename some input variables + + Fixes shadow warnings and in some cases makes for better C++ code + not using this-> + + poppler/CairoOutputDev.cc | 52 + +++++++++++++++++++++++------------------------ + 1 file changed, 26 insertions(+), 26 deletions(-) + +commit e62c83a88fec28aec9bdcdb210abcd8d84034c7b +Author: Albert Astals Cid +Date: Fri Jun 21 19:22:32 2019 +0200 + + rename text member to textPage + + reflects better what it is and fixes several shadow warnings + + poppler/CairoOutputDev.cc | 40 ++++++++++++++++++++-------------------- + poppler/CairoOutputDev.h | 4 ++-- + 2 files changed, 22 insertions(+), 22 deletions(-) + +commit 536ec92bc2ef34b6b137cf73f5e9e15a1010eb55 +Author: Albert Astals Cid +Date: Fri Jun 21 19:10:35 2019 +0200 + + GfXShading: Prepend some variables with bbox_ + + Makes it clear those variables are only about the bbox, also fixes + shadow warnings + + poppler/GfxState.cc | 18 +++++++++--------- + poppler/GfxState.h | 4 ++-- + 2 files changed, 11 insertions(+), 11 deletions(-) + +commit 8ec3c11697a4ed735b2a9d0ee1d759e42d7c6246 +Author: Albert Astals Cid +Date: Fri Jun 21 18:57:00 2019 +0200 + + GfxFont: Rename local variable cmap to cnameCmap + + Fixes shadow warning + + poppler/GfxFont.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 7b088899d97981a9cd62f68fd632d7394f10c9d7 +Author: Albert Astals Cid +Date: Fri Jun 21 18:46:34 2019 +0200 + + TextOutputDev: break i definition into multiple ones + + Fixes shadow warning + + poppler/TextOutputDev.cc | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 9cea7a935e608828ef8957aeefbb3539f4f63ae5 +Author: Albert Astals Cid +Date: Fri Jun 21 18:35:19 2019 +0200 + + Annot: Rename dx and dy + + Fixes shadow warning + + poppler/Annot.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 4e225788ec5d500d4f71d7abe8163517bfeadea0 +Author: Albert Astals Cid +Date: Fri Jun 21 18:33:20 2019 +0200 + + Annot: rename one i and one j to k + + fixes shadow warning + + poppler/Annot.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 2b73efb5d4aafdca90c892ed61c26bf3a98d87cf +Author: Albert Astals Cid +Date: Fri Jun 21 18:29:01 2019 +0200 + + Annot: break out a i definition into multiple + + fixes shadow warning + + poppler/Annot.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 4d9fa84efd7b757f90cd36353c20ba033d6a2204 +Author: Albert Astals Cid +Date: Fri Jun 21 18:24:05 2019 +0200 + + Annot: Rename three type to a longer more qualified name + + Fixes shadow warnings + + poppler/Annot.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 40f5c496016ba94c9a27e31c5d1afb8e1a366de5 +Author: Albert Astals Cid +Date: Fri Jun 21 18:18:47 2019 +0200 + + coords -> coordsA + + fixes shadow warning + + poppler/Annot.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d669e12a537e84d0de5b5f478a14dd00d96ed790 +Author: Albert Astals Cid +Date: Fri Jun 21 16:56:13 2019 +0200 + + Annot: rect -> rectA in constructor parameters + + fixes shadow warning + + poppler/Annot.cc | 76 + ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 38 insertions(+), 38 deletions(-) + +commit 093531cd0d0878b892d92ebc56c26936e5de3712 +Author: Albert Astals Cid +Date: Fri Jun 21 16:43:50 2019 +0200 + + TextOutputDev: Don't a loop with variable i inside a loop with + variable i + + poppler/TextOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9e3c9bdf8988dcfe00977350428220640073d058 +Author: Albert Astals Cid +Date: Fri Jun 21 16:42:57 2019 +0200 + + TextOutputDev: rename two in variables to fix shadow warning + + poppler/TextOutputDev.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 2690e42e4d8fcfd9a815443eb0686fb0c3db4ca0 +Author: Tobias Deiminger +Date: Mon May 6 10:04:04 2019 +0200 + + Fix line annotation arrows for usage in dimensioning + + By combining leader lines with arrow/slash endings, one can use + AnnotLine for dimensioning (e.g. see Line Annotation key IT = + LineDimension in PDF reference). Current drawing instructions didn't + consider this use case. The combination of leader line with + ROpenArrow, + RClosedArrow and Slash looked poor because arrows were shifted to the + inside of the leader strokes. Additionally the main segment was not + shortened correctly for some arrow types. + + This fixes the mentioned issues for AnnotLine and AnnotPolygon. + + poppler/Annot.cc | 115 + +++++++++++++++++++++++++++++++------------------------ + poppler/Annot.h | 4 +- + 2 files changed, 66 insertions(+), 53 deletions(-) + +commit c621269e0b9923f4b7ad6862436838ccdf68bd7f +Author: Albert Astals Cid +Date: Wed Jun 19 22:44:46 2019 +0200 + + Initialize Function::domain + + Fixes uninitialized memory read in oss-fuzz 15395 + + poppler/Function.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fe83564018d4af9ae093b3ef09cc69c112482c7f +Author: Albert Astals Cid +Date: Wed Jun 19 19:44:27 2019 +0200 + + Update (C) of last commit + + poppler/Movie.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 7dd5405d98857e684c46a27a1abde93ba171f313 +Author: Evgeny Stambulchik +Date: Wed Jun 19 08:57:55 2019 +0000 + + Fix typos preventing parsing of start&duration + + poppler/Movie.cc | 82 + +++++++++++++++++++++++++++----------------------------- + 1 file changed, 39 insertions(+), 43 deletions(-) + +commit 53c4afce86d506a1ed050667da6982dda92da290 +Author: Albert Astals Cid +Date: Sun Jun 9 20:48:11 2019 +0200 + + Remove Annot::xref + + Makes no sense to store xref if it's just doc->getXRef and we're also + storing doc + + It saves up some memory and also makes the code easier to read + since storing + both doc and ref may make you think that ref at some point could be + different than doc->getXRef but it isn't + + poppler/Annot.cc | 73 + ++++++++++++++++++++++++++++---------------------------- + poppler/Annot.h | 4 +--- + 2 files changed, 37 insertions(+), 40 deletions(-) + +commit 58994c211d525705136d045d8b9b8839197481f4 +Author: Albert Astals Cid +Date: Sun Jun 9 20:37:21 2019 +0200 + + Remove AnnotAppearance::xref + + We can just get it from the doc when needed + + poppler/Annot.cc | 3 +-- + poppler/Annot.h | 1 - + 2 files changed, 1 insertion(+), 3 deletions(-) + +commit a9bf48780660b855135d2435c7dd29dddb3d45c0 +Author: Albert Astals Cid +Date: Fri Jun 7 17:08:10 2019 +0200 + + FormField::getFullyQualifiedName: Rename variable + + fixes shadow warning + + poppler/Form.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 5d9eebbf4b31ef3124015d7ac4e5d9723b91a042 +Author: Albert Astals Cid +Date: Fri Jun 7 17:07:06 2019 +0200 + + FormField::_createWidget: Rename parameter to fix shadow warning + + poppler/Form.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit fb8093dd3ac116d382b9cea9b940d59be89bd304 +Author: Albert Astals Cid +Date: Fri Jun 7 17:06:10 2019 +0200 + + FormWidgetSignature::getSignedRangeBounds: obj -> byteRangeObj + + poppler/Form.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 126c9883cf62d59a2cb4818e699f7d0ab19f4519 +Author: Albert Astals Cid +Date: Fri Jun 7 16:56:01 2019 +0200 + + Form: add A to some constructor parameters to avoid shadow warnings + + poppler/Form.cc | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +commit c148085564edf90760cab47a9363b1c868a5322c +Author: Albert Astals Cid +Date: Fri Jun 7 16:48:54 2019 +0200 + + FormWidget::getAdditionalAction: Rename parameter to fix shadow + warning + + poppler/Form.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7f87a3a309f30d67e04d365105a479e53ebe814b +Author: Albert Astals Cid +Date: Fri Jun 7 16:46:49 2019 +0200 + + Fix last two shadow warnings in PSOutputDev + + Don't pass doc to writeDocSetup, we already have it + Rename writeDocSetup pages to pageList + + poppler/PSOutputDev.cc | 10 +++++----- + poppler/PSOutputDev.h | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit e3a09f02fa1b4ac9197b704fee10233b6386cd99 +Author: Albert Astals Cid +Date: Thu Jun 6 14:21:15 2019 +0200 + + scale -> s + + to not collide with the scale member variable + + poppler/TextOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 366685602e953354c3818cff185fa7e00f1afb64 +Author: Albert Astals Cid +Date: Wed Jun 5 21:19:58 2019 +0200 + + page -> p + + fixes shadow warnings, doesn't make code harder to read, it's + in trivial + functions + + poppler/TextOutputDev.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit c7981a19fab9abf8df31e67c87aa7710fdf60bc7 +Author: Albert Astals Cid +Date: Wed Jun 5 21:13:46 2019 +0200 + + text -> t + + Fixes some shadow warnings + + poppler/TextOutputDev.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 024dd8d2bd58ded2457581fc2e6eea5ecc664c45 +Author: Albert Astals Cid +Date: Wed Jun 5 21:10:26 2019 +0200 + + adjustLine -> doAdjustLine + + fixes shadow warning + + splash/Splash.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f9ab3afbb4c1129813eec68c5914ad1796484daf +Author: Albert Astals Cid +Date: Wed Jun 5 20:55:54 2019 +0200 + + Fix shadow warning in PSOutputDev::tilingPatternFill + + poppler/PSOutputDev.cc | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 6b39c1e8c4f13219e0ed5a7545e930136ccbfec5 +Author: Albert Astals Cid +Date: Wed Jun 5 20:45:28 2019 +0200 + + Rename fontMaxValidGlyph map to perFontMaxValidGlyph + + poppler/PSOutputDev.cc | 4 ++-- + poppler/PSOutputDev.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 277ce8b4455842d3ddc812a10636603a2d92cf90 +Author: Albert Astals Cid +Date: Wed Jun 5 20:34:02 2019 +0200 + + PSOutputDev::writeHeader: pass int instead of vector + + it's what we really need and fixes shadow warning + + poppler/PSOutputDev.cc | 8 ++++---- + poppler/PSOutputDev.h | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit bd6a0c584ce48accc1351fd651e7bafa6003140b +Author: Albert Astals Cid +Date: Wed Jun 5 20:29:29 2019 +0200 + + PSOutputDev: psTitle -> title as a function parameter + + fixes shadow warning + + poppler/PSOutputDev.cc | 6 +++--- + poppler/PSOutputDev.h | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 55ac94ac16a6b1750059ac606a12fc549239229d +Author: Albert Astals Cid +Date: Wed Jun 5 20:08:04 2019 +0200 + + HtmlOutputDev: rename variables to not collide with existing ones + + makes reading the code easier + + utils/HtmlOutputDev.cc | 42 +++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +commit 0c78e1efb6752161b8ed97b03e8d4f44827fca17 +Author: Albert Astals Cid +Date: Thu May 16 15:13:12 2019 +0200 + + -Wshadow renaming in perf-test + + test/perf-test.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 89bd3f1f1d60a99a8a3bb7ccd384a5e6e731e0d4 +Author: Albert Astals Cid +Date: Thu May 16 15:12:05 2019 +0200 + + HtmlOutputDev::checkPageSlice: rename Page *page to p + + To not collide with FILE *page + + utils/HtmlOutputDev.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e56461bb8208ad028c2c1673e80a2a23e3eef795 +Author: Albert Astals Cid +Date: Fri Apr 5 17:07:52 2019 +0200 + + AnnotInk(): Rename inkList to inkListArray + + to not collide with AnnotInk::inkList + + poppler/Annot.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 20cb86345288063294532c03b123c1f08921ff93 +Author: Albert Astals Cid +Date: Fri Apr 5 17:06:06 2019 +0200 + + Configuration(): Rename name to subtypeName + + to not collide with Configuration::name + + poppler/Annot.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 32eed048980ae480e6671fe272c6b9037d1cd0e7 +Author: Albert Astals Cid +Date: Fri Apr 5 17:04:42 2019 +0200 + + Annot::initialize: Rename ref to pRef to not collide with Annot::ref + + poppler/Annot.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 40e999471ecfcb42804c00a3c9ff31677d8838df +Author: Albert Astals Cid +Date: Fri Mar 29 17:51:02 2019 +0100 + + GfxDeviceNColorSpace::copy: Move i inside loop + + poppler/GfxState.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 2e824cd8aa6c743219d6d22f266e33cc7c2d98f8 +Author: Albert Astals Cid +Date: Fri Mar 29 17:44:31 2019 +0100 + + GlobalParams: Fix shadow warnings + + poppler/GlobalParams.cc | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +commit 6c16dacc28d975cf3f78ac6b34612f1900c43e74 +Author: Albert Astals Cid +Date: Fri Mar 29 17:44:12 2019 +0100 + + StructElement::parseAttributes: Fix shadow warning + + poppler/StructElement.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 42b417547e963d150e1e786e2fa503130ff72184 +Author: Albert Astals Cid +Date: Fri Mar 29 17:38:21 2019 +0100 + + Dict: Use the that pattern for a non-const this + + poppler/Dict.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 71830663e816a90841a2534ecc21a0923ab9dbba +Author: Albert Astals Cid +Date: Fri Mar 29 17:43:42 2019 +0100 + + ArthurOutputDev: Fix shadow warning + + qt5/src/ArthurOutputDev.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 3d410e44ab50f064671f6b3c72f7e7eb8d015aeb +Author: Albert Astals Cid +Date: Fri Mar 29 17:42:52 2019 +0100 + + gtk-test.cc: Rename variable to fix shadow warning + + test/gtk-test.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0593f2567c3887b9323bb7c73f6b62748b44722a +Author: Albert Astals Cid +Date: Fri Mar 29 17:40:36 2019 +0100 + + OutlineItemData: Rename constructor params + + Fixes shadow warning + + qt5/src/poppler-outline-private.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 0d56b4665ab296e8f152f1203ac11f5d21ecf36c +Author: Albert Astals Cid +Date: Fri Mar 29 17:40:03 2019 +0100 + + Splash::makeDashedPath: Remove i declaration in for + + We already have one above and this causes a shadow warning + + splash/Splash.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 61611e9d1db881fdeec730671d092a5144e51533 +Author: Albert Astals Cid +Date: Wed Jun 5 20:22:02 2019 +0200 + + PSOutputDev: Move variable declaration inside loop + + fixes shadow warning + + poppler/PSOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0eb72dbf3f8f8981b67c6641aca6844bf255ef15 +Author: Albert Astals Cid +Date: Wed Jun 5 20:19:41 2019 +0200 + + PSOuputDev: Rename rotate local variable to pageRotate + + fixes shadow warning + + poppler/PSOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6831a1ebdc0f3a2d00d64cb979cfe5eccce5da5f +Author: Albert Astals Cid +Date: Wed Jun 5 20:16:18 2019 +0200 + + PSOutputDev: rename variables to make things less confusing + + fixes shadow warnings + + poppler/PSOutputDev.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 18a60f394e13cbf82e35daf47d563abcbb01dd25 +Author: Albert Astals Cid +Date: Fri Mar 29 17:39:04 2019 +0100 + + SplashOutputDev::drawSoftMaskedImage: Rename n to fix shadow warning + + poppler/SplashOutputDev.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c12e4e0592bb44a4fbacb77ff0e744fd999f3fb4 +Author: Christian Persch +Date: Wed May 29 11:13:41 2019 +0200 + + glib: docs: Add index for API new in 0.78 + + glib/reference/poppler-docs.sgml | 4 ++++ + 1 file changed, 4 insertions(+) + +commit db1626d5210493a9e77cc6575383b566ae5e07f6 +Author: Masamichi Hosoda +Date: Mon Oct 8 19:02:10 2018 +0900 + + Add poppler_document_create_dests_tree() to glib frontend + + Creates named destinations balanced binary tree in document. + + glib/poppler-document.cc | 85 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-document.h | 3 ++ + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 89 insertions(+) + +commit d1f1a354d512645c616941b56aaf30641e89959f +Author: Simon McVittie +Date: Tue May 28 12:37:24 2019 +0100 + + glib: Document G_IO_ERROR as a possible error condition + + This was already implicit from G_IO_ERROR_NOT_SUPPORTED being a + documented error condition, and from the use of GCancellable, but is + probably clearer when spelled out explicitly. The addition of + g_seekable_seek() and g_seekable_tell() in the previous commit might + add more error conditions in the same domain. + + Signed-off-by: Simon McVittie + + glib/poppler-document.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit aa432bc0be1a8b9f74b85ae78590f11dc6949c8b +Author: Simon McVittie +Date: Thu Feb 14 09:43:32 2019 +0000 + + glib: Don't create PopplerInputStream with length 0 + + Since commit a59f6164, PopplerInputStream requires a nonzero length. + + Loosely based on an earlier patch by Kouhei Sutou. This version adds + support for length == -1, which is documented to work. + + Resolves: https://gitlab.freedesktop.org/poppler/poppler/issues/414 + Bug-Debian: https://bugs.debian.org/896596 + + glib/poppler-document.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 9481c4733db409c755afee6de0cb784934267dc3 +Author: maxice8 +Date: Fri Feb 8 16:01:59 2019 -0200 + + glib: pass poppler to gir libs. + + Fixes cross compilation of gir in Void Linux + + [ 85%] Generating Poppler-0.18.gir + g-ir-scanner: link: aarch64-linux-gnu-gcc -o + /builddir/poppler-0.74.0/build/glib/tmp-introspectfs1jd4m9/Poppler-0.18 + -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 + -pipe -march=armv8-a -I/usr/aarch64-linux-gnu/usr/include + /builddir/poppler-0.74.0/build/glib/tmp-introspectfs1jd4m9/Poppler-0.18.o + -L. -Wl,-rpath,. -Wl,--no-as-needed -L/builddir/poppler-0.74.0/build + -Wl,-rpath,/builddir/poppler-0.74.0/build + -L/builddir/poppler-0.74.0/build/glib + -Wl,-rpath,/builddir/poppler-0.74.0/build/glib -lpoppler-glib + -lgio-2.0 -lgobject-2.0 -Wl,--export-dynamic -lgmodule-2.0 + -pthread -lglib-2.0 -Wl,-z,relro -Wl,-z,now -Wl,--as-needed + -L/usr/aarch64-linux-gnu/usr/lib + /usr/lib/gcc/aarch64-linux-gnu/8.2.0/../../../../aarch64-linux-gnu/bin/ld: + warning: libpoppler.so.85, needed by ./libpoppler-glib.so, not found + (try using -rpath or -rpath-link) + /usr/lib/gcc/aarch64-linux-gnu/8.2.0/../../../../aarch64-linux-gnu/bin/ld: + ./libpoppler-glib.so: undefined reference to + `FormWidgetText::noSpellCheck() const' + + glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c250cbd2ef18aca9748e2e8d753a2cb414f6f1d9 +Author: zdenop +Date: Mon Apr 29 18:06:57 2019 +0200 + + install pkg-config pc files if pkg-config is found + + CMakeLists.txt | 35 + +++++++++++++++++++---------------- + cmake/modules/PopplerMacros.cmake | 6 ++---- + 2 files changed, 21 insertions(+), 20 deletions(-) + +commit ce8f750d8dcd029dc5a3a60e2ac1d0b16fd27ebf +Author: Christian Persch +Date: Sun May 26 18:50:38 2019 +0200 + + glib: Fix introspection for poppler_document_new_from_data + + The API takes binary data, not an UTF-8 string. + + https://gitlab.freedesktop.org/poppler/poppler/issues/448 + + glib/poppler-document.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 90ddcddc7f4ce7a8ad4a5d02a7c7a4b9872c383a +Author: Federico Mena Quintero +Date: Fri May 24 10:12:59 2019 -0500 + + glib: Don't use the deprecated g_type_class_add_private() + + Use G_DEFINE_TYPE_WITH_PRIVATE() instead. This has been available + since glib 2.38, and poppler requires glib 2.41 already. + + glib/poppler-attachment.cc | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +commit 970e14c6c9c05b669a512adfce6421a747f54c71 +Author: Federico Mena Quintero +Date: Fri May 24 13:06:22 2019 -0500 + + glib: Document the differences between render() and + render_for_printing() - #749 + + I got these by grepping for "printing" in the source code, and trying + to summarize the differences between rendering to the screen and + rendering to a printer. Hopefully these are all the important ones. + + Fixes https://gitlab.freedesktop.org/poppler/poppler/issues/749 + + glib/poppler-page.cc | 38 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 36 insertions(+), 2 deletions(-) + +commit 13eddb110671cb9809fc21558b45db2a775a172b +Author: Albert Astals Cid +Date: Sat May 25 00:41:38 2019 +0200 + + Poppler 0.77.0 + + CMakeLists.txt | 6 +++--- + NEWS | 17 +++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 22 insertions(+), 5 deletions(-) + +commit 89a5367d49b2556a2635dbb6d48d6a6b182a2c6c +Author: Albert Astals Cid +Date: Thu May 23 00:54:29 2019 +0200 + + JPEG2000Stream: fail gracefully if not all components have the + same WxH + + I think this is just a mistake, or at least the only file we have with + this scenario is a fuzzed one + + poppler/JPEG2000Stream.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 65adf225eca287f63361cf49bd47388bff81af79 +Author: Albert Astals Cid +Date: Thu May 16 17:20:55 2019 +0200 + + qt5: Fix optional content handling with exclusive layers + + We were setting the "ui" value correctly, but not the "backend" one + because we were shortcuting on obeyRadioGroups for the off state + + Update test to check also for the backend value + + qt5/src/poppler-optcontent-private.h | 4 +++- + qt5/src/poppler-optcontent.cc | 10 ++++++---- + qt5/tests/check_optcontent.cpp | 10 ++++++++++ + 3 files changed, 19 insertions(+), 5 deletions(-) + +commit 157c723c0465bfa509dc499be46f3d6b8e3c7048 +Author: Albert Astals Cid +Date: Thu May 16 17:19:48 2019 +0200 + + OptionalContent: add some simple const + + poppler/OptionalContent.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 019cb4a6a908e7ad9959673e21168d6479892603 +Author: Albert Astals Cid +Date: Wed May 15 23:30:42 2019 +0200 + + Update (C) of previous commits + + cpp/poppler-page-renderer.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit 0477707248bb62404961a08e75ecaf106529e7e1 +Author: Oliver Sander +Date: Thu Apr 25 21:33:30 2019 +0200 + + Call updateCTM with the identity matrix instead of all zeros + + The method Gfx::doShowText calls out->updateCTM once with the all-zero + matrix. This was apparently implemented with the Splash output device + in mind: SplashOutputDev::updateCTM ignores its parameters, and + therefore calling it with a zero matrix is okay. For other output + devices calling updateCTM with a zero matrix multiplies the CTM + with zero, which breaks further rendering. See + + https://gitlab.freedesktop.org/poppler/poppler/issues/206 + + for an example. + + This patch changes the argument to updateCTM in doShowText + from the zero matrix to an identity matrix. That way, the CTM + is unchanged no matter how the output device implements its + updateCTM method. + + poppler/Gfx.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 792da2e1e08671ba0e9d01c8714bd1747861701f +Author: Julián Unrrein +Date: Tue May 14 15:42:08 2019 -0300 + + cpp: Change displayPageSlice parameter to make render_page thread-safe + + This allows applications to render different pages on different + threads + + cpp/poppler-page-renderer.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 9433b6c9c37dcfc82f074230881a98808b2300ab +Author: Albert Astals Cid +Date: Tue May 14 19:41:53 2019 +0200 + + Update (C) of previous commit + + splash/Splash.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 6a1580e84f492b5671d23be98192267bb73de250 +Author: Marek Kasik +Date: Mon May 13 15:08:38 2019 +0200 + + Splash: Restrict filling of overlapping boxes + + Check whether area to fill in Splash::blitTransparent() + does not run out of allocated memory for source and for destination + and shrink it if needed. + + Fixes #750 + + splash/Splash.cc | 48 +++++++++++++++++++++++++++++++++--------------- + 1 file changed, 33 insertions(+), 15 deletions(-) + +commit 03c0bb79945822cbe1e342a28aec8949eed843dd +Author: Albert Astals Cid +Date: Fri May 10 23:45:12 2019 +0200 + + Fix small memory leak in SignatureHandler::getCertificateInfo + + poppler/SignatureHandler.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit eaeac5c7dba6f53acef3f0be6b226facecfc5f28 +Author: Albert Astals Cid +Date: Fri May 10 23:28:02 2019 +0200 + + Fix crash on signature handling + + Since we only call NSS_Init once, we should only call NSS_Shutdown + once. + + Do it via atexit + + Fixes issue #766 + + poppler/SignatureHandler.cc | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit d06b96171260e8f3fd7c12c028f763c0f110a803 +Author: Albert Astals Cid +Date: Fri May 10 22:51:43 2019 +0200 + + pdfsig: Fix small memory leak + + When document is not fully signed + + utils/pdfsig.cc | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 2709ff2e809a47631f3bd58bd86a65611c70bbe5 +Author: Sebastian Berger +Date: Fri May 3 10:27:10 2019 +0000 + + Update pdftotext.1 + + utils/pdftotext.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 248540fbe44886f7ede290c216822df21ad06d7d +Author: Albert Astals Cid +Date: Wed May 1 00:05:14 2019 +0200 + + Poppler 0.76.1 + + CMakeLists.txt | 2 +- + NEWS | 12 ++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 15 insertions(+), 3 deletions(-) + +commit fe744fedb2757c6a6b69a5a7a30cab8b7e448cc5 +Author: Oliver Sander +Date: Tue Apr 30 12:36:37 2019 +0200 + + Fix some typos in build system output and comments + + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 0d0630cd6f10d0586172b740290056620fe56b21 +Author: Albert Astals Cid +Date: Sun Apr 28 19:25:08 2019 +0200 + + qt5: Fix regression in annotation handling + + qt5/src/poppler-annotation.cc | 2 +- + qt5/tests/check_annotations.cpp | 18 ++++++++++++++++++ + 2 files changed, 19 insertions(+), 1 deletion(-) + +commit b49d16a47388e03aa1a56ba64a47751aa993e06a +Author: Albert Astals Cid +Date: Thu Apr 25 22:31:33 2019 +0200 + + Update (C) of two previous commits + + poppler/Decrypt.cc | 2 +- + poppler/Gfx.cc | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit e0ef346c0f669140076c4cf443f07ea0770996da +Author: Albert Astals Cid +Date: Fri Sep 21 00:32:24 2018 +0200 + + Make the mul tables be calculated at compile time with constexpr + + poppler/Decrypt.cc | 134 + +++++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 99 insertions(+), 35 deletions(-) + +commit 9186cf25d03cd680381dde9766e12310269bbf69 +Author: Oliver Sander +Date: Thu Apr 25 21:27:04 2019 +0200 + + Fix a typo in an error message + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 62f945272dd9c4d8c8febb13b38fb7c5c331c1f4 +Author: William Bader +Date: Tue Apr 23 00:57:18 2019 +0200 + + Handle splashModeDeviceN8 in two switch + + poppler/SplashOutputDev.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 3b40194971cb3fcfc63fc238ebab81a1d54fa1e9 +Author: Albert Astals Cid +Date: Mon Apr 22 13:05:08 2019 +0200 + + Remove unused functions + + poppler/SplashOutputDev.cc | 48 + ---------------------------------------------- + 1 file changed, 48 deletions(-) + +commit 16f34af3cda7f8e5647c50027ed032952d9afe0e +Author: Albert Astals Cid +Date: Mon Apr 22 12:58:35 2019 +0200 + + NULL -> nullptr + + poppler/SplashOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 310fd7c1465be424126bd8f3d853036178df72b9 +Author: Albert Astals Cid +Date: Mon Apr 22 12:28:07 2019 +0200 + + Add SPLASH_CMYK=ON to the clazy CI + + to have more coverage, this doesn't really reduce the coverage for the + "normal" case of not having SPLASH_CMYK defined since there's very few + else for that ifdef and they're just simplifications of the if code + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 97781707843016291827796a5bc96340c40cc4e5 +Author: Albert Astals Cid +Date: Mon Apr 22 12:35:41 2019 +0200 + + Add (C) for previous commit + + splash/SplashBitmap.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 28d9bcf831ce994a02ee0f92278c614fa31c5d99 +Author: William Bader +Date: Mon Apr 22 12:24:03 2019 +0200 + + Fix compile with SPLASH_CMYK enabled + + splash/SplashBitmap.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit e0eb356d85e2b43751af6ea7ccd753833f8f967c +Author: Albert Astals Cid +Date: Sun Apr 21 11:46:39 2019 +0200 + + poppler 0.76.0 + + CMakeLists.txt | 4 ++-- + NEWS | 18 ++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 22 insertions(+), 4 deletions(-) + +commit 97bbfd67d7fa4d633e10e3dc90fd523051607836 +Author: LE GARREC Vincent +Date: Wed Apr 17 10:59:34 2019 +0000 + + ofz-11248: Use-of-uninitialized-value in Parser::makeStream + + poppler/Hints.cc | 10 ++++++---- + poppler/XRef.cc | 4 +++- + 2 files changed, 9 insertions(+), 5 deletions(-) + +commit d1223ff2890a028834d1bdccb8984dc58575eda1 +Author: LE GARREC Vincent +Date: Wed Apr 17 08:17:47 2019 +0000 + + ofz-8552: Overflow JBIG2Stream::readTextRegion + + And fix endless loop. + + poppler/JBIG2Stream.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 1a950e45cde918513846d8a13022403b859a482e +Author: Albert Astals Cid +Date: Sat Apr 13 23:43:59 2019 +0200 + + Small improvements to README.contributors + + README.contributors | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit e1e15db0a4d0a5b051efc9947d5ac79184447b9b +Author: himajin100000 +Date: Mon Apr 8 21:14:59 2019 +0900 + + avoid more C4310 + + fofi/FoFiType1C.cc | 9 +++++---- + poppler/Form.cc | 5 +++-- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 1fbbb3e499873e92d775cac9cc285b3c362e5db7 +Author: himajin100000 +Date: Sun Apr 7 21:43:55 2019 +0900 + + avoid warning C4310: cast truncates constant value + + goo/GooString.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 4ae6786469ec0268307fa05cb6d9ce58b4541941 +Author: Albert Astals Cid +Date: Mon Apr 8 00:56:12 2019 +0200 + + Update (C) of previous commit + + poppler/FontInfo.cc | 2 +- + poppler/FontInfo.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 0ec33438f4a407c122c9bfc4dc34758203b50e8a +Author: Adam Reichold +Date: Sun Apr 7 20:48:30 2019 +0200 + + Avoid duplicate set look-up and ordering overhead when tracking + visited fonts and objects in FontScanner. + + poppler/FontInfo.cc | 15 +++++---------- + poppler/FontInfo.h | 6 ++++-- + 2 files changed, 9 insertions(+), 12 deletions(-) + +commit ba40d76a5555fe78f3a0dab91d0590f452f2ee3e +Author: Albert Astals Cid +Date: Fri Apr 5 17:17:52 2019 +0200 + + FormField::FormField: Only call Array::get once + + poppler/Form.cc | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +commit 70845beb5ed8c9b20f3ff1b5054c58b35ebe4872 +Author: Albert Astals Cid +Date: Fri Apr 5 16:46:29 2019 +0200 + + Introduce Dict::getVal(int i, Ref *returnRef) + + And use it in FontInfoScanner::scanFonts + + poppler/Dict.cc | 11 +++++++++++ + poppler/Dict.h | 2 ++ + poppler/FontInfo.cc | 11 +++++------ + 3 files changed, 18 insertions(+), 6 deletions(-) + +commit 8051f678b3b43326e5fdfd7c03f39de21059f426 +Author: Albert Astals Cid +Date: Fri Apr 5 16:34:48 2019 +0200 + + FontInfoScanner::scanFonts Fix infinite loop in broken files + + Fixes #752 + + poppler/FontInfo.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 0a1c6c41cf27bbfa2e19fe0b3c48eeb919f8e322 +Author: Albert Astals Cid +Date: Fri Apr 5 16:30:01 2019 +0200 + + Rename resObj to dictObjI since that makes much more sense + + And we already have a resObj down the function that is the Resources + object so that should be actually called resObj + + poppler/FontInfo.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit ea34108538742ebddf95052319d2f3cbd29b5986 +Author: Albert Astals Cid +Date: Fri Apr 5 16:06:22 2019 +0200 + + Update (C) of previous commit + + qt5/src/poppler-annotation-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3fe46034a9621b2769d20a15a662334e4270d32c +Author: Albert Astals Cid +Date: Fri Mar 29 10:52:19 2019 +0100 + + Use Ref::INVALID more + + In this case we have to be a bit more careful since we're changing + code that + used to assign to 0,0 and now INVALID is -1, -1 but i'm confident it's + fine + + inReplyTo seems to be only used in qt5/src/poppler-annotation.cc and + i've updated the code to use the boolean isInReplyTo instead of + checking + the ref number directly + + The change in Dict only affects its two callers, one in Annot and + one in + Catalog. The one in catalog has been updated, the one in Annot doesn't + seem to need updating (and moreover if you check history before using + the new Dict function was using -1, -1 as ref not initialized) + + The change in Array only affects its one caller, in Function, + whose code + has been updated + + The embFontID change is something that was forgotten in the previous + commit about using Ref::INVALID + + The change for iccProfileStreamA is only local to that function + and has + been changed to use Ref::INVALID in all its uses + + poppler/Annot.cc | 3 +-- + poppler/Annot.h | 1 + + poppler/Array.cc | 4 ++-- + poppler/Array.h | 1 + + poppler/Catalog.cc | 2 +- + poppler/Dict.cc | 4 ++-- + poppler/Dict.h | 1 + + poppler/Function.cc | 2 +- + poppler/GfxFont.cc | 8 ++++---- + poppler/GfxFont.h | 2 +- + poppler/GfxState.cc | 12 +++--------- + poppler/Link.h | 4 ++-- + qt5/src/poppler-annotation-private.h | 2 +- + qt5/src/poppler-annotation.cc | 6 +++--- + 14 files changed, 24 insertions(+), 28 deletions(-) + +commit 9aa0f0aecf9e37f6bb35bab689956d339268a6ef +Author: Marek Kasik +Date: Thu Feb 21 18:26:33 2019 +0100 + + Read PrintPageRange viewer preference + + Lookup for PrintPageRange viewer preference + in constructor of ViewerPreferences and make + it available via getPrintPageRange() method. + + https://gitlab.freedesktop.org/poppler/poppler/issues/290 + + poppler/ViewerPreferences.cc | 24 ++++++++++++++++++++++++ + poppler/ViewerPreferences.h | 4 ++++ + 2 files changed, 28 insertions(+) + +commit b6ffc748e7f3fd4864e95ae383e054949bb73f70 +Author: Marek Kasik +Date: Thu Jan 17 14:45:06 2019 +0100 + + Read NumCopies viewer preference + + Lookup for NumCopies viewer preference + in constructor of ViewerPreferences and make + it available via getNumCopies() method. + + https://gitlab.freedesktop.org/poppler/poppler/issues/290 + + poppler/ViewerPreferences.cc | 8 ++++++++ + poppler/ViewerPreferences.h | 2 ++ + 2 files changed, 10 insertions(+) + +commit b12aafcddff19bc80fab18a0a243dd17b25614d0 +Author: Marek Kasik +Date: Tue Jan 22 15:50:31 2019 +0100 + + Read PickTrayByPDFSize viewer preference + + Lookup for PickTrayByPDFSize viewer preference + in constructor of ViewerPreferences and make + it available via getPickTrayByPDFSize() method. + + https://gitlab.freedesktop.org/poppler/poppler/issues/290 + + poppler/ViewerPreferences.cc | 7 +++++++ + poppler/ViewerPreferences.h | 3 +++ + 2 files changed, 10 insertions(+) + +commit 6e9d57bd3506c22f0f2db0647600567188666978 +Author: Albert Astals Cid +Date: Wed Apr 3 19:16:43 2019 +0200 + + Update (C) of previous commit + + splash/SplashXPathScanner.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8dbe2e6c480405dab9347075cf4be626f90f1d05 +Author: Albert Astals Cid +Date: Wed Apr 3 18:02:42 2019 +0200 + + SplashXPathScanner::clipAALine: Fix crash on broken file + + Make sure the index of allIntersections we access is valid + + Fixes #748 + + splash/SplashXPathScanner.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit eec84fe2d2dad20acdfb47cf06f8171e6f9e74dc +Author: Albert Astals Cid +Date: Tue Apr 2 01:14:30 2019 +0200 + + Make test pass on MSVC + + QStringliteral+MSVC+non ascii chars doesn't play very well + + qt5/tests/check_annotations.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 07067734e9e8b39889b5569e72bb64095773b564 +Author: Albert Astals Cid +Date: Tue Apr 2 00:38:30 2019 +0200 + + Update (C) of previous commits + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 647344ebbef536248e47b1ab1f1fccb20c941aac +Author: Albert Astals Cid +Date: Tue Apr 2 00:29:42 2019 +0200 + + Fix MSVC compile + + Windows.h defines max/min macros, these extra parentheses makes + it happy + enough ... + + goo/GooCheckedOps.h | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit a17bfb24f7caa4ab5cd7ecc0ccbb7cfc7d72c62a +Author: Nelson Benítez León +Date: Fri Mar 29 16:58:17 2019 -0400 + + add testcase for issue #743 + + qt5/tests/check_search.cpp | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +commit 67d81ed907040b22c789466f990ba0000f2df7d5 +Author: Nelson Benítez León +Date: Sun Mar 24 19:44:42 2019 -0400 + + findText: fix regression on case-insensitive search + + introduced by commit 86326030f6989c79f8dd9e91cd4c249278cdbc49 + + The function to detect 7bit Ascii assumed the check was being + done on a plain C char type (1 byte length) whereas the passed + Unicode type is bigger (defined as unsigned int) and so can hold + larger values. So fix our detection for an Ascii7 char appropriately. + + Fixes issue #743 + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ea12ae67be12883e4626b34db8f2f849fb6d56d7 +Author: LE GARREC Vincent +Date: Sun Mar 31 20:49:25 2019 +0000 + + ofz-8443: Integer-overflow in identifyCFF + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8443 + + fofi/FoFiIdentifier.cc | 8 +++++--- + goo/GooCheckedOps.h | 26 +++++++++++++++----------- + 2 files changed, 20 insertions(+), 14 deletions(-) + +commit 516e6149572a16747f21d6510f844b5879954ec0 +Author: LE GARREC Vincent +Date: Sun Mar 31 00:33:09 2019 +0000 + + Integer-overflow in Gfx::doAxialShFill + + oss-fuzz/8631 + + goo/GooCheckedOps.h | 11 +++++++++++ + poppler/Gfx.cc | 21 +++++++++++---------- + 2 files changed, 22 insertions(+), 10 deletions(-) + +commit f25f7f19fab3559ecf2d427a52193767c02e2640 +Author: Albert Astals Cid +Date: Sun Mar 31 01:19:46 2019 +0100 + + Update (C) of previous commits + + poppler/Form.cc | 2 +- + poppler/Gfx.cc | 2 +- + poppler/GlobalParamsWin.cc | 2 +- + poppler/Hints.cc | 1 + + poppler/Lexer.h | 1 + + poppler/Linearization.cc | 1 + + poppler/Parser.cc | 2 +- + poppler/Parser.h | 1 + + 8 files changed, 8 insertions(+), 4 deletions(-) + +commit eb40274320381deca89898fb78b57091d2b804cc +Author: Adam Reichold +Date: Wed Nov 21 18:08:13 2018 +0100 + + Since a Parser cannot be used without a Lexer, make the Parser own + the Lexer by value and construct it in place. + + poppler/Gfx.cc | 2 +- + poppler/GlobalParamsWin.cc | 3 +-- + poppler/Hints.cc | 2 +- + poppler/Lexer.h | 3 +++ + poppler/Linearization.cc | 2 +- + poppler/Parser.cc | 61 + ++++++++++++++++++++++++---------------------- + poppler/Parser.h | 10 ++++---- + poppler/XRef.cc | 33 ++++++++++--------------- + 8 files changed, 57 insertions(+), 59 deletions(-) + +commit 8aa78dbcf5370d78ea025e7249e9119202767e44 +Author: Nelson Benítez León +Date: Sun Nov 11 19:25:30 2018 +0500 + + Form.cc: fix radiobutton reporting wrong state + + When a radiobutton (belonging to a normal radiobutton group) + has a /V key matching his 'OnStr' state, then when you + ask that radiobutton for his state (eg. radiobutton->state()) + it will wrongly return 'true', when really the active + radiobutton is another one in the group. + + This happens because the faulty radiobutton was not passing + the getState() call to his Parent (which every radiobutton + in a group should do, as the Parent stores the value of the current + active item). + + The code was not doing it because it had a valid AppearanceState + (/V key). That behaviour may be right for checkboxes but not for + radiobuttons. + + A testcase is included. An example definition of an + affected radiobutton follows: + + /F 4 + /FT /Btn + /Ff 49152 + /AP /N /Beer 59 0 R /Off 61 0 R + /AS /Beer + /MK /BC [1,0,0] /BG [1,1,1] /CA (4) + /P 20 0 R + /Parent 8 0 R + /Rect [235.277,654.247,249.224,668.194] + /Subtype /Widget + /Type /Annot + /V /Beer + + Fixes issue #159 + + poppler/Form.cc | 5 ++++- + qt5/tests/check_forms.cpp | 47 + +++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 51 insertions(+), 1 deletion(-) + +commit b0f11e3c8696cbb334b765789a548419669fa4ea +Author: Albert Astals Cid +Date: Sun Mar 31 00:39:09 2019 +0100 + + Update (C) of previous commit + + qt5/src/poppler-private.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 74abafe107d0e865919557034c7d6d9dcd19ef6c +Author: Adam Reichold +Date: Sat Mar 30 19:31:58 2019 +0100 + + Implement UnicodeParsedString in terms of QString::fromUtf16 for + significant simplifications. + + qt5/src/poppler-private.cc | 37 +++++++------------------------------ + 1 file changed, 7 insertions(+), 30 deletions(-) + +commit b9512adc677408f74087f7865b2d7ea99b81cc4b +Author: Adam Reichold +Date: Sat Mar 30 12:25:51 2019 +0100 + + Add test case for annotations containing UTF-16LE-encoded text. + + qt5/tests/check_annotations.cpp | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit d607906598243cfc322073222d7d1c9813d7ad79 +Author: Albert Astals Cid +Date: Sat Mar 30 11:47:46 2019 +0100 + + (C) of previous commits + + goo/GooString.h | 1 + + 1 file changed, 1 insertion(+) + +commit 255eec8cac9ad68b129ed44326118dd1064eb331 +Author: Albert Astals Cid +Date: Fri Mar 29 12:44:20 2019 +0100 + + Use the default provided Ref = operator, it's good enough + + poppler/Link.cc | 6 ++---- + poppler/Object.h | 2 +- + poppler/StructElement.h | 2 +- + 3 files changed, 4 insertions(+), 6 deletions(-) + +commit 81fc9aa333f81be496d8255cd2ad4d0b9e23bba6 +Author: Albert Astals Cid +Date: Fri Mar 29 12:39:58 2019 +0100 + + Use the existing Ref operator== + + glib/poppler-action.cc | 4 ++-- + poppler/Annot.cc | 8 ++++---- + poppler/Annot.h | 4 ++-- + poppler/CairoFontEngine.cc | 6 +++--- + poppler/Form.cc | 3 +-- + poppler/MarkedContentOutputDev.cc | 5 ++--- + poppler/PSOutputDev.cc | 25 +++++++++---------------- + poppler/Page.cc | 4 ++-- + poppler/SplashOutputDev.cc | 7 +++---- + test/pdf-fullrewrite.cc | 6 +++--- + 10 files changed, 31 insertions(+), 41 deletions(-) + +commit 244c7d6926463b079b1f96e34d9e4451d352942e +Author: Albert Astals Cid +Date: Fri Mar 29 12:59:16 2019 +0100 + + Make Catalog::findPage just take a Ref instead of num and gen + + All the callers already have a ref so makes no sense to unbox it + + cpp/poppler-destination.cpp | 3 ++- + glib/poppler-action.cc | 4 ++-- + glib/poppler-structure-element.cc | 2 +- + poppler/Annot.cc | 4 ++-- + poppler/Catalog.cc | 4 ++-- + poppler/Catalog.h | 2 +- + poppler/PDFDoc.h | 2 +- + poppler/StructElement.cc | 2 +- + qt5/src/poppler-link.cc | 4 ++-- + utils/HtmlOutputDev.cc | 10 +++++----- + 10 files changed, 19 insertions(+), 18 deletions(-) + +commit e2ccb1cdf7702a2c014e7aaeeeb8d5fc4fcf4d18 +Author: Albert Astals Cid +Date: Fri Mar 29 12:43:39 2019 +0100 + + FormField: don't assign ref to 0, 0 then to just assign it to aref + + poppler/Form.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 8c8e0a143e975b16e6c437c03dc2267e7e8ff3fc +Author: Albert Astals Cid +Date: Thu Mar 28 15:50:15 2019 +0100 + + GfxICCBasedColorSpace: Remove unused member variable + + poppler/GfxState.cc | 8 +++----- + poppler/GfxState.h | 6 ++---- + 2 files changed, 5 insertions(+), 9 deletions(-) + +commit aaff2ee913fcc37cf35384e198587fe848d2cdf3 +Author: Albert Astals Cid +Date: Thu Mar 28 14:29:13 2019 +0100 + + cpp: Support UTF16-LE strings + + They are not supported in the spec but Adobe supports them and there's + files outthere with these kind of strings, so we're + supporting them + + cpp/poppler-private.cpp | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit 3c12c660748ccdd0b7c08b8f4a2891ad1368e437 +Author: Albert Astals Cid +Date: Thu Mar 28 12:58:41 2019 +0100 + + qt5: small optimization to UnicodeParsedString + + by using QString::reserve it should be faster and use less memory + + qt5/src/poppler-private.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 623d073030259042921d34034cdcf701dae7c96b +Author: Albert Astals Cid +Date: Thu Mar 28 12:47:22 2019 +0100 + + qt: UnicodeParsedString support UTF16-LE strings + + They are not part of the standard but Adobe seems to support them and + there's files out there like that so better to support them than not + + qt5/src/poppler-private.cc | 15 ++++++++++++--- + qt5/tests/check_strings.cpp | 2 ++ + 2 files changed, 14 insertions(+), 3 deletions(-) + +commit 0bb9dbc608a73df0a5579c0db3347f2d147266c4 +Author: Christophe Fergeau +Date: Tue Sep 26 11:02:58 2017 +0200 + + document: Handle UTF16-LE annotations + + I can produce such annotations when adding annotations to a PDF + attachement from the standard mail app on my iPhone (iOS 12.1). + They currently all show as "ÿþÚ" rather than the actual string + content. + + UTF16-BE vs UTF16-LE is detected by inferring the endianness from the + first two bytes of the string (0xFF 0xFE and 0xFE 0xFF aka Byte Order + Marker). + + glib/poppler-document.cc | 4 ++++ + goo/GooString.h | 1 + + 2 files changed, 5 insertions(+) + +commit 926ea4645fa36d29d4bf89009719716668103366 +Author: Albert Astals Cid +Date: Thu Mar 28 00:09:28 2019 +0100 + + Use the newly introduced Ref::INVALID() + + poppler/Annot.cc | 10 ++++------ + poppler/GfxFont.cc | 14 +++++++------- + poppler/GfxFont.h | 4 ++-- + poppler/Link.cc | 6 +++--- + poppler/Link.h | 2 +- + poppler/StructElement.h | 2 +- + poppler/StructTreeRoot.h | 4 ++-- + qt5/src/poppler-link.cc | 6 +++--- + qt5/src/poppler-page.cc | 8 +++----- + 9 files changed, 26 insertions(+), 30 deletions(-) + +commit 8122f6d6d409b53151a20c5578fc525ee97315e8 +Author: Marek Kasik +Date: Thu Mar 21 13:47:51 2019 +0100 + + cairo: Constrain number of cycles in rescale filter + + Pass address of the first byte after end of the source buffer + to downsample_row_box_filter() so that we can check + that we don't run out of it. + + Fixes issue #736 + + poppler/CairoRescaleBox.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit d716e636231c8d636bf2139896d817b66fe6d510 +Author: Marek Kasik +Date: Thu Mar 21 13:15:37 2019 +0100 + + cairo: Compute correct coverage values for box filter + + Use double precision for computation of coverage + of the left most pixel in the box filter. + + Issue #736 + + poppler/CairoRescaleBox.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 2b5cccbafc79d561811906dfa5bc288aa9478b10 +Author: Albert Astals Cid +Date: Thu Feb 28 17:57:17 2019 +0100 + + Rework AnnotPopup parent handling code + + The old code was not updating the parent member on setParent + + poppler/Annot.cc | 10 ++++++---- + poppler/Annot.h | 4 ++-- + poppler/Object.h | 6 ++++++ + poppler/Page.cc | 2 +- + 4 files changed, 15 insertions(+), 7 deletions(-) + +commit 732bc31dcc7aa7fda42e4dbaa8a17f0d39125156 +Author: Albert Astals Cid +Date: Fri Mar 22 22:35:45 2019 +0100 + + Update (C) of past commits + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 2 +- + qt5/src/poppler-annotation.cc | 2 +- + utils/HtmlOutputDev.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 30c731b487190c02afff3f036736a392eb60cd9a +Author: Adam Reichold +Date: Fri Mar 22 19:12:47 2019 +0100 + + Properly initialize HtmlOutputDev::page to avoid SIGSEGV upon + error exit. + + Closes #742 + + utils/HtmlOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c317087a9e5db4f6441b4e399837d5b9afbe46a0 +Author: Albert Astals Cid +Date: Fri Mar 22 00:21:12 2019 +0100 + + Stop requiring gcc 4.9 + + We now just support whatever Ubuntu 16.04 has as minimum (gcc 5.4.0) + + .gitlab-ci.yml | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +commit 9068f1c0d2f643471a7e159f4a03dca4a20518f2 +Author: Tobias Deiminger +Date: Thu Mar 21 23:43:48 2019 +0000 + + Don't error out if there's no DA in FreeText annotation + + We can proceed anyway, hardcoded default values will be used in + AnnotFreeText::generateFreeTextAppearance. + + poppler/Annot.cc | 7 ++++--- + poppler/Annot.h | 2 ++ + qt5/src/poppler-annotation.cc | 9 ++++++--- + 3 files changed, 12 insertions(+), 6 deletions(-) + +commit fb5d8000b8f5169d57f84b911f5475b9003fa1ae +Author: Albert Astals Cid +Date: Thu Mar 21 23:48:45 2019 +0100 + + Update (C) from last commit + + cpp/poppler-font.cpp | 1 + + cpp/poppler-toc-private.h | 1 + + cpp/poppler-toc.cpp | 1 + + poppler/Annot.cc | 2 +- + poppler/FontInfo.cc | 1 + + poppler/FontInfo.h | 1 + + poppler/Form.cc | 1 + + poppler/Form.h | 1 + + poppler/Gfx.h | 1 + + poppler/GfxState.cc | 2 +- + poppler/GfxState.h | 2 +- + poppler/GfxState_helpers.h | 1 + + poppler/GlobalParams.cc | 1 + + poppler/GlobalParams.h | 1 + + poppler/GlobalParamsWin.cc | 1 + + poppler/JBIG2Stream.cc | 1 + + poppler/JBIG2Stream.h | 1 + + poppler/Link.cc | 1 + + poppler/Link.h | 1 + + poppler/OptionalContent.cc | 1 + + poppler/OptionalContent.h | 1 + + poppler/Outline.cc | 1 + + poppler/Outline.h | 1 + + poppler/PDFDocFactory.cc | 1 + + poppler/PDFDocFactory.h | 1 + + poppler/PSOutputDev.cc | 1 + + poppler/PSOutputDev.h | 1 + + poppler/PageLabelInfo.h | 1 + + poppler/PageLabelInfo_p.h | 1 + + poppler/TextOutputDev.cc | 1 + + poppler/TextOutputDev.h | 1 + + poppler/UnicodeMap.cc | 1 + + poppler/UnicodeMapFuncs.h | 1 + + qt5/src/poppler-annotation-helper.h | 2 +- + qt5/src/poppler-document.cc | 1 + + qt5/src/poppler-fontinfo.cc | 1 + + qt5/src/poppler-optcontent.cc | 1 + + qt5/src/poppler-outline.cc | 1 + + qt5/src/poppler-page-transition-private.h | 1 + + qt5/src/poppler-page.cc | 2 +- + qt5/src/poppler-private.cc | 1 + + qt5/src/poppler-private.h | 1 + + splash/Splash.cc | 1 + + splash/SplashBitmap.cc | 1 + + splash/SplashBitmap.h | 1 + + test/perf-test.cc | 1 + + utils/HtmlOutputDev.cc | 1 + + utils/HtmlOutputDev.h | 1 + + utils/Win32Console.h | 1 + + utils/pdfdetach.cc | 1 + + utils/pdffonts.cc | 1 + + utils/printencodings.cc | 1 + + 52 files changed, 52 insertions(+), 5 deletions(-) + +commit b843b42cb12f1038c470a646c4899af119a0bece +Author: Oliver Sander +Date: Thu Mar 21 16:49:01 2019 +0100 + + Replace 'auto' by actual types + + glib/poppler-action.cc | 2 +- + glib/poppler-page.cc | 14 +++++++------- + qt5/src/poppler-document.cc | 2 +- + qt5/src/poppler-optcontent.cc | 4 ++-- + qt5/src/poppler-outline.cc | 2 +- + 5 files changed, 12 insertions(+), 12 deletions(-) + +commit 7f32f8b78ffecc7788267d4d98d4e6247b955489 +Author: Oliver Sander +Date: Thu Dec 6 06:54:54 2018 +0100 + + Remove unused variable + + glib/poppler-page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a00a867b78a525d4dc57cd24006d80ea56041bdc +Author: Oliver Sander +Date: Mon Dec 3 11:37:27 2018 +0100 + + Unify the declarations of PSOutPaperSize + + The clazy CI complains about a 'struct vs. class' inconsistency. + + poppler/PSOutputDev.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9bc752c7fabe190987ae46ed28620b62cdff60e9 +Author: Oliver Sander +Date: Sun Dec 2 21:02:51 2018 +0100 + + Remove GooList completely + + CMakeLists.txt | 1 - + cpp/poppler-font.cpp | 2 +- + cpp/poppler-toc-private.h | 4 +--- + cpp/poppler-toc.cpp | 7 +++--- + glib/poppler-document.cc | 13 +++++------ + glib/poppler-page.cc | 1 - + goo/GooList.h | 53 + --------------------------------------------- + poppler/Annot.cc | 11 +++++----- + poppler/FontInfo.cc | 6 ++--- + poppler/FontInfo.h | 5 ++--- + poppler/Form.cc | 8 +++---- + poppler/Form.h | 5 ++--- + poppler/Gfx.h | 1 - + poppler/GfxState.cc | 14 ++++++------ + poppler/GfxState.h | 19 ++++++---------- + poppler/GlobalParams.cc | 11 +++++----- + poppler/GlobalParams.h | 5 +++-- + poppler/GlobalParamsWin.cc | 1 - + poppler/JBIG2Stream.cc | 13 +++++------ + poppler/JBIG2Stream.h | 4 ++-- + poppler/Link.cc | 15 ++++++------- + poppler/Link.h | 13 +++++------ + poppler/OptionalContent.cc | 11 +++++----- + poppler/OptionalContent.h | 7 +++--- + poppler/Outline.cc | 5 ++--- + poppler/Outline.h | 11 +++++----- + poppler/PDFDocFactory.cc | 5 ++--- + poppler/PDFDocFactory.h | 4 ++-- + poppler/PSOutputDev.cc | 3 +-- + poppler/PSOutputDev.h | 2 +- + poppler/TextOutputDev.cc | 49 + ++++++++++++++++++++--------------------- + poppler/TextOutputDev.h | 14 ++++++------ + poppler/UnicodeMap.cc | 1 - + qt5/src/poppler-document.cc | 4 ++-- + qt5/src/poppler-fontinfo.cc | 2 +- + qt5/src/poppler-outline.cc | 3 +-- + qt5/src/poppler-page.cc | 2 +- + qt5/src/poppler-private.cc | 4 ++-- + qt5/src/poppler-private.h | 2 +- + splash/Splash.cc | 1 - + splash/SplashBitmap.cc | 5 ++--- + splash/SplashBitmap.h | 6 ++--- + test/perf-test.cc | 1 - + utils/HtmlOutputDev.cc | 11 +++++----- + utils/HtmlOutputDev.h | 9 ++++---- + utils/pdfdetach.cc | 1 - + utils/pdffonts.cc | 2 +- + utils/printencodings.cc | 5 +++-- + 48 files changed, 148 insertions(+), 234 deletions(-) + +commit fa8f3f22e85a5508fa53e8604b079e9b73e63f76 +Author: Oliver Sander +Date: Sun Dec 2 20:41:27 2018 +0100 + + Remove method GooList::get + + Use operator[] instead. This is another move towards discarding + GooList in favor of std::vector. + + cpp/poppler-font.cpp | 2 +- + cpp/poppler-toc.cpp | 2 +- + glib/poppler-action.cc | 4 +-- + glib/poppler-document.cc | 24 ++++++------- + glib/poppler-page.cc | 12 +++---- + goo/GooList.h | 4 --- + poppler/Annot.cc | 78 + +++++++++++++++++++++---------------------- + poppler/Form.cc | 4 +-- + poppler/GfxState.cc | 10 +++--- + poppler/GlobalParams.cc | 8 ++--- + poppler/JBIG2Stream.cc | 28 ++++++++-------- + poppler/OptionalContent.cc | 2 +- + poppler/PDFDocFactory.cc | 2 +- + poppler/PSOutputDev.cc | 8 ++--- + poppler/TextOutputDev.cc | 12 +++---- + qt5/src/poppler-fontinfo.cc | 2 +- + qt5/src/poppler-optcontent.cc | 4 +-- + qt5/src/poppler-page.cc | 2 +- + qt5/src/poppler-private.cc | 2 +- + splash/Splash.cc | 2 +- + splash/SplashBitmap.cc | 2 +- + utils/HtmlOutputDev.cc | 6 ++-- + utils/pdffonts.cc | 4 +-- + utils/printencodings.cc | 2 +- + 24 files changed, 111 insertions(+), 115 deletions(-) + +commit 760ca656bd30bba162392011ebca5c67df25ae47 +Author: Oliver Sander +Date: Sat Dec 1 13:36:40 2018 +0100 + + Remove method deleteGooList + + cpp/poppler-font.cpp | 5 ++++- + glib/poppler-document.cc | 5 ++++- + goo/GooList.h | 8 -------- + poppler/Annot.cc | 30 ++++++++++++++++++++++++------ + poppler/Form.cc | 15 ++++++++++++--- + poppler/GfxState.cc | 5 ++++- + poppler/GlobalParams.cc | 10 ++++++++-- + poppler/JBIG2Stream.cc | 10 ++++++++-- + poppler/Link.cc | 24 ++++++++++++++++++------ + poppler/OptionalContent.cc | 5 ++++- + poppler/Outline.cc | 10 ++++++++-- + poppler/PDFDocFactory.cc | 5 ++++- + poppler/PSOutputDev.cc | 5 ++++- + poppler/TextOutputDev.cc | 38 ++++++++++++++++++++++++++++++-------- + qt5/src/poppler-fontinfo.cc | 6 +++++- + splash/SplashBitmap.cc | 5 ++++- + utils/HtmlOutputDev.cc | 10 ++++++++-- + 17 files changed, 149 insertions(+), 47 deletions(-) + +commit 3bf47e100717f4295652d578ecd12e489937b329 +Author: Oliver Sander +Date: Fri Nov 30 22:20:01 2018 +0100 + + Make GooList a template type + + One more step towards getting rid of it completely. + + cpp/poppler-font.cpp | 4 +-- + cpp/poppler-toc-private.h | 5 ++-- + cpp/poppler-toc.cpp | 6 ++--- + glib/poppler-action.cc | 2 +- + glib/poppler-document.cc | 14 +++++----- + glib/poppler-page.cc | 18 +++++-------- + goo/GooList.h | 13 ++++----- + poppler/Annot.cc | 22 +++++++-------- + poppler/FontInfo.cc | 7 +++-- + poppler/FontInfo.h | 4 +-- + poppler/Form.cc | 14 +++++----- + poppler/Form.h | 4 +-- + poppler/GfxState.cc | 24 ++++++++--------- + poppler/GfxState.h | 19 ++++++++----- + poppler/GlobalParams.cc | 14 +++++----- + poppler/GlobalParams.h | 5 ++-- + poppler/JBIG2Stream.cc | 16 +++++------ + poppler/JBIG2Stream.h | 5 ++-- + poppler/Link.cc | 20 +++++++------- + poppler/Link.h | 14 +++++----- + poppler/OptionalContent.cc | 13 +++++---- + poppler/OptionalContent.h | 8 +++--- + poppler/Outline.cc | 8 +++--- + poppler/Outline.h | 15 +++++------ + poppler/PDFDocFactory.cc | 6 ++--- + poppler/PDFDocFactory.h | 5 ++-- + poppler/PSOutputDev.cc | 4 +-- + poppler/PSOutputDev.h | 5 ++-- + poppler/TextOutputDev.cc | 62 + +++++++++++++++++++++---------------------- + poppler/TextOutputDev.h | 18 ++++++------- + qt5/src/poppler-document.cc | 2 +- + qt5/src/poppler-fontinfo.cc | 4 +-- + qt5/src/poppler-optcontent.cc | 4 +-- + qt5/src/poppler-page.cc | 2 +- + qt5/src/poppler-private.cc | 4 +-- + qt5/src/poppler-private.h | 3 ++- + splash/Splash.cc | 2 +- + splash/SplashBitmap.cc | 8 +++--- + splash/SplashBitmap.h | 6 ++--- + utils/HtmlOutputDev.cc | 14 +++++----- + utils/HtmlOutputDev.h | 9 ++++--- + utils/pdffonts.cc | 2 +- + utils/printencodings.cc | 2 +- + 43 files changed, 218 insertions(+), 218 deletions(-) + +commit 5610fc71fcd6b4c54e805470259ed95547aa2328 +Author: Oliver Sander +Date: Fri Nov 30 21:44:58 2018 +0100 + + pdfdetach: Replace GooList by std::vector + + utils/pdfdetach.cc | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +commit fda9a2a2fcb0d12add4812c84f7d39684d2ca6d7 +Author: Oliver Sander +Date: Fri Nov 30 17:46:02 2018 +0100 + + Remove method GooList::getLength + + Use method 'size' (from std::vector) instead. + + cpp/poppler-font.cpp | 4 ++-- + cpp/poppler-toc.cpp | 6 +++--- + glib/poppler-action.cc | 5 ++--- + glib/poppler-document.cc | 8 ++++---- + glib/poppler-page.cc | 20 +++++++++----------- + goo/GooList.h | 3 --- + poppler/Annot.cc | 14 +++++++------- + poppler/Form.cc | 8 ++++---- + poppler/GfxState.cc | 20 ++++++++++---------- + poppler/GlobalParams.cc | 9 ++++----- + poppler/JBIG2Stream.cc | 29 ++++++++++++++--------------- + poppler/OptionalContent.cc | 2 +- + poppler/Outline.cc | 2 +- + poppler/PDFDocFactory.cc | 2 +- + poppler/PSOutputDev.cc | 6 +++--- + poppler/TextOutputDev.cc | 21 ++++++++++----------- + qt5/src/poppler-document.cc | 4 ++-- + qt5/src/poppler-fontinfo.cc | 4 ++-- + qt5/src/poppler-optcontent.cc | 4 ++-- + qt5/src/poppler-page.cc | 2 +- + qt5/src/poppler-private.cc | 3 +-- + splash/Splash.cc | 4 ++-- + splash/SplashBitmap.cc | 2 +- + utils/HtmlOutputDev.cc | 6 +++--- + utils/HtmlOutputDev.h | 2 +- + utils/pdfdetach.cc | 2 +- + utils/pdffonts.cc | 4 ++-- + utils/printencodings.cc | 2 +- + 28 files changed, 94 insertions(+), 104 deletions(-) + +commit f4e902124c90333db9b2ff2fee3dcf01f52df999 +Author: Albert Astals Cid +Date: Thu Mar 21 20:02:28 2019 +0100 + + Fix mismatched free/delete + + poppler/OptionalContent.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5a5ae212c8e476dbddb9ce8f7a5e30589ba6c8e5 +Author: Albert Astals Cid +Date: Thu Mar 21 20:01:12 2019 +0100 + + Add missing include guards + + poppler/GfxState_helpers.h | 7 ++++++- + poppler/PageLabelInfo.h | 7 ++++++- + poppler/PageLabelInfo_p.h | 7 ++++++- + poppler/UnicodeMapFuncs.h | 7 ++++++- + qt5/src/poppler-annotation-helper.h | 5 +++++ + qt5/src/poppler-page-transition-private.h | 7 ++++++- + utils/Win32Console.h | 6 ++++++ + 7 files changed, 41 insertions(+), 5 deletions(-) + +commit e68916fca85e497d73327625d72fcf8879ed67b2 +Author: Albert Astals Cid +Date: Thu Mar 21 00:05:10 2019 +0100 + + 0.75.0 + + CMakeLists.txt | 4 ++-- + NEWS | 17 +++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 21 insertions(+), 4 deletions(-) + +commit cb1e3809e3c5329ca4dbd29313c5c2241332874b +Author: Adam Reichold +Date: Wed Mar 20 21:39:14 2019 +0100 + + Add CI job to generate glib frontend HTML-based API documentation. + + .gitlab-ci.yml | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 333bf1757bc68ce342ca708b881c75914a7c463a +Author: Adam Reichold +Date: Wed Mar 20 00:16:27 2019 +0100 + + Also build the Doxygen-based CPP frontend docs in the CI so that + they can be automatically published via GitLab Pages. + + .gitlab-ci.yml | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit a1e0f77578e88b9f089fd88ccba0608a24f2901c +Author: Yves-Gaël Chény +Date: Mon Mar 11 12:20:40 2019 +0100 + + add to parameters for command line tools pdftoppm + + -sep : single character separor between name and page number, + default - + -forcenum : force page number even if there is only one page + + utils/pdftoppm.1 | 6 ++++++ + utils/pdftoppm.cc | 11 +++++++++-- + 2 files changed, 15 insertions(+), 2 deletions(-) + +commit 20424e7b6a8b6505db1f6fea8318e9f089a8384c +Author: Adam Reichold +Date: Sat Feb 9 10:11:24 2019 +0100 + + Publish Qt5 frontend API documentation as GitLab artifacts and + trigger publish via GitLab pages. + + .gitlab-ci.yml | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +commit fada09a2ccc11a3a1d308e810f1336d8df6011fd +Author: Albert Astals Cid +Date: Mon Mar 18 00:50:00 2019 +0100 + + pdfunite: Fix stack overflow on broken file + + Fixes issue #741 + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 45c6c323fd577a96bb1bf0a53e1d1e5562932fad +Author: Umang Malik +Date: Sat Mar 16 00:25:05 2019 +0000 + + Fix parsing of polygon annotation LE values + + AnnotPolygon::initialize used to look for strings, corrected it + to look for names because pdf reference says LE : An array of two + names... + + poppler/Annot.cc | 240 + ++++++++++++++++++++++++++++++++++++------------------- + poppler/Annot.h | 7 +- + 2 files changed, 162 insertions(+), 85 deletions(-) + +commit 12d4c8a46dd7b37bdc475d88d81ec5eecae48627 +Author: Albert Astals Cid +Date: Tue Mar 12 22:59:59 2019 +0100 + + Switch clazy CI to regular fedora + + rawhide is broken at this point and the current "fedora" has also + clazy + 1.5 so that's enough for us + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 148c881286049dde9812beecfed8a7636e6f6def +Author: Albert Astals Cid +Date: Tue Mar 5 00:54:00 2019 +0100 + + Update (C) of recent commits + + poppler/JPXStream.cc | 1 + + utils/pdfunite.cc | 1 + + 2 files changed, 2 insertions(+) + +commit 7b4e372deeb716eb3fe3a54b31ed41af759224f9 +Author: Marek Kasik +Date: Mon Mar 4 12:55:12 2019 +0100 + + pdfunite: Check XRef's Catalog for being a Dict + + Check whether Catalog from XRef is Dict for each document + passed to pdfunite and return error if not. + + https://gitlab.freedesktop.org/poppler/poppler/issues/706 + + utils/pdfunite.cc | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 2e406d3de277545c61ef462aca5b9e7b984dc477 +Author: Robert Niemi +Date: Sat Mar 2 06:43:30 2019 +0100 + + JPXStream: Replaces undefined left-shift operations. + + Left-shifting a negative signed int is undefined. Most compilers + shifts the same + way as unsigned ints, but it's better to be clear about it. + + poppler/JPXStream.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit d9d9c9f16fbd475aa7653a535f38681d3ccb7899 +Author: Albert Astals Cid +Date: Sat Mar 2 00:07:29 2019 +0100 + + pdfsig: fix use after free + + It can happen that destroying the pdf tries to log, which needs + globalParams, so destroy globalParams last + + Fixes issue #733 + + utils/pdfsig.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 33befc25c42ff52e44ffd857a4a114b180a952e4 +Author: Albert Astals Cid +Date: Fri Mar 1 17:46:55 2019 +0100 + + SignatureHandler: Fix crash on broken files + + Issue #732 + + poppler/SignatureHandler.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 679339e0384a630052902cfbad1b278440857046 +Author: Albert Astals Cid +Date: Thu Feb 28 17:42:20 2019 +0100 + + Function: use new Array::get function + + Makes code simple and saves getting twice if it's a ref + + poppler/Function.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit ef6d9e341c98aaf727a27bd858eda7c52b4bed21 +Author: Albert Astals Cid +Date: Thu Feb 28 17:40:44 2019 +0100 + + Array: introduce get variant that returns also the Ref it is one + + Similar to the new one in Dict + + poppler/Array.cc | 14 ++++++++++++++ + poppler/Array.h | 1 + + 2 files changed, 15 insertions(+) + +commit 11d6103d45521d0cfec2a5e49a8214bf85843c7f +Author: Albert Astals Cid +Date: Thu Feb 28 17:26:47 2019 +0100 + + Annot: Use the new Dict::lookup function + + Simplifies the code + + poppler/Annot.cc | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +commit 56dc35f28a3f878e57ad7eb2b0ca63f325882f12 +Author: Albert Astals Cid +Date: Thu Feb 28 17:05:43 2019 +0100 + + Annot: Remove unneeded copy() calls + + poppler/Annot.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit ff77c618d2d71ff7b9e473b5735b027ec9ba55bd +Author: Albert Astals Cid +Date: Thu Feb 28 17:02:42 2019 +0100 + + Link: Remove unneeded copy() calls + + poppler/Link.cc | 17 ++++++++++------- + poppler/Link.h | 8 ++++---- + 2 files changed, 14 insertions(+), 11 deletions(-) + +commit d57ceff195f5d02504d7adf7396defc915272b67 +Author: Albert Astals Cid +Date: Thu Feb 28 16:52:58 2019 +0100 + + Gfx: Save unneeded copy() calls + + poppler/Gfx.cc | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit 008431647c573d342f07f2e05123bdce938802a3 +Author: Albert Astals Cid +Date: Thu Feb 28 16:52:33 2019 +0100 + + StructElement: save unneeded copy() calls + + poppler/StructElement.cc | 5 +++-- + poppler/StructElement.h | 4 ++-- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit 38422a432c4f49e31467e5eae447e244eade3218 +Author: Albert Astals Cid +Date: Thu Feb 28 16:51:57 2019 +0100 + + OptionalContent: constify + + poppler/OptionalContent.cc | 2 +- + poppler/OptionalContent.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d2ccd7f9cd26a877492bc5dd02094defa9be0592 +Author: Albert Astals Cid +Date: Thu Feb 28 16:51:25 2019 +0100 + + Form: Save unneeded copy() calls + + poppler/Form.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c4c8b5be381c925328ecace0753ce4d0c1305bf8 +Author: Albert Astals Cid +Date: Thu Feb 28 16:50:36 2019 +0100 + + FontInfo: Save unneeded copy() call + + poppler/FontInfo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a1b7baeab913931b06e53d2d271481f711eeab81 +Author: Albert Astals Cid +Date: Thu Feb 28 16:50:19 2019 +0100 + + Annot: save some unneeded copy() calls + + poppler/Annot.cc | 30 ++++++++++++++---------------- + poppler/Annot.h | 6 +++--- + 2 files changed, 17 insertions(+), 19 deletions(-) + +commit c33a0e82f8df11f7a5a0f7d0e0020c485b9142f0 +Author: Albert Astals Cid +Date: Thu Feb 28 17:33:40 2019 +0100 + + Update (C) of previous commit + + poppler/FileSpec.h | 2 +- + poppler/Stream.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 4402e335d6a907c3eb73708a6cd50061625d431f +Author: Albert Astals Cid +Date: Sun Feb 10 10:00:32 2019 +0100 + + Add new util: pdfattach + + poppler/Catalog.cc | 81 +++++++++++++++++++++++++++++++++++++ + poppler/Catalog.h | 8 ++++ + poppler/Dict.cc | 13 ++++++ + poppler/Dict.h | 1 + + poppler/FileSpec.cc | 28 +++++++++++++ + poppler/FileSpec.h | 2 + + poppler/PDFDoc.cc | 6 +++ + poppler/Stream.cc | 1 + + poppler/Stream.h | 5 +++ + utils/CMakeLists.txt | 9 +++++ + utils/pdfattach.1 | 60 +++++++++++++++++++++++++++ + utils/pdfattach.cc | 112 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + 12 files changed, 326 insertions(+) + +commit f4136a6353162db249f63ddb0f20611622ab61b4 +Author: Albert Astals Cid +Date: Wed Feb 27 19:43:22 2019 +0100 + + ImageStream::getLine: fix crash on broken files + + Fixes #728 + + poppler/Stream.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 49ecbd5933e5b182ffc211d281cdfdc499d0357e +Author: Albert Astals Cid +Date: Wed Feb 27 15:44:01 2019 +0100 + + Change Dict::lookupNF return a const & + + Saves some copy() + + poppler/Annot.cc | 46 + ++++++++++++++++++------------------- + poppler/Catalog.cc | 6 ++--- + poppler/Dict.cc | 9 ++++---- + poppler/Dict.h | 2 +- + poppler/FileSpec.cc | 4 ++-- + poppler/FontInfo.cc | 2 +- + poppler/Form.cc | 4 ++-- + poppler/Gfx.cc | 17 +++++++------- + poppler/GfxFont.cc | 8 +++---- + poppler/Link.cc | 6 ++--- + poppler/Movie.cc | 4 ++-- + poppler/Object.h | 4 ++-- + poppler/OptionalContent.cc | 2 +- + poppler/Outline.cc | 10 ++++---- + poppler/PDFDoc.cc | 10 ++++---- + poppler/PSOutputDev.cc | 2 +- + poppler/Page.cc | 24 +++++++++---------- + poppler/Stream.cc | 4 ++-- + poppler/StructElement.cc | 12 +++++----- + poppler/StructTreeRoot.cc | 2 +- + poppler/XRef.cc | 21 ++++++++--------- + qt5/src/poppler-annotation-helper.h | 4 ++-- + utils/pdfunite.cc | 8 +++---- + 23 files changed, 105 insertions(+), 106 deletions(-) + +commit 099a09c57224a8072d1591c193815e6434178f25 +Author: Albert Astals Cid +Date: Wed Feb 27 15:58:42 2019 +0100 + + pdf-fullrewrite: Save copy() calls + + test/pdf-fullrewrite.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 1005f8ab69ef539bc46ad3fd4d7e610de0204239 +Author: Albert Astals Cid +Date: Wed Feb 27 15:56:23 2019 +0100 + + StructTreeRoot::parseNumberTreeNode: Save copy() call + + poppler/StructTreeRoot.cc | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 6b099768fad76d06a7351fc2a446859cfce983fb +Author: Albert Astals Cid +Date: Wed Feb 27 15:54:30 2019 +0100 + + StructElement::parseChild: Save copy() call + + poppler/StructElement.cc | 4 ++-- + poppler/StructElement.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 2c26b40b8fd82f813c7a8f115ecfa12096452849 +Author: Albert Astals Cid +Date: Wed Feb 27 15:52:51 2019 +0100 + + OptionalContent: Save unneeded copy() calls + + poppler/OptionalContent.cc | 18 +++++++++--------- + poppler/OptionalContent.h | 2 +- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit b7de46a75644d9e7289c7ec1972ccc6c4eb5afa5 +Author: Albert Astals Cid +Date: Wed Feb 27 15:49:47 2019 +0100 + + Object::print: Save unneded copy() calls + + poppler/Object.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 8b8c9ea6eb89bc6b6a0fb0d479e58ba55345e574 +Author: Albert Astals Cid +Date: Wed Feb 27 15:48:54 2019 +0100 + + LinkDest::LinkDest: Save unneeded copy() call + + poppler/Link.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 8579a7b95b6658d1e1a905a8e0ec938f42b8b8f0 +Author: Albert Astals Cid +Date: Wed Feb 27 15:48:38 2019 +0100 + + GfxICCBasedColorSpace::parse: Save unneeded copy() call + + poppler/GfxState.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 4b00c90dcfb2283d872c0dc07d7a54ebd490aaf8 +Author: Albert Astals Cid +Date: Wed Feb 27 15:14:19 2019 +0100 + + GfxFontDict::hashFontObject1: Remove unnecessary copy calls + + poppler/GfxFont.cc | 7 +++---- + poppler/GfxFont.h | 4 ++-- + 2 files changed, 5 insertions(+), 6 deletions(-) + +commit 063eda5fae00bfb62f04941dc0657596f67683db +Author: Albert Astals Cid +Date: Wed Feb 27 14:59:46 2019 +0100 + + OptionalContent: Remove some unnecessary copy() + + poppler/OptionalContent.cc | 8 ++++---- + poppler/OptionalContent.h | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 32c7d7437974a8b675b9e4913de9d35a100888ea +Author: Albert Astals Cid +Date: Wed Feb 27 14:57:03 2019 +0100 + + FontInfoScanner::scanFonts: remove unnecessary Object::copy + + poppler/FontInfo.cc | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 597e26e96d2a1449aea360e2cf6ffcbf4b8f5b1d +Author: Albert Astals Cid +Date: Wed Feb 27 13:56:23 2019 +0100 + + Make Annot::getNF and Dict::getNF return const & instead of copy + + Lots of users can deal with a const & directly, so it saves us some + copying. For the ones that can't move the copy to the caller side. + + Some of copy() on the caller side can be easily removed, that + will come + on next commits + + glib/poppler-document.cc | 4 ++-- + poppler/Annot.cc | 6 +++--- + poppler/Array.cc | 11 ++++++----- + poppler/Array.h | 4 ++-- + poppler/Catalog.cc | 8 ++++---- + poppler/Dict.h | 4 ++-- + poppler/FontInfo.cc | 2 +- + poppler/Form.cc | 6 +++--- + poppler/Function.cc | 2 +- + poppler/Gfx.cc | 4 ++-- + poppler/GfxFont.cc | 6 +++--- + poppler/GfxState.cc | 4 ++-- + poppler/Link.cc | 8 ++++---- + poppler/Object.cc | 4 ++-- + poppler/Object.h | 8 ++++---- + poppler/OptionalContent.cc | 24 ++++++++++++------------ + poppler/PDFDoc.cc | 24 ++++++++++++------------ + poppler/PSOutputDev.cc | 8 ++++---- + poppler/Page.cc | 2 +- + poppler/StructElement.cc | 4 ++-- + poppler/StructTreeRoot.cc | 8 ++++---- + poppler/XRef.cc | 4 ++-- + qt5/src/poppler-optcontent.cc | 6 +++--- + test/pdf-fullrewrite.cc | 8 ++++---- + utils/pdfunite.cc | 20 ++++++++++---------- + 25 files changed, 95 insertions(+), 94 deletions(-) + +commit 0a4e86e804b784b497407cc9e82cb109ed19edbf +Author: Albert Astals Cid +Date: Tue Feb 19 23:06:20 2019 +0100 + + Update (C) of previous commits + + poppler/Parser.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 69d86f90e30785a0db76d3898914de4c0782b947 +Author: Albert Astals Cid +Date: Tue Feb 19 16:18:48 2019 +0100 + + TextOutputDev: Fix assert in broken file + + oss-fuzz/13203 + + poppler/TextOutputDev.cc | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +commit b0a3356f675e76cf26e6e1ac626a32f7b081da8d +Author: Albert Astals Cid +Date: Sun Feb 17 00:54:23 2019 +0100 + + Remove the "long" Object objRef constructor + + Did analyze the assembler generated by the more verbose option in + Parser.cc that is a hot path and the assembler was the same + + poppler/Object.h | 2 -- + poppler/PDFDoc.cc | 5 ++++- + poppler/Parser.cc | 5 ++++- + qt5/tests/check_optcontent.cpp | 4 ++-- + utils/pdfunite.cc | 8 ++++---- + 5 files changed, 14 insertions(+), 10 deletions(-) + +commit 60b663236547efe8b3d87e0149050056ad9f0f60 +Author: Albert Astals Cid +Date: Wed Feb 13 20:26:07 2019 +0100 + + CI Use kdeorg/android-sdk instead of apol/asdk:clang + + it's a bit more official looking + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cc7a18307d363c687221a49cee3e0b6e22ff390f +Author: Masamichi Hosoda +Date: Tue Feb 12 21:16:42 2019 +0900 + + cpp: tests: Add showing version information to poppler-dump + + cpp/tests/poppler-dump.cpp | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 258a25fc02976db194e3eb1e383921a328c72a94 +Author: Albert Astals Cid +Date: Sun Feb 10 23:52:13 2019 +0100 + + gbasename: Include stdlib for free + + fixes macos build + + goo/gbasename.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit d14a96210f5def63a817c9a2c6d9e971c7272717 +Author: Albert Astals Cid +Date: Sun Feb 10 23:51:01 2019 +0100 + + Update (C) + + goo/gbasename.cc | 2 +- + utils/InMemoryFile.cc | 2 +- + utils/InMemoryFile.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit e4b72ca0694d86915676a47642fa3c319f8b936b +Author: +Date: Sun Feb 10 16:25:35 2019 -0500 + + tidyup: #if to #ifdef in HAVE_IN_MEMORY_FILE_FOPENCOOKIE as per aacid + + utils/InMemoryFile.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7b9b3a924d6b63e25e6e6157be5c5e471c43e406 +Author: +Date: Sun Feb 10 16:25:18 2019 -0500 + + MSVC/Mac build fix: Hide the private methods in InMemoryFile behind + a HAVE_IN_MEMORY_FILE_FOPENCOOKIE guard. These use datatypes like + off64_t which don't seem to port to MSVC/Mac. + + utils/InMemoryFile.cc | 2 ++ + utils/InMemoryFile.h | 2 ++ + 2 files changed, 4 insertions(+) + +commit 2d1c8327c936600deca28a15230804a448e3f8a2 +Author: +Date: Sun Feb 10 16:24:29 2019 -0500 + + MSVC build fix: gbasename: basename()/libgen.h don't exist in + MSVC-land. Instead, use _splitpath_s. + + goo/gbasename.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 0e7b76ef87378e924e9f715bfe4ff50b8af4a709 +Author: Albert Astals Cid +Date: Sun Feb 10 18:02:11 2019 +0100 + + NameTree: remove undefined function + + poppler/Catalog.h | 1 - + 1 file changed, 1 deletion(-) + +commit e65dfd791447225c9477f973cbc172b269164af9 +Author: Albert Astals Cid +Date: Sun Feb 10 18:01:25 2019 +0100 + + NameTree: Remove unused member + + poppler/Catalog.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit ae62db7d22c1dbd3b958ec571337d34c9fc7be7b +Author: Masamichi Hosoda +Date: Sun Feb 10 23:27:25 2019 +0900 + + cpp: docs: Add description of header version macro + + This commit adds description of header version macro. + POPPLER_VERSION + POPPLER_VERSION_MAJOR + POPPLER_VERSION_MINOR + POPPLER_VERSION_MICRO + + cpp/poppler-version.cpp | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit dbc49f4805eff0ca9f200feebd433ab73b12ba73 +Author: Masamichi Hosoda +Date: Sun Feb 10 22:04:45 2019 +0900 + + cpp: docs: Add header file information + + This commit adds header files for the document. + It generates header file information + including dependency graphs and so on. + + cpp/poppler-destination.cpp | 3 +++ + cpp/poppler-document.cpp | 3 +++ + cpp/poppler-embedded-file.cpp | 3 +++ + cpp/poppler-font.cpp | 3 +++ + cpp/poppler-global.cpp | 3 +++ + cpp/poppler-image.cpp | 3 +++ + cpp/poppler-page-renderer.cpp | 3 +++ + cpp/poppler-page-transition.cpp | 3 +++ + cpp/poppler-page.cpp | 3 +++ + cpp/poppler-rectangle.cpp | 3 +++ + cpp/poppler-toc.cpp | 3 +++ + cpp/poppler-version.cpp | 6 ++++++ + 12 files changed, 39 insertions(+) + +commit 9802b5fc05817a9a4db6a65b22411068767fb681 +Author: Masamichi Hosoda +Date: Sun Feb 10 21:22:50 2019 +0900 + + cpp: docs: Fix doc generating from poppler-version.h.in + + Doxygen generated document did not contain + `poppler::version_string()`, `poppler::version_major()`, + `poppler::version_minor()`, and `poppler::version_micro()`. + These descriptions are written in `poppler-version.h.in` + in source files and doxygen could not parse `poppler-version.h.in` + because its extension is not mapped to any languages. + + This commit adds `*.in` to C++ in extension mapping. + As a result, doxygen parses `poppler-version.h.in` as C++ file. + So generated document becomes to contain + `poppler::version_string()` etc. + + cpp/Doxyfile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e5fee74cbb924bb6758fa7697c66571e50ec2f7d +Author: Albert Astals Cid +Date: Sun Feb 10 16:52:11 2019 +0100 + + Make the Object Ref constructor explicit + + poppler/Object.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4d0cbca6a9ebf92f4947522f56cf9361d4b5314e +Author: Albert Astals Cid +Date: Sun Feb 10 16:46:56 2019 +0100 + + Add an XRef::fetch variant that takes a const Ref + + makes the code more compact and easier to understand + + glib/poppler-action.cc | 2 +- + poppler/FontInfo.cc | 4 ++-- + poppler/Gfx.cc | 4 ++-- + poppler/Object.cc | 4 ++-- + poppler/PDFDoc.cc | 18 +++++++++--------- + poppler/XRef.cc | 9 +++++++-- + poppler/XRef.h | 3 ++- + utils/pdfunite.cc | 2 +- + 8 files changed, 26 insertions(+), 20 deletions(-) + +commit fc555c756becd50d75d87b820b695363030d9ab9 +Author: Albert Astals Cid +Date: Sun Feb 10 16:28:28 2019 +0100 + + Object: Add constructor that takes a const Ref + + makes it easier to not have to unbox the Ref for no reason + + poppler/Annot.cc | 12 ++++++------ + poppler/Form.cc | 2 +- + poppler/GfxFont.cc | 6 +++--- + poppler/Object.h | 4 +++- + poppler/PDFDoc.cc | 2 +- + poppler/PSOutputDev.cc | 4 ++-- + poppler/Page.cc | 12 ++++++------ + poppler/XRef.cc | 4 ++-- + qt5/src/poppler-document.cc | 4 ++-- + utils/pdfunite.cc | 4 ++-- + 10 files changed, 28 insertions(+), 26 deletions(-) + +commit 5f6ff67b0e1dc075d737fc840642c292329dcd08 +Author: Albert Astals Cid +Date: Sun Feb 10 15:32:26 2019 +0100 + + pdftohtml: Add -dataurls to man page + + utils/pdftohtml.1 | 3 +++ + 1 file changed, 3 insertions(+) + +commit 7b8dbc0a4dc8e0738658b8e4fe7c44adad15af24 +Author: Greg Knight +Date: Fri Nov 23 22:30:12 2018 -0500 + + pdftohtml: singleHtml and stout are not mutually exclusive. with + -dataurls is actually quite reasonable. + + utils/pdftohtml.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 91ab53fa635e9ea964f10e9a6681d04d7185c732 +Author: Greg Knight +Date: Fri Nov 23 19:53:38 2018 -0500 + + pdftohtml: add support for dataUrls argument + + eliminate the 'extension' field used to regenerate background images; + replace with a list of background images + + utils/HtmlOutputDev.cc | 67 + ++++++++++++++++++++++++++------------------------ + utils/HtmlOutputDev.h | 15 ++++++----- + utils/pdftohtml.cc | 46 ++++++++++++++++++++++++---------- + 3 files changed, 77 insertions(+), 51 deletions(-) + +commit 44da4d785cffeb5d4bbb1460479add6ce01edea2 +Author: Greg Knight +Date: Sun Feb 10 10:31:36 2019 +0100 + + Introduce gbase64 + + CMakeLists.txt | 1 + + goo/gbase64.cc | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + goo/gbase64.h | 28 ++++++++++++++++++++++++++++ + 3 files changed, 79 insertions(+) + +commit 2ba81611e9ccdcb49275ee247308bd0dcba3e64d +Author: Greg Knight +Date: Sun Feb 10 10:28:26 2019 +0100 + + Introduce gbasename + + CMakeLists.txt | 1 + + goo/gbasename.cc | 51 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + goo/gbasename.h | 22 ++++++++++++++++++++++ + utils/HtmlOutputDev.cc | 47 + ++++++++++++++++------------------------------ + utils/HtmlOutputDev.h | 7 ------- + utils/pdfsig.cc | 6 ++---- + 6 files changed, 92 insertions(+), 42 deletions(-) + +commit 7f4da59665969f624c18a1ba3e1f1ac1ca3478b1 +Author: Greg Knight +Date: Fri Nov 23 19:37:37 2018 -0500 + + pdftohtml data urls: adding InMemoryFile utility class + + utils/CMakeLists.txt | 1 + + utils/InMemoryFile.cc | 75 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + utils/InMemoryFile.h | 51 +++++++++++++++++++++++++++++++++++ + 3 files changed, 127 insertions(+) + +commit 8d2a3e533024b01c8ec7fe3170d29877bbf4af5e +Author: Albert Astals Cid +Date: Sun Feb 10 10:03:05 2019 +0100 + + constify saveAs GooStrings + + poppler/PDFDoc.cc | 6 +++--- + poppler/PDFDoc.h | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit c0c89223c1724815e8bae78ebac72bb3a4873a68 +Author: Albert Astals Cid +Date: Thu Feb 7 19:34:31 2019 +0100 + + 0.74.0 + + CMakeLists.txt | 4 ++-- + NEWS | 26 ++++++++++++++++++++++++++ + cpp/CMakeLists.txt | 2 +- + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 32 insertions(+), 6 deletions(-) + +commit 2c5fadd7e1c1b896ee23a3ba694f5f19430b6720 +Author: Albert Astals Cid +Date: Wed Feb 6 19:45:09 2019 +0100 + + Update (C) of last commit + + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoRescaleBox.cc | 1 + + qt5/src/ArthurOutputDev.cc | 2 +- + utils/ImageOutputDev.cc | 2 +- + utils/pdftocairo.cc | 2 +- + 5 files changed, 5 insertions(+), 4 deletions(-) + +commit 5a72f3cd65d4c9481b0b5b2535e51057c7b9b291 +Author: Albert Astals Cid +Date: Wed Feb 6 18:31:55 2019 +0100 + + Use reinterpret_cast to silence cast-align warnings + + In ImageOutputDev it comes directly from malloc, and malloc guarantees + alignment for basic types, so we're good + + In ArthurOutputDev it comes from QImage::bits that uses malloc + internally, so we're good + + In cairo* it comes from cairo_image_surface_get_data that comes from + pixman_image_get_data that returns a uint32_t * so we're only going to + the original type alignment + + .gitlab-ci.yml | 2 +- + poppler/CairoOutputDev.cc | 8 ++++---- + poppler/CairoRescaleBox.cc | 2 +- + qt5/src/ArthurOutputDev.cc | 6 +++--- + utils/ImageOutputDev.cc | 2 +- + utils/pdftocairo.cc | 2 +- + 6 files changed, 11 insertions(+), 11 deletions(-) + +commit ff1ab1b0c9b265df1fd07380cd78ca0daa63d642 +Author: Vincent Le Garrec +Date: Sat Feb 2 04:25:52 2019 +0100 + + Undefined-shift in StreamPredictor::getNextLine + + oss-fuzz/10284 + + poppler/Stream.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 5d2ef36e11a63d06c05fa6d314cd7571262d6e4e +Author: Albert Astals Cid +Date: Mon Feb 4 22:30:54 2019 +0100 + + Update (C) + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8446948decde451b4be5f869e98884233e43588c +Author: Albert Astals Cid +Date: Sun Feb 3 14:25:18 2019 +0100 + + SplashXPath: Handle overflow of adjusts gracefully + + oss-fuzz/12638 + + splash/SplashXPath.cc | 120 + +++++++++++++++++++++++++------------------------- + 1 file changed, 61 insertions(+), 59 deletions(-) + +commit 5417b8c364fb5f71176f1a22554ac98b20a58815 +Author: Vincent Le Garrec +Date: Sat Feb 2 05:00:49 2019 +0100 + + Integer-overflow in FoFiBase::checkRegion + + oss-fuzz/8612 + + fofi/FoFiBase.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 0d4103767f99aebbf7c84165f834fd0e2b5c3054 +Author: Albert Astals Cid +Date: Sun Feb 3 00:43:41 2019 +0100 + + Gfx8BitFont: Make multiple code variables instead of one + + Makes for easier understanding/scoping of its value + + poppler/GfxFont.cc | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +commit 308b7ca12352b741c4f11b4b7685ef71fa66d50a +Author: Vincent Le Garrec +Date: Sat Feb 2 04:40:08 2019 +0100 + + Integer-overflow in Gfx8BitFont::Gfx8BitFont + + oss-fuzz/8715 + + poppler/GfxFont.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit b54e1fc3e0d2600621a28d50f9f085b9e38619c2 +Author: Adam Reichold +Date: Fri Feb 1 08:42:27 2019 +0100 + + Also defend against requests for negative XRef indices. oss-fuzz/12797 + + poppler/XRef.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 3cc40be2c545b833d518994d9e459376e6858cb1 +Author: Albert Astals Cid +Date: Mon Jan 28 22:02:52 2019 +0100 + + JBIG2Stream: Free huffTab if buildTable fails + + poppler/JBIG2Stream.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 181db8ab737c2fbf73b1706879d00d97a72426d3 +Author: LE GARREC Vincent +Date: Sun Jan 27 16:43:15 2019 +0000 + + ofz-8467: Undefined-shift in CMap::addCIDs + + poppler/CMap.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit c3577325de5b9d59539c2413dcc66283df062ffa +Author: LE GARREC Vincent +Date: Sun Jan 27 10:19:10 2019 +0000 + + ofz-8725: Undefined-shift in JBIG2HuffmanDecoder::buildTable + + poppler/JBIG2Stream.cc | 41 +++++++++++++++++++++++++++++------------ + 1 file changed, 29 insertions(+), 12 deletions(-) + +commit a73c80e024e8b2a9613926793165da07017dfbb2 +Author: Vincent Le Garrec +Date: Sat Jan 26 09:05:14 2019 +0100 + + ofz-8516: Undefined-shift in StreamBitReader::readBits + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8516 + + poppler/Hints.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit ef64a69b84ad066559a0f25d5c5af96af38b9dd1 +Author: Vincent Le Garrec +Date: Sat Jan 26 09:53:38 2019 +0100 + + ofz-8798: Undefined-shift in JBIG2MMRDecoder::get2DCode + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8798 + + poppler/JBIG2Stream.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 6f5327114c824791dda72dc415b047d445e46d9d +Author: Albert Astals Cid +Date: Fri Jan 25 16:10:08 2019 +0100 + + glib: Fix cast from 'GTime *' (aka 'int *') to 'time_t *' (aka + 'long *') + + Sounds rather scary since we're storing a bigger value than what + really + fits. + + Fixed by the suggestion of + https://developer.gnome.org/glib/stable/glib-Date-and-Time-Functions.html#GTime + + Changing the type of _PopplerAttachment ctime/mtime would change the + structure size, thus break the BC, so leaving that for the future for + now + + glib/poppler-attachment.cc | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit f2493d53a70e10ea69bd147c48be7c8544979436 +Author: Albert Astals Cid +Date: Fri Jan 25 19:49:54 2019 +0100 + + SampledFunction: Fix uninitialized memory read + + oss-fuzz/12608 + + poppler/Function.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a6427ea6df68eb20e1970ddaf4017ba9a04e737a +Author: Vincent Le Garrec +Date: Fri Jan 25 07:37:46 2019 +0100 + + Fix ofz-8438 + + https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8438 + + poppler/GfxState.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7486e4995d66f1a8676f3e65e408e8cdab049f6b +Author: Albert Astals Cid +Date: Wed Jan 16 22:56:42 2019 +0100 + + pdfsig: add -nssdir option + + Contains code inspired in code by Hans-Ulrich Jüttner and Adrian + Johnson + + poppler/SignatureHandler.cc | 56 + ++++++++++++++++++++++++++++++--------------- + poppler/SignatureHandler.h | 9 +++++--- + poppler/SignatureInfo.cc | 4 ++-- + utils/pdfsig.1 | 15 ++++++++++-- + utils/pdfsig.cc | 12 +++++++--- + 5 files changed, 68 insertions(+), 28 deletions(-) + +commit 8076bc66c3bd6897d142fba7e7740ab9baf0cb37 +Author: Albert Astals Cid +Date: Sat Jan 19 21:34:23 2019 +0100 + + Fix link in FreeBSD + + .gitlab-ci.yml | 3 +-- + CMakeLists.txt | 6 +++++- + cmake/modules/FindGLIB.cmake | 6 +++++- + cmake/modules/FindNSS3.cmake | 6 +++++- + glib/CMakeLists.txt | 6 +++++- + 5 files changed, 21 insertions(+), 6 deletions(-) + +commit 900d02b0cba78e23d80869b89c07db81b63bbcf4 +Author: Albert Astals Cid +Date: Sat Jan 19 01:20:07 2019 +0100 + + Update (C) + + goo/gdir.h | 1 + + poppler/Function.cc | 2 +- + poppler/SplashOutputDev.cc | 1 + + poppler/Stream.cc | 1 + + splash/SplashFTFontEngine.cc | 1 + + splash/SplashFontEngine.cc | 1 + + splash/SplashFontFile.cc | 1 + + utils/pdfinfo.cc | 1 + + 8 files changed, 8 insertions(+), 1 deletion(-) + +commit 98f7cf7cf126a1d28797b4ce9095aefe9656e954 +Author: Albert Astals Cid +Date: Fri Jan 18 17:18:39 2019 +0100 + + Fix e[0] gcc warning + + poppler/Function.cc | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +commit 748b4e58e384b806618fae2014b6e413a4168fed +Author: Christian Persch +Date: Fri Jan 4 22:13:43 2019 +0100 + + all: Remove support for obsolete systems + + https://gitlab.freedesktop.org/poppler/poppler/issues/709 + + goo/gdir.h | 5 -- + goo/gfile.cc | 182 + +++---------------------------------------- + goo/gfile.h | 7 +- + poppler/GlobalParams.cc | 2 - + poppler/PSOutputDev.cc | 8 -- + poppler/SplashOutputDev.cc | 6 -- + poppler/Stream.cc | 8 -- + poppler/TextOutputDev.cc | 8 -- + splash/SplashFTFontEngine.cc | 6 -- + splash/SplashFontEngine.cc | 12 --- + splash/SplashFontFile.cc | 6 -- + utils/pdfinfo.cc | 4 - + 12 files changed, 10 insertions(+), 244 deletions(-) + +commit 9f247fbb14df853274423035530a141405c90cda +Author: Volker Krause +Date: Wed Jan 16 20:17:12 2019 +0100 + + Remove unused MacroPushRequiredVars.cmake + + This is nowadays also provided by CMake itself via + CMakePushCheckState. + + cmake/modules/MacroPushRequiredVars.cmake | 47 + ------------------------------- + 1 file changed, 47 deletions(-) + +commit eae71a6b497f0bbafeaf3d8a09dc735e591cdf10 +Author: Masamichi Hosoda +Date: Sat Jan 12 21:55:17 2019 +0900 + + cpp: Add named destination for poppler-dump + + cpp/tests/poppler-dump.cpp | 97 + ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 97 insertions(+) + +commit ec67506c3d0b1c519bb3e2f0bee90fac328e7ddb +Author: Masamichi Hosoda +Date: Sat Jan 12 18:44:42 2019 +0900 + + cpp: Add document::create_destination_map() + + Creates a map of all the named destinations in the document. + + cpp/poppler-document.cpp | 56 + ++++++++++++++++++++++++++++++++++++++++++++++++ + cpp/poppler-document.h | 8 +++++++ + 2 files changed, 64 insertions(+) + +commit dbed0702722336baf3ed9fc0e780e14fcdec6f3b +Author: Masamichi Hosoda +Date: Sat Jan 12 16:08:44 2019 +0900 + + cpp: Add destination class + + The information about a destination used in a PDF document. + + cpp/CMakeLists.txt | 2 + + cpp/poppler-destination-private.h | 55 ++++++++ + cpp/poppler-destination.cpp | 285 + ++++++++++++++++++++++++++++++++++++++ + cpp/poppler-destination.h | 68 +++++++++ + 4 files changed, 410 insertions(+) + +commit 842a75d8d6cc0105da6c0b5dbb0997b79ba63246 +Author: Volker Krause +Date: Tue Jan 15 19:50:39 2019 +0100 + + Fix fseeko configure check on Android for API level < 24 + + The availability depends on the _FILE_OFFSET_BITS define, which is set + in config.h. So we need to have this during the configure check + as well, + to test under the same conditions. + + ConfigureChecks.cmake | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 8984a7103abadd1bbc8c0a7ae093611509874d73 +Author: Albert Astals Cid +Date: Fri Jan 11 21:02:43 2019 +0100 + + Update (C) of last commits + + poppler/Form.cc | 2 +- + poppler/SignatureHandler.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b82b77b06f97e960c0f35bfc21b61e61109e1a6f +Author: Albert Astals Cid +Date: Fri Jan 11 11:10:49 2019 +0100 + + Make validateSignature return a SignatureValidationStatus + + poppler/Form.cc | 7 +++--- + poppler/SignatureHandler.cc | 55 + ++++++++++++++++++++++----------------------- + poppler/SignatureHandler.h | 5 +---- + 3 files changed, 31 insertions(+), 36 deletions(-) + +commit 01ccc50e5e7407bed8a0b65aeb4b72b038c6ec07 +Author: Albert Astals Cid +Date: Fri Jan 11 11:05:52 2019 +0100 + + Merge NSS_CertTranslate into validateCertificate + + poppler/Form.cc | 5 ++--- + poppler/SignatureHandler.cc | 51 + +++++++++++++++++++-------------------------- + poppler/SignatureHandler.h | 3 +-- + 3 files changed, 24 insertions(+), 35 deletions(-) + +commit fbb6509c05bad7e6bfeba8b4bb2cdc4a0e2d297f +Author: Adrian Johnson +Date: Sun Nov 25 22:12:12 2018 +0100 + + Include timezone in timeToDateString() + + poppler/DateInfo.cc | 61 + +++++++++++++++++++++-------------------------------- + poppler/DateInfo.h | 1 + + 2 files changed, 25 insertions(+), 37 deletions(-) + +commit 8da4d536cc2b982365483ee873f859b346efeff0 +Author: Albert Astals Cid +Date: Wed Jan 9 09:58:43 2019 +0100 + + qt5: demo: Actually use the lazy toc model lazyly + + qt5/demos/toc.cpp | 145 + ++++++++++++++++++++++++++++++++++++++++++++---------- + qt5/demos/toc.h | 6 ++- + 2 files changed, 124 insertions(+), 27 deletions(-) + +commit c8e6e73a28f6d66e6babedf9cc8da4f10b9e5ffe +Author: Albert Astals Cid +Date: Wed Jan 9 20:07:10 2019 +0100 + + Update (C) of previous commits + + qt5/demos/toc.cpp | 1 + + qt5/src/poppler-outline-private.h | 2 ++ + qt5/src/poppler-outline.cc | 2 ++ + qt5/src/poppler-qt5.h | 2 +- + 4 files changed, 6 insertions(+), 1 deletion(-) + +commit 9b9795e935867f4bc35c4fdb2979dda8c92f6292 +Author: Albert Astals Cid +Date: Wed Jan 9 10:20:15 2019 +0000 + + Update since to 0.74 + + qt5/src/poppler-qt5.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3cb662cd84520bb669692bfba0560a1ffd233920 +Author: Adam Reichold +Date: Fri Dec 7 09:38:59 2018 +0100 + + Add a method the check if an outline item has children to avoid + having to eagerly expand the hierarchy anyway. + + qt5/src/poppler-outline.cc | 11 +++++++++++ + qt5/src/poppler-qt5.h | 7 +++++++ + qt5/tests/check_outline.cpp | 2 ++ + 3 files changed, 20 insertions(+) + +commit 3376db5e5b2588c5b4d0df74b5c9a3230ffbc78d +Author: Adam Reichold +Date: Sat Nov 24 18:55:26 2018 +0100 + + Port the Qt5 viewer demo to use the lazy outline item API (even if + for loading all items up front for now). + + qt5/demos/toc.cpp | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +commit a2e42c88cee27497517bbab098a917bfd80d26f7 +Author: Adam Reichold +Date: Sat Nov 24 18:55:01 2018 +0100 + + Add missing doc comments for the lazy outline item API of the Qt5 + frontend. + + qt5/src/poppler-qt5.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +commit c0fc05ed1113383bcbb55272bd64e1842490e2a1 +Author: Adam Reichold +Date: Wed Oct 31 21:19:55 2018 +0100 + + Remove the intermediate Outline type since all items are owned by the + document and the top-level items will always be eagerly loaded anyway. + + qt5/src/poppler-document.cc | 16 +++++++++++----- + qt5/src/poppler-outline-private.h | 7 ------- + qt5/src/poppler-outline.cc | 23 ----------------------- + qt5/src/poppler-qt5.h | 19 ++----------------- + qt5/tests/check_outline.cpp | 13 ++++--------- + 5 files changed, 17 insertions(+), 61 deletions(-) + +commit 13b5eae9f785a70bc6b9af8e773a555665a1b39c +Author: Adam Reichold +Date: Wed Oct 31 19:03:57 2018 +0100 + + Add Qt5 API that lazily builds an outline by wrapping the internal + objects. + + qt5/src/CMakeLists.txt | 1 + + qt5/src/poppler-document.cc | 12 ++- + qt5/src/poppler-outline-private.h | 52 +++++++++++ + qt5/src/poppler-outline.cc | 189 + ++++++++++++++++++++++++++++++++++++++ + qt5/src/poppler-private.cc | 2 +- + qt5/src/poppler-qt5.h | 50 ++++++++++ + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/check_outline.cpp | 55 +++++++++++ + 8 files changed, 360 insertions(+), 2 deletions(-) + +commit 29fa0f234ff1094c8e9f7a09ca31262e28df40a4 +Author: Christian Persch +Date: Mon Jan 7 23:26:56 2019 +0100 + + glib: docs: Add API index for 0.73 + + glib/reference/poppler-docs.sgml | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 67e46f6e1339f830f9f8b6fd27e38708b4cf4b0e +Author: Albert Astals Cid +Date: Mon Jan 7 22:15:12 2019 +0100 + + Poppler 0.73.0 + + CMakeLists.txt | 4 ++-- + NEWS | 32 ++++++++++++++++++++++++++++++++ + cpp/CMakeLists.txt | 2 +- + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 39 insertions(+), 7 deletions(-) + +commit 75f3d31daa050ca822d2ab501cdeca748ddf9d54 +Author: Marek Kasik +Date: Wed Jan 2 14:55:41 2019 +0100 + + glib: Make PrintScaling preference available in API + + Add poppler_document_get_print_scaling() function and + PopplerPrintScaling enum so that applications which + use poppler's glib frontend can access this preference. + + https://bugs.freedesktop.org/show_bug.cgi?id=92779 + + glib/poppler-document.cc | 60 + ++++++++++++++++++++++++++++++++++++- + glib/poppler-document.h | 17 +++++++++++ + glib/reference/poppler-sections.txt | 3 ++ + glib/reference/poppler.types | 1 + + 4 files changed, 80 insertions(+), 1 deletion(-) + +commit 44505cb397c46baa7dd4a0456f737f36e6d19ad0 +Author: Christian Persch +Date: Tue Jan 1 18:16:18 2019 +0100 + + glib: Fix named destinations + + Named destinations may be described by bytestrings, containing + embedded NULs and not being NUL terminated. That means they cannot + be exposed directly as char*. + + The alternatives are to escape the string from the internal + representation + when exposing it in the API (e.g. in PopplerDest.named_dest), or to + add parallel API exposing it as GString, or GBytes. This patch chooses + the first option, since the presence of these named destionations + in the + public, not sealed, PopplerDest struct means that the second option + would + need more API additions. The chosen option is simpler, and does not + need the API users to adapt unless they create the named dest strings + themselves, or consume them in ways other than calling poppler APIs. + + The escaping scheme chosen simply replaces embedded NUL with "\0" and + escapes a literal backslash with "\\". This is a minimal ABI + change in + that some strings that previously worked unchanged as destinations + (those containing backslash) now don't work, but on the other hand, + previously it was impossible to use any destinations containing + embedded + NULs. + + Add poppler_named_dest_{from,to}_bytestring() to perform that + conversion, and clarify the documentation for when you need them. + + Based on a patch by José Aliste . + + https://gitlab.freedesktop.org/poppler/poppler/issues/631 + + glib/demo/utils.c | 2 - + glib/poppler-action.cc | 5 +- + glib/poppler-action.h | 16 ++++ + glib/poppler-document.cc | 151 + +++++++++++++++++++++++++++++++----- + glib/reference/poppler-sections.txt | 2 + + 5 files changed, 154 insertions(+), 22 deletions(-) + +commit 5196cf634cddabde8963306ab99f86c3840fbbbb +Author: Albert Astals Cid +Date: Sat Jan 5 20:11:22 2019 +0100 + + qt5: Remove CertificateInfo() + + This is BC because the version with it was never released + + People will shoot themselves on the foot and we don't need it + + qt5/src/poppler-form.cc | 94 + ++++++++++++++++++++++++------------------------- + qt5/src/poppler-form.h | 3 +- + 2 files changed, 48 insertions(+), 49 deletions(-) + +commit 8e8c8417a724b3d12e310f9858d0bf02f1b49c7e +Author: Albert Astals Cid +Date: Sat Jan 5 19:48:41 2019 +0100 + + Remove unneeded/leaky copyString calls + + the left hand is a std::string + + poppler/SignatureHandler.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 7fde94de5bc8bcb83f347663abf4dd056a03837e +Author: Oliver Sander +Date: Sat Oct 27 21:21:31 2018 +0200 + + Make CertificateInfo a std::unique_ptr + + poppler/SignatureHandler.cc | 4 ++-- + poppler/SignatureHandler.h | 2 +- + poppler/SignatureInfo.cc | 8 +++----- + poppler/SignatureInfo.h | 5 +++-- + 4 files changed, 9 insertions(+), 10 deletions(-) + +commit 8943f7de0125152f20a64b8092ed516e08e6c1d9 +Author: Oliver Sander +Date: Sat Oct 27 21:09:29 2018 +0200 + + Use std::string for the strings in EntityInfo + + poppler/CertificateInfo.cc | 45 + ++++----------------------------------------- + poppler/CertificateInfo.h | 8 ++++---- + qt5/src/poppler-form.cc | 16 ++++++++-------- + 3 files changed, 16 insertions(+), 53 deletions(-) + +commit 0d3c6b4010629d92e7aee1a7486085d9e0ca711c +Author: Oliver Sander +Date: Sat Oct 27 20:42:44 2018 +0200 + + Use GooString for publicKey, cert_serial, cert_der + + poppler/CertificateInfo.cc | 35 +++++++++-------------------------- + poppler/CertificateInfo.h | 12 ++++++------ + poppler/SignatureHandler.cc | 4 ++-- + qt5/src/poppler-form.cc | 2 +- + 4 files changed, 18 insertions(+), 35 deletions(-) + +commit 119554432264010850250344c8c087c9f31216dc +Author: Oliver Sander +Date: Fri Oct 26 21:02:56 2018 +0200 + + Lots of changes to CertificateInfo memory handling + + poppler/CertificateInfo.cc | 131 + ++++++++++++++++++++++++++++++++++---------- + poppler/CertificateInfo.h | 39 ++++++++++--- + poppler/Form.cc | 2 +- + poppler/SignatureHandler.cc | 44 +++++++-------- + poppler/SignatureHandler.h | 8 +-- + poppler/SignatureInfo.cc | 4 +- + poppler/SignatureInfo.h | 3 +- + qt5/src/poppler-form.cc | 38 ++++++++----- + qt5/src/poppler-form.h | 19 ++++--- + 9 files changed, 195 insertions(+), 93 deletions(-) + +commit 0e2577ec4c3d08eac0b02a3e941d51082b2754c0 +Author: Albert Astals Cid +Date: Thu Oct 25 21:49:12 2018 +0200 + + delete copy constructor and assignement + + poppler/CertificateInfo.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 5a12875cec4d544ea1ca2838fcf407bc2888dd10 +Author: Albert Astals Cid +Date: Thu Oct 25 21:38:44 2018 +0200 + + Install the header file CertificateInfo.h + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 5d6e6f3d4ead5f098be84fffab5cc7d4bdefe38a +Author: Chinmoy Ranjan Pradhan +Date: Tue Jul 17 17:47:34 2018 +0000 + + Expose X509CertificateInfo in qt5 frontend + + qt5/src/poppler-form.cc | 222 + ++++++++++++++++++++++++++++++++++++++++++++++++ + qt5/src/poppler-form.h | 133 +++++++++++++++++++++++++++++ + 2 files changed, 355 insertions(+) + +commit a6944a73286032c2c434f78325531cdf9d3a0de2 +Author: Chinmoy Ranjan Pradhan +Date: Tue Jul 17 18:18:30 2018 +0000 + + Add X509CertificateInfo to poppler + + CMakeLists.txt | 1 + + poppler/CertificateInfo.cc | 127 + ++++++++++++++++++++++++++++++++++++++++++++ + poppler/CertificateInfo.h | 98 ++++++++++++++++++++++++++++++++++ + poppler/Form.cc | 1 + + poppler/SignatureHandler.cc | 114 +++++++++++++++++++++++++++++++++++++-- + poppler/SignatureHandler.h | 5 ++ + poppler/SignatureInfo.cc | 14 +++++ + poppler/SignatureInfo.h | 5 ++ + 8 files changed, 361 insertions(+), 4 deletions(-) + +commit aed1af47a2f1adde4e47836798346674f84b873a +Author: Christian Persch +Date: Sat Jan 5 23:50:24 2019 +0100 + + gfile: Fix the build on WIN32 + + The openFileDescriptor function is not user in the WIN32 codepaths, + so just #ifdef it out on WIN32. + + goo/gfile.cc | 4 ++++ + goo/gfile.h | 4 ++++ + 2 files changed, 8 insertions(+) + +commit 01e963c4f89f47a883c27c597cdf7bf361e8f1ce +Author: Albert Astals Cid +Date: Sat Jan 5 18:12:42 2019 +0100 + + qt5: undefine major and minor since old glibc defined them + + qt5/src/poppler-version.h.in | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 0e8effb2c5143548f4245300840a510eaf94f9e7 +Author: Alexey Pavlov +Date: Mon Dec 10 12:03:48 2018 +0100 + + msys2: add missing include on mingw-w64 + + utils/pdfsig.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 12cf140b0e3b241788b6dfd65129d9bb028bef9c +Author: Alexey Pavlov +Date: Mon Dec 10 01:07:07 2018 +0100 + + msys2: fix glib introspection path on mingw-w64 + + glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 859b4e54c8a6af13eb4715076dc90a17bb2b71df +Author: Alexey Pavlov +Date: Mon Dec 10 01:06:18 2018 +0100 + + msys2: support enabling NSS on mingw-w64 + + cmake/modules/FindNSS3.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2cebd37e2910a7edacb19c32b82d8b8f7cfe41d6 +Author: Albert Astals Cid +Date: Sat Jan 5 17:31:00 2019 +0100 + + Update (C) of previous commits + + fofi/FoFiBase.cc | 1 + + fofi/FoFiIdentifier.cc | 1 + + goo/gfile.cc | 1 + + goo/gfile.h | 1 + + poppler/CairoFontEngine.cc | 1 + + poppler/FileSpec.cc | 1 + + poppler/GfxState.cc | 2 +- + poppler/GlobalParams.cc | 1 + + poppler/GlobalParamsWin.cc | 1 + + poppler/PDFDoc.cc | 1 + + poppler/PSOutputDev.cc | 1 + + poppler/TextOutputDev.cc | 1 + + splash/SplashBitmap.cc | 1 + + 13 files changed, 13 insertions(+), 1 deletion(-) + +commit d5625de8ce3fc31608248fe14b12c4c7d1a43593 +Author: Christian Persch +Date: Thu Jan 3 21:11:49 2019 +0100 + + gfile: Open files with CLOEXEC flag set + + First try to atomically open the file using O_CLOEXEC for open() + and the "e" mode for fopen(), and if that doesn't work or O_CLOEXEC + isn't defined, fall back to opening the file first and applying + the FD_CLOEXEC flag afterwards. + + goo/gfile.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 45 insertions(+), 2 deletions(-) + +commit 4a3eef323d72b06780c318f58917f884eecc812e +Author: Christian Persch +Date: Thu Jan 3 21:11:49 2019 +0100 + + gfile: Add wrapper for open(3p) and use it instead of directly + calling open + + This is in preparation to making the wrapper enforce the O_CLOEXEC + flag. + + goo/gfile.cc | 6 +++++- + goo/gfile.h | 3 +++ + poppler/CairoFontEngine.cc | 2 +- + 3 files changed, 9 insertions(+), 2 deletions(-) + +commit e1e4457a235f6107c09d32994fc628efa9e7bd0e +Author: Christian Persch +Date: Thu Jan 3 21:11:49 2019 +0100 + + all: Use the openFile fopen wrapper from gfile.h + + Use the openFile wrapper instead of calling fopen directly + in the libraries. + + fofi/FoFiBase.cc | 3 ++- + fofi/FoFiIdentifier.cc | 3 ++- + glib/poppler-attachment.cc | 5 +++-- + glib/poppler-media.cc | 5 +++-- + poppler/FileSpec.cc | 3 ++- + poppler/GfxState.cc | 5 +++-- + poppler/GlobalParams.cc | 4 ++-- + poppler/GlobalParamsWin.cc | 2 +- + poppler/PDFDoc.cc | 6 +++--- + poppler/PSOutputDev.cc | 4 ++-- + poppler/TextOutputDev.cc | 3 ++- + splash/SplashBitmap.cc | 7 ++++--- + 12 files changed, 29 insertions(+), 21 deletions(-) + +commit 1e99a1eeb3a144facf45165df9f457796c045daa +Author: Albert Astals Cid +Date: Thu Jan 3 19:47:10 2019 +0100 + + Revert 9fd5ec0e6e5f763b190f2a55ceb5427cfe851d5f + + It was causing regressions for some half-broken files + + Rationale: + + Even if xref::constructXRef is returning false, that only means "i + din't find a new xref root", but constructXRef is also quite + stubborn in + which it basically parses the whole file and stores the positions + of all + the objects it finds, so for some half broken pdf files this is good + enough and we will be able to render those files just fine + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 646be0366430891fcea27980623e9b8f31acfd8f +Author: Albert Astals Cid +Date: Wed Jan 2 23:14:53 2019 +0100 + + Update (C) + + poppler/PDFDoc.cc | 2 +- + splash/Splash.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9fd5ec0e6e5f763b190f2a55ceb5427cfe851d5f +Author: Albert Astals Cid +Date: Mon Dec 31 11:47:57 2018 +0100 + + PDFDoc::setup: Fix return value + + At that point xref can have gone wrong since extractPDFSubtype() can + have caused a reconstruct that broke stuff so instead of + unconditionally + returning true, return xref->isOk() + + Fixes #706 + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 141405e0cc6aead0f2eed83f2f5834afa2b0dbe9 +Author: Stefan Brüns +Date: Wed Aug 29 00:16:02 2018 +0200 + + Allocate SplashXPathScanner on the stack + + SplashXPathScanner is only used inside the each fill function, + but newer + passed to the outside. As it is small, there is no reason to not + allocate it on the stack. + + splash/Splash.cc | 37 +++++++++++++++---------------------- + 1 file changed, 15 insertions(+), 22 deletions(-) + +commit 3cfc61a2a3b97bc3d0cfea874abddcc7f26a68d3 +Author: Albert Astals Cid +Date: Wed Jan 2 00:24:35 2019 +0100 + + Forgot one + + Again no (C) + + poppler/JPXStream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 615a12a4d12bc4769226f73026961623f0b15b62 +Author: Albert Astals Cid +Date: Wed Jan 2 00:20:58 2019 +0100 + + Fix some trivial warnings + + No (C) for this (a machine could do it) + + poppler/JPXStream.cc | 34 +++++++++++++++++----------------- + poppler/SplashOutputDev.cc | 2 +- + poppler/Stream.cc | 12 ++++++------ + qt5/src/poppler-document.cc | 4 ++-- + qt5/src/poppler-form.cc | 2 +- + 5 files changed, 27 insertions(+), 27 deletions(-) + +commit ac407360c3d3494a8ebc872080d680b76c294b0a +Author: Albert Astals Cid +Date: Wed Jan 2 00:22:17 2019 +0100 + + Add (C) from last commit + + poppler/GfxState.cc | 2 +- + qt5/src/poppler-qt5.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e07c8b4784234383cb5ddcf1133ea91a772506e2 +Author: Adam Reichold +Date: Tue Jan 1 10:54:40 2019 +0100 + + Avoid global display profile state becoming an uncontrolled memory + leak by enforcing single initialization. Closes #654 + + poppler/GfxState.cc | 9 +++++++++ + qt5/src/poppler-qt5.h | 4 ++++ + 2 files changed, 13 insertions(+) + +commit 15d2d1edfae7670ab8b75e2e47cbeab1d3ecc842 +Author: Albert Astals Cid +Date: Wed Jan 2 00:03:52 2019 +0100 + + Welcome 2019 + + poppler/poppler-config.h.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 39a251b1b3a3343400a08e2f03c5518a26624626 +Author: Adam Reichold +Date: Mon Dec 24 15:40:38 2018 +0100 + + Do not try to parse into unallocated XRef entry and return pointer + to dummy entry instead. Closes #692 and oss-fuzz/12330 + + poppler/XRef.cc | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) + +commit de0c0b8324e776f0b851485e0fc9622fc35695b7 +Author: Albert Astals Cid +Date: Sat Dec 29 01:25:17 2018 +0100 + + FileSpec: Move the fileSpec.dictLookup call inside fileSpec.isDict if + + Fixes #704 + + poppler/FileSpec.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 653d743771ed778e46be8c14cccf4fb7e2205b74 +Author: Albert Astals Cid +Date: Thu Dec 27 17:53:53 2018 +0100 + + JBIG2Stream: Fix uninitialized memory read on broken files + + fixes oss-fuzz/12243 + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7f87dc10b6adccd6d1b977a28b064add254aa2da +Author: Adam Reichold +Date: Thu Dec 27 11:54:53 2018 +0100 + + Do not try to construct invalid rich media annotation assets. Closes + #703 + + poppler/Annot.cc | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +commit 3ef359a91ae84315ff8667f0c5286c9cafa9332e +Author: Albert Astals Cid +Date: Wed Dec 26 12:34:36 2018 +0100 + + Update (C) + + cpp/poppler-global.cpp | 1 + + cpp/poppler-global.h | 1 + + 2 files changed, 2 insertions(+) + +commit 5cba64142f716f5df61c2136175b86e6d7256526 +Author: Adam Reichold +Date: Mon Dec 24 23:20:45 2018 +0100 + + Add API to cpp frontend to specify a custom data directory for + initialization of global parameters. + + cpp/poppler-document-private.h | 3 +++ + cpp/poppler-document.cpp | 15 ++++++++++++++- + cpp/poppler-global.cpp | 17 +++++++++++++++++ + cpp/poppler-global.h | 2 ++ + 4 files changed, 36 insertions(+), 1 deletion(-) + +commit 72c316d12e1fe26bf6b4f3911ba8e5bcc46af354 +Author: Jeroen Ooms +Date: Sun Dec 9 17:21:28 2018 +0100 + + Windows: only set SOVERSION for shared libs + + CMakeLists.txt | 2 +- + cpp/CMakeLists.txt | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/CMakeLists.txt | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 6e7cbc713ae584d195f77845d6cafcdc80fb64ab +Author: Albert Astals Cid +Date: Sat Dec 22 11:11:59 2018 +0100 + + Gfx::doTilingPatternFill: Fix undefined behaviour + + oss-fuzz/8548 + + poppler/Gfx.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 61fe5ae92794feaaaf4eb8abb01d55d152e28dd7 +Author: Albert Astals Cid +Date: Sat Dec 22 10:59:36 2018 +0100 + + qt5: test-render-to-file: Save files as png + + Is a greeeeeeeeeeeeeat disk space saver + + qt5/tests/test-render-to-file.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 230652c1af3c1b3b91e10d94ab79339135dc6ca3 +Author: Oliver Sander +Date: Tue Dec 11 22:50:07 2018 +0100 + + Fix memory handling bug + + The CIDToGID map is an array of ints. The code properly allocated + a number N of ints, but then used memcpy for N unsigned shorts. + That left the upper half of the array uninitialized. + + qt5/src/ArthurOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 13ed70184e125a20a5bdbfbf73456de741c81d9f +Author: Oliver Sander +Date: Fri Nov 9 22:28:21 2018 +0100 + + Remove method SplashFTFontFile::getCodeToGID + + This method was added in cc43c720e857548175a9e35b0686a1a7a8957f50 + for the use in the ArturOutputDev::updateFont. + It is not use there anymore, and can therefore be removed again. + + splash/SplashFTFontFile.cc | 4 ---- + splash/SplashFTFontFile.h | 3 --- + 2 files changed, 7 deletions(-) + +commit 3c56110469b86a7665c18ce165d4ad0e5870ebb3 +Author: Oliver Sander +Date: Sat Sep 15 13:58:37 2018 +0200 + + Remove all Splash code from the Arthur backend + + Previously, Splash code was used to get the codeToGID + mapping for font rendering (which you apparently cannot + get from Qt). This patch reimplements the same functionality + using only FoFi and FreeType. This makes the code easier + to understand, because it removes several layers of + redirection. + + qt5/src/ArthurOutputDev.cc | 355 + ++++++++++++++++++++------------------------- + qt5/src/ArthurOutputDev.h | 15 +- + qt5/src/CMakeLists.txt | 2 +- + 3 files changed, 167 insertions(+), 205 deletions(-) + +commit 7477b71e5c4f2d3f4876c1c9cba3c937506bfdaa +Author: Yuri Chornoivan +Date: Thu Dec 20 14:15:46 2018 +0200 + + Fix minor typos + + cpp/poppler-document.cpp | 2 +- + cpp/poppler-global.cpp | 2 +- + glib/poppler-document.cc | 8 ++++---- + glib/poppler-document.h | 2 +- + glib/poppler-form-field.cc | 2 +- + glib/poppler-page.cc | 4 ++-- + glib/poppler-page.h | 6 +++--- + glib/poppler-structure-element.cc | 4 ++-- + poppler/Annot.cc | 6 +++--- + poppler/Annot.h | 4 ++-- + poppler/Array.h | 2 +- + poppler/CachedFile.h | 2 +- + poppler/CairoOutputDev.cc | 4 ++-- + poppler/CairoRescaleBox.cc | 4 ++-- + poppler/CharCodeToUnicode.cc | 2 +- + poppler/Decrypt.cc | 4 ++-- + poppler/FlateStream.cc | 4 ++-- + poppler/Form.cc | 4 ++-- + poppler/GfxFont.cc | 2 +- + poppler/GfxState.h | 4 ++-- + poppler/PDFDoc.cc | 2 +- + poppler/SignatureHandler.cc | 2 +- + poppler/SplashOutputDev.cc | 2 +- + poppler/StructElement.cc | 2 +- + poppler/StructTreeRoot.cc | 2 +- + qt5/src/poppler-annotation.h | 4 ++-- + qt5/src/poppler-form.h | 4 ++-- + qt5/src/poppler-link.h | 8 ++++---- + qt5/src/poppler-page.cc | 2 +- + qt5/src/poppler-qt5.h | 6 +++--- + splash/SplashClip.h | 2 +- + test/perf-test.cc | 8 ++++---- + utils/HtmlOutputDev.h | 2 +- + utils/pdftohtml.cc | 2 +- + 34 files changed, 60 insertions(+), 60 deletions(-) + +commit e676558a8b2d71906f1bf77407318a4fef6a60c2 +Author: Albert Astals Cid +Date: Sun Dec 16 23:40:02 2018 +0100 + + qt5: Add the possibility of getting version + + We provide both the build and runtime version, so if an app was built + against poppler 0.65 but running against 0.72, the app can say + somewhere + in it's about/config dialogs + + Running poppler 0.72 (built against 0.65) + + This way we can explain to users while some features are not available + even if they should be, because the runtime and build time differences + sometimes matter + + qt5/src/CMakeLists.txt | 4 +++ + qt5/src/poppler-version.cpp | 40 +++++++++++++++++++++++++++ + qt5/src/poppler-version.h.in | 66 + ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 110 insertions(+) + +commit 3f4e9e49dd2063ae64c2575faf713942878e8a67 +Author: Albert Astals Cid +Date: Tue Dec 18 22:15:29 2018 +0100 + + Test for issue 690 with new file + + qt5/tests/check_password.cpp | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit 1a49822dc7a149174c6cc51fd163f7fda3fbb6c4 +Author: Adam Reichold +Date: Tue Dec 18 21:46:00 2018 +0100 + + Copy the string contents, not the string object, into the key + buffer. Closes #690 + + poppler/Decrypt.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 641312cb67c9f31188367323ea186f40cbb103e5 +Author: Albert Astals Cid +Date: Thu Dec 13 22:41:27 2018 +0100 + + Make it more obvious that XPDF headers have unstable API/ABI + + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7565f2366080304bfe4ab5846c90cf4cbc89457b +Author: Albert Astals Cid +Date: Sun Dec 9 22:43:20 2018 +0100 + + Update (C) + + poppler/TextOutputDev.cc | 1 + + poppler/TextOutputDev.h | 1 + + poppler/UTF.cc | 1 + + poppler/UTF.h | 1 + + qt5/src/poppler-page-private.h | 1 + + qt5/src/poppler-page.cc | 1 + + qt5/src/poppler-qt5.h | 1 + + 7 files changed, 7 insertions(+) + +commit 86326030f6989c79f8dd9e91cd4c249278cdbc49 +Author: Nelson Benítez León +Date: Mon Sep 10 15:51:56 2018 +0100 + + add new 'IgnoreDiacritics' option to ::findText() + + This makes possible that simple ascii search terms + can match on their accented and other diacritics + counterparts. + + This option will be ignored if the search term is + not pure Ascii. + + Issue #637 + + glib/poppler-page.cc | 1 + + glib/poppler.h | 6 +++- + poppler/TextOutputDev.cc | 77 + ++++++++++++++++++++++++++++++++++++++---- + poppler/TextOutputDev.h | 15 ++++++++ + poppler/UTF.cc | 59 ++++++++++++++++++++++++++++++++ + poppler/UTF.h | 13 +++++++ + qt5/src/poppler-page-private.h | 4 +-- + qt5/src/poppler-page.cc | 18 +++++----- + qt5/src/poppler-qt5.h | 5 ++- + qt5/tests/check_search.cpp | 58 +++++++++++++++++++++++++++++++ + 10 files changed, 237 insertions(+), 19 deletions(-) + +commit 90a3778a8f73761c421991dca789d3a196940573 +Author: Albert Astals Cid +Date: Fri Dec 7 15:54:11 2018 +0100 + + Update (C) + + cpp/poppler-global.cpp | 1 + + cpp/poppler-private.cpp | 1 + + 2 files changed, 2 insertions(+) + +commit 135e897ed9a550361eb8f07a5ffedec48f079bd9 +Author: Suzuki Toshiya +Date: Fri Dec 7 09:21:42 2018 +0100 + + Improve handling of UTF-16 in cpp frontend by considering Endianess + + cpp/poppler-global.cpp | 12 ++++++++++-- + cpp/poppler-private.cpp | 2 +- + 2 files changed, 11 insertions(+), 3 deletions(-) + +commit a4fad73c86a2eabe004e7cbaa8c9c0ff42146375 +Author: Albert Astals Cid +Date: Thu Dec 6 18:27:04 2018 +0100 + + cpp: Fix page::text_list encoding issue + + Text from TextoutputDev always comes in UTF-8 + + Well it comes in GlobalParams::textEncoding but that is UTF-8 and we + don't let people change it + + cpp/poppler-page.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2f442c6a54d5dc8941e40c12f814869b93ded400 +Author: Albert Astals Cid +Date: Thu Dec 6 20:15:51 2018 +0100 + + Update (C) + + cpp/poppler-document-private.h | 1 + + qt5/src/poppler-document.cc | 2 +- + qt5/src/poppler-private.cc | 1 + + qt5/src/poppler-private.h | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +commit 91419d2a2c4966a4e347b78c50b65625164257db +Author: Adam Reichold +Date: Mon Dec 3 19:57:18 2018 +0100 + + Make initialization of globalParams in the qt5 frontend threadsafe + so that multiple threads can create documents concurrently. + + qt5/src/poppler-document.cc | 1 + + qt5/src/poppler-private.cc | 4 ++++ + qt5/src/poppler-private.h | 2 ++ + 3 files changed, 7 insertions(+) + +commit e5ab9d3b387117d3d6f2e52de5d35882057fa209 +Author: Yuliana +Date: Mon Dec 3 19:50:50 2018 +0100 + + Make initialization of globalParams in the cpp frontend threadsafe + so that multiple threads can create documents concurrently. + + cpp/poppler-document-private.h | 1 + + cpp/poppler-document.cpp | 5 +++++ + 2 files changed, 6 insertions(+) + +commit ef3ef702bc3dc845731e43215400448c5324efd4 +Author: Oliver Sander +Date: Fri Nov 30 18:56:05 2018 +0100 + + Remove the file gtypes.h completely + + CMakeLists.txt | 1 - + fofi/FoFiBase.h | 2 -- + fofi/FoFiEncodings.h | 2 -- + fofi/FoFiIdentifier.cc | 1 - + fofi/FoFiTrueType.cc | 1 - + fofi/FoFiTrueType.h | 1 - + fofi/FoFiType1.h | 1 - + fofi/FoFiType1C.h | 1 - + goo/FixedPoint.h | 1 - + goo/GooString.h | 2 -- + goo/GooTimer.h | 1 - + goo/gdir.h | 1 - + goo/gfile.h | 1 - + goo/grandom.h | 2 -- + goo/gtypes.h | 31 ------------------------------- + poppler/BuiltinFont.h | 2 -- + poppler/CMap.h | 1 - + poppler/CachedFile.h | 1 - + poppler/CairoFontEngine.h | 1 - + poppler/CairoOutputDev.h | 1 - + poppler/CairoRescaleBox.h | 1 - + poppler/CharCodeToUnicode.h | 1 - + poppler/CompactFontTables.h | 2 -- + poppler/DateInfo.h | 1 - + poppler/Decrypt.h | 1 - + poppler/FontInfo.h | 1 - + poppler/Function.h | 1 - + poppler/Gfx.h | 1 - + poppler/GfxFont.h | 1 - + poppler/GfxState.h | 1 - + poppler/GlobalParams.h | 1 - + poppler/Hints.h | 1 - + poppler/JArithmeticDecoder.h | 2 -- + poppler/JBIG2Stream.h | 1 - + poppler/JPEG2000Stream.h | 1 - + poppler/JPXStream.h | 1 - + poppler/Linearization.h | 1 - + poppler/MarkedContentOutputDev.h | 1 - + poppler/Object.h | 1 - + poppler/OutputDev.h | 1 - + poppler/PSTokenizer.h | 2 -- + poppler/PageLabelInfo.h | 1 - + poppler/PreScanOutputDev.h | 1 - + poppler/SecurityHandler.h | 1 - + poppler/SplashOutputDev.h | 1 - + poppler/Stream.h | 1 - + poppler/StructElement.h | 1 - + poppler/StructTreeRoot.h | 1 - + poppler/TextOutputDev.h | 1 - + poppler/UnicodeMap.h | 1 - + poppler/UnicodeTypeTable.h | 2 -- + poppler/ViewerPreferences.h | 2 -- + poppler/XRef.h | 1 - + qt5/src/ArthurOutputDev.h | 1 - + splash/SplashFTFontEngine.h | 1 - + splash/SplashFont.h | 1 - + splash/SplashFontEngine.h | 1 - + splash/SplashFontFile.h | 1 - + splash/SplashFontFileID.h | 2 -- + splash/SplashGlyphBitmap.h | 2 -- + splash/SplashTypes.h | 2 -- + utils/HtmlOutputDev.h | 1 - + utils/HtmlUtils.h | 1 - + utils/ImageOutputDev.h | 1 - + utils/JSInfo.h | 1 - + utils/parseargs.h | 2 -- + utils/pdfdetach.cc | 1 - + utils/pdftocairo-win32.h | 1 - + utils/pdftocairo.cc | 1 - + 69 files changed, 113 deletions(-) + +commit cc51c2183cba19e84d2a7e2dddc0278418264357 +Author: Oliver Sander +Date: Fri Nov 30 18:18:13 2018 +0100 + + Replace Gulong by unsigned long + + goo/GooString.cc | 4 ++-- + goo/gtypes.h | 5 ----- + poppler/Decrypt.cc | 22 +++++++++++----------- + poppler/Movie.h | 2 +- + poppler/Rendition.cc | 2 +- + poppler/Stream.cc | 8 ++++---- + 6 files changed, 19 insertions(+), 24 deletions(-) + +commit 22053d55a26baf856a0b95552875e748dd1fb849 +Author: Oliver Sander +Date: Fri Nov 30 18:12:17 2018 +0100 + + Replace Guint by unsigned int + + fofi/FoFiBase.cc | 12 +- + fofi/FoFiBase.h | 6 +- + fofi/FoFiIdentifier.cc | 56 ++++---- + fofi/FoFiTrueType.cc | 114 +++++++-------- + fofi/FoFiTrueType.h | 20 +-- + fofi/FoFiType1.cc | 2 +- + glib/poppler-input-stream.cc | 8 +- + goo/GooString.cc | 4 +- + goo/gtypes.h | 1 - + poppler/Annot.cc | 2 +- + poppler/Annot.h | 6 +- + poppler/CMap.cc | 22 +-- + poppler/CMap.h | 8 +- + poppler/CachedFile.h | 2 +- + poppler/CairoFontEngine.cc | 10 +- + poppler/CairoFontEngine.h | 8 +- + poppler/Catalog.cc | 2 +- + poppler/Catalog.h | 4 +- + poppler/CharCodeToUnicode.cc | 2 +- + poppler/CurlPDFDocBuilder.cc | 2 +- + poppler/Decrypt.cc | 44 +++--- + poppler/Decrypt.h | 4 +- + poppler/FontInfo.cc | 2 +- + poppler/Function.cc | 6 +- + poppler/Gfx.cc | 4 +- + poppler/GfxFont.cc | 2 +- + poppler/GfxState.cc | 24 ++-- + poppler/GfxState.h | 10 +- + poppler/Hints.cc | 88 ++++++------ + poppler/Hints.h | 64 ++++----- + poppler/JArithmeticDecoder.cc | 22 +-- + poppler/JArithmeticDecoder.h | 22 +-- + poppler/JBIG2Stream.cc | 316 + +++++++++++++++++++++--------------------- + poppler/JBIG2Stream.h | 72 +++++----- + poppler/JPXStream.cc | 196 +++++++++++++------------- + poppler/JPXStream.h | 170 +++++++++++------------ + poppler/Linearization.cc | 14 +- + poppler/Linearization.h | 14 +- + poppler/PDFDoc.cc | 20 +-- + poppler/PDFDoc.h | 16 +-- + poppler/PSOutputDev.cc | 2 +- + poppler/SplashOutputDev.cc | 2 +- + poppler/Stream.cc | 12 +- + poppler/Stream.h | 10 +- + poppler/StructElement.h | 12 +- + poppler/UnicodeMap.cc | 4 +- + poppler/UnicodeMap.h | 2 +- + poppler/XRef.cc | 4 +- + qt5/src/poppler-form.cc | 2 +- + splash/Splash.cc | 54 ++++---- + splash/Splash.h | 2 +- + splash/SplashState.h | 2 +- + splash/SplashXPath.h | 2 +- + utils/pdfunite.cc | 4 +- + 54 files changed, 757 insertions(+), 758 deletions(-) + +commit b7503eb3c2364e7ca7fc37418bb4cc484437ea71 +Author: Oliver Sander +Date: Fri Nov 30 18:08:02 2018 +0100 + + Replace Gushort by unsigned short + + fofi/FoFiEncodings.cc | 6 +++--- + fofi/FoFiEncodings.h | 6 +++--- + fofi/FoFiType1C.cc | 16 ++++++++-------- + fofi/FoFiType1C.h | 6 +++--- + goo/gtypes.h | 1 - + poppler/BuiltinFont.cc | 2 +- + poppler/BuiltinFont.h | 4 ++-- + poppler/CompactFontTables.h | 6 +++--- + poppler/GfxFont.cc | 6 +++--- + poppler/GfxState.h | 4 ++-- + poppler/JPXStream.h | 2 +- + poppler/Movie.h | 4 ++-- + poppler/SplashOutputDev.cc | 6 +++--- + poppler/Stream.cc | 12 ++++++------ + poppler/Stream.h | 12 ++++++------ + qt5/src/ArthurOutputDev.cc | 2 +- + splash/SplashMath.h | 12 ++++++------ + utils/ImageOutputDev.cc | 2 +- + 18 files changed, 54 insertions(+), 55 deletions(-) + +commit 51bb46766cc5b50d81227cd91e518bc78b0a944b +Author: Oliver Sander +Date: Fri Nov 30 18:02:01 2018 +0100 + + Replace Guchar by unsigned char + + fofi/FoFiBase.cc | 2 +- + fofi/FoFiBase.h | 2 +- + fofi/FoFiTrueType.cc | 76 ++++---- + fofi/FoFiTrueType.h | 4 +- + fofi/FoFiType1.cc | 4 +- + fofi/FoFiType1C.cc | 44 ++--- + fofi/FoFiType1C.h | 4 +- + glib/poppler-input-stream.cc | 2 +- + glib/poppler-input-stream.h | 2 +- + goo/grandom.cc | 4 +- + goo/grandom.h | 2 +- + goo/gtypes.h | 1 - + poppler/CairoOutputDev.cc | 20 +- + poppler/DCTStream.cc | 2 +- + poppler/DCTStream.h | 2 +- + poppler/Decrypt.cc | 276 +++++++++++++-------------- + poppler/Decrypt.h | 30 +-- + poppler/FlateEncoder.h | 8 +- + poppler/Gfx.cc | 2 +- + poppler/GfxFont.h | 2 +- + poppler/GfxState.cc | 214 ++++++++++----------- + poppler/GfxState.h | 104 +++++----- + poppler/JArithmeticDecoder.cc | 2 +- + poppler/JArithmeticDecoder.h | 2 +- + poppler/JBIG2Stream.cc | 26 +-- + poppler/JBIG2Stream.h | 6 +- + poppler/JPEG2000Stream.cc | 4 +- + poppler/JPEG2000Stream.h | 4 +- + poppler/Object.h | 4 +- + poppler/PDFDoc.cc | 18 +- + poppler/PDFDoc.h | 8 +- + poppler/PSOutputDev.cc | 32 ++-- + poppler/Page.cc | 2 +- + poppler/Parser.cc | 4 +- + poppler/Parser.h | 4 +- + poppler/SecurityHandler.h | 6 +- + poppler/SplashOutputDev.cc | 156 +++++++-------- + poppler/SplashOutputDev.h | 12 +- + poppler/Stream.cc | 86 ++++----- + poppler/Stream.h | 52 ++--- + poppler/XRef.cc | 4 +- + poppler/XRef.h | 6 +- + qt5/src/ArthurOutputDev.cc | 10 +- + qt5/src/poppler-media.cc | 2 +- + qt5/src/poppler-page.cc | 2 +- + splash/Splash.cc | 432 + +++++++++++++++++++++--------------------- + splash/Splash.h | 12 +- + splash/SplashBitmap.cc | 18 +- + splash/SplashBitmap.h | 6 +- + splash/SplashClip.cc | 4 +- + splash/SplashClip.h | 2 +- + splash/SplashFTFont.cc | 4 +- + splash/SplashFont.cc | 4 +- + splash/SplashFont.h | 2 +- + splash/SplashGlyphBitmap.h | 2 +- + splash/SplashPath.cc | 6 +- + splash/SplashPath.h | 4 +- + splash/SplashScreen.cc | 18 +- + splash/SplashScreen.h | 10 +- + splash/SplashState.cc | 40 ++-- + splash/SplashState.h | 10 +- + splash/SplashTypes.h | 34 ++-- + splash/SplashXPathScanner.cc | 12 +- + test/perf-test.cc | 2 +- + utils/HtmlOutputDev.cc | 6 +- + utils/HtmlOutputDev.h | 2 +- + utils/ImageOutputDev.cc | 4 +- + utils/pdfinfo.cc | 2 +- + 68 files changed, 947 insertions(+), 948 deletions(-) + +commit 27954f7d44275d4fc458da680bba89ab749d3c07 +Author: Oliver Sander +Date: Fri Nov 30 17:55:48 2018 +0100 + + Move definition of type Goffset from gtypes.h to gfile.h + + Because it is used for file-related stuff. + + goo/gfile.h | 3 +++ + goo/gtypes.h | 1 - + poppler/Error.h | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) + +commit 9414cc632c17afb7b78c559447b2044268f06cfc +Author: Albert Astals Cid +Date: Thu Dec 6 17:22:06 2018 +0100 + + Poppler 0.72.0 + + CMakeLists.txt | 4 ++-- + NEWS | 27 +++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + 4 files changed, 31 insertions(+), 4 deletions(-) + +commit 8db8b4ead169e9ac3ad3f274828f6ad25951a6fb +Author: Albert Astals Cid +Date: Thu Dec 6 17:21:32 2018 +0100 + + qt5: Revert involuntary ABI change + + qt5/src/Doxyfile | 2 +- + qt5/src/poppler-link.cc | 4 ++-- + qt5/src/poppler-link.h | 6 ++++-- + 3 files changed, 7 insertions(+), 5 deletions(-) + +commit 4e53767cabc93a2c8d17b338bbf4309669696bd8 +Author: Christian Persch +Date: Sat Dec 1 22:26:03 2018 +0100 + + glib: docs: Reorganise sections + + Sort sections, and add missing functions. + + glib/reference/poppler-sections.txt | 762 + ++++++++++++++++++------------------ + glib/reference/poppler.types | 85 +++- + 2 files changed, 456 insertions(+), 391 deletions(-) + +commit a8bb420fe01be16293f0f4b18f299414afe0a125 +Author: Christian Persch +Date: Sat Dec 1 22:26:03 2018 +0100 + + glib: docs: Add missing indices of API-added-by-version + + glib/reference/poppler-docs.sgml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit a6aee51c1be09dcef03c1dfe924752bbb211ae6a +Author: Adam Reichold +Date: Wed Nov 28 20:36:50 2018 +0100 + + Fix typos in utils. + + utils/pdftohtml.cc | 2 +- + utils/pdftops.cc | 2 +- + utils/pdftotext.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit dc00f29828feb4192df59b1c1be783d631c2ef5a +Author: Albert Astals Cid +Date: Wed Nov 28 20:06:20 2018 +0100 + + Update (C) + + goo/GooString.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 853623c23e0c805e9b04c59f9449b388a485f31a +Author: Greg Knight +Date: Wed Nov 28 08:44:39 2018 -0500 + + use qt5 _data tests per Adam Reichold's recommendation + + qt5/tests/check_goostring.cpp | 32 +++++++++++++++++--------------- + 1 file changed, 17 insertions(+), 15 deletions(-) + +commit 96a0c301a13d02570f44dc0eafbc97b302e996cb +Author: Greg Knight +Date: Tue Nov 27 18:37:25 2018 -0500 + + add testFromInt to fail if GooString::fromInt is broken again + + qt5/tests/check_goostring.cpp | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit 903983bbd921a5139e3cd6de227b571870c764d8 +Author: Greg Knight +Date: Sun Nov 25 15:47:18 2018 -0500 + + gooString::fromInt: Repair the return value. + formatInt renders from "right to left" and returns the position of + the most significant digit in 'p' - which is not generally equal to + 'buf' in the case of GooString::fromInt (unless you're rendering a + 24-digit number.) + + This repairs several issues in pdftohtml + + goo/GooString.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8315a1234fb4332d202e3a728938359777706daa +Author: Aleix Pol +Date: Mon Nov 19 17:57:32 2018 +0100 + + Include an Android CI + + It uses the following image: + https://phabricator.kde.org/source/sysadmin-ci-tooling/browse/master/system-images/android/sdk/Dockerfile-clang + + The one we are using now as kdeorg/android-sdk is still using + GCC which + can't compile poppler master (it can compile last stable version, but + new features are used now and it can't cope). + KDE will start using this clang version when Qt 5.12 releases and we + know there's no major regressions, but poppler can already start doing + so now. + + It only checks that poppler builds correctly, doesn't execute + anything. + + .gitlab-ci.yml | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +commit 709f2e8d03e961e524f51312fff03b6e37854959 +Author: Albert Astals Cid +Date: Sun Nov 18 13:03:55 2018 +0100 + + Regenerate UnicodeDecompTables.h from python 3.7.1 + + Supposedly more complete Unicode information + + poppler/UnicodeDecompTables.h | 17870 + +++++++++++++++++++++------------------- + 1 file changed, 9358 insertions(+), 8512 deletions(-) + +commit 7bb75cc533339a8480c16fe432ae4034b7ff5c57 +Author: Elliott Sales de Andrade +Date: Mon Oct 22 00:26:40 2018 -0400 + + regtest: Fix file opened in wrong mode. + + regtest/HTMLReport.py | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit d02d1a1e62a13ff357815f13379a00f34b957233 +Author: Elliott Sales de Andrade +Date: Sun Oct 21 22:12:19 2018 -0400 + + regtest: Fix Printer.printerr. + + regtest/Printer.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1c3cc387a8d1686897801833ae1dd9493a48b708 +Author: Elliott Sales de Andrade +Date: Sun Oct 21 22:05:10 2018 -0400 + + regtest: Replace execfile with plain read & exec. + + regtest/Utils.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 60cf2c0fc385f2a8f60036136c957adf2193cdf9 +Author: Elliott Sales de Andrade +Date: Sun Oct 21 21:58:20 2018 -0400 + + regtest: Enable new-style division everywhere. + + regtest/Bisect.py | 2 +- + regtest/Config.py | 2 +- + regtest/HTMLReport.py | 2 +- + regtest/InterruptibleQueue.py | 2 +- + regtest/Printer.py | 2 +- + regtest/TestReferences.py | 2 +- + regtest/TestRun.py | 12 ++++++++---- + regtest/Timer.py | 2 +- + regtest/Utils.py | 2 +- + regtest/backends/__init__.py | 2 +- + regtest/backends/cairo.py | 2 +- + regtest/backends/postscript.py | 2 +- + regtest/backends/splash.py | 2 +- + regtest/backends/text.py | 2 +- + regtest/builder/__init__.py | 2 +- + regtest/builder/autotools.py | 2 +- + regtest/commands/__init__.py | 2 +- + regtest/commands/create-refs.py | 2 +- + regtest/commands/create-report.py | 2 +- + regtest/commands/find-regression.py | 2 +- + regtest/commands/run-tests.py | 2 +- + regtest/main.py | 2 +- + 22 files changed, 29 insertions(+), 25 deletions(-) + +commit 5a266afcf314660a0bf8b3aeffb6308c1c66f805 +Author: Elliott Sales de Andrade +Date: Sun Oct 21 21:54:09 2018 -0400 + + regtest: Enable absolute import on all files. + + regtest/Bisect.py | 2 +- + regtest/Config.py | 2 +- + regtest/HTMLReport.py | 2 +- + regtest/InterruptibleQueue.py | 2 +- + regtest/Printer.py | 2 +- + regtest/TestReferences.py | 2 +- + regtest/TestRun.py | 2 +- + regtest/Timer.py | 2 +- + regtest/Utils.py | 2 +- + regtest/backends/__init__.py | 2 +- + regtest/backends/cairo.py | 2 +- + regtest/backends/postscript.py | 2 +- + regtest/backends/splash.py | 2 +- + regtest/backends/text.py | 2 +- + regtest/builder/__init__.py | 2 +- + regtest/builder/autotools.py | 2 +- + regtest/commands/__init__.py | 2 +- + regtest/commands/create-refs.py | 2 +- + regtest/commands/create-report.py | 2 +- + regtest/commands/find-regression.py | 2 +- + regtest/commands/run-tests.py | 2 +- + regtest/main.py | 2 +- + 22 files changed, 22 insertions(+), 22 deletions(-) + +commit 557423168289490ec9ddf1301924667c82cb3481 +Author: Elliott Sales de Andrade +Date: Sun Oct 21 21:48:24 2018 -0400 + + regtest: Replace tabs with spaces. + + regtest/TestRun.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0c744c934927ebe644215d23d06677fd670175c4 +Author: Elliott Sales de Andrade +Date: Sun Oct 21 21:43:09 2018 -0400 + + regtest: Use print function everywhere. + + regtest/Bisect.py | 1 + + regtest/Config.py | 1 + + regtest/HTMLReport.py | 1 + + regtest/InterruptibleQueue.py | 1 + + regtest/Printer.py | 1 + + regtest/TestReferences.py | 1 + + regtest/TestRun.py | 1 + + regtest/Timer.py | 1 + + regtest/Utils.py | 1 + + regtest/backends/__init__.py | 1 + + regtest/backends/cairo.py | 1 + + regtest/backends/postscript.py | 1 + + regtest/backends/splash.py | 1 + + regtest/backends/text.py | 1 + + regtest/builder/__init__.py | 1 + + regtest/builder/autotools.py | 1 + + regtest/commands/__init__.py | 3 ++- + regtest/commands/create-refs.py | 1 + + regtest/commands/create-report.py | 1 + + regtest/commands/find-regression.py | 1 + + regtest/commands/run-tests.py | 1 + + regtest/main.py | 1 + + 22 files changed, 23 insertions(+), 1 deletion(-) + +commit 0c02573f7c43a5b02b29daf8cb7f94d3925137a9 +Author: Elliott Sales de Andrade +Date: Sun Oct 21 21:38:15 2018 -0400 + + regtest: Fix iteration through dictionary on Py3. + + regtest/HTMLReport.py | 6 +----- + regtest/commands/__init__.py | 3 +-- + 2 files changed, 2 insertions(+), 7 deletions(-) + +commit 98a84ba86d5b675b4cd490455c5f5d644235b5c3 +Author: Elliott Sales de Andrade +Date: Sun Oct 21 21:30:04 2018 -0400 + + regtest: Don't use exceptions for Printer singleton. + + In Python 3, exceptions must derive from the BaseException class, + which + Printer definitely does not do. + + regtest/Printer.py | 26 ++++++++++++-------------- + 1 file changed, 12 insertions(+), 14 deletions(-) + +commit 6c427f7ecb97780ae3405be9ba6c7f0d9fe934dc +Author: Elliott Sales de Andrade +Date: Sun Oct 21 21:15:26 2018 -0400 + + Support Python 3 in scripts. + + gtkdoc.py | 6 ++++- + poppler/gen-unicode-tables.py | 61 + +++++++++++++++++++++++++++---------------- + 2 files changed, 43 insertions(+), 24 deletions(-) + +commit a85c2ed8f4359341adb94887c4b551a761244fdb +Author: Albert Astals Cid +Date: Sat Nov 17 19:29:16 2018 +0100 + + Be more stubborn looking for a nssdb + + Fixes issue #669 + + poppler/SignatureHandler.cc | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +commit 647a9813c41d936feea063f42060535464314ccc +Author: Albert Astals Cid +Date: Fri Nov 16 23:14:13 2018 +0100 + + Save Object::copy on Page construction + + poppler/Catalog.cc | 4 ++-- + poppler/PDFDoc.cc | 2 +- + poppler/Page.cc | 16 ++++++++-------- + poppler/Page.h | 2 +- + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 8f158da92c53ae16a368f844965f57ba8ffed77d +Author: Adam Reichold +Date: Fri Nov 16 21:36:33 2018 +0100 + + Make GooString constructible and assignable from null pointers again + since some of the code expects it. + + goo/GooString.h | 12 ++++++------ + qt5/tests/check_goostring.cpp | 37 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 43 insertions(+), 6 deletions(-) + +commit e87818f7f9daff228fbc820aa78b3a08615e0826 +Author: Albert Astals Cid +Date: Fri Nov 16 17:12:24 2018 +0100 + + Two Object::copy calls less + + poppler/Catalog.cc | 3 +-- + poppler/Page.cc | 6 +++--- + 2 files changed, 4 insertions(+), 5 deletions(-) + +commit 13708e8fd48b4ce72276a99f32d54a2b3b016897 +Author: Albert Astals Cid +Date: Wed Nov 14 14:53:04 2018 +0100 + + Annot: Remove some inc/defRef by Object moving + + glib/poppler-action.cc | 2 +- + poppler/Annot.cc | 200 + ++++++++++++++++++++++++------------------------- + poppler/Annot.h | 46 ++++++------ + 3 files changed, 124 insertions(+), 124 deletions(-) + +commit aa864c8729595e64af136d181bfb581d80e03eb7 +Author: Albert Astals Cid +Date: Wed Nov 14 01:01:27 2018 +0100 + + Save an incRef/decRef when creating FormField + + poppler/Form.cc | 38 +++++++++++++++++++------------------- + poppler/Form.h | 12 ++++++------ + 2 files changed, 25 insertions(+), 25 deletions(-) + +commit f846c9a2ccdd975ead3b8287cbac0064841ef360 +Author: Albert Astals Cid +Date: Wed Nov 14 15:26:47 2018 +0100 + + JBIG2Stream: Move Object instead of copying it + + poppler/JBIG2Stream.cc | 6 +++--- + poppler/JBIG2Stream.h | 2 +- + poppler/Stream.cc | 5 +++-- + 3 files changed, 7 insertions(+), 6 deletions(-) + +commit 09952b05990a4c5bcd9763dd6701cefb13ab8e69 +Author: Albert Astals Cid +Date: Wed Nov 14 15:05:52 2018 +0100 + + AnnotFileAttachment::initialize: Save a Object::copy() + + poppler/Annot.cc | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit 20e8d51d6523ce6c92c1aab1b75d7c1bb64b441d +Author: Albert Astals Cid +Date: Wed Nov 14 15:02:49 2018 +0100 + + Remove unused AnnotPopup::setParent + + poppler/Annot.cc | 4 ---- + poppler/Annot.h | 1 - + 2 files changed, 5 deletions(-) + +commit 8d5931e6c585fcca27d127b0b804bc19d9188e49 +Author: Albert Astals Cid +Date: Wed Nov 14 14:58:41 2018 +0100 + + AnnotAppearance::getAppearanceStream: Save a copy() call + + poppler/Annot.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit c3a2c11a966a8e260a44716cbb0e26fa437b8f8d +Author: Albert Astals Cid +Date: Sun Oct 21 11:29:44 2018 +0200 + + Stream::makeFilter: Fix memory leak + + fixes oss-fuzz/9614 + + poppler/Stream.cc | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +commit d0ab87c1471349facd91caa65815670b1e3b7bb7 +Author: Albert Astals Cid +Date: Mon Nov 12 18:30:56 2018 +0100 + + Save an incRef/decRef when creating EmbFile + + poppler/FileSpec.cc | 12 +++++------- + poppler/FileSpec.h | 2 +- + 2 files changed, 6 insertions(+), 8 deletions(-) + +commit 08d4f02cdfa0f5ab0eccbc476f623dd334ce6432 +Author: Tobias Deiminger +Date: Mon Nov 12 19:13:04 2018 +0100 + + Fix parsing of line annotation LE values + + AnnotLine::initialize used to look for strings, which is wrong, + because PDF reference says "LE [...] An array of two names". + + poppler/Annot.cc | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit f1575bb7352eeaf26e6e1784c9bdff708c93280d +Author: Albert Astals Cid +Date: Sun Nov 11 23:17:46 2018 +0100 + + qt5: tests, go back to fromUt8, some tests failed on MSVC + + And don't feel like investigating why + + qt5/tests/check_password.cpp | 12 ++++++------ + qt5/tests/check_search.cpp | 24 ++++++++++++------------ + 2 files changed, 18 insertions(+), 18 deletions(-) + +commit 817b0f12453985c416a0388cdd4a09697d092b7f +Author: Oliver Sander +Date: Fri Nov 9 18:42:04 2018 +0100 + + Rename GooString::getCString GooString::c_str + + This is the name used by std::string. + + cpp/poppler-document.cpp | 4 +- + cpp/poppler-embedded-file.cpp | 6 +- + cpp/poppler-font.cpp | 4 +- + cpp/poppler-page.cpp | 2 +- + cpp/poppler-private.cpp | 2 +- + fofi/FoFiTrueType.cc | 48 +++++------ + fofi/FoFiType1C.cc | 168 + ++++++++++++++++++------------------ + glib/poppler-action.cc | 10 +-- + glib/poppler-attachment.cc | 2 +- + glib/poppler-document.cc | 22 ++--- + glib/poppler-media.cc | 4 +- + glib/poppler-movie.cc | 2 +- + glib/poppler-page.cc | 4 +- + goo/GooString.cc | 2 +- + goo/GooString.h | 2 +- + goo/gfile.cc | 32 +++---- + poppler/Annot.cc | 48 +++++------ + poppler/CairoFontEngine.cc | 4 +- + poppler/CairoOutputDev.cc | 6 +- + poppler/Catalog.cc | 6 +- + poppler/CharCodeToUnicode.cc | 6 +- + poppler/CurlCachedFile.cc | 6 +- + poppler/DateInfo.cc | 2 +- + poppler/Decrypt.cc | 54 ++++++------ + poppler/Error.cc | 6 +- + poppler/Form.cc | 20 ++--- + poppler/Function.cc | 6 +- + poppler/Gfx.cc | 10 +-- + poppler/GfxFont.cc | 12 +-- + poppler/GfxState.cc | 8 +- + poppler/GlobalParams.cc | 58 ++++++------- + poppler/GlobalParamsWin.cc | 28 +++--- + poppler/Lexer.cc | 2 +- + poppler/Link.cc | 8 +- + poppler/LocalPDFDocBuilder.cc | 2 +- + poppler/Object.cc | 2 +- + poppler/PDFDoc.cc | 32 +++---- + poppler/PSOutputDev.cc | 90 +++++++++---------- + poppler/PageLabelInfo.cc | 4 +- + poppler/Parser.cc | 2 +- + poppler/SignatureHandler.cc | 4 +- + poppler/SplashOutputDev.cc | 22 ++--- + poppler/StructElement.cc | 4 +- + poppler/StructElement.h | 2 +- + poppler/TextOutputDev.cc | 6 +- + poppler/UTF.cc | 2 +- + qt5/src/ArthurOutputDev.cc | 24 +++--- + qt5/src/poppler-annotation-helper.h | 4 +- + qt5/src/poppler-annotation.cc | 14 +-- + qt5/src/poppler-document.cc | 4 +- + qt5/src/poppler-embeddedfile.cc | 8 +- + qt5/src/poppler-form.cc | 6 +- + qt5/src/poppler-link.cc | 2 +- + qt5/src/poppler-movie.cc | 2 +- + qt5/src/poppler-page.cc | 10 +-- + qt5/src/poppler-private.cc | 12 +-- + qt5/src/poppler-private.h | 4 +- + qt5/src/poppler-sound.cc | 2 +- + qt5/tests/check_annotations.cpp | 2 +- + qt5/tests/check_goostring.cpp | 36 ++++---- + qt5/tests/check_pagelabelinfo.cpp | 10 +-- + qt5/tests/check_strings.cpp | 4 +- + splash/SplashBitmap.cc | 2 +- + splash/SplashFTFontEngine.cc | 4 +- + splash/SplashFTFontFile.cc | 6 +- + splash/SplashFontFile.cc | 2 +- + test/perf-test.cc | 2 +- + utils/HtmlFonts.cc | 8 +- + utils/HtmlFonts.h | 2 +- + utils/HtmlLinks.cc | 2 +- + utils/HtmlOutputDev.cc | 110 +++++++++++------------ + utils/HtmlOutputDev.h | 2 +- + utils/JSInfo.cc | 8 +- + utils/pdffonts.cc | 10 +-- + utils/pdfinfo.cc | 28 +++--- + utils/pdfsig.cc | 14 +-- + utils/pdftocairo-win32.cc | 22 ++--- + utils/pdftocairo.cc | 44 +++++----- + utils/pdftohtml.cc | 30 +++---- + utils/pdftoppm.cc | 14 +-- + utils/pdftops.cc | 6 +- + utils/pdftotext.cc | 16 ++-- + utils/pdfunite.cc | 10 +-- + utils/printencodings.cc | 2 +- + 84 files changed, 632 insertions(+), 632 deletions(-) + +commit fb7f34b1f9706c4912384eabd5dbf44b6c88c71d +Author: Albert Astals Cid +Date: Sun Nov 11 22:59:48 2018 +0100 + + Update (C) of last commits + + poppler/GfxState_helpers.h | 2 +- + qt5/src/poppler-annotation-helper.h | 2 +- + qt5/src/poppler-annotation.h | 2 +- + qt5/src/poppler-link.h | 2 +- + splash/SplashScreen.cc | 2 +- + splash/SplashXPathScanner.cc | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +commit 49d5b1b663faa883e774ec7e72ae211fcc625873 +Author: Tobias Deiminger +Date: Fri Nov 2 20:17:04 2018 +0100 + + Draw line annotation endings (arrow, circle, ...) + + Line endings are already parsed from /LE array and are gettable and + settable as enum value in current APIs. + + With this commit we implement the drawing operations so that line + endings become actually visible when document is rendered. + + poppler/Annot.cc | 174 + +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + poppler/Annot.h | 10 +++- + 2 files changed, 179 insertions(+), 5 deletions(-) + +commit c7161f7127644b2f85e7ef067a4929beeb1a71cb +Author: Albert Astals Cid +Date: Thu Nov 8 23:28:44 2018 +0100 + + Add a clazy -Werror CI + + Enables levels 0, 1 and 2, along with some manual ones + Disables non-pod-globa-static, StructElement would need some rework to + fix it and it's only a bit about optimization of start time, we + can live + with it + + .gitlab-ci.yml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 28e953cbab0059dff76c9cfa35c4522709968b0e +Author: Albert Astals Cid +Date: Wed Nov 7 19:22:49 2018 +0100 + + Minor clazy Qt fixes in tests and demo + + qt5/demos/abstractinfodock.cpp | 2 +- + qt5/demos/embeddedfiles.cpp | 2 +- + qt5/demos/fonts.cpp | 4 +- + qt5/demos/info.cpp | 4 +- + qt5/demos/navigationtoolbar.cpp | 9 ++-- + qt5/demos/optcontent.cpp | 2 +- + qt5/demos/pageview.h | 2 +- + qt5/demos/permissions.cpp | 2 +- + qt5/demos/thumbnails.cpp | 4 +- + qt5/demos/toc.cpp | 4 +- + qt5/demos/viewer.cpp | 34 ++++++++------ + qt5/demos/viewer.h | 2 +- + qt5/tests/check_actualtext.cpp | 4 +- + qt5/tests/check_annotations.cpp | 6 ++- + qt5/tests/check_attachments.cpp | 24 +++++----- + qt5/tests/check_dateConversion.cpp | 3 ++ + qt5/tests/check_fonts.cpp | 22 +++++---- + qt5/tests/check_forms.cpp | 2 + + qt5/tests/check_goostring.cpp | 8 ++-- + qt5/tests/check_lexer.cpp | 2 + + qt5/tests/check_links.cpp | 14 +++--- + qt5/tests/check_metadata.cpp | 10 ++-- + qt5/tests/check_object.cpp | 2 + + qt5/tests/check_optcontent.cpp | 42 +++++++++-------- + qt5/tests/check_pagelabelinfo.cpp | 2 + + qt5/tests/check_pagelayout.cpp | 2 + + qt5/tests/check_pagemode.cpp | 2 + + qt5/tests/check_password.cpp | 12 +++-- + qt5/tests/check_permissions.cpp | 2 + + qt5/tests/check_search.cpp | 94 + +++++++++++++++++++------------------- + qt5/tests/check_strings.cpp | 57 ++++++++++++----------- + qt5/tests/check_utf_conversion.cpp | 26 ++++++----- + qt5/tests/poppler-fonts.cpp | 6 +-- + qt5/tests/poppler-forms.cpp | 2 +- + qt5/tests/stress-poppler-dir.cpp | 18 ++++---- + qt5/tests/stress-poppler-qt5.cpp | 23 +++++----- + qt5/tests/stress-threads-qt5.cpp | 20 ++++---- + qt5/tests/test-password-qt5.cpp | 33 +++++++------ + qt5/tests/test-poppler-qt5.cpp | 33 +++++++------ + qt5/tests/test-render-to-file.cpp | 6 +-- + 40 files changed, 304 insertions(+), 244 deletions(-) + +commit 74ad4e3570f31afcb7e6e00e0d9cf2c53c3db6eb +Author: Albert Astals Cid +Date: Wed Nov 7 15:52:00 2018 +0100 + + char * -> QStringLiteral + + qt5/src/poppler-private.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 82b91c56d1a89c29108bf03b07e751b54b589446 +Author: Albert Astals Cid +Date: Wed Nov 7 15:48:39 2018 +0100 + + exclude some function-args-by-value and function-args-by-ref + + Since they are part of the API + + qt5/src/poppler-annotation.cc | 2 +- + qt5/src/poppler-annotation.h | 1 + + qt5/src/poppler-link.cc | 2 +- + qt5/src/poppler-link.h | 1 + + qt5/src/poppler-page-transition.cc | 2 +- + qt5/src/poppler-page-transition.h | 1 + + 6 files changed, 6 insertions(+), 3 deletions(-) + +commit 1ac74b477748c86263c737c6f1b3ac71fb4808bc +Author: Albert Astals Cid +Date: Wed Nov 7 15:34:20 2018 +0100 + + Pass small and trivially-copyable type by value + + fofi/FoFiTrueType.cc | 4 ++-- + poppler/Form.cc | 12 ++++++------ + poppler/Form.h | 12 ++++++------ + poppler/GfxFont.cc | 4 ++-- + poppler/GfxState_helpers.h | 2 +- + poppler/MarkedContentOutputDev.h | 2 +- + poppler/Object.h | 6 +++--- + poppler/OptionalContent.cc | 2 +- + poppler/OptionalContent.h | 2 +- + poppler/StructElement.cc | 2 +- + poppler/StructElement.h | 4 ++-- + poppler/StructTreeRoot.cc | 2 +- + poppler/StructTreeRoot.h | 2 +- + qt5/src/poppler-annotation-helper.h | 4 ++-- + qt5/src/poppler-link.cc | 12 ++++++------ + qt5/src/poppler-link.h | 4 ++-- + splash/SplashScreen.cc | 2 +- + splash/SplashXPathScanner.cc | 2 +- + 18 files changed, 40 insertions(+), 40 deletions(-) + +commit e69cd723679c4732d07dec13c60af800ba9c0e0a +Author: Albert Astals Cid +Date: Wed Nov 7 15:28:48 2018 +0100 + + No need to store to a QImage variable to not use it later + + Makes clazy happier + + qt5/tests/stress-poppler-dir.cpp | 2 +- + qt5/tests/stress-poppler-qt5.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 8969d8786e95cb86f20adfbc876466eddb1028e7 +Author: Albert Astals Cid +Date: Fri Nov 9 01:20:37 2018 +0100 + + NULL -> nullptr + + glib/poppler-form-field.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 54d003599920276710e7532b2250b302b459e2a4 +Author: Albert Astals Cid +Date: Thu Nov 8 23:12:15 2018 +0100 + + qt5: Add -DQT_NO_SIGNALS_SLOTS_KEYWORDS + + We don't have any signals or slots at the moment but add the + keyword so + if we ever add them it's using the Q_SIGNAL/Q_SLOT variant so we don't + get collisions with other people that use signal/slot + + qt5/src/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 178fdef48c18dfdb2f1efea780ffd320631defcd +Author: Albert Astals Cid +Date: Sat Nov 3 21:04:52 2018 +0100 + + Rework Parser::makeStream "entry" variable handling + + Scopes the entry variable so people don't try to use it in between + + poppler/Parser.cc | 36 +++++++++++++++++++++--------------- + 1 file changed, 21 insertions(+), 15 deletions(-) + +commit 426834dbf1c0981593773697a2c47308ecc38593 +Author: Albert Astals Cid +Date: Wed Nov 7 15:26:56 2018 +0100 + + NULL -> nullptr + + glib/poppler-attachment.cc | 2 +- + glib/poppler-document.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b8cae8886a2894502dc12ceba63f2aab62ab3992 +Author: Albert Astals Cid +Date: Tue Nov 6 22:11:28 2018 +0000 + + Update since to 0.72 + + glib/poppler-form-field.cc | 2 +- + glib/poppler-form-field.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d09f763b3ea5581f7819b46b659f3d9b1b5fd78c +Author: Elliott Sales de Andrade +Date: Thu Nov 7 00:51:11 2013 -0500 + + glib: Support getting form widget additional actions. + + glib/demo/forms.c | 40 ++++++++++++++++++++++++++++++++ + glib/poppler-form-field.cc | 57 + ++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-form-field.h | 24 +++++++++++++++++++ + glib/poppler-private.h | 4 ++++ + 4 files changed, 125 insertions(+) + +commit ee6166ab599c3d5f694191707c366653afa7b0d3 +Author: Elliott Sales de Andrade +Date: Thu Nov 7 00:50:38 2013 -0500 + + glib-demo: Fix indent for actions code. + + glib/demo/forms.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 744a3491675f22e36a5fba38f58bb90ec7291884 +Author: Albert Astals Cid +Date: Tue Nov 6 19:28:22 2018 +0100 + + Update (C) + + poppler/FileSpec.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d2f5d424ba8752f9a9e9dad410546ec1b46caa0a +Author: Adam Reichold +Date: Tue Nov 6 09:08:06 2018 +0100 + + pdfdetach: Check for valid file name of embedded file before using + it to determine save path. + + Closes #660 + + utils/pdfdetach.cc | 24 ++++++++++++++++++------ + 1 file changed, 18 insertions(+), 6 deletions(-) + +commit 77a30e94d96220d7e22dff5b3f0a7f296f01b118 +Author: Adam Reichold +Date: Tue Nov 6 09:13:41 2018 +0100 + + pdfdetach: Check for valid embedded file before trying to save it. + + Closes #661 + + utils/pdfdetach.cc | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit 6912e06d9ab19ba28991b5cab3319d61d856bd6d +Author: Adam Reichold +Date: Tue Nov 6 09:00:02 2018 +0100 + + Check for stream before calling stream methods when saving an + embedded file. + + Closes #659 + + poppler/FileSpec.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 6ced3253fa3356e50d6c1dfa8961561eabefb9e8 +Author: Christian Persch +Date: Tue Oct 23 23:42:47 2018 +0200 + + glib: Fix missing destructor call + + PopplerAttachmentPrivate has a Object member which + was never destructed, only set to an empty Object() + on dispose. While there is no memory leak (currently!), + this is still not correct. + + Fix this by making PopplerAttachmentPrivate a C++ class, + constructed in place of the gobject instance private in + init(), and call the destructor explicitly in finalize(). + + glib/poppler-attachment.cc | 28 +++++++++++----------------- + 1 file changed, 11 insertions(+), 17 deletions(-) + +commit 08572e1bdca03baed694dd9828bb2b878865e669 +Author: Albert Astals Cid +Date: Sat Nov 3 12:21:41 2018 +0100 + + Parser::makeStream: Fix crash on malformed files + + fixes oss-fuzz/11244 + + poppler/Parser.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 89fccf45fc5bfca3756102e6bec1950ec1d436a9 +Author: Albert Astals Cid +Date: Sat Nov 3 01:45:55 2018 +0100 + + initialize entry + + poppler/Parser.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2cd0ded91ad25a655ddd0c3ff14bc8c25c4eb410 +Author: Albert Astals Cid +Date: Sat Nov 3 01:43:30 2018 +0100 + + Update (C) + + poppler/Parser.cc | 1 + + poppler/XRef.h | 1 + + 2 files changed, 2 insertions(+) + +commit 3d35d209c19c1d3b09b794a0c863ba5de44a9c0a +Author: Marek Kasik +Date: Mon Oct 29 17:44:47 2018 +0100 + + Avoid cycles in PDF parsing + + Mark objects being processed in Parser::makeStream() as being + processed + and check the mark when entering this method to avoid processing + of the same object recursively. + + poppler/Parser.cc | 15 +++++++++++++++ + poppler/XRef.h | 1 + + 2 files changed, 16 insertions(+) + +commit 0c2cfbf9ca0b1d1c9a4fec9417035350753528f4 +Author: Albert Astals Cid +Date: Fri Nov 2 22:44:23 2018 +0100 + + Update (C) + + poppler/Form.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 91fa06ee9279c8ec9569f06c7ec871dd592c49e5 +Author: Nelson Benítez León +Date: Mon Oct 29 22:48:08 2018 +0500 + + Form.cc: fix checkbox lacking /AP cannot change state + + When a checkbox had no /AP key (which is not mandatory) + poppler was silently ignoring the setState() call that + changes the checked/unchecked state. + + Fixed by using getOnStr() instead of accessing onStr + directly, as the former has code in place to return + correct values when the field is a checkbox and has + no names for the On/Off states (as a result of not + having the /AP key which could contain those names). + + A testcase is included. An example definition of an + affected checkbox follows: + + /F 4 + /FT /Btn + /H /P + /MK /BC [1,0,0] /BG [1,1,1] /CA (4) + /Q 0 + /Rect [235.277,654.247,249.224,668.194] + /Subtype /Widget + /T (basiccheckbox) + /Type /Annot + /V /Off + + Fixes issue #655 + + poppler/Form.cc | 6 +++--- + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/check_forms.cpp | 43 + +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 47 insertions(+), 3 deletions(-) + +commit b645e64e906b4b8930cd380cc95b6d6777b96003 +Author: Albert Astals Cid +Date: Thu Nov 1 23:18:18 2018 +0100 + + Update (C) + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 52db12dd06fac5cfe9010c1f18ef719f2c6c3df2 +Author: Adrian Johnson +Date: Sun Oct 14 07:57:34 2018 +0000 + + cairo: Update comment + + poppler/CairoOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit cb307609b79187b72f5239330bf7f448d7101678 +Author: Adrian Johnson +Date: Thu Oct 11 08:42:14 2018 +0000 + + cairo: Don't use UNIQUE_ID for PS output + + to avoid using PS memory on cairo >= 1.5.10 + + poppler/CairoOutputDev.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 5d1e0a3576cd05565988ec697905924948727a87 +Author: Albert Astals Cid +Date: Thu Nov 1 12:00:13 2018 +0100 + + Workaround debian unstable not wanting to install libc++-dev + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ce774021d8330814f10d80b060b2870db5860641 +Author: Albert Astals Cid +Date: Wed Oct 31 22:13:17 2018 +0100 + + Poppler 0.71.0 + + CMakeLists.txt | 6 +++--- + NEWS | 23 +++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 28 insertions(+), 5 deletions(-) + +commit 8a971633e8b61afeed8edbc89be590a7c8a477dc +Author: luzpaz +Date: Wed Oct 31 01:02:14 2018 +0000 + + cpp/poppler-page-transition.cpp typo + + cpp/poppler-page-transition.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2be4ba842e023ea8662755b11b905c22e733e4c8 +Author: Albert Astals Cid +Date: Wed Oct 31 17:52:51 2018 +0100 + + qt5: Test two leaks in a test + + qt5/tests/check_annotations.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +commit aeb2c1798ef39b5d3a167f4531e9f09dcb18e88d +Author: Albert Astals Cid +Date: Wed Oct 31 17:38:26 2018 +0100 + + qt5: Fix crash when adding Highlight Annotations + + qt5/src/poppler-annotation.cc | 2 +- + qt5/tests/check_annotations.cpp | 31 +++++++++++++++++++++++++++++++ + 2 files changed, 32 insertions(+), 1 deletion(-) + +commit 2d6ba9b1483cd4ae7f90d2f7ddef5a08cc3082a2 +Author: Albert Astals Cid +Date: Tue Oct 30 00:11:06 2018 +0100 + + Fix crash if document is malformed (too wide) + + oss-fuzz/11195 + + splash/Splash.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit a186b43382a8c4e8a4443f9d7048a103499ba264 +Author: Albert Astals Cid +Date: Mon Oct 29 23:35:30 2018 +0100 + + Update (C) + + goo/GooString.cc | 1 + + poppler/StructElement.cc | 1 + + poppler/StructElement.h | 1 + + 3 files changed, 3 insertions(+) + +commit 48877b91db366293658a2561f08f110501872ce9 +Author: Adam Reichold +Date: Sat Oct 6 12:04:04 2018 +0200 + + Replace the implementation of GooString by std::string but keep the + exact interface intact. + + The approach is slightly different to GooList as it reimplements + GooString in terms of + std::string but keeps its interface intact and does expose any + std::string functionality + as of now. + + This is done since GooString has a significantly larger API surface + and exposing both API + would be quite confusing with with some overloads from GooString + and some from std::string + being visible. But it does mean we can align the API (they are + already pretty close) and + expose new things like a reserve method piece by piece. + + It also already helps in that the implementation of GooString is + gone except for the + original parts, i.e. the formatting, and we have zero cost conversion + from/to std::string + which should help in making more use of it elsewhere. It also gives + us do-nothing-access + to optimizations done for the standard library, e.g. word-level + implementations of + cmp and friends. + + (Note that the resulting GooString.cc is a bit funny as the formatting + helper are now + local to the translation unit, but I had to redeclare them to keep + the diff small as + I did not change them at all. But if this is done, they could probably + just be moved to + where the declarations are to make the source file more readable.) + + goo/GooString.cc | 368 + ++++++++++------------------------------------- + goo/GooString.h | 125 +++++++--------- + poppler/StructElement.cc | 15 +- + poppler/StructElement.h | 2 +- + 4 files changed, 135 insertions(+), 375 deletions(-) + +commit ebc05abc1dd0eed0f9a15fcc5a27195d141689ef +Author: Elliott Sales de Andrade +Date: Tue Oct 23 02:15:20 2018 -0400 + + glib-demo: Align property labels to top of cell. + + glib/demo/utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5993cc0afdd6f1ebb4e6738536309245e53be18f +Author: Albert Astals Cid +Date: Fri Oct 26 17:41:43 2018 +0200 + + qt5: Default to hidden symbols + + qt5/src/CMakeLists.txt | 4 ++++ + qt5/src/poppler-private.h | 8 ++++---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit ac8c9ade5b4e3776e709629e5fc38bc5362736b7 +Author: Alistair Thomas +Date: Mon Feb 12 15:04:15 2018 +0000 + + Remove glib/poppler.gidl + + The GIDL format was the pre-cursor to the GObject Introspection + Repository (GIR) format. Poppler has used GIR for a long time now. + + glib/poppler.gidl | 217 + ------------------------------------------------------ + 1 file changed, 217 deletions(-) + +commit 54a3233a061925c344c54639a7f6e27588af0b02 +Author: luzpaz +Date: Fri Oct 26 12:25:25 2018 +0000 + + poppler-toc.cpp: typo fix + + cpp/poppler-toc.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f235a53673abdd6cf6c2f69ba63a64fccb258b36 +Author: Adam Reichold +Date: Sat Sep 1 11:53:03 2018 +0200 + + Add fuzzer target from oss-fuzz project and integrate it into the + build system via FUZZER CMake variable. + + CMakeLists.txt | 9 +++++++-- + INSTALL | 4 ++++ + cpp/tests/CMakeLists.txt | 10 +++++----- + cpp/tests/pdf_fuzzer.cc | 49 + ++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 65 insertions(+), 7 deletions(-) + +commit c5cdf0cc01e9e61e3e4553d3e388a47ec5b41281 +Author: luzpaz +Date: Wed Oct 24 18:11:31 2018 +0000 + + Fix typo in comment + + cpp/poppler-document.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 163420b48bdddf9084208b3cadf04dafad52d40a +Author: Oliver Sander +Date: Sun Oct 21 08:28:56 2018 +0200 + + Replace GBool, gTrue, and gFalse by bool, true, false, resp. + + These are just non-standard names for bool, true, false, respectively. + Getting rid of these names saves on layer of mental redirection, + and enables proper syntax highlighting in editors. + + cpp/poppler-page-renderer.cpp | 10 +- + cpp/poppler-page.cpp | 26 +- + fofi/FoFiBase.cc | 36 +- + fofi/FoFiBase.h | 22 +- + fofi/FoFiIdentifier.cc | 152 ++++---- + fofi/FoFiTrueType.cc | 84 ++--- + fofi/FoFiTrueType.h | 18 +- + fofi/FoFiType1.cc | 32 +- + fofi/FoFiType1.h | 4 +- + fofi/FoFiType1C.cc | 268 +++++++------- + fofi/FoFiType1C.h | 50 +-- + glib/poppler-action.cc | 6 +- + glib/poppler-document.cc | 4 +- + glib/poppler-form-field.cc | 2 +- + glib/poppler-input-stream.cc | 18 +- + glib/poppler-input-stream.h | 12 +- + glib/poppler-page.cc | 44 +-- + glib/poppler-structure-element.cc | 4 +- + goo/FixedPoint.cc | 8 +- + goo/FixedPoint.h | 4 +- + goo/GooString.cc | 52 +-- + goo/GooString.h | 20 +- + goo/GooTimer.h | 2 +- + goo/gdir.h | 12 +- + goo/gfile.cc | 10 +- + goo/gtypes.h | 12 - + poppler/Annot.cc | 300 ++++++++-------- + poppler/Annot.h | 80 ++--- + poppler/Array.cc | 6 +- + poppler/Array.h | 2 +- + poppler/BuiltinFont.cc | 6 +- + poppler/BuiltinFont.h | 2 +- + poppler/CMap.cc | 18 +- + poppler/CMap.h | 4 +- + poppler/CairoFontEngine.cc | 62 ++-- + poppler/CairoFontEngine.h | 26 +- + poppler/CairoOutputDev.cc | 206 +++++------ + poppler/CairoOutputDev.h | 166 ++++----- + poppler/CairoRescaleBox.cc | 6 +- + poppler/CairoRescaleBox.h | 2 +- + poppler/Catalog.cc | 54 +-- + poppler/Catalog.h | 10 +- + poppler/CharCodeToUnicode.cc | 24 +- + poppler/CharCodeToUnicode.h | 6 +- + poppler/CurlPDFDocBuilder.cc | 8 +- + poppler/CurlPDFDocBuilder.h | 2 +- + poppler/DCTStream.cc | 4 +- + poppler/DCTStream.h | 4 +- + poppler/DateInfo.cc | 14 +- + poppler/DateInfo.h | 2 +- + poppler/Decrypt.cc | 96 ++--- + poppler/Decrypt.h | 20 +- + poppler/Dict.cc | 12 +- + poppler/Dict.h | 6 +- + poppler/FileSpec.cc | 16 +- + poppler/FileSpec.h | 10 +- + poppler/FlateEncoder.cc | 20 +- + poppler/FlateEncoder.h | 10 +- + poppler/FlateStream.cc | 4 +- + poppler/FlateStream.h | 2 +- + poppler/FontInfo.cc | 6 +- + poppler/FontInfo.h | 12 +- + poppler/Form.cc | 58 +-- + poppler/Form.h | 22 +- + poppler/Function.cc | 126 +++---- + poppler/Function.h | 32 +- + poppler/Gfx.cc | 240 ++++++------- + poppler/Gfx.h | 48 +-- + poppler/GfxFont.cc | 166 ++++----- + poppler/GfxFont.h | 46 +-- + poppler/GfxState.cc | 168 ++++----- + poppler/GfxState.h | 150 ++++---- + poppler/GlobalParams.cc | 168 ++++----- + poppler/GlobalParams.h | 54 +-- + poppler/GlobalParamsWin.cc | 188 +++++----- + poppler/Hints.cc | 56 +-- + poppler/Hints.h | 8 +- + poppler/JArithmeticDecoder.cc | 12 +- + poppler/JArithmeticDecoder.h | 8 +- + poppler/JBIG2Stream.cc | 142 ++++---- + poppler/JBIG2Stream.h | 42 +-- + poppler/JPEG2000Stream.cc | 28 +- + poppler/JPEG2000Stream.h | 4 +- + poppler/JPXStream.cc | 412 +++++++++++----------- + poppler/JPXStream.h | 52 +-- + poppler/Lexer.cc | 56 +-- + poppler/Lexer.h | 6 +- + poppler/Linearization.cc | 4 +- + poppler/Link.cc | 62 ++-- + poppler/Link.h | 76 ++-- + poppler/LocalPDFDocBuilder.cc | 8 +- + poppler/LocalPDFDocBuilder.h | 2 +- + poppler/MarkedContentOutputDev.cc | 12 +- + poppler/MarkedContentOutputDev.h | 12 +- + poppler/Movie.cc | 22 +- + poppler/Movie.h | 16 +- + poppler/Object.h | 60 ++-- + poppler/OptionalContent.cc | 22 +- + poppler/OptionalContent.h | 6 +- + poppler/Outline.cc | 4 +- + poppler/Outline.h | 6 +- + poppler/OutputDev.cc | 30 +- + poppler/OutputDev.h | 96 ++--- + poppler/PDFDoc.cc | 222 ++++++------ + poppler/PDFDoc.h | 72 ++-- + poppler/PDFDocBuilder.h | 4 +- + poppler/PSOutputDev.cc | 584 + +++++++++++++++---------------- + poppler/PSOutputDev.h | 228 ++++++------ + poppler/PSTokenizer.cc | 20 +- + poppler/PSTokenizer.h | 2 +- + poppler/Page.cc | 74 ++-- + poppler/Page.h | 50 +-- + poppler/PageLabelInfo.cc | 24 +- + poppler/PageLabelInfo.h | 4 +- + poppler/PageLabelInfo_p.h | 4 +- + poppler/PageTransition.cc | 6 +- + poppler/PageTransition.h | 8 +- + poppler/Parser.cc | 16 +- + poppler/Parser.h | 10 +- + poppler/PreScanOutputDev.cc | 128 +++---- + poppler/PreScanOutputDev.h | 60 ++-- + poppler/Rendition.cc | 26 +- + poppler/Rendition.h | 18 +- + poppler/SecurityHandler.cc | 24 +- + poppler/SecurityHandler.h | 20 +- + poppler/SplashOutputDev.cc | 408 ++++++++++----------- + poppler/SplashOutputDev.h | 156 ++++----- + poppler/StdinPDFDocBuilder.cc | 8 +- + poppler/StdinPDFDocBuilder.h | 2 +- + poppler/Stream.cc | 568 + +++++++++++++++--------------- + poppler/Stream.h | 226 ++++++------ + poppler/StructElement.cc | 214 +++++------ + poppler/StructElement.h | 34 +- + poppler/StructTreeRoot.cc | 2 +- + poppler/TextOutputDev.cc | 260 +++++++------- + poppler/TextOutputDev.h | 130 +++---- + poppler/UnicodeMap.cc | 8 +- + poppler/UnicodeMap.h | 10 +- + poppler/UnicodeTypeTable.cc | 32 +- + poppler/UnicodeTypeTable.h | 12 +- + poppler/ViewerPreferences.cc | 12 +- + poppler/ViewerPreferences.h | 24 +- + poppler/XRef.cc | 270 +++++++------- + poppler/XRef.h | 74 ++-- + qt5/src/ArthurOutputDev.cc | 30 +- + qt5/src/ArthurOutputDev.h | 28 +- + qt5/src/poppler-annotation-helper.h | 2 +- + qt5/src/poppler-annotation.cc | 2 +- + qt5/src/poppler-form.cc | 4 +- + qt5/src/poppler-link-extractor-private.h | 6 +- + qt5/src/poppler-link-extractor.cc | 2 +- + qt5/src/poppler-movie.cc | 2 +- + qt5/src/poppler-page-private.h | 4 +- + qt5/src/poppler-page.cc | 84 ++--- + qt5/src/poppler-ps-converter.cc | 20 +- + qt5/tests/check_pagelabelinfo.cpp | 4 +- + splash/Splash.cc | 254 +++++++------- + splash/Splash.h | 102 +++--- + splash/SplashBitmap.cc | 8 +- + splash/SplashBitmap.h | 10 +- + splash/SplashClip.cc | 8 +- + splash/SplashClip.h | 18 +- + splash/SplashFTFont.cc | 36 +- + splash/SplashFTFont.h | 10 +- + splash/SplashFTFontEngine.cc | 8 +- + splash/SplashFTFontEngine.h | 16 +- + splash/SplashFTFontFile.cc | 8 +- + splash/SplashFTFontFile.h | 6 +- + splash/SplashFont.cc | 20 +- + splash/SplashFont.h | 10 +- + splash/SplashFontEngine.cc | 14 +- + splash/SplashFontEngine.h | 12 +- + splash/SplashFontFile.cc | 18 +- + splash/SplashFontFile.h | 12 +- + splash/SplashFontFileID.h | 2 +- + splash/SplashGlyphBitmap.h | 4 +- + splash/SplashMath.h | 2 +- + splash/SplashPath.cc | 8 +- + splash/SplashPath.h | 10 +- + splash/SplashPattern.cc | 4 +- + splash/SplashPattern.h | 18 +- + splash/SplashScreen.h | 2 +- + splash/SplashState.cc | 36 +- + splash/SplashState.h | 22 +- + splash/SplashXPath.cc | 12 +- + splash/SplashXPath.h | 6 +- + splash/SplashXPathScanner.cc | 36 +- + splash/SplashXPathScanner.h | 20 +- + test/gtk-test.cc | 4 +- + test/pdf-fullrewrite.cc | 78 ++--- + test/pdf-inspector.cc | 4 +- + test/perf-test.cc | 20 +- + utils/HtmlFonts.cc | 22 +- + utils/HtmlFonts.h | 22 +- + utils/HtmlLinks.cc | 10 +- + utils/HtmlLinks.h | 6 +- + utils/HtmlOutputDev.cc | 102 +++--- + utils/HtmlOutputDev.h | 54 +-- + utils/HtmlUtils.h | 8 +- + utils/ImageOutputDev.cc | 54 +-- + utils/ImageOutputDev.h | 64 ++-- + utils/JSInfo.cc | 14 +- + utils/JSInfo.h | 6 +- + utils/parseargs.cc | 40 +-- + utils/parseargs.h | 10 +- + utils/pdfdetach.cc | 26 +- + utils/pdffonts.cc | 8 +- + utils/pdfimages.cc | 40 +-- + utils/pdfinfo.cc | 46 +-- + utils/pdfseparate.cc | 6 +- + utils/pdfsig.cc | 10 +- + utils/pdftocairo-win32.cc | 32 +- + utils/pdftocairo-win32.h | 8 +- + utils/pdftocairo.cc | 122 +++---- + utils/pdftohtml.cc | 78 ++--- + utils/pdftoppm.cc | 68 ++-- + utils/pdftops.cc | 76 ++-- + utils/pdftotext.cc | 44 +-- + utils/pdfunite.cc | 24 +- + 219 files changed, 5479 insertions(+), 5491 deletions(-) + +commit 22dd47a64222bf967d57b986539ae1be46bc06a7 +Author: Elliott Sales de Andrade +Date: Sun Oct 21 18:48:40 2018 -0400 + + Use GDateTime to format dates in GLib demo. + + Removing localtime_r allows the demo to be built on Windows. + + glib/demo/utils.c | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +commit 2125bfa4b754088fd9f753aea70ec08ea14dd4bc +Author: Elliott Sales de Andrade +Date: Sun Oct 21 18:20:18 2018 -0400 + + Remove SYSTEM flag from another file for mingw build. + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 497498f02c2b26aa7cfa8f9bc881b305b13796d8 +Author: Elliott Sales de Andrade +Date: Sun Oct 21 17:55:12 2018 -0400 + + Use dnf on Fedora instead of yum. + + dnf replaced yum a few releases ago. + + .gitlab-ci.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5b1faed4a8b4a749d06fc192770bb38e98631972 +Author: Elliott Sales de Andrade +Date: Sun Oct 21 17:47:38 2018 -0400 + + Enable searching for GTK on Windows. + + There's no reason it can't be available (either natively, or when + cross-compiling with mingw). + + cmake/modules/FindGTK.cmake | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit f47c25939e8ef6ee995d312bac219791fc5b0236 +Author: Albert Astals Cid +Date: Tue Oct 23 00:02:56 2018 +0200 + + We don't need the LCMS find module anymore + + We only support lcms2 for a while + + cmake/modules/FindLCMS.cmake | 84 + -------------------------------------------- + 1 file changed, 84 deletions(-) + +commit 3867958e84a7a136e5e86157617a3fc64988ee69 +Author: Albert Astals Cid +Date: Mon Oct 22 21:49:34 2018 +0200 + + 0.70.1 + + CMakeLists.txt | 2 +- + NEWS | 4 ++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 7 insertions(+), 3 deletions(-) + +commit 0e012fcdc3258fe788cf53053bb1fe33846285f1 +Author: Christian Persch +Date: Mon Oct 22 18:33:38 2018 +0200 + + glib: Install missing header + + https://gitlab.freedesktop.org/poppler/poppler/issues/647 + + glib/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 0eb4224ae15b0c9ac641c829de0d4ae1b15b609d +Author: Albert Astals Cid +Date: Mon Oct 22 00:31:13 2018 +0200 + + also install libgtk3-dev so that glib demo is built + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1a43637fc8278ba8ede00fa68a7565ad3626edba +Author: Albert Astals Cid +Date: Sun Oct 21 18:47:56 2018 +0200 + + Poppler 0.70.0 + + CMakeLists.txt | 4 ++-- + NEWS | 21 +++++++++++++++++++++ + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 27 insertions(+), 6 deletions(-) + +commit 2639d577cfebac60c81788442359cfac975e222d +Author: Albert Astals Cid +Date: Sun Oct 21 18:46:26 2018 +0200 + + Remove commented out code + + poppler/Annot.h | 1 - + 1 file changed, 1 deletion(-) + +commit af161a35025edfca7c96e66ad8642e85b5b504cb +Author: Albert Astals Cid +Date: Sun Oct 21 18:43:56 2018 +0200 + + Update (C) + + cpp/poppler-document.cpp | 1 + + cpp/poppler-font.cpp | 1 + + cpp/poppler-page.cpp | 2 +- + goo/GooList.h | 1 + + goo/grandom.cc | 1 + + goo/grandom.h | 3 ++- + poppler/Annot.cc | 2 +- + poppler/Annot.h | 3 ++- + poppler/CMap.cc | 1 + + poppler/CMap.h | 1 + + poppler/CairoFontEngine.cc | 1 + + poppler/CairoFontEngine.h | 1 + + poppler/CairoOutputDev.cc | 1 + + poppler/Decrypt.cc | 1 + + poppler/FontInfo.cc | 1 + + poppler/Gfx.h | 1 + + poppler/GfxState.h | 1 + + poppler/Link.cc | 1 + + poppler/MarkedContentOutputDev.cc | 1 + + poppler/Outline.cc | 1 + + poppler/OutputDev.cc | 2 +- + poppler/PDFDoc.h | 2 +- + poppler/PDFDocFactory.cc | 1 + + poppler/Page.cc | 1 + + poppler/Page.h | 1 + + poppler/PageLabelInfo_p.h | 1 + + poppler/PopplerCache.h | 1 + + poppler/PreScanOutputDev.cc | 2 +- + poppler/PreScanOutputDev.h | 2 +- + poppler/TextOutputDev.cc | 1 + + poppler/UnicodeMap.cc | 2 +- + poppler/XRef.cc | 2 ++ + poppler/XRef.h | 1 + + qt5/src/ArthurOutputDev.h | 2 +- + qt5/src/poppler-annotation-helper.h | 2 ++ + qt5/src/poppler-annotation.cc | 1 + + qt5/src/poppler-fontinfo.cc | 1 + + qt5/src/poppler-page.cc | 1 + + splash/Splash.cc | 1 + + splash/SplashBitmap.cc | 2 +- + splash/SplashFTFont.cc | 1 + + splash/SplashFTFont.h | 1 + + splash/SplashFTFontFile.cc | 2 +- + splash/SplashFTFontFile.h | 2 +- + splash/SplashFont.cc | 1 + + splash/SplashFont.h | 1 + + splash/SplashFontEngine.cc | 1 + + splash/SplashFontEngine.h | 1 + + splash/SplashXPathScanner.cc | 1 + + splash/SplashXPathScanner.h | 1 + + utils/HtmlFonts.cc | 1 + + utils/HtmlFonts.h | 1 + + utils/HtmlOutputDev.cc | 1 + + utils/ImageOutputDev.h | 1 + + utils/pdftocairo-win32.cc | 2 +- + utils/printencodings.cc | 1 + + 56 files changed, 60 insertions(+), 14 deletions(-) + +commit fdea0c5c03fac42c783b7f134c153dc9db0a5262 +Author: Philipp Knechtges +Date: Sun Oct 21 16:58:11 2018 +0200 + + Adjust pdf writing to honor PDF/A rules + + PDF/A as can be tested with VeraPDF requires: + - Second line needs to be a comment line with four characters with + byte encoding above 127 + - "obj" needs to be followed by a new line + - "endobj" needs to start on a new line + + poppler/PDFDoc.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit f5e3f799eb791c0dae3acf12283c574bf4e008c0 +Author: Albert Astals Cid +Date: Sun Oct 21 17:39:21 2018 +0200 + + PDFDoc: Add some const + + poppler/PDFDoc.cc | 2 +- + poppler/PDFDoc.h | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 4ef2020d036c5b6b11040be2e2685746434778e5 +Author: Christian Persch +Date: Fri Oct 19 22:46:15 2018 +0200 + + glib: Only export symbols in the public API + + poppler-glib exported lots of internal C++ symbols + that are not in the public API, nor have any ABI + guarantees. + + Mark all public functions with POPPLER_PUBLIC, and + use symbol visibility to hide everything else. + + glib/CMakeLists.txt | 3 ++ + glib/poppler-action.h | 6 +++ + glib/poppler-annot.h | 68 ++++++++++++++++++++++++++++++++++ + glib/poppler-attachment.h | 3 ++ + glib/poppler-date.h | 3 ++ + glib/poppler-document.h | 80 + ++++++++++++++++++++++++++++++++++++++++ + glib/poppler-enums.h.template | 3 ++ + glib/poppler-form-field.h | 33 +++++++++++++++++ + glib/poppler-layer.h | 7 ++++ + glib/poppler-macros.h | 33 +++++++++++++++++ + glib/poppler-media.h | 6 +++ + glib/poppler-movie.h | 5 +++ + glib/poppler-page.h | 78 + +++++++++++++++++++++++++++++++++++++++ + glib/poppler-structure-element.h | 72 + ++++++++++++++++++++++++++++++++++++ + glib/poppler.h | 5 +++ + 15 files changed, 405 insertions(+) + +commit 1d8df8e36b5627a4dffbfe76e384022daf6e4eb1 +Author: Christian Persch +Date: Fri Oct 19 23:48:49 2018 +0200 + + pdf-inspector: Link to the right libraries + + pdf-inspector doesn't use libpoppler-glib, but linked to it. + Changing it to link only to libpoppler revealed that it + used lots of symbols from poppler-glib that poppler-glib + should not export. Fix that by adding the necessary sources + to the pdf-inspector sources and linking to the libraries + needed by these sources (freetype, pthreads). + + test/CMakeLists.txt | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 20dfaa9e0b993567055c01902527bcddb9017520 +Author: Evangelos Rigas +Date: Mon Sep 24 15:59:44 2018 +0100 + + Add support for PDF subtype property (glib backend) + + Export PDFSubtype, PDFSubtypePart, and PDFSubtypeConformance + to GLib as enums and add function to get the GTS string based + on the PDF Subtype. + + Add PDF Subtype documentation reference in glib. + + glib/poppler-document.cc | 252 + ++++++++++++++++++++++++++++++++++++ + glib/poppler-document.h | 87 +++++++++++++ + glib/reference/poppler-sections.txt | 13 ++ + 3 files changed, 352 insertions(+) + +commit 8dc68b38874ed1b8f61c051b9b9a5c41d6dd60c2 +Author: Albert Astals Cid +Date: Wed Oct 17 23:07:41 2018 +0200 + + GfxFunctionShading::parse: Fix memory leak on broken files + + oss-fuzz/11020 + + poppler/GfxState.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit f162ecdea0dda5dbbdb45503c1d55d9afaa41d44 +Author: Marek Kasik +Date: Fri Apr 20 11:38:13 2018 +0200 + + Fix crash on missing embedded file + + Check whether an embedded file is actually present in the PDF + and show warning in that case. + + https://bugs.freedesktop.org/show_bug.cgi?id=106137 + https://gitlab.freedesktop.org/poppler/poppler/issues/236 + + glib/poppler-attachment.cc | 26 +++++++++++++++++--------- + glib/poppler-document.cc | 3 ++- + 2 files changed, 19 insertions(+), 10 deletions(-) + +commit 114ec1fc50595fdfadd1be6b2ae4fc1923f0cf50 +Author: Albert Astals Cid +Date: Tue Oct 16 19:43:30 2018 +0200 + + CI: fedora fixed their mingw packages, remove workaround + + .gitlab-ci.yml | 3 --- + 1 file changed, 3 deletions(-) + +commit 710534c7229c42c85038b4263fc67f4ff4a94182 +Author: Albert Astals Cid +Date: Tue Oct 16 19:58:27 2018 +0200 + + Check for overflow in Splash::scaleImageYdXd + + oss-fuzz/11006 + + splash/Splash.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 5b9f42db983e1d5e915373cf554a50ce4e9b7ef0 +Author: Tobias Deiminger +Date: Mon Oct 15 08:25:14 2018 +0200 + + Make Page::renderToImage with Arthur more thread safe + + An application using ArthurBackend can be subject to multi threading. + So better use a copy of XRef during rendering, just the same as it's + already done when using SplashBackend. + + qt5/src/poppler-page.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a32fb958e48ced022a358b5933ae669923f81bb3 +Author: Stefan Brüns +Date: Sun May 27 06:10:37 2018 +0200 + + SplashXPathScanner: Force inlining of addIntersection + + The majority of the code in addIntersection can be optimized away for + vertical (x0 == x1) and horizontal (count == 0) segments, thus + the inlined + code is less than the function call setup alone. + This leaves diagonal segments as the only remaining call site, i.e. + inlining here is a net win as well. + + Reduces runtime for #57 (fdo#96728, runsforever-poppler.pdf) from + 1442 seconds + to 1239 seconds (86%), and #24 (fdo#78728, surf-types.pdf) from ~ + 5.0 seconds + to 4.7 seconds. + + splash/SplashXPathScanner.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 97f310b1c5e29e4c323a1688c20b2754e9b36adc +Author: Stefan Brüns +Date: Sun May 27 06:10:36 2018 +0200 + + SplashXPathScanner: Move more invariant code out of the loop + + "seg->x0 - seg->y0 * seg->dxdy" is constant and can be moved out + of the + loop. + The next start point is the old end point. Thus, only the new + x coordinate + has to clamped (segXMin <= xx1 <= segXMax), also do the 'floor' + operation + just once per loop. + + According to valgrind/callgrind, this reduces instruction count in + computeIntersections() for #24 (fdo#78728) by 6%. No change for + fdo#96728. + + splash/SplashXPathScanner.cc | 34 ++++++++++++++++++++-------------- + 1 file changed, 20 insertions(+), 14 deletions(-) + +commit d8ba50c6638ad6720188c0c8237ffb5bbc3af490 +Author: Stefan Brüns +Date: Sat May 26 21:34:49 2018 +0200 + + SplashXPathScanner: Move invariant checks out of addIntersection loop + + For horizontal segments, count is always 0. For vertical/diagonal + segments, + the count depends on the winding rule (EvenOdd/NonZero) and the + direction, + but is constant for each segment. + + Reduces runtime for #57 (fdo#96728) from 1773 seconds to 1442 seconds + (81%). + + splash/SplashXPathScanner.cc | 22 ++++++++++------------ + splash/SplashXPathScanner.h | 3 +-- + 2 files changed, 11 insertions(+), 14 deletions(-) + +commit 5f817cb2067a226bc7bc271a42e66bbbf2811d98 +Author: Tobias Deiminger +Date: Mon Oct 1 21:39:06 2018 +0200 + + Skip XRef reconstruction for new-style XRef streams + + XRef::constructXRef was invented to support old style XRef tables. + Sadly it won't work for XRef streams. If applied anyway, it + corrupts our + existing XRef::entries array. Better skip reconstruction for the + XRef-stream-case + in XRef::readXRefUntil (just like XRef::fetch already does). + + Fixes #139. + + poppler/XRef.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 7f20ace4579f69fc3bd0f975fadec37134c3782c +Author: Adam Reichold +Date: Wed Oct 10 07:44:58 2018 +0200 + + Remove usage of pragmas interface and implementation + + GCC recommends not using them for a long time and its documentation + says: + > These #pragmas have been superceded as of GCC 2.7.2 by COMDAT + support + > and the “key method” heuristic mentioned in Vague Linkage. + > Using them can actually cause your program to grow due to + > unnecessary out-of-line copies of inline functions. + + Also nobody seems to set USE_GCC_PRAGMAS and sometimes they were + guarded by just __GNUC__ which upsets Clang. + + fofi/FoFiBase.cc | 4 ---- + fofi/FoFiBase.h | 4 ---- + fofi/FoFiEncodings.cc | 4 ---- + fofi/FoFiEncodings.h | 4 ---- + fofi/FoFiIdentifier.cc | 4 ---- + fofi/FoFiIdentifier.h | 4 ---- + fofi/FoFiTrueType.cc | 4 ---- + fofi/FoFiTrueType.h | 4 ---- + fofi/FoFiType1.cc | 4 ---- + fofi/FoFiType1.h | 4 ---- + fofi/FoFiType1C.cc | 4 ---- + fofi/FoFiType1C.h | 4 ---- + goo/FixedPoint.cc | 4 ---- + goo/FixedPoint.h | 4 ---- + goo/GooString.cc | 4 ---- + goo/GooString.h | 4 ---- + goo/GooTimer.cc | 4 ---- + goo/GooTimer.h | 4 ---- + poppler/Annot.cc | 4 ---- + poppler/Annot.h | 4 ---- + poppler/Array.cc | 4 ---- + poppler/Array.h | 4 ---- + poppler/BuiltinFont.cc | 4 ---- + poppler/BuiltinFont.h | 4 ---- + poppler/CMap.cc | 4 ---- + poppler/CMap.h | 4 ---- + poppler/CairoFontEngine.cc | 4 ---- + poppler/CairoFontEngine.h | 4 ---- + poppler/CairoOutputDev.cc | 4 ---- + poppler/CairoOutputDev.h | 4 ---- + poppler/Catalog.cc | 4 ---- + poppler/Catalog.h | 4 ---- + poppler/CharCodeToUnicode.cc | 4 ---- + poppler/CharCodeToUnicode.h | 4 ---- + poppler/DCTStream.h | 9 --------- + poppler/Decrypt.cc | 4 ---- + poppler/Decrypt.h | 4 ---- + poppler/Dict.cc | 4 ---- + poppler/Dict.h | 4 ---- + poppler/Error.cc | 4 ---- + poppler/Error.h | 4 ---- + poppler/FileSpec.h | 4 ---- + poppler/FlateEncoder.cc | 4 ---- + poppler/FlateEncoder.h | 4 ---- + poppler/FlateStream.cc | 4 ---- + poppler/FlateStream.h | 9 --------- + poppler/Form.cc | 4 ---- + poppler/Form.h | 4 ---- + poppler/Function.cc | 4 ---- + poppler/Function.h | 4 ---- + poppler/Gfx.cc | 4 ---- + poppler/Gfx.h | 4 ---- + poppler/GfxFont.cc | 4 ---- + poppler/GfxFont.h | 4 ---- + poppler/GfxState.cc | 4 ---- + poppler/GfxState.h | 4 ---- + poppler/GlobalParams.cc | 4 ---- + poppler/GlobalParams.h | 4 ---- + poppler/GlobalParamsWin.cc | 4 ---- + poppler/JArithmeticDecoder.cc | 4 ---- + poppler/JArithmeticDecoder.h | 4 ---- + poppler/JBIG2Stream.cc | 4 ---- + poppler/JBIG2Stream.h | 4 ---- + poppler/JPXStream.cc | 4 ---- + poppler/JPXStream.h | 4 ---- + poppler/Lexer.cc | 4 ---- + poppler/Lexer.h | 4 ---- + poppler/Link.cc | 4 ---- + poppler/Link.h | 4 ---- + poppler/NameToCharCode.cc | 4 ---- + poppler/NameToCharCode.h | 4 ---- + poppler/Object.cc | 4 ---- + poppler/Object.h | 4 ---- + poppler/OptionalContent.cc | 4 ---- + poppler/OptionalContent.h | 4 ---- + poppler/Outline.cc | 4 ---- + poppler/Outline.h | 4 ---- + poppler/OutputDev.cc | 4 ---- + poppler/OutputDev.h | 4 ---- + poppler/PDFDoc.cc | 4 ---- + poppler/PDFDoc.h | 4 ---- + poppler/PSOutputDev.cc | 4 ---- + poppler/PSOutputDev.h | 4 ---- + poppler/PSTokenizer.cc | 4 ---- + poppler/PSTokenizer.h | 4 ---- + poppler/Page.cc | 4 ---- + poppler/Page.h | 4 ---- + poppler/PageTransition.cc | 4 ---- + poppler/PageTransition.h | 4 ---- + poppler/Parser.cc | 4 ---- + poppler/Parser.h | 4 ---- + poppler/PreScanOutputDev.cc | 4 ---- + poppler/PreScanOutputDev.h | 4 ---- + poppler/ProfileData.cc | 4 ---- + poppler/ProfileData.h | 4 ---- + poppler/SecurityHandler.cc | 4 ---- + poppler/SecurityHandler.h | 4 ---- + poppler/SplashOutputDev.cc | 4 ---- + poppler/SplashOutputDev.h | 4 ---- + poppler/Stream.cc | 4 ---- + poppler/Stream.h | 4 ---- + poppler/StructElement.cc | 4 ---- + poppler/StructElement.h | 4 ---- + poppler/StructTreeRoot.cc | 4 ---- + poppler/StructTreeRoot.h | 4 ---- + poppler/TextOutputDev.cc | 4 ---- + poppler/TextOutputDev.h | 4 ---- + poppler/UTF.h | 4 ---- + poppler/UnicodeMap.cc | 4 ---- + poppler/UnicodeMap.h | 4 ---- + poppler/XRef.cc | 4 ---- + poppler/XRef.h | 4 ---- + qt5/src/ArthurOutputDev.cc | 4 ---- + qt5/src/ArthurOutputDev.h | 4 ---- + splash/Splash.cc | 4 ---- + splash/Splash.h | 4 ---- + splash/SplashBitmap.cc | 4 ---- + splash/SplashBitmap.h | 4 ---- + splash/SplashClip.cc | 4 ---- + splash/SplashClip.h | 4 ---- + splash/SplashFTFont.cc | 4 ---- + splash/SplashFTFont.h | 4 ---- + splash/SplashFTFontEngine.cc | 4 ---- + splash/SplashFTFontEngine.h | 4 ---- + splash/SplashFTFontFile.cc | 4 ---- + splash/SplashFTFontFile.h | 4 ---- + splash/SplashFont.cc | 4 ---- + splash/SplashFont.h | 4 ---- + splash/SplashFontEngine.cc | 4 ---- + splash/SplashFontEngine.h | 4 ---- + splash/SplashFontFile.cc | 4 ---- + splash/SplashFontFile.h | 4 ---- + splash/SplashFontFileID.cc | 4 ---- + splash/SplashFontFileID.h | 4 ---- + splash/SplashPath.cc | 4 ---- + splash/SplashPath.h | 4 ---- + splash/SplashPattern.cc | 4 ---- + splash/SplashPattern.h | 4 ---- + splash/SplashScreen.cc | 4 ---- + splash/SplashScreen.h | 4 ---- + splash/SplashState.cc | 4 ---- + splash/SplashState.h | 4 ---- + splash/SplashXPath.cc | 4 ---- + splash/SplashXPath.h | 4 ---- + splash/SplashXPathScanner.cc | 4 ---- + splash/SplashXPathScanner.h | 4 ---- + test/gtk-test.cc | 4 ---- + test/pdf-inspector.cc | 4 ---- + utils/HtmlOutputDev.cc | 4 ---- + utils/HtmlOutputDev.h | 4 ---- + utils/ImageOutputDev.cc | 4 ---- + utils/ImageOutputDev.h | 4 ---- + 152 files changed, 618 deletions(-) + +commit e1501603b6f043a40586ff0babf34980a6f03b15 +Author: Adam Reichold +Date: Tue Oct 9 21:36:57 2018 +0200 + + Remove unused function in Decrypt translation unit. + + poppler/Decrypt.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit cc95433be9d3eee28e701069bbd0d63b7a585dbb +Author: Adam Reichold +Date: Tue Oct 9 21:36:09 2018 +0200 + + Remove unused debuggging function in CairoOutputDev translation unit. + + poppler/CairoOutputDev.cc | 7 ------- + 1 file changed, 7 deletions(-) + +commit bcfa08d007596876bff20dcac0ca84fee69fe56d +Author: Adam Reichold +Date: Sat Sep 1 12:35:20 2018 +0200 + + Fix memory leak in Catalog by tracking pages (and page refs) using + std::vector and std::unique_ptr instead of manually allocating + them. oss-fuzz/10119 + + poppler/Catalog.cc | 79 + +++++++++++++----------------------------------------- + poppler/Catalog.h | 6 ++--- + 2 files changed, 21 insertions(+), 64 deletions(-) + +commit 38b54a6a18d53d7f9e1d290c6cc420744c450d4f +Author: Oliver Sander +Date: Mon Oct 8 21:20:18 2018 +0200 + + Move 'default' definition of con-/destructors to .cc file + + poppler/Annot.cc | 54 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 54 + +++++++++++++++++++++++++++--------------------------- + 2 files changed, 81 insertions(+), 27 deletions(-) + +commit 602dc4ba8e54977667a0fd884cc3539bc100c963 +Author: Oliver Sander +Date: Mon Oct 8 16:13:30 2018 +0200 + + Make compile again + + poppler/Annot.cc | 39 +++------------------------------------ + 1 file changed, 3 insertions(+), 36 deletions(-) + +commit c66dec6154a72dd45430cb40885a9eb19e01eca9 +Author: Oliver Sander +Date: Mon Oct 8 10:44:59 2018 +0200 + + Remove out-commented code + + poppler/Annot.h | 1 - + 1 file changed, 1 deletion(-) + +commit d8ecf4ca7f574fd49bdfc3afd155245fa130cc6e +Author: Oliver Sander +Date: Mon Oct 8 10:42:28 2018 +0200 + + Fix typo in a comment + + poppler/Annot.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d52c567551279b2ee8ab8a6ab848e99c5c0021c7 +Author: Oliver Sander +Date: Mon Sep 3 17:20:51 2018 +0200 + + Make my own mess compile again + + poppler/Annot.cc | 10 ++++------ + qt5/src/poppler-annotation-helper.h | 2 ++ + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 054022ef5d9531944dee4195cf2b8c31d1c428b4 +Author: Adam Reichold +Date: Wed Aug 29 23:05:18 2018 +0200 + + Port AnnotPath to use std::vector instead of + std::unique_ptr to further avoid manual memory management. + + poppler/Annot.cc | 26 +++++++++----------------- + poppler/Annot.h | 11 +++++------ + qt5/src/poppler-annotation.cc | 8 ++++---- + 3 files changed, 18 insertions(+), 27 deletions(-) + +commit 891ba9a47ad837006938a5acdace46049fcb8892 +Author: Oliver Sander +Date: Wed Aug 29 21:42:28 2018 +0200 + + Remove an unnecessary pointer assignment + + No need to set a std::unique_ptr to nullptr right before + it goes out of scope. + + poppler/Annot.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 9b1032753a57a2aa18f21b3e6770d6788f757cf6 +Author: Carlos Garcia Campos +Date: Sun May 21 14:14:19 2017 +0200 + + annots: Use std::unique_ptr instead of new/delete + + glib/poppler-annot.cc | 25 +- + poppler/Annot.cc | 889 + +++++++++++------------------------- + poppler/Annot.h | 382 ++++++++-------- + qt5/src/poppler-annotation-helper.h | 2 +- + qt5/src/poppler-annotation.cc | 39 +- + 5 files changed, 486 insertions(+), 851 deletions(-) + +commit da428865c21f4be117a665224eaf465ffb9f8a6c +Author: Adam Reichold +Date: Sun Oct 7 22:43:25 2018 +0200 + + Fix typo in UPSTREAM_TEST_DATA_URL as while it does work anyway, + it is quite confusing. + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 51adf4f54815c3a74b3a224eff5b107adf7ef7fe +Author: Steven Boswell +Date: Sat Oct 6 09:25:08 2018 +0200 + + Make HtmlFont::HtmlFilter convert tabs into spaces using the same + logic used for spaces. + + utils/HtmlFonts.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2b5c7c8609e88a4a9b18a19168ba4eb6a60572c3 +Author: Adam Reichold +Date: Sat Oct 6 09:21:44 2018 +0200 + + Remove HtmlFont::simple since it is just a diversion around + HtmlFont::HtmlFilter. + + utils/HtmlFonts.cc | 15 --------------- + utils/HtmlFonts.h | 1 - + utils/HtmlOutputDev.cc | 15 ++++----------- + 3 files changed, 4 insertions(+), 27 deletions(-) + +commit e0eb2474ef0a154001512b66b7cd34f9d0cddd60 +Author: Adam Reichold +Date: Tue Aug 21 20:09:40 2018 +0200 + + Remove HtmlFont::pos and always track a font name to allow handling + of unknown font families with known style suffixes. + + utils/HtmlFonts.cc | 135 + +++++++++++++++++++------------------------------ + utils/HtmlFonts.h | 8 +-- + utils/HtmlOutputDev.cc | 6 --- + utils/pdftohtml.cc | 1 - + 4 files changed, 53 insertions(+), 97 deletions(-) + +commit 257e583fceea1e35f0162a1dbd961859add688f9 +Author: Albert Astals Cid +Date: Sun Sep 23 02:55:09 2018 +0200 + + Remove last use of non const GooString::getCString + + goo/GooString.h | 1 - + poppler/GlobalParams.cc | 40 ++++++++++++++++++---------------------- + poppler/GlobalParamsWin.cc | 4 ++-- + 3 files changed, 20 insertions(+), 25 deletions(-) + +commit 89b4f3b9be15e30dfe6a8de431b5de1e8c4f28f3 +Author: Albert Astals Cid +Date: Sat Oct 6 14:54:39 2018 +0200 + + mingw64 fedora build + + We find every so often that the windows build breaks since there's + a few + ifdef for windows, so CI it + + Has some mv because the openjpeg2 packages are a bit broken + and removes a SYSTEM because i think something in their packages + is also + broken since i don't need to remove that when i build on my arch linux + with mingw64 + + .gitlab-ci.yml | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 0118e221548303b71c2b40a878526d017ef64db5 +Author: Stefan Brüns +Date: Mon Aug 27 02:12:08 2018 +0200 + + SplashXPathScanner: Reduce complexity of sorting spans + + For complex paths, a significant amount of time is spent in + SplashXPathScanner::computeIntersections, more specifically with + sorting the spans in y/x order. + + Instead of using one large array for all spans, use a 2-dimensional + structure. As the number of y positions is known upfront, it is + possible to create an array for the y dimension and insert the spans + directly at the appropriate position. + + For Y rows with X spans per row, this reduces the complexity for + sorting + from O( Y*X log Y*X) to O( Y * X log X), i.e. a reduction by log Y. + + For the documents from #57 (fdo#96728) and #24 (fdo#78728), the + runtime/memory is significantly reduced (according to /usr/bin/time + -v): + (1) $> pdftoppm -r 18 -aa no runsforever-poppler.pdf + (2) $> pdftoppm surf-types.pdf + + Before/After + runsforever-poppler | surf-types + User time (seconds): 2979.80 / 2348.08 | 9.45 / 7.76 + Maximum resident set size (kbytes): 51208 / 46288 | 18084 / 14076 + + splash/SplashXPathScanner.cc | 216 + ++++++++++++++++++------------------------- + splash/SplashXPathScanner.h | 22 +++-- + 2 files changed, 106 insertions(+), 132 deletions(-) + +commit 7ef04b5643c6bad8cd4b6f6fc4aa9b800c49406f +Author: Stefan Brüns +Date: Fri Aug 24 00:50:26 2018 +0200 + + SplashXPathScanner: Clamp y range to yMin/yMax outside the loop + + Instead of implicitly clamping by setting interIdx == interEnd, + calculate + the first and last y position outside the loop, and use these as loop + bounds. + + splash/SplashXPathScanner.cc | 55 + +++++++++++++++++++++----------------------- + 1 file changed, 26 insertions(+), 29 deletions(-) + +commit 68fdbfd0b159e8cf146c480f0d14f5d7adfd5806 +Author: Stefan Brüns +Date: Sat May 26 19:51:21 2018 +0200 + + SplashXPathScanner: Move state out of SplashXPathScanner for + iterating spans + + Iterating through spans is independent of the spans itself. Moving the + iteration to a seperate class allows to keep the iteration state out + of SplashXPathScanner, and also allows to move invariant code out of + getNextSpan(...). + + splash/Splash.cc | 9 ++++++--- + splash/SplashXPathScanner.cc | 36 ++++++++++++++++++++++-------------- + splash/SplashXPathScanner.h | 30 ++++++++++++++++++------------ + 3 files changed, 46 insertions(+), 29 deletions(-) + +commit 29bf8086b26516090565d5f91ee1a43f98a5c5f6 +Author: Albert Astals Cid +Date: Fri Oct 5 20:55:41 2018 +0200 + + GooList: Be a class again + + All the forward declarations we have are saying class and both + MSVC and + clang are unhappy about it + + goo/GooList.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f39161321dcbb7932b77f4883814ce503b9442fe +Author: Albert Astals Cid +Date: Fri Oct 5 20:14:09 2018 +0200 + + Fix Windows build + + poppler/GlobalParamsWin.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a6929b40d94d92f7583d17bf4befae36eae87631 +Author: Adam Reichold +Date: Fri Oct 5 12:45:00 2018 +0200 + + Remove GooList's reserving constructor since it has only three users + and it seems to better to be explicit whether we reserve or resize. + + goo/GooList.h | 3 --- + poppler/GfxState.cc | 3 ++- + poppler/Link.cc | 6 ++++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit de89d6449cba119fa86908b2771c4c441cb8a503 +Author: Adam Reichold +Date: Fri Oct 5 12:29:24 2018 +0200 + + Do not use non-standard pragma once and do not change semantics of + reserving GooList constructor. + + goo/GooList.h | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 101728e8a5089c01fc7bca950db0e8ae84d27b47 +Author: Adam Reichold +Date: Sun Aug 26 22:10:47 2018 +0200 + + Remove GooList::append since the single element variant is + std::vector::push_back and the list variant is used only once. + + glib/poppler-document.cc | 2 +- + goo/GooList.h | 15 --------------- + poppler/Annot.cc | 4 ++-- + poppler/FontInfo.cc | 2 +- + poppler/Form.cc | 2 +- + poppler/GfxState.cc | 10 +++++----- + poppler/GlobalParams.cc | 8 ++++---- + poppler/JBIG2Stream.cc | 18 +++++++++--------- + poppler/Link.cc | 10 +++++----- + poppler/OptionalContent.cc | 5 +++-- + poppler/Outline.cc | 2 +- + poppler/PDFDocFactory.cc | 2 +- + poppler/PSOutputDev.cc | 2 +- + poppler/TextOutputDev.cc | 18 +++++++++--------- + splash/Splash.cc | 2 +- + splash/SplashBitmap.cc | 2 +- + utils/HtmlOutputDev.cc | 12 ++++++------ + utils/pdfdetach.cc | 4 ++-- + 18 files changed, 53 insertions(+), 67 deletions(-) + +commit e44e90b434434de5ea3b23d3a40ded7a5ad05b1c +Author: Adam Reichold +Date: Sun Aug 26 21:46:31 2018 +0200 + + Remove GooList::put as it is apparently unused. + + goo/GooList.h | 4 ---- + 1 file changed, 4 deletions(-) + +commit 571a321721c5b166c402995b0a8e015f10948c31 +Author: Adam Reichold +Date: Sun Aug 26 21:42:47 2018 +0200 + + Turn deleteGooList macro into a template to improve type checking + and diagnostics. + + cpp/poppler-font.cpp | 2 +- + glib/poppler-document.cc | 2 +- + goo/GooList.h | 19 ++++++++----------- + poppler/Annot.cc | 12 ++++++------ + poppler/Form.cc | 6 +++--- + poppler/GfxState.cc | 2 +- + poppler/GlobalParams.cc | 4 ++-- + poppler/JBIG2Stream.cc | 4 ++-- + poppler/Link.cc | 6 +++--- + poppler/OptionalContent.cc | 2 +- + poppler/Outline.cc | 4 ++-- + poppler/PDFDocFactory.cc | 2 +- + poppler/PSOutputDev.cc | 2 +- + poppler/TextOutputDev.cc | 14 +++++++------- + qt5/src/poppler-fontinfo.cc | 2 +- + splash/SplashBitmap.cc | 2 +- + utils/HtmlOutputDev.cc | 4 ++-- + utils/pdfdetach.cc | 2 +- + 18 files changed, 44 insertions(+), 47 deletions(-) + +commit 46a8486d71b686facdea716bd04911bd029ac67e +Author: Adam Reichold +Date: Sun Aug 26 21:31:18 2018 +0200 + + Remove GooList::insert since the single caller actually needs only + std::vector::push_back. + + goo/GooList.h | 6 ------ + poppler/PDFDocFactory.cc | 6 +++--- + 2 files changed, 3 insertions(+), 9 deletions(-) + +commit 76c716c7d65f5110bd3e2eec25aed62aed7fe24a +Author: Adam Reichold +Date: Sun Aug 26 21:25:35 2018 +0200 + + Remove GooList::copy since it is apparently unused. + + goo/GooList.h | 3 --- + 1 file changed, 3 deletions(-) + +commit 4ae24db322e38ec81acc749c71c9efa972afe39d +Author: Adam Reichold +Date: Sun Aug 26 21:20:57 2018 +0200 + + Remove GooList::del since its few users are easily converted. + + goo/GooList.h | 9 --------- + poppler/JBIG2Stream.cc | 15 ++++++--------- + utils/HtmlOutputDev.cc | 14 +++++++------- + 3 files changed, 13 insertions(+), 25 deletions(-) + +commit 4236d98179699dd7512805075eecb292fc253965 +Author: Adam Reichold +Date: Sun Aug 26 16:30:28 2018 +0200 + + Reimplement GooList as a subtype of std::vector + + This reimplements GooList as a subtype of std::vector + to facilitate + porting the various places where GooList is used to STL + containers. After this + change, this can happen mechanically by replacing all of the + GooList-specific + API by their implementations at the call sites and cleaning up until + at some + point no more GooList-specific API is left and the type can be + removed. + + This of course keeps the normally inefficient pattern of storing + pointer to + objects instead of objects inside these containers which however + can then be + refactoring in a separate step building on top this and as a pure + optimization. + + CMakeLists.txt | 1 - + goo/GooList.cc | 136 + ------------------------------------------------ + goo/GooList.h | 87 +++++++++++++------------------ + utils/printencodings.cc | 15 +++--- + 4 files changed, 42 insertions(+), 197 deletions(-) + +commit 3f08b610e4dbbbcb449e686d46360255efd78cfc +Author: Oliver Sander +Date: Thu Sep 13 20:55:28 2018 +0200 + + Fold the constant splashFontCacheSize + + As the cache is a std::array now, the constant is only used in a + single location. Hence there is no need to keep it as a separate + name. + + splash/SplashFontEngine.h | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit a7ffcfe9612970bf37edb1a78480d357d7ecd62b +Author: Oliver Sander +Date: Thu Sep 13 20:53:32 2018 +0200 + + Reimplement the Splash font cache as a std::array + + std::find_if and std::rotate nicely replace the hand-written loops. + + splash/SplashFontEngine.cc | 66 + ++++++++++++++++++---------------------------- + splash/SplashFontEngine.h | 4 ++- + 2 files changed, 29 insertions(+), 41 deletions(-) + +commit 588d96b572a28e5b0bef55e152d134b62818f85a +Author: Oliver Sander +Date: Wed Sep 12 21:34:12 2018 +0200 + + Make SplashFont::matches a const method + + splash/SplashFont.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d248d3e59165824ca5279db4c451d63f762f1ac3 +Author: Oliver Sander +Date: Wed Sep 12 16:17:41 2018 +0200 + + Make a few pointer arguments const + + This increases code legibility, if nothing else. + + splash/SplashFTFont.cc | 2 +- + splash/SplashFTFont.h | 2 +- + splash/SplashFTFontFile.cc | 2 +- + splash/SplashFTFontFile.h | 2 +- + splash/SplashFont.cc | 2 +- + splash/SplashFont.h | 4 ++-- + splash/SplashFontEngine.cc | 4 ++-- + splash/SplashFontEngine.h | 2 +- + splash/SplashFontFile.h | 2 +- + 9 files changed, 11 insertions(+), 11 deletions(-) + +commit 1243d28214471444333ea1972616ffb8c8926952 +Author: Oliver Sander +Date: Wed Sep 12 16:02:43 2018 +0200 + + Minor simplification of font-loading logic + + If a pointer is explicitly set to nullptr, there is no + need to test whether it really is nullptr in the very + next line. + + splash/SplashFontEngine.cc | 30 ++++++++++++------------------ + 1 file changed, 12 insertions(+), 18 deletions(-) + +commit 13e610fd95025804623ebfc7d134332071f5f1d5 +Author: Adam Reichold +Date: Fri Sep 21 18:13:04 2018 +0200 + + Since the circular dependency between PopplerCache and XRef is + gone now, XRef can properly embed PopplerCache without additional + indirection. + + poppler/XRef.cc | 22 +++++----------------- + poppler/XRef.h | 8 ++------ + 2 files changed, 7 insertions(+), 23 deletions(-) + +commit 70e929e682cec8b60120ae3b1320eab457bd2ea7 +Author: Adam Reichold +Date: Fri Sep 21 18:07:04 2018 +0200 + + Remove specialized PopplerObjectCache since it has only one user and + the additional abstraction actually obscures how it is used instead + of simplifying it. + + poppler/Gfx.cc | 16 +++++++++------- + poppler/Gfx.h | 3 ++- + poppler/PopplerCache.h | 29 ++--------------------------- + 3 files changed, 13 insertions(+), 35 deletions(-) + +commit cb8a526906687d85dfa5af1b30a585e76e2762a7 +Author: Adam Reichold +Date: Fri Sep 21 17:39:56 2018 +0200 + + Turn PopplerCache into a template to avoid double indirection for + look-up via virtual helper classes. + + CMakeLists.txt | 1 - + poppler/Function.h | 1 - + poppler/GfxState.cc | 43 +------------ + poppler/GfxState.h | 1 - + poppler/OutputDev.cc | 15 ++--- + poppler/OutputDev.h | 16 +++-- + poppler/PopplerCache.cc | 156 + ------------------------------------------------ + poppler/PopplerCache.h | 109 ++++++++++++++++----------------- + poppler/XRef.cc | 46 +------------- + poppler/XRef.h | 4 +- + 10 files changed, 77 insertions(+), 315 deletions(-) + +commit 36d40492565faca3f0fc4fe7a77005b4fca45eec +Author: Albert Astals Cid +Date: Fri Oct 5 00:17:01 2018 +0200 + + SignatureValidationInfoPrivate: Match declaration in poppler-form.h + + qt5/src/poppler-form.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 530bf719646a1f909a70978e41b0487bd4198664 +Author: Albert Astals Cid +Date: Fri Oct 5 00:13:55 2018 +0200 + + CairoType3Font: Remove unused member + + poppler/CairoFontEngine.cc | 7 +++---- + poppler/CairoFontEngine.h | 3 +-- + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit 718eb66aa4e6ab0ccbee16889534b32e0faeeb30 +Author: Albert Astals Cid +Date: Fri Oct 5 00:10:31 2018 +0200 + + cmake: Set the clang warnings based on the gcc ones + + cmake/modules/PopplerMacros.cmake | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +commit 9829cadbe10ad4cb468514ec68a3160e18f090bc +Author: Albert Astals Cid +Date: Fri Oct 5 00:10:06 2018 +0200 + + TextSelectionPainter: Remove unused member + + poppler/TextOutputDev.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 3edd00c7a0a7047bc530b77587e60b5e59b53641 +Author: Albert Astals Cid +Date: Fri Oct 5 00:05:58 2018 +0200 + + Some more NULL to nullptr + + poppler/CairoOutputDev.h | 2 +- + poppler/CurlPDFDocBuilder.h | 6 +++--- + poppler/FileSpec.h | 2 +- + poppler/FlateEncoder.h | 3 ++- + poppler/Form.h | 6 +++--- + poppler/Gfx.h | 14 ++++++------- + poppler/GfxState.h | 30 +++++++++++++-------------- + poppler/GlobalParams.h | 8 ++++---- + poppler/Lexer.h | 2 +- + poppler/Link.h | 28 +++++++++++++------------- + poppler/LocalPDFDocBuilder.h | 6 +++--- + poppler/OptionalContent.h | 10 ++++----- + poppler/OutputDev.h | 10 ++++----- + poppler/PDFDoc.h | 48 + ++++++++++++++++++++++---------------------- + poppler/PDFDocBuilder.h | 4 ++-- + poppler/PDFDocFactory.h | 6 +++--- + poppler/PSOutputDev.h | 18 ++++++++--------- + poppler/Page.h | 34 +++++++++++++++---------------- + poppler/Parser.h | 2 +- + poppler/StdinPDFDocBuilder.h | 6 +++--- + poppler/Stream.h | 22 ++++++++++---------- + poppler/StructElement.h | 14 ++++++------- + poppler/StructTreeRoot.h | 6 +++--- + poppler/XRef.h | 4 ++-- + splash/Splash.h | 2 +- + splash/SplashBitmap.h | 2 +- + splash/SplashScreen.h | 4 ++-- + utils/HtmlOutputDev.h | 10 ++++----- + 28 files changed, 155 insertions(+), 154 deletions(-) + +commit 2f5ad138924ce4e236455b0e4493d4d869c76397 +Author: Albert Astals Cid +Date: Thu Oct 4 19:44:12 2018 +0200 + + SplashXPath: check for overflow + + fixes oss-fuzz/10806 + + splash/SplashXPath.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 6007b32e10c6283f3d9f4eeb0cb862ecfeba239a +Author: Adam Reichold +Date: Wed Oct 3 20:24:24 2018 +0200 + + Inline move construction and assignment of Object to avoid function + call overhead. + + poppler/Object.cc | 16 ---------------- + poppler/Object.h | 17 +++++++++++++++-- + 2 files changed, 15 insertions(+), 18 deletions(-) + +commit 5e5e7234c06bc2aa327a1461419f15de4a21b563 +Author: Adam Reichold +Date: Wed Oct 3 16:53:59 2018 +0200 + + Add microbenchmark to check effect of using memcpy instead of + assignment. + + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/check_object.cpp | 36 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 37 insertions(+) + +commit 64fec200816005b6c324f455446ea2ca290ffb87 +Author: Adam Reichold +Date: Sat Sep 22 11:13:39 2018 +0200 + + Avoid Object being too friendly with Array, Dict and XRef as these + can just use placement-new and the usual destructor which is public + anyways. + + poppler/Object.cc | 5 ----- + poppler/Object.h | 13 ++----------- + poppler/XRef.cc | 12 ++++++------ + 3 files changed, 8 insertions(+), 22 deletions(-) + +commit cb29b28da31e3f563c46fd596812a7860d52ab8f +Author: Adam Reichold +Date: Sat Sep 22 11:07:05 2018 +0200 + + Remove unneccessary macros from Object, avoid zeroing uninitialized + objects and avoid copying inactive union members. + + poppler/Object.cc | 13 +++++++------ + poppler/Object.h | 37 ++++++++++++++++--------------------- + 2 files changed, 23 insertions(+), 27 deletions(-) + +commit c4c55d9e3572b2b4ef84d7cdd0b50ca6d3bbd19e +Author: Albert Astals Cid +Date: Tue Oct 2 20:09:37 2018 +0200 + + Fix windows build by not build a test that doesnt' build anymore + + qt5/tests/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ad998fc493b5fae74f79d53ec930e2b4067e7dda +Author: Albert Astals Cid +Date: Tue Oct 2 19:44:21 2018 +0200 + + don't fail tests on platforms we already know the test fails + + qt5/tests/check_pagelabelinfo.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 139f2a4c1ab53fd5eb339e395a7c068e3622f83f +Author: Oliver Sander +Date: Thu Aug 30 23:58:37 2018 +0200 + + Port the implementation of 'class Annots' to std::vector + + This simplifies the code a little: most of the memory management + code disappears, because std::vector does it for us. + + poppler/Annot.cc | 44 +++++++++++++------------------------------- + poppler/Annot.h | 9 ++++----- + 2 files changed, 17 insertions(+), 36 deletions(-) + +commit a6f88881d41f064a4c2438d4e1b532872a879b0c +Author: Adam Reichold +Date: Sun Sep 23 09:56:51 2018 +0200 + + Put (optional) usage of codecvt behind a configure check s.t. we + at least compile even if we do not properly handle the unicode + page label. + + ConfigureChecks.cmake | 2 ++ + config.h.cmake | 3 +++ + poppler/PageLabelInfo_p.h | 20 ++++++++++++-------- + 3 files changed, 17 insertions(+), 8 deletions(-) + +commit 65c8bc1eefea0b99e46d4190dc61ead216088283 +Author: Adam Reichold +Date: Sun Sep 23 00:45:04 2018 +0200 + + Parse Unicode decimals as well as ASCII decimals when resolving + page labels. + + poppler/PageLabelInfo.cc | 7 ++++--- + poppler/PageLabelInfo_p.h | 30 ++++++++++++++++++++++++++++++ + qt5/tests/check_pagelabelinfo.cpp | 20 ++++++++++++++++++++ + 3 files changed, 54 insertions(+), 3 deletions(-) + +commit 2cbdd1543134bf256ba49dd1209deadcfc45a4fe +Author: Adam Reichold +Date: Sat Sep 29 09:53:20 2018 +0200 + + Do not use unsigned char to instantiate a random engine as the + standard permits only short and wider and MSVC is strict about that. + + goo/grandom.cc | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit 80a2aa1ba039947f5c4e87a1ad7b5aa324d96407 +Author: Adam Reichold +Date: Sun Sep 30 16:51:32 2018 +0200 + + Use git clone instead of and a relative CI project path to allow MR + to modify the test repository. + + .gitlab-ci.yml | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit c46717a70341ac0120579c867d49c250bed4ed52 +Author: Adam Reichold +Date: Fri Aug 31 23:05:05 2018 +0200 + + Use the C++ standard library facilities for thread-safe random number + generation avoiding the need for explicit configure checks. + + ConfigureChecks.cmake | 1 - + config.h.cmake | 3 --- + goo/grandom.cc | 58 + +++++++++++++-------------------------------------- + goo/grandom.h | 20 ++++-------------- + 4 files changed, 19 insertions(+), 63 deletions(-) + +commit f3e3dd8004d87468d0e07c3fe6c05cc0fab50a52 +Author: Oliver Sander +Date: Thu Sep 27 13:58:34 2018 +0200 + + FreeText: Use font from default appearance string + + If a FreeText annotation misses an AP entry, try to create a + temporary font + as defined by its default appearance string. Tf operator names the + font resource, + and we can search for the resource inside the default resource + dictionary. + See ISO32000 sections about "Free Text Annotations" and "Variable + Text". + + If lookup fails for some reason, use Helvetica as fallback. + + Patch done together with Tobias Deiminger + + poppler/Annot.cc | 66 + ++++++++++++++++++++++++++++++++++++++++++++++---------- + poppler/Annot.h | 2 ++ + 2 files changed, 57 insertions(+), 11 deletions(-) + +commit b8b82412a8123369335c37e546cec38eaa460d05 +Author: Albert Astals Cid +Date: Sun Sep 23 23:47:54 2018 +0200 + + More const + + Marked some caches as mutable + + Fixed an actual bug in page::text that was swapping the page + cropbox in + each call + + cpp/poppler-page.cpp | 10 +- + glib/poppler-page.cc | 2 +- + poppler/CairoOutputDev.cc | 24 +-- + poppler/CairoOutputDev.h | 24 +-- + poppler/Function.cc | 16 +- + poppler/Function.h | 108 +++++----- + poppler/Gfx.cc | 20 +- + poppler/Gfx.h | 10 +- + poppler/GfxState.cc | 126 ++++++------ + poppler/GfxState.h | 412 + +++++++++++++++++++------------------- + poppler/MarkedContentOutputDev.cc | 2 +- + poppler/MarkedContentOutputDev.h | 2 +- + poppler/OutputDev.cc | 2 +- + poppler/OutputDev.h | 16 +- + poppler/PDFDoc.cc | 6 +- + poppler/PDFDoc.h | 2 +- + poppler/PSOutputDev.cc | 45 ++--- + poppler/PSOutputDev.h | 16 +- + poppler/Page.cc | 4 +- + poppler/Page.h | 40 ++-- + poppler/PreScanOutputDev.cc | 15 +- + poppler/PreScanOutputDev.h | 12 +- + poppler/SplashOutputDev.cc | 47 ++--- + poppler/SplashOutputDev.h | 14 +- + poppler/TextOutputDev.cc | 12 +- + poppler/TextOutputDev.h | 24 +-- + poppler/UnicodeMap.cc | 2 +- + poppler/UnicodeMap.h | 6 +- + qt5/src/ArthurOutputDev.cc | 6 +- + qt5/src/ArthurOutputDev.h | 6 +- + qt5/src/poppler-annotation.cc | 2 +- + qt5/src/poppler-form.cc | 2 +- + qt5/src/poppler-page.cc | 3 +- + utils/HtmlOutputDev.cc | 2 +- + utils/ImageOutputDev.cc | 6 +- + utils/ImageOutputDev.h | 4 +- + utils/pdfinfo.cc | 2 +- + utils/pdfunite.cc | 2 +- + 38 files changed, 518 insertions(+), 536 deletions(-) + +commit d5d6dd939e06cd8048d9d8090502915b0488b1dd +Author: Albert Astals Cid +Date: Sun Sep 23 22:41:12 2018 +0200 + + Some more NULL -> nullptr + + poppler/GlobalParams.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 7ec06feed742af74e7b53a1df964eef8c3965e16 +Author: Albert Astals Cid +Date: Sun Sep 23 22:38:55 2018 +0200 + + Fix build with -DFONT_CONFIGURATION=generic + + poppler/GlobalParams.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2ea24b168ab196237093b49cbc24427b023aa79b +Author: Albert Astals Cid +Date: Sun Sep 23 22:35:32 2018 +0200 + + FoFiType1C::getIndexVal: Don't calculate val if it's not ok + + No need to do extra work if we're saying it won't be used + + Fixes oss-fuzz/10632 + + fofi/FoFiType1C.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 8ca7c4f2bbce1e22393cb2e71ae9025b72289121 +Author: Albert Astals Cid +Date: Sun Sep 23 19:32:53 2018 +0200 + + Fix windows build even more + + glib/poppler-document.cc | 4 ++++ + utils/pdftocairo-win32.cc | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 21a17289c662fa67128d61180e9f8f357660d06b +Author: Albert Astals Cid +Date: Sun Sep 23 19:24:54 2018 +0200 + + Fix Windows build + + poppler/GlobalParamsWin.cc | 2 +- + poppler/PDFDoc.cc | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 2aa679bf2551874561190caff4ea18b34c9b388f +Author: Albert Astals Cid +Date: Sun Sep 23 19:17:53 2018 +0200 + + Remove the DEBUG_FORMS define + + Just define the functions, but not call them + + poppler/Form.cc | 20 +++----------------- + poppler/Form.h | 21 ++++----------------- + poppler/poppler-config.h.cmake | 3 --- + 3 files changed, 7 insertions(+), 37 deletions(-) + +commit 87fcbb6a73cfeac5d21a8ce8e8d10f2f52ae0e00 +Author: Albert Astals Cid +Date: Sun Sep 23 19:15:19 2018 +0200 + + Remove the DISABLE_OUTLINE define + + It makes no sense + + poppler/PDFDoc.cc | 8 -------- + poppler/PDFDoc.h | 5 ----- + poppler/poppler-config.h.cmake | 2 +- + utils/HtmlOutputDev.cc | 12 ------------ + utils/HtmlOutputDev.h | 2 -- + utils/pdftohtml.cc | 4 ---- + 6 files changed, 1 insertion(+), 32 deletions(-) + +commit cd53c552e75d47a1c1d60953989192271a452c0b +Author: Albert Astals Cid +Date: Sun Sep 23 19:11:12 2018 +0200 + + Remove ENABLE_PLUGINS + + We're never defining it, so just stop carrying it + + CMakeLists.txt | 2 - + poppler/GlobalParams.cc | 219 -------------------------- + poppler/GlobalParams.h | 14 -- + poppler/SecurityHandler.cc | 96 +----------- + poppler/SecurityHandler.h | 40 ----- + poppler/XpdfPluginAPI.cc | 243 ----------------------------- + poppler/XpdfPluginAPI.h | 342 + ----------------------------------------- + poppler/poppler-config.h.cmake | 3 +- + 8 files changed, 3 insertions(+), 956 deletions(-) + +commit e84b9e58e0e644f30e104850969a8255d59b9971 +Author: Albert Astals Cid +Date: Sun Sep 23 19:07:00 2018 +0200 + + More const + + glib/poppler-private.h | 2 +- + glib/poppler-structure-element.cc | 27 ++++++++++++--------------- + poppler/Gfx.h | 2 +- + poppler/GfxState.h | 8 ++++---- + poppler/PDFDoc.cc | 14 +++++++------- + poppler/PDFDoc.h | 36 + ++++++++++++++++++------------------ + poppler/SecurityHandler.cc | 8 ++++---- + poppler/SecurityHandler.h | 12 ++++++------ + utils/pdfinfo.cc | 2 +- + 9 files changed, 54 insertions(+), 57 deletions(-) + +commit 1b8a163fe13ddc6734e1c0cbf719947a83c86613 +Author: Albert Astals Cid +Date: Sun Sep 23 14:03:35 2018 +0200 + + More const + + fofi/FoFiTrueType.cc | 2 +- + poppler/CMap.cc | 16 ++++++++-------- + poppler/CMap.h | 16 ++++++++-------- + poppler/CairoFontEngine.cc | 7 +++---- + poppler/Decrypt.cc | 26 +++++++++++++------------- + poppler/Decrypt.h | 24 ++++++++++++------------ + poppler/Gfx.cc | 2 +- + poppler/GfxFont.cc | 2 +- + poppler/GfxFont.h | 46 + +++++++++++++++++++++++----------------------- + poppler/GlobalParams.cc | 22 +++++++++++----------- + poppler/GlobalParams.h | 18 +++++++++--------- + poppler/GlobalParamsWin.cc | 2 +- + poppler/PDFDoc.cc | 8 ++++---- + poppler/PDFDoc.h | 4 ++-- + poppler/PSOutputDev.cc | 2 +- + poppler/SplashOutputDev.cc | 4 ++-- + poppler/TextOutputDev.cc | 6 +++--- + utils/HtmlOutputDev.cc | 5 ++--- + 18 files changed, 105 insertions(+), 107 deletions(-) + +commit 45c8888dcaf3da7981abc045835efd01a24e9e00 +Author: Albert Astals Cid +Date: Sun Sep 23 13:41:59 2018 +0200 + + FoFiType1: Some more const + + fofi/FoFiType1.cc | 10 +++++----- + fofi/FoFiType1.h | 10 +++++----- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit 5c54abedbc15d373109b23bf61c4e229d9c0cd9f +Author: Albert Astals Cid +Date: Sun Sep 23 13:35:45 2018 +0200 + + FoFiType1C: more const + + fofi/FoFiType1C.cc | 22 +++++++++++----------- + fofi/FoFiType1C.h | 18 +++++++++--------- + 2 files changed, 20 insertions(+), 20 deletions(-) + +commit 70575ed3c0286cda0e288d2aff2b4c2b0e0c640a +Author: Albert Astals Cid +Date: Sun Sep 23 13:24:30 2018 +0200 + + FoFiTrueType: More const + + fofi/FoFiTrueType.cc | 48 + ++++++++++++++++++++++++------------------------ + fofi/FoFiTrueType.h | 50 + +++++++++++++++++++++++++------------------------- + 2 files changed, 49 insertions(+), 49 deletions(-) + +commit 3db883dec4c37d53f0b268970355fdd1b11b097f +Author: Albert Astals Cid +Date: Sun Sep 23 13:09:34 2018 +0200 + + Object: two more const char * + + poppler/Object.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit c46f445b6ff4ea59f845a81b873599835ad64b6a +Author: Albert Astals Cid +Date: Sun Sep 23 13:05:21 2018 +0200 + + Object: make getCmd const char * + + poppler/Gfx.cc | 5 ++--- + poppler/Gfx.h | 2 +- + poppler/Object.h | 2 +- + poppler/XRef.cc | 2 +- + 4 files changed, 5 insertions(+), 6 deletions(-) + +commit f1b91cac94f1309452604447e9a5ace4e14336fc +Author: Albert Astals Cid +Date: Sun Sep 23 02:37:10 2018 +0200 + + pdftohtml & friends: some const + + utils/HtmlOutputDev.cc | 17 ++++++++--------- + utils/HtmlOutputDev.h | 16 ++++++++-------- + utils/pdftohtml.cc | 7 +++---- + 3 files changed, 19 insertions(+), 21 deletions(-) + +commit 3096a561afe4c001b08e54ffee396d6efa071fca +Author: Albert Astals Cid +Date: Sun Sep 23 02:35:12 2018 +0200 + + SplashBitmap: const filename + + splash/SplashBitmap.cc | 4 ++-- + splash/SplashBitmap.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit f557542147c59acaf9bc34082f433f74d38e5a58 +Author: Albert Astals Cid +Date: Sun Sep 23 02:32:23 2018 +0200 + + pdftops: const char * + + utils/pdftops.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit f974a592cfce3ef6f06e12b7621b39c1906db5c0 +Author: Albert Astals Cid +Date: Sun Sep 23 02:31:39 2018 +0200 + + pdftotext: const char * + + utils/pdftotext.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 2add4fd2a1d26a00659c9441feafd51a10b671c1 +Author: Albert Astals Cid +Date: Sun Sep 23 02:31:19 2018 +0200 + + TextOutputDev: const filename + + poppler/TextOutputDev.cc | 2 +- + poppler/TextOutputDev.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit bdb0a44e069d5767b0a12623d8f8ec7fcb6a4a0e +Author: Albert Astals Cid +Date: Sun Sep 23 02:28:33 2018 +0200 + + Include algorithm for std::max + + Fixes MSVC build + + poppler/PageLabelInfo.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 52f9386bdab2e5d90c3a0f5721012fdd9278bc00 +Author: Albert Astals Cid +Date: Sun Sep 23 02:26:02 2018 +0200 + + Update (C) + + goo/GooString.cc | 2 +- + goo/GooString.h | 2 +- + poppler/Array.h | 1 + + poppler/Error.cc | 2 +- + poppler/Error.h | 2 +- + poppler/PageLabelInfo.cc | 1 + + poppler/PageLabelInfo.h | 1 + + poppler/SplashOutputDev.cc | 1 + + utils/parseargs.cc | 2 +- + utils/parseargs.h | 2 +- + 10 files changed, 10 insertions(+), 6 deletions(-) + +commit b719b3f00078051ca380d8c30767b48b359dd87f +Author: Albert Astals Cid +Date: Sun Sep 23 02:21:56 2018 +0200 + + const char * + + poppler/CairoFontEngine.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1e1f0c306f1e2626ad7774034a4df499da59e9f8 +Author: Albert Astals Cid +Date: Sun Sep 23 02:21:45 2018 +0200 + + pdftocairo: const char * + + utils/pdftocairo.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit f96e1f246435163328e3123d932608a3954f72bb +Author: Albert Astals Cid +Date: Sun Sep 23 02:20:28 2018 +0200 + + parseargs: const char * + + utils/parseargs.cc | 4 ++-- + utils/parseargs.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 8dc1e98b8e112ed48155920f5aa4e46b5d616e79 +Author: Albert Astals Cid +Date: Sun Sep 23 02:14:51 2018 +0200 + + GooString: some more const + + goo/GooString.cc | 12 ++++++------ + goo/GooString.h | 8 ++++---- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit 297e6944a67c1891b9ba194fff0562352a5f8d1f +Author: Albert Astals Cid +Date: Sun Sep 23 02:09:50 2018 +0200 + + Error: Make the msg be const + + cpp/poppler-private.cpp | 2 +- + cpp/poppler-private.h | 2 +- + glib/poppler.cc | 2 +- + poppler/Error.cc | 4 ++-- + poppler/Error.h | 2 +- + qt5/src/poppler-private.cc | 2 +- + test/perf-test.cc | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) + +commit 139748612d18c8e0d701003067eb1838b202267c +Author: Albert Astals Cid +Date: Sun Sep 23 02:03:25 2018 +0200 + + gfile: Remove a bunch of unused functions + + \o/ + + goo/gfile.cc | 228 + ----------------------------------------------------------- + goo/gfile.h | 30 -------- + 2 files changed, 258 deletions(-) + +commit d1104f9d7a5e86b80244d0627562fe832d5bcd4b +Author: Albert Astals Cid +Date: Sun Sep 23 01:54:47 2018 +0200 + + Don't cast nullptr + + Doesn't make any sense + + fofi/FoFiType1.cc | 2 +- + fofi/FoFiType1C.cc | 2 +- + poppler/Annot.cc | 34 +++++++++++++++++----------------- + poppler/Gfx.cc | 10 +++++----- + poppler/GfxFont.cc | 6 +++--- + poppler/GfxState.cc | 2 +- + poppler/Hints.cc | 2 +- + poppler/PSOutputDev.cc | 6 +++--- + poppler/Page.cc | 4 ++-- + poppler/SecurityHandler.cc | 4 ++-- + poppler/TextOutputDev.cc | 4 ++-- + test/perf-test.cc | 2 +- + 12 files changed, 39 insertions(+), 39 deletions(-) + +commit 8a845c65e0dc290af920ce4175689f7321e1d459 +Author: Albert Astals Cid +Date: Sun Sep 23 01:45:38 2018 +0200 + + Fix crash introduced by c792e4cde92e6ece06592955068ffb579e826382 + + We need to initialize properly the fields that will be used in the + destructor before bailing out + + poppler/GfxState.cc | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit e67e88b393778d81a0ab50aa1faf2b598db98749 +Author: Albert Astals Cid +Date: Sun Sep 23 01:22:32 2018 +0200 + + FoFiTrueType: some more const + + fofi/FoFiTrueType.cc | 12 ++++++------ + fofi/FoFiTrueType.h | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +commit f4800bffe2756a64cba03cb1a017bfacad63fdb0 +Author: Albert Astals Cid +Date: Sun Sep 23 01:21:55 2018 +0200 + + FoFiType1C: Some more const + + fofi/FoFiType1C.cc | 4 ++-- + fofi/FoFiType1C.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 735d234d76b31c7d2061f70d0cf88cc122613a80 +Author: Albert Astals Cid +Date: Sun Sep 23 01:16:43 2018 +0200 + + FoFiBase: No need to store two pointers + + that point to the same place + + And also make the data const (until the moment we have to free it) + + fofi/FoFiBase.cc | 6 +++--- + fofi/FoFiBase.h | 5 ++--- + fofi/FoFiType1.cc | 4 ++-- + 3 files changed, 7 insertions(+), 8 deletions(-) + +commit bddcc771de9e7d0a7a077732f15a958a44794f94 +Author: Albert Astals Cid +Date: Sun Sep 23 01:15:23 2018 +0200 + + FoFiTrueType: Some more const + + fofi/FoFiTrueType.cc | 4 ++-- + fofi/FoFiTrueType.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 367a0c6ec6b25b706b9cf181d69abd5f32ffbcea +Author: Albert Astals Cid +Date: Sun Sep 23 01:12:11 2018 +0200 + + FoFiXXX: Make the filenames const char * + + fofi/FoFiBase.cc | 2 +- + fofi/FoFiBase.h | 2 +- + fofi/FoFiTrueType.cc | 4 ++-- + fofi/FoFiTrueType.h | 4 ++-- + fofi/FoFiType1.cc | 4 ++-- + fofi/FoFiType1.h | 16 +++++++++++++++- + fofi/FoFiType1C.cc | 2 +- + fofi/FoFiType1C.h | 2 +- + 8 files changed, 25 insertions(+), 11 deletions(-) + +commit b4c61b1f9149e6f0a7533cb03eeee13f9e6d1811 +Author: Albert Astals Cid +Date: Sun Sep 23 00:57:25 2018 +0200 + + Form: add some const + + poppler/Form.cc | 12 ++++++------ + poppler/Form.h | 8 ++++---- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit 1f9f3ddc015a26611e1eff178570f7a7d81fcecc +Author: Albert Astals Cid +Date: Sun Sep 23 00:54:33 2018 +0200 + + Decrypt: Make one char * be const + + poppler/Decrypt.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 47e1342d788c40d225eb0aebded160dea454bf60 +Author: Albert Astals Cid +Date: Sun Sep 23 00:52:14 2018 +0200 + + CharCodeToUnicode: Make three char * be const + + poppler/CharCodeToUnicode.cc | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +commit 0e0d0ca632e0770605e8e7bce58191f8fa4c05d5 +Author: Albert Astals Cid +Date: Sun Sep 23 00:50:42 2018 +0200 + + Annot: make two char * be const + + poppler/Annot.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 384276842ad147b3f65084aaf725a72d45227282 +Author: Albert Astals Cid +Date: Sun Sep 23 00:49:31 2018 +0200 + + gdir: Add some const + + goo/gdir.h | 10 +++++----- + goo/gfile.cc | 4 ++-- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit 646981275fcbb57568ea91529a847f779fba7578 +Author: Albert Astals Cid +Date: Sun Sep 23 00:46:59 2018 +0200 + + GlobalParams: Make some GooString * const + + poppler/GlobalParams.cc | 8 ++++---- + poppler/GlobalParams.h | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit a28116539832cde87acd844aa0130df0eed405d6 +Author: Albert Astals Cid +Date: Sun Sep 23 00:43:11 2018 +0200 + + FoFiType1C: Add some const + + fofi/FoFiType1C.cc | 18 +++++++++--------- + fofi/FoFiType1C.h | 18 +++++++++--------- + 2 files changed, 18 insertions(+), 18 deletions(-) + +commit da87b12ef125e3c2d43822004f1f9f2a7f45aaf3 +Author: Albert Astals Cid +Date: Sun Sep 23 00:42:51 2018 +0200 + + FoFiBase: Add some const + + fofi/FoFiBase.cc | 20 ++++++++++---------- + fofi/FoFiBase.h | 18 +++++++++--------- + 2 files changed, 19 insertions(+), 19 deletions(-) + +commit 1b48d72ad9b5e73334d330b94917a351c5305e61 +Author: Albert Astals Cid +Date: Sun Sep 23 00:35:55 2018 +0200 + + Function: make variable const char * instead of char * + + poppler/Function.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit ee0479eccbde05648fe5e0ecbcdf52f841271d97 +Author: Albert Astals Cid +Date: Sun Sep 23 00:16:48 2018 +0200 + + FoFiIdentifier: make two char * be const char* + + fofi/FoFiIdentifier.cc | 18 +++++++++--------- + fofi/FoFiIdentifier.h | 18 ++++++++++++++++-- + 2 files changed, 25 insertions(+), 11 deletions(-) + +commit 9a71d40d28effb125bcc7f1fd8e76cf6d269b2de +Author: Adam Reichold +Date: Mon Feb 19 07:20:44 2018 +0100 + + Port PageLabelInfo from GooString/GooList to std::string/std::vector. + + poppler/PageLabelInfo.cc | 104 + ++++++++++++++++++++--------------------------- + poppler/PageLabelInfo.h | 19 ++++----- + 2 files changed, 52 insertions(+), 71 deletions(-) + +commit ab04ccdd0d78ecf50f50b0458468788aa3984bcc +Author: Adam Reichold +Date: Tue May 15 19:49:58 2018 +0200 + + Also simplify the Array implementation by rebasing it on + std::vector. + + poppler/Array.cc | 39 ++++++++++----------------------------- + poppler/Array.h | 7 +++---- + 2 files changed, 13 insertions(+), 33 deletions(-) + +commit 75663433262c087d3729f16a528e37a345e0f6b4 +Author: Adam Reichold +Date: Sat Sep 22 10:15:14 2018 +0200 + + Make look-up size computation for drawSoftMaskedImage unsigned to + avoid overflowing into negative number and only check multiplied + allocations. oss-fuzz/10158 + + poppler/SplashOutputDev.cc | 43 + ++++++++++++++++++------------------------- + 1 file changed, 18 insertions(+), 25 deletions(-) + +commit 769308e8f46bd6b9eaaed9159071fd78943e74e9 +Author: Adam Reichold +Date: Fri Sep 21 10:52:28 2018 +0200 + + Do some more checks for allocation failure in + SplashOutputDev::drawSoftMaskedImage. oss-fuzz/10582 + + poppler/SplashOutputDev.cc | 71 + ++++++++++++++++++++++++++++------------------ + 1 file changed, 43 insertions(+), 28 deletions(-) + +commit 1c403665cc7726091465f93955ff6c3af4064a49 +Author: Adam Reichold +Date: Sat Sep 22 13:22:43 2018 +0200 + + Fix overflow by noting that pos + length instead of just length must + stay within bounds when trying to recover. oss-fuzz/8670 + + poppler/Parser.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c792e4cde92e6ece06592955068ffb579e826382 +Author: Adam Reichold +Date: Sat Sep 22 12:58:50 2018 +0200 + + Fix integer overflow by moving check bits-per-compoennt before mask + computation. oss-fuzz/9343 + + poppler/GfxState.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8a675c046cd5689356d51ac2268b90a205fa24ed +Author: Adam Reichold +Date: Sat Sep 22 13:39:05 2018 +0200 + + Check that Type1C font dict offset and length do not overflow integer + positions. oss-fuzz/8633 + + fofi/FoFiType1C.cc | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit de999b24ffefb397ff716123ea66137fc48f7daf +Author: Albert Astals Cid +Date: Sat Sep 22 22:47:59 2018 +0200 + + Fix copypasta mistake + + qt5/src/poppler-qt5.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b2c2433b4dc8bb11fcd6206dc8e24373a66ba521 +Author: Albert Astals Cid +Date: Sat Sep 22 20:09:40 2018 +0200 + + qt5: Be more stubborn getting the page from a label string + + If using the "plain" label string didn't work, try with an + unicode encoded one, this is a bit better since the + label->cmpN comparison in PageLabelInfo::labelToIndex + now succeeds but unfortunately the strtol used there + still gets confused and fails to return the proper page index + + qt5/src/poppler-document.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit e39fceea516b8c1b17d8719433a1e3e81cc32cee +Author: Albert Astals Cid +Date: Sat Sep 22 19:42:52 2018 +0200 + + qt5: Add simple tool to print the labels of pages + + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/poppler-page-labels.cpp | 48 + +++++++++++++++++++++++++++++++++++++++ + 2 files changed, 49 insertions(+) + +commit bc165c4ee67a950e0478b00792f9d160801735bf +Author: Albert Astals Cid +Date: Sat Sep 22 19:20:31 2018 +0200 + + qt5: Add Page::index() + + qt5/src/poppler-page.cc | 4 ++++ + qt5/src/poppler-qt5.h | 9 ++++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit e5aff4b4fcbd3e1cbdd7d6329c00eee10b36e94d +Author: Adam Reichold +Date: Fri Sep 21 16:31:27 2018 +0200 + + Remove MULTITHREADED build flag, i.e. always enable threading support + based on the C++ standard library and make use of RAII lockers for + GlobalParams. + + CMakeLists.txt | 4 - + config.h.cmake | 3 - + poppler/Annot.cc | 8 +- + poppler/Annot.h | 2 - + poppler/Array.cc | 7 +- + poppler/Array.h | 2 - + poppler/CairoFontEngine.cc | 8 +- + poppler/CairoFontEngine.h | 2 - + poppler/Catalog.cc | 7 +- + poppler/Catalog.h | 4 +- + poppler/Dict.cc | 7 +- + poppler/Dict.h | 2 - + poppler/GlobalParams.cc | 191 + ++++++++++++----------------------------- + poppler/GlobalParams.h | 2 - + poppler/GlobalParamsWin.cc | 20 +---- + poppler/PDFDoc.cc | 8 +- + poppler/PDFDoc.h | 2 - + poppler/Page.cc | 7 +- + poppler/Page.h | 2 - + poppler/XRef.cc | 12 +-- + poppler/XRef.h | 2 - + poppler/poppler-config.h.cmake | 5 -- + 22 files changed, 76 insertions(+), 231 deletions(-) + +commit a38895a1851d9a7a9abd1070bba23fb68708cb78 +Author: Adam Reichold +Date: Sat Sep 1 07:20:32 2018 +0200 + + Replace GooMutex by std::recursive_mutex (and plain reference counter + by std::atomic_int). + + CMakeLists.txt | 1 - + goo/GooMutex.h | 93 + -------------------------------------------- + poppler/Annot.cc | 23 +---------- + poppler/Annot.h | 7 +++- + poppler/Array.cc | 20 +--------- + poppler/Array.h | 12 +++--- + poppler/CMap.cc | 26 +------------ + poppler/CMap.h | 11 ++---- + poppler/CairoFontEngine.cc | 8 +--- + poppler/CairoFontEngine.h | 4 +- + poppler/Catalog.cc | 8 +--- + poppler/Catalog.h | 3 +- + poppler/CharCodeToUnicode.cc | 29 +------------- + poppler/CharCodeToUnicode.h | 11 ++---- + poppler/Dict.cc | 14 +------ + poppler/Dict.h | 7 +--- + poppler/GlobalParams.cc | 24 +++--------- + poppler/GlobalParams.h | 11 ++---- + poppler/PDFDoc.cc | 8 +--- + poppler/PDFDoc.h | 5 ++- + poppler/Page.cc | 8 +--- + poppler/Page.h | 5 ++- + poppler/Stream.cc | 26 +------------ + poppler/Stream.h | 14 +++---- + poppler/XRef.cc | 14 ++----- + poppler/XRef.h | 3 +- + 26 files changed, 60 insertions(+), 335 deletions(-) + +commit 2052dc60f5b7403418384237d4bad2c7faf0acee +Author: Albert Astals Cid +Date: Fri Sep 21 23:41:09 2018 +0200 + + Poppler 0.69 + + CMakeLists.txt | 4 ++-- + NEWS | 31 +++++++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 36 insertions(+), 5 deletions(-) + +commit 554e87a1ea76ce73b4cfe6fca5b9c1bb47502dad +Author: Albert Astals Cid +Date: Fri Sep 21 18:00:24 2018 +0200 + + offset from beginning of file can't be < 0 + + poppler/XRef.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 06c344ccb8ccfafa9c506f40226ea2cce0e5f75c +Author: Adam Reichold +Date: Fri Sep 21 09:43:40 2018 +0200 + + Use deferred sorting with Dict again to avoid performance regression + + This tries to move sorting a Dict into the first find call again, + but tries + harder to make the double-checked locking work correctly so that + at least + concurrent calls to find are correct (but concurrent calls to find and + add, set or remove are still not allowed). + + poppler/Dict.cc | 24 ++++++++++++++---------- + poppler/Dict.h | 2 +- + 2 files changed, 15 insertions(+), 11 deletions(-) + +commit 22ea442de8776e7e6fa78062cb8bb224b98e736f +Author: Albert Astals Cid +Date: Thu Sep 20 23:23:56 2018 +0200 + + SplashOutputDev::drawImage: gmallocn -> checkoverflow + + oss-fuzz/10194 + + And also add a likely for the previous change in the file + + poppler/SplashOutputDev.cc | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +commit 8ff1bddc6a97a5f8b43ff95405f0642fb03f962b +Author: Albert Astals Cid +Date: Thu Sep 20 23:21:02 2018 +0200 + + Splash::scaleImageYdXd: gmallocn -> gmallocn_checkoverflow + + oss-fuzz/10205 + + splash/Splash.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit cf25cd0c4893b62a9993034079a6c89c6ca370ee +Author: Albert Astals Cid +Date: Thu Sep 20 23:17:06 2018 +0200 + + SplashOutputDev::drawSoftMaskedImage: gmallocn -> + gmallocn_checkoverflow + + oss-fuzz/10298 + + poppler/SplashOutputDev.cc | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +commit b5db021a71e38d56079cbcfcaf3345765e9ed782 +Author: Albert Astals Cid +Date: Thu Sep 20 23:10:55 2018 +0200 + + GfxUnivariateShading::setupCache: gmallocn -> gmallocn_checkoverflow + + oss-fuzz/10508 + + poppler/GfxState.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit ab1b051a9f65b7f8e4dc9f8f9c28a0aff0c86596 +Author: Albert Astals Cid +Date: Thu Sep 20 23:05:55 2018 +0200 + + Remove unused variable + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d1a4c5a9faf95618fc302c358021a745afc0527c +Author: Denis Onishchenko +Date: Thu Sep 20 22:57:03 2018 +0200 + + Fix 2 errors in computation of type3 glyphs transformation matrix + + poppler/Gfx.cc | 28 +++++++++++++--------------- + 1 file changed, 13 insertions(+), 15 deletions(-) + +commit 5dadcc93c4d4d44d0ec3bdc6bb54851f6ffaee98 +Author: Tobias Deiminger +Date: Sun Sep 9 09:28:22 2018 +0200 + + Compile Qt5 frontend with -DQT_STRICT_ITERATORS + + QT_STRICT_ITERATORS prevents conversion from non-const iterator to + const iterator. + + It helps detecting situations where we waste resources due to + needless detach from implicitely shared container data (i.e. deep + copy). + + If anyone should run into problems, they can disable strict iterators + using a global cache variable: + + $ cmake DENABLE_QT_STRICT_ITERATORS=OFF [...] + + qt5/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 3105b61e0912df397dd712632d8ea16269ff4d94 +Author: Albert Astals Cid +Date: Wed Sep 19 23:17:07 2018 +0200 + + Update (C) + + poppler/OptionalContent.h | 1 + + poppler/StructTreeRoot.cc | 1 + + poppler/StructTreeRoot.h | 1 + + qt5/src/poppler-link.cc | 1 + + qt5/src/poppler-optcontent.cc | 1 + + 5 files changed, 5 insertions(+) + +commit 5bbb2fc4b159b003a22a9d3327ba290a7bba15f0 +Author: Adam Reichold +Date: Tue Sep 18 21:36:13 2018 +0200 + + Add a separate build job using Ubuntu 14.04 and GCC 4.9 to + compatibility with older systems. + + .gitlab-ci.yml | 35 +++++++++++++++++++++++++++-------- + 1 file changed, 27 insertions(+), 8 deletions(-) + +commit 560b34a6e2d3fd58edfb5f0af751f1aa7d3dc3d8 +Author: Adam Reichold +Date: Tue Sep 18 11:35:55 2018 +0200 + + Prevent leaking OptionalContentGroup by using unique_ptr as early + as possible. oss-fuzz/10418 + + poppler/OptionalContent.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 7ac84c1d633b49d69b1ec80606fdca8ee14d80e0 +Author: Oliver Sander +Date: Tue Sep 18 11:18:33 2018 +0200 + + Document the new 'ArthurFontID' type + + qt5/src/ArthurOutputDev.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5048bec585be382f9d37110c6b2e16d26d29d5b2 +Author: Oliver Sander +Date: Tue Sep 18 11:02:58 2018 +0200 + + Bugfix: Do not disregard Ref::gen when using Ref as a cache key + + According to Leonard Rosenthol's book, the 'gen' field of a + reference is almost always zero. However, this doesn't mean that + it can be ignored when comparing two Refs. + + Incidentally, this patch also makes use of the recently introduced + Ref::operator<, which allows to replace the small custom class + ArthurFontID by a std::pair. + + qt5/src/ArthurOutputDev.h | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +commit 7e9b6f1dba716e7adba1ed2ecd765b207def9747 +Author: Adam Reichold +Date: Sat Sep 15 09:54:01 2018 +0200 + + Fix TODO in OCGs by creating a look-up table from Ref to + OptionalContentGroup (and make Ref a regular type to do so). + + glib/poppler-document.cc | 12 ++++-------- + poppler/Object.h | 31 +++++++++++++++++++++++++------ + poppler/OptionalContent.cc | 42 + ++++++++++-------------------------------- + poppler/OptionalContent.h | 9 +++++---- + poppler/StructTreeRoot.cc | 2 +- + poppler/StructTreeRoot.h | 2 +- + qt5/src/poppler-link.cc | 5 ----- + qt5/src/poppler-optcontent.cc | 9 ++++----- + utils/pdfinfo.cc | 2 +- + 9 files changed, 51 insertions(+), 63 deletions(-) + +commit 94527d5a61eb3402b49436b978bad69f71884051 +Author: Adam Reichold +Date: Sat Sep 15 09:31:37 2018 +0200 + + Check for Ref type before unwrapping Object as such + + oss-fuzz/10359 + + poppler/OptionalContent.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 3af4c151cf09e1e98d311e8308060eb832bdd7d2 +Author: Adam Reichold +Date: Sun Sep 2 13:48:17 2018 +0200 + + Make Object::takeString leave a dead object instead of a null string + and hence assert non-null strings during object creation. + + poppler/Object.h | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit a238d170dd89e27efd44ea09126b84272c0ac47b +Author: Tobias Deiminger +Date: Fri Sep 7 16:30:48 2018 +0200 + + Add missing newline after Tf in setTextFont + + Until now AnnotAppearanceBuilder::setTextFont was only used to write + last operation in apperance string for /DA. There you don't notice + the missing delimiter. Delimiter will however be required in general, + e.g. when writing appearance string for /AP. + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1acbe6af40e598b3afae18709eb32ec44d7b1afc +Author: Tobias Deiminger +Date: Sat Sep 8 12:39:25 2018 +0200 + + Fix compilation with QT_STRICT_ITERATORS + + qt5/tests/check_annotations.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 574840c5a61a9a20c930dd6fec63e6cf11bacfa5 +Author: Christian Persch +Date: Wed Sep 5 21:19:04 2018 +0200 + + goo: Split GDir and GDirEntry out of gfile.h + + This allows including gfile.h together with glib.h which has + a conflicting GDir type. + + https://gitlab.freedesktop.org/poppler/poppler/issues/370 + + CMakeLists.txt | 1 + + goo/gdir.h | 91 + +++++++++++++++++++++++++++++++++++++++++++++++++ + goo/gfile.cc | 1 + + goo/gfile.h | 49 -------------------------- + poppler/GlobalParams.cc | 1 + + 5 files changed, 94 insertions(+), 49 deletions(-) + +commit f2223e12e401648a24d559ba766759b8afac2d5e +Author: Adam Reichold +Date: Sun Sep 2 10:43:18 2018 +0200 + + Assert validity of Object contents where at least constructor or + destructor seem to assume it to catch errors as early as possible + when using debug builds. + + poppler/Object.cc | 8 ++------ + poppler/Object.h | 9 +++++---- + 2 files changed, 7 insertions(+), 10 deletions(-) + +commit 7c6c1fef6a7eab712ad335d63c5fe7ff05e6e59f +Author: Albert Astals Cid +Date: Sun Sep 2 13:32:01 2018 +0200 + + pdftotext: Fix memory leak in printLine + + utils/pdftotext.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e8e95d2ca4f1c108cc69cab72c7c5ab31f80a597 +Author: Sanchit Anand +Date: Tue Aug 28 02:58:39 2018 -0400 + + pdftotext: Fix only outputs first page content with -bbox-layout + option + + Issue #88 + + poppler/TextOutputDev.cc | 5 +++++ + poppler/TextOutputDev.h | 5 +++++ + utils/pdftotext.cc | 6 ++---- + 3 files changed, 12 insertions(+), 4 deletions(-) + +commit 09cc5fd1b4ef758b1f496b33bc5c5cb9e63b08eb +Author: Albert Astals Cid +Date: Sun Sep 2 13:10:45 2018 +0200 + + qt5: test: Compile with old qt + + qt5/tests/check_annotations.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 042d2483c04652036ab921983b4967851f3bb8cf +Author: Albert Astals Cid +Date: Sun Sep 2 12:39:09 2018 +0200 + + Add missing (C) + + And minor style change by Albert + + poppler/Annot.cc | 6 ++++-- + poppler/Annot.h | 6 ++++-- + qt5/src/poppler-annotation-helper.h | 1 + + qt5/src/poppler-annotation.cc | 2 ++ + qt5/src/poppler-annotation.h | 1 + + 5 files changed, 12 insertions(+), 4 deletions(-) + +commit d4b4be23c8b55a118f7b9194a93a8e9da38793c1 +Author: Tobias Deiminger +Date: Sat Aug 25 23:08:39 2018 +0200 + + More review fixes + + Text color is indicated by nonstroking color in graphics state + Assumption: Text rendering mode is 'fill'. + + Increase color precision for lossless roundtrip of 16 bit integers + Our API takes QColor from user. We want to support a lossless + roundtrip + of QColor (16 bit per channel internally) through document + save and + load, and empirically found .5f is best match. + + Check only .5f case of color channel roundtrip. Include 65535. + We check if precision == 5 is sufficient, and fail if not. We + know that + precision < 5 will never work, because target set contains + less numbers + than uint16 range. + + Use smart pointer in textFont and textColor + + Add test for CMYK QColor roundtrip + + Support QColor::Cmyk to AnnotColor::colorCMYK conversion + + Add simple test for font size. Fix actual/expected args. + + Model font name as class Object, type objName + Take into account that ISO 32000 says Tf operand is always + an object of + PDF type "name". Further benefit: class Object introduces + ownership + semantcis. + + Use more std::unique_ptr and fix some coding syle + Some places assumed ownership implicitely. Make it more + explicit. + + Move parse/constructAppearanceString into DefaultAppearance + We gain cohesion and automatic memory management. + + Fix minor styling issues + + Use std::make_unique from C++14 + + poppler/Annot.cc | 163 + ++++++++++++++++++++-------------------- + poppler/Annot.h | 29 ++++--- + qt5/src/poppler-annotation.cc | 85 +++++++++++++-------- + qt5/tests/check_annotations.cpp | 66 +++++++++++----- + 4 files changed, 199 insertions(+), 144 deletions(-) + +commit b67e7ab708a0606298fd3707347bed935390d062 +Author: Adam Reichold +Date: Fri Aug 24 20:14:14 2018 +0200 + + Add a roundtrip consistency test for the text color properties + of annotations. + + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/check_annotations.cpp | 75 + +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 76 insertions(+) + +commit db0451ab16060509d13415162a95db269ca0d4f3 +Author: Tobias Deiminger +Date: Sat Aug 25 19:57:13 2018 +0200 + + Fix open review comments from #50 + + Make fontTag optional for AnnotFreeText::parseAppearanceString. + Handle fontColor == nullptr in + AnnotFreeText::constructAppearanceString. + Use AnnotAppearanceBuilder in + AnnotFreeText::constructAppearanceString. + Delete copy assignment operator for DefaultAppearance. + Rename setAppearanceString to setDefaultAppearance. + + poppler/Annot.cc | 45 + +++++++++++++++++-------------------------- + poppler/Annot.h | 8 +++++--- + qt5/src/poppler-annotation.cc | 2 +- + 3 files changed, 24 insertions(+), 31 deletions(-) + +commit 64531344de3dc663a4429e94381d68cc198d0425 +Author: Dileep Sankhla +Date: Thu Aug 23 17:48:39 2018 +0200 + + Add annotation font color + + poppler/Annot.cc | 73 +++++++++++++++++++++----- + poppler/Annot.h | 29 +++++++++-- + qt5/src/poppler-annotation-helper.h | 2 +- + qt5/src/poppler-annotation.cc | 101 + ++++++++++++++++++++++-------------- + qt5/src/poppler-annotation.h | 4 ++ + 5 files changed, 152 insertions(+), 57 deletions(-) + +commit f506b8bc52efd0781a933a44bb58d02fb000c78d +Author: Albert Astals Cid +Date: Sat Sep 1 23:54:26 2018 +0200 + + Fix handling of Signature Info Location and Reason + + We can't call GooString->getCString and just store that char * + as it belonged to us since it may very well be the inner array + of the GooString and be invalid once the GooString goes away + + poppler/Form.cc | 6 +++--- + poppler/SignatureInfo.cc | 8 ++++---- + poppler/SignatureInfo.h | 4 ++-- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit 7418616dbfc9c4e5b05b7a57f4fabed3bf9fdcb0 +Author: Albert Astals Cid +Date: Sat Sep 1 23:51:48 2018 +0200 + + Link: Fix memory leak regarding next actions + + poppler/Link.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 45f0f6d21d51c0408fe1d876f18ef05489e69bc0 +Author: Evangelos Rigas +Date: Mon Aug 6 10:57:47 2018 +0100 + + [utils] Add PDF subtype to pdfinfo + + If the document is compliant with PDF A, E, VT, UA or X standard + print PDF subtype version, title, subtitle and explain the part + and conformance levels. + + utils/pdfinfo.cc | 238 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 238 insertions(+) + +commit 98d1b3dcc2c0530c12fb4422067c529ab375c680 +Author: Evangelos Rigas +Date: Wed Aug 22 10:51:12 2018 +0300 + + [core] Add support for PDF subtype property + + Parse /GTS_PDF(A,E,UA,VT,X)Version from the PDF Information + Dictionary into three enums: PDFSubtype, PDFSubtypePart, and + PDFSubtypeConformance. + + poppler/PDFDoc.cc | 132 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/PDFDoc.h | 46 +++++++++++++++++++ + 2 files changed, 178 insertions(+) + +commit 4f039c57fee4413a500a9e36bf8350eae1130442 +Author: Albert Astals Cid +Date: Sat Sep 1 01:05:02 2018 +0200 + + Update (C) from last commits + + cpp/poppler-image.cpp | 1 + + poppler/GfxState.cc | 1 + + poppler/JBIG2Stream.cc | 1 + + qt5/src/ArthurOutputDev.cc | 1 + + splash/SplashPath.cc | 1 + + 5 files changed, 5 insertions(+) + +commit 9df44cf1e0e300b751cd1c562f2b48335db72ac7 +Author: Jakub Wilk +Date: Fri Aug 31 12:05:56 2018 +0200 + + Install goo/GooCheckedOps.h + + goo/gmem.h includes goo/GooCheckedOps.h, so they should be installed + together. + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 55e2b746e6bd3e495c30fe7e5154ec2c956d3faa +Author: Adam Reichold +Date: Fri Aug 31 19:17:59 2018 +0200 + + Check for allocation failure during processing of JBIG2 + streams. oss-fuzz/10146 + + poppler/JBIG2Stream.cc | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +commit bb078cbd88252e421d14747b98c5c71062cf7571 +Author: Adam Reichold +Date: Fri Aug 31 20:18:23 2018 +0200 + + Always check for allocation failure after calling SplashPath::grow + and also set curSubpath to zero so that noCurrentPoint applies after + allocation failure. oss-fuzz/10148 + + splash/SplashPath.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit f200264ddb0a16f54ae2711f399867e659957b1d +Author: Albert Astals Cid +Date: Fri Aug 31 20:03:36 2018 +0200 + + FoFiType1C::getDeltaIntArray: Fix undefined inf to int conversion + + fofi/FoFiType1C.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 9bfc10eecb57354270806aa1d9278eebb1db2287 +Author: Adam Reichold +Date: Fri Aug 31 18:47:52 2018 +0200 + + Bump required C++ standard version to C++14 and convert a few + hopefully obvious call sites where types are repeated to using + std::make_unique. + + CMakeLists.txt | 2 +- + cpp/poppler-image.cpp | 2 +- + cpp/poppler-page.cpp | 14 +++++++------- + poppler/GfxState.cc | 2 +- + qt5/src/ArthurOutputDev.cc | 46 + +++++++++++++++++++++++++++------------------- + 5 files changed, 37 insertions(+), 29 deletions(-) + +commit d2fa4a727fc994256219a4c4f777a1c38dcc26c5 +Author: Albert Astals Cid +Date: Fri Aug 31 19:53:05 2018 +0200 + + (C) of previous commits + + fofi/FoFiType1C.cc | 1 + + poppler/SplashOutputDev.h | 1 + + 2 files changed, 2 insertions(+) + +commit 51f1c813970627db0b8804f6a729eed79ac9dfb4 +Author: Stefan Brüns +Date: Fri Aug 31 00:27:13 2018 +0200 + + SplashPath: Allocate temporary pathes on the stack + + The majority of SplashPath'es are created using + convertPath(GfxState *, GfxPath *), and are only temporary, + i.e. with function scope. + + Returning a SplashPath instead of a pointer from convertPath() + - which is cheap due to the move constructor - saves recurrent + new/delete's for each stroke/fill/... operation. + + poppler/SplashOutputDev.cc | 69 + ++++++++++++++++------------------------------ + poppler/SplashOutputDev.h | 2 +- + 2 files changed, 25 insertions(+), 46 deletions(-) + +commit a31a9e1b9a1eefcea4c8e08f2d84deb0ac6cc4ae +Author: Stefan Brüns +Date: Fri Aug 31 00:23:32 2018 +0200 + + SplashPath: Add move constructor + + After moving, the new SplashPath is in the same state as it + has been copy constructed, the moved from is in the same + state as default constructed, i.e. empty. + + splash/SplashPath.cc | 17 +++++++++++++++++ + splash/SplashPath.h | 1 + + 2 files changed, 18 insertions(+) + +commit 2190b9997ac786189368fc03e46e540c308f11b5 +Author: Stefan Brüns +Date: Wed Aug 29 00:21:57 2018 +0200 + + Allocate temporary SplashXPath on the stack + + SplashXPath is only used inside the each fill function, but newer + passed to the outside. As it is small, there is no reason not to + allocate it on the stack. + + splash/Splash.cc | 36 +++++++++++++----------------------- + 1 file changed, 13 insertions(+), 23 deletions(-) + +commit 38caf0adac8811e663b51656638177397f1400f6 +Author: Albert Astals Cid +Date: Fri Aug 31 10:00:15 2018 +0200 + + Add clang + libc++ testing pipeline + + Would have catched the missing array include in PSOutputDev + + .gitlab-ci.yml | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit 4244a048e55d7cce0caddc68b6bb21983e670bc4 +Author: Adam Reichold +Date: Fri Aug 31 07:33:31 2018 +0200 + + Replace #pragma once by standard-supported include guards and add + missing copyright preamble for new header. + + goo/GooCheckedOps.h | 15 ++++++++++++++- + goo/gmem.h | 5 ++++- + 2 files changed, 18 insertions(+), 2 deletions(-) + +commit 5671d3acc6a723ac3cb63866e2f429e0f0075c68 +Author: Adam Reichold +Date: Thu Aug 30 21:27:13 2018 +0200 + + Extend checked operations header with support for Clang in addition + to checking for GCC version 5 or later. + + goo/GooCheckedOps.h | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit ed28a5612fc0bf8580ccd360ae086fc715d19b35 +Author: Adam Reichold +Date: Thu Aug 30 20:56:33 2018 +0200 + + Fix delta decoding for Type1C fonts to avoid signed integer + overflow. oss-fuzz/8424 + + fofi/FoFiType1C.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit de20e92a70e73d828984f41f52212051fba51700 +Author: Adam Reichold +Date: Thu Aug 30 20:54:17 2018 +0200 + + Factor out overflow-checked multiplication into a separate header + for extension and reuse. + + goo/GooCheckedOps.h | 32 ++++++++++++++++++++++++++++++++ + goo/gmem.h | 16 ++-------------- + 2 files changed, 34 insertions(+), 14 deletions(-) + +commit 3407c5c8003e67deba2b477741ac471927d40f14 +Author: Adam Reichold +Date: Fri Aug 31 07:38:34 2018 +0200 + + Reintroduce the assertion in Array::remove since there it is not + possible to check any return value. + + poppler/Array.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 2c25d197c921e292f49aa2b25f4006acd57c1440 +Author: Adam Reichold +Date: Thu Aug 30 20:26:55 2018 +0200 + + Remove index out of range assertions from Array getters + + A lot of code seems to have been incompatible with the recently + removed DEBUG_MEM + flag, i.e. it relied on the Array getters returning a null object + when the index + was out of range and rather checked the returned object type (since + they had to do + that in any case) than the index. + + Due to this, debug builds became much harder to test, especially + using fuzzing. This + commit thereby removes the assertions to restore the situation when + DEBUG_MEM was + present but disabeld by default and should thereby fix oss-fuzz/10121. + + poppler/Array.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit 987bbb684e688651e3d06502e2ff9b6f08130538 +Author: Albert Astals Cid +Date: Thu Aug 30 22:49:19 2018 +0200 + + PSOutputDev: Hopefully fix compilation under MSVC + + poppler/PSOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit df818b383cf4fa402b89f7b2dd0f958a749a4790 +Author: Albert Astals Cid +Date: Thu Aug 30 20:46:20 2018 +0200 + + SplashPath: Fix overflow check + + What signals overflow is size being 0 not length being 0 + + splash/SplashPath.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 23d570a6f47bc9bc7bf0bcb5dd561885c9a2c55a +Author: Albert Astals Cid +Date: Thu Aug 30 18:54:55 2018 +0200 + + SplashPath: Check for overflow + + fixes oss-fuzz/10120 + + splash/SplashPath.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit ad107bbb8e4d8eb1a23e530d040d5b11bb8ff859 +Author: Albert Astals Cid +Date: Thu Aug 30 18:28:50 2018 +0200 + + JBIG2Bitmap: Fix overflow check + + Fixes oss-fuzz/10113 + + poppler/JBIG2Stream.cc | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit e3a3e3fa996f318c36f9926fa8cc5dfc9edfac20 +Author: Philipp Knechtges +Date: Sun Aug 26 19:37:29 2018 +0200 + + PSOutputDev: add native support for type 7 shadings when using level 3 + + Type 7 shadings are identical for PS and PDF, so we can just emit + the corresponding + information rather than tiling the whole domain. + + poppler/PSOutputDev.cc | 55 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/PSOutputDev.h | 4 +++- + 2 files changed, 58 insertions(+), 1 deletion(-) + +commit de34900993bff73c8da651319027b2fa8c490172 +Author: Ed Porras +Date: Sun Aug 26 20:24:23 2018 +0200 + + fix macOS compilation due to boolean define in jpeglib + + typedef enum { FALSE = 0, TRUE = 1 } boolean; + + goo/JpegWriter.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit be05f7640ca13a6eb327dfac0073acc5dae1e3b4 +Author: Albert Astals Cid +Date: Wed Aug 29 19:02:34 2018 +0200 + + Add (c) of the last few commits + + goo/gmem.h | 1 + + poppler/Array.cc | 1 + + poppler/CairoRescaleBox.cc | 1 + + poppler/GfxFont.cc | 1 + + poppler/Object.cc | 1 + + poppler/poppler-config.h.cmake | 1 + + utils/pdfdetach.cc | 1 + + utils/pdffonts.cc | 1 + + utils/pdfimages.cc | 1 + + utils/pdfinfo.cc | 1 + + utils/pdftocairo.cc | 1 + + utils/pdftohtml.cc | 1 + + utils/pdftoppm.cc | 2 +- + utils/pdftops.cc | 1 + + utils/pdftotext.cc | 1 + + 15 files changed, 15 insertions(+), 1 deletion(-) + +commit 7d523aeae16daf2d504c058031fff90a1a17bf64 +Author: Adam Reichold +Date: Mon Aug 27 20:03:17 2018 +0200 + + Use GCC instrinsics to perform overflow checking in the gmem + allocation functions. + + goo/gmem.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 2b4371b434b27874b64742dcd885e4f303082810 +Author: Adam Reichold +Date: Mon Aug 27 19:55:44 2018 +0200 + + Turn gmem into a header-only wrapper to allow unnecessary branches + to be optimized away and function call overhead to be aovided. + + CMakeLists.txt | 1 - + goo/gmem.cc | 171 + ----------------------------------------- + goo/gmem.h | 185 + +++++++++++++++++++++++++++++++++++---------- + poppler/CairoRescaleBox.cc | 6 +- + poppler/GfxFont.cc | 2 +- + 5 files changed, 147 insertions(+), 218 deletions(-) + +commit c362ab1b97f20c5b73b3bad8d52015f679178748 +Author: Adam Reichold +Date: Mon Aug 27 19:42:29 2018 +0200 + + Remove DEBUG_MEM from Object since this uses RAII now and hence + cannot leak. (The existing tracking also is not thread-safe and + hence unreliable.) + + poppler/Object.cc | 31 ------------------------------- + poppler/Object.h | 17 ----------------- + poppler/poppler-config.h.cmake | 3 +-- + utils/pdfdetach.cc | 3 --- + utils/pdffonts.cc | 3 --- + utils/pdfimages.cc | 3 --- + utils/pdfinfo.cc | 3 --- + utils/pdftocairo.cc | 3 --- + utils/pdftohtml.cc | 3 --- + utils/pdftoppm.cc | 3 --- + utils/pdftops.cc | 3 --- + utils/pdftotext.cc | 3 --- + 12 files changed, 1 insertion(+), 77 deletions(-) + +commit 122b3ca5838f9648646d7a2940badaae86756f03 +Author: Adam Reichold +Date: Mon Aug 27 19:39:20 2018 +0200 + + Replace specific DEBUG_MEM in Array implementation by debug + assertions. + + poppler/Array.cc | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +commit f89446f6917a869b0f1a80fcc8ce81a7213dade4 +Author: Adam Reichold +Date: Mon Aug 27 19:37:25 2018 +0200 + + Remove generic heap debugging from gmem since external tools and + compiler instrumentation achieve the same effect. + + goo/gmem.cc | 151 + ---------------------------------------------------- + goo/gmem.h | 9 ---- + utils/pdfdetach.cc | 1 - + utils/pdffonts.cc | 1 - + utils/pdfimages.cc | 1 - + utils/pdfinfo.cc | 1 - + utils/pdftocairo.cc | 1 - + utils/pdftohtml.cc | 1 - + utils/pdftoppm.cc | 1 - + utils/pdftops.cc | 1 - + utils/pdftotext.cc | 1 - + 11 files changed, 169 deletions(-) + +commit 38b67245941a8672372953142b06c80cd0a142c0 +Author: Adam Reichold +Date: Mon Aug 27 19:27:41 2018 +0200 + + Remove gmempp implementing C++ memory allocation operators using + gmalloc for heap debugging. + + CMakeLists.txt | 1 - + goo/gmempp.cc | 32 -------------------------------- + 2 files changed, 33 deletions(-) + +commit d62d65c21f01c7b0a7c28adebcab43d667bcaed9 +Author: Adam Reichold +Date: Sat Aug 25 20:06:13 2018 +0200 + + Use --output-on-failure ctest flag to make failed CI runs more + informative. + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 93b214986aa89bc085c7937f63e5eafe795d985c +Author: Adam Reichold +Date: Fri Aug 24 07:42:52 2018 +0200 + + Reconstruct iterator via index arithmetic instead of relying on a + non-standard constructor to fix builds on MSVC. + + poppler/Dict.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit dcd8ad25023db542ade5edc23fc5f943d8ee6376 +Author: Albert Astals Cid +Date: Thu Aug 23 23:07:41 2018 +0200 + + Also delete Object::dictAdd that takes a char * + + Makes sure noone gets a char * -> const char * promotion via Object + + poppler/Object.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit d63564b2bca955c7ef6ec694e3c64f9e4ee46d57 +Author: Albert Astals Cid +Date: Thu Aug 23 23:10:57 2018 +0200 + + Add Adam's copyright for the last patchset + + poppler/Annot.cc | 1 + + poppler/Catalog.cc | 1 + + poppler/Catalog.h | 1 + + poppler/Dict.cc | 1 + + poppler/Dict.h | 1 + + poppler/Form.cc | 1 + + poppler/Object.h | 1 + + poppler/PDFDoc.cc | 2 +- + poppler/Parser.cc | 1 + + utils/pdfunite.cc | 1 + + 10 files changed, 10 insertions(+), 1 deletion(-) + +commit ff2b670062d1315435b418f7ce47b28adb4b789b +Author: Adam Reichold +Date: Thu Aug 23 20:29:08 2018 +0200 + + Delete the previously ownership taking overload of Dict::add to + avoid unexpected memory leaks due to the initial API change. + + poppler/Dict.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 8cb364059d3a8d502811565acd166116dbcd0785 +Author: Adam Reichold +Date: Tue May 8 18:54:32 2018 +0200 + + Adjust all users of Dict::add to avoid leaking memory due to by now + unnecessary calls to copyString. + + poppler/Annot.cc | 28 ++++++++++++++-------------- + poppler/Gfx.cc | 9 +++------ + poppler/Object.h | 4 ++-- + poppler/PDFDoc.cc | 8 ++++---- + poppler/Parser.cc | 8 +++----- + utils/pdfunite.cc | 4 ++-- + 6 files changed, 28 insertions(+), 33 deletions(-) + +commit d479e37d34435c6afedf1343a7f60334f351220c +Author: Adam Reichold +Date: Tue May 8 18:19:03 2018 +0200 + + Fix linking errors in release builds due to non exported weak symbols. + + poppler/Dict.cc | 4 ++++ + poppler/Dict.h | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit d4230e3b72d22a24ffe747891a15635ebf0df628 +Author: Adam Reichold +Date: Tue May 8 08:32:03 2018 +0200 + + But do use swap-and-pop if the Dict is still small enough to be + unsorted. + + poppler/Dict.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit ca202af16ac9bd177d7417f3e74b8987e9256bc6 +Author: Adam Reichold +Date: Mon May 7 22:58:43 2018 +0200 + + Try to simplify Dict by implementing it in terms of std::vector + and std::string. + + poppler/Catalog.cc | 2 +- + poppler/Catalog.h | 2 +- + poppler/Dict.cc | 240 + ++++++++++++++++------------------------------------- + poppler/Dict.h | 46 +++++----- + poppler/Form.cc | 2 +- + poppler/Object.h | 4 +- + 6 files changed, 99 insertions(+), 197 deletions(-) + +commit 670171ba7507bc8ea39c3a33316c86b68fed5e0d +Author: Albert Astals Cid +Date: Thu Aug 23 18:11:45 2018 +0200 + + Don't abort if the SampleFunction has too many samples + + Fixes issue #634 + + poppler/Function.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 5fbce88ec9f6d360c5b6436837dfa760c8fa8d95 +Author: Volker Krause +Date: Thu Aug 23 00:56:27 2018 +0200 + + Fix memory issues in GfxImageColorMap copy ctor + + - byte_lookup and lookup2 could contain uninitialized memory + - lookup2 was not copied at all + - lookup could be copied with the wrong size + + Issue #145 + + poppler/GfxState.cc | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +commit 2b5f35e59d234aed0805f0ea8ac5086e35837153 +Author: Oliver Sander +Date: Tue Nov 28 16:40:40 2017 +0100 + + Document the OutputDev::clip and OutputDev::oeClip methods + + poppler/OutputDev.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 2a67883de1c896c5a8956226db7871e97724ed2b +Author: Adam Reichold +Date: Wed Aug 22 06:10:29 2018 +0200 + + Also install Curl development files since it is a default enabled + dependency. + + .gitlab-ci.yml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c220ef254f326866016930ac9c1c2b430fcb11ea +Author: Albert Astals Cid +Date: Wed Aug 22 00:57:33 2018 +0200 + + Fix uninitialized memory read + + Fixes oss-fuzz/10009 + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b8082c67943ea7ef7c115b86cffb0785da32d227 +Author: Adam Reichold +Date: Tue Aug 21 20:21:36 2018 +0200 + + Since the CI directory is cached, we need to make sure we create it + if necessary instead of failing. + + .gitlab-ci.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f1b8626e021a11d2b649be69c563a2a9af210c84 +Author: Adam Reichold +Date: Tue Aug 21 08:35:31 2018 +0200 + + Use a proper UTF-8 locale for non-ASCII file names in the tests and + rebase onto Debian unstable + + .gitlab-ci.yml | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +commit 534aca90732c199e96057111272afbc22796ea60 +Author: Adam Reichold +Date: Tue Aug 21 08:13:10 2018 +0200 + + Also download test-data to be able to run unit tests + + .gitlab-ci.yml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 78f8a6abed64a1b9ad320587b614ee87bc7791ab +Author: Adam Reichold +Date: Tue Aug 21 08:00:41 2018 +0200 + + Add initial GitLab CI manifest + + .gitlab-ci.yml | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit c666833e4163a93451eab27c675af9ca82d11593 +Author: Albert Astals Cid +Date: Sun Aug 19 23:37:51 2018 +0200 + + poppler 0.68 + + CMakeLists.txt | 4 ++-- + NEWS | 25 +++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 29 insertions(+), 4 deletions(-) + +commit 9492eeb6af75d691a2131fa8481556b1ac86795c +Author: Albert Astals Cid +Date: Sun Aug 19 23:29:10 2018 +0200 + + Update (C) + + utils/HtmlFonts.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 7a74c4071f001664c4383ea8e4e9d941bdb438b4 +Author: Albert Astals Cid +Date: Sun Aug 19 19:52:56 2018 +0200 + + Don't give a warning when Marked value is false + + Bug #107430 + + poppler/Catalog.cc | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit ce0f124ae2a50c51cae32b8c4e7559a9223ea3d5 +Author: Albert Astals Cid +Date: Sat Aug 18 23:58:40 2018 +0200 + + Make sure that the openjpeg we're getting is version 2 + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 06106d930b18a34c18e32734b73c212b852161a5 +Author: Aleksey Nikolaev +Date: Thu Aug 16 17:20:00 2018 +0200 + + Fix build with MSVC + + cpp/poppler-page.cpp | 4 ++++ + cpp/poppler-page.h | 5 +++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit 04db8bd27db154e055a0d1715c0f81d4c37d6871 +Author: Albert Astals Cid +Date: Thu Aug 16 16:06:50 2018 +0200 + + LONG_LONG_MAX -> LLONG_MAX + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1b0b9e14e25494dfc08bbb9fe7232c7fca0d7f32 +Author: Hannah von Reth +Date: Thu Aug 16 15:39:28 2018 +0200 + + Remove wchar_t- on MSVC + + Qt is built with wchar_t so if you try to build poppler without it, + there are conflicting types and everything fails + + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +commit 12bf632489587df9da416ed8303fb8aefc26bdac +Author: Albert Astals Cid +Date: Thu Aug 16 11:18:21 2018 +0200 + + Use OpenJpeg cmake config file instead of pkgconfig + + CMakeLists.txt | 16 ++++++++-------- + cmake/modules/FindLIBOPENJPEG2.cmake | 22 ---------------------- + 2 files changed, 8 insertions(+), 30 deletions(-) + +commit 0f35c2de35efa5689e4668b76a68c76de893fe7c +Author: Albert Astals Cid +Date: Thu Aug 9 17:04:38 2018 +0200 + + Fix spacing + + poppler/SignatureInfo.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 90ace43c5bb52854b4fa1fdd224d0273b8fd6ff0 +Author: Chinmoy Ranjan Pradhan +Date: Thu Aug 9 16:39:30 2018 +0200 + + [qt] Add Reason and Location to SignatureInfo + + Small tweaks (spacing) by Albert Astals Cid + + Bug #107299 + + qt5/src/poppler-form.cc | 17 +++++++++++++++++ + qt5/src/poppler-form.h | 13 +++++++++++++ + 2 files changed, 30 insertions(+) + +commit c9bf96aa99059ce0216a75ae2868b79d6e21bc3d +Author: Chinmoy Ranjan Pradhan +Date: Thu Aug 9 16:35:14 2018 +0200 + + Add Reason and Location to SignatureInfo + + Small tweaks (const, etc) by Albert Astals Cid + + Bug #107299 + + poppler/Form.cc | 10 ++++++++++ + poppler/SignatureInfo.cc | 29 +++++++++++++++++++++++++++++ + poppler/SignatureInfo.h | 7 +++++++ + 3 files changed, 46 insertions(+) + +commit 9f8fb7aae92268c9460434abd4d970f04a9af926 +Author: Steven Boswell +Date: Thu Aug 9 16:16:10 2018 +0200 + + HtmlFont: Fix possible uninitialized variable & dangling reference + + Bug #107316 + + utils/HtmlFonts.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1f8ab328f1440721fe7be7615a9d965a6e3d0439 +Author: Albert Astals Cid +Date: Thu Aug 9 00:40:14 2018 +0200 + + XRef::readXRef: Fix possible integer overflow + + fixes oss-fuzz/9777 + + poppler/XRef.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit c1e90bb19003af9ddf7a1ea88399d9ce47db233f +Author: Albert Astals Cid +Date: Mon Jul 23 23:05:14 2018 +0200 + + Always initialize SplashPipe:cSrcVal + + Fixes Use-of-uninitialized-value in oss-fuzz/9560 + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 71645d9e76f9bb075ae9b6599d281b8382e86e67 +Author: Albert Astals Cid +Date: Mon Jul 23 00:21:40 2018 +0200 + + Add (C) for the last commits + + poppler/SignatureHandler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f9c7d61e36bb1fb0c77681b993fe5f4c2b1cd37e +Author: Albert Astals Cid +Date: Mon Jul 23 00:19:17 2018 +0200 + + Don't free signeddata nor signerinfo + + They get freed as part of freeing CMSMessage + + poppler/SignatureHandler.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 54a75cb091b0994290e6b398b98e3113cd61355a +Author: Albert Astals Cid +Date: Mon Jul 23 00:18:50 2018 +0200 + + Don't destroy the cert, doesn't belong to us + + poppler/SignatureHandler.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit 36f317d488d8ce6efb69db89a2eca09a98553ab5 +Author: Albert Astals Cid +Date: Sun Jul 22 23:48:03 2018 +0200 + + Copy subject dn instead of storing it + + It comes deep from the cert memory so it's destroyed shorting + after and + thus is invalid if we don't copy it + + poppler/SignatureInfo.cc | 6 ++++-- + poppler/SignatureInfo.h | 4 ++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit 6c4eaf5642439d87dafa03391441bb3e7f3a98c4 +Author: Zsombor Hollay-Horvath +Date: Sat Jul 21 00:28:50 2018 +0200 + + cpp: Add rotation() to text_box + + Bug #106562 + + cpp/poppler-page.cpp | 7 +++++++ + cpp/poppler-page.h | 6 ++++++ + cpp/poppler-private.h | 2 ++ + 3 files changed, 15 insertions(+) + +commit bcd89bc0abb2cc05d3dc428074bb24b450ab7cf0 +Author: Thibaut Brard +Date: Sat Jul 21 00:17:58 2018 +0200 + + pdftohtml: Add option to not round coordinates + + when outputing as xml + + utils/HtmlOutputDev.cc | 22 ++++++++++++++++++---- + utils/pdftohtml.1 | 3 +++ + utils/pdftohtml.cc | 4 ++++ + 3 files changed, 25 insertions(+), 4 deletions(-) + +commit 6ef17493c7d5344aba4278017724746e63659f7f +Author: Albert Astals Cid +Date: Sat Jul 21 00:14:07 2018 +0200 + + JpegWriter: Use the C++11 cascading constructors + + goo/JpegWriter.cc | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit 0b4ad184b479e24b13b0453b89859b75b699b131 +Author: Martin Packman +Date: Fri Jul 20 23:34:37 2018 +0200 + + Add -jpegopt optimize option support to utils + + New option 'optimize=y' for utils that take a -jpegopt param, + pdftocairo and pdftoppm. This corresponds to the cjpeg -optimize + flag, and slightly reduces the size of the output jpeg but uses + additional cpu and memory. + + New jpegOptimize boolean in splash/SplashBitmap WriteImgParams. + + New setOptimize method on goo/JpegWriter taking a boolean. + + Update manpages for new option. + + goo/JpegWriter.cc | 12 ++++++++++++ + goo/JpegWriter.h | 2 ++ + splash/SplashBitmap.cc | 2 ++ + splash/SplashBitmap.h | 2 ++ + utils/pdftocairo.1 | 6 ++++++ + utils/pdftocairo.cc | 11 +++++++++++ + utils/pdftoppm.1 | 6 ++++++ + utils/pdftoppm.cc | 11 +++++++++++ + 8 files changed, 52 insertions(+) + +commit 20d89699b35397f23352d0e60a3e19da2ce6b410 +Author: Albert Astals Cid +Date: Thu Jul 19 23:20:03 2018 +0200 + + poppler 0.67 + + CMakeLists.txt | 4 ++-- + NEWS | 8 ++++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 12 insertions(+), 4 deletions(-) + +commit 8bc5acb1c18e77e912b7d9caa7f73e6969d1dede +Author: Albert Astals Cid +Date: Thu Jul 19 17:55:13 2018 +0200 + + Splash::arbitraryTransformMask: Set clipRes to splashClipPartial in + some if branches + + If xx or yy are not in the expected bounds something went wrong so + don't assume we're still inside the valid area for the destination + either + + fixes oss-fuzz/9382 + + splash/Splash.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 004e3c10df0abda214f0c293f9e269fdd979c5ee +Author: Albert Astals Cid +Date: Wed Jul 18 20:31:27 2018 +0200 + + Fix crash when Object has negative number + + Spec says object number has to be > 0 and gen has to be >= 0 + + Reported by email + + poppler/Parser.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 155897f3cb88db5050b9d16dc50bfd8b660077b6 +Author: Albert Astals Cid +Date: Tue Jul 17 01:05:38 2018 +0200 + + JBIG2Stream::readTextRegion: Fix uninitialized memory read + + fixes oss-fuzz/9381 + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eb1291f86260124071e12226294631ce685eaad6 +Author: Albert Astals Cid +Date: Wed Jul 11 00:26:01 2018 +0200 + + GfxPatchMeshShading::getParameterizedColor: Fix uninitialized + memory read + + fixes oss-fuzz/9264 + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 729e212f465d015959e5a64662593e5e3f8e4924 +Author: Albert Astals Cid +Date: Fri Jul 6 17:29:46 2018 +0200 + + Add some easy const to XRef + + poppler/XRef.cc | 26 +++++++++++++------------- + poppler/XRef.h | 46 +++++++++++++++++++++++----------------------- + 2 files changed, 36 insertions(+), 36 deletions(-) + +commit e607d9c4a0057c390c59e306f6dc010aea2125ee +Author: Stefan Brüns +Date: Sun May 20 19:31:53 2018 +0200 + + Small optimization for AABGR8 pipes + + Skip some computations if both src and dest alpha are zero, or if + src is fully opaque. Equivalent to Commit f47936af7508A + ("Small optimization for AAXRGB8 pipes"). + + splash/Splash.cc | 28 +++++++++++++++++++--------- + 1 file changed, 19 insertions(+), 9 deletions(-) + +commit 1b5298ebb8d76b5eee11d9cccdfffcdceb5d064b +Author: Albert Astals Cid +Date: Mon Jul 2 21:46:10 2018 +0200 + + GfxUnivariateShading::getColor: Fix uninitialized memory read + + fixes oss-fuzz/9165 + + poppler/GfxState.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit d8346166d5150c1673379dcb3c658b9805f99764 +Author: Albert Astals Cid +Date: Mon Jul 2 20:10:25 2018 +0200 + + Gfx::doRadialShFill: Don't divide by zero + + fixes oss-fuzz/9133 + + poppler/Gfx.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 0735821ee03f9d83a9817450b12f45a502f51834 +Author: Albert Astals Cid +Date: Tue Jun 26 17:09:52 2018 +0200 + + Form: Remove return in void function + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b317ee3ecb939b91e1f8245177defaa59f8478b7 +Author: Albert Astals Cid +Date: Tue Jun 26 15:27:48 2018 +0200 + + Form: Remove unused getContentCopy + + it's confusing to have getContent and getContentCopy that does 99% + the same + + poppler/Form.cc | 11 ----------- + poppler/Form.h | 3 --- + 2 files changed, 14 deletions(-) + +commit 664d166194bc0832fd446b354630c4c7994ae4e3 +Author: Albert Astals Cid +Date: Tue Jun 26 15:22:13 2018 +0200 + + Form: Add a few more const + + poppler/Form.cc | 8 ++++---- + poppler/Form.h | 18 +++++++++--------- + 2 files changed, 13 insertions(+), 13 deletions(-) + +commit 5ef6a845d8872f5dbc5698260ab5e12391f01f76 +Author: Albert Astals Cid +Date: Mon Jun 25 19:21:37 2018 +0200 + + Splash::arbitraryTransformImage: Fix uninitialized memory read + + fixes oss-fuzz/9066 + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 267228bb071016621c80fc8514927905164aaeea +Author: Albert Astals Cid +Date: Sun Jun 24 18:28:22 2018 +0200 + + pdfsig: Use posix basename() instead of GNU one + + So it builds on non GNU systems too + + Bug #106783 + + utils/pdfsig.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 459f369145a9d8f638fe123425f0e2880487640e +Author: Albert Astals Cid +Date: Sun Jun 24 11:51:20 2018 +0200 + + Move variable declarations closer to where they are used + + Allows for declaring two of them as const + + poppler/Stream.cc | 26 ++++++++++---------------- + 1 file changed, 10 insertions(+), 16 deletions(-) + +commit e8b82c4239da638ae77dfab07faaff33af4af1cc +Author: Albert Astals Cid +Date: Sun Jun 24 11:46:36 2018 +0200 + + ImageStream::getLine: Fix ubsan undefined shift + + I'm not totally sure this is the "correct" fix, but doesn't regress + any file on my test suite so seems one of those cases only happens + on bad files, and this helps oss-fuzz progress in its testing + + Fixes oss-fuzz/8432 + + poppler/Stream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c0e87eda688351b3caf222e5525f75a3190fd87c +Author: Albert Astals Cid +Date: Sun Jun 24 11:15:52 2018 +0200 + + AnnotBorder::parseDashArray: Fix correct calculation + + obj not being a num also means not correct + + fixes oss-fuzz/9056 + + poppler/Annot.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 322f8a453664fbad65c4b998034adf8df2ac0bea +Author: Albert Astals Cid +Date: Sat Jun 23 00:41:18 2018 +0200 + + GfxDeviceNColorSpace::parse: Fix leak on malformed files + + Fixes oss-fuzz/9036 + + poppler/GfxState.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit af4d5f31705dcfd65319da430f87744b5c1f3616 +Author: Albert Astals Cid +Date: Fri Jun 22 23:55:09 2018 +0200 + + SplashFTFont::makeGlyph: Bail out if constructor returned early + + fixes oss-fuzz/8811 + + splash/SplashFTFont.cc | 7 +++++-- + splash/SplashFTFont.h | 3 ++- + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit 0281c02b9a1cd776c45ca1fd2f5eeea15f6827a6 +Author: Albert Astals Cid +Date: Fri Jun 22 17:33:21 2018 +0200 + + (C) update from 2 commits ago + + fofi/FoFiType1C.h | 1 + + 1 file changed, 1 insertion(+) + +commit 1b65f9eb1beef0d1a41a4d59c89e4acd193a1a3f +Author: Albert Astals Cid +Date: Fri Jun 22 17:29:26 2018 +0200 + + Gfx:Generalize protection against a pattern drawing itself + + fixes oss-fuzz/8929 + + poppler/CairoOutputDev.cc | 2 +- + poppler/Gfx.cc | 53 + ++++++++++++++++++++++++++-------------------- + poppler/Gfx.h | 4 ++-- + poppler/PSOutputDev.cc | 2 +- + poppler/SplashOutputDev.cc | 2 +- + 5 files changed, 35 insertions(+), 28 deletions(-) + +commit da349184c61034ac5818efe90d426de6af2c74d7 +Author: Albert Astals Cid +Date: Fri Jun 22 16:48:11 2018 +0200 + + FoFiType1C::readPrivateDict: Fix potential uninitialized memory read + + fixes oss-fuzz/8864 + + fofi/FoFiType1C.cc | 2 -- + fofi/FoFiType1C.h | 6 +++--- + 2 files changed, 3 insertions(+), 5 deletions(-) + +commit 877dcec7e2357991d79508a2aefc39d1510bf235 +Author: Albert Astals Cid +Date: Tue Jun 19 23:16:47 2018 +0200 + + Poppler 0.66 + + CMakeLists.txt | 4 ++-- + NEWS | 7 +++++++ + cpp/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 11 insertions(+), 4 deletions(-) + +commit 37d2aa88409429397a6c8801b34213f6eded8e1e +Author: Albert Astals Cid +Date: Tue Jun 19 17:42:16 2018 +0200 + + PostScriptFunction::parseCode: Fix memory leak on malformed files + + Fixes oss-fuzz/8859 + + poppler/Function.cc | 1 + + 1 file changed, 1 insertion(+) + +commit e4f4cbddd11ae6386985879187007fa5add43624 +Author: Albert Astals Cid +Date: Tue Jun 12 09:32:57 2018 +0200 + + StreamPredictor: Move pixBytes calculation after checks + + fixes oss-fuzz/8835 + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit adb7cac1b787b35c4f5d25e0441e459ab92d0469 +Author: Albert Astals Cid +Date: Tue Jun 12 09:00:33 2018 +0200 + + GfxImageColorMap: Initialize y to prevent uninit mem use + + Fixes oss-fuzz/8839 + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6b37df791731e40837fa1eba86ae740650431438 +Author: Albert Astals Cid +Date: Wed Jun 6 17:56:27 2018 +0200 + + SampledFunction: Fix divide by zero + + Actual valid values are 1, 2, 4, 8, 12, 16, 24, and 32 but this + check is easier + + fixes oss-fuzz/8713 + + poppler/Function.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit d6a3dc3ebbc97fcdd3c45028b5741f4b99fc0279 +Author: Albert Astals Cid +Date: Wed Jun 6 17:46:17 2018 +0200 + + GfxAxialShading::parse: Fix memory leak on broken files + + fixes oss-fuzz/8742 + + poppler/GfxState.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 599e28433268ceaa933cf2a2492c81da4418e207 +Author: Albert Astals Cid +Date: Tue Jun 5 20:11:19 2018 +0200 + + JBIG2Stream::readSymbolDictSeg: Fix potential uninitialized memory + read + + fixes oss-fuzz/8748 + + poppler/JBIG2Stream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a231de883b438af1807726fab4265ecf4689cf50 +Author: Albert Astals Cid +Date: Tue Jun 5 20:00:03 2018 +0200 + + CMap::parse2: Initialize end + + fixes oss-fuzz/8747 + + poppler/CMap.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2c629fefe2b2b1e2663521beeac432c808afe7c7 +Author: Albert Astals Cid +Date: Tue Jun 5 19:56:53 2018 +0200 + + JBIG2Stream::readSymbolDictSeg: Initialize dh + + fixes oss-fuzz/8751 + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0053966d3ec5b5c4eb6480417b2c8a8ccd910964 +Author: Albert Astals Cid +Date: Mon Jun 4 20:38:41 2018 +0200 + + JBIG2Stream::readSymbolDictSeg: Initialize refDX + + fixes oss-fuzz/8696 + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8dfe3fb37ec01e35eb22a0932fe708bc9b78cb4f +Author: Albert Astals Cid +Date: Wed May 30 17:09:16 2018 +0200 + + LONG_LONG_MAX -> LLONG_MAX + + that's the name the standard uses + + poppler/Parser.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b4f0e2b27a0880801c7af0c82fe17894797511b2 +Author: Stefan Brüns +Date: Sat May 26 19:51:20 2018 +0200 + + Splash: Reserve space for path segments upfront + + Instead of iteratively growing the array reserve sufficient space + prior to populating the array. + + poppler/SplashOutputDev.cc | 2 ++ + splash/SplashPath.cc | 18 ++++++++++++++++++ + splash/SplashPath.h | 4 ++++ + 3 files changed, 24 insertions(+) + +commit 450a8a54e080b5bb80533b1777b3b670bea1f27a +Author: Albert Astals Cid +Date: Wed May 30 09:09:12 2018 +0200 + + JBIG2Stream::readSymbolDictSeg: Initialize refDY + + fixes oss-fuzz/8621 + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1750c0155762e75d0a80ab55b50d1bfd172c2430 +Author: Stefan Brüns +Date: Tue May 29 23:49:05 2018 +0200 + + splash: Correctly manipulate spot colors if SPOT_NCOMPS != 4 + + The default number of spot colors is 4, in this case the change is + without effect, otherwise only the last 4 colors where handled. + + splash/SplashTypes.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit fb4629eb4b1787332b88b330da16353e5ade7b4d +Author: Albert Astals Cid +Date: Tue May 29 20:32:23 2018 +0200 + + SplashFTFont: Early return if face->units_per_EM is 0 + + fixes oss-fuzz/8617 + + splash/SplashFTFont.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 943a465d7b76b26de83d2038226c72bcf619c29f +Author: Albert Astals Cid +Date: Tue May 29 20:23:51 2018 +0200 + + SplashFTFont: Initialize textScale + + fixes oss-fuzz/8616 + + splash/SplashFTFont.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f821faa1795c1b25104d84e9f5a7e8ad218baa61 +Author: Albert Astals Cid +Date: Tue May 29 20:18:26 2018 +0200 + + CMap::parse2: Initialize start + + fixes oss-fuzz/8611 + + poppler/CMap.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a76c8fbd50a3a5cbe0487158e9d2b325e596d2c6 +Author: Albert Astals Cid +Date: Tue May 29 01:01:26 2018 +0200 + + GfxSeparationColorSpace::getRGB: ensure color2 doesn't have uninit + values + + if alt->getNComps() is bigger than func->getOutputSize() (which + is most + likely a faulty file) we init those indexes of color2 with 0 + + fixes oss-fuzz/8586 + + poppler/GfxState.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit e35fdb1448b7860d697b9c2ec8bda49c7a8a3ae5 +Author: Albert Astals Cid +Date: Tue May 29 00:59:22 2018 +0200 + + JBIG2Stream::readTextRegion: Initialize ds + + fixes oss-fuzz/8594 + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bb25c0d46f1f0e037805f0c6dde07f3ea9c9320c +Author: Albert Astals Cid +Date: Tue May 29 00:55:28 2018 +0200 + + Gfx::doRadialShFill: Initialize colorA, colorB and colorC + + fixes oss-fuzz/8587 + + poppler/Gfx.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit b8cf8b04cbd1c0c5643cc77ed7b0b60525ecf080 +Author: Albert Astals Cid +Date: Mon May 28 23:51:32 2018 +0200 + + FoFiType1::parse: Don't copy to buf more than the available file + + fixes oss-fuzz/8576 + + fofi/FoFiType1.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 10a3dc2a9c92349e498ea36bb342b821dcfc9d76 +Author: Albert Astals Cid +Date: Mon May 28 17:44:34 2018 +0200 + + GfxState.cc: Fix undefined behaviour when compBits is 31 + + it's a technical issue since according to spec biggest + valid value for compBits is 16, but this is simpler imho + + fixes oss-fuzz/8582 + + poppler/GfxState.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 96e7bc19ffcaf46d4cb69660ed040c09d46815d6 +Author: Albert Astals Cid +Date: Sun May 27 09:42:24 2018 +0200 + + JBIG2Stream::readTextRegion: Initialize a few variables + + So if the stream is broken we don't use uninitialized variables + + fixes oss-fuzz/8547 + + poppler/JBIG2Stream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9c0c538e8d1aa39cd136cfb8fe0fbfe1def5174d +Author: Albert Astals Cid +Date: Sun May 27 09:34:16 2018 +0200 + + Gfx::doAxialShFill: initialize color1 + + fixes oss-fuzz/8546 + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 18f376c0dff184851b3ee4c05c40b4ee2c21da8c +Author: Albert Astals Cid +Date: Sun May 27 09:29:49 2018 +0200 + + FoFiType1::parse: Fix reading past font length + + fixes oss-fuzz/8545 + + fofi/FoFiType1.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 19d3993f3f40b5113141d5a55acea307c174f1d3 +Author: Albert Astals Cid +Date: Sun May 27 09:10:05 2018 +0200 + + XRef::fetch: Don't try to fetch objects with negative offset + + fixes oss-fuzz/8433 + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9a8d33246601dbd2bea98bb3404596848f71162a +Author: Albert Astals Cid +Date: Sun May 27 08:47:19 2018 +0200 + + Splash::fillGlyph2: fix buffer overflow + + Make sure xx / 8 + 1 is not out of bounds + + fixes oss-fuzz/8422 + + splash/Splash.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1bc71245fa88dc23dc355f926f50f04896739fff +Author: Adam Reichold +Date: Sat May 26 11:54:41 2018 +0200 + + LZWStream: make inputBuf unsigned + + since shifting negative numbers is undefined according to spec + + poppler/Stream.cc | 6 +++--- + poppler/Stream.h | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 68c5977980a60b2fbac0a5938e697cf09f37b0a2 +Author: Albert Astals Cid +Date: Fri May 25 23:06:53 2018 +0200 + + BaseCryptStream: Initialize all of objKey + + fixes oss-fuzz/8493 + + poppler/Decrypt.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 14adecb9693345b7e3baa6dee05f5c88dde7952c +Author: Albert Astals Cid +Date: Fri May 25 22:57:29 2018 +0200 + + Decrypt::md5: initialize x + + When msgLen is small enough x would had initialized values for some + parts of the md5 calculation + + fixes oss-fuzz/8492 + + poppler/Decrypt.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 71bb82bdecccc235e15255635cab2c31cce58e0e +Author: Albert Astals Cid +Date: Fri May 25 22:52:31 2018 +0200 + + Gfx::doAxialShFill: initialize color0 + + fixes oss-fuzz/8470 + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b245154fdebc9a78db163bc95959c6c8f5b4126f +Author: Albert Astals Cid +Date: Fri May 25 22:46:22 2018 +0200 + + Parser::makeStream: Don't overflow length + + fixes oss-fuzz/8499 + + poppler/Parser.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 86777478387577aee8242eb2f11932041e87eff5 +Author: Albert Astals Cid +Date: Fri May 25 19:44:50 2018 +0200 + + Splash::fillWithPattern: initialize pipe + + Makes sure if things fail we're not painting with uninitialized memory + + fixes oss-fuzz/8538 + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 97caec070090d112d4fb5b63dc433a34e214c7e5 +Author: Albert Astals Cid +Date: Fri May 25 19:38:19 2018 +0200 + + FoFiType1C::readTopDict: Return early if parsing fails + + fixes oss-fuzz/8456 + + fofi/FoFiType1C.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 7e2189377bfaa0594e25eaba26aca47bea59f315 +Author: Albert Astals Cid +Date: Fri May 25 17:47:07 2018 +0200 + + GfxGouraudTriangleShading::parse: Add bounds check for compBits + + The spec is much more strict on what is valid, but i'm only doing + a check so that the code doesn't break + + poppler/GfxState.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit fef32ba463a225618a967c541d939fd69e02f2dd +Author: Albert Astals Cid +Date: Fri May 25 17:42:22 2018 +0200 + + GfxPatchMeshShading::parse: Add bounds check for compBits + + The spec is much more strict on what is valid, but i'm only doing + a check so that the code doesn't break + + fixes oss-fuzz/8445 + + poppler/GfxState.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 3b9d8025dbdfcfac94ede20b05d86d177393cde7 +Author: Albert Astals Cid +Date: Fri May 25 17:26:37 2018 +0200 + + Splash: Fix another potential uninitialized memory use + + fixes oss-fuzz/8466 + + splash/Splash.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 0e3b18a48c3907a49c51a0ceded6078a2fd790eb +Author: Albert Astals Cid +Date: Fri May 25 17:06:13 2018 +0200 + + SplashUnivariatePattern::getColor: Fix potential uninitialized + memory read + + If the GfxUnivariateShading doesn't provide enough bits of color + fill them with 0 as to not have random memory read + + fixes oss-fuzz/8470 + + poppler/GfxState.cc | 5 +++-- + poppler/GfxState.h | 4 +++- + poppler/SplashOutputDev.cc | 6 +++++- + 3 files changed, 11 insertions(+), 4 deletions(-) + +commit c75500bf6b2af4b9a26467ce55d1f2879e916b79 +Author: Albert Astals Cid +Date: Fri May 25 16:41:36 2018 +0200 + + T3FontCache: change the order in which the overflow checks are done + + fixes oss-fuzz/8479 + + poppler/SplashOutputDev.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 4ea7ac960d9ecb6a407d0e660312f5701d3dcd49 +Author: Albert Astals Cid +Date: Fri May 25 16:35:49 2018 +0200 + + SplashFTFont::getGlyphPath: early return if textScale == 0 + + fixes oss-fuzz/8529 + + splash/SplashFTFont.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit c1164653bd8d6bcb7da1d959634f63592a393235 +Author: Albert Astals Cid +Date: Fri May 25 16:26:44 2018 +0200 + + GfxGouraudTriangleShading::parse: Protect against coordBits <= 0 + + fixes oss-fuzz/8524 + + poppler/GfxState.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit a7154bcc6aba5429dc6cc024bd90dae2f1d2d0c1 +Author: Albert Astals Cid +Date: Fri May 25 16:21:45 2018 +0200 + + XRef::readXRefTable: Rewrite overflow check + + In a way that it doesn't depend on undefined behaviour + + fixes oss-fuzz/8528 + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f966b9096d046aaee4891de11f74207218cc929b +Author: Albert Astals Cid +Date: Thu May 24 23:58:41 2018 +0200 + + SplashOutputDev::drawSoftMaskedImage: Fix uninitialized memory read + + It can happen that maskStr->doGetChars doesn't give us the number + of chars we wanted, if that happens just set the remainder to zero + + poppler/SplashOutputDev.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit b228892adb01f978d5e6045e1e61741bca1950d2 +Author: Albert Astals Cid +Date: Thu May 24 23:49:12 2018 +0200 + + Splash::blitImageClipped: initialize pixel + + At least this way if the getPixels call we're not drawing random + memory + and thus we get a stable render which helps with regtests + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 67be3708cc4dea9e03f5d0ce5b0214fff35748f2 +Author: Albert Astals Cid +Date: Thu May 24 23:29:55 2018 +0200 + + SplashFTFont::makeGlyph: Fix use of uninitialized data + + caused by the bugfix to not divide by zero + + splash/SplashFTFont.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit c758fc980834882528eeae82568494e46d189cc5 +Author: Albert Astals Cid +Date: Thu May 24 23:19:16 2018 +0200 + + FoFiType1::parse: Fix invalid memory access + + Make sure there's enough line left before calling strncmp + + fixes oss-fuzz/8425 + + fofi/FoFiType1.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 07318f3899248f67a58148b29a9555ff47a1b083 +Author: Albert Astals Cid +Date: Thu May 24 20:15:42 2018 +0200 + + StreamReader::cmp: Fix potential undefined behaviour + + going outside an array range is technically undefined behaviour, + even if then after you go back in range with the next operation, so + we first calculate the diff and then add it to the array + + fofi/FoFiIdentifier.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 6b91d37a704fb2b6fa9529d859c366c331327ab9 +Author: Albert Astals Cid +Date: Thu May 24 18:22:00 2018 +0200 + + SplashOutputDev: Fix memory leak on malformed files + + i.e. SplashOutputDev::endTextObject is not called after + SplashOutputDev::drawChar + + fixes oss-fuzz/8508 + + poppler/SplashOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c9650369c5dd74812db515d986ded898b9002ae4 +Author: Albert Astals Cid +Date: Thu May 24 18:20:12 2018 +0200 + + Splash::scaleMaskYuXu: Free internal bitmap data on error + + this way we don't try to use it later, which will be an uninitialized + memory read + + fixes oss-fuzz/8511 + + splash/Splash.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f279778fe0aca610cdecb70d0a714bbaa08b0d22 +Author: Albert Astals Cid +Date: Thu May 24 13:06:00 2018 +0200 + + JBIG2Stream::readSymbolDictSeg: Fix potential uninitialized memory use + + fixes oss-fuzz/8468 + + poppler/JBIG2Stream.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit ea72a3f3dc1619482ab2502dc50fe628600f38b5 +Author: Albert Astals Cid +Date: Thu May 24 12:42:54 2018 +0200 + + gmallocn: move the operation after the checks + + fixes oss-fuzz/8423 + + goo/gmem.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit aa39d079dc3b68b0a3512408706d053d664d557d +Author: Albert Astals Cid +Date: Thu May 24 12:40:38 2018 +0200 + + XRef::readXRefStreamSection: Add integer overflow check + + fixes oss-fuzz/8444 + + poppler/XRef.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit db73587c566f8e50f03b24628e8948a558ee7039 +Author: Albert Astals Cid +Date: Thu May 24 11:56:39 2018 +0200 + + StreamPredictor: move rowBytes calculation after overflow check + + fixes oss-fuzz/8498 + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 76820f5ab932a9ed18913bc7d1a452ddf060c133 +Author: Albert Astals Cid +Date: Thu May 24 01:12:07 2018 +0200 + + JBIG2Stream::readPageInfoSeg: Fix memory leak on malformed documents + + fixes oss-fuzz/8463 + + poppler/JBIG2Stream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit ffb0daefda688564c1456f4b8b3f5a715d228cdc +Author: Albert Astals Cid +Date: Wed May 23 19:06:51 2018 +0200 + + Apply previous optimization also to Splash::pipeRunAARGB8 + + splash/Splash.cc | 28 +++++++++++++++++++--------- + 1 file changed, 19 insertions(+), 9 deletions(-) + +commit f47936af75088c55a19fe6b1a67128fcc3f57b08 +Author: Stefan Brüns +Date: Wed May 23 19:05:50 2018 +0200 + + Small optimization for AAXRGB8 pipes + + Skip some computations if both src and dest alpha are zero, or if + src is fully opaque. For common cases (majority of pixels fully + opaque) like in fdo#81211, this reduces execution time of + pipeRunAAXBGR8 by 50% (-20% total execution time). + + splash/Splash.cc | 29 ++++++++++++++++++++--------- + 1 file changed, 20 insertions(+), 9 deletions(-) + +commit 60ec88b3ca5f109b3532dbf2f36df66aed2d7bbf +Author: Albert Astals Cid +Date: Wed May 23 19:49:29 2018 +0200 + + greallocn: move the operation to after the checks + + fixes oss-fuzz/8484 + + goo/gmem.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit e0fb18040378659c98fedb4bdaff6a903ddd095b +Author: Albert Astals Cid +Date: Wed May 23 19:40:50 2018 +0200 + + Gfx::opSetExtGState: Fix memory leak on broken files + + doSoftMask was called just once, from opSetExtGState, but was + given the duty to delete blendingColorSpace that given doSoftMask + has various early returns is hard to do right, so i've moved + the deletion to opSetExtGState itself + + fixes oss-fuzz/8431 + + poppler/Gfx.cc | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit 86991adb172fd55decdc72ec6fc34d41b19beafa +Author: Albert Astals Cid +Date: Wed May 23 19:35:27 2018 +0200 + + Gfx::doRadialShFill: Fix potential divide by zero + + fixes oss-fuzz/8476 + + poppler/Gfx.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 62c7a6a135aa8c70f638bac9b41a11c4e69c8452 +Author: Albert Astals Cid +Date: Wed May 23 19:29:39 2018 +0200 + + GfxImageColorMap::GfxImageColorMap: Bail out early if bits <= 0 + + fixes oss-fuzz/8478 + + poppler/GfxState.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 6e2de368f620d2e459a4cfe6533a8c29fae6d8c9 +Author: Albert Astals Cid +Date: Wed May 23 19:21:30 2018 +0200 + + SplashFTFont::SplashFTFont: Early return if textScale is 0 + + fixes oss-fuzz/8482 + + splash/SplashFTFont.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 8d715bfc7c3610b823721dc26368728795baa2fe +Author: Albert Astals Cid +Date: Wed May 23 15:44:05 2018 +0200 + + GfxPatchMeshShading::parse: Error out if BitsPerCoordinate <= 0 + + poppler/GfxState.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit f5fb32bd4b64040dc0f9b9e1555dabce804ba566 +Author: Albert Astals Cid +Date: Wed May 23 15:38:26 2018 +0200 + + Splash::scaleMaskYuXu: Also check for srcHeight <= 0 + + splash/Splash.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0318e1667c7b137493f22be61b835eb914f68fa9 +Author: Albert Astals Cid +Date: Wed May 23 15:34:32 2018 +0200 + + GfxPatchMeshShading::parse: Fix memory leak on malformed documents + + fixes oss-fuzz/8487 + + poppler/GfxState.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 3ca2d43b7ddcca08bc026c6564f89ffbe0dde506 +Author: Albert Astals Cid +Date: Wed May 23 00:27:08 2018 +0200 + + warning-- + + poppler/Decrypt.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 58e056c4b15f262b7715f8061d6885eb80044d0d +Author: Albert Astals Cid +Date: Wed May 23 00:23:19 2018 +0200 + + Revert 31c3832b996acbf04ea833e304d7d21ac4533a57 + + So shifting left negative values is undefined behaviour according + to the + spec but if we don't do it we break, so we seem to be depending + on this + undefined behaviour, will try to figure out a better fix + + poppler/Stream.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit a6c2eb671f08beb682e086d5f6791fdb78906a7c +Author: Albert Astals Cid +Date: Tue May 22 22:12:03 2018 +0200 + + Make sure dash[i] is intialized + + even if obj is not a number + + fixes oss-fuzz/8462 + + poppler/Gfx.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 083bfa59378be1c008cb6543f7e9bebde29a4079 +Author: Albert Astals Cid +Date: Tue May 22 22:01:35 2018 +0200 + + nBitsDiffObjects can only be 32 as per spec + + fixes oss-fuzz/8464 + + poppler/Hints.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 942a426f2844b66758b6b443234c3686d61420cc +Author: Albert Astals Cid +Date: Tue May 22 21:41:51 2018 +0200 + + Parser::makeStream: Make sure length is not negative + + fixes oss-fuzz/8469 + + poppler/Parser.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit bf03344ad26b1227b5052420feabe062441c02ed +Author: Albert Astals Cid +Date: Tue May 22 20:36:05 2018 +0200 + + StandardSecurityHandler::isUnencrypted: Fix uninitialized memory use + + fixes oss-fuzz/8426 + + poppler/SecurityHandler.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 31c3832b996acbf04ea833e304d7d21ac4533a57 +Author: Albert Astals Cid +Date: Tue May 22 20:25:18 2018 +0200 + + LZWStream::getCode: Don't left shift negative values + + it's undefined behaviour + + poppler/Stream.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 2c0a0b07fdb2c76487ca4af7b2f50da9904c6c23 +Author: Albert Astals Cid +Date: Tue May 22 20:15:39 2018 +0200 + + Gfx::doImage: Fix memory leak on malformed documents + + fixes oss-fuzz/8452 + + poppler/Gfx.cc | 1 + + 1 file changed, 1 insertion(+) + +commit ace7ca3e0dd1570ef6804c0f054742b2996b9b9f +Author: Albert Astals Cid +Date: Tue May 22 20:10:01 2018 +0200 + + SplashAxialPattern: fix potential divide by zero + + poppler/SplashOutputDev.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 3b8634e744aa5ba3b317fd3378ba07a438826827 +Author: Albert Astals Cid +Date: Tue May 22 20:07:50 2018 +0200 + + GfxAxialShading::getParameterRange: Fix potential divide by zero + + fixes oss-fuzz/8436 + + poppler/GfxState.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 91079d4f482b35f190a4f2bbd9f4fb6a8ad7c2a2 +Author: Albert Astals Cid +Date: Tue May 22 20:01:56 2018 +0200 + + SampledFunction: Fix potential divide by zero + + fixes oss-fuzz/8455 + + poppler/Function.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 6169bfb1ecd289a8235be0b8884a550f5d1ad926 +Author: Albert Astals Cid +Date: Tue May 22 19:56:34 2018 +0200 + + GfxState.cc: Fix potential division by zero + + fixes oss-fuzz/8465 + + poppler/GfxState.cc | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +commit 0868c499a9f5f37f8df5c9fef03c37496b40fc8a +Author: Albert Astals Cid +Date: Tue May 22 19:42:38 2018 +0200 + + Parser::makeStream: Fix potential integer overflow + + poppler/Parser.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit dbe330678766d1260d7f595d238e90aeae1194d6 +Author: Albert Astals Cid +Date: Tue May 22 19:31:34 2018 +0200 + + XRef::constructXRef: Prevent overflow when calculating newSize + + fixes oss-fuzz/8421 + + poppler/XRef.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 224dda4d292a097866f109a9d2cec4b3ba78eb97 +Author: Albert Astals Cid +Date: Tue May 22 19:17:20 2018 +0200 + + Fix out of bounds write in BaseCryptStream + + fixes oss-fuzz/8420 + + poppler/Decrypt.cc | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 0c0c368fed70c1db64ce04b135fd5b060a1f0653 +Author: Albert Astals Cid +Date: Tue May 22 18:26:29 2018 +0200 + + LZWStream::clearTable: init newChar to 0 + + it should not be needed because on well formed streams it will be + properly initialized in processNextCode but + this solves an uninitialized memory use on malformed documents + + fixes oss-fuzz/8457 + + poppler/Stream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit e7f59e39a0aca2a8a363fc0edcf25fb5aaada7a5 +Author: Albert Astals Cid +Date: Tue May 22 18:22:29 2018 +0200 + + Splash::scaleMaskYuXu: Fix crash on malformed files + + fixes oss-fuzz/8435 + fixes oss-fuzz/8441 + + splash/Splash.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 547f19cd420f2d579d921620545e6496adb6a9fb +Author: Albert Astals Cid +Date: Tue May 22 18:17:58 2018 +0200 + + Fix crash in "generic" GlobalParams::findSystemFontFile + + Not very important since we usually either use the fontconfig or + the windows one + + fixes oss-fuzz/8427 + + poppler/GlobalParams.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit d1d8dea64db53fb151fede27efd5fd3308820a51 +Author: Albert Astals Cid +Date: Tue May 22 18:13:19 2018 +0200 + + Fix memory leak on malformed files + + fixes oss-fuzz/8430 + + poppler/Gfx.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 127d0fe3a209b04fc9efb086d423bca4ba359dca +Author: Albert Astals Cid +Date: Tue May 22 01:08:12 2018 +0200 + + Fix overflownLongLong check + + We actually want integer math here since doubles lose the precision we + want at that high long long values + + poppler/Lexer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c9e2dc7ea7e098875e6b93566bdb1d14451c3673 +Author: Albert Astals Cid +Date: Sat May 19 17:05:25 2018 +0200 + + Poppler 0.65.0 + + CMakeLists.txt | 4 ++-- + NEWS | 22 ++++++++++++++++++++++ + cpp/CMakeLists.txt | 2 +- + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 28 insertions(+), 6 deletions(-) + +commit 921de21733816fc6cd66c70c7a4914fbfee924d6 +Author: Albert Astals Cid +Date: Fri May 18 00:45:59 2018 +0200 + + qt5: remove duplicate code + + Create new toPopplerAdditionalActionType private function + + qt5/src/poppler-annotation.cc | 15 +-------------- + qt5/src/poppler-form.cc | 17 ++--------------- + qt5/src/poppler-private.cc | 18 ++++++++++++++++++ + qt5/src/poppler-private.h | 2 ++ + 4 files changed, 23 insertions(+), 29 deletions(-) + +commit 083139775fd4ee8dd073347bb0e2835aab334444 +Author: Andre Heinecke +Date: Wed May 2 16:20:40 2018 +0200 + + qt5: Add widget annot actions to FormFields + + This adds API to access AnnotWidget actions which + are associated with a FormField. + + qt5/src/poppler-form.cc | 31 +++++++++++++++++++++++++++++++ + qt5/src/poppler-form.h | 8 ++++++++ + 2 files changed, 39 insertions(+) + +commit 784bf432bffadf654b213caa21ec95fafb963299 +Author: Albert Astals Cid +Date: Tue May 8 01:16:06 2018 +0200 + + Fix build with -DFONT_CONFIGURATION=generic + + poppler/GlobalParams.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 07b8f838b3d8859a3ad34a3140bb24475bd6ac2c +Author: Albert Astals Cid +Date: Mon May 7 19:13:07 2018 +0200 + + cast to void * to bypass new gcc -Wclass-memaccess warning + + Yes what we're doing there is a bit nasty but it works :D + + poppler/Array.cc | 2 +- + poppler/Dict.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 2e750862ed5cba42fba2c6dd953820445d9c64cb +Author: Albert Astals Cid +Date: Mon May 7 19:02:40 2018 +0200 + + Remove useless memset + + Parent already has a proper constructor that initializes stuff and on + top of that the sizeof was of the pointer and not of the class itself + + poppler/StructTreeRoot.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 030c6123c42813818fbb94717d301d4723671545 +Author: Albert Astals Cid +Date: Sun May 6 17:25:39 2018 +0200 + + Fix windows build + + poppler/GlobalParamsWin.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 62ed50c649670423136a49ae0fc39a6d314336a7 +Author: Albert Astals Cid +Date: Sun May 6 17:01:30 2018 +0200 + + Remove GlobalParams::getUnicodeToUnicode + + As shown by Adam in f559cc94310c149a61eb246e1aff7c093f3406b5 it was a + noop since we were not filling the hash it tried to get info from + + poppler/GfxFont.cc | 45 +-------------------------------------------- + poppler/GlobalParams.h | 1 - + 2 files changed, 1 insertion(+), 45 deletions(-) + +commit 18cc4c3006695bbebd1d99d953d555a0bb3a3a65 +Author: Adam Reichold +Date: Wed Feb 21 20:15:22 2018 +0100 + + Make UnicodeMap a move-only type to simplify the initialization of + residentUnicodeMaps s.t. it is closer to the GooHash-based version. + + poppler/GlobalParams.cc | 35 ++++++---------- + poppler/UnicodeMap.cc | 106 + +++++++++++++++++++++++++++++++++++------------- + poppler/UnicodeMap.h | 16 ++++---- + 3 files changed, 97 insertions(+), 60 deletions(-) + +commit 75cba9a1434c991534795d9185d7b755d9ed288c +Author: Adam Reichold +Date: Sun Feb 18 16:12:19 2018 +0100 + + Remove GooHash after replacing it by std::unordered_map. + + CMakeLists.txt | 2 - + goo/GooHash.cc | 403 + --------------------------------------------------------- + goo/GooHash.h | 93 ------------- + 3 files changed, 498 deletions(-) + +commit ccf5fbf898a27b02085b7b0707e5f59bee443fb3 +Author: Adam Reichold +Date: Sun Feb 18 16:23:36 2018 +0100 + + Also replace the Win32-specific usage of GooHash by std::unordered_map + on a best-effort basis. + + poppler/GlobalParams.cc | 6 ------ + poppler/GlobalParams.h | 3 ++- + poppler/GlobalParamsWin.cc | 25 ++++++++++++------------- + 3 files changed, 14 insertions(+), 20 deletions(-) + +commit 85e43288159804c57b3168fa95f955c41040bd29 +Author: Adam Reichold +Date: Sun Feb 18 16:11:55 2018 +0100 + + Replace GooHash by std::unordered_map in PSOutputDev. + + poppler/PSOutputDev.cc | 31 +++++++++++-------------------- + poppler/PSOutputDev.h | 8 +++++--- + 2 files changed, 16 insertions(+), 23 deletions(-) + +commit d5701be9c7daaf097698c0db57e004c4782450ee +Author: Adam Reichold +Date: Sun Feb 18 16:11:29 2018 +0100 + + Replace GooHash by std::unordered_map in OutputDev. + + poppler/Gfx.cc | 20 ++++---------------- + poppler/OutputDev.cc | 15 ++++----------- + poppler/OutputDev.h | 15 +++++++++------ + poppler/PSOutputDev.h | 3 ++- + poppler/ProfileData.cc | 10 +--------- + poppler/ProfileData.h | 25 ++++++++++--------------- + test/pdf-inspector.cc | 17 +++++------------ + 7 files changed, 35 insertions(+), 70 deletions(-) + +commit f559cc94310c149a61eb246e1aff7c093f3406b5 +Author: Adam Reichold +Date: Sun Feb 18 16:10:59 2018 +0100 + + Replace GooHash by std::unordered_map in GlobalParams. + + poppler/CharCodeToUnicode.cc | 9 +- + poppler/CharCodeToUnicode.h | 3 +- + poppler/GlobalParams.cc | 218 + ++++++++++++++----------------------------- + poppler/GlobalParams.h | 34 +++---- + 4 files changed, 97 insertions(+), 167 deletions(-) + +commit 41ad41d6eb726aabd3bff18db5c08422e0d18807 +Author: Adam Reichold +Date: Sun Feb 18 16:10:16 2018 +0100 + + Replace GooHash by std::unordered_map in FoFiTrueType. + + fofi/FoFiTrueType.cc | 39 +++++++++++++++------------------------ + fofi/FoFiTrueType.h | 8 +++++--- + 2 files changed, 20 insertions(+), 27 deletions(-) + +commit 55272138c3835dd9db8733850304ffe966e6478d +Author: Adam Reichold +Date: Tue Feb 20 09:07:17 2018 +0100 + + Add conversion methods between GooString and std::string. + + goo/GooString.h | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 08a4ac65d202742209bca6cf3806c4d111a5522c +Author: Albert Astals Cid +Date: Fri May 4 15:51:18 2018 +0200 + + FindLIBOPENJPEG2.cmake: Remove cache code + + It wasn't working since the if mentioned LIBOPENJPEG2_INCLUDE_DIR + instead of LIBOPENJPEG2_INCLUDE_DIRS + and when fixing the typo it broke the build because we were not + defining USE_OPENJPEG2, so better just + remove the broken if code + + cmake/modules/FindLIBOPENJPEG2.cmake | 22 +++++++--------------- + 1 file changed, 7 insertions(+), 15 deletions(-) + +commit 8f94bc8e6f65420a63411ead3a7e838a9542acbd +Author: Bjarni Ingi Gislason +Date: Fri May 4 15:29:09 2018 +0200 + + pdffonts: Minor formatting changes in the man page + + Bug #105194 + + utils/pdffonts.1 | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +commit 7bd0f774508f543616ebb2ad1f4558fdacfca5b7 +Author: Zsombor Hollay-Horvath +Date: Fri May 4 15:23:21 2018 +0200 + + cpp: Expose more image modes, add option to select mode in renderer + + Bug #105558 + + cpp/poppler-image.cpp | 46 +++++++++++++++- + cpp/poppler-image.h | 5 +- + cpp/poppler-page-renderer.cpp | 124 + +++++++++++++++++++++++++++++++++++++++++- + cpp/poppler-page-renderer.h | 13 +++++ + 4 files changed, 184 insertions(+), 4 deletions(-) + +commit 60b4fe65bc9dc9b82bbadf0be2e3781be796a13d +Author: Albert Astals Cid +Date: Tue May 1 02:46:17 2018 +0200 + + FoFiType1C::cvtGlyph: Fix infinite recursion on malformed documents + + Bugs #104942, #103238 + + fofi/FoFiType1C.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 8429a67536b7c2f6d752e4a522ee98e6f76a40f9 +Author: Albert Astals Cid +Date: Tue May 1 02:44:37 2018 +0200 + + XRef: Fix runtime undefined behaviour + + Going to the position -1 of an array is undefined behaviour, so + don't do + it + + Bug #105970 + + poppler/XRef.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 9d42769705180d6df4ba8415849ef8790a0e9b1d +Author: Albert Astals Cid +Date: Tue May 1 02:43:21 2018 +0200 + + Add the invisible character check to SplashOutputDev::beginType3Char + + Bug #106244 + + poppler/SplashOutputDev.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 15d6519933256ffd1746eb6c7988def34228952e +Author: Albert Astals Cid +Date: Mon Apr 30 15:09:26 2018 +0200 + + cpp: add a newline after the error line + + cpp/poppler-private.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6085b7b35b8ee6b0aab2d1b55064f79cb7e2c2fb +Author: Albert Astals Cid +Date: Fri Mar 23 16:46:09 2018 +0100 + + Make poppler_form_field_get_font_size return 0 + + It was doing that anyway but in a more complex way. + + Added a note into the docu so that people can volunteer to come + and fix it if someone is using it + + glib/poppler-form-field.cc | 5 ++++- + poppler/Annot.cc | 1 - + poppler/Annot.h | 3 --- + poppler/Form.cc | 4 ---- + poppler/Form.h | 2 -- + 5 files changed, 4 insertions(+), 11 deletions(-) + +commit a613cd32bcaabe67649536886637ad022685c402 +Author: Albert Astals Cid +Date: Thu Apr 19 17:10:23 2018 +0200 + + Fix compilation with libc++ + + qt5/src/ArthurOutputDev.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 4d851d16aa6a2a9f00b60091a2ef810be1a571ea +Author: Albert Astals Cid +Date: Tue Apr 17 20:04:26 2018 +0200 + + poppler 0.64.0 + + CMakeLists.txt | 4 ++-- + NEWS | 33 +++++++++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 38 insertions(+), 5 deletions(-) + +commit 1dcf335a8e212fdfd18bad1f56a743504f653cf5 +Author: Albert Astals Cid +Date: Tue Apr 17 16:21:33 2018 +0200 + + qt5: Don't need this friend declaration + + qt5/src/poppler-link.h | 1 - + 1 file changed, 1 deletion(-) + +commit 281d5cbd33521c823f1602f3d0c1e2ad9a4ab1d2 +Author: Albert Astals Cid +Date: Fri Apr 6 15:34:57 2018 +0200 + + Object::getName return const char instead of char + + poppler/Form.cc | 2 +- + poppler/Form.h | 2 +- + poppler/Gfx.cc | 20 ++++++++++---------- + poppler/Gfx.h | 14 +++++++------- + poppler/GfxFont.cc | 4 ++-- + poppler/Link.cc | 6 +++--- + poppler/Link.h | 2 +- + poppler/MarkedContentOutputDev.cc | 2 +- + poppler/MarkedContentOutputDev.h | 2 +- + poppler/Movie.cc | 2 +- + poppler/Object.h | 2 +- + poppler/OutputDev.cc | 6 +++--- + poppler/OutputDev.h | 6 +++--- + poppler/Rendition.cc | 2 +- + poppler/Stream.cc | 2 +- + poppler/Stream.h | 2 +- + 16 files changed, 38 insertions(+), 38 deletions(-) + +commit 8fe1a5b96e5ad7dac60dd0f198b3c8b18fb3c5bb +Author: Andre Heinecke +Date: Tue Apr 17 10:02:40 2018 +0200 + + Fix parsing of focus out actions + + The key is uppercase B with lowercase L. Not I. + + poppler/Annot.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3636ccbaece6706ef86dfab9303c3f164e68ffe2 +Author: Albert Astals Cid +Date: Tue Apr 17 10:57:06 2018 +0200 + + pdfsig: Don't use fixed buffer size for path + + utils/pdfsig.cc | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +commit 17c7e3b0e1801a8643712013eb3b106c802e0faa +Author: Albert Astals Cid +Date: Tue Apr 17 11:02:29 2018 +0200 + + utils: Move numberOfCharacters to shared file + + utils/numberofcharacters.h | 26 ++++++++++++++++++++++++++ + utils/pdftocairo.cc | 13 +------------ + utils/pdftoppm.cc | 13 +------------ + 3 files changed, 28 insertions(+), 24 deletions(-) + +commit 73ab9930810ae83998467ec859f3ee3984548cbd +Author: Albert Astals Cid +Date: Tue Apr 17 10:46:46 2018 +0200 + + pdfsig: Add -dump to manpage + + utils/pdfsig.1 | 3 +++ + 1 file changed, 3 insertions(+) + +commit bdece3bb0c115576d23e76dc29ee43f04aafdee0 +Author: Chinmoy Ranjan Pradhan +Date: Tue Apr 17 10:45:15 2018 +0200 + + pdfsig: Add -dump which writes signatures to disk + + Bug #104881 + + poppler/Form.cc | 8 +++++++- + poppler/Form.h | 7 +++++-- + utils/pdfsig.cc | 33 +++++++++++++++++++++++++++++++-- + 3 files changed, 43 insertions(+), 5 deletions(-) + +commit 97aa11bf135421c1f87f2a46e2f597626f503f10 +Author: Oliver Sander +Date: Fri Mar 23 22:04:11 2018 +0100 + + Document method drawImageMask + + poppler/OutputDev.h | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit ae4349620863a42ae569f1ce05461bb27340c4ea +Author: Albert Astals Cid +Date: Mon Apr 16 22:49:54 2018 +0200 + + Make the second parseAction variant private + + poppler/Link.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 444d9d8de5d4f8d627084405e1583b6d6d3900c7 +Author: Albert Astals Cid +Date: Mon Apr 16 22:28:18 2018 +0200 + + Simplify LinkAction::parseAction a bit + + After the discussion on the mailing list, also using unique_ptr was + wrong + + poppler/Link.cc | 22 +++++++++++----------- + poppler/Link.h | 5 +++-- + 2 files changed, 14 insertions(+), 13 deletions(-) + +commit 88c99f1f6f4faf31faabccd35d9d094958020ebc +Author: Albert Astals Cid +Date: Mon Apr 16 17:59:35 2018 +0200 + + Fix crash on malformed documents + + In GfxGouraudTriangleShading::parse + + Bug #106061 + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit df8a4ee51e18a39f85568c4122e5edd8c03d61df +Author: Albert Astals Cid +Date: Mon Apr 16 17:46:10 2018 +0200 + + Make it so we copy seenNextActions a bit less + + poppler/Link.cc | 20 +++++++++++--------- + poppler/Link.h | 3 ++- + 2 files changed, 13 insertions(+), 10 deletions(-) + +commit bd9fb431941916174e1c3b2201bf5f422bcf61bd +Author: Aleix Pol +Date: Mon Apr 16 16:38:09 2018 +0200 + + Make it possible to build poppler on Android without fontconfig + + Didn't manage to make fontconfig build, still nice to have poppler + available. + + CMakeLists.txt | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 34a44e5b95230b1ed03bb030e9963d0187b01951 +Author: Aleix Pol +Date: Mon Apr 16 16:35:47 2018 +0200 + + Do not assume that iconv is in /usr/include + + We find it explicitly because it may be elsewhere. + + cpp/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit bdd8db389c7b09cd9042267f36214f809e4c5f60 +Author: Andre Heinecke +Date: Mon Apr 16 17:13:05 2018 +0200 + + Add support for Next actions following an action + + Next actions are action dictionaries or an array + of action dictonaries. "Next" is an entry in the + general action dictionary. + + These actions are supposed to be performed after each other. + So that a single button press can for example + both trigger a Hide action and a JavaScript action. + + poppler/Link.cc | 72 + +++++++++++++++++++++++++++++++++++++++++- + poppler/Link.h | 18 +++++++++-- + qt5/src/poppler-link-private.h | 9 ++++++ + qt5/src/poppler-link.cc | 7 +++- + qt5/src/poppler-link.h | 11 ++++++- + qt5/src/poppler-page.cc | 14 ++++++++ + 6 files changed, 125 insertions(+), 6 deletions(-) + +commit ab72205dd14efe9c5c8d12e6b1ae538208bce168 +Author: Andre Heinecke +Date: Mon Apr 16 16:31:38 2018 +0200 + + Add support for hide action + + The hide action can be used to show / hide fields. + + poppler/Link.cc | 29 +++++++++++++++++++++++++++++ + poppler/Link.h | 35 +++++++++++++++++++++++++++++++++++ + qt5/src/poppler-annotation.cc | 6 ++++++ + qt5/src/poppler-link-private.h | 17 +++++++++++++++++ + qt5/src/poppler-link.cc | 28 ++++++++++++++++++++++++++++ + qt5/src/poppler-link.h | 39 + ++++++++++++++++++++++++++++++++++++++- + qt5/src/poppler-page.cc | 11 +++++++++++ + 7 files changed, 164 insertions(+), 1 deletion(-) + +commit 022ccd4e1c61f4e89c7ffad83d9a5a896f65dc40 +Author: Albert Astals Cid +Date: Mon Apr 16 16:22:55 2018 +0200 + + GfxGouraudTriangleShading::parse: Fix memory leak on malformed files + + Bug #106059 + + poppler/GfxState.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 776257d0c20d4e3ae8d66683ab0f087bf6fc7b0f +Author: Albert Astals Cid +Date: Wed Apr 11 00:44:41 2018 +0200 + + Fix leaks in GfxPatchMeshShading::parse with malformed documents + + Bug #105969 + + poppler/GfxState.cc | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit d80e7aac3366f93865581a783751abb528c120b3 +Author: Albert Astals Cid +Date: Wed Apr 11 00:32:35 2018 +0200 + + Make GfxGouraudTriangleShading::parse more accepting of malformed + documents + + Bug #105972 + + poppler/GfxState.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit fee13e935e4c9eaadff434436eaceeb13afcfc13 +Author: Oliver Sander +Date: Fri Mar 23 22:24:42 2018 +0100 + + Implement Type3 font support for ArthurOutputDev + + qt5/src/ArthurOutputDev.cc | 177 + ++++++++++++++++++++++++++++++++++++++++----- + qt5/src/ArthurOutputDev.h | 16 ++-- + qt5/src/poppler-page.cc | 4 +- + 3 files changed, 170 insertions(+), 27 deletions(-) + +commit 79c588912f41aa6ee81ea058e7e649199a252f90 +Author: Oliver Sander +Date: Sun Mar 25 21:38:27 2018 +0200 + + Do not make ArthurOutputDev::startPage fill the page with white + + qt5/src/ArthurOutputDev.cc | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +commit 8c8c0034ae88c06616ace5e5ead71318f04311cf +Author: Oliver Sander +Date: Sat Apr 7 23:45:50 2018 +0200 + + Implement ArthurOutputDev::drawImageMask + + Bug #105531 + + Also temporarily disable type3 fonts since it seems they're not + properly + supported + + qt5/src/ArthurOutputDev.cc | 91 + +++++++++++++++------------------------------- + qt5/src/ArthurOutputDev.h | 2 +- + 2 files changed, 30 insertions(+), 63 deletions(-) + +commit 3e0408966ccdd713de7795ce7992888b3896b49c +Author: Andre Heinecke +Date: Thu Mar 22 14:53:19 2018 +0100 + + Qt5: Allow setting of visibility + + Extends Qt5 API to allow setting visibility flags + + qt5/src/poppler-form.cc | 11 +++++++++++ + qt5/src/poppler-form.h | 6 ++++++ + 2 files changed, 17 insertions(+) + +commit b4127fb1c45fe5dcabe3751f0b40029405224f49 +Author: Albert Astals Cid +Date: Fri Apr 6 23:08:15 2018 +0200 + + Add some more const + + const is always good :) + + cpp/poppler-embedded-file.cpp | 13 ++-- + cpp/poppler-private.cpp | 4 +- + cpp/poppler-private.h | 3 +- + cpp/poppler-toc-private.h | 4 +- + cpp/poppler-toc.cpp | 9 +-- + glib/poppler-action.cc | 50 +++++++-------- + glib/poppler-document.cc | 8 +-- + glib/poppler-layer.cc | 2 +- + glib/poppler-media.cc | 4 +- + glib/poppler-movie.cc | 2 +- + glib/poppler-private.h | 6 +- + goo/GooList.cc | 16 ++++- + goo/GooList.h | 8 +-- + poppler/FileSpec.cc | 10 +-- + poppler/FileSpec.h | 26 ++++---- + poppler/Function.h | 2 +- + poppler/Link.cc | 26 ++++---- + poppler/Link.h | 138 + ++++++++++++++++++++-------------------- + poppler/Movie.cc | 12 ++-- + poppler/Movie.h | 26 ++++---- + poppler/OptionalContent.cc | 8 +-- + poppler/OptionalContent.h | 14 ++-- + poppler/Outline.cc | 10 +-- + poppler/Outline.h | 20 +++--- + poppler/Rendition.cc | 4 +- + poppler/Rendition.h | 18 +++--- + poppler/Sound.cc | 6 +- + poppler/Sound.h | 18 +++--- + qt5/src/poppler-document.cc | 4 +- + qt5/src/poppler-embeddedfile.cc | 10 +-- + qt5/src/poppler-link.cc | 4 +- + qt5/src/poppler-media.cc | 2 +- + qt5/src/poppler-movie.cc | 4 +- + qt5/src/poppler-optcontent.cc | 4 +- + qt5/src/poppler-private.cc | 24 +++---- + qt5/src/poppler-private.h | 8 +-- + qt5/src/poppler-sound.cc | 2 +- + utils/HtmlFonts.cc | 4 +- + utils/HtmlFonts.h | 2 +- + utils/HtmlOutputDev.cc | 12 ++-- + utils/HtmlOutputDev.h | 4 +- + utils/pdfdetach.cc | 2 +- + 42 files changed, 285 insertions(+), 268 deletions(-) + +commit a8e93f46df9feb7f7241826307af51befdb25d9e +Author: Albert Astals Cid +Date: Fri Apr 6 09:02:28 2018 +0200 + + Make Object return const GooString pointer + + This helps making sure noone is changing strings that belong to + objects without us realizing. + + In fact noone was doing except an ifdef for windows, fixed it to + not modify the dict contents anymore + + glib/poppler-action.cc | 2 +- + poppler/Annot.cc | 6 +++--- + poppler/FileSpec.cc | 4 +++- + poppler/Form.cc | 6 +++--- + poppler/GfxFont.cc | 4 ++-- + poppler/GfxState.cc | 3 ++- + poppler/Link.cc | 3 ++- + poppler/Object.h | 3 ++- + poppler/Outline.cc | 3 ++- + poppler/PDFDoc.cc | 3 ++- + poppler/Parser.cc | 4 +++- + poppler/Stream.cc | 2 +- + poppler/StructElement.cc | 3 ++- + qt5/src/poppler-document.cc | 6 +++--- + qt5/src/poppler-embeddedfile.cc | 5 +++-- + qt5/src/poppler-optcontent.cc | 3 ++- + qt5/src/poppler-qt5.h | 2 +- + qt5/tests/check_dateConversion.cpp | 4 ++-- + test/pdf-fullrewrite.cc | 4 ++-- + utils/pdfinfo.cc | 7 ++++--- + utils/pdftohtml.cc | 5 +++-- + utils/pdftotext.cc | 5 +++-- + utils/pdfunite.cc | 5 +++-- + 23 files changed, 54 insertions(+), 38 deletions(-) + +commit 07180b86786cce95df4e2433a7cf3e006749a0f5 +Author: Albert Astals Cid +Date: Fri Apr 6 13:03:16 2018 +0200 + + Gfx: Make two functions take const GooString * + + poppler/Gfx.cc | 8 ++++---- + poppler/Gfx.h | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit c4af5981ab2a5f42a9a1194bb5929c2151fc2674 +Author: Albert Astals Cid +Date: Fri Apr 6 13:00:12 2018 +0200 + + OutputDev: change functions taking GooString * to make it const + + People that use poppler core, beware of the signature change! + + poppler/CairoOutputDev.cc | 5 +++-- + poppler/CairoOutputDev.h | 5 +++-- + poppler/OutputDev.h | 7 ++++--- + poppler/PSOutputDev.cc | 4 ++-- + poppler/PSOutputDev.h | 2 +- + poppler/TextOutputDev.cc | 7 ++++--- + poppler/TextOutputDev.h | 7 ++++--- + utils/HtmlOutputDev.cc | 5 +++-- + utils/HtmlOutputDev.h | 5 +++-- + 9 files changed, 27 insertions(+), 20 deletions(-) + +commit 5fc6d9fcb41966b85dc67117531c81ec89f42f20 +Author: Albert Astals Cid +Date: Fri Apr 6 12:50:18 2018 +0200 + + PageAttrs and Page getLastModified return const GooString * + + poppler/Page.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit a801b46e1e792b5d0a34f97de870c485e0ef312a +Author: Albert Astals Cid +Date: Fri Apr 6 12:48:18 2018 +0200 + + PSOuputDev writePSString and writePSTextLine take const + + poppler/PSOutputDev.cc | 4 ++-- + poppler/PSOutputDev.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit eb6de58de5ef8c2ddeeed386e0b8b498b945797f +Author: Albert Astals Cid +Date: Fri Apr 6 12:47:12 2018 +0200 + + PDFDoc::writeString take const GooString pointer + + poppler/PDFDoc.cc | 2 +- + poppler/PDFDoc.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 853b2251d4e11f14cd891bf1b6095ee36683d161 +Author: Albert Astals Cid +Date: Fri Apr 6 12:46:06 2018 +0200 + + OCDisplayNode take const GooString pointer + + poppler/OptionalContent.cc | 4 ++-- + poppler/OptionalContent.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 0a8311929ba599d7b0a35e83b1f5dec4a3c9da06 +Author: Albert Astals Cid +Date: Fri Apr 6 12:44:43 2018 +0200 + + GfxFont::getNextChar take const char pointer + + poppler/GfxFont.cc | 4 ++-- + poppler/GfxFont.h | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 0e35441513bdce2471113b937bccb8928c7c9d9f +Author: Albert Astals Cid +Date: Fri Apr 6 12:42:29 2018 +0200 + + FormFieldText::tokenizeDA take const GooString + + poppler/Form.cc | 2 +- + poppler/Form.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ba91b95f6e504cce08825e83a567a554ac846e39 +Author: Albert Astals Cid +Date: Fri Apr 6 12:41:44 2018 +0200 + + dateStringToTime take const GooString + + poppler/DateInfo.cc | 4 ++-- + poppler/DateInfo.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 9bfe4b43216bce4e702d7d8f61fc7cb9acdbb8f6 +Author: Albert Astals Cid +Date: Fri Apr 6 12:40:53 2018 +0200 + + CMap::getCID take const char + + poppler/CMap.cc | 4 ++-- + poppler/CMap.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 690ea9e5c900268556431df71bdac38f5e74dc36 +Author: Albert Astals Cid +Date: Fri Apr 6 12:39:35 2018 +0200 + + GooString::insert make pointer const + + goo/GooString.cc | 2 +- + goo/GooString.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit f3551055dab57eb0bc544070b15c6a7435585003 +Author: Albert Astals Cid +Date: Fri Apr 6 12:19:54 2018 +0200 + + Introduce AutoFreeMemStream + + This is done by turning the old MemStream implementation to a new + template implementation in BaseMemStream + and inheriting from it MemStream for const char * and + AutoFreeMemStream for char *. + + This way we make clear one frees the data and the other does not, + while also removing the ugly setNeedsFree in MemStream + + poppler/Annot.cc | 16 ++++++--------- + poppler/SplashOutputDev.cc | 3 +-- + poppler/Stream.h | 51 + +++++++++++++++++++++++++++------------------- + 3 files changed, 37 insertions(+), 33 deletions(-) + +commit 4cc89c79f58cb416aae8396190a788e1398113ff +Author: Albert Astals Cid +Date: Fri Apr 6 12:11:55 2018 +0200 + + Move MemStream implementation to header + + Will be useful in next step where we turn it into a template + + poppler/Stream.cc | 83 -------------------------------------------------- + poppler/Stream.h | 91 + +++++++++++++++++++++++++++++++++++++++++++++++++------ + 2 files changed, 81 insertions(+), 93 deletions(-) + +commit 8821c04f36cb737776cd9077a46f1a9f86ca54e7 +Author: Albert Astals Cid +Date: Wed Apr 4 10:20:52 2018 +0200 + + Workaround form field text not being drawn on broken files + + Try drawing with the form appearance instead of the field apparance + if drawing with the field appearance fails + + Bug #103245 + + poppler/Annot.cc | 88 + +++++++++++++++++++++++++++++++++++--------------------- + poppler/Annot.h | 24 +++++++++------- + 2 files changed, 68 insertions(+), 44 deletions(-) + +commit afb053d652cc1f670465d471f671652b112dbf51 +Author: Albert Astals Cid +Date: Thu Apr 5 11:48:11 2018 +0200 + + Annot: Move appearBuf construction to a new class + + Previously we had appearBuf construction functions in Annot itself + which was a bit + confusing. Some functions like writeString took appearBuf as + parameter, some + other did not. By moving it out to a new class and making all the + input parameters const + pointers we make it clear the construction of appearBuf doesn't have + any other side + effect on Annot itself or any other class + + I'm leaving the functions in their old place to minimize the diff + so it's easier to read. + I'll move them in a follow up commit + + poppler/Annot.cc | 528 + ++++++++++++++++++++++++++++--------------------------- + poppler/Annot.h | 73 +++++--- + 2 files changed, 321 insertions(+), 280 deletions(-) + +commit 0a79dc3036111e86a11bd290057da6674da3b311 +Author: Albert Astals Cid +Date: Thu Apr 5 18:15:33 2018 +0200 + + Add some more const + + glib/poppler-action.cc | 14 +++++------ + glib/poppler-annot.cc | 18 +++++++-------- + glib/poppler-document.cc | 2 +- + glib/poppler-form-field.cc | 4 ++-- + glib/poppler-private.h | 2 +- + poppler/Annot.cc | 16 ++++++------- + poppler/Annot.h | 54 + +++++++++++++++++++++---------------------- + poppler/Catalog.cc | 5 ++-- + poppler/Catalog.h | 5 ++-- + poppler/Form.cc | 6 ++--- + poppler/Form.h | 6 ++--- + poppler/Link.h | 23 +++++++++--------- + poppler/PDFDoc.h | 3 ++- + poppler/UTF.cc | 3 ++- + poppler/UTF.h | 3 ++- + qt5/src/poppler-annotation.cc | 5 ++-- + qt5/src/poppler-document.cc | 9 +++++++- + qt5/src/poppler-form.cc | 4 ++-- + qt5/src/poppler-page.cc | 2 +- + qt5/src/poppler-private.cc | 4 ++-- + qt5/src/poppler-private.h | 4 ++-- + qt5/src/poppler-qt5.h | 7 ++++++ + utils/JSInfo.cc | 7 +++--- + utils/JSInfo.h | 3 ++- + 24 files changed, 116 insertions(+), 93 deletions(-) + +commit b60de1700d95d022ec0d1676886b0442cb763473 +Author: Albert Astals Cid +Date: Thu Apr 5 16:03:54 2018 +0200 + + Introduce a const version of GfxResources::lookupFont + + poppler/Gfx.cc | 13 +++++++++++-- + poppler/Gfx.h | 5 ++++- + poppler/GfxFont.cc | 2 +- + poppler/GfxFont.h | 2 +- + 4 files changed, 17 insertions(+), 5 deletions(-) + +commit 6bb508acd9a79671e5e9defc7b92a943fb880cda +Author: Albert Astals Cid +Date: Thu Apr 5 14:19:51 2018 +0200 + + More const in GfxFont methods + + poppler/GfxFont.h | 10 +++++----- + poppler/PSOutputDev.cc | 2 +- + poppler/PSOutputDev.h | 2 +- + poppler/SplashOutputDev.cc | 11 ++++++----- + qt5/src/ArthurOutputDev.cc | 3 ++- + 5 files changed, 15 insertions(+), 13 deletions(-) + +commit 390109044bdef1ba67c2339bffaf11b38261854d +Author: Albert Astals Cid +Date: Thu Apr 5 13:00:59 2018 +0200 + + Fix windows build + + poppler/GlobalParamsWin.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f75c0f5c3f9d63334cc21e0ab68f1af45d0037cc +Author: Albert Astals Cid +Date: Thu Apr 5 12:58:34 2018 +0200 + + Make GfxFont::getName const + + glib/poppler-structure-element.cc | 2 +- + poppler/FontInfo.cc | 3 ++- + poppler/GfxFont.h | 2 +- + poppler/GlobalParams.cc | 6 +++--- + poppler/PSOutputDev.cc | 6 ++++-- + poppler/PSOutputDev.h | 3 ++- + utils/HtmlFonts.cc | 3 ++- + 7 files changed, 15 insertions(+), 10 deletions(-) + +commit a669ad5cfb28cdfcfe38bbce39fbf8c6fc3102d9 +Author: Albert Astals Cid +Date: Thu Apr 5 12:55:39 2018 +0200 + + buildFcPattern: Don't modify the actual name of the font + + When doing the '-' to ' ' replacement to build the fc pattern + + poppler/GlobalParams.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 4f9b3d8d8d17863873a8a399ff3fe212d247b236 +Author: Albert Astals Cid +Date: Thu Apr 5 12:37:40 2018 +0200 + + Make some GfxFont methods const + + poppler/GfxFont.cc | 8 ++++---- + poppler/GfxFont.h | 16 ++++++++-------- + 2 files changed, 12 insertions(+), 12 deletions(-) + +commit 2bf6f2275c49f94e84f935653d6c42f6b5f9b364 +Author: Albert Astals Cid +Date: Thu Apr 5 12:21:38 2018 +0200 + + Make some Form methods const + + glib/poppler-form-field.cc | 6 +++--- + poppler/Annot.cc | 4 ++-- + poppler/Form.cc | 18 +++++++++--------- + poppler/Form.h | 32 ++++++++++++++++---------------- + qt5/src/poppler-form.cc | 3 ++- + 5 files changed, 32 insertions(+), 31 deletions(-) + +commit 6f2bc64e09b7f5e5be6962840ede40369b78fd5e +Author: Albert Astals Cid +Date: Thu Apr 5 12:25:17 2018 +0200 + + Make AnnotWidget::drawText and Annot::layoutText input GooString const + + poppler/Annot.cc | 9 +++++---- + poppler/Annot.h | 5 +++-- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 5e7931c4c9fdaba8b3343d04eda6e9eb2a2e3dcd +Author: Albert Astals Cid +Date: Thu Apr 5 12:23:21 2018 +0200 + + Make _poppler_goo_string_to_utf8 input param const + + glib/poppler-document.cc | 2 +- + glib/poppler-private.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 3fdb7ea7b6a1ed4add2fbc6dca7a38b27fc79f45 +Author: Albert Astals Cid +Date: Thu Apr 5 12:21:11 2018 +0200 + + Make UnicodeParsedString input const + + qt5/src/poppler-private.cc | 5 +++-- + qt5/src/poppler-private.h | 3 ++- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 4b96c8399102a36e542c9da3b34650c26ccdda3c +Author: Albert Astals Cid +Date: Thu Apr 5 12:19:07 2018 +0200 + + Make pdfDocEncodingToUTF16 input param const + + poppler/Form.cc | 5 +++-- + poppler/Form.h | 1 + + poppler/PDFDocEncoding.h | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +commit 5804259f22d4d42ed7c37c9efb613910248cd1d4 +Author: Albert Astals Cid +Date: Thu Apr 5 11:58:50 2018 +0200 + + GfxFont::getToUnicode -> const + + And we don't need to do the inc/dec ref dance in Annot + since the GfxFont is still alive while we use it and there's + no other users to getToUnicode that may keep the CharCodeToUnicode + for longer time than the GfxFont live + + poppler/Annot.cc | 5 ++--- + poppler/GfxFont.cc | 12 ++++-------- + poppler/GfxFont.h | 7 ++++--- + 3 files changed, 10 insertions(+), 14 deletions(-) + +commit 1eb06156855758e4b1da2adc0334d84d3f857fb1 +Author: Albert Astals Cid +Date: Thu Apr 5 11:56:57 2018 +0200 + + CharCodeToUnicode::mapToCharCode -> const + + poppler/CharCodeToUnicode.cc | 3 ++- + poppler/CharCodeToUnicode.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 2a49511517678b7e05660bb9a35a614c83229b66 +Author: Albert Astals Cid +Date: Thu Apr 5 11:50:23 2018 +0200 + + Add some const to GooHash and GooString + + goo/GooHash.cc | 7 ++++--- + goo/GooHash.h | 7 ++++--- + goo/GooString.cc | 7 ++++--- + goo/GooString.h | 7 ++++--- + 4 files changed, 16 insertions(+), 12 deletions(-) + +commit e491e935ea355d48519cf0a14e4b060655850675 +Author: Evangelos Foutras +Date: Mon Apr 2 16:09:34 2018 +0300 + + Fix PDFDoc::checkHeader() for PDFs smaller than 1 KiB + + The fix for bug 104502 made it so PDFDoc::checkHeader() would print a + warning and return immediatelly if it encounters an EOF while reading + the first 1024 bytes. + + Some PDF files can be smaller than 1024 bytes, for example those used + by pdf2djvu's test suite. The latter would fail due to the unexpected + warnings. + + Change the behavior of PDFDoc::checkHeader() when encountering an EOF + so it processes the data it has read so far instead of aborting early. + + https://bugs.freedesktop.org/show_bug.cgi?id=105674 + + poppler/PDFDoc.cc | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) + +commit c19469f2a80ebc09bef3fbd603034e43c4a707cd +Author: Mojca Miklavec +Date: Mon Apr 2 12:52:35 2018 +0200 + + Fix build on some platforms + + We need to include time.h in gfile.h + + Bug #105766 + + goo/gfile.cc | 6 ++---- + goo/gfile.h | 2 ++ + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit c7a317635cfc6934e975e846335e37a68d6b3876 +Author: Albert Astals Cid +Date: Mon Mar 26 16:10:05 2018 +0200 + + glib: less deprecated calls + + And increate gdk pixbuf requirement to the version i think we + actually require + + cmake/modules/FindGTK.cmake | 2 +- + glib/demo/annots.c | 2 +- + glib/demo/selections.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 7a708ffd374cd18e9e4bfe8a8e95c02184a074ba +Author: Oliver Sander +Date: Wed Mar 28 00:00:35 2018 +0200 + + Implement ArthurOutputDev::axialShadedFill + + qt5/src/ArthurOutputDev.cc | 128 + ++++++++++++++++++++++++++++++++++++++++++++- + qt5/src/ArthurOutputDev.h | 9 +++- + 2 files changed, 135 insertions(+), 2 deletions(-) + +commit 5e7aef9df36a07c82b0ab40f80fd8464840f6424 +Author: Albert Astals Cid +Date: Fri Mar 23 15:34:56 2018 +0100 + + PSOutputDev: move i declaration to the for + + poppler/PSOutputDev.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 79789ed3d2798fb34f1c82d950e03a4d41e197de +Author: Albert Astals Cid +Date: Fri Mar 23 19:58:16 2018 +0100 + + Annot: setColor -> setDrawColor + + to differentiate from the setColor that actually changes the annot + color + + poppler/Annot.cc | 60 + ++++++++++++++++++++++++++++---------------------------- + poppler/Annot.h | 2 +- + 2 files changed, 31 insertions(+), 31 deletions(-) + +commit e34e187934e3654989b6af5177f345032623dd9b +Author: Albert Astals Cid +Date: Fri Mar 23 19:57:39 2018 +0100 + + SplashOutputDev: make getMatteColor static + + poppler/SplashOutputDev.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c14dfa44a70ce32bbe1268ddff6106cab3f33bc2 +Author: Albert Astals Cid +Date: Fri Mar 23 19:56:12 2018 +0100 + + HtmlOutputDev: don't pass catalog around to not use it + + utils/HtmlOutputDev.cc | 13 ++++++------- + utils/HtmlOutputDev.h | 4 ++-- + 2 files changed, 8 insertions(+), 9 deletions(-) + +commit 92c51751a87b31c4bafa7b0146f745b3008ec9fc +Author: Albert Astals Cid +Date: Fri Mar 23 19:55:42 2018 +0100 + + JPEG2000Stream.cc: no need to store indexed + + we only use it in one function + + poppler/JPEG2000Stream.cc | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +commit 46543272dbe7655821e1c794ca3cc22e8cb4cef9 +Author: Albert Astals Cid +Date: Tue Mar 20 23:44:23 2018 +0100 + + gfile: Fix windows build + + goo/gfile.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 327c342a932d8df731ec02a6b22792004206c2db +Author: Andre Heinecke +Date: Tue Mar 20 23:07:15 2018 +0100 + + Add read only setter for form fields + + Read only is modifiable from AcroForm scripts. + + poppler/Form.cc | 32 ++++++++++++++++++++++++++++++++ + poppler/Form.h | 4 +++- + qt5/src/poppler-form.cc | 6 ++++++ + qt5/src/poppler-form.h | 7 +++++++ + 4 files changed, 48 insertions(+), 1 deletion(-) + +commit 4798ef5298bcfcfadf8e1d66f9200e3c9eee2248 +Author: Carlos Garcia Campos +Date: Mon Mar 19 11:16:03 2018 +0100 + + build: bring back the option to disable GObject introspection + + It was available with autotools, but we lost it when switching + to cmake. + + CMakeLists.txt | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit f26285f361478219ea9d3c6de1529ecd5ff96ac9 +Author: Albert Astals Cid +Date: Sun Mar 18 19:23:49 2018 +0100 + + 0.63 + + CMakeLists.txt | 4 ++-- + NEWS | 60 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + cpp/CMakeLists.txt | 2 +- + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 66 insertions(+), 6 deletions(-) + +commit 8b2079b7250e037599f6640539f8107d93314919 +Author: Albert Astals Cid +Date: Sun Mar 18 19:01:40 2018 +0100 + + Update copyrights + + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 2 +- + poppler/GfxFont.cc | 2 +- + poppler/GfxFont.h | 2 +- + poppler/Object.h | 2 +- + poppler/StructElement.cc | 1 + + poppler/StructTreeRoot.cc | 2 +- + poppler/StructTreeRoot.h | 1 + + poppler/TextOutputDev.cc | 2 +- + utils/pdfinfo.cc | 2 +- + 10 files changed, 10 insertions(+), 8 deletions(-) + +commit 41321580f0a13309e5de44eb42851e3c82a5ef8f +Author: Adam Reichold +Date: Sun Mar 4 09:17:00 2018 +0100 + + Use the detection idiom to handle the non-standard struct stat field + name for high-resolution mtime on Mac OS X. + + goo/gfile.cc | 40 +++++++++++++++++++++++++++++++++++++--- + 1 file changed, 37 insertions(+), 3 deletions(-) + +commit b14baefb406b8f08f0702edd686ebc7698cb7f15 +Author: Adam Reichold +Date: Mon Feb 12 08:09:00 2018 +0100 + + Explicitly anchor destructor of text_box_data to avoid linker errors + using Clang on Mac OS X. + + cpp/poppler-page.cpp | 3 +++ + cpp/poppler-private.h | 3 +++ + 2 files changed, 6 insertions(+) + +commit 4afe2fb10ab969bfd9895c0ba9d4990c5881b451 +Author: Carlos Garcia Campos +Date: Sun Mar 4 10:28:57 2018 +0100 + + cairo: use GOOD instead of BEST as the default cairo filter for + scaling + + The quality is good enough and the performance is much better. + + https://bugs.freedesktop.org/show_bug.cgi?id=103136 + + poppler/CairoOutputDev.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 41c61811fdd6efe2bef34d2ce26520fc6b3c4237 +Author: Jason Crain +Date: Fri Feb 23 23:21:03 2018 -0600 + + TextPage: Add horizontal scaling to font matrix + + Drawing the text selection sometimes draws text reversed or expanded. + This is because the while the current font transformation matrix is + saved, the horizontal scaling is not. Include the effect of the + horizontal scaling in the transformation matrix. + + https://bugs.freedesktop.org/show_bug.cgi?id=105259 + + poppler/TextOutputDev.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2740b3aca81a6a8c690540fc141e5923a1fff460 +Author: Albert Astals Cid +Date: Tue Feb 27 00:47:04 2018 +0100 + + cpp: Add since + + cpp/poppler-page.h | 3 +++ + 1 file changed, 3 insertions(+) + +commit 42a6b8651f040f0960802e705b1aea82a956a63b +Author: suzuki toshiya +Date: Tue Feb 27 00:46:18 2018 +0100 + + cpp: Add page::text_list + + cpp/poppler-page.cpp | 91 + ++++++++++++++++++++++++++++++++++++++++++++++ + cpp/poppler-page.h | 55 ++++++++++++++++++++++++++++ + cpp/poppler-private.h | 9 +++++ + cpp/tests/poppler-dump.cpp | 34 +++++++++++++++++ + 4 files changed, 189 insertions(+) + +commit e25d4af6ed9b254db3096a2e483798734296376d +Author: Adam Reichold +Date: Sun Feb 18 09:43:58 2018 +0100 + + Fix warnings due to unhandled link types in XML serialization of + annotations code in the Qt5 frontend. + + qt5/src/poppler-annotation.cc | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +commit e015ab97c1ee3a4ea386ccc86385aad458827d96 +Author: Adam Reichold +Date: Sun Feb 18 09:42:58 2018 +0100 + + Fix warnings due to the use of deprecated overloads of + Poppler::Page::Search in tests of Qt5 frontend. + + qt5/tests/check_search.cpp | 38 + +++++++++++++++++++------------------- + qt5/tests/stress-threads-qt5.cpp | 10 +++++----- + 2 files changed, 24 insertions(+), 24 deletions(-) + +commit 732903ecf1bdb085cac36eb29d330a7970670064 +Author: Adam Reichold +Date: Sun Feb 18 09:42:04 2018 +0100 + + Fix buffer size warning due to missing space for null terminator + in pdfseparate. + + utils/pdfseparate.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 791e024656212c65d798cb69a134cdd3e30cc79e +Author: Albert Astals Cid +Date: Sun Feb 18 23:05:59 2018 +0100 + + Make it work with newer gtk-doc + + Hopefully still works with older versions + + Bug #105075 + + gtkdoc.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 948d392d9acc3d82b86a260c952095a603fe767f +Author: William Bader +Date: Sun Feb 18 22:06:02 2018 +0100 + + Add python3 support to gtkdoc.py + + gtkdoc.py | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +commit 73130ae1125c86ebd0ee504d0681d9911ff2cfbd +Author: Albert Astals Cid +Date: Wed Feb 14 17:40:23 2018 +0100 + + SplashGouraudPattern: Remove mode member variable + + We don't need it anymore, was introduced in the initial overprint + implementation and was forgotten to be removed when merging xpdf 3.03 + + poppler/SplashOutputDev.cc | 9 ++------- + poppler/SplashOutputDev.h | 5 ++--- + 2 files changed, 4 insertions(+), 10 deletions(-) + +commit 37efb98d77c14c27a22806ec676c13f0a8b99490 +Author: Albert Astals Cid +Date: Wed Feb 14 17:43:41 2018 +0100 + + SplashOutputDev:: Remove unused maskBitmap member + + poppler/SplashOutputDev.h | 1 - + 1 file changed, 1 deletion(-) + +commit e3cece1bfc00083637f709f7647b4711b5c6a084 +Author: Albert Astals Cid +Date: Fri Feb 2 23:17:11 2018 +0100 + + Fix some -Wshadow warnings + + More to come, -Wshadow is interesting but if we enable it we still + get too many warnings for it to be useful + + cpp/tests/poppler-dump.cpp | 6 ++-- + poppler/CachedFile.cc | 8 +++--- + poppler/CairoFontEngine.cc | 64 + +++++++++++++++++++++--------------------- + poppler/CairoOutputDev.cc | 5 ++-- + poppler/CairoOutputDev.h | 4 +-- + poppler/Decrypt.cc | 6 ++-- + poppler/FontInfo.cc | 5 ++-- + poppler/Gfx.cc | 2 +- + poppler/GfxFont.cc | 12 ++++---- + poppler/GfxState.cc | 31 +++++++++----------- + poppler/JBIG2Stream.cc | 11 ++++---- + poppler/PDFDoc.cc | 4 +-- + poppler/StructElement.cc | 6 ++-- + poppler/StructTreeRoot.cc | 8 +++--- + poppler/TextOutputDev.h | 4 +-- + poppler/XRef.cc | 4 +-- + qt5/src/ArthurOutputDev.cc | 4 +-- + qt5/src/poppler-annotation.cc | 18 ++++++------ + qt5/src/poppler-media.cc | 4 +-- + qt5/src/poppler-page.cc | 24 ++++++++-------- + qt5/tests/test-poppler-qt5.cpp | 10 ++++--- + splash/SplashFTFontFile.cc | 5 ++-- + utils/ImageOutputDev.cc | 8 +++--- + utils/pdfinfo.cc | 7 ++--- + utils/pdftocairo.cc | 22 +++++++-------- + utils/pdftoppm.cc | 20 ++++++------- + 26 files changed, 149 insertions(+), 153 deletions(-) + +commit 8cfe91ae51fa50e66217c6bbcb236ec3a267e45e +Author: Albert Astals Cid +Date: Fri Feb 2 23:22:33 2018 +0100 + + CairoOutputDev: Remove two unused member variables + + poppler/CairoOutputDev.h | 2 -- + 1 file changed, 2 deletions(-) + +commit b1016f574ac63fa269ca5125827895220e1df883 +Author: Albert Astals Cid +Date: Thu Feb 1 22:46:33 2018 +0100 + + Qt5: Add cancellation support to renderToImage and textList + + qt5/src/poppler-page.cc | 148 + ++++++++++++++++++++++++++++-------------------- + qt5/src/poppler-qt5.h | 98 +++++++++++++++++++++++++++++++- + 2 files changed, 185 insertions(+), 61 deletions(-) + +commit 248aa0f5832ce063a9ae061dfcf54596e0ea5fba +Author: Albert Astals Cid +Date: Sun Jan 28 00:25:38 2018 +0100 + + Fix build without libpng + + utils/ImageOutputDev.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f93fa48839be2937cd7ce38c14884428416bcc4b +Author: Andreas Gruenbacher +Date: Sat Jan 27 20:24:09 2018 +0100 + + Fix build without libtiff + + Bug #104813 + + utils/ImageOutputDev.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit f65f60e5d3f5e4109a79212a9994b5096a2a2a8d +Author: Jason Crain +Date: Thu Jan 18 11:57:33 2018 -0600 + + GfxFontDict: merge reference generation from xpdf 4.00 + + The GfxFontDict constructor generates a fake indirect reference if the + font dictionary doesn't have a real indirect reference. It sometimes + assigns the same reference to two different fonts leading to a wrong + font being used. XPDF 4.00 fixes this by using the hash of the font + data to create the fake reference. + + https://bugs.freedesktop.org/show_bug.cgi?id=104565 + + poppler/GfxFont.cc | 125 + +++++++++++++++++++++++++++++++++++++++++++++++++---- + poppler/GfxFont.h | 4 ++ + 2 files changed, 120 insertions(+), 9 deletions(-) + +commit 7342327039dfc750934f3ce7ff0bdb6bc585151c +Author: Albert Astals Cid +Date: Wed Jan 17 22:33:42 2018 +0100 + + Form.h: include time.h for time_t + + poppler/Form.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit a89e7474fcd9e7e6dd1330c585130346aa862598 +Author: suzuki toshiya +Date: Wed Jan 17 00:22:55 2018 +0100 + + Enable building all libs as static libs + + if the correct switch is used + + cpp/CMakeLists.txt | 2 +- + glib/CMakeLists.txt | 4 ++-- + qt5/src/CMakeLists.txt | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 7f550e88d86482adcfab6e054ff14588b32b692a +Author: Albert Astals Cid +Date: Sun Jan 14 20:51:19 2018 +0100 + + Remove declare but unused Object instances + + poppler/Annot.cc | 36 ------------------------------------ + poppler/CairoFontEngine.cc | 2 -- + poppler/Catalog.cc | 1 - + poppler/Form.cc | 2 +- + poppler/Lexer.cc | 1 - + poppler/Link.cc | 2 -- + poppler/PDFDoc.cc | 1 - + poppler/SplashOutputDev.cc | 2 -- + poppler/XRef.cc | 1 - + qt5/src/ArthurOutputDev.cc | 1 - + utils/JSInfo.cc | 1 - + utils/pdfinfo.cc | 1 - + utils/pdfseparate.cc | 1 - + 13 files changed, 1 insertion(+), 51 deletions(-) + +commit 4b237953b187f38c90b9a747f587cbc277db6d45 +Author: Albert Astals Cid +Date: Sun Jan 14 20:17:56 2018 +0100 + + pdfsig: Remove "int i = 0;" variable that was shadowing pevious i + + And making us access the wrong sig_widgets element + + utils/pdfsig.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 08f2cddf18b6ccdc13861b52821cbbf2d3e48472 +Author: Albert Astals Cid +Date: Thu Jan 11 19:38:29 2018 +0100 + + GfxFunctionShading::parse: Fix abort in malformed document + + Bug #104581 + + poppler/GfxState.cc | 32 ++++++++++++++++++++++---------- + 1 file changed, 22 insertions(+), 10 deletions(-) + +commit 10831921281f75b4b2c05ab85f4093331788e6a8 +Author: Albert Astals Cid +Date: Thu Jan 11 00:27:50 2018 +0100 + + GfxGouraudTriangleShading::parse: Don't abort on malformed documents + + Bug #104567 + + poppler/GfxState.cc | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +commit a59f61641fcb36859b625749afb4561557e419f6 +Author: Albert Astals Cid +Date: Wed Jan 10 23:24:19 2018 +0100 + + PDFDoc::setup: Fail early if base stream length is 0 + + Bug #103552 + + poppler/PDFDoc.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 00c1566e8cc0dacd899ec6dd267265f4b714eae4 +Author: Albert Astals Cid +Date: Wed Jan 10 00:49:51 2018 +0100 + + UnicodeMapFuncs: Move implementation to .cpp + + With that the last warning i got on poppler core is gone \o/ + + CMakeLists.txt | 1 + + poppler/UnicodeMapFuncs.cc | 88 + ++++++++++++++++++++++++++++++++++++++++++++++ + poppler/UnicodeMapFuncs.h | 64 +++------------------------------ + 3 files changed, 93 insertions(+), 60 deletions(-) + +commit bf6d79b5c6b5bdcc0d79b4eebd85840e8f2e30ef +Author: Albert Astals Cid +Date: Wed Jan 10 00:49:33 2018 +0100 + + Forgot C for last commit + + poppler/UTF.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ebf33c2b0c66c456683c189af1b297fe24adcf9d +Author: Albert Astals Cid +Date: Wed Jan 10 00:40:38 2018 +0100 + + utf16CountUtf8Bytes: initialize codepoint to 0 + + Was tired of seeing the warning + + I actually think the code is a little bit fishy for invalid values, + but since we only use it for win32 builds i'm not spending much more + time looking at it. + + poppler/UTF.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 43ad7071aa126d3b6754421b544e114d87fdd82a +Author: Albert Astals Cid +Date: Tue Jan 9 23:41:01 2018 +0100 + + qt5: Implement operator= for PageTransition + + qt5/src/poppler-page-transition.cc | 10 ++++++++++ + qt5/src/poppler-page-transition.h | 5 ++++- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit c2711874a4afc00448c21e86fdaf0b7aec40b623 +Author: Albert Astals Cid +Date: Tue Jan 9 19:47:29 2018 +0100 + + Fix another clazy rule-of-three warning + + We can just use the default copy assignemnt and constructor for Parent + + poppler/StructTreeRoot.h | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 30ccee028213efcf3d3a103ae6003bdcd15e1126 +Author: Albert Astals Cid +Date: Tue Jan 9 19:42:53 2018 +0100 + + Fix more Wmissing-field-initializer + + by using the default initializer + + goo/gfile.cc | 6 +++--- + poppler/GlobalParamsWin.cc | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit ef4e450c921f4373955def51a74ebffd8f7b4599 +Author: Albert Astals Cid +Date: Tue Jan 9 19:36:16 2018 +0100 + + Enable no-missing-field-initializers + + cmake/modules/PopplerMacros.cmake | 2 +- + glib/poppler-structure-element.cc | 29 +++++++++++++++-------------- + poppler/GfxFont.cc | 4 ++-- + poppler/JBIG2Stream.cc | 20 ++++++++++---------- + test/gtk-test.cc | 2 +- + test/pdf-fullrewrite.cc | 2 +- + utils/pdfdetach.cc | 3 ++- + utils/pdffonts.cc | 4 ++-- + utils/pdfimages.cc | 4 ++-- + utils/pdfinfo.cc | 4 ++-- + utils/pdfseparate.cc | 4 ++-- + utils/pdfsig.cc | 4 ++-- + utils/pdftocairo.cc | 4 ++-- + utils/pdftohtml.cc | 4 ++-- + utils/pdftoppm.cc | 4 ++-- + utils/pdftops.cc | 4 ++-- + utils/pdftotext.cc | 4 ++-- + utils/pdfunite.cc | 4 ++-- + 18 files changed, 54 insertions(+), 52 deletions(-) + +commit efd2205a0bc9e838fd2184c329f8370aa292c346 +Author: suzuki toshiya +Date: Tue Jan 9 00:03:59 2018 +0100 + + add "--owner root:0 --group root:0" options to tar command in + dist target + + Because git-archive always uses root:root in the generated tarball, + the source tarballs (since 0.60.0) have 2 uid/gids in it. + "root:root" by git-archive, and normal users/group by normal tar. + For detail, please find the analysis at:: + https://lists.freedesktop.org/archives/poppler/2017-December/012737.html + + Bug #104398 + + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cbd864b74fe368c1172974c7040c67ddfbc52cf6 +Author: Albert Astals Cid +Date: Mon Jan 8 23:48:57 2018 +0100 + + Fix abort in Gfx::opBeginMarkedContent if args[1] is not a name + + Bug #104468 + + poppler/Gfx.cc | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +commit 1aaf621f511ca4c235cb30a5ddbf050acd30fe91 +Author: Ben Timby +Date: Mon Jan 8 23:42:40 2018 +0100 + + Check return code of getChar(), abort reading on error. + + Bug #104502 + + poppler/PDFDoc.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit ad7f6acd3c643b5bc0c9b7f91616f678b178a041 +Author: Albert Astals Cid +Date: Mon Jan 8 23:40:25 2018 +0100 + + (C) of last commit + + poppler/Lexer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 582153b68e076c0f2ae71392f7553181c466e849 +Author: Albert Astals Cid +Date: Mon Jan 8 23:34:13 2018 +0100 + + Lexer: Check curStr is actually a Stream before doing Stream + operations + + Bug #104518 + + poppler/Lexer.cc | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit dea6e03352084361e7c89cff7adaa53110c4e91a +Author: Albert Astals Cid +Date: Mon Jan 8 23:25:39 2018 +0100 + + Fix new Object API porting bug + + When doing the XRef::readXRefTable workaround of moving entries[1] to + entries[0] set the entries[1] object back to null + + Bug #104517 + + poppler/XRef.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 4c9e1b66725051cd4726baf19d891c2d9c710868 +Author: Albert Astals Cid +Date: Mon Jan 8 23:09:13 2018 +0100 + + A few more nullptr + + poppler/Link.h | 2 +- + poppler/Object.h | 4 ++-- + poppler/OutputDev.h | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit e428033c2d7efbbbf89bb2f84c8998521ac7ef8e +Author: Albert Astals Cid +Date: Mon Jan 8 22:55:00 2018 +0100 + + Run clang-tidy with modernize nullptr + + Also add two enum values in the qt5 frontend to representate no flags + Also mark glib/gtk/cairo system includes so that gcc doesn't report + the issues in those headers + + cmake/modules/PopplerMacros.cmake | 2 +- + cpp/poppler-document.cpp | 50 +- + cpp/poppler-image.cpp | 20 +- + cpp/poppler-page.cpp | 8 +- + cpp/poppler-private.cpp | 2 +- + cpp/poppler-toc.cpp | 4 +- + cpp/tests/poppler-dump.cpp | 2 +- + cpp/tests/poppler-render.cpp | 2 +- + fofi/FoFiBase.cc | 10 +- + fofi/FoFiEncodings.cc | 396 +- + fofi/FoFiIdentifier.cc | 2 +- + fofi/FoFiTrueType.cc | 30 +- + fofi/FoFiType1.cc | 18 +- + fofi/FoFiType1C.cc | 28 +- + glib/CMakeLists.txt | 4 + + glib/demo/info.cc | 12 +- + glib/poppler-action.cc | 54 +- + glib/poppler-annot.cc | 64 +- + glib/poppler-attachment.cc | 12 +- + glib/poppler-cached-file-loader.cc | 16 +- + glib/poppler-document.cc | 246 +- + glib/poppler-form-field.cc | 30 +- + glib/poppler-input-stream.cc | 14 +- + glib/poppler-layer.cc | 16 +- + glib/poppler-media.cc | 10 +- + glib/poppler-movie.cc | 6 +- + glib/poppler-page.cc | 124 +- + glib/poppler-structure-element.cc | 200 +- + glib/poppler.cc | 8 +- + goo/GooHash.cc | 24 +- + goo/GooString.cc | 16 +- + goo/GooTimer.cc | 6 +- + goo/PNGWriter.cc | 6 +- + goo/TiffWriter.cc | 18 +- + goo/gfile.cc | 26 +- + goo/gmem.cc | 18 +- + goo/grandom.cc | 4 +- + goo/gstrtod.cc | 10 +- + poppler/Annot.cc | 300 +- + poppler/Array.cc | 2 +- + poppler/BuiltinFont.cc | 2 +- + poppler/BuiltinFontTables.cc | 8374 + ++++++++++++++++++------------------ + poppler/CMap.cc | 22 +- + poppler/CairoFontEngine.cc | 42 +- + poppler/CairoOutputDev.cc | 108 +- + poppler/CairoRescaleBox.cc | 6 +- + poppler/Catalog.cc | 76 +- + poppler/CharCodeToUnicode.cc | 28 +- + poppler/CurlCachedFile.cc | 6 +- + poppler/DCTStream.cc | 16 +- + poppler/DateInfo.cc | 4 +- + poppler/Decrypt.cc | 4 +- + poppler/Dict.cc | 8 +- + poppler/Error.cc | 4 +- + poppler/FileSpec.cc | 18 +- + poppler/FontEncodingTables.cc | 980 ++--- + poppler/FontInfo.cc | 22 +- + poppler/Form.cc | 70 +- + poppler/Function.cc | 26 +- + poppler/Gfx.cc | 146 +- + poppler/GfxFont.cc | 134 +- + poppler/GfxState.cc | 346 +- + poppler/GlobalParams.cc | 76 +- + poppler/GlobalParamsWin.cc | 170 +- + poppler/Hints.cc | 18 +- + poppler/JArithmeticDecoder.cc | 2 +- + poppler/JBIG2Stream.cc | 202 +- + poppler/JPEG2000Stream.cc | 22 +- + poppler/Lexer.cc | 8 +- + poppler/Linearization.cc | 16 +- + poppler/Link.cc | 52 +- + poppler/MarkedContentOutputDev.cc | 22 +- + poppler/Movie.cc | 2 +- + poppler/NameToCharCode.cc | 4 +- + poppler/NameToUnicodeTable.h | 4 +- + poppler/OptionalContent.cc | 28 +- + poppler/Outline.cc | 10 +- + poppler/OutputDev.cc | 6 +- + poppler/PDFDoc.cc | 84 +- + poppler/PSOutputDev.cc | 162 +- + poppler/PSOutputDev.h | 2 +- + poppler/Page.cc | 10 +- + poppler/PageLabelInfo.cc | 2 +- + poppler/Parser.cc | 10 +- + poppler/PopplerCache.cc | 4 +- + poppler/Rendition.cc | 4 +- + poppler/SecurityHandler.cc | 26 +- + poppler/SignatureHandler.cc | 60 +- + poppler/Sound.cc | 10 +- + poppler/SplashOutputDev.cc | 186 +- + poppler/StdinCachedFile.cc | 2 +- + poppler/StdinPDFDocBuilder.cc | 2 +- + poppler/Stream.cc | 70 +- + poppler/StructElement.cc | 72 +- + poppler/StructElement.h | 30 +- + poppler/StructTreeRoot.cc | 4 +- + poppler/StructTreeRoot.h | 2 +- + poppler/TextOutputDev.cc | 224 +- + poppler/UTF.cc | 6 +- + poppler/UnicodeMap.cc | 18 +- + poppler/UnicodeTypeTable.cc | 938 ++-- + poppler/XRef.cc | 38 +- + qt5/demos/abstractinfodock.h | 2 +- + qt5/demos/documentobserver.cpp | 2 +- + qt5/demos/embeddedfiles.h | 2 +- + qt5/demos/fonts.h | 2 +- + qt5/demos/info.h | 2 +- + qt5/demos/metadata.h | 2 +- + qt5/demos/navigationtoolbar.h | 2 +- + qt5/demos/optcontent.cpp | 2 +- + qt5/demos/optcontent.h | 2 +- + qt5/demos/pageview.h | 2 +- + qt5/demos/permissions.h | 2 +- + qt5/demos/thumbnails.h | 2 +- + qt5/demos/toc.cpp | 4 +- + qt5/demos/toc.h | 2 +- + qt5/demos/viewer.cpp | 4 +- + qt5/src/ArthurOutputDev.cc | 2 +- + qt5/src/poppler-annotation.cc | 60 +- + qt5/src/poppler-base-converter.cc | 8 +- + qt5/src/poppler-document.cc | 18 +- + qt5/src/poppler-embeddedfile.cc | 14 +- + qt5/src/poppler-form.cc | 6 +- + qt5/src/poppler-link.cc | 4 +- + qt5/src/poppler-media.cc | 2 +- + qt5/src/poppler-movie.cc | 2 +- + qt5/src/poppler-optcontent.cc | 16 +- + qt5/src/poppler-optcontent.h | 2 +- + qt5/src/poppler-page.cc | 36 +- + qt5/src/poppler-pdf-converter.cc | 2 +- + qt5/src/poppler-private.cc | 16 +- + qt5/src/poppler-private.h | 2 +- + qt5/src/poppler-ps-converter.cc | 10 +- + qt5/src/poppler-qt5.h | 8 +- + qt5/src/poppler-sound.cc | 2 +- + qt5/tests/check_lexer.cpp | 2 +- + qt5/tests/check_metadata.cpp | 8 +- + qt5/tests/check_search.cpp | 2 +- + qt5/tests/stress-threads-qt5.cpp | 12 +- + qt5/tests/test-poppler-qt5.cpp | 2 +- + splash/Splash.cc | 110 +- + splash/SplashBitmap.cc | 18 +- + splash/SplashClip.cc | 12 +- + splash/SplashFTFont.cc | 8 +- + splash/SplashFTFontEngine.cc | 8 +- + splash/SplashFTFontFile.cc | 12 +- + splash/SplashFont.cc | 8 +- + splash/SplashFontEngine.cc | 22 +- + splash/SplashFontFile.cc | 4 +- + splash/SplashPath.cc | 8 +- + splash/SplashScreen.cc | 4 +- + splash/SplashState.cc | 22 +- + splash/SplashXPath.cc | 8 +- + splash/SplashXPathScanner.cc | 4 +- + test/CMakeLists.txt | 5 +- + test/gtk-test.cc | 28 +- + test/pdf-fullrewrite.cc | 14 +- + test/pdf-inspector.cc | 22 +- + test/perf-test.cc | 66 +- + utils/HtmlFonts.cc | 8 +- + utils/HtmlLinks.cc | 6 +- + utils/HtmlOutputDev.cc | 94 +- + utils/ImageOutputDev.cc | 10 +- + utils/JSInfo.cc | 4 +- + utils/Win32Console.cc | 2 +- + utils/parseargs.cc | 2 +- + utils/pdfdetach.cc | 8 +- + utils/pdffonts.cc | 6 +- + utils/pdfimages.cc | 8 +- + utils/pdfinfo.cc | 6 +- + utils/pdfseparate.cc | 14 +- + utils/pdfsig.cc | 12 +- + utils/pdftocairo-win32.cc | 22 +- + utils/pdftocairo.cc | 34 +- + utils/pdftohtml.cc | 36 +- + utils/pdftoppm.cc | 20 +- + utils/pdftops.cc | 8 +- + utils/pdftotext.cc | 10 +- + utils/pdfunite.cc | 16 +- + 179 files changed, 7929 insertions(+), 7920 deletions(-) + +commit 2e47887616155dee566083e1aac9adab69aa4386 +Author: Albert Astals Cid +Date: Mon Jan 8 22:14:34 2018 +0100 + + Seems we don't need to set this cmake policies to OLD + + builds fine without warnings + + cmake/modules/PopplerDefaults.cmake | 8 -------- + 1 file changed, 8 deletions(-) + +commit 1ae5d91467663576a5d11add69fa72a2d108f0ad +Author: Albert Astals Cid +Date: Mon Jan 8 18:45:43 2018 +0100 + + Remove useless return in a void function + + poppler/SplashOutputDev.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8794789a72f845b009656e6d7ae6a00b709e09bc +Author: Albert Astals Cid +Date: Mon Jan 8 18:07:38 2018 +0100 + + Delete lots of copy constructors and copy assignment operators + + Fixes rule-of-three and copyable-polymorphic warnings reported + by clazy. + + The default copy constructor and copy assignment operator are + only valid for simple classes so we delete them (i.e. make then + not exist) + when we have either a virtual class or a destructor, the code still + compiles + so this doesn't fix any bug, it is more a protection for when you + think you + can copy a class and don't realize the default copy constrcutor is + not doing + what you want and you get crashes. Hopefully this helps us in the + future :) + + cpp/poppler-document-private.h | 4 ++++ + cpp/poppler-embedded-file-private.h | 4 ++++ + cpp/poppler-global.cpp | 3 +++ + cpp/poppler-image-private.h | 4 ++++ + cpp/poppler-image.cpp | 4 +++- + cpp/poppler-page-private.h | 4 ++++ + cpp/poppler-toc-private.h | 4 ++++ + fofi/FoFiBase.h | 16 ++++++++++++++ + fofi/FoFiIdentifier.cc | 4 ++++ + goo/GooMutex.h | 5 ++++- + goo/ImgWriter.h | 6 +++++- + goo/gfile.h | 5 ++++- + poppler/Annot.h | 38 + +++++++++++++++++++++++++++++++++- + poppler/Array.h | 5 ++++- + poppler/BuiltinFont.h | 18 ++++++++++++++++ + poppler/CMap.h | 8 ++++++- + poppler/CachedFile.h | 9 +++++++- + poppler/CairoFontEngine.h | 6 +++++- + poppler/CairoOutputDev.h | 4 ++++ + poppler/CairoRescaleBox.h | 4 ++++ + poppler/Catalog.h | 9 +++++++- + poppler/CharCodeToUnicode.h | 8 ++++++- + poppler/Dict.h | 5 ++++- + poppler/FileSpec.h | 8 ++++++- + poppler/FontInfo.h | 4 +++- + poppler/Form.h | 8 ++++++- + poppler/Function.h | 5 ++++- + poppler/Gfx.cc | 5 ++++- + poppler/Gfx.h | 8 ++++++- + poppler/GfxFont.h | 11 +++++++++- + poppler/GfxState.cc | 2 ++ + poppler/GfxState.h | 26 ++++++++++++++++++++++- + poppler/GlobalParams.cc | 6 +++++- + poppler/GlobalParams.h | 5 ++++- + poppler/Hints.h | 5 ++++- + poppler/JArithmeticDecoder.h | 18 ++++++++++++++++ + poppler/JBIG2Stream.cc | 4 +++- + poppler/Lexer.h | 5 ++++- + poppler/Link.h | 10 +++++++++ + poppler/MarkedContentOutputDev.h | 4 ++++ + poppler/Movie.h | 3 ++- + poppler/NameToCharCode.h | 17 +++++++++++++++ + poppler/OptionalContent.h | 11 +++++++++- + poppler/Outline.h | 8 ++++++- + poppler/PDFDoc.h | 5 ++++- + poppler/PDFDocBuilder.h | 8 +++++-- + poppler/PDFDocFactory.h | 5 ++++- + poppler/PSOutputDev.cc | 7 ++++++- + poppler/Page.h | 5 ++++- + poppler/PageLabelInfo.h | 6 +++++- + poppler/Parser.h | 5 ++++- + poppler/PopplerCache.h | 18 +++++++++++++--- + poppler/Rendition.h | 3 ++- + poppler/SecurityHandler.cc | 5 ++++- + poppler/SecurityHandler.h | 5 ++++- + poppler/Sound.h | 5 ++++- + poppler/SplashOutputDev.cc | 4 +++- + poppler/Stream.h | 14 ++++++++++++- + poppler/StructElement.h | 5 ++++- + poppler/StructTreeRoot.h | 4 ++++ + poppler/TextOutputDev.cc | 2 ++ + poppler/TextOutputDev.h | 29 +++++++++++++++++++++++++- + poppler/UnicodeMap.h | 7 +++++++ + poppler/XRef.cc | 5 ++++- + poppler/XRef.h | 9 +++++++- + qt5/demos/documentobserver.h | 3 +++ + qt5/src/poppler-annotation-private.h | 5 ++++- + qt5/src/poppler-annotation.cc | 14 ++++++++++++- + qt5/src/poppler-converter-private.h | 5 ++++- + qt5/src/poppler-embeddedfile-private.h | 5 ++++- + qt5/src/poppler-link-private.h | 5 ++++- + qt5/src/poppler-media.cc | 5 ++++- + qt5/src/poppler-movie.cc | 5 ++++- + qt5/src/poppler-optcontent-private.h | 5 ++++- + qt5/src/poppler-page-transition.cc | 3 +++ + qt5/src/poppler-page-transition.h | 3 ++- + qt5/src/poppler-private.h | 18 +++++++--------- + qt5/src/poppler-sound.cc | 5 ++++- + splash/Splash.h | 5 ++++- + splash/SplashBitmap.h | 5 ++++- + splash/SplashClip.h | 5 ++++- + splash/SplashFTFontEngine.h | 5 ++++- + splash/SplashFont.h | 5 ++++- + splash/SplashFontEngine.h | 5 ++++- + splash/SplashFontFile.h | 8 ++++++- + splash/SplashFontFileID.h | 16 ++++++++++++++ + splash/SplashPath.h | 17 +++++++++++++++ + splash/SplashPattern.h | 4 ++++ + splash/SplashScreen.h | 5 ++++- + splash/SplashState.h | 4 ++++ + splash/SplashXPath.h | 4 ++++ + splash/SplashXPathScanner.h | 4 ++++ + test/perf-test.cc | 4 ++++ + utils/HtmlFonts.h | 4 +++- + utils/HtmlLinks.h | 5 ++++- + utils/HtmlOutputDev.cc | 4 +++- + utils/HtmlOutputDev.h | 13 ++++++++++-- + 97 files changed, 626 insertions(+), 83 deletions(-) + +commit 4c7814342806b61fedbb2d45ce74462f9dbc20bc +Author: Albert Astals Cid +Date: Thu Jan 4 23:12:54 2018 +0100 + + Fix assert on malformed documents + + Bug #104354 + + poppler/GfxState.cc | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +commit 6233710068e8406cb44741bdc74d1a0e2582e5cf +Author: Adrian Johnson +Date: Thu Jan 4 15:41:11 2018 +1030 + + Remove error for wrong child type for tagged pdf + + It is harmless and as a few PDFs do this it just adds noise to + the output. + + Bug #103587 + + poppler/StructTreeRoot.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit 321538259a9c79a99ce846a6ea2d94dd7fa56f61 +Author: Adrian Johnson +Date: Sun Nov 26 20:43:15 2017 +1030 + + Fix some bugs in StructTreeRoot parsing of parent tree + + - Add support for parsing child nodes in the number tree + - Number tree keys do not have to be consecutive numbers. Use + map instead of vector for parentTree. + - Due to performance impact of iterating a map instead of + vector in parentTreeAdd, add a reverse mapping from Ref + to parentTree. + - Add mcid parameter to findParentElement() to enable finding + the parent when there are multiple MCIDs on the same page. + - Move RefCompare from pdfinfo.cc to Object.h so it can be + used by other files. + + Bug #103912 + + poppler/Object.h | 8 +++ + poppler/StructElement.cc | 2 +- + poppler/StructTreeRoot.cc | 121 + +++++++++++++++++++++++++++------------------- + poppler/StructTreeRoot.h | 14 ++++-- + utils/pdfinfo.cc | 6 --- + 5 files changed, 91 insertions(+), 60 deletions(-) + +commit c4cbb4fd5e062544bf34109140266d0b027a512b +Author: Adrian Johnson +Date: Mon Oct 30 19:21:41 2017 +1030 + + Fix pdfimages with flate encoded inline images + + - Remove advance strem pos to end of image code from listImage(). + getInlineImageLength() already does this. + + - Always EmbedStream in getInlineImageLength() to get size of + stored image. + The type of encoding does not matter. + + - Use same record EmbeddeStream code for all image types in + writeImage() + + - Fix some memory leaks + + Bug #103446 + + utils/ImageOutputDev.cc | 54 + ++++++++++++------------------------------------- + 1 file changed, 13 insertions(+), 41 deletions(-) + +commit f87238296f7a81f131f2525c4ea3a26d14e8a7ff +Author: Adrian Johnson +Date: Wed Jan 3 08:36:58 2018 +1030 + + Fix EmbedStream replay + + Bug #103446 + + poppler/Stream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e70990c5b2d95a9099b8f4a1c69ca9e5b2a559a4 +Author: Albert Astals Cid +Date: Wed Jan 3 00:46:42 2018 +0100 + + qt5: make the check for rendition a bit earlier + + qt5/src/poppler-annotation.cc | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit 9f08b62ea283ea66b35cfc6dab3e7f45bc4170b9 +Author: Albert Astals Cid +Date: Wed Jan 3 00:32:23 2018 +0100 + + qt5: Do not assume all Screen annotation actions are Renditions + + Fixes KDE bug #388175 + + qt5/src/poppler-annotation.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 15272137daf186114d8dfeb6898d8d90b3ccfd91 +Author: Albert Astals Cid +Date: Wed Jan 3 00:14:13 2018 +0100 + + Fix undefined sanitizer warning about qsort + + Said the first parameter is defined by spec to not be null and + we where + passing null when there's no blocks, so add an if + + poppler/TextOutputDev.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 066e6a3e0487f9e011f7b8d1ccff62def8db1e6c +Author: Albert Astals Cid +Date: Wed Jan 3 00:15:14 2018 +0100 + + Welcome 2018 + + poppler/poppler-config.h.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c9958ecb87de34b923a17521c8bb149569bacca8 +Author: Oliver Sander +Date: Sat Oct 28 21:16:55 2017 +0200 + + ArthurOutputDev: Rudimentary support for transparency groups + + This patch adds minimal support for transparency groups. With it, + the Arthur backend can render highlight annotations. + + qt5/src/ArthurOutputDev.cc | 46 + ++++++++++++++++++++++++++++++++++++++++++++++ + qt5/src/ArthurOutputDev.h | 15 +++++++++++++++ + 2 files changed, 61 insertions(+) + +commit bda1d76fc3c9cf69b2b67d94278e136ac50c3e3b +Author: Oliver Sander +Date: Fri Dec 29 00:14:44 2017 +0100 + + ArthurOutputDev: Replace the QPainter by a stack of QPainters + + This patch lays some groundwork for the support of transparency + groups. Transparency groups temporarily create new painters. + These get painted upon, and then the resulting new painting + will be drawn at once onto the original PaintDevice. To implement + this, we need a stack of painters rather than a single one. + The first painter on the stack is the original one. Opening a + transparency group pushes a new painter onto the stack, and + all drawing operations always go to the painter on the top + of the stack. + + qt5/src/ArthurOutputDev.cc | 88 + +++++++++++++++++++++++----------------------- + qt5/src/ArthurOutputDev.h | 7 +++- + 2 files changed, 50 insertions(+), 45 deletions(-) + +commit 71b04b79154a8edd27e73a2360d0c3a901246d8c +Author: Oliver Sander +Date: Fri Aug 11 22:23:46 2017 +0200 + + ArthurOutputDev: Implement updateBlendMode + + qt5/src/ArthurOutputDev.cc | 52 + ++++++++++++++++++++++++++++++++++++++++++++++ + qt5/src/ArthurOutputDev.h | 1 + + 2 files changed, 53 insertions(+) + +commit 9b981f9123fe8c3c8662015de341cff76aa28b07 +Author: Thomas Freitag +Date: Thu Dec 28 00:55:39 2017 +0100 + + FoFiTrueType::readPostTable() from xpdf 4.00 + + Bug #102880 + + fofi/FoFiTrueType.cc | 30 +++++++++++------------------- + 1 file changed, 11 insertions(+), 19 deletions(-) + +commit 00fc829352716b04d9ab59552daefffed20e2852 +Author: Thomas Freitag +Date: Thu Dec 28 00:55:00 2017 +0100 + + Break loop if recursionLimit is reached + + poppler/Parser.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e41ce80a27b735df8e2ccc17e15adea012543712 +Author: Albert Astals Cid +Date: Wed Dec 27 00:18:47 2017 +0100 + + OutlineItem: Store parent and refNum + + This way when opening our children we make sure they are not also our + parent (i.e. there's a loop) + + Fixes bug #102914 + + poppler/Outline.cc | 31 +++++++++++++++++-------------- + poppler/Outline.h | 6 ++++-- + 2 files changed, 21 insertions(+), 16 deletions(-) + +commit ffefe1c038de555ed39c3d9eca6ef79ac1f97b86 +Author: Albert Astals Cid +Date: Tue Dec 26 23:57:21 2017 +0100 + + qt5: demo: don't crash if page is malformed + + qt5/demos/pageview.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 81461f4cddf6b8705e6cf24d20084fc71891bb91 +Author: Albert Astals Cid +Date: Sat Dec 23 11:20:43 2017 +0100 + + Remove another LCMS1 old ifdef + + utils/pdftocairo.cc | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +commit 2556ec0705373a01feffe3ca0cd7147af2fdd2c9 +Author: suzuki toshiya +Date: Sat Dec 23 11:19:17 2017 +0100 + + Remove libcms1 crumbs from pdftocairo and qt5 frontend + + Bug #104358 + + qt5/src/poppler-document.cc | 5 +---- + utils/pdftocairo.cc | 6 +----- + 2 files changed, 2 insertions(+), 9 deletions(-) + +commit 48de59a92a5f88d10a1a53abf7f15f578104e1ed +Author: Carlos Garcia Campos +Date: Thu Dec 21 13:25:37 2017 +0100 + + regtest: Add an option to exit after n failures + + Note that running jobs are not cancelled when max failures is reached, + so we usually end up getting more failures than the maximum. + + regtest/HTMLReport.py | 2 ++ + regtest/Printer.py | 15 ++++++++++++++ + regtest/TestRun.py | 46 + +++++++++++++++++++++++++++++++++++++++++-- + regtest/commands/run-tests.py | 8 +++++++- + 4 files changed, 68 insertions(+), 3 deletions(-) + +commit 79a096a48c735ac301ae4d7439bddf630a559a96 +Author: Vincent Le Garrec +Date: Thu Dec 21 00:57:48 2017 +0100 + + Fix index out of bounds undefined behaviour in PSTokenizer + + Bug #103583 + + poppler/PSTokenizer.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit c138ec620b5084348dc892bf9fd8228ed098970a +Author: Oliver Sander +Date: Tue Nov 28 16:40:40 2017 +0100 + + Arthur: 'clip' should intersect new and old clipping path + + Previously, the 'clip' method of the ArthurOutputDev class + replaced the current clipping path with the one given in + the GfxState variable. However, the expected behavior is + to intersect the new path with the old one, and use the + result as the new clipping path. + + qt5/src/ArthurOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7b434a7ad9333a3b2250d636a517c58d9a12bca2 +Author: Pekka Vuorela +Date: Fri Dec 15 16:56:20 2017 +0200 + + Honor configuration for building glibc copy of strtok_r + + config.h didn't get included and HAVE_STRTOK_R was never defined. + Now getting via glibc.h. + + goo/glibc_strtok_r.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit c2037af18095bb42dd43bafb42650df469e7e5ef +Author: Oliver Sander +Date: Wed Oct 18 23:23:50 2017 +0200 + + Don't let ArthurOutputDev be friend of SplashPath anymore + + Now that ArthurOutputDev uses Qt glyph rendering, there is + not need for it to be friend of SplashPath anymore. + + splash/SplashPath.h | 2 -- + 1 file changed, 2 deletions(-) + +commit 33c3b391dfc3c10b1b63b0b82df4dcb47b71c53a +Author: Fredrik Fornwall +Date: Tue Dec 19 00:37:44 2017 +0100 + + PDFDoc: use %c instead of \x to output binary + + Bug #103873 + + poppler/PDFDoc.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 15dd674a384c80a8f3d4f0647f6617ba72d9bd26 +Author: Albert Astals Cid +Date: Thu Dec 14 15:11:31 2017 +0100 + + Remove unused FindLIBOPENJPEG.cmake + + cmake/modules/FindLIBOPENJPEG.cmake | 64 + ------------------------------------- + 1 file changed, 64 deletions(-) + +commit 65dcc0b9c16c80e6718ada060d7ac0e2c0e39abf +Author: Albert Astals Cid +Date: Wed Dec 13 10:40:50 2017 +0100 + + Reset lastAbortCheck on updateLevel reset + + Otherwise we get to a point that the + if (updateLevel - lastAbortCheck > 10) { + branch is never executed because updateLevel got to 20000 but + lastAbortCheck is still at the last value + + poppler/Gfx.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3690e96154b226025b465ac2260cf1ff2d269abd +Author: Albert Astals Cid +Date: Wed Dec 13 00:07:20 2017 +0100 + + Remove the extern C from glib.h + + Apparently this fixes build with MSVC + + Bug #103621 + + goo/glibc.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit f5706275121409887b0e486b896b48cbcccb766a +Author: Adrian Johnson +Date: Sun Oct 22 10:26:55 2017 +1030 + + cairo: limit image size when printing + + 1 bpp image formats can have very large sizes. Even if the maximum + cairo image size is not exceeded, it still uses a huge amount + of memory + and is very slow. + + This limits the image size when printing to 8192x8192 which is + sufficient for 300ppi at A2 size. Cairo >= 1.5.10 scales mime images + to the same dimensions as the cairo image, so the original mime image + can still be embedded. + + Bug 103399 + + poppler/CairoOutputDev.cc | 35 ++++++++++++++++++++++++++++++++--- + 1 file changed, 32 insertions(+), 3 deletions(-) + +commit 3f13dd5f04984be1912b4537ffbfacd892750915 +Author: Adrian Johnson +Date: Sun Oct 22 09:37:01 2017 +1030 + + cairo: support embedding CCITT image data + + Bug 103399 + + poppler/CairoOutputDev.cc | 46 + +++++++++++++++++++++++++++++++++++++++++++--- + poppler/CairoOutputDev.h | 5 ++++- + poppler/Stream.cc | 14 ++++++++++---- + poppler/Stream.h | 6 +++++- + 4 files changed, 62 insertions(+), 9 deletions(-) + +commit 3263fa4439e1a09dae6a0332a90b983d25bc218d +Author: Thomas Freitag +Date: Tue Dec 12 00:26:37 2017 +0100 + + windows version for Error out on save if file has changed since we + opened it + + goo/gfile.cc | 14 +++++++++++++- + goo/gfile.h | 6 ++++-- + 2 files changed, 17 insertions(+), 3 deletions(-) + +commit e4ee1392136188fab0005a0bd7b30c6d9a16d97d +Author: Albert Astals Cid +Date: Tue Dec 12 00:24:31 2017 +0100 + + Error out on save if file has changed since we opened it + + In poppler we keep the fd of the file open so the XRef+FileStream can + locate objects. This is good since we save lots of memory for + not having + everything on memory all the time, but that means that when we want to + save we need the file to be exactly the same as it was when we created + the XRef otherwise we're going to be reading from the wrong part + of the + "new" file. + + Bug #103793 + + goo/gfile.cc | 18 +++++++++++++++++- + goo/gfile.h | 10 ++++++++-- + poppler/ErrorCodes.h | 16 ++++++++++++++++ + poppler/PDFDoc.cc | 11 +++++++++++ + 4 files changed, 52 insertions(+), 3 deletions(-) + +commit f10359121568409e6062a82de696fe93be615a53 +Author: Albert Astals Cid +Date: Sun Dec 3 22:41:32 2017 +0100 + + Fix memory leak on error condition + + poppler/Catalog.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 72e0a3a087f160d819f7697a8536bbee12240c7a +Author: Albert Astals Cid +Date: Sun Dec 3 20:25:06 2017 +0100 + + 0.62.0 + + CMakeLists.txt | 6 +++--- + NEWS | 26 ++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 32 insertions(+), 6 deletions(-) + +commit 90958363fd5e8c5e74a889e0c2140c71a0c09eb6 +Author: Albert Astals Cid +Date: Sun Dec 3 20:23:09 2017 +0100 + + Add missing (C) + + poppler/Error.cc | 2 +- + poppler/UTF.cc | 2 +- + poppler/UTF.h | 2 +- + poppler/UnicodeMapFuncs.h | 1 + + utils/JSInfo.cc | 2 +- + utils/pdfdetach.cc | 2 +- + utils/pdffonts.cc | 2 +- + utils/pdfseparate.cc | 1 + + utils/pdfsig.cc | 1 + + utils/pdftohtml.cc | 1 + + utils/pdftotext.cc | 1 + + utils/printencodings.cc | 1 + + 12 files changed, 12 insertions(+), 6 deletions(-) + +commit f007ab6beb2616850488271da5162f4ef0dbe789 +Author: Adrian Johnson +Date: Sat Dec 2 14:13:50 2017 +1030 + + INSTALL: add debug options + + also ensure cmake commands are lowercase to be consistent with our + code style. + + INSTALL | 38 +++++++++++++++++++++++++++++++++----- + 1 file changed, 33 insertions(+), 5 deletions(-) + +commit cef42ac807f4da7ae91be1b6b81b50adb9684975 +Author: Adrian Johnson +Date: Sat Dec 2 14:01:42 2017 +1030 + + Fix UTF test fail + + The buffer size was not large enough. Increase it and add an assert to + check the buffer size. + + qt5/tests/check_utf_conversion.cpp | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit fb4c69d270a618bb23791e52f46ec73c86574294 +Author: Albert Astals Cid +Date: Fri Dec 1 23:44:17 2017 +0100 + + Remove the Qt4 frontend + + .gitignore | 2 - + CMakeLists.txt | 17 - + cmake/modules/FindQt4.cmake | 1311 ------- + poppler-qt4.pc.cmake | 12 - + qt4/.gitignore | 4 - + qt4/CMakeLists.txt | 6 - + qt4/demos/.gitignore | 4 - + qt4/demos/CMakeLists.txt | 28 - + qt4/demos/abstractinfodock.cpp | 57 - + qt4/demos/abstractinfodock.h | 48 - + qt4/demos/documentobserver.cpp | 50 - + qt4/demos/documentobserver.h | 50 - + qt4/demos/embeddedfiles.cpp | 82 - + qt4/demos/embeddedfiles.h | 44 - + qt4/demos/fonts.cpp | 72 - + qt4/demos/fonts.h | 43 - + qt4/demos/info.cpp | 72 - + qt4/demos/info.h | 43 - + qt4/demos/main_viewer.cpp | 33 - + qt4/demos/metadata.cpp | 50 - + qt4/demos/metadata.h | 43 - + qt4/demos/navigationtoolbar.cpp | 144 - + qt4/demos/navigationtoolbar.h | 65 - + qt4/demos/optcontent.cpp | 69 - + qt4/demos/optcontent.h | 47 - + qt4/demos/pageview.cpp | 101 - + qt4/demos/pageview.h | 53 - + qt4/demos/permissions.cpp | 66 - + qt4/demos/permissions.h | 43 - + qt4/demos/thumbnails.cpp | 84 - + qt4/demos/thumbnails.h | 48 - + qt4/demos/toc.cpp | 88 - + qt4/demos/toc.h | 43 - + qt4/demos/viewer.cpp | 319 -- + qt4/demos/viewer.h | 73 - + qt4/src/.gitignore | 9 - + qt4/src/ArthurOutputDev.cc | 812 ---- + qt4/src/ArthurOutputDev.h | 170 - + qt4/src/CMakeLists.txt | 54 - + qt4/src/Doxyfile | 1637 --------- + qt4/src/Mainpage.dox | 85 - + qt4/src/poppler-annotation-helper.h | 181 - + qt4/src/poppler-annotation-private.h | 112 - + qt4/src/poppler-annotation.cc | 5089 + -------------------------- + qt4/src/poppler-annotation.h | 1375 ------- + qt4/src/poppler-base-converter.cc | 105 - + qt4/src/poppler-converter-private.h | 49 - + qt4/src/poppler-document.cc | 850 ----- + qt4/src/poppler-embeddedfile-private.h | 42 - + qt4/src/poppler-embeddedfile.cc | 135 - + qt4/src/poppler-export.h | 20 - + qt4/src/poppler-fontinfo.cc | 150 - + qt4/src/poppler-form.cc | 416 --- + qt4/src/poppler-form.h | 343 -- + qt4/src/poppler-link-extractor-private.h | 57 - + qt4/src/poppler-link-extractor.cc | 84 - + qt4/src/poppler-link-private.h | 57 - + qt4/src/poppler-link.cc | 710 ---- + qt4/src/poppler-link.h | 641 ---- + qt4/src/poppler-media.cc | 168 - + qt4/src/poppler-media.h | 100 - + qt4/src/poppler-movie.cc | 110 - + qt4/src/poppler-optcontent-private.h | 124 - + qt4/src/poppler-optcontent.cc | 456 --- + qt4/src/poppler-optcontent.h | 84 - + qt4/src/poppler-page-private.h | 57 - + qt4/src/poppler-page-transition-private.h | 28 - + qt4/src/poppler-page-transition.cc | 101 - + qt4/src/poppler-page-transition.h | 158 - + qt4/src/poppler-page.cc | 810 ---- + qt4/src/poppler-pdf-converter.cc | 115 - + qt4/src/poppler-private.cc | 296 -- + qt4/src/poppler-private.h | 241 -- + qt4/src/poppler-ps-converter.cc | 280 -- + qt4/src/poppler-qiodeviceoutstream-private.h | 47 - + qt4/src/poppler-qiodeviceoutstream.cc | 64 - + qt4/src/poppler-qt4.h | 1990 ---------- + qt4/src/poppler-sound.cc | 132 - + qt4/src/poppler-textbox.cc | 63 - + qt4/tests/.gitignore | 33 - + qt4/tests/CMakeLists.txt | 67 - + qt4/tests/README.unittest | 23 - + qt4/tests/check_actualtext.cpp | 33 - + qt4/tests/check_attachments.cpp | 157 - + qt4/tests/check_dateConversion.cpp | 142 - + qt4/tests/check_fonts.cpp | 248 -- + qt4/tests/check_goostring.cpp | 127 - + qt4/tests/check_lexer.cpp | 107 - + qt4/tests/check_links.cpp | 98 - + qt4/tests/check_metadata.cpp | 275 -- + qt4/tests/check_optcontent.cpp | 446 --- + qt4/tests/check_pagelabelinfo.cpp | 43 - + qt4/tests/check_pagelayout.cpp | 49 - + qt4/tests/check_pagemode.cpp | 73 - + qt4/tests/check_password.cpp | 88 - + qt4/tests/check_permissions.cpp | 44 - + qt4/tests/check_search.cpp | 175 - + qt4/tests/check_strings.cpp | 250 -- + qt4/tests/poppler-attachments.cpp | 39 - + qt4/tests/poppler-fonts.cpp | 89 - + qt4/tests/poppler-forms.cpp | 166 - + qt4/tests/poppler-texts.cpp | 40 - + qt4/tests/stress-poppler-dir.cpp | 67 - + qt4/tests/stress-poppler-qt4.cpp | 74 - + qt4/tests/stress-threads-qt4.cpp | 309 -- + qt4/tests/test-password-qt4.cpp | 136 - + qt4/tests/test-poppler-qt4.cpp | 235 -- + qt4/tests/test-render-to-file.cpp | 69 - + 108 files changed, 25623 deletions(-) + +commit bb0011b74093cfbf5a21b72861ac46a2b8699c0e +Author: Albert Astals Cid +Date: Fri Dec 1 23:37:38 2017 +0100 + + Make the disable for ENABLE_CMS be none + + as it is for ENABLE_LIBOPENJPEG and for ENABLE_DCTDECODER + + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 0ea5ad393601f0b1c060268cf1c310b47f928f7b +Author: Albert Astals Cid +Date: Fri Dec 1 23:35:28 2017 +0100 + + Stop supporting openjpeg1, you really want to use openjpeg2 :) + + CMakeLists.txt | 54 ++--------------- + config.h.cmake | 6 -- + poppler/JPEG2000Stream.cc | 145 + ---------------------------------------------- + 3 files changed, 5 insertions(+), 200 deletions(-) + +commit ce8e17e4fa96b7dd639c72818bba5a26c16cc1cb +Author: Albert Astals Cid +Date: Fri Dec 1 23:19:39 2017 +0100 + + Stop supporting lcms1, you really want to use lcms2 :) + + CMakeLists.txt | 36 ++++++------------------------------ + config.h.cmake | 3 --- + poppler/Gfx.cc | 5 ----- + poppler/GfxState.cc | 40 ---------------------------------------- + 4 files changed, 6 insertions(+), 78 deletions(-) + +commit 42d8d7ffd8b5393dc3103a45932b70bc8ca61c2e +Author: Albert Astals Cid +Date: Wed Nov 22 21:50:24 2017 +0100 + + Open files that state 8 bits as third field of W + + Even we only really accept 32 bits since it is really strange to have + more than 2^31 generations + + Bug #103469 + + poppler/XRef.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 6ab81a63323e8339647f883649bf74f9d96820ae +Author: Oliver Sander +Date: Tue Nov 7 17:25:27 2017 +0100 + + Document the meaning of the 'type' integer of a shading + + poppler/GfxState.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 0a9d6debdb3d4e28d9125a007244bca0c1cd760a +Author: Jean Ghali +Date: Fri Nov 17 23:13:56 2017 +0100 + + Include glibc.h where needed + + at least for strtok_r + + fofi/FoFiType1.cc | 2 ++ + poppler/CharCodeToUnicode.cc | 2 ++ + poppler/GlobalParams.cc | 2 ++ + poppler/PDFDoc.cc | 2 ++ + poppler/UnicodeMap.cc | 2 ++ + 5 files changed, 10 insertions(+) + +commit e0302537ec0919d9f3dbf180ebbc6e2653b1049b +Author: Albert Astals Cid +Date: Wed Nov 15 10:44:14 2017 +0100 + + qt5: Add API to let the rendering process callback to get a partial + rendering + + Bug #103372 + + qt5/src/poppler-page.cc | 254 + +++++++++++++++++++++++++++++++++--------------- + qt5/src/poppler-qt5.h | 78 +++++++++++++++ + 2 files changed, 254 insertions(+), 78 deletions(-) + +commit 33b8e6220d06a26378d7d21c88ead6e2280c2e52 +Author: Adrian Johnson +Date: Wed Nov 15 19:58:53 2017 +1030 + + fix MSC macro + + poppler/GlobalParams.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a6dd3f957f5979fa34a05ba963862de7d0d9df61 +Author: Adrian Johnson +Date: Sun Nov 12 10:33:07 2017 +1030 + + Support unicode on windows console + + The Win32Console should be used in programs that require unicode + support for command line arguments and stdio ouput on windows. On + windows it gets the command line arguments from GetCommandLineW and + converts to UTF-8, and redefines the stdio output functions to convert + UTF-8 to calls to WriteConsoleW. On other platforms this class is a + no-op. + + poppler/PDFDoc.cc | 9 +- + poppler/UTF.cc | 287 + ++++++++++++++++++++++++++++++++++++- + poppler/UTF.h | 39 +++++ + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/check_utf_conversion.cpp | 87 +++++++++++ + utils/CMakeLists.txt | 1 + + utils/JSInfo.cc | 1 + + utils/Win32Console.cc | 167 +++++++++++++++++++++ + utils/Win32Console.h | 63 ++++++++ + utils/pdfdetach.cc | 2 + + utils/pdffonts.cc | 2 + + utils/pdfimages.cc | 2 + + utils/pdfinfo.cc | 2 + + utils/pdfseparate.cc | 2 + + utils/pdfsig.cc | 2 + + utils/pdftocairo-win32.cc | 1 + + utils/pdftocairo.cc | 2 + + utils/pdftohtml.cc | 2 + + utils/pdftoppm.cc | 2 + + utils/pdftops.cc | 2 + + utils/pdftotext.cc | 2 + + 21 files changed, 676 insertions(+), 2 deletions(-) + +commit 49107ffcd4d3c9b18fc950d37bede08f89bcfcda +Author: Adrian Johnson +Date: Sun Nov 12 10:33:07 2017 +1030 + + Fix some mingw warnings + + - Include poppler-config.h for mingw PRINTF_FORMAT + - Only redefine strcasecmp for MSVC + - Recent versions of MSVC have snprintf and vsnprintf + + poppler/Error.cc | 1 + + poppler/GlobalParams.cc | 2 +- + poppler/PDFDoc.cc | 1 + + test/perf-test.cc | 15 +++------------ + 4 files changed, 6 insertions(+), 13 deletions(-) + +commit 4f687665c39da743e802fc71ba05fb5966095293 +Author: Adrian Johnson +Date: Sun Nov 12 10:33:07 2017 +1030 + + sort encoding list + + makes it easier to find encodings listed by -listenc + + utils/printencodings.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 5c394f71f03d27507db3446ad34f299393fa3621 +Author: Adrian Johnson +Date: Sun Nov 12 10:33:07 2017 +1030 + + Move UTF8.h to UnicodeMapFuncs.h and rename UCS2 to UTF16 + + UTF8.h is not exclusively UTF-8 code. Renaming to UnicodeMapFuncs.h + identifies the file as containing maps for UnicodeMap and is + consistent with the name UnicodeMapTables.h. + + The mapUCS2 code was changed to support UTF-16 in 979ef1ca without + changing the name. + + CMakeLists.txt | 2 +- + poppler/GlobalParams.cc | 4 ++-- + poppler/{UTF8.h => UnicodeMapFuncs.h} | 6 +++--- + 3 files changed, 6 insertions(+), 6 deletions(-) + +commit 9ff60568ab420e86295bfa81cef9375d7c5600b8 +Author: Thomas Zajic +Date: Tue Nov 14 22:25:37 2017 +0100 + + pdfsig: install man page + + utils/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit d63ddd1fb762e536dd78f24bd3e3ddbc3504e1eb +Author: Oliver Sander +Date: Tue Nov 14 20:05:33 2017 +0100 + + Use GfxLabColorSpace::transform only when USE_CMS is set + + The recent commit e84338a44f27afb9872cb108fc29683b35ac55f7 + introduced an unqualified use of GfxLabColorSpace::transform, + even though that member only exists if USE_CMS is set. + + Fix this by adding the appropriate preprocessor conditionals. + + poppler/GfxState.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 19909998a2f1f703c9978510ae1fc3baed84de31 +Author: Adrian Johnson +Date: Sat Nov 11 05:38:25 2017 +1030 + + glib demo: fix warning + + glib/demo/selections.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e84338a44f27afb9872cb108fc29683b35ac55f7 +Author: Albert Astals Cid +Date: Mon Nov 13 00:37:00 2017 +0100 + + GfxLabColorSpace::parse: Fix crash in broken documents + + Bug #103582 + + poppler/GfxState.cc | 28 ++++++++++++++++++---------- + 1 file changed, 18 insertions(+), 10 deletions(-) + +commit fea27db14358c8342c9f5bdbe6cb3bff02cebc2b +Author: Albert Astals Cid +Date: Sun Nov 12 19:54:52 2017 +0100 + + Fix leak if parseDA fails + + poppler/Form.cc | 1 + + 1 file changed, 1 insertion(+) + +commit faeb48920d64a776911a259bcf1bb6231ac1d24c +Author: Albert Astals Cid +Date: Sun Nov 12 19:14:32 2017 +0100 + + 0.61.1 + + CMakeLists.txt | 2 +- + NEWS | 11 +++++++++++ + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 15 insertions(+), 4 deletions(-) + +commit 155597a09b2c7fcbd0eea2b5a2021a5b65476e4c +Author: Jeroen Ooms +Date: Sat Nov 4 05:33:09 2017 -0700 + + Fix for corrupted image files on Windows + + Bug #102494 + + cpp/poppler-image.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c45efa2d7e0db8a4ace0e8c6955b3fa48dc6d070 +Author: Adam Sampson +Date: Sun Nov 5 11:45:00 2017 +0000 + + Fix incorrect paths in .pc files. + + The change in 67c3878ef10449b241c37d1022e2518029860335 used the + CMAKE_INSTALL_x variables instead of CMAKE_INSTALL_FULL_x; the former + contain things like "include" instead of full paths, so the resulting + .pc files break packages that depend on poppler. Use the latter. + + Also fix a missing @ in the qt5 file. + + Bug #103578 + + poppler-cairo.pc.cmake | 4 ++-- + poppler-cpp.pc.cmake | 4 ++-- + poppler-glib.pc.cmake | 4 ++-- + poppler-qt4.pc.cmake | 4 ++-- + poppler-qt5.pc.cmake | 4 ++-- + poppler-splash.pc.cmake | 4 ++-- + poppler.pc.cmake | 4 ++-- + 7 files changed, 14 insertions(+), 14 deletions(-) + +commit 7ccedf2b082e4d46257fb247e1f6e1197d66eead +Author: Adrian Johnson +Date: Wed Nov 8 21:07:45 2017 +1030 + + cairo: don't overflow y * stride when accessing image data + + poppler/CairoOutputDev.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 6ae4293fce77290f4fbdc643c999809d5924bf2c +Author: Roland Hieber +Date: Wed Nov 8 08:22:01 2017 +0100 + + CMake: add the custom buildtests target only once + + Make BUILDTESTS_ADDED a global property, so the `buildtests` target + gets added only once. As far as I understood, this seems to fulfil + the requirements of CMP0002. + + Bug #103003 + + cmake/modules/PopplerMacros.cmake | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit aaa9c5308766a88d0512b87051d7c7082f152a9f +Author: Albert Astals Cid +Date: Fri Nov 3 11:25:02 2017 +0100 + + Poppler 0.61 + + CMakeLists.txt | 6 +++--- + NEWS | 20 ++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 26 insertions(+), 6 deletions(-) + +commit 79b704b4017cf66dc3c39b49425c8b02760e5165 +Author: Albert Astals Cid +Date: Fri Nov 3 11:14:10 2017 +0100 + + Update (C) for commits since last release + + fofi/FoFiTrueType.cc | 2 +- + goo/FixedPoint.cc | 14 ++++++++++++++ + goo/FixedPoint.h | 15 +++++++++++++++ + goo/GooMutex.h | 1 + + goo/GooString.cc | 2 +- + goo/GooString.h | 1 + + goo/gfile.cc | 2 +- + goo/gfile.h | 2 +- + goo/glibc.h | 2 +- + goo/glibc_strtok_r.cc | 1 + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 2 +- + poppler/Array.cc | 1 + + poppler/Array.h | 1 + + poppler/CMap.cc | 1 + + poppler/CMap.h | 2 +- + poppler/CairoFontEngine.cc | 2 +- + poppler/CairoFontEngine.h | 2 +- + poppler/CairoRescaleBox.cc | 2 +- + poppler/Catalog.cc | 2 +- + poppler/Catalog.h | 2 +- + poppler/CharCodeToUnicode.cc | 2 +- + poppler/CharCodeToUnicode.h | 1 + + poppler/DCTStream.cc | 1 + + poppler/Decrypt.cc | 2 +- + poppler/Dict.cc | 1 + + poppler/Dict.h | 1 + + poppler/FlateEncoder.cc | 1 + + poppler/FlateStream.cc | 1 + + poppler/GlobalParams.cc | 2 +- + poppler/GlobalParams.h | 2 +- + poppler/GlobalParamsWin.cc | 2 +- + poppler/Object.h | 2 +- + poppler/OutputDev.cc | 2 +- + poppler/OutputDev.h | 2 +- + poppler/PDFDoc.cc | 2 +- + poppler/PDFDoc.h | 2 +- + poppler/PDFDocFactory.cc | 1 + + poppler/PSOutputDev.cc | 2 +- + poppler/PSOutputDev.h | 2 +- + poppler/Page.cc | 2 +- + poppler/Page.h | 2 +- + poppler/SplashOutputDev.cc | 2 +- + poppler/SplashOutputDev.h | 2 +- + poppler/StructTreeRoot.cc | 1 + + poppler/TextOutputDev.cc | 2 +- + poppler/TextOutputDev.h | 2 +- + poppler/UnicodeMap.cc | 1 + + poppler/UnicodeMap.h | 14 ++++++++++++++ + poppler/XRef.cc | 2 +- + poppler/XRef.h | 2 +- + poppler/poppler-config.h.cmake | 1 + + qt4/src/ArthurOutputDev.cc | 1 + + qt4/src/poppler-document.cc | 1 + + qt4/src/poppler-page.cc | 1 + + qt5/src/ArthurOutputDev.cc | 1 + + qt5/src/poppler-document.cc | 1 + + qt5/src/poppler-page.cc | 1 + + splash/Splash.cc | 2 +- + splash/Splash.h | 2 +- + splash/SplashFTFont.cc | 1 + + splash/SplashFTFont.h | 1 + + splash/SplashFTFontEngine.cc | 1 + + splash/SplashFTFontEngine.h | 1 + + splash/SplashFTFontFile.cc | 2 +- + splash/SplashFTFontFile.h | 1 + + splash/SplashFontEngine.cc | 1 + + splash/SplashFontEngine.h | 1 + + splash/SplashMath.h | 1 + + splash/SplashState.cc | 1 + + splash/SplashState.h | 1 + + splash/SplashTypes.h | 1 + + splash/SplashXPath.cc | 1 + + utils/pdfimages.cc | 2 +- + utils/pdftocairo-win32.cc | 2 +- + utils/pdftoppm.cc | 2 +- + utils/pdftops.cc | 2 +- + 77 files changed, 117 insertions(+), 40 deletions(-) + +commit b8b6a7c9240d1b98e79463ea93245127ac56e764 +Author: Sandro Mani +Date: Fri Nov 3 10:37:25 2017 +0100 + + mingw: change library names to include the soversion + + Bug #103157 + + CMakeLists.txt | 4 ++++ + cpp/CMakeLists.txt | 4 ++++ + glib/CMakeLists.txt | 4 ++++ + qt4/src/CMakeLists.txt | 4 ++++ + qt5/src/CMakeLists.txt | 4 ++++ + 5 files changed, 20 insertions(+) + +commit f6ad64878d91cbd0c19531c7ff669af0e0fa0912 +Author: Sandro Mani +Date: Tue Oct 31 00:24:11 2017 +0100 + + Install pkg-config files also on mingw + + cmake/modules/PopplerMacros.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 67c3878ef10449b241c37d1022e2518029860335 +Author: Emilio Pozuelo Monfort +Date: Tue Oct 31 00:20:29 2017 +0100 + + cmake: support GNUInstallDirs + + This allows users to set various install directories, e.g. + libdir, includedir, mandir... + + Bug #103211 + + CMakeLists.txt | 21 ++++++++++----------- + cmake/modules/GObjectIntrospectionMacros.cmake | 4 ++-- + cpp/CMakeLists.txt | 2 +- + glib/CMakeLists.txt | 2 +- + glib/reference/CMakeLists.txt | 2 +- + poppler-cairo.pc.cmake | 5 ++--- + poppler-cpp.pc.cmake | 5 ++--- + poppler-glib.pc.cmake | 5 ++--- + poppler-qt4.pc.cmake | 5 ++--- + poppler-qt5.pc.cmake | 5 ++--- + poppler-splash.pc.cmake | 5 ++--- + poppler.pc.cmake | 5 ++--- + qt4/src/CMakeLists.txt | 2 +- + qt5/src/CMakeLists.txt | 2 +- + utils/CMakeLists.txt | 22 + +++++++++++----------- + 15 files changed, 42 insertions(+), 50 deletions(-) + +commit 4d109589e5d2ac989d4fd7ac318ddf976f3106ed +Author: Oliver Sander +Date: Sun Oct 29 20:28:52 2017 +0100 + + Fix leak in ArthurOutputDev::updateFont + + Bug #103508 + + qt5/src/ArthurOutputDev.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit b9ae2fd75c147988653093d0ecbf66188d81f8fc +Author: Adrian Johnson +Date: Sun Oct 22 18:29:31 2017 +1030 + + glib demo: correct the previous warnings fix + + Bug 103050 + + glib/demo/utils.c | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +commit d72f0383b959d8495a452d2d32377e588b15ad65 +Author: Kay Dohmann +Date: Mon Oct 23 23:31:13 2017 +0200 + + Tweak LZWStream::processNextCode + + Fixes file attached at bug 103174 and doesn't seem to cause any + regression in the files we have around + + Bug #103174 + + poppler/Stream.cc | 16 +++++++--------- + 1 file changed, 7 insertions(+), 9 deletions(-) + +commit e0926ca8a94bafa6d5bfd694064c5e30da2b79db +Author: Oliver Sander +Date: Thu Oct 5 18:32:40 2017 +0200 + + Properly implement saveState / restoreState + + Not all of the internal state was actually saved/restored in + those methods, which lead to inconsistencies between the + ArthurOutputDev state and the GfxState object. + + Bug #103118 + + qt5/src/ArthurOutputDev.cc | 14 ++++++++++++++ + qt5/src/ArthurOutputDev.h | 9 +++++++++ + 2 files changed, 23 insertions(+) + +commit ebf6d1ca736fecad49fbf543875c794770bd4d57 +Author: Oliver Sander +Date: Fri Sep 15 11:18:58 2017 +0200 + + Clean up the remaining Splash code in Arthur backend + + - remove some goto-style error handling + - use nullptr + - use std::unique_ptr (fixes a leak) + - remove unused data member m_currentFont + - remove some unused forward declarations + + Bug #103117 + + qt5/src/ArthurOutputDev.cc | 48 + +++++++++++++++++----------------------------- + qt5/src/ArthurOutputDev.h | 4 ---- + 2 files changed, 18 insertions(+), 34 deletions(-) + +commit 0a8174945379142348ce1006ce88cb1a75c01c96 +Author: Albert Astals Cid +Date: Sun Oct 22 12:45:05 2017 +0200 + + isfinite -> std::isfinite + + Fixes build on the travis CI + + poppler/SplashOutputDev.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 9c7b557da043c897292219a16f419ba9650e6dfc +Author: Adrian Johnson +Date: Mon Oct 2 20:22:02 2017 +1030 + + Fix mingw warnings + + poppler/Annot.cc | 6 +++--- + poppler/DCTStream.cc | 6 ++++-- + poppler/GlobalParams.cc | 29 +++++++++++++++++------------ + poppler/XRef.cc | 1 + + poppler/poppler-config.h.cmake | 3 +-- + 5 files changed, 26 insertions(+), 19 deletions(-) + +commit 69414f14f60c49f9e0a8243603c6330fa3d11837 +Author: Adrian Johnson +Date: Mon Oct 2 18:40:58 2017 +1030 + + mingw build fix - use win32 threads + + The cmake FindThreads detects both win32 and pthreads on mingw. + It also attempts a TryRun test for pthreads which won't work with + a cross compile. + + CMakeLists.txt | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit ecd2b7bf71b110b0e245e2866a13f2c0a901921f +Author: Adrian Johnson +Date: Mon Oct 2 17:03:19 2017 +1030 + + Remove VC7 workaround + + VC7 (2002) does not support C++11 + + poppler/Gfx.cc | 8 -------- + 1 file changed, 8 deletions(-) + +commit 6e3e639c632f8527f9dc75061605e4a55f2faae9 +Author: Adrian Johnson +Date: Mon Oct 2 16:59:31 2017 +1030 + + Use for isfinite() + + poppler/SplashOutputDev.cc | 21 +-------------------- + 1 file changed, 1 insertion(+), 20 deletions(-) + +commit f9cef28b504445c7976baa0a51676204f95397fc +Author: Adrian Johnson +Date: Mon Oct 2 15:13:42 2017 +1030 + + c++11 has long long + + fofi/FoFiTrueType.cc | 1 + + fofi/FoFiType1.cc | 1 + + goo/GooString.cc | 36 ------------------------------------ + goo/GooString.h | 13 ------------- + poppler/Object.h | 1 + + poppler/PDFDoc.cc | 1 + + 6 files changed, 4 insertions(+), 49 deletions(-) + +commit 4f2bd307711f792f8caf93a560444e17bd98611a +Author: Adrian Johnson +Date: Mon Oct 2 13:45:38 2017 +1030 + + Remove fmax/fmin from poppler-config.h + + C++11 has fmax/fmin in so use it and remove the #ifdefs + for MSVC. + + poppler/TextOutputDev.cc | 2 +- + poppler/poppler-config.h.cmake | 6 ------ + 2 files changed, 1 insertion(+), 7 deletions(-) + +commit 555e2ea6b6f80a6f79eeaa44a39c24dc8461e78c +Author: Adrian Johnson +Date: Mon Oct 2 13:33:07 2017 +1030 + + Move strtok_r to goo/glibc + + Move strtok_r out of poppler-config.h as it is not used in any + header files + + Move strtok_r.cpp to goo/glibc_strtok_r.cc to keep it with the + other emulated + glibc functions. But keep it in a separate file due to the different + license. + + CMakeLists.txt | 2 +- + ConfigureChecks.cmake | 1 + + config.h.cmake | 3 +++ + goo/glibc.h | 4 ++++ + poppler/strtok_r.cpp => goo/glibc_strtok_r.cc | 4 +++- + poppler/poppler-config.h.cmake | 8 -------- + 6 files changed, 12 insertions(+), 10 deletions(-) + +commit 2ca32d2cfc57626bbc833d4981c7d0a071ccc985 +Author: Adrian Johnson +Date: Mon Oct 2 13:18:12 2017 +1030 + + move/remove macros from poppler-config.h that don't need to be there + + popen/pclose are not used in any .h files - move to config.h + + POPEN_READ_MODE is not used - remove + + config.h.cmake | 8 ++++++++ + poppler/poppler-config.h.cmake | 15 --------------- + 2 files changed, 8 insertions(+), 15 deletions(-) + +commit bf3931016614c434f7229e00bb75e3b113803d04 +Author: Adrian Johnson +Date: Mon Oct 2 12:55:41 2017 +1030 + + Remove unused HAVE_ZLIB_H/HAVE_LIBZ macros + + CMakeLists.txt | 3 --- + config.h.cmake | 3 --- + 2 files changed, 6 deletions(-) + +commit 82e7f4bad79d122fe8cf16be54901d1f1668ca37 +Author: Adrian Johnson +Date: Mon Oct 2 12:05:10 2017 +1030 + + Make poppler compile if threads not available + + CMakeLists.txt | 5 ++++- + goo/GooMutex.h | 6 +++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +commit 350b905537f59323a6b9a854cf019e8e95940bd6 +Author: Adrian Johnson +Date: Mon Oct 2 11:36:42 2017 +1030 + + Use -pthread flag instead of -lpthread + + The -pthread flag should be used for compiling with threads as it sets + flags for both the preprocessor and linker. + + In cmake this is achieved with the set(THREADS_PREFER_PTHREAD_FLAG + TRUE) + before find_package(Threads) and using the Threads::Threads import + target. + + Also added set(CMAKE_THREAD_PREFER_PTHREAD TRUE) as we only support + pthread on non windows platforms. + + CMakeLists.txt | 11 +++++------ + glib/CMakeLists.txt | 4 ++-- + utils/CMakeLists.txt | 4 ++-- + 3 files changed, 9 insertions(+), 10 deletions(-) + +commit e01e6db4e0643b7b318a3d7dc49442bb2d6ade00 +Author: Adrian Johnson +Date: Sun Oct 1 20:51:13 2017 +1030 + + HAVE_PTHREAD is not used + + config.h.cmake | 3 --- + 1 file changed, 3 deletions(-) + +commit 36010177e9c168d110c44407512c93b49a9cf95c +Author: Adrian Johnson +Date: Sun Oct 1 19:28:13 2017 +1030 + + Remove unused macros + + The jpeg.h HAVE_BOOLEAN is only required if the application defines + type 'boolean' to prevent jpeg.h from redefining it. + + ConfigureChecks.cmake | 6 ------ + config.h.cmake | 36 ------------------------------------ + 2 files changed, 42 deletions(-) + +commit 6658754b9b8dfd1ba692da2681d95e21e9c1c2d4 +Author: Adrian Johnson +Date: Sun Oct 1 19:09:28 2017 +1030 + + We always have config.h so drop the macro + + CMakeLists.txt | 1 - + poppler/CairoRescaleBox.cc | 2 -- + 2 files changed, 3 deletions(-) + +commit 7b0d736ccd5d3e1327684d21d6afbe2dec01188f +Author: Adrian Johnson +Date: Sun Oct 1 19:04:39 2017 +1030 + + c++11 has so we can drop the stdint.h checks and emulation + + ConfigureChecks.cmake | 1 - + config.h.cmake | 3 --- + goo/gtypes_p.h | 30 ------------------------------ + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoRescaleBox.cc | 2 +- + poppler/Decrypt.cc | 2 +- + utils/pdftocairo-win32.h | 2 +- + utils/pdftocairo.cc | 2 +- + 8 files changed, 5 insertions(+), 39 deletions(-) + +commit 465edbbffcc94f9af9fac7606086a28362f92d09 +Author: Adrian Johnson +Date: Sun Oct 1 18:48:07 2017 +1030 + + Fix remaining -Wundef warnings + + and make -Wundef a default warning + + cmake/modules/PopplerMacros.cmake | 2 +- + goo/FixedPoint.h | 2 +- + goo/TiffWriter.cc | 2 +- + goo/gfile.cc | 20 ++++++++--------- + goo/gfile.h | 10 ++++----- + poppler/Annot.cc | 12 +++++----- + poppler/Annot.h | 2 +- + poppler/Array.cc | 6 ++--- + poppler/Array.h | 2 +- + poppler/CMap.cc | 14 ++++++------ + poppler/CMap.h | 4 ++-- + poppler/CairoFontEngine.cc | 10 ++++----- + poppler/CairoFontEngine.h | 2 +- + poppler/Catalog.cc | 6 ++--- + poppler/Catalog.h | 2 +- + poppler/CharCodeToUnicode.cc | 16 +++++++------- + poppler/CharCodeToUnicode.h | 4 ++-- + poppler/Dict.cc | 8 +++---- + poppler/Dict.h | 2 +- + poppler/FlateStream.cc | 2 +- + poppler/Gfx.cc | 4 ++-- + poppler/GlobalParams.cc | 12 +++++----- + poppler/GlobalParams.h | 4 ++-- + poppler/GlobalParamsWin.cc | 2 +- + poppler/OutputDev.cc | 2 +- + poppler/OutputDev.h | 2 +- + poppler/PDFDoc.cc | 6 ++--- + poppler/PDFDoc.h | 2 +- + poppler/PDFDocFactory.cc | 4 ++-- + poppler/PSOutputDev.cc | 24 ++++++++++---------- + poppler/PSOutputDev.h | 8 +++---- + poppler/Page.cc | 6 ++--- + poppler/Page.h | 2 +- + poppler/Stream.cc | 8 +++---- + poppler/Stream.h | 2 +- + poppler/TextOutputDev.cc | 14 ++++++------ + poppler/TextOutputDev.h | 14 ++++++------ + poppler/UnicodeMap.cc | 16 +++++++------- + poppler/UnicodeMap.h | 4 ++-- + poppler/XRef.cc | 10 ++++----- + poppler/XRef.h | 2 +- + utils/ImageOutputDev.cc | 4 ++-- + utils/pdfimages.cc | 4 ++-- + utils/pdftocairo.cc | 46 + +++++++++++++++++++-------------------- + utils/pdftoppm.cc | 6 ++--- + utils/pdftops.cc | 6 ++--- + 46 files changed, 171 insertions(+), 171 deletions(-) + +commit b424862bf5df75db651076c780c7242eaf887479 +Author: Adrian Johnson +Date: Sun Oct 1 18:18:42 2017 +1030 + + Remove HAVE_FREETYPE macros + + Freetype is a mandatory dependency so we can drop the macros. + + CMakeLists.txt | 1 - + config.h.cmake | 3 --- + poppler/SplashOutputDev.cc | 8 -------- + poppler/poppler-config.h.cmake | 7 +------ + qt4/src/ArthurOutputDev.cc | 2 -- + qt5/src/ArthurOutputDev.cc | 2 -- + splash/SplashFTFont.cc | 4 ---- + splash/SplashFTFont.h | 4 ---- + splash/SplashFTFontEngine.cc | 4 ---- + splash/SplashFTFontEngine.h | 4 ---- + splash/SplashFTFontFile.cc | 4 ---- + splash/SplashFTFontFile.h | 4 ---- + splash/SplashFontEngine.cc | 20 -------------------- + splash/SplashFontEngine.h | 6 ------ + utils/pdftoppm.cc | 2 -- + 15 files changed, 1 insertion(+), 74 deletions(-) + +commit e0428ef002e9c8d6e2046fcdeeedcf7462367501 +Author: Adrian Johnson +Date: Sun Oct 1 18:02:15 2017 +1030 + + Remove unused t1lib code + + CMakeLists.txt | 6 - + poppler/SplashOutputDev.cc | 3 - + poppler/poppler-config.h.cmake | 2 +- + qt4/src/ArthurOutputDev.cc | 3 - + qt5/src/ArthurOutputDev.cc | 3 - + splash/SplashFontEngine.cc | 30 ---- + splash/SplashFontEngine.h | 6 - + splash/SplashT1Font.cc | 309 + ----------------------------------------- + splash/SplashT1Font.h | 69 --------- + splash/SplashT1FontEngine.cc | 138 ------------------ + splash/SplashT1FontEngine.h | 50 ------- + splash/SplashT1FontFile.cc | 134 ------------------ + splash/SplashT1FontFile.h | 70 ---------- + 13 files changed, 1 insertion(+), 822 deletions(-) + +commit 7f01a804455dcc9d87fa17b566b8bd269b2d5489 +Author: Adrian Johnson +Date: Sun Oct 1 17:31:23 2017 +1030 + + Use _WIN32 to check for windows, not WIN32 + + These should have been fixed in #24259 but must have been missed. + + goo/gfile.cc | 4 ++-- + goo/gfile.h | 2 +- + poppler/GlobalParams.cc | 4 ++-- + splash/SplashMath.h | 6 +++--- + 4 files changed, 8 insertions(+), 8 deletions(-) + +commit e38ffea64dc9c113607168e298c7ccdf8edaa61e +Author: Adrian Johnson +Date: Sun Oct 1 17:25:19 2017 +1030 + + Fix some -Wundef warnings + + goo/FixedPoint.cc | 2 +- + poppler/GlobalParams.cc | 2 +- + poppler/PSOutputDev.cc | 8 +-- + poppler/SplashOutputDev.cc | 158 + ++++++++++++++++++++++---------------------- + poppler/SplashOutputDev.h | 2 +- + qt4/src/poppler-document.cc | 2 +- + qt4/src/poppler-page.cc | 4 +- + qt5/src/poppler-document.cc | 2 +- + qt5/src/poppler-page.cc | 4 +- + splash/Splash.cc | 76 ++++++++++----------- + splash/Splash.h | 10 +-- + splash/SplashBitmap.cc | 20 +++--- + splash/SplashBitmap.h | 2 +- + splash/SplashFTFont.cc | 6 +- + splash/SplashFontEngine.h | 4 +- + splash/SplashMath.h | 42 ++++++------ + splash/SplashState.cc | 10 +-- + splash/SplashState.h | 2 +- + splash/SplashTypes.h | 16 ++--- + splash/SplashXPath.cc | 6 +- + utils/pdftoppm.cc | 12 ++-- + utils/pdftops.cc | 6 +- + 22 files changed, 198 insertions(+), 198 deletions(-) + +commit 9bb84057624c3b2f8fc5d137e70ae34efa46fe31 +Author: Adrian Johnson +Date: Sun Oct 1 13:27:10 2017 +1030 + + glib demo: fix deprecated warnings + + glib/demo/utils.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit 5d954d1c4f25447f70d949e31afeeefb70c2a8d5 +Author: Adrian Johnson +Date: Sun Oct 1 12:53:38 2017 +1030 + + Fix warning: implicit declaration of function ‘localtime_r’ + + poppler/glib/demo/utils.c:488:20: warning: implicit declaration of + function ‘localtime_r’ [-Wimplicit-function-declaration] + if (time == 0 || !localtime_r (&time, &t)) return NULL; + ^~~~~~~~~~~ + + The c files also need the -D_DEFAULT_SOURCE feature macro to enable + non standard C++11 functons. + + cmake/modules/PopplerMacros.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8ccc9efb6c5f717b8cd206a92f802c66bc0a69c7 +Author: Adrian Johnson +Date: Sun Oct 1 12:35:19 2017 +1030 + + Fix warning: comparison of unsigned expression < 0 is always false + + poppler/FlateEncoder.cc | 1 - + poppler/StructTreeRoot.cc | 4 ++-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit 88571e7877f729eec2f7a3552b0fa6cc913ae1a6 +Author: Albert Astals Cid +Date: Thu Oct 19 18:11:49 2017 +0200 + + Move setPSCenter from GlobalParams to PSOutputDev + + poppler/GlobalParams.cc | 16 ---------------- + poppler/GlobalParams.h | 3 --- + poppler/PSOutputDev.cc | 3 ++- + poppler/PSOutputDev.h | 4 +++- + utils/pdftops.cc | 8 ++++---- + 5 files changed, 9 insertions(+), 25 deletions(-) + +commit 5b8fe4ee986673f15fcf8f58409cc85e8bf7ca12 +Author: Albert Astals Cid +Date: Thu Oct 19 17:49:06 2017 +0200 + + Remove various never called internal setters from GlobalParams.h + + TextKeepTinyChars: false, simplify if in TextOutputDev + DisableFreeTypeHinting: didn't actually have a getter :D + StrokeAdjust: true, adjust the code in Cairo/SplashOutputDev to + use gTrue + ScreenType: unset, simplify switch in SplashOutputDev + ScreenSize: -1, simplify code in SplashOutputDev + ScreenDotRadius: -1, simplify code in SplashOutputDev + ScreenGamma: 1.0, simplify code in SplashOutputDev + ScreenBlackThreshold: 0.0, simplify code in SplashOutputDev + ScreenWhiteThreshold: 1.0, simplify code in SplashOutputDev + MinLineWidth: 0.0, define it as static const in SplashOutputDev + since was used in various places + MapNumericCharNames: true, remove GfxFont.cc if guard + MapUnknownCharNames: true, remove GfxFont.cc if guard + + poppler/CairoOutputDev.cc | 2 +- + poppler/GfxFont.cc | 94 +++++++++++----------- + poppler/GlobalParams.cc | 193 + --------------------------------------------- + poppler/GlobalParams.h | 44 ----------- + poppler/SplashOutputDev.cc | 66 +++++----------- + poppler/TextOutputDev.cc | 3 +- + 6 files changed, 68 insertions(+), 334 deletions(-) + +commit 19ebd40547186a8ea6da08c8d8e2a6d6b7e84f5d +Author: Albert Astals Cid +Date: Fri Oct 13 00:55:49 2017 +0200 + + CairoOutputDev: Fix crash in broken files + + Bug #103016 + + poppler/CairoOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 7ee9dadef37b20bca707a6b1e858e17d191e368b +Author: Jason Crain +Date: Thu Oct 5 15:32:13 2017 -0500 + + TextOutputDev: Fix crash in fuzzed file + + This file crashes pdftotext because it positions texts past INT_MIN, + leading to overflow in subsequent calculations. + + Bug #103116 + + poppler/TextOutputDev.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 369cd504e70e55378c6395355056fa8676679e56 +Author: David Tardon +Date: Fri Oct 6 08:07:35 2017 +0200 + + do not install Function.cc, as it's not a header + + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +commit f09a9923bb65755e183694c5f1be6af4a50e96e6 +Author: Albert Astals Cid +Date: Thu Oct 5 19:15:44 2017 +0200 + + Poppler 0.60.1 + + CMakeLists.txt | 2 +- + NEWS | 7 +++++++ + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 11 insertions(+), 4 deletions(-) + +commit e816c7a47caa0c3f5261d467333f8c2eb6a2ad51 +Author: Albert Astals Cid +Date: Thu Oct 5 18:51:49 2017 +0200 + + FindLIBOPENJPEG.cmake: Add CheckCXXSourceCompiles + + Since we use check_cxx_source_compiles + + cmake/modules/FindLIBOPENJPEG.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +commit f538b74a38acb53b877e000a64647ce8043133ac +Author: Oliver Sander +Date: Tue Oct 3 00:04:17 2017 +0200 + + qt5: ArthurOutputDev: Add missing 'return' in error paths + + qt5/src/ArthurOutputDev.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit c2ba8fd8cf51af48a9e789d29e9fd5512d1688e3 +Author: Albert Astals Cid +Date: Mon Oct 2 23:46:49 2017 +0200 + + Poppler 0.60.0 + + CMakeLists.txt | 4 ++-- + NEWS | 28 ++++++++++++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 34 insertions(+), 6 deletions(-) + +commit 9432e0bfc4c4f2e16b7c152aa8b04d6d19ed4898 +Author: Albert Astals Cid +Date: Mon Oct 2 23:29:21 2017 +0200 + + Add missing (C) + + cpp/poppler-private.cpp | 1 + + fofi/FoFiTrueType.cc | 2 +- + goo/GooString.cc | 2 +- + goo/GooString.h | 2 +- + goo/JpegWriter.cc | 1 + + goo/gmem.h | 2 +- + poppler/CairoOutputDev.cc | 2 +- + poppler/CurlPDFDocBuilder.cc | 2 +- + poppler/Decrypt.cc | 2 +- + poppler/GfxState.h | 2 +- + poppler/GlobalParams.cc | 2 +- + poppler/PSOutputDev.cc | 2 +- + poppler/PSOutputDev.h | 2 +- + poppler/UnicodeMap.cc | 1 + + qt4/src/poppler-link.cc | 2 +- + qt4/src/poppler-private.cc | 2 +- + qt5/src/poppler-link.cc | 2 +- + qt5/src/poppler-private.cc | 2 +- + qt5/src/poppler-qt5.h | 1 + + splash/Splash.cc | 2 +- + splash/SplashFTFontFile.cc | 1 + + splash/SplashFTFontFile.h | 1 + + utils/pdfseparate.cc | 2 +- + 23 files changed, 23 insertions(+), 17 deletions(-) + +commit da02d7c683f1788d38cccb3716edd1ba011cb94c +Author: Albert Astals Cid +Date: Mon Oct 2 23:05:59 2017 +0200 + + remove m4 gtk-doc.make and add comments to poppler-features.h.cmake + + glib/poppler-features.h.cmake | 55 ++++++++ + gtk-doc.make | 305 + ---------------------------------------- + m4/.gitignore | 5 - + m4/ax_pthread.m4 | 317 + ------------------------------------------ + m4/define-dir.m4 | 34 ----- + m4/gtk-doc.m4 | 88 ------------ + m4/iconv.m4 | 180 ------------------------ + m4/introspection.m4 | 94 ------------- + m4/libjpeg.m4 | 114 --------------- + 9 files changed, 55 insertions(+), 1137 deletions(-) + +commit f871b82edfd632f79ec7bdd0b4d560cd348d8b1a +Author: Oliver Sander +Date: Fri Sep 8 23:27:45 2017 +0200 + + qt5: ArthurOutputDev: Fix several small bugs related to dash pattern + handling + + qt5/src/ArthurOutputDev.cc | 21 ++++++++++++++++++++- + 1 file changed, 20 insertions(+), 1 deletion(-) + +commit 3ec5e86ca000653525650a99755c85e512a04bdc +Author: Oliver Sander +Date: Fri Sep 29 21:24:23 2017 +0200 + + qt5: ArthurOutputDev: Implement the drawSoftMaskedImage method + + qt5/src/ArthurOutputDev.cc | 67 + ++++++++++++++++++++++++++++++++++++++++++++++ + qt5/src/ArthurOutputDev.h | 9 +++++++ + 2 files changed, 76 insertions(+) + +commit 376ae2f8b8a92fd7bd751fbfcd0aa46530b59ca4 +Author: Albert Astals Cid +Date: Sat Sep 30 11:27:44 2017 +0200 + + Remove the gir-girs target + + It depends on the same files (subset) as the gir-typelibs target + meaning that sometimes when doing a parallel build you'd get the + two commands trying to generate the same file at once and bad + things happen + + cmake/modules/GObjectIntrospectionMacros.cmake | 1 - + 1 file changed, 1 deletion(-) + +commit 19eedc6fb693a62f305e13079501e3105f869f3c +Author: Albert Astals Cid +Date: Sat Sep 30 11:12:31 2017 +0200 + + Fix crash in broken files + + Bug #103045 + + fofi/FoFiTrueType.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5df4a8b0ad56b11c9be3b362e33810c5af57952b +Author: Albert Astals Cid +Date: Tue Sep 26 23:49:41 2017 +0200 + + Enable libcurl support by default + + CMakeLists.txt | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 2c92c7b6a828c9db8a38f079ea7a3d51c12a481d +Author: Albert Astals Cid +Date: Mon Sep 25 19:33:44 2017 +0200 + + Fix infinite recursion on broken files + + Bug #102969 + + poppler/Gfx.cc | 46 ++++++++++++++++++++++++++++++++++------------ + poppler/GfxState.cc | 33 ++++++++++++++++++--------------- + poppler/GfxState.h | 15 +++++++++------ + 3 files changed, 61 insertions(+), 33 deletions(-) + +commit d3f12611b30e6421f05603a9838ed9131b1aa61e +Author: Bernd Kuhls +Date: Sun Sep 24 23:56:29 2017 +0200 + + include ctype.h for isdigit + + Bug #102951 + + poppler/Form.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit a1a4be92323ae45f1ecc16595438520309554eb0 +Author: Carlos Garcia Campos +Date: Sun Sep 24 13:21:58 2017 +0200 + + cairo: do not use the custom downscaling for rendering images when + using cairo >= 1.14 + + poppler/CairoOutputDev.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 3b64fc488e7ff10634aa2dd76ad4f152ebfe7edc +Author: Carlos Garcia Campos +Date: Sun Sep 24 12:39:06 2017 +0200 + + regtest: change default value of utils dir to ../build/utils + + regtest/main.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit deba5f3c57929a96105d822c8cba46e5334694c7 +Author: Carlos Garcia Campos +Date: Sun Sep 24 12:31:43 2017 +0200 + + cairo: Do not extend the pattern in drawImageMaskRegular + + This is causing some documents with tiling patterns to take ages + to render, + since we switched to use drawImageMaskRegular in 00a536a4. This patch + applies the same changes made in 7d8dfb09 and db87dc7f for + drawImageMaskPrescaled to drawImageMaskRegular. + + poppler/CairoOutputDev.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit cceb80b353ca748d1e04373d238195fd548319b8 +Author: Carlos Garcia Campos +Date: Sun Sep 24 08:24:44 2017 +0200 + + glib: Make g-ir-scanner always link to the libs in build directory + + It was using the installed libraries, causing a build failure when + there's new API added to the poppler core. + + glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2afde7084ab55893182c2da59c429b48eb5d5a35 +Author: Albert Astals Cid +Date: Fri Sep 22 18:18:54 2017 +0200 + + Remove GlobalParams::splashResolution + + Noone was setting or getting the variable + + poppler/GlobalParams.h | 1 - + 1 file changed, 1 deletion(-) + +commit df783c5d10490e94e911316a6f42bb2d91a22dea +Author: Albert Astals Cid +Date: Fri Sep 22 18:18:50 2017 +0200 + + Add a const to the static structure + + poppler/GlobalParamsWin.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a309cbfdd831b37461284b95763ca5a872e6af2b +Author: Albert Astals Cid +Date: Fri Sep 22 18:18:46 2017 +0200 + + Remove GlobalParams::setPSFile + + It had a setter but not a getter so wasn't used for anything + + poppler/GlobalParams.cc | 13 ------------- + poppler/GlobalParams.h | 2 -- + 2 files changed, 15 deletions(-) + +commit 7af5f7cadbdb89e0eaab148940c2c65cb12cc6d6 +Author: Albert Astals Cid +Date: Fri Sep 22 18:18:42 2017 +0200 + + Remove GlobalParams::ccFontFiles + + it was never filled so it was basically a noop + + poppler/GfxFont.cc | 10 ---------- + poppler/GlobalParams.cc | 14 -------------- + poppler/GlobalParams.h | 3 --- + 3 files changed, 27 deletions(-) + +commit b5f8be7ede64e55d44ed484797a66ca068ba955f +Author: Albert Astals Cid +Date: Fri Sep 22 18:18:39 2017 +0200 + + Remove GlobalParams::fontDirs + + It was only read but never filled so it was basically a noop + + poppler/GlobalParams.cc | 31 +------------------------------ + poppler/GlobalParams.h | 1 - + 2 files changed, 1 insertion(+), 31 deletions(-) + +commit 3463537624a24e3bdcaa42c135d337c6cd452ea5 +Author: Albert Astals Cid +Date: Fri Sep 22 18:18:22 2017 +0200 + + Remove GlobalParams::getPSResidentFont* + + There was no way to set its contents so it's basically a noop + + poppler/GfxFont.cc | 38 ---------------------- + poppler/GlobalParams.cc | 85 + ------------------------------------------------- + poppler/GlobalParams.h | 29 ----------------- + poppler/PSOutputDev.cc | 6 ---- + 4 files changed, 158 deletions(-) + +commit 851bc59c6f4b007333d064af5c6992702b92cdf6 +Author: Albert Astals Cid +Date: Thu Sep 21 20:45:52 2017 +0200 + + Remove the autotools based build system + + .gitignore | 20 +- + INSTALL | 244 ++------ + INSTALL.cmake | 76 --- + Makefile.am | 133 ----- + autogen.sh | 117 ---- + configure.ac | 1154 + -------------------------------------- + cpp/Makefile.am | 74 --- + cpp/tests/Makefile.am | 21 - + fofi/Makefile.am | 28 - + glib/Makefile.am | 122 ---- + glib/demo/Makefile.am | 56 -- + glib/poppler-features.h.in | 88 --- + glib/reference/Makefile.am | 92 --- + glib/reference/version.xml.in | 1 - + goo/Makefile.am | 69 --- + poppler-cairo-uninstalled.pc.in | 6 - + poppler-cairo.pc.in | 9 - + poppler-cpp-uninstalled.pc.in | 7 - + poppler-cpp.pc.in | 13 - + poppler-glib-uninstalled.pc.in | 7 - + poppler-glib.pc.in | 13 - + poppler-qt4-uninstalled.pc.in | 7 - + poppler-qt4.pc.in | 13 - + poppler-qt5-uninstalled.pc.in | 7 - + poppler-qt5.pc.in | 13 - + poppler-splash-uninstalled.pc.in | 7 - + poppler-splash.pc.in | 9 - + poppler-uninstalled.pc.in | 6 - + poppler.pc.in | 11 - + poppler/Makefile.am | 348 ------------ + poppler/poppler-config.h.in | 196 ------- + qt4/Makefile.am | 1 - + qt4/demos/Makefile.am | 65 --- + qt4/src/Makefile.am | 76 --- + qt4/tests/Makefile.am | 141 ----- + qt5/Makefile.am | 1 - + qt5/demos/Makefile.am | 65 --- + qt5/src/Makefile.am | 78 --- + qt5/tests/Makefile.am | 141 ----- + splash/Makefile.am | 73 --- + test/Makefile.am | 67 --- + utils/Makefile.am | 155 ----- + 42 files changed, 43 insertions(+), 3787 deletions(-) + +commit 1a33f60da2996ea64c1b903580885697940cf046 +Author: Albert Astals Cid +Date: Thu Sep 21 20:32:25 2017 +0200 + + Add some constness to the basic classes + + goo/GooString.cc | 2 +- + goo/GooString.h | 2 +- + poppler/Array.cc | 8 +-- + poppler/Array.h | 12 ++--- + poppler/Dict.cc | 18 +++---- + poppler/Dict.h | 26 +++++----- + poppler/Object.cc | 4 +- + poppler/Object.h | 152 + +++++++++++++++++++++++++++--------------------------- + 8 files changed, 112 insertions(+), 112 deletions(-) + +commit 135843fa8398364e0559c2b0b96f9be4a44572c5 +Author: Carlos Garcia Campos +Date: Wed Sep 20 19:38:14 2017 +0200 + + Add gtk-doc support to CMake build + + CMakeLists.txt | 4 +- + glib/CMakeLists.txt | 4 + + glib/reference/CMakeLists.txt | 12 ++ + gtkdoc.py | 440 + ++++++++++++++++++++++++++++++++++++++++++ + make-glib-api-docs | 66 +++++++ + 5 files changed, 525 insertions(+), 1 deletion(-) + +commit e51db61a33cdbe6307f048b65912a85f6cd1ec5b +Author: William Bader +Date: Wed Sep 20 19:36:46 2017 +0200 + + PSOutputDev: Fix wrong text generation + + This patch moves the code to update the max valid glyph hash into its + own function and updates the max valid glyph only if the new value is + higher than the previous value. + This fixes a problem with pages that have multiple copies of the same + font with different glyph counts. If poppler processed the font + with the + smaller count last, and then the PDF wrote text in the font with the + larger count, pdftops would not show the glyphs above the maximum + of the + smaller font. + + Bug #102760 + + poppler/PSOutputDev.cc | 16 ++++++++++------ + poppler/PSOutputDev.h | 1 + + 2 files changed, 11 insertions(+), 6 deletions(-) + +commit 6665839b5ce2e4f6fb2acc682ce2f91ed2404ce8 +Author: Albert Astals Cid +Date: Wed Sep 20 19:36:29 2017 +0200 + + qt5: The tests don't need GUI + + qt5/tests/check_actualtext.cpp | 2 +- + qt5/tests/check_attachments.cpp | 2 +- + qt5/tests/check_dateConversion.cpp | 2 +- + qt5/tests/check_fonts.cpp | 2 +- + qt5/tests/check_goostring.cpp | 2 +- + qt5/tests/check_lexer.cpp | 2 +- + qt5/tests/check_links.cpp | 2 +- + qt5/tests/check_metadata.cpp | 2 +- + qt5/tests/check_optcontent.cpp | 2 +- + qt5/tests/check_pagelabelinfo.cpp | 2 +- + qt5/tests/check_pagelayout.cpp | 2 +- + qt5/tests/check_pagemode.cpp | 2 +- + qt5/tests/check_password.cpp | 2 +- + qt5/tests/check_permissions.cpp | 2 +- + qt5/tests/check_search.cpp | 2 +- + qt5/tests/check_strings.cpp | 2 +- + 16 files changed, 16 insertions(+), 16 deletions(-) + +commit 26a067d4a84f80eeb892e30a5ab608d0fbea1de5 +Author: Albert Astals Cid +Date: Wed Sep 20 10:36:04 2017 +0200 + + Remove the moc includes + + Some people are having trouble with them and automoc really should + be taking care of this so no need to have the include. Let's hope this + doesn't break some other people :D + + qt5/demos/abstractinfodock.cpp | 1 - + qt5/demos/embeddedfiles.cpp | 1 - + qt5/demos/fonts.cpp | 1 - + qt5/demos/info.cpp | 1 - + qt5/demos/metadata.cpp | 1 - + qt5/demos/navigationtoolbar.cpp | 1 - + qt5/demos/optcontent.cpp | 1 - + qt5/demos/pageview.cpp | 1 - + qt5/demos/permissions.cpp | 1 - + qt5/demos/thumbnails.cpp | 1 - + qt5/demos/toc.cpp | 1 - + qt5/demos/viewer.cpp | 1 - + qt5/src/poppler-optcontent.cc | 1 - + 13 files changed, 13 deletions(-) + +commit 939465c40902d72e0c05d4f3a27ee67e4a007ed7 +Author: Albert Astals Cid +Date: Tue Sep 19 21:19:03 2017 +0200 + + Fix crash in broken files + + Bug #102854 + + poppler/Stream.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit a8aa61f774503c9ebd840e148c4fa31a6959600d +Author: Albert Astals Cid +Date: Tue Sep 19 21:17:49 2017 +0200 + + autotools: Fix build + + qt5/src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6b82904b717994c887f33bfc72e4999363fc8e72 +Author: Albert Astals Cid +Date: Sun Sep 17 23:03:48 2017 +0200 + + Fix printf-like format warnings + + poppler/Stream.h | 2 +- + test/perf-test.cc | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit b26924e32128b7ba57260e9fdc54be1893bcff77 +Author: Albert Astals Cid +Date: Sun Sep 17 02:06:32 2017 +0200 + + A few more static markers + + test/perf-test.cc | 2 +- + utils/pdftocairo-win32.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 4a4e291246f238731429729e10633ee1f627eb77 +Author: Albert Astals Cid +Date: Sun Sep 17 01:58:36 2017 +0200 + + Make newer gcc happy about fallthrough + + on HtmlOutputDev.cc fixes a leak when printHtml is false + + fofi/FoFiTrueType.cc | 2 ++ + poppler/Annot.cc | 4 ++-- + poppler/SplashOutputDev.cc | 8 ++++++++ + splash/Splash.cc | 2 ++ + utils/HtmlOutputDev.cc | 9 ++++----- + 5 files changed, 18 insertions(+), 7 deletions(-) + +commit 0790dd3afb8370aebca8e7e154bbd2b5ae5cd5a2 +Author: Albert Astals Cid +Date: Sat Sep 16 18:01:49 2017 +0200 + + Fix missing-declarations warnings + + ... and add it to default warning set + + cmake/modules/PopplerMacros.cmake | 2 +- + cpp/tests/poppler-dump.cpp | 2 +- + glib/poppler-action.cc | 1 + + goo/JpegWriter.cc | 2 +- + goo/gmem.h | 2 +- + poppler/Annot.cc | 6 ++-- + poppler/Decrypt.cc | 2 +- + poppler/TextOutputDev.cc | 2 +- + qt4/src/poppler-link.cc | 2 +- + qt4/src/poppler-private.cc | 6 ++-- + qt4/tests/check_links.cpp | 4 +-- + qt4/tests/poppler-forms.cpp | 14 ++++----- + qt5/src/poppler-link.cc | 2 +- + qt5/src/poppler-private.cc | 6 ++-- + qt5/tests/check_links.cpp | 4 +-- + qt5/tests/poppler-forms.cpp | 18 ++++++------ + test/perf-test-preview-dummy.cc | 4 +++ + test/perf-test.cc | 62 + +++++++++++++++++++-------------------- + utils/pdfinfo.cc | 4 +-- + utils/pdfseparate.cc | 2 +- + utils/pdfsig.cc | 6 ++-- + utils/pdftotext.cc | 2 +- + utils/pdfunite.cc | 6 ++-- + 23 files changed, 83 insertions(+), 78 deletions(-) + +commit afd91b148d3d0ba025821740ff4c075b1de2fdc5 +Author: Albert Astals Cid +Date: Sat Sep 16 17:47:42 2017 +0200 + + Fix warning: format ‘%x’ expects argument of type ‘unsigned + int*’, but argument 3 has type ‘int*’ + + poppler/UnicodeMap.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a0ed20f3fb8025706ad9a580f6a692316bf6df66 +Author: Albert Astals Cid +Date: Sat Sep 16 17:45:42 2017 +0200 + + -Woverflow fixes + + cpp/poppler-private.cpp | 4 ++-- + glib/poppler-document.cc | 3 +-- + goo/GooString.cc | 6 ++++++ + goo/GooString.h | 1 + + poppler/Annot.cc | 9 +++------ + poppler/Form.cc | 13 +++++-------- + qt4/src/poppler-private.cc | 4 ++-- + qt5/src/poppler-private.cc | 4 ++-- + 8 files changed, 22 insertions(+), 22 deletions(-) + +commit d51cc34d7d51b6ddb7bfba318ed12bcbe763be6a +Author: Albert Astals Cid +Date: Sat Sep 16 17:35:15 2017 +0200 + + -pedantic fixes + + glib/poppler-media.cc | 2 +- + glib/poppler-movie.cc | 2 +- + glib/poppler-structure-element.cc | 2 +- + goo/glibc.h | 2 +- + poppler/StructElement.cc | 14 +++++++------- + utils/JSInfo.cc | 2 +- + 6 files changed, 12 insertions(+), 12 deletions(-) + +commit 804a823a67fedc3e633e89f817232d3c15715b56 +Author: Adrian Johnson +Date: Sat Sep 16 20:16:58 2017 +0930 + + cmake: restructure the warnings into a "default" and "extra" group + + Most of the previous warnings are now in default. Extra warnings that + should be fixed but currently result in a lot of warnings are in the + extra group. + + The old no/yes/kde COMPILE_WARNINGS option has been replaced with the + boolean option EXTRA_WARN (default off) to enable the extra warnings. + + CMakeLists.txt | 18 +++++------------- + cmake/modules/PopplerMacros.cmake | 32 ++++++++++++++++++++++++-------- + 2 files changed, 29 insertions(+), 21 deletions(-) + +commit 6d40d4bad46ce1b53624feca7410b35e4fe0048d +Author: Albert Astals Cid +Date: Fri Sep 15 01:07:59 2017 +0200 + + CurlPDFDocBuilder don't crash if given a url that doesn't exist + + poppler/CurlPDFDocBuilder.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit cc43c720e857548175a9e35b0686a1a7a8957f50 +Author: Oliver Sander +Date: Fri Aug 18 11:51:06 2017 +0200 + + Replace Splash font rendering by Qt font rendering + + Previously, the Arthur backend would use Splash code to do + its font rendering. That was not a satisfactory solution: + Qt can do font rendering directly. Also, the Splash font + rendering in the Arthur code had a few bugs, which lead + to legible-but-not-pretty fonts. + + This patch replaces the Splash font rendering by Qt font + rendering. Some Splash code will have to remain, because + Qt seems unable to do the proper charcode-to-glyph-index + transformations. + + I took a lot of inspiration from Mihai Niculescu's patch at + + https://lists.freedesktop.org/archives/poppler/2013-June/010370.html + + That's why the patch adds Mihai's name in the copyright list. + + qt5/src/ArthurOutputDev.cc | 254 + +++++++++++++++++++++++++-------------------- + qt5/src/ArthurOutputDev.h | 31 +++++- + splash/SplashFTFontFile.cc | 4 + + splash/SplashFTFontFile.h | 3 + + 4 files changed, 177 insertions(+), 115 deletions(-) + +commit da63c35549e8852a410946ab016a3f25ac701bdf +Author: Albert Astals Cid +Date: Thu Sep 14 19:14:41 2017 +0200 + + FoFiType1C::convertToType0: Fix crash in broken files + + Bug #102724 + + fofi/FoFiType1C.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 504b3590182175390f474657a372e78fb1508262 +Author: Albert Astals Cid +Date: Thu Sep 14 19:14:23 2017 +0200 + + Splash::scaleImage: Do not try to scale if srcHeight or srcWidth + are < 1 + + Bug #102719 + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 500ce88a3b5b0bd556ac6941ba66a86cae44663a +Author: Oliver Sander +Date: Wed Sep 13 12:12:29 2017 +0200 + + Fix two minor typos + + qt5/tests/test-render-to-file.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 80f9819b6233f9f9b5fd44f0e4cad026e5d048c2 +Author: Albert Astals Cid +Date: Wed Sep 13 23:09:45 2017 +0200 + + isImageInterpolationRequired: Fix divide by 0 on broken documents + + Bug #102688 + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit aaf5327649e8f7371c9d3270e7813c43ddfd47ee +Author: Albert Astals Cid +Date: Wed Sep 13 23:01:03 2017 +0200 + + Gfx::doShowText: Fix infinite recursion on broken files + + Bug #102701 + + poppler/Gfx.cc | 25 +++++++++++++++++++++++-- + poppler/Gfx.h | 1 + + poppler/GfxFont.cc | 8 ++++++++ + poppler/GfxFont.h | 1 + + 4 files changed, 33 insertions(+), 2 deletions(-) + +commit 476394e7a025e02e4897da2e765df2c895d0708f +Author: Albert Astals Cid +Date: Wed Sep 13 22:58:14 2017 +0200 + + XRef::parseEntry: Fix crash in broken file + + Bug #102687 + + poppler/XRef.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 0f891b85169dabd3d23348aba40266547bd4bcf6 +Author: Adrian Johnson +Date: Wed Sep 13 20:12:52 2017 +0930 + + pdfinfo: don't truncate dest name + + utils/pdfinfo.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 951e7b3c1f337ceaf490edce3c575f89c45cb6d4 +Author: Adrian Johnson +Date: Wed Sep 13 19:24:07 2017 +0930 + + cmake: ensure user cflags/cxxflags are appended to end + + cmake/modules/PopplerMacros.cmake | 44 + +++++++++++++++++++++------------------ + 1 file changed, 24 insertions(+), 20 deletions(-) + +commit a5c616a65a77bf597836cced6f987e5b93480ca5 +Author: Adrian Johnson +Date: Mon Sep 11 20:55:01 2017 +0930 + + cmake INSTALL file + + INSTALL.cmake | 76 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 76 insertions(+) + +commit a5e5649ecf16fa05770620dbbd4985935dc2bbff +Author: Albert Astals Cid +Date: Mon Sep 11 12:35:16 2017 +0200 + + Fix crash in FoFiType1C::convertToType0 in broken files + + Bug #102653 + + fofi/FoFiType1C.cc | 435 + +++++++++++++++++++++++++++-------------------------- + 1 file changed, 220 insertions(+), 215 deletions(-) + +commit 325887ebef8ea1c6ef9d3607a59d95ffea383986 +Author: Albert Astals Cid +Date: Sun Sep 10 17:41:47 2017 +0200 + + Make JBIG2Stream::readGenericBitmap return cleanly on error + + instead of causing abort + + Also fixes warning when compiled with newer gcc + + poppler/JBIG2Stream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f253a28f4c5bb65c363d31b8b46f984c660499ee +Author: Albert Astals Cid +Date: Fri Sep 8 19:05:36 2017 +0200 + + qt5: in development -> is stable + + The API itself is done-ish even if it gets improvements from time to + time. In development seems to imply "don't use me yet" + + qt5/src/Mainpage.dox | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1316c7a41f4dd7276f404f775ebb5fef2d24ab1c +Author: Albert Astals Cid +Date: Fri Sep 8 18:29:42 2017 +0200 + + Annot: Fix crash on broken files + + Bug #102607 + + poppler/Annot.cc | 42 +++++++++++++++++++++++------------------- + 1 file changed, 23 insertions(+), 19 deletions(-) + +commit 2532df6060092e9fab7f041ae9598aff9cdd94bb +Author: Albert Astals Cid +Date: Fri Sep 8 18:28:15 2017 +0200 + + Annot: Fix crash on broken files + + Bug #102601 + + poppler/Annot.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6472d8493f7e82cc78b41da20a2bf19fcb4e0a7d +Author: Albert Astals Cid +Date: Fri Sep 8 18:26:05 2017 +0200 + + SplashOutputDev: Fix crash on broken files + + Bug #102604 + + poppler/SplashOutputDev.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 3ab44e2a77b560198c1e1616cfb39c1ac7374e29 +Author: Albert Astals Cid +Date: Fri Sep 8 18:21:40 2017 +0200 + + Remove unmaintained TODO file + + TODO | 40 ---------------------------------------- + 1 file changed, 40 deletions(-) + +commit dfcf997e6fbca31dbe051fbd9c32aca818825e38 +Author: Hans-Ulrich Jüttner +Date: Wed Sep 6 11:03:52 2017 +0200 + + Added methods to get and set the font size of text fields + + Fixes bug #101692 + + poppler/Annot.cc | 24 +++---------- + poppler/Form.cc | 92 + +++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Form.h | 16 +++++++++ + qt5/src/poppler-form.cc | 12 ++++++- + qt5/src/poppler-form.h | 10 ++++++ + 5 files changed, 134 insertions(+), 20 deletions(-) + +commit 0bda8bb8eda838316a61238441665abfd24eb020 +Author: Oliver Sander +Date: Thu Sep 7 19:55:54 2017 +0200 + + Disable glib if cairo is not found + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 118cd73a3c4eba78bbfed16cfc2996dec5491944 +Author: Albert Astals Cid +Date: Wed Sep 6 19:42:26 2017 +0200 + + cmake: Give people the option to build poppler as a static library + + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 766a32ff59dadd9ae4639d8a79861a17be6aec52 +Author: Adrian Johnson +Date: Tue Sep 5 20:55:45 2017 +0930 + + cmake: add options to disable glib/qt4/qt5 + + CMakeLists.txt | 54 + ++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 34 insertions(+), 20 deletions(-) + +commit 101aba9a8d6623bca419946262fea6b46a790454 +Author: Albert Astals Cid +Date: Tue Sep 5 19:34:12 2017 +0200 + + cmake: Fix build when using a cairo different than the system one + + glib/demo/CMakeLists.txt | 2 +- + test/CMakeLists.txt | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 1d3f00e8c53dbbd3a8409993b7b66667df434b5d +Author: Adrian Johnson +Date: Tue Sep 5 06:39:49 2017 +0930 + + ignore build directory + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 340a99f580b9f7b6add831e9a0252574bfea66f2 +Author: Oliver Sander +Date: Fri Sep 1 22:16:49 2017 +0200 + + Control whether renderToImage shows annotations + + I'd like to control whether the renderToImage and renderToPainter + methods show annotations or not. To this end, this patch introduces + a new value 'HideAnnotations' to the Document::RenderHint enum. + + qt5/src/poppler-page.cc | 36 ++++++++++++++++++++++++++++++++++-- + qt5/src/poppler-qt5.h | 3 ++- + 2 files changed, 36 insertions(+), 3 deletions(-) + +commit dd80c182cbcb188af0dd590f222ba9bbb31e3fb7 +Author: Albert Astals Cid +Date: Mon Sep 4 19:36:06 2017 +0200 + + Fix building with old clang + + poppler/StructElement.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit a22cd0badbc177f8a2eedb0386895ddf3379c618 +Author: Albert Astals Cid +Date: Sun Sep 3 23:35:08 2017 +0200 + + Initial make dist support in cmake + + .gitattributes | 5 +++++ + CMakeLists.txt | 9 +++++++++ + 2 files changed, 14 insertions(+) + +commit 85bfedad416906b1a5dff377d470387692b5ca70 +Author: Albert Astals Cid +Date: Sun Sep 3 22:54:32 2017 +0200 + + Poppler 0.59 + + CMakeLists.txt | 4 ++-- + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 22 insertions(+), 7 deletions(-) + +commit 98b4c23cf6f6eb0dbc167ed0606932b0d8de39f1 +Author: Albert Astals Cid +Date: Sun Sep 3 22:50:31 2017 +0200 + + Update (C) + + utils/pdfinfo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5c8dfc90603111aea36add20c88abde79a351d85 +Author: Albert Astals Cid +Date: Sun Sep 3 22:32:09 2017 +0200 + + Remove the old if/else cmake syntax + + that was weird and forced you to replicate the if clause in the + else and + endif + + CMakeLists.txt | 154 + +++++++++++++++++++++++------------------------ + cpp/tests/CMakeLists.txt | 2 +- + glib/CMakeLists.txt | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/tests/CMakeLists.txt | 8 +-- + qt5/src/CMakeLists.txt | 2 +- + qt5/tests/CMakeLists.txt | 8 +-- + test/CMakeLists.txt | 10 +-- + utils/CMakeLists.txt | 10 +-- + 9 files changed, 99 insertions(+), 99 deletions(-) + +commit 251bb42e9af251c86b8fec120e14972ac7c07106 +Author: Albert Astals Cid +Date: Sun Sep 3 22:23:18 2017 +0200 + + Remove the check for cmake >= 2.8.8 since we're requiring 3.1 already + + CMakeLists.txt | 25 ++++++++++--------------- + 1 file changed, 10 insertions(+), 15 deletions(-) + +commit 3ea09e735f81a2a16a204388bc474871aaa10271 +Author: Adrian Johnson +Date: Sat Sep 2 17:50:58 2017 +0930 + + Fix warning when compiling with cygwin + + ImageOutputDev.cc:532:14: warning: ‘f’ may be used uninitialized + in this function [-Wmaybe-uninitialized] + + utils/ImageOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6ef21aea5bb8b87f9a7e9217c316cd5e10612a62 +Author: Adrian Johnson +Date: Sat Sep 2 17:50:35 2017 +0930 + + Fix cygwin 32-bit compile + + poppler/goo/gfile.cc: In function ‘GBool openTempFile(GooString**, + FILE**, const char*)’: + poppler/goo/gfile.cc:409:37: error: ‘mkstemp’ was not declared + in this scope + fd = mkstemp((*name)->getCString()); + ^ + poppler/goo/gfile.cc:417:39: error: ‘fdopen’ was not declared + in this scope + if (fd < 0 || !(*f = fdopen(fd, mode))) { + ^ + poppler/goo/gfile.cc: In function ‘int Gfseek(FILE*, Goffset, + int)’: + poppler/goo/gfile.cc:558:34: error: ‘fseeko’ was not declared + in this scope + return fseeko(f, offset, whence); + ^ + poppler/goo/gfile.cc: In function ‘Goffset Gftell(FILE*)’: + poppler/goo/gfile.cc:572:18: error: ‘ftello’ was not declared + in this scope + return ftello(f); + ^ + + cmake/modules/PopplerMacros.cmake | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 048237db6a7122a5769a15c7dd3ae3680e06e9bb +Author: Albert Astals Cid +Date: Sat Sep 2 22:59:32 2017 +0200 + + pdfunite: Fix API porting error that caused abort in some cases + + We need to check for xRef->getTrailerDict() existing before accessing + xRef->getDocInfo(); + + poppler/PDFDoc.cc | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 4459d817194431f4f00553d5ad67b960a37e4c9d +Author: Adrian Johnson +Date: Sat Sep 2 20:16:44 2017 +0930 + + pdfinfo: use GooString.append instead of sprintf/strcat + + https://lists.freedesktop.org/archives/poppler/2017-September/012437.html + + utils/pdfinfo.cc | 46 +++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) + +commit 267ff8af69ae7e8526d9bfe5063207c87a9b70b5 +Author: Albert Astals Cid +Date: Sat Sep 2 13:27:33 2017 +0200 + + Fix infinite recursion in NameTree parsing in broken files + + poppler/Catalog.cc | 16 +++++++++++++--- + poppler/Catalog.h | 2 +- + 2 files changed, 14 insertions(+), 4 deletions(-) + +commit c5487b653b1c37882af32a25296611e64d7ba867 +Author: Albert Astals Cid +Date: Sat Sep 2 11:55:17 2017 +0200 + + pdfinfo: -dests don't crash in broken documents + + That have pages that don't have ref + + utils/pdfinfo.cc | 38 ++++++++++++++++++++------------------ + 1 file changed, 20 insertions(+), 18 deletions(-) + +commit 10660b359dc960f4b0f3728243c64eec79c39851 +Author: Albert Astals Cid +Date: Sat Sep 2 11:50:00 2017 +0200 + + pdfinfo: Fix memory leaks when using -dests + + utils/pdfinfo.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit ea6174def73f7478ae76843bb88ef85c5a6150f9 +Author: Albert Astals Cid +Date: Sat Sep 2 11:31:51 2017 +0200 + + pdfinfo: Fix crash if getDest* returns nullptr + + utils/pdfinfo.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 73e12716f3e4643c2ea13421902b8220596454d7 +Author: Albert Astals Cid +Date: Fri Sep 1 20:11:27 2017 +0200 + + Poppler 0.58 + + CMakeLists.txt | 4 ++-- + NEWS | 30 ++++++++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 37 insertions(+), 7 deletions(-) + +commit 8a5c7be5b5772672b34638532793cf62be78e9b8 +Author: Albert Astals Cid +Date: Fri Sep 1 20:02:17 2017 +0200 + + Add missing includes + + goo/JpegWriter.cc | 2 +- + goo/JpegWriter.h | 2 +- + goo/gfile.cc | 1 + + goo/gfile.h | 1 + + poppler/CairoOutputDev.cc | 2 +- + poppler/Gfx.cc | 2 +- + poppler/GlobalParams.cc | 1 + + poppler/GlobalParamsWin.cc | 2 ++ + poppler/Outline.cc | 1 + + poppler/Stream.cc | 2 +- + poppler/Stream.h | 2 +- + splash/SplashBitmap.cc | 2 +- + splash/SplashBitmap.h | 2 +- + utils/pdftocairo.cc | 2 +- + 14 files changed, 15 insertions(+), 9 deletions(-) + +commit 26f64a2a34a9273897c34045ea7af5e8c3c603cb +Author: Albert Astals Cid +Date: Thu Aug 31 15:37:07 2017 +0200 + + cmake: enable glib for windows too + + There's no need to not having it enabled + + cmake/modules/FindGLIB.cmake | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit 90bc39daf9d3276b166b4c88e1d2c1988aa41c71 +Author: Oliver Sander +Date: Mon Aug 28 10:25:12 2017 +0200 + + Document some parameters of the drawChar method + + Thanks to Adrian Johnson, who explained their meaning to me. + + poppler/OutputDev.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 59e6e9b3e4d77229051cafeeeb65a82e9a966204 +Author: Albert Astals Cid +Date: Sun Aug 27 12:54:03 2017 +0200 + + Add missing inlcudes when compiling with cmake+mingw + + utils/pdftocairo-win32.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 13cf327cd512ebc26c8bd31cdd80d61027634bcb +Author: Albert Astals Cid +Date: Sun Aug 27 12:51:19 2017 +0200 + + cmake: Use -std=c++11 instead of -std=gnu++11 + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 1602610ce2bbab2feb0177f0876e1ed0ee40a472 +Author: Tobias C. Berner +Date: Sun Aug 27 12:16:05 2017 +0200 + + Include time.h for time_t + + qt5/src/poppler-form.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 40cb9f4bf6f35ea62bc7b9e5c23008f98ebd4b36 +Author: Albert Astals Cid +Date: Thu Aug 24 11:14:34 2017 +0200 + + Fix build with mingw + + config.h.cmake | 6 ++++++ + poppler/GlobalParamsWin.cc | 21 ++++++--------------- + poppler/Link.cc | 14 ++------------ + poppler/PDFDoc.cc | 4 +--- + 4 files changed, 15 insertions(+), 30 deletions(-) + +commit 5be33ba49071a9ffeb62be93e5dc01267318d1c2 +Author: Adrian Johnson +Date: Wed Aug 23 21:00:09 2017 +0930 + + Fix Outline title + + poppler/Outline.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 1b84a71ee2550ae4b14cb1e40576de1f022eb2e8 +Author: Oliver Sander +Date: Tue Aug 22 11:43:08 2017 +0200 + + Use Qt::SvgMiterJoin instead of Qt::MiterJoin + + The two differ in what happens when the miter limit is exceeded. + According to + + https://bugreports.qt.io/browse/QTBUG-52640 + + Qt::SvgMiterJoin is what the pdf standard requires. + + Closes: https://bugs.freedesktop.org/show_bug.cgi?id=102356 + + qt5/src/ArthurOutputDev.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 0793b6740121f4af07360800bebdc6238fc43087 +Author: Oliver Sander +Date: Sun Aug 13 19:47:15 2017 +0200 + + Document the updateCTM method + + poppler/OutputDev.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 488d28ec9507eb99c7cb4cd2cafb54995a8bc9f8 +Author: Adrian Johnson +Date: Wed Aug 16 21:01:07 2017 +0930 + + pdfimages: support listing/extracting inline images + + The difficulty with extracting inline images is that inline images do + not provide any way of determining the length or end of image data + without decoding the image. We can get the length by using ImageStream + to decode the data then check the stream position. But then we are + still unable to extract the undecoded image data because embedded + streams can only be read once. + + Since inline images tend to be small the solution implemented is to + modify EmbedStream to keep a copy of the data read from it in memory + and then allow the data to be read again. + + Two new functions have been added to EmbedStream. rewind() will cause + EmbedStream.getChar() to stop recording data and switch to replaying + the saved data, returning EOF when the end of the saved data is + reached. The restore() function will make getChar() switch back to + reading from the parent stream. + + ImageOutputDev can now extract or get the image size by first using + ImageStream to read data from the embedded stream. After calling + rewind() the undecoded image data can be read from the embedded stream + until EOF is returned. Then restore() is called so that Gfx can read + the 'EI' from the end of the embedded stream. + + Bug 25625 + + poppler/Gfx.cc | 2 +- + poppler/Stream.cc | 96 + +++++++++++++++++++++++++++++++++++++++++++------ + poppler/Stream.h | 14 ++++++-- + utils/ImageOutputDev.cc | 67 ++++++++++++++++++++++++++++++---- + utils/ImageOutputDev.h | 1 + + 5 files changed, 159 insertions(+), 21 deletions(-) + +commit b9030a069756c84669ed6f408399cc7e2ce4fd10 +Author: Adrian Johnson +Date: Sun Jul 16 12:23:28 2017 +0930 + + pdftoppm: add -jpegopt for setting jpeg compression parameters + + Bug 45727 + + splash/SplashBitmap.cc | 25 ++++++++++++---- + splash/SplashBitmap.h | 15 ++++++++-- + utils/pdftoppm.1 | 15 ++++++++++ + utils/pdftoppm.cc | 80 + ++++++++++++++++++++++++++++++++++++++++++++++---- + 4 files changed, 120 insertions(+), 15 deletions(-) + +commit dd54243f00557e84dba887403912d12463c8b1e9 +Author: Adrian Johnson +Date: Sat Jul 15 21:26:29 2017 +0930 + + pdftocairo: add -jpegopt for setting jpeg compression parameters + + Bug 45727 + + goo/JpegWriter.cc | 10 ++++++++ + goo/JpegWriter.h | 2 ++ + utils/pdftocairo.1 | 17 ++++++++++++- + utils/pdftocairo.cc | 71 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 99 insertions(+), 1 deletion(-) + +commit 00a536a455e4dd396c6b8b74d3e6a5c82d987eed +Author: Adrian Johnson +Date: Wed Aug 16 21:21:58 2017 +0930 + + cairo 1.14 now has high quality downscaling + + The filter needs to be GOOD or BEST to activate the high quality + downscaling. + + poppler/CairoOutputDev.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 535bc8eeaf8d354a84129fe00c3a5e3ac0a85aa3 +Author: Christoph Cullmann +Date: Wed Aug 16 21:11:36 2017 +0930 + + win32: call ANSI functions directly + + to be able to compile with different -DUNICODE variants + + Bug 100312 + + goo/gfile.cc | 14 +++++++------- + goo/gfile.h | 2 +- + poppler/GlobalParams.cc | 2 +- + poppler/GlobalParamsWin.cc | 20 ++++++++++---------- + 4 files changed, 19 insertions(+), 19 deletions(-) + +commit a8d670b59b0301040e716f3a11a78fce1177337d +Author: Adrian Johnson +Date: Tue Aug 15 21:35:27 2017 +0930 + + pdfinfo: add -dests option to print named destinations + + Bug 97262 + + utils/pdfinfo.1 | 4 ++ + utils/pdfinfo.cc | 140 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 143 insertions(+), 1 deletion(-) + +commit 6d3239a2fd04595fecfb81a8703794877f4d8dec +Author: Adrian Johnson +Date: Tue Aug 15 20:09:25 2017 +0200 + + Fix build with autotools + + qt5/src/Makefile.am | 1 + + utils/Makefile.am | 4 ++++ + 2 files changed, 5 insertions(+) + +commit b56a697c58bcf09063827b9c109be9c04a033b8a +Author: Albert Astals Cid +Date: Tue Aug 15 12:25:26 2017 +0200 + + Improvements to the previous Signature commit + + * Remove FormWidgetSignature::setFormSignatureType, the API was + weird, + make it be an output parameter of getCheckedSignature + + * include cleanup + + * Make validation time mandatory, marking to use -1 for *now* + + * Remove setFormSignatureType noone uses + + * Fix compilation wihtout NSS3 + + * Don't static cast between NSS3 HASH_HashType and poppler-qt5 + HashAlgorithm + + * Actually pass validationTime down in FormFieldSignature::validate + + * Add since markers to poppler-qt5 functions/enums + + * Fix spacing + + * Remove SignatureValidationInfo::signingDateTime that returns + QDateTime, having two functions that return the same is a bit + confusing, + and we're not filling the timezone info anyway, so let it be a time_t + + poppler/Form.cc | 17 ++++--------- + poppler/Form.h | 20 ++++++---------- + poppler/SignatureHandler.h | 5 ++-- + poppler/SignatureInfo.cc | 7 +++++- + poppler/SignatureInfo.h | 4 ++-- + qt5/src/poppler-form.cc | 52 ++++++++++++++++++++++------------------ + qt5/src/poppler-form.h | 59 + +++++++++++++++++++++++++++++----------------- + utils/pdfsig.cc | 25 +++++--------------- + 8 files changed, 96 insertions(+), 93 deletions(-) + +commit a81700dfa638872fe9641289971ca9a2b50b42ad +Author: Hans-Ulrich Jüttner +Date: Tue Aug 15 10:27:26 2017 +0200 + + Various signature related improvements + + Export signature via Qt5 interface. + Add support for signatures of SubFilter "ETSI.CAdES.detached". + Add an optional validation time to method validateSignature(). + Print full Subject Distinguished Name, signing time, hash algorithm + and a statement wether the total document is signed in pdfsig. + + Fixes bug #99271 + + poppler/Form.cc | 178 + ++++++++++++++++++++++++++++++++++++++++++-- + poppler/Form.h | 34 ++++++++- + poppler/SignatureHandler.cc | 34 ++++++++- + poppler/SignatureHandler.h | 5 +- + poppler/SignatureInfo.cc | 33 +++++++- + poppler/SignatureInfo.h | 9 ++- + qt5/src/poppler-form.cc | 112 ++++++++++++++++++++++++++++ + qt5/src/poppler-form.h | 58 +++++++++++++++ + utils/pdfsig.1 | 6 +- + utils/pdfsig.cc | 73 ++++++++++++++++++ + 10 files changed, 523 insertions(+), 19 deletions(-) + +commit e15a0df15b89e1c7ba98cd7bbbf8ef97e541d231 +Author: Hannah von Reth +Date: Sun Aug 13 20:26:44 2017 +0200 + + Remove old/wrong cmake code for MSVC + + cpp/CMakeLists.txt | 3 --- + 1 file changed, 3 deletions(-) + +commit 236f4ff4f516cb68a2d102627b0a3da73578c67f +Author: Hannah von Reth +Date: Sun Aug 13 20:24:15 2017 +0200 + + Use WIN32_LEAN_AND_MEAN on Windows + + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 1abf98b76ba134adc44883cd2ae345f769ca0d5a +Author: Oliver Sander +Date: Sat Aug 12 16:42:40 2017 +0200 + + qt5: ArthurOutputDev: Properly set the QPainter transformation + + Previously, the code did not touch the QPainter world transformation + matrix. Rather, the code contained ad hoc coordinate transformations + scattered throughout the code. This patch does a cleanup: the + QPainter + transformation matrix is set properly, and the hand-coded + transformations are removed. This should not affect the rendering + output, but it makes the current (and future!) code simpler to + read and write. + + qt5/src/ArthurOutputDev.cc | 56 + ++++++++++++++++++++++++---------------------- + qt5/src/ArthurOutputDev.h | 4 ++++ + 2 files changed, 33 insertions(+), 27 deletions(-) + +commit 2baaa02087ef66b97bf3c4bce49785a10632178f +Author: Albert Astals Cid +Date: Sun Aug 13 12:35:39 2017 +0200 + + Revert part of last commit, we wants tests not to fail :) + + qt5/tests/check_metadata.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3af2e18fc31f18efb36408281ca5879f284edaa4 +Author: Oliver Sander +Date: Fri Aug 11 22:55:41 2017 +0200 + + Fix copy'n'paste bugs: Qt4 -> Qt5 + + qt5/src/ArthurOutputDev.h | 2 +- + qt5/src/poppler-annotation.h | 2 +- + qt5/tests/check_metadata.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit a9581e624fa62b3905b790ac10d1349b1f96048a +Author: Roland Hieber +Date: Fri Aug 11 11:44:26 2017 +0200 + + Form.h: fix error: 'vector' in namespace 'std' does not name a type + + Bug #102147 + + Original error message while compiling with + OSELAS.Toolchain-2016.06.1-arm-v7a-linux-gnueabi, + gcc-5.4.0-glibc-2.23-binutils-2.26-kernel-4.6-sanitized: + + make[5]: Entering directory + '/ptx/work/dude/WORK_B/rhi/OSELAS.BSP-Miele-PST/platform-cpu20/build-target/poppler-0.57.0/qt4/src' + CXX libpoppler_qt4_la-poppler-form.lo + In file included from poppler-form.cc:26:0: + ../../poppler/Form.h:544:14: error: 'vector' in namespace + 'std' does not name a template type + ../../poppler/Form.h:556:8: error: 'vector' in namespace + 'std' does not name a template type + Makefile:735: recipe for target + 'libpoppler_qt4_la-poppler-form.lo' failed + + configure arguments were: + + --prefix=/usr --sysconfdir=/etc --localstatedir=/var + --libdir=/usr/lib --host=arm-v7a-linux-gnueabi + --build=x86_64-host-linux-gnu --enable-option-checking + --disable-silent-rules --disable-dependency-tracking + --enable-shared --enable-fast-install --enable-libtool-lock + --enable-xpdf-headers --enable-build-type=release + --disable-single-precision --enable-fixedpoint --enable-cmyk + --disable-relocatable --enable-libopenjpeg=none + --disable-libnss + --disable-libtiff --enable-largefile --enable-zlib + --disable-zlib-uncompress --enable-libcurl + --enable-dctdecoder=libjpeg --enable-libpng + --disable-splash-output --enable-cairo-output + --enable-poppler-glib --disable-introspection + --disable-gtk-doc + --disable-gtk-doc-html --disable-gtk-doc-pdf + --enable-poppler-qt4 --disable-poppler-qt5 + --enable-poppler-cpp + --disable-gtk-test --enable-utils --disable-compile-warnings + --enable-cms=lcms1 --without-x + --with-font-configuration=fontconfig --without-libiconv-prefix + --with-testdatadir= + + Signed-off-by: Roland Hieber + + poppler/Form.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit f0ecbc6f988aa19ffb2b7e583dca4e609f2f6c65 +Author: Thomas Freitag +Date: Thu Aug 10 09:17:27 2017 +0200 + + Tweak which cmap we use + + Bug #101855 + + poppler/GfxFont.cc | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) + +commit 7e844eae94bc4eda1c6dcc3460840b25f4ca7898 +Author: Oliver Sander +Date: Wed Aug 9 11:09:50 2017 +0200 + + qt5: Arthur: initialize the image with the paper color + + Bug #102129 + + qt5/src/poppler-page.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit d7b800933e1b57c180247708991f5c3a282f8305 +Author: Jason Alan Palmer +Date: Wed Aug 9 00:41:05 2017 +0200 + + cpp: Fix page.text() not taking page orientation into account + + Bug #94517 + + cpp/poppler-page.cpp | 10 +++++++++- + cpp/tests/poppler-dump.cpp | 3 ++- + 2 files changed, 11 insertions(+), 2 deletions(-) + +commit cd04a81343fd5cba824a891f25c01eeffee5f906 +Author: Albert Astals Cid +Date: Tue Aug 8 22:42:46 2017 +0200 + + Fix use of uninitialized value use + + Bug #102117 + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fe97135ffb18eaaec7d23a7394641ba103bfe48d +Author: Albert Astals Cid +Date: Tue Aug 1 19:30:28 2017 +0200 + + Make the openjpeg1 code compile with the new Object API + + poppler/JPEG2000Stream.cc | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) + +commit e5ff049c3d11e6ea24b624807730acd21a6ef4d5 +Author: Albert Astals Cid +Date: Tue Aug 1 01:07:00 2017 +0200 + + Gfx::doImage: Simplify memory management + + of maskColorMap by using a std::unique_ptr + + Fixes a memory leak reported by Coverity + + poppler/Gfx.cc | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit 19eda068ae1866e4f46efc9534b34779007fdc16 +Author: Albert Astals Cid +Date: Tue Aug 1 00:53:52 2017 +0200 + + Fix memory leak on corner case condition + + poppler/Parser.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit dbe7a5da3dce56210bd4ca2deaf8f5ad4a9d0529 +Merge: 687474e1 c167f35b +Author: Albert Astals Cid +Date: Tue Aug 1 00:12:13 2017 +0200 + + Merge remote-tracking branch 'origin/master' into better_object + +commit c167f35b8c3fd7e94fa97385949b2c133d918ed4 +Author: Albert Astals Cid +Date: Mon Jul 31 23:39:37 2017 +0200 + + Poppler 0.57 + + CMakeLists.txt | 4 ++-- + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 21 insertions(+), 7 deletions(-) + +commit be0384d2220a75d2666b1fd2228e156b1595a57f +Author: Albert Astals Cid +Date: Mon Jul 31 23:34:57 2017 +0200 + + Add missing (C) + + poppler/StructTreeRoot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0e7f6cb1c42db3d65395365833472ff859def87a +Author: Jannick +Date: Mon Jul 31 19:53:12 2017 +0200 + + Fix some warnings in some unusual #ifdef combinations + + Bug #101812 + + poppler/PSOutputDev.cc | 2 +- + poppler/Stream.cc | 5 ++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit f55d6a64dd3f69fa9c1ba984218809cc50c9b052 +Author: Albert Astals Cid +Date: Mon Jul 31 19:45:32 2017 +0200 + + Add missing (C) + + utils/pdfseparate.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 543b0ea219191122fee0583ce62c19e31de34109 +Author: Roland Hieber +Date: Mon Jul 17 11:35:32 2017 +0200 + + configure.ac: fix --disable-FEATURE actually enabling the feature + + Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=101818 + + A frequently seen antipattern is to use + AC_ARG_ENABLE(feature, help, action-if-given, action-if-not-given) as + AC_ARG_ENABLE(feature, help, action-if-enabled, action-if-disabled). + However, action-if-given is also evaluated for --disable-FEATURE (with + enableval=no), which results in --disable-FEATURE and --enable-FEATURE + doing the same in this case. + + Rewrite the single-precision, fixedpoint and cmyk arguments + accordingly + so the user is not confused if they explicitely want to disable those + options. + + Signed-off-by: Roland Hieber + + configure.ac | 32 ++++++++++++++++++++++++++------ + 1 file changed, 26 insertions(+), 6 deletions(-) + +commit 92ad743b63c3e82211ea0b2e4d4471dd3f71cebc +Author: Léonard Michelet +Date: Mon Jul 31 19:40:06 2017 +0200 + + pdfseparate: minor improvement to the documentation + + Bug #101800 + + utils/pdfseparate.1 | 7 ++++--- + utils/pdfseparate.cc | 2 +- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit 0a2096743fa749a8a7d4caa714eecbe8a9661619 +Author: Albert Astals Cid +Date: Mon Jul 31 16:52:46 2017 +0200 + + Add some more overrides + + poppler/CurlCachedFile.h | 4 ++-- + poppler/CurlPDFDocBuilder.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 687474e17db59482dc4538740701bdb32bc9d6bd +Author: Albert Astals Cid +Date: Mon Jul 31 16:47:31 2017 +0200 + + Build++ + + poppler/CurlPDFDocBuilder.cc | 5 +---- + poppler/Stream.cc | 2 +- + 2 files changed, 2 insertions(+), 5 deletions(-) + +commit 66e718e753a527289ce86cd206fcffd23fc28d81 +Merge: 9cecd78f 213ae24b +Author: Albert Astals Cid +Date: Mon Jul 31 16:39:53 2017 +0200 + + Merge remote-tracking branch 'origin/master' into better_object + +commit 213ae24b4df97f557e771060e37197d0e57f6f7f +Author: Jannick +Date: Sun Jul 16 19:51:49 2017 +0200 + + added override tag to function declarations + + poppler/FlateStream.h | 16 ++++++++-------- + poppler/JPXStream.h | 16 ++++++++-------- + poppler/Stream.h | 16 ++++++++-------- + 3 files changed, 24 insertions(+), 24 deletions(-) + +commit ab371fe60568947e355d89e28d489f7f9a1a7404 +Author: Jason Crain +Date: Sun Jul 16 12:07:54 2017 -0500 + + pdftohtml: skip control characters + + W3C disallows them and they cause a warning in PHP. + + https://bugs.freedesktop.org/show_bug.cgi?id=101770 + + utils/HtmlFonts.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 0f4ea2f18b1953ccc88bcbd6b16ede828b44e561 +Author: Adrian Johnson +Date: Mon Jul 10 21:06:30 2017 +0930 + + Fix parsing of Type 1 fonts with newlines in encoding sequences + + Adobe Type 1 font spec states that the encoding sequences should be of + the form: + + dup index /name put + + The bug 101728 test case has the encoding sequences in the form: + + dup + index /name put + + Make the Type 1 parse handle encoding sequences split over more than + one line. + + Bug 101728 + + fofi/FoFiType1.cc | 40 +++++++++++++++++++++++++++++++++++----- + 1 file changed, 35 insertions(+), 5 deletions(-) + +commit 75fff6556eaf0ef3a6fcdef2c2229d0b6d1c58d9 +Author: Caolán McNamara +Date: Wed Jul 12 14:12:46 2017 +0100 + + CVE-2017-9865 (fdo#100774) avoid stack buffer overflow + + in GfxImageColorMap:getGray + + by passing first arg to getGray of maximum possibly required size + + and similar in HtmlOutputDev::drawPngImage + + utils/HtmlOutputDev.cc | 6 ++++-- + utils/ImageOutputDev.cc | 6 ++++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit 5d0c23a9f6cdc3fd216335124788958f46932158 +Author: Jan-Erik S +Date: Sat Jul 29 18:23:39 2017 +0200 + + Fix crash in broken document + + poppler/StructTreeRoot.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 852fd28674e14f25c6902c0adab19909f73f2632 +Author: David Faure +Date: Sat Jul 29 18:18:23 2017 +0200 + + Set RUNPATH for poppler shared libs + + Bug #101945 + + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 771c82623e8e1e0c92b8ca6f7c2b8a81ccbb60d3 +Author: Albert Astals Cid +Date: Mon Jul 3 22:44:42 2017 +0200 + + pdfunite: fix crash in broken documents + + Bug #101208 + + poppler/PDFDoc.cc | 70 + +++++++++++++++++++++++++++++++++++++++++-------------- + poppler/PDFDoc.h | 21 +++++++---------- + 2 files changed, 62 insertions(+), 29 deletions(-) + +commit 02d9b182b80d5745b79480b0b8d0eb49b0be304e +Author: Albert Astals Cid +Date: Wed Jun 21 22:49:26 2017 +0200 + + Poppler 0.56 + + CMakeLists.txt | 2 +- + NEWS | 8 ++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 13 insertions(+), 5 deletions(-) + +commit 3a2759aa2a98c2157cb35731b95e393b8882f8d3 +Author: Jose Aliste +Date: Tue May 16 18:44:49 2017 -0400 + + Check numComps is between reasonable bounds + + Before this patch, some PDF might crash because of an overflow + if numComps does not lie between 0 and 4. + This is a security fix for CVE-2017-0319. + + poppler/Stream.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit d9c88e1c8892c79b8865a0dabdcc0d3ffd55c195 +Author: Albert Astals Cid +Date: Wed Jun 21 00:56:38 2017 +0200 + + Fix crash in malformed documents + + poppler/GfxState.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 55db66c69fd56826b8523710046deab1a8d14ba2 +Author: Albert Astals Cid +Date: Wed Jun 21 00:55:20 2017 +0200 + + Fix crash in malformed documents + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5266fa426d73c5dbdb3dd903d50885097833acc6 +Author: Albert Astals Cid +Date: Tue Jun 20 23:58:26 2017 +0200 + + Fix crash in malformed document + + Bug #101526 + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 112b8ab16128c6e7f80fe7c1890f7b63abd85cce +Author: Albert Astals Cid +Date: Tue Jun 20 23:51:16 2017 +0200 + + Fix crash in broken documents + + Fixes bug #101525 + + poppler/JBIG2Stream.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 4e68bf998f886cab8a45fa315164d8ba7aa0dee4 +Author: Albert Astals Cid +Date: Tue Jun 20 23:43:23 2017 +0200 + + Fix crash on broken documents + + Fixes bug #101524 + + poppler/JBIG2Stream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 558cdb4a4efbb2227f4009f5d87cdd94bfb40107 +Author: Albert Astals Cid +Date: Tue Jun 20 23:37:26 2017 +0200 + + Fix crash in malformed documents + + Fixes bug #101523 + + poppler/GfxFont.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f7030a0176ed0ab484a401acc26072060e420679 +Author: Albert Astals Cid +Date: Mon Jun 19 23:45:24 2017 +0200 + + Fix crash on broken documents + + Bug #101505 + + goo/GooHash.cc | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit e465d36b8ecf46b80af4ac6b941ae56eb4883a89 +Author: Albert Astals Cid +Date: Mon Jun 19 23:35:29 2017 +0200 + + Fix crash on malformed files + + Bug #101502 + + poppler/GfxState.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit e2ab2fa9d8c41e0115b2c276a2594cd2f7c217e6 +Author: Albert Astals Cid +Date: Mon Jun 19 23:18:51 2017 +0200 + + Fix crash on malformed files + + Bug #101500 + + poppler/Function.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 17e4111da1ae5c9798ca0c040bf75c01bbb72a8a +Author: Albert Astals Cid +Date: Sat Jun 17 17:47:23 2017 +0200 + + Break earlier on reaching recursion limit + + Bug #101379 + + poppler/Parser.cc | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +commit 8e1a2474c5513f7b2f4718258ca90e2d6e03f127 +Author: Albert Astals Cid +Date: Sat Jun 17 12:35:41 2017 +0200 + + pdftohmtl: Initialize rotSkewMat + + Fixes uninitialized memory read at bug #100314 + + utils/HtmlFonts.cc | 1 + + 1 file changed, 1 insertion(+) + +commit dd7b0eec87ffc389ee3ba7319442e681e19b15ba +Author: Albert Astals Cid +Date: Sat Jun 17 12:33:35 2017 +0200 + + Remove unused constructor + + utils/HtmlFonts.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 5b05222ccd18a121ea2ae1d67b8b5d4947cdfce0 +Author: Albert Astals Cid +Date: Sat Jun 17 12:33:06 2017 +0200 + + Fix crash in malformed file + + Bug #101429 + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e1b5053e54b0ef7d6b09f3b9c97883db533d509a +Author: Even Rouault +Date: Fri Jun 16 00:21:53 2017 +0200 + + Fix crash on broken file + + Fixes bug #101366 + + poppler/SplashOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9e05af3da0ce14c48f0652e01718960c6bc7b4b0 +Author: Hans-Ulrich Jüttner +Date: Wed Jun 14 23:19:48 2017 +0200 + + FormFieldButton::setState() shouldn't check the field is readOnly + + Bug #101419 + + poppler/Form.cc | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 9cecd78ff12a145fd7a61d226d54fd8f9ce19638 +Merge: b5ca57db 23a2f6a2 +Author: Albert Astals Cid +Date: Sat Jun 17 18:35:14 2017 +0200 + + Merge remote-tracking branch 'origin/master' into better_object + +commit 23a2f6a2492a0957489eac31b6700b4d68180bdb +Author: Albert Astals Cid +Date: Sat Jun 17 17:47:23 2017 +0200 + + Break earlier on reaching recursion limit + + Bug #101379 + + poppler/Parser.cc | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +commit 5323bc8baf9add8c28a0a6970ab94b6386f38d14 +Author: Albert Astals Cid +Date: Sat Jun 17 12:35:41 2017 +0200 + + pdftohmtl: Initialize rotSkewMat + + Fixes uninitialized memory read at bug #100314 + + utils/HtmlFonts.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 67159370014e5cb3ef296b256bf410e0468fe71e +Author: Albert Astals Cid +Date: Sat Jun 17 12:33:35 2017 +0200 + + Remove unused constructor + + utils/HtmlFonts.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit d52bba350acb3023ebdba8537854206641cd0998 +Author: Albert Astals Cid +Date: Sat Jun 17 12:33:06 2017 +0200 + + Fix crash in malformed file + + Bug #101429 + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit db254b4b5b1ac2dae46b9fd5ad23af311e481489 +Author: Even Rouault +Date: Fri Jun 16 00:21:53 2017 +0200 + + Fix crash on broken file + + Fixes bug #101366 + + poppler/SplashOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 9fc5ed2176da68442927127bea8c427800eb244c +Author: Hans-Ulrich Jüttner +Date: Wed Jun 14 23:19:48 2017 +0200 + + FormFieldButton::setState() should check the field isn't readOnly + + Bug #101419 + + poppler/Form.cc | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit 5c9b08a875b07853be6c44e43ff5f7f059df666a +Author: Albert Astals Cid +Date: Sat May 27 00:09:17 2017 +0200 + + pdfunite: Fix crash with broken documents + + Sometimes we can't parse pages so check before accessing them + + Thanks to Jiaqi Peng for the report + + Fixes bugs #101153 and #101149 + + utils/pdfunite.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit ff05069f34a00d67cdddb033f6240a3407e90057 +Author: Albert Astals Cid +Date: Sun May 21 23:39:38 2017 +0200 + + Poppler 0.55.0 + + CMakeLists.txt | 2 +- + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 21 insertions(+), 5 deletions(-) + +commit 680b3f6b80e6d342a6b6e3fe8f1953857784f737 +Author: Albert Astals Cid +Date: Sun May 21 23:20:56 2017 +0200 + + Update (C) + + poppler/Object.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0bf38541443cb8dee4d9a5197fdfcf91f6043a2d +Author: Albert Astals Cid +Date: Sun May 21 23:20:38 2017 +0200 + + Don't forget to ship this file ^_^ + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit aa03a71c3a1127cffd19bb0f596c4b361a7f2269 +Author: Albert Astals Cid +Date: Sun May 21 22:37:23 2017 +0200 + + Fix abort in files with broken Decode arrays + + Fixes KDE bug #379835 + + poppler/GfxState.cc | 18 ++++++++++++------ + poppler/Object.h | 7 +++++++ + 2 files changed, 19 insertions(+), 6 deletions(-) + +commit 65c5a5266462244130f110599ac5d1011a04216e +Author: Albert Astals Cid +Date: Sun May 21 18:42:15 2017 +0200 + + Fail by default if libopenjpeg2/1 is not available + + You can "force" to use the unmaintained JPX decoder or none at all + + CMakeLists.txt | 30 +++++++++++++++++++++++++++--- + config.h.cmake | 3 +++ + configure.ac | 29 +++++++++++++++++++++++++---- + poppler/Stream.cc | 5 +++++ + 4 files changed, 60 insertions(+), 7 deletions(-) + +commit ea6d3200ae26775dcc26ed80fad18ca51e7f7f07 +Author: Albert Astals Cid +Date: Sun May 21 18:08:41 2017 +0200 + + Fix openjpeg text + + We've prefered openjpeg2 over 1 for a while + + CMakeLists.txt | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b286a6b5b1a63563263072305da04604cb022488 +Author: Albert Astals Cid +Date: Sun May 21 17:45:00 2017 +0200 + + Fail by default if libjpeg is not available + + You can "force" to use the unmaintained DCT decoder or none at all + + CMakeLists.txt | 29 +++++++++++++++++++++++------ + config.h.cmake | 3 +++ + configure.ac | 40 +++++++++++++++++++++++++++++++--------- + poppler/Stream.cc | 7 ++++++- + 4 files changed, 63 insertions(+), 16 deletions(-) + +commit b5ca57dbfecd9e680b3bd4b293b0eac400d24cfb +Author: Albert Astals Cid +Date: Sat May 13 01:05:43 2017 +0200 + + Fix memory leak in XRef::constructXRef + + poppler/XRef.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b21c5f7741bb0af47c64c042a8586d922d26b47a +Author: Albert Astals Cid +Date: Sat May 13 00:13:43 2017 +0200 + + Use initNullAfterMalloc since this is after a greallocn + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e98ca09fafadbf7d37b838ed2f8953dc6a53a034 +Author: Albert Astals Cid +Date: Sat May 13 00:01:05 2017 +0200 + + Forgot to add my (C) here + + poppler/Rendition.h | 1 + + 1 file changed, 1 insertion(+) + +commit 47aa71cf39764135f3e3a39cbfb8efc50de1ac28 +Author: Albert Astals Cid +Date: Fri May 12 23:38:26 2017 +0200 + + Make Dict incRef/decRef private + + poppler/Catalog.cc | 40 +++++++++++----------------------------- + poppler/Catalog.h | 2 +- + poppler/Dict.h | 9 +++++---- + poppler/PDFDoc.cc | 37 ++++++++++++++++--------------------- + poppler/PDFDoc.h | 7 +++---- + poppler/Page.cc | 17 ++++++++--------- + poppler/Page.h | 2 +- + utils/pdfunite.cc | 12 +++++------- + 8 files changed, 50 insertions(+), 76 deletions(-) + +commit 0d7aa8c8aa491e005f78b019eff78f400764a61c +Author: Albert Astals Cid +Date: Fri May 12 23:10:53 2017 +0200 + + Make Array incRef/decRef private + + poppler/Array.h | 9 +++++---- + poppler/PDFDoc.cc | 14 +++++++------- + 2 files changed, 12 insertions(+), 11 deletions(-) + +commit b1f4e35fa2da8909dee07529ce1dd9445639793b +Author: Albert Astals Cid +Date: Fri May 12 23:03:28 2017 +0200 + + Make Stream incRef/decRef private + + Object handles it for us + + Also remove incRef/decRef from OutStream + + glib/poppler-action.cc | 2 +- + glib/poppler-attachment.cc | 15 ++++--------- + glib/poppler-media.cc | 19 +++++++---------- + poppler/FileSpec.h | 1 + + poppler/Rendition.cc | 53 + +++++++++++++++++++++++----------------------- + poppler/Rendition.h | 6 ++++-- + poppler/Stream.cc | 1 - + poppler/Stream.h | 18 ++++++---------- + 8 files changed, 50 insertions(+), 65 deletions(-) + +commit d34e5304a9094d505ffce8ec4069d4ddf2ee5950 +Author: Albert Astals Cid +Date: Fri May 12 22:41:03 2017 +0200 + + Get rid of another incRef() call + + poppler/Annot.cc | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit a7f2baa21a09454cb393dce806896e62e548f63e +Author: Albert Astals Cid +Date: Fri May 12 22:38:41 2017 +0200 + + Pass the Object around instead of the Dict + + Saves an awkard incRef call + + poppler/Annot.cc | 198 + +++++++++++++++++++++++++++---------------------------- + poppler/Annot.h | 46 ++++++------- + poppler/Form.cc | 2 +- + 3 files changed, 122 insertions(+), 124 deletions(-) + +commit 0321bca7a3f6f5bd8b8f3e6ad13f4441e53c909b +Author: Albert Astals Cid +Date: Fri May 12 22:25:36 2017 +0200 + + SplashOutputDev::doUpdateFont - Fix crash on broken file + + poppler/SplashOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 96ff78d63d2173671d07f62910b1d85c5fc509ff +Author: Albert Astals Cid +Date: Wed May 10 11:20:56 2017 +0200 + + cpp: Return nullptr if the page at index can't be fethed + + That is the same of what the glib/qt frontends do. + + Bug #100981 + + cpp/poppler-document.cpp | 13 ++++++++++++- + cpp/tests/poppler-dump.cpp | 18 +++++++++++++----- + 2 files changed, 25 insertions(+), 6 deletions(-) + +commit d83b11300386c7f0364acff06bd809e9efcbe4ca +Author: Albert Astals Cid +Date: Tue May 9 16:08:18 2017 +0200 + + JPXStreamPrivate::init2 - Fix memory leak in broken files + + poppler/JPEG2000Stream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 270866ebac7920503c0856a5dd1e7937ab68dd5f +Author: Albert Astals Cid +Date: Tue May 9 14:34:57 2017 +0200 + + GfxDeviceNColorSpace::parse - Fix memory leak on broken files + + poppler/GfxState.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 22123c836b35c1e8a1feb831899aacd991597c45 +Author: Albert Astals Cid +Date: Tue May 9 10:59:21 2017 +0200 + + TextPool::addWord - Fix memory leak on broken files + + poppler/TextOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit d7a102f49e2ea63c1cf3ed79134ce6fc2b2c6a59 +Author: Albert Astals Cid +Date: Tue May 9 10:50:27 2017 +0200 + + FoFiType1::parse - Fix memory leak on broken files + + fofi/FoFiType1.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 9773c1534668d84b8267c3e5c9d612076fa231a5 +Author: Albert Astals Cid +Date: Tue May 9 00:38:07 2017 +0200 + + New Object API + + Implement the move operators and copy construtor + + Almost all the init() functions are gone and we just have simple + constructors now + + Also made free() public since you're not supposed to call it anymore, + unless you're being evil and malloc'ing Objects like Array/Dict/XRef + + This has a huge reaction chain, most importantly we + don't get objects by passing a pointer Object parameter, we + just get the object as a return value, which is a much clearer API + - aobj->copy(&obj); + + obj = aobj->copy(); + before I was never sure what was being copied into what + + Comes with a huge diff, I probably made some mistake in the porting + since there was lots of copy & paste involved + + cpp/poppler-document.cpp | 14 +- + cpp/poppler-page.cpp | 5 +- + glib/poppler-action.cc | 27 +- + glib/poppler-attachment.cc | 4 +- + glib/poppler-document.cc | 30 +- + glib/poppler-input-stream.cc | 10 +- + glib/poppler-input-stream.h | 4 +- + glib/poppler-movie.cc | 5 +- + glib/poppler-page.cc | 13 +- + glib/poppler-structure-element.cc | 37 +- + poppler/Annot.cc | 1779 + +++++++++++++++-------------------- + poppler/Annot.h | 27 +- + poppler/Array.cc | 34 +- + poppler/Array.h | 8 +- + poppler/CMap.cc | 12 +- + poppler/CairoFontEngine.cc | 6 +- + poppler/CairoOutputDev.cc | 5 +- + poppler/Catalog.cc | 383 +++----- + poppler/Catalog.h | 2 +- + poppler/DCTStream.cc | 8 +- + poppler/Dict.cc | 49 +- + poppler/Dict.h | 12 +- + poppler/FileSpec.cc | 133 ++- + poppler/FileSpec.h | 5 +- + poppler/FontInfo.cc | 43 +- + poppler/Form.cc | 337 +++---- + poppler/Form.h | 2 +- + poppler/Function.cc | 225 ++--- + poppler/Gfx.cc | 767 ++++++--------- + poppler/Gfx.h | 14 +- + poppler/GfxFont.cc | 350 +++---- + poppler/GfxFont.h | 4 +- + poppler/GfxState.cc | 794 ++++++---------- + poppler/Hints.cc | 25 +- + poppler/JBIG2Stream.cc | 5 +- + poppler/JPEG2000Stream.cc | 17 +- + poppler/Lexer.cc | 74 +- + poppler/Lexer.h | 7 +- + poppler/Linearization.cc | 57 +- + poppler/Link.cc | 197 ++-- + poppler/Movie.cc | 112 +-- + poppler/Movie.h | 2 +- + poppler/Object.cc | 67 +- + poppler/Object.h | 153 ++- + poppler/OptionalContent.cc | 144 +-- + poppler/Outline.cc | 49 +- + poppler/PDFDoc.cc | 371 +++----- + poppler/PDFDoc.h | 8 +- + poppler/PSOutputDev.cc | 406 +++----- + poppler/Page.cc | 192 ++-- + poppler/Page.h | 17 +- + poppler/PageLabelInfo.cc | 52 +- + poppler/PageTransition.cc | 34 +- + poppler/Parser.cc | 96 +- + poppler/Parser.h | 9 +- + poppler/PopplerCache.cc | 21 +- + poppler/PopplerCache.h | 4 +- + poppler/Rendition.cc | 169 ++-- + poppler/SecurityHandler.cc | 85 +- + poppler/Sound.cc | 40 +- + poppler/Sound.h | 5 +- + poppler/SplashOutputDev.cc | 15 +- + poppler/StdinPDFDocBuilder.cc | 7 +- + poppler/Stream.cc | 133 +-- + poppler/Stream.h | 24 +- + poppler/StructElement.cc | 244 ++--- + poppler/StructTreeRoot.cc | 74 +- + poppler/ViewerPreferences.cc | 43 +- + poppler/XRef.cc | 404 +++----- + poppler/XRef.h | 16 +- + qt4/src/poppler-annotation-helper.h | 39 +- + qt4/src/poppler-document.cc | 13 +- + qt4/src/poppler-form.cc | 7 +- + qt4/src/poppler-optcontent.cc | 17 +- + qt4/src/poppler-page.cc | 18 +- + qt4/src/poppler-private.h | 6 +- + qt4/tests/check_lexer.cpp | 63 +- + qt4/tests/check_optcontent.cpp | 114 +-- + qt5/src/poppler-annotation-helper.h | 39 +- + qt5/src/poppler-document.cc | 11 +- + qt5/src/poppler-form.cc | 5 +- + qt5/src/poppler-optcontent.cc | 17 +- + qt5/src/poppler-page.cc | 16 +- + qt5/src/poppler-private.h | 6 +- + qt5/tests/check_lexer.cpp | 91 +- + qt5/tests/check_optcontent.cpp | 114 +-- + test/pdf-fullrewrite.cc | 21 +- + utils/pdfinfo.cc | 21 +- + utils/pdftohtml.cc | 13 +- + utils/pdftotext.cc | 24 +- + utils/pdfunite.cc | 208 ++-- + 91 files changed, 3539 insertions(+), 5850 deletions(-) + +commit 3c29ded4bee5eadb829ed46af2ec92be57b0077b +Author: Albert Astals Cid +Date: Fri May 5 23:32:32 2017 +0200 + + Make Object free itself on init and destruction + + Will make for a *much* easier way to code. + + Patches with more std::move coming on top. + + Most things seem to work though i'm pretty sure some things are + broken. + + NEEDS TESTING + + poppler/Annot.cc | 3 +- + poppler/Array.cc | 5 +-- + poppler/Array.h | 4 ++- + poppler/Catalog.cc | 29 ++++++++++------- + poppler/Catalog.h | 6 ++-- + poppler/DCTStream.cc | 8 ++--- + poppler/DCTStream.h | 4 +-- + poppler/Dict.cc | 29 ++++++++--------- + poppler/Dict.h | 4 ++- + poppler/Form.cc | 1 - + poppler/Gfx.cc | 25 ++++++--------- + poppler/Movie.cc | 30 +++++++++++------- + poppler/Movie.h | 2 ++ + poppler/Object.cc | 51 +++++++++++++++++++++++++++--- + poppler/Object.h | 79 + +++++++++++++++++++++++++++++----------------- + poppler/OptionalContent.cc | 2 +- + poppler/Page.cc | 4 +-- + poppler/Page.h | 6 ++-- + poppler/Parser.cc | 4 +-- + poppler/Stream.cc | 36 ++++++++++++++------- + poppler/Stream.h | 8 ++--- + poppler/StructElement.cc | 10 ++---- + poppler/XRef.cc | 19 ++++++++--- + utils/pdfunite.cc | 4 +-- + 24 files changed, 234 insertions(+), 139 deletions(-) + +commit d73bcd3721f3b53bb97241cc53a6abf807aff782 +Author: Albert Astals Cid +Date: Fri May 5 15:12:42 2017 +0200 + + auto_ptr -> unique_ptr + + cpp/poppler-document.cpp | 25 +++++++++++++------------ + cpp/poppler-image.cpp | 9 +++++---- + cpp/poppler-page.cpp | 3 ++- + cpp/tests/poppler-dump.cpp | 9 +++++---- + cpp/tests/poppler-render.cpp | 5 +++-- + qt4/tests/check_fonts.cpp | 4 ++-- + qt4/tests/check_links.cpp | 4 ++-- + qt5/tests/check_fonts.cpp | 4 ++-- + qt5/tests/check_links.cpp | 4 ++-- + 9 files changed, 36 insertions(+), 31 deletions(-) + +commit 9ad9d92591a6389f84919ff2de3668c2b6158dc9 +Author: Albert Astals Cid +Date: Fri May 5 00:57:35 2017 +0200 + + Fix memory leak in error condition + + Coverity was complaining we missed one delete in one of the error + conditions, so just made colorMap not be newer, no need to care about + deletes ;) + + poppler/Gfx.cc | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +commit cdab9a2dc27a10c84550db28fac8dbdcdcd4d29d +Author: Albert Astals Cid +Date: Fri May 5 00:47:45 2017 +0200 + + Move the bits sanity checking a bit higher in the function + + Saves some time and makes the code simpler as we have to delete one + thing less + + poppler/Gfx.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit b2545e9368a58a6987614f75d39da4568a076881 +Author: Albert Astals Cid +Date: Thu May 4 21:24:23 2017 +0200 + + Fix regression in GfxIndexedColorSpace::mapColorToBase + + The bounds check was off by one, making file from bug 100931 render + incorrectly. Bug #100931 + + poppler/GfxState.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 09000ce81397eba1eed383f730e48b92b932e0b4 +Author: Albert Astals Cid +Date: Thu May 4 18:35:16 2017 +0200 + + Minor optimization + + Do not create a timer for every single operation since we hardly + run the + profileCommands if branch + + poppler/Gfx.cc | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit b21b041f7948680c03109f0c404400a9dbc4544c +Author: Albert Astals Cid +Date: Tue Apr 25 19:48:24 2017 +0200 + + Fix memory leak when reconstructing broken files + + Need to free the catalog variable if we're going to fetch over + it again + + Bug #100776 + + poppler/XRef.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 278439531b13b0b047dbe3a75aa3f1b3407c8bd4 +Author: Albert Astals Cid +Date: Tue Apr 25 19:42:15 2017 +0200 + + Fix memory leak (and probably logic bug) parsing broken XRef entries + + Don't need to get obj1 again to ask if it's an int64 instead of an int + + Bug #100775 + + poppler/XRef.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 478be219772a6c298baad568da3643895cd50d35 +Author: Albert Astals Cid +Date: Fri Apr 21 16:29:44 2017 +0200 + + Poppler 0.54 + + CMakeLists.txt | 2 +- + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + gtk-doc.make | 1 + + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 9 files changed, 22 insertions(+), 7 deletions(-) + +commit d627a38b3a25906b356413a1de29aaad9f7a0f28 +Author: Albert Astals Cid +Date: Fri Apr 21 16:03:49 2017 +0200 + + Update (C) + + poppler/XRef.cc | 2 +- + qt5/src/poppler-private.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 3a13817da1fff5244267bbc7dee178ac665de4e0 +Author: Adrian Johnson +Date: Fri Apr 21 19:23:07 2017 +0930 + + pdfimages: don't fail listing if inline image data contains 'EI' + + Normally when listing images we don't read the image data. But for + inline images we should read the image data to advance the stream + position to the end of the image data. If we don't advance the stream + position and the image data happens to contain 'EI', Gfx will resume + reading the content stream from the middle of the image data. + + Bug 100737 + + utils/ImageOutputDev.cc | 61 + ++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 45 insertions(+), 16 deletions(-) + +commit e3779c849c86685c9bc294af407b364daf4b2202 +Author: Carlos Garcia Campos +Date: Sat Apr 8 09:56:59 2017 +0200 + + glib: Fix return value in API doc comment of + poppler_movie_get_play_mode + + glib/poppler-movie.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cc7809e73c71e0e6b7db29dc8a12cfb573448b77 +Author: Albert Astals Cid +Date: Wed Apr 5 23:18:52 2017 +0200 + + Make XRef reconstruction a bit better + + Also detect streams whose endstream is on the middle of a line and + not only at the beginning + + Bug #100509 + + poppler/XRef.cc | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) + +commit 2bbd110113f789c56609b3288258f667e0f3851a +Author: Carlos Garcia Campos +Date: Sun Apr 2 15:49:48 2017 +0200 + + glib-demo: Show play mode in movie properties view + + glib/demo/utils.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit dad9b36e0e91524e8e342cf924026c37fcb1730e +Author: Francesco Poli (wintermute) +Date: Sun Apr 2 15:28:20 2017 +0200 + + glib: Expose movie play mode + + With this patch the movie play mode can be queried via the glib + interface. An enum value is obtained that reports whether the movie + should be played once, in loop, and so forth... + + https://bugs.freedesktop.org/show_bug.cgi?id=99625 + + glib/poppler-movie.cc | 35 + +++++++++++++++++++++++++++++++++++ + glib/poppler-movie.h | 31 ++++++++++++++++++++++++++----- + glib/reference/poppler-sections.txt | 4 ++++ + 3 files changed, 65 insertions(+), 5 deletions(-) + +commit 0dbec24428d96ae78be8ca06b230d68cde445614 +Author: Christoph Cullmann +Date: Wed Mar 22 23:45:41 2017 +0100 + + qt5: Compile with -DQT_NO_CAST_FROM_BYTEARRAY + + Bug #100311 + + qt5/src/poppler-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7ba4eb3ac3f23236e3df1ef992160d702dc5e4e9 +Author: Albert Astals Cid +Date: Wed Mar 22 23:42:57 2017 +0100 + + Poppler 0.53 + + CMakeLists.txt | 4 ++-- + NEWS | 18 ++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/Makefile.am | 2 +- + 9 files changed, 27 insertions(+), 9 deletions(-) + +commit 411c963a9fe7d0d51bc96f046792688a020bfc66 +Author: Albert Astals Cid +Date: Sun Mar 19 12:40:37 2017 +0100 + + Update (C) + + goo/PNGWriter.cc | 2 +- + goo/PNGWriter.h | 2 +- + goo/TiffWriter.cc | 2 +- + goo/TiffWriter.h | 2 +- + poppler/GfxState.h | 2 +- + utils/ImageOutputDev.cc | 2 +- + utils/ImageOutputDev.h | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +commit 96333f6dcd93afadea35f9301c7a919545037ed4 +Author: Albert Astals Cid +Date: Wed Mar 8 23:33:00 2017 +0100 + + Add override markers + + cmake/modules/PopplerMacros.cmake | 4 + + fofi/FoFiIdentifier.cc | 42 +-- + fofi/FoFiTrueType.h | 2 +- + fofi/FoFiType1.h | 2 +- + glib/poppler-cached-file-loader.h | 4 +- + glib/poppler-input-stream.h | 34 +-- + goo/JpegWriter.h | 10 +- + goo/NetPBMWriter.h | 8 +- + goo/PNGWriter.h | 8 +- + goo/TiffWriter.h | 10 +- + poppler/Annot.h | 50 ++-- + poppler/CairoFontEngine.h | 6 +- + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 344 +++++++++++----------- + poppler/DCTStream.h | 18 +- + poppler/Decrypt.h | 24 +- + poppler/FlateEncoder.h | 16 +- + poppler/Form.h | 18 +- + poppler/Function.h | 52 ++-- + poppler/GfxFont.h | 20 +- + poppler/GfxState.cc | 2 +- + poppler/GfxState.h | 366 + +++++++++++------------ + poppler/JBIG2Stream.cc | 16 +- + poppler/JBIG2Stream.h | 22 +- + poppler/JPEG2000Stream.h | 24 +- + poppler/Link.h | 66 ++--- + poppler/LocalPDFDocBuilder.h | 5 +- + poppler/MarkedContentOutputDev.h | 22 +- + poppler/PSOutputDev.cc | 16 +- + poppler/PSOutputDev.h | 142 ++++----- + poppler/PopplerCache.cc | 2 +- + poppler/PreScanOutputDev.h | 110 +++---- + poppler/SecurityHandler.h | 30 +- + poppler/SplashOutputDev.cc | 2 +- + poppler/SplashOutputDev.h | 210 ++++++------- + poppler/StdinCachedFile.h | 5 +- + poppler/StdinPDFDocBuilder.h | 5 +- + poppler/Stream.h | 422 + +++++++++++++-------------- + poppler/TextOutputDev.cc | 38 +-- + poppler/TextOutputDev.h | 46 +-- + poppler/XRef.cc | 2 +- + poppler/XRef.h | 12 +- + qt4/CMakeLists.txt | 3 + + qt4/src/poppler-annotation.h | 8 +- + qt4/src/poppler-link.h | 2 +- + qt5/demos/abstractinfodock.h | 6 +- + qt5/demos/embeddedfiles.h | 6 +- + qt5/demos/fonts.h | 4 +- + qt5/demos/info.h | 4 +- + qt5/demos/metadata.h | 4 +- + qt5/demos/navigationtoolbar.h | 6 +- + qt5/demos/optcontent.h | 6 +- + qt5/demos/pageview.h | 6 +- + qt5/demos/permissions.h | 4 +- + qt5/demos/thumbnails.h | 4 +- + qt5/demos/toc.h | 4 +- + qt5/demos/viewer.h | 2 +- + qt5/src/ArthurOutputDev.cc | 2 +- + qt5/src/ArthurOutputDev.h | 90 +++--- + qt5/src/poppler-annotation.cc | 56 ++-- + qt5/src/poppler-annotation.h | 84 +++--- + qt5/src/poppler-form.h | 16 +- + qt5/src/poppler-link-extractor-private.h | 10 +- + qt5/src/poppler-link.h | 24 +- + qt5/src/poppler-optcontent.h | 18 +- + qt5/src/poppler-qiodeviceoutstream-private.h | 10 +- + qt5/src/poppler-qt5.h | 6 +- + qt5/tests/stress-threads-qt5.cpp | 4 +- + qt5/tests/test-password-qt5.cpp | 4 +- + qt5/tests/test-poppler-qt5.cpp | 6 +- + splash/SplashFTFont.h | 12 +- + splash/SplashFTFontFile.h | 6 +- + splash/SplashPattern.h | 12 +- + test/gtk-test.cc | 6 +- + utils/HtmlOutputDev.h | 56 ++-- + utils/ImageOutputDev.h | 62 ++-- + utils/pdftohtml.cc | 12 +- + 77 files changed, 1404 insertions(+), 1400 deletions(-) + +commit da490581b1b4d50efdba1e25115697e17bb0ef51 +Author: Albert Astals Cid +Date: Wed Mar 8 22:07:34 2017 +0100 + + Compile in C++11 mode + + I tried using AX_CXX_COMPILE_STDCXX_11 for the autotools side but + could not get it to fill CXXFLAGS or any other variable i could find, + help welcome + + CMakeLists.txt | 4 +++- + configure.ac | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit aa8633267d1d0e2079bb4a2b82bc7b36a4d306f5 +Author: Albert Astals Cid +Date: Mon Mar 6 22:45:52 2017 +0100 + + pdfinfo: Fix memory leak when printing JS + + utils/JSInfo.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit d30e66cf39ef69a81bdd91e21203c876f38d9a09 +Author: Albert Astals Cid +Date: Mon Mar 6 22:43:27 2017 +0100 + + pdfinfo: fix leak when printing JS + + utils/JSInfo.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit a7632c5db6875828500dce7c984ec933d5349f26 +Author: Albert Astals Cid +Date: Mon Mar 6 22:34:20 2017 +0100 + + pdftohtml: fix small memory leak when constructing some filenames + + utils/HtmlOutputDev.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 8ebec831c2abea9f13761474990c0d94346c1a35 +Author: Albert Astals Cid +Date: Mon Mar 6 22:24:06 2017 +0100 + + SplashOutputDev: Fix memory leak when rendering images with colormap + and matte color + + poppler/SplashOutputDev.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit cfaeeadbc642a297486481d9efd6068fd9ef7ea3 +Author: Adrian Johnson +Date: Sat Mar 4 10:54:29 2017 +1030 + + pdfimages: support 16bpc png and tiff images + + bug 99988 + + goo/PNGWriter.cc | 4 ++++ + goo/PNGWriter.h | 3 ++- + goo/TiffWriter.cc | 6 ++++++ + goo/TiffWriter.h | 3 ++- + poppler/GfxState.h | 4 ++++ + utils/ImageOutputDev.cc | 38 +++++++++++++++++++++++++++++++++++++- + utils/ImageOutputDev.h | 1 + + 7 files changed, 56 insertions(+), 3 deletions(-) + +commit 1b0653ce395242547b2b34b99034a19cd2d3ea6b +Author: Albert Astals Cid +Date: Thu Mar 2 01:00:12 2017 +0100 + + Qt5: Expose Form additional actions + + qt5/src/poppler-form.cc | 20 ++++++++++++++++++++ + qt5/src/poppler-form.h | 19 +++++++++++++++++++ + 2 files changed, 39 insertions(+) + +commit a4c6433c423bd0dcc5056d9ee0375188fea9a0bc +Author: Albert Astals Cid +Date: Thu Mar 2 00:56:43 2017 +0100 + + Update (C) of previous commit + + poppler/Form.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0151e6e3824a6db907d871a2e56f5c20c001b588 +Author: Albert Astals Cid +Date: Thu Mar 2 00:56:27 2017 +0100 + + Qt5: expose form calculate order + + qt5/src/poppler-document.cc | 18 +++++++++++++++++- + qt5/src/poppler-qt5.h | 9 ++++++++- + 2 files changed, 25 insertions(+), 2 deletions(-) + +commit 0ae3d40a79c25feb5cb9bce6fc8cc48c30bfd1b6 +Author: Albert Astals Cid +Date: Thu Mar 2 00:52:21 2017 +0100 + + Parse AcroForm CO (calculateOrder) + + poppler/Form.cc | 19 +++++++++++++++++++ + poppler/Form.h | 4 ++++ + 2 files changed, 23 insertions(+) + +commit bbfc56b3c9a1e613e6db008a56c9c3333ae1427a +Author: Albert Astals Cid +Date: Thu Mar 2 00:45:44 2017 +0100 + + Make FormWidget* setters ignore isReadOnly + + isReadOnly is for the user but poppler needs to be able to set the + value for example for fields whose value is autocalculated + + poppler/Form.cc | 23 +---------------------- + 1 file changed, 1 insertion(+), 22 deletions(-) + +commit f853145556a61a3d1104d6fd62261924d9fc9e50 +Author: Albert Astals Cid +Date: Sun Feb 19 23:25:47 2017 +0100 + + There's no config file + + poppler/GlobalParams.h | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit c7a7c34fcb875414eb3092df84f8e8e8e523648d +Author: Albert Astals Cid +Date: Wed Feb 15 23:26:10 2017 +0100 + + Poppler 0.52.0 + + CMakeLists.txt | 2 +- + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 21 insertions(+), 5 deletions(-) + +commit baad9bd0406f63cffa8054c5831ccc3cb5d207e3 +Author: Albert Astals Cid +Date: Wed Feb 15 23:05:55 2017 +0100 + + Update C years + + poppler/Annot.cc | 2 +- + poppler/OptionalContent.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 83d4d3ee56b22ef4c0899514abcfc4c220fb4031 +Author: Albert Astals Cid +Date: Mon Feb 13 20:47:05 2017 +0100 + + Properly initialize some RichMedia variables in corner cases + + Bug #99767 + + poppler/Annot.cc | 31 ++++++++++++++----------------- + 1 file changed, 14 insertions(+), 17 deletions(-) + +commit 8de4b3595a80d8880b842599cb25ab5fd5367689 +Author: Albert Astals Cid +Date: Mon Feb 13 01:15:04 2017 +0100 + + Fix assert on reading some OCGs + + Check the object is a ref before calling getRef + + Bug #99768 + + poppler/OptionalContent.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 0b7c235c3ebe2a7a8d7bd6bfb22e605bf770a022 +Author: Adrian Johnson +Date: Thu Feb 9 21:23:04 2017 +1030 + + pdftocairo.1: typo + + utils/pdftocairo.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e7aad35dcba3449bc8a56de070fea7e09cb64833 +Author: Hubert Figuière +Date: Tue Jan 17 23:58:00 2017 -0500 + + Qt: fix memory leaks found when running tests + + -cleanup objects in tests to fix memory leaks. + -optcontent was leaking the headers items + + Bug #99449 + + qt4/src/poppler-optcontent-private.h | 2 ++ + qt4/src/poppler-optcontent.cc | 3 +++ + qt4/tests/check_links.cpp | 2 ++ + qt5/src/poppler-optcontent-private.h | 2 ++ + qt5/src/poppler-optcontent.cc | 3 +++ + qt5/tests/check_links.cpp | 2 ++ + 6 files changed, 14 insertions(+) + +commit dc8edecc437f33305257b6cb208dc2da367b7868 +Author: Albert Astals Cid +Date: Sun Jan 15 18:27:49 2017 +0100 + + Poppler 0.51 + + CMakeLists.txt | 2 +- + NEWS | 15 ++++++++++++++- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/Makefile.am | 2 +- + 8 files changed, 21 insertions(+), 8 deletions(-) + +commit c4de00a93c470020c6c96eb343854039bfc0a424 +Author: Albert Astals Cid +Date: Sat Jan 14 23:42:32 2017 +0100 + + Forgot to update the \since value + + qt5/src/poppler-form.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0eb28e216fc45fe5ceed1c093a541ceca0dc0397 +Author: Christoph Cullmann +Date: Fri Jan 13 00:03:27 2017 +0100 + + qt5: Fix segfault/assert if LinkDestination is constructed with + invalid input string. + + Bug #99357 + + qt5/src/poppler-link.cc | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +commit 4db6507320b51e060f73f7fb0eab364e8a1fee77 +Author: Sebastian Rasmussen +Date: Wed Jan 11 23:37:54 2017 +0100 + + Check for error from NSS in SignatureHandler construct. + + And cascading effects in other SignalHandler members. + + Bug #99363 + + poppler/SignatureHandler.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 8bb90fc828a3400a2464a38f0ec9e592754197dd +Author: Albert Astals Cid +Date: Tue Jan 10 17:20:18 2017 +0100 + + Qt5: Minor api refinements to the new signature classes + + qt5/src/poppler-form.cc | 32 +++++++++++++++++++++----------- + qt5/src/poppler-form.h | 22 +++++++++++----------- + qt5/tests/poppler-forms.cpp | 14 +++++++------- + 3 files changed, 39 insertions(+), 29 deletions(-) + +commit aa63debdaa6001ed68333b31cd06c2f9958fd8d2 +Author: Hanno Meyer-Thurow +Date: Tue Jan 10 16:28:14 2017 +0100 + + Qt5: Implement digital signature support + + Bug #94378 + + qt5/src/poppler-form.cc | 121 + ++++++++++++++++++++++++++++++++++++++++++++ + qt5/src/poppler-form.h | 106 ++++++++++++++++++++++++++++++++++++++ + qt5/src/poppler-page.cc | 7 +++ + qt5/tests/poppler-forms.cpp | 47 ++++++++++++++++- + 4 files changed, 280 insertions(+), 1 deletion(-) + +commit 2f831d5b9481e5ab06178409f7fccf74eda6e1a2 +Author: Albert Astals Cid +Date: Mon Jan 9 00:30:42 2017 +0100 + + New year! + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b6c4d6d1312f63e5e6dcfa28ea48ff3e6935daa9 +Author: Albert Astals Cid +Date: Mon Jan 9 00:28:37 2017 +0100 + + Fix memory leak in PDFDoc::markAnnotations + + poppler/PDFDoc.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 3cae7773d2f8ad6506e2712689c56fa6975e01d3 +Author: Thomas Freitag +Date: Mon Jan 9 00:25:53 2017 +0100 + + pdfunite: add fields to AcroForm dict + + Bug #99141 + + utils/pdfunite.cc | 33 +++++++++++++++++++++++++++++++-- + 1 file changed, 31 insertions(+), 2 deletions(-) + +commit c301f6c675784a65fb2ebdf99ded5d5d3f8defdd +Author: Albert Astals Cid +Date: Mon Dec 19 22:53:47 2016 +0100 + + qt5: Add Poppler::FormField::setName + + qt5/src/poppler-form.cc | 9 ++++++++- + qt5/src/poppler-form.h | 10 ++++++++-- + 2 files changed, 16 insertions(+), 3 deletions(-) + +commit 86c99de95cd16199e0f9f1fb82999c27d54c5b76 +Author: Albert Astals Cid +Date: Mon Dec 19 22:53:10 2016 +0100 + + Add Form[Field|Widget]::setPartialName + + Useful to repair/tweak pdf files + + poppler/Form.cc | 16 ++++++++++++++++ + poppler/Form.h | 2 ++ + 2 files changed, 18 insertions(+) + +commit 56dfa44960b9ab9fb4dcc01d8e3861a9293b0ee0 +Author: Albert Astals Cid +Date: Thu Dec 15 23:32:41 2016 +0100 + + Poppler 0.50 + + CMakeLists.txt | 4 ++-- + NEWS | 25 +++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 3 ++- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/Makefile.am | 3 ++- + 11 files changed, 38 insertions(+), 11 deletions(-) + +commit 1511523450f40b539fb1d58950a907f3712fd5c7 +Author: Albert Astals Cid +Date: Thu Dec 15 22:04:04 2016 +0100 + + Refine previous fix a bit + + Call GfxColorSpace::setupColorProfiles only when we really need it + + poppler/GfxState.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 9b016440725de086fa87fcbf776e27acee2c01b7 +Author: Marek Kasik +Date: Wed Sep 21 12:28:16 2016 +0200 + + Don't crash when calling cmsGetColorSpace() + + Initialize RGBProfile and displayProfile before their use + if they were not initialized in GfxState's constructor. + + https://bugs.freedesktop.org/show_bug.cgi?id=97870 + + poppler/GfxState.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8321b400adf6c042cd630ceea7f54fcf6862211d +Author: Albert Astals Cid +Date: Thu Dec 15 18:02:30 2016 +0100 + + Add one more const + + Makes clang happier (i.e. gives one warning less) + + fofi/FoFiEncodings.cc | 18 ++++++++++++++++-- + fofi/FoFiEncodings.h | 18 ++++++++++++++++-- + 2 files changed, 32 insertions(+), 4 deletions(-) + +commit 1a6e4b65197391b23c2163b939d4787f2058a2e1 +Author: Jason Crain +Date: Wed Dec 7 09:28:58 2016 -0600 + + cairo: initialize CairoOutputDev::antialias + + Initialize CairoOutputDev::antialias to CAIRO_ANTIALIAS_DEFAULT. + + Bug #98983 + + poppler/CairoOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 2cf901c817fc99e1fa57745c11aa79cdfb4e8c99 +Author: William Bader +Date: Thu Dec 8 21:45:18 2016 +0100 + + Fix PS conversion for some files + + Bug #63963 + + fofi/FoFiTrueType.cc | 13 ++++++++++++- + fofi/FoFiTrueType.h | 2 ++ + poppler/PSOutputDev.cc | 26 ++++++++++++++++++++++++++ + poppler/PSOutputDev.h | 1 + + 4 files changed, 41 insertions(+), 1 deletion(-) + +commit 97b801b55b9bd33f20723c7139cf845a1cba5bd3 +Author: Albert Astals Cid +Date: Wed Dec 7 22:52:24 2016 +0100 + + Remove useless include + + utils/pdftohtml.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 7ac94c8f552f0db13334d4d014cfdb54de72c451 +Author: Albert Astals Cid +Date: Wed Dec 7 22:38:48 2016 +0100 + + nSharedGroups doesn't need to be a class member + + And also mark some variables as const to make it easier to see they + don't change + + poppler/Hints.cc | 20 +++++++------------- + poppler/Hints.h | 1 - + 2 files changed, 7 insertions(+), 14 deletions(-) + +commit 4c4b913802c79eb8bf9c0ce72a08842851f1c5bc +Author: Jeffrey Morlan +Date: Wed Dec 7 22:36:26 2016 +0100 + + Bail out if nBitsNumObjects or nBitsDiffGroupLength are greater + than 32 + + Bug #94941 + + poppler/Hints.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 21cd08e34bd317b2ecc7c8b4e0d122d85bdf6714 +Author: Albert Astals Cid +Date: Sat Dec 3 02:18:58 2016 +0100 + + Default to libopenjpeg2 instead of libopenjpeg1 + + Tested 2.1.1 and it's better or equal than the old libopenjpeg1 + + I thought of doing a version check but i don't think it's common + someone will be building a new poppler with an old libopenjpeg2 + + CMakeLists.txt | 16 ++++++++-------- + configure.ac | 31 ++++++++++++++++--------------- + 2 files changed, 24 insertions(+), 23 deletions(-) + +commit b5f3e935c3a1f4824fcd681e291c35852966bb45 +Author: Albert Astals Cid +Date: Fri Dec 2 00:09:38 2016 +0100 + + Revert "introduced hex string as a new Object type and used it for + file identifier" + + This reverts commit debd1361f4a4cb7811677ab7a8f241b8b6fca5f9. + + poppler/Lexer.cc | 3 +-- + poppler/Object.cc | 15 ++------------- + poppler/Object.h | 16 +++------------- + poppler/PDFDoc.cc | 10 ---------- + 4 files changed, 6 insertions(+), 38 deletions(-) + +commit 3a260ba8b3db99b4c0a956cc615704168db30e56 +Author: Albert Astals Cid +Date: Fri Dec 2 00:09:31 2016 +0100 + + Revert "treat file identifier as a hex string, not a basic string" + + This reverts commit 628299bc02ef825609e1ade539f967bbf052be0c. + + poppler/PDFDoc.cc | 12 ++++++------ + poppler/PSOutputDev.cc | 5 ++--- + poppler/SecurityHandler.cc | 3 +-- + poppler/StructElement.cc | 5 ++--- + 4 files changed, 11 insertions(+), 14 deletions(-) + +commit 42ef2ac51543fabb5f5f5c3a19c79020d4fb1238 +Author: Thomas Freitag +Date: Wed Nov 30 00:14:46 2016 +0100 + + Read softmask into memstrean in case of matte + + In case of matte the softmask has to be read twice. This is not + possible when read from stdin. So this patch allocate a memstream + first and read the softmask into this memstream. + + Bug #97803 + + poppler/SplashOutputDev.cc | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +commit c448e16dc4f2f3c55b06e3f1e098f45f8abacc18 +Author: William Bader +Date: Wed Nov 30 00:00:15 2016 +0100 + + patch to add -passlevel1customcolor + + Bug #97193 + + poppler/PSOutputDev.cc | 38 ++++++++++++++++---------------------- + poppler/PSOutputDev.h | 5 +++++ + utils/pdftops.cc | 6 +++++- + 3 files changed, 26 insertions(+), 23 deletions(-) + +commit 628299bc02ef825609e1ade539f967bbf052be0c +Author: Jakub Alba +Date: Sun Jul 24 22:46:23 2016 +0200 + + treat file identifier as a hex string, not a basic string + + poppler/PDFDoc.cc | 12 ++++++------ + poppler/PSOutputDev.cc | 5 +++-- + poppler/SecurityHandler.cc | 3 ++- + poppler/StructElement.cc | 5 +++-- + 4 files changed, 14 insertions(+), 11 deletions(-) + +commit debd1361f4a4cb7811677ab7a8f241b8b6fca5f9 +Author: Jakub Alba +Date: Sun Jul 24 22:30:30 2016 +0200 + + introduced hex string as a new Object type and used it for file + identifier + + File identifiers are usually written as hex strings (and this is + how the PDF + reference presents them in an example). Until now, poppler was + reading hex + strings properly, but was forgeting about the fact that a given + string is a hex + string, so e.g. file identifier was first read as a hex string and + then printed as + an ordinary string and thanks to that what was printed was actually + junk. This + commit fixes that. + + poppler/Lexer.cc | 3 ++- + poppler/Object.cc | 15 +++++++++++++-- + poppler/Object.h | 16 +++++++++++++--- + poppler/PDFDoc.cc | 10 ++++++++++ + 4 files changed, 38 insertions(+), 6 deletions(-) + +commit 484d9d46e8995f12ce941be1e080e98e2ff4b95d +Author: Albert Astals Cid +Date: Fri Nov 25 20:05:19 2016 +0100 + + Spelling fixes spotted by William Bader + + qt4/src/poppler-optcontent.h | 2 +- + qt5/src/poppler-optcontent.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit bc11784e143d462d62d3f63fc61e58b4b9640da7 +Author: Albert Astals Cid +Date: Fri Nov 25 17:42:27 2016 +0100 + + Qt: Support OCG state change links + + qt4/src/poppler-link-private.h | 57 +++++++++++++++++++ + qt4/src/poppler-link.cc | 33 +++++------ + qt4/src/poppler-link.h | 34 +++++++++++- + qt4/src/poppler-optcontent-private.h | 3 +- + qt4/src/poppler-optcontent.cc | 103 + +++++++++++++++++++++++------------ + qt4/src/poppler-optcontent.h | 8 +++ + qt4/src/poppler-page.cc | 11 +++- + qt5/src/poppler-link-private.h | 57 +++++++++++++++++++ + qt5/src/poppler-link.cc | 33 +++++------ + qt5/src/poppler-link.h | 34 +++++++++++- + qt5/src/poppler-optcontent-private.h | 3 +- + qt5/src/poppler-optcontent.cc | 103 + +++++++++++++++++++++++------------ + qt5/src/poppler-optcontent.h | 8 +++ + qt5/src/poppler-page.cc | 11 +++- + 14 files changed, 382 insertions(+), 116 deletions(-) + +commit b4e93c374deaaf31121a666c987a35bc9554beb3 +Author: Kenji Uno +Date: Thu Nov 3 10:19:06 2016 +0900 + + Fix pdftoppm -tiff -gray/-mono incorrect output. + + - SplashBitmap has imageWriterFormat that ImgWriter + should accept. + + splash/SplashBitmap.cc | 93 + +++++++++++++++++++++++++++++++++++++------------- + splash/SplashBitmap.h | 3 +- + 2 files changed, 71 insertions(+), 25 deletions(-) + +commit 5a04becc4940b926744e64d3b7d0355adcabf282 +Author: Jakub Alba +Date: Fri Jun 17 13:41:39 2016 +0200 + + Fix PDFDoc::saveIncrementalUpdate()'s detection of document being + modified + + Bug 96561 + + poppler/PDFDoc.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 0c9c2089f52de5bb08717518c439fa8bbb99011f +Author: Albert Astals Cid +Date: Wed Nov 23 20:22:17 2016 +0100 + + Fix Outline parsing on broken documents + + Broken documents in which the parent "Last" pointer is earlier than + the siblings "Next" pointer + + This mimics Adobe Reader behaviour. + + Bug #98732 + + poppler/Outline.cc | 18 ++++-------------- + poppler/Outline.h | 4 ++-- + 2 files changed, 6 insertions(+), 16 deletions(-) + +commit e59cbaf9c1ab4a575633ee3263244e03c6d21713 +Author: Jason Crain +Date: Fri Nov 18 15:44:29 2016 -0600 + + glib: Use g_slice_new0 for PopplerActionLayer + + PDFs using PopplerActionLayer will sometimes crash because they are + allocated with g_new0 but freed with g_slice_free. Change the + allocation to use g_slice_new0. + + Bug #98786 + + glib/poppler-action.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 02e2d8e2c3004c36d1f8f798e5a7a30166f48f37 +Author: Albert Astals Cid +Date: Tue Nov 15 00:10:43 2016 +0100 + + 0.49 + + CMakeLists.txt | 4 ++-- + NEWS | 5 ++++- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 11 insertions(+), 8 deletions(-) + +commit f7f0f14e095425d171456a697804f2f34ed26426 +Author: Tor Lillqvist +Date: Tue Nov 15 00:06:26 2016 +0100 + + VS 2013 has fmin() and fmax() + + NEWS | 13 +++++++++++++ + poppler/poppler-config.h.cmake | 3 ++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit 07ac68603552b36a2a6b8ea5982f22f24f5835b1 +Author: Albert Astals Cid +Date: Tue Nov 15 00:03:24 2016 +0100 + + Update (C) + + poppler/PSOutputDev.cc | 1 + + poppler/poppler-config.h.in | 1 + + utils/pdfseparate.cc | 2 +- + 3 files changed, 3 insertions(+), 1 deletion(-) + +commit b837ae3bc69c5c76f1a4e3abaeb22d0574d6b2c8 +Author: Thomas Freitag +Date: Thu Nov 10 00:33:17 2016 +0100 + + Continue rendering in case of 'Singular matrix in shading pattern + fill' + + Bug #98623 + + poppler/Gfx.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 6c01a48458a8b4896d606ef9bcc4af5e03393b72 +Author: Thomas Freitag +Date: Wed Nov 2 23:10:01 2016 +0100 + + merge type3 glyph handling from xpdf 3.04 + + Fixes bug #96667 + + poppler/SplashOutputDev.cc | 28 +++++++++++++++++++++++----- + poppler/SplashOutputDev.h | 1 - + 2 files changed, 23 insertions(+), 6 deletions(-) + +commit f43cb73939f85952d83afc87a6dc638dc1ae311b +Author: Albert Astals Cid +Date: Wed Nov 2 00:13:26 2016 +0100 + + Avoid UBSan warning about undefined downcast + + ...of this-ptr of in-construction FormFieldSignature while still in + the base + FormField ctor by simply casting the parent-class field member + when needed + + poppler/Form.cc | 83 + ++++++++++++++++++++++++++++++++------------------------- + poppler/Form.h | 9 +++---- + 2 files changed, 50 insertions(+), 42 deletions(-) + +commit 4539d0b002efbd19393fd55a6fb87b013acdb8f1 +Author: Caolán McNamara +Date: Thu Oct 27 14:31:20 2016 +0200 + + PSOutputDev.cc: std::max requires + + poppler/PSOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 4619957cbab81ab0b25f3fdd3ed872f0ad93f074 +Author: Tor Lillqvist +Date: Thu Oct 27 14:27:32 2016 +0200 + + VS 2013 has fmin() and fmax() + + poppler/poppler-config.h.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit be073d39f72f625bf3d8482ead76881150695bf4 +Author: Albert Astals Cid +Date: Mon Oct 31 10:11:56 2016 +0100 + + Fix typo in disable nss help string + + Bug #98514 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2a09ec47aef8870dba345f4045e691ffb5a59f4d +Author: Albert Astals Cid +Date: Mon Oct 24 20:04:22 2016 +0200 + + Fix memory leak in parametrized gouraudTriangleShadedFill + + poppler/SplashOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 169889b8e196cfcd288e6555fb048fbbf95ba3f6 +Author: Albert Astals Cid +Date: Mon Oct 24 20:04:00 2016 +0200 + + Fix crash on broken files + + splash/Splash.cc | 38 ++++++++++++++++++++------------------ + 1 file changed, 20 insertions(+), 18 deletions(-) + +commit 269a91e3b03a19acc06fd0f72356f2e48a6368a7 +Author: Jakub Alba +Date: Tue Aug 23 13:20:44 2016 +0200 + + PDFDoc::setDocInfoStringEntry(): treat value consisting of just the + unicode marker as an empty string + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 43cfdf9de45e6833a2815b173f8cc945f1c5f9d6 +Author: Jakub Alba +Date: Tue Aug 23 13:19:07 2016 +0200 + + goo: add GooString::hasJustUnicodeMarker(void) + + goo/GooString.cc | 2 +- + goo/GooString.h | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit e3c5bdf4fcd29c5d180046d1c279d3f99c1027a7 +Author: Jakub Alba +Date: Fri Oct 21 23:06:23 2016 +0200 + + update copyrights + + cpp/poppler-document.cpp | 2 +- + cpp/poppler-document.h | 2 +- + cpp/poppler-embedded-file.cpp | 2 +- + cpp/poppler-global.cpp | 2 +- + cpp/poppler-private.cpp | 2 +- + cpp/poppler-private.h | 2 +- + glib/poppler-document.cc | 2 +- + glib/poppler-document.h | 2 +- + goo/GooString.cc | 2 +- + goo/GooString.h | 2 +- + poppler/Object.h | 2 +- + poppler/PDFDoc.cc | 2 +- + poppler/PDFDoc.h | 2 +- + poppler/XRef.cc | 2 +- + poppler/XRef.h | 2 +- + qt4/src/poppler-document.cc | 2 +- + qt4/src/poppler-private.cc | 2 +- + qt4/src/poppler-private.h | 2 +- + qt4/src/poppler-qt4.h | 2 +- + qt5/src/poppler-document.cc | 2 +- + qt5/src/poppler-private.cc | 2 +- + qt5/src/poppler-private.h | 2 +- + qt5/src/poppler-qt5.h | 2 +- + 23 files changed, 23 insertions(+), 23 deletions(-) + +commit 5d15a52aade68c618c356fe403ca500e74917ef7 +Author: Pino Toscano +Date: Sun Oct 9 13:04:46 2016 +0200 + + pdfseparate: remove extra '%' in error message + + utils/pdfseparate.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 036bcee237c814197af3324cd3697ea88d9ac6d3 +Author: Albert Astals Cid +Date: Sat Oct 8 17:55:31 2016 +0200 + + 0.48 + + CMakeLists.txt | 4 ++-- + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + poppler/Outline.cc | 1 + + poppler/UTF.cc | 1 + + poppler/UTF.h | 1 + + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 10 files changed, 22 insertions(+), 7 deletions(-) + +commit 3cfbc4efde1df6dcb9ef18a0fb26c7e199e6e8f5 +Author: Jason Crain +Date: Wed Sep 28 14:56:02 2016 +0000 + + TextOutputDev: Break words on all whitespace characters + + Some PDF creators like Chrome use no-break spaces or other whitespace + characters between words, causing pdftotext -bbox to not break + words as + expected. Fix this by breaking words on any character with the + Unicode + whitespace property. + + Bug #97399 + + poppler/TextOutputDev.cc | 2 +- + poppler/UTF.cc | 12 ++++++++++++ + poppler/UTF.h | 2 ++ + 3 files changed, 15 insertions(+), 1 deletion(-) + +commit 27cf7fabad27648019b36b2d6352e6767bfc8689 +Author: Albert Astals Cid +Date: Wed Sep 28 23:23:33 2016 +0200 + + Increase glib requirement + + Seems we've been requiring it for a while at least. + + See "Build fail on Ubuntu 14.04" thread on the mailing list + + CMakeLists.txt | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 86e50e156952713f0ce3ecc7b6f03f06dc0902c1 +Author: Adrian Johnson +Date: Wed Sep 28 06:10:20 2016 +0930 + + Revert "pdfinfo: add -dests option to print named destinations" + + This reverts commit 183dbf3249e8db2398b63a749eb010bc0a89dc35. + + cmake/modules/PopplerMacros.cmake | 2 +- + configure.ac | 1 - + utils/pdfinfo.1 | 4 -- + utils/pdfinfo.cc | 140 + +------------------------------------- + 4 files changed, 2 insertions(+), 145 deletions(-) + +commit 183dbf3249e8db2398b63a749eb010bc0a89dc35 +Author: Adrian Johnson +Date: Sat Sep 17 22:08:23 2016 +0930 + + pdfinfo: add -dests option to print named destinations + + Bug 97262 + + cmake/modules/PopplerMacros.cmake | 2 +- + configure.ac | 1 + + utils/pdfinfo.1 | 4 ++ + utils/pdfinfo.cc | 140 + +++++++++++++++++++++++++++++++++++++- + 4 files changed, 145 insertions(+), 2 deletions(-) + +commit 151715976509075e9b95e0ab86d1fcacb2c1580a +Author: Masamichi Hosoda +Date: Sat Aug 20 23:16:33 2016 +0900 + + Add functions for named destination name in name-dict + + Get the number of named destinations in name-dict + int numDests(); + + Get the i'th named destination name in name-dict + char *getDestsName(int i); + + Get the i'th named destination link destination in name-dict + LinkDest *getDestsDest(int i); + + poppler/Catalog.cc | 38 ++++++++++++++++++++++++++++++++++++++ + poppler/Catalog.h | 9 +++++++++ + 2 files changed, 47 insertions(+) + +commit 99267c0b3f3aed520247dc0a5eb70df04b00df46 +Author: Masamichi Hosoda +Date: Sat Aug 20 20:40:18 2016 +0900 + + Add functions for named destination name in name-tree + + Get the number of named destinations in name-tree + int Catalog::numDestNameTree(); + + Get the i'th named destination name in name-tree + GooString *Catalog::getDestNameTreeName(int i); + + Get the i'th named destination link destination in name-tree + LinkDest *Catalog::getDestNameTreeDest(int i); + + poppler/Catalog.cc | 13 +++++++++++++ + poppler/Catalog.h | 9 +++++++++ + 2 files changed, 22 insertions(+) + +commit 09ab87a9faf552b28eb7fe3e8ffd137390be5535 +Author: Masamichi Hosoda +Date: Sat Aug 20 19:35:27 2016 +0900 + + Divide Catalog::findDest() + + In order to use constructing LinkDest from other functions, + this commit divides Catalog::findDest(). + + poppler/Catalog.cc | 24 +++++++++++++++++------- + poppler/Catalog.h | 2 ++ + 2 files changed, 19 insertions(+), 7 deletions(-) + +commit 6c84188c3ff3120c3d13f26a889df51d5be6ed87 +Author: Albert Astals Cid +Date: Wed Sep 7 23:58:42 2016 +0200 + + Refactor Hints to be less bad on broken files + + If we reach the end of the stream don't try to continue reading bits + from it + + Bug #97623 + + poppler/Hints.cc | 246 + +++++++++++++++++++++++++++++++++--------------------- + poppler/Hints.h | 16 ++-- + poppler/PDFDoc.cc | 4 + + 3 files changed, 159 insertions(+), 107 deletions(-) + +commit 0d06c871df8065e72ae54a1821ca9e872a554352 +Author: Albert Astals Cid +Date: Tue Sep 6 23:42:55 2016 +0200 + + Make some classes smaller in memory (amd64) + + Thanks to elf-dissector + + TextWord 176 -> 160 + Annot 256 -> 240 + GfxShading 200 -> 184 + + poppler/Annot.h | 6 +++--- + poppler/GfxState.h | 6 +++--- + poppler/TextOutputDev.h | 6 +++--- + 3 files changed, 9 insertions(+), 9 deletions(-) + +commit 3ccd1c34a19c81d92bff27a095cf912afecb5ef3 +Author: Albert Astals Cid +Date: Tue Sep 6 23:42:03 2016 +0200 + + Compile++ + + splash/SplashScreen.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2ece00c84418fb8a92acc44d2bd0b001bfa10b27 +Author: Albert Astals Cid +Date: Tue Sep 6 23:41:42 2016 +0200 + + Fix warning about new enum + + utils/pdfinfo.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f5c34c63a64ae3a6af9aee2d2710a966b7e2d95c +Author: Jakub Kucharski +Date: Sat Aug 27 06:13:55 2016 +0200 + + goo: check at compile time if GooString has the right size + + static_assert is a C++ feature introduced in C++0x. GCC already + uses this + standard by default, so we can make use of it. In case it's compiled + without C++ + >= 0x support, the #if macro will get rid of it. + + goo/GooString.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 3a1a4baacf9672cd1e26a860303ba22f75c2b942 +Author: Jakub Kucharski +Date: Sat Aug 27 06:09:04 2016 +0200 + + goo: fix GooString::STR_STATIC_SIZE calculation + + Before this fix on 64-bit systems 4 bytes were left unsused (because + of memory + alignment). I've also removed unnecessary MemoryLayout class which + used to be + used to calculate GooString::STR_STATIC_SIZE, although it had only + made it + harder. + + goo/GooString.h | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +commit 1de363eecfa50f6432c5ff87c920213186815416 +Author: Albert Astals Cid +Date: Tue Sep 6 00:09:40 2016 +0200 + + Fix another ubsan warning + + splash/SplashScreen.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 90d0fae2b0bd713f36500f59f4bfee33ad9e13bb +Author: Albert Astals Cid +Date: Mon Sep 5 16:19:41 2016 +0200 + + Missing (C) from last commit + + fofi/FoFiBase.cc | 1 + + fofi/FoFiTrueType.cc | 2 +- + goo/GooString.cc | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +commit 67df1e16d7ae87e8b05c3186063cb925a799790a +Author: Albert Astals Cid +Date: Mon Sep 5 16:10:58 2016 +0200 + + Check we don't overflow in some calculations + + Overflow is undefined behaviour + + fofi/FoFiBase.cc | 2 ++ + fofi/FoFiTrueType.cc | 7 +++++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit 7024b3c97df1815a4f1c9f677dc05dcf5ee72c3d +Author: Albert Astals Cid +Date: Mon Sep 5 16:09:34 2016 +0200 + + No need to do a memcpy of an empty string + + Saves some warnings about memcpy of null strings on some broken + documents + + goo/GooString.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a902f5983e6802c9346569fcc599cf5f5042bd8d +Author: Albert Astals Cid +Date: Mon Sep 5 16:08:17 2016 +0200 + + initialize XRef::encryptAlgorithm to something + + poppler/Decrypt.cc | 12 +++++++++++- + poppler/Stream.h | 5 +++-- + poppler/XRef.cc | 3 ++- + 3 files changed, 16 insertions(+), 4 deletions(-) + +commit 7c7c35db46c0da51c09783a00484161721ea48ab +Author: Albert Astals Cid +Date: Sun Sep 4 15:40:32 2016 +0200 + + Fix memory leak in error handling + + utils/HtmlOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4552af28684e18c6153ce5598b121a73477af4d6 +Author: Albert Astals Cid +Date: Sun Sep 4 15:24:14 2016 +0200 + + Do not crash on invalid files where nStripes is 0 + + Bug #85276 + + poppler/PSOutputDev.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 364c15795a0508d421ca636bc7b71f93039a82b1 +Author: Albert Astals Cid +Date: Sun Sep 4 15:23:25 2016 +0200 + + Always delete aaBuf if it is there + + Doesn't matter if antialias is temporarily disabled + + splash/Splash.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 22c4701d5f7be0010ee4519daa546fba5ab7ac13 +Author: Albert Astals Cid +Date: Fri Aug 26 15:18:22 2016 +0200 + + Fix crash in files with broken JBIG2Streams + + poppler/JBIG2Stream.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit c46b8b99b3a2d51692d889df22136cb737d3a47f +Author: Albert Astals Cid +Date: Fri Aug 26 14:53:19 2016 +0200 + + Fix memory leak when parsing broken Forms + + poppler/Form.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 92175cb29450241fafc6d74170f97aee5b7a6d7a +Author: Jason Crain +Date: Sun Jul 31 00:53:24 2016 -0500 + + Fix UTF16 decoding of document outline title + + Use TextStringToUCS4 function and don't ignore astral characters. + + Bug #97156 + + poppler/Outline.cc | 18 ++---------------- + 1 file changed, 2 insertions(+), 16 deletions(-) + +commit fea7bfc3978cb962e2372df3c407114effd5f831 +Author: Jason Crain +Date: Sat Jul 30 03:38:29 2016 -0500 + + TextOutputDev: Remove null characters from PDF text + + Null characters in the PDF text cause problems with the glib + frontend's + handling of C strings. Filter them out. + + Bug #97144 + + poppler/TextOutputDev.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit ead33cf26ab7416ae0b37f8eeb19dc231e9a31f0 +Author: Albert Astals Cid +Date: Mon Aug 22 23:40:07 2016 +0200 + + Make sure GfxICCBasedColorSpace and its alt colorspace have the same + number of nComps + + On files where this doesn't happen (only bad files i've found so far) + this is leading to crashes + + poppler/GfxState.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 55e9f50deb68fb156335a5eb075b28e7b75d88ed +Author: Albert Astals Cid +Date: Thu Aug 18 23:54:15 2016 +0200 + + Poppler 0.47 + + CMakeLists.txt | 2 +- + NEWS | 10 ++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 15 insertions(+), 5 deletions(-) + +commit 0889366a5872316919dbb640b6cc5cda85295169 +Author: Jakub Kucharski +Date: Mon Aug 1 01:10:18 2016 +0200 + + XRef::createDocInfoIfNoneExists(): don't presume that DocInfo is + a dictionary + + In case a PDF document doesn't comply with the PDF reference and + its DocInfo + object isn't a dictionary, remove it and create a dictionary in + its place. + + poppler/XRef.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 7ba975630e12a3242d73372a685e016101c5e479 +Author: Jakub Kucharski +Date: Mon Aug 1 01:17:08 2016 +0200 + + PDFDoc::setDocInfoStringEntry(): free empty value string + + Normally the ownership of value is passed on to the Object class. In + case value + is an empty string, it doesn't happen, so we have to free it in + order to have + a uniform behaviour managing memory and not to introduce memory leaks. + + poppler/PDFDoc.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit f0feeed3513899558c59b65f798f294212309486 +Author: Matthias Kilian +Date: Mon Aug 1 22:50:44 2016 +0200 + + Work with non gnu grep + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3f5c84e17acfa71dfd44514384398f5a4c449630 +Author: Albert Astals Cid +Date: Sat Jul 30 17:50:42 2016 +0200 + + Check for XRefEntry existing before using it + + Bug #97005 + + poppler/Hints.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 7d3aea760a14a73962e429059f73d97391660367 +Author: Albert Astals Cid +Date: Sat Jul 30 17:32:59 2016 +0200 + + Fix abort on documents where the docinfo obj is not a dict + + Bug #97134 + + poppler/PDFDoc.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5641644f485b402cd906d3db73a22a00eb00489b +Author: Albert Astals Cid +Date: Mon Jul 25 00:14:30 2016 +0200 + + Poppler 0.46 + + CMakeLists.txt | 4 ++-- + NEWS | 33 +++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/CMakeLists.txt | 2 +- + cpp/Doxyfile | 2 +- + cpp/Makefile.am | 2 +- + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/Makefile.am | 2 +- + 15 files changed, 48 insertions(+), 15 deletions(-) + +commit 97375143f458a9f12009d798ec43364d548051b9 +Author: Albert Astals Cid +Date: Sun Jul 24 23:59:09 2016 +0200 + + update Copyrights + + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 2 +- + poppler/Link.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit bc1e3df84adff679194c33ce2dc52caa70b24df8 +Author: Richard Palo +Date: Sun Jul 24 23:52:52 2016 +0200 + + Work with non gnu greps + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit df6904366d587133760adf0d43a128aa4d35a712 +Author: Jakub Kucharski +Date: Sun Jul 24 13:14:39 2016 +0200 + + qt5: fix memory leaks in Document::modificationDate() and + Document::creationDate() + + qt5/src/poppler-document.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit d89ea6ae0ddd70916700a402649a9e0423ae9fbb +Author: Jakub Kucharski +Date: Sun Jul 24 13:14:19 2016 +0200 + + qt4: fix memory leaks in Document::modificationDate() and + Document::creationDate() + + qt4/src/poppler-document.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 844ede567f188997bb49ab1fc435797b4f31f5e9 +Author: Albert Astals Cid +Date: Sun Jul 24 12:47:21 2016 +0200 + + qt5: Fix memory leak in new implementation of ::date + + qt5/src/poppler-document.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit d34ac7cedf4213020f5a4c05e09aa8d781bc6e43 +Author: Jakub Kucharski +Date: Sun Jul 24 12:43:41 2016 +0200 + + qt5: Added document property setters & getters + + Part of Bug #36653 + + qt5/src/poppler-document.cc | 234 + ++++++++++++++++++++++++++++++++++++-------- + qt5/src/poppler-private.cc | 9 ++ + qt5/src/poppler-private.h | 3 + + qt5/src/poppler-qt5.h | 118 ++++++++++++++++++++++ + 4 files changed, 321 insertions(+), 43 deletions(-) + +commit 720718739c8002304e8da33d9ca87bc0c1511425 +Author: Albert Astals Cid +Date: Sun Jul 24 12:40:04 2016 +0200 + + qt4: Fix memory leak in new implementation of ::date + + qt4/src/poppler-document.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit e7cbc36467dfac9415d7d1cac70b77e04566e75d +Author: Jakub Kucharski +Date: Sun Jul 24 12:39:34 2016 +0200 + + qt4: Added document property setters & getters + + Part of Bug #36653 + + qt4/src/poppler-document.cc | 234 + ++++++++++++++++++++++++++++++++++++-------- + qt4/src/poppler-private.cc | 9 ++ + qt4/src/poppler-private.h | 3 + + qt4/src/poppler-qt4.h | 118 ++++++++++++++++++++++ + 4 files changed, 321 insertions(+), 43 deletions(-) + +commit 977669048b93e0561fc86e15b42ac69884e36fab +Author: Jakub Kucharski +Date: Sun Jul 24 12:20:58 2016 +0200 + + cpp: Added document property setters & getters + + Part of Bug #36653 + + cpp/poppler-document.cpp | 445 + ++++++++++++++++++++++++++++++++++++++++++++--- + cpp/poppler-document.h | 24 +++ + 2 files changed, 447 insertions(+), 22 deletions(-) + +commit 7f4a201226bc1112a121c749eb73f2a78e5149e3 +Author: Jakub Kucharski +Date: Sun Jul 24 12:19:52 2016 +0200 + + cpp: Added functions to save a document + + Part of Bug #36653 + + cpp/poppler-document.cpp | 30 ++++++++++++++++++++++++++++++ + cpp/poppler-document.h | 4 ++++ + 2 files changed, 34 insertions(+) + +commit 8d5778feeb3c6cd932ecd7abeba7d1e670d2af66 +Author: Adrian Johnson +Date: Tue Jul 19 22:58:39 2016 +0930 + + cairo: try finding glyphs in substitute fonts by unicode value + + if the glyph name can not be found in the substitute font, try + converting the name to unicode value in see of the font cmap has a + mapping for the character. + + Bug 96994 + + poppler/CairoFontEngine.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 954ee650047c185523f3e20e92f8fc4c67308196 +Author: Adrian Johnson +Date: Sun Jul 17 21:38:54 2016 +0930 + + pdftocairo: Use fprintf for printing errors + + utils/pdftocairo.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 92f283ba931b605935646e2c55007b75c7e82288 +Author: Jakub Kucharski +Date: Sun Jul 17 01:42:19 2016 +0200 + + glib: make document metatag gobject properties writeable + + glib/poppler-document.cc | 56 + +++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 48 insertions(+), 8 deletions(-) + +commit 13f0333a46e2a498700ee6bff9845ae0eceafe80 +Author: Adrian Johnson +Date: Tue Jul 5 06:54:54 2016 +0930 + + pdfinfo: update man page for listenc, meta, js, and struct* options + + utils/pdfinfo.1 | 2 ++ + 1 file changed, 2 insertions(+) + +commit c91483aceb1b640771f572cb3df9ad707e5cad0d +Author: Adrian Johnson +Date: Mon Jul 4 21:55:53 2016 +0930 + + pdfinfo: Don't print pdf info when printing metadata, javascript, + or structure + + Bug 96801 + + utils/pdfinfo.cc | 579 + +++++++++++++++++++++++++++---------------------------- + 1 file changed, 289 insertions(+), 290 deletions(-) + +commit 95d30fe3dd0cf265ccefd80d7deac00c7f430b14 +Author: Jakub Kucharski +Date: Tue Jul 12 23:02:35 2016 +0200 + + cpp: pass len to GooString constructor in + detail::ustring_to_unicode_GooString() + + Bug #96426 + + cpp/poppler-private.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8a0b8b2ea57e3b9ac60e17e82aa22994f26d6213 +Author: Albert Astals Cid +Date: Tue Jul 5 23:35:57 2016 +0200 + + Be less strict when parsing FitH Link destinations + + Would need the same for other kind of destinations too but since + don't have a file that needs it i'll refrain from changing it + + Bug #96661 + + poppler/Link.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 7f893f546dd9753967b986d3a7a56becf9b8d02f +Author: Albert Astals Cid +Date: Tue Jul 5 23:30:29 2016 +0200 + + Remove checks that are already at the beginning of the function + + poppler/Link.cc | 8 -------- + 1 file changed, 8 deletions(-) + +commit 82476b0d6967ce5e61dce4666fe556edd63c16e6 +Author: Jakub Kucharski +Date: Mon Jun 6 22:17:57 2016 +0200 + + glib: Added document property setters & simplified getters + + https://bugs.freedesktop.org/show_bug.cgi?id=36653 + + glib/poppler-document.cc | 347 + +++++++++++++++++++++++++++--------- + glib/poppler-document.h | 18 ++ + glib/reference/poppler-docs.sgml | 4 + + glib/reference/poppler-sections.txt | 8 + + 4 files changed, 288 insertions(+), 89 deletions(-) + +commit 4f7c67b59b9c55b9b896378d3adbecbb73f6eb63 +Author: Jakub Kucharski +Date: Tue Feb 23 16:46:43 2016 +0100 + + Added DocInfo setters & getters + + https://bugs.freedesktop.org/show_bug.cgi?id=36653 + + poppler/Object.h | 7 +++++- + poppler/PDFDoc.cc | 67 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/PDFDoc.h | 41 ++++++++++++++++++++++++++++++++++ + poppler/XRef.cc | 34 ++++++++++++++++++++++++++++ + poppler/XRef.h | 7 ++++++ + 5 files changed, 155 insertions(+), 1 deletion(-) + +commit e2851dd8166fa5a1df0518959ad71c9d81bd9152 +Author: Jakub Kucharski +Date: Tue Feb 23 15:36:43 2016 +0100 + + Added XRef modification flag + + https://bugs.freedesktop.org/show_bug.cgi?id=36653 + + poppler/PDFDoc.cc | 12 +----------- + poppler/XRef.cc | 5 +++++ + poppler/XRef.h | 7 +++++++ + 3 files changed, 13 insertions(+), 11 deletions(-) + +commit 9faa9b05171e46815924b48d31a7c45a1285c403 +Author: Adrian Johnson +Date: Sun Jun 5 22:44:56 2016 +0930 + + Fix tiling patterns with BBox with non-zero x,y + + poppler/CairoOutputDev.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 500fb06a23c95109547fded267a21647c8629502 +Author: Adrian Johnson +Date: Tue Jun 21 20:05:44 2016 +0930 + + Don't use -fPIC on cygwin + + it emits a warning for every file stating that -fPIC is ignored + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5f939d683a8978cdfdb65a3471296bf9e5940055 +Author: Adrian Johnson +Date: Sun Jun 19 11:07:09 2016 +0930 + + pdftocairo: revert the use of groups for blending into white page + + This was added in 853e949 but has since been found to cause + regressions eg the test case in bug 63587. + + utils/pdftocairo.cc | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit 5165c1a59332a0bc9da60a1a8d53dace039aae32 +Author: Adrian Johnson +Date: Sun Jun 19 11:19:24 2016 +0930 + + cairo: fix bug in setAntialias() + + Was setting the member cairo instead of cr parameter. Also rename the + function to avoid confusion with the public setAntialias() and make it + static to prevent this type of bug in future. + + poppler/CairoOutputDev.cc | 16 ++++++++-------- + poppler/CairoOutputDev.h | 2 +- + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit dfbb98327cbbc173a63f5db36b6606a93e5166aa +Author: Albert Astals Cid +Date: Fri Jun 17 00:04:25 2016 +0200 + + Poppler 0.45 + + CMakeLists.txt | 4 ++-- + NEWS | 19 +++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 26 insertions(+), 7 deletions(-) + +commit 3829958339b332d7ddf005d5ab98dd0ad3c8b3c6 +Author: Albert Astals Cid +Date: Thu Jun 16 23:58:07 2016 +0200 + + Add (C) + + poppler/DateInfo.cc | 1 + + poppler/DateInfo.h | 1 + + poppler/Form.cc | 2 +- + utils/pdfinfo.cc | 2 +- + 4 files changed, 4 insertions(+), 2 deletions(-) + +commit 4c7e057b0315ed37bd47e304ca191191244b2963 +Author: Albert Astals Cid +Date: Fri Jun 17 00:11:50 2016 +0200 + + dist glibc.h + + we don't install it, but we need it for building + + goo/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5ee67050c400daa7bc0b0a4f5dddf21be18be124 +Author: Adrian Johnson +Date: Tue Jun 14 07:32:35 2016 +0930 + + Fix windows compile + + utils/pdfinfo.cc | 1 + + 1 file changed, 1 insertion(+) + +commit df0779031d6ae0180024f92602bc2a680cf73dd5 +Author: Jakub Kucharski +Date: Thu May 19 16:11:04 2016 +0200 + + cpp: switched from detail::convert_date() to core's dateStringToTime() + + cpp/poppler-document.cpp | 4 +++- + cpp/poppler-embedded-file.cpp | 6 ++++-- + cpp/poppler-global.cpp | 6 +++++- + cpp/poppler-private.cpp | 25 +------------------------ + cpp/poppler-private.h | 3 +-- + 5 files changed, 14 insertions(+), 30 deletions(-) + +commit ff24d677c6078c3dfb54c35541369d908314bcdb +Author: Adrian Johnson +Date: Wed Feb 24 20:57:37 2016 +1030 + + pdfinfo: add -isodates for printing dates in ISO-8601 format + + utils/pdfinfo.1 | 3 +++ + utils/pdfinfo.cc | 36 +++++++++++++++++++++++++++++++++++- + 2 files changed, 38 insertions(+), 1 deletion(-) + +commit dd08f24f5e52c56546dfda70be483dc29e03c2e6 +Author: Adrian Johnson +Date: Wed Feb 24 21:10:08 2016 +1030 + + pdfinfo: convert dates to local time zone + + utils/pdfinfo.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit e4690ee1be027dd7028e86ea6732a3f4f2680ef7 +Author: Adrian Johnson +Date: Tue Feb 23 21:01:49 2016 +1030 + + glib: return date in UTC instead of local time + + Bug 94173 + + ConfigureChecks.cmake | 1 + + config.h.cmake | 3 +++ + configure.ac | 1 + + glib/poppler-date.cc | 33 +++++++------------------------- + goo/glibc.cc | 24 ++++++++++++++++++++++++ + goo/glibc.h | 4 ++++ + poppler/DateInfo.cc | 52 + +++++++++++++++++++++++++++++---------------------- + poppler/DateInfo.h | 6 +++++- + poppler/Form.cc | 2 +- + 9 files changed, 76 insertions(+), 50 deletions(-) + +commit 7936af2eeb8f84993acabd1b306da50d49256b31 +Author: Adrian Johnson +Date: Tue Feb 23 20:52:30 2016 +1030 + + Emulate some non portable glibc functions when not available + + CMakeLists.txt | 1 + + cpp/tests/poppler-dump.cpp | 5 +---- + glib/demo/utils.c | 6 ------ + goo/Makefile.am | 3 ++- + goo/glibc.cc | 34 ++++++++++++++++++++++++++++++++++ + goo/glibc.h | 33 +++++++++++++++++++++++++++++++++ + poppler/DateInfo.cc | 7 ++----- + 7 files changed, 73 insertions(+), 16 deletions(-) + +commit 4d799cdf9b9039b003de7d3baf05d858bc507a5a +Author: Albert Astals Cid +Date: Thu Jun 2 00:22:05 2016 +0200 + + pdfinfo: Fix another leak + + Again not crucial in pdfinfo itself but nice to be clean so that if it + the leak check fails is because the core is doing something bad + + utils/JSInfo.cc | 13 ++++++++----- + utils/JSInfo.h | 3 ++- + 2 files changed, 10 insertions(+), 6 deletions(-) + +commit 4daee8a8ce40aeb658964a5902ae104549f7af75 +Author: Albert Astals Cid +Date: Wed Jun 1 18:37:57 2016 +0200 + + Fix memory leak when failing to parse thumbs or actions + + poppler/Page.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit bc6eb28776feaa302ad93e315798cad02c1e2a54 +Author: Albert Astals Cid +Date: Wed Jun 1 18:36:17 2016 +0200 + + pdfinto: Fix memory leak + + It's not very critial that pdfinfo does not leak, but it's nice + to have no leaks so one can run ASAN over a file and see if something + is wrong or not + + utils/pdfinfo.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 66617b256acfcd98f727bf11b7d7e92bcbd16de0 +Author: Albert Astals Cid +Date: Wed Jun 1 18:35:50 2016 +0200 + + Point ucs4 to null when len is 0 + + Makes it easier for the caller than can always just free the passed + pointer + + poppler/UTF.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 0d70a57c7ad8a53e2462560a47b6ea5eba73d6c5 +Author: Albert Astals Cid +Date: Wed Jun 1 18:34:32 2016 +0200 + + Add docu to the get*Action methods + + Since unfortunately their behaviour is different in what you have + to do with the pointer given + + poppler/Annot.h | 12 ++++++------ + poppler/Form.h | 6 +++--- + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit 3db727f9546779a8896fc30a6669751d726ab86c +Author: Albert Astals Cid +Date: Wed Jun 1 18:32:45 2016 +0200 + + Fix memory leak in RichMedia parsing + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 8ace48fb07b81cab6ae68dc23d173e7441ad6d2e +Author: Albert Astals Cid +Date: Sun May 29 11:45:55 2016 +0200 + + SplashOutputDev: Fix iccTransform + splashModeXBGR8 + + poppler/SplashOutputDev.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 46039c2ef5b666d5ee85e7f6fc6a74a5a9e69526 +Author: Albert Astals Cid +Date: Fri May 27 11:06:01 2016 +0200 + + Add braces to make it more clear to which if the else applies + + poppler/UnicodeTypeTable.cc | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +commit 2d72a8bfc87c9bdcea6b617ebd4b3a3684e174e8 +Author: Albert Astals Cid +Date: Thu May 26 17:59:21 2016 +0200 + + Initialize nConfigurations and nAssets + + poppler/Annot.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4e49b3af7d6f731b9da20a9d6e5aa54578f08d3f +Author: Albert Astals Cid +Date: Thu May 26 17:34:56 2016 +0200 + + Fix memory leak on error on JBIG2Stream::readHalftoneRegionSeg + + poppler/JBIG2Stream.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 5f51939eea5b98dcef115d18baec3179701d0292 +Author: Albert Astals Cid +Date: Tue May 24 23:34:48 2016 +0200 + + Fix stack overflow + + Bug #96027 + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c820826377d79438ecaf90e9b2106a8451585add +Author: Albert Astals Cid +Date: Tue May 24 00:00:57 2016 +0200 + + Fix (C) year + + utils/HtmlOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9ce8dd7fbd132b5f423dc3bf10fa87b973390d0b +Author: Albert Astals Cid +Date: Mon May 23 23:59:40 2016 +0200 + + Fix stack overflow on broken file + + Bug #95567 + + poppler/Stream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 37fb37e368c659832fc1a1dfd499c42340b62f38 +Author: Vincent Le Garrec +Date: Mon May 23 23:18:40 2016 +0200 + + pdftohtml: Fix crash on broken file + + Bug #95563 + + utils/HtmlOutputDev.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 1d0251c8ab48e2e1a4873d84b4bc573b3ae2a98d +Author: Albert Astals Cid +Date: Sat May 21 20:02:26 2016 +0200 + + Fix memory leak in Splash::gouraudTriangleShadedFill + + splash/Splash.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit eb20f8cc2c0dea281ae44336a8fac8cc86a99895 +Author: Albert Astals Cid +Date: Sat May 21 19:19:43 2016 +0200 + + 0.44 + + CMakeLists.txt | 4 ++-- + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 23 insertions(+), 7 deletions(-) + +commit 58f56a7af99b477f39e57aed74443b6851afe15f +Author: Thomas Freitag +Date: Sat May 21 18:25:22 2016 +0200 + + Fix Compile in 32bit linux + + Bug #95492 + + poppler/Decrypt.cc | 65 + +++++++++++++++++++++++++++--------------------------- + 1 file changed, 33 insertions(+), 32 deletions(-) + +commit 853e94995255591b35d9bdbeb0174476838097c0 +Author: Adrian Johnson +Date: Sun Apr 17 16:02:57 2016 +0930 + + pdftocairo: add -antialias option + + Bug 94977 + + poppler/CairoOutputDev.cc | 24 +++++++++++++++++ + poppler/CairoOutputDev.h | 4 ++- + utils/pdftocairo.1 | 26 +++++++++++++++++++ + utils/pdftocairo.cc | 66 + ++++++++++++++++++++++++++++++++++++++++++----- + 4 files changed, 112 insertions(+), 8 deletions(-) + +commit 8453966178de8535cdabac090e78ec17857f8975 +Author: Thomas Freitag +Date: Tue May 17 01:00:37 2016 +0200 + + Improve rendering of some dotted lines + + Bug #84693 + + splash/Splash.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 182abe4ed5c0773073c6751a26a7c4e40e99e02e +Author: Thomas Freitag +Date: Fri May 13 00:07:24 2016 +0200 + + Splash: type 3 chars. restore the current position also in output + device + + Bug #95344 + + poppler/Gfx.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 9c35dc79ec777d9495796124ac7a42bf2b4cf83f +Author: Jakub Kucharski +Date: Wed May 11 23:34:53 2016 +0200 + + goo: refactor GooString::Set() + + it is used only once to concatenate strings and it is in a GooString + constructor used specifically for that + so I think concatenation should take place in the constructor and + GooString::Set + should do exactly what it says which is setting the string. + + Bug #94201 + + goo/GooString.cc | 40 ++++++++++++++-------------------------- + goo/GooString.h | 10 +++++----- + 2 files changed, 19 insertions(+), 31 deletions(-) + +commit 0ecec576faf7e1ef644f5973f17e0b8244560912 +Author: Albert Astals Cid +Date: Wed May 4 23:23:04 2016 +0200 + + Fix typo in GfxPatchMeshShading::parse + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 890178f9c946931ec34b8b227493ec9f1c6109aa +Author: Albert Astals Cid +Date: Wed May 4 01:32:47 2016 +0200 + + Fix potential crash in SplashOutputDev::doUpdateFont + + If we delete fontLoc we need to set it to NULL since it's not set + to any value in all of the + branches of this code + + poppler/SplashOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 86572d7d2835fdd77e82eeb428e3a56c2d0f271d +Author: Albert Astals Cid +Date: Wed May 4 01:27:54 2016 +0200 + + Fix memory leak in SignatureHandler::getDefaultFirefoxCertDB_Linux + + poppler/SignatureHandler.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3707f9d17c5f8a883ddb9614b11676ad49ade5b2 +Author: Albert Astals Cid +Date: Wed May 4 00:59:01 2016 +0200 + + Fix potential crash in TextPage::coalesce + + When flows is not null flow was still pointing to an now deleted + flow that + may had made it crash in the for loop below + + poppler/TextOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6d26d02c39de6546f57b20c46922f8c56aad78a0 +Author: Albert Astals Cid +Date: Wed May 4 00:58:12 2016 +0200 + + Remove call that does nothing + + We don't use dict after this call and streamGetDict is a pure getter, + i.e. it doesn't change the stream at all + + poppler/GfxState.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 56c71fcaae71c2b3cc91bb981715541518e05684 +Author: Albert Astals Cid +Date: Wed May 4 00:55:06 2016 +0200 + + Fix memory leak in PSOutputDev::filterPSLabel + + poppler/PSOutputDev.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit a0c3fd3f18232c126815a129158e0c4cd3a819a9 +Author: Albert Astals Cid +Date: Fri Apr 29 00:14:24 2016 +0200 + + New version and soversion + + CMakeLists.txt | 4 ++-- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + gtk-doc.make | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) + +commit da91593e834d4e617213466331226347f1688a53 +Author: Albert Astals Cid +Date: Fri Apr 29 00:12:59 2016 +0200 + + News + + NEWS | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit bdd25a2583552fe8e72dcf4bc17d9f488b7c1268 +Author: Albert Astals Cid +Date: Fri Apr 29 00:07:24 2016 +0200 + + Update Cs + + poppler/CairoFontEngine.cc | 2 +- + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 1 + + poppler/GfxFont.cc | 2 +- + utils/pdftocairo.cc | 1 + + 5 files changed, 5 insertions(+), 3 deletions(-) + +commit dbbe1590d49e620ef0743cb1b99b0b5b9a1f36ec +Author: Arseniy Lartsev +Date: Thu Apr 28 23:59:05 2016 +0200 + + qt: Fix crash on certain PDF form item activation actions + + Bug #94873 + + qt4/src/poppler-page.cc | 3 ++- + qt5/src/poppler-page.cc | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 1cc93886eee3204e2ccd8bcc8b90306e809255e0 +Author: Thomas Freitag +Date: Thu Apr 28 23:53:06 2016 +0200 + + Allow newlines in ' obj' sequence + + Bug #94756 + + poppler/XRef.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit a8e3399487258e53df0fd4a79c570c8d71188bed +Author: Takahiro Hashimoto +Date: Wed Apr 27 00:16:52 2016 +0200 + + Compile with C++11 compilers that don't define isinfinite + + Bug #94761 + + poppler/SplashOutputDev.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 6eafb6570765605108cf3525f78b10223439ee1d +Author: Pino Toscano +Date: Thu Apr 21 08:30:25 2016 +0200 + + configure: remove unused check for gethostbyname + + configure.ac | 5 ----- + 1 file changed, 5 deletions(-) + +commit d9408c186f9b5c992a4e1492a58dda506d8453ac +Author: Pino Toscano +Date: Sun Apr 10 10:29:05 2016 +0200 + + typo fixes + + - "indentical" -> "identical" + - "numberals" -> "numerals" + - "paremeters" -> "parameters" + + poppler/PageLabelInfo_p.h | 2 +- + qt4/src/poppler-media.cc | 8 ++++---- + qt5/src/poppler-media.cc | 8 ++++---- + utils/pdfimages.1 | 2 +- + 4 files changed, 10 insertions(+), 10 deletions(-) + +commit 5ac54db9150e949ed0e41eec1f19a7f5ec880646 +Author: Pino Toscano +Date: Sun Apr 10 10:16:36 2016 +0200 + + utils: ship pdfsig.1 if pdfsig is built + + utils/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 92c6799a40b0755ff2d43f33241d442cc5d4e323 +Author: Pino Toscano +Date: Sun Apr 10 09:43:29 2016 +0200 + + remove +x modes + + poppler/SecurityHandler.cc | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 9c39db64ba2eb20ca769a103d83a830f406486f0 +Author: Jason Crain +Date: Mon Jan 18 20:56:18 2016 -0600 + + Add SymbolMT as an alias for the Symbol font + + A document using the SymbolMT font will have the wrong glyphs drawn. + Add it as + an alias for the Symbol font so the correct font and encoding + are used. + + Bug #93168 + + poppler/GfxFont.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit af332349d7a5e3737ea53608cda2f1cad6159108 +Author: Jason Crain +Date: Mon Mar 28 21:36:52 2016 -0500 + + pdftocairo: Calculate rotation before scaling + + Scaling calculation (-scale-to-x and -scale-to-y) is wrong if a + page is + rotated. Fix by moving scale calculation to after rotation + calculation. + + bug #94655 + + utils/pdftocairo.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit db87dc7fa28537f7532328c278c05d8b60f90d6f +Author: Jason Crain +Date: Sun Feb 21 22:54:15 2016 -0600 + + cairo: save mask state and don't extend image mask + + Don't extend an image mask pattern. Save and restore the mask in + tilingPatternFill. + + bug #94234 + + poppler/CairoOutputDev.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit b68a4ee1dcd1da5b48b2c1f0bb2b6a789ca18ea5 +Author: Jason Crain +Date: Thu Feb 18 01:59:42 2016 -0600 + + cairo: Check if PDF knows the width of 'm' in case of substituted font + + Bug #94054 + + poppler/CairoFontEngine.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 7d8dfb09d2b9d69d4e80838ce58fdbd091bce7ec +Author: Jason Crain +Date: Sun Feb 28 16:18:05 2016 -0600 + + cairo: fix fillToStrokePathClip crash and rendering + + The cairo backend can crash if the dash pattern changes between + calling + clipToStrokePathClip and fillToStrokePathClip because + fillToStrokePathClip + calls cairo_set_dash with the saved dash pattern but the current + dash count. + + Fixes the crash by removing the call to cairo_get_dash_count in + fillToStrokePathClip. Makes strokePathClip reference counted + because when + drawing tiling patterns it may need to be kept around for more than + one drawing + operation. Uses fillToStrokePathClip in a few more places to fix + rendering. + + bug #62905 + + poppler/CairoOutputDev.cc | 38 ++++++++++++++++++++++++++++++-------- + poppler/CairoOutputDev.h | 1 + + 2 files changed, 31 insertions(+), 8 deletions(-) + +commit 67bc280c4068ae9501053c06ee05341b95a5e6db +Author: Thomas Freitag +Date: Sun Mar 20 12:39:24 2016 +0100 + + Implement sanity check for linearization usage + + Bug #92482 + + poppler/PDFDoc.cc | 42 +++++++++++++++++++++++++++++++++++++++++- + poppler/PDFDoc.h | 7 ++++++- + 2 files changed, 47 insertions(+), 2 deletions(-) + +commit a24ac96e9f5c914c1c979319ca1043dabd334763 +Author: Albert Astals Cid +Date: Thu Mar 17 00:08:37 2016 +0100 + + meh typo + + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f8ff943650e7e2a4cb836be43bf04907a5e156fc +Author: Albert Astals Cid +Date: Wed Mar 16 23:40:00 2016 +0100 + + 0.42 + + CMakeLists.txt | 4 ++-- + Makefile.am | 1 + + NEWS | 28 ++++++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 4 ++-- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 8 files changed, 37 insertions(+), 8 deletions(-) + +commit ef21f651a4af801502d6b4b4f7258d54f14e7aea +Author: Albert Astals Cid +Date: Wed Mar 16 20:23:39 2016 +0100 + + Some (C) updating + + poppler/FlateStream.cc | 1 + + poppler/Gfx.cc | 2 +- + poppler/PSOutputDev.cc | 2 +- + poppler/SignatureHandler.cc | 2 +- + poppler/SplashOutputDev.cc | 2 +- + poppler/SplashOutputDev.h | 2 +- + poppler/Stream.cc | 2 +- + poppler/Stream.h | 2 +- + poppler/TextOutputDev.cc | 2 +- + poppler/TextOutputDev.h | 2 +- + 10 files changed, 10 insertions(+), 9 deletions(-) + +commit 57b7a52cc6b3675bfbff29ef20a509eadce091ac +Author: Thomas Freitag +Date: Wed Mar 16 10:36:22 2016 +0100 + + Fix rendering of some broken PDF files + + Call constructXRef if necessary xref can't be fetched and the PDF + don't use xref streams + + Bug #92508 + + poppler/XRef.cc | 8 +++++++- + poppler/XRef.h | 3 ++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +commit 04f3448d73ff7a3a2f1bf885aea64e96cc29a69d +Author: Thomas Freitag +Date: Wed Mar 16 00:58:35 2016 +0100 + + Initialize gamut mapping multipliers in ::copy() functions + + Bug #90697 + + poppler/GfxState.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 69ffeb71a79b686d5c79d20832c4666c498098e8 +Author: Alok Anand +Date: Mon Mar 14 20:18:32 2016 +0100 + + Add the support for version 5 + revision 6 documents. + + Bug #85368 + + poppler/Decrypt.cc | 357 + ++++++++++++++++++++++++++++++++++++++++++++- + poppler/SecurityHandler.cc | 9 +- + 2 files changed, 358 insertions(+), 8 deletions(-) + +commit 2dcfefb43c0d4ca86a4f4b2d019882e134201b27 +Author: Thomas Freitag +Date: Sat Mar 12 03:52:01 2016 +0100 + + handle SMaskInData = 0 for JPX encoded images + + Bug #93468 + + poppler/JPEG2000Stream.cc | 77 + +++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 61 insertions(+), 16 deletions(-) + +commit e58d310c1802b77a6356ec0d3d0180a2a1605b41 +Author: Thomas Freitag +Date: Thu Mar 10 12:05:28 2016 +0100 + + Implement function shading in splash + + Bug #94441 + + poppler/SplashOutputDev.cc | 117 + +++++++++++++++++++++++++++++++++++++++++++++ + poppler/SplashOutputDev.h | 31 +++++++++++- + 2 files changed, 147 insertions(+), 1 deletion(-) + +commit 09e2ae234179c42ccf06b040a0f6c89d65d69713 +Author: Thomas Freitag +Date: Tue Mar 8 23:08:53 2016 +0100 + + assure line width > 0 in case of text stroke + + Bug #94038 + + poppler/SplashOutputDev.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 37c7469955d465e006d74eecebb766eb8513bbf3 +Author: Thomas Freitag +Date: Mon Mar 7 20:23:11 2016 +0100 + + JPXStream: Don't scale image comps to 8 bits in case of an indexed + colorspace + + Followup of bug #94371 + + poppler/JPEG2000Stream.cc | 58 + +++++++++++++++++++++++++++++++---------------- + 1 file changed, 38 insertions(+), 20 deletions(-) + +commit d4e24e5754f5a0bf335ddf83747d0dc85b7c409f +Author: Thomas Freitag +Date: Sun Mar 6 22:46:23 2016 +0100 + + implement jpx streams with depth < 8 + + Bug #94371 + + poppler/JPEG2000Stream.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 5f79b6485b107fb0939563837046fea6b4b89fdc +Author: Albert Astals Cid +Date: Thu Mar 3 00:45:34 2016 +0100 + + (C) here too + + qt5/src/poppler-link.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a80a036269eb18daf0ec69c23a8bc71fb4852acb +Author: Albert Astals Cid +Date: Thu Mar 3 00:44:27 2016 +0100 + + Qt: Only check the link page for local links + + qt4/src/poppler-link.cc | 32 +++++++++++++++++--------------- + qt5/src/poppler-link.cc | 28 +++++++++++++++------------- + 2 files changed, 32 insertions(+), 28 deletions(-) + +commit a3c7f6184d1be3f2737086cf650f4012075515f8 +Author: Adrián Pérez de Castro +Date: Wed Mar 2 11:58:24 2016 +0200 + + Tagged-PDF: Document new pdfinfo flags in its manual page + + https://bugs.freedesktop.org/show_bug.cgi?id=64816 + + utils/pdfinfo.1 | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 7cf52e56677e11b15d610017bccd0cc3f74badaf +Author: Emmanuele Bassi +Date: Wed Mar 2 04:38:52 2016 +0000 + + Use correct includes for NSPR/NSS headers + + The header files provided by NSS3 are inside versioned directories, + `$includedir/nss3` and `$includedir/nspr4`, which are provided by the + nss3 pkg-config file as include directives for the compiler. + + We can also use nspr.h as a single entry point, to avoid cherry + picking + specific headers. + + https://bugzilla.freedesktop.org/show_bug.cgi?id=94360 + + poppler/SignatureHandler.cc | 2 +- + poppler/SignatureHandler.h | 22 +++++++++------------- + 2 files changed, 10 insertions(+), 14 deletions(-) + +commit 1f7cb78f8b771bae8bfd96a7a7ca3afbaf89c749 +Author: Albert Astals Cid +Date: Wed Mar 2 09:51:46 2016 +0100 + + Fix memory leak in Matte parsing + + Also remove unneeded comment + + poppler/Gfx.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 36c276f1af7e0f1d8a207f6cdcaa80a24e95e044 +Author: Thomas Freitag +Date: Wed Mar 2 09:50:01 2016 +0100 + + Splash: Implementation of matte entries in softmasks of softmasked + images + + Bug #22473 + + poppler/Gfx.cc | 30 +++++++++++++++-- + poppler/GfxState.cc | 7 ++-- + poppler/GfxState.h | 7 +++- + poppler/SplashOutputDev.cc | 80 + +++++++++++++++++++++++++++++++++++++++++++++- + poppler/SplashOutputDev.h | 3 +- + 5 files changed, 120 insertions(+), 7 deletions(-) + +commit 810605dae2d7f239ce29640a31a9befe511c3190 +Author: Albert Astals Cid +Date: Wed Mar 2 00:49:00 2016 +0100 + + Compile++ + + poppler/Form.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 9d33825e6f6167f07b2739645b93249b2bc043da +Merge: a8853b1d f3e3ebe5 +Author: Albert Astals Cid +Date: Wed Mar 2 00:37:11 2016 +0100 + + Merge remote-tracking branch 'origin/signatureHandling' + +commit f3e3ebe51483050cfdf8773dbd0d6646521f17cb +Author: André Guerreiro +Date: Wed Mar 2 00:35:05 2016 +0100 + + Load NSS root certs module + + This change is needed to actually do certificate validation, because + as it is NSS is trying to load the module which contains all the + builtin root certs from the Firefox profile directory where it is + usually missing. This way it will load the module from a system + library directory. + + poppler/SignatureHandler.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit a8853b1df0a15570dff6ecc333769257bbf874c3 +Author: Adrian Perez de Castro +Date: Thu May 9 19:11:26 2013 +0300 + + Tagged-PDF: Modify pdfinfo to show the document structure + + https://bugs.freedesktop.org/show_bug.cgi?id=64816 + + utils/pdfinfo.cc | 96 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 96 insertions(+) + +commit 1bf0ffdf1c68019515349262a14425c78c90ea18 +Author: Adrian Johnson +Date: Thu Feb 25 22:52:32 2016 +1030 + + Add missing files that got dropped from the previous commit + (989ceb6bd90) + + poppler/FlateEncoder.cc | 148 + ++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/FlateEncoder.h | 73 ++++++++++++++++++++++++ + 2 files changed, 221 insertions(+) + +commit 989ceb6bd90cc8a79dd48c58183f1855de269c9b +Author: William Bader +Date: Thu Feb 25 21:01:16 2016 +1030 + + Add support for Flate compression in Level 3 PostScript output. + + The changes to the build variables are from Adrian Johnson's + DeflateStream + patches at https://bugs.freedesktop.org/attachment.cgi?id=89776 + + CMakeLists.txt | 21 ++++++-- + config.h.cmake | 5 +- + configure.ac | 97 +++++++++++++++++++++-------------- + poppler/FlateStream.cc | 14 +++++ + poppler/Makefile.am | 13 ++++- + poppler/PSOutputDev.cc | 122 + +++++++++++++++++++++++++++++--------------- + poppler/PSOutputDev.h | 10 +++- + poppler/Stream.cc | 4 +- + poppler/Stream.h | 2 +- + poppler/poppler-config.h.in | 6 +-- + 10 files changed, 202 insertions(+), 92 deletions(-) + +commit 91c0be60f3e7a53373ba660702358cf52f74d1b2 +Author: William Bader +Date: Thu Feb 25 20:50:10 2016 +1030 + + xpdf304: Merge xpdf-3.04 support for LZW encoding in PSOutputDev + and Stream. + + Level 2 and Level 3 PostScript now use LZW encoding instead of Run + Length encoding, which can make some images one tenth the size. + PSOutputDev provides setEnableLZW() and getEnableLZW() to control + support for LZW encoding. + + poppler/PSOutputDev.cc | 164 + ++++++++++++++++++++++++++++++++++--------------- + poppler/PSOutputDev.h | 3 + + poppler/Stream.cc | 145 +++++++++++++++++++++++++++++++++++++++++++ + poppler/Stream.h | 38 ++++++++++++ + 4 files changed, 301 insertions(+), 49 deletions(-) + +commit b88e68f9c84d987a814716aab50543bf8a5cb8f8 +Author: William Bader +Date: Thu Feb 25 20:41:48 2016 +1030 + + xpdf304: Merge change from poppler/Gfx.cc to avoid attempting a + tiling pattern fill + + with a singular transform matrix (abs(determinant) < 0.000001). + + poppler/Gfx.cc | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +commit 3f5f0796d855cb8b8c3a038484d4ca7c6f1a55f2 +Author: Jason Crain +Date: Fri Feb 19 10:54:29 2016 -0600 + + Cache result of inner loop in visitDepthFirst + + Speeds up sorting of text blocks. + + bug #77087 + + poppler/TextOutputDev.cc | 42 ++++++++++++++++++++++++++++++++++-------- + poppler/TextOutputDev.h | 4 ++++ + 2 files changed, 38 insertions(+), 8 deletions(-) + +commit 448169bd96137e2bf0145783012276220bb0c51a +Author: Thomas Freitag +Date: Wed Feb 17 23:02:53 2016 +0100 + + Fall back to Gfx implementation of tiling pattern if repetition rate + is small + + Bug #90596 + + poppler/SplashOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 23e4291f2545f56432b0a9c4d709048825327bc2 +Author: Thomas Freitag +Date: Wed Feb 17 22:59:30 2016 +0100 + + Check if PDF knows the witdh of 'm' in case of substituted font + + To check wether the PDF font declaration includes the width of + the letter 'm', compare it with the width of code 0. Code 0 is the + replacement glyph in a font and has the width of a blank. The width + table is initialized with this value, and the blank is always smaller + than a 'm'. + + Bug #94054 + + poppler/SplashOutputDev.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 88415426df363f1ef86b741cbc3587a89d31aa1f +Author: Albert Astals Cid +Date: Wed Feb 17 00:11:49 2016 +0100 + + 0.41.0 + + CMakeLists.txt | 2 +- + NEWS | 9 +++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 14 insertions(+), 5 deletions(-) + +commit 5689c990a187108ddc0a88b9825ba3bea644368f +Author: Thomas Freitag +Date: Tue Feb 16 01:44:31 2016 +0100 + + Adjust limit check and check in addition bitmap pointer + + Bug #94053 + + poppler/SplashOutputDev.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 57bc52b93e6431f0dc7762e2001dedd614383001 +Author: Jakub Wilk +Date: Sun Feb 14 11:22:31 2016 +0100 + + pdfinfo manpage: corrupted description of -js and -rawdates + + utils/pdfinfo.1 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit ab3c9ccb630004be049cb59f303612aa2a35f408 +Author: Adrian Johnson +Date: Fri Feb 12 20:15:46 2016 +1030 + + cairo: add missing font types (fontCIDType0COT and fontTrueTypeOT) + + bug 93559 + + poppler/CairoFontEngine.cc | 41 ++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 38 insertions(+), 3 deletions(-) + +commit f1c4d8ac1fe4293566285117170e8234c1be3943 +Author: Albert Astals Cid +Date: Thu Feb 4 01:08:59 2016 +0100 + + pdfseparate: Refine resource detection + + Related to bug #87637 + + poppler/PDFDoc.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 449d45fab8e61393d858549460e61599e4dbd7eb +Author: Albert Astals Cid +Date: Wed Jan 13 23:19:12 2016 +0100 + + 0.40.0 + NEWS + + CMakeLists.txt | 2 +- + NEWS | 18 ++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 23 insertions(+), 5 deletions(-) + +commit e9740b57324cf5a09f6f4312165da13c7b3a576b +Author: Albert Astals Cid +Date: Wed Jan 13 23:14:35 2016 +0100 + + Update copyrights + + poppler/Function.cc | 2 +- + utils/pdftocairo.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 3bfc45bfcca1a52447cedbb95afad1ef362ac6f0 +Author: Adrian Johnson +Date: Mon Jan 11 21:46:49 2016 +1030 + + pdftocairo: check for invalid use of -scale-to* and -paper[wh] options + + Bug 92195 + + utils/pdftocairo.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 819bea740b1fadb24833e0ecbdf4e75ddca8eb14 +Author: Adrian Johnson +Date: Mon Jan 11 19:44:14 2016 +1030 + + pdftocairo: ensure surface flushed before accessing image data + + utils/pdftocairo.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f7542348b37cc881d854bbc36c3af0a4fe37d839 +Author: Adrian Johnson +Date: Mon Jan 11 19:39:34 2016 +1030 + + pdftocairo: document that -singlefile appends file type + + Bug 86254 + + utils/pdftocairo.1 | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 9fa58b1ef6c97e2a30bb3197c11000fac3b059f4 +Author: Adrian Johnson +Date: Mon Jan 11 19:26:02 2016 +1030 + + pdftocairo: fix writing to stdout out with image output + + utils/pdftocairo.cc | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit dcefd7a232ba17af878b95efaa4ffaf147d095b7 +Author: Adrian Johnson +Date: Fri Jan 8 16:49:25 2016 +1030 + + check all byte ranges in signature dictionary + + poppler/Form.cc | 60 + +++++++++++++++++++++++++++++--------------------------- + poppler/Object.h | 12 +++++++++++- + 2 files changed, 42 insertions(+), 30 deletions(-) + +commit e5104973197c63c3a46e6d2c0f41c9de111d4686 +Author: André Guerreiro +Date: Fri Jan 8 17:02:35 2016 +1030 + + Improve robustness of SignatureHandler::validateCertificate + + poppler/SignatureHandler.cc | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +commit 4b0f6e5ec04058d12fbf7537c80b662cbea931b9 +Author: Markus Kilås +Date: Wed Jan 6 23:36:17 2016 +0100 + + Fix printf for unsigned int + + utils/pdfsig.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 01d4bb222d63eda7dc5ec903c0735179edf77c0e +Author: Albert Astals Cid +Date: Sun Jan 3 13:01:31 2016 +0100 + + Happy New Year + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d8f418d2f2ec5966d77caf128a52c834fdd0efcf +Author: Khaled Hosny +Date: Mon Nov 23 13:52:10 2015 +0400 + + Fix finding Arabic Presentation Forms ligatures + + PDF text containing Arabic Presentation forms ligatures is still not + found after the previous commit. + + This because the ligatures are decomposed in logical order after + normalisation, while the whole string is in visual order. For example + the RTL text ABCD in visual order will be DCBA, and assuming B is a + ligature, it will be decomposed to B1B2 so the string after + normalization will be DCB1B2A while we are expecting it to be DCB2B1A. + + This patch reverses the order of the decomposition of RTL characters + to + work around this issue. + + poppler/TextOutputDev.cc | 4 +++- + poppler/UnicodeTypeTable.cc | 20 ++++++++++++++++---- + poppler/UnicodeTypeTable.h | 7 ++++++- + 3 files changed, 25 insertions(+), 6 deletions(-) + +commit 67645087477beb618304ea34cbdbafd40b199276 +Author: Khaled Hosny +Date: Wed Nov 18 14:47:28 2015 +0400 + + Handle right-to-left text in search + + Currently right-to-left text reversal is only done during text + dumping, + but not during search. This commit applies the same reversal logic + during PDF search as well. + + poppler/TextOutputDev.cc | 191 + ++++++++++++++++++++++++++--------------------- + 1 file changed, 107 insertions(+), 84 deletions(-) + +commit 00422d0c6baaba639fa0660e3a933cdb76b28f88 +Author: Jason Crain +Date: Sun Dec 20 09:54:43 2015 -0600 + + cairo: use shape mask with soft mask + + Clear target with the shape mask whether the soft mask is set or not. + Propagate the shape up to any higher level groups and destroy the + shape pattern when done. + + Fix a memory leak by removing a call to 'cairo_reference + (cairo_shape)'. + We already keep track of the lifetime of cairo_shape using + knockoutCount. + + bug 91931 + + poppler/CairoOutputDev.cc | 49 + ++++++++++++++++++++++------------------------- + 1 file changed, 23 insertions(+), 26 deletions(-) + +commit bc4cab272e4fe28b836cb2ef1ff672f0d79d243c +Author: Carlos Garcia Campos +Date: Sat Jan 2 09:49:27 2016 +0100 + + regtest: Fix the number of worker threads spawned reported in log + of run-tests command + + regtest/TestRun.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ea75de614e666d8235c38048585315e0d7ff5522 +Author: Adam Reichold +Date: Sat Jan 2 09:48:03 2016 +0100 + + regtest: Limit the number of worker threads to the number of documents + to create references + + The same way we do for the run-tests command. + + regtest/TestReferences.py | 27 ++++++++++++++++++--------- + 1 file changed, 18 insertions(+), 9 deletions(-) + +commit 25bb59a81de8a1b6dd23fec871a97ccb11fe9d64 +Author: Carlos Garcia Campos +Date: Fri Jan 1 12:45:42 2016 +0100 + + regtest: Allow to interrupt run-tests and create-refs commands when + multiple threads are used + + The Queue join implementation uses a non-timed wait that blocks + the main + thread, making it impossible to interrupt it with CTRL+C or sending + SIGINT signal. Using any timeout value for wait would fix the problem, + but Queue doesn't allow to pass a timeout to the join method. The + Queue implementation is actually quite simple, so we can just add our + own implementation with only the things we really need and use + a timeout + value when calling wait() in join(). + + regtest/InterruptibleQueue.py | 68 + +++++++++++++++++++++++++++++++++++++++++++ + regtest/TestReferences.py | 4 +-- + regtest/TestRun.py | 4 +-- + 3 files changed, 72 insertions(+), 4 deletions(-) + +commit ffb3ff633b124c476ab48bbcfce04d7f418df9bc +Author: Adam Reichold +Date: Fri Jan 1 11:32:14 2016 +0100 + + regtest: Do not use the log printer with the TestReferences lock held + + regtest/TestReferences.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e3b09727ad96a03ba1250f49486948899b4df793 +Author: Adam Reichold +Date: Fri Dec 25 14:10:03 2015 +0100 + + Make detection of version one of OpenJPEG prefer a pkg-config manifest + if it exists. + + CMakeLists.txt | 1 - + cmake/modules/FindLIBOPENJPEG.cmake | 37 + +++++++++++++++++++++++-------------- + 2 files changed, 23 insertions(+), 15 deletions(-) + +commit 7c880daecfcddac2f8181d5f3d506dd409812dbe +Author: Adam Reichold +Date: Fri Dec 25 14:10:03 2015 +0100 + + Make use of LINK_PRIVATE flag to fix warning on CMake policy 0022. + + CMakeLists.txt | 3 +-- + cpp/CMakeLists.txt | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +commit 4a413b9b95d5c6815c91adb815254cce97dd5b4b +Author: Adam Reichold +Date: Fri Dec 25 14:10:03 2015 +0100 + + Make target names for Qt4 and Qt5 builds unique so they can be built + at the same time using recent CMake and Ninja versions. + + qt4/tests/CMakeLists.txt | 44 +++++++++++++++++++++--------------------- + qt5/CMakeLists.txt | 2 ++ + qt5/demos/CMakeLists.txt | 2 -- + qt5/src/CMakeLists.txt | 2 -- + qt5/tests/CMakeLists.txt | 50 + +++++++++++++++++++++++------------------------- + 5 files changed, 48 insertions(+), 52 deletions(-) + +commit b3425dd3261679958cd56c0f71995c15d2124433 +Author: Albert Astals Cid +Date: Tue Dec 22 22:50:33 2015 +0100 + + Do not crash on invalid files + + Bug #93476 + + poppler/Function.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 5d57c34cbf9288eec6ddb149e905268405c19450 +Author: Pino Toscano +Date: Sun Dec 20 08:42:25 2015 +0100 + + typo fix: "occurence" -> "occurrence" + + utils/pdfunite.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3eee5274abb24d5b5be05262aafe794652cdac35 +Author: Albert Astals Cid +Date: Thu Dec 17 00:09:37 2015 +0100 + + New gtk-doc stuff + + gtk-doc.make | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit fb1f7b0fb037837f37be65aa23ecac711a1b4981 +Author: Albert Astals Cid +Date: Thu Dec 17 00:08:24 2015 +0100 + + Prepare for 0.39 + + CMakeLists.txt | 4 ++-- + NEWS | 21 +++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 2 +- + poppler/GfxState.cc | 1 + + poppler/GfxState.h | 1 + + poppler/JPEG2000Stream.cc | 1 + + poppler/Makefile.am | 2 +- + poppler/PSOutputDev.cc | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + utils/pdftocairo.cc | 2 +- + 14 files changed, 35 insertions(+), 11 deletions(-) + +commit 7ed7fb6d2be009c5d433338a6b3da816dd38f5ca +Author: Pino Toscano +Date: Sun Oct 12 22:43:22 2014 +0200 + + Fix typos in error messages + + Reported by Jakub Wilk, thanks! + + poppler/JPEG2000Stream.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 47ffce08e75002aa0707107c76984e7e471d8afb +Author: Adrian Johnson +Date: Thu Jan 15 21:20:05 2015 +1030 + + cairo: Implement function shading using mesh gradients + + Gfx draws function shadings by subdividing the shading until the + colors are the same or the maximum subdivision is reached then fills + each cell with the color of the mid point of the cell. The solid + colors can result in a pixelated appearance. + + This patch implements a cairo specific version of the function shading + that uses mesh gradients to draw each cell. By setting the corner of + each patch to the shading color at that point, the mesh gradient will + interpolate the colors resulting in a smooth appearance. + + Bug 88394 + + poppler/CairoOutputDev.cc | 101 + ++++++++++++++++++++++++++++++++++++++++++++++ + poppler/CairoOutputDev.h | 5 ++- + 2 files changed, 105 insertions(+), 1 deletion(-) + +commit d7717cf18d0db5663687690ccf66102e9a124025 +Author: Jason Crain +Date: Fri Aug 22 00:51:36 2014 -0500 + + cairo: Scale radial pattern + + Scale the radial pattern because cairo/pixman do not work well with a + very large or small scaled matrix. See cairo bug #81657. + + bug #22098 + + poppler/CairoOutputDev.cc | 26 ++++++++++++++++++++------ + 1 file changed, 20 insertions(+), 6 deletions(-) + +commit 9ef565d0302ad4a36c53d7cd3251bff6a53070ea +Author: Carlos Garcia Campos +Date: Fri Dec 4 11:08:45 2015 +0100 + + regtest: Pass always both the owner and user passwords to the tools + + regtest/backends/cairo.py | 2 +- + regtest/backends/postscript.py | 2 +- + regtest/backends/splash.py | 2 +- + regtest/backends/text.py | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 3686005cde6f0c0992498a1773b02331fce79b1c +Author: Carlos Garcia Campos +Date: Fri Dec 4 11:03:27 2015 +0100 + + pdftocairo: Fix double free when both user and owner passwords + are given + + utils/pdftocairo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 38796894f8ab19c2cd0b996e6b1aa0be98326eac +Author: Hib Eris +Date: Mon Jun 9 22:54:54 2014 +0200 + + Remove enum PopplerOrientation from API + + This should have been removed long time ago with + 1aad886c6c19a964a3fc9e18f31acc8e115478e0 + + https://bugs.freedesktop.org/show_bug.cgi?id=93229 + + glib/poppler.h | 8 -------- + glib/reference/poppler-docs.sgml | 1 - + glib/reference/poppler-sections.txt | 11 ----------- + 3 files changed, 20 deletions(-) + +commit 921fe21d56be27c8164111577b9a848525b35508 +Author: Carlos Garcia Campos +Date: Thu Dec 3 16:23:30 2015 +0100 + + regtest: Fix testing text backend + + Fix a typo in previous commit. + + regtest/backends/text.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3e22c678e749eda4402a7440b91b33d627705fdb +Author: Carlos Garcia Campos +Date: Thu Dec 3 15:46:58 2015 +0100 + + regtest: Add support for testing password protected documents + + Similar to how skipped file works, you can pass a passwords file from + the command line or add a Passwords file to your docs directory. This + file should be a python file containing a "passwords" dictionary where + the key is the test document and the value is the password required to + open that document. + + regtest/TestReferences.py | 7 +++++-- + regtest/TestRun.py | 11 +++++++---- + regtest/Utils.py | 13 +++++++++++++ + regtest/backends/__init__.py | 2 +- + regtest/backends/cairo.py | 7 +++++-- + regtest/backends/postscript.py | 7 +++++-- + regtest/backends/splash.py | 7 +++++-- + regtest/backends/text.py | 7 +++++-- + regtest/main.py | 3 +++ + 9 files changed, 49 insertions(+), 15 deletions(-) + +commit 50ba37c7b1aff14c73f158ff7f33d31953af512b +Author: Hib Eris +Date: Sun Jun 8 14:03:17 2014 +0200 + + doc: Move PopplerError to it's own section + + https://bugs.freedesktop.org/show_bug.cgi?id=79837 + + glib/poppler.cc | 15 +++++++++++++++ + glib/reference/poppler-docs.sgml | 1 + + glib/reference/poppler-sections.txt | 18 +++++++++++++----- + 3 files changed, 29 insertions(+), 5 deletions(-) + +commit ef518d601836fcedb8b558447f10c846e4038318 +Author: Hib Eris +Date: Mon Jun 9 15:53:57 2014 +0200 + + doc: Add poppler_orientation_get_type to poppler-sections.txt + + https://bugs.freedesktop.org/show_bug.cgi?id=79837 + + glib/reference/poppler-sections.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 7f1de12da6d1128535c2e3e7dc89e29ca61b858f +Author: Hib Eris +Date: Sun Jun 8 22:27:47 2014 +0200 + + doc: Fix PopplerStructureElement documentation + + https://bugs.freedesktop.org/show_bug.cgi?id=79837 + + glib/poppler-structure-element.cc | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +commit d4a9da24d2c479d53ff1094e6e1d7c1d79561da4 +Author: Hib Eris +Date: Mon Jun 9 08:34:13 2014 +0200 + + doc: Do not include private headers + + https://bugs.freedesktop.org/show_bug.cgi?id=79837 + + glib/reference/Makefile.am | 6 +++++- + glib/reference/poppler-sections.txt | 1 - + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 7980727d76b29db12b468e5da19d174d42bc3b00 +Author: Adrian Johnson +Date: Tue Oct 27 22:27:22 2015 +1030 + + pdftops: fix %%PageBoundingBox + + The %%PageBoundingBox calculation did not take into account the + page transformation + (eg rotate, fit-to-page). + + Bug 87161 + + poppler/GfxState.cc | 16 +++++++++++ + poppler/GfxState.h | 5 ++++ + poppler/PSOutputDev.cc | 72 + +++++++++++++++++++++++++++++++++++++------------- + 3 files changed, 74 insertions(+), 19 deletions(-) + +commit 37840827c4073dedfd37915a74eb8fe0c44843c3 +Author: Thomas Freitag +Date: Wed Dec 2 22:15:33 2015 +0100 + + Ignore the alternateSpace and tintTransform + + As a reasonable compromise in my eyes this new patch + now also checks the alternate colorspace, and if this + is DeviceGray in case of a separation colorspace with + name black this patch treats is as if it is really a + DeviceGray and so ignore tintTransform and alternate + colorspace just in this case when using getGray() and getRGB(). + + Bug #92381 + + poppler/GfxState.cc | 64 + +++++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 48 insertions(+), 16 deletions(-) + +commit 72f0ea4f883417a920be65cb778989bf81e8f57d +Author: Carlos Garcia Campos +Date: Wed Dec 2 16:59:16 2015 +0100 + + glib-demo: Use duration_real in transitions demo + + glib/demo/transitions.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b5c7b93cabc0d95fb3a7dc1b8104363cd04873c1 +Author: Arseniy Lartsev +Date: Wed Dec 2 16:48:05 2015 +0100 + + glib: Add duration_real to PopplerPageTransition + + https://bugs.freedesktop.org/show_bug.cgi?id=92040 + + glib/poppler-page.cc | 1 + + glib/poppler-page.h | 1 + + 2 files changed, 2 insertions(+) + +commit 38ff3736576b81be51eb11454862f83d1c3f3d0e +Author: Adrian Johnson +Date: Sun Nov 29 08:06:14 2015 +1030 + + Visual Studio 2015 now supports snprintf + + Bug 93116 + + config.h.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c63aa0c153fc114e6457fc89a40a9aa2a5508b9a +Author: Albert Astals Cid +Date: Mon Nov 16 21:44:17 2015 +0100 + + Poppler 0.38 + + CMakeLists.txt | 4 ++-- + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 19 insertions(+), 7 deletions(-) + +commit 6ca4afcea790d9118af3cda4961a647485fb14e8 +Author: Albert Astals Cid +Date: Mon Nov 16 21:40:20 2015 +0100 + + Update copyright years + + utils/pdftocairo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e14049bc5b85f8ae2e1a56bc09480a499343e49 +Author: Adrian Johnson +Date: Sat Oct 31 18:32:49 2015 +1030 + + pdftocairo: fix fit to page transformation + + Testing with the test case in bug 87161 revealed some bugs. + + utils/pdftocairo.cc | 42 ++++++++++++++++++++---------------------- + 1 file changed, 20 insertions(+), 22 deletions(-) + +commit 8859cebef5bb5308757505c8f2c8ca9fc12e154d +Author: Adrian Johnson +Date: Sat Oct 31 08:04:51 2015 +1030 + + gitignore + + utils/.gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 946eb417e6da11491f6409669119254c769b6945 +Author: Adrian Johnson +Date: Thu Oct 29 21:59:06 2015 +1030 + + man pages: remove final comma in see also list + + utils/pdfdetach.1 | 2 +- + utils/pdffonts.1 | 2 +- + utils/pdfimages.1 | 2 +- + utils/pdfinfo.1 | 2 +- + utils/pdfseparate.1 | 2 +- + utils/pdfsig.1 | 2 +- + utils/pdftocairo.1 | 2 +- + utils/pdftohtml.1 | 2 +- + utils/pdftoppm.1 | 2 +- + utils/pdftops.1 | 2 +- + utils/pdftotext.1 | 2 +- + utils/pdfunite.1 | 2 +- + 12 files changed, 12 insertions(+), 12 deletions(-) + +commit 1c66076bac768774e8b2b514bc0c555bc0395348 +Author: André Guerreiro +Date: Thu Oct 29 21:55:46 2015 +1030 + + pdfsig: update man page + + utils/pdfsig.1 | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 3167964d70647d7b04e3ef8f415d5935990ecc9a +Author: Thomas Freitag +Date: Wed Oct 28 23:13:44 2015 +0100 + + Multiply opacity in case of pattern colorspace + + Bug #92592 + + poppler/Gfx.cc | 4 +++- + poppler/OutputDev.h | 4 +++- + poppler/SplashOutputDev.cc | 8 ++++++++ + poppler/SplashOutputDev.h | 2 ++ + splash/Splash.cc | 16 ++++++++++++++-- + splash/Splash.h | 2 ++ + splash/SplashState.cc | 11 ++++++++++- + splash/SplashState.h | 5 ++++- + 8 files changed, 46 insertions(+), 6 deletions(-) + +commit 298caa2fc52cf50e92e1afda39b77b11f2de9743 +Author: Adrian Johnson +Date: Wed Oct 28 20:54:43 2015 +1030 + + Add pdfsig reference (and other missing utils) to man pages + + utils/pdfdetach.1 | 5 ++++- + utils/pdffonts.1 | 3 +++ + utils/pdfimages.1 | 5 ++++- + utils/pdfinfo.1 | 3 +++ + utils/pdfseparate.1 | 10 ++++++++++ + utils/pdftocairo.1 | 3 +++ + utils/pdftohtml.1 | 3 +++ + utils/pdftoppm.1 | 3 +++ + utils/pdftops.1 | 3 +++ + utils/pdftotext.1 | 5 ++++- + utils/pdfunite.1 | 10 ++++++++++ + 11 files changed, 50 insertions(+), 3 deletions(-) + +commit 5a6d6f5ec8782bb69a5805d8d8379a33aa00edec +Author: Adrian Johnson +Date: Wed Oct 28 20:54:23 2015 +1030 + + Add pdfsig man page + + utils/pdfsig.1 | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +commit 1f8e1a029773cefe0c31357c1e450cc4ecd5a5b5 +Author: Adrian Johnson +Date: Wed Oct 28 19:38:14 2015 +1030 + + pdfsig: rename -c to -nocert + + and make help options consistent with other tools (add -? and list + help options last) + + utils/pdfsig.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 9d5bf425bd82dda303362380c488559be0007d78 +Author: Adrian Johnson +Date: Wed Oct 28 19:34:26 2015 +1030 + + rename pdfsigverify to pdfsig + + utils/CMakeLists.txt | 12 ++++++------ + utils/Makefile.am | 6 +++--- + utils/{pdfsigverify.cc => pdfsig.cc} | 6 +++--- + 3 files changed, 12 insertions(+), 12 deletions(-) + +commit 1d97f708ceb7cd34ccdb1a4f85192efe83d1853c +Author: Albert Astals Cid +Date: Tue Oct 27 22:27:31 2015 +0100 + + Differentiate between unknown and untrusted issuer + + poppler/SignatureHandler.cc | 4 +++- + poppler/SignatureInfo.h | 4 +++- + utils/pdfsigverify.cc | 7 +++++-- + 3 files changed, 11 insertions(+), 4 deletions(-) + +commit 19e20dc69a631f92bf4fdc0be0dd840a460cfc92 +Author: Markus Kilås +Date: Tue Oct 27 22:23:06 2015 +0100 + + Handle untrusted issuer + + poppler/SignatureHandler.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit c20f68ce434366bbec4077824da97ce843ecdff3 +Author: Marek Kasik +Date: Thu Oct 22 16:15:23 2015 +0200 + + forms: Fix showing of some non-ASCII characters + + The &uChar is an array with just 1 member not 2. + This fixes mapping of some Unicode characters to + character codes. + + poppler/Annot.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 64735113b203bb5adaaadc65641ef6c971f82bc6 +Author: Marek Kasik +Date: Fri Oct 23 10:15:47 2015 +0200 + + forms: Find correct glyph or return 0 + + Function CharCodeToUnicode::mapToCharCode() could return + wrong character code for given unicode character because + of wrongly placed continue statement. + + poppler/CharCodeToUnicode.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 02d3564faa5d8174ed93ce66fcda975b1a898ec5 +Author: André Guerreiro +Date: Wed Oct 14 22:50:05 2015 +0200 + + Incremental hashing + large file support for digital signatures + + poppler/Form.cc | 63 + +++++++++++++++++++++++++++++++++------------ + poppler/Form.h | 1 + + poppler/SignatureHandler.cc | 34 ++++++++++++++---------- + poppler/SignatureHandler.h | 9 +++++-- + 4 files changed, 76 insertions(+), 31 deletions(-) + +commit fb906dca8b84d03267099cc3174c50e932a55236 +Author: Adrian Johnson +Date: Thu Oct 15 07:19:16 2015 +1030 + + cmake: synchronize warnings with configure + + CMakeLists.txt | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 6329e3999d0a45b4c0cd0a8b675362e694bf1243 +Author: Adrian Johnson +Date: Thu Oct 15 07:11:13 2015 +1030 + + configure: warn that the internal DCT/JPX decoders are unmaintained + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 67e1463dc65f85aec1f85b5bace9e810bf477e15 +Author: Albert Astals Cid +Date: Mon Oct 12 16:49:34 2015 +0200 + + Clarify getting a xpdf license does not allow you to use poppler in + closed source projects + + README | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 44e1a2f715d0da8bb2941da296faab7ee144cfc2 +Author: Albert Astals Cid +Date: Fri Oct 9 23:28:03 2015 +0200 + + Poppler 0.37 + + CMakeLists.txt | 4 ++-- + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + gtk-doc.make | 20 ++++++++++++-------- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/Makefile.am | 2 +- + 12 files changed, 36 insertions(+), 19 deletions(-) + +commit 5570c70a20ae62a9b3341372fafc64e916774adb +Author: André Guerreiro +Date: Mon Oct 5 16:50:30 2015 +0200 + + NSS conditional build + + CMakeLists.txt | 19 ++++++++++++++----- + config.h.cmake | 3 +++ + configure.ac | 20 +++++++++++++++++++- + poppler/Form.cc | 7 ++++++- + poppler/Makefile.am | 28 ++++++++++++++++++++++------ + utils/CMakeLists.txt | 16 +++++++++------- + utils/Makefile.am | 5 ++++- + 7 files changed, 77 insertions(+), 21 deletions(-) + +commit c7c0207b1cfe49a4353d6cda93dbebef4508138f +Author: André Guerreiro +Date: Mon Oct 5 15:57:04 2015 +0200 + + Support for adbe.pkcs7.sha1 signatures + + poppler/Form.cc | 2 +- + poppler/SignatureHandler.cc | 27 +++++++++++++++++++++++++-- + 2 files changed, 26 insertions(+), 3 deletions(-) + +commit e8cb16bff48dbe2d9efd988ddb09608406d2633b +Author: Adrian Johnson +Date: Sun Sep 27 15:34:12 2015 +0930 + + configure: fix openjpeg detection + + - configure was failing when enable_libopenjpeg="auto" and openjpeg + not found + - fix header check for pre 1.4 versions + + Bug 92135 + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a82e338b4f9639aced3201bf7639bbdf1a7974e2 +Author: Albert Astals Cid +Date: Sun Sep 27 15:41:27 2015 +0200 + + Fix memory leak on font reload + + poppler/SplashOutputDev.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 8639b20da3d9be62f47462ad1cdaa5c65d117dfb +Author: Thomas Freitag +Date: Sun Sep 27 15:37:51 2015 +0200 + + Try to use an external font if the internal one is invalid + + poppler/GfxFont.h | 11 +++++++++++ + poppler/SplashOutputDev.cc | 8 ++++++++ + 2 files changed, 19 insertions(+) + +commit e3225a0543d1e6fbc269094ca192879816296993 +Author: Albert Astals Cid +Date: Fri Sep 25 01:14:41 2015 +0200 + + Fix crash in GfxGouraudTriangleShading for malformed files + + poppler/GfxState.cc | 26 ++++++++++++++++---------- + 1 file changed, 16 insertions(+), 10 deletions(-) + +commit 0a33e3a740a1dbe57023d0a51077689d29d79def +Author: Albert Astals Cid +Date: Fri Sep 25 01:00:32 2015 +0200 + + Fix the fix of the fix for SplashOutputDev::beginTransparencyGroup + and malformed files + + poppler/SplashOutputDev.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit b723e4f90c78ac972bf30d7006283042930374d7 +Author: Albert Astals Cid +Date: Fri Sep 25 00:53:10 2015 +0200 + + Fix crash in malformed document in SplashOutputDev::drawMaskedImage + + And improved the one i just did for + SplashOutputDev::beginTransparencyGroup + + poppler/SplashOutputDev.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit fd49b3d4ecdbe04c4f51e6ab77687dc25bbc3f49 +Author: Albert Astals Cid +Date: Fri Sep 25 00:45:55 2015 +0200 + + Fix crash on Annot::layoutText for malformed documents + + poppler/Annot.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit a88be71fee8a4fd8e9a5a1d9d955addc0f3076ea +Author: Albert Astals Cid +Date: Fri Sep 25 00:42:14 2015 +0200 + + Fix crash in SplashOutputDev::beginTransparencyGroup in malformed file + + poppler/SplashOutputDev.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 0fa5c17ea409c3fdfe1e3a97ff5e4bae96da1cae +Author: Albert Astals Cid +Date: Fri Sep 25 00:36:33 2015 +0200 + + Fix crash on JBIG2Stream::readHalftoneRegionSeg for malformed + documents + + poppler/JBIG2Stream.cc | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit 942adfc25e7a00ac3cf032ced2d8949e99099f70 +Author: Albert Astals Cid +Date: Fri Sep 25 00:30:58 2015 +0200 + + Fix crash on AnnotInk::draw for malformed documents + + poppler/Annot.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4f7903ebc037c63683637973285bc34ea83542dc +Author: André Guerreiro +Date: Thu Sep 24 23:57:46 2015 +0200 + + Fix for Buffer overflow + + poppler/Form.cc | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +commit 9aa19159bff4db02889cba48b9b31e40247e5314 +Author: Even Rouault +Date: Fri Sep 11 13:56:05 2015 +0200 + + Catalog::cachePageTree(): recover from out of memory condition + + poppler/Catalog.cc | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 8dc9187690de10f1538764972799a39660272d1f +Author: Even Rouault +Date: Fri Sep 11 13:30:32 2015 +0200 + + Catalog::getNumPages(): validate page count + + poppler/Catalog.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 7028f835a603e12dd73452a39f56ac0b633207b2 +Author: Arseniy Lartsev +Date: Sun Sep 20 18:32:36 2015 +0200 + + PageTransition D is a number not an int + + See bug #92040 + + poppler/PageTransition.cc | 5 +++-- + poppler/PageTransition.h | 5 +++-- + qt4/src/poppler-page-transition.cc | 6 ++++++ + qt4/src/poppler-page-transition.h | 14 ++++++++++++-- + qt5/src/poppler-page-transition.cc | 6 ++++++ + qt5/src/poppler-page-transition.h | 14 ++++++++++++-- + 6 files changed, 42 insertions(+), 8 deletions(-) + +commit a98f99e90aac703e648697da5c897c49645eda10 +Author: Kenji Uno +Date: Wed Sep 16 22:08:59 2015 +0200 + + SplashOuputDev: Protect calls to set/getAA with the proper #if guards + + Bug #92006 + + poppler/SplashOutputDev.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 2a48cab5e66a69ed1bf3e792efc109ddcad8d5ee +Author: Jason Crain +Date: Tue Sep 15 14:43:21 2015 -0500 + + cairo: Use mask for even-odd fill + + Bug #84527 + + poppler/CairoOutputDev.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 10693fb236ff92c6aa0c0a9f762362d2fd9ea738 +Author: Albert Astals Cid +Date: Mon Sep 14 20:19:00 2015 +0200 + + include shuffling + + poppler/PDFDoc.cc | 2 -- + poppler/PDFDoc.h | 3 --- + poppler/SignatureHandler.cc | 1 - + utils/pdfsigverify.cc | 1 + + 4 files changed, 1 insertion(+), 6 deletions(-) + +commit 6e24d374987fbba0f5a133d73dfcb3e73129b534 +Author: Albert Astals Cid +Date: Mon Sep 14 19:59:09 2015 +0200 + + Simplify biterange handling + + poppler/Form.cc | 22 +++++++--------------- + poppler/Form.h | 2 +- + 2 files changed, 8 insertions(+), 16 deletions(-) + +commit 7afa26fc389f4b2aa67cdf286e9c4ebfb3d78de5 +Author: Albert Astals Cid +Date: Mon Sep 14 19:50:56 2015 +0200 + + Disable SignatureInfo and SignatureHandler copy ctr and assignment + operator + + poppler/SignatureHandler.h | 3 +++ + poppler/SignatureInfo.h | 3 +++ + 2 files changed, 6 insertions(+) + +commit 5348f8d080ae9f0ee58d75fd7ae2bc9f23692eca +Author: Albert Astals Cid +Date: Mon Sep 14 19:46:23 2015 +0200 + + Fix some leaks in SignatureHandler + + poppler/SignatureHandler.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 17b3a8dc2f8ab50696dd1247c4b6dd75991ab17e +Author: Albert Astals Cid +Date: Mon Sep 14 19:40:30 2015 +0200 + + Signatures: keep Goostring and convert to uchar when needed + + poppler/Form.cc | 11 ++++++----- + poppler/Form.h | 5 ++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit a4ac855435325225e3d89d83870ff08ec73d86f8 +Author: Albert Astals Cid +Date: Mon Sep 14 01:52:41 2015 +0200 + + PDFDoc::getSignatureWidgets: Do not assume a given page exists + + poppler/PDFDoc.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 6509068cf6e4a92359bcc5402f9e9eb9649d641c +Author: Albert Astals Cid +Date: Mon Sep 14 01:45:47 2015 +0200 + + SignatureHandler initialize members on constructor + + poppler/SignatureHandler.cc | 4 ++++ + poppler/SignatureHandler.h | 8 ++++---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit 5d8dfaa9d55932cde638880bcee063a6f084689f +Author: Albert Astals Cid +Date: Mon Sep 14 01:43:16 2015 +0200 + + SignatureInfo::setSignerName: free old signer_name + + poppler/SignatureInfo.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f284cfc7394175ea675d7c76d97a1f8461cf17d2 +Author: Albert Astals Cid +Date: Mon Sep 14 01:42:11 2015 +0200 + + Start function names on lowercase + + poppler/Form.cc | 4 ++-- + poppler/SignatureHandler.cc | 5 +++-- + poppler/SignatureHandler.h | 5 +++-- + 3 files changed, 8 insertions(+), 6 deletions(-) + +commit 127ad3bb038d90ad7579e2e94cff2890869e2f43 +Author: Albert Astals Cid +Date: Mon Sep 14 01:40:31 2015 +0200 + + FormFieldSignature::parseInfo: check for isString instead !isNull + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e428a3b8449830bf00706b4ccf86c27a55970f1f +Author: Albert Astals Cid +Date: Mon Sep 14 01:39:57 2015 +0200 + + FormFieldSignature::parseInfo: Use shorter isName version + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ba3a4ec30fcd303e91ef41bef491c230a822bd32 +Author: Albert Astals Cid +Date: Mon Sep 14 01:36:44 2015 +0200 + + Delete the signature_info in FormFieldSignature not in pdfsigverify + + poppler/Form.cc | 1 + + utils/pdfsigverify.cc | 3 +-- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e6b3d696adea70c79f60a67c275e23c29d2534c3 +Author: Albert Astals Cid +Date: Mon Sep 14 01:33:56 2015 +0200 + + Make signature code more resilient + + Do not abort with sign-a-pdf-with-reader-enabled.pdf + + poppler/Form.cc | 68 + +++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 37 insertions(+), 31 deletions(-) + +commit 23fa84ff91666d1feb2242fe4572eb397c791c55 +Author: Albert Astals Cid +Date: Mon Sep 14 01:28:18 2015 +0200 + + cmake: No need if NSS3_FOUND if it's required + + CMakeLists.txt | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit 7a1dac27d380f0b1a68383525a4ae4a0c7f3e6f5 +Author: Albert Astals Cid +Date: Mon Sep 14 01:26:31 2015 +0200 + + FormFieldSignature::validateSignature: Free to_check earlier + + poppler/Form.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 71cc344d85aba7a4ae79e2c4c454341096a2329b +Author: Albert Astals Cid +Date: Mon Sep 14 01:25:31 2015 +0200 + + Remove PDFDoc::countSignatures + + poppler/PDFDoc.cc | 7 +------ + poppler/PDFDoc.h | 3 +-- + utils/pdfsigverify.cc | 9 +++------ + 3 files changed, 5 insertions(+), 14 deletions(-) + +commit c68954dd73202f21b62899dc335fd74218d5b595 +Author: Albert Astals Cid +Date: Mon Sep 14 01:20:41 2015 +0200 + + pdfsigverify: move assignment before if + + utils/pdfsigverify.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8727fe6c08b7326523d6e15c90ce89e5e9d7300e +Author: Albert Astals Cid +Date: Mon Sep 14 01:20:16 2015 +0200 + + pdfsigverify: no if before delete + + utils/pdfsigverify.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit eb1a6a6254fb393555d6d30b99f4ea800d8d446b +Author: André Guerreiro +Date: Mon Sep 14 01:17:30 2015 +0200 + + Core: Support for digital signatures + + Coded with André Esser + + Bug #16770 + + CMakeLists.txt | 9 ++ + cmake/modules/FindNSS3.cmake | 22 ++++ + configure.ac | 2 + + poppler/DateInfo.cc | 26 ++++ + poppler/DateInfo.h | 3 + + poppler/Form.cc | 116 ++++++++++++++++- + poppler/Form.h | 16 +++ + poppler/Makefile.am | 6 + + poppler/PDFDoc.cc | 27 ++++ + poppler/PDFDoc.h | 9 ++ + poppler/SignatureHandler.cc | 301 + +++++++++++++++++++++++++++++++++++++++++++ + poppler/SignatureHandler.h | 65 ++++++++++ + poppler/SignatureInfo.cc | 86 +++++++++++++ + poppler/SignatureInfo.h | 66 ++++++++++ + utils/CMakeLists.txt | 8 ++ + utils/Makefile.am | 4 + + utils/pdfsigverify.cc | 174 +++++++++++++++++++++++++ + 17 files changed, 938 insertions(+), 2 deletions(-) + +commit b14d4b0968f7b0ad783c3fa56ad863d7fda235fe +Author: Albert Astals Cid +Date: Thu Sep 10 00:33:15 2015 +0200 + + Post release fixlets for the NEWS file + + NEWS | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit de1ece5c929c3f46c04be76b4b72f6371911fd1a +Author: Albert Astals Cid +Date: Thu Sep 10 00:26:02 2015 +0200 + + Poppler 0.36 + + CMakeLists.txt | 4 ++-- + NEWS | 36 ++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/Makefile.am | 2 +- + 11 files changed, 47 insertions(+), 11 deletions(-) + +commit d490c21fe4a60cff26f34c619d3078dcb575bf44 +Author: Albert Astals Cid +Date: Wed Sep 9 23:55:57 2015 +0200 + + Update (C) + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fc69a5e7dab48636946282e5d4b7be77e650023c +Author: Albert Astals Cid +Date: Tue Sep 8 17:48:49 2015 +0200 + + Qt5: Minor optimizations + + Call reserve on containers + Use QStringLiteral/QLatin1String + + qt5/src/poppler-annotation.cc | 612 + +++++++++++++++++++++--------------------- + qt5/src/poppler-document.cc | 3 +- + qt5/src/poppler-fontinfo.cc | 3 +- + qt5/src/poppler-form.cc | 3 +- + qt5/src/poppler-optcontent.cc | 2 + + qt5/src/poppler-page.cc | 1 + + qt5/src/poppler-private.cc | 18 +- + 7 files changed, 325 insertions(+), 317 deletions(-) + +commit 9b4e908d86e78535cced9fb7ccac1f3f0e1fc5c1 +Author: Albert Astals Cid +Date: Tue Sep 8 17:48:16 2015 +0200 + + Qt4: Minor optimization + + Call reserve on containers upfront + + qt4/src/poppler-annotation.cc | 4 +++- + qt4/src/poppler-document.cc | 3 ++- + qt4/src/poppler-fontinfo.cc | 3 ++- + qt4/src/poppler-form.cc | 3 ++- + qt4/src/poppler-optcontent.cc | 2 ++ + qt4/src/poppler-page.cc | 1 + + 6 files changed, 12 insertions(+), 4 deletions(-) + +commit f8182694909c989bd65b7317f9df439c5bfabe95 +Author: Albert Astals Cid +Date: Tue Sep 8 17:13:07 2015 +0200 + + renderingIntent is always non null + + poppler/GfxState.cc | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit 6f69e2e35b8fe7a347367074ce36959d47fd8635 +Author: Albert Astals Cid +Date: Tue Sep 8 09:44:30 2015 +0200 + + Matrix is 48 bytes, pass it by ref instead of by value + + poppler/TextOutputDev.cc | 4 ++-- + poppler/TextOutputDev.h | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit c871ae2cd6fbc8a827dfe2c4d5595d7439a4b54e +Author: Heiko Becker +Date: Sun May 3 16:06:30 2015 +0200 + + cmake: Allow configuring SHARE_INSTALL_DIR + + This is helpful on a multiarch layout where the prefix is /usr/${host} + but arch-independent files should still be installed to /usr/share. + + Bug 90293 + + CMakeLists.txt | 1 + + cmake/modules/GObjectIntrospectionMacros.cmake | 2 +- + utils/CMakeLists.txt | 22 + +++++++++++----------- + 3 files changed, 13 insertions(+), 12 deletions(-) + +commit 1e1a2d0600153c98d44f65e83a0555ab5288450b +Author: Jason Crain +Date: Sun Sep 6 22:33:02 2015 +0200 + + Fix JBIG2Decode infinite loop and stack overflow + + Creating a JBIG2Decode filter can create a stack overflow or infinite + loop. Fix stack overflow by adding 'recursion' argument to fetch + call. Fix infinite loop by removing the reference lookup loop. + Chains of references aren't allowed by the spec anyway. + + Bug #91186 + + poppler/Stream.cc | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +commit 3c91ded21c828d3529f9cd00c417601c67c8a741 +Author: Albert Astals Cid +Date: Tue Sep 1 23:46:55 2015 +0200 + + Revert a42614284c94c6742b2343abd797657fffa80e0e + + poppler/PDFDoc.cc | 33 ++++++++++++++------------------- + poppler/PDFDoc.h | 11 +++++------ + qt4/src/poppler-pdf-converter.cc | 14 +------------- + qt4/src/poppler-qt4.h | 4 +--- + qt5/src/poppler-pdf-converter.cc | 14 +------------- + qt5/src/poppler-qt5.h | 4 +--- + utils/pdfunite.cc | 3 +-- + 7 files changed, 24 insertions(+), 59 deletions(-) + +commit 911d9fc8d85b776418039b4eebb37200a0987554 +Author: Jeremy Echols +Date: Tue Sep 1 00:22:28 2015 +0200 + + pdftotext: Add -bbox-layout option + + Adds layout information for blocks and lines in addition to words + + Bug #89941 + + utils/pdftotext.1 | 4 ++ + utils/pdftotext.cc | 115 + +++++++++++++++++++++++++++++++++++++++++++---------- + 2 files changed, 99 insertions(+), 20 deletions(-) + +commit a42614284c94c6742b2343abd797657fffa80e0e +Author: Adam Reichold +Date: Tue Sep 1 00:15:46 2015 +0200 + + Add option to strip encryption + + Adds a PDF write mode that forces a complete rewrite that ignores + the original + encryption parameters of the document and also removes the encryption + entry + from the trailer dictionary. + + poppler/PDFDoc.cc | 33 +++++++++++++++++++-------------- + poppler/PDFDoc.h | 11 ++++++----- + qt4/src/poppler-pdf-converter.cc | 14 +++++++++++++- + qt4/src/poppler-qt4.h | 4 +++- + qt5/src/poppler-pdf-converter.cc | 14 +++++++++++++- + qt5/src/poppler-qt5.h | 4 +++- + utils/pdfunite.cc | 3 ++- + 7 files changed, 59 insertions(+), 24 deletions(-) + +commit 72c0162258f2630a3bb11b9c1078ec1ec2812788 +Author: Jason Crain +Date: Tue Aug 18 01:34:10 2015 -0500 + + cairo: fix size of transparency group surface + + Under rotation cairo_surface_create_similar_clip will create a surface + with incorect width/height. Rely on cairo to do the correct + calculation. + + Bug #66229 + + poppler/CairoOutputDev.cc | 30 ++++++++---------------------- + 1 file changed, 8 insertions(+), 22 deletions(-) + +commit 06f942657ee0798d7bdc5bd180150ea0464833a5 +Author: Arthur Stavisky +Date: Sat Aug 29 15:50:45 2015 +0200 + + Fix for xref table creation + + Bug #90790 + + utils/pdfunite.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6ccdd381b483f50f37005fd9b13f79d2f38273ff +Author: Pino Toscano +Date: Sat Aug 29 12:18:44 2015 +0200 + + typo fix, "existant" -> "existent" + + NEWS | 2 +- + poppler/Form.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9d79f06192d176298b4c911a6702ad1cfe099112 +Author: Hib Eris +Date: Thu Aug 27 23:10:05 2015 +0200 + + Do not hardcode -fPIC in Makefile.am + + The flag -fPIC is already set on CXXFLAGS by configure. + For the mingw compiler, you should not use fPIC, see d44e7e35. + + https://bugs.freedesktop.org/show_bug.cgi?id=91466 + + qt5/src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3e19bec738889ee9140379ac3f871552dbb9bf41 +Author: Thomas Freitag +Date: Thu Aug 27 23:01:21 2015 +0200 + + pdfunite: Insert embedded files in result pdf + + Bug #90066 + + poppler/PDFDoc.cc | 1 - + utils/pdfunite.cc | 156 + +++++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 154 insertions(+), 3 deletions(-) + +commit 6e469dbe239714b478488af5ff73046e6a46a908 +Author: Adam Reichold +Date: Sun Aug 16 21:05:38 2015 +0200 + + Change default Qt frontend image format + + Change the default image format used by the Qt frontends to XBGR/RGB32 + which allows efficient blending and pixmap conversion via Qt. Also use + the premultiplied conversion for IgnorePaperColor to elide a further + copy for pixmap conversion. + + qt4/src/poppler-page.cc | 46 + +++++++++++++++------------------------------- + qt5/src/poppler-page.cc | 46 + +++++++++++++++------------------------------- + 2 files changed, 30 insertions(+), 62 deletions(-) + +commit 56fc0bb2f20adfd89835f3132bfef3033fdcd80d +Author: Adam Reichold +Date: Sun Aug 16 21:01:52 2015 +0200 + + Add premultiplied alpha channel to SplashBitmap + + This extends the convertToXBGR method so that it can either + * leave the alpha channel of the bitmap data opaque, + * copy the alpha channel into the bitmap data, + * transfer the alpha channel into the bitmap data and + perform premultiplication on the bitmap data. + + qt4/src/poppler-page.cc | 6 +++++- + qt5/src/poppler-page.cc | 6 +++++- + splash/SplashBitmap.cc | 49 + ++++++++++++++++++++++++++++++++++++++----------- + splash/SplashBitmap.h | 11 +++++++++-- + 4 files changed, 57 insertions(+), 15 deletions(-) + +commit e5511b58e732f921c65e366fb4d221371b95d905 +Author: Hans-Peter Deifel +Date: Thu Aug 27 22:38:08 2015 +0200 + + cpp: Fix utf8/utf16 conversion + + The old code assumed that ustring::size() would return the number of + bytes in ustring, but it really returns the number of + characters. Since + ustring is a basic_string, these two values differ + (by a + factor of two). + + This needs to be considered when using iconv, since it operates + on byte + counts, not character counts. + + Bug #91644 + + cpp/poppler-global.cpp | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit d06c27584ecf4b7ff2fe492f0133722ac461dfd6 +Author: Thomas Freitag +Date: Thu Aug 27 22:16:03 2015 +0200 + + File Saving improvements + + Refinement of the /P annotation test + + Fixes file from comment #8 in bug #87637 + + poppler/PDFDoc.cc | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) + +commit 545a8f7cb0a473706858d2851f968ffadcc78ed0 +Author: Jason Crain +Date: Mon Aug 24 01:12:01 2015 +0200 + + Fix bounds check in Linearization::getPageFirst + + Make sure Linearization::pageFirst is in the interval [0, + getNumPages), + otherwise Hints::getPageObjectNum() can have an out of bounds read. + + Bug #91200 + + poppler/Linearization.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3e61c7523416157acadec7fe59429f880a9d0310 +Author: William Bader +Date: Wed Aug 19 23:01:41 2015 +0200 + + Splash: Fix wrong memory access + + Bug #91686 + + splash/Splash.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 431cd5afe7dc931f21f7eadd3e69406612d09a0c +Author: Jakub Wilk +Date: Mon Aug 17 19:49:51 2015 +0200 + + Update Jakub Wilk's email + + fofi/FoFiType1.cc | 2 +- + poppler/CharCodeToUnicode.cc | 2 +- + poppler/GlobalParams.cc | 2 +- + poppler/Object.h | 2 +- + poppler/PDFDoc.cc | 2 +- + poppler/UnicodeMap.cc | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +commit 1745d2166dd7680d72fe4a71c1fc7a0a5379dcca +Author: Tobias Koenig +Date: Fri Aug 14 00:10:53 2015 +0200 + + Add basic support for RichMedia annotations to Qt frontends + + Bug #91548 + + qt4/src/poppler-annotation.cc | 615 + ++++++++++++++++++++++++++++++++++++++++- + qt4/src/poppler-annotation.h | 330 +++++++++++++++++++++- + qt5/src/poppler-annotation.cc | 616 + +++++++++++++++++++++++++++++++++++++++++- + qt5/src/poppler-annotation.h | 331 ++++++++++++++++++++++- + 4 files changed, 1888 insertions(+), 4 deletions(-) + +commit da5760675d75acf1883ac6f757f755222248762f +Author: Albert Astals Cid +Date: Fri Aug 14 00:04:15 2015 +0200 + + add (C) + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit bc01007d714a58fd0023594b055e0cd5fbad1f7e +Author: Tobias Koenig +Date: Thu Aug 13 23:57:44 2015 +0200 + + Patch to support RichMedia annotations in poppler core + + poppler/Annot.cc | 404 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 172 ++++++++++++++++++++++- + 2 files changed, 575 insertions(+), 1 deletion(-) + +commit 1213501882cf2ec6e3dcb3c078391040c8cb0a57 +Author: Albert Astals Cid +Date: Sun Aug 9 18:27:06 2015 +0200 + + 0.35.0 + + CMakeLists.txt | 4 ++-- + NEWS | 29 +++++++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/Makefile.am | 2 +- + 11 files changed, 40 insertions(+), 11 deletions(-) + +commit a7b1151ce7a14d359d85bacfe02352cdeb8d9a8f +Author: Hib Eris +Date: Sun Jul 26 10:38:37 2015 +0200 + + glib-demo: Prefer gtk_label_set_{x,y}align() over deprecated + gtk_misc_set_alignment() + + https://bugs.freedesktop.org/show_bug.cgi?id=88788 + + glib/demo/main.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit e6e7d1492b518d57136031a94069a994182693cc +Author: Hib Eris +Date: Sun May 31 12:32:36 2015 +0200 + + pdftocairo: Fix cast to pointer from integer of different size + on win64 + + Fixes warning: + + [ 322s] CXX pdftocairo-pdftocairo-win32.o + [ 324s] In file included from + /usr/x86_64-w64-mingw32/sys-root/mingw/include/windows.h:72:0, + [ 324s] from + /usr/x86_64-w64-mingw32/sys-root/mingw/include/cairo/cairo-win32.h:44, + [ 324s] from pdftocairo-win32.cc:16: + [ 324s] pdftocairo-win32.cc: In function 'HWND__* + createGroupBox(HWND, HINSTANCE, int, const char*, RECT*)': + [ 324s] pdftocairo-win32.cc:170:23: warning: cast to pointer from + integer of different size [-Wint-to-pointer-cast] + [ 324s] parent, (HMENU)id, + [ 324s] ^ + [ 324s] pdftocairo-win32.cc: In function 'HWND__* + createCheckBox(HWND, HINSTANCE, int, const char*, RECT*)': + [ 324s] pdftocairo-win32.cc:186:23: warning: cast to pointer from + integer of different size [-Wint-to-pointer-cast] + [ 324s] parent, (HMENU)id, + [ 324s] ^ + [ 324s] pdftocairo-win32.cc: In function 'HWND__* + createStaticText(HWND, HINSTANCE, int, const char*, RECT*)': + [ 324s] pdftocairo-win32.cc:202:23: warning: cast to pointer from + integer of different size [-Wint-to-pointer-cast] + [ 324s] parent, (HMENU)id, + [ 324s] ^ + [ 324s] pdftocairo-win32.cc: In function 'HWND__* + createPageScaleComboBox(HWND, HINSTANCE, int, RECT*)': + [ 324s] pdftocairo-win32.cc:219:23: warning: cast to pointer from + integer of different size [-Wint-to-pointer-cast] + [ 324s] parent, (HMENU)id, + [ 324s] ^ + + https://bugs.freedesktop.org/show_bug.cgi?id=91465 + + utils/pdftocairo-win32.cc | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit f3a0191abbf67c8b0f83739e1844a2fabe4138a4 +Author: Hib Eris +Date: Thu Jul 23 21:44:57 2015 +0200 + + Explicitly link poppler-glib against pthread + + Debian complains about missing symbols: + + dpkg-shlibdeps: warning: symbol pthread_mutexattr_destroy used by + debian/libpoppler-glib8/usr/lib/i386-linux-gnu/libpoppler-glib.so.8.6.0 + found in none of the libraries + dpkg-shlibdeps: warning: symbol pthread_mutexattr_init used by + debian/libpoppler-glib8/usr/lib/i386-linux-gnu/libpoppler-glib.so.8.6.0 + found in none of the libraries + dpkg-shlibdeps: warning: symbol pthread_mutexattr_settype used by + debian/libpoppler-glib8/usr/lib/i386-linux-gnu/libpoppler-glib.so.8.6.0 + found in none of the libraries + + https://bugs.freedesktop.org/show_bug.cgi?id=91450 + + glib/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit fb264bfa8bf7142cabc8d94a86594cf0e7c9f134 +Author: Hib Eris +Date: Fri Jul 24 22:18:26 2015 +0200 + + glib-demo: Remove code for no longer supported gtk versions + + https://bugs.freedesktop.org/show_bug.cgi?id=88788 + + glib/demo/annots.c | 8 -------- + glib/demo/selections.c | 16 ---------------- + 2 files changed, 24 deletions(-) + +commit dd0883649ac296c6033474fe5991c534ac2ce594 +Author: Hib Eris +Date: Fri Jul 24 22:09:57 2015 +0200 + + glib-demo: Remove use of deprecated + gtk_dialog_set_alternative_button_order() + + https://bugs.freedesktop.org/show_bug.cgi?id=88788 + + glib/demo/main.c | 4 ---- + 1 file changed, 4 deletions(-) + +commit ffc798a7fcf95d2aaf123772072ef956ceb2dff7 +Author: Hib Eris +Date: Sun Jan 25 18:16:04 2015 +0100 + + glib-demo: Remove deprecated use of gtk_misc_set_alignment() + + https://bugs.freedesktop.org/show_bug.cgi?id=88788 + + glib/demo/main.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 56915b2989fc244b58a454fe40412eb731e706bd +Author: Hib Eris +Date: Sun Jan 25 13:10:31 2015 +0100 + + glib-demo: Remove use of deprecated GtkAlignment + + https://bugs.freedesktop.org/show_bug.cgi?id=88788 + + glib/demo/annots.c | 23 +++++++++++--------- + glib/demo/forms.c | 23 +++++++++++--------- + glib/demo/info.cc | 18 +++++++++------ + glib/demo/main.c | 12 +--------- + glib/demo/page.c | 34 ++++++++++++++++++----------- + glib/demo/text.c | 18 +++++++++------ + glib/demo/utils.c | 64 + +++++++++++++++++++++++++++++++----------------------- + 7 files changed, 107 insertions(+), 85 deletions(-) + +commit 49e33e1213a7957d4814656960bf269abcabc7c3 +Author: Hib Eris +Date: Sun Jan 25 12:21:41 2015 +0100 + + glib-demo: Remove deprecated use of gtk_tree_view_set_rules_hint() + + The use of rules-hint is deprecated in gtk because it is + considered bad application API and is not really usefull. + + See + https://git.gnome.org/browse/gtk+/commit/?id=0ed766ec866a2da7e3db05b1db2fc2519d6b1cdc + + https://bugs.freedesktop.org/show_bug.cgi?id=88788 + + glib/demo/attachments.c | 1 - + glib/demo/find.c | 1 - + glib/demo/fonts.c | 1 - + glib/demo/transitions.c | 1 - + 4 files changed, 4 deletions(-) + +commit 70f3c5ff0010775e5fcd590db1b8d475694fe3a4 +Author: William Bader +Date: Sat Jul 18 16:36:30 2015 +0200 + + Updated patch to add configure --enable-build-type + + Bug #90796 + + configure.ac | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 52 insertions(+) + +commit 1aa2f6e8a41a6a86dc02bf7c5cbc62355e780961 +Author: Albert Astals Cid +Date: Fri Jul 17 00:40:56 2015 +0200 + + Silly micro optimization: Move vars inside case {} + + poppler/SplashOutputDev.cc | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +commit 705615f7569bbadb555bbf45c15c7c01f1690db5 +Author: Albert Astals Cid +Date: Fri Jul 17 00:38:58 2015 +0200 + + More typo fix + + poppler/Catalog.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3b6b3fefe97b885e42966fece84a123fc4671b20 +Author: William Bader +Date: Fri Jul 17 00:37:46 2015 +0200 + + [Splash] Fix wrong writes on non rgb outputs + + Bug #90570 + + poppler/SplashOutputDev.cc | 52 + +++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 51 insertions(+), 1 deletion(-) + +commit 885b23bfd16a3e4970a52956493e92a160b2d0a8 +Author: Dmytro Morgun +Date: Fri Jul 17 00:30:08 2015 +0200 + + GlobalParamsWin bug/fixes + + Bug #91053 + + poppler/GlobalParamsWin.cc | 57 + ++++++++++++++++++++++++++-------------------- + 1 file changed, 32 insertions(+), 25 deletions(-) + +commit 0ce4da8ab16b4a5497688a6cf86175aaec0f585f +Author: Albert Astals Cid +Date: Wed Jul 15 23:59:11 2015 +0200 + + Make sure pageRootRef is a ref before using it + + Bug #91344 + + poppler/Catalog.cc | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) + +commit b71431513b45f8a1aa4154332dae56af241258f8 +Author: Albert Astals Cid +Date: Wed Jul 15 13:10:27 2015 +0200 + + Typo fix in warning + + poppler/Catalog.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ccd780f9504f5b077ea12370fd5380ff7da5cd23 +Author: Dmytro Morgun +Date: Wed Jul 15 00:26:55 2015 +0200 + + [Windows] remove ifndef + + splash/SplashFontEngine.cc | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +commit 2ed8465074c4fc2c88f745b29bdae92410751327 +Author: William Bader +Date: Wed Jul 15 00:07:48 2015 +0200 + + Allow configuring SPLASH_CMYK support from cmake/configure + + Bug #90795 + + CMakeLists.txt | 4 ++++ + config.h.cmake | 3 +++ + configure.ac | 7 +++++++ + poppler/SplashOutputDev.cc | 4 ++-- + qt4/src/poppler-document.cc | 3 ++- + qt4/src/poppler-page.cc | 4 ++-- + qt5/src/poppler-document.cc | 3 ++- + qt5/src/poppler-page.cc | 4 ++-- + splash/Splash.cc | 2 +- + splash/SplashBitmap.cc | 4 ++-- + 10 files changed, 27 insertions(+), 11 deletions(-) + +commit 334dc56f2f9adf4daa33c20ce034a5b1f8259baf +Author: Albert Astals Cid +Date: Sun Jul 12 23:29:30 2015 +0200 + + [qt] KeepAlphaChannel -> IgnorePaperColor + + qt4/src/poppler-page.cc | 13 ++++++------- + qt4/src/poppler-qt4.h | 4 ++-- + qt5/src/poppler-page.cc | 13 ++++++------- + qt5/src/poppler-qt5.h | 4 ++-- + 4 files changed, 16 insertions(+), 18 deletions(-) + +commit 2a1363a4a3129fe4b5e4fae1018dc8919a2d796a +Author: Albert Astals Cid +Date: Sun Jul 12 23:22:32 2015 +0200 + + Update (C) + + splash/SplashBitmap.cc | 1 + + splash/SplashBitmap.h | 1 + + 2 files changed, 2 insertions(+) + +commit e903b2364f55c4f6417d826ab85dcb60cd240563 +Author: Albert Astals Cid +Date: Sun Jul 12 23:20:20 2015 +0200 + + [qt] fix spacing in header + + qt4/src/poppler-qt4.h | 4 ++-- + qt5/src/poppler-qt5.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 810c659faea542c3bd6e9c48c9a7c60b886a9269 +Author: Adam Reichold +Date: Fri Jul 3 00:31:56 2015 +0200 + + Switch default image format of Qt frontends + + This changes the Poppler::Page::renderToImage method w.r.t. to + the image + formats used to render using Splash, i.e. the default will be RGB8. If + overprint preview is requested, DeviceN8 will be used and converted to + XBGR8 for display. If the internal alpha channel is requested, + XBGR8 will + be used and augmented by Splash's separate alpha channel. + + This yields some improvements w.r.t. to rendering including alpha + blending + with the paper colour, i.e. synthetic benchmarks using structurally + simple + documents yield more than two percent improvement. + + qt4/src/poppler-page.cc | 115 + +++++++++++++++++++++++++++++------------------- + qt5/src/poppler-page.cc | 114 + ++++++++++++++++++++++++++++------------------- + 2 files changed, 138 insertions(+), 91 deletions(-) + +commit 8fea54e48ec9ba35122c565f761e7e7f016a34f9 +Author: Adam Reichold +Date: Thu Jul 2 21:08:38 2015 +0200 + + Improve efficiency of Poppler::Page::renderToImage + + Improves the efficiency of rendering into a QImage using + the Splash output device by removing a copy of the raw bitmap data + since Qt5 will properly free this data using a function supplied + during construction, i.e. in this case gfree. + + This improves performance in synthentic rendering benchmarks + by approximately four percent and reduces the maximum working + set size. + + qt5/src/poppler-page.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 09db5a71fff4b7a0ed1d5d7e76c8270e2f6e9a8d +Author: Adam Reichold +Date: Thu Jul 2 21:02:59 2015 +0200 + + Add KeepAlphaChannel render flag to Qt frontends + + Adds a new render flag which will indicate that the image return by + Poppler::Page::renderToImage will not be opaque and alpha blended with + the paper colour, but retain its actually background transparency. + + This improves performance in synthentic rendering benchmarks by almost + five percent and the additional alpha blending that is then done + by the + consuming application is often a hardware-accellerated operation. + + qt4/src/poppler-page.cc | 6 ++++-- + qt4/src/poppler-qt4.h | 3 ++- + qt5/src/poppler-page.cc | 6 ++++-- + qt5/src/poppler-qt5.h | 3 ++- + 4 files changed, 12 insertions(+), 6 deletions(-) + +commit d604a075c6b171d5c3fe26c146d3469c4bc0af3f +Author: Adam Reichold +Date: Thu Jul 2 21:00:16 2015 +0200 + + Make SplashBitmap XBGR transfer alpha channel + + Adds an option to SplashBitmap::convertToXBGR and + SplashBitmap::getXBGRLine + so that both optionally transfer Splash's internal alpha channel + into the + fourth component of the resulting bitmap data. + + splash/SplashBitmap.cc | 27 ++++++++++++++++++++++----- + splash/SplashBitmap.h | 4 ++-- + 2 files changed, 24 insertions(+), 7 deletions(-) + +commit 17adfc848f99a5c5bfad35c94289ccf03fba1a16 +Author: Adam Reichold +Date: Sun Jul 12 17:05:24 2015 +0200 + + Adjust memory layout computation of GooString + + GooString uses the small string optimization but the static buffer + size is + hard-coded and hence the final object size becomes dependent on + architecture. + This adds a helper class to compute the memory layout at compile + time so that + the target object size of e.g. 32 or another multiple of 16 is + achieved. + + This also adds an overload so that the C string returned by + GooString's + getCString method respect the constness of this and fixes a constness + issue + in the lexer tests. + + goo/GooString.h | 24 ++++++++++++++++-------- + qt4/tests/check_lexer.cpp | 2 +- + qt5/tests/check_lexer.cpp | 2 +- + 3 files changed, 18 insertions(+), 10 deletions(-) + +commit d1720740f3381f489f1ee83ce1ce53e73aafd537 +Author: Albert Astals Cid +Date: Wed Jul 8 23:22:13 2015 +0200 + + Poppler 0.34 + + CMakeLists.txt | 4 ++-- + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 19 insertions(+), 6 deletions(-) + +commit 2fc1f540754391ffa87d7fe9f3438e134d821207 +Author: Thomas Freitag +Date: Tue Jul 7 18:48:51 2015 +0200 + + [Splash] Fix crash in PDF with nested softmasks + + Bug #91240 + + poppler/SplashOutputDev.cc | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +commit 0b8919f19dd501c9962bca05c9b0559464e923c3 +Author: Dmytro Morgun +Date: Mon Jul 6 00:28:27 2015 +0200 + + Fix pedantic memory leak + + poppler/StructElement.cc | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 2ef22af960d3d800087209fea047009a8419134c +Author: Albert Astals Cid +Date: Sun Jul 5 16:03:57 2015 +0200 + + [cmake] Make sure ENABLE_LIBOPENJPEG is either 0 or 1 + + Otherwise if it was auto it gets translated to 1 for the cmakedefine + boolean + which is wrong when the auto ends up meaning "i din't find it" + + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 50455bcf4f1644060b2187d4e60c3798793041cc +Author: Tamas Szekeres +Date: Fri Jul 3 20:24:01 2015 +0200 + + std::max/min need + + Bug #88511 + + cpp/poppler-font.cpp | 3 +++ + cpp/poppler-global.cpp | 3 +++ + poppler/Annot.cc | 2 ++ + poppler/SplashOutputDev.cc | 2 ++ + 4 files changed, 10 insertions(+) + +commit 346fc70dbf2803e23e70b093401aa2cda216492b +Author: Albert Astals Cid +Date: Fri Jul 3 20:19:01 2015 +0200 + + Forgot the (C) + + poppler/PSOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit df09c1a84dfe80d2e6cfde3308c79da5b2ea7428 +Author: Marek Kasik +Date: Fri Jul 3 20:14:23 2015 +0200 + + Embed Type1 fonts to PostScript files correctly + + Remove PFB headers from embedded Type1 fonts + before embedding them into a PostScript file. + + Bug #19747 + + poppler/PSOutputDev.cc | 57 + +++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 50 insertions(+), 7 deletions(-) + +commit 11f117cc71641b89783b207232171f850a2b64ff +Author: Carlos Garcia Campos +Date: Thu Jun 4 10:51:36 2015 +0200 + + regtest: Disable pretty diffs for text files in HTML reports + + difflib is entering in an infinite loop with some files, so disable it + for now. We need to either fix that somehow or find a different way to + generate pretty diffs of text files. + + regtest/HTMLReport.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 3db4cb6f07229e26405bfb512c626a272f6351f5 +Author: Thomas Freitag +Date: Sun May 24 18:41:30 2015 +0200 + + Splash: Speed up of rendering icc based images + + Bug #90171 + + poppler/SplashOutputDev.cc | 142 + +++++++++++++++++++++++++++++++++++++++++++-- + poppler/SplashOutputDev.h | 8 ++- + splash/Splash.cc | 17 ++++-- + splash/Splash.h | 9 ++- + 4 files changed, 163 insertions(+), 13 deletions(-) + +commit c50720dcc9e15516e0e19072c0df03fbdee63dec +Author: Adrian Johnson +Date: Fri May 22 21:44:55 2015 +0930 + + glib: update new symbols section + + glib/reference/poppler-docs.sgml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit b271a19ec30b20bc11f2240ae6b96672e3cafafb +Author: Albert Astals Cid +Date: Thu May 14 21:56:47 2015 +0200 + + Poppler 0.33 + + CMakeLists.txt | 4 ++-- + NEWS | 25 +++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 9 files changed, 34 insertions(+), 9 deletions(-) + +commit 2b2fb719aa5ffe32fbc3fb500444b1643b1c6099 +Author: Albert Astals Cid +Date: Thu May 14 20:17:12 2015 +0200 + + Add missing (C) + + poppler/Annot.cc | 1 + + poppler/Annot.h | 2 +- + poppler/CairoFontEngine.cc | 1 + + poppler/Page.cc | 3 ++- + 4 files changed, 5 insertions(+), 2 deletions(-) + +commit ae76b75c6a5383eb52f58fba0faba69ae8698ef9 +Author: William Bader +Date: Thu May 14 20:06:22 2015 +0200 + + Fix regression in pdftops parameter passing + + Recent changes to the command line processing moved some options + from GlobalParams to PSOutputDev. + The options used to be set by calling setters in GlobalParams before + creating the PSOutputDev. + Now the options are set by calling setters in PSOutputDev after it + is created. + The problem is that PSOutputDev() calls init() which uses options + that now can not be set until later after PSOutputDev() returns. + These patches split some of the code of init() into a new postInit() + that is automatically called later after the pdftops main program + has had a chance to set the command line options. + When I was looking through the code, I also fixed a misspelling of + sanitizedTitle as sanitizedTile. + + Bug #89827 + + poppler/PSOutputDev.cc | 138 + +++++++++++++++++++++++++++++++------------------ + poppler/PSOutputDev.h | 11 ++-- + 2 files changed, 96 insertions(+), 53 deletions(-) + +commit c516b341a9c2e0c9a985bc14ad3cae73bf10fb02 +Author: Thomas Petazzoni +Date: Sun May 3 15:27:19 2015 +0200 + + Fix invalid shell comparaison in libtiff test + + Bug #115523 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 040b316f0cb1ac933dce616fabe24c93f96fe1cd +Author: Jason Crain +Date: Sat Apr 18 12:44:47 2015 -0500 + + glib: Fix segfault when creating PopplerAction + + Screen annotations and form fields currently pass a NULL pointer to + _poppler_action_new. Pass the PopplerDocument instead. + + Bug #90093 + + glib/poppler-annot.cc | 4 ++-- + glib/poppler-form-field.cc | 2 +- + glib/poppler-page.cc | 2 +- + glib/poppler-private.h | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit 056ee89122385bc2df7cb2c05e1cb1770af8ecce +Author: Carlos Garcia Campos +Date: Sat Apr 18 12:16:56 2015 +0200 + + glib: Add poppler_annot_markup_set_popup_rectangle() + + It updates the popup rectangle of a markup annotation that already + has a + popup associated. + + glib/poppler-annot.cc | 31 +++++++++++++++++++++++++++++++ + glib/poppler-annot.h | 2 ++ + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 34 insertions(+) + +commit 1aae63ebc6fffe9fa1a2898e4ed733c22e312015 +Author: Carlos Garcia Campos +Date: Sat Apr 18 11:46:41 2015 +0200 + + annots: Add popup annots without a markup annot associated to the + list of annots + + For consistency with Annots::createAnnot(). + + poppler/Annot.h | 2 +- + poppler/Page.cc | 6 +++++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 05ef3f9feee760544108c68e0d45d1de25fd8901 +Author: Philipp Reinkemeier +Date: Mon Feb 16 09:11:58 2015 +0100 + + annots: Fixed adding annotation of Subtype Popup to pdf page + + https://bugs.freedesktop.org/show_bug.cgi?id=89136 + + poppler/Annot.cc | 19 +++++++++++++++++++ + poppler/Page.cc | 11 ++++++++++- + 2 files changed, 29 insertions(+), 1 deletion(-) + +commit 8ca43bebf36f8da085917f28230e25524de4f4f4 +Author: Jason Crain +Date: Tue Mar 24 02:51:47 2015 -0500 + + cairo: Fix memory leak in CairoFreeTypeFont::create + + - Free embedded font data in _ft_done_face when the cairo font is + destroyed. + - Free embedded font data if _ft_new_face finds it's a duplicate of an + already open font. + - Free embedded font data and codeToGID array if font creation fails. + + Bug #89952 + + poppler/CairoFontEngine.cc | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +commit edc7bb4fe7b5e718431de12bee1d95036d06efa0 +Author: Jason Crain +Date: Sat Apr 4 18:40:48 2015 +0200 + + Combine base characters and diacritical marks + + LaTeX adds base characters and diacritical marks as separate + characters. When a base character and diacritical mark are drawn over + each other, this patch converts them into a combining character + sequence. + + Bug #87215 + C# poppler-0.31.0.tar.xz + + poppler/TextOutputDev.cc | 419 + ++++++++++++++++++++++++++++++++++------------- + poppler/TextOutputDev.h | 31 +++- + 2 files changed, 336 insertions(+), 114 deletions(-) + +commit 96c35dfde6722ff8c5ef7ff59e37be90d273acab +Author: Albert Astals Cid +Date: Fri Mar 27 22:42:34 2015 +0100 + + pdftohtml: Set exit status adecuately + + Based on a patch by Matt Atkinson + Bug #83609 + + utils/pdftohtml.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 0969801c12a6ec0fbc079c8203cece9c70466955 +Author: Albert Astals Cid +Date: Thu Mar 26 16:08:20 2015 +0100 + + Fix previous commit about initializing on failure + + It's the nComps of the destination not of the origin we need + + poppler/SplashOutputDev.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit ede6d00688fcf0e3c843b0a507304f5a98395d41 +Author: Albert Astals Cid +Date: Thu Mar 26 15:44:40 2015 +0100 + + memset on error to have reproducible outputs + + poppler/SplashOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 4bb2c9b98299f429752b4c60820cea31ef05f7e0 +Author: Jason Crain +Date: Wed Mar 25 21:04:19 2015 +0100 + + Use width from W array for WMode positioning + + Bug #89621 + + poppler/GfxFont.cc | 36 ++++++++++++------------------------ + poppler/GfxFont.h | 2 ++ + 2 files changed, 14 insertions(+), 24 deletions(-) + +commit 033dbbd7fef8c04c7f4961455cc1cd8d6d1bd93b +Author: Albert Astals Cid +Date: Sun Mar 15 14:06:15 2015 +0100 + + Fix the previous pdfDocEncoding fix + + Since actually the previous fix didn't account for non ascii + characters as output of pdfDocEncoding + + qt4/src/poppler-private.cc | 36 +++++++++++++++--------------------- + qt5/src/poppler-private.cc | 36 +++++++++++++++--------------------- + 2 files changed, 30 insertions(+), 42 deletions(-) + +commit bc8076d8f638ccb44f8e3b94aaae96850b025deb +Author: Albert Astals Cid +Date: Sun Mar 15 13:32:41 2015 +0100 + + Fix PDF Text String -> QString conversion + + If they are not UTF16-BE they are in PDFDocEncoding (not ascii) + + Fixes KDE bug #344849 + + qt4/src/poppler-private.cc | 5 +++-- + qt5/src/poppler-private.cc | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit d7cc90a8b60d7e353db6e0acdd0b789485e32972 +Author: Albert Astals Cid +Date: Sat Mar 7 15:04:52 2015 +0100 + + 0.32.0 + + CMakeLists.txt | 4 ++-- + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 23 insertions(+), 7 deletions(-) + +commit c13297d154ded11721fe7d3abdba459ca628cef8 +Author: Albert Astals Cid +Date: Sat Mar 7 14:58:10 2015 +0100 + + Update (C) + + poppler/SecurityHandler.cc | 2 +- + poppler/SplashOutputDev.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit c909964bff671d5ff0d8eee5f613ded4562f8afd +Author: Albert Astals Cid +Date: Sat Mar 7 14:54:43 2015 +0100 + + Do not assert on broken document + + Bug #89422 + + poppler/SecurityHandler.cc | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit 3705fcee0309c50b5fecd563e8e466cbe2c5972b +Author: Thomas Freitag +Date: Fri Mar 6 15:19:58 2015 +0100 + + Fix Wrong colour shown when GouraudTriangleShFill uses a DeviceN + colorspace + + Bug #89182 + + poppler/SplashOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b7fde1ec83a5fff9bec73becc22e581583a30d43 +Author: Albert Astals Cid +Date: Wed Feb 25 21:51:34 2015 +0100 + + Fix last commit regression + + It seems it actually needs to be pipe->shape and not pipe->usesShape + (i.e. it seems at some point we use pipe->shape with useShape + being false) + Otherwise we had a regression on + eci_altona-test-suite-v2_technical2_x4.pdf + + splash/Splash.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7980fe868a8ef2ee3315f0bcb606c448d6604039 +Author: William Bader +Date: Wed Feb 25 15:00:33 2015 +0100 + + Fix uninitialized variable in Splash::pipeRun + + Use useShape is actually the guard for shape, so use it in the if + + splash/Splash.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 57b6b78a0831fb31c06fd1bc6e9803de524f9d2d +Author: Thomas Freitag +Date: Tue Feb 24 23:34:57 2015 +0100 + + pdfseparate: use always an unique instance for PDFDoc for savePageAs + + utils/pdfseparate.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 8a30d219df71ead323649ff0dfd4a724b5e7bd18 +Author: William Bader +Date: Sat Feb 21 23:55:10 2015 +0100 + + Fix memcpy introduced in ec956ab8552dbe10fac4e649951042bddc424b7d + + goo/GooString.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ec956ab8552dbe10fac4e649951042bddc424b7d +Author: William Bader +Date: Tue Feb 17 22:55:14 2015 +0100 + + Reduce use of gmalloc() in GooString::appendfv() + + Bug #89096 + + goo/GooString.cc | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +commit 132ef18324f62c1f2a08dcd794b379fadaa4daf5 +Author: Petr Gajdos +Date: Wed Feb 11 19:37:21 2015 +0100 + + Annot BG/BC: Empty Array means no color + + poppler/Annot.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit bf4aae25a244b1033a2479b9a8f633224f7d5de5 +Author: William Bader +Date: Wed Feb 11 17:35:40 2015 +0100 + + Off by one fix to the previous crash fix + + fofi/FoFiTrueType.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 97dd46bae5424818ca808c20506d7d96f7b85fb5 +Author: William Bader +Date: Mon Feb 9 22:30:51 2015 +0100 + + pdftops: Add aaRaster and overprint to man file + + utils/pdftops.1 | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit c114a90063d755639d2b0dbf816690a66b54bee0 +Author: Albert Astals Cid +Date: Sun Feb 8 00:24:11 2015 +0100 + + Fix crash in fuzzed file from Bug #84988 + + poppler/TextOutputDev.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 22895623e6cd2a5923f552421d44cc80cab77dd8 +Author: Albert Astals Cid +Date: Sat Feb 7 22:28:21 2015 +0100 + + Fix malformed file crash from bug #86854 + + poppler/PSOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cdb7ad95f7c8fbf63ade040d8a07ec96467042fc +Author: Albert Astals Cid +Date: Sat Feb 7 22:21:16 2015 +0100 + + Fix malformed file crash in bug #85243 + + fofi/FoFiTrueType.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 6641b935e1fc0c4151a723b6b476d987b8324ed2 +Author: Albert Astals Cid +Date: Sat Feb 7 21:58:23 2015 +0100 + + If ECM is around include the sanitizers module + + This way you can run + cmake -DECM_ENABLE_SANITIZERS='address' + and get an ASAN built poppler + + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 92e41685dcef538a7fc669ca357ce9f448a8078e +Author: Albert Astals Cid +Date: Sat Feb 7 21:54:39 2015 +0100 + + Fix crash in malformed file from bug #85275 + + poppler/SplashOutputDev.cc | 4 ++-- + splash/Splash.cc | 10 +++++++++- + splash/SplashBitmap.cc | 4 ++-- + 3 files changed, 13 insertions(+), 5 deletions(-) + +commit 9842b3b00492eda21297d5d65f769f77a565f6ac +Author: Aleksei Volkov +Date: Sat Feb 7 20:46:26 2015 +0100 + + No need to check for hmtx, freetype does for us + + Bug #88939 + + fofi/FoFiTrueType.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4849eb43892640062c485e48ba7a29b5a0cc9587 +Author: William Bader +Date: Sat Feb 7 16:41:53 2015 +0100 + + Make the colorpsace optimization and option and not the default + + Bug #88971 + + poppler/PSOutputDev.cc | 25 ++++++++++++++++--------- + poppler/PSOutputDev.h | 4 ++++ + utils/pdftops.1 | 10 +++++++++- + utils/pdftops.cc | 4 ++++ + 4 files changed, 33 insertions(+), 10 deletions(-) + +commit 8e16e423a718b92514885e771e31048f1ae2a766 +Author: Albert Astals Cid +Date: Thu Feb 5 20:18:13 2015 +0100 + + 0.31.0 + + And copyright updating + + CMakeLists.txt | 4 ++-- + NEWS | 17 +++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/CairoOutputDev.cc | 1 + + poppler/CairoOutputDev.h | 1 + + poppler/JBIG2Stream.cc | 1 + + poppler/JBIG2Stream.h | 1 + + poppler/Makefile.am | 2 +- + poppler/Stream.cc | 1 + + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/Makefile.am | 2 +- + 16 files changed, 33 insertions(+), 11 deletions(-) + +commit f932315e559a7857d9c5642eb04efc0d2b717789 +Author: suzuki toshiya +Date: Tue Jan 20 22:05:29 2015 +1030 + + cairo: support embedding JBIG2 image data + + http://lists.freedesktop.org/archives/poppler/2014-December/011183.html + + poppler/CairoOutputDev.cc | 117 + ++++++++++++++++++++++++++++++++++++++-------- + poppler/CairoOutputDev.h | 3 ++ + poppler/JBIG2Stream.cc | 9 +++- + poppler/JBIG2Stream.h | 4 +- + poppler/Stream.cc | 13 +++++- + 5 files changed, 121 insertions(+), 25 deletions(-) + +commit 78abf540057181b708c546aee421f81a1dd58331 +Author: Adam Reichold +Date: Wed Jan 21 22:30:45 2015 +0100 + + Worlds -> Words + + qt4/src/poppler-page.cc | 4 ++-- + qt4/src/poppler-qt4.h | 2 +- + qt4/tests/check_search.cpp | 4 ++-- + qt5/src/poppler-page.cc | 4 ++-- + qt5/src/poppler-qt5.h | 2 +- + qt5/tests/check_search.cpp | 4 ++-- + 6 files changed, 10 insertions(+), 10 deletions(-) + +commit 027eac4e565576ca2e7042e21426e28abd775d98 +Author: Adam Reichold +Date: Tue Jan 20 00:09:09 2015 +0100 + + Expose whole-words search option in Qt frontends + + qt4/src/poppler-page-private.h | 5 +- + qt4/src/poppler-page.cc | 114 + +++++++++++++++++++++++++------------ + qt4/src/poppler-qt4.h | 44 +++++++++++++- + qt4/tests/check_search.cpp | 112 +++++++++++++++++++++++++++++++----- + qt5/src/poppler-page-private.h | 5 +- + qt5/src/poppler-page.cc | 116 + +++++++++++++++++++++++++------------ + qt5/src/poppler-qt5.h | 46 +++++++++++++-- + qt5/tests/check_search.cpp | 126 + +++++++++++++++++++++++++++++++++-------- + 8 files changed, 447 insertions(+), 121 deletions(-) + +commit 30a0baa353c374165e5f411efc4203746f14a74d +Author: Albert Astals Cid +Date: Sun Jan 18 15:39:53 2015 +0100 + + Move more variables from GlobalParams to PSOutputDev + + poppler/CairoFontEngine.cc | 4 +- + poppler/GfxFont.cc | 15 ++--- + poppler/GfxFont.h | 7 ++- + poppler/GlobalParams.cc | 144 + --------------------------------------------- + poppler/GlobalParams.h | 28 --------- + poppler/PSOutputDev.cc | 121 +++++++++++++++++++------------------ + poppler/PSOutputDev.h | 30 +++++++++- + poppler/SplashOutputDev.cc | 2 +- + qt4/src/ArthurOutputDev.cc | 4 +- + qt5/src/ArthurOutputDev.cc | 4 +- + utils/pdftops.cc | 36 ++++-------- + 11 files changed, 116 insertions(+), 279 deletions(-) + +commit 8fed995c3457d64669ae12901450b7c811599dba +Author: Albert Astals Cid +Date: Sun Jan 18 14:52:53 2015 +0100 + + Forgot to delete this in the previous commit + + poppler/GlobalParams.h | 1 - + 1 file changed, 1 deletion(-) + +commit 4992ff7fa062462507733494827fdad7eaaa95b3 +Author: Albert Astals Cid +Date: Sun Jan 18 13:57:36 2015 +0100 + + Move raster mono and resolution from GlobalParams to PSOutputDev + + poppler/GlobalParams.cc | 32 -------------------------------- + poppler/GlobalParams.h | 7 ------- + poppler/PSOutputDev.cc | 18 +++++++----------- + poppler/PSOutputDev.h | 6 ++++++ + utils/pdftops.cc | 7 ++++--- + 5 files changed, 17 insertions(+), 53 deletions(-) + +commit 54908f675eda96c363528198e8c530921df2f45a +Author: Albert Astals Cid +Date: Sun Jan 18 13:34:45 2015 +0100 + + Move psUncompressPreloadedImages from GlobalParams to PSOutputDev + + It belongs there and PSOutputDev is always created by the external + user + so in case someone wants to set it, it is the same amount of work + to set it in GlobalParams than in PSOutputDev + + poppler/GlobalParams.cc | 16 ---------------- + poppler/GlobalParams.h | 3 --- + poppler/PSOutputDev.cc | 9 +++++---- + poppler/PSOutputDev.h | 2 ++ + 4 files changed, 7 insertions(+), 23 deletions(-) + +commit 136d7aa5e79f153dfcb216c58598e33a8ff16630 +Author: Albert Astals Cid +Date: Sun Jan 18 13:28:26 2015 +0100 + + Remove declared but not defined function + + poppler/GlobalParams.h | 1 - + 1 file changed, 1 deletion(-) + +commit fdba9154d9a176759c765180805e608d4959c34e +Author: Adam Reichold +Date: Fri Jan 16 19:57:59 2015 +0100 + + pdftoppm: parse the flags earlier and only once + + utils/pdftoppm.cc | 42 +++++++++++++++--------------------------- + 1 file changed, 15 insertions(+), 27 deletions(-) + +commit 6b072500b5ac936631be6b29b7d5a591848a18f3 +Author: William Bader +Date: Wed Jan 14 23:28:03 2015 +0100 + + Add rasterization option to pdftops + + Also removes GlobalParams stuff \o/ + + Coded in conjuntion with Albert + + Bug #85934 + + cpp/poppler-page-renderer.cpp | 5 ++-- + poppler/GlobalParams.cc | 58 + ++----------------------------------------- + poppler/GlobalParams.h | 16 +++--------- + poppler/PSOutputDev.cc | 14 +++++------ + poppler/PSOutputDev.h | 5 +++- + poppler/SplashOutputDev.cc | 19 ++++++-------- + poppler/SplashOutputDev.h | 11 +++++--- + qt4/src/poppler-page.cc | 7 +++--- + qt5/src/poppler-page.cc | 7 +++--- + utils/pdftohtml.cc | 9 +++---- + utils/pdftoppm.cc | 49 ++++++++++++++++++++++++++---------- + utils/pdftops.cc | 14 ++++++++++- + 12 files changed, 96 insertions(+), 118 deletions(-) + +commit dc9751e6ac47a708ba6e7a68560bdce6a2e4a010 +Author: Albert Astals Cid +Date: Fri Jan 9 15:50:02 2015 +0100 + + Compile++ + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d91876a0c7a936b1f6f461d80131d7586a6c1a5e +Author: Albert Astals Cid +Date: Thu Jan 8 20:13:06 2015 +0100 + + Accept malformed documents whose root is a Page instead of a Pages + + gs and Adobe Reader do it so it's "common" enough + + Bug #88172 + + poppler/Catalog.cc | 37 ++++++++++++++++++++++++++++++++----- + 1 file changed, 32 insertions(+), 5 deletions(-) + +commit 7ce86b9be058408eb567d8d0b9747853a66c116f +Author: Albert Astals Cid +Date: Thu Jan 8 17:35:28 2015 +0100 + + Remove assert in gouraudFillTriangle + + We don't *need* the assert, an error() is fine and the malformed + document + will just get rendered wrongly instead of "crashing" + + Bugs #85274 + + poppler/Gfx.cc | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +commit 9e9df4b20d17478996780008bc9802a857d173fc +Author: Albert Astals Cid +Date: Thu Jan 8 17:01:52 2015 +0100 + + Fix crash on broken document + + Bug #85281 + + poppler/GfxState.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 636faafcb84b856580398f7883b6406d645c85d1 +Author: Adam Reichold +Date: Tue Jan 6 22:57:20 2015 +0100 + + JPEG2000Stream: Inline doGetChar and doLookChar + + poppler/JPEG2000Stream.cc | 49 + +++++++++++++++++++++++++---------------------- + poppler/JPEG2000Stream.h | 7 ++----- + 2 files changed, 28 insertions(+), 28 deletions(-) + +commit c13bffe92963c4969037695992f4c2776bbe973f +Author: Albert Astals Cid +Date: Sun Jan 4 23:17:42 2015 +0100 + + 0.30 + + CMakeLists.txt | 4 ++-- + NEWS | 18 ++++++++++++++++++ + configure.ac | 2 +- + cpp/CMakeLists.txt | 2 +- + cpp/Doxyfile | 2 +- + cpp/Makefile.am | 2 +- + poppler/Makefile.am | 2 +- + poppler/PDFDoc.cc | 1 + + poppler/TextOutputDev.cc | 2 +- + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 13 files changed, 31 insertions(+), 12 deletions(-) + +commit e499fdab2e96cb3069db7ac8ffa0df20ccccddc9 +Author: Thomas Freitag +Date: Sun Jan 4 20:23:39 2015 +0100 + + extended openjpeg2 support + + poppler/JPEG2000Stream.cc | 101 + +++++++++++++++++++++++++++++++++++----------- + 1 file changed, 78 insertions(+), 23 deletions(-) + +commit 2841f3c34dd6366a70e4d6d307a08b3fbc3e9897 +Author: Adrian Johnson +Date: Sun Jan 4 20:22:47 2015 +0100 + + Cmake support for openjpeg2 + + With some tweaks from Albert + + CMakeLists.txt | 56 + +++++++++++++++++++++++++++++------- + cmake/modules/FindLIBOPENJPEG2.cmake | 30 +++++++++++++++++++ + 2 files changed, 76 insertions(+), 10 deletions(-) + +commit 117af9c6bbd923954ef7de63adec8c22d51da1e4 +Author: Adrian Johnson +Date: Sun Jan 4 19:42:34 2015 +0100 + + Initial attempt at libopenjpeg2 support + + OpenJPEG 2 has a new pkg-config name and API. + + - Update configure.ac to find openjpeg 2 and provide V1/v2 macros + - Update JPEG2000Stream to use new API depending on openjpeg v1/v2 + macros + - OpenJPEG 2.1 changed the API so provide a version macro to make + it easier + to handle the the 2.1 change and any future changes. + - Move openjpeg.h into the .cc file + + configure.ac | 80 ++++++++---- + poppler/JPEG2000Stream.cc | 313 + +++++++++++++++++++++++++++++++++++++--------- + poppler/JPEG2000Stream.h | 41 ++---- + 3 files changed, 323 insertions(+), 111 deletions(-) + +commit 9caf7525409d699c16896653528486451123b485 +Author: Albert Astals Cid +Date: Sun Jan 4 18:48:02 2015 +0100 + + Make PSOutputDev accept a list of pages indeces + + Instead of first, last + + Bug #84833 + + Reviewed in the mailing list, see "Can anyone have a look at my + patch?" + + glib/poppler-page.cc | 10 ++++++--- + poppler/PSOutputDev.cc | 50 + ++++++++++++++++++++++++----------------- + poppler/PSOutputDev.h | 14 +++++++----- + qt4/src/poppler-ps-converter.cc | 11 ++++++--- + qt5/src/poppler-ps-converter.cc | 11 ++++++--- + utils/pdftops.cc | 15 +++++++++---- + 6 files changed, 71 insertions(+), 40 deletions(-) + +commit 173f182fb568843f97e7d45d1b16bebbd2aa7413 +Author: Li Junling +Date: Fri Jan 2 17:23:24 2015 +0100 + + Find last 'startxref' in the last 24K instead of the last 1K + + Bug #85919 + + poppler/PDFDoc.cc | 38 ++++++++++++++++++++++---------------- + 1 file changed, 22 insertions(+), 16 deletions(-) + +commit 0b1cd9403b8a240e58ec4f1832588d25f8295278 +Author: Jason Crain +Date: Sat Dec 20 03:22:23 2014 -0600 + + Free BBox object on error + + poppler/Gfx.cc | 1 + + 1 file changed, 1 insertion(+) + +commit acc33a6950031ac4a5c759d043d24df0cfa7e8b6 +Author: Jason Crain +Date: Sat Dec 20 02:24:49 2014 -0600 + + Check for invalid matrix in annotation + + Bug #84990 + + poppler/Gfx.cc | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit 56aff7d78658f586e3c4cd41685f189dafb3098a +Author: Thomas Freitag +Date: Tue Dec 23 15:49:15 2014 +0100 + + pdfunite: Support output intents, optional content and acroform + + utils/pdfunite.cc | 116 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 116 insertions(+) + +commit 9e734063e6a6a4b9743c9aa27d3d3127b5a960d7 +Author: Jason Crain +Date: Fri Dec 19 01:56:45 2014 -0600 + + Move array reallocation from visitLine to startLine + + Fixes potential memory corruption from writing after end of lines + array. + + https://bugs.freedesktop.org/show_bug.cgi?id=84555 + + poppler/TextOutputDev.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 0c47b769a77795bd866b6686b79fd20ad6f554bf +Author: Daniel Macks +Date: Sun Dec 14 18:52:48 2014 +0100 + + Only consider adding -fno-check-new if compiler supports it + + Helps compiling on old clang's + + Bug #76963 + + configure.ac | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +commit c9c90d50e3708f6fac313aa8b458aef6dba5dcfb +Author: Hans-Peter Deifel +Date: Fri Dec 12 13:09:51 2014 +0100 + + cpp: New API to set debug output function + + Adds the global function set_debug_error_function, that allows users + to install their own function to print internal poppler errors. + + cpp/poppler-global.cpp | 29 +++++++++++++++++++++++++++++ + cpp/poppler-global.h | 5 +++++ + cpp/poppler-private.cpp | 15 ++++++++++++--- + cpp/poppler-private.h | 3 +++ + 4 files changed, 49 insertions(+), 3 deletions(-) + +commit fa8f276a10911c97d2777fff3270771802bc3892 +Author: Albert Astals Cid +Date: Thu Dec 4 23:11:12 2014 +0100 + + 0.29.0 + + CMakeLists.txt | 4 ++-- + NEWS | 15 +++++++++++++++ + configure.ac | 4 ++-- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 23 insertions(+), 8 deletions(-) + +commit fee700cfecb9d7d5fa938704a5f457f15aaa4676 +Author: Albert Astals Cid +Date: Mon Dec 1 20:52:42 2014 +0100 + + Run dos2unix as suggested by Volker Grabsch + + splash/SplashState.h | 278 ++++++++++---------- + test/perf-test-preview-dummy.cc | 44 ++-- + test/perf-test-preview-win.cc | 544 + ++++++++++++++++++++-------------------- + 3 files changed, 433 insertions(+), 433 deletions(-) + +commit d3fe0661c6dc6050e14cd5cb4afa089b7d7d66b0 +Author: Richard PALO +Date: Sun Nov 30 22:46:22 2014 +0100 + + warning: "_FILE_OFFSET_BITS" redefined + + Bug #86870 + + test/perf-test.cc | 2559 + +++++++++++++++++++++++++++-------------------------- + 1 file changed, 1280 insertions(+), 1279 deletions(-) + +commit 18884065e11fee82506915095619107a43172ecb +Author: Richard PALO +Date: Sun Nov 30 22:36:29 2014 +0100 + + The isfinite macro is defined on SunOS under c99 + + Bug #86869 + + poppler/SplashOutputDev.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit bcb470064dd9f75ab0b0a0d9b7319fe8f1e558ae +Author: Adrian Johnson +Date: Tue Nov 25 05:53:38 2014 +1030 + + cofigure: print "no" instead of "auto" if lcms not found + + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +commit 832046c57ab2909d329340f1c941b29e8246ff73 +Author: Thomas Freitag +Date: Fri Nov 28 11:08:34 2014 +0100 + + Use correct LAB byte array for lcms input + + Bug #86388 + + poppler/GfxState.cc | 51 + ++++++++++++++++++++++++++++++++++++++------------- + poppler/GfxState.h | 4 +++- + 2 files changed, 41 insertions(+), 14 deletions(-) + +commit a604bc3a2ed9f9181aa3b12d795608fcf5e08220 +Author: Thomas Freitag +Date: Fri Nov 14 11:56:50 2014 +0100 + + Solve blend mode problem in CYMK and DeviceN for separable blend modes + + Fixes part of #68986 + + poppler/SplashOutputDev.cc | 277 + +++++++++++++++++++++++++-------------------- + 1 file changed, 155 insertions(+), 122 deletions(-) + +commit b7802ff39db270dda2aa20f005fb87c22ed34137 +Author: Thomas Freitag +Date: Fri Nov 14 11:47:38 2014 +0100 + + Use Default colorspaces if present instead of Device colorspaces + + Fixes part of #68986 + + poppler/CairoOutputDev.cc | 4 +- + poppler/Gfx.cc | 40 +++++----- + poppler/GfxState.cc | 197 + ++++++++++++++++++++++++++++++++++------------ + poppler/GfxState.h | 31 ++++---- + poppler/Page.cc | 4 +- + 5 files changed, 188 insertions(+), 88 deletions(-) + +commit 07aa6f4030418883d8d45a8dfa3d80d2dadca4e7 +Author: Thomas Freitag +Date: Thu Nov 13 12:26:25 2014 +0100 + + write correct size in trailer dict + + Bug #86063 + + poppler/PDFDoc.cc | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit 51e7c29cabedc72e097023e6d8d6d68ed43fa20c +Author: Carlos Garcia Campos +Date: Fri Nov 7 18:30:36 2014 +0100 + + regtest: Update references also for tests that no longer crash + + We are currently updating the refs only when we have checksums to + compare, but if a test used to crash there's no md5 file in refs. + + regtest/TestRun.py | 2 ++ + regtest/backends/__init__.py | 24 ++++++++++++++++++++++++ + 2 files changed, 26 insertions(+) + +commit d205908930d5dc4ec3a1a1a2c2b93fbb92c2c867 +Author: William Bader +Date: Wed Nov 5 20:23:49 2014 +0100 + + Make it proper C + + glib/demo/annots.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit fa1d636b00210b9c52787ab3c833fe9aa2e293fa +Author: Albert Astals Cid +Date: Tue Nov 4 20:00:08 2014 +0100 + + 0.28.1 + + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 7debbb05df18afc86df8a4fd37980728ec2e5788 +Author: Albert Astals Cid +Date: Tue Nov 4 19:29:58 2014 +0100 + + Fix typo + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d5489ef37742227176e800390a990f2b882d9710 +Author: Albert Astals Cid +Date: Tue Nov 4 01:27:05 2014 +0100 + + 0.28.0 + + CMakeLists.txt | 6 +++--- + NEWS | 43 +++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 4 ++-- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/Makefile.am | 2 +- + 11 files changed, 56 insertions(+), 13 deletions(-) + +commit f87115a1129e4e03802769181a3392c8dce3192a +Author: Hib Eris +Date: Tue Nov 4 01:25:18 2014 +0100 + + Don't ship the moc files + + qt4/demos/Makefile.am | 1 - + qt5/demos/Makefile.am | 1 - + 2 files changed, 2 deletions(-) + +commit 0a9c38076f1555196029372b7e08714b43c7a58d +Author: Albert Astals Cid +Date: Mon Nov 3 21:43:28 2014 +0100 + + Update (C) + + fofi/FoFiType1.cc | 1 + + poppler/PDFDoc.cc | 4 ++-- + poppler/PDFDoc.h | 2 +- + poppler/XRef.cc | 2 +- + qt4/src/poppler-annotation-private.h | 2 +- + qt4/src/poppler-annotation.cc | 2 +- + qt4/src/poppler-page.cc | 2 +- + qt4/src/poppler-qt4.h | 2 +- + qt5/src/poppler-annotation-private.h | 2 +- + qt5/src/poppler-annotation.cc | 2 +- + qt5/src/poppler-page.cc | 2 +- + qt5/src/poppler-qt5.h | 2 +- + utils/pdfdetach.cc | 1 + + utils/pdftocairo-win32.cc | 12 ++++++++++++ + utils/pdftocairo-win32.h | 12 ++++++++++++ + utils/pdftocairo.cc | 3 ++- + 16 files changed, 40 insertions(+), 13 deletions(-) + +commit 73cf1e87c9803bbe4271be297b486d9932677d46 +Author: Albert Astals Cid +Date: Mon Nov 3 21:37:13 2014 +0100 + + Need to dist this file + + utils/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 2fd0cd652cfc03c9af35a59192729e4ed26e8146 +Author: Albert Astals Cid +Date: Mon Nov 3 19:20:23 2014 +0100 + + Fix memory leaks when running pdfseparate + + Bug #84768 + + poppler/PDFDoc.cc | 102 + +++++++++++++++++++++------------------------------ + poppler/PDFDoc.h | 2 +- + utils/pdfseparate.cc | 8 +++- + utils/pdfunite.cc | 4 +- + 4 files changed, 50 insertions(+), 66 deletions(-) + +commit d6ea8acbb348fdb43601a963ba5407e933565003 +Author: Adrian Johnson +Date: Mon Nov 3 19:11:25 2014 +0100 + + fix crash in Xref::getEntry + + Bug 85234 + + poppler/XRef.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bd142810b9f66b017a58b3e1840d4d72794f1ef4 +Author: Jason Crain +Date: Thu May 15 02:22:44 2014 -0500 + + cairo: Use matrix to determine pattern size + + https://bugs.freedesktop.org/show_bug.cgi?id=33364 + + poppler/CairoOutputDev.cc | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +commit 06dd7dc337c7db6122329e98783a126d59035aff +Author: Hib Eris +Date: Thu May 29 12:45:33 2014 +0200 + + Include windows.h, not Windows.h + + Fixes building on file systems that are case sensitive, e.g. when + cross compiling on Linux for win32. + + https://bugs.freedesktop.org/show_bug.cgi?id=79407 + + qt4/tests/stress-threads-qt4.cpp | 2 +- + qt5/tests/stress-threads-qt5.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 76a350b11160ac203a41b27fbc85a3264bfe4735 +Author: Carlos Garcia Campos +Date: Thu Oct 30 18:25:06 2014 +0100 + + regtest: Try to fix again the paths of the resources in the generated + HTML report + + Use always relatives paths for the resources under the out directory, + and absolute paths for all other resources when no-absolute-path + command + line option is used. + + regtest/HTMLReport.py | 47 + +++++++++++++++++++++++------------------------ + 1 file changed, 23 insertions(+), 24 deletions(-) + +commit c93d6b264dc77c46c72281d966bf826274a43d15 +Author: Carlos Garcia Campos +Date: Wed Oct 29 17:37:06 2014 +0100 + + regtest: respect --no-absolute-paths when creating the pretty + diff links + + regtest/HTMLReport.py | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit 9f953e47a6ea92d806aeea61e227af54c889c6be +Author: Carlos Garcia Campos +Date: Mon Oct 27 19:53:28 2014 +0100 + + regtest: Add an option to create the HTML report without absolute + paths + + It uses the paths as received from the command line attributes. + + regtest/HTMLReport.py | 15 +++++++++++---- + regtest/commands/create-report.py | 4 ++++ + 2 files changed, 15 insertions(+), 4 deletions(-) + +commit 3d840231bc6f0714da361493ef32913af2eb78d7 +Author: Carlos Garcia Campos +Date: Sun Oct 26 12:09:28 2014 +0100 + + regtest: Fix png diff generation with python-pil pillow fork + + Use from PIL import Image instead of just import Image, since pillow + only doesn't support import Image without using PIL.Image. + + regtest/backends/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 68e58ec5465efc289d85ae104941db92450a3168 +Author: Carlos Garcia Campos +Date: Sun Oct 26 11:21:23 2014 +0100 + + regtest: Limit the number of worker threads to the number of documents + to test + + We are always spawning all the threads even if the documents to + test is + less than the worker threads. Also optimize the case of running + only one + test to not spwn any thread. + + regtest/TestRun.py | 27 ++++++++++++++++++--------- + 1 file changed, 18 insertions(+), 9 deletions(-) + +commit 7c21b95852e891060cd2e276949acf0945306ab7 +Author: Carlos Garcia Campos +Date: Sun Oct 26 11:08:45 2014 +0100 + + regtest: Allow to run groups of tests individually + + Now it's possible to pass more than one argument to run-tests + command and + optionally the docs directory. When more than one test is passed + and the + docs directory is not provided, the common base path of all passed + tests + is used as docs directory. The tests passed can be documents or + directories, using absolute paths or paths relative to the docs + directory. + This also allows us to update the refs for a group of tests. + + regtest/TestRun.py | 26 ++++++++++++++++++++++++-- + regtest/Utils.py | 7 +++++-- + regtest/commands/run-tests.py | 29 ++++++++++++++++++++--------- + 3 files changed, 49 insertions(+), 13 deletions(-) + +commit 53be607edc18a861aeb0b6663bac3c05de46c84c +Author: Hib Eris +Date: Fri Oct 24 11:35:17 2014 +0200 + + Fix warning on unused variable in pdftocairo.cc + + Fixes warning: + + CXX pdftocairo-pdftocairo.o + pdftocairo.cc:130:14: warning: ‘setupdlg’ defined but not used + [-Wunused-variable] + static GBool setupdlg = gFalse; + ^ + + https://bugs.freedesktop.org/show_bug.cgi?id=85400 + + utils/pdftocairo.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit f966b8766d40b2c912e69a1e17ef8cc4bd52be95 +Author: Carlos Garcia Campos +Date: Tue Oct 21 16:42:27 2014 +0200 + + fofi: Fix a crash when parsing an invalid font due to a integer + overflow + + This fixes a crash rendering trust_metrics.f2495.f0.pdf. + + fofi/FoFiType1.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4963332ca4db13d8a9186b06d2aa0d59abbc10ee +Author: Adrian Johnson +Date: Sun Oct 5 21:58:37 2014 +1030 + + pdftocairo: add -printdlg output option for win32 + + when set the win32 print dialog is displayed before printing + + configure.ac | 2 +- + utils/pdftocairo-win32.cc | 303 + ++++++++++++++++++++++++++++++++++++++++++++-- + utils/pdftocairo-win32.h | 14 +-- + utils/pdftocairo.1 | 14 ++- + utils/pdftocairo.cc | 31 ++++- + 5 files changed, 337 insertions(+), 27 deletions(-) + +commit d8fe025c36f555a5438677e20df803eee216bb13 +Author: Adrian Johnson +Date: Sun Oct 5 18:11:09 2014 +1030 + + pdftocairo: add a -setupdlg option that will the show printer + properties + + dialog when printing to a win32 printer. + + utils/pdftocairo-win32.cc | 22 +++++++++++++++++++--- + utils/pdftocairo-win32.h | 3 ++- + utils/pdftocairo.1 | 5 +++++ + utils/pdftocairo.cc | 24 ++++++++++++++++-------- + 4 files changed, 42 insertions(+), 12 deletions(-) + +commit c091aa14513859ab76223f5e4e6055d92082433c +Author: Adrian Johnson +Date: Sun Sep 14 20:43:47 2014 +0930 + + pdftocairo: fix a number of bugs in win32 printing + + - make origPageSizes work + - make landscape pages work + - make -noshrink option work + - return actual page size in use back to main() so fit page transform + works + - hdc should be destroyed after cairo surface + - improve option parsing and rename duplex values + - Add third call to DocumentProperties as discussed in bug 79936 + - fix error messages + + utils/pdftocairo-win32.cc | 181 + ++++++++++++++++++++++++++-------------------- + utils/pdftocairo-win32.h | 2 +- + utils/pdftocairo.1 | 5 +- + utils/pdftocairo.cc | 49 ++++++------- + 4 files changed, 132 insertions(+), 105 deletions(-) + +commit cc3b39d49c656e912a7461212f3bb4e58c6444e7 +Author: Adrian Johnson +Date: Fri Sep 12 18:17:49 2014 +0930 + + make pdftocairo-win32.cc a standalone .cc file + + instead of #including it in pdftocairo.cc + + utils/CMakeLists.txt | 1 + + utils/Makefile.am | 3 +- + utils/pdftocairo-win32.cc | 74 + +++++++++++++++++++++++------------------------ + utils/pdftocairo-win32.h | 22 ++++++++++++++ + utils/pdftocairo.cc | 24 +++++++++------ + 5 files changed, 77 insertions(+), 47 deletions(-) + +commit 700205af19ef1ae5f2c713d118ebd5dd4a0afba3 +Author: Adrian Johnson +Date: Sun Sep 7 20:18:36 2014 +0930 + + pdftocairo: Allow an output file for win32 printing to be specified + + Can be used for testing win32 print output without wasting paper. + + utils/pdftocairo-win32.cc | 12 ++++++++---- + utils/pdftocairo.1 | 4 ++++ + utils/pdftocairo.cc | 13 +++++++------ + 3 files changed, 19 insertions(+), 10 deletions(-) + +commit 40d3ae87befad489fd8c0b38ff2561a0782cae0b +Author: Rodrigo Rivas Costa +Date: Sat Sep 6 21:04:10 2014 +0930 + + Add support for printing to a Windows printer from pdftocairo + + Bug 79936 + + configure.ac | 2 +- + utils/pdftocairo-win32.cc | 219 + ++++++++++++++++++++++++++++++++++++++++++++++ + utils/pdftocairo.1 | 23 ++++- + utils/pdftocairo.cc | 61 ++++++++++--- + 4 files changed, 292 insertions(+), 13 deletions(-) + +commit ee4a389872d86b619c677888da8f13f1f6c54472 +Author: Adrian Johnson +Date: Mon Oct 20 22:32:30 2014 +1030 + + PDFDoc: fix crash when getPage() returns NULL + + Bug 85235 + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0c3f53e34ec287dab2784e1f3411ad06b62dffc7 +Author: Adrian Johnson +Date: Mon Oct 20 22:17:20 2014 +1030 + + PDFDOC: Check for EOF when reading raw stream + + Bug 85233 + + poppler/PDFDoc.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 88dbd4df0998233939b4a51cedbfc65c58a315f9 +Author: Adrian Johnson +Date: Sun Oct 19 22:47:15 2014 +1030 + + pdfdetach: fix crash when getPage() returns null + + Bug 85145 + + utils/pdfdetach.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit e0179304cdef615fcf639046410d214fd5b5f276 +Author: Adrian Johnson +Date: Sun Oct 19 21:36:39 2014 +1030 + + cairo: fix crash when no group color space + + Bug 85137 + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 745f1241bf903969e50f0e1139641e389a9c331f +Author: Scott West +Date: Tue Oct 7 23:54:52 2014 +0200 + + Fix memory leak in Dict.remove. + + The entry was previously just overwritten now it is freed + + Small fixes by Albert oo + + Bug #84607 + + poppler/Dict.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit b8810703ca76f0bbc8185ab87679cf18eb006d52 +Author: Luigi Scarso +Date: Tue Oct 7 22:45:05 2014 +0200 + + Make Attribute::getName() work when UTF-16BE is used + + Contains some ideas by me + Bug #84722 + + goo/GooString.h | 9 +++++---- + poppler/StructElement.cc | 17 +++++++++++------ + poppler/StructElement.h | 7 +++++-- + 3 files changed, 21 insertions(+), 12 deletions(-) + +commit 96a04336c7a6331727724125686a0d6f42f19f46 +Author: Adrian Johnson +Date: Mon Oct 6 10:21:51 2014 +1030 + + cairo: only embed mime data if image decode map is identity + + https://bugs.launchpad.net/ubuntu/+source/cairo/+bug/1317517 + + poppler/CairoOutputDev.cc | 19 ++++++++++++++++--- + poppler/CairoOutputDev.h | 3 ++- + 2 files changed, 18 insertions(+), 4 deletions(-) + +commit 18541054bebce3f9d4729629785bf140d67d2da0 +Author: Adrian Johnson +Date: Wed Sep 24 21:20:42 2014 +0930 + + cairo: Only embed mime data for gray/rgb/cmyk colorspaces + + Bug 80719 + + poppler/CairoOutputDev.cc | 39 +++++++++++++++++++++++++++++++-------- + poppler/CairoOutputDev.h | 2 +- + 2 files changed, 32 insertions(+), 9 deletions(-) + +commit cbf2652c483d7010fc36191c8b209a57eeec93d8 +Author: Adrian Johnson +Date: Thu Jan 26 00:37:17 2012 +1030 + + cairo: don't render text when text matrix is not invertable + + Emulates acroread behavior. + + Bug 78042 + + poppler/CairoOutputDev.cc | 14 +++++++++----- + poppler/CairoOutputDev.h | 1 + + 2 files changed, 10 insertions(+), 5 deletions(-) + +commit 4fe17e97a4bd7873caad771c446199b282039697 +Author: Carlos Garcia Campos +Date: Sun Oct 5 11:30:43 2014 +0200 + + glib: Build introspection linking to the uninstalled libraries + + https://bugs.freedesktop.org/show_bug.cgi?id=84526 + + glib/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a2477da56a4d1c534175940d7c01a9d3db6c72d4 +Author: Albert Astals Cid +Date: Wed Oct 1 22:33:11 2014 +0200 + + Fix 303287ebdad0de9fb2655c4d7eab627c0045ea04 + + It may happen that j is bigger than macGlyphNames size, so don't + try to access it + + fofi/FoFiTrueType.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit ce95ecda450361496aedd5d5cd0bf47fd2c66703 +Author: Albert Astals Cid +Date: Tue Sep 30 19:50:20 2014 +0200 + + Fix assert in 5068.asan.0.6052.pdf + + poppler/Gfx.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 01723aa17e836e818158dbdc56df642a290be300 +Author: Adrian Johnson +Date: Tue Sep 30 18:48:47 2014 +0200 + + Map Standard/Expert encoding ligatures to AGLFN names + + for use with substitute fonts that are not compatible with the + Standard 14 fonts. + + Bug 80093 + + poppler/CairoFontEngine.cc | 12 +++++++++--- + poppler/GfxFont.cc | 29 ++++++++++++++++++++++++++++- + poppler/GfxFont.h | 7 ++++++- + splash/SplashFTFontFile.cc | 8 ++++++++ + 4 files changed, 51 insertions(+), 5 deletions(-) + +commit 529db4a94607c1ad909764d26f740c601bbe896f +Author: Hib Eris +Date: Mon Sep 29 22:59:15 2014 +0200 + + Fix build with --disable-utils + + Since 21b5fd655ce45b90668d1416d21c526ab7eb3ad6, building Poppler + fails when configured + with '--disable-utils'. + + Bug #84448 + + Makefile.am | 6 +----- + utils/Makefile.am | 4 ++++ + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit c54f6aceed983a221d88ce5c21becbf8aab2931b +Author: Thomas Freitag +Date: Mon Sep 29 21:42:46 2014 +0200 + + use alt colorspace to get CMYK values for an ICC based CMYK colorspace + + The reason for the pale image is that GfxICCBasedColorSpace::getCMYK() + uses the cms transformation to get RGB values and the convert it + back to CMYK even for a ICC based CMYK colorspace instead of just + returning the CMYK values itself. + + Bug #79019 + + poppler/GfxState.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 21b5fd655ce45b90668d1416d21c526ab7eb3ad6 +Author: Hib Eris +Date: Sun Sep 14 11:20:23 2014 +0200 + + Refactor Makefiles to build a noinst library for parsing args + + Prevents this automake warning about possible forward-incompatibility: + + $ ./autogen.sh + ... + cpp/tests/Makefile.am:16: warning: source file + '$(top_srcdir)/utils/parseargs.cc' is in a subdirectory, + cpp/tests/Makefile.am:16: but option 'subdir-objects' is disabled + automake: warning: possible forward-incompatibility. + automake: At least a source file is in a subdirectory, but the + 'subdir-objects' + automake: automake option hasn't been enabled. For now, the + corresponding output + automake: object file(s) will be placed in the top-level directory. + However, + automake: this behaviour will change in future Automake versions: + they will + automake: unconditionally cause object files to be placed in the + same subdirectory + automake: of the corresponding sources. + automake: You are advised to start using 'subdir-objects' option + throughout your + automake: project, to avoid future incompatibilities. + cpp/tests/Makefile.am:20: warning: source file + '$(top_srcdir)/utils/parseargs.cc' is in a subdirectory, + cpp/tests/Makefile.am:20: but option 'subdir-objects' is disabled + parallel-tests: installing './test-driver' + test/Makefile.am:58: warning: source file '../utils/parseargs.cc' + is in a subdirectory, + test/Makefile.am:58: but option 'subdir-objects' is disabled + + $ automake --version + automake (GNU automake) 1.14.1 + ... + + https://bugs.freedesktop.org/show_bug.cgi?id=83839 + + cpp/tests/Makefile.am | 3 +-- + test/Makefile.am | 8 ++++---- + utils/.gitignore | 2 ++ + utils/Makefile.am | 42 ++++++++++++++++++------------------------ + 4 files changed, 25 insertions(+), 30 deletions(-) + +commit 70a851b0cc58241d1f2f6bc48af2614595326c8f +Author: Adrian Johnson +Date: Sat Sep 6 21:16:04 2014 +0930 + + Update .gitignore + + .gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit d44e7e3560bdc79253df98db05385dce3e8ccbb4 +Author: Adrian Johnson +Date: Sat Sep 6 21:53:21 2014 +0930 + + Don't use -fPIC on mingw + + it emits a warning for every file stating that -fPIC is ignored + + configure.ac | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 2723371b2e2f7684301ea1c5272ab49851f28c03 +Author: Adrian Johnson +Date: Sat Sep 6 21:19:46 2014 +0930 + + make autogen.sh work with variables with spaces + + eg ./autogen.sh CXXFLAGS="-O0 -g3" + + autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ebc814a7e31511308bbcd8856d0356f4d7cc74be +Author: Hib Eris +Date: Sun Sep 14 11:45:12 2014 +0200 + + Add compile to .gitignore + + Automake automatically creates a wrapper script called 'compile' for + compilers which do not understand '-c -o'. + + $ automake --version + automake (GNU automake) 1.14.1 + + https://bugs.freedesktop.org/show_bug.cgi?id=83840 + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 8ce31485faa26994c52f4d032cc5a8355aba23d1 +Merge: 4589ce17 303287eb +Author: Albert Astals Cid +Date: Fri Sep 26 00:40:43 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit 303287ebdad0de9fb2655c4d7eab627c0045ea04 +Author: Thomas Freitag +Date: Fri Sep 26 00:25:38 2014 +0200 + + Fix rendering of file with a wrong embedded font + + Bug #84270 + + fofi/FoFiTrueType.cc | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +commit f94ba85a736b4c90c05e7782939f32506472658e +Author: Carlos Garcia Campos +Date: Fri Sep 12 19:22:20 2014 +0200 + + glib: Fix use of uninitialized members in PopplerInputStream + + https://bugs.freedesktop.org/show_bug.cgi?id=82630 + + glib/poppler-input-stream.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 4589ce17caf94e7c5fa856906d3a8cc08e999d73 +Author: Carlos Garcia Campos +Date: Fri Sep 12 19:22:20 2014 +0200 + + glib: Fix use of uninitialized members in PopplerInputStream + + https://bugs.freedesktop.org/show_bug.cgi?id=82630 + + glib/poppler-input-stream.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit fe67324d450c356b7c876cf50da705156112513a +Merge: e62e18e1 f74a5964 +Author: Albert Astals Cid +Date: Thu Aug 21 21:39:52 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit f74a5964078224c01bd5642aabc928d185bb0b69 +Author: Albert Astals Cid +Date: Thu Aug 21 20:07:54 2014 +0200 + + 0.26.4 + + CMakeLists.txt | 2 +- + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 17 insertions(+), 5 deletions(-) + +commit ce92e4ccefc7dad79db7f0af7a792ffa47824849 +Author: Albert Astals Cid +Date: Thu Aug 21 20:03:42 2014 +0200 + + Update (C) years + + poppler/Annot.cc | 1 + + poppler/CairoOutputDev.cc | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 42315c28809e62da7872add917e82853cf8c7e33 +Author: Albert Astals Cid +Date: Thu Aug 21 19:58:35 2014 +0200 + + Make sure e is always initialized + + goo/gfile.cc | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit e62e18e1b318d6fa664d236723de3c06ae43e86b +Author: Jehan Pagès +Date: Tue Aug 12 21:05:03 2014 +0200 + + poppler: use poppler-data pkg-config for both cmake and autotools + builds + + CMakeLists.txt | 16 ++++++++++++++++ + config.h.cmake | 2 +- + configure.ac | 7 ++++++- + 3 files changed, 23 insertions(+), 2 deletions(-) + +commit 572c60764bbbd2080bfd7a926c646ad20b467aea +Author: Hib Eris +Date: Tue Aug 12 18:12:45 2014 +0200 + + Makefile.am cleanups + + Bug #79411 + + configure.ac | 13 +++-- + cpp/Makefile.am | 66 +++++++++++++------------ + cpp/tests/Makefile.am | 13 ++--- + fofi/Makefile.am | 6 +-- + glib/Makefile.am | 29 ++++++----- + glib/demo/Makefile.am | 18 +++---- + glib/reference/Makefile.am | 3 +- + goo/Makefile.am | 38 +++++++-------- + poppler/Makefile.am | 118 + ++++++++++++++++++++++----------------------- + qt4/demos/Makefile.am | 59 +++++++++++------------ + qt4/src/Makefile.am | 31 ++++++------ + qt4/tests/Makefile.am | 97 +++++++++++++------------------------ + qt5/demos/Makefile.am | 59 +++++++++++------------ + qt5/src/Makefile.am | 27 ++++++----- + qt5/tests/Makefile.am | 98 ++++++++++++++----------------------- + splash/Makefile.am | 42 ++++++++-------- + test/Makefile.am | 68 +++++++++----------------- + utils/Makefile.am | 97 ++++++++++++++++++------------------- + 18 files changed, 405 insertions(+), 477 deletions(-) + +commit 4a4fe80d85a31b10822c7cd8eb5a0698bf306a52 +Author: Hib Eris +Date: Fri Aug 1 07:16:36 2014 +0200 + + glib-demo: Replace use of deprecated gtk stock items + + https://bugs.freedesktop.org/show_bug.cgi?id=82384 + + glib/demo/annots.c | 8 ++++---- + glib/demo/attachments.c | 4 ++-- + glib/demo/main.c | 6 +++--- + glib/demo/page.c | 6 +++--- + glib/demo/utils.c | 4 ++-- + 5 files changed, 14 insertions(+), 14 deletions(-) + +commit ec6bad36cf5e9521f35285a3295976c05a69f76a +Author: Hib Eris +Date: Fri Aug 1 07:51:10 2014 +0200 + + glib-demo: Remove use of deprecated gtk_dialog_get_action_area() + + https://bugs.freedesktop.org/show_bug.cgi?id=82385 + + glib/demo/main.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit b72a534d6c7d8bc026812b68f9d9ac6bf9a2200a +Merge: f2e4154e ef3f7585 +Author: Albert Astals Cid +Date: Sun Aug 3 01:06:57 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit ef3f7585fac086de0919aa0bb0ef91a5070ac23e +Author: Jiri Slaby +Date: Sun Aug 3 01:05:00 2014 +0200 + + Improve non-latin characters in inline notes + + Preview commit had by mistake changes in these two files that + belong here + + Bug #65956 + + poppler/Annot.cc | 1 + + poppler/CharCodeToUnicode.cc | 1 + + 2 files changed, 2 insertions(+) + +commit 1b9c54286a4cdfaa284795933c20acf3c7e13bfc +Author: Ed Porras +Date: Sun Aug 3 01:01:35 2014 +0200 + + Don't check for inlineImg twice + + Bug #82059 + + poppler/Annot.cc | 2 +- + poppler/CharCodeToUnicode.cc | 2 +- + poppler/SplashOutputDev.cc | 9 ++++----- + 3 files changed, 6 insertions(+), 7 deletions(-) + +commit f2e4154eff52b86e62490a3ccba470824c9cf436 +Author: Thomas Freitag +Date: Sat Jul 26 00:12:37 2014 +0200 + + pdfseparate: additonal handling for annotations + + Bug #77549 + + poppler/PDFDoc.cc | 46 ++++++++++++++++++++++++++++------------------ + poppler/PDFDoc.h | 6 +++--- + utils/pdfunite.cc | 2 +- + 3 files changed, 32 insertions(+), 22 deletions(-) + +commit e7825f7cbbe7cc9c324fcb34c2e0dcae75f4172a +Author: Carlos Garcia Campos +Date: Fri Jul 25 15:45:55 2014 +0200 + + glib: Fix a memory leak when getting text layout and attributes + + glib/poppler-page.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit b729bf92ea1522a1eed9579e53e7580215cb9555 +Author: Carlos Garcia Campos +Date: Fri Jul 25 15:45:55 2014 +0200 + + glib: Fix a memory leak when getting text layout and attributes + + glib/poppler-page.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit a1ecff0f0ab81fe76f63244250d96e7ef275f402 +Author: Carlos Garcia Campos +Date: Fri Jul 25 11:25:42 2014 +0200 + + glib: Return NULL in poppler_annot_get_contents also for empty strings + + glib/poppler-annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab1113d10ef712c7c44cd4b4bb6bc79f9ca3702c +Author: Anuj Khare +Date: Thu Jul 24 19:47:22 2014 +0200 + + annots: Fix a crash when adding annot without contents + + Having no content in an annotation results in a crash when generating + its appearance, since the contents pointer is dereferenced. + For consistency, the same has been done in Annot::initialize. + + poppler/Annot.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit f302864ed354b313ec39433f65ca3b107b55789d +Author: Carlos Garcia Campos +Date: Fri Jul 25 11:25:42 2014 +0200 + + glib: Return NULL in poppler_annot_get_contents also for empty strings + + glib/poppler-annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 13a5c5f4b61d05f2d18f94ad15e210a47021a576 +Author: Anuj Khare +Date: Thu Jul 24 19:47:22 2014 +0200 + + annots: Fix a crash when adding annot without contents + + Having no content in an annotation results in a crash when generating + its appearance, since the contents pointer is dereferenced. + For consistency, the same has been done in Annot::initialize. + + poppler/Annot.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 94ea9d8e1631abfbb8cc078100942d46b1356970 +Author: Carlos Garcia Campos +Date: Thu Jul 24 10:46:17 2014 +0200 + + cairo: Make sure we always push a transparency group in + setSoftMaskFromImageMask() + + Because that's what unsetSoftMaskFromImageMask() assumes. + + https://bugs.freedesktop.org/show_bug.cgi?id=81624 + + poppler/CairoOutputDev.cc | 64 + +++++++++++++++++++++++------------------------ + 1 file changed, 31 insertions(+), 33 deletions(-) + +commit 02c127b355bb8a98684a5d0af063c60b8bfd09dd +Author: Carlos Garcia Campos +Date: Thu Jul 24 10:46:17 2014 +0200 + + cairo: Make sure we always push a transparency group in + setSoftMaskFromImageMask() + + Because that's what unsetSoftMaskFromImageMask() assumes. + + https://bugs.freedesktop.org/show_bug.cgi?id=81624 + + poppler/CairoOutputDev.cc | 64 + +++++++++++++++++++++++------------------------ + 1 file changed, 31 insertions(+), 33 deletions(-) + +commit c841a703c4c1750fd7ac0d04c6c3e7d4af80b8fa +Author: Albert Astals Cid +Date: Mon Jul 21 00:29:28 2014 +0200 + + Improve Overprintmode and shadings + + Bug #80998 + + poppler/SplashOutputDev.cc | 6 ++++-- + poppler/SplashOutputDev.h | 8 +++++++- + splash/Splash.cc | 24 ++++++++++++++++++++++-- + splash/SplashPattern.h | 6 +++++- + 4 files changed, 38 insertions(+), 6 deletions(-) + +commit ce782112746f629a8e7be6f2daf6ece6ab19917d +Merge: 2c0cb689 26372cfa +Author: Albert Astals Cid +Date: Sun Jul 20 20:35:13 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit 26372cfae029a1124e042855c58bf5b70f281c76 +Author: Ed Porras +Date: Sun Jul 20 20:33:48 2014 +0200 + + printf -> error + + Bug #81513 + + poppler/Catalog.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 87d12c09281e3d12cda0fadcd65ab78928dff283 +Author: Albert Astals Cid +Date: Sun Jul 20 18:20:57 2014 +0200 + + 0.26.3 + + CMakeLists.txt | 2 +- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +commit 69e5b81640c9bb31f0876fa8eb7ba28dbf38923f +Author: Albert Astals Cid +Date: Sun Jul 20 18:18:29 2014 +0200 + + News for 0.26.3 + + NEWS | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +commit c368c0714d57c089057d974908295d850a1b5108 +Author: Albert Astals Cid +Date: Sun Jul 20 18:15:22 2014 +0200 + + Update Thomas' (C) + + splash/SplashXPathScanner.cc | 2 +- + splash/SplashXPathScanner.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 639179318c43a907a27e86778b720d33d481a9f9 +Author: Pino Toscano +Date: Thu Jul 17 07:33:10 2014 +0200 + + glib: use C90-style comments in public headers + + glib/poppler-media.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2c0cb689910e8579bf428b3999bcac0cb27b0e51 +Merge: 0b639cd2 1161e728 +Author: Albert Astals Cid +Date: Sat Jul 12 17:21:07 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit 1161e728de9ca7c9a5fb0e24c4a5e4a79c65a849 +Author: Thomas Freitag +Date: Sat Jul 12 17:04:42 2014 +0200 + + Error out instead of exiting if allInter grows too much + + Bug #78714 + + splash/SplashXPathScanner.cc | 25 +++++++++++++++++-------- + splash/SplashXPathScanner.h | 2 +- + 2 files changed, 18 insertions(+), 9 deletions(-) + +commit e82a24a585d251f767725f61700dc1f8fe169a52 +Author: Pino Toscano +Date: Sat Jul 12 08:35:45 2014 +0200 + + cmake: sync poppler-config.h.cmake with poppler-config.h.in + + poppler/poppler-config.h.cmake | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 0b639cd2ac1071f5b741031a78d8e2bc18d2b7d7 +Merge: bb16c716 a5ad55b7 +Author: Albert Astals Cid +Date: Fri Jul 11 00:32:46 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit a5ad55b7cb9dc4e62754954291e4ecb8e05b5d67 +Author: Albert Astals Cid +Date: Fri Jul 11 00:32:07 2014 +0200 + + Add Hib's (C) + + poppler/poppler-config.h.in | 1 + + 1 file changed, 1 insertion(+) + +commit 4f4ee736075d5b1d1bf4911a26c2f80a7122fe04 +Author: Aki Koskinen +Date: Fri Jul 11 00:30:52 2014 +0200 + + Fix compilation of Qt5 frontend with MinGW + + qt5/src/poppler-private.h | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit ddd91675792d9d496b06223867e05d2a190b878b +Author: Hib Eris +Date: Thu May 29 16:58:55 2014 +0200 + + Include stdio.h from poppler-config.h + + In poppler-config.h there is a check for __MINGW_PRINTF_FORMAT, + which is set by stdio.h. + + This fixes this warning when compling with the mingw-w64-compiler: + + XRef.cc: In member function 'virtual void + XRef::XRefTableWriter::writeEntry(Goffset, int, XRefEntryType)': + XRef.cc:1460:94: warning: unknown conversion type character 'l' + in format [-Wformat=] + outStr->printf("%010lli %05i %c\r\n", (long long)offset, gen, + (type==xrefEntryFree)?'f':'n'); + ^ + XRef.cc:1460:94: warning: format '%i' expects argument of type 'int', + but argument 3 has type 'Goffset {aka long long int}' [-Wformat=] + XRef.cc:1460:94: warning: too many arguments for format + [-Wformat-extra-args] + + https://bugs.freedesktop.org/show_bug.cgi?id=79762 + + poppler/poppler-config.h.in | 2 ++ + 1 file changed, 2 insertions(+) + +commit bb16c7162c73b871e26f508823c0ee259b7e5420 +Author: Hib Eris +Date: Sat Jun 7 12:00:52 2014 +0200 + + Move automake version check from autogen.sh to configure.ac + + https://bugs.freedesktop.org/show_bug.cgi?id=79797 + + autogen.sh | 18 ------------------ + configure.ac | 2 +- + 2 files changed, 1 insertion(+), 19 deletions(-) + +commit 74c72223cf609e7c24594f95cab6f9865ad562ac +Merge: f8f7b3a6 47a947f1 +Author: Albert Astals Cid +Date: Fri Jul 11 00:23:04 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit 47a947f1dc664793a7037888a46a297a46c79d6c +Author: Hib Eris +Date: Thu Jun 19 10:11:21 2014 +0200 + + Fix moc-qt5 detection + + https://bugs.freedesktop.org/show_bug.cgi?id=80250 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f8f7b3a61bc7eb1e569c25a630b5e127b5dcae62 +Merge: 805ff761 aa6205d1 +Author: Albert Astals Cid +Date: Wed Jul 9 00:23:22 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit aa6205d195c56a77e897bad125bf213aba138422 +Author: Jason Crain +Date: Mon Jul 7 23:52:39 2014 -0500 + + Increase required Qt4 version to 4.7.0 + + We use Qt::LayoutDirectionAuto, introduced in 4.7.0. + + bug #81005 + + CMakeLists.txt | 2 +- + configure.ac | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 805ff76112ebfd57276ea78f1f0891abc61a6c03 +Author: Yaakov Selkowitz +Date: Mon Apr 11 16:26:11 2011 -0500 + + Do not dist gir_DATA + + See https://bugzilla.gnome.org/show_bug.cgi?id=621611 for rationale. + + glib/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e5862155b1c549b6774bb4f25c09c45857ff1734 +Author: Hib Eris +Date: Wed Jun 4 20:58:56 2014 +0200 + + Add Changelog to .gitignore + + https://bugs.freedesktop.org/show_bug.cgi?id=79744 + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 5f22649694d64c4170db82847b599576d5377176 +Author: Hib Eris +Date: Wed Jun 4 20:56:23 2014 +0200 + + Add *.gir, *.typelib to glib/.gitignore + + https://bugs.freedesktop.org/show_bug.cgi?id=79744 + + glib/.gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit b63f57985719c7884b67f46fc4afd4954c44c5ab +Author: Hib Eris +Date: Wed Jun 4 20:54:30 2014 +0200 + + Add poppler-undeclared.txt to .gitignore + + https://bugs.freedesktop.org/show_bug.cgi?id=79744 + + glib/reference/.gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 5e0f4e2516d5a3997ea9c9a9927e24d4f3abe136 +Author: Hib Eris +Date: Wed Jun 4 20:52:15 2014 +0200 + + Add poppler-forms, stress-threads-qt, test-render-to-file to + .gitignore + + https://bugs.freedesktop.org/show_bug.cgi?id=79744 + + qt4/tests/.gitignore | 3 +++ + qt5/tests/.gitignore | 3 +++ + 2 files changed, 6 insertions(+) + +commit 4d2400e7bb8ae9208030b9615dda7c53e571be8b +Author: Hib Eris +Date: Wed Jun 4 10:09:16 2014 +0200 + + Add test-driver to .gitignore + + https://bugs.freedesktop.org/show_bug.cgi?id=79744 + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 4c35e0213be26f21b628ff8d9f170252bb0106c9 +Author: Hib Eris +Date: Wed Jun 4 10:06:20 2014 +0200 + + Add poppler-qt5.pc to .gitignore + + https://bugs.freedesktop.org/show_bug.cgi?id=79744 + + .gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2b455b85168d5c9d8641d9a91bfde81ccab18e54 +Author: Pino Toscano +Date: Sun Jul 6 11:13:54 2014 +0200 + + glib: fix typo in apidox + + glib/poppler.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 266a61ab1c9f536a4fb7d68c8f285c854eb2d6e9 +Author: Albert Astals Cid +Date: Thu Jun 19 20:16:19 2014 +0200 + + 0.26.2 + + CMakeLists.txt | 2 +- + NEWS | 10 ++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 15 insertions(+), 5 deletions(-) + +commit 3381ee20efca2ce27733182d0d6720c1e6936a7f +Author: Albert Astals Cid +Date: Thu Jun 19 19:57:31 2014 +0200 + + Update (C) + + poppler/Lexer.cc | 2 +- + utils/pdftohtml.cc | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 8a5e59c6ea7ccd0ecbdb4b37bf3fe4e74e1c0e8e +Merge: 1b705331 310fbeec +Author: Albert Astals Cid +Date: Wed Jun 18 00:37:03 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit 310fbeec692b02d555e3e8dd6c851be11b25e26a +Author: Albert Astals Cid +Date: Wed Jun 18 00:31:48 2014 +0200 + + Make sure we have an xref before using + + KDE bug #335413 had this backtrace + XRef::getNumEntry (this=0x0, offset=-1) at XRef.cc:1300 + 0x00007f29aec1681e in Lexer::getObj (this=0x1648760, + obj=obj@entry=0x1bdf978, cmdA=cmdA@entry=0x7f29aeca66c8 "endstream", + objNum=objNum@entry=0) at Lexer.cc:594 + 0x00007f29aec20dfd in Parser::shift (this=this@entry=0x1bdf950, + cmdA=cmdA@entry=0x7f29aeca66c8 "endstream", objNum=objNum@entry=0) + at Parser.cc:323 + 0x00007f29aec20fde in Parser::makeStream (this=this@entry=0x1bdf950, + dict=dict@entry=0x7fff2541cad0, fileKey=fileKey@entry=0x0, + encAlgorithm=encAlgorithm@entry=cryptRC4, keyLength=keyLength@entry=0, + objNum=objNum@entry=0, objGen=objGen@entry=0, + recursion=recursion@entry=1, strict=strict@entry=false) at + Parser.cc:245 + 0x00007f29aec216b8 in Parser::getObj (this=this@entry=0x1bdf950, + obj=obj@entry=0x7fff2541cad0, simpleOnly=simpleOnly@entry=false, + fileKey=fileKey@entry=0x0, encAlgorithm=encAlgorithm@entry=cryptRC4, + keyLength=keyLength@entry=0, objNum=objNum@entry=0, + objGen=objGen@entry=0, recursion=recursion@entry=0, + strict=strict@entry=false) at Parser.cc:131 + 0x00007f29aec350fc in XRef::readXRef + (this=this@entry=0xfe43a0, pos=pos@entry=0xfe4438, + followedXRefStm=followedXRefStm@entry=0x7fff2541cb30, + xrefStreamObjsNum=xrefStreamObjsNum@entry=0x0) at XRef.cc:551 + 0x00007f29aec35319 in XRef::XRef (this=0xfe43a0, + strA=0x1c54ff0, pos=, mainXRefEntriesOffsetA=0, + wasReconstructed=0x7fff2541cbaf, reconstruct=) + at XRef.cc:342 + 0x00007f29aec2534f in PDFDoc::setup (this=this@entry=0x311e1b0, + ownerPassword=ownerPassword@entry=0x1165830, + userPassword=userPassword@entry=0x447f550) at PDFDoc.cc:262 + + poppler/Lexer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1b705331019b155f2138d4b9f5a5bd03ec59193d +Author: Hib Eris +Date: Sun Jun 8 17:07:15 2014 +0200 + + [glib] doc: Move poppler_date_parse to utility functions section + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-docs.sgml | 1 + + glib/reference/poppler-sections.txt | 7 ++++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit d661553b0a13855aa5a1240e9c04a0e49dafd910 +Author: Hib Eris +Date: Sun Jun 8 16:11:26 2014 +0200 + + [glib] doc: Document PopplerFindFlags:POPPLER_FIND_DEFAULT + + Fixes warning: + DOC Building XML + ../../glib/poppler.h:157: warning: Value description for + PopplerFindFlags::POPPLER_FIND_DEFAULT is missing in source code + comment + block. + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/poppler.h | 1 + + 1 file changed, 1 insertion(+) + +commit 237a1402ab836d10eb5fdc1aa6ceccabea10a316 +Author: Hib Eris +Date: Sun Jun 8 16:07:14 2014 +0200 + + [glib] doc: Use instead of + + Fixes: + DOC Building HTML + Element em in namespace '' encountered in para, but no template + matches. + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/poppler-structure-element.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 66abf3992228be2559542e9d2753f45f06ae7728 +Author: Hib Eris +Date: Sun Jun 8 16:02:01 2014 +0200 + + [glib] doc: Add PopplerBackend documentation + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/poppler.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit a30ec8e4abe3875aad068c83265b47f9beea33d1 +Author: Hib Eris +Date: Sun Jun 8 15:05:52 2014 +0200 + + [glib] doc: Add missing POPPLER_TYPE_POINT + + And while we are here, also move poppler_point_get_type() and + poppler_quadrilateral_get_type() to private subsection. + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-sections.txt | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 6eb0537ac5163356c8e8f689d2408fa695e99423 +Author: Hib Eris +Date: Sun Jun 8 14:59:15 2014 +0200 + + [glib] doc: Fix typo + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-sections.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 96adcad85d76409cb8ed4266a08ae776b42661e4 +Author: Hib Eris +Date: Sun Jun 8 14:53:42 2014 +0200 + + [glib] doc: Add poppler_annot_set_flags() to documentation + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-sections.txt | 1 + + 1 file changed, 1 insertion(+) + +commit f3519352c70537009cc6bd660c0bd3e727db8b8a +Author: Hib Eris +Date: Sun Jun 8 14:38:13 2014 +0200 + + [glib] doc: Move PopplerFindFlags to PopplerPage section + + And also add the missing POPPLER_TYPE_FIND_FLAGS and + poppler_find_flags_get_type. + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-sections.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 45b0d49330d9d089b2480b91e418924a490c82ce +Author: Hib Eris +Date: Sun Jun 8 14:22:28 2014 +0200 + + [glib] doc: Move PopplerPrintFlags to PopplerPage section + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-sections.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit ce357147d17004a2772ca3b32d106da511bba360 +Author: Hib Eris +Date: Sun Jun 8 13:22:51 2014 +0200 + + [glib] doc: Move poppler_get_{version, backend} documentation to + features section + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/reference/poppler-sections.txt | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit 1bfd6b69e7e98d4b3e6e891a46b58c9109b8c14c +Author: Hib Eris +Date: Sun Jun 8 12:57:25 2014 +0200 + + [glib] doc: Move PopplerColor documentation to it's own section + + https://bugs.freedesktop.org/show_bug.cgi?id=79798 + + glib/poppler-page.cc | 6 ++++++ + glib/reference/poppler-docs.sgml | 1 + + glib/reference/poppler-sections.txt | 21 +++++++++++++++------ + 3 files changed, 22 insertions(+), 6 deletions(-) + +commit 2dd9b95fd910023a7d9d23f2c2e41dcab91d3c31 +Merge: fed71ebd b36d27b4 +Author: Albert Astals Cid +Date: Fri Jun 6 21:43:49 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit b36d27b42417d15866a5729409e39d6f7c2b0289 +Author: Hib Eris +Date: Fri Jun 6 21:42:10 2014 +0200 + + Fix typo in configure.ac + + Bug #79742 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fed71ebd8e43e24eace9dcebe24bd318ff3d04a6 +Author: Hib Eris +Date: Thu May 29 13:22:05 2014 +0200 + + Change pagenum arguments in PDFDoc::markAnnotations from Guint to int + + Bug #79410 + Fixes compile warning: + + CXX PDFDoc.lo + PDFDoc.cc: In member function 'GBool PDFDoc::markAnnotations(Object*, + XRef*, XRef*, Guint, Guint, Guint)': + PDFDoc.cc:1607:40: warning: comparison between signed and unsigned + integer expressions [-Wsign-compare] + if (obj2.getRef().num == oldPageNum) { + ^ + PDFDoc.cc:1617:47: warning: comparison between signed and unsigned + integer expressions [-Wsign-compare] + } else if (obj2.getRef().num == newPageNum) { + + https://bugs.freedesktop.org/show_bug.cgi?id=79410 + + poppler/PDFDoc.cc | 4 ++-- + poppler/PDFDoc.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit f5e702060a84362bfdf75260531920d4ba8b7333 +Author: Pino Toscano +Date: Sat May 24 15:59:42 2014 +0200 + + pdftohtml: exit with 0 with -v and -h + + utils/pdftohtml.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 700bf398ef7b20306f5035e423becfaa3d28fb10 +Author: Albert Astals Cid +Date: Fri May 23 20:05:41 2014 +0200 + + 0.26.1 + + CMakeLists.txt | 2 +- + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 17 insertions(+), 5 deletions(-) + +commit 93373cd113d046b65538fe983b46842d689a2112 +Author: Albert Astals Cid +Date: Sun May 11 18:31:10 2014 +0200 + + Qt: Add a new page->annotations() call that let's you specify subtypes + + This way we don't return annotations you may not be interested in + + qt4/src/poppler-annotation-private.h | 4 +-- + qt4/src/poppler-annotation.cc | 48 + ++++++++++++++++++++++++++++++++++-- + qt4/src/poppler-page.cc | 7 +++++- + qt4/src/poppler-qt4.h | 14 +++++++++++ + qt5/src/poppler-annotation-private.h | 4 +-- + qt5/src/poppler-annotation.cc | 48 + ++++++++++++++++++++++++++++++++++-- + qt5/src/poppler-page.cc | 7 +++++- + qt5/src/poppler-qt5.h | 15 +++++++++++ + 8 files changed, 137 insertions(+), 10 deletions(-) + +commit d2892cd893e4379914a08e66682ed5c423743a41 +Merge: 08442203 7e9fc61e +Author: Albert Astals Cid +Date: Wed May 7 22:27:41 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit 7e9fc61e287889eefd6b08ef5991d31fed79cafd +Author: Albert Astals Cid +Date: Wed May 7 22:25:59 2014 +0200 + + Fix libopenjpeg 1.5 detection on some systems + + Someone somewhere decided the pc file will be called libopenjpeg1 + instead of libopenjpeg + + Bug #78389 + + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 0844220347f984c3d9b04fe53e690ee0e8c74afe +Merge: 84278d8a 0a6c1ff7 +Author: Albert Astals Cid +Date: Wed May 7 21:56:07 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit 0a6c1ff777aa23c7a5654b313b639e66600883b9 +Author: Thomas Freitag +Date: Wed May 7 21:54:46 2014 +0200 + + Only add annotations of the current page when splitting + + Bug #77549 + + poppler/PDFDoc.cc | 153 + +++++++++++++++++++++++++++++++++++++++++++++++++++++- + poppler/PDFDoc.h | 4 +- + utils/pdfunite.cc | 9 +++- + 3 files changed, 162 insertions(+), 4 deletions(-) + +commit 84278d8adbb1f6e9a28588fcb4db30c9ef70adde +Merge: 7b94b119 5b2cdef4 +Author: Albert Astals Cid +Date: Sun May 4 22:21:25 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit 5b2cdef49a8a0a92fd323fbe45841a5098a42ece +Author: Olly Betts +Date: Sun May 4 22:20:30 2014 +0200 + + Fix extraction of text in some files + + Bug #78145 + + poppler/GfxFont.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7b94b119f07713af7b8b9f1ac3ea3f1d35c1e240 +Merge: c859d2b8 bae836cd +Author: Albert Astals Cid +Date: Sun May 4 16:21:24 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.26' + +commit bae836cd3dd3511ca9cf4745626142334bafd1a6 +Author: Marek Kasik +Date: Sun May 4 16:20:33 2014 +0200 + + Use field value V for radio buttons + + Turn on radio button only if its appearance state is equal to + the value + of name object "V" of the field. + + Bug #75979 + + poppler/Annot.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a748b3a059938e6ae98b51eb82bab7c33a5e23c7 +Author: Carlos Garcia Campos +Date: Wed Apr 30 09:25:31 2014 +0200 + + glib: Fix multiple definition of PopplerTextSpan + + https://bugs.freedesktop.org/show_bug.cgi?id=78103 + + glib/poppler-structure-element.h | 3 --- + 1 file changed, 3 deletions(-) + +commit c859d2b891a115c79d04db14463791dfb1c46a20 +Author: Carlos Garcia Campos +Date: Wed Apr 30 09:25:31 2014 +0200 + + glib: Fix multiple definition of PopplerTextSpan + + https://bugs.freedesktop.org/show_bug.cgi?id=78103 + + glib/poppler-structure-element.h | 3 --- + 1 file changed, 3 deletions(-) + +commit 9a68daee2b3c7f8a992ee47c0e9ac78b346d4348 +Author: Albert Astals Cid +Date: Fri Apr 25 01:01:08 2014 +0200 + + 0.26.0 + + CMakeLists.txt | 4 ++-- + NEWS | 13 +++++++++++++ + configure.ac | 4 ++-- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 20 insertions(+), 7 deletions(-) + +commit 8073852c84b71257d487aa8a46e441aa82f4b42c +Author: Fabio D'Urso +Date: Mon Apr 14 23:35:50 2014 +0200 + + qt: Fix missing ! in TextAnnotation::setInplaceIntent + + CID #16814 + + qt4/src/poppler-annotation.cc | 2 +- + qt5/src/poppler-annotation.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 1fbf98664c0879ac035a63602242a910c0c1d316 +Author: Albert Astals Cid +Date: Mon Apr 14 11:53:59 2014 +0200 + + Initialize tmpBufLen + + CID #16957 + + It isn't really needed since locateFont always returns a fontLoc + with a non null + path if fontLoc itself is not null, but it doesn't hurt either + + qt4/src/ArthurOutputDev.cc | 4 ++-- + qt5/src/ArthurOutputDev.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit b3e5c582a279b1b8d8309322ac3f4d0e51831f77 +Author: Albert Astals Cid +Date: Thu Apr 10 23:38:09 2014 +0200 + + Remove unused member + + cpp/poppler-font.cpp | 2 -- + 1 file changed, 2 deletions(-) + +commit b86f471c43e387cf873358cf3cbcd27470646713 +Author: Albert Astals Cid +Date: Thu Apr 10 22:50:56 2014 +0200 + + 0.25.3 + + CMakeLists.txt | 2 +- + NEWS | 19 +++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/CairoOutputDev.cc | 2 +- + poppler/GfxFont.cc | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/poppler-optcontent.cc | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/poppler-optcontent.cc | 2 +- + qt5/src/poppler-private.cc | 2 +- + qt5/src/poppler-private.h | 2 +- + 12 files changed, 30 insertions(+), 11 deletions(-) + +commit 80107c72ac03bf4d00b2d71d6f947c139ea84ab5 +Author: Pino Toscano +Date: Sun Apr 6 20:17:31 2014 +0200 + + qt5: remove m_fontInfoIterator from Document + + it was used by the deprecated scanForFonts API, which was not provided + in poppler-qt5 + + qt5/src/poppler-private.cc | 2 -- + qt5/src/poppler-private.h | 2 -- + 2 files changed, 4 deletions(-) + +commit b8325316e41fb03eb5fac5c80d6a550fe9ce9695 +Author: Albert Astals Cid +Date: Sun Apr 6 16:05:51 2014 +0200 + + Fix memory leak + + CID #16943 + + utils/pdfseparate.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ca9713118d6ce3fdd245f9ca4f595229a5be19c3 +Author: Albert Astals Cid +Date: Sun Apr 6 15:59:43 2014 +0200 + + Don't check twice for the same variable ^_^ + + CID #16804 + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0ef290a7c5a8fa54d3fe0f646abdf098443a7a67 +Author: Albert Astals Cid +Date: Sun Apr 6 15:57:38 2014 +0200 + + Fix memory leak + + CID #16852 + + splash/Splash.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8810b8917fded340b784873a91ca025b0bb49f3d +Author: Albert Astals Cid +Date: Sun Apr 6 15:49:18 2014 +0200 + + Fix Out-of-bounds read + + CID #16844 + + poppler/PageLabelInfo_p.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 9309907673e8557a25021dce79d9b4354640e2d0 +Author: Albert Astals Cid +Date: Sun Apr 6 15:35:00 2014 +0200 + + Fix memory leak + + Don't pass new'ed GooStrings as parameters to error() + + CID #16915 + + poppler/GfxFont.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit a511005584a38217fed582ced6ce2c937526cf96 +Author: Albert Astals Cid +Date: Sun Apr 6 15:28:50 2014 +0200 + + Fix Uninitialized pointer read when nFucnsA is 0 + + CID #16965 + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 26b961a64030d91c5db2769dcd0ab8dff7b9b6a6 +Author: Albert Astals Cid +Date: Sun Apr 6 15:23:35 2014 +0200 + + gfree -> delete since it was new'ed + + CID #16786 + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 814ac2230b594cce3b871588804dd92f4a187e7e +Author: Albert Astals Cid +Date: Sun Apr 6 15:22:13 2014 +0200 + + delete -> gfree since it was gmaloced + + CID #16785 + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b496b6665803247b10b018ae939a2a452fa4a48f +Author: Albert Astals Cid +Date: Sun Apr 6 15:17:50 2014 +0200 + + Fix memory leak + + CID #16864 + + poppler/SplashOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 1b612f355e9f29fa93c15a9de1188049a8e086b6 +Author: Albert Astals Cid +Date: Sun Apr 6 15:14:50 2014 +0200 + + Fix memory leak + + CID #16853 + + poppler/XRef.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 07621ebbda8ab85cf4cd76a6092efc67aa14454d +Merge: 8d3a2c9d 9fcd46ac +Author: Pino Toscano +Date: Sat Apr 5 15:49:31 2014 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit 9fcd46ac4a94f138981ec5afaab3875918c6a175 +Author: Pino Toscano +Date: Sat Apr 5 15:48:27 2014 +0200 + + qt4/qt5: remove extra qDebug + + qt4/src/poppler-optcontent.cc | 1 - + qt5/src/poppler-optcontent.cc | 1 - + 2 files changed, 2 deletions(-) + +commit 37286ee2923de060ae463ac6b178ffd0e6096b90 +Author: Pino Toscano +Date: Sat Apr 5 15:46:44 2014 +0200 + + qt4/qt5: fix some kinds of OCG models + + properly pass parent and child when building the tree + + qt4/src/poppler-optcontent.cc | 2 +- + qt5/src/poppler-optcontent.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 8d3a2c9d007052bcb8719200760a1abb6314f804 +Author: Peter Breitenlohner +Date: Sun Mar 30 23:34:23 2014 +0200 + + Avoid MinGW/Cygwin warnings due to redefinition of NOMINMAX + + goo/GooMutex.h | 3 +++ + goo/GooTimer.h | 5 ++++- + goo/gfile.h | 5 ++++- + poppler/XpdfPluginAPI.h | 3 +++ + 4 files changed, 14 insertions(+), 2 deletions(-) + +commit 38dcaf96f308265ff6958e4683bcec2be0c254b9 +Author: Adrian Johnson +Date: Fri Mar 28 20:49:17 2014 +1030 + + cairo: fix segv cause by bad image stream + + bug 76445 + + poppler/CairoOutputDev.cc | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 07b0a038b194eb0392a1e9a4236064d37247d687 +Author: Jakub Wilk +Date: Sun Mar 30 16:12:28 2014 +0200 + + pdftohtml: Fix typo in manpage + + utils/pdftohtml.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac3c8303396a0b8de5e4ad32f480b8da5f3b396e +Author: Thomas Liebetraut +Date: Sun Mar 30 12:25:26 2014 +0200 + + glib: Fix the first coord of the qudrilateral in + create_poppler_quads_from_annot_quads() + + https://bugs.freedesktop.org/show_bug.cgi?id=76504 + + glib/poppler-annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 82d69da7c2f67e774c51fb7b146fdf639a6b9616 +Author: Albert Astals Cid +Date: Fri Mar 28 15:53:22 2014 +0100 + + Fix error reported by ASAN in 3628.asan.0.3910.pdf + + ==20743== ERROR: AddressSanitizer: heap-buffer-overflow on + address 0x60040005c6ef at pc 0x7f8912ca0c90 bp 0x7fff8509ee20 sp + 0x7fff8509ee18 + READ of size 1 at 0x60040005c6ef thread T0 + #0 0x7f8912ca0c8f in expandRow(unsigned char*, unsigned char*, + int, int, int) /home/tsdgeos/devel/poppler/splash/Splash.cc:4855 + #1 0x7f8912ca1097 in Splash::scaleImageYuXuBilinear(bool + (*)(void*, unsigned char*, unsigned char*), void*, + SplashColorMode, int, bool, int, int, int, int, SplashBitmap*) + /home/tsdgeos/devel/poppler/splash/Splash.cc:4897 + #2 0x7f8912c9d2b7 in Splash::scaleImage(bool + (*)(void*, unsigned char*, unsigned char*), void*, + SplashColorMode, int, bool, int, int, int, int, bool, bool) + /home/tsdgeos/devel/poppler/splash/Splash.cc:4127 + #3 0x7f8912c98101 in Splash::drawImage(bool + (*)(void*, unsigned char*, unsigned char*), void*, + SplashColorMode, bool, int, int, double*, bool, bool) + /home/tsdgeos/devel/poppler/splash/Splash.cc:3726 + #4 0x7f8912c7056a in + SplashOutputDev::drawSoftMaskedImage(GfxState*, + Object*, Stream*, int, int, GfxImageColorMap*, + bool, Stream*, int, int, GfxImageColorMap*, bool) + /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3630 + #5 0x7f8912ac7aa7 in Gfx::doImage(Object*, Stream*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4646 + #6 0x7f8912ac4de0 in Gfx::opXObject(Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179 + #7 0x7f8912a9f33a in Gfx::execOp(Object*, Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903 + #8 0x7f8912a9e50f in Gfx::go(bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762 + #9 0x7f8912a9e163 in Gfx::display(Object*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728 + #10 0x7f8912b80e13 in Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool + (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/Page.cc:585 + #11 0x7f8912b8833f in PDFDoc::displayPageSlice(OutputDev*, + int, double, double, int, bool, bool, bool, int, int, int, int, + bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503 + #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*, + int, int, int, int, int, double, double, char*) + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222 + #13 0x404416 in main + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521 + #14 0x7f89121a8ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4) + #15 0x401d58 in _start + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58) + + splash/Splash.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 38ec8cbeeaf69d96b9d7bcd662187c8916cf7903 +Author: Albert Astals Cid +Date: Fri Mar 28 11:18:02 2014 +0100 + + Fix error reported by ASAN in 5782.asan.0.7113.pdf + + ==32161== ERROR: AddressSanitizer: heap-buffer-overflow on + address 0x6008000e3bcf at pc 0x7f66bae0e117 bp 0x7fffcb54ea70 sp + 0x7fffcb54ea68 + READ of size 1 at 0x6008000e3bcf thread T0 + #0 0x7f66bae0e116 in GooString::getChar(int) + /home/tsdgeos/devel/poppler/goo/GooString.h:119 + #1 0x7f66bafb5dca in LinkURI::LinkURI(Object*, GooString*) + /home/tsdgeos/devel/poppler/poppler/Link.cc:562 + #2 0x7f66bafb2a05 in LinkAction::parseAction(Object*, GooString*) + /home/tsdgeos/devel/poppler/poppler/Link.cc:98 + #3 0x7f66bae69c0e in AnnotLink::initialize(PDFDoc*, Dict*) + /home/tsdgeos/devel/poppler/poppler/Annot.cc:2621 + #4 0x7f66bae698d9 in AnnotLink::AnnotLink(PDFDoc*, Dict*, Object*) + /home/tsdgeos/devel/poppler/poppler/Annot.cc:2596 + #5 0x7f66bae8d998 in Annots::createAnnot(Dict*, Object*) + /home/tsdgeos/devel/poppler/poppler/Annot.cc:6737 + #6 0x7f66bae8d269 in Annots::Annots(PDFDoc*, int, Object*) + /home/tsdgeos/devel/poppler/poppler/Annot.cc:6683 + #7 0x7f66bafc750d in Page::getAnnots(XRef*) + /home/tsdgeos/devel/poppler/poppler/Page.cc:402 + #8 0x7f66bafc8e66 in Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool + (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/Page.cc:595 + #9 0x7f66bafd02fd in PDFDoc::displayPageSlice(OutputDev*, int, + double, double, int, bool, bool, bool, int, int, int, int, + bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503 + #10 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*, + int, int, int, int, int, double, double, char*) + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222 + #11 0x404416 in main + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521 + #12 0x7f66ba5f0ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4) + #13 0x401d58 in _start + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58) + + poppler/Link.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 49b4eb68ee646aefe49b70f9e2831ebf93576053 +Author: Albert Astals Cid +Date: Fri Mar 28 11:08:18 2014 +0100 + + Fix error reported by ASAN in 590.asan.0.7288.pdf + + ==31898== ERROR: AddressSanitizer: heap-use-after-free on + address 0x60ae0007432c at pc 0x7f03483026aa bp 0x7fff6ec0c820 sp + 0x7fff6ec0c818 + READ of size 4 at 0x60ae0007432c thread T0 + #0 0x7f03483026a9 in SplashFTFont::getGlyphPath(int) + /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:414 + #1 0x7f034829f681 in SplashOutputDev::drawChar(GfxState*, + double, double, double, double, double, + double, unsigned int, int, unsigned int*, int) + /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2239 + #2 0x7f0348100599 in Gfx::doShowText(GooString*) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054 + #3 0x7f03480fddb0 in Gfx::opShowSpaceText(Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886 + #4 0x7f03480dc33a in Gfx::execOp(Object*, Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903 + #5 0x7f03480db50f in Gfx::go(bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762 + #6 0x7f03480db163 in Gfx::display(Object*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728 + #7 0x7f03481bddd1 in Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool + (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/Page.cc:585 + #8 0x7f03481c52fd in PDFDoc::displayPageSlice(OutputDev*, int, + double, double, int, bool, bool, bool, int, int, int, int, + bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503 + #9 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*, + int, int, int, int, int, double, double, char*) + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222 + #10 0x404416 in main + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521 + #11 0x7f03477e5ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4) + #12 0x401d58 in _start + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58) + + splash/SplashFTFont.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 89a64b508e5f8445798c95fcec6c87180f6c9b73 +Author: Albert Astals Cid +Date: Fri Mar 28 00:35:17 2014 +0100 + + Fix error reported by ASAN in 2279.asan.0.1904.pdf + + ==20507== ERROR: AddressSanitizer: heap-buffer-overflow on + address 0x60420000ff04 at pc 0x7fa1492e8012 bp 0x7fff8406d900 sp + 0x7fff8406d8f8 + READ of size 4 at 0x60420000ff04 thread T0 + #0 0x7fa1492e8011 in SplashFTFont::makeGlyph(int, int, int, + SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*) + /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:284 + #1 0x7fa1492eda32 in SplashFont::getGlyph(int, int, int, + SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*) + /home/tsdgeos/devel/poppler/splash/SplashFont.cc:168 + #2 0x7fa1492e7c69 in SplashFTFont::getGlyph(int, int, int, + SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*) + /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:233 + #3 0x7fa1492b3368 in Splash::fillChar(double, double, int, + SplashFont*) /home/tsdgeos/devel/poppler/splash/Splash.cc:2714 + #4 0x7fa149286a20 in SplashOutputDev::drawChar(GfxState*, + double, double, double, double, double, + double, unsigned int, int, unsigned int*, int) + /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2270 + #5 0x7fa1490e7599 in Gfx::doShowText(GooString*) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054 + #6 0x7fa1490e4db0 in Gfx::opShowSpaceText(Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886 + #7 0x7fa1490c333a in Gfx::execOp(Object*, Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903 + #8 0x7fa1490c250f in Gfx::go(bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762 + #9 0x7fa1490c2163 in Gfx::display(Object*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728 + #10 0x7fa1491a4dd1 in Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool + (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/Page.cc:585 + #11 0x7fa1491ac2fd in PDFDoc::displayPageSlice(OutputDev*, + int, double, double, int, bool, bool, bool, int, int, int, int, + bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503 + #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*, + int, int, int, int, int, double, double, char*) + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222 + #13 0x404416 in main + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521 + #14 0x7fa1487ccec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4) + #15 0x401d58 in _start + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58) + + splash/SplashFTFont.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5055479634dc8d0cd5afb3373de600fb121357fe +Author: Albert Astals Cid +Date: Thu Mar 27 23:54:20 2014 +0100 + + Fix error reported by ASAN in 2010.asan.0.1506.pdf + + ==18859== ERROR: AddressSanitizer: unknown-crash on address + 0x7f1e4a6beb50 at pc 0x7f1e5557444d bp 0x7fff6af3c340 sp + 0x7fff6af3bb00 + WRITE of size 442216446 at 0x7f1e4a6beb50 thread T0 + #0 0x7f1e5557444c (/usr/lib/x86_64-linux-gnu/libasan.so.0+0xe44c) + #1 0x7f1e550e04ff in SplashFont::getGlyph(int, int, int, + SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*) + /home/tsdgeos/devel/poppler/splash/SplashFont.cc:206 + #2 0x7f1e550d9c69 in SplashFTFont::getGlyph(int, int, int, + SplashGlyphBitmap*, int, int, SplashClip*, SplashClipResult*) + /home/tsdgeos/devel/poppler/splash/SplashFTFont.cc:233 + #3 0x7f1e550a5368 in Splash::fillChar(double, double, int, + SplashFont*) /home/tsdgeos/devel/poppler/splash/Splash.cc:2714 + #4 0x7f1e55078a20 in SplashOutputDev::drawChar(GfxState*, + double, double, double, double, double, + double, unsigned int, int, unsigned int*, int) + /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:2270 + #5 0x7f1e54ed9599 in Gfx::doShowText(GooString*) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4054 + #6 0x7f1e54ed6db0 in Gfx::opShowSpaceText(Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3886 + #7 0x7f1e54eb533a in Gfx::execOp(Object*, Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903 + #8 0x7f1e54eb450f in Gfx::go(bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762 + #9 0x7f1e54eb4163 in Gfx::display(Object*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728 + #10 0x7f1e54f96dd1 in Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool + (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/Page.cc:585 + #11 0x7f1e54f9e2fd in PDFDoc::displayPageSlice(OutputDev*, + int, double, double, int, bool, bool, bool, int, int, int, int, + bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503 + #12 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*, + int, int, int, int, int, double, double, char*) + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222 + #13 0x404416 in main + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521 + #14 0x7f1e545beec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4) + #15 0x401d58 in _start + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58) + + splash/SplashFont.cc | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit 3e7779935ec2610410bc4a42e9b0174e41ca9672 +Author: Albert Astals Cid +Date: Thu Mar 27 16:49:57 2014 +0100 + + Fix error reported by ASAN in 139.asan.0.581.pdf + + ==15244== ERROR: AddressSanitizer: SEGV on unknown address + 0x605df000f3ee (pc 0x7f1087b3a22e sp 0x7fffec30ff20 bp 0x7fffec30ff80 + T0) + AddressSanitizer can not provide additional info. + #0 0x7f1087b3a22d + (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x48f22d) + #1 0x7f1087b19d92 + (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x46ed92) + #2 0x7f1087ae570b + (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x43a70b) + #3 0x7f1087ae4061 + (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x439061) + #4 0x7f1087ab9b38 + (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x40eb38) + #5 0x7f1087900989 + (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x255989) + #6 0x7f10878f733a + (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24c33a) + #7 0x7f10878f650f + (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24b50f) + #8 0x7f10878f6163 + (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x24b163) + #9 0x7f10879d8dd1 + (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x32ddd1) + #10 0x7f10879e02fd + (/home/tsdgeos/devel/poppler/build-debug/libpoppler.so.46.0.0+0x3352fd) + #11 0x40311e + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x40311e) + #12 0x404416 + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x404416) + #13 0x7f1087000ec4 (/lib/x86_64-linux-gnu/libc-2.19.so+0x21ec4) + #14 0x401d58 + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58) + + splash/SplashXPathScanner.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 23ad7fa5253a4fec6543d1435827aa1b59b62ced +Author: Albert Astals Cid +Date: Thu Mar 27 01:14:05 2014 +0100 + + 0.25.2 + + CMakeLists.txt | 4 ++-- + NEWS | 48 + +++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + gtk-doc.make | 33 +++++++++++++++++++--------- + m4/gtk-doc.m4 | 47 + +++++++++++++++++++++++++++------------- + poppler/CairoOutputDev.h | 2 +- + poppler/Hints.cc | 2 +- + poppler/Makefile.am | 2 +- + poppler/PSOutputDev.cc | 3 ++- + poppler/PSOutputDev.h | 2 +- + poppler/StructElement.cc | 2 +- + poppler/StructElement.h | 2 +- + poppler/StructTreeRoot.cc | 2 +- + poppler/StructTreeRoot.h | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + qt4/src/poppler-ps-converter.cc | 1 + + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Doxyfile | 2 +- + qt5/src/Makefile.am | 2 +- + qt5/src/poppler-ps-converter.cc | 1 + + utils/pdftocairo.cc | 2 +- + utils/pdftops.cc | 1 + + 25 files changed, 127 insertions(+), 45 deletions(-) + +commit ec2f8bca9f48935d3180dab65ef2ca455a893afd +Author: Albert Astals Cid +Date: Wed Mar 26 18:38:13 2014 +0100 + + Fix overflow malloc + + poppler/Stream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 322e416451b7b33cba8fb3d4702207693c3c7921 +Author: Albert Astals Cid +Date: Wed Mar 26 17:58:48 2014 +0100 + + Fix error reported by ASAN in 1195.asan.0.293.pdf + + ==31060== ERROR: AddressSanitizer: heap-buffer-overflow on + address 0x60040002a215 at pc 0x7f5614cd96c4 bp 0x7fff54a44050 sp + 0x7fff54a44048 + READ of size 1 at 0x60040002a215 thread T0 + #0 0x7f5614cd96c3 in JBIG2Stream::readGenericBitmap(bool, + int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int) + /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3389 + #1 0x7f5614cce0e7 in JBIG2Stream::readSymbolDictSeg(unsigned + int, unsigned int, unsigned int*, unsigned int) + /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1867 + #2 0x7f5614ccb8fe in JBIG2Stream::readSegments() + /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1408 + #3 0x7f5614cca72e in JBIG2Stream::reset() + /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248 + #4 0x7f5614d1648b in ImageStream::reset() + /home/tsdgeos/devel/poppler/poppler/Stream.cc:484 + #5 0x7f5614de6578 in SplashOutputDev::drawImage(GfxState*, + Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool) + /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158 + #6 0x7f5614c41d64 in Gfx::doImage(Object*, Stream*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653 + #7 0x7f5614c3ede0 in Gfx::opXObject(Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179 + #8 0x7f5614c1933a in Gfx::execOp(Object*, Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903 + #9 0x7f5614c1850f in Gfx::go(bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762 + #10 0x7f5614c18163 in Gfx::display(Object*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728 + #11 0x7f5614cfae27 in Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool + (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/Page.cc:585 + #12 0x7f5614d02353 in PDFDoc::displayPageSlice(OutputDev*, + int, double, double, int, bool, bool, bool, int, int, int, int, + bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503 + #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*, + int, int, int, int, int, double, double, char*) + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222 + #14 0x404416 in main + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521 + #15 0x7f5614322ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4) + #16 0x401d58 in _start + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58) + + poppler/JBIG2Stream.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 225232f6f070d17d8570108ffe39ffd4350fc6e8 +Author: Albert Astals Cid +Date: Wed Mar 26 15:00:09 2014 +0100 + + Fix error reported by ASAN in 6609.asan.0.8343.pdf + + ==8470== ERROR: AddressSanitizer: heap-buffer-overflow on + address 0x7f3b12f7b5e1 at pc 0x7f3b0f915f5e bp 0x7fff47842de0 sp + 0x7fff47842dd8 + READ of size 1 at 0x7f3b12f7b5e1 thread T0 + #0 0x7f3b0f915f5d in JBIG2Stream::readGenericBitmap(bool, + int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int) + /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3628 + #1 0x7f3b0f910558 in JBIG2Stream::readGenericRegionSeg(unsigned + int, bool, bool, unsigned int) + /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:2849 + #2 0x7f3b0f906b33 in JBIG2Stream::readSegments() + /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1443 + #3 0x7f3b0f90572e in JBIG2Stream::reset() + /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248 + #4 0x7f3b0f951459 in ImageStream::reset() + /home/tsdgeos/devel/poppler/poppler/Stream.cc:484 + #5 0x7f3b0fa21546 in SplashOutputDev::drawImage(GfxState*, + Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool) + /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158 + #6 0x7f3b0f87cd64 in Gfx::doImage(Object*, Stream*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653 + #7 0x7f3b0f879de0 in Gfx::opXObject(Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179 + #8 0x7f3b0f85433a in Gfx::execOp(Object*, Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903 + #9 0x7f3b0f85350f in Gfx::go(bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762 + #10 0x7f3b0f853163 in Gfx::display(Object*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728 + #11 0x7f3b0f935df5 in Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool + (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/Page.cc:585 + #12 0x7f3b0f93d321 in PDFDoc::displayPageSlice(OutputDev*, + int, double, double, int, bool, bool, bool, int, int, int, int, + bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503 + #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*, + int, int, int, int, int, double, double, char*) + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222 + #14 0x404416 in main + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521 + #15 0x7f3b0ef5dec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4) + #16 0x401d58 in _start + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58) + + poppler/JBIG2Stream.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 216890f1f147b25643e0d6e18e361d4d34b6c332 +Author: Albert Astals Cid +Date: Wed Mar 26 12:19:42 2014 +0100 + + Fix error reported by ASAN in 6760.asan.0.8568.pdf + + ==26566== ERROR: AddressSanitizer: SEGV on unknown address + 0x7fffbc3e5ea8 (pc 0x7fe1fa858db1 sp 0x7fffc788eb30 bp 0x7fffc788eb40 + T0) + AddressSanitizer can not provide additional info. + #0 0x7fe1fa858db0 in PSStack::index(int) + /home/tsdgeos/devel/poppler/poppler/Function.cc:1067 + #1 0x7fe1fa856fd6 in PostScriptFunction::exec(PSStack*, int) + /home/tsdgeos/devel/poppler/poppler/Function.cc:1621 + #2 0x7fe1fa854c10 in PostScriptFunction::transform(double*, + double*) /home/tsdgeos/devel/poppler/poppler/Function.cc:1266 + #3 0x7fe1fa854097 in + PostScriptFunction::PostScriptFunction(Object*, Dict*) + /home/tsdgeos/devel/poppler/poppler/Function.cc:1216 + #4 0x7fe1fa84a0c2 in Function::parse(Object*, + std::set, std::allocator >*) + /home/tsdgeos/devel/poppler/poppler/Function.cc:98 + #5 0x7fe1fa849e3c in Function::parse(Object*) + /home/tsdgeos/devel/poppler/poppler/Function.cc:63 + #6 0x7fe1fa8c1d8c in GfxDeviceNColorSpace::parse(Array*, + OutputDev*, GfxState*, int) + /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2978 + #7 0x7fe1fa8a6fb7 in GfxColorSpace::parse(Object*, + OutputDev*, GfxState*, int) + /home/tsdgeos/devel/poppler/poppler/GfxState.cc:328 + #8 0x7fe1fa88440f in Gfx::doImage(Object*, Stream*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4403 + #9 0x7fe1fa882d6c in Gfx::opXObject(Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179 + #10 0x7fe1fa85d2c6 in Gfx::execOp(Object*, Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903 + #11 0x7fe1fa85c49b in Gfx::go(bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762 + #12 0x7fe1fa85c0ef in Gfx::display(Object*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728 + #13 0x7fe1fa93ed81 in Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool + (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/Page.cc:585 + #14 0x7fe1fa9462ad in PDFDoc::displayPageSlice(OutputDev*, + int, double, double, int, bool, bool, bool, int, int, int, int, + bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503 + #15 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*, + int, int, int, int, int, double, double, char*) + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222 + #16 0x404416 in main + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521 + #17 0x7fe1f9f66ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4) + #18 0x401d58 in _start + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58) + + poppler/Function.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit fb7d91435c71603697b652c70cfa76dd595ee200 +Author: Albert Astals Cid +Date: Wed Mar 26 12:08:52 2014 +0100 + + Fix ASAN in 750.asan.0.9621.pdf + + ==25876== ERROR: AddressSanitizer: heap-buffer-overflow on + address 0x60040002a10f at pc 0x7fc396c3c23e bp 0x7ffff1123d20 sp + 0x7ffff1123d18 + READ of size 1 at 0x60040002a10f thread T0 + #0 0x7fc396c3c23d in JBIG2Stream::readGenericBitmap(bool, + int, int, int, bool, bool, JBIG2Bitmap*, int*, int*, int) + /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:3504 + #1 0x7fc396c30073 in JBIG2Stream::readSymbolDictSeg(unsigned + int, unsigned int, unsigned int*, unsigned int) + /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1867 + #2 0x7fc396c2d88a in JBIG2Stream::readSegments() + /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1408 + #3 0x7fc396c2c6ba in JBIG2Stream::reset() + /home/tsdgeos/devel/poppler/poppler/JBIG2Stream.cc:1248 + #4 0x7fc396c783f7 in ImageStream::reset() + /home/tsdgeos/devel/poppler/poppler/Stream.cc:484 + #5 0x7fc396d484e4 in SplashOutputDev::drawImage(GfxState*, + Object*, Stream*, int, int, GfxImageColorMap*, bool, int*, bool) + /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:3158 + #6 0x7fc396ba3cf0 in Gfx::doImage(Object*, Stream*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4653 + #7 0x7fc396ba0d6c in Gfx::opXObject(Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:4179 + #8 0x7fc396b7b2c6 in Gfx::execOp(Object*, Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903 + #9 0x7fc396b7a49b in Gfx::go(bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762 + #10 0x7fc396b7a0ef in Gfx::display(Object*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728 + #11 0x7fc396c5cd93 in Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool + (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/Page.cc:585 + #12 0x7fc396c642bf in PDFDoc::displayPageSlice(OutputDev*, + int, double, double, int, bool, bool, bool, int, int, int, int, + bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503 + #13 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*, + int, int, int, int, int, double, double, char*) + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222 + #14 0x404416 in main + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521 + #15 0x7fc396284ec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4) + #16 0x401d58 in _start + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58) + + poppler/JBIG2Stream.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 9002b3b7cbbbc5802abfa8383ded2093a29d1746 +Author: Albert Astals Cid +Date: Wed Mar 26 00:48:15 2014 +0100 + + Fix ASAN in 784.asan.0.9671.pdf + + ================================================================= + ==24856== ERROR: AddressSanitizer: SEGV on unknown address + 0x603bfffe5804 (pc 0x7f7aa3310c6b sp 0x7fff0e656bd0 bp 0x7fff0e656e90 + T0) + AddressSanitizer can not provide additional info. + #0 0x7f7aa3310c6a in + GfxIndexedColorSpace::mapColorToBase(GfxColor*, GfxColor*) + /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2509 + #1 0x7f7aa33110d2 in GfxIndexedColorSpace::getRGB(GfxColor*, + GfxRGB*) /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2529 + #2 0x7f7aa3466712 in convertGfxColor(unsigned + char*, SplashColorMode, GfxColorSpace*, GfxColor*) + /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:117 + #3 0x7f7aa34675a9 in SplashUnivariatePattern::getColor(int, + int, unsigned char*) + /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:215 + #4 0x7f7aa348d2a2 in Splash::pipeRun(SplashPipe*) + /home/tsdgeos/devel/poppler/splash/Splash.cc:363 + #5 0x7f7aa34c9c29 in Splash::drawAALine(SplashPipe*, + int, int, int, bool, unsigned char) + /home/tsdgeos/devel/poppler/splash/Splash.cc:1537 + #6 0x7f7aa34c4787 in Splash::shadedFill(SplashPath*, bool, + SplashPattern*) /home/tsdgeos/devel/poppler/splash/Splash.cc:6388 + #7 0x7f7aa348b65c in + SplashOutputDev::univariateShadedFill(GfxState*, + SplashUnivariatePattern*, double, double) + /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:4408 + #8 0x7f7aa348b93d in SplashOutputDev::radialShadedFill(GfxState*, + GfxRadialShading*, double, double) + /home/tsdgeos/devel/poppler/poppler/SplashOutputDev.cc:4427 + #9 0x7f7aa32c7574 in Gfx::doRadialShFill(GfxRadialShading*) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:3058 + #10 0x7f7aa32c188f in Gfx::opShFill(Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:2476 + #11 0x7f7aa32b12c6 in Gfx::execOp(Object*, Object*, int) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:903 + #12 0x7f7aa32b049b in Gfx::go(bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:762 + #13 0x7f7aa32b00ef in Gfx::display(Object*, bool) + /home/tsdgeos/devel/poppler/poppler/Gfx.cc:728 + #14 0x7f7aa3392dc9 in Page::displaySlice(OutputDev*, double, + double, int, bool, bool, int, int, int, int, bool, bool + (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/Page.cc:585 + #15 0x7f7aa339a2f5 in PDFDoc::displayPageSlice(OutputDev*, + int, double, double, int, bool, bool, bool, int, int, int, int, + bool (*)(void*), void*, bool (*)(Annot*, void*), void*, bool) + /home/tsdgeos/devel/poppler/poppler/PDFDoc.cc:503 + #16 0x40311e in savePageSlice(PDFDoc*, SplashOutputDev*, + int, int, int, int, int, double, double, char*) + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:222 + #17 0x404416 in main + /home/tsdgeos/devel/poppler/utils/pdftoppm.cc:521 + #18 0x7f7aa29baec4 (/lib/x86_64-linux-gnu/libc.so.6+0x21ec4) + #19 0x401d58 in _start + (/home/tsdgeos/devel/poppler/build-debug/utils/pdftoppm+0x401d58) + SUMMARY: AddressSanitizer: SEGV + /home/tsdgeos/devel/poppler/poppler/GfxState.cc:2509 + GfxIndexedColorSpace::mapColorToBase(GfxColor*, GfxColor*) + + poppler/GfxState.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8947c6bc1dcb768b9d9c03a7a5db1573abdc2e87 +Author: Albert Astals Cid +Date: Wed Mar 26 00:47:59 2014 +0100 + + Forgot my (C) in the last commit + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1d7095ab7bdf0f14c3bfe99d6d5985bce98abe16 +Author: Albert Astals Cid +Date: Tue Mar 25 22:29:07 2014 +0100 + + Fix Heap-buffer-overflow in TextPage::updateFont + + Bug #76442 + + poppler/TextOutputDev.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 37ad83d69bd1d10da6ea1eb559c4bd320917ae25 +Author: Albert Astals Cid +Date: Sat Mar 22 17:33:55 2014 +0100 + + Reorder the if check condition + + I think the previous condition was correct anyway because of the + extra -1 in the i check + but it really makes more sense to have the i check first + + Bug #76478 + + goo/gfile.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3535d658095ffa49ef8615d69843afa9c5ada061 +Author: Albert Astals Cid +Date: Sat Mar 22 17:29:46 2014 +0100 + + Make the test rect go to xMax, yMax not xMax-1,yMax-1 + + I don't understand why the -1 is there and removing + it actually fixes bug #76387 + + splash/Splash.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1e93c3f2d1c86edd40ca283ed422089f64886d04 +Author: William Bader +Date: Sat Mar 15 17:14:21 2014 +0100 + + Fix regression when creating level1 PS + + Bug #75241 + + poppler/PreScanOutputDev.cc | 16 ++++++++++++++-- + poppler/PreScanOutputDev.h | 3 ++- + 2 files changed, 16 insertions(+), 3 deletions(-) + +commit 1ea2eb412d12d97eaf49d1e51d7fda7abd8fbf9d +Author: Jason Crain +Date: Wed Mar 12 00:34:13 2014 +0100 + + Limit numeric parsing of character names + + Bug #38456 + + poppler/GfxFont.cc | 139 + ++++++++++++++++++++++++++++++++++-------------- + poppler/GlobalParams.cc | 4 +- + 2 files changed, 102 insertions(+), 41 deletions(-) + +commit e24cbeae22d6c8630e292897bd982a87e6290ca6 +Author: Steven Lee +Date: Tue Mar 11 21:24:59 2014 +0100 + + Fix TIFF writting in Windows + + Bug #75969 + + goo/TiffWriter.cc | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit b984a3b5946ebcd736e0583a10eb614cede3388a +Author: Adrian Perez de Castro +Date: Wed Mar 5 11:19:48 2014 +0200 + + glib: Use flags argument in poppler_structure_element_get_text() + + Instead of accepting a boolean argument to enable recursive text + extraction, + use a flags value. Text extraction may add features in the future (for + example, allowing using alternate text as replacement for inline + figures), + and this will allow to extend the method without introducing ABI + or API + breakage. + + https://bugs.freedesktop.org/show_bug.cgi?id=75796 + + glib/poppler-structure-element.cc | 12 +++++++----- + glib/poppler-structure-element.h | 14 +++++++++++++- + glib/reference/poppler-sections.txt | 3 +++ + 3 files changed, 23 insertions(+), 6 deletions(-) + +commit 94df09de1e07d442895ec1fb5cc23cacd9826552 +Author: Adrian Perez de Castro +Date: Thu Mar 6 10:44:51 2014 +0200 + + glib: Add missing underscore in method name + + The correct name is poppler_structure_element_get_form_state(). + + https://bugs.freedesktop.org/show_bug.cgi?id=75827 + + glib/poppler-structure-element.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7ddd03f9a00dcf505921821c55bebe6817aa3605 +Author: Carlos Garcia Campos +Date: Wed Mar 5 17:48:39 2014 +0100 + + Rename getNumElements, getElement and appendElement as getNumChildren, + getChild and appendChild + + It's more consistent with other internal API and less confusing. + + glib/poppler-structure-element.cc | 16 ++++++++-------- + poppler/StructElement.cc | 6 +++--- + poppler/StructElement.h | 8 ++++---- + poppler/StructTreeRoot.cc | 4 ++-- + poppler/StructTreeRoot.h | 8 ++++---- + 5 files changed, 21 insertions(+), 21 deletions(-) + +commit 7d6a5b65f8497537248d405177ae141f3765a419 +Author: Carlos Garcia Campos +Date: Wed Mar 5 17:40:14 2014 +0100 + + glib: Update the documentation symbols after the PopplerStructureScope + rename + + glib/reference/poppler-sections.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9282b5a26e9ce81d81d42c0cbe449543c8366b7c +Author: Carlos Garcia Campos +Date: Wed Mar 5 17:37:38 2014 +0100 + + glib: Rename PopplerStructureScope as PopplerStructureTableScope + + It's a table specific attribute + + glib/poppler-structure-element.cc | 14 +++++++------- + glib/poppler-structure-element.h | 12 ++++++------ + 2 files changed, 13 insertions(+), 13 deletions(-) + +commit 9888eb65c6fad0eabcf525a7e88941dec2a27e92 +Author: Adrian Perez de Castro +Date: Thu Sep 26 19:36:12 2013 +0300 + + glib: Implement accessors for element attributes + + Implement inspecting the standard attributes of + PopplerStructureElement + objects. + + https://bugs.freedesktop.org/show_bug.cgi?id=64821 + + glib/poppler-structure-element.cc | 1279 + ++++++++++++++++++++++++++++++++++- + glib/poppler-structure-element.h | 252 ++++++- + glib/reference/poppler-sections.txt | 84 +++ + 3 files changed, 1597 insertions(+), 18 deletions(-) + +commit b346df59ef0775f5bd74a9f7379b5f430ccd7b79 +Author: Adam Reichold +Date: Tue Mar 4 23:40:59 2014 +0100 + + Qt: Expose document-supplied text direction + + qt4/src/poppler-document.cc | 17 +++++++++++++++++ + qt4/src/poppler-qt4.h | 10 +++++++++- + qt5/src/poppler-document.cc | 17 +++++++++++++++++ + qt5/src/poppler-qt5.h | 10 +++++++++- + 4 files changed, 52 insertions(+), 2 deletions(-) + +commit 2fc38c1866243598e22be07f0177e7d9385542d5 +Author: Adrian Perez de Castro +Date: Fri Feb 28 19:14:36 2014 +0200 + + glib: Fixes in the API reference documentation + + - Remove the references to non-existent methods for + PopplerStructureElement, + and point to PopplerStructureElementIter instead to point out how to + obtain the structure tree. + - Remove a non-existent include in poppler-docs.sgml + - Add POPPLER_TYPE_TEXT_SPAN to the list of private symbols. + + https://bugs.freedesktop.org/show_bug.cgi?id=75615 + + glib/poppler-structure-element.cc | 6 +++--- + glib/reference/poppler-docs.sgml | 1 - + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit cfe47a655ec5e280168e000da85bbf13f5f5f8b8 +Author: Adrian Perez de Castro +Date: Fri Feb 28 19:17:45 2014 +0200 + + glib: Remove poppler_text_span_is_link() in header + + The method poppler_text_span_is_link() does not exist, and must + be removed from the API header. + + https://bugs.freedesktop.org/show_bug.cgi?id=75613 + + glib/poppler-structure-element.h | 1 - + 1 file changed, 1 deletion(-) + +commit 7a2db63b5f7cae4bc215baa0859c4d4f8a660951 +Author: Adrian Perez de Castro +Date: Wed Feb 26 20:16:29 2014 +0200 + + glib: Remove unneeded POPPLER_STRUCTURE_ELEMENT_UNKNOWN + + The enum value POPPLER_STRUCTURE_ELEMENT_UNKNOWN because Poppler does + not add invalid StructElements ("invalid" being nodes of type + StructElement::Unknown) to the Tagged-PDF structure tree. That means + that poppler-glib does not need to expose it in the API. An assertion + is left to aid in finding issues when using debug builds. + + https://bugs.freedesktop.org/show_bug.cgi?id=75541 + + glib/poppler-structure-element.cc | 12 +++++++----- + glib/poppler-structure-element.h | 1 - + 2 files changed, 7 insertions(+), 6 deletions(-) + +commit db909c2a14f962234a813ba9853535b9692cfd5a +Author: Albert Astals Cid +Date: Wed Feb 26 22:09:44 2014 +0100 + + Try harder to open broken files + + Bug #75232 + + poppler/PDFDoc.cc | 33 ++++++++++++++++++++++----------- + poppler/PDFDoc.h | 8 ++++---- + 2 files changed, 26 insertions(+), 15 deletions(-) + +commit b2394eee5384edf4128d598030989e66d64714ef +Author: Adrian Perez de Castro +Date: Mon Feb 10 20:29:35 2014 +0200 + + Tagged-PDF: Fix parsing of attached element attributes + + The wrong object was used as attribute dictionary, which caused + a segmentation fault when parsing PDF files in which the structure + elements included attributes attached to them. This patch fixes the + issue. + + Thanks to Joanmarie Diggs for helping in + debugging the problem. + + https://bugs.freedesktop.org/show_bug.cgi?id=74805 + + poppler/StructElement.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c549b5e9ce2dcc8beb2511ee315bfff2fdfdf6e8 +Author: Adrian Perez de Castro +Date: Sun Feb 9 18:31:22 2014 +0200 + + glib: Add poppler_structure_element_is_grouping() + + Implement a method to check whether a structure element is a grouping + element, wrapping the StructElement::isGrouping() method. + + https://bugs.freedesktop.org/show_bug.cgi?id=74753 + + glib/poppler-structure-element.cc | 20 ++++++++++++++++++++ + glib/poppler-structure-element.h | 1 + + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 22 insertions(+) + +commit 6fbd6cb85bdd32dc5a3d4c3c719556269a4488ac +Author: Adrian Perez de Castro +Date: Fri Feb 21 15:02:44 2014 +0200 + + glib: Handle missing structure element types + + Element Art (article); RB, RP, RB (Ruby text inner elements); and + WT, WP (Warichu inner elements) were not being handled. This adds + the corresponding handling in poppler-glib. Also, the "default" case + in the switch in poppler_structure_element_get_type() is removed, so + the compiler can emit warnings when enum values are not handled. + + https://bugs.freedesktop.org/show_bug.cgi?id=75323 + + glib/poppler-structure-element.cc | 25 +++++++++++++++++++------ + glib/poppler-structure-element.h | 9 +++++++-- + 2 files changed, 26 insertions(+), 8 deletions(-) + +commit 63e9c0b67fa2e64ca20258d873a849386c7eb295 +Author: Fabio D'Urso +Date: Mon Feb 17 23:58:09 2014 +0100 + + Some error() usage fixes + + poppler/Hints.cc | 3 ++- + poppler/JBIG2Stream.cc | 4 ++-- + poppler/PSOutputDev.cc | 4 ++-- + poppler/SecurityHandler.cc | 3 ++- + poppler/StructTreeRoot.cc | 3 ++- + qt4/src/poppler-annotation.cc | 6 +++--- + qt5/src/poppler-annotation.cc | 6 +++--- + utils/HtmlOutputDev.cc | 11 ++++++----- + 8 files changed, 22 insertions(+), 18 deletions(-) + +commit 8f2d847f1d0224a297e642944f8da9c1409732b6 +Author: Fabio D'Urso +Date: Mon Feb 17 23:56:49 2014 +0100 + + Clang++ plugin that checks for usage errors in GooString::format-style + calls + + goo/GooString.h | 12 +- + poppler/Error.h | 4 +- + test/goostring-format-checker/README | 16 + + .../goostring-format-checker.cc | 369 + +++++++++++++++++++++ + 4 files changed, 397 insertions(+), 4 deletions(-) + +commit d7d61dcda91910f7eb2548b19e8380d7c3232dd3 +Author: Thomas Freitag +Date: Wed Feb 12 21:50:38 2014 +0100 + + blend usage in PDF with spot colors casue random output + + The reason for the random colors is the uninitialized local variable + cBlend. The blend functions only fills offset 0 to 3, so offset 4 + up to 4 + SPOT_NCOMPS are left uninitialized, but all offsets are + stored in the bitmap. + So we need to initialize these offsets with 0! + + Bug #74883 + + splash/Splash.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit b2905a0d299cc09fcd219afe49cb370f6db61c5a +Author: Albert Astals Cid +Date: Mon Feb 10 20:19:07 2014 +0100 + + increase gtk3 dependency + + gtk_tree_view_set_activate_on_single_click was introduced in 3.8 + + cmake/modules/FindGTK.cmake | 2 +- + configure.ac | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 71d4041b061c109a965e72230640cf8ee616dac3 +Author: Albert Astals Cid +Date: Mon Feb 10 20:16:46 2014 +0100 + + Make sure number of least objects in hints table is valid + + Bug #74741 + + poppler/Hints.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit a865f13def88153fdbe8a0a054d2005e3e2bb737 +Author: Albert Astals Cid +Date: Sun Feb 9 23:22:07 2014 +0100 + + Fix cmake build + + glib/CMakeLists.txt | 2 ++ + glib/demo/CMakeLists.txt | 1 + + 2 files changed, 3 insertions(+) + +commit d6fde0fac0120b1622942d8344d5153d9abf3e1e +Author: Adrian Perez de Castro +Date: Wed May 29 23:44:03 2013 +0300 + + glib-demo: Pane showing the document structure + + Adds a new pane in poppler-glib-demo showing the structure for + Tagged-PDF + documents. It also serves as an example on how to to use the API for + PopplerStructure and PopplerStructureElement. + + glib/demo/Makefile.am | 2 + + glib/demo/main.c | 2 + + glib/demo/taggedstruct.c | 232 + +++++++++++++++++++++++++++++++++++++++++++++++ + glib/demo/taggedstruct.h | 31 +++++++ + 4 files changed, 267 insertions(+) + +commit 0f9fa775c469c03d1613b955ee7b06b823e6e080 +Author: Adrian Perez de Castro +Date: Thu Sep 26 17:50:51 2013 +0300 + + glib: Expose inline attributes of structure elements + + Allows obtaining inline text attributes from structure elements. The + text + is divived into "spans", which are groups of consecutive glyphs + that share + their attributes. Each one of those is represented by a + PopplerTextSpan, + which gives information about the text font and color, and the + link target + for links. The list of PopplerTextSpans is created lazily when + first used. + + https://bugs.freedesktop.org/show_bug.cgi?id=64821 + + glib/poppler-structure-element.cc | 269 + ++++++++++++++++++++++++++++++++++++ + glib/poppler-structure-element.h | 16 ++- + glib/poppler.h | 1 + + glib/reference/poppler-sections.txt | 12 ++ + 4 files changed, 297 insertions(+), 1 deletion(-) + +commit 8072d4b0e3ea10b4308f8172891f769f30466133 +Author: Adrian Perez de Castro +Date: Thu May 9 12:01:59 2013 +0300 + + glib: Expose the document structure tree + + Implements a new PopplerStructureElement classe, which builds upon + StructTreeRoot and StructElement to expose the document structure of + tagged PDFs in the GLib binding. + + Navigation of the structure tree is done by an iterator-based + interface, + using PopplerStructureElementIter. + + https://bugs.freedesktop.org/show_bug.cgi?id=64821 + + glib/Makefile.am | 2 + + glib/poppler-private.h | 10 + + glib/poppler-structure-element.cc | 663 + ++++++++++++++++++++++++++++++++++++ + glib/poppler-structure-element.h | 112 ++++++ + glib/poppler.h | 3 + + glib/reference/poppler-docs.sgml | 2 + + glib/reference/poppler-sections.txt | 37 ++ + glib/reference/poppler.types | 2 + + 8 files changed, 831 insertions(+) + +commit 46b7470ae9846d7e6dbb72bbb3ff831acd954168 +Author: Germán Poo-Caamaño +Date: Thu Jan 30 14:42:51 2014 -0800 + + glib-demo: Fix performance in text markup annotations + + Fix https://bugs.freedesktop.org/show_bug.cgi?id=51487#c45 + + glib/demo/annots.c | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +commit 8a84b45674aed8c27a1d172b07eb0531c0ec14f1 +Author: Carlos Garcia Campos +Date: Sat Feb 8 09:17:02 2014 +0100 + + glib: Fix gobject-introspection warnings + + glib/poppler-page.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 899799df78c00fc2ca6d2d0e612536b87a871817 +Author: Adrian Perez de Castro +Date: Tue Feb 4 19:26:53 2014 +0200 + + Allow properly identifying grouping elements + + Grouping elements in the Tagged-PDF structure should be identifiable + as + such (see section 14.8.4.2 "Grouping Elements" of the PDF + standard). Those + were previously reported as inline elements, which is quite not + correct. + This patch introduces a new StructElement::isGrouping() method which + correctly reports grouping elements as such. + + https://bugs.freedesktop.org/show_bug.cgi?id=74520 + + poppler/StructElement.cc | 31 +++++++++++++++++++------------ + poppler/StructElement.h | 1 + + 2 files changed, 20 insertions(+), 12 deletions(-) + +commit 27cd9a00bfebf0602e7ed29a8ee8e16ffff67bde +Author: Adrian Perez de Castro +Date: Tue Feb 4 19:35:58 2014 +0200 + + Report LBody elements in Tagged-PDF structure as block elements + + According to section 14.8.4.3 "Block-Level Structure Elements" + (in particular subsection 14.8.4.3.3 "List Elements"), structure + elements of type LBody must be reported as block elements. This + patch changes the reported type from elementTypeUndefined to + elementTypeBlock accordingly. + + https://bugs.freedesktop.org/show_bug.cgi?id=74522 + + poppler/StructElement.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4cda839cb489fe5cd4726109cb9ab8b0ba2fa563 +Author: Adrian Johnson +Date: Tue Jan 28 06:06:09 2014 +1030 + + pdftops: ensure there is always a page size in the output + + even if the PDF file as badly broken. + + poppler/PSOutputDev.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 45a87afdf1372911aa1ba840557e61627cdc7b4f +Author: Adrian Johnson +Date: Sun Dec 29 15:16:37 2013 +1030 + + cairo: clip to crop box + + when printing the cairo surface may larger than the crop box + + fixes https://bugzilla.gnome.org/show_bug.cgi?id=649886 + + poppler/CairoOutputDev.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 6d39a1d7b348329dd057a8e7c77bfd47921fc495 +Author: Adrian Johnson +Date: Mon Dec 30 17:59:09 2013 +1030 + + pdftocairo: ensure page size and crop box works the same as pdftops + + Bug 72312 + + utils/pdftocairo.1 | 26 +++++++++----------------- + utils/pdftocairo.cc | 20 +++++++++++++++----- + 2 files changed, 24 insertions(+), 22 deletions(-) + +commit b1da7e20dcef78ef6036418b37a47ba3f8818453 +Author: Adrian Johnson +Date: Thu Dec 19 22:18:26 2013 +1030 + + pdftops: Only change paper size when different to previous size + + Previously this check was done in the code (removed in previous + commit). + Moving this check into the pdfSetupPaper macro preserves page + independence. + + Bug 72312 + + poppler/PSOutputDev.cc | 30 +++++++++++++++++++++++++----- + 1 file changed, 25 insertions(+), 5 deletions(-) + +commit 7ac7d3bad4b868950ee96fd9c5ece88632f8827c +Author: Adrian Johnson +Date: Fri Dec 20 07:19:21 2013 +1030 + + pdftops: Remove origpagesizes mode and make -origpagesizes an alias + for -paper match + + Bug 72312 + + poppler/PSOutputDev.cc | 9 ++------- + poppler/PSOutputDev.h | 4 ++-- + utils/pdftops.1 | 30 ++++++++++-------------------- + utils/pdftops.cc | 23 ++++++++++++++--------- + 4 files changed, 28 insertions(+), 38 deletions(-) + +commit 31fc5181bc491ff2e4aee0ae05c0f611a36e585c +Author: Adrian Johnson +Date: Fri Dec 20 07:16:37 2013 +1030 + + pdftops: Use crop box as page size + + unless -nocrop is used. The fontends use the crop box as the page + size and + acroread uses the cropbox as the page size for display and printing. + + Bug 72312 + + poppler/PSOutputDev.cc | 28 +++++++--------------------- + 1 file changed, 7 insertions(+), 21 deletions(-) + +commit bf2049b17ac4706f472c59e50266f4eaf0ffaa32 +Author: Adrian Johnson +Date: Sun Dec 15 18:00:41 2013 +1030 + + pdftps: fix DocumentMedia/Page/Media/PageBBox DSC comments + + Bug 72312 + + poppler/PSOutputDev.cc | 167 + ++++++++++++++++++++++++++-------------- + poppler/PSOutputDev.h | 6 +- + qt4/src/poppler-ps-converter.cc | 1 + + qt5/src/poppler-ps-converter.cc | 1 + + utils/pdftops.cc | 1 + + 5 files changed, 119 insertions(+), 57 deletions(-) + +commit fe49033c9bd2103c13d4eb59983e06fdcdd33a8d +Author: Till Kamppeter +Date: Sat Dec 14 16:05:09 2013 +1030 + + pdftops: ensure paper size takes into account rotation + + Bug 72312 + + poppler/PSOutputDev.cc | 48 + ++++++++++++++++++++---------------------------- + 1 file changed, 20 insertions(+), 28 deletions(-) + +commit 31edf585e62f4e91b7b64295cc8b978ac466ce58 +Author: Bogdan Cristea +Date: Mon Jan 27 20:06:11 2014 +0100 + + [qt] Improve compilation under Win 8 with Visual Studio 2012 + + Bug #73111 + + goo/GooMutex.h | 3 ++- + goo/GooTimer.h | 2 ++ + goo/gfile.h | 2 ++ + poppler/PDFDoc.cc | 4 +--- + poppler/XpdfPluginAPI.h | 2 ++ + poppler/poppler-config.h.cmake | 18 ++++++++++++++++-- + poppler/poppler-config.h.in | 18 ++++++++++++++++-- + qt4/tests/stress-threads-qt4.cpp | 5 +++++ + qt5/src/poppler-private.h | 6 ++++-- + qt5/tests/stress-threads-qt5.cpp | 5 +++++ + test/perf-test.cc | 1 - + 11 files changed, 55 insertions(+), 11 deletions(-) + +commit 834cd18e3ddfda44a11316290f7eee98cd871305 +Author: Albert Astals Cid +Date: Sun Jan 26 16:10:20 2014 +0100 + + Use c99 for the c compiler + + cmake/modules/PopplerMacros.cmake | 1 + + 1 file changed, 1 insertion(+) + +commit 03674a141a96806e5e1a134dc3dec2ee61b68713 +Author: Pino Toscano +Date: Sun Jan 26 12:43:13 2014 +0100 + + qt4/qt5: add GCC visibility export attributes + + this does no actual changes to the exported symbols, but can help in + hiding symbols if the right GCC flags for symbols visibility are + specified + + qt4/src/poppler-export.h | 3 +++ + qt5/src/poppler-export.h | 3 +++ + 2 files changed, 6 insertions(+) + +commit 52b46d05219cf9898ee4adae7c8c2702adb1ba23 +Author: Pino Toscano +Date: Sun Jan 26 12:38:03 2014 +0100 + + qt4/qt5: improve naming of internal export/import macros + + use something less generic than LIB_EXPORT/LIB_IMPORT + + qt4/src/poppler-export.h | 12 ++++++------ + qt5/src/poppler-export.h | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +commit 7a8bcea11ad71fccbbba2787fc442f6ba4bf7100 +Author: Pino Toscano +Date: Thu Jan 23 22:34:07 2014 +0100 + + cmake: install JpegWriter.h depending on libjpeg + + ... and not libopenjpeg + + CMakeLists.txt | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 57f34f525fa2c2e62ebc7383ceba48ebc80ebba6 +Author: Andres Gomez +Date: Wed Jan 8 12:26:14 2014 +0200 + + glib-demo: Fix conding style issue in render.c + + glib/demo/render.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3fac919eeb1ca1abfdbb4f9923a454e532256f5c +Author: Andres Gomez +Date: Wed Jan 8 12:25:52 2014 +0200 + + glib-demo: Fix trailing whitespaces in render.c + + glib/demo/render.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 92ea15642a6d3fe65d66d5c59fb6bed54e060e5d +Author: Christian Persch +Date: Fri Jan 3 23:31:56 2014 +0100 + + glib: Install error callback + + Install an error callback so that poppler error messages can be + redirected + to the GLib logging API. + + https://bugs.freedesktop.org/show_bug.cgi?id=73269 + + glib/poppler.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 47 insertions(+) + +commit f99128e38bbff43623d5cd1c1bc27fd789d0bc0c +Author: Carlos Garcia Campos +Date: Sun Jan 19 16:03:35 2014 +0100 + + glib: Make vertices a constructor parameter of line annotations + + It's a required field in the line annotation. + + glib/demo/annots.c | 4 +--- + glib/poppler-annot.cc | 12 ++++++++++-- + glib/poppler-annot.h | 4 +++- + 3 files changed, 14 insertions(+), 6 deletions(-) + +commit 587a40f90e4ac5a1b6ab9044495a1ae403bc8c58 +Author: Carlos Garcia Campos +Date: Sun Jan 19 15:58:43 2014 +0100 + + annots: Fix memory leak when setting AnnotTextMarkup quads twice + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 69e73da1fbab9bf3365b40dced1008b0283ac931 +Author: Germán Poo-Caamaño +Date: Wed Nov 20 11:53:30 2013 -0800 + + glib-demo: Add support for PopplerTextAnnotMarkup + + * The subtypes are: Highlihght, Squiggly, StrikeOut and Underline. + * Use ScrolledWindow for annotation properties to make room to + show the Quadrilaterals of TextMarkup annotations. + + https://bugs.freedesktop.org/show_bug.cgi?id=51487 + + glib/demo/annots.c | 232 + +++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 206 insertions(+), 26 deletions(-) + +commit 9a7699ebe3e644ba845ef75d9295c88d321cb934 +Author: Germán Poo-Caamaño +Date: Mon Nov 18 16:42:08 2013 -0800 + + glib: Add PopplerAnnotTextMarkup class and subtypes + + The subtypes are: Highlihght, Squiggly, StrikeOut and Underline. + It adds convenient methods to set/get/free quadrilaterals + necessaries for TextMarkup annotations. + + https://bugs.freedesktop.org/show_bug.cgi?id=51487 + + glib/poppler-annot.cc | 264 + ++++++++++++++++++++++++++++++++++++ + glib/poppler-annot.h | 23 ++++ + glib/poppler-page.cc | 6 + + glib/poppler-private.h | 1 + + glib/poppler.h | 1 + + glib/reference/poppler-sections.txt | 11 ++ + 6 files changed, 306 insertions(+) + +commit 40040b41216a3dcc833fc224f1c6f15517a88aed +Author: Germán Poo-Caamaño +Date: Mon Nov 18 16:26:27 2013 -0800 + + glib: Add PopplerQuadrilateral boxed type + + https://bugs.freedesktop.org/show_bug.cgi?id=51487 + + glib/poppler-page.cc | 53 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-page.h | 33 +++++++++++++++++++++++ + glib/poppler.h | 1 + + glib/reference/poppler-sections.txt | 6 +++++ + 4 files changed, 93 insertions(+) + +commit c8a845cf7c7752d3b7dad06013d3154812c66c92 +Author: Albert Astals Cid +Date: Tue Jan 14 20:26:59 2014 +0100 + + Do not define -ansi + + We are using long long that is not defined in ansi, so forcing ansi + strictness does + not make any sense. Bug #72499 + + cmake/modules/PopplerMacros.cmake | 5 ----- + configure.ac | 15 --------------- + 2 files changed, 20 deletions(-) + +commit f0c13ee72e8a7df17bdf847f5e922c01acee1f0d +Author: Albert Astals Cid +Date: Mon Jan 6 21:55:07 2014 +0100 + + C for last commit + + poppler/Parser.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1e1b9991a911fb610e74119979b20b179f3f2a67 +Author: Albert Astals Cid +Date: Mon Jan 6 21:51:25 2014 +0100 + + Fix rendering of pdf file from KDE bug 329600 + + It used to work and regressed with large file support (used to work + because stuff just overflowed) + + lexer->getPos needs lexer to be a stream, if it is not, just resort + to the +5000 kludge + + poppler/Parser.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4cd5c349cfbc745688c0c38fc50d364092bc3718 +Author: Albert Astals Cid +Date: Mon Jan 6 21:48:25 2014 +0100 + + Update popplers (C) + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 7ca2f42b06757587dfd9521fb1c6c7d657545553 +Author: Albert Astals Cid +Date: Mon Jan 6 15:48:22 2014 +0100 + + Learn about automake 1.14 + + autogen.sh | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit de9643b6f76774ebe131c4787df82dd213181c71 +Author: Albert Astals Cid +Date: Fri Jan 3 00:53:37 2014 +0100 + + 0.25.1 + + CMakeLists.txt | 2 +- + NEWS | 19 +++++++++++++++++++ + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 5 files changed, 23 insertions(+), 4 deletions(-) + +commit e238c1f83fd5f667336bfbb0e9a59569ff638ecc +Author: Albert Astals Cid +Date: Fri Jan 3 00:29:28 2014 +0100 + + Fix qt5 moc detection fix + + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 381ae2877acace4e8908b07ee5fb442bc19bf814 +Merge: 64100e7f a2f0e4b1 +Author: Albert Astals Cid +Date: Fri Jan 3 00:04:29 2014 +0100 + + Merge remote-tracking branch 'origin/poppler-0.24' + + Conflicts: + CMakeLists.txt + NEWS + configure.ac + cpp/Doxyfile + qt4/src/Doxyfile + qt5/src/Doxyfile + +commit a2f0e4b1fd8b3d9675cc00a561094bd78a63d048 +Author: Albert Astals Cid +Date: Thu Jan 2 23:48:29 2014 +0100 + + 0.24.5 + + CMakeLists.txt | 2 +- + NEWS | 4 ++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 9 insertions(+), 5 deletions(-) + +commit 523b2731e0489bab58e66b21016bd6f010e616ea +Author: Albert Astals Cid +Date: Thu Jan 2 22:54:42 2014 +0100 + + Update copyrights + + poppler/JBIG2Stream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 64100e7f1f6b550e952838fce38615ec3788e17c +Author: Fabio D'Urso +Date: Sat Dec 28 12:11:47 2013 +0100 + + Simplify some calls to GooString::format-family functions + + poppler/Object.h | 4 ++-- + utils/pdftocairo.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 0abde34d0f7ba0fc04a30dbfd78373ec9d9d0695 +Author: Fabio D'Urso +Date: Sat Dec 28 12:11:05 2013 +0100 + + Fixed some GooString format markers + + poppler/CMap.cc | 3 ++- + poppler/Function.cc | 3 ++- + poppler/StructElement.cc | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +commit a7da4c6ac2b13308803806009c3437332b140586 +Author: Fabio D'Urso +Date: Fri Dec 27 17:09:39 2013 +0100 + + GooString format: fixed bug with printing LLONG_MIN + + ( -LLONG_MIN doesn't fit in a signed long long ) + + goo/GooString.cc | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +commit fe88f20cc565b4cf4765fed56c821989148ef454 +Author: Fabio D'Urso +Date: Fri Dec 27 17:08:50 2013 +0100 + + GooString format: Added some tests + improved documentation + + goo/GooString.h | 10 +++++-- + qt4/tests/check_goostring.cpp | 66 + +++++++++++++++++++++++++++++++++++++++++++ + qt5/tests/check_goostring.cpp | 66 + +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 139 insertions(+), 3 deletions(-) + +commit 5234a349adb678d267a3d8ca13176ac8abb7afd2 +Author: Thomas Freitag +Date: Fri Dec 20 20:25:26 2013 +0100 + + pdfunite: do not lose fonts when merging some files + + utils/pdfunite.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 8e24fcc0d296e07327e9cbe297f627bfc6471ee3 +Merge: 85efba38 b02f8731 +Author: Albert Astals Cid +Date: Wed Dec 18 21:51:57 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.24' + + Conflicts: + poppler/GfxState.cc + +commit b02f873174865837fed3a9544b70b8b21747a3dd +Author: Fabio D'Urso +Date: Wed Dec 18 21:46:12 2013 +0100 + + Fixed some GooString format markers + + poppler/GfxState.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 85efba38c02b5daf7d3fc46bc85850e6842a085d +Author: Thomas Freitag +Date: Wed Dec 18 00:46:00 2013 +0100 + + Make pdfunite work even if there's a single file given + + Bug #72720 + + utils/pdfunite.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a766c55f68db38feed91cf003a0d5710e2f925a8 +Author: Tuomas Jormola +Date: Mon Dec 16 20:43:28 2013 +0100 + + Fix detection of moc for Qt5 + + Bug #72744 + + On my Mac OS X 10.9 Mavericks system with Qt 5.2.0 installed using + Homebrew, the output of the moc command doesn't include the string + "Qt 5" which is expected by the moc version detection logic in + configure.ac of poppler 0.24.4. This patch updates the grep pattern so + that the current expected moc version output and the version output of + this installation of Qt5 are both detected as a valid moc for + Qt5. With + this patch applied, I was able to build and test poppler with Qt5 + support successfully. + + (09:26:05)(tj@gauri)(~)$ uname -a + Darwin gauri.ad.local.domain 13.0.0 Darwin Kernel Version 13.0.0: + Thu Sep 19 22:22:27 PDT 2013; root:xnu-2422.1.72~6/RELEASE_X86_64 + x86_64 i386 MacBookPro3,1 Darwin + (09:26:08)(tj@gauri)(~)$ /usr/local/opt/qt5/bin/moc -v + moc 5.2.0 + (09:26:24)(tj@gauri)(~)$ + + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit a43b4bf84fe4bde6649049685bf4ed6a682e8286 +Author: Carlos Garcia Campos +Date: Sun Dec 15 11:59:57 2013 +0100 + + regtest: Add a command line option to create-report command to not + launch the browser + + regtest/HTMLReport.py | 5 +++-- + regtest/commands/create-report.py | 5 ++++- + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit 113958276b96d7f1aab7042e1807a9970425d234 +Author: Carlos Garcia Campos +Date: Sun Dec 15 11:48:51 2013 +0100 + + regtest: Return an exist status code depending on whether the + command succeeded + + regtest/TestRun.py | 2 ++ + regtest/commands/__init__.py | 4 ++-- + regtest/commands/create-refs.py | 2 ++ + regtest/commands/create-report.py | 2 ++ + regtest/commands/find-regression.py | 4 +++- + regtest/commands/run-tests.py | 6 ++++-- + regtest/main.py | 8 ++++---- + regtest/poppler-regtest | 2 +- + 8 files changed, 20 insertions(+), 10 deletions(-) + +commit 44cf2de0df351d5948893f6a4e2bca1168d16b70 +Author: Dominik Haumann +Date: Thu Dec 12 23:12:35 2013 +0100 + + Arthur font rendering improvements + + The patch does does the following: + - use NoPen to fill the glyphs + - since SplashPath seems to bitwise OR stop and start of path, + closing a subpath needs to happen before starting a path. + + Arthur needs serious work but this is a definite improvement in all + the files i've tried it on + + qt4/src/ArthurOutputDev.cc | 18 +++++++++--------- + qt5/src/ArthurOutputDev.cc | 18 +++++++++--------- + 2 files changed, 18 insertions(+), 18 deletions(-) + +commit 02863f683be4543a2af6c26d53be93785d2b836a +Author: Albert Astals Cid +Date: Thu Dec 12 23:09:43 2013 +0100 + + qt: Simple silly test program to save to file + + Allows us to do some quick arthur testing + + qt4/tests/CMakeLists.txt | 1 + + qt4/tests/Makefile.am | 8 ++++- + qt4/tests/test-render-to-file.cpp | 69 + +++++++++++++++++++++++++++++++++++++++ + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/Makefile.am | 8 ++++- + qt5/tests/test-render-to-file.cpp | 69 + +++++++++++++++++++++++++++++++++++++++ + 6 files changed, 154 insertions(+), 2 deletions(-) + +commit 018892d4ceccd5e2994cdb74cd2d401293fc929d +Author: Albert Astals Cid +Date: Wed Dec 11 23:05:53 2013 +0100 + + 0.25.0 + + CMakeLists.txt | 6 +++--- + configure.ac | 4 ++-- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 9 insertions(+), 9 deletions(-) + +commit a1b99b26da9124fa55f773af55ae7382bd911d47 +Author: Albert Astals Cid +Date: Wed Dec 11 23:00:00 2013 +0100 + + NEWS + + NEWS | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +commit 10a0c45676ef56bee5924e889a7e7c21244b4339 +Author: Albert Astals Cid +Date: Tue Dec 10 20:48:36 2013 +0100 + + Update copyrights + + cpp/poppler-image.cpp | 1 + + goo/PNGWriter.cc | 2 +- + poppler/MarkedContentOutputDev.cc | 2 ++ + poppler/MarkedContentOutputDev.h | 2 ++ + poppler/Object.h | 1 + + poppler/PDFDoc.h | 1 + + utils/ImageOutputDev.h | 2 +- + 7 files changed, 9 insertions(+), 2 deletions(-) + +commit 6c0e7d35f273583acc2aa818860e3120b0cab64f +Author: Thomas Freitag +Date: Tue Dec 10 20:14:39 2013 +0100 + + correction for knockout transparency groups + + Fixes test "G" in eci_altona-test-suite-v2_technical2_x4.pdf + + poppler/SplashOutputDev.cc | 18 ++++++++++--- + splash/Splash.cc | 63 + +++++++++++++++++++++++++++++++++------------ + splash/SplashFTFontEngine.h | 3 +++ + splash/SplashFontEngine.cc | 13 ++++++++++ + splash/SplashFontEngine.h | 5 ++++ + 5 files changed, 82 insertions(+), 20 deletions(-) + +commit f77bc21813ae7234ec4ce94ce4e92230fe5c174a +Merge: 06e9dc91 58e04a08 +Author: Albert Astals Cid +Date: Sat Dec 7 16:56:11 2013 +0000 + + Merge remote-tracking branch 'origin/poppler-0.24' + + Conflicts: + utils/pdfimages.cc + utils/pdfinfo.cc + utils/pdfseparate.cc + +commit 06e9dc917650f562cd6f6666190a8c25756514a3 +Author: Albert Astals Cid +Date: Sat Dec 7 16:39:02 2013 +0000 + + Compile++ + + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 58e04a08afee39370283c494ee2e4e392fd3b684 +Author: Fabio D'Urso +Date: Sat Dec 7 16:33:09 2013 +0000 + + segExtraBytes is a goffset not an int so use lld + + Fixes KDE bug #328511 + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3335d5e52fd7527bba7368ad6e87f1188808582f +Author: Carlos Garcia Campos +Date: Fri Dec 6 17:28:13 2013 +0100 + + regtest: Limit the stderr files to ~1MB + + Some tests send a lot of information to stderr, usually due to parsing + errors in buggy documents. More than 1MB of stderr output is + diffcult to + hanlde and in most cases it's redundant with a lot of duplicated + messages. + This patch reduced the size of the refs dir for the complete test + suite + by 1GB. + + regtest/backends/__init__.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 24107ac47625438837d7c29053bff795f986a6bb +Author: Carlos Garcia Campos +Date: Fri Dec 6 13:24:47 2013 +0100 + + regtest: Save checksum results sorted in md5 files + + We are using os.listdir() to get the list of test results that returns + files in arbitrary order. + + regtest/backends/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f1c9993d58fb9d191a7b3e26bfcaf7b5eec5323d +Author: Carlos Garcia Campos +Date: Fri Dec 6 13:03:24 2013 +0100 + + regtest: Show also the tests expected to crash/fail to run but + don't fail + + regtest/TestRun.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 64d1e79c863d12b12b87ed0e3139d364f503e026 +Author: Carlos Garcia Campos +Date: Fri Dec 6 12:51:48 2013 +0100 + + regtest: Improve readability of test results + + Show a summary of tests failed per backend with the percentages and + use a + new line for every test in the result instead of using a comma + separated + line. + + regtest/TestRun.py | 67 + ++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 47 insertions(+), 20 deletions(-) + +commit c35bc1da9402896c88999f9cffed6962a265f32e +Author: Carlos Garcia Campos +Date: Fri Dec 6 10:04:48 2013 +0100 + + glib-demo: Increase the default size of the main window + + Some demos like annots that show a document view use more space than + they used to, requiring to manually resize the window everytime. + + glib/demo/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab7da0bf62bb5032c4683d9cd841075d26045aae +Author: Germán Poo-Caamaño +Date: Mon Oct 28 22:52:22 2013 -0700 + + glib-demo: Add Square and Circle annotations demo + + https://bugs.freedesktop.org/show_bug.cgi?id=70983 + + glib/demo/annots.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit 2ec450567f27bba3ee4a08b5e69b7c9605bea4bb +Author: Germán Poo-Caamaño +Date: Mon Oct 28 22:48:39 2013 -0700 + + glib: Add implementation of Square and Circle annotations + + Square and Circle only differ in the constructor which defines + the subtype. Therefore, it uses the same name than Poppler's + Geometry class. + + https://bugs.freedesktop.org/show_bug.cgi?id=70983 + + glib/poppler-annot.cc | 263 + ++++++++++++++++++++++++++++++++---- + glib/poppler-annot.h | 23 ++++ + glib/poppler-page.cc | 6 + + glib/poppler-private.h | 2 + + glib/poppler.h | 2 + + glib/reference/poppler-sections.txt | 16 +++ + 6 files changed, 286 insertions(+), 26 deletions(-) + +commit e109cf2461d5be93d004593123d875a28fd79b61 +Author: Carlos Garcia Campos +Date: Tue Nov 26 20:12:22 2013 +0100 + + annots: Make Annot::setBorder receive an AnnotBorder object + + Instead of receiving AnnotBorderArray. Also implement writeToObject in + both AnnotBorderArray and AnnotBorderBS to make sure that + Annot::setBorder will work for both cases. + + poppler/Annot.cc | 51 +++++++++++++++++++++++++++++++++++++++++++++------ + poppler/Annot.h | 10 +++++++--- + 2 files changed, 52 insertions(+), 9 deletions(-) + +commit 3979b82982e84107d93fbbe95350bf25ce47398d +Author: Carlos Garcia Campos +Date: Tue Nov 26 14:44:57 2013 +0100 + + annots: Use a default border for annots that can have a BS entry + + According to the spec if neither the Border nor the BS entry is + present, + the border shall be drawn as a solid line with a width of 1 point. + However, acroread seems to ignore the Border entry for annots + that can't + have a BS entry. + + poppler/Annot.cc | 223 + ++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 132 insertions(+), 91 deletions(-) + +commit 36c07c82bdff010695c5d615b67506922522d0e8 +Author: Carlos Garcia Campos +Date: Tue Nov 26 14:07:21 2013 +0100 + + annots: Add helper function Annot::setLineStyleForBorder + + It sets the line dash and width based on the given AnnotBorder. Use it + only when the border width is greater than 0 for FreeText annotations + and always for annotations that use the border to set the line + width and + dash, but don't draw a border. + + poppler/Annot.cc | 110 + ++++++++++++++++--------------------------------------- + poppler/Annot.h | 1 + + 2 files changed, 32 insertions(+), 79 deletions(-) + +commit e7b1ff97318fd6c3a8fed3a33d45f1cb55208b28 +Author: Carlos Garcia Campos +Date: Tue Nov 26 11:40:57 2013 +0100 + + annots: Remove unused typeUnknown AnnotBorderType from AnnotBorder + + Also make the AnnotBorder constructor protected to make sure it's not + possible to create AnnotBorder instances. + + poppler/Annot.cc | 3 --- + poppler/Annot.h | 12 ++++++++---- + 2 files changed, 8 insertions(+), 7 deletions(-) + +commit 17b2623360ed8917e94a8e5b880e92e6db70335e +Author: Adrian Perez de Castro +Date: Tue Jun 18 00:35:51 2013 +0300 + + Tagged-PDF: Text content extraction from structure elements + + Implement StructElement::getText(), by using MCOutputDev. This + output device + captures pieces of text (aka "spans") which have the same attributes + into + a list of TextSpan objects. + + https://bugs.freedesktop.org/show_bug.cgi?id=64815 + + poppler/Makefile.am | 2 + + poppler/MarkedContentOutputDev.cc | 210 + ++++++++++++++++++++++++++++++++++++++ + poppler/MarkedContentOutputDev.h | 128 +++++++++++++++++++++++ + poppler/StructElement.cc | 50 +++++++++ + poppler/StructElement.h | 28 +++++ + 5 files changed, 418 insertions(+) + +commit 2c4320c26744ea28be10eac7cc54980c9eb4fc27 +Author: Carlos Garcia Campos +Date: Tue Dec 3 19:07:09 2013 +0100 + + glib-demo: Show number of charcters and text layout units in text demo + + It helps to easily detect the cases where these values mismatch. + + glib/demo/text.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 98d75dcdb9b73feb6f35d8ad76f5d0c428289f91 +Author: Jason Crain +Date: Sat Nov 30 17:29:50 2013 +0100 + + Limit use of ZapfDingbats character names + + Some PDFs use names from ZapfDingbats (a1-a206) without intending for + them to be used for text extraction. Only use these character names + to locate glyphs or for text extraction with ZapfDingbats fonts. + + Bug #60243 + + goo/GooString.cc | 10 ++ + goo/GooString.h | 4 + + poppler/GfxFont.cc | 15 +- + poppler/GlobalParams.cc | 33 +++- + poppler/GlobalParams.h | 16 +- + poppler/NameToUnicodeTable.h | 415 + ++++++++++++++++++++++--------------------- + 6 files changed, 274 insertions(+), 219 deletions(-) + +commit 817cc333ca8009998f2099583fd0a2fc703f3db3 +Author: Carlos Garcia Campos +Date: Fri Nov 29 10:07:16 2013 +0100 + + regtest: Do not buffer stderr output + + Some buggy documents can produce a huge stderr output because + of parsing + errors or whatever. We could give a file directly to Popen to + write the + stderr file, but we only want to create the file when there's output, + because it's what we use to know whether the command produced + output or + not. So, instead of buffering the whole output and then write it + to the + file, now we read from the pipe while the command is running, writing + the output in chunks to the file. This improves a lot the memory + consumption when running some tests. + + regtest/backends/__init__.py | 40 + ++++++++++++++++++++++++++++++---------- + 1 file changed, 30 insertions(+), 10 deletions(-) + +commit f8f82f1cc3a948239a05d7762210a3f244299db6 +Author: Carlos Garcia Campos +Date: Fri Nov 29 10:03:24 2013 +0100 + + regtest: Read test results in chunks to get the md5 digest + + Some backends can generate huge results, like huge postscript + files that + we don't want to load in memory to get the md5. So, instead of + creating + thr md5 object with the entire file, we feed it with chunks of data + using the update method. This improves a lot the memory consumption + and + performance as well. + + regtest/backends/__init__.py | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +commit 3444a44397a890dbeb1bd10357dbc8246fd21ad0 +Author: Carlos Garcia Campos +Date: Fri Nov 29 10:01:20 2013 +0100 + + regtest: Remove unused method _check_exit_status2 + + It was used when the backends ran in parallel odd and even pages, but + it's no longer used since threads support was added. + + regtest/backends/__init__.py | 20 -------------------- + 1 file changed, 20 deletions(-) + +commit 5f825df417947c51943f1db327e1aa6c3faa15b0 +Author: Carlos Garcia Campos +Date: Fri Nov 29 09:57:57 2013 +0100 + + regtest: Do not store the current line in Printer but only its length + + We are not using the line text anymore, but only the length. + + regtest/Printer.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 1486d93f0f6418b37ccc57568717d9349a79935b +Author: Carlos Garcia Campos +Date: Wed Nov 27 18:29:36 2013 +0100 + + regtest: Do not consider docs with no refs as skipped + + Handle them differently as new docs, and show them in the summary + suggesting to use create-refs command to include them in the test + suite. + + regtest/TestRun.py | 40 +++++++++++++++++++++++----------------- + 1 file changed, 23 insertions(+), 17 deletions(-) + +commit 5241c0cc730c380dc44c3a081e1de675e1915861 +Author: Carlos Garcia Campos +Date: Wed Nov 27 17:18:37 2013 +0100 + + regtest: Use number of tests run to show the progress + + Instead of using the number of document tested. We don't really + need to + set a number to a particular document, we only want to know the + progress + of the whole process. This ensures that the progress is shown in the + correct order. It also simplifies the code a bit. + Also improved the output formatting to make it easier to read. + + regtest/Printer.py | 44 ++++----------- + regtest/TestReferences.py | 50 +++++++++++------ + regtest/TestRun.py | 136 + +++++++++++++++++++++++++--------------------- + 3 files changed, 118 insertions(+), 112 deletions(-) + +commit 0af3e009a702d0c6ca716565ab87b386baa0a1ed +Author: Albert Astals Cid +Date: Wed Nov 27 00:53:16 2013 +0100 + + 0.24.4 + + CMakeLists.txt | 4 ++-- + NEWS | 18 ++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 25 insertions(+), 7 deletions(-) + +commit a42a13be0a0cda71dc230a73f7b16eb4eb066251 +Author: suzuki toshiya +Date: Wed Nov 27 00:05:57 2013 +0100 + + Warn the user if he provides a wrong range + + utils/pdffonts.cc | 7 +++++++ + utils/pdfimages.cc | 7 +++++++ + utils/pdfinfo.cc | 7 +++++++ + utils/pdfseparate.cc | 7 +++++++ + utils/pdftocairo.cc | 7 +++++++ + utils/pdftohtml.cc | 8 +++++++- + utils/pdftoppm.cc | 7 +++++++ + utils/pdftops.cc | 7 +++++++ + utils/pdftotext.cc | 6 ++++++ + 9 files changed, 62 insertions(+), 1 deletion(-) + +commit 45552cafaeef6b883078db269437586add1dc32c +Author: Albert Astals Cid +Date: Tue Nov 26 23:36:12 2013 +0100 + + Update copyrights + + utils/pdftotext.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f20fe89d4f5a8f768e2019f25cecf40cd0e4f5f8 +Author: Carlos Garcia Campos +Date: Mon Nov 25 09:05:41 2013 +0100 + + glib-demo: Add an area selector to text demo + + And use the for_area variants of the API to get the text, text layout + and text attributes. + + glib/demo/text.c | 114 + +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 110 insertions(+), 4 deletions(-) + +commit bb2b7fb491fb72f0ea024d80df89680ede3457b4 +Author: Carlos Garcia Campos +Date: Mon Nov 25 09:04:30 2013 +0100 + + glib: Add API to get text, text layout and text attributes for a + given area + + glib/poppler-page.cc | 107 + ++++++++++++++++++++++++++++++++++-- + glib/poppler-page.h | 8 +++ + glib/reference/poppler-sections.txt | 3 + + 3 files changed, 113 insertions(+), 5 deletions(-) + +commit f662973b0da52da84acc3668a0e037ee72498193 +Author: Carlos Garcia Campos +Date: Sat Nov 2 14:07:07 2013 +0100 + + TextOutputDev: Honor the selection rectangle passed to + TextPage::getSelectionWords() + + Make TextPage::getSelectionWords() return a list of TextWordSelection + instead of a list of TextWord so that it's possible to know which + characters of the word are inside the given selection rectangle. + Adapt the glib frontend to the new API and use the selection bounds + instead of the whole word to build the list of characters in + poppler_page_get_text_layout() and poppler_page_get_text_attributes(), + which ensures the number of glyphs returned is in sync with the number + of characters returned by poppler_page_get_text(). + + https://bugs.freedesktop.org/show_bug.cgi?id=71160 + + glib/poppler-page.cc | 22 ++++++++++++++-------- + poppler/TextOutputDev.cc | 40 ++++++++-------------------------------- + poppler/TextOutputDev.h | 20 ++++++++++++++++++++ + 3 files changed, 42 insertions(+), 40 deletions(-) + +commit 18fab454c59b1c77c691617aaef99245eacd83b5 +Author: Germán Poo-Caamaño +Date: Mon Oct 28 22:41:41 2013 -0700 + + glib-demo: Simplify annotations list and its properties + + * Move the annotation's rectangle to properties to make the + list view of annotations cleaner. + * Remove duplicated information: flags and page are already + present in the UI. + + https://bugs.freedesktop.org/show_bug.cgi?id=70982 + + glib/demo/annots.c | 70 + ++++++++++++------------------------------------------ + 1 file changed, 15 insertions(+), 55 deletions(-) + +commit 770a7ac9833a3c4f4f0399093272d4d0bdc7923b +Merge: e7a0f2b9 9ae29c7a +Author: Albert Astals Cid +Date: Thu Nov 21 23:58:29 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit 9ae29c7a07d0f372dbfc4aca17bbb646126aedb5 +Author: Thomas Freitag +Date: Thu Nov 21 23:53:53 2013 +0100 + + Don't end loop if reading from GooFile fails + + Bug #71835 + + poppler/Stream.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit e7a0f2b942fe621304275175324f7809d1c83d80 +Author: Hib Eris +Date: Wed Nov 20 00:43:27 2013 +0100 + + Fix warning on signed/unsigned comparison in GfxState.cc + + Bug #71641 + + poppler/GfxState.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c784c4c3a582aaa4e10c223665cb876e12b7c16f +Author: Germán Poo-Caamaño +Date: Mon Nov 18 00:57:53 2013 -0800 + + glib-demo: Add support for simple line annotations + + https://bugs.freedesktop.org/show_bug.cgi?id=70981 + + glib/demo/annots.c | 99 + +++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 91 insertions(+), 8 deletions(-) + +commit 2d164e06b8a84ade6689d85bba2d606c66bf62a9 +Author: Germán Poo-Caamaño +Date: Mon Nov 18 00:48:13 2013 -0800 + + glib-demo: add color selection for new annotations + + https://bugs.freedesktop.org/show_bug.cgi?id=71727 + + glib/demo/annots.c | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +commit 7127a2c705787f6f44b0852efeabe9fdeae7e2c0 +Author: Germán Poo-Caamaño +Date: Sun Nov 17 23:38:32 2013 -0800 + + glib: Add support for simple line annotations + + https://bugs.freedesktop.org/show_bug.cgi?id=70981 + + glib/poppler-annot.cc | 79 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-annot.h | 12 ++++++ + glib/poppler-page.cc | 3 ++ + glib/poppler-private.h | 1 + + glib/poppler.h | 1 + + glib/reference/poppler-sections.txt | 7 ++++ + 6 files changed, 103 insertions(+) + +commit 451bac9f05bab18f3aa0392ddf6eb6b569004cb8 +Author: Germán Poo-Caamaño +Date: Sun Nov 17 23:30:14 2013 -0800 + + glib: Add PopplerPoint boxed type + + https://bugs.freedesktop.org/show_bug.cgi?id=70981 + + glib/poppler-page.cc | 54 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-page.h | 20 ++++++++++++++ + glib/poppler.h | 1 + + glib/reference/poppler-sections.txt | 5 ++++ + 4 files changed, 80 insertions(+) + +commit c01cee165392ba8297e4168111a66d2acb272a99 +Merge: 07c25548 47605a8a +Author: Albert Astals Cid +Date: Mon Nov 18 22:58:28 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.24' + + Conflicts: + poppler/Catalog.cc + poppler/Catalog.h + +commit 47605a8aaf85bee21601219b04c0c8e6cf982507 +Author: José Aliste +Date: Mon Nov 18 22:52:08 2013 +0100 + + Catalog: sort entries of NameTrees to make sure lookup works + + Bug #26049 + + poppler/Catalog.cc | 12 ++++++++++++ + poppler/Catalog.h | 2 ++ + 2 files changed, 14 insertions(+) + +commit 07c255482f7ec8a8cfd4eaeaf7b07de317bbcc7a +Author: Germán Poo-Caamaño +Date: Sun Oct 27 13:30:22 2013 -0700 + + glib-demo: Add annotations interactively + + * Prepare UI to add multiple annotations type. + * Remove dialog and button add annotations. + + https://bugs.freedesktop.org/show_bug.cgi?id=69978 + + glib/demo/annots.c | 348 + ++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 213 insertions(+), 135 deletions(-) + +commit 4b7c91ea697359751f9abe9ec5e63021c90a60ed +Author: Germán Poo-Caamaño +Date: Sat Sep 28 23:18:07 2013 -0700 + + glib: Add getter and setter for annotation's rectangle + + Annotation objects contain at least two keys, Rect and Subtype. + The former has the coordinates where the annotation is placed. + The getter and setter allows to obtain and modify the position + of a given annotation. + + https://bugs.freedesktop.org/show_bug.cgi?id=70901 + + glib/poppler-annot.cc | 48 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-annot.h | 4 ++++ + glib/reference/poppler-sections.txt | 2 ++ + 3 files changed, 54 insertions(+) + +commit 491f0a170c72271a7a9ce049fbcfe81f08cff162 +Author: suzuki toshiya +Date: Fri Nov 15 20:35:12 2013 +0100 + + pdftotext: Escape the text of the xml headers + + utils/pdftotext.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 4da94680d4d2d6b1bd3351d476a20f9c7ae565bc +Merge: 3ea3d7c6 78c407ac +Author: Albert Astals Cid +Date: Fri Nov 15 20:27:00 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit 3ea3d7c6c7a0ede76428204ec11aec3a844117fc +Author: Hib Eris +Date: Fri Nov 15 19:59:52 2013 +0100 + + pdftotext: Silence warning for may be used uninitialized variable + + Bug #71640 + + utils/pdftotext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 97910b9eb92df49757915bde02e0d54de04552d4 +Author: Hib Eris +Date: Fri Nov 15 19:55:19 2013 +0100 + + Do not close stdout in pdftotext + + Bug #71639 + + utils/pdftotext.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 78c407ac7e8f48ae2d2c75ad0f5960390190d2e3 +Author: Albert Astals Cid +Date: Fri Nov 15 20:25:52 2013 +0100 + + destionation -> destination + + And this is why the xml based api has to die + + Bug #71643 + Found by Hib + + qt4/src/poppler-annotation.cc | 5 +++-- + qt5/src/poppler-annotation.cc | 3 ++- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit a23c9ad4c0536d680bedc563444ce3adf6e1ee9e +Author: Hib Eris +Date: Fri Nov 15 11:38:45 2013 +0100 + + Silence warning for may be used uninitialized variable in + ImageOutputDec.cc + + Fixes warning: + + CXX ImageOutputDev.lo + ImageOutputDev.cc: In member function 'void + ImageOutputDev::writeImageFile(ImgWriter*, + ImageOutputDev::ImageFormat, const char*, Stream*, int, int, + GfxImageColorMap*)': + ImageOutputDev.cc:409:28: warning: 'imgStr' may be used uninitialized + in this function [-Wmaybe-uninitialized] + + Bug #71642 + + utils/ImageOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c43a80e65fc570a8017892ba111a8c48ac33d9ad +Author: Hib Eris +Date: Fri Nov 15 19:59:52 2013 +0100 + + pdftotext: Silence warning for may be used uninitialized variable + + Bug #71640 + + utils/pdftotext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f905d804c0d1c715d8423938f41b5a002c0ef15d +Author: Hib Eris +Date: Fri Nov 15 19:55:19 2013 +0100 + + Do not close stdout in pdftotext + + Bug #71639 + + utils/pdftotext.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 33e703ac9bb6cf69664d6c6fddd3bebd56336074 +Merge: 8294d18e 7c74bccd +Author: Albert Astals Cid +Date: Fri Nov 15 19:50:10 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit 7c74bccdf514cce05987dde7fb1cce4ac65ff025 +Author: Albert Astals Cid +Date: Fri Nov 15 19:48:07 2013 +0100 + + Forgot to update the copyrights + + poppler/Lexer.cc | 2 +- + poppler/Lexer.h | 2 +- + poppler/Parser.cc | 2 +- + poppler/Parser.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit ebe49d597a62aa94601c2e4595dbad1895ea7ef0 +Author: Albert Astals Cid +Date: Fri Nov 15 19:33:00 2013 +0100 + + Fix regression in broken endstream detection + + Rregression was caused by e1ffa9100cf6b4a444be7ed76b11698a5c5bb441 + Fixes bug #70854 + + poppler/Lexer.cc | 4 ++-- + poppler/Lexer.h | 2 +- + poppler/Parser.cc | 11 ++++------- + poppler/Parser.h | 2 +- + 4 files changed, 8 insertions(+), 11 deletions(-) + +commit 8294d18ea96bd18be076bccbdbdaa015fc48aa12 +Author: Adrian Perez de Castro +Date: Thu Sep 26 20:46:34 2013 +0300 + + Tagged-PDF: Parsing of StructElem standard types and attributes + + Parse attributes and standard types of StructElem nodes of the + document structure tree. Type name aliases are resolved via the + RoleMap (and cycles detected). Both standard attributes and user + properties are mapped to instances of the Attribute class. + Attributes are parsed both via ClassMap references and directly + referenced from the StructElem objects. + + https://bugs.freedesktop.org/show_bug.cgi?id=64815 + + poppler/StructElement.cc | 1018 + +++++++++++++++++++++++++++++++++++++++++++++- + poppler/StructElement.h | 113 ++++- + 2 files changed, 1126 insertions(+), 5 deletions(-) + +commit 4e0cbd37b964107c0fb531d48876a33ae843bf27 +Author: suzuki toshiya +Date: Mon Nov 11 22:46:07 2013 +0100 + + pdftohtml: Add -? and --help + + utils/pdftohtml.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 4dbd36f5b35dd0964e59d942242aecdc6b474c89 +Author: Andres Gomez +Date: Tue Nov 5 09:52:23 2013 +0200 + + glib-demo: Fix conding style issue in main.c + + https://bugs.freedesktop.org/show_bug.cgi?id=71245 + + glib/demo/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 02f3c235eaf60350c98e88dbe266378fccef59d7 +Author: Andres Gomez +Date: Tue Nov 5 09:52:23 2013 +0200 + + glib-demo: Fix a typo in function name + + https://bugs.freedesktop.org/show_bug.cgi?id=71245 + + glib/demo/main.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5620b82e69335b7f12d877a24f1a463604f0e515 +Author: Andres Gomez +Date: Tue Nov 5 09:52:23 2013 +0200 + + glib-demo: Fix trailing whitespaces in main.c + + https://bugs.freedesktop.org/show_bug.cgi?id=71245 + + glib/demo/main.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 43309d92d327b4ae8e89edb15482247045d726a4 +Author: Germán Poo-Caamaño +Date: Sat Sep 28 20:45:32 2013 -0700 + + glib-demo: Make the Remove annotation button prominent in demo + + Move out from Annotation properties to the top. This make better + use of the space. + Make the remove button active only if there is an annotation + selected. + + https://bugs.freedesktop.org/show_bug.cgi?id=69978 + + glib/demo/annots.c | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +commit f4a72fd3c61091d6b455af9a881c2390da19b506 +Author: Albert Astals Cid +Date: Sat Oct 26 19:06:34 2013 +0200 + + 0.24.3 + + CMakeLists.txt | 2 +- + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 19 insertions(+), 5 deletions(-) + +commit 33a5af32cd5769cf1b6c6344077ac4a3f407ba21 +Author: Albert Astals Cid +Date: Sat Oct 26 18:48:50 2013 +0200 + + Update copyrights + + qt4/src/poppler-document.cc | 2 +- + utils/pdfseparate.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9f09b9596f1fc52481914019d68c8f9b85b5c438 +Merge: bd893d4a 61f79b84 +Author: Albert Astals Cid +Date: Thu Oct 24 01:03:02 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit 61f79b8447c3ac8ab5a26e79e0c28053ffdccf75 +Author: Albert Astals Cid +Date: Thu Oct 24 00:54:56 2013 +0200 + + Allow only one %d in the filename + + Fixes crashes if you had %s and similar in the filename + + Inspired from patch by Pedro Ribeiro + + Bug #69434 + + utils/pdfseparate.cc | 31 ++++++++++++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) + +commit bd893d4a543a6cc3a525655f37def38440944f28 +Merge: 93e8b05f daa0990a +Author: Albert Astals Cid +Date: Thu Oct 10 02:19:34 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit daa0990a7baf17d00d12574a4de815e070727a86 +Author: Albert Astals Cid +Date: Thu Oct 10 02:16:25 2013 +0200 + + Return empty if getXRef()->copy() fails + + Seems this can happen by looking at the backtrace in + https://bugs.kde.org/show_bug.cgi?id=325810 + + qt4/src/poppler-document.cc | 6 ++++++ + qt5/src/poppler-document.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +commit f4bfa940aa40a82a1080cdaf765da1d1615ccfb1 +Author: Carlos Garcia Campos +Date: Sat Oct 5 11:20:04 2013 +0200 + + cairo: Do not set an invalid matrix in drawImage() + + https://bugs.freedesktop.org/show_bug.cgi?id=70085 + + poppler/CairoOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 93e8b05fb2a6d225f048db6a3a735717433a5a13 +Author: Carlos Garcia Campos +Date: Sat Oct 5 11:20:04 2013 +0200 + + cairo: Do not set an invalid matrix in drawImage() + + https://bugs.freedesktop.org/show_bug.cgi?id=70085 + + poppler/CairoOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3084f8f4a5ad55937094b14e30169dccf1fa4ec9 +Author: Germán Poo-Caamaño +Date: Sat Sep 21 11:59:32 2013 -0700 + + glib-demo: Expand short names for annotations used in demo + + https://bugs.freedesktop.org/show_bug.cgi?id=69978 + + glib/demo/annots.c | 10 +++++----- + glib/demo/main.c | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit ff674f57a3587142165fd56aec089d9840ceda36 +Author: Germán Poo-Caamaño +Date: Fri Sep 27 22:33:42 2013 -0700 + + glib-demo: Merge columns Type and Color in annotations demo + + Reduce the space used by both columns, makes the color + pixbuf smaller enough to give a clue of the annotation + color. + + https://bugs.freedesktop.org/show_bug.cgi?id=69978 + + glib/demo/annots.c | 28 ++++++++++++++++------------ + 1 file changed, 16 insertions(+), 12 deletions(-) + +commit 76d6e2d385e2cbad7f44bc8aee05147efd3970a4 +Author: Germán Poo-Caamaño +Date: Fri Sep 20 23:27:20 2013 -0700 + + glib-demo: Rearrange layout for annotations in demo + + Add render area to visualize the annotations per page. + + https://bugs.freedesktop.org/show_bug.cgi?id=69978 + + glib/demo/annots.c | 130 + ++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 118 insertions(+), 12 deletions(-) + +commit a6b1fc1a2ca83b3e4c52bcaa95b99d0289354f4b +Author: Germán Poo-Caamaño +Date: Sun Sep 29 22:50:42 2013 -0700 + + glib-demo: Fix rectangle calculation for new annotations in demo + + https://bugs.freedesktop.org/show_bug.cgi?id=69978 + + glib/demo/annots.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bd49b3c0c6f2adccc5bda561edbaf9f00ed2917a +Author: Thomas Freitag +Date: Wed Oct 2 23:32:09 2013 +0200 + + Use icc profile in OutputIntents + + Bug #34053 + + poppler/Gfx.cc | 114 +++++++++++--- + poppler/Gfx.h | 8 +- + poppler/GfxState.cc | 429 + +++++++++++++++++++++++++++++++++++++++++----------- + poppler/GfxState.h | 72 ++++++--- + poppler/Page.cc | 2 +- + 5 files changed, 490 insertions(+), 135 deletions(-) + +commit df947a0641082f530200880d46e20cd3e1fd962f +Author: Albert Astals Cid +Date: Wed Oct 2 20:53:32 2013 +0200 + + Compile++ + + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +commit fa83d7e4f36cfc11c7b4f81f5f5e8ed69eb6dbbe +Author: Daniel Kahn Gillmor +Date: Wed Oct 2 20:35:58 2013 +0200 + + pdfseparate: allow zero-padded pagespecs + + Bug #50914 + + utils/pdfseparate.cc | 22 +++++++++++++++++++--- + 1 file changed, 19 insertions(+), 3 deletions(-) + +commit e04cabd878a0fd84faa5178f423fd828d010b664 +Author: Adrian Perez de Castro +Date: Mon Jun 17 17:00:27 2013 +0300 + + Tagged-PDF: Implement parsing of StructTreeRoot + + Implement parsing of the StructTreeRoot entry of the Catalog. Also, + the + Catalog::getStructTreeRoot() and PDFDoc::getStructTreeRoot() + methods are + modified to return an instance of StructTreeRoot instead of an Object. + + All elements from the StructTreeRoot are parsed except for: + + - IDTree: it is a lookup tree to locate items by their ID, which would + be barely useful because the whole structure tree is to be kept in + memory, which should be fast enough to traverse. + - ParentTreeNextKey: This is needed only when the ParentTree object is + to be modified. For the moment the implementation deals only with + reading, so this has been deliberately left out. + + StructElem tree nodes from the document structure tree are parsed as a + StructElement instance. Attributes and extraction of content out from + elements are not yet handled. + + https://bugs.freedesktop.org/show_bug.cgi?id=64815 + + poppler/Catalog.cc | 36 +++--- + poppler/Catalog.h | 5 +- + poppler/Makefile.am | 4 + + poppler/PDFDoc.h | 3 +- + poppler/StructElement.cc | 322 + ++++++++++++++++++++++++++++++++++++++++++++++ + poppler/StructElement.h | 167 ++++++++++++++++++++++++ + poppler/StructTreeRoot.cc | 174 +++++++++++++++++++++++++ + poppler/StructTreeRoot.h | 83 ++++++++++++ + 8 files changed, 776 insertions(+), 18 deletions(-) + +commit 45e0fe56985f34e695c99a2f6ec1ffe14e239b9e +Author: Adrian Perez de Castro +Date: Thu Sep 26 20:56:52 2013 +0300 + + Implement Object::takeString() method + + Object::takeString() behaves like Object::getString(), but transfers + ownership of the returned string to the caller. Also, it makes + sure that + calling Object::free() afterwards won't free the string that the + Object + is holding. + + poppler/Object.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit d80eb4a34c218de34633ee2f1b9dfd65504a0ad9 +Author: Thomas Freitag +Date: Tue Oct 1 22:57:55 2013 +0200 + + cache cms values in getGray(), getRGB() and getCMYK() + + Bug #68420 + + poppler/GfxState.cc | 111 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/GfxState.h | 2 + + 2 files changed, 113 insertions(+) + +commit 9bc8f3240698d5a8ae4c0129e768840664d28c22 +Merge: a2742c8f e2fe8513 +Author: Albert Astals Cid +Date: Tue Oct 1 19:19:32 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit e2fe85137ecb59eb0d177682c552febc64cda643 +Author: Adrian Johnson +Date: Tue Oct 1 19:15:08 2013 +0200 + + Fix PFB font embedding + + Bug #69717 + + poppler/PSOutputDev.cc | 52 + ++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 46 insertions(+), 6 deletions(-) + +commit a2742c8fce0594ccbdb036dd0c29c6e15d2229f3 +Merge: 6b30a521 06dabe1e +Author: Albert Astals Cid +Date: Mon Sep 30 19:32:41 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit 06dabe1eed912e5f5c96fe9f371ab459516e5a99 +Author: Albert Astals Cid +Date: Fri Sep 27 12:41:23 2013 +0200 + + 0.24.2 + + CMakeLists.txt | 2 +- + NEWS | 8 ++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 13 insertions(+), 5 deletions(-) + +commit 78141da189c42a04b6a303767284de755a4a2d4d +Author: Albert Astals Cid +Date: Fri Sep 27 12:39:00 2013 +0200 + + Update copyrights + + utils/pdfseparate.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 6b30a5214e39993025cf2fb9f221e1360de7fa9c +Merge: 4966b6f4 dc344b41 +Author: Albert Astals Cid +Date: Sat Sep 21 10:38:45 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit dc344b410f49410174ee902b7649ebd8c2cb0fa2 +Author: Lu Wang +Date: Sat Sep 21 10:37:30 2013 +0200 + + pdftocairo: check file opening failure in beginDocument() + + utils/pdftocairo.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 4966b6f4193cc9d13f63e92bdc2aac0c8b78298d +Merge: 0f074b16 1e612d33 +Author: Albert Astals Cid +Date: Sat Sep 21 10:15:28 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit 1e612d331b79dabec66ad241d7ffe66674a10bc4 +Author: Thomas Freitag +Date: Sat Sep 21 10:10:16 2013 +0200 + + Windows: Fix CreateFile fails with ERROR_SHARING_VIOLATION + + Bug #69597 + + goo/gfile.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 0f074b16317d874fe58d7042f8434282786ca757 +Merge: d2774325 b8682d86 +Author: Pino Toscano +Date: Mon Sep 16 19:53:10 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + + Conflicts: + utils/pdfimages.1 + +commit b8682d868ddf7f741e93b791588af0932893f95c +Author: Pino Toscano +Date: Mon Sep 16 19:46:55 2013 +0200 + + pdfseparate: improve the path building + + Make use of snprintf to limit the output to the pathName buffer; + while I'm there, expand its size to 4096 (might help longer paths), + although a better fix would be dynamically allocate its length + (and/or using GooString, maybe). + + utils/pdfseparate.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d2774325f5248018977d3ab8f8dd7155ed972668 +Author: Adrian Johnson +Date: Sat Sep 14 14:08:11 2013 +0930 + + pdfimages.1: fix typo + + utils/pdfimages.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9b5957278c7f249fa1010e61a0ed79f0eb20e26d +Author: Adrian Johnson +Date: Sat Aug 31 17:33:25 2013 +0930 + + pdfimages: ensure dump* variables are intialized + + utils/ImageOutputDev.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit e116ef32504b589001814f0f579309ecf7ec89d9 +Author: Adrian Johnson +Date: Wed Aug 28 08:05:23 2013 +0930 + + Make cpp/poppler-image.cc use goo/NetPBMWriter + + cpp/CMakeLists.txt | 1 - + cpp/Makefile.am | 2 - + cpp/PNMWriter.cc | 119 + -------------------------------------------------- + cpp/PNMWriter.h | 43 ------------------ + cpp/poppler-image.cpp | 14 +++--- + 5 files changed, 6 insertions(+), 173 deletions(-) + +commit a87a11ee6bbd0f5707a3ac34ac2b9cc79f4e92d0 +Author: Adrian Johnson +Date: Thu Aug 29 22:42:34 2013 +0930 + + pdfimages: support cmyk tiff output + + If -tiff is specified, CMYK images will be written as CMYK TIFF files + instead of converting to RGB. If both -png and -tiff are specified (as + is the case with the -all option), CMYK images are written as TIFF and + all other types as PNG. + + utils/ImageOutputDev.cc | 32 +++++++++++++++++++++++++++++++- + utils/ImageOutputDev.h | 3 ++- + utils/pdfimages.1 | 13 ++++++++----- + utils/pdfimages.cc | 3 ++- + 4 files changed, 43 insertions(+), 8 deletions(-) + +commit 63da26f8fb0b2b5ffaa127762d4e36d995c482ee +Author: Thomas Freitag +Date: Tue Aug 27 20:40:29 2013 +0200 + + resolve copy&paste error + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 563da2d375c003478d398897796ecbf45ce03482 +Author: Albert Astals Cid +Date: Mon Aug 26 22:33:10 2013 +0200 + + 0.24.1 + + CMakeLists.txt | 2 +- + NEWS | 23 +++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 6 files changed, 28 insertions(+), 5 deletions(-) + +commit 2c73f1ea9116172692d8350cb7adf1b5376f795c +Author: Albert Astals Cid +Date: Mon Aug 26 21:50:51 2013 +0200 + + Fix typo + + qt5/src/poppler-qt5.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f58e9b64d5cf62906876c5c0f8da0f3c2c6c2bac +Author: Albert Astals Cid +Date: Mon Aug 26 00:27:59 2013 +0200 + + Some more files Adrian has changed + + goo/PNGWriter.h | 2 +- + utils/HtmlOutputDev.cc | 2 +- + utils/pdftocairo.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 16da389c61c495111a5a49f62539a423a0655c28 +Author: Adrian Johnson +Date: Mon Aug 26 07:50:51 2013 +0930 + + fix typo in pdfimages.1 + + utils/pdfimages.1 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 56c0d4f3a231dca141c06493b50ab25959b5b15c +Author: Adrian Johnson +Date: Mon Aug 26 07:47:46 2013 +0930 + + fix typo in pdfimages.1 + + utils/pdfimages.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit af4f2b775946815b572622bf4c4d42ad3aea1141 +Author: Adrian Johnson +Date: Sat Aug 24 21:25:51 2013 +0930 + + pdfimages: Add -all option to write all image in their native format + + utils/pdfimages.1 | 4 ++++ + utils/pdfimages.cc | 23 +++++++++++++++++------ + 2 files changed, 21 insertions(+), 6 deletions(-) + +commit 25e96b6ddbbe54a75ddb97d2e235c1bd6033fe79 +Author: Adrian Johnson +Date: Wed Aug 21 22:22:28 2013 +0930 + + pdfimages: support ccitt output + + poppler/Stream.h | 5 +++++ + utils/ImageOutputDev.cc | 35 +++++++++++++++++++++++++++++++++++ + utils/ImageOutputDev.h | 4 ++++ + utils/pdfimages.1 | 39 ++++++++++++++++++++++++++++++++++++++- + utils/pdfimages.cc | 4 ++++ + 5 files changed, 86 insertions(+), 1 deletion(-) + +commit 086413263cb63a24d9492fbe534fdcc34b45951a +Author: Adrian Johnson +Date: Sun Aug 18 20:37:01 2013 +0930 + + pdfimages: support JBIG2 output + + poppler/JBIG2Stream.h | 1 + + utils/ImageOutputDev.cc | 25 +++++++++++++++++++++++++ + utils/ImageOutputDev.h | 4 ++++ + utils/pdfimages.1 | 13 ++++++++----- + utils/pdfimages.cc | 4 ++++ + 5 files changed, 42 insertions(+), 5 deletions(-) + +commit 2845ebabd00a2755549b8db436e78a3e0e0c0713 +Author: Adrian Johnson +Date: Sun Aug 18 20:07:31 2013 +0930 + + pdfimages: add support for writing JPEG2000 files + + utils/ImageOutputDev.cc | 4 ++++ + utils/ImageOutputDev.h | 4 ++++ + utils/pdfimages.1 | 12 ++++++++---- + utils/pdfimages.cc | 4 ++++ + 4 files changed, 20 insertions(+), 4 deletions(-) + +commit 2021c8ffcb36432049c4305e85ced2ae139086f3 +Author: Adrian Johnson +Date: Sun Aug 18 17:29:00 2013 +0930 + + pdfimages: add support for png and tiff output + + utils/ImageOutputDev.cc | 67 + ++++++++++++++++++++++++++++++++++++++++++++++--- + utils/ImageOutputDev.h | 17 +++++++++++-- + utils/pdfimages.1 | 22 ++++++++++------ + utils/pdfimages.cc | 19 +++++++++++--- + 4 files changed, 110 insertions(+), 15 deletions(-) + +commit 8f466775c77b09a7114c688004317e6db05bcd3f +Author: Adrian Johnson +Date: Sun Aug 18 16:08:02 2013 +0930 + + Change PNGWriter monochrome format to be 8 pixels/byte + + to be consistent with TiffWriter and NetPBMWriter + + goo/PNGWriter.cc | 4 ---- + goo/PNGWriter.h | 2 +- + utils/HtmlOutputDev.cc | 31 +++++++++++++++++++------------ + utils/ImageOutputDev.cc | 9 ++++++--- + utils/pdftocairo.cc | 2 +- + 5 files changed, 27 insertions(+), 21 deletions(-) + +commit e53aec2c61ba42cf0635dc05f8e27e3503c1eaac +Author: Adrian Johnson +Date: Sun Aug 18 15:50:39 2013 +0930 + + Refactor ImageOutputDev to facilitate adding more output formats + + - Move PPM/PBM code into a NetPBMWriter class so PNGWriter and + TiffWritersupport be added. + + - Create generic WriteRawIMage function for writing jpeg files so + support for jpeg2000/jbig2 can be added. + + CMakeLists.txt | 1 + + goo/Makefile.am | 2 + + goo/NetPBMWriter.cc | 84 ++++++++++++++++ + goo/NetPBMWriter.h | 52 ++++++++++ + utils/ImageOutputDev.cc | 261 + +++++++++++++++++++++--------------------------- + utils/ImageOutputDev.h | 15 +-- + 6 files changed, 262 insertions(+), 153 deletions(-) + +commit 0ca0fcc9f536a57365048914cd8a8cc3eb5ed4fd +Author: Adrian Johnson +Date: Sat Aug 17 15:24:43 2013 +0930 + + pdfimages: fix bug in -list output + + Images of type /ImageMask should have type 'stencil'. + + utils/ImageOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f8ee5a931c795013d17f73f083b6e6f9a683d061 +Author: Adrian Johnson +Date: Sat Aug 17 15:17:11 2013 +0930 + + pdfimages: print size, ratio, and ppi + + utils/ImageOutputDev.cc | 100 + ++++++++++++++++++++++++++++++++++++++++++++---- + utils/pdfimages.1 | 12 ++++++ + utils/pdfimages.cc | 2 +- + 3 files changed, 106 insertions(+), 8 deletions(-) + +commit b5321c4f40fb56b10f75c14c5c955c5775cf2ef9 +Author: Thomas Freitag +Date: Sun Aug 25 20:13:12 2013 +0200 + + use getCMYK/DeviceNLine in CMYK mode if available + + Second part of bug 66928 + + poppler/GfxState.cc | 310 + ++++++++++++++++++++++++++++++++++++++++++++- + poppler/GfxState.h | 32 ++++- + poppler/SplashOutputDev.cc | 28 ++-- + splash/SplashTypes.h | 2 - + 4 files changed, 355 insertions(+), 17 deletions(-) + +commit d006ac567e59e82c4c6cb42c5e429a4aa516ac0b +Merge: d391af7e ed3585ef +Author: Albert Astals Cid +Date: Sun Aug 25 19:36:33 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit ed3585efc8b259cb065eac361a6a499f9f26851f +Author: William Bader +Date: Sun Aug 25 19:31:11 2013 +0200 + + Fix pdftops -eps -level1sep rendering of a file + + Since 8fb243bf11a979af8bfa36427436940706c9f71d we have + case splashModeXBGR8: + + cSrcNonIso[3] = 255; + and that means splashModeDeviceN8 and splashModeCMYK8 can't + skip their breaks anymore otherwise the cSrcNonIso[3] gets + overwritten + + Bug #68321 + + splash/Splash.cc | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit d391af7ea63c4bc884bb81895aea0cdd8f8b282a +Author: Albert Astals Cid +Date: Sat Aug 24 14:03:49 2013 +0200 + + Update copyrights + + poppler/Annot.cc | 1 + + poppler/Annot.h | 1 + + poppler/Catalog.cc | 2 ++ + poppler/Catalog.h | 2 ++ + poppler/Form.cc | 2 +- + poppler/Form.h | 1 + + poppler/Page.cc | 1 + + poppler/Page.h | 1 + + utils/pdfinfo.cc | 1 + + 9 files changed, 11 insertions(+), 1 deletion(-) + +commit a47b7f853174d6101f2b882a2db1a7dc95b33293 +Author: Adrian Johnson +Date: Sat Aug 3 10:28:20 2013 +0930 + + Add pdfinfo option to print out javascript + + poppler/Catalog.h | 1 + + utils/JSInfo.cc | 164 + +++++++++++++++++++++++++++++++++++++++++------------- + utils/JSInfo.h | 12 +++- + utils/pdfinfo.1 | 3 + + utils/pdfinfo.cc | 10 ++++ + 5 files changed, 151 insertions(+), 39 deletions(-) + +commit 8f7155e7e3180bb1966a5e7df6af6acdd479939b +Author: Adrian Johnson +Date: Sat Aug 3 09:05:21 2013 +0930 + + pdfinfo: indicate if pdf contains javascript + + poppler/Annot.cc | 27 ++++++++++ + poppler/Annot.h | 8 +++ + poppler/Catalog.cc | 26 +++++++++ + poppler/Catalog.h | 12 +++++ + poppler/Form.cc | 4 ++ + poppler/Form.h | 2 + + poppler/Page.cc | 20 +++++++ + poppler/Page.h | 10 +++- + utils/CMakeLists.txt | 4 ++ + utils/JSInfo.cc | 145 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + utils/JSInfo.h | 50 ++++++++++++++++++ + utils/Makefile.am | 4 ++ + utils/pdfinfo.1 | 3 ++ + utils/pdfinfo.cc | 8 +++ + 14 files changed, 322 insertions(+), 1 deletion(-) + +commit c2453fc1307ebb222747f976e1311ecc5e99abfa +Merge: 3bb8c2e3 70298a02 +Author: Albert Astals Cid +Date: Tue Aug 20 19:53:17 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit 70298a021657a72ae80389687a86247144e6d6b6 +Author: Thomas Freitag +Date: Tue Aug 20 19:46:01 2013 +0200 + + Don't copy not needed bitmap + + Speeds up rendering of fixes from bug 67105 + As example one file is down from 130s to 6.5s + + poppler/SplashOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3bb8c2e34039cf473bf72ed9dab55664deab3ab7 +Merge: 71c1d162 fc783300 +Author: Albert Astals Cid +Date: Tue Aug 20 00:41:13 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit fc78330072b9771fa39d21896703adb4836e5398 +Author: Albert Astals Cid +Date: Tue Aug 20 00:37:56 2013 +0200 + + use getRGBLine images if available + + Speeds up greatly files from bug #66928 + + E.g. some file went from 21s to 2s in my computer + + poppler/SplashOutputDev.cc | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) + +commit 71c1d162477a243db07b62ef3c056a2946f8986e +Merge: 7d1de78a 678c7675 +Author: Albert Astals Cid +Date: Sun Aug 18 16:41:20 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit 7d1de78ad79162217ee0ca6c2e99ce51017a327d +Merge: 7e0d969d fbea2241 +Author: Albert Astals Cid +Date: Sun Aug 18 16:40:34 2013 +0200 + + Merge commit 'origin/poppler-0.24~1' + + This is merging the revert commits with the "ours" strategy, so + it's virtually + doing nothing other than making the stable branch mergeable again + to master + +commit 678c767584fa80620cc58a1d8a913cb3473209d4 +Author: Albert Astals Cid +Date: Sun Aug 18 16:19:27 2013 +0200 + + Fix crash in 1026.asan.0.42.pdf + + We were not checking that bitmapOff was in bounds + + splash/Splash.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit fbea2241cccdde0106d2c34592b6ddda28a8d848 +Author: Albert Astals Cid +Date: Sat Aug 17 01:32:51 2013 +0200 + + Revert "Tagged-PDF: Accessors in Catalog for the MarkInfo dictionary" + + This reverts commit 402ee8b4e31630a42a0a38db1d39164cc5789f3c. + + No clue how this ended up in the stable branch + + poppler/Catalog.cc | 45 --------------------------------------------- + poppler/Catalog.h | 10 ---------- + 2 files changed, 55 deletions(-) + +commit 6d2771b8a8c0cb0f2288d0900fea3c9edc3dd172 +Author: Albert Astals Cid +Date: Sat Aug 17 01:32:38 2013 +0200 + + Revert "pdfinfo: Use Catalog::getMarkInfo() to show mark info + properties" + + This reverts commit 73cca518c479594e26605196d54b429fbf42dcdc. + + No clue how this ended up in the stable branch + + utils/pdfinfo.cc | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit 7e0d969dc2439637ab16e609df8223504316f87d +Merge: 6efc0c7a ef642065 +Author: Albert Astals Cid +Date: Sat Aug 17 01:13:30 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit ef6420656c7b88eb22a63ec2cb3e504e0bda0384 +Author: Albert Astals Cid +Date: Sat Aug 17 01:11:37 2013 +0200 + + Fix jpeg image export + + Use same logic than the one used in ImageOutputDev + Bug #48270 + + utils/HtmlOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 681f52a572b08c068cb376e5b2dc8a31676aad07 +Author: Albert Astals Cid +Date: Fri Aug 16 23:58:44 2013 +0200 + + Fix exit(1) in 1026.asan.0.42.pdf + + The main crash in discussion with Thomas + + splash/Splash.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 9f4d7796589e4c9c1645fbbcf0cfabd79a71bde9 +Author: Thomas Freitag +Date: Thu Aug 8 20:33:54 2013 +0200 + + use copyString where memory is freed with gfree + + Bug #67666 + + poppler/Annot.cc | 2 +- + poppler/Dict.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 73cca518c479594e26605196d54b429fbf42dcdc +Author: Adrian Perez de Castro +Date: Thu Apr 25 09:52:56 2013 +0300 + + pdfinfo: Use Catalog::getMarkInfo() to show mark info properties + + utils/pdfinfo.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 402ee8b4e31630a42a0a38db1d39164cc5789f3c +Author: Adrian Perez de Castro +Date: Thu Apr 25 09:52:56 2013 +0300 + + Tagged-PDF: Accessors in Catalog for the MarkInfo dictionary + + poppler/Catalog.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++ + poppler/Catalog.h | 10 ++++++++++ + 2 files changed, 55 insertions(+) + +commit 6efc0c7ad97a82064a1e2c47e0b063b606e56bb7 +Author: Albert Astals Cid +Date: Fri Aug 16 23:31:54 2013 +0200 + + Remove unused xref member + + poppler/OptionalContent.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cb5160aa74f64b78a20aaed4b89fead850b42e9b +Author: Albert Astals Cid +Date: Fri Aug 16 23:31:17 2013 +0200 + + Remove usnused objectNumberFirst member + + poppler/Hints.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit a642aad68733c25f4055c268d691eedcf4e14a22 +Author: Albert Astals Cid +Date: Fri Aug 16 23:30:50 2013 +0200 + + PNGWriterPrivate is actually a struct not a class + + goo/PNGWriter.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 31947d413eae115acc147c33fc55b8ab4adccd91 +Author: Thomas Freitag +Date: Tue Aug 13 19:39:30 2013 +0200 + + pdftoppm: Add thinlinemode option setting + + utils/pdftoppm.1 | 12 ++++++++++++ + utils/pdftoppm.cc | 17 +++++++++++++++-- + 2 files changed, 27 insertions(+), 2 deletions(-) + +commit 8a1740b0b6ee4b217ecbe9d0046e4afa491e9f17 +Merge: b27588c4 c3f953dc +Author: Albert Astals Cid +Date: Mon Aug 12 22:47:44 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit c3f953dc87f83ac726f99cb8f1f959c486098391 +Author: Yury G. Kudryashov +Date: Sat Aug 10 21:43:57 2013 +0300 + + Fix a typo + + qt4/src/poppler-qt4.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b27588c4c946ef4f9a62248fbead4dffcb60b4d1 +Author: Yury G. Kudryashov +Date: Mon Aug 12 22:42:13 2013 +0200 + + Fix indentation + + utils/pdftotext.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit b8b5773386ee4f57e72c2b867421cdff8a2eab5a +Merge: 5f9d385d 62d079b4 +Author: Albert Astals Cid +Date: Thu Aug 8 20:47:05 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit 62d079b40a2f816f59cc533b1624ea57458331f3 +Author: Yury G. Kudryashov +Date: Thu Aug 8 20:45:08 2013 +0200 + + Fix `pdftotext -bbox in.pdf -` + + Print body text to stdout if invoked as above. + + Bug #45163 + + utils/pdftotext.cc | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) + +commit 5f9d385dbec3148614b84ae24cae47177e18dbfc +Merge: af450a88 86dbc5f6 +Author: Albert Astals Cid +Date: Thu Aug 8 20:41:25 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.24' + +commit 86dbc5f6f850ba3919bed9979386e5a4d0e7dba3 +Author: Yury G. Kudryashov +Date: Thu Aug 8 20:39:30 2013 +0200 + + pdfdetach: don't mention xpdfrc + + - drop -cfg command line argument; the old code passed its value to + GlobalParams constructor which is the data dir, not a cfg file + - remove corresponding lines from pdfdetach.1 + - fix '-enc' documentation in pdfdetach.1 + + utils/pdfdetach.1 | 23 +++-------------------- + utils/pdfdetach.cc | 6 ++---- + 2 files changed, 5 insertions(+), 24 deletions(-) + +commit af450a885ede5a3eac1a12734310722963764d83 +Author: Thomas Freitag +Date: Thu Aug 8 20:33:54 2013 +0200 + + use copyString where memory is freed with gfree + + Bug #67666 + + poppler/Annot.cc | 2 +- + poppler/Dict.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 030ee12875a562f5976c5569d5c76783aadf89bd +Author: Adrian Perez de Castro +Date: Thu Apr 25 09:52:56 2013 +0300 + + pdfinfo: Use Catalog::getMarkInfo() to show mark info properties + + utils/pdfinfo.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 9a232273988c0d2fd752dc2016e5111227ae6646 +Author: Adrian Perez de Castro +Date: Thu Apr 25 09:52:56 2013 +0300 + + Tagged-PDF: Accessors in Catalog for the MarkInfo dictionary + + poppler/Catalog.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++ + poppler/Catalog.h | 10 ++++++++++ + 2 files changed, 55 insertions(+) + +commit 2724a7b9f723789491b4991ce7fe0cfa3e5488c3 +Author: Carlos Garcia Campos +Date: Tue Jul 30 09:36:44 2013 +0200 + + glib-demo: Remove GTK_DISABLE_DEPRECATED compilation flag + + Deprecations are now compile warnings, there's no reason to make them + fatal. + + glib/demo/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit ef9d861486d54fb3dcf7b8bca01bd44c3b3361a9 +Author: Carlos Garcia Campos +Date: Tue Jul 30 09:36:44 2013 +0200 + + glib-demo: Remove GTK_DISABLE_DEPRECATED compilation flag + + Deprecations are now compile warnings, there's no reason to make them + fatal. + + glib/demo/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit eac752dc25942439de3e1c7a4ff815500a41dd2a +Author: Albert Astals Cid +Date: Mon Jul 29 19:11:55 2013 +0200 + + 0.24.0 + + CMakeLists.txt | 6 +++--- + NEWS | 7 +++++++ + configure.ac | 4 ++-- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 16 insertions(+), 9 deletions(-) + +commit 892433a068a8a11c09a7c4f57c5fc941747c4453 +Author: Albert Astals Cid +Date: Mon Jul 29 19:08:10 2013 +0200 + + Update Ed's copyright + + poppler/TextOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 4637b1581286381c3d1c6963828d9cd8afc5b9e0 +Author: Albert Astals Cid +Date: Mon Jul 29 01:08:06 2013 +0200 + + Make some pdftops conversions *much* faster + + For example: http://ev.kde.org/resources/expense_report.pdf + + Without this patch it seems "infinite", which this patch it's a + few seconds + + The change: Instead of just remembering in xobjStack the set of + XObjects (and Patterns, + the variable name was 'wrong') we are currently setting up (i.e. the + current chain), we + remember all of them. + + This has passed the pdf->ps regression test without a single issue + + poppler/PSOutputDev.cc | 42 ++++++++++-------------------------------- + poppler/PSOutputDev.h | 6 +++--- + 2 files changed, 13 insertions(+), 35 deletions(-) + +commit e04287f2682e46831c04e0ef8d60411f521a2572 +Author: Albert Astals Cid +Date: Mon Jul 29 00:55:43 2013 +0200 + + Fallback to 1x1 bitmap If we fail to create the corrent one + + poppler/SplashOutputDev.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit fe5ff20cb93a70fa1650ef5e00b67e35de20f0ca +Author: Albert Astals Cid +Date: Mon Jul 29 00:54:07 2013 +0200 + + Initialize t3FillColorOnly + + poppler/PSOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 19930d9f104b63070dcd7636758eb8b90a86fc0d +Author: Ed Catmur +Date: Sun Jul 21 11:07:00 2013 +0200 + + TextOutputDev: Do not draw ligatures more than once when selected + + When the selection covers a ligature presentation form where a single + character code corresponds to multiple Unicode codepoints, the + glyph for + the ligature is drawn multiple times, once for each Unicode character. + + https://bugs.freedesktop.org/show_bug.cgi?id=9001 + + poppler/TextOutputDev.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 6b451b2d3f785c28d98907ae338d58380db518d2 +Author: Albert Astals Cid +Date: Fri Jul 19 02:55:29 2013 +0200 + + 0.23.4 + + CMakeLists.txt | 4 +-- + NEWS | 8 ++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + gtk-doc.make | 70 + +++++++++++++++++++++++++++++++----------------- + m4/gtk-doc.m4 | 6 ++++- + poppler/CairoOutputDev.h | 2 +- + poppler/Makefile.am | 2 +- + poppler/TextOutputDev.cc | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 11 files changed, 67 insertions(+), 35 deletions(-) + +commit 6cf43442e38c501b49293a28f38e06ab143852c6 +Author: Ed Catmur +Date: Thu Jul 18 10:34:29 2013 +0200 + + TextOutputDev: clip the selected text rendering to the selection box + + Sometimes with italic text or text containing ligatures, part of the + glyph falls outside the selection box. By clipping to the selection + box + we avoid drawing the whole glyph with the selection color. + + https://bugs.freedesktop.org/show_bug.cgi?id=66983 + + poppler/TextOutputDev.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 269b3f3d572a15f1007f8cc84f758b1a293ef8af +Author: Carlos Garcia Campos +Date: Mon Jul 8 20:19:30 2013 +0200 + + build: Make -lpthread take preference over -pthread + + This makes libpoppler link to pthreads and fixes runtime error due to + unresolved pthread symbols when running some of the utils and tests. + + m4/ax_pthread.m4 | 2 +- + test/Makefile.am | 6 ++++-- + utils/Makefile.am | 4 +++- + 3 files changed, 8 insertions(+), 4 deletions(-) + +commit 40f857d27930aa002a99c96f3892c5e240e7ecb5 +Author: Carlos Garcia Campos +Date: Mon Jul 8 19:55:10 2013 +0200 + + m4: Replace old acx_pthread.m4 with new one ax_pthread.m4 + + configure.ac | 2 +- + m4/acx_pthread.m4 | 280 ----------------------------------------------- + m4/ax_pthread.m4 | 317 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 318 insertions(+), 281 deletions(-) + +commit 44b7070aa713b2e20eb97b868000d432e2f8504e +Author: Pino Toscano +Date: Mon Jul 8 19:42:15 2013 +0200 + + cmake: improve linking with pthreads + + Use the CMake-provided variable instead of hardcoding -lpthread. + + CMakeLists.txt | 6 +++--- + utils/CMakeLists.txt | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 69c281fdcf23520151c0eb5471a4259c73fa1273 +Author: Carlos Garcia Campos +Date: Sun Jul 7 11:51:27 2013 +0200 + + cairo: Fix the bounding box of images saved in CairoImageOutputDev + + We were using the size of the original image instead of the rendered + size and asuming the scales were always positive. + + poppler/CairoOutputDev.cc | 145 + ++++++++++++++++++---------------------------- + poppler/CairoOutputDev.h | 5 +- + 2 files changed, 59 insertions(+), 91 deletions(-) + +commit 759e0266b36c4ea9f66912f1e53ed6392dbfd6da +Author: Albert Astals Cid +Date: Tue Jul 2 00:47:13 2013 +0200 + + News for 0.23.3 + + forgot to add them to the tarball, oh well + + NEWS | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit df1fe9dc7ade5228e37c16c6f0c9a2d4890fdc90 +Author: Albert Astals Cid +Date: Tue Jul 2 00:33:04 2013 +0200 + + 0.23.3 + + CMakeLists.txt | 4 ++-- + Makefile.am | 2 +- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + qt5/src/Doxyfile | 2 +- + 7 files changed, 8 insertions(+), 8 deletions(-) + +commit df9d4fee17adfe003c822175b6921a3cd93675f6 +Author: Albert Astals Cid +Date: Mon Jul 1 21:04:10 2013 +0200 + + Update copyrights + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 2 +- + poppler/Page.cc | 2 +- + poppler/TextOutputDev.cc | 2 +- + poppler/TextOutputDev.h | 2 +- + qt5/src/poppler-annotation.cc | 2 +- + qt5/src/poppler-annotation.h | 2 +- + qt5/src/poppler-document.cc | 2 +- + qt5/src/poppler-link.cc | 2 +- + qt5/src/poppler-qt5.h | 2 +- + 10 files changed, 10 insertions(+), 10 deletions(-) + +commit 67129e9db88e8332907407f14d3e09ee5c49e274 +Author: Jason Crain +Date: Mon Jul 1 02:24:47 2013 -0500 + + Check for NULL in Page::getResourceDictCopy + + poppler/Page.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit c376559bc412e90204162bb4b2d20cd586db70c1 +Author: Carlos Garcia Campos +Date: Sun Jun 30 13:14:07 2013 +0200 + + annots: Invalidate the appearance stream when annot properties change + + Make invalidateAppearance() protected and only call it when properties + that affect the appearance stream are updated. Remove all calls to + invalidateAppearance() from qt frontend, this is now handled by + the core + and fixes the appearance stream regeneration in the glib frontend too. + + poppler/Annot.cc | 36 ++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 10 ++++++---- + qt4/src/poppler-annotation.cc | 34 ---------------------------------- + qt5/src/poppler-annotation.cc | 34 ---------------------------------- + 4 files changed, 42 insertions(+), 72 deletions(-) + +commit c746e8b38e821d1ebeaf52c4c816515bc3ddaaf6 +Author: Carlos Garcia Campos +Date: Sun Jun 30 11:44:59 2013 +0200 + + annots: Remove unused variable + + poppler/Annot.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 7d9d5d2518f7760e6a4317a358040ddd9164fdef +Author: Carlos Garcia Campos +Date: Sun Jun 30 11:40:15 2013 +0200 + + annots: Do not update AP and AS entries if they are not present when + invaliding the appaearance stream + + poppler/Annot.cc | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +commit 347b53f7fca644564724c230fe6c0dcbffa0d6f9 +Author: Carlos Garcia Campos +Date: Sun Jun 30 11:23:54 2013 +0200 + + annots: do not set the default appearance state when invalidating + appearances + + We are setting the default appareance state to Off and then we are + updating AS dictionary to NULL in the XRef. The appearance state + is only + required when there's more than once appearance stream, but when + invalidating the apperance we remove all streams. + + poppler/Annot.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit b5e9941c145fc99e03a28d92a50840638895908d +Author: Albert Astals Cid +Date: Mon Jul 1 00:32:51 2013 +0200 + + Fix crash on malformed doc + + Where the Colorants dictionary values are not arrays + Document can be found on KDE bug #319925 + + poppler/GfxState.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 19f8a88bba6022b8172477e6f52dfd36b2fc5e92 +Author: Fabio D'Urso +Date: Thu Mar 7 00:20:15 2013 +0100 + + qt5: Free some temporary memory in + TextAnnotationPrivate::createNativeAnnot + + There's no need to keep this buffer around after it has been flushed + + qt5/src/poppler-annotation.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 8bac4d1e43ce9a4c66fddc8430d7bed2d9aabba1 +Author: Fabio D'Urso +Date: Tue Jun 25 20:09:00 2013 +0200 + + qt5: Some documentation about annotations + + * Removed incorrect hint "Use uniqueName to test for Annotation + equality": uniqueNames are optional and we don't actually guarantee + uniqueness + * Added "How to add annotations" and "FixedRotation flag specifics" + sections in the Annotation class page + * Added links from enum Annotation::SubType items to actual subclasses + * Added documentation for annotation flags that are known to work + * Added "see also" links between annotation flag and boundary + setters/getters + * Added warning on Annotation::setPopup to tell that it's currently + not + implemented + + qt5/src/poppler-annotation.h | 143 + ++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 135 insertions(+), 8 deletions(-) + +commit 1d5fe3f20189fd3928121e954bcc8fa7278b39fb +Author: Fabio D'Urso +Date: Sat Mar 2 19:06:49 2013 +0100 + + qt5: FixedRotation annotations' coordinate conversion + + FixedRotation(=flagNoRotate) annotations use a different coordinate + system than regular annotations. This patch implements transparent + conversion so that qt5 clients don't notice the difference. + + Important! When dealing with FixedRotation annotations, poppler-qt5 + clients will need to set geometry-related annotation properties in + the following order: + 1) flags (because we need to know if this is a FixedRotation + annotation or not) + 2) boundary (because we need to know what the topleft corner is, + so that we can construct the conversion matrix) + 3) anything else + + This requirement will be documented in the next patch + + qt5/src/poppler-annotation-private.h | 7 ++- + qt5/src/poppler-annotation.cc | 111 + +++++++++++++++++++++++++++-------- + 2 files changed, 92 insertions(+), 26 deletions(-) + +commit ab130c91492765f8be29ed112dd2e2e6f665641b +Author: Fabio D'Urso +Date: Sat Mar 2 00:55:58 2013 +0100 + + core: Remove geometry-related arguments from annotation constructors + + Removed arguments from annotation constructors related to the geometry + of the annotation. This change will make it easier to support creating + annotations with flag NoRotate in the next patch (because no special + cases will be needed: coordinate conversion code will be able + to always + assume that the underlying annotation object already exists). + + Data that used to be taken from these arguments is now replaced + by dummy + values, which can be modified using appropriate setter methods after + the annotation object is created. + + Affected annotation types: + - AnnotLine + - AnnotTextMarkup + - AnnotPolygon + - AnnotInk + + qt5/src/poppler-annotation.cc | 34 ++++++++++++++++++---------------- + 1 file changed, 18 insertions(+), 16 deletions(-) + +commit 35cfb6914e1be4c5eda2f355900b1a0a1fa69d19 +Author: Fabio D'Urso +Date: Fri Feb 15 12:24:18 2013 +0100 + + poppler_qt5viewer: Add combobox to select rotation + + qt5/demos/navigationtoolbar.cpp | 15 +++++++++++++++ + qt5/demos/navigationtoolbar.h | 4 ++++ + qt5/demos/pageview.cpp | 24 +++++++++++++++++++++++- + qt5/demos/pageview.h | 3 +++ + qt5/demos/viewer.cpp | 2 ++ + 5 files changed, 47 insertions(+), 1 deletion(-) + +commit de2a93c0bc6e92a95c687796f59780c998b90ca4 +Author: Fabio D'Urso +Date: Thu Mar 7 00:20:15 2013 +0100 + + qt4: Free some temporary memory in + TextAnnotationPrivate::createNativeAnnot + + There's no need to keep this buffer around after it has been flushed + + qt4/src/poppler-annotation.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 738b0b4fedaa2b2b28ea1c11622dfd880180d1c9 +Author: Fabio D'Urso +Date: Thu Mar 7 20:50:52 2013 +0100 + + qt4: Some documentation about annotations + + * Removed incorrect hint "Use uniqueName to test for Annotation + equality": uniqueNames are optional and we don't actually guarantee + uniqueness + * Added "How to add annotations" and "FixedRotation flag specifics" + sections in the Annotation class page + * Added links from enum Annotation::SubType items to actual subclasses + * Added documentation for annotation flags that are known to work + * Added "see also" links between annotation flag and boundary + setters/getters + * Added warning on Annotation::setPopup to tell that it's currently + not + implemented + + qt4/src/poppler-annotation.h | 143 + ++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 135 insertions(+), 8 deletions(-) + +commit cf950a2b7e8278e70719c67b441b0d324ffd0399 +Author: Fabio D'Urso +Date: Sat Mar 2 19:06:49 2013 +0100 + + qt4: FixedRotation annotations' coordinate conversion + + FixedRotation(=flagNoRotate) annotations use a different coordinate + system than regular annotations. This patch implements transparent + conversion so that qt4 clients don't notice the difference. + + Important! When dealing with FixedRotation annotations, poppler-qt4 + clients will need to set geometry-related annotation properties in + the following order: + 1) flags (because we need to know if this is a FixedRotation + annotation or not) + 2) boundary (because we need to know what the topleft corner is, + so that we can construct the conversion matrix) + 3) anything else + + This requirement will be documented in the next patch + + poppler/Annot.cc | 8 +++ + poppler/Annot.h | 2 + + qt4/src/poppler-annotation-private.h | 7 ++- + qt4/src/poppler-annotation.cc | 111 + +++++++++++++++++++++++++++-------- + 4 files changed, 102 insertions(+), 26 deletions(-) + +commit 4b13085568df09d8b75099f6a5438f025a028fd5 +Author: Fabio D'Urso +Date: Sat Mar 2 00:55:58 2013 +0100 + + core: Remove geometry-related arguments from annotation constructors + + Removed arguments from annotation constructors related to the geometry + of the annotation. This change will make it easier to support creating + annotations with flag NoRotate in the next patch (because no special + cases will be needed: coordinate conversion code will be able + to always + assume that the underlying annotation object already exists). + + Data that used to be taken from these arguments is now replaced + by dummy + values, which can be modified using appropriate setter methods after + the annotation object is created. + + Affected annotation types: + - AnnotLine + - AnnotTextMarkup + - AnnotPolygon + - AnnotInk + + poppler/Annot.cc | 56 + +++++++++++++------------------------------ + poppler/Annot.h | 9 ++++--- + qt4/src/poppler-annotation.cc | 34 +++++++++++++------------- + 3 files changed, 39 insertions(+), 60 deletions(-) + +commit 5923cfb5f7e3a0703de17e21f4952f92a44f3c14 +Author: Fabio D'Urso +Date: Fri Feb 15 12:24:18 2013 +0100 + + poppler_qt4viewer: Add combobox to select rotation + + qt4/demos/navigationtoolbar.cpp | 15 +++++++++++++++ + qt4/demos/navigationtoolbar.h | 4 ++++ + qt4/demos/pageview.cpp | 24 +++++++++++++++++++++++- + qt4/demos/pageview.h | 3 +++ + qt4/demos/viewer.cpp | 2 ++ + 5 files changed, 47 insertions(+), 1 deletion(-) + +commit 74ea15cc454f31b772e71b3525b71045dbfa5527 +Author: Fabio D'Urso +Date: Tue Jun 25 19:56:20 2013 +0200 + + core: Support for rendering annotations with flagNoRotate + + Gfx::drawAnnot now makes a counter-rotation if flagNoRotate is set + + poppler/Annot.cc | 55 + ++++++++++++++++++++++++++++++++++++------------------- + poppler/Annot.h | 3 ++- + poppler/Gfx.cc | 41 +++++++++++++++++++++++++++++++++++++---- + poppler/Gfx.h | 3 ++- + 4 files changed, 77 insertions(+), 25 deletions(-) + +commit 2639957ba78defd2ab6282679375fb7969bad21f +Author: Fabio D'Urso +Date: Wed Jun 26 23:12:40 2013 +0200 + + Do not crash in page::removeAnnot if there are non-Ref entries + in /Annots + + poppler/Page.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit ae016aa263c218fbfbd607cc92feac1013348c7e +Author: Albert Astals Cid +Date: Wed Jun 26 11:33:55 2013 +0200 + + Fix qt5 found/not found logic + + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit e27c1057caf4d878a0dc43c92c9e0b565db8fe40 +Merge: c55b577c ee8cfbc7 +Author: Albert Astals Cid +Date: Tue Jun 25 19:17:13 2013 +0200 + + Merge remote-tracking branch 'origin/qt5' + +commit c55b577ce69ad4bb69f5261b3e120e92c9fdb3d0 +Author: Carlos Garcia Campos +Date: Tue Jun 25 10:01:38 2013 +0200 + + glib: Use TextPage::getSelectionWords to build text layout and + attributes + + This way we can make sure that the list of words used in + poppler_page_get_text_layout and poppler_page_get_text_attributes + is the + same that the one used in poppler_page_get_text. This fixes the + mismatch + between the number of characters in the text returned by + poppler_page_get_text and the number of characters returned by + poppler_page_get_text_layout in some documents. + + glib/poppler-page.cc | 168 + +++++++++++++++++++++++++++------------------------ + 1 file changed, 90 insertions(+), 78 deletions(-) + +commit fc534f571315c064005515c19d7d70ad3af1563e +Author: Carlos Garcia Campos +Date: Tue Jun 25 10:05:01 2013 +0200 + + TextOutputDev: add a method to TextPage to get the selection as a + list of words + + Returns a list of lines of words. + + poppler/TextOutputDev.cc | 36 ++++++++++++++++++++++++++++++++++++ + poppler/TextOutputDev.h | 4 ++++ + 2 files changed, 40 insertions(+) + +commit a924246b7534e86165f8e9ab6c60d56b73a17b94 +Author: Carlos Garcia Campos +Date: Tue Jun 25 09:57:48 2013 +0200 + + TextOutputDev: simplify the text selection dumper + + Build a list of lines of words and don't try to format the text when + detecting tables, simply add the words and lines in the right order. + + poppler/TextOutputDev.cc | 200 + ++++++++++++++++++++++------------------------- + 1 file changed, 92 insertions(+), 108 deletions(-) + +commit c849094a2daf896d085937adff1f7659a09da062 +Author: Carlos Garcia Campos +Date: Mon Jun 24 18:29:11 2013 +0200 + + TextOutputDev: Move TextSelection class from TextSelectionPainter + to TextSelectionVisitor + + So that it can be used by other TextSelectionVisitor implementations. + Also renamed it as TextWordSelection since it contains a word + selection. + + poppler/TextOutputDev.cc | 35 ++++++++++++++++++----------------- + 1 file changed, 18 insertions(+), 17 deletions(-) + +commit b3ff3f2c3e131556d2b27cbe52f0ddbbb4820c19 +Author: Jason Crain +Date: Thu Jun 20 21:47:13 2013 -0500 + + Draw glyphs after selection background + + When multiple lines of text are selected, TextSelectionPainter will + draw selections over each other, hiding the previous line with the + selection background of the current line. This patch changes + TextSelectionPainter so that glyphs are drawn only after the entire + background is drawn. + + https://bugs.freedesktop.org/show_bug.cgi?id=65989 + + poppler/TextOutputDev.cc | 109 + ++++++++++++++++++++++++++++++----------------- + 1 file changed, 69 insertions(+), 40 deletions(-) + +commit ee8cfbc78fe9de109abbe0727a738870f6027a73 +Author: Albert Astals Cid +Date: Tue Jun 18 23:20:01 2013 +0200 + + Fix indent + + qt5/src/poppler-optcontent.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9d0a5b6afb25a1273504383e108bdb95ca82f099 +Author: Albert Astals Cid +Date: Tue Jun 18 23:19:30 2013 +0200 + + Bring changes from the qt4 dir + + qt5/src/Doxyfile | 2 +- + qt5/src/poppler-private.h | 2 +- + qt5/tests/CMakeLists.txt | 1 + + qt5/tests/Makefile.am | 13 +- + qt5/tests/stress-threads-qt5.cpp | 304 + +++++++++++++++++++++++++++++++++++++++ + qt5/tests/test-poppler-qt5.cpp | 2 +- + 6 files changed, 320 insertions(+), 4 deletions(-) + +commit 1adb1ab7aee026e227d25716a4b7be22b19b5b84 +Author: Albert Astals Cid +Date: Tue Jun 18 20:50:49 2013 +0200 + + Make it build with autotools + + poppler/Makefile.am | 23 +- + {poppler => qt4/src}/ArthurOutputDev.cc | 0 + {poppler => qt4/src}/ArthurOutputDev.h | 0 + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Makefile.am | 5 +- + qt5/src/ArthurOutputDev.cc | 816 + ++++++++++++++++++++++++++++++++ + qt5/src/ArthurOutputDev.h | 170 +++++++ + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Makefile.am | 5 +- + qt5/src/poppler-optcontent.cc | 2 + + 10 files changed, 997 insertions(+), 28 deletions(-) + +commit 93a1c2b768cc419c5bf9b3033bf85fb21326a65a +Author: Albert Astals Cid +Date: Tue Jun 18 00:33:38 2013 +0200 + + If qmake gives us a Qt5 qmake try with qmake4 and qmake-qt4 + + cmake/modules/FindQt4.cmake | 62 + ++++++++++++++++++++++++++++----------------- + 1 file changed, 39 insertions(+), 23 deletions(-) + +commit 7cc33a752ef864b595748ce7724ba553a8e3ba8e +Author: Albert Astals Cid +Date: Mon Jun 17 22:57:56 2013 +0200 + + We are not compiling an executable + + qt5/src/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +commit 87cfcd41e8e970186c6ce753aa660ef86aca8878 +Author: Granger Anthony +Date: Mon Jun 17 09:17:51 2013 +0200 + + Allow to enable Qt5 support only with CMake >= 2.8.8 + + CMakeLists.txt | 26 ++++++++++++++++---------- + qt5/tests/CMakeLists.txt | 1 - + 2 files changed, 16 insertions(+), 11 deletions(-) + +commit b44c70f04758000cf0e049b06cc7864287570f7b +Author: Albert Astals Cid +Date: Mon Jun 17 22:10:05 2013 +0200 + + Bring PIC back to the toplevel, still have linking errors tohugh :-/ + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit be49073f5ce79f56b38197758a5cf1253b972306 +Author: Albert Astals Cid +Date: Mon Jun 17 21:50:31 2013 +0200 + + Use qtchooser if available + + configure.ac | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +commit b1958228d4bc6793a3606b5e31c61a57b9fac9f5 +Author: Albert Astals Cid +Date: Mon Jun 17 20:21:08 2013 +0200 + + No distro ships moc-qt5 but make it work in case someone would + + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 06f45c7177afc67e02985be1a97cd976c530c4ae +Author: Albert Astals Cid +Date: Mon Jun 17 20:04:49 2013 +0200 + + Build fixes + + Fix moc when moc-qt4 is qt4 moc but moc is qt5 one + Do not add -fPIE everywhere, just -fPIC to qt5 + + configure.ac | 10 ++++++---- + qt5/src/Makefile.am | 2 +- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit cb617c21fba727781f46278f5475b91d528a488b +Author: Albert Astals Cid +Date: Mon Jun 17 18:12:18 2013 +0200 + + Files i forgot + + poppler-qt5-uninstalled.pc.in | 7 +++++++ + poppler-qt5.pc.cmake | 13 +++++++++++++ + poppler-qt5.pc.in | 13 +++++++++++++ + 3 files changed, 33 insertions(+) + +commit 5c521bba427eb163e4b77d936865fbdd0e07faf3 +Author: Albert Astals Cid +Date: Mon Jun 17 18:12:07 2013 +0200 + + soversion 1 + + qt5/src/CMakeLists.txt | 2 +- + qt5/src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 43786964946b4f4c005a0526e16fead3ffa6ba4a +Author: Albert Astals Cid +Date: Mon Jun 17 00:23:31 2013 +0200 + + harmonize spaces + + CMakeLists.txt | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 2e2ea27fe3dc688c87003d170b82451a6a872b0d +Author: Albert Astals Cid +Date: Mon Jun 17 00:22:18 2013 +0200 + + Remove qt4 mentions + + qt5/src/poppler-converter-private.h | 6 +++--- + qt5/src/poppler-embeddedfile-private.h | 2 +- + qt5/src/poppler-form.cc | 2 +- + qt5/src/poppler-form.h | 6 +++--- + qt5/src/poppler-pdf-converter.cc | 2 +- + qt5/src/poppler-private.cc | 4 ++-- + qt5/src/poppler-private.h | 2 +- + qt5/src/poppler-qt5.h | 2 +- + 8 files changed, 13 insertions(+), 13 deletions(-) + +commit e2264ce82af3e971e34930f5307b7c9b43a1e346 +Author: Albert Astals Cid +Date: Mon Jun 17 00:19:27 2013 +0200 + + remove deprecated stuff + + qt5/src/poppler-annotation.cc | 19 ++------ + qt5/src/poppler-annotation.h | 18 ------- + qt5/src/poppler-document.cc | 19 -------- + qt5/src/poppler-link.cc | 5 -- + qt5/src/poppler-link.h | 10 ---- + qt5/src/poppler-page.cc | 18 ------- + qt5/src/poppler-qt5.h | 41 ---------------- + qt5/tests/check_fonts.cpp | 21 ++------- + qt5/tests/check_metadata.cpp | 1 - + qt5/tests/check_search.cpp | 107 + ++++++++++++++++++++++-------------------- + 10 files changed, 65 insertions(+), 194 deletions(-) + +commit 21808e203eed46e379954b58b7014998b3836573 +Author: Albert Astals Cid +Date: Mon Jun 17 00:03:45 2013 +0200 + + remove commented stuff + + qt5/src/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +commit 16e7033f18a8da8e27aaed6f63cce156abf8837a +Author: Albert Astals Cid +Date: Mon Jun 17 00:01:27 2013 +0200 + + Initial Qt5 port + + CMakeLists.txt | 20 + + Makefile.am | 18 +- + configure.ac | 66 +- + qt5/.gitignore | 4 + + qt5/CMakeLists.txt | 3 + + qt5/Makefile.am | 1 + + qt5/demos/.gitignore | 4 + + qt5/demos/CMakeLists.txt | 38 + + qt5/demos/Makefile.am | 67 + + qt5/demos/abstractinfodock.cpp | 57 + + qt5/demos/abstractinfodock.h | 48 + + qt5/demos/documentobserver.cpp | 50 + + qt5/demos/documentobserver.h | 50 + + qt5/demos/embeddedfiles.cpp | 82 + + qt5/demos/embeddedfiles.h | 44 + + qt5/demos/fonts.cpp | 72 + + qt5/demos/fonts.h | 43 + + qt5/demos/info.cpp | 72 + + qt5/demos/info.h | 43 + + qt5/demos/main_viewer.cpp | 33 + + qt5/demos/metadata.cpp | 50 + + qt5/demos/metadata.h | 43 + + qt5/demos/navigationtoolbar.cpp | 129 + + qt5/demos/navigationtoolbar.h | 61 + + qt5/demos/optcontent.cpp | 69 + + qt5/demos/optcontent.h | 47 + + qt5/demos/pageview.cpp | 79 + + qt5/demos/pageview.h | 50 + + qt5/demos/permissions.cpp | 66 + + qt5/demos/permissions.h | 43 + + qt5/demos/thumbnails.cpp | 84 + + qt5/demos/thumbnails.h | 48 + + qt5/demos/toc.cpp | 88 + + qt5/demos/toc.h | 43 + + qt5/demos/viewer.cpp | 317 ++ + qt5/demos/viewer.h | 73 + + qt5/src/.gitignore | 9 + + qt5/src/CMakeLists.txt | 54 + + qt5/src/Doxyfile | 1637 ++++++++++ + qt5/src/Mainpage.dox | 85 + + qt5/src/Makefile.am | 73 + + qt5/src/poppler-annotation-helper.h | 198 ++ + qt5/src/poppler-annotation-private.h | 111 + + qt5/src/poppler-annotation.cc | 4394 + ++++++++++++++++++++++++++ + qt5/src/poppler-annotation.h | 921 ++++++ + qt5/src/poppler-base-converter.cc | 105 + + qt5/src/poppler-converter-private.h | 49 + + qt5/src/poppler-document.cc | 679 ++++ + qt5/src/poppler-embeddedfile-private.h | 42 + + qt5/src/poppler-embeddedfile.cc | 135 + + qt5/src/poppler-export.h | 17 + + qt5/src/poppler-fontinfo.cc | 149 + + qt5/src/poppler-form.cc | 416 +++ + qt5/src/poppler-form.h | 343 ++ + qt5/src/poppler-link-extractor-private.h | 57 + + qt5/src/poppler-link-extractor.cc | 84 + + qt5/src/poppler-link.cc | 711 +++++ + qt5/src/poppler-link.h | 612 ++++ + qt5/src/poppler-media.cc | 168 + + qt5/src/poppler-media.h | 100 + + qt5/src/poppler-movie.cc | 110 + + qt5/src/poppler-optcontent-private.h | 121 + + qt5/src/poppler-optcontent.cc | 427 +++ + qt5/src/poppler-optcontent.h | 77 + + qt5/src/poppler-page-private.h | 54 + + qt5/src/poppler-page-transition-private.h | 28 + + qt5/src/poppler-page-transition.cc | 95 + + qt5/src/poppler-page-transition.h | 148 + + qt5/src/poppler-page.cc | 744 +++++ + qt5/src/poppler-pdf-converter.cc | 115 + + qt5/src/poppler-private.cc | 292 ++ + qt5/src/poppler-private.h | 240 ++ + qt5/src/poppler-ps-converter.cc | 273 ++ + qt5/src/poppler-qiodeviceoutstream-private.h | 47 + + qt5/src/poppler-qiodeviceoutstream.cc | 64 + + qt5/src/poppler-qt5.h | 1812 +++++++++++ + qt5/src/poppler-sound.cc | 132 + + qt5/src/poppler-textbox.cc | 63 + + qt5/tests/.gitignore | 30 + + qt5/tests/CMakeLists.txt | 75 + + qt5/tests/Makefile.am | 152 + + qt5/tests/README.unittest | 23 + + qt5/tests/check_actualtext.cpp | 33 + + qt5/tests/check_attachments.cpp | 157 + + qt5/tests/check_dateConversion.cpp | 142 + + qt5/tests/check_fonts.cpp | 248 ++ + qt5/tests/check_goostring.cpp | 61 + + qt5/tests/check_lexer.cpp | 128 + + qt5/tests/check_links.cpp | 96 + + qt5/tests/check_metadata.cpp | 275 ++ + qt5/tests/check_optcontent.cpp | 484 +++ + qt5/tests/check_pagelabelinfo.cpp | 43 + + qt5/tests/check_pagelayout.cpp | 49 + + qt5/tests/check_pagemode.cpp | 73 + + qt5/tests/check_password.cpp | 88 + + qt5/tests/check_permissions.cpp | 44 + + qt5/tests/check_search.cpp | 91 + + qt5/tests/check_strings.cpp | 250 ++ + qt5/tests/poppler-attachments.cpp | 39 + + qt5/tests/poppler-fonts.cpp | 89 + + qt5/tests/poppler-forms.cpp | 166 + + qt5/tests/poppler-texts.cpp | 40 + + qt5/tests/stress-poppler-dir.cpp | 67 + + qt5/tests/stress-poppler-qt5.cpp | 74 + + qt5/tests/test-password-qt5.cpp | 136 + + qt5/tests/test-poppler-qt5.cpp | 235 ++ + 106 files changed, 21480 insertions(+), 4 deletions(-) + +commit 714ee1e61d853394818dca7155b1b882408ffc6a +Author: Albert Astals Cid +Date: Sun Jun 16 19:00:01 2013 +0200 + + Pass down the recursion param + + Fixes heap smashing in 168.pdf.SIGSEGV.598.462 + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1f3e3828b9a57e044b86640b9bf9ad2437cc5656 +Author: Albert Astals Cid +Date: Sat Jun 15 17:21:36 2013 +0200 + + Add quotes since use_cairo can have spaces + + BUG #65709 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fe3ffab19d54326052fd0ff8ee3ee1feb9fa928c +Author: Adam Reichold +Date: Tue Jun 11 23:08:07 2013 +0200 + + Windows compile fixes + + qt4/tests/stress-threads-qt4.cpp | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit 99908cb0c8a784791ffa0682c8f105acdef0d5ab +Author: Peter Breitenlohner +Date: Tue Jun 11 10:02:01 2013 +0200 + + MinGW32 may or may not define __MINGW_PRINTF_FORMAT + + Moreover __USE_MINGW_ANSI_STDIO might be defined as 0 + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 0673f3d8024554c414f578e0770086f475e6a605 +Author: Albert Astals Cid +Date: Tue Jun 11 00:19:19 2013 +0200 + + 0.23.2 + + CMakeLists.txt | 4 ++-- + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 18 insertions(+), 6 deletions(-) + +commit 7f1bf8d94302c15a2ff68debfb6fba49df526d16 +Author: Christoph Duelli +Date: Thu May 16 16:16:32 2013 +0200 + + Do not pollute global namespace with internal classes + + Bug #64680 + + fofi/FoFiIdentifier.cc | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 07992075a6d1d29db57f997f67d5a4a6deacbbb4 +Merge: 4a0bd6fd 25f453ef +Author: Albert Astals Cid +Date: Sun Jun 9 12:17:53 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + + Conflicts: + poppler/Catalog.cc + qt4/src/poppler-private.h + utils/HtmlOutputDev.cc + +commit 25f453ef49004452ac4c201d59d9ce2ef52ffeee +Author: Julien Nabet +Date: Sun Jun 9 12:12:06 2013 +0200 + + Prefer prefix ++/-- operators for non-primitive types + + Part of bug #80537 + + poppler/CachedFile.cc | 3 ++- + poppler/Catalog.cc | 5 +++-- + utils/HtmlFonts.cc | 3 ++- + utils/HtmlLinks.cc | 3 ++- + 4 files changed, 9 insertions(+), 5 deletions(-) + +commit ed01688a899c5e7560a93ca2424ca302ff3452f1 +Author: Julien Nabet +Date: Sun Jun 9 12:10:01 2013 +0200 + + Fix mismatched allocation and deallocation + + Part of bug #65551 + + qt4/src/poppler-private.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a27890ac441fbd613ddfe6fcf404b92be371e554 +Author: Julien Nabet +Date: Sun Jun 9 12:08:06 2013 +0200 + + Fix memory leak + + utils/HtmlOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 4a0bd6fdb2e9e3c589e1bdb282e7c2bfca8567b1 +Merge: bbd27c92 17a16a27 +Author: Albert Astals Cid +Date: Sun Jun 9 12:06:10 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 17a16a2731b1110a12c7163c139d85bccee04492 +Author: Albert Astals Cid +Date: Sun Jun 9 12:04:40 2013 +0200 + + Fix mismatched free/delete + + Bug #65553 + + poppler/UTF.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bbd27c92b5e5034dc2899ea26b47fcb983209f82 +Author: Thomas Freitag +Date: Thu Jun 6 23:52:36 2013 +0200 + + Speed-up some tiling on a 10x factor + + Bug #64892 + + poppler/SplashOutputDev.cc | 15 ++++++++++++++- + splash/Splash.cc | 15 +++++++++++---- + splash/Splash.h | 3 ++- + 3 files changed, 27 insertions(+), 6 deletions(-) + +commit 7847769a24bd3ccf863f653bc2215e84157ccfb6 +Author: Peter Breitenlohner +Date: Tue Jun 4 15:31:06 2013 +0200 + + Use fseeko64/ftello64 for MinGW32 + + goo/gfile.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 0c3548087b379dd6ffa2291d03f0ea1c7e6a69d1 +Author: Peter Breitenlohner +Date: Tue Jun 4 15:31:05 2013 +0200 + + Allow to build without multithreading + + poppler/Annot.cc | 7 +++++++ + poppler/XRef.cc | 4 ++++ + 2 files changed, 11 insertions(+) + +commit 1e74ac4589daf80dcac54b094145d32c90069738 +Author: Adam Reichold +Date: Thu Jun 6 01:03:48 2013 +0200 + + [qt4] fix autotools + + qt4/tests/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 342cc0d8a101e99199d447d632a1cd5ba7beb5b2 +Author: Li Junling +Date: Tue Jun 4 22:39:35 2013 +0200 + + Fix memory leak + + poppler/SplashOutputDev.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 52945a072b6f864e80485cc4321a27530a76c452 +Author: Albert Astals Cid +Date: Tue Jun 4 22:35:32 2013 +0200 + + Move the iccColorSpaceCache from Gfx to OutputDev + + This way it's shared when doing tiling. Page 35 of + bug-poppler64963.pdf + goes down from 150 to 133 seconds + + poppler/Gfx.cc | 61 ++++++++++++++-------------------- + poppler/Gfx.h | 12 ++----- + poppler/GfxState.cc | 93 + ++++++++++++++++++++++++++-------------------------- + poppler/GfxState.h | 33 ++++++++++--------- + poppler/OutputDev.cc | 8 ++++- + poppler/OutputDev.h | 19 +++++++++-- + 6 files changed, 114 insertions(+), 112 deletions(-) + +commit 7d4bda198b8ac767bdf4e0a4fdcaae5541113f92 +Author: Albert Astals Cid +Date: Mon Jun 3 23:34:11 2013 +0200 + + Compile + + qt4/tests/stress-threads-qt4.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit 395b3fa021850225e1fea66736f3a3f00571571f +Author: Albert Astals Cid +Date: Mon Jun 3 23:31:52 2013 +0200 + + Fix #end -> #endif + + poppler/poppler-config.h.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 425d1b4835389e2031631ce54cee157af39f1cb6 +Author: Adam Reichold +Date: Mon Jun 3 20:04:21 2013 +0200 + + Check for the correct number of arguments + + qt4/tests/stress-threads-qt4.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9d3eb07a1ea01b98aabe4f32481dd4a83bc8f2a5 +Author: Hib Eris +Date: Mon Jun 3 08:49:37 2013 +0200 + + Fix cmake build to use ansi stdio extensions when using a mingw + compiler + + https://bugs.freedesktop.org/show_bug.cgi?id=65238 + + poppler/poppler-config.h.cmake | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 287afe2290d64ca63cdb75fef8f3fbdc20997970 +Author: Adam Reichold +Date: Sun Jun 2 23:29:00 2013 +0200 + + Add a thread stresser in qt4 + + qt4/tests/CMakeLists.txt | 1 + + qt4/tests/Makefile.am | 9 +- + qt4/tests/stress-threads-qt4.cpp | 298 + +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 307 insertions(+), 1 deletion(-) + +commit 77ecb3823c2db4a6cca5af5889c07c73f90de7f0 +Author: Adam Reichold +Date: Sat Jun 1 19:04:10 2013 +0200 + + Add a pthread option to pdftoppm + + It's mostly a developer tool only to test thread support + Not end user oriented (hence no buildsystem) + + Parts also by Thomas + + utils/pdftoppm.cc | 130 + ++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 126 insertions(+), 4 deletions(-) + +commit caa19f4961146915f51be6c72f60c3aa43037235 +Author: Albert Astals Cid +Date: Sat Jun 1 17:22:54 2013 +0200 + + qt4: Fix test binary name in help + + qt4/tests/test-poppler-qt4.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a0b48b1d05f08605bca5e1a2e2518e16578f6055 +Author: Hib Eris +Date: Sat Jun 1 14:42:42 2013 +0200 + + Fix printf format warning for size_t + + Fixes: + + CXX pdfunite.o + pdfunite.cc: In function ‘int main(int, char**)’: + pdfunite.cc:142:59: warning: format ‘%d’ expects argument of type + ‘int’, but argument 3 has type ‘std::vector::size_type + {aka long unsigned int}’ [-Wformat] + + https://bugs.freedesktop.org/show_bug.cgi?id=65242 + + utils/pdfunite.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 860737c2a19c734a0c5b65ad506ba229ba439985 +Author: Hib Eris +Date: Sat Jun 1 12:05:17 2013 +0200 + + Use ansi stdio extensions when using a mingw compiler + + In the C runtime used by mingw compilers (msvcrt.dll) the printf + function does not support the C99 format-width specifier "%ll". + + Defining __USE_MINGW_ANSI_STDIO enables mingw's ansi stdio extensions + that implement a C99 compliant printf function. + + https://bugs.freedesktop.org/show_bug.cgi?id=65238 + + CMakeLists.txt | 4 ++++ + configure.ac | 3 +++ + poppler/poppler-config.h.in | 5 +++++ + 3 files changed, 12 insertions(+) + +commit dd30ce39252a3820254b43f90699849ab5a1ca58 +Author: Hib Eris +Date: Fri May 31 12:24:55 2013 +0200 + + Fix warning on narrowing conversion from int to DWORD + + Fixes warning when compiling for Windows: + + gfile.cc: In member function 'Goffset GooFile::size() const': + gfile.cc:609:30: warning: narrowing conversion of '-1' from 'int' + to 'DWORD {aka long unsigned int}' inside { } is ill-formed in C++11 + [-Wnarrowing] + LARGE_INTEGER size = {-1,-1}; + + https://bugs.freedesktop.org/show_bug.cgi?id=65239 + + goo/gfile.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 01a825f3f9f5dcf686fc123d2cf80b9c525d0d89 +Merge: a57f9378 b4b13102 +Author: Albert Astals Cid +Date: Sat Jun 1 13:47:29 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit b4b13102716cd33636a94fd99c49487924761670 +Author: Albert Astals Cid +Date: Sat Jun 1 13:45:53 2013 +0200 + + Fix crash on malformed file + + Also remove outdated comment + + Bug #65221 + + poppler/Stream.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit a57f93780de12732875e0195127a92bff835ff61 +Author: Albert Astals Cid +Date: Tue May 28 00:11:10 2013 +0200 + + 0.23.1 + + CMakeLists.txt | 4 ++-- + NEWS | 11 +++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 17 insertions(+), 6 deletions(-) + +commit 299a1447e3d9a845b5e964f29e698046abdb63f2 +Author: Albert Astals Cid +Date: Tue May 28 00:10:43 2013 +0200 + + Build poppler-forms in the autotools buildsystem + + qt4/tests/Makefile.am | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit dcfaf20503868d0956ee81208265a975b480fb52 +Author: Albert Astals Cid +Date: Mon May 27 23:40:49 2013 +0200 + + Dist these two files too + + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit de7a3fb715811be6be9ed51b1c5ab1a63c523403 +Author: Albert Astals Cid +Date: Mon May 27 23:40:07 2013 +0200 + + Add missing copyright + + poppler/Hints.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 30282d3fdbbb3029d9a0f838b2cd979bb962235c +Merge: 61f66588 56044ef4 +Author: Albert Astals Cid +Date: Mon May 27 00:20:12 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 56044ef482c26f10a8a1371dace049c144659dc7 +Author: Albert Astals Cid +Date: Mon May 27 00:18:22 2013 +0200 + + Fix infinite loop while feeding wrong data in stdin + + Take into account that CachedFile::read might not always return + the number of elems we asked it to read + + Bug #64967 + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 61f665885daeb0009ecac2cc85188f23d6addb60 +Author: Albert Astals Cid +Date: Mon May 27 00:01:24 2013 +0200 + + Fix big file support in cmake + + Tested by Fabio + + CMakeLists.txt | 2 ++ + cmake/modules/CheckFileOffsetBits.c | 14 +++++++++++ + cmake/modules/CheckFileOffsetBits.cmake | 44 + +++++++++++++++++++++++++++++++++ + config.h.cmake | 6 ++--- + 4 files changed, 63 insertions(+), 3 deletions(-) + +commit f536a4ec37246e10f03fe4de309bd31deb6a4727 +Author: Hib Eris +Date: Thu May 16 21:06:56 2013 +0200 + + Do not use deprecated gtk_scrolled_window_add_with_viewport() + + https://bugs.freedesktop.org/show_bug.cgi?id=64683 + + glib/demo/find.c | 4 ++++ + glib/demo/images.c | 4 ++++ + glib/demo/layers.c | 4 ++++ + glib/demo/render.c | 4 ++++ + glib/demo/selections.c | 4 ++++ + test/gtk-test.cc | 4 ++++ + 6 files changed, 24 insertions(+) + +commit c10f2f8777927d8cfe547941ea2f70fcce14da7a +Author: Pino Toscano +Date: Mon May 20 00:09:45 2013 +0200 + + fix typo in error message + + poppler/Hints.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 71d327194293cb3d1a0e274eaf4451c7afe81e8a +Merge: 7b2df1f9 6a98b56f +Author: Albert Astals Cid +Date: Fri May 17 23:04:12 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 6a98b56f6ded957477ddcccd4ff849a870020395 +Author: Albert Astals Cid +Date: Fri May 17 23:01:20 2013 +0200 + + Make an invalid nSharedGroupsFirst a real error + + Instead trying to recover + Fixes bug #46703 + + poppler/Hints.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 7b2df1f935192c89eacddd98c4bf92f38013c8e0 +Author: Albert Astals Cid +Date: Fri May 17 20:56:51 2013 +0200 + + A simple form dumper + + qt4/tests/CMakeLists.txt | 1 + + qt4/tests/poppler-forms.cpp | 166 + ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 167 insertions(+) + +commit 54f539b4436a1a3e0eab2ef0904c302865082982 +Merge: b3d8f510 3a6e2de1 +Author: Albert Astals Cid +Date: Thu May 16 21:27:47 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 3a6e2de1d35e3ee4fd86f71713c49bec8e09e41d +Author: Albert Astals Cid +Date: Thu May 16 21:27:02 2013 +0200 + + Make sure that Title: doesn't contain \n or \n + + Bug #63862 + + poppler/PSOutputDev.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit b3d8f510e30fb4d8da9069390d5e9bd8a283fbd6 +Author: Thomas Freitag +Date: Thu May 16 20:52:09 2013 +0200 + + Fix splashModeBGR8 rendering + + Also make SplashBitmap able to write splashModeBGR8 images + + Bug #64381 + + splash/Splash.cc | 4 ++-- + splash/SplashBitmap.cc | 24 ++++++++++++++++++++++-- + 2 files changed, 24 insertions(+), 4 deletions(-) + +commit 8640933a3aa7dbafa21765d029e97b4bba76716c +Author: Fabio D'Urso +Date: Thu Apr 25 19:18:30 2013 +0200 + + Fix printf format specifiers (Goffset is a long long, not a int) + + poppler/PDFDoc.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f8e8805bbce3e94b16b77fece0072645c66f6a31 +Author: Fabio D'Urso +Date: Thu Apr 25 19:06:09 2013 +0200 + + Re-enable commented-out printf-format attribute on OutStream::printf + + The answer to the question "2,3 because the first arg is class + instance ?" is yes. It's documented behavior: + Since non-static C++ methods have an implicit this argument, the + arguments of such methods should be counted from two, not one. + from + http://gcc.gnu.org/onlinedocs/gcc-4.3.2/gcc/Function-Attributes.html + + poppler/Stream.h | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 013b2b247268f9b8dcd8e0461580e0bbcf7554c1 +Author: Fabio D'Urso +Date: Thu Apr 25 17:58:25 2013 +0200 + + XRef stream writing: Write 32-bit offsets when possible + + For compatibility reasons: some pdf readers don't support 64-bit + offsets + yet (for example, poppler 0.22 doesn't) + + poppler/XRef.cc | 38 ++++++++++++++++++++++++++++---------- + poppler/XRef.h | 17 +++++++++++++++-- + 2 files changed, 43 insertions(+), 12 deletions(-) + +commit ea61a9dc012fbffd9bc9fe8a09264ba8744635fc +Author: Albert Astals Cid +Date: Mon May 13 23:15:55 2013 +0200 + + 0.23.0 + + Includes news, soversions, updated copyrights, etc + + CMakeLists.txt | 6 +++--- + NEWS | 12 ++++++++++++ + configure.ac | 4 ++-- + cpp/Doxyfile | 2 +- + goo/gfile.cc | 1 + + goo/gfile.h | 1 + + poppler/CairoOutputDev.h | 2 +- + poppler/Makefile.am | 2 +- + poppler/Stream.cc | 1 + + poppler/Stream.h | 1 + + poppler/XRef.cc | 1 + + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + 14 files changed, 28 insertions(+), 11 deletions(-) + +commit 7a5eee1cbebe241b8bd44027fc07682944686910 +Author: Albert Astals Cid +Date: Mon May 13 23:00:40 2013 +0200 + + Add check_pagelabelinfo test + + qt4/tests/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 30a519f21dd5df8d41a43a58b2cbd95fe657df73 +Merge: 998a9e7c 0c0aef20 +Author: Albert Astals Cid +Date: Mon May 13 20:40:04 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 0c0aef20d9cecaee1de0badc6cd56dd6e5b5bf12 +Author: Albert Astals Cid +Date: Mon May 13 19:57:02 2013 +0200 + + 0.22.4 version + + Also increase soversion since Gfx.h got a new member + + CMakeLists.txt | 4 ++-- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) + +commit 4d6662d05f6b652af97ac6e0eb1f1c1dca8e9550 +Author: Albert Astals Cid +Date: Mon May 13 19:55:21 2013 +0200 + + 0.22.4 NEWS + + NEWS | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 93e08d96867d636a70ab04ee4ad22c2214ae4b6a +Author: Albert Astals Cid +Date: Mon May 13 19:51:52 2013 +0200 + + Update copyright years + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 998a9e7c982a72b0e931304b719de40f30094d12 +Merge: 5e73cb05 73d09cd5 +Author: Albert Astals Cid +Date: Mon May 13 19:30:26 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + + Conflicts: + splash/Splash.cc + +commit 73d09cd55f3bd307450c2dd095e039ea39c69cea +Author: Albert Astals Cid +Date: Mon May 13 19:28:40 2013 +0200 + + Fix compilation with fixed point mode enabled + + Thanks to Andreas Müller for the tip + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5e73cb059e27f68b329513de609d52e84d73f8af +Merge: 5e9654a3 b3e44fc5 +Author: Albert Astals Cid +Date: Tue May 7 22:00:02 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit b3e44fc59a9258ad701bc67132dea0646fd8b61a +Author: Albert Astals Cid +Date: Tue May 7 21:53:31 2013 +0200 + + We need UnicodeParsedString here too + + Fixes KDE bug #307786 + + qt4/src/poppler-embeddedfile.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5e9654a3eb28b2c8b0985545778dd0e45829f8e1 +Merge: eeecd971 a107428e +Author: Albert Astals Cid +Date: Thu Apr 25 20:45:34 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + + Conflicts: + poppler/Gfx.h + +commit a107428e7db0c420b60418a33b9f815909ac9a33 +Author: Albert Astals Cid +Date: Thu Apr 25 20:44:36 2013 +0200 + + Update my C of the last two previous commits + + poppler/Gfx.cc | 2 +- + poppler/Gfx.h | 2 +- + utils/HtmlOutputDev.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit eeecd9718f201dc795b2cb8469c43860aec6e07d +Author: Albert Astals Cid +Date: Thu Apr 25 20:29:24 2013 +0200 + + Do not start drawing a form we are already drawing + + Bug #63190 + + poppler/Gfx.cc | 23 +++++++++++++++++++---- + poppler/Gfx.h | 2 ++ + 2 files changed, 21 insertions(+), 4 deletions(-) + +commit 43d66e11aa9e692c1c6b3a237e7e972d317e5c4d +Author: Albert Astals Cid +Date: Thu Apr 25 20:27:43 2013 +0200 + + Make sure getKids returns != 0 before using it + + Fixes crash in bug #63909 + + utils/HtmlOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ec298b3b780f885464aa00880150eaa2b9b50b08 +Author: Albert Astals Cid +Date: Thu Apr 25 20:29:24 2013 +0200 + + Do not start drawing a form we are already drawing + + Bug #63190 + + poppler/Gfx.cc | 23 +++++++++++++++++++---- + poppler/Gfx.h | 2 ++ + 2 files changed, 21 insertions(+), 4 deletions(-) + +commit 11ab42e7e90099d0cebf8f02197413fd5dee044b +Author: Albert Astals Cid +Date: Thu Apr 25 20:27:43 2013 +0200 + + Make sure getKids returns != 0 before using it + + Fixes crash in bug #63909 + + utils/HtmlOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4ee78e77f7d6cadc8e150ceff96b546ddca329d4 +Author: Carlos Garcia Campos +Date: Sat Apr 20 16:41:56 2013 +0200 + + cairo: Always use the trasnfer function if present in setSoftMask + + "If the subtype is Alpha, the transparency group XObject G shall be + evaluated to compute a group alpha only. The colours of the + constituent + objects shall be ignored and the colour compositing computations shall + not be performed. The transfer function TR shall then be applied + to the + computed group alpha to produce the mask values." + + We were using the transfer function only for luminosity soft masks. + + https://bugs.freedesktop.org/show_bug.cgi?id=63587 + + poppler/CairoOutputDev.cc | 37 +++++++++++++++++++------------------ + 1 file changed, 19 insertions(+), 18 deletions(-) + +commit 3c2a92b06a6541071bd1e555606bb2096de17ef6 +Author: Carlos Garcia Campos +Date: Sat Apr 20 16:41:56 2013 +0200 + + cairo: Always use the trasnfer function if present in setSoftMask + + "If the subtype is Alpha, the transparency group XObject G shall be + evaluated to compute a group alpha only. The colours of the + constituent + objects shall be ignored and the colour compositing computations shall + not be performed. The transfer function TR shall then be applied + to the + computed group alpha to produce the mask values." + + We were using the transfer function only for luminosity soft masks. + + https://bugs.freedesktop.org/show_bug.cgi?id=63587 + + poppler/CairoOutputDev.cc | 37 +++++++++++++++++++------------------ + 1 file changed, 19 insertions(+), 18 deletions(-) + +commit fd648e83e60db7157b7273ffddc02308b0c5813b +Merge: 970e9f63 53b9cec6 +Author: Albert Astals Cid +Date: Sun Apr 21 23:30:16 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 53b9cec6c1334020f90b885cff6fc30293437e5f +Author: Thomas Freitag +Date: Sun Apr 21 23:28:40 2013 +0200 + + Splash: Always consider a softmask transfer function + + Fixes bug 63587 in splash + + poppler/SplashOutputDev.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 970e9f6304c3b59ac3e44495b90a5cfe7c7ceb8b +Author: Hib Eris +Date: Fri Apr 12 13:26:55 2013 +0200 + + Remove unused variables from Lexer::getObj() + + https://bugs.freedesktop.org/show_bug.cgi?id=63467 + + poppler/Lexer.cc | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +commit f8bf602620b3c7570f483ac66fc4d6a76a81a882 +Merge: bbd27dc4 62a5b4d5 +Author: Albert Astals Cid +Date: Sun Apr 14 16:40:51 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 62a5b4d5c6d5c368d190b86eab63ccb07d642c01 +Author: Hib Eris +Date: Sun Apr 14 16:37:14 2013 +0200 + + Check for strcpy_s() and strcat_s() at configure time + + It is better to test for functions than to hardcode exceptions for + specific compilers. + + This fixes compiling poppler with the latest mingw-w64 compiler which + has strcpy_s() and strcat_s() build in. + + Bug #63459 + + ConfigureChecks.cmake | 2 ++ + configure.ac | 1 + + test/perf-test.cc | 6 ++++-- + 3 files changed, 7 insertions(+), 2 deletions(-) + +commit bbd27dc4ce7b24af890d80f597f74e5d7ee0215a +Merge: ea3698cf 5bc00809 +Author: Albert Astals Cid +Date: Fri Apr 12 00:10:27 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + + Conflicts: + poppler/TextOutputDev.h + +commit 5bc00809ebe560a180d5df93eb50bdf0ff0e97e6 +Author: Albert Astals Cid +Date: Thu Apr 11 23:29:00 2013 +0200 + + Increase poppler core soname + + CMakeLists.txt | 2 +- + poppler/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 115d4c1465291adde86c3c905f265ac03374441f +Author: Albert Astals Cid +Date: Thu Apr 11 23:28:17 2013 +0200 + + Increase version number to 0.22.3 + + CMakeLists.txt | 2 +- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit ae1a3553b85e2616a339aacb6efecd15db373858 +Author: Albert Astals Cid +Date: Thu Apr 11 23:26:44 2013 +0200 + + News file + + NEWS | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit 1fefe98fc86cf8449346bdc230dff5758b1bb7a3 +Author: Albert Astals Cid +Date: Thu Apr 11 23:22:20 2013 +0200 + + Update copyrgihts + + poppler/CairoOutputDev.cc | 2 +- + poppler/PDFDoc.cc | 2 +- + poppler/TextOutputDev.cc | 2 +- + poppler/TextOutputDev.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit ea3698cfffc9c132081f5691287ef1fd17911b2a +Merge: fcc14682 aaaea5d0 +Author: Albert Astals Cid +Date: Wed Apr 10 20:42:01 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit aaaea5d0f2f427e82625a04f90c178e24892e539 +Author: Marek Kasik +Date: Wed Apr 10 16:41:48 2013 +0200 + + man pages: Fix typos + + Fix several typos in manual pages of pdftops and pdfseparate. + + utils/pdfseparate.1 | 2 +- + utils/pdftops.1 | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit fcc14682899ff4981bfece74dbc8c290a625b05c +Merge: f11e2162 e6559a0d +Author: Albert Astals Cid +Date: Sun Apr 7 17:44:12 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit e6559a0d836df127ed5061794dc737d435ef534c +Author: Albert Astals Cid +Date: Sun Apr 7 17:42:23 2013 +0200 + + Fix crash in KDE bug #317710 + + It is not guaranteed that the ::LinkAction passed to + PageData::convertLinkActionToLink + will be always around (e.g. Page::action deletes it) so make a copy + of the ::MediaRendition object + + qt4/src/poppler-link.h | 6 +++--- + qt4/src/poppler-media.cc | 6 ++++++ + qt4/src/poppler-media.h | 5 ++++- + qt4/src/poppler-page.cc | 4 ++-- + 4 files changed, 15 insertions(+), 6 deletions(-) + +commit f11e21627121c3ff81c0ec7f4d71936a2dd590c3 +Merge: e1ffa910 b9fdb0cb +Author: Albert Astals Cid +Date: Sat Apr 6 23:26:54 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit e1ffa9100cf6b4a444be7ed76b11698a5c5bb441 +Author: Thomas Freitag +Date: Sat Apr 6 23:21:58 2013 +0200 + + Fix endstream detection + + Part 1 of bug #62985 + + the endstream search, and at least with bug-poppler16579.pdf this + doesn't work correctly: the shift(-1) with the used token mechanism + in Lexer isn't correct for a binary data stream. If there is i.e. a + "(" without corresponding ")" in the binary data, which of course can + happen and happens in that pdf, shift(-1) skips the searched endstream + and can therefore in worst case reach the end-of-file. Therefore I + implemented a shift("endstream") in Java, which I now port back to + C++, or in other words "There and Back Again" :-) + + You can test it with bug-poppler16579.pdf if You just change temporary + + if (longNumber <= INT_MAX && longNumber >= INT_MIN && + *end_ptr == '\0') { + + in XRef.cc to + + if (gFalse && longNumber <= INT_MAX && longNumber >= + INT_MIN && *end_ptr == '\0') { + + poppler/Lexer.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++ + poppler/Lexer.h | 2 ++ + poppler/Parser.cc | 28 ++++++++++++++++++++++++++-- + poppler/Parser.h | 2 ++ + 4 files changed, 75 insertions(+), 2 deletions(-) + +commit b9fdb0cb767a228c56f3f0635a7f78e3e0a8c7b6 +Author: Albert Astals Cid +Date: Sat Apr 6 23:20:48 2013 +0200 + + Last commit was Thomas' forgot his (C) + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 94bee4601cbbda0e7c6205a04650e0510f198aee +Merge: 42368fb9 b312210b +Author: Albert Astals Cid +Date: Sat Apr 6 23:19:25 2013 +0200 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit b312210b630f96baeb8b2f3b49b0b79779609d98 +Author: Albert Astals Cid +Date: Sat Apr 6 23:18:18 2013 +0200 + + Fix for complete rewrites in repaired files + + Part 2 of bug #62985 + if You save a PDF with defect xref offsets, the + + readXRefUntil(-1 /* read all xref sections */, &xrefStreamObjNums) + + in XRef::scanSpecialFlags() will destroy the already reconstructed + entries table, but this means that any modification which the user did + in the meantime get lost. This can be tested i.e. with bug168518.pdf. + + poppler/XRef.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 42368fb9452c3719a7bbd159f1c1421068f40653 +Author: Albert Astals Cid +Date: Sat Apr 6 18:28:35 2013 +0200 + + Add missing free() + + poppler/PDFDoc.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 2264e7a95e5dc252de1b5736a1edd6bf5de3ad1f +Author: Thomas Freitag +Date: Sat Apr 6 18:27:57 2013 +0200 + + implement Crypt filter + + Bug #62800 + + poppler/Decrypt.h | 3 ++- + poppler/PDFDoc.cc | 37 ++++++++++++++++++++++++++++++++++--- + poppler/Stream.cc | 6 ++++++ + poppler/Stream.h | 3 ++- + 4 files changed, 44 insertions(+), 5 deletions(-) + +commit a65a4e6f878ff033b780b2f1e3362f2918c93b6b +Author: Adam Reichold +Date: Sat Apr 6 18:25:21 2013 +0200 + + No need to keep the mutex attributes around all the time + + goo/GooMutex.h | 27 ++++++++++----------------- + 1 file changed, 10 insertions(+), 17 deletions(-) + +commit 73ff5ad58cfe7ec9415cc1459b6ca083fee608f4 +Author: Albert Astals Cid +Date: Sat Apr 6 18:19:28 2013 +0200 + + Pass the recursion flag + + poppler/DCTStream.cc | 6 +++--- + poppler/DCTStream.h | 2 +- + poppler/Stream.cc | 4 ++-- + poppler/Stream.h | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +commit 837e3704e76ea857b3de45503840e9b855096fef +Author: Albert Astals Cid +Date: Sat Apr 6 17:01:08 2013 +0200 + + Make our mutexes recursive + + Fixes a deadlock problem found with a pdf i can't share + (411klaralv.pdf) + Reviewed by Thomas and Adam on the mailing list + + CMakeLists.txt | 3 +++ + glib/CMakeLists.txt | 3 +++ + goo/GooMutex.h | 36 ++++++++++++++++++++++-------------- + poppler/Annot.cc | 34 +++++++++++++++++----------------- + poppler/Annot.h | 4 ++-- + poppler/Catalog.cc | 24 +++++++++++------------- + poppler/Catalog.h | 8 ++++---- + poppler/XRef.cc | 2 +- + utils/CMakeLists.txt | 3 +++ + 9 files changed, 66 insertions(+), 51 deletions(-) + +commit 0a243c8c14d09a40f25338999c3ca06273277b45 +Author: Adam Reichold +Date: Fri Apr 5 00:00:07 2013 +0200 + + Add a GooFile class to encapsulate file read access using offsets + + Bug #62735 + + ConfigureChecks.cmake | 2 ++ + config.h.cmake | 6 ++++ + configure.ac | 1 + + goo/gfile.cc | 80 + ++++++++++++++++++++++++++++++++++++++++++++++ + goo/gfile.h | 30 +++++++++++++++++ + poppler/GlobalParamsWin.cc | 19 ++++------- + poppler/PDFDoc.cc | 37 ++++++--------------- + poppler/PDFDoc.h | 4 ++- + poppler/Stream.cc | 46 +++++++++----------------- + poppler/Stream.h | 17 +++------- + 10 files changed, 158 insertions(+), 84 deletions(-) + +commit 70e6af4739d2eea58e6f3200a8c9467597a12ae5 +Author: Rodrigo Rivas Costa +Date: Thu Apr 4 23:10:09 2013 +0200 + + Be pedantic about setjmp use + + Bug #63067 + + poppler/DCTStream.cc | 57 + +++++++++++++++++++++++++++------------------------- + 1 file changed, 30 insertions(+), 27 deletions(-) + +commit c7e28e3d672654f31f1a0f95245a1fba3bc9c28f +Author: Albert Astals Cid +Date: Mon Mar 25 22:55:58 2013 +0100 + + Only write the file once when saving + + Bug #62739 + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 09ddb34f202be2111c70901724d64d3b61483c7a +Author: Albert Astals Cid +Date: Mon Mar 25 22:55:58 2013 +0100 + + Only write the file once when saving + + Bug #62739 + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 75378557f409a5a2305ea0fb42c56184c74ba887 +Author: Carlos Garcia Campos +Date: Sun Mar 24 12:53:29 2013 +0100 + + glib: Always start from the beginning when starting a new search on + a page + + And start from previous match when searching the next one on the same + page. This allows to search for the same string multiple times on the + same page. + + https://bugs.freedesktop.org/show_bug.cgi?id=59972 + + glib/poppler-page.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 4ee6757dd7de9211faf8601531342a199225a06d +Author: Carlos Garcia Campos +Date: Sun Mar 24 12:53:29 2013 +0100 + + glib: Always start from the beginning when starting a new search on + a page + + And start from previous match when searching the next one on the same + page. This allows to search for the same string multiple times on the + same page. + + https://bugs.freedesktop.org/show_bug.cgi?id=59972 + + glib/poppler-page.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 83cf2d3d3ecce6340d858a2ee037cd5120ac1db5 +Author: Jason Crain +Date: Sat Mar 9 08:44:36 2013 -0600 + + TextOutputDev: Set text matrix when painting selection + + https://bugs.freedesktop.org/show_bug.cgi?id=61042 + + poppler/TextOutputDev.cc | 30 +++++++++++++++++++++++------- + poppler/TextOutputDev.h | 3 ++- + 2 files changed, 25 insertions(+), 8 deletions(-) + +commit a3bc584fdd7f74a7dab701c743df0bb0bf74a03e +Author: Jason Crain +Date: Sat Mar 9 08:44:36 2013 -0600 + + TextOutputDev: Set text matrix when painting selection + + https://bugs.freedesktop.org/show_bug.cgi?id=61042 + + poppler/TextOutputDev.cc | 30 +++++++++++++++++++++++------- + poppler/TextOutputDev.h | 3 ++- + 2 files changed, 25 insertions(+), 8 deletions(-) + +commit 8cbdbc64897a34beb226d4dc4c58095f10013f29 +Merge: 2bce2cf2 a01e2d41 +Author: Albert Astals Cid +Date: Wed Mar 20 22:37:06 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit a01e2d41fcb638fe340bd3d4d22bd13db245e0fd +Author: Thomas Freitag +Date: Wed Mar 20 22:35:08 2013 +0100 + + check order bounding box values in tiling pattern + + Bug #62369 + + poppler/Gfx.cc | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) + +commit 2bce2cf2a523f9b8db7f5e255384044b8dfe1a24 +Author: Albert Astals Cid +Date: Tue Mar 19 22:53:47 2013 +0100 + + Avoid blackboxes on weird files using the thin line mode + + Bug #61719 + + splash/Splash.cc | 35 +++++++++++++++++++++++++++++++++++ + splash/Splash.h | 1 + + 2 files changed, 36 insertions(+) + +commit b2d07cbf0c2f94bd25e1422e366ff78031815867 +Merge: 80cf78f2 32069506 +Author: Albert Astals Cid +Date: Mon Mar 18 21:06:59 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 3206950658521009b52f638cc5e712e0cef42706 +Author: Albert Astals Cid +Date: Mon Mar 18 21:06:09 2013 +0100 + + Spec says Zoom -> 0 means no zoom change + + poppler/Link.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 13ee9f8b7d42ed7d7bc0f9dbf190ff66e6ab5a81 +Author: Pino Toscano +Date: Mon Mar 18 18:15:57 2013 +0100 + + cmake: drop search of gthread-2.0 and gio-2.0 from GTK + + this matches what is done in the autoconf counterpart + + cmake/modules/FindGTK.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 47e869e60fb147caca825380eeaa2a0851d502b9 +Author: Michael Weiser +Date: Mon Mar 18 18:15:14 2013 +0100 + + cmake: search also for gio-2.0 as GLIB library + + cmake/modules/FindGLIB.cmake | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 80cf78f2020e2f4cf33ed49fe522c6861d710588 +Merge: b21780e6 72c8312d +Author: Adrian Johnson +Date: Mon Mar 18 20:02:08 2013 +1030 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 72c8312d77704211f55c8de35b47bd811c792878 +Author: Adrian Johnson +Date: Sun Mar 17 19:39:14 2013 +1030 + + cairo: Don't change image interpolation when printing + + Bug 62418 + + poppler/CairoOutputDev.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit b21780e69dd92f3f2bcb7851608d3e0557dc81f8 +Author: Thomas Freitag +Date: Sat Mar 16 23:20:35 2013 +0100 + + Fix typo + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 75849a0d7c205c048714b90883695b6bebd2298c +Merge: ec7140b3 5a51812b +Author: Albert Astals Cid +Date: Tue Mar 12 20:27:59 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + + Conflicts: + poppler/Stream.h + +commit 5a51812b7c1457feb8acaa106f43d7d5252b3980 +Author: Peter Breitenlohner +Date: Tue Mar 12 20:25:50 2013 +0100 + + Fix compile when not using libjpeg + + poppler/Stream.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 341e863d65fdd5619a071e4fd903fa82bf33c757 +Author: Albert Astals Cid +Date: Mon Mar 11 19:20:06 2013 +0100 + + 0.22.2 + + CMakeLists.txt | 4 ++-- + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 22 insertions(+), 6 deletions(-) + +commit ec7140b3f56b034fbbc53cb8066ba01fe9f60f47 +Merge: c86062f9 5db6585c +Author: Albert Astals Cid +Date: Fri Mar 8 16:41:21 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + + Conflicts: + poppler/Stream.cc + poppler/Stream.h + +commit 5db6585c2b02dd4071f1adabd53509506333dcf8 +Author: Albert Astals Cid +Date: Fri Mar 8 16:38:49 2013 +0100 + + Make the non jpeglib based DCTStream compile + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6402e291e1f9374fbaf4de3b97b21f43d38d6ab8 +Author: Thomas Freitag +Date: Fri Mar 8 16:37:11 2013 +0100 + + Workaround broken jpeg stream definitions + + Bug #61994 + + poppler/DCTStream.cc | 22 +++++++++++++++++++--- + poppler/DCTStream.h | 6 +++++- + poppler/Stream.cc | 8 ++++---- + poppler/Stream.h | 4 ++-- + 4 files changed, 30 insertions(+), 10 deletions(-) + +commit c86062f982d6eb08cb27b654b6317c71ab77c692 +Merge: 677e5b26 4e142b60 +Author: Albert Astals Cid +Date: Mon Mar 4 20:13:36 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 4e142b60790638e4495b4fd6551702470cf4c38f +Author: Albert Astals Cid +Date: Mon Mar 4 20:12:01 2013 +0100 + + Make sure we don't try to paint in x < 0 + + Fixes crash in KDE bug #315432 + + splash/Splash.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 677e5b265a0d39a988f65d642a4f964a279fad28 +Author: Albert Astals Cid +Date: Sun Mar 3 19:07:32 2013 +0100 + + Small improvements over locker class + + * Remove the namespace (we don't use much/any namespaces in + poppler core) + * Rename the class and defines from lock to locker since lock and be + either the action "to lock" or the "thing that locks", with locker + it is more clear (i think) that is "the thing" than "the action" + * Make Annot::decRefCnt use gLockMutex since we the object itself + is being deleted in the if and not sure the locker would be happy + with that + * change the getNumPages() param to be DoNotLockMutex since + previously it was a gFalse (i guess Thomas made a c&p typo here) + * Have only one constructor like Adam suggested. + + goo/GooMutex.h | 33 +++++++++-------- + poppler/Annot.cc | 92 + +++++++++++++++++++++++----------------------- + poppler/Annot.h | 6 +-- + poppler/Array.cc | 15 ++++---- + poppler/CairoFontEngine.cc | 8 ++-- + poppler/Catalog.cc | 52 +++++++++++++------------- + poppler/Catalog.h | 10 ++--- + poppler/Dict.cc | 20 +++++----- + poppler/PDFDoc.cc | 12 +++--- + poppler/Page.cc | 16 ++++---- + poppler/Stream.cc | 8 ++-- + poppler/XRef.cc | 18 ++++----- + 12 files changed, 147 insertions(+), 143 deletions(-) + +commit d5c929fc253c2748bb8fa3642d9b5383c5fe96f8 +Author: Thomas Freitag +Date: Sun Mar 3 18:00:11 2013 +0100 + + Add a locker helper and a bool -> enum changes + + Bug #59933 + + goo/GooMutex.h | 16 +++++++ + poppler/Annot.cc | 114 + +++++++++++++++++---------------------------- + poppler/Annot.h | 4 +- + poppler/Array.cc | 22 +++------ + poppler/CairoFontEngine.cc | 10 ++-- + poppler/Catalog.cc | 79 ++++++++++--------------------- + poppler/Catalog.h | 9 ++-- + poppler/Dict.cc | 29 ++++-------- + poppler/FontInfo.cc | 2 +- + poppler/PDFDoc.cc | 21 ++------- + poppler/Page.cc | 32 ++++++------- + poppler/Page.h | 3 +- + poppler/Stream.cc | 12 ++--- + poppler/XRef.cc | 29 ++++-------- + 14 files changed, 145 insertions(+), 237 deletions(-) + +commit 1f4a012f7570ffd2120e3e8c2236de5408f3dda3 +Merge: 15d40392 a766740c +Author: Albert Astals Cid +Date: Fri Mar 1 19:16:52 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit a766740cf5a5a7580935a026bf15fbd668aa0fdf +Author: Thomas Freitag +Date: Fri Mar 1 19:12:22 2013 +0100 + + Restore CTM on early exits + + Bug #61413 + + poppler/SplashOutputDev.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 15d40392a29dded8a29c2dc9d7c15b402515e033 +Merge: be5d9af3 39882dfe +Author: Albert Astals Cid +Date: Thu Feb 28 19:46:59 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 39882dfecdccc00db353946a31d395582ee37022 +Author: José Aliste +Date: Wed Feb 27 01:33:38 2013 +0100 + + Correct rendering of underline and strike out annotations + + Current code assumes that the text to underline or strike out is + horizontal. + Fixes bug #61518 + + poppler/Annot.cc | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +commit be5d9af38655496a2eaa4eb12cea84461c5aeb3f +Author: Thomas Freitag +Date: Sat Feb 23 23:41:46 2013 +0100 + + expose thin line modes in qt frontend + + qt4/src/poppler-page.cc | 5 ++++- + qt4/src/poppler-qt4.h | 6 ++++-- + 2 files changed, 8 insertions(+), 3 deletions(-) + +commit f96cbacfdbc97ace35f843854992f06e9322f485 +Author: Thomas Freitag +Date: Sat Feb 23 23:39:52 2013 +0100 + + Refine splashThinLineShape support + + splash/Splash.cc | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +commit 47453a78e52aa43edd148aef53b67306603161f5 +Author: Thomas Freitag +Date: Wed Feb 20 23:12:17 2013 +0100 + + More threading safety + + poppler/Annot.cc | 97 + +++++++++++++++++++++++++++++++++++------ + poppler/Annot.h | 8 +++- + poppler/FontInfo.cc | 29 ++++++------ + poppler/FontInfo.h | 5 ++- + poppler/Page.cc | 11 ++++- + poppler/Page.h | 6 +-- + poppler/SplashOutputDev.cc | 7 ++- + poppler/SplashOutputDev.h | 5 ++- + poppler/XRef.cc | 4 +- + qt4/src/poppler-page.cc | 9 ++-- + qt4/src/poppler-ps-converter.cc | 3 +- + 11 files changed, 139 insertions(+), 45 deletions(-) + +commit 60c5e072d4b930507469e6e8c234971725a4aa26 +Merge: 0d42a6da 8d626256 +Author: Albert Astals Cid +Date: Wed Feb 20 21:08:53 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 8d62625610746ad70ffb88d845791fa03f5e35cc +Author: Thomas Fischer +Date: Wed Feb 20 21:07:10 2013 +0100 + + height -> maskHeight + + Bug #61168 + + utils/ImageOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 0d42a6dab479d27de1ecb2b47ad3f7568b1ee638 +Merge: 7eb78809 8fb243bf +Author: Albert Astals Cid +Date: Wed Feb 20 00:00:09 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 8fb243bf11a979af8bfa36427436940706c9f71d +Author: Albert Astals Cid +Date: Tue Feb 19 23:59:17 2013 +0100 + + Initialize cSrcNonIso[3] in splashModeXBGR8 + + Fixes valgrind warning + + splash/Splash.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 8a0199a0247c1a03a4d64375ca8bc900570d1817 +Author: Albert Astals Cid +Date: Tue Feb 19 23:11:46 2013 +0100 + + Fix indent + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7eb7880907cb7b6bd1032013d6ce4c49aa3525c4 +Merge: 2c84acbf 1389aa41 +Author: Albert Astals Cid +Date: Tue Feb 19 22:26:37 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 1389aa41b2984de9da7bb66c11485f6c6aeaea41 +Author: Albert Astals Cid +Date: Tue Feb 19 22:25:56 2013 +0100 + + fix indent + + splash/Splash.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2c84acbfd02eeeaf0d20542798e907cb011c1e57 +Merge: 401c35b7 ffd33e7b +Author: Albert Astals Cid +Date: Tue Feb 19 11:32:11 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit ffd33e7b5aea44bc54a74f433f6bfff859b913dd +Author: Albert Astals Cid +Date: Tue Feb 19 11:31:22 2013 +0100 + + Fix missing ) here too + + README.contributors | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 14466ecc320387c9b6568280614a96e6f56309b4 +Author: Albert Astals Cid +Date: Tue Feb 19 11:31:02 2013 +0100 + + Forgot my C here + + poppler/PageLabelInfo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 401c35b797d3c25c734fbfb5b95be16a666a6012 +Author: Albert Astals Cid +Date: Mon Feb 18 22:33:07 2013 +0100 + + Fix closing ) as suggested by William Bader + + README.contributors | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 94364adade4dc27e5d80bc14511d4f2b7ea4ab0d +Merge: 164805b4 47f30fa9 +Author: Albert Astals Cid +Date: Mon Feb 18 20:34:34 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 47f30fa96e62fc215c0e80f42517908760ef8065 +Author: Brad Hards +Date: Mon Feb 18 20:38:10 2013 +1100 + + Minor rewording of contributor README + + README.contributors | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 164805b4471256d3915c5e49fff28c9cdcbf89e6 +Author: Albert Astals Cid +Date: Mon Feb 18 20:05:12 2013 +0100 + + Move the commented test to a proper one + + poppler/Makefile.am | 3 +- + poppler/PageLabelInfo.cc | 160 + +------------------------------------- + poppler/PageLabelInfo_p.h | 147 + ++++++++++++++++++++++++++++++++++ + qt4/tests/CMakeLists.txt | 1 + + qt4/tests/Makefile.am | 4 + + qt4/tests/check_pagelabelinfo.cpp | 43 ++++++++++ + 6 files changed, 198 insertions(+), 160 deletions(-) + +commit 527b91a0ef97906041ffe57e88f0d26e1c407af0 +Merge: df355624 95609be5 +Author: Albert Astals Cid +Date: Mon Feb 18 19:49:14 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 95609be551fc4413874b8980010be70fbbab112a +Author: Albert Astals Cid +Date: Mon Feb 18 19:47:19 2013 +0100 + + Use the toLatin function in PageLabelInfo::indexToLabel + + Wonder why Kristian never enabled it? + Fixes bug #61034 + + poppler/PageLabelInfo.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit df3556240d5e4b4546b3c42b29be6d2be83a2802 +Merge: 4dacd7cd 5c7057c6 +Author: Albert Astals Cid +Date: Tue Feb 12 23:55:24 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 5c7057c61ed6e270e001c1f86632f265bebb6890 +Author: Nuno Araujo +Date: Tue Feb 12 23:54:47 2013 +0100 + + Fix the build with automake-1.13 + + autogen.sh | 17 +++++++++-------- + configure.ac | 3 +-- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit 4dacd7cdeb19d16fe7737c71e34904c7363c6b63 +Merge: 7f2c255f 9fc4b9f7 +Author: Albert Astals Cid +Date: Tue Feb 12 22:59:56 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + +commit 9fc4b9f7a7e6105a6fd85aed9c21b78742e89ddd +Author: Peter Breitenlohner +Date: Tue Feb 12 22:58:17 2013 +0100 + + true->TRUE + + Fixes compilation with jpeglib9 + + goo/JpegWriter.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7f2c255ff28386ba992717f729f25a979f240375 +Author: Thomas Freitag +Date: Tue Feb 12 22:48:40 2013 +0100 + + Introduce option SplashThinLineMode + + More info at bug #37347 + + poppler/SplashOutputDev.cc | 9 ++++++++- + poppler/SplashOutputDev.h | 3 ++- + splash/Splash.cc | 37 ++++++++++++++++++++++++++++++------- + splash/Splash.h | 9 +++++++-- + splash/SplashClip.cc | 7 ++++--- + splash/SplashClip.h | 4 +++- + splash/SplashTypes.h | 8 +++++++- + splash/SplashXPath.cc | 14 ++++++++++++-- + splash/SplashXPath.h | 17 ++++++++++++++++- + splash/SplashXPathScanner.cc | 9 +++++---- + splash/SplashXPathScanner.h | 17 ++++++++++++++++- + 11 files changed, 110 insertions(+), 24 deletions(-) + +commit c2ebcbea2267f861c491c0cd6c1fbf2dc2aff7d2 +Merge: 48ed05d9 dca21f86 +Author: Albert Astals Cid +Date: Sun Feb 10 12:01:13 2013 +0100 + + Merge remote-tracking branch 'origin/poppler-0.22' + + Conflicts: + poppler/Parser.cc + +commit dca21f86359b6b2a925f7b05a2f36ab854cefbce +Author: Albert Astals Cid +Date: Sun Feb 10 11:47:21 2013 +0100 + + 0.22.1 + + CMakeLists.txt | 2 +- + NEWS | 9 +++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 13 insertions(+), 4 deletions(-) + +commit e8e9245f6a4884da3940fc281b7ff1a42d7f5964 +Author: Albert Astals Cid +Date: Sun Feb 10 11:43:14 2013 +0100 + + Update C year here too + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ebbacd897e2b529d1c3637b6af438b8dcc1d7ce8 +Author: Albert Astals Cid +Date: Sun Feb 10 11:42:21 2013 +0100 + + Update C + + poppler/Parser.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 48ed05d95598b642a57456a843baf9f246502bb6 +Author: Adrian Johnson +Date: Wed Feb 6 21:56:01 2013 +1030 + + Make Goffset long long and factor out all fseek/ftell into gfile.cc + + This fixes build problems on 32-bit machines due to off_t being + defined differently depending on whether source files included + condig.h. + + Bug 60095 + + goo/gfile.cc | 38 ++++++++++++++++++++++++ + goo/gfile.h | 7 +++++ + goo/gtypes.h | 19 +----------- + poppler/Stream.cc | 67 + ++++++------------------------------------ + poppler/XRef.cc | 4 +-- + poppler/poppler-config.h.cmake | 6 ---- + poppler/poppler-config.h.in | 6 ---- + utils/pdfinfo.cc | 16 ++-------- + 8 files changed, 60 insertions(+), 103 deletions(-) + +commit fbcd64386c1b189db6e06234577261973bdc88cc +Author: Adrian Johnson +Date: Fri Jan 25 22:24:50 2013 +1030 + + cairo: support uncolored tiling patterns + + Bug 59179 + + poppler/CairoOutputDev.cc | 20 ++++++++++++++++++++ + poppler/CairoOutputDev.h | 1 + + 2 files changed, 21 insertions(+) + +commit c60ad119363c65d097dff56a68c1ab3fb2933f0b +Author: Adrian Johnson +Date: Sun Jan 27 15:50:26 2013 +1030 + + A few more missing Goffsets + + glib/poppler-input-stream.h | 2 +- + poppler/PDFDoc.cc | 16 ++++++++-------- + poppler/PDFDoc.h | 6 +++--- + poppler/Stream.cc | 4 ++-- + poppler/Stream.h | 4 ++-- + 5 files changed, 16 insertions(+), 16 deletions(-) + +commit 9b113dc86a27085693ac4bcad061780c881ea7f9 +Author: Adrian Johnson +Date: Sun Jan 27 11:32:34 2013 +1030 + + Use sys/types.h instead of stdio.h for the off_t type + + Bug 44085 + + goo/gtypes.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit f3aa5236361dca3db64f110520ebe721ba1c9464 +Author: Pino Toscano +Date: Sun Jan 27 18:50:10 2013 +0100 + + use Goffset also for length in MemStream ctor + + poppler/Stream.cc | 2 +- + poppler/Stream.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit eb5ce6990522bac91d8f5d0d3636c46178386d25 +Author: Pino Toscano +Date: Sun Jan 27 15:20:42 2013 +0100 + + avoid max() macro expansion + + protect against compilers defining max as macro + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6b716b1ab60b573b5770d8636992247387bc3513 +Author: Pino Toscano +Date: Sun Jan 27 15:18:04 2013 +0100 + + cmake: provide HAVE_FSEEK64 and HAVE_FSEEKO in poppler-config + + followup of a3cee0e7e9dd292c70fe1fa19a92e70bbc1e1b41 also for the + cmake-generated poppler-config.h + + poppler/poppler-config.h.cmake | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit fe59ac914230b80aa82b314398a8a038ef083e06 +Author: Adrian Johnson +Date: Sat Jan 26 16:44:49 2013 +1030 + + Read 8 byte xref offsets when sizeof(Goffset) < 8 + + and print an error if the offset read is too large for Goffset. + + Bug 56318 + + poppler/XRef.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 098d98dfc3846150098f5b20f3f5a07cb565c465 +Author: Lu Wang +Date: Sat Jan 26 19:31:20 2013 +0100 + + Rename function + + Makes it say more what it does + + poppler/GfxState.cc | 3 ++- + poppler/GfxState.h | 3 ++- + poppler/SplashOutputDev.cc | 5 +++-- + 3 files changed, 7 insertions(+), 4 deletions(-) + +commit 97e93d7583f2a6a5b1c8b51474744ca05277dc28 +Author: Lu Wang +Date: Sat Jan 26 16:56:00 2013 +0100 + + Remove unused deviceHasTextClip + + poppler/CairoOutputDev.h | 1 - + poppler/OutputDev.h | 1 - + poppler/PSOutputDev.h | 1 - + poppler/SplashOutputDev.h | 1 - + utils/pdftohtml.cc | 1 - + 5 files changed, 5 deletions(-) + +commit 1bb3ddc2264cb65dffd553a952ee4518344df0de +Author: Albert Astals Cid +Date: Fri Jan 25 19:37:24 2013 +0100 + + A few Goffsets we missed + + charactersRead is returned in BaseCryptStream::getPos thus should + be a Goffset + Gfx::getPos returns Parser::getPos and thus should be a Goffset too + + poppler/Decrypt.h | 3 ++- + poppler/Gfx.cc | 4 ++-- + poppler/Gfx.h | 4 ++-- + 3 files changed, 6 insertions(+), 5 deletions(-) + +commit 5f8b1275a19b2036c6e9323a744d8bc64af31c36 +Author: Albert Astals Cid +Date: Fri Jan 25 19:32:58 2013 +0100 + + New year! + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 574907e6a74e62a5ee6d7f17c43fdd9bcb07e069 +Author: Albert Astals Cid +Date: Fri Jan 25 19:31:59 2013 +0100 + + Adrian C for 2013 because of the big files support + + cpp/poppler-private.cpp | 1 + + cpp/poppler-private.h | 1 + + goo/gtypes.h | 1 + + poppler/Decrypt.cc | 1 + + poppler/Decrypt.h | 1 + + poppler/Error.cc | 1 + + poppler/Error.h | 1 + + poppler/Hints.cc | 1 + + poppler/Hints.h | 1 + + poppler/JBIG2Stream.cc | 1 + + poppler/JBIG2Stream.h | 1 + + poppler/JPEG2000Stream.cc | 1 + + poppler/JPEG2000Stream.h | 1 + + poppler/Lexer.cc | 2 +- + poppler/Lexer.h | 1 + + poppler/Object.cc | 1 + + poppler/Object.h | 1 + + poppler/PDFDoc.cc | 1 + + poppler/PDFDoc.h | 1 + + poppler/PageTransition.cc | 1 + + poppler/Parser.cc | 1 + + poppler/Parser.h | 1 + + poppler/SecurityHandler.cc | 1 + + poppler/Stream.cc | 1 + + poppler/Stream.h | 1 + + poppler/XRef.cc | 1 + + poppler/XRef.h | 1 + + qt4/src/poppler-private.cc | 1 + + qt4/src/poppler-qiodeviceoutstream-private.h | 1 + + qt4/src/poppler-qiodeviceoutstream.cc | 1 + + utils/pdfinfo.cc | 2 +- + utils/pdfunite.cc | 1 + + 32 files changed, 32 insertions(+), 2 deletions(-) + +commit 95b81ae9b5a345c9caa3d658b9b543d1937c6c02 +Author: Adrian Johnson +Date: Fri Jan 25 21:37:51 2013 +1030 + + gitignore + + qt4/tests/.gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit 576dc53c857d99bb5d81fe7c9c52fe314a6e58ee +Author: Thomas Freitag +Date: Fri Jan 25 21:27:13 2013 +1030 + + splash: fix uninitialized memory + + Bug 44085 + + poppler/SplashOutputDev.cc | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit a9768588cd6086f4ca4e6906db038cfdbfd551d5 +Author: Adrian Johnson +Date: Fri Jan 25 21:24:29 2013 +1030 + + win32 large file support + + Bug 44085 + + goo/gtypes.h | 2 ++ + poppler/Stream.cc | 13 +++++++++++++ + utils/pdfinfo.cc | 3 +++ + 3 files changed, 18 insertions(+) + +commit a3cee0e7e9dd292c70fe1fa19a92e70bbc1e1b41 +Author: Adrian Johnson +Date: Fri Jan 25 21:23:43 2013 +1030 + + Large file support + + Create a Goffset type and use this type for all file offsets and file + sizes. + + Bug 44085 + + cpp/poppler-private.cpp | 2 +- + cpp/poppler-private.h | 2 +- + glib/poppler-input-stream.cc | 10 +- + glib/poppler-input-stream.h | 16 +-- + goo/gtypes.h | 15 +++ + poppler/Decrypt.cc | 2 +- + poppler/Decrypt.h | 2 +- + poppler/Error.cc | 10 +- + poppler/Error.h | 5 +- + poppler/Hints.cc | 4 +- + poppler/Hints.h | 6 +- + poppler/JBIG2Stream.cc | 8 +- + poppler/JBIG2Stream.h | 2 +- + poppler/JPEG2000Stream.cc | 2 +- + poppler/JPEG2000Stream.h | 2 +- + poppler/Lexer.h | 8 +- + poppler/Object.h | 8 +- + poppler/PDFDoc.cc | 54 +++++----- + poppler/PDFDoc.h | 14 +-- + poppler/Parser.cc | 10 +- + poppler/Parser.h | 2 +- + poppler/Stream.cc | 88 ++++++++--------- + poppler/Stream.h | 102 +++++++++---------- + poppler/XRef.cc | 141 + +++++++++++++++++---------- + poppler/XRef.h | 34 +++---- + poppler/poppler-config.h.in | 6 ++ + qt4/src/poppler-private.cc | 2 +- + qt4/src/poppler-qiodeviceoutstream-private.h | 2 +- + qt4/src/poppler-qiodeviceoutstream.cc | 4 +- + test/perf-test.cc | 6 +- + utils/pdfinfo.cc | 6 +- + utils/pdfunite.cc | 2 +- + 32 files changed, 320 insertions(+), 257 deletions(-) + +commit 6eebbb9c015f98b713205e56ab2f1d4d430e9206 +Author: Adrian Johnson +Date: Fri Jan 25 21:22:51 2013 +1030 + + Add Int64 object type + + Bug 44085 + + poppler/Lexer.cc | 46 + ++++++++++++++++++++-------------------------- + poppler/Object.cc | 6 +++--- + poppler/Object.h | 26 +++++++++++++++----------- + poppler/PDFDoc.cc | 4 ++-- + poppler/SecurityHandler.cc | 4 ++-- + qt4/tests/check_lexer.cpp | 24 +++++++++++++++++------- + test/pdf-fullrewrite.cc | 9 +-------- + 7 files changed, 60 insertions(+), 59 deletions(-) + +commit be495d73ce7324963a979cffc149330f5512288b +Author: Adrian Johnson +Date: Fri Jan 25 21:14:21 2013 +1030 + + use getNum instead of getReal + + poppler/PageTransition.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit a5adb6738e1e191c64457e0c07ee2e3422a042dd +Author: Albert Astals Cid +Date: Sat Jan 19 18:13:33 2013 +0100 + + Don't use config.h but poppler-config.h + + That was already included but i forgot to kill the other one + + poppler/XRef.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 8eb489c355d734a72e140ce7e32470d048362499 +Author: Thomas Freitag +Date: Sat Jan 19 17:43:08 2013 +0100 + + Make rendering thread-safe + + Bug #50992 + + glib/poppler-input-stream.cc | 4 ++ + glib/poppler-input-stream.h | 1 + + poppler/Annot.cc | 52 +++++++++---------- + poppler/Array.cc | 48 +++++++++++++++++- + poppler/Array.h | 15 ++++-- + poppler/ArthurOutputDev.cc | 3 +- + poppler/ArthurOutputDev.h | 3 +- + poppler/CairoFontEngine.cc | 33 +++++++++--- + poppler/CairoFontEngine.h | 11 ++-- + poppler/CairoOutputDev.cc | 15 ++++-- + poppler/CairoOutputDev.h | 5 +- + poppler/Catalog.cc | 84 +++++++++++++++++++++++++++---- + poppler/Catalog.h | 15 ++++-- + poppler/Dict.cc | 67 ++++++++++++++++++++++++- + poppler/Dict.h | 11 +++- + poppler/Gfx.cc | 18 ++++--- + poppler/Gfx.h | 8 +-- + poppler/GlobalParamsWin.cc | 4 +- + poppler/Object.h | 7 +-- + poppler/OutputDev.h | 4 +- + poppler/PDFDoc.cc | 66 ++++++++++++++++++------ + poppler/PDFDoc.h | 11 ++-- + poppler/PSOutputDev.cc | 12 ++--- + poppler/PSOutputDev.h | 4 +- + poppler/Page.cc | 75 ++++++++++++++++++++++++--- + poppler/Page.h | 18 +++++-- + poppler/Parser.cc | 3 +- + poppler/PreScanOutputDev.cc | 4 +- + poppler/PreScanOutputDev.h | 4 +- + poppler/SplashOutputDev.cc | 16 +++--- + poppler/SplashOutputDev.h | 5 +- + poppler/Stream.cc | 117 + ++++++++++++++++++++++++++++++++----------- + poppler/Stream.h | 35 +++++++++---- + poppler/TextOutputDev.cc | 5 +- + poppler/TextOutputDev.h | 3 +- + poppler/XRef.cc | 99 +++++++++++++++++++++++++++++++++--- + poppler/XRef.h | 16 +++++- + qt4/src/poppler-document.cc | 23 ++++----- + qt4/src/poppler-page.cc | 64 ++++++++++++++++++++--- + qt4/src/poppler-private.cc | 3 +- + qt4/src/poppler-private.h | 74 +-------------------------- + test/gtk-test.cc | 2 +- + utils/HtmlOutputDev.cc | 3 +- + utils/HtmlOutputDev.h | 3 +- + utils/ImageOutputDev.h | 3 +- + 45 files changed, 793 insertions(+), 283 deletions(-) + +commit 3db9472e2b016f1b411174273f27848193ab18e5 +Author: José Aliste +Date: Fri Jan 18 15:22:03 2013 +0100 + + Add a null check for gfxFont + + Bug #59561 + + poppler/TextOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 4b69217f72f3fd313f73df059eb1e6294878a95e +Author: Peter Dyballa +Date: Fri Jan 11 00:32:46 2013 +0100 + + Use CPPFLAGS for CPPFLAGS not CFLAGS + + Bug #59186 + + m4/libjpeg.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8b6dc55e530b2f5ede6b9dfb64aafdd1d5836492 +Author: Albert Astals Cid +Date: Thu Jan 10 22:31:52 2013 +0100 + + Fix invalid memory access in 1150.pdf.asan.8.69 + + splash/Splash.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit e14b6e9c13d35c9bd1e0c50906ace8e707816888 +Author: Albert Astals Cid +Date: Thu Jan 10 20:52:02 2013 +0100 + + Fix invalid memory access in 2030.pdf.asan.69.463 + + poppler/Function.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 0388837f01bc467045164f9ddaff787000a8caaa +Author: Albert Astals Cid +Date: Thu Jan 10 20:29:06 2013 +0100 + + Fix another invalid memory access in 1091.pdf.asan.72.42 + + poppler/Stream.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 957aa252912cde85d76c41e9710b33425a82b696 +Author: Albert Astals Cid +Date: Thu Jan 10 19:16:19 2013 +0100 + + Fix invalid memory accesses in 1091.pdf.asan.72.42 + + splash/Splash.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit bbc2d8918fe234b7ef2c480eb148943922cc0959 +Author: Albert Astals Cid +Date: Thu Jan 10 19:07:48 2013 +0100 + + Fix invalid memory accesses in 1036.pdf.asan.23.17 + + splash/Splash.cc | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit a9b8ab4657dec65b8b86c225d12c533ad7e984e2 +Author: Albert Astals Cid +Date: Wed Jan 9 22:56:45 2013 +0100 + + Fix crash in broken file 1031.pdf.asan.48.15 + + splash/Splash.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 7266a634e01e20648cc877371edc95651d30d4fc +Author: Albert Astals Cid +Date: Wed Jan 9 22:52:45 2013 +0100 + + Forgot the C of the last commit + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a205e71a2dbe0c8d4f4905a76a3f79ec522eacec +Author: Albert Astals Cid +Date: Wed Jan 9 22:47:28 2013 +0100 + + Do not crash in broken documents like 1007.pdf.asan.48.4 + + splash/Splash.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit b1026b5978c385328f2a15a2185c599a563edf91 +Author: Albert Astals Cid +Date: Wed Jan 9 22:17:09 2013 +0100 + + Initialize refLine totally + + Fixes uninitialized memory read in 1004.pdf.asan.7.3 + + poppler/Stream.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit bef2c42f381c74fdb8bbb43babe1a93a0e229fb0 +Author: Adrian Johnson +Date: Thu Jan 3 15:27:36 2013 +1030 + + Parser: return error if stream encountered when allowStreams = false + + Opening a PDF file where the first object is a stream prints a + "Command token too long" error message. This is caused by the + Linearization check in Linearization::Linearization reading objects + with allowStreams = false. The Parser ignores the "stream" token and + tries reading the next token which is usually binary data. Setting + allowStreams to true will not work since the stream length is often an + indirect object and at this point the XRef has not been created. + + Fix this by making Parser return an error object if the "stream" token + is encountered when allowStreams is false. + + Bug 58966 + + poppler/Parser.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 801f7feea79e5bc3b5417566552e4df1e6b8a51c +Author: Albert Astals Cid +Date: Sat Dec 29 19:22:54 2012 +0100 + + 0.22.0 + + CMakeLists.txt | 6 +++--- + NEWS | 14 ++++++++++++++ + configure.ac | 4 ++-- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 22 insertions(+), 8 deletions(-) + +commit bf5ef68c89d4189b18458b764f807cfc6599bad7 +Author: Carlos Garcia Campos +Date: Sat Dec 29 19:43:11 2012 +0100 + + regtest: Print test results when the test has finished + + To make sure the result corresponds to the test now that we are using + multiple threads. + + regtest/Printer.py | 25 +++++++++++++++++++------ + regtest/TestRun.py | 18 +++++++++--------- + 2 files changed, 28 insertions(+), 15 deletions(-) + +commit 80c7f6aa3fa83175fafc71fa8c834350d513a48f +Author: Jason Crain +Date: Fri Nov 23 23:31:01 2012 -0600 + + TextOutputDev: Use page size for max value in TextPage::visitSelection + + https://bugs.freedesktop.org/show_bug.cgi?id=50138 + + poppler/TextOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 0d31edfa5617f4fecb04d5476de54a63b6146686 +Author: Ross Lagerwall +Date: Fri Nov 30 09:23:55 2012 +0000 + + pdf-inspector Change from the deprecated GtkTable to GtkGrid + + This fixes the problem of the description_label height changing after + its text changes which was introduced since the port to Gtk3. + + https://bugs.freedesktop.org/show_bug.cgi?id=57727 + + test/pdf-inspector.ui | 39 +++++++++++++++------------------------ + 1 file changed, 15 insertions(+), 24 deletions(-) + +commit 9977a4f26b5698b0b85ca911e7392013941944e0 +Author: Ross Lagerwall +Date: Tue Nov 13 15:49:44 2012 +0000 + + pdf-inspector: Remove deprectated has-separator property + + https://bugs.freedesktop.org/show_bug.cgi?id=57727 + + test/pdf-inspector.ui | 1 - + 1 file changed, 1 deletion(-) + +commit 806d116a38c2a6552c9bcee2c6f753d7059c17aa +Author: Ross Lagerwall +Date: Tue Nov 13 15:44:15 2012 +0000 + + pdf-inspector: Add correct title and copyright + + https://bugs.freedesktop.org/show_bug.cgi?id=57727 + + test/pdf-inspector.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 7d5bf74c19768fa3447819a4debff06d5d83900a +Author: Ross Lagerwall +Date: Tue Nov 13 15:23:36 2012 +0000 + + pdf-inspector: Fix crash by not freeing filename_g + + It is not necessary because PDFDoc takes over filename_g and destroys + it in its deconstructor. + + https://bugs.freedesktop.org/show_bug.cgi?id=57727 + + test/pdf-inspector.cc | 1 - + 1 file changed, 1 deletion(-) + +commit d61c6d4944d6f7c9e8b517dd28958124f4923d08 +Author: Thomas Freitag +Date: Fri Dec 28 01:18:48 2012 +0100 + + Repair pdfunite + + Sorry, when I implemented the support encrypted pdf files in + pdfseparate I + missed that writePageObjects of course is also used in pdfunite + for combining + pages, and even more that encrypted files are still not supported + by pdfunite, + I removed the numoffset from writing the objects itself. Therefore + there are + still all objects in the combined pdf file, but the references + missing the + numoffset and therefore were no more reachable. + The patch repairs it. + + Bug #58569 + + poppler/PDFDoc.cc | 6 ++++-- + poppler/PDFDoc.h | 4 ++-- + utils/pdfunite.cc | 4 ++-- + 3 files changed, 8 insertions(+), 6 deletions(-) + +commit be4804bff2b722ceac180da52ad436fee548f9ee +Author: Albert Astals Cid +Date: Fri Dec 28 01:17:14 2012 +0100 + + dos2unix + + poppler/PDFDoc.cc | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +commit 703c77eb59aa22ab6372d56a20ee81dc7dfa6e4a +Author: Even Rouault +Date: Fri Dec 28 00:57:17 2012 +0100 + + Fix very long loop in JPXStream::getImageParams() + + poppler/JPXStream.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 7e0be7854adc49e4e00c0badb0dc470fbdf6d612 +Author: Even Rouault +Date: Fri Dec 28 00:44:29 2012 +0100 + + Avoid DoS due to huge number of JPX tiles in a stream + + poppler/JPXStream.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 2017dbebd9afd4f172242ff8462fce739d911e64 +Author: Even Rouault +Date: Fri Dec 28 00:30:13 2012 +0100 + + Do not crash on 0 or negative nBits values + + poppler/Stream.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 858df0dc04e2f306e806fe0fc4fb5c8ec804e263 +Author: Albert Astals Cid +Date: Thu Dec 27 23:30:27 2012 +0100 + + Fix arg typo + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1dd6280d79ad22461208702b3c929377887c99ff +Author: Albert Astals Cid +Date: Sat Dec 15 16:39:23 2012 +0100 + + 0.21.4 soversion increases + + CMakeLists.txt | 2 +- + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + poppler/Makefile.am | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 99d0288bb0b6879ae5414d174939bbd9c1e90bd3 +Author: Albert Astals Cid +Date: Sat Dec 15 16:37:19 2012 +0100 + + 0.21.4 version increase + + CMakeLists.txt | 2 +- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 2bc48d5369f1dbecfc4db2878f33bdeb80d8d90f +Author: Albert Astals Cid +Date: Sat Dec 15 16:36:38 2012 +0100 + + 0.21.4 NEWS + + NEWS | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit b3423d54b1254597d7ca953872211fa3aa83e29c +Author: Albert Astals Cid +Date: Sat Dec 15 16:29:54 2012 +0100 + + Updated copyrights + + goo/JpegWriter.h | 2 +- + goo/PNGWriter.cc | 1 + + goo/PNGWriter.h | 1 + + goo/TiffWriter.cc | 1 + + goo/TiffWriter.h | 1 + + poppler/GlobalParams.cc | 2 +- + poppler/TextOutputDev.cc | 1 + + splash/Splash.cc | 1 + + utils/HtmlOutputDev.cc | 1 + + 9 files changed, 9 insertions(+), 2 deletions(-) + +commit 487f20d24830a97cad4773ae27f0c2cc58df2ed0 +Author: Albert Astals Cid +Date: Thu Dec 13 20:40:39 2012 +0100 + + Check obj1 is a dict before using it + + Fixes bug #58257 + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 03045469206adbd797e3a38fee3a16cdd1716812 +Author: Albert Astals Cid +Date: Thu Dec 13 19:24:54 2012 +0100 + + Fix crop on EPS conversion + + Bug #30692 + Patch is half William Bader's and half mine + + poppler/OutputDev.h | 5 +++++ + poppler/PSOutputDev.h | 4 +++- + poppler/Page.cc | 3 +++ + poppler/Page.h | 2 ++ + 4 files changed, 13 insertions(+), 1 deletion(-) + +commit 5d50b2765428e5a417967be2f41452ab05917db7 +Author: Peter Breitenlohner +Date: Tue Dec 11 18:54:30 2012 +0100 + + Correct bad semantics + + Negation has higher precedence than comparison + Confirmed by Marek Kasik that wrote the code originally + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e306bad391a3ff49593f1f3bac0717d62599bd13 +Author: Pino Toscano +Date: Sun Dec 9 22:40:27 2012 +0100 + + pngwriter: move #include into .cc file + + Move all the private data (including the libpng types) to a private + class. + + This requires HtmlOutputDev.cc to include on its own (which + is correct, since it uses the libpng API directly). + + goo/PNGWriter.cc | 98 + +++++++++++++++++++++++++++++--------------------- + goo/PNGWriter.h | 12 ++----- + utils/HtmlOutputDev.cc | 4 +++ + 3 files changed, 64 insertions(+), 50 deletions(-) + +commit cf338551e9d031cc00d56cea0d258ec5fd96e79a +Author: Pino Toscano +Date: Sun Dec 9 22:22:03 2012 +0100 + + tiffwriter: move #include into .cc file + + Move all the private data (including the libtiff types) to a private + class. + + goo/TiffWriter.cc | 94 + ++++++++++++++++++++++++++++++++----------------------- + goo/TiffWriter.h | 12 ++----- + 2 files changed, 56 insertions(+), 50 deletions(-) + +commit 0dfa51f0bfa787ee9c865fd4f05e4bd964c260fc +Author: Albert Astals Cid +Date: Sun Dec 9 22:31:50 2012 +0100 + + Having a look at the log Marek has (C) in this file + + poppler/TextOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f1b2e29e1d5f420903085318f06c4dc83ebb24f3 +Author: Thomas Freitag +Date: Sun Dec 9 20:59:26 2012 +0100 + + Fix crash when rendering on mono1 + + poppler/SplashOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 71bad47ed6a36d825b0d08992c8db56845c71e40 +Author: Marek Kasik +Date: Sun Dec 9 20:20:00 2012 +0100 + + Filter stuff that might end up in the shell + + Since it seems shells don't know how to filter stuff and might + causing bad things to happen + + poppler/Error.cc | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) + +commit c35d030472e6cb140c3dff30b91541772c992eb0 +Author: Albert Astals Cid +Date: Sat Dec 8 23:51:59 2012 +0100 + + Add private copy constructor and operator= to make sure we don't + use the default ones + + Since using them would results in bad things happening + + goo/GooHash.h | 16 ++++++++++++++++ + goo/GooList.h | 16 ++++++++++++++++ + goo/PNGWriter.h | 5 ++++- + goo/TiffWriter.h | 5 ++++- + goo/gfile.h | 4 ++++ + 5 files changed, 44 insertions(+), 2 deletions(-) + +commit f6741d9242bf2d9c13c8d534c50c8e4d404afc7f +Author: Adrian Johnson +Date: Sun Dec 2 09:34:35 2012 +1030 + + jpegwriter: move #include "jpeglib.h" into .cc file + + On cygwin pdftocairo -v shows the wrong version due to + jpeglib.h defining PACKAGE_VERSION. + + Avoid polluting our header files by moving libjpeg.h and + libjpeg types into JpegWriter.cc + + Bug 57687 + + goo/JpegWriter.cc | 120 + ++++++++++++++++++++++++++++++++----------------- + goo/JpegWriter.h | 25 ++++++----- + splash/SplashBitmap.cc | 2 +- + utils/pdftocairo.cc | 4 +- + 4 files changed, 95 insertions(+), 56 deletions(-) + +commit e78dbb1b7dbd20c3ae547b02270ab0648c1bfc61 +Author: Adrian Johnson +Date: Sun Dec 2 09:10:32 2012 +1030 + + Reformat goo/*Writer files to poppler style + + goo/ImgWriter.h | 20 ++--- + goo/JpegWriter.cc | 184 ++++++++++++++++++++++---------------------- + goo/JpegWriter.h | 38 ++++----- + goo/PNGWriter.cc | 224 + +++++++++++++++++++++++++++--------------------------- + goo/PNGWriter.h | 62 +++++++-------- + goo/TiffWriter.cc | 40 +++++----- + goo/TiffWriter.h | 58 +++++++------- + 7 files changed, 313 insertions(+), 313 deletions(-) + +commit 1bfe4b22cf893dd498d6f306ee9cf942c72fe3ed +Author: Matthias Kramm +Date: Mon Nov 19 12:39:56 2012 -0800 + + Fix linewidths in monochrome mode. + + For zoom levels that scale the page below sqrt(2) of the original + resolution, monochrome line widths were wrong (snapped back to 1 pixel + wide.) This patch fixes that issue. + + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e5008bdb26df0135edfbd30a811df2332f4e036c +Author: José Aliste +Date: Sat Dec 8 10:33:21 2012 -0300 + + glib-demo: Update the demo to modify flags of annotations + + https://bugs.freedesktop.org/show_bug.cgi?id=58015 + + glib/demo/annots.c | 65 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 65 insertions(+) + +commit 8cd5cae953de374276c11711dc106de15c8dcad0 +Author: Carlos Garcia Campos +Date: Sat Dec 8 18:57:07 2012 +0100 + + regtest: Use the number of cpus as default number of worker threads + + regtest/main.py | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 605c363b04ba3853883010c0a413054fe246d9aa +Author: Carlos Garcia Campos +Date: Sat Dec 8 18:45:22 2012 +0100 + + regtest: Remove trailing whitespaces + + regtest/TestReferences.py | 10 +++++----- + regtest/TestRun.py | 10 +++++----- + regtest/main.py | 6 +++--- + 3 files changed, 13 insertions(+), 13 deletions(-) + +commit 787a8438708397f0a1bf26e93726f544c91533e6 +Author: Hib Eris +Date: Sun Dec 2 08:03:10 2012 +0100 + + Fix compile warning on deprecated conversion from string constant + + Fixes (for win32): + + CXX GlobalParams.lo + GlobalParams.cc: In function 'char* get_poppler_datadir()': + GlobalParams.cc:181:12: warning: deprecated conversion from string + constant to 'char*' [-Wwrite-strings] + + poppler/GlobalParams.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cb3a10417ae659fdb7b77132c569c93ec00bc95e +Author: Fabio D'Urso +Date: Sun Dec 2 01:41:05 2012 +0100 + + Fixed check_lexer on 32-bit systems + + qt4/tests/check_lexer.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8550576bdf74180b62f54f9fd59213fbcd0a1be1 +Author: José Aliste +Date: Sat Dec 8 10:33:04 2012 -0300 + + glib: Add poppler_annot_set_flags + + https://bugs.freedesktop.org/show_bug.cgi?id=58015 + + glib/poppler-annot.cc | 22 ++++++++++++++++++++++ + glib/poppler-annot.h | 2 ++ + 2 files changed, 24 insertions(+) + +commit 15dcc5426ce319429e1a2c518902effb2ddf06cf +Author: Adam Reichold +Date: Thu Dec 6 18:45:46 2012 +0100 + + implement parallel testing using Python's Queue class + + regtest/Printer.py | 36 +++++++++++++++++----------- + regtest/TestReferences.py | 23 +++++++++++++++++- + regtest/TestRun.py | 58 + ++++++++++++++++++++++++++++++++++++---------- + regtest/backends/cairo.py | 5 ++-- + regtest/backends/splash.py | 5 ++-- + regtest/main.py | 11 ++++++++- + 6 files changed, 104 insertions(+), 34 deletions(-) + +commit c46646020826136b403e9aae8e2ded24c7165522 +Author: Hib Eris +Date: Sun Dec 2 10:04:28 2012 +0100 + + glib-demo: Do not use deprecated gtk_color_button_{get,set}_rgba() + + Since Gtk 3.4, gtk_color_button_get_rgba() and + gtk_color_button_set_rgba() have been deprecated. + + https://bugs.freedesktop.org/show_bug.cgi?id=57798 + + glib/demo/selections.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit f8c1b55e764a6e79b0530fb1be9ee11917f4237e +Author: Albert Astals Cid +Date: Sat Dec 1 22:19:17 2012 +0100 + + 0.21.3 + + CMakeLists.txt | 4 ++-- + NEWS | 17 +++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 23 insertions(+), 6 deletions(-) + +commit e3716d9d735a1093399a3c5c33ea5471a6adc405 +Author: Albert Astals Cid +Date: Sat Dec 1 22:34:00 2012 +0100 + + Build on make check correctly + + qt4/tests/check_goostring.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c7ae96b162e8a05269a54c31f8e7c411edc84553 +Merge: 1f279c32 b1dacd1e +Author: Albert Astals Cid +Date: Sat Dec 1 21:26:24 2012 +0100 + + Merge commit 'b1dacd1e6ab00eb1976491eb2b45c76671011b38' + +commit 1f279c32dcdc899b509fc00aaa57382bc8af90f3 +Author: Albert Astals Cid +Date: Sat Dec 1 20:37:52 2012 +0100 + + Update copyrights + + poppler/CairoOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 5daa17c013be8ebe180ff48207e189bd9bd50a84 +Author: Albert Astals Cid +Date: Sat Dec 1 20:06:17 2012 +0100 + + Initialize to NULL, fixes crash + + Since the TextStringToUCS4 not always assigns to second param, + initialize uni to NULL + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f673be852e6564e039b5ec24e5bf583149b1d5a4 +Author: Jason Crain +Date: Sat Dec 1 20:03:00 2012 +0100 + + Allow large chars in TextPage + + poppler/TextOutputDev.cc | 1 - + 1 file changed, 1 deletion(-) + +commit aca122432951c4c0a2a5dbaba046d848f2153b84 +Author: Hib Eris +Date: Sat Jun 23 18:27:55 2012 +0200 + + Fix compile warning on unused variable filename_g + + glib/poppler-document.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c702066961b1cc2a9c0fb16546e9db93c312813b +Author: Hib Eris +Date: Sat Jun 23 18:23:59 2012 +0200 + + Do not use 'size' uninitialized + + poppler/PDFDoc.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 14bdeacb0eb8e4a1d3995f310a1b526e4dcc96dc +Author: Hib Eris +Date: Sat Jun 23 18:09:01 2012 +0200 + + Fix compile warnings on deprecated conversion from string constant to + 'char*' + + poppler/FileSpec.cc | 3 ++- + poppler/GlobalParamsWin.cc | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 72d4a1ba998218de876e2a0e939bbec4b7795299 +Author: Hib Eris +Date: Sat Jun 23 17:52:13 2012 +0200 + + Fix compile warning on signed/unsigned comparison + + goo/gfile.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1262111e70ff161e495505bd6a262cc0357a943c +Author: Hib Eris +Date: Sat Jun 23 17:46:54 2012 +0200 + + Remove unused variable + + goo/gfile.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 85572b85950ed4e4421f1e61e704e5c250ca27d9 +Author: Albert Astals Cid +Date: Sat Dec 1 01:50:25 2012 +0100 + + Silence gcc warning + + Bug #57572 + + goo/TiffWriter.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a97aead193a927b91a4e33d7b5d2ba7179e664df +Author: Adrian Johnson +Date: Fri Nov 30 21:30:19 2012 +0100 + + Splash: Implement bilinear image scaling + + Bug #22138 + + poppler/SplashOutputDev.cc | 10 +-- + splash/Splash.cc | 183 + ++++++++++++++++++++++++++++++++++++++++++--- + splash/Splash.h | 13 +++- + 3 files changed, 188 insertions(+), 18 deletions(-) + +commit e6806d893a9a104e3f23d69d0245ad0e4948a409 +Author: Pino Toscano +Date: Wed Nov 28 17:59:36 2012 +0100 + + cmake: Enable compiler warnings for C code + + Compilation of glib/demo uses a C compiler, thus compiler warnings + should be enabled in the CFLAGS variable. + + followup of 5c5945d163fe406960ccc2e3a71882722b9e69d1 + + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit bdb17da35de49b9fd1a549c3afd5e36004552080 +Author: Hib Eris +Date: Mon Nov 26 20:38:03 2012 +0100 + + cairo: Fix uninitaliazed warning in CairoOutputDev + + Fix warning: + + CXX CairoOutputDev.lo + ../../poppler/poppler/CairoOutputDev.cc: In member function 'virtual + void RescaleDrawImage::getRow(int, uint32_t*)': + ../../poppler/poppler/CairoOutputDev.cc:2813:25: warning: 'pix' + may be used uninitialized in this function [-Wuninitialized] + + https://bugs.freedesktop.org/show_bug.cgi?id=57571 + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit beff044e4fdf44e80ad7c75255cb71a83e70a293 +Author: Hib Eris +Date: Tue Nov 27 22:19:01 2012 +0100 + + glib-demo: Fix warning on signedness + + Fixes: + + CC attachments.o + ../../../poppler/glib/demo/attachments.c: In function + ‘attachment_save_callback’: + ../../../poppler/glib/demo/attachments.c:190:2: warning: pointer + targets in passing argument 2 of ‘g_checksum_update’ differ in + signedness [-Wpointer-sign] + /usr/include/glib-2.0/glib/gchecksum.h:69:23: note: expected ‘const + guchar *’ but argument is of type ‘const gchar *’ + + https://bugs.freedesktop.org/show_bug.cgi?id=57620 + + glib/demo/attachments.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b484749ffa58315e4b61738d652347d7a77da982 +Author: Hib Eris +Date: Tue Nov 27 19:38:59 2012 +0100 + + glib-demo: Fix set but unused warning + + Fixes: + + CC print.o + ../../../poppler/glib/demo/print.c: In function + ‘pgd_print_draw_page’: + ../../../poppler/glib/demo/print.c:68:27: warning: variable + ‘settings’ set but not used [-Wunused-but-set-variable] + + https://bugs.freedesktop.org/show_bug.cgi?id=57620 + + glib/demo/print.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 8438daf7bf7ab1b96c6899baab7e47d9c634cb3d +Author: Hib Eris +Date: Sun Jun 24 14:54:31 2012 +0200 + + glib-demo: pgd_text_view_query_tooltip(): return a gboolean + + https://bugs.freedesktop.org/show_bug.cgi?id=57620 + + glib/demo/text.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit ff9e211cfb60eb820b9b046da546352fa59d7df9 +Author: Hib Eris +Date: Sat Jun 23 22:56:02 2012 +0200 + + glib-demo: Remove set but unused variable textinfo + + https://bugs.freedesktop.org/show_bug.cgi?id=57620 + + glib/demo/text.c | 2 -- + 1 file changed, 2 deletions(-) + +commit 8e5ae33bc63eca5297dea12fc281ba223f5be09a +Author: Hib Eris +Date: Sat Jun 23 22:44:22 2012 +0200 + + glib-demo: Fix warning "operation on 'page' may be undefined + [-Wsequence-point]" + + https://bugs.freedesktop.org/show_bug.cgi?id=57620 + + glib/demo/text.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c6f98d62b885e1d7f6ce1f265d4a87dca36494de +Author: Hib Eris +Date: Sat Jun 23 22:38:35 2012 +0200 + + glib-demo: Remove unused variable slice_selector + + https://bugs.freedesktop.org/show_bug.cgi?id=57620 + + glib/demo/render.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit da56d280e2a51229c93117d8b537897ba63296cf +Author: Hib Eris +Date: Sat Jun 23 22:36:29 2012 +0200 + + glib-demo: Remove unused variable region + + https://bugs.freedesktop.org/show_bug.cgi?id=57620 + + glib/demo/selections.c | 1 - + 1 file changed, 1 deletion(-) + +commit c792e59064018e0fd899f32080489419517f2bbe +Author: Hib Eris +Date: Sat Jun 23 22:34:44 2012 +0200 + + glib-demo: Do not use 'text' uninitialized + + https://bugs.freedesktop.org/show_bug.cgi?id=57620 + + glib/demo/utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c5a8f7eda14030436e6905dd826e72cabbcf0e5f +Author: Hib Eris +Date: Sat Jun 23 22:26:53 2012 +0200 + + glib-demo: Fix warning on unused variable selection + + https://bugs.freedesktop.org/show_bug.cgi?id=57620 + + glib/demo/layers.c | 1 - + 1 file changed, 1 deletion(-) + +commit 4ceb3f4f4ca0092e79bb36723a7332b071491666 +Author: Hib Eris +Date: Sat Jun 23 18:36:12 2012 +0200 + + glib-demo: Fix warnings on unused variables + + https://bugs.freedesktop.org/show_bug.cgi?id=57620 + + glib/demo/annots.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 5c5945d163fe406960ccc2e3a71882722b9e69d1 +Author: Hib Eris +Date: Tue Nov 27 19:21:34 2012 +0100 + + Enable compiler warnings for C code + + Compilation of glib/demo uses a C compiler, thus compiler warnings + should be enabled in the CFLAGS variable. + + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 55940e989701eb9118015e30f4f48eb654fa34c4 +Author: Pino Toscano +Date: Tue Nov 27 16:05:15 2012 +0100 + + fix my previous GooString::insert fix + + we need only to move the characters after the specified position, + not all of them + + extend qt4's check_goostring with few more checks covering this + (and the previous) fix + + goo/GooString.cc | 2 +- + qt4/tests/check_goostring.cpp | 39 + +++++++++++++++++++++++++++++++++++++++ + 2 files changed, 40 insertions(+), 1 deletion(-) + +commit dcbc9686d97f4f6596c43d1f701207278c25f8eb +Author: Pino Toscano +Date: Mon Nov 26 14:44:21 2012 +0100 + + glib/cmake: Include Gio-2.0 for introspection + + Fixes g-ir-scanner warnings: + poppler-document.cc:257: Warning: Poppler: + poppler_document_new_from_stream: argument stream: Unresolved type: + 'GInputStream*' + poppler-document.cc:257: Warning: Poppler: + poppler_document_new_from_stream: argument cancellable: Unresolved + type: 'GCancellable*' + poppler-document.cc:315: Warning: Poppler: + poppler_document_new_from_gfile: argument file: Unresolved type: + 'GFile*' + poppler-document.cc:315: Warning: Poppler: + poppler_document_new_from_gfile: argument cancellable: Unresolved + type: 'GCancellable*' + + https://bugs.freedesktop.org/show_bug.cgi?id=56218 + + folloup of c84753e12029fcc6113f80dedc9a943ce1deb214 + + glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 169e4cb001fa235ca608d3d0b42ea4214161fc2d +Author: Pino Toscano +Date: Mon Nov 26 14:42:59 2012 +0100 + + glib/cmake: Show all suppressed introspection scanner warnings + + https://bugs.freedesktop.org/show_bug.cgi?id=56218 + + followup of 11a1f6f512a7d7b86defeb5963fa16bc08e3ba1c + + glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 62c0dbbe9f1987c78eeb87f248d35e7fd73e968a +Author: Albert Astals Cid +Date: Mon Nov 26 00:40:57 2012 +0100 + + Check GooString::insert + + Checks we don't break what we just fixed with Pino's patch + + qt4/tests/CMakeLists.txt | 1 + + qt4/tests/Makefile.am | 7 ++++++- + qt4/tests/check_goostring.cpp | 22 ++++++++++++++++++++++ + 3 files changed, 29 insertions(+), 1 deletion(-) + +commit 01e438ca47776075c8171bda090e7d859fd9f620 +Author: Adam Reichold +Date: Mon Nov 26 00:39:05 2012 +0100 + + Don't use memcpy to copy classes + + poppler/Function.cc | 63 + +++++++++++++++++++++++++++++++++++++++++++---------- + poppler/Function.h | 11 ++++++---- + 2 files changed, 59 insertions(+), 15 deletions(-) + +commit 7ba15d11e56175601104d125d5e4a47619c224bf +Author: Pino Toscano +Date: Mon Nov 26 00:29:35 2012 +0100 + + fix GooString::insert() + + Hi, + + as reported in a Debian bug [1], it seems GooString::insert could lead + to using uninitialized memory. + The case is a simple: + GooString goo; + goo.insert(0, "."); + goo.insert(0, "This is a very long long test string"); + i.e. basically first insert a single character at position 0, and + then a + string longer than STR_STATIC_SIZE always at position 0. + + [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=693817 + + goo/GooString.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 703f85a10cf7ad61d2f2d3a5faf347fdddcb4738 +Author: Carlos Garcia Campos +Date: Sun Nov 25 12:36:33 2012 +0100 + + glib: Fix returns tag in PopplerAttachmentSaveFunc api doc + + glib/poppler-attachment.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 52896031783b28cee350ea92c8736e2c2e4e9d33 +Author: José Aliste +Date: Mon Nov 19 23:47:19 2012 +0100 + + glib: Add missing ":" at the end of some functions documentation + + New versions of gir-scanner emit a warning when the : at + the end of the function documentation is not found. + + https://bugs.freedesktop.org/show_bug.cgi?id=56218 + + glib/poppler-annot.cc | 2 +- + glib/poppler-form-field.cc | 10 +++++----- + glib/poppler-layer.cc | 12 ++++++------ + 3 files changed, 12 insertions(+), 12 deletions(-) + +commit 60dfc1a3471f824f40b0bef5b97a7b04bd78e72b +Author: Hib Eris +Date: Sat Oct 20 10:17:01 2012 +0200 + + glib: Exclude poppler-input-stream.h from introspection files + + Fixes warning: + + poppler-input-stream.h:28: Warning: Poppler: + symbol='inputStreamBufSize': Unknown namespace for symbol + 'inputStreamBufSize' + + https://bugs.freedesktop.org/show_bug.cgi?id=56218 + + glib/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c84753e12029fcc6113f80dedc9a943ce1deb214 +Author: Hib Eris +Date: Sat Oct 20 09:40:09 2012 +0200 + + glib: Include Gio-2.0 for introspection + + Fixes g-ir-scanner warnings: + poppler-document.cc:257: Warning: Poppler: + poppler_document_new_from_stream: argument stream: Unresolved type: + 'GInputStream*' + poppler-document.cc:257: Warning: Poppler: + poppler_document_new_from_stream: argument cancellable: Unresolved + type: 'GCancellable*' + poppler-document.cc:315: Warning: Poppler: + poppler_document_new_from_gfile: argument file: Unresolved type: + 'GFile*' + poppler-document.cc:315: Warning: Poppler: + poppler_document_new_from_gfile: argument cancellable: Unresolved + type: 'GCancellable*' + + https://bugs.freedesktop.org/show_bug.cgi?id=56218 + + glib/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 11a1f6f512a7d7b86defeb5963fa16bc08e3ba1c +Author: Hib Eris +Date: Sat Oct 20 09:30:05 2012 +0200 + + glib: Show all suppressed introspection scanner warnings + + https://bugs.freedesktop.org/show_bug.cgi?id=56218 + + glib/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 16812829a7d4816717731318b1aa1bc3ab5e3935 +Author: Jason Crain +Date: Mon Aug 27 22:42:11 2012 -0500 + + Update fill and stroke color in CairoOutputDev::startPage + + Keep fill_color and stroke_color from falling out of sync with + fill_pattern and stroke_pattern. + + https://bugs.freedesktop.org/show_bug.cgi?id=54526 + + glib/poppler-page.cc | 2 +- + poppler/CairoOutputDev.cc | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit c93702bea0718d67660f2255344dcf9b0f502d57 +Author: José Aliste +Date: Tue Nov 20 11:25:41 2012 +0100 + + glib: Ensure text is only computed on first render + + Getting the text on a page could be quite slow on + complex pages without structured text. Before this patch, + poppler_page_render would reprocess the text each time + is called. + + glib/poppler-page.cc | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit b0297110c455eb18096268b59d6095d428380de5 +Author: Jason Crain +Date: Wed Nov 21 14:15:59 2012 -0600 + + glib: check if words end with spaces + + poppler_page_get_text_layout and poppler_page_get_text_attributes + assume that each word ends with a space or newline, causing them to + become mismatched from the text. This adds a check to + TextWord::getSpaceAfter. + + https://bugs.freedesktop.org/show_bug.cgi?id=54504 + + glib/poppler-page.cc | 62 + +++++++++++++++++++++++++++++----------------------- + 1 file changed, 35 insertions(+), 27 deletions(-) + +commit b1dacd1e6ab00eb1976491eb2b45c76671011b38 +Author: Albert Astals Cid +Date: Fri Nov 23 00:12:24 2012 +0100 + + 0.21.2 + + CMakeLists.txt | 4 ++-- + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 19 insertions(+), 6 deletions(-) + +commit 2d2a3af7159945c3fd54f22878e2eb09e019bbc6 +Author: Albert Astals Cid +Date: Fri Nov 23 00:06:39 2012 +0100 + + Update copyrights + + goo/TiffWriter.cc | 1 + + goo/TiffWriter.h | 1 + + poppler/CairoRescaleBox.cc | 1 + + poppler/CairoRescaleBox.h | 38 ++++++++++++++++++++++++++++++++++++++ + splash/SplashBitmap.cc | 2 +- + 5 files changed, 42 insertions(+), 1 deletion(-) + +commit e0d0177562ff546b59b3bc8eb68a08dc740d6f6c +Author: Adrian Johnson +Date: Wed Nov 14 22:44:20 2012 +1030 + + cairo: Fix crash in CairoImageOutputDev with setSoftMaskFromImageMask + + Bug 57067 + + poppler/CairoOutputDev.cc | 46 + ++++++++++++++++++++++++++++++++++++++++++++++ + poppler/CairoOutputDev.h | 5 +++++ + 2 files changed, 51 insertions(+) + +commit f050717f986a6c2833876d14083363a540fa849a +Author: Adrian Johnson +Date: Wed Nov 14 23:50:10 2012 +1030 + + cairo: fix soft mask when image resolution != smask resolution + + Both image and mask are drawn the same size (unit square) regardless + of the size of the image data. + + Bug 57070 + + poppler/CairoOutputDev.cc | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +commit 87fd5275514b63f13622b79a8fcfe443ccc4f45d +Author: Adrian Johnson +Date: Sun Nov 11 18:53:12 2012 +1030 + + cairo: make drawImage work with images > 32767 in width/height + + Cairo images are limited to 32767 in width and height due to the + 16.16 format used by pixman. Make drawImage work with large images + by scaling down the image before a cairo image is created. + + CairoRescaleBox.cc has been turned into a class with a virtual + function to get the next row of the source image. This allows the + rescale code to access the source data one row at a time to avoid + needing to allocate an image the size of the source image. + + A RescaleDrawImage class derived from CairoRescaleBox has been + written to create the cairo source image to be used by drawImage. The + code from drawImage that created the cairo source image has been moved + into RescaleDrawImage::getSourceImage and RescaleDrawImage::getRow. + + Bug 56858 + + poppler/CairoOutputDev.cc | 278 + ++++++++++++++++++++++++--------------------- + poppler/CairoRescaleBox.cc | 177 +++++++++++++++-------------- + poppler/CairoRescaleBox.h | 21 +++- + 3 files changed, 258 insertions(+), 218 deletions(-) + +commit d1c509c48fc422649d0c2c2d70af5e13e3472874 +Author: Adrian Johnson +Date: Sat Nov 17 10:04:55 2012 +1030 + + pdftocairo: add tiff support + + Bug 57006 + + utils/pdftocairo.1 | 23 ++++++++------ + utils/pdftocairo.cc | 88 + +++++++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 83 insertions(+), 28 deletions(-) + +commit 6d3fe48cf30b298b4436462904d781ea441c1f3d +Author: Adrian Johnson +Date: Sat Nov 17 10:03:22 2012 +1030 + + tiff: remove splash dependency and add RGBA support + + Bug 57006 + + goo/TiffWriter.cc | 47 + +++++++++++++++++++---------------------------- + goo/TiffWriter.h | 13 ++++++++++--- + splash/SplashBitmap.cc | 23 +++++++++++++++++++++-- + 3 files changed, 50 insertions(+), 33 deletions(-) + +commit 15f600a5702788f7e5b91cd67bc2438179921939 +Author: Albert Astals Cid +Date: Thu Nov 15 22:17:27 2012 +0100 + + Don't do a check for sanity that then we don't use + + Fixes bugs 56753 and 51684 + + fofi/FoFiTrueType.cc | 26 -------------------------- + 1 file changed, 26 deletions(-) + +commit c7e3c2d7087e4fc36564ba7bd55e27e100e0a5e5 +Author: Albert Astals Cid +Date: Wed Nov 14 14:58:45 2012 +0100 + + Remove unused code + + fofi/FoFiTrueType.cc | 658 + ------------------------------------------- + fofi/FoFiTrueType.h | 11 +- + splash/SplashFTFontEngine.cc | 42 +-- + 3 files changed, 2 insertions(+), 709 deletions(-) + +commit 06951f529e6514a0c26d6d821ab5fab0920a7cf3 +Author: Albert Astals Cid +Date: Tue Nov 13 23:37:22 2012 +0100 + + Simplify >= 0 ifs for unsigned + + cpp/poppler-global.cpp | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit fa813adc3f7b7ee3cc819f1e0cb85e01f13c2c01 +Author: Albert Astals Cid +Date: Tue Nov 13 23:37:01 2012 +0100 + + Remove < 0 ifs for unsigned + + splash/SplashFTFont.cc | 8 -------- + 1 file changed, 8 deletions(-) + +commit 1969bcd693289eba1138fcaa74a684cb3ff2aefc +Author: Albert Astals Cid +Date: Tue Nov 13 23:36:40 2012 +0100 + + Remove unused members + + poppler/Gfx.cc | 3 --- + poppler/Gfx.h | 5 +---- + 2 files changed, 1 insertion(+), 7 deletions(-) + +commit 3a6e5ed5e28b6113696a7ae60b0b85d7097eb731 +Author: Albert Astals Cid +Date: Tue Nov 13 23:35:53 2012 +0100 + + Remove >= 0 checks for unsigned variables + + utils/HtmlFonts.cc | 6 +++--- + utils/HtmlFonts.h | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 0dcc2d711810dd64aa8d8721ce53a6b72e12c47c +Author: Albert Astals Cid +Date: Tue Nov 13 23:35:10 2012 +0100 + + Remove unused var + + utils/pdfinfo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1fc97862d30bf723135310bfc8701e6788bfd284 +Author: Albert Astals Cid +Date: Tue Nov 13 23:24:19 2012 +0100 + + size can't be smaller than 0 because it's a size_t + + goo/gmem.cc | 22 +--------------------- + 1 file changed, 1 insertion(+), 21 deletions(-) + +commit bb801a9b889bc0e62cf8b853c26cc6636b4af9a1 +Author: Albert Astals Cid +Date: Tue Nov 13 22:51:17 2012 +0100 + + Removed unused var + + utils/pdfinfo.cc | 1 - + 1 file changed, 1 deletion(-) + +commit fd651fb49653e89d96b032e010a7d8e891536bb0 +Author: Albert Astals Cid +Date: Mon Nov 12 00:42:49 2012 +0100 + + Parse the args (so that -v says vesion only) + + Fixes bug #56817 + + utils/pdfunite.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 7e2e9567f51d01be9a88848e1141c6d4f0f768a1 +Author: Albert Astals Cid +Date: Fri Nov 9 20:02:25 2012 +0100 + + 0.21.1 + + CMakeLists.txt | 4 ++-- + NEWS | 14 ++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + 8 files changed, 22 insertions(+), 8 deletions(-) + +commit 98b7cfd289abb53a745a88d6ec99e95df477fc8f +Merge: 40efa729 d254174e +Author: Albert Astals Cid +Date: Fri Nov 9 00:38:19 2012 +0100 + + Merge remote-tracking branch 'origin/poppler-0.20' + + Conflicts: + poppler/Form.cc + +commit 40efa72987ebf62cbf2c761c10a209e2e6be612e +Author: Fabio D'Urso +Date: Sun Nov 4 11:20:29 2012 +0100 + + Replaced forward declaration of enum CryptAlgorithm with a proper + #include + + Forward-declaring enums is illegal. It hasn't caused problems so far + because XRef.h includes Object.h, which in turn includes Stream.h, + where + the enum is defined. + Therefore, enum is alreadly defined when the compiler reaches + that line. + + To avoid future issues, I've replaced it with a proper #include + "Stream.h" + (which expands to nothing as Stream.h has already been included + at that + point). + + I've also added a #include in XRef.h because it references enum + CryptAlgorithm too. Also in this case, it expands to nothing. + + poppler/PDFDoc.h | 2 +- + poppler/XRef.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 0f7c17d7f92d4cdfbd8816dba666aeed924d8bc2 +Author: Fabio D'Urso +Date: Fri Nov 2 10:54:17 2012 +0100 + + qt4: Export information about the document form type + + This patch also wraps the code that checks the form type and moves it + from pdfinfo to the Catalog class. + + poppler/Catalog.cc | 19 +++++++++++++++++++ + poppler/Catalog.h | 9 +++++++++ + qt4/src/poppler-document.cc | 16 ++++++++++++++++ + qt4/src/poppler-qt4.h | 18 ++++++++++++++++++ + utils/pdfinfo.cc | 19 ++++++++++--------- + 5 files changed, 72 insertions(+), 9 deletions(-) + +commit f3f5a166bcd16b6f2cb516cceb2b3f41b6faf0b4 +Author: Fabio D'Urso +Date: Fri Nov 2 01:53:24 2012 +0100 + + Editable FormFieldChoice: Clear editedChoice when one of the + predefined option is selected + + This patch clears the user-entered text when the user interacts with + predefined options. + + poppler/Form.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit ddcd5dc0ceecc02f0d4f740cb6c9b557dfd33c74 +Author: Fabio D'Urso +Date: Thu Nov 1 00:58:51 2012 +0100 + + FormFieldChoice ctor: Added support to recognize user strings as + /V value + + Fixes + http://lists.freedesktop.org/archives/poppler/2012-October/009688.html + + poppler/Form.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 1302bf52bba7e6446f01358240a4b5b583e196a9 +Author: Fabio D'Urso +Date: Wed Oct 31 19:56:37 2012 +0100 + + FormFieldChoice ctor: Stop scanning if /V is a string and the + corresponding option has been identified + + poppler/Form.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit d254174e08146115ad04ac1f1bf82bb26e56c684 +Author: Fabio D'Urso +Date: Wed Oct 31 16:57:56 2012 +0100 + + FormFieldChoice::updateSelection: Fixed wrong loop condition + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 401de95f5ab42ab0f5d8fd92d76b5def50f84a2b +Author: Fabio D'Urso +Date: Wed Oct 31 19:43:51 2012 +0100 + + FormFieldChoice ctor: Look for selected options in /I instead of /V + if /I is available + + Since /I stores the indices of the selected options, it can + distinguish + duplicate option (i.e. options with the same name/export value). + + poppler/Form.cc | 71 + ++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 42 insertions(+), 29 deletions(-) + +commit cfd3a46a857100cb634e18192b762e7342165348 +Author: Fabio D'Urso +Date: Wed Oct 31 15:44:32 2012 +0100 + + FormFieldChoice: Handle /V values containing the export value instead + of the option name + + According to the PDF spec, /V should always contain an "option + name" and + never an "export value" if /Opt is an array of couples. However, it + seems that acroread works the other way round: it is able to identify + selected options only if they are referred by their export value + instead of the option name. + With this patch, we mimic this behavior. + + poppler/Form.cc | 49 ++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 34 insertions(+), 15 deletions(-) + +commit ce99940bcac0447f32ee2ad46efb09af93989c12 +Author: Fabio D'Urso +Date: Sat Oct 13 00:13:33 2012 +0200 + + FormFieldChoice::updateSelection: Write /I too + + This improves handling of choice fields containing two or more entries + with the same name, and also makes sure that the previous value of /I + gets updated (failing to update it results in acroread still showing + the old selection). + + poppler/Form.cc | 50 ++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 36 insertions(+), 14 deletions(-) + +commit 102553e2104a1b223c8ac924aa6702829adebbdb +Author: Fabio D'Urso +Date: Wed Oct 31 16:57:56 2012 +0100 + + FormFieldChoice::updateSelection: Fixed wrong loop condition + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d7522ea1d2e66beef64f705e8986142f15fcf613 +Author: Fabio D'Urso +Date: Wed Oct 31 15:26:37 2012 +0100 + + FormFieldChoice ctor: Don't convert "human-readable" option names + to unicode + + Despite that comment, they're not meant to be read by humans only, + but they + are also used as option identifiers. + + This patch stops poppler from forcing them to be unicode. Instead, + they now stay the same encoding as their corresponding /Opt entry. + + This fixes poppler not being able to recognize selected entries + in documents produced by poppler itself: previously, the /V value was + always written in Unicode encoding, and therefore it was very + often not + binary-equal to the corresponding /Opt entry. + Now the /V value is always binary-equal to the corresponding /Opt + entry. + + poppler/Form.cc | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +commit da08ebeee241198907378c6461721fddb5106875 +Author: Adrian Johnson +Date: Sun Oct 28 12:13:22 2012 +1030 + + Don't allow invalid unicode to be passed to backends + + poppler/CharCodeToUnicode.cc | 11 +++++++++-- + poppler/UTF.cc | 11 +++++++++++ + poppler/UTF.h | 4 ++++ + 3 files changed, 24 insertions(+), 2 deletions(-) + +commit 9f92feda5eff9b2542c64349f33ae3cf250e7f4b +Author: Thomas Freitag +Date: Fri Nov 2 23:05:55 2012 +0100 + + Memory leak in CharCodeToUnicode + + Bug #54702 + + poppler/CharCodeToUnicode.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit ef11b4f0e642dff0be02bf3327eb56bf0b364847 +Author: Thomas Freitag +Date: Fri Nov 2 22:44:27 2012 +0100 + + Implement overprint in qt interface + + With minor api fixes by me (Albert Astals Cid) + + qt4/src/poppler-document.cc | 23 ++++++++++++--- + qt4/src/poppler-page.cc | 38 +++++++++++++----------- + qt4/src/poppler-private.h | 69 + ++++++++++++++++++++++++++++---------------- + qt4/src/poppler-qt4.h | 11 ++++++- + splash/SplashBitmap.cc | 70 + +++++++++++++++++++++++++++++++++++++++++++++ + splash/SplashBitmap.h | 5 +++- + 6 files changed, 169 insertions(+), 47 deletions(-) + +commit ae8fc0cbfc6123189e17b3cf1286e0540f181646 +Author: Adrian Johnson +Date: Tue Oct 30 21:22:04 2012 +1030 + + cairo: support parameterized Gouraud shading + + Bug 56463 + + poppler/CairoOutputDev.cc | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +commit 3be4e835d765f2f060e2a2e07dd23905c3212cdd +Author: Pino Toscano +Date: Wed Oct 24 18:37:06 2012 +0200 + + dos2unix + + utils/pdftoppm.cc | 876 + +++++++++++++++++++++++++++--------------------------- + 1 file changed, 438 insertions(+), 438 deletions(-) + +commit 77a980472e76b568346a49057b0217111a14a4cd +Merge: 74d6217b 46fb3653 +Author: Albert Astals Cid +Date: Tue Oct 23 00:23:53 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit 46fb3653c7ae44c34d12d799df8f70d649eaa995 +Author: Albert Astals Cid +Date: Tue Oct 23 00:22:55 2012 +0200 + + Fix the or-ing of flags + + qt4/src/poppler-document.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 74d6217ba164fdfe263b4edac8047b60506e39a6 +Author: Carlos Garcia Campos +Date: Sun Oct 21 17:48:57 2012 +0200 + + regstest: Add print_test_result_ln() and use it for failed test + results + + To make sure they are always shown. + + regtest/Printer.py | 3 +++ + regtest/TestRun.py | 10 +++++----- + 2 files changed, 8 insertions(+), 5 deletions(-) + +commit 4e9b8d2cca44241a501bb8095b3980d17fcda6c5 +Author: Carlos Garcia Campos +Date: Sun Oct 21 17:48:22 2012 +0200 + + regtest: Do not rewrite lines in verbose mode + + regtest/Printer.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2a25264afe3c59931f6a3638e2d6c6c2e0e5dfba +Author: Albert Astals Cid +Date: Fri Oct 19 17:22:56 2012 +0200 + + make static + + because i can + + qt4/tests/check_fonts.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit bc4a54c0a4430216c9aeaf2c3bddbaeef5a004e4 +Author: Albert Astals Cid +Date: Fri Oct 19 17:22:13 2012 +0200 + + Compile with clang + + qt4/tests/check_fonts.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit f38194cfae8f8690bc3767cbdcf140519564366c +Merge: 80cf4347 5312984b +Author: Albert Astals Cid +Date: Fri Oct 19 00:02:02 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit 5312984b40355b067001704e9c688ea0a72b1159 +Author: Albert Astals Cid +Date: Fri Oct 19 00:00:53 2012 +0200 + + Define the numbers a bit better so gcc in i386 understands them better + + qt4/tests/check_lexer.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 80cf43472e5913f5f64bf73cb4a8ac5a53063f2e +Author: Adam Reichold +Date: Wed Oct 17 08:27:13 2012 +0200 + + added accessors for FormWidgetChoice::editChoice property to qt4 + frontend + + qt4/src/poppler-form.cc | 23 +++++++++++++++++++++++ + qt4/src/poppler-form.h | 15 +++++++++++++++ + 2 files changed, 38 insertions(+) + +commit 0b3ff2dc4e1ba37dd66f5913b10a9d69e31c40ce +Merge: fb5cb0fb 528b64bb +Author: Albert Astals Cid +Date: Wed Oct 17 00:28:40 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + + Conflicts: + CMakeLists.txt + NEWS + configure.ac + cpp/Doxyfile + poppler/Annot.cc + poppler/Form.h + qt4/src/Doxyfile + +commit 528b64bb077ed37c0d8fc7ae2ef3dc2c0dbb26ca +Author: Fabio D'Urso +Date: Tue Sep 4 23:10:17 2012 +0200 + + Free entries in the xref form a linked list: terminate it properly + when writing the XRef + + The last entry must point back to object 0. Previously it was left + unitialized and resulted in "-000000001 00000 f" being written in the + XRef table. + + poppler/XRef.cc | 1 + + 1 file changed, 1 insertion(+) + +commit fb5cb0fbdfcd06556661b38b0c598922fff2d759 +Author: Fabio D'Urso +Date: Thu Oct 4 11:20:42 2012 +0200 + + Create the 24x24 rectangle for text annotation icons from the top-left + corner instead of bottom-left + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 35c07fe40d7b18e19f6ef0f5615f9f5ac8195cf7 +Author: Fabio D'Urso +Date: Tue Oct 9 15:24:02 2012 +0200 + + AnnotWidget: Avoid repeatedly deleting and creating xref entries + for appearance streams + + Previously updating the appearance stream always involved deleting + the old + stream's xref entry and creating a new one. + Since xref entry deletion causes the generation number to be + incremented, this + behavior caused the generation number to quickly rise during user + input. + + This patch stops it by reusing the same entry as the old appearance + stream in + case of repeated modifications. + + poppler/Annot.cc | 40 ++++++++++++++++++++++++++++------------ + poppler/Annot.h | 1 + + 2 files changed, 29 insertions(+), 12 deletions(-) + +commit 2127a977bbe9985aa58561116508ad4f08430a2c +Author: Fabio D'Urso +Date: Tue Oct 9 12:49:26 2012 +0200 + + Generate and write the appearance stream in + AnnotWidget::updateWidgetApperance() + + Note: At the moment the old appearance is deleted and a *new* xref + entry is + created every time AnnotWidget::updateWidgetApperance() is called. + + poppler/Annot.cc | 30 +++++++++++++++++++++++++----- + 1 file changed, 25 insertions(+), 5 deletions(-) + +commit 0446e2cc1073f4579a90284d28bc5872e46e0536 +Author: Fabio D'Urso +Date: Tue Oct 9 10:47:40 2012 +0200 + + Killed FormField::isModified() in favor of a new AnnotWidget callback + + Instead of having to ask FormField from AnnotWidget::draw if the + widget's appearance needs to be rebuilt, now AnnotWidget gets notified + of changes via the new AnnotWidget::updateAppearanceStream() callback. + + poppler/Annot.cc | 16 ++++++++++------ + poppler/Annot.h | 1 + + poppler/Form.cc | 52 + ++++++++++++++++++++++++++++++++++++++-------------- + poppler/Form.h | 12 +++++++++--- + 4 files changed, 58 insertions(+), 23 deletions(-) + +commit 68d732ab2d55ae15e194ececfffa753977fae84c +Author: Fabio D'Urso +Date: Tue Oct 9 15:24:02 2012 +0200 + + AnnotWidget: Avoid repeatedly deleting and creating xref entries + for appearance streams + + Previously updating the appearance stream always involved deleting + the old + stream's xref entry and creating a new one. + Since xref entry deletion causes the generation number to be + incremented, this + behavior caused the generation number to quickly rise during user + input. + + This patch stops it by reusing the same entry as the old appearance + stream in + case of repeated modifications. + + poppler/Annot.cc | 40 ++++++++++++++++++++++++++++------------ + poppler/Annot.h | 1 + + 2 files changed, 29 insertions(+), 12 deletions(-) + +commit e2993cc9551dc7521528904646f941c9747473f7 +Author: Fabio D'Urso +Date: Tue Oct 9 12:49:26 2012 +0200 + + Generate and write the appearance stream in + AnnotWidget::updateWidgetApperance() + + Note: At the moment the old appearance is deleted and a *new* xref + entry is + created every time AnnotWidget::updateWidgetApperance() is called. + + poppler/Annot.cc | 30 +++++++++++++++++++++++++----- + 1 file changed, 25 insertions(+), 5 deletions(-) + +commit df924493922e8c0f7b1e19c2847d33b28a098913 +Author: Fabio D'Urso +Date: Tue Oct 9 10:47:40 2012 +0200 + + Killed FormField::isModified() in favor of a new AnnotWidget callback + + Instead of having to ask FormField from AnnotWidget::draw if the + widget's appearance needs to be rebuilt, now AnnotWidget gets notified + of changes via the new AnnotWidget::updateAppearanceStream() callback. + + poppler/Annot.cc | 16 ++++++++++------ + poppler/Annot.h | 1 + + poppler/Form.cc | 52 + ++++++++++++++++++++++++++++++++++++++-------------- + poppler/Form.h | 12 +++++++++--- + 4 files changed, 58 insertions(+), 23 deletions(-) + +commit 0a5bda01ace9f8576d687c5a28feb5cf09b48a92 +Author: Albert Astals Cid +Date: Sun Oct 14 23:05:27 2012 +0200 + + New/old header for cmake buildsystem + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 6d46f0b477143eb0df09f718e96dd2ff2a7dd61b +Author: Hib Eris +Date: Sat Sep 22 20:50:07 2012 +0200 + + Split our UTF.h into xpdf based UTF8.h and a poppler specific UTF.h + + poppler/GlobalParams.cc | 2 +- + poppler/Makefile.am | 1 + + poppler/UTF.h | 79 + +--------------------------------------------- + poppler/UTF8.h | 84 + +++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 87 insertions(+), 79 deletions(-) + +commit 03cbba935c90ce9a6d9ad44f7cda4901c2f81f2e +Author: Hib Eris +Date: Sat Sep 22 19:58:40 2012 +0200 + + Do not use mapUTF8() directly in CairoOutputDev + + poppler/CairoOutputDev.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit f219bdbcadcb0334d595bbd9afd01f00c37d1978 +Author: Hib Eris +Date: Sun Oct 14 22:59:55 2012 +0200 + + Make sure array index is >= 0 + + Fixes this warning on array subscript type: + UTF.cc: In function 'int TextStringToUCS4(GooString*, Unicode**)': + UTF.cc:99:33: warning: array subscript has type 'char' + [-Wchar-subscripts] + + poppler/UTF.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 65a2555607e03c94d77ae9ebdb34ab6d4f8844b6 +Author: Fabio D'Urso +Date: Fri Oct 12 23:54:57 2012 +0200 + + FormFieldChoice ctor: Fixed wrong index variable + + It caused a crash if multiple items are initially selected. + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 710bb3383306a9aa6debbfe1364029ee12a15576 +Author: Fabio D'Urso +Date: Fri Oct 12 23:54:57 2012 +0200 + + FormFieldChoice ctor: Fixed wrong index variable + + It caused a crash if multiple items are initially selected. + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ce18c9b3d5251305eb76d294fdf4b4de9382b3a4 +Author: Albert Astals Cid +Date: Wed Oct 10 19:54:57 2012 +0200 + + 0.20.5 + + CMakeLists.txt | 2 +- + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 19 insertions(+), 4 deletions(-) + +commit b112602334a5de84ae30c2e90d9bc6d4609f7f96 +Author: Tobias Koening +Date: Mon Oct 8 22:32:34 2012 +0200 + + [qt4] make LinkRendition properties available + + Bug #55378 + + poppler/Link.cc | 34 +++++++++++++++++++----- + poppler/Link.h | 17 +++++++++--- + qt4/src/poppler-annotation.cc | 2 -- + qt4/src/poppler-annotation.h | 1 + + qt4/src/poppler-link.cc | 60 + ++++++++++++++++++++++++++++++++++++++++--- + qt4/src/poppler-link.h | 57 + +++++++++++++++++++++++++++++++++++++--- + qt4/src/poppler-page.cc | 8 +++++- + 7 files changed, 158 insertions(+), 21 deletions(-) + +commit 6d6bd660dbb652f2f3e87c81c55a87d1fc11ec70 +Author: Carlos Garcia Campos +Date: Sat Oct 6 10:26:55 2012 +0200 + + glib: chain up finalize to the parent class + + This was missing in some of the classes. + + https://bugs.freedesktop.org/show_bug.cgi?id=55521 + + glib/poppler-document.cc | 6 ++++++ + glib/poppler-page.cc | 2 ++ + 2 files changed, 8 insertions(+) + +commit ac3875a9e7f2f4f31881d3d1b3081f2adaef65a1 +Author: Carlos Garcia Campos +Date: Sat Oct 6 10:26:55 2012 +0200 + + glib: chain up finalize to the parent class + + This was missing in some of the classes. + + https://bugs.freedesktop.org/show_bug.cgi?id=55521 + + glib/poppler-document.cc | 6 ++++++ + glib/poppler-page.cc | 2 ++ + 2 files changed, 8 insertions(+) + +commit 042d332c1c9f628e3bfaabf3da9e04436a8677b5 +Merge: 7b9a9f80 e044814c +Author: Albert Astals Cid +Date: Thu Oct 4 00:53:01 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit e044814c0657a6c5b44939a01dcbdc8d83396d43 +Author: Thomas Freitag +Date: Thu Oct 4 00:51:04 2012 +0200 + + Do not render invalid outlines + + Bug #55573 + + splash/SplashFTFont.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 7b9a9f809d07303fe5adff9210731613df8b2adf +Merge: 3b0962cd 9451b7a6 +Author: Albert Astals Cid +Date: Wed Oct 3 01:24:04 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit 9451b7a61b6dcaa6c4a76f3efda82f1ebd408654 +Author: Albert Astals Cid +Date: Wed Oct 3 01:21:45 2012 +0200 + + Fix crash when parsing some unknown colorspaces + + Can't do csObj->getName if csObj is a dict + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3b0962cd14b15ce92c0916f58ed5ba00aebe80b0 +Merge: a9d7ea2e 42908e6e +Author: Albert Astals Cid +Date: Tue Oct 2 19:51:48 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit 42908e6e72d95cec0f70b202c4b1c23f7e47c2a4 +Author: Lu Wang +Date: Tue Oct 2 19:31:04 2012 +0200 + + support automake-1.12 in autogen.sh + + Bug #55541 + + autogen.sh | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit a9d7ea2eb549acbf6ca7e2a299ffed46ff3d8758 +Merge: 397d7b45 9bb68456 +Author: Albert Astals Cid +Date: Wed Sep 26 15:31:29 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + + Conflicts: + poppler/XRef.cc + +commit 9bb68456de41d24db7acf61204bc3f4e36e98505 +Author: Albert Astals Cid +Date: Wed Sep 26 15:13:47 2012 +0200 + + Initilize rootNum + + Fixes valgrind warnings about uninitialized uses + + poppler/XRef.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 397d7b4597ad4bc8ab41fd7a99078473a3c93eb0 +Merge: 6013d49d 2c0f70af +Author: Albert Astals Cid +Date: Wed Sep 26 15:00:04 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit 2c0f70afff03798165c2b609e115dc7e9c034c57 +Author: Thomas Freitag +Date: Wed Sep 26 14:58:05 2012 +0200 + + More crash fixes for broken documents + + poppler/JPXStream.cc | 97 + ++++++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 82 insertions(+), 15 deletions(-) + +commit 78558d24692c68212da35a88deb68069c5a06d81 +Author: Thomas Freitag +Date: Wed Sep 26 14:32:05 2012 +0200 + + Fix more crashes in broken files + + solves 1258.pdf.SIGSEGV.dee.288 and 1255.pdf.asan.38.285, extends + 1043.pdf.asan.47.50 and 557.pdf.asan.47.894 + + poppler/GfxState.cc | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) + +commit e8822c0f3a46195ec7c6e55c556dd0c5716be742 +Author: Albert Astals Cid +Date: Wed Sep 26 14:21:46 2012 +0200 + + Add unlikelys + + poppler/Stream.cc | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +commit 31874f2e065b0d68f726ef404de98f42489c80c7 +Author: Thomas Freitag +Date: Wed Sep 26 14:17:00 2012 +0200 + + Less crashes in broken files + + rebased patch for 1001.pdf.asan.2a.4, extends patch for + 100.pdf.asan.38.2 + + poppler/Stream.cc | 100 + ++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 98 insertions(+), 2 deletions(-) + +commit 81b1d9207840ec1e66eef469b29a36a8556b7265 +Author: Albert Astals Cid +Date: Wed Sep 26 13:38:54 2012 +0200 + + Add some unlikelys + + poppler/JBIG2Stream.cc | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit 9ae1184e3049cabc695c8645a10eaef748b6e641 +Author: Thomas Freitag +Date: Wed Sep 26 12:32:26 2012 +0200 + + More fixes against broken files + + solves 121.pdf.asan.6f.235, extends 682.pdf.SIGFPE.f3.1033 and + 569.pdf.SIGSEGV.c1.907, extends Patch for 829. and 839. asan and + sigsegv series + + poppler/JBIG2Stream.cc | 105 + +++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 93 insertions(+), 12 deletions(-) + +commit 1d72c14b3877ae730ac0aa92f36923269e8a2004 +Author: Thomas Freitag +Date: Wed Sep 26 11:48:14 2012 +0200 + + Fix crash in 158.pdf.asan.d.451 + + poppler/SplashOutputDev.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 6013d49d852c58c4c23f787fd7dd64731c0918f1 +Merge: b97c28c4 671df5da +Author: Albert Astals Cid +Date: Wed Sep 26 00:53:28 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit 671df5dad0732882ceb9e053c3f947dfe0597f3d +Author: Lu Wang +Date: Wed Sep 26 00:52:32 2012 +0200 + + Don't close the stream if it's not a stream + + poppler/PSOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit b97c28c42a18d1c2a8fabea52c092d948811d582 +Merge: 32bb8741 f8c116f1 +Author: Albert Astals Cid +Date: Tue Sep 25 23:22:23 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + + Conflicts: + qt4/src/Makefile.am + +commit f8c116f1e0fbf3516ce228fbb34c33d6b618bed0 +Author: Albert Astals Cid +Date: Tue Sep 25 23:07:55 2012 +0200 + + Add LCMS_FLAGS + + Fixes compilation when lcms is on non standard locations + Bug #55326 + + qt4/src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 32bb87419c360a3b14c717c0f385198b70a1b2e7 +Author: Carlos Garcia Campos +Date: Sun Sep 23 18:15:13 2012 +0200 + + regtest: Reduce the noise of the default output when running tests + + Show permanent information only about failed tests, without the + details + about the failing pages. Previous verbose output is available passing + --verbose command line output. + + regtest/Printer.py | 96 + +++++++++++++++++++++++++++++++++++++ + regtest/TestReferences.py | 8 ++-- + regtest/TestRun.py | 35 +++++++------- + regtest/backends/__init__.py | 13 +++-- + regtest/commands/create-refs.py | 3 +- + regtest/commands/find-regression.py | 5 +- + regtest/commands/run-tests.py | 3 +- + regtest/main.py | 3 ++ + 8 files changed, 137 insertions(+), 29 deletions(-) + +commit ca6afce24aac2ef9d88e215177b11760f7468a6d +Author: Lu Wang +Date: Fri Sep 21 21:33:05 2012 +0200 + + Do not call drawing routines if we don't need non text + + Bug #54617 + + poppler/Gfx.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 70030b91ce2280f23c3e5adf863f1d336c9c5faf +Author: Albert Astals Cid +Date: Fri Sep 21 08:18:29 2012 +0200 + + Increase sonames + + CMakeLists.txt | 2 +- + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Makefile.am | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +commit 2323e38f1a54cb58ec31b4cf15e6c2b1db742ca5 +Author: Albert Astals Cid +Date: Fri Sep 21 08:12:52 2012 +0200 + + Version increase + + CMakeLists.txt | 4 ++-- + configure.ac | 4 ++-- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +commit 11a9a620276d199701be5811eb63687ace85ace1 +Author: Albert Astals Cid +Date: Fri Sep 21 08:10:15 2012 +0200 + + Drop the s from AdditionalActionsType + + qt4/src/poppler-annotation-private.h | 5 +++-- + qt4/src/poppler-annotation.cc | 6 +++--- + qt4/src/poppler-annotation.h | 6 +++--- + 3 files changed, 9 insertions(+), 8 deletions(-) + +commit 028e0e7ddf8c30d311feb937385ef21acd34a52d +Author: Albert Astals Cid +Date: Thu Sep 20 18:13:08 2012 +0200 + + 0.21.0 news + + NEWS | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + +commit 2f2d053352e04e434d83dd93dfdbd08ab5b23f2e +Author: Albert Astals Cid +Date: Thu Sep 20 18:12:57 2012 +0200 + + Update copyrights + + poppler/Annot.cc | 3 ++- + poppler/Annot.h | 1 + + poppler/TextOutputDev.cc | 2 +- + poppler/UTF.h | 1 + + 4 files changed, 5 insertions(+), 2 deletions(-) + +commit 9fad83913791478b63fc76360f1a13e955cdcf4a +Author: Albert Astals Cid +Date: Mon Sep 17 23:15:10 2012 +0200 + + Move to init + + poppler/XRef.cc | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit c470a3929c0a02b8a543fcada22138ab1fc18176 +Author: Thomas Freitag +Date: Mon Sep 17 23:13:48 2012 +0200 + + Support encrypted pdf files in pdfseparate + + poppler/PDFDoc.cc | 35 ++++++++++++++++++++++++++++++++--- + poppler/XRef.cc | 15 +++++++++++++++ + poppler/XRef.h | 2 ++ + utils/pdfseparate.cc | 4 ---- + 4 files changed, 49 insertions(+), 7 deletions(-) + +commit 9b613dcf3c77bc2801d1125dc9bbc5a4dd04e16b +Author: Albert Astals Cid +Date: Mon Sep 17 23:12:43 2012 +0200 + + Compile + + goo/TiffWriter.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit fb5c383bd5be7090fc78380b4bb3244c3316c0cd +Author: William Bader +Date: Mon Sep 17 00:03:49 2012 +0200 + + Make pdftoppm -tiff -overprint work + + Bug #54896 + + goo/TiffWriter.cc | 13 ++++++++++++- + goo/TiffWriter.h | 4 +++- + 2 files changed, 15 insertions(+), 2 deletions(-) + +commit 3794916572a0531b10ee57c9f189497489b90bc8 +Author: Albert Astals Cid +Date: Sun Sep 16 17:53:47 2012 +0200 + + Fix the siblings field correctly + + Fixes KDE bug #302334 + + poppler/Form.cc | 45 + +++++++++++++++++++++++++-------------------- + poppler/Form.h | 24 +++++++++++++----------- + qt4/src/poppler-form.cc | 13 ++++++++++--- + 3 files changed, 48 insertions(+), 34 deletions(-) + +commit e8b6d2ac3a874dd5de166b52625fa628004ea5fe +Merge: 7cb40726 9f51baaf +Author: Albert Astals Cid +Date: Sun Sep 16 14:08:34 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit 9f51baaf7a86680f2195ecdb978f1eb59a8aa734 +Author: Albert Astals Cid +Date: Sun Sep 16 14:07:45 2012 +0200 + + Rework the #ifdef so that i don't get a gcc warning + + poppler/strtok_r.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit b63049f97629a93ec346033e0ec56fc11f34c4fe +Author: Albert Astals Cid +Date: Sun Sep 16 14:05:01 2012 +0200 + + Forgot to add the new test to autotools + + qt4/tests/Makefile.am | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 7cb40726f9e80ee2b2f27ca6ce151b46c6ec091d +Merge: e980d110 c6d7084d +Author: Albert Astals Cid +Date: Sun Sep 16 13:50:19 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit c6d7084d316e94b5b042b086f5440f8543ff5947 +Author: Albert Astals Cid +Date: Sun Sep 16 13:48:51 2012 +0200 + + Fix parsing of numbers + + -2147483648 is an integer + -2147483649 is a real + + poppler/Lexer.cc | 14 +++++- + qt4/tests/CMakeLists.txt | 1 + + qt4/tests/check_lexer.cpp | 118 + ++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 131 insertions(+), 2 deletions(-) + +commit e980d11061c19f13c75f93506e07903b4d1c7f97 +Merge: b72c02d1 36580883 +Author: Albert Astals Cid +Date: Sat Sep 15 20:41:50 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit 365808837080574080b4f8da079124c172fb2123 +Author: Alexey Pavlov +Date: Sat Sep 15 20:38:10 2012 +0200 + + Fix build using mingw64 with winpthread + + strtok_r in winpthread is declared as a macro, that is why + the error happens. Therefore, it is necessary to check whether + the macro + __WINPTHREADS_VERSION is declared. + + Bug #54851 + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + poppler/strtok_r.cpp | 16 +++++++++++++++- + 3 files changed, 17 insertions(+), 3 deletions(-) + +commit b72c02d1a2ec8180b3ddfd2bb2b462c0189377d5 +Author: Albert Astals Cid +Date: Thu Sep 13 19:56:45 2012 +0200 + + Remove the fonts loop + + sometimes it's very slow and doesn't really add much + + qt4/tests/test-poppler-qt4.cpp | 4 ---- + 1 file changed, 4 deletions(-) + +commit cb93d51ccb6b1f6938946ae5d38fb9817005fd7a +Author: Albert Astals Cid +Date: Wed Sep 12 00:12:07 2012 +0200 + + Make gcc happy + + It is stupid and can't see that we only use them when we init them + and complains + they might be used un-initialized + + poppler/TextOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3349a8dd7e0469cc5b5aaa8dd929c6078183ef86 +Author: Thomas Freitag +Date: Wed Sep 12 00:04:45 2012 +0200 + + Splash: Avoid bogus memory error for tilingPattern + + just return gFalse if the resulting + tiling pattern bitmap reaches a memory limit and so the Gfx + implemention of + tiling patterns will be used. I think that this is an acceptable + approach also + concerning performance, because it would take also a while to paint + such a huge + bitmap and then draw it to splash. + + poppler/SplashOutputDev.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 2e77799a1668f949612f551425d0665c59ff1d93 +Author: Thomas Freitag +Date: Tue Sep 11 23:33:25 2012 +0200 + + Splash: Implement DeviceN support + + Bug #53140 + + Some copying from the bug tracker + + To explain + it a little bit more I copy a few lines from "Patch 8.01 — DeviceN + Support (6 + colors)" of the Ghent PDF workgroup: + "This patch tests the DeviceN capabilities of a workflow. If DeviceN + is not + handled correctly the colors are converted to CMYK. Instead of the + check marks + an X will appear in the lower left corner of each image and in + the gradient. + In addition you could inspect the color separations. The objects + should appear + only in the Black, Pantone 265C and GWG Green separations as indicated + in the + captions." + Without the patch all DeviceN colors are immediately converted to CMYK + (with + SPLASH_CMYK). This leads especially to problems, if overprint is + used: in + overprint mode a CMYK color will knockout the underlying CMYK + components, BUT + neither any spot colors. But if underlying spot colors are immediately + converted to CMYK colors, they will be kocked out then, too! + The patch now spends up to four (or up to SPOT_NCOMPS) additional + spot colors + in the splash bitmap, so the order in the bitmap will be + CMYKSTUVCMYKSTUVCMYKSTUV... where S, T, U, V are spot colors (I + would use + S1,S2, S3, S4 if it's possible to use indexes), and all painting + operations are + done now in this new device. Only at the end, when we want to store + the bitmap + in a CMYK or RGB color, the spot colors are converted and their + alternate CMYK + components are added to the normal CMYK components. + According to the PDF spec are PDF writer should use different spot + color names + if they have a different appearance in their alternate CMYK + colorspace. + "hasDifferntResultSet" (sorry for the typo) proofs that: if the same + spot color + name is reused BUT has a different appearance in the alternate + colorspace, it + will be converted immediately to its alternate colorspace. + "createMapping" is used so that getDeviceN (color) returns the + components in + the correct order according their appearance in the splash bitmap, + i.e. the + fourth detected spot color must be placed in index 7 of the color + array. + updateFill- and updateStrokeColorspace are needed to create this + mapping at the + appropriate place. And they are not called once but everytime the + colorspace + changed in the PDF (but of course only once in Gfx). + The GooList *getSeparationList() is used to store the functions + for converting + the spot colors to their alternate colorspace in order of their + appearance in + the splash bitmap. The functions are needed to compare if a spot + color with the + same name has really the same appearance and at the end when the + splash bitmap + has to be converted to a CMYK or RGB bitmap (s. ahead). + deviceNTransfer is needed simular to rgbTransferX or cmykTransferX + if a + transfer function is specified in the ExtGState and splash uses + the DeviceN8. + "Do we really need splashModeDeviceN8?": Do we really need + splashModeXBGR8? But + kidding aside: splashModeDeviceN8 needs four more components than + splashModeCMYK8, so the bitmap size in memory doubles the size of + a pure CMYK + bitmap, and it is only needed if the PDF uses spot colors. So I + think it's a + good idea to spend an additional mode and let it up to the calling + application + and the cirumstances if it wants to use this new mode or not. + + poppler/Function.cc | 14 + + poppler/Function.h | 4 + + poppler/GfxState.cc | 341 +++++++++++++++++- + poppler/GfxState.h | 41 ++- + poppler/SplashOutputDev.cc | 173 ++++++++- + poppler/SplashOutputDev.h | 3 + + splash/Splash.cc | 255 ++++++++++++- + splash/Splash.h | 7 +- + splash/SplashBitmap.cc | 115 +++++- + splash/SplashBitmap.h | 8 +- + splash/SplashState.cc | 30 +- + splash/SplashState.h | 3 + + splash/SplashTypes.h | 30 +- + utils/pdftoppm.cc | 878 + ++++++++++++++++++++++----------------------- + 14 files changed, 1415 insertions(+), 487 deletions(-) + +commit cb2ed646c4ef4161e443ee0a377d1111b3be28ff +Merge: f3a1b765 3ce4d213 +Author: Albert Astals Cid +Date: Tue Sep 11 19:29:19 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit f3a1b765bd6a58d327a80feedbe30e1c0792076e +Author: Jason Crain +Date: Tue Sep 11 19:28:28 2012 +0200 + + Allow multiple fonts in a TextWord + + Bug #6923 + + glib/poppler-page.cc | 49 ++++++----- + poppler/TextOutputDev.cc | 224 + ++++++++++++++++++++++------------------------- + poppler/TextOutputDev.h | 21 ++--- + 3 files changed, 145 insertions(+), 149 deletions(-) + +commit 3ce4d213480471dfd8e307c24c99bf3c6308cd6f +Author: Albert Astals Cid +Date: Tue Sep 11 19:24:58 2012 +0200 + + Do not use isnan as it is C99 + + poppler/TextOutputDev.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 4d7a64a23fd4b4b5ee0d47ead8677f374aaaf6c9 +Author: Jason Crain +Date: Tue Sep 11 19:24:11 2012 +0200 + + Check for NaN in TextPage::addChar + + poppler/TextOutputDev.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit e79b70ec13ab4d2cce8f245d150fa9329b436658 +Author: Tobias Koenig +Date: Tue Sep 11 16:39:55 2012 +0200 + + Make 'additional actions' available in Annotation API of Qt4 frontend + + Bug #53589 + + qt4/src/poppler-annotation-private.h | 3 ++ + qt4/src/poppler-annotation.cc | 99 + +++++++++++++++++++++++++++++++++++- + qt4/src/poppler-annotation.h | 68 ++++++++++++++++++++++++- + 3 files changed, 168 insertions(+), 2 deletions(-) + +commit 5f338ea7d01cabc0f8c50690d0bc262d85baa0ed +Author: Albert Astals Cid +Date: Mon Sep 10 19:47:20 2012 +0200 + + Fix typo + + NEWS | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5fd691dc58aac817bca81c87c4820afcf53989d1 +Author: Albert Astals Cid +Date: Mon Sep 10 19:29:01 2012 +0200 + + 0.20.40.20.40.20.40.20.4 + + CMakeLists.txt | 4 ++-- + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 19 insertions(+), 6 deletions(-) + +commit 1b40cdd9f863cd3868db85b5ccfa77a8350c56d6 +Merge: 6c40a553 b3e86dbd +Author: Albert Astals Cid +Date: Mon Sep 10 18:49:52 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit b3e86dbdba82956f125e37f69176072e2d0127f2 +Author: Thomas Freitag +Date: Sun Sep 9 23:35:45 2012 +0200 + + Try to find another rootNum if actual rootNum doesn't point to a dict + + Bug #14303 + + poppler/XRef.cc | 14 ++++++++++++-- + poppler/XRef.h | 4 ++-- + 2 files changed, 14 insertions(+), 4 deletions(-) + +commit 6c40a553a3c8825931c59797059392fd110531cc +Merge: 17fc1bfa 558a7d9b +Author: Albert Astals Cid +Date: Sun Sep 9 23:27:40 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit 558a7d9b046bbbe185dea263b48a3cb2664378fc +Author: Thomas Freitag +Date: Sun Sep 9 23:25:47 2012 +0200 + + Fix invalid memory access in solves 1066.pdf.asan.38.75 + + splash/SplashClip.cc | 23 +++++++++++++++++++++++ + splash/SplashXPathScanner.cc | 3 +++ + 2 files changed, 26 insertions(+) + +commit d0df8e54512f584ca2b3edbae1c19e167948e5c3 +Author: Thomas Freitag +Date: Sun Sep 9 23:21:38 2012 +0200 + + Fix invalid memory access in 1106.pdf.asan.30.120.patch + + poppler/Function.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 86b89864396a1dcf027e5793e6ac75411977bcf9 +Author: Thomas Freitag +Date: Sun Sep 9 23:08:49 2012 +0200 + + Fix crash in 1255.pdf.SIGSEGV.56f.285 + + poppler/XRef.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 96931732f343d2bbda9af9488b485da031866c3b +Author: Thomas Freitag +Date: Sun Sep 9 22:47:57 2012 +0200 + + Fix invalid memory access in 61.pdf.asan.13.95 + + fofi/FoFiType1C.cc | 25 +++++++++++++++++-------- + fofi/FoFiType1C.h | 2 ++ + 2 files changed, 19 insertions(+), 8 deletions(-) + +commit 26917d69c4da6a110db02b120133c36579fbb17c +Author: Albert Astals Cid +Date: Sun Sep 9 22:23:36 2012 +0200 + + Add unlikely + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e6a3c797c01aa343f640f2e6f45de5bf379aa8ad +Author: Thomas Freitag +Date: Sun Sep 9 22:22:59 2012 +0200 + + Fix wrong memory access in 68.pdf.asan.7.1030 + + poppler/Gfx.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 48fe18cf277cd2a4e665c74b3a594482f762f4b6 +Author: Albert Astals Cid +Date: Sun Sep 9 22:09:44 2012 +0200 + + Fix memory leak + + poppler/Gfx.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b87aafc0cdb36c3555053f2684c45f1a9d7b2f94 +Author: Albert Astals Cid +Date: Sun Sep 9 21:42:48 2012 +0200 + + Add unlikelys to the ifs + + poppler/DCTStream.cc | 4 ++-- + poppler/JBIG2Stream.cc | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit a019eef2f8ca53addd7ccab7f9c47657f4e52286 +Author: Thomas Freitag +Date: Sun Sep 9 21:41:09 2012 +0200 + + Fix crash in 1162.pdf.SIGSEGV.28e.182 + + poppler/DCTStream.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit ad7c6ac88f2315c9ce003308d1b4988592d4434b +Author: William Bader +Date: Sun Sep 9 21:31:58 2012 +0200 + + Fix crash in 1028.pdf.SIGSEGV.ae6.33 + + poppler/JBIG2Stream.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit b861af714daee4125e54b250dddf82106f5a8ce8 +Author: Albert Astals Cid +Date: Sun Sep 9 21:15:06 2012 +0200 + + Fix memory leak + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 17fc1bfa8013cafe3b348f0cc07ef08bf9c7dd9a +Merge: e0118be3 a4f59113 +Author: Albert Astals Cid +Date: Sun Sep 9 12:52:49 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + +commit a4f59113574a8d7460c6ce5000cb09d20fe52b74 +Author: Albert Astals Cid +Date: Sun Sep 9 12:49:43 2012 +0200 + + Fix memory leak + + poppler/Annot.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 28240046f8fe37ca96f9a80cb1ea3a59af9c66f3 +Author: Thomas Freitag +Date: Sun Sep 9 12:48:26 2012 +0200 + + Fix crash in 589.pdf.SIGSEGV.8b1.929 + + poppler/Annot.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit e0118be3ba38bd00fa2a9c20c5b4cd82e820ba0b +Merge: 2c414307 ccd3db5a +Author: Albert Astals Cid +Date: Sat Sep 8 18:15:43 2012 +0200 + + Merge remote-tracking branch 'origin/poppler-0.20' + + Conflicts: + glib/poppler-document.cc + poppler/PDFDoc.cc + poppler/XRef.h + utils/HtmlFonts.cc + +commit ccd3db5a7723ddb692f6dc85ed9d0f5e3dde189f +Author: Albert Astals Cid +Date: Sat Sep 8 18:10:14 2012 +0200 + + Only complain when the malloc really failed + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2c41430732f517d4d57e914a315ba315a2545541 +Author: Albert Astals Cid +Date: Thu Sep 6 22:12:38 2012 +0200 + + Add missing licenses + + goo/grandom.cc | 2 ++ + goo/grandom.h | 2 ++ + splash/SplashScreen.cc | 1 + + utils/pdfinfo.cc | 1 + + 4 files changed, 6 insertions(+) + +commit be88963a5955ac033e7a7d224bdcc4049085a9dc +Author: Fabio D'Urso +Date: Thu Aug 9 13:18:22 2012 +0200 + + pdf-fullrewrite: Added support for encrypted documents, checks on + output documents, incremental update mode + + test/CMakeLists.txt | 1 + + test/Makefile.am | 3 +- + test/pdf-fullrewrite.cc | 354 + ++++++++++++++++++++++++++++++++++++++++++++++-- + 3 files changed, 342 insertions(+), 16 deletions(-) + +commit 381be58e9e0d0e323acbd975a2334eca6d9018fd +Author: Fabio D'Urso +Date: Sat Aug 4 13:00:06 2012 +0200 + + pdfinfo: Show info about the encryption algorithm + + utils/pdfinfo.cc | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) + +commit 273e8c896e95b548093159dc8bb14d48ce447053 +Author: Fabio D'Urso +Date: Wed Aug 15 18:09:02 2012 +0200 + + Mark object streams as DontRewrite + + So that they don't get copied in full rewrite mode, because they're + not referenced from the XRef table we build, and we already + individually write each object they contain. + + poppler/XRef.cc | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 59db8deaa7b1907831b526de3011dc22d0ffb333 +Author: Fabio D'Urso +Date: Thu Aug 9 20:08:44 2012 +0200 + + Mark XRef streams as Unencrypted and DontRewrite + + - Unencrypted because they are stored in unencrypted form + - DontRewrite because they must not be copied in full rewrite mode, + because we always build a new XRef table, and existing XRef streams + are not referenced any more (ie they become "leaked" objects). + Furthermore, since readers know that XRef streams' objects are + unencrypted from the fact that they are XRef streams, but these + leaked objects are no longer referred as XRef streams, readers would + think that they are regularly encrypted objects, resulting in + currupt objects. + + poppler/PDFDoc.cc | 5 +++ + poppler/XRef.cc | 126 + +++++++++++++++++++++++++++++++++++------------------- + poppler/XRef.h | 9 ++-- + 3 files changed, 94 insertions(+), 46 deletions(-) + +commit 116722cc74e267ac44dd5a70924557cdf6f25d02 +Author: Fabio D'Urso +Date: Sat Aug 4 12:47:22 2012 +0200 + + Encrypt strWeird streams before writing them in PDFDoc::writeObject + + poppler/Decrypt.cc | 9 ++++++++- + poppler/Decrypt.h | 2 ++ + poppler/PDFDoc.cc | 10 ++++++++++ + 3 files changed, 20 insertions(+), 1 deletion(-) + +commit 695889c1330ca5b37338b8363dbf233fce936bc6 +Author: Fabio D'Urso +Date: Sat Aug 4 12:24:25 2012 +0200 + + Encrypt strings before writing them in PDFDoc::writeString + + poppler/PDFDoc.cc | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit 4ab8e7be536db40db8a1a4af50dad3ba59c49f14 +Author: Fabio D'Urso +Date: Sat Aug 4 02:06:11 2012 +0200 + + Propagate encryption parameters to PDFDoc's write functions + + poppler/PDFDoc.cc | 54 + ++++++++++++++++++++++++++++++++++++------------------ + poppler/PDFDoc.h | 20 +++++++++++++------- + poppler/XRef.cc | 14 ++++++++++++++ + poppler/XRef.h | 2 ++ + utils/pdfunite.cc | 2 +- + 5 files changed, 66 insertions(+), 26 deletions(-) + +commit 9e43f9a8bcbee9060309b9679dbcc6b501a79cfb +Author: Fabio D'Urso +Date: Wed Aug 1 16:14:22 2012 +0200 + + Separated header and footer write commands from the rest of + PDFDoc::writeObject + + Because in next patch I'll need to pass the object's num and gen + always, + not only if the object's header and footer need to be written. + + poppler/PDFDoc.cc | 51 + +++++++++++++++++++++++++++++++++------------------ + poppler/PDFDoc.h | 11 +++++++---- + utils/pdfunite.cc | 2 +- + 3 files changed, 41 insertions(+), 23 deletions(-) + +commit 4d19a002801531b07f11382daaf9880e4691a10e +Author: Fabio D'Urso +Date: Sat Aug 4 01:36:06 2012 +0200 + + Do not change encrypted documents' ID, not even in case of full + rewrite + + Because we will raw-copy encrypted streams, and the ID is part of the + decryption key. + + poppler/PDFDoc.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 800b2e37d3c4c73147bf9e11d9f38afe2183ab9d +Author: Fabio D'Urso +Date: Wed Aug 1 14:07:10 2012 +0200 + + Initial support for saving encrypted documents + + - Do not refuse to save encrypted documents + - Copy the /Encrypt value in the new document's trailer dictionary + - Mark indirect objects referred from /Encrypt as not encrypted + in XRef::scanSpecialFlags + + poppler/PDFDoc.cc | 49 ++++++++++++++++++------------------------- + poppler/XRef.cc | 62 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++- + poppler/XRef.h | 16 +++++++++++++- + 3 files changed, 96 insertions(+), 31 deletions(-) + +commit 6647153d47b1d67d2a4d6b90dce2184ab6c7dda6 +Author: Fabio D'Urso +Date: Thu Aug 9 12:26:53 2012 +0200 + + Added field XRefEntry::flags, and turned XRefEntry::updated into + a flag + + In next patches I'll add other flags + + poppler/PDFDoc.cc | 4 ++-- + poppler/XRef.cc | 18 +++++++++--------- + poppler/XRef.h | 20 +++++++++++++++++++- + 3 files changed, 30 insertions(+), 12 deletions(-) + +commit a284c6c6623587abb7da7e4c171c42e006ea477b +Author: Fabio D'Urso +Date: Sat Aug 4 01:57:41 2012 +0200 + + Be able to output overflown integers back + + Because Lexer.cc:241 can read them, and we must be able to write them + back (especially in full rewrite mode). + + poppler/PDFDoc.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 53baea19658a27f15c7ed870a24be82b8219ddfe +Author: Fabio D'Urso +Date: Sat Aug 4 01:32:08 2012 +0200 + + FlateStream::unfilteredReset should call str->unfilteredReset() + + Just like any other FilterStream-derived class does + + poppler/Stream.cc | 14 +++++++++++--- + poppler/Stream.h | 2 ++ + 2 files changed, 13 insertions(+), 3 deletions(-) + +commit 4e5fee4e9156480173f05e7b3d0bdf604127d481 +Author: Fabio D'Urso +Date: Mon Aug 6 02:08:27 2012 +0200 + + Initialize AES encryption with random CBC IV data + + poppler/Decrypt.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 1b008f273359b8df6b64ffa94bb2828e42ffa63e +Author: Fabio D'Urso +Date: Mon Aug 6 02:08:40 2012 +0200 + + Replaced srand/rand calls in SplashScreen with grandom calls + + splash/SplashScreen.cc | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit faff947d8106048b19ba74dd483b90b8cebb16c7 +Author: Fabio D'Urso +Date: Mon Aug 6 02:06:47 2012 +0200 + + Added goo/grandom.[cc|h] with POSIX implementation + + CMakeLists.txt | 2 ++ + ConfigureChecks.cmake | 1 + + config.h.cmake | 3 +++ + configure.ac | 1 + + goo/Makefile.am | 6 +++-- + goo/grandom.cc | 68 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + goo/grandom.h | 32 ++++++++++++++++++++++++ + 7 files changed, 111 insertions(+), 2 deletions(-) + +commit af8d05d1ab89b74e307e90aaf19c750528f5f561 +Author: Fabio D'Urso +Date: Fri Aug 3 12:46:06 2012 +0200 + + Added encryption support in Decrypt.cc/.h + + poppler/Decrypt.cc | 222 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Decrypt.h | 21 ++++- + 2 files changed, 242 insertions(+), 1 deletion(-) + +commit ba6ff179aa78a42a384166ace2df80101cfbe7b9 +Author: Fabio D'Urso +Date: Thu Aug 2 18:56:29 2012 +0200 + + Refactoring of Decrypt.cc/.h in preparation for encryption support + + poppler/Decrypt.cc | 219 + +++++++++++++++++++++++++++-------------------------- + poppler/Decrypt.h | 35 ++++++--- + 2 files changed, 133 insertions(+), 121 deletions(-) + +commit cd1ab1e34032d5620140bd0b6b6ec4b74f89ae19 +Author: Albert Astals Cid +Date: Thu Aug 30 22:36:14 2012 +0200 + + Update Adrian's copyrights + + goo/GooString.cc | 1 + + poppler/CharCodeToUnicode.cc | 1 + + poppler/TextOutputDev.cc | 2 +- + poppler/UTF.cc | 23 +++++++++++++++++++++++ + utils/HtmlOutputDev.cc | 2 +- + 5 files changed, 27 insertions(+), 2 deletions(-) + +commit ce8a579f339507da3fd7802e1531fbf6849c0c98 +Author: Adrian Johnson +Date: Tue Aug 28 22:16:34 2012 +0930 + + Move text to unicode conversion into a separate function + + This also ensures UTF-16 ActualText strings are converted to UCS-4 + before calling addChar. + + goo/GooString.cc | 2 +- + poppler/TextOutputDev.cc | 32 ++++---------------------------- + poppler/UTF.cc | 34 ++++++++++++++++++++++++++++++++++ + poppler/UTF.h | 8 ++++++++ + utils/pdfinfo.cc | 37 ++++++------------------------------- + 5 files changed, 53 insertions(+), 60 deletions(-) + +commit cac13e782cf4413703cfd1fa23e76133dfbe5ef9 +Author: Adrian Johnson +Date: Tue Aug 28 21:48:16 2012 +0930 + + text: increase the tolerance for overlapping glyphs + + TextOutputDev will start a new line when encountering consecutive + glyphs with overlapping bounding boxes. This can occur when drawing + diacritics with a separate glyph. In this case, due to the diacritic + having a different baseline, the lines may be output in the wrong + order. + + This patch increases the tolerance for overlapping bounding boxes to + prevent diacritics from splitting lines. + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6f6386219449e70c2c3bc3559fdde3df4a57a809 +Author: Adrian Johnson +Date: Thu Mar 8 20:52:28 2012 +1030 + + Convert UTF-16 to UCS-4 when reading toUnicode cmap + + to ensure only UCS-4 values are used with the "Unicode" type. + + CMakeLists.txt | 3 ++- + poppler/CairoOutputDev.cc | 2 +- + poppler/CharCodeToUnicode.cc | 12 ++++++----- + poppler/GlobalParams.cc | 2 +- + poppler/Makefile.am | 3 ++- + poppler/TextOutputDev.cc | 19 +----------------- + poppler/UTF.cc | 47 + ++++++++++++++++++++++++++++++++++++++++++++ + poppler/{UTF8.h => UTF.h} | 23 ++++++++++++++++++++-- + utils/HtmlOutputDev.cc | 14 +------------ + 9 files changed, 83 insertions(+), 42 deletions(-) + +commit b3b0f5abe4fdcc39d884670e4a998d39324659f6 +Author: Albert Astals Cid +Date: Thu Aug 30 00:57:51 2012 +0200 + + qt4: unbreak spacing + + qt4/src/poppler-embeddedfile.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6356c0bbae47db291a3585d31c7727bc3f8d97a4 +Author: Albert Astals Cid +Date: Thu Aug 30 00:57:51 2012 +0200 + + qt4: unbreak spacing + + qt4/src/poppler-embeddedfile.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 46948868dee6d4e68b658c68d7df482590e34da3 +Author: Albert Astals Cid +Date: Thu Aug 30 00:43:45 2012 +0200 + + Accept FileSpec as Dict too and not only as Ref + + File to try in KDE bug #306008 + + poppler/Catalog.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit debc8fb497bc22c0f9f34d785852981a87475c30 +Author: Albert Astals Cid +Date: Thu Aug 30 00:35:40 2012 +0200 + + Take into account the embFile returned by the core may be NULL + + qt4/src/poppler-embeddedfile-private.h | 4 +++- + qt4/src/poppler-embeddedfile.cc | 19 ++++++++++++------- + 2 files changed, 15 insertions(+), 8 deletions(-) + +commit 3ca67a59fc15782abb1e479eb2b8916de5b1b6ed +Author: Albert Astals Cid +Date: Thu Aug 30 00:34:06 2012 +0200 + + Return NULL EmbFile if the FileSpec is not ok + + Otherwise we might end up asserting + + poppler/FileSpec.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 9264b375eec19e639c524b677f770ad750b1cb43 +Author: Albert Astals Cid +Date: Thu Aug 30 00:43:45 2012 +0200 + + Accept FileSpec as Dict too and not only as Ref + + File to try in KDE bug #306008 + + poppler/Catalog.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 01528eaedc77d5559f6dc4229b66f1a819678fb7 +Author: Albert Astals Cid +Date: Thu Aug 30 00:35:40 2012 +0200 + + Take into account the embFile returned by the core may be NULL + + qt4/src/poppler-embeddedfile-private.h | 4 +++- + qt4/src/poppler-embeddedfile.cc | 19 ++++++++++++------- + 2 files changed, 15 insertions(+), 8 deletions(-) + +commit c1fba45be106dc30a5136efe41493b1cf6d2a1b5 +Author: Albert Astals Cid +Date: Thu Aug 30 00:34:06 2012 +0200 + + Return NULL EmbFile if the FileSpec is not ok + + Otherwise we might end up asserting + + poppler/FileSpec.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 1881486e9817304d0817ce24b177c1bc79587138 +Author: Tobias Koenig +Date: Fri Aug 24 19:12:20 2012 +0200 + + annots: Unify parsing of additional actions entries + + https://bugs.freedesktop.org/show_bug.cgi?id=53586 + + poppler/Annot.cc | 58 + ++++++++++++++++++++++++++++++++++++++++++++------------ + poppler/Annot.h | 24 +++++++++++++++++++---- + 2 files changed, 66 insertions(+), 16 deletions(-) + +commit 686ec0cc92e25f74eaa9e09a328724cbdf939bca +Author: Albert Astals Cid +Date: Wed Aug 15 20:02:05 2012 +0200 + + Remove declared but not implemented function + + poppler/XRef.h | 1 - + 1 file changed, 1 deletion(-) + +commit 0b3259c1d5679cb8d59d770e5fbe7e1bc141a025 +Author: Albert Astals Cid +Date: Wed Aug 15 20:02:05 2012 +0200 + + Remove declared but not implemented function + + poppler/XRef.h | 1 - + 1 file changed, 1 deletion(-) + +commit 5fd2a35227c22dbddedfb397eff0e0a09c3d1b03 +Author: Pino Toscano +Date: Wed Aug 15 19:51:43 2012 +0200 + + poppler-config.h: remove WITH_FONTCONFIGURATION_* macros + + no public header uses them anymore, so need to expose them + + poppler/poppler-config.h.cmake | 10 ---------- + poppler/poppler-config.h.in | 10 ---------- + 2 files changed, 20 deletions(-) + +commit edd0ea4847c143adb1d15a57b42b0ce2b2c80b0e +Author: Pino Toscano +Date: Wed Aug 15 19:31:50 2012 +0200 + + ignore more qt4 tests + + qt4/tests/.gitignore | 3 +++ + 1 file changed, 3 insertions(+) + +commit 2df57857000c5adbee6b029ff7a79acc707786a0 +Author: Pino Toscano +Date: Wed Aug 15 18:59:15 2012 +0200 + + build: remove extra fontconfig CFLAGS and LIBS + + fontconfig is used only in .cpp sources inside the 'poppler' + subdirectory, so there is no need to add the include paths for it + in other directories; + likewise, do not to link to it if not needed + + glib/Makefile.am | 4 +--- + qt4/demos/Makefile.am | 2 -- + qt4/src/Makefile.am | 2 -- + qt4/tests/Makefile.am | 2 -- + test/Makefile.am | 6 ++---- + utils/CMakeLists.txt | 3 --- + utils/Makefile.am | 4 +--- + 7 files changed, 4 insertions(+), 19 deletions(-) + +commit 3e802949264d9310df057daff891a3fccb2eb8d3 +Author: Albert Astals Cid +Date: Wed Aug 15 00:02:23 2012 +0200 + + PSOutputDev: Always write HiResBoundingBox + + Makes some people happier and it doesn't hurt us much + Bug #53159 + + poppler/PSOutputDev.cc | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +commit e83568065f77ba722b147b3b10faed1ff66f22dc +Author: Pino Toscano +Date: Sat Aug 11 01:38:08 2012 +0200 + + remove extra execution permissions + + (cherry picked from commit 9a5a19ee2f9cd536c3527b30c0256ca9dce3638c) + + goo/GooTimer.h | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 9a5a19ee2f9cd536c3527b30c0256ca9dce3638c +Author: Pino Toscano +Date: Sat Aug 11 01:38:08 2012 +0200 + + remove extra execution permissions + + goo/GooTimer.h | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit 1b2903c104012fdd3c982d57898910945dff9a15 +Author: Albert Astals Cid +Date: Sat Aug 11 00:05:10 2012 +0200 + + 0.20.3 + + CMakeLists.txt | 4 ++-- + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 22 insertions(+), 6 deletions(-) + +commit 40e7b744d32152ab4c6201b8bda7fb7caf6bfd4e +Author: Albert Astals Cid +Date: Sun Aug 5 15:07:16 2012 +0200 + + If NULL, NULL fails as password try EMPTY, EMPTY before failing + + Reviewed by Jose Aliste + Bug #3498 + + poppler/SecurityHandler.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit a53e0641365608f832b455404f1ee584d278e0c4 +Author: Albert Astals Cid +Date: Sun Aug 5 15:07:16 2012 +0200 + + If NULL, NULL fails as password try EMPTY, EMPTY before failing + + Reviewed by Jose Aliste + Bug #3498 + + poppler/SecurityHandler.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 3ca2bc0d3abdf92741b7921ea402c9de09e531f6 +Author: Markus Trippelsdorf +Date: Fri Aug 3 00:48:12 2012 +0200 + + Fix segfault when scaleImage returns NULL + + Bug 52488 + + splash/Splash.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 31fe12c63f0133d124e2115aba607857aaff0978 +Author: Markus Trippelsdorf +Date: Fri Aug 3 00:48:12 2012 +0200 + + Fix segfault when scaleImage returns NULL + + Bug 52488 + + splash/Splash.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit d3c339017857cd762d8419260e33e1cc4e197743 +Author: Thomas Freitag +Date: Thu Aug 2 00:22:19 2012 +0200 + + PSOutputDev: Fix Bitmaps in level2sep or level3sep + + Bug #52384 + + poppler/PSOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 768cf5877f48f8cee80fe96e2ee52f42f230dfdf +Author: Thomas Freitag +Date: Thu Aug 2 00:22:19 2012 +0200 + + PSOutputDev: Fix Bitmaps in level2sep or level3sep + + Bug #52384 + + poppler/PSOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d0e55aa49484263882345fa648e1e907d2b172f2 +Author: Thomas Freitag +Date: Wed Aug 1 22:56:49 2012 +0200 + + Splash: Blend mode enhancements for CMYK + + poppler/SplashOutputDev.cc | 76 + ++++++++++++++++++++++++++++++++-------------- + splash/Splash.cc | 22 -------------- + 2 files changed, 54 insertions(+), 44 deletions(-) + +commit 315447843a368556a8536bc30e579c9bf338682e +Author: Thomas Freitag +Date: Wed Aug 1 22:56:49 2012 +0200 + + Splash: Blend mode enhancements for CMYK + + poppler/SplashOutputDev.cc | 76 + ++++++++++++++++++++++++++++++++-------------- + splash/Splash.cc | 22 -------------- + 2 files changed, 54 insertions(+), 44 deletions(-) + +commit 78c6a5615013d26b8a2babb13b3c4f7d6a1d70a4 +Author: Albert Astals Cid +Date: Tue Jul 31 23:32:19 2012 +0200 + + Replace c++ style includes with c style ones + + Fixes build in Solaris 10 + Bug #52426 + + goo/gstrtod.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit c0c88b3707fc7337e814ae4252d80002641a19ee +Author: Albert Astals Cid +Date: Tue Jul 31 23:32:19 2012 +0200 + + Replace c++ style includes with c style ones + + Fixes build in Solaris 10 + Bug #52426 + + goo/gstrtod.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit dcbc923bd3592a81876f84005fbaddcea18641cc +Author: Thomas Freitag +Date: Sun Jul 22 18:40:46 2012 +0200 + + Make sure xScale and yScale are always initialized + + Bug #52215 + + poppler/PSOutputDev.cc | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 36481939e3064de920e49d9d1742a85473a50963 +Author: Thomas Freitag +Date: Sun Jul 22 18:40:46 2012 +0200 + + Make sure xScale and yScale are always initialized + + Bug #52215 + + poppler/PSOutputDev.cc | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit ef7c2418e12d3e6a79f1d89a0051b005fadbc344 +Author: Thomas Freitag +Date: Sat Jul 21 00:01:49 2012 +0200 + + Fix conversion to ps when having multiple strips + + Bug 51982 + + poppler/PSOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 6b567565b7b9d591fbd7441592096960a303bd39 +Author: Thomas Freitag +Date: Sat Jul 21 00:01:49 2012 +0200 + + Fix conversion to ps when having multiple strips + + Bug 51982 + + poppler/PSOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 349b21acc249c130fb053bc4a0c75019f75bd35b +Author: Torsten Kasch +Date: Thu Jul 19 00:18:14 2012 +0200 + + Unify poppler-config.h includes in core "installed" headers + + Bug 52193 + + goo/FixedPoint.h | 2 +- + goo/GooTimer.h | 2 +- + goo/JpegWriter.h | 2 +- + goo/PNGWriter.h | 2 +- + goo/TiffWriter.h | 2 +- + goo/gfile.h | 2 +- + goo/gmem.h | 2 +- + splash/SplashFTFont.h | 2 +- + splash/SplashMath.h | 2 +- + 9 files changed, 9 insertions(+), 9 deletions(-) + +commit 34327b2c201392f96e3449941411b7ad4b3e8bcb +Author: Torsten Kasch +Date: Thu Jul 19 00:18:14 2012 +0200 + + Unify poppler-config.h includes in core "installed" headers + + Bug 52193 + + goo/FixedPoint.h | 2 +- + goo/GooTimer.h | 2 +- + goo/JpegWriter.h | 2 +- + goo/PNGWriter.h | 2 +- + goo/TiffWriter.h | 2 +- + goo/gfile.h | 2 +- + goo/gmem.h | 2 +- + splash/SplashFTFont.h | 2 +- + splash/SplashMath.h | 2 +- + 9 files changed, 9 insertions(+), 9 deletions(-) + +commit 8fe700217ab6ce786a8272f2c338e3dab434c56e +Author: Torsten Kasch +Date: Thu Jul 19 00:06:45 2012 +0200 + + autoconf: Do not assume the shell is bash compatible + + Bug 52197 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 15c6ae699f083ea6c9716c1098ae9833a56eeb3e +Author: Torsten Kasch +Date: Thu Jul 19 00:06:45 2012 +0200 + + autoconf: Do not assume the shell is bash compatible + + Bug 52197 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f5311da76ec7cd7c1e6cdfc4e18df6dd56e8398b +Author: Albert Astals Cid +Date: Thu Jul 19 00:01:49 2012 +0200 + + pdfseparate: Return 0 on success + + utils/pdfseparate.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit dc8833a36b514c13cfd6b1fd4665d2fddd71f357 +Author: Albert Astals Cid +Date: Thu Jul 19 00:01:49 2012 +0200 + + pdfseparate: Return 0 on success + + utils/pdfseparate.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 51f22ca0badfc41c19cba66cabd63184244f81c7 +Author: Thomas Freitag +Date: Mon Jul 16 23:32:23 2012 +0200 + + PSOutputDev: Fix DeviceN images with alternate Lab colorspace in + level 3 PostScript + + Bug #51822 + + poppler/PSOutputDev.cc | 54 + +++++++++++++++++++++++++++++++++++++++++++------- + poppler/PSOutputDev.h | 2 +- + 2 files changed, 48 insertions(+), 8 deletions(-) + +commit 31ef967033407de91109ff46db9c60cb8748bc55 +Author: Thomas Freitag +Date: Mon Jul 16 23:32:23 2012 +0200 + + PSOutputDev: Fix DeviceN images with alternate Lab colorspace in + level 3 PostScript + + Bug #51822 + + poppler/PSOutputDev.cc | 54 + +++++++++++++++++++++++++++++++++++++++++++------- + poppler/PSOutputDev.h | 2 +- + 2 files changed, 48 insertions(+), 8 deletions(-) + +commit f9f5238d32615f93d07afa3aa7384a8b30737203 +Author: Thomas Freitag +Date: Fri Jul 13 00:56:48 2012 +0200 + + Fix Splash::arbitraryTransformImage causes bogus memory allocation + size + + Bug #49523 + + poppler/SplashOutputDev.cc | 2 +- + splash/Splash.cc | 79 + ++++++++++++++++++++++++++-------------------- + splash/Splash.h | 4 +-- + 3 files changed, 48 insertions(+), 37 deletions(-) + +commit 950d5f3dec4bff5d3c523d55689d7b70215dc110 +Author: Thomas Freitag +Date: Fri Jul 13 00:56:48 2012 +0200 + + Fix Splash::arbitraryTransformImage causes bogus memory allocation + size + + Bug #49523 + + poppler/SplashOutputDev.cc | 2 +- + splash/Splash.cc | 79 + ++++++++++++++++++++++++++-------------------- + splash/Splash.h | 4 +-- + 3 files changed, 48 insertions(+), 37 deletions(-) + +commit e09be3bc6ba1290fd31bde0c3d19c4ffcbadbf00 +Author: Albert Astals Cid +Date: Tue Jul 10 23:06:53 2012 +0200 + + 0.20.2 + + CMakeLists.txt | 2 +- + NEWS | 11 +++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 15 insertions(+), 4 deletions(-) + +commit e15fe0e1e6accf779caeb1179a8d62161c0aa650 +Author: Thomas Freitag +Date: Thu Jul 5 17:44:02 2012 +0200 + + Fix handling of DeviceN images in level 3 PostScript + + bug #51548 + + poppler/PSOutputDev.cc | 14 -------------- + 1 file changed, 14 deletions(-) + +commit 31837201cf5b3db735c89ef4969105b7a6ab465d +Author: Thomas Freitag +Date: Thu Jul 5 17:44:02 2012 +0200 + + Fix handling of DeviceN images in level 3 PostScript + + bug #51548 + + poppler/PSOutputDev.cc | 14 -------------- + 1 file changed, 14 deletions(-) + +commit 262203bd86403e43034fbfbbeef5a5894a62ecb2 +Author: Albert Astals Cid +Date: Sat Jun 30 14:36:28 2012 +0200 + + [qt4] Refactor part of ::search() functions + + qt4/src/poppler-page-private.h | 7 ++++- + qt4/src/poppler-page.cc | 61 + +++++++++++++++++++----------------------- + 2 files changed, 34 insertions(+), 34 deletions(-) + +commit bd71f80c409dbb47231088c3c6661946ccde6e67 +Author: Adam Reichold +Date: Thu Jun 28 17:42:17 2012 +0200 + + [qt4] add whole-page search method to Poppler::Page + + qt4/src/poppler-page.cc | 39 +++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-qt4.h | 14 ++++++++++++++ + 2 files changed, 53 insertions(+) + +commit 46ebe7dc84b14ce8dda7b3b1da516b9d99ac3344 +Author: Albert Astals Cid +Date: Fri Jun 29 01:56:55 2012 +0200 + + PSOutputDev: Correct %%DocumentCustomColors + + Bug 51479 + + poppler/PSOutputDev.cc | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit 02c4e6bf4cc0f5535946fe31815081a40b1de986 +Author: Albert Astals Cid +Date: Fri Jun 29 01:56:55 2012 +0200 + + PSOutputDev: Correct %%DocumentCustomColors + + Bug 51479 + + poppler/PSOutputDev.cc | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit 2b8d95aeede56c75699bb83ca3b23ea199b81c2c +Author: Albert Astals Cid +Date: Thu Jun 28 00:18:07 2012 +0200 + + Add some security checks to JPXStream decoding + + Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk + and Gynvael Coldwind + + poppler/JPXStream.cc | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit f7990386d268a444c297958e9c50ed27a0825a00 +Author: Albert Astals Cid +Date: Thu Jun 28 00:18:07 2012 +0200 + + Add some security checks to JPXStream decoding + + Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk + and Gynvael Coldwind + + poppler/JPXStream.cc | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit c5c6eed1623506e1206e89cee0b7c887d815ba62 +Author: Albert Astals Cid +Date: Sun Jun 24 23:43:03 2012 +0200 + + Change SplashBitmap gmallocn to gmallocn_checkoverflow + + Fixes abort in KDE bug #302372 + + splash/Splash.cc | 37 +++++++++++++++++++++++-------------- + splash/SplashBitmap.cc | 18 +++++++++++------- + 2 files changed, 34 insertions(+), 21 deletions(-) + +commit f48eb669ae5c729c026554802e666e64399c0900 +Author: Albert Astals Cid +Date: Sun Jun 24 23:43:03 2012 +0200 + + Change SplashBitmap gmallocn to gmallocn_checkoverflow + + Fixes abort in KDE bug #302372 + + splash/Splash.cc | 37 +++++++++++++++++++++++-------------- + splash/SplashBitmap.cc | 18 +++++++++++------- + 2 files changed, 34 insertions(+), 21 deletions(-) + +commit c87738ee234aafc6eda5a263ad789205037020e1 +Author: Thomas Freitag +Date: Sun Jun 24 20:20:38 2012 +0200 + + copy resources content defined in the pages dict + + Fixes bug #51369 + + poppler/PDFDoc.cc | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +commit ff48a5d67a130211fbbb98aa0011bca0c1185114 +Author: Thomas Freitag +Date: Sun Jun 24 20:20:38 2012 +0200 + + copy resources content defined in the pages dict + + Fixes bug #51369 + + poppler/PDFDoc.cc | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +commit 6cdf879e389f05abba30b3fad8083b7fff23056e +Author: Fabio D'Urso +Date: Sun Jun 24 11:48:04 2012 +0200 + + qt4: Do not hang on malformed /Annots objects + + Don't recurse infinitely if the /Annots object contains annotation + dictionaries (according to specs, /Annots must contain *references* + to annotation dictionaries). + + Fixes bug #51361 + + qt4/src/poppler-annotation.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit bd1dab39a857b852c09d21f64254ffc1f24c2df0 +Author: Fabio D'Urso +Date: Sun Jun 24 11:48:04 2012 +0200 + + qt4: Do not hang on malformed /Annots objects + + Don't recurse infinitely if the /Annots object contains annotation + dictionaries (according to specs, /Annots must contain *references* + to annotation dictionaries). + + Fixes bug #51361 + + qt4/src/poppler-annotation.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 31db47d077825045edd1a2d229e873a6f8e09fb1 +Author: Carlos Garcia Campos +Date: Sun Jun 17 12:00:43 2012 +0200 + + Simplify AnnotAppearance::getAppearanceStream() + + - Use a switch instead of if to get the stream object + - Use the return value of dictLookupNF to check whether the object is + null + - Don't fetch the stream to check the reference is valid, this is + already done when used + + poppler/Annot.cc | 50 ++++++++++++++++++-------------------------------- + 1 file changed, 18 insertions(+), 32 deletions(-) + +commit b15d02b92aca1348564e70d0245064bc27eefce8 +Author: Maciej Mrozowski +Date: Fri May 18 01:47:55 2012 +0200 + + Add the possibility of using lcms1 even if lcms2 is installed + + CMakeLists.txt | 20 +++++++++++++------- + configure.ac | 31 +++++++++++++++---------------- + 2 files changed, 28 insertions(+), 23 deletions(-) + +commit 0cc2738737ed411159c8c8045eff5d1a4463ed16 +Author: Mark Brand +Date: Thu Jun 14 20:31:26 2012 +0200 + + fix typo to compile in Windows + + poppler/GlobalParamsWin.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3575becd60585324bcefc0631b1bac47c1db3c5c +Author: Mark Brand +Date: Thu Jun 14 20:31:26 2012 +0200 + + fix typo to compile in Windows + + poppler/GlobalParamsWin.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 2e1410ea62fe99e52c94f878d02181f0b59f1cd5 +Author: Albert Astals Cid +Date: Mon Jun 11 15:17:59 2012 +0200 + + Add some security checks to JBIG2Stream decoding + + Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk + and Gynvael Coldwind + + poppler/JBIG2Stream.cc | 58 + ++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 44 insertions(+), 14 deletions(-) + +commit 06618065c8a97a5bec125560546b98edfc1210f3 +Author: Albert Astals Cid +Date: Mon Jun 11 15:17:59 2012 +0200 + + Add some security checks to JBIG2Stream decoding + + Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk + and Gynvael Coldwind + + poppler/JBIG2Stream.cc | 58 + ++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 44 insertions(+), 14 deletions(-) + +commit 6a76d21661add4f84ee0859c4e7a4c23e7a63bc4 +Author: Hib Eris +Date: Sun Jun 10 19:44:18 2012 +0200 + + Check value of first page in linearization table + + Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk + and Gynvael Coldwind + + poppler/Linearization.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit e3fe88df3646a80945210ba426eb4681a98b55e9 +Author: Hib Eris +Date: Sun Jun 10 19:44:18 2012 +0200 + + Check value of first page in linearization table + + Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk + and Gynvael Coldwind + + poppler/Linearization.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1240eee8c0d0d01113443e0fda87721775a76da9 +Author: Albert Astals Cid +Date: Sun Jun 10 20:42:55 2012 +0200 + + 0.20.1 + + CMakeLists.txt | 4 ++-- + NEWS | 25 +++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 31 insertions(+), 6 deletions(-) + +commit d483436517c5d9679fd6f4ec5544128ffcc2188e +Author: Albert Astals Cid +Date: Sun Jun 10 20:15:01 2012 +0200 + + Update copyrights + + poppler/GlobalParamsWin.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c783037619e2b4c101e8ecd7e61c94ee077b4be2 +Author: Albert Astals Cid +Date: Sun Jun 10 20:15:01 2012 +0200 + + Update copyrights + + poppler/GlobalParamsWin.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d791101fbdebf7a3b3f333939f9bbff6bbecf45f +Author: Albert Astals Cid +Date: Sun Jun 10 19:09:17 2012 +0200 + + Do use NULL function + + Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk + and Gynvael Coldwind + + poppler/Gfx.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit f3f9d8f28a97338da92c842d5668b0ef3495ef13 +Author: Albert Astals Cid +Date: Sun Jun 10 19:09:17 2012 +0200 + + Do use NULL function + + Fixes crash in broken/fuzzed pdf sent by Mateusz "j00ru" Jurczyk + and Gynvael Coldwind + + poppler/Gfx.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 8b3fa65f293804dab7ae2fd069132d0d6f44bbb2 +Author: Tobias Koenig +Date: Sun Jun 10 17:48:08 2012 +0200 + + [qt4] Add accessor methods for poster information + + qt4/src/poppler-movie.cc | 15 +++++++++++++++ + qt4/src/poppler-qt4.h | 15 +++++++++++++++ + 2 files changed, 30 insertions(+) + +commit e8aa8266254bfd2189d5b5105e3d76caa4cc6713 +Author: Thomas Freitag +Date: Sun Jun 10 16:58:54 2012 +0200 + + use setoverprintmode only if rip knows it + + poppler/PSOutputDev.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 92ef16e3699da949c80716c3fd4b438fe79c134d +Author: Thomas Freitag +Date: Sun Jun 10 16:58:54 2012 +0200 + + use setoverprintmode only if rip knows it + + poppler/PSOutputDev.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6e3503b5591b105fa92e6cc6568b8819f6acd625 +Author: Fabio D'Urso +Date: Thu May 24 23:17:27 2012 +0200 + + qt4: Keep page rotation into account when normalizing annotation + coords + + If the page is rotated by 90 or 270 degrees, width and height need + to be swapped + + qt4/src/poppler-annotation.cc | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +commit 99aa734ae2d3ba51f840d4c8ef450488fb702a31 +Author: Fabio D'Urso +Date: Thu May 24 23:17:27 2012 +0200 + + qt4: Keep page rotation into account when normalizing annotation + coords + + If the page is rotated by 90 or 270 degrees, width and height need + to be swapped + + qt4/src/poppler-annotation.cc | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +commit 4f2ac544f36aa11747c3e13ff69fc19bdd0136dc +Author: Fabio D'Urso +Date: Sat Jun 9 01:31:29 2012 +0200 + + Fix saving to xml + + The default icon is Note not comment + + qt4/src/poppler-annotation.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bde31ce7b223abc86d25e06f3d73668b792c70df +Author: Fabio D'Urso +Date: Sat Jun 9 01:31:29 2012 +0200 + + Fix saving to xml + + The default icon is Note not comment + + qt4/src/poppler-annotation.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0df0aa439eed1d9838a80942e00af08e9acabb8d +Author: Carlos Garcia Campos +Date: Sat Jun 2 17:33:23 2012 +0200 + + glib-demo: Add find options to find demo + + glib/demo/find.c | 61 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 60 insertions(+), 1 deletion(-) + +commit 52b3ede4bfd1e2288a0efca34da5d6239d3563e9 +Author: Carlos Garcia Campos +Date: Sat Jun 2 16:25:06 2012 +0200 + + glib-demo: Show search matches in a document view + + glib/demo/find.c | 253 + +++++++++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 218 insertions(+), 35 deletions(-) + +commit ed0c761c2190a3c1959a60ae9b7961f58a43c939 +Author: Thomas Schenker +Date: Sat Jun 2 11:54:21 2012 +0200 + + glib: Add poppler_page_find_text_with_options + + To be able to search text with options like case sensitive, search + backwards and whole words only. + + https://bugs.freedesktop.org/show_bug.cgi?id=2951 + + glib/poppler-page.cc | 52 + +++++++++++++++++++++++++++---------- + glib/poppler-page.h | 3 +++ + glib/poppler.h | 18 +++++++++++++ + glib/reference/poppler-sections.txt | 2 ++ + 4 files changed, 62 insertions(+), 13 deletions(-) + +commit 126b55c9a44ccb0dba55e758843e9ee4aa43ee2b +Author: Carlos Garcia Campos +Date: Sat Jun 2 17:19:30 2012 +0200 + + Implement whole words only option to search text + + It seems we missed it in the xpdf303 merge. + + poppler/TextOutputDev.cc | 144 + ++++++++++++++++++++++++----------------------- + 1 file changed, 74 insertions(+), 70 deletions(-) + +commit 20210fbb6117649b20f6930031f24b8fc97b773d +Author: Luis Parravicini +Date: Mon May 28 23:44:17 2012 +0200 + + pdftohtml: Add -fontfullname + + Outputs the font name without any substitutions. Bug #49872 + + utils/HtmlFonts.cc | 4 +++- + utils/pdftohtml.1 | 3 +++ + utils/pdftohtml.cc | 4 ++++ + 3 files changed, 10 insertions(+), 1 deletion(-) + +commit 03f979a7e59c4eb5ecb8acc324c7faf700144589 +Author: Gerald Schmidt +Date: Sat May 26 17:46:59 2012 +0200 + + Make the output more xhtml compliant + + utils/HtmlOutputDev.cc | 105 + +++++++++++++++++++++++++------------------------ + 1 file changed, 53 insertions(+), 52 deletions(-) + +commit ba6406222f828e354323223fc4bdb01c1726fb49 +Author: Fabio D'Urso +Date: Mon May 21 18:16:06 2012 +0200 + + Added Annot::removeReferencedObjects + Always set annotations' + page field + + - Now Page::removeAnnot calls Annot::removeReferencedObjects, which + takes care of + removing referenced objects (such as the annot popup and the + appearance streams). + - Previously, Annot's page field was set only if the annotation + dictionary + contained /P + + poppler/Annot.cc | 40 + ++++++++++++++++++++++++++++++++++------ + poppler/Annot.h | 13 +++++++++---- + poppler/Page.cc | 7 ++++--- + poppler/Page.h | 2 +- + qt4/src/poppler-annotation.cc | 8 -------- + 5 files changed, 48 insertions(+), 22 deletions(-) + +commit 9904b8f10abf068a7816bd90976ccbb320387645 +Author: Adrian Johnson +Date: Thu May 24 18:24:48 2012 +0930 + + glib docs: fix typo + + glib/poppler-document.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 028f580056f99719cfb8af7bbe8184ceac02cb16 +Author: Adrian Johnson +Date: Sun May 13 21:36:36 2012 +0930 + + add sustitute font name to GlobalParamsWin32 to fix compilation + + poppler/GlobalParamsWin.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 1916d000a86336213ffd6e9bd44ce873e8955895 +Author: Adrian Johnson +Date: Sat May 12 16:31:38 2012 +0930 + + Include substitute font name in system font cache + + Bug 49826 + + poppler/FontInfo.cc | 1 + + poppler/GlobalParams.cc | 58 + +++++++++++++++++++++++++++---------------------- + 2 files changed, 33 insertions(+), 26 deletions(-) + +commit b47d38e2ccd8563394df89765e277bde95730052 +Author: Adrian Johnson +Date: Thu May 24 18:24:48 2012 +0930 + + glib docs: fix typo + + glib/poppler-document.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 14a29dbff585cbe55247431a346c2ac3e12473fe +Author: Adrian Johnson +Date: Sun May 13 21:36:36 2012 +0930 + + add sustitute font name to GlobalParamsWin32 to fix compilation + + poppler/GlobalParamsWin.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 7436b2c8a853f5121eb7dd13168ab997f1cf7d80 +Author: Adrian Johnson +Date: Sat May 12 16:31:38 2012 +0930 + + Include substitute font name in system font cache + + Bug 49826 + + poppler/FontInfo.cc | 1 + + poppler/GlobalParams.cc | 58 + +++++++++++++++++++++++++++---------------------- + 2 files changed, 33 insertions(+), 26 deletions(-) + +commit 1c6e84555572a6bf3a2e3fbe9a54b40f11c122ad +Author: Fabio D'Urso +Date: Fri May 18 16:22:46 2012 +0200 + + qt4: Make TextAnnotation ctor public + + qt4/src/poppler-annotation.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fe28614e7aab6e029f4b420353b67a7eea24de36 +Author: Fabio D'Urso +Date: Fri May 18 16:22:46 2012 +0200 + + qt4: Make TextAnnotation ctor public + + qt4/src/poppler-annotation.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8e504bf2543621973fdaddbd29055ce435540146 +Author: Ville Skyttä +Date: Wed May 16 23:49:01 2012 +0300 + + pdfseparate.1: Syntax fixes. + + utils/pdfseparate.1 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 918456372548810c9efbf0533fa155034dd081f2 +Author: Ville Skyttä +Date: Wed May 16 23:49:01 2012 +0300 + + pdfseparate.1: Syntax fixes. + + utils/pdfseparate.1 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 892e486addcbcad619613c7be1ca692a0d36d6e5 +Author: Albert Astals Cid +Date: Mon May 21 20:28:42 2012 +0200 + + Compile++ + + cmake/modules/FindGTK.cmake | 8 ++++---- + glib/demo/CMakeLists.txt | 6 +++--- + test/CMakeLists.txt | 6 +++--- + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit 794e89ed41d03997778fc4c59b7f1ba557b5e6b7 +Author: Albert Astals Cid +Date: Mon May 21 20:18:42 2012 +0200 + + Compile + + glib/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 78e6c9905a52c0cd4bfc1e56874f50689f04a1c6 +Author: Carlos Garcia Campos +Date: Sun May 20 12:11:27 2012 +0200 + + glib-demo: Make text characters list fill and expand in text demo + + glib/demo/text.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 610eb24426d9b36ac7da40a2fceb3dbeeec19a5c +Author: Carlos Garcia Campos +Date: Sun May 20 12:08:09 2012 +0200 + + glib-demo: Add a button to remove annots from the annot view + + glib/demo/annots.c | 48 +++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 41 insertions(+), 7 deletions(-) + +commit 11a3093e093319e88f14af0ab6c15009104d17ee +Author: Carlos Garcia Campos +Date: Sun May 20 11:22:49 2012 +0200 + + glib: Add poppler_page_remove_annot() + + https://bugs.freedesktop.org/show_bug.cgi?id=40473 + + glib/poppler-page.cc | 19 +++++++++++++++++++ + glib/poppler-page.h | 2 ++ + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 22 insertions(+) + +commit 0dd157ae7f19cd91ea425a607b968f08addc3a40 +Author: Carlos Garcia Campos +Date: Sun May 20 10:37:47 2012 +0200 + + glib: Take a reference of the core annotation when creating a + PopplerAnnot + + This way if the annotation is removed from the page, the core + annotation + object is not destroyed. Also, a new PopplerAnnot that is never + added to + a page doesn't leak the core annotation anymore. + + glib/poppler-annot.cc | 53 + +++++++++++++++++++++------------------------------ + 1 file changed, 22 insertions(+), 31 deletions(-) + +commit f818b842f54d6860920b39778228e8b247b4e761 +Author: Carlos Garcia Campos +Date: Sat May 19 12:32:33 2012 +0200 + + glib-demo: Fix runtime warning + + glib/demo/selections.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a24e326425e198eeb70c4d9205bb7a0a3a9db297 +Author: Carlos Garcia Campos +Date: Sat May 19 12:09:45 2012 +0200 + + gtk-tests: Port to GTK+ 3.0 + + configure.ac | 4 +- + glib/demo/annots.c | 74 +++++++------- + glib/demo/attachments.c | 4 +- + glib/demo/find.c | 4 +- + glib/demo/fonts.c | 4 +- + glib/demo/forms.c | 64 ++++++------ + glib/demo/images.c | 21 ++-- + glib/demo/info.cc | 67 ++++++------ + glib/demo/layers.c | 22 ++-- + glib/demo/links.c | 6 +- + glib/demo/main.c | 31 ++---- + glib/demo/outline.c | 2 +- + glib/demo/page.c | 23 ++--- + glib/demo/print.c | 14 +-- + glib/demo/render.c | 263 + ++++++++++++++---------------------------------- + glib/demo/selections.c | 77 ++++++-------- + glib/demo/text.c | 22 ++-- + glib/demo/transitions.c | 4 +- + glib/demo/utils.c | 101 +++++++++---------- + glib/demo/utils.h | 6 +- + test/gtk-test.cc | 48 +++++---- + 21 files changed, 350 insertions(+), 511 deletions(-) + +commit 9f7d919e68a26bb7dd809986d8394fe20b750bd0 +Author: Anthony Wesley +Date: Thu May 17 19:54:47 2012 +0200 + + Fix logic on SplashBitmap::writeImgFile + + splash/SplashBitmap.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 87093d1250807f660042295747a012032f84c034 +Author: Anthony Wesley +Date: Thu May 17 19:54:47 2012 +0200 + + Fix logic on SplashBitmap::writeImgFile + + splash/SplashBitmap.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7e7997e12faccf4c0513811b324a2fd0fa960a96 +Author: Igor Slepchin +Date: Tue May 15 23:16:27 2012 +0200 + + Determine if font is bold or italic based on FontDescriptor. + + Bug #49758 + + utils/HtmlFonts.cc | 24 ++++++++++++++++++------ + utils/HtmlFonts.h | 3 ++- + utils/HtmlOutputDev.cc | 4 +--- + 3 files changed, 21 insertions(+), 10 deletions(-) + +commit 3a249aa8ad5e9f7511bcafd0416ce51c7efe5f4d +Author: Igor Slepchin +Date: Tue May 15 23:16:27 2012 +0200 + + Determine if font is bold or italic based on FontDescriptor. + + Bug #49758 + + utils/HtmlFonts.cc | 24 ++++++++++++++++++------ + utils/HtmlFonts.h | 3 ++- + utils/HtmlOutputDev.cc | 4 +--- + 3 files changed, 21 insertions(+), 10 deletions(-) + +commit ff2c251dbaef9b964af48f51ebb517626ac3145c +Author: Carlos Garcia Campos +Date: Sun May 13 20:13:32 2012 +0200 + + glib-demo: Use poppler_document_new_from_gfile to load the given uri + + glib/demo/main.c | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit a7629331ab4ba5b256213af1f1b2954a49953c34 +Author: Carlos Garcia Campos +Date: Sun May 13 20:13:03 2012 +0200 + + glib: Add poppler_document_new_from_gfile + + glib/poppler-document.cc | 46 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-document.h | 4 ++++ + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 51 insertions(+) + +commit 95277b1f481e274ab0ce22ffb44b40437bffa3c8 +Author: Carlos Garcia Campos +Date: Sun May 13 20:11:12 2012 +0200 + + glib Add missing cancellable param in poppler_document_new_from_stream + doc + + glib/poppler-document.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 329bb1e2b4f4b58832847bcf805d19ac0fd5ef02 +Author: Carlos Garcia Campos +Date: Sun May 13 19:45:55 2012 +0200 + + glib: Make sure password is always converted to latin1 + + Remove the utf8 validation since glib API is supposed to always + receive + utf8 strings. + + glib/poppler-document.cc | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +commit c4bf7b162028a2f9ffcd2baba2759bdb14fae51f +Author: Carlos Garcia Campos +Date: Sun May 13 19:45:55 2012 +0200 + + glib: Make sure password is always converted to latin1 + + Remove the utf8 validation since glib API is supposed to always + receive + utf8 strings. + + glib/poppler-document.cc | 43 ++++++++++++++++++++----------------------- + 1 file changed, 20 insertions(+), 23 deletions(-) + +commit 7714b4e319c48ee915061a172208245ae7c4141b +Author: Carlos Garcia Campos +Date: Sun May 13 19:30:17 2012 +0200 + + glib: Fix memory leak when document fails to load + + glib/poppler-document.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 4d0786a97e061a752686968bd7976bdda01b1f84 +Author: Carlos Garcia Campos +Date: Sun May 13 19:30:17 2012 +0200 + + glib: Fix memory leak when document fails to load + + glib/poppler-document.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 1d1c8175c57ebe6518f4252ab92a20286b7d4c6f +Author: Carlos Garcia Campos +Date: Sun May 13 18:41:25 2012 +0200 + + glib: Add poppler_document_new_from_stream + + A PopplerInputStream has been added to handle GMemoryInputStream and + GLocalFileInputStream, since we don't want to cache the contents in + those cases. A PopplerCachedFileLoader has been added to handle all + other cases. + + configure.ac | 10 +-- + glib/Makefile.am | 4 + + glib/poppler-cached-file-loader.cc | 108 +++++++++++++++++++++++++++ + glib/poppler-cached-file-loader.h | 44 +++++++++++ + glib/poppler-document.cc | 69 ++++++++++++++++++ + glib/poppler-document.h | 6 ++ + glib/poppler-input-stream.cc | 141 + ++++++++++++++++++++++++++++++++++++ + glib/poppler-input-stream.h | 74 +++++++++++++++++++ + glib/reference/poppler-docs.sgml | 4 + + glib/reference/poppler-sections.txt | 1 + + poppler-glib-uninstalled.pc.in | 2 +- + poppler-glib.pc.in | 2 +- + 12 files changed, 458 insertions(+), 7 deletions(-) + +commit 13d2aa303eb1fd900f1045efec14af8002477b02 +Author: Thomas Freitag +Date: Sun May 13 17:25:15 2012 +0200 + + remove unnecesary transparency group handling in splash + + Bug #13487 + + poppler/Gfx.cc | 64 + +++++++++++++++++++++++++++++++++++++++++++++- + poppler/Gfx.h | 4 ++- + poppler/GfxState.cc | 4 ++- + poppler/OutputDev.h | 1 + + poppler/SplashOutputDev.cc | 11 ++++++++ + poppler/SplashOutputDev.h | 1 + + 6 files changed, 82 insertions(+), 3 deletions(-) + +commit b477443e8a4c52500529aaf3be76f01a61e85f28 +Author: Thomas Freitag +Date: Sun May 13 17:25:15 2012 +0200 + + remove unnecesary transparency group handling in splash + + Bug #13487 + + poppler/Gfx.cc | 64 + +++++++++++++++++++++++++++++++++++++++++++++- + poppler/Gfx.h | 4 ++- + poppler/GfxState.cc | 4 ++- + poppler/OutputDev.h | 1 + + poppler/SplashOutputDev.cc | 11 ++++++++ + poppler/SplashOutputDev.h | 1 + + 6 files changed, 82 insertions(+), 3 deletions(-) + +commit a76867003a7bff5ab03016156c75b4c928788d50 +Author: Albert Astals Cid +Date: Sun May 13 13:10:40 2012 +0200 + + Distribute cmake/modules/FindLCMS2.cmake + + Bug #49818 + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 8f040dec2ce2eae24dd1eb15900d4d284e4b3848 +Author: Albert Astals Cid +Date: Sun May 13 13:10:40 2012 +0200 + + Distribute cmake/modules/FindLCMS2.cmake + + Bug #49818 + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 7f47630a7fc19214cd48dbd164ecf577ba35cc46 +Author: Albert Astals Cid +Date: Thu May 10 23:12:04 2012 +0200 + + Compile with the unsupported ENABLE_PLUGINS defined + + poppler/GlobalParams.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 22264cb230fc5902aea14ab43fa013a8ebdbf812 +Author: Albert Astals Cid +Date: Thu May 10 23:04:33 2012 +0200 + + Make it compile + + Sorry :-/ + + goo/gfile.cc | 82 + -------------------------------------------------- + goo/gfile.h | 4 --- + poppler/GlobalParams.h | 2 +- + 3 files changed, 1 insertion(+), 87 deletions(-) + +commit 44bf99a7b8683a077f2a5db50541099c109aa069 +Author: Albert Astals Cid +Date: Thu May 10 22:59:18 2012 +0200 + + Kill the concept of "base dir" + + We are a library so having a "common configuration folder" does + not really + make much sense at a library level, and even less if it's called + .xpdf :D + + Fixes bug 49448 + + goo/gfile.cc | 46 + ---------------------------------------------- + goo/gfile.h | 3 --- + poppler/GfxState.cc | 16 ++-------------- + poppler/GlobalParams.cc | 21 --------------------- + poppler/GlobalParams.h | 3 --- + test/perf-test.cc | 1 - + 6 files changed, 2 insertions(+), 88 deletions(-) + +commit bb091e38a1c0248ba24b0711b4afc0b0524cce10 +Author: Albert Astals Cid +Date: Thu May 10 22:38:41 2012 +0200 + + Make it be something closer to real english + + utils/pdftohtml.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 67f3c3e0d03ec63df7c6028cbd626e384d231c2b +Author: Fabio D'Urso +Date: Wed May 9 16:48:15 2012 +0200 + + GooString formatting: add support for uppercase hexadecimal + Use + it in Annot::layoutText + + goo/GooString.cc | 61 + ++++++++++++++++++++++++++++++++++++++++++++++---------- + goo/GooString.h | 17 ++++++++-------- + poppler/Annot.cc | 2 +- + 3 files changed, 61 insertions(+), 19 deletions(-) + +commit 1f7f8a78409e6bcc90bd32ea2aaa75ed3a7b6218 +Author: Fabio D'Urso +Date: Wed May 9 16:18:05 2012 +0200 + + Use error() instead of fprintf(stderr, ...) in Annot::layoutText + + poppler/Annot.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit a7a2e72f9ba43816a81278e0565d31807ac5ceb5 +Author: Albert Astals Cid +Date: Thu May 10 22:31:24 2012 +0200 + + More gs cleanup and forgot the (C) on modification + + goo/gfile.cc | 2 +- + goo/gfile.h | 2 +- + utils/pdftohtml.cc | 4 ---- + 3 files changed, 2 insertions(+), 6 deletions(-) + +commit ad36d22d1f11339be90403534b921cce120fdbad +Author: Albert Astals Cid +Date: Thu May 10 22:24:40 2012 +0200 + + pdftohtml: Remove the option to invoke gs + + goo/gfile.cc | 8 --- + goo/gfile.h | 3 -- + utils/pdftohtml.1 | 8 +-- + utils/pdftohtml.cc | 149 + ++++++++++++----------------------------------------- + 4 files changed, 36 insertions(+), 132 deletions(-) + +commit 4114c928fa2560937e02319f57937f1c267a9817 +Author: Albert Astals Cid +Date: Thu May 10 21:09:14 2012 +0200 + + 0.20.0 + + CMakeLists.txt | 6 +++--- + NEWS | 16 ++++++++++++++++ + configure.ac | 4 ++-- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 24 insertions(+), 8 deletions(-) + +commit df05d084cb26807c39695280cd8ea52d13aa1255 +Author: Albert Astals Cid +Date: Thu May 10 20:54:13 2012 +0200 + + Bring back the begin/endMarkedContent virtuals + + For those evil people that keep using poppler internals + + poppler/Gfx.cc | 8 ++++++++ + poppler/OutputDev.cc | 8 +++++++- + poppler/OutputDev.h | 4 +++- + 3 files changed, 18 insertions(+), 2 deletions(-) + +commit b6159fea4a13ecfd1c38b3a666a797c5147dd952 +Author: William Bader +Date: Thu May 10 20:02:19 2012 +0200 + + splash uses cmykTransferC for M, Y and K in two places + + splash/Splash.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit c2146219d555cab277906daefd2589f9056f536c +Author: Peter Breitenlohner +Date: Thu May 10 13:26:18 2012 +0200 + + Add missing function parameter + + poppler/GlobalParams.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 753f6ab9347f972223ec21b7ed4b4f7ebed3d420 +Author: Albert Astals Cid +Date: Thu May 3 15:29:57 2012 -0700 + + Compile with ENABLE_PLUGINS defined + + poppler/SecurityHandler.cc | 4 ++-- + poppler/SecurityHandler.h | 16 ++++++++++++++++ + poppler/XpdfPluginAPI.cc | 35 +---------------------------------- + poppler/XpdfPluginAPI.h | 34 +++++++++++++++------------------- + 4 files changed, 34 insertions(+), 55 deletions(-) + +commit 23df93aaf495428b580bafd0fd1f41515828b08d +Author: Albert Astals Cid +Date: Thu May 3 14:50:09 2012 -0700 + + We don't support the keyBinding concept + + remove wrong merge + + poppler/GlobalParams.cc | 1 - + 1 file changed, 1 deletion(-) + +commit e55838b41959acc311e9b00dc390c9816a9afac2 +Author: Jason +Date: Wed May 2 19:35:26 2012 +0200 + + glib: Use delete[] to free array allocated with new[] + + https://bugs.freedesktop.org/show_bug.cgi?id=48447 + + glib/poppler-document.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dec873463b06bfe76ff48e36282877e6ac11b59d +Author: Albert Astals Cid +Date: Sun Apr 29 23:36:57 2012 +0200 + + Add the objUint type + + poppler/Object.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 50c0b294d08114920a5db711876e20d991f474a6 +Author: Albert Astals Cid +Date: Sun Apr 29 22:33:09 2012 +0200 + + Make sure the index to dcHuffTables and acHuffTables is in bounds + + Found in a fuzzed pdf sent by Mateusz "j00ru" Jurczyk and Gynvael + Coldwind + + poppler/Stream.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 9e36206465289c96cb189c648a6f5121714c647b +Author: Albert Astals Cid +Date: Sun Apr 29 22:18:12 2012 +0200 + + include for memcpy + + splash/SplashBitmap.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 931051fe0bb445545355027d999515bc3d4b32ef +Author: Albert Astals Cid +Date: Sun Apr 29 22:07:34 2012 +0200 + + Make sure the index for refLine is in bounds + + Found in a fuzzed pdf sent by Mateusz "j00ru" Jurczyk and Gynvael + Coldwind + + poppler/Stream.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 53b9c2e2806320d0d0e35134b75da5da72514742 +Author: Albert Astals Cid +Date: Sun Apr 29 22:00:18 2012 +0200 + + Just call getNum if isNum is true + + Found in a fuzzed pdf sent by Mateusz "j00ru" Jurczyk and Gynvael + Coldwind + + poppler/Link.cc | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +commit da8d858c4fc610718a5f14b14dc3a4a11564a73d +Author: Albert Astals Cid +Date: Sun Apr 29 20:28:37 2012 +0200 + + Do not access args[-1] + + Found in a fuzzed pdf sent by Mateusz "j00ru" Jurczyk and Gynvael + Coldwind + + poppler/Gfx.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 934b1a7cd502fe5537a350cdfc650989992693f7 +Author: Albert Astals Cid +Date: Sun Apr 29 19:59:15 2012 +0200 + + Do not access invalid lookup indexes + + Found by Mateusz "j00ru" Jurczyk and Gynvael Coldwind + + poppler/GfxState.cc | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +commit e80fd082914fe29fad7e60c321a747eb8634e413 +Author: Albert Astals Cid +Date: Sun Apr 29 18:27:41 2012 +0200 + + [qt4] the qualified name may be unicode encoded + + qt4/src/poppler-form.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 251be1787a2a003862691f5a825eb3468eceb6a2 +Author: Albert Astals Cid +Date: Sun Apr 29 18:26:42 2012 +0200 + + Fix getFullyQualifiedName with unicode field names + + Based on a patch from Mark Riedesel. + Bug #49256 + + poppler/Form.cc | 71 + +++++++++++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 61 insertions(+), 10 deletions(-) + +commit be41f1c7905d695d17e19ced83a1018531d00199 +Author: Albert Astals Cid +Date: Sun Apr 29 16:02:45 2012 +0200 + + SplashOutputDev: Fix rendering of knockout groups + + Bug #12185 + + poppler/SplashOutputDev.cc | 31 ++++++++++++++++++++++++++++--- + splash/Splash.cc | 21 ++++++++++++++++++--- + splash/Splash.h | 6 ++++-- + splash/SplashBitmap.cc | 22 +++++++++++++++++++++- + splash/SplashBitmap.h | 2 ++ + 5 files changed, 73 insertions(+), 9 deletions(-) + +commit 800cb9ec7189a539d64b99fa181cd4126496c1ec +Author: Thomas Freitag +Date: Sat Apr 28 17:15:30 2012 +0200 + + Reconstruct xref table if xref needed but missing + + Bug #40719 + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 410822d7013ce1f61325afdb61d75ea64666755e +Author: Albert Astals Cid +Date: Fri Apr 27 01:10:22 2012 +0200 + + 0.19.4 + + CMakeLists.txt | 4 ++-- + NEWS | 17 +++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 23 insertions(+), 6 deletions(-) + +commit b1d5c6c0a20a4a24b42de66db23e0f63d10ca52d +Author: Fabio D'Urso +Date: Tue Apr 24 21:00:11 2012 +0200 + + Output XRef stream when incrementally updating if there's already + a XRef stream + + poppler/PDFDoc.cc | 45 ++++++++++++++++++++++++++++++-- + poppler/XRef.cc | 76 + +++++++++++++++++++++++++++++++++++++++++++++++-------- + poppler/XRef.h | 34 +++++++++++++++++++++++++ + 3 files changed, 142 insertions(+), 13 deletions(-) + +commit 2ecf3b2e49a4c35e995d25016b810592260edfeb +Author: Fabio D'Urso +Date: Tue Apr 24 18:10:15 2012 +0200 + + Refactoring of XRef table write support (in preparation for XRef + stream write support) + + - Trailer dictionary creation now lives in its own function + "createTrailerDict" + (that will be used by XRef stream creation too) + - writeXRefTableTrailer (WAS writeTrailer) now takes care of writing + the XRef + table too (previously it was demanded to the caller) + + poppler/PDFDoc.cc | 61 + +++++++++++++++++++++++++++---------------------------- + poppler/PDFDoc.h | 14 ++++++++++--- + poppler/XRef.cc | 2 +- + poppler/XRef.h | 2 +- + utils/pdfunite.cc | 10 +++++---- + 5 files changed, 49 insertions(+), 40 deletions(-) + +commit cf7a20adbd15f901d414ce06825459c33eeef3f5 +Author: Thomas Freitag +Date: Wed Apr 25 18:51:23 2012 +0200 + + Fix slow rendering of pdf with a lot of image masks in pattern + colorspace + + Makes it around 8 times faster + + poppler/CairoOutputDev.cc | 6 +++--- + poppler/CairoOutputDev.h | 6 +++--- + poppler/Gfx.cc | 4 ++-- + poppler/OutputDev.cc | 5 +++-- + poppler/OutputDev.h | 6 +++--- + poppler/PSOutputDev.cc | 4 ++-- + poppler/PSOutputDev.h | 4 ++-- + poppler/SplashOutputDev.cc | 35 +++++++++++------------------------ + poppler/SplashOutputDev.h | 4 ++-- + 9 files changed, 31 insertions(+), 43 deletions(-) + +commit 26fd142a3608283fd41e07b54067a51a9db76e93 +Author: Fabio D'Urso +Date: Sat Apr 21 18:16:46 2012 +0200 + + Preserve z-index after annotation removal + + poppler/Annot.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 7b10014c1fe9ef1cba57fd6b01c63129ac31386a +Author: Fabio D'Urso +Date: Sat Apr 21 17:53:22 2012 +0200 + + Do not remove appearance stream if it's shared with other annotations + + poppler/Annot.cc | 78 + +++++++++++++++++++++++++++++++++++++++++++++++++++++--- + poppler/Annot.h | 6 +++++ + 2 files changed, 80 insertions(+), 4 deletions(-) + +commit 7684c325929493ad9de01a891de0aef197e176dd +Author: Fabio D'Urso +Date: Sat Apr 21 20:26:49 2012 +0200 + + AnnotText: Always force 24x24 size with custom stamps, not only on + first rendering + + poppler/Annot.cc | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +commit 44cd46a6e04a87bd702dab4a662042f69f16c4ad +Author: Albert Astals Cid +Date: Mon Apr 23 20:02:55 2012 +0200 + + Do not try to access nPatches - 1 if nPatches is 0 + + Found by Mateusz "j00ru" Jurczyk and Gynvael Coldwind + + poppler/GfxState.cc | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +commit a92f87b83e3c6c9078508c644aa09f4f2b14e9cc +Author: Albert Astals Cid +Date: Mon Apr 23 00:06:18 2012 +0200 + + Do not complain if the entry is missing + + Since we are actually looking for non existing entries :D + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 114e113e3278d02baaffd6c0da7fda266283c176 +Author: Fabio D'Urso +Date: Sat Apr 21 21:08:55 2012 +0200 + + Do not allocate XRef entries whose generation number is 65535 + + poppler/XRef.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit ad8785b053aa115b593b2f20073e2989d59a77c9 +Author: Albert Astals Cid +Date: Wed Apr 18 22:51:33 2012 +0200 + + Remove duplicate call + + utils/pdftohtml.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 80d4e1843c56801508f476fed64ecb3201ba18c8 +Author: Fabio D'Urso +Date: Tue Apr 17 20:25:57 2012 +0200 + + Do not draw border in AnnotText::draw + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a1e3d868ccd7fb84d52d94754d8681c97119fb6e +Author: Fabio D'Urso +Date: Fri Mar 30 21:52:04 2012 +0200 + + Save/restore gfx state when drawing annot border + + poppler/Gfx.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 7fbeaac5c0d0240564add6c252c1ba7c14639d98 +Author: Albert Astals Cid +Date: Tue Apr 17 20:36:51 2012 +0200 + + Be sure we are checking a non free entry + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d1254c7e8e995302542093968a0c2967f3c0b5ff +Author: Thomas Freitag +Date: Tue Apr 17 20:36:03 2012 +0200 + + Do not complain if the entry does not exist + + XRef::getNumEntry is only trying to find which entry a given stream + pos belongs so no need to cry if the entry is not there + Bug 48679 + + poppler/XRef.cc | 10 ++++++---- + poppler/XRef.h | 2 +- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit bcbe9497a4fa50b41852abd538ad139c7b6693e5 +Author: suzuki toshiya +Date: Tue Apr 17 20:21:58 2012 +0200 + + Copying graphics library CFLAGS to cpp frontend Makefile.am. + + Because poppler-image.cpp includes PNGWriter.h, JpegWriter.h, + TiffWriter.h, + CFLAGS to include libpng, libjpeg and libtiff headers are expected. + + cpp/Makefile.am | 22 +++++++++++++++++++++- + 1 file changed, 21 insertions(+), 1 deletion(-) + +commit 44c9df8277877ee1021317a3b6c253f80310f826 +Author: suzuki toshiya +Date: Tue Apr 17 20:21:00 2012 +0200 + + Do not clear FREETYPE_CFLAGS, FREETYPE_LIBS before PKG_CHECK_MODULES() + + Although configure --help says as if environmental variables + FREETYPE_CFLAGS and FREETYPE_LIBS will overwrite the values obtained + by pkg-config. But it is not. These help messages are automatically + given + by pkg-config macro (so I guess no poppler developer designed so + intentionally). + + In current configure, FREETYPE_CFLAGS, FREETYPE_LIBS are cleared + before + PKG_CONFIG_MODULES(), like: + + dnl Check for freetype headers + FREETYPE_LIBS= + FREETYPE_CFLAGS= + + PKG_CHECK_MODULES(FREETYPE, freetype2, + [freetype_pkgconfig=yes], + [freetype_pkgconfig=no]) + + if test "x$freetype_pkgconfig" = "xyes"; then + + AC_DEFINE(HAVE_FREETYPE_H, 1, [Have FreeType2 include + files]) + + else + + AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) + [...] + + Checking the history why these values are cleared, it seems that + the initial revision of poppler did not use pkg-config to detect + FREETYPE_CFLAGS, _LIBS. At that time, only freetype-config is used. + In later, when PKG_CHECK_MODULES is introduced, it was accidentally + introduced AFTER the clearning of FREETYPE_CFLAGS,_LIBS. As a result, + the inconsistency between "configure --help" and what configure does + really. I propose to move the clearance of FREETYPE_CFLAGS,_LIBS + just before AC_PATH_PROG, to make PKG_CHECK_MODULES catch the + environmental + values. + + configure.ac | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 9e0f0368e543df46b40cbd7bed6fdc1abf846e7d +Author: suzuki toshiya +Date: Tue Apr 17 20:19:41 2012 +0200 + + Do not append "-ansi" to CXXFLAG, if "-std=XXX" is already specified. + + SplashOutputDev.cc uses isfinite() function (defined by math.h). + isfinite() was standardized in C99, and imported to C++0x in later. + + In QNX header file system, isfinite() is disabled by default, + the definition of __STDC_VERSION__ > 199901 is required to enable it. + In the case of GCC, "-std=c99" (for C) or "-std=gnu++0x" (for C++) + is expected. + + But, current configure of poppler appends "-ansi" flag for CXXFLAGS, + if the compiler is known to be GNU. "-ansi" is C89 or C++98, + so isfinite() + is unavailable. I propose a patch NOT to "-ansi" flag, if CXXFLAGS + includes "-std=XXX" already. + + configure.ac | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 2f1e7ef252b8d1f7ee6004825c2926f0f5e181a5 +Author: Albert Astals Cid +Date: Thu Apr 12 23:11:41 2012 +0200 + + Do not crash in broken documents + + They might trigger an xref reconstruct and then i could not be in + bounds anymore + Crash found by Joel Voss of Leviathan Security Group + + poppler/XRef.cc | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 19fb9caecb1b265a8b8651e9bcf4b779f593fefd +Author: Albert Astals Cid +Date: Thu Apr 12 22:24:50 2012 +0200 + + Fix crash when the destination file does not exist + + Issue found by Joel Voss of Leviathan Security Group + + utils/HtmlOutputDev.cc | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +commit fa4848eae370437ab1b9863124e9a340830f66c7 +Author: Adrian Johnson +Date: Fri Apr 13 22:11:01 2012 +0930 + + man pages: add missing section heading + + utils/pdftotext.1 | 1 + + 1 file changed, 1 insertion(+) + +commit 08a14aa37b177bb4586869857ae678cb4bcd4039 +Author: Albert Astals Cid +Date: Thu Apr 12 21:52:30 2012 +0200 + + 0.19.3 + + CMakeLists.txt | 4 ++-- + NEWS | 26 +++++++++++++++++++++++++- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + 8 files changed, 33 insertions(+), 9 deletions(-) + +commit 52227b59d1fa2a2029bfff2f8a167efd81faebbb +Author: Albert Astals Cid +Date: Thu Apr 12 20:52:55 2012 +0200 + + Update (C) + + poppler/CairoFontEngine.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 40cb3f27f4dcad4fe8c48f0b638eac7913fc3722 +Author: Albert Astals Cid +Date: Thu Apr 12 20:50:38 2012 +0200 + + Do not pass those params to createGfx since they aren't used + + glib/poppler-page.cc | 4 ++-- + poppler/Page.cc | 9 +++------ + poppler/Page.h | 5 ++--- + 3 files changed, 7 insertions(+), 11 deletions(-) + +commit 9a10d31fca7f060f24bae9efe15662f02a9684ca +Author: Fabio D'Urso +Date: Thu Apr 12 20:31:23 2012 +0200 + + qt4: Remove unimplemented revision setters from public API + + qt4/src/poppler-annotation-private.h | 2 ++ + qt4/src/poppler-annotation.cc | 62 + ++++++++---------------------------- + qt4/src/poppler-annotation.h | 13 -------- + 3 files changed, 16 insertions(+), 61 deletions(-) + +commit 0531329aeb8783c48f056929e6e81cebda33500f +Author: Albert Astals Cid +Date: Thu Apr 12 20:07:13 2012 +0200 + + [qt4] Mark the dummy stuff as deprecated + + qt4/src/poppler-annotation.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 67b7b2bdd0943680437d96349c3415aa40082cbb +Author: Albert Astals Cid +Date: Thu Apr 12 20:06:52 2012 +0200 + + [qt4] initialize the dummy members here too + + qt4/src/poppler-annotation.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit bf171382afb6b50284c3855e3a1815a15ec34366 +Author: Albert Astals Cid +Date: Thu Apr 12 19:24:42 2012 +0200 + + Add since markers + + qt4/src/poppler-annotation.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit e36fd775394ee752c0f62f789359c72b52094975 +Author: Albert Astals Cid +Date: Thu Apr 12 18:58:29 2012 +0200 + + Remove unneeded forward declaration + + qt4/src/poppler-qt4.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit c1aa4a8c0aa9d46757e3849776acac42731e02d1 +Author: Fabio D'Urso +Date: Thu Apr 12 00:39:33 2012 +0200 + + qt4: Annotation appearance invalidation + + Call Annot::invalidateAppearance every time the visual aspect + is changed + + qt4/src/poppler-annotation.cc | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +commit 4338ae354c66e4df8d7d70a156517e27b3b80539 +Author: Fabio D'Urso +Date: Sun Mar 25 22:58:33 2012 +0200 + + qt4: Added HideAnnotations option to PSConverter + + qt4/src/poppler-ps-converter.cc | 23 ++++++++++++++++++++++- + qt4/src/poppler-qt4.h | 3 ++- + 2 files changed, 24 insertions(+), 2 deletions(-) + +commit e50993b3b47a759c93ccdeeaef289d6985b05bb1 +Author: Fabio D'Urso +Date: Thu Mar 22 19:58:12 2012 +0100 + + qt4: DOM annotation store - Black color is different than invalid + color + + qt4/src/poppler-annotation.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4739a6a02097f110c37defdfa616351459902806 +Author: Fabio D'Urso +Date: Mon Mar 19 19:17:33 2012 +0100 + + qt4: Annotation removal + + qt4/src/poppler-annotation-private.h | 3 +++ + qt4/src/poppler-annotation.cc | 29 +++++++++++++++++++++++++++++ + qt4/src/poppler-page.cc | 5 +++++ + qt4/src/poppler-qt4.h | 8 ++++++++ + 4 files changed, 45 insertions(+) + +commit 25a64d69aaab61c8cf944107e649e19920244a2b +Author: Fabio D'Urso +Date: Tue Mar 20 01:46:07 2012 +0100 + + qt4: TextAnnotation write support + basic textFont getter + + Also makes inplaceText a synoym for contents + + qt4/src/poppler-annotation.cc | 159 + ++++++++++++++++++++++++++++++++---------- + 1 file changed, 124 insertions(+), 35 deletions(-) + +commit a31a8118ba07aa7f90c69130476fb7d86f8614ad +Author: Fabio D'Urso +Date: Sun Mar 11 23:57:51 2012 +0100 + + qt4: GeomAnnotation, InkAnnotation and CaretAnnotation write support + + qt4/src/poppler-annotation.cc | 103 + ++++++++++++++++++++++++++++++++++++++---- + qt4/src/poppler-annotation.h | 6 +-- + 2 files changed, 96 insertions(+), 13 deletions(-) + +commit e4052b52002447772e24571fd13f0f22fd2bfb16 +Author: Fabio D'Urso +Date: Sat Mar 10 17:48:56 2012 +0100 + + qt4: HighlightAnnotation and StampAnnotation write support + + qt4/src/poppler-annotation.cc | 96 + +++++++++++++++++++++++++++++++++++++++---- + qt4/src/poppler-annotation.h | 4 +- + 2 files changed, 91 insertions(+), 9 deletions(-) + +commit b5e948b6130cdb04387a8244179337c7904dcd03 +Author: Fabio D'Urso +Date: Wed Mar 14 17:44:50 2012 +0100 + + qt4: Annotation insertion and LineAnnotation support + + This patch adds Page::addAnnotation to insert new annotations in + a page. + The only annotation type that can be added is LineAnnotation. Support + for other + types will be added in the next patches. + + qt4/src/poppler-annotation-private.h | 12 ++ + qt4/src/poppler-annotation.cc | 297 + +++++++++++++++++++++++++++++++++-- + qt4/src/poppler-annotation.h | 4 +- + qt4/src/poppler-page.cc | 5 + + qt4/src/poppler-qt4.h | 9 ++ + 5 files changed, 316 insertions(+), 11 deletions(-) + +commit 20b4feec612448be8a800173ddadbf257657477e +Author: Fabio D'Urso +Date: Fri Mar 9 19:31:16 2012 +0100 + + qt4: Basic setters to edit annotations + + qt4/src/poppler-annotation-helper.h | 15 ++++ + qt4/src/poppler-annotation-private.h | 1 + + qt4/src/poppler-annotation.cc | 128 + ++++++++++++++++++++++++++++++++--- + 3 files changed, 135 insertions(+), 9 deletions(-) + +commit 0e8c35b59f0fba926b30c9a87823c92ae03bf116 +Author: Fabio D'Urso +Date: Fri Mar 9 01:04:28 2012 +0100 + + qt4: Changes to Annotation API (part 2/2) + + 1) Moved annotation data retrieval logic to getters for types of + annotations + that will be made editable in next patches. + Others (Link, FileAttachment, Sound, Movie and Screen) are still + entirely filled + at creation time. + + 2) TextAnnotation's callout points setter now takes an array, not just + individual points. + + 3) AnnotationPrivate::pdfObjectReference replaced with a getter + method that + directly queries the tied Annot object (if any) + + qt4/src/poppler-annotation-helper.h | 31 +- + qt4/src/poppler-annotation-private.h | 23 +- + qt4/src/poppler-annotation.cc | 1254 + +++++++++++++++++++++++++++++++--- + qt4/src/poppler-annotation.h | 58 +- + qt4/src/poppler-link.cc | 2 +- + qt4/src/poppler-page.cc | 778 +-------------------- + qt4/src/poppler-qt4.h | 4 +- + 7 files changed, 1217 insertions(+), 933 deletions(-) + +commit 73b91207649a81740183e2288809d3b84b52f595 +Author: Fabio D'Urso +Date: Wed Mar 7 17:05:50 2012 +0100 + + qt4: Changes to Annotation API (part 1/2) + + This is part 1/2 of a change in annotation API. It breaks both source + and binary + compatibility. + + Note that, even though DOM methods are partially modified by this + patch, their + output is 100% backward compatible. Therefore code relying only on + DOM methods + (i.e. AnnotationUtils methods) will keep working. + + 1) Style and Popup container classes + + Style and Popup (previously known as Window) properties are now + wrapped in + container classes. In both of them, private data is implicitly shared. + The old Window structure is removed, but an undocumented window + field is still + exported to make Okular 4.8.0 compile. It must not be used. + + 2) Revisions + + The Annotation::Revision structure was removed, because it added an + extra layer + of indirection that can be avoided. Now revision scope and type + are stored + directly in the target Annotation, and Annotation::revisions() + returns a list + of pointers to child annotations. + + 3) All constructors are temporarily made private + + This patch hides all constructors from user code. Subsequent + patches will + restore them in the same patch as their type-specific creation + support. + + 4) Minor fixes + - Popup size was incorrectly stored as an integer value, now + it's part of + a QRectF. + - Typo: LinkAnnotation::linkDestionation() --> linkDestination + - Dash array is now exported as QVector instead of + a marks/spaces + integer pair + - GeomAnnotation's geometricalPointWidth removed, because it + was never + referenced and it doesn't exist in PDF specs + + 5) AnnotationPrivate data is now explicitly shared + Annotation private data has been rearranged so that it's now + possible to + uniformly give ownership of all Annotation objects to the caller. + Previously Page::annotations() did leave ownership to user, but + Annotation::revisions() didn't. Now both of them give ownership + to user. + + qt4/src/poppler-annotation-private.h | 19 +- + qt4/src/poppler-annotation.cc | 1022 + ++++++++++++++++++++++++---------- + qt4/src/poppler-annotation.h | 292 +++++++--- + qt4/src/poppler-page.cc | 92 ++- + qt4/src/poppler-qt4.h | 6 + + 5 files changed, 997 insertions(+), 434 deletions(-) + +commit 7f0f080277d35f6f2e426ca2a3ff76c2856daeaf +Author: Adrian Johnson +Date: Tue Apr 10 00:08:49 2012 +0930 + + cairo: fix stroke pattern with transparency group + + Cairo copy path/append path with device offsets is broken. Use GfxPath + instead. + + Bug 48468 + + poppler/CairoOutputDev.cc | 15 ++++++--------- + poppler/CairoOutputDev.h | 4 ++-- + 2 files changed, 8 insertions(+), 11 deletions(-) + +commit 5ea305c3924cead302092378ab67300c3099afd9 +Author: Adrian Johnson +Date: Sun Apr 8 23:11:30 2012 +0930 + + cairo: only align stroke coords for horizontal and vertical lines + + Bug 48318 + + poppler/CairoOutputDev.cc | 80 + ++++++++++++++++++++++++++++++++++++----------- + poppler/CairoOutputDev.h | 2 +- + 2 files changed, 62 insertions(+), 20 deletions(-) + +commit 8414d8f621b8abb018e80f2255cfb511a1e558d4 +Author: Adrian Johnson +Date: Mon Apr 9 12:08:20 2012 +0930 + + cairo: ensure 0 width lines with stroke_adjust are aligned + + Previously the code path for 0 width lines ignored the stroke_adjust + setting. Rearrange the code so the code path for stroke_adjust == TRUE + is performed first (this will also set 0 width lines to 1 pixel wide). + + poppler/CairoOutputDev.cc | 42 +++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +commit af1a84eb90656de68bb14f2c4ae4f813c51bc3a3 +Author: Adrian Johnson +Date: Mon Apr 9 17:17:29 2012 +0930 + + cairo: fix paintTransparencyGroup when both mask and fill opacity + are required + + Bug 48453 + + poppler/CairoOutputDev.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 46b3a70cae3b37cb4270a83afaddd6734442b752 +Author: Fabio D'Urso +Date: Mon Apr 9 19:32:24 2012 +0200 + + Caption text rendering in AnnotLine + + poppler/Annot.cc | 262 + ++++++++++++++++++++++++++++++++++++++----------------- + poppler/Annot.h | 2 + + 2 files changed, 183 insertions(+), 81 deletions(-) + +commit 855607828447ecec2c8444650d015e21bd17d2e2 +Author: Fabio D'Urso +Date: Mon Apr 9 16:45:50 2012 +0200 + + AnnotFreeText rendering improvements (auto word-wrap, quadding, + border style, font/border color) + + poppler/Annot.cc | 146 + +++++++++++++++++++++++++++++++++++++++++++------------ + poppler/Annot.h | 1 + + 2 files changed, 115 insertions(+), 32 deletions(-) + +commit 80f662162698c1ec27771d9cf5e2e6bc3d21c4df +Author: Ihar Filipau +Date: Thu Apr 12 00:19:26 2012 +0200 + + Fix the mask inversion + + utils/HtmlOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 06591d848e53598973f7d5fddac50785a46e8027 +Author: Thomas Freitag +Date: Wed Apr 11 23:49:29 2012 +0200 + + Fix Splash CMYK merge error + + Mail says + ****** + Hi, + + playing around with the attached PDF to get a better CMYK support for + the blend mode soft light, I encountered that I made a big mistake + during merge in the CMYK part of splash. I fixed that. The attached + patch also includes the small enhancement I made in soft light + routine. + ****** + + poppler/SplashOutputDev.cc | 9 +++++++++ + splash/Splash.cc | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit 1f45afde6410f03c79fcf4b66d5834079879d38f +Author: Ihar Filipau +Date: Mon Apr 9 19:17:41 2012 +0200 + + Add producer and version to xml output + + utils/HtmlOutputDev.cc | 2 +- + utils/pdf2xml.dtd | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit cef6ac0ebbf8451beaadb3ddb6c991bbb7239432 +Author: Fabio D'Urso +Date: Sun Apr 8 23:15:15 2012 +0200 + + FIX: Do not append a NUL character to Unicode page labels + + poppler/PageLabelInfo.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 3d4985f14e54ddcc64ea654b23e931b7e6acfbdc +Author: Fabio D'Urso +Date: Sat Apr 7 11:28:36 2012 +0200 + + Do not trust the rect of AnnotTextMarkup when drawing + + poppler/Annot.cc | 43 +++++++++++++++++++++++++++++-------------- + 1 file changed, 29 insertions(+), 14 deletions(-) + +commit c6296cd8c1ca398beac20f1e88c87b9082386247 +Author: Fabio D'Urso +Date: Sat Apr 7 00:30:54 2012 +0200 + + Do not trust the rect of AnnotLine, AnnotPolygon and AnnotInk + when drawing + + poppler/Annot.cc | 126 + ++++++++++++++++++++++++++++++++++++++++++++----------- + poppler/Annot.h | 27 ++++++++++++ + 2 files changed, 128 insertions(+), 25 deletions(-) + +commit 503620ae74d719da52e3374725e490c62f7be7a3 +Author: Fabio D'Urso +Date: Thu Mar 29 19:07:05 2012 +0200 + + Do not recreate Annots when writing to PS, Export poppler-generated + Annot appearance resource dict + + 1) With previous code each Annot object was reconstructed from the + pdf object when + writing to PS, leading to the fact that writeDocSetup couldn't see the + generated appearance. + This patch makes writeDocSetup use the same Annots object returned by + Page::getAnnots. + + 2) This patch also enables each Annot subtype to control the exported + resources. AnnotFreeText uses this new method to export font + information. + + 3) Comment fixed in Page.h: Page::getAnnots does *not* give away + ownership, in + fact the returned object is destroyed by ~Page. + + poppler/Annot.cc | 28 ++++++++++++++++++++++++++++ + poppler/Annot.h | 5 +++-- + poppler/FontInfo.cc | 11 ++++------- + poppler/PSOutputDev.cc | 12 +++--------- + poppler/Page.h | 2 +- + 5 files changed, 39 insertions(+), 19 deletions(-) + +commit 2733504890333b0925d95e01310726d11fed44d8 +Author: Fabio D'Urso +Date: Fri Mar 23 20:54:58 2012 +0100 + + Basic AnnotFreeText rendering (hardcoded font, WinAnsi characters + only) + + This patch also moves layoutText and writeString from AnnotWidget + to Annot + + poppler/Annot.cc | 137 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++- + poppler/Annot.h | 11 +++-- + 2 files changed, 142 insertions(+), 6 deletions(-) + +commit 3023a59c0a1a5974b232f6f8cb629eabb6797616 +Author: Fabio D'Urso +Date: Sun Mar 25 22:04:11 2012 +0200 + + AnnotTextMarkup rendering improvements + + 1) FIX: Wrong coords in typeUnderline and typeStrikeout + 2) Implementation of typeSquiggly + 3) FIX: Form creation is common to all markup types + + poppler/Annot.cc | 92 + ++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 56 insertions(+), 36 deletions(-) + +commit 8927ddc448edc016043107e88e3bc3b2b8b03269 +Author: Fabio D'Urso +Date: Thu Mar 22 17:33:01 2012 +0100 + + Improvements to AnnotLine::draw + + poppler/Annot.cc | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 46 insertions(+), 4 deletions(-) + +commit bd7a40fd0312c753d1871558b566376304f1ff35 +Author: Fabio D'Urso +Date: Wed Mar 21 22:48:05 2012 +0100 + + AnnotInk rendering + + poppler/Annot.cc | 62 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 2 ++ + 2 files changed, 64 insertions(+) + +commit 6a8794abe639db8284db079e028cbcd66e138884 +Author: Fabio D'Urso +Date: Wed Mar 21 22:33:13 2012 +0100 + + AnnotPolygon rendering + + poppler/Annot.cc | 87 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 2 ++ + 2 files changed, 89 insertions(+) + +commit f389c50458079f24164b1c12b1151c8617485acb +Author: Fabio D'Urso +Date: Wed Mar 21 21:12:59 2012 +0100 + + Do not fill AnnotGeometry with transparent color + + Previously it was filled with black. + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c63cc22dd82f827305ad57f241ad49998f2a1c23 +Author: Albert Astals Cid +Date: Sun Apr 8 12:28:17 2012 +0200 + + Remove extra copy() (memleak) + + poppler/GlobalParams.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit ed0c9640abcbea459e3a276ee0b27631b01c32c4 +Author: Albert Astals Cid +Date: Sun Apr 8 12:24:20 2012 +0200 + + Do not crash if mallocing too much memory + + Fixes crash in + https://ritdml.rit.edu/bitstream/handle/1850/11220/TYehThesis1992.pdf?sequence=1 + even though the page is still unrendered + + poppler/JBIG2Stream.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit f1e621adbbb74ec709022b2a31195331651c83fa +Author: Adrian Johnson +Date: Sun Apr 8 19:42:05 2012 +0930 + + cairo: use correct userfont font bbox + + cairo 1.12 started clipping text to the font bbox + + Bug 48399 + + poppler/CairoFontEngine.cc | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit f5b708c3e04ba50756cd9f9530cf82f547443ce9 +Author: Suzuki Toshiya +Date: Fri Apr 6 15:22:36 2012 +0200 + + ttc<->ttf fallback is expected for CJK font list in GlobalParamsWin.cc + + Bug 48046 + + poppler/GlobalParamsWin.cc | 224 + ++++++++++++++++++++++++++------------------- + 1 file changed, 128 insertions(+), 96 deletions(-) + +commit 4e940b14a6fddde9a1714976ff8045e26cbf7d40 +Author: Adrian Johnson +Date: Mon Apr 2 20:03:11 2012 +0930 + + cairo: fix regression caused by mesh gradients + + poppler/CairoOutputDev.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 74a7d963de75c0097eedcf4224d13cf275a64757 +Author: Carlos Garcia Campos +Date: Sun Apr 1 19:35:48 2012 +0200 + + regtest: remove debug print to show bisect exit status in Bisect.py + + regtest/Bisect.py | 1 - + 1 file changed, 1 deletion(-) + +commit 2749db77eb8ccdbc4b0771163c8942f882f259f4 +Author: Carlos Garcia Campos +Date: Sun Apr 1 19:20:37 2012 +0200 + + regtest: Fix crash when creating HTML report for a single test + + regtest/commands/create-report.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 1c8e1bb637347d0d31945f9d265b29e7b49396e2 +Author: Carlos Garcia Campos +Date: Sun Apr 1 19:11:57 2012 +0200 + + regtest: Don't show results for crashed or failed to run tests in + HTML report + + regtest/HTMLReport.py | 2 ++ + 1 file changed, 2 insertions(+) + +commit a5f4936dfb3e60ca37f932cc066aa10765f3cbc9 +Author: Fabio D'Urso +Date: Sat Mar 24 23:13:48 2012 +0100 + + Fix: annotDisplayDecideCbk was not propagated + + poppler/OutputDev.h | 6 +++++- + poppler/PSOutputDev.cc | 11 ++++++++--- + poppler/PSOutputDev.h | 5 ++++- + poppler/Page.cc | 3 ++- + utils/HtmlOutputDev.h | 5 ++++- + 5 files changed, 23 insertions(+), 7 deletions(-) + +commit aab8c9a026f781da47ecedd453e225f906361444 +Author: Albert Astals Cid +Date: Thu Mar 29 21:49:38 2012 +0200 + + Increase version + + CMakeLists.txt | 4 ++-- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 6 insertions(+), 6 deletions(-) + +commit f7e65b62480631d0485167a81a588a176630dd8d +Author: Albert Astals Cid +Date: Thu Mar 29 21:48:11 2012 +0200 + + 0.19.2 news + + NEWS | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +commit 627e072eb1edbfabf549656e9abf10100ed7340c +Author: Albert Astals Cid +Date: Thu Mar 29 21:40:13 2012 +0200 + + Update copyrights + + poppler/TextOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit e9ad888b003d343d8ca60f044c7cf10a8df81cf4 +Author: Albert Astals Cid +Date: Thu Mar 29 19:49:34 2012 +0200 + + Add quotes to the poppler version define + + poppler/poppler-config.h.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8172bb03b6e8f1c16e1a152fb251b10446f54129 +Author: Peter Breitenlohner +Date: Mon Mar 26 11:13:34 2012 +0200 + + define POPPLER_VERSION as C string + + Signed-off-by: Peter Breitenlohner + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4a38d933d06d189317b1b9028c3fa4ae2a1551af +Author: Suzuki Toshiya +Date: Thu Mar 29 19:34:25 2012 +0200 + + per-collection fallback for missing CID-keyed fonts on Win32 + + poppler/GlobalParamsWin.cc | 38 ++++++++++++++++++++++++++++++++++---- + 1 file changed, 34 insertions(+), 4 deletions(-) + +commit a0b3e0938e08847d10c5d7b7528c7c5d43a7a3b8 +Author: Hib Eris +Date: Thu Mar 29 07:52:30 2012 +0200 + + Fix help message + + Partial credit goes to suzuki toshiya + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 631224dc0c721119c91984f1940c9e51edf17eca +Author: Fabio D'Urso +Date: Tue Mar 20 00:56:50 2012 +0100 + + Annotation removal + + poppler/Annot.cc | 17 +++++++++++++++++ + poppler/Annot.h | 1 + + poppler/Page.cc | 36 ++++++++++++++++++++++++++++++++++++ + poppler/Page.h | 3 +++ + 4 files changed, 57 insertions(+) + +commit 20476370a445a26f1fae9db6ad58727ee3c63550 +Author: Fabio D'Urso +Date: Wed Mar 28 23:16:37 2012 +0200 + + Basic support for Annot appearance stream removal and invalidation + + poppler/Annot.cc | 190 + +++++++++++++++++++++++++++++++++++++++++-------------- + poppler/Annot.h | 29 +++++++-- + 2 files changed, 168 insertions(+), 51 deletions(-) + +commit e9a066c3a53cc1cb73dd43a243390ae4e3c76ca3 +Author: Albert Astals Cid +Date: Wed Mar 28 23:33:37 2012 +0200 + + Fix another typo in macGlyphNames + + fofi/FoFiTrueType.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3d277b230e806a648fcc6d9e7af39370aa89c2ae +Author: Adrian Johnson +Date: Sat Feb 18 09:19:51 2012 +1030 + + Fix typo in "mu" glyph name in truetype 'post' table standard mac + ordering + + The standard mac ordering table is at: + + https://developer.apple.com/fonts/ttrefman/rm06/Chap6post.html + + fofi/FoFiTrueType.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 47b910d35b2cf5914ed4c07f751c5e8c304be7fc +Author: suzuki toshiya +Date: Wed Mar 28 20:21:44 2012 +0200 + + Add quotes + + this is quite small fix. In poppler's configure, basically the shell + variables are not enclosed, and not quoted, aslike + if test x$use_glib = x; then + This syntax make the test command confused when use_glib is multi-word + value, as, "no (required cairo output)". In such case, test cannot + know + how to evaluate the token "no" "(required" "cairo", so some "syntax + error" + messages are given. Thus, quoting of the variable would be safer. + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 78224609f6c1d87deee72b60a8f8f9f6c36ac75f +Author: Albert Astals Cid +Date: Wed Mar 28 20:21:11 2012 +0200 + + Workaround Windows problem with libjpeg + + In libjpeg6b, there is a type definition conflict issue in jmorecfg.h. + jmorecfg.h typedefs INT16 as short, INT32 as long. The latter conflict + with basetsd.h of Microsoft Windows SDK or MinGW that typedefs INT32 + as int. basetsd.h is included by windows.h, so, if the users work with + ANSI C features only, the conflict does not appear, it would be the + background why such fundamental error has been preserved. + Anyway, jmorecfg.h designer was aware about the conflict with + X11 headers + (Xmd.h defines INT16, INT32, etc), so if we pretend as if Xmd.h were + included (by defining XMD_H), this issue can be bypassed. Attached + patch + checks the conflict, then, if there is a conflict, tries XMD_H + trick, and + uses it if it works. If jmorecfg.h or basetsd.h was manually fixed to + prevent this issue, this trick is not used. + + configure.ac | 42 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + +commit d8cf31f8c7e190939525ad68cd4617fb48fea60e +Author: suzuki toshiya +Date: Wed Mar 28 20:20:43 2012 +0200 + + update Makefile.am to reflect LIBJPEG_CFLAGS, LIBTIFF_CFLAGS, + LIBPNG_CFLAGS for related sources. + + goo/Makefile.am | 15 +++++++++++++++ + poppler/Makefile.am | 6 ++++++ + splash/Makefile.am | 16 ++++++++++++++++ + utils/Makefile.am | 6 ++++++ + 4 files changed, 43 insertions(+) + +commit f0c13f5efc641c63627b8f0b0815b6b511d8d196 +Author: suzuki toshiya +Date: Wed Mar 28 20:20:06 2012 +0200 + + Configure improvements for libs in non default paths + + evaluate pkg-config-like environmental variables like LIBJPEG_CFLAGS, + LIBJPEG_LIBS, LIBTIFF_CFLAGS and LIBTIFF_LIBS in configuration. + + configure.ac | 50 ++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 44 insertions(+), 6 deletions(-) + +commit e55f485d803cb1f82e0d8a53d1998e1887c7920f +Author: suzuki toshiya +Date: Wed Mar 28 20:19:08 2012 +0200 + + Improve m4/libjpeg.m4 + + m4/libjpeg.m4 uses USER_INCLUDES and USER_LDFLAGS in it, but + USER_INCLUDES is not reflected when jpeglib.h is searched. + this patch modifies m4/libjpeg.m4 to reflect USER_INCLUDES + when jpeglib.h is searched. + + m4/libjpeg.m4 | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit e88c17d45220eea60a3dd7fab26a067616388c5f +Author: Albert Astals Cid +Date: Wed Mar 28 20:05:45 2012 +0200 + + Fix compile in windows + + poppler/GlobalParamsWin.cc | 35 ++++++++++++++++++++++++++++++----- + 1 file changed, 30 insertions(+), 5 deletions(-) + +commit ee0eaabe24019d2af226ef03e3f456787525e040 +Author: Fabio D'Urso +Date: Mon Mar 19 00:05:49 2012 +0100 + + Added Array::remove (and Object::arrayRemove) + + poppler/Array.cc | 13 +++++++++++++ + poppler/Array.h | 4 ++++ + poppler/Object.h | 5 +++++ + 3 files changed, 22 insertions(+) + +commit d6a1b7dcaeac1e49533519b9f8a279fd64d04c67 +Author: Thomas Freitag +Date: Tue Mar 27 00:00:05 2012 +0200 + + Some regression fixes/improvements + + I just finished the patch for these regressions, they had differents + reasons + 1. In CharCodeToUnicode::mapToUnicode the identity support was missing + 2. The new algorithms for axial and radial shading caused problems in + cairo. I revert these changes but removed the examination of hidden + content (this is already done in the calling function) + 3. The examination of optional hidden content in showing text + was wrong: + of course hidden text should not be shown, but text parameters + like text + position in the state must be changed! + 4. Searching and finding fonts especially with base14 fonts should be + more exact than just looking at the base14 name (i.e. fixed width + and so + on) when using fontconfig. I implement that to find the best font + fitting to the needs. + + poppler/CharCodeToUnicode.cc | 5 + + poppler/Gfx.cc | 329 + ++++++++++++++++++++----------------------- + poppler/GfxFont.cc | 3 +- + poppler/GlobalParams.cc | 78 +++++++--- + poppler/GlobalParams.h | 6 +- + 5 files changed, 218 insertions(+), 203 deletions(-) + +commit a5257efe00d0fe850b1abe5c552f7581027ac64c +Author: Fabio D'Urso +Date: Mon Mar 26 19:28:55 2012 +0200 + + Re-added forceRasterize to PSOutputDev (and qt4 fix too)‏ + + The patch restores the forceRasterize argument in PSOutputDev ctors. + Commit 6ee907f291427b8751a872b31210bf32e8d2b722 had removed it, + turning it + into a global param. + As a side effect, this patch also fixes qt4/poppler-ps-converter, + which had + not been updated to the new signature, and thus produced corrupted + output if + forceRasterization was set. + + glib/poppler-page.cc | 2 +- + poppler/GlobalParams.cc | 16 ---------------- + poppler/GlobalParams.h | 3 --- + poppler/PSOutputDev.cc | 6 +++++- + poppler/PSOutputDev.h | 3 +++ + 5 files changed, 9 insertions(+), 21 deletions(-) + +commit 55d039ada063a9427de6dd59846ce1570ab26e9f +Author: Suzuki Toshiya +Date: Mon Mar 26 22:31:29 2012 +0200 + + CJK improvements + + More info in the mailing list threads + * script names for vertical writing mode should be differentiated + for CJK + * 2 workarounds for a Korean font on Microsoft Windows + + fofi/FoFiTrueType.cc | 47 ++++++++++++++++++++++++++++++++++++----------- + fofi/FoFiTrueType.h | 8 +++++++- + poppler/GfxFont.cc | 14 ++++++++------ + 3 files changed, 51 insertions(+), 18 deletions(-) + +commit a8b0fa4d07480242afba7751995e38eaf3147ac5 +Author: Horst Prote +Date: Mon Mar 26 21:04:32 2012 +1030 + + don't add newline to last line extracted by TextSelectionDumper + + Bug 45955 + + poppler/TextOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit c40e2315cd796ba928969d13a761f5f19d8438fc +Author: Adrian Johnson +Date: Fri Mar 23 21:49:42 2012 +1030 + + cairo: use a transparency group with + setSoftMaskFromImageMask/unsetSoftMaskFromImageMask + + Drawing a tiling pattern between setSoftMaskFromImageMask and + unsetSoftMaskFromImageMask clears the softmask. + + Similar to Splash, create a transparency group in + setSoftMaskFromImageMask. Pop and paint the group in + unsetSoftMaskFromImageMask. The saveState/restoreState is to ensure + the softmask is restored before painting the group. + + Bug 47739 + + poppler/CairoOutputDev.cc | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit 7b57afea2e433fc7b6f359a62b1289f0e1da3267 +Author: Adrian Johnson +Date: Sat Mar 24 08:27:34 2012 +1030 + + cairo: update cairo mesh pattern to 1.12 api + + Now that a stable version of cairo with mesh gradient support is + released update poppler to use this api. + + poppler/CairoOutputDev.cc | 40 ++++++++++++++++++++-------------------- + poppler/CairoOutputDev.h | 4 ++-- + 2 files changed, 22 insertions(+), 22 deletions(-) + +commit 2f156b34fc8755ddd2a32cac830f3073d6b2c481 +Author: Suzuki Toshiya +Date: Fri Mar 23 20:00:18 2012 +0100 + + Fix compile in mingw-gcc + + poppler/GlobalParamsWin.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 06b6db92dd1ec32f9a55347073f8b533aa074ee1 +Author: Fabio D'Urso +Date: Sun Mar 18 23:58:05 2012 +0100 + + Added XRef::removeIndirectObject + + poppler/PDFDoc.cc | 15 ++++++++++----- + poppler/XRef.cc | 15 +++++++++++++++ + poppler/XRef.h | 2 ++ + 3 files changed, 27 insertions(+), 5 deletions(-) + +commit a2e9b7c02ffa0e5edc4da18cc726993bc92fc684 +Author: Fabio D'Urso +Date: Mon Mar 19 19:17:09 2012 +0100 + + Fix in AnnotMarkup's popup window handling + + AnnotPopup's ref was previously set to the *parent* annot, now + it's correctly + set to the *popup* annot's own. + + poppler/Annot.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 05641304df67beae546a2fe18071f3be52707aa8 +Author: Fabio D'Urso +Date: Mon Mar 19 20:56:45 2012 +0100 + + Basic Annot border editing support + + poppler/Annot.cc | 23 +++++++++++++++++++++++ + poppler/Annot.h | 9 +++++++++ + 2 files changed, 32 insertions(+) + +commit 3e6275a05066c152b265cc27275d9e4107c089e9 +Author: Fabio D'Urso +Date: Fri Mar 16 21:47:02 2012 +0100 + + Yet new setters to AnnotFreeText + + poppler/Annot.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 2 ++ + 2 files changed, 47 insertions(+) + +commit f69f41056fc8cd8a70b38024f255e9074af20bdc +Author: Pino Toscano +Date: Tue Mar 20 15:18:33 2012 +0100 + + cmake: reset CMAKE_REQUIRED_INCLUDES/CMAKE_REQUIRED_LIBRARIES + + cmake/modules/FindLIBOPENJPEG.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +commit 4a9238441a5317c3304296e4e6430cccefe8322c +Author: Ihar Filipau +Date: Fri Mar 16 00:07:45 2012 +0100 + + Flip images if they need to + + Bug 32340 + + utils/HtmlOutputDev.cc | 50 + ++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 48 insertions(+), 2 deletions(-) + +commit 6d68d0d3acc8c8e0d9d310b2e1ba2b07d6bfe942 +Author: Ihar Filipau +Date: Thu Mar 15 22:56:10 2012 +0100 + + pdftohtml: extract mask images even if they are not JPEG + + Bug #47186 + + utils/HtmlOutputDev.cc | 203 + +++++++++++++++++++++++++++++++------------------ + utils/HtmlOutputDev.h | 3 + + 2 files changed, 131 insertions(+), 75 deletions(-) + +commit 60155e0fc7224a6b479bf62133f72c460fe48078 +Author: Albert Astals Cid +Date: Thu Mar 15 20:46:53 2012 +0100 + + Install poppler-media.h + + qt4/src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 6a173844d5ca6f32e188406ab14cae6a7548fc1d +Author: Albert Astals Cid +Date: Thu Mar 15 20:44:12 2012 +0100 + + Add the export + + qt4/src/poppler-media.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit e401f8e6ba3e18d5a3a4920cd111b2174c75f415 +Author: Albert Astals Cid +Date: Thu Mar 15 20:32:12 2012 +0100 + + Increase version and sonames + + CMakeLists.txt | 4 ++-- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + 9 files changed, 10 insertions(+), 10 deletions(-) + +commit ce059698e8c5097f75e7a0f828af0936aa104af0 +Author: Albert Astals Cid +Date: Thu Mar 15 20:27:45 2012 +0100 + + 0.19.1 news + + Also inclusing 0.18.x ones + + NEWS | 110 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 110 insertions(+) + +commit 2041d5721871adb2a23999c16ecbdc60abb7b1c4 +Author: Albert Astals Cid +Date: Thu Mar 15 20:20:31 2012 +0100 + + Update C years + + poppler/CMap.h | 1 + + poppler/GfxFont.h | 2 +- + poppler/Rendition.cc | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +commit 95d684aa2a87d01296f5e93516f2ac3f54adbec8 +Author: Guillermo Amaral +Date: Thu Mar 15 20:13:20 2012 +0100 + + Remove the QIODevice and go with a not so good but more safer + QByteArray + + Bug #47336 + + qt4/src/CMakeLists.txt | 1 - + qt4/src/Makefile.am | 1 - + qt4/src/poppler-media.cc | 35 ++++++++++----- + qt4/src/poppler-media.h | 4 +- + qt4/src/poppler-page.cc | 1 - + qt4/src/poppler-streamsequentialdevice-private.h | 51 + --------------------- + qt4/src/poppler-streamsequentialdevice.cc | 56 + ------------------------ + 7 files changed, 26 insertions(+), 123 deletions(-) + +commit 9fee12f9bee7252db0974ef69870b69ff1452053 +Author: Albert Astals Cid +Date: Thu Mar 15 19:23:47 2012 +0100 + + Compile++ + + qt4/src/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit aa1e6d12d063a64a22841f7996101b45aa680ec7 +Author: Guillermo Amaral +Date: Thu Mar 15 00:35:31 2012 +0100 + + Added media rendition support for Qt4 + + qt4/src/CMakeLists.txt | 3 + + qt4/src/poppler-annotation.cc | 66 ++++++++++ + qt4/src/poppler-annotation.h | 47 ++++++- + qt4/src/poppler-link.cc | 44 +++++++ + qt4/src/poppler-link.h | 38 +++++- + qt4/src/poppler-media.cc | 149 + +++++++++++++++++++++++ + qt4/src/poppler-media.h | 94 ++++++++++++++ + qt4/src/poppler-page.cc | 32 ++++- + qt4/src/poppler-qt4.h | 2 + + qt4/src/poppler-streamsequentialdevice-private.h | 51 ++++++++ + qt4/src/poppler-streamsequentialdevice.cc | 56 +++++++++ + 11 files changed, 579 insertions(+), 3 deletions(-) + +commit 258e2197afa49e60b0b13a05408fc8d484dd8147 +Author: Fabio D'Urso +Date: Wed Mar 14 23:25:00 2012 +0100 + + Added some new setters to AnnotFreeText + + poppler/Annot.cc | 39 +++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 4 ++++ + 2 files changed, 43 insertions(+) + +commit 84a62ac157e03880c1c1eda60c3927bd4414640e +Author: Fabio D'Urso +Date: Wed Mar 14 23:24:28 2012 +0100 + + Added some new setters to AnnotGeometry, AnnotInk and AnnotCaret + + poppler/Annot.cc | 116 + +++++++++++++++++++++++++++++++++++++++++-------------- + poppler/Annot.h | 10 +++++ + 2 files changed, 96 insertions(+), 30 deletions(-) + +commit 233c9a097bdc382f6a2eb6319ee15528c72e9632 +Author: Fabio D'Urso +Date: Wed Mar 14 23:23:59 2012 +0100 + + Added some new setters to AnnotTextMarkup and AnnotStamp + + poppler/Annot.cc | 61 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 11 ++++++++-- + 2 files changed, 70 insertions(+), 2 deletions(-) + +commit 8fb3ac6cf66233b80959ba99a2c706111050f5f1 +Author: Fabio D'Urso +Date: Wed Mar 14 23:23:23 2012 +0100 + + Added Page::getDoc() + + poppler/Page.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit dc4cb07c1e735006d5168e0e65f5143d7fc53e12 +Author: Fabio D'Urso +Date: Wed Mar 14 23:22:10 2012 +0100 + + Added some new setters to AnnotLine and AnnotPolygon + + poppler/Annot.cc | 201 + +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + poppler/Annot.h | 16 +++++ + 2 files changed, 211 insertions(+), 6 deletions(-) + +commit 4931018eecc37dbbe0df1a456347ab200f1b057a +Author: Fabio D'Urso +Date: Wed Mar 14 23:21:07 2012 +0100 + + Make Dict::set remove the entry if object is Null + + poppler/Dict.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 13ac2c0bed3fa5515a3c068488cb6a0b17410a97 +Author: Fabio D'Urso +Date: Wed Mar 14 23:20:13 2012 +0100 + + Added some new setters to Annot and AnnotMarkup + + poppler/Annot.cc | 94 + ++++++++++++++++++++++++++++++++++++++++++++++++++++---- + poppler/Annot.h | 8 +++++ + 2 files changed, 96 insertions(+), 6 deletions(-) + +commit aa2b5ffa7961aac0aea33ae9a42bf1f38a756b1b +Author: Pino Toscano +Date: Wed Mar 14 16:25:35 2012 +0100 + + qt4: replace ObjectReference with simplier Ref + + instead of roll out a new (still private) version of Ref, just use + it for private annotation and link data; + this needed a couple of explicit initializations of Ref (since it's + a simple struct with no methods) and a private operator== for it + + qt4/src/CMakeLists.txt | 1 - + qt4/src/poppler-annotation-private.h | 4 +- + qt4/src/poppler-annotation.cc | 1 + + qt4/src/poppler-link.cc | 16 ++++--- + qt4/src/poppler-link.h | 5 +- + qt4/src/poppler-objectreference.cc | 89 + ------------------------------------ + qt4/src/poppler-objectreference_p.h | 77 ------------------------------- + qt4/src/poppler-page.cc | 7 ++- + 8 files changed, 21 insertions(+), 179 deletions(-) + +commit e5b914b2bfbb5e95ecde5f1ce148374b1d58dadd +Author: Ihar Filipau +Date: Tue Mar 13 23:54:26 2012 +0100 + + Add possibilty of controlling word breaks percentage + + Bug #47022 + + utils/HtmlOutputDev.cc | 7 +++++-- + utils/pdftohtml.1 | 5 +++++ + utils/pdftohtml.cc | 7 +++++++ + 3 files changed, 17 insertions(+), 2 deletions(-) + +commit 4388cb69114e406ec29e8b6976d1a900e4ab1b7d +Author: Albert Astals Cid +Date: Sun Mar 11 23:37:39 2012 +0100 + + Make doUpdateFont protected + + So that people inheriting from SplashOutputDev *yuck* can use it + more easily + Bug 46622 + + poppler/SplashOutputDev.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 448cfc431b7067af38da51e725ac0f1b2a0bc8f8 +Author: Tobias Koenig +Date: Sun Mar 11 23:22:18 2012 +0100 + + support for LinkMovie object in Qt4 frontend + + Bug #40561 + + qt4/src/CMakeLists.txt | 1 + + qt4/src/poppler-annotation-private.h | 4 ++ + qt4/src/poppler-annotation.h | 4 ++ + qt4/src/poppler-link.cc | 42 +++++++++++++---- + qt4/src/poppler-link.h | 43 +++++++++++++++-- + qt4/src/poppler-objectreference.cc | 89 + ++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-objectreference_p.h | 77 +++++++++++++++++++++++++++++++ + qt4/src/poppler-page.cc | 39 ++++++++++++---- + 8 files changed, 276 insertions(+), 23 deletions(-) + +commit a0d151deabf8243c98ff9953f8a43bb56fbf95a9 +Author: Carlos Garcia Campos +Date: Sun Mar 11 16:05:15 2012 +0100 + + regtest: Add find-regression command to run git bisect automatically + + regtest/Bisect.py | 113 + ++++++++++++++++++++++++++++++++++++ + regtest/builder/__init__.py | 86 +++++++++++++++++++++++++++ + regtest/builder/autotools.py | 63 ++++++++++++++++++++ + regtest/commands/find-regression.py | 77 ++++++++++++++++++++++++ + 4 files changed, 339 insertions(+) + +commit 856768c380ecea30ce9727b81c4c44b4f9489626 +Author: Carlos Garcia Campos +Date: Sat Mar 10 18:15:58 2012 +0100 + + regtest: Add information about skipped tests in the summary + + regtest/TestRun.py | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 508c7c3ef1f22459daa822f8287cab382119e753 +Author: Tobias Koenig +Date: Wed Mar 7 18:35:05 2012 +0100 + + Fix logic error in Rendition parsing code + + Make the rendition object invalid when both P an C entries are not + present or are invalid in Media Rendition dictionary. + + https://bugs.freedesktop.org/show_bug.cgi?id=47063 + + poppler/Rendition.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 68625258ab3cfc3e8e10a727e397f80bed0d1f5c +Author: Adrian Johnson +Date: Sun Mar 4 18:37:53 2012 +1030 + + glib demo: make ctrl-q quit the demo + + glib/demo/main.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 684b47727ba810ad6bf239e2838aa65b6f6cec36 +Author: Adrian Johnson +Date: Sun Mar 4 18:10:49 2012 +1030 + + glib demo: show font encoding in font demo + + glib/demo/fonts.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 48c08d28645d82ab9d67433a0150f6e1ba24b7c6 +Author: Adrian Johnson +Date: Sun Mar 4 17:49:56 2012 +1030 + + glib: add poppler_fonts_iter_get_encoding + + glib/poppler-document.cc | 26 ++++++++++++++++++++++++++ + glib/poppler-document.h | 1 + + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 28 insertions(+) + +commit 8d935569a977675afac35cf1bd5f2611b6a771b6 +Author: Albert Astals Cid +Date: Mon Mar 5 21:59:09 2012 +0100 + + Fix regression in some PSOutputDev array sizing + + poppler/PSOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2484bc0f29aef74c45ea39ef1e24804ed736154c +Author: Albert Astals Cid +Date: Sun Mar 4 23:47:24 2012 +0100 + + Fix mismatch in some functions declarations + + goo/GooString.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 35c960d198d2efa97d15e962662114c5c31b8d20 +Author: Even Rouault +Date: Sun Mar 4 20:32:42 2012 +0100 + + Do not crash on malformed files with 0 bits in the color map of + an image + + poppler/Gfx.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit dae29c6c201cd69cbf4f008de865cc19a36f29b3 +Author: Thomas Freitag +Date: Sun Mar 4 15:22:02 2012 +0100 + + CJK substitute implementation on WIndows platforms. + + When You install ghostscript on WIndows You're able to switch on CJK + support. This will create a cidfmap file in the gs-lib directory. The + ps file which creates it (mkcidfm.ps) runs over the windows font + directory and tries to create a suitable substitution table for + missing + CJK fonts. The cidfmap file is more or less PDF like, so it's + quite easy + to parse it with our parser and create a substitution table in + GlobalParamsWin and use that table. But I expect it in the poppler + data + dir instead of searching for ghostscript installation. If it is not + there, it always returns the default CID font of point 2. + You can either copy it from the gs lib directory or create it with the + ghostscript tool calling + + gswin32c -q -dBATCH -sFONTDIR= + -sCIDFMAP=/cidfmap mkcidfm.ps + + poppler/GlobalParams.cc | 5 +++ + poppler/GlobalParams.h | 2 + + poppler/GlobalParamsWin.cc | 106 + ++++++++++++++++++++++++++++++++++++++++----- + 3 files changed, 103 insertions(+), 10 deletions(-) + +commit 32e47ee03840cc8f21c00497025864d77edb75f5 +Author: Thomas Freitag +Date: Sun Mar 4 15:21:13 2012 +0100 + + Improve CJK suport in PSOutputDev + + 1. Adapt bug fix for bug 11413 to the postscript device + 2. A small bug fix when locateFont doesn't find a suitable font and + returns a null pointer + + to 1.: + Adapting the implementation of the bug fix for splash and cairo to the + postscript device was quite easy. But my first proofs of the + output with + ghostscript 8.71 shows some regressions where the CJK chars have a + smaller height than the default square of the font. But the "48" + in the + output of bug-poppler11413.pdf which is set in a "normal" font but + rotated was at the right position. Then I stepped to ghostscript 9.04, + and now the CJK chars were shown correctly, but the 48 was positioned + wrong. But because of these different tests I think that it is still a + problem in ghostscript when using a mix of CJK fonts and "normal" + fonts. + BTW, also Acrobat X distiller has problems with the position of the + "48"! + + to 2.: + On my first tests with PDF which uses non embedded CJK fonts on + Windows + I got crashes. Reason for it was that GlobalParamWin returns + Helvetica, + which is not a CID font, but locateFont accepts here only CID + fonts and + therefore returns a NULL pointer. I first fixed that and then + decided to + return as default MS Mincho if a CID font is expected. + + poppler/PSOutputDev.cc | 203 + ++++++++++++++++++++++--------------------------- + 1 file changed, 92 insertions(+), 111 deletions(-) + +commit 61037a6de157e39331ae7a8b12ee5a115fd7e936 +Author: Adrian Johnson +Date: Sun Mar 4 17:40:40 2012 +1030 + + glib demo: fix typo + + glib/demo/selections.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit aff5b0a4f04c12ad7733aedbc9997367f5873aa1 +Author: Carlos Garcia Campos +Date: Sat Mar 3 20:10:17 2012 +0100 + + regtest: Ignore backends with no results when creating html report + + regtest/HTMLReport.py | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 9d28b8db3561845f4ca94c29479a259ceaf78bc5 +Author: Carlos Garcia Campos +Date: Sat Mar 3 14:42:51 2012 +0100 + + regtest: Add --pretty-diff option to create-report command + + It includes a pretty-diff link to make a bit easier to check + differences + in test results. For images it creates a html with javascript that + toggles actual and expected image, using the same code than WebKit + layout test results. For text files it uses HtmlDiff class from python + difflib. It's an option disabled by default because pretty diff + for text + files is very slow. + + regtest/HTMLReport.py | 128 + +++++++++++++++++++++++++++++++++++++- + regtest/commands/create-report.py | 4 ++ + 2 files changed, 129 insertions(+), 3 deletions(-) + +commit 670ea176495b8b580daba061840c914714bf422d +Author: Adrian Johnson +Date: Fri Mar 2 22:22:16 2012 +1030 + + pdffonts: list the encoding of each font + + Bug 46888 + + poppler/CMap.h | 2 ++ + poppler/FontInfo.cc | 3 +++ + poppler/FontInfo.h | 2 ++ + poppler/GfxFont.cc | 26 ++++++++++++++++++++++++++ + poppler/GfxFont.h | 4 ++++ + utils/pdffonts.1 | 3 +++ + utils/pdffonts.cc | 7 ++++--- + 7 files changed, 44 insertions(+), 3 deletions(-) + +commit 3ab6b5ebf3b6c0d59bcb2ec68eae1aa95cab1d0e +Author: William Bader +Date: Fri Mar 2 19:40:44 2012 +0100 + + Fix pdftops -passfonts regression + + This patch fixes pdftops -passfonts by using the new psFontPassthrough + variable + consistently and removing the old psSubstFonts and its setter and + getter in + GlobalParams. + + Bug 46744 + + poppler/GlobalParams.cc | 9 +-------- + poppler/GlobalParams.h | 4 +--- + utils/pdftops.cc | 10 +++++----- + 3 files changed, 7 insertions(+), 16 deletions(-) + +commit 6c1ee34424b1122c0a2222b776d8d475f7c555cd +Author: Adrian Johnson +Date: Fri Mar 2 18:41:58 2012 +1030 + + Update poppler copyright + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit cdb1350d1e28cf3bceda75736ca91e13d193de84 +Author: Albert Astals Cid +Date: Thu Mar 1 18:58:02 2012 +0100 + + Increase versions + + CMakeLists.txt | 4 ++-- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + 9 files changed, 10 insertions(+), 10 deletions(-) + +commit 2c9e6fa5b3bc6cd01618c3fb4f46533bfce97466 +Author: Albert Astals Cid +Date: Thu Mar 1 18:48:17 2012 +0100 + + 0.19.0 news file + + NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +commit 14f6abfcb83f91755e6de05cd33870934bba3cfb +Author: Albert Astals Cid +Date: Thu Mar 1 17:53:25 2012 +0100 + + Update copyrights + + goo/JpegWriter.cc | 2 +- + poppler/CairoFontEngine.cc | 1 + + poppler/CairoOutputDev.cc | 3 ++- + poppler/CairoOutputDev.h | 2 +- + poppler/CairoRescaleBox.cc | 15 +++++++++++++++ + poppler/FontInfo.cc | 2 +- + poppler/FontInfo.h | 1 + + poppler/Gfx.cc | 2 +- + poppler/GfxFont.cc | 1 + + poppler/GlobalParams.cc | 2 ++ + poppler/GlobalParams.h | 1 + + poppler/Lexer.cc | 1 + + poppler/NameToUnicodeTable.h | 2 +- + utils/ImageOutputDev.cc | 1 + + utils/ImageOutputDev.h | 1 + + utils/parseargs.cc | 1 + + utils/parseargs.h | 1 + + utils/pdffonts.cc | 1 + + utils/pdfimages.cc | 1 + + utils/pdftocairo.cc | 2 +- + utils/pdftoppm.cc | 2 +- + 21 files changed, 37 insertions(+), 8 deletions(-) + +commit e63ca8184168f824575be9bbb64e9b1eac1eff94 +Author: Adrian Johnson +Date: Thu Mar 1 21:46:12 2012 +1030 + + pdftocairo: document that -scale-to will preserve aspect ratio + + based on pdftpppm patch 7ec31b8dc40ec8a3534fbb89964aa011aeb81f5e + + utils/pdftocairo.1 | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit fa82a7ce1372e5976ad95624115fcd7a4d9bd22c +Author: Adrian Johnson +Date: Thu Mar 1 21:43:32 2012 +1030 + + pdftocairo: allow one of -scale-to-[xy] = -1 to mean the aspect + ratio is to be preserved + + based on pdftoppm patch 38ace7db5de0b2b247fd520e48a8f26e5d28c9d7 + + utils/pdftocairo.1 | 8 ++++++-- + utils/pdftocairo.cc | 8 ++++++-- + 2 files changed, 12 insertions(+), 4 deletions(-) + +commit a2b008223ad6887f00d76c535f2b0b0f13f52b76 +Author: Adrian Johnson +Date: Tue Feb 28 21:38:19 2012 +1030 + + glib: add copy button to selections demo + + glib/demo/selections.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit b666d19308a043206e405c7e9d4ad709d68d331b +Author: Adrian Johnson +Date: Tue Feb 28 21:07:06 2012 +1030 + + glib: show substitute font name in demo + + glib/demo/fonts.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 18bc59fcf5a59b1fd51a631c02e900790c3a6dc0 +Author: Adrian Johnson +Date: Tue Feb 28 21:06:38 2012 +1030 + + glib: add poppler_fonts_iter_get_substitute_name + + glib/poppler-document.cc | 27 +++++++++++++++++++++++++++ + glib/poppler-document.h | 1 + + glib/reference/poppler-docs.sgml | 4 ++++ + glib/reference/poppler-sections.txt | 1 + + 4 files changed, 33 insertions(+) + +commit 4eaafe67de79fb63ebf61f031a97bbc0ed6a8891 +Author: Albert Astals Cid +Date: Wed Feb 29 23:22:34 2012 +0100 + + Change nnnnnn to number + + This way people won't expect it to be six fixed digits + Bug #46708 + + utils/pdftoppm.1 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit aec6cb67951e56e4557a11c4fdf301e585268fe4 +Author: William Bader +Date: Wed Feb 29 23:18:16 2012 +0100 + + Fix stuff lost when merging xpdf303 + + restore the implementation of -binary + restore the fix that level2sep and level3sep must write cmyk instead + of rgb + restore the conversion of bitmaps with all gray to mono8 + fixed the CMYK misspelling in Stream. + + poppler/PSOutputDev.cc | 284 + +++++++++++++++++++++++++++++++++++++++++-------- + poppler/Stream.cc | 55 ++++++++-- + poppler/Stream.h | 39 ++++++- + 3 files changed, 320 insertions(+), 58 deletions(-) + +commit e977925a1eb15083e6b020b31da77ddef9d5df02 +Author: William Bader +Date: Wed Feb 29 23:12:24 2012 +0100 + + Fix double alloc + + xpdf303 merge glitch + + poppler/PSOutputDev.cc | 1 - + 1 file changed, 1 deletion(-) + +commit e13efe04facdc10f3acffece3b057544f018f40c +Author: William Bader +Date: Wed Feb 29 23:10:43 2012 +0100 + + Fix memory leak + + Wrong merge from xpdf303 + + poppler/GfxState.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit adfc03e441b2a86dab5216dc560fd79343dfbe4f +Author: Hib Eris +Date: Wed Feb 29 21:10:56 2012 +0100 + + Only use Hints table when there are no parse errors + + Fixes bug #46459. + + poppler/Hints.cc | 6 ++++-- + poppler/Parser.cc | 30 ++++++++++++++++++++++++------ + poppler/Parser.h | 7 +++++-- + 3 files changed, 33 insertions(+), 10 deletions(-) + +commit 7ec31b8dc40ec8a3534fbb89964aa011aeb81f5e +Author: Adrian Johnson +Date: Mon Feb 27 21:15:39 2012 +1030 + + pdftoppm: document that -scale-to will preserve aspect ratio + + utils/pdftoppm.1 | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 38ace7db5de0b2b247fd520e48a8f26e5d28c9d7 +Author: Adrian Johnson +Date: Sat Feb 25 20:02:22 2012 +1030 + + pdftoppm: allow one of -scale-to-[xy] = -1 to mean the aspect ratio + is to be preserved + + bug 43393 + + utils/pdftoppm.1 | 8 ++++++-- + utils/pdftoppm.cc | 8 ++++++-- + 2 files changed, 12 insertions(+), 4 deletions(-) + +commit 738b879ebb536cc84d7ec96543d484023b69e6d3 +Author: Carlos Garcia Campos +Date: Sat Feb 25 20:53:58 2012 +0100 + + regtest: Add create-report command to generate html report of + test results + + regtest/HTMLReport.py | 197 + ++++++++++++++++++++++++++++++++++++++ + regtest/backends/__init__.py | 20 +++- + regtest/commands/create-report.py | 57 +++++++++++ + 3 files changed, 273 insertions(+), 1 deletion(-) + +commit d5faabd509c2860ab199ee89b8ef9d4c14fa5118 +Author: Carlos Garcia Campos +Date: Sat Feb 25 20:50:53 2012 +0100 + + regtest: Use diff.png extension for image diff files + + So that they are recognized as images + + regtest/backends/__init__.py | 16 ++++++++++++++-- + regtest/backends/cairo.py | 2 +- + regtest/backends/splash.py | 2 +- + regtest/backends/text.py | 2 +- + 4 files changed, 17 insertions(+), 5 deletions(-) + +commit 2a5f1594a23cf521497f904b502fbadf56a9e780 +Author: William Bader +Date: Sat Feb 25 16:32:33 2012 +0100 + + Fix PSOutputDev regression with -level1 + + poppler/PSOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6a5deb0a86ad227cce3f85b1f58a9b86755cd812 +Author: Adrian Johnson +Date: Sat Feb 25 19:39:02 2012 +1030 + + autoconf: PKG_CHECK_EXISTS should not have the variable prefix in + the first argument + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8f4566c14a727fb75c4c353989cf5eb96516c2e3 +Author: Adrian Johnson +Date: Wed Feb 22 21:21:52 2012 +1030 + + autoconf: replace openjpeg compile test with a version test + + Now that openjpeg 1.5 is released and supports pkg-config the compile + test can be replaced with a pkg-config version check. + + configure.ac | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit 30f38bf425e2f76b3f6cc4c080137ac7219a9dbe +Author: Adrian Johnson +Date: Wed Feb 22 21:01:59 2012 +1030 + + autoconf: Use pkgconfig to check for libopenjpeg + + and if not found fallback to using AC_CHECK_LIB/AC_CHECK_HEADERS + + openjpeg >= 1.4 installs a pkgconfig file + + Bug 21789 + + configure.ac | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +commit 466340d257ff0fe7e3a88a4e013e3feec3f7b70a +Author: Albert Astals Cid +Date: Thu Feb 23 23:47:15 2012 +0100 + + Combine UTF16 surrogate pairs + + Bug 46521 + + utils/HtmlOutputDev.cc | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit 675ef2bda3c4e06b39e2ba09b3b19d99cfb001b6 +Author: Oliver Sander +Date: Thu Feb 23 23:22:50 2012 +0100 + + Compile + + poppler/Stream.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7705e65c231cc3af296bf19f5cba110cabb72e7d +Author: Albert Astals Cid +Date: Thu Feb 23 23:09:23 2012 +0100 + + Generate outlines in pdftohtml in -xml mode. + + Bug 56993 + + utils/HtmlOutputDev.cc | 130 + ++++++++++++++++++++++++++++++++++++------------- + utils/HtmlOutputDev.h | 7 ++- + utils/pdf2xml.dtd | 7 ++- + utils/pdftohtml.cc | 5 +- + 4 files changed, 108 insertions(+), 41 deletions(-) + +commit 30446bdd7e202eed88d131e04477c76861fd145c +Author: Albert Astals Cid +Date: Thu Feb 23 22:56:17 2012 +0100 + + Use an Identity CharCodeToUnicode for Adobe-Identity and Adobe-UCS + collections + + Also fix Identity CharCodeToUnicode code + + Bug #35468 + + poppler/CharCodeToUnicode.cc | 18 +++++++++++++----- + poppler/CharCodeToUnicode.h | 7 +++++-- + poppler/GfxFont.cc | 13 +++++++------ + 3 files changed, 25 insertions(+), 13 deletions(-) + +commit 71104f1ec55d3be999afaa1b62405454b31066a9 +Author: Albert Astals Cid +Date: Thu Feb 23 19:34:57 2012 +0100 + + Remove unneded CharCodeToUnicode includes + + poppler/ArthurOutputDev.cc | 3 +-- + poppler/CairoFontEngine.cc | 3 +-- + poppler/CairoOutputDev.cc | 3 +-- + poppler/SplashOutputDev.cc | 3 +-- + 4 files changed, 4 insertions(+), 8 deletions(-) + +commit c0c8cc1592ee6aa13157e34f8083b951d487a413 +Author: Adrian Johnson +Date: Thu Feb 23 21:13:23 2012 +1030 + + glib docs: fix typo + + glib/poppler.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fde3bed0f400a50f31f1f6bcee44ac1b2c17ddc6 +Author: Albert Astals Cid +Date: Wed Feb 22 00:03:37 2012 +0100 + + pdfinfo: decode utf-16 surrogate pairs + + Based on a patch by Adrian Johnson + Bug 23075 + + utils/pdfinfo.cc | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit 3361564364a1799fc3d6c6df9f208c5531c407dc +Author: Adrian Johnson +Date: Tue Feb 21 22:20:02 2012 +0100 + + Expand glyph name ligatures such as "ff", "ffi" etc to normal form + + Bug 7002 + + poppler/GfxFont.cc | 14 +++++++++++++- + poppler/UnicodeTypeTable.cc | 9 +++++++++ + poppler/UnicodeTypeTable.h | 3 +++ + 3 files changed, 25 insertions(+), 1 deletion(-) + +commit d0186c558f4a84a9317687ad50b460d34fb5fdf0 +Author: Pino Toscano +Date: Mon Feb 20 22:18:00 2012 +0100 + + cmake: support for lcms2 + + followup of e48c22d3b70412015b9cc07a9a6ce07845274e13 also for the + CMake build system, + importing the FindLCMS2.cmake from kdelibs + + CMakeLists.txt | 26 +++++++++++++-- + cmake/modules/FindLCMS2.cmake | 73 + +++++++++++++++++++++++++++++++++++++++++++ + config.h.cmake | 3 ++ + utils/CMakeLists.txt | 3 ++ + 4 files changed, 102 insertions(+), 3 deletions(-) + +commit e48c22d3b70412015b9cc07a9a6ce07845274e13 +Author: Koji Otani +Date: Mon Feb 20 22:04:01 2012 +0100 + + Add support for lcms2 + + configure.ac | 24 ++++++- + poppler/GfxState.cc | 159 + +++++++++++++++++++++++++++----------------- + qt4/src/poppler-document.cc | 5 ++ + utils/pdftocairo.cc | 17 +++++ + 4 files changed, 143 insertions(+), 62 deletions(-) + +commit 1bcae7aa8f87cc85ee6b477bf0abb49452e46505 +Author: Igor Slepchin +Date: Sun Feb 19 23:40:50 2012 +0100 + + Consistently check if pdftohtml needs to generate outlines. + + utils/pdftohtml.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 126bf08105e319f9216654782e5a63f99f1d1825 +Author: Albert Astals Cid +Date: Sun Feb 19 23:18:25 2012 +0100 + + Update glyph names to Unicode values mapping + + Added Zapf Dingbat names and fixed copyrightsans, copyrightserif, + registersans, registerserif, trademarksans, trademarkserif + Kudos to Adrian Johnson for find what was missing :-) + Bug #13131 + + poppler/NameToUnicodeTable.h | 213 + +++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 207 insertions(+), 6 deletions(-) + +commit c0fec84312a37f62bdbfdee7c8e9b520af28330a +Author: Pino Toscano +Date: Sun Feb 19 14:47:24 2012 +0100 + + fix typo, GString -> GooString + + goo/GooString.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit aaae8996766f259dcc329755c7cccde7c916c1fb +Author: Adrian Johnson +Date: Thu Feb 16 22:22:15 2012 +1030 + + cairo: set mask matrix before drawing an image with a mask + + Bug 40828 + + poppler/CairoOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit fff439f25d9bbd199db5646deccd80733138898e +Author: Adrian Johnson +Date: Sun Feb 19 15:45:31 2012 +1030 + + update .gitignore + + utils/.gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 1cc3e152d6e879eb13fbdf2964ede3e01d13d097 +Author: Adrian Johnson +Date: Sun Feb 19 15:43:09 2012 +1030 + + glib docs: fix typo + + glib/poppler-page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4f4db591276ec156c55b3a3c2020a1cf82f1519b +Author: Adrian Johnson +Date: Sun Feb 19 15:37:04 2012 +1030 + + cairo: fix pdftocairo crash when pdf document uses actualText + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9b72ee4e4c8658b2f7cd542d601a5c3be621d3fc +Author: Thomas Freitag +Date: Sat Feb 18 17:34:12 2012 +0100 + + Make some of the unfilteredResets be really unfiltered + + poppler/Stream.cc | 26 ++++++++++++++++++++------ + poppler/Stream.h | 3 +++ + 2 files changed, 23 insertions(+), 6 deletions(-) + +commit 33aded82fbd98832eaab7cb7487fe6a1c7ef15f5 +Author: Albert Astals Cid +Date: Sat Feb 18 17:21:10 2012 +0100 + + Rework XRef getNumObjects and getSize + + Kill XRef::last since we do not maintain it correctly, now + getNumObjects returns size as it did + Kill getSize as it just returns the same as getNumObjects + + poppler/PDFDoc.cc | 10 +++++----- + poppler/XRef.cc | 12 +----------- + poppler/XRef.h | 6 ++---- + 3 files changed, 8 insertions(+), 20 deletions(-) + +commit 521d3740e9b7d2cfacf29f089a4a8f6c962de807 +Author: Adrian Johnson +Date: Mon Feb 13 22:05:18 2012 +1030 + + pdfimages: add -list option to list all images + + Bug 46066 + + utils/ImageOutputDev.cc | 204 + ++++++++++++++++++++++++++++++++++++++++++------ + utils/ImageOutputDev.h | 20 ++++- + utils/pdfimages.1 | 101 ++++++++++++++++++++++++ + utils/pdfimages.cc | 12 ++- + 4 files changed, 307 insertions(+), 30 deletions(-) + +commit 119b6b752314c9b13440eddf5bd1d5cef2966e80 +Author: Adrian Johnson +Date: Mon Feb 6 16:50:11 2012 +1030 + + cairo: don't read inline image streams twice + + Bug 45668 + + poppler/CairoOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a76135391555145ec740d49a7141e60da0ea5dee +Author: Hib Eris +Date: Tue Feb 14 20:11:19 2012 +0100 + + Add a configuration option for the test data dir + + This makes 'make distcheck' run succesfully. + + CMakeLists.txt | 20 ++++++++++++++++++++ + Makefile.am | 2 +- + configure.ac | 42 + +++++++++++++++++++++++++++++++++++++++++ + qt4/tests/CMakeLists.txt | 1 + + qt4/tests/Makefile.am | 1 + + qt4/tests/check_actualtext.cpp | 2 +- + qt4/tests/check_attachments.cpp | 14 +++++++------- + qt4/tests/check_fonts.cpp | 18 +++++++++--------- + qt4/tests/check_links.cpp | 6 +++--- + qt4/tests/check_metadata.cpp | 32 +++++++++++++++---------------- + qt4/tests/check_optcontent.cpp | 12 ++++++------ + qt4/tests/check_pagelayout.cpp | 6 +++--- + qt4/tests/check_pagemode.cpp | 10 +++++----- + qt4/tests/check_password.cpp | 12 ++++++------ + qt4/tests/check_permissions.cpp | 2 +- + qt4/tests/check_search.cpp | 4 ++-- + 16 files changed, 124 insertions(+), 60 deletions(-) + +commit 59946e0c34e762eb5f5a13b4ae8c9ec7fb21379a +Author: Thomas Freitag +Date: Tue Feb 14 19:37:21 2012 +0100 + + Overprint implementation in postscript and splash device + + It is an enhancement patch, a + merge fix and a bug fix in one: an enhancement, because it now + completes + the implementation overprint mode and devicen in postscript, a merge + fix, because it fixes some bugs in the overprint implementation in + splash of xpdf 3.0.3 and has now the complete functionality (and + more!) + of my implementation back again and a bug fix, because it fixes + the use + of splash cmyk in postscript which never had worked. + + 1. Overprint implementation in postscript + To have a complete overprint implementation in the (pure) postscript + device there were just two things missing: overprint mode and the + implementation of the DeviceN colorspace in PostScript. I double + checked + my implementation with the Ghent Test Suite with GhostScript (device + pdfwrite) and Acrobat X distiller, and all the tests now succeeds, + either in Acrobat X distiller or in GhostScript. As overprint is a + device dependent feature, it is up to the output device if it supports + overprint and what features of overprint are supported, and often You + have various configuration possibilities there. Nearly all PostScript + output of the Ghent tests show now the desired results if converting + it + back to PDF with ghostscript pdfwrite, the implementation in + ghostscript + is complete. On the other hand a few tests failed when using Acrobat X + distiller, all of them with the overprint mode switch. Funny, because + overprint mode 1 is often also called the illustrator overprint mode + because it was introduced by illustrator, but probably the destiller + only handles EPS correctly which comes from illustrator + + 2. Overprint implementation in postscript if using splash + rasterization + Of course the postscript overprint implementation will only work if + pdftops doesn't decide to use splash to rasterize it because of + the use + of transparencies in the PDF. But because overprint is device + dependent + I decided to spend an additional parameter "overprint" to pdftops + (simular to pdftoppm). Switching it on (only available if compiled + with + SPLASH_CMYK, because overprint is only in CMYK colorspace showable) + will + use the overprint implementation in splash also if rasterizing + the PDF. + + 3. Overprint implementation in splash + The overprint implementation in splash now uses the better designed + interface of xpdf and therefore now also works in transparency groups. + Thanks to the developper team of xpdf. I just fixed a small bug in it, + where it defies the technical specification. Of course it is still in + the nature of the splash implementation that it fails if CMYK values + should overprint spot colors, because spot colors are converted + immediately in their CMYK alternates. And in the implementation of + overprinting spot colors over CMYK colors I made a small assumption to + get it running which causes undesired results if this assumption + fails, + but I didn't want to implement more and more configuration switches. I + still plan to implement a DeviceN output in splash and make a complete + implementation there, but this is of course a bigger task (but + doable). + The overprint switch in pdftoppm is still only available if compiled + with the SPLASH_CMYK directive. + + poppler/PSOutputDev.cc | 67 ++++++++++-- + poppler/PSOutputDev.h | 3 +- + poppler/SplashOutputDev.cc | 62 ++++++++++-- + poppler/SplashOutputDev.h | 4 +- + splash/Splash.cc | 70 +++++++++---- + splash/Splash.h | 4 +- + splash/SplashState.cc | 5 +- + splash/SplashState.h | 247 + +++++++++++++++++++++++---------------------- + utils/pdftops.cc | 13 +++ + 9 files changed, 308 insertions(+), 167 deletions(-) + +commit b505920db6d3dac58c7e9f4f8917f4c4449b08a0 +Merge: 9250449a a6312817 +Author: Albert Astals Cid +Date: Tue Feb 14 19:18:54 2012 +0100 + + Merge remote-tracking branch 'origin/xpdf303merge' + + Conflicts: + utils/HtmlOutputDev.cc + utils/HtmlOutputDev.h + +commit 9250449aaa279840d789b3a7cef75d06a0fd88e7 +Author: Hib Eris +Date: Sun Feb 12 23:16:41 2012 +0100 + + Improve moc detection when cross compiling + + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 66cf1fdb3ba6894f61d9078f5c30046b464347ae +Author: Pino Toscano +Date: Sun Feb 12 22:27:58 2012 +0100 + + qt4: remove non-existing 'qt' include dirs + + qt4/demos/Makefile.am | 1 - + qt4/src/Makefile.am | 1 - + qt4/tests/Makefile.am | 1 - + 3 files changed, 3 deletions(-) + +commit 53d8fc4d2978b70e8926e3df71facd1f39de9348 +Author: Pino Toscano +Date: Sun Feb 12 17:36:55 2012 +0100 + + man pages: fix minor issues with hypens and % + + utils/pdfseparate.1 | 6 +++--- + utils/pdftocairo.1 | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit a63128179c65b5d9d6d9d41fa601a593b0a05d94 +Author: Thomas Freitag +Date: Thu Feb 9 22:02:52 2012 +0100 + + [xpdf303] Fix merge issue + + utils/pdftoppm.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cd5a6a4d02e579e543067d1847164aff90363f16 +Author: Thomas Freitag +Date: Thu Feb 9 22:01:42 2012 +0100 + + [xpdf303] Fix merge bug + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 597fa37cacec928c40d0491174ce843fe01f26d9 +Author: Igor Slepchin +Date: Wed Feb 8 19:22:13 2012 -0500 + + Close li tags in generated outlines. + + Also, add newlines after ul tags for better readability. + Bug #45807 + (cherry picked from commit bf81250ff7d0968852fc7559fafb6389cd695b91) + + utils/HtmlOutputDev.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 2fc36dba5f63703896722adb5127896e4c2840e7 +Author: Igor Slepchin +Date: Thu Feb 9 00:15:13 2012 +0100 + + Get rid of static data members; merge duplicated jpeg dumping code. + + HtmlPage::pgNum is never used; + imgNum is always equal to imgList->getLength()+1 + imgList is now maintained in HtmlPage. + + utils/HtmlOutputDev.cc | 143 + +++++++++++++++++++------------------------------ + utils/HtmlOutputDev.h | 15 ++++-- + 2 files changed, 65 insertions(+), 93 deletions(-) + +commit f655efe327ddd3b6a68353a62589d4e4f8a318a8 +Author: Albert Astals Cid +Date: Wed Feb 8 23:58:27 2012 +0100 + + Fix memory leak when using HtmlOutputDev::mapEncodingToHtml + + Bug #45805 + (cherry picked from commit 53a0c2043dfd56f6da7780f1a049f75af368b84b) + + utils/HtmlOutputDev.cc | 47 + ++++++++++++++++++++++++----------------------- + utils/HtmlOutputDev.h | 7 ++++--- + 2 files changed, 28 insertions(+), 26 deletions(-) + +commit 68f02d19c571fce956c7f4af6ccd0ff9ba8b1b03 +Author: Albert Astals Cid +Date: Wed Feb 8 23:47:46 2012 +0100 + + Fix leak in pdftohtml getInfoString + + Bug #45805 + (cherry picked from commit 4afe4d827a342a847e8b89aba5b4164ed3b4cc32) + + utils/pdftohtml.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 2b7ba166c28e32653db4ae7acf90e06e0dd5975b +Author: Albert Astals Cid +Date: Wed Feb 8 19:12:52 2012 +0100 + + [xpdf303] Compile fixes + + poppler/GlobalParamsWin.cc | 2 +- + poppler/SplashOutputDev.cc | 10 ---------- + 2 files changed, 1 insertion(+), 11 deletions(-) + +commit b8c9b179c9491cf6755b07bfdec4174e78b7d241 +Author: Albert Astals Cid +Date: Mon Feb 6 19:55:07 2012 +0100 + + [xpdf303] Adapt better to what we did and what xpdf303 does + + poppler/ArthurOutputDev.cc | 1 - + poppler/GlobalParams.cc | 10 ---------- + poppler/GlobalParams.h | 1 - + poppler/SplashOutputDev.cc | 3 --- + poppler/SplashOutputDev.h | 1 - + splash/SplashFTFont.cc | 40 + +++++++++++++++++++--------------------- + splash/SplashFTFont.h | 1 - + splash/SplashFTFontEngine.cc | 7 +++---- + splash/SplashFTFontEngine.h | 5 ++--- + splash/SplashFontEngine.cc | 3 +-- + splash/SplashFontEngine.h | 1 - + utils/pdftoppm.cc | 2 +- + 12 files changed, 26 insertions(+), 49 deletions(-) + +commit ea6bc19564865e04431d9154802ae7fba975a716 +Merge: e17f0956 92ce79f4 +Author: Albert Astals Cid +Date: Mon Feb 6 01:18:25 2012 +0100 + + Merge branch 'master' into xpdf303merge + + Conflicts: + poppler/CairoOutputDev.cc + poppler/CairoOutputDev.h + poppler/FontInfo.cc + poppler/GfxFont.cc + poppler/GfxState.cc + poppler/GlobalParams.cc + poppler/GlobalParams.h + poppler/Lexer.cc + +commit e17f09563276ee25b6acfc127b6ea360da650030 +Author: Albert Astals Cid +Date: Mon Feb 6 00:25:53 2012 +0100 + + [xpdf303] TextOutputDev and associated changes + + cpp/poppler-page.cpp | 10 +- + glib/poppler-page.cc | 5 +- + poppler/ArthurOutputDev.cc | 1 + + poppler/CairoOutputDev.cc | 2 +- + poppler/Gfx.cc | 6 +- + poppler/PSOutputDev.cc | 6 +- + poppler/TextOutputDev.cc | 360 + ++++++++++++++++++++++++++++----------------- + poppler/TextOutputDev.h | 18 ++- + qt4/src/poppler-page.cc | 12 +- + test/perf-test.cc | 2 +- + utils/pdftotext.1 | 4 + + utils/pdftotext.cc | 10 +- + 12 files changed, 270 insertions(+), 166 deletions(-) + +commit 548648bf29dc1551443eb1925814342e7aadee46 +Author: Albert Astals Cid +Date: Sun Feb 5 23:08:44 2012 +0100 + + [xpdf303] Merge PDFDoc encryption related code + + poppler/PDFDoc.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 6ee907f291427b8751a872b31210bf32e8d2b722 +Author: Albert Astals Cid +Date: Sun Feb 5 22:57:25 2012 +0100 + + [xpdf303] More merges from Thomas, basically PSOutputDev and some + other small stuff + + poppler/GfxFont.cc | 4 +- + poppler/GlobalParams.cc | 95 ++- + poppler/GlobalParams.h | 18 +- + poppler/GlobalParamsWin.cc | 16 +- + poppler/Hints.cc | 2 +- + poppler/PSOutputDev.cc | 1814 + ++++++++++++++++++++++--------------------- + poppler/PSOutputDev.h | 51 +- + poppler/Parser.cc | 13 +- + poppler/Parser.h | 7 +- + poppler/PreScanOutputDev.cc | 70 +- + poppler/PreScanOutputDev.h | 16 +- + poppler/XRef.cc | 91 ++- + poppler/XRef.h | 3 +- + utils/pdftops.cc | 2 +- + 14 files changed, 1231 insertions(+), 971 deletions(-) + +commit 92ce79f47f929392f48737612a9690088573f63d +Author: Igor Slepchin +Date: Sun Feb 5 15:55:39 2012 +0100 + + Proper unicode support when dumping PDF outline. + + Also use of already existing Outline class rather than parsing the + outline anew. + + Bug 45572 + (cherry picked from commit 40f7289ab04787734b856c53d5c0139445b52635) + + Conflicts: + + utils/HtmlOutputDev.cc + + utils/HtmlOutputDev.cc | 197 + ++++++++++++++++++++++++++----------------------- + utils/HtmlOutputDev.h | 6 +- + utils/pdftohtml.cc | 3 +- + 3 files changed, 112 insertions(+), 94 deletions(-) + +commit 38ec58ed1cb54722aece875287b847643aa2c4b8 +Author: Adrian Johnson +Date: Sat Feb 4 17:13:30 2012 +1030 + + Lexer: convert integer to real when overflow occurs + + Bug 45605 + + poppler/Lexer.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit df89de61b7d01f0f816e773cdb809faa3053e962 +Author: Hib Eris +Date: Tue Jan 31 20:01:30 2012 +0100 + + glib: Exclude poppler-private.h from introspection files + + Fixes bug #45455. + + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 88cb6d9360bc943fc2cdda262dc46bf831641541 +Author: Carlos Garcia Campos +Date: Sat Feb 4 12:04:03 2012 +0100 + + glib: Update gtk-doc makefile and m4 file + + gtk-doc.make | 112 + +++++++++++++++++++++++++++++++++------------------------- + m4/gtk-doc.m4 | 6 ++++ + 2 files changed, 70 insertions(+), 48 deletions(-) + +commit 3f4164f84bbf748a2f919741669ef20db0fbda9f +Author: Hib Eris +Date: Wed Feb 1 10:44:17 2012 +0100 + + gtk-doc: Fix build when builddir != srcdir + + Bug #45549. + + glib/reference/Makefile.am | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 8daeb82f982eba25fe8c7d07358f0a6593ddc89a +Author: Hib Eris +Date: Thu Feb 2 13:01:45 2012 +0100 + + gtk-doc: Fix API documentation for poppler_page_free_annot_mapping() + + Remove reference to non existent method poppler_annot_free() and use + ref/unref instead of copy/free. + + Bug #45549. + + glib/poppler-page.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f8ce9966e4f480949799a26c01bd861f4011b587 +Author: Carlos Garcia Campos +Date: Sat Feb 4 11:51:34 2012 +0100 + + gtk-doc: Remove reference to non existent method poppler_layer_free() + + Bug #45549. + + glib/poppler-document.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit f58f3525f135bc47e89c23c33e96e43db10d4853 +Author: Hib Eris +Date: Thu Feb 2 15:59:47 2012 +0100 + + gtk-doc: Add more glib API documentation for poppler-document + + Fixes several gtk-doc warnings. + + Bug #45549. + + glib/poppler-document.h | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 080247f6a47bc929b25f6e000f4474801af74b1f +Author: Hib Eris +Date: Thu Feb 2 15:45:37 2012 +0100 + + gtk-doc: remove references to removed pixbuf functions + + Bug #45549. + + glib/poppler-page.cc | 6 ++---- + glib/reference/poppler-sections.txt | 4 ---- + 2 files changed, 2 insertions(+), 8 deletions(-) + +commit 47780d9ed1fd69068fdb9b9782e2cb37e2a5b217 +Author: Hib Eris +Date: Thu Feb 2 15:43:30 2012 +0100 + + gtk-doc: do not build doc for glib-demo + + Fixes glib-demo symbols in poppler-unused.txt + + Bug #45549. + + glib/reference/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e320f335cc6e54c60bd2436799dd1f05beb060ba +Author: Hib Eris +Date: Sat Feb 4 11:32:50 2012 +0100 + + gtk-doc: Fix typo's + + Bug #45549. + + glib/poppler-annot.cc | 6 +++--- + glib/poppler-annot.h | 2 +- + glib/poppler-document.cc | 2 +- + glib/poppler-media.cc | 2 +- + glib/poppler-page.cc | 3 +-- + glib/poppler-page.h | 4 ++-- + glib/reference/poppler-sections.txt | 4 +++- + 7 files changed, 12 insertions(+), 11 deletions(-) + +commit 1fe27b07975e9a9455708563118fb73cce696f81 +Author: Hib Eris +Date: Tue Jan 31 12:49:01 2012 +0100 + + cairo: Remove unused variable in CairoFontEngine.cc + + Fixes bug #45442. + + poppler/CairoFontEngine.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit e3d80c79815ce46daf3c3f2b944f49eaf19bfea5 +Author: Hib Eris +Date: Tue Jan 31 14:42:04 2012 +0100 + + Fix return value of downscale_box_filter() + + Fixes bug #45441. + + poppler/CairoRescaleBox.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e074e526fa206403b84da5ce0f27d7357223c7ac +Author: Hib Eris +Date: Tue Jan 31 13:02:16 2012 +0100 + + Fix return value of poppler_attachment_save + + Fixes bug #45440. + + glib/poppler-attachment.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bc389cff91c350d7da186d4cf707c389c77bbc29 +Author: Hib Eris +Date: Tue Jan 31 14:03:08 2012 +0100 + + glib-demo: Do not use deprecated gtk_dialog_set_has_separator() + + Bug #45439 + + glib/demo/main.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit e52e3c24663edaa630d9187e832223b474b74089 +Author: Hib Eris +Date: Tue Jan 31 13:39:05 2012 +0100 + + glib-demo: Do not use deprecated GtkComboBox API + + Bug #45439. + + glib/demo/annots.c | 6 ++++++ + glib/demo/print.c | 9 ++++++++- + glib/demo/render.c | 16 ++++++++++++++++ + glib/demo/selections.c | 8 ++++++++ + 4 files changed, 38 insertions(+), 1 deletion(-) + +commit 165ab4ec122d0e1a6f30dcfba80aefc422cd83b7 +Author: Hib Eris +Date: Tue Jan 31 12:15:51 2012 +0100 + + Fix build for builddir != srcdir + + Fixes bug #45434. + + glib/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e424a13bb516464d59ad76fd0933e92f3307b21b +Author: Thomas Freitag +Date: Fri Feb 3 00:12:10 2012 +0100 + + pdfseparate fixes by Thomas after his last commit + + poppler/PDFDoc.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 4fcd42cfa4424992cd4b36af38bc6230ce0706c9 +Author: Albert Astals Cid +Date: Wed Feb 1 22:53:03 2012 +0100 + + [xpdf303] More merges from Thomas (with minor fixes from me) + + Basically fonts related and some other small stuff + + poppler/Annot.cc | 6 +- + poppler/ArthurOutputDev.cc | 47 +-- + poppler/CMap.cc | 153 ++++++++ + poppler/CMap.h | 16 + + poppler/CairoFontEngine.cc | 43 +-- + poppler/CharCodeToUnicode.h | 1 + + poppler/FontInfo.cc | 8 +- + poppler/Gfx.cc | 363 +++++++++++-------- + poppler/GfxFont.cc | 831 + +++++++++++++++++++++++++++++--------------- + poppler/GfxFont.h | 34 +- + poppler/GfxState.cc | 81 +++-- + poppler/GfxState.h | 2 + + poppler/GlobalParams.cc | 738 ++++++++++++++++++++++----------------- + poppler/GlobalParams.h | 112 +++--- + poppler/GlobalParamsWin.cc | 180 ++++++++-- + poppler/PSOutputDev.cc | 591 +++++++++++++++---------------- + poppler/PSOutputDev.h | 12 +- + poppler/PreScanOutputDev.cc | 10 +- + poppler/SplashOutputDev.cc | 59 ++-- + poppler/XRef.cc | 16 +- + 20 files changed, 2008 insertions(+), 1295 deletions(-) + +commit 0089357de8ea96f3e394ea9cb37e8182ccf15ae2 +Author: Thomas Freitag +Date: Wed Feb 1 19:17:38 2012 +0100 + + pdfseparate: Produce PDF/X conformant pdf pages if the original PDF + was PDF/X conformant. + + poppler/PDFDoc.cc | 63 + ++++++++++++++++++++++++++++++++++--------------------- + poppler/XRef.cc | 9 +++++++- + poppler/XRef.h | 5 ++++- + 3 files changed, 51 insertions(+), 26 deletions(-) + +commit be62a4f2e7d5db3b6d85d1b3026979f9561e6e15 +Author: Hib Eris +Date: Mon Jan 30 17:07:28 2012 +0100 + + Fix build with latest mingw-w64 headers + + Fixes bug #45407. + (cherry picked from commit 58c17c3a61f18a6808ec9ba37e82734a655090ac) + + glib/poppler-annot.cc | 1 + + glib/poppler-document.cc | 1 + + 2 files changed, 2 insertions(+) + +commit acbc63348ce5e279e4d66ed4f240dc8d61df4e57 +Author: Suzuki Toshiya +Date: Mon Jan 30 20:46:04 2012 +1030 + + pdftocairo/automake: link with lcms + + utils/Makefile.am | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 9548573a16629fecdbd44c9aac8b626ec6f53b81 +Author: Pino Toscano +Date: Mon Jan 30 00:32:52 2012 +0100 + + glib/cmake: various minor introspection improvements + + "port" to CMake of the automake equivalents of + 4765c3289635fe4fb006e7df4f83d7056eb42855 + + glib/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +commit bf2ffb1cc76bcf569419ac495f524c41bb6f1650 +Author: Pino Toscano +Date: Mon Jan 30 00:21:31 2012 +0100 + + cmake: support $(gir_name)_EXPORT_PACKAGES for g-ir-scanner + + cmake/modules/GObjectIntrospectionMacros.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +commit cbe7131e63c5896010e7e1ad5c0c3aa91611704d +Author: Albert Astals Cid +Date: Fri Jan 27 00:36:18 2012 +0100 + + Set OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG if you have it + + Fixes/workarounds bug 43414 with openjpeg 1.5 (unreleased) + (cherry picked from commit de6415af1a39ec7dfa4f149c6c5e311b86352cec) + + cmake/modules/FindLIBOPENJPEG.cmake | 13 +++++++++++++ + config.h.cmake | 3 +++ + configure.ac | 8 ++++++++ + poppler/JPEG2000Stream.cc | 7 ++++++- + 4 files changed, 30 insertions(+), 1 deletion(-) + +commit 641526d1a7e8032ea8f7b8ac42c5ad8c20448d9b +Author: Adrian Johnson +Date: Wed Jan 25 22:44:27 2012 +1030 + + jpeg: set image parameters after jpeg_set_defaults() + + so the resolution does not get overwritten by the defaults. + + The libjpeg documentation for jpeg_set_defaults() states: "This + routine sets all JPEG parameters to reasonable defaults, using only + the input image's color space (field in_color_space, which must + already be set in cinfo)" + + Bug 45224 + + goo/JpegWriter.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit f7356a88fe983c2ddd7d5a50400768310a26c4d2 +Author: Adrian Johnson +Date: Thu Jan 26 11:33:28 2012 +1030 + + glib: add section in docs for new symbols in 0.18 + + glib/reference/poppler-docs.sgml | 4 ++++ + 1 file changed, 4 insertions(+) + +commit b42c171de93dba56859beb21cfe5312d825fedd6 +Author: Alexander Saprykin +Date: Mon Jan 23 22:07:15 2012 +0100 + + Do not use 50Kb of stack in SplashXPath::addCurve + + Bug 44905 + + splash/SplashXPath.cc | 69 + ++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 49 insertions(+), 20 deletions(-) + +commit a04fca6266bda6d04068f38f16fe492cb6b8677b +Author: Adrian Johnson +Date: Sat Jan 21 09:41:12 2012 +1030 + + cairo: use fabs when comparing the transformed line width + + as the transform may cause a negative width. + + Bug 43441 + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ce1b6c7ca16847f07eeafc29c6503be6fa5a9a3d +Author: Patrick Pfeifer +Date: Thu Jan 19 14:54:48 2012 +0100 + + cairo: Fix test for rotation + + Fixes bug #14619. + + poppler/CairoOutputDev.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 4765c3289635fe4fb006e7df4f83d7056eb42855 +Author: Evan Nemerson +Date: Sun Jan 15 11:02:50 2012 -0800 + + glib: various minor introspection and documentation improvements + + Bug 44790 + + glib/Makefile.am | 4 +++- + glib/poppler-annot.cc | 8 ++++---- + glib/poppler-attachment.h | 7 ++++--- + glib/poppler-document.cc | 6 ++++-- + glib/poppler-media.h | 7 ++++--- + glib/poppler-page.cc | 23 +++++++++++++++-------- + 6 files changed, 34 insertions(+), 21 deletions(-) + +commit e8e42988c5cebab2ffa5fe020f30a3a645e90b5f +Author: Adrian Johnson +Date: Mon Jan 16 21:25:19 2012 +1030 + + cairo: ensure paintTransparencyGroup uses same ctm as + beginTransparencyGroup + + Bug 29968 + + poppler/CairoOutputDev.cc | 8 ++++++-- + poppler/CairoOutputDev.h | 1 + + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit f6c7aa752f9455bba1aa3c72e0998e7911c1d43e +Author: Adrian Johnson +Date: Wed Jan 18 21:19:43 2012 +1030 + + configure.ac: print the glib version required if not found + + configure.ac | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 100488ec7db2d1f3e25bfda42c1603ca86696195 +Author: Adrian Johnson +Date: Sun Jan 15 23:52:28 2012 +1030 + + cairo: restore temporary clip used in CairoOutputDev::fill when + painting a mask + + The clip is only used to clip the paint to the fill path so it should + be moved inside the save/restore. + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9c092e17e8f0cf0335b431a223e6e44bddc27e64 +Author: Albert Astals Cid +Date: Sun Jan 15 23:28:51 2012 +0100 + + [xpdf] More Splash and Gfx changes from Thomas + + 1. merge of blend changes + Here I had not only merged the changed in blend modes, I made also + a few + changes in the SPLASH_CMYK area, so that the already sent PDF now also + be rendered correctly with the -jpegcmyk option + 2. merge of font handling in SplashOutputDev.cc + There were a few changes left in font handling, I took them over + 3. merge of getcolor-changes + The getcolor changes win a price for well defined C++ code. I wouldn't + have merged them, if there were not a lot of other things to merge. + 4. merge of image handling in SplashOutputDev.cc + I merged the left changes in image handling including colorizing masks + in pattern colorspace + 5. cleanup of overprint + I tested the overprint implementation of Derek. They succeed only + in 70 + % percent of the PDF where my solution had success, but Derek's + solution + is much cleaner, and I'm sure that I could also fix the rest in + it. BUT: + as I already considered, when I implemented overprint, there are some + overprint situations, which can not be solved in a CMYK colorspace, we + have to implement a DeviceN colorpace when also overprint from CMYK + colors over spot colors should work. Therefore I decided to remove my + overprint implementation completely from the code and let Derek's + solution in, even if there could be done some enhancements in it. + 6. colorizing text in pattern colorspace + When I saw Derek's implementation with a clean interface only at one + place in Gfx.cc, I first was very surprised. My solution had a lot of + places in Gfx.cc, where I looked if the current colorspace is + a pattern + colorspace. Therefore I first had a look into the PDF specification + again, and really, it can be done in the way of Derek. Therefore I + merged it and removed the fragments of my code. + + On this step I started a regtest against the version after the fourth + patch. There were a lot of enhancements, especially in texts with + symbolic chars like mathematical and so on, but there was one + (and ONLY + one) regression, shown in bug-poppler27482.pdf + I examined that (that is also the reason for the delay) and + encountered + that on merging I removed my solution for this bug, therefore + + 7. insert enhancements for colorizing masks in pattern colorspace + I adapt the bug fix from bug 27482 to the merge. + + poppler/CairoOutputDev.cc | 101 ++-- + poppler/CairoOutputDev.h | 21 +- + poppler/Gfx.cc | 705 +++++++++++++++----------- + poppler/Gfx.h | 22 +- + poppler/GfxState.cc | 208 +++++--- + poppler/GfxState.h | 37 +- + poppler/GlobalParams.cc | 17 + + poppler/GlobalParams.h | 3 + + poppler/OutputDev.cc | 13 +- + poppler/OutputDev.h | 25 +- + poppler/PSOutputDev.cc | 87 ++-- + poppler/PSOutputDev.h | 21 +- + poppler/PreScanOutputDev.cc | 2 +- + poppler/SplashOutputDev.cc | 1179 + +++++++++++++++++++++---------------------- + poppler/SplashOutputDev.h | 80 +-- + poppler/TextOutputDev.cc | 8 + + poppler/TextOutputDev.h | 8 + + splash/Splash.cc | 11 +- + splash/Splash.h | 122 ++--- + splash/SplashPattern.cc | 14 - + splash/SplashPattern.h | 7 - + utils/pdftoppm.cc | 1 + + 22 files changed, 1390 insertions(+), 1302 deletions(-) + +commit 69df13c49cea2390f2c5036f3d450f134f7a2656 +Author: Thomas Freitag +Date: Sun Jan 15 15:07:18 2012 +0100 + + Fix stack overflow in PDFDoc::markObject() + + Bug 44660 + + poppler/PDFDoc.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit cdb56567c60b492ad08befff54f2ff70620b86fe +Author: Thomas Freitag +Date: Sun Jan 15 15:04:51 2012 +0100 + + Correctly initialize globalParams + + utils/pdfseparate.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 4e205a6625431dcf95375de009b4354746a4f0b7 +Author: Adrian Johnson +Date: Sun Jan 15 22:18:30 2012 +1030 + + parseargs: don't use arg->size with GooString argument + + 40b56994 added GooString arguments but incorrectly used arg->size as + the string length. arg->size is always 0 for GooString arguments. This + worked because the arg->size - 1 string length passed to + GooString::Set() just happened to be the the same value as the + CALC_STRING_LEN default argument indicating the string length is to be + calculated with strlen. + + utils/parseargs.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit a7210a7ebc3d3ca88643bfbc2f0d660a5553a668 +Author: Arseny Solokha +Date: Fri Jan 13 18:52:17 2012 +0100 + + Properly initialize globalParams + + Bug 44659 + + utils/pdfunite.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit baaf93f0e47a1978f9ea80e9394543a25b763d77 +Author: Adrian Johnson +Date: Thu Jan 12 01:05:07 2012 +1030 + + configure.ac: print the cairo version required if not found + + Bug 44619 + + configure.ac | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 9b8b4232587831fdada37de033c272a3c5049c34 +Author: Adrian Johnson +Date: Thu Jan 12 00:26:03 2012 +1030 + + cairo: avoid setting huge clip area when printing + + Bug 44002 + + poppler/CairoOutputDev.cc | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +commit efe115f22f8f00a2863ef265ad6f4e7cc2e0336c +Author: Albert Astals Cid +Date: Tue Jan 10 23:41:54 2012 +0100 + + compile + + poppler/ArthurOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 52d190d8ff962a57a59218f6871c3a63a443ea53 +Author: Albert Astals Cid +Date: Tue Jan 10 23:33:40 2012 +0100 + + [xpdf303] tiling "merges" from Thomas, using mostly our "old" code + instead of xpdf's + + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 4 ++-- + poppler/Gfx.cc | 45 + +++++++++++++++++++++++++++++++++------------ + poppler/Gfx.h | 15 +++++++++------ + poppler/GfxState.cc | 5 ++++- + poppler/GfxState.h | 7 ++++--- + poppler/OutputDev.h | 3 ++- + poppler/PSOutputDev.cc | 2 +- + poppler/PSOutputDev.h | 2 +- + poppler/PreScanOutputDev.cc | 15 +++++++-------- + poppler/PreScanOutputDev.h | 2 +- + poppler/SplashOutputDev.cc | 8 ++++++-- + poppler/SplashOutputDev.h | 3 ++- + splash/Splash.cc | 32 ++++++++++++++++++++++++-------- + utils/ImageOutputDev.cc | 2 +- + utils/ImageOutputDev.h | 2 +- + 16 files changed, 99 insertions(+), 50 deletions(-) + +commit bf75a957650dd5208ecf1f6db1555a3d00b7949c +Author: Albert Astals Cid +Date: Tue Jan 10 23:31:27 2012 +0100 + + [xpdf303] Splash::blitTransparent merges from Thomas + + splash/Splash.cc | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 296244ab74e56b2781daae0a664617d1da30527c +Author: Albert Astals Cid +Date: Tue Jan 10 23:30:34 2012 +0100 + + [xpdf303] Merge xpath Splash stuff from Thomas + + splash/SplashXPath.cc | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +commit e1ae7b900b01db7c7703da68ad94aa9bda1938f6 +Author: Albert Astals Cid +Date: Tue Jan 10 23:29:38 2012 +0100 + + [xpdf303] Merge splash font stuff from Thomas + + poppler/GlobalParams.cc | 17 +++++++++++++++++ + poppler/GlobalParams.h | 3 +++ + poppler/SplashOutputDev.cc | 3 +++ + poppler/SplashOutputDev.h | 1 + + splash/SplashFTFont.cc | 34 ++++++++++++++++++++++++++++------ + splash/SplashFTFont.h | 1 + + splash/SplashFTFontEngine.cc | 7 ++++--- + splash/SplashFTFontEngine.h | 5 +++-- + splash/SplashFontEngine.cc | 3 ++- + splash/SplashFontEngine.h | 1 + + 10 files changed, 63 insertions(+), 12 deletions(-) + +commit d46b673c46a72132fb3918b64733be552e35952f +Author: Albert Astals Cid +Date: Tue Jan 10 23:28:43 2012 +0100 + + [xpdf303] More merges from Thomas + + splash/Splash.cc | 2800 + ++++++++++++++++++++++++++++++++++++------------------ + splash/Splash.h | 60 ++ + 2 files changed, 1943 insertions(+), 917 deletions(-) + +commit 2cb40bab3b8c49d54c2a49554b30268ccb32899b +Author: Adrian Johnson +Date: Sun Jan 8 21:35:41 2012 +1030 + + Fix typo in pdffonts man page + + utils/pdffonts.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 34ae382915d9d9b2b3c015fee3c24907a6b52b8b +Author: Albert Astals Cid +Date: Sat Jan 7 17:14:05 2012 +0100 + + xpdf303: Merge some stuff in Splash [Thomas Freitag] + + 1. merge the complete pipe changes + a) including the overprint implementation from Derek used by pipe + b) including the transfer function implementation + 2. Two changes (not really a merge) to get it compiled under windows + (in + GlobalParams.cc & PDFDoc.cc) + 3. merge fill and stroke changes + a) including merge of SplashClip.cc + b) including merge of SplashXPathScanner.cc + + poppler/GfxState.cc | 94 ++- + poppler/GfxState.h | 17 +- + poppler/GlobalParams.cc | 7 + + poppler/GlobalParams.h | 3 + + poppler/GlobalParamsWin.cc | 2 +- + poppler/PDFDoc.cc | 2 +- + poppler/SplashOutputDev.cc | 134 +++- + poppler/SplashOutputDev.h | 8 +- + splash/Splash.cc | 1658 + ++++++++++++++++++++++++++++++------------ + splash/Splash.h | 42 +- + splash/SplashClip.cc | 57 +- + splash/SplashState.cc | 49 ++ + splash/SplashState.h | 12 + + splash/SplashXPathScanner.cc | 474 +++++++----- + splash/SplashXPathScanner.h | 24 +- + 15 files changed, 1845 insertions(+), 738 deletions(-) + +commit c2378609ae52523beb64e0f040fc79dce4877e03 +Author: Thomas Freitag +Date: Sat Jan 7 11:47:19 2012 +0100 + + regtest: read stderr output before calling wait to fix a possible + deadlock + + In the way the scripts starts it subprocesses, stderr becomes buffered + for the subprocesses. And unforunately, when the buffer limit is + reached, the subprocess suspends it work until it can print again on + stderr. That's why the python script runs into a deadlock when the + subprocess produces a lot of error messages. A small rearrange of the + commands, first read the stderr output and then wait that the + subprocess + ends, will remove this deadlock. + + regtest/backends/__init__.py | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit da6bfacb0f858f27bd47f247a25d6bc9ab778411 +Author: Adrian Johnson +Date: Sat Jan 7 10:35:17 2012 +1030 + + Add -subst option to pdffonts to list the substitute font name + and filename + + Bug 44416 + + poppler/FontInfo.cc | 8 ++++-- + poppler/FontInfo.h | 2 ++ + poppler/GlobalParams.cc | 29 +++++++++++++++++++-- + poppler/GlobalParams.h | 3 ++- + utils/pdffonts.1 | 3 +++ + utils/pdffonts.cc | 67 + +++++++++++++++++++++++++++++++++++-------------- + 6 files changed, 88 insertions(+), 24 deletions(-) + +commit 9979b1b3e36dc8085d8c684692fece463fa474b1 +Author: Yi Yang +Date: Sat Jan 7 09:44:42 2012 +1030 + + Include .otf fonts when finding substitute fonts + + Bug 44412 + + poppler/GfxFont.cc | 2 +- + poppler/GlobalParams.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ebfab832ab4f2642b9ab2ededd25de670a3c7147 +Author: Adrian Johnson +Date: Fri Dec 23 09:55:20 2011 +1030 + + autoconf: Check for cairo-ft and other cairo backends + + so that CAIRO_LIBS includes the freetype dependency and pdftocairo + includes the dependencies for optional cairo backends. + + Bug 43969 + + configure.ac | 14 ++++++++++++-- + utils/Makefile.am | 4 ++-- + 2 files changed, 14 insertions(+), 4 deletions(-) + +commit 51ca2b7c7dec5430d29860fd887ad5c5d9b3f574 +Author: Albert Astals Cid +Date: Thu Dec 15 00:26:09 2011 +0100 + + [xpdf303] Some more changes in TextOutputDev + + poppler/TextOutputDev.cc | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit c5ce12993a4d2bcd3b3e95b1f08d00dc8960678c +Author: Albert Astals Cid +Date: Wed Dec 14 22:49:33 2011 +0100 + + [xpdf303] Merge some stuff from TextOutputDev + + Yes, this is the best commit log i could think of + + poppler/TextOutputDev.cc | 268 + ++++++++++++++++++++++++++++++----------------- + poppler/TextOutputDev.h | 19 ++-- + 2 files changed, 180 insertions(+), 107 deletions(-) + +commit 388d72ac27ae98fe3a1ebd21760f2b0fa0249a9b +Author: Albert Astals Cid +Date: Tue Dec 6 23:21:15 2011 +0100 + + include strings.h as we use memcpy + + Fixes bug 43558 + + goo/PNGWriter.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 743f70f594bf3c9a58d1ff0738b9a2bc3ea03382 +Author: Albert Astals Cid +Date: Tue Dec 6 20:27:03 2011 +0100 + + xpdf303: Use xpdf method against recursion while parsing + + Ours detected loops correctly, but not "valid" files containing lots + of arrays one inside the other [[[[[[[[[[[[[[[[[[[ + So go to this more crude "fix" used in xpdf + + poppler/Dict.cc | 4 ++-- + poppler/Dict.h | 2 +- + poppler/Object.cc | 4 ++-- + poppler/Object.h | 8 ++++---- + poppler/Parser.cc | 32 +++++++++++++++----------------- + poppler/Parser.h | 10 +++------- + poppler/XRef.cc | 33 +++++++-------------------------- + poppler/XRef.h | 2 +- + 8 files changed, 35 insertions(+), 60 deletions(-) + +commit 63c942a45227ef28fb94ef4765171d9812fffafa +Author: Albert Astals Cid +Date: Sun Dec 4 17:29:45 2011 +0100 + + Do not fail if we are trying to save a file with Encrypt but that + we have not modified at all + + Fixes KDE bug #288045 + + poppler/PDFDoc.cc | 49 +++++++++++++++++++++++++++++-------------------- + 1 file changed, 29 insertions(+), 20 deletions(-) + +commit 0937d775e59a963b72fa7924e0f7be484f8345fc +Author: Albert Astals Cid +Date: Sun Dec 4 15:37:20 2011 +0100 + + update name and copyright + (cherry picked from commit 22601c2a64f094ede8085a3ccca3de9daaa556e7) + + utils/pdftocairo.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit bdb439ac5a751d6146204ae0d61fdbf7828c89c3 +Author: Axel Strübing +Date: Thu Nov 24 22:32:57 2011 +0100 + + Fix typo/regression introduced in + f6d026bfa18624ccd321e102bb39ba744998de1e + + poppler/Gfx.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 74e11d8c912dd95d235e44e7b34b8ea1be082b9f +Author: Albert Astals Cid +Date: Thu Nov 24 18:54:27 2011 +0100 + + Fix typo + + qt4/src/poppler-qt4.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ec2a1c3fca92a28c56911729927838f7aacf1078 +Author: Albert Astals Cid +Date: Wed Nov 16 23:13:52 2011 +0100 + + xpdf303: Use the correct sizeof() for the greallocn + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 544440b9d19ce99f3a7fcacdea70999b1efc217f +Author: Albert Astals Cid +Date: Wed Nov 16 23:09:23 2011 +0100 + + xpdf303: Add XRef::getPermFlags + + poppler/XRef.h | 1 + + 1 file changed, 1 insertion(+) + +commit b2e43e531edcecaeacf02a627c98cf7ef57f3e3c +Author: Albert Astals Cid +Date: Wed Nov 16 23:04:04 2011 +0100 + + xpdf303: make strToUnsigned "safer" + + poppler/PDFDoc.cc | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit bd1513742182ed4c80d21401dd30180981879f24 +Author: Albert Astals Cid +Date: Wed Nov 16 22:59:12 2011 +0100 + + xpdf303: Check xrefEntryCompressed entries to be of correct type + and in bounds + + poppler/XRef.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 3bf3e82d1f3eb19a454239d8c7641fc68ff4e462 +Author: Albert Astals Cid +Date: Wed Nov 16 22:54:17 2011 +0100 + + xpdf303: Adobe apparently ignores the generation number on compressed + objects + + poppler/XRef.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 73e6f19c4e76762eb5131b168e3b24167ba126cb +Author: Albert Astals Cid +Date: Wed Nov 16 22:29:11 2011 +0100 + + xpdf303: Add PDFDoc::fileNameU to windows builds + + poppler/PDFDoc.cc | 43 +++++++++++++++++++++++++++++++++++-------- + poppler/PDFDoc.h | 6 ++++++ + 2 files changed, 41 insertions(+), 8 deletions(-) + +commit 65388b1aaf9a78efcf9486d5e2d4bdce76f11194 +Author: Igor Slepchin +Date: Tue Nov 15 21:53:40 2011 +0100 + + Output images in pdftohtml -xml mode if no -i option is specified. + + Comes with an attached update to pdf2xml.dtd + + utils/HtmlOutputDev.cc | 48 + ++++++++++++++++++++++++++++++++++++++++-------- + utils/pdf2xml.dtd | 22 +++++++++++++++++----- + 2 files changed, 57 insertions(+), 13 deletions(-) + +commit a4c78946bc1fc3d52152af2e319051050ab05e28 +Author: Albert Astals Cid +Date: Mon Nov 14 13:22:53 2011 +0100 + + Make GfxColorSpace::parse accept dicts too + + poppler/GfxState.cc | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit f6d026bfa18624ccd321e102bb39ba744998de1e +Author: Albert Astals Cid +Date: Fri Nov 11 16:37:27 2011 +0100 + + Do not crash if failing to parse the colorspace + + Fixes bug 42793 + + poppler/Gfx.cc | 52 +++++++++++++++++++++++++++++----------------------- + 1 file changed, 29 insertions(+), 23 deletions(-) + +commit c9da140bb476dcbb3928950ae9b506de82695cd2 +Author: David King +Date: Thu Oct 20 11:31:10 2011 +0200 + + glib-demo: Conditionally initialise threading + + In GLib 2.24.0 and above, threading is enabled by default, and the + thread initialization functions are deprecated since GLib 2.31.0. + + Fixes bug #42036. + + glib/demo/main.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit a0db250bbdefff6361551cf9db344bd5268fea11 +Author: Vittal Aithal +Date: Wed Nov 9 20:07:58 2011 +0100 + + pdfinfo: report page rotation + + utils/pdfinfo.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit e7dbd17ff07afa465636a90f526cd7ac8c731862 +Author: Kenji Uno +Date: Wed Nov 9 12:39:41 2011 +0100 + + Fix leak in GooString when resizing + + If resizing from "long" to shorter + + goo/GooString.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 6a4f0c32b6723b127034d59a34bf076942e9935f +Author: Carlos Garcia Campos +Date: Sun Nov 6 15:44:06 2011 +0100 + + regtest: Skip tests with results when creating refs + + Not only tests that have md5, but also crashed or failed tests. + + regtest/TestReferences.py | 4 ++-- + regtest/backends/__init__.py | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit eab952d121c7ab88a0d41587cfa449c0978bea04 +Author: Pino Toscano +Date: Thu Nov 3 21:58:11 2011 +0100 + + qt4: remove unused variable + + qt4/src/poppler-embeddedfile.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 85615f04e040dd38792533a4522e437644e97548 +Author: Pino Toscano +Date: Thu Nov 3 16:15:40 2011 +0100 + + qt4: get rid of the own F and Ff flags reading + + no more useful now, as they are available either directly or as + parsed values in both Annot and FormField + + qt4/src/poppler-form.cc | 16 ---------------- + qt4/src/poppler-private.h | 4 +--- + 2 files changed, 1 insertion(+), 19 deletions(-) + +commit 43347b43eeb66b5c8dc9637c36436baacc626bc4 +Author: Pino Toscano +Date: Thu Nov 3 16:10:57 2011 +0100 + + qt4: use the flags of the associated Annot object + + qt4/src/poppler-form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6c9492202de9b3b43da9eac3e40dc7fe218f21da +Author: Pino Toscano +Date: Thu Nov 3 16:03:11 2011 +0100 + + qt4: remove old commented code + + qt4/src/poppler-form.cc | 1 - + 1 file changed, 1 deletion(-) + +commit f0eca54131f7cdf6c1e0e78a18be0bf642567af4 +Author: Pino Toscano +Date: Thu Nov 3 15:46:33 2011 +0100 + + qt4: use the quadding read already in FormField + + ... instead of reading it again + + qt4/src/poppler-form.cc | 24 ++++++++---------------- + 1 file changed, 8 insertions(+), 16 deletions(-) + +commit d92bce1ae87d2f351bb1b972c64466502fb212aa +Author: Pino Toscano +Date: Thu Nov 3 15:30:45 2011 +0100 + + qt4: include + + qt4/src/poppler-private.h | 1 + + 1 file changed, 1 insertion(+) + +commit 955cd0c7bd3a72340deba098f4242a4904adc60f +Author: Albert Astals Cid +Date: Wed Nov 2 20:20:41 2011 +0100 + + Compile with MSVC needed for last change in the qt4 frontend + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit e0f5bc1deebaa9861baffd7c9ba31ea31585cd1d +Author: Hib Eris +Date: Tue Nov 1 14:15:09 2011 +0100 + + qt4: Use PDFDoc(wchar_t *, ...) on Windows + + Bug 35378 + + qt4/src/poppler-document.cc | 6 +++--- + qt4/src/poppler-private.h | 17 +++++++++++++++-- + 2 files changed, 18 insertions(+), 5 deletions(-) + +commit 52c1e9c5109299255d13b5b1e7d3eedaab512084 +Author: Carlos Garcia Campos +Date: Tue Nov 1 14:13:10 2011 +0100 + + regtest: Add --update-refs command line option to run-tests command + + It allows to update the references of failing tests. + + regtest/TestRun.py | 2 +- + regtest/backends/__init__.py | 34 ++++++++++++++++++++++++++++++++-- + regtest/commands/run-tests.py | 4 ++++ + 3 files changed, 37 insertions(+), 3 deletions(-) + +commit b4896a416b1df14a81b944b3c577fec85c9c7f7d +Author: Rex Dieter +Date: Tue Nov 1 09:40:53 2011 +0100 + + Fix pkg-config files + + We were using $FOO_REQUIRED instead of @FOO_REQUIRED@ + + configure.ac | 1 + + poppler-glib-uninstalled.pc.in | 2 +- + poppler-glib.pc.cmake | 2 +- + poppler-glib.pc.in | 2 +- + 4 files changed, 4 insertions(+), 3 deletions(-) + +commit 53f1b0c5edfdbef817bff31566893ac4e111516a +Author: Carlos Garcia Campos +Date: Sun Oct 30 16:02:19 2011 +0100 + + pdftocairo: Make sure beginDocument() is always called + + This fixes a crash when rendering only odd/even pages in a printing + format. + + utils/pdftocairo.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 8b0dfe9537082eaccd982530f1eddc2fcfc92f8e +Author: Albert Astals Cid +Date: Thu Oct 27 19:58:31 2011 +0200 + + xpdf303: Use splashDist instead of splashSqrt and USE_FIXEDPOINT + enhacements + + splash/SplashFTFont.cc | 70 + +++++++++++++++++++++++++++++++++++++++++++++----- + splash/SplashFTFont.h | 2 +- + 2 files changed, 65 insertions(+), 7 deletions(-) + +commit b021bce2583c8e1e3a4c129106d80e7a4e223600 +Author: Albert Astals Cid +Date: Thu Oct 27 19:54:22 2011 +0200 + + xpdf303: wops, make it compile + + poppler/Lexer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 76295f4d401c36bdef3b2a20d18ac57a3b976410 +Author: Albert Astals Cid +Date: Thu Oct 27 19:42:42 2011 +0200 + + xpdf303: Adopt xpdf solution for the name too long problem + + poppler/Lexer.cc | 37 +++++++++++++++++-------------------- + 1 file changed, 17 insertions(+), 20 deletions(-) + +commit be6d4c19b8ce1515ce995eee408dc5752012c649 +Author: Albert Astals Cid +Date: Thu Oct 27 19:34:38 2011 +0200 + + xpdf303: Add brackets + + poppler/Lexer.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 904ae1385e93155a55008977c89aa664b7c8cb9b +Author: Albert Astals Cid +Date: Wed Oct 26 14:22:28 2011 +0200 + + Expose POPPLER_VERSION in poppler-config.h + + configure.ac | 3 +++ + poppler/poppler-config.h.cmake | 5 +++++ + poppler/poppler-config.h.in | 5 +++++ + 3 files changed, 13 insertions(+) + +commit aa83d4fe942ef0685c5990ddf3eccc2fbdf82292 +Author: Albert Astals Cid +Date: Thu Oct 20 00:59:57 2011 +0200 + + xpdf303: Add readFromStream + + poppler/GfxFont.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 74d771d58a4d1868669117709eb6811ec28bf840 +Author: Albert Astals Cid +Date: Thu Oct 20 00:56:58 2011 +0200 + + xpdf303: Add base14SubstFonts + + poppler/GfxFont.cc | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit 71260f987161d5b122caced6af14e9d64be46e4d +Author: Albert Astals Cid +Date: Thu Oct 20 00:55:42 2011 +0200 + + xpdf303: GfxFontLoc implementation + + poppler/GfxFont.cc | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit 586430137985fd303ce87bdb9b902ee9a01341e8 +Author: Albert Astals Cid +Date: Thu Oct 20 00:54:09 2011 +0200 + + xpdf303: More stuff into base14FontMap + + poppler/GfxFont.cc | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +commit c0affb1845c339f89ca67608cb9fd9134ff902f5 +Author: Albert Astals Cid +Date: Thu Oct 20 00:51:31 2011 +0200 + + xpdf303: GfxFont::getOrignName/getName rework + + poppler/FontInfo.cc | 4 ++-- + poppler/GfxFont.cc | 4 ---- + poppler/GfxFont.h | 6 +----- + poppler/PSOutputDev.cc | 8 ++++---- + poppler/TextOutputDev.cc | 5 ++--- + 5 files changed, 9 insertions(+), 18 deletions(-) + +commit c5c513b5b72e03f6f0a94d04f7d8a22fe9bdaa80 +Author: Albert Astals Cid +Date: Thu Oct 20 00:45:30 2011 +0200 + + xpdf303: GfxFontLoc + + poppler/GfxFont.h | 35 +++++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) + +commit 4ec5e5e6d4785eb7a60744ae7e33c7ba3f603e8e +Author: Albert Astals Cid +Date: Thu Oct 20 00:34:10 2011 +0200 + + xpdf303: StdFontMapEntry renaming + + poppler/GfxFont.cc | 26 +++++++++++--------------- + poppler/GfxFont.h | 2 ++ + 2 files changed, 13 insertions(+), 15 deletions(-) + +commit e71088dc5087303b1ae5f3e72af287ec4e0a1342 +Author: Albert Astals Cid +Date: Mon Oct 17 13:42:06 2011 +0200 + + remove useless #if + + poppler/Page.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 40b56994dda79653c902977423f349efa55cf21e +Author: Adrian Johnson +Date: Mon Oct 17 20:33:03 2011 +1030 + + utils: Add GooString arg to parseargs and use for paths in pdftocairo + + and MAXPATHLEN is not available on windows. Avoid the + need to know the max path length by using GooString for the path. + + utils/parseargs.cc | 12 ++++++++++++ + utils/parseargs.h | 2 ++ + utils/pdftocairo.cc | 17 ++++++++--------- + 3 files changed, 22 insertions(+), 9 deletions(-) + +commit 4bb34757dbbff780baba053371274c05b29771e1 +Author: Adrian Johnson +Date: Mon Sep 19 21:11:44 2011 +0930 + + cairo: fix setSoftMask bugs + + - Getting the clip extents in device space requires transforming all + four corners of the clip extents and translating by the group device + offset other wise the device extents will not be correct for rotated + ctm. + + - Adjust matrix to include translation of the clip extents origin + since the mask surface does not start at (0,0). + + - the ctm when called cairo_mask() needs to be the same as the + ctm when + the mask was created. + + - implement transfer function in setSoftMask + + Bug 41005 + + poppler/CairoOutputDev.cc | 97 + +++++++++++++++++++++++++++++------------------ + poppler/CairoOutputDev.h | 6 ++- + 2 files changed, 65 insertions(+), 38 deletions(-) + +commit 50adbed183e9bf70eb4c41e8858cf464c3042e45 +Author: Carlos Garcia Campos +Date: Sun Oct 16 12:40:27 2011 +0200 + + Remove poppler-cairo dependency from poppler-glib pkg-config file + + poppler-glib links to poppler-cairo statically, so it doesn'tm + depend on + the dynamic library. + + CMakeLists.txt | 1 - + configure.ac | 2 -- + poppler-glib-uninstalled.pc.in | 2 +- + poppler-glib.pc.cmake | 2 +- + poppler-glib.pc.in | 2 +- + 5 files changed, 3 insertions(+), 6 deletions(-) + +commit acd8ecc9121db58851f73764f046a4f54bd80581 +Author: Adrian Johnson +Date: Sat Oct 8 15:03:24 2011 +1030 + + ps: fix uncolored tiling patterns + + Uncolored patterns and type 3 chars must not use color setting + operators. When emitting an uncolored pattern: + - disable the update color space functions + - disable the update color functions + - set pdfLastFill and pdfLastStroke to true to ensure the the sCol + and fCol procedures that is used by some of the PS procedures that + emulate PDF operators do not update the color. + + Bug 41462 + + poppler/PSOutputDev.cc | 41 +++++++++++++++++++++++++++++++++++++++++ + poppler/PSOutputDev.h | 1 + + 2 files changed, 42 insertions(+) + +commit 6e1326b11f98f2b277e53a6cdbcb373ce6c29958 +Author: Adrian Johnson +Date: Fri Oct 7 20:29:36 2011 +1030 + + ps: emit non repeating patterns in PSOutput with inType3Char = true + + instead of falling back to Gfx. This avoids emitting the image data + twice. + + poppler/PSOutputDev.cc | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +commit ed05fcb8c442b716c5e382c98f2625701926c86a +Author: Adrian Johnson +Date: Sat Oct 1 20:19:19 2011 +0930 + + ps: fix tiling pattern fill matrix + + In PS the pattern matrix maps the pattern space to user space. In PDF + the pattern matrix maps the pattern space to the default ctm of the + content stream (baseMatrix in Gfx). The matrix mat already contains + the + correct pattern->baseMatrix so use it instead of pmat. + + Bug 41374 + + poppler/PSOutputDev.cc | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit 087757866de13b6164967a1d241d3c0e47065f1a +Author: Albert Astals Cid +Date: Thu Oct 13 12:18:52 2011 +0200 + + xpdf303: Merge SplashT1Font::getGlyphPath changes + + splash/SplashT1Font.cc | 39 +++++++++++++++++++++------------------ + 1 file changed, 21 insertions(+), 18 deletions(-) + +commit c84f46ee16a8dcc6e2cad2359df621cc6cdb8fa5 +Author: Albert Astals Cid +Date: Thu Oct 13 12:16:14 2011 +0200 + + xpdf303: Add GBool type1 to SplashFTFontFile + + splash/SplashFTFontFile.cc | 9 +++++---- + splash/SplashFTFontFile.h | 3 ++- + 2 files changed, 7 insertions(+), 5 deletions(-) + +commit d845da2c3c1acbeaa4b9bb3125f9143e785210ff +Author: Yury G. Kudryashov +Date: Thu Oct 6 14:49:19 2011 +0200 + + Okular moved to git, fix docs + + Fix URLs in poppler-qt4 documentation + + qt4/src/Mainpage.dox | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit bb40c980f7ab7a6eb9735af17103f87bc65893d6 +Author: Yury G. Kudryashov +Date: Thu Oct 6 14:49:08 2011 +0200 + + Explicitly include fontconfig include dir + + This fixes cmake-driven build on systems where fontconfig is + installed in + non-standard location. + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 776ca137984556530ba938265714934bdc3d6443 +Author: Yury G. Kudryashov +Date: Thu Oct 6 14:48:46 2011 +0200 + + Fix typo in cmake option documentation + + Relocatable build does *not* (was missing in docs) hardcode library + location. + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab8616dcb637ac1aeb4d5f142c3c4bff9aecd041 +Author: Adrian Johnson +Date: Thu Oct 6 14:21:10 2011 +0200 + + close the file or flush stdout + + utils/pdftocairo.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 72c2d563684ab6937a98a0c1c79be3639d29c9ce +Author: Albert Astals Cid +Date: Tue Oct 4 17:46:11 2011 +0200 + + xpdf303: Make sure array length is > 0 + + This is not scritcly necessary since Array::get already returns a + null object in case + the index is out of range but let's merge it for the sake of being + more closer to xpdf + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c814c2452c7f60623fdd0fee6f915adeaf5b49e3 +Author: Albert Astals Cid +Date: Tue Oct 4 17:40:27 2011 +0200 + + xpdf303: Limit recursion in GfxColorSpace parsing + + I think we could do it better, but it'd take more time and it's not + what we are doing in this branch anyway + + poppler/GfxState.cc | 43 +++++++++++++++++++++++++++---------------- + poppler/GfxState.h | 14 +++++++------- + 2 files changed, 34 insertions(+), 23 deletions(-) + +commit 0e53ba5709296dc2ba1399f885af200d2041f0cd +Author: Glad Deschrijver +Date: Sat Oct 1 15:41:51 2011 +0200 + + qt4: Add the option of PSConverter creating EPS + + qt4/src/poppler-ps-converter.cc | 3 ++- + qt4/src/poppler-qt4.h | 6 ++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit 04e271a0c10807c9c3967daa1f656e87b97b9901 +Author: Albert Astals Cid +Date: Sat Oct 1 14:34:50 2011 +0200 + + Fix typo in documentation + + Reported by Glad Deschrijver + (cherry picked from commit 1346caac6c564035d368617a329b361d0253fbf6) + + qt4/src/poppler-qt4.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9855529e8e1a83c6d77a9e4221ea2132d44e9fb1 +Author: Albert Astals Cid +Date: Sat Oct 1 14:27:44 2011 +0200 + + Remove space after % as it confuses libspectre + + Discussed with Adrian Johnson + Problem found by Glad Deschrijver + + poppler/PSOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8e8cde6f374b59222d834e2e7f08fb4a6a4d55a5 +Author: Albert Astals Cid +Date: Wed Sep 28 23:32:24 2011 +0200 + + xpdf303: More manpage merging + + utils/pdftotext.1 | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit f798f00c9ec55bff2eb93938424c436ba2663e7a +Author: Albert Astals Cid +Date: Wed Sep 28 23:30:55 2011 +0200 + + xpdf303: mention pdfdetach in non xpdf tools + + utils/pdftocairo.1 | 1 + + utils/pdftohtml.1 | 1 + + 2 files changed, 2 insertions(+) + +commit 3fc46ac1c046460ccf46ba4b8a92f728e775694a +Author: Albert Astals Cid +Date: Wed Sep 28 23:30:00 2011 +0200 + + xpdf303: Fix pdfdetach man page references + + utils/pdfdetach.1 | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +commit 79e1d77fb00a7c7f0bda4ae76328c4211c7f16e6 +Author: Albert Astals Cid +Date: Wed Sep 28 23:27:53 2011 +0200 + + xpdf303: Merge some more manpages + + utils/pdfinfo.1 | 15 +++++++++++---- + utils/pdftoppm.1 | 9 +++++---- + 2 files changed, 16 insertions(+), 8 deletions(-) + +commit 841c96be59ddad32f51d4d114ba1dcc42285ab55 +Author: Albert Astals Cid +Date: Wed Sep 28 23:23:25 2011 +0200 + + xpdf303: Merge some man pages + + utils/pdffonts.1 | 9 +++++---- + utils/pdfimages.1 | 9 +++++---- + utils/pdftops.1 | 9 +++++---- + 3 files changed, 15 insertions(+), 12 deletions(-) + +commit d2706a05513134f961e2500e0e596f2769707ce5 +Author: Adrian Johnson +Date: Wed Sep 28 21:20:23 2011 +0930 + + cairo: fix crash when using poppler_page_get_image() + + poppler/CairoOutputDev.h | 1 + + 1 file changed, 1 insertion(+) + +commit 0c0591fa23441c54c9443072615273ea65482d76 +Author: Albert Astals Cid +Date: Tue Sep 27 00:45:59 2011 +0200 + + 0.18.0 + + CMakeLists.txt | 6 ++-- + NEWS | 14 ++++++++ + configure.ac | 4 +-- + cpp/Doxyfile | 2 +- + gtk-doc.make | 102 + ++++++++++++++++++++++------------------------------ + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 7 files changed, 64 insertions(+), 68 deletions(-) + +commit 19f5db7acd64330d198f18695175df02141794d7 +Author: Albert Astals Cid +Date: Tue Sep 27 00:15:15 2011 +0200 + + Update Carlos (C) year + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6d34d4af90b8b41360de4dabb000bbcc894775d0 +Author: Albert Astals Cid +Date: Tue Sep 27 00:09:54 2011 +0200 + + Rename pdfmerge and pdfextract + + To pdfunite and pdfseparate, the old names were taken + + utils/.gitignore | 4 ++-- + utils/CMakeLists.txt | 28 ++++++++++++++-------------- + utils/Makefile.am | 16 ++++++++-------- + utils/{pdfextract.1 => pdfseparate.1} | 16 ++++++++-------- + utils/{pdfextract.cc => pdfseparate.cc} | 6 +++--- + utils/{pdfmerge.1 => pdfunite.1} | 14 +++++++------- + utils/{pdfmerge.cc => pdfunite.cc} | 6 +++--- + 7 files changed, 45 insertions(+), 45 deletions(-) + +commit baf54c2876edd476ffc68da6518598847bb7ec8a +Author: Albert Astals Cid +Date: Mon Sep 26 15:54:46 2011 +0200 + + Remove getRawStream + + Since it does exactly the same as getNextStream + + poppler/DCTStream.h | 1 - + poppler/Stream.h | 1 - + utils/HtmlOutputDev.cc | 7 ++----- + utils/ImageOutputDev.cc | 9 +++------ + 4 files changed, 5 insertions(+), 13 deletions(-) + +commit bba57e588fd1ee3a61f18405d1d1bf89fceb5b96 +Author: Carlos Garcia Campos +Date: Sun Sep 25 12:21:02 2011 +0200 + + xpdf303: Added the pdfdetach tool + + I haven't merged xpdf code for embedded files, I think our + implementation is better and more complete. I've adapated pdfdetach + code to use our code and return also embedded files of file attachment + annotations to match what xpdf does. + + poppler/FileSpec.cc | 22 ++++ + poppler/FileSpec.h | 3 + + utils/CMakeLists.txt | 9 ++ + utils/Makefile.am | 6 + + utils/pdfdetach.1 | 105 +++++++++++++++++ + utils/pdfdetach.cc | 318 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 463 insertions(+) + +commit f62c2f002c782d3a7887525f031d266aca6eb582 +Author: Carlos Garcia Campos +Date: Sat Sep 24 11:20:13 2011 +0200 + + xpdf303: Parse ActualText in Gfx instead of output devices + + Remove beginMarkedContent and endMarkedcontent and add beginActualText + and endActualText. ActualText is parsed in Gfx, that already + handles the + marked content stack, so that text output dev doesn't need to + handle it + too. The text string is passed to beginActualText(). This change + is not + an exact merge of xpdf code, I've tried to keep our implementation. + + poppler/CairoOutputDev.cc | 8 +-- + poppler/CairoOutputDev.h | 6 +- + poppler/Gfx.cc | 40 +++++++++---- + poppler/OutputDev.cc | 6 -- + poppler/OutputDev.h | 4 +- + poppler/TextOutputDev.cc | 145 + +++++++++++++++++++--------------------------- + poppler/TextOutputDev.h | 21 ++++--- + 7 files changed, 108 insertions(+), 122 deletions(-) + +commit a097447ed13cb021003425f85597e2628935feb2 +Author: Carlos Garcia Campos +Date: Sat Sep 24 09:43:05 2011 +0200 + + Use new error syntax in pdfextract + + utils/pdfextract.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 718c735aed540aa49b8dde250ca886c6ad93f5b6 +Merge: 6721916c 69707f0a +Author: Carlos Garcia Campos +Date: Sat Sep 24 09:38:52 2011 +0200 + + Merge branch 'master' into xpdf303merge + +commit 69707f0a9b5a94c80817039db943fb4f26e743e3 +Author: Adrian Johnson +Date: Mon Sep 19 22:00:34 2011 +0930 + + Update .gitignore + + regtest/.gitignore | 1 + + utils/.gitignore | 2 ++ + 2 files changed, 3 insertions(+) + +commit 0de477817e424078cfcfcae114e7745809f0848d +Author: Adrian Johnson +Date: Mon Sep 19 21:57:07 2011 +0930 + + utils: Add Glyph & Cog copyright to pdfmerge and pdfextract man pages + + utils/pdfextract.1 | 3 ++- + utils/pdfmerge.1 | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit ce7372db64ee807dc2b491e121fbe557dbf697e8 +Author: Adrian Johnson +Date: Mon Sep 19 22:04:27 2011 +0930 + + regtest: render cairo at 72ppi + + For consistency with splash. It is faster and easier to compare with + splash results. + + regtest/backends/cairo.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6cf7330089c4dcc1099906d9c37c3607a2a1eeba +Author: Carlos Garcia Campos +Date: Mon Sep 19 18:42:35 2011 +0200 + + regtest: Ignore checksums of crashed, failed and stderr files + + They shouldn't have a checksum, but it might happen with md5 files + generated with previous versions. + + regtest/backends/__init__.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 6512bf1c5dab37058460882fec3407b396830981 +Author: Albert Astals Cid +Date: Sun Sep 18 18:38:32 2011 +0200 + + Render at 72 instead of 150, it's faster :D + + regtest/backends/splash.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b828f63ed3896a22f3fe7ddbe2ec2f549d7a2c62 +Author: Albert Astals Cid +Date: Sun Sep 18 18:20:47 2011 +0200 + + install pdfextract and pdfmerge manpages + + utils/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 986759dfbe85998c85ee9b0825c7522395567531 +Author: Thomas Freitag +Date: Sun Sep 18 18:19:30 2011 +0200 + + pdfextract and pdfmerge man pages + + utils/Makefile.am | 2 ++ + utils/pdfextract.1 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + utils/pdfmerge.1 | 32 ++++++++++++++++++++++++++++++++ + 3 files changed, 82 insertions(+) + +commit 90da1af542fd7f3cecef31b15da6971345b38209 +Author: Thomas Freitag +Date: Sun Sep 18 18:19:04 2011 +0200 + + Complain if %d is not present and it should + + utils/pdfextract.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 40e066a84ddb3a5c41805c095659af5f5704d6d8 +Author: suzuki toshiya +Date: Sun Sep 18 18:16:14 2011 +0200 + + qt_subdir is unneeded + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6721916c92d720947b3285c85fdbe6610c6bf013 +Merge: 8456a6e1 e23f6b9c +Author: Carlos Garcia Campos +Date: Sun Sep 18 16:31:10 2011 +0200 + + Merge branch 'master' into xpdf303merge + + Conflicts: + poppler/Gfx.cc + +commit e23f6b9cade804136bd4bb58182f4fe0b072fbf2 +Author: Carlos Garcia Campos +Date: Sun Sep 18 16:27:50 2011 +0200 + + regtest: Do not create checksums for crashed, failed and stderr files + + regtest/backends/__init__.py | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 110b8be1d9f2694b42bd12dcb6af02bfca9866dd +Author: Carlos Garcia Campos +Date: Sun Sep 18 16:26:58 2011 +0200 + + Fix memory leak + + poppler/Gfx.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 8456a6e1354126dc98357fb806595bd3bc198522 +Author: Carlos Garcia Campos +Date: Sun Sep 18 16:07:54 2011 +0200 + + xpdf303: Add OCDisplayNode + + It's not used by poppler yet, but we might want to use it from the + frontends after the merge. + + poppler/OptionalContent.cc | 127 + +++++++++++++++++++++++++++++++++++++++++++++ + poppler/OptionalContent.h | 36 ++++++++++++- + 2 files changed, 162 insertions(+), 1 deletion(-) + +commit 06c6660dc9fe326f185ff323e643af6714b32ec8 +Author: Carlos Garcia Campos +Date: Sun Sep 18 15:08:44 2011 +0200 + + xpdf303: Parse usage dictionary of optional content groups + + poppler/OptionalContent.cc | 28 ++++++++++++++++++++++++++++ + poppler/OptionalContent.h | 14 +++++++++++++- + 2 files changed, 41 insertions(+), 1 deletion(-) + +commit 528d5b0d40302b3fee3aec69b85bdd1daa4db568 +Author: Carlos Garcia Campos +Date: Sun Sep 18 14:03:36 2011 +0200 + + xpdf303: Image XObjects can have a OC entry too + + poppler/Gfx.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit c40353d3bb761f5be8ddbd2bf5341e83901fb132 +Author: Carlos Garcia Campos +Date: Sun Sep 18 13:32:07 2011 +0200 + + xpdf303: OC entry is specific to form XObjects + + poppler/Gfx.cc | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit 6ddb51d81b064346dc85d2ae72570a956a184d74 +Author: Carlos Garcia Campos +Date: Sun Sep 18 12:59:28 2011 +0200 + + xpdf303: The spec doesn't say OC must be null or ref + + poppler/Annot.cc | 5 +---- + poppler/Gfx.cc | 22 +++++++--------------- + 2 files changed, 8 insertions(+), 19 deletions(-) + +commit 434bb9b38319edc7282be22044bd7761403a38a6 +Author: Carlos Garcia Campos +Date: Sun Sep 18 12:45:12 2011 +0200 + + xpdf303: OC entry can be an optional content group too + + Not only an optional content membership dictionary. + + poppler/OptionalContent.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 56410b80fdabb99e2de0c6589de6ee745936c523 +Author: Carlos Garcia Campos +Date: Sun Sep 18 12:44:02 2011 +0200 + + xpdf303: Not finding an oc group is not necessarily a syntax error + + poppler/OptionalContent.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 4bb4439450e342479375cb56d10561457475bd13 +Author: Carlos Garcia Campos +Date: Sun Sep 18 12:42:15 2011 +0200 + + xpdf303: Fix check of OptionalContentGroup::getState() + + We use an enum, not a boolean. + + poppler/OptionalContent.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d737e3098e02e46525c0edf2165462e03ac7a0e6 +Author: Carlos Garcia Campos +Date: Sun Sep 18 11:36:11 2011 +0200 + + xpdf303: Add support for visibility expressions in OptContent + + poppler/OptionalContent.cc | 113 + +++++++++++++++++++++++++++++++++++---------- + poppler/OptionalContent.h | 3 +- + 2 files changed, 91 insertions(+), 25 deletions(-) + +commit 258d56ba85902a8ab50eec3fe66dd6425226fa59 +Merge: 72a77363 12c6239c +Author: Carlos Garcia Campos +Date: Sun Sep 18 11:12:38 2011 +0200 + + Merge branch 'master' into xpdf303merge + +commit 12c6239ca4f1f6a5de72aebd755f9d1354ea5837 +Author: Carlos Garcia Campos +Date: Sun Sep 18 11:08:06 2011 +0200 + + regtest: Fix checksum check for tests containing spaces in filename + + regtest/backends/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 72a7736389cbe36c1f8a526f1a659cae1a3f85a3 +Author: Carlos Garcia Campos +Date: Sun Sep 18 10:47:51 2011 +0200 + + xpdf303: No need to cache optContentConfig object in Annot + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) + +commit 93ba92db0a3af35f197a4faa5a528af98ea0f624 +Author: Albert Astals Cid +Date: Wed Sep 14 00:58:44 2011 +0200 + + Make it work with Python3 + + regtest/Config.py | 4 ++-- + regtest/TestReferences.py | 8 ++++---- + regtest/TestRun.py | 32 ++++++++++++++++---------------- + regtest/Timer.py | 8 ++++---- + regtest/backends/__init__.py | 12 ++++++------ + regtest/commands/__init__.py | 6 +++--- + regtest/commands/create-refs.py | 2 +- + regtest/commands/run-tests.py | 2 +- + regtest/main.py | 2 +- + 9 files changed, 38 insertions(+), 38 deletions(-) + +commit da1b5437148e1e6317246b16f7235c8bc280be97 +Author: Carlos Garcia Campos +Date: Tue Sep 13 20:09:56 2011 +0200 + + regtest: Add a way to skip files + + A new command line option --skip has been added to give a file + with the + list of test to skip. When --skip is not used, it look for a file + named + Skipped in the tests dir. Lines starting with '#' are considered + comments and are ignored. + + regtest/TestReferences.py | 9 +++++++-- + regtest/TestRun.py | 9 +++++++-- + regtest/Utils.py | 20 ++++++++++++++++++++ + regtest/main.py | 6 +++++- + 4 files changed, 39 insertions(+), 5 deletions(-) + +commit b730b2c1d9666f62f940762663c8318e64049d61 +Author: Carlos Garcia Campos +Date: Tue Sep 13 19:04:04 2011 +0200 + + regtest: Limit the number of arguments to 1 + + It's easier to run poppler-regtest more than once if you need to run + different tests. + + regtest/commands/create-refs.py | 24 ++++++++++++------------ + regtest/commands/run-tests.py | 26 +++++++++++++------------- + regtest/main.py | 2 +- + 3 files changed, 26 insertions(+), 26 deletions(-) + +commit 5ce045d0358318859c844340c639483485b69c58 +Author: Carlos Garcia Campos +Date: Tue Sep 13 18:18:21 2011 +0200 + + regtest: Sort tests before create-refs/run-tests and show progress + + regtest/TestReferences.py | 20 ++++++++------------ + regtest/TestRun.py | 21 ++++++++++----------- + regtest/Utils.py | 35 +++++++++++++++++++++++++++++++++++ + 3 files changed, 53 insertions(+), 23 deletions(-) + +commit 10801b6faee9037af054fe74cc4a03620ea41d45 +Author: Carlos Garcia Campos +Date: Mon Sep 12 20:13:17 2011 +0200 + + Add initial poppler regressions test program + + regtest/Config.py | 32 ++++++ + regtest/TestReferences.py | 73 +++++++++++++ + regtest/TestRun.py | 156 ++++++++++++++++++++++++++++ + regtest/Timer.py | 73 +++++++++++++ + regtest/backends/__init__.py | 220 + ++++++++++++++++++++++++++++++++++++++++ + regtest/backends/cairo.py | 39 +++++++ + regtest/backends/postscript.py | 35 +++++++ + regtest/backends/splash.py | 39 +++++++ + regtest/backends/text.py | 48 +++++++++ + regtest/commands/__init__.py | 93 +++++++++++++++++ + regtest/commands/create-refs.py | 65 ++++++++++++ + regtest/commands/run-tests.py | 69 +++++++++++++ + regtest/main.py | 77 ++++++++++++++ + regtest/poppler-regtest | 6 ++ + 14 files changed, 1025 insertions(+) + +commit 245e331a14e11a615bf47abbeb34a3561e393b41 +Author: Albert Astals Cid +Date: Mon Sep 12 13:43:49 2011 +0200 + + 0.17.4 + + CMakeLists.txt | 2 +- + NEWS | 5 +++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 9 insertions(+), 4 deletions(-) + +commit 194b2413eb2c6a1641508aec63336aaf89ec3b51 +Author: Albert Astals Cid +Date: Mon Sep 12 13:43:35 2011 +0200 + + gir 0.18 + + glib/CMakeLists.txt | 12 ++++++------ + glib/Makefile.am | 12 ++++++------ + 2 files changed, 12 insertions(+), 12 deletions(-) + +commit 61c06d2efad20880e1e0b399cf797dd55f6c8dab +Author: Albert Astals Cid +Date: Mon Sep 12 00:32:38 2011 +0200 + + xpdf303: Useless NULL assignments + + poppler/SplashOutputDev.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 4fbcbf1ffb8a98fe8c12643fdab2cbd90b4e60f9 +Author: Albert Astals Cid +Date: Mon Sep 12 00:30:52 2011 +0200 + + xpdf303: Set size to 64 instead of 100 + + poppler/SplashOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1c7203e57e9c7c264f5cada6362a6b449dd8689c +Author: Albert Astals Cid +Date: Mon Sep 12 00:21:03 2011 +0200 + + xpdf303: Avoid calling a "slow" function + + poppler/PSOutputDev.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit db4c5789bf95af9f45a7911153acc20a26a447f1 +Author: Albert Astals Cid +Date: Mon Sep 12 00:19:49 2011 +0200 + + xpdf303: fix spacing + + poppler/PSOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 10c3d15f841865929d2f66353cb01d0d321e8b82 +Author: Albert Astals Cid +Date: Mon Sep 12 00:03:13 2011 +0200 + + xpdf303: make limit smaller + + poppler/PSOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1d4e6e739701ba817576752ced169b24c5e95156 +Author: Albert Astals Cid +Date: Sun Sep 11 23:57:22 2011 +0200 + + xpdf303: Remove 512 limit in pdftoppm + + utils/pdftoppm.cc | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +commit e4e843f1115d95c54967f0386bfb28f685d6c88d +Author: Albert Astals Cid +Date: Sun Sep 11 22:49:34 2011 +0200 + + xpdf303: Rework nComps != colorSpace->getNComps() handling + + poppler/GfxState.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit dda45b6a67f3f97705e5d806eaf7d37171789e66 +Author: Albert Astals Cid +Date: Sun Sep 11 22:46:51 2011 +0200 + + xpdf303: NULL GfxICCBasedColorSpace if array does not have 2 elements + + poppler/GfxState.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 760e814a6d26db8eba567520aad771002e11357a +Author: Albert Astals Cid +Date: Sun Sep 11 22:21:40 2011 +0200 + + xpdf303: increase formDepth limit + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 59442e5994f3b94d5221cbc90f79fad235fe2611 +Author: Albert Astals Cid +Date: Sun Sep 11 22:10:41 2011 +0200 + + xpdf303: Remove flags that were never used + + splash/Splash.cc | 6 +----- + splash/SplashXPath.cc | 34 ++++------------------------------ + splash/SplashXPath.h | 13 ++++--------- + 3 files changed, 9 insertions(+), 44 deletions(-) + +commit 41a620ef60507ceda42a14d06d6587ed10016468 +Author: Albert Astals Cid +Date: Thu Sep 8 16:18:01 2011 +0200 + + xpdf303: Adapt use of getBlock to our use of getChars + + poppler/Stream.cc | 58 + +++++++++++++++++++++++++++++++++---------------------- + poppler/Stream.h | 2 ++ + 2 files changed, 37 insertions(+), 23 deletions(-) + +commit 2f7701fe730a648d0a1d181c5b20e4802640dc52 +Author: Albert Astals Cid +Date: Thu Sep 8 15:59:27 2011 +0200 + + xpdf303: Adapt xpdf getBlock to our getChars + + poppler/JBIG2Stream.cc | 17 ++++++++ + poppler/JBIG2Stream.h | 2 + + poppler/Stream.cc | 113 + ++++++++++++++++++++++++++++++++++++++++++++----- + poppler/Stream.h | 55 +++++++++++++----------- + 4 files changed, 152 insertions(+), 35 deletions(-) + +commit 3a1988db40def1655ec638cd521ed40eadc0acca +Author: Carlos Garcia Campos +Date: Thu Sep 8 15:40:12 2011 +0200 + + xpdf303: empty pages need to call dump to do any setup required by + the OutputDev + + poppler/Page.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 4cddaed21592ac491519a81a003035bc4e618705 +Author: Carlos Garcia Campos +Date: Thu Sep 8 15:35:33 2011 +0200 + + xpdf303: Don't clip the other page boxes to the MediaBox at the + intermediate nodes + + only do it at the leaf (Page) nodes - the other boxes can be specified + before the MediaBox is specified. + I think we already had that change, we checked isPage before clipping, + I've merged this way just to make future merges a bit easier. + + poppler/Page.cc | 16 ++++++++-------- + poppler/Page.h | 3 +++ + 2 files changed, 11 insertions(+), 8 deletions(-) + +commit 3538ac89bfea750de8907847d1d5e3515d0b8be7 +Author: Albert Astals Cid +Date: Thu Sep 8 15:07:21 2011 +0200 + + xpdf303: compile + + poppler/ArthurOutputDev.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 89d95d0f254a828d28d943b698eeaec51f03686f +Author: Carlos Garcia Campos +Date: Thu Sep 8 12:38:36 2011 +0200 + + xpdf303: Add codeToGID and codeToGIDLen params to + loadOpenTypeCFFFont() + + poppler/SplashOutputDev.cc | 12 +++++++++++- + splash/SplashFTFontEngine.cc | 29 +++++++++++++++++------------ + splash/SplashFTFontEngine.h | 3 ++- + splash/SplashFontEngine.cc | 6 ++++-- + splash/SplashFontEngine.h | 3 ++- + 5 files changed, 36 insertions(+), 17 deletions(-) + +commit d768204e51e6bdbcac4d6b43537297616cbedbf3 +Author: Albert Astals Cid +Date: Tue Sep 6 21:56:43 2011 +0200 + + xpdf303: Revert b36d150931cd555b84ee996d505e8b91e2afde19 + + Breaks bug164568-2.pdf so our fix was better :-) + + poppler/JBIG2Stream.cc | 91 + ++++++++++++++++++++++---------------------------- + poppler/JBIG2Stream.h | 1 - + 2 files changed, 40 insertions(+), 52 deletions(-) + +commit 2230b8f2128edf4994d8a742f562e1b5acf96b74 +Author: Albert Astals Cid +Date: Tue Sep 6 00:05:53 2011 +0200 + + xpdf303: Merge JPXStream changes + + poppler/JPXStream.cc | 1000 + +++++++++++++++++++++++++++++++------------------- + poppler/JPXStream.h | 43 +-- + 2 files changed, 632 insertions(+), 411 deletions(-) + +commit 35bb53feaa2e469253368f03a9835d73aeb1a240 +Author: Albert Astals Cid +Date: Mon Sep 5 23:20:09 2011 +0200 + + xpdf303: Add BufStream + + poppler/Stream.cc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Stream.h | 25 +++++++++++++++++++++++++ + 2 files changed, 71 insertions(+) + +commit 8a9d92fcf05285c1f06bc153aa79d0200d05bbd9 +Author: Albert Astals Cid +Date: Mon Sep 5 22:57:02 2011 +0200 + + xpdf303: CCITTFaxStream header misc fixes + + poppler/Stream.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 22d370c0a1f8c016ebc5a6d8320fe55bfd31c8a7 +Author: Albert Astals Cid +Date: Mon Sep 5 22:53:45 2011 +0200 + + xpdf303: DCTStream misc fixes + + poppler/Stream.cc | 32 ++++++++++++++++++++++++++------ + 1 file changed, 26 insertions(+), 6 deletions(-) + +commit 36d3057546b5a1d717c71b8dcb9773f91e3b5960 +Author: Albert Astals Cid +Date: Mon Sep 5 22:46:59 2011 +0200 + + xpdf303: Add some {} + + poppler/Stream.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 308654eb5dfbb783f29bd645f60c79d5b5fe42c9 +Author: Albert Astals Cid +Date: Mon Sep 5 22:45:50 2011 +0200 + + xpdf303: code1 changed to int in CCITTFaxStream::reset + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f097dc1f9d580eb1cdc8180d3920fe795493cf89 +Author: Albert Astals Cid +Date: Mon Sep 5 22:43:16 2011 +0200 + + xpdf303: Use 32 bits in CCITTFaxStream::lookBits + + poppler/Stream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b5417659042c95891aa549cae396ba4cc6604030 +Author: Albert Astals Cid +Date: Mon Sep 5 22:40:02 2011 +0200 + + xpdf303: Check against lookBits returning EOF + + poppler/Stream.cc | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +commit eaf9d31c97a3cc06f4ce94d9190ae1a337634749 +Author: Albert Astals Cid +Date: Mon Sep 5 22:38:05 2011 +0200 + + xpdf303: Set endOfLine to true if code1 is 1 + + poppler/Stream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a654a77e26a6c7d76c318636303f8c636a3d2495 +Author: Albert Astals Cid +Date: Mon Sep 5 22:36:58 2011 +0200 + + xpdf303: Tweaks to CCITTFaxStream::lookChar + + poppler/Stream.cc | 55 + +++++++++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 43 insertions(+), 12 deletions(-) + +commit abdf828449cd543e66f326ba862efcb3ca6d342d +Author: Albert Astals Cid +Date: Mon Sep 5 22:19:30 2011 +0200 + + xpdf303: Remove cygwin workaround + + poppler/Stream.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 05ef4227d09381e3a9e8050e447770f44d532386 +Author: Albert Astals Cid +Date: Mon Sep 5 22:18:33 2011 +0200 + + xpdf303: Return false if getLine fails + + poppler/Stream.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit c2d6158bd56328754d77ab8f1bf84d46e6ede773 +Author: Albert Astals Cid +Date: Mon Sep 5 22:14:39 2011 +0200 + + xpdf303: Return NULL if size < 0 + + poppler/Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 04947e1dca858b890302a5a1005b84b34255d670 +Author: Albert Astals Cid +Date: Mon Sep 5 22:11:24 2011 +0200 + + xpdf303: Add -rawdates and print Form information + + utils/pdfinfo.cc | 30 +++++++++++++++++++++++++++--- + 1 file changed, 27 insertions(+), 3 deletions(-) + +commit 9529e776e53e71069ba4215cdb8b84592d37b555 +Author: Carlos Garcia Campos +Date: Mon Sep 5 21:19:58 2011 +0200 + + xpdf303: Other fixes in PostScriptFunction + + poppler/Function.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 071f983f461ba0b872dd93d7f1a24d325312799d +Author: Carlos Garcia Campos +Date: Mon Sep 5 21:19:13 2011 +0200 + + xpdf303: Fixed a bug in the PostScript-type function parser + + Real numbers that start with a decimal point weren't being handled + correctly. + + poppler/Function.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit da0eff1aaa31c2bf357a64b6275645100c9629d4 +Author: Carlos Garcia Campos +Date: Mon Sep 5 21:12:02 2011 +0200 + + xpdf303: Fixes in StitchingFunction + + poppler/Function.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit b655316706ec394fa6c8ad076d9d9d96ac8ed563 +Author: Albert Astals Cid +Date: Mon Sep 5 21:05:55 2011 +0200 + + xpdf303: Rework LinkURI decoding + + poppler/Link.cc | 35 +++++++++++++++++++---------------- + 1 file changed, 19 insertions(+), 16 deletions(-) + +commit abad9b4e44d81a206bccff8a109ceb9a7effa2ad +Author: Carlos Garcia Campos +Date: Mon Sep 5 21:00:31 2011 +0200 + + xpdf303: Cache the last transform for PostScript-type functions + + poppler/Function.cc | 37 ++++++++++++++++++++++++++++++++++--- + poppler/Function.h | 2 ++ + 2 files changed, 36 insertions(+), 3 deletions(-) + +commit e1c6b4c6e6df0854b040c9af9ef2d3f6789e24b2 +Author: Albert Astals Cid +Date: Mon Sep 5 21:02:31 2011 +0200 + + xpdf303: Only call getNum if isNum + + poppler/Link.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit e5661e1a08c38d4c8d69976a8c1c02c1102bc88c +Author: Carlos Garcia Campos +Date: Mon Sep 5 20:49:13 2011 +0200 + + Optimize SampledFunction + + Pull index computation code out of the transform function; cache the + last transform. + + poppler/Function.cc | 87 + ++++++++++++++++++++++++++++++++++++++++++++--------- + poppler/Function.h | 4 ++- + 2 files changed, 75 insertions(+), 16 deletions(-) + +commit b36d150931cd555b84ee996d505e8b91e2afde19 +Author: Albert Astals Cid +Date: Mon Sep 5 20:52:05 2011 +0200 + + xpdf303: Take xpdf way of handling bug 6500 + + poppler/JBIG2Stream.cc | 91 + ++++++++++++++++++++++++++++---------------------- + poppler/JBIG2Stream.h | 1 + + 2 files changed, 52 insertions(+), 40 deletions(-) + +commit 065565a67c7826b64d89fac9719049d0a57da721 +Author: Albert Astals Cid +Date: Mon Sep 5 20:39:50 2011 +0200 + + xpdf303: Merge ¿speed? improvements in JBIG2Stream::readGenericBitmap + + poppler/JBIG2Stream.cc | 586 + +++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 471 insertions(+), 115 deletions(-) + +commit 28adb3884dafcf1d36aae1ec05855b10b22aa4ae +Author: Albert Astals Cid +Date: Mon Sep 5 20:26:57 2011 +0200 + + xpdf303: Change bpp calculation + + poppler/JBIG2Stream.cc | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +commit c163a82f45d869b7c35a1a7141ab237507671f82 +Author: Albert Astals Cid +Date: Mon Sep 5 20:25:04 2011 +0200 + + xpdf303: Change symCodeLen calculation + + poppler/JBIG2Stream.cc | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +commit 1d1a985101c26f90bde8340dcfae3d6a1e0a08ba +Author: Albert Astals Cid +Date: Mon Sep 5 20:20:03 2011 +0200 + + xpdf303: symCodeLen calculation fix + + poppler/JBIG2Stream.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 5c0274572c65972434293a30f3ba5afd3905005f +Author: Albert Astals Cid +Date: Mon Sep 5 20:07:54 2011 +0200 + + xpdf303: add line accessor + + poppler/JBIG2Stream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 7b77a264b5c21ba693677b1249a2122743e4e395 +Author: Albert Astals Cid +Date: Mon Sep 5 19:46:16 2011 +0200 + + xpdf303: segments with unspecified length + + poppler/JBIG2Stream.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 23066e8e8309babd61ade9f50ef7d82c9e275055 +Author: Albert Astals Cid +Date: Mon Sep 5 19:41:16 2011 +0200 + + xpdf303: More EOF detection + + poppler/JBIG2Stream.cc | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit bc6eded798d6e5dc7a58f88afbe4ab2904698db5 +Author: Albert Astals Cid +Date: Mon Sep 5 19:38:29 2011 +0200 + + xpdf303: Comment++ + + poppler/JBIG2Stream.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit adb98856a745340b4ffb34ffd2ed701600cfc82f +Author: Albert Astals Cid +Date: Mon Sep 5 19:38:02 2011 +0200 + + xpdf303: Exit loop in case of EOF + + poppler/JBIG2Stream.cc | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit 112154567ebcab63959294533b00075d6ca6ea65 +Author: Albert Astals Cid +Date: Mon Sep 5 19:33:27 2011 +0200 + + xpdf303: Initialize to NULL + + poppler/JBIG2Stream.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit b9ecfdf4cb27a19e65817af51c048e8030825035 +Author: Albert Astals Cid +Date: Mon Sep 5 19:27:36 2011 +0200 + + xpdf303: Delay memory allocation up to when it is really needed + + poppler/CMap.cc | 58 + ++++++++------------------------------------------------- + poppler/CMap.h | 2 -- + 2 files changed, 8 insertions(+), 52 deletions(-) + +commit 7af7b4b2d1941ee9dcd575535d4fc31f29026d8d +Author: Carlos Garcia Campos +Date: Mon Sep 5 19:05:31 2011 +0200 + + xpdf303: Rework initialization of appearance state + + Merged a slightly different patch, adding an error when the AS + entry is + missing and the AP contains one or more subdictionaries. + + poppler/Annot.cc | 62 + +++++++++++++++++++++++++++++++------------------------- + 1 file changed, 34 insertions(+), 28 deletions(-) + +commit f7d307b818bca9553a05b5d43deb429abbf04824 +Author: Carlos Garcia Campos +Date: Sun Sep 4 13:56:35 2011 +0200 + + xpdf303: Rewrote the code that handles annotation transforms + + It was not handling non-rectangular transforms correctly. + + poppler/Gfx.cc | 143 + ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 75 insertions(+), 68 deletions(-) + +commit 4609f9feeca22620c6e143962a3717784a843a68 +Author: Carlos Garcia Campos +Date: Sun Sep 4 13:09:50 2011 +0200 + + xpdf303: Implement rotation in the form field appearance regeneration + + poppler/Annot.cc | 51 ++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 38 insertions(+), 13 deletions(-) + +commit ca7d77a27e2f3a692842968f08dcb9fa5379bf0f +Author: Carlos Garcia Campos +Date: Sun Sep 4 11:53:40 2011 +0200 + + Create forms with a PDFDoc instead of XRef too + + poppler/Form.cc | 79 + +++++++++++++++++++++++++++++---------------------------- + poppler/Form.h | 28 ++++++++++---------- + 2 files changed, 55 insertions(+), 52 deletions(-) + +commit ec52e46e309a0307fdf12113a1b7d41a760f9d6c +Author: Carlos Garcia Campos +Date: Sun Sep 4 11:32:38 2011 +0200 + + xpdf303: Create annots with a doc instead of xref + catalog + + glib/poppler-action.cc | 2 +- + glib/poppler-annot.cc | 4 +- + poppler/Annot.cc | 364 + +++++++++++++++++++++++++------------------------ + poppler/Annot.h | 128 ++++++++--------- + poppler/Catalog.cc | 9 +- + poppler/Form.cc | 22 +-- + poppler/Form.h | 11 +- + poppler/PSOutputDev.cc | 2 +- + poppler/Page.cc | 2 +- + 9 files changed, 274 insertions(+), 270 deletions(-) + +commit ce5e620f07e984927610866467705bb526f9ad8d +Author: Carlos Garcia Campos +Date: Sat Sep 3 11:05:42 2011 +0200 + + xpdf303: Handle the case where sid < 0 + + fofi/FoFiType1C.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 9d77f999de973f3c547245bca0568f8984faa5d7 +Author: Carlos Garcia Campos +Date: Sat Sep 3 11:02:55 2011 +0200 + + xpdf303: Initialize nFDs in FoFiType1C::parse() + + fofi/FoFiType1C.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d9594c95713ac79b46e313ecf2875196ea076ef4 +Author: Carlos Garcia Campos +Date: Sat Sep 3 11:01:28 2011 +0200 + + xpdf303: Check whether fdSelect is NULL before using it + + fofi/FoFiType1C.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 4e4a8ec52c5662e21036f219636a39fc97a32353 +Author: Carlos Garcia Campos +Date: Sat Sep 3 10:52:14 2011 +0200 + + xpdf303: Add writePSString() helper function to FoFiType1C + + fofi/FoFiType1C.cc | 68 + +++++++++++++++++++++++++++++++++++++++--------------- + fofi/FoFiType1C.h | 1 + + 2 files changed, 51 insertions(+), 18 deletions(-) + +commit ff03811db1ef833df4bab12fe3bf3a8c1534c174 +Author: Carlos Garcia Campos +Date: Sat Sep 3 10:40:15 2011 +0200 + + xpdf303: More checks in GooString + + goo/GooString.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 0029efbe2a8a97ff34353f8028ac649b2fd07013 +Author: Carlos Garcia Campos +Date: Sat Sep 3 10:32:14 2011 +0200 + + xpdf303: Use a double instead of an int with a cast + + goo/GooString.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 419ee8c30ba0df02e9f0281b321fbe38387e5a21 +Author: Carlos Garcia Campos +Date: Fri Sep 2 18:44:04 2011 +0200 + + xpdf303: Add more formats to GooString + + goo/GooString.cc | 102 + ++++++++++++++++++++++++++++++++++++++++++++++++++----- + goo/GooString.h | 21 ++++++++++-- + 2 files changed, 111 insertions(+), 12 deletions(-) + +commit 738a6954da01fd3fc8c1cd5baa49fc7b8c959169 +Author: Carlos Garcia Campos +Date: Fri Sep 2 18:24:04 2011 +0200 + + xpdf303: Add getGlyphName() to FoFiType1C + + fofi/FoFiType1C.cc | 12 ++++++++++++ + fofi/FoFiType1C.h | 4 ++++ + 2 files changed, 16 insertions(+) + +commit 39b77a193996b0916690a246f4a9874dad596b2f +Author: Carlos Garcia Campos +Date: Fri Sep 2 18:17:51 2011 +0200 + + xpdf303: Improvements in FoFiType1 parser + + fofi/FoFiType1.cc | 75 + ++++++++++++++++++++++++++----------------------------- + 1 file changed, 35 insertions(+), 40 deletions(-) + +commit 44dbb28a07125f92a0835aea7ad3403310bc451d +Author: Carlos Garcia Campos +Date: Fri Sep 2 18:08:39 2011 +0200 + + xpdf303: Handle PFB headers in Type 1 font files + + fofi/FoFiType1.cc | 36 ++++++++++++++++++++++++++++++++++++ + fofi/FoFiType1.h | 1 + + 2 files changed, 37 insertions(+) + +commit 9531a52b227a994ab8e0d66aeaff2b21358ca73e +Author: Carlos Garcia Campos +Date: Fri Sep 2 18:01:35 2011 +0200 + + xpdf303: New signature of methods convertToCIDType0() and + convertToType0() + + fofi/FoFiTrueType.cc | 8 ++--- + fofi/FoFiTrueType.h | 4 +-- + fofi/FoFiType1C.cc | 84 + +++++++++++++++++++++++++++++++++++--------------- + fofi/FoFiType1C.h | 19 +++++++++--- + poppler/PSOutputDev.cc | 13 ++++++-- + 5 files changed, 91 insertions(+), 37 deletions(-) + +commit 830d2b40770333489a08f23a3b16a372770a8d19 +Author: Albert Astals Cid +Date: Thu Sep 1 23:23:57 2011 +0200 + + xpdf303: Use openFile + + poppler/CharCodeToUnicode.cc | 4 ++-- + poppler/GlobalParams.cc | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit ddf9d6e35b40b902519cbaa8cb664ba6dfdfd510 +Author: Albert Astals Cid +Date: Thu Sep 1 23:21:26 2011 +0200 + + xpdf303: openFile + minor fixes for openTempFile in Windows + + goo/gfile.cc | 108 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + goo/gfile.h | 13 +++++++ + 2 files changed, 118 insertions(+), 3 deletions(-) + +commit 68e8fa9ff4f13b6703148b3eb6ea628418211243 +Author: Albert Astals Cid +Date: Thu Sep 1 23:17:59 2011 +0200 + + xpdf303: make gcc happy + + fofi/FoFiType1C.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 876021b1aa16ad38767a91e1be31c392f368fde2 +Author: Carlos Garcia Campos +Date: Thu Sep 1 19:07:01 2011 +0200 + + xpdf303: Add getFontMatrix() + + fofi/FoFiTrueType.cc | 76 + +++++++++++++++++++++++++++++++--------------------- + fofi/FoFiTrueType.h | 9 +++++++ + fofi/FoFiType1.cc | 37 +++++++++++++++++++++++++ + fofi/FoFiType1.h | 4 +++ + fofi/FoFiType1C.cc | 29 ++++++++++++++++++++ + fofi/FoFiType1C.h | 3 +++ + 6 files changed, 127 insertions(+), 31 deletions(-) + +commit 1369862ed61ef8b0f81c52fce36f6c1602d82ddb +Author: Carlos Garcia Campos +Date: Thu Sep 1 18:27:51 2011 +0200 + + xpdf303: Ignore entries that have an invalid tag too + + fofi/FoFiTrueType.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 0fe7cc82e84dc2a3b79248b111656e5e7df9fdc2 +Author: Carlos Garcia Campos +Date: Thu Sep 1 18:21:33 2011 +0200 + + xpdf303: Update cmap, name, post and os2 tables in FoFiTrueType + + fofi/FoFiTrueType.cc | 29 ++++++++++++++++------------- + 1 file changed, 16 insertions(+), 13 deletions(-) + +commit 0feebf5f3c9da8d7a1154456a00492a623340cec +Author: Carlos Garcia Campos +Date: Thu Sep 1 18:16:59 2011 +0200 + + xpdf303: Ignore any bogus entries in the table directory + + It's a different approach to fix the same issue we had already fixed, + added just to make future merge easier. We were also reallocating the + tables array, I've kept that but doing it only when the size actually + changes. + + fofi/FoFiTrueType.cc | 25 +++++++++++++------------ + 1 file changed, 13 insertions(+), 12 deletions(-) + +commit 68c6ebc78b89eec94a9c3538fe6e27561a21b680 +Author: Carlos Garcia Campos +Date: Thu Sep 1 17:49:46 2011 +0200 + + xpdf303: codeToGID items can be < 0 now + + fofi/FoFiTrueType.cc | 12 ++++++++++-- + poppler/PSOutputDev.cc | 2 +- + splash/SplashFTFont.cc | 2 +- + 3 files changed, 12 insertions(+), 4 deletions(-) + +commit 19204ed5cd5cb64809f1a1f51dd5ffdef2b9417a +Author: Albert Astals Cid +Date: Thu Sep 1 17:28:39 2011 +0200 + + xpdf303: CMap::getCID signature change + + poppler/CMap.cc | 47 +++++++++++++++++++++++++++++++---------------- + poppler/CMap.h | 8 +++++--- + poppler/GfxFont.cc | 6 ++++-- + 3 files changed, 40 insertions(+), 21 deletions(-) + +commit 9c74bef77e7e1d7a8464dff43cae16bb1206665e +Author: Albert Astals Cid +Date: Thu Sep 1 17:04:04 2011 +0200 + + xpdf303: Use splashDist instead of splashSqrt + + splash/SplashT1Font.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0568d0dc3c42b68b715226e5ce0ff98d73a94ac7 +Author: Albert Astals Cid +Date: Thu Sep 1 17:01:30 2011 +0200 + + xpdf303: Do the multiplication the other way around + + No idea why :-D + + splash/SplashFTFont.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 3c0da502aa1d5b1acae01cf1e43fb96f5ecc11da +Author: Albert Astals Cid +Date: Thu Sep 1 17:00:31 2011 +0200 + + xpdf303: Use splashCheckDet isntead of splashAbs + + splash/SplashFontEngine.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2b4303c66f8de9a267413465898897fd6b0ebb17 +Author: Albert Astals Cid +Date: Thu Sep 1 16:51:53 2011 +0200 + + xpdf303: Bigger fileKey + + poppler/XRef.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 53060857e31a01413936fbe33b7032a0a325b384 +Author: Albert Astals Cid +Date: Thu Sep 1 16:50:08 2011 +0200 + + xpdf303: Merge JArithmeticDecoder.* + + poppler/JArithmeticDecoder.cc | 47 + ++++++++++++++++++++++++++++++++++++------- + poppler/JArithmeticDecoder.h | 4 ++++ + 2 files changed, 44 insertions(+), 7 deletions(-) + +commit 0722960b4cf4ce40b6bd278ac7287d64a1d70bf2 +Author: Albert Astals Cid +Date: Thu Sep 1 16:48:31 2011 +0200 + + xpdf303: Do not crash if imgStr->getLine() is NULL + + utils/ImageOutputDev.cc | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +commit f848edab849910b8291c7974e484ef5d02b2234c +Author: Albert Astals Cid +Date: Thu Sep 1 16:42:30 2011 +0200 + + xpdf303: Do not extract the million tiles of a pattern + + utils/ImageOutputDev.cc | 9 +++++++++ + utils/ImageOutputDev.h | 12 ++++++++++++ + 2 files changed, 21 insertions(+) + +commit 01adb7ef6a524d7313a45e7c5f441da4fd0250bd +Author: Albert Astals Cid +Date: Thu Sep 1 16:31:50 2011 +0200 + + xpdf303: Assembler for some functions + + splash/SplashMath.h | 110 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 110 insertions(+) + +commit 4f87a3163f133565e8774ef416e67d05f906723d +Author: Albert Astals Cid +Date: Thu Sep 1 16:25:19 2011 +0200 + + xpdf303: Add splashAvg + + splash/SplashMath.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 64cf42f89939763d105be4948a20e9ecb81a64c1 +Author: Albert Astals Cid +Date: Thu Sep 1 16:23:08 2011 +0200 + + xpdf303: Add getters to SplashClip + + splash/SplashClip.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 28c6a55742f55a719ef63b8e0eff7c242653cf36 +Author: Albert Astals Cid +Date: Thu Sep 1 16:17:56 2011 +0200 + + xpdf303: unneeded forward declare + + poppler/Page.h | 1 - + 1 file changed, 1 deletion(-) + +commit 38ebe8c568aafbe5f248f9e0a654f46829e0b659 +Author: Albert Astals Cid +Date: Thu Sep 1 16:13:53 2011 +0200 + + xpdf303: Page functions do not need Catalog * anymore + + glib/poppler-document.cc | 2 +- + glib/poppler-page.cc | 11 ++++------ + poppler/FontInfo.cc | 2 +- + poppler/OutputDev.h | 4 ++-- + poppler/PDFDoc.cc | 8 +++---- + poppler/PSOutputDev.cc | 6 +++--- + poppler/PSOutputDev.h | 2 +- + poppler/Page.cc | 36 + ++++++++++++++++---------------- + poppler/Page.h | 16 +++++++------- + poppler/TextOutputDev.cc | 2 +- + poppler/TextOutputDev.h | 2 +- + qt4/src/poppler-link-extractor-private.h | 2 +- + qt4/src/poppler-link-extractor.cc | 4 ++-- + qt4/src/poppler-page.cc | 4 ++-- + utils/HtmlOutputDev.cc | 9 ++++---- + utils/HtmlOutputDev.h | 7 +++---- + utils/pdftohtml.cc | 2 +- + 17 files changed, 58 insertions(+), 61 deletions(-) + +commit 7d794f6411499fb8f26778bf2b54cb9734d004af +Author: Albert Astals Cid +Date: Thu Sep 1 15:47:32 2011 +0200 + + xpdf303: API rework, Gfx wants a PDFDoc instead of an XRef + + cpp/poppler-page-renderer.cpp | 2 +- + glib/poppler-document.cc | 2 +- + glib/poppler-page.cc | 2 -- + poppler/CairoFontEngine.cc | 28 ++++++++++++---------------- + poppler/CairoFontEngine.h | 13 ++++++------- + poppler/CairoOutputDev.cc | 12 +++++------- + poppler/CairoOutputDev.h | 6 +++--- + poppler/Catalog.cc | 8 +++++--- + poppler/Catalog.h | 4 +++- + poppler/Gfx.cc | 15 +++++++++------ + poppler/Gfx.h | 6 ++++-- + poppler/PDFDoc.cc | 6 +++--- + poppler/PSOutputDev.cc | 29 +++++++++++++++-------------- + poppler/PSOutputDev.h | 9 ++++----- + poppler/Page.cc | 8 +++++--- + poppler/Page.h | 4 +++- + poppler/PreScanOutputDev.cc | 6 +++--- + poppler/PreScanOutputDev.h | 4 ++-- + poppler/SplashOutputDev.cc | 13 +++++++------ + poppler/SplashOutputDev.h | 5 +++-- + qt4/src/poppler-private.h | 2 +- + qt4/src/poppler-ps-converter.cc | 2 -- + test/gtk-test.cc | 2 +- + test/pdf-inspector.cc | 2 +- + test/perf-test.cc | 2 +- + utils/pdftocairo.cc | 2 +- + utils/pdftohtml.cc | 6 +++--- + utils/pdftoppm.cc | 2 +- + utils/pdftops.cc | 4 ++-- + 29 files changed, 105 insertions(+), 101 deletions(-) + +commit 52fb80a7b3f98eb8322a7ba84e2900f044b3a18a +Author: Albert Astals Cid +Date: Thu Sep 1 13:27:01 2011 +0200 + + xpdf303: compile++ + + poppler/ArthurOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 37ca8dc4215693ec657d165ebdb6c315a0ae92c9 +Author: Carlos Garcia Campos +Date: Thu Sep 1 12:34:32 2011 +0200 + + xpdf303: Use int instead of Gushort for gid/cid maps + + fofi/FoFiTrueType.cc | 18 +++++++++--------- + fofi/FoFiTrueType.h | 14 +++++++------- + fofi/FoFiType1C.cc | 8 ++++---- + fofi/FoFiType1C.h | 2 +- + poppler/CairoFontEngine.cc | 22 +++++++++++----------- + poppler/CairoFontEngine.h | 8 ++++---- + poppler/GfxFont.cc | 22 +++++++++++----------- + poppler/GfxFont.h | 10 +++++----- + poppler/PSOutputDev.cc | 14 +++++++------- + poppler/SplashOutputDev.cc | 6 +++--- + splash/SplashFTFontEngine.cc | 6 +++--- + splash/SplashFTFontEngine.h | 2 +- + splash/SplashFTFontFile.cc | 12 ++++++------ + splash/SplashFTFontFile.h | 8 ++++---- + splash/SplashFontEngine.cc | 2 +- + splash/SplashFontEngine.h | 2 +- + 16 files changed, 78 insertions(+), 78 deletions(-) + +commit df942e25bff9b014bde0ff69c8a01fa3c1963015 +Author: Albert Astals Cid +Date: Thu Sep 1 01:08:10 2011 +0200 + + xpdf303: More parsing flexibility + + poppler/CharCodeToUnicode.cc | 18 ++++++------------ + 1 file changed, 6 insertions(+), 12 deletions(-) + +commit 5305dfc5702e8004e5ae35697c6aebd0b1a5c96e +Author: Albert Astals Cid +Date: Thu Sep 1 01:05:02 2011 +0200 + + xpdf303: Make sure codes are inside the range + + poppler/CharCodeToUnicode.cc | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit 45212483572c68abd612b5c62b21cbb545e10143 +Author: Albert Astals Cid +Date: Thu Sep 1 01:01:13 2011 +0200 + + xpdf303: change mapLen growing stragegy + + poppler/CharCodeToUnicode.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 75d70f190e97f69047cdbe97a872a936788392d9 +Author: Albert Astals Cid +Date: Thu Sep 1 01:00:23 2011 +0200 + + xpdf303: Limit code to 0xffffff + + poppler/CharCodeToUnicode.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit b4180a187f9246b6390df112e5536ead9ef9bcbe +Author: Albert Astals Cid +Date: Thu Sep 1 00:59:09 2011 +0200 + + xpdf303: Use parseHex instead of sscanf + + poppler/CharCodeToUnicode.cc | 18 ++++++++---------- + 1 file changed, 8 insertions(+), 10 deletions(-) + +commit 121f648f233adcdc631c7e29d67b60baa922e29a +Author: Albert Astals Cid +Date: Thu Sep 1 00:28:40 2011 +0200 + + Add helper parseHex function + + poppler/CharCodeToUnicode.cc | 35 +++++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) + +commit be0436ace671070bab4304efee607f40c959bc55 +Author: Albert Astals Cid +Date: Thu Sep 1 00:26:57 2011 +0200 + + xpdf303: CharCodeToUnicode::makeIdentityMapping & friends + + poppler/CharCodeToUnicode.cc | 25 +++++++++++++++++++++++++ + poppler/CharCodeToUnicode.h | 4 ++++ + 2 files changed, 29 insertions(+) + +commit 5dd94447b14db1894f06ad0590187dae7575e33a +Author: Albert Astals Cid +Date: Thu Sep 1 00:15:59 2011 +0200 + + xpdf303: Remove unused constructor + + splash/SplashXPath.cc | 5 ----- + splash/SplashXPath.h | 1 - + 2 files changed, 6 deletions(-) + +commit d00d56e4a46e8534378534de0d94ce0551d75d84 +Author: Albert Astals Cid +Date: Thu Sep 1 00:11:49 2011 +0200 + + xpdf303: Speedup SplashScreen + + By using << instead of * and by putting some functions on the header + so they can be inlined + + splash/SplashScreen.cc | 89 + +++++++++++++++++--------------------------------- + splash/SplashScreen.h | 14 ++++++-- + 2 files changed, 42 insertions(+), 61 deletions(-) + +commit 5e8debf96ab1bb9db31a0332a482d08c181d52ea +Author: Albert Astals Cid +Date: Wed Aug 31 23:56:52 2011 +0200 + + xpdf303: Add splashCheckDet helper + + splash/SplashMath.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 4cef5a52b33b1afba28d890bbe48000b734ac357 +Author: Albert Astals Cid +Date: Wed Aug 31 21:09:50 2011 +0200 + + xpdf303: Protect against NULL from lexer->getStream() + + poppler/Parser.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 2547ec60db6d954e5c8318e30fcc54f70bcfa95c +Author: Albert Astals Cid +Date: Wed Aug 31 21:05:11 2011 +0200 + + xpdf303: Add GBool force = gFalse to SplashPath::close + + splash/SplashPath.cc | 5 +++-- + splash/SplashPath.h | 6 ++++-- + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit 9370f9640a24c7b944f3da7c10e070a960bdd8f9 +Author: Albert Astals Cid +Date: Wed Aug 31 21:01:32 2011 +0200 + + xpdf303: Add guards to the header + + poppler/Stream-CCITT.h | 5 +++++ + 1 file changed, 5 insertions(+) + +commit ab9dea663a4df5af8f54c1ff5149254adfd72ce9 +Author: Albert Astals Cid +Date: Wed Aug 31 20:34:17 2011 +0200 + + xpdf303: Add SplashBitmap::writeAlphaPGMFile and + SplashBitmap::takeData + + splash/SplashBitmap.cc | 22 ++++++++++++++++++++++ + splash/SplashBitmap.h | 6 ++++++ + 2 files changed, 28 insertions(+) + +commit 6558d735c65a3dca9b9e16de5588c8b8c482f04f +Author: Albert Astals Cid +Date: Wed Aug 31 20:30:27 2011 +0200 + + xpdf303: Write faster + + splash/SplashBitmap.cc | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +commit a9b26d9c35fccc7b46a96acdb2064a9976bd49bd +Author: Albert Astals Cid +Date: Wed Aug 31 20:29:58 2011 +0200 + + xpdf303: Only free data if there is data to free + + splash/SplashBitmap.cc | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 8f6e0285d7e80d8c1a8defaad9d0f87a2e054151 +Author: Albert Astals Cid +Date: Wed Aug 31 20:20:47 2011 +0200 + + xpdf303: PDFDocEncoding changes + + This overwrites Michael Vrable's changes of using U+FFFD to actually + using the order, i'm taking Derek's change here + + poppler/PDFDocEncoding.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 9c8f30fb4a2a0dd2cf359610e33749e1682921c7 +Author: Albert Astals Cid +Date: Wed Aug 31 20:17:38 2011 +0200 + + xpdf303: comment changes + + poppler/Link.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit b78046057657b44c5cc9353d9e3dde356eb7fcbd +Author: Albert Astals Cid +Date: Wed Aug 31 19:32:03 2011 +0200 + + xpdf303: Introduce unicodeTypeNum and unicodeTypeAlphaNum + + poppler/UnicodeTypeTable.cc | 11 +++++++++++ + poppler/UnicodeTypeTable.h | 4 ++++ + 2 files changed, 15 insertions(+) + +commit 0ec4b390ddb7fa7d028b8f0515ecd3e61c488c9f +Author: Albert Astals Cid +Date: Wed Aug 31 19:30:55 2011 +0200 + + xpdf303: UnicodeTypeTable tables changes + + poppler/UnicodeTypeTable.cc | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +commit f331c009f94703d6007fce9570ee19c6e4822339 +Author: Albert Astals Cid +Date: Wed Aug 31 19:20:12 2011 +0200 + + xpdf303: Remove warning() from Error.h + + poppler/CairoOutputDev.cc | 6 +++--- + poppler/Error.cc | 7 ------- + poppler/Error.h | 1 - + 3 files changed, 3 insertions(+), 11 deletions(-) + +commit 53f94df2ce21793914ccc153ba6b2fe5cbeb8371 +Author: Albert Astals Cid +Date: Wed Aug 31 19:17:13 2011 +0200 + + Port to setErrorCallback + + cpp/poppler-document.cpp | 2 +- + cpp/poppler-private.cpp | 6 ++---- + cpp/poppler-private.h | 3 ++- + qt4/src/poppler-private.cc | 8 +++----- + test/perf-test.cc | 4 ++-- + 5 files changed, 10 insertions(+), 13 deletions(-) + +commit 95a52f06a98f49f7c8f2b92634b75af96b4eee1d +Author: Albert Astals Cid +Date: Wed Aug 31 19:07:22 2011 +0200 + + xpdf303: Forgot this when doing the char * -> const char * + + poppler/JPXStream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 00549400f155d8e36b4ac718603fc945858fe50d +Author: Albert Astals Cid +Date: Wed Aug 31 19:04:14 2011 +0200 + + xpdf303: error() changes, new param and formatting + + fofi/FoFiBase.cc | 8 +-- + fofi/FoFiTrueType.cc | 2 +- + fofi/FoFiType1.cc | 4 +- + goo/JpegWriter.cc | 2 +- + goo/PNGWriter.cc | 16 ++--- + poppler/Annot.cc | 40 +++++------ + poppler/ArthurOutputDev.cc | 16 ++--- + poppler/CMap.cc | 26 +++---- + poppler/CachedFile.cc | 2 +- + poppler/CairoFontEngine.cc | 10 +-- + poppler/Catalog.cc | 50 ++++++------- + poppler/CharCodeToUnicode.cc | 54 +++++++------- + poppler/CurlCachedFile.cc | 2 +- + poppler/DCTStream.cc | 2 +- + poppler/Decrypt.cc | 2 +- + poppler/Error.cc | 55 ++++++++++----- + poppler/Error.h | 23 +++++- + poppler/FileSpec.cc | 8 +-- + poppler/Form.cc | 44 ++++++------ + poppler/Function.cc | 107 ++++++++++++++-------------- + poppler/Gfx.cc | 161 + +++++++++++++++++++++--------------------- + poppler/GfxFont.cc | 102 ++++++++++++++------------- + poppler/GfxState.cc | 128 ++++++++++++++++----------------- + poppler/GfxState.h | 8 +-- + poppler/GlobalParams.cc | 38 +++++----- + poppler/GlobalParamsWin.cc | 4 +- + poppler/Hints.cc | 22 +++--- + poppler/JBIG2Stream.cc | 88 +++++++++++------------ + poppler/JPEG2000Stream.cc | 10 +-- + poppler/JPXStream.cc | 164 + ++++++++++++++++++++++--------------------- + poppler/Lexer.cc | 24 +++---- + poppler/Linearization.cc | 20 +++--- + poppler/Link.cc | 77 ++++++++++---------- + poppler/Movie.cc | 2 +- + poppler/Object.h | 8 +-- + poppler/OptionalContent.cc | 14 ++-- + poppler/PDFDoc.cc | 43 ++++++------ + poppler/PDFDocFactory.cc | 2 +- + poppler/PSOutputDev.cc | 45 ++++++------ + poppler/Page.cc | 12 ++-- + poppler/Parser.cc | 10 +-- + poppler/Rendition.cc | 6 +- + poppler/SecurityHandler.cc | 12 ++-- + poppler/SplashOutputDev.cc | 28 ++++---- + poppler/Stream.cc | 116 ++++++++++++++++-------------- + poppler/TextOutputDev.cc | 2 +- + poppler/UnicodeMap.cc | 15 ++-- + poppler/XRef.cc | 32 ++++----- + splash/Splash.cc | 2 +- + splash/SplashBitmap.cc | 6 +- + test/perf-test.cc | 4 +- + utils/HtmlOutputDev.cc | 18 ++--- + utils/ImageOutputDev.cc | 10 +-- + utils/pdfextract.cc | 4 +- + utils/pdfimages.cc | 2 +- + utils/pdfinfo.cc | 6 +- + utils/pdfmerge.cc | 6 +- + utils/pdftocairo.cc | 6 +- + utils/pdftohtml.cc | 6 +- + utils/pdftops.cc | 6 +- + utils/pdftotext.cc | 12 ++-- + 61 files changed, 912 insertions(+), 842 deletions(-) + +commit cd0764921064bfd455e9df52dc9bda6fbd2c2db2 +Author: Carlos Garcia Campos +Date: Wed Aug 31 17:23:28 2011 +0200 + + xpdf303: Always define at least 256 glyphs for Type 0 fonts + + fofi/FoFiTrueType.cc | 41 ++++++++++++++++++++++++++++++++++------- + fofi/FoFiTrueType.h | 3 ++- + 2 files changed, 36 insertions(+), 8 deletions(-) + +commit 4d4318e258fb68704b1a51a14fa89134606e2aa7 +Author: Carlos Garcia Campos +Date: Wed Aug 31 17:07:25 2011 +0200 + + xpdf303: Different growing strategy for vmtxTab in FoFiTrueType + + fofi/FoFiTrueType.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c8c7fcef9bc8f802be2d376c9d2099971f159317 +Author: Carlos Garcia Campos +Date: Wed Aug 31 17:05:16 2011 +0200 + + xpdf303: Fix memory leak in FoFiTrueType + + fofi/FoFiTrueType.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 655b1a97db5449c009e5b63fc7c12233e6fae450 +Author: Carlos Garcia Campos +Date: Wed Aug 31 16:54:05 2011 +0200 + + xpdf303: Check for an invalid loca format field in the head table + in FoFiTrueType + + fofi/FoFiTrueType.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 9710ab96f1cf26394cc473952a3331d60c149451 +Author: Carlos Garcia Campos +Date: Wed Aug 31 16:49:54 2011 +0200 + + Fix the build + + fofi/FoFiIdentifier.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 36b733a3165fd26aa8c25ba57faa5d2277aa31ec +Author: Carlos Garcia Campos +Date: Tue Aug 30 16:31:52 2011 +0200 + + xpdf303: Handle bogus loca table entries in FoFiTrueType + + where the offset is past the end of the glyf table. This part was + missing in previous commit. + + fofi/FoFiTrueType.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit a288bdb417582f07a5a0cb13d5218946a1d0ccc8 +Author: Albert Astals Cid +Date: Tue Aug 30 21:55:43 2011 +0200 + + xpdf303: Increase max keyLength to 32 + + poppler/XRef.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 12e0acd9d393df76e297bb3fde323092c428be21 +Author: Albert Astals Cid +Date: Tue Aug 30 21:03:05 2011 +0200 + + xpdf303: GfxXXXpath different growing strategy + + poppler/GfxState.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 7c5e496715f56498fb1aa08371d2b8d4d0e73d25 +Author: Albert Astals Cid +Date: Tue Aug 30 20:59:36 2011 +0200 + + xpdf303: No need for 4 Guint when 1 is enough + + poppler/GfxState.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e7e8082901e108130d5c98cc7648f143978c9562 +Author: Albert Astals Cid +Date: Tue Aug 30 20:50:17 2011 +0200 + + xpdf303: GooList::copy, GooList::reverse and GooList::put + + goo/GooList.cc | 22 ++++++++++++++++++++++ + goo/GooList.h | 10 ++++++++++ + 2 files changed, 32 insertions(+) + +commit 8a119cf205467c20269e7beffde9497ffd277c15 +Author: Albert Astals Cid +Date: Tue Aug 30 20:48:40 2011 +0200 + + xpdf303: Inserting with a negative i means prepending + + goo/GooList.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 95142a8e63e476324e368785001a23d4f1d462b9 +Author: Albert Astals Cid +Date: Tue Aug 30 20:47:12 2011 +0200 + + xpdf303: If size is 0 reserve 8 anyway + + goo/GooList.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bd1076da03f76fb62998a9409d366412f4aa5d13 +Author: Albert Astals Cid +Date: Tue Aug 30 20:45:36 2011 +0200 + + xpdf303: Complain for gmalloc and grealloc < 0 + + goo/gmem.cc | 28 ++++++++++++++++++++++++---- + 1 file changed, 24 insertions(+), 4 deletions(-) + +commit 5a42b3693a9e501a27d790d4aeafcb68f63cb950 +Author: Albert Astals Cid +Date: Tue Aug 30 20:38:39 2011 +0200 + + xpdf303: Honor the deleteKeys setting + + goo/GooHash.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit d584b54eff52c47f983947b2aff0967dfed0ccf9 +Author: Albert Astals Cid +Date: Tue Aug 30 20:36:03 2011 +0200 + + xpdf303: set to NULL on failure + + goo/gfile.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit bf2cb5c9c47b4a61192101f0a48771657228e383 +Author: Adrian Johnson +Date: Tue Aug 30 19:08:40 2011 +0930 + + Fix compile error with libpng >= 1.5.0 + + libpng 1.5.0 changed one of the types in the png_set_iCCP() function + prototype. + + goo/PNGWriter.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 6364c50ffb4053cc30cecbefff7a3142cab8c50b +Author: Albert Astals Cid +Date: Tue Aug 30 18:27:09 2011 +0200 + + xpdf303: Support for aes256 et all in Decrypt/SecurityHandler + + poppler/Decrypt.cc | 488 + +++++++++++++++++++++++++++++++++++++++------ + poppler/Decrypt.h | 19 +- + poppler/PDFDoc.cc | 2 +- + poppler/SecurityHandler.cc | 238 ++++++++++++---------- + poppler/SecurityHandler.h | 7 +- + poppler/Stream.h | 3 +- + 6 files changed, 595 insertions(+), 162 deletions(-) + +commit 39ce4575f96953b499d09074e847d492d18379fa +Author: Albert Astals Cid +Date: Tue Aug 30 17:39:30 2011 +0200 + + xpdf303: Add FoFiIdentifier + + CMakeLists.txt | 2 + + fofi/FoFiIdentifier.cc | 630 + +++++++++++++++++++++++++++++++++++++++++++++++++ + fofi/FoFiIdentifier.h | 42 ++++ + fofi/Makefile.am | 2 + + 4 files changed, 676 insertions(+) + +commit 33e7d54b4a29d297108ef3dc6008190625125ec8 +Author: Albert Astals Cid +Date: Tue Aug 30 17:36:22 2011 +0200 + + xpdf303: Also check against INT_MAX in FoFiBase + + fofi/FoFiBase.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit fb1f56f091e5329b30279916b182f64134f3b2e6 +Author: Albert Astals Cid +Date: Tue Aug 30 17:34:50 2011 +0200 + + xpdf303: Introduce FoFiBase::getU32LE + + fofi/FoFiBase.cc | 15 +++++++++++++++ + fofi/FoFiBase.h | 1 + + 2 files changed, 16 insertions(+) + +commit a79bc3359586cbc2c235d20dfa934dab1f475561 +Author: Carlos Garcia Campos +Date: Tue Aug 30 16:59:08 2011 +0200 + + xpdf303: Check for a zero-entry cmap table in FoFiTrueType + + fofi/FoFiTrueType.cc | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +commit efce014e39d0d13157b21a10ff8d483b5cfc561a +Author: Albert Astals Cid +Date: Tue Aug 30 17:02:16 2011 +0200 + + xpdf303: upddate xpdfCopyright + + poppler/poppler-config.h.cmake | 4 ++-- + poppler/poppler-config.h.in | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 2eb388ccc6c7526e66da804d9d800cf29a027914 +Author: Albert Astals Cid +Date: Tue Aug 30 16:50:39 2011 +0200 + + xpdf303: Merge README + + README | 2 +- + README-XPDF | 153 + +++++++++++++++++++++++++++++++++++++++--------------------- + 2 files changed, 101 insertions(+), 54 deletions(-) + +commit 331b0f1c16c4f636fc616569bab030969aa848f2 +Author: Carlos Garcia Campos +Date: Tue Aug 30 16:42:33 2011 +0200 + + xpdf303: Check for entries in the table directory with bogus tags + in FoFiTrueType + + This handles the case where the number of tables given in the + header is + too high. + + fofi/FoFiTrueType.cc | 30 +++++++++++++++++++++++++----- + 1 file changed, 25 insertions(+), 5 deletions(-) + +commit faaba717046ba87ef5ded614e2bcab6260a9f7c2 +Author: Albert Astals Cid +Date: Tue Aug 30 16:36:24 2011 +0200 + + xpdf303: FixedPoint improvements + + goo/FixedPoint.cc | 51 + ++++++++++++++++++++++++++++++++------------------ + goo/FixedPoint.h | 15 +++++++++++++-- + splash/Splash.cc | 12 ++++++++++++ + splash/SplashFTFont.cc | 16 ++++++++-------- + splash/SplashMath.h | 8 +++++--- + splash/SplashXPath.cc | 9 +++++++++ + 6 files changed, 80 insertions(+), 31 deletions(-) + +commit 73efc96eef6bd32a7c058b7dda8101f4f23c454f +Author: Carlos Garcia Campos +Date: Tue Aug 30 16:31:52 2011 +0200 + + xpdf303: Handle bogus loca table entries in FoFiTrueType + + where the offset is past the end of the glyf table. + + fofi/FoFiTrueType.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 1df3489392a77e2b75adbafcc2fa10de829c172e +Author: Carlos Garcia Campos +Date: Tue Aug 30 16:21:40 2011 +0200 + + xpdf303: Use std::sort (with functors) in place of qsort + + It can be significantly faster. Not included changes in + SplashXPathScanner.cc since they depend on other changes not yet + merged. + + fofi/FoFiTrueType.cc | 55 + +++++++++++++++++++++++--------------------------- + poppler/GfxFont.cc | 24 ++++++++++++++-------- + splash/SplashScreen.cc | 12 +++++++---- + splash/SplashXPath.cc | 44 ++++++++++++++++++---------------------- + 4 files changed, 69 insertions(+), 66 deletions(-) + +commit f298e7f844105f2d9a36144e59be86c341e37507 +Merge: 2a6bd7aa 0ca5453f +Author: Albert Astals Cid +Date: Tue Aug 30 16:21:58 2011 +0200 + + Merge branch 'master' into xpdf303merge + +commit 0ca5453fea9e5342188f772acd6f31af1778f236 +Author: Albert Astals Cid +Date: Tue Aug 30 16:20:17 2011 +0200 + + Compile when defining USE_FIXEDPOINT + + splash/Splash.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit bd7a53bc2f27fc3979f8de306e2dcaca53d4570a +Author: Albert Astals Cid +Date: Tue Aug 30 16:20:08 2011 +0200 + + match function definition + + poppler/SplashOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2a6bd7aae37f73a94bf1a84f699f310177661611 +Author: Albert Astals Cid +Date: Tue Aug 30 15:13:17 2011 +0200 + + xpdf303: Expand latin1UnicodeMapRanges and ascii7UnicodeMapRanges + + poppler/UnicodeMapTables.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +commit 4d31785409e464d0e96dcf11167ecdffd64026d1 +Author: Albert Astals Cid +Date: Tue Aug 30 15:09:01 2011 +0200 + + xpdf303: More entries for nameToUnicodeTab + + poppler/NameToUnicodeTable.h | 3159 + ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 3159 insertions(+) + +commit 2658030836f3a15dadadd7f1989dfaa858bf876f +Author: Albert Astals Cid +Date: Tue Aug 30 14:49:23 2011 +0200 + + xpdf303: char * -> const char * + + cmake/modules/PopplerMacros.cmake | 2 +- + configure.ac | 2 +- + cpp/poppler-private.cpp | 2 +- + cpp/poppler-private.h | 2 +- + fofi/FoFiBase.h | 2 +- + fofi/FoFiEncodings.cc | 6 ++--- + fofi/FoFiEncodings.h | 6 ++--- + fofi/FoFiTrueType.cc | 10 ++++----- + fofi/FoFiTrueType.h | 4 ++-- + fofi/FoFiType1.cc | 4 ++-- + fofi/FoFiType1.h | 2 +- + fofi/FoFiType1C.cc | 14 ++++++------ + fofi/FoFiType1C.h | 6 ++--- + goo/GooHash.cc | 16 +++++++------- + goo/GooHash.h | 12 +++++----- + goo/GooString.cc | 22 +++++++++---------- + goo/GooString.h | 16 +++++++------- + goo/gfile.cc | 4 ++-- + goo/gfile.h | 4 ++-- + goo/gmem.cc | 2 +- + goo/gmem.h | 2 +- + poppler/Annot.cc | 8 +++---- + poppler/Annot.h | 6 ++--- + poppler/ArthurOutputDev.cc | 6 ++--- + poppler/BuiltinFont.cc | 6 ++--- + poppler/BuiltinFont.h | 10 ++++----- + poppler/DCTStream.cc | 2 +- + poppler/DCTStream.h | 2 +- + poppler/Dict.cc | 14 ++++++------ + poppler/Dict.h | 14 ++++++------ + poppler/Error.cc | 10 ++++----- + poppler/Error.h | 6 ++--- + poppler/FileSpec.cc | 2 +- + poppler/FlateStream.cc | 2 +- + poppler/FlateStream.h | 2 +- + poppler/FontEncodingTables.cc | 14 ++++++------ + poppler/FontEncodingTables.h | 14 ++++++------ + poppler/FontInfo.cc | 2 +- + poppler/Form.cc | 6 ++--- + poppler/Form.h | 4 ++-- + poppler/Gfx.cc | 2 +- + poppler/Gfx.h | 2 +- + poppler/GfxFont.cc | 46 + +++++++++++++++++++-------------------- + poppler/GfxFont.h | 8 +++---- + poppler/GfxState.cc | 6 ++--- + poppler/GfxState.h | 2 +- + poppler/GlobalParams.cc | 21 +++++++++--------- + poppler/GlobalParams.h | 8 +++---- + poppler/GlobalParamsWin.cc | 6 ++--- + poppler/JBIG2Stream.cc | 2 +- + poppler/JBIG2Stream.h | 2 +- + poppler/JPEG2000Stream.cc | 2 +- + poppler/JPEG2000Stream.h | 2 +- + poppler/JPXStream.h | 2 +- + poppler/NameToCharCode.cc | 8 +++---- + poppler/NameToCharCode.h | 6 ++--- + poppler/NameToUnicodeTable.h | 2 +- + poppler/Object.cc | 4 ++-- + poppler/Object.h | 28 ++++++++++++------------ + poppler/PDFDoc.cc | 2 +- + poppler/PSOutputDev.cc | 24 ++++++++++---------- + poppler/PSOutputDev.h | 8 +++---- + poppler/Page.cc | 2 +- + poppler/Page.h | 2 +- + poppler/SplashOutputDev.cc | 6 ++--- + poppler/Stream.cc | 16 +++++++------- + poppler/Stream.h | 28 ++++++++++++------------ + poppler/TextOutputDev.cc | 2 +- + poppler/TextOutputDev.h | 2 +- + poppler/UnicodeMap.cc | 4 ++-- + poppler/UnicodeMap.h | 4 ++-- + poppler/UnicodeTypeTable.cc | 4 ++-- + qt4/src/poppler-private.cc | 2 +- + qt4/src/poppler-ps-converter.cc | 2 +- + splash/SplashFTFontEngine.cc | 8 +++---- + splash/SplashFTFontEngine.h | 6 ++--- + splash/SplashFTFontFile.cc | 6 ++--- + splash/SplashFTFontFile.h | 2 +- + splash/SplashFontEngine.cc | 6 ++--- + splash/SplashFontEngine.h | 6 ++--- + splash/SplashT1FontEngine.cc | 6 ++--- + splash/SplashT1FontEngine.h | 4 ++-- + splash/SplashT1FontFile.cc | 10 ++++----- + splash/SplashT1FontFile.h | 6 ++--- + test/pdf-operators.c | 4 ++-- + test/perf-test.cc | 4 ++-- + utils/HtmlFonts.cc | 4 ++-- + utils/HtmlOutputDev.cc | 12 +++++----- + utils/HtmlOutputDev.h | 4 ++-- + utils/parseargs.cc | 4 ++-- + utils/parseargs.h | 6 ++--- + utils/pdffonts.cc | 2 +- + utils/pdfinfo.cc | 12 +++++----- + utils/pdftocairo.cc | 4 ++-- + utils/pdftohtml.cc | 10 ++++----- + utils/pdftotext.cc | 12 +++++----- + 96 files changed, 337 insertions(+), 338 deletions(-) + +commit c899d26e0f7a61db99925179330c28df015a676b +Author: Albert Astals Cid +Date: Tue Aug 30 00:31:00 2011 +0200 + + Add COPYING3 from xpdf3.03 + + COPYING3 | 674 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 674 insertions(+) + +commit 508517a35cb3bc5195682a9cd89fb50a801eddc2 +Author: Albert Astals Cid +Date: Mon Aug 29 23:55:42 2011 +0200 + + 0.17.3 + + CMakeLists.txt | 4 ++-- + NEWS | 32 ++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 2 +- + 10 files changed, 42 insertions(+), 10 deletions(-) + +commit 1431564f3363a63a8669c8dd15970db814f4969f +Author: Thomas Freitag +Date: Mon Aug 29 22:22:02 2011 +0200 + + Add pdfextract and pdfmerge + + See "Creating PDF with poppler ?" thread for more info + + utils/CMakeLists.txt | 15 +++++ + utils/Makefile.am | 10 +++ + utils/pdfextract.cc | 111 ++++++++++++++++++++++++++++++++ + utils/pdfmerge.cc | 176 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 312 insertions(+) + +commit 8ca2f41089bc6402baf9b24428af04314c037b54 +Author: Thomas Freitag +Date: Mon Aug 29 22:20:52 2011 +0200 + + Rework writing of PDF files + + Makes it more compatible with other PDF readers + See "Creating PDF with poppler ?" thread in the mailing list for + more info + + poppler/PDFDoc.cc | 389 + ++++++++++++++++++++++++++++++++++++++++++++++++------ + poppler/PDFDoc.h | 30 ++++- + 2 files changed, 375 insertions(+), 44 deletions(-) + +commit 33da7e270431e8e4c500e7573b3ca0dddd9f237e +Author: suzuki toshiya +Date: Sun Aug 28 22:07:38 2011 +0200 + + Fix building static-linked pdftocairo + + utils/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 91fafce028ca6620c0eb22e370fb4c6fd3404e3c +Author: Adrian Johnson +Date: Tue Aug 23 21:02:02 2011 +0930 + + cairo: align strokes when Stroke Adjust is true and line width <= 1 + + If the stroke coordinates are not aligned, lines in cairo may be up to + 1 pixel wider than the requested width. This is most obvious when the + line width is 1 and the rendered line is 2 pixels. + + When Stroke Adjust is true, the PDF standard requires that stroke + coordinates be adjusted to ensure the stroke width is within half a + pixel of the requested width. + + If Stroke Adjust is enabled and the width is <= 1 pixel (the previous + commit adjusts the width to be at least 1 pixel), use the method + documented at http://www.cairographics.org/FAQ/#sharp_lines to align + the coordinates to ensure the rendered width is 1 pixel. + + Fixes bug #4536. + + poppler/CairoOutputDev.cc | 40 +++++++++++++++++++++++++++++++++++----- + poppler/CairoOutputDev.h | 3 +++ + 2 files changed, 38 insertions(+), 5 deletions(-) + +commit cfc67afe80b963ba662018674cadf3085466bb9f +Author: Adrian Johnson +Date: Tue Aug 23 20:46:24 2011 +0930 + + cairo: fix stroking of very thin lines + + Lines with a width less than 1.0 are almost invisible in cairo output + due to antialising. The PDF standard states that when the Stroke + Adjust graphics parameter is true, all lines must be at least one + pixel wide. + + Add a stroke_adjust flag to the CairoOuputDev. Like splash, use the + globalParam strokeAdjust setting (which defaults to true) to + initialize the flag and ignore the Stroke Adjust settng in PDF + files. This emulates Acrobat behavior. + + When stroke_adjust is true, find the line width in device pixels and + if less than 0.5 set the line width to 0.5 device pixels. The value + 0.5 pixels seems to make horizontal and vertical lines look better + because integer aligned 1.0 wide lines in cairo are rendered two + pixels wide which looks too fat. + + poppler/CairoOutputDev.cc | 20 +++++++++++++++++++- + poppler/CairoOutputDev.h | 1 + + 2 files changed, 20 insertions(+), 1 deletion(-) + +commit 7a7c932e09796b944dda69df1b339c889ee1d63a +Author: Albert Astals Cid +Date: Thu Aug 25 00:23:40 2011 +0200 + + Add a way to get the fully qualified name + + qt4/src/poppler-form.cc | 12 +++++++++++- + qt4/src/poppler-form.h | 8 +++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) + +commit e001871d927f9cc86b4327d64e4c66ad00172ad0 +Author: Albert Astals Cid +Date: Wed Aug 24 23:44:18 2011 +0200 + + Clarify ownership + + qt4/src/poppler-qt4.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 87c48fdc175be4d852b953778f915ea93cd50194 +Author: Adrian Johnson +Date: Wed Aug 24 19:53:48 2011 +0930 + + cairo: fix unique id mime data + + The unique id string was copied before the object number was appended + resulting in all images in pdf output being the same. + + poppler/CairoOutputDev.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 08a2ba6f1603246651f0d5e697b88d38363d7df2 +Author: Pino Toscano +Date: Tue Aug 23 20:20:32 2011 +0200 + + pdftocairo/cmake: need to link to freetype + + utils/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 82496b18dc4aff66cc29f2b6607c8f894afe8b49 +Author: Albert Astals Cid +Date: Mon Aug 22 16:42:28 2011 +0200 + + Update Adrian (C) + + poppler/GfxFont.h | 1 + + 1 file changed, 1 insertion(+) + +commit 2576e3a6d9746e2272c620a775e11295932eb5f2 +Author: Adrian Johnson +Date: Mon Aug 22 21:41:36 2011 +0930 + + update SEE ALSO section of man pages + + - ensure each man page references all other utils + - sort list of utils in alphabetical order + + utils/pdffonts.1 | 8 +++++--- + utils/pdfimages.1 | 8 +++++--- + utils/pdfinfo.1 | 8 +++++--- + utils/pdftocairo.1 | 2 +- + utils/pdftohtml.1 | 8 ++++++++ + utils/pdftoppm.1 | 8 +++++--- + utils/pdftops.1 | 8 +++++--- + utils/pdftotext.1 | 9 +++++---- + 8 files changed, 39 insertions(+), 20 deletions(-) + +commit 23ec5c8d394beb632ee45f6308215646cd1a0195 +Author: Adrian Johnson +Date: Mon Aug 22 21:26:24 2011 +0930 + + cairo: only use show_text_glyphs if the surface supports it and the + font has toUnicode + + When generating pdf output, fonts that do not have toUnicode cause an + excessive number of empty text ActualText entries to be written due to + glyphs that do not have have a mapping. + + poppler/CairoOutputDev.cc | 12 ++++++++---- + poppler/CairoOutputDev.h | 1 + + poppler/GfxFont.h | 3 +++ + 3 files changed, 12 insertions(+), 4 deletions(-) + +commit 3a574f13fa22b7c31eda0d0437f4094a5a39ff34 +Author: Adrian Johnson +Date: Fri Aug 19 23:23:24 2011 +0930 + + cairo: fix stroke patterns + + Since cairo still does not yet have cairo_stroke_to_path(), this + implements a workaround for stroke patterns. In clipToStrokePath, the + stroke path and stroke parameters are saved. In tilingPatternFill and + fill (used to draw shading patterns) if a stroke path clip has been + saved, the current pattern is stroked instead of filled using the + saved stroke. + Fixes bug #11719. + + poppler/CairoOutputDev.cc | 52 + ++++++++++++++++++++++++++++++++++++++++++++++- + poppler/CairoOutputDev.h | 17 ++++++++++++++-- + 2 files changed, 66 insertions(+), 3 deletions(-) + +commit eb740dac838d2a1e32899327ca6d25c3dca641df +Author: Carlos Garcia Campos +Date: Mon Aug 22 13:41:56 2011 +0200 + + glib-demo: Add text attributes information to text demo + + glib/demo/text.c | 103 + +++++++++++++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 97 insertions(+), 6 deletions(-) + +commit cda4aefaa136ae07778de3b1593808a5aaa2db5b +Author: Carlos Garcia Campos +Date: Mon Aug 22 13:40:49 2011 +0200 + + glib-demo: Add pgd_pixbuf_new_for_color() to utils + + To get a pixbuf for a given poppler color. + + glib/demo/annots.c | 22 +--------------------- + glib/demo/utils.c | 27 +++++++++++++++++++++++++++ + glib/demo/utils.h | 1 + + 3 files changed, 29 insertions(+), 21 deletions(-) + +commit 2a11b2963a548186654722a393db1e19d57828f1 +Author: danigm +Date: Mon Aug 22 12:51:50 2011 +0200 + + glib: Add poppler_page_get_text_attributes() + + It returns a list of text attributes that apply to a range of text as + returned by poppler_page_get_text(). Text attributes are represented + by + a PopplerTextAttributes struct that contains font name, font size, + whether text is undrlined and foreground color for a range of text. + Fixes bug #33269. + + glib/poppler-page.cc | 202 + ++++++++++++++++++++++++++++++++++++ + glib/poppler-page.h | 33 ++++++ + glib/poppler.h | 1 + + glib/reference/poppler-sections.txt | 7 ++ + 4 files changed, 243 insertions(+) + +commit 15f99157cf3900bf20cf619e204ae53085af497d +Author: Carlos Garcia Campos +Date: Mon Aug 22 12:43:12 2011 +0200 + + textoutputdev: Add TextFontInfo::matches() + + It checks whether two TextFontInfo objects contain the same font. + + poppler/TextOutputDev.cc | 4 ++++ + poppler/TextOutputDev.h | 1 + + 2 files changed, 5 insertions(+) + +commit 5b554b39fca634c8ba58915c14522cb2920fe280 +Author: Pino Toscano +Date: Mon Aug 22 13:16:23 2011 +0200 + + pdftocairo/cmake: link to lcms library if available + + utils/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +commit f7cd236fea8740ef05635d1fd7917a778cc373f0 +Author: Albert Astals Cid +Date: Mon Aug 22 00:00:32 2011 +0200 + + Ship HtmlUtils.h + + utils/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit a128a858c50287cfba74c69996276ea44370dc26 +Author: Albert Astals Cid +Date: Sun Aug 21 23:52:06 2011 +0200 + + Update Adrian's (C) + + goo/PNGWriter.cc | 2 +- + goo/PNGWriter.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b78134314107d8344360c3313478115ed291630d +Author: Albert Astals Cid +Date: Sun Aug 21 23:46:09 2011 +0200 + + Fix copyright + + c&p is evil + + goo/gtypes_p.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ade53277546cef4ba19d982518c0cd83a4bb9c12 +Author: Albert Astals Cid +Date: Sun Aug 21 23:42:53 2011 +0200 + + Move HAVE_STDINT_H use to a private header + + This way we do not need to expose it in poppler-config.h since + gtypes.h is a half public header + + goo/Makefile.am | 1 + + goo/gtypes.h | 18 ------------------ + goo/gtypes_p.h | 30 ++++++++++++++++++++++++++++++ + poppler/CairoOutputDev.cc | 1 + + poppler/CairoRescaleBox.cc | 1 + + utils/pdftocairo.cc | 1 + + 6 files changed, 34 insertions(+), 18 deletions(-) + +commit 6166c3a37a4d6307d4f23ee272ea07c95bbba74a +Author: Albert Astals Cid +Date: Sun Aug 21 23:31:30 2011 +0200 + + Silence silly gcc + + goo/PNGWriter.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit eb5b228c4c24152e632c931b63c64ffb1e10d45d +Author: Adrian Johnson +Date: Sat Aug 20 21:13:18 2011 +0930 + + pdftocairo: fix writing to stdout for ps/pdf/svg + + utils/pdftocairo.cc | 23 ++++++++++++++++++++--- + 1 file changed, 20 insertions(+), 3 deletions(-) + +commit 1beac5896a301be68de22240017fef11e7d27d40 +Author: Adrian Johnson +Date: Sat Aug 13 00:23:23 2011 +0930 + + Add poppler version to PSOutputDev ouput + + poppler/PSOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b35fd3651fd3dbaa876fc64b8c5cfe77ae67335f +Author: Adrian Johnson +Date: Fri Aug 5 23:01:51 2011 +0930 + + cairo: use cairo_show_text_glyphs() when printing + + This will allow cairo to setup the correct toUnicode or glyph names to + ensure text can be extracted. + + poppler/CairoOutputDev.cc | 41 ++++++++++++++++++++++++++++++++++++++--- + poppler/CairoOutputDev.h | 5 +++++ + 2 files changed, 43 insertions(+), 3 deletions(-) + +commit 51ade078bc1fa737e20120ae4cb3bf693a219823 +Author: Stefan Thomas +Date: Thu Jul 15 16:24:55 2010 +0100 + + pdftocairo: Added to CMake build system. + + utils/CMakeLists.txt | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit 5a8745cdf428e22641937977eedfc1d605f6ff07 +Author: Adrian Johnson +Date: Fri Aug 12 23:57:01 2011 +0930 + + Add pdftocairo man page + + utils/Makefile.am | 5 +- + utils/pdftocairo.1 | 254 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 258 insertions(+), 1 deletion(-) + +commit b67a12b2b26692e2ccec7ff2e6df18fee05be535 +Author: Adrian Johnson +Date: Thu Aug 11 21:34:11 2011 +0930 + + pdftocairo - utility for creating png/jpeg/ps/eps/pdf/svg using + CairoOutputDev + + utils/.gitignore | 2 +- + utils/Makefile.am | 20 +- + utils/pdftocairo.cc | 970 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 989 insertions(+), 3 deletions(-) + +commit 4f2d774826bf7bb7b3825e02c5ca4c2928643950 +Author: Adrian Johnson +Date: Thu Aug 11 21:32:53 2011 +0930 + + png: add support for embedding ICC profile + + goo/PNGWriter.cc | 28 ++++++++++++++++++++++++++++ + goo/PNGWriter.h | 8 ++++++++ + 2 files changed, 36 insertions(+) + +commit 1091f47310bf0fc71bac5dd4ec81dad50b2f2537 +Author: Adrian Johnson +Date: Wed Aug 10 18:48:15 2011 +0930 + + png: Add additional pixel formats + + RGBA is required for images with transparency. GRAY and MONOCHROME + allow PNGWriter write more compact PNG files when the images is known + to be all gray or monochrome. + + goo/PNGWriter.cc | 30 ++++++++++++++++++++++++++---- + goo/PNGWriter.h | 11 ++++++++++- + 2 files changed, 36 insertions(+), 5 deletions(-) + +commit c6f26915db568f12892d48005746ad2922c19000 +Author: Adrian Johnson +Date: Wed Aug 10 18:45:24 2011 +0930 + + png: use PNG_RESOLUTION_METER instead of PNG_RESOLUTION_UNKNOWN to + set resolution + + gimp does not show the correct resolution unless PNG_RESOLUTION_METER + is used + + goo/PNGWriter.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 2667d2a5b34e1bbf322aea42876e7e81aa06dc29 +Author: Adrian Johnson +Date: Tue Aug 9 22:05:53 2011 +0930 + + Use stdint.h instead of assuming the size of types + + configure.ac | 1 + + goo/gtypes.h | 18 ++++++++++++++++++ + poppler/CairoOutputDev.cc | 2 -- + poppler/CairoRescaleBox.cc | 2 -- + 4 files changed, 19 insertions(+), 4 deletions(-) + +commit c043f298e68bdfffcb7505ec354ec7487b5bd7b2 +Author: Adrian Johnson +Date: Fri Jul 8 21:13:36 2011 +0930 + + cairo: assume printer pixel size is 1/600" when stroking 0 width lines + + Fixes bug #39067. + + poppler/CairoOutputDev.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 961adf0b767be78d3556b7315de3761d3d46b107 +Author: Adrian Johnson +Date: Thu Aug 18 17:44:35 2011 +0930 + + cairo: set mime data for soft masked images + + Fixes bug #40192. + + poppler/CairoOutputDev.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 86271e4810f714d4ba7a2a6651a9b1d04f653262 +Author: Joshua Richardson +Date: Thu Aug 18 18:48:40 2011 +0200 + + pdftohtml: Support text rotation + + Includes a few other fixlets. + See bug 38586 for more info + + utils/HtmlFonts.cc | 64 ++++++++++--------- + utils/HtmlFonts.h | 10 ++- + utils/HtmlOutputDev.cc | 170 + ++++++++++++++++++++++++++++++++++--------------- + utils/HtmlOutputDev.h | 8 ++- + utils/HtmlUtils.h | 51 +++++++++++++++ + 5 files changed, 218 insertions(+), 85 deletions(-) + +commit 56248b84e2185483dd54704c13838e8f78029d49 +Author: Albert Astals Cid +Date: Thu Aug 18 12:40:51 2011 +0200 + + Only declare overprint if we are going to use it + + utils/pdftoppm.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit a1093aae9f64cb6768164551d50cafaef52876c1 +Author: Albert Astals Cid +Date: Thu Aug 18 12:30:29 2011 +0200 + + Fix Adrian's (C) + + poppler/PSOutputDev.cc | 2 +- + poppler/PSOutputDev.h | 3 ++- + poppler/PreScanOutputDev.cc | 1 + + poppler/PreScanOutputDev.h | 1 + + poppler/SplashOutputDev.cc | 1 + + poppler/SplashOutputDev.h | 1 + + 6 files changed, 7 insertions(+), 2 deletions(-) + +commit 7741b24d05f50c134cf15361d52f5df7ae3c3115 +Author: Adrian Johnson +Date: Sun Aug 14 22:06:22 2011 +0930 + + ps: Avoid using /PatternType if only one instance of the pattern + is used + + this optimization makes pages print faster on my LaserJet + + poppler/PSOutputDev.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit a60e61ac64634dc59c80d8e6b0288c1269fc0154 +Author: Adrian Johnson +Date: Sun Aug 14 21:55:24 2011 +0930 + + ps: use PS Patterns for tiling fill when PS level >= 2 + + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 4 +-- + poppler/Gfx.cc | 4 +-- + poppler/OutputDev.h | 2 +- + poppler/PSOutputDev.cc | 59 + +++++++++++++++++++++++++++++++++++++++++---- + poppler/PSOutputDev.h | 13 +++++++++- + poppler/PreScanOutputDev.cc | 2 +- + poppler/PreScanOutputDev.h | 2 +- + poppler/SplashOutputDev.cc | 2 +- + poppler/SplashOutputDev.h | 2 +- + 10 files changed, 76 insertions(+), 16 deletions(-) + +commit 9938770e737b2fcec8269147e70663517f848925 +Author: Albert Astals Cid +Date: Mon Aug 15 13:17:24 2011 +0200 + + 0.17.2 + + CMakeLists.txt | 4 ++-- + NEWS | 37 +++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Doxyfile | 2 +- + qt4/src/Makefile.am | 5 +++-- + 10 files changed, 49 insertions(+), 11 deletions(-) + +commit 378fc06c574b85b5c003ca842aa743f0ffe5587e +Author: Albert Astals Cid +Date: Mon Aug 1 22:14:12 2011 +0200 + + Only assume the OC is not visible if it exists and is set to no + + Similar to commit e2def20a45c1d8307fd62fabb9769121af975abf + but in the other branch of the if, fixes bug 39637 + + poppler/OptionalContent.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 861a7bfb9431609e1e148240447f23c8e83b9d0f +Author: Thomas Freitag +Date: Fri Jul 29 00:30:58 2011 +0200 + + Implement overprint in Splash + + See the "Implementing overprint in Splash" thread in the mailing + list for more info + + goo/ImgWriter.h | 2 + + goo/JpegWriter.cc | 54 ++++++-- + goo/JpegWriter.h | 7 +- + poppler/Gfx.cc | 98 +++++++++++++-- + poppler/GfxState.cc | 1 + + poppler/GfxState.h | 4 + + poppler/OutputDev.h | 1 + + poppler/SplashOutputDev.cc | 307 + +++++++++++++++++++++++++++++++++++++++------ + poppler/SplashOutputDev.h | 51 +++++++- + splash/Splash.cc | 86 +++++++++---- + splash/Splash.h | 9 +- + splash/SplashBitmap.cc | 64 +++++++++- + splash/SplashBitmap.h | 1 + + splash/SplashPattern.cc | 16 ++- + splash/SplashPattern.h | 7 ++ + splash/SplashState.cc | 11 +- + splash/SplashState.h | 22 ++++ + splash/SplashTypes.h | 5 +- + utils/pdftoppm.cc | 36 +++++- + 19 files changed, 686 insertions(+), 96 deletions(-) + +commit e2fa8a2ca8459d19c0f9dca445a2399b9a3d483d +Author: Koji Otani +Date: Thu Jul 28 12:43:57 2011 +0200 + + Parse the "Medium" modifier when asking fontconfig for a font + + poppler/GlobalParams.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 0a677dd8dc9c55936530ea1fee901cab831c52af +Author: Koji Otani +Date: Thu Jul 28 12:42:16 2011 +0200 + + Improve selection of CJK fonts + + Seems we need to do some more fontconfig magic for some special + fontconfig configurations + More info at bug 36474 + + poppler/GlobalParams.cc | 137 + +++++++++++++++++++++++++++++++----------------- + 1 file changed, 89 insertions(+), 48 deletions(-) + +commit e78aff6796a5d5a0a4f2fe8c7ceb33c506e2c8f5 +Author: William Bader +Date: Tue Jul 26 00:10:34 2011 +0200 + + make -level1sep write gray instead of cmyk + + If it is a gray only image + Bug 39012 + + poppler/PSOutputDev.cc | 63 + +++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 60 insertions(+), 3 deletions(-) + +commit ea31309487aab6ed407a086dff1f350b6e4bdbc9 +Author: Albert Astals Cid +Date: Tue Jul 26 00:09:27 2011 +0200 + + Update (C) + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a945641497946a825dc880f94200ea1d5409332b +Author: Hib Eris +Date: Sat Jul 23 08:44:06 2011 +0200 + + Handle missing startxref properly + + Bug 38209 + + poppler/PDFDoc.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 2c1b25ef2592367f4c18e204ab5d102f15cf272f +Author: William Bader +Date: Mon Jul 25 23:43:27 2011 +0200 + + Fix a bad memory access + + When not using antialias and the character starts to the left/top + of the image + Bug 37189 + + splash/Splash.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit 300900afa2140141748a7571270be5d850274072 +Author: Daniel Glöckner +Date: Sat Jul 23 19:49:15 2011 +0200 + + Fix numerical overflow in libopenjpeg JPXStream::doLookChar() + + It also includes a speed optimization. Bug 39361 + + poppler/JPEG2000Stream.cc | 37 ++++++++++++++++++++++++++++++++++++- + poppler/JPEG2000Stream.h | 36 +++++++++++------------------------- + 2 files changed, 47 insertions(+), 26 deletions(-) + +commit ec6ea621b066a3b332a8099341664889d2ff3743 +Author: Axel Struebing +Date: Thu Jul 21 23:12:36 2011 +0200 + + Fix calculation of startXRefPos + + Reviewed by Hib Eris + See "another problem with saving linearized files" in the mailing + list for more info + + poppler/PDFDoc.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit ce97cfcd6373c98fb8c63e9b3ef6c51738f22a50 +Author: Albert Astals Cid +Date: Wed Jul 20 00:24:52 2011 +0200 + + Render dots for 0 length dashed lines + + Bug 34150 + + splash/Splash.cc | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 42c1b1c4af6b07f488d1b2b02a4700f19b0ab0ef +Author: Tomas Hoger +Date: Wed Jul 20 00:23:15 2011 +0200 + + Fix crash on truncated JPEG/DCT stream + + Bug 36693 + + poppler/DCTStream.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 091b570c63694e475c24bb8805638ac70c654892 +Author: Albert Astals Cid +Date: Wed Jul 20 00:19:43 2011 +0200 + + Make sure the dict is a page dict + + Fixes second part of 35925 and 39072 + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac566c887ffae9d384587f7587609642aef7a016 +Author: Albert Astals Cid +Date: Wed Jul 20 00:17:49 2011 +0200 + + Do not crash if can not get page 0 for some reason + + qt4/tests/test-poppler-qt4.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 6ad95e7b8b9766aa19f01f06f02eb430e4a4a899 +Author: Albert Astals Cid +Date: Mon Jul 11 15:04:49 2011 +0100 + + Complete the list of preprocessor defines that we never define + + When using any of the two sanctioned build systems + + poppler/poppler-config.h.cmake | 6 ++++-- + poppler/poppler-config.h.in | 6 ++++-- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit edcc84ef0137a733cf3fab79b919af309d87325c +Author: Albert Astals Cid +Date: Mon Jul 11 15:00:39 2011 +0100 + + Harmonize all SPLASH_CMYK to use #if + + poppler/SplashOutputDev.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit a8fca630d592941c033ca6a380bf46b6e733a748 +Author: Albert Astals Cid +Date: Mon Jul 11 14:57:33 2011 +0100 + + Sanitize headers a big + + * Remove includes to config.h as that file does not exist + * Add to poppler-config.h all the defines we define in the + configure/cmake process and are used in headers + * Include poppker-config.h where needed + + goo/GooTimer.h | 2 ++ + goo/ImgWriter.h | 3 +- + goo/JpegWriter.h | 3 +- + goo/PNGWriter.h | 4 +-- + goo/TiffWriter.h | 3 +- + goo/gfile.h | 3 +- + poppler/DCTStream.h | 5 ++-- + poppler/FlateStream.h | 5 ++-- + poppler/Gfx.h | 3 +- + poppler/GfxState.h | 2 ++ + poppler/Stream.h | 3 +- + poppler/poppler-config.h.cmake | 63 + ++++++++++++++++++++++++++++++++++++++++++ + poppler/poppler-config.h.in | 63 + ++++++++++++++++++++++++++++++++++++++++++ + splash/SplashFTFont.h | 4 ++- + splash/SplashMath.h | 4 ++- + 15 files changed, 153 insertions(+), 17 deletions(-) + +commit 214322f3c66a9aad4e2a46f6e305a3dacaa4f8b1 +Author: Albert Astals Cid +Date: Sun Jul 10 01:20:21 2011 +0100 + + And 3 years later, Ed has answered :-) + + Now all our changes are GPLv2+ + + poppler/GfxFont.cc | 3 +++ + poppler/GlobalParams.cc | 3 +++ + poppler/TextOutputDev.cc | 3 +++ + poppler/TextOutputDev.h | 3 +++ + poppler/UnicodeTypeTable.cc | 3 +++ + poppler/UnicodeTypeTable.h | 3 +++ + 6 files changed, 18 insertions(+) + +commit 37cc1344672f480d4062aafbd2f3245ca1392279 +Author: Albert Astals Cid +Date: Sun Jul 10 01:15:44 2011 +0100 + + Fix header + + The file was modified in 2009 and README.contributors stating + everything is GPLv2+ is from 2008 + + poppler/XpdfPluginAPI.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 230ab66f52a992557464e325d18f88573ec52423 +Author: Albert Astals Cid +Date: Sun Jul 10 01:06:41 2011 +0100 + + make files easier to include by themselves + + fofi/FoFiTrueType.h | 2 ++ + splash/Splash.h | 3 ++- + splash/SplashFontEngine.h | 3 ++- + 3 files changed, 6 insertions(+), 2 deletions(-) + +commit 866c6d1b0daa8b28f259e1faba075026cf9007e0 +Author: Albert Astals Cid +Date: Sun Jul 10 00:55:25 2011 +0100 + + Name most of the classes in poppler/ includable by themselves + + poppler/Annot.h | 4 +++- + poppler/Catalog.h | 2 ++ + poppler/CharCodeToUnicode.h | 4 +++- + poppler/CompactFontTables.h | 16 ++++++++++++++++ + poppler/FontInfo.h | 6 +++++- + poppler/GfxState_helpers.h | 4 +++- + poppler/NameToUnicodeTable.h | 18 ++++++++++++++++++ + 7 files changed, 50 insertions(+), 4 deletions(-) + +commit 6b62fb7e9bd7de7f79b9b9a6fe36a5f5da099133 +Author: William Bader +Date: Mon Jun 27 19:38:52 2011 +0100 + + Remove unused variable + + poppler/PSOutputDev.cc | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 4bc6c5bd3a001bb4eb9f61488e3d4f356638e391 +Author: Adrian Bunk +Date: Tue Jul 5 15:21:06 2011 +0300 + + .gitignore tests additions + + The following files were missing in .gitignore: + - cpp/tests/poppler-render + - qt4/tests/poppler-texts + - test/gtk-test + + cpp/tests/.gitignore | 1 + + qt4/tests/.gitignore | 1 + + test/.gitignore | 1 + + 3 files changed, 3 insertions(+) + +commit 00076bc308ae320244c47777fe351c1c2bef2da8 +Author: Albert Astals Cid +Date: Fri Jun 24 22:51:55 2011 +0100 + + Forgot William's (C) here + + poppler/Stream.cc | 1 + + poppler/Stream.h | 1 + + 2 files changed, 2 insertions(+) + +commit 7e244fde4ec03da08d81af3402b21646c803bd31 +Author: William Bader +Date: Fri Jun 24 22:39:13 2011 +0100 + + patch to make -level2sep and -level3sep write gray instead of cmyk + + If they are only gray of course :D + + poppler/PSOutputDev.cc | 34 ++++++++++++++++++++++++++++++---- + poppler/Stream.cc | 43 +++++++++++++++++++++++++++++++++++++++++++ + poppler/Stream.h | 29 +++++++++++++++++++++++++++++ + 3 files changed, 102 insertions(+), 4 deletions(-) + +commit abba8140a9972197faaca96ec590af7dc9408fb0 +Author: William Bader +Date: Fri Jun 24 22:38:33 2011 +0100 + + patch to make -level2sep and -level3sep write cmyk instead of rgb + + poppler/PSOutputDev.cc | 59 + +++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 54 insertions(+), 5 deletions(-) + +commit 706007431325b1e8c9bf4cba35c89511b10ebf0c +Author: Albert Astals Cid +Date: Mon Jun 20 23:30:50 2011 +0100 + + (C) for Jim + + fofi/FoFiBase.cc | 1 + + 1 file changed, 1 insertion(+) + +commit e23384fbb3542941d2cf59ce6560913255ca2b01 +Author: Jim Meyering +Date: Mon Jun 20 11:09:01 2011 +0200 + + don't gmalloc(-1) upon ftell failure + + * fofi/FoFiBase.cc: Diagnose ftell failure. + + fofi/FoFiBase.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit c5601bde9d8f3f56e558a6f63e563c9d337810eb +Author: Steven Murdoch +Date: Mon Jun 20 23:25:43 2011 +0100 + + Fix encoding of PDF document metadata in output of pdftohtml + + pdftohtml simply copies the PDF document title into the HTML + tag, which fails when the title is UCS-2 encoded, or if it contains + characters which are in pdfDocEncoding (a ISO 8859-1 superset), + but not + in ISO 8859-1. This patch fixes the problem by decoding UCS-2 or + pdfDocEncoding into Unicode, then encoding this in the desired output + encoding. HTML escaping wasn't being done either, so I have used the + existing function HtmlFont::HtmlFilter to perform both HTML escaping + and character set encoding. This static method had to be made public + to call it from pdftohtml. See bug #37900. + + utils/HtmlFonts.h | 3 ++- + utils/pdftohtml.cc | 41 ++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 40 insertions(+), 4 deletions(-) + +commit d4af1c4ef46abf1f11b7215c7b144ce7bb7912eb +Author: Joshua Richardson <joshuarbox-junk1@yahoo.com> +Date: Sat Jun 18 13:39:54 2011 +0100 + + Fix vertical spacing issues in pdftohtml output. + + Bug 38019 + + utils/HtmlFonts.cc | 3 ++- + utils/HtmlOutputDev.cc | 21 +++++++++++++++++++-- + 2 files changed, 21 insertions(+), 3 deletions(-) + +commit 589933ef105b60e8d48854cce15a7548c2850116 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jun 13 21:24:39 2011 +0100 + + Forgot my (C) + + poppler/PreScanOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f5d2ddd13d27078355dee63207671885bf9b0926 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jun 13 18:57:29 2011 +0100 + + We need to include config.h here + + Fixes crash after patch to fix bug 13518 + + poppler/PreScanOutputDev.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 147ae4bf76a85768c9ed729ca10ee3dae93b8876 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 8 23:36:14 2011 +0100 + + Do not crash if link does not have an action + + utils/HtmlOutputDev.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 5d9489bf566b700ef38e5e33665a2648b535e1e7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jun 4 21:46:10 2011 +0100 + + forgot to update the C + + utils/pdftotext.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 7b123bf2b11ac81f24a966186a06de739d3c8f02 +Author: Steven Murdoch <Steven.Murdoch@cl.cam.ac.uk> +Date: Sat Jun 4 20:22:52 2011 +0100 + + Fix pdftotext -htmlmeta to correctly output U+2019 in PDF metadata + + In PDF documents, right single quotation mark (U+2019) may be + encoded as + 0x90 because PDFDocEncoding uses some of the reserved characters in + ISO 8859-1. However, pdftotext -htmlmeta assumes that characters + are either + UCS-2 or ISO 8859-1. Thus when a right single quotation mark is + encoded as + 0x90, it is output as unicode 0x90 (which is a control + character). pdfinfo + does the right thing by first converting from PDFDocEncoding to + Unicode + with pdfDocEncoding[], before encoding it in the desired character + set. + This patch applies the same logic to pdftotext. pdftohtml is broken + in the + same way, but this patch does not attempt to fix it. + + Bug 37900 + + utils/pdftotext.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit db2ae1bdbb7fcb64ba4c91dfc574d9f970bebdf6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jun 4 13:23:11 2011 +0100 + + Make sure catDict is a dict + + poppler/Catalog.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 58915affbdf1b5780f25d172a582c69fb2413230 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jun 4 13:20:02 2011 +0100 + + Make sure catDict is a dict before using it + + KDE Bug 274888 shows it's possible to get aborts because of that + + poppler/Catalog.cc | 26 ++++++++++++++++---------- + 1 file changed, 16 insertions(+), 10 deletions(-) + +commit 4ebc7e364409fe303e7a5729b568913e3c92e7d4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jun 4 13:19:34 2011 +0100 + + We need to free catDict on failure + + poppler/Catalog.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 335a7fc6d98f5facc1ff098a91ac968387473cb3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue May 31 23:18:26 2011 +0100 + + Make parse() private + + poppler/Catalog.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 311d69ef2222409859817737c44b8e741289d897 +Author: Axel Strübing <axel.struebing@freenet.de> +Date: Sun May 29 16:12:29 2011 +0100 + + Needs to be freed + + As i said in my last commit comment :D + + poppler/PDFDoc.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 66c7d0199b45bc7c81c88a9989c9515398d30d43 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 28 17:32:02 2011 +0100 + + No need to check for NULL + + We probably need to free obj4 but i don't have the stamina to properly + test it + + poppler/PDFDoc.cc | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +commit 450934619a1c5b2a58f65649f567274af8d24ea7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 28 12:37:08 2011 +0100 + + Parse that as unicode + + Fixes KDE Bug #274055 + + qt4/src/poppler-page.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 04dfb2c984b3c9949466e2b70e26b58029c5a7d3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat May 7 12:55:34 2011 +0200 + + Make FileSpec a class and move EmbFile from Catalog to FileSpec + + Qt and cpp frontends adapted by Pino Toscano + + cpp/poppler-document.cpp | 4 +- + cpp/poppler-embedded-file-private.h | 10 +-- + cpp/poppler-embedded-file.cpp | 42 +++++++---- + glib/poppler-annot.cc | 6 +- + glib/poppler-attachment.cc | 33 +++++---- + glib/poppler-document.cc | 5 +- + glib/poppler-private.h | 3 +- + poppler/Catalog.cc | 118 + +++--------------------------- + poppler/Catalog.h | 55 +------------- + poppler/FileSpec.cc | 128 + +++++++++++++++++++++++++++++++++ + poppler/FileSpec.h | 51 ++++++++++++- + qt4/src/poppler-embeddedfile-private.h | 6 +- + qt4/src/poppler-embeddedfile.cc | 34 +++++---- + qt4/src/poppler-page.cc | 5 +- + qt4/src/poppler-private.h | 4 +- + qt4/tests/check_attachments.cpp | 12 ++-- + 16 files changed, 284 insertions(+), 232 deletions(-) + +commit 74f9befddd4b5848c4af0c1b2848a1322f8cd0a2 +Author: Pino Toscano <pino@kde.org> +Date: Wed May 25 16:46:15 2011 +0200 + + [qt4] Page needs to be a friend of EmbeddedFile, too + + qt4/src/poppler-qt4.h | 1 + + 1 file changed, 1 insertion(+) + +commit 74853614d617486b7b62e9c08be39a6e58bc7d9b +Author: Pino Toscano <pino@kde.org> +Date: Wed May 25 16:40:49 2011 +0200 + + update copyrights + + qt4/src/poppler-embeddedfile-private.h | 2 +- + qt4/src/poppler-embeddedfile.cc | 2 +- + qt4/src/poppler-qt4.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit e6b2dec502c02f9fbaed480f227cf7145249a98e +Author: Pino Toscano <pino@kde.org> +Date: Wed May 25 16:39:09 2011 +0200 + + [qt4] one more usage of the new EmbeddedFile ctor + + followup of a264e5385b2d0fee5126b3d0e57d42d34cafa45d + + qt4/src/poppler-page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a264e5385b2d0fee5126b3d0e57d42d34cafa45d +Author: Pino Toscano <pino@kde.org> +Date: Wed May 25 16:12:02 2011 +0200 + + [qt4] create EmbeddedFile by EmbeddedFileData only + + - create the private class and pass it to the EmbeddedFile ctor, + reducing the amount of poppler code API exposed to the outside + - turn the old private EmbeddedFile(EmbFile*) ctor in a death machine + + qt4/src/poppler-embeddedfile-private.h | 3 +++ + qt4/src/poppler-embeddedfile.cc | 21 ++++++++++++++++++--- + qt4/src/poppler-private.h | 3 ++- + qt4/src/poppler-qt4.h | 2 ++ + 4 files changed, 25 insertions(+), 4 deletions(-) + +commit 232bfa1c59013637fd7e858e22194becb636ad21 +Author: Pino Toscano <pino@kde.org> +Date: Wed May 25 15:55:48 2011 +0200 + + [Qt4] split EmbeddedFileData in an own file + + qt4/src/poppler-embeddedfile-private.h | 37 + ++++++++++++++++++++++++++++++++++ + qt4/src/poppler-embeddedfile.cc | 7 +------ + 2 files changed, 38 insertions(+), 6 deletions(-) + +commit a7242b78b3c9a64cf38ac150e6a914d7abce3355 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 7 11:10:11 2011 +0100 + + Do not free a shallow copy of an object we'll free later + + Make sure we have our own copy we can free + Fixes KDE BUG #268816 + (cherry picked from commit dab9cdf795d6caead555326958e86e844ace067b) + + poppler/Catalog.cc | 12 +++++------- + poppler/Catalog.h | 2 +- + 2 files changed, 6 insertions(+), 8 deletions(-) + +commit 4db2452b3d345d9531987998e6b5532a59137e1d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri May 6 14:57:51 2011 +0200 + + glib: Add poppler_document_get_n_attachments() + + glib/poppler-document.cc | 34 + ++++++++++++++++++++++++---------- + glib/poppler-document.h | 1 + + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 26 insertions(+), 10 deletions(-) + +commit 3e3284de3fe1916d7f8161ede7bf49c76d01f303 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri May 6 14:49:05 2011 +0200 + + glib: Update gtk-doc.make + + gtk-doc.make | 151 + ++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 98 insertions(+), 53 deletions(-) + +commit 9a77bd7706a08d9aeabe600e3500c14493ac8519 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri May 6 14:48:38 2011 +0200 + + glib-demo: Add missing permission flags to info demo + + glib/demo/info.cc | 39 ++++++++++++++++++++++++++++++++++++--- + 1 file changed, 36 insertions(+), 3 deletions(-) + +commit 091c155f8a7bc79da84cd21877be389de1f2b1a3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri May 6 14:47:36 2011 +0200 + + glib: Add missing permissions flags to PopplerPermissions + + glib/poppler-document.cc | 6 ++++++ + glib/poppler-document.h | 10 +++++++++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit 632d6a40ce3a5d3d8e10bf7e93e8eb578beae907 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue May 3 21:54:59 2011 +0100 + + 0.17.1 + + CMakeLists.txt | 4 ++-- + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 18 insertions(+), 6 deletions(-) + +commit ecb136b9927a454df9360a307ccd741eaea3ca93 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue May 3 21:42:45 2011 +0100 + + remove unused vars + + poppler/Annot.cc | 9 ++------- + poppler/ArthurOutputDev.cc | 12 ++---------- + 2 files changed, 4 insertions(+), 17 deletions(-) + +commit ad131763640b2e27dde75c42b514386284b6a60d +Author: Pino Toscano <pino@kde.org> +Date: Wed Apr 27 22:36:13 2011 +0200 + + [qt4/tests] turn some assignments to bool into QVERIFY checks + + qt4/tests/check_optcontent.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit be08dd69d9dd4fcb22400f2f0aea331222e88e4a +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 27 20:45:36 2011 +0100 + + update copyright years + (cherry picked from commit 2fbd493197309de5700f71f09967c9d23add88d3) + + poppler/Annot.cc | 1 + + utils/pdftotext.cc | 1 + + 2 files changed, 2 insertions(+) + +commit 39bcce0c8ed378aafb1019ffd1ae40330f6bb63f +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 27 19:39:01 2011 +0100 + + Remove more variables that are set but then unused + + poppler/SplashOutputDev.cc | 11 +------ + utils/HtmlOutputDev.cc | 75 + +--------------------------------------------- + 2 files changed, 2 insertions(+), 84 deletions(-) + +commit 6656cf657b62d626910a02dfae9b6a1eb77772dd +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 27 08:46:37 2011 +0100 + + Remove unused vars + + poppler/TextOutputDev.cc | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit ce55510f4dd10dfec2fc5b1c211c4a546c6ebc98 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 27 08:42:34 2011 +0100 + + Remove unused vars + + splash/Splash.cc | 5 ++--- + splash/SplashFTFontEngine.cc | 4 +--- + splash/SplashXPath.cc | 6 ++---- + 3 files changed, 5 insertions(+), 10 deletions(-) + +commit 49d199fd1ea14383638739d95d019adb33b17768 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 27 08:38:17 2011 +0100 + + Fix page_transition::operator= + + cpp/poppler-page-transition.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 807c1df2bf79c7c6378390b41dc230d80533ae3f +Author: Tom Gleason <tom@buildadam.com> +Date: Tue Apr 26 17:06:07 2011 +0100 + + bbox coordinates are relative to MediaBox size, not CropBox size + + utils/pdftotext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 813f41367a681702ae7a155d5c2f3195124a9096 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Apr 3 20:40:15 2011 +0200 + + forms: fix mem leak in case of error + + poppler/Form.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 722baf8baf42e2c7a49e1560aae5235677d1ddee +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Apr 3 20:17:57 2011 +0200 + + forms: check form field is actually terminal before creating the + widget + + poppler/Form.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 5f6f7fc569d1c891956a3c37b3e328504635ab33 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Apr 3 15:06:45 2011 +0100 + + Properly initialize pageObjectNum to 0 + + Bug 35925 + + poppler/Hints.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit d6786edc2549164214342a50782b72c2fd904b63 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Apr 3 13:11:18 2011 +0200 + + forms: Remove unused parameter + + poppler/Form.cc | 2 +- + poppler/Form.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 62692ff381f3b7907b330bfc2019416ed058ea46 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Apr 3 13:01:42 2011 +0200 + + forms: rework the way form fields tree is built + + Now we build the tree as described by the doc, without ignoring + container fields and always creating a child widget for composed + (field + + annot) dictionaries. The way check and radio buttons are set + has been + reworked too, since now it's possible to have a set of buttons where + children are not widgets, but form fields with a child widget. + + poppler/Annot.cc | 4 +- + poppler/Form.cc | 237 + +++++++++++++++++++++++++++++-------------------------- + poppler/Form.h | 17 ++-- + 3 files changed, 137 insertions(+), 121 deletions(-) + +commit a6802301d9c3ab8bf68bd8821f562f8ecced8491 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 28 17:42:37 2011 +0200 + + forms: Add debug methods to print the forms tree + + poppler/Form.cc | 78 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Form.h | 25 ++++++++++++++++++ + 2 files changed, 103 insertions(+) + +commit 46f87da04700cdd1afa634f9c554e376f6f6f752 +Author: José Aliste <jaliste@src.gnome.org> +Date: Thu Mar 31 08:09:41 2011 -0400 + + Fix a memleak in AnnotScreen::initialize + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b64178eaa5dd01f914649d6faa870fa140ddaf9b +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Mar 30 15:17:54 2011 +0200 + + glib: docs: Add PopplerActionJavascript to poppler-sections.txt + + glib/reference/poppler-sections.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 3d777181ddee8f7ab2cc9e4684879cb5b52b065c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Mar 30 15:16:04 2011 +0200 + + glib: Use Javascript instead of JavaScript for consistency + + glib/poppler-action.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c4774fecfe3d523f32d5980f50e31daa798c9692 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Mar 30 15:08:59 2011 +0200 + + glib-demo: show javascript actions in actions view + + glib/demo/utils.c | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit 68bbbe1a3f68d242b35027ae41f5751b02a2a700 +Author: José Aliste <jaliste@src.gnome.org> +Date: Tue Mar 29 04:56:37 2011 -0400 + + glib: add JavaScript actions + + glib/poppler-action.cc | 24 ++++++++++++++++++++++++ + glib/poppler-action.h | 14 +++++++++++++- + 2 files changed, 37 insertions(+), 1 deletion(-) + +commit 3dd934088a06f246718382601030c9b093d04160 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 30 00:03:58 2011 +0100 + + Need to create the globalParams + + qt4/tests/check_optcontent.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +commit ce0d4278a32b3ba19c2002ed0c481c58b1854d59 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 29 23:47:33 2011 +0100 + + Long gone + + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +commit 12337026533aa59bb66022ce8a119f37aafd4fad +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 29 23:40:57 2011 +0100 + + increase sonames + + CMakeLists.txt | 2 +- + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Makefile.am | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +commit a6e613b01698c6b38deff5248fcf7c0b17d041c3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 29 23:40:38 2011 +0100 + + more typos + + NEWS | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e3ee037ede67212836be158b935deb7ea974b7f7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 29 23:38:24 2011 +0100 + + typo + + NEWS | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8bcd94964f0af17a3f5b6edf71127df3daa00b1a +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 29 23:30:30 2011 +0100 + + typo + + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a05b9dacbe5dbd4337fdbb3e7d7d364ad5fbaeab +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 29 23:28:49 2011 +0100 + + 0.17.0 version number + + CMakeLists.txt | 2 +- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 4637b737b4735c70017b46a3ed6c0ee069c02c9b +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 29 23:28:41 2011 +0100 + + 0.17.0 news + + NEWS | 108 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 108 insertions(+) + +commit a55cc5d9c67ede1d96f6e5a58179ddd9f563c53f +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 29 22:51:40 2011 +0100 + + Update years + + poppler/Catalog.cc | 2 +- + poppler/Catalog.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d96efb6c1af621be78e998ba1a228022c3c076fc +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 29 11:13:03 2011 +0200 + + fix comment + + poppler/ViewerPreferences.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 74ec81d66d4d5bc45cccc4aa8794df1c517f2d74 +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 29 11:07:36 2011 +0200 + + viewer preferences: read PrintScaling and Duplex + + poppler/ViewerPreferences.cc | 24 ++++++++++++++++++++++++ + poppler/ViewerPreferences.h | 14 ++++++++++++++ + 2 files changed, 38 insertions(+) + +commit b41bcd484dd7a93a339270926c57caa524059d8f +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 29 10:58:46 2011 +0200 + + free the viewerPreferences Object + + poppler/Catalog.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 1dd88d0b6b7cbfda76e81902a351c89457a061a8 +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 29 09:58:10 2011 +0200 + + read the ViewerPreferences dict once, and construct ViewerPreferences + on demand + + this way it is possible to know whether the ViewerPreferences + dictionary is present in the Catalog + + poppler/Catalog.cc | 24 +++++++++--------------- + poppler/Catalog.h | 3 ++- + 2 files changed, 11 insertions(+), 16 deletions(-) + +commit f10b0b8c88a7df83ada09f32b6cb6fd930fcb748 +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 29 09:57:46 2011 +0200 + + assume the prefDict is not null + + poppler/ViewerPreferences.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit d4a5ea45057cad531a8979cf9861ac05cdd56613 +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 29 09:54:22 2011 +0200 + + fix variable name for DisplayDocTitle + + poppler/ViewerPreferences.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cf84a05ae524aa9b266463cc23cccc3860ff1ba3 +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 28 23:18:02 2011 +0200 + + viewer preferences: read NonFullScreenPageMode and Direction + + poppler/ViewerPreferences.cc | 26 ++++++++++++++++++++++++++ + poppler/ViewerPreferences.h | 15 +++++++++++++++ + 2 files changed, 41 insertions(+) + +commit 460253a6705a227ff7c36e9c31cceb93cce4d78b +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 28 22:37:54 2011 +0200 + + read some boolean viewer preferences + + - HideToolbar + - HideMenubar + - HideWindowUI + - FitWindow + - CenterWindow + - DisplayDocTitle + + poppler/ViewerPreferences.cc | 41 + +++++++++++++++++++++++++++++++++++++++++ + poppler/ViewerPreferences.h | 13 +++++++++++++ + 2 files changed, 54 insertions(+) + +commit 9fa9ac3546674120532bb512b82af6471cbebf01 +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 28 19:58:16 2011 +0200 + + add skeleton for ViewerPreferences + + a small class for handling the ViewerPreferences dictionary of + a Catalog, + created on demand and in any occasion (so defaults are in one + place only) + + CMakeLists.txt | 2 ++ + poppler/Catalog.cc | 23 +++++++++++++++++++++++ + poppler/Catalog.h | 4 ++++ + poppler/Makefile.am | 2 ++ + poppler/ViewerPreferences.cc | 30 ++++++++++++++++++++++++++++++ + poppler/ViewerPreferences.h | 34 ++++++++++++++++++++++++++++++++++ + 6 files changed, 95 insertions(+) + +commit c6081f0bf00d7dcdfa1d09e91e4c9a1fe5a54ad6 +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 28 19:55:00 2011 +0200 + + delete the temporary buffers created by pdfDocEncodingToUTF16() + + poppler/Form.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit d94d5056d5570e2f5cb578736eba12317ea63fa4 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 28 18:20:31 2011 +0200 + + glib-demo: show the activation action of form fields if there's one + + glib/demo/forms.c | 21 ++++++++++++++++----- + 1 file changed, 16 insertions(+), 5 deletions(-) + +commit ba0f36b76d0c2fd4ef39f3013fc125a53747c03f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 28 18:17:52 2011 +0200 + + glib: Add poppler_form_field_get_action() + + Fixes bug #33174. + + glib/poppler-form-field.cc | 34 + ++++++++++++++++++++++++++++++++++ + glib/poppler-form-field.h | 1 + + glib/poppler-private.h | 1 + + glib/reference/poppler-sections.txt | 1 + + 4 files changed, 37 insertions(+) + +commit ae5b9cf884ce38dde409c3e5b0f6c46f7d6327d2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 28 17:43:53 2011 +0200 + + Revert "Patch for embedding videos in to the pdf" + + This reverts commit 66575c990f379871e4b796befc899de178332670. + + It introduces new API to glib frontend that is wrong and will be + changed soon. + + glib/poppler-annot.cc | 33 ----- + glib/poppler-annot.h | 5 - + poppler/Annot.cc | 377 + -------------------------------------------------- + poppler/Annot.h | 2 - + 4 files changed, 417 deletions(-) + +commit b7edd4c93539585652961ecf2db9c4462415c8bc +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Mar 27 12:31:19 2011 +0200 + + annot: Always create appearance streams when NeedAppearances is true + + Fixes regression in document example_054.pdf + + poppler/Annot.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e9350899e77c28452c48b56349ad7758b3fd47ba +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Mar 24 20:09:18 2011 +0000 + + Introduce splash-friendly getRGBLine functions + + So it does not need to pack and unpack the color again and again + + poppler/GfxState.cc | 248 + ++++++++++++++++++++++++++++++++++++++++++--- + poppler/GfxState.h | 22 +++- + poppler/SplashOutputDev.cc | 43 ++------ + 3 files changed, 265 insertions(+), 48 deletions(-) + +commit 7b08795a9541e9fa01836b4c7fd63f6fe295ad80 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Mar 24 12:16:07 2011 +0100 + + glib: Add g_return macros to make sure index is correct in form + field choice methods + + glib/poppler-form-field.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit f1102fccd2899bc7f97414b1e2a295c59f03da22 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Mar 24 12:15:30 2011 +0100 + + glib-demo: Fix a crash when a choice form field has no items selected + + glib/demo/forms.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b3971ee6bca6b14b75f046c831a31ac1e5e3241e +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 22 22:08:27 2011 +0000 + + kill this TODO, n is too small + + poppler/SplashOutputDev.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1064d75817401fe24f728c189b450e9e906beb56 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 22 20:43:05 2011 +0000 + + kill unmaintained abiword backend + + CMakeLists.txt | 16 - + configure.ac | 16 - + poppler/ABWOutputDev.cc | 1179 + ----------------------------------------------- + poppler/ABWOutputDev.h | 141 ------ + poppler/Makefile.am | 17 - + utils/CMakeLists.txt | 10 - + utils/Makefile.am | 18 +- + utils/pdftoabw.cc | 201 -------- + 8 files changed, 2 insertions(+), 1596 deletions(-) + +commit abf167af8b15e5f3b510275ce619e6fdb42edd40 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Mon Mar 21 21:34:46 2011 +0000 + + Implement tiling/patterns in SplashOutputDev + + Fixes bug 13518 + + poppler/CairoOutputDev.cc | 5 +- + poppler/CairoOutputDev.h | 10 +- + poppler/Gfx.cc | 6 +- + poppler/OutputDev.h | 6 +- + poppler/PSOutputDev.cc | 8 +- + poppler/PSOutputDev.h | 6 +- + poppler/PreScanOutputDev.cc | 22 +++- + poppler/PreScanOutputDev.h | 16 ++- + poppler/SplashOutputDev.cc | 265 + ++++++++++++++++++++++++++++++++++++++++++++ + poppler/SplashOutputDev.h | 12 ++ + 10 files changed, 334 insertions(+), 22 deletions(-) + +commit 66575c990f379871e4b796befc899de178332670 +Author: Srinivas Adicherla <srinivas.adicherla@gmail.com> +Date: Thu Mar 17 20:14:05 2011 +0000 + + Patch for embedding videos in to the pdf + + glib/poppler-annot.cc | 33 +++++ + glib/poppler-annot.h | 5 + + poppler/Annot.cc | 377 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 2 + + 4 files changed, 417 insertions(+) + +commit ec1917968d2f1c7a00772a0829b3fcc6957d8f3c +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Mar 14 00:13:26 2011 +0000 + + Only build gtk-test if we have to build gtk-test + + test/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 1acbb01e72a22f70f00dc058ff206e3bc05bc0ab +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Mar 13 14:49:48 2011 +0000 + + (C) years + + poppler/CachedFile.cc | 2 +- + poppler/CurlCachedFile.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit bc8aeb269aa92406081f749064ceff75bb3145e7 +Author: Hib Eris <hib@hiberis.nl> +Date: Sat Mar 12 23:17:59 2011 +0100 + + Check response code of libcurl call + + poppler/CachedFile.cc | 8 +++++++- + poppler/CurlCachedFile.cc | 12 +++++++++--- + 2 files changed, 16 insertions(+), 4 deletions(-) + +commit 0268cedee5b460835a4747d0ea41bbe12269310d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Mar 12 15:24:30 2011 +0100 + + cairo: Fix typo + + poppler/CairoFontEngine.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5aa369e68e5c9f14efc888c7b26da06aa8bd2a78 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 12 13:47:34 2011 +0000 + + Remove unused variable + + poppler/CurlCachedFile.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit c0dffbe28f91b30b36310ab0b9a9b948610550ae +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 12 12:15:58 2011 +0100 + + update copyright years + + cpp/poppler-document-private.h | 2 +- + cpp/poppler-document.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b8fab173ffdd1e62a34b530228d08bc5ec6725ac +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 12 12:13:05 2011 +0100 + + [cpp] init the globalParams early in the document loading + + introduce a small RAII class to init/deinit the globalParams, and + make document_private inherit from it + + cpp/poppler-document-private.h | 17 +++++++++----- + cpp/poppler-document.cpp | 52 + +++++++++++++++++++++++------------------- + 2 files changed, 39 insertions(+), 30 deletions(-) + +commit a97a54cb22def2a9fc381fb81842dad9e5c3931f +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 12 12:12:11 2011 +0100 + + forms: delete tmp_str after being converted to GooString + + poppler/Form.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 9671fe07f8c9ade956742cb141b99518c3b12bad +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Mar 11 00:05:52 2011 +0000 + + getForm can return NULL, do not crash if that happens + + poppler/Annot.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit bd32672899f5ca4509ec9311de8092d14bec8ab1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Mar 10 23:33:15 2011 +0000 + + update copyright years + + poppler/Catalog.cc | 2 +- + qt4/src/poppler-form.cc | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 841f3bbca37015ec2c58d7b85a73cef5681294f8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Mar 10 23:30:51 2011 +0000 + + Do not infinite loop + + poppler/Form.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f2fcafdc2b982d9bbed3c01bc7d45c8bd0603f19 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Mar 10 23:27:41 2011 +0000 + + Create the globalParams before the pdfdoc + + qt4/src/poppler-private.cc | 5 +---- + qt4/src/poppler-private.h | 12 ++++++++---- + 2 files changed, 9 insertions(+), 8 deletions(-) + +commit f956b03604b195623ab034a06942a39547adf905 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Mar 10 00:01:18 2011 +0000 + + compile + + qt4/src/poppler-form.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f0ec3bedc5490aa35e54563019fcf2c3f8b7647d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Mar 9 20:54:15 2011 +0100 + + forms: Remove unused method FormWidget::updateField() + + poppler/Form.cc | 22 ---------------------- + poppler/Form.h | 2 -- + 2 files changed, 24 deletions(-) + +commit 93c25e100ae2564b9a866b95bed16d2fac619bd7 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Mar 9 20:49:32 2011 +0100 + + forms: Rename FormField::createActivationAction() to + FormField::getActivationAction() + + And use the existing action from the AnnotWidget instead of creating a + new one. + + poppler/Form.cc | 11 ++--------- + poppler/Form.h | 2 +- + qt4/src/poppler-form.cc | 3 +-- + 3 files changed, 4 insertions(+), 12 deletions(-) + +commit 59fb0489bfabfd8acccafdcd0361ce005664962a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Mar 9 20:19:24 2011 +0100 + + annots: Check whether we need to create an appearance stream in + AnnotWidget::draw() + + And never modify the AP entry since it breaks check and radio buttons + that doesn't have an appearance for the Off state. + + poppler/Annot.cc | 79 + ++++++++++---------------------------------------------- + poppler/Annot.h | 1 - + 2 files changed, 13 insertions(+), 67 deletions(-) + +commit f3b00ef51ceef6d9b7a1aa7e0f19249abf8ca6f3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Mar 9 18:19:12 2011 +0100 + + annots: Add Annot::setAppearanceState() and use it from FormWidget + + This method not only updates the current appearance state, but + also the + appearance stream corresponding to the new state. + + poppler/Annot.cc | 43 ++++++++++++++++++++++++++++++++++++------- + poppler/Annot.h | 2 ++ + poppler/Form.cc | 7 +++---- + 3 files changed, 41 insertions(+), 11 deletions(-) + +commit d59561212253302d4dcb23392bb8306b8e5c68d1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Mar 9 17:35:28 2011 +0100 + + forms: Make FormWidget use a real widget annotation instead of + duplicating code + + When creating annotations, if it's a widget annotation, look first + whether it has already been created by a FormWidget and reuse + it instead + of duplicating it. + + poppler/Annot.cc | 42 +++++++++++++-------- + poppler/Annot.h | 2 +- + poppler/Catalog.cc | 2 +- + poppler/Form.cc | 107 + +++++++++++++++++++++++++---------------------------- + poppler/Form.h | 23 ++++++------ + 5 files changed, 89 insertions(+), 87 deletions(-) + +commit 2dd7e1ba09d4501adf9d10ab4cb8ee003cace74a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Mar 9 10:25:00 2011 +0100 + + forms: Move modified flag from FormWidget to FormField + + poppler/Form.cc | 16 ++++++++-------- + poppler/Form.h | 6 ++++-- + 2 files changed, 12 insertions(+), 10 deletions(-) + +commit b04f03be7e43e309af5f164ef71788e7b8915841 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Mar 9 10:17:57 2011 +0100 + + forms: Move field names handling from FormWidget to FormField + + poppler/Form.cc | 149 + +++++++++++++++++++++++++++++++------------------------- + poppler/Form.h | 20 +++++--- + 2 files changed, 95 insertions(+), 74 deletions(-) + +commit abe1e0d5a37bcdb4376901306d3adccfb33ff3b4 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Mar 8 21:39:00 2011 +0100 + + annots: Make sure no border is drawn for invalid border arrays + + Fixes regression on ClassSchedule_2091_ENGL.pdf + + poppler/Annot.cc | 8 ++++++-- + poppler/Annot.h | 2 +- + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit 14d145371e86ccb92f09b1ca750ced52171b2885 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Mar 8 20:14:57 2011 +0100 + + forms: Remove loadDefaults method + + Moving the code to initialize form field stuff to form field + constructors and widget stuff to form widget constructors. Clean up an + simplify the code. + + poppler/Form.cc | 227 + +++++++++++++++++++++----------------------------------- + poppler/Form.h | 21 ++---- + 2 files changed, 91 insertions(+), 157 deletions(-) + +commit 0585d7820455c93fe5b732b7a9a20d423df47075 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Mar 8 15:36:45 2011 +0100 + + forms: Handle field values (V entry) by field objects + + Rather than AnnotWidget or FormWidget, and use the form field object + from AnnotWidget to get the values. + + poppler/Annot.cc | 52 ++++---- + poppler/Form.cc | 400 + +++++++++++++++++++++++++++---------------------------- + poppler/Form.h | 21 +-- + 3 files changed, 230 insertions(+), 243 deletions(-) + +commit dc100eb9080fb58164fc94c86bfb1728cecd21c3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 7 20:14:27 2011 +0100 + + annots: Use the field object to get MaxLen instead of parsing the + field dict + + poppler/Annot.cc | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit 7149634f184dc3f07f2a70c296aac207ef24952c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 7 19:55:45 2011 +0100 + + forms: Parse the default resources dictionary in Form + + And use it in AnnotWidget instead of parsing the dictionary again. + + poppler/Annot.cc | 65 + ++++++++++++++++++++++---------------------------------- + poppler/Annot.h | 12 +++++------ + poppler/Form.cc | 16 ++++++++++++++ + poppler/Form.h | 5 +++++ + 4 files changed, 52 insertions(+), 46 deletions(-) + +commit 2e73f17975811177c0b3c16b8bd97c7eb912bc44 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 7 18:41:48 2011 +0100 + + forms: Parse field variable text entries (DA, Q) in FormField() + + And use them from AnnotWidget instead of parsing the field dictionary + again. + + poppler/Annot.cc | 28 +++++----------------------- + poppler/Form.cc | 17 +++++++++++++++++ + poppler/Form.h | 9 +++++++++ + 3 files changed, 31 insertions(+), 23 deletions(-) + +commit 8677a34911563a712b2dcf0b6e411cee0bad9c44 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 7 18:24:07 2011 +0100 + + forms: Parse default variable text entries (DA, Q) on Form + construction + + And use them from AnnotWidget instead of parsing the acroForm + dictionary + again. + + poppler/Annot.cc | 99 + +++++++++++++++++++++++++++----------------------------- + poppler/Form.cc | 11 +++++++ + poppler/Form.h | 12 +++++++ + 3 files changed, 70 insertions(+), 52 deletions(-) + +commit 41420bfd88685d9b1ac44dc7444ea3abee92097c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 7 09:18:25 2011 +0100 + + annots: Only parse the dash array for dashed borders + + poppler/Annot.cc | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit c198a3f83d8508ddaf84564871d9202ffba8096c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Mar 6 17:52:01 2011 +0100 + + annots: Use the field object to get the top index of a form field + choice + + Instead of parsing the field dictionary again. + + poppler/Annot.cc | 14 ++------------ + poppler/Annot.h | 1 - + 2 files changed, 2 insertions(+), 13 deletions(-) + +commit 5cf803ec181dbf1112f67b4f4a9c77b88d102e3b +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Mar 6 17:47:18 2011 +0100 + + forms: Add FormFieldChoice::getTopIndex() + + poppler/Form.cc | 5 +++++ + poppler/Form.h | 5 ++++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 1248f59e2045749ece1f5a5e579b866b8330a752 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Mar 6 17:41:33 2011 +0100 + + annots: Draw widget background using the existing appearance + characteristics + + Instead of parsing the appearance characteristics dictionary again + + poppler/Annot.cc | 23 +++++++---------------- + 1 file changed, 7 insertions(+), 16 deletions(-) + +commit dc249ad4529997001ae1f96dcfd7351766ca8e8d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Mar 6 17:34:33 2011 +0100 + + annots: Factor out generateFieldAppearance() + + Adding methods to render every form field type and using the field + object when possible instead of parsing the field dictionary again. + + poppler/Annot.cc | 312 + +++++++++++++++++++++++-------------------------------- + poppler/Annot.h | 8 +- + 2 files changed, 138 insertions(+), 182 deletions(-) + +commit f98b3540db731026e0febf1f010548f0f0ef9142 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Mar 6 15:57:22 2011 +0100 + + annots: Move code to draw the border of an AnnotWidget to a new method + + And use the field object instead of parsing the field dictionary + again. + + poppler/Annot.cc | 242 + +++++++++++++++++++++++++++---------------------------- + poppler/Annot.h | 3 + + 2 files changed, 124 insertions(+), 121 deletions(-) + +commit 9854f3173f994bbe3f57d33bd1d0e045833859c2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Mar 6 15:56:06 2011 +0100 + + annots: Add AnnotColor::adjustColor() to be able to adjust an + existing AnnotColor + + poppler/Annot.cc | 7 +++++++ + poppler/Annot.h | 2 ++ + 2 files changed, 9 insertions(+) + +commit 2bf82f27bd9c8f97e5484ea97be661f65221163d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Mar 5 15:30:01 2011 +0100 + + annots: Remove unused class AnnotBorderStyle + + poppler/Annot.cc | 22 ---------------------- + poppler/Annot.h | 36 ------------------------------------ + 2 files changed, 58 deletions(-) + +commit 128dcaf282f418d8c45cea4df6ad4d3167b3e39c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Mar 5 13:12:49 2011 +0100 + + annots: Add AnnotBorder::parseDashArray() to parse dash arrays + + The code was duplicated in AnnotBorderArray and AnnotBorderBS + + poppler/Annot.cc | 91 + +++++++++++++++++++------------------------------------- + poppler/Annot.h | 4 ++- + 2 files changed, 34 insertions(+), 61 deletions(-) + +commit ec2643d311e0ce55f0ff5309c0c420140d053a50 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 1 19:50:55 2011 +0000 + + fix copyright years + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 2 +- + poppler/ArthurOutputDev.cc | 2 +- + poppler/ArthurOutputDev.h | 2 +- + poppler/FontInfo.cc | 1 + + poppler/Form.cc | 4 ++-- + poppler/Form.h | 3 ++- + poppler/GlobalParams.cc | 1 + + poppler/GlobalParams.h | 1 + + poppler/Link.cc | 2 +- + poppler/Link.h | 2 +- + poppler/OutputDev.h | 2 +- + poppler/PDFDoc.cc | 2 +- + poppler/Page.cc | 2 +- + poppler/Page.h | 2 +- + poppler/TextOutputDev.cc | 2 +- + poppler/TextOutputDev.h | 2 +- + qt4/src/poppler-form.cc | 2 +- + qt4/src/poppler-link-extractor-private.h | 2 +- + qt4/src/poppler-link-extractor.cc | 2 +- + qt4/src/poppler-page.cc | 2 +- + qt4/src/poppler-private.h | 2 +- + utils/HtmlOutputDev.cc | 2 +- + utils/HtmlOutputDev.h | 4 ++-- + 24 files changed, 27 insertions(+), 23 deletions(-) + +commit 900974ebfbe6ab7ae21ed151ff79f9578d2bdae2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 1 19:42:22 2011 +0000 + + Fix years + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit c804db4d8261274b013f8c340abfc921c77bb3cf +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 1 19:22:31 2011 +0100 + + move the fontconfig.h inclusion from GlobalParams.h to GlobalParams.cc + + this avoids a dependency on the fontconfig headers to the users of + the core + + poppler/GlobalParams.cc | 4 ++++ + poppler/GlobalParams.h | 3 --- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 2d77c7f9c41f1121354413bcdc3beded35a247f9 +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 1 16:51:04 2011 +0100 + + create the GooString on stack, not in heap + + poppler/Annot.cc | 5 ++--- + poppler/Form.cc | 5 ++--- + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit 5dc2ef0e27ac48c81739cdfe8e8070ebbc410c87 +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 1 16:39:36 2011 +0100 + + annots: avoid temporary GooString's just for comparisons, just + use strcmp + + other than reducing few GooString allocations, strcmp should be much + faster than GooString::cmp + + poppler/Annot.cc | 128 + ++++++++++++++++++++++++------------------------------- + 1 file changed, 56 insertions(+), 72 deletions(-) + +commit 535e48ab764ee4e377451ddd032044b51b842c4a +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 1 16:07:34 2011 +0100 + + [qt4] ignore "Widget" annotations + + they usually are forms or something else we do not support, so do + not complain about them for now + + qt4/src/poppler-page.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f0e5c36e7f1c5d0f0f51e3a6a6acd6c423f86df7 +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 1 16:02:54 2011 +0100 + + annots: avoid a temporary GooString just for comparisons, just + use strcmp + + other than reducing few GooString allocations, strcmp should be much + faster than GooString::cmp + + poppler/Annot.cc | 54 + ++++++++++++++++++++++++++---------------------------- + 1 file changed, 26 insertions(+), 28 deletions(-) + +commit 58a3b83a8fbd8b13eb98c4f677f4ed19b6ae44cd +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 1 15:35:45 2011 +0100 + + fix appendAnnot() invocation on annotations reading + + 1) check that the annot is actually a non-NULL pointer (otherwise + doing anything else is pointless) + 2) call appendAnnot() only if the annotation isOk() (that will + increase the annot refcount), but always decrement the refcount + (so valid annotation will have it at 1, while invalid will be deleted) + + poppler/Annot.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 664865a2ddca9c20ac36a41aef52ebf12eab838d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Mar 1 10:56:40 2011 +0100 + + Merge Link and AnnotLink code + + Annotations now belong to the Page and are created only once on + demand. + Annots are now ref counted and Links is a list of AnnotLink objects, + Link object has been removed. The AnnotLink API is mostly the + same than + Link and frontends APIs are not affected. + Qt4 changes made by Pino Toscano. + + glib/poppler-document.cc | 2 +- + glib/poppler-page.cc | 29 ++++---- + glib/poppler-private.h | 1 - + poppler/Annot.cc | 79 +++++++++++++------- + poppler/Annot.h | 24 ++++-- + poppler/ArthurOutputDev.cc | 4 - + poppler/ArthurOutputDev.h | 3 - + poppler/CairoOutputDev.cc | 3 - + poppler/CairoOutputDev.h | 6 -- + poppler/FontInfo.cc | 4 +- + poppler/Form.cc | 36 ++++----- + poppler/Form.h | 5 +- + poppler/Link.cc | 124 + +++++-------------------------- + poppler/Link.h | 43 ++--------- + poppler/OutputDev.h | 4 +- + poppler/PDFDoc.cc | 4 +- + poppler/Page.cc | 63 ++++++++-------- + poppler/Page.h | 11 +-- + poppler/TextOutputDev.cc | 9 ++- + poppler/TextOutputDev.h | 10 +-- + qt4/src/poppler-link-extractor-private.h | 2 +- + qt4/src/poppler-link-extractor.cc | 3 +- + qt4/src/poppler-page.cc | 12 ++- + utils/HtmlOutputDev.cc | 7 +- + utils/HtmlOutputDev.h | 4 +- + 25 files changed, 188 insertions(+), 304 deletions(-) + +commit 1f6573e949aaba0eb0a4c2f9cd73d7ad45ba67be +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 27 21:53:32 2011 +0100 + + small fixes to the pdftohtml manpage + + - capitalize HTML, PDF, XML, PNG + - dont -> do not + - fix UTF-8 character + - fix hypens used as minus + + utils/pdftohtml.1 | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit e927384897595f1bda5f7e41b552602f9cc8ed95 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 27 16:39:59 2011 +0100 + + [qt4] fix caption of push button fields + + instead of asking the 'onStr' of the underlying form widget, + take (if available) the 'MK' entry, i.e. the appearance + characteristics dictionary, + and use the normal caption of that + + qt4/src/poppler-form.cc | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +commit 5b24ee2c934feea1b7d46c8ec423d1c547258be2 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 27 16:24:22 2011 +0100 + + annots: 'CA', 'RC' and 'AC' are strings, not names + + poppler/Annot.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit e64f6cb23e9a564b3f80daea9abcfe8bb29189eb +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 27 15:22:32 2011 +0100 + + make getOnStr() return the GooString* instead of its char* + + ... and modify its use accordingly + this way it is easier to check for a numm onStr, without the risk + of dereferencing a NULL pointer + + poppler/Form.cc | 6 +++--- + poppler/Form.h | 2 +- + qt4/src/poppler-form.cc | 7 ++----- + 3 files changed, 6 insertions(+), 9 deletions(-) + +commit f9c978fc2ab8a1f901f2136ae95deb9d41076155 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 27 14:39:52 2011 +0100 + + [qt4] directly use the dict + + qt4/src/poppler-form.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 071966e48577c515b17a424baeae85ae4fc80a20 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 27 14:21:11 2011 +0100 + + [qt4] move textAlignment() as a private function + + qt4/src/poppler-form.cc | 33 +++++++++++++++++++++++++++++++-- + qt4/src/poppler-private.h | 25 ------------------------- + 2 files changed, 31 insertions(+), 27 deletions(-) + +commit adc236771f11eeb4197064747836e8ed3fbfeba9 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 27 14:13:50 2011 +0100 + + [qt4] use FormWidget::getAlternateUiName() + + ... instead of read the value on our own + + qt4/src/poppler-form.cc | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit 9f111483cf6196dedf3cee380c3e5224776203ea +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 27 14:12:16 2011 +0100 + + forms: read the TU field as alternateUiName + + poppler/Form.cc | 8 ++++++++ + poppler/Form.h | 2 ++ + 2 files changed, 10 insertions(+) + +commit cfaadaa9e4a857fcea3b5a2cadacd352de6c469d +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 27 14:07:35 2011 +0100 + + [qt4] use FormWidget::getPartialName() + + ... instead of read the value on our own + + qt4/src/poppler-form.cc | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit 2478896a0c1f6e5842f3d8b172e4cc7e6bd58cd8 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 27 13:24:09 2011 +0100 + + [qt4] use the new FormWidget::createActivationAction() + + qt4/src/poppler-form.cc | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +commit 1dcb683a5c2dd6a1de654e90a4394f65d63dc296 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 27 13:22:48 2011 +0100 + + add FormWidget::createActivationAction() + + used to get and create a new activation action object of a form widget + + poppler/Form.cc | 12 ++++++++++++ + poppler/Form.h | 3 +++ + 2 files changed, 15 insertions(+) + +commit bd4cc73e438a7d4d4a10c50c69e65b5bdc63ddf2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 27 11:04:45 2011 +0000 + + Some more missing copyrights + + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 2 +- + poppler/Gfx.cc | 2 +- + poppler/OutputDev.h | 2 +- + poppler/TextOutputDev.cc | 1 + + 5 files changed, 5 insertions(+), 4 deletions(-) + +commit 6c2ed4781d8ecfffdf24e1459aafd554b3527686 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 27 10:55:22 2011 +0000 + + Add 2011 years + + poppler/Annot.cc | 2 +- + poppler/CairoFontEngine.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b297fb9de0779ac84d5b7ef68c792afefe598320 +Author: William Bader <williambader@hotmail.com> +Date: Sun Feb 27 01:48:55 2011 +0000 + + access the pixels directly + + Faster, bug 34005 + + splash/Splash.cc | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +commit de77e26759f1c33698abe248ad29b75c329a043c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 27 01:39:23 2011 +0000 + + Fix crash in some pdf + + Has to be 3 and not nComps since it's a output buffer, a the input one + Bug 34357 + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4f82a2e08cb2c930956c6b38030fa7b015a0de5a +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 27 01:38:33 2011 +0000 + + Implement GfxDeviceCMYKColorSpace::getRGBLine + + poppler/GfxState.cc | 22 +++++++++++++++++++++- + poppler/GfxState.h | 12 +++++++++++- + 2 files changed, 32 insertions(+), 2 deletions(-) + +commit 4980b99214281dcab8f82b5b618aadc24de371f4 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 26 14:00:33 2011 +0100 + + annots: Don't assume y1 > y3 for quad points of a highlight annotation + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=643028 + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e6ae0f8609cd66e9e124af59adefdff9d610dcd4 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 26 13:23:47 2011 +0100 + + cairo: Handle font type fontCIDType2OT when creating freetype font + + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=643273 + + poppler/CairoFontEngine.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 22eb01d305ea2560d26417ca8df9c0465d4e9a82 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 26 12:17:49 2011 +0100 + + cairo: Fix a crash when rendering a document with inline images + + poppler/CairoOutputDev.cc | 28 ++++++++++++++++------------ + poppler/CairoOutputDev.h | 2 +- + 2 files changed, 17 insertions(+), 13 deletions(-) + +commit a6599dd1fda37186b876b5b2de80be1731dd5946 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 26 11:59:03 2011 +0100 + + glib: Add some more introspection annotations + + glib/poppler-attachment.cc | 2 +- + glib/poppler-document.cc | 4 ++-- + glib/poppler-media.cc | 2 +- + glib/poppler-page.cc | 6 +++--- + 4 files changed, 7 insertions(+), 7 deletions(-) + +commit 89c66f236c85ac5a53ae12b01cdebc30e27b78d3 +Author: Peter Ward <peteraward@gmail.com> +Date: Sat Feb 26 11:39:58 2011 +0100 + + glib: Add missing "out" annotation to poppler_page_get_size() + + glib/poppler-page.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7a68199b342eb3f33733f7d7446ede8f94130fba +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 26 11:09:27 2011 +0100 + + cairo: Check if cairo version is == 1.11.2 to use mesh gradients api + + Cairo API has changed in 1.11.3. + + poppler/CairoOutputDev.cc | 4 ++-- + poppler/CairoOutputDev.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 97e7ab1a4eea2160f3f0847d10f6c16f2d66ef11 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Feb 25 20:33:39 2011 +0000 + + Do not ask freetype for a font of size 0x0 + + Fixes rendering bug at 34602 + + splash/SplashFTFont.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 3590a2d38082fc705040cdb31bf0b22ff12dd3e4 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Thu Feb 24 18:47:35 2011 +0000 + + Fix rendering of some substituted fonts + + More info in bug 34522 + + poppler/GfxFont.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 384753f1f9f780687bdead99a6548ef8598b898a +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Feb 21 19:19:48 2011 +0000 + + Use gfree since we allocate with gmalloc + + Bug 34512 + + goo/GooString.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d775420c3c6cb5a29ff74712d3fc210fcb4b4627 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 19 11:19:57 2011 +0000 + + Do not delete textOut twice when using -bbox + + utils/pdftotext.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit e1a56d73b066e7152ccf6ccf36206def7956cb00 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Feb 16 00:06:45 2011 +0000 + + Lots of rendering improvements by Thomas and Andrea + + Function.cc: Stitching functions incorrectly reported 0 as output + size. + Function.cc: Remove cache from PostScriptFunction + Function.cc: Make PSStack stack allocated + GfxState.cc & GfxState.h: Abstract GfxSimpleShading, add Matrix::norm + method, add simple caching, parameter range computation + SplashOutputDev.cc & SplashOutputDev..h & Splash.cc & SplashPattern.h: + Improve splash rendering, implement radial and abstract simple + shadings + in splash + + And maybe something more, look at the + Followup Bug 32349 & Poppler: More shading fun ;-) + thread for more info + + poppler/Function.cc | 122 +-------- + poppler/Function.h | 3 +- + poppler/GfxState.cc | 634 + +++++++++++++++++++++++++++++++++++++++------ + poppler/GfxState.h | 90 +++++-- + poppler/SplashOutputDev.cc | 253 +++++++++++++++--- + poppler/SplashOutputDev.h | 67 ++++- + splash/Splash.cc | 126 ++++++--- + splash/SplashPattern.h | 7 +- + 8 files changed, 1006 insertions(+), 296 deletions(-) + +commit 675b3505f963a0110dac7f865654232cbb865ef5 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Feb 13 16:21:52 2011 +0100 + + tests: Merge splash and cairo tests into a single gtk-test tool + + With a command line option to use cairo or splash backends. + + test/CMakeLists.txt | 20 +-- + test/Makefile.am | 29 ++-- + test/gtk-cairo-test.cc | 190 ----------------------- + test/gtk-splash-test.cc | 311 ------------------------------------- + test/gtk-test.cc | 397 + ++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 412 insertions(+), 535 deletions(-) + +commit 728c022cdc1ea12aa54077d44276f9d7714930d4 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 13 13:25:51 2011 +0100 + + remove more references to the qt3 frontend + + followup of d82f98a274bfa008c218e265a080c4af7ce95131 + + Makefile.am | 3 --- + 1 file changed, 3 deletions(-) + +commit 15e5b3f16015361754fdc14da4a0dde5af887568 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 13 13:23:06 2011 +0100 + + remove more GDK-related stuff + + followup of 149b7fec472beda9d1538e0f26607c9498d504c2 + + Makefile.am | 1 - + cmake/modules/FindGDK.cmake | 22 ---------------------- + config.h.cmake | 3 --- + glib/reference/Makefile.am | 1 - + glib/reference/poppler-sections.txt | 1 - + 5 files changed, 28 deletions(-) + +commit 50aa15a0bd7100fc9b9243de1d6e6f4b59df1488 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 13 13:07:19 2011 +0100 + + remove GDK API here too + + followup of 149b7fec472beda9d1538e0f26607c9498d504c2 + + glib/poppler-features.h.cmake | 1 - + 1 file changed, 1 deletion(-) + +commit f410cd11268254b9d0422201c9860d775f73fdd8 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Feb 13 12:55:37 2011 +0100 + + gtk-splash-test: Don't use GDK deprecated API + + test/gtk-splash-test.cc | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) + +commit a0568e449061d6b6af5485e340cd6f9d3e54ef7c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Feb 13 12:27:22 2011 +0100 + + glib: remove gdk referenes from pkg-config files + + poppler-glib-uninstalled.pc.in | 2 +- + poppler-glib.pc.cmake | 2 +- + poppler-glib.pc.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 149b7fec472beda9d1538e0f26607c9498d504c2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Feb 13 11:51:57 2011 +0100 + + glib: Remove deprecated GDK API + + It removes the GDK dependency so that poppler-glib now only depends on + glib and cairo. + + CMakeLists.txt | 9 -- + configure.ac | 44 +------ + glib/CMakeLists.txt | 14 +-- + glib/Makefile.am | 8 +- + glib/poppler-features.h.in | 6 - + glib/poppler-page.cc | 296 + --------------------------------------------- + glib/poppler-page.h | 34 ------ + 7 files changed, 4 insertions(+), 407 deletions(-) + +commit a5482d64472a81206dd8d0c5bb80007f6d5bb893 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Feb 13 11:40:23 2011 +0100 + + glib: Remove test-poppler-glib, poppler-glib-demo does the same + and more + + glib/CMakeLists.txt | 8 - + glib/Makefile.am | 14 - + glib/test-poppler-glib.cc | 657 + ---------------------------------------------- + 3 files changed, 679 deletions(-) + +commit cab0cf028a192772dcb5c3f4aefa0a421e73e9e7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Feb 11 19:42:34 2011 +0000 + + Do not infinite loop in some broken files + + poppler/JBIG2Stream.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 1125cc8ccf386d8e0a0679aa73614bc2cb8037b0 +Author: William Bader <williambader@hotmail.com> +Date: Tue Feb 8 20:27:16 2011 +0000 + + Allow setting the rasterization resolution + + More info at bug 34001 + + poppler/GlobalParams.cc | 15 +++++++++++++++ + poppler/GlobalParams.h | 3 +++ + poppler/PSOutputDev.cc | 7 ++++++- + utils/pdftops.1 | 6 ++++++ + utils/pdftops.cc | 6 ++++++ + 5 files changed, 36 insertions(+), 1 deletion(-) + +commit 96e169b0eca31891f3cd564365d4a2a5c6e2a2c0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 8 19:58:31 2011 +0000 + + Make really sure the uMap static pointer is valid + + It might happen you are extremely unlucky and get the same + globalParams after a new delete/creation + + qt4/src/poppler-private.cc | 51 + +++++++++++++++++++++++++++++++++++++++------- + qt4/src/poppler-private.h | 34 +++---------------------------- + 2 files changed, 47 insertions(+), 38 deletions(-) + +commit c3470145f95791167c19a438934a923eab8a93cf +Author: William Bader <williambader@hotmail.com> +Date: Tue Feb 8 19:54:48 2011 +0000 + + Add PS level1 non standard binary output option + + More info at bug 34003 + + poppler/GlobalParams.cc | 18 +++- + poppler/GlobalParams.h | 5 +- + poppler/PSOutputDev.cc | 227 + ++++++++++++++++++++++++++++++++++-------------- + utils/pdftops.1 | 7 ++ + utils/pdftops.cc | 8 +- + 5 files changed, 198 insertions(+), 67 deletions(-) + +commit 37077aa475d2dee81f87daa05297b201eeb99c87 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Feb 7 19:48:28 2011 +0000 + + Make sure tx is inside the bitmap + + Seems to be what the code tried to do, fixes crash in bug 33948 + depending on + the resolution you render it + + poppler/SplashOutputDev.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 5aa854f70c8f563efe56dafa8bd6b3cdd5c95451 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Feb 6 13:24:35 2011 +0100 + + cairo: Use the new cairo unique id to set the surface id when printing + + Set the unique surface id when attaching jpeg images to the surface so + that cairo can reuse the mime data even when a new surface is created + with the same mime data. This reduces the size of the output file when + printing. + + poppler/CairoOutputDev.cc | 18 ++++++++++++++++-- + poppler/CairoOutputDev.h | 2 +- + 2 files changed, 17 insertions(+), 3 deletions(-) + +commit fe7b8aa4fc78aacf3226d019db74146ceaebd63c +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Feb 2 22:35:40 2011 +0000 + + Workaround bug when converting pdf to ps with level1 + + See bug 31926 for more info + + poppler/PSOutputDev.cc | 2 +- + poppler/PreScanOutputDev.cc | 7 +++++++ + poppler/PreScanOutputDev.h | 7 +++++++ + 3 files changed, 15 insertions(+), 1 deletion(-) + +commit 5984ad081cd609f3146e0da5e22097ef073eb519 +Author: William Bader <williambader@hotmail.com> +Date: Sun Jan 30 17:02:02 2011 +0000 + + Increase precision + + Fixes some issues with pdf from bug 27482 + + poppler/PSOutputDev.cc | 200 + ++++++++++++++++++++++++------------------------- + 1 file changed, 100 insertions(+), 100 deletions(-) + +commit c60d5afbeb986c1b335357202c5f551a3c146a76 +Author: Jim Meyering <meyering@redhat.com> +Date: Mon Jan 24 15:51:20 2011 +0100 + + demo: don't use an uninitialized local variable + + * text.c (pgd_text_get_text): Before this change, when + poppler_page_get_text returned NULL, we'd use "n_recs" uninitialized. + + glib/demo/text.c | 1 + + 1 file changed, 1 insertion(+) + +commit a3bdc56e2f086444419eddfcda5d2010a9a6b5c0 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jan 29 11:23:33 2011 +0100 + + glib-demo: Add a tooltip with current selected character in text demo + + To make sure that the offset of the text returned by + poppler_page_get_text() matches + the list of rectangles returned by poppler_page_get_text_layout(). + + glib/demo/text.c | 60 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 60 insertions(+) + +commit bf2d86c8db430595fb3c55edd3f6c8d289bdaeb5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jan 28 20:34:08 2011 +0000 + + Make sure uMap is still valid before using it + + Fixes KDE bug 264667 + + qt4/src/poppler-private.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit e6fb20d7b3bf8ea8aedc1bcd910e035059835b5f +Author: Axel Strübing <axel.struebing@freenet.de> +Date: Fri Jan 28 19:20:15 2011 +0000 + + Extract text of a pdf correctly + + See "[poppler] text extraction does not work" in the mailing list + for more info + + poppler/GfxFont.cc | 14 +++++++++++++- + poppler/GfxFont.h | 2 ++ + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit 4829d36a3b005585db8c8115f7ee81a4e2384780 +Author: Simon Kellner <kellner@kit.edu> +Date: Wed Jan 26 22:59:49 2011 +0000 + + fix labelToIndex on multiple prefixes + + A PDF document can use page label prefixes, for example, to label + only inside a chapter ("A-1" .. "A-<n>", "B-1" .. "B-<m>" et cetera). + When calculating a page index for a given label, poppler would + disregard the page range for all preceding prefixes that do not + match the given prefix. + + poppler/PageLabelInfo.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit e57c75fbd95ef8399b0785500f6893465bc808c3 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Mon Jan 24 19:48:09 2011 +1030 + + cairo: Implement Type 4,5,6,7 shadings using cairo mesh gradients + + Fixes bugs #19076 and #32791. + + poppler/CairoOutputDev.cc | 139 + ++++++++++++++++++++++++++++++++++++++++++++++ + poppler/CairoOutputDev.h | 12 ++++ + poppler/Gfx.cc | 10 +++- + poppler/OutputDev.h | 2 + + 4 files changed, 161 insertions(+), 2 deletions(-) + +commit 5081356fcc69012e9df95dbf1e3c36e7c1e751c4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 25 20:26:25 2011 +0000 + + Fix leak in SplashOutputDev::axialShadedFill + + poppler/SplashOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 19dc283c3af597deab297341a37495c06988948b +Author: Thomas Klausner <wiz@danbala.tuwien.ac.at> +Date: Mon Jan 24 19:05:08 2011 +0000 + + Include zlib header since we use things defined there + + goo/PNGWriter.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 5056e33e01ce0f7db1a5401b7b38d30e84eedf69 +Author: Sam Liao <phyomh@gmail.com> +Date: Mon Jan 17 13:07:22 2011 +0800 + + Poppler: Fix line selection, dont check y for Line selection + + When a line is selected while the Y values of selection is + not in the y range of words, the render will render the + line with reverse color while the words does not show up. + + This fix neglect the Y vaules to make sure that the words + also displayed when line is selected. + + poppler/TextOutputDev.cc | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +commit 88812e716c1a0c87a504118d47eb4cc6f52962fa +Author: Andreas Hartmetz <ahartmetz@gmail.com> +Date: Fri Jan 21 23:33:47 2011 +0000 + + Add Hinting API to ArthurOutputDev + + poppler/ArthurOutputDev.cc | 11 +++++++++-- + poppler/ArthurOutputDev.h | 15 ++++++++++++++- + 2 files changed, 23 insertions(+), 3 deletions(-) + +commit dc5ec4668bdfe3b6ba41f0a2e551bbc07f8839ba +Author: Andreas Hartmetz <ahartmetz@gmail.com> +Date: Fri Jan 21 23:32:50 2011 +0000 + + support slight hinting in Splash backend + + cpp/poppler-page-renderer.cpp | 2 +- + poppler/SplashOutputDev.cc | 6 +++++- + poppler/SplashOutputDev.h | 4 +++- + qt4/src/poppler-private.h | 3 ++- + qt4/src/poppler-qt4.h | 4 +++- + splash/SplashFTFont.cc | 27 ++++++++++++++++++--------- + splash/SplashFTFont.h | 2 ++ + splash/SplashFTFontEngine.cc | 10 +++++++--- + splash/SplashFTFontEngine.h | 6 ++++-- + splash/SplashFontEngine.cc | 4 +++- + splash/SplashFontEngine.h | 2 ++ + 11 files changed, 50 insertions(+), 20 deletions(-) + +commit 0c5b1bef9f3f98001cee20061b1eaf20b965c5a9 +Author: William Bader <williambader@hotmail.com> +Date: Fri Jan 21 19:01:45 2011 +0000 + + Fix rendering for some pdf with -level1sep + + Also some speed improvemensts. Bug #32365 + + poppler/PSOutputDev.cc | 207 + ++++++++++++++++++++++++++++++++++++++----------- + poppler/PSOutputDev.h | 13 +++- + 2 files changed, 170 insertions(+), 50 deletions(-) + +commit 6cb8965fb8bce6da2a4460e86f592c1ea3a84a5c +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jan 21 18:43:21 2011 +0000 + + fix (C) years + + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 2 +- + qt4/src/poppler-private.cc | 2 +- + qt4/tests/check_strings.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 24f9c8924b2135da616386d0fa691fe790b4e7a4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jan 21 08:43:34 2011 +0000 + + Access the correct variable + + Fixes asert on bug 33063 + + poppler/Annot.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 07a8808c22445c421f3064da7e5227dcbf40358b +Author: Pino Toscano <pino@kde.org> +Date: Mon Jan 17 21:34:23 2011 +0100 + + fix unicodeToQString() to correctly decode the Unicode sequence + + Use a UnicodeMap to convert the sequence to UTF-8, and convert from + that to QString. + Also, ignore the last character of the Unicode sequence if it is 0x0. + + Add a couple of testcases for it. + + qt4/src/poppler-private.cc | 30 ++++++++++++++++++++++++------ + qt4/tests/check_strings.cpp | 21 +++++++++++++++++++++ + 2 files changed, 45 insertions(+), 6 deletions(-) + +commit ed367c08d788c88c49de770019bf826cfebb3e2c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 16 17:25:02 2011 +0000 + + Don't need this either + + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +commit 76ab657dc81ed0af7d9f2efaca2e68d570063001 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 16 17:22:56 2011 +0000 + + And this is the last bit of qt3 cleaning? + + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +commit 9a02856c2762e65b8f03e443e728e05e5a86f65b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 16 17:21:00 2011 +0000 + + Another qt3 unused file + + m4/qt.m4 | 16 ---------------- + 1 file changed, 16 deletions(-) + +commit 26da7a52d31eb677ab6399de2c07140aa272b35e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 16 17:17:59 2011 +0000 + + Yet more qt3 cleaning + + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +commit 8dc9c693abb0033247a338d0f7d1f3f7a57c1a55 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 16 17:14:34 2011 +0000 + + Some more qt3 thigs i forgot to kill + + CMakeLists.txt | 5 - + Makefile.am | 1 - + cmake/modules/FindQt3.cmake | 319 + -------------------------------------------- + 3 files changed, 325 deletions(-) + +commit d82f98a274bfa008c218e265a080c4af7ce95131 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 16 17:13:06 2011 +0000 + + Kill qt3 frontend + + CMakeLists.txt | 5 - + Makefile.am | 5 - + configure.ac | 18 -- + poppler-qt-uninstalled.pc.in | 7 - + poppler-qt.pc.cmake | 13 -- + poppler-qt.pc.in | 13 -- + qt/.gitignore | 7 - + qt/CMakeLists.txt | 34 ---- + qt/Makefile.am | 48 ----- + qt/poppler-document.cc | 344 + --------------------------------- + qt/poppler-fontinfo.cc | 83 -------- + qt/poppler-link-qt3.h | 188 ------------------ + qt/poppler-link.cc | 267 -------------------------- + qt/poppler-page-transition-private.h | 28 --- + qt/poppler-page-transition.cc | 95 ---------- + qt/poppler-page-transition.h | 146 -------------- + qt/poppler-page.cc | 357 + ----------------------------------- + qt/poppler-private.cc | 147 --------------- + qt/poppler-private.h | 102 ---------- + qt/poppler-qt.h | 311 ------------------------------ + qt/test-poppler-qt.cpp | 122 ------------ + 21 files changed, 2340 deletions(-) + +commit 301352e5585d4ab6e7b609b4ab79b4d8b8656092 +Author: Daiki Ueno <ueno@unixuser.org> +Date: Sun Jan 9 18:48:50 2011 +0000 + + Do not crash in case jpeg_create_decompress fails + + Bug 32890 + + poppler/DCTStream.cc | 21 ++++++++++++--------- + poppler/DCTStream.h | 8 ++++++-- + 2 files changed, 18 insertions(+), 11 deletions(-) + +commit 17baf0498485720b4ea5952bb46287f533139d0a +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jan 8 13:03:31 2011 +0000 + + Remove declaration of function without implementation + + poppler/XRef.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit a9e280508f5d669c8b6e1a6bb888b9369d868ab3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jan 8 10:39:41 2011 +0100 + + glib: Fix memory leak when calling poppler_page_get_text_layout() + for pages with no text + + glib/poppler-page.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 5d62d18941810ef7d668eafa8b001085133fb169 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jan 8 10:33:32 2011 +0100 + + glib: Use NULL instead of FALSE in g_return_val_if_fail() for + functions returning a pointer + + glib/poppler-page.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 1324ae13f1fc2fa28951c2c7f7d63d4756537229 +Author: Pino Toscano <pino@kde.org> +Date: Thu Jan 6 01:15:30 2011 +0100 + + [cpp/apidox] advertize the 'pnm' image format + + cpp/poppler-image.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit b192363960c26111167b1b08db9910e5f39dcf8b +Author: Pino Toscano <pino@kde.org> +Date: Thu Jan 6 01:09:09 2011 +0100 + + [cpp] Add PNM (PBM/PGM/PPM) exporting to 'image'. + + Introduce a custom ImgWriter (PNMWriter) for exporting in the PNM + variants, + and use it choosing the output format matching as close as possible + the format of the image. + + cpp/CMakeLists.txt | 1 + + cpp/Makefile.am | 2 + + cpp/PNMWriter.cc | 119 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + cpp/PNMWriter.h | 43 ++++++++++++++++++ + cpp/poppler-image.cpp | 22 +++++++++- + 5 files changed, 186 insertions(+), 1 deletion(-) + +commit bebc530cbde7898759e1bd3629d2836ce0fb1d08 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Fri Dec 31 12:11:40 2010 +1030 + + cairo: Don't set JPX mime data if the stream specifies a colorspace + + The stream colorspace overides, and may be different to, the + colorspace in the JPX data. + + https://bugs.freedesktop.org/show_bug.cgi?id=32746 + + poppler/CairoOutputDev.cc | 46 + +++++++++++++++++++++++++++++++--------------- + poppler/CairoOutputDev.h | 1 + + 2 files changed, 32 insertions(+), 15 deletions(-) + +commit 1399b9ab14b19f25583c75af2b36f63a6a01129a +Author: Pino Toscano <pino@kde.org> +Date: Wed Dec 29 15:56:45 2010 +0100 + + [cpp] add TIFF output to 'image' + + cpp/poppler-image.cpp | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit 1c7937dbc3c577ffc12cacc8de33d320e2f30ce9 +Author: William Bader <williambader@hotmail.com> +Date: Wed Dec 29 14:47:06 2010 +0000 + + Make pdftoppm be able of writing tif files + + BUG 32027 + + CMakeLists.txt | 15 ++++ + config.h.cmake | 3 + + configure.ac | 32 ++++++++ + goo/Makefile.am | 2 + + goo/TiffWriter.cc | 202 + +++++++++++++++++++++++++++++++++++++++++++++++++ + goo/TiffWriter.h | 53 +++++++++++++ + poppler/Makefile.am | 11 +++ + splash/SplashBitmap.cc | 18 ++++- + splash/SplashBitmap.h | 5 +- + splash/SplashTypes.h | 4 +- + utils/pdftoppm.1 | 6 ++ + utils/pdftoppm.cc | 14 +++- + 12 files changed, 358 insertions(+), 7 deletions(-) + +commit bae91ecb638fcfee001e5c9a86a754610da796e4 +Author: William Bader <williambader@hotmail.com> +Date: Tue Dec 28 11:53:54 2010 +0000 + + Add -singlefile option to pdftoppm + + Bug 32025 + + utils/pdftoppm.1 | 3 +++ + utils/pdftoppm.cc | 26 +++++++++++++++++++++++--- + 2 files changed, 26 insertions(+), 3 deletions(-) + +commit ff58ee66c27da09a370a3000ab55eb1a24921852 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 27 20:07:21 2010 +0000 + + bump soname just in case the getPage change is not BC + + qt/CMakeLists.txt | 2 +- + qt/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 453df02e195a96d0210f297c21c8ffba646659da +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 27 19:51:13 2010 +0000 + + Make distcheck work + + glib/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6a34cec72c1a1b6576858a7836aae4a902fb5ed7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 27 19:29:52 2010 +0000 + + increase core soname + + CMakeLists.txt | 2 +- + poppler/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 8c11e9d68dceb609d04b3b383d22c307b5981d86 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 27 19:23:29 2010 +0000 + + 0.16.0 project version increase + + CMakeLists.txt | 4 ++-- + configure.ac | 4 ++-- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +commit 8c1fd83c6061279af00c1172fe41cee61f19d917 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 27 19:22:22 2010 +0000 + + 0.16.0 NEWS + + NEWS | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit 0294d6e50691a3e40fad0d6e4fa9056944a91efd +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Thu Dec 23 15:56:32 2010 +0000 + + Be more correct when drawing radial shadings + + Fixes 32349 + + poppler/Gfx.cc | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) + +commit 3aa08e378927889b35b6fa858d6da568250ba6ec +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 19 22:36:47 2010 +0000 + + Seems to work with this version, so enable it + + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 93cf184b7573980bf2e56342e64f9b99c5d0b415 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 19 14:16:25 2010 +0000 + + Fix last commit + + Applying patches by hand is bad + + poppler/PDFDoc.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ebb580d756a8321de87814f05ab572564732c15e +Author: Philip Lorenz <lorenzph+freedesktop@gmail.com> +Date: Sun Dec 19 14:08:31 2010 +0000 + + Windows fixes + + poppler/PDFDoc.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 88a4154420e016d93c5ce05b5b8e09b6bddcadc9 +Author: Philip Lorenz <lorenzph+freedesktop@gmail.com> +Date: Sun Dec 19 13:03:01 2010 +0000 + + build on newer MSVC + + qt4/src/poppler-annotation.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 18cd9f6aeb48266c551952c395eb9cd662bc27f5 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Sat Dec 18 17:59:54 2010 +0000 + + compile in windows + + poppler/FontInfo.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 471102ef68b439dfa13e20e3b0f2e143f8d0dc85 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 17 00:36:36 2010 +0000 + + Remove -resolution + + Actually use -zoom that is there for a reason + + utils/pdftohtml.1 | 3 --- + utils/pdftohtml.cc | 15 ++++++--------- + 2 files changed, 6 insertions(+), 12 deletions(-) + +commit edf6c47feb5b7658e585bcce196e465245e1dc98 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Dec 16 22:56:40 2010 +0000 + + kill useless code + + utils/pdftohtml.cc | 8 -------- + 1 file changed, 8 deletions(-) + +commit 185a2f81485e19f96393a431be5523a277747b94 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Dec 16 22:56:15 2010 +0000 + + static-ify some vars + + utils/HtmlOutputDev.cc | 9 --------- + utils/pdftohtml.cc | 8 ++++---- + 2 files changed, 4 insertions(+), 13 deletions(-) + +commit e4dfc548c57b690db9122d1db3342ed0a785c8bb +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Dec 14 19:45:46 2010 +0000 + + We need this to make the define really be defined + + config.h.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +commit 06da4b46c442778c67b788b747f04b386b5247ac +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Tue Dec 14 09:06:57 2010 +1030 + + cairo: Use A1 instead of A8 for imagemask + + The cairo PDF surface now optimizes the case of cairo_mask() with + solid source and A1 mask to use a PDF stencil mask. + + Fixes https://bugs.launchpad.net/ubuntu/+source/libcairo/+bug/680628 + where a 65K PDF printed to PDF using poppler-cairo turns into an 8MB + PDF. + + CMakeLists.txt | 2 ++ + configure.ac | 1 + + poppler/CairoOutputDev.cc | 25 ++++++++++++++++++------- + 3 files changed, 21 insertions(+), 7 deletions(-) + +commit 6ef457dc818e7e241e5d2e264bc2d78b132ae638 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 13 14:08:29 2010 +0000 + + Move -fno-exceptions -fno-check-new to default flags + + Makes sense since we decided not to support the exception path in + gmem a + while ago + + cmake/modules/PopplerMacros.cmake | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 86e469600b58ae05cb6ede1b4017fbdac99cc556 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 13 14:04:00 2010 +0000 + + More gcc flags movement + + -Wchar-subscripts is part of -Wall so remove it + Move -fno-common to default options since it makes sense to use it + + cmake/modules/PopplerMacros.cmake | 4 ++-- + configure.ac | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 2b74241d8b1fd1ec9fab4f6f673bbaaa1cb3d949 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 13 13:56:52 2010 +0000 + + Promote -Wcast-align to the general warnings we ask gcc to give + + cmake/modules/PopplerMacros.cmake | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 7313e0a4de6f2146c1dcb3d235f18a3c844d12d5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 12 23:28:18 2010 +0000 + + Do not return 99 (or 1) with -h, -v and -printenc + + Bug 32149 + + utils/pdffonts.cc | 2 ++ + utils/pdfimages.cc | 2 ++ + utils/pdfinfo.cc | 3 +++ + utils/pdftoppm.cc | 2 ++ + utils/pdftops.cc | 5 ++++- + utils/pdftotext.cc | 3 +++ + 6 files changed, 16 insertions(+), 1 deletion(-) + +commit 669cbfc9fd78a22d4f14b0af43143e1f5dc28cd5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Dec 11 19:04:22 2010 +0000 + + Fix the preliminary bbox/clip calculation + + Code based in code posted by Suzuki Toshiya in the freetype mailing + list + + splash/SplashFTFont.cc | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit 2984002a64acca7014edeadd900dd52cdf7d9eac +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Dec 11 18:57:52 2010 +0000 + + Remove the * we just need to increase the pointer + + Gives a warning with newer gcc's + + splash/Splash.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 9b45fa072198da4a5032004ac943cf2227aa97ea +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 10 12:05:58 2010 +0000 + + Make PreScanOutputDev be less agressive when deciding to rasterize + + BUG 30107 + + poppler/PreScanOutputDev.cc | 14 +++++++++++++- + poppler/PreScanOutputDev.h | 4 ++++ + 2 files changed, 17 insertions(+), 1 deletion(-) + +commit f96f6a06cdc33b4654669ac74d5abd0d546a127d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 5 12:06:21 2010 +0000 + + Adapt the zlib-base FlateStream code to API changes + + Bug 32065 + + poppler/FlateStream.cc | 9 ++++++--- + poppler/FlateStream.h | 9 +++++++++ + 2 files changed, 15 insertions(+), 3 deletions(-) + +commit 7b1f83990a1f68306daf5f7dbeabcd38f4382e3b +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Nov 29 22:27:46 2010 +0000 + + 0.15.3 + + CMakeLists.txt | 4 ++-- + NEWS | 18 ++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 24 insertions(+), 6 deletions(-) + +commit 7c23a993193aaaa4d4b5b6d1161a0455d1e2a8c0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Nov 29 21:33:31 2010 +0000 + + Add some more isNum before calling getNum + + poppler/GfxState.cc | 48 ++++++++++++++++++++++++++++++++---------------- + 1 file changed, 32 insertions(+), 16 deletions(-) + +commit 62ec4f591c258e702ee79b519919a931517220bf +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Nov 29 20:50:43 2010 +0000 + + pass fetchOriginatorNums in some more calls + + Fixes some more crashes in broken files + + poppler/Parser.cc | 7 ++++++- + poppler/Parser.h | 1 + + poppler/XRef.cc | 6 +++--- + 3 files changed, 10 insertions(+), 4 deletions(-) + +commit d2a0e2ca723142478858f7edfb7c98807d554578 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu Nov 25 10:36:38 2010 +0000 + + Skip over loops in Pages tree + + poppler/Catalog.cc | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit 7abd371364e6e4aaef932f26b0664f7f9d760c42 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 28 13:57:50 2010 +0000 + + this var is not about xobjects only anymroe + + poppler/FontInfo.cc | 6 +++--- + poppler/FontInfo.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 1ac14df61d711097837e44d80a9332f0a854b95e +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sun Nov 28 13:49:41 2010 +0000 + + find fonts inside patterns + + Bug 31948 + + poppler/FontInfo.cc | 50 + +++++++++++++++++++++++++++----------------------- + 1 file changed, 27 insertions(+), 23 deletions(-) + +commit d30dd8c6f6491beac9750447126930168394cd9f +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 28 13:25:39 2010 +0000 + + Use sets instead of arrays + + poppler/FontInfo.cc | 46 ++++++++-------------------------------------- + poppler/FontInfo.h | 11 +++-------- + 2 files changed, 11 insertions(+), 46 deletions(-) + +commit 4c20bf14c0b1d7f1d5e530ded890186487da32b5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 28 12:50:24 2010 +0000 + + Use FontInfoScanner + + No idea why we didn't do this before, duplicate code is evil and now + pdffonts doesn't crash on pdf from bug 20486 + + utils/pdffonts.cc | 185 + ++++++++---------------------------------------------- + 1 file changed, 26 insertions(+), 159 deletions(-) + +commit d915f3d5a9e9e2e5dcd6be4cf8fac1b5849a13e9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 24 21:51:46 2010 +0000 + + protect against null ref here + + poppler/Catalog.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cf32faaa16d763561fb9dfc4469345e4b3ba2369 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 24 21:48:54 2010 +0000 + + Protect against NULL values here + + poppler/JPEG2000Stream.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 46a6cc5952c59504863baed3ad2870093c462f12 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 24 19:42:59 2010 +0000 + + Check the objects are numbers before using them + + Bug 31895 + + poppler/GfxState.cc | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +commit 52e25cca7e75a8b8eac95a3cec258f1cd9f8ecaa +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Nov 23 20:31:14 2010 +0000 + + If it is not a Page but has no Kids either let's just pretend it's + a page + + Fixes broken PDF at bug 31861 + + poppler/Catalog.cc | 2 +- + poppler/Dict.cc | 4 ++++ + poppler/Dict.h | 2 ++ + 3 files changed, 7 insertions(+), 1 deletion(-) + +commit c6127898b13311197971b1c6b1b306b91e28cf0e +Author: Hib Eris <hib@hiberis.nl> +Date: Mon Nov 22 13:08:48 2010 +0000 + + Use gmallocn_checkoverflow when parsing Hints table + + Prevents running out of memory with malicious documents. + + poppler/Hints.cc | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 6a17cc89eda52f08cbacbf9bfaaeda22cf041e82 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Mon Nov 22 19:20:56 2010 +0000 + + Improve rendering of radial shadings + + Improves the duck rendering in bug 22098 + + poppler/Gfx.cc | 71 + ++++++++++++++++++++++++++++------------------------------ + 1 file changed, 34 insertions(+), 37 deletions(-) + +commit 9093adede4f9ad6fb2962dcefcb09c1d8c357715 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 21 23:49:12 2010 +0000 + + pedantic ; + + poppler/CurlPDFDocBuilder.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 61445f5af749510fb647059af01abf1faf664195 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Nov 20 22:19:35 2010 +0000 + + forgot to upadte year here + + poppler/Parser.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3628837febb21bcd1b54f3fb737628ea59e5d95d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Nov 20 22:15:08 2010 +0000 + + And now generalize the previous fix + + Works for loops of more than one item as in bug 28784 + + poppler/Dict.cc | 4 ++-- + poppler/Dict.h | 2 +- + poppler/Object.cc | 4 ++-- + poppler/Object.h | 9 +++++---- + poppler/Parser.cc | 19 +++++++++++++------ + poppler/Parser.h | 7 ++++++- + poppler/XRef.cc | 30 +++++++++++++++++++++++++----- + poppler/XRef.h | 2 +- + 8 files changed, 55 insertions(+), 22 deletions(-) + +commit b0555189a7fbd7f6a899e582783b9e0df44d5d6a +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Nov 20 21:32:24 2010 +0000 + + Protect against more loops when parsing + + poppler/Dict.cc | 4 ++-- + poppler/Dict.h | 2 +- + poppler/Object.cc | 4 ++-- + poppler/Object.h | 8 ++++---- + poppler/Parser.cc | 2 +- + poppler/XRef.cc | 4 ++-- + poppler/XRef.h | 2 +- + 7 files changed, 13 insertions(+), 13 deletions(-) + +commit 555fa897b275ca7195f22a727b049c8c4f2d74cd +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Nov 20 19:14:38 2010 +0000 + + Detect loops in FormField creation + + poppler/Form.cc | 88 + ++++++++++++++++++++++++++++++++------------------------- + poppler/Form.h | 14 +++++---- + 2 files changed, 58 insertions(+), 44 deletions(-) + +commit 1802ddef374cb1451975480b2427e5d23ee2c737 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Nov 20 18:58:17 2010 +0000 + + Forgot to port this away from GooVector :-S + + poppler/CurlCachedFile.cc | 3 +-- + poppler/CurlCachedFile.h | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +commit 32e53c5436b8c3654e7043f1d86596a79511a4cf +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Nov 20 18:54:59 2010 +0000 + + fix spacing + + poppler/Form.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 1cb3d5d94a1d89ccded96d977bcabfbe438fb81f +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Nov 20 18:08:45 2010 +0000 + + fix the memset + + Fixes crash in broken pdf + + poppler/Hints.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 22e8cebaa15adb4b19c9556cdca43cc3e77832b7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Nov 20 17:20:34 2010 +0000 + + Ensure the obj are num before reading them + + poppler/GfxState.cc | 32 ++++++++++++++++++++++---------- + 1 file changed, 22 insertions(+), 10 deletions(-) + +commit 08b2db36db4e011ebe36d2d945cb1a0498f1c5fb +Author: Pino Toscano <pino@kde.org> +Date: Sat Nov 20 14:00:36 2010 +0100 + + add my copyright here + + poppler/Hints.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 91aa4b02aa93ffe3828479194067de42d52be465 +Author: Pino Toscano <pino@kde.org> +Date: Sat Nov 20 13:13:46 2010 +0100 + + [cpp] include <ios> for std::hex() and std::left() + + cpp/poppler-global.cpp | 1 + + cpp/tests/poppler-dump.cpp | 1 + + 2 files changed, 2 insertions(+) + +commit 1c924412923cb01f2cb95b0943cb7bbaf7e8cfb6 +Author: Pino Toscano <pino@kde.org> +Date: Sat Nov 20 13:02:36 2010 +0100 + + [cpp] include <iterator> for std::back_inserter() + + cpp/poppler-document.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit 95b551025a34f3a7bcff2852eac6d186bc8a7cb0 +Author: Pino Toscano <pino@kde.org> +Date: Sat Nov 20 12:54:21 2010 +0100 + + use a std::vector<char> instead of a var-length-array of char's + + poppler/Hints.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 4faaff893515c80cb69b02e431a0f8483274a497 +Author: Hib Eris <hib@hiberis.nl> +Date: Fri Nov 19 23:53:35 2010 +0000 + + [win32] Simplify strtok_r implementation + + The previous implementation did not compile with mingw64. + + poppler/strtok_r.cpp | 137 + +-------------------------------------------------- + 1 file changed, 1 insertion(+), 136 deletions(-) + +commit 255f84927a649d980f047fe755c9c308535a3779 +Author: Hib Eris <hib@hiberis.nl> +Date: Fri Nov 19 23:45:33 2010 +0000 + + Correct parsing of linearization table + + Fixes bug #31627 + + poppler/Linearization.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 9d05138f0b7d15945f546564036bc67815593db0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 14 16:05:28 2010 +0000 + + 0.15.2 + + CMakeLists.txt | 4 ++-- + NEWS | 22 ++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 28 insertions(+), 6 deletions(-) + +commit 2d18543bd6b3a5a9ff2dfab63339d5bfcccd0b2f +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 14 15:41:56 2010 +0000 + + This does actually work now :D + + qt4/tests/check_metadata.cpp | 1 - + 1 file changed, 1 deletion(-) + +commit d772364b8a5858cbd98e256547d319260fa9d084 +Author: Pino Toscano <pino@kde.org> +Date: Thu Nov 11 21:52:25 2010 +0100 + + [Qt4] New function setDebugErrorFunction(). + + This new function + typedef can be useful to direct the ebug/error + messages + to a different place than the default qDebug()'s one. + + Base on an idea of Albert, added closure and polish by me. + + qt4/src/poppler-private.cc | 20 +++++++++++++++++++- + qt4/src/poppler-qt4.h | 24 ++++++++++++++++++++++++ + 2 files changed, 43 insertions(+), 1 deletion(-) + +commit ce929cf33f4b6b6421f9d327b4bb792816d47aac +Author: Jakob Voss <jakob.voss@gbv.de> +Date: Wed Nov 10 23:41:44 2010 +0000 + + Add -p flag to pdfimages + + Adds the page the image is in to the image filename + + utils/ImageOutputDev.cc | 25 ++++++++++++++++++------- + utils/ImageOutputDev.h | 19 +++++++++++++++---- + utils/pdfimages.1 | 3 +++ + utils/pdfimages.cc | 6 +++++- + 4 files changed, 41 insertions(+), 12 deletions(-) + +commit 6296c28968613aadb7ea084092945a54005eca9b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 10 23:28:45 2010 +0000 + + Kill GooVector + + std::vector does the same and GooVector is not part of xpdf so + we don't + need to maintain it in case we ever get a new xpdf release we want to + merge with + + CMakeLists.txt | 1 - + goo/GooVector.h | 159 + --------------------------------------------- + goo/Makefile.am | 1 - + poppler/CachedFile.cc | 19 +++--- + poppler/CachedFile.h | 15 +++-- + poppler/Catalog.cc | 12 ++-- + poppler/Catalog.h | 10 +-- + poppler/Form.h | 3 +- + poppler/Gfx.h | 7 +- + poppler/Hints.cc | 5 +- + poppler/Hints.h | 6 +- + poppler/StdinCachedFile.cc | 2 +- + poppler/StdinCachedFile.h | 2 +- + poppler/Stream.h | 1 - + poppler/XRef.cc | 10 +-- + poppler/XRef.h | 7 +- + utils/HtmlFonts.cc | 8 +-- + utils/HtmlFonts.h | 12 ++-- + utils/HtmlLinks.cc | 8 +-- + utils/HtmlLinks.h | 4 +- + 20 files changed, 66 insertions(+), 226 deletions(-) + +commit 5934c320aa136c1a6e97fb9bf54bdfdccfcab521 +Author: Hib Eris <hib@hiberis.nl> +Date: Wed Nov 10 22:50:36 2010 +0000 + + Linearization improvements + + Read + http://lists.freedesktop.org/archives/poppler/2010-November/006642.html + for the detailed patch description + + CMakeLists.txt | 4 + + glib/poppler-action.cc | 4 +- + glib/poppler-document.cc | 17 +- + glib/poppler-page.cc | 1 + + poppler/CachedFile.h | 2 +- + poppler/Catalog.cc | 352 +++++++++++++++++++++----------- + poppler/Catalog.h | 14 +- + poppler/FontInfo.cc | 5 +- + poppler/Hints.cc | 439 + ++++++++++++++++++++++++++++++++++++++++ + poppler/Hints.h | 95 +++++++++ + poppler/Linearization.cc | 224 ++++++++++++++++++++ + poppler/Linearization.h | 45 ++++ + poppler/Makefile.am | 4 + + poppler/PDFDoc.cc | 284 ++++++++++++++++++++++---- + poppler/PDFDoc.h | 38 +++- + poppler/PSOutputDev.cc | 39 ++-- + poppler/PSOutputDev.h | 14 +- + poppler/Stream.cc | 13 +- + poppler/Stream.h | 11 +- + poppler/XRef.cc | 351 +++++++++++++++++++------------- + poppler/XRef.h | 25 ++- + qt/poppler-document.cc | 14 +- + qt/poppler-page.cc | 19 +- + qt/poppler-private.h | 14 +- + qt/poppler-qt.h | 3 +- + qt4/src/poppler-document.cc | 12 +- + qt4/src/poppler-link.cc | 7 +- + qt4/src/poppler-page.cc | 3 +- + qt4/src/poppler-ps-converter.cc | 2 + + utils/HtmlOutputDev.cc | 2 +- + utils/HtmlOutputDev.h | 3 + + utils/pdffonts.cc | 6 +- + utils/pdfinfo.cc | 22 +- + utils/pdftohtml.cc | 2 +- + utils/pdftops.cc | 3 +- + 35 files changed, 1690 insertions(+), 403 deletions(-) + +commit abb1313ae40ab7efb073406f47fa53bf7afe0b88 +Author: Pino Toscano <pino@kde.org> +Date: Mon Nov 8 01:54:03 2010 +0100 + + [cpp/apidox] add the minimum version of 'image' + + cpp/poppler-image.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +commit f559e77cb7d76c5fe6a79be9086667a29613c912 +Author: Pino Toscano <pino@kde.org> +Date: Mon Nov 8 01:52:48 2010 +0100 + + [cpp] add image::bytes_per_row() + + cpp/poppler-image.cpp | 8 ++++++++ + cpp/poppler-image.h | 1 + + 2 files changed, 9 insertions(+) + +commit 14dea4d74698d5d7d994e687f8176652d790dba7 +Author: Pino Toscano <pino@kde.org> +Date: Sun Nov 7 22:57:31 2010 +0100 + + [arthur] use the untransformed line width, not the transformed one + + ... as the painter will do the transformation itself already; + seems to product better results + + poppler/ArthurOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f077e82af0724be88d28c896a3c208f1d50ccff9 +Author: Pino Toscano <pino@kde.org> +Date: Sun Nov 7 21:50:48 2010 +0100 + + [qt4] New Page::renderToPainter() + + This new painter-based painting function ican be used for painting + (with Arthur only for now) without getting an image first. + Also add a new flag type for it, with a single item telling whether + do not save+restore the provided painter. + + Mostly based on a patch by Matthias Fauconneau + (matthias.fauconneau@gmail.com), thanks! + + qt4/src/poppler-page.cc | 62 + +++++++++++++++++++++++++++++++--------------- + qt4/src/poppler-qt4.h | 65 + ++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 107 insertions(+), 20 deletions(-) + +commit df02d1fc9e65422121e5e8f493c13229552ec0e7 +Author: Pino Toscano <pino@kde.org> +Date: Sun Nov 7 19:47:56 2010 +0100 + + [arthur] remove unused 'm_image' attribute + + poppler/ArthurOutputDev.cc | 1 - + poppler/ArthurOutputDev.h | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +commit b29582cd0d542a3e70dbca3fb75770daa4cc91ca +Author: Matthias Fauconneau <matthias.fauconneau@gmail.com> +Date: Sun Nov 7 19:44:11 2010 +0100 + + [arthur] small fixes and memory leaks + + - fix font rendering (transforming the glyph path and not only the + glyph origin) + - fix image rendering (alpha was set to zero) + + poppler/ArthurOutputDev.cc | 122 + ++++++++++++++++++++------------------------- + 1 file changed, 54 insertions(+), 68 deletions(-) + +commit 970f075569bf9be5e5ddc3a9ad1fabec5435dfaf +Author: Pino Toscano <pino@kde.org> +Date: Sun Nov 7 16:31:02 2010 +0100 + + [cpp/tests] add a simple poppler-render test + + ... to ease testing the render capabilities of poppler-cpp. + quite minimal at the moment. + + cpp/tests/CMakeLists.txt | 3 ++ + cpp/tests/Makefile.am | 9 +++- + cpp/tests/poppler-render.cpp | 113 + +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 124 insertions(+), 1 deletion(-) + +commit bfe4139c742cb0a669f5504df7e22e3e57243d9a +Author: Pino Toscano <pino@kde.org> +Date: Sun Nov 7 16:23:26 2010 +0100 + + [cpp] Add page_renderer, to render pages over images. + + This new class introduces a very simple way to render a page, using + the Splash backend, + giving an 'image' as result. + It can hold a color for the "paper" of the pages, and some hints + for the actual rendering. + + cpp/CMakeLists.txt | 2 + + cpp/Makefile.am | 2 + + cpp/poppler-page-renderer.cpp | 212 + ++++++++++++++++++++++++++++++++++++++++++ + cpp/poppler-page-renderer.h | 66 +++++++++++++ + 4 files changed, 282 insertions(+) + +commit 91e3f7b4ea42a5821fd78e1edf55e95250c9bc68 +Author: Pino Toscano <pino@kde.org> +Date: Sun Nov 7 16:19:34 2010 +0100 + + [cpp] add an internal way to get a 'page_private' of a 'page' + + useful for getting a 'page_private' in the implementation of other + cpp classes + without the need to add friends to 'page' + + cpp/poppler-page-private.h | 5 +++++ + 1 file changed, 5 insertions(+) + +commit fa7c41cb9c52ecd3d7c574455b1258a3021b8c75 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Nov 4 20:55:34 2010 +0000 + + Improvements to the splash backend + + Antialias and shadings. + Code by Thomas Freitag <Thomas.Freitag@alfa.de> and Christian + Feuersänger <cfeuersaenger@googlemail.com> + More info at bug 30436 + + poppler/CairoOutputDev.h | 5 +- + poppler/Function.cc | 4 +- + poppler/Function.h | 2 + + poppler/Gfx.cc | 12 +- + poppler/OutputDev.h | 16 +- + poppler/PSOutputDev.h | 4 +- + poppler/SplashOutputDev.cc | 182 ++++++++++++++++++++- + poppler/SplashOutputDev.h | 68 +++++++- + splash/Splash.cc | 395 + ++++++++++++++++++++++++++++++++++++++++++++- + splash/Splash.h | 11 +- + splash/SplashBitmap.cc | 4 +- + splash/SplashBitmap.h | 3 + + splash/SplashPattern.cc | 17 +- + splash/SplashPattern.h | 36 ++++- + 14 files changed, 735 insertions(+), 24 deletions(-) + +commit 0aa040163741ab8ba093a742e556bba2a5ab7edf +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 3 20:40:24 2010 +0000 + + Do not add sibling children as parents + + Fixes c2ff94b1600b8a5841a5e4627f014560ac460f1a + + poppler/Function.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit c2ff94b1600b8a5841a5e4627f014560ac460f1a +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 3 00:02:02 2010 +0000 + + Do not loop forever in broken documents + + StitchingFunctions that have themselves up in the parent chain + are wrong + + poppler/Function.cc | 22 +++++++++++++++++++--- + poppler/Function.h | 6 ++++-- + 2 files changed, 23 insertions(+), 5 deletions(-) + +commit cad66a7d25abdb6aa15f3aa94a35737b119b2659 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Nov 2 19:14:34 2010 +0000 + + Fix crash in broken documents + + mapLen = (code + 256) & ~255; can wrap and you end up with mapLen + < code + that is not what you wanted + + poppler/CharCodeToUnicode.cc | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +commit 7e5f31c1c41193c6e49355970e6d027b91d45825 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Nov 2 00:32:01 2010 +0000 + + make some more fields private + + splash/SplashFontFile.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 6751eb48dc49890f7ad8b732b3fc29a2db746ec4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Nov 2 00:26:08 2010 +0000 + + Make the destructor private + + You are not supposed to call it, you should call unref + + splash/SplashFontFile.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit b718e821d5f21ea5b0c44c6c2b59769c9b94892a +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Oct 28 08:46:09 2010 +0100 + + Revert fdfffc9c68314d3f64dee7e0ef8617105e3198dd + + It is not a leak and makes things crash :D + + poppler/SplashOutputDev.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 15b9aeac5a20c544db1aebe00113ebc2f7ba52c7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Oct 28 00:37:29 2010 +0100 + + if reallocn fails, free p + + goo/gmem.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 561c0567a5741d7c49903c51c8020187dccaa0d9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Oct 27 22:43:51 2010 +0100 + + fix comment + + poppler/SplashOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4ef38cc99a879202e717447a422272cf85eeccfc +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Oct 27 22:36:07 2010 +0100 + + Fix memory leaks that can happen with broken documents + + poppler/SplashOutputDev.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit fdfffc9c68314d3f64dee7e0ef8617105e3198dd +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Oct 27 20:40:19 2010 +0100 + + Fix memory leak + + poppler/SplashOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 90d479d9d5c947175e60ab689f440ae9c24f0b2b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Oct 27 20:39:48 2010 +0100 + + Do not crash if bitmap->alpha == NULL + + Happens in broken files + + splash/Splash.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 6ad36277971ec46d4a4ef0c45625e60f8c5f1247 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Oct 25 18:59:49 2010 +0100 + + Initialze movie to NULL on broken pdf files + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 2d0b6e2956a81164bca6adc9aacad0e620480957 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 24 00:23:21 2010 +0100 + + Here the chars to read is the increment size not the initialSize + + Fixes crash in file provided by Robert Święcki + + poppler/Stream.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dcb02d2100136b6035485be3be214ce3d9f1c102 +Author: Vincent Torri <vtorri@univ-evry.fr> +Date: Sat Oct 23 23:45:05 2010 +0100 + + remove -ansi flag for cywin and mingw + + configure.ac | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 17cdc81224c72f7b58de61734c9ead337ff7b42b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 23 23:37:59 2010 +0100 + + update my C year + + poppler/SplashOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e09ddce7e21bbd62b384d9d59fbd1e0f14f7d05f +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 23 23:33:00 2010 +0100 + + Fix crash in malformed documents + + poppler/SplashOutputDev.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 906e4e15421d8f3f0a825ca767e5eac3169853d6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 23 23:12:44 2010 +0100 + + Do not leak attrs1 + + poppler/Catalog.cc | 1 + + 1 file changed, 1 insertion(+) + +commit ec32bb45a57a8a839156c946fcde1270aa6019d9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 23 23:00:03 2010 +0100 + + Do not crash if n is 0 + + poppler/Function.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 9edf7e4fefb37989af9a2558aaa83d7cd4694ec6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 23 22:59:50 2010 +0100 + + add unlikely marker + + poppler/Decrypt.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c46e863b7b94dc2f83a7d89f4afb8fe3bc8ec35c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 23 22:55:49 2010 +0100 + + Do not divide by 0 in rc4InitKey + + poppler/Decrypt.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit bcb13ed5828e2a855efd5e38b2acd15ca37a9991 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 23 22:40:17 2010 +0100 + + Check obj2 is a num before reading it + + poppler/Gfx.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit c64a49307782299cb7a950a66419f9d59707f38b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Oct 20 22:29:29 2010 +0100 + + 0.15.1 + + CMakeLists.txt | 4 ++-- + NEWS | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 52 insertions(+), 6 deletions(-) + +commit 3b45c66de91243d7419657512cf726c9e1c26dfb +Author: Kenneth Berland <ken@hero.com> +Date: Sun Oct 17 14:24:16 2010 +0100 + + Add -bbox option to pdftotext + + utils/pdftotext.1 | 4 ++ + utils/pdftotext.cc | 125 + ++++++++++++++++++++++++++++++++++++++++++----------- + 2 files changed, 103 insertions(+), 26 deletions(-) + +commit 71ec4c7a6715a40d536d1e4b911dae48d1bba7b9 +Author: Pino Toscano <pino@kde.org> +Date: Sun Oct 17 14:57:43 2010 +0200 + + [CMake] update MacroOptionalFindPackage.cmake from KDE SVN + + no radical changes, just a minor improvement for the "explicitly + disabled" case + + cmake/modules/MacroOptionalFindPackage.cmake | 40 + +++++++++++++++++++++------- + 1 file changed, 30 insertions(+), 10 deletions(-) + +commit ab0049d8be5dfe1989c4aa33c2732915c62fecb2 +Author: Pino Toscano <pino@kde.org> +Date: Sun Oct 17 14:29:22 2010 +0200 + + [CMake] Cairo package: make the version check really working + + cmake/modules/FindCairo.cmake | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 1cea33717c92631ee9c417d9f89e32b03695c75a +Author: Pino Toscano <pino@kde.org> +Date: Sun Oct 17 13:55:58 2010 +0200 + + [CMake] Bump cairo dependency to 1.10 + + followup of fc9b85894754d175af916eaf6cb127efd601df7e + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d6f49aa2da15cd2e9cf775d6b1d2d04a005c8cdd +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 17 14:22:57 2010 +0200 + + [cairo] Fix a crash when redering documents with invalid type 3 fonts + + poppler/CairoFontEngine.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e2fad550c3cbf86541730582151e1bb6470ed9c1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 17 13:47:33 2010 +0200 + + [glib-demo] Use poppler_page_get_selected_region() in selections demo + + glib/demo/selections.c | 73 + +++++++++++++++----------------------------------- + 1 file changed, 22 insertions(+), 51 deletions(-) + +commit 88013458e141de58ed801480707ae0dfe92b9aa2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 17 13:46:26 2010 +0200 + + [glib] Add poppler_page_get_selected_region() + + that returns a cairo_region_t, and deprecate + poppler_page_get_selection_region(). + + glib/poppler-page.cc | 81 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-page.h | 4 ++ + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 86 insertions(+) + +commit fc9b85894754d175af916eaf6cb127efd601df7e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 17 12:54:18 2010 +0200 + + [configure] Bump cairo dependency to 1.10 + + configure.ac | 2 +- + poppler/CairoOutputDev.cc | 4 ---- + 2 files changed, 1 insertion(+), 5 deletions(-) + +commit dd14ef6b211ac1c8a4f16bb6094dbfd6a09cbef9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 17 12:46:55 2010 +0100 + + Improve dict lookup speed for big dicts + + Based on a patch by Paweł Wiejacha <pawel.wiejacha@gmail.com> + + poppler/Dict.cc | 98 + +++++++++++++++++++++++++++++++++++++++++++++------------ + poppler/Dict.h | 2 ++ + 2 files changed, 80 insertions(+), 20 deletions(-) + +commit bb38a0c71434413f2728109c73278de1b8a58571 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 17 12:52:01 2010 +0200 + + [glib-demo] Make glib demo program installable + + It's a useful tool for testing and debugging not only for people who + install from sources. + + glib/demo/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d26d0fab2ddfff853f6681a3518813a2d65a4112 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 17 12:36:46 2010 +0200 + + [glib-demo] Use printing options in print demo + + glib/demo/print.c | 96 + +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 93 insertions(+), 3 deletions(-) + +commit 4a71dcdd350d0c0515ca349f0b875b33289d25ee +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 17 12:31:41 2010 +0200 + + [glib] Add poppler_page_render_for_printing_with_options() + + It allows to print with the same options acroread has: + + - Print document + - Print document and markup + - Print document and stamps + + glib/poppler-page.cc | 77 + ++++++++++++++++++++++++++++++++----- + glib/poppler-page.h | 3 ++ + glib/poppler.h | 19 +++++++++ + glib/reference/poppler-sections.txt | 4 ++ + 4 files changed, 94 insertions(+), 9 deletions(-) + +commit 0b3b2ebc3930bd46fb13fb2158fc695b0962f7c5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 16 15:09:05 2010 +0100 + + Add a callback to know which page has been printed + + qt4/src/poppler-ps-converter.cc | 16 ++++++++++++++-- + qt4/src/poppler-qt4.h | 10 ++++++++++ + 2 files changed, 24 insertions(+), 2 deletions(-) + +commit 4bd25223c4d15dfa91965a6e86eaa444a5a81f71 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 16 15:08:05 2010 +0100 + + Do not omit this character + + Mimics Cairo backend and Adode Reader behaviour + + splash/SplashFTFont.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit b604a008a2a379a21e5fdfa0799886f80d893a08 +Author: Christian Feuersänger <cfeuersaenger@googlemail.com> +Date: Thu Oct 14 23:56:36 2010 +0100 + + Improve rendering of Shading Type 6 and 7 + + poppler/Gfx.cc | 214 + +++++++++++++++++++++++++++++++++++++++++----------- + poppler/Gfx.h | 9 ++- + poppler/GfxState.cc | 96 ++++++++++++++++++++++- + poppler/GfxState.h | 127 ++++++++++++++++++++++++++++++- + 4 files changed, 398 insertions(+), 48 deletions(-) + +commit c6bb63b31c268e4e842532e6839b15edb31cf25c +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Oct 14 23:33:13 2010 +0100 + + Only clip boxes to mediabox if we are at the page level + + Fixes bug 30784 + + poppler/Page.cc | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) + +commit 4a248b3f523209ec16ace587229412653b2276d0 +Author: Pino Toscano <pino@kde.org> +Date: Thu Oct 14 18:32:05 2010 +0200 + + [cpp] make it compile also when there are no image formats available + + including the ImgWirter.h is enough to get the definition of ImgWriter + + cpp/poppler-image.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit de1501d87549269f9214c9e3fba4cbf39960826e +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Oct 13 19:18:36 2010 +0100 + + remove windows eol + + poppler/Gfx.cc | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +commit 12e68b49feef10b654944dd71eab0852cfeceb89 +Author: Pino Toscano <pino@kde.org> +Date: Sun Oct 10 23:04:57 2010 +0200 + + [cpp] Add a new 'image' class. + + This implicitely shared class represents the data buffer of an + "image", + with direct access to the data. + It also has a function to save to file (png/jpeg). + + Still a FIXME in the copy() method and in the save() (for mono + images only). + + cpp/CMakeLists.txt | 2 + + cpp/Makefile.am | 3 + + cpp/poppler-image-private.h | 48 +++++ + cpp/poppler-image.cpp | 431 + ++++++++++++++++++++++++++++++++++++++++++++ + cpp/poppler-image.h | 70 +++++++ + 5 files changed, 554 insertions(+) + +commit db31687ba476e272b72625a8a78b50780522ee7d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Oct 9 10:33:06 2010 +0200 + + [glib] docs: Document poppler_annot_markup_get_date() + + glib/poppler-annot.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit a7cf8d322a4a687c9810a577cc92ff6b9725ecdc +Author: Fernando Herrera <fherrera@onirica.com> +Date: Thu Oct 7 17:28:31 2010 +0200 + + [glib] Fix introspection annotations for poppler_document_get_page*() + + Return value should be transfer full since the caller owns the only + reference. + + glib/poppler-document.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit d690bea929553d1a4392d42d949843e9467ba8cb +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Oct 5 22:18:22 2010 +0100 + + Make sure obj is a num before reading it + + Not sure if using a 0 is correct otherwise, but if your matrix is + broken you're probably going to get a wrong rendering anyway, so who + cares. Bug #30590 + + poppler/Gfx.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit b17be2bc32cf71bac0473bf4ac16359e3027b4fc +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 3 12:14:11 2010 +0200 + + [annots] Fix a crash when drawing square/circle annots without + a border + + Fixes bug #30580 + + poppler/Annot.cc | 121 + ++++++++++++++++++++++++++++--------------------------- + 1 file changed, 61 insertions(+), 60 deletions(-) + +commit e3d3944c1988343704e3ba3a5d60609719466afb +Author: Tomas Hoger <thoger@redhat.com> +Date: Wed Sep 29 20:03:45 2010 +0100 + + Fix uninitialized uses on DCTScanInfo + + poppler/Stream.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit f380647f09d88339c936184bbe86c70c0d47de4b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 29 20:02:10 2010 +0100 + + Free names + + poppler/Catalog.cc | 1 + + 1 file changed, 1 insertion(+) + +commit aa0fd32a8501473832bce1b8b804dd3f9a45735b +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 27 22:39:09 2010 +0100 + + Consider render value when colorizing text + + Fixes bug 2807 + + poppler/CairoOutputDev.cc | 18 +++--------------- + poppler/CairoOutputDev.h | 2 -- + poppler/Gfx.cc | 21 +++++++++++++++++---- + poppler/PSOutputDev.cc | 26 ++++++++++---------------- + poppler/PSOutputDev.h | 3 +-- + poppler/SplashOutputDev.cc | 18 +++--------------- + poppler/SplashOutputDev.h | 4 +--- + 7 files changed, 35 insertions(+), 57 deletions(-) + +commit cf710b999b510203e9348ea9f04360be1fe957b8 +Author: Pino Toscano <pino@kde.org> +Date: Fri Sep 24 00:50:37 2010 +0200 + + [Qt4] enable the generation of the QCH file + + ... usable in Qt Assistant + + qt4/src/Doxyfile | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit be6d933071c9ab043f01f374a884472c4ce3007e +Author: Pino Toscano <pino@kde.org> +Date: Thu Sep 23 15:55:45 2010 +0200 + + update Doxyfile's for qt4 and cpp + + no changes in the actual configuration values + + cpp/Doxyfile | 155 ++++-- + qt4/src/Doxyfile | 1469 + +++++++++++++++++++++++++++++++++--------------------- + 2 files changed, 1018 insertions(+), 606 deletions(-) + +commit 721da3d542ab9b234b058f3c14ea9303d748107e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Sep 23 14:09:11 2010 +0200 + + [glib] Use g_memdup instead of g_strdup in poppler_document_get_id() + + Ids are not null-terminated strings, but fixed size byte arrays. + + glib/demo/info.cc | 8 ++++++-- + glib/poppler-document.cc | 33 ++++++++++++++------------------- + 2 files changed, 20 insertions(+), 21 deletions(-) + +commit 4ffc0ed73397e4e58f04c3577b093a3fd39c22bd +Author: Pino Toscano <pino@kde.org> +Date: Thu Sep 23 02:21:12 2010 +0200 + + [cpp] small clarification in document::load_from_data() apidox + + cpp/poppler-document.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9491dc4a10706109d0f2b4d15f21b9a1db51d8c9 +Author: Pino Toscano <pino@kde.org> +Date: Thu Sep 23 02:18:07 2010 +0200 + + [cpp] add document::load_from_raw_data() + + ... to be able to load a document from an external data buffer, + with no need to copy the data. + + add as well a new document_private constructor to handle the new + situation, + and make sure to properly use the raw data when unlocking the document + + cpp/poppler-document-private.h | 5 ++++ + cpp/poppler-document.cpp | 53 + ++++++++++++++++++++++++++++++++++++++++++ + cpp/poppler-document.h | 4 ++++ + 3 files changed, 62 insertions(+) + +commit a3c1f2d5ea1de969e9aaaa84ee38866938b4ce0c +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 22 20:14:27 2010 +0100 + + fix copyright + + poppler/Form.cc | 1 + + poppler/Form.h | 1 + + 2 files changed, 2 insertions(+) + +commit 1aad013e353a9e59bdab8a1b4ce93f2ad7aaf4f2 +Author: Pino Toscano <pino@kde.org> +Date: Wed Sep 22 17:07:38 2010 +0200 + + update copyrights + + cpp/poppler-document.h | 2 +- + cpp/poppler-page-transition.cpp | 2 +- + cpp/poppler-private.cpp | 2 +- + cpp/poppler-rectangle.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 2d6d66ebe0215df66e33cb5974c58c324fab50b6 +Author: Pino Toscano <pino@kde.org> +Date: Wed Sep 22 17:07:13 2010 +0200 + + [cpp/tests] poppler-dump: show the PDF IDs, if available + + cpp/tests/poppler-dump.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit e39fde1b62544b90e73a2fc3609a260991db3a47 +Author: Pino Toscano <pino@kde.org> +Date: Wed Sep 22 16:52:08 2010 +0200 + + [cpp] add document::get_pdf_id() + + ... to get the IDs of a PDF document, if present. + + cpp/poppler-document.cpp | 29 +++++++++++++++++++++++++++++ + cpp/poppler-document.h | 1 + + 2 files changed, 30 insertions(+) + +commit 299a1849a148fa0a7b3171c45ec68b9901aa93bb +Author: Pino Toscano <pino@kde.org> +Date: Wed Sep 22 16:36:30 2010 +0200 + + [Qt4] add Document::getPdfId() + + ... to get the IDs of a PDF document, if present. + + also, add two test cases for it in the metadata unit test + + qt4/src/poppler-document.cc | 16 ++++++++++++++ + qt4/src/poppler-qt4.h | 14 +++++++++++++ + qt4/tests/check_metadata.cpp | 50 + ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 80 insertions(+) + +commit dd9bcdb720ac1bf8a022635bcbb3b56e4b75bb15 +Author: Pino Toscano <pino@kde.org> +Date: Wed Sep 22 16:29:46 2010 +0200 + + Make the internal get_id() not fail because of null bytes in the ID. + + Passing the const char* of the byte string to convert is not enough + if its length must be checked, + as it might fail when the string of the ID contains null bytes. + Instead, pass the original GooString so its size is properly checked. + + Also, remove an hardcoded 16 and make it dependent on pdfIdLength, + as used elsewhere in get_id() function. + + poppler/PDFDoc.cc | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 9554cbc3cb4fc0cd7ad2295f5d27a18e030c6aee +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Sep 22 12:54:25 2010 +0200 + + [glib-demo] Show form field names in forms demo + + glib/demo/forms.c | 26 ++++++++++++++++++++------ + 1 file changed, 20 insertions(+), 6 deletions(-) + +commit 257634b26b682628dba5ee5f94cb0bad030bcb4f +Author: Mark Riedesel <mark@klowner.com> +Date: Wed Sep 22 12:52:49 2010 +0200 + + [glib] Add methods to get mapping, partial an fully qualified form + field names + + See bug #28780. + + glib/poppler-form-field.cc | 68 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-form-field.h | 3 ++ + glib/reference/poppler-sections.txt | 3 ++ + 3 files changed, 74 insertions(+) + +commit 6db98abc59c154dcb18d69fc37e44ce804c3ccc9 +Author: Mark Riedesel <mark@klowner.com> +Date: Wed Sep 22 12:41:16 2010 +0200 + + Add getLabel method to FormWidget + + See bug #28780. + + poppler/Form.cc | 64 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Form.h | 8 ++++++++ + 2 files changed, 72 insertions(+) + +commit bcdca66fd57439735e0b9aa182ab7cfce29e9ed0 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Sep 21 11:49:37 2010 +0200 + + [glib] Fix minimum value of creation and modification date properties + + It should be -1 which means there's no date specified + + glib/poppler-document.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d2578bd66129466b2dd114b6407c147598e09d2b +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 19:19:27 2010 +0100 + + Avoid loops in Form::fieldLookup + + Fixes crash in broken pdf provided by Joel Voss of Leviathan + Security Group + + poppler/Dict.h | 3 +++ + poppler/Form.cc | 27 ++++++++++++++++++++++++--- + 2 files changed, 27 insertions(+), 3 deletions(-) + +commit 2fe825deac055be82b220d0127169cb3d61387a8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 19:15:25 2010 +0100 + + Make sure obj1 is a num before reading it + + Fixes crash in broken pdf provided by Joel Voss of Leviathan + Security Group + + poppler/Gfx.cc | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +commit 473de6f88a055bb03470b4af5fa584be8cb5fda4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 19:11:42 2010 +0100 + + Fix memory leak if obj2 is not a dict + + Found thanks to PDF provided by Joel Voss of Leviathan Security Group + + poppler/Form.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 9706e28657ff7ea52aa69d9efb3f91d0cfaee70b +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 19:09:37 2010 +0100 + + Fix crash when idx is out of range + + Found thanks to PDF provided by Joel Voss of Leviathan Security Group + + poppler/Function.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 26a5817ffec9f05ac63db6c5cd5b1f0871d271c7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 19:08:54 2010 +0100 + + Fix crash when idx is out of range + + Fixes crash in broken pdf provided by Joel Voss of Leviathan + Security Group + + poppler/Function.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit dfdf3602bde47d1be7788a44722c258bfa0c6d6e +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 19:07:12 2010 +0100 + + Give a value to color.c[i] + + Might not be the better solution but it's better than having a random + value there + + Found thanks to PDF provided by Joel Voss of Leviathan Security Group + + poppler/Gfx.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 01c85c08305bae16242f5979ab107fa5bb5f5100 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 19:04:37 2010 +0100 + + Forgot my (C) here + + poppler/Decrypt.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bf2055088a3a2d3bb3d3c37d464954ec1a25771f +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 19:03:19 2010 +0100 + + Properly initialize stack + + Fixes crash in broken pdf provided by Joel Voss of Leviathan + Security Group + + poppler/Function.cc | 1 + + 1 file changed, 1 insertion(+) + +commit e853106b58d6b4b0467dbd6436c9bb1cfbd372cf +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 19:01:36 2010 +0100 + + Properly initialize parser + + Fixes crash in broken pdf provided by Joel Voss of Leviathan + Security Group + + poppler/Gfx.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 3422638b2a39cbdd33a114a7d7debc0a5f688501 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 18:58:43 2010 +0100 + + Fix crash in broken pdf (parser->getStream() is 0) + + Found thanks to PDF provided by Joel Voss of Leviathan Security Group + + poppler/Gfx.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit a2dab0238a69240dad08eca2083110b52ce488b7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 18:55:51 2010 +0100 + + Initialize properly charactersRead + + It is possible that there are calls to getPos before reset + Found thanks to PDF provided by Joel Voss of Leviathan Security Group + + poppler/Decrypt.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 39d140bfc0b8239bdd96d6a55842034ae5c05473 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 18:54:31 2010 +0100 + + Fix crash in broken pdf (code < 0) + + Found thanks to PDF provided by Joel Voss of Leviathan Security Group + + fofi/FoFiType1.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit c6a091512745771894b54a71613fd6b5ca1adcb3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 21 18:50:25 2010 +0100 + + Fix memory leak + + Found thanks to PDF provided by Joel Voss of Leviathan Security Group + + poppler/Stream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 9b6ddb68b80ef19cd2615900bd24da76374003d9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 20 19:47:47 2010 +0100 + + Fix copyright + + poppler/PDFDoc.cc | 1 + + poppler/PDFDoc.h | 1 + + 2 files changed, 2 insertions(+) + +commit fa3abc23656204eedd022ee1c73d9e5af758cdac +Author: Pino Toscano <pino@kde.org> +Date: Fri Sep 17 22:20:09 2010 +0200 + + [cpp] More bits of API documentation. + + cpp/poppler-global.cpp | 124 + ++++++++++++++++++++++++++++++++++++++++ + cpp/poppler-page-transition.cpp | 32 +++++++++++ + cpp/poppler-rectangle.cpp | 19 ++++++ + 3 files changed, 175 insertions(+) + +commit c5f7b5becc9993c05b67a470d5a1e431806b98d6 +Author: Pino Toscano <pino@kde.org> +Date: Fri Sep 17 20:26:37 2010 +0200 + + update copyrights + + qt4/src/poppler-private.cc | 2 +- + qt4/tests/check_strings.cpp | 18 ++++++++++++++++++ + 2 files changed, 19 insertions(+), 1 deletion(-) + +commit ae517042570327b860c1db6b68f9697d5c104657 +Author: Pino Toscano <pino@kde.org> +Date: Fri Sep 17 19:39:10 2010 +0200 + + [cpp] improve a bit the Unicode* -> ustring conversion + + (although IMHO not yet solved) + + cpp/poppler-private.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit f4c6ef88f01f6763943a3e6e006e52dbea0b149c +Author: Pino Toscano <pino@kde.org> +Date: Fri Sep 17 16:07:05 2010 +0200 + + [Qt4/tests] check_strings: add a new test case for + QStringToUnicodeGooString + + not much test data at the moment though + + qt4/tests/check_strings.cpp | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +commit ffd227b7669895325d752009d5185973cf86ce5b +Author: Pino Toscano <pino@kde.org> +Date: Fri Sep 17 14:25:57 2010 +0200 + + [Qt4] optimize UnicodeParsedString using less memory from QString + + - reserve() the right number of chars in the result string, so there + is less possibility to make it gr + ow its buffer + - do not call unicodeToQString() just to create a 1 character string, + but directly append a QChar crea + ted with the resulting unicode value (always belonging to the BMP) + + this should reduce of a very little bit the memory usage, while give + a sensible speedup of UnicodeParsedString invocations + + qt4/src/poppler-private.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 6180890008f2b1814f092f50b8f75376399905ba +Author: Pino Toscano <pino@kde.org> +Date: Fri Sep 17 13:23:25 2010 +0200 + + [Qt4/tests] check_strings: add a test case for UnicodeParsedString + + very simple test data for it, at the moment + + qt4/tests/check_strings.cpp | 48 + +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +commit c5f78d7d3953d62a746c6f5a90085ea020fe5ec7 +Author: Pino Toscano <pino@kde.org> +Date: Fri Sep 17 12:54:32 2010 +0200 + + [Qt4/tests] check_string: use a pool of GooString + + this way we can reuse the GooString in a data set even after a test + run (eg in benchmarks), + making sure they all are properly freed + + qt4/tests/check_strings.cpp | 35 ++++++++++++++++++++++++++++++----- + 1 file changed, 30 insertions(+), 5 deletions(-) + +commit 0cd5a256bdf7778c0c720941a611ad8ab56fa2e9 +Author: Pino Toscano <pino@kde.org> +Date: Fri Sep 17 00:27:53 2010 +0200 + + [Qt4/tests] first version of a unit test for strings + + this is used for testing the various string conversions: + - unicodeToQString + - UnicodeParsedString + - QStringToUnicodeGooString + - QStringToGooString + the 1st and the 4th have basic tests + + given private symbols are used, this unit test is not compiled on + windows (at least, it supposed to be so) + + qt4/tests/CMakeLists.txt | 3 ++ + qt4/tests/Makefile.am | 7 ++- + qt4/tests/check_strings.cpp | 101 + ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 110 insertions(+), 1 deletion(-) + +commit c6e8b21c9829672e6ca42e6cdc0ca631a06af73f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Sep 17 13:44:38 2010 +0200 + + [glib] docs: Document PopplerDocument properties + + glib/poppler-document.cc | 380 + +++++++++++++++++++++++++++-------------------- + 1 file changed, 223 insertions(+), 157 deletions(-) + +commit d4a6c17255821925906c17b79b88eebed9edfee1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Sep 17 13:04:33 2010 +0200 + + [glib] Add accessor for all PopplerDocument properties + + PopplerDocument:linearized is now a boolean value rather than string, + so this commit breaks the API again. + + glib/demo/info.cc | 8 +- + glib/poppler-document.cc | 532 + +++++++++++++++++++++++++++++------- + glib/poppler-document.h | 74 +++-- + glib/reference/poppler-sections.txt | 16 ++ + 4 files changed, 498 insertions(+), 132 deletions(-) + +commit a5fec843dbb40fdd2007b926405b96789b21496d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Sep 17 10:38:14 2010 +0200 + + [glib-demo] Show permanent/update ID in document info demo + + glib/demo/info.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit bfaf8f3cc62f28c6255d42680b9464ab9973737e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Sep 17 10:37:32 2010 +0200 + + [glib] Add poppler_document_get_id() to get the PDF file identifier + + glib/poppler-document.cc | 52 + +++++++++++++++++++++++++++++++++++++ + glib/poppler-document.h | 3 +++ + glib/reference/poppler-sections.txt | 1 + + 3 files changed, 56 insertions(+) + +commit b15641677447b2e89853a667fc34bcca1383a97a +Author: srinivas adicherla <srinivas.adicherla@gmail.com> +Date: Fri Sep 17 10:36:22 2010 +0200 + + Add a method to get the PDF file identifier + + poppler/PDFDoc.cc | 65 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/PDFDoc.h | 3 +++ + 2 files changed, 68 insertions(+) + +commit 3b4a901a4431814590449b6cd5ea418f4d6c1172 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Sep 16 23:23:03 2010 +0100 + + Add -s option + + Writes a single html file + Since git does not allow multiple authors i'm adding them here + OSSD CDAC Mumbai by Leena Chourey (leenac@cdacmumbai.in) and Onkar + Potdar (onkar@cdacmumbai.in) + + utils/HtmlFonts.cc | 11 +++++-- + utils/HtmlFonts.h | 18 +++++++++-- + utils/HtmlOutputDev.cc | 84 + +++++++++++++++++++++++++++++++------------------- + utils/pdftohtml.1 | 3 ++ + utils/pdftohtml.cc | 15 +++++++-- + 5 files changed, 93 insertions(+), 38 deletions(-) + +commit 2792330f6caeeb42e2996271456b562489215c4c +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 15 22:42:09 2010 +0100 + + new soversions + + CMakeLists.txt | 2 +- + cpp/CMakeLists.txt | 2 +- + cpp/Makefile.am | 2 +- + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 4 ++-- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Makefile.am | 2 +- + 8 files changed, 9 insertions(+), 9 deletions(-) + +commit 1cf56c732b63d0a310bc45b8e4b3f3f357a42cb1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 15 20:56:42 2010 +0100 + + 0.15.0 in the versions + + CMakeLists.txt | 2 +- + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 4ec0be498b557c3cf631e43823c6d7004304dff3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 15 20:56:34 2010 +0100 + + 0.15.0 NEWS + + NEWS | 90 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 90 insertions(+) + +commit c01a17745c04aef3e6f2225679c867a03e731e83 +Author: Pino Toscano <pino@kde.org> +Date: Thu Sep 16 20:55:56 2010 +0200 + + [CMake] disable the GObject introspection system + + it cannot complete the scanning propecure correctly without libtool + it seems + + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9be7d3143b12f291409f88f3d725a239934b205e +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 15 19:19:30 2010 +0100 + + update copyright + + poppler/OptionalContent.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b9333529bba43a71655fdbf1919ba515f7df9ca3 +Author: Pino Toscano <pino@kde.org> +Date: Wed Sep 15 17:23:54 2010 +0200 + + [cpp/tests] poppler-dump: convert out_ustring() to an + operator<<(std::ostream&) + + so we have a chance to better output the bytearray of a string to + the stream + + cpp/tests/poppler-dump.cpp | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +commit a44f711b4412332875337e9fb7509f18db806ddc +Author: Pino Toscano <pino@kde.org> +Date: Wed Sep 15 16:44:30 2010 +0200 + + [cpp/tests] poppler-dump: add a "--show-text <physical|raw>" option + + ... to show the text of a page in the specified layout + + cpp/tests/poppler-dump.cpp | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +commit 0094c9372b5b439af2564d83d6fb7439f4bdba88 +Author: Pino Toscano <pino@kde.org> +Date: Wed Sep 15 13:19:13 2010 +0200 + + [cpp] add a new page::text() for specifying a layout mode + + add a new text_layout_enum enum for the layout mode, used by the + new text() + make the old text() implementation call the new one with the old value + (= physical) + add & adapt the apidox accordingly + + cpp/poppler-page.cpp | 27 +++++++++++++++++++++++++-- + cpp/poppler-page.h | 5 +++++ + 2 files changed, 30 insertions(+), 2 deletions(-) + +commit 4ec3e7784cdba5c0720b1992ba500e97a7e0ed2b +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Sep 15 11:24:07 2010 +0200 + + Set initial state of optional content groups based on BaseState field + + There's a test case using BaseState attached to bug #30106 + + poppler/OptionalContent.cc | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit f49aa86812ed8ad91d41c675bc670b3d88d3444a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Sep 13 14:37:10 2010 +0200 + + [glib] doc: Document PopplerPage:label property + + glib/poppler-page.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit f41fe7ae6e374100574c49d1bb7a3ddc646786c8 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Sep 13 14:36:43 2010 +0200 + + [glib] doc: Add poppler_page_get_label to poppler-sections.txt + + glib/reference/poppler-sections.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 91b8246766a8e5d9cca385b5854667d7967a9d71 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Sep 13 14:22:56 2010 +0200 + + [glib-demo] Use poppler_page_get_label() instead of g_object_get() + + glib/demo/page.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b82412ef86091f4d249c818cebf00e4c59bae311 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Sep 13 14:22:03 2010 +0200 + + [glib] Add poppler_page_get_label() + + It's just an accessor for the property label + + glib/poppler-page.cc | 47 ++++++++++++++++++++++++++++++++++------------- + glib/poppler-page.h | 1 + + 2 files changed, 35 insertions(+), 13 deletions(-) + +commit ff88abf61f4bf90ad276a8593be1818d39c8ecac +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Sep 13 10:05:45 2010 +0200 + + [glib] Avoid core headers to be parsed by the g-i scanner + + glib/poppler-document.cc | 2 ++ + glib/poppler-page.cc | 2 ++ + glib/poppler-private.h | 3 +++ + 3 files changed, 7 insertions(+) + +commit 53324502898ae5fbbb21a4fb819e4a84acdc1a64 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Sep 12 11:42:03 2010 +0200 + + [glib] Fix a crash when building layer actions + + Some layers are just the parent of others, but not actually a layer so + they don't have an optional content object. Fixes bug #30106. + + glib/poppler-action.cc | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit dfc6ea7877635212aa7c5f7ade07af4aa9467e96 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Sep 12 11:36:58 2010 +0200 + + [glib] Fix layers array generation when it contains multiple arrays + + Fixes layers for document attached to bug #30106. + + glib/poppler-document.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 7574912b6c0ff0421c69b6e8c6835957d5126d7d +Author: Jonathan Liu <net147@gmail.com> +Date: Thu Sep 9 20:34:03 2010 +0100 + + Fix checking whether _WIN32 is defined + + Bug 29329 + + poppler/StdinCachedFile.cc | 2 +- + utils/pdftoppm.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 2fc83068c32e09fa3de03a157a420490431ea706 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Sep 5 14:26:27 2010 +0100 + + Increase the number of cached glyphs for small sizes + + Should not increase memory usage much and gives me a 17% speed + increase + in the firefox nytimes advertisment pdf + + splash/SplashFont.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 0d96f74f31171c58a55e4ac36d492ce36dd5e7c5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Sep 5 12:31:57 2010 +0100 + + Use std::sort instead of qsort + + Gives a nice speed improvement without any real code change + Passes regression tests + Based on Paweł Wiejacha patches + + poppler/GfxFont.cc | 17 +++++++--------- + splash/SplashXPath.cc | 48 + ++++++++++++++++++++++++++++---------------- + splash/SplashXPathScanner.cc | 10 +++++---- + 3 files changed, 44 insertions(+), 31 deletions(-) + +commit 3b4816b2b8caa0e2baafbe4c0eb1e45e452d01ce +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 1 20:43:35 2010 +0100 + + forgot the file + + qt4/tests/poppler-texts.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +commit b0db93c71a83946aa3e02bae6b396223dcca19d1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 1 20:43:14 2010 +0100 + + add since and rename enum + + qt4/src/poppler-page.cc | 2 +- + qt4/src/poppler-qt4.h | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit a86f9d90be99a36c41c6932fb4d9a202c4ff6d05 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 1 20:20:48 2010 +0100 + + Clarify the ownership + + qt4/src/poppler-qt4.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 33ad3a17ac26879fcd6a7fad2023dd219bc5919f +Author: Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> +Date: Wed Sep 1 20:19:54 2010 +0100 + + Add a way to access the raw text + + poppler/TextOutputDev.cc | 23 ++++++++++++++++++++--- + qt4/src/poppler-page.cc | 11 +++++++++-- + qt4/src/poppler-qt4.h | 19 +++++++++++++++++++ + qt4/tests/CMakeLists.txt | 1 + + qt4/tests/Makefile.am | 7 ++++++- + 5 files changed, 55 insertions(+), 6 deletions(-) + +commit 46e89248b3c5b1789baa3bd9bfa012570720ddb5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 1 19:54:02 2010 +0100 + + quadding is not a GBool but an int + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit ae79fc504c5424be2fa21dbc5498ced4db6e5dd3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Aug 31 22:14:57 2010 +0100 + + Make GBool a bool instead of an int + + Passes the regression tests and might make things faster and use a bit + less memory + + cpp/tests/CMakeLists.txt | 2 +- + cpp/tests/Makefile.am | 2 +- + goo/gtypes.h | 7 ++++--- + utils/CMakeLists.txt | 2 +- + utils/Makefile.am | 2 +- + utils/{parseargs.c => parseargs.cc} | 0 + 6 files changed, 8 insertions(+), 7 deletions(-) + +commit d3f32f2c4f9f46620c0287c44bef686f340461f3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Aug 31 18:51:17 2010 +0100 + + Read from the correct variable + + Fixes crash on KDE bug 249586 + + poppler/Movie.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 681bb38eafc720b309172ed7c650439c559663a0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Aug 26 23:55:58 2010 +0100 + + Make declaration match what there is in the .cc file + + poppler/TextOutputDev.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c91e869304fc263c52f21ee484a57a6f1900f6b2 +Author: Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> +Date: Thu Aug 26 19:40:46 2010 +0100 + + Add -r option to pdftohtml + + Fixes bug 29551 + + utils/pdftohtml.1 | 3 +++ + utils/pdftohtml.cc | 18 +++++++++++++----- + 2 files changed, 16 insertions(+), 5 deletions(-) + +commit 9b4be586640b4ad344b1b3ed4c9cda8351257f0c +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Aug 25 19:26:30 2010 +0100 + + Use 3 not nComps + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 218f67c527fb41babf2703ba068d072f8326e37b +Author: Paweł Wiejacha <pawel.wiejacha@gmail.com> +Date: Tue Aug 24 23:47:06 2010 +0100 + + Make SplashOutputDev::imageSrc faster + + By using getRGBLine when possible + + poppler/SplashOutputDev.cc | 39 ++++++++++++++++++++++++++++++--------- + 1 file changed, 30 insertions(+), 9 deletions(-) + +commit 868f4a1f22051b7978f47a0614f23fd66dbb7ca8 +Author: Paweł Wiejacha <pawel.wiejacha@gmail.com> +Date: Tue Aug 24 23:35:21 2010 +0100 + + Make GfxICCBasedColorSpace::getRGBLine faster + + By calling doTransform less + + poppler/GfxState.cc | 15 +++++++-------- + poppler/GfxState.h | 4 +++- + 2 files changed, 10 insertions(+), 9 deletions(-) + +commit 46e37c54c6365cf37dc1e223a3c146e7b96a56af +Author: Paweł Wiejacha <pawel.wiejacha@gmail.com> +Date: Tue Aug 24 21:23:34 2010 +0100 + + Do not call pow three times when one is enough + + poppler/GfxState.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 8591c804598576556c6d24a66b6648de8ed1c4eb +Author: Mike Slegeir <tehpola@yahoo.com> +Date: Sun Aug 22 22:01:03 2010 +0100 + + Use splash instead of external gs invocation to render the background + + Patch in bug 19404, should fix 9746 too + + utils/pdftohtml.1 | 8 +- + utils/pdftohtml.cc | 210 + ++++++++++++++++++++++++++++++++++++++--------------- + 2 files changed, 158 insertions(+), 60 deletions(-) + +commit 7fc3c21a8c5d6cf8517100427b182887a9569ed0 +Author: Ilya Gorenbein <igorenbein@finjan.com> +Date: Fri Aug 20 20:24:31 2010 +0100 + + Fix failure to parse PDF with damaged internal structure + + Patch in bug 29189, fixes bug 3870 + + poppler/PDFDoc.cc | 24 +++++++++++++---- + poppler/XRef.cc | 80 + ++++++++++++++++++++++++++++++++----------------------- + poppler/XRef.h | 5 ++-- + 3 files changed, 68 insertions(+), 41 deletions(-) + +commit bedf48d4397ae412a6d28fc8fea16cc23a29f07c +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Aug 17 22:02:59 2010 +0100 + + use memset instead of a for + + splash/Splash.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 03ca5b4a5c9964d9c0e9913eb2061692848c4b95 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Aug 10 19:55:31 2010 +0100 + + Update copyrights + + goo/GooTimer.cc | 1 + + goo/GooTimer.h | 1 + + goo/gfile.cc | 2 +- + poppler/DCTStream.cc | 1 + + poppler/DCTStream.h | 1 + + poppler/GfxState.cc | 2 +- + poppler/Page.cc | 2 +- + qt4/src/poppler-annotation.cc | 2 +- + 8 files changed, 8 insertions(+), 4 deletions(-) + +commit 3bca8ddc10bf4291bf0c0e39c67341a05953e949 +Author: Jonathan Liu <net147@gmail.com> +Date: Tue Aug 10 19:42:40 2010 +0100 + + Tell windows we are writing/reading binary data + + Bug #29329 + + poppler/StdinCachedFile.cc | 9 +++++++++ + utils/pdftoppm.cc | 9 +++++++++ + 2 files changed, 18 insertions(+) + +commit bdd617f2177a7836f6b6686fde892664513a32a7 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Aug 3 13:05:26 2010 +0200 + + [glib] Fix a crash when a layer doesn't have a name + + Fixes bug #28842. + + glib/poppler-layer.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e9f0646ca664cc27825f7e084f8419fe0de1fcfc +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Aug 3 13:02:52 2010 +0200 + + Catalog page array might contain NULL for some pages in invalid + documents + + Fixes a crash reproducible with gtk-splash-test when opening document + attached to bug #28842. + + poppler/PDFDoc.cc | 27 +++++++++++++++------------ + 1 file changed, 15 insertions(+), 12 deletions(-) + +commit 842209782ca3ba8c1c783cccf565372a18b3fda5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 30 19:29:12 2010 +0100 + + Do not crash when using pdftops in some files + + Fixes crash in file in kde bug 246269. The output is still wrong + though + + fofi/FoFiType1C.cc | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 0dd7c80b7baf2622eb4780a867c4dc6291773f3b +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jul 26 23:58:26 2010 +0100 + + Do not overwrite the rgb values + + Recommended by Koji Otani in Re: [poppler] Question about code + Passed the regression testing in my files + + poppler/GfxState.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 627edf88c8f5c073a68bd05990df56e1af547292 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jul 25 13:56:03 2010 +0200 + + [annots] Fix a crash when adding a new annotation and annots object + is an array + + When annots object is an array instead of a ref, the modified + object is + actually de page object. + + poppler/Page.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 5d86f9b600b1e10de93bcaf1b925fadbc2a47522 +Author: mpsuzuki <mpsuzuki@hiroshima-u.ac.jp> +Date: Sat Jul 24 15:12:05 2010 +0100 + + reindent correctly + + poppler/TextOutputDev.cc | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +commit d0a6f9abdab88ec43004b6766337db304cbf6a25 +Author: Pino Toscano <pino@kde.org> +Date: Thu Jul 22 21:28:55 2010 +0200 + + [CMake] improve the way include dirs and cflags for gdk and gtk + are set + + correctly include_directories() for the include dirs, while add the + cflags which are not include dirs as definitions + + glib/CMakeLists.txt | 5 +++-- + glib/demo/CMakeLists.txt | 5 ++++- + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit 02d85dd2cc154dbb6caa04a349532033d833edd1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jul 20 13:53:56 2010 +0200 + + [glib-demo] Add support for adding annots in annot demo + + glib/demo/annots.c | 114 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 114 insertions(+) + +commit 969cb850f5c2bc31de82c591b2b3210b5cfabf5f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jul 20 13:53:29 2010 +0200 + + [glib] docs: Add new symbols to poppler-sections.txt + + glib/reference/poppler-sections.txt | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 251959438b6257fe71ed58e79eec60cda68a66cf +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jul 20 13:53:00 2010 +0200 + + [glib] Add poppler_page_add_annot() + + glib/poppler-document.cc | 7 ++++--- + glib/poppler-page.cc | 19 +++++++++++++++++++ + glib/poppler-page.h | 2 ++ + 3 files changed, 25 insertions(+), 3 deletions(-) + +commit 78a4f6976e708f2cc23aac49fbff0faf00e74bc3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jul 20 13:51:16 2010 +0200 + + [glib] annots: Add several setter methods + + glib/poppler-annot.cc | 278 + ++++++++++++++++++++++++++++++++++++++++++++----- + glib/poppler-annot.h | 26 +++++ + glib/poppler-private.h | 6 ++ + 3 files changed, 285 insertions(+), 25 deletions(-) + +commit fee488c9db60ab691ce9ff5eef284be2af897aee +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jul 18 11:26:59 2010 +0200 + + [annots] Add AnnotMarkup::setOpacity + + poppler/Annot.cc | 8 ++++++++ + poppler/Annot.h | 1 + + 2 files changed, 9 insertions(+) + +commit d15a355ede2d8510c4df847ea0b92b5357b29914 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jul 18 09:57:35 2010 +0200 + + Set the page reference (P in annot dict) when adding a new annot to + a page + + poppler/Annot.cc | 9 +++++++++ + poppler/Annot.h | 3 +++ + poppler/Page.cc | 2 ++ + 3 files changed, 14 insertions(+) + +commit 49ffb46db3118db874d2d9830bb034762d625c61 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jul 19 16:31:54 2010 +0100 + + Remove exception support + + We don't use it and don't even support it properly + + CMakeLists.txt | 1 - + config.h.cmake | 3 --- + configure.ac | 4 --- + goo/gmem.cc | 56 + ++++++++++++------------------------------ + goo/gmem.h | 38 +++++++++------------------- + poppler/poppler-config.h.cmake | 5 ---- + poppler/poppler-config.h.in | 5 ---- + 7 files changed, 27 insertions(+), 85 deletions(-) + +commit dd2e9399868e3dbf2fa4ede050f8d74d29ebbbb4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jul 19 16:31:43 2010 +0100 + + add uninstalled.pc to ignore + + .gitignore | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit d1033006aae381a0f075e02d54638a1af997caf3 +Author: Pino Toscano <pino@kde.org> +Date: Sat Jul 17 21:46:14 2010 +0200 + + add FindGObjectIntrospection.cmake and + GObjectIntrospectionMacros.cmake to the dist + + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit ce8d03950736cc35d035a44a7d88e5f2a9defa74 +Author: Pino Toscano <pino@kde.org> +Date: Sat Jul 17 21:39:08 2010 +0200 + + [CMake/glib] add support for gobject-introspection + + other than a module to find (using pkg-config) gobject-introspection, + this adds a macro (gir_add_introspections) to add new introspections + in a directory. + its working is much similar (even the variable names used) to + the Makefile version provided by gobject-repository itself, with + the notable difference of a disabled libtool in the g-ir-scanner + invocation. + the only additional step needed is adding two custom targets, compiled + by ALL, which have the gir and the typelib files as dependencies, + to make them build with the usual `make all'. + + CMakeLists.txt | 5 +- + cmake/modules/FindGObjectIntrospection.cmake | 61 +++++++++++++++++ + cmake/modules/GObjectIntrospectionMacros.cmake | 94 + ++++++++++++++++++++++++++ + glib/CMakeLists.txt | 36 ++++++++++ + 4 files changed, 194 insertions(+), 2 deletions(-) + +commit 78bf43d8e11aa52db9862af118c597e117d31083 +Author: Pino Toscano <pino@kde.org> +Date: Sat Jul 17 20:28:58 2010 +0200 + + [CMake] properly use the glib2 include dirs + + properly use GLIB2_INCLUDE_DIRS (pkg-config result) for the glib + include dirs, + while turn GLIB2_CFLAGS into GLIB2_CFLAGS_OTHERS to add the remaining + CFLAGS as definitions + + glib/CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6f3082d677bc62aa3f8124132e3e337c01be2629 +Author: Pino Toscano <pino@kde.org> +Date: Sat Jul 17 19:28:09 2010 +0200 + + [CMake] split the generated sources of poppler_glib_SRCS in an own + poppler_glib_generated_SRCS + + glib/CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 2a252dd9b05857bbd10dee235e873886fc74ec17 +Author: Pino Toscano <pino@kde.org> +Date: Sat Jul 17 14:57:38 2010 +0200 + + [CMake] add stub message and TODO for the gobject-introspection + support + + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +commit 8a3d1794a8ef5d525bb454755fec018e3fcb3816 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 16 14:00:32 2010 +0100 + + update + + TODO | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 31ac578942b82cbd16b064abca586ccb89dfa7ce +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 15 15:05:10 2010 +0200 + + Rework ChangeLog generation to fix make distcheck + + Makefile.am | 22 +++++++++++++++++++--- + 1 file changed, 19 insertions(+), 3 deletions(-) + +commit 5da5825ecab63089a19aac694826271019a94e6d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 15 15:03:20 2010 +0200 + + [glib] docs: Add version.xml to content_files var + + glib/reference/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fe69b474ae63c9d5d2538db9e51e666dd6ea9fb3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jul 15 10:51:21 2010 +0100 + + Fix padding of names + + The previous method returned 2 for documents with 100 pages, which + is wrong as 100 needs 3 + characters, not 2 + + utils/pdftoppm.cc | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit e265ae2d8a46df00ab1bbd863f01f652068d265f +Author: Brian Cameron <brian.cameron@oracle.com> +Date: Wed Jul 14 20:26:25 2010 +0100 + + Add uninstalled .pc file for poppler when using autoconf + + Makefile.am | 9 ++++++++- + configure.ac | 9 ++++++++- + poppler-cairo-uninstalled.pc.in | 6 ++++++ + poppler-cpp-uninstalled.pc.in | 7 +++++++ + poppler-glib-uninstalled.pc.in | 7 +++++++ + poppler-qt-uninstalled.pc.in | 7 +++++++ + poppler-qt4-uninstalled.pc.in | 7 +++++++ + poppler-splash-uninstalled.pc.in | 7 +++++++ + poppler-uninstalled.pc.in | 6 ++++++ + 9 files changed, 63 insertions(+), 2 deletions(-) + +commit 552ab99e60fe4068be8e4e415924e4be289e47cd +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jul 13 10:18:01 2010 +0200 + + Handle ColorTransform in DCT streams when using libjpeg + + Fixes bug #28873. + + poppler/DCTStream.cc | 30 ++++++++++++++++++++++++++++++ + poppler/DCTStream.h | 1 + + 2 files changed, 31 insertions(+) + +commit 8a6697f89625106f3c373dbc7b4dc521e22502f7 +Author: Hib Eris <hib@hiberis.nl> +Date: Sat Jul 3 16:42:04 2010 +0200 + + Only define findModifier() when used + + Prevents a warning when building with win32 font backend. + + poppler/GlobalParams.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b1fdb87a4ebb5079c731256cce1870de8c54c65d +Author: Hib Eris <hib@hiberis.nl> +Date: Fri Jul 2 10:53:20 2010 +0200 + + Fix compile warnings on auto imports for mingw compiler + + cpp/Makefile.am | 2 +- + cpp/tests/Makefile.am | 2 ++ + glib/Makefile.am | 2 ++ + poppler/Makefile.am | 2 +- + qt4/demos/Makefile.am | 2 ++ + qt4/src/Makefile.am | 2 +- + qt4/tests/Makefile.am | 2 ++ + 7 files changed, 11 insertions(+), 3 deletions(-) + +commit 9e577110134eb1e093e697b7504efca759000086 +Author: Hib Eris <hib@hiberis.nl> +Date: Fri Jul 2 10:51:24 2010 +0200 + + Check for declaration of gettimeofday() + + The function gettimeofday() is not declared in ansi mode with the + mingw compiler, even though the function exists. Therefore, + configure must + not only check with AC_CHECK_FUNC, but also with AC_CHECK_DECL. + + Also, the checks must run in a C++ context because that is where + gettimeofday() is used. + + configure.ac | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 58c8430ac584f3ba5e97aceb148e6287bfc45f95 +Author: Hib Eris <hib@hiberis.nl> +Date: Wed Jun 30 15:06:44 2010 +0200 + + Set -ansi compiler flag early in configure.ac + + The -ansi compiler flag does not enable warnings, but turns of certain + features of GCC. To force feature tests to use this flag, it should be + set early in configure.ac + + This is important for the mingw compiler where header files refrain + from declaring certain function (e.g. gettimeofday()) when the -ansi + flag is set. + + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit e3663a855a9c86f0a3988a7a50fa40d37d0ea069 +Author: Hib Eris <hib@hiberis.nl> +Date: Fri Jul 2 14:45:15 2010 +0200 + + Use MAX_PATH instead of _MAX_PATH everywhere + + _MAX_PATH is compiler specific and not availble with the mingw + compiler + in ansi mode. MAX_PATH is in the Windows api and thus always available + when windows.h is included. + + goo/gfile.cc | 4 ++-- + poppler/GlobalParams.cc | 2 +- + poppler/PDFDoc.cc | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 7227c407d23a37f5d95e6c01cb7411be2f82ca85 +Author: Hib Eris <hib@hiberis.nl> +Date: Wed Jun 30 16:15:06 2010 +0200 + + Check for _WIN32 instead of _MSC_VER + + goo/GooTimer.cc | 6 +++--- + goo/GooTimer.h | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 34e727e011529be312313a1f4d4fa1ba9c545888 +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Jun 29 16:43:31 2010 +0200 + + Fix cross compiling for Windows with autotools + + When cross compiling for Windows with autotools, libtool creates + libpoppler_qt4_la-poppler-optcontent.lo instead of + poppler-optcontent.lo. Thus, explicitly using poppler-optcontent.lo to + create poppler-optcontent.moc does not work well. + + qt4/src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1bc2f4501ea4e56ca99ae4d94d6cf34cf33c2c7a +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Jun 29 15:34:22 2010 +0200 + + define poppler_qt4_EXPORTS when building with autotools + + Lets you build the qt4 bindings for Windows with automake/autoconf. + + qt4/src/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit 5825114a26cc6eece2e556063f640dda53ea1e11 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jul 11 12:24:20 2010 +0100 + + Compile++ + + glib/demo/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 5e4d8eeea0b9dba68420c164975418c76a53be85 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jul 10 15:54:28 2010 +0200 + + [pdf-inspector] Do not render for printing + + test/pdf-inspector.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e6824972a213a888ca0185b7ae0a75fc23f75797 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jul 10 15:52:15 2010 +0200 + + [annots] Use a transparency group for markup annots without AP and + opacity != 1 + + Fixes bug #623616. + + poppler/Annot.cc | 346 + +++++++++++++++++++++++++------------------------------ + poppler/Annot.h | 3 + + poppler/Gfx.cc | 9 +- + poppler/Gfx.h | 2 +- + 4 files changed, 165 insertions(+), 195 deletions(-) + +commit 70ce0b6ea1a0d61f5048d2ae49c639d74a643b29 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 9 17:04:00 2010 +0200 + + [annots] Clamp QuadPoints coords to annot rectangle instead of + ignore points + + Fixes appearance stream generation for document attached to bug + #623616. + + poppler/Annot.cc | 38 +++++++++++++++++++++----------------- + 1 file changed, 21 insertions(+), 17 deletions(-) + +commit 8a9e561bfe64f71e9f38c43e5c6be7e5069b2349 +Author: Hib Eris <hib@hiberis.nl> +Date: Fri Jul 2 21:07:53 2010 +0200 + + Nicer autogen.sh output + + autogen.sh | 1 + + 1 file changed, 1 insertion(+) + +commit ce4d328294cea73f4b7368691dc1fed6bd45d569 +Author: Hib Eris <hib@hiberis.nl> +Date: Fri Jul 2 20:51:47 2010 +0200 + + Add option for autogen.sh to skip configure + + If you do not want to automatically run configure when calling + autogen.sh, run it with: + + $ NOCONFIGURE=1 ./autogen.sh + + This feature is modeled after gnome-autogen.sh behaviour. + + autogen.sh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit d7ee87c5d0a35c8d4fcc88bde4b8496c49f397c6 +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Jul 6 15:16:08 2010 +0100 + + warnings-=2 + + poppler/GfxFont.cc | 3 ++- + utils/HtmlOutputDev.cc | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit 1e7f457ca1617fd8c958feef8dd7e694476dedd9 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 9 12:29:14 2010 +0200 + + [cairo] Use ceil to convert double to int in tilingPatternFill() + + Fixes rendering of page 2 of document attached to bug #28954. + + poppler/CairoOutputDev.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 91a7605eb51144f2e7dea69aa9454fff47c49bd2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 9 11:42:56 2010 +0200 + + [glib] Fix build when GDK is enabled + + glib/test-poppler-glib.cc | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +commit 09e3e0e9c5134688c4ed2af5cd3a12aa2986474c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 8 18:56:38 2010 +0200 + + [glib] Fix poppler_page_find_tex() when called more than once + + Fixes bug #27927 + + glib/poppler-page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25427bdecb219ffe6f0592d2ac36de60c247bfd9 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 8 17:46:22 2010 +0200 + + Fix build when compiling without glib frontend + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit 550684731356a66753ec19f5a8ca4b572db6d2d5 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 8 17:16:02 2010 +0200 + + [glib-demo] Add selections demo + + glib/demo/Makefile.am | 2 + + glib/demo/main.c | 4 +- + glib/demo/selections.c | 687 + +++++++++++++++++++++++++++++++++++++++++++++++++ + glib/demo/selections.h | 31 +++ + 4 files changed, 723 insertions(+), 1 deletion(-) + +commit b257428150e2c13dcc24fd8f75e4ee2c679ab414 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 8 14:45:29 2010 +0200 + + [glib] Add poppler_page_get_selected_text() + + And change poppler_page_get_text() to return the text of the whole + page. For consistency with poppler_page_get_selection_region() + get_seletect_text() doesn't invert the y coords as get_text() + did. This + change breaks the API. Users of poppler_page_get_text should: + + - Use the new poppler_page_get_text() if they want the text of the + whole page + + - Use poppler_page_get_selected_text() if they want the text of the + selected area. In this case they shouldn't invert the y coords + anymore + before calling the method. + + glib/demo/text.c | 9 +------- + glib/poppler-page.cc | 43 + +++++++++++++++++++++++++++---------- + glib/poppler-page.h | 3 ++- + glib/reference/poppler-sections.txt | 1 + + 4 files changed, 36 insertions(+), 20 deletions(-) + +commit bedc88225c948ad1288b69c6c106adce36233442 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jul 7 11:55:47 2010 +0200 + + [cairo] Fix warning on signed/unsigned comparison + + poppler/CairoFontEngine.cc | 12 ++++++------ + poppler/CairoFontEngine.h | 8 ++++---- + 2 files changed, 10 insertions(+), 10 deletions(-) + +commit 092aa901b9ec35a48bc1fb229ad16a3b00eef5f2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Jul 5 11:16:49 2010 +0200 + + [glib] docs: add some more introspection annotations + + glib/poppler-attachment.cc | 4 ++-- + glib/poppler-document.cc | 12 ++++++------ + glib/poppler-media.cc | 4 ++-- + glib/poppler-page.cc | 4 ++-- + 4 files changed, 12 insertions(+), 12 deletions(-) + +commit 6c4e14fd90d5ef2d6670a980ab2476b6fab58df7 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Jul 5 10:49:59 2010 +0200 + + [glib] docs: fix POPPLER_CHECK_VERSION() docs + + glib/poppler-features.h.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit ed324a867ecf1f616c4b2dc575f01d5cf1b67c38 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 2 18:28:45 2010 +0200 + + [glib] Rename instrospection files as 0.16 instead of 0.14 + + glib/Makefile.am | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit a55f567ff1ea0858eda13a024ed765a016f3bff0 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 2 18:23:03 2010 +0200 + + [glib] docs: Remove unneeded empty line in doc comment + + glib/poppler-features.h.in | 1 - + 1 file changed, 1 deletion(-) + +commit f16015303422280eaa21c3144eca0f1a330dce8a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 2 18:19:13 2010 +0200 + + [glib] docs: Add GObject introspection annotations + + glib/poppler-annot.cc | 45 + ++++++++++++++++++++-------------------- + glib/poppler-document.cc | 8 +++---- + glib/poppler-page.cc | 23 +++++++++++++------- + glib/reference/poppler-docs.sgml | 2 ++ + 4 files changed, 43 insertions(+), 35 deletions(-) + +commit 60242038e4dce7f0c90f2bfa0e771120247dbc9d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 30 09:35:29 2010 +0200 + + [glib] Add GObject introspection support + + configure.ac | 5 +++ + glib/Makefile.am | 29 +++++++++++++++++ + m4/introspection.m4 | 94 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 128 insertions(+) + +commit 3160950a7d7161457405c9084c31af230329b3f0 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 2 12:47:04 2010 +0200 + + [glib] docs: Add index of deprecated symbols + + glib/reference/poppler-docs.sgml | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 593db7acf6edce1267f69d12310bf4098ff24c97 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 2 12:44:39 2010 +0200 + + [glib] docs: deprecate GDK API + + glib/poppler-page.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 6facefb3fa8f97a9d330545308fb2d89c7f57fa0 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 1 18:01:45 2010 +0200 + + [glib] docs: Add index of new symbols for versions 0.12, 0.14 and 0.16 + + glib/poppler-action.h | 10 +++++++--- + glib/poppler-annot.cc | 17 +++++++++++++++++ + glib/poppler-date.cc | 2 ++ + glib/poppler-document.cc | 16 +++++++++++++++- + glib/poppler-layer.cc | 12 ++++++++++++ + glib/poppler-media.cc | 14 ++++++++++++-- + glib/poppler-media.h | 3 +++ + glib/poppler-movie.cc | 6 ++++++ + glib/poppler-page.cc | 2 ++ + glib/reference/poppler-docs.sgml | 12 ++++++++++++ + 10 files changed, 88 insertions(+), 6 deletions(-) + +commit 166b78c0ce8a4536873c4f60b392c24c8a68e7aa +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 1 17:25:03 2010 +0200 + + [glib] docs: document PopplerMediaSaveFunc + + glib/poppler-media.h | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +commit 5cc0a51f88580c65ac2d5c6ff02b8cf14697b70c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 1 17:20:13 2010 +0200 + + [glib] Use the same name for parameter in function prototype + + glib/poppler-media.h | 10 +++++----- + glib/poppler-movie.h | 6 +++--- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit 6793fd8fd2d33d3d58c6556b5dbe6d0497e56646 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 1 15:49:49 2010 +0200 + + [glib] docs: document some enums in poppler-action + + glib/poppler-action.h | 92 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 92 insertions(+) + +commit 8e139696dbe19f54ad54364a711b929146f11080 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 1 15:02:58 2010 +0200 + + [glib] docs: mark structures in poppler-private.h as private + + glib/poppler-private.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit ccae7e574047d66c638003cc36fa1edeef4d35ed +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 1 14:59:50 2010 +0200 + + [glib] docs: document PopplerDocument enums + + glib/poppler-document.h | 65 + +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 65 insertions(+) + +commit 4fbff172693c38cdc4ae8070a55ceb706aa213cd +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 1 14:26:53 2010 +0200 + + [glib] docs: document PopplerFontInfo + + glib/poppler-document.cc | 106 + +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 106 insertions(+) + +commit 465dd4897ff603a6fd96503cf4746fc808b0f827 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 1 12:59:39 2010 +0200 + + [glib] docs: document some enums + + glib/poppler.h | 55 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 55 insertions(+) + +commit de3d599ea9e948867cfe395f42ed659670110c4c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 1 12:31:10 2010 +0200 + + [glib] docs: document boxed types defined in poppler-page + + glib/poppler-page.cc | 147 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-page.h | 79 +++++++++++++++++++++++++++ + 2 files changed, 226 insertions(+) + +commit 34c52190e1dbf4d3effa44b4408faa1fbae0d12d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 1 09:33:08 2010 +0200 + + [glib] Remove splash header file + + glib/poppler-page.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 6910545a487f206ccd059bb295d2312228dbf2ba +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 30 19:03:04 2010 +0200 + + [glib] docs: Remove invalid symbol from poppler-sections.txt + + glib/reference/poppler-sections.txt | 1 - + 1 file changed, 1 deletion(-) + +commit 65ea3b636cb5a38660e526a483a4d95f5acdf8db +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 30 19:02:32 2010 +0200 + + [glib] docs: fix typo + + glib/poppler-form-field.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 689bfec40b5b3030c2819cb4aac42c3ab6279278 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 30 19:01:47 2010 +0200 + + [glib] docs: Add missing doc for parameter + + glib/poppler-document.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0b3d77627f255a4bf3da6ee875ad8d9eb931c96e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 30 19:00:59 2010 +0200 + + [glib] Use the same name for parameter in function prototype + + glib/poppler-page.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 19e1944c00ac2da6b18b015721fc3a8d1898a23a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 30 18:01:52 2010 +0200 + + [glib] docs: Add media and movie to docs + + glib/poppler-media.cc | 6 ++++++ + glib/poppler-movie.cc | 6 ++++++ + glib/reference/poppler-docs.sgml | 3 ++- + 3 files changed, 14 insertions(+), 1 deletion(-) + +commit ca48bee07e6b4a20ea7b40b472a335e75feb4739 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 30 17:56:50 2010 +0200 + + [glib] docs: Add missing types to poppler.types + + glib/reference/poppler.types | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 613ccf81317a007ed5017ee788466613a6699bb5 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 30 17:54:22 2010 +0200 + + [glib] docs: rework poppler-sections.txt + + - Better organization of sections and contents + - Use of Standard and Private subsections + - Add missing sections + - Remove enums section + + glib/reference/poppler-sections.txt | 424 + +++++++++++++++++++++++++----------- + 1 file changed, 295 insertions(+), 129 deletions(-) + +commit b37556a32b79f8711ed7eca24abf19511872a70a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 30 12:01:44 2010 +0200 + + [glib] docs: Add index of symbols + + glib/reference/poppler-docs.sgml | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 7f5fa4e19b4e324a396d64261b9125c1a557ac84 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 30 12:00:35 2010 +0200 + + [glib] docs: Add version information + + configure.ac | 1 + + glib/reference/Makefile.am | 2 +- + glib/reference/poppler-docs.sgml | 7 ++++++- + glib/reference/version.xml.in | 1 + + 4 files changed, 9 insertions(+), 2 deletions(-) + +commit 848d5e158fa9eadd19a658db314ba3fff9d026e8 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 30 11:30:41 2010 +0200 + + [glib] docs: do not use gtk-doc templates + + configure.ac | 2 +- + glib/poppler-action.cc | 6 + + glib/poppler-annot.cc | 6 + + glib/poppler-attachment.cc | 6 + + glib/poppler-attachment.h | 16 + + glib/poppler-document.cc | 8 + + glib/poppler-features.h.in | 59 ++++ + glib/poppler-form-field.cc | 6 + + glib/poppler-layer.cc | 6 + + glib/poppler-page.cc | 6 + + glib/reference/tmpl/poppler-action.sgml | 216 ------------ + glib/reference/tmpl/poppler-annot.sgml | 377 --------------------- + glib/reference/tmpl/poppler-attachment.sgml | 68 ---- + glib/reference/tmpl/poppler-document.sgml | 410 + ----------------------- + glib/reference/tmpl/poppler-enums.sgml | 246 -------------- + glib/reference/tmpl/poppler-features.sgml | 83 ----- + glib/reference/tmpl/poppler-form-field.sgml | 318 ------------------ + glib/reference/tmpl/poppler-layer.sgml | 83 ----- + glib/reference/tmpl/poppler-page.sgml | 483 + --------------------------- + glib/reference/tmpl/poppler-private.sgml | 148 -------- + glib/reference/tmpl/poppler-unused.sgml | 8 - + glib/reference/tmpl/poppler.sgml | 285 ---------------- + glib/reference/tmpl/stamp-poppler-enums.sgml | 22 -- + gtk-doc.make | 78 +++-- + m4/gtk-doc.m4 | 2 +- + 25 files changed, 171 insertions(+), 2777 deletions(-) + +commit 16e15ac845206217086e2adac9f220e75c0c630d +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 29 21:44:02 2010 +0100 + + bitmap can be null at this stage, check it isn't + + poppler/JBIG2Stream.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 38e5d28a184d0ca8df71a7ea910ce85d7a225e4e +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jun 21 20:38:00 2010 +0100 + + more pow 0.5 -> sqrt + + poppler/GfxState.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 58a53ca0a4e8434e8478f8fe121067dcf05c017d +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jun 21 19:24:20 2010 +0100 + + sqrt is much faster than pow 0.5 + + poppler/GfxState.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit bf86a9fc464aca57ebec207a213dcc2cc6031940 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jun 21 19:20:47 2010 +0100 + + introduce getChars to save some method calls + + Can give us a decent speedup when we go a lot though this methods + + poppler/Catalog.cc | 12 +---- + poppler/DCTStream.cc | 51 ++++++++++++++------ + poppler/DCTStream.h | 3 ++ + poppler/GfxFont.cc | 22 ++------- + poppler/GfxState.cc | 30 ++++-------- + poppler/JPEG2000Stream.cc | 67 +++++++------------------- + poppler/JPEG2000Stream.h | 38 ++++++++++++++- + poppler/Link.cc | 14 ++---- + poppler/Object.h | 4 ++ + poppler/Stream.cc | 90 +++++++++++++++++++---------------- + poppler/Stream.h | 118 + +++++++++++++++++++++++++++++++++++++++++++++- + 11 files changed, 279 insertions(+), 170 deletions(-) + +commit 65c14073a3b1035ca5fe3bd6667abd315272841e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Jun 21 17:19:22 2010 +0200 + + Reduce pow operations in GfxCalRGBColorSpace::getXYZ() + + We were doing the same pow operation 3 times!. It makes document + attached to bug #28591 render a little faster. + + poppler/GfxState.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 9365c05c1f66b3000febf32c45cef2ffe79e041a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jun 19 10:36:39 2010 +0200 + + [glib] Fix links/annots area for rotated documents with page CropBox + not starting at 0,0 + + Fixes bug #28588. + + glib/poppler-page.cc | 25 ++++++++++--------------- + 1 file changed, 10 insertions(+), 15 deletions(-) + +commit d9504c0a288c84b68a516f715505d6bc94b911f5 +Author: Pino Toscano <pino@kde.org> +Date: Fri Jun 18 23:59:04 2010 +0200 + + [autotools] link the 'cpp' tests against libpoppler as well + + ... this way gatof() can be found correctly + should fix bug #28605 + + cpp/tests/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 62975737bcaa6e0a2ecab981aa3e0c8f2ff10571 +Author: Brian Cameron <brian.cameron@oracle.com> +Date: Fri Jun 18 19:22:17 2010 +0100 + + Compile with Sun Studio + + goo/ImgWriter.h | 3 ++- + goo/JpegWriter.h | 3 ++- + poppler/SplashOutputDev.cc | 6 ++++++ + 3 files changed, 10 insertions(+), 2 deletions(-) + +commit 7cbe3d1521aea8b484efb8663e75684e05b6fb61 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jun 17 23:01:21 2010 +0100 + + Optimize Splash::compositeBackground + + Optimization takes into account the two most common cases, the + pixel not + being painted at all (alpha == 0) meaning we just copy the paperColor + and the pixel being opage meaning we have to do nothing + + splash/Splash.cc | 34 ++++++++++++++++++++++++++-------- + 1 file changed, 26 insertions(+), 8 deletions(-) + +commit f323e5e4cdcc20075ee7c722f7adc088c0772249 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jun 17 22:59:37 2010 +0100 + + Check the objects are num before reading them + + Might have caused the kde bug #241995 + + poppler/GfxState.cc | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit 35e87d2062b1d82db0d765de5a6187122a0fa99c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 16 11:52:25 2010 +0200 + + [gib-demo] Add demo for poppler_page_get_text_layout() + + glib/demo/text.c | 182 + +++++++++++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 164 insertions(+), 18 deletions(-) + +commit ddcea568b3a7334e062d6214f43d0a2c2ec95be4 +Author: Daniel Garcia <danigm@yaco.es> +Date: Tue Jun 15 16:57:32 2010 +0200 + + [glib] Add poppler_page_get_text_layout() + + Returns an array of PopplerRectangle items and each Rectangle is a + text character position. + + The position in this array represent the offset in text returned by + poppler_page_get_text + + glib/poppler-page.cc | 91 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-page.h | 4 ++- + 2 files changed, 94 insertions(+), 1 deletion(-) + +commit 6e9fe8832c37b560ac4d0b0e32d618bde70ee117 +Author: Pino Toscano <pino@kde.org> +Date: Wed Jun 16 00:22:59 2010 +0200 + + [Qt4] and support 'Print' named action here too... + + qt4/src/poppler-annotation.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 53c003f36af5d77f50fe238eaec4c5f7c3a485c7 +Author: Pino Toscano <pino@kde.org> +Date: Wed Jun 16 00:18:13 2010 +0200 + + [CMake] install the new goo/GooLikely.h + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 2ba752aabc8dad4bb35a351697b1590795c54ca4 +Author: Pino Toscano <pino@kde.org> +Date: Wed Jun 16 00:06:30 2010 +0200 + + update copyrights + + qt4/src/poppler-link.h | 3 ++- + qt4/src/poppler-page.cc | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 38bf54bbad40288be763c6a1a89d90477c9ef89d +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 15 23:05:43 2010 +0100 + + move the declaration of likely/unlikely to an own file in goo/ + + goo/GooLikely.h | 22 ++++++++++++++++++++++ + goo/Makefile.am | 1 + + poppler/Object.h | 9 +-------- + splash/Splash.cc | 4 +--- + 4 files changed, 25 insertions(+), 11 deletions(-) + +commit 9838edf8c7497858e3bac2743784a3259f61cfdd +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 15 22:54:34 2010 +0100 + + Protect us against negative y coordinates + + Happens very rarely, like in bug 28480 + + splash/Splash.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 8b32c3e9826d4462fd9d16fab4200ebb23251046 +Author: Pino Toscano <pino@kde.org> +Date: Tue Jun 15 23:55:01 2010 +0200 + + [Qt4/apidox] ok, now the *proper* version for 'Print'... + + qt4/src/poppler-link.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b54e5ac49f69bd1c906e517edcb436e042199cd5 +Author: Pino Toscano <pino@kde.org> +Date: Tue Jun 15 23:53:50 2010 +0200 + + [Qt4/apidox] add the proper version for the new 'Print' + + qt4/src/poppler-link.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 71ad18c3b6b73e23d71600d07ce00bdfaf0bef60 +Author: Pino Toscano <pino@kde.org> +Date: Tue Jun 15 23:51:01 2010 +0200 + + [Qt4] recognize the 'Print' named action here too + + qt4/src/poppler-annotation.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 96f60f2748ba76de0d296a9838dbd7181f506e36 +Author: Guillermo Amaral <gamaral@kdab.com> +Date: Tue Jun 15 23:47:46 2010 +0200 + + [Qt4] recognize 'Print' as name in named actions + + qt4/src/poppler-link.h | 3 ++- + qt4/src/poppler-page.cc | 2 ++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 25494311c5b8eb88d43df420ec91a1aedad20d05 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 15 17:44:23 2010 +0200 + + [glib] Add some G_UNLIKELY() + + glib/poppler-document.cc | 12 ++++++------ + glib/poppler-page.cc | 17 ++++++++++------- + 2 files changed, 16 insertions(+), 13 deletions(-) + +commit 52f133fb962256edb577b7f639c5c13221c6365d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 15 14:20:49 2010 +0200 + + [glib] Use g_slice for actions and destinations + + glib/poppler-action.cc | 21 +++++++++------------ + 1 file changed, 9 insertions(+), 12 deletions(-) + +commit f035c94d8b5b34c0c3bb47b8cfc2f9c720a4fc71 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 15 14:01:07 2010 +0200 + + [glib] Use g_slice_dup in _copy() function for iterators + + glib/poppler-document.cc | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +commit c84f69681828c7e3b969f666f9b84f1531976c6f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 15 13:57:18 2010 +0200 + + [glib] Use g_slice for mappings and PopplerRectangle + + glib/poppler-page.cc | 50 + ++++++++++++++++++-------------------------------- + 1 file changed, 18 insertions(+), 32 deletions(-) + +commit e12b9ab105f3b56b47ded871693b939ed421c853 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 15 13:49:27 2010 +0200 + + [glib] Use poppler_image_mapping_free() instead of g_free() + + glib/poppler-page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fb791a15f7472042fb2174e6f5df6924dd4eeb9b +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 15 13:37:52 2010 +0200 + + [glib] Remove poppler_mapping_free and use poppler_link_mapping_free + instead + + glib/poppler-page.cc | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +commit 6186d7220e545eb89597626933a10acd0cd25173 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 15 13:16:59 2010 +0200 + + [glib] Use _new() methods instead of g_new() to create boxed structs + + glib/poppler-page.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 44639cb7b10ab6d66122ae2b6b7f3e5745f933bd +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 15 10:39:00 2010 +0200 + + [glib-demo] Use poppler_rectangle_free() instead of g_free() + + glib/demo/find.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3ca304f3837af27ae49541a5f441d8729264a945 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jun 14 19:16:41 2010 +0100 + + Add more caching to ObjectStreams + + Makes opening of file from bug 26759 ten times faster + + poppler/XRef.cc | 62 + ++++++++++++++++++++++++++++++++++++++++++++++++--------- + poppler/XRef.h | 4 ++-- + 2 files changed, 55 insertions(+), 11 deletions(-) + +commit cc2e5f190e19ee8169f67df2541302a2816873d3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Jun 14 18:17:01 2010 +0200 + + [glib-demo] Support password protected documents + + glib/demo/main.c | 175 + +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 170 insertions(+), 5 deletions(-) + +commit 34b2dbb6bbaf0189c92eea6b7924999ab2b6ad11 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Jun 14 17:41:51 2010 +0200 + + [glib-demo] Remove GLIB_CHECK_VERSION(), we already depend on + glib 2.18 + + glib/demo/attachments.c | 5 ----- + glib/demo/main.c | 32 +------------------------------- + 2 files changed, 1 insertion(+), 36 deletions(-) + +commit a52670a46c0561025d8b86cd2865603f0720c695 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 13 15:31:15 2010 +0100 + + do not distribute these two files + + they are generated on configure/cmake time and depend on the machine + + glib/Makefile.am | 7 +++---- + poppler/Makefile.am | 4 ++-- + 2 files changed, 5 insertions(+), 6 deletions(-) + +commit eb0206ba8458f1dba004ac7bef856dcbb2ccbba5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 9 18:56:16 2010 +0100 + + we need to ship these two files + + Bug 28458 + + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 7dfdf1ee293b7d36a049a90d8a17462ed0e50f2c +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 8 21:54:52 2010 +0100 + + Typo-- + + utils/pdftoppm.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 57cc04ee1a122794b338c0d9818dbdaea46a42d6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 8 21:49:40 2010 +0100 + + Add cropbox to the manpage + + utils/pdftoppm.1 | 3 +++ + 1 file changed, 3 insertions(+) + +commit f9e6cb9647981f7afbb20261b3ccedaf003657d2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 8 20:43:11 2010 +0100 + + 0.14.0 + + CMakeLists.txt | 4 ++-- + NEWS | 18 ++++++++++++++++++ + configure.ac | 4 ++-- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 24 insertions(+), 6 deletions(-) + +commit 963afdc39153fee69ecb939c98deeef4f64638de +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 8 20:29:58 2010 +0100 + + libpoppler-qt4.so.3.2.0 -> libpoppler-qt4.so.3.3.0 + + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit c1629be8011f3bddbf619246090640d62136d521 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 8 20:23:00 2010 +0100 + + Increase soname as _PopplerActionMovie struct grew + + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 5ef45b1e72aed88ece0905b1204edee641f3c8fc +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 8 19:35:20 2010 +0100 + + Do not exit when trying to allocate memory for the XRef fails + + See bug 28406 + + poppler/XRef.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit e7a5e9f70ee1283a2ca6734552d905279c97989b +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jun 4 08:46:33 2010 +0100 + + a bit of docu + + poppler/Object.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9ff4dab2558f7c2700fd7fcaccacdad9619dbdda +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jun 4 08:44:34 2010 +0100 + + Add support for unsigned integer numbers + + So files store their P as a 32 bit unsigned instead of as a 32 bit + signed, making us to overflow our objInt parsing and rejecting to open + the file, this patch introduces objUint that only happens when the + number is not real, does not fit in a 32 bit integer but still fits + in a + 32 bit unsigned integer + + poppler/Lexer.cc | 32 +++++++++++++++++++++++++------- + poppler/Object.cc | 5 ++++- + poppler/Object.h | 14 +++++++++++--- + poppler/SecurityHandler.cc | 22 ++++++++++++++++++++++ + 4 files changed, 62 insertions(+), 11 deletions(-) + +commit 41e9af7f505dbfbda36f6ac97df90f2a42ab3160 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 1 21:40:07 2010 +0100 + + If the document is not encrypted it is ok to print + + poppler/XRef.cc | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit b15c793a8a58b17a7fe7b32c1037726e1e0e1bf0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 1 20:57:16 2010 +0100 + + Check it is a stream, not that it is not none + + People is reporting aborts, e.g. KDE bug 240208 + but can not check if this really fixes it since he can not share the + document + + poppler/Lexer.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit a72c68117ba05f3934e2df227cdcaf53a375f0ce +Author: Pino Toscano <pino@kde.org> +Date: Fri May 28 18:11:02 2010 +0200 + + [cpp apidox] add a start of API documentation for the 'page' class + + cpp/poppler-page.cpp | 68 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 68 insertions(+) + +commit acf7729e8e270e1b4b2a552272dc280ae6d7b352 +Author: Pino Toscano <pino@kde.org> +Date: Fri May 28 17:38:35 2010 +0200 + + [cpp] fix the font_iterator current page status + + cpp/poppler-font.cpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 4e017ff24a01cbbf1b39eedc3d7697f8b180fdd9 +Author: Pino Toscano <pino@kde.org> +Date: Fri May 28 17:15:28 2010 +0200 + + [cpp apidox] add API documentation for the 'font_info' and + 'font_iterator' classes + + cpp/poppler-font.cpp | 71 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 71 insertions(+) + +commit 2ff840b62e41e2fc98e9fcff7330f40216de58a5 +Author: Pino Toscano <pino@kde.org> +Date: Fri May 28 14:34:37 2010 +0200 + + [cpp] move the actual convert_date(const char*) implementation in + the detail + + this way it is possible to call it from inside poppler-cpp without + an implicit conversion to std::string + + cpp/poppler-document.cpp | 2 +- + cpp/poppler-embedded-file.cpp | 4 ++-- + cpp/poppler-global.cpp | 23 ++--------------------- + cpp/poppler-private.cpp | 25 +++++++++++++++++++++++++ + cpp/poppler-private.h | 2 ++ + 5 files changed, 32 insertions(+), 24 deletions(-) + +commit 8112e9111313eaded4cd2e89d0e67efb0f3e29db +Author: Pino Toscano <pino@kde.org> +Date: Fri May 28 13:13:50 2010 +0200 + + [cpp] add a time_type typedef + + ... defined as unsigned int, and use it all around + (it changes nothing for client code) + + cpp/poppler-document.cpp | 8 ++++---- + cpp/poppler-document.h | 2 +- + cpp/poppler-embedded-file.cpp | 4 ++-- + cpp/poppler-embedded-file.h | 4 ++-- + cpp/poppler-global.cpp | 4 ++-- + cpp/poppler-global.h | 4 +++- + 6 files changed, 14 insertions(+), 12 deletions(-) + +commit bc5bdb43b12437e00aaddc27a74b9ac4b6498446 +Author: Pino Toscano <pino@kde.org> +Date: Fri May 28 13:01:53 2010 +0200 + + use the proper type for iterating on a GooVector + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 87128ab0dfec6be1a034361512ee41301b078831 +Author: Maciej Mrozowski <reavertm@gmail.com> +Date: Thu May 27 17:31:00 2010 +0200 + + [CMake] Do not force -O2, preserve compiler flags instead. + + cmake/modules/PopplerMacros.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 241c338facb45641ef1a271c904355a014bbf28d +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu May 27 20:37:55 2010 +0100 + + Allow quality & progressive mode to be utilised in JpegWriter + + goo/JpegWriter.cc | 15 +++++++++++++-- + goo/JpegWriter.h | 4 ++++ + splash/SplashBitmap.cc | 18 +++++++++--------- + splash/SplashBitmap.h | 4 ++++ + 4 files changed, 30 insertions(+), 11 deletions(-) + +commit 9eda6e8aaae412a9882141d1b5b8c7bf0c823c68 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue May 25 23:44:30 2010 +0100 + + Do not follow loops blindly + + Fixes crash in pdf in bug 28172 + + poppler/XRef.cc | 21 +++++++++++++++------ + poppler/XRef.h | 7 ++++--- + 2 files changed, 19 insertions(+), 9 deletions(-) + +commit bbee6e0c8c9b181f8d19c167c867d74a765685fb +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue May 25 23:13:38 2010 +0100 + + update copyright + + poppler/JBIG2Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 80b72b9f2fd70395580205b8b176e0576e132cf5 +Author: Hib Eris <hib@hiberis.nl> +Date: Wed May 26 13:07:57 2010 +0200 + + [autotools] sync autotool build with cmake build + + In addition to commit 69c2cf76cef9c190ac07726f60f1dccd3df5cb6d + + poppler/poppler-config.h.in | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 30ea3ab8a1eecafb3366aef193910098fdb7ccc8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue May 25 23:07:56 2010 +0100 + + Fix crash when parsing pdf in bug 28170 + + This code is a can of crashing worms :-7 + + poppler/JBIG2Stream.cc | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit b5a9021037c4e6cbbfd622433f3de693d1f47671 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue May 25 20:00:57 2010 +0100 + + 0.13.4 + + CMakeLists.txt | 2 +- + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + glib/reference/tmpl/poppler-action.sgml | 5 +++++ + glib/reference/tmpl/poppler-annot.sgml | 18 ++++++++++++++++++ + glib/reference/tmpl/poppler-attachment.sgml | 3 +++ + glib/reference/tmpl/poppler-document.sgml | 5 +++++ + glib/reference/tmpl/poppler-enums.sgml | 17 +++++++++++++++++ + glib/reference/tmpl/poppler-features.sgml | 3 +++ + glib/reference/tmpl/poppler-form-field.sgml | 3 +++ + glib/reference/tmpl/poppler-layer.sgml | 4 ++++ + glib/reference/tmpl/poppler-page.sgml | 13 +++++++++++++ + glib/reference/tmpl/poppler-private.sgml | 3 +++ + glib/reference/tmpl/poppler.sgml | 6 ++++++ + glib/reference/tmpl/stamp-poppler-enums.sgml | 3 +++ + qt4/src/Doxyfile | 2 +- + 17 files changed, 103 insertions(+), 4 deletions(-) + +commit 57ab0ebe993d79fe551bba58e0a70d55d32828f8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 12 20:49:31 2010 +0100 + + better copyright + + poppler/strtok_r.cpp | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +commit 69c2cf76cef9c190ac07726f60f1dccd3df5cb6d +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 12 20:47:25 2010 +0100 + + mingw does not provide strtok_r + + Copy the glibc implementation + + CMakeLists.txt | 1 + + poppler/Makefile.am | 1 + + poppler/poppler-config.h.cmake | 4 + + poppler/strtok_r.cpp | 189 + +++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 195 insertions(+) + +commit 9e9b5e0d87a7450bd2223538673321ecec720c36 +Author: Marek Kasik <mkasik@redhat.com> +Date: Tue May 11 12:06:17 2010 +0200 + + Better check of overlapping of table cells when selecting text + + Add check for overlapping of upper right cell with lower left cell + of assumed table (related to #3188). + + poppler/TextOutputDev.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit a3e40b460b7690ef73ccf143b10da07e91d9ee7f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon May 10 17:41:04 2010 +0200 + + [annots] Adjust bbox for line annots when y1 = y2 + + Some documents like pdf_commenting_new.pdf, have y1 = y2 but + line_width > 0, acroread renders the lines in such cases even + though the + annot bbox is empty. + + poppler/Annot.cc | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit e30d24c506a9ff742f8af5d6c71273abeddaa265 +Author: Pino Toscano <pino@kde.org> +Date: Tue May 4 15:19:26 2010 +0200 + + [cpp] ustring::{from,to}_utf8(): fix in/out buffer sizes + + cpp/poppler-global.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit aaa19a673020e12dbfceb4d25ade0ece7875fd83 +Author: Pino Toscano <pino@kde.org> +Date: Tue May 4 12:07:43 2010 +0200 + + [cpp] make the pkg-config files really working + + poppler-cpp.pc.cmake | 6 +++++- + poppler-cpp.pc.in | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +commit 8f963ccde41ef1faa719254fccc5bdfe75e9fa87 +Author: Patrick Spendrin <ps_ml@gmx.de> +Date: Sun May 2 18:42:10 2010 +0200 + + Windows: define strtok_r as strtok_s + + poppler/poppler-config.h.cmake | 4 ++++ + poppler/poppler-config.h.in | 4 ++++ + 2 files changed, 8 insertions(+) + +commit c9d8df51c96e50ad72f7954baba2254259fc894c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 1 19:52:51 2010 +0100 + + 2010 in these copyrights + + poppler/poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 9ce71fb35fdd66c55872956432160a5c76a62080 +Author: Jakub Wilk <ubanus@users.sf.net> +Date: Sat May 1 19:50:54 2010 +0100 + + Use strtok_r instead strtok + + strtok is not thread safe + + fofi/FoFiType1.cc | 8 +++++--- + poppler/CharCodeToUnicode.cc | 6 ++++-- + poppler/GlobalParams.cc | 6 ++++-- + poppler/PDFDoc.cc | 4 +++- + poppler/UnicodeMap.cc | 21 ++++++++++++++++++--- + 5 files changed, 34 insertions(+), 11 deletions(-) + +commit 6b2983f89e87792a393880dab6dc1fedb748db2c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Apr 30 14:48:50 2010 +0200 + + [cairo] Set device offset and matrix to smask depending on the + group target + + It seems to fix all of my test cases. Fixes bug #27208. + + poppler/CairoOutputDev.cc | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +commit ac32021704178721ee007a6b6831283e323e500f +Author: Pino Toscano <pino@kde.org> +Date: Fri Apr 30 01:14:14 2010 +0200 + + demote the #warning to a simple FIXME comment + + poppler/ArthurOutputDev.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 8c1bc17552c989c15f318d9d109607a9a594ca6b +Author: Pino Toscano <pino@kde.org> +Date: Fri Apr 30 01:12:19 2010 +0200 + + MSVC: define fmax() and fmin() + + MSVC does not provide those functions, so we need to define them to + the existing max()/mix() macros. + Thanks to Patrick Spendrin for the hint! + + poppler/poppler-config.h.cmake | 5 +++++ + poppler/poppler-config.h.in | 5 +++++ + 2 files changed, 10 insertions(+) + +commit 71063d51a45835b0267a7e3f823ef49689cfd06f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Apr 29 20:28:07 2010 +0200 + + Make sure we are drawing text before calling endTextObject() + + This is actually the right fix for the previous commit. + + poppler/Gfx.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit e909219d8e92994bd52976f9676015fa6ca9fc91 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Apr 29 18:34:22 2010 +0200 + + Set textHaveCSPattern=false again before filling the pattern in + opEndText() + + Fixes cairo backend regressions caused by commit + ccf238b32e236f69c0507a5421ac2649dfa8d865. + + poppler/Gfx.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 29572d6ac7829b60efce2d8e489473c55e370f26 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 27 23:39:23 2010 +0100 + + fabs for doubles + + poppler/TextOutputDev.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 4905e2bd764ea601e3bf9c5195c740e5bf186af5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 27 23:34:34 2010 +0100 + + fix include + + splash/SplashBitmap.cc | 1 + + 1 file changed, 1 insertion(+) + +commit f9f0e4b747a1527bd6354897cdba7954d58651de +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Apr 27 14:26:23 2010 +0200 + + Fix first color stop offset of linear gradients + + Fixes bug #27837. + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5b822011029f3721fbafd4a7bf01b9d6fee35d25 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 24 18:18:08 2010 +0200 + + include standard float.h instead of unportable values.h + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dee7cb8691528293bb5b8f266970cdb6771e301b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 24 15:39:23 2010 +0100 + + 0.13.3 + + CMakeLists.txt | 2 +- + NEWS | 31 +++++++++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 35 insertions(+), 4 deletions(-) + +commit 07864c9e2a7a32b48bdbab92c8b2f79bce1d9f5b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 24 13:07:02 2010 +0100 + + minor cleanups + + utils/HtmlLinks.cc | 15 ++------------- + utils/HtmlLinks.h | 16 ++++++++++++++-- + 2 files changed, 16 insertions(+), 15 deletions(-) + +commit e501eabb2f0775444a2bf64005a3a3f1ffa281b4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 24 13:06:12 2010 +0100 + + Do not assume the parameter will have more than 5 chars + + utils/pdftohtml.cc | 30 ++++++++++++++++++------------ + 1 file changed, 18 insertions(+), 12 deletions(-) + +commit 6cc4d571339214e9eeeb682ba48fb220cef905f9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 24 13:04:05 2010 +0100 + + Fix end() to return the correct last valid value + + goo/GooVector.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 4ed53e30e735b79c46eab9d54883531c6e187b17 +Author: William Bader <williambader@hotmail.com> +Date: Fri Apr 23 22:52:24 2010 +0100 + + Silence some Illegal entry in bfrange block in ToUnicode CMap + + Fixes #27728 + + poppler/CharCodeToUnicode.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 16a004784043e2a8587c0c3c6d23889df8a80470 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Apr 22 19:39:01 2010 +0100 + + Avoid the usage of std:: + + poppler/TextOutputDev.cc | 25 +++++++++++-------------- + 1 file changed, 11 insertions(+), 14 deletions(-) + +commit a7dcb2b4ffee57b7f78529cbaeaab647ab93de86 +Author: Pino Toscano <pino@kde.org> +Date: Thu Apr 22 13:31:41 2010 +0200 + + Windows: include config.h in GlobalParamsWin.cc only if not included + already + + GlobalParamsWin.cc is not compiled standalone but only #include'd by + GlobalParams.cc (on Windows only), so config.h has already included + already + as safety check, check for PACKAGE_NAME (#define'd in config.h) + before #include'ing it again + + poppler/GlobalParamsWin.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit fba076e17af24a9c9883504282316bba119a908c +Author: Pino Toscano <pino@kde.org> +Date: Thu Apr 22 13:24:04 2010 +0200 + + avoid accidental max() macro replacement with some compilers (eg MSVC) + + defining an empty macro and using it between "max" and "(", such + compilers won't try to replace their macro max(a, b) there; in any + case, empty spaces are just fine + + poppler/TextOutputDev.cc | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit ccf238b32e236f69c0507a5421ac2649dfa8d865 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Wed Apr 21 19:21:37 2010 +0100 + + Improve colorizing text and masks in pattern colorspace + + Bug #27482 + + poppler/Gfx.cc | 137 + ++++++++++++++++++++++----------------------- + poppler/Gfx.h | 4 +- + poppler/SplashOutputDev.cc | 41 ++++++++++++-- + poppler/SplashOutputDev.h | 3 +- + 4 files changed, 106 insertions(+), 79 deletions(-) + +commit 8e86dfb328d94939ecf390d34af533b831b2837b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 21 19:19:53 2010 +0100 + + Add copyright + + poppler/TextOutputDev.cc | 1 + + poppler/TextOutputDev.h | 1 + + 2 files changed, 2 insertions(+) + +commit 6f9f3d33ff8058e28243ba45b8547e21ad0d088a +Author: Andre Klapper <a9016009@gmx.de> +Date: Wed Apr 21 19:57:15 2010 +0200 + + [glib-demo] Compile with -DGSEAL_ENABLE + + Fixes bug #27579. + + glib/demo/images.c | 2 +- + glib/demo/layers.c | 4 ++-- + glib/demo/render.c | 8 ++++---- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 6b14c18d60cae130869f9a5c7688dfe880602224 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Apr 21 19:56:49 2010 +0200 + + [cairo] Make sure we always use a new path in doPath() + + Fixes document + http://acroeng.adobe.com/Test_Files/images/transparency/Untitled-2.pdf + when rendering with cairo backend. + + poppler/CairoOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 4f71d64c69500ed78daf4d797c8af6cfbd3d970e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Apr 21 11:44:49 2010 +0200 + + [cairo] Fix pattern size when bbox is not at 0,0 + + poppler/CairoOutputDev.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit 9c5612f6e013a8698eff6531ec388a7e6c1fb89a +Author: Marek Kasik <mkasik@redhat.com> +Date: Fri Feb 12 14:31:01 2010 +0100 + + Distinguish between columns and tables when selecting text + + This commit add ability to detect tables in text by checking borders + of 4 neighbouring text blocks for arrangement (to the left, to + the right, + center, ...). Detected border of whole table is then stored in + ExMin, ExMax, + EyMin and EyMax of each block together with id of detected + table. Sorting + of blocks is then performed on the these borders to be able to + distinguish + tables from columns. + Pasting of selected text was modified so that tables are pasted + correctly + (even with multi line cells). + + poppler/TextOutputDev.cc | 490 + +++++++++++++++++++++++++++++++++++++++++------ + poppler/TextOutputDev.h | 5 + + 2 files changed, 437 insertions(+), 58 deletions(-) + +commit db014ffb357e760d9397544c5a8fe747cdb497ab +Author: Brian Ewins <brian.ewins@gmail.com> +Date: Mon Nov 23 08:58:19 2009 +0000 + + Select top right to bottom left in RTL mode + + This makes pure RTL selection work. Bidi is not handled at all. + Rendering of the selection is poor and the dumped text appears + to still be in reverse order to me. + + poppler/TextOutputDev.cc | 57 + ++++++++++++++++++++++++++++++++++++------------ + 1 file changed, 43 insertions(+), 14 deletions(-) + +commit b1d43fa052d9160c4f319a67415ecf3ebf2cf9b3 +Author: Brian Ewins <brian.ewins@gmail.com> +Date: Sun Nov 22 09:47:40 2009 +0000 + + Make pdftotext newlines match copy and paste + + The output of pdftotext didn't insert line breaks, + resulting in jumbled text. Change the rules to + emit a newline at the end of each line unless + a hyphenation is being supressed, and an extra + newline at the end of each flow. + + poppler/TextOutputDev.cc | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) + +commit f83b677a8eb44d65698b77edb13a5c7de3a72c0f +Author: Brian Ewins <brian.ewins@gmail.com> +Date: Thu Nov 12 02:50:29 2009 +0000 + + Use a reading-order sort to order blocks + + This switches the block sort from XY to reading order, + using the rules from T. Breuel's "High Performance + Document Layout Analysis". + + Signed-off-by: Brian Ewins <brian.ewins@gmail.com> + + poppler/TextOutputDev.cc | 164 + +++++++++++++++++++++++++++++++++++++++++++++-- + poppler/TextOutputDev.h | 8 +++ + 2 files changed, 167 insertions(+), 5 deletions(-) + +commit a2191a4d45e0abaec97c19aacae37c4c5824bd36 +Author: Brian Ewins <brian.ewins@gmail.com> +Date: Mon Nov 9 06:24:51 2009 +0000 + + Separate flow construction from reading order + + If the blocks were already in reading order, then + constructing flows is simplified, since blocks + cannot be picked out-of-order. Make this change + first in preparation for adding a reading-order + sort. + + Signed-off-by: Brian Ewins <brian.ewins@gmail.com> + + poppler/TextOutputDev.cc | 96 + +++++++++--------------------------------------- + 1 file changed, 17 insertions(+), 79 deletions(-) + +commit 345ed51af9b9e7ea53af42727b91ed68dcc52370 +Author: Brian Ewins <brian.ewins@gmail.com> +Date: Thu Oct 29 01:46:29 2009 +0000 + + Fix bug 3188, text selection across table cells + + Bug 3188. When selecting text, poppler goes across the whole + page then down, rather than across each cell, down that cell, + then across to the next cell. This leads to illegible paste + results. + + Teach TextPage to visit the selection in flow order rather than + block order. + + Signed-off-by: Brian Ewins <brian.ewins@gmail.com> + + poppler/TextOutputDev.cc | 334 + +++++++++++++++++++++++++---------------------- + 1 file changed, 178 insertions(+), 156 deletions(-) + +commit 12d83931ae1b899b70c7ea5c01f03f123b1bb9a8 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Apr 18 17:53:48 2010 +0200 + + [cairo] Check pattern status after setting matrix when rendering + images + + Fixes rendering of document attached to kde bug + http://bugs.kde.org/show_bug.cgi?id=135417. + + poppler/CairoOutputDev.cc | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +commit ff6d501a2fc887fd49a985161f756d6d6b8e6c0d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Apr 18 17:51:42 2010 +0200 + + [cairo] Fix a crash when rendering 0x0 images + + See kde bug http://bugs.kde.org/show_bug.cgi?id=135417 + + poppler/CairoOutputDev.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 84cd2186861436fbaa7c29aa691e69fcd543a1c2 +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Apr 13 23:42:28 2010 +0200 + + Properly initialize variable + + poppler/CachedFile.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 24f244f486f332b0bd76c6525c5d9d03168a76e6 +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Apr 13 23:54:28 2010 +0200 + + pdftops: require output filename when reading from stdin + + utils/pdftops.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 955f9f53ff225f6794a494fdd0f0fe5ee1a41d88 +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Apr 13 23:47:40 2010 +0200 + + pdftotext: require output filename when reading from stdin + + utils/pdftotext.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 31388aa8b5117619878431b7fed2d033000af541 +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Apr 13 23:27:20 2010 +0200 + + pdftohtml: require output filename when reading from stdin + + utils/pdftohtml.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit a8d43ec1c7f5448a7f63d9bbd9062d56ee1c7c58 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 14 19:21:33 2010 +0100 + + update XOPEN_SOURCE to 600 in non standard compile options + + it seems helps compiling on some BSD + + cmake/modules/PopplerMacros.cmake | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 4cce1f14e964edf1bf2d9fb8286ee002a67dc212 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 13 21:57:16 2010 +0100 + + include strings.h on non windows platforms + + poppler/GlobalParams.cc | 2 ++ + test/perf-test.cc | 2 ++ + 2 files changed, 4 insertions(+) + +commit 55c76069c52f9f51c6b8c60fe1aa8de499012ea8 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Apr 12 19:32:46 2010 +0200 + + [glib] Use existing cairo api when rendering to a pixbuf + + I should fix bug #5589 for the GDK api too. + + glib/poppler-page.cc | 227 + +++++++++++++++++++++------------------------------ + 1 file changed, 93 insertions(+), 134 deletions(-) + +commit 51aefe1423a068e8c119c21a8791d265aecbeaf5 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Apr 9 12:50:00 2010 +0200 + + [cairo] Implement colorizing image masks with pattern colorspace + + poppler/CairoOutputDev.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit bd8f44289770175a17ac45e4788b0d374cc93d5a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Apr 9 12:02:38 2010 +0200 + + Partially revert "[cairo] Do not change device offset of mask surface" + + This partially reverts commit + a32f6f9ebaed3e4827b9dc6cb37e307c2798f521. + It fixed bug #27208, but it's causing regressions on other documents. + + poppler/CairoOutputDev.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit bcb405c43fb7140f5d601d00de4d30913a0050ef +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Apr 8 12:02:48 2010 +0200 + + Pages were always created without forms by Catalog + + Use getForm() instead of form when creating a page object. + + poppler/Catalog.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d46581c574b3088a82555cbc3b76e95e2571b9c0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 7 20:25:23 2010 +0100 + + Fix destructor + + poppler/Catalog.cc | 19 +++++++------------ + poppler/Catalog.h | 3 +-- + 2 files changed, 8 insertions(+), 14 deletions(-) + +commit ab14433f8b3d7c67f279cece65dfdd40c6675ac0 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu Mar 25 15:33:33 2010 +0100 + + Parse Form on demand + + poppler/Catalog.cc | 21 +++++++++++++-------- + poppler/Catalog.h | 2 +- + 2 files changed, 14 insertions(+), 9 deletions(-) + +commit c72a2c7f70b13a7b7b531b3c983d9a9bc104bac7 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu Mar 25 17:33:11 2010 +0100 + + Parse Names on demand + + poppler/Catalog.cc | 112 + +++++++++++++++++++++++++++++++++++++++++++---------- + poppler/Catalog.h | 18 ++++++--- + 2 files changed, 104 insertions(+), 26 deletions(-) + +commit 32053360c93607cf9bdc092257cefad5d4df9ec5 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu Mar 25 16:32:22 2010 +0100 + + Parse Dests on demand + + poppler/Catalog.cc | 27 +++++++++++++++++++++------ + poppler/Catalog.h | 2 +- + 2 files changed, 22 insertions(+), 7 deletions(-) + +commit da0f8e69eecb944e128474f62829f729eeabd189 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu Mar 25 16:48:07 2010 +0100 + + Parse Outline on demand in PDFDoc + + poppler/PDFDoc.cc | 17 ++++++++++++----- + poppler/PDFDoc.h | 2 +- + 2 files changed, 13 insertions(+), 6 deletions(-) + +commit d7a69c8cad112cb6616d0192d8a4028fdaee2f73 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu Mar 25 16:05:02 2010 +0100 + + Parse Outline on demand + + poppler/Catalog.cc | 23 ++++++++++++++++++++--- + poppler/Catalog.h | 2 +- + 2 files changed, 21 insertions(+), 4 deletions(-) + +commit c149e027fa76824221a78fe6d3bf9bfe953491d4 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu Mar 25 15:51:51 2010 +0100 + + Parse StructTreeRoot on demand + + poppler/Catalog.cc | 22 +++++++++++++++++++--- + poppler/Catalog.h | 2 +- + 2 files changed, 20 insertions(+), 4 deletions(-) + +commit 3c6effe44d6d97f175c2ee7f3913d8c4ba34d612 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu Mar 25 14:55:22 2010 +0100 + + Parse Metadata on demand + + poppler/Catalog.cc | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit 749d67ea2346a3453ef41dc37ba59d419ad900b0 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu Mar 25 15:09:58 2010 +0100 + + Parse PageLabelInfo on demand + + poppler/Catalog.cc | 37 +++++++++++++++++++++++++++++-------- + poppler/Catalog.h | 3 +++ + 2 files changed, 32 insertions(+), 8 deletions(-) + +commit 78f7d106714fa489a66c39410163a6902ba24856 +Author: Hib Eris <hib@hiberis.nl> +Date: Sat Mar 27 14:43:57 2010 +0100 + + Parse PageMode and PageLayout on demand + + poppler/Catalog.cc | 109 + ++++++++++++++++++++++++++++++++++++----------------- + poppler/Catalog.h | 11 ++++-- + 2 files changed, 81 insertions(+), 39 deletions(-) + +commit f5dd5be64d09186ee289632c1a61979d15edd605 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Apr 7 19:48:39 2010 +0200 + + Fix saving update docs that have a compressed xref table + + - Use the original xref table size as Size field in the trailer + dictionary to make sure size = maxObjId + 1 + + - Use the right generation number for compressed objects that which + must be 0. gen field in xref entry for compressed objects is the + index of the object in the stream, not the generation number. + + Fixes bug #27450. + + poppler/PDFDoc.cc | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 3f302fdd78cd78873bf5376af84e83741a8daadb +Author: Pino Toscano <pino@kde.org> +Date: Tue Apr 6 23:58:46 2010 +0200 + + use a GooVector<bool> instead of a non-standard variable-length-array + + poppler/CachedFile.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 425a62b5fa8e4e69bfc1c64ed126b5baac06d78a +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Apr 6 10:57:30 2010 +0200 + + pdfutils: fix deleting fileName + + utils/pdfinfo.cc | 2 +- + utils/pdftoabw.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 198c9d61ba93ba62ea2da44a23cd948d43556c3e +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 6 22:00:14 2010 +0100 + + Use the topleft of the Rect of text annots to draw + + Not use the full rect when we are drawing "our" notes + + poppler/Annot.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 1422802f029483ad3e62a3a13e66b2d3990ac58f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Apr 6 12:32:12 2010 +0200 + + [cairo] Use current fill_opacity when drawing soft masked images + + Fixes GNOME Bug https://bugzilla.gnome.org/show_bug.cgi?id=614915 + + poppler/CairoOutputDev.cc | 27 ++++++++++++++++++++------- + 1 file changed, 20 insertions(+), 7 deletions(-) + +commit c152d30f879e6cde45de58bb9249035e127e84e7 +Author: Hib Eris <hib@hiberis.nl> +Date: Mon Apr 5 18:55:29 2010 +0200 + + delete fileName in utils + + utils/pdftohtml.cc | 1 + + utils/pdftops.cc | 1 + + utils/pdftotext.cc | 1 + + 3 files changed, 3 insertions(+) + +commit f091c83414ab32a4ecf1fa2bd15f13a3cf113a86 +Author: Hib Eris <hib@hiberis.nl> +Date: Mon Apr 5 20:12:01 2010 +0100 + + add some docu + + poppler/CachedFile.h | 30 ++++++++++++++++++++++++++++++ + poppler/CurlPDFDocBuilder.h | 2 ++ + poppler/LocalPDFDocBuilder.h | 2 ++ + poppler/PDFDocBuilder.h | 9 +++++++++ + poppler/PDFDocFactory.h | 12 ++++++++++++ + poppler/StdinPDFDocBuilder.h | 2 ++ + 6 files changed, 57 insertions(+) + +commit fc071d800cb4329a3ccf898d7bf16b4db7323ad8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Apr 5 19:11:26 2010 +0100 + + Rework DCTStream error handling, should work better now + + Fixes bug 26280 + + poppler/DCTStream.cc | 35 ++++++++++++++--------------------- + poppler/DCTStream.h | 5 +++-- + utils/HtmlOutputDev.cc | 4 ++-- + 3 files changed, 19 insertions(+), 25 deletions(-) + +commit a9d801b2db20ecb08734ee5cdb703abf11994b6e +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Apr 5 16:55:02 2010 +0100 + + Make some paremeters const & to clearly show we just read them + + poppler/CachedFile.cc | 18 ++++++++++-------- + poppler/CachedFile.h | 8 +++++--- + poppler/CurlCachedFile.cc | 9 +++++---- + poppler/CurlCachedFile.h | 3 ++- + poppler/CurlPDFDocBuilder.cc | 9 +++++---- + poppler/CurlPDFDocBuilder.h | 5 +++-- + poppler/LocalPDFDocBuilder.cc | 15 ++++++++------- + poppler/LocalPDFDocBuilder.h | 5 +++-- + poppler/PDFDocBuilder.h | 5 +++-- + poppler/PDFDocFactory.cc | 7 ++++--- + poppler/PDFDocFactory.h | 3 ++- + poppler/StdinCachedFile.cc | 3 ++- + poppler/StdinCachedFile.h | 3 ++- + poppler/StdinPDFDocBuilder.cc | 7 ++++--- + poppler/StdinPDFDocBuilder.h | 5 +++-- + utils/pdffonts.cc | 4 ++-- + utils/pdfimages.cc | 4 ++-- + utils/pdfinfo.cc | 4 ++-- + utils/pdftoabw.cc | 4 ++-- + utils/pdftohtml.cc | 4 ++-- + utils/pdftoppm.cc | 2 +- + utils/pdftops.cc | 4 ++-- + utils/pdftotext.cc | 4 ++-- + 23 files changed, 76 insertions(+), 59 deletions(-) + +commit a04ee3ea6066c97d41fc40d5d97c600a1870855a +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Apr 5 16:50:58 2010 +0100 + + forgot my (C) + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ed723c8ac4a21a50d7d236cdcf7a635defd8dffb +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Apr 5 16:50:15 2010 +0100 + + The copy constructor of GooString never worked, so do not use it + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a28be8e4009b86fdfd92da928def194225a736c6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Apr 5 16:49:06 2010 +0100 + + Add some const correctnes to GooString + + goo/GooString.cc | 12 ++++++------ + goo/GooString.h | 21 ++++++++++++--------- + 2 files changed, 18 insertions(+), 15 deletions(-) + +commit 46aee9e4d225b88a3dfd4afbe57259f337bb15d3 +Author: Hib Eris <hib@hiberis.nl> +Date: Mon Apr 5 14:36:09 2010 +0200 + + Use PDFDocFactory in utils + + utils/pdffonts.cc | 16 ++++++++-------- + utils/pdfimages.cc | 11 ++++++++++- + utils/pdfinfo.cc | 31 +++++++------------------------ + utils/pdftoabw.cc | 10 +++++++++- + utils/pdftohtml.cc | 10 +++++++++- + utils/pdftoppm.cc | 17 +++++++++++------ + utils/pdftops.cc | 9 ++++++++- + utils/pdftotext.cc | 14 +++++++------- + 8 files changed, 69 insertions(+), 49 deletions(-) + +commit d487a90688c4431075c9e4db040b3b02625e208f +Author: Hib Eris <hib@hiberis.nl> +Date: Mon Apr 5 14:35:52 2010 +0200 + + Add PDFDocFactory + + CMakeLists.txt | 2 ++ + poppler/Makefile.am | 2 ++ + poppler/PDFDocFactory.cc | 71 + ++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/PDFDocFactory.h | 42 ++++++++++++++++++++++++++++ + 4 files changed, 117 insertions(+) + +commit 869135920831fb0d15db734f3dcd7a67146cc241 +Author: Hib Eris <hib@hiberis.nl> +Date: Wed Feb 24 15:24:26 2010 +0100 + + Add CurlPDFDocBuilder + + CMakeLists.txt | 2 ++ + poppler/CurlPDFDocBuilder.cc | 46 + ++++++++++++++++++++++++++++++++++++++++++++ + poppler/CurlPDFDocBuilder.h | 30 +++++++++++++++++++++++++++++ + poppler/Makefile.am | 6 ++++-- + 4 files changed, 82 insertions(+), 2 deletions(-) + +commit ec5c6117a64f9cb03560091c4d7948d4287b6975 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu Feb 25 11:23:28 2010 +0100 + + Add LocalPDFDocBuilder and StdinPDFDocBuilder + + CMakeLists.txt | 4 ++++ + poppler/LocalPDFDocBuilder.cc | 45 + +++++++++++++++++++++++++++++++++++++++++++ + poppler/LocalPDFDocBuilder.h | 30 +++++++++++++++++++++++++++++ + poppler/Makefile.am | 4 ++++ + poppler/StdinPDFDocBuilder.cc | 42 + ++++++++++++++++++++++++++++++++++++++++ + poppler/StdinPDFDocBuilder.h | 30 +++++++++++++++++++++++++++++ + 6 files changed, 155 insertions(+) + +commit 919b735d1c0b99bf72280aff8db87ba503954498 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Apr 4 11:05:35 2010 +0200 + + Add PDFDocBuilder + + CMakeLists.txt | 1 + + poppler/Makefile.am | 1 + + poppler/PDFDocBuilder.h | 32 ++++++++++++++++++++++++++++++++ + 3 files changed, 34 insertions(+) + +commit 1ab07faf05661d6d92186974c4b1c279b6178747 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Apr 4 11:29:53 2010 +0200 + + Add PDFDoc::ErrorPDFDoc + + poppler/PDFDoc.cc | 14 ++++++++++++++ + poppler/PDFDoc.h | 3 +++ + 2 files changed, 17 insertions(+) + +commit efc7e5efeddd8f70b7c74573d3194aba0a7d4631 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Apr 4 11:17:37 2010 +0200 + + Cleanup PDFDoc + + poppler/PDFDoc.cc | 40 +++++++++++++++------------------------- + poppler/PDFDoc.h | 3 ++- + 2 files changed, 17 insertions(+), 26 deletions(-) + +commit 08a3435e67ebf21beac2fefcbd21ad65f9293fd1 +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Feb 23 02:29:26 2010 +0100 + + Add HTTP support using libcurl + + With libcurl, poppler can handle documents over http. + + CMakeLists.txt | 18 ++++++++ + config.h.cmake | 6 +++ + configure.ac | 16 +++++++ + poppler/CurlCachedFile.cc | 95 + ++++++++++++++++++++++++++++++++++++++++++ + poppler/CurlCachedFile.h | 39 +++++++++++++++++ + poppler/Makefile.am | 20 +++++++++ + poppler/poppler-config.h.cmake | 5 +++ + poppler/poppler-config.h.in | 5 +++ + utils/pdfinfo.cc | 16 ++++++- + 9 files changed, 219 insertions(+), 1 deletion(-) + +commit a87abf6ad9fb66d35a70c9412adc5d8ba2889b96 +Author: Hib Eris <hib@hiberis.nl> +Date: Wed Feb 24 14:46:59 2010 +0100 + + Use cached files to read from stdin in pdfinfo + + This fixes reading from stdin. + + utils/pdfinfo.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 958b04b14baf03c07492fa1cbd225d9968b9efc1 +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Feb 23 02:02:10 2010 +0100 + + Add support for reading a cached file from stdin + + CMakeLists.txt | 2 ++ + poppler/Makefile.am | 2 ++ + poppler/StdinCachedFile.cc | 37 +++++++++++++++++++++++++++++++++++++ + poppler/StdinCachedFile.h | 26 ++++++++++++++++++++++++++ + 4 files changed, 67 insertions(+) + +commit 9539f75bd06150a3868209c5b04a75f5253722cc +Author: Hib Eris <hib@hiberis.nl> +Date: Sat Apr 3 15:08:20 2010 +0200 + + Add support for cached files + + CMakeLists.txt | 2 + + poppler/CachedFile.cc | 246 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/CachedFile.h | 113 +++++++++++++++++++++++ + poppler/Makefile.am | 2 + + poppler/Stream.cc | 102 +++++++++++++++++++++ + poppler/Stream.h | 58 ++++++++++++ + 6 files changed, 523 insertions(+) + +commit 8c6aefb8aa8929b9c47791d3062ed3ac8512626f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Apr 4 16:08:12 2010 +0200 + + [lexer] Correctly parse numbers with '+' sign + + See GNOME Bug: https://bugzilla.gnome.org/show_bug.cgi?id=614549 + + poppler/Lexer.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit ab5044e451e3714d385295f0b4ce9a15c8f2562c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Apr 4 12:32:42 2010 +0100 + + Add the -o[dd] and -e[ven] options to pdftoppm + + I've been using this patch forever and it's a pain to apply and + unapply + it each time + + utils/pdftoppm.1 | 6 ++++++ + utils/pdftoppm.cc | 8 ++++++++ + 2 files changed, 14 insertions(+) + +commit 0e371fb628a7e7d0cc1656e6405af4c97dbebf5d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Apr 4 12:30:34 2010 +0100 + + Fix my roll optimization + + Thanks Carlos for noticing + + poppler/Function.cc | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit a32f6f9ebaed3e4827b9dc6cb37e307c2798f521 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Mar 28 18:43:14 2010 +0200 + + [cairo] Do not change device offset of mask surface + + Also call cairo_paint() after set_source_rgb() to paint the + background. + Fixes bug #27208. + + poppler/CairoOutputDev.cc | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +commit efa5d9544d29252e3df36cc4e65c3d880b3c5172 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 27 22:11:49 2010 +0000 + + remove empty section + + NEWS | 2 -- + 1 file changed, 2 deletions(-) + +commit 5722df7a5387e43ec73f659ca58d2d07b9c4be3b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 27 22:04:43 2010 +0000 + + poppler 0.13.2 + + CMakeLists.txt | 2 +- + NEWS | 39 +++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 43 insertions(+), 4 deletions(-) + +commit b82fd707747b9d87ebf3c8f7ce5ab70ccdf82809 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 27 22:00:58 2010 +0000 + + gtk-doc changes + + glib/reference/tmpl/poppler-action.sgml | 7 +++---- + glib/reference/tmpl/poppler-annot.sgml | 9 --------- + glib/reference/tmpl/poppler-private.sgml | 10 ++++++++++ + glib/reference/tmpl/poppler-unused.sgml | 8 ++++++++ + glib/reference/tmpl/poppler.sgml | 10 ++++++++++ + 5 files changed, 31 insertions(+), 13 deletions(-) + +commit ed0354be4eac615b80e7a868984cc527853788b4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 27 21:44:59 2010 +0000 + + some forgotten copyrights + + qt/poppler-page.cc | 2 +- + qt4/src/poppler-document.cc | 2 +- + qt4/src/poppler-movie.cc | 3 ++- + qt4/src/poppler-page.cc | 2 +- + 4 files changed, 5 insertions(+), 4 deletions(-) + +commit 2aedeedf9ef2e2d3eb17bc36d728e68c2f7af762 +Author: Hib Eris <hib@hiberis.nl> +Date: Sat Mar 27 14:38:27 2010 +0000 + + Correctly initialize actualText + + poppler/TextOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit b53f9b203598555d6d706c3804aba013b8566921 +Author: Jan Engelhardt <jengelh@medozas.de> +Date: Sat Mar 27 13:23:42 2010 +0000 + + make qt3 detection use pkgconfig + + m4/qt.m4 | 101 + +++++---------------------------------------------------- + qt/Makefile.am | 4 +-- + 2 files changed, 10 insertions(+), 95 deletions(-) + +commit 320d4cee46e108498440179d8f9eab22cd5383d9 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 24 21:51:58 2010 +0100 + + Revert "no more needed" + + This reverts commit 24d6bc8c78cb3148db2098ae4d69bd744340cf52. + It is actually needed. + + cpp/tests/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit af21b5ab366bfdda203c26a77f4ae6ed0e70f64e +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 23 00:13:21 2010 +0100 + + [CMake] remove the (now) unneeded stuff from Find{GLIB,GDK,GTK}.cmake, + and search for them + + this way each bit (GLIB, GDK, and GTK) can be enabled/disabled + independently from the others + + CMakeLists.txt | 4 +++- + cmake/modules/FindGDK.cmake | 14 +------------- + cmake/modules/FindGLIB.cmake | 14 +------------- + cmake/modules/FindGTK.cmake | 14 +------------- + 4 files changed, 6 insertions(+), 40 deletions(-) + +commit 9b93ed5ce6712ec4cdf58148628e95685c289ef5 +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 23 00:02:27 2010 +0100 + + [CMake] copy FindGTK.cmake as FindGLIB.cmake and FindGDK.cmake + + this way FindGTK.cmake can be split in the various parts + + cmake/modules/FindGDK.cmake | 34 ++++++++++++++++++++++++++++++++++ + cmake/modules/FindGLIB.cmake | 34 ++++++++++++++++++++++++++++++++++ + 2 files changed, 68 insertions(+) + +commit 0ec21cae0b4623644c3efca1d2836a9f38f25737 +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 22 22:11:04 2010 +0100 + + [Qt] add the unhandled cases for 'actionOCGState' + + qt/poppler-page.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 5211e09595135b8e6c68efd1b8b689b518092b84 +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 22 22:07:44 2010 +0100 + + [CMake/cpp] move the BUILD_CPP_TESTS option to the main CMakeLists.txt + + CMakeLists.txt | 1 + + cpp/tests/CMakeLists.txt | 3 --- + 2 files changed, 1 insertion(+), 3 deletions(-) + +commit 24d6bc8c78cb3148db2098ae4d69bd744340cf52 +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 22 22:00:55 2010 +0100 + + no more needed + + cpp/tests/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +commit a07ef8f703ab896f89ed211a5780e4a669b04fc7 +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 22 22:00:15 2010 +0100 + + [CMake] revert addition of "-Wl,--no-add-needed" to the link flags, + if available + + for now it is safer without it + + cmake/modules/PopplerMacros.cmake | 6 ------ + 1 file changed, 6 deletions(-) + +commit 86debcc9bba28a7c86f01ca9e63bde5fcd541846 +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 22 21:49:22 2010 +0100 + + [CMake] add "-ansi" to the CXXFLAGS only on Linux + + cmake/modules/PopplerMacros.cmake | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 0819acd52a2ce74f0e176626d7b2233e10232d53 +Merge: c4ddbe89 92738ebb +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 22 21:43:01 2010 +0100 + + Merge branch 'master' of ssh://git.freedesktop.org/git/poppler/poppler + +commit 92738ebb8a9c7cfc879aae59c2cbdf3159f03cd3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Mar 22 20:28:15 2010 +0000 + + Add a search overload that takes doubles + + QRectF is evil and is float in some arch and causes search to loop + infinitely because of double->float conversion + + qt4/src/poppler-page.cc | 22 +++++++++++++++------- + qt4/src/poppler-qt4.h | 16 ++++++++++++++-- + 2 files changed, 29 insertions(+), 9 deletions(-) + +commit 0a895f14c8125c5de7b97e8e799459c431eb51cb +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Mon Mar 22 19:03:54 2010 +0000 + + correctly initialize the grayscale softmask color + + Fixes file with sha1sum e6e1576803a1bd74ad822eebbd750ee7b8357d25 + + poppler/SplashOutputDev.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit c4ddbe89df9e48343a9606728b7c182080d87ece +Author: Patrick Spendrin <ps_ml@gmx.de> +Date: Sat Mar 20 21:55:17 2010 +0100 + + [CMake] when the conf configuration backend is "win32", set the + required Internet Explorer version to 5.0 + + ... as done with autotools as well + + CMakeLists.txt | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 97da1f9d060493d9fb54a20e980c3f6e2b82c97e +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 20 17:51:07 2010 +0100 + + [CMake] check whether a link flag is supported before adding it to + the link flags + + this way we can add -Wl,--as-needed and -Wl,--no-add-needed only if + the current GCC/LD supports them + + cmake/modules/PopplerMacros.cmake | 23 ++++++++++++++++++++--- + 1 file changed, 20 insertions(+), 3 deletions(-) + +commit 223bce6d14e632f457a81b2ec091fe16369d2eb6 +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 20 14:08:58 2010 +0100 + + [CMake] with GCC, pass --as-needed and --no-add-needed to the linker + + --as-needed allows to avoid overlinking, linking only to the libraries + whose symbols are actually used + --no-add-needed makes the linker not use the NEEDED libraries + automatically, so we have to always make sure we specify all the + libraries actually used in a exe/lib + + cmake/modules/PopplerMacros.cmake | 4 ++++ + 1 file changed, 4 insertions(+) + +commit fc761f0d385708daaef1b95968532795b04f11b0 +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 20 14:05:59 2010 +0100 + + [CMake] poppler-dump uses parseargs.c which uses the poppler core API, + so it must link to it + + cpp/tests/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit a210440b05d14efc53224a10e8b3ac7d508043b5 +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 20 14:04:02 2010 +0100 + + [CMake] poppler-glib uses the freetype API, so it must explicitly + link to it + + glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f5d352666b92cee0390470d7b892ec8dcbf046a5 +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 20 14:03:19 2010 +0100 + + [CMake] pdftoabw uses the libxml2 API, so it must explicitly link + to it + + utils/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3fc2c4affe825f4aabcee161ec794338bd359403 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Mar 18 13:52:52 2010 +0100 + + [glib] Use g_slice_new/free instead of g_new/free to alloc/free + iterators + + glib/poppler-document.cc | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +commit 7bd6a8558646983669ce699f83d5ed42d7fce476 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Mar 18 13:34:03 2010 +0100 + + [glib] Move find_annot_movie_for_action() from page to action + + And remove _poppler_action_movie_set_movie(). + + glib/poppler-action.cc | 93 + ++++++++++++++++++++++++++++++++++++++++++++------ + glib/poppler-page.cc | 79 ------------------------------------------ + glib/poppler-private.h | 2 -- + 3 files changed, 82 insertions(+), 92 deletions(-) + +commit e5e3d310aa488638431dd85ac3383a12056674bf +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Mar 18 12:20:26 2010 +0100 + + Update copyright header + + poppler/Link.cc | 2 +- + poppler/Link.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit c76870178a031e437de3f9ed7baa64efb96955d6 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Mar 18 12:13:36 2010 +0100 + + [glib-demo] OCG State Actions demo + + glib/demo/utils.c | 64 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 64 insertions(+) + +commit 456e42f91dfbf73b71a5dbdde13d7ccdb5637d79 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Mar 18 12:12:51 2010 +0100 + + [glib] Add support for OCG State actions + + glib/poppler-action.cc | 125 + +++++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-action.h | 25 +++++++++- + glib/poppler.h | 1 + + 3 files changed, 150 insertions(+), 1 deletion(-) + +commit 4b109899e0732bbf65cacd875829e869e61eda48 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Mar 18 12:10:19 2010 +0100 + + [glib] Make get_layer_rbgroup() and get_layers() doc funcs public + for internal use + + glib/poppler-document.cc | 12 ++++++------ + glib/poppler-private.h | 3 +++ + 2 files changed, 9 insertions(+), 6 deletions(-) + +commit 38a55f6118debf994ce1fc41e987b0e3766047ba +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Mar 18 12:08:30 2010 +0100 + + Add support for Set-OCG-State actions + + Fixes bug #23522. + + poppler/Link.cc | 80 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Link.h | 31 ++++++++++++++++++++++ + 2 files changed, 111 insertions(+) + +commit bf398e53b0823d0a6272679858b67c5ffd704425 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 17 23:06:44 2010 +0100 + + [CMake] fix pkg-config executable variable name + + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit ab1a37666704d6b15c19b694ee191327847c23da +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 17 23:04:01 2010 +0100 + + [CMake] proper way of looking for pkg-config + + cmake/modules/FindGTK.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7f07a7dcea031f99a9a6d7c424184a2e69ee0062 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 17 22:58:08 2010 +0100 + + [CMake] update FindFontconfig.cmake with a more recent version + + ... present in KDE (as before) + + cmake/modules/FindFontconfig.cmake | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +commit beee143ffbdc699ab19f10a01e5747200ea1927a +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 17 18:36:32 2010 +0100 + + [CMake] set the LINK_INTERFACE_LIBRARIES for the poppler and + poppler-cpp libraries + + this should reduce the libraries linked by frontends and utility + applications + + CMakeLists.txt | 1 + + cpp/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+) + +commit 5ab791cb2a029edcde84b00a47165adfe4d98a98 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 17 16:39:38 2010 +0100 + + [CMake] small cleanups in FindGTK.cmake + + - update the header will all the stuff found and the variables set + - add my copyright for this year + - remove no more useful UsePkgConfig inclusion + + cmake/modules/FindGTK.cmake | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +commit fcbc76d82e3059c8288fbdc8da117ac9b38a70f2 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 17 16:36:41 2010 +0100 + + [CMake] switch gtk2 (gtk+, gdk-pixbuf, gthread, gio) search to use + the new pkg_check_modules() way + + cmake/modules/FindGTK.cmake | 27 ++------------------------- + 1 file changed, 2 insertions(+), 25 deletions(-) + +commit 5b8135e0899aa3578045eca40940a3495c48d895 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 17 16:27:40 2010 +0100 + + [CMake] link poppler-glib to the gdk2 libraries, if gdk2 was found + + glib/CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +commit 3dc4979d72048e81ae3b2d60dab11e791ac95696 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 17 16:26:04 2010 +0100 + + [CMake] switch gdk2 search to use the new pkg_check_modules() way + + cmake/modules/FindGTK.cmake | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +commit 0ef3d899cb8dea75c97ae1038cac5006f97bc0d2 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 17 16:05:07 2010 +0100 + + [CMake] switch glib2 search to use the new pkg_check_modules() way + + cmake/modules/FindGTK.cmake | 18 ++---------------- + 1 file changed, 2 insertions(+), 16 deletions(-) + +commit d2dc83cb8de481e44ea584eee77881978af920fa +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 17 15:56:16 2010 +0100 + + [CMake] rename GLIB_VERSION to GLIB_REQUIRED + + this way it matches autotools, and it is going to not conflict with + my next changes + + CMakeLists.txt | 4 ++-- + cmake/modules/FindGTK.cmake | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 34accfe27305cae18e09243ab2a607287b86fa47 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 17 13:55:09 2010 +0100 + + [CMake] set all the definitions for poppler-glib in a single place + + glib/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3d93daf50c61019ca70f42e7ccf33897800b262a +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 17 13:49:22 2010 +0100 + + [CMake] no need to check for BUILD_GTK_TESTS for single tests + + poppler_add_test(... BUILD_GTK_TESTS ...) takes care of that already + + glib/CMakeLists.txt | 4 ++-- + test/CMakeLists.txt | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 946a11345d01d39538d22114e50aa3e179059883 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 20:24:25 2010 +0100 + + [build] Update cmake files + + CMakeLists.txt | 2 ++ + glib/CMakeLists.txt | 4 ++++ + 2 files changed, 6 insertions(+) + +commit 922c0fe392ba439453edb5b2e88b74f0caa586b3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 20:08:23 2010 +0100 + + [glib-demo] Rendition actions demo + + glib/demo/utils.c | 112 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 112 insertions(+) + +commit 163b3f79d67543bc37b64875e30dcc9b7053e1d5 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 20:08:00 2010 +0100 + + [glib] Add support for rendition actions + + glib/poppler-action.cc | 22 ++++++++++++++++++++++ + glib/poppler-action.h | 14 +++++++++++++- + 2 files changed, 35 insertions(+), 1 deletion(-) + +commit d9b1e40751beddf48a8694b20bfcc4b4cb41060a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 20:06:45 2010 +0100 + + [glib] Add PopplerMedia representing a Rendition Media Clip + + glib/Makefile.am | 2 + + glib/poppler-media.cc | 302 + +++++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-media.h | 53 +++++++++ + glib/poppler-private.h | 2 + + glib/poppler.h | 2 + + 5 files changed, 361 insertions(+) + +commit 0224b81c4729a98a56b7a68054422ea655018d6a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 17:54:03 2010 +0100 + + [glib-demo] Add page number to annots demo + + glib/demo/annots.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 0153b892c63e4fccd0819150cf7b4213857a11c5 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 17:49:51 2010 +0100 + + [glib] Add poppler_annot_get_page_index() to get the page associated + to annot + + glib/poppler-annot.cc | 19 +++++++++++++++++++ + glib/poppler-annot.h | 1 + + 2 files changed, 20 insertions(+) + +commit b47337ea91696fea8f42a68a6fa160681ab284b2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 17:49:17 2010 +0100 + + [annots] Checks screen annots associated with a rendition action + have a valid page ref + + poppler/Annot.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 9417fd793ec8d806822669aa614193073e7dfe50 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 16:52:30 2010 +0100 + + [annots] Save page index of the page associated with the annot + + poppler/Annot.cc | 14 +++++--------- + poppler/Annot.h | 4 ++-- + 2 files changed, 7 insertions(+), 11 deletions(-) + +commit 36b76a5d01b74c6381433b6f6f7ffb9f02696a60 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 14:12:11 2010 +0100 + + Rework LinkRendition to follow the spec + + poppler/Link.cc | 68 + +++++++++++++++++++++++++++++++++++---------------------- + poppler/Link.h | 12 ++++++---- + 2 files changed, 50 insertions(+), 30 deletions(-) + +commit 7b5885ee7d2026df9a6e87327b6d02f37d79b8b2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 12:25:12 2010 +0100 + + [glib-demo] Annot screen demo + + glib/demo/annots.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit bdb76c7cb89bcb6fb139b0ef348d96b7780d57ed +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 12:24:19 2010 +0100 + + [glib] Add support for screen annotation + + Based on patch by Sam Kaplan. + + glib/poppler-annot.cc | 75 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-annot.h | 8 ++++++ + glib/poppler-page.cc | 3 ++ + glib/poppler-private.h | 1 + + glib/poppler.h | 1 + + 5 files changed, 88 insertions(+) + +commit 54892b1375e360113432b07c6ba058f861d21fe8 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 12:21:30 2010 +0100 + + [annots] Save the action already parsed in AnnotScreen + + poppler/Annot.cc | 9 +++++++-- + poppler/Annot.h | 5 +++-- + 2 files changed, 10 insertions(+), 4 deletions(-) + +commit 5a84a2d749478f19631dbfad2be06ec4ea85038c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 11:16:17 2010 +0100 + + [glib-demo] Annot and links movie demo + + glib/demo/annots.c | 20 ++++++++++ + glib/demo/utils.c | 115 + ++++++++++++++++++++++++++++++++++++++++++++++++++++- + glib/demo/utils.h | 3 ++ + 3 files changed, 137 insertions(+), 1 deletion(-) + +commit 2cf5ee4f62089df099f78cd4d39a4eb7589d1b47 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 11:04:17 2010 +0100 + + [glib] Add support for movie actions + + Based on patch by Hugo Mercier. + + glib/poppler-action.cc | 35 ++++++++++++++++++---- + glib/poppler-action.h | 15 ++++++++-- + glib/poppler-page.cc | 81 + +++++++++++++++++++++++++++++++++++++++++++++++++- + glib/poppler-private.h | 2 ++ + 4 files changed, 125 insertions(+), 8 deletions(-) + +commit 132b6f072fefd231d42f31626f1b5009c4e8319e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 10:56:23 2010 +0100 + + [glib] Add support for movie annotations + + Based on patch by Hugo Mercier. + + glib/poppler-annot.cc | 97 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-annot.h | 10 ++++++ + glib/poppler-page.cc | 3 ++ + glib/poppler-private.h | 1 + + glib/poppler.h | 1 + + 5 files changed, 112 insertions(+) + +commit aecad2bb12be44825d273e364ec6a0444dac5605 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 15 10:48:03 2010 +0100 + + [glib] Add PopplerMovie class + + glib/Makefile.am | 2 + + glib/poppler-movie.cc | 140 + +++++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-movie.h | 42 +++++++++++++++ + glib/poppler-private.h | 2 + + glib/poppler.h | 2 + + 5 files changed, 188 insertions(+) + +commit 5b3234a16e0d465bff2b5e277cb64b4f4b0a8dbd +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Mar 14 16:10:26 2010 +0100 + + Split Movie class into Rendition and Movie classes to follow the spec + + poppler/Annot.cc | 16 +- + poppler/Link.cc | 10 +- + poppler/Link.h | 6 +- + poppler/Makefile.am | 2 + + poppler/Movie.cc | 438 + +++++------------------------------------------ + poppler/Movie.h | 138 +++------------ + poppler/Rendition.cc | 400 + +++++++++++++++++++++++++++++++++++++++++++ + poppler/Rendition.h | 157 +++++++++++++++++ + qt4/src/poppler-movie.cc | 9 +- + 9 files changed, 657 insertions(+), 519 deletions(-) + +commit f9c163730478e3b6d8a1e73dbae6c52c28ae1e84 +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 8 14:49:12 2010 +0100 + + [Qt4] include Object.h and Annot.h, now needed + + qt4/src/poppler-movie.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit a00532f509c19c5455e0db5068db95dd4583e8dd +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 8 14:22:53 2010 +0100 + + Check for Null instead of None to know whether a dict entry is present + + Dict::lookup returns obj->initNull() when the key is not found. + + poppler/Movie.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit b51e66c9a7e2f7f39ae1edf8bda02a7bc1ad4ebd +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 8 14:15:22 2010 +0100 + + [annots] Create appearance stream for Movie Annotations when not + defined + + See bug #23108 + + poppler/Annot.cc | 103 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++- + poppler/Annot.h | 4 ++- + 2 files changed, 105 insertions(+), 2 deletions(-) + +commit fae59411852e5c2c45825c5ea963318f1ed5dc6a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 8 14:07:09 2010 +0100 + + Fix handling of poster in Movie + + Poster is not always a stream, it can be a boolean too. Also, get the + reference when available instead of fetching the stream. + + poppler/Movie.cc | 25 ++++++++++++------------- + poppler/Movie.h | 6 ++++-- + 2 files changed, 16 insertions(+), 15 deletions(-) + +commit a451f83d101bf265a1e7e2a17c0b320895e70f4e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Mar 7 12:22:57 2010 +0100 + + Save width, height (aspect) in Movie object and provide getAspect() + method + + poppler/Movie.cc | 3 ++- + poppler/Movie.h | 4 ++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit f88d469f860da17055fc4b98b64aef241fcf0185 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Mar 6 12:33:40 2010 +0100 + + Move Movie objects parsing code from Annot to Movie + + poppler/Annot.cc | 244 + ++------------------------------------------- + poppler/Annot.h | 73 +------------- + poppler/Link.cc | 4 +- + poppler/Movie.cc | 255 + +++++++++++++++++++++++++++++++++++++++-------- + poppler/Movie.h | 25 +++-- + qt4/src/poppler-movie.cc | 11 +- + 6 files changed, 246 insertions(+), 366 deletions(-) + +commit ec9138b574c7226ad733880d3d43b86bb72073f4 +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 23:17:50 2010 +0100 + + [autotools] add also cpp/tests/CMakeLists.txt to the "dist files" + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit ef3258d6fc57e7a62d951cc826804e50e8e1b526 +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 23:14:12 2010 +0100 + + [autotools] fix location of poppler-config.h.cmake + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fd1d9c882997ff35acd5a458e9dfeba3ad6c8b25 +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 22:42:06 2010 +0100 + + [CMake] just enable what needed each time + + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 476bde472a7e694afde96a04ea335fe9582d6fad +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 22:39:45 2010 +0100 + + [CMake] add small description for the zlib option + + taken from two bits in configure.ac + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1267d7e0c36e262984070a3b55fea46e7289a4b4 +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 19:34:03 2010 +0100 + + [CMake] add a note about gtk-doc not supported yet + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 201b18ad0837e84d874b56e1b0469d1b2d45378b +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 19:30:36 2010 +0100 + + [CMake] sync with poppler-config.h.in: add + WITH_FONTCONFIGURATION_{FONTCONFIG,WIN32} + + poppler/poppler-config.h.cmake | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 0d0044e8cc2d406f066338102ec73e1b56214cc3 +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 19:25:27 2010 +0100 + + [CMake] move poppler-config.h.cmake in the poppler subdirectory, + where poppler-config.h.in is + + CMakeLists.txt | 2 +- + poppler-config.h.cmake => poppler/poppler-config.h.cmake | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit f785e29a901d2c76204dd26e9585446fdd817ebd +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 18:35:34 2010 +0100 + + [CMake] remove the generated poppler-enums.{c,h} in the clean target + + ie usually when doing `make clean' + + glib/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 369604603375dbe3516136b6f8f9d0c26e0b744f +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 18:26:45 2010 +0100 + + [CMake] use the --template option of glib-mkenums (like done with + autotools) + + glib/CMakeLists.txt | 24 ++++-------------------- + 1 file changed, 4 insertions(+), 20 deletions(-) + +commit bbcbb34fec10c90edd5960bdbcc6849bc8f39526 +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 17:34:40 2010 +0100 + + [CMake] set POPPLER_GLIB_DISABLE_DEPRECATED and + POPPLER_GLIB_DISABLE_SINGLE_INCLUDES as done with autotools + + CMakeLists.txt | 6 ++++++ + glib/CMakeLists.txt | 6 +++++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 190fa971c12ca1b3007f6ba349a77a7c15c47490 +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 17:24:25 2010 +0100 + + reorder to match what's in the correspondent .in + + glib/poppler-features.h.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ff46def8b178420a86a974ec2ce767a538bba8be +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 17:23:16 2010 +0100 + + [CMake] GDK_FEATURE is no more needed here + + glib/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +commit 1eb8026a3060ef61a88c535177510f7ac7e7fc25 +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 17:19:58 2010 +0100 + + [CMake] set in one place whether to build the glib frontend + + CMakeLists.txt | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit a1a6f23e2345814e147a72211ce9139555385223 +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 17:09:58 2010 +0100 + + [CMake] correctly set the GLIB_REQ stuff + + CMakeLists.txt | 1 + + poppler-glib.pc.cmake | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 0f2e5d6925c5938281d9bafc297a43867c4a915b +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 17:03:21 2010 +0100 + + [CMake] move the minimum GLib version to the main CMakeLists.txt + + CMakeLists.txt | 1 + + cmake/modules/FindGTK.cmake | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit efdffba45d15b538dbfb294403e99f3a6470b4d9 +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 16:58:27 2010 +0100 + + [CMake] align the GDK stuff (GDK_{FEATURE,REQ}) to what done with + autotools + + CMakeLists.txt | 6 +++++- + poppler-glib.pc.cmake | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit cfecc69b7f05920f543ee7e9aafeafaa4c3506fb +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 16:49:14 2010 +0100 + + [CMake] apparently there's not a minimum version requirement for GDK, + so drop the check + + cmake/modules/FindGTK.cmake | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 8ff1cf03d2607b0f13bbbbf272f2b03d8927bd24 +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 16:47:21 2010 +0100 + + [CMake] first look for Cairo, then for GLib/GDK/GTK + + this starts to align to the searches done with autotools + also, move the CAIRO_FEATURE to the main CMakeLists.txt + + CMakeLists.txt | 19 +++++++++++-------- + glib/CMakeLists.txt | 1 - + 2 files changed, 11 insertions(+), 9 deletions(-) + +commit bcaf62b8e252594530d3050761ba563cf3b1fb6e +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 16:00:03 2010 +0100 + + [CMake] enhance/rewrite a bit the FindCairo module + + make use of some features of CMake 2.6 (as we require it): + - newer pkg-config handling (aka pkg_check_modules()) + - version checking for modules (PACKAGE_FIND_VERSION*) + - find_package_handle_standard_args() + also, after the pkg-config search to win32, search for cairo again + (double-check plus real search for win32) + furthermore, introduce CAIRO_INCLUDE_DIRS with the include paths + requires (kind of "obsoletes" CAIRO_CFLAGS, left there in case it + is used again) + + apply the changes to the rest of the build system (specify the + version needed, use the correct variable for includes) + + CMakeLists.txt | 2 +- + cmake/modules/FindCairo.cmake | 64 + +++++++++++++++++++++++++++---------------- + glib/CMakeLists.txt | 2 +- + 3 files changed, 43 insertions(+), 25 deletions(-) + +commit c96aa0f5fc74ae04f483485b787aaf65f1791991 +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 02:01:13 2010 +0100 + + add Patrick's copyright notices + + cpp/poppler-global.h | 1 + + goo/gtypes.h | 14 ++++++++++++++ + poppler/GlobalParams.cc | 1 + + poppler/SplashOutputDev.cc | 1 + + 4 files changed, 17 insertions(+) + +commit 3311bedd2eb831ef1fd553f3f50960331cf6885f +Author: Patrick Spendrin <ps_ml@gmx.de> +Date: Sun Mar 7 01:56:15 2010 +0100 + + MSVC: disable for the 'ustring' class the warning C4251 (which does + not apply) + + cpp/poppler-global.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 9efa18397bd05fbd27c7811fa6e0f34ce94012e0 +Author: Patrick Spendrin <ps_ml@gmx.de> +Date: Sun Mar 7 01:48:03 2010 +0100 + + MSVC: disable warning C4800, which is of no use for now + + goo/gtypes.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 3a88d1bf8d2c5a9e8014e0d46e24c9ec06556469 +Author: Patrick Spendrin <ps_ml@gmx.de> +Date: Sun Mar 7 01:26:10 2010 +0100 + + MSVC: no isfinite(), so provide it using _finite() + + poppler/SplashOutputDev.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 7774912c46f832f25c51b4cfc0e9430b1cd7fa1f +Author: Patrick Spendrin <ps_ml@gmx.de> +Date: Sun Mar 7 01:22:31 2010 +0100 + + MSVC: do not force constness here, so the right overload will + be chosen + + poppler/GlobalParams.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cf07a5d85b402b6956c9605fbdc88bddcb94a3cf +Author: Pino Toscano <pino@kde.org> +Date: Sun Mar 7 00:49:07 2010 +0100 + + [CMake] show end yes/no message about the GDK usage + + just like done with autotools + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 42c98f8eabe304d5e3dc8c1ebdd5b0b6c221e696 +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 6 17:18:08 2010 +0100 + + [CMake] make the font configuration backend selection take a string + (like with autotools) + + this way it is possible to set the cmake variable FONT_CONFIGURATION + to either "win32" (default on windows) or "fontconfig" (default + elsewhere) to the font backend to use + as a consequence, make fontconfig a requirement only if the font + backend chosen is "fontconfig" + + CMakeLists.txt | 39 +++++++++++++++++++++++++++++---------- + 1 file changed, 29 insertions(+), 10 deletions(-) + +commit bda6e7cd089f2970af2e9540b4415633ffcf0ebb +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 6 17:13:30 2010 +0100 + + [CMake] add a show_end_message() macro to show a generic string + as value + + make show_end_message_yesno() call it with the proper "yes" or + "no" string + + cmake/modules/PopplerMacros.cmake | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit d313c0f508711b3b7166b84608c43ebf1f07194b +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 6 17:08:59 2010 +0100 + + [CMake] rename the show_end_message() macro to + show_end_message_yesno() + + CMakeLists.txt | 26 +++++++++++++------------- + cmake/modules/PopplerMacros.cmake | 4 ++-- + 2 files changed, 15 insertions(+), 15 deletions(-) + +commit 0425ff835fa26df5e25e628a6c56f3a180713905 +Author: Pino Toscano <pino@kde.org> +Date: Fri Mar 5 22:21:56 2010 +0100 + + update copyright + + poppler/ArthurOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c5ea135ca58e112110be3ae10d887f3188172765 +Author: Pino Toscano <pino@kde.org> +Date: Fri Mar 5 22:14:57 2010 +0100 + + [arthur] update the miter limit + + poppler/ArthurOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 552f344b3e3df7c796afa6946149b0a5590cc4f7 +Author: Pino Toscano <pino@kde.org> +Date: Fri Mar 5 22:04:39 2010 +0100 + + [arthur] update the line dash style + + poppler/ArthurOutputDev.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit bc42ee05fceef0d0dd2ab0587c184dfc37cf29bf +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Mar 5 18:54:32 2010 +0000 + + fix copyright year + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b21461e91ed671ef29fd3cf4780fda44f82a0679 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Fri Mar 5 15:14:08 2010 +0100 + + [cairo] Close image stream before resetting it again + + poppler/CairoOutputDev.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 866bcc7edb47fe11355081045e2d316a4d530649 +Author: Pino Toscano <pino@kde.org> +Date: Thu Mar 4 14:19:50 2010 +0100 + + [Qt4] no need to save&restore on a newly created painter + + qt4/src/poppler-page.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 654698b556eb53eab7c2d55fc6b3fdd9e35173bb +Author: Pino Toscano <pino@kde.org> +Date: Thu Mar 4 13:16:11 2010 +0100 + + [Qt4] use Arthur unconditionally + + arthur is no more tied to splash, so can be used in an occasion + + qt4/src/poppler-document.cc | 2 +- + qt4/src/poppler-page.cc | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +commit 41931b6310d2ae81e622db904246f019ceb8410d +Author: Pino Toscano <pino@kde.org> +Date: Thu Mar 4 13:13:11 2010 +0100 + + [Qt4] compile Arthur unconditionally + + as the arthur output dev does not require splash anymore, we can + always compile it with poppler-qt4 + + poppler/Makefile.am | 4 ++-- + qt4/src/CMakeLists.txt | 6 +----- + qt4/src/Makefile.am | 6 +----- + 3 files changed, 4 insertions(+), 12 deletions(-) + +commit 48a29e2bbc9aa9bd0cb2775a2365c0ffdeb6ce87 +Author: Pino Toscano <pino@kde.org> +Date: Thu Mar 4 13:11:43 2010 +0100 + + [Arthur] make ArthurOutputDev compile even with Splash disabled + + text rendering is disabled in that case for now + + poppler/ArthurOutputDev.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 2013a19b6457753890affad8c4049f2ce4627df7 +Author: Pino Toscano <pino@kde.org> +Date: Thu Mar 4 13:02:43 2010 +0100 + + [CMake/tests] compile gtk-splash-test only if splash is enabled + + test/CMakeLists.txt | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +commit ae740c5cfefbae13f82b750e39fa3dbbdc94858b +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 2 23:22:06 2010 +0100 + + [cpp] update the copyrights + + cpp/poppler-document-private.h | 2 +- + cpp/poppler-document.cpp | 2 +- + cpp/poppler-embedded-file.cpp | 2 +- + cpp/poppler-embedded-file.h | 2 +- + cpp/poppler-global.cpp | 3 ++- + cpp/poppler-global.h | 2 +- + cpp/poppler-page.cpp | 2 +- + cpp/poppler-page.h | 2 +- + cpp/poppler-rectangle.h | 2 +- + cpp/poppler-toc.cpp | 2 +- + cpp/poppler-version.cpp | 2 +- + cpp/tests/poppler-dump.cpp | 2 +- + 12 files changed, 13 insertions(+), 12 deletions(-) + +commit 24b1d8d0b4ae7cea9fbc331f19cd5ce3917b8b4d +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 2 23:15:56 2010 +0100 + + [cpp] {from,to}_utf_8() -> {from,to}_utf8() + + cpp/poppler-global.cpp | 4 ++-- + cpp/poppler-global.h | 4 ++-- + cpp/poppler-page.cpp | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 690af1bc58de1ebe710c5e599f1cb635e4838fc8 +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Mar 2 16:33:04 2010 +0100 + + [cpp] define poppler_cpp_EXPORTS when building with autotools as well + + fixes building on Windows + + cpp/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit 7492a376e7e5ec35534276ac15485123645617b0 +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 2 22:16:07 2010 +0100 + + [cpp/tests] use gmtime() when gmtime_r() is not available + + cpp/tests/poppler-dump.cpp | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit de013cc14a0621782c53f481ed7e559f241855a3 +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 2 22:05:25 2010 +0100 + + [cpp] include config.h _after_ the other includes + + cpp/poppler-global.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 388e5d6aebcabbfc90894c86248159c63701cb0a +Author: Hib Eris <hib@hiberis.nl> +Date: Tue Mar 2 15:51:23 2010 +0100 + + Use ICONV_CONST when necessary + + cpp/poppler-global.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit aaa58b26733a2f7c778632da4942b588050cf33f +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 2 21:53:55 2010 +0100 + + [CMake] properly define ICONV_CONST + + CMakeLists.txt | 1 - + cmake/modules/FindIconv.cmake | 3 +++ + config.h.cmake | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) + +commit 6304b0d8959fccf96b030c757d78e845d04757e4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 28 15:33:53 2010 +0100 + + poppler 0.13.1 + + CMakeLists.txt | 2 +- + NEWS | 33 +++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + cpp/Doxyfile | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 37 insertions(+), 4 deletions(-) + +commit 9eac71862915c851c07075e3ca3af82eb9e4e775 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 28 15:33:19 2010 +0100 + + Make sure the private headers end up in the tarball on make dist + + cpp/Makefile.am | 5 +++++ + 1 file changed, 5 insertions(+) + +commit b488172311c2921ab4c365d71ad8b1ab7f596c71 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 28 14:25:36 2010 +0100 + + Add copyright notices + + poppler/CairoFontEngine.cc | 3 ++- + poppler/CairoFontEngine.h | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 5453cff5b7cb47cadfdae585a58409117af8c1f1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Feb 28 13:51:22 2010 +0100 + + [cairo] Select filter for images based on scale factor + + When rendering images and interpolate flag is disabled or missing, we + always interpolate unless scale factor is >= 400% + + See bugs #25268, #9860 + + poppler/CairoOutputDev.cc | 64 + ++++++++++++++++++++++++++++++++++------------- + poppler/CairoOutputDev.h | 2 ++ + 2 files changed, 49 insertions(+), 17 deletions(-) + +commit e65456cbd5cae2750426aabeb2d66a10537616f0 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Feb 28 13:13:13 2010 +0100 + + [cairo] Refactor scaled size computation into a new method + + poppler/CairoOutputDev.cc | 52 + +++++++++++++++++++++++------------------------ + poppler/CairoOutputDev.h | 2 ++ + 2 files changed, 28 insertions(+), 26 deletions(-) + +commit 32aa9ae7d0087298661829265de00e93398272b3 +Author: Jan Kümmel <jan+freedesktop@snorc.org> +Date: Sat Feb 27 17:58:46 2010 +0100 + + [cairo] Omit writing of embedded fonts into tempary files + + Fixes bug #26694. + + poppler/CairoFontEngine.cc | 146 + +++++++++++++++++++++++++-------------------- + 1 file changed, 80 insertions(+), 66 deletions(-) + +commit 7ba52a32343ca73730a80b64c136e3f03348e7d9 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 27 17:42:46 2010 +0100 + + [cairo] Remove unused 'face' from CairoFreeTypeFont class + + poppler/CairoFontEngine.cc | 6 ++---- + poppler/CairoFontEngine.h | 3 +-- + 2 files changed, 3 insertions(+), 6 deletions(-) + +commit 7c3140c88c00282e10888143fffe3c402d48fb05 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Feb 27 13:13:47 2010 +0100 + + Don't use '\' character in PostScript names + + poppler/PSOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 8e354a15a1861719c00799937ad9f9bb1bb71e9f +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Wed Feb 24 18:58:11 2010 +0000 + + Fix remaining part of 26243 + + Thomas says: The "gn" is colored with a shading pattern, but the + shading has a bbox, + so it is clipped to this bbox, too. But when coloring text or masks in + pattern colorspace, this is definely wrong. + + poppler/Gfx.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit fcbc571a98775b1daa8f562fc8674fb2d15b6626 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 23 17:02:47 2010 +0100 + + [cpp] make checksum() return an array of data, instead of a string + + a checksum is a sequence of values after all, so just return it as + such instead of pretending it is a string + accordingly adapt the mini dump application + + cpp/poppler-embedded-file.cpp | 10 ++++++++-- + cpp/poppler-embedded-file.h | 2 +- + cpp/tests/poppler-dump.cpp | 4 ++-- + 3 files changed, 11 insertions(+), 5 deletions(-) + +commit fbefb9bef9f7a099d51919255a98f412d1e1d696 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 23 16:56:47 2010 +0100 + + [cpp apidox] add API documentation for the 'embedded_file' class + + cpp/poppler-embedded-file.cpp | 43 + +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 43 insertions(+) + +commit 6d39cca0a035fc656d3b86ba66dedaccee532fcb +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 23 16:41:56 2010 +0100 + + [cpp apidox] add API documentation for the 'toc' and 'toc_item' + classes + + cpp/poppler-toc.cpp | 57 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 57 insertions(+) + +commit 857e4ceb26d959c48c7af6bff53ca1bfe5307236 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 23 15:39:58 2010 +0100 + + [cpp] when the loading of the document fails, put back the data + where it was before + + cpp/poppler-document-private.h | 2 +- + cpp/poppler-document.cpp | 10 +++++++--- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit 7838b182143086192ac8dcf571da0ce1743619e2 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 23 00:04:09 2010 +0100 + + [cpp] add the directory of the generated html apidox to the ignore + list + + cpp/.gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 71a38a23a9db5cac872c666283b7abcb1462210c +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 22 23:43:34 2010 +0100 + + [cpp] add page::text() to get the text inside a page region + + cpp/poppler-page.cpp | 16 ++++++++++++++++ + cpp/poppler-page.h | 1 + + 2 files changed, 17 insertions(+) + +commit 4c75360233bc67f097551980a46ecce976927220 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 22 23:05:53 2010 +0100 + + [cpp] add page::search() + + cpp/poppler-page.cpp | 51 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + cpp/poppler-page.h | 8 ++++++++ + 2 files changed, 59 insertions(+) + +commit 8932c53a084083eb42d109dd17bac3ad41ce65b5 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 22 22:39:36 2010 +0100 + + [cpp] add getters and setters for left/top/right/bottom + + cpp/poppler-rectangle.h | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +commit 8e1ea57f558fa3a1702a17d79b5aaffc486c6a56 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 22 22:19:51 2010 +0100 + + [cpp] add a global enum for case sensitivity + + cpp/poppler-global.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit ae41b087de8f0a7d525320dcf1d64ff22fe982b6 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 22 19:06:21 2010 +0100 + + [cpp apidox] doxygen configuration for poppler-cpp + + cpp/Doxyfile | 1551 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 1551 insertions(+) + +commit 1a36a7bcc684065478a3ade2c2938f0e3672140a +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 22 19:05:49 2010 +0100 + + [cpp apidox] very small start of intro page + + cpp/Mainpage.dox | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 85e052ab7a4c462143325ecf60eebba35411b790 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 22 18:53:20 2010 +0100 + + [cpp apidox] start adding API documentation for the global 'poppler' + namespace + + ... including the 'convert_date' function and faking the 'noncopyable' + class + + cpp/poppler-global.cpp | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit b01608f91fb6cf6e9c4fb6e6ee3cb57517a766bf +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 22 18:52:24 2010 +0100 + + [cpp apidox] exclude the 'detail' namespace from apidox extraction + + this includes also the 'noncopyable' typedef, but that will be + handled differently + + cpp/poppler-global.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit f17a7a8cfdeabb3ced3ba8d42c869d892c528e13 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 22 18:51:30 2010 +0100 + + [cpp apidox] add API documentation for the version functions + + cpp/poppler-version.cpp | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit f6c4bbddc7d04c0b1a6b25c41cbf6d81ae40cc0c +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 22 18:50:54 2010 +0100 + + [cpp apidox] start adding API documentation for 'document' + + cpp/poppler-document.cpp | 182 + +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 182 insertions(+) + +commit cbb7519904d9b6395d0128e16a79324e4b8bfcc0 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 22 13:15:11 2010 +0100 + + [CMake] no more need to build system check for the Cairo blend modes + + followup of 880890c14e99a954b365a3a6b59deeffa5304d30 for the cmake + build system + + cmake/modules/FindCairo.cmake | 18 ------------------ + config.h.cmake | 3 --- + 2 files changed, 21 deletions(-) + +commit 80f47bbf45faf751c661c1d0931e8e1da622b8ca +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Feb 22 12:43:06 2010 +0100 + + [cairo] Use cairo_surface_set_mime_data() when printing + + When rendering a jpeg image for printing, using + cairo_surface_set_mime_data() to attach the jpeg stream to the + surface reduces drastically the size of the output file. + + poppler/CairoOutputDev.cc | 42 ++++++++++++++++++++++++++++++++++++++++++ + poppler/CairoOutputDev.h | 1 + + 2 files changed, 43 insertions(+) + +commit d63293af6dbff65f160be0118b1580c03a1aab56 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Nov 27 09:52:23 2009 +0100 + + [cairo] Turn EXTEND_PAD off when printing + + poppler/CairoOutputDev.cc | 98 + ++++++++++++++++++++++++++++++++--------------- + 1 file changed, 67 insertions(+), 31 deletions(-) + +commit 880890c14e99a954b365a3a6b59deeffa5304d30 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Feb 22 11:01:05 2010 +0100 + + [cairo] Use CAIRO_VERSION macros to check whether blend modes are + available + + configure.ac | 24 ------------------------ + poppler/CairoOutputDev.cc | 4 ++-- + 2 files changed, 2 insertions(+), 26 deletions(-) + +commit 5c300ce00b5c59da767ca1ffec12f96f0ebbe701 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 21 21:20:10 2010 +0100 + + [Qt4/apidox] fix typo + + qt4/src/poppler-qt4.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3f89ccf871e2f4a14129ad3e986b8cd19cdf129c +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 21 21:06:31 2010 +0100 + + [CMake] set the CXXFLAGS in a better way + + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a18dab9e53a20a76eb46fa3a868fffdd3c754ce2 +Merge: fa098929 f3862f7d +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 21 19:56:38 2010 +0100 + + Merge remote branch 'origin/cpp-frontend' + + * origin/cpp-frontend: (34 commits) + [cpp/tests] poppler-dump: show a string for the font type + [cpp/tests] poppler-dump: show the orientation of the pages + [cpp/tests] poppler-dump: a bit less output in permissions lines + [cpp/tests] poppler-dump: add --show-all to show all the information + [cpp] use iconv for the utf8 <-> utf16 conversions + [cpp] add the build system stuff for iconv, mandatory for cpp + [cpp] fixup unicode GooString <-> ustring conversions + [cpp] fix installation of poppler-version.h with autotools and + builddir != srcdir + simplify + [cpp/tests] add a simple poppler-dump test + [cpp] use the correct index (instead of an uninitialized variable) + [cpp] properly delete the children of a toc item + [cpp] actually implement toc::root() + [cpp] fix the reference to the vector data + [cpp] fix the reference to the vector data + [cpp] add destructor for 'rectangle' + [cpp] add out stream operators for rect and rectf + [cpp] add namespace to namespace functiond to link properly + [cpp] add default empty parameters for the passwords of the document + loading functions + [cpp] add "human friendly" output representation for byte_array + ... + + Conflicts: + config.h.cmake + +commit fa0989297e95b6adebed71336ea206d1b279ab24 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 21 16:59:57 2010 +0000 + + Detect the need for nanosleep in solaris + + Fixes bug 26650 + + ConfigureChecks.cmake | 5 +++++ + test/CMakeLists.txt | 17 +++++++++++------ + 2 files changed, 16 insertions(+), 6 deletions(-) + +commit d074485aa9d9fac6b715382002f53e3303bbc519 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 20 10:08:33 2010 +0000 + + Do not call getPixel if we know how to access the data + + Gives a 20% speed increase in some pdf + + splash/Splash.cc | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit d4cafe357bd86feb4b56e5dfbf5b7822e237a2ee +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 20 10:07:20 2010 +0000 + + Only call getPixel when really needed + + Gives a 8% speed increase in some pdf + + splash/Splash.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit c3122cfbe090f3a4045269222f941cd5ce77c171 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 20 10:04:37 2010 +0000 + + Move test code to the header to it can be inlined + + Gives a 10% speed increase in some documents + + splash/SplashClip.cc | 40 ++++++++++++++-------------------------- + splash/SplashClip.h | 43 +++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 55 insertions(+), 28 deletions(-) + +commit d987fb9b77e6da454eb898cc6c8baaf747b7ac4f +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Feb 19 23:59:03 2010 +0000 + + implement writeImgFile for splashModeXBGR8 + + splash/SplashBitmap.cc | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +commit f9425c0b5b112ac673d0499f79a743afce719593 +Author: Hib Eris <hib@hiberis.nl> +Date: Fri Feb 19 20:18:13 2010 +0000 + + use pkgconfig to detect libpng on autotools too + + configure.ac | 12 ++++--- + goo/Makefile.am | 7 +++- + m4/libpng.m4 | 99 + ----------------------------------------------------- + poppler/Makefile.am | 3 ++ + 4 files changed, 17 insertions(+), 104 deletions(-) + +commit 0cb07d645527f25997f5e1b104a6be92441d8ffa +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Feb 18 23:27:20 2010 +0000 + + Only swap w with h if rotation is 90 or 270 + + utils/pdftoppm.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 35015ed11090d67cab69443e607d4d80ca03c619 +Author: Nils Höglund <nils.hoglund@gmail.com> +Date: Thu Feb 18 23:14:51 2010 +0000 + + Match the number of calls to beginMarkedContent and endMarkedContent + + poppler/Gfx.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit ee265760e6ecec93fe26fb8e02848872555daefd +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Feb 18 23:13:48 2010 +0000 + + make sure properties exists before using it + + poppler/TextOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit eab7a55815c06525c7aeba254b66498ab147a958 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Feb 17 21:54:31 2010 +0000 + + if malloc failed return false + + splash/SplashFTFont.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit e2def20a45c1d8307fd62fabb9769121af975abf +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 16 23:31:05 2010 +0000 + + Only assume the OC is not visible if it exists and is set to no + + Fixes bug 26532 and a small line that was not drawn in 15899 + + poppler/OptionalContent.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5edd175bdd0f7c2fc3aecb72384de4cb0788fc4e +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 16 20:57:22 2010 +0000 + + Add and fix copyright years + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0f0fba1b04589061449f98b9dcd8a0c4e7ad2d74 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 16 22:00:51 2010 +0100 + + make the descriptions specify they refer to the Splash backend + + config.h.cmake | 4 ++-- + configure.ac | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 39b4699020b5cfa1a10e5ef00f0e355e27b21c9f +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 16 21:56:30 2010 +0100 + + [CMake] reflect that poppler-glib needs cairo now + + poppler-glib.pc.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5c66c775bcd686c61ea136bcd8f261fb631c5e71 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 16 20:52:15 2010 +0000 + + We don't need to pass anything to FontConfig + + Makes it much easier to manage and also fixes bug 26544 + + poppler/GlobalParams.cc | 11 +++-------- + poppler/GlobalParams.h | 6 +----- + 2 files changed, 4 insertions(+), 13 deletions(-) + +commit 582b5259b3c65ee1bef99dbdfccf00f37269b76f +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 16 16:36:24 2010 +0100 + + [CMake] find the system threads, and define in the config.h if we + have pthreads + + CMakeLists.txt | 4 ++++ + config.h.cmake | 3 +++ + 2 files changed, 7 insertions(+) + +commit 1dff9d440556a155fb5ca7bed15fc6a1f77a1c97 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 16 16:10:44 2010 +0100 + + [CMake] add the HAVE_LIBOPENJPEG and HAVE_OPENJPEG_H defines, to + match autotools' ones + + CMakeLists.txt | 1 + + config.h.cmake | 6 ++++++ + 2 files changed, 7 insertions(+) + +commit 4a0bcaa83e6e6533cd48c63449a08467d51c13ea +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 16 16:01:53 2010 +0100 + + [CMake] config.h.cmake: change some comments to match autotools' ones + + config.h.cmake | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 9e38082c3e571d035f0152d65661e5dd97fdd5d8 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 16 15:58:30 2010 +0100 + + [CMake] add the Win32-specific ENABLE_RELOCATABLE option, matching + autotools' one + + CMakeLists.txt | 5 +++++ + config.h.cmake | 3 +++ + 2 files changed, 8 insertions(+) + +commit eb03020893ed591c18817d75d427a1296cb1f233 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 16 15:49:50 2010 +0100 + + [CMake] config.h.cmake: move POPPLER_WITH_GDK in the same place of + autotools' generated one, and with the same comment + + config.h.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit ba65b3af047b758094b999b2939065c5127508dd +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Feb 10 23:08:04 2010 +0000 + + Wrap #include <jpeglib.h> in extern "C" to fix build + + Fixes bug 26351 + + goo/JpegWriter.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit d3d2a3ee0a3505f44d1196823716b768d434ba73 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 10 23:16:27 2010 +0100 + + [CMake] fix typo: "MULTITHREAD" -> "MULTITHREADED" + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0dae2294cf8a2f312d8e6504be4e1be516b34b1b +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Tue Feb 9 21:44:07 2010 +0000 + + Fix regression in painting. Fixes bug 26243 + + poppler/Gfx.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit aa9c3acbc73bafb33c8a797701ed0488a4a74263 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jan 28 17:23:18 2010 +0100 + + [cairo] Add clipToStrokePath() method + + It's unimplemented, it just contains a log message to help when + debugging. + + poppler/CairoOutputDev.cc | 4 ++++ + poppler/CairoOutputDev.h | 1 + + 2 files changed, 5 insertions(+) + +commit 41a450c8db45fd064798d15c3d8fe5ab536a7b30 +Author: David Benjamin <davidben@mit.edu> +Date: Fri Jan 22 00:26:59 2010 -0500 + + [cairo] Avoid leaving pointers to free'd memory + + Fixes potential free'd memory access introduced by + 3a94e8ce90c0a4d11c5c5aa8805c167c8a0434e5. I don't think this is + actually + possible in the current code; we push/pop before and after rendering a + PDF, so the bottom state should never have a mask. + + Still, better to clean this up. + + poppler/CairoOutputDev.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 309228404710debee4337cc53c641dfef64ad86c +Author: David Benjamin <davidben@mit.edu> +Date: Wed Jan 27 22:41:16 2010 +0000 + + Allow commands to abort the current stream + + In many instances, the sensible response (and what acroread does) in + case of an error is abort the PDF stream. To avoid changing the return + value of every function and using C++ exceptions, we communicate via a + commandAborted variable. + + This patch, matching acroread's behavior aborts the current stream + when + there are too few arguments or we pop too many times. Implementation + note 39 in Appendix H of the PDF reference contradicts the former, but + hand-crafted test PDFs as well as the file in #24575 suggest + otherwise. + + Unlike all the other attempts, this patch actually fixes the PDF in + bug #24575. + + poppler/Gfx.cc | 11 +++++++++++ + poppler/Gfx.h | 1 + + 2 files changed, 12 insertions(+) + +commit 8284008aa8230a92ba08d547864353d3290e9bf9 +Author: David Benjamin <davidben@mit.edu> +Date: Wed Jan 27 22:40:33 2010 +0000 + + Add a stack of stateGuards to Gfx + + While a stack of states is a good way to maintain graphics contexts, + if + the command stream you are interpreting is untrusted, we must place + appropriate guards to be sure that, not only do we not pop past + the end + of the stack, but we do not pop past the stack as it was when we began + rendering. + + poppler/Gfx.cc | 30 +++++++++++++++++++++++++++++- + poppler/Gfx.h | 11 +++++++++++ + 2 files changed, 40 insertions(+), 1 deletion(-) + +commit 4ae84c830f842d100cbb702b32970951a5a5769f +Author: David Benjamin <davidben@mit.edu> +Date: Wed Jan 27 22:39:20 2010 +0000 + + Maintain the height of the stack in Gfx + + Introduces a new variable Gfx::stackHeight that maintains up-to-date + information about the current height of the stack. + + poppler/Gfx.cc | 4 ++++ + poppler/Gfx.h | 1 + + 2 files changed, 5 insertions(+) + +commit 120fe6ef673c648ae7b19ad2a7e9aef22ee25810 +Author: David Benjamin <davidben@mit.edu> +Date: Wed Jan 27 22:38:43 2010 +0000 + + Do not use objects just after deleting them + + The error condition in GfxCIDFont::GfxCIDFont references cMapName and + collection, so they should not be deleted yet. + + poppler/GfxFont.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 3375fa96c7a7dbbb98f5a7b3df9e840a5f30bc80 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 27 22:32:29 2010 +0000 + + GooVector rewrite, old version had "unknown" origins/license + + goo/GooVector.h | 237 + +++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 141 insertions(+), 96 deletions(-) + +commit a945fe64e16ac9aa2577c5db05fc7f3fd4955b7b +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jan 27 16:15:40 2010 +0100 + + [cairo] Fix downscaling images when document is rotated + + Fixes bug #26264. + + poppler/CairoOutputDev.cc | 37 +++++++++++++++++++++++++++++++++++-- + 1 file changed, 35 insertions(+), 2 deletions(-) + +commit 428cc965c17f167ea00540beeaeaac5c3e426686 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 26 21:01:32 2010 +0000 + + Add POPPLER_WITH_GDK in cmake build system + + Bug 26247 + + glib/CMakeLists.txt | 1 + + glib/poppler-features.h.cmake | 1 + + 2 files changed, 2 insertions(+) + +commit 0af1ae75fd4c8031343f668bed5d8ca6588ee652 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jan 26 20:49:17 2010 +0100 + + [cairo] Use the right matrix for the mask in drawMaskedImage() + + Fixes bug #16906. + + poppler/CairoOutputDev.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit d8ceaff39f5b80624b6bdc703c2a180dfc3d73ee +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jan 26 11:57:06 2010 +0100 + + [cairo] Add some more LOG messages + + poppler/CairoOutputDev.cc | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +commit 778e764b3cb77526260c3c8b46acf19ad06fc61d +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jan 25 22:40:20 2010 +0000 + + poppler 0.13.0 + + CMakeLists.txt | 4 +-- + NEWS | 99 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 5 files changed, 104 insertions(+), 5 deletions(-) + +commit 1b5333f2685b8ab85bb1f5b899332c5a0ac99a3d +Author: Pino Toscano <pino@kde.org> +Date: Mon Jan 25 02:19:00 2010 +0100 + + [CMake] allow multiple targets with the same name + + this is needed for building the unit tests later without explicitly + having + enabling them at configure time (thus compile them on-demand) + for this, set the cmake policy 0003 as OLD (allow), and consecuently + 0011 for + setting the former from an include()d script + + cmake/modules/PopplerDefaults.cmake | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 92e1f46866c063c370ef1d6324f6a6c01aed6680 +Author: Pino Toscano <pino@kde.org> +Date: Mon Jan 25 02:15:27 2010 +0100 + + [CMake] do not add the fake buildtests target for the MSVC IDE + + cmake/modules/PopplerMacros.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit dea5aa37de079196fa916b1db9af782cf25045f9 +Author: Maciej Mrozowski <reavertm@gmail.com> +Date: Mon Jan 25 00:51:20 2010 +0000 + + Install some more goo files + + CMakeLists.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 671a971c45a1e8ce8f6daade82117a9a137034d6 +Author: Maciej Mrozowski <reavertm@gmail.com> +Date: Mon Jan 25 00:48:31 2010 +0000 + + do not install a private header + + qt4/src/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 54c86e53a143a8f9d196e4bef2a733c6f00f6026 +Author: Maciej Mrozowski <reavertm@gmail.com> +Date: Mon Jan 25 00:33:07 2010 +0000 + + Only build tests if told to + + test/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit eb082274694aadb80dd16caea65d7f0a1adf8b46 +Author: Maciej Mrozowski <reavertm@gmail.com> +Date: Mon Jan 25 00:29:55 2010 +0000 + + Only build demos and test if told so. Install poppler-layer.h + + glib/CMakeLists.txt | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 73fcc310cd7d6ef435b453485c1c99a33f77212a +Author: Maciej Mrozowski <reavertm@gmail.com> +Date: Mon Jan 25 00:29:09 2010 +0000 + + install man pages + + utils/CMakeLists.txt | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 8672217af4cf88d5506572c2b40fbb0d1d0dbd87 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jan 25 00:11:50 2010 +0000 + + Make the poppler object cache params be a ref + + And make sure what we was is a ref, otherwise we abort + + poppler/Gfx.cc | 14 ++++++++------ + poppler/PopplerCache.cc | 12 ++++++------ + poppler/PopplerCache.h | 6 +++--- + 3 files changed, 17 insertions(+), 15 deletions(-) + +commit 9567fd8d3d905897d0abacd77885102ae86ba8a9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 24 20:15:49 2010 +0000 + + ImgWriter is a header too + + goo/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 735e8a690d0bd3ab4bec90bdad975d19ac3d4689 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 24 19:51:19 2010 +0000 + + noone maintains this either + + msvc/config.h | 62 ---------------------------------- + msvc/poppler/poppler-config.h | 77 + ------------------------------------------- + 2 files changed, 139 deletions(-) + +commit d485564f0dc86f62b996380bfbd570cf3f543e4f +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 24 19:22:33 2010 +0000 + + remove files noone maintains + + README.windows | 63 ------------------------ + makefile.vc | 150 + --------------------------------------------------------- + 2 files changed, 213 deletions(-) + +commit 38467f2738c88f060ae1d30332e34da743a888a5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 24 19:18:44 2010 +0000 + + only compile glib frontend if cairo is found + + CMakeLists.txt | 4 ++-- + glib/CMakeLists.txt | 25 +++++++------------------ + 2 files changed, 9 insertions(+), 20 deletions(-) + +commit cf045acf46307d51fb6d9959451b53681e6cac03 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 24 19:01:52 2010 +0000 + + compile + + glib/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 0397cf4f193015286464ae70ab202ed400110e30 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 24 19:00:09 2010 +0000 + + Add and fix copyright years + + poppler/CairoFontEngine.cc | 1 + + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 2 +- + poppler/Gfx.cc | 2 +- + poppler/Gfx.h | 2 +- + poppler/PopplerCache.cc | 1 + + poppler/PopplerCache.h | 1 + + 7 files changed, 7 insertions(+), 4 deletions(-) + +commit 9c9f18b6ceea546dfb21ef0aab29ba99733dcb52 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jan 24 19:27:29 2010 +0100 + + [glib-demo] Remove #ifdef HAVE_CAIRO macros from several demos + + glib/demo/images.c | 2 -- + glib/demo/layers.c | 71 + +++--------------------------------------------------- + glib/demo/render.c | 29 ++++------------------ + 3 files changed, 9 insertions(+), 93 deletions(-) + +commit 4e938c1f81add2162ced0e97b24fe588f15f178d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jan 24 19:15:06 2010 +0100 + + [glib] Make glib frontend unconditionally use cairo output device + + Splash support has been removed. + + configure.ac | 74 ++++++++------- + glib/Makefile.am | 20 +--- + glib/poppler-document.cc | 9 -- + glib/poppler-page.cc | 237 + +--------------------------------------------- + glib/poppler-page.h | 7 -- + glib/poppler-private.h | 14 --- + glib/poppler.cc | 6 -- + glib/test-poppler-glib.cc | 6 +- + poppler-glib.pc.in | 2 +- + 9 files changed, 51 insertions(+), 324 deletions(-) + +commit 59ff9d66fc3b0c9612b1c12fc1ae4dbb8dc85b39 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jan 24 17:57:48 2010 +0100 + + Use a small object cache in GfxResources to cache GState objects + + It drastically improves performance with some documents like page + 742 of + PDF32000_2008.pdf + + poppler/Gfx.cc | 19 +++++++++++++++++-- + poppler/Gfx.h | 2 ++ + 2 files changed, 19 insertions(+), 2 deletions(-) + +commit 880a4a9a60a10f7aa7d3dc7c2802b31b7ef01e06 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jan 24 17:56:35 2010 +0100 + + Add a generic cache to store objects by its reference + + poppler/PopplerCache.cc | 60 + +++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/PopplerCache.h | 16 +++++++++++++ + 2 files changed, 76 insertions(+) + +commit 5ad492df75c0c2394719e85db4c8b43f15b52110 +Author: mpsuzuki <mpsuzuki@hiroshima-u.ac.jp> +Date: Sun Jan 24 13:34:41 2010 +0100 + + [cairo] Fix memory leak + + poppler/CairoFontEngine.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3160464b4b70c714c36234320878acab81b866cc +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Nov 26 13:17:19 2009 +0100 + + [cairo] Use our own implementation to scale down images instead + of cairo + + This is a workaround for the low quality downscaling of pixman. + Rescaler implementation is a box filter that supports non-integer box + sizes written by Jeff Muizelaar. + Fixes bug #5589. + + poppler/CairoOutputDev.cc | 89 ++++++++++++ + poppler/CairoOutputDev.h | 1 + + poppler/CairoRescaleBox.cc | 352 + +++++++++++++++++++++++++++++++++++++++++++++ + poppler/CairoRescaleBox.h | 12 ++ + poppler/Makefile.am | 4 +- + 5 files changed, 457 insertions(+), 1 deletion(-) + +commit 6825a219f0bc0ac6fd469fb8a6ebb86df774375f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jan 23 11:24:15 2010 +0100 + + [glib] Use TextOutputDev to get TextPage when we haven't rendered + the page + + glib/poppler-page.cc | 27 ++++++++++++++++++--------- + 1 file changed, 18 insertions(+), 9 deletions(-) + +commit 6c61a457e9a8ec10945bc1e0700c8e4d121faa58 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 20 21:59:05 2010 +0000 + + Fix GfxRadialShading::GfxRadialShading + + Fixes crash in KDE bug 223359 + + poppler/GfxState.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 442894d371879a6bf2adb5a39b9dd0a49e76e4ac +Author: Pino Toscano <pino@kde.org> +Date: Fri Jan 15 21:28:42 2010 +0100 + + [glib-demo/cmake] compile print.c + + followup of b64d4bd46b052feb0b143f1348773afbd93e5e33 + + glib/demo/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit b64d4bd46b052feb0b143f1348773afbd93e5e33 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Nov 27 11:47:22 2009 +0100 + + [glib-demo] Add print demo + + glib/demo/Makefile.am | 2 + + glib/demo/main.c | 4 +- + glib/demo/print.c | 135 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/demo/print.h | 31 ++++++++++++ + 4 files changed, 171 insertions(+), 1 deletion(-) + +commit ba2c746f358a5785d8cbaaf03d8628ee3754c388 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Nov 27 09:52:50 2009 +0100 + + [glib-demo] Add render for printing option to render demo + + glib/demo/render.c | 47 ++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 38 insertions(+), 9 deletions(-) + +commit 9a478008ccb61641f09bd77eaa55033cca266c43 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jan 15 12:03:11 2010 +0100 + + Add FONTCONFIGURATION macros to poppler-config.h + + They are used in a header file (GlobalParams.h). It fixes a crash + when opening any document. + + poppler/poppler-config.h.in | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 1f80f874d8e132411816302465f04bc59d404d89 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 14 08:43:11 2010 +0000 + + Fix Uncover and Fade to return correct values + + Bug 26034 + + poppler/PageTransition.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 350ff407e06a961f2a5b9d203cb8e78ce09313a0 +Author: Hib Eris <hib@hiberis.nl> +Date: Wed Jan 13 22:20:41 2010 +0000 + + Make poppler (optionally) relocatable on Windows + + configure.ac | 26 ++++++++++++++++++++++ + poppler/GlobalParams.cc | 57 + +++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 83 insertions(+) + +commit 36b67b002db802bfad553720e2114b76b07bb614 +Author: Hib Eris <hib@hiberis.nl> +Date: Wed Jan 13 22:17:03 2010 +0000 + + Make fontconfig optional with mingw compiler + + CMakeLists.txt | 8 +++++++- + config.h.cmake | 6 ++++++ + configure.ac | 39 ++++++++++++++++++++++++++++++++++++++- + makefile.vc | 2 +- + poppler/GlobalParams.cc | 10 +++++++--- + poppler/GlobalParams.h | 7 ++++--- + poppler/GlobalParamsWin.cc | 5 +++++ + 7 files changed, 68 insertions(+), 9 deletions(-) + +commit 9c0b20ab8c104c2f5398a5a3b8409ca554f5fa39 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 12 22:55:06 2010 +0000 + + Add the possibility of using float for splash variables instead + of double + + Based on a patch by Marius Vollmer marius.vollmer@nokia.com + See bug 25578 for more info + + CMakeLists.txt | 7 ++++++- + config.h.cmake | 5 ++++- + configure.ac | 10 +++++++++- + splash/SplashMath.h | 14 ++++++++++++-- + splash/SplashTypes.h | 4 +++- + 5 files changed, 34 insertions(+), 6 deletions(-) + +commit 30e5f76e372114339fa1d37c335e6bbade8b6d8a +Author: Pino Toscano <pino@kde.org> +Date: Thu Jan 7 11:18:36 2010 +0100 + + [CMake] followup recent glib/gtk+ version requirements + + - glib to 2.18, see ce9404b1999f81b3f9e5a89bcd6e715463f89024 + - gtk+ to 2.14, see e338643f2cebb1203f7ff0646f87b3dea8318757 + + cmake/modules/FindGTK.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit e338643f2cebb1203f7ff0646f87b3dea8318757 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jan 7 11:08:31 2010 +0100 + + [tests] Bump GTK+ requirements to 2.14 + + Fixes bug #22090. + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ce9404b1999f81b3f9e5a89bcd6e715463f89024 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jan 7 11:06:19 2010 +0100 + + Bump glib requirements to 2.18 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 526c8871cbdfbc119e013ee96887a79f65403790 +Author: Hib Eris <hib@hiberis.nl> +Date: Thu Dec 31 17:52:33 2009 +0100 + + [glib] Use PDFDoc(wchar_t *, ...) on Windows + + Fixes bug #25032 + + glib/poppler-document.cc | 22 +++++++++++++++++++--- + 1 file changed, 19 insertions(+), 3 deletions(-) + +commit e0c8188136958b853269179079efefdd3488dc22 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jan 4 18:36:01 2010 +0000 + + Require Qt 4.4 + + This updates the requirement to real requirement + + CMakeLists.txt | 2 +- + configure.ac | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit f9accdb878b23ebd2152dd05d61cfcc71d46cd03 +Author: Pino Toscano <pino@kde.org> +Date: Mon Jan 4 14:13:13 2010 +0100 + + [Qt4/tests] use getPdfVersion() instead of the deprecated pdfVersion() + + qt4/tests/stress-poppler-dir.cpp | 3 ++- + qt4/tests/stress-poppler-qt4.cpp | 3 ++- + qt4/tests/test-password-qt4.cpp | 4 +++- + qt4/tests/test-poppler-qt4.cpp | 4 +++- + 4 files changed, 10 insertions(+), 4 deletions(-) + +commit 898e939d8c0ac74cc7ee3f5d42d83083ed31036e +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Jan 2 02:33:58 2010 +0100 + + Make pdftoppm embed correct resolution in PNG and JPEG files + + goo/ImgWriter.h | 3 ++- + goo/JpegWriter.cc | 6 +++++- + goo/JpegWriter.h | 3 ++- + goo/PNGWriter.cc | 6 +++++- + goo/PNGWriter.h | 3 ++- + splash/SplashBitmap.cc | 9 +++++---- + splash/SplashBitmap.h | 5 +++-- + utils/HtmlOutputDev.cc | 4 +++- + utils/pdftoppm.cc | 9 +++++---- + 9 files changed, 32 insertions(+), 16 deletions(-) + +commit df569dc2fb89d7e0780bbf7a687ce2464ff5cb43 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Jan 2 01:19:50 2010 +0100 + + enable AM_SILENT_RULES by default + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f3862f7d987aae52a1fd2bb0af27d1cd803a5b84 +Author: Pino Toscano <pino@kde.org> +Date: Thu Dec 31 00:20:11 2009 +0100 + + [cpp/tests] poppler-dump: show a string for the font type + + cpp/tests/poppler-dump.cpp | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +commit 9c343c821593ebae51ac47b58ad007a82f198652 +Author: Pino Toscano <pino@kde.org> +Date: Thu Dec 31 00:13:09 2009 +0100 + + [cpp/tests] poppler-dump: show the orientation of the pages + + cpp/tests/poppler-dump.cpp | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +commit bc91fe3824f37cd17a38aac85c817e8ada1b2f43 +Author: Pino Toscano <pino@kde.org> +Date: Wed Dec 30 23:53:31 2009 +0100 + + [cpp/tests] poppler-dump: a bit less output in permissions lines + + cpp/tests/poppler-dump.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1199de8f097a78edb831313841ac0ed3f9ec9905 +Author: Pino Toscano <pino@kde.org> +Date: Wed Dec 30 23:50:36 2009 +0100 + + [cpp/tests] poppler-dump: add --show-all to show all the information + + cpp/tests/poppler-dump.cpp | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 9522f830b59942adfc91d5f03c274415a4737ccc +Author: Pino Toscano <pino@kde.org> +Date: Wed Dec 30 23:38:40 2009 +0100 + + [cpp] use iconv for the utf8 <-> utf16 conversions + + cpp/poppler-global.cpp | 92 + +++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 64 insertions(+), 28 deletions(-) + +commit b156b4031f5daf658f40db8efa2a3016d95b98b5 +Author: Pino Toscano <pino@kde.org> +Date: Wed Dec 30 23:24:23 2009 +0100 + + [cpp] add the build system stuff for iconv, mandatory for cpp + + CMakeLists.txt | 6 ++ + Makefile.am | 1 + + cmake/modules/FindIconv.cmake | 57 +++++++++++++ + config.h.cmake | 6 ++ + configure.ac | 6 ++ + cpp/CMakeLists.txt | 2 +- + cpp/Makefile.am | 3 +- + m4/iconv.m4 | 180 + ++++++++++++++++++++++++++++++++++++++++++ + 8 files changed, 259 insertions(+), 2 deletions(-) + +commit a0cffb8b69e0595a2afe15ecc4928e0df1eeb063 +Author: Pino Toscano <pino@kde.org> +Date: Wed Dec 30 18:57:09 2009 +0100 + + [cpp] fixup unicode GooString <-> ustring conversions + + better make them use the "hand-made" code, it is more correct for them + + cpp/poppler-private.cpp | 44 +++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 41 insertions(+), 3 deletions(-) + +commit 3b6e3605209d5db453725b9ce4e6e54679d9c5da +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 27 15:30:22 2009 +0100 + + Do not crop the transformation matrix at an arbitrary value + + Fixes bug 25763 and gave no regression on my test suite + + poppler/GfxState.cc | 21 --------------------- + poppler/SplashOutputDev.cc | 15 +++++++++++++++ + 2 files changed, 15 insertions(+), 21 deletions(-) + +commit ea44c60645001ffea7d297f8549aaa4f5ce5e16c +Author: Ilya Gorenbein <igorenbein@finjan.com> +Date: Sun Dec 27 15:27:00 2009 +0100 + + Try to work on streams without Length + + We have code that finds the Length if it's wrong so let that code + do its job + instead of returning a NULL stream + + poppler/Parser.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 283dd326a00c804b6332ee3ca1aaa0d86377b3f3 +Author: Pino Toscano <pino@kde.org> +Date: Sat Dec 19 12:50:10 2009 +0100 + + [cpp] fix installation of poppler-version.h with autotools and + builddir != srcdir + + cpp/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit df0ccddb7f784b4a8564beda51b3047cb9e3611a +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 18 20:23:48 2009 +0000 + + move the retrieval of the bitmap after rendering the page as it can + change on render time + + utils/pdftoppm.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit ab88a02f7efefc950a316d7a5edf88dad8f3e4d0 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Dec 17 18:24:20 2009 +0100 + + [annots] QuadPoints is required in Text Markup annotations + + Show an error message and mark annotation as invalid when it's + missing. + + poppler/Annot.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 39dc99431b3ea9e00f6f645dd7169c0319571dc9 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Dec 17 18:17:20 2009 +0100 + + [annots] Create appearance stream for Sound Annotations when not + defined + + See bug #23108. + + poppler/Annot.cc | 112 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 2 + + 2 files changed, 114 insertions(+) + +commit e4f5a78a853b88b1586ef59fc8893a321ea23736 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Dec 17 17:39:39 2009 +0100 + + [annots] Add Tag and Graph icons for File Attachment annotations + + See bug #23108. + + poppler/Annot.cc | 70 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 70 insertions(+) + +commit 752b14857cfb0669fd6d7dfef2ea73c13a2369fc +Author: Pino Toscano <pino@kde.org> +Date: Thu Dec 17 17:16:01 2009 +0100 + + simplify + + cpp/poppler-toc.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a26e4b7903fabc667d7d16c23ca2c7a535dd05fa +Author: Pino Toscano <pino@kde.org> +Date: Thu Dec 17 17:09:35 2009 +0100 + + [cpp/tests] add a simple poppler-dump test + + this small test executable can dump various features of the document, + like the general info, permissions, metadata, toc, fonts, + embedded files, pages, etc + + also add the necessary autotools+cmake machinery to compile it + + configure.ac | 1 + + cpp/CMakeLists.txt | 2 + + cpp/Makefile.am | 1 + + cpp/tests/.gitignore | 1 + + cpp/tests/CMakeLists.txt | 24 ++++ + cpp/tests/Makefile.am | 17 +++ + cpp/tests/poppler-dump.cpp | 293 + +++++++++++++++++++++++++++++++++++++++++++++ + 7 files changed, 339 insertions(+) + +commit 86c871cc625d00b8ee7f93dc8c0f9ef8462bba5a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Dec 17 17:05:45 2009 +0100 + + [annots] Create appearance stream for Text Markup Annotations when + not defined + + Highlight annotations are an exception, we always ignore the + appearance stream to use our own, since for most of the documents the + appearance stream provided by the annotation is not enough. That's why + it's currently broken. This is what acroread does indeed and Leonard + Rosenthol recommended us to do the same. + See bug #23108. + + poppler/Annot.cc | 199 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 2 + + 2 files changed, 201 insertions(+) + +commit 904ecd929c6acbbad6d782b950c53c0a80e1f39c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Dec 17 12:49:20 2009 +0100 + + [annots] Fix memory leaks + + poppler/Annot.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit ef7954b86f9b1a762c4f77a48d5f42f8db4bbed7 +Author: Pino Toscano <pino@kde.org> +Date: Tue Dec 15 02:20:18 2009 +0100 + + [cpp] use the correct index (instead of an uninitialized variable) + + cpp/poppler-page.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2547b5e53e7799cf7299838ae9bd882c21a228ae +Author: Pino Toscano <pino@kde.org> +Date: Tue Dec 15 02:14:57 2009 +0100 + + [cpp] properly delete the children of a toc item + + cpp/poppler-toc.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit 771bd3594740fe16bd030dbe73928a8b1d4d113f +Author: Pino Toscano <pino@kde.org> +Date: Tue Dec 15 02:04:24 2009 +0100 + + [cpp] actually implement toc::root() + + cpp/poppler-toc.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +commit ca1d2ec4588b2437b58b4448ae2fc5ebd0f130d3 +Author: Pino Toscano <pino@kde.org> +Date: Tue Dec 15 00:54:29 2009 +0100 + + [cpp] fix the reference to the vector data + + cpp/poppler-global.cpp | 2 +- + cpp/poppler-private.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 16c946e7658b0e9cff701ce1d6bbf7d3828cbe08 +Author: Pino Toscano <pino@kde.org> +Date: Tue Dec 15 00:35:25 2009 +0100 + + [cpp] fix the reference to the vector data + + cpp/poppler-document.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9bb90c99b65e0e9d9b65c7dbeb5b4d66377ceb21 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 23:43:12 2009 +0100 + + [cpp] add destructor for 'rectangle' + + cpp/poppler-rectangle.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 61ccdc9ab3b816174896fcae0899ff34f11eee80 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 23:40:51 2009 +0100 + + [cpp] add out stream operators for rect and rectf + + cpp/CMakeLists.txt | 1 + + cpp/Makefile.am | 1 + + cpp/poppler-rectangle.cpp | 35 +++++++++++++++++++++++++++++++++++ + cpp/poppler-rectangle.h | 5 +++++ + 4 files changed, 42 insertions(+) + +commit 69dd51fed3de41f8b799b811ae5ee59c0d5f59c2 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 22:24:07 2009 +0100 + + [cpp] add namespace to namespace functiond to link properly + + cpp/poppler-global.cpp | 4 ++-- + cpp/poppler-version.cpp | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit 3923fa4890984d8616d86016f4f4a94e8ef3e992 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 22:23:15 2009 +0100 + + [cpp] add default empty parameters for the passwords of the document + loading functions + + cpp/poppler-document.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 1d23cc677e9b0a9f61c53e0ea365537f33abe5bf +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 21:44:56 2009 +0100 + + [cpp] add "human friendly" output representation for byte_array + + cpp/poppler-global.cpp | 23 +++++++++++++++++++++++ + cpp/poppler-global.h | 3 +++ + 2 files changed, 26 insertions(+) + +commit 82954ea5f8ba880276328765f104690a05adbd9e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Dec 7 12:05:54 2009 +0100 + + [annot] Create appearance stream for Attachment Annotations when + not defined + + See bug #23108. + + poppler/Annot.cc | 94 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 2 ++ + 2 files changed, 96 insertions(+) + +commit c6195472326c183fcfd8a3e9da1ee7f6fa8b7c3d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Dec 6 17:09:23 2009 +0100 + + [annots] Use opacity when drawing Markup Annotations + + According to the spec: + + "The constant opacity value that shall be used in painting the + annotation. This value shall apply to all visible elements of the + annotation in its closed state (including its background and border) + but + not to the pop-up window that appears when the annotation is opened. + + The specified value shall not used if the annotation has an appearance + stream in that case, the appearance stream shall specify any + transparency. + + If no explicit appearance stream is defined for the annotation, it may + be painted by implementation-dependent means that do not necessarily + conform to the PDF imaging model; in this case, the effect of + this entry + is implementation-dependent as well." + + poppler/Annot.cc | 21 +++++++++++++++------ + poppler/Gfx.cc | 9 ++++++++- + poppler/Gfx.h | 2 +- + 3 files changed, 24 insertions(+), 8 deletions(-) + +commit a337c1d757d52c1c238229d2f0cd3a41694b0e08 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 16:18:22 2009 +0100 + + [cpp] add document metadata reading + + cpp/poppler-document.cpp | 9 +++++++++ + cpp/poppler-document.h | 1 + + 2 files changed, 10 insertions(+) + +commit 6c4fa513e60dbdd5ab693434f239d82d95756994 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Dec 6 16:56:22 2009 +0100 + + [annot] Create appearance stream for Geometry Annotations when + not defined + + See bug #23108. + + poppler/Annot.cc | 120 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 2 + + 2 files changed, 122 insertions(+) + +commit eed94b8bd2855dce1fd39b835e3280cbd0ccd1cf +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Dec 6 16:51:37 2009 +0100 + + [annot] Create appearance stream for Line Annotations when not defined + + See bug #23108. + + poppler/Annot.cc | 62 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 2 ++ + 2 files changed, 64 insertions(+) + +commit 1c7a5f5e89c4c51e31b6de345d4862ef8dcc2bc0 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Dec 6 16:40:14 2009 +0100 + + [annot] Create appearance stream for Text Annotations when not defined + + Streams have been created by using the svg icons created by mac_v and + ulisse. See bug #23108. + + poppler/Annot.cc | 305 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 2 + + 2 files changed, 307 insertions(+) + +commit c9cb6353ad5279d09615eb2c944b2b053cdf5ccc +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 15:52:25 2009 +0100 + + [cpp] add function to query for document "permissions" + + cpp/poppler-document.cpp | 23 +++++++++++++++++++++++ + cpp/poppler-document.h | 1 + + cpp/poppler-global.h | 4 ++++ + 3 files changed, 28 insertions(+) + +commit 30e90c7c1b41c62ddc21905e7ccdea4c95547e80 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 15:33:36 2009 +0100 + + [cpp] add is_encrypted and is_linearized for document + + cpp/poppler-document.cpp | 10 ++++++++++ + cpp/poppler-document.h | 2 ++ + 2 files changed, 12 insertions(+) + +commit 93fd588c519958a1f66231c111ea8a6b0a759be1 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 13:19:24 2009 +0100 + + [cpp] add the possibility to load a document from raw data + + cpp/poppler-document-private.h | 5 +++++ + cpp/poppler-document.cpp | 35 ++++++++++++++++++++++++++++++++++- + cpp/poppler-document.h | 3 +++ + 3 files changed, 42 insertions(+), 1 deletion(-) + +commit 53996365b159cf84adf2cac56c76b8bda8dfb12e +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 12:57:41 2009 +0100 + + [cpp] use the byte_array typedef + + cpp/poppler-embedded-file.cpp | 6 +++--- + cpp/poppler-embedded-file.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit e4969c1aaed4a8eb770d8b54920f2476129bbcb7 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Dec 6 16:19:36 2009 +0100 + + [annots] Refactor Annot::setColor to receive an AnnotColor + + Removes duplicated code since color arrays are already parsed in + AnnotColor + + poppler/Annot.cc | 136 + +++++++++++++++++++++++++++++-------------------------- + poppler/Annot.h | 4 +- + 2 files changed, 73 insertions(+), 67 deletions(-) + +commit cfb4f5dfabf31de22d68aa0d5796cb7a33d8b462 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 11:06:36 2009 +0100 + + [cpp] add a byte_array typedef, and use it for utf8 string data + + cpp/poppler-global.cpp | 12 +++--------- + cpp/poppler-global.h | 5 ++++- + cpp/poppler-private.cpp | 5 ++--- + 3 files changed, 9 insertions(+), 13 deletions(-) + +commit 2d13ac31671b2007e44a90f45a82cb3adfa9c80c +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 02:30:06 2009 +0100 + + update ignore files + + .gitignore | 1 + + cpp/.gitignore | 1 + + 2 files changed, 2 insertions(+) + +commit 01e902e40ca15acf0319e37d39a271d6875bfce9 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 02:02:47 2009 +0100 + + [cpp] add a version header+functions + + this way, it is possible to get (either at build time and at runtime) + the version of the current poppler-cpp library + + poppler-config.h is generated by the build system (autotools or cmake) + with the correct version information + + configure.ac | 2 ++ + cpp/CMakeLists.txt | 5 +++++ + cpp/Makefile.am | 6 ++++-- + cpp/poppler-version.cpp | 41 +++++++++++++++++++++++++++++++++++++++++ + cpp/poppler-version.h.in | 39 +++++++++++++++++++++++++++++++++++++++ + 5 files changed, 91 insertions(+), 2 deletions(-) + +commit b3f5e5d60bc9109da961940f6216722f9db4a87b +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 00:56:15 2009 +0100 + + [CMake] add the configure check for the Cairo blend modes support + (as in autotools) + + cmake/modules/FindCairo.cmake | 18 ++++++++++++++++++ + config.h.cmake | 3 +++ + 2 files changed, 21 insertions(+) + +commit f6ba877e0c22538cfe34d32d69814f660de59d2c +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 00:44:55 2009 +0100 + + [CMake] add configure check for sys/mman.h (as in autotools) + + ConfigureChecks.cmake | 1 + + config.h.cmake | 3 +++ + 2 files changed, 4 insertions(+) + +commit e12801320ae030628fc62c073983c06b39ee13d7 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 00:42:20 2009 +0100 + + minor spello + + config.h.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6428907ebcf33d4391673aadcfa71c3061f6d352 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 00:41:49 2009 +0100 + + [CMake] add configure check for fcntl.h (as in autotools) + + ConfigureChecks.cmake | 1 + + config.h.cmake | 3 +++ + 2 files changed, 4 insertions(+) + +commit 916ab7163249e23bd5ba00922fdcad9caaf92c75 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 00:34:59 2009 +0100 + + [CMake] oops, those should have been '#cmakedefine' and not '#define' + + config.h.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ea655d8c7e24e97ee710110a783ed9c209cf76e3 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 00:33:51 2009 +0100 + + [CMake] move and rename to match more the autotools output + + config.h.cmake | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +commit 9f0146c5b2f9326e834104b89791f66b18f85adc +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 14 00:28:04 2009 +0100 + + [CMake] add checks for gmtime_r and localtime_r + + ConfigureChecks.cmake | 2 ++ + config.h.cmake | 6 ++++++ + 2 files changed, 8 insertions(+) + +commit 9d0cf201e96044dd679c26bea6255d986a6cd246 +Author: Pino Toscano <pino@kde.org> +Date: Sun Dec 13 23:45:39 2009 +0100 + + [cpp] add ignore file + + cpp/.gitignore | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit d783e92b863d8b22de6ca326328115fec63193ed +Author: Pino Toscano <pino@kde.org> +Date: Sun Dec 13 23:42:33 2009 +0100 + + [cpp] don't forget the cmake stuff when packing with the autotools + + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit 0105caefe860e7a45fc7d3a1bd1162fe56bcfe6a +Author: Pino Toscano <pino@kde.org> +Date: Sun Dec 13 23:40:55 2009 +0100 + + [cpp] add the pkg-config stuff + + CMakeLists.txt | 3 +++ + Makefile.am | 7 +++++-- + configure.ac | 3 ++- + poppler-cpp.pc.cmake | 9 +++++++++ + poppler-cpp.pc.in | 9 +++++++++ + 5 files changed, 28 insertions(+), 3 deletions(-) + +commit d5a74f78df0dca24fd537b30424fd2ebb3efe3e2 +Author: Pino Toscano <pino@kde.org> +Date: Sun Dec 13 23:35:06 2009 +0100 + + [cpp] add the (rest of the) CMake build system for it + + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 0e41f937946e4e4c1b660406bd74e4afe8825b5f +Author: Pino Toscano <pino@kde.org> +Date: Sun Dec 13 23:31:46 2009 +0100 + + [cpp] add the autotools buildsystem for it + + Makefile.am | 6 +++++- + configure.ac | 15 +++++++++++++++ + cpp/Makefile.am | 32 ++++++++++++++++++++++++++++++++ + 3 files changed, 52 insertions(+), 1 deletion(-) + +commit 9727fdc0c682742335e44ddc2f32d60e4c59983a +Author: Pino Toscano <pino@kde.org> +Date: Sun Dec 13 22:55:28 2009 +0100 + + Start of a pure C++ frontend for Poppler. + + This initial version (called 'poppler-cpp') includes preliminary + support for: + - document (loading from file name, some query methods, unlocking, + font listing, embedded files) + - page (some query methods) with page transitions + - TOC + + Modelled a bit on the Qt4 API, it provides also an own "ustring" + typedef representing UTF-16 strings, + with methods to convert back/to UTF-8 and Latin 1. + + Most probably it has bugs, but nevertheless worth testing and + developing. + + cpp/CMakeLists.txt | 34 ++++ + cpp/poppler-document-private.h | 55 +++++++ + cpp/poppler-document.cpp | 316 + ++++++++++++++++++++++++++++++++++++ + cpp/poppler-document.h | 92 +++++++++++ + cpp/poppler-embedded-file-private.h | 40 +++++ + cpp/poppler-embedded-file.cpp | 116 +++++++++++++ + cpp/poppler-embedded-file.h | 55 +++++++ + cpp/poppler-font.cpp | 166 +++++++++++++++++++ + cpp/poppler-font.h | 91 +++++++++++ + cpp/poppler-global.cpp | 162 ++++++++++++++++++ + cpp/poppler-global.h | 86 ++++++++++ + cpp/poppler-page-private.h | 44 +++++ + cpp/poppler-page-transition.cpp | 95 +++++++++++ + cpp/poppler-page-transition.h | 82 ++++++++++ + cpp/poppler-page.cpp | 121 ++++++++++++++ + cpp/poppler-page.h | 62 +++++++ + cpp/poppler-private.cpp | 70 ++++++++ + cpp/poppler-private.h | 66 ++++++++ + cpp/poppler-rectangle.h | 60 +++++++ + cpp/poppler-toc-private.h | 62 +++++++ + cpp/poppler-toc.cpp | 136 ++++++++++++++++ + cpp/poppler-toc.h | 74 +++++++++ + 22 files changed, 2085 insertions(+) + +commit 62854051f4e47028147cc93a5faac39e2fa2c9fd +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Dec 12 17:22:08 2009 +0100 + + Initialize profileCommands in Gfx constructor + + poppler/Gfx.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 4e6af25a028d16608111634c5467420e31fa399b +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Dec 9 19:45:40 2009 +0100 + + [cairo] Update font of TextPage in CairoOutputDev::updateAll() + + Fixes a crash with some documents, see Evince bug + https://bugzilla.gnome.org/show_bug.cgi?id=603934 + + poppler/CairoOutputDev.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 6798d3e52e36e91bceff3a1a96372e9d9c6f3813 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Dec 6 15:34:36 2009 +0100 + + Use fixed size array in AnnotColor + + glib/poppler-annot.cc | 2 +- + poppler/Annot.cc | 24 +++++------------------- + poppler/Annot.h | 5 ++--- + poppler/Gfx.cc | 2 +- + qt4/src/poppler-annotation.cc | 2 +- + 5 files changed, 10 insertions(+), 25 deletions(-) + +commit 92fab93bee3748a73c09429cc8a105c16f21fed0 +Author: Axel Struebing <axel.struebing@freenet.de> +Date: Sat Dec 5 22:31:29 2009 +0000 + + Add a empty space after null + + Fixes bug 25465 + + poppler/PDFDoc.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 32103f45d0193b31e95269ea9123b8011d93e994 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Dec 5 10:14:18 2009 +0100 + + [annots] Add isVisible() to check whether annot is visible before + drawing it + + It takes into account annot flags and optional content. + + poppler/Annot.cc | 29 ++++++++++++++--------------- + poppler/Annot.h | 1 + + 2 files changed, 15 insertions(+), 15 deletions(-) + +commit c14dfc7102341f5e1ed67a05c0738d55befab1ec +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Dec 5 10:07:46 2009 +0100 + + [annots] Do not check if annot is a link in Annot::draw() + + AnnotLink already implements draw() + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ddf85d4a51f605eed998c633857b8bb5c74ab590 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 4 14:59:41 2009 +0100 + + Make the code a bit more resilient + + By checking the GooString we are going to use really exists + + poppler/PSOutputDev.cc | 24 ++++++++++++++++-------- + 1 file changed, 16 insertions(+), 8 deletions(-) + +commit 78b4afa0a44048b8d40438d400652dbae4cb99b1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 4 14:57:10 2009 +0100 + + Accept Fontname if FontName is not present + + Fixes KDE bug 217013 + + poppler/GfxFont.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit fee5cb0eec2ddb8d596289e9a6285cf04d97632e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Dec 4 13:26:42 2009 +0100 + + [annots] Remove redundant flags definition + + poppler/Annot.cc | 22 +++++++++------------- + 1 file changed, 9 insertions(+), 13 deletions(-) + +commit 3a94e8ce90c0a4d11c5c5aa8805c167c8a0434e5 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Nov 27 15:23:11 2009 +0100 + + [cairo] Revert commit 77c2e154c2cb57300116ecd4295f1e67b06b411f + + And fix bug #24575 jut by checking pointer is not null before + using it. + + poppler/CairoOutputDev.cc | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +commit a093b768e64d477ebdd5f6b519d80a6c45706e7e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 22 20:23:49 2009 +0100 + + Add copyrights + + poppler/CairoFontEngine.cc | 2 +- + poppler/CairoOutputDev.cc | 4 ++-- + poppler/CairoOutputDev.h | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit 77c2e154c2cb57300116ecd4295f1e67b06b411f +Author: David Benjamin <davidben@mit.edu> +Date: Sun Nov 22 20:19:29 2009 +0100 + + Do not crash on malformed files + + bug 24575 + + poppler/CairoOutputDev.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 1d0cb9b2cfd4d4d9aa9b0ad83ad6408544263a09 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Nov 22 19:59:34 2009 +0100 + + [cairo] Initialize fill_color and stroke_color + + poppler/CairoOutputDev.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 32de2ac62fb87570e1a59152f37b86e571a01180 +Author: Ilya Gorenbein <igorenbein@finjan.com> +Date: Sun Nov 22 19:51:54 2009 +0100 + + Improve the reconstruction of the XRef + + Makes load a file Ilya can't share + + poppler/XRef.cc | 165 + ++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 95 insertions(+), 70 deletions(-) + +commit 039c6dffbfbed46a11e207048a3247d6921d6b02 +Author: Ilya Gorenbein <igorenbein@finjan.com> +Date: Sun Nov 22 15:14:20 2009 +0100 + + Correctly initialize fileName + + poppler/Link.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit b905caf1785ee207cc0480953da69be302d3d4e9 +Author: David Benjamin <davidben@mit.edu> +Date: Sat Nov 21 02:43:21 2009 +0100 + + Be more lenient with /Decode key on images + + The spec requires the field be [1 0] or [0 1]. Adobe accepts + floating point + values as well. This fixes bug #17439. + + poppler/Gfx.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit d99e7a88845a5f4b35e2c538c597316b2ad541ca +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Nov 20 22:09:44 2009 +0100 + + Check for openjpeg in the C++ part as it uses bool in the header + + Bug 25103 + + configure.ac | 61 + ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 30 insertions(+), 31 deletions(-) + +commit 55261a2dc86241c8d132e590e76e7398b3ca5090 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 18 22:26:01 2009 +0100 + + replace floor with a cast to int for numbers > 0 + + bug-poppler13487.pdf gets a 15% faster rendering + + splash/SplashMath.h | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) + +commit 28df9fb323f14dc632c9502655abf69984b7d67e +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 18 21:57:02 2009 +0100 + + Remove unused label + + poppler/Catalog.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 037979a01a6fcafc61360e758dbc4a5eb056825e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Nov 17 19:12:30 2009 +0100 + + [cairo] If there's a soft mask available when filling, apply the + mask instead of filling + + Fixes bug #8474. + + poppler/CairoOutputDev.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 46380d36f004d71dd2c2e7bc82836af248684b51 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Nov 17 20:48:22 2009 +0100 + + i didn't want to commit this + + configure.ac | 60 + +++++++++++++++++++++++++++-------------------------- + splash/SplashMath.h | 5 ++--- + utils/pdftoppm.cc | 8 ------- + 3 files changed, 33 insertions(+), 40 deletions(-) + +commit 1844e0927ae89824f59b2b3378bf5e00a51a251c +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Nov 17 20:34:24 2009 +0100 + + do not use setAttribute with doubles + + it is evil and locale dependant, we do NOT want that so use + QString::number + + configure.ac | 60 +++++++++++++++---------------- + qt4/src/poppler-annotation.cc | 82 + +++++++++++++++++++++---------------------- + splash/SplashMath.h | 5 +-- + utils/pdftoppm.cc | 8 +++++ + 4 files changed, 81 insertions(+), 74 deletions(-) + +commit 572d79f4b8a7bf1717b88dbd2609d8fa9b036dee +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 15 20:40:56 2009 +0100 + + Only calculate the matrix when it is really needed + + That only happens when outputting to 1 bit images + Speeds out rendering on some pdf up to 40% + + splash/SplashScreen.cc | 35 +++++++++++++++++++++++++++++++++-- + splash/SplashScreen.h | 16 ++++++++++++++++ + 2 files changed, 49 insertions(+), 2 deletions(-) + +commit 1c3113361fa376093e6fedfbf48feee7dcbc46b7 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sun Nov 15 19:43:18 2009 +0100 + + Write out fixed-content portion of Type 1 fonts in PSOutputDev + + If /Length3 of a Type 1 FontFile is > 0 the fixed-content from the + FontFile should be used instead of adding the generic 512 zeros and + cleartomark. + + poppler/PSOutputDev.cc | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit 2d30dc605cd984f6c32124af9aa7b877d416d141 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Nov 15 17:31:36 2009 +0100 + + [glib-demo] Show attachment name in FileAttachment annot properties + table + + glib/demo/annots.c | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 6c8ae140256818401351a331787c83e043fdba09 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Nov 15 17:31:13 2009 +0100 + + [glib] Add poppler_annot_file_attachment_get_name() + + glib/poppler-annot.cc | 36 +++++++++++++++++++++++++++++------- + glib/poppler-annot.h | 1 + + 2 files changed, 30 insertions(+), 7 deletions(-) + +commit ecf5173eb288187a1f076fd4b116f1212fa9e203 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Nov 15 17:14:29 2009 +0100 + + [glib-demo] Add properties of FileAttachment annotations + + glib/demo/annots.c | 67 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 67 insertions(+) + +commit 8f4fdd864d79e4fa83951a3eb006ea8287c3a1ba +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Nov 15 17:12:43 2009 +0100 + + [glib-demo] Add pgd_table_add_property_with_custom_widget() + + To be able to add properties to a table that are not labels + + glib/demo/utils.c | 31 +++++++++++++++++++++---------- + glib/demo/utils.h | 30 +++++++++++++++++------------- + 2 files changed, 38 insertions(+), 23 deletions(-) + +commit 061b85f7a442107cda67e385bd772ec8565a936e +Author: Thomas Viehmann <tv@beamnet.de> +Date: Sun Nov 15 17:11:43 2009 +0100 + + [glib] Add support for file attachment annotations + + glib/poppler-annot.cc | 69 + +++++++++++++++++++++++++++++++++++++++++++++++--- + glib/poppler-annot.h | 8 ++++++ + glib/poppler-page.cc | 3 +++ + glib/poppler-private.h | 1 + + glib/poppler.h | 49 +++++++++++++++++------------------ + 5 files changed, 102 insertions(+), 28 deletions(-) + +commit 189c45332991bce51e40bcaf65da67d2d644045a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Nov 15 16:42:21 2009 +0100 + + [glib] Remove PopplerDocument from PopplerAttachment + + Since we are duplicating the stream we don't need to hold a + reference of + PopplerDocument anymore. + + glib/poppler-attachment.cc | 13 +------------ + glib/poppler-document.cc | 2 +- + glib/poppler-private.h | 3 +-- + 3 files changed, 3 insertions(+), 15 deletions(-) + +commit e55bfeb1ddc60053c5ee5fef840c409891781ce6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Nov 13 00:55:37 2009 +0100 + + jpeg_start_decompress can fail, check it + + Fixes KDE bug #214317 + + poppler/DCTStream.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit c59d93061cf71d13916872a20aed37ecfbb3bfa4 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Nov 9 18:32:55 2009 +0100 + + [cairo] Do nothing when image mask is 1x1 and the pixel is 0 + + poppler/CairoOutputDev.cc | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 448f03cfc429d33bfa5527e3dc964ef5da10ee94 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Mon Nov 9 22:52:39 2009 +1030 + + Don't render the color white in type 3 glyphs in the cairo backend + + PDF allows the "g" operator in Type 3 charprocs but cairo user fonts + will render any stroke or fill in the font color. + + As the only PDFs I've seen with "g" in the charprocs are only using + the gray values 0 or 1, a workaround is to disable strokes and fills + of the charproc when the gray level is > 0.5. + + poppler/CairoOutputDev.cc | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 3fead2a3b53681ef95116f18f17f1a9febec6e48 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Nov 9 11:25:24 2009 +0100 + + Transitions dictionary can be a Ref too + + poppler/Page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ac4955d03a532cab1933698aeb667d44300e52d0 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Nov 9 11:12:48 2009 +0100 + + [glib-demo] Explicitely add gio as dependency for GTK+ tests + + configure.ac | 4 ++-- + glib/demo/main.c | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 32ea667ec8f18311539123c7b80c7ab4767070cb +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Tue Aug 11 19:17:52 2009 +0100 + + [cairo] Mark images dirty + + After directly manipulating the pixel values we need to mark the + surface + as dirty. This means that cairo will refresh any caches it may + have taken + of the surface will the new data. + + poppler/CairoOutputDev.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 10a41150c4067bb3ab85e25dae76e0968a6cd586 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Tue Aug 11 19:17:06 2009 +0100 + + [cairo] Use colToDbl() to avoid rounding error. + + poppler/CairoOutputDev.cc | 37 +++++++++++++++++++------------------ + 1 file changed, 19 insertions(+), 18 deletions(-) + +commit c9491319689f04edd57adda7ee85f84f17fd1c47 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Tue Aug 11 18:07:17 2009 +0100 + + [cairo] Reduce the number of redundant pattern creations + + poppler/CairoOutputDev.cc | 84 + ++++++++++++++++++++++++++++------------------- + 1 file changed, 51 insertions(+), 33 deletions(-) + +commit ead78d9f703c8b2d556c94be3c47dbae7469eda8 +Author: Reece Dunn <msclrhd@gmail.com> +Date: Thu Nov 5 22:25:14 2009 +0100 + + fontpos is never set to -1, so remove the checks in HtmlOutputDev. + + utils/HtmlOutputDev.cc | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +commit 55dd6024a4672a1787e8b1a8276bd78fff94e2cd +Author: Ilya Gorenbein <igorenbein@finjan.com> +Date: Wed Nov 4 22:07:18 2009 +0100 + + Do not error on files without "Count" and "Kids" + + It is not spec compliant not to have those fields but Adobe Reader and + FoxIt seems to allow it so try to behave like them. See bug 24720 + to see why one would want such file + + poppler/Catalog.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 58a1d42aed7352c008d201b8f355f6e4146f71e5 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Oct 29 18:38:22 2009 +0100 + + [cairo] Don't render patterns when using CairoImageOutputDev + + poppler/CairoOutputDev.h | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 7670cc48dcf3ffd77e3ffa29056a3e13b2926709 +Author: Ilya Gorenbein <igorenbein@finjan.com> +Date: Wed Oct 28 19:20:41 2009 +0100 + + There are some pdf where Aspect values are reals, use getNum + + Fixes bug 24733 + + poppler/Annot.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 4fe89e520a04a6ab6d6ec6a8294896b2f427c7da +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 25 21:55:55 2009 +0100 + + do not accept negative interval lengths in the page labels tree + + See bug 24721 + + poppler/PageLabelInfo.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit b174ebd6b323c7a58a19d59c1a9e4ac4e6cba7d9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 23 21:57:42 2009 +0200 + + Move the iccColorSpaceCache from a static in GfxState to a member + of Gfx + + Fixes the problem that the keys are per document but we had a static + that lived as much as the library. Now the cache only lives the + rendering + of a page so it's a bit slower but at least it's correct. Fixes + bug 24686 + + poppler/Gfx.cc | 49 ++++++++++++++++++---------- + poppler/Gfx.h | 13 ++++++-- + poppler/GfxState.cc | 94 + ++++++++++++++++++++++++++--------------------------- + poppler/GfxState.h | 33 +++++++++---------- + poppler/Page.cc | 4 +-- + 5 files changed, 107 insertions(+), 86 deletions(-) + +commit 4a9bdd30dc353865685e03eb1c1ac6093797695a +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Oct 22 21:26:29 2009 +0200 + + initialize len at 0 when reading the font fails + + See bug 24525 for more info + + poppler/GfxFont.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c839b706092583f6b12ed3cc634bf5af34b7a2bb +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Oct 20 10:09:13 2009 +0200 + + [glib] Fix CVE-2009-3607 + + glib/poppler-page.cc | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +commit 44462e0ca39392e5629020226b901e4026089b46 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Oct 19 23:33:58 2009 +0200 + + fix memory leak + + poppler/PSOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d701aaa9eaa62567210070129f5feffe24bf1936 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 18 01:22:16 2009 +0200 + + This include is needed as this file uses Ref + + poppler/OutputDev.h | 1 + + 1 file changed, 1 insertion(+) + +commit d4202536e1b62c326c301d5088fa0e176c523e85 +Author: Pino Toscano <pino@kde.org> +Date: Sat Oct 17 01:35:11 2009 +0200 + + SplashGlyphBitmap is a struct and not a class + + poppler/ArthurOutputDev.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 654176dee7c9325aa5a24a2de3c070faa16e8a9c +Author: Michael Jansen <kde@michael-jansen.biz> +Date: Sat Oct 17 01:30:40 2009 +0200 + + CMake: add the possibility to pass LIB_SUFFIX. + + This allows to tune the installation libdir by adding a suffix for it + (making it eg lib, lib32, or lib64) + + CMakeLists.txt | 16 +++++++++------- + glib/CMakeLists.txt | 2 +- + poppler-cairo.pc.cmake | 2 +- + poppler-glib.pc.cmake | 2 +- + poppler-qt.pc.cmake | 2 +- + poppler-qt4.pc.cmake | 2 +- + poppler-splash.pc.cmake | 2 +- + poppler.pc.cmake | 2 +- + qt/CMakeLists.txt | 2 +- + qt4/src/CMakeLists.txt | 2 +- + 10 files changed, 18 insertions(+), 16 deletions(-) + +commit 43829ae4b25a88ace06f05fa6750e5732539f4be +Author: Pino Toscano <pino@kde.org> +Date: Sat Oct 17 01:21:39 2009 +0200 + + put a space so MSVC won't try to see it as comment + + poppler/GfxState.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f64086ea22a4e8cb3d4e7116db2a9541ac2fb19f +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 17 00:48:58 2009 +0200 + + check the document is not locked when printing + + qt4/src/poppler-ps-converter.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 85d1015480b7ab3f21cc5f78dc53d4c5efdc6e60 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 17 00:48:27 2009 +0200 + + fix file name comment + + qt4/src/poppler-ps-converter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 270764ad1bf2cfe95aed0b6850d2347361b4268d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 17 00:47:34 2009 +0200 + + Add a way for converters to return more exact errors they had when + converting + + qt4/src/poppler-base-converter.cc | 8 +++++++- + qt4/src/poppler-converter-private.h | 3 ++- + qt4/src/poppler-pdf-converter.cc | 11 ++++++++++- + qt4/src/poppler-ps-converter.cc | 6 +++++- + qt4/src/poppler-qt4.h | 14 ++++++++++++++ + 5 files changed, 38 insertions(+), 4 deletions(-) + +commit 1082e1671afd8ab91583dabc876304008acb021c +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 16 23:17:22 2009 +0200 + + Some "security" fixes based on newly released Xpdf 3.02pl4 + + poppler/Stream.cc | 4 ++++ + poppler/XRef.cc | 19 +++++++++++++++---- + splash/Splash.cc | 7 +++++++ + splash/SplashBitmap.cc | 37 ++++++++++++++++++++++++++++++------- + splash/SplashErrorCodes.h | 4 +++- + 5 files changed, 59 insertions(+), 12 deletions(-) + +commit c2458275e02f56226779b82d73c13defcbbda563 +Author: Glenn Ganz <glenn.ganz@uptime.ch> +Date: Fri Oct 16 20:54:32 2009 +0200 + + fix constructor of DCTStream + + poppler/Stream.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit fd91b79c053bb5cd01a766032b90981dbc5e5dd3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 10 14:53:42 2009 +0200 + + fix compiling with automake + + goo/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c3031b4318af6f85256f2478c8678dedd0d6acd1 +Author: Pino Toscano <pino@kde.org> +Date: Fri Oct 9 16:17:16 2009 +0200 + + cmake: simplify the linking to libpng + + CMakeLists.txt | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 96688dd7a091f8fa141fad2b3d05bae04b0b86fb +Author: Patrick Spendrin <ps_ml@gmx.de> +Date: Fri Oct 9 16:09:46 2009 +0200 + + MSVC: add _CRT_SECURE_NO_WARNINGS to the define's + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit f346c1f6b55f87ebd6bb0b0932462d5514aa40ff +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 9 00:29:06 2009 +0200 + + add -ansi flag to default warnings + + cmake/modules/PopplerMacros.cmake | 2 +- + configure.ac | 2 +- + utils/parseargs.c | 30 +++++++++++++++--------------- + utils/parseargs.h | 26 +++++++++++++------------- + 4 files changed, 30 insertions(+), 30 deletions(-) + +commit 53e0016b772f1b78d998506e2f3106011d32cef3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 9 00:15:52 2009 +0200 + + Add virtual destructor to ImgWriter + + CMakeLists.txt | 1 + + goo/ImgWriter.cc | 15 +++++++++++++++ + goo/ImgWriter.h | 2 ++ + goo/Makefile.am | 1 + + 4 files changed, 19 insertions(+) + +commit 699dcacced7be05b788c414c231dc2b5c07de06e +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 9 00:13:11 2009 +0200 + + Add -Wnon-virtual-dtor flag + + cmake/modules/PopplerMacros.cmake | 4 ++-- + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit d1e4fca4a8602994b010fae4f4fea5cd4df9276e +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 9 00:10:03 2009 +0200 + + build on cmake too + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit d67511c92022121066f43003f01b955962ddcd33 +Author: Stefan Thomas <thomas@eload24.com> +Date: Fri Oct 9 00:09:23 2009 +0200 + + Add -jpeg to pdftoppm + + goo/ImgWriter.h | 28 +++++++++++++++ + goo/JpegWriter.cc | 92 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + goo/JpegWriter.h | 42 +++++++++++++++++++++++ + goo/Makefile.am | 2 ++ + goo/PNGWriter.cc | 5 +-- + goo/PNGWriter.h | 10 +++--- + splash/SplashBitmap.cc | 46 +++++++++++++++++-------- + splash/SplashBitmap.h | 5 +-- + splash/SplashTypes.h | 11 ++++++ + utils/pdftoppm.1 | 3 ++ + utils/pdftoppm.cc | 22 +++++++++--- + 11 files changed, 239 insertions(+), 27 deletions(-) + +commit 388196df1fb05fb2d88ae82bd81e823a23588ec1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Oct 7 17:11:58 2009 +0200 + + [glib-demo] Show some of the annot flags in annots treeview + + glib/demo/annots.c | 35 +++++++++++++++++++++++++++++++++-- + 1 file changed, 33 insertions(+), 2 deletions(-) + +commit 034907c6582c1f50782ec9c58a29b140c6fc0688 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Oct 6 00:52:10 2009 +0200 + + Forgot to update the year here + + qt4/src/poppler-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fef89acebf5312324c104fb52e629563fbc2de76 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Oct 6 00:42:52 2009 +0200 + + Add the possibility of enabling hinting + + qt4/src/poppler-document.cc | 2 +- + qt4/src/poppler-private.h | 1 + + qt4/src/poppler-qt4.h | 3 ++- + 3 files changed, 4 insertions(+), 2 deletions(-) + +commit 485252844b5e0964ee724b74e2a7ba2b820b259e +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Oct 6 00:41:57 2009 +0200 + + rework how hinting is used in the splash backend + + Basically we default to no hinting now with the possibility to + enable it + + poppler/ArthurOutputDev.cc | 2 +- + poppler/GlobalParams.cc | 19 ------------- + poppler/GlobalParams.h | 3 --- + poppler/SplashOutputDev.cc | 8 +++++- + poppler/SplashOutputDev.h | 3 +++ + splash/SplashFTFont.cc | 64 + ++++++++++---------------------------------- + splash/SplashFTFont.h | 4 +-- + splash/SplashFTFontEngine.cc | 8 +++--- + splash/SplashFTFontEngine.h | 7 ++--- + splash/SplashFontEngine.cc | 5 ++-- + splash/SplashFontEngine.h | 3 ++- + 11 files changed, 40 insertions(+), 86 deletions(-) + +commit 8194c156cf2167834779e1690a89b5068baf8d58 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Oct 5 00:55:55 2009 +0200 + + Fix includes for those using internal headers + + goo/FixedPoint.h | 2 +- + goo/gmem.h | 2 +- + poppler/OutputDev.h | 2 +- + poppler/PSOutputDev.h | 2 +- + poppler/PageLabelInfo.h | 2 +- + utils/ImageOutputDev.h | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +commit 091f68ccd59413d6890dfbfcf8911f112e690b50 +Author: Kovid Goyal <kovid@kovidgoyal.net> +Date: Mon Oct 5 00:39:36 2009 +0200 + + Use _WIN32 instead of WIN32 + + More info at http://bugs.freedesktop.org/show_bug.cgi?id=24259 + + goo/GooMutex.h | 16 +++++++++++++++- + goo/gfile.cc | 33 +++++++++++++++++---------------- + goo/gfile.h | 5 +++-- + msvc/poppler/poppler-config.h | 2 +- + poppler-config.h.cmake | 2 +- + poppler/ABWOutputDev.h | 3 ++- + poppler/FileSpec.cc | 7 ++++--- + poppler/GlobalParams.cc | 37 +++++++++++++++++++------------------ + poppler/GlobalParams.h | 4 ++-- + poppler/Link.cc | 3 ++- + poppler/PDFDoc.cc | 4 ++-- + poppler/PDFDoc.h | 3 ++- + poppler/PSOutputDev.cc | 5 +++-- + poppler/TextOutputDev.cc | 5 +++-- + poppler/XpdfPluginAPI.cc | 13 ++++++++++++- + poppler/poppler-config.h.in | 2 +- + splash/SplashFontEngine.cc | 9 +++++---- + test/perf-test.cc | 24 ++++++++++++------------ + utils/HtmlOutputDev.h | 3 ++- + 19 files changed, 108 insertions(+), 72 deletions(-) + +commit 7fd8bdfa450db4e323e4e5d12159359fbc47f9ed +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Oct 5 00:21:15 2009 +0200 + + Remove spurious ; + + Found by -Wextra i think we should add more warnings to our default + flags + + qt4/src/poppler-annotation.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d46f7343e446331489d3fe6711a7cf778e0bd902 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 2 22:04:46 2009 +0200 + + Strings can have 0 inside so use the length + + Fixes saving some files + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2bc2040081919340415f576ce8266356deadbfcd +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 2 22:04:03 2009 +0200 + + Increase decimals from 5 to 10, a double has that precision + + Makes saving more faithful for some files + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 05eb7342d5234732f27c9c67b7fc1f9e40a4e075 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 2 22:03:40 2009 +0200 + + If the stream was wrongly formed save the correct length + + Fixes saving of some files + + poppler/PDFDoc.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit b98faa4c162392d9416a5a93c9042b41f82d8657 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 2 22:02:13 2009 +0200 + + Return the save status as program status + + test/pdf-fullrewrite.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f73f59f2c7bb7c7d57eb70cdc1bc30b80a92d0b7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 2 22:01:45 2009 +0200 + + If the Length entry of the stream is wrong, fix it + + Fixes saving some files + + poppler/Parser.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 91135c7e788bc32e414e1a9c9ab43b326a07e970 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 2 22:00:12 2009 +0200 + + increase the range of characters we sanitize + + Fixes saving of some files + + goo/GooString.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9dcb3e8be2cd52a795605548e43d6bfc149b2ea5 +Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> +Date: Sun Sep 27 17:17:32 2009 +0200 + + Fix the linking not to use the .so directly but the lib + + Fixes check on cygwin + + m4/qt.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ed4a6f1cfc7ccd2717d939841c092347c3307547 +Author: Kovid Goyal <kovid@kovidgoyal.net> +Date: Sat Sep 26 19:26:19 2009 +0200 + + Do not crash when saving files that come from a stream without name + + Bug 24090 + + poppler/PDFDoc.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 04b232d48930af9bc614d7fef47f79ce247713a4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 26 18:30:41 2009 +0200 + + Write the Info into the trailer dict if there is one + + Bug 24091 + + poppler/PDFDoc.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 343e4f9aceb935eb393ad94bbef4dbb1b1a450ee +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 26 18:28:40 2009 +0200 + + Plug leak + + test/pdf-fullrewrite.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 2ea0032283c4717f1bb285fab7956fc38f375e87 +Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> +Date: Sat Sep 26 15:01:35 2009 +0200 + + Patch to make poppler work on Cygwin + + Bug 4195 + + configure.ac | 3 +++ + qt/Makefile.am | 2 +- + qt4/src/Makefile.am | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +commit 074dc5e5e39cebc1fbe9bf6a15b2cae2391006c1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 26 14:56:38 2009 +0200 + + Improve realibility for Streams with broken Length + + Fixes bug 6841 + + poppler/Parser.cc | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +commit b7702820245fb6cdbf77afba37c53c03d4362a25 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 21 21:58:26 2009 +0200 + + Print with a . and not with a , in all locales + + This is a regression after the removal of setting LC_NUMERIC + + poppler/PDFDoc.cc | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit d31080d8195694cef740d4e77484179bb38d1f26 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Sep 20 17:21:13 2009 +0200 + + CharCodeToUnicode is not mandatory in fonts, don't crash one fonts + that do not have it + + Fixes bug #24036 + + poppler/Annot.cc | 33 ++++++++++++++++++++------------- + 1 file changed, 20 insertions(+), 13 deletions(-) + +commit a729d005a7204791fa8415de5aa0834136073ce8 +Author: Pino Toscano <pino@kde.org> +Date: Thu Sep 17 20:12:20 2009 +0200 + + Windows32/MSVC: initialize the font list once per GlobalParams, + instead of once at all + + this fixes the font list being empty at the second (and following) + GlobalParams creation + thanks for Christian Ehrlicher for reporting the bug and testing + its fix + + poppler/GlobalParams.cc | 1 + + poppler/GlobalParams.h | 1 + + poppler/GlobalParamsWin.cc | 1 - + 3 files changed, 2 insertions(+), 1 deletion(-) + +commit 68711d8494e2765c4a24ea59ce8d904981f0f917 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 9 23:24:22 2009 +0200 + + uint -> Guint + + some compilers don't know about uint + + poppler/Gfx.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 943a13c9354dec18cb023642aebbe5d3bb920ed7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 9 20:04:06 2009 +0200 + + poppler 0.12.0 + + CMakeLists.txt | 4 ++-- + NEWS | 18 ++++++++++++++++++ + configure.ac | 4 ++-- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 5 files changed, 26 insertions(+), 8 deletions(-) + +commit e8ed7210346cb18f6e4588ad557f993c6d42f4a3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 9 19:21:21 2009 +0200 + + increase library to 3.2.0 + + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e950107006a3b1889646d3705323c1b3d41eaa49 +Author: David Benjamin <davidben@mit.edu> +Date: Wed Sep 9 01:19:38 2009 +0200 + + Fix infinite loop in JBIG2Decoder + + Bug 23025 + Also fixes problems in bug-poppler6881-2.pdf and bug-poppler6500.pdf + + poppler/JBIG2Stream.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit 1cb25a4adaaf3e2da50724312a3db6928991f425 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Sep 6 10:45:56 2009 +0200 + + [glib] Ignore attachments with an invalid embedded file + + Fixes bug #10386 + + glib/poppler-document.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 842e00f3114666609ef4dec6fa613d46f330a40c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 5 15:20:35 2009 +0200 + + Add EmbeddedFile::isValid + + Also do not crash if data() is called on an invalid file + + qt4/src/poppler-embeddedfile.cc | 10 +++++++++- + qt4/src/poppler-qt4.h | 9 ++++++++- + 2 files changed, 17 insertions(+), 2 deletions(-) + +commit 9d40b268f5a9a9a0fb79da0e1627dd8eebc4db6a +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 5 15:19:27 2009 +0200 + + Add EmbFile::isOk + + At the moment returns false if the object stream is not really + a stream + + poppler/Catalog.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 642650b6f70425c8fff2df978ae71249a5ae07f3 +Author: David Benjamin <davidben@mit.edu> +Date: Sat Sep 5 01:12:49 2009 +0200 + + Better fallback when there's a type mismatch + + Bug #17252 + + poppler/GfxFont.cc | 38 ++++++++++++++++++++++++++++++++------ + 1 file changed, 32 insertions(+), 6 deletions(-) + +commit bf5811f5331292ccf30f1b0f089fe43d351d96be +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Aug 26 00:43:46 2009 +0200 + + Improve shading color rendering + + Shading is not necessarily lineal so require another bisection to + assume all the area in between have the same color. Fixes bug #20238 + + poppler/Gfx.cc | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +commit e94430b790fde6ce7b7cb163c2e0adf2d071c81d +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Aug 26 00:42:49 2009 +0200 + + Make code a bit more readable + + poppler/Gfx.cc | 23 +++++++++++------------ + 1 file changed, 11 insertions(+), 12 deletions(-) + +commit 465212780557705fd939dfe54f96913505bfc96e +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Aug 25 21:55:45 2009 +0200 + + forgot to update my copyright + + poppler/JPEG2000Stream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4f6016d01ced32002bef22b9b5d5426a74e55842 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Aug 25 21:10:07 2009 +0200 + + Fix format security warnings + + Don't just directly print strings of unknown content; use "%s". + + poppler/JPEG2000Stream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4616b23382b5d155f8b2f1942733037cf5730844 +Author: Christian Persch <chpe@gnome.org> +Date: Tue Aug 25 21:09:40 2009 +0200 + + Fix format security warnings + + Don't just directly print strings of unknown content; use "%s". + + poppler/GfxState.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 6c5c8d008456d1e4f3d60bc182209747c2a175dc +Author: Christian Persch <chpe@gnome.org> +Date: Tue Aug 25 21:03:16 2009 +0200 + + Support AM_SILENT_RULES + + When using automake 1.11, should support silent build rules. + + Makefile.am | 2 +- + configure.ac | 1 + + glib/Makefile.am | 4 ++-- + qt4/demos/Makefile.am | 2 +- + qt4/src/Makefile.am | 2 +- + qt4/tests/Makefile.am | 2 +- + 6 files changed, 7 insertions(+), 6 deletions(-) + +commit e7dd1c47b01d8f31599ee686eafbe7c54d7c023a +Author: Christian Persch <chpe@gnome.org> +Date: Tue Aug 25 21:01:13 2009 +0200 + + Fix automake check, and add automake 1.11 support + + Fix the automake checks to take the *newest* version available, + not the + oldest one. Add support for automake 1.11. FDO#23473. + + autogen.sh | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit 493d2c5aa78a3241e70108c5d7eccba9ac72f834 +Author: Rex Dieter <rdieter@math.unl.edu> +Date: Mon Aug 24 20:08:46 2009 +0200 + + Use Requires.private if available + + The following patch minimizes pkg-config deps similar to how the + glib-related pkg-config deps are done. + + poppler-qt.pc.cmake | 3 ++- + poppler-qt.pc.in | 3 ++- + poppler-qt4.pc.cmake | 3 ++- + poppler-qt4.pc.in | 3 ++- + 4 files changed, 8 insertions(+), 4 deletions(-) + +commit 341cd3ecd08a39cd146c1c57f356b50a2881c03f +Author: Jakub Wilk <ubanus@users.sf.net> +Date: Mon Aug 24 19:51:34 2009 +0200 + + common options for pdftoabw + + The attached patch fixes command line handling for pdftoabw and + implements some + common options (e.g., --help) that are already found in other + pdftosomething + utilities. + + utils/pdftoabw.cc | 39 ++++++++++++++++++++++++++++++++------- + 1 file changed, 32 insertions(+), 7 deletions(-) + +commit 365683d5faea6e0a7570b139d1f3366c22271f8e +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Aug 18 21:18:13 2009 +0200 + + 0.11.3 + + CMakeLists.txt | 2 +- + NEWS | 22 ++++++++++++++++++++++ + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 5 files changed, 28 insertions(+), 6 deletions(-) + +commit cb28bc8a637d300664b3c7569263445275333878 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Aug 17 14:14:03 2009 +0200 + + [glib] Add FORMAT_MAJOR/MINOR properties to get the PDF version + + See bug #23076. + + glib/poppler-document.cc | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +commit 1b5612841b0c663f6d391d4581f65f68a2975db0 +Author: Pino Toscano <pino@kde.org> +Date: Mon Aug 17 01:04:04 2009 +0200 + + [Qt] add Document::getPdfVersion(int *major, int *minor) for the + document PDF version numbers + + This new function reads the version of the PDF specification of the + document, putting major and minor numbers in own variables. + + qt/poppler-document.cc | 8 ++++++++ + qt/poppler-qt.h | 12 ++++++++++++ + 2 files changed, 20 insertions(+) + +commit aef8ecda1e80b921228f415a53c9c5a52df87d94 +Author: Pino Toscano <pino@kde.org> +Date: Mon Aug 17 00:57:08 2009 +0200 + + [Qt4] deprecate Document::pdfVersion() + + ... in favour of getPdfVersion() + + qt4/src/poppler-qt4.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 830140f70e48e8033ad4411b6bd405d5ad7358a3 +Author: Pino Toscano <pino@kde.org> +Date: Mon Aug 17 00:51:13 2009 +0200 + + [Qt4] add Document::getPdfVersion(int *major, int *minor) for the + document PDF version numbers + + This new function reads the version of the PDF specification of the + document, putting major and minor numbers in own variables. + Add them to the relative unit test. + + qt4/src/poppler-document.cc | 8 ++++++++ + qt4/src/poppler-qt4.h | 13 +++++++++++++ + qt4/tests/check_metadata.cpp | 4 ++++ + 3 files changed, 25 insertions(+) + +commit 5491d16dfbd73f0256c62e49d02622dc3185012e +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 17 00:24:41 2009 +0200 + + Move poppler core away from using a double as PDF file version + + Frontends are yet to come + + glib/poppler-document.cc | 2 +- + poppler/PDFDoc.cc | 7 ++++--- + poppler/PDFDoc.h | 8 +++++--- + qt/poppler-document.cc | 4 ++-- + qt4/src/poppler-document.cc | 4 ++-- + utils/pdfinfo.cc | 4 ++-- + 6 files changed, 16 insertions(+), 13 deletions(-) + +commit efd5dd63a5b08249529d9a9f5906aefe806fb3aa +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 17 00:21:22 2009 +0200 + + Forgot to update copyright info + + fofi/FoFiType1C.cc | 14 ++++++++++++++ + poppler/PDFDoc.cc | 2 +- + utils/parseargs.c | 2 +- + 3 files changed, 16 insertions(+), 2 deletions(-) + +commit 25ff4be0b4521cc3d2de386cdeb589beb245d435 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 17 00:15:10 2009 +0200 + + No need to change the locale since we use gatof that does the + right thing + + poppler/PDFDoc.cc | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit a6f698b4edc42c0414dd4690e1e037088321db2c +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 17 00:14:35 2009 +0200 + + Use gatof instead of atof + + fofi/FoFiType1C.cc | 3 ++- + poppler/Annot.cc | 5 +++-- + poppler/Function.cc | 3 ++- + poppler/PDFDoc.cc | 3 ++- + utils/parseargs.c | 4 +++- + 5 files changed, 12 insertions(+), 6 deletions(-) + +commit 807b121cae45832d2e5832bad19c31e77420bfec +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 17 00:10:30 2009 +0200 + + Add a custom strtod that comes from libspectre + + Works over C locale integers without changing locale settings + + CMakeLists.txt | 2 + + goo/Makefile.am | 6 ++- + goo/gstrtod.cc | 147 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + goo/gstrtod.h | 43 +++++++++++++++++ + 4 files changed, 196 insertions(+), 2 deletions(-) + +commit 914bf7677a14494b69857b1d8070092a9999fe79 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 16 20:50:02 2009 +0200 + + When writing the cm matrix write 4 significant digits not 4 decimals + + This fixes bug 23332 + Maybe we want to make this the default behaviour of 'g' instead of + a new 'gs' case, but i prefer to be on the safe side for the moment + + goo/GooString.cc | 27 +++++++++++++++++++++++++-- + goo/GooString.h | 4 +++- + poppler/PSOutputDev.cc | 4 ++-- + 3 files changed, 30 insertions(+), 5 deletions(-) + +commit b7dfca1aa52b825eb3b8f1cc0470398c31615b30 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Aug 16 19:28:37 2009 +0200 + + [cairo] CairoImageOutputDev doesn't implement patterns + + poppler/CairoOutputDev.h | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit d20d65111aee2ee4b8cdea2962ed1bb149122ba9 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Aug 16 17:36:14 2009 +0200 + + [cairo] Implement tiling patterns in cairo backend + + Fixes bug #13518 for the cairo backend. + + poppler/CairoOutputDev.cc | 56 + +++++++++++++++++++++++++++++++++++++++++++++++ + poppler/CairoOutputDev.h | 10 +++++++++ + 2 files changed, 66 insertions(+) + +commit e965d0686d979c775b64a93f8e2f775f81885417 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Aug 13 14:48:10 2009 +0200 + + Change OutputDev::tilingPatternFill to return a GBool + + It allows outputdevs to decide whether render the pattern or not + depending + on the parameters, like shaded patterns currently do. + + poppler/Gfx.cc | 37 +++++++++++++++++++------------------ + poppler/OutputDev.h | 11 ++++++----- + poppler/PSOutputDev.cc | 12 +++++++----- + poppler/PSOutputDev.h | 10 +++++----- + 4 files changed, 37 insertions(+), 33 deletions(-) + +commit ce70ef7d6afc800e24031dae43da301e9e542f0e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 15 17:45:57 2009 +0200 + + Fix backwards search + + qt4/src/poppler-page.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5b7b1cdc5c3b8652d3ae583b4d7b8b6de625adc2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 15 17:45:05 2009 +0200 + + Add an autotest showing previousresult fails + + qt4/tests/check_search.cpp | 51 + ++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 51 insertions(+) + +commit 2484b0dcb8eb62f8e2c147498c58871ec04630b5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 14 11:47:11 2009 +0200 + + Implement the alpha path + + I wonder if this is the correct fix why it was not implemented + but if fixes rendering of files in KDE bug 145868, KDE bug 193657, + poppler bug 17473.pdf, poppler bug 21651, poppler bug 22143 and + poppler bug 22152 and causes no regression in all the other files + i have in my test dir so i'm commiting it + + poppler/SplashOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 03970d8b6d7624444664320470baa6d1b1299622 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Aug 11 12:01:07 2009 +0200 + + [build] Fix build with autotools + + utils/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 15752b7cd5c94620e3ad3b6afd9c70ccc754c9b3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Aug 10 20:02:13 2009 +0200 + + [cairo] Add empty updateBlendMode to CairoImageOutputDev + + Fixes a crash when using CairoImageOutputDev with a document with + blend + modes. + + poppler/CairoOutputDev.h | 1 + + 1 file changed, 1 insertion(+) + +commit 45dae4e66b2b833f95656850b5f1b0ffd1d96f1d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Aug 10 20:00:04 2009 +0200 + + [cairo] Use current fill_opacity when drawing images + + Fixes launchpad bug #342282 (page 2 of the attached document) + + poppler/CairoOutputDev.cc | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit b1cd54546844f2f7cd6bf7cc14b7584c84c3fc14 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Aug 10 19:55:44 2009 +0200 + + [cairo] Do not save the font file twice for FreeType fonts + + Fixes bug #20491. + + poppler/CairoFontEngine.cc | 19 ++----------------- + 1 file changed, 2 insertions(+), 17 deletions(-) + +commit 4181a0ff11195eb7a56d76be23994b843e20b483 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 10 19:58:09 2009 +0200 + + this branch is unlikely to happen + + poppler/Lexer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2a3025f32951ce7b7343aeef111902615d71595e +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 10 19:55:40 2009 +0200 + + fix overflow calculation not to depend on the variable overflowing + + poppler/Lexer.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit a38001f724f78231c2fdadd28e647a35b41bab74 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 9 23:26:02 2009 +0200 + + Check for overflow when parsing integers + + Fixes bug 23078 + + poppler/Lexer.cc | 28 ++++++++++++++++++++++------ + 1 file changed, 22 insertions(+), 6 deletions(-) + +commit 4c4c0e44452d07bea88d98b7df0c01fadd7693cc +Author: Jakub Wilk <ubanus@users.sf.net> +Date: Sat Aug 8 17:26:14 2009 +0200 + + Silence some warnings when using internal headers and not compiling + with -Wno-write-strings + + People should not be using internal headers but it's just two lines + + poppler/Object.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit e2c319ba18ab473fd969db9519a9231be67538c3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 8 00:48:18 2009 +0200 + + Also implement mono so that -mono in pdftoppm -png works + + Totally not optimized + + splash/SplashBitmap.cc | 23 ++++++++++++++++++++++- + 1 file changed, 22 insertions(+), 1 deletion(-) + +commit c669e7f3ca421265e78161cc3fdecd2a0c7510c9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 8 00:38:50 2009 +0200 + + Support splashModeMono8 in writePNGFile + + Works though is non optimal + + splash/SplashBitmap.cc | 55 + +++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 39 insertions(+), 16 deletions(-) + +commit 92744b72df9084fd2d69ba78406898378884aed8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 8 00:20:52 2009 +0200 + + Add the -png flag to pdftoppm to output to PNG + + Based on a patch by Shen Liang <shenzhuxi@gmail.com> + Also factored common PNG code from HtmlOutputDev to PNGWriter + + CMakeLists.txt | 5 +++ + goo/Makefile.am | 9 +++- + goo/PNGWriter.cc | 110 + ++++++++++++++++++++++++++++++++++++++++++++++ + goo/PNGWriter.h | 43 ++++++++++++++++++ + poppler/Makefile.am | 8 ++++ + splash/SplashBitmap.cc | 70 +++++++++++++++++++++++++++++ + splash/SplashBitmap.h | 5 +++ + splash/SplashErrorCodes.h | 4 +- + utils/CMakeLists.txt | 4 -- + utils/HtmlOutputDev.cc | 66 +++++----------------------- + utils/Makefile.am | 4 -- + utils/pdftoppm.1 | 3 ++ + utils/pdftoppm.cc | 21 +++++++-- + 13 files changed, 283 insertions(+), 69 deletions(-) + +commit e4439ff527bb202d0239f78e647452983b733411 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Aug 7 15:23:57 2009 +0200 + + [cairo] Don't apply masks when fill color space mode is csPattern + + In that case the mask is used for clipping when drawing images. Fixes + bug #22216. + + poppler/CairoOutputDev.cc | 59 + ++++++++++++++++++++++++++++++----------------- + 1 file changed, 38 insertions(+), 21 deletions(-) + +commit 7194f59a18e4f6997ae560af3db1bd101d6f726e +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu Aug 6 11:24:22 2009 +0100 + + [cairo] Use FT_New_Memory_Face() for mmapped fonts + + If we hold a mapping for the font, then we can pass that memory to + FreeType for it to use as well. This saves on FreeType having to + read the + file into a fresh block of memory. + + poppler/CairoFontEngine.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 7e2bbcf6f85111d1006b0d5bc1503cadaba83c9f +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Aug 4 00:10:58 2009 +0200 + + Set KDAB via gamaral copyright + + poppler/Form.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ed5918e16dafebc9ecf6db8ce0186f407ecbf7d5 +Author: Pino Toscano <pino@kde.org> +Date: Sat Aug 1 20:00:22 2009 +0200 + + [Qt4 apidox] make example for FontIterator... not leak ;) + + qt4/src/poppler-qt4.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit f3b36d9c992491e614e88dbf1a84b5433a7647f4 +Author: Pino Toscano <pino@kde.org> +Date: Sat Aug 1 19:54:52 2009 +0200 + + [Qt4] Add color management API. + + Add few wrapper functions to get/set color profiles. + Add a function to know whether the color management functions actually + do anything (ie support compiled or not). + Add few basic API docs for the new functions. + Based on an initial patch by Hal V. Engel <hvengel@astound.net>, + heavily reindented, polished and massaged in its API by me. + + qt4/src/poppler-document.cc | 52 + +++++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-qt4.h | 50 + +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 102 insertions(+) + +commit 78a1969d040018c0c2bb74c94f5507f786e4666e +Author: Pino Toscano <pino@kde.org> +Date: Sat Aug 1 18:00:06 2009 +0200 + + [Qt] add unhandled cases and remove unused code + + qt/poppler-page.cc | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +commit bddebec0712e92e13b57d3d05d652673fe737866 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 1 17:12:22 2009 +0200 + + 0.11.2 + + CMakeLists.txt | 2 +- + NEWS | 30 ++++++++++++++++++++++++++++++ + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 5 files changed, 36 insertions(+), 6 deletions(-) + +commit 87e2af3454348f5568d155c15af5d85268e47f1b +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Aug 1 15:48:02 2009 +0200 + + [glib-demo] Add cast to make sure the comparison is always valid + + glib/demo/attachments.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 464e95ef451103daddc9a30cd26b986291f02176 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Aug 1 15:47:25 2009 +0200 + + [glib-demo] Add missing return + + glib/demo/attachments.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 7f48369e4d29b2a71abffa9e1966e3a2252de895 +Author: Guillermo Antonio Amaral Bastidas <gamaral@amaral.com.mx> +Date: Sat Aug 1 15:41:34 2009 +0200 + + Call fillChildrenSiblingsID in fillChildrenSiblingsID instaed of + loadChildrenDefaults + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e21a3e40bf6f4365064cea751ae186580d8f81f5 +Author: William Bader <williambader@hotmail.com> +Date: Sat Aug 1 15:23:03 2009 +0200 + + Add the possibility of disabling font substitution in pdftops + + Bug #23030 + + poppler/GlobalParams.cc | 17 ++++++++++++++ + poppler/GlobalParams.h | 4 ++++ + poppler/PSOutputDev.cc | 59 + +++++++++++++++++++++++++++---------------------- + poppler/PSOutputDev.h | 2 ++ + utils/pdftops.1 | 8 ++++++- + utils/pdftops.cc | 7 ++++++ + 6 files changed, 70 insertions(+), 27 deletions(-) + +commit bd68c90338cbf16f468e5db59722610300a629e1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 1 15:19:48 2009 +0200 + + Forgot to add my copyright + + poppler/GfxState.h | 1 + + 1 file changed, 1 insertion(+) + +commit 173451730948c320f16a0f5924a58302603eca0b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 1 15:13:35 2009 +0200 + + Try to workaround some incorrect PDF + + Fixes rendering of PDF where forms/patterns have more q than Q. Fixes + rendering in splash of pdf in bugs #22835, #21899 and #16402 + + poppler/Gfx.cc | 13 +++++++++++++ + poppler/GfxState.h | 1 + + 2 files changed, 14 insertions(+) + +commit 35c408ca49be08144bcf14aa112505fd556725d2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 31 23:27:02 2009 +0200 + + add the overloaded virtual warning also the autotools based build + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1c32bd2d101e5dfb37e28276ecad699f121b27b7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 31 23:22:25 2009 +0200 + + Add my copyright to files i just edited + + poppler/OutputDev.cc | 1 + + poppler/OutputDev.h | 1 + + utils/HtmlOutputDev.h | 2 +- + 3 files changed, 3 insertions(+), 1 deletion(-) + +commit 10717a48c85f1dbeff1c6bcd094006a9ecc92efc +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 31 23:22:10 2009 +0200 + + Add -Woverloaded-virtual as default CXX flag + + cmake/modules/PopplerMacros.cmake | 1 + + 1 file changed, 1 insertion(+) + +commit db5f736655f01575ac5d7c524cbf131924ae91fa +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 31 23:12:00 2009 +0200 + + rename the function + + That way the name is different from the OutputDev function and does + not seem like a wrong overload + + utils/HtmlOutputDev.cc | 4 ++-- + utils/HtmlOutputDev.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 4be87f87509b93c4fe4025f9bd788e9412416663 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 31 23:11:32 2009 +0200 + + Remove Outputdev::beginMarkedContent as noone uses it + + poppler/Gfx.cc | 2 -- + poppler/OutputDev.cc | 3 --- + poppler/OutputDev.h | 1 - + 3 files changed, 6 deletions(-) + +commit 6ab2ec8a89519d2bd1576c8d62f8aec51b04479a +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 31 23:10:56 2009 +0200 + + Warning-- + + poppler/PSOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 53c3d636ad645a350b576160e1498726238a7bd1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 31 18:23:57 2009 +0200 + + [cairo] Implement radialShadedFill in cairo backend using cairo + gradients + + Fixes bugs #10942, #14160 + + poppler/CairoOutputDev.cc | 28 +++++++++ + poppler/CairoOutputDev.h | 2 + + poppler/Gfx.cc | 141 + +++++++++++++++++++++++++++------------------- + poppler/OutputDev.h | 2 +- + poppler/PSOutputDev.cc | 3 +- + poppler/PSOutputDev.h | 2 +- + 6 files changed, 117 insertions(+), 61 deletions(-) + +commit 2ba937545d1a2b9fa798f04fee755ccdf0e74ec7 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 31 17:49:18 2009 +0200 + + [cairo] Use cairo_pattern_set_extend for linear gradients + + poppler/CairoOutputDev.cc | 9 +++++++++ + poppler/CairoOutputDev.h | 1 + + poppler/Gfx.cc | 34 ++++++++++++++++++++++++++++------ + poppler/OutputDev.h | 4 ++++ + 4 files changed, 42 insertions(+), 6 deletions(-) + +commit b054756113f0df6b59935823882f412486e96db5 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jun 17 11:10:15 2009 +0200 + + [cairo] Implement blend mdoes in cairo backend + + It requires cairo from git master to work at the moment. Fixes bugs + #22384, #12979, #13603, #17919, #22255 + + configure.ac | 27 ++++++++++++++++++++++ + poppler/CairoOutputDev.cc | 59 + +++++++++++++++++++++++++++++++++++++++++++++++ + poppler/CairoOutputDev.h | 1 + + 3 files changed, 87 insertions(+) + +commit bf8964726c9311e7e82b1faf49cc2272e5c1e339 +Author: William Bader <williambader@hotmail.com> +Date: Thu Jul 30 22:08:43 2009 +0200 + + Fix some double to int warnings by explicit casting + + poppler/Gfx.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit fdbd0c548e963461b2bc4bdf1beaa1577cafcea7 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 30 21:05:18 2009 +0200 + + Update gtk-doc build files + + gtk-doc.make | 102 + +++++++++++++++++++++++++++++++++++++++------------------- + m4/gtk-doc.m4 | 74 +++++++++++++++++++++++------------------- + 2 files changed, 110 insertions(+), 66 deletions(-) + +commit ae84dce5cea4d249526a6ed5b2feb2d3f241da1b +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 30 20:45:39 2009 +0200 + + Revert "Remove unneeded files from repo" + + This reverts commit 4cc9dee35e03d7b295a476f937ec0f2c43bb6592. + + See bug #22697. + + configure.ac | 2 +- + glib/reference/Makefile.am | 4 +- + gtk-doc.make | 155 + +++++++++++++++++++++++++++++++++++++++++++++ + m4/gtk-doc.m4 | 53 ++++++++++++++++ + 4 files changed, 211 insertions(+), 3 deletions(-) + +commit 7e14516a78b16453c747eb92b08665632e5f6844 +Author: Sanjoy Mahajan <sanjoy@mit.edu> +Date: Mon Jul 27 23:20:50 2009 +0200 + + Fix displayPages call + + Parameters are outputdev, first, last, dpi, dpi, rotate, usemediabox, + crop, printing + and we were doing + usemediabox = !noCrop + crop = gFasle + the correct is + usemediabox = noCrop + crop = !noCrop + + utils/pdftops.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3d53a0eb14420d54c0ebf8590e34c018b8da105d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jul 19 16:02:33 2009 +0200 + + Copy byte_lookup in copy constructor + + poppler/GfxState.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 8f7271acf17c46e663cd48d90c382b04a834fba2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jul 19 15:53:49 2009 +0200 + + Don't use byte_lookup table when color space doesn't support getLine + methods + + For color spaces that don't implement getRGBLine or getGrayLine + methods, + getRGB or getGray are called for every pixel, however we were + allocating + the byte_lookup table and converting colors in those cases + too. Instead + of falling back to generic methods in the base class, the new methods + useGetRGBLine and useGetGrayLine have been added to he base class, + so that + when they are not suopported in the current color space byte_lookup + table is + not used at all. + + Fixes bug #11027. + + poppler/GfxState.cc | 125 + ++++++++++++++++++++++++++++++---------------------- + poppler/GfxState.h | 21 +++++++-- + 2 files changed, 91 insertions(+), 55 deletions(-) + +commit 1bc737796bef1c65289a101b2d4c367267b9c974 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jul 19 15:51:43 2009 +0200 + + Remove unused variable + + poppler/GfxState.h | 1 - + 1 file changed, 1 deletion(-) + +commit 512b2c654fd80c83b82e7adc828a478a18de17ab +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jul 26 19:35:06 2009 +0200 + + [cairo] Use CAIRO_EXTEND_PAD in drawImageMaskPrescaled too + + poppler/CairoOutputDev.cc | 32 +++++++++++++++----------------- + 1 file changed, 15 insertions(+), 17 deletions(-) + +commit ad26e34bede53cb6300bc463cbdcc2b5adf101c2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jul 26 18:36:06 2009 +0200 + + [cairo] Use rectangle + clip instead of invert + tranform + + This is just for consistency of drawImage methods + + poppler/CairoOutputDev.cc | 30 ++++++++++++++---------------- + 1 file changed, 14 insertions(+), 16 deletions(-) + +commit ee6b761a55baef4c3bbe4614b0c3b3d761a3111f +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Sun Jul 26 16:19:15 2009 +0200 + + [cairo] Apply a clip for masked drawImage + + In order to use EXTEND_PAD with a mask, we need to apply a clip (to + constrain the image to the appropriate region). The complicating + factor for + drawSoftImage() is that mask size is independent of the image size, + so we + need to compute the intersection of the mask with in the image + in userspace. + + poppler/CairoOutputDev.cc | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +commit 499c6c972bac14936b5370276da723a6e98861b3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jul 26 11:30:08 2009 +0200 + + [cairo] Use CAIRO_EXTEND_PAD when drawing images + + poppler/CairoOutputDev.cc | 306 + +++++++++++++++++++++------------------------- + 1 file changed, 140 insertions(+), 166 deletions(-) + +commit f91eb7d01cef0897727c63267db309bc92297d37 +Author: Koji Otani <sho@bbr.jp> +Date: Sat Jul 25 16:34:12 2009 +0200 + + Fix generation of ps for some files + + For example fixes second pdf in bug 18908 + + poppler/PSOutputDev.cc | 68 + +++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 51 insertions(+), 17 deletions(-) + +commit f93f5e17d8f23f3e2862f3411f43a95b334e6c91 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Jul 20 17:10:37 2009 +0200 + + [cairo] Improve performance when rendering one-channel images + + It implements the same idea already used in SplashOutputDev, for + one-channel (monochrome/gray/separation) images we build a lookup + table + so that we won't need to call colorMap->getRGBLine when filling the + image buffer. Fixes bug #18017. + + poppler/CairoOutputDev.cc | 36 ++++++++++++++++++++++++++++++++++-- + 1 file changed, 34 insertions(+), 2 deletions(-) + +commit e7475062b6ae5c495fa72faaf8fb3d97391f8544 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jul 14 17:22:52 2009 +0200 + + [cairo] Handle fontType1COT fonts in CairoFontEngine + + poppler/CairoFontEngine.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit d42b9425fb2f98fa79e7a60e4f71ef14f5bacfe9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jul 12 19:55:14 2009 +0200 + + glade is not used anymore + + cmake/modules/FindGTK.cmake | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 454f7468c6a6a442a5064b5daa24d65ebf4fc6b6 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu Jul 9 10:43:00 2009 +0100 + + [cairo] Fix drawImage() for non-1x1 images + + Carlos noticed a nasty bug with converting drawImage() to use PAD + + fill, + instead of NONE + paint. That is the image was being padded out + far beyond + the correct output extents. The cause is that the caller pre-scales + the + context for the image, so the output rectangle was many times the true + image size - obliterating large amounts of the page. The temporary + fix is + to counter-act the scaling on the context. Longer term, after + fixing all + painters to use PAD correctly, we need to review the callers to remove + unnecessary pre-scaling. + + poppler/CairoOutputDev.cc | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit f8d93eae3c7b9388feabac71f2380d0b42a855e7 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jul 8 20:14:35 2009 +0200 + + Lookup UF and F entries before Unix, MAC and DOS in getFileSpec + + poppler/FileSpec.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 767c534f5fdf6ccbccfd85a0086d72c215c278f1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jul 8 19:13:54 2009 +0200 + + Use UF entry when present in dict in getFileSpecName() too + + poppler/FileSpec.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 569627ac4d56ddd58e109ce2a37179a85e042030 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jul 8 13:02:16 2009 +0200 + + Implement axialShadedFill in cairo backend using cairo gradients + + See bug #10942. + + poppler/CairoOutputDev.cc | 29 +++++++++++++++++++++++++++++ + poppler/CairoOutputDev.h | 10 ++++++++++ + poppler/Gfx.cc | 29 ++++++++++++++++++++--------- + poppler/OutputDev.h | 6 +++++- + poppler/PSOutputDev.cc | 2 +- + poppler/PSOutputDev.h | 2 +- + 6 files changed, 66 insertions(+), 12 deletions(-) + +commit 6ae0a6c0044713affa23eb1ee6a070785ed6c2f3 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Wed Jul 8 16:48:26 2009 +0100 + + [cairo] premultiply image mask + + Cairo uses a premultiplied colour-space, so when creating the + image mask + in drawImage() we need to remember to multiply by the alpha. In + this case + it just requires zeroing out the masked pixels. + + poppler/CairoOutputDev.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit 646e5884e748ecce7094c673400484aa1d902bdd +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Wed Jul 8 17:00:34 2009 +0100 + + [cairo] maskColors is an array of ints, no scaling required + + drawImage() was erroneously scaling the maskColors from what it + believed + to be [0:1] to [0:255]. However maskColors is already an integer + array, + [0:255]. + + poppler/CairoOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d75feb1ee84385a9f94308cf47a43f4583092ddf +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Wed Jul 8 16:37:19 2009 +0100 + + [cairo] cleanse DrawImage() + + Just a small bit of code rearrangement to reduce repetition and + invalid checks. + + poppler/CairoOutputDev.cc | 102 + +++++++++++++++++++--------------------------- + 1 file changed, 41 insertions(+), 61 deletions(-) + +commit 52f3704fed16cfc1e9dd85f72dde7922371e4099 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jul 8 11:40:52 2009 +0200 + + [TODO] Update TODO file + + TODO | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit ef261f5f72d37a0aa2709611ee2bad7d55340ed8 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jul 7 10:57:31 2009 +0200 + + Do not use F and UF entries if Unix or DOS are present in FileSpec + dict + + poppler/FileSpec.cc | 114 + +++++++++++++++++++++++----------------------------- + 1 file changed, 51 insertions(+), 63 deletions(-) + +commit cafd4653dc6c7574214e80aa09489dcd24e347a6 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jul 1 11:41:32 2009 +0200 + + [glib-demo] Fix a typo + + glib/demo/utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a3c9c6d0c0ee55dccd2d03f20d5683ae300cdc6b +Author: Pino Toscano <pino@kde.org> +Date: Wed Jul 8 02:01:39 2009 +0200 + + start updating the TODO file + + TODO file had quite some rust and dust in it, making quite "difficult" + for others to understand what can be done for helping. + First step has been removing all the items done. + Next is grouping items by areas, so it is more clear what should be + done in what area; current areas are: + - general items: for general stuff to be done, not specific to some + area; an example could have been "use littlecms for color management?" + - core: stuff which is specific to the core library + - Qt4/Qt/glib/etc frontend: stuff specific for that frontend + - new frontends: ideas for possible new frontends + + I was not sure about some items and Jeff Muizelaar's TODO, so I left + them there. + + TODO | 47 +++++++++++++++-------------------------------- + 1 file changed, 15 insertions(+), 32 deletions(-) + +commit 92ad0ef89fe7690d83854b4821178dfdb2e22897 +Author: Pino Toscano <pino@kde.org> +Date: Sat Jul 4 00:19:23 2009 +0200 + + [Qt4 demo] hopefully fix the page size on zoom change + + qt4/demos/pageview.cpp | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 97094d13bc0f144b25e13c1de7a5328608ab13e3 +Author: Pino Toscano <pino@kde.org> +Date: Sat Jul 4 00:07:12 2009 +0200 + + [Qt4 demo] show a list of checked/unchecked items for the document + permissions + + qt4/demos/permissions.cpp | 25 ++++++++----------------- + qt4/demos/permissions.h | 6 +++--- + 2 files changed, 11 insertions(+), 20 deletions(-) + +commit 0d8f2ee0f03a14e7b8477c4b787c3441a758f26b +Author: Pino Toscano <pino@kde.org> +Date: Fri Jul 3 23:55:42 2009 +0200 + + [Qt4 demo] show page numbers in the toolbar as 1..n + + qt4/demos/navigationtoolbar.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b0d48df9121c55f8162ddf0ee63832f9adebf37b +Author: Pino Toscano <pino@kde.org> +Date: Fri Jul 3 17:55:31 2009 +0200 + + [Qt4 demo] correctly use DPI values for the page sizes + + qt4/demos/pageview.cpp | 12 +++++++++--- + qt4/demos/pageview.h | 2 ++ + 2 files changed, 11 insertions(+), 3 deletions(-) + +commit dcc3c384919f1562b8f312ad3ac847e23f3e83ab +Author: Sebastien Bacher <seb128@ubuntu.com> +Date: Wed Jul 1 10:09:12 2009 +0200 + + [test] Use gtkbuilder rather than libglade + + Fixes bug #21673 + + cmake/modules/FindGTK.cmake | 1 - + configure.ac | 4 +- + test/Makefile.am | 2 +- + test/pdf-inspector.cc | 34 ++-- + test/pdf-inspector.glade | 434 + -------------------------------------------- + test/pdf-inspector.ui | 416 + ++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 439 insertions(+), 452 deletions(-) + +commit 28208d1c9b8afbb769a5f4d9b0655b99fd4af16e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jul 1 09:52:12 2009 +0200 + + [glib-demo] Do not use gio if glib < 2.15 + + Fixes bug #22530. + + glib/demo/main.c | 33 +++++++++++++++++++++++++++++++-- + 1 file changed, 31 insertions(+), 2 deletions(-) + +commit 6ef83414ab55294cf46b6b05813927bb04066986 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 30 23:07:00 2009 +0200 + + Check getFileSpecNameForPlatform succeeded before using it's return + value + + Fixes crash on bug 22551 + + poppler/Annot.cc | 7 ++++--- + poppler/Link.cc | 30 +++++++++++++++++------------- + poppler/Sound.cc | 8 +++++--- + 3 files changed, 26 insertions(+), 19 deletions(-) + +commit 4b9db83841a8b97df1e0991c1b853897b7095777 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 30 11:24:29 2009 +0200 + + [glib-demo] Do not fill the surface before rendering + + The surface is guaranteed to be cleared + + glib/demo/render.c | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +commit 5deb6db5d340c08f337d2ba67aa1fd690e4eedd8 +Author: William Bader <williambader@hotmail.com> +Date: Mon Jun 29 21:55:49 2009 +0200 + + Fix interpolate parameter position + + poppler/SplashOutputDev.cc | 3 ++- + utils/ImageOutputDev.cc | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit e1e9ae2826eff1665d798b4b50b5c63e8282246b +Author: Pino Toscano <pino@kde.org> +Date: Sun Jun 28 20:11:42 2009 +0200 + + [Qt4 demo] do not crash when changing the zoom with no document + + qt4/demos/pageview.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +commit a98de97137cb343182bd03c443fc08ff4e0fd9a5 +Author: Pino Toscano <pino@kde.org> +Date: Sun Jun 28 19:08:02 2009 +0200 + + [Qt4 demo] add a zoom combobox + + qt4/demos/navigationtoolbar.cpp | 33 ++++++++++++++++++++++++++++++++- + qt4/demos/navigationtoolbar.h | 7 ++++++- + qt4/demos/pageview.cpp | 14 ++++++++++++-- + qt4/demos/pageview.h | 6 +++++- + qt4/demos/viewer.cpp | 2 ++ + 5 files changed, 57 insertions(+), 5 deletions(-) + +commit 40002d2c765398869a3b7d8d92715f0608e39ab3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 28 16:45:19 2009 +0200 + + Make sure the array is big enough to read from it + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0a1b41ff6de5a41e3450ecbcb1ba754dc06c29d9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jun 26 19:31:22 2009 +0200 + + Do not crash when we can't find onStr + + Fixes crash in bug #22485 + Not sure this is the best solution, but Adobe doesn't even open + the file + + poppler/Form.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 6cb846664e57b02c99f1e6ad2b4e9128c9622e0a +Author: Ilya Gorenbein <igorenbein@finjan.com> +Date: Thu Jun 25 20:13:29 2009 +0200 + + Initilize AnnotColot properly when the Array is not correct + + poppler/Annot.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 5fdc3acb8dded2e7d08e6ef30f4c5ae1a4a11b5e +Author: Till Kamppeter <till.kamppeter@gmail.com> +Date: Mon Jun 22 21:38:23 2009 +0200 + + Only change the page size when it really changes, otherwise duplex + commands are lost + + poppler/PSOutputDev.cc | 10 +++++++++- + poppler/PSOutputDev.h | 4 ++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit bf69beeb257cfd750c6ddc8b68aeb859b36380b2 +Author: David Benjamin <davidben@mit.edu> +Date: Sat Jun 20 23:51:09 2009 +0200 + + Make DecryptStream return sane values for getPos() + + Many streams (notably JBIG2Stream) expect wrapped streams to return + correct + values for getPos(), i.e. increments by 1 when readChar() called, etc. + Fixes bug #19706. + + poppler/Decrypt.cc | 8 ++++++++ + poppler/Decrypt.h | 3 +++ + 2 files changed, 11 insertions(+) + +commit 5ee4ff2aaf98e2eaa1ec2dc9f7e659b3b01ba7bf +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jun 20 15:00:16 2009 +0200 + + [glib-demo] Allow using relative paths in demo application + + glib/demo/main.c | 17 +++++------------ + 1 file changed, 5 insertions(+), 12 deletions(-) + +commit a568248d3255407fcaa7368c4925c20e95619d20 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jun 19 21:07:39 2009 +0200 + + 0.11.1 + + CMakeLists.txt | 2 +- + NEWS | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 5 files changed, 54 insertions(+), 8 deletions(-) + +commit ac99e239f2726db32617ff03174a6ce74361ea1b +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jun 19 21:03:29 2009 +0200 + + ship PopplerCache.h + + CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 84984d2aa25917d68c9971cefe636e626eada13d +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jun 19 20:54:15 2009 +0200 + + Ship PopplerCache.h too + + poppler/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 3a52d46e5df8eb926b550d7f7a82f316dbf6808f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jun 19 17:45:44 2009 +0200 + + [glib-demo] Destroy pattern after using it + + glib/demo/render.c | 1 + + 1 file changed, 1 insertion(+) + +commit 2e97524e5d82a4c33a4e6410fead444681db6749 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jun 19 14:20:16 2009 +0200 + + [glib-demo] Use a transparent surface and fill it in white after + rendering + + glib/demo/render.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 009937842d5a8bfc12394e9e3ab71b7c33340a85 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jun 19 14:10:05 2009 +0200 + + [glib-demo] Use cairo_paint instead of rectangle + fill + + glib/demo/render.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 7248da095f67d57c3999cee7d980e62fd8a7cf49 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jun 19 09:37:02 2009 +0200 + + Use Interpolate flag to decide whether applying image interpolation + during rendering + + Fixes bug #9860 + + poppler/ArthurOutputDev.cc | 4 +- + poppler/ArthurOutputDev.h | 5 ++- + poppler/CairoOutputDev.cc | 92 + ++++++++++++++++++++++++++------------------- + poppler/CairoOutputDev.h | 48 ++++++++++++----------- + poppler/Gfx.cc | 49 ++++++++++++++++++++---- + poppler/OutputDev.cc | 17 ++++++--- + poppler/OutputDev.h | 13 ++++--- + poppler/PSOutputDev.cc | 8 ++-- + poppler/PSOutputDev.h | 8 ++-- + poppler/PreScanOutputDev.cc | 25 ++++++++++-- + poppler/PreScanOutputDev.h | 25 ++++++++++-- + poppler/SplashOutputDev.cc | 16 +++++--- + poppler/SplashOutputDev.h | 12 ++++-- + utils/HtmlOutputDev.cc | 16 ++++---- + utils/HtmlOutputDev.h | 7 ++-- + utils/ImageOutputDev.cc | 20 +++++----- + utils/ImageOutputDev.h | 12 ++++-- + 17 files changed, 248 insertions(+), 129 deletions(-) + +commit 37e3f877ee725648734ff41e1e83870a210bcbd7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jun 19 00:37:21 2009 +0200 + + Handle Streams in CMap definitions + + Fixes bug 22334 + + poppler/CMap.cc | 50 + ++++++++++++++++++++++++++++++------------------- + poppler/CMap.h | 17 ++++++++++++----- + poppler/GfxFont.cc | 41 +++++++++++++++++++++++++++------------- + poppler/GlobalParams.cc | 6 +++--- + poppler/GlobalParams.h | 5 +++-- + 5 files changed, 77 insertions(+), 42 deletions(-) + +commit 47de8eef46300832556ce5ed869e391e477fd843 +Author: David Benjamin <davidben@mit.edu> +Date: Fri Jun 19 00:30:35 2009 +0200 + + Fix some bugs in JBIG2Stream handling + + For more info see bug 12014 and [poppler] Bug in JBIG2Stream from + 08-June-2009 + + poppler/JBIG2Stream.cc | 88 + +++++++++++++++++++++++++++----------------------- + poppler/JBIG2Stream.h | 15 +++++++++ + 2 files changed, 63 insertions(+), 40 deletions(-) + +commit d30b1013ea3ce45b5ea942fe7357c0fd07ff47f4 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 2 11:44:08 2009 +0200 + + Add setOpen() and setIcon() in AnnotText + + poppler/Annot.cc | 25 +++++++++++++++++++++++++ + poppler/Annot.h | 3 +++ + 2 files changed, 28 insertions(+) + +commit 287feffc1c1c0aa42a398fc071b489acef9ef22e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 2 11:26:40 2009 +0200 + + Add setLabel() and setPopup() to AnnotMarkup + + poppler/Annot.cc | 36 ++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 4 ++++ + 2 files changed, 40 insertions(+) + +commit 2a938af5624fbc79316dd6bee5e550f2b4270a76 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 2 10:59:44 2009 +0200 + + Add setParent() and setOpen() to AnnotPopup + + poppler/Annot.cc | 19 +++++++++++++++++++ + poppler/Annot.h | 4 ++++ + 2 files changed, 23 insertions(+) + +commit 0af5464352dfa51f0458c57a3590c847a45964c7 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 2 10:37:49 2009 +0200 + + Save parent reference of popup annotations + + poppler/Annot.cc | 16 +++++----------- + poppler/Annot.h | 4 ++-- + 2 files changed, 7 insertions(+), 13 deletions(-) + +commit fc4bc43dcd6f6871a47b9198e8c2571a5d448c3e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Jun 1 14:52:21 2009 +0200 + + Fix a crash in pdf-inspector + + test/pdf-inspector.cc | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 3da7a2657892fde52b62e1f73476cb33d6c75e96 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri May 29 13:35:39 2009 +0200 + + Add Annot::setColor() + + poppler/Annot.cc | 19 ++++++++++++++++++- + poppler/Annot.h | 6 +++++- + 2 files changed, 23 insertions(+), 2 deletions(-) + +commit 3eabdf57729852205855cf74ff2d2f9d7bc03f73 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri May 29 13:23:26 2009 +0200 + + Add construtors to create AnnotColor objects directly from color + values + + poppler/Annot.cc | 26 ++++++++++++++++++++++++++ + poppler/Annot.h | 3 +++ + 2 files changed, 29 insertions(+) + +commit 8045e7a1a84a3d54a1c9415ac63b5b9df5ecc349 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri May 29 13:06:40 2009 +0200 + + Add Page::addAnnot() to add a new annotation to the page + + poppler/Page.cc | 28 ++++++++++++++++++++++++++++ + poppler/Page.h | 2 ++ + 2 files changed, 30 insertions(+) + +commit fe80eb84ec711b7400cef95e791a74c8fd259af7 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri May 29 13:00:19 2009 +0200 + + Add getRef() to get the annotation reference + + poppler/Annot.h | 1 + + 1 file changed, 1 insertion(+) + +commit 1c92657be72c44dba7185808ffb00dd85c5ab289 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri May 29 12:14:02 2009 +0200 + + Save page object and ref in Page class + + This is needed to be able to modify the page object. + + poppler/Catalog.cc | 2 +- + poppler/Page.cc | 6 +++++- + poppler/Page.h | 4 +++- + 3 files changed, 9 insertions(+), 3 deletions(-) + +commit 4ad2d663262008e4b97342c4ed67c686ff5abd13 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri May 29 11:43:30 2009 +0200 + + Add annot constructors to create annot objects without a dict + + This allows to create annotation objects to be added to the document. + Required fields on the annotation dictionary are constructor + arguments, + setters will be added for the other fields. + + poppler/Annot.cc | 300 + +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + poppler/Annot.h | 22 +++- + 2 files changed, 315 insertions(+), 7 deletions(-) + +commit e5c4862b0c1b08a0fab47070cb9c862026e93567 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 10 23:28:03 2009 +0200 + + ignore++ + + m4/.gitignore | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 572779f8037763c1e0ee64c47a3dad6df0d3b693 +Author: Koji Otani <sho@bbr.jp> +Date: Wed Jun 10 22:55:26 2009 +0200 + + Fix dashed line in page 1 of bug 20011 + + poppler/Gfx.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit b97591672e0d9c31a3d044fe52e34cc80a491221 +Author: Koji Otani <sho@bbr.jp> +Date: Wed Jun 10 22:54:57 2009 +0200 + + Fix "Conditional jump or move depends on uninitialised value" + + When stroking with a pattern, set strokeColor with a copy of + fillColor. + This is wrong and the fillColor may be uninitialized. + See bug 20011 + + poppler/Gfx.cc | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +commit a92b38836b1e4475d5a7a1b9cb8f3e9429cef275 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 9 22:39:19 2009 +0200 + + Correctly duplicate the cache on PostScriptFunction(PostScriptFunction + *func) + + poppler/Function.cc | 28 ++++++++++++++++++++++++++++ + poppler/PopplerCache.cc | 20 ++++++++++++++++++++ + poppler/PopplerCache.h | 14 ++++++++++++++ + 3 files changed, 62 insertions(+) + +commit 2cecdf922f4c8178b0e55d3ddf86c31f8be3313a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jun 9 11:04:39 2009 +0200 + + [glib] Fix a crash when a destination points to an invalid page + + glib/poppler-action.cc | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +commit 831288c13c3a7502bbccd1313c6e376283be367c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 7 18:37:20 2009 +0200 + + Optimize roll() a bit + + If the number of times to roll is > than half the number of items + rotate in the reverse direction + Makes it be 33% of exec() instead of 42% + + poppler/Function.cc | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +commit 3d40dcad850a2bc0e28845a15722db0c79920135 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 7 13:38:50 2009 +0200 + + Move the GfxState cache to the new poppler cache class + + poppler/GfxState.cc | 97 + +++++++++++++++++++++++++---------------------------- + poppler/GfxState.h | 19 ++--------- + 2 files changed, 49 insertions(+), 67 deletions(-) + +commit 2619e09833f421fb3d8cc68d41d15081ae6824e4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 7 13:37:40 2009 +0200 + + Implement a cache for PostscriptFunction transforms + + Makes time of rendering of bug 21562 go down from 24 to 8 seconds + + poppler/Function.cc | 76 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Function.h | 2 ++ + 2 files changed, 78 insertions(+) + +commit 588bfe3c14f42be492066c2a98e30482475a6926 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 7 13:36:39 2009 +0200 + + Add a code to a generic cache based on Koji's code for GfxState cache + + CMakeLists.txt | 1 + + poppler/Makefile.am | 1 + + poppler/PopplerCache.cc | 82 + +++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/PopplerCache.h | 47 ++++++++++++++++++++++++++++ + 4 files changed, 131 insertions(+) + +commit d09478fcc44b5c594f1803fc24654af5e10fa129 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 7 01:34:01 2009 +0200 + + Move index and pop to class definition too + + poppler/Function.cc | 32 +++++++++++++++----------------- + 1 file changed, 15 insertions(+), 17 deletions(-) + +commit 2083264e8ab0fd9976294de08a18de615d5a1168 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 7 01:21:19 2009 +0200 + + Move the implementations to the class definition + + Make gcc inline the functions and time to render a heavy PSFunction + doc goes from 28 to 20 secs + + poppler/Function.cc | 151 + ++++++++++++++++++++++++---------------------------- + 1 file changed, 71 insertions(+), 80 deletions(-) + +commit 24580fcd2be74db5f3140bdb2ebff8431b7d3f1e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jun 6 16:17:26 2009 +0200 + + Add a debug saying how much rendering took + + qt4/tests/test-poppler-qt4.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +commit 50cf7cffff760e41774957ad8f1f92803142438e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jun 6 16:04:54 2009 +0200 + + Use g_path_get_basename instead of g_basename in gtk-cairo-test + + Fixes bug #21361. + + test/gtk-cairo-test.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 4cc9dee35e03d7b295a476f937ec0f2c43bb6592 +Author: Christian Persch <chpe@gnome.org> +Date: Sat Jun 6 12:13:48 2009 +0200 + + Remove unneeded files from repo + + See bug #22094 + + configure.ac | 2 +- + glib/reference/Makefile.am | 4 +- + gtk-doc.make | 155 + --------------------------------------------- + m4/gtk-doc.m4 | 53 ---------------- + 4 files changed, 3 insertions(+), 211 deletions(-) + +commit c94e476dbff9e527c72e52377d830f35f29ba3d6 +Author: Pino Toscano <pino@kde.org> +Date: Fri Jun 5 11:09:44 2009 +0200 + + when showing the tooltip for a text rect, show also its index in + the page text boxes list + + qt4/tests/test-poppler-qt4.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 2298acac267257b1916c802bdb902428e69e683b +Author: Pino Toscano <pino@kde.org> +Date: Fri Jun 5 11:08:51 2009 +0200 + + [Qt4 apidox] FontInterator is new in 0.12 + + qt4/src/poppler-qt4.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 37c48c2521c623c485841472c4a174a1841aea33 +Author: Pino Toscano <pino@kde.org> +Date: Fri Jun 5 10:54:30 2009 +0200 + + [CMake] Add poppler version defines and version check macro + + Add POPPLER_[MAJOR|MINOR|MICRO]_VERSION defines and + POPPLER_CHECK_VERSION macro. FDO bug #22091. + + CMakeLists.txt | 5 ++++- + glib/poppler-features.h.cmake | 9 +++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 26f6fb1d79c2589829cd896d57da63d16641f307 +Author: Pino Toscano <pino@kde.org> +Date: Fri Jun 5 10:51:26 2009 +0200 + + [CMake] switch poppler-features.h.cmake to a more autotools-like + syntax + + glib/CMakeLists.txt | 2 +- + glib/poppler-features.h.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 89704635b727db42f6c72ba101091eb7eddb967a +Author: Pino Toscano <pino@kde.org> +Date: Fri Jun 5 10:39:17 2009 +0200 + + [Qt4 demo] compile the new thumbnail module with autotools as well + + qt4/demos/Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + +commit 291bafe64c8755fe5f85a51b184ac6e3d3170e1d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jun 5 10:07:16 2009 +0200 + + [glib] Use g_strerror instead of strerror + + Fixes bug #22095. + + glib/poppler-document.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0ca7e214fb5f9c9fb59792149bd23c1617d38cac +Author: Christian Persch <chpe@gnome.org> +Date: Thu Jun 4 22:35:40 2009 +0200 + + Add poppler version defines and version check macro + + Add POPPLER_[MAJOR|MINOR|MICRO]_VERSION defines and + POPPLER_CHECK_VERSION macro. FDO bug #22091. + + configure.ac | 11 ++++- + glib/poppler-features.h.in | 9 ++++ + glib/reference/poppler-docs.sgml | 1 + + glib/reference/poppler-sections.txt | 10 ++++ + glib/reference/tmpl/poppler-features.sgml | 80 + +++++++++++++++++++++++++++++++ + 5 files changed, 110 insertions(+), 1 deletion(-) + +commit 4ce04da0040e5a2626c110f94a128e2d272401b9 +Author: Matthias Drochner <M.Drochner@fz-juelich.de> +Date: Thu Jun 4 23:05:22 2009 +0200 + + Use the correct value when creating the V field + + PDF Spec says: + For items represented in the Opt array by a two-element array, + the name string is the second of the two array elements. + + poppler/Form.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 7e01e37a834bfdd75d739ea2b48e9127ca7f259e +Author: Till Kamppeter <till.kamppeter@gmail.com> +Date: Thu Jun 4 20:25:55 2009 +0200 + + Add part of fix for bug 20420, the other part was checked in with + Thomas patches + + poppler/PSOutputDev.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 50a7b4bcaa6e5f56cc25fe6936f9dc537a1b4b37 +Author: Jeremy C. Reed <reed@reedmedia.net> +Date: Thu Jun 4 20:19:03 2009 +0200 + + [glib] Hyphenate UTF-8 and UTF-16BE + + Fixes bug #21953. + + where iconv() is called to fill in a text field, use "UTF-8" and + "UTF-16BE" as encoding names rather than the less portable + "UTF8" and "UTF16BE" -- this makes it work on NetBSD. + + glib/poppler-annot.cc | 2 +- + glib/poppler-form-field.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 2cf9e6a2318b770ae62572944c687576d1801d31 +Author: Till Kamppeter <till.kamppeter@gmail.com> +Date: Thu Jun 4 19:48:42 2009 +0200 + + Support multiple page sizes when converting to PS + + Fixes byg #19777 + + poppler/PSOutputDev.cc | 31 +++++++++++++++++++++++++++++-- + poppler/PSOutputDev.h | 4 +++- + utils/pdftops.1 | 26 +++++++++++++++++++++----- + utils/pdftops.cc | 17 ++++++++++++----- + 4 files changed, 65 insertions(+), 13 deletions(-) + +commit 30fb7cb7e47cf6a8008c5083c8d0978fdfdf8e62 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jun 4 19:25:22 2009 +0200 + + Add missing { } + + poppler/Gfx.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1beec21ed3a016998fee3849d460166895db9047 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 3 22:37:43 2009 +0200 + + Give an error when using level1sep without having CMYK support + + Fixes bug #22026 + + poppler/PSOutputDev.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit e80d645c34c7d44d1f35da0a25669d1c4cde6e7f +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 3 22:00:49 2009 +0200 + + Also accept tokens with to leading 00 + + Fixes bug 22025, based on a patch by William Bader + + poppler/CharCodeToUnicode.cc | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit e521c1efaeba3f35d10e46bca3d9650dabd2d889 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Wed Jun 3 22:08:57 2009 +0930 + + Implement text in pattern colorspace for the cairo backend + + poppler/CairoOutputDev.cc | 47 + +++++++++++++++++++++++++++++++++++++++++++++++ + poppler/CairoOutputDev.h | 19 +++++++++++++++++++ + 2 files changed, 66 insertions(+) + +commit a87978b09a026b2db6b0f80271d87b44b336a121 +Author: Pino Toscano <pino@kde.org> +Date: Wed Jun 3 13:49:56 2009 +0200 + + [Qt4 demo] show the checksum for embedded files + + qt4/demos/embeddedfiles.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit db5102842494a124d813db1696bb60820db3442b +Author: Pino Toscano <pino@kde.org> +Date: Wed Jun 3 13:21:22 2009 +0200 + + [Qt4 demo] remove checks for Qt >= 4.2 + + poppler-qt4 requires Qt 4.3, so checking for 4.2 is no more needed + + qt4/demos/embeddedfiles.cpp | 2 -- + qt4/demos/fonts.cpp | 2 -- + qt4/demos/info.cpp | 2 -- + qt4/demos/optcontent.cpp | 2 -- + qt4/demos/permissions.cpp | 2 -- + qt4/demos/toc.cpp | 2 -- + 6 files changed, 12 deletions(-) + +commit e8d897581656ee4a20e9bb87dd999425663ace3b +Author: Pino Toscano <pino@kde.org> +Date: Wed Jun 3 02:54:29 2009 +0200 + + [Qt4 demo] simplier way to change page from the thumbnail view + + qt4/demos/pageview.cpp | 5 ----- + qt4/demos/pageview.h | 3 --- + qt4/demos/thumbnails.cpp | 2 +- + qt4/demos/thumbnails.h | 3 --- + qt4/demos/viewer.cpp | 1 - + 5 files changed, 1 insertion(+), 13 deletions(-) + +commit f69a4fe47d3478cccbc03e4ac0929c7eada681c0 +Author: Pino Toscano <pino@kde.org> +Date: Wed Jun 3 01:24:21 2009 +0200 + + [Qt4 demo] Add a thumbnail dock widget + + Useful to show the embedded page thumbnails in the document, if any. + Based on a patch by Shawn Rutledge <shawn.t.rutledge@gmail.com>, + reworked by me to be a QListWidget showing the page items at their + full size. + + qt4/demos/CMakeLists.txt | 1 + + qt4/demos/thumbnails.cpp | 84 + ++++++++++++++++++++++++++++++++++++++++++++++++ + qt4/demos/thumbnails.h | 51 +++++++++++++++++++++++++++++ + qt4/demos/viewer.cpp | 11 ++++++- + 4 files changed, 146 insertions(+), 1 deletion(-) + +commit 2f24ac0f4bbd6de1c9f137110b3ac2bd3b23b0b9 +Author: Shawn Rutledge <shawn.t.rutledge@gmail.com> +Date: Wed Jun 3 01:22:31 2009 +0200 + + [Qt4 demo] add a public slot to set the current page + + qt4/demos/pageview.cpp | 5 +++++ + qt4/demos/pageview.h | 3 +++ + 2 files changed, 8 insertions(+) + +commit 1f1baf186f9e37606765e51ec5b9893ddfbfa893 +Author: Shawn Rutledge <shawn.t.rutledge@gmail.com> +Date: Wed Jun 3 01:19:16 2009 +0200 + + [Qt4] Add Page::thumbnail() + + This function can be used to get the embedded thumbnail of the page, + present in the document. + Reindented by me, and avoid a memory leak because of non-freed data. + + qt4/src/poppler-page.cc | 21 ++++++++++++++++++++- + qt4/src/poppler-qt4.h | 11 +++++++++++ + 2 files changed, 31 insertions(+), 1 deletion(-) + +commit 5cc24be1e9af0a27ab88ffa719bcabc2378868e4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 3 00:05:54 2009 +0200 + + Remove unused variables + + poppler/SplashOutputDev.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit 45823bf8f4abacbbf257f6708264de074eda3cf4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 3 00:02:54 2009 +0200 + + Make it compile :-/ + + poppler/SplashOutputDev.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit f5ae14907261a46c121f3ed7aea9d7ad9b9c55de +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 2 23:52:59 2009 +0200 + + Really fix the typo + + README | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5d4b1995cdd57db7cef3d88704850aaf66ed7fff +Author: William Bader <williambader@hotmail.com> +Date: Tue Jun 2 23:10:53 2009 +0200 + + Fix three typos in README + + README | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 104f9286ceb5fcb5f4795bca7633029142d5f6a4 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Tue Jun 2 22:59:42 2009 +0200 + + Support colorizing text in pattern colorspace + + This implements commits the final patches for bug 19670 and 19994 + Also fixes bugs 15819 and 2807 + Also implements blending for SPLASH_CMYK in Splash + It's a quite big change but i've done regression testing over my whole + pdf suite and did not fit anything that went worse, just improvements + Missing the Cairo support + + CMakeLists.txt | 1 + + poppler/Gfx.cc | 135 ++++++++++++--- + poppler/Gfx.h | 7 + + poppler/GfxState.cc | 58 +------ + poppler/GfxState_helpers.h | 80 +++++++++ + poppler/Makefile.am | 1 + + poppler/OutputDev.h | 14 ++ + poppler/PSOutputDev.cc | 285 +++++++++++++++++++------------- + poppler/PSOutputDev.h | 18 ++ + poppler/SplashOutputDev.cc | 404 + ++++++++++++++++++++++++++++++++++++++------- + poppler/SplashOutputDev.h | 19 +++ + 11 files changed, 766 insertions(+), 256 deletions(-) + +commit d3e4563146cbff4cb507522783e60462461c7524 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Sun May 31 23:23:07 2009 +0200 + + Set memory to 0 after allocation, fixes problems on Sun machines, + should not hurt for others + + poppler/GfxState.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 78a58931b4347ecb505bad5a51104382ef5f91c7 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Sun May 31 22:52:23 2009 +0200 + + Add splashClearColor that assigns white to the given colorptr + + splash/SplashTypes.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 47c26747b32c242ec8ac60e7b93150a67eb22e31 +Author: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Sun May 31 22:51:22 2009 +0200 + + Fix splashColorModeNComps to correctly include all values for each + SplashColorMode + + splash/SplashState.cc | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 41775d8c0b44bf591d8ff5ede7fad276e8fa9eef +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Jun 1 15:24:24 2009 +0200 + + [glib-demo] Use poppler_annot_markup_has_popup() + + glib/demo/annots.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit f542c5294394e837298cb7e7d1d94bb336bfd09d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Jun 1 15:24:04 2009 +0200 + + [glib] Add poppler_annot_markup_has_popup() + + glib/poppler-annot.cc | 20 ++++++++++++++++++++ + glib/poppler-annot.h | 1 + + 2 files changed, 21 insertions(+) + +commit af32d56af779edcc539b680e634755941d1bf45c +Author: Petr Gajdos <pgajdos@novell.com> +Date: Thu May 21 00:37:18 2009 +0200 + + Add the possibility of forcing no hinting of fonts + + poppler/ArthurOutputDev.cc | 2 ++ + poppler/GlobalParams.cc | 20 ++++++++++++ + poppler/GlobalParams.h | 4 +++ + poppler/SplashOutputDev.cc | 2 ++ + splash/SplashFTFont.cc | 76 + +++++++++++++++++++++++++++----------------- + splash/SplashFTFont.h | 2 ++ + splash/SplashFTFontEngine.cc | 8 +++-- + splash/SplashFTFontEngine.h | 6 ++-- + splash/SplashFontEngine.cc | 4 ++- + splash/SplashFontEngine.h | 2 ++ + 10 files changed, 91 insertions(+), 35 deletions(-) + +commit 1a69d9638214943b3c2278f570694d9722a5de15 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 20 23:58:44 2009 +0200 + + Do not create the GfxColorTransform if the lcms could not be created + + Fixes crash on pdf from bug 20108 + + poppler/GfxState.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 95246d39c1289111a4ba3eb2ffbec50d7702e5eb +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 20 23:20:20 2009 +0200 + + Check Mask entries are int before using them, also if they are real + cast to int and try to use them + + Fixes bug #21841 + + poppler/Gfx.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 0c3517bfb4e1e1a28962f8d490ad69ec5766b6a1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 20 23:08:41 2009 +0200 + + Fix pdftops crash on file from KDE bug 174899 + + Still does not generate a correct ps file, but at least the program + does not crash now + + fofi/FoFiTrueType.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 548c72600b8a5e076647041660ed5031feedc7cc +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 20 22:43:11 2009 +0200 + + Do not exit(1) on a pdf i have lying around + + PDF is 0f03b3539a436a9f18d7e4e29d410f89 6607907.pdf + + poppler/JBIG2Stream.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit f78d3a7ff5ef4b500d76d84ebc45aac3be162dab +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 18 20:44:40 2009 +0200 + + Move lcms.h include to GfxState.cc, replace lcms typedefs by void * + + poppler/GfxState.cc | 70 + ++++++++++++++++++++++++++++++++++++++++++++++------- + poppler/GfxState.h | 64 +++++++++++------------------------------------- + 2 files changed, 75 insertions(+), 59 deletions(-) + +commit ec2467f9981b7e7c23d5dcd8eabf2e7c8cdf8930 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun May 17 20:00:53 2009 +0200 + + Use the lcms include dir + + CMakeLists.txt | 3 +++ + poppler/Makefile.am | 2 ++ + 2 files changed, 5 insertions(+) + +commit e0fcf7055af480498a81a000dcd9f977a783df66 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun May 17 12:07:05 2009 +0200 + + Use pkgconfig for autotools cms check + + configure.ac | 12 +++++++----- + poppler/Makefile.am | 2 +- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 657734c19274ab281328cba9297eca45e48777aa +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun May 17 12:06:47 2009 +0200 + + Better lcms check comming from kdelibs + + cmake/modules/FindLCMS.cmake | 95 + +++++++++++++++++++++++++++++++++----------- + 1 file changed, 71 insertions(+), 24 deletions(-) + +commit 0974b7b4bfe3f8cf3a1408741ddf01c667c28044 +Author: Patrick Spendrin <ps_ml@gmx.de> +Date: Thu May 14 16:15:22 2009 +0200 + + [Win32] Build fix for MSVC. + + poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit d1c0e8a6c63361304cd453bb4c51e84a1aab7efa +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu May 14 00:29:18 2009 +0200 + + Kill support for specifying extension in openTmpFile + + We don't use it and it would not work anyway, see bug #21713 + + goo/gfile.cc | 58 + ++++++++++---------------------------------- + goo/gfile.h | 3 ++- + poppler/CairoFontEngine.cc | 6 ++--- + splash/SplashFTFontEngine.cc | 3 ++- + splash/SplashT1FontEngine.cc | 3 ++- + splash/SplashT1FontFile.cc | 3 ++- + 6 files changed, 24 insertions(+), 52 deletions(-) + +commit e237d8b5c2ae8805487a0790d9fb218263686712 +Author: Pino Toscano <pino@kde.org> +Date: Wed May 13 18:37:07 2009 +0200 + + [Qt4] we don't need an output device anymore (since long, even) + for resolving destinations + + qt4/src/poppler-document.cc | 3 --- + 1 file changed, 3 deletions(-) + +commit 9a2a851da93ef1a0c291fc9523a468e808ffd08e +Author: Pino Toscano <pino@kde.org> +Date: Wed May 13 18:19:11 2009 +0200 + + [Qt4] Do not try to resolve named destinations for GoTo links pointing + to external documents. + + In such cases, the named destination is a destination in the external + document, so we would try to look up a destination which is not in + the current document (thus the look up is unuseful). + It is task of the users of poppler-qt4 detect such + situations, and resolve the named when necessary, using + Document::linkDestination(QString). + + qt4/src/poppler-document.cc | 2 +- + qt4/src/poppler-link.cc | 2 +- + qt4/src/poppler-page.cc | 6 ++++-- + qt4/src/poppler-private.cc | 4 ++-- + qt4/src/poppler-private.h | 5 +++-- + 5 files changed, 11 insertions(+), 8 deletions(-) + +commit 51f6cc26fc5fdccce1ba4d4816dec374ce85d67a +Author: Pino Toscano <pino@kde.org> +Date: Wed May 13 17:38:00 2009 +0200 + + [Qt4] start a (basic) unit test for links & destinations + + qt4/tests/CMakeLists.txt | 1 + + qt4/tests/Makefile.am | 5 +++ + qt4/tests/check_links.cpp | 96 + +++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 102 insertions(+) + +commit 174f8087f5e09c5d1915de128b7a15acf47c1e13 +Author: Pino Toscano <pino@kde.org> +Date: Wed May 13 16:44:59 2009 +0200 + + [Qt4] set the destination name only when it is not resolved + + qt4/src/poppler-link.cc | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit fb0cb2add9443992f166acdf744fbec875faaabf +Author: Pino Toscano <pino@kde.org> +Date: Tue May 12 01:53:43 2009 +0200 + + [Qt4] Add LinkDestination::destinationName() that returns the name + of the current destination. + + qt4/src/poppler-link.cc | 10 ++++++++++ + qt4/src/poppler-link.h | 7 +++++++ + 2 files changed, 17 insertions(+) + +commit b8bd44f1302f7b6a6923d41c98ec74c118a5abb8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 11 20:49:34 2009 +0200 + + Poppler 0.11.0 aka 0.12 Alpha 1 + + CMakeLists.txt | 4 +- + NEWS | 142 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + msvc/config.h | 6 +-- + poppler/Makefile.am | 2 +- + qt4/src/Doxyfile | 2 +- + 6 files changed, 150 insertions(+), 8 deletions(-) + +commit 79bcedd5602729b959f21aed222445de621e7ecb +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon May 11 19:59:57 2009 +0200 + + Update copyright headers for previous patches + + poppler/ArthurOutputDev.cc | 1 + + poppler/CairoOutputDev.cc | 2 +- + poppler/Page.cc | 2 +- + poppler/Stream.cc | 1 + + poppler/Stream.h | 1 + + utils/HtmlOutputDev.cc | 1 + + utils/ImageOutputDev.cc | 1 + + 7 files changed, 7 insertions(+), 2 deletions(-) + +commit f16e36df3a74e1adf14513a6340be2e8665f8d65 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun May 10 19:24:32 2009 +0200 + + Don't include popups annots with a parent in annots list + + poppler/Annot.cc | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 5051ebed1477ff3f7721606f79d66d56a80c1145 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun May 10 19:10:51 2009 +0200 + + Make sure ImageStream::close() is called after ImageStream::reset() + + poppler/ArthurOutputDev.cc | 1 + + poppler/CairoOutputDev.cc | 20 +++++++++++++++++--- + poppler/Page.cc | 1 + + poppler/Stream.cc | 4 ++++ + poppler/Stream.h | 3 +++ + utils/HtmlOutputDev.cc | 1 + + utils/ImageOutputDev.cc | 1 + + 7 files changed, 28 insertions(+), 3 deletions(-) + +commit 829ed964374676ddfa4a9048c940dc20a309ca47 +Author: M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> +Date: Sun May 10 23:39:11 2009 +0200 + + Fix axial shading fix to ensure the painting passes by the four + edges of the bbox + + When j and teoricalj are the same, just change the value of ta[] + not the next[] ones + + poppler/Gfx.cc | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit 68d9644499676ed1553b2bfcdbfc9a5677c75345 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 9 22:25:12 2009 +0200 + + Hidden property depends on parent being hidden, not only yourself + + Fixes bug #16093 + + poppler/Gfx.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 810a71ea66f0e07d9849a5e9bf28911472482d1b +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri May 8 09:36:31 2009 +0200 + + [glib] Add poppler_annot_markup_get_popup_rectangle + + glib/demo/annots.c | 8 ++++++++ + glib/poppler-annot.cc | 35 +++++++++++++++++++++++++++++++++++ + glib/poppler-annot.h | 2 ++ + 3 files changed, 45 insertions(+) + +commit 5d328282da4713356fbe4283bd992ac2fc9010a2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu May 7 23:11:55 2009 +0200 + + bitmap->h can be 0, move to _checkoverflow variant, code already + knows how to deal with NULL + + splash/SplashFTFont.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5b0fb6f94d6d54b1b0c97762db61e2ab0dd07c85 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 6 22:59:55 2009 +0200 + + Fix format printing + + poppler/JBIG2Stream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c21b08a254f42f53d4b59ad4fb308c7c68c32d15 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed May 6 15:56:21 2009 +0200 + + [glib] Several fixes in poppler_annot_get_color() + + PopplerColor is compatible with GdkColor where every component is + in the + range of 0 to 65535, we were returning values between 0 and 1 but + converted to guint16. + We were also showing a warning when AnnotColor::colorTransparent is + used, but we decided to return a PopplerColor * to be able to + represent + transparent color returning NULL, so it's actually supported. + + glib/demo/annots.c | 25 +++++++++++-------------- + glib/poppler-annot.cc | 36 +++++++++++++++++++++--------------- + 2 files changed, 32 insertions(+), 29 deletions(-) + +commit 63cc40ec02498e1ec249d5f74e23f574c665872e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 2 14:08:23 2009 +0200 + + Link pdftoabw to abiword libs + + Fixes bug #21520 + + utils/Makefile.am | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +commit 70e06e9ae28d08bb7495a7f2eb03b0b5714a1e54 +Author: Kouhei Sutou <kou@cozmixng.org> +Date: Wed Apr 29 09:52:21 2009 +0900 + + PopplerAttachment refers its document. + + glib/poppler-attachment.cc | 41 +++++++++++++++++++++++++++++++++++------ + 1 file changed, 35 insertions(+), 6 deletions(-) + +commit 977a13f1091700bf7e7b31859e0e6632dc323462 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Apr 25 19:07:01 2009 +0200 + + [glib] Only create checksum string for valid checksums + + glib/poppler-attachment.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit fb6e7141e3008ae230ae5819e2c7a0425296d8d2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Apr 24 10:13:53 2009 +0200 + + Update copyright headers + + glib/poppler-annot.cc | 1 + + glib/poppler-annot.h | 1 + + poppler/Annot.cc | 2 +- + poppler/Annot.h | 2 +- + poppler/DateInfo.cc | 1 + + poppler/DateInfo.h | 1 + + 6 files changed, 6 insertions(+), 2 deletions(-) + +commit fc7e52fef0317f9c85ead2c4f8a0e9b688decca3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Apr 24 09:53:41 2009 +0200 + + Fix typos in Annot::setContents() documentation + + poppler/Annot.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit df0032cf5f6e5dc44bad056c659180e4065d32e2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Apr 23 13:19:25 2009 +0200 + + Document Annot::setContents() method + + poppler/Annot.h | 2 ++ + 1 file changed, 2 insertions(+) + +commit 86a37a8f3f93e3378b446f8d81d80571267c7660 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Apr 23 13:16:04 2009 +0200 + + Update the annotation last modified time when it's modified + + poppler/Annot.cc | 26 ++++++++++++++++---------- + poppler/Annot.h | 7 ++++--- + 2 files changed, 20 insertions(+), 13 deletions(-) + +commit 9662bfa2b4b2282d0fc29d2a327b62d8bde56ff2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Apr 23 13:13:07 2009 +0200 + + Add timeToDateString() to DateInfo + + This function converts a time_t into a string in PDF date format. + + configure.ac | 1 + + poppler/DateInfo.cc | 47 +++++++++++++++++++++++++++++++++++++++++++++++ + poppler/DateInfo.h | 7 +++++++ + 3 files changed, 55 insertions(+) + +commit dc4cf0c29b53cda5c1c2badc5026af3429502e3a +Author: Pino Toscano <pino@kde.org> +Date: Tue Apr 21 21:51:52 2009 +0200 + + add poppler-date.{cc,h} + + glib/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 0750c6502faeabff571f5730b567097e793dca64 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Apr 21 20:04:27 2009 +0200 + + [glib-demo] Fix dates handling in annots demo + + glib/demo/annots.c | 69 + +++++++++++------------------------------------------- + 1 file changed, 14 insertions(+), 55 deletions(-) + +commit fe73bf9771e8294af4c8a11ec4c2891ff8f8d859 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Apr 21 20:02:25 2009 +0200 + + [glib-demo] GTime is deprecated, use time_t instead + + glib/demo/utils.c | 2 +- + glib/demo/utils.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 6d468cfa0cb89760e5d6cca43521cde6d99aa52e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Apr 21 20:00:20 2009 +0200 + + [glib-demo] Use format_date from utils and remove duplicated code + + glib/demo/info.cc | 27 ++------------------------- + 1 file changed, 2 insertions(+), 25 deletions(-) + +commit e5f5ea01d0da4c4d877b93755523dc2a7f2ec049 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Apr 21 19:57:11 2009 +0200 + + [glib] Fix poppler_annot_markup_get_date() + + Date field in Markup annots is also a PDF format date string, so it + should be parsed and the resulting time_t used to create a correct + GDate. + + glib/poppler-annot.cc | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +commit 876ad1bcc8a7b2f37656bf15cee7eb888fd46ed4 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Apr 21 19:36:33 2009 +0200 + + [glib] Add info about the return value in poppler_annot_get_modified() + doc + + glib/poppler-annot.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 8c54a15e1715721ee7af7e82c90b8dda3689c65f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Apr 21 19:35:14 2009 +0200 + + [glib] Fix a typo in poppler_date_parse documentation + + glib/poppler-date.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 39d09fa237d06fa93b02eb916d2c0242c4e8fe85 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Apr 21 19:29:32 2009 +0200 + + [glib] Add poppler_date_parse to parse PDF format date strings + + We need to make this public because the field M in the Annot + dictionary + might be a Date string (in PDF date format) or a text + string. According + to the PDF spec: "The preferred format is a date string as described + in + Section 3.8.3, “Dates,” but viewer applications should be + prepared to + accept and display a string in any format". The only way to know + whether + it's a PDF date string or not, is by trying to parse it. For this + reason + poppler_annot_get_modified() returns a gchar * instead of a + time_t. So, + viewers should try to parse the string in order to convert it to a + time_t, and if it fails to parse, use the date string as provided + by the + document. + + glib/Makefile.am | 2 ++ + glib/poppler-attachment.cc | 4 +-- + glib/poppler-date.cc | 66 + ++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-date.h | 30 +++++++++++++++++++++ + glib/poppler-document.cc | 45 ++++++------------------------- + glib/poppler-private.h | 2 +- + glib/poppler.h | 1 + + 7 files changed, 110 insertions(+), 40 deletions(-) + +commit 9c2714a3e1c02f445661618e24bcd27f1392b2b7 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Apr 21 18:08:06 2009 +0200 + + [glib] Implement poppler_annot_set_contents() + + glib/poppler-annot.cc | 25 +++++++++++++++++++++++++ + glib/poppler-annot.h | 2 ++ + 2 files changed, 27 insertions(+) + +commit eec550e8b3cf96aefed9b03a78d365c2848fb8f2 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Apr 21 18:06:34 2009 +0200 + + Add setContents() to modify the annot contents + + poppler/Annot.cc | 26 +++++++++++++++++++++++++- + poppler/Annot.h | 4 ++++ + 2 files changed, 29 insertions(+), 1 deletion(-) + +commit 047a8870a8cea9b680080e0d3bf68d0685431233 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Apr 20 23:38:53 2009 +0200 + + In case of err3 or err2 in readPageTree we need to free kidRef too + + poppler/Catalog.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit cb61b555f2c4db8685dec5491ca86570c962aab6 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Apr 18 18:30:04 2009 +0200 + + Extend test-poppler-glib to show more page annotations and actions + + Based on path by Thomas Viehmann <tv@beamnet.de> + + glib/test-poppler-glib.cc | 68 + +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 68 insertions(+) + +commit 2221b8a9ae5e986c79ea3f6c9f3b0246d328c7ab +Author: Matthias Franz <matthias@ktug.or.kr> +Date: Sun Apr 19 23:29:18 2009 +0200 + + Fix decryption using owner password on some pdf + + See bug #21270 + + poppler/Decrypt.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit e20efbf6cc676758b8ef7d2ad607560fcdbbf89e +Author: Peter Kerzum <kerzum@yandex-team.ru> +Date: Fri Apr 17 22:14:26 2009 +0200 + + Fix typo in GfxFont.cc + + poppler/GfxFont.cc | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit b760debea03380280d72cd39d792cbc1a380a87c +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Apr 17 21:04:26 2009 +0200 + + Fix rendering of axial shadings + + Fixes bug #19896 + + poppler/Gfx.cc | 102 + +++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 62 insertions(+), 40 deletions(-) + +commit 9f1312f3d7dfa7e536606a7c7296b7c876b11c00 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Apr 16 22:13:26 2009 +0200 + + Fix problems that happen when parsing broken JBIG2 files + + Fixes + CVE-2009-0799 xpdf OOB Read + CVE-2009-0800 xpdf Multiple Input Validation Flaws + CVE-2009-1179 xpdf Integer Overflow + CVE-2009-1180 xpdf Invalid free() + CVE-2009-1181 xpdf NULL dereference DoS + CVE-2009-1182 xpdf MMR Decoder Buffer Overflows + CVE-2009-1183 xpdf MMR Infinite Loop DoS + + Patch based on a patch by Derek Noonburg + Some files still hit the exit(1) in goo.c but at least none is + really crashing + + poppler/JBIG2Stream.cc | 447 + +++++++++++++++++++++++++++++++++++-------------- + poppler/JBIG2Stream.h | 4 + + 2 files changed, 324 insertions(+), 127 deletions(-) + +commit 284a92899602daa4a7f429e61849e794569310b5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Apr 13 21:51:12 2009 +0200 + + Did a mistake in the gmalloc -> gmallocn commit, it's a 4 here not a 3 + + poppler/SplashOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9cf2325fb22f812b31858e519411f57747d39bd8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 11 00:31:57 2009 +0200 + + More gmalloc → gmallocn + + glib/poppler-page.cc | 2 +- + splash/Splash.cc | 8 ++++---- + splash/SplashBitmap.cc | 6 +++--- + splash/SplashFTFont.cc | 2 +- + 4 files changed, 9 insertions(+), 9 deletions(-) + +commit c399b2d512aa073b0d7cd8eb5413a4b43f0d6aef +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 11 00:26:23 2009 +0200 + + Revert part of last commit, i need more math classes :D + + poppler/JBIG2Stream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7b2d314a61fd0e12f47c62996cb49ec0d1ba747a +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 11 00:23:04 2009 +0200 + + Be paranoid, use gmallocn or gmallocn3 in all gmalloc with * + + poppler/ArthurOutputDev.cc | 4 ++-- + poppler/CairoOutputDev.cc | 14 +++++++------- + poppler/GfxState.cc | 8 ++++---- + poppler/JBIG2Stream.cc | 4 ++-- + poppler/PSOutputDev.cc | 6 +++--- + poppler/SplashOutputDev.cc | 20 ++++++++++---------- + 6 files changed, 28 insertions(+), 28 deletions(-) + +commit 0131f0a01cba8691d10a18de1137a4744988b346 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 11 00:20:55 2009 +0200 + + Add gmallocn3 that does the same as gmallocn but with 3 arguments + + goo/gmem.cc | 22 ++++++++++++++++++++++ + goo/gmem.h | 2 ++ + 2 files changed, 24 insertions(+) + +commit 75c3466ba2e4980802e80b939495981240261cd5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Apr 10 18:05:54 2009 +0200 + + Make it compile in Solaris + + See bug #21080 + + poppler/CairoFontEngine.cc | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 3210970dc1d6faf51bce59bb7ecb6b881f9c0fe6 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Apr 10 13:09:37 2009 +0200 + + [glib] Print annotations with the print flag enabled + + glib/poppler-page.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit b0b9798c85c7c6d6f336f73135a98974897b9f60 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Mar 30 23:26:39 2009 +0200 + + Fix clip test for fonts + + Fixes bug 20950 + I really don't remember why i put that -1 maybe i got mislead by + SplashClip::testRect + having a +1, but the idea of the +1 is correct because it's ints + vs floats + + splash/SplashFTFont.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5c08f57aa80092954746d722bb13655aee3f162c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Mar 29 23:52:31 2009 +0200 + + Forgot Ross copyright + + poppler/TextOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c6d3e7884010ebdcc961d81ca8c692870fc9b139 +Author: Ross Moore <ross@maths.mq.edu.au> +Date: Sun Mar 29 23:46:09 2009 +0200 + + Fix extraction of some ActualText content + + Fixes bug #20013 + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e4b3f7cbcb6ccdfa8b18d8da5f7074f4140b776a +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 25 22:16:07 2009 +0100 + + Fix getGlyphAdvance to behave correctly on font size changes + + Fixes bug #20769 + + splash/SplashFTFont.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 4acde05ac4d0b03466c949138321cc3445a14158 +Author: Eric Toombs <ewtoombs@uwaterloo.ca> +Date: Wed Mar 25 21:11:03 2009 +0100 + + Remove case-insensitive matching of filenames in PDFDoc constructor + + poppler/PDFDoc.cc | 39 ++++++++++----------------------------- + 1 file changed, 10 insertions(+), 29 deletions(-) + +commit 120c7f6697ed1edaff6e17ae1ed202c69f03a73c +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 24 22:56:33 2009 +0100 + + declare the matrix at the beginning + + poppler/ArthurOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 441a9cd56935bfe2d8fddc5d3bc2c0104aeffaca +Author: Eric Toombs <ewtoombs@uwaterloo.ca> +Date: Sun Mar 22 22:50:14 2009 +0100 + + Improved error reporting of ErrOpenFile errors + + See bug #20660 for more information + + glib/poppler-document.cc | 14 ++++++++++--- + poppler/PDFDoc.cc | 54 + ++++++++++++++++++++++++++++-------------------- + poppler/PDFDoc.h | 8 +++++++ + 3 files changed, 51 insertions(+), 25 deletions(-) + +commit 16af0ced4a0762f2f538135bd8dd72b469f6fdca +Author: Michael K. Johnson <a1237@danlj.org> +Date: Sat Mar 21 16:14:06 2009 +0100 + + Support rendering non-square pixels in pdftoppm + + Bug #20702 + + utils/pdftoppm.1 | 16 ++++++++++++++-- + utils/pdftoppm.cc | 37 ++++++++++++++++++++++++++++++++----- + 2 files changed, 46 insertions(+), 7 deletions(-) + +commit a103c60abd5fe4c721b099c005daf22d6350c355 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 21 15:47:12 2009 +0100 + + Update version we need of Qt4 + + CMakeLists.txt | 2 +- + configure.ac | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit c4b1754fdd3a4649551556de2655c8291daafddf +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 21 13:29:38 2009 +0100 + + Bump cairo dependency to 1.8.4 + + Cairo 1.8.4 fixes and important bug that affects the Type 3 font + rendering + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 50c4ee413929e5a70133839e3cde039da738fab2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 18 22:00:05 2009 +0100 + + Add more _checkoverflow variants, rework internals + + goo/gmem.cc | 92 + ++++++++++++++++++++++++++++++------------------------------- + goo/gmem.h | 4 ++- + 2 files changed, 48 insertions(+), 48 deletions(-) + +commit 121c44db0884f0d70ba1470a66aa78441257c421 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Fri Mar 20 23:25:19 2009 +1030 + + Fix cairo luminosity smask when cairo ctm != identity + + poppler/CairoOutputDev.cc | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +commit 3f55aff56a1d2002ba79f3efba5eb77e94575439 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Thu Mar 19 22:34:23 2009 +1030 + + Fix bug in cairo backend with nested masks + + The previous smask was not restored after a q/Q pair or form xobject. + + poppler/CairoOutputDev.cc | 18 +++++++++++++++++- + poppler/CairoOutputDev.h | 5 +++++ + 2 files changed, 22 insertions(+), 1 deletion(-) + +commit 4cc3cb8992ac554352d68e97563823b9bbd556ce +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Mar 20 12:38:28 2009 +0100 + + Bump cairo dependency to 1.8.4 + + Cairo 1.8.4 fixes and important bug that affects the Type 3 font + rendering + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit da94fe717a1ab60fb074fae61d582d1ee7151fc2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Mar 16 22:54:27 2009 +0100 + + Fix parsing of border arrays + + Fixes 19761 + + poppler/Annot.cc | 54 + ++++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 36 insertions(+), 18 deletions(-) + +commit 8df0323f1ca4548a5d5824ece8736b356ce7ca42 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Mar 12 00:09:03 2009 +0100 + + Really fix jpeg lib init order? + + poppler/DCTStream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 12aac6774fc6f92def3d5567051117951cc32223 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 11 23:00:37 2009 +0100 + + fontCIDType2OT fonts can also have a CIDToGIDMap + + Fixes bug #20605 + + poppler/GfxFont.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 0ca9ae2848808d15e7a2b00f5eb33bb8f990c887 +Author: Vincent Torri <vtorri@univ-evry.fr> +Date: Wed Mar 11 00:39:59 2009 +0100 + + remove the fortran check during the initialisation of libtool + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit 710e329a3a6a9ee2eed997c9eeaea21c44237423 +Author: Vincent Torri <vtorri@univ-evry.fr> +Date: Wed Mar 11 00:37:11 2009 +0100 + + Add AC_CONFIG_MACRO_DIR([m4]) + + It is used by autoreconf to trace changes in m4 macros that are in + the m4/ subdirectory. + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit d15e47158ae31909212d3875159046afb208de97 +Author: Vincent Torri <vtorri@univ-evry.fr> +Date: Wed Mar 11 00:36:27 2009 +0100 + + Better check for pkg-config + + configure.ac | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit b3f569f9a6c117c097acac52ae6552209fcd2101 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 11 00:25:07 2009 +0100 + + Check there is an optional content config before using it + + Fixes bug #20587 + + poppler/Gfx.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 7a5d1e57b2757c986da17f7238415b927e73127f +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Mon Mar 9 22:54:58 2009 +0100 + + Check for pkgconfig before using it + + At the moment if pkgconfig is not installed, an unhelpful syntax + error appears when testing for freetype. Identify the problem + earlier on + + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 8dc9e4d57a4759de2b56a87d9bace80d5d563fef +Author: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Sun Mar 8 15:29:02 2009 +0100 + + use AC_CHECK_HEADER to find headers + + The original m4/libjpeg.m4 used AC_FIND_FILE to look for jpeg + header file. + This test is not cross-compiling save. This patch uses the autoconf + function + AC_CHECK_HEADER to look for the jpeg header, which works in the + native and + the cross compiling scenaria. + Bug #20538 + + m4/libjpeg.m4 | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit bf2e2f056cadbc488cd3e9576b44beb34689ec81 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Mar 8 13:44:44 2009 +0100 + + Add the new croptting options explanations + + utils/pdftotext.1 | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 663d9e5a448641421d290dd228be692a0f236b9c +Author: Jan Jockusch <jan@jockusch.de> +Date: Sun Mar 8 13:44:20 2009 +0100 + + Make pdftotext to accept cropping options like pdftoppm + + Bug #20331 + + utils/pdftotext.cc | 29 ++++++++++++++++++++++++++++- + 1 file changed, 28 insertions(+), 1 deletion(-) + +commit cc4b61f19b69c31d9a73ae7361c4b6a94345d1c2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Mar 8 12:55:45 2009 +0100 + + Fix the previous fix + + I should stop listening to people without checking that what they + say is + correct + + poppler/DCTStream.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a4a73cd9f9ee9767d74fbb44ffe083d2057a9d61 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Mar 8 12:44:06 2009 +0100 + + I should compile before commiting :-/ + + poppler/DCTStream.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 6a6b3cc91053e771a67dffa979076d130f87ff11 +Author: Ryszard Trojnacki <rysiek@menel.com> +Date: Sun Mar 8 12:38:42 2009 +0100 + + set up the error-manager before calling jpeg_create_decompress + + Bug #20484 + + poppler/DCTStream.cc | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit 4dfa7460ddc4b5684d5ef8db17efa50b95b7b735 +Author: Nick Jones <nick.jones@network-box.com> +Date: Tue Mar 3 00:55:53 2009 +0100 + + Do not blindly follow loops parsing OutlineItem + + More details in bug 18364 + + poppler/Outline.cc | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit de3131ae38fc9442b198d4d7b0c57c6939ad66ce +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 2 15:20:07 2009 +0100 + + [Qt4] adapt to the new PDFDoc saving API + + store the error code instead of the bool + + qt4/src/poppler-pdf-converter.cc | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit dac0542eb793603090416f1b7712ca08253f1e7f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 2 09:54:22 2009 +0100 + + [glib] Correctly handle doc->saveAs() error code. + + Fixes bug #19915. + + glib/poppler-document.cc | 37 +++++++++++++++++++++++++++++++++---- + 1 file changed, 33 insertions(+), 4 deletions(-) + +commit bfc6572614727565d883b9545d4b6665f3c2fdfe +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 28 13:16:49 2009 +0100 + + Return an error code instead of a GBool when saving + + poppler/PDFDoc.cc | 22 +++++++++++----------- + poppler/PDFDoc.h | 8 ++++---- + 2 files changed, 15 insertions(+), 15 deletions(-) + +commit f7c88148fdb671736d81dd5f01a3fb68f944510c +Author: Koji Otani <sho@bbr.jp> +Date: Wed Feb 25 23:38:35 2009 +0100 + + Fix cache shifting + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 305af8cdb6822858e152e1f930bba2ce3904bf1b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Feb 25 22:40:24 2009 +0100 + + Make JBIG2Stream not crash in 2009-41414141.pdf + + poppler/JBIG2Stream.cc | 151 + ++++++++++++++++++++++++++++--------------------- + 1 file changed, 85 insertions(+), 66 deletions(-) + +commit 26a8217160c1eaeeadb92023b27e68f402e38dd0 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Feb 22 18:14:15 2009 +0100 + + Check if cairo_shape is not NULL before using it. + + We were checking shape instead. It fixes a crash with some documents. + See bug #17337. + + poppler/CairoOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5e68e52da65b4d8c3817e5fbb6f1a937da321d48 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 21 18:03:15 2009 +0100 + + [Qt4] do not assume the destination file name for links is ASCII + + qt4/src/poppler-page.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 439cb397fed33df627a09c70788d72bef20dc872 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 21 18:02:36 2009 +0100 + + [Qt] do not assume the destination file name for links is ASCII + + qt/poppler-page.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3ea5f45ad3e5a55e577a2e45f61b55932ed17013 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 21 17:46:30 2009 +0100 + + [glib] Make sure filename is valid utf-8 for remote dests + + glib/poppler-action.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit b5989e4ffece6c1831610ee163d05fd80386a001 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 21 17:45:18 2009 +0100 + + Use the UF entry when present in Filespec dictionary + + poppler/FileSpec.cc | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +commit 943fca42b5fa815fad650e42da4ad6e806adc3b1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 21 12:08:00 2009 +0100 + + [glib] Add a macro to define boxed types + + glib/poppler-action.cc | 26 +------------ + glib/poppler-annot.cc | 15 ++------ + glib/poppler-document.cc | 44 +++++---------------- + glib/poppler-page.cc | 99 + ++++++++++-------------------------------------- + glib/poppler-private.h | 20 ++++++++++ + 5 files changed, 53 insertions(+), 151 deletions(-) + +commit 7406337ed2d38a86308f20f8273a152538e524de +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 21 11:11:20 2009 +0100 + + [glib] Use template files to create poppler-enums + + glib/Makefile.am | 43 + +++++++++++++----------------------------- + glib/poppler-enums.c.template | 44 + +++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-enums.h.template | 25 ++++++++++++++++++++++++ + 3 files changed, 82 insertions(+), 30 deletions(-) + +commit 29bc9d1dd115b5d400975533c3924993c3adae30 +Author: Thomas Viehmann <tv@beamnet.de> +Date: Sat Jan 17 13:16:38 2009 +0100 + + glib small doc comment corrections + + glib/poppler-attachment.cc | 2 +- + glib/poppler-layer.cc | 2 ++ + glib/poppler.cc | 2 -- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit a06e715d89a99b909b8e7b73b733066c67b1ade3 +Author: Thomas Viehmann <tv@beamnet.de> +Date: Sat Jan 17 12:58:20 2009 +0100 + + Make glib API reference more complete + + glib/reference/poppler-docs.sgml | 2 + + glib/reference/poppler-sections.txt | 55 +++++ + glib/reference/tmpl/poppler-action.sgml | 9 +- + glib/reference/tmpl/poppler-annot.sgml | 368 + ++++++++++++++++++++++++++++++++ + glib/reference/tmpl/poppler-layer.sgml | 79 +++++++ + 5 files changed, 511 insertions(+), 2 deletions(-) + +commit 3a21dafa46d42d86daec440a85b9d63b292a3c88 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 3 21:33:00 2009 +0100 + + Fix cache shifting + + If we do + for (i = 0;i < GFX_ICCBASED_CACHE_SIZE-1 && cache[i].num > 0;i++) { + cache[i+1] = cache[i]; + what we do at the end is copy position 0 to all others so + we need to do it in the reverse order + + poppler/GfxState.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit 0ed3fd52bb2d3375ed302285b18f076721b8028e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Feb 1 10:37:25 2009 +0100 + + [glib-demo] Fix a typo in format string + + glib/demo/page.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2df6d530cd9acd8648a6196031218ef10e7b3891 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 29 00:51:13 2009 +0100 + + Add line that for some reason was not imported from xpdf file + + Fixes bug 19789 + + utils/ImageOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 1fc342eadcbbb41302f190b215c5daf23c9ec9b1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 28 22:53:43 2009 +0100 + + Fix crash on unexepcted Form Opt value + + Fixes crash on bug 19790 + + poppler/Form.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit b1d4efb082ac3dadd7752a557e5aeb6651e17471 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 27 00:26:08 2009 +0100 + + PostScriptFunction::transform optimization + + Do not create and destroy a PSStack each time + PostScriptFunction::transform is called gives a 7% speedup on heavy + PostScriptFunction::transform pdf like nytimes firefox ad + + poppler/Function.cc | 12 ++++++++---- + poppler/Function.h | 15 +++++++++++++++ + 2 files changed, 23 insertions(+), 4 deletions(-) + +commit 90f95127d8d89cfcadeb7d701437ab07ce4a8a61 +Author: Koji Otani <sho@bbr.jp> +Date: Sun Jan 25 23:17:39 2009 +0100 + + Cache last 5 GfxICCBasedColorSpace + + poppler/GfxState.cc | 60 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/GfxState.h | 15 ++++++++++++++ + 2 files changed, 75 insertions(+) + +commit d3f04f537fb3e963c149a7e2d8d83c7cb19da8c0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jan 23 23:08:46 2009 +0100 + + Do not crash in some PDF we don't parse correctly + + Fixes bug 19702 + + poppler/JBIG2Stream.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 3990c9e52da7b17215506857c792c90a37ebac79 +Author: Koji Otani <sho@bbr.jp> +Date: Mon Jan 19 09:53:00 2009 +0100 + + Fix a problem in cairo backend when using a CMYK Profile + + poppler/GfxState.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6e51ae7fe8b9dc8ad52b735f2fe056f8ea8f1dcb +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 15 22:33:04 2009 +0100 + + calculate the limit in a way that one does not access an invalid + index of the matrix + + poppler/DCTStream.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ea2aa7bd1ceb0e3282398f52683e4f52ef401f74 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 15 22:18:48 2009 +0100 + + Forgot my copyrights + + poppler/DCTStream.cc | 2 +- + poppler/DCTStream.h | 2 +- + poppler/Stream.cc | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit d65dd23752ec14635d0d224afa7dd605f98a10a4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 15 22:17:14 2009 +0100 + + Minor optimizations + + poppler/DCTStream.cc | 17 ++++++++--------- + poppler/DCTStream.h | 3 ++- + poppler/Stream.cc | 3 ++- + 3 files changed, 12 insertions(+), 11 deletions(-) + +commit d3d2910f757dfc3e141aed62aa970136f9d7186f +Author: Pino Toscano <pino@kde.org> +Date: Sun Jan 11 00:40:46 2009 +0100 + + fix a (relatively small) memory leak when asking for a document-level + JS + + poppler/Catalog.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 869584a84eed507775ff1c3183fe484c14b6f77b +Author: Jonathan Kew <jonathan_kew@sil.org> +Date: Sat Jan 10 18:28:47 2009 +0100 + + Add the possibility of setting the datadir on runtime + + poppler/GlobalParams.cc | 27 ++++++++++++++++++++------- + poppler/GlobalParams.h | 5 ++++- + 2 files changed, 24 insertions(+), 8 deletions(-) + +commit cf112dceb1d6653beae73ce2fac6fb5eee48ff33 +Author: Koji Otani <sho@bbr.jp> +Date: Sat Jan 10 18:11:20 2009 +0100 + + Fix some problems with color management in CMYK Color Profile. + + Fixes bug 19483 + + poppler/GfxState.cc | 106 + ++++++++++++++++++++++++++-------------------------- + 1 file changed, 53 insertions(+), 53 deletions(-) + +commit 6dd77338d16f80760ae32ff9f3e2be9768fc0c49 +Author: Pino Toscano <pino@kde.org> +Date: Thu Jan 8 11:49:45 2009 +0100 + + [Qt4] use the cropbox for the annotations coordinates + + Fixes bug #18558. + + qt4/src/poppler-page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 69c07c031159d36dde52609bffa6d48c3c56cef5 +Author: Pino Toscano <pino@kde.org> +Date: Thu Jan 8 00:59:19 2009 +0100 + + update Poppler copyright to 2009 + + msvc/poppler/poppler-config.h | 2 +- + poppler-config.h.cmake | 2 +- + poppler/poppler-config.h.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +commit 79e0eea85cf063c6323caafbec97f3d71fc04ca2 +Author: Pino Toscano <pino@kde.org> +Date: Thu Jan 8 00:57:03 2009 +0100 + + remove old cmake modules, add a new one + + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 0e6420ece2d6fcc046d5814b48a2754fb86771e2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 7 23:33:02 2009 +0100 + + Require cmake 2.6.0, remove two cmake files provided upstream + + CMakeLists.txt | 4 +- + cmake/modules/FindFreetype.cmake | 74 + ----------------------- + cmake/modules/FindPackageHandleStandardArgs.cmake | 58 ------------------ + glib/CMakeLists.txt | 2 +- + 4 files changed, 3 insertions(+), 135 deletions(-) + +commit a69add73bf7bef17c677c735db77934ba67188a5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 7 19:06:13 2009 +0100 + + Update copyright notices + + poppler/FontInfo.cc | 1 + + poppler/FontInfo.h | 1 + + qt4/src/poppler-document.cc | 2 +- + qt4/src/poppler-fontinfo.cc | 2 +- + qt4/src/poppler-form.cc | 1 + + qt4/src/poppler-form.h | 1 + + qt4/src/poppler-private.h | 2 +- + qt4/src/poppler-qt4.h | 2 +- + 8 files changed, 8 insertions(+), 4 deletions(-) + +commit 18d584158a781fecb4f696b01fb4d17803ce7d7a +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 7 17:55:48 2009 +0100 + + Add lcms option to cmake buildsystem + + CMakeLists.txt | 9 +++++++++ + cmake/modules/FindLCMS.cmake | 37 +++++++++++++++++++++++++++++++++++++ + config.h.cmake | 3 +++ + 3 files changed, 49 insertions(+) + +commit 140b8ed97416f9c2ec02eb749ca45ca50bd651a8 +Author: Koji Otani <sho@bbr.jp> +Date: Wed Jan 7 17:43:44 2009 +0100 + + Add initial support for color management + + configure.ac | 19 ++ + poppler/GfxState.cc | 697 + ++++++++++++++++++++++++++++++++++++++++++++++++---- + poppler/GfxState.h | 74 +++++- + poppler/Makefile.am | 5 + + 4 files changed, 738 insertions(+), 57 deletions(-) + +commit bdc76dc811a6e4d5fd929bbdc8cd3300aeaea31f +Author: Pino Toscano <pino@kde.org> +Date: Tue Jan 6 15:45:37 2009 +0100 + + [Qt4] apidox improvements for the font functions of Document; mark + scanForFonts() as deprecated + + qt4/src/poppler-qt4.h | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +commit 6630e715714161cd803fc064f5d3cf880f42b0a5 +Author: Pino Toscano <pino@kde.org> +Date: Tue Jan 6 15:36:19 2009 +0100 + + tell Doxygen to consider Q_DECL_DEPRECATED as empty + + qt4/src/Doxyfile | 1 + + 1 file changed, 1 insertion(+) + +commit d748d430b106580b8be29ca3ec75caf05b55812e +Author: Pino Toscano <pino@kde.org> +Date: Tue Jan 6 15:24:25 2009 +0100 + + [Qt4] Add a FontIterator for iterating through the fonts of the + document, page by page. + + This new iterator class is the new preferred way for getting the + fonts of a document in a page-by-page mode. + * Document::fonts() is adapted to use it, instead of relying on + scanForFonts() + * scanForFonts() is ported to FontIterator, but keeping the old + behaviour ("i can scan the document only once") + * added unit tests for fonts(), scanForFonts() and FontIterator + + qt4/src/poppler-document.cc | 27 +++++--- + qt4/src/poppler-fontinfo.cc | 36 +++++++++++ + qt4/src/poppler-private.h | 27 ++++++-- + qt4/src/poppler-qt4.h | 65 +++++++++++++++++++ + qt4/tests/check_fonts.cpp | 149 + ++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 291 insertions(+), 13 deletions(-) + +commit b9804542bb50216786dc11ca16efd84304f4b832 +Author: Pino Toscano <pino@kde.org> +Date: Tue Jan 6 15:16:53 2009 +0100 + + Add the possibility to set the first page to scan. + + The default value is 0 (= first page), so it should be compatible + with any usage so far. + + poppler/FontInfo.cc | 4 ++-- + poppler/FontInfo.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit af74fef03bfbd79334da5612c63c7793952542f9 +Author: Warren Toomey <poppler@tuhs.org> +Date: Tue Jan 6 01:36:31 2009 +0100 + + Add forgotten file to let the autotools based system build + + m4/libpng.m4 | 99 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 99 insertions(+) + +commit ae588500f62bab5666174ff3b1564c414c5a76c5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 6 01:35:38 2009 +0100 + + Fix the cmake buildsystem + + CMakeLists.txt | 6 ++++++ + config.h.cmake | 3 +++ + utils/CMakeLists.txt | 4 ++++ + 3 files changed, 13 insertions(+) + +commit 940d060a14712c09da427e2fac4ec579f7291b0f +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 6 01:27:06 2009 +0100 + + do not leak fName if fopen fails + + utils/HtmlOutputDev.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 7be9198adb940ad7c5fffc6db0158cf7042e1b8f +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 6 01:24:15 2009 +0100 + + Do not leak pgNum and imgnum if fopen fails + + utils/HtmlOutputDev.cc | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit dfba6c022b150553cb2b18b027e661b3b4625ce7 +Author: Warren Toomey <poppler@tuhs.org> +Date: Tue Jan 6 01:16:31 2009 +0100 + + Make pdftohtml output png images when the image stream is not a jpeg + + configure.ac | 14 ++++++ + utils/HtmlOutputDev.cc | 126 + ++++++++++++++++++++++++++++++++++++++++++++++--- + utils/HtmlOutputDev.h | 3 +- + utils/Makefile.am | 4 ++ + 4 files changed, 140 insertions(+), 7 deletions(-) + +commit 0963c276ba972a36c2895e4fe1c7475acd489738 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 4 16:54:32 2009 +0100 + + Fix some checked checkboxes not rendering correctly + + If we are forcing ZaDb/ZapfDingbats to correctly draw a checkmark + in the checkbox, but the file does not have such font defined we + need to create a fake one so the system really renders it + Fixes bug 19359 + + poppler/Annot.cc | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- + poppler/Annot.h | 2 ++ + poppler/Gfx.h | 7 ++++--- + 3 files changed, 53 insertions(+), 5 deletions(-) + +commit 46128cf83b322c112eb0c409c20052bdb2ea4a37 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 4 14:21:15 2009 +0100 + + Remove wrong and unused FormWidget(FormWidget *dest) contructor + + poppler/Form.cc | 11 ----------- + poppler/Form.h | 3 +-- + 2 files changed, 1 insertion(+), 13 deletions(-) + +commit 5203aefc41fa47c461812cc46f28281edd226515 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 4 14:03:16 2009 +0100 + + Plug some memory leaks + + poppler/Annot.cc | 5 ++++- + poppler/Form.cc | 4 +++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit 5fb7ec7e6af4cfb2b256a5b9b9752e68330b4aec +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Dec 30 23:46:59 2008 +0100 + + If Length2 is zero just write until we find EOF of the stream + + Fixes exporting to PS of the two pdf i have that have fonts with + Length2 set to 0 + + poppler/PSOutputDev.cc | 26 +++++++++++++++++++++----- + 1 file changed, 21 insertions(+), 5 deletions(-) + +commit ca35fdbc7c31dae432d775b6c087a83fa9b897fc +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Dec 30 23:03:57 2008 +0100 + + We need spaces here too to satify other consumer parsers + + poppler/PDFDoc.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3c07c73e07a9cb59ee4c23ca60d2adce92de45f7 +Author: Pino Toscano <pino@kde.org> +Date: Tue Dec 30 22:21:27 2008 +0100 + + [Qt4-demo] load a document when passed via command line + + qt4/demos/main_viewer.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +commit aba0aaa896d634a51fbb3a3e6eae411be462f930 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 29 00:31:18 2008 +0100 + + More improvements in document writing + + Dictionary keys are names so need to be sanitized + Add a space after num gen obj + + poppler/PDFDoc.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit e5b93a847ae4e20a77fecef0938da4f14dfbe3eb +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Dec 28 22:59:14 2008 +0100 + + Let compiler figure out CDECL + + CDECL is a compiler specific macro to specify C calling convention. + + On Windows, some functions must be forced to use this calling + convention. + To do this, you can use the macro CDECL, which is defined in windef.h. + + Poppler should not try to be smarter than the compiler and try + to guess + the correct definition for CDECL. Instead it should rely on the + definitions in the windef.h file provided by the compiler. + + On Unix, specifying a calling convention is not nescessary, so + CDECL can + be an empty definition. + + poppler-config.h.cmake | 8 ++------ + poppler/poppler-config.h.in | 8 ++------ + 2 files changed, 4 insertions(+), 12 deletions(-) + +commit de70c0aeb37d788f595b0574796844f51ddedec1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 28 21:21:12 2008 +0100 + + [qt4] improve doc a bit + + qt4/src/poppler-form.h | 2 +- + qt4/src/poppler-qt4.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit effb32658019e09dc86c017e39154fd554fc94f8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 28 02:56:30 2008 +0100 + + Form Rects are against the cropbox, not the media box + + Fixes second pdf at kde bug 161327 + + qt4/src/poppler-form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0f10561f3b1c90acc030d973399316bfca5f495e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 28 01:44:25 2008 +0100 + + Fix my last commit, copy&paste is really evil + + goo/GooString.cc | 9 +++++---- + goo/GooString.h | 2 +- + 2 files changed, 6 insertions(+), 5 deletions(-) + +commit 217b46484ff56bfd5906b293ebee70b82cc0263d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 28 01:29:41 2008 +0100 + + Move PSOutputDev::filterPSName to GooString::sanitizedName so i can + use it from PDFDoc::writeObject + + goo/GooString.cc | 36 ++++++++++++++++++++++++++++++++++++ + goo/GooString.h | 7 +++++++ + poppler/PDFDoc.cc | 7 ++++++- + poppler/PSOutputDev.cc | 49 + +++++++++---------------------------------------- + poppler/PSOutputDev.h | 3 +-- + 5 files changed, 59 insertions(+), 43 deletions(-) + +commit f41fa9ee71aef5539cf9976c79b32bf1713c8167 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 26 22:56:12 2008 +0100 + + Change the overflow check to the same used in gmem.cc, much more + easy to understand + + poppler/XRef.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit b8ae7d91dedc9a75200b6050628ec2740af84b98 +Author: Hib Eris <hib@hiberis.nl> +Date: Fri Dec 26 22:28:09 2008 +0100 + + Fix compile warnings on auto imports for mingw32 + + configure.ac | 3 +++ + glib/Makefile.am | 2 +- + glib/demo/Makefile.am | 2 ++ + test/Makefile.am | 2 ++ + utils/Makefile.am | 2 ++ + 5 files changed, 10 insertions(+), 1 deletion(-) + +commit ba47bd2ba05f883306606eda30bff17bd4a8eec6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 26 19:47:42 2008 +0100 + + BaseFile.h has never been used and it fact it's not part of xpdf + sources + + Fixes bug 19298 + + CMakeLists.txt | 1 - + poppler/BaseFile.h | 82 + ----------------------------------------------------- + poppler/Makefile.am | 1 - + 3 files changed, 84 deletions(-) + +commit 84366d9e63b0d6a5ee1aae2463648cfc2ff5e1b8 +Author: Hib Eris <hib@hiberis.nl> +Date: Wed Dec 24 19:27:19 2008 +0100 + + Let libtool build DLLs on windows too + + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 08cef528f2e51cc62cff4125f179021ad9555317 +Author: Hib Eris <hib@hiberis.nl> +Date: Wed Dec 24 17:48:46 2008 +0100 + + Fix compile warning on string literal format + + test/pdf-inspector.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0606b4bba8e889204c7b7c9d376f63b659f83a4f +Author: Hib Eris <hib@hiberis.nl> +Date: Wed Dec 24 17:48:10 2008 +0100 + + Fix compile warnings on parentheses and/or + + poppler/CairoOutputDev.cc | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +commit eba2232cabd5fb1e177db2a6053f0d1a0aee882b +Author: Hib Eris <hib@hiberis.nl> +Date: Wed Dec 24 17:46:32 2008 +0100 + + Fix some more warnings + + test/gtk-cairo-test.cc | 11 ----------- + test/pdf-inspector.cc | 9 +++++---- + 2 files changed, 5 insertions(+), 15 deletions(-) + +commit c80431eb1626d89e7b615e5a5149d3436b554b66 +Author: Hib Eris <hib@hiberis.nl> +Date: Mon Dec 22 09:28:47 2008 +0100 + + Fix compile warning on format type + + glib/test-poppler-glib.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fda181c35b7c7500b6d3c6ca9d454addd54929c5 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 22 00:53:44 2008 +0100 + + group condition within brackets + + poppler/ArthurOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c1beeecbd6cbf82811d70c75cb24059b4b492abe +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 22 00:46:49 2008 +0100 + + [demo] use the proper format field for gsize types + + glib/demo/attachments.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bfb975466f0ff78e9e292b6af7cac66e4c331456 +Merge: 3e278925 ea3546f8 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 22 00:29:38 2008 +0100 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit 3e2789257f5fc4ae0573a0c62ea380d8e83a5bb5 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 22 00:24:23 2008 +0100 + + [Qt] deserialize also the value of 'right' + + qt/poppler-link.cc | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 7c053ab7623cea1ac650d3e960d2d91a1ef21557 +Author: Pino Toscano <pino@kde.org> +Date: Mon Dec 22 00:19:02 2008 +0100 + + [Qt] move in a .cc file the implementation of the QString<->GooString + functions and DocumentData::addTocChildren() + + qt/CMakeLists.txt | 1 + + qt/Makefile.am | 1 + + qt/poppler-document.cc | 10 ---- + qt/poppler-page.cc | 1 + + qt/poppler-private.cc | 147 + +++++++++++++++++++++++++++++++++++++++++++++++++ + qt/poppler-private.h | 106 +++-------------------------------- + 6 files changed, 157 insertions(+), 109 deletions(-) + +commit ea3546f84c5335c58cdb2906b1a1a4656be9c8ea +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Dec 21 23:33:49 2008 +0100 + + Fix compile warnings on signed/unsigned comparison + + goo/gfile.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ca672ae51d2c1fa59a891717b418ba86b5e7345c +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Dec 21 23:33:00 2008 +0100 + + Fix compile warnings on ignored pragma with mingw compiler + + poppler/Gfx.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 86cfe8ab2b4e0b600f3f6682701c2fcfbe5d0ca9 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Dec 21 23:08:56 2008 +0100 + + Fix compile warnings on signed/unsigned comparison + + poppler/GfxFont.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit e34af7ffe0a4024e2eb39314bdb09eb9a662e53e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 21 22:16:39 2008 +0100 + + Update copyright of last commits + + poppler/TextOutputDev.cc | 1 + + poppler/TextOutputDev.h | 2 +- + qt4/src/poppler-page.cc | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +commit f6d84dcfc9cc587c7408af79b1ee7658d456f8d8 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Dec 21 22:09:00 2008 +0100 + + Fix compile warning to suggest parentheses and/or + + poppler/TextOutputDev.cc | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit 15205403eaa95d6fba0e36983de993877dd3a983 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Dec 21 21:59:45 2008 +0100 + + Fix warning to suggest parentheses inside shift + + poppler/PSOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit cc24f37e582bfc0069faf286da97a48fe4794db1 +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Dec 21 21:35:29 2008 +0100 + + Fix compile warning on ambiguous else + + test/perf-test.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a8cc4ad8c2da804f25db8cca1c85433d5a63307c +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Dec 21 21:34:28 2008 +0100 + + Fix compile warning on format not a string literal + + test/perf-test.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 3cbbf8226730aa7ee6273e154e4a9d58670a3cda +Author: Hib Eris <hib@hiberis.nl> +Date: Sun Dec 21 21:30:54 2008 +0100 + + Fix compile warning about uninitialized variable + + poppler/ABWOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit f675916277cb76cd1293225a1271f835a02148fb +Author: Pino Toscano <pino@kde.org> +Date: Sat Dec 20 23:23:10 2008 +0100 + + reset to NULL after being deleted + + found with poppler-qt4 unit tests =) + + poppler/TextOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit c976770c64e4c991fff27e413414473583b6fd86 +Author: Pino Toscano <pino@kde.org> +Date: Sat Dec 20 22:25:55 2008 +0100 + + [Qt4] use QHash instead of QMap where applicable + + using a hash table instead of a map mapes lookup faster; + in these cases we don't need the sorting a map gives + + qt4/src/poppler-page.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 944f6049a50eb3be9fb29174d67adc4ad1d0b9fe +Author: Pino Toscano <pino@kde.org> +Date: Sat Dec 20 20:13:43 2008 +0100 + + add find.c and text.c + + glib/demo/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit ba91b889c3b50239e339938f3c9d31fffcd87d44 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Dec 20 19:29:40 2008 +0100 + + Make destructor private in TextPage + + poppler/TextOutputDev.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 0da16537aa83f6ed6d8895c7e54266263a71c1cf +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Dec 19 19:08:21 2008 +0100 + + Refactor actual text code adding a new ActualText class + + It's used by both Text and Cairo ouput devices avoiding duplicated + code + in such classes. + + poppler/CairoOutputDev.cc | 108 +++--------------------- + poppler/CairoOutputDev.h | 7 +- + poppler/TextOutputDev.cc | 206 + ++++++++++++++++++++++++++-------------------- + poppler/TextOutputDev.h | 34 ++++++-- + 4 files changed, 160 insertions(+), 195 deletions(-) + +commit 0f8ab301c633133eea3dbd4f2254f31c50e3c4a9 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Dec 14 13:12:34 2008 +0100 + + [glib-demo] Add find demo + + glib/demo/Makefile.am | 2 + + glib/demo/find.c | 282 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/demo/find.h | 31 ++++++ + glib/demo/main.c | 4 +- + 4 files changed, 318 insertions(+), 1 deletion(-) + +commit 88df9e9aa9adb53f0a9714ea404d46f111495df3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Dec 14 11:54:35 2008 +0100 + + [glib-demo] Add Text demo + + glib/demo/Makefile.am | 2 + + glib/demo/main.c | 4 +- + glib/demo/text.c | 175 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/demo/text.h | 31 +++++++++ + 4 files changed, 211 insertions(+), 1 deletion(-) + +commit 5b0f2355d55a5104820fd0bf16b4e76b25959de4 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Dec 14 11:49:00 2008 +0100 + + [glib] Use TextPage instead of TextOutputDev when cairo is enabled + + glib/poppler-page.cc | 148 + ++++++++++++++++++++++++++++++++++--------------- + glib/poppler-private.h | 4 ++ + 2 files changed, 107 insertions(+), 45 deletions(-) + +commit 3ced71fb68d62308db7b9535367eafefb55d1cde +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Dec 14 11:18:00 2008 +0100 + + Add optionally text support to CairoOutputDev + + If a TextPage is set, it'll be used when rendering so that we + don't need + to use TextOutputDev and render again. + + poppler/CairoOutputDev.cc | 144 + ++++++++++++++++++++++++++++++++++++++++++++-- + poppler/CairoOutputDev.h | 19 +++++- + 2 files changed, 155 insertions(+), 8 deletions(-) + +commit 0bdad35cc4cfdb8da5acaf44678920b7a0025f99 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Dec 14 11:14:12 2008 +0100 + + Add refcount support to TextPage + + poppler/TextOutputDev.cc | 12 +++++++++++- + poppler/TextOutputDev.h | 5 +++++ + qt4/src/poppler-page.cc | 2 +- + 3 files changed, 17 insertions(+), 2 deletions(-) + +commit f86514c3fbc867fc6457feacba23451e89993524 +Author: Koji Otani <sho@bbr.jp> +Date: Wed Dec 17 00:36:39 2008 +0100 + + Fix wrong PS generation when a large image is in Patterns + + Bug 18908 + + poppler/PSOutputDev.cc | 114 + +++++++++++++++++++++++++++++++------------------ + 1 file changed, 72 insertions(+), 42 deletions(-) + +commit fc395eb90b418e43453acefb42cd04baf0b7ad40 +Author: Richard Airlie <richard.airlie@maglabs.net> +Date: Tue Dec 16 21:11:53 2008 +0100 + + Allow the use of cropbox in pdftoppm + + utils/pdftoppm.cc | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +commit 80f415176952635a485356cf36048eee53396c25 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Dec 16 20:37:39 2008 +0100 + + Make destructors private/protected since you are not supposed to + use them + + poppler/GfxFont.cc | 2 +- + poppler/GfxFont.h | 11 +++++------ + 2 files changed, 6 insertions(+), 7 deletions(-) + +commit dbcebda953cb36a45a125aada68e85249fb73f43 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 15 20:10:31 2008 +0100 + + Do not leak on AnnotScreen destructor + + Fixes bug 19095 + + poppler/Annot.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit aaeb0d137232bf1cb11dc5e37b8b45b50c6f9c6a +Author: Pino Toscano <pino@kde.org> +Date: Fri Dec 12 00:43:19 2008 +0100 + + update the xpdf headers installation + + CMakeLists.txt | 32 +++++++++++++++++++++----------- + 1 file changed, 21 insertions(+), 11 deletions(-) + +commit 7c6527fa05389f705872aaaaff12e739b5d1577e +Author: Pino Toscano <pino@kde.org> +Date: Fri Dec 12 00:41:21 2008 +0100 + + don't install Function.cc, as it is not an header + + poppler/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +commit 0179e21b128ffccb5afd13203137ab8435197609 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 12 00:16:38 2008 +0100 + + Be more helpful with bad boys that want to use poppler core directly + + fofi/Makefile.am | 10 ++++++++++ + splash/SplashClip.h | 2 +- + splash/SplashPath.h | 2 +- + splash/SplashXPath.h | 2 +- + 4 files changed, 13 insertions(+), 3 deletions(-) + +commit 401632e4eeb4b10b1183a820f32461da77e8e4f2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 12 00:14:04 2008 +0100 + + Try harder to look for openjpeg + + cmake/modules/FindLIBOPENJPEG.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ab539f46089702f60b96b1ba2b2bc1544173c264 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Dec 11 23:15:45 2008 +0100 + + Fix crash when reading outline + + Fixes bug 19024. Last as reference is required if the item has + children (Table 8.4) so if there is no last reference, don't try to + read children. + + poppler/Outline.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit c9a755f9fd14511f43a2ca7fcda36bdd64bb1d87 +Author: Ilya Gorenbein <igorenbein@finjan.com> +Date: Sun Dec 7 17:59:19 2008 +0100 + + Fix memory leak + + Bug 18924 + + poppler/Page.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 4cd364c179ae91ed383a8237ba1ad263952fd7aa +Author: Pino Toscano <pino@kde.org> +Date: Sun Nov 30 16:57:52 2008 +0100 + + add my copyright here + + qt4/src/poppler-private.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 6b1676deb773675d90469adc84c3de8dcdaf174c +Author: Pino Toscano <pino@kde.org> +Date: Sun Nov 30 16:56:43 2008 +0100 + + [Qt4] support URI actions for TOC items + + qt4/src/poppler-private.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit b5cd58b5565055fd0c13771461245ddcd80edfcf +Author: Pino Toscano <pino@kde.org> +Date: Sun Nov 30 16:34:57 2008 +0100 + + extract the LinkAction "serialization" in an own function, and make + it more safe + + qt4/src/poppler-private.cc | 85 + ++++++++++++++++++++++++++++++++-------------- + 1 file changed, 59 insertions(+), 26 deletions(-) + +commit ee191363e22940ae7b06945e68c4738b17c78348 +Author: Pino Toscano <pino@kde.org> +Date: Sun Nov 30 16:17:32 2008 +0100 + + move the addTocChildren() implementation in the cpp + + qt4/src/poppler-form.cc | 1 + + qt4/src/poppler-page.cc | 1 + + qt4/src/poppler-private.cc | 65 + ++++++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-private.h | 64 + ++------------------------------------------- + 4 files changed, 69 insertions(+), 62 deletions(-) + +commit f8eaabf1aa7e384619129a7509be85d0c3bfb825 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 30 13:33:12 2008 +0100 + + Update copyrights of the last commits + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5f4fedfae6098e25644ffe5d4b1ed0bac043841d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Nov 29 19:51:27 2008 +0100 + + Use the Length specified in the Stream as initial bufSize + + This is a optimization to save a few reallocations, if the Length + value is incorrect it will still work + + poppler/JPEG2000Stream.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 12f6d6ba2052fbdc8ea4ba7c7c9277e75bf170a5 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Nov 23 18:20:14 2008 +0100 + + Fix a crash when the second argument of opMarkPoint is not a + dictionary + + According to the spec "If any of the values are indirect references to + objects outside the content stream, the property list dictionary must + instead be defined as a named resource. + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 817e123a28e9f6b7e5be23f7ac2ba3bcec5e3f3f +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Nov 22 21:48:37 2008 +1030 + + Don't compare print flag for non Type 3 fonts in cairo font cache + + poppler/CairoFontEngine.cc | 7 ++++++- + poppler/CairoFontEngine.h | 4 +++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +commit 68f8ade28764855d4f663607c50c8202b1268296 +Author: Albert Astals Cid <tsdgeos@samsung.localdomain> +Date: Sun Nov 23 10:54:46 2008 +0100 + + Compile with -pedantic + + Thanks to Bernard Leak for notifying + + test/pdf-inspector.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4a4fa7ed44a87e47a6078a1f7bb6f41071672ea7 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Nov 18 20:11:07 2008 +0100 + + Fix a crash when selecting text in word mode + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a6f5032ab0d6edbf3879f39efff7916b1f7233da +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Nov 16 18:24:06 2008 +0100 + + optContentConfig is not actually stored in PDFDoc but in Catalog + + poppler/PDFDoc.h | 1 - + 1 file changed, 1 deletion(-) + +commit b843ac34c6c4ca1580f99fa2220c59dfcd91f026 +Author: Pino Toscano <pino@kde.org> +Date: Sat Nov 15 14:49:02 2008 +0100 + + [Qt4] deserialize the value of the 'right' coordinate, too + + qt4/src/poppler-link.cc | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 03061fdae49842556c9ff48e61914fc88502e1d8 +Author: Tim Mooney <enchanter@users.sourceforge.net> +Date: Thu Nov 13 22:32:22 2008 +0100 + + Fix build on Solaris 10 + Sun Studio 12. + + Fixes bug 17496 + + configure.ac | 14 ++++++++++++++ + test/Makefile.am | 6 ++++-- + 2 files changed, 18 insertions(+), 2 deletions(-) + +commit 17b18be4fd25f2ca2b4ed7382d9fda50410c44f1 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Wed Nov 12 20:40:57 2008 +1030 + + Ensure cairo font matrix is invertable + + Fixes bugs #18254 and #18429 + + poppler/CairoOutputDev.cc | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit e2257e6916cd1067d43db9ed45f944413c61ed64 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 9 22:44:48 2008 +0100 + + Update copyrights of the last commits + + poppler/CairoFontEngine.cc | 1 + + poppler/CairoFontEngine.h | 1 + + poppler/Form.cc | 2 +- + poppler/Gfx.h | 1 + + poppler/OptionalContent.h | 1 + + qt4/src/poppler-optcontent.cc | 1 + + 6 files changed, 6 insertions(+), 1 deletion(-) + +commit 069f8ad9453e612e907b561aa50983c34400193d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 9 20:36:06 2008 +0100 + + MakeItBuild + + glib/CMakeLists.txt | 1 + + glib/demo/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+) + +commit 04025c4f65bbb7e4330f6d17d917a035c0906f3d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Nov 9 17:03:20 2008 +0100 + + Fix a crash when initializing an Annot with a null catalog + + Forms crate a temp annot just to get the font size of the form field + passing a NULL catalog. + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 471255c5a3850984997d91c7850759eb0c7e8a9c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Nov 8 20:58:57 2008 +0100 + + [glib-demo] Add Optional Content demo + + glib/demo/Makefile.am | 2 + + glib/demo/layers.c | 511 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/demo/layers.h | 31 +++ + glib/demo/main.c | 4 +- + 4 files changed, 547 insertions(+), 1 deletion(-) + +commit 7363c25e1d83332932d9b4fe16d7fb4e364da628 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 26 19:47:35 2008 +0100 + + [glib] Add Optional Content support + + glib/Makefile.am | 2 + + glib/poppler-document.cc | 377 + ++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-document.h | 12 ++ + glib/poppler-layer.cc | 201 ++++++++++++++++++++++++ + glib/poppler-layer.h | 43 ++++++ + glib/poppler-private.h | 21 +++ + glib/poppler.h | 3 + + glib/test-poppler-glib.cc | 52 ++++++- + 8 files changed, 710 insertions(+), 1 deletion(-) + +commit c674566f458b54097f21aae0d4bf8637146565c5 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 26 19:42:53 2008 +0100 + + Fix memory leaks in OptionalContent + + poppler/OptionalContent.cc | 13 +++---------- + poppler/OptionalContent.h | 10 ++++++---- + 2 files changed, 9 insertions(+), 14 deletions(-) + +commit 06ca313b8ecb8abb8dec3b418d118525b7bb0fdf +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 26 19:11:45 2008 +0100 + + Check annotation optional content properties before drawing it + + poppler/Annot.cc | 20 ++++++++++++-------- + poppler/Annot.h | 4 ++-- + 2 files changed, 14 insertions(+), 10 deletions(-) + +commit a6d58927b048aa043cb6b6ed3ee9aeb213578924 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Nov 8 20:50:40 2008 +0100 + + Do not show hidden optional content + + Before any draw operation we first check whether we are inside an + optional marked content element that is currently hidden. + + poppler/Gfx.cc | 113 + ++++++++++++++++++++++++++++++++++++++++----------------- + poppler/Gfx.h | 7 +++- + 2 files changed, 84 insertions(+), 36 deletions(-) + +commit 5f168f991477e291290350a28f4a60a565e187b9 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Oct 20 17:56:11 2008 +0200 + + [glib] Show action titles when printing the index in test program + + glib/test-poppler-glib.cc | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +commit a906d12e16748d9a40c0db4043a576fd3d004341 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Nov 8 20:20:00 2008 +0100 + + Minor code cleanup and consistency issues + + poppler/OptionalContent.cc | 22 +++++++++++----------- + poppler/OptionalContent.h | 8 ++++---- + qt4/src/poppler-optcontent.cc | 6 +++--- + qt4/tests/check_optcontent.cpp | 8 ++++---- + 4 files changed, 22 insertions(+), 22 deletions(-) + +commit e73c2ce906b7e1f06d641f7e0733aad6336b4091 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Oct 19 12:44:13 2008 +0200 + + Delete the optContent object if it's invalid + + poppler/Catalog.cc | 4 ++++ + poppler/OptionalContent.cc | 3 +++ + poppler/OptionalContent.h | 5 +++++ + 3 files changed, 12 insertions(+) + +commit 2900e7e4c920d735d5a727e9e39f71df97bd7b93 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Nov 8 18:12:47 2008 +0100 + + A new cairo is needed + + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit aaaecd2e86769d3a99e21577448a193711985958 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 5 22:47:30 2008 +0100 + + Do not abort if indexHighA is 'invalid', move it to the closest + valid value and try with it + + For the bug 18374 it works and does not seem a security problem + + poppler/GfxState.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 82f4228a50efe6447c68f7f6d34a7805b7e4b75e +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 5 20:57:17 2008 +0100 + + Add myself here + + qt4/demos/viewer.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit 8df7d83439f0e9ab200840f912f1c08bbf44bd6e +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 5 20:49:01 2008 +0100 + + [Qt4Demo] Fix leak + + qt4/demos/viewer.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit d3c424e0362f53bda5c4e2e415823d78ace76253 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 5 20:14:17 2008 +0100 + + Rename i to j so that code is more clear by not shadowing the + function parameter + + poppler/Catalog.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 9d12de9b59de4336eabb423f7bf0363b6a35e2a8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 5 20:00:01 2008 +0100 + + Fix crash in case indices is NULL + + Putting more than one "logical line" per "real line" is evil, we + think if will group it, but does not + + poppler/UnicodeTypeTable.cc | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit fc61dad9daa15f83802ffa5c3cd9b59d80bb310b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 5 19:52:00 2008 +0100 + + [Qt] Fix leak + + qt/poppler-link.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 981fb857b0afb1cda7836744dcf37906285512b4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 5 19:49:18 2008 +0100 + + [Qt] Fix memory leak + + qt/poppler-document.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit e925e92d5cbfc009c138ece117227a3b0894ead6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 5 19:44:40 2008 +0100 + + Do not leak uBuf in the error case + + poppler/CharCodeToUnicode.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0741a402632ec5a8641ff11707142bf2731c1833 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Nov 1 22:27:48 2008 +1030 + + Restore the cairo Type3 font image prescaling funtionality + + poppler/CairoFontEngine.cc | 49 + +++++++++++++++++++++++++++------------------- + poppler/CairoFontEngine.h | 20 +++++++++++-------- + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 2 +- + 4 files changed, 43 insertions(+), 30 deletions(-) + +commit 91a7c3fdd44f30b0b50ed05a3313bbb1b5c86e71 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Nov 1 20:57:24 2008 +1030 + + Remove cairo font matrix y flip when inside a Type 3 char + + Not sure why this was previously required but it now produces + incorrect results. + + poppler/CairoOutputDev.cc | 5 ----- + 1 file changed, 5 deletions(-) + +commit 3bf4d7d75b455a9a0b5ee3a8c78b218e5af5185a +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Nov 1 20:50:07 2008 +1030 + + Transform the glyph advance by the font matrix + + poppler/CairoFontEngine.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 4aa32bad61d008a854fdc9e902d6834bb1687d7e +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Nov 1 20:49:04 2008 +1030 + + Use the font BBox, not the font matrix to set the Gfx BBox + + poppler/CairoFontEngine.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 987955440c7711f440c3d2b5cc8c05ec07228a77 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Nov 1 20:47:05 2008 +1030 + + Ensure both the font matrix and y-axis flip are in the matrix + + we use for transforming the glyph metrics. + + poppler/CairoFontEngine.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 5c051aa117477cba5d350adfc539acb4b5f2a56a +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Nov 1 01:59:07 2008 +1030 + + Require cairo 1.8.2 for user-font support + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a3edfa30680864b95a5196c5619846de42980857 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Nov 1 01:57:32 2008 +1030 + + Implement Type 3 fonts in cairo backend using cairo user-fonts + + poppler/CairoFontEngine.cc | 174 + +++++++++++++++++++++++++++++++++++++++++++-- + poppler/CairoFontEngine.h | 18 +++++ + poppler/CairoOutputDev.cc | 9 ++- + poppler/CairoOutputDev.h | 4 +- + 4 files changed, 194 insertions(+), 11 deletions(-) + +commit feab1e982a2ee39bb372d593633a06b6a499822f +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Nov 1 01:21:39 2008 +1030 + + Add CairoOutputDev functions for getting Type 3 glyph metrics + + poppler/CairoOutputDev.cc | 10 ++++++++++ + poppler/CairoOutputDev.h | 7 +++++++ + 2 files changed, 17 insertions(+) + +commit a75efe208d899d4a23d5e2fcef200e4225721636 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Nov 1 00:26:40 2008 +1030 + + Make the catalog available to CairoFontEngine + + glib/poppler-document.cc | 3 ++- + poppler/CairoFontEngine.cc | 2 +- + poppler/CairoFontEngine.h | 3 ++- + poppler/CairoOutputDev.cc | 7 +++++-- + poppler/CairoOutputDev.h | 3 ++- + test/pdf-inspector.cc | 2 +- + 6 files changed, 13 insertions(+), 7 deletions(-) + +commit 941d3976c496b75a3c5a9d19b80044fc2b57bd98 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Fri Oct 31 22:44:41 2008 +1030 + + Allow multiple instances of CairoOutputDev to be created + + for the same document that shares the same CairoFontEngine. + + poppler/CairoOutputDev.cc | 16 +++++++++++----- + poppler/CairoOutputDev.h | 4 +++- + 2 files changed, 14 insertions(+), 6 deletions(-) + +commit 94cff513d8589f51b243fcb078f82cb931bb6d35 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Fri Oct 31 21:11:01 2008 +1030 + + Use correct return type in _ft_new_face + + poppler/CairoFontEngine.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0b5ee897a24ce1edfca19a3b843f9b7ee7026d07 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Fri Oct 31 20:55:14 2008 +1030 + + Refactor CairoFont + + Create a CairoFreeType subclass and move the FreeType specific code + into it. + + poppler/CairoFontEngine.cc | 197 + +++++++++++++++++++++++++-------------------- + poppler/CairoFontEngine.h | 26 ++++-- + 2 files changed, 131 insertions(+), 92 deletions(-) + +commit a5865dae5b414de5f6dbda2a512101050c374e06 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Oct 28 10:30:59 2008 +0100 + + [glib] Add DISABLE_SINGLE_INCLUDES flags and fix glib-demo + + configure.ac | 4 ++++ + glib/Makefile.am | 3 ++- + glib/demo/Makefile.am | 3 ++- + glib/demo/annots.h | 2 +- + glib/demo/attachments.h | 2 +- + glib/demo/fonts.h | 2 +- + glib/demo/forms.h | 2 +- + glib/demo/images.h | 2 +- + glib/demo/info.h | 2 +- + glib/demo/links.h | 2 +- + glib/demo/outline.h | 2 +- + glib/demo/page.h | 2 +- + glib/demo/render.h | 2 +- + glib/demo/transitions.h | 2 +- + glib/demo/utils.h | 2 +- + 15 files changed, 20 insertions(+), 14 deletions(-) + +commit e07bfb54b77430e10e50c33151cf0afc9854006c +Author: Christian Persch <chpe@gnome.org> +Date: Tue Oct 28 10:29:51 2008 +0100 + + [glib] Fix build when compiling with GTK_DISABLE_SINGLE_INCLUDES + + glib/poppler-page.h | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit a84d272ffd2b593ac98148e71b83fba299c60fea +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Oct 28 10:01:00 2008 +0100 + + [glib] Add disable deprecated compile flags and fix compile warnings + + configure.ac | 6 ++++++ + glib/Makefile.am | 3 ++- + glib/demo/Makefile.am | 4 +++- + glib/demo/attachments.c | 4 ++-- + 4 files changed, 13 insertions(+), 4 deletions(-) + +commit 43f2b84a81625abee84c93cdced7fb92c99cd944 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Oct 21 23:00:55 2008 +0200 + + [Qt4] Small docu improvement + + qt4/src/poppler-qt4.h | 3 +++ + 1 file changed, 3 insertions(+) + +commit 00f9995b4960575cd1f392474c585f2140c8e587 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 12 14:20:01 2008 +0200 + + Do not crash if there is not font + + See bug 18023 for more info + + poppler/TextOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 084cc4335cfe2c0e66219eba4c1177ee7ff018c5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Oct 10 23:15:35 2008 +0200 + + obj4 should be the index 1 on the Array, not the 0, that's already + obj3 + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d7442c90206d4b7a8ebc58f995647eb87ac35f42 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Oct 9 22:53:00 2008 +0200 + + If Name is a Ref we want to get the String it references, not the Ref + + poppler/OptionalContent.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 93f8dd9e837557bbfc0f058a664c356e3d6e82c0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Oct 9 21:28:27 2008 +0200 + + Poppler 0.10.0 + + CMakeLists.txt | 2 +- + NEWS | 16 ++++++++++++++++ + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 5 files changed, 22 insertions(+), 6 deletions(-) + +commit cdd9bf016de0d3f96b1d5e304c9d02f2bf71ff18 +Author: Mark Kaplan <mkaplan@finjan.com> +Date: Wed Oct 8 22:29:11 2008 +0200 + + Initialize properly OptionalContentGroup::m_name + + poppler/OptionalContent.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c7b87f3b8cbbcca29a1974debc2233f621a2e33b +Author: Carlo Bramini <carlo.bramix@libero.it> +Date: Mon Oct 6 19:32:27 2008 +0200 + + Fix link on Mingw+Msys + + test/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e92255296511cae9cbbac8de800d8b26e5f681f1 +Author: Pino Toscano <pino@kde.org> +Date: Sun Oct 5 15:57:06 2008 +0200 + + [Qt4] when the PDF exporting fails, delete the file if it was + created by + the (failed) exporting + + qt4/src/poppler-pdf-converter.cc | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +commit 360f470b852e37d400949343763a18bf598820e8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 4 20:04:44 2008 +0200 + + Remove unused var + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit df7317f1320513b4f66cb6618d753b82042671f5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 4 19:48:57 2008 +0200 + + free the object + + poppler/PDFDoc.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 9946d9af9dd5d5b96d5c777413a3e253dfd1f291 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 4 19:39:46 2008 +0200 + + If we try saving a document that was encrypted, we break everything, + so just fail early + + poppler/PDFDoc.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 108959432af7714cb8ffe42d98d40c97f936a2e6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 4 19:39:24 2008 +0200 + + Correctly return wheter it was saved or not + + qt4/src/poppler-pdf-converter.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 4c6cb1c204d782e2ac2113b57f6d372b4716017d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 4 01:46:58 2008 +0200 + + Remove spurious // + + fofi/FoFiType1.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e8e7809ab4b115cbe67251da12989fc024912514 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 4 01:43:02 2008 +0200 + + There are files that have more than one encoding definition per line, + make them work + + Fixes bug 17018, while at it, i've added some comments and some + error() to make things a bit clearer + + fofi/FoFiType1.cc | 28 ++++++++++++++++++++++++---- + 1 file changed, 24 insertions(+), 4 deletions(-) + +commit 7604e025038fee24c2cb3001f2100d5d1e48efe1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Oct 4 00:35:46 2008 +0200 + + Fix Poppler::Link::linkArea for rotated pages + + we suck :-( Fixes kde bug 172105 + + qt4/src/poppler-link-extractor.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 450b21e4528a8e890d3dda37ecb0a68602f8efaa +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Oct 1 00:46:29 2008 +0200 + + I've changed these files this year too, update copyright + + goo/gmem.cc | 2 +- + goo/gmem.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 98310ca24841789cf53b10d34e271ceb4e054001 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 30 23:59:43 2008 +0200 + + Fix StitchingFunction(StitchingFunction *func) and + GfxAxialShading(GfxAxialShading *shading) + + Fixes bug 17852 + + poppler/Function.cc | 2 ++ + poppler/GfxState.cc | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit d12f5f4395eb18f8d29182e24acddd3e2b5cfe88 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 30 23:20:26 2008 +0200 + + 0.9.3 + + CMakeLists.txt | 2 +- + NEWS | 17 +++++++++++++++++ + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 5 files changed, 23 insertions(+), 6 deletions(-) + +commit d61e464754521555a06ed0901955f49be4def29a +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 30 19:26:17 2008 +0200 + + Timothy also agreed, now Ed Catmur is the last one missing to answer + + utils/ImageOutputDev.cc | 3 +++ + utils/ImageOutputDev.h | 3 +++ + 2 files changed, 6 insertions(+) + +commit 3225f54fea7cbb6b25d7223268cdeccfdd823375 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 30 00:27:49 2008 +0200 + + And Marco said yes to GPLv2+ + + Only Timothy Lee and Ed Catmur left :-) + + poppler/Catalog.cc | 3 +++ + poppler/Outline.cc | 3 +++ + poppler/Outline.h | 3 +++ + splash/Splash.cc | 3 +++ + splash/Splash.h | 3 +++ + 5 files changed, 15 insertions(+) + +commit 268d803c9dd67b7f78f8dcdc3c7653c8b2c2d08f +Author: Warren Toomey <wkt@tuhs.org> +Date: Mon Sep 29 21:14:40 2008 +0200 + + Let HmtlOutputDev process images + + utils/HtmlOutputDev.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit a29984ab777c64a1cb286b667a6a91ad9b191f40 +Merge: f399afe6 68658721 +Author: Pino Toscano <pino@kde.org> +Date: Sun Sep 28 23:39:08 2008 +0200 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit f399afe6f6b9c250327d0e4c5b3f2839889d7095 +Author: Pino Toscano <pino@kde.org> +Date: Sun Sep 28 23:38:34 2008 +0200 + + [Qt4] various apidox improvements + + qt4/src/Mainpage.dox | 10 +--- + qt4/src/poppler-link.h | 92 +++++++++++++++++++++++++++++++++---- + qt4/src/poppler-qt4.h | 121 + +++++++++++++++++++++++++++++++++---------------- + 3 files changed, 168 insertions(+), 55 deletions(-) + +commit 68658721583b05ebacb1165ac36e91d49735bbd9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Sep 28 19:29:06 2008 +0200 + + If tables is null, don't try to write to file as it'll crash, fixes + crash on 17811 when using cairooutputdev + + fofi/FoFiTrueType.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 3cb5b7fc5ae168ef58fd1905f61c1b9abe6cb86c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Sep 28 19:25:53 2008 +0200 + + Introduce greallocn_checkoverflow and use it in FoFiTrueType::parse + + Fixes the other part of bug 17811 + + fofi/FoFiTrueType.cc | 4 ++-- + goo/gmem.cc | 21 +++++++++++++++++++++ + goo/gmem.h | 1 + + 3 files changed, 24 insertions(+), 2 deletions(-) + +commit aa7ef03af49f74ed558dcbab8ad4c594bb2b7d53 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Sep 28 19:24:43 2008 +0200 + + If libjpeg tells us to abort, let's abort :D + + Fixes part of bug 17811 + + poppler/DCTStream.cc | 1 + + 1 file changed, 1 insertion(+) + +commit e2461c9aa4d74b5511621d7222979948e31541ad +Author: Pino Toscano <pino@kde.org> +Date: Sun Sep 28 18:07:25 2008 +0200 + + [Qt4] Activate the 'printing' flag by default in the PSConverter. + + qt4/src/poppler-ps-converter.cc | 2 +- + qt4/src/poppler-qt4.h | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 957d7acb66635e9748c6bc7a31cdbbcbb8da9011 +Author: Carlo Bramini <carlo.bramix@libero.it> +Date: Sat Sep 27 17:23:20 2008 +0200 + + Misc mingw fixes + + configure.ac | 2 +- + glib/Makefile.am | 2 +- + glib/demo/info.cc | 1 + + m4/libjpeg.m4 | 2 +- + 4 files changed, 4 insertions(+), 3 deletions(-) + +commit b3828203c4e594754957033ea826e8e22164fd5b +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Sep 26 23:08:14 2008 +0200 + + Carl agreed too, so CairoOutputDev.cc is done + + Only miss, Marco Pesenti Gritti, Timothy Lee and Ed Catmur + + poppler/CairoOutputDev.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit a197a07728d19abc2708979c95b4ef53e88fcb55 +Author: Carlo Bramini <carlo.bramix@libero.it> +Date: Fri Sep 26 18:42:05 2008 +0200 + + Compile where localtime_r is not available + + glib/demo/info.cc | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 38884e1722ac7e15c62cece20035c5fb0020f4b3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 24 14:18:38 2008 +0200 + + Do what Jeff really want to do, mark the font as invalid if it matches + any of the known collections that Identity is not a good fallback + + Fixes pdf on KDE bug 171365 + + poppler/GfxFont.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0e080aaf44816e5d5b9008f3c2fb54868932f0ac +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 24 13:12:13 2008 +0200 + + Remove non-needed X includes + + Spotted by Carlo Bramini + + test/gtk-cairo-test.cc | 3 --- + test/pdf-inspector.cc | 3 --- + 2 files changed, 6 deletions(-) + +commit 6888b023fdb199d3c5fb705bd928aedf68eeffdb +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 23 23:28:04 2008 +0200 + + Only do the scale to 'm' size trick on non embedded fonts as it was + meant to be + + Fixes bug 17744 + + poppler/SplashOutputDev.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 539d29f4f3b24b98c9fc5f88d3477e427fbe409d +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 23 22:39:50 2008 +0200 + + 0.9.2 + + CMakeLists.txt | 2 +- + NEWS | 19 +++++++++++++++++++ + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 5 files changed, 25 insertions(+), 6 deletions(-) + +commit abd070a79d8345bda3853395a39e4e2882c4ff8a +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 22 20:23:11 2008 +0200 + + Check the types here too + + Benchmarking in release mode, both in "human feel" and callgrind + the benefit/lost is almost inexistant + + poppler/Object.h | 36 ++++++++++++++++++++++-------------- + 1 file changed, 22 insertions(+), 14 deletions(-) + +commit df47e4c441e4ec79b1bb40de7044c9501f243b76 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Tue Sep 16 12:56:04 2008 +0100 + + Check for duplicate open fonts. + + Before creating a new FT_Face for a font, check to see if there is a + duplicate amongst the list of open fonts, kept alive by either + Poppler's + or Cairo's font cache . + + A quick example of the benefit of this check is that it reduces the + RSS of + the Poppler converter in the Cairo test suite from over 900 MiB to + just 90 + MiB. + + configure.ac | 1 + + poppler/CairoFontEngine.cc | 214 + +++++++++++++++++++++++++++++++++++++++------ + 2 files changed, 190 insertions(+), 25 deletions(-) + +commit 41d1edddcf84ca23c0fc39c5f4f3a49e408a9f1a +Author: Kouhei Sutou <kou@cozmixng.org> +Date: Sun Sep 21 16:33:33 2008 +0200 + + [glib-demo] Fix a crash in forms demo + + glib/demo/forms.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit fe26075353226be9a02c8cf1a6a29586de15ce86 +Author: Pino Toscano <pino@kde.org> +Date: Sun Sep 21 12:03:21 2008 +0200 + + really use the key passed to it + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8aa531cb478d6ae838a94f9f31e6a0bbd0dd957c +Author: Pino Toscano <pino@kde.org> +Date: Sun Sep 21 11:18:22 2008 +0200 + + Read the 'readOnly' attribute directly in the FormField constructor. + + poppler/Form.cc | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +commit b56f64d676bdabd4a3ebe0eb2237f4c202a3707d +Author: Pino Toscano <pino@kde.org> +Date: Sun Sep 21 00:53:54 2008 +0200 + + Handle streams as entries for the catalog JS name tree. + + poppler/Catalog.cc | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +commit 93386d67b3d7adbd87547e9742e4df1c10eadbc1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 20 16:20:03 2008 +0200 + + Compile with -pedantic + + poppler/Form.h | 4 ++-- + qt4/src/poppler-embeddedfile.cc | 4 ++-- + qt4/src/poppler-movie.cc | 3 ++- + qt4/src/poppler-sound.cc | 3 ++- + qt4/src/poppler-textbox.cc | 2 +- + 5 files changed, 9 insertions(+), 7 deletions(-) + +commit 6961fd8efe3db6ee7077dc2ed072498696dae31a +Author: Tomas Are Haavet <tomasare@gmail.com> +Date: Sat Sep 20 16:13:37 2008 +0200 + + Remove some warnings and errors when compiling with gcc and -pedantic + + fofi/FoFiTrueType.cc | 3 ++- + glib/poppler-annot.cc | 8 ++++---- + glib/poppler-attachment.cc | 2 +- + glib/poppler-document.cc | 6 +++--- + glib/poppler-form-field.cc | 2 +- + glib/poppler-page.cc | 2 +- + poppler/Annot.h | 5 +++-- + splash/SplashTypes.h | 3 ++- + 8 files changed, 17 insertions(+), 14 deletions(-) + +commit 4e9a04da358b1527a08102e601a52f07930532f2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 20 16:10:50 2008 +0200 + + Add mention of GPLv2 or later in poppler changes to all files except + Splash.cc and Splash.h, i've still no answer from Marco :-( + + splash/SplashBitmap.cc | 3 +++ + splash/SplashBitmap.h | 3 +++ + splash/SplashErrorCodes.h | 3 +++ + splash/SplashFTFont.cc | 3 +++ + splash/SplashFTFont.h | 3 +++ + splash/SplashFTFontEngine.cc | 3 +++ + splash/SplashFTFontEngine.h | 3 +++ + splash/SplashFTFontFile.cc | 3 +++ + splash/SplashFTFontFile.h | 3 +++ + splash/SplashFont.cc | 3 +++ + splash/SplashFont.h | 3 +++ + splash/SplashFontEngine.cc | 3 +++ + splash/SplashFontEngine.h | 3 +++ + splash/SplashFontFile.cc | 3 +++ + splash/SplashFontFile.h | 3 +++ + splash/SplashT1Font.cc | 3 +++ + splash/SplashT1Font.h | 3 +++ + splash/SplashT1FontEngine.cc | 3 +++ + splash/SplashT1FontFile.cc | 3 +++ + splash/SplashT1FontFile.h | 3 +++ + splash/SplashTypes.h | 3 +++ + splash/SplashXPathScanner.cc | 3 +++ + 22 files changed, 66 insertions(+) + +commit beb87362072d5b480cf6b2c02445ec17c119ff56 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 20 15:47:25 2008 +0200 + + Add Tomas' Copyright + + utils/HtmlFonts.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 8ccb1bb651b129875ef802356c4a229b2ce31973 +Author: Tomas Are Haavet <tomasare@gmail.com> +Date: Sat Sep 20 15:45:47 2008 +0200 + + Initialize pos the correct value to not have crashes + + utils/HtmlFonts.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 77bf8ec94e36fef7e120f1dc4bb1390be71cfb97 +Author: Tomas Are Haavet <tomasare@gmail.com> +Date: Sat Sep 20 14:17:06 2008 +0200 + + Fix memory leak + + utils/HtmlOutputDev.cc | 1 + + 1 file changed, 1 insertion(+) + +commit b22be54dc2205269974315ca748d835d0990d6da +Author: Tomas Are Haavet <tomasare@gmail.com> +Date: Sat Sep 20 14:16:26 2008 +0200 + + Fix mismatched free/delete + + utils/HtmlOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ac16174da1d6f19445f78e7cd7c4a18cb9524dde +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 20 00:52:19 2008 +0200 + + make sure the image is setup before using it, otherwise some things + don't print correctly like PDF from bug 17645 + + poppler/PSOutputDev.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit ffa4ffdf7fe83035c72addd8c4c8ee566621ba06 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 17 23:27:30 2008 +0200 + + 0.9.1 + + CMakeLists.txt | 2 +- + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 5 files changed, 19 insertions(+), 6 deletions(-) + +commit f57cbe32bcde0808943b9be2456dd69fa5b6dd27 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Sep 14 22:18:38 2008 +0200 + + If when looking for an object we get objSomeNumberAfter assume it + was an int of SomeNumberAfter + + Fixes bug 17568 and i don't see how it can break existing things + because it's already on an error path + + poppler/XRef.cc | 25 +++++++++++++++++++++++++ + 1 file changed, 25 insertions(+) + +commit 1a852064ff5a1a15bc315ddca472a0ad74292581 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Sep 13 12:11:41 2008 +0200 + + [glib-demo] Do not try to get info about remote destinations + + glib/demo/utils.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 951cffeb2cbff4e179043033b5ac7f5eb764d6dc +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Sep 12 12:05:53 2008 +0200 + + Make sure DecryptAESState::bufIdx is never bigger than 16, otherwise + we crash + + I am not sure this is the correct fix, but fixes crash on files of + bugs 13972, 16092 and 17523 and they seem to work ok + + poppler/Decrypt.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 491109edbe827860e764b5fcb67456867923858d +Author: Haruyuki Kawabe <Haruyuki.Kawabe@unisys.co.jp> +Date: Wed Sep 10 23:00:32 2008 +0200 + + Generate the outline file at the same place the other files are + generated + + Fixes bug 17504 + + utils/HtmlOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7dfc1e4c9348d537896bda7b0f2ae591afc72866 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 10 00:03:50 2008 +0200 + + we want to distribute this file too + + qt4/src/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ddb73e8dc1ccbddf3b170e12c7153ccaf716d7cc +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 9 23:47:33 2008 +0200 + + We want to distribute cmake/modules/FindLIBOPENJPEG.cmake too + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 646ccc2bb8563d411dc25bdbab53725ae08572ba +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 9 23:22:17 2008 +0200 + + m_doc->doc->getOptContentConfig() can be null, so check for it + + qt4/src/poppler-document.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d7f0bce67101f37f8d3e69d7d701388bcdc7200f +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 9 23:18:49 2008 +0200 + + Qt4 frontend had timezone parsing that got lost when moving to the + common function, i suck + + glib/poppler-document.cc | 6 ++++-- + poppler/DateInfo.cc | 20 ++++++++++++++------ + poppler/DateInfo.h | 2 +- + qt/poppler-document.cc | 6 ++++-- + qt4/src/poppler-document.cc | 22 +++++++++++++++++++--- + utils/pdfinfo.cc | 6 ++++-- + utils/pdftohtml.cc | 6 ++++-- + 7 files changed, 50 insertions(+), 18 deletions(-) + +commit 0af8609e6c932de2d85168cc9147854ee84b3a1b +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 9 20:55:27 2008 +0200 + + i want this packaged too + + utils/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit dd0f4c1510382e17cf33d3fe163e384da1d6d289 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 9 20:48:04 2008 +0200 + + Fix includepath + + fofi/FoFiTrueType.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 16c0842c3e01608a72709af55cc5cb8b567efedf +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 9 20:36:18 2008 +0200 + + API changed, so increase soname + + glib/CMakeLists.txt | 2 +- + glib/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 217c0d1f80a78713977a7bfbe680fce90f1c6b36 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 8 23:56:28 2008 +0200 + + change version to 0.9.0 + + Now only need to wait for Carlos and Iñigo's answer to a BIC change + in glib/ and we'll have 0.9.0 :-) + + CMakeLists.txt | 2 +- + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +commit e34022a8fcfb9fe211dd6b561377d855972b2087 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 8 23:36:04 2008 +0200 + + Increase soname for libpoppler, i'm almost sure we broke BC there + + CMakeLists.txt | 2 +- + poppler/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit bc275049d6ef083daf71a043ccf23fd0634f5c4d +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 8 23:33:24 2008 +0200 + + soname 3.1.0 for qt4 libs, we are BC/SC but got new API + + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 06743a25a73adc3fba95f7b4ad74a6dde1a54ead +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 8 23:23:06 2008 +0200 + + added news for 0.9.0 + + NEWS | 115 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 115 insertions(+) + +commit d35ca2ce5df12d40e295873e44b1f18ea40ba897 +Author: Pino Toscano <pino@kde.org> +Date: Sun Sep 7 01:13:33 2008 +0200 + + [Qt4] apidox improvements + + qt4/src/poppler-annotation.h | 70 + +++++++++++++++++++++++++++++++++++++++++--- + qt4/src/poppler-link.h | 12 +++++--- + qt4/src/poppler-qt4.h | 22 ++++++++++++-- + 3 files changed, 93 insertions(+), 11 deletions(-) + +commit 796d4c002d47c85716775d173eddfb2ae8866eaf +Author: Pino Toscano <pino@kde.org> +Date: Sat Sep 6 22:48:13 2008 +0200 + + no more need for including the qt3 paths + + qt4/demos/CMakeLists.txt | 1 - + qt4/src/CMakeLists.txt | 1 - + qt4/tests/CMakeLists.txt | 1 - + 3 files changed, 3 deletions(-) + +commit db7ee3b3ae0f42155f9245691e4bfdef98a8ed6f +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 6 23:16:05 2008 +0200 + + [Qt4] Fix docu + + qt4/src/poppler-qt4.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3366059a25611f19ab592cda18c5efe0b9359771 +Author: Pino Toscano <pino@kde.org> +Date: Sat Sep 6 16:34:58 2008 +0200 + + [Qt4] add option flags for the PS converter + + - map the 'strictMargins' and 'forceRasterize' bool options as flags + - add a flag for setting the "printing" mode + + qt4/src/poppler-ps-converter.cc | 34 ++++++++++++++++++++++++++-------- + qt4/src/poppler-qt4.h | 26 ++++++++++++++++++++++++++ + 2 files changed, 52 insertions(+), 8 deletions(-) + +commit afa26d5c9ac9feb61aad30eb65dc00c9854d7f2e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 6 15:46:12 2008 +0200 + + we are printing so pass the print flag as true + + qt/poppler-document.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f5d1eb5eaabaf3ab4bb87b8b4b901bbf30b20b29 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 6 15:43:32 2008 +0200 + + We are pringint here, so pass the printing flag as true + + Fixes KDE bug 170459, you'd wonder how many times i've made the + same mistake... + + qt4/src/poppler-ps-converter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 58e828d732f06bae9133dd518d89fa4348f1cca8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Sep 5 18:45:23 2008 +0200 + + Only like QtTest to the tests, not to the lib itself + + configure.ac | 13 +++++++++++-- + qt4/tests/Makefile.am | 22 +++++++++++----------- + 2 files changed, 22 insertions(+), 13 deletions(-) + +commit 49b3e4560f62a9a7db350d94d50e229f5e1208bf +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Sep 5 18:17:45 2008 +0200 + + Movie filename is not a string, but a File Specification + + Fixes a crash when filename is a dictionary + + poppler/Annot.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit 996d2e176057e22acbc374cff7a712ce6fd92d93 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Sep 5 18:17:25 2008 +0200 + + Unify multiple File Specification parsers + + CMakeLists.txt | 2 + + poppler/FileSpec.cc | 146 + +++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/FileSpec.h | 24 ++++++++ + poppler/Link.cc | 104 +++++------------------------------ + poppler/Link.h | 4 -- + poppler/Makefile.am | 2 + + poppler/PSOutputDev.cc | 35 +----------- + poppler/PSOutputDev.h | 1 - + poppler/Sound.cc | 7 ++- + 9 files changed, 197 insertions(+), 128 deletions(-) + +commit 31f3eb2d6b43f7fbf4d978730d109b08b1563989 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 3 21:49:23 2008 +0200 + + Only set the state to true if the AS value is the same as parent's V + + Fixes bug 16121 and 15535 + + poppler/Form.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit c75abac7ba07990ef54a46fa0d429eea580a71ef +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 2 19:16:55 2008 +0200 + + Kjartan was missing and just agreed + + utils/HtmlOutputDev.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 630aa133017d15ddc7bf96c79f43c5b60fa9749a +Merge: b2bc9b3f de822554 +Author: Pino Toscano <pino@kde.org> +Date: Tue Sep 2 01:25:55 2008 +0200 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit b2bc9b3f59ef8e5fea18f0bc91b71fc9eb9a4157 +Author: Pino Toscano <pino@kde.org> +Date: Tue Sep 2 01:24:39 2008 +0200 + + [Qt4] small apidox improvements + + mostly the start of the \since marker addition, plus few other + documentation addition/improvements + + qt4/src/poppler-annotation.h | 9 +++++++ + qt4/src/poppler-form.h | 8 ++++++ + qt4/src/poppler-link.h | 14 ++++++++--- + qt4/src/poppler-optcontent.h | 11 +++++++++ + qt4/src/poppler-qt4.h | 59 + ++++++++++++++++++++++++++++++++++++++------ + 5 files changed, 90 insertions(+), 11 deletions(-) + +commit 6bc4881477ea15d70d420e57b5663052f2f9df76 +Author: Pino Toscano <pino@kde.org> +Date: Tue Sep 2 00:47:56 2008 +0200 + + expand the macros, extract poppler-optcontent.h + + enable the macro expansion and define POPPLER_QT4_EXPORT to be + empty, so + we don't have it in the apidox + + qt4/src/Doxyfile | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit de822554acdb1b2bc9e70c0668c43a10c0ec129a +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 1 23:50:37 2008 +0200 + + Initialize widget to null before calling initialize not after :-( + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1a7b7199112d97e816a099cbc1a5672c83e64156 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 1 20:42:06 2008 +0200 + + Add my copyright + + poppler/Dict.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 1fef34782a003f46fceab0d3bed36212bbf32c4c +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 1 20:35:37 2008 +0200 + + Find reverse way in Dict + + This fixes Greg Stolze - Marriage Of Virtue & Viciousness.pdf + The issue with this pdf is that has a Dict with two entries with + the same key + The pdf spec says if that happens, results are undefined, but Acroread + uses the + second key while we were using the first, searching backwards we + use the second now too and the pdf works + + poppler/Dict.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bb7996eaaad6a70404891bb2ff530160737ea3d7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 1 20:29:25 2008 +0200 + + Do not crash on documents with no pages + + qt4/tests/test-poppler-qt4.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 0c11d390e4b0e3765ae20968359c7562c9857db7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 1 20:13:33 2008 +0200 + + All poppler commiters to these files agreed to GPLv2+ + + Still missing to answer + Marco Pesenti Gritti + Catalog.cc + Outline.cc + Outline.h + + Kjartan Maraas + HtmlOutputDev.cc + + Timothy Lee + ImageOutputDev.h + ImageOutputDev.cc + + Carl Worth + CairoOutputDev.cc + + Ed Catmur + GfxFont.cc + GlobalParams.cc + TextOutputDev.cc + TextOutputDev.h + UnicodeTypeTable.cc + UnicodeTypeTable.h + + poppler/Annot.cc | 3 +++ + poppler/Annot.h | 3 +++ + poppler/Array.cc | 3 +++ + poppler/Array.h | 3 +++ + poppler/ArthurOutputDev.cc | 3 +++ + poppler/ArthurOutputDev.h | 3 +++ + poppler/CMap.cc | 3 +++ + poppler/CMap.h | 3 +++ + poppler/CairoFontEngine.cc | 3 +++ + poppler/CairoFontEngine.h | 3 +++ + poppler/CairoOutputDev.h | 3 +++ + poppler/Catalog.h | 3 +++ + poppler/CharCodeToUnicode.cc | 3 +++ + poppler/CharCodeToUnicode.h | 3 +++ + poppler/Decrypt.cc | 3 +++ + poppler/Decrypt.h | 3 +++ + poppler/Dict.cc | 3 +++ + poppler/Dict.h | 3 +++ + poppler/Error.cc | 3 +++ + poppler/Error.h | 3 +++ + poppler/Function.cc | 3 +++ + poppler/Gfx.cc | 3 +++ + poppler/Gfx.h | 3 +++ + poppler/GfxFont.h | 3 +++ + poppler/GfxState.cc | 3 +++ + poppler/GfxState.h | 3 +++ + poppler/GlobalParams.h | 3 +++ + poppler/JBIG2Stream.cc | 3 +++ + poppler/JPXStream.cc | 3 +++ + poppler/Lexer.cc | 3 +++ + poppler/Lexer.h | 3 +++ + poppler/Link.cc | 3 +++ + poppler/Link.h | 3 +++ + poppler/Object.cc | 3 +++ + poppler/Object.h | 3 +++ + poppler/OutputDev.cc | 3 +++ + poppler/OutputDev.h | 3 +++ + poppler/PDFDoc.cc | 3 +++ + poppler/PDFDoc.h | 3 +++ + poppler/PDFDocEncoding.cc | 3 +++ + poppler/PDFDocEncoding.h | 3 +++ + poppler/PSOutputDev.cc | 3 +++ + poppler/PSOutputDev.h | 3 +++ + poppler/PSTokenizer.cc | 3 +++ + poppler/PSTokenizer.h | 3 +++ + poppler/Page.cc | 3 +++ + poppler/Page.h | 3 +++ + poppler/Parser.cc | 3 +++ + poppler/Parser.h | 3 +++ + poppler/SplashOutputDev.cc | 3 +++ + poppler/SplashOutputDev.h | 3 +++ + poppler/Stream-CCITT.h | 3 +++ + poppler/Stream.cc | 3 +++ + poppler/Stream.h | 3 +++ + poppler/UTF8.h | 3 +++ + poppler/XRef.cc | 3 +++ + poppler/XRef.h | 3 +++ + utils/HtmlFonts.cc | 3 +++ + utils/HtmlLinks.cc | 3 +++ + utils/HtmlOutputDev.h | 3 +++ + utils/parseargs.c | 3 +++ + utils/parseargs.h | 3 +++ + utils/pdffonts.cc | 3 +++ + utils/pdfimages.cc | 3 +++ + utils/pdfinfo.cc | 3 +++ + utils/pdftohtml.cc | 3 +++ + utils/pdftoppm.cc | 3 +++ + utils/pdftops.cc | 3 +++ + utils/pdftotext.cc | 3 +++ + 69 files changed, 207 insertions(+) + +commit 8670bfed7900586725b30e3af67f6849acc6efda +Author: Vasile Gaburici <gaburici@cs.umd.edu> +Date: Sat Aug 30 12:47:13 2008 +0200 + + Fix extraction of images + + See bug 16999 for more info + + utils/ImageOutputDev.cc | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 1c98f197664b1a2c06e2caf32116a8487f4054bf +Author: Vasile Gaburici <gaburici@cs.umd.edu> +Date: Sat Aug 30 12:44:02 2008 +0200 + + Read sMap reverse so CMap entries take precedence + + See bug 17321 for a more in depth explanation + + poppler/CharCodeToUnicode.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 8f1deb3f8000bdeb845a6c786a654bc7eb684f0a +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 29 23:06:19 2008 +0200 + + Are we a lib or aren't we? Unify String to Date parsing so we all + behave the same way + + CMakeLists.txt | 2 ++ + glib/poppler-document.cc | 29 ++--------------- + poppler/DateInfo.cc | 62 + +++++++++++++++++++++++++++++++++++++ + poppler/DateInfo.h | 27 ++++++++++++++++ + poppler/Makefile.am | 2 ++ + qt/poppler-document.cc | 22 ++----------- + qt4/src/poppler-annotation-helper.h | 16 ++-------- + qt4/src/poppler-document.cc | 52 +++---------------------------- + utils/pdfinfo.cc | 16 ++-------- + utils/pdftohtml.cc | 9 ++---- + 10 files changed, 111 insertions(+), 126 deletions(-) + +commit c39f23dca98d3efe8d094c9a3e1bd460ba57d1ce +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 29 20:50:57 2008 +0200 + + Add a readme for contributors with licensing and misc info + + README.contributors | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +commit 35a72590ffd3284e63601af79599e5fa025e567f +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Aug 28 00:58:11 2008 +0200 + + Be more protective against huge font sizes in bogus documents like + the one in http://bugs.freedesktop.org/show_bug.cgi?id=17326 + + 10 MB in size is a font of 3200x3200, huge enough to be discarted + + poppler/SplashOutputDev.cc | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +commit 33727cf6773b12d736ba245fdd146559ce93102d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 24 20:36:13 2008 +0200 + + fix location of the comment + + fofi/FoFiType1.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit abe29b4fdb33f449649fdea5d7af2deeb702f0bb +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 24 20:24:35 2008 +0200 + + All changes made to fofi/ files under the poppler project are by + people that accepts to license the code under GPLv2+ + + fofi/FoFiBase.cc | 3 +++ + fofi/FoFiTrueType.cc | 3 +++ + fofi/FoFiTrueType.h | 3 +++ + fofi/FoFiType1.cc | 3 +++ + fofi/FoFiType1C.h | 3 +++ + 5 files changed, 15 insertions(+) + +commit 6346d7050a03935c71336c65d5f8f0fe2860d321 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 24 20:23:50 2008 +0200 + + All changes made to goo/ files under the poppler project are by + people that accepts to license the code under GPLv2+ + + goo/GooString.cc | 3 +++ + goo/GooString.h | 3 +++ + goo/gfile.cc | 3 +++ + goo/gfile.h | 3 +++ + goo/gmem.cc | 3 +++ + goo/gmem.h | 3 +++ + 6 files changed, 18 insertions(+) + +commit d6e1f1fb4e83527d3ece51d98fa20262713b7da1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 24 20:22:06 2008 +0200 + + .cc -> .h + + poppler/FontInfo.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9f0ac70f7ad806cadce379d4fabb90eff697ad52 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 24 19:25:27 2008 +0200 + + Add missing addresses + + poppler/ABWOutputDev.cc | 4 ++-- + poppler/ABWOutputDev.h | 2 +- + poppler/FlateStream.cc | 2 +- + poppler/FlateStream.h | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +commit 22f6af73961686895f207fe13022a21333455862 +Merge: 12a9e427 6d6913a7 +Author: Pino Toscano <pino@kde.org> +Date: Sun Aug 24 19:03:24 2008 +0200 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit 12a9e427fb487165b1797f81d52d733c27bfa2e1 +Author: Pino Toscano <pino@kde.org> +Date: Sun Aug 24 18:57:52 2008 +0200 + + [Qt4] add showControl and playMode properties of MovieObject's + + qt4/src/poppler-movie.cc | 14 ++++++++++++++ + qt4/src/poppler-qt4.h | 20 ++++++++++++++++++++ + 2 files changed, 34 insertions(+) + +commit c444c652859b6e52160e5571e84f8eb1292d65f1 +Author: Pino Toscano <pino@kde.org> +Date: Sun Aug 24 18:47:58 2008 +0200 + + [Qt4] make the MovieObject ctor private, with only Page able to use it + + qt4/src/poppler-qt4.h | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 6d6913a79779769ce0fe2f0b516a90a50e51b947 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 24 18:45:45 2008 +0200 + + fix Jeff's entry + + poppler/DCTStream.cc | 2 +- + poppler/DCTStream.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 25bd5967f9f550a32e20eea91cd00cbeff98249e +Author: Pino Toscano <pino@kde.org> +Date: Sun Aug 24 18:45:25 2008 +0200 + + [Qt4] initialize the MovieObject from an AnnotMovie + + the annotation has all the data we need, so just init from that + + qt4/src/poppler-movie.cc | 8 ++++---- + qt4/src/poppler-page.cc | 4 +--- + qt4/src/poppler-qt4.h | 4 ++-- + 3 files changed, 7 insertions(+), 9 deletions(-) + +commit 47f54ad4de111f62a5b8c25520ef6b2bca6026d2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 24 18:18:13 2008 +0200 + + Add more correct copyright statements on fofi, goo, poppler and + util directories to be more compliant with GPL that requires such + modification statements to be present. Meanwhile i did that, i did + qt and qt4 dirs too, glib is missing if someone wants to fix it, + but it's not crucial as it's not a fork of some other GPL software + + AUTHORS | 4 +++- + fofi/FoFiBase.cc | 11 +++++++++++ + fofi/FoFiTrueType.cc | 14 ++++++++++++++ + fofi/FoFiTrueType.h | 12 ++++++++++++ + fofi/FoFiType1.cc | 12 ++++++++++++ + fofi/FoFiType1C.h | 11 +++++++++++ + goo/GooString.cc | 13 +++++++++++++ + goo/GooString.h | 12 ++++++++++++ + goo/GooTimer.cc | 3 +++ + goo/GooTimer.h | 8 ++++++-- + goo/GooVector.h | 12 ++++++++++++ + goo/gfile.cc | 13 +++++++++++++ + goo/gfile.h | 11 +++++++++++ + goo/gmem.cc | 13 +++++++++++++ + goo/gmem.h | 13 +++++++++++++ + poppler/ABWOutputDev.cc | 3 ++- + poppler/ABWOutputDev.h | 2 +- + poppler/Annot.cc | 19 +++++++++++++++++++ + poppler/Annot.h | 17 +++++++++++++++++ + poppler/Array.cc | 11 +++++++++++ + poppler/Array.h | 11 +++++++++++ + poppler/ArthurOutputDev.cc | 14 +++++++++++++- + poppler/ArthurOutputDev.h | 13 ++++++++++++- + poppler/CMap.cc | 12 ++++++++++++ + poppler/CMap.h | 11 +++++++++++ + poppler/CairoFontEngine.cc | 17 +++++++++++++++++ + poppler/CairoFontEngine.h | 17 +++++++++++++++++ + poppler/CairoOutputDev.cc | 19 +++++++++++++++++++ + poppler/CairoOutputDev.h | 16 ++++++++++++++++ + poppler/Catalog.cc | 19 +++++++++++++++++++ + poppler/Catalog.h | 16 ++++++++++++++++ + poppler/CharCodeToUnicode.cc | 14 ++++++++++++++ + poppler/CharCodeToUnicode.h | 13 +++++++++++++ + poppler/DCTStream.cc | 5 ++++- + poppler/DCTStream.h | 6 +++++- + poppler/Decrypt.cc | 12 ++++++++++++ + poppler/Decrypt.h | 11 +++++++++++ + poppler/Dict.cc | 13 +++++++++++++ + poppler/Dict.h | 13 +++++++++++++ + poppler/Error.cc | 13 +++++++++++++ + poppler/Error.h | 13 +++++++++++++ + poppler/FlateStream.cc | 2 ++ + poppler/FlateStream.h | 2 ++ + poppler/FontInfo.cc | 22 ++++++++++++++++++++++ + poppler/FontInfo.h | 21 +++++++++++++++++++++ + poppler/Form.cc | 10 +++++++++- + poppler/Form.h | 6 +++++- + poppler/Function.cc | 12 ++++++++++++ + poppler/Gfx.cc | 23 +++++++++++++++++++++++ + poppler/Gfx.h | 13 +++++++++++++ + poppler/GfxFont.cc | 19 +++++++++++++++++++ + poppler/GfxFont.h | 16 ++++++++++++++++ + poppler/GfxState.cc | 14 ++++++++++++++ + poppler/GfxState.h | 13 +++++++++++++ + poppler/GlobalParams.cc | 19 +++++++++++++++++++ + poppler/GlobalParams.h | 15 +++++++++++++++ + poppler/JBIG2Stream.cc | 13 +++++++++++++ + poppler/JPXStream.cc | 11 +++++++++++ + poppler/Lexer.cc | 12 ++++++++++++ + poppler/Lexer.h | 12 ++++++++++++ + poppler/Link.cc | 14 ++++++++++++++ + poppler/Link.h | 12 ++++++++++++ + poppler/Movie.cc | 17 ++++++++++++++++- + poppler/Object.cc | 11 +++++++++++ + poppler/Object.h | 12 ++++++++++++ + poppler/OptionalContent.cc | 5 ++++- + poppler/Outline.cc | 11 +++++++++++ + poppler/Outline.h | 11 +++++++++++ + poppler/OutputDev.cc | 13 +++++++++++++ + poppler/OutputDev.h | 14 ++++++++++++++ + poppler/PDFDoc.cc | 15 +++++++++++++++ + poppler/PDFDoc.h | 15 +++++++++++++++ + poppler/PDFDocEncoding.cc | 13 ++++++++++++- + poppler/PDFDocEncoding.h | 11 +++++++++++ + poppler/PSOutputDev.cc | 15 +++++++++++++++ + poppler/PSOutputDev.h | 14 ++++++++++++++ + poppler/PSTokenizer.cc | 12 ++++++++++++ + poppler/PSTokenizer.h | 11 +++++++++++ + poppler/Page.cc | 20 ++++++++++++++++++++ + poppler/Page.h | 16 ++++++++++++++++ + poppler/PageLabelInfo.cc | 12 ++++++++++++ + poppler/PageLabelInfo.h | 12 ++++++++++++ + poppler/PageTransition.h | 18 ++++++++++++++++++ + poppler/Parser.cc | 12 ++++++++++++ + poppler/Parser.h | 11 +++++++++++ + poppler/SplashOutputDev.cc | 16 ++++++++++++++++ + poppler/SplashOutputDev.h | 11 +++++++++++ + poppler/Stream-CCITT.h | 11 +++++++++++ + poppler/Stream.cc | 14 ++++++++++++++ + poppler/Stream.h | 13 +++++++++++++ + poppler/TextOutputDev.cc | 18 ++++++++++++++++++ + poppler/TextOutputDev.h | 15 +++++++++++++++ + poppler/UTF8.h | 11 +++++++++++ + poppler/UnicodeTypeTable.cc | 13 +++++++++++++ + poppler/UnicodeTypeTable.h | 11 +++++++++++ + poppler/XRef.cc | 17 ++++++++++++++++- + poppler/XRef.h | 14 ++++++++++++++ + qt/poppler-document.cc | 3 +++ + qt/poppler-fontinfo.cc | 3 +-- + qt/poppler-page.cc | 7 ++++++- + qt/poppler-private.h | 4 ++++ + qt/poppler-qt.h | 5 ++++- + qt4/src/poppler-annotation-helper.h | 1 + + qt4/src/poppler-annotation.cc | 3 ++- + qt4/src/poppler-annotation.h | 4 +++- + qt4/src/poppler-document.cc | 4 +++- + qt4/src/poppler-embeddedfile.cc | 1 + + qt4/src/poppler-fontinfo.cc | 5 ++++- + qt4/src/poppler-form.cc | 2 +- + qt4/src/poppler-form.h | 2 +- + qt4/src/poppler-link-extractor-private.h | 2 +- + qt4/src/poppler-link-extractor.cc | 2 +- + qt4/src/poppler-link.cc | 3 ++- + qt4/src/poppler-link.h | 1 + + qt4/src/poppler-optcontent-private.h | 1 + + qt4/src/poppler-optcontent.cc | 1 + + qt4/src/poppler-optcontent.h | 1 + + qt4/src/poppler-page-private.h | 2 ++ + qt4/src/poppler-page.cc | 4 ++++ + qt4/src/poppler-private.h | 4 +++- + qt4/src/poppler-ps-converter.cc | 1 + + qt4/src/poppler-qt4.h | 5 ++++- + qt4/src/poppler-textbox.cc | 2 ++ + splash/Splash.cc | 12 ++++++++++++ + splash/Splash.h | 12 ++++++++++++ + splash/SplashBitmap.cc | 12 ++++++++++++ + splash/SplashBitmap.h | 11 +++++++++++ + splash/SplashErrorCodes.h | 11 +++++++++++ + splash/SplashFTFont.cc | 12 ++++++++++++ + splash/SplashFTFont.h | 11 +++++++++++ + splash/SplashFTFontEngine.cc | 11 +++++++++++ + splash/SplashFTFontEngine.h | 11 +++++++++++ + splash/SplashFTFontFile.cc | 11 +++++++++++ + splash/SplashFTFontFile.h | 11 +++++++++++ + splash/SplashFont.cc | 11 +++++++++++ + splash/SplashFont.h | 11 +++++++++++ + splash/SplashFontEngine.cc | 11 +++++++++++ + splash/SplashFontEngine.h | 11 +++++++++++ + splash/SplashFontFile.cc | 12 ++++++++++++ + splash/SplashFontFile.h | 12 ++++++++++++ + splash/SplashT1Font.cc | 11 +++++++++++ + splash/SplashT1Font.h | 11 +++++++++++ + splash/SplashT1FontEngine.cc | 11 +++++++++++ + splash/SplashT1FontFile.cc | 11 +++++++++++ + splash/SplashT1FontFile.h | 11 +++++++++++ + splash/SplashTypes.h | 11 +++++++++++ + splash/SplashXPathScanner.cc | 11 +++++++++++ + utils/HtmlFonts.cc | 24 ++++++++++++++++++++++++ + utils/HtmlFonts.h | 12 ++++++++++++ + utils/HtmlLinks.cc | 23 +++++++++++++++++++++++ + utils/HtmlLinks.h | 12 ++++++++++++ + utils/HtmlOutputDev.cc | 13 +++++++++++++ + utils/HtmlOutputDev.h | 11 +++++++++++ + utils/ImageOutputDev.cc | 13 +++++++++++++ + utils/ImageOutputDev.h | 12 ++++++++++++ + utils/parseargs.c | 13 +++++++++++++ + utils/parseargs.h | 11 +++++++++++ + utils/pdffonts.cc | 12 ++++++++++++ + utils/pdfimages.cc | 11 +++++++++++ + utils/pdfinfo.cc | 12 ++++++++++++ + utils/pdftoabw.cc | 26 +++++++++++++++++++------- + utils/pdftohtml.cc | 11 +++++++++++ + utils/pdftoppm.cc | 11 +++++++++++ + utils/pdftops.cc | 12 ++++++++++++ + utils/pdftotext.cc | 12 ++++++++++++ + 165 files changed, 1795 insertions(+), 37 deletions(-) + +commit 0dfbb8996ee91aa044eb2bdf2859ef64005116f8 +Author: Loïc Minier <lool@dooz.org> +Date: Wed Aug 20 22:10:07 2008 +0200 + + Fixes escaping of hyphens in man pages + + utils/pdfinfo.1 | 2 +- + utils/pdftops.1 | 16 ++++++++-------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +commit 6cfa0e598a81460e5d0a7d60d8584366d2a70165 +Author: Loïc Minier <lool@dooz.org> +Date: Wed Aug 20 19:57:42 2008 +0200 + + Fix synopsis of pdftops in man page to clarify that a PDF file is + required in all cases + + utils/pdftops.1 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 48a73cc709a8bed9d2d0f9cbd2a9d2b6c0dad05b +Author: Pino Toscano <pino@kde.org> +Date: Sat Aug 23 19:26:01 2008 +0200 + + [Qt4] convert the title of movie annotations + + qt4/src/poppler-page.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 419ec15ac825f2e0052b411462f00ac57fed030e +Author: Pino Toscano <pino@kde.org> +Date: Sat Aug 23 19:25:04 2008 +0200 + + [Qt4] get/set the title for movie annotations + + qt4/src/poppler-annotation.cc | 13 +++++++++++++ + qt4/src/poppler-annotation.h | 3 +++ + 2 files changed, 16 insertions(+) + +commit 63bcaf113fcb5a4a9e5c120df2c3dafb2977c90a +Author: Pino Toscano <pino@kde.org> +Date: Sat Aug 23 01:58:30 2008 +0200 + + [Qt4] convert the movie annotation from the core type to the Qt4 one + + qt4/src/poppler-page.cc | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) + +commit 5cc490de74af12726bdeb9b5a6a0f0d1d79383b5 +Author: Pino Toscano <pino@kde.org> +Date: Sat Aug 23 01:55:41 2008 +0200 + + [Qt4] first version of a MovieAnnotation + + right mow it just holds the movie object + + qt4/src/poppler-annotation.cc | 74 + +++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-annotation.h | 26 ++++++++++++++- + 2 files changed, 99 insertions(+), 1 deletion(-) + +commit 3d5c2e22d790d7c139e1cd28aebb21cfe76b8b6b +Author: Pino Toscano <pino@kde.org> +Date: Sat Aug 23 01:54:30 2008 +0200 + + compile the new poppler-movie.cc + + qt4/src/CMakeLists.txt | 1 + + qt4/src/Makefile.am | 1 + + 2 files changed, 2 insertions(+) + +commit 599698a9b133999f1f0bb0548489111e9d7b6f05 +Author: Pino Toscano <pino@kde.org> +Date: Sat Aug 23 01:52:58 2008 +0200 + + [Qt4] first version of a MovieObject object for movies + + slightly differs from the version in core + + qt4/src/poppler-movie.cc | 73 + ++++++++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-qt4.h | 34 ++++++++++++++++++++++ + 2 files changed, 107 insertions(+) + +commit 820f15009845870701e1f4e7f4fc4fb93312ab3e +Author: Pino Toscano <pino@kde.org> +Date: Sat Aug 23 01:45:07 2008 +0200 + + fix Movie::copy() + + the default copy ctor already does the vertbatim copies, so no need to + do them on our own; what needs to be done is checking whether + an object + is valid before either doing a "smart copy" or "postprocessing" it + + poppler/Movie.cc | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +commit c3a006ae35250e9a5638c2ce713b7470380751c7 +Author: Pino Toscano <pino@kde.org> +Date: Sat Aug 23 01:04:34 2008 +0200 + + compile attachments.c in the demo with cmake as well + + glib/demo/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit b5a7987a50b3d28fbfa219e2cef85b9e53aaf079 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Aug 21 20:40:18 2008 +0200 + + [glib-demo] Fix attachments demo with documents that don't contain + attachments + + glib/demo/attachments.c | 27 ++++++++++++++++++++------- + 1 file changed, 20 insertions(+), 7 deletions(-) + +commit a2b0aefedbdb20ce0ef8398a700202021fcf00db +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Aug 21 20:14:50 2008 +0200 + + [glib-demo] Fix typo + + glib/demo/attachments.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9e563d6d877624b1caf82ac30c5ae30a1eb48f21 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Aug 21 20:12:33 2008 +0200 + + [glib-demo] Add checksum validation to attachments demo + + glib/demo/attachments.c | 101 + ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 101 insertions(+) + +commit e233325e6f13d8b232bf68a2812fe755e7fccd4d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Aug 21 19:03:32 2008 +0200 + + [glib-demo] Add demo for attachments + + glib/demo/Makefile.am | 2 + + glib/demo/attachments.c | 242 + ++++++++++++++++++++++++++++++++++++++++++++++++ + glib/demo/attachments.h | 31 +++++++ + glib/demo/main.c | 4 +- + glib/demo/utils.c | 23 +++++ + glib/demo/utils.h | 1 + + 6 files changed, 302 insertions(+), 1 deletion(-) + +commit 0e2efa0fce5bf059ce85d3e3bec2293b405ec3c9 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Aug 21 19:02:24 2008 +0200 + + [glib] Make sure name and descripction are valid utf8 strings + + glib/poppler-attachment.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 15a73704ab6b009ca5e07c08f0b12d970adc387d +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Tue Aug 19 09:18:03 2008 +0100 + + Memleak and invalid free. + + CairoOutputDev::setSoftMask() fails to free the cairo_t and mask + it uses + to draw the opaque soft mask and attempts to destroy a reference to a + surface it does not own (this bug was masked by the fact that + a reference + was still being held by the unfreed cairo_t). + + poppler/CairoOutputDev.cc | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit d3110e392097db54e9ee59300213e490dee39126 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Aug 19 19:19:09 2008 +0200 + + Fix include so it can be used in the unsupported way of installing + internal poppler/ headers + + Notified by Caolan McNamara <caolanm@redhat.com> + + poppler/PreScanOutputDev.h | 2 +- + poppler/SecurityHandler.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 303249e5548bfbf6823e97850e498970d802b4a0 +Author: Albert Astals Cid <tsdgeos@samsung.localdomain> +Date: Fri Aug 15 01:52:52 2008 +0200 + + Revert 123a87aff2e35b10efe6a1d715585b427e4a9afa it creates problems + with some pdf files + + poppler/Gfx.cc | 14 ++------------ + poppler/Gfx.h | 3 --- + 2 files changed, 2 insertions(+), 15 deletions(-) + +commit 27ddf3c5e839358c8553d41743faa8ee304767bf +Author: Pino Toscano <pino@kde.org> +Date: Wed Aug 13 13:55:57 2008 +0200 + + [Qt4] make sure to use the correct page width/height for form + widgets coordinates + + qt4/src/poppler-form.cc | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 2e7b0eb4af8cf5938833e5659d01b77096e7b7f7 +Author: Pino Toscano <pino@kde.org> +Date: Tue Aug 12 13:49:52 2008 +0200 + + [Qt4] add a method to get the activation action of a FormField + + qt4/src/poppler-form.cc | 19 +++++++++++++++++++ + qt4/src/poppler-form.h | 8 ++++++++ + 2 files changed, 27 insertions(+) + +commit f9e679adbd6830da26eb9909bcb16e3bdf0da6b4 +Author: Pino Toscano <pino@kde.org> +Date: Tue Aug 12 13:47:15 2008 +0200 + + create a static version of PageData::convertLinkActionToLink() + + qt4/src/poppler-page-private.h | 2 ++ + qt4/src/poppler-page.cc | 5 +++++ + 2 files changed, 7 insertions(+) + +commit a6ecc864ea3e94d7232cff6a2e8f49919d8f24ff +Author: Albert Astals Cid <tsdgeos@samsung.localdomain> +Date: Tue Aug 12 01:23:21 2008 +0200 + + initialize widget, fixes crash on EC2006.pdf + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 123a87aff2e35b10efe6a1d715585b427e4a9afa +Author: Albert Astals Cid <tsdgeos@samsung.localdomain> +Date: Tue Aug 12 00:37:09 2008 +0200 + + Cache the last created GfxResource, very useful because some pdf + created by pstopdf push and pop the same GfxResource all the time + + This brings us a speedup of 16 times (from 11 seconds to about 600 + msec) in kde bug 168663 + + poppler/Gfx.cc | 14 ++++++++++++-- + poppler/Gfx.h | 3 +++ + 2 files changed, 15 insertions(+), 2 deletions(-) + +commit 5ad1a12183f4b8e328f32386a74b5616e7e59070 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 4 20:34:42 2008 +0200 + + Be less strict when parsing TTF tables + + With this change and freetype from CVS i can render Bug 16940 using + the splash renderer + + fofi/FoFiTrueType.cc | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit d322720428fa416b7d5f23acc72d1d4b4f74d041 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 4 20:16:50 2008 +0200 + + Report an error when FoFiTrueType::load or FoFiTrueType::make fail + + poppler/SplashOutputDev.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 901ebc84ff7c0872c3f9f5e6eaf418ba6400fa10 +Author: Pino Toscano <pino@kde.org> +Date: Sun Aug 3 10:54:09 2008 +0200 + + [Qt4] Make the paper color setting working as it should. + + A BGR colorspace means that colors should be set as blue,green,red, + and + not red,green,blue. + + qt4/src/poppler-private.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 66b34c78943be598778a3ef438b0cefac668c6a2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 2 13:54:34 2008 +0200 + + This should not be here, breaks jpeg rendering when not using libjpeg + + That was included erroneously when the file writing code was added + + poppler/Stream.cc | 1 - + 1 file changed, 1 deletion(-) + +commit fd8d71ea8b12393201ece9c09372fd69c7573025 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 1 23:47:51 2008 +0200 + + These defines are unneeded too + + msvc/poppler/poppler-config.h | 30 ------------------------------ + poppler-config.h.cmake | 30 ------------------------------ + poppler/poppler-config.h.in | 30 ------------------------------ + 3 files changed, 90 deletions(-) + +commit 391b5d5cdd9f63fe90229f88cdad628fb63c0206 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 1 23:36:09 2008 +0200 + + Get rid of more defines, say our version on command line tools, + also say our copyright + + Did not modify PSOutputDev.cc output as PS is too fragile + + msvc/poppler/poppler-config.h | 9 +-------- + poppler-config.h.cmake | 9 +-------- + poppler/PSOutputDev.cc | 2 +- + poppler/poppler-config.h.in | 9 +-------- + utils/pdffonts.cc | 3 ++- + utils/pdfimages.cc | 3 ++- + utils/pdfinfo.cc | 3 ++- + utils/pdftohtml.cc | 3 ++- + utils/pdftoppm.cc | 3 ++- + utils/pdftops.cc | 3 ++- + utils/pdftotext.cc | 3 ++- + 11 files changed, 18 insertions(+), 32 deletions(-) + +commit d14fb1513be045363f7edec21cee04fd4937ede2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 1 23:14:28 2008 +0200 + + Add GooList *getEncodingNames(); + + Forgot to commit this earlier :-( + + poppler/GlobalParams.cc | 19 +++++++++++++++++++ + poppler/GlobalParams.h | 2 ++ + 2 files changed, 21 insertions(+) + +commit 9fd34443d765ccd61864d18bceadc049d905b957 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 1 23:09:39 2008 +0200 + + remove defines we don't use at all + + msvc/poppler/poppler-config.h | 4 ---- + poppler-config.h.cmake | 4 ---- + poppler/poppler-config.h.in | 4 ---- + 3 files changed, 12 deletions(-) + +commit 0f13013dc3079915572b6b002dac8d01d2dbde04 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 1 23:06:50 2008 +0200 + + xpdfrc has been dead for a while + + msvc/poppler/poppler-config.h | 25 ------------------------- + poppler-config.h.cmake | 25 ------------------------- + poppler/poppler-config.h.in | 25 ------------------------- + 3 files changed, 75 deletions(-) + +commit 96392667d1331d2f8750f27c116e34bbf9282dca +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 1 22:20:55 2008 +0200 + + Provide a default constructor for FontInfo so you can use it as + metatype for qvariant + + qt4/src/poppler-fontinfo.cc | 5 +++++ + qt4/src/poppler-private.h | 7 +++++++ + qt4/src/poppler-qt4.h | 5 +++++ + 3 files changed, 17 insertions(+) + +commit 9fd1077e63d97a316380b8df4821bf4c9434fb52 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 1 17:47:51 2008 +0200 + + Build with cmake too + + utils/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d8d6a3f46620d45c279b7ca1a4a2fa3a36285cde +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 1 17:44:07 2008 +0200 + + Improve manpages and add -listenc to pdfinfo and pdftotext in the way + + Our manpages listed things like xpdfrc and -cfg options we don't + support at all. + Also some options were missing from the man pages + Finally there was the -enc option you completely had to guess which + string to pass, + so i've added the -listenc option to get the user the list of + encodings he can use + + utils/Makefile.am | 2 ++ + utils/pdffonts.1 | 18 ------------------ + utils/pdfimages.1 | 14 -------------- + utils/pdfinfo.1 | 28 ++++------------------------ + utils/pdfinfo.cc | 16 ++++++++++++++-- + utils/pdftoppm.1 | 42 +++++++++++++++++++++--------------------- + utils/pdftops.1 | 41 +++-------------------------------------- + utils/pdftotext.1 | 32 ++++---------------------------- + utils/pdftotext.cc | 16 ++++++++++++++-- + utils/printencodings.cc | 34 ++++++++++++++++++++++++++++++++++ + utils/printencodings.h | 24 ++++++++++++++++++++++++ + 11 files changed, 120 insertions(+), 147 deletions(-) + +commit f5b0ca794b0879e3d239bf1d6138b15ead27d9ca +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Tue Jul 29 20:18:33 2008 +0930 + + Fix ActualText string length check in TextOutputDev.cc + + poppler/TextOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 21bbdc9d663995336900f1ce97cf294f04464e01 +Author: Boris Toloknov <tlknv@yandex.ru> +Date: Mon Jul 28 21:02:07 2008 +0200 + + make xml output valid xml + + utils/HtmlLinks.cc | 33 ++++++++++++++++++-- + utils/HtmlOutputDev.cc | 85 + ++++++++++++++++++++++++++++++++------------------ + 2 files changed, 85 insertions(+), 33 deletions(-) + +commit dccfc4c2910b47a77cd7b6019d9365f1684ffd0c +Author: Boris Toloknov <tlknv@yandex.ru> +Date: Mon Jul 28 20:58:13 2008 +0200 + + Limit ascent and descent are to reasonable values. + + See bug 16592 to cases where this helps + + utils/HtmlOutputDev.cc | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit 0fd5a3db1ddad447d44b64eff9abfb077a7853a0 +Author: Boris Toloknov <tlknv@yandex.ru> +Date: Mon Jul 28 20:52:19 2008 +0200 + + Make html output to keep all the spaces with   + + utils/HtmlFonts.cc | 2 ++ + utils/HtmlOutputDev.cc | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 650c73fa0f570f699d907e33060fb23290940b42 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jul 28 20:44:13 2008 +0200 + + findDest crashes on null goostrings so rework the ifs a bit + + utils/HtmlOutputDev.cc | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +commit adee9c0e9e8b2de20309b3ae6eb8e6d6ed05cf85 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jul 26 00:04:03 2008 +0200 + + We are not storing the ctu, so decref and leak-- :-) + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit e7b3e3ae3080bd6f239f7d96761729ad30b075ae +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 25 23:52:28 2008 +0200 + + Fix leak + + qt4/src/poppler-form.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 006b974d4faae53e6bd51a4281dd923ab1c2d4e8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 25 23:15:11 2008 +0200 + + Fix memory leak + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 3a549d75acceedfa25dcf79074d0cdfb643c746e +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 25 23:08:21 2008 +0200 + + Free the previous modified object in case it exists + + poppler/XRef.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 040d244b97a554342061c777a286e99dbb9acabd +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 25 21:31:55 2008 +0200 + + Need this or otherwise it crashes on complete overwrite + + poppler/PDFDoc.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 11ebceeef938a7e6fa9b5437e65b5b4b822f3018 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 25 21:30:24 2008 +0200 + + Fix my last fix about saving, i think this is the correct one + + - One incremental update only write the modified entries xref, + not all + - Update gen to 0 when resizing entries + - On XRef::add correctly initialize all newly allocated entries + + poppler/PDFDoc.cc | 4 ++-- + poppler/XRef.cc | 57 + ++++++++++++++++++++++++++++++++++++++++++++----------- + poppler/XRef.h | 2 +- + 3 files changed, 49 insertions(+), 14 deletions(-) + +commit 03d445f485f90972ab1c05d79b2999b763ab7377 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 25 20:16:54 2008 +0200 + + Fix XRef::writeToFile after my change + + poppler/XRef.cc | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +commit 136fa97576f2df0d7a7563b34651ca222927ea57 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 25 20:12:51 2008 +0200 + + Fix XRef::add and XRef::addIndirectObject, also remove num from + XRefEntry + + Previous code was under some incorrect assumptions: + * our XRef does not maintain the free link list so if you want to + find a free entry you have to go though all of them + * our XRefEntry does not need a num because the index itself is + the num + + Conflicts: + + poppler/XRef.cc + + poppler/XRef.cc | 70 + +++++++++++++++++++++------------------------------------ + poppler/XRef.h | 1 - + 2 files changed, 25 insertions(+), 46 deletions(-) + +commit 55572b77da95c47393b78f3aff804ea9c5ae17e5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jul 22 22:50:00 2008 +0200 + + Really do what the comment says and also init changeLeft, changeTop + and changeZoom + + poppler/Link.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 8dc7afaeea08183de331ecfd41ce1971e7772fd0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jul 22 21:05:03 2008 +0200 + + Some documents have loops in XObject dictionaries, make sure we + don't get in an infinite loop while traversing them + + Fixes infinite loop on http://bugs.kde.org/show_bug.cgi?id=166145 + + poppler/FontInfo.cc | 44 ++++++++++++++++++++++++++++++++++++-------- + poppler/FontInfo.h | 4 ++++ + 2 files changed, 40 insertions(+), 8 deletions(-) + +commit 9fb17c952dcff798e45280eeb9c718680147e766 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jul 20 13:47:11 2008 +0200 + + Fix condition, we want thumb to be a Stream, not to be non null + + Fixes bug 16579 + + glib/poppler-page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3696025977fd345b12767f75a2de6ed7e9467365 +Author: Pino Toscano <pino@kde.org> +Date: Fri Jul 18 23:32:25 2008 +0200 + + initialize pageWidgets, otherwise it can be a rubbish pointer + is Annots + is not a valid object + + poppler/Page.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0189ff8b86de18486f7397076f7a0fbf133a1a33 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jul 1 20:16:50 2008 +0200 + + Fix condition, we want fetched_thumb to be a Stream, not to be + non null + + Fixes bug 16579 + + poppler/Page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5bd77dcdd5220d63934f4b3e78d85a936947a53d +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jul 1 00:49:01 2008 +0200 + + forgot about we use autofoo too + + qt4/tests/Makefile.am | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 5ed2503003d973b5461594af15485af49591451d +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jul 1 00:43:26 2008 +0200 + + unittesting about ActualText + + qt4/tests/CMakeLists.txt | 1 + + qt4/tests/check_actualtext.cpp | 33 +++++++++++++++++++++++++++++++++ + 2 files changed, 34 insertions(+) + +commit f3bb2eb556f5248242f6db85052ef045fcb697c6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jul 1 00:41:35 2008 +0200 + + Unbreak ActualText extraction + + poppler/Gfx.cc | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +commit 9e9543b105b39f8b0048c00fc94741e43ad615e9 +Author: Pino Toscano <pino@kde.org> +Date: Thu Jun 26 20:19:06 2008 +0200 + + use FindPackageHandleStandardArgs + + cmake/modules/FindLIBOPENJPEG.cmake | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +commit fec41ceddebe194f139bcc5b2f3fa74e7d1ae502 +Author: Pino Toscano <pino@kde.org> +Date: Thu Jun 26 20:18:27 2008 +0200 + + need to use LIBOPENJPEG_FOUND, as it really represents whether + libopenjpeg was found or not + + CMakeLists.txt | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit 5498d93e59a0b79e5add3dc6181d5e98ba689217 +Author: Michael Vrable <mvrable@cs.ucsd.edu> +Date: Fri Jun 20 21:42:34 2008 -0700 + + Use a single global FT_Library in CairoOutputDev + + Cairo may internally keep references to the FreeType fonts loaded in + CairoFontEngine even after poppler is done with them. Commit + 42db4890e829 + ("Do not call FT_Done_Face on a live cairo_font_face_t") introduced + a fix + for one use-after-free bug, by delaying deleting an FT_Face objects + until + cairo is done with it. + + That fix doesn't correct all the bugs. An FT_Library object is + created for + each CairoOutputDev object, and deleted when the CairoOutputDev + goes away. + But the FT_Library object should not be deleted while fonts loaded + using it + are still in use. And cairo can keep references to fonts around + more or + less indefinitely. + + To more fully fix the problem, we can either: + 1. Keep a count of not-yet-deleted fonts associated with each + FT_Library, + and wait to call FT_Done_FreeType until it drops to zero. + 2. Never call FT_Done_FreeType. + + The second option is the simplest. To avoid leaking memory FT_Library + objects, use a single global FT_Library instead of a + per-CairoOutputDev + copy. + + poppler/CairoOutputDev.cc | 18 +++++++++++++++--- + poppler/CairoOutputDev.h | 4 +++- + 2 files changed, 18 insertions(+), 4 deletions(-) + +commit c75632d62a052d3c3739b96f5586f97c68baf25b +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 24 02:31:43 2008 +0200 + + Open in WriteOnly mode, fixes the fact that when writing to an + existing file, the contents beyond what we wrote were still there + + qt4/src/poppler-base-converter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9810fdfc54aac80aa99561a9d820d11b062e4637 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 24 02:12:21 2008 +0200 + + the entry is not updated here either, fix uninitialized variable use + + poppler/XRef.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 2da15db4751d3cb93d40b48e348dbc51f6e7a29f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jun 20 11:39:08 2008 +0200 + + Do not create an OCGs object if there isn't an OCProperties dictionary + in the Catalog + + poppler/Catalog.cc | 5 +++-- + poppler/Gfx.cc | 12 +++++++++++- + poppler/OptionalContent.cc | 25 +++++-------------------- + 3 files changed, 19 insertions(+), 23 deletions(-) + +commit d6fb5dcb7b7596961800d9744d17b6adb8d9a2ad +Author: Michael Vrable <mvrable@cs.ucsd.edu> +Date: Wed Jun 18 11:24:05 2008 -0700 + + Fix a crash in the cairo backend with Type 3 glyphs + + Commit 86b7e8a3bee7 ("Ensure cairo renders Type 3 glyphs with only + the fill + color") introduced a bug into the Cairo backend, causing evince + to crash + with the message + evince: cairo-pattern.c:679: cairo_pattern_destroy: Assertion + `((*&(&pattern->ref_count)->ref_count) > 0)' failed. + Fix this by updating reference counts to the fill and stroke + patterns when + modifying them in beginType3Char. + + Simplify the code as well by not saving the old stroke pattern before + overriding it; this is already done since beginType3Char/endType3Char + is + wrapped by calls to saveState/restoreState in Gfx::doShowText. + + poppler/CairoOutputDev.cc | 4 ++-- + poppler/CairoOutputDev.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit c3a00c83f1d24c1f88e7ed3b3f772460e578f3cc +Author: Pino Toscano <pino@kde.org> +Date: Sun Jun 15 02:39:31 2008 +0200 + + poppler-page-transition.h is here now + + qt4/src/Doxyfile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2affed0fc97b958ae46f531c471a3cf0b04c0f55 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jun 14 01:24:49 2008 +0200 + + Give warnings if the build configuration for stream decoders is + different from default one + + configure.ac | 20 +++++++++++++++++--- + 1 file changed, 17 insertions(+), 3 deletions(-) + +commit 8e74bc612cb4102891324ffdbfcdb47293ecb95e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jun 14 01:13:53 2008 +0200 + + Warn the user if he does not have any enabled rendering backend + + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +commit 99d2361032cbaafd69bd796170757ed6482f208d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jun 14 00:53:38 2008 +0200 + + Add a JPEG2000 decoder based on OpenJPEG + + Enabled by default since it's generally better than xpdf one + See + http://lists.freedesktop.org/archives/poppler/2008-June/003874.html + for more information + + CMakeLists.txt | 30 +++++- + cmake/modules/FindLIBOPENJPEG.cmake | 44 +++++++++ + configure.ac | 33 +++++++ + poppler/JPEG2000Stream.cc | 181 + ++++++++++++++++++++++++++++++++++++ + poppler/JPEG2000Stream.h | 48 ++++++++++ + poppler/Makefile.am | 22 ++++- + poppler/Stream.cc | 7 +- + 7 files changed, 360 insertions(+), 5 deletions(-) + +commit e368838d7f9691c7b1adf7d7f62f65abed91eea7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 11 00:48:53 2008 +0200 + + [Qt4] Add the possibility of getting a QByteArray with the data of + an embedded font + + qt4/src/poppler-document.cc | 23 +++++++++++++++++++++++ + qt4/src/poppler-private.h | 3 +++ + qt4/src/poppler-qt4.h | 5 +++++ + 3 files changed, 31 insertions(+) + +commit 184292ffb8fef5aa5a72bdbfcc0c95b663f452bd +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 10 23:00:11 2008 +0200 + + Make the fontRef and the embRef accessible to FontInfo users + + poppler/FontInfo.cc | 2 +- + poppler/FontInfo.h | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 86b7e8a3bee74c5b89c451137cf9c2758ba6913f +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sun Jun 8 18:00:05 2008 +0930 + + Ensure cairo renders Type 3 glyphs with only the fill color + + poppler/CairoOutputDev.cc | 3 +++ + poppler/CairoOutputDev.h | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 99e2d95728f41c91ab59a01c62d82b19a7a2e083 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sun Jun 1 00:49:32 2008 +0930 + + glib: save/restore cairo state when rendering a page + + glib/poppler-page.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 6f40ee4af6b59f9d2c326adc8d2574e45f4d4d29 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 8 23:46:04 2008 +0200 + + Make sure we use Qt4 moc to generate moc files of the qt4 frontend + + configure.ac | 20 ++++++++++++++++++++ + qt4/demos/Makefile.am | 2 +- + qt4/src/Makefile.am | 2 +- + qt4/tests/Makefile.am | 2 +- + 4 files changed, 23 insertions(+), 3 deletions(-) + +commit 86aa8fc0708f7da4a907a8bdb1845e53d29892b7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jun 5 19:21:08 2008 +0200 + + Fix leak on ABWOutputDev.cc + + poppler/ABWOutputDev.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 979ef1cafa968d776a2b804ce555b11212212397 +Author: Koji Otani <sho@bbr.jp> +Date: Tue Jun 3 21:07:15 2008 +0200 + + Support for surrogates outside the BMP plane + + poppler/TextOutputDev.cc | 19 ++++++++++++++++++- + poppler/UTF8.h | 14 ++++++++++++++ + 2 files changed, 32 insertions(+), 1 deletion(-) + +commit 1614ab3036cf25c9b94967163996678d386ce0ac +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 1 16:32:55 2008 +0200 + + Do not limit CharCodeToUnicodeString to 8 characters + + poppler/Annot.cc | 10 +++++----- + poppler/CharCodeToUnicode.cc | 37 +++++++++++++++++++++---------------- + poppler/CharCodeToUnicode.h | 2 +- + poppler/Gfx.cc | 8 ++++---- + poppler/GfxFont.cc | 43 + ++++++++++++++++++++++++------------------- + poppler/GfxFont.h | 6 +++--- + poppler/PSOutputDev.cc | 4 ++-- + 7 files changed, 60 insertions(+), 50 deletions(-) + +commit bf95c6970dacaa62512de858cf60ff6cf0c1bf7c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 1 00:07:11 2008 +0200 + + [Qt] Fix leak when calling Poppler::Document::scanForFonts + + qt/poppler-document.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d21d7271fc74ab78cd157549138d0027cf179471 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 31 23:57:31 2008 +0200 + + Make sure file exists before printing it + + utils/HtmlOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0480a788c0f25af1bc09360b599debb37f831e10 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue May 27 23:20:32 2008 +0200 + + require gthread-2.0 + + cmake/modules/FindGTK.cmake | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +commit 2e40ef652eb9fca7fe947acb2adfecc96ad3c50e +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 26 22:13:38 2008 +0200 + + Do not shadow a paramer with a local variable name + + qt4/src/poppler-page.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 1fd856aa1fb48869111e5b86f263bfd94fa7af17 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 26 20:52:53 2008 +0200 + + Do not leak tSplash if transpGroupStack->blendingColorSpace is NULL + + poppler/SplashOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 492209ec8648342a3a5447611f3f1ce63b63e8e9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 26 20:51:06 2008 +0200 + + Move variables only used inside the loop inside the loop, fix delete + of uninitialized data due to my previous patch + + poppler/Page.cc | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +commit 79ab8cceb318f3bb5ebad431824e3ae593aea340 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 26 20:38:59 2008 +0200 + + Do not leak memory if data_out is NULL + + poppler/Page.cc | 35 ++++++++++++++++++----------------- + 1 file changed, 18 insertions(+), 17 deletions(-) + +commit f44c33344d4af31ee008826179bcd92db445f35a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun May 25 19:16:12 2008 +0200 + + [glib] Init glib threads in demo app as required by g_timer + + configure.ac | 4 ++-- + glib/demo/main.c | 4 ++++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 58d5b7b9ab9ac245481299c4765f3bd305580d2e +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 21 22:18:29 2008 +0200 + + [Qt4] Fix text() method + + I'm not sure this is the real and correct fix, but it works more + than previous code so it's and improvement + + qt4/src/poppler-page.cc | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +commit e3e4113c73128f49f99289b592446d4382b5d65c +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 12 15:39:43 2008 +0200 + + Add getters to some TextBlock members. + + Needed by some reader using poppler internals, bad you! + + poppler/TextOutputDev.h | 5 +++++ + 1 file changed, 5 insertions(+) + +commit ff699e64bd1de78915aad4ddb79d6f529aef2b87 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun May 11 23:44:50 2008 +0200 + + Check the OC we found exists before using it + + Fixes crash http://bugs.freedesktop.org/show_bug.cgi?id=15899 + + poppler/OptionalContent.cc | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) + +commit ac26ba5148b99a03a56e37ba201ad420b8619943 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri May 9 20:17:37 2008 +0200 + + Do not crash on unlock with wrong password + + qt/poppler-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 19ec5a531cb03a7bee1cfcc9c7d5c4390fbd069d +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu May 8 23:15:58 2008 +0200 + + Fix build with --enable-fixedpoint + + splash/Splash.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1cf5f0fda542efef575a123622637d81b9c42053 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 7 18:49:28 2008 +0200 + + [Qt] Fix Document::unlock + + qt/poppler-document.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit b5041924eb023cc095f2445935ff713cf65dacce +Author: Pino Toscano <pino@kde.org> +Date: Wed May 7 16:44:03 2008 +0200 + + do not delete the GooString owned by an Object + + poppler/Annot.cc | 4 ---- + 1 file changed, 4 deletions(-) + +commit 546a7b700862db00240de9fd50bdba1dd347765b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun May 4 15:26:26 2008 +0200 + + Fix leaks on error conditions + + poppler/Annot.cc | 6 ++++++ + poppler/ArthurOutputDev.cc | 1 + + poppler/JBIG2Stream.cc | 1 + + 3 files changed, 8 insertions(+) + +commit 914f1b1d814ab3d958aa0ca21ad73ef5aed20b89 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 3 18:21:28 2008 +0200 + + A widget annot does not always belong to a form, so check before + accessing the widget member + + poppler/Annot.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c907e41ab18dda10cd3c9789bd0e7fe71b6402a8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 30 00:42:34 2008 +0200 + + findSegment can return NULL check for it + + poppler/JBIG2Stream.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 8b7f29b577bca3295e99fea4a5cf4a6bb7ba2617 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 30 00:26:28 2008 +0200 + + new[] implies delete[] + + poppler/ABWOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 926c13825d5f7364286975db8ffa507b92f4b3ab +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 29 23:44:51 2008 +0200 + + add lost return when adding kees patch + + poppler/Object.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ba9283f6bc78e97006e52ef5de20c958ee9e1a37 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 29 23:42:00 2008 +0200 + + make the function static + + utils/pdftoppm.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 931a8272f556ba8a35342f0c5bf53bdb57ea7a31 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 29 23:41:31 2008 +0200 + + make the variable static + + utils/pdftoabw.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1887d2910d2006c7fc3ecc95db0150f1537e9d0a +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 29 23:35:17 2008 +0200 + + constify some static arrays + + poppler/CompactFontTables.h | 2 +- + poppler/Decrypt.cc | 8 ++++---- + poppler/Function.cc | 2 +- + poppler/GfxFont.cc | 6 +++--- + poppler/GfxState.cc | 4 ++-- + poppler/JBIG2Stream.cc | 10 +++++----- + poppler/JPXStream.cc | 4 ++-- + poppler/Lexer.cc | 2 +- + poppler/PSOutputDev.cc | 6 +++--- + poppler/PSTokenizer.cc | 2 +- + poppler/SplashOutputDev.cc | 2 +- + poppler/Stream-CCITT.h | 12 ++++++------ + poppler/Stream.cc | 10 +++++----- + poppler/UnicodeTypeTable.cc | 2 +- + 14 files changed, 36 insertions(+), 36 deletions(-) + +commit 51140e2d9490696d716f77d3225da0bfdfc212b4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 29 23:14:59 2008 +0200 + + more static markers + + poppler/Annot.cc | 2 +- + poppler/DCTStream.cc | 2 +- + poppler/Object.cc | 2 +- + poppler/SplashOutputDev.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 893703cb9eee879f728db329f7ee1fc19e7f980e +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 29 23:03:51 2008 +0200 + + add static + + poppler/XRef.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7333bc913111e56ee241b7ef2bf6e9fea68b7da2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 29 23:01:13 2008 +0200 + + add static + + poppler/JBIG2Stream.cc | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +commit 1ea36507f9c9f163b6772268046e7560d0c00dbc +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 29 22:47:19 2008 +0200 + + make findModifier static + + poppler/GlobalParams.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit be9961571dbfabb982e6f69abd3bbc98fa971864 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 29 21:48:09 2008 +0200 + + make variables not used outside static + + utils/pdftohtml.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b157064a85350da6ea9c4f46e965e45ebc59d227 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 29 21:43:23 2008 +0200 + + constify setPSPaperSize + + utils/pdftops.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ee57ead8a6f34fa8de044399e5912395e0f3a425 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 29 21:37:57 2008 +0200 + + constify argDesc arrays + + Gives me binaries 2KB smaller (in total) in release build + + utils/parseargs.c | 18 +++++++++--------- + utils/parseargs.h | 4 ++-- + utils/pdffonts.cc | 2 +- + utils/pdfimages.cc | 2 +- + utils/pdfinfo.cc | 2 +- + utils/pdftoabw.cc | 2 +- + utils/pdftohtml.cc | 2 +- + utils/pdftoppm.cc | 2 +- + utils/pdftops.cc | 2 +- + utils/pdftotext.cc | 2 +- + 10 files changed, 19 insertions(+), 19 deletions(-) + +commit 9f93d9eb464877e0d23dcf205295da9162f03253 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 29 20:45:01 2008 +0200 + + make psOpNames static + + Makes my release build 64 bytes smaller + + poppler/Function.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 29e3e779c68371b7c4aadcf68ee0712046f39c6d +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 26 23:47:01 2008 +0200 + + remember to call the base implementation here + + qt4/demos/optcontent.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit a188f3cd36775d78ace5b5d62c8ab7c059b3b2b1 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 26 23:42:09 2008 +0200 + + reset the current page to 0, when closing a document + + qt4/demos/viewer.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit 7eca6da6436ffc1c41cfed1a07be4dafa1172463 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 26 23:41:45 2008 +0200 + + no need to manually disconnect from the model, as it will be deleted + by the document anyway + + qt4/demos/optcontent.cpp | 1 - + 1 file changed, 1 deletion(-) + +commit 6cddda7f3c3b8ddb95e6aba1b234a27c4454c23d +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 26 22:41:59 2008 +0200 + + sync updateFont() with SplashOutputDev + + poppler/ArthurOutputDev.cc | 75 + ++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 59 insertions(+), 16 deletions(-) + +commit ddc7c1f8c24762bae615e7dec92e92a58c827478 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 26 18:12:51 2008 +0200 + + construct AnnotPolygon for Polygon and PolyLine annotations + + poppler/Annot.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit f9c7e8037b7165b6271ce7aea0d315053c4d66a5 +Merge: 59d33d8e f5fec4fd +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 26 18:09:59 2008 +0200 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit 59d33d8e99673f73ccf2ad9a62bd25fca51f0eb8 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 26 17:56:42 2008 +0200 + + use the base implementation to update all the states + + poppler/ArthurOutputDev.cc | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) + +commit 45d2a9529bf241554c59437118cb8c705554dc27 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 26 17:55:39 2008 +0200 + + Set the font antialiasing from the painter settings, instead of the + global settings. + + poppler/ArthurOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5faa72fd70e0d85268e807a8b870d80dda9189a9 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 26 17:53:28 2008 +0200 + + Get the font and painter matrices, and reenable the font drawing. + + poppler/ArthurOutputDev.cc | 28 +++++++++++++++++++++------- + 1 file changed, 21 insertions(+), 7 deletions(-) + +commit f5fec4fdedd8d316b19968545e447e2036a1bb47 +Author: Kees Cook <kees@outflux.net> +Date: Wed Apr 23 19:53:03 2008 +0200 + + provide type-checking for union pointer accesses + + poppler/Object.h | 68 + +++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 43 insertions(+), 25 deletions(-) + +commit a567c921ce538616f4ba0b7933086ef5a8ab0f55 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Tue Apr 22 23:09:10 2008 +0200 + + Little change to avoid AnnotWidget crashing when they aren't related + to FormWidgets. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit 73798c95b8a4c0504e9246e6f73fd31f812ad6fa +Author: Albert Astals Cid <tsdgeos@bluebox.(none)> +Date: Mon Apr 21 19:56:52 2008 +0200 + + Link to pthread when needed + + Should fix bug 15625 + + configure.ac | 2 + + m4/acx_pthread.m4 | 280 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Makefile.am | 4 + + 3 files changed, 286 insertions(+) + +commit 6c248bdad77235a45402d9693a0b822cc208b6b9 +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 20 18:32:59 2008 +0200 + + the dtor should be virtual + + qt4/src/poppler-converter-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 68dba1a452ca70add5b05ab8e2adab838bc2cb73 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Apr 20 16:21:10 2008 +0200 + + if ncand is a Guint cand should be one too + + poppler/CMap.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0b91eb19f5a3d07b625ee5188f1fcb4b4b1544ea +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Apr 20 16:17:50 2008 +0200 + + Unused var-- + + poppler/GfxFont.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1ed3cc40987b691319fd9f1a30296d80de5732fd +Author: Pino Toscano <pino@kde.org> +Date: Wed Apr 16 15:45:45 2008 +0200 + + fix border style conversion + + qt4/src/poppler-page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7c8feb4e3627bde2052a7e536d2d49d1cbbce8ee +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 15 21:57:31 2008 +0200 + + Hack to "support" 16 bits images + + Everywhere we assume a component fits in 8 bits, with this hack + we treat 16 bit images as 8 bit ones until it's fixed correctly. + Fixes http://bugs.kde.org/show_bug.cgi?id=158165 + + poppler/GfxState.cc | 6 ++++++ + poppler/Stream.cc | 9 +++++++++ + 2 files changed, 15 insertions(+) + +commit f338a9ded5d42dd65853c5c7bbe27f6724096416 +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 13 21:41:51 2008 +0200 + + [Qt4] convert the sound annotations + + qt4/src/poppler-page.cc | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +commit 733d51fca04ee682fed2242f868edd545f3755fa +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 13 21:38:25 2008 +0200 + + [Qt4] First version of a SoundAnnotation. + + qt4/src/poppler-annotation.cc | 87 + +++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-annotation.h | 30 ++++++++++++++- + 2 files changed, 116 insertions(+), 1 deletion(-) + +commit feb1ea091111bd7292879c465590acfd7671c876 +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 13 21:36:26 2008 +0200 + + First version of AnnotSound. + + poppler/Annot.cc | 37 ++++++++++++++++++++++++++++++++++++- + poppler/Annot.h | 26 ++++++++++++++++++++++++++ + 2 files changed, 62 insertions(+), 1 deletion(-) + +commit ec2cf81edf1b2c6707de4d30316ff5f5e24534d4 +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 13 18:31:21 2008 +0200 + + [Qt4] convert the file attachment annotations + + qt4/src/poppler-page.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +commit 9fa2e96c96d365ae67859545ebd635d726784fca +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 13 18:29:00 2008 +0200 + + [Qt4] Initial version of FileAttachmentAnnotation + + qt4/src/poppler-annotation.cc | 88 + +++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-annotation.h | 29 +++++++++++++- + 2 files changed, 116 insertions(+), 1 deletion(-) + +commit 5899aff11f94e707654574e830e0757b1df558d4 +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 13 10:50:39 2008 +0200 + + [Qt4] Read the annotations from the core, instead of own parsing. + + Almost all the data are converted correctly, the results seem to be + the same. + Added TODOs in the few parts (not essential) I was not able to figure + out how to convert, yet. + Covert also the Caret annotations. + + qt4/src/poppler-annotation-helper.h | 2 +- + qt4/src/poppler-page.cc | 851 + +++++++++++++++++------------------- + 2 files changed, 393 insertions(+), 460 deletions(-) + +commit 40a12793c5ccea206d79e0c17e2f2d0cf74bb4f3 +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 13 02:21:55 2008 +0200 + + add getters for the AnnotPolygon properties + + poppler/Annot.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 9311f75d4c3da991efb8afd00701a0ce1cbae1b0 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sun Apr 13 01:52:36 2008 +0200 + + Almost full AnnotPolygon support. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 99 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 37 +++++++++++++++++++++ + 2 files changed, 136 insertions(+) + +commit 01aa052ed761a4ada471d196985825986bb58627 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sun Apr 13 01:13:49 2008 +0200 + + Extend AnnotPath behaviour to include cooordinate array parsing. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 96 + ++++++++++++++++++++++++++++++-------------------------- + poppler/Annot.h | 4 ++- + 2 files changed, 55 insertions(+), 45 deletions(-) + +commit ca52830e9519ae7b778f98e5c2547daef7da5f09 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sun Apr 13 00:54:13 2008 +0200 + + Added OptionalContent support to Annots. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 9 +++------ + poppler/Annot.h | 5 +++-- + 2 files changed, 6 insertions(+), 8 deletions(-) + +commit 4b87196b7829c87d15af4e8b4138ca97548fb519 +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 13 00:18:24 2008 +0200 + + Isolate the embedded file reading logic into a new EmbFile + constructor. + + This way, it can be shared and reused in various places (Catalog, + AnnotFileAttachment, etc). + + poppler/Catalog.cc | 205 + +++++++++++++++++++++++++++++------------------------ + poppler/Catalog.h | 1 + + 2 files changed, 112 insertions(+), 94 deletions(-) + +commit 45b407e51905948690065749085a4af1cbb29a8e +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 13 00:14:38 2008 +0200 + + correctly get the FileSpec dictionary + + poppler/Annot.cc | 4 +++- + poppler/Annot.h | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) + +commit c3aa3a97d9c553ea7976741d798901352fb5381c +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 12 22:45:57 2008 +0200 + + properly initialize an AnnotPath + + poppler/Annot.cc | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit a3406fb2ace1390db1c181823a7bfc66c9174d98 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 12 22:40:42 2008 +0200 + + properly dispose the memory of the ink lists + + poppler/Annot.cc | 13 ++++++++++++- + poppler/Annot.h | 1 + + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 0dad70e2d12e8b587cab8ce2d914c81c6897a1d1 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 12 22:15:35 2008 +0200 + + make AnnotInk working. + + - get the point indexes in the correct way + - dispose with free what you allocate with malloc + - fix logic when checking for an even number of points + + poppler/Annot.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 77404e24ea1e175fc9b55097dc5b35cc34760659 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 12 21:08:54 2008 +0200 + + a length is an int + + poppler/Annot.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bc2b2ffd2144f951c311e968fba4bc50b7c43ff3 +Merge: cd5afe6d bacc1dd9 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sat Apr 12 17:40:49 2008 +0200 + + Fixed merging conflict. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + +commit cd5afe6d9eca687ee224ff7680a8cba28d81a36d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 12 00:44:08 2008 +0200 + + Do not take into account Colorspace resource subdictionary for + image XObjects + + Fixes bug 15125 + The motivation under that change is on section 4.5.2 of the spec: + Certain objects, such as image XObjects, specify a + color space as an explicit parameter, often associated with the + key ColorSpace. + In this case, the color space array or name is always defined + directly as a PDF + object, not by an entry in the ColorSpace resource + subdictionary. This conven- + tion also applies when color spaces are defined in terms of other + color spaces. + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bacc1dd9f37ff19c5e54878a5b08e7d734584bbf +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 12 17:20:09 2008 +0200 + + Read the "in reply to" reference as such, without reading the + associated annotation dictionary. + + poppler/Annot.cc | 10 ++++------ + poppler/Annot.h | 4 ++-- + 2 files changed, 6 insertions(+), 8 deletions(-) + +commit ffe09454a0948a6107bcc38f23ba2068151c547d +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sat Apr 12 17:17:59 2008 +0200 + + Initial Annot3D parsing a few general improvements. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 130 + +++++++++++++++++++++++++++++++++++++++++++++++++++---- + poppler/Annot.h | 84 +++++++++++++++++++++++++++++------ + 2 files changed, 193 insertions(+), 21 deletions(-) + +commit 8757c577241dda31bc59c7d1c208c159ad428877 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sat Apr 12 10:38:07 2008 +0200 + + AnnotFileAttachment support. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 38 ++++++++++++++++++++++++++++++++++++-- + poppler/Annot.h | 25 +++++++++++++++++++++++++ + 2 files changed, 61 insertions(+), 2 deletions(-) + +commit 36989658149fc9e5e8a049ce070a102f35b7bddc +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sat Apr 12 09:55:26 2008 +0200 + + AnnotInk support. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 113 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 45 ++++++++++++++++++++++ + 2 files changed, 158 insertions(+) + +commit 464b171d0e9b989196c287f2ee4dfbbc14212aa9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 12 00:44:08 2008 +0200 + + Do not take into account Colorspace resource subdictionary for + image XObjects + + Fixes bug 15125 + The motivation under that change is on section 4.5.2 of the spec: + Certain objects, such as image XObjects, specify a + color space as an explicit parameter, often associated with the + key ColorSpace. + In this case, the color space array or name is always defined + directly as a PDF + object, not by an entry in the ColorSpace resource + subdictionary. This conven- + tion also applies when color spaces are defined in terms of other + color spaces. + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 42db4890e8295aaec5a1be12d1414fc0a9048550 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu Mar 27 10:52:22 2008 +0000 + + Do not call FT_Done_Face on a live cairo_font_face_t. + + Currently CairoFont calls FT_Done_Face on its deletion, but the + FT_Face + is usually still in use within cairo. This causes a failure later when + cairo tries to create a glyph from its cairo_font_face_t. + + From http://bugs.freedesktop.org/show_bug.cgi?id=15216: + ==13745== Invalid read of size 4 + ==13745== at 0x51BE572: FT_Load_Glyph (ftobjs.c:549) + ==13745== by 0x4A24921: _cairo_ft_scaled_glyph_init + (cairo-ft-font.c:1922) + ==13745== by 0x4A117AB: _cairo_scaled_glyph_lookup + (cairo-scaled-font.c:1674) + ==13745== by 0x4A12A5A: _cairo_scaled_font_glyph_device_extents + (cairo-scaled-font.c:1124) + ==13745== by 0x4A21ECD: _cairo_analysis_surface_show_glyphs + (cairo-analysis-surface.c:516) + ==13745== by 0x4A144DC: _cairo_surface_show_glyphs + (cairo-surface.c:2086) + ==13745== by 0x4A1FCC8: _cairo_meta_surface_replay_internal + (cairo-meta-surface.c:816) + ==13745== by 0x4A214B1: _paint_page (cairo-paginated-surface.c:299) + ==13745== by 0x4A2171E: _cairo_paginated_surface_show_page + (cairo-paginated-surface.c:445) + ==13745== by 0x4A14BDF: cairo_surface_show_page + (cairo-surface.c:1702) + ==13745== by 0x49FF661: cairo_show_page (cairo.c:2155) + ==13745== by 0xA267D97: + pdf_document_file_exporter_end_page(_EvFileExporter*) + (ev-poppler.cc:1753) + ==13745== Address 0x55c5630 is 88 bytes inside a block of size + 552 free'd + ==13745== at 0x402269C: free (vg_replace_malloc.c:326) + ==13745== by 0x51B7ABC: ft_free (ftsystem.c:158) + ==13745== by 0x51BB319: ft_mem_free (ftutil.c:171) + ==13745== by 0x51BC318: destroy_face (ftobjs.c:856) + ==13745== by 0x51BC3B2: FT_Done_Face (ftobjs.c:1972) + ==13745== by 0x4363704: CairoFont::~CairoFont() + (CairoFontEngine.cc:251) + ==13745== by 0x436401D: CairoFontEngine::getFont(GfxFont*, XRef*) + (CairoFontEngine.cc:335) + ==13745== by 0x4366915: CairoOutputDev::updateFont(GfxState*) + (CairoOutputDev.cc:318) + ==13745== by 0x5093BF1: Gfx::opShowText(Object*, int) (Gfx.cc:3073) + ==13745== by 0x508F901: Gfx::execOp(Object*, Object*, int) + (Gfx.cc:726) + ==13745== by 0x50906FF: Gfx::go(int) (Gfx.cc:594) + ==13745== by 0x5090C96: Gfx::display(Object*, int) (Gfx.cc:557) + + The solution is to release the reference to the cairo_font_face_t upon + destruction of the CairoFont, and then to release the FT_Face from the + destroy notify of the cairo_font_face_t. + + poppler/CairoFontEngine.cc | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +commit 5f60843824582ece36d806508ec388330ddee854 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Tue Apr 8 00:30:57 2008 +0200 + + Added AnnotCoord support. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 64 + ++++++++++++++++++---------------------------------- + poppler/Annot.h | 69 + ++++++++++++++++++++++++++------------------------------ + 2 files changed, 54 insertions(+), 79 deletions(-) + +commit a6f70f465a3e6719d63cefbe3c27bae015be43c1 +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 6 13:12:01 2008 +0200 + + add getters for the coordinates in an AnnotLine + + poppler/Annot.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 1d83d6edf9a843335e37a4d1e0e0dd71eb23d93b +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 6 12:24:42 2008 +0200 + + [Qt4] the caret symbol is an enum value, now + + qt4/src/poppler-annotation.cc | 35 ++++++++++++++++++++++++++++------- + qt4/src/poppler-annotation.h | 7 +++++-- + 2 files changed, 33 insertions(+), 9 deletions(-) + +commit 229d991a3258cb9b56f5e00f2deb3c976253cf68 +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 6 12:23:04 2008 +0200 + + the caret symbol does not seem to allow additional values, so convert + it to an enum + + poppler/Annot.cc | 11 +++++++---- + poppler/Annot.h | 9 +++++++-- + 2 files changed, 14 insertions(+), 6 deletions(-) + +commit fc24500ddd9182f97d23c46eaafc6be79a6721eb +Author: Pino Toscano <pino@kde.org> +Date: Sun Apr 6 11:43:49 2008 +0200 + + propetly initialise a couple of members; leak less + + poppler/ArthurOutputDev.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 9409de1e7c5b3770c7ef00c01ee376953dd532a5 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sun Apr 6 01:38:25 2008 +0200 + + Changed AnnotFreeText RD field to the new parseDiffRectangle. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 35 ++--------------------------------- + 1 file changed, 2 insertions(+), 33 deletions(-) + +commit 28c5ee2e9fc2a24d2f2efb3d74d5cf882a106239 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 5 23:19:33 2008 +0200 + + typo fix + + poppler/Annot.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ed02769688466ca72bf35d4223c3822a1245604b +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 5 19:36:21 2008 +0200 + + read the destination of a link annotation + + poppler/Annot.cc | 5 ++++- + poppler/Annot.h | 4 ++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit ca31bf12a9d70bac88e457f7799e9935aba58640 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 5 16:48:53 2008 +0200 + + variable forgotten in the copy&paste... + + qt4/src/poppler-annotation.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 4168daa141b76e5fcd07d046aca8dac2f3037ff9 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 5 16:34:12 2008 +0200 + + [Qt4] deserialize also CaretAnnotation's + + qt4/src/poppler-annotation.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit b55bcc2aa95825863bef23ab96364b350a49949d +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 5 16:31:31 2008 +0200 + + [Qt4] first version of a CaretAnnotation. + + qt4/src/poppler-annotation.cc | 80 + +++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-annotation.h | 25 +++++++++++++- + 2 files changed, 104 insertions(+), 1 deletion(-) + +commit 4c9a02b7e49666efe10fdc16e7a03d8d520b65ec +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 5 16:01:58 2008 +0200 + + First version of AnnotCaret. + + poppler/Annot.cc | 36 +++++++++++++++++++++++++++++++++++- + poppler/Annot.h | 22 ++++++++++++++++++++++ + 2 files changed, 57 insertions(+), 1 deletion(-) + +commit d260fe9e514c667b66969b982119429cc922eb07 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 5 15:54:29 2008 +0200 + + isolate the code for parsing a "difference rectangle" in an own + function + + poppler/Annot.cc | 54 + +++++++++++++++++++++++++++++++----------------------- + 1 file changed, 31 insertions(+), 23 deletions(-) + +commit 760833e409c122c0a61f7c87fd3133eebc10b402 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 5 15:36:43 2008 +0200 + + First version of AnnotGeometry. + + poppler/Annot.cc | 77 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + poppler/Annot.h | 24 ++++++++++++++++++ + 2 files changed, 99 insertions(+), 2 deletions(-) + +commit 95d9d2362534c0524ad0448818b2d69b0909d482 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 5 03:23:00 2008 +0200 + + finally, load the QuadPoints correctly + + when checking the validity of the coordinate, do the comparison just + with the proper one (either X or Y); + free the "point" object after each iteration + + poppler/Annot.cc | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +commit af1ffcbcec1730332d11f8da4a7ddac833b22408 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 5 02:54:00 2008 +0200 + + More robust reading of QuadPoints (reset the allocated memory, + use the heap) + + poppler/Annot.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 68fd98d69bac20282665cf6b824da30c3b310f0b +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 5 02:51:41 2008 +0200 + + Really implement AnnotTextMarkup. + + poppler/Annot.cc | 29 +++++++++++++++++++++++++---- + poppler/Annot.h | 2 +- + 2 files changed, 26 insertions(+), 5 deletions(-) + +commit 69a2ecfaf8f8cffd3027db5c3cc88c41413e42f1 +Author: Pino Toscano <pino@kde.org> +Date: Sat Apr 5 01:38:28 2008 +0200 + + Add the Stamp annotation type. + + poppler/Annot.cc | 28 +++++++++++++++++++++++++++- + poppler/Annot.h | 20 ++++++++++++++++++++ + 2 files changed, 47 insertions(+), 1 deletion(-) + +commit 97be4332818bcf58461816be995d88926809a4e5 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Fri Apr 4 23:49:12 2008 +0200 + + Updated glib bindings. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + glib/demo/annots.c | 32 +++++--------------------------- + glib/poppler-annot.cc | 27 +++++---------------------- + glib/poppler-annot.h | 13 +------------ + 3 files changed, 11 insertions(+), 61 deletions(-) + +commit 5caac407cdaf58621ac27e5561b31a995404ccb3 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Fri Apr 4 23:36:46 2008 +0200 + + Fixed icon name in AnnotText. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 25 ++++++------------------- + poppler/Annot.h | 15 +++------------ + 2 files changed, 9 insertions(+), 31 deletions(-) + +commit 0b714a61383da1b62daf2a60e3f6fcda09b4e9f2 +Author: Adam Batkin <adam@batkin.net> +Date: Thu Apr 3 20:02:52 2008 +0200 + + FindFirstFile returns INVALID_HANDLE_VALUE and not NULL on error + + goo/gfile.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit be765f27cc5430d9bb2a3e113eb245d67c20a376 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Mar 31 12:37:33 2008 +0200 + + [glib] Fix a crash in outline demo due to page_num == dest_page_num + - 1 + + glib/demo/utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e991e9ac6fcc0b6928b96fe8326eebcf3cb720ca +Author: Albert Astals Cid <tsdgeos@localhost.(none)> +Date: Sat Mar 29 13:25:52 2008 +0100 + + Add the export macro + + qt4/src/poppler-page-transition.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit b70ca35dce6da6efdff254c11a63de4f44228278 +Author: Albert Astals Cid <tsdgeos@localhost.(none)> +Date: Sat Mar 29 00:30:31 2008 +0100 + + Duplicate page-transition files on qt4 + + qt4/src/CMakeLists.txt | 4 +- + qt4/src/Makefile.am | 4 +- + qt4/src/poppler-page-transition-private.h | 28 ++++++ + qt4/src/poppler-page-transition.cc | 95 +++++++++++++++++++ + qt4/src/poppler-page-transition.h | 146 + ++++++++++++++++++++++++++++++ + 5 files changed, 273 insertions(+), 4 deletions(-) + +commit b5312785063235cef7584ab6a5d198fb72de0988 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Wed Mar 26 23:56:49 2008 +0100 + + Improved glib annot demo. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + glib/demo/annots.c | 314 + ++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 289 insertions(+), 25 deletions(-) + +commit 7cc8fd70f68d2cdab7ab83a0ecf6c8896c971d62 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 26 21:03:34 2008 +0100 + + remove damn error + + qt4/src/poppler-page.cc.orig | 1317 + ------------------------------------------ + 1 file changed, 1317 deletions(-) + +commit 7a47ff3b54678a3de6964d25050e02186484f39a +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 26 21:00:32 2008 +0100 + + [Qt4] Add support for JavaScript links, and create them when present. + + qt4/src/poppler-link.cc | 36 ++ + qt4/src/poppler-link.h | 32 +- + qt4/src/poppler-page.cc | 7 + + qt4/src/poppler-page.cc.orig | 1317 + ++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 1391 insertions(+), 1 deletion(-) + +commit a6f2c10ee01ee62ae945b50f6b6eae380377fe03 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 26 20:59:21 2008 +0100 + + [Qt4] Read the document-level JavaScript scripts. + + qt4/src/poppler-document.cc | 15 +++++++++++++++ + qt4/src/poppler-qt4.h | 8 ++++++++ + 2 files changed, 23 insertions(+) + +commit b8a471e55b998836c09c65ff736afdef8ac55189 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 26 20:56:01 2008 +0100 + + Add support for JavaScript actions, and read them when found. + + poppler/Link.cc | 33 +++++++++++++++++++++++++++++++++ + poppler/Link.h | 23 +++++++++++++++++++++++ + 2 files changed, 56 insertions(+) + +commit 2fd85dc1b8b2ababadfc60e285c08a844737e4bb +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 26 20:53:42 2008 +0100 + + Read the JavaScript codes in the NameTree of the Catalog. + + poppler/Catalog.cc | 39 +++++++++++++++++++++++++++++++++++++++ + poppler/Catalog.h | 7 +++++++ + 2 files changed, 46 insertions(+) + +commit 312f14f5b7be1f0d62620477222919423c3869e0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 26 20:05:31 2008 +0100 + + compile++ + + fofi/FoFiBase.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5bd750062e1fb136f77a55d1f35b2d6fabaad1b3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 26 19:42:43 2008 +0100 + + update version + + CMakeLists.txt | 2 +- + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +commit 10d4a8b9aed51902157c04d9deea0e99d829c4f6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 26 19:42:36 2008 +0100 + + fill news + + NEWS | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 2069826d61ebd527768b6455689276c0a8288085 +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 26 16:05:06 2008 +0100 + + missing break + + qt4/src/poppler-page.cc | 1 + + 1 file changed, 1 insertion(+) + +commit d6a0c6a6803a03f402c2dcde41c6195e951470ba +Author: Pino Toscano <pino@kde.org> +Date: Wed Mar 26 15:50:39 2008 +0100 + + initialize posterStream to avoid crashing later + + poppler/Movie.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 0be811b3ad86b1cb14be94a017e70c65b8e64730 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 25 22:59:22 2008 +0100 + + Don't end up in an infinite recursive loop in case resObj dict is + the same we are already in + + poppler/FontInfo.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0222c6ceb0fcf1d7c4422691a68a035a558ad614 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Mar 24 17:14:07 2008 +0100 + + fix build when using cmake, not sure it's completely ok, but at + least i can compile + + CMakeLists.txt | 1 + + cmake/modules/FindGTK.cmake | 23 ++++++++++++++++------- + config.h.cmake | 3 +++ + glib/CMakeLists.txt | 17 +++++++++++------ + glib/poppler-page.cc | 2 +- + glib/test-poppler-glib.cc | 2 +- + 6 files changed, 33 insertions(+), 15 deletions(-) + +commit 3e4164f2db69358adf07596195842dd00458b621 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Mar 24 15:10:31 2008 +0100 + + fix some cmake HAVE_foo + + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 22f615aee488cc363a078330861e80f389f47061 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sun Mar 23 13:22:07 2008 +0100 + + Fixed wrong functions. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + glib/poppler-annot.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit cccfe42ed9c53d27cf6a1403ae55bf34a053012d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 22 19:12:05 2008 +0100 + + Fix rm line not to error when no *moc file is present + + qt4/src/Makefile.am | 2 +- + qt4/tests/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit e60d39ba0e8b9742106a0c9b1385b1c907729c3f +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 22 19:11:17 2008 +0100 + + Fix rm line not to error if no *moc file is present + + qt4/demos/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit d9d52e622c6b28a9941168bb73839ec335ca7232 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 22 19:10:40 2008 +0100 + + Fix configure to not require gdk when we are on try mode + + configure.ac | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 9b8809298dd16cdbffcc12b6db8e274578934063 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 22 15:49:02 2008 +0100 + + It's really only an error if < 0 + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0fb1e697cc4100ce23298141c8b5829273872423 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 22 15:46:44 2008 +0100 + + remove unneeded variable + + poppler/PDFDoc.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 3404cb626ee9b4520d6fe601e07560745a4cb42a +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 22 15:44:50 2008 +0100 + + Remove OutStream::reset since noone uses it + + This way we have a fseek less to care about if worked or not + + poppler/Stream.cc | 5 ----- + poppler/Stream.h | 5 ----- + qt4/src/poppler-qiodeviceoutstream-private.h | 1 - + qt4/src/poppler-qiodeviceoutstream.cc | 5 ----- + 4 files changed, 16 deletions(-) + +commit 066595dd06c930997d5ec65a06c822616af9baa0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 22 15:43:07 2008 +0100 + + Check the document stream is seekable when opening it + + Fixes bug 14126 + + poppler/PDFDoc.cc | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 23b6475463f8973b5ac83bb21a6b7b6000cc435b +Author: Ed Avis <eda@waniasset.com> +Date: Sat Mar 22 13:55:59 2008 +0100 + + Check for fseek return values + + fofi/FoFiBase.cc | 14 ++++++++++++-- + poppler/GfxFont.cc | 12 ++++++++++-- + 2 files changed, 22 insertions(+), 4 deletions(-) + +commit b33bb282e45cf1a083cfbb13603ac465d386c28d +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Fri Mar 21 13:53:21 2008 +0100 + + Fixed poppler glib public api. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + glib/poppler-annot.cc | 4 ++-- + glib/poppler-annot.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 371932f413d570d7784c668f30834d3d92d7aa80 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Mar 20 11:44:32 2008 +0100 + + [glib] Remove unused variable. + + glib/poppler-document.cc | 1 - + 1 file changed, 1 deletion(-) + +commit 21fa476ac384256c15a954b708e009f2b336b06f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Mar 20 11:42:32 2008 +0100 + + [glib] Do not cache image_dev in poppler page. + + Thanks to Kouhei Sutou who caught the problem. + + glib/poppler-page.cc | 60 + +++++++++++++++++++++++++++-------------------- + glib/poppler-private.h | 3 --- + glib/test-poppler-glib.cc | 9 ++++++- + 3 files changed, 43 insertions(+), 29 deletions(-) + +commit 22cd70d8fc308fb8b19d36d0172014ba532230fb +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 19 21:52:14 2008 +0100 + + poppler_annot_markup_get_opacity returns a double so use %f + + glib/demo/annots.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b9a5fd4671638caa91f8a389be278d993391f499 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 19 21:28:49 2008 +0100 + + updated by gtk-doc + + glib/reference/tmpl/poppler-action.sgml | 1 + + glib/reference/tmpl/poppler.sgml | 3 +++ + 2 files changed, 4 insertions(+) + +commit b7e0b740578ea1e84ac0ef850b5a03c66b2863e3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 19 21:28:01 2008 +0100 + + Fill 0.7.3 news + + NEWS | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 3adaff1dad8127fdd06653cf49196027ad414a08 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 19 21:27:46 2008 +0100 + + Bump version to 0.7.3 + + CMakeLists.txt | 2 +- + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +commit 52dd710b63911be2d8c960de0232c497c35ecac8 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Mar 19 18:35:35 2008 +0100 + + [glib] Update outline and links demos to the new POPPLER_ACTION_NONE + + glib/demo/utils.c | 3 +++ + 1 file changed, 3 insertions(+) + +commit 6a22f0a20df38156c06e8ba10649e0828a1da102 +Author: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> +Date: Wed Mar 19 18:32:48 2008 +0100 + + [glib] Consider no action as an action of type None instead of Unknown + + glib/poppler-action.cc | 2 +- + glib/poppler-action.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 185d5818fd546f85934b041d5b0cdcdf1849b1dc +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Mar 18 20:08:21 2008 +0100 + + Improve error handling when creating a document + + glib/poppler-document.cc | 40 ++++++++++++++++++++++++++++------------ + glib/poppler.h | 5 ++++- + 2 files changed, 32 insertions(+), 13 deletions(-) + +commit 9bba2748985049515bfd9c9b44f26b92fa704078 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Mar 15 01:11:39 2008 +0100 + + Some more free + + poppler/OptionalContent.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +commit bfc308935fa138e27c4d2ad0e1c1cad20eba8e8a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Mar 15 01:05:32 2008 +0100 + + Use error instead of printf + + poppler/OptionalContent.cc | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +commit 998b1523ee653c1585f03b4a580e0d95ba694aca +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Mar 15 01:02:31 2008 +0100 + + Some free + + poppler/OptionalContent.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit c65a66a82259f547927cbb918611bcf4a8e264b2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Mar 14 20:29:53 2008 +0100 + + xx0 is non exclusive so that should be < not <= + + Fixes several warnings about writes on bad places + + splash/SplashXPathScanner.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit bd2272f3079319d1c05ca93f7fb6eb0a5370b938 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Mar 14 19:52:04 2008 +0100 + + Fix "Make sure we don't draw outside the bitmap on Splash::fillGlyph2" + when painting with no aa + + Fixes bug 15009 + + splash/Splash.cc | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 5bf8d864e68854f0855e07fb67aa124e06c739cd +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 12 22:48:07 2008 +0100 + + fix build + + glib/reference/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit d0be5c86dcd3310062d820b3515c31e4720af2ca +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 12 22:40:59 2008 +0100 + + Update version to 0.7.2 and fill NEWS + + CMakeLists.txt | 2 +- + NEWS | 20 ++++++++++++++++++++ + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 5 files changed, 26 insertions(+), 6 deletions(-) + +commit 0b2ecf39572821a99374e6acec7c1bd438911bbc +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 12 22:38:57 2008 +0100 + + update soname here too + + glib/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f5065016b168e4896e2fe774cd22bbd900849b52 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Mar 12 22:06:53 2008 +0100 + + Make GDK dependency option for glib bindings + + Fixes bug #13719. + + configure.ac | 45 ++- + glib/Makefile.am | 7 +- + glib/demo/page.c | 88 +++++- + glib/demo/render.c | 4 + + glib/poppler-action.h | 1 - + glib/poppler-annot.cc | 26 +- + glib/poppler-annot.h | 2 +- + glib/poppler-document.h | 2 - + glib/poppler-features.h.in | 1 + + glib/poppler-page.cc | 695 + ++++++++++++++++++++++++++------------------- + glib/poppler-page.h | 76 +++-- + glib/poppler.h | 2 +- + glib/test-poppler-glib.cc | 2 +- + 13 files changed, 610 insertions(+), 341 deletions(-) + +commit 46d4fab82332e71d0b68c0a8deeac78f2201ed14 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 12 20:35:33 2008 +0100 + + Increment version of libpoppler and libpoppler-qt4 + + CMakeLists.txt | 2 +- + poppler/Makefile.am | 2 +- + qt4/src/CMakeLists.txt | 2 +- + qt4/src/Makefile.am | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 550c1fc73a6d2af65728751fd0b59ccc7110fa8b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 12 20:34:48 2008 +0100 + + Init to false updated field of XRefEntries plus indenting fixes + + poppler/XRef.cc | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +commit 6a671686c6265ecdb4c48f04392de9c56d4e0936 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Wed Mar 12 21:43:12 2008 +1030 + + Fix regression in cairo output when transforming ctm + + The commit: + ec01926e5a9dc16e200060497c43e79a1623698d "Avoid setting a singular + ctm" + introduced a regression in the output when using a ctm. + + The check for an invertable matrix had the side effect of inverting + the matrix. Instead, make a copy of the matrix before testing if it is + invertable. + + poppler/CairoOutputDev.cc | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 0b2c3bb25c908b07e760d824dbfe93c6051812aa +Merge: 362fe013 9c472f76 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Wed Mar 12 00:23:58 2008 +0100 + + Merge branch 'master' of + ssh://inigomartinez@git.freedesktop.org/git/poppler/poppler + +commit 362fe013c0d96698b52d70cf5226cddca7fe52d4 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Wed Mar 12 00:07:12 2008 +0100 + + Enabled back the AnnotWidget support. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9c472f76d2462d0e775c851fdbac6ca2bc9812ea +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 12 00:00:20 2008 +0100 + + cmake build + + glib/demo/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 821858f5c36786955d9475044bfee57f5060ad2f +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 11 23:58:05 2008 +0100 + + Return char bounding box instead of edge, it's much more useful for + character positioning + + qt4/src/poppler-page.cc | 8 ++++++-- + qt4/src/poppler-private.h | 3 +-- + qt4/src/poppler-qt4.h | 6 ++---- + qt4/src/poppler-textbox.cc | 4 ++-- + 4 files changed, 11 insertions(+), 10 deletions(-) + +commit d7e642732ced592362d9787bddadb7a110dcc5a5 +Merge: 3642f0c4 2d6c6053 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Tue Mar 11 23:41:59 2008 +0100 + + Merge branch 'master' of + ssh://inigomartinez@git.freedesktop.org/git/poppler/poppler + +commit 3642f0c48bc49cd4d698e769544c1d8604c6482f +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Tue Mar 11 23:13:33 2008 +0100 + + glib annots demo. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + glib/demo/Makefile.am | 2 + + glib/demo/annots.c | 468 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/demo/annots.h | 31 ++++ + glib/demo/main.c | 4 +- + 4 files changed, 504 insertions(+), 1 deletion(-) + +commit 2d6c60537317bd3ac9e0582e0da09e7365729097 +Author: Pino Toscano <pino@kde.org> +Date: Tue Mar 11 22:54:44 2008 +0100 + + For now we cannot handle MovieLink's, so comment them out. + + qt4/src/poppler-annotation.cc | 2 ++ + qt4/src/poppler-link.cc | 4 ++++ + qt4/src/poppler-link.h | 2 ++ + 3 files changed, 8 insertions(+) + +commit a354f7198c493990613a1db131c662ec27948863 +Author: Hugo Mercier <hmercier31@gmail.com> +Date: Tue Mar 11 22:49:00 2008 +0100 + + Initial Movie support (2) + + Now with the forgotten files + + poppler/Movie.cc | 443 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Movie.h | 177 ++++++++++++++++++++++ + 2 files changed, 620 insertions(+) + +commit 43e5dd941d4bc35c4eebbad66c13235639e0c1a0 +Merge: aab17684 4fdd2543 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 11 22:31:22 2008 +0100 + + Merge branch 'master' of + ssh://aacid@git.freedesktop.org/git/poppler/poppler + +commit 4fdd254370ea6055e95c8ebee51b69e06c501714 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Mar 11 22:31:00 2008 +0100 + + Fix build + + glib/poppler-page.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit aab17684dc3f21ff2b1ee6eacdc0c565d368df78 +Author: Hugo Mercier <hmercier31@gmail.com> +Date: Tue Mar 11 22:28:28 2008 +0100 + + Initial Movie support + + CMakeLists.txt | 2 + + poppler/Annot.cc | 316 + +++++++++++++++++++++++++++++++++++++++++++++++++++- + poppler/Annot.h | 125 +++++++++++++++++++++ + poppler/Link.cc | 108 +++++++++++++++--- + poppler/Link.h | 64 ++++++++++- + poppler/Makefile.am | 2 + + 6 files changed, 591 insertions(+), 26 deletions(-) + +commit 13a0d2390b9e4684af070c213f385485715353df +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 11 22:27:38 2008 +0100 + + Add poppler-annot to the cmake build system + + glib/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +commit 19f0e3b40bce4d8157d8c8bd04eaf6bacbef38b8 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Tue Mar 11 22:09:04 2008 +0100 + + Add preliminary annotations support in the glib frontend + + glib/Makefile.am | 2 + + glib/poppler-annot.cc | 776 + +++++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-annot.h | 181 ++++++++++++ + glib/poppler-page.cc | 166 +++++++++++ + glib/poppler-page.h | 15 + + glib/poppler-private.h | 5 +- + glib/poppler.h | 7 + + 7 files changed, 1151 insertions(+), 1 deletion(-) + +commit 6fa3ab20fee311b4aff92be18870fd0e1730a81f +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Tue Mar 11 18:44:27 2008 +0100 + + Changed AnnotMarkup inheritance + + poppler/Annot.cc | 9 +++++---- + poppler/Annot.h | 10 +++++----- + 2 files changed, 10 insertions(+), 9 deletions(-) + +commit 3111cfe2ccb32f9680baaad0c3f0678dd5969f8b +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Mar 10 22:12:36 2008 +0100 + + And free the memory + + qt4/tests/test-poppler-qt4.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +commit 58f88c23402ac2e678dc655f64d93d89bb1812be +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Mar 10 22:08:43 2008 +0100 + + Add the -textRects option to the test app so we can check text rects + are correct + + qt4/tests/test-poppler-qt4.cpp | 45 + +++++++++++++++++++++++++++++++++++++----- + 1 file changed, 40 insertions(+), 5 deletions(-) + +commit 94ceb3cae79dc7786fa59fd889a87160780ed5df +Merge: 0f9e8430 35f34bd4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Mar 9 23:34:11 2008 +0100 + + Merge branch 'master' of + ssh://aacid@git.freedesktop.org/git/poppler/poppler + +commit 0f9e84302ac2108f05bdbb10e7e57ae19ad1e9f3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Mar 9 23:33:11 2008 +0100 + + Do not force default values to fontconfig patterns as fontconfig + already fills in default values for us + + Fixes bug 14883 + + poppler/GlobalParams.cc | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit 35f34bd44c74eeb76a58b30acfbb0303d7285f06 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Mar 9 17:38:54 2008 +0100 + + Fix build when compiling without cairo support + + glib/demo/images.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 32637db19dd80a9b8452f86eb677b10e77290627 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Mar 9 00:57:08 2008 +0100 + + proper lib64 Qt detection + + Fixes bug 14583 + + m4/qt.m4 | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +commit 65a88a95a5c54c890048e8a986df361585d601dd +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 8 03:11:36 2008 +0100 + + Provide the mime type for an embedded file, if known. + + Adapt the unit test for that. + + qt4/src/poppler-embeddedfile.cc | 5 +++++ + qt4/src/poppler-qt4.h | 5 +++++ + qt4/tests/check_attachments.cpp | 7 +++++++ + 3 files changed, 17 insertions(+) + +commit 23da27a229c8b3cc2a0a0dd6354c40723934390c +Author: Pino Toscano <pino@kde.org> +Date: Sat Mar 8 03:10:58 2008 +0100 + + Optionally read the mimetype for the embedded files. + + poppler/Catalog.cc | 17 +++++++++-------- + poppler/Catalog.h | 7 ++++++- + 2 files changed, 15 insertions(+), 9 deletions(-) + +commit 42c254b978c61e2ccfda083dfeffec9fc35a5fe7 +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 3 16:56:09 2008 +0100 + + be safe about out-of-range values + + qt4/src/poppler-textbox.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5db75df77938eb7620867d0618058be52ed2d3cb +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 3 16:53:39 2008 +0100 + + initialize nicely + + qt4/src/poppler-private.h | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 3ad0ab7e4abd37528284269c69be3cdfb8d31d2e +Author: Pino Toscano <pino@kde.org> +Date: Mon Mar 3 16:49:23 2008 +0100 + + apidox + + qt4/src/poppler-link.h | 17 +++++++++++++++++ + qt4/src/poppler-qt4.h | 23 ++++++++++++++++++++++- + 2 files changed, 39 insertions(+), 1 deletion(-) + +commit ec01926e5a9dc16e200060497c43e79a1623698d +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Mar 2 20:15:20 2008 -0500 + + Avoid setting a singular ctm + + Ignoring singular ctm's gives a better result than having + our cairo context error and turn off. Related to #14398. + + poppler/CairoOutputDev.cc | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit 4882d7a118b93fdb5c441d70757e485be7ee25d7 +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 28 15:12:23 2008 +0100 + + printf -> qDebug + + qt4/src/poppler-optcontent.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 31ce4049bf12c2716be7ec0fb8eda502d989f66e +Author: Brad Hards <bradh@saxicola.cuneata.net> +Date: Thu Feb 28 22:09:30 2008 +1100 + + Respect PageMode for optional content and embedded files. + + This makes the PDF 1.7 spec open with the embedded files showing. + + qt4/demos/embeddedfiles.cpp | 7 +++++++ + qt4/demos/embeddedfiles.h | 1 + + qt4/demos/optcontent.cpp | 8 ++++++++ + qt4/demos/optcontent.h | 1 + + 4 files changed, 17 insertions(+) + +commit ff938c431799d49325c0f46f1e6cbe1033993a83 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Feb 27 23:12:53 2008 +0100 + + do not forget to distribute GlobalParamsWin.cc next time + + poppler/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 277382b8186d137a9f2a62bc2d22e9f0cda7d923 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Feb 27 22:56:33 2008 +0100 + + fix typo + + glib/demo/images.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5b2f8f21fca63508570a0c77c6f7221a322e6e57 +Merge: 7e651186 4254f123 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 22:10:12 2008 +0100 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit 7e651186f483976f9833de245b6c7add38e77a16 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 22:03:17 2008 +0100 + + Properly enable/disable the contents when their parents are changed. + + Now, the children maintain the "checked state" they had, when their + parent is unchecked; + but, they are really disabled, both in the possibility to be checked + and in the drawing of their associated content [applying the same + to their children, and so on]. + + qt4/src/poppler-optcontent-private.h | 8 +++++++- + qt4/src/poppler-optcontent.cc | 37 + +++++++++++++++++++++++++++++++----- + 2 files changed, 39 insertions(+), 6 deletions(-) + +commit 4254f1237ebed09b8e1c85f935a20bde3d8f36ff +Merge: ed6c0c26 0569ae76 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Feb 27 20:44:27 2008 +0100 + + Merge branch 'master' of + ssh://aacid@git.freedesktop.org/git/poppler/poppler + +commit 8d384c06f96ba8cb3e73c275b3c708c64da4595d +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 20:39:09 2008 +0100 + + small header cleanup + + qt4/src/poppler-optcontent-private.h | 9 +++++++-- + qt4/src/poppler-optcontent.cc | 7 ++++--- + 2 files changed, 11 insertions(+), 5 deletions(-) + +commit ed6c0c260837a0025279765ef7778b83d6ee2209 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Feb 27 20:43:45 2008 +0100 + + fix build and distcheck with autools + + qt4/demos/Makefile.am | 3 +++ + qt4/src/Makefile.am | 5 ++++- + qt4/tests/Makefile.am | 3 +++ + 3 files changed, 10 insertions(+), 1 deletion(-) + +commit 344d55539b1b6bcabec609fd828db372a07491b4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Feb 27 20:43:13 2008 +0100 + + fill the NEWS for 0.7.1 + + NEWS | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 1c47633ba782021978fa34d41a4ab0badf3af9d3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Feb 27 20:42:55 2008 +0100 + + Increase version number to 0.7.1 + + CMakeLists.txt | 2 +- + configure.ac | 2 +- + msvc/config.h | 6 +++--- + qt4/src/Doxyfile | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +commit 0569ae76b6af1723b4606af189242a23199f387d +Merge: f395531a d8eba8c1 +Author: Brad Hards <bradh@kde.org> +Date: Thu Feb 28 06:26:09 2008 +1100 + + Merge branch 'master' of + ssh://bradh@git.freedesktop.org/git/poppler/poppler + +commit d8eba8c10834116b4f0f295375805172f5216993 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 19:07:46 2008 +0100 + + export the OptContentModel + + qt4/src/poppler-optcontent.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 0445e64a4124af7c1b84673f237022e133eb8542 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 19:04:03 2008 +0100 + + make only the Document able to create OptContentsModel's + + qt4/src/poppler-optcontent.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit c965437b67a4f97ee8365a217bd10406fba3767a +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 18:58:31 2008 +0100 + + setRootNode() is private (and unused) API + + qt4/src/poppler-optcontent-private.h | 2 ++ + qt4/src/poppler-optcontent.cc | 8 ++++---- + qt4/src/poppler-optcontent.h | 4 ---- + 3 files changed, 6 insertions(+), 8 deletions(-) + +commit e293bfc384e2dfc4ef04582053ce18d8c0bcb7b3 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 18:50:35 2008 +0100 + + small cleanup + + qt4/src/poppler-optcontent.cc | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +commit f11aa0008585e845ce509172d76f72f941be497d +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 18:44:09 2008 +0100 + + adapt the tests to the new layout of the contents model + + qt4/tests/check_optcontent.cpp | 66 + +++++++++++++++--------------------------- + 1 file changed, 23 insertions(+), 43 deletions(-) + +commit 4a324484b5c77ddc348746e7bcf6051ade28e389 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 18:04:52 2008 +0100 + + free some objects (thus leak less) + + poppler/Gfx.cc | 2 ++ + poppler/OptionalContent.cc | 2 ++ + 2 files changed, 4 insertions(+) + +commit 0f4e7791ab6884072a1aee56e9cec212d8cea263 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 15:58:21 2008 +0100 + + ignore any generated .moc here + + qt4/src/.gitignore | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 136ae44f155b17d9e8b041b67f75531d8544337c +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 15:56:09 2008 +0100 + + keep track of the items changed when toggling an item, so we can + update them properly + + qt4/src/poppler-optcontent-private.h | 4 ++-- + qt4/src/poppler-optcontent.cc | 38 + ++++++++++++++++++++++++++++-------- + 2 files changed, 32 insertions(+), 10 deletions(-) + +commit b73e2afef7e5e1b68d82a10c94bca3c201c5f8b3 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 15:52:06 2008 +0100 + + fix indexFromItem once again, and make parent() call it with the + right node + + qt4/src/poppler-optcontent-private.h | 2 +- + qt4/src/poppler-optcontent.cc | 19 +++++++++---------- + 2 files changed, 10 insertions(+), 11 deletions(-) + +commit 803787f763578320aa5f405ed49c64e6b924bad3 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 15:30:18 2008 +0100 + + compile with the autotools + + (second patch I forgot to apply with the first) + + qt4/src/Makefile.am | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 0b527a8ed62677bb09df4587f072a310c2959750 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 14:34:13 2008 +0100 + + Extract the OptContentItem -> QModelIndex creation in an own function. + + qt4/src/poppler-optcontent-private.h | 1 + + qt4/src/poppler-optcontent.cc | 7 ++++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit c94d6cc95c6838f31e27832cb3090389bf4d8227 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 14:30:26 2008 +0100 + + Make index(), data() and setData() more safe. + + Errors spotted using ModelTest. + + qt4/src/poppler-optcontent-private.h | 2 +- + qt4/src/poppler-optcontent.cc | 15 +++++++++------ + 2 files changed, 10 insertions(+), 7 deletions(-) + +commit b8e833733d84eaa93d6bae522710feb3075ca329 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 14:05:19 2008 +0100 + + fix build with the autotools + + qt4/src/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit f89ba474bae281f1cdeddb72ac8425dee1087e35 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 13:28:50 2008 +0100 + + Put the check states of the optional contents in the same column as + the name. + + This feels a bit more elegant than changing a value in a different + column. + Cleanup data()/setData() so they can be extended easily. + + qt4/src/poppler-optcontent.cc | 74 + ++++++++++++++++++++++--------------------- + 1 file changed, 38 insertions(+), 36 deletions(-) + +commit defa0ecb2790402a4069fea3b3c285a50675682d +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 12:24:16 2008 +0100 + + Add a skeleton of OptContentModel::headerData(). + + It does nothing yet, but we can add stuff later on w/o breaking BC. + + qt4/src/poppler-optcontent.cc | 5 +++++ + qt4/src/poppler-optcontent.h | 2 ++ + 2 files changed, 7 insertions(+) + +commit f395531a3e8f71a46b3c942f8f437ade1d9fdb57 +Author: Brad Hards <bradh@kde.org> +Date: Wed Feb 27 22:22:51 2008 +1100 + + Minor cleanup. + + qt4/src/poppler-optcontent.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +commit 0a19486cb4de57c0c987cc4ce2434a96bbd18338 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 12:15:44 2008 +0100 + + refresh the current page when the data of the content model change + + qt4/demos/optcontent.cpp | 8 ++++++++ + qt4/demos/optcontent.h | 3 +++ + 2 files changed, 11 insertions(+) + +commit 09b7cc2efb7d21fa4dabd23d2d2de877cc7d86ee +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 12:15:18 2008 +0100 + + optional method to reload the current page + + qt4/demos/documentobserver.cpp | 5 +++++ + qt4/demos/documentobserver.h | 1 + + 2 files changed, 6 insertions(+) + +commit 39fe905be8f2ae79d9c26cd87547f3ea2608411e +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 12:00:29 2008 +0100 + + Add a dock for showing the optional content tree. + + qt4/demos/CMakeLists.txt | 1 + + qt4/demos/Makefile.am | 3 +++ + qt4/demos/optcontent.cpp | 55 + ++++++++++++++++++++++++++++++++++++++++++++++++ + qt4/demos/optcontent.h | 43 +++++++++++++++++++++++++++++++++++++ + qt4/demos/viewer.cpp | 7 ++++++ + 5 files changed, 109 insertions(+) + +commit f17dd5539501a996479b903ac9b8aceb3c4cfafe +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 11:53:32 2008 +0100 + + cleanup + + qt4/src/poppler-optcontent-private.h | 3 ++- + qt4/src/poppler-optcontent.h | 4 +--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +commit f3cc894559f10dbd4277fa9f30de9931ed69dfd4 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 11:43:34 2008 +0100 + + OptContentModel::itemFromRef() and OptContentItem are private API. + + Hide them in the implementation. + + qt4/src/poppler-optcontent-private.h | 43 + ++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-optcontent.cc | 8 +++---- + qt4/src/poppler-optcontent.h | 42 + ----------------------------------- + 3 files changed, 47 insertions(+), 46 deletions(-) + +commit 48e8b2105cf8f177ca655b969470e45e2407db82 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 11:28:16 2008 +0100 + + move all the private stuff of OptContentModel into its d-pointer + + qt4/src/poppler-optcontent-private.h | 9 +++++++-- + qt4/src/poppler-optcontent.cc | 29 +++++++++++++++-------------- + qt4/src/poppler-optcontent.h | 4 ---- + 3 files changed, 22 insertions(+), 20 deletions(-) + +commit b78a7f7a0e8d5a9c22014d34754090d863030e0d +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 27 11:06:57 2008 +0100 + + use a QPointer for the OptContentModel, so we are safe about + ownership. + + qt4/src/poppler-document.cc | 4 ++-- + qt4/src/poppler-private.h | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +commit 48557da71adb0fe6bd4da2fb32433796a96c3576 +Author: Brad Hards <bradh@kde.org> +Date: Wed Feb 27 19:39:18 2008 +1100 + + We need to install the optional content header. + + qt4/src/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 6e2bb03b5ef256c03a8da1cbf9bbc87c593942ad +Author: Brad Hards <bradh@kde.org> +Date: Wed Feb 27 19:23:49 2008 +1100 + + Partial d-pointer implementation. + + qt4/src/poppler-optcontent-private.h | 57 + ++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-optcontent.cc | 49 +++++++++++++++++++------------ + qt4/src/poppler-optcontent.h | 24 ++++----------- + 3 files changed, 92 insertions(+), 38 deletions(-) + +commit c627b7aa10ae9cdceb78b751a7e826170f402af0 +Author: Brad Hards <bradh@kde.org> +Date: Wed Feb 27 16:12:38 2008 +1100 + + A couple of cleanups suggested by Pino. + + qt4/src/poppler-document.cc | 6 +++--- + qt4/src/poppler-qt4.h | 8 +++++--- + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 81891667e18fcf164af02f5f366de07f78d67c8f +Author: Brad Hards <bradh@kde.org> +Date: Wed Feb 27 15:47:03 2008 +1100 + + Add in the initial part of the optional content support. + + To see this work, compare ClarityOCGs.pdf with and + without this change. + + Right now we only handle optional content using + XObjects. Optional content using Marked Content has + infrastructure, but is not implemented. That will be + quite invasive in Gfx, and I'm not confident enough + to do it this late in the process. + + CMakeLists.txt | 1 + + poppler/Catalog.cc | 9 + + poppler/Catalog.h | 4 + + poppler/Gfx.cc | 65 +++++- + poppler/Gfx.h | 12 +- + poppler/Makefile.am | 2 + + poppler/OptionalContent.cc | 322 ++++++++++++++++++++++++++ + poppler/OptionalContent.h | 85 +++++++ + poppler/PDFDoc.h | 5 + + poppler/PSOutputDev.cc | 6 +- + poppler/Page.cc | 2 +- + qt4/src/.gitignore | 1 + + qt4/src/CMakeLists.txt | 3 + + qt4/src/Makefile.am | 6 + + qt4/src/poppler-document.cc | 13 ++ + qt4/src/poppler-optcontent.cc | 354 +++++++++++++++++++++++++++++ + qt4/src/poppler-optcontent.h | 122 ++++++++++ + qt4/src/poppler-private.h | 4 + + qt4/src/poppler-qt4.h | 18 ++ + qt4/tests/.gitignore | 1 + + qt4/tests/CMakeLists.txt | 1 + + qt4/tests/Makefile.am | 5 + + qt4/tests/check_optcontent.cpp | 499 + +++++++++++++++++++++++++++++++++++++++++ + 23 files changed, 1532 insertions(+), 8 deletions(-) + +commit 11b70bcda905e618c199a067db6b0246612e101d +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 26 23:01:27 2008 +0100 + + fixup the default export macro name (added by cmake); _WIN32 is + defined only on win32 (remove a plethora of warnings) + + qt4/src/poppler-export.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit d4d6c14cd83d04c61daa6618c3148a0bb47dc292 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 26 22:57:02 2008 +0100 + + install the export header + + qt4/src/CMakeLists.txt | 1 + + qt4/src/Makefile.am | 1 + + 2 files changed, 2 insertions(+) + +commit 4ba2e2d21710135656adbf93c5994cfb46502308 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 26 22:55:30 2008 +0100 + + no need to include the export header in private headers + + qt4/src/poppler-annotation-helper.h | 1 - + qt4/src/poppler-annotation-private.h | 1 - + qt4/src/poppler-converter-private.h | 1 - + qt4/src/poppler-link-extractor-private.h | 1 - + qt4/src/poppler-page-private.h | 1 - + qt4/src/poppler-private.h | 1 - + qt4/src/poppler-qiodeviceoutstream-private.h | 1 - + 7 files changed, 7 deletions(-) + +commit 0a466c09fb70b92f39df19bc315b6575e419ad5b +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 26 22:47:31 2008 +0100 + + We also need to distribute poppler-export.h + + qt4/src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 2034d57c700049bc9a6565bbb818e1c9f4467784 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 26 22:46:29 2008 +0100 + + Now for real: Add special casing in cmake buildsystem for MSVC, + also add Export markers to qt4 classes, although symbol visibility + is only used on MSVC at the moment + + CMakeLists.txt | 5 +++++ + qt4/src/CMakeLists.txt | 3 +++ + qt4/src/poppler-annotation-helper.h | 1 + + qt4/src/poppler-annotation-private.h | 1 + + qt4/src/poppler-annotation.h | 19 ++++++++++--------- + qt4/src/poppler-converter-private.h | 1 + + qt4/src/poppler-export.h | 6 +++--- + qt4/src/poppler-form.h | 9 +++++---- + qt4/src/poppler-link-extractor-private.h | 1 + + qt4/src/poppler-link.h | 17 +++++++++-------- + qt4/src/poppler-page-private.h | 1 + + qt4/src/poppler-private.h | 1 + + qt4/src/poppler-qiodeviceoutstream-private.h | 1 + + qt4/src/poppler-qt4.h | 21 +++++++++++---------- + qt4/tests/CMakeLists.txt | 6 ++++++ + 15 files changed, 59 insertions(+), 34 deletions(-) + +commit b931920f63f4276ec355118faa061bafa5ac5244 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 26 22:42:16 2008 +0100 + + Add special casing in cmake buildsystem for MSVC, also add Export + markers to qt4 classes, although symbol visibility is only used on + MSVC at the moment + + qt4/src/poppler-export.h | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 1778fddb36d6cb2c7f7848bee06189158f69f16e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 24 23:02:08 2008 +0100 + + Add the cmake files to EXTRA_DIST so they get added when i do make + dist to get the release tarball + + Makefile.am | 39 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + +commit 51f171e10a42d492c8c32a5e2578d05b73d89238 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 24 22:47:46 2008 +0100 + + ignore more + + qt4/demos/.gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit adb1ccdb9265f0583cb348c456a39efac610aff1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 24 22:46:33 2008 +0100 + + ignore + + qt4/demos/.gitignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit 101e526c63175ffc1a75e1b68da7bb4fff9cd530 +Author: Patrick Spendrin <ps_ml@gmx.de> +Date: Sun Feb 24 20:52:41 2008 +0100 + + define snprintf to _snprintf if we are building on MSVC + + config.h.cmake | 4 ++++ + 1 file changed, 4 insertions(+) + +commit f7f8ab488257c3979d20e5c0690ec5d7c2cd831b +Author: Patrick Spendrin <ps_ml@gmx.de> +Date: Sun Feb 24 20:43:11 2008 +0100 + + define M_PI in case it is not defined + + poppler/Function.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit f00436b63bf9a42dcb2728a07db9c20f1f23d0bc +Author: Patrick Spendrin <ps_ml@gmx.de> +Date: Sun Feb 24 20:39:42 2008 +0100 + + Add proper dirent.h guards + + utils/pdftoabw.cc | 2 ++ + utils/pdftohtml.cc | 2 ++ + 2 files changed, 4 insertions(+) + +commit e1463451c584181f918265438cf6ddcb408bf731 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Feb 21 20:43:56 2008 +0100 + + Code uses if USE_EXCEPTIONS, so we need to defined it to 1, not just + define it + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 88d4bbbcf828e3247454c8ba3c2fb0fb58207b6a +Author: Michael Vrable <mvrable@cs.ucsd.edu> +Date: Thu Feb 21 19:53:03 2008 +0100 + + If a bitmap's dimensions are invalid, do not try to display it. + + poppler/Gfx.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 452ae6f5674b00b43955952961f7ca0583f73e27 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Feb 21 19:46:19 2008 +0100 + + Make sure we don't draw outside the bitmap on Splash::fillGlyph2 + + splash/Splash.cc | 76 + ++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 49 insertions(+), 27 deletions(-) + +commit 7f60fa806bd6d3d28917f349a2a19b52f97f593a +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Feb 21 13:00:05 2008 -0500 + + Fix typo + + Signed-off-by: James Cloos <cloos@jhcloos.com> + + qt4/demos/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 053ecae534a4522d152b0139b6aed6da2059d760 +Author: Carl Worth <cworth@cworth.org> +Date: Wed Feb 20 17:21:27 2008 -0800 + + Keep cairo and cairo_shape consistent + + The 'cairo_shape' state was not always being modified at the same + time as 'cairo'. In some cases this led to a sequence of ever + larger matrix scale factors until things just blew up. + + poppler/CairoOutputDev.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit bf6dd890994150406b4464e45355a4a99870fc60 +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 21 01:23:07 2008 +0100 + + Add a dock for showing the document metadata. + + qt4/demos/CMakeLists.txt | 1 + + qt4/demos/Makefile.am | 3 +++ + qt4/demos/metadata.cpp | 50 + ++++++++++++++++++++++++++++++++++++++++++++++++ + qt4/demos/metadata.h | 43 +++++++++++++++++++++++++++++++++++++++++ + qt4/demos/viewer.cpp | 7 +++++++ + 5 files changed, 104 insertions(+) + +commit b6f0c8f83924c08be20b602b128651bf018172a3 +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 21 00:54:26 2008 +0100 + + Do not assign conflicting accelerators. + + qt4/demos/viewer.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e0c27a968c7e7a0f6a89a050ddbfe328229f431d +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 21 00:53:24 2008 +0100 + + Apply the antialias settings w/o notify the observers. + + qt4/demos/viewer.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 2c6149abcecda15c6f73a1dee537072240ddd545 +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 21 00:51:21 2008 +0100 + + Add a settings menu to choose the render backend. + + qt4/demos/viewer.cpp | 28 ++++++++++++++++++++++++++++ + qt4/demos/viewer.h | 3 +++ + 2 files changed, 31 insertions(+) + +commit db2b0778dca364751a1d22294be29f8c7799e2e9 +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 21 00:33:23 2008 +0100 + + Add a dock for showing the embedded files. + + TODO: show the checksum in a pretty format. + + qt4/demos/CMakeLists.txt | 1 + + qt4/demos/Makefile.am | 3 ++ + qt4/demos/embeddedfiles.cpp | 75 + +++++++++++++++++++++++++++++++++++++++++++++ + qt4/demos/embeddedfiles.h | 43 ++++++++++++++++++++++++++ + qt4/demos/viewer.cpp | 7 +++++ + 5 files changed, 129 insertions(+) + +commit 51fba47ccb12a66282769fc504bac4c9f5123f75 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 17 01:49:59 2008 +0100 + + clear the page label when the document is closed + + qt4/demos/pageview.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +commit e964e2b9fbbe9b52b137ecd06729a06530835227 +Author: Michael Vrable <mvrable@cs.ucsd.edu> +Date: Tue Feb 19 23:22:55 2008 +0100 + + Allow grouped checkboxes to be selected individually. + + When checkboxes are in a group, they ought to behave like a + collection of + radio buttons. However, when deciding whether to draw a checkbox as + selected or not, the checkbox-drawing code was looking up the value + of the + V field in the form dictionary, which is shared among all checkboxes + in the + group. Thus, checkboxes would either all be on or off in unison. + + Instead, look up the AS (appearance state) value in each checkbox's + annotation dictionary, so that different checkboxes can be drawn + differently. + + poppler/Annot.cc | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 702fdd6c56b5369554c683d8c8e0e2c66e80886c +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 19 00:18:04 2008 +0100 + + changes from gtk-doc + + glib/reference/tmpl/poppler-document.sgml | 1 + + glib/reference/tmpl/poppler-page.sgml | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 9e13b91ba38c20989d283588e73490a1601f5bb0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Feb 19 00:10:24 2008 +0100 + + distribute the headers too + + qt4/demos/Makefile.am | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 194e0ced7c38514ec3126666531862e3b29b4b77 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Feb 18 23:34:06 2008 +0100 + + Fill NEWS and increase version number to 0.7 + + CMakeLists.txt | 2 +- + NEWS | 96 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- + msvc/config.h | 6 ++-- + qt4/src/Doxyfile | 2 +- + 5 files changed, 102 insertions(+), 6 deletions(-) + +commit 3c407efe9f1f0cc3f6366d3a2b6e9b687656cc95 +Merge: 51f0cea0 7f4acb87 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 18 21:30:42 2008 +0100 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit 51f0cea0e3ba1acfc63877752e950fdd8c07e258 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 18 21:29:41 2008 +0100 + + make the poppler_qt4viewer compile with the auto"tools" + + qt4/demos/Makefile.am | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit 7f4acb879d300e18dfaff768027c88195d7d8f1b +Author: Timothy Lee <timothy.lee@siriushk.com> +Date: Mon Feb 18 20:56:35 2008 +0100 + + Implement ImageOutputDev::drawMaskedImage and + ImageOutputDev::drawSoftMaskedImage so all images are exported when + using pdfimages + + utils/ImageOutputDev.cc | 19 +++++++++++++++++++ + utils/ImageOutputDev.h | 11 +++++++++++ + 2 files changed, 30 insertions(+) + +commit 064b316648e35416bb49336639da1d8d288d1ecf +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Feb 18 20:17:37 2008 +0100 + + xref can be null so check for it before checking we went out of bounds + + Fixes bug 14549 + + poppler/Lexer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b287b611b1c7b7dd00e12518cee3a6c35044e161 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 17 01:21:07 2008 +0100 + + Really niptick: help menu with about dialog for us and Qt. + + qt4/demos/viewer.cpp | 15 +++++++++++++++ + qt4/demos/viewer.h | 2 ++ + 2 files changed, 17 insertions(+) + +commit 6400254fdabf3d0d32f27ebd00faa6958be62019 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 17 01:12:27 2008 +0100 + + Add a title to the viewer :) + + qt4/demos/viewer.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +commit b363c0568c9c61e7ee8ed86d808f0eed0b93b525 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 17 01:09:57 2008 +0100 + + Add the possibility to save a copy of the file. + + qt4/demos/viewer.cpp | 29 +++++++++++++++++++++++++++++ + qt4/demos/viewer.h | 2 ++ + 2 files changed, 31 insertions(+) + +commit 42987dcdd8d7432145f78cfc550f0c099e6e7311 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 17 00:33:01 2008 +0100 + + Add a Permissions dock. + + qt4/demos/CMakeLists.txt | 1 + + qt4/demos/Makefile.am | 1 + + qt4/demos/permissions.cpp | 77 + +++++++++++++++++++++++++++++++++++++++++++++++ + qt4/demos/permissions.h | 43 ++++++++++++++++++++++++++ + qt4/demos/viewer.cpp | 7 +++++ + 5 files changed, 129 insertions(+) + +commit 9d1dda64de1d9e3f6fc81e40a0c2246a6270dfa8 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 16 23:56:17 2008 +0100 + + Add settings for antialias. + + qt4/demos/viewer.cpp | 41 +++++++++++++++++++++++++++++++++++++++++ + qt4/demos/viewer.h | 4 ++++ + 2 files changed, 45 insertions(+) + +commit 3abb8703d7d8b7a5fbcbb3c19d8e84d640abe88c +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 16 22:25:11 2008 +0100 + + Add a TOC info dock. + + qt4/demos/CMakeLists.txt | 1 + + qt4/demos/Makefile.am | 1 + + qt4/demos/toc.cpp | 90 + ++++++++++++++++++++++++++++++++++++++++++++++++ + qt4/demos/toc.h | 43 +++++++++++++++++++++++ + qt4/demos/viewer.cpp | 7 ++++ + 5 files changed, 142 insertions(+) + +commit 80925f06d125ebfc9909e36bdbe5d37fd0e48bdc +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 16 21:51:10 2008 +0100 + + Adapt the Fonts and Info docks to the new abstract info dock. + + qt4/demos/fonts.cpp | 10 +++------- + qt4/demos/fonts.h | 11 +++++------ + qt4/demos/info.cpp | 10 +++------- + qt4/demos/info.h | 11 +++++------ + 4 files changed, 16 insertions(+), 26 deletions(-) + +commit c03531d691e56aba2b4c6538cf9e2463e1e0aa29 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 16 21:43:19 2008 +0100 + + Introduce a base info dock for handling the "dirty" work. + + qt4/demos/CMakeLists.txt | 1 + + qt4/demos/Makefile.am | 1 + + qt4/demos/abstractinfodock.cpp | 57 + ++++++++++++++++++++++++++++++++++++++++++ + qt4/demos/abstractinfodock.h | 48 +++++++++++++++++++++++++++++++++++ + 4 files changed, 107 insertions(+) + +commit 0f7d51c7fc2439ee9392c166576c341238f00f36 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 16 18:49:52 2008 +0100 + + Delete the poppler page after usage. + + qt4/demos/pageview.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit b41d069cdd1435ddb14b3de2986875069523c814 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 16 18:48:57 2008 +0100 + + Initialize the current page number correctly. + + qt4/demos/viewer.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 75e516af0e72a2e3041660300e522ad00869372b +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 16 18:43:56 2008 +0100 + + Add a side dock for showing the fonts of the document. + + qt4/demos/CMakeLists.txt | 1 + + qt4/demos/Makefile.am | 1 + + qt4/demos/fonts.cpp | 78 + ++++++++++++++++++++++++++++++++++++++++++++++++ + qt4/demos/fonts.h | 44 +++++++++++++++++++++++++++ + qt4/demos/viewer.cpp | 7 +++++ + 5 files changed, 131 insertions(+) + +commit 8e642d1cbd48d4790a6769287cbfd90c3bc9fc34 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 16 17:21:30 2008 +0100 + + Add a View menu where the dock widget toogle actions will be. + + As start, put the Info dock there. + + qt4/demos/viewer.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +commit c1feb7c2b5008cc04edb3c028f888072920ce4dc +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 16 17:14:00 2008 +0100 + + Add a side dock for showing the info keys. + + qt4/demos/CMakeLists.txt | 1 + + qt4/demos/Makefile.am | 1 + + qt4/demos/info.cpp | 78 + ++++++++++++++++++++++++++++++++++++++++++++++++ + qt4/demos/info.h | 44 +++++++++++++++++++++++++++ + qt4/demos/viewer.cpp | 5 ++++ + 5 files changed, 129 insertions(+) + +commit abc9b00c6470f9f6b66c280455f544ad0ee3aa8c +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 16 16:09:52 2008 +0100 + + Basic work in the demo PDF viewer, open documents and navigate into + the pages. + + An observer structure was introduced, so extra components can be + easily added and made aware of the document/page changes. + Both the navigation toolbar and the page view are implemented as + observers. + + qt4/demos/CMakeLists.txt | 3 ++ + qt4/demos/Makefile.am | 3 ++ + qt4/demos/documentobserver.cpp | 45 +++++++++++++++++++ + qt4/demos/documentobserver.h | 49 +++++++++++++++++++++ + qt4/demos/navigationtoolbar.cpp | 98 + +++++++++++++++++++++++++++++++++++++++++ + qt4/demos/navigationtoolbar.h | 56 +++++++++++++++++++++++ + qt4/demos/pageview.cpp | 60 +++++++++++++++++++++++++ + qt4/demos/pageview.h | 44 ++++++++++++++++++ + qt4/demos/viewer.cpp | 98 + +++++++++++++++++++++++++++++++++++++++-- + qt4/demos/viewer.h | 17 +++++++ + 10 files changed, 470 insertions(+), 3 deletions(-) + +commit 14c88853a5675f40efb72f3ef01f49eb06ab846c +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 16 00:32:30 2008 +0100 + + Compile the poppler_qt4viewer. + + qt4/demos/CMakeLists.txt | 7 +++++++ + qt4/demos/Makefile.am | 12 ++++++++++-- + 2 files changed, 17 insertions(+), 2 deletions(-) + +commit aeb591f015d5e7a2643ed75d872358d2b1256b99 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 16 00:31:46 2008 +0100 + + Add a very minimal base PDF viewer. + + So minimal that it does nothing at the moment... + + qt4/demos/main_viewer.cpp | 29 +++++++++++++++++++++++++++++ + qt4/demos/viewer.cpp | 46 + ++++++++++++++++++++++++++++++++++++++++++++++ + qt4/demos/viewer.h | 45 + +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 120 insertions(+) + +commit 8da490b090487c4c37290b63bdc9abcfaf6d6940 +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 15 23:59:39 2008 +0100 + + Add a skeleton of directory where PopplerQt4 demos will be. + + configure.ac | 1 + + qt4/CMakeLists.txt | 1 + + qt4/Makefile.am | 2 +- + qt4/demos/CMakeLists.txt | 10 ++++++++++ + qt4/demos/Makefile.am | 20 ++++++++++++++++++++ + 5 files changed, 33 insertions(+), 1 deletion(-) + +commit e24b49d52a5c1716641695ee731dd49848a114d9 +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 14 22:21:54 2008 +0100 + + do not print it as string + + qt4/src/poppler-private.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2316455864e9c900c08d051c59b9508eddcb7c34 +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 14 21:02:20 2008 +0100 + + Pipe the poppler error messages through the Qt debug system. + + qt4/src/poppler-private.cc | 21 +++++++++++++++++++++ + qt4/src/poppler-private.h | 8 +++++++- + 2 files changed, 28 insertions(+), 1 deletion(-) + +commit d985d3b0cdc57370137865add2a5f3a7802109c7 +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 14 14:56:18 2008 +0100 + + Use what FormWidgetText give us. + + qt4/src/poppler-form.cc | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +commit a69bd442e52f4495f8d6bfd3bb58b3ebd1be1a63 +Author: Michael Vrable <mvrable@cs.ucsd.edu> +Date: Thu Feb 14 12:52:22 2008 +0100 + + Provide Unicode mappings for some control characters in + PDFDocEncoding. + + Though they do not represent glyphs, values such as carriage return + can be + found in text strings in PDFDocEncoding. Provide mappings for + these bytes + to Unicode. + + Additionally, map unknown characters to U+FFFD instead of U+0000, + so that + unknown characters do not result in nulls (which can truncate strings + early, particularly if the string is later re-encoded into + null-terminated + UTF-8). + + poppler/PDFDocEncoding.cc | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) + +commit ce17383e0ed21770b471e88f25046a64a23e7e45 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Feb 13 20:56:39 2008 +0100 + + Yet another fix for buggy documents, do not use the cache if the + cache could not be created because it ought to be too big + + Fixes http://bugs.kde.org/show_bug.cgi?id=157777 + + splash/SplashFont.cc | 48 + ++++++++++++++++++++++++++++-------------------- + 1 file changed, 28 insertions(+), 20 deletions(-) + +commit 15a61cac718ae8cbf83911e299b4cfdd24cdf178 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 13 20:55:18 2008 +0100 + + add images.c + + glib/demo/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 9cfe10ab7f51d329647e102e446baaef043d8cc6 +Merge: e9187292 7d65b4da +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 13 20:53:43 2008 +0100 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit 7d65b4da1bc060aeb94d67c2ff26912cef48c030 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Feb 13 20:32:43 2008 +0100 + + Add images demo + + glib/demo/Makefile.am | 2 + + glib/demo/images.c | 338 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/demo/images.h | 31 +++++ + glib/demo/main.c | 4 +- + 4 files changed, 374 insertions(+), 1 deletion(-) + +commit e9187292701e72db1020f7701d0725d83eee4b00 +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 13 19:41:57 2008 +0100 + + Do the one-time initialisation in initTestCase(). + + qt4/tests/check_dateConversion.cpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit fb996c46e3c6b56a2c67819620000bcd804aacd6 +Author: Michael Vrable <mvrable@cs.ucsd.edu> +Date: Wed Feb 13 18:44:41 2008 +0100 + + Major rework of text display in form fields code. + + This adds support for UTF-16 strings as input, and will recode them + to the + appropriate character set for the font. + + The method Annot::layoutText packs a lot of functionality together, + but I + couldn't see a good way to split it apart. It will convert an + input text + string from PDFDocEncoding or UTF-16 (encoding is autodetected) to the + appropriate encoding for the font which will be used to display + the form + field. At the same time, it can compute the width of the resulting + string, + and optionally break the string at a specified width to aid in + wrapping + multi-line text. Text wrapping is integrated with encoding conversion + since wrapping is easiest with the original text (where spaces + and newlines + are easily identified), but text widths can only be computed after + re-encoding. + + Support for composite fonts is included, so long as those fonts use an + identity CMap, but this is still untested. Support for more + complex CMaps + is missing. + + The rewrite also includes a minor improvement to the formatting + of comb + fields; characters are now centered in the comb cells. + + poppler/Annot.cc | 507 + +++++++++++++++++++++++++++++++++++-------------------- + poppler/Annot.h | 9 +- + 2 files changed, 327 insertions(+), 189 deletions(-) + +commit 88c780aed4c9855f879e3c7a9f82500a859635a2 +Author: Michael Vrable <mvrable@cs.ucsd.edu> +Date: Wed Feb 13 18:42:49 2008 +0100 + + Fix what look to be a few bugs in functions for mapping to/from + Unicode. + + - Endianness fix in pdfDocEncodingToUTF16 (previously looked to + assume a + little-endian processor) + - Add support for CharCodeToUnicode::mapToCharCode for Unicode + codepoints + above 255. + + poppler/CharCodeToUnicode.cc | 4 ++-- + poppler/Form.cc | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 7574cb71f24ce5b32427f243c39b6029fb58ec81 +Merge: e798802f 4e45e5ca +Author: Pino Toscano <pino@kde.org> +Date: Wed Feb 13 01:07:31 2008 +0100 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit 4e45e5ca4ab0ba2a6586505d80ed81f4b3426752 +Author: Patrick Spendrin <ps_ml@gmx.de> +Date: Tue Feb 12 21:41:26 2008 +0100 + + Do the right thing with CDECL, that is, undefine it if it is defined + so we can redefine it later + + poppler-config.h.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e798802f00bff0a24ee6d1312d6c62624395865a +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 12 20:57:56 2008 +0100 + + Apidox fix: state which checksum is returned (if available). + + qt4/src/poppler-qt4.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4e2ba70a88c40fef6775053b1cc5fa30e622cea7 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 12 11:25:34 2008 +0100 + + Free the Object after you use it. + + poppler/Annot.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 039545fcd2c12631c7b8aea89c35f36cb387a17a +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 12 11:13:27 2008 +0100 + + Return the siblings even for checkboxes. + + qt4/src/poppler-form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fe5ee75cdf3e11e314318af12edf9d5bc8986250 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 12 11:12:01 2008 +0100 + + Initialize correctly; free your memory. + + poppler/Form.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit e0eff92c7067d43faa8e93baed1f061863111251 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Feb 11 20:32:41 2008 +0100 + + Update the field dict instead of the annot dict for non composed dicts + + We were always updating the annot dictionary, adding or updating + the V field. While this is correct for composed dicts (annot + field) + it isn't for non composed ones since the annot dictionary doesn't + contain any V field because it's a field of the form field dictionary. + In these cases the form field is not correctly updated and if the + document is saved it will be wrong. + + poppler/Form.cc | 44 +++++++++++++++++++++++++++++++------------- + poppler/Form.h | 2 ++ + 2 files changed, 33 insertions(+), 13 deletions(-) + +commit 905e6da9795fee94329022c0cafbc229055fd4f6 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Feb 10 19:22:50 2008 +0100 + + Move forms specific draw methods from Annot to AnnotWidget class + + poppler/Annot.cc | 3433 + +++++++++++++++++++++++++++--------------------------- + poppler/Annot.h | 87 +- + poppler/Form.cc | 39 +- + poppler/Form.h | 2 + + poppler/Page.cc | 9 +- + 5 files changed, 1765 insertions(+), 1805 deletions(-) + +commit 78afbc4d7819654e8742d4457c9847ad02b73bf1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Feb 10 17:12:59 2008 +0100 + + Some code refactoring and cleanup + + - Unused 'field' attribute in FormWidget class is now used and + getField() method has been added + - Method isReadOnly() in FormWidget class is not virtual anymore + but implemented in the base class + - Unused attribute 'catalog' in Form class has been removed and + 'acroForm' has been added instead with a getObj() method to get it. + - createFieldFromDict() method is now static + + poppler/Form.cc | 128 + ++++++++++++++++++++++++++++---------------------------- + poppler/Form.h | 41 +++++++++--------- + 2 files changed, 84 insertions(+), 85 deletions(-) + +commit 5f8e2f9140ee2ede841700726b974768ec863672 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 11 20:16:44 2008 +0100 + + Use QVarLengthArray instead of relying on gcc-ism. + + qt4/src/poppler-page.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 7499764d382366823519aa13a38e1e44781c78af +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 11 11:57:50 2008 +0100 + + Add FormFieldButton::siblings(). + + This is needed for grouping together the radio buttons. + + qt4/src/poppler-form.cc | 14 ++++++++++++++ + qt4/src/poppler-form.h | 8 ++++++++ + 2 files changed, 22 insertions(+) + +commit 85bfa4f499a90d45b13df4d0a8760a7da6fc1532 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 11 02:40:37 2008 +0100 + + Small apidox fix. + + qt4/src/poppler-form.h | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +commit ada05055c91e967dc3e2af32a2176dd12cb7fe70 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 11 02:27:19 2008 +0100 + + Preliminary support for "button" form fields (ie, push buttons, + check boxes, and radio buttons). + + qt4/src/poppler-form.cc | 55 + +++++++++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-form.h | 54 + ++++++++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-page.cc | 6 ++++++ + 3 files changed, 115 insertions(+) + +commit 278b33f25df418ef12798100002845a3e2ceebd3 +Merge: c730b33f fdb0a4a2 +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 11 00:57:24 2008 +0100 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit fdb0a4a2f1d86aec7a3b0fcd4b4d48455791ecad +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Feb 10 18:47:40 2008 -0500 + + Avoid prescaling images when printing. + + Adds a function for letting the CairoOutputDev know whether it is + targetting a + screen or not. It then uses this knowledge to avoid prescaling + images. This way + cairo gets the full resolution image for use in the printed output. + + glib/poppler-page.cc | 1 + + poppler/CairoOutputDev.cc | 3 ++- + poppler/CairoOutputDev.h | 2 ++ + 3 files changed, 5 insertions(+), 1 deletion(-) + +commit c730b33f1ec2032c4b8c2660738448d954eb0f7d +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 11 00:46:20 2008 +0100 + + Keep the EmbFile object, and use this for getting the data. + + qt4/src/poppler-embeddedfile.cc | 33 +++++++++++---------------------- + qt4/src/poppler-private.h | 1 - + 2 files changed, 11 insertions(+), 23 deletions(-) + +commit 5915e57e7785370ce305cbbb3c2fedf36886689f +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 10 03:19:18 2008 +0100 + + const & in foreach + + qt4/tests/poppler-fonts.cpp | 2 +- + qt4/tests/stress-poppler-dir.cpp | 2 +- + qt4/tests/stress-poppler-qt4.cpp | 2 +- + qt4/tests/test-password-qt4.cpp | 2 +- + qt4/tests/test-poppler-qt4.cpp | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +commit d8374e0c2eb3ba05be101687e20c5fcbc42c1ad0 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 10 01:32:24 2008 +0100 + + Include only what needed; remove extra includes. + + qt4/tests/poppler-attachments.cpp | 4 +++- + qt4/tests/poppler-fonts.cpp | 4 +++- + qt4/tests/stress-poppler-dir.cpp | 9 ++++++--- + qt4/tests/stress-poppler-qt4.cpp | 9 ++++++--- + qt4/tests/test-password-qt4.cpp | 10 ++++++---- + qt4/tests/test-poppler-qt4.cpp | 12 ++++++++---- + 6 files changed, 32 insertions(+), 16 deletions(-) + +commit fa01a1115c4554b18c3462b568d76860d2fbe17b +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 10 01:09:57 2008 +0100 + + Comment out unused vars. + + utils/pdftoabw.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit d3275e4263372b534c276f81d0c997ecb6675487 +Merge: c2186c18 5347a97e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 9 23:57:03 2008 +0100 + + Merge branch 'master' of + ssh://aacid@git.freedesktop.org/git/poppler/poppler + +commit c2186c1829c695c4ddb6c471ef8ad4ffa23c1b70 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 9 23:56:32 2008 +0100 + + Only check if we are out of bounds if the object we are searching + for has a known id (0 also means not known) + + Found by Michael Vrable + + poppler/Lexer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5347a97e39388ae38cf2ab9c67f953b0f7a02a13 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 9 18:26:41 2008 +0100 + + Add the operators for the flags we have. + + qt4/src/poppler-qt4.h | 3 +++ + 1 file changed, 3 insertions(+) + +commit 329ade4f936bf063539cdc887aaf9a1722a5b8e0 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 9 18:23:59 2008 +0100 + + Add options for the PDF export; add the WithChanges flag for saving + the changes to the document as well. + + qt4/src/poppler-pdf-converter.cc | 25 +++++++++++++++++++++++-- + qt4/src/poppler-qt4.h | 14 ++++++++++++++ + 2 files changed, 37 insertions(+), 2 deletions(-) + +commit afb255366d56551bdc307766199bef9c5021d3ac +Merge: 8c44b175 8cb0e752 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 9 17:58:49 2008 +0100 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit 8c44b175081983c492821858341109fee9e86b16 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 9 17:57:57 2008 +0100 + + Do not rely on GNU extensions, but at least use Qt. + + qt4/src/poppler-qiodeviceoutstream.cc | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +commit 8cb0e75203daa01439413d1a775482b48e784baa +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 9 17:56:13 2008 +0100 + + Domain order is x_min x_max y_min y_max and not x_min y_min x_max + y_max + + poppler/GfxState.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit c8f734ba4258059fa4521a4d364f62ca1632840b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 9 13:37:04 2008 +0100 + + PS cos and sin input values are degrees so convert to radians so we + can use the cos and sin cmath functions + + poppler/Function.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 5fb0c9d31c1abf2e6ad306c112fbd2a7c33d8772 +Merge: 26556636 2255c85e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 9 13:15:15 2008 +0100 + + Merge branch 'master' of + ssh://carlosgc@git.freedesktop.org/git/poppler/poppler + +commit 26556636e71d5abcbfdd1373f5576d1233532cf8 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Feb 9 13:14:41 2008 +0100 + + Add saveWithoutChangesAs method to be able to save the document + ignoring changes made in forms or annots + + glib/poppler-document.cc | 41 ++++++++++++++++++++++++++++++++++++++++- + glib/poppler-document.h | 3 +++ + poppler/PDFDoc.cc | 38 ++++++++++++++++++++++++++++++++------ + poppler/PDFDoc.h | 4 ++++ + 4 files changed, 79 insertions(+), 7 deletions(-) + +commit 2255c85e4939a0752083dca21984ff4398baf8d2 +Merge: 5ba92876 56c92460 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 9 12:49:45 2008 +0100 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit 5ba928762471e1ea8b81acd4644dfd3f58d18f77 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 9 12:48:04 2008 +0100 + + Fix placeholders in printf-like functions. + + glib/demo/page.c | 2 +- + glib/test-poppler-glib.cc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 56c924609223196c5c41b9e6d9102bc248bad947 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 9 12:26:06 2008 +0100 + + atan operator must yield a degrees result between 0 and 360 + + See testcase at http://bugs.kde.org/show_bug.cgi?id=157497 + + poppler/Function.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 2a39932ae35a2716842bd2a1c3d4f9ce6b1e3dd8 +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 9 01:31:20 2008 +0100 + + Few improvements to the password test. + + - QString::fromUtf8() instead of QFile::encodeName() to correctly + pass the utf8 filenames + - QVERIFY(!foo) instead of QCOMPARE(foo, false) + - QVERIFY() also the return value of unlock() + + qt4/tests/check_password.cpp | 31 ++++++++++++++++--------------- + 1 file changed, 16 insertions(+), 15 deletions(-) + +commit cc9c124d4d859b845eebf4ca1e4397870a35fd4e +Author: Pino Toscano <pino@kde.org> +Date: Sat Feb 9 01:09:02 2008 +0100 + + Add an unit test case for few invalid dates. + + qt4/tests/check_dateConversion.cpp | 34 + ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +commit eca91761741de5b340f7a2160db5b33401feb935 +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 8 18:42:14 2008 +0100 + + Remove unneeded headers. + + qt4/src/poppler-page.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 899627505a4645fb1cc7d3599adbeec449c57041 +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 8 18:41:13 2008 +0100 + + The return value is QString, so return QString's... + + qt4/src/poppler-document.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit a1606fa4ff438983e3a7f55dd2d10a66f72e6711 +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 8 17:31:32 2008 +0100 + + Move checkDocument() inside the private class. + + qt4/src/poppler-document.cc | 6 +++--- + qt4/src/poppler-private.h | 2 ++ + qt4/src/poppler-qt4.h | 2 +- + 3 files changed, 6 insertions(+), 4 deletions(-) + +commit f1ec70a83f807493dab5118761df31c0f67decad +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 8 17:26:41 2008 +0100 + + Remove C-ism. + + qt4/src/poppler-document.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3e994e8586fa1c87ef7e7f82af1cdacf2cd36310 +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 8 12:21:56 2008 +0100 + + Add the missing font types. + + qt4/src/poppler-fontinfo.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +commit ba07963f85d777a441349e23d4c2f510e45c73be +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 8 12:19:04 2008 +0100 + + Be safe against self-assignment. + + qt4/src/poppler-fontinfo.cc | 3 +++ + 1 file changed, 3 insertions(+) + +commit 834b86548e09f4b24cdb2f194299d053b9b55022 +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 8 12:15:16 2008 +0100 + + Small apidox fix. + + qt4/src/poppler-qt4.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 11a61eac5b8cde04bf762bbbe0deab5c0bd52951 +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 8 02:21:32 2008 +0100 + + Pack few bools together. + + qt4/src/poppler-annotation.cc | 8 ++++---- + qt4/src/poppler-link.cc | 10 +++++----- + qt4/src/poppler-private.h | 4 ++-- + 3 files changed, 11 insertions(+), 11 deletions(-) + +commit 1aeba15b5eb9b30943259824678ebc9e4f56e870 +Merge: a4890637 22d10c19 +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 8 01:39:16 2008 +0100 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit a4890637a2c2ab1623311d9a6920e82131c2597c +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 8 01:36:56 2008 +0100 + + Move QStringToUnicodeGooString() and QStringToGooString() to the + private module. + + qt4/src/poppler-document.cc | 10 ---------- + qt4/src/poppler-form.cc | 15 --------------- + qt4/src/poppler-private.cc | 25 +++++++++++++++++++++++++ + qt4/src/poppler-private.h | 4 ++++ + 4 files changed, 29 insertions(+), 25 deletions(-) + +commit 5e44241c4976b819f7be6badd2d183fbfb8ee6de +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 8 01:30:07 2008 +0100 + + Move the string functions implementation in a .cc file. + + qt4/src/CMakeLists.txt | 1 + + qt4/src/Makefile.am | 1 + + qt4/src/poppler-private.cc | 70 + ++++++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-private.h | 46 +++--------------------------- + 4 files changed, 76 insertions(+), 42 deletions(-) + +commit 124d92139241ad95da559d22af48254b45ac4a2e +Author: Pino Toscano <pino@kde.org> +Date: Fri Feb 8 01:07:43 2008 +0100 + + Include own header first, remove extra includes. + + qt4/src/poppler-document.cc | 1 - + qt4/src/poppler-embeddedfile.cc | 3 ++- + qt4/src/poppler-form.cc | 4 +++- + qt4/src/poppler-link-extractor-private.h | 2 ++ + qt4/src/poppler-link-extractor.cc | 7 +++++-- + qt4/src/poppler-page-private.h | 6 +++++- + qt4/src/poppler-private.h | 4 +++- + qt4/src/poppler-qt4.h | 2 -- + qt4/src/poppler-sound.cc | 4 ++-- + 9 files changed, 22 insertions(+), 11 deletions(-) + +commit 22d10c19e232dea143bda372c92aa12b999e4921 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Feb 7 23:38:50 2008 +0100 + + PDF spec says name tokens have a maximum length of 127, but there are + some docs in the wild with more than that and they work on acroread + so increase the allowed length to 128+127 + + poppler/Lexer.cc | 25 +++++++++++++++++++++---- + 1 file changed, 21 insertions(+), 4 deletions(-) + +commit ee9f85915feb86b54ace1a403baa13bbdd7c3966 +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 7 18:07:53 2008 +0100 + + Having a PageData is mandatory. + + Just assert when constructing instead of checking for it in each + link iteration. + + qt4/src/poppler-link-extractor.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit ad4b1361f6c25359e6ddb38599bfc1e4e3e80408 +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 7 18:03:30 2008 +0100 + + Precalc stuff we don't need to recalc in each link iteration. + + qt4/src/poppler-link-extractor-private.h | 3 ++- + qt4/src/poppler-link-extractor.cc | 14 ++++++++------ + 2 files changed, 10 insertions(+), 7 deletions(-) + +commit 82432dbc62a0879f4513640c2e0f594fda9347ad +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 7 17:51:50 2008 +0100 + + Store the ::Page internally, so we don't need to get it again + everytime. + + qt4/src/poppler-page-private.h | 3 +++ + qt4/src/poppler-page.cc | 37 ++++++++++++++----------------------- + 2 files changed, 17 insertions(+), 23 deletions(-) + +commit 8ec51f7ca518aa6a4a69f30d373722d05f50cf07 +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 7 16:48:16 2008 +0100 + + Compile the stress-poppler-dir test as well. + + qt4/tests/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +commit 8a946b76ae2e7c2c5238b4e580c1c226eb457dc9 +Author: Pino Toscano <pino@kde.org> +Date: Thu Feb 7 01:07:28 2008 +0100 + + Micro-touches to the debug messages. + + qt4/src/poppler-page.cc | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit c31990dfe50c7a0e3999e6d967699fce5ccb3339 +Merge: 7701e2a5 6d58cda8 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 5 00:38:00 2008 +0100 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit 7701e2a5c7d18fdaa0fa40c190e6ee0524746046 +Author: Pino Toscano <pino@kde.org> +Date: Tue Feb 5 00:37:01 2008 +0100 + + Add a AnnotColor -> QColor conversion method. + + qt4/src/poppler-annotation-helper.h | 6 ++++++ + qt4/src/poppler-annotation.cc | 31 +++++++++++++++++++++++++++++++ + 2 files changed, 37 insertions(+) + +commit 6d58cda82b0181f2cca6e9d95b15877793be0812 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Feb 4 23:33:51 2008 +0100 + + Protect us against weird dateString values + + qt4/src/poppler-document.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit aa0435f1544fe1adcf10173e34eaeaf2a7a703c7 +Merge: b43f4e9a 37600b5e +Author: Pino Toscano <pino@kde.org> +Date: Mon Feb 4 20:56:53 2008 +0100 + + Merge branch 'master' of + ssh://pino@git.freedesktop.org/git/poppler/poppler + +commit 37600b5e848386d2c92c3dff8219c9dda16b0dca +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sun Feb 3 22:42:51 2008 +0100 + + Minor changes to Annot related stuff. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 15 ++++----------- + poppler/Annot.h | 12 ++++++++++-- + poppler/Gfx.cc | 7 ++++--- + poppler/Page.cc | 9 +++++++++ + poppler/Page.h | 3 +++ + 5 files changed, 30 insertions(+), 16 deletions(-) + +commit b43f4e9a161a1fd7b827244dc21b1bd2a6df7054 +Author: Pino Toscano <pino@kde.org> +Date: Sun Feb 3 20:32:15 2008 +0100 + + Pass the DocumentData to the Page (simplify a bit some code). + + qt4/src/poppler-document.cc | 2 +- + qt4/src/poppler-link-extractor-private.h | 4 +- + qt4/src/poppler-link-extractor.cc | 8 ++-- + qt4/src/poppler-page-private.h | 4 +- + qt4/src/poppler-page.cc | 64 + ++++++++++++++++---------------- + qt4/src/poppler-qt4.h | 5 +-- + 6 files changed, 42 insertions(+), 45 deletions(-) + +commit 4e0bb0307fccefc21f74a4c5a3a0d7e8e687b550 +Author: Pino Toscano <pino@draco.(none)> +Date: Sat Feb 2 12:57:25 2008 +0100 + + Fix include guard. + + poppler/ArthurOutputDev.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 6f11ef660540fd13aad1350385beb90758ca86af +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Feb 1 23:55:37 2008 +0100 + + Fix for end condition, init ucode to 0 + + poppler/GfxFont.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 1da2091807ae7f7d4d3f446953c41b4c440d4b1b +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 31 23:52:20 2008 +0100 + + Ensure we don't draw outside the main bitmap on + SplashOutputDev::setSoftMask + + Fixes crash on http://bugs.kde.org/show_bug.cgi?id=157000 + + poppler/SplashOutputDev.cc | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit ecabc9469b137e8251344e5502de1cbf875223b9 +Author: Pino Toscano <pino@kde.org> +Date: Thu Jan 31 00:20:55 2008 +0100 + + Set RelWithDebInfo as default build type, if not specified. + + cmake/modules/PopplerMacros.cmake | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 19da87a20b3906523a330e3c956903a58a3ede7f +Author: Pino Toscano <pino@kde.org> +Date: Thu Jan 31 00:11:58 2008 +0100 + + Support the different CMake build modes. + + Now you can specify (using -DCMAKE_BUILD_TYPE=type) a CMake build + type to have GCC or ICC w/ tuned C(XX)FLAGS. + The supported build types are: None (as in no type is specified on + command line), RelWithDebInfo, Release, Debug, DebugFull, Profile. + + CMakeLists.txt | 7 ------- + cmake/modules/PopplerMacros.cmake | 29 +++++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+), 7 deletions(-) + +commit 37d2055137c310ceb217164a76814b188be3b1b2 +Author: Pino Toscano <pino@draco.(none)> +Date: Wed Jan 30 23:12:03 2008 +0100 + + Introduce the CMake-based build system. + + Mostly works nicely as the autotools, and it mimics (almost) all + the autotools behaviours. + Copied some scripts from the KDE cmake scripts (BSD-licensed). + TODO: gtk-doc. + + CMakeLists.txt | 390 +++++++ + ConfigureChecks.cmake | 47 + + cmake/modules/COPYING-CMAKE-SCRIPTS | 22 + + cmake/modules/FindCairo.cmake | 44 + + cmake/modules/FindFontconfig.cmake | 47 + + cmake/modules/FindFreetype.cmake | 74 ++ + cmake/modules/FindGTK.cmake | 70 ++ + cmake/modules/FindPackageHandleStandardArgs.cmake | 58 + + cmake/modules/FindQt3.cmake | 319 +++++ + cmake/modules/FindQt4.cmake | 1295 + +++++++++++++++++++++ + cmake/modules/MacroBoolTo01.cmake | 20 + + cmake/modules/MacroEnsureVersion.cmake | 117 ++ + cmake/modules/MacroOptionalFindPackage.cmake | 28 + + cmake/modules/MacroPushRequiredVars.cmake | 47 + + cmake/modules/PopplerDefaults.cmake | 10 + + cmake/modules/PopplerMacros.cmake | 83 ++ + config.h.cmake | 149 +++ + glib/CMakeLists.txt | 107 ++ + glib/demo/CMakeLists.txt | 17 + + glib/poppler-features.h.cmake | 24 + + poppler-cairo.pc.cmake | 9 + + poppler-config.h.cmake | 160 +++ + poppler-glib.pc.cmake | 13 + + poppler-qt.pc.cmake | 12 + + poppler-qt4.pc.cmake | 12 + + poppler-splash.pc.cmake | 9 + + poppler.pc.cmake | 11 + + qt/CMakeLists.txt | 33 + + qt4/CMakeLists.txt | 2 + + qt4/src/CMakeLists.txt | 43 + + qt4/tests/CMakeLists.txt | 47 + + test/CMakeLists.txt | 52 + + utils/CMakeLists.txt | 84 ++ + 33 files changed, 3455 insertions(+) + +commit 1ea831d3eee6eda35fadfb3c75962a0c708e6c7b +Author: Pino Toscano <pino@kde.org> +Date: Wed Jan 30 22:17:38 2008 +0100 + + Preprocessor #warning is GCC-specific. + + poppler/ArthurOutputDev.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 4c738cc6bd51f9d9e23ba83949c490c5c8691345 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 29 23:45:52 2008 +0100 + + Scale text to match 'm' size + + Fixes bug 12304 + + poppler/SplashOutputDev.cc | 37 +++++++++++++++++++++++++++++++ + splash/SplashFTFont.cc | 55 + +++++++++++++++++++++++++++++++++++++++++++++- + splash/SplashFTFont.h | 4 ++++ + splash/SplashFont.h | 4 ++++ + splash/SplashFontFile.cc | 1 + + splash/SplashFontFile.h | 2 ++ + 6 files changed, 102 insertions(+), 1 deletion(-) + +commit 64f16cf6ebf2870852fe8d937b25be58869ad40a +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 29 23:41:15 2008 +0100 + + Enable antialias by default on the test tool + + qt4/tests/test-poppler-qt4.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +commit 90f0e6bc1e96d9f1666cb8476a92e127f5b927d4 +Author: Jonathan Kew <jonathan_kew@sil.org> +Date: Tue Jan 29 20:23:08 2008 +0100 + + Provide gstrndup as a portable substitue of strndup + + configure.ac | 1 - + goo/gmem.cc | 7 +++++++ + goo/gmem.h | 5 +++++ + poppler/GfxFont.cc | 8 +------- + 4 files changed, 13 insertions(+), 8 deletions(-) + +commit 77b91c852ad3d5554afc03aee92a1d928f233401 +Merge: 0babb0eb 05336967 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jan 28 20:44:34 2008 +0100 + + Merge branch 'master' of + ssh://aacid@git.freedesktop.org/git/poppler/poppler + +commit 0babb0eb1afa343fb12a3fd037b98d2d1c794a1c +Author: Jonathan Kew <jonathan_kew@sil.org> +Date: Mon Jan 28 20:42:44 2008 +0100 + + Introduce a check for strndup and alternative for systems without it + + configure.ac | 1 + + poppler/GfxFont.cc | 6 ++++++ + 2 files changed, 7 insertions(+) + +commit 053369678963206a4afa88a614de1994872c7c5a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jan 27 19:36:28 2008 +0100 + + Add ok_to_fill_form permission flag + + glib/poppler-document.cc | 2 ++ + glib/poppler-document.h | 3 ++- + glib/test-poppler-glib.cc | 21 +++++++++++++++++++-- + 3 files changed, 23 insertions(+), 3 deletions(-) + +commit 3085a9495ad87a54758da0024372610fdaf88d57 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Jan 27 19:15:34 2008 +0100 + + Fix slice rendering in poppler glib demo + + glib/demo/render.c | 41 ++++++++++++++++++++++++----------------- + 1 file changed, 24 insertions(+), 17 deletions(-) + +commit 7ad6c4ba110b970516d5380444a03ae217496ddf +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 24 21:14:44 2008 +0100 + + Incrementing the iterator would be a good idea + + qt4/src/poppler-annotation.cc | 1 + + 1 file changed, 1 insertion(+) + +commit 7c99ec4635a4971321bbead7d1bc723da59b755e +Author: Julien Rebetez <julien@fhtagn.net> +Date: Thu Jan 24 19:18:15 2008 +0100 + + Revert unwanted change on Dict, fix leak on writeTrailer + + poppler/Dict.cc | 2 +- + poppler/PDFDoc.cc | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 2335fb6034d2e9ec304abba400119b88302b3160 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 23 23:26:20 2008 +0100 + + Draw underlined Links correctly + + See http://bugs.kde.org/show_bug.cgi?id=151359 for an example + + poppler/Gfx.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 96c532ea4b56a147de1deb965126e31f87df588b +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jan 23 13:30:12 2008 +0100 + + Fix memory leak + + poppler/Form.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 6bca64407c675ca837f83a12c0f655f975f14407 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jan 23 13:27:45 2008 +0100 + + Make sure default values are not loaded more than once for the + same widget. + + poppler/Form.cc | 18 +++++++++++++++++- + poppler/Form.h | 1 + + 2 files changed, 18 insertions(+), 1 deletion(-) + +commit eccf84b51a1cf5d478c0ec84be3fc9be8e458f4f +Author: Pino Toscano <pino@kde.org> +Date: Tue Jan 22 23:28:16 2008 +0100 + + Refactor the PSConverter and add a PDFConverter (for PDF export/save). + + Add an OutStream subclass to redirect the output to a QIODevice. + Split the PSConverter in a base class (BaseConverter) w/ d_ptr + structure. + Add a new PDFConverter that inherit BaseConverter, and do the + actual export + making use of the new QIODeviceOutStream. + The BaseConverter now handles automatically file or QIODevice output. + + qt4/src/Makefile.am | 5 + + qt4/src/poppler-base-converter.cc | 99 ++++++++++++++++ + qt4/src/poppler-converter-private.h | 48 ++++++++ + qt4/src/poppler-document.cc | 5 + + qt4/src/poppler-pdf-converter.cc | 68 +++++++++++ + qt4/src/poppler-ps-converter.cc | 162 + ++++++++++++--------------- + qt4/src/poppler-qiodeviceoutstream-private.h | 47 ++++++++ + qt4/src/poppler-qiodeviceoutstream.cc | 71 ++++++++++++ + qt4/src/poppler-qt4.h | 85 +++++++++++--- + 9 files changed, 483 insertions(+), 107 deletions(-) + +commit 547db8be1ab0b2987f0f06d8529eaaed2414028c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jan 22 13:22:20 2008 +0100 + + Fix a crash when createAnnot returns NULL due to invalid annot dict. + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0d558841142587d66bd3b2025e5a9ca39f7a6159 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jan 21 21:43:39 2008 +0100 + + Fix another reversed comparison due to cmp + + poppler/Annot.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cb6a87e39336e2e3893f3e5f577e4d176d237a9f +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Mon Jan 21 10:07:35 2008 +0100 + + Fixed a few compare issues with Annots. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +commit 7cf85dc8d7c895a211684c7d36757063ed4f469b +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Mon Jan 21 21:27:49 2008 +0100 + + The glade file needs to be distributed + + test/Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 46e93d31dd9b5909ecd8f7a8f8de23329444a7bc +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Sun Jan 20 19:56:51 2008 +0100 + + we need time.h if we use time() + + poppler/PDFDoc.cc | 1 + + 1 file changed, 1 insertion(+) + +commit a0adb006c38ea07f010a01d9c0bb07ca0f48939d +Author: Pino Toscano <pino@kde.org> +Date: Sun Jan 20 19:55:55 2008 +0100 + + Added a saveAs() overload which takes a plain OutStream + + poppler/PDFDoc.cc | 9 +++++++-- + poppler/PDFDoc.h | 2 ++ + 2 files changed, 9 insertions(+), 2 deletions(-) + +commit fcdd5c51f370d040ae57aa64801c9bd4dbe88752 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jan 19 18:00:10 2008 +0100 + + Do not render images when getting the image mapping, it can be done + later on demand. + + glib/poppler-page.cc | 81 +++++++++++++++------------- + glib/poppler-page.h | 6 ++- + poppler/CairoOutputDev.cc | 131 + ++++++++++++++++++++++++++-------------------- + poppler/CairoOutputDev.h | 12 ++++- + 4 files changed, 135 insertions(+), 95 deletions(-) + +commit 37ae465775d9a53e7c06cf51aa215439214fd79c +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Sat Jan 19 14:00:31 2008 +0100 + + ignore pdf-fullrewrite binary + + test/.gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 1d160935ea4c1116b745c584ed7f1fd03fbbfb46 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sat Jan 19 13:59:46 2008 +0100 + + AnnotWidget support and few fixes + + poppler/Annot.cc | 243 + ++++++++++++++++++++++++++++++++++++++++++++++++++++--- + poppler/Annot.h | 142 +++++++++++++++++++++++++++++--- + 2 files changed, 365 insertions(+), 20 deletions(-) + +commit 0e91a3973e525d65236d15930a8ea0e5bbb6a6cc +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sat Jan 19 13:59:25 2008 +0100 + + AnnotTextMarkup support and improved AnnotQuadrilaterals + + poppler/Annot.cc | 356 + ++++++++++++++++++++++++++++++++++++++++++++----------- + poppler/Annot.h | 130 +++++++++++++++++--- + 2 files changed, 400 insertions(+), 86 deletions(-) + +commit c13952cd56a40bad14a1bf28699b137f65162f10 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sat Jan 19 13:59:02 2008 +0100 + + Changed AnnotQuadrilateral parsing inside AnnotLink + + poppler/Annot.cc | 246 + ++++++++++++++++++++++++++++++------------------------- + poppler/Annot.h | 19 +++-- + 2 files changed, 144 insertions(+), 121 deletions(-) + +commit 2f821f10fbbba9363405201c86494cd861cec2b2 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sat Jan 19 13:49:43 2008 +0100 + + Add AnnotQuadPoints class + + poppler/Annot.cc | 16 ++++++++++++++++ + poppler/Annot.h | 23 +++++++++++++++++++++++ + 2 files changed, 39 insertions(+) + +commit de4c8fa6607e55c199bede1dc731227692ef4f53 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sun Dec 30 21:21:56 2007 +0100 + + AnnotFreeText support. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 232 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++- + poppler/Annot.h | 127 ++++++++++++++++++++++++++++++ + 2 files changed, 358 insertions(+), 1 deletion(-) + +commit c3504a87933ae1516b1ef05e527fd1c039091235 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Sun Dec 30 19:37:18 2007 +0100 + + Improved AnnotLink support. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 116 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 51 ++++++++++++++++++++++++ + 2 files changed, 167 insertions(+) + +commit a20468cc38bb590124b2b028a08f364f90f2487f +Author: Julien Rebetez <julien@fhtagn.net> +Date: Sat Jan 19 13:02:17 2008 +0100 + + Adds a test application to test full rewrite functionnality. + + test/Makefile.am | 11 ++++++++++- + test/pdf-fullrewrite.cc | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 54 insertions(+), 1 deletion(-) + +commit 246294714c6011651fd0e5b3649bd65919058c72 +Author: Julien Rebetez <julien@fhtagn.net> +Date: Sat Jan 19 12:59:03 2008 +0100 + + FormWidget's 'modified' member variable is now updated correctly + each time an update is done. + + Before, only text FormWidget had their 'modified' field set to 'true' + if they had been updated. + It is now the case for the other type of FormWidgets. + + poppler/Form.cc | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 6e0f297b8b17afb95779724b8618ca39016e664a +Author: Julien Rebetez <julien@fhtagn.net> +Date: Sat Jan 19 12:54:09 2008 +0100 + + Annot will save their generated appearance in their AP dict. + + poppler/Annot.cc | 42 ++++++++++++++++++++++++++++++++++++++---- + poppler/Annot.h | 1 + + 2 files changed, 39 insertions(+), 4 deletions(-) + +commit e20f6a8e9ac3936b4bc03710a71fe390dfc4c094 +Author: Julien Rebetez <julien@fhtagn.net> +Date: Sat Jan 19 12:52:02 2008 +0100 + + Add deep copy constructor to Dict. + + poppler/Dict.cc | 14 +++++++++++++- + poppler/Dict.h | 1 + + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit e8d46cab77c7167edb0896296118daafc0f13b6d +Author: Julien Rebetez <julien@fhtagn.net> +Date: Sat Jan 19 12:51:44 2008 +0100 + + Adds the ability to save PDF using either incremental update or by + rewriting completly the PDF. + + poppler/PDFDoc.cc | 379 + +++++++++++++++++++++++++++++++++++++++++++++++++++++- + poppler/PDFDoc.h | 18 ++- + poppler/XRef.cc | 12 +- + poppler/XRef.h | 3 +- + 4 files changed, 402 insertions(+), 10 deletions(-) + +commit 742b0c3dec01d8672b84f56d5bb0e2890b178594 +Author: Julien Rebetez <julien@fhtagn.net> +Date: Sat Jan 19 12:51:27 2008 +0100 + + Make the md5 method of Decrypt public so it can be used by other + files. + + poppler/Decrypt.cc | 5 ++--- + poppler/Decrypt.h | 1 + + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit bb7867976740dea259d4110c072552fc5953910f +Author: Julien Rebetez <julien@fhtagn.net> +Date: Sat Jan 19 12:51:07 2008 +0100 + + Modify the writeToFile method of XRef so it uses OutStream instead + of a C file descriptor. + + poppler/XRef.cc | 10 +++++----- + poppler/XRef.h | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit d80736587fdbc0e163077f27bfd21c5e3a7fa4c7 +Author: Julien Rebetez <julien@fhtagn.net> +Date: Sat Jan 19 12:50:49 2008 +0100 + + Adds addIndirectObject method to XRef. This method allow the creation + of new indirect objects. + + poppler/XRef.cc | 39 +++++++++++++++++++++++++++++++++++++++ + poppler/XRef.h | 1 + + 2 files changed, 40 insertions(+) + +commit 8bd00dd0872191b8806e9411d9a1adc441f08a47 +Author: Julien Rebetez <julien@fhtagn.net> +Date: Sat Jan 19 12:50:16 2008 +0100 + + Add some unfiltered methods to input stream. + + With these methods, it is possible to read the raw content from the + stream, without any filtering (even not the headers). + + poppler/Stream.cc | 41 ++++++++++++++++++++++++++++------------- + poppler/Stream.h | 26 ++++++++++++++++++++++++++ + 2 files changed, 54 insertions(+), 13 deletions(-) + +commit 8bcda287ddd316f90b3e47a3a307fbe63a5c21f7 +Author: Julien Rebetez <julien@fhtagn.net> +Date: Sat Jan 19 12:46:53 2008 +0100 + + Add setNeedFree method to MemStream so it is possible to choose if + the stream should take care of deleting the buffer. + + poppler/Stream.h | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 4fbd143de7e3a8ab386dd14b057e62b3b9fe04e4 +Author: Julien Rebetez <julien@fhtagn.net> +Date: Sat Jan 19 12:45:54 2008 +0100 + + Add Outstream, a base class for output streams and FileOutStream, + which implements OutStream for output to a file. + + poppler/Stream.cc | 55 +++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Stream.h | 64 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 119 insertions(+) + +commit 696eaa47169fb063b7e6998c876926c578b6fbfa +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jan 17 15:56:59 2008 +0100 + + Fix a crash when editing text form fields + + poppler/Annot.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 9ec1b28dcdade12498b94b650c26483581294ee6 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jan 17 14:54:34 2008 +0100 + + Fix a crash when a form field contains reference to non existant + children + + poppler/Form.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit f7ed40c465033bad26dfda008c5984954baa0607 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jan 16 21:01:50 2008 +0100 + + Add a cast to fix build + + glib/demo/info.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 1c0aa21e598b879ec49d96700e6438ccb8ac2283 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Fri Jan 11 20:28:49 2008 +0100 + + rename info.c to info.cc to fix bug 14024 + + glib/demo/Makefile.am | 2 +- + glib/demo/{info.c => info.cc} | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 88f8bf850b6c41d25b9576597b5fc5bd75a122f4 +Author: Kjartan Maraas <kmaraas@gnome.org> +Date: Thu Jan 10 23:51:54 2008 +0100 + + Fix two use after free bugs in HtmlOutputDev.cc + + utils/HtmlOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 348f4f9d9d5b0f91da6f46e0fcefec80255d4179 +Merge: 8a8a4f01 4eca2e04 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Sat Jan 5 23:03:06 2008 +0100 + + Merge branch 'master' of + ssh://aacid@git.freedesktop.org/git/poppler/poppler + +commit 8a8a4f01272fb86898fafbda07129c0cbc03d527 +Author: Pino Toscano <pino@kde.org> +Date: Sat Jan 5 23:02:22 2008 +0100 + + Make Document::renderHints return the correct render hints + + qt4/src/poppler-document.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4eca2e041c93349e0c4666e83ad1ca3caff91dee +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jan 1 14:34:00 2008 +0100 + + Add page transitions demo + + glib/demo/Makefile.am | 2 + + glib/demo/main.c | 16 +-- + glib/demo/transitions.c | 321 + ++++++++++++++++++++++++++++++++++++++++++++++++ + glib/demo/transitions.h | 31 +++++ + 4 files changed, 363 insertions(+), 7 deletions(-) + +commit e92b50bbd3dfc8657b611e3c33129d7c5bae2319 +Author: Koji Otani <sho@bbr.jp> +Date: Wed Dec 26 18:56:01 2007 +0100 + + Use getEmbeddedFontID instead of getEmbeddedFontName to check if a + font is embedded or not + + poppler/GfxFont.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 30e9bae97e3742913015f7ea46636b2b80937612 +Author: Ed Catmur <ed@catmur.co.uk> +Date: Sat Dec 22 22:54:51 2007 +0100 + + Fixlets for Adobe Glyph Naming convention implementation + + poppler/GfxFont.cc | 94 + ++++++++++++++++++++++++++++-------------------------- + 1 file changed, 48 insertions(+), 46 deletions(-) + +commit 40551e616b007ceb15c9d6e3d77c24538ffec924 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Sat Dec 22 14:31:50 2007 +0100 + + Check the destination page of the link does exist + + qt4/src/poppler-link.cc | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +commit c06d6f2236d854f05e7621be280109ff27dc73b9 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Thu Dec 20 20:13:08 2007 +0100 + + Use UnicodeParsedString that does exactly what this code does + + qt4/src/poppler-document.cc | 28 +--------------------------- + 1 file changed, 1 insertion(+), 27 deletions(-) + +commit 5f9f06a10fdb72a9d809ee1f779e1a8f549840e7 +Author: Koji Otani <sho@bbr.jp> +Date: Thu Dec 20 19:59:26 2007 +0100 + + Fix for latest CJK code + + See + http://lists.freedesktop.org/archives/poppler/2007-December/003244.html + for more information + + poppler/GfxFont.cc | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +commit bb49e1e3909fc7392c197dc67d9b7f5312fd0dad +Author: Ed Catmur <ed@catmur.co.uk> +Date: Tue Dec 18 20:20:11 2007 +0100 + + Implement Adobe Glyph Naming convention + + poppler/GfxFont.cc | 183 + ++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 154 insertions(+), 29 deletions(-) + +commit 5634d63abdd64d371f2e8687a1c172f55b052008 +Author: Koji Otani <sho@bbr.jp> +Date: Mon Dec 17 20:43:41 2007 +0100 + + Allow seting some more Graphics States (Font, LW, LC, LJ, ML, D, + RI, FL) by operator 'gs' + + poppler/Gfx.cc | 67 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 67 insertions(+) + +commit 7a9e7fc96b47b9d833300233ac38bbd60097f425 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Dec 16 21:21:08 2007 +0100 + + Add AnnotLink class so that link annots are properly recognized + + Right now, all of the annots except Text, are created using the + base class Annot which sets the type to unknown. For link annots this + causes the border never be drawn, since we are checking first + whether the + annot is a Link and it's always false. + + poppler/Annot.cc | 12 +++++++++++- + poppler/Annot.h | 10 ++++++++++ + 2 files changed, 21 insertions(+), 1 deletion(-) + +commit 796d9cb9b188a8af69d7fbf9bccbb408cbf6a71a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Dec 15 15:21:49 2007 +0100 + + Fix a crash when trying to create a temp annot with catalog = NULL + + poppler/Annot.cc | 7 +++++++ + poppler/Annot.h | 1 + + poppler/Form.cc | 6 ++---- + 3 files changed, 10 insertions(+), 4 deletions(-) + +commit 99f049f0dfbfd9c22bea56ae96253837ae421e23 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Dec 14 15:26:24 2007 +0100 + + Use the default dash array when it's not correct in AnnotBorderBS + + poppler/Annot.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit cb2a997aa6f9dd5508ca8b04e63815da893497ef +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Dec 14 14:12:14 2007 +0100 + + Fix another crash due to uninitialized variables + + poppler/Annot.cc | 18 ++++++++---------- + poppler/Annot.h | 1 + + 2 files changed, 9 insertions(+), 10 deletions(-) + +commit f704e86d8c72bacbd9443c4d828cd284d3a11753 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Dec 14 12:58:12 2007 +0100 + + Fix several crashes due to uninitialized variables in Annots. + + poppler/Annot.cc | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit 0820a93ba1c0e893681024feb9f9bd120a9eeb4d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Dec 14 12:38:58 2007 +0100 + + Check whether top and left should be changed in FitH, FitV, FitBH + and FitBV destinations + + According to the spec, if a null value is specified for top or left + parameter in such + destinations, the parameter should be retained unchanged. + + poppler/Link.cc | 36 ++++++++++++++++++++++++++++-------- + 1 file changed, 28 insertions(+), 8 deletions(-) + +commit 0fb42a2f557d5ec83b42326eb6b0be41622ca328 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Wed Dec 12 01:02:31 2007 +0100 + + Changed getters to const + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 28 +++++++++++----------- + poppler/Annot.h | 72 + ++++++++++++++++++++++++++++---------------------------- + 2 files changed, 50 insertions(+), 50 deletions(-) + +commit 29d39a8ae120e6045a16a7aa0944c36560b42508 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Mon Dec 10 17:56:44 2007 +0100 + + AnnotText support. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 123 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++- + poppler/Annot.h | 65 ++++++++++++++++++++++++----- + 2 files changed, 177 insertions(+), 11 deletions(-) + +commit 2acecde458122bd67487cc302478befa78bf6fbe +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Mon Dec 10 16:45:46 2007 +0100 + + AnnotMarkup support. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 115 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 51 ++++++++++++++++++++++++ + 2 files changed, 166 insertions(+) + +commit 1f8c1fe34e04688d2ba200f1166cfdd1ffe563f0 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Mon Dec 10 16:34:01 2007 +0100 + + AnnotPopup support. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 34 ++++++++++++++++++++++++++++++++++ + poppler/Annot.h | 21 +++++++++++++++++++++ + 2 files changed, 55 insertions(+) + +commit 6c83e06fb2eb77d0dbefd1ebfbcac3e5f0cbb622 +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Mon Dec 10 16:24:38 2007 +0100 + + Prepare code to Annotation Subtype support. + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + glib/poppler-page.cc | 11 +--- + poppler/Annot.cc | 160 + ++++++++++++++++++++++++++++++++++++--------------- + poppler/Annot.h | 54 ++++++++++++++--- + poppler/Form.cc | 6 +- + 4 files changed, 167 insertions(+), 64 deletions(-) + +commit fa0bb5bbea5bf2769c8b3084f78770b7781002eb +Author: Iñigo Martínez <inigomartinez@gmail.com> +Date: Mon Dec 10 15:41:38 2007 +0100 + + Various Annot improvements + + Signed-off-by: Iñigo Martínez <inigomartinez@gmail.com> + + poppler/Annot.cc | 613 + ++++++++++++++++++++++++++++++++++++------------------- + poppler/Annot.h | 140 +++++++++++-- + poppler/Gfx.cc | 21 +- + poppler/Gfx.h | 5 +- + 4 files changed, 543 insertions(+), 236 deletions(-) + +commit e0f49fd5aef3c798798ad7e7dba55857bde1b4c0 +Author: Koji Otani <sho@bbr.jp> +Date: Thu Dec 13 23:40:46 2007 +0100 + + Some CJK charecters are displayed vertical glyphs incorrectly when + horizontal mode + + poppler/GfxFont.cc | 46 +++++++++++++++++++++++++--------------------- + 1 file changed, 25 insertions(+), 21 deletions(-) + +commit 85901922bf354a1268037d0b6ec5cbf14da979a1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Dec 13 23:30:59 2007 +0100 + + Yet another gmallocn to gmallocn_checkoverflow + + Fixes http://bugs.kde.org/show_bug.cgi?id=153949 + + poppler/SplashOutputDev.cc | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +commit f24259cddb9c5e02cf9d2071bfa0106f3e88bd59 +Author: Koji Otani <sho@bbr.jp> +Date: Mon Dec 10 23:24:14 2007 +0100 + + Display characters outside of unicode BMP with TT font + + fofi/FoFiTrueType.cc | 33 ++++++++++++++++++++--- + fofi/FoFiTrueType.h | 2 +- + poppler/CMap.cc | 34 ++++++++++++++++++++++++ + poppler/CMap.h | 4 +++ + poppler/GfxFont.cc | 75 + ++++++++++++++++++++++++++++++++-------------------- + 5 files changed, 115 insertions(+), 33 deletions(-) + +commit 7cbabbf378cf5a9c0411558ff02b44dec2040ea1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Dec 10 22:00:30 2007 +0100 + + Fix a crash when marked content properties operator is not a dict. + + poppler/Gfx.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e807f9c72c7f0c5cc0655918f676f4af54739442 +Merge: bf57117d e2ea7430 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 9 18:07:30 2007 +0100 + + Merge branch 'master' of + ssh://aacid@git.freedesktop.org/git/poppler/poppler + +commit bf57117df8786778faf31e5d843533004f867ff3 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sun Dec 9 18:07:00 2007 +0100 + + Add support for ActualText entries + + Patch by Adrian Johnson with two minor changes by me (one fordward + declaration and a leak fix) + + poppler/Form.cc | 2 +- + poppler/Gfx.cc | 2 +- + poppler/OutputDev.cc | 2 +- + poppler/OutputDev.h | 2 +- + poppler/PDFDocEncoding.h | 4 ++ + poppler/TextOutputDev.cc | 98 + +++++++++++++++++++++++++++++++++++++++++++++++- + poppler/TextOutputDev.h | 11 ++++++ + 7 files changed, 116 insertions(+), 5 deletions(-) + +commit e2ea7430e7d6db50cbfdac34713915e5b0942a89 +Author: Albert Astals Cid <tsdgeos@localhost.(none)> +Date: Sat Dec 8 23:21:34 2007 +0100 + + disable warnings about assigning const char * to char * + + We have them all over the place and we are not going to fix it as + that'll be too much overhead when re-merging xpdf changes + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit acf70c666d4f534cd97de64d4378bf6399e31fd4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Dec 6 23:58:26 2007 +0100 + + Disable gtk tests if the user disabled glib frontend + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit bb0ec68f21d355081ff75aad641bc3809141e398 +Merge: 5a34cddf b925ea23 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Dec 6 18:38:54 2007 +0100 + + Merge branch 'master' of + ssh://aacid@git.freedesktop.org/git/poppler/poppler + +commit b925ea232b6ed5028712600f9aebe453f3b2ba06 +Author: Brad Hards <bradh@kde.org> +Date: Tue Dec 4 19:11:13 2007 +1100 + + Remove redundant check. + + poppler/PSOutputDev.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 275afca4ef24020273df652ccfdf76c6994e9294 +Author: Brad Hards <bradh@kde.org> +Date: Sun Dec 2 19:45:16 2007 +1100 + + Preserve PDF page labels when we output as postscript. + + Resolves bug 13338. + + poppler/PSOutputDev.cc | 81 + +++++++++++++++++++++++++++++++++++++++++++++++++- + poppler/PSOutputDev.h | 2 ++ + 2 files changed, 82 insertions(+), 1 deletion(-) + +commit 641edb83a457083c13f3e374f6ac6c570dd54d7f +Author: Brad Hards <bradh@kde.org> +Date: Wed Nov 28 19:42:53 2007 +1100 + + Minor API documentation update + + qt4/src/poppler-annotation.h | 81 + ++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 79 insertions(+), 2 deletions(-) + +commit 3635ec6fcbc89daf633c03efb644df9031b80f59 +Author: Brad Hards <bradh@kde.org> +Date: Wed Nov 28 19:42:22 2007 +1100 + + Update doxygen configuration file to version 1.5.3 + + qt4/src/Doxyfile | 185 + ++++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 141 insertions(+), 44 deletions(-) + +commit 02c7ea6e1fd3e225de1eda231813f4db0ffb9fdb +Author: Brad Hards <bradh@kde.org> +Date: Wed Nov 28 19:41:54 2007 +1100 + + Fix off-by-one in printCommands path. + + poppler/Gfx.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 74af7c1209f47ed39addf7fde3ea106a7c77a408 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Nov 24 18:12:00 2007 +0100 + + Convert passwords from utf-8 to latin-1 when needed. Fixes bug #4557 + + glib/poppler-document.cc | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +commit 5a34cddf043cb484549cb411e034786a7d8688a3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Nov 23 23:13:57 2007 +0100 + + add a ignore + + glib/demo/.gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit 21a58562cc1e575ec3d81b6e34bfcb21306eb67f +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Nov 23 23:12:06 2007 +0100 + + sscanf does not like null strings, so don't call it on empty qstrings + + qt/poppler-document.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6f8451cf9d19f57f658d1568643ecb0f953e1075 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Nov 11 21:29:40 2007 -0500 + + Add support for knockout groups to the cairo backend + + This is sort of hacky because we need to keep track of shape and + opacity + seperately. It is also probably not entirely correct. However, + it should be + closer than previously. + + poppler/CairoOutputDev.cc | 309 + ++++++++++++++++++++++++++++++++++++++++++++-- + poppler/CairoOutputDev.h | 8 +- + 2 files changed, 303 insertions(+), 14 deletions(-) + +commit b0fbfb0ac366434d7e4c0350a9be83ddda7b03cf +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Nov 11 16:06:16 2007 -0500 + + Track the AlphaIsShape and TextKnockout state + + Parse, store and notify the OutputDevices about these entries. + + poppler/Gfx.cc | 14 ++++++++++++++ + poppler/GfxState.h | 6 ++++++ + poppler/OutputDev.h | 2 ++ + 3 files changed, 22 insertions(+) + +commit f6429b13a972f2deb25b3d3a9948dca024a54841 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Nov 10 14:08:09 2007 -0500 + + Fix accidental mode change. + + poppler/CairoFontEngine.cc | 0 + poppler/CairoOutputDev.cc | 0 + 2 files changed, 0 insertions(+), 0 deletions(-) + +commit 5797f50a99d1494767edc5928f9c3e9d927b946d +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Nov 10 01:52:00 2007 -0500 + + Scale text to match 'm' size + + This adds back the hack that was removed when fontconfig support + was added long + ago. It's not a great solution but lets us be at least as good as + xpdf. Fixes + #12304 with the cairo backend. The problem persists with the splash + backend. + + poppler/CairoFontEngine.cc | 56 + +++++++++++++++++++++++++++++++++++++++++++--- + poppler/CairoFontEngine.h | 7 +++++- + poppler/CairoOutputDev.cc | 8 +++++-- + 3 files changed, 65 insertions(+), 6 deletions(-) + +commit 551212e55127c7e46d9aff3318015fd9b5385687 +Author: Brad Hards <bradh@frogmouth.net> +Date: Sat Nov 10 11:56:15 2007 +0100 + + Fix uninitialized variable access + + Supported by Derek B. Noonburg + + poppler/GfxState.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 934a5ae45eb17bd0e2010be89f55510e8a69816b +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Nov 3 13:08:51 2007 -0400 + + Avoiding using floating point when converting to luminance. + + The code now also does proper rounding instead of just truncating. + + poppler/CairoOutputDev.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 1b3f045a25e5d172357bc87c15ba591c8e1511a7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Nov 8 23:34:07 2007 +0100 + + Move another gmallocn to gmallocn_checkoverflow. Fixes crashes on + incorrect pdf sent by Red Hat + + poppler/Stream.cc | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +commit 944d327fd7036332a33b4ad6476ceca7a650ef6e +Merge: fb1d1f45 c340255f +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 7 23:52:47 2007 +0100 + + Merge branch 'master' of + ssh://aacid@git.freedesktop.org/git/poppler/poppler + +commit fb1d1f459784a6c19034212a617268f7f5a90e9c +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 7 23:51:58 2007 +0100 + + merge ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch + + poppler/Stream.cc | 417 + +++++++++++++++++++++++++++++++----------------------- + poppler/Stream.h | 10 +- + 2 files changed, 245 insertions(+), 182 deletions(-) + +commit c340255f46bc95b5f850abcd3d9bcdc8594199bb +Author: Brad Hards <bradh@kde.org> +Date: Mon Nov 5 20:36:23 2007 +1100 + + Update .gitignore + + Suppress the noise a bit. + + qt4/.gitignore | 1 + + qt4/tests/.gitignore | 3 +++ + test/.gitignore | 2 ++ + 3 files changed, 6 insertions(+) + +commit cebf770379e7d71166e729aebf771a4ca291d48b +Author: Brad Hards <bradh@kde.org> +Date: Mon Nov 5 20:31:18 2007 +1100 + + Add a new unit test, for non-ASCII searching. + + There is a bug report (bug:7063) about not being able + to find text that isn't ASCII. I think that the problem isn't + in poppler core code - this unit test shows we can find + characters as long as they are properly encoded (which the + Qt4 front end does). + + qt4/tests/Makefile.am | 7 ++++++- + qt4/tests/check_search.cpp | 40 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 46 insertions(+), 1 deletion(-) + +commit 570fe464a2aae4f22d0b47cce73b8bc36b116e9f +Merge: 1c7b7a0c 78750679 +Author: Brad Hards <bradh@kde.org> +Date: Mon Nov 5 15:55:39 2007 +1100 + + Merge branch 'minor-fixes' + +commit 78750679e213d7307cce38166b6af32562e871b8 +Author: Brad Hards <bradh@kde.org> +Date: Mon Nov 5 15:54:36 2007 +1100 + + Additional check for password protected documents + + We need to bail out on locked documents. In the future, + we could probably go interactive, and ask the user for + a password. + + qt4/tests/test-poppler-qt4.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 1c7b7a0c581b542945cac257202bbb819d33694c +Author: Brad Hards <bradh@kde.org> +Date: Mon Nov 5 15:49:45 2007 +1100 + + Minor Qt4 API documentation fix + + Also, this is a test of my git newbie-ness. + + qt4/src/poppler-form.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit b86fc565d175835cf27e9c8632da47a5e0b50237 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Nov 5 00:14:55 2007 +0100 + + Fix FSF address + + glib/demo/fonts.c | 2 +- + glib/demo/fonts.h | 2 +- + glib/demo/forms.c | 2 +- + glib/demo/forms.h | 2 +- + glib/demo/info.c | 2 +- + glib/demo/info.h | 2 +- + glib/demo/links.c | 2 +- + glib/demo/links.h | 2 +- + glib/demo/main.c | 2 +- + glib/demo/outline.c | 2 +- + glib/demo/outline.h | 2 +- + glib/demo/page.c | 2 +- + glib/demo/page.h | 2 +- + glib/demo/render.c | 2 +- + glib/demo/render.h | 2 +- + glib/demo/utils.c | 2 +- + glib/demo/utils.h | 2 +- + glib/poppler-action.cc | 2 +- + glib/poppler-action.h | 2 +- + glib/poppler-attachment.cc | 2 +- + glib/poppler-attachment.h | 2 +- + glib/poppler-document.cc | 2 +- + glib/poppler-document.h | 2 +- + glib/poppler-features.h.in | 2 +- + glib/poppler-form-field.cc | 2 +- + glib/poppler-form-field.h | 2 +- + glib/poppler-page.cc | 2 +- + glib/poppler-page.h | 2 +- + glib/poppler.cc | 2 +- + glib/poppler.h | 2 +- + poppler/PageTransition.cc | 2 +- + poppler/Sound.cc | 2 +- + poppler/Sound.h | 2 +- + qt/poppler-document.cc | 2 +- + qt/poppler-fontinfo.cc | 2 +- + qt/poppler-link-qt3.h | 2 +- + qt/poppler-link.cc | 2 +- + qt/poppler-page-transition-private.h | 2 +- + qt/poppler-page-transition.cc | 2 +- + qt/poppler-page-transition.h | 2 +- + qt/poppler-page.cc | 2 +- + qt/poppler-private.h | 2 +- + qt/poppler-qt.h | 2 +- + qt4/src/poppler-annotation-helper.h | 2 +- + qt4/src/poppler-annotation-private.h | 2 +- + qt4/src/poppler-annotation.cc | 2 +- + qt4/src/poppler-annotation.h | 2 +- + qt4/src/poppler-document.cc | 2 +- + qt4/src/poppler-embeddedfile.cc | 2 +- + qt4/src/poppler-fontinfo.cc | 2 +- + qt4/src/poppler-form.cc | 2 +- + qt4/src/poppler-form.h | 2 +- + qt4/src/poppler-link-extractor-private.h | 2 +- + qt4/src/poppler-link-extractor.cc | 2 +- + qt4/src/poppler-link.cc | 2 +- + qt4/src/poppler-link.h | 2 +- + qt4/src/poppler-page-private.h | 2 +- + qt4/src/poppler-page.cc | 2 +- + qt4/src/poppler-private.h | 2 +- + qt4/src/poppler-ps-converter.cc | 2 +- + qt4/src/poppler-qt4.h | 2 +- + qt4/src/poppler-sound.cc | 2 +- + qt4/src/poppler-textbox.cc | 2 +- + 63 files changed, 63 insertions(+), 63 deletions(-) + +commit 37776afc6f8a5733b41da6fb0f45e7ace4edf737 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Nov 5 00:03:55 2007 +0100 + + Update from http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt + + COPYING | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +commit 34a90b35998b65539cf1e8f09194d45db71064a1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 4 14:03:35 2007 +0100 + + Remove duplicate checking + + poppler/JBIG2Stream.cc | 8 -------- + 1 file changed, 8 deletions(-) + +commit d694e1dd042fb97fbc62046b69cafe30d6f9ea58 +Merge: ba5b31c6 432e657a +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 4 13:26:47 2007 +0100 + + Merge branch 'master' of + ssh://aacid@git.freedesktop.org/git/poppler/poppler + +commit ba5b31c6a8b2317332bfa148f6d80f66891fb9ce +Author: Brad Hards <bradh@frogmouth.net> +Date: Sun Nov 4 13:25:12 2007 +0100 + + Require fontconfig >= 2.0 Fixes bug 9020 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 432e657a49cb097638a79e38c141088039572816 +Author: Jeff Muizelaar <jeff@freiheit.infidigm.net> +Date: Mon Sep 17 19:15:21 2007 -0400 + + Use realloc/free instead of new/delete when resizing GooStrings + + This allows for a large performance improvement when appending a + large number + of characters to a GooString. This is especially helpful for + TextOutputDev on + large PDFs. For example, the following code has the potential to be + O(n) instead of + O(n²) with a good implementation of realloc. + + while (n) { + string.append(character); + n--; + } + + goo/GooString.cc | 30 +++++++++++++++++------------- + 1 file changed, 17 insertions(+), 13 deletions(-) + +commit cb80112afed2c5b9642c3c43f1cc001ed88d08cb +Author: Jonathan Kew <jonathan_kew@sil.org> +Date: Thu Nov 1 20:53:05 2007 +0100 + + Do not try to parse directories when processing nameToUnicode + dir. Fixes ugly warnings on mingw32 + + poppler/GlobalParams.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit ad6b888edff7b30be72df948c4052b9934a37705 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Thu Nov 1 20:48:21 2007 +0100 + + Add some castings to make it compile + + glib/test-poppler-glib.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit a968dcc759379f48265c91bea63ca4cf987d94a9 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Wed Oct 31 23:53:39 2007 +0100 + + Tests for passwords + + qt4/tests/Makefile.am | 13 +++++- + qt4/tests/check_password.cpp | 87 + ++++++++++++++++++++++++++++++++++++++++ + qt4/tests/stress-poppler-dir.cpp | 63 +++++++++++++++++++++++++++++ + qt4/tests/test-poppler-qt4.cpp | 15 ++++++- + 4 files changed, 175 insertions(+), 3 deletions(-) + +commit 7b7a08863a8278dee7aa1fe7789cf72223c26b35 +Author: Brad Hards <bradh@frogmouth.net> +Date: Wed Oct 31 23:53:27 2007 +0100 + + Improve documentation + + qt4/src/poppler-qt4.h | 64 + ++++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 56 insertions(+), 8 deletions(-) + +commit 96493c9409186a7e964e894c7f730962b6995fd7 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Wed Oct 31 23:51:25 2007 +0100 + + remove old file + + glib/test-poppler-glib.c | 514 + ----------------------------------------------- + 1 file changed, 514 deletions(-) + +commit 951a05f7a11af4a44e4cb85a015939d6a3e513f5 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Sat Oct 27 12:33:22 2007 +0200 + + Remove fordward declaration of a non-existant class + + poppler/Form.h | 1 - + 1 file changed, 1 deletion(-) + +commit 289679405ab143bc2106cf269227c514a1602e56 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Thu Oct 25 22:16:10 2007 -0400 + + Avoid drawing borders unless /W and /S are specified in /BS + + Acroread doesn't sometimes doesn't draw borders when you'd + expect it to. Special case that behaviour so that we do the + same thing. + + poppler/Annot.cc | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +commit ab0a6c37faf9916edcd70e128d9f2654eb795ace +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Thu Oct 25 20:56:58 2007 +0200 + + Fix compilation on mingw. Bug 12493 + + Added a check for localtime_r in configure.ac + Moved test-poppler-glib.c to test-poppler-glib.cc to get the correct + compiler + + configure.ac | 1 + + glib/Makefile.am | 2 +- + glib/test-poppler-glib.cc | 520 + ++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 522 insertions(+), 1 deletion(-) + +commit 6bd637dc135045b20abf024d394538d7a3160795 +Merge: c01ab714 25b273db +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Tue Oct 23 23:27:01 2007 +0200 + + Merge branch 'master' of + ssh://aacid@git.freedesktop.org/git/poppler/poppler + +commit c01ab714ecd42e39ecb0be1c0c2504635251ac01 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Tue Oct 23 23:26:21 2007 +0200 + + Provide setters for some methods that only had getters. Fixes + bug 12894 + + poppler/GlobalParams.cc | 49 + +++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/GlobalParams.h | 7 +++++++ + 2 files changed, 56 insertions(+) + +commit 25b273db677815c8df11e52fe9df29fe857a8a88 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Mon Oct 22 23:01:37 2007 -0400 + + Unset the font if it doesn't exist or we can not load it properly + + Previously, the previous font stayed current and glyphs would be + drawn using + it. This resulted in random glyphs being chosen unless the encodings + happened + to match. Now, instead, we draw nothing which matches the behaviour of + acroread. + + poppler/Gfx.cc | 4 ++++ + poppler/GfxFont.cc | 4 ++++ + 2 files changed, 8 insertions(+) + +commit 57331767ed5306eba1f9bf60e48fc88debdc2198 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Mon Oct 22 23:33:59 2007 +0200 + + builddir != srcdir fixes by Christian Persch <chpe gnome org> + + autogen.sh | 7 ++++--- + glib/demo/Makefile.am | 1 + + 2 files changed, 5 insertions(+), 3 deletions(-) + +commit 2a333e5a618b5c92f3c703816b950321f25d3aab +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Mon Oct 22 22:14:43 2007 +0200 + + Splash rework, check if font is inside clip area before rendering + it to a temporary bitmap. Fixes KDE bug 150693 + + This change is not trivial. What i did is: + It is getGlyph the one that does the intersection between clip area + and rendering area of the font instead fillGlyph2 + That means some clipRes = state->clip->testRect but we win more + robustness against broken pdf that specify HUGE fonts + + splash/Splash.cc | 207 + ++++++++++++++++++++++++------------------------- + splash/Splash.h | 4 +- + splash/SplashFTFont.cc | 23 +++++- + splash/SplashFTFont.h | 4 +- + splash/SplashFont.cc | 29 +++++-- + splash/SplashFont.h | 5 +- + splash/SplashT1Font.cc | 11 ++- + splash/SplashT1Font.h | 4 +- + 8 files changed, 162 insertions(+), 125 deletions(-) + +commit cf785cd12ae77e8dd778ed043584f8f26efe675f +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Mon Oct 22 21:59:35 2007 +0200 + + Add gmallocn_checkoverflow, it's the same as gmallocn but returns + NULL on overflow instead of doing exit() + + goo/gmem.cc | 18 ++++++++++++++++++ + goo/gmem.h | 3 +++ + 2 files changed, 21 insertions(+) + +commit 37e16ac301a35ceca2e3535f8c6100d4cf723c82 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Mon Oct 22 21:54:02 2007 +0200 + + exit(1) is bad in library code, use the src.abort method to describe + failure + + poppler/DCTStream.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit dbe975c129999a3efceb1c86518fa6fda74f685c +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Oct 22 11:25:37 2007 +0200 + + Fix a crash with invalid TrueType fonts + + fofi/FoFiTrueType.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +commit 8bfe30a48fd7021591ab307bd51f86c06ff202b9 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Oct 19 15:46:50 2007 +0200 + + Do not generate appearance stream for radio button that are not active + + poppler/Annot.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 1a531dcfee1c6fc79a414c38cbe7327fbf9a59d8 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Oct 19 13:12:24 2007 +0200 + + Fix a crash with invalid embedded fonts + + poppler/CairoFontEngine.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit e1740278457e512676b623bcdf9968193f0a8d7b +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Oct 19 12:21:54 2007 +0200 + + Do not draw annotations when rendering for printing + + glib/poppler-page.cc | 25 ++++++++++++++++++++++--- + poppler/Annot.h | 2 ++ + 2 files changed, 24 insertions(+), 3 deletions(-) + +commit a4d25f79dfc1a7e4998e2e113ef92312bd4af553 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Oct 16 15:24:08 2007 +0200 + + Detect form fields at any depth level + + We were ignoring non root form fields that contain only a kids + dictionary. + See evince bug: http://bugzilla.gnome.org/show_bug.cgi?id=486957 + + poppler/Form.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 03e1da99f7393fb1103643311b0b5af7b875e09c +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Oct 13 19:38:15 2007 -0400 + + Add an implementation of CairoOutputDev::startPage() + + The implementation initializes fill_pattern and stroke_pattern + to black matching SplashOutputDev. This fixes #12504. + + poppler/CairoOutputDev.cc | 9 +++++++++ + poppler/CairoOutputDev.h | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit 825c942d46e0c3e254028441015c5dd8440cc734 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Fri Oct 12 13:47:09 2007 +0200 + + Copy the embeddef file description string correctly + + poppler/Catalog.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 5e60da78695eff44cc10dbce46ef170727f682b1 +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Fri Oct 12 13:46:52 2007 +0200 + + Correctly delete the embedded file stream + + qt4/src/poppler-embeddedfile.cc | 1 + + qt4/src/poppler-private.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit 1627fbbde8be01af3bdd2583f3439897a37d5215 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Oct 6 23:27:40 2007 -0400 + + Use maskWidth and maskHeight for reading from the mask image in + CairoOutputDev::drawMaskedImage() + + Previously, drawMaskedImage() was incorrectly using the image width + and height which is + wrong when width != maskWidth or heigh != maskHeight. Fixes #12668. + + poppler/CairoOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 3156d560c5eaf6970da422d0b09fd2e95bfe6d1d +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Oct 5 11:34:01 2007 +0200 + + Fix a crash when Form Fields array contains references + to non existent objects. Fixes bug #11865 + + poppler/Form.cc | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit f0b5e6286e94c6153c8247b5fae63a18622c48d3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Oct 4 15:22:01 2007 +0200 + + Do not return unknown field type for signature form fields + + glib/poppler-form-field.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 498fd7fb99b01a879d07e2ad12c0b9462a8fc438 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Oct 4 12:36:39 2007 +0200 + + Add poppler_page_render_for_printing() and + poppler_page_render_to_pixbuf_for_printing() + + We were unconditionally passing printing=gFalse to displaySlice. With + these new + functions we can render to a pixbuf or cairo surface passing + printing=gTrue to + displaySlice. + + glib/poppler-page.cc | 135 + +++++++++++++++++++++++++++++++++++++++++---------- + glib/poppler-page.h | 10 ++++ + 2 files changed, 119 insertions(+), 26 deletions(-) + +commit 56af69787c78c2edbb69266e86a5a5b639ca6d3e +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Oct 3 23:02:25 2007 -0400 + + Error out if we can't find a .cidToUnicode for a known character + collection + + This situation was caused by the fixes for bug #11413. I'm not sure + it's the best thing to do, but it seems better. + + poppler/GfxFont.cc | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit 3d0df46908379bce1d196b9dc41153b1adb5f725 +Author: Michael Wolf <maw@ximian.com> +Date: Wed Oct 3 19:43:55 2007 +0200 + + Fix compile warning + + glib/test-poppler-glib.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit aba29e12528025c2cc71bf46e02e76ac4db2b193 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Sep 28 21:01:50 2007 +0200 + + Add forms demo to glib poppler demo + + glib/demo/Makefile.am | 2 + + glib/demo/forms.c | 489 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/demo/forms.h | 31 ++++ + glib/demo/main.c | 8 +- + glib/demo/utils.c | 1 - + 5 files changed, 527 insertions(+), 4 deletions(-) + +commit d0c0f26d2c95232c216e3daa15e98a3aff14ac27 +Merge: 59d55f73 38d5bb15 +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Tue Sep 25 03:33:52 2007 -0700 + + Merge branch 'master' of + ssh://kjk@git.freedesktop.org/git/poppler/poppler + +commit 38d5bb150a5fe883da1d4256463d1f796d201283 +Author: Krzysztof Kowalczyk <kkowalczyk@kjkubu.(none)> +Date: Tue Sep 25 16:13:51 2007 -0700 + + Silence deprecation warnings - annoying with msvc 2005. + + makefile.vc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 59d55f7371bee81c9392fa2d4174ceffaacde471 +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Tue Sep 25 01:21:19 2007 -0700 + + Fix misleading comment. + + goo/GooTimer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c36d8afc984795aca0a12a94ec7668092067db82 +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Tue Sep 25 00:32:29 2007 -0700 + + Revert "replace extremely confusing 'a*(int)sizeof(foo)/sizeof(foo) + != a' which, due to type promotions, if a is int, is equivalent to + a < 0; fix problems revealed by the change" + + This reverts commit 08bf7c1151d594d4c7d253a2c89f4f3a088ad8ec. + + poppler/XRef.cc | 25 +++++++++++++++++++++---- + 1 file changed, 21 insertions(+), 4 deletions(-) + +commit ff25e83abae1ca17e2e7dd6f20946026fca69fff +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Mon Sep 24 23:57:25 2007 -0700 + + Make perf-test compile on unix as well. + + test/Makefile.am | 16 ++++++- + test/perf-test-preview-dummy.cc | 1 + + test/perf-test.cc | 104 + +++++++++++++++++----------------------- + 3 files changed, 59 insertions(+), 62 deletions(-) + +commit 70f3bf42b3028d9a2e4aefdc2e1a458b3c77b0e7 +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Mon Sep 24 21:26:54 2007 -0700 + + Let perf-test.cc manage lifetime of rendered bitmap. + + test/perf-test-preview-win.cc | 7 ------- + 1 file changed, 7 deletions(-) + +commit b622b252cba068a15eae77df5deb261dd98affaf +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Mon Sep 24 21:20:12 2007 -0700 + + Disable my_error for now - seems to corrupt memory. + + test/perf-test.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit bde8c9669ca6b43cb6a664bd14df164a718041ea +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Mon Sep 24 21:08:58 2007 -0700 + + Con't copy the file unless COPY_FILE is defined. + + test/perf-test.cc | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit bf9b46b012c64624818a2110af7c4b7e3b419728 +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Mon Sep 24 20:13:54 2007 -0700 + + Respect -loadonly cmd-line arg. + + test/perf-test.cc | 2 ++ + 1 file changed, 2 insertions(+) + +commit 2f664b654ca19135f0f8a0fe89872b9e0d526fa2 +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Mon Sep 24 19:41:45 2007 -0700 + + Fix msvc debug build. Fix bitmap leak in perf-test. + + makefile.vc | 6 ++++-- + test/perf-test.cc | 1 + + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 05d41cd5aec39b4e3c8949445a9986e5ca8b50dd +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Mon Sep 24 08:10:37 2007 -0700 + + Use GooTimer instead of my own timer. + + test/perf-test.cc | 98 + +++++-------------------------------------------------- + 1 file changed, 8 insertions(+), 90 deletions(-) + +commit 05fbce5b6657e883ece9054c79576b25271a05a4 +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Mon Sep 24 08:01:11 2007 -0700 + + Make GooTimer work for Windows/msvc build. + + goo/GooTimer.cc | 69 + +++++++++++++++++++++++++++++++++++++++------------------ + goo/GooTimer.h | 28 ++++++++++++++--------- + poppler/Gfx.cc | 11 ++------- + 3 files changed, 66 insertions(+), 42 deletions(-) + +commit 6347915085a487da08d39a859f4261fa812dab09 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Mon Sep 24 01:08:17 2007 -0700 + + Add Error.cc in msvc build and use setErrorFunction in perf-test. + + makefile.vc | 3 +-- + test/perf-test.cc | 10 +++++----- + 2 files changed, 6 insertions(+), 7 deletions(-) + +commit ed01b3965c57ce2a4eabf9c46b5319ea627d3324 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Mon Sep 24 01:03:09 2007 -0700 + + Match declaration of setErrorFunction with its definition. + + Also enable this code for Windows, since CDECL was what + was throwing msvc off. + + poppler/Error.cc | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +commit 71fb15f8bd131a13d8cf0f394fe601cfbb6e1772 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Mon Sep 24 00:38:29 2007 -0700 + + Even less compiler warnings. + + poppler/CairoOutputDev.cc | 6 +++--- + qt/poppler-page.cc | 3 +++ + utils/HtmlOutputDev.cc | 10 ++++++---- + 3 files changed, 12 insertions(+), 7 deletions(-) + +commit 7ba3f198a0651d2a7c91b7d9e10a5173dc3de0a3 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Mon Sep 24 00:32:37 2007 -0700 + + Even less compiler warnings. + + qt/poppler-document.cc | 8 ++++++++ + qt/poppler-private.h | 8 -------- + qt4/src/poppler-document.cc | 10 ++++++++++ + qt4/src/poppler-form.cc | 15 +++++++++++++++ + qt4/src/poppler-private.h | 25 ------------------------- + 5 files changed, 33 insertions(+), 33 deletions(-) + +commit ab1059f594cb9fccd8568ca2a535a363c7521daa +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Mon Sep 24 00:14:01 2007 -0700 + + Don't break aliasing. + + poppler/GlobalParams.cc | 40 ++++++++++++++++++---------------------- + 1 file changed, 18 insertions(+), 22 deletions(-) + +commit 71c47b30adf687a0bcece22834933267053360de +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Sun Sep 23 23:49:31 2007 -0700 + + Reduce compiler warnings. + + poppler/JBIG2Stream.cc | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit 8466d94929844c976bbad8bb7d1ea7f7f77cc196 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Sun Sep 23 23:34:52 2007 -0700 + + Reduce compiler warnings. Tabs to spaces. + + fofi/FoFiType1C.cc | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) + +commit c53b8ccfba6fa4345086493f9e44212721c11d0a +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Sun Sep 23 23:23:34 2007 -0700 + + Reduce number of compiler warnings. + + poppler/CharCodeToUnicode.cc | 2 +- + poppler/Gfx.cc | 6 ++---- + poppler/PageLabelInfo.cc | 2 ++ + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit abede2a06c5c9dc97b40479deda49621458f1171 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Sun Sep 23 23:03:36 2007 -0700 + + Reduce number of compiler warnings. + + glib/poppler-action.cc | 1 - + glib/poppler-document.cc | 9 ++------- + glib/poppler-page.cc | 3 +-- + qt/poppler-document.cc | 1 - + qt4/src/poppler-annotation.cc | 16 +++++++++++++--- + 5 files changed, 16 insertions(+), 14 deletions(-) + +commit 60f5bcea4a920441e25ae11d677636242aabb2db +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Sun Sep 23 22:48:06 2007 -0700 + + Remove unused variables. + + utils/pdftoppm.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3179eee44eb0afbc642675268b9a4abb16ccdde3 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Sun Sep 23 22:47:21 2007 -0700 + + Remove unused variables. + + utils/HtmlOutputDev.cc | 23 ----------------------- + 1 file changed, 23 deletions(-) + +commit e9dc379190aa3166870d0b11a05ccc4e9dad2706 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Sun Sep 23 22:41:59 2007 -0700 + + Remove unused variables. + + poppler/ArthurOutputDev.cc | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) + +commit 08bf7c1151d594d4c7d253a2c89f4f3a088ad8ec +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Sun Sep 23 22:28:16 2007 -0700 + + replace extremely confusing 'a*(int)sizeof(foo)/sizeof(foo) != a' + which, due to type promotions, if a is int, is equivalent to a < 0; + fix problems revealed by the change + + poppler/XRef.cc | 25 ++++--------------------- + 1 file changed, 4 insertions(+), 21 deletions(-) + +commit 5a1f670a4d16affeed86cdf643ab22f481caa3a5 +Author: Krzysztof Kowalczyk <kkowalczyk@kjkubu.(none)> +Date: Sun Sep 23 20:42:59 2007 -0700 + + ignore *.o files + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit c156aed7234f82dea4cb384c1b8a7acdd34545be +Author: Krzysztof Kowalczyk <kkowalczyk@kjkubu.(none)> +Date: Sun Sep 23 20:41:19 2007 -0700 + + remove unused variables + + poppler/ABWOutputDev.cc | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +commit d0bdef4752be5fa609a0766ee87aa54d51611d9a +Author: Krzysztof Kowalczyk <kkowalczyk@kjkubu.(none)> +Date: Sat Sep 22 13:38:03 2007 -0700 + + undo accidental changes to file permissions + + msvc/poppler/poppler-config.h | 0 + poppler/Annot.cc | 0 + poppler/CairoFontEngine.cc | 0 + poppler/CairoOutputDev.cc | 0 + poppler/Catalog.cc | 0 + poppler/Form.cc | 0 + poppler/GfxFont.cc | 0 + poppler/GfxState.cc | 0 + poppler/Page.cc | 0 + poppler/SplashOutputDev.cc | 0 + poppler/TextOutputDev.cc | 0 + splash/Splash.cc | 0 + splash/SplashFTFontEngine.cc | 0 + test/perf-test-preview-dummy.cc | 0 + test/perf-test-preview-win.cc | 0 + test/perf-test.cc | 0 + 16 files changed, 0 insertions(+), 0 deletions(-) + +commit 6c69473f2f4a49757614ddd249e65bb7a13c63c1 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Fri Sep 21 08:09:53 2007 -0700 + + undo accidental mode change + + makefile.vc | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + +commit e7e386e7ce8cb8eb8a7037ebdaa601524d332ae7 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Fri Sep 21 08:08:53 2007 -0700 + + more simplification by removing unneded code + + makefile.vc | 2 +- + test/perf-test.cc | 60 + +++++++++---------------------------------------------- + 2 files changed, 10 insertions(+), 52 deletions(-) + +commit 3e10604637ec193269a3155985476d3b83dc7d62 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Fri Sep 21 07:48:38 2007 -0700 + + for portability use bool/true/false instead of BOOL/TRUE/FALSE + + test/perf-test.cc | 176 + ++++++++++++++++++++++++++---------------------------- + 1 file changed, 86 insertions(+), 90 deletions(-) + +commit 634718936f2a95fac2a9d12fcea483b3d0ca8fa6 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Fri Sep 21 07:41:14 2007 -0700 + + simplify perf-test + + test/perf-test-pdf-engine.h | 78 + ------------------------------------------- + test/perf-test-preview-win.cc | 5 ++- + test/perf-test.cc | 75 + +++++++++++++++++++++++++++++++++++++++-- + 3 files changed, 75 insertions(+), 83 deletions(-) + +commit 617550199762fab42ca2e202e641e047b3efbac0 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Fri Sep 21 05:20:16 2007 -0700 + + simplify perf-test code + + test/perf-test-pdf-engine.h | 67 +++-------------------- + test/perf-test-preview-dummy.cc | 3 +- + test/perf-test-preview-win.cc | 80 ++++++++++++++++++++++++---- + test/perf-test.cc | 114 + ++++------------------------------------ + 4 files changed, 86 insertions(+), 178 deletions(-) + +commit fb5bf808b88992c1772a10e4ed9fe788fb618417 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Fri Sep 21 03:03:26 2007 -0700 + + more msvc build fixes + + makefile.vc | 2 +- + test/perf-test.cc | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 60829b08a7440f36014f68ec54bee7a742412738 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Fri Sep 21 03:02:34 2007 -0700 + + msvc build fixes + + msvc/poppler/poppler-config.h | 143 + ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 143 insertions(+) + +commit 853c22a174bae81139edc9aeded7f26ae2655cef +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Thu Sep 20 23:21:35 2007 -0700 + + add pre-made config.h for msvc build + + msvc/config.h | 62 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) + +commit 31c43b118bd4372134018be6f6693f77d1f6a39b +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Thu Sep 20 22:10:09 2007 -0700 + + remove unused variables + + poppler/CairoFontEngine.cc | 6 ++---- + poppler/CairoOutputDev.cc | 14 ++------------ + splash/SplashFTFontEngine.cc | 2 ++ + 3 files changed, 6 insertions(+), 16 deletions(-) + +commit 01b99f60e36dd955817f23911ef38947360f61f7 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Thu Sep 20 21:14:17 2007 -0700 + + remove unused variables + + poppler/GfxState.cc | 11 ++--------- + poppler/SplashOutputDev.cc | 9 +++------ + poppler/TextOutputDev.cc | 3 --- + 3 files changed, 5 insertions(+), 18 deletions(-) + +commit 7c406400532d68524a43cf963d894d3c4b269400 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Thu Sep 20 20:57:44 2007 -0700 + + remove unused variables + + poppler/Catalog.cc | 1 - + poppler/Form.cc | 5 ----- + poppler/GfxFont.cc | 6 ++---- + poppler/Page.cc | 2 +- + splash/Splash.cc | 5 ++++- + 5 files changed, 7 insertions(+), 12 deletions(-) + +commit 70f23389c97b1870b7311d97322cdd16b580a79d +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Thu Sep 20 20:23:59 2007 -0700 + + don't silence warnings about unused variables/functions to keep + programmers honest + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit cdb6fcf98137473efd993e1374a6f010e9db67db +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Thu Sep 20 20:00:56 2007 -0700 + + Remove unused variables + + poppler/Annot.cc | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit 0e76b49ac852a5a7ebae4c1f67b153e0b7c9f905 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Tue Sep 18 01:04:50 2007 -0700 + + Explain how to compile on Windows using msvc makefile. + + README.windows | 63 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 63 insertions(+) + +commit c002b4dc75b2688ffe8a734cf3e15f5891797842 +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Tue Sep 18 00:04:47 2007 -0700 + + Add Windows/msvc makefile. + + Add native msvc windows makefile and pre-made + config.h for windows in msvc directory. + + makefile.vc | 149 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 149 insertions(+) + +commit 1f33fc58201c92120c587189d2e0e819f83167da +Author: Krzysztof Kowalczyk <kkowalczyk@tlapx60ubu.(none)> +Date: Mon Sep 17 23:53:02 2007 -0700 + + Start on a test program. + + Test program can be used for regression testing and + performance testing. It renders a page (or pages) + in a given PDF (or PDFs) and records rendering times. + For historical reasons the code is ugly and probably + only compiles on windows, but it'll get better. + + test/perf-test-pdf-engine.h | 131 ++++ + test/perf-test-preview-dummy.cc | 22 + + test/perf-test-preview-win.cc | 222 ++++++ + test/perf-test.cc | 1428 + +++++++++++++++++++++++++++++++++++++++ + 4 files changed, 1803 insertions(+) + +commit b96db4ad27535c2666fccdfe0a3c04cc7c37792d +Author: Jeff Muizelaar <jeff@freiheit.infidigm.net> +Date: Mon Sep 17 20:28:38 2007 -0400 + + Avoid double free caused by 302 merge + + The ownership of the the string returned by getKey() changed with + the 302 merge + but this code was not updated. Found by Matthew Woehlke. + + qt4/src/poppler-document.cc | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 2a495f19d4465e15fd2fa96656d904315c79a443 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Sep 17 16:52:45 2007 -0400 + + Simplify ChangeLog rule a bit. + + ChangeLog.mk | 81 + ------------------------------------------------------------ + Makefile.am | 7 +++--- + 2 files changed, 4 insertions(+), 84 deletions(-) + +commit 7d5abbeec55e4b90b139671d96cfdf58bdab70b8 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Sep 17 15:45:26 2007 -0400 + + Add dist hook to generate ChangeLog. + + Taken from cairo. It still need some tweaking. + + ChangeLog.mk | 81 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + Makefile.am | 4 +++ + configure.ac | 2 +- + 3 files changed, 86 insertions(+), 1 deletion(-) + +commit 15ad81c64cd8b1cb438d41be402daa19a239db3d +Author: Albert Astals Cid <tsdgeos@bluebox.localdomain> +Date: Mon Sep 17 19:39:29 2007 +0200 + + Use = instead of == in qt.m4 + + m4/qt.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 70fabcb96e207b9b889bb32c0cf5ea3fc0aa08f8 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sun Sep 16 20:40:53 2007 -0400 + + Rename .cvsignore files to .gitignore and drop ChangeLog file. + + .cvsignore => .gitignore | 0 + ChangeLog | 4586 + ----------------------------- + fofi/{.cvsignore => .gitignore} | 0 + glib/{.cvsignore => .gitignore} | 0 + glib/reference/{.cvsignore => .gitignore} | 0 + goo/{.cvsignore => .gitignore} | 0 + poppler/{.cvsignore => .gitignore} | 0 + qt/{.cvsignore => .gitignore} | 0 + qt4/{.cvsignore => .gitignore} | 0 + qt4/src/{.cvsignore => .gitignore} | 0 + qt4/tests/{.cvsignore => .gitignore} | 0 + splash/{.cvsignore => .gitignore} | 0 + test/{.cvsignore => .gitignore} | 0 + utils/{.cvsignore => .gitignore} | 0 + 14 files changed, 4586 deletions(-) + +commit c9f9403ffc5b95ae790c3c81284c7786afe33f4d +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Fri Sep 14 20:50:07 2007 +0000 + + Windows implementation for matching fonts that doesn't use fontconfig + + ChangeLog | 6 + + poppler/GlobalParamsWin.cc | 285 + +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 291 insertions(+) + +commit d18b5361a0504458da805ed6be037c9d648f9372 +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Fri Sep 14 20:47:11 2007 +0000 + + Update ChangeLog for previous checkin + + ChangeLog | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +commit 3330763ddca66b30d5ee60aab94d6fe0bbae9c8f +Author: Krzysztof Kowalczyk <kkowalczyk@gmail.com> +Date: Fri Sep 14 06:17:35 2007 +0000 + + windows/msvc compilation fixes + + poppler/DCTStream.h | 2 +- + poppler/Error.cc | 6 ++++++ + poppler/FlateStream.h | 2 +- + poppler/GlobalParams.cc | 12 ++++++++++-- + poppler/GlobalParams.h | 17 +++++++++++++++++ + poppler/Stream.cc | 2 +- + splash/SplashFTFontEngine.cc | 2 ++ + splash/SplashFontEngine.cc | 2 +- + splash/SplashFontFile.cc | 2 ++ + splash/SplashFontFile.h | 3 ++- + splash/SplashT1FontEngine.cc | 2 +- + 11 files changed, 44 insertions(+), 8 deletions(-) + +commit 6eb159ef34eb7e2fb8adcfc48afd84d5f50efbbd +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 10 17:38:05 2007 +0000 + + * autogen.sh: Support automake-1.10. + Patch by Krzysztof Kowalczyk <kkowalczyk@gmail.com> + + ChangeLog | 5 +++++ + autogen.sh | 11 ++++++----- + 2 files changed, 11 insertions(+), 5 deletions(-) + +commit 31bbc8c727cfecc79bd8da962ad8d99a0d1d3d33 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 8 10:40:17 2007 +0000 + + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-ps-converter.cc: + Add PSConverter::setOutputDevice() to set a QIODevice where + writing the resulting PS. + + ChangeLog | 7 ++++++ + qt4/src/poppler-ps-converter.cc | 51 + +++++++++++++++++++++++++++++++++++++---- + qt4/src/poppler-qt4.h | 5 +++- + 3 files changed, 58 insertions(+), 5 deletions(-) + +commit b3d63d03c310f01cc5b23d00ffd2103c6891fef2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 5 20:22:32 2007 +0000 + + * qt4/src/poppler-ps-converter.cc: Fix Right<->Left + interchange + + ChangeLog | 1 + + qt4/src/poppler-ps-converter.cc | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +commit 64368582d5ca4e28c236f440482c96f1dd3a8897 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 5 18:22:52 2007 +0000 + + * poppler/PSOutputDev.cc: Fix printing of second parameter + + ChangeLog | 4 ++++ + poppler/PSOutputDev.cc | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit eaf9d06cf0d08ccdc183759e0331dc2439a6f10f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Sep 5 10:57:09 2007 +0000 + + 2007-09-05 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-page.cc: + * glib/demo/render.c: Fix build with --disable-cairo-output. + + ChangeLog | 5 +++++ + glib/demo/render.c | 31 +++++++++++++++++++++++++++---- + glib/poppler-page.cc | 22 ++++++++++++---------- + 3 files changed, 44 insertions(+), 14 deletions(-) + +commit c0f488c2b0e115be3e1b7e4dc7baa38db5837498 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 4 22:04:52 2007 +0000 + + did not want to commit this + + gtk-doc.make | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3462851b4ea342651095f1803cd488bc3b3f5749 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 4 22:02:06 2007 +0000 + + * utils/pdftoppm.cc: Fix build on Sun Studio compiler. + Patch by Brian Cameron <brian.cameron@sun.com> + + ChangeLog | 5 +++++ + gtk-doc.make | 2 +- + utils/pdftoppm.cc | 2 +- + 3 files changed, 7 insertions(+), 2 deletions(-) + +commit cdf3b9062cc54d558b8dbeefb3211a920ff2cb94 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 3 19:23:11 2007 +0000 + + write news + fix qt4 build + + NEWS | 13 +++++++++++++ + qt4/src/Makefile.am | 3 ++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit c82208a44f3b09c27bc33831641e4f746dd4361f +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 3 18:28:44 2007 +0000 + + * configure.ac: Bump version to 0.6 + * glib/Makefile.am + * poppler/Makefile.am + * qt/Makefile.am + * qt4/src/Makefile.am: Bump sonames + + ChangeLog | 8 ++++++++ + configure.ac | 2 +- + glib/Makefile.am | 2 +- + poppler/Makefile.am | 2 +- + qt/Makefile.am | 2 +- + qt4/src/Makefile.am | 2 +- + 6 files changed, 13 insertions(+), 5 deletions(-) + +commit 2a12409ebbf96ea3ca4556b71231a45ae37cb052 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 3 17:09:01 2007 +0000 + + * poppler/JBIG2Stream.cc: + * poppler/Stream.cc: Patch by Derek B. Noonburg + <derekn@foolabs.com> + to fix some errors in CCITTFaxStream and JBIG2Stream.cc + + ChangeLog | 6 ++++++ + poppler/JBIG2Stream.cc | 7 ++++--- + poppler/Stream.cc | 2 +- + 3 files changed, 11 insertions(+), 4 deletions(-) + +commit 0b483e71ef02b4040b665935c1018c8b30b9c1ca +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Sep 3 08:54:01 2007 +0000 + + 2007-09-03 Carlos Garcia Campos <carlosgc@gnome.org> + * gtk-doc.make: + * glib/poppler-document.cc: + * glib/poppler-form-field.cc: + * glib/poppler-page.cc: + * glib/reference/poppler-docs.sgml: + * glib/reference/poppler-sections.txt: + * glib/reference/poppler.types: + * glib/reference/tmpl/poppler-action.sgml: + * glib/reference/tmpl/poppler-attachment.sgml: + * glib/reference/tmpl/poppler-document.sgml: + * glib/reference/tmpl/poppler-enums.sgml: + * glib/reference/tmpl/poppler-form-field.sgml: + * glib/reference/tmpl/poppler-page.sgml: + * glib/reference/tmpl/poppler-private.sgml: + * glib/reference/tmpl/poppler.sgml: Update glib bindings API + documentation. + + ChangeLog | 19 ++ + glib/poppler-document.cc | 10 + + glib/poppler-form-field.cc | 205 ++++++++++++++++++ + glib/poppler-page.cc | 12 +- + glib/reference/poppler-docs.sgml | 2 + + glib/reference/poppler-sections.txt | 108 +++++++++- + glib/reference/poppler.types | 2 + + glib/reference/tmpl/poppler-action.sgml | 36 +++- + glib/reference/tmpl/poppler-attachment.sgml | 65 ++++++ + glib/reference/tmpl/poppler-document.sgml | 50 +++++ + glib/reference/tmpl/poppler-enums.sgml | 60 ++++++ + glib/reference/tmpl/poppler-form-field.sgml | 315 + ++++++++++++++++++++++++++++ + glib/reference/tmpl/poppler-page.sgml | 236 ++++++++++++++++++++- + glib/reference/tmpl/poppler-private.sgml | 6 + + glib/reference/tmpl/poppler.sgml | 49 +++++ + gtk-doc.make | 34 +-- + 16 files changed, 1181 insertions(+), 28 deletions(-) + +commit 289e3893cda45055951bb8d3b82a45644bc0b6c6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Sep 2 17:02:55 2007 +0000 + + * poppler/GfxState.cc: Pad zeroes instead of aborting when + rendering + 1-bit images and the stream is "too short" to mimic + Acroread and + ghostscript behaviour. Patch by <darren.kenny@sun.com>. Fixes + #12208 + + ChangeLog | 3 +++ + poppler/GfxState.cc | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 6f6c2180aca2e26ea0e3c2f21f11bc8f457c19c0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Sep 2 16:31:19 2007 +0000 + + * glib/demo/Makefile.am: Add + $(top_builddir)/poppler/libpoppler.la + * poppler/TextOutputDev.cc: Patch from Ed Catmur + <ed@catmur.co.uk> to + improve matching of half strings of decomposed + characters/ligatures. + + ChangeLog | 3 +++ + glib/demo/Makefile.am | 1 + + poppler/TextOutputDev.cc | 21 +++++++++++++-------- + 3 files changed, 17 insertions(+), 8 deletions(-) + +commit be1b5a0196cdfc78f74e08a023b477cac16eb0f3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Sep 2 16:06:03 2007 +0000 + + poppler/PDFDoc.cc: Don't enforce %%EOF at the end of file + + ChangeLog | 4 ++++ + poppler/PDFDoc.cc | 3 ++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 500a87af9240344806c18ebbd05a89f4f4c69955 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Sep 2 00:53:42 2007 +0000 + + 2007-09-01 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: + * poppler/Error.cc: + * poppler/Error.h: Report any cairo errors when destroying + the cairo + context. + + ChangeLog | 7 +++++++ + poppler/CairoOutputDev.cc | 7 ++++++- + poppler/Error.cc | 7 +++++++ + poppler/Error.h | 1 + + 4 files changed, 21 insertions(+), 1 deletion(-) + +commit 0c22556bf70ff67eb388cdcd9784603030397785 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Sep 1 23:38:04 2007 +0000 + + 2007-09-01 Jeff Muizelaar <jeff@infidigm.net> + + * glib/demo/Makefile.am: Only build the demo app if the + cflags will be + appropriately set. + + ChangeLog | 5 +++++ + glib/demo/Makefile.am | 2 ++ + 2 files changed, 7 insertions(+) + +commit a23d45dd6cd8a2ac4181170a9ee924fe49a9781b +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Sep 1 23:00:59 2007 +0000 + + 2007-09-01 Jeff Muizelaar <jeff@infidigm.net> + + * glib/poppler-page.cc: Add note about clipping + + ChangeLog | 4 ++++ + glib/poppler-page.cc | 2 ++ + 2 files changed, 6 insertions(+) + +commit bf489d5cebc467807f2b38f74f6a6e34a503a9ca +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Aug 30 18:39:51 2007 +0000 + + * poppler/Form.h: Remove unused methods. Fixes 12013 + + ChangeLog | 4 ++++ + poppler/Form.h | 3 --- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit a81cc06c855385911dffa826b9e1407d6097e8c8 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Aug 30 18:15:34 2007 +0000 + + 2007-08-30 Carlos Garcia Campos <carlosgc@gnome.org> + * poppler/TextOutputDev.cc: + * poppler/TextOutputDev.h: + * glib/poppler.h: + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/test-poppler-glib.c: Add support for word and line + selections. Based on patch by Kristian Høgsberg. + + ChangeLog | 10 ++++++ + glib/poppler-page.cc | 81 + ++++++++++++++++++++++++++++++++++++++++++------ + glib/poppler-page.h | 2 ++ + glib/poppler.h | 4 +-- + glib/test-poppler-glib.c | 2 +- + poppler/TextOutputDev.cc | 74 +++++++++++++++++++++++++++++-------------- + poppler/TextOutputDev.h | 34 +++++++++++++++----- + 7 files changed, 163 insertions(+), 44 deletions(-) + +commit 59ddb5cc8bec54305b6d256ad9975e95ecdcb935 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 27 18:37:55 2007 +0000 + + * poppler/UnicodeTypeTable.cc: Fix error on the NFKC text + matching + routine. Fixes bug #11775. Patch by Ed Catmur + <ed@catmur.co.uk> + + ChangeLog | 5 +++++ + poppler/UnicodeTypeTable.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit a6e46ce61670679f368e66c1a98a7d5d1c960c5b +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 27 17:56:29 2007 +0000 + + * qt4/src/Doxyfile: + * qt4/src/Mainpage.dox: + * qt4/src/poppler-annotation.h: + * qt4/src/poppler-form.h: + * qt4/src/poppler-link.h: + * qt4/src/poppler-qt4.h: + A few API documentation fixes and improvements. + + ChangeLog | 10 +++++++ + qt4/src/Doxyfile | 26 ++++++------------ + qt4/src/Mainpage.dox | 26 +++++++++++------- + qt4/src/poppler-annotation.h | 34 ++++++++++++++++++++++++ + qt4/src/poppler-form.h | 18 ++++++------- + qt4/src/poppler-link.h | 63 + +++++++++++++++++++++++++++++++++++++++++--- + qt4/src/poppler-qt4.h | 44 +++++++++++++++++++++---------- + 7 files changed, 166 insertions(+), 55 deletions(-) + +commit a7f8d92fba8c45d6ca83568c045d5e324158ee6b +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 27 17:17:14 2007 +0000 + + * qt4/src/poppler-link.cc: + * qt4/src/poppler-link.h: + Initialise correctly, and missing empty destructor. + * qt4/src/poppler-annotation.cc: + Don't leak the private class. + + ChangeLog | 9 +++++++++ + qt4/src/poppler-annotation.cc | 4 ++-- + qt4/src/poppler-link.cc | 8 ++++++-- + qt4/src/poppler-link.h | 1 + + 4 files changed, 18 insertions(+), 4 deletions(-) + +commit 2b1ef8f06879eb0b79288d57540c238ea833db24 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 26 21:39:22 2007 +0000 + + Fix bug 12121 + + ChangeLog | 4 ++++ + utils/ImageOutputDev.cc | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 20bcac5ee1988befb9c590a0d16cb615f0c49901 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 26 21:28:34 2007 +0000 + + forgot to cvs add + + qt4/src/poppler-annotation-private.h | 49 + ++++++++++++++++++++++++++++++++++++ + 1 file changed, 49 insertions(+) + +commit e48de657db0ef439457b4b5ca39b937da25d531e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 26 18:11:01 2007 +0000 + + * qt4/src/poppler-annotation.cc: + * qt4/src/poppler-annotation.h: + Move all the private members of the *Annotation classes into + a common + shared private. + + ChangeLog | 4 + + qt4/src/poppler-annotation.cc | 969 + +++++++++++++++++++++++++++++++++++------- + qt4/src/poppler-annotation.h | 277 ++++++++---- + qt4/src/poppler-page.cc | 249 ++++++----- + 4 files changed, 1155 insertions(+), 344 deletions(-) + +commit 392f050f909b6a1250acf1971446a1849534482c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 26 16:42:46 2007 +0000 + + * qt4/src/poppler-document.cc: + * qt4/src/poppler-embeddedfile.cc: + * qt4/src/poppler-fontinfo.cc: + * qt4/src/poppler-form.cc: + * qt4/src/poppler-form.h: + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-sound.cc: + * qt4/src/poppler-textbox.cc: + API work: remove 'const' and 'const&' from return values + with Qt + classes; make the non-copiable classes really non-copiable; + uninline a Document::page() method; other related small + changes. + * qt4/src/poppler-link.cc: + * qt4/src/poppler-link.h: + Make LinkDestination an implicitely shared class, with all + the private + members into the private class; move all the private members + of the + Link* classes into a common shared private. + + ChangeLog | 23 ++- + qt4/src/poppler-document.cc | 7 +- + qt4/src/poppler-embeddedfile.cc | 12 -- + qt4/src/poppler-fontinfo.cc | 12 +- + qt4/src/poppler-form.cc | 16 +- + qt4/src/poppler-form.h | 14 +- + qt4/src/poppler-link.cc | 373 + ++++++++++++++++++++++++++++++---------- + qt4/src/poppler-link.h | 67 +++++--- + qt4/src/poppler-qt4.h | 32 ++-- + qt4/src/poppler-sound.cc | 7 - + qt4/src/poppler-textbox.cc | 4 +- + 11 files changed, 404 insertions(+), 163 deletions(-) + +commit f215aca25fdd8fe287b717dde53f0be273d995e4 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun Aug 26 10:52:19 2007 +0000 + + 2007-08-26 Carlos Garcia Campos <carlosgc@gnome.org> + * configure.ac: + * glib/Makefile.am: + * glib/demo/Makefile.am: + * glib/demo/fonts.[ch]: + * glib/demo/info.[ch]: + * glib/demo/links.[ch]: + * glib/demo/main.c: + * glib/demo/outline.[ch]: + * glib/demo/page.[ch]: + * glib/demo/render.[ch]: + * glib/demo/utils.[ch]: Add poppler glib demo tool. + + ChangeLog | 14 ++ + configure.ac | 1 + + glib/Makefile.am | 2 +- + glib/demo/Makefile.am | 26 +++ + glib/demo/fonts.c | 276 ++++++++++++++++++++++++++++ + glib/demo/fonts.h | 31 ++++ + glib/demo/info.c | 243 ++++++++++++++++++++++++ + glib/demo/info.h | 31 ++++ + glib/demo/links.c | 289 +++++++++++++++++++++++++++++ + glib/demo/links.h | 31 ++++ + glib/demo/main.c | 205 +++++++++++++++++++++ + glib/demo/outline.c | 218 ++++++++++++++++++++++ + glib/demo/outline.h | 31 ++++ + glib/demo/page.c | 249 +++++++++++++++++++++++++ + glib/demo/page.h | 31 ++++ + glib/demo/render.c | 498 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/demo/render.h | 31 ++++ + glib/demo/utils.c | 234 ++++++++++++++++++++++++ + glib/demo/utils.h | 42 +++++ + 19 files changed, 2482 insertions(+), 1 deletion(-) + +commit 7c9529b70dc44bb001d21a3b47fc65916813dec1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Aug 23 20:39:31 2007 +0000 + + 2007-08-23 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-page.cc: Add missing comma. + + ChangeLog | 4 ++++ + glib/poppler-page.cc | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 3c4a85503261ee81a829a1683f1f5fa85d41f8ee +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Thu Aug 23 20:15:46 2007 +0000 + + 2007-08-23 Jeff Muizelaar <jeff@infidigm.net> + + * glib/poppler-page.cc: pass in -1 to displaySlice so that + it sets up + the slice size for us. This fixes the case of the wrong + values being + used when the pdf was rotated on its side. + Fixes #11913. + + ChangeLog | 7 +++++++ + glib/poppler-page.cc | 5 ++--- + 2 files changed, 9 insertions(+), 3 deletions(-) + +commit 3ba088d8caee3c40c2aba0cd85adcf9195ae88a3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Aug 22 21:29:32 2007 +0000 + + * splash/SplashBitmap.cc: + * splash/SplashBitmap.h: + * utils/pdftoppm.cc: Add the following features to pdftoppm + - if omitting input filename or using - for input filename + reads pdf from stdin + - if omitting output filename, prints output to stdout + - create image of a cropped rectangle of the pdf + - scale pdf to fit in a square of wanted size + Patch by Ilmari Heikkinen <ilmari.heikkinen@gmail.com> + + ChangeLog | 12 ++++++ + splash/SplashBitmap.cc | 18 +++++++-- + splash/SplashBitmap.h | 2 + + utils/pdftoppm.cc | 107 + +++++++++++++++++++++++++++++++++++++++++-------- + 4 files changed, 119 insertions(+), 20 deletions(-) + +commit 567e82c13aace4f40c7a555a62a3a4d223a46d92 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Aug 22 19:34:02 2007 +0000 + + 2007-08-22 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/GlobalParams.cc: Fix debug spew. Patch from + Matthias Clasen. + + ChangeLog | 4 ++++ + poppler/GlobalParams.cc | 1 - + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit bc499987074d046baf29deafe4a29d57039c0c5e +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Aug 22 19:28:24 2007 +0000 + + 2007-08-22 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: Fix the computation of the + padding in the + image scaling code. + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.cc | 6 ++++-- + 2 files changed, 9 insertions(+), 2 deletions(-) + +commit d9719233447cb4f85f2bf9d9ec6ef089caa21140 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Aug 19 16:20:21 2007 +0000 + + 2007-08-19 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: Avoid allocating the glyph + array if + currentFont is not set in beginString. This closes a possible + memory leak. + + ChangeLog | 6 ++++++ + poppler/CairoOutputDev.cc | 3 +++ + 2 files changed, 9 insertions(+) + +commit 099eb56896046e020f4ef0365e1ee382f85ec1ab +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Aug 15 18:52:20 2007 +0000 + + * poppler/JBIG2Stream.cc: Quick fix for bug #12014 + + ChangeLog | 4 ++++ + poppler/JBIG2Stream.cc | 16 +++++++++++----- + 2 files changed, 15 insertions(+), 5 deletions(-) + +commit 3b7e3645c85c7a3d341457f105835b58c935bd67 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Aug 15 00:04:48 2007 +0000 + + RC2 is out! (0.5.91) + + ChangeLog | 1 + + NEWS | 18 ++++++++++++++++++ + configure.ac | 2 +- + 3 files changed, 20 insertions(+), 1 deletion(-) + +commit c240daefe660ac3456dc0c5f5dc82aa53ebc3313 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Aug 14 23:10:37 2007 +0000 + + * poppler/Stream.cc: Fix CVE-2007-3387 by merging xpdf-3.02pl1.patch + + ChangeLog | 1 + + poppler/Stream.cc | 12 +++++------- + 2 files changed, 6 insertions(+), 7 deletions(-) + +commit 1ba884b6b98ac8d755c9adc9f23a7a68d8b17b54 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Aug 14 22:47:30 2007 +0000 + + * configure.ac: + * pòppler/Makefile.am: Patch by Vincent Torri + <vtorri@univ-evry.fr> to + fix linking under MinGW + + ChangeLog | 6 ++++++ + configure.ac | 13 +++++++++++++ + poppler/Makefile.am | 5 +++-- + 3 files changed, 22 insertions(+), 2 deletions(-) + +commit 3c31f923fcf1aeb361910eb1e9445cc28aa5b3ca +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Aug 7 16:22:12 2007 +0000 + + 2007-08-07 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: Don't use the prescaleMethod + when we have a rotation as that case has not been tested. + Also make sure that scaledHeight is at least 1. + + ChangeLog | 6 ++++++ + poppler/CairoOutputDev.cc | 7 ++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit af97e5f8e0f3beeb43acde92a0788c02d9718adf +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Aug 6 17:41:17 2007 +0000 + + 2007-08-06 Carlos Garcia Campos <carlosgc@gnome.org> + * poppler/Annot.cc: + * poppler/Annot.h: + * poppler/Form.cc: + * poppler/Form.h: + * poppler/Page.cc: Do not always regenerate appearance + stream for + every form widget, but only when it's actually needed. + + ChangeLog | 9 ++++++ + poppler/Annot.cc | 86 + ++++++++++++++++++++++++++++++++++---------------------- + poppler/Annot.h | 8 +++--- + poppler/Form.cc | 25 +++------------- + poppler/Form.h | 4 ++- + poppler/Page.cc | 8 ++---- + 6 files changed, 74 insertions(+), 66 deletions(-) + +commit 74627e71388ca0a4c0938a472c291ef87186f370 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Jul 31 21:40:19 2007 +0000 + + 2007-07-31 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/GlobalParams.cc: s/GList/GooList/ some Windows code. + + ChangeLog | 4 ++++ + poppler/GlobalParams.cc | 8 ++++---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit f421e2151345ac855b75e819e19343a90789b3bf +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Jul 31 16:50:06 2007 +0000 + + 2007-07-31 Jeff Muizelaar <jeff@infidigm.net> + + * glib/poppler-document.cc: + * glib/poppler-document.h: Add + poppler_fonts_iter_get_file_name. + + ChangeLog | 5 +++++ + glib/poppler-document.cc | 16 ++++++++++++++++ + glib/poppler-document.h | 1 + + 3 files changed, 22 insertions(+) + +commit 4d57b8a12b845d5d5ac321d7a4bca980d60d429f +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Jul 31 16:48:35 2007 +0000 + + 2007-07-31 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.h: Add comment about + CairoImageOutputDevice's + implementation. + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.h | 1 + + 2 files changed, 6 insertions(+) + +commit f04a67006abdb5843ab481aa1e25b51abd1b1b64 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jul 31 11:41:53 2007 +0000 + + 2007-07-31 Carlos Garcia Campos <carlosgc@gnome.org> + * poppler/Form.cc: + * poppler/Form.h: Fix memory leak. + + ChangeLog | 5 +++++ + poppler/Form.cc | 9 +++++---- + poppler/Form.h | 4 ++-- + 3 files changed, 12 insertions(+), 6 deletions(-) + +commit ee9d556a8b413160911a535a0e9089b919ca29f5 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jul 31 11:40:22 2007 +0000 + + 2007-07-31 Carlos Garcia Campos <carlosgc@gnome.org> + * poppler/CairoOutputDev.h: Empty implementation of + transparency + groups and soft masks in CairoImageOutputDev. Fixes a crash in + poppler_page_get_image_mapping. + + ChangeLog | 6 ++++++ + poppler/CairoOutputDev.h | 11 +++++++++++ + 2 files changed, 17 insertions(+) + +commit e08779856c801b9968dc2d47e28e86abc1ec7110 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Jul 31 05:29:57 2007 +0000 + + 2007-07-31 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/GfxFont.cc: Fix the case where the Encoding is + "Identity" + and ToUnicode exists. GfxCIDFont::getCodeToGIDMap makes + CIDTOGID map + from ToUnicde map, but when encoding is Identity, it should + not use + ToUnicode map to get GID. If encoding is Identity, No CIDTOGID + map is + needed. + Patch by Koji Otani. + Fixes #11413. + + ChangeLog | 10 ++++++++++ + poppler/GfxFont.cc | 1 + + 2 files changed, 11 insertions(+) + +commit 86fc9a6f343be920f5159e745947401227e41a37 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Mon Jul 30 19:28:17 2007 +0000 + + 2007-07-30 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: Prescale image masks before + giving them + to cairo to improve the quality of the scaled image. Improves + #5589. + + ChangeLog | 6 + + poppler/CairoOutputDev.cc | 300 + ++++++++++++++++++++++++++++++++++++++++++++-- + poppler/CairoOutputDev.h | 10 +- + 3 files changed, 303 insertions(+), 13 deletions(-) + +commit f754246e47161e9bf99887201e283c1419ade4f1 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Mon Jul 30 19:07:45 2007 +0000 + + 2007-07-30 Jeff Muizelaar <jeff@infidigm.net> + + * configure.ac: Update require cairo version to 1.4 + + ChangeLog | 4 ++++ + configure.ac | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit bb20249ac676995725b617ef442f5feb01f78205 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Mon Jul 30 18:44:41 2007 +0000 + + 2007-07-30 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: Add transparency group support. + Fixes #7856. + + ChangeLog | 6 +++ + poppler/CairoOutputDev.cc | 133 + ++++++++++++++++++++++++++++++++++++++++++++++ + poppler/CairoOutputDev.h | 21 +++++++- + 3 files changed, 159 insertions(+), 1 deletion(-) + +commit a85acecaeb0d122becbc52a385d918561e995eca +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Mon Jul 30 00:22:35 2007 +0000 + + 2007-07-29 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: transform the original matrix + for type3 fonts + instead of using set_matrix() + + ChangeLog | 6 ++++++ + poppler/CairoOutputDev.cc | 20 +++++++++++++++++--- + poppler/CairoOutputDev.h | 1 + + 3 files changed, 24 insertions(+), 3 deletions(-) + +commit a81a082169de32d01c36c969616a5c2279f1bac7 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Mon Jul 30 00:18:59 2007 +0000 + + 2007-07-29 Jeff Muizelaar <jeff@infidigm.net> + + * glib/test-poppler-glib.c: include <time.h> to fix + compilation. + + ChangeLog | 4 ++++ + glib/test-poppler-glib.c | 1 + + 2 files changed, 5 insertions(+) + +commit 81393cb30f6287caf5195265cdc039555f2767d3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jul 28 08:22:40 2007 +0000 + + 2007-07-28 Carlos Garcia Campos <carlosgc@gnome.org> + * poppler/Annot.cc: + * poppler/Annot.h: + * poppler/Form.cc: + * poppler/Form.h: Make fieldLookup static in Form and use + it from + both Form and Annot. + + ChangeLog | 8 +++++++ + poppler/Annot.cc | 43 +++++++++++------------------------- + poppler/Annot.h | 1 - + poppler/Form.cc | 66 + +++++++++++++++++++++++++++----------------------------- + poppler/Form.h | 2 ++ + 5 files changed, 54 insertions(+), 66 deletions(-) + +commit 81b669dcb14bf821a49c9879f8d4129075647f5f +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jul 28 08:05:11 2007 +0000 + + 2007-07-28 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-page.h: Remove unneeded declarations. Fixes bug + #11744. Patch by Kouhei Sutou <kou@cozmixng.org>. + + ChangeLog | 5 +++++ + glib/poppler-page.h | 2 -- + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit f2c4e5305009f1da770c99d3e2e3371ff37c75f3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri Jul 27 09:17:40 2007 +0000 + + 2007-07-27 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-document.cc: + * glib/poppler-document.h: + * glib/poppler-private.h: + * glib/test-poppler-glib.c: Make PopplerFontInfo + GObject. Patch by + Kouhei Sutou <kou@cozmixng.org>. + + ChangeLog | 8 ++++++++ + glib/poppler-document.cc | 44 + ++++++++++++++++++++++++++++++++++++++++---- + glib/poppler-document.h | 6 +++++- + glib/poppler-private.h | 1 + + glib/test-poppler-glib.c | 2 +- + 5 files changed, 55 insertions(+), 6 deletions(-) + +commit 975c7cff10d9b00359e147329ae2c7a93f8a3833 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jul 25 17:20:06 2007 +0000 + + micro optimization + + qt4/src/poppler-page.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 525a7f49dd95f2644870a1c59ca15124e30026b4 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jul 24 16:45:25 2007 +0000 + + 2007-07-24 Carlos Garcia Campos <carlosgc@gnome.org> + * poppler/Annot.cc: + * poppler/Form.cc: Several fixes in forms. Generate + appearance for + field buttons that don't have an AP dict. Do not remove + the first + character of the second and following lines in multiline text + fields. Fix a crash with pdf documents created by ooo + which have + radio buttons. Look for some inheritable attributes in the + parent when needed. + + ChangeLog | 10 ++++++++ + poppler/Annot.cc | 27 ++++++++++---------- + poppler/Form.cc | 77 + +++++++++++++++++++++++++++++++++++++++----------------- + 3 files changed, 78 insertions(+), 36 deletions(-) + +commit 633a1cde65f86ee6577a68f4f8d36de43d14c714 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jul 15 21:03:50 2007 +0000 + + * utils/HtmlOutputDev.cc: + * utils/HtmlOutputDev.h: Create the html files in the + correct place, + not in the invocation dir. Fixes bug #11610 + + ChangeLog | 6 ++++++ + utils/HtmlOutputDev.cc | 37 ++++++++++--------------------------- + utils/HtmlOutputDev.h | 4 ---- + 3 files changed, 16 insertions(+), 31 deletions(-) + +commit ccb2d420ca8d818aa9ba1d64f08f5e94ab313a72 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jul 15 17:09:29 2007 +0000 + + * poppler/DCTStream.cc + * poppler/DCTStream.h: Implement less evil error handling. On + a + error_exit level error we don't want to actually exit the + program. See + http://bugs.kde.org/show_bug.cgi?id=147878 for a pdf with this + problem. libjpeg was printing "Bogus Huffman table definition" + and + exiting the program. + * poppler/Stream.cc: Remove bogus #warning + + ChangeLog | 10 ++++++++++ + poppler/DCTStream.cc | 17 ++++++++++++++++- + poppler/DCTStream.h | 1 + + poppler/Stream.cc | 1 - + 4 files changed, 27 insertions(+), 2 deletions(-) + +commit f9d82dfd299ae23a1baf3e35e2c3cd351129c525 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jul 14 18:23:42 2007 +0000 + + * utils/pdftops.cc: init width/height to -1 so it is + calculated if not + specified + + ChangeLog | 5 +++++ + utils/pdftops.cc | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit 1c04136e9538ccfaa2d6b968861682ca3b69ffb3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jul 14 15:23:31 2007 +0000 + + 2007-07-14 Pino Toscano <pino@kde.org> + * glib/poppler-action.h: + * glib/poppler-document.h: Remove trailing comma from the last + item of enums. + + ChangeLog | 6 ++++++ + glib/poppler-action.h | 2 +- + glib/poppler-document.h | 8 ++++---- + 3 files changed, 11 insertions(+), 5 deletions(-) + +commit b9b68cabce19a5e23911e5432ace8c13bd237391 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jul 14 15:15:57 2007 +0000 + + 2007-07-14 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-form-field.cc: + * glib/poppler-form-field.h: + * glib/test-poppler-glib.c: Make is_password a property + instead of + a text form field type, since a text field could be + multiline and + password at the same time. + + ChangeLog | 8 ++++++++ + glib/poppler-form-field.cc | 10 ++++++++-- + glib/poppler-form-field.h | 2 +- + glib/test-poppler-glib.c | 4 ++-- + 4 files changed, 19 insertions(+), 5 deletions(-) + +commit 14a8361039d708661b8699b2e7c4496135021a85 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 13 22:18:05 2007 +0000 + + * fofi/FoFiTrueType.cc + * fofi/FoFiTrueType.h + * poppler/CairoFontEngine.cc + * poppler/CharCodeToUnicode.cc + * poppler/CharCodeToUnicode.h + * poppler/GfxFont.cc + * poppler/GfxFont.h + * poppler/SplashOutputDev.cc: Patch by + Koji Otani <sho@bbr.jp> to fix several problems with + Japanese fonts. + Fixes bug 11413 + + ChangeLog | 13 ++ + fofi/FoFiTrueType.cc | 305 + +++++++++++++++++++++++++++++++++++++++++++ + fofi/FoFiTrueType.h | 12 ++ + poppler/CairoFontEngine.cc | 47 ++----- + poppler/CharCodeToUnicode.cc | 16 +++ + poppler/CharCodeToUnicode.h | 1 + + poppler/GfxFont.cc | 230 ++++++++++++++++++++++++++++---- + poppler/GfxFont.h | 2 + + poppler/SplashOutputDev.cc | 53 ++------ + 9 files changed, 577 insertions(+), 102 deletions(-) + +commit 8389099d8e8940e3f8920b14a83075d69bcd8e6c +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 13 18:21:02 2007 +0000 + + * poppler/FontInfo.cc: Fix the FontInfoScanner::scan method to + actually scan the number of requested pages + + ChangeLog | 6 ++++++ + poppler/FontInfo.cc | 12 ++++++------ + 2 files changed, 12 insertions(+), 6 deletions(-) + +commit 9ced4442372d08375e0ded62f79052d8a3ec9cd6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 13 18:08:44 2007 +0000 + + * poppler/GlobalParams.cc: Remove dead unused code from + Win32 ifdef + + ChangeLog | 4 ++++ + poppler/GlobalParams.cc | 6 ------ + 2 files changed, 4 insertions(+), 6 deletions(-) + +commit fb89fdb8de608ff94082e16819f042cddabf2bcc +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jul 11 18:52:12 2007 +0000 + + * poppler/PSOutputDev.cc + * poppler/PSOutputDev.h + * utils/pdftohtml.cc: Fix bug 9746. pdftohtml complex mode + had text + twice + + ChangeLog | 7 +++++++ + poppler/PSOutputDev.cc | 5 +++++ + poppler/PSOutputDev.h | 2 ++ + utils/pdftohtml.cc | 3 +-- + 4 files changed, 15 insertions(+), 2 deletions(-) + +commit 0c9fa59bf5edf3cfcca1792da51b904a7c7f7615 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jul 11 18:30:19 2007 +0000 + + 2007-07-11 Carlos Garcia Campos <carlosgc@gnome.org> + * poppler/Form.cc: + * poppler/XRef.cc: + * poppler/XRef.h: Fix memory leak. + + ChangeLog | 6 ++++++ + poppler/Form.cc | 49 ++++++++++++++++++++++++------------------------- + poppler/XRef.cc | 22 ++++++++++------------ + poppler/XRef.h | 2 +- + 4 files changed, 41 insertions(+), 38 deletions(-) + +commit 4ae7d43bd54c5b3e2f08c48441f741d3099e228f +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jul 11 18:12:26 2007 +0000 + + * goo/GooVector.h: Rename guard from _VECTOR_H to GOO_VECTOR_H + * goo/gfile.cc: GString -> GooString in Windows code + * poppler/GlobalParams.cc: GString -> GooString in Windows + code + * splash/SplashT1FontEngine.cc + * splash/SplashT1FontEngine.h + * splash/SplashT1FontFile.cc + * splash/SplashT1FontFile.h: T1 code is not supported, + but at least + make it compile :-D + + ChangeLog | 11 +++++++++++ + goo/GooVector.h | 4 ++-- + goo/gfile.cc | 6 +++--- + poppler/GlobalParams.cc | 26 +++++++++++++------------- + splash/SplashFontEngine.cc | 2 +- + splash/SplashT1FontEngine.cc | 8 ++++---- + splash/SplashT1FontEngine.h | 7 +++---- + splash/SplashT1FontFile.cc | 8 +++++--- + splash/SplashT1FontFile.h | 4 ++-- + 9 files changed, 44 insertions(+), 32 deletions(-) + +commit 7bd125ce96c603fd5cf42d7c6a29b542e82dd4ec +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jul 11 18:08:07 2007 +0000 + + 2007-07-11 Carlos Garcia Campos <carlosgc@gnome.org> + * poppler/Form.cc: + * poppler/Form.h: + * glib/poppler-form-field.cc: + * glib/poppler-form-field.h: + * glib/test-poppler-glib.c: Add a method to get the max length + allowed in text form fields. + + ChangeLog | 9 +++++++++ + glib/poppler-form-field.cc | 8 ++++++++ + glib/poppler-form-field.h | 1 + + glib/test-poppler-glib.c | 1 + + poppler/Form.cc | 11 +++++++++++ + poppler/Form.h | 4 ++++ + 6 files changed, 34 insertions(+) + +commit 8a68855735e9d295d71685e82de39204d639ea7a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Jul 9 08:52:58 2007 +0000 + + 2007-07-09 Carlos Garcia Campos <carlosgc@gnome.org> + * poppler/Annot.cc: + * poppler/Annot.h: Render '*' instead of the actual content in + password form fields. Patch by Julien Rebetez + <julien@fhtagn.net> + + ChangeLog | 6 ++++++ + poppler/Annot.cc | 52 + +++++++++++++++++++++++++++++----------------------- + poppler/Annot.h | 5 +++-- + 3 files changed, 38 insertions(+), 25 deletions(-) + +commit 53cf7d7084dc03a28239f11c94f2095bb02d6108 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jul 7 16:23:56 2007 +0000 + + 2007-07-07 Carlos Garcia Campos <carlosgc@gnome.org> + * poppler/Form.cc: + * poppler/Form.h: + * glib/poppler-form-field.cc: + * glib/poppler-form-field.h: + * glib/test-poppler-glib.c: Add a method to get the type of + a Form + Field Button. + + ChangeLog | 9 +++++++++ + glib/poppler-form-field.cc | 18 ++++++++++++++++++ + glib/poppler-form-field.h | 8 ++++++++ + glib/test-poppler-glib.c | 26 +++++++++++++++++++++++--- + poppler/Form.cc | 5 +++++ + poppler/Form.h | 2 ++ + 6 files changed, 65 insertions(+), 3 deletions(-) + +commit de0a40181e5832a0dc263d40ed0a269867764623 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jul 7 15:28:29 2007 +0000 + + 2007-07-07 Carlos Garcia Campos <carlosgc@gnome.org> + * poppler/Form.cc: Fix a crash when setting state on + buttons that + don't have state. + + ChangeLog | 5 +++++ + poppler/Form.cc | 3 +++ + 2 files changed, 8 insertions(+) + +commit a33518a3283ff25aa5517bc535ddb61383b1cfdc +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 6 09:08:44 2007 +0000 + + * poppler/Form.cc: Fix a bug with FormField's destructor + which was not + checking if the FormField is terminal to determine wether + it needs to + delete children or widgets. Patch by + Julien Rebetez <julien@fhtagn.net> + + ChangeLog | 4 ++++ + poppler/Form.cc | 17 +++++++++++------ + 2 files changed, 15 insertions(+), 6 deletions(-) + +commit 43f0d5b9bb198cdcbc2f7111f294c6f947105314 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 6 08:47:11 2007 +0000 + + * goo/GooString.cc: + * poppler/ABWOutputDev.cc: Build on Sun Force compiler, + patch by + Darren Kenny <darren.kenny@sun.com> + + ChangeLog | 6 ++++++ + goo/GooString.cc | 2 +- + poppler/ABWOutputDev.cc | 4 +++- + 3 files changed, 10 insertions(+), 2 deletions(-) + +commit 4e7405071b69889362e4d49de3f881f0e3e261e3 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 5 13:04:01 2007 +0000 + + 2007-07-05 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-form-field.cc: Allow to set NULL in form fields + that can contain text. + + ChangeLog | 5 +++++ + glib/poppler-form-field.cc | 30 ++++++++++++------------------ + 2 files changed, 17 insertions(+), 18 deletions(-) + +commit 625510797c528257527003477fe28adbacfe80e7 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Thu Jul 5 08:13:51 2007 +0000 + + 2007-07-05 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-attachment.cc: + * glib/poppler-attachment.h: + * glib/test-poppler-glib.c: Rename cdate and mdate again + to ctime + and mtime, since they are public attributes and we don't + want to + break the API. + + ChangeLog | 8 ++++++++ + glib/poppler-attachment.cc | 4 ++-- + glib/poppler-attachment.h | 4 ++-- + glib/test-poppler-glib.c | 4 ++-- + 4 files changed, 14 insertions(+), 6 deletions(-) + +commit 9b2640f156f24b07c797d9461f84e64d550efa1a +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jul 4 13:57:31 2007 +0000 + + * qt4/src/poppler-form.cc: QStringToGooString -> + QStringToUnicodeGooString has FormWidgetText::setContent + wants to have + the unicode formated string + * qt4/src/poppler-private.h: create QStringToUnicodeGooString + + ChangeLog | 7 +++++++ + qt4/src/poppler-form.cc | 2 +- + qt4/src/poppler-private.h | 15 +++++++++++++++ + 3 files changed, 23 insertions(+), 1 deletion(-) + +commit b70115cf979b29f75c644518ae0e9c0dd9892ebf +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jul 4 13:06:38 2007 +0000 + + 2007-07-04 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-form-field.cc: Convert strings from UTF8 + to UTF16BE + before setting them. + + ChangeLog | 5 +++++ + glib/poppler-form-field.cc | 34 ++++++++++++++++++++++++---------- + 2 files changed, 29 insertions(+), 10 deletions(-) + +commit d37843877a6f93a9f27502d07ad82cba79e9aa73 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Wed Jul 4 08:26:52 2007 +0000 + + 2007-07-04 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-attachment.cc: + * glib/poppler-attachment.h: Add size, creation and + modification + date and checksum properties to attachments. Fix memory leaks. + * glib/test-poppler-glib.c: + * glib/poppler.h: + * glib/poppler-private.h: + * glib/poppler-document.cc: Add a function to convert a + pdf date + into a GTime that is used by attachments and document + properties. Fix memory leak in attachments. + + ChangeLog | 12 ++++ + glib/poppler-attachment.cc | 25 +++++++- + glib/poppler-attachment.h | 16 ++--- + glib/poppler-document.cc | 142 + +++++++++++++++++++++++---------------------- + glib/poppler-private.h | 6 +- + glib/poppler.h | 1 + + glib/test-poppler-glib.c | 56 +++++++++++++++--- + 7 files changed, 171 insertions(+), 87 deletions(-) + +commit d933f47d4af0992059148259a189373b42499bbe +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jul 3 20:31:20 2007 +0000 + + * qt4/tests/poppler-fonts.cpp: For the sake of completeness, + add all + the enums + + ChangeLog | 2 ++ + qt4/tests/poppler-fonts.cpp | 28 ++++++++++++++++++++-------- + 2 files changed, 22 insertions(+), 8 deletions(-) + +commit d90b166cfbdc4857351baa627d158d5e0b6652b4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jul 3 16:46:51 2007 +0000 + + * poppler/Catalog.cc: Fix crash, + embeddedFileNameTree.getName(i) + returns a reference to its own data so does not have to + be deleted + * qt4/tests/poppler-attachments.cpp: Delete the doc, just + for sake of + correctness + + ChangeLog | 7 +++++++ + poppler/Catalog.cc | 1 - + qt4/tests/poppler-attachments.cpp | 1 + + 3 files changed, 8 insertions(+), 1 deletion(-) + +commit 7fa87eb2b093770271bc3a72de5b0b9dc228aa1b +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jul 3 14:01:40 2007 +0000 + + 2007-07-03 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-form-field.cc: + * glib/poppler-form-field.h: + * glib/test-poppler-glib.c: Add choice_commit_on_change + function + to glib bindings. + + ChangeLog | 7 +++++++ + glib/poppler-form-field.cc | 8 ++++++++ + glib/poppler-form-field.h | 1 + + glib/test-poppler-glib.c | 2 ++ + 4 files changed, 18 insertions(+) + +commit 8b67e0403f6eaab6770cc0b7861074ae0b6d85bb +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Tue Jul 3 13:49:18 2007 +0000 + + 2007-07-03 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-form-field.cc: + * glib/poppler-form-field.h: + * glib/test-poppler-glib.c: Fix a typo. + + ChangeLog | 6 ++++++ + glib/poppler-form-field.cc | 2 +- + glib/poppler-form-field.h | 2 +- + glib/test-poppler-glib.c | 2 +- + 4 files changed, 9 insertions(+), 3 deletions(-) + +commit 33a5765eb404a4b321b09c26af74c1ed64a5d474 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jul 3 13:22:54 2007 +0000 + + * poppler/Catalog.cc: + * poppler/Catalog.h: Add size and checksum properties to + the embeded + files + * qt4/src/poppler-embeddedfile.cc: + * qt4/src/poppler-qt4.h: Add size and checksum properties + to the qt4 + frontend + + ChangeLog | 9 +++++++++ + poppler/Catalog.cc | 19 ++++++++++++++++--- + poppler/Catalog.h | 13 +++++++++++-- + qt4/src/poppler-embeddedfile.cc | 16 ++++++++++++++++ + qt4/src/poppler-qt4.h | 14 ++++++++++++++ + 5 files changed, 66 insertions(+), 5 deletions(-) + +commit c7d21f9354bbe090cce6459124dcaadf1e46639e +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Jul 2 13:39:32 2007 +0000 + + 2007-07-02 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-form-field.cc: + * glib/poppler-form-field.h: + * glib/test-poppler-glib.c: + Use FILE_SELECT instead of FILESELECT and fix a typo. Patch by + Kouhei Sutou + + ChangeLog | 9 +++++++++ + glib/poppler-form-field.cc | 2 +- + glib/poppler-form-field.h | 2 +- + glib/test-poppler-glib.c | 2 +- + 4 files changed, 12 insertions(+), 3 deletions(-) + +commit 5e301064c62c6d58f488839d7bf804af912a3de1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Mon Jul 2 13:34:26 2007 +0000 + + 2007-07-02 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-form-field.cc: + * glib/poppler-form-field.h: + * glib/test-poppler-glib.c: + Add poppler_form_field_is_read_only to glib bindings. Patch by + Kouhei Sutou + + ChangeLog | 9 +++++++++ + glib/poppler-form-field.cc | 8 ++++++++ + glib/poppler-form-field.h | 1 + + glib/test-poppler-glib.c | 6 +++++- + 4 files changed, 23 insertions(+), 1 deletion(-) + +commit 11875746ce28e8999bcad46167fcfea131cd267a +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jun 30 08:33:30 2007 +0000 + + 2007-06-30 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-page.cc: Use poppler_page_transition_get_type + instead of poppler_page_transition which doesn't exist. Patch + by + Kouhei Sutou + + ChangeLog | 6 ++++++ + glib/poppler-page.cc | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 0a5acaae3b9bfcd731bc4e072f35f9433aa773da +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jun 30 08:25:15 2007 +0000 + + 2007-06-30 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/Makefile.am: + * glib/poppler-form-field.cc: + * glib/poppler-form-field.h: + * glib/poppler-document.cc: + * glib/poppler-document.h: + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler-private.h: + * glib/poppler.h: + * glib/test-poppler-glib.c: Improve forms API in the glib + bindings + in order to make it more consistent with the current API and + easier to use. + + ChangeLog | 15 +++ + glib/Makefile.am | 2 + + glib/poppler-document.cc | 197 ++-------------------------- + glib/poppler-document.h | 55 +------- + glib/poppler-form-field.cc | 316 + +++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-form-field.h | 96 ++++++++++++++ + glib/poppler-page.cc | 210 ++++++++++++------------------ + glib/poppler-page.h | 55 ++------ + glib/poppler-private.h | 11 +- + glib/poppler.h | 40 +++--- + glib/test-poppler-glib.c | 119 ++++++++++++++--- + 11 files changed, 662 insertions(+), 454 deletions(-) + +commit 2212874e57a6eb9db733b2e9a98f0cfcb88a8fc1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 26 21:31:07 2007 +0000 + + * poppler/Form.cc: Don't crash on documents with AcroForm + but no + AcroForm->Fields (it's mandatory but...) + + ChangeLog | 5 +++++ + poppler/Form.cc | 54 + +++++++++++++++++++++++++++++------------------------- + 2 files changed, 34 insertions(+), 25 deletions(-) + +commit e48ee9c4af6bf98b6988c51dcab9ee9ef6e3cafe +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sat Jun 23 18:06:07 2007 +0000 + + 2007-06-23 Carlos Garcia Campos <carlosgc@gnome.org> + * poppler/Annot.cc: + * poppler/Form.cc: Fix memory leaks. + + ChangeLog | 5 +++++ + poppler/Annot.cc | 2 +- + poppler/Form.cc | 13 +++++++++---- + 3 files changed, 15 insertions(+), 5 deletions(-) + +commit d874a2753e3ac51b6f539dfdf980435c8c381b4f +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 20 20:07:15 2007 +0000 + + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-document.cc: Allow access to a document's + metadata contents + from the qt4 binding. Based on patch by Jason Kivlighn + * qt4/tests/test-poppler-qt4.cpp: Print metadata if it exists + + ChangeLog | 5 +++++ + qt4/src/poppler-document.cc | 13 +++++++++++++ + qt4/src/poppler-qt4.h | 5 +++++ + qt4/tests/test-poppler-qt4.cpp | 1 + + 4 files changed, 24 insertions(+) + +commit 08d4c437e735ac50a340c4ae17ee0eeccd00dc20 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 20 18:40:03 2007 +0000 + + * glib/poppler-document.cc: Allow access to a document's + metadata stream + through the glib binding. Patch by Jason Kivlighn + <jkivlighn@gmail.com> Approved by Carlos + + ChangeLog | 6 ++++++ + glib/poppler-document.cc | 21 +++++++++++++++++++++ + 2 files changed, 27 insertions(+) + +commit cdd2a49dc99aa16ded674c58dbb50298f06cf18a +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jun 15 18:15:53 2007 +0000 + + * poppler/ABWOutputDev.cc: Replaces the getBiggestSeperator + function + at the ABWoutputdev with one that is easier to read/debug + and less likely to contain bugs. Some cosmetic fixes at the + functions recursiveXYC and splitnodes. Patch by + Jauco Noordzij <jauco.noordzij@gmail.com>. More info at + bug #11273 + + ChangeLog | 8 + + poppler/ABWOutputDev.cc | 384 + ++++++++++++------------------------------------ + 2 files changed, 106 insertions(+), 286 deletions(-) + +commit 7f23383197b0e2fa24be7b4925ea6f39eb95bbc1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 13 20:39:21 2007 +0000 + + * poppler/ABWOutputDev.cc + * poppler/ABWOutputDev.h: Remove dependency on debugxml. Patch + by + Jauco Noordzij <jauco.noordzij@gmail.com>. Fixes bug #11187 + + ChangeLog | 6 ++++ + poppler/ABWOutputDev.cc | 80 + ++++++++++++++++++++++++++++++++++++++++++++++++- + poppler/ABWOutputDev.h | 1 + + 3 files changed, 86 insertions(+), 1 deletion(-) + +commit 948520cd529ce47d1970aae6a0b8058128e37c30 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 13 18:50:40 2007 +0000 + + * goo/FixedPoint.h + * goo/gmem.h + * poppler/SecurityHandler.h + * poppler/poppler-config.h.in + * utils/ImageOutputDev.h: + Patch by Axel Howind <Axel.Howind@htp-tel.de> + - include USE_EXCEPTIONS and USE_FIXEDPOINT in + poppler-config.h.in + - fix typo (MULTITHREADED/MULTITHREADING) in + poppler.config.h.in + - change installed headers to include poppler-config.h + instead of + config.h + - use <poppler/poppler-config.h> instead of <poppler-config.h> + so that + installed headers can be used without including + .../include/poppler + in the include path + + ChangeLog | 16 ++++++++++++++++ + goo/FixedPoint.h | 2 +- + goo/gmem.h | 2 +- + poppler/SecurityHandler.h | 2 +- + poppler/poppler-config.h.in | 12 +++++++++++- + utils/ImageOutputDev.h | 2 +- + 6 files changed, 31 insertions(+), 5 deletions(-) + +commit 825461e47b05595805e87a0d2960b07197c8da8b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 13 18:24:56 2007 +0000 + + configure.ac: Fix detection of glib + + ChangeLog | 4 ++++ + configure.ac | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit a67a93fc6b4812a4f892b311c5b299e59283cd47 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jun 11 21:14:22 2007 +0000 + + * poppler/CMap.h: + * poppler/CharCodeToUnicode.h: + * poppler/GlobalParams.h: + * poppler/PageLabelInfo.h: + * poppler/UnicodeMap.h: Further include cleanup. Patch by + Axel Howind + on bug #11228 + + ChangeLog | 9 +++++++++ + poppler/CMap.h | 2 +- + poppler/CharCodeToUnicode.h | 2 +- + poppler/GlobalParams.h | 2 +- + poppler/PageLabelInfo.h | 6 +++--- + poppler/UnicodeMap.h | 2 +- + 6 files changed, 16 insertions(+), 7 deletions(-) + +commit 051b31af053cac4727718169b79b25451a4bdd95 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jun 11 21:11:05 2007 +0000 + + * qt/poppler-qt.h + * qt4/src/poppler-qt4.h: Headers cleanup + + ChangeLog | 5 +++++ + qt/poppler-qt.h | 6 +++--- + qt4/src/poppler-qt4.h | 8 ++++---- + 3 files changed, 12 insertions(+), 7 deletions(-) + +commit 3e1597b80fc6750f1ec3269f9819aa8225879524 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jun 8 22:39:23 2007 +0000 + + poppler/Annot.cc: Fix leak + + ChangeLog | 4 ++++ + poppler/Annot.cc | 1 + + 2 files changed, 5 insertions(+) + +commit 49535c20b4f71d1c1381134233e2e1449cf560c0 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Thu Jun 7 21:23:03 2007 +0000 + + 2007-06-07 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/ABWOutputDev.cc: Change "and", "or", "not" to "&&", + "||", + "!" for consistency with the rest of the code. Patch by + Jens Granseuer + + ChangeLog | 5 +++ + poppler/ABWOutputDev.cc | 93 + +++++++++++++++++++++++++------------------------ + 2 files changed, 52 insertions(+), 46 deletions(-) + +commit dd8fa975bf51dd18120369d0ef2d8f1781e04d93 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jun 2 09:18:11 2007 +0000 + + correct form of patch 11102 + + utils/HtmlFonts.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit cdf70857ece0748f13b11c923ccf9626094555b4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jun 1 18:34:48 2007 +0000 + + * poppler/ArthurOutputDev.cc + * splash/SplashFTFont.cc + * splash/SplashMath.h: Make it compile with + --enable-fixedpoint. Fixes + bug 11110 + + ChangeLog | 7 +++++++ + poppler/ArthurOutputDev.cc | 8 ++++---- + splash/SplashFTFont.cc | 8 ++++---- + splash/SplashMath.h | 2 +- + 4 files changed, 16 insertions(+), 9 deletions(-) + +commit 90b1a404629a884cc32737a3a729c9a75f7a59c1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 30 18:33:24 2007 +0000 + + * configure.ac: Fix to check for glib-2.0 not glib that is + 1.0. Patch + came though Pardus developers and they don't remember where + they got + it from. + + ChangeLog | 6 ++++++ + configure.ac | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 03d766ea1ddd4ce6d938f96b53906a7dc8bd179a +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 30 18:29:57 2007 +0000 + + make dist needs this + + qt4/src/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +commit d540c04268047fdd125ad932ca05c7553a97c0fe +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 30 17:50:00 2007 +0000 + + * utils/HtmlFonts.cc: Make pdftohtml not pollute stdout. Patch + by + Nanning Buitenhuis <nanning@elvenkind.com> + + And some changes in glib/reference/tmpl + + ChangeLog | 5 + + glib/reference/tmpl/poppler-document.sgml | 4 + + glib/reference/tmpl/poppler-enums.sgml | 150 + ++++++++++++++++++++++++++++++ + glib/reference/tmpl/poppler-page.sgml | 5 +- + glib/reference/tmpl/poppler-unused.sgml | 130 + -------------------------- + utils/HtmlFonts.cc | 2 +- + 6 files changed, 162 insertions(+), 134 deletions(-) + +commit ce414f2a36f4d97a3bddfd42baabdc1e34bf9321 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue May 29 22:01:58 2007 +0000 + + 2007-05-29 Kristian Høgsberg <krh@redhat.com> + + * poppler/gen-unicode-tables.py: Add this script to fix + distcheck. + + ChangeLog | 4 ++++ + poppler/gen-unicode-tables.py | 38 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 42 insertions(+) + +commit 97e602752b05f3690acb1821bdca31c5771361e1 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun May 27 11:24:40 2007 +0000 + + 2007-05-27 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/test-poppler-glib.c: Add forms test + * glib/poppler-page.cc: + * glib/poppler-page.h: + Fix indentation, some code cleanups and memory leaks. + + ChangeLog | 7 ++ + glib/poppler-page.cc | 198 + ++++++++++++++++++++++++++++------------------- + glib/poppler-page.h | 6 +- + glib/test-poppler-glib.c | 39 ++++++++++ + 4 files changed, 168 insertions(+), 82 deletions(-) + +commit 3d31c2b1ea913fc80211f1c6fed9b3666f124049 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun May 27 10:12:56 2007 +0000 + + 2007-05-27 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-page.cc: + * glib/poppler-page.h: + Add missing image mapping type definition. + + ChangeLog | 6 ++++++ + glib/poppler-page.cc | 48 + +++++++++++++++++++++++++++++++++++++++++++++--- + glib/poppler-page.h | 5 +++++ + 3 files changed, 56 insertions(+), 3 deletions(-) + +commit 8284a769568322066a9d4626bd9b2cf3d18a6487 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 26 23:20:12 2007 +0000 + + * configure.ac: + * NEWS: Bump release to 0.5.9 (0.6 Release Candidate) + + ChangeLog | 2 ++ + NEWS | 15 +++++++++++++++ + configure.ac | 2 +- + 3 files changed, 18 insertions(+), 1 deletion(-) + +commit e6ff9e0d95e058f6aff3c72d5f4d7d7ccf661999 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 26 22:33:21 2007 +0000 + + * poppler-qt.pc.in: + * poppler-qt4.pc.in: + * qt/Makefile.am: + * qt4/src/Makefile.am: Install qt3 and qt4 headers in + separate dirs. + That way be can reuse poppler-page-transition.h and distros + don't get + conflicts when making separate qt3 and qt4 packages + + ChangeLog | 9 +++++++++ + poppler-qt.pc.in | 2 +- + poppler-qt4.pc.in | 2 +- + qt/Makefile.am | 2 +- + qt4/src/Makefile.am | 2 +- + 5 files changed, 13 insertions(+), 4 deletions(-) + +commit fefefe495a182c1745314186b99441b9e76ba5b4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri May 25 23:17:58 2007 +0000 + + * qt4/src/poppler-link-extractor-private.cc: + * qt4/src/poppler-link-extractor-private.h: + * qt4/src/poppler-link.cc: + * qt4/src/poppler-link.h: Return link coordinates in 0..1 + range + instead of 0..size, much more easier to do user<->dev + transformations + * qt4/src/poppler-private.h: Fix indentation + + ChangeLog | 6 ++++++ + qt4/src/poppler-link-extractor-private.h | 1 + + qt4/src/poppler-link-extractor.cc | 12 ++++++------ + qt4/src/poppler-link.cc | 25 +++++++++++++++---------- + qt4/src/poppler-link.h | 7 ++++++- + qt4/src/poppler-private.h | 15 ++++++++------- + 6 files changed, 42 insertions(+), 24 deletions(-) + +commit ecaeaa9512d1dae4a036703ea8739102a8e463f0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri May 25 22:30:20 2007 +0000 + + * qt4/src/poppler-link-extractor.cc: Use correct page box + to extract + link clickable area + + ChangeLog | 5 +++++ + qt4/src/poppler-link-extractor.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 774a9456c668ef70b2e8f17d59f8f427aa97bad5 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Fri May 25 18:43:04 2007 +0000 + + 2007-05-25 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/GfxFont.cc: + * poppler/GfxFont.h: + * poppler/GlobalParams.cc: + Don't cache DisplayFontParams by font name, instead cache them + in GfxFont. Fixes #8140. + + ChangeLog | 8 ++++++++ + poppler/GfxFont.cc | 2 ++ + poppler/GfxFont.h | 6 ++++++ + poppler/GlobalParams.cc | 4 ++-- + 4 files changed, 18 insertions(+), 2 deletions(-) + +commit a88fadf0bb9af55c83c9c4f7d08deb17d6aa9ae4 +Author: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Fri May 25 17:33:37 2007 +0000 + + 2007-05-25 Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler.h: + Add selection style parameter to render_selection in order + to allow + requesting selections of words and paragraphs. + + ChangeLog | 8 ++++++++ + glib/poppler-page.cc | 30 ++++++++++++++++-------------- + glib/poppler-page.h | 6 ++++-- + glib/poppler.h | 7 +++++++ + 4 files changed, 35 insertions(+), 16 deletions(-) + +commit bf195b489c22875695e202d6ca6659144ef57e61 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 23 21:20:58 2007 +0000 + + * qt4/src/poppler-document.cc: + * qt4/src/poppler-private.h: + Better handle the setting of the vector antialiasing for + Splash. + * qt4/src/Mainpage.dox: + * qt4/src/poppler-link.h: + * qt4/src/poppler-qt4.h: + A few of API documentation fixes and improvements. + + ChangeLog | 10 ++++++++ + qt4/src/Mainpage.dox | 8 ++----- + qt4/src/poppler-document.cc | 5 ++-- + qt4/src/poppler-link.h | 4 +++- + qt4/src/poppler-private.h | 1 + + qt4/src/poppler-qt4.h | 57 + ++++++++++++++++++++++++++++++--------------- + 6 files changed, 57 insertions(+), 28 deletions(-) + +commit 36d1fe292778ba29990a389c50a0df0d51f11913 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 21 21:42:38 2007 +0000 + + Fix assert in bug 11023 + + ChangeLog | 4 ++++ + glib/poppler-action.cc | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 5b411246a2cce6ed3bb2d8c9e9d856227b6aba7f +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 21 21:39:08 2007 +0000 + + * glib/poppler-page.cc: + * glib/poppler-page.h: + poppler_page_render_section() for cairo. Bug 7023 + + ChangeLog | 6 ++++ + glib/poppler-page.cc | 88 + ++++++++++++++++++++++++++++++++++++++++++++++------ + glib/poppler-page.h | 9 ++++++ + 3 files changed, 93 insertions(+), 10 deletions(-) + +commit 409f2a9cb31add29accb87011331c50dc08110cd +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 21 21:35:10 2007 +0000 + + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler-private.h: + * glib/poppler.h: + * glib/test-poppler-glib.c: + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: Extend CairoOutputdev to do + image caching when rendering + + ChangeLog | 11 +++ + glib/poppler-page.cc | 161 ++++++++++++++++++++++++++++++++-- + glib/poppler-page.h | 10 +++ + glib/poppler-private.h | 3 + + glib/poppler.h | 9 +- + glib/test-poppler-glib.c | 27 +++++- + poppler/CairoOutputDev.cc | 215 + ++++++++++++++++++++++++++++++++++++++++++++++ + poppler/CairoOutputDev.h | 122 ++++++++++++++++++++++++++ + 8 files changed, 545 insertions(+), 13 deletions(-) + +commit afd11ec66430dae084b5a5560333e933460fc637 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 21 21:29:09 2007 +0000 + + * poppler/Annot.cc: avoid crashing if the font for the + drawing methods + can not be found + * poppler/Form.cc: fix memory leak + * qt4/src/poppler-private.h: fix the UnicodeParsedString + function to + really work and not crash + * splash/SplashTypes.h: RGB8X mode makes max number of + components in + any SplashColor always be 4 + + ChangeLog | 11 +++++++++++ + poppler/Annot.cc | 6 ++++++ + poppler/Form.cc | 1 + + qt4/src/poppler-private.h | 5 ++++- + splash/SplashTypes.h | 6 +----- + 5 files changed, 23 insertions(+), 6 deletions(-) + +commit f019c8a8efde004e1663ea88cb48c0e46318d936 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu May 17 21:32:57 2007 +0000 + + 2007-05-17 Pino Toscano <pino@kde.org> + + * qt4/src/poppler-link.cc: + Give some default values to LinkDestination + * qt4/src/poppler-private.h: + Fix memory leak when converting QString -> GooString + + ChangeLog | 7 +++++++ + qt4/src/poppler-link.cc | 12 ++++++++++++ + qt4/src/poppler-private.h | 4 +++- + 3 files changed, 22 insertions(+), 1 deletion(-) + +commit d68a4eb44b5390b3093774f39a6805ad2e95c146 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun May 13 00:53:43 2007 +0000 + + 2007-05-12 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/Annot.cc: Only do appearance generation for text, + choice or + other fields that contain text. Patch by Julien Rebetez. + + ChangeLog | 5 +++++ + poppler/Annot.cc | 52 + ++++++++++++++++++++++++++++++++++++++++++++++------ + 2 files changed, 51 insertions(+), 6 deletions(-) + +commit 96f8731e90af1abce67d00a3febc11880c69ce62 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 7 18:41:09 2007 +0000 + + * Catalog.cc: Fix leak + * Form.cc: Fix leak, provide empty + FormPageWidgets::~FormPageWidgets + implementation + * Page.cc: Fix leak + + ChangeLog | 7 +++++++ + poppler/Catalog.cc | 1 + + poppler/Form.cc | 5 +++++ + poppler/Page.cc | 1 + + 4 files changed, 14 insertions(+) + +commit d46553d696b2d7fe416ce8db40db54dd1d7c6733 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Apr 30 22:34:21 2007 +0000 + + * poppler/Makefile.am: Don't link cairo to all poppler, + just to + poppler_cairo so when compiling the qt frontend and the + glib frontend + the qt one does not end up depending on cairo + + ChangeLog | 6 ++++++ + poppler/Makefile.am | 1 - + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit d5c52409c532a126bcb8eb65f6f1390113a5f258 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Apr 29 17:37:38 2007 +0000 + + jeff committed this line by mistake + + ChangeLog | 1 - + 1 file changed, 1 deletion(-) + +commit 6ddc11ef4c534369ee104422bfb989603c466790 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Apr 29 17:33:58 2007 +0000 + + 2007-04-29 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/UnicodeTypeTable.cc: Make some of the unicode + tables const + which gets rid of about 20k of data. + + text data bss dec hex filename + before: 1415838 128864 8 1544710 179206 libpoppler.so + after: 1404574 140128 8 1544710 179206 libpoppler.so + + ChangeLog | 10 ++++++++++ + poppler/UnicodeTypeTable.cc | 24 ++++++++++++------------ + 2 files changed, 22 insertions(+), 12 deletions(-) + +commit c5613ab5ce65fc84eb3a5584cee1454171173fa7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 28 23:25:59 2007 +0000 + + * poppler/SplashOutputDev.cc: + * qt/poppler-private.h: + * qt4/src/poppler-private.h: + * splash/Splash.cc: + * splash/SplashBitmap.cc: + * splash/SplashTypes.h: Rename splashModeRGBX8 to + splashModeXBGR8 and + hopefully fix qt frontends image generation + + ChangeLog | 10 +++++ + poppler/SplashOutputDev.cc | 102 + +++++++++++++++++++++++++++++++++------------ + qt/poppler-private.h | 2 +- + qt4/src/poppler-private.h | 2 +- + splash/Splash.cc | 44 +++++++++---------- + splash/SplashBitmap.cc | 16 +++---- + splash/SplashTypes.h | 4 +- + 7 files changed, 120 insertions(+), 60 deletions(-) + +commit 6479ce224f1393235ca9888dfe0710327fbfccd2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 28 22:12:22 2007 +0000 + + fix merging problems + + splash/Splash.cc | 1 + + splash/SplashBitmap.cc | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit e2ac4ada3e29139053871ff7f53772e1ccc7adc0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 28 15:39:36 2007 +0000 + + \n at the end of the printf + Although i'm not sure we want to printf this... + + poppler/GlobalParams.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9b8133940638c95940edcb9b98126ca9a4f7b8d4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 28 12:00:38 2007 +0000 + + * qt4/src/Makefile.am: + * qt4/src/poppler-document.cc: + * qt4/src/poppler-ps-converter.cc: + * qt4/src/poppler-qt4.h: Replace Document::print function + with lots of + arguments with a helper class with lots of functions. Will + help + mantaining BC in case we decide to add more functionality + to the + printing process. + + ChangeLog | 10 +++ + qt4/src/Makefile.am | 1 + + qt4/src/poppler-document.cc | 39 ++------- + qt4/src/poppler-ps-converter.cc | 190 + ++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-qt4.h | 119 +++++++++++++++++++++---- + 5 files changed, 307 insertions(+), 52 deletions(-) + +commit 26d5fefcd4c858e2ebd689d963a65773957ac808 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 28 11:35:34 2007 +0000 + + * qt4/src/poppler-page.cc: + Hopefully fix the calculation of the image size when rendering + using + ArthurOutputDev. + + ChangeLog | 6 ++++++ + qt4/src/poppler-page.cc | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 218364bc4951682de8e63e1bd3f061636b08b615 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 28 11:34:14 2007 +0000 + + * glib/poppler-document.h: + * poppler/FontInfo.h: + * qt/poppler-qt.h: + * qt4/src/poppler-qt4.h: GfxFontType changed, adapt enums + of the + frontends and helper classes. Forgot to do it before merging. + + ChangeLog | 8 ++++++++ + glib/poppler-document.h | 6 +++++- + poppler/FontInfo.h | 6 +++++- + qt/poppler-qt.h | 6 +++++- + qt4/src/poppler-qt4.h | 20 ++++++++++++-------- + 5 files changed, 35 insertions(+), 11 deletions(-) + +commit c1a40d3b4e9b27e34c94c9477a0313534563a394 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 28 11:20:58 2007 +0000 + + * qt4/src/poppler-annotation.h: + Make the header clean. + + ChangeLog | 5 +++++ + qt4/src/poppler-annotation.h | 3 +++ + 2 files changed, 8 insertions(+) + +commit 3f4bf880b95e28a1ae7a38b18b341e089860780c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 28 11:16:49 2007 +0000 + + * qt4/src/Makefile.am: + * qt4/src/poppler-link-extractor-private.h: + * qt4/src/poppler-link-extractor.cc: + * qt4/src/poppler-page-private.h: + * qt4/src/poppler-page.cc: + * qt4/src/poppler-private.h: + * qt4/src/poppler-qt4.h: + Getting the links of a page now is not more dependant on + the current + output device, and can be done anytime; thus, the doLinks + parameter + of the Page::render() can be dropped. + + ChangeLog | 13 ++++++ + qt4/src/Makefile.am | 3 +- + qt4/src/poppler-link-extractor-private.h | 55 ++++++++++++++++++++++++ + qt4/src/poppler-link-extractor.cc | 74 + ++++++++++++++++++++++++++++++++ + qt4/src/poppler-page-private.h | 38 ++++++++++++++++ + qt4/src/poppler-page.cc | 52 ++++------------------ + qt4/src/poppler-private.h | 5 ++- + qt4/src/poppler-qt4.h | 4 +- + 8 files changed, 195 insertions(+), 49 deletions(-) + +commit 7f9eec9ef4e7dc895d2a3e38014b6368cc7564b6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Apr 27 22:41:10 2007 +0000 + + 2007-04-28 Albert Astals Cid <aacid@kde.org> + + * qt4/*: Stop requyring users to declare UNSTABLE_POPPLER_QT4 + + ChangeLog | 4 ++++ + qt4/src/Doxyfile | 2 +- + qt4/src/Mainpage.dox | 3 +-- + qt4/src/poppler-document.cc | 2 -- + qt4/src/poppler-embeddedfile.cc | 2 -- + qt4/src/poppler-fontinfo.cc | 2 -- + qt4/src/poppler-form.cc | 1 - + qt4/src/poppler-link.cc | 2 -- + qt4/src/poppler-page.cc | 1 - + qt4/src/poppler-qt4.h | 3 --- + qt4/src/poppler-sound.cc | 2 -- + qt4/src/poppler-textbox.cc | 2 -- + qt4/tests/check_attachments.cpp | 1 - + qt4/tests/check_dateConversion.cpp | 1 - + qt4/tests/check_fonts.cpp | 1 - + qt4/tests/check_metadata.cpp | 1 - + qt4/tests/check_pagelayout.cpp | 1 - + qt4/tests/check_pagemode.cpp | 1 - + qt4/tests/check_permissions.cpp | 1 - + qt4/tests/poppler-attachments.cpp | 1 - + qt4/tests/poppler-fonts.cpp | 1 - + qt4/tests/stress-poppler-qt4.cpp | 1 - + qt4/tests/test-password-qt4.cpp | 1 - + qt4/tests/test-poppler-qt4.cpp | 1 - + 24 files changed, 6 insertions(+), 32 deletions(-) + +commit 45993a6faafd7646075bc6630d5d2ad7a44f7e20 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Apr 27 22:26:09 2007 +0000 + + 2007-04-28 Carlos Garcia Campos <carlosgc@gnome.org> + reviewed and some code by: Albert Astals Cid <aacid@kde.org> + + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler.h: + * glib/test-poppler-glib.c: + * poppler/Makefile.am: + * poppler/PageTransition.cc: + * poppler/PageTransition.h: + * qt/poppler-page-transition.cc: + * qt/poppler-page-transition.h: Move Page Transition parsing + from qt + frontends to poppler core. Expose Page transitions on the glib + frontend. + + ChangeLog | 15 ++++ + glib/poppler-page.cc | 122 ++++++++++++++++++++++++++ + glib/poppler-page.h | 111 ++++++++++++++---------- + glib/poppler.h | 58 +++++++++---- + glib/test-poppler-glib.c | 60 +++++++++++++ + poppler/Makefile.am | 2 + + poppler/PageTransition.cc | 197 + +++++++++++++++--------------------------- + poppler/PageTransition.h | 86 ++++++++++++++++++ + qt/poppler-page-transition.cc | 145 ++++++------------------------- + qt/poppler-page-transition.h | 9 +- + 10 files changed, 497 insertions(+), 308 deletions(-) + +commit 877d6b202a75eb12119b16e740f85cc8b477d589 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Apr 27 21:25:30 2007 +0000 + + * glib/poppler-page.cc: + * poppler/PSOutputDev.cc: + * poppler/PSOutputDev.h: + * qt/poppler-document.cc: + * qt4/src/poppler-document.cc: + * qt4/src/poppler-qt4.h: + * utils/pdftohtml.cc: + * utils/pdftops.cc: + Add option to force rasterizing the pages when printing them + Add functionality to output the title field on the PS file + Only Qt4 frontend exposes the functionality + + Bringing this features from KPDF 3.5.7 to poppler + Testers welcome + Patches for other frontends more than welcome + Comments and suggestions even more than welcome :-) + + ChangeLog | 14 +++++++++++++ + glib/poppler-page.cc | 3 ++- + poppler/PSOutputDev.cc | 48 + +++++++++++++++++++++++++++++++-------------- + poppler/PSOutputDev.h | 17 ++++++++++------ + qt/poppler-document.cc | 2 +- + qt4/src/poppler-document.cc | 9 +++++++-- + qt4/src/poppler-qt4.h | 2 +- + utils/pdftohtml.cc | 2 +- + utils/pdftops.cc | 2 +- + 9 files changed, 71 insertions(+), 28 deletions(-) + +commit 99053be5357235c47a87775985646ef8d9880ed9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Apr 26 17:57:01 2007 +0000 + + * goo/Makefile.am: Remove duplicate gmem.h + + ChangeLog | 4 ++++ + goo/Makefile.am | 1 - + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit f6adb46cd88d23b34f1918d3be31c05b68b6a443 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 25 21:31:17 2007 +0000 + + ignore pdftoabw binary + + utils/.cvsignore | 1 + + 1 file changed, 1 insertion(+) + +commit e09f231ac6c03ac2c3606f1bf20ba1bde3d85abd +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 25 21:25:06 2007 +0000 + + 2007-04-25 Albert Astals Cid <aacid@kde.org> + + * qt4/src/poppler-document.cc: remove a delete[] no longer + needed + * qt4/src/poppler-private: initilize m_hints + + ChangeLog | 5 +++++ + qt4/src/poppler-document.cc | 1 - + qt4/src/poppler-private.h | 1 + + 3 files changed, 6 insertions(+), 1 deletion(-) + +commit bf7e0e980bf29994021cb1228f89f582adddf284 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 25 19:59:09 2007 +0000 + + Merge xpdf302branch in HEAD as noone vetoed it. + Testing more than welcome + + ChangeLog | 140 + + configure.ac | 4 + + fofi/FoFiTrueType.cc | 458 +++- + fofi/FoFiTrueType.h | 42 +- + fofi/FoFiType1.cc | 65 +- + fofi/FoFiType1C.cc | 590 +++-- + fofi/FoFiType1C.h | 7 +- + glib/poppler-action.cc | 12 +- + glib/poppler-document.cc | 5 +- + glib/poppler-page.cc | 8 +- + goo/FixedPoint.cc | 31 +- + goo/FixedPoint.h | 5 + + goo/GooString.cc | 444 +++- + goo/GooString.h | 41 +- + goo/Makefile.am | 2 +- + goo/gfile.cc | 54 +- + goo/{gmem.c => gmem.cc} | 126 +- + goo/gmem.h | 27 +- + poppler/ABWOutputDev.cc | 1 - + poppler/ABWOutputDev.h | 1 - + poppler/Annot.cc | 1685 +++++++++--- + poppler/Annot.h | 83 +- + poppler/ArthurOutputDev.cc | 13 +- + poppler/Catalog.cc | 79 +- + poppler/Catalog.h | 16 +- + poppler/CharCodeToUnicode.cc | 31 +- + poppler/DCTStream.cc | 2 +- + poppler/DCTStream.h | 4 +- + poppler/Decrypt.cc | 427 ++- + poppler/Decrypt.h | 54 +- + poppler/Dict.cc | 23 +- + poppler/Dict.h | 27 +- + poppler/FontInfo.cc | 1 - + poppler/Form.cc | 19 +- + poppler/Form.h | 2 +- + poppler/Function.cc | 65 +- + poppler/Function.h | 8 +- + poppler/Gfx.cc | 1247 ++++++--- + poppler/Gfx.h | 39 +- + poppler/GfxFont.cc | 45 +- + poppler/GfxFont.h | 7 +- + poppler/GfxState.cc | 209 +- + poppler/GfxState.h | 42 +- + poppler/GlobalParams.cc | 399 ++- + poppler/GlobalParams.h | 41 +- + poppler/JBIG2Stream.cc | 96 +- + poppler/JBIG2Stream.h | 4 +- + poppler/JPXStream.cc | 246 +- + poppler/JPXStream.h | 8 +- + poppler/Lexer.cc | 18 +- + poppler/Link.cc | 150 +- + poppler/Link.h | 49 +- + poppler/Makefile.am | 4 +- + poppler/Object.cc | 5 +- + poppler/Object.h | 29 +- + poppler/Outline.cc | 1 - + poppler/OutputDev.cc | 2 + + poppler/OutputDev.h | 62 +- + poppler/PDFDoc.cc | 100 +- + poppler/PDFDoc.h | 21 +- + poppler/PSOutputDev.cc | 2715 ++++++++++++++----- + poppler/PSOutputDev.h | 58 +- + poppler/PSTokenizer.cc | 2 +- + poppler/Page.cc | 227 +- + poppler/Page.h | 22 +- + poppler/PageLabelInfo.cc | 1 - + poppler/Parser.cc | 66 +- + poppler/Parser.h | 11 +- + poppler/PreScanOutputDev.cc | 255 ++ + poppler/PreScanOutputDev.h | 128 + + poppler/SecurityHandler.cc | 17 +- + poppler/SecurityHandler.h | 5 + + poppler/SplashOutputDev.cc | 1480 ++++++----- + poppler/SplashOutputDev.h | 41 +- + poppler/Stream.cc | 338 +-- + poppler/Stream.h | 39 +- + poppler/TextOutputDev.cc | 537 +++- + poppler/TextOutputDev.h | 77 +- + poppler/UGooString.cc | 182 -- + poppler/UGooString.h | 79 - + poppler/XRef.cc | 29 +- + poppler/XRef.h | 6 +- + qt/poppler-document.cc | 15 +- + qt/poppler-page-transition.cc | 1 - + qt/poppler-page.cc | 4 +- + qt/poppler-private.h | 72 +- + qt4/src/poppler-annotation-helper.h | 38 +- + qt4/src/poppler-document.cc | 7 +- + qt4/src/poppler-embeddedfile.cc | 6 +- + qt4/src/poppler-form.cc | 12 +- + qt4/src/poppler-page.cc | 8 +- + qt4/src/poppler-private.h | 76 +- + splash/Splash.cc | 4994 + ++++++++++++++++++----------------- + splash/Splash.h | 137 +- + splash/SplashBitmap.cc | 110 +- + splash/SplashBitmap.h | 10 +- + splash/SplashClip.cc | 276 +- + splash/SplashClip.h | 28 +- + splash/SplashFTFont.cc | 104 +- + splash/SplashFTFont.h | 5 +- + splash/SplashFTFontEngine.cc | 54 +- + splash/SplashFTFontEngine.h | 9 +- + splash/SplashFTFontFile.cc | 19 +- + splash/SplashFTFontFile.h | 9 +- + splash/SplashFont.cc | 6 +- + splash/SplashFont.h | 13 +- + splash/SplashFontEngine.cc | 72 +- + splash/SplashFontEngine.h | 11 +- + splash/SplashFontFile.cc | 1 - + splash/SplashFontFile.h | 2 +- + splash/SplashMath.h | 15 +- + splash/SplashPath.cc | 42 +- + splash/SplashPath.h | 31 +- + splash/SplashPattern.cc | 28 - + splash/SplashPattern.h | 25 - + splash/SplashScreen.cc | 304 ++- + splash/SplashScreen.h | 18 +- + splash/SplashState.cc | 63 +- + splash/SplashState.h | 14 +- + splash/SplashT1Font.cc | 101 +- + splash/SplashT1Font.h | 6 +- + splash/SplashT1FontEngine.cc | 4 +- + splash/SplashT1FontFile.cc | 9 +- + splash/SplashT1FontFile.h | 7 +- + splash/SplashTypes.h | 72 +- + splash/SplashXPath.cc | 353 +-- + splash/SplashXPath.h | 26 +- + splash/SplashXPathScanner.cc | 143 + + splash/SplashXPathScanner.h | 13 + + utils/HtmlOutputDev.cc | 15 +- + utils/HtmlOutputDev.h | 15 +- + utils/pdffonts.cc | 15 +- + utils/pdfinfo.cc | 21 +- + utils/pdftoabw.cc | 1 - + utils/pdftohtml.cc | 3 +- + utils/pdftoppm.cc | 8 + + utils/pdftops.cc | 8 +- + utils/pdftotext.cc | 1 - + 138 files changed, 14350 insertions(+), 6851 deletions(-) + +commit ba74bb3b0632593d1937911d73709fc870480efd +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Apr 16 21:25:46 2007 +0000 + + * qt4/src/poppler-private.h: + Add the information about the open/close item in the DOM tree + of the TOC. + + ChangeLog | 7 +++++++ + qt4/src/poppler-private.h | 5 ++++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 6c7969f37c85f326327aca98e0346f2ebc86ffda +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 14 23:19:46 2007 +0000 + + * utils/HtmlFonts.cc: Fix rendering of text colors on + complex mode. + * utils/pdftohtml.cc: Fix rendering of links. + + ChangeLog | 5 +++++ + utils/HtmlFonts.cc | 8 ++++---- + utils/pdftohtml.cc | 2 +- + 3 files changed, 10 insertions(+), 5 deletions(-) + +commit add8515d7b3fba59c20ed1bbb058cea9e138c1a8 +Author: Brad Hards <bradh@frogmouth.net> +Date: Sat Apr 14 07:29:04 2007 +0000 + + Not sure what this was intended to do, but it triggers a lot of + problems with the unit tests (essentially, duplicate delete's). + + CCMAIL: aacid@kde.org + + qt4/src/poppler-embeddedfile.cc | 1 - + 1 file changed, 1 deletion(-) + +commit f3ded10305f6ac682640c37c21f569db0f830756 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Apr 7 21:12:35 2007 +0000 + + 2007-04-07 Jeff Muizelaar <jeff@infidigm.net> + + * utils/pdftoabw.cc: Fixing passing the wrong type + to fprintf. Patch by Kouhei Sutou. Fixes #10554. + + ChangeLog | 5 +++++ + utils/pdftoabw.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 2fcb76df955c143153fe4b273d0388fcb7f67d8a +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Fri Apr 6 15:27:52 2007 +0000 + + 2007-04-06 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/ABWOutputDev.cc: + * utils/pdftoabw.cc: Fix a number of issues with the new + AbiWord code: + *) Allows you to save to a file other than stdout + *) Checks for error conditions when reading the PDF + doc and + writing the ABW doc + *) Removes dead code in pdftoabw.cc + *) Fixes a SEGV I encountered when converting my + new home's floor plan + *) Returns proper error conditions should the + conversion fail for any reason + Patch by Dominic Lachowicz + + ChangeLog | 12 ++++++ + poppler/ABWOutputDev.cc | 3 ++ + utils/pdftoabw.cc | 101 + ++++++++++++++++++++++++++++-------------------- + 3 files changed, 74 insertions(+), 42 deletions(-) + +commit 29da65ec48b5ba91139084e197ce457d3cff3732 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Apr 5 12:13:51 2007 +0000 + + * poppler/PSOutputDev.cc: Readd code wrongly removed when doing the + GlobalParams cleaning + + ChangeLog | 5 +++++ + poppler/PSOutputDev.cc | 5 +++++ + 2 files changed, 10 insertions(+) + +commit 722b2bd86f58f2d7a914571cccfa195485a70c47 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Apr 4 02:42:29 2007 +0000 + + 2007-04-03 Jeff Muizelaar <jeff@infidigm.net> + + * configure.ac: + * poppler/ABWOutputDev.cc: + * poppler/ABWOutputDev.h: + * poppler/Makefile.am: + * utils/Makefile.am: + * utils/pdftoabw.cc: Add AbiWord output device and pdftoabw + program. + Patch by Jauco Noordzij. Autotools stuff by Dominic Lachowicz. + + ChangeLog | 10 + + configure.ac | 15 + + poppler/ABWOutputDev.cc | 1286 + +++++++++++++++++++++++++++++++++++++++++++++++ + poppler/ABWOutputDev.h | 140 ++++++ + poppler/Makefile.am | 17 + + utils/Makefile.am | 16 +- + utils/pdftoabw.cc | 138 +++++ + 7 files changed, 1620 insertions(+), 2 deletions(-) + +commit c9b467da290476da5ebbe8dc25699cd25e589b57 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Mar 22 20:56:24 2007 +0000 + + * poppler/Gfx.cc: Accept reals for width and height of + images. Fixes + KDE bug 143322 + + ChangeLog | 5 +++++ + poppler/Gfx.cc | 14 ++++++++++---- + 2 files changed, 15 insertions(+), 4 deletions(-) + +commit ff8f8d44ef47a98f7dbdfaa4d27a720b1f37015f +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Mar 15 20:16:13 2007 +0000 + + * glib/Makefile.am: Make it build with BSD/Make. Patch by + Henry Precheur <henry@precheur.org> + + ChangeLog | 5 +++++ + glib/Makefile.am | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit bbf7e78b6b2509ecdc476d7f55151ef327470d9d +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Mar 7 19:15:32 2007 +0000 + + 2007-03-07 Carlos Garcia Campos <carlosgc@gnome.org> + reviewed by: Albert Astals Cid <aacid@kde.org> + + * poppler/Page.cc: Consider 0x0 boxes as invalid. Fixes + http://bugzilla.gnome.org/show_bug.cgi?id=408682 + + 2007-03-06 Pino Toscano <pino@kde.org> + reviewed by: Albert Astals Cid <aacid@kde.org> + + * configure.ac: + * qt/Makefile.am: + * qt/poppler-link.cc: + * qt/poppler-page.cc: + * qt/poppler-private.h: + * qt4/poppler-link.cc: + Make the Qt4 frontend compilable again with no Splash. + Make the Qt3 frontend compilable with no Splash. + + ChangeLog | 18 ++++++++++++++++++ + configure.ac | 12 +----------- + poppler/Page.cc | 7 ++++++- + qt/Makefile.am | 1 - + qt/poppler-link.cc | 4 +++- + qt/poppler-page.cc | 16 +++++++++++++++- + qt/poppler-private.h | 11 ++++++++++- + qt4/src/poppler-link.cc | 10 ++++++---- + 8 files changed, 59 insertions(+), 20 deletions(-) + +commit 08dcc7121450cbfa163254001e73bb6a2670e055 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 6 22:27:18 2007 +0000 + + * poppler/Annot.cc: + * poppler/Form.cc: + Fix uninitialized variables. + Properly escape parenthesis and slash in text field + + ChangeLog | 9 ++++++++- + poppler/Annot.cc | 3 +++ + poppler/Form.cc | 1 + + 3 files changed, 12 insertions(+), 1 deletion(-) + +commit e8d3b21d08a59ec8b62503b48504fe046d746bfa +Author: Brad Hards <bradh@frogmouth.net> +Date: Sun Mar 4 07:30:31 2007 +0000 + + Switch to using pkg-config to find Qt4. + + ChangeLog | 9 +++ + configure.ac | 36 +++++------ + m4/qt.m4 | 165 + -------------------------------------------------- + poppler/Makefile.am | 2 +- + qt4/src/Makefile.am | 3 +- + qt4/tests/Makefile.am | 21 +++---- + 6 files changed, 36 insertions(+), 200 deletions(-) + +commit bd99616b9c06f96beadb68e015d2904b7fe2df1d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 25 00:34:21 2007 +0000 + + 007-02-25 Julien Rebetez <julienr@svn.gnome.org> + + reviewed by: Albert Astals Cid <aacid@kde.org> + + * poppler/Annot.cc: + * poppler/Annot.h: + * poppler/Form.cc: + * poppler/Form.h: + Fix compilation warnings. + + ChangeLog | 10 ++++++++++ + poppler/Annot.cc | 30 +++++++++++++++++------------- + poppler/Annot.h | 5 ++++- + poppler/Form.cc | 37 ++++++++++++++----------------------- + poppler/Form.h | 13 ++++++------- + 5 files changed, 51 insertions(+), 44 deletions(-) + +commit d8d23b56332618d8c7d8198f55ec6efafd24187e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 25 00:00:20 2007 +0000 + + forgot to commit these + + qt4/src/poppler-form.cc | 284 + ++++++++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-form.h | 247 +++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 531 insertions(+) + +commit 984ce7f919aec27d5f4225376550cd6b58d4ae52 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 24 23:58:31 2007 +0000 + + 2007-02-25 Pino Toscano <pino@kde.org> + reviewed by: Albert Astals Cid <aacid@kde.org> + + * qt4/src/Doxyfile: + * qt4/src/Makefile.am: + * qt4/src/poppler-annotation-helper.h: + * qt4/src/poppler-form.cc: + * qt4/src/poppler-form.h: + * qt4/src/poppler-page.cc: + * qt4/src/poppler-private.h: + * qt4/src/poppler-qt4.h: + Beginning of interactive forms support, first + implementation in the + Qt4 frontend. It supports text and choice fields in + a basic way. + + ChangeLog | 14 ++++++++++ + qt4/src/Doxyfile | 1 + + qt4/src/Makefile.am | 2 ++ + qt4/src/poppler-annotation-helper.h | 18 ++++++------- + qt4/src/poppler-page.cc | 36 +++++++++++++++++++++++++ + qt4/src/poppler-private.h | 52 + ++++++++++++++++++++++++++++++++++++- + qt4/src/poppler-qt4.h | 7 +++++ + 7 files changed, 120 insertions(+), 10 deletions(-) + +commit de7a90fc724de14151ec994d18f860ada3be2ac8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 24 23:43:34 2007 +0000 + + 2007-02-25 Albert Astals Cid <aacid@kde.org> + + * configure.ac: + * glib/poppler-document.cc: + * poppler/GlobalParams.cc: + * poppler/GlobalParams.h: + * poppler/PSOutputDev.cc: + * qt/poppler-document.cc: + * qt4/src/poppler-document.cc: + * qt4/src/poppler-private.h: + * qt4/src/poppler-qt4.h: + * test/gtk-splash-test.cc: + * test/pdf-inspector.cc: + * utils/pdffonts.cc: + * utils/pdfimages.cc: + * utils/pdfinfo.cc: + * utils/pdftohtml.cc: + * utils/pdftoppm.cc: + * utils/pdftops.cc: + * utils/pdftotext.cc: Remove dependency on xpdfrc file + and cleanup + GlobalParams accordingly + + ChangeLog | 22 ++ + configure.ac | 1 - + glib/poppler-document.cc | 4 +- + poppler/GlobalParams.cc | 666 + +------------------------------------------- + poppler/GlobalParams.h | 59 +--- + poppler/PSOutputDev.cc | 8 - + qt/poppler-document.cc | 4 +- + qt4/src/poppler-document.cc | 2 +- + qt4/src/poppler-private.h | 2 +- + qt4/src/poppler-qt4.h | 6 +- + test/gtk-splash-test.cc | 2 +- + test/pdf-inspector.cc | 2 +- + utils/pdffonts.cc | 5 +- + utils/pdfimages.cc | 5 +- + utils/pdfinfo.cc | 5 +- + utils/pdftohtml.cc | 2 +- + utils/pdftoppm.cc | 15 +- + utils/pdftops.cc | 50 ++-- + utils/pdftotext.cc | 5 +- + 19 files changed, 72 insertions(+), 793 deletions(-) + +commit 74e70386b759a3cd9864d11eb4ca210010136aa5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 24 23:32:22 2007 +0000 + + 2007-02-25 Julien Rebetez <julienr@svn.gnome.org> + reviewed by: <aacid@kde.org> + + * glib/poppler-document.cc: + * glib/poppler-document.h: + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler-private.h: + * glib/poppler.h: + * poppler/Annot.cc: + * poppler/Annot.h: + * poppler/Catalog.cc: + * poppler/Catalog.h: + * poppler/CharCodeToUnicode.cc: + * poppler/CharCodeToUnicode.h: + * poppler/Dict.cc: + * poppler/Dict.h: + * poppler/Form.cc: + * poppler/Form.h: + * poppler/GfxFont.cc: + * poppler/GfxFont.h: + * poppler/Makefile.am: + * poppler/Object.h: + * poppler/Page.cc: + * poppler/Page.h: + * poppler/XRef.cc: + * poppler/XRef.h: + Beginning of Interactive Form support: + Add a bunch of new classes (FormWidget / FormField) + to deal with form + fields. + Add support for object modification through + XRef::setModifiedObject, as + well as a function to write the Xref to a file, + which will be used + to implement PDF writing. + Add some functions to glib wrapper to expose the + new form features. + + ChangeLog | 35 ++ + glib/poppler-document.cc | 192 +++++++ + glib/poppler-document.h | 55 ++ + glib/poppler-page.cc | 120 +++++ + glib/poppler-page.h | 55 ++ + glib/poppler-private.h | 4 + + glib/poppler.h | 15 +- + poppler/Annot.cc | 344 +++++++++--- + poppler/Annot.h | 21 +- + poppler/Catalog.cc | 17 +- + poppler/Catalog.h | 4 + + poppler/CharCodeToUnicode.cc | 34 ++ + poppler/CharCodeToUnicode.h | 3 + + poppler/Dict.cc | 32 ++ + poppler/Dict.h | 4 + + poppler/Form.cc | 1187 + ++++++++++++++++++++++++++++++++++++++++++ + poppler/Form.h | 470 +++++++++++++++++ + poppler/GfxFont.cc | 27 + + poppler/GfxFont.h | 5 + + poppler/Makefile.am | 2 + + poppler/Object.h | 4 + + poppler/Page.cc | 11 +- + poppler/Page.h | 8 +- + poppler/XRef.cc | 87 ++++ + poppler/XRef.h | 9 + + 25 files changed, 2666 insertions(+), 79 deletions(-) + +commit 5c4ea446f33248964431e79b14592b30362634fe +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 18 21:44:24 2007 +0000 + + * configure.ac: Change {datadir}/poppler to {datarootdir}/poppler so + that i get /usr/local/share/poppler in config.h + instead of + ${prefix}/poppler Better fixes are welcome. + + ChangeLog | 6 ++++++ + configure.ac | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit dd140dd63de661303b578863af4d515d82117cca +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 4 00:19:25 2007 +0000 + + fix date + + ChangeLog | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3c1ed68bf4ee49b27275f7f65d49f42933b1cfa0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 4 00:16:43 2007 +0000 + + * poppler/Lexer.cc: + * poppler/Lexer.h: Patch to fix regression introduced by + optimizations + in bugzilla issue 7808 + + ChangeLog | 6 ++++++ + poppler/Lexer.cc | 30 ++++++++++++++++++++---------- + poppler/Lexer.h | 2 +- + 3 files changed, 27 insertions(+), 11 deletions(-) + +commit 672408839de0deac4c6006b54df723336ee4be2d +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 31 22:05:09 2007 +0000 + + * qt4/src/poppler-page.cc: + Patch by Pino Toscano <pino@kde.org> to remove a nonsense done + by him. + + * qt4/tests/test-poppler-qt4.cpp: + Simply a bit. Patch by Pino Toscano <pino@kde.org>. + + ChangeLog | 8 ++++++++ + qt4/src/poppler-page.cc | 2 -- + qt4/tests/test-poppler-qt4.cpp | 24 ++++++++++++------------ + 3 files changed, 20 insertions(+), 14 deletions(-) + +commit 9c64b8c754e09ff2858af56ce38ef013002bf8e4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 31 18:48:16 2007 +0000 + + * m4/qt.m4: Fix Qt4 detection on Mac. Patch by Benjamin Reed + <ranger@befunk.com> + + ChangeLog | 5 +++++ + m4/qt.m4 | 26 +++++++++++++++++++++++--- + 2 files changed, 28 insertions(+), 3 deletions(-) + +commit 1b81192ff2bb9fae4a7bbc685fafe1718f303a7b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 28 15:55:11 2007 +0000 + + * glib/poppler-page.cc: Make link mapping coordinates + follow page + rotation. Patch by Carlos Garcia Campos <carlosgc@gnome.org> + * glib/poppler-action.cc: Fix link destination + coordinates. Patch by + Carlos Garcia Campos <carlosgc@gnome.org> + + ChangeLog | 4 ++ + glib/poppler-action.cc | 15 +++++- + glib/poppler-page.cc | 124 + +++++++++++++++++++++++++++++++------------------ + 3 files changed, 97 insertions(+), 46 deletions(-) + +commit 75dcf94f53c2d7241111f0d527ee4d3a2ef0b0cf +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 28 15:36:08 2007 +0000 + + * glib/poppler-document.cc: Plug memory leak in + poppler-document. Patch by Carlos Garcia Campos <carlosgc@gnome.org> + + ChangeLog | 5 +++++ + glib/poppler-document.cc | 30 ++++++++++++++---------------- + 2 files changed, 19 insertions(+), 16 deletions(-) + +commit 682a15fc38a2c569d9b1f9871e3e949b62b33cf8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 21 22:35:23 2007 +0000 + + * poppler-document.cc: + * poppler-page.cc: + * poppler-private.h: + * poppler-qt4.h: + No need to destroy the Splash output device to change its + paper color. + Add the possibility to set flags that affect the rendering + (some + backends supports only some of them, though). + Add a Page::label to get the label associated with a page. + Patches by Pino Toscano <pino@kde.org>. + + ChangeLog | 12 ++++++++++++ + qt4/src/poppler-document.cc | 20 ++++++++++++++++++++ + qt4/src/poppler-page.cc | 14 +++++++++++++- + qt4/src/poppler-private.h | 29 ++++++++++++++++++++++++----- + qt4/src/poppler-qt4.h | 25 +++++++++++++++++++++++++ + 5 files changed, 94 insertions(+), 6 deletions(-) + +commit 7331bc46c1cb323316501f05ae1740bea5655596 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 17 20:06:29 2007 +0000 + + * poppler/Sound.h: + * poppler/Sound.cc: + * qt4/src/poppler-sound.cc: Move most of the sound reading + code + into the Sound class, so frontends can use it easily. + Patch by Pino Toscano <pino@kde.org>. + + ChangeLog | 10 +++- + poppler/Sound.cc | 80 +++++++++++++++++++++++++- + poppler/Sound.h | 32 ++++++++++- + qt4/src/poppler-sound.cc | 144 + +++++++++++++++++------------------------------ + 4 files changed, 167 insertions(+), 99 deletions(-) + +commit 841bee94da7b6376d2e1fb3daaf8b727b90e42d8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jan 13 23:19:21 2007 +0000 + + * poppler/Stream.h: + * poppler/Stream.cc: Remove MemStream::setNeedFree method + i really did + not need it + * qt4/src/poppler-document.cc: + * qt4/src/poppler-link.cc: + * qt4/src/poppler-page.cc: + * qt4/src/poppler-private.h: Make Document::loadFromData + work on + documents with a password and don't need to do a malloc and + a memcpy. + + ChangeLog | 11 +++++++ + poppler/Stream.cc | 5 --- + poppler/Stream.h | 1 - + qt4/src/poppler-document.cc | 74 + ++++++++++++++++++++++++--------------------- + qt4/src/poppler-link.cc | 4 +-- + qt4/src/poppler-page.cc | 34 ++++++++++----------- + qt4/src/poppler-private.h | 24 +++++++++------ + 7 files changed, 84 insertions(+), 69 deletions(-) + +commit e1432fd7c4a6a2386789f450d39c6d954fd4e656 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jan 13 18:29:39 2007 +0000 + + * configure.ac + * poppler/Makefile.am + * qt4/src/Makefile.am + * qt4/src/poppler-document.cc + * qt4/src/poppler-link.cc + * qt4/src/poppler-page.cc + * qt4/src/poppler-private.h + * qt4/src/poppler-qt4.h: Make the Qt4 backend compilable + even with + no Splash backend. Patch by Pino Toscano <pino@kde.org>. + + ChangeLog | 12 ++++++++++++ + configure.ac | 5 ----- + poppler/Makefile.am | 5 +++-- + qt4/src/Makefile.am | 6 +++++- + qt4/src/poppler-document.cc | 16 ++++++++++++++-- + qt4/src/poppler-link.cc | 1 + + qt4/src/poppler-page.cc | 15 ++++++++++++--- + qt4/src/poppler-private.h | 8 +++++++- + qt4/src/poppler-qt4.h | 6 ++++++ + 9 files changed, 60 insertions(+), 14 deletions(-) + +commit 457038e97325720615c4390ffa075dd8283966ee +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jan 13 17:56:07 2007 +0000 + + * poppler/Stream.h: + * poppler/Stream.cc: Add MemStream::setNeedFree method + * qt4/src/poppler-document.cc: + * qt4/src/poppler-private.h: + * qt4/src/poppler-qt4.h: Add Document::loadFromData method + + ChangeLog | 8 ++++++++ + poppler/Stream.cc | 5 +++++ + poppler/Stream.h | 1 + + qt4/src/poppler-document.cc | 22 ++++++++++++++++++++++ + qt4/src/poppler-private.h | 17 +++++++++++++++-- + qt4/src/poppler-qt4.h | 16 ++++++++++++++++ + 6 files changed, 67 insertions(+), 2 deletions(-) + +commit 4e2a9c49ecab00b1f5d175570165cd490afdd31e +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 11 22:28:03 2007 +0000 + + goo/gmem.c: Merge change from xpdf-3.01pl2 + + ChangeLog | 4 ++++ + goo/gmem.c | 13 +++++++++++-- + 2 files changed, 15 insertions(+), 2 deletions(-) + +commit bce14b274fd788d728116950d6464a85e33a9966 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 11 22:12:11 2007 +0000 + + * poppler/Catalog.h: + * poppler/Catalog.cc: Limit max depth of recursive calls on + readPageTree to fix MOAB-06-01-2007 + + ChangeLog | 6 ++++++ + poppler/Catalog.cc | 20 +++++++++++++++----- + poppler/Catalog.h | 2 +- + 3 files changed, 22 insertions(+), 6 deletions(-) + +commit 3f0679a336ffaf2aff149f8526fa11f8f8cbda59 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jan 6 21:53:08 2007 +0000 + + Patch by Pino Toscano <pino@kde.org> to fix some memory leaks when + dealing with sounds. + + ChangeLog | 9 +++++++++ + poppler/Sound.cc | 1 + + qt4/src/poppler-link.cc | 5 +++++ + qt4/src/poppler-link.h | 1 + + qt4/src/poppler-page.cc | 4 ++++ + qt4/src/poppler-sound.cc | 7 ++++++- + 6 files changed, 26 insertions(+), 1 deletion(-) + +commit d41cd2f567a955031cb7498d9089e70e14df4a42 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 4 19:10:16 2007 +0000 + + qt4/src/poppler-private.h: gmallocn -> new[] + + ChangeLog | 4 ++++ + qt4/src/poppler-private.h | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit f8edfb6832144cbbd1b234f6b35e33325269255c +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 4 18:56:13 2007 +0000 + + qt/poppler-page-transition.cc: Fix memory leak. Patch by Tobias + Koenig <tokoe@kde.org> + + ChangeLog | 5 +++++ + qt/poppler-page-transition.cc | 1 + + 2 files changed, 6 insertions(+) + +commit 250a9f4b429344e0968c7bd0c0cebe7af373ae0a +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Dec 30 14:50:25 2006 +0000 + + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-document.cc: Add const & to some parameters. Patch + by Pino Toscano <pino@kde.org> + + ChangeLog | 6 ++++++ + qt4/src/poppler-document.cc | 4 ++-- + qt4/src/poppler-qt4.h | 4 ++-- + 3 files changed, 10 insertions(+), 4 deletions(-) + +commit 250c1f94cc9a53f980fd08364d6cce29db9fd067 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 29 14:08:35 2006 +0000 + + * poppler/UGooString.cc: Patch by Pino Toscano <pino@kde.org> so + that QStringToUGooString does not crash. + + ChangeLog | 5 +++++ + poppler/UGooString.cc | 1 + + 2 files changed, 6 insertions(+) + +commit 42770e5f07407b03dce31c73fd6956f9c8fc9a06 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Fri Dec 29 04:12:40 2006 +0000 + + 2006-12-28 Brad Taylor <brad@getcoded.net> + + * poppler/glib/poppler-document.h: + * poppler/glib/poppler-document.cc: Add + poppler_document_new_from_data + to allow loading PDFs out of memory. + + ChangeLog | 6 +++ + glib/poppler-document.cc | 113 + ++++++++++++++++++++++++++++++++++------------- + glib/poppler-document.h | 4 ++ + 3 files changed, 93 insertions(+), 30 deletions(-) + +commit 6fedd991b584e300b5710630fa7942d357fe7aaa +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Dec 28 17:22:36 2006 +0000 + + * qt4/src/poppler-embeddedfile.cc: + * qt4/src/poppler-document.cc: + * qt/poppler-document.cc: Fix memory leaks + + ChangeLog | 6 ++++++ + qt/poppler-document.cc | 4 ++++ + qt4/src/poppler-document.cc | 4 +++- + qt4/src/poppler-embeddedfile.cc | 4 +++- + 4 files changed, 16 insertions(+), 2 deletions(-) + +commit 7da5885e45c33382060276c95d9a3bd117ae55c7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Dec 28 15:51:44 2006 +0000 + + * goo/GooString.cc + * goo/GooString.h + * goo/gmem.c + * goo/gmem.h + * poppler/Lexer.cc + * poppler/Lexer.h + * poppler/PageLabelInfo.cc + * poppler/Parser.cc + * poppler/UGooString.cc + * poppler/UGooString.h: Patch by Krzysztof Kowalczyk + <kkowalczyk@gmail.com> to improve performance. See bug 7808 for + details. + + ChangeLog | 15 ++++ + goo/GooString.cc | 186 + ++++++++++++++++++++++++----------------------- + goo/GooString.h | 28 +++++-- + goo/gmem.c | 3 +- + goo/gmem.h | 2 +- + poppler/Lexer.cc | 19 +++-- + poppler/Lexer.h | 10 +++ + poppler/PageLabelInfo.cc | 1 + + poppler/Parser.cc | 17 +++-- + poppler/UGooString.cc | 137 +++++++++++++++++++++++++++------- + poppler/UGooString.h | 40 ++++++++-- + 11 files changed, 313 insertions(+), 145 deletions(-) + +commit fbc05a6791fc28ee26a9d9188722ea3453c65ddc +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Dec 27 23:15:06 2006 +0000 + + * poppler/Annot.cc: + * poppler/Annot.h: Add type checking to processing of "Rect". Patch + by Scott Turner <scotty1024@mac.com> + + ChangeLog | 6 ++++++ + poppler/Annot.cc | 48 +++++++++++++++++++++++++++++------------------- + poppler/Annot.h | 1 + + 3 files changed, 36 insertions(+), 19 deletions(-) + +commit dc6b372358ac629c43aa2faabd644942cb0ed98b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Dec 27 15:23:04 2006 +0000 + + Remove , after last value of enum. Thanks to André Wöbbeking + + ChangeLog | 1 + + poppler/Catalog.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +commit c7d19539a95927eb277966a521f13393c9e116bb +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Dec 27 12:38:58 2006 +0000 + + qt4/src/poppler-qt4.h: Remove , after last value of enum. Thanks to + André Wöbbeking + + ChangeLog | 5 +++++ + qt4/src/poppler-qt4.h | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit b29429c702e6540b9f35689b0a164f30e747d5d9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Dec 26 20:07:03 2006 +0000 + + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-page.cc: Add Page::duration() function to the + qt4 frontend. + + ChangeLog | 6 ++++++ + qt4/src/poppler-page.cc | 8 ++++++++ + qt4/src/poppler-qt4.h | 9 ++++++++- + 3 files changed, 22 insertions(+), 1 deletion(-) + +commit 62dfc58903b496c4cc720c8b2c759c6fb82fb443 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Dec 26 19:56:28 2006 +0000 + + * glib/test-poppler-glib.c: + * glib/poppler-page.cc: + * glib/poppler-page.h: + * poppler/Page.cc: + * poppler/Page.h: Implement /Dur entry in page object. Patch + by Carlos + Garcia Campos <carlosgc@gnome.org> + + ChangeLog | 9 +++++++++ + glib/poppler-page.cc | 16 ++++++++++++++++ + glib/poppler-page.h | 1 + + glib/test-poppler-glib.c | 7 +++++++ + poppler/Page.cc | 13 +++++++++++++ + poppler/Page.h | 6 ++++++ + 6 files changed, 52 insertions(+) + +commit 34e5aa62f4d3ba7a2d94a68a91c11a48277a4119 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Dec 23 13:12:13 2006 +0000 + + * poppler/PSTokenizer.cc: Enhance PSTokenizer::getToken + performance. + Patch by Scott Turner <scotty1024@mac.com>. In a random pdf + i tested + the patchs improves PSTokenizer::getToken performance by 15% + + ChangeLog | 6 ++++++ + poppler/PSTokenizer.cc | 33 +++++++++++++++++++++------------ + poppler/PSTokenizer.h | 1 + + 3 files changed, 28 insertions(+), 12 deletions(-) + +commit 1a5fa1d2ced62e7d027e085663e987cff625ce0b +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 22 23:39:41 2006 +0000 + + poppler/Page.cc: Fix memory leak when reading a wrong color map in + a thumbnail. Patch by Scott Turner <scotty1024@mac.com> + + ChangeLog | 3 +++ + poppler/Page.cc | 1 + + 2 files changed, 4 insertions(+) + +commit dd1c134dcf085338a85188c7f205fc300396dc86 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 22 23:27:53 2006 +0000 + + qt/poppler-page.cc: Fix memory leak in Page::textList. Patch by + Jerry Epplin <jepplin@globalvelocity.com> + + ChangeLog | 5 +++++ + qt/poppler-page.cc | 4 +++- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 87e474a018c4808d6251fd79f9e9640e0f733551 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Thu Dec 21 01:01:30 2006 +0000 + + 2006-12-20 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: Fix scaling of maskedImage + masks. They + should be scaled to the size of the image not the size of + the mask. + Fixes #9403. + + ChangeLog | 6 ++++++ + poppler/CairoOutputDev.cc | 8 ++------ + 2 files changed, 8 insertions(+), 6 deletions(-) + +commit 769a89623c680f51690db1751522b016b02b83a8 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Dec 20 19:55:55 2006 +0000 + + 2006-12-20 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/GlobalParams.cc: Try to make zero-width lines as + close to + one pixel wide as we can. Fixes #9393. + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.cc | 10 ++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) + +commit 5c4bca18373528f293bd5e080efca572977fc1ff +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Dec 19 20:27:55 2006 +0000 + + poppler/SplashOutputDev.cc: Fix gray calculation. Patch by Scott + Turner <scotty1024@mac.com> + + ChangeLog | 5 +++++ + poppler/SplashOutputDev.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit fba99578f6001ae0c0df0442bb73040b55109b1d +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Dec 12 05:23:59 2006 +0000 + + 2006-12-12 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: Change a cairo_set_matrix to + cairo_transform so that we don't blindly clobber the existing + matrix. + Patch by Daniel Colascione. + Fixes #9190. + + ChangeLog | 7 +++++++ + poppler/CairoOutputDev.cc | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 9a6ffa1c6e009f8606a055f873efdcd5829fcfa2 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Dec 10 05:24:56 2006 +0000 + + 2006-12-09 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/Function.cc: Initialize + PostScriptFunction::codeString to + NULL so that it can safely deleted if initialization fails. + Fixes #9263. + + ChangeLog | 6 ++++++ + poppler/Function.cc | 1 + + 2 files changed, 7 insertions(+) + +commit e92d63a179ae022270156da4e396c15ff9236d89 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Nov 23 19:01:44 2006 +0000 + + * m4/libjpeg.m4: Make JPEG library header search work under + MSYS. Patch by Alexis Wilke + + ChangeLog | 5 +++++ + m4/libjpeg.m4 | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 3913110f698fd006b394a395b5b0adfde30af31b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 22 21:55:27 2006 +0000 + + there should not be any whitespace after the \ + + qt4/src/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit c3ab7addec5a7990872949b813c2b727b1614d64 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 19 18:51:23 2006 +0000 + + Another leak fix on qt4/src/poppler-page.cc the previous changelog + is enough for this one ;-) + + qt4/src/poppler-page.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 9e9b82da91abacb916b05302d40bf822af6ac7f1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Nov 19 12:59:48 2006 +0000 + + * qt4/src/poppler-link.cc: + * qt4/src/poppler-page.cc: + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-textbox.cc: Fix memory leaks + * splash/Splash.cc: Initialize the values of nClipRes + + ChangeLog | 8 ++++++++ + qt4/src/poppler-link.cc | 6 ++++++ + qt4/src/poppler-page.cc | 4 +++- + qt4/src/poppler-qt4.h | 1 + + qt4/src/poppler-textbox.cc | 5 +++++ + splash/Splash.cc | 2 +- + 6 files changed, 24 insertions(+), 2 deletions(-) + +commit b9faacc62182efcbc84df2471e4c5dcf2b03bda8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Nov 18 17:08:04 2006 +0000 + + * qt4/src/poppler-document.cc + * qt4/src/poppler-qt4.h: Add int marginRight, int + marginBottom, int + marginLeft, int marginTop, bool strictMargins to + Document::print() + + ChangeLog | 6 ++++++ + qt4/src/poppler-document.cc | 11 +++++++++-- + qt4/src/poppler-qt4.h | 6 +++++- + 3 files changed, 20 insertions(+), 3 deletions(-) + +commit da8e6d4c3e0afdaa031413649ae20545c8a1f845 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Nov 16 21:03:27 2006 +0000 + + really commit pino's patch :-S + + qt4/src/Doxyfile | 11 +++-- + qt4/src/Mainpage.dox | 26 +++++----- + qt4/src/poppler-annotation.h | 33 ++++++++----- + qt4/src/poppler-link.h | 68 +++++++++++++++++++++---- + qt4/src/poppler-qt4.h | 115 + +++++++++++++++++++++++++++---------------- + 5 files changed, 171 insertions(+), 82 deletions(-) + +commit 4f26e65096e3133a39fc0c9e82084c90cf77dda9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Nov 16 21:00:10 2006 +0000 + + * qt4/src/Mainpage.dox: + * qt4/src/Doxyfile: + * qt4/src/poppler-annotation.h: + * qt4/src/poppler-link.h: + * qt4/src/poppler-qt4.h: Improve API documentation. Patch by + Pino Toscano. + + Generated docu at http://people.freedesktop.org/~aacid/docs/qt4/ + + ChangeLog | 9 +++++++++ + qt4/src/Mainpage.dox | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit e68b6f3f8fea1e4f036eba0f19bb7e0c423d408c +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Nov 15 21:07:50 2006 +0000 + + 2006-11-15 Albert Astals Cid <aacid@kde.org> + + * qt4/src/poppler-link.cc: + * qt4/src/poppler-page.cc: + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-document.cc: + * qt4/src/poppler-private.h: Generalize the way we render + the pages: + merge all the Page::renderTo* functions in only one that + renders on + a QImage, taking into account the currently chosen backend. + It is possible to switch rendering backend using the Document. + Patch by Pino Toscano. + + * qt4/tests/stress-poppler-qt4.cpp: + * qt4/tests/test-password-qt4.cpp: + * qt4/tests/test-poppler-qt4.cpp: Adapt the tests to the + changes in + the rendering API of Page. Patch by Pino Toscano. + + ChangeLog | 17 ++++++ + qt4/src/poppler-document.cc | 14 +++++ + qt4/src/poppler-link.cc | 2 +- + qt4/src/poppler-page.cc | 123 + +++++++++++++++++++++------------------ + qt4/src/poppler-private.h | 32 ++++++---- + qt4/src/poppler-qt4.h | 75 +++++++----------------- + qt4/tests/stress-poppler-qt4.cpp | 3 +- + qt4/tests/test-password-qt4.cpp | 12 ++-- + qt4/tests/test-poppler-qt4.cpp | 17 +++--- + 9 files changed, 152 insertions(+), 143 deletions(-) + +commit 37088dd3335be6e7641c47bea9b1ddd689b07372 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Nov 13 19:16:44 2006 +0000 + + * poppler/ArthurOutputDev.cc: Small fix to get colors right + + ChangeLog | 4 ++++ + poppler/ArthurOutputDev.cc | 8 ++++---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit 302e2cab9fd626222c69ad40f7e40be2e65d34a9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Nov 11 15:41:27 2006 +0000 + + Fix typo when outputing PS scale + + ChangeLog | 4 ++++ + poppler/PSOutputDev.cc | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit e3550fb286dae98992b30edbf4a9300fa58d2e77 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Nov 7 23:53:31 2006 +0000 + + 2006-11-07 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: take horizontal scaling into + account + when updating the font. Also, cleanup some unused code. Fixes + #8924. + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.cc | 9 ++------- + 2 files changed, 7 insertions(+), 7 deletions(-) + +commit f020b64a72ad5c82c3e7bdcf15039bb0037b1f22 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Oct 18 18:43:59 2006 +0000 + + 2006-10-18 Albert Astals Cid <aacid@kde.org> + + * qt4/src/poppler-document.cc: + * qt4/src/poppler-private.h: Do not crash when opening a + encrypted document. Do not crash when unlocking a locked + document. + + ChangeLog | 7 +++++++ + qt4/src/poppler-document.cc | 41 + ++++++++++++++++------------------------- + qt4/src/poppler-private.h | 14 ++++++++++++++ + 3 files changed, 37 insertions(+), 25 deletions(-) + +commit 577330ee1d4d1021174cf1bd59557a83a017e06f +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Oct 11 23:09:24 2006 +0000 + + * splash/Splash.cc: + * splash/SplashErrorCodes.h: Do not crash on documents that + report a + 0x0 mask for an image, like + http://bugs.kde.org/attachment.cgi?id=18083&action=view + + ChangeLog | 7 +++++++ + splash/Splash.cc | 2 ++ + splash/SplashErrorCodes.h | 2 ++ + 3 files changed, 11 insertions(+) + +commit 42c016c6d3c6de65fd92b51b9d6cc96d52404689 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 8 20:38:47 2006 +0000 + + * poppler/Link.cc: + * poppler/Link.h: + * poppler/Makefile.am: + * poppler/Page.cc: + * poppler/Page.h: + * poppler/Sound.cc: + * poppler/Sound.h: Make poppler able to read Sound objects, + Sound + actions and Opening/Closing page actions. Patch by Pino + Toscano. + + * qt4/src/Makefile.am: + * qt4/src/poppler-link.cc: + * qt4/src/poppler-link.h: + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-page.cc: + * qt4/src/poppler-sound.cc: Support for sounds, sound links + and page + actions in the Qt4 backend. Patch by Pino Toscano. + + ChangeLog | 19 +++++ + poppler/Link.cc | 53 ++++++++++++++ + poppler/Link.h | 32 +++++++++ + poppler/Makefile.am | 2 + + poppler/Page.cc | 8 +++ + poppler/Page.h | 4 ++ + poppler/Sound.cc | 65 +++++++++++++++++ + poppler/Sound.h | 46 ++++++++++++ + qt4/src/Makefile.am | 1 + + qt4/src/poppler-link.cc | 35 ++++++++++ + qt4/src/poppler-link.h | 26 ++++++- + qt4/src/poppler-page.cc | 32 +++++++++ + qt4/src/poppler-qt4.h | 87 +++++++++++++++++++++++ + qt4/src/poppler-sound.cc | 177 + +++++++++++++++++++++++++++++++++++++++++++++++ + 14 files changed, 586 insertions(+), 1 deletion(-) + +commit 1da064d7e7403ec7111eecb2b9613e27a2c4bb5d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Sep 30 16:28:35 2006 +0000 + + * qt4/src/poppler-page.cc: PA is optional, H is a name not a string + + ChangeLog | 4 ++++ + qt4/src/poppler-page.cc | 15 +++++++++------ + 2 files changed, 13 insertions(+), 6 deletions(-) + +commit 29366d8e470ab2207cdfdab115c2fa9618c4c74e +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 25 20:43:18 2006 +0000 + + * glib/Makefile.am + * qt/Makefile.am + * qt4/src/Makefile.am + * qt4/tests/Makefile.am + * test/Makefile.am + * utils/Makefile.am: Add FONTCONFIG_CFLAGS FONTCONFIG_LIBS + for people + that need them. Patch by morfoh@opensde.org. Fixes bug #8415 + + ChangeLog | 10 ++++++++++ + glib/Makefile.am | 2 ++ + qt/Makefile.am | 6 ++++-- + qt4/src/Makefile.am | 2 ++ + qt4/tests/Makefile.am | 2 ++ + test/Makefile.am | 6 ++++-- + utils/Makefile.am | 6 ++++-- + 7 files changed, 28 insertions(+), 6 deletions(-) + +commit 957c1e59df213a01ca87f03d067a8dab5dc09fb6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 25 20:05:28 2006 +0000 + + ignore poppler-features.h + + glib/.cvsignore | 1 + + 1 file changed, 1 insertion(+) + +commit 3158b54375bdfdc82779362cc9442aade87f84f6 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Sep 22 00:55:54 2006 +0000 + + 2006-09-21 Kristian Høgsberg <krh@redhat.com> + + * NEWS: Update list of bugs fixes, release 0.5.4. + + ChangeLog | 2 ++ + NEWS | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit 17dd1f60f9328ae68fbe262ae0745be976ff9f95 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Sep 21 23:28:14 2006 +0000 + + 2006-09-21 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Check for gtk+ 2.8 for the gtk+ test case, + invert + help text for zlib option (#7788, #7661). + + ChangeLog | 3 +++ + configure.ac | 12 +++++------- + 2 files changed, 8 insertions(+), 7 deletions(-) + +commit ddbbd697424b9122ce1f0541ddada3fe8bb38fb1 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Sep 21 22:58:31 2006 +0000 + + 2006-09-21 Kristian Høgsberg <krh@redhat.com> + + * utils/pdftops.cc: Get duplex setting from GlobalParams. + + ChangeLog | 2 ++ + utils/pdftops.cc | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 0d25592a1a5811ee8fffbd70307c7bcaaaacadf3 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Sep 21 22:40:52 2006 +0000 + + 2006-09-21 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (_poppler_page_new): Make PopplerPage + reference its document throughout the lifetime of the page + (#7005). + + ChangeLog | 3 +++ + glib/poppler-page.cc | 5 ++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit b834755c7ae45eb4020e9cdbc3852eac0151fcdc +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Sep 21 22:37:00 2006 +0000 + + 2006-09-21 Kristian Høgsberg <krh@redhat.com> + + * poppler/Gfx.cc: Remove the right out->updateAll() call. + + ChangeLog | 4 ++++ + poppler/Gfx.cc | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 181e2af1edf2cbc3c8edadad0dce215a64a990dd +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Sep 21 01:05:23 2006 +0000 + + 2006-09-20 Kristian Høgsberg <krh@redhat.com> + + * NEWS: Sum up changes. + + * configure.ac: Bump release to 0.5.4. + + ChangeLog | 4 ++++ + NEWS | 10 ++++++++++ + configure.ac | 2 +- + 3 files changed, 15 insertions(+), 1 deletion(-) + +commit cc9c17a6730422be99ebcd69991fcf5d7b569640 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Sep 21 00:56:33 2006 +0000 + + 2006-09-20 Kristian Høgsberg <krh@redhat.com> + + * poppler/Gfx.cc: Remove last remnant of erroneous type3 + commit a + while back, fixing #8182. + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.cc | 1 - + poppler/Gfx.cc | 1 - + 3 files changed, 5 insertions(+), 2 deletions(-) + +commit 83be722b56d9266b89946fe994023351e47eb4fd +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Sep 20 20:22:19 2006 +0000 + + 2006-09-20 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/TextOutputDev.cc: TextFontInfo stores a copy of + a pointer + to a GfxFont but does not increment the reference count. Fix + the + problem by calling incRefCnt and decRefCnt + appropriately. Fixes #4649 + + ChangeLog | 6 ++++++ + poppler/TextOutputDev.cc | 4 ++++ + 2 files changed, 10 insertions(+) + +commit 1cf60015d7d78668c83737be6015dc880fd04ebf +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Sep 19 04:39:07 2006 +0000 + + 2006-09-19 Kristian Høgsberg <krh@redhat.com> + + * poppler/GlobalParams.cc: Add scanEncodingDirs() to + automatically + scan in any encodings found under ${datadir}/poppler. + + * m4/define-dir.m4: New file, adds AC_DEFINE_DIR macro. + + ChangeLog | 7 +++ + configure.ac | 16 +------ + goo/gfile.cc | 16 +++---- + goo/gfile.h | 2 + + m4/define-dir.m4 | 34 ++++++++++++++ + poppler/GlobalParams.cc | 116 + ++++++++++++++++++++++++++++++++---------------- + poppler/GlobalParams.h | 7 ++- + 7 files changed, 136 insertions(+), 62 deletions(-) + +commit 821c883f9df9cc0e5b81aa2e070727996cf3bc4e +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Sep 18 15:40:50 2006 +0000 + + 2006-09-13 Kristian Høgsberg <krh@redhat.com> + + * poppler/Makefile.am (libpoppler_la_LIBADD): Add cairo + libs to + link if configured. + + ChangeLog | 3 +++ + poppler/Makefile.am | 4 ++++ + 2 files changed, 7 insertions(+) + +commit d8ab8ebc94c32d32ad17ed54cede453de25d7dd5 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Sep 13 20:25:03 2006 +0000 + + 2006-09-13 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Tighten glib check (#7906), add check for C++ + compiler (#8048). + + ChangeLog | 5 +++++ + configure.ac | 3 ++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 7c748075e18cfe95be6a56adf09ce7f2f032b86f +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 12 19:48:47 2006 +0000 + + sorry Jeff + + ChangeLog | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit 6cdcfae0e1c6fbec07ee5273e6ad97ef04110868 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Sep 11 21:20:56 2006 +0000 + + 2006-09-11 Albert Astals Cid <aacid@kde.org> + + * qt4/src/poppler-annotation.cc: + * qt4/src/poppler-annotation.h: + * qt4/src/poppler-page.cc: Add support for + LinkAnnotation. Patch by + Pino Toscano + + ChangeLog | 10 +- + qt4/src/poppler-annotation.cc | 230 + +++++++++++++++++++++++++++++++++++++++- + qt4/src/poppler-annotation.h | 22 +++- + qt4/src/poppler-page.cc | 237 + +++++++++++++++++++++++++----------------- + 4 files changed, 392 insertions(+), 107 deletions(-) + +commit 8335c7eea2aa62a580170f47323d8674bd89e412 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Fri Sep 8 23:28:22 2006 +0000 + + 2006-09-08 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: The work-around for 1x1 + imagemasks was not + calling cairo_set_source causing the rectangles to be drawn + the wrong + colour occasionally. Fix by moving the existing call to + cairo_set_source above the work-around. Fixes #7113. + + ChangeLog | 7 +++++++ + poppler/CairoOutputDev.cc | 8 ++++---- + 2 files changed, 11 insertions(+), 4 deletions(-) + +commit 02d505aa0176b6e5a54ee82426d8333a9ef8f000 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Thu Sep 7 04:01:39 2006 +0000 + + 2006-09-06 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: Avoid crashing in CairoOutputDev + if + endString is called without a corresponding beginString. Fixes + #4515. + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.cc | 8 +++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit 3ea0aada0434c9f815814253dd9d1374ae6643cc +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Sep 6 23:54:30 2006 +0000 + + 2006-09-06 Jeff Muizelaar <jeff@infidigm.net> + + * configure.ac: + * poppler/FlateStream.cc: + * poppler/FlateStream.h: Fix FlateStream to not read more + than it + needs. This has a performance impact because our input buffer + is now + only 1 byte large, however correctness is better than + performance. + This should fix #3948. + + ChangeLog | 9 +++++++++ + configure.ac | 2 +- + poppler/FlateStream.cc | 35 +++++++++++++++++++++++++---------- + poppler/FlateStream.h | 3 ++- + 4 files changed, 37 insertions(+), 12 deletions(-) + +commit 1d2e6aedca0b8fcce6ac84ae2576ab067912886b +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Sep 5 01:21:50 2006 +0000 + + 2006-09-04 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: Initialize currentFont to + NULL before + use. Found by Pascal Terjan. Fixes #7924. + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.cc | 1 + + 2 files changed, 6 insertions(+) + +commit 7905adaa21f2347346927fa567c64be60e2bc69c +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Sep 3 09:27:21 2006 +0000 + + * poppler/Dict.cc: + * poppler/Dict.h: + * poppler/Object.h: + * poppler/Parser.cc: Patch by Krzysztof Kowalczyk to increase + speed by + means of doing less copies between objects. See bug 8112 + for more + information. + + ChangeLog | 9 +++++++++ + poppler/Dict.cc | 4 ++-- + poppler/Dict.h | 11 +++++++++-- + poppler/Object.h | 12 ++++++++++++ + poppler/Parser.cc | 15 +++++++++------ + 5 files changed, 41 insertions(+), 10 deletions(-) + +commit 4da7c90a619002e54f436c4efee723b5bc42a112 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Aug 24 22:32:31 2006 +0000 + + * qt4/src/poppler-private.h: Init m_fontInfoScanner to + NULL. Discovered by + Rafael Rodríguez <rafael.rodriguez.tf@gmail.com> + + ChangeLog | 5 +++++ + qt4/src/poppler-private.h | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 469202e117910beb4e0ad906d5c154a3bae5c98b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Aug 16 14:35:14 2006 +0000 + + * qt/poppler-page.cc: Report correct page size. Backport from Qt4 + frontend. Patch by Wilfried Huss + + ChangeLog | 5 +++++ + qt/poppler-page.cc | 10 ++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) + +commit b881844e4d31009c5d54c9321a6daaf0f354cf6b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Aug 16 09:18:04 2006 +0000 + + did not want to commit that, thanks Brad for noticing! + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f52380e6d569280839d7c37362bd7cc59f2573c3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Aug 15 22:27:31 2006 +0000 + + add a warning how nasty zlib can be, it can come and it your pdfs + and make your readers crash when you are not looking at it, so be + aware that if you enable it you are on your own ;-) + + ChangeLog | 4 ++++ + configure.ac | 4 ++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 1caba84b1024f1fa7865deebbf70379855ce078d +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 11 13:12:11 2006 +0000 + + 2006-08-11 Albert Astals Cid <aacid@kde.org> + + * poppler/Catalog.cc: Fix leak + + ChangeLog | 4 ++++ + poppler/Catalog.cc | 1 + + 2 files changed, 5 insertions(+) + +commit 9b6455f6530e273afaa5f948b67ceeec8a06f976 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Aug 10 16:08:51 2006 +0000 + + 2006-08-10 Albert Astals Cid <aacid@kde.org> + + * poppler/SplashOutputDev.cc: Try to fix refs to fonts + yet again + + ChangeLog | 4 ++++ + poppler/SplashOutputDev.cc | 4 ++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 305f60e0437dcfc5babd449123a1fe4cd062a219 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 5 17:10:07 2006 +0000 + + 2006-08-05 Albert Astals Cid <aacid@kde.org> + + * poppler/Catalog.cc: The name array can contain references + to strings + instead of stings themselves, or at least PDF of + https://bugs.freedesktop.org/show_bug.cgi?id=7780 does. This + makes it + work with that file + * qt4/src/poppler-embeddedfile.cc: Use UGooString for + description + + ChangeLog | 8 ++++++++ + poppler/Catalog.cc | 12 ++++++++++-- + qt4/src/poppler-embeddedfile.cc | 3 ++- + 3 files changed, 20 insertions(+), 3 deletions(-) + +commit dd8758ea3f0f44e9f8362343f15b2064f428ad64 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Aug 4 22:48:09 2006 +0000 + + 2006-08-05 Albert Astals Cid <aacid@kde.org> + + * utils/pdftotext.cc: + * utils/pdfinfo.cc: + * utils/pdffonts.cc: Add the posibility of reading a file + from stdin. + Patch by Dom Lachowicz + + ChangeLog | 7 +++++++ + utils/pdffonts.cc | 11 ++++++++++- + utils/pdfinfo.cc | 11 ++++++++++- + utils/pdftotext.cc | 11 ++++++++++- + 4 files changed, 37 insertions(+), 3 deletions(-) + +commit a418d844cf6baa797919796ceadaf21ef9b2e5b9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Aug 3 10:34:52 2006 +0000 + + * configure.ac: Use the correct variable to output the + utils status. + Patch by Dom Lachowic + + ChangeLog | 5 +++++ + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 1673b895656143a8a1f1a45e07f777f39995940d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jul 30 20:31:31 2006 +0000 + + * poppler/GfxState.cc: make nGfxBlendModeNames define + return the + correct size of the gfxBlendModeNames array so it does + not access + invalid memory areas when the blend mode is not + found. Discovered by + Krzysztof Kowalczyk + + ChangeLog | 7 +++++++ + poppler/GfxState.cc | 12 +++++++----- + 2 files changed, 14 insertions(+), 5 deletions(-) + +commit e4561568d14e7b3b2aec6ecaf3cc09078bdf7a46 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jul 30 09:38:28 2006 +0000 + + * splash/SplashFontEngine.cc: + * poppler/SplashOutputDev.cc: Fix memory leak when using + embedded + fonts in the pdf file. Patch by Krzysztof Kowalczyk + + ChangeLog | 6 ++++++ + poppler/SplashOutputDev.cc | 8 ++++++-- + splash/SplashFontEngine.cc | 12 ++++++++---- + 3 files changed, 20 insertions(+), 6 deletions(-) + +commit 4a27502159a89992f54be2673b44bf7a8392b60d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jul 29 16:24:53 2006 +0000 + + push back thing i did not want to commit, sorry + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit ba448afc0e97a9e779409ff228adcd4f627971f5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jul 29 16:22:52 2006 +0000 + + * configure.ac: Disable qt and qt4 frontends if splash + backend is + disabled + + ChangeLog | 5 +++++ + configure.ac | 18 ++++++++++++++---- + 2 files changed, 19 insertions(+), 4 deletions(-) + +commit 1e32d3baa5e8296caf55bd5853216a96618c74ac +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Jul 28 18:17:45 2006 +0000 + + 2006-07-28 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoOutputDev.cc: Don't set font matrix translation + (fix from Behdad Esfahbod). + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.cc | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit 0bc1b0f35c28cb80dd27d24110367348e52c143b +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jul 27 18:21:28 2006 +0000 + + fix date, i don't live in the past + + ChangeLog | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2f27c3a0218608568f6cd1c718ef51b9879023a3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jul 27 18:17:50 2006 +0000 + + * poppler/Stream.cc: If you are going to test a variable, + better + initialize it first ;-) Fixes bug 7646 + + ChangeLog | 5 +++++ + poppler/Stream.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit f39ab43ca824cb7e5db73137c4545b3e85134425 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jul 26 18:16:01 2006 +0000 + + 2006-07-26 Albert Astals Cid <aacid@kde.org> + + * qt/poppler-document.cc: + * qt/poppler-private.h: + * qt/poppler-qt.h: Port the QDomDocument *Document::toc() + const method + from the qt4 frontend to the qt frontend. Patch by Wilfried + Huss + + ChangeLog | 7 ++++++ + qt/poppler-document.cc | 18 ++++++++++++++++ + qt/poppler-private.h | 58 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + qt/poppler-qt.h | 16 ++++++++++++++ + 4 files changed, 99 insertions(+) + +commit c3a9fd546b853c85b6be5fc8f4e5a78d8a7e7437 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jul 25 18:39:57 2006 +0000 + + * qt4/src/poppler-document.cc: Obey kdeprint masters in that + a library + should output as much device independent PS as posible, + so disabling + duplex printing for default is a good idea. + + ChangeLog | 6 ++++++ + qt4/src/poppler-document.cc | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit edc0499644b8083600ced9a5087ec0b0189e615b +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Jul 24 19:49:51 2006 +0000 + + 2006-07-24 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: + * poppler/Makefile.am: Move fontconfig dependency to + libpoppler. + + ChangeLog | 5 +++++ + configure.ac | 18 +++++++----------- + poppler/Makefile.am | 6 ++++-- + 3 files changed, 16 insertions(+), 13 deletions(-) + +commit 24b5a68a3f4cdba63fbcd01dc178a330b5f604a7 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Jul 18 21:32:11 2006 +0000 + + 2006-07-18 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/Gfx.cc: fix opCloseStroke to match the behaviour of + a separate opClose and opStroke. Previously, opCloseStroke + only + closes if there is a path however opClose closes + unconditionally. + + ChangeLog | 6 ++++++ + poppler/Gfx.cc | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit c57ebd40fcf85432b2e5045086d158a63af12525 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Jul 18 21:26:57 2006 +0000 + + 2006-07-18 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/TextOutputDev.cc: call setDefaultCTM() after + start page + like in Gfx.cc. This fixes a regression caused by the fix + to #6948. + + ChangeLog | 5 +++++ + poppler/TextOutputDev.cc | 1 + + 2 files changed, 6 insertions(+) + +commit 640d5d5a9d9e53f3f677eb05f3d18e6bfc74e95a +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jul 16 18:22:23 2006 +0000 + + 2006-07-16 Albert Astals Cid <aacid@kde.org> + + * poppler/GfxState.cc: Do not crash when we can not + parse a GfxImageColorMap + Fixes crash on pdf that can be found at + + ChangeLog | 7 +++++++ + poppler/GfxState.cc | 4 ++++ + qt4/src/Doxyfile | 4 ++-- + 3 files changed, 13 insertions(+), 2 deletions(-) + +commit c6926d1d8ab04468f56f4687cdd3f06af206226b +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jun 28 19:23:52 2006 +0000 + + * poppler/DCTStream.cc: + * poppler/DCTStream.h: Reset jpeg structures on reset. + Fixes crash while printing pdf at + http://bugs.kde.org/attachment.cgi?id=16818&action=view + + ChangeLog | 7 +++++++ + poppler/DCTStream.cc | 25 ++++++++++++++++++------- + poppler/DCTStream.h | 2 ++ + 3 files changed, 27 insertions(+), 7 deletions(-) + +commit 96ac8dec591a0325a822c1f7b7bc7e78b867e3a0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 25 16:59:31 2006 +0000 + + Ask for paper size width and height to pass it to PSOutputDev in + both qt frontends (qt got abi mantained, qt4 changed as you still + have to define UNSTABLE_POPPLER_QT4 to be able of using it, one day + we'll have to think of removing it) + + ChangeLog | 8 ++++++++ + qt/poppler-document.cc | 9 +++++++-- + qt/poppler-qt.h | 9 +++++++++ + qt4/src/poppler-document.cc | 4 ++-- + qt4/src/poppler-qt4.h | 10 +++++++++- + 5 files changed, 35 insertions(+), 5 deletions(-) + +commit 965011f2001fb1ea36857995d5555266f82b8d96 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 25 16:20:50 2006 +0000 + + put back a change that was not meant to be commited + + qt/poppler-qt.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4995d09c91173d34a435112828aff21a63b147e9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 25 16:19:32 2006 +0000 + + rename poppler-link.h to poppler-link-qt3.h to not get conflicts + on install + + qt/Makefile.am | 2 +- + qt/poppler-link-qt3.h | 188 ++++++++++++++++++++++++++++++++++++ + qt/poppler-link.cc | 258 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + qt/poppler-qt.h | 4 +- + 4 files changed, 449 insertions(+), 3 deletions(-) + +commit 087921b134c2646e6d41960f471a1819c7c8790a +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 25 10:29:22 2006 +0000 + + add link support to qt3 frontend. + Patch by Wilfried Huss based on Qt4 code + + ChangeLog | 11 ++++ + qt/Makefile.am | 4 +- + qt/poppler-document.cc | 19 ++++--- + qt/poppler-page.cc | 136 + ++++++++++++++++++++++++++++++++++++++++++++++--- + qt/poppler-private.h | 33 +++++++++++- + qt/poppler-qt.h | 14 +++-- + 6 files changed, 196 insertions(+), 21 deletions(-) + +commit 831bd8942ef3224354b128d5e14e68fdfc57168b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 11 16:14:32 2006 +0000 + + optimization by Mario Teijeiro Otero + + poppler/UGooString.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1223fd4b200f6c13996f8299f3563c818af0c21d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Jun 10 22:23:19 2006 +0000 + + * poppler/UGooString.cc: When any of the chars that we + are passing to the UGooString is not pdfencodable, do not + encode the string, because we loose information if we do, + this fixes rendering of + http://publikationen.ub.uni-frankfurt.de/volltexte/2005/890/pdf/TR_abs_g.pdf + and other docs with type3 fonts and ligatures + + ChangeLog | 9 +++++++++ + poppler/UGooString.cc | 8 ++++++++ + 2 files changed, 17 insertions(+) + +commit b85a39ddfc7de8c0621e995c114885ecd08fcdc2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jun 1 21:03:38 2006 +0000 + + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-page.cc: Add Rotation parameter that + is passed + to the respective output devs + + ChangeLog | 6 ++++++ + qt4/src/poppler-page.cc | 22 ++++++++++++++-------- + qt4/src/poppler-qt4.h | 14 +++++++++----- + 3 files changed, 29 insertions(+), 13 deletions(-) + +commit 2b5d3277f36864ff1ef44f1942f22de247d67ab6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jun 1 17:23:45 2006 +0000 + + * qt/poppler-document.cc: + * qt/poppler-qt.h: Add printing support, patch by + Stefan Kebekus <stefan.kebekus@math.uni-koeln.de> + + ChangeLog | 6 ++++++ + qt/poppler-document.cc | 18 ++++++++++++++++++ + qt/poppler-qt.h | 2 ++ + 3 files changed, 26 insertions(+) + +commit 5380d005b7b54cc6587ce6e8c3bbb358da5cd9a5 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Thu Jun 1 06:42:25 2006 +0000 + + 2006-06-01 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/PSOutputDev.cc: + * poppler/PSOutputDev.h: Change filename parameter to + PSOutputDev + constructor from char * to const char *. + + ChangeLog | 6 ++++++ + poppler/PSOutputDev.cc | 2 +- + poppler/PSOutputDev.h | 2 +- + 3 files changed, 8 insertions(+), 2 deletions(-) + +commit c2a81ea8b01f3943a2eb737cf957acc0d05f7eed +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed May 31 20:14:04 2006 +0000 + + * poppler/SplashOutputDev.cc: + * splash/Splash.cc: Fix no splashModeRGB8Qt mode, that is, + make it + show images + + I'm sorry, really, i'll try to do better + + ChangeLog | 6 ++++++ + poppler/SplashOutputDev.cc | 10 ++++++++++ + splash/Splash.cc | 3 +++ + 3 files changed, 19 insertions(+) + +commit 643b310cf51474b6dfc077fe086ea121e807f6e1 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed May 31 19:18:28 2006 +0000 + + 2006-05-31 Jeff Muizelaar <jeff@infidigm.net> + + * TODO: Remove items's from my list that are done. + + ChangeLog | 4 ++++ + TODO | 3 --- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit 96e582721dcb15ea258b989c7c500084bff9f56d +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed May 31 17:31:49 2006 +0000 + + 2006-05-31 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: Change the cairo backend to + use the + transformation in cairo instead of doing all of the + transformations in + the OutputDevice. Fixes #6948. + + ChangeLog | 7 ++ + poppler/CairoOutputDev.cc | 200 + ++++++++++++++++++++-------------------------- + poppler/CairoOutputDev.h | 1 + + 3 files changed, 96 insertions(+), 112 deletions(-) + +commit 00ffb9bf50b6b3b2e8eaa8af593aaa01d4a62a34 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed May 31 04:53:27 2006 +0000 + + 2006-05-31 Kristian Høgsberg <krh@redhat.com> + + * NEWS: Sum up changes. + + * configure.ac: Bump release to 0.5.3. + + ChangeLog | 6 ++++++ + NEWS | 8 ++++++++ + configure.ac | 2 +- + 3 files changed, 15 insertions(+), 1 deletion(-) + +commit 223a4bf3a679f666b6c963a8787cf5b5ac75c4b6 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed May 31 02:02:54 2006 +0000 + + 2006-05-30 Kristian Høgsberg <krh@redhat.com> + + * poppler-glib.pc.in: + * configure.ac: Add poppler as a private requires if + pkg-config + supports it. + + ChangeLog | 6 ++++++ + configure.ac | 11 +++++++++++ + poppler-glib.pc.in | 3 ++- + 3 files changed, 19 insertions(+), 1 deletion(-) + +commit 7aaa4d3fbdb8ea2534d3cb80e68b2759b2e8fd2f +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue May 30 21:46:06 2006 +0000 + + 2006-05-30 Kristian Høgsberg <krh@redhat.com> + + * test/gtk-cairo-test.cc: Add --page option to gtk-cairo-test. + + ChangeLog | 4 ++++ + test/gtk-cairo-test.cc | 21 ++++++++++++++++++--- + 2 files changed, 22 insertions(+), 3 deletions(-) + +commit f7c1d519b9695ad8adfdcf3af696de746cdcf375 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Mon May 29 18:44:17 2006 +0000 + + 2006-05-29 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoFontEngine.cc: + * poppler/CairoFontEngine.h: + * poppler/CairoOutputDev.cc: Allow CairoFont creation to + fail more + gracefully. Fixes #4030. + + ChangeLog | 7 +++++++ + poppler/CairoFontEngine.cc | 27 +++++++++++++++++++++------ + poppler/CairoFontEngine.h | 4 +++- + poppler/CairoOutputDev.cc | 5 +++++ + 4 files changed, 36 insertions(+), 7 deletions(-) + +commit 84861800dad3649d4757d5c5539b9e86e2b2c644 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat May 27 17:27:37 2006 +0000 + + 2006-05-27 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: Back out the rest of krh's type3 + font work. This fixes type3 fonts in CairoOutputDevice. + + ChangeLog | 6 ++++++ + poppler/CairoOutputDev.cc | 3 +++ + poppler/CairoOutputDev.h | 2 +- + 3 files changed, 10 insertions(+), 1 deletion(-) + +commit 6f5a89a0a2cf17d45d1c31ce105829be8c7ac456 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue May 23 20:49:16 2006 +0000 + + * poppler/SplashOutputDev.cc: + * qt4/src/poppler-private.h: + * splash/Splash.cc: + * splash/SplashBitmap.cc: + * splash/SplashTypes.h: bring splashModeRGB8 back to the + old code + (before Frank's patch), create splashModeRGB8Qt that has + Frank's + codepath and is used by Qt frontends. Fixes corruption on + other programs expecting the old behaviour. + + Remember dude we are now a lib! you can not change behaviour from + one day to another! + + /me hits himself + + ChangeLog | 11 +++ + poppler/SplashOutputDev.cc | 8 +++ + qt/poppler-private.h | 2 +- + qt4/src/poppler-private.h | 2 +- + splash/Splash.cc | 169 + +++++++++++++++++++++++++++++++++++++++++++++ + splash/SplashBitmap.cc | 26 ++++++- + splash/SplashTypes.h | 2 + + 7 files changed, 216 insertions(+), 4 deletions(-) + +commit 495d592c3ba7fe81e03774f5b2ed677e5aa560c7 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue May 23 19:16:37 2006 +0000 + + 2006-05-23 Kristian Høgsberg <krh@redhat.com> + + * qt4/src/Makefile.am (libpoppler_qt4_la_SOURCES): Add missing + + ChangeLog | 5 +++++ + qt4/src/Makefile.am | 1 + + 2 files changed, 6 insertions(+) + +commit eecd06c86585bca05c99cd2e9a1b1ff3bbae3c72 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon May 22 20:19:35 2006 +0000 + + 2006-05-22 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Bump release. + * NEWS: Sum up changes. + + ChangeLog | 5 +++++ + NEWS | 11 ++++++++++- + configure.ac | 2 +- + 3 files changed, 16 insertions(+), 2 deletions(-) + +commit 680f20dfd1cf0342d49516b3848a2aef5d2a3883 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon May 22 19:58:41 2006 +0000 + + 2006-05-22 Kristian Høgsberg <krh@redhat.com> + + Patch from Rainer Keller to fix the ImageOutputDev (#6984). + + * utils/ImageOutputDev.cc (drawImage): Upate to work with new + 16-bit color representation. + + * utils/ImageOutputDev.h: Return gTrue for needNonText(). + + ChangeLog | 9 +++++++++ + NEWS | 4 ++++ + utils/ImageOutputDev.cc | 6 +++--- + utils/ImageOutputDev.h | 2 +- + 4 files changed, 17 insertions(+), 4 deletions(-) + +commit e43a06bf6e953fa9af18476e2c9f27106398c09c +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sun May 21 23:26:45 2006 +0000 + + 2006-05-21 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoFontEngine.cc: + * poppler/CairoFontEngine.h: Back out type3 font work + committed by + accident. + + ChangeLog | 6 + + poppler/CairoFontEngine.cc | 347 + +++++---------------------------------------- + poppler/CairoFontEngine.h | 17 +-- + 3 files changed, 47 insertions(+), 323 deletions(-) + +commit 7d4bb0533f88f06449ebd64c1220d0b75001937d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun May 21 18:14:15 2006 +0000 + + fix all is blue issue on ppc machines + + ChangeLog | 7 +++++++ + qt/poppler-page.cc | 17 +++++++++++++++++ + qt4/src/poppler-page.cc | 17 +++++++++++++++++ + 3 files changed, 41 insertions(+) + +commit 655af1e0126ca96d75c9c718d7d8f928c898b1f6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun May 21 17:19:53 2006 +0000 + + hope to fix really Kouhei's name now + + ChangeLog | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit cc783a1ebe868ff75db5472775dabe0020ae501f +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun May 21 11:54:30 2006 +0000 + + Fix Kouhei name + + ChangeLog | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e4b6ad3bb873a6f334934921e6d56e9d26e06a9a +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 19 22:55:49 2006 +0000 + + Add bug number to ChangeLog entry. + + ChangeLog | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 46f5f070cceb2c0f3b53537c8e33340b9f1bba38 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 19 22:26:03 2006 +0000 + + 2006-05-19 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-action.h: + * glib/poppler-action.cc: Add poppler_dest_get_type(), + patch from + Kouhei Souto (#6907). + + ChangeLog | 4 ++++ + glib/poppler-action.cc | 13 +++++++++++++ + glib/poppler-action.h | 4 ++++ + 3 files changed, 21 insertions(+) + +commit 875dc5b112dfe2d4a48a7567b1ff79257447cc0d +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 19 22:21:35 2006 +0000 + + 2006-05-19 Kristian Høgsberg <krh@redhat.com> + + * poppler-glib.pc.in (Requires): Add gdk-2.0 dependency, from + Kouhei Souto (#6896). + + ChangeLog | 3 +++ + poppler-glib.pc.in | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit b66dda2640c088bbe205f698a0c4028144027922 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 19 22:19:21 2006 +0000 + + 2006-05-19 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-document.h (POPPLER_TYPE_INDEX_ITER) + (POPPLER_TYPE_FONTS_ITER): Add these macros, patch from Kouhei + Souto (#6897). + + ChangeLog | 4 ++++ + glib/poppler-document.h | 2 ++ + 2 files changed, 6 insertions(+) + +commit 095730456c0d8312067af10dd55a3b9165a83736 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 19 22:16:25 2006 +0000 + + 2006-05-19 Kristian Høgsberg <krh@redhat.com> + + * glib/Makefile.am (INCLUDES): Add define for G_LOG_DOMAIN, + from + Kouhei Souto (#6899). + + ChangeLog | 3 +++ + glib/Makefile.am | 1 + + 2 files changed, 4 insertions(+) + +commit b8d77633899c1dec5f3b9c9a0f075f39afa98965 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 19 22:12:38 2006 +0000 + + 2006-05-19 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-document.cc (poppler_document_save): + Memleak patch + from Paolo Borelli (#6908). + + ChangeLog | 5 +++++ + glib/poppler-document.cc | 2 ++ + 2 files changed, 7 insertions(+) + +commit 488f77298fee9eebbca5983c1c9fb186b3b67aa3 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 19 22:04:17 2006 +0000 + + 2006-05-19 Kristian Høgsberg <krh@redhat.com> + + * TextOutputDev.h: + * TextOutputDev.cc: + * UnicodeTypeTable.h: + * UnicodeTypeTable.cc: + * UnicodeCClassTables.h: + * UnicodeCompTables.h: + * UnicodeDecompTables.h: + * gen-unicode-tables.py: Patch from Ed Catmur (#2929) + to convert + search string and document text to unicode NFKC (compatibility + composition) before matching so ligatures match correctly. + + ChangeLog | 13 + + poppler/Makefile.am | 5 + + poppler/TextOutputDev.cc | 41 +- + poppler/TextOutputDev.h | 3 + + poppler/UnicodeCClassTables.h | 1827 +++++++++ + poppler/UnicodeCompTables.h | 665 ++++ + poppler/UnicodeDecompTables.h | 8526 + +++++++++++++++++++++++++++++++++++++++++ + poppler/UnicodeTypeTable.cc | 235 ++ + poppler/UnicodeTypeTable.h | 3 + + 9 files changed, 11303 insertions(+), 15 deletions(-) + +commit ecb942e54a1ab0f7eded91b7d1278f0ac62e2071 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 19 21:42:54 2006 +0000 + + 2006-05-19 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (poppler_page_prepare_output_dev): + Fix the + rotation bug for real. + + ChangeLog | 5 +++++ + glib/poppler-page.cc | 16 +++++++++------- + 2 files changed, 14 insertions(+), 7 deletions(-) + +commit 28ae789afe0625a641525e4a0768d51fa8bd667c +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 19 20:54:13 2006 +0000 + + 2006-05-19 Kristian Høgsberg <krh@redhat.com> + + Patch from Kouhei Sutou (#6905). + + * glib/poppler-document.cc: + * glib/poppler-document.h: + * glib/poppler-private.h: + * glib/reference/tmpl/poppler-private.sgml: + * glib/reference/tmpl/poppler.sgml: Make PopplerPSOutput + a proper + glib object. + + ChangeLog | 11 +++++++ + glib/poppler-document.cc | 51 + ++++++++++++++++++++++++++------ + glib/poppler-document.h | 4 +++ + glib/poppler-private.h | 2 ++ + glib/reference/tmpl/poppler-private.sgml | 1 + + glib/reference/tmpl/poppler.sgml | 1 + + 6 files changed, 61 insertions(+), 9 deletions(-) + +commit 02cf7fd7df0b2d8c2b1c6f108e581bc1c7a973b1 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 19 20:35:43 2006 +0000 + + 2006-05-19 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (poppler_page_prepare_output_dev): Fix + rotation bug (#6913, #6926). + + ChangeLog | 3 +++ + glib/poppler-page.cc | 12 +++++++++++- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 78ae3efd9541d7b63ff5a2c4de3fde300806688f +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 19 19:21:59 2006 +0000 + + 2006-05-19 Kristian Høgsberg <krh@redhat.com> + + Memory leak patch from Carlos Garcia Campos (#6947). + + * glib/poppler-action.cc: + * glib/poppler-document.cc: + * glib/poppler-page.cc: + * poppler/CairoFontEngine.cc: + * poppler/CairoFontEngine.h: + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: + * poppler/Gfx.cc: + * poppler/TextOutputDev.cc: Fix various memory leaks. + + ChangeLog | 14 ++ + glib/poppler-action.cc | 9 +- + glib/poppler-document.cc | 31 +++- + glib/poppler-page.cc | 2 + + poppler/CairoFontEngine.cc | 347 + ++++++++++++++++++++++++++++++++++++++++----- + poppler/CairoFontEngine.h | 17 ++- + poppler/CairoOutputDev.cc | 5 +- + poppler/CairoOutputDev.h | 2 +- + poppler/Gfx.cc | 1 + + poppler/TextOutputDev.cc | 9 ++ + 10 files changed, 381 insertions(+), 56 deletions(-) + +commit 354c1926b7181fd668f221e1d672974e04fda747 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri May 19 17:24:19 2006 +0000 + + * qt4/src/poppler-link.cc: Patch by Pino Toscano, ensure the + splashoutput is created when parsing the TOC. + + ChangeLog | 5 +++++ + qt4/src/poppler-link.cc | 5 +++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +commit 3c9a5f37704781c9a51e72edd18451870452b9a7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun May 14 16:11:54 2006 +0000 + + * poppler/FontInfo.cc: Fix possible crash, half patch + by Kouhei Sutou <kou@cozmixng.org> + + ChangeLog | 5 +++++ + poppler/FontInfo.cc | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit 436f578fe762e8ceccce95a0f2003406527dde64 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 13 16:01:57 2006 +0000 + + * poppler/GfxState.cc: + * poppler/GfxState.h: Fix memleak, patch by + Carlos Garcia Campos <carlosgc@gnome.org> + + ChangeLog | 6 ++++++ + poppler/GfxState.cc | 8 ++++++++ + poppler/GfxState.h | 3 +-- + 3 files changed, 15 insertions(+), 2 deletions(-) + +commit 906515769097f2e38f6b2c2aff598919b9d1ee0d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 13 15:58:37 2006 +0000 + + * qt4/src/poppler-document.cc: leak-- + * qt4/src/poppler-private.h: Refcount globalparams + * qt4/tests/test-poppler-qt4.cpp: Some leaks less + + ChangeLog | 6 ++++++ + qt4/src/poppler-document.cc | 10 +++++----- + qt4/src/poppler-private.h | 8 ++++++++ + qt4/tests/test-poppler-qt4.cpp | 6 ++++-- + 4 files changed, 23 insertions(+), 7 deletions(-) + +commit 46fd63c44369c882d8dac473d4156001d9d4ed18 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 13 11:14:24 2006 +0000 + + numbers for easier casting + + qt4/src/poppler-link.h | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit 35500375e3f790c444ab7e7d0a687d270c5a66b1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri May 12 21:02:01 2006 +0000 + + fixing compile problems for some people + + qt4/src/poppler-page.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 181f09829cf4831965059e3064114d83348c51b5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri May 12 20:40:05 2006 +0000 + + * qt4/src/Makefile.am + * qt4/src/poppler-annotation-helper.h + * qt4/src/poppler-annotation.cc + * qt4/src/poppler-annotation.h + * qt4/src/poppler-link.cc + * qt4/src/poppler-link.h + * qt4/src/poppler-page.cc + * qt4/src/poppler-qt4.h: Code for annotations stripped + from oKular, + it's all based on Enrico's work, so ask him for details, + the problem + is that he left KDE development a while ago. + + ChangeLog | 14 + + qt4/src/Makefile.am | 2 + + qt4/src/poppler-annotation-helper.h | 213 ++++++++++ + qt4/src/poppler-annotation.cc | 792 + ++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-annotation.h | 257 ++++++++++++ + qt4/src/poppler-link.cc | 4 +- + qt4/src/poppler-link.h | 2 +- + qt4/src/poppler-page.cc | 691 +++++++++++++++++++++++++++++++ + qt4/src/poppler-qt4.h | 8 +- + 9 files changed, 1980 insertions(+), 3 deletions(-) + +commit 3a48e89dfbe54af73a68ed8e917938f14ad17f01 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue May 9 20:07:06 2006 +0000 + + * qt4/src/Makefile.am: + * qt4/src/poppler-document.cc: + * qt4/src/poppler-link.cc: + * qt4/src/poppler-page.cc: + * qt4/src/poppler-private.h: + * qt4/src/poppler-qt4.h: Adding links extraction code, + should work as + it is basically stripped out from kpdf, but comments are + obviously welcome as always + + ChangeLog | 10 +++ + qt4/src/Makefile.am | 1 + + qt4/src/poppler-document.cc | 13 +--- + qt4/src/poppler-link.cc | 129 ++++++++++++++++++++++++++++++-- + qt4/src/poppler-link.h | 178 + ++++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-page.cc | 139 ++++++++++++++++++++++++++++++---- + qt4/src/poppler-private.h | 9 ++- + qt4/src/poppler-qt4.h | 56 +++----------- + 8 files changed, 456 insertions(+), 79 deletions(-) + +commit f628e1506e576a8553a9699c1d7f05ef55c24fa2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 8 19:03:51 2006 +0000 + + memleak-- by carlos + + ChangeLog | 5 +++++ + poppler/Catalog.cc | 5 ++++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 1fce6266564583d356817a21f43c6b1ad8ce3716 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat May 6 10:57:07 2006 +0000 + + fix code, i suck + + qt4/src/poppler-page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit be913b90d59da35a347498b86fdd3edb065aef23 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri May 5 20:51:01 2006 +0000 + + * poppler/Function.cc: quick fix for KDE bug #126760 + + Better solutions are of course accepted + + ChangeLog | 4 ++++ + poppler/Function.cc | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit 2b085293bd73b4e77da848b3fe63a7e82e9ba5e5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu May 4 19:10:55 2006 +0000 + + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-page.cc: Implement search functionality + + more code to make oKular qt4popplered possible, probably not most + quickest code around, feel free to comment/optimize + + ChangeLog | 5 +++++ + qt4/src/poppler-page.cc | 43 +++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-qt4.h | 16 ++++++++++++++++ + 3 files changed, 64 insertions(+) + +commit a9b0c7977aba7bc85a8673c7f95187ff17ee4173 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue May 2 04:38:39 2006 +0000 + + 2006-05-02 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc: + * poppler/Gfx.cc: + * poppler/GfxFont.cc: + * poppler/GfxFont.h: + * poppler/GfxState.cc: + * poppler/TextOutputDev.cc: Patch from Gary Coady to add + reference + counting to GfxFont so we don't crash on text selection. + + ChangeLog | 10 ++++++++++ + glib/poppler-page.cc | 2 +- + poppler/Gfx.cc | 2 ++ + poppler/GfxFont.cc | 14 +++++++++++++- + poppler/GfxFont.h | 4 ++++ + poppler/GfxState.cc | 7 +++++++ + poppler/TextOutputDev.cc | 1 + + 7 files changed, 38 insertions(+), 2 deletions(-) + +commit 57af0207334ff1a407899370281ebb90fe953a32 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 1 18:33:47 2006 +0000 + + * qt4/src/poppler-page.cc: + * qt4/src/poppler-private.h: + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-textbox.cc: Add nextWord(), hasSpaceAfter() + and + edge() to TextBox + + More things to make poppler-qt4Okular nearer + + ChangeLog | 8 ++++++++ + qt4/src/poppler-page.cc | 14 ++++++++++++++ + qt4/src/poppler-private.h | 11 +++++++++++ + qt4/src/poppler-qt4.h | 8 ++++++++ + qt4/src/poppler-textbox.cc | 23 ++++++++++++++++------- + 5 files changed, 57 insertions(+), 7 deletions(-) + +commit 61b126390f764fd38c79b6a64160a7dc7870bd4a +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 1 13:41:14 2006 +0000 + + revert thing that should not have gone in + + poppler/PageLabelInfo.cc | 43 +++++++++++++++++++++++++++++++++++++++++++ + poppler/PageLabelInfo.h | 44 + -------------------------------------------- + 2 files changed, 43 insertions(+), 44 deletions(-) + +commit f2424ef63e86d82b2be277e2b268b48aae29601e +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon May 1 13:32:31 2006 +0000 + + * qt4/src/poppler-document.cc: + * qt4/src/poppler-private.h: + * qt4/src/poppler-qt4.h: Add the possibility of setting + the paper + color + + One step more to make oKular fully use the qt4 bindings + + ChangeLog | 7 +++++++ + poppler/PageLabelInfo.cc | 43 + ------------------------------------------- + poppler/PageLabelInfo.h | 44 + ++++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-document.cc | 10 ++++++++++ + qt4/src/poppler-private.h | 22 +++++++++++++++++----- + qt4/src/poppler-qt4.h | 6 ++++++ + 6 files changed, 84 insertions(+), 48 deletions(-) + +commit 4147400e2b692df7f70c3772e8a4b576d4d85294 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 29 15:23:41 2006 +0000 + + Fix memory leak. Bug 6765 + + ChangeLog | 5 +++++ + poppler/JBIG2Stream.cc | 1 + + 2 files changed, 6 insertions(+) + +commit 960d60467d62d28f20b127d07e8de1af42eec568 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Thu Apr 27 17:26:36 2006 +0000 + + 2006-04-27 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: delete imgStr if some of + the cairo + functions fail. Fixes coverty reports #2106, #2107, #2077 and + bug #6764. Patch by Kjartan Maraas. + + ChangeLog | 6 ++++++ + poppler/CairoOutputDev.cc | 34 +++++++++++++++++++++++++--------- + 2 files changed, 31 insertions(+), 9 deletions(-) + +commit 155112131c6e25bfde752cf5daa80a6c9712cfed +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Apr 23 15:50:52 2006 +0000 + + qt4/src/poppler-private.h: Protect us against a link not having + a destination or a namedDestination + + ChangeLog | 5 +++++ + qt4/src/poppler-private.h | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit c902a3a22bcceedc8ee8ca377064efcc8a9178ca +Author: Brad Hards <bradh@frogmouth.net> +Date: Fri Apr 21 12:02:19 2006 +0000 + + Add another path to search for Qt4 libs and includes. + + CCMAIL: montel@kde.org + + m4/qt.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 18f8e1f1d213dbcda27cd0ec429273801f65e208 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 18 19:11:56 2006 +0000 + + * goo/GooVector.h: Fix typo that was preventing build with MSVC8 + Discovered by Reece Dunn <msclrhd@hotmail.com> + + ChangeLog | 5 +++++ + goo/GooVector.h | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit cbbb28a5959343d20dffe945ea83272c0b2e287b +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sun Apr 16 22:59:44 2006 +0000 + + 2006-04-16 Carlos Garcia Campos <carlosgc@gnome.org> + + * glib/poppler-action.cc: + * glib/poppler-action.h: + * glib/poppler-private.h: + * glib/poppler.h: + Add support for named destinations and named actions. + + * glib/poppler-document.cc: + * glib/poppler-document.h: + Allow to find named destinations in document. + + ChangeLog | 12 +++ + glib/poppler-action.cc | 152 + +++++++++++++++++++++++++----- + glib/poppler-action.h | 7 +- + glib/poppler-document.cc | 37 ++++++++ + glib/poppler-document.h | 4 +- + glib/poppler-private.h | 2 + + glib/poppler.h | 1 + + glib/reference/tmpl/poppler-action.sgml | 2 + + glib/reference/tmpl/poppler-document.sgml | 4 - + 9 files changed, 189 insertions(+), 32 deletions(-) + +commit 85687a1e0e4c6be2dbfb23ba00018b9c7c7454f5 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Apr 12 06:52:07 2006 +0000 + + 2006-04-12 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: Add support for masked images + to the cairo + backend. CairoOutputDevice really should have been refactored + before + committing this, but the results were so pretty I couldn't + resist. + Fixes #6174. + + ChangeLog | 8 ++++ + poppler/CairoOutputDev.cc | 118 + ++++++++++++++++++++++++++++++++++++++++++++++ + poppler/CairoOutputDev.h | 8 ++++ + 3 files changed, 134 insertions(+) + +commit 6039d4fc65cb25bef20efa29bc29d42086fc0854 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Apr 12 05:46:44 2006 +0000 + + 2006-04-12 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: Fix breakage by krh by only + calling + cairo_destroy on non-null. + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.cc | 4 +++- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit d839a0bd78361930e5e2fe889df12e1e853ffed3 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Apr 12 02:07:07 2006 +0000 + + 2006-04-11 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: + * poppler-glib.pc.in: + * glib/Makefile.am: + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler.h: + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: + * glib/poppler-features.h.in: + Make the CairoOutputDev render to a cairo_t instead of a + cairo_surface_t and expose that functionality in the glib + wrapper + (poppler_page_render). + + * test/Makefile.am: + * test/gtk-cairo-test.cc: + Update gtk-cairo-test to use this new interface and add a spin + button for changing page (#5951). + + * utils/Makefile.am (EXTRA_DIST): Fix warning where this was + assigned twice. + + ChangeLog | 23 ++++ + configure.ac | 8 ++ + glib/Makefile.am | 10 +- + glib/poppler-features.h.in | 24 ++++ + glib/poppler-page.cc | 63 +++++++--- + glib/poppler-page.h | 10 ++ + glib/poppler.h | 1 + + poppler-glib.pc.in | 2 +- + poppler/CairoOutputDev.cc | 23 ++-- + poppler/CairoOutputDev.h | 6 +- + test/Makefile.am | 4 +- + test/gtk-cairo-test.cc | 286 + ++++++++++++++------------------------------- + utils/Makefile.am | 6 +- + 13 files changed, 221 insertions(+), 245 deletions(-) + +commit b198c9801c668014c0979c57033a0637e7e046e2 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Mon Apr 10 18:12:44 2006 +0000 + + 2006-04-10 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: take originX and originY into + account in + drawChar() to draw vertical text properly. Fixes #6551. + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit fd251f52efc7748fda91cc77fb9d3966e0f02ac8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Apr 9 11:05:51 2006 +0000 + + m4/qt.m4: Improve for systems that need -pthread to be linked when + linking Qt. Patch by Diego Pettenò + + ChangeLog | 5 +++++ + m4/qt.m4 | 28 +++++++++++++++++++++++++++- + 2 files changed, 32 insertions(+), 1 deletion(-) + +commit 36de9747153a2ea9b3cf86c41e75a521441a2e06 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 8 10:44:43 2006 +0000 + + * poppler/Makefile.am: + * qt4/src/Makefile.am: Don't link Qt4 in libpoppler when using + Qt4 frontend + Patch by Stefan Schweizer + + ChangeLog | 6 ++++++ + poppler/Makefile.am | 11 +++++------ + qt4/src/Makefile.am | 1 + + 3 files changed, 12 insertions(+), 6 deletions(-) + +commit bf7afe161d76c50fd1c480eb236607145782e59d +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Apr 5 18:20:56 2006 +0000 + + poppler/JBIG2Stream.cc: Fix for some buggy JBIG2 documents, patch + by Raj Kumar and Paul Walmsley. Fixes bug 6500 + + ChangeLog | 5 +++++ + poppler/JBIG2Stream.cc | 43 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 48 insertions(+) + +commit 315f8e488d3db848f88a06c7568b6583bbf0e432 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Apr 5 17:20:56 2006 +0000 + + 2006-04-05 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: use a separate matrix for + the softmask. + fixes #6492. + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.cc | 11 ++++++++++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit 0d311518f678a479c1efeaec15011e0a34de80fc +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 4 21:01:01 2006 +0000 + + * splash/Splash.cc: + * splash/SplashBitmap.cc: Make Splashbitmap RGB8 use 32bits + internally + * qt/poppler-page.cc: + * qt4/src/poppler-page.cc: Adapt to splashbitmap change so + copying to + QImage is faster. + Patch by Frank Meerkötter slightly modified by Albert + Astals Cid + + I'll leave adapting the glib frontend for you guys, i tried to adapt + it but i got lost at gdk_pixbuf_get_n_channels (pixbuf); + + ChangeLog | 9 ++++++ + qt/poppler-page.cc | 18 ++++------- + qt4/src/poppler-page.cc | 15 ++++----- + splash/Splash.cc | 81 + +++++++++++++++++++++++++------------------------ + splash/SplashBitmap.cc | 10 +++--- + 5 files changed, 67 insertions(+), 66 deletions(-) + +commit 888bd41b42507f0a1af55c55495d31d802ce7706 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Apr 4 20:42:08 2006 +0000 + + Fix crash when using fixedpoint math. Patch by Frank Meerkoetter + + ChangeLog | 5 +++++ + splash/SplashFTFont.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 56c98450160b639790931226a045ce4712e7d45e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Apr 2 18:07:59 2006 +0000 + + Improvements to the Qt4 frontend, comments welcome + + ChangeLog | 7 +++ + m4/qt.m4 | 4 +- + qt4/src/Makefile.am | 1 + + qt4/src/poppler-document.cc | 85 +++++++++++++++++++++------ + qt4/src/poppler-link.cc | 138 + ++++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-page.cc | 9 ++- + qt4/src/poppler-private.h | 95 +++++++++++++++++++++++++++++- + qt4/src/poppler-qt4.h | 86 ++++++++++++++++++++++++--- + 8 files changed, 395 insertions(+), 30 deletions(-) + +commit c80ebf237e9c6232a1d0567a2688a294acfd481b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Apr 1 11:25:57 2006 +0000 + + Fix bug 6454 + + ChangeLog | 5 +++++ + poppler/XRef.cc | 22 +++++++++++++--------- + 2 files changed, 18 insertions(+), 9 deletions(-) + +commit fe8142fbc12127682b8024673fe1af57b47bb5c9 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Mar 21 04:25:53 2006 +0000 + + 2006-03-20 Jeff Muizelaar <jeff@infidigm.net> + + * glib/poppler-page.cc: Avoid strdup in + poppler_page_get_property and + make code cleaner. Combined with the memleak fix closes #6187. + Patch by chpe. + + ChangeLog | 6 ++++++ + glib/poppler-page.cc | 5 +---- + 2 files changed, 7 insertions(+), 4 deletions(-) + +commit 4f961df2e6e91a0dc0a024ae5acdefa394179a05 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Mar 21 04:19:18 2006 +0000 + + 2006-03-20 Jeff Muizelaar <jeff@infidigm.net> + + * glib/poppler-page.cc: Fix memory leak in + poppler_page_get_text + Patch by chpe. + + ChangeLog | 5 +++++ + glib/poppler-page.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit ff4febab0a519732972c21bf76d7693c98265e0f +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Mar 20 20:07:36 2006 +0000 + + Use UGooString for dates, fixes KDE bug 123938 + + ChangeLog | 6 ++++++ + qt/poppler-document.cc | 2 +- + qt4/src/poppler-document.cc | 2 +- + 3 files changed, 8 insertions(+), 2 deletions(-) + +commit 75ac6de8cd651b1cbe2d6a7ffa4574097088041f +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Mon Mar 20 19:12:29 2006 +0000 + + 2006-03-20 Carlos Garcia Campos <calosgc@gnome.org> + + reviewed by: Jeff Muizelaar <jeff@infidigm.net> + + * glib/poppler-document.cc: Fix memory leak in + poppler_font_info_free + + ChangeLog | 6 ++++++ + glib/poppler-document.cc | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 784f6d9a0888dab34c586ffe14db8e55b8a11f51 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Mon Mar 20 19:02:10 2006 +0000 + + 2006-03-20 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoFontEngine.h: remove unused variables + + ChangeLog | 4 ++++ + poppler/CairoFontEngine.h | 1 - + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit 847436779d7c82b428acfd6339130228bfadca24 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Mar 19 19:19:42 2006 +0000 + + fix date + + ChangeLog | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 401bae69cc7ade676cacd89b483f0a93a653c7a1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Mar 19 17:01:05 2006 +0000 + + fix htmloutputdev + + ChangeLog | 4 ++++ + utils/HtmlOutputDev.cc | 2 +- + utils/HtmlOutputDev.h | 2 +- + 3 files changed, 6 insertions(+), 2 deletions(-) + +commit d56330e688c0a40b4e206ed3bbddd06d7f3ee66c +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Mar 16 22:04:56 2006 +0000 + + * poppler/Page.cc: Remove a #ifdef that was never defined + (nice to + have so sucky W args), probably came from gpdf (it's not + on xpdf + sources) and was causing bugs 6079 and 6167 + + Might be worth backporting to the stable branch + + ChangeLog | 8 +++++++- + poppler/Page.cc | 2 -- + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit 7ed6737b00ece7ca00cee1d148752b11700370e6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Mar 16 19:21:11 2006 +0000 + + poppler/FontInfo.cc: Embedded fonts don't have a font file + + ChangeLog | 4 ++++ + poppler/FontInfo.cc | 20 ++++++++++++-------- + 2 files changed, 16 insertions(+), 8 deletions(-) + +commit a34688ee29e1cdfcbaca232cf005af55af87f796 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Mar 14 19:34:10 2006 +0000 + + * qt4/src/poppler-qt4.h: Fix compilation with gcc4.1, patch by + Michael Olbrich + + ChangeLog | 5 +++++ + qt4/src/poppler-qt4.h | 10 +++++----- + 2 files changed, 10 insertions(+), 5 deletions(-) + +commit 1a90b3aaf6be4ca3ebb47e904842b1e14a0e8dfc +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Mar 11 15:19:02 2006 +0000 + + * poppler/FontInfo.cc: + * poppler/FontInfo.h: Add getFile() function that returns + the path of the font that is beign used in the system to + represent that font + * qt4/src/poppler-document.cc: + * qt4/src/poppler-fontinfo.cc: + * qt4/src/poppler-private.h: + * qt4/src/poppler-qt4.h: Add the file() function + * qt4/tests/poppler-fonts.cpp: Show the path of the font + used to represent each font + + May be interesting to have in the other frontends + + ChangeLog | 13 +++++++++++++ + poppler/FontInfo.cc | 10 ++++++++++ + poppler/FontInfo.h | 2 ++ + qt4/src/poppler-document.cc | 14 +------------- + qt4/src/poppler-fontinfo.cc | 29 +++++++++-------------------- + qt4/src/poppler-private.h | 29 +++++++++++++++++++++++++++++ + qt4/src/poppler-qt4.h | 8 ++++++-- + qt4/tests/poppler-fonts.cpp | 5 +++-- + 8 files changed, 73 insertions(+), 37 deletions(-) + +commit 22b1618185ec70895ec644d9e590c266ff98c9db +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Mar 9 21:56:07 2006 +0000 + + Build with cairo disabled, patch by Eduardo de Barros Lima + + ChangeLog | 5 +++++ + glib/Makefile.am | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 50ecfadab36a9769b09e4c2c1670d86448a0e1ee +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Feb 28 23:24:59 2006 +0000 + + 2006-02-28 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Bump release to 0.5.1. + + * NEWS: Sum up 0.5.1 changes so far. + + * TextOutputDev.h: add getters for a couple of attributes. + + * glib/Makefile.am: + * poppler/Makefile.am: Move cairo link dependency to glib + bindings. + + ChangeLog | 11 +++++++++++ + NEWS | 10 ++++++++++ + configure.ac | 2 +- + glib/Makefile.am | 11 ++++++----- + poppler/Makefile.am | 19 ++++++++----------- + poppler/TextOutputDev.h | 7 +++++-- + qt/Makefile.am | 1 + + test/Makefile.am | 16 +++++++++------- + utils/Makefile.am | 29 +++++++++++++++++------------ + 9 files changed, 68 insertions(+), 38 deletions(-) + +commit b9e951ac68b9977ab7217ad0346bcf46a3fa3dfe +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Feb 28 19:59:58 2006 +0000 + + 2006-02-28 Kristian Høgsberg <krh@redhat.com> + + * goo/gmem.c: (gmalloc), (grealloc): + * poppler/JBIG2Stream.cc: + * poppler/Stream.cc: + * poppler/Stream.h: + * splash/SplashXPathScanner.cc: + + More integer overflow fixes from Derek Noonburg (#5922). + + ChangeLog | 10 ++++++++++ + goo/gmem.c | 9 +++++---- + poppler/JBIG2Stream.cc | 12 ++++++++++-- + poppler/Stream.cc | 7 +++++++ + poppler/Stream.h | 2 +- + 5 files changed, 33 insertions(+), 7 deletions(-) + +commit 46db73a142d65a0c944910388d5971debc06ecbf +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Feb 28 18:31:59 2006 +0000 + + 2006-02-28 Kristian Høgsberg <krh@redhat.com> + + * poppler/PSOutputDev.cc: Make PSOutputDev constructor respect + passed in paper size (#5946, #5749). + + ChangeLog | 5 +++++ + poppler/PSOutputDev.cc | 14 ++++++++------ + 2 files changed, 13 insertions(+), 6 deletions(-) + +commit 0f7f2182b2abe965b382937f5569b65a8828fc93 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Feb 28 18:25:00 2006 +0000 + + 2006-02-28 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-document.cc (info_dict_get_string): Refactor + _popper_goo_string_to_utf8() out into it's own function. + + * glib/poppler-page.cc (poppler_page_get_property): Use + _popper_goo_string_to_utf8() here to convert ucs2 page labels. + + * glib/poppler-page.cc (poppler_page_get_selection_region): + Add + braces to fix warning. + + * poppler/PageLabelInfo.cc: If the label prefix string has + a ucs2 + marker, append the number part of the label as ucs2 (#5952). + + ChangeLog | 14 +++ + glib/poppler-document.cc | 52 +++++------ + glib/poppler-page.cc | 23 +++-- + glib/poppler-private.h | 3 + + glib/reference/tmpl/poppler-enums.sgml | 150 + -------------------------------- + glib/reference/tmpl/poppler-unused.sgml | 130 +++++++++++++++++++++++++++ + glib/test-poppler-glib.c | 2 +- + goo/GooString.cc | 5 ++ + goo/GooString.h | 4 + + poppler/PageLabelInfo.cc | 39 ++++++--- + poppler/PageLabelInfo.h | 2 +- + 11 files changed, 228 insertions(+), 196 deletions(-) + +commit 1bf83cdc8b75e1c76956ae643ee273e0b558fd08 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 25 12:30:30 2006 +0000 + + fix warning + + ChangeLog | 4 ++++ + poppler/Object.cc | 3 ++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit eb5642f396c8772c83b2cf27da437413b692c952 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Feb 23 22:26:05 2006 +0000 + + Don't build pdftoppm when splashoutput is disabled as it does not link + + ChangeLog | 5 +++++ + utils/Makefile.am | 13 +++++++++++-- + 2 files changed, 16 insertions(+), 2 deletions(-) + +commit 7c5c1361045429a429a6f40d936f8c7c01fe0d07 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Feb 18 20:17:00 2006 +0000 + + 2006-02-18 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: + * poppler/GfxState.cc: + * poppler/GfxState.h: Add support for drawSoftMaskedImage to + CairoOutputDev. Ugly but works. + + ChangeLog | 8 ++++ + poppler/CairoOutputDev.cc | 101 + ++++++++++++++++++++++++++++++++++++++++++++++ + poppler/CairoOutputDev.h | 6 +++ + poppler/GfxState.cc | 50 +++++++++++++++++++++++ + poppler/GfxState.h | 2 + + 5 files changed, 167 insertions(+) + +commit dcb748f68112bd5f99fea8a3da06666be6cff0c5 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Thu Feb 16 19:41:17 2006 +0000 + + 2006-02-16 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: Work around cairo bug when + scaling + 1x1 bitmaps. Fixes #3387. Also gives a performance + improvement. + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.cc | 33 ++++++++++++++++++++++++--------- + 2 files changed, 29 insertions(+), 9 deletions(-) + +commit ef1070f6ca2d1e74c5f94728f3aaae22f0990c17 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Feb 16 19:28:54 2006 +0000 + + Update soname + + ChangeLog | 8 ++++++++ + glib/Makefile.am | 2 ++ + poppler/Makefile.am | 2 ++ + qt/Makefile.am | 2 ++ + qt4/src/Makefile.am | 2 ++ + 5 files changed, 16 insertions(+) + +commit 24b9f5c33fb00ff80a79b34444282a57288f636c +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Feb 13 23:04:54 2006 +0000 + + * poppler/ArthurOutputDev.cc: Make it compile after changing code + so we did not pass files to freetype but buffers + + ChangeLog | 5 +++++ + poppler/ArthurOutputDev.cc | 53 + +++++++++++++++++----------------------------- + 2 files changed, 24 insertions(+), 34 deletions(-) + +commit 0bda90310b267d3a4963096293eb2bd29b120768 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Feb 13 22:38:44 2006 +0000 + + Probably the last of inner patches missing from kpdf + Everybody will we happy now, kpdf has been finally assimilated + + ChangeLog | 5 ++ + poppler/PSOutputDev.cc | 124 + +++++++++++++++++++++++++++++++++++++++++++++---- + poppler/PSOutputDev.h | 4 +- + 3 files changed, 123 insertions(+), 10 deletions(-) + +commit cf9867fbbee2468a955b5845016585eeedf2debe +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Feb 6 20:49:21 2006 +0000 + + Various fixes from Frank Meerkötter to enable fixedpoint arithmetic + + ChangeLog | 8 ++++++++ + configure.ac | 2 +- + goo/FixedPoint.h | 2 +- + splash/Splash.cc | 4 ++-- + splash/SplashTypes.h | 2 +- + 5 files changed, 13 insertions(+), 5 deletions(-) + +commit f04e2c4f20f821ff8cb9465a715ccbb22091d449 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Feb 6 18:50:10 2006 +0000 + + Jeff Muizelaar's improvements to my yesterday's small patches + + ChangeLog | 6 ++++++ + poppler/Annot.cc | 9 ++++----- + poppler/JBIG2Stream.cc | 2 +- + 3 files changed, 11 insertions(+), 6 deletions(-) + +commit 33e98f81cdfda0935ac7ea79a691976465ec790b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Feb 5 15:46:10 2006 +0000 + + Some small fixes from kpdf + + ChangeLog | 8 ++++++++ + poppler/Gfx.cc | 1 + + poppler/GfxFont.cc | 1 + + poppler/JBIG2Stream.cc | 2 +- + poppler/SplashOutputDev.cc | 1 - + 5 files changed, 11 insertions(+), 2 deletions(-) + +commit 6d9e6489d24b3105204ff4233f6493136e9b5715 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Feb 4 21:10:41 2006 +0000 + + 2006-02-04 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/Gfx.cc: + * poppler/OutputDev.cc: + * poppler/OutputDev.h: Let output devices know about pdf + grouping + operators. + Patch by Thorkild Stray. + + ChangeLog | 8 ++++++++ + poppler/Gfx.cc | 14 ++++++++++++++ + poppler/OutputDev.cc | 16 ++++++++++++++++ + poppler/OutputDev.h | 10 ++++++++++ + 4 files changed, 48 insertions(+) + +commit b4e34d905cd0ca5815a450de35b4c2774f4887c9 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Feb 4 20:48:25 2006 +0000 + + 2006-02-04 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/GlobalParams.cc: Check all fonts returned by + fontconfig. + Discard the ones that are not truetype or type1. Fixes #5758. + Patch by Ed Catmur. + + ChangeLog | 6 ++++++ + poppler/GlobalParams.cc | 51 + +++++++++++++++++++++++++++---------------------- + 2 files changed, 34 insertions(+), 23 deletions(-) + +commit fd85a0afdd7b4cafc68df400d4f94fccaea18c76 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 4 20:34:13 2006 +0000 + + Remove bug from "do not use an external file to pass fonts to + Freetype" patch, patch by Stefan Schweizer + + ChangeLog | 3 +++ + poppler/SplashOutputDev.cc | 14 ++++++++++---- + 2 files changed, 13 insertions(+), 4 deletions(-) + +commit 67ca9d01f8badcf542f60b23521c384c9840ca1b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 4 20:31:00 2006 +0000 + + Added a DTD of the xml pdftohtml creates patch by Stefan Schweizer + + ChangeLog | 2 ++ + utils/Makefile.am | 2 ++ + utils/pdf2xml.dtd | 28 ++++++++++++++++++++++++++++ + 3 files changed, 32 insertions(+) + +commit f4df23ca7f396883a906f16dfc8db1ebd528e04a +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 4 20:24:03 2006 +0000 + + ignore++ + + utils/.cvsignore | 1 + + 1 file changed, 1 insertion(+) + +commit 93ad488679f594e45547a67e2a7397f4c8bd2820 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Feb 4 20:07:07 2006 +0000 + + Actually create pdftoppm patch by Stefan Schweizer + + ChangeLog | 44 +++++++++++++++++++++++++------------------- + utils/Makefile.am | 10 ++++++++-- + utils/pdftoppm.cc | 9 +++++---- + 3 files changed, 38 insertions(+), 25 deletions(-) + +commit 7d2be955e6345a052590b06b29a6d2fb2111e2e6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Feb 2 23:06:20 2006 +0000 + + CVE-2006-0301 fix by Derek though KDE security team + + ChangeLog | 5 +++++ + splash/SplashXPathScanner.cc | 32 ++++++++++++++++++++------------ + 2 files changed, 25 insertions(+), 12 deletions(-) + +commit c191e7d0f13ea429017e4d4f79ce803e84c72e40 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Feb 2 22:54:27 2006 +0000 + + i should learn on which day i live + + ChangeLog | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1ddeed60d07c3a7e011f3f594fa9299379d0b000 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Feb 2 22:50:01 2006 +0000 + + don't use files to pass fonts to freetype + + ChangeLog | 26 ++++++++++++ + fofi/FoFiTrueType.cc | 43 ++++++++++++++++---- + fofi/FoFiTrueType.h | 7 ++-- + fofi/FoFiType1C.h | 2 +- + goo/gfile.cc | 8 ++++ + poppler/GfxFont.cc | 49 ++++++++++++++++++++++- + poppler/GfxFont.h | 2 + + poppler/GlobalParams.cc | 1 + + poppler/GlobalParams.h | 1 + + poppler/SplashOutputDev.cc | 94 + ++++++++++++++++++++++---------------------- + splash/SplashFTFontEngine.cc | 44 +++++++++++++-------- + splash/SplashFTFontEngine.h | 16 ++++---- + splash/SplashFTFontFile.cc | 47 +++++++++++++--------- + splash/SplashFTFontFile.h | 18 ++++----- + splash/SplashFontEngine.cc | 46 +++++++++------------- + splash/SplashFontEngine.h | 16 ++++---- + splash/SplashFontFile.cc | 70 +++++++++++++++++++++++++++++---- + splash/SplashFontFile.h | 25 ++++++++++-- + splash/SplashT1FontEngine.cc | 29 +++++++------- + splash/SplashT1FontFile.cc | 30 +++++++++++--- + splash/SplashT1FontFile.h | 4 +- + 21 files changed, 396 insertions(+), 182 deletions(-) + +commit 34df4cfa5cd8788ccf2ea698cbedd05b209041f5 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Feb 1 03:52:12 2006 +0000 + + 2006-01-31 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/GlobalParams.cc (GlobalParams::getDisplayFont): + Allow ttc fonts to be used. + + ChangeLog | 5 +++++ + poppler/GlobalParams.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 0184e7c928ec60c0aa3f8634d96ae0cf0ad6d157 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Jan 29 05:16:31 2006 +0000 + + 2006-01-28 Jeff Muizelaar <jeff@infidigm.net> + + * glib/poppler-attachment.h: fix compile by adding <time.h> + include. + Acked-by: Jonathan Blanford <jrb@redhat.com> + + ChangeLog | 5 +++++ + glib/poppler-attachment.h | 1 + + 2 files changed, 6 insertions(+) + +commit c805e25f2f074640e4345f8b71eef8d7de677109 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Jan 26 19:25:07 2006 +0000 + + 2006-01-26 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoOutputDev.cc: Patch from Christian Krause; + handle + 0-width lines (#5545). + + ChangeLog | 5 +++++ + poppler/CairoOutputDev.cc | 6 +++++- + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit 4f48abcd4c21460d4c5b718a7ba18cdceb30c2d1 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Tue Jan 24 06:21:39 2006 +0000 + + Tue Jan 24 01:19:40 2006 Jonathan Blandford <jrb@redhat.com> + + * glib/Makefile.am: + * glib/poppler-attachment.cc: + * glib/poppler-attachment.h: + * glib/poppler-document.cc: + * glib/poppler-document.h: + * glib/poppler-page.cc: + * glib/poppler-private.h: + * glib/poppler.h: + * glib/test-poppler-glib.c: + * glib/reference/tmpl/poppler-enums.sgml: + * glib/reference/tmpl/poppler-unused.sgml: glib bindings + for the + embedded file support. It doesn't support mtime and + ctime yet, + but the rest works. + + ChangeLog | 16 +++ + glib/Makefile.am | 2 + + glib/poppler-attachment.cc | 223 + ++++++++++++++++++++++++++++++++ + glib/poppler-attachment.h | 67 ++++++++++ + glib/poppler-document.cc | 63 +++++++++ + glib/poppler-document.h | 6 + + glib/poppler-page.cc | 2 +- + glib/poppler-private.h | 6 +- + glib/poppler.h | 1 + + glib/reference/tmpl/poppler-enums.sgml | 150 +++++++++++++++++++++ + glib/reference/tmpl/poppler-unused.sgml | 130 ------------------- + glib/test-poppler-glib.c | 26 +++- + 12 files changed, 559 insertions(+), 133 deletions(-) + +commit 052bf4b80c8a0dc45f6222617bfd8ae1b9c40410 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Jan 23 18:52:48 2006 +0000 + + 2006-01-23 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: + * poppler/GlobalParams.cc: + * poppler/poppler-config.h.in: + * utils/pdftohtml.cc: + * utils/pdftops.cc: Respect command line paper size settings + (#5641). + Drop the built-in paper sizes. + + ChangeLog | 9 +++++++++ + configure.ac | 1 - + poppler/GlobalParams.cc | 23 ++--------------------- + poppler/poppler-config.h.in | 5 ----- + utils/pdftohtml.cc | 4 +--- + utils/pdftops.cc | 4 +++- + 6 files changed, 15 insertions(+), 31 deletions(-) + +commit fb2054a5031d60aac3ccc9a36b3ed88a32188e33 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Jan 23 15:40:54 2006 +0000 + + 2006-01-23 Kristian Høgsberg <krh@redhat.com> + + * glib/test-poppler-glib.c (print_document_info, print_index): + Move variable declarations to top (#5692). + + * utils/*.cc: Move config.h #include to top of #include's + (#5693). + + ChangeLog | 5 +++++ + glib/test-poppler-glib.c | 5 +++-- + poppler/FontInfo.cc | 2 +- + utils/HtmlOutputDev.cc | 2 +- + utils/ImageOutputDev.cc | 2 +- + utils/pdffonts.cc | 2 +- + utils/pdfimages.cc | 2 +- + utils/pdfinfo.cc | 2 +- + utils/pdftohtml.cc | 4 ++-- + utils/pdftoppm.cc | 2 +- + utils/pdftops.cc | 2 +- + utils/pdftotext.cc | 2 +- + 12 files changed, 19 insertions(+), 13 deletions(-) + +commit 836af3529e827e25f20cb4710cbbf9ed0371a42c +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Jan 23 14:45:30 2006 +0000 + + 2006-01-23 Kristian Høgsberg <krh@redhat.com> + + * splash/SplashFTFont.cc: Don't use deprecated freetype + include + files. + + ChangeLog | 5 +++++ + splash/SplashFTFont.cc | 3 ++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 60e13bf84e4f020a264811e4a5bf85d67e15d6df +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Jan 21 21:56:40 2006 +0000 + + 2006-01-21 Jeff Muizelaar <jeff@infidigm.net> + + * TODO: Add my todo list. + + ChangeLog | 4 ++++ + TODO | 10 ++++++++++ + 2 files changed, 14 insertions(+) + +commit cebba06563d1b691a8bbb83828e47c9cc91e231a +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 18 22:40:26 2006 +0000 + + ok, ok, lasts files, i promise :-/ + + qt4/tests/check_attachments.cpp | 151 + ++++++++++++++++++++++++++++++++++++++ + qt4/tests/poppler-attachments.cpp | 37 ++++++++++ + 2 files changed, 188 insertions(+) + +commit 0b12e7cce6c6633b1d07e2902a9fa13ff52079e7 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 18 22:38:59 2006 +0000 + + YAMF = Yet Another Missing File + + qt4/src/poppler-embeddedfile.cc | 106 + ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 106 insertions(+) + +commit 38c8f3a53b3eb2be1fbfa360f77285037d89b719 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 18 22:36:01 2006 +0000 + + as usual i foget some files + + poppler/UGooString.cc | 86 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/UGooString.h | 55 ++++++++++++++++++++++++++++++++ + 2 files changed, 141 insertions(+) + +commit ad6e7d862c8fa6e10a7dbbb3391cbb0b6c922375 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 18 22:32:13 2006 +0000 + + Brad patch for embedded document extraction, only has Qt4 bindings + for now, needs Qt3 and glib work + + ChangeLog | 42 +++++++++++++ + glib/poppler-action.cc | 2 +- + glib/poppler-document.cc | 1 + + poppler/Annot.cc | 1 + + poppler/Catalog.cc | 133 + +++++++++++++++++++++++++++++++++++++++--- + poppler/Catalog.h | 60 +++++++++++++++++-- + poppler/Dict.cc | 17 +++--- + poppler/Dict.h | 15 ++--- + poppler/FontInfo.cc | 1 + + poppler/Function.cc | 1 + + poppler/Gfx.cc | 1 + + poppler/GfxFont.cc | 5 +- + poppler/GfxState.cc | 1 + + poppler/Link.cc | 9 +-- + poppler/Link.h | 9 +-- + poppler/Makefile.am | 2 + + poppler/Object.h | 17 +++--- + poppler/Outline.cc | 1 + + poppler/PDFDoc.cc | 1 + + poppler/PDFDoc.h | 2 +- + poppler/PSOutputDev.cc | 5 +- + poppler/Page.cc | 1 + + poppler/PageLabelInfo.cc | 1 + + poppler/Parser.cc | 2 + + poppler/SecurityHandler.cc | 1 + + poppler/Stream.cc | 1 + + poppler/XRef.cc | 1 + + qt/poppler-document.cc | 1 + + qt/poppler-page-transition.cc | 1 + + qt4/src/Makefile.am | 1 + + qt4/src/poppler-document.cc | 26 ++++++++- + qt4/src/poppler-private.h | 2 + + qt4/src/poppler-qt4.h | 68 +++++++++++++++++++++ + qt4/tests/.cvsignore | 2 + + qt4/tests/Makefile.am | 16 ++++- + utils/HtmlOutputDev.cc | 1 + + utils/pdffonts.cc | 1 + + utils/pdfinfo.cc | 1 + + utils/pdftohtml.cc | 1 + + utils/pdftotext.cc | 1 + + 40 files changed, 401 insertions(+), 54 deletions(-) + +commit 550fb0b617ece7951ec39aec5fa5504cc90022fc +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 18 21:22:12 2006 +0000 + + Add some more documentation to PageTransition, patch by Stefan Kebekus + + ChangeLog | 6 ++++++ + qt/poppler-page-transition.h | 40 + +++++++++++++++++++++++++++++++++------- + qt4/src/Doxyfile | 2 +- + 3 files changed, 40 insertions(+), 8 deletions(-) + +commit d66f3647ff1c38318d4cd056cb4d4c7a32eb6603 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jan 18 18:54:12 2006 +0000 + + poppler/CharCodeToUnicode.cc: Fix check for length that was not + having into account that there could be \n or \r in tokens + an that + those do not have to be took into account. Fixes + http://bugs.kde.org/show_bug.cgi?id=120310 + + ChangeLog | 9 ++++++++- + poppler/CharCodeToUnicode.cc | 31 +++++++++++++++++++++++++++---- + 2 files changed, 35 insertions(+), 5 deletions(-) + +commit d78b670339c8f92a32ab5f0a574d0e21690806f8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 17 21:35:31 2006 +0000 + + When doing the parsing check with XREF we did not grow too much. Fixes + serialata10a.pdf + + ChangeLog | 10 ++++++++++ + poppler/Lexer.cc | 22 +++++++++++++++++++--- + poppler/Lexer.h | 8 +++++--- + poppler/Parser.cc | 6 +++--- + poppler/Parser.h | 2 +- + poppler/XRef.cc | 17 +++++++++++++++++ + poppler/XRef.h | 3 +++ + 7 files changed, 58 insertions(+), 10 deletions(-) + +commit f5db636af0cd6e05cd7ede37a8585001d51192a1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 17 20:33:08 2006 +0000 + + i suck + i suck + i suck + i suck + i suck + A file i forgot to add to make it compile :-/ + + qt/poppler-page-transition-private.h | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +commit 9cc97908ea67ab431e58129f589e00f41f40a143 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Thu Jan 12 23:54:08 2006 +0000 + + 2006-01-12 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/GlobalParams.cc: Make buildFcPattern() static. + + ChangeLog | 4 ++++ + poppler/GlobalParams.cc | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit c7ce134fb1dadb46e2b3773d0976ea31da0a046f +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Jan 11 16:52:58 2006 +0000 + + 2006-01-11 Kristian Høgsberg <krh@redhat.com> + + * poppler/JBIG2Stream.cc: + * poppler/Stream.cc: Merge patch to fix CVE-2005-3624, + CVE-2005-3625 and CVE-2005-3627 issues. + + ChangeLog | 6 ++++++ + poppler/JBIG2Stream.cc | 32 +++++++++++++++++++++++++++++++- + poppler/Stream.cc | 8 +++++--- + 3 files changed, 42 insertions(+), 4 deletions(-) + +commit ec7fb41725c19bc7f2aad1073fe6397ea0a8da0d +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jan 10 21:57:28 2006 +0000 + + * configure.ac: + * m4/qt.m4: Fix bugs created when splitting the code from + configure.ac, take QTDIR into account when looking for + QtTestLib and + do not die if it is not found as it is not mandatory + * qt/poppler-page-transition.cc: + * qt/poppler-page.cc: + * qt/poppler-private.h: + * qt4/tests/Makefile.am: + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-page.cc: + * qt4/src/Makefile.am: Fix mess created my the moving and + renaming of + PageTransition.cc + + ChangeLog | 15 +++++++++++++++ + configure.ac | 14 ++++---------- + m4/qt.m4 | 5 +++++ + qt/poppler-page-transition.cc | 2 +- + qt/poppler-page.cc | 1 + + qt/poppler-private.h | 5 ----- + qt4/src/Makefile.am | 1 + + qt4/src/poppler-page.cc | 2 +- + qt4/src/poppler-qt4.h | 2 +- + qt4/tests/Makefile.am | 1 + + 10 files changed, 30 insertions(+), 18 deletions(-) + +commit d9bc53a741b3bbd2a202662c66fe70f49ac72a49 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Jan 10 17:59:51 2006 +0000 + + 2006-01-10 Kristian Høgsberg <krh@redhat.com> + + * splash/Makefile.am: Only install splash headers if + --enable-xpdf-headers is given. + + * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Set this here. + + ChangeLog | 7 +++++++ + Makefile.am | 1 + + splash/Makefile.am | 4 ++++ + 3 files changed, 12 insertions(+) + +commit ea6d9b97cec6fabf8a5005c565bbdb378bed7f54 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Tue Jan 10 17:55:59 2006 +0000 + + 2006-01-10 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: + Fix the following fixme in CairoOutputDevice. + + // FIXME: This is quite right yet, we need to accumulate all + // glyphs within one text object before we clip. Right now + this + // just add this one string. + + The fix uses a strategy similar to the one the Splash backend. + textClipPath is used to store the appended path from each + call to + endString(). The accumulated path is clipped in endTextObject. + + ChangeLog | 14 ++++++++++++++ + poppler/CairoOutputDev.cc | 27 +++++++++++++++++++++++---- + poppler/CairoOutputDev.h | 1 + + 3 files changed, 38 insertions(+), 4 deletions(-) + +commit 9e8a655a2bd3ca8cff1a150dce0dd378aeca047b +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Jan 8 22:59:48 2006 +0000 + + 2006-01-08 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: Don't try and load type3 fonts + (#4030). + + ChangeLog | 6 +++++- + poppler/CairoOutputDev.cc | 5 ++++- + 2 files changed, 9 insertions(+), 2 deletions(-) + +commit 25fd8e1ea87c41855a4ee702fbe47f5661a54c22 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Jan 8 22:51:17 2006 +0000 + + 2006-01-08 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/Page.cc: use colToByte for reading thumbnails + (#5420). + + Patch by Nickolay V. Shmyrev. + + ChangeLog | 6 ++++++ + poppler/Page.cc | 6 +++--- + 2 files changed, 9 insertions(+), 3 deletions(-) + +commit df73ee2ec4b65ccf611f0fd76fb456cc797693d4 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Jan 7 06:10:15 2006 +0000 + + 2006-01-07 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/CairoOutputDev.cc: Initialize (fill|stroke)_opacity. + + ChangeLog | 4 ++++ + poppler/CairoOutputDev.cc | 2 ++ + 2 files changed, 6 insertions(+) + +commit 18eb8de66749082e4aa65cc6d369a533826fab33 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Jan 6 10:05:58 2006 +0000 + + 2006-01-06 Kristian Høgsberg <krh@redhat.com> + + * qt/poppler-page.cc: + * qt/poppler-private.h: + * qt/poppler-qt.h: + * qt4/src/Makefile.am: + * qt/Makefile.am: + * poppler/Makefile.am: Move PageTransition to qt bindings, + move + contents from Private.h to qt/poppler-private.h. + + * poppler/TextOutputDev.cc (visitWord): Remove #warning. + + * utils/Makefile.am (pdfimages_SOURCES): Add ImageOutputDev.h, + use + dist_man1_MANS so we actually dist the man pages. + + * goo/Makefile.am (poppler_goo_include_HEADERS): Add + GooVector.h. + + * glib/reference/Makefile.am: DOC_SOURCE_DIR must be + relative to + $(srcdir), fix this to make distchek run. + + * m4/qt.m4: + * m4/libjpeg.m4: + * acinclude.m4: + * configure.ac: Split out Qt and libjpeg checks from + configure.ac + and acinclude.m4 to m4/qt.m4 and m4/libjpeg.m4. + + ChangeLog | 26 +++ + configure.ac | 223 + ++------------------- + glib/reference/Makefile.am | 2 +- + glib/reference/tmpl/poppler-enums.sgml | 150 -------------- + glib/reference/tmpl/poppler-unused.sgml | 130 ++++++++++++ + goo/Makefile.am | 1 + + acinclude.m4 => m4/libjpeg.m4 | 7 +- + m4/qt.m4 | 206 + +++++++++++++++++++ + poppler/Makefile.am | 1 - + poppler/Private.h | 30 --- + poppler/TextOutputDev.cc | 2 - + qt/Makefile.am | 8 +- + qt/poppler-page-transition.cc | 187 + +++++++++++++++++ + .../poppler-page-transition.h | 3 +- + qt/poppler-page.cc | 1 - + qt/poppler-private.h | 9 +- + qt/poppler-qt.h | 2 +- + qt4/src/Makefile.am | 8 +- + utils/Makefile.am | 54 ++++- + 19 files changed, 634 insertions(+), 416 deletions(-) + +commit 93921e77115ebe4d527f98675e438de485e84507 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 5 23:53:33 2006 +0000 + + * poppler/DCTStream.cc: Fix handling of malformed jpeg streams like + the one at http://bugs.kde.org/show_bug.cgi?id=119569 + + Might be worth backporting to 0.4.x + + ChangeLog | 5 +++++ + poppler/DCTStream.cc | 26 ++++++++++++++++---------- + 2 files changed, 21 insertions(+), 10 deletions(-) + +commit 0dc16af02071350a0dc11af4106799378c99cdad +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jan 5 13:53:58 2006 +0000 + + Introduce variants of renderTo that return a QImage and do not use + a QPixmap so threading is possible. + + ChangeLog | 8 +++++++ + qt/poppler-page.cc | 18 ++++++++++----- + qt/poppler-qt.h | 30 ++++++++++++++++++++----- + qt4/src/poppler-page.cc | 9 +++++++- + qt4/src/poppler-qt4.h | 59 + +++++++++++++++++++++++++++---------------------- + 5 files changed, 85 insertions(+), 39 deletions(-) + +commit 5c2cbf5d327c6cc75c073b56c3ab1748c0d24387 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jan 2 14:24:31 2006 +0000 + + Use error() instead std::cerr in PageTranstion.cc + + ChangeLog | 4 ++++ + poppler/PageTransition.cc | 5 +++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit da5a4233498b56df611e1c7bca0090306cb5dbe0 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Mon Jan 2 00:06:45 2006 +0000 + + Sun Jan 1 18:50:51 2006 Jonathan Blandford <jrb@redhat.com> + + * Makefile.am: + * autogen.sh: + * configure.ac: + * gtk-doc.make: + * glib/Makefile.am: enable gtk-doc support. + + ChangeLog | 8 +++ + Makefile.am | 2 + + autogen.sh | 14 +++++ + configure.ac | 4 ++ + glib/Makefile.am | 1 + + gtk-doc.make | 153 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + m4/gtk-doc.m4 | 53 +++++++++++++++++++ + 7 files changed, 235 insertions(+) + +commit 372c34cc9728d7041bc4f6893c0bae50c9501c50 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 1 22:35:48 2006 +0000 + + * qt4/src/poppler-private.h: + * qt4/src/poppler-page.cc: + * qt4/src/poppler-document.cc: Don't create a SplashOutputDev + for + every splashRenderToPixmap + + ChangeLog | 4 ++++ + qt4/src/poppler-document.cc | 1 - + qt4/src/poppler-page.cc | 18 +++++------------- + qt4/src/poppler-private.h | 24 +++++++++++++++++++++++- + 4 files changed, 32 insertions(+), 15 deletions(-) + +commit 6ff83474ac594368015334db9c6b33d3a552079f +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jan 1 22:18:47 2006 +0000 + + * qt/poppler-page.cc: + * qt/poppler-private.h: Don't create a SplashOutputDev for every + renderToPixmap. + + ChangeLog | 6 ++++++ + qt/poppler-page.cc | 8 +------- + qt/poppler-private.h | 24 +++++++++++++++++++++++- + 3 files changed, 30 insertions(+), 8 deletions(-) + +commit 6942646d4c82327a80b021838a38aa55c1026883 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Sun Jan 1 20:34:36 2006 +0000 + + Sun Jan 1 15:32:08 2006 Jonathan Blandford <jrb@redhat.com> + + * glib/reference/*: More gtk-doc work. Not enabled for + building + by default, but filled in. + + .cvsignore | 1 + + ChangeLog | 5 + + glib/reference/.cvsignore | 18 ++ + glib/reference/Makefile.am | 87 +++++++ + glib/reference/poppler-docs.sgml | 17 ++ + glib/reference/poppler-overrides.txt | 0 + glib/reference/poppler-sections.txt | 151 ++++++++++++ + glib/reference/poppler.types | 4 + + glib/reference/tmpl/poppler-action.sgml | 172 +++++++++++++ + glib/reference/tmpl/poppler-document.sgml | 354 + +++++++++++++++++++++++++++ + glib/reference/tmpl/poppler-enums.sgml | 169 +++++++++++++ + glib/reference/tmpl/poppler-page.sgml | 243 ++++++++++++++++++ + glib/reference/tmpl/poppler-private.sgml | 128 ++++++++++ + glib/reference/tmpl/poppler-unused.sgml | 0 + glib/reference/tmpl/poppler.sgml | 216 ++++++++++++++++ + glib/reference/tmpl/stamp-poppler-enums.sgml | 19 ++ + 16 files changed, 1584 insertions(+) + +commit 0fab1b711f153859e113cb3b6d734ddcb58fb87a +Author: Jonathan Blandford <jrb@redhat.com> +Date: Sat Dec 31 02:10:33 2005 +0000 + + Fri Dec 30 21:08:33 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/*{cc,h}: Update inline doc comments. This is in + preparation for gtk-doc support. + + ChangeLog | 5 ++ + glib/poppler-action.cc | 14 +++++ + glib/poppler-action.h | 2 - + glib/poppler-document.cc | 151 + ++++++++++++++++++++++++++++++++++++++++++++++- + glib/poppler-document.h | 4 +- + glib/poppler-page.cc | 28 +++++++++ + glib/poppler.cc | 16 +++++ + glib/test-poppler-glib.c | 29 +++++++++ + 8 files changed, 243 insertions(+), 6 deletions(-) + +commit 313530036b204eaa5ddfa150730302e855560d6a +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 30 22:54:46 2005 +0000 + + A delete that slipped from the last patch-commit + + qt4/src/poppler-page.cc | 1 + + 1 file changed, 1 insertion(+) + +commit cf6f8123af19aca4200b58a454652f68ce8132e2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 30 22:31:32 2005 +0000 + + Puting PageTransition implementation into poppler "core", both Qt + and Qt4 frontends use it. + + poppler/Makefile.am | 1 + + poppler/PageTransition.cc | 188 + ++++++++++++++++++++++++++++++++++++++++++++++ + poppler/PageTransition.h | 118 +++++++++++++++++++++++++++++ + poppler/Private.h | 30 ++++++++ + qt/Makefile.am | 2 +- + qt/poppler-page.cc | 111 +-------------------------- + qt/poppler-qt.h | 72 +----------------- + qt4/src/Makefile.am | 2 +- + qt4/src/poppler-page.cc | 17 ++++- + qt4/src/poppler-qt4.h | 14 +++- + 10 files changed, 374 insertions(+), 181 deletions(-) + +commit 56035ab199ac6deb5c1e07e745d120d1121a5960 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Dec 30 21:59:58 2005 +0000 + + * utils/HtmlOutputDev.cc: + * utils/ImageOutputDev.cc: Fix build when using --disable-libjpeg + + ChangeLog | 5 +++++ + utils/HtmlOutputDev.cc | 2 ++ + utils/ImageOutputDev.cc | 2 ++ + 3 files changed, 9 insertions(+) + +commit 8b64dafc7f1d198fb0052c0d6f0da6de97bbb48d +Author: Brad Hards <bradh@frogmouth.net> +Date: Wed Dec 28 09:23:43 2005 +0000 + + Plug a few memory leaks in the Qt4 bindings. + + ChangeLog | 25 ++++++++++++++++++++ + qt4/src/poppler-document.cc | 3 +++ + qt4/src/poppler-private.h | 7 +++++- + qt4/src/poppler-qt4.h | 3 +++ + qt4/tests/check_fonts.cpp | 8 +++++++ + qt4/tests/check_metadata.cpp | 50 + +++++++++++++++++++++++++++++++++++----- + qt4/tests/check_pagelayout.cpp | 6 +++++ + qt4/tests/check_pagemode.cpp | 10 ++++++++ + qt4/tests/check_permissions.cpp | 2 ++ + qt4/tests/check_version.cpp | 22 ------------------ + qt4/tests/poppler-fonts.cpp | 1 + + qt4/tests/stress-poppler-qt4.cpp | 2 ++ + 12 files changed, 110 insertions(+), 29 deletions(-) + +commit 64c07a20a4ed844f3b3dd26e974f58d5877cf9fd +Author: Brad Hards <bradh@frogmouth.net> +Date: Tue Dec 27 06:10:01 2005 +0000 + + qt4/src/poppler-qt4.h and qt4/src/poppler-document.cc: add + convertDate() function that + turns char* PDF date strings into QDateTime. This version handles + the timezone conversions. Refactored the existing date() method + to use it. + + qt4/tests/check_dateConversion.cpp: unit tests for convertDate() + qt4/tests/check_metadata.cpp: update to reflect UTC. + qt4/tests/.cvsignore: suppress check_dateConversion + + ChangeLog | 9 ++++ + qt4/src/poppler-document.cc | 89 ++++++++++++++++++++----------- + qt4/src/poppler-qt4.h | 5 ++ + qt4/tests/.cvsignore | 1 + + qt4/tests/Makefile.am | 11 ++-- + qt4/tests/check_dateConversion.cpp | 105 + +++++++++++++++++++++++++++++++++++++ + qt4/tests/check_metadata.cpp | 4 +- + 7 files changed, 188 insertions(+), 36 deletions(-) + +commit 4b2e3b5106b75f23c830837a886cd29beb1d1d1b +Author: Brad Hards <bradh@frogmouth.net> +Date: Tue Dec 27 05:08:34 2005 +0000 + + * qt4/src/Doxyfile (JAVADOC_AUTOBRIEF): Turned on automatic + \brief mode. + + * qt4/src/poppler-qt4.h: Update API documentation. Patch from + Stefan Kebekus, with some changes. Removed \brief entries. + + ChangeLog | 8 +++++ + qt4/src/Doxyfile | 2 +- + qt4/src/poppler-qt4.h | 81 + ++++++++++++++++++++++++++++++++++++++++----------- + 3 files changed, 73 insertions(+), 18 deletions(-) + +commit 8d9cf43aaa73d5012428a6a4c5d7e2cccbd3036e +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Dec 21 22:09:47 2005 +0000 + + 2005-12-21 Kristian Høgsberg <krh@redhat.com> + + * NEWS: Sum up 0.5 changes so far. + + * acinclude.m4: Split jpeg macros out into this file. + + * poppler/Stream.cc: Apply latest CVE-2005-3191 updates. + + ChangeLog | 8 ++++ + NEWS | 8 ++++ + acinclude.m4 | 112 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 114 + --------------------------------------------------- + poppler/JPXStream.cc | 1 + + poppler/Stream.cc | 11 +++-- + 6 files changed, 137 insertions(+), 117 deletions(-) + +commit 97243286560cb4f264b875185c8768a6af09d554 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Dec 21 17:30:33 2005 +0000 + + 2005-12-21 Kristian Høgsberg <krh@redhat.com> + + * utils/Makefile.am: Add parseargs.h to sources and add + -I$(top_srcdir)/poppler to INCLUDES. + + * poppler/CairoFontEngine.cc: Apply patch from Hiroyuki + Ikezoe to + man non-embedded CJK fonts work. + + ChangeLog | 14 ++++++++++--- + configure.ac | 2 +- + poppler/CairoFontEngine.cc | 52 + +++++++++++++++++++++++++++++++++++++++++----- + utils/Makefile.am | 15 +++++++------ + 4 files changed, 68 insertions(+), 15 deletions(-) + +commit cf887a9a9fae7272165d3aae05c85444ff5ca604 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 18 22:03:30 2005 +0000 + + * poppler/Page.cc: Only discard cropbox sizes one by one + and not + completely. Jeff and Martin were right + + ChangeLog | 2 ++ + poppler/Page.cc | 13 ++++++++++--- + 2 files changed, 12 insertions(+), 3 deletions(-) + +commit 495890b9cef9d5d61bb47e789add1cf2c3b8f83d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 18 21:56:15 2005 +0000 + + + .cvsignore + + utils/.cvsignore | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +commit 5dca860bba6918e06fab3aa56a2c75f0ac9ecdfb +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 18 21:08:48 2005 +0000 + + Fix utils building on Slackware + + ChangeLog | 3 +++ + configure.ac | 3 +++ + utils/Makefile.am | 3 ++- + 3 files changed, 8 insertions(+), 1 deletion(-) + +commit 03e3d9164ffd71f03136b57a9941ea14fadb21aa +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 18 17:12:28 2005 +0000 + + 2005-12-18 Albert Astals Cid <aacid@kde.org> + + * configure.ac: Better jpeg detection, refer to ml PCbsd + problem + + ChangeLog | 4 ++ + configure.ac | 131 + +++++++++++++++++++++++++++++++++++++++++++++++++++-------- + 2 files changed, 118 insertions(+), 17 deletions(-) + +commit 888d76a29c9c5ea6c90cc4299b230ca0c2c2944f +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 12 20:21:08 2005 +0000 + + * poppler/Page.cc: Ignore cropBox if it seems incorrect + + ChangeLog | 4 ++++ + poppler/Page.cc | 7 +++++++ + 2 files changed, 11 insertions(+) + +commit bcc5e3afe27c8787ce7022a0701997c96eddb4fe +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Dec 12 20:15:11 2005 +0000 + + 2005-12-12 Kristian Høgsberg <krh@redhat.com> + + * Makefile.am: + * configure.ac: + * goo/GooVector.h: + * utils/HtmlFonts.cc: + * utils/HtmlFonts.h: + * utils/HtmlLinks.cc: + * utils/HtmlLinks.h: + * utils/HtmlOutputDev.cc: + * utils/HtmlOutputDev.h: + * utils/ImageOutputDev.cc: + * utils/ImageOutputDev.h: + * utils/Makefile.am: + * utils/parseargs.c: + * utils/parseargs.h: + * utils/pdffonts.1: + * utils/pdffonts.cc: + * utils/pdfimages.1: + * utils/pdfimages.cc: + * utils/pdfinfo.1: + * utils/pdfinfo.cc: + * utils/pdftohtml.1: + * utils/pdftohtml.cc: + * utils/pdftoppm.1: + * utils/pdftoppm.cc: + * utils/pdftops.1: + * utils/pdftops.cc: + * utils/pdftotext.1: + * utils/pdftotext.cc: Add command line utilities from xpdf. + + ChangeLog | 31 + + Makefile.am | 6 +- + configure.ac | 25 +- + goo/GooVector.h | 101 +++ + utils/HtmlFonts.cc | 326 ++++++++++ + utils/HtmlFonts.h | 85 +++ + utils/HtmlLinks.cc | 101 +++ + utils/HtmlLinks.h | 49 ++ + utils/HtmlOutputDev.cc | 1569 + +++++++++++++++++++++++++++++++++++++++++++++++ + utils/HtmlOutputDev.h | 302 +++++++++ + utils/ImageOutputDev.cc | 195 ++++++ + utils/ImageOutputDev.h | 76 +++ + utils/Makefile.am | 18 + + utils/parseargs.c | 190 ++++++ + utils/parseargs.h | 71 +++ + utils/pdffonts.1 | 128 ++++ + utils/pdffonts.cc | 294 +++++++++ + utils/pdfimages.1 | 96 +++ + utils/pdfimages.cc | 159 +++++ + utils/pdfinfo.1 | 157 +++++ + utils/pdfinfo.cc | 376 ++++++++++++ + utils/pdftohtml.1 | 85 +++ + utils/pdftohtml.cc | 429 +++++++++++++ + utils/pdftoppm.1 | 113 ++++ + utils/pdftoppm.cc | 189 ++++++ + utils/pdftops.1 | 224 +++++++ + utils/pdftops.cc | 336 ++++++++++ + utils/pdftotext.1 | 135 ++++ + utils/pdftotext.cc | 337 ++++++++++ + 29 files changed, 6194 insertions(+), 9 deletions(-) + +commit 5fbded32741acb5fac411189f80cb57aa11df517 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Dec 10 10:52:15 2005 +0000 + + * qt4/src/poppler-page.cc: + * qt4/src/poppler-qt4.h: + * qt4/src/tests/test-poppler-qt4.cpp: The parameters x,y,w,h to the + method splashRenderToPixmap are now used. Convenient + defaults are provided. The test has been changed accordingly. Some + added documentation. Patch by Stefan Kebekus + + ChangeLog | 9 +++++++++ + qt4/src/poppler-page.cc | 4 ++-- + qt4/src/poppler-qt4.h | 31 +++++++++++++++++++++++-------- + qt4/tests/test-poppler-qt4.cpp | 2 +- + 4 files changed, 35 insertions(+), 11 deletions(-) + +commit bc6df8c41081c0c0107655cbf70ddb8b0c493c34 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Dec 9 20:49:59 2005 +0000 + + 2005-12-09 Kristian Høgsberg <krh@redhat.com> + + * poppler/GfxState.cc: Use colToByte() for converting + GxfColorComp + to bytes (really fix #5117). + + * poppler/Stream.cc: Remove duplicated check (#5243). + + ChangeLog | 5 +++++ + poppler/GfxState.cc | 6 +++--- + poppler/Stream.cc | 4 ---- + 3 files changed, 8 insertions(+), 7 deletions(-) + +commit 8a2464122455311c6d16ae62bb9ac9a0ae365a28 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Dec 9 19:40:40 2005 +0000 + + 2005-12-09 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: + * poppler/Makefile.am (poppler_includedir): + * goo/Makefile.am (poppler_goo_include_HEADERS): Make + installation + of xpdf header files optional. + + ChangeLog | 10 +++++++++- + configure.ac | 8 ++++++++ + goo/Makefile.am | 4 ++++ + poppler/Makefile.am | 4 ++++ + 4 files changed, 25 insertions(+), 1 deletion(-) + +commit 830b61bfd1c985fe14ec4d0f6724c8f70e924fc1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Dec 8 18:17:42 2005 +0000 + + * configure.ac: Detect if gettimeofday is available, fixes + for correct + linking to Qt4 on windows + * goo/GooTimer.[cc|h]: Only build if gettimeofday is available + * poppler/Gfx.cc: Only use the timer for profiling if + gettimeofday is + available + * poppler/GlobalParams.cc: Remove extra unlockGlobalParams + that was + making windows hang + * splash/SplashFTFontEngine.cc: i need unistd.h on windows + also + * splash/SplashFontFile.cc: i need unistd.h on windows also + + ChangeLog | 12 ++++++++++++ + configure.ac | 14 +++++++++++++- + goo/GooTimer.cc | 3 +++ + goo/GooTimer.h | 4 ++++ + poppler/Gfx.cc | 6 ++++++ + poppler/GlobalParams.cc | 1 - + splash/SplashFTFontEngine.cc | 4 +--- + splash/SplashFontFile.cc | 4 +--- + 8 files changed, 40 insertions(+), 8 deletions(-) + +commit 0a1c33ed17fd7053ed455da3444856a5dab3c9b4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Dec 8 12:42:50 2005 +0000 + + Remove -DDATADIR we are not using if for anything and it shadows a + windows typedef + + ChangeLog | 8 ++++++++ + glib/Makefile.am | 3 +-- + poppler/Makefile.am | 3 +-- + qt/Makefile.am | 3 +-- + test/Makefile.am | 3 +-- + 5 files changed, 12 insertions(+), 8 deletions(-) + +commit adca042e666fd932f16213d0a4daba08b5021901 +Author: Brad Hards <bradh@frogmouth.net> +Date: Wed Dec 7 08:42:21 2005 +0000 + + Remove the version check. OK'd by krh. + + ChangeLog | 2 ++ + poppler/PDFDoc.cc | 6 +----- + 2 files changed, 3 insertions(+), 5 deletions(-) + +commit bc57f8dd73eef9a74e4a6e248ed6985c360db838 +Author: Brad Hards <bradh@frogmouth.net> +Date: Wed Dec 7 08:31:09 2005 +0000 + + Add infoKeys() - allows you to get a list of all the string names + (keys) + for the metadata. + + ChangeLog | 7 +++++++ + qt4/src/poppler-document.cc | 22 ++++++++++++++++++++++ + qt4/src/poppler-qt4.h | 7 +++++++ + qt4/tests/check_metadata.cpp | 18 ++++++++++++++++++ + 4 files changed, 54 insertions(+) + +commit 7ec41df91e6dbf792e11676d929acc2f634bd382 +Author: Brad Hards <bradh@frogmouth.net> +Date: Tue Dec 6 09:58:04 2005 +0000 + + Add more unit tests for better coverage. + + ChangeLog | 6 ++++ + qt4/tests/check_fonts.cpp | 24 ++++++++++++++++ + qt4/tests/check_metadata.cpp | 66 + ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 96 insertions(+) + +commit a92b10016306ac46775c9b95b52d249b233ff950 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Dec 5 20:46:22 2005 +0000 + + * poppler/CairoFontEngine.cc: Correct fix for #5149, i broke it when + merging xpdf 3.01 patches + + ChangeLog | 5 +++++ + poppler/CairoFontEngine.cc | 4 +--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit 66096477d1a86f13fcb07ae25caff1cc02b1e7cd +Author: Brad Hards <bradh@frogmouth.net> +Date: Sun Dec 4 19:48:25 2005 +0000 + + Add checking for Type3 fonts in the unit test. + + ChangeLog | 5 +++++ + qt4/tests/check_fonts.cpp | 24 ++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +commit 62345b0affed8e2e37728fca7f2b750879192c43 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 4 18:53:40 2005 +0000 + + Fix error in merging CAN-2005-3193 fix. Thanks Daniel Gryniewicz + for notifying + + ChangeLog | 5 +++++ + poppler/JPXStream.cc | 2 -- + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit ba4b3f88271892f197aa2ec076c80ff63a175887 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Dec 4 11:30:00 2005 +0000 + + * qt/poppler-qt.h: + * qt/poppler-fontinfo.h: + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-fontinfo.cc: Implement copy constructor of + FontInfo needed + as Q[Value]List<FontInfo> uses it when appending + + ChangeLog | 8 ++++++++ + qt/poppler-fontinfo.cc | 9 +++++++++ + qt/poppler-qt.h | 2 ++ + qt4/src/poppler-fontinfo.cc | 9 +++++++++ + qt4/src/poppler-qt4.h | 2 ++ + 5 files changed, 30 insertions(+) + +commit e091231d98d12c19b0098ffbaec6ecda28097dff +Author: Brad Hards <bradh@frogmouth.net> +Date: Sun Dec 4 10:45:25 2005 +0000 + + Add new unit test to .cvsignore suppressions. + + ChangeLog | 2 ++ + qt4/tests/.cvsignore | 1 + + 2 files changed, 3 insertions(+) + +commit 6a7b1eaaedbfdd3a8e6b4d899477350f2b485641 +Author: Brad Hards <bradh@frogmouth.net> +Date: Sun Dec 4 10:05:21 2005 +0000 + + * qt4/src/poppler-qt4.h: + qt4/src/fontinfo.cc: add implementation for FontInfo::typeName() + + * qt4/tests/check_fonts.cpp: + * qt4/tests/Makefile.am: add unit test for fonts + + * qt4/src/Mainpage.dox: Minor typo fixes. + + ChangeLog | 11 +++++++++++ + qt4/src/Mainpage.dox | 5 +++-- + qt4/src/poppler-fontinfo.cc | 24 ++++++++++++++++++++++++ + qt4/src/poppler-qt4.h | 14 +++++++++++++- + qt4/tests/Makefile.am | 5 +++++ + qt4/tests/check_fonts.cpp | 42 + ++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 98 insertions(+), 3 deletions(-) + +commit 31b28b4c59f7820901e9cf893197f381acbae8ce +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sun Dec 4 02:24:25 2005 +0000 + + 2005-12-03 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (poppler_page_set_selection_alpha): Use + Nickolays original fix instead of trying to be clever with + gdk_pixbuf_fill(). + + * poppler/CairoFontEngine.cc: Fix text corruption bug (#5149), + a rerun of an old classic (#3340). + + ChangeLog | 7 +++++++ + glib/poppler-page.cc | 8 +++++++- + poppler/CairoFontEngine.cc | 2 ++ + 3 files changed, 16 insertions(+), 1 deletion(-) + +commit 4d169c5c345cdac84a39026e759b928977643417 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sun Dec 4 01:42:29 2005 +0000 + + 2005-12-03 Kristian Høgsberg <krh@redhat.com> + + * poppler/GfxState.cc: Fixing another problem with new GfxRGB + representation causing images to show up as random pixels + (#5117). + + ChangeLog | 5 +++++ + poppler/GfxState.cc | 6 +++--- + 2 files changed, 8 insertions(+), 3 deletions(-) + +commit 58de0458e17b1639ce0bcae45a4b09b2c0a56618 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sat Dec 3 23:23:53 2005 +0000 + + 2005-12-03 Kristian Høgsberg <krh@redhat.com> + + * qt/Makefile.am (noinst_PROGRAMS): Only build qt test + program if + splash is enabled. + + * poppler/CairoOutputDev.cc: Remove unused grid snapping code, + sidestepping #4507. + + * glib/poppler-document.h (PopplerPermissions): Breaking enum + definition over multiple lines confuses glib-mkenums (#4600). + + * poppler/Makefile.am (libpoppler_la_LIBADD): Add + FREETYPE_LIBS + (#4515). + + * poppler/TextOutputDev.cc: + * qt/poppler-qt.h: GCC-4.1 fixes (#5031). + + ChangeLog | 17 +++++++++++++++++ + glib/poppler-document.h | 5 +---- + poppler/CairoOutputDev.cc | 35 +++++++++-------------------------- + poppler/CairoOutputDev.h | 2 +- + poppler/Makefile.am | 3 ++- + poppler/TextOutputDev.cc | 2 +- + qt/Makefile.am | 4 ++++ + qt/poppler-qt.h | 6 +++--- + 8 files changed, 38 insertions(+), 36 deletions(-) + +commit df45483f1437d8a96519e1428d1f4b3ffc08c2cd +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Dec 3 22:39:06 2005 +0000 + + remove another chagne should not have gone in + + test/pdf-inspector.cc | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +commit 7dfe02ee112dee51346525b62d877e6591135761 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Dec 3 22:28:46 2005 +0000 + + Add the font retrieveing on the qt3 backend also, based on a patch + by Wilfried Huss + + ChangeLog | 3 ++ + qt/poppler-fontinfo.cc | 75 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 78 insertions(+) + +commit 655b9dd195ac9faf2f7ea0255880b8c83b249a06 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Dec 3 22:26:07 2005 +0000 + + this should have not went in + + poppler/TextOutputDev.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit ab45eb562159d5b006e658ec66723a0a47908f65 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Dec 3 22:20:54 2005 +0000 + + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-fontinfo.cc: + * qt4/src/poppler-textbox.cc: Remove implementation of that classes + from the header, use pimpl + + ChangeLog | 9 ++++- + poppler/TextOutputDev.h | 10 +++--- + qt/Makefile.am | 1 + + qt/poppler-document.cc | 29 ++++++++++++++++ + qt/poppler-private.h | 2 ++ + qt/poppler-qt.h | 80 + ++++++++++++++++++++++++++++++++++++++++++++- + qt4/src/Makefile.am | 2 ++ + qt4/src/poppler-fontinfo.cc | 69 ++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-qt4.h | 43 ++++++++++-------------- + qt4/src/poppler-textbox.cc | 49 +++++++++++++++++++++++++++ + test/pdf-inspector.cc | 9 +++-- + 11 files changed, 268 insertions(+), 35 deletions(-) + +commit 64079ad81caf6d2cf66b1f3a3de9454146e15c6c +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sat Dec 3 21:55:36 2005 +0000 + + 2005-12-03 Kristian Høgsberg <krh@redhat.com> + + Fixes from Nickolay V. Shmyrev: + + * poppler/TextOutputDev.cc (TextLine::visitSelection, + TextBlock::visitSelection): Fix selection crash with + zero-width + word boxes or zero-height line boxes (#4402). + + * poppler/CairoOutputDev.h: Fix wrong cairo-ft.h include + (#4413). + + * poppler/CairoOutputDev.cc (eoFill, fill): + * glib/poppler-page.cc (poppler_page_render_selection): + Update to + work with new GfxColor definition and use + cairo_pattern_create_rgba() to cache cairo_pattern_t's for the + fill and stroke colors. + + * glib/poppler-page.cc (poppler_page_set_selection_alpha): + Zero + out pixbuf first. + + ChangeLog | 21 +++++++++++++++++ + glib/poppler-page.cc | 18 +++++++++------ + poppler/CairoOutputDev.cc | 59 + ++++++++++++++++++++++++++++++++++------------- + poppler/CairoOutputDev.h | 6 ++--- + poppler/TextOutputDev.cc | 8 +++---- + 5 files changed, 82 insertions(+), 30 deletions(-) + +commit f3da21a3ecdd2694290e64af86c8e35fcb61371b +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Dec 3 21:35:45 2005 +0000 + + More docs for the Qt4 frontend, patch by Stefan Kebekus + + ChangeLog | 8 ++++ + qt4/src/.cvsignore | 3 +- + qt4/src/Doxyfile | 4 +- + qt4/src/Mainpage.dox | 91 + ++++++++++++++++++++++++++++++++++++++++++ + qt4/src/poppler-page.cc | 20 +++------- + qt4/src/poppler-qt4.h | 57 ++++++++++++++++++-------- + qt4/tests/test-poppler-qt4.cpp | 5 ++- + 7 files changed, 151 insertions(+), 37 deletions(-) + +commit 7b2c6e92611db9350ca5dcaf3fd730fe5e69afea +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Dec 1 22:45:10 2005 +0000 + + Fix CAN-2005-3193 related bugs + Thanks Leonard for reporting + + ChangeLog | 6 ++++++ + poppler/JPXStream.cc | 9 ++++++++- + poppler/Stream.cc | 33 ++++++++++++++++++++++++++++++++- + poppler/Stream.h | 3 +++ + 4 files changed, 49 insertions(+), 2 deletions(-) + +commit a90f076af9ebb188895e7b223bcb7e5c3f4309c4 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Nov 28 22:50:19 2005 +0000 + + Fix QPixmap contents generation messed when doing the xpdf 3.01 + transition in qt4 frontend + Use Splash backend by default in the qt4 test, added -arthur option + to use the Arthur backend + + ChangeLog | 12 ++++++++-- + qt4/src/poppler-page.cc | 47 ++++++++++++++++++++++++++++--------- + qt4/src/poppler-qt4.h | 17 ++++++++++---- + qt4/tests/test-poppler-qt4.cpp | 53 + ++++++++++++++++++++++++++---------------- + 4 files changed, 91 insertions(+), 38 deletions(-) + +commit b7e4f0e7d175abde7fafb1fcc7ba129468bc8c1a +Author: Brad Hards <bradh@frogmouth.net> +Date: Sun Nov 27 01:33:51 2005 +0000 + + Convert Qt4 unit tests to use the new Qt4.1 QTestlib framework. + Add a little more API documentation + + ChangeLog | 7 +++++ + qt4/src/poppler-qt4.h | 11 +++++--- + qt4/tests/Makefile.am | 12 ++++++--- + qt4/tests/check_metadata.cpp | 58 + ++++++++++++++++++++--------------------- + qt4/tests/check_pagelayout.cpp | 14 +++++----- + qt4/tests/check_pagemode.cpp | 22 ++++++++-------- + qt4/tests/check_permissions.cpp | 18 ++++++------- + 7 files changed, 78 insertions(+), 64 deletions(-) + +commit d036fa022dbb6f4421ccc8b12b8f9e4f0c8d7406 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Nov 25 22:52:56 2005 +0000 + + patch from kebekus to add to the qt4 binding the same functions we + added to the qt3 one + + ChangeLog | 5 +++++ + qt4/src/poppler-page.cc | 44 ++++++++++++++++++++++++++++++++++++++++++-- + qt4/src/poppler-qt4.h | 22 ++++++++++++++++++++++ + 3 files changed, 69 insertions(+), 2 deletions(-) + +commit 3c9f09d76dc70e4ba766930facee8b6f30bcd2da +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Nov 22 21:50:44 2005 +0000 + + Fix page range in the inspector + + ChangeLog | 4 ++++ + test/pdf-inspector.cc | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit e64f63416dbce497cb2167272b95491664f213e8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Nov 21 22:12:15 2005 +0000 + + PAtch to add some more functions to the qt binding by Stefan Kebekus + + ChangeLog | 5 ++++ + qt/poppler-page.cc | 69 + +++++++++++++++++++++++++++++++++++++++++++++++++++++- + qt/poppler-qt.h | 41 ++++++++++++++++++++++++++++++++ + 3 files changed, 114 insertions(+), 1 deletion(-) + +commit 8bd8cb4160b73da69d058783750352fbface66dc +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Nov 21 19:44:09 2005 +0000 + + Fix a possible build problem + + ChangeLog | 4 ++++ + qt/Makefile.am | 1 + + 2 files changed, 5 insertions(+) + +commit fc59b79dc375544681032a1618e96c458515d724 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sun Nov 20 23:17:32 2005 +0000 + + 2005-11-20 Kristian Høgsberg <krh@redhat.com> + + * poppler/GfxState.cc: Fix the byte_lookup initialization + broken + by the merges (#4350). Modify GfxColorSpace::getRGBLine() + to work + with new GfXColor type. + + ChangeLog | 13 +++++++++++- + poppler/GfxState.cc | 59 + +++++++++++++++++++++++++++++++---------------------- + 2 files changed, 47 insertions(+), 25 deletions(-) + +commit 6fe2cb0fcd53211143dcd0c47bf8c8c7a8c11a39 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Nov 17 21:37:34 2005 +0000 + + make it compile with freetype 2.2.0 preversions + + ChangeLog | 4 ++++ + splash/SplashFTFont.cc | 42 +++++++++++++++++++++++++++++++++++++----- + 2 files changed, 41 insertions(+), 5 deletions(-) + +commit 429d3521d788be702a3944bc290569f90ae04892 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Nov 4 19:03:55 2005 +0000 + + Make it compile using --disable-cairo-output + + ChangeLog | 4 ++++ + glib/poppler-document.cc | 6 ++++-- + glib/poppler-page.cc | 27 +++++++++++++-------------- + 3 files changed, 21 insertions(+), 16 deletions(-) + +commit b96c118eb08d478914c2981204d749a95957cbb3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Nov 1 15:29:32 2005 +0000 + + Comment some unused parameters to calm down compiler warnings when + using these heders on external projects with higher warning verbosity + + ChangeLog | 5 +++ + poppler/OutputDev.h | 125 + ++++++++++++++++++++++++++-------------------------- + poppler/Stream.h | 24 +++++----- + 3 files changed, 80 insertions(+), 74 deletions(-) + +commit 51670972777510a3ec64a56649716b31167b9d0e +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 30 20:29:05 2005 +0000 + + Last xpdf 3.01 merge (at least from my side) + It's very big, but noone has opposed in the 2 weeks time i gave on + the ml so either poppler is dead or people agree with the patch + + ChangeLog | 39 + + glib/poppler-page.cc | 32 +- + poppler/ArthurOutputDev.cc | 2 +- + poppler/ArthurOutputDev.h | 2 +- + poppler/CairoOutputDev.cc | 2 +- + poppler/CairoOutputDev.h | 2 +- + poppler/Gfx.cc | 645 +++++++++-- + poppler/Gfx.h | 17 +- + poppler/GfxState.cc | 1410 ++++++++++++++++++++--- + poppler/GfxState.h | 196 +++- + poppler/OutputDev.cc | 25 + + poppler/OutputDev.h | 46 +- + poppler/PDFDoc.cc | 98 +- + poppler/PDFDoc.h | 24 +- + poppler/PSOutputDev.cc | 1461 ++++++++++++++++++++---- + poppler/PSOutputDev.h | 48 +- + poppler/Page.cc | 115 +- + poppler/Page.h | 23 +- + poppler/SplashOutputDev.cc | 1525 ++++++++++++++++++++++--- + poppler/SplashOutputDev.h | 59 +- + poppler/TextOutputDev.cc | 230 ++-- + poppler/TextOutputDev.h | 16 +- + qt/poppler-page.cc | 34 +- + qt4/src/poppler-page.cc | 31 +- + splash/Splash.cc | 2656 + +++++++++++++++++++++++++++++++++----------- + splash/Splash.h | 75 +- + splash/SplashBitmap.cc | 216 ++-- + splash/SplashBitmap.h | 13 +- + splash/SplashPattern.cc | 22 +- + splash/SplashPattern.h | 19 +- + splash/SplashState.cc | 11 + + splash/SplashState.h | 3 + + splash/SplashTypes.h | 145 ++- + test/gtk-cairo-test.cc | 2 +- + test/gtk-splash-test.cc | 23 +- + test/pdf-inspector.cc | 2 +- + 36 files changed, 7685 insertions(+), 1584 deletions(-) + +commit 10dfa2254dafb9de93692def2bfb3133d9a39989 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Oct 17 02:17:51 2005 +0000 + + 2005-10-05 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (poppler_page_render_to_ps): + Fix another + off-by-one page number error (#4555). + + ChangeLog | 6 +++++- + poppler/poppler-config.h.in | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 9830f0ea41f09fefada740e9429c491e067a5082 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 16 15:11:32 2005 +0000 + + GfxFont merges from xpdf 3.01 + + ChangeLog | 1 + + poppler/GfxFont.cc | 109 + ++++++++++++++++++++++++++++++++++++----------------- + 2 files changed, 75 insertions(+), 35 deletions(-) + +commit 62b5ba221aca8c320e964916b0c0329efc8da572 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 16 15:04:39 2005 +0000 + + Stream[cc|h] merges from xpdf 3.01 + + ChangeLog | 1 + + poppler/Stream.cc | 714 + +++++++++++++++++++++++++++++++++++++++++++++++++----- + poppler/Stream.h | 19 +- + 3 files changed, 658 insertions(+), 76 deletions(-) + +commit b9fab51179f38e9798b10366be672f0432c874da +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 16 14:58:14 2005 +0000 + + Function.cc|h merges from xpdf 3.01 + + ChangeLog | 1 + + poppler/Function.cc | 76 + ++++++++++++++++++++++++++++++----------------------- + poppler/Function.h | 42 +++++++++++++++++++++++++++++ + 3 files changed, 86 insertions(+), 33 deletions(-) + +commit c6e0242200f818c67508041763ff317e79daadd6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 16 14:54:17 2005 +0000 + + Annot.[cc|h] and related merges from xpdf 3.01 + + ChangeLog | 7 +- + poppler/Annot.cc | 234 + +++++++++++++++++++++++++++++++++++++++++++------ + poppler/Annot.h | 20 ++--- + poppler/FontInfo.cc | 2 +- + poppler/PSOutputDev.cc | 2 +- + poppler/Page.cc | 2 +- + 6 files changed, 221 insertions(+), 46 deletions(-) + +commit 65d574fdc009e45ad66d1d402d5e805e4e94f427 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 16 14:30:16 2005 +0000 + + Merge SplashFTFont.cc with xpdf 3.01 changes + + ChangeLog | 1 + + splash/SplashFTFont.cc | 64 + ++++++++++++++++++++++++++++++++++---------------- + 2 files changed, 45 insertions(+), 20 deletions(-) + +commit f9d208e86433b213b21a75089f82fd00dcd746fc +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 16 14:25:32 2005 +0000 + + Merge SplashScreen.[cc|h] from xpdf 3.01 + + ChangeLog | 4 ++ + splash/SplashScreen.cc | 110 + ++++++++++++++++++++++++++++++++----------------- + splash/SplashScreen.h | 12 +++++- + 3 files changed, 87 insertions(+), 39 deletions(-) + +commit 7d46ac000316566503a27b5e5c68621be9c081d0 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Oct 16 14:19:47 2005 +0000 + + Merging SplashXPathScanner.cc changes from xpdf 3.01 + + splash/SplashXPathScanner.cc | 80 + ++++++++++++++++++++++++-------------------- + 1 file changed, 43 insertions(+), 37 deletions(-) + +commit e34713a2187e05358f98e749ec2923210a40a862 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Oct 5 15:57:17 2005 +0000 + + 2005-10-05 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (poppler_page_render_to_ps): + Fix another + off-by-one page number error (#4555). + + ChangeLog | 5 +++++ + glib/poppler-page.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit fdd0934430ed251f9aeb45158b6ec95684b3e7b4 +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Mon Sep 26 19:29:45 2005 +0000 + + 2005-09-26 Marco Pesenti Gritti <mpg@redhat.com> + + * glib/poppler-action.cc: + + Initialize window title even if the action is unknown + + ChangeLog | 6 ++++++ + glib/poppler-action.cc | 5 +++-- + 2 files changed, 9 insertions(+), 2 deletions(-) + +commit e9753049ddfbdf28df7a222d35eccdbcbcbc848d +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Mon Sep 26 10:42:38 2005 +0000 + + 2005-09-26 Marco Pesenti Gritti <mpg@redhat.com> + + * glib/poppler-action.cc: + * glib/poppler-action.h: + + Implement launch action + + ChangeLog | 7 +++++++ + glib/poppler-action.cc | 11 ++++++++--- + glib/poppler-action.h | 1 + + 3 files changed, 16 insertions(+), 3 deletions(-) + +commit ab18b2cb6d1c62bb91173d105e8631fe4ef1bcfb +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 20 15:27:31 2005 +0000 + + Parser.cc merges from xpdf 3.01 + + ChangeLog | 1 + + poppler/Parser.cc | 19 +++++++++++-------- + 2 files changed, 12 insertions(+), 8 deletions(-) + +commit cf6723caaed24615c3b8965cee9c433007f80d77 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 20 15:08:52 2005 +0000 + + TextPage *TextOutpudDev::takeText() from xpdf 3.01 + + ChangeLog | 1 + + poppler/TextOutputDev.cc | 8 ++++++++ + poppler/TextOutputDev.h | 4 ++++ + 3 files changed, 13 insertions(+) + +commit e0cbb0ca2c611ad5ac0267e46279c9d61450902a +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 20 14:59:43 2005 +0000 + + more 3.00 -> 3.01 merging + + ChangeLog | 1 + + poppler/XRef.cc | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) + +commit 9c7adb318d395ff674c6febf6406a8d47e9e5bf6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 20 14:43:15 2005 +0000 + + * poppler/UnicodeMap.cc: More grealloc -> greallocn + * poppler/UnicodeTypeTable.cc: Merge from xpdf 3.01 + + ChangeLog | 2 ++ + poppler/UnicodeMap.cc | 4 ++-- + poppler/UnicodeTypeTable.cc | 4 ++-- + 3 files changed, 6 insertions(+), 4 deletions(-) + +commit 2c4c9b855b0df1dc0836d4f44e9471215a419ea6 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 20 14:34:31 2005 +0000 + + Merge link.cc changes from xpdf 3.00 -> 3.01 + + ChangeLog | 1 + + poppler/Link.cc | 64 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 62 insertions(+), 3 deletions(-) + +commit 4e9490c0219dd9c99ba0e5533c96663b8570a87b +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Sep 20 14:00:43 2005 +0000 + + Merge GlobalParam.* changes, they are worthless for us as poppler + but this way we are nearer to have the 3.01 sources merged, then we + can remove them if we decide we don't need this options. + Remove a setEncryption from the Xref.h marco probably forgot to + remove when merging + + ChangeLog | 3 +++ + poppler/GlobalParams.cc | 41 +++++++++++++++++++++++++++++++++++++++++ + poppler/GlobalParams.h | 22 ++++++++++++++++------ + poppler/XRef.h | 4 ---- + 4 files changed, 60 insertions(+), 10 deletions(-) + +commit 22da021bf69d83d641e3f30cc0e1bd62394e56a4 +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Tue Sep 20 13:23:08 2005 +0000 + + 2005-09-20 Marco Pesenti Gritti <mpg@redhat.com> + + * poppler/XRef.cc: + + Remove duplicated initialization + + ChangeLog | 6 ++++++ + poppler/XRef.cc | 4 ---- + 2 files changed, 6 insertions(+), 4 deletions(-) + +commit 2a8778147938e3ed2af177226a9c35655f898c95 +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Tue Sep 20 10:18:57 2005 +0000 + + 2005-09-20 Marco Pesenti Gritti <mpg@redhat.com> + + * poppler/GlobalParams.cc: + + s/G/Goo in not yet compiled plugins code + + ChangeLog | 6 ++++++ + poppler/GlobalParams.cc | 8 ++++---- + 2 files changed, 10 insertions(+), 4 deletions(-) + +commit 16f720b87cfc491db585dbdc99236cf492ffe85b +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Tue Sep 20 09:57:41 2005 +0000 + + 2005-09-20 Marco Pesenti Gritti <mpg@redhat.com> + + * poppler/Makefile.am: + + Add XPDFPlugin*. Thanks to TSDgeos that noticed this. + + * poppler/XpdfPluginAPI.cc: + + Fixup + + ChangeLog | 10 ++++++++++ + poppler/Makefile.am | 4 +++- + poppler/XpdfPluginAPI.cc | 2 +- + 3 files changed, 14 insertions(+), 2 deletions(-) + +commit 5f30791c3d87315ad1f742de64d2c1351ca70cb7 +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Fri Sep 16 19:33:28 2005 +0000 + + *** empty log message *** + + ChangeLog | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit db62e07fcf57f45951b21f8aab44b0d943efe5d0 +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Fri Sep 16 19:33:05 2005 +0000 + + 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com> + + * poppler/PDFDoc.cc: + * poppler/PDFDoc.h: + * poppler/XRef.cc: + * poppler/XRef.h: + + Merge more from 3.01 + + poppler/PDFDoc.cc | 20 ++++++++++++++++---- + poppler/PDFDoc.h | 19 +++++++++---------- + poppler/XRef.cc | 13 +++++++++++-- + poppler/XRef.h | 7 +++++-- + 4 files changed, 41 insertions(+), 18 deletions(-) + +commit 3acc7be594712fd0ce7ac07b7188d5b38b382782 +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Fri Sep 16 19:05:00 2005 +0000 + + 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com> + + * poppler/XRef.cc: + + Merge some initialization that I lost before + + ChangeLog | 6 ++++++ + poppler/XRef.cc | 4 ++++ + 2 files changed, 10 insertions(+) + +commit 3badd82b72b2768be27e309b048cd8dcb1c80038 +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Fri Sep 16 18:46:37 2005 +0000 + + 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com> + + * poppler/XRef.cc: + + Merge change from 3.01 + + ChangeLog | 6 ++++++ + poppler/XRef.cc | 8 -------- + 2 files changed, 6 insertions(+), 8 deletions(-) + +commit 5474583e20ca773befa17242d4ad7b8f81d5bf99 +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Fri Sep 16 18:38:58 2005 +0000 + + 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com> + + * poppler/CharCodeToUnicode.cc: + * poppler/CharCodeToUnicode.h: + + Improvements from xpdf 3.01 + + ChangeLog | 7 +++++++ + poppler/CharCodeToUnicode.cc | 31 +++++++++++++++++++------------ + poppler/CharCodeToUnicode.h | 4 ++++ + 3 files changed, 30 insertions(+), 12 deletions(-) + +commit b2a6eab113fecd3823885c64f3302bea4f372a9f +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Fri Sep 16 18:37:29 2005 +0000 + + 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com> + + * poppler/CMap.cc: + + Improvements from xpdf 3.01 + + ChangeLog | 6 ++++++ + poppler/CMap.cc | 30 +++++++++++++++++++++++++++--- + 2 files changed, 33 insertions(+), 3 deletions(-) + +commit 3f69f2158453b9dab9efc280ed1578ac3d0cebe8 +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Fri Sep 16 18:35:29 2005 +0000 + + 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com> + + * poppler/NameToUnicodeTable.h: + * poppler/UnicodeTypeTable.cc: + * poppler/UnicodeTypeTable.h: + + Merge some unicode table changes from xpdf 3.01 + + ChangeLog | 8 + + poppler/NameToUnicodeTable.h | 168 +++++------ + poppler/UnicodeTypeTable.cc | 690 + +++++++++++++++++++++++++++++++++++++++++-- + poppler/UnicodeTypeTable.h | 2 + + 4 files changed, 764 insertions(+), 104 deletions(-) + +commit 6cbe76bc55d557fe5fca0f8f1b33bda95acdc0e9 +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Fri Sep 16 18:32:29 2005 +0000 + + 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com> + + * poppler/SplashOutputDev.h: + * splash/Splash.cc: + * splash/Splash.h: + + Modified region support from xpdf 3.01 + + ChangeLog | 8 ++++++++ + poppler/SplashOutputDev.h | 5 +++++ + splash/Splash.cc | 31 +++++++++++++++++++++++++++++++ + splash/Splash.h | 11 +++++++++++ + 4 files changed, 55 insertions(+) + +commit a9df3f3203c14161e5d6bc6048ec7e123536e6d3 +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Fri Sep 16 18:29:18 2005 +0000 + + 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com> + + * goo/Makefile.am: + * poppler/DCTStream.h: + * poppler/Decrypt.cc: + * poppler/Decrypt.h: + * poppler/FlateStream.h: + * poppler/GlobalParams.cc: + * poppler/GlobalParams.h: + * poppler/Makefile.am: + * poppler/PDFDoc.cc: + * poppler/PDFDoc.h: + * poppler/Parser.cc: + * poppler/Parser.h: + * poppler/Stream.cc: + * poppler/Stream.h: + * poppler/XRef.cc: + * poppler/XRef.h: + * poppler/poppler-config.h.in: + + Merge security plugins support from xpdf 3.01 + + ChangeLog | 24 +++ + goo/FixedPoint.cc | 95 +++++++++++ + goo/FixedPoint.h | 150 ++++++++++++++++++ + goo/Makefile.am | 6 +- + poppler/DCTStream.h | 2 - + poppler/Decrypt.cc | 23 ++- + poppler/Decrypt.h | 6 +- + poppler/FlateStream.h | 2 - + poppler/GlobalParams.cc | 229 +++++++++++++++++++++++++++ + poppler/GlobalParams.h | 16 ++ + poppler/Makefile.am | 5 +- + poppler/PDFDoc.cc | 36 +++++ + poppler/PDFDoc.h | 1 + + poppler/Parser.cc | 20 --- + poppler/Parser.h | 4 - + poppler/SecurityHandler.cc | 376 + ++++++++++++++++++++++++++++++++++++++++++++ + poppler/SecurityHandler.h | 157 ++++++++++++++++++ + poppler/Stream.cc | 18 --- + poppler/Stream.h | 8 - + poppler/XRef.cc | 162 ++----------------- + poppler/XRef.h | 13 +- + poppler/XpdfPluginAPI.cc | 262 ++++++++++++++++++++++++++++++ + poppler/XpdfPluginAPI.h | 341 +++++++++++++++++++++++++++++++++++++++ + poppler/poppler-config.h.in | 2 - + 24 files changed, 1737 insertions(+), 221 deletions(-) + +commit a777e5c26483b90d0910e85c2be666640835d0bf +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Fri Sep 16 18:21:38 2005 +0000 + + 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com> + + * configure.ac: + * goo/Makefile.am: + * splash/Makefile.am: + * splash/SplashFTFont.cc: + * splash/SplashMath.h: + * splash/SplashTypes.h: + + Merge support for fixed point + + ChangeLog | 11 +++++++++++ + configure.ac | 4 ++++ + splash/Makefile.am | 1 + + splash/SplashFTFont.cc | 7 +++++++ + splash/SplashMath.h | 34 +++++++++++++++++++++++++++++++++- + splash/SplashTypes.h | 5 +++++ + 6 files changed, 61 insertions(+), 1 deletion(-) + +commit 00457c5f44a246c9f867a114a72be9f7b2dc1cf5 +Author: Marco Pesenti Gritti <mpg@redhat.com> +Date: Fri Sep 16 18:11:14 2005 +0000 + + 2005-09-16 Marco Pesenti Gritti <mpg@redhat.com> + + * poppler/ArthurOutputDev.cc: + * poppler/CairoFontEngine.cc: + * poppler/TextOutputDev.cc: + * poppler/UnicodeMap.cc: + + Use mallocn when possible + + ChangeLog | 9 +++++++++ + poppler/ArthurOutputDev.cc | 2 +- + poppler/CairoFontEngine.cc | 4 ++-- + poppler/TextOutputDev.cc | 2 +- + poppler/UnicodeMap.cc | 2 +- + 5 files changed, 14 insertions(+), 5 deletions(-) + +commit 09c9ff67ceae5753811a2f625e3ad810628c782e +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Sep 16 18:00:43 2005 +0000 + + SplashXPath.cc merges from xpdf 3.00 -> 3.01 + + ChangeLog | 3 ++ + splash/SplashXPath.cc | 81 + +++++++++++++++++++++++++-------------------------- + 2 files changed, 42 insertions(+), 42 deletions(-) + +commit 0555ba861d3b84d88c80da4fa247274338ff7817 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Sep 16 17:42:56 2005 +0000 + + SplashFontEngine.cc merge from xpdf 3.00 -> 3.01 + + splash/SplashFontEngine.cc | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit ddc72bd8354168d992631d1ef8cd0939b428966c +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Sep 15 22:24:55 2005 +0000 + + Merge xpdf 3.00 -> 3.01 changes in SplashT1Font.* files + + splash/SplashT1Font.cc | 23 ++++++++++++++++++----- + splash/SplashT1Font.h | 2 ++ + 2 files changed, 20 insertions(+), 5 deletions(-) + +commit ba409db3157105f326b4bbc342ca7af859a44ce9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Sep 15 22:20:37 2005 +0000 + + Merge xpdf 3.00 -> 3.01 changes in SplashPath.* files + + splash/SplashPath.cc | 3 ++- + splash/SplashPath.h | 5 +++++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 3ea00e853049d8c26ee88aaef8ea6c47c8d46956 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Sep 15 22:15:47 2005 +0000 + + Merge xpdf 3.00 -> 3.01 changes in SplashFont.* files + + splash/SplashFont.cc | 6 ++++++ + splash/SplashFont.h | 10 +++++++++- + 2 files changed, 15 insertions(+), 1 deletion(-) + +commit e571dcbfd0c77a28e41710577859f632cc989de5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Sep 15 22:09:50 2005 +0000 + + Merge the xpdf 3.01 change that uses runtime detection of freetype + version + + ChangeLog | 6 ++++++ + configure.ac | 14 +++----------- + poppler/CairoFontEngine.cc | 21 ++++++++++++++------- + poppler/CairoFontEngine.h | 3 ++- + splash/SplashFTFontEngine.cc | 19 +++++++++++-------- + splash/SplashFTFontEngine.h | 1 + + 6 files changed, 37 insertions(+), 27 deletions(-) + +commit 59fe2937db192dc7b59bf28c3f29909faf11aae3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Sep 15 21:51:16 2005 +0000 + + Merge xpdf 3.00 -> 3.01 changes for that file + + splash/SplashClip.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit b2f94635249f2c5f0c876a1005826fe4c6eb6025 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Sep 15 12:52:36 2005 +0000 + + Merge xpdf 3.00 -> xpdf 3.01 changes for Catalog.[cc|h] + + poppler/Catalog.cc | 5 ++++- + poppler/Catalog.h | 3 +++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 0fc2e70576b1c48cf47a686e8aa7e202a802bc9d +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Sep 15 12:32:25 2005 +0000 + + Another small merge from xpdf 3.01 + + ChangeLog | 3 +++ + poppler/Outline.cc | 6 +++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +commit f8983ceb3c55df72c94870806d71db139c11bdeb +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Sep 15 12:28:34 2005 +0000 + + Another small xpdf 3.00 -> xpdf 3.01 merge + + poppler/Object.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 52efe9845cf3eb1dd836f90bfa203760baa2f87c +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Sep 15 11:46:56 2005 +0000 + + bradh forgot to remove the two returns when merging xpdf 3.00 -> + xpdf 3.01 changes of this file + + poppler/JPXStream.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 4b4fc5c017bf147c9069bbce32fc14467bd2a81a +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Sep 14 21:20:36 2005 +0000 + + Merge all the fofi/ changes from xpdf 3.01, there is only one api + change that affects PSOutputDev (also has been updated the part + that uses this api not the whole file). All our fixes in that dir + are included in the upgrade. + + ChangeLog | 4 + + fofi/FoFiTrueType.cc | 406 + +++++++++++++++++++++++++++++++++++++++++++------ + fofi/FoFiTrueType.h | 15 +- + fofi/FoFiType1.cc | 25 ++- + fofi/FoFiType1C.cc | 134 +++++++++++++--- + fofi/FoFiType1C.h | 6 + + poppler/PSOutputDev.cc | 7 +- + poppler/PSOutputDev.h | 3 +- + 8 files changed, 515 insertions(+), 85 deletions(-) + +commit a68e8e6330418b1f623867973b9c128a9a139c0c +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Sep 7 03:00:36 2005 +0000 + + 2005-09-06 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Enable A4_PAPER and OPI_SUPPORT by default. + There + is no reason to not enable OPI and the paper size should be + controlled by the application. + + * test/Makefile.am (EXTRA_DIST): Add pdf-operators.c + + ChangeLog | 8 ++++++++ + configure.ac | 17 ++--------------- + test/Makefile.am | 3 +++ + 3 files changed, 13 insertions(+), 15 deletions(-) + +commit b6490944c081ff53f623acea7ab7a600c3e54816 +Author: Brad Hards <bradh@frogmouth.net> +Date: Sat Sep 3 11:53:44 2005 +0000 + + Switch the qt4/tests unittests to use QtTestLib. + + ChangeLog | 6 ++ + configure.ac | 66 +++++++++++++++++++++ + qt4/tests/.cvsignore | 17 ++---- + qt4/tests/Makefile.am | 71 ++++++++-------------- + qt4/tests/README.unittest | 23 ++++++++ + qt4/tests/check_author.cpp | 25 -------- + qt4/tests/check_linearised.cpp | 23 -------- + qt4/tests/check_metadata.cpp | 101 + ++++++++++++++++++++++++++++++++ + qt4/tests/check_orientation.cpp | 40 ------------- + qt4/tests/check_pagelayout.cpp | 44 ++++++++++++++ + qt4/tests/check_pagelayout_facing.cpp | 22 ------- + qt4/tests/check_pagelayout_none.cpp | 22 ------- + qt4/tests/check_pagelayout_single.cpp | 22 ------- + qt4/tests/check_pagemode.cpp | 64 ++++++++++++++++++++ + qt4/tests/check_pagemode_attach.cpp | 22 ------- + qt4/tests/check_pagemode_fullscreen.cpp | 22 ------- + qt4/tests/check_pagemode_none.cpp | 22 ------- + qt4/tests/check_pagemode_oc.cpp | 22 ------- + qt4/tests/check_pagemode_thumbs.cpp | 22 ------- + qt4/tests/check_permissions.cpp | 60 +++++++------------ + 20 files changed, 354 insertions(+), 362 deletions(-) + +commit 3725841417871d1051772068833dc908ca70b7ce +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Sep 2 14:47:24 2005 +0000 + + 2005-09-02 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc: Apply Marcos rotation fix. + + ChangeLog | 4 ++++ + glib/poppler-page.cc | 5 ++++- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit ecf3dcadb948013cbc987e464952933daf78e4bf +Author: Brad Hards <bradh@frogmouth.net> +Date: Wed Aug 31 15:28:46 2005 +0000 + + Merge some missing parts of previous patches, and some other minor + cleanups from xpdf 3.0.1 + + poppler/Catalog.cc | 16 +-- + poppler/JPXStream.cc | 380 + +++++++++++++++++++++++++++++++++---------------- + poppler/JPXStream.h | 25 ++-- + poppler/Lexer.cc | 11 ++ + poppler/Lexer.h | 3 + + poppler/PSOutputDev.cc | 31 ++-- + poppler/Stream.h | 7 + + 7 files changed, 309 insertions(+), 164 deletions(-) + +commit de78738164319b733e54a9abfb5957870facd6cd +Author: Brad Hards <bradh@frogmouth.net> +Date: Wed Aug 31 09:51:41 2005 +0000 + + poppler/JArithmeticDecoder.cc + poppler/JArithmeticDecoder.h + poppler/JBIG2Stream.cc + poppler/JBIG2Stream.h: merge in some of the JBIG2 changes from + xpdf 3.0.1. + + ChangeLog | 9 ++ + poppler/JArithmeticDecoder.cc | 42 ++++++-- + poppler/JArithmeticDecoder.h | 22 +++- + poppler/JBIG2Stream.cc | 227 + +++++++++++++++++++++++++----------------- + poppler/JBIG2Stream.h | 4 +- + 5 files changed, 201 insertions(+), 103 deletions(-) + +commit 55952feb637e300b073691ae95d68e766521a769 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Aug 29 15:24:32 2005 +0000 + + 2005-08-29 Kristian Høgsberg <krh@redhat.com> + + * configure.ac (HAVE_FREETYPE_H): Patch from Hiroyuki + Ikezoe: Set + HAVE_FREETYPE_217_OR_OLDER to 0 if we found freetype using + pkg-config (#4223). + + ChangeLog | 6 ++++++ + configure.ac | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 244e5c1f8f65da41ba6314028766dfe5973f6132 +Author: Brad Hards <bradh@frogmouth.net> +Date: Sun Aug 28 09:43:18 2005 +0000 + + Merge the Goo* improvements from xpdf 3.0.1. This change is based on + martink's work (7-xpdf-3.01-goo-improvements.patch), with some + tweaking + by me. + + ChangeLog | 13 ++++++++ + fofi/FoFiTrueType.cc | 1 + + goo/GooHash.cc | 24 +++++++++++++++ + goo/GooHash.h | 2 ++ + goo/GooList.cc | 5 ++++ + goo/GooList.h | 5 ++++ + goo/GooString.cc | 85 + +++++++++++++++++++++++++++++++++++++++++++++++++++- + goo/GooString.h | 11 +++---- + goo/gmem.c | 3 ++ + poppler/Decrypt.cc | 1 + + 10 files changed, 142 insertions(+), 8 deletions(-) + +commit eb91b274245b4f5f5389bc9ddfde2c2806557665 +Author: Brad Hards <bradh@frogmouth.net> +Date: Sun Aug 28 09:31:53 2005 +0000 + + This part of my previous gmallocn merge patch was missing. + + goo/GooHash.cc | 4 ++-- + goo/GooList.cc | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +commit b3474fd5e0efc96b5814d86e0cdedf39387e7ae3 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Aug 28 03:26:53 2005 +0000 + + add note about related bug + + ChangeLog | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit ace2eb6ba518b970b96f30f61c4795c161e0cb79 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Aug 28 03:22:04 2005 +0000 + + 2005-08-27 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/FlateStream.cc: Fix predictor leak. + + ChangeLog | 4 ++++ + poppler/FlateStream.cc | 1 + + 2 files changed, 5 insertions(+) + +commit 96657c5480bf2ecf445ad5a105b8e7393ae53c8b +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Aug 28 03:19:55 2005 +0000 + + 2005-08-27 Jeff Muizelaar <jeff@infidigm.net> + + * configure.ac: Disable the zlib-based decoder by default. + + ChangeLog | 4 ++++ + configure.ac | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit d1d715158223c7ca3ae279cea420a948cfdb0428 +Author: Brad Hards <bradh@frogmouth.net> +Date: Sat Aug 27 08:43:42 2005 +0000 + + Merge the gmalloc -> gmallocn changes from xpdf 3.0.1. This change is + based on martink's work (13-xpdf-3.01-goo-allocn.patch) with some + tweaking by me. There may be some residual gmallocn changes still to + be merged. + + ChangeLog | 7 ++++++ + fofi/FoFiTrueType.cc | 12 +++++----- + fofi/FoFiType1.cc | 2 +- + fofi/FoFiType1C.cc | 14 +++++------ + goo/gmem.c | 22 ++++++++++++++++++ + goo/gmem.h | 9 ++++++++ + poppler/Annot.cc | 2 +- + poppler/Array.cc | 2 +- + poppler/BuiltinFont.cc | 2 +- + poppler/CMap.cc | 6 ++--- + poppler/Catalog.cc | 8 +++---- + poppler/CharCodeToUnicode.cc | 22 +++++++++--------- + poppler/Dict.cc | 2 +- + poppler/Function.cc | 20 ++++++++-------- + poppler/Gfx.cc | 2 +- + poppler/GfxFont.cc | 24 +++++++++---------- + poppler/GfxState.cc | 54 + +++++++++++++++++++++---------------------- + poppler/JArithmeticDecoder.cc | 2 +- + poppler/JBIG2Stream.cc | 30 ++++++++++++------------ + poppler/Link.cc | 6 ++--- + poppler/NameToCharCode.cc | 4 ++-- + poppler/Outline.cc | 4 ++-- + poppler/SplashOutputDev.cc | 8 +++---- + poppler/Stream.cc | 12 +++++----- + poppler/TextOutputDev.cc | 48 +++++++++++++++++++------------------- + poppler/XRef.cc | 18 +++++++-------- + splash/SplashClip.cc | 12 +++++----- + splash/SplashFTFontFile.cc | 2 +- + splash/SplashFont.cc | 6 ++--- + splash/SplashPath.cc | 8 +++---- + splash/SplashScreen.cc | 4 ++-- + splash/SplashState.cc | 4 ++-- + splash/SplashT1FontFile.cc | 4 ++-- + splash/SplashXPath.cc | 4 ++-- + splash/SplashXPathScanner.cc | 4 ++-- + 35 files changed, 214 insertions(+), 176 deletions(-) + +commit feb82c60b1f86a9d1260db57534d98c54ee615c4 +Author: Martin Kretzschmar <martink@gnome.org> +Date: Wed Aug 24 19:41:27 2005 +0000 + + * configure.ac: add /usr/include/qt4 to qt4_incdirs. That's what + Debian and Ubuntu use. Maybe we should just use pkg-config. If + it's usable with qt4. + + * test/.cvsignore: ignore pdf_inspector binary. + + ChangeLog | 8 ++++++++ + configure.ac | 2 +- + test/.cvsignore | 7 ++++--- + 3 files changed, 13 insertions(+), 4 deletions(-) + +commit 8dce80eb74f24f07ac7668905f1631e04a9c5841 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Aug 24 18:57:46 2005 +0000 + + 2005-08-24 Kristian Høgsberg <krh@redhat.com> + + * poppler/TextOutputDev.cc: Push rotation argument down to + GfxState constructor. This is still not completely + functional yet. + + * glib/poppler-page.cc (poppler_page_render_selection): Add + rotation argument so API is useful. Not yet implemented. + (poppler_page_prepare_output_dev): Patch from Marco to fix + rotation using the cairo backend. + + ChangeLog | 10 ++++++++++ + glib/poppler-page.cc | 22 ++++++++++++++++------ + glib/poppler-page.h | 1 + + poppler/TextOutputDev.cc | 11 ++++++++--- + poppler/TextOutputDev.h | 4 +++- + 5 files changed, 38 insertions(+), 10 deletions(-) + +commit b909b5ae98bc3e557ef6e658e2b9120e82951259 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Wed Aug 24 03:21:20 2005 +0000 + + Tue Aug 23 17:21:02 2005 Jonathan Blandford <jrb@redhat.com> + + * test/Makefile.am (gtk_cairo_test_LDADD): add + FREETYPE_{CFLAGS,LIBS} to the cairo deps + + ChangeLog | 5 +++++ + test/Makefile.am | 4 +++- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit da3aac379f07ffedd6078707ec9923800fc0c0a5 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Tue Aug 23 18:20:45 2005 +0000 + + Tue Aug 23 13:38:01 2005 Jonathan Blandford <jrb@redhat.com> + + * configure.ac: + * poppler/Gfx.cc: + * poppler/Gfx.h: + * poppler/GlobalParams.cc: + * poppler/GlobalParams.h: + * poppler/Makefile.am: + * poppler/OutputDev.cc: + * poppler/OutputDev.h: + * poppler/ProfileData.cc: + * poppler/ProfileData.h: + * test/Makefile.am: + * test/pdf-inspector.cc: + * test/pdf-inspector.glade: + * test/pdf-operators.c: Initial cut at a pdf inspector. This + should help us look at PDF files. + + ChangeLog | 18 ++ + configure.ac | 4 +- + poppler/Gfx.cc | 30 ++++ + poppler/Gfx.h | 1 + + poppler/GlobalParams.cc | 16 ++ + poppler/GlobalParams.h | 3 + + poppler/Makefile.am | 2 + + poppler/OutputDev.cc | 17 ++ + poppler/OutputDev.h | 10 +- + poppler/ProfileData.cc | 44 +++++ + poppler/ProfileData.h | 41 +++++ + test/Makefile.am | 13 +- + test/pdf-inspector.cc | 358 ++++++++++++++++++++++++++++++++++++++ + test/pdf-inspector.glade | 434 + +++++++++++++++++++++++++++++++++++++++++++++++ + test/pdf-operators.c | 81 +++++++++ + 15 files changed, 1068 insertions(+), 4 deletions(-) + +commit 1aad886c6c19a964a3fc9e18f31acc8e115478e0 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Aug 22 18:20:12 2005 +0000 + + 2005-08-22 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler-private.h: + * glib/test-poppler-glib.c: Patch from Marco to simplify + the glib + rotation API. + + ChangeLog | 8 +++ + glib/poppler-page.cc | 136 + +++++++---------------------------------------- + glib/poppler-page.h | 4 +- + glib/poppler-private.h | 1 - + glib/test-poppler-glib.c | 2 +- + 5 files changed, 28 insertions(+), 123 deletions(-) + +commit 6070b1dc4b76c236f3100fbd255c2d906e61c3c2 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sun Aug 21 23:14:04 2005 +0000 + + 2005-08-21 Kristian Høgsberg <krh@redhat.com> + + * poppler/Makefile.am (INCLUDES): Add FREETYPE_CFLAGS. + + * configure.ac: Make freetype check use pkg-config if + possible. + + ChangeLog | 6 ++++++ + configure.ac | 34 ++++++++++++++++++++++++---------- + poppler/Makefile.am | 1 + + 3 files changed, 31 insertions(+), 10 deletions(-) + +commit 2698ca6fa107ea91dc01eb8cfb0c93383fbca125 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Aug 17 16:54:01 2005 +0000 + + 2005-08-17 Kristian Høgsberg <krh@redhat.com> + + * poppler/GfxFont.cc: Add fix discussed in #3131 to only + use the + MacRoman char map if the font has one or the font dicts + specifies + /MacRoman. + + ChangeLog | 6 ++++++ + poppler/GfxFont.cc | 1 - + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 5dc9b14b99f2efa2fe018e9267dd363d1bcd78b1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Aug 7 23:58:12 2005 +0000 + + Fix EOF checking + + ChangeLog | 4 ++++ + poppler/PDFDoc.cc | 10 +++++++++- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 155d019d7b474f244a3e4bf64d192015f6a266c4 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sat Aug 6 18:09:51 2005 +0000 + + 2005-08-06 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc: + * glib/poppler-page.h: Use GdkColor for specifying selection + colors, we alreay depend on GDK anyway. + + ChangeLog | 6 ++++++ + glib/poppler-page.cc | 20 +++++++++----------- + glib/poppler-page.h | 5 +++-- + 3 files changed, 18 insertions(+), 13 deletions(-) + +commit c710b645c8297d356c101b13a9889bcaba691176 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 6 11:58:59 2005 +0000 + + Update comment + + poppler/PDFDoc.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit de7953c8a8360d8bfc99298906c5fc1094684fc3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Sat Aug 6 11:47:37 2005 +0000 + + Increase EOF searching up to last 1024 characters + + ChangeLog | 7 +++++++ + poppler/PDFDoc.cc | 23 +++++++++++++---------- + 2 files changed, 20 insertions(+), 10 deletions(-) + +commit 5dd72618688763b50d5f5738d857c9294ef1b1c2 +Author: Brad Hards <bradh@frogmouth.net> +Date: Sat Aug 6 02:15:58 2005 +0000 + + Add password arguments to document constructor. + + ChangeLog | 4 ++++ + qt4/src/poppler-document.cc | 8 ++++++-- + qt4/src/poppler-qt4.h | 4 +++- + 3 files changed, 13 insertions(+), 3 deletions(-) + +commit edbd7957b393eb63f48df7db6b220b355d4fc461 +Author: Brad Hards <bradh@frogmouth.net> +Date: Sat Aug 6 02:07:55 2005 +0000 + + Make API extraction work again. + + ChangeLog | 3 +++ + qt4/src/Doxyfile | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +commit f43a6f1d1c27c042f5736746c94430083baa4c1d +Author: Brad Hards <bradh@frogmouth.net> +Date: Sat Aug 6 01:53:06 2005 +0000 + + Add new test code for encrypted files. + + ChangeLog | 5 ++ + qt4/tests/.cvsignore | 1 + + qt4/tests/Makefile.am | 7 ++- + qt4/tests/test-password-qt4.cpp | 135 + ++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 147 insertions(+), 1 deletion(-) + +commit 2ec26afaf80864b023899b890b8e229448da9bed +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Aug 5 22:30:20 2005 +0000 + + 2005-08-05 Kristian Høgsberg <krh@redhat.com> + + * poppler/TextOutputDev.cc (visitLine): Round selection + coordinates in device space, so selection isn't fuzzy. + + * poppler/GfxState.cc: + * poppler/GfxState.h: Add simple Matrix class. + + ChangeLog | 8 ++++++++ + poppler/CairoOutputDev.cc | 6 +++--- + poppler/GfxState.cc | 26 ++++++++++++++++++++++++++ + poppler/GfxState.h | 10 ++++++++++ + poppler/TextOutputDev.cc | 14 ++++++++++++++ + 5 files changed, 61 insertions(+), 3 deletions(-) + +commit ccba4f0773047eea5e4ad0ac736450160dd97664 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Aug 5 19:04:36 2005 +0000 + + 2005-08-05 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc: + * glib/poppler-page.h: + * poppler/TextOutputDev.cc: + * poppler/TextOutputDev.h: Propagate selection colors to + the glib API. + + ChangeLog | 7 ++++++ + glib/poppler-page.cc | 63 + ++++++++++++++++++++++++++++++++++++++++++------ + glib/poppler-page.h | 4 ++- + poppler/TextOutputDev.cc | 25 +++++++++---------- + poppler/TextOutputDev.h | 7 ++++-- + 5 files changed, 82 insertions(+), 24 deletions(-) + +commit 43e97129393f403c41f191ceae9a54793ece005f +Author: Brad Hards <bradh@frogmouth.net> +Date: Thu Aug 4 10:15:23 2005 +0000 + + Fix problem with drawing filled objects that was introduced in + Rev 1.4. + + ChangeLog | 5 +++++ + poppler/ArthurOutputDev.cc | 13 +++++++++++-- + 2 files changed, 16 insertions(+), 2 deletions(-) + +commit a75d80333a70d2e1ac7c9032d316034eebed9dd6 +Author: Brad Hards <bradh@frogmouth.net> +Date: Wed Aug 3 11:44:55 2005 +0000 + + Implement paging ability for Qt4, more than a little based + on Albert's work for Qt3. + Up arrow -> previous page + Down arrow -> next page + q -> quit. + + What more could you want from a PDF viewer :-) + + ChangeLog | 6 ++++++ + qt4/tests/test-poppler-qt4.cpp | 47 + +++++++++++++++++++++++++++++++++--------- + 2 files changed, 43 insertions(+), 10 deletions(-) + +commit f3e0a163b098da1cc389c2c4f47e28358b1bec77 +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Aug 1 19:15:40 2005 +0000 + + Fix problem in the patch to fix #3299 + + ChangeLog | 4 ++++ + poppler/DCTStream.cc | 15 ++++++++++----- + poppler/DCTStream.h | 1 + + 3 files changed, 15 insertions(+), 5 deletions(-) + +commit 5f7bd81bedd8c90e3312190256488ff0c15502e1 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Aug 1 15:21:19 2005 +0000 + + 2005-08-01 Kristian Høgsberg <krh@redhat.com> + + Patch from Dan Winship <danw@novell.com> + + * glib/poppler-page.cc (poppler_page_copy_to_pixbuf): Set + alpha to + 0xff (opaque), not 0x00. + + ChangeLog | 7 +++++++ + glib/poppler-page.cc | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit 22f509e60f60ccaea1f91d9ec1ef7ba8200bee8a +Author: Brad Hards <bradh@frogmouth.net> +Date: Mon Aug 1 08:09:00 2005 +0000 + + Fix up the fill problem with drawing text, where the "middle" + of glyphs + with a "hole" (like d, o, p, b, g) got filled. Also remove some + debugging + code. The glyphs are still ugly though. + + ChangeLog | 7 +++++++ + poppler/ArthurOutputDev.cc | 13 +------------ + 2 files changed, 8 insertions(+), 12 deletions(-) + +commit 7bf5d10c1f6edd538769c3a83a3b3d5df56d604b +Author: Brad Hards <bradh@frogmouth.net> +Date: Sun Jul 31 09:54:04 2005 +0000 + + An initial version of proper font handling, heavily based on work by + Albert Astals Cid. I changed it to stroke the glyphs based on the + SplashPath. In the longer term, Arthur should use FreeType paths + directly - hopefully that will be less ugly, and not fill everything. + + ChangeLog | 8 + + poppler/ArthurOutputDev.cc | 401 + ++++++++++++++++++++++++++++++++------------- + poppler/ArthurOutputDev.h | 15 +- + qt4/src/poppler-page.cc | 2 +- + splash/SplashPath.h | 2 + + 5 files changed, 314 insertions(+), 114 deletions(-) + +commit 8567b794628786b82e8db2a7daf75e4ad2398960 +Author: Brad Hards <bradh@frogmouth.net> +Date: Fri Jul 29 12:15:19 2005 +0000 + + Add some more test cases. + + ChangeLog | 4 ++++ + qt4/tests/.cvsignore | 4 ++++ + qt4/tests/Makefile.am | 10 +++++++++- + qt4/tests/check_pagelayout_facing.cpp | 22 ++++++++++++++++++++++ + qt4/tests/check_version.cpp | 22 ++++++++++++++++++++++ + 5 files changed, 61 insertions(+), 1 deletion(-) + +commit 59d660cf4d614fdea09d6a62b8889f7682c2b4f9 +Author: Brad Hards <bradh@frogmouth.net> +Date: Fri Jul 29 11:41:14 2005 +0000 + + Compile fix associated with last change. + + poppler/ArthurOutputDev.cc | 2 -- + 1 file changed, 2 deletions(-) + +commit 88c57c73f57820d6a57e26825093fbc688845e67 +Author: Brad Hards <bradh@frogmouth.net> +Date: Fri Jul 29 11:24:42 2005 +0000 + + A couple of minor changes to the Arthur backend. + + ChangeLog | 9 +++++++++ + poppler/ArthurOutputDev.cc | 18 ++++++++++++++---- + 2 files changed, 23 insertions(+), 4 deletions(-) + +commit 481db9d9eae5ea16e5b382f4ad21e6e624a70dcf +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Jul 29 05:48:33 2005 +0000 + + 2005-07-29 Kristian Høgsberg <krh@redhat.com> + + * poppler/TextOutputDev.cc: Finish TextSelectionDumper + class for + extracting the text from a selection. Add + TextPage::getSelectionText() and + TextOutputDev::getSelectionText() + methods to expose the new functionality. + + * glib/poppler-page.cc (poppler_page_get_text): Use + TextOutputDev::getSelectionText() to get the text from the + selection. + + * glib/poppler-document.cc (poppler_document_new_from_file): + * glib/poppler-page.cc (_poppler_page_new): Add extra NULL to + g_object_new() constructor to silence gcc warning about + missing + sentinel. + + ChangeLog | 16 +++++ + glib/poppler-document.cc | 2 +- + glib/poppler-page.cc | 31 +++++---- + poppler/TextOutputDev.cc | 164 + +++++++++++++++++++++++++++++++++++------------ + poppler/TextOutputDev.h | 8 +++ + 5 files changed, 164 insertions(+), 57 deletions(-) + +commit ad312dbded4e8f70c3a2eac9a0964fa00ecb6b2c +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jul 28 22:56:17 2005 +0000 + + Fix memory leaks in PageLabelInfo.cc + + ChangeLog | 4 ++++ + poppler/PageLabelInfo.cc | 11 +++++++++++ + poppler/PageLabelInfo.h | 2 ++ + 3 files changed, 17 insertions(+) + +commit b45ad9f3409d7b1ed147135a70553e5255913c61 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jul 28 20:53:36 2005 +0000 + + - delete family; + + delete[] family; + as family is new[]'ed + + When assigning family if the font had "the proper info" and family + had to be deleted, do it. + + poppler/GlobalParams.cc | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +commit f93dfc5c5133e0b1bd9f4786cfe18bd796cbac2a +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jul 28 18:51:17 2005 +0000 + + Remove the debugging + + poppler/GlobalParams.cc | 5 ----- + 1 file changed, 5 deletions(-) + +commit 8022315004e1623c0be320f7671fcd72c15c0de3 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jul 28 18:37:17 2005 +0000 + + Wonder how that slipped here + + poppler/GlobalParams.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 82638babe89e402c0348619ec3205059b977c7e9 +Author: Albert Astals Cid <aacid@kde.org> +Date: Thu Jul 28 17:34:19 2005 +0000 + + Fontconfig patch is here, rejoice + + ChangeLog | 15 +- + glib/poppler-document.cc | 1 - + poppler/CairoFontEngine.cc | 95 +-------- + poppler/CairoFontEngine.h | 2 - + poppler/CairoOutputDev.cc | 4 - + poppler/GlobalParams.cc | 473 + ++++++++++++++++++++------------------------ + poppler/GlobalParams.h | 17 +- + poppler/SplashOutputDev.cc | 132 +------------ + poppler/SplashOutputDev.h | 3 - + qt/poppler-document.cc | 1 - + qt4/src/poppler-document.cc | 1 - + test/gtk-cairo-test.cc | 1 - + test/gtk-splash-test.cc | 1 - + 13 files changed, 241 insertions(+), 505 deletions(-) + +commit e9015531b1d0e5f2c8d8ca2bc50d5f14aaf954bc +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Jul 28 06:31:57 2005 +0000 + + 2005-07-28 Kristian Høgsberg <krh@redhat.com> + + * poppler/poppler-config.h.in: Add GCC_PRINTF_FORMAT macro to + annotate printf-like functions (#3638). + + * poppler/Error.h: Add GCC_PRINTF_FORMAT to error(). + + * poppler/PSOutputDev.h: Add GCC_PRINTF_FORMAT to + PSOutputDev::writePSFmt(). + + * poppler/PSOutputDev.cc, poppler/GlobalParams.cc: Quiet new + printf warnings. + + ChangeLog | 11 +++++++++++ + poppler/Error.h | 2 +- + poppler/GlobalParams.cc | 3 ++- + poppler/PSOutputDev.cc | 3 +-- + poppler/PSOutputDev.h | 2 +- + poppler/TextOutputDev.cc | 13 ++++++++++++- + poppler/poppler-config.h.in | 12 ++++++++++++ + 7 files changed, 40 insertions(+), 6 deletions(-) + +commit 9df89c495683e229b771b3d008ed25d478465c35 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Jul 28 05:52:43 2005 +0000 + + 2005-07-28 Kristian Høgsberg <krh@redhat.com> + + * poppler/TextOutputDev.cc (TextBlock::visitSelection): Assign + start and stop coordinates in one place so we don't assign the + same point to both in some corner cases. + (TextWord::visitSelection): Initialize begin to len, not + len + 1 + to fix crash. + + (TextWord::visitSelection, TextLine::visitSelection): Change + selection trigger; now midpoint of glyph must be included in + selection area for glyph to be in selection. + + ChangeLog | 12 +++++ + poppler/CairoOutputDev.cc | 2 +- + poppler/TextOutputDev.cc | 113 + ++++++++++++++++++++++------------------------ + 3 files changed, 67 insertions(+), 60 deletions(-) + +commit a3d9b5849cedf1316c6fc5859872e957f3f7b593 +Author: Martin Kretzschmar <martink@gnome.org> +Date: Wed Jul 27 19:21:08 2005 +0000 + + * poppler/PSOutputDev.cc (PSOutputDev): change the constructor to + take paper size and duplex setting parameters. + (init): add paper size and duplex parameters. + (writeDocSetup): add duplex parameter. + + * poppler/PSOutputDev.h: update declarations. + + * glib/poppler-private.h (struct _PopplerPSFile): store necessary + information to eventually construct a PSOutputDev. + + * glib/poppler-page.cc (poppler_page_render_to_ps): initialize the + output dev if it doesn't exist yet. + + * glib/poppler-document.cc (poppler_ps_file_new): don't create the + PSOutputDev here, just store filename and page range. + (poppler_ps_file_set_paper_size, poppler_ps_file_set_duplex): new + functions. + (poppler_ps_file_free): free the filename which we strdup now. + + * glib/poppler-document.h: add prototypes. + + ChangeLog | 23 +++++++++++++++++++++++ + glib/poppler-document.cc | 49 + +++++++++++++++++++++++++++++++++++++++++------- + glib/poppler-document.h | 15 ++++++++++----- + glib/poppler-page.cc | 10 ++++++++++ + glib/poppler-private.h | 6 ++++++ + poppler/PSOutputDev.cc | 23 ++++++++++++++--------- + poppler/PSOutputDev.h | 9 +++++++-- + 7 files changed, 112 insertions(+), 23 deletions(-) + +commit 7be920ecf13698c3cf4ab8df09c8c67f1a04bfa2 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jul 26 21:52:09 2005 +0000 + + Fix mem leak in qt test app + + ChangeLog | 4 ++++ + qt/test-poppler-qt.cpp | 2 ++ + 2 files changed, 6 insertions(+) + +commit 2bc26dffd9f296799617d319055648c20f748c8a +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Jul 26 20:34:13 2005 +0000 + + 2005-07-26 Kristian Høgsberg <krh@redhat.com> + + * fofi/FoFiType1.cc: Make check for end of encoding array + a bit + more liberal so we don't crash on complex encoding arrays + (#3344). + + ChangeLog | 5 +++++ + fofi/FoFiType1.cc | 21 +++++++-------------- + 2 files changed, 12 insertions(+), 14 deletions(-) + +commit 07911274e4e850a628b1e587cafc2a73c05f93fe +Author: Albert Astals Cid <aacid@kde.org> +Date: Mon Jul 25 20:40:37 2005 +0000 + + Work on bad jpeg data that have garbage before the start marker. Fixes + bug #3299 + + ChangeLog | 5 +++++ + poppler/DCTStream.cc | 38 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 43 insertions(+) + +commit a1869eca39172fcb42f036a5846b19548be53568 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 22 11:01:25 2005 +0000 + + Fix bug #3586 + + ChangeLog | 5 +++++ + poppler/CairoFontEngine.cc | 2 ++ + 2 files changed, 7 insertions(+) + +commit 95529b41272484f08fb54393e1886bf7ff3e02c8 +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 22 10:45:19 2005 +0000 + + Make it possible to browse pages in test-poppler-qt + + ChangeLog | 13 +++++++++---- + qt/test-poppler-qt.cpp | 49 + ++++++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 49 insertions(+), 13 deletions(-) + +commit 2d52650864eab0e9385ed1fe8fb594daac9d8322 +Author: Martin Kretzschmar <martink@gnome.org> +Date: Fri Jul 22 10:35:56 2005 +0000 + + * glib/poppler-document.cc (poppler_fonts_iter_get_name): if the + font is a subset, strip the ABCDEF+ tag. + (poppler_fonts_iter_get_full_name): does what the old get_name did. + (poppler_fonts_iter_get_font_type, poppler_fonts_iter_is_embedded) + (poppler_fonts_iter_is_subset): new wrappers. + + * glib/poppler-document.h (PopplerFontType): new enum. + Update prototypes. + + ChangeLog | 11 ++++++++++ + glib/poppler-document.cc | 54 + +++++++++++++++++++++++++++++++++++++++++++++++- + glib/poppler-document.h | 38 ++++++++++++++++++++++++---------- + 3 files changed, 91 insertions(+), 12 deletions(-) + +commit 43bed4aafcf1d291dc96fa5070efbd7936a6122f +Author: Albert Astals Cid <aacid@kde.org> +Date: Fri Jul 22 10:33:54 2005 +0000 + + Fix bugs #3728 and #3750 + + ChangeLog | 4 ++++ + splash/Splash.cc | 10 ++++++++++ + 2 files changed, 14 insertions(+) + +commit c7bcef87493d354a077dd223d76f86640acc0ce3 +Author: Martin Kretzschmar <martink@gnome.org> +Date: Fri Jul 15 19:55:30 2005 +0000 + + update for 2005-06-27 change to actually display something again. + + ChangeLog | 5 +++++ + test/gtk-cairo-test.cc | 10 ++++++---- + 2 files changed, 11 insertions(+), 4 deletions(-) + +commit 6623711d2d50dc52454904ee16b25337f0aab130 +Author: Brad Hards <bradh@frogmouth.net> +Date: Sun Jul 10 09:34:03 2005 +0000 + + A general cleanup of the Arthur output renderer. + + ChangeLog | 5 +++ + poppler/ArthurOutputDev.cc | 105 + ++++++++++++++++----------------------------- + 2 files changed, 41 insertions(+), 69 deletions(-) + +commit ea1cc9a7b12db9c44b89896c41d07e3ba932d054 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Jul 8 04:59:41 2005 +0000 + + 2005-07-08 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (poppler_page_set_selection_alpha): Add + this function to initialize the alpha channel when using the + splash backend. + + * poppler/TextOutputDev.cc (visitLine): Add missing scaling of + intra-line selection edges. + + ChangeLog | 9 ++++++++ + glib/poppler-page.cc | 59 + +++++++++++++++++++++++++++++++++++++++++++++++- + poppler/TextOutputDev.cc | 17 ++++++++------ + 3 files changed, 77 insertions(+), 8 deletions(-) + +commit 1cd915397c9532ed80b4f905b6ed9c0126aa38f2 +Author: Brad Hards <bradh@frogmouth.net> +Date: Thu Jul 7 21:15:09 2005 +0000 + + Add support for page layout to the Qt4 bindings, plus + test cases. + + ChangeLog | 8 ++++++++ + qt4/src/poppler-document.cc | 22 ++++++++++++++++++++++ + qt4/src/poppler-qt4.h | 26 ++++++++++++++++++++++++-- + qt4/tests/Makefile.am | 10 +++++++++- + qt4/tests/check_pagelayout_none.cpp | 22 ++++++++++++++++++++++ + qt4/tests/check_pagelayout_single.cpp | 22 ++++++++++++++++++++++ + 6 files changed, 107 insertions(+), 3 deletions(-) + +commit 4e050aef7ba132900f84205be221fd48808848c3 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Jul 7 17:19:36 2005 +0000 + + 2005-07-07 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (poppler_page_prepare_output_dev): + Account + for page rotation when creating the cairo surface. + + ChangeLog | 5 +++++ + glib/poppler-page.cc | 17 +++++++++++++++-- + 2 files changed, 20 insertions(+), 2 deletions(-) + +commit 2eeab0b8afeb4897806df2de6e496889c25dda5e +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Jul 7 15:58:43 2005 +0000 + + 2005-07-06 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (poppler_page_copy_to_pixbuf): Add + out of + bounds checking (from Marco). + + ChangeLog | 6 +++++- + glib/poppler-page.cc | 5 +++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit b1015f6bdbd93b2a2574a9f0e0e1cd7dbae9af78 +Author: Brad Hards <bradh@frogmouth.net> +Date: Thu Jul 7 11:13:24 2005 +0000 + + At least try to fix glib issues. If you care about glib, + then you should review this. + + ChangeLog | 4 ++++ + glib/poppler-document.cc | 2 ++ + 2 files changed, 6 insertions(+) + +commit 8bf787031e7a2e93b4e1202918bd1aee86675082 +Author: Brad Hards <bradh@frogmouth.net> +Date: Thu Jul 7 11:04:08 2005 +0000 + + Update for page mode - new mode from PDF-1.6, API docs fixes + and some tests. + + ChangeLog | 15 +++++++++++++++ + poppler/Catalog.cc | 2 ++ + poppler/Catalog.h | 3 ++- + qt4/src/poppler-document.cc | 2 ++ + qt4/src/poppler-qt4.h | 14 +++++++++----- + qt4/tests/Makefile.am | 22 +++++++++++++++++++++- + qt4/tests/check_pagemode_attach.cpp | 22 ++++++++++++++++++++++ + qt4/tests/check_pagemode_fullscreen.cpp | 22 ++++++++++++++++++++++ + qt4/tests/check_pagemode_none.cpp | 22 ++++++++++++++++++++++ + qt4/tests/check_pagemode_oc.cpp | 22 ++++++++++++++++++++++ + qt4/tests/check_pagemode_thumbs.cpp | 22 ++++++++++++++++++++++ + 11 files changed, 161 insertions(+), 7 deletions(-) + +commit 695e27fb4d6fcc3466e2c9c95b4f02821b07e823 +Author: Brad Hards <bradh@frogmouth.net> +Date: Thu Jul 7 11:01:27 2005 +0000 + + Suppress noise from new test files. + + qt4/tests/.cvsignore | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit 8a8d57bdcf11ed2903913d938b9711053b9bb9f1 +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jul 6 17:12:36 2005 +0000 + + Extract family, stretch and weight from the font descriptor + + ChangeLog | 2 ++ + poppler/GfxFont.cc | 41 +++++++++++++++++++++++++++++++++++++++++ + poppler/GfxFont.h | 36 ++++++++++++++++++++++++++++++++++++ + 3 files changed, 79 insertions(+) + +commit 3a1646c2f776f5a07b0e830fcb8e1b0a80efb41c +Author: Albert Astals Cid <aacid@kde.org> +Date: Wed Jul 6 13:29:00 2005 +0000 + + Add checkFooter to check the document ends with %%EOF + + ChangeLog | 5 +++++ + poppler/PDFDoc.cc | 28 ++++++++++++++++++++++++++++ + poppler/PDFDoc.h | 1 + + 3 files changed, 34 insertions(+) + +commit 377c023d31cf74d8240aa5be9dba8e3838459a8c +Author: Brad Hards <bradh@frogmouth.net> +Date: Wed Jul 6 11:15:16 2005 +0000 + + Add unit tests for the isLinearized() property. + + ChangeLog | 4 ++++ + qt4/tests/Makefile.am | 6 +++++- + qt4/tests/check_linearised.cpp | 23 +++++++++++++++++++++++ + 3 files changed, 32 insertions(+), 1 deletion(-) + +commit 5fa869887a840a585340993718df0841010666cf +Author: Brad Hards <bradh@frogmouth.net> +Date: Wed Jul 6 09:52:30 2005 +0000 + + Remove boolean for unicode table lookup from Font + + ChangeLog | 14 ++++++++++++++ + qt4/src/poppler-document.cc | 2 -- + qt4/src/poppler-qt4.h | 14 +------------- + qt4/tests/poppler-fonts.cpp | 16 +++++++--------- + 4 files changed, 22 insertions(+), 24 deletions(-) + +commit 40469c5883e17e734f3d54872c59e76b95bc0f95 +Author: Brad Hards <bradh@frogmouth.net> +Date: Wed Jul 6 09:00:39 2005 +0000 + + Update to reflect recent changes. + + qt4/tests/.cvsignore | 2 ++ + 1 file changed, 2 insertions(+) + +commit 6cea437208f913085a6a8c7183b0826a107cefb5 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jul 5 21:15:48 2005 +0000 + + Don't crash with files that have fonts with no name + + ChangeLog | 7 +++++++ + qt4/src/poppler-document.cc | 13 ++++++++++--- + qt4/src/poppler-qt4.h | 2 +- + 3 files changed, 18 insertions(+), 4 deletions(-) + +commit 1323c74479848f5b87a3a13fa26e8b9e096e9f6a +Author: Brad Hards <bradh@frogmouth.net> +Date: Tue Jul 5 12:31:59 2005 +0000 + + Check in a couple more test apps + + qt4/tests/Makefile.am | 10 ++++++- + qt4/tests/check_author.cpp | 25 +++++++++++++++++ + qt4/tests/check_permissions.cpp | 59 + +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 93 insertions(+), 1 deletion(-) + +commit 839a798ec3725427185de5a48c58ac448596b25d +Author: Brad Hards <bradh@frogmouth.net> +Date: Tue Jul 5 12:25:00 2005 +0000 + + Add Qt4 bindings for new user permission properties. + + ChangeLog | 4 ++++ + qt4/src/poppler-document.cc | 25 ++++++++++++++++++++++ + qt4/src/poppler-qt4.h | 51 + ++++++++++++++++++++++++++++++++++++++++----- + 3 files changed, 75 insertions(+), 5 deletions(-) + +commit e10f6990d3339e3a7adeaa50b1754cf7ecf82f87 +Author: Brad Hards <bradh@frogmouth.net> +Date: Tue Jul 5 12:15:04 2005 +0000 + + Add some more user permissions properties - high resolution + printing, document assembly, extraction for accessibility + and form completion. + + ChangeLog | 8 ++++++++ + poppler/PDFDoc.h | 9 +++++++++ + poppler/XRef.cc | 55 + +++++++++++++++++++++++++++++++++++++++++++++++++++---- + poppler/XRef.h | 4 ++++ + 4 files changed, 72 insertions(+), 4 deletions(-) + +commit 3a8e1ba03cdec6412dd0b79f0cc59a4cd97dd4e7 +Author: Brad Hards <bradh@frogmouth.net> +Date: Mon Jul 4 11:38:22 2005 +0000 + + A couple more little changes. + + ChangeLog | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit a44bd0b45bb89f29ddca5d0e8986a8de50f9db39 +Author: Brad Hards <bradh@frogmouth.net> +Date: Mon Jul 4 11:37:21 2005 +0000 + + Change path to sample file to point to test module + + qt4/tests/check_orientation.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2a7079087c35651c242d3843c94703a3199e61ca +Author: Brad Hards <bradh@frogmouth.net> +Date: Mon Jul 4 11:36:13 2005 +0000 + + Fix typo causing failure to pick up upside down pages. + + qt4/src/poppler-page.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 529a548044ae721a414c5b8e768c0498b1e6830b +Author: Brad Hards <bradh@frogmouth.net> +Date: Mon Jul 4 08:30:29 2005 +0000 + + Update to reflect recent changes + + ChangeLog | 30 +++++++++++++++++++++++++++++- + qt4/tests/.cvsignore | 2 ++ + 2 files changed, 31 insertions(+), 1 deletion(-) + +commit 08cca4670f8ae65333beacda85834112e76489d1 +Author: Brad Hards <bradh@frogmouth.net> +Date: Mon Jul 4 08:21:27 2005 +0000 + + Add in a simple demo/test application, similar to the pdffonts + application in xpdf. + + qt4/tests/Makefile.am | 9 +++++- + qt4/tests/poppler-fonts.cpp | 76 + +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 84 insertions(+), 1 deletion(-) + +commit 52af89d8303b50c45d5e4584d19ec8b7d7ebcf9b +Author: Brad Hards <bradh@frogmouth.net> +Date: Mon Jul 4 08:18:52 2005 +0000 + + Update to reflect changes to rendering API. + + qt4/tests/stress-poppler-qt4.cpp | 4 ++-- + qt4/tests/test-poppler-qt4.cpp | 3 ++- + 2 files changed, 4 insertions(+), 3 deletions(-) + +commit d42998d0fc32b1e21a2aeef1311e0baf508ade3f +Author: Brad Hards <bradh@frogmouth.net> +Date: Mon Jul 4 08:16:17 2005 +0000 + + Qt4 update. + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-document.cc complete Qt4 font metadata + handling + + * qt4/src/poppler-qt4.h: + * qt4/src/poppler-page.cc: change the render API to make + it more + Qt-like. + + qt4/src/poppler-document.cc | 7 ++++- + qt4/src/poppler-page.cc | 5 ++-- + qt4/src/poppler-qt4.h | 73 + ++++++++++++++++++++++++++++++++++++++++++--- + 3 files changed, 77 insertions(+), 8 deletions(-) + +commit 5d194b926d1ed642ed4bbd3304befa073d389cd4 +Author: Brad Hards <bradh@frogmouth.net> +Date: Mon Jul 4 08:10:16 2005 +0000 + + Change FontInfo::type() to return an enumerated value, + rather than a GooString. + + poppler/FontInfo.cc | 16 ++-------------- + poppler/FontInfo.h | 16 +++++++++++++--- + 2 files changed, 15 insertions(+), 17 deletions(-) + +commit 1303020b2e97bc110ccf045cd2811daf59ec72ce +Author: Brad Hards <bradh@frogmouth.net> +Date: Mon Jul 4 07:42:32 2005 +0000 + + Fix up the unit test, now that I have a real sample + file. + + qt4/tests/check_orientation.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 96fc0ea3fc6c9c7d933e9e0c02a622b2aeef7617 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Jul 1 04:57:49 2005 +0000 + + 2005-07-01 Kristian Høgsberg <krh@redhat.com> + + * poppler/TextOutputDev.cc: Make selection also work when + dragging + backwards in the text flow. Currently this is a big pile of + if-statements, and there is certainly room for improvement. + + ChangeLog | 6 +++ + poppler/TextOutputDev.cc | 129 + ++++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 111 insertions(+), 24 deletions(-) + +commit 06c49c496f28aba608101adcecd8cec34937ac78 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Jun 30 19:44:33 2005 +0000 + + 2005-06-30 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.h: * glib/poppler-page.cc + (poppler_page_copy_to_pixbuf): Fix splash compilation + (patch from + Marco). + (poppler_page_render_to_pixbuf): Drop dest_x and dest_y + coordinates from this function. This functionality can be + achieved using a sub-GdkPixbuf. + + * glib/test-poppler-glib.c (main): Update test case. + + ChangeLog | 11 +++++++++++ + NEWS | 6 ++++++ + glib/poppler-page.cc | 27 ++++++++++----------------- + glib/poppler-page.h | 4 +--- + glib/test-poppler-glib.c | 2 +- + 5 files changed, 29 insertions(+), 21 deletions(-) + +commit b126785aeda6b5576a13fc3f3853b027bd7dd306 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Jun 30 00:36:01 2005 +0000 + + 2005-06-29 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-private.h: Move TextOutputDev.h include + here from + poppler-page.cc + + ChangeLog | 5 +++++ + glib/poppler-page.cc | 1 - + glib/poppler-private.h | 1 + + 3 files changed, 6 insertions(+), 1 deletion(-) + +commit b15a8caf003d7d0631d4f78db5ab54e55a5a000a +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Jun 29 21:24:48 2005 +0000 + + 2005-06-29 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler-private.h: + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: + * poppler/Page.cc: + * poppler/Page.h: + * poppler/TextOutputDev.cc: + * poppler/TextOutputDev.h: Add support for rendering real + selection (based on text flow). + + ChangeLog | 20 ++- + configure.ac | 4 +- + glib/poppler-page.cc | 224 +++++++++++++++++++------ + glib/poppler-page.h | 65 ++++---- + glib/poppler-private.h | 3 + + poppler/CairoOutputDev.cc | 13 +- + poppler/CairoOutputDev.h | 2 +- + poppler/Page.cc | 59 +++++-- + poppler/Page.h | 12 ++ + poppler/TextOutputDev.cc | 414 + +++++++++++++++++++++++++++++++++++++++++++++- + poppler/TextOutputDev.h | 38 ++++- + 11 files changed, 743 insertions(+), 111 deletions(-) + +commit 3b5e20465e482eb0e75a106697ee94d60aea2fdc +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 28 22:51:29 2005 +0000 + + Forgot assigning type on copy constructor + + poppler/FontInfo.cc | 1 + + 1 file changed, 1 insertion(+) + +commit e512cd1832a0e6d15149e12e8e67a39d335efc86 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 28 22:49:14 2005 +0000 + + Add FontInfo::getType() + + ChangeLog | 3 +++ + poppler/FontInfo.cc | 4 ++++ + poppler/FontInfo.h | 2 ++ + 3 files changed, 9 insertions(+) + +commit 8aeb5205f2876a9dc36eb1dc1e361bb87adf4e31 +Author: Albert Astals Cid <aacid@kde.org> +Date: Tue Jun 28 22:00:05 2005 +0000 + + use transformation matrix for image rendering in Arthur backend + + ChangeLog | 4 ++++ + poppler/ArthurOutputDev.cc | 12 +++++++----- + 2 files changed, 11 insertions(+), 5 deletions(-) + +commit a221d06fdc7b0688ca0744a1d6ad49d472c7f12c +Author: Brad Hards <bradh@frogmouth.net> +Date: Tue Jun 28 10:59:14 2005 +0000 + + Reduce cvs up noise + + .cvsignore | 1 + + ChangeLog | 7 +++++++ + qt4/.cvsignore | 3 +++ + qt4/src/.cvsignore | 7 +++++++ + qt4/tests/.cvsignore | 8 ++++++++ + 5 files changed, 26 insertions(+) + +commit ea58a20bbcf450a1ecb8fe00e8162cfdf76105f1 +Author: Brad Hards <bradh@frogmouth.net> +Date: Tue Jun 28 10:00:09 2005 +0000 + + Initial import of Qt4 bindings, and for a Qt4 "Arthur" (QPainter) + backend renderer. + + The bindings are currently unstable - you can expect substantial + change + in both source and binary interfaces. + + The Arthur renderer currently does a reasonable job of rendering path + and fill, but the image rendering doesn't work (for reasons that + aren't + clear to me) and text rendering doesn't use the right glyphs - it just + draws with the current font. There is a lot of work to do on this + too. Help is, of coure, welcome. + + ChangeLog | 12 + + Makefile.am | 10 +- + configure.ac | 94 ++- + poppler-qt4.pc.in | 12 + + poppler/ArthurOutputDev.cc | 604 +++++++++++++++++++ + poppler/ArthurOutputDev.h | 133 +++++ + poppler/Makefile.am | 20 + + qt4/Makefile.am | 1 + + qt4/src/Doxyfile | 1212 + ++++++++++++++++++++++++++++++++++++++ + qt4/src/Makefile.am | 22 + + qt4/src/poppler-document.cc | 309 ++++++++++ + qt4/src/poppler-page.cc | 170 ++++++ + qt4/src/poppler-private.h | 36 ++ + qt4/src/poppler-qt4.h | 286 +++++++++ + qt4/tests/Makefile.am | 34 ++ + qt4/tests/check_orientation.cpp | 40 ++ + qt4/tests/stress-poppler-qt4.cpp | 70 +++ + qt4/tests/test-poppler-qt4.cpp | 121 ++++ + 18 files changed, 3183 insertions(+), 3 deletions(-) + +commit 61e9bc76eb2fcb0b4b899ebfad1cc71c59fc8274 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Jun 28 03:44:12 2005 +0000 + + 2005-06-27 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: Change CairoOutputDev to render + to a + given surface and let the user create that surface. + + * glib/poppler-document.cc: + * glib/poppler-page.cc: + * glib/poppler-private.h: Create the cairo image surface here + instead and pass it to the CairoOutputDev for rendering. + + * poppler/CairoOutputDevImage.cc: + * poppler/CairoOutputDevImage.h: + * poppler/CairoOutputDevX.cc: + * poppler/CairoOutputDevX.h: + * poppler/Makefile.am: Remove specialized cairo output + devices. + + ChangeLog | 17 ++++ + glib/poppler-document.cc | 2 +- + glib/poppler-page.cc | 21 +++- + glib/poppler-private.h | 4 +- + poppler/CairoOutputDev.cc | 24 +++-- + poppler/CairoOutputDev.h | 8 +- + poppler/CairoOutputDevImage.cc | 80 --------------- + poppler/CairoOutputDevImage.h | 44 --------- + poppler/CairoOutputDevX.cc | 216 + ----------------------------------------- + poppler/CairoOutputDevX.h | 117 ---------------------- + poppler/Makefile.am | 8 +- + 11 files changed, 54 insertions(+), 487 deletions(-) + +commit 8079dce3f0ed91dd531465f45c6d3c568ab4ecd1 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Jun 27 01:04:32 2005 +0000 + + 2005-06-26 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDev.h: Switch back to using drawChar() + for + text, but utilize the beginString() and endString() hooks + so we + can use cairo_show_glyphs() efficiently. + + ChangeLog | 7 +++ + poppler/CairoOutputDev.cc | 107 + ++++++++++++++-------------------------------- + poppler/CairoOutputDev.h | 12 +++++- + 3 files changed, 48 insertions(+), 78 deletions(-) + +commit 1aa48d6b7907a1d53830f0cf28085041f685368d +Author: Albert Astals Cid <aacid@kde.org> +Date: Sun Jun 26 23:35:26 2005 +0000 + + Add PageTransition class and PageTransition* Page::getTransition() + const; to the qt frontend. Code almost 100% copied from xpdf code + inside kpdf + + ChangeLog | 5 +++ + qt/poppler-page.cc | 121 + +++++++++++++++++++++++++++++++++++++++++++++++++++++ + qt/poppler-qt.h | 78 ++++++++++++++++++++++++++++++++++ + 3 files changed, 204 insertions(+) + +commit 9d4327eecd94299a3629b0814e84f981a4be1dfb +Author: Martin Kretzschmar <martink@gnome.org> +Date: Sun Jun 26 15:54:16 2005 +0000 + + add poppler-enums.[ch]. + + ChangeLog | 2 ++ + glib/.cvsignore | 8 +++++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit 768186514b9fc175cf330344408bb89ab4c909f3 +Author: Martin Kretzschmar <martink@gnome.org> +Date: Sun Jun 26 11:40:35 2005 +0000 + + require glib 2.4+ for g_value_take_string and G_DEFINE_TYPE. + + ChangeLog | 5 +++++ + configure.ac | 4 ++-- + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit 5d40e34a367212c39af06332879f26824d6d62d2 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Jun 26 00:01:39 2005 +0000 + + 2005-06-25 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/Error.h: Maybe fix build on Solaris. + + ChangeLog | 4 ++++ + poppler/Error.h | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit c2780a3b3f4615bb28bfe394d649b388db4ccf4d +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Jun 20 21:33:09 2005 +0000 + + 2005-06-20 Kristian Høgsberg <krh@redhat.com> + + * NEWS: + * configure.ac: Bump version to 0.3.3 and sum up changes since + last release. + + * glib/poppler-page.cc (poppler_page_find_text): Initialize + xMin + and yMin to avoid referencing unintialized memory (#3582). + + ChangeLog | 9 +++++++++ + NEWS | 10 ++++++++++ + configure.ac | 2 +- + glib/poppler-page.cc | 2 ++ + 4 files changed, 22 insertions(+), 1 deletion(-) + +commit 9023891f314ac37811b5c973be2e36b6de353cf2 +Author: Martin Kretzschmar <martink@gnome.org> +Date: Mon Jun 20 18:45:41 2005 +0000 + + (info_dict_get_string): convert from PDFDocEncoding to UTF-8. + + ChangeLog | 5 +++++ + glib/poppler-document.cc | 16 +++++++++++++++- + 2 files changed, 20 insertions(+), 1 deletion(-) + +commit bbf2fe757f0fd08d0e90e3810709ab7152c779c0 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Jun 20 17:58:38 2005 +0000 + + 2005-06-20 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler.h: Clean up glib rotation implementation and + add a + getter for rotation. Patch from Marco. + + ChangeLog | 7 ++++++ + glib/poppler-page.cc | 69 + +++++++++++++++++++++++++++++----------------------- + glib/poppler-page.h | 57 ++++++++++++++++++++++--------------------- + glib/poppler.h | 1 - + 4 files changed, 75 insertions(+), 59 deletions(-) + +commit c264d8a9f84587cd0f2ef67683a01fc8dd9395af +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Jun 20 17:38:27 2005 +0000 + + 2005-06-20 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-document.cc: + * poppler/FontInfo.cc: Fixes from Marco to handle fonts + without + name (typically type 3 fonts) and fix an iterator bug. + + ChangeLog | 6 ++++++ + glib/poppler-document.cc | 8 +++++++- + poppler/FontInfo.cc | 13 ++++++++++--- + 3 files changed, 23 insertions(+), 4 deletions(-) + +commit 4746e63a793a2881e904ac54d58b7d3e48b07dcf +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Jun 20 17:22:35 2005 +0000 + + 2005-06-20 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (poppler_page_get_link_mapping): Adjust + link coordinates so they're relative to bounding box + lower left + corner (#3396). + + ChangeLog | 6 ++++++ + glib/poppler-page.cc | 6 ++++++ + 2 files changed, 12 insertions(+) + +commit bada3d03583ef6ed34d2aa743de8fd9ca4a5c748 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Jun 17 05:30:56 2005 +0000 + + 2005-06-17 Kristian Høgsberg <krh@redhat.com> + + * autogen.sh: Patch from Emil Soleyman-Zomalan to enable + checks + for automake >= 1.7 (#3554). + + ChangeLog | 5 +++ + autogen.sh | 104 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 109 insertions(+) + +commit 25db42831ddde500697126352458e092a9b0ab9b +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Jun 15 15:02:46 2005 +0000 + + 2005-06-15 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-document.cc: + * glib/poppler-document.h: Patch from Marco to get initial + status + (open or closed) for bookmark subtrees. + ----------------------------------------------------------- + + ChangeLog | 6 ++++++ + glib/poppler-document.cc | 9 +++++++++ + glib/poppler-document.h | 1 + + 3 files changed, 16 insertions(+) + +commit e54e306ac5d603001fefda3b9ecd81821e4bd09e +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Jun 13 17:18:32 2005 +0000 + + Forgot to add new files. + + poppler/FontInfo.cc | 197 + ++++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/FontInfo.h | 51 ++++++++++++++ + 2 files changed, 248 insertions(+) + +commit 23e8ed5cbf4d7d999a8a1dcf714aaddaf339ceff +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Jun 13 16:09:33 2005 +0000 + + 2005-06-13 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-document.cc: + * glib/poppler-document.h: + * glib/poppler-private.h: + * glib/poppler.h: + * glib/test-poppler-glib.c: + * poppler/Makefile.am: Patch from Marco to extract font + info from + document. + + ChangeLog | 10 ++++ + glib/poppler-document.cc | 131 + +++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-document.h | 13 +++++ + glib/poppler-private.h | 7 +++ + glib/poppler.h | 2 + + glib/test-poppler-glib.c | 14 +++++ + poppler/Makefile.am | 2 + + 7 files changed, 179 insertions(+) + +commit fbb86d2983a28ad2c46b8c5d475a2df1f0f0e4b9 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Jun 8 14:35:46 2005 +0000 + + 2005-06-08 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoFontEngine.cc: Remember to delete tmpFileName. + Patch from Nikolai Weibull (#3491). + + ChangeLog | 5 +++++ + poppler/CairoFontEngine.cc | 37 +++++++++++++++++++------------------ + 2 files changed, 24 insertions(+), 18 deletions(-) + +commit 699b03025c1d38a42a49e39017097c5d0315fd6f +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Jun 7 20:25:48 2005 +0000 + + 2005-06-07 Kristian Høgsberg <krh@redhat.com> + + * qt/test-poppler-qt.cpp: Add stdlib.h include for exit(). + + ChangeLog | 4 ++++ + qt/test-poppler-qt.cpp | 1 + + 2 files changed, 5 insertions(+) + +commit 0017b1a72c58e2d016d22451079c466abdfff15c +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Jun 2 19:14:45 2005 +0000 + + 2005-06-02 Kristian Høgsberg <krh@redhat.com> + + * poppler/TextOutputDev.h: + * qt/poppler-qt.h: Patch from Stanislav Brabec + <sbrabec@suse.cz> + to fix gcc 4.0.1 warnings on undeclared friend classes. + + * test/gtk-splash-test.cc: Fix from Martin Kretzschmar + <martink@gnome.org> to compile with OPI enabled (#2911). + + ChangeLog | 9 +++++++++ + poppler/TextOutputDev.h | 3 +++ + qt/poppler-qt.h | 2 ++ + test/gtk-splash-test.cc | 2 +- + 4 files changed, 15 insertions(+), 1 deletion(-) + +commit 47c3b4ec2c7691e44f5100b1f5956df0005467c8 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Jun 2 18:49:55 2005 +0000 + + 2005-06-02 Kristian Høgsberg <krh@redhat.com> + + Patch from Stanislav Brabec <sbrabec@suse.cz>: + + * configure.ac: + * poppler-cairo.pc.in: + * poppler-glib.pc.in: + * poppler-qt.pc.in: + * poppler-splash.pc.in: Misc fixes to pkg-config files. + + ChangeLog | 10 ++++++++++ + configure.ac | 6 ++++-- + poppler-cairo.pc.in | 3 +-- + poppler-glib.pc.in | 4 ++-- + poppler-qt.pc.in | 1 + + poppler-splash.pc.in | 3 +-- + 6 files changed, 19 insertions(+), 8 deletions(-) + +commit 9f0da96dd005defd5d82dd05b627ff1925430215 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Thu Jun 2 00:35:44 2005 +0000 + + 2005-06-01 Jeff Muizelaar <jeff@infidigm.net> + + * poppler/Error.cc: + * poppler/Error.h: Make error handling function setable + through + setErrorFunction. + + Based on a patch by Albert Astals Cid. + + ChangeLog | 8 ++++++++ + poppler/Error.cc | 29 ++++++++++++++++++++--------- + poppler/Error.h | 2 ++ + 3 files changed, 30 insertions(+), 9 deletions(-) + +commit f688aa11d066f1c6f4115cbdb604ac61fb8b5146 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sun May 29 14:59:34 2005 +0000 + + 2005-05-29 Kristian Høgsberg <krh@redhat.com> + + * glib/*: Add more meta data properties to poppler document. + Patch by Emil Soleyman-Zomalan (#3359). + + ChangeLog | 5 ++ + glib/poppler-document.cc | 155 + ++++++++++++++++++++++++++++++++++++++++++++++- + glib/poppler.gidl | 5 ++ + glib/test-poppler-glib.c | 46 +++++++++----- + 4 files changed, 194 insertions(+), 17 deletions(-) + +commit 9e6eeec574d48d2341ee620e16360d3b21c40103 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu May 26 13:03:35 2005 +0000 + + 2005-05-26 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoOutputDev.cc (clip): Remove snapToGrid + so clip() + prototype matches what Gfx actually calls (fixes clipping). + + * poppler/CairoOutputDev.cc: Update fill color, stroke + color, fill + opacity and stroke opacity from GfxState on restore, + since they + aren't handled by cairo_restore() (#3362). + + * poppler/CairoOutputDev.cc: Comment out tolerance setting + until + we figure out how cairo settings relate to pdf settings. + + * poppler/CairoOutputDev.cc: Support fill and stroke opacity. + + ChangeLog | 12 ++++++++++++ + poppler/CairoOutputDev.cc | 41 ++++++++++++++++++++++++++++++----------- + poppler/CairoOutputDev.h | 6 +++++- + 3 files changed, 47 insertions(+), 12 deletions(-) + +commit 89a633edd860e3c6ded1e468edf6f28cfcb43d0e +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu May 26 12:52:38 2005 +0000 + + 2005-05-26 Kristian Høgsberg <krh@redhat.com> + + * poppler/GfxState.cc: + * poppler/GfxState.h: Add GfxColorSpace::getRGBLine here and + implement in subclasses. + + * poppler/CairoOutputDev.cc (drawImage): Use getRGBLine here. + + ChangeLog | 8 +++ + poppler/CairoOutputDev.cc | 66 +++++++++---------- + poppler/GfxState.cc | 160 + +++++++++++++++++++++++++++++++++++++++++++++- + poppler/GfxState.h | 14 ++++ + 4 files changed, 212 insertions(+), 36 deletions(-) + +commit 4d8224819da7a85e4d99f96c9bbb047ece58130a +Author: Jonathan Blandford <jrb@redhat.com> +Date: Mon May 23 04:23:53 2005 +0000 + + Mon May 23 00:22:41 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/poppler-document.h: Add a permissions flag to the glib + bindings. + + ChangeLog | 5 +++++ + glib/poppler-document.cc | 24 ++++++++++++++++++++++++ + glib/poppler-document.h | 16 +++++++++------- + 3 files changed, 38 insertions(+), 7 deletions(-) + +commit 1f677e2f60634a7d0c5e0e0d2125ab15c2722979 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sat May 21 21:33:06 2005 +0000 + + 2005-05-21 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-document.cc (poppler_ps_file_new): Fix + off-by-one + error spotted by Jürg Billeter. + ----------------------------------------------------- + + ChangeLog | 5 +++++ + glib/poppler-document.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 0bbf2f08173866cde9b097eeeb1f4218a396588d +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 20 20:48:52 2005 +0000 + + 2005-05-20 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoOutputDev.cc: Account for different row + vs. column + vector conventions between cairo and poppler. + + ChangeLog | 3 +++ + poppler/CairoOutputDev.cc | 18 +++++++++--------- + 2 files changed, 12 insertions(+), 9 deletions(-) + +commit da44ec7e8de58e55e55b1f780bc3f4bc8307874f +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 20 18:38:10 2005 +0000 + + 2005-05-20 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoFontEngine.cc: Only get the code to gid map if + we're using freetype 2.1.7 or older (#3340). + + ChangeLog | 5 +++++ + poppler/CairoFontEngine.cc | 13 ++++++++----- + 2 files changed, 13 insertions(+), 5 deletions(-) + +commit 6fe29cf0a7e54b8d294471a0f94eb9e989ad1d7f +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu May 19 05:18:04 2005 +0000 + + Add bugzilla number. + + ChangeLog | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 42de1348622cf86a87bc22941bd48bffa943dac9 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu May 19 05:16:22 2005 +0000 + + 2005-05-19 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoFontEngine.cc: Only cast to Gfx8BitFont when we + know for sure we have a truetype font. + GfxCIDFont::getCIDToGIDLen() can return 0 in which case + codeToGID + will be NULL, and we end up casting it to a Gfx8BitFont. + + ChangeLog | 7 +++++++ + poppler/CairoFontEngine.cc | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit afc05387c94a76ff0ed69b3f5d9a69ddd1448e83 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed May 18 17:39:59 2005 +0000 + + 2005-05-18 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Require cairo 0.5.0, bump release to 0.3.2. + + * NEWS: Sum up latest changes. + + * glib/poppler-document.cc (poppler_ps_file_new): Take a page + range here instead of just number of pages. + + ChangeLog | 9 +++++++++ + NEWS | 7 +++++++ + configure.ac | 6 +++--- + glib/poppler-document.cc | 15 ++++++++++----- + glib/poppler-document.h | 1 + + 5 files changed, 30 insertions(+), 8 deletions(-) + +commit 420134a194af9161282ccfe329d17adef8d325f2 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue May 17 23:38:27 2005 +0000 + + 2005-05-17 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoOutputDevX.cc: + * test/gtk-cairo-test.cc: Chase the cairo xlib constructor + again. + + ChangeLog | 5 +++++ + poppler/CairoOutputDevX.cc | 5 +++-- + test/gtk-cairo-test.cc | 5 +++-- + 3 files changed, 11 insertions(+), 4 deletions(-) + +commit 6fd62953a910dcfb4abd9de5ea18285b8fa5d202 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon May 16 23:16:15 2005 +0000 + + Add bug number and attribution to ChangeLog entry. + + ChangeLog | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 6d7f624c13e8a9a8251ac97388cd80e418c70250 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon May 16 21:56:31 2005 +0000 + + 2005-05-16 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Check for glib-mkenums. + + * glib/Makefile.am (poppler-enums.h): Generate glib enums at + compile time. + + * glib/poppler-enums.c: + * glib/poppler-enums.h: Removed. + + ChangeLog | 8 +++ + configure.ac | 3 + + glib/.cvsignore | 1 + + glib/Makefile.am | 67 ++++++++++++------ + glib/poppler-enums.c | 189 + --------------------------------------------------- + glib/poppler-enums.h | 49 ------------- + 6 files changed, 57 insertions(+), 260 deletions(-) + +commit 2801b54a944fc9e1072c5dcb9f1153a0c9f42de5 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon May 16 20:27:51 2005 +0000 + + 2005-05-16 Kristian Høgsberg <krh@redhat.com> + + * test/gtk-cairo-test.cc: Update this test case also. + + ChangeLog | 2 ++ + test/gtk-cairo-test.cc | 5 +++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 8753ae8ba20fcceaef3ef1dda89129f0456fccf6 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon May 16 19:06:00 2005 +0000 + + 2005-05-16 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoOutputDevX.cc: Track changes to cairo Xlib + surface + constructors. + + * poppler/CairoFontEngine.cc (cairo_font_face_destroy): + Make this + static. + + ChangeLog | 8 ++++++++ + poppler/CairoFontEngine.cc | 2 +- + poppler/CairoOutputDevX.cc | 5 +++-- + 3 files changed, 12 insertions(+), 3 deletions(-) + +commit 2e17106ef4711097104a561d5be49980f8b2f5ab +Author: Jonathan Blandford <jrb@redhat.com> +Date: Fri May 13 03:47:36 2005 +0000 + + whoops! commit the right file. + + glib/poppler.gidl | 212 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + glib/test.gidl | 23 ------ + 2 files changed, 212 insertions(+), 23 deletions(-) + +commit 19b62e1c8ea8ce042ac089defe94f756dcaf194e +Author: Jonathan Blandford <jrb@redhat.com> +Date: Fri May 13 03:25:32 2005 +0000 + + Thu May 12 23:10:45 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/poppler.gidl: add metadata file. + + ChangeLog | 4 ++++ + glib/test.gidl | 23 +++++++++++++++++++++++ + 2 files changed, 27 insertions(+) + +commit bef5a548f3b21e7220079155e9b5054fb0c6c3c7 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu May 12 21:26:25 2005 +0000 + + 2005-05-12 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoOutputDev.cc: + * poppler/CairoOutputDevX.cc: + * poppler/CairoOutputDevImage.cc: + * test/gtk-cairo-test.cc: Update to latest cairo changes, + patch + from Jens Taprogge (#3281) + + ChangeLog | 8 ++++++++ + poppler/CairoOutputDev.cc | 22 +++++++++++----------- + poppler/CairoOutputDevImage.cc | 11 ++++++----- + poppler/CairoOutputDevX.cc | 7 +++++-- + test/gtk-cairo-test.cc | 8 +++++--- + 5 files changed, 35 insertions(+), 21 deletions(-) + +commit c10ea2dd9bffaf9af023612ef196bab2b204d3e1 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed May 11 20:01:43 2005 +0000 + + 2005-05-11 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler.cc (poppler_get_backend, poppler_get_version): + Add + these functions so it's easy to tell if poppler is using + cairo or + splash and what version. + + * glib/test-poppler-glib.c (main): Print out version and + backend. + + ChangeLog | 8 ++++++++ + glib/poppler-enums.c | 26 ++++++++++++++++++++++++++ + glib/poppler-enums.h | 15 +++++++++++++++ + glib/poppler.cc | 21 +++++++++++++++++++++ + glib/poppler.h | 11 +++++++++++ + glib/test-poppler-glib.c | 9 ++++++++- + 6 files changed, 89 insertions(+), 1 deletion(-) + +commit 7d189e33cfa68e722561e9398ad85a77b538ab14 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri May 6 16:38:57 2005 +0000 + + 2005-05-06 Kristian Høgsberg <krh@redhat.com> + + * glib/Makefile.am (libpoppler_glib_la_LIBADD): Link + poppler-glib + against poppler. + + * qt/Makefile.am (libpoppler_qt_la_LIBADD): Ditto for qt. + + * poppler-glib.pc (Libs): Drop -lpoppler from link. + + * poppler-qt.pc (Libs): Ditto for qt. + + * configure.ac: Test for both libqt-mt.la and libqt-mt.so + in that + order. + + ChangeLog | 14 ++++++++++++++ + configure.ac | 8 +++++++- + glib/Makefile.am | 1 + + poppler-glib.pc.in | 2 +- + poppler-qt.pc.in | 2 +- + qt/Makefile.am | 1 + + qt/test-poppler-qt.cpp | 1 + + 7 files changed, 26 insertions(+), 3 deletions(-) + +commit c937e63f17a096b94a554103476ecb9ab1b71b90 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed May 4 20:08:41 2005 +0000 + + 2005-05-04 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask, + CairoOutputDev::drawImage): Track cairo cvs API changes; use + cairo_mask() and cairo_paint() for drawing image masks + and images. + + ChangeLog | 6 +++ + poppler/CairoOutputDev.cc | 98 + ++++++++++++++++++++++++----------------------- + 2 files changed, 57 insertions(+), 47 deletions(-) + +commit c142773ad30b409d8169a53921e731305de46e50 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed May 4 19:28:07 2005 +0000 + + 2005-05-04 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoOutputDev.cc: Fix matrix convention confusion. + + ChangeLog | 4 ++++ + poppler/CairoOutputDev.cc | 4 ++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 28760927d724231d0137ca7ecc66c6c2250dff0d +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed May 4 19:11:11 2005 +0000 + + 2005-05-04 Kristian Høgsberg <krh@redhat.com> + + Patches from Albert Astals Cid: + + * qt/poppler-page.cc (getText): Use QString::fromUtf8() + instead of + implicit latin1 cast constructor. + + * qt/test-poppler-qt.cpp (main): Use a QLabel for showing text + instead of qDebug. + + ChangeLog | 10 ++++++++++ + qt/poppler-page.cc | 5 ++--- + qt/test-poppler-qt.cpp | 6 +++++- + 3 files changed, 17 insertions(+), 4 deletions(-) + +commit fd36522375bcf436639b8731acb3ad22c03c03f4 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Wed May 4 06:32:38 2005 +0000 + + Wed May 4 02:31:05 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/poppler-document.cc: + * glib/poppler-document.h: + * glib/poppler-enums.c: (poppler_permissions_get_type): + * glib/poppler-enums.h: + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler.h: + + Register a bunch of boxed types to test introspection, and for + LBs. Also, remove unused 'popper_document_save()' (-: + + ChangeLog | 13 ++++++++ + glib/poppler-document.cc | 48 ++++++++++++++++------------ + glib/poppler-document.h | 18 +++++++++-- + glib/poppler-enums.c | 19 +++++++++++ + glib/poppler-enums.h | 2 ++ + glib/poppler-page.cc | 83 + ++++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-page.h | 36 ++++++++++++++------- + glib/poppler.h | 12 ++++--- + 8 files changed, 193 insertions(+), 38 deletions(-) + +commit 132647f8311c07b1f95ee4fca185e9774aae4913 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon May 2 05:39:11 2005 +0000 + + 2005-05-01 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoFontEngine.cc: + * poppler/CairoFontEngine.h: + * poppler/CairoOutputDev.cc: Back out workaround for cairo + 0.4.0 + font API and port to new cairo head. + + ChangeLog | 7 +++++ + configure.ac | 4 +-- + poppler/CairoFontEngine.cc | 67 + +++++++++++++++++------------------------- + poppler/CairoFontEngine.h | 12 ++++---- + poppler/CairoOutputDev.cc | 39 ++++++++++++++---------- + poppler/CairoOutputDevImage.cc | 2 +- + 6 files changed, 66 insertions(+), 65 deletions(-) + +commit 595c18c038f8dcef73fe58612fc8b93f891e65a1 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Mon May 2 00:44:26 2005 +0000 + + 2005-05-01 Jeff Muizelaar <jeff@infidigm.net> + + * splash/SplashFTFont.cc (SplashFTFont::getGlyphPath): + Use FT_LOAD_NO_BITMAP to make sure we get outlines loaded + instead + of bitmaps for use in FT_Outline_Decompose. + + Patch from Albert Astals Cid. + + ChangeLog | 8 ++++++++ + splash/SplashFTFont.cc | 2 +- + 2 files changed, 9 insertions(+), 1 deletion(-) + +commit 49d89ca0ed3986bec7468f6c0ed295e84ba67239 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun May 1 21:54:55 2005 +0000 + + 2005-05-01 Jeff Muizelaar <jeff@infidigm.net> + + * goo/gmem.c: (gmalloc), (grealloc), (gfree): + * goo/gmem.h: make memory functions use size_t instead of int. + + Patch from Takashi Iwai through Albert Astals Cid. + + ChangeLog | 7 +++++++ + goo/gmem.c | 10 +++++----- + goo/gmem.h | 4 ++-- + 3 files changed, 14 insertions(+), 7 deletions(-) + +commit 14d618bece894e4c6bed0f179a8fda4db5a67c9d +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Apr 30 19:53:57 2005 +0000 + + 2005-04-30 Jeff Muizelaar <jeff@infidigm.net> + + * qt/poppler-document.cc (Document::unlock) : + * qt/poppler-qt.h (Document::unlock): + Add const to the password argument. + + Patch from Albert Astals Cid. + + ChangeLog | 8 ++++++++ + qt/poppler-document.cc | 2 +- + qt/poppler-qt.h | 2 +- + 3 files changed, 10 insertions(+), 2 deletions(-) + +commit 1e66da32964cc76c6ed3773574f422b4608cb0e1 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Apr 30 17:31:47 2005 +0000 + + 2005-04-30 Jeff Muizelaar <jeff@infidigm.net> + + * fofi/FoFiType1.cc (FoFiType1::parse): + Don't assume Encoding array of Type1 fonts end in "foo def". + http://partners.adobe.com/public/developer/en/font/T1_SPEC.PDF + says + "This sequence of assignments must be followed by an instance + of the + token def or readonly; such a token may not occur within + the sequence + of assignments." so it must end with "readonly" "def" + "readonly def" + (That is what most fonts are using and this is why it was not + crashing) + + Patch from Albert Astals Cid. + + ChangeLog | 13 +++++++++++++ + fofi/FoFiType1.cc | 14 +++++++++++--- + 2 files changed, 24 insertions(+), 3 deletions(-) + +commit 0b532db77ef41937dd5be30d15c96557d81eceb2 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Fri Apr 29 19:37:07 2005 +0000 + + Fri Apr 29 14:54:44 2005 Jonathan Blandford <jrb@redhat.com> + + * goo/GooTimer.h: New class to do simple timing checks. + + * glib/poppler-document.c: Patch from Martin Kretzschmar + to really + set the PDF version correct. Third time's the charm. + + ChangeLog | 7 ++++++ + glib/poppler-document.cc | 4 ++- + goo/GooTimer.cc | 63 + ++++++++++++++++++++++++++++++++++++++++++++++++ + goo/GooTimer.h | 40 ++++++++++++++++++++++++++++++ + goo/Makefile.am | 2 ++ + 5 files changed, 115 insertions(+), 1 deletion(-) + +commit 38948ea6f9ef76dae9b8a7156fe1ef32a0457380 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Apr 29 03:57:16 2005 +0000 + + 2005-04-29 Kristian Høgsberg <krh@bitplanet.net> + + * configure.ac: Bump release to 0.3.1. + + * NEWS: Write up news for 0.3.1 release. + + ChangeLog | 6 ++++++ + NEWS | 6 ++++++ + configure.ac | 2 +- + 3 files changed, 13 insertions(+), 1 deletion(-) + +commit af65146c92682a3af06e9d3147426445c78309de +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Apr 28 23:03:06 2005 +0000 + + 2005-04-28 Kristian Høgsberg <krh@redhat.com> + + Patch from Martin Kretzschmar: + + * poppler/GlobalParams.cc: use UTF-8 as the default text + encoding. + Fixes Bug 2934. + + ChangeLog | 7 +++++++ + poppler/GlobalParams.cc | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +commit c2db3e1b297a9dc0accd0d8a1366970d45705c8f +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Apr 27 20:56:18 2005 +0000 + + 2005-04-27 Jeff Muizelaar <jeff@infidigm.net> + + * configure.ac: + * poppler/FlateStream.cc: + * poppler/FlateStream.h: + * poppler/Makefile.am: + * poppler/Stream.cc: + * poppler/Stream.h: Add a reimplementation of FlateStream + using + zlib. + + ChangeLog | 10 +++++ + configure.ac | 29 ++++++++++++++ + poppler/FlateStream.cc | 107 + +++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/FlateStream.h | 68 +++++++++++++++++++++++++++++++ + poppler/Makefile.am | 17 +++++++- + poppler/Stream.cc | 6 +++ + poppler/Stream.h | 2 + + 7 files changed, 237 insertions(+), 2 deletions(-) + +commit bc0afe524c2b87af191d83fc9e9bcdc8a6ce4042 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Apr 27 18:53:20 2005 +0000 + + 2005-04-27 Kristian Høgsberg <krh@redhat.com> + + * poppler/Catalog.cc (NameTree::lookup): Fix bsearch return + value + NULL check. Found by Albert Astals Cid. + + ChangeLog | 5 +++++ + poppler/Catalog.cc | 8 ++++---- + 2 files changed, 9 insertions(+), 4 deletions(-) + +commit 3c37dc350d54e5a1035aecfba5bfa394f931cf51 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Tue Apr 26 17:17:05 2005 +0000 + + Tue Apr 26 13:13:42 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/test-poppler-glib.c (main): add a quick dump-to-text + test. + + ChangeLog | 4 ++++ + glib/test-poppler-glib.c | 20 ++++++++++++++++++++ + 2 files changed, 24 insertions(+) + +commit 44b800d520f90ffd143255d2c23835ea357c195b +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Apr 25 18:04:32 2005 +0000 + + Actually commit the qt/Makefile.am change advertised in the ChangeLog. + + qt/Makefile.am | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 437bec03dd2ab3cdf6215f9ad443b7f21ce84e18 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sun Apr 24 19:56:17 2005 +0000 + + 2005-04-24 Kristian Høgsberg <krh@redhat.com> + + * qt/Makefile.am (libpoppler_qt_la_SOURCES): Add + poppler-private.h + to SOURCES. + + ChangeLog | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 9b2b1244ed5f30a99120aaee49c72f7cb6a4f556 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sat Apr 23 20:16:02 2005 +0000 + + 2005-04-23 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoFontEngine.cc: Use the right fileName for + loading + CID fonts (#3114). + + ChangeLog | 5 +++++ + poppler/CairoFontEngine.cc | 11 +++++++++-- + 2 files changed, 14 insertions(+), 2 deletions(-) + +commit e4516d728a4d1bc85831d5d00b6d6b8d49c79308 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sat Apr 23 00:09:05 2005 +0000 + + 2005-04-22 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Actually commit version number bump. + + ChangeLog | 4 ++++ + NEWS | 2 +- + configure.ac | 2 +- + 3 files changed, 6 insertions(+), 2 deletions(-) + +commit c20448cb26fa1c309d726f272ddf1227f5a0e6ea +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Apr 22 17:29:49 2005 +0000 + + 2005-04-22 Martin Kretzschmar <martink@gnome.org> + + * poppler/CairoFontEngine.cc: declare matrix variable + before the + first goto. Fixes build with gcc 3.3. + + ChangeLog | 5 +++++ + poppler/CairoFontEngine.cc | 3 ++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit 42ecccf9b454893797e3d62f0f1c0a3276689e51 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Apr 22 04:09:23 2005 +0000 + + Fri Apr 22 00:01:40 2005 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoFontEngine.cc: Hack around semi-broken + cairo-0.4.0 + font API to fix the problem where some glyphs would show up + at the + wrong sizes. We now create an FT_Face for each size and font + combination we encounter, since an FT_Face can't be shared + between + several cairo_font_t. + + ChangeLog | 8 +++++ + poppler/CairoFontEngine.cc | 79 + ++++++++++++++++++++-------------------------- + poppler/CairoFontEngine.h | 23 ++++++-------- + poppler/CairoOutputDev.cc | 18 +++++------ + 4 files changed, 61 insertions(+), 67 deletions(-) + +commit 7a703616d9497eba4d7d318da9918dae9cbe8f12 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Apr 21 19:50:45 2005 +0000 + + Thu Apr 21 15:43:52 2005 Kristian Høgsberg <krh@redhat.com> + + * poppler/Outline.cc: + * poppler/Outline.h: Implement the documented behaviour for + Outline::getItems() and OutlineItem::getKids() and make + documentation more precise (Patch from Marco). + + ChangeLog | 7 +++++++ + poppler/Outline.cc | 6 ++++++ + poppler/Outline.h | 7 ++++--- + 3 files changed, 17 insertions(+), 3 deletions(-) + +commit 5c89902c5ee2cf13536225c141768b29505815ce +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Apr 21 06:35:33 2005 +0000 + + Thu Apr 21 02:25:20 2005 Kristian Høgsberg <krh@redhat.com> + + * poppler/CairoFontEngine.cc (CairoFont::getFont): Cache + cairo_font_t's for a given CairoFont. With this patch + cairo will + recognize glyphs coming from the same font as such and + the glyph + cache will actually work. + + * glib/poppler-document.cc (poppler_document_new_from_file): + Add + output device (cairo or splash) to PopplerDocument and + initialize + it in the constructor. + + * glib/poppler-page.cc (splash_render_to_pixbuf, + cairo_render_to_pixbuf): Use output device from associated + poppler + document instead of creating a new one. + + * poppler-glib.pc.in (Requires): Add Requires: field. + + * poppler/Page.cc (loadThumb): Remove unecessary and buggy + call to + Stream::addFilters(), reported by Ryan Lortie (#3046). + + ChangeLog | 7 ++++++- + NEWS | 12 +++--------- + poppler/CairoFontEngine.cc | 45 + +++++++++++++++++++++++++++++++++++++++------ + poppler/CairoFontEngine.h | 9 ++++++++- + poppler/CairoOutputDev.cc | 9 +-------- + 5 files changed, 57 insertions(+), 25 deletions(-) + +commit 71c1563bb0462154cb7caa4356d8f8d049073ac4 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Apr 21 05:20:24 2005 +0000 + + Thu Apr 21 00:15:30 2005 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-document.cc (poppler_document_new_from_file): + Add + output device (cairo or splash) to PopplerDocument and + initialize + it in the constructor. + + * glib/poppler-page.cc (splash_render_to_pixbuf, + cairo_render_to_pixbuf): Use output device from associated + poppler + document instead of creating a new one. + + * poppler-glib.pc.in (Requires): Add Requires: field. + + * poppler/Page.cc (loadThumb): Remove unecessary and buggy + call to + Stream::addFilters(), reported by Ryan Lortie (#3046). + + ChangeLog | 15 +++++++++++++++ + NEWS | 15 +++++++++++++++ + glib/poppler-document.cc | 10 ++++++++++ + glib/poppler-page.cc | 22 ++-------------------- + glib/poppler-private.h | 13 +++++++++++++ + poppler-glib.pc.in | 1 + + poppler/CairoFontEngine.cc | 2 +- + poppler/Page.cc | 2 -- + 8 files changed, 57 insertions(+), 23 deletions(-) + +commit c6328cbc6cea05890b52a8302f8deba443959c03 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Apr 20 22:48:52 2005 +0000 + + 2005-04-13 Jeff Muizelaar <jrmuizel@nit.ca> + + * qt/poppler-page.cc (Page::getText): + * qt/poppler-qt.h: add a getText method for getting + the text on a page + + * qt/test-poppler-qt.c (PDFDisplay::PDFDisplay): + add the option to display the text on a page + + Patch from Albert Astals Cid. + + ChangeLog | 11 +++++++++++ + qt/poppler-page.cc | 37 +++++++++++++++++++++++++++++++++++++ + qt/poppler-qt.h | 20 ++++++++++++++++++++ + qt/test-poppler-qt.cpp | 40 ++++++++++++++++++++++++++++++---------- + 4 files changed, 98 insertions(+), 10 deletions(-) + +commit 86a32b65100a5baedd18ce0135703289839a317c +Author: Jonathan Blandford <jrb@redhat.com> +Date: Tue Apr 19 21:22:26 2005 +0000 + + Tue Apr 19 17:21:19 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/poppler-document.cc (poppler_document_get_property): + Use + %.2g instead. + + ChangeLog | 5 +++++ + glib/poppler-document.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 4e81624dcc2d5218f2f8bb4eaa992e724014a853 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Tue Apr 19 21:13:22 2005 +0000 + + Tue Apr 19 17:11:52 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/poppler-document.cc (poppler_document_get_property): + Use %g + instead of %f to avoid versioning like PDF-1.50000 + + ChangeLog | 5 +++++ + glib/poppler-document.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 6ef9d30f06be2bd8a9e1470d70f49843a7e432ac +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Apr 19 19:48:49 2005 +0000 + + Tue Apr 19 15:43:35 2005 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-action.cc (_poppler_action_new): Handle + NULL links + gracefully (fix from Jeff). + + ChangeLog | 5 +++++ + glib/poppler-action.cc | 7 ++++++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +commit 770b7310ce8b07f95960c2014bf3f6040c060ac4 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Apr 19 04:28:15 2005 +0000 + + Tue Apr 19 00:20:08 2005 Kristian Høgsberg <krh@redhat.com> + + * poppler/Catalog.cc: Fix from Marco to make sure we always + initialize Catalog::pageLabelInfo. + + ChangeLog | 5 +++++ + poppler/Catalog.cc | 3 +-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 49c10d9f2c4e0cef031f96929e38a14d7ce5af19 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Sat Apr 16 18:57:43 2005 +0000 + + Sat Apr 16 14:53:15 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/Makefile.am: Create poppler-enums.[ch] + + * glib/poppler.h: + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler-action.h: Try to clean up the headers a bit + + * glib/poppler-document.cc: + * glib/poppler-document.h: Add support for document data. + Implemented as a lot of GObject properties. + + * glib/poppler-enums.c: + * glib/poppler-enums.h: New autogenerated files. + + * glib/test-poppler-glib.c: Test the new document metadata. + Seems + to work nicely, other than the PDF string and View Prefs. + + * poppler/Catalog.cc: + * poppler/Catalog.h: Extend to support PageLayout. + + ChangeLog | 22 ++++++ + glib/Makefile.am | 32 +++++++- + glib/poppler-action.h | 15 ++-- + glib/poppler-document.cc | 196 + ++++++++++++++++++++++++++++++++++++++++++----- + glib/poppler-document.h | 43 +++++++++-- + glib/poppler-enums.c | 144 ++++++++++++++++++++++++++++++++++ + glib/poppler-enums.h | 32 ++++++++ + glib/poppler-page.cc | 3 - + glib/poppler-page.h | 1 + + glib/poppler.h | 7 ++ + glib/test-poppler-glib.c | 48 +++++++++++- + poppler/Catalog.cc | 17 ++++ + poppler/Catalog.h | 11 +++ + 13 files changed, 529 insertions(+), 42 deletions(-) + +commit f35c76cd3528f1e1de594e85e734ca23624b3a62 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Apr 15 02:25:10 2005 +0000 + + 2005-04-14 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler-private.h: + * glib/poppler.h: Patch from Marco Pesenti Gritti to set page + orientaton. + + ChangeLog | 8 ++++ + glib/poppler-page.cc | 109 + +++++++++++++++++++++++++++++++++++++++++++++---- + glib/poppler-page.h | 45 ++++++++++---------- + glib/poppler-private.h | 1 + + glib/poppler.h | 9 ++++ + 5 files changed, 142 insertions(+), 30 deletions(-) + +commit 538408a8845e167cc2d796ac8b8129d0a2e6a894 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Thu Apr 14 01:34:38 2005 +0000 + + 2005-04-13 Jeff Muizelaar <jrmuizel@nit.ca> + + * poppler/CairoOutputDevImage.cc (getBitmap): remove unused + SplashBitmap. Patch from Albert Astals Cid. + + ChangeLog | 5 +++++ + poppler/CairoOutputDevImage.cc | 2 -- + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 2903530492c24f3c7cb3bf3b993500694aaa27a8 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Apr 12 15:37:39 2005 +0000 + + 2005-04-12 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Add fontconfig to PKG_CHECK_MODULES for + the cairo + backend too, since we shouldn't depend on cairo.pc to pull + that in + for us. + + * poppler/Makefile.am (INCLUDES): Add $(splash_includes) to + INCLUDES to make sure the fontconfig include path is + added when + using the splash backend. + + ChangeLog | 10 ++++++++++ + configure.ac | 4 ++-- + poppler/Makefile.am | 1 + + 3 files changed, 13 insertions(+), 2 deletions(-) + +commit 0f7dd9a0512ff97293ee3f8a762b0049393b3cc1 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Apr 9 18:14:39 2005 +0000 + + 2005-04-09 Jeff Muizelaar <jrmuizel@nit.ca> + + * poppler-qt.h: + * poppler-document.cc (okToPrint, okToChange, okToCopy): + Patch from Albert Astals Cid adding more metadata exports + + ChangeLog | 6 ++++++ + qt/poppler-document.cc | 20 ++++++++++++++++++++ + qt/poppler-qt.h | 4 ++++ + 3 files changed, 30 insertions(+) + +commit dee72b531dab83a29c7675ae06ffe376e4498a4e +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Apr 8 21:09:27 2005 +0000 + + 2005-04-08 Kristian Høgsberg <krh@redhat.com> + + * poppler-qt.pc.in (Libs): Add -lpoppler to Libs. + + ChangeLog | 4 ++++ + poppler-qt.pc.in | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +commit df59ce3b1d5ca8cd46aaf5f189bc78953e21e1a9 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Fri Apr 8 03:30:33 2005 +0000 + + 2005-04-07 Jeff Muizelaar <jrmuizel@nit.ca> + + * configure.ac: redo the qt tests from Albert Astals Cid + + ChangeLog | 4 ++++ + configure.ac | 78 + ++++++++++++++++++++++++++++++++++++------------------------ + 2 files changed, 51 insertions(+), 31 deletions(-) + +commit 3f9dde10e4778255c468895942e45d1a2637af3a +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Fri Apr 8 03:11:00 2005 +0000 + + 2005-04-07 Jeff Muizelaar <jrmuizel@nit.ca> + + * qt/poppler-document.cc: + * qt/poppler-page.cc: + * qt/poppler-qt.h: + Patch from Albert Astals Cid adding consts and exporting + some more + metadata. + + ChangeLog | 8 ++++++++ + qt/poppler-document.cc | 21 ++++++++++++++++++--- + qt/poppler-page.cc | 6 +++--- + qt/poppler-qt.h | 15 +++++++++------ + 4 files changed, 38 insertions(+), 12 deletions(-) + +commit e79a8b946e0d04b32da0b4ceea1649efd203cb07 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Apr 7 22:01:51 2005 +0000 + + 2005-04-07 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-document.cc: + * glib/poppler-document.h: + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler-private.h: Print to PS support from Marco + Pesenti + Gritti. + + ChangeLog | 9 +++++++++ + glib/poppler-document.cc | 45 + +++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-document.h | 8 ++++++-- + glib/poppler-page.cc | 19 +++++++++++++++++++ + glib/poppler-page.h | 40 +++++++++++++++++++++------------------- + glib/poppler-private.h | 7 +++++++ + 6 files changed, 107 insertions(+), 21 deletions(-) + +commit 7319b66eb64e735ae8b811306eb76755f088385b +Author: Jonathan Blandford <jrb@redhat.com> +Date: Thu Apr 7 16:26:15 2005 +0000 + + Thu Apr 7 12:25:39 2005 Jonathan Blandford <jrb@redhat.com> + + * configure.ac: check for qt, not glib, when enabling the qt + subdir + + ChangeLog | 5 +++++ + configure.ac | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit e258ed0cb42d524ee39451f680ad4c067e7721da +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Apr 6 20:49:19 2005 +0000 + + 2005-04-06 Jeff Muizelaar <jrmuizel@nit.ca> + + * .cvsignore, glib/.cvsignore, qt/.cvsignore: + Add more things to .cvsignore. + Patch from Martin Kretzschmar. + + .cvsignore | 2 ++ + ChangeLog | 6 ++++++ + glib/.cvsignore | 7 +++++++ + qt/.cvsignore | 7 +++++++ + 4 files changed, 22 insertions(+) + +commit 2a5624a81aa84677a57e098d7d4045f44e3b6f3a +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Apr 6 20:35:03 2005 +0000 + + 2005-04-06 Jeff Muizelaar <jrmuizel@nit.ca> + + * poppler-page.cc (Page::Page, Page::~Page): + Construct and deconstruct the PageData object. + Patch from Albert Astals Cid. + + ChangeLog | 6 ++++++ + qt/poppler-page.cc | 6 ++++++ + qt/poppler-qt.h | 1 + + 3 files changed, 13 insertions(+) + +commit f983e3d317660653f2bfc56f9b06e2cec675beca +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Apr 6 14:39:40 2005 +0000 + + 2005-04-06 Jeff Muizelaar <jrmuizel@nit.ca> + + * Makefile.am, configure.ac: Add configuration for qt wrapper. + + * poppler-qt.pc.in: + * qt/Makefile.am: + * qt/poppler-document.cc: + * qt/poppler-page.cc: + * qt/poppler-private.h: + * qt/poppler-qt.h: + * qt/test-poppler-qt.cpp: + New files. + + ChangeLog | 13 +++ + Makefile.am | 13 ++- + configure.ac | 64 +++++++++++++- + poppler-qt.pc.in | 11 +++ + qt/Makefile.am | 32 +++++++ + qt/poppler-document.cc | 232 + +++++++++++++++++++++++++++++++++++++++++++++++++ + qt/poppler-page.cc | 66 ++++++++++++++ + qt/poppler-private.h | 32 +++++++ + qt/poppler-qt.h | 75 ++++++++++++++++ + qt/test-poppler-qt.cpp | 63 ++++++++++++++ + 10 files changed, 597 insertions(+), 4 deletions(-) + +commit d91dd69a7a0dd581c26728d2640e4d36a7ffe75f +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Apr 5 17:46:44 2005 +0000 + + 2005-04-05 Kristian Høgsberg <krh@redhat.com> + + * NEWS: Attempt to sum up changes since 0.1.2. + + * configure.ac: Bump release to 0.2.0, add AC_DEFINEs + for cairo + and splash availability. + + * poppler/CairoFontEngine.cc: Disable hinting. + + * glib/poppler-page.cc (poppler_page_render_to_pixbuf): Choose + either splash or cairo rendering, based on configure choice. + (cairo_render_to_pixbuf): New function to render using + the cairo + backend. + (splash_render_to_pixbuf): Split out the splash code to this + function. + + ChangeLog | 16 +++++ + NEWS | 6 +- + configure.ac | 16 +++-- + glib/Makefile.am | 17 ++++- + glib/poppler-page.cc | 152 + +++++++++++++++++++++++++++++++++-------- + poppler/CairoFontEngine.cc | 2 +- + poppler/CairoOutputDevImage.cc | 20 ++---- + poppler/CairoOutputDevImage.h | 3 +- + 8 files changed, 179 insertions(+), 53 deletions(-) + +commit b62b0cec2335d987b31fbb0043cb33db29cc6a13 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Apr 5 02:56:32 2005 +0000 + + 2005-04-04 Kristian Høgsberg <krh@redhat.com> + + * ChangeLog: Add this entry to test commit mailer script. + + ChangeLog | 2 ++ + 1 file changed, 2 insertions(+) + +commit 50b494266ce197fe88468ca2917b9910d77e5f98 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Apr 5 02:49:18 2005 +0000 + + 2005-04-04 Kristian Høgsberg <krh@redhat.com> + + * TODO: Add reminder about using PDF font descriptors with + fontconfig. + + ChangeLog | 3 +++ + TODO | 2 ++ + 2 files changed, 5 insertions(+) + +commit d3d12235bf4de48363571b3d992ea3bfc29e6529 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Apr 4 21:50:56 2005 +0000 + + 2005-04-04 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Add checks for mkstemp() and mkstemps(). + + * glib/poppler-page.cc (poppler_page_find_text): Reverse + y-coordinates so we return PDF style coordinates. + + From Maro Pesenti Gritti <mpgritti@gmail.com>: + + * configure.ac, poppler/Makefile.am: Check for fontconfig when + we're building the splash backend. + + * glib/poppler-page.cc (poppler_page_get_text): New + function to + select text on page. + + ChangeLog | 15 +++++++++++++++ + configure.ac | 5 ++++- + glib/poppler-page.cc | 48 + +++++++++++++++++++++++++++++++++++++++++++++--- + glib/poppler-page.h | 3 +++ + poppler/Makefile.am | 4 ++++ + 5 files changed, 71 insertions(+), 4 deletions(-) + +commit 2cb9d70678e33504246cbfbe0525c33f5e3b7736 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Apr 4 05:56:29 2005 +0000 + + 2005-04-04 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (poppler_page_find_text): Reverse + list of + matches so we get them in the right order. + + ChangeLog | 5 +++++ + glib/poppler-page.cc | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit 8c2a5ffb73c0f2d84adebcfbd43f8347ae8c8bbc +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sun Apr 3 18:17:55 2005 +0000 + + 2005-04-03 Martin Kretzschmar <martink@gnome.org> + + * poppler/DCTStream.h: Wrap #include <jpeglib.h> in extern "C" + Fixes build with unpatched libjpeg. + + ChangeLog | 5 +++++ + poppler/DCTStream.h | 2 ++ + 2 files changed, 7 insertions(+) + +commit 1879d82d9088aa36ef5e677f4bae44c84f90caa6 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Sat Apr 2 22:16:38 2005 +0000 + + 2005-04-02 Jeff Muizelaar <jrmuizel@nit.ca> + + * poppler/Page.h: + * poppler/Page.cc (Page::Page): + Some initial infrastructure for supporting transitions. + + ChangeLog | 6 ++++++ + poppler/Page.cc | 10 ++++++++++ + poppler/Page.h | 4 ++++ + 3 files changed, 20 insertions(+) + +commit fa4efbed51e12811070798a7cfb6b1f9e8d57abc +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Apr 1 00:32:34 2005 +0000 + + 2005-03-31 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (poppler_page_render_to_pixbuf): Clip + output to destination pixbuf and fix RGB order. + + ChangeLog | 5 +++++ + glib/poppler-page.cc | 38 +++++++++++++++++++++++--------------- + 2 files changed, 28 insertions(+), 15 deletions(-) + +commit bb508ded0b8c5806a9db1ec73e57b14268896911 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Mar 31 22:45:05 2005 +0000 + + 2005-03-31 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc (poppler_page_find_text): New + function to + seach a page for occurrences of a given text string. + + * glib/poppler-page.cc: Add g_return_if_fail() checks to + a couple + of functions. + + ChangeLog | 8 +++++ + glib/poppler-page.cc | 82 + ++++++++++++++++++++++++++++++++++++++++++------ + glib/poppler-page.h | 18 ++++++++--- + glib/test-poppler-glib.c | 19 +++++++++-- + 4 files changed, 109 insertions(+), 18 deletions(-) + +commit 0b4d481e9c79cb18cf41b503970801bbf4b95b3c +Author: Jonathan Blandford <jrb@redhat.com> +Date: Thu Mar 31 05:29:42 2005 +0000 + + Thu Mar 31 00:26:20 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/poppler-page.cc: + * glib/poppler-page.h (poppler_page_get_link_mapping, + poppler_page_free_link_mapping): New functions to get a + mapping of + links to locations on the current document. + :s + + ChangeLog | 7 +++++ + glib/poppler-page.cc | 85 + ++++++++++++++++++++++++++++++++++++++++++++++++---- + glib/poppler-page.h | 15 ++++++++++ + 3 files changed, 102 insertions(+), 5 deletions(-) + +commit c4e18f5a454794bd5e226f1106a54ccf807c6c3d +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Thu Mar 31 02:28:46 2005 +0000 + + 2005-03-30 Jeff Muizelaar <jrmuizel@nit.ca> + + * poppler/DCTStream.h: change x to unsigned int to eliminate + comparision warning + + ChangeLog | 5 +++++ + poppler/DCTStream.h | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit e6a2a588305b4797af901599eb6854028f2be476 +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Mar 30 18:43:44 2005 +0000 + + 2005-03-30 Jeff Muizelaar <jrmuizel@nit.ca> + + * poppler/Catalog.cc: delete pageLabelInfo on deconstruction + + ChangeLog | 4 ++++ + poppler/Catalog.cc | 1 + + 2 files changed, 5 insertions(+) + +commit a52905c0f0bf4d10d2103b80924a4de204d03836 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Wed Mar 30 04:08:26 2005 +0000 + + add this + + glib/poppler-action.cc | 285 + +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 285 insertions(+) + +commit 9542860a74076020b5727d4b761c08cdab42d69e +Author: Jonathan Blandford <jrb@redhat.com> +Date: Wed Mar 30 04:07:57 2005 +0000 + + add these + + glib/poppler-action.h | 157 + ++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 157 insertions(+) + +commit 07720f98eca8736695f7d0d8e98465d301e6b7cf +Author: Jonathan Blandford <jrb@redhat.com> +Date: Wed Mar 30 04:07:39 2005 +0000 + + Tue Mar 29 23:07:17 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/poppler-page.h: Reformat. + + ChangeLog | 4 ++++ + glib/poppler-page.h | 34 +++++++++++++++++----------------- + 2 files changed, 21 insertions(+), 17 deletions(-) + +commit 3437b9e122aa05f4ede24664ee5a9b2d423ef9c4 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Wed Mar 30 04:04:53 2005 +0000 + + Tue Mar 29 22:49:15 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/poppler-action.[ch]: New item to encapsulate links. + * glib/poppler-document.[ch] (poppler_index_iter_get_action): + New + function to get the action. Also, fix some warnings. + * glib/poppler-private.h (_poppler_action_new): New function. + * glib/test-poppler-glib.c: Fix warnings. + + ChangeLog | 8 +++++++ + glib/Makefile.am | 2 ++ + glib/poppler-document.cc | 57 + +++++++++++------------------------------------- + glib/poppler-document.h | 7 ++---- + glib/poppler-private.h | 12 ++++++++-- + glib/poppler.h | 1 + + glib/test-poppler-glib.c | 4 +++- + 7 files changed, 39 insertions(+), 52 deletions(-) + +commit cab0ec4d011c34b571050a446c6e3286cc8749c8 +Author: Jonathan Blandford <jrb@redhat.com> +Date: Tue Mar 29 18:49:26 2005 +0000 + + Tue Mar 29 02:36:00 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/poppler-document.[ch] (PopplerIndexIter): Add an + iter to + extract the index from the doc. Includes a bad hack, for now. + + Mon Mar 28 22:02:07 2005 Jonathan Blandford <jrb@redhat.com> + + * glib/poppler-page.cc: + * glib/poppler-page.h (poppler_page_get_thumbnail_size): New + function. + * poppler-glib.pc.in: add -lpoppler-glib to the libs line. + + ChangeLog | 12 ++++ + glib/poppler-document.cc | 160 + ++++++++++++++++++++++++++++++++++++++++++++++- + glib/poppler-document.h | 15 +++++ + glib/poppler-page.cc | 48 +++++++++++++- + glib/poppler-page.h | 3 + + poppler-glib.pc.in | 2 +- + 6 files changed, 236 insertions(+), 4 deletions(-) + +commit 2de98f3871bc4ea3e361ca4fe37f5b6561918c77 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Mar 28 07:49:54 2005 +0000 + + 2005-03-28 Kristian Høgsberg <krh@redhat.com> + + * poppler/Page.cc (loadThumb): Backend agnostic method for + extracting an embedded thumbnail iamge. + + * poppler/Dict.cc (lookupInt): New convenience method. + + * glib/poppler-page.cc (poppler_page_get_thumbnail): New glib + function for getting the embedded thumbnail image for a page. + + ChangeLog | 10 +++++ + glib/poppler-page.cc | 23 ++++++++++ + glib/poppler-page.h | 32 +++++++------- + glib/test-poppler-glib.c | 24 ++++++++--- + poppler/Dict.cc | 20 +++++++++ + poppler/Dict.h | 1 + + poppler/Page.cc | 109 + +++++++++++++++++++++++++++++++++++++++++++++++ + poppler/Page.h | 1 + + 8 files changed, 196 insertions(+), 24 deletions(-) + +commit 591055d1fbcd0b9c2bb11f14040568051c5976d1 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sat Mar 26 00:34:21 2005 +0000 + + 2005-03-25 Kristian Høgsberg <krh@redhat.com> + + * glib/Makefile.am (libpoppler_glib_la_SOURCES): Add + + * configure.ac: Check for fontconfig for glib bindings. + + ChangeLog | 4 ++++ + configure.ac | 4 ++-- + glib/Makefile.am | 7 +++++-- + 3 files changed, 11 insertions(+), 4 deletions(-) + +commit 1e30abe94a96b91df05716ea079c58782d767951 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Mar 24 22:24:41 2005 +0000 + + 2005-03-24 Kristian Høgsberg <krh@redhat.com> + + * glib/Makefile.am: Use POPPLER_GLIB_CFLAGS and + POPPLER_GLIB_LIBS + instead of GTK_TEST_*. Reported by Adam Jackson + <ajax@nwnk.net>. + + ChangeLog | 5 +++++ + glib/Makefile.am | 7 +++---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit 1d9fcaa34222b2ccd53280148561917dbb8d95d9 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Mar 23 05:53:08 2005 +0000 + + File Edit Options Buffers Tools Help + 2005-03-23 Kristian Høgsberg <krh@redhat.com> + + * poppler/Catalog.cc (indexToLabel, labelToIndex): Add + stricter + checking of incoming labels and indices. + + * glib/test-poppler-glib.c (main): Change test program to + take the + page label from the command line. + + ChangeLog | 6 ++++++ + glib/test-poppler-glib.c | 5 ++++- + poppler/Catalog.cc | 31 +++++++++++++++++++++++++++++-- + 3 files changed, 39 insertions(+), 3 deletions(-) + +commit a9bbb465a0ee6ab320f76d322a3f575327ad1148 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Mar 23 05:38:34 2005 +0000 + + 2005-03-23 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-page.cc: + * glib/poppler-page.h: Add poppler_page_get_index() and rename + popper_page_get_dimension() to popper_page_get_size() + + ChangeLog | 6 ++++++ + glib/poppler-page.cc | 12 +++++++++--- + glib/poppler-page.h | 32 +++++++++++++++++--------------- + glib/test-poppler-glib.c | 5 ++--- + 4 files changed, 34 insertions(+), 21 deletions(-) + +commit 178bff27d09d1e18d1fc00c975fa235b0e9f93d3 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Mar 23 04:14:28 2005 +0000 + + 2005-03-22 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-document.cc: Implement poppler_document_save(). + + * glib/poppler-document.h: Add prototype and format headers + properly. + + ChangeLog | 7 +++++++ + glib/poppler-document.cc | 20 ++++++++++++++++++++ + glib/poppler-document.h | 30 +++++++++++++----------------- + 3 files changed, 40 insertions(+), 17 deletions(-) + +commit e40c6f69c9466df4cc70840b959f72cb0809c777 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Mar 23 01:30:04 2005 +0000 + + 2005-03-22 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Fix --disable-popper typo reported by Albert. + Require exactly cairo 0.4 since CVS cairo has API changes. + + ChangeLog | 5 +++++ + configure.ac | 6 +++--- + 2 files changed, 8 insertions(+), 3 deletions(-) + +commit 2a1e4f6f6dd87dc59b3579175a87215fd7350ee0 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Mar 22 22:46:37 2005 +0000 + + 2005-03-22 Kristian Høgsberg <krh@redhat.com> + + * poppler/Array.cc: + * poppler/Array.h: Add getString() convenience method. + + * poppler/Catalog.cc: + * poppler/Catalog.h: Optimize lookup of named destinations. + + ChangeLog | 8 +++ + poppler/Array.cc | 15 ++++++ + poppler/Array.h | 1 + + poppler/Catalog.cc | 142 + ++++++++++++++++++++++++++++++++++------------------- + poppler/Catalog.h | 32 +++++++++++- + 5 files changed, 146 insertions(+), 52 deletions(-) + +commit 4dfe0ce4a1ca09d632943f0f6315e31135957ada +Author: Kristian Høgsberg <krh@redhat.com> +Date: Tue Mar 22 01:50:05 2005 +0000 + + 2005-03-21 Kristian Høgsberg <krh@redhat.com> + + * NEWS, TODO: Update these. + + ChangeLog | 4 ++++ + NEWS | 1 + + TODO | 29 ++++++++++++++++++++--------- + 3 files changed, 25 insertions(+), 9 deletions(-) + +commit c158de90a5a8c6514d8aa22efa0b891a1801e822 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Mar 21 07:53:19 2005 +0000 + + 2005-03-21 Kristian Høgsberg <krh@redhat.com> + + From Albert Astals Cid <tsdgeos@yahoo.es>: + + * poppler/Catalog.cc, poppler/Catalog.h: Parse PageMode + setting + from the Catalog dict and expose it through getPageMode() + method. + + ChangeLog | 10 ++++++++-- + poppler/Catalog.cc | 16 ++++++++++++++++ + poppler/Catalog.h | 12 ++++++++++++ + 3 files changed, 36 insertions(+), 2 deletions(-) + +commit 9887679ca195714d71cbedde9297e9dcea04eb13 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Mon Mar 21 07:36:11 2005 +0000 + + 2005-03-21 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-document.cc: + + * glib/poppler-document.h: Expose the documenttitle as + a GObject + property. + + * glib/poppler-page.cc: Expose the page label as a GObject + property. + + * glib/poppler-private.h: Add the page index to PopplerPage. + + * glib/test-poppler-glib.c: Print out page label and document + title. + + * poppler/Catalog.cc: + * poppler/Catalog.h: Add page label accessors. + + * poppler/PageLabelInfo.cc: + * poppler/PageLabelInfo.h: New files. + + * poppler/Makefile.am: Add new files to sources. + + ChangeLog | 23 ++++ + glib/poppler-document.cc | 95 ++++++++++++- + glib/poppler-document.h | 3 + + glib/poppler-page.cc | 37 ++++- + glib/poppler-private.h | 3 +- + glib/test-poppler-glib.c | 13 +- + poppler/Catalog.cc | 15 ++ + poppler/Catalog.h | 6 + + poppler/Makefile.am | 4 +- + poppler/PageLabelInfo.cc | 346 + +++++++++++++++++++++++++++++++++++++++++++++++ + poppler/PageLabelInfo.h | 37 +++++ + 11 files changed, 573 insertions(+), 9 deletions(-) + +commit 2cfe917de909254bc3a114a6add68a14b5885fd0 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sun Mar 20 05:44:06 2005 +0000 + + 2005-03-20 Kristian Høgsberg <krh@redhat.com> + + * glib/poppler-document.cc: + * glib/poppler-page.h: + * glib/poppler.cc: + * poppler/Array.cc: + * poppler/Array.h: + * poppler/Catalog.cc: Fix up filenames in #include statements + and + comments. + + ChangeLog | 10 ++++++++++ + glib/poppler-document.cc | 2 +- + glib/poppler-document.h | 2 +- + glib/poppler-page.cc | 2 +- + glib/poppler-page.h | 2 +- + glib/poppler.cc | 2 +- + glib/poppler.h | 2 +- + 7 files changed, 16 insertions(+), 6 deletions(-) + +commit f9b6017cfaf8f814ae2fc027927477c29f24af71 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sun Mar 20 00:35:21 2005 +0000 + + 2005-03-19 Kristian Høgsberg <krh@redhat.com> + + Land the first bits of the glib wrapper. + + * Makefile.am: + * configure.ac: Add new glib subdirectory and configure + options + for glib wrapper. + + * glib/Makefile.am: + * glib/poppler-document.cc: + * glib/poppler-document.h: + * glib/poppler-page.cc: + * glib/poppler-page.h: + * glib/poppler-private.h: + * glib/poppler.cc: + * glib/poppler.h: + * glib/test-poppler-glib.c: + * poppler-glib.pc.in: New files. + + ChangeLog | 19 ++++++ + Makefile.am | 27 ++++---- + NEWS | 4 ++ + configure.ac | 25 ++++++- + glib/Makefile.am | 33 ++++++++++ + glib/poppler-document.cc | 165 + +++++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-document.h | 52 +++++++++++++++ + glib/poppler-page.cc | 158 + +++++++++++++++++++++++++++++++++++++++++++++ + glib/poppler-page.h | 50 ++++++++++++++ + glib/poppler-private.h | 20 ++++++ + glib/poppler.cc | 29 +++++++++ + glib/poppler.h | 42 ++++++++++++ + glib/test-poppler-glib.c | 43 ++++++++++++ + poppler-glib.pc.in | 11 ++++ + 14 files changed, 661 insertions(+), 17 deletions(-) + +commit 2a31446b227b5cdc8334e672a71835b6ea14713a +Author: Jeff Muizelaar <jeff@infidigm.net> +Date: Wed Mar 16 15:51:36 2005 +0000 + + 2005-03-16 Jeff Muizelaar <jrmuizel@nit.ca> + + From Dan Sheridan <dan.sheridan@postman.org.uk> + + * poppler/XRef.cc (XRef::checkEncrypted): + The key length should be 5 for revision 2 documents. + + ChangeLog | 7 +++++++ + poppler/XRef.cc | 6 ++++++ + 2 files changed, 13 insertions(+) + +commit e632a1d4b2f685993bda407458c34ef8e6b74136 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Mar 11 22:43:29 2005 +0000 + + 2005-03-11 Kristian Høgsberg <krh@redhat.com> + + From Jeff Muizelaar <jrmuizel@nit.ca>: + + * poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask): + Use + getLine instead of getPixel. + + ChangeLog | 3 +++ + poppler/CairoOutputDev.cc | 18 ++++++++---------- + 2 files changed, 11 insertions(+), 10 deletions(-) + +commit 83e904452f205a2c0cd2723cb12b7fd4640ce342 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Mar 11 21:42:52 2005 +0000 + + 2005-03-11 Kristian Høgsberg <krh@redhat.com> + + From Jeff Muizelaar <jrmuizel@nit.ca>: + + * configure.ac: Add checks for libjpeg. + + * DCTStream.cc, DCTStream.h, Stream.cc, Stream.h, Makefile.am: + Conditionally use libjpeg instead of xpdf jpeg decoder. + + ChangeLog | 9 +++++ + configure.ac | 34 +++++++++++++++- + poppler/DCTStream.cc | 110 + +++++++++++++++++++++++++++++++++++++++++++++++++++ + poppler/DCTStream.h | 70 ++++++++++++++++++++++++++++++++ + poppler/Makefile.am | 14 ++++++- + poppler/Stream.cc | 8 ++++ + poppler/Stream.h | 2 + + 7 files changed, 245 insertions(+), 2 deletions(-) + +commit e2af71338fd89760c4ac76999985efc5eb92817f +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Mar 11 16:42:20 2005 +0000 + + 2005-03-10 Kristian Høgsberg <krh@redhat.com> + + From Jeff Muizelaar <jrmuizel@nit.ca>: + + * poppler/CairoFontEngine.cc (CairoFontEngine::getFont): + Don't print "Type 3 font!" message. + + * poppler/CairoOutputDev.cc (CairoOutputDev::drawImageMask): + Enable image mask drawing and do it properly, albeit slowly. + + * poppler/CairoOutputDev.h + (CairoOutputDev::interpretType3Chars): Return true so that + Gfx.cc turns type3 characters into calls to drawImageMask + + ChangeLog | 14 ++++++++++++++ + poppler/CairoFontEngine.cc | 1 - + poppler/CairoOutputDev.cc | 25 ++++++++++--------------- + poppler/CairoOutputDev.h | 2 +- + 4 files changed, 25 insertions(+), 17 deletions(-) + +commit 3dc52373346e448077d2539163e873eef6406ed7 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Mar 9 15:47:00 2005 +0000 + + 2005-03-09 Kristian Høgsberg <krh@redhat.com> + + * NEWS: Describe 0.1.2 (and 0.1.1) release. + + * configure.ac: Bump poppler version to 0.1.2 + + ChangeLog | 6 ++++++ + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 3 files changed, 19 insertions(+), 1 deletion(-) + +commit 5c6a2d34fc25df28ca5326e6910d7cf664f0c3d7 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Wed Mar 9 15:35:31 2005 +0000 + + 2005-03-09 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Bump cairo requirement to 0.4. + + ChangeLog | 4 ++++ + configure.ac | 4 ++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 5b2d9a61e79cefd819888c8c89231a5fafccd114 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sat Mar 5 04:57:49 2005 +0000 + + 2005-03-04 Kristian Høgsberg <krh@redhat.com> + + Patch from Jeff Muizelaar <jrmuizel@nit.ca>. Changed to + allocate + glyphs using gmalloc. + + * poppler/CairoOutputDev.cc (CairoOutputDev::drawString): + Implement drawString instead of drawChar. This change should + make clipping to a text path work and has a performance + improvement. Currently the code is a little ugly because we + can't concat matrices to cairo without losing our current + font. + + * poppler/CairoOutputDev.h (CairoOutputDev::useDrawChar): + Tell Gfx.cc that it should use drawString instead of drawChar. + + ChangeLog | 14 ++++++ + TODO | 3 ++ + poppler/CairoOutputDev.cc | 110 + ++++++++++++++++++++++++++++++++++------------ + poppler/CairoOutputDev.h | 7 +-- + 4 files changed, 102 insertions(+), 32 deletions(-) + +commit 60d190ef80a0dcd9cc3a67306e2c65c5dd482f24 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sat Mar 5 04:37:14 2005 +0000 + + 2005-03-04 Kristian Høgsberg <krh@redhat.com> + + * test/gtk-cairo-test.cc (view_load): + * test/gtk-splash-test.cc (view_load): Fix missing return + statement, and remove unused variables. + + * configure.ac: Add configure option to enable the default KDE + flags as described by Albert Astals Cid <tsdgeos@yahoo.es>. + + * TODO: Update with Jeff's items. + + * .cvsignore: + * */.cvsignore: Add these to silence CVS. + + ChangeLog | 9 +++++++++ + TODO | 15 +++++++++++---- + configure.ac | 21 +++++++++++++++++++++ + test/gtk-cairo-test.cc | 6 ++---- + test/gtk-splash-test.cc | 5 ++--- + 5 files changed, 45 insertions(+), 11 deletions(-) + +commit e6706e505c1675724c8870f7c58079932661db5f +Author: Kristian Høgsberg <krh@redhat.com> +Date: Sat Mar 5 02:19:50 2005 +0000 + + 2005-03-04 Kristian Høgsberg <krh@redhat.com> + + * .cvsignore: + * */.cvsignore: Add these to silence CVS. + + .cvsignore | 21 +++++++++++++++++++++ + ChangeLog | 3 +++ + fofi/.cvsignore | 8 ++++++++ + goo/.cvsignore | 8 ++++++++ + poppler/.cvsignore | 10 ++++++++++ + splash/.cvsignore | 8 ++++++++ + test/.cvsignore | 10 ++++++++++ + 7 files changed, 68 insertions(+) + +commit 932edfc3c5c61e3b3e98957b717abbf8055e1c5e +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Mar 4 19:47:13 2005 +0000 + + 2005-03-04 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Implement same check for gtk+-2.0 tests as for + cairo. + + ChangeLog | 5 +++++ + configure.ac | 11 ++++++++--- + 2 files changed, 13 insertions(+), 3 deletions(-) + +commit c632b35ad9345f280d78c268f84ae3fd5a3921b9 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Mar 4 16:33:43 2005 +0000 + + 2005-03-04 Kristian Høgsberg <krh@redhat.com> + + * configure.ac: Only fail hard in check for cairo if the user + specified --enable-cairo-output (from Brad Hards + <bradh@frogmouth.net>). Print summary of configure results + at the + end of configure script. + + * poppler/poppler-config.h: Remove this file (noticed by Brad + Hards <bradh@frogmouth.net>). + + ChangeLog | 5 +++++ + configure.ac | 17 ++++++++++++++--- + 2 files changed, 19 insertions(+), 3 deletions(-) + +commit 80f9c90273eb31ac349c46bf86dedff7daf21db4 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Mar 4 15:32:32 2005 +0000 + + 2005-03-04 Kristian Høgsberg <krh@redhat.com> + + * poppler/poppler-config.h: Remove this file (noticed by Brad + Hards <bradh@frogmouth.net>). + + ChangeLog | 5 ++ + poppler/poppler-config.h | 146 + ----------------------------------------------- + 2 files changed, 5 insertions(+), 146 deletions(-) + +commit 338b83b6f08a7212fdde2bbce94385e9a71a3d23 +Author: Kristian Høgsberg <krh@redhat.com> +Date: Fri Mar 4 02:46:44 2005 +0000 + + 2005-03-03 Kristian Høgsberg <krh@redhat.com> + + Patch from Jeff Muizelaar <jrmuizel@nit.ca>: + + * poppler/CairoOutputDev.cc (CairoOutputDev::drawImage, + CairoOutputDev::drawImageMask): destroy the image surface and + free the image buffer. + + ChangeLog | 10 ++++++++++ + autogen.sh | 2 +- + poppler/CairoOutputDev.cc | 8 +++++--- + 3 files changed, 16 insertions(+), 4 deletions(-) + +commit 062aa51487f539406b54458885b4c9501da3c44d +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Mar 3 20:01:14 2005 +0000 + + 2005-03-03 Kristian Høgsberg <krh@redhat.com> + + * autogen.sh: Add to CVS. + + ChangeLog | 4 ++++ + autogen.sh | 4 ++++ + 2 files changed, 8 insertions(+) + +commit cb02d5d0e770e2a8cbe5a8ac810820a2ce5fec0c +Author: Kristian Høgsberg <krh@redhat.com> +Date: Thu Mar 3 19:45:58 2005 +0000 + + Initial revision + + AUTHORS | 3 + + COPYING | 340 ++++ + ChangeLog | 33 + + INSTALL | 236 +++ + Makefile.am | 29 + + NEWS | 4 + + README | 37 + + README-XPDF | 376 ++++ + TODO | 21 + + configure.ac | 139 ++ + fofi/FoFiBase.cc | 156 ++ + fofi/FoFiBase.h | 55 + + fofi/FoFiEncodings.cc | 994 ++++++++++ + fofi/FoFiEncodings.h | 34 + + fofi/FoFiTrueType.cc | 1438 ++++++++++++++ + fofi/FoFiTrueType.h | 131 ++ + fofi/FoFiType1.cc | 207 ++ + fofi/FoFiType1.h | 57 + + fofi/FoFiType1C.cc | 2385 ++++++++++++++++++++++ + fofi/FoFiType1C.h | 224 +++ + fofi/Makefile.am | 16 + + goo/GooHash.cc | 356 ++++ + goo/GooHash.h | 74 + + goo/GooList.cc | 92 + + goo/GooList.h | 89 + + goo/GooMutex.h | 49 + + goo/GooString.cc | 236 +++ + goo/GooString.h | 98 + + goo/Makefile.am | 20 + + goo/gfile.cc | 705 +++++++ + goo/gfile.h | 140 ++ + goo/gmem.c | 204 ++ + goo/gmem.h | 53 + + goo/gmempp.cc | 32 + + goo/gtypes.h | 29 + + poppler-cairo.pc.in | 10 + + poppler-splash.pc.in | 10 + + poppler.pc.in | 11 + + poppler/Annot.cc | 137 ++ + poppler/Annot.h | 79 + + poppler/Array.cc | 73 + + poppler/Array.h | 56 + + poppler/BaseFile.h | 82 + + poppler/BuiltinFont.cc | 65 + + poppler/BuiltinFont.h | 55 + + poppler/BuiltinFontTables.cc | 4284 + ++++++++++++++++++++++++++++++++++++++++ + poppler/BuiltinFontTables.h | 23 + + poppler/CMap.cc | 384 ++++ + poppler/CMap.h | 101 + + poppler/CairoFontEngine.cc | 367 ++++ + poppler/CairoFontEngine.h | 61 + + poppler/CairoOutputDev.cc | 569 ++++++ + poppler/CairoOutputDev.h | 146 ++ + poppler/CairoOutputDevImage.cc | 87 + + poppler/CairoOutputDevImage.h | 43 + + poppler/CairoOutputDevX.cc | 211 ++ + poppler/CairoOutputDevX.h | 117 ++ + poppler/Catalog.cc | 364 ++++ + poppler/Catalog.h | 87 + + poppler/CharCodeToUnicode.cc | 533 +++++ + poppler/CharCodeToUnicode.h | 112 ++ + poppler/CharTypes.h | 24 + + poppler/CompactFontTables.h | 464 +++++ + poppler/Decrypt.cc | 399 ++++ + poppler/Decrypt.h | 59 + + poppler/Dict.cc | 95 + + poppler/Dict.h | 75 + + poppler/Error.cc | 38 + + poppler/Error.h | 21 + + poppler/ErrorCodes.h | 36 + + poppler/FontEncodingTables.cc | 1824 +++++++++++++++++ + poppler/FontEncodingTables.h | 20 + + poppler/Function.cc | 1525 ++++++++++++++ + poppler/Function.h | 181 ++ + poppler/Gfx.cc | 3079 +++++++++++++++++++++++++++++ + poppler/Gfx.h | 279 +++ + poppler/GfxFont.cc | 1508 ++++++++++++++ + poppler/GfxFont.h | 313 +++ + poppler/GfxState.cc | 2782 ++++++++++++++++++++++++++ + poppler/GfxState.h | 1053 ++++++++++ + poppler/GlobalParams.cc | 1764 +++++++++++++++++ + poppler/GlobalParams.h | 312 +++ + poppler/JArithmeticDecoder.cc | 300 +++ + poppler/JArithmeticDecoder.h | 89 + + poppler/JBIG2Stream.cc | 3337 +++++++++++++++++++++++++++++++ + poppler/JBIG2Stream.h | 141 ++ + poppler/JPXStream.cc | 2822 ++++++++++++++++++++++++++ + poppler/JPXStream.h | 338 ++++ + poppler/Lexer.cc | 474 +++++ + poppler/Lexer.h | 75 + + poppler/Link.cc | 851 ++++++++ + poppler/Link.h | 407 ++++ + poppler/Makefile.am | 140 ++ + poppler/NameToCharCode.cc | 116 ++ + poppler/NameToCharCode.h | 40 + + poppler/NameToUnicodeTable.h | 1097 ++++++++++ + poppler/Object.cc | 231 +++ + poppler/Object.h | 301 +++ + poppler/Outline.cc | 151 ++ + poppler/Outline.h | 74 + + poppler/OutputDev.cc | 104 + + poppler/OutputDev.h | 162 ++ + poppler/PDFDoc.cc | 322 +++ + poppler/PDFDoc.h | 176 ++ + poppler/PDFDocEncoding.cc | 44 + + poppler/PDFDocEncoding.h | 16 + + poppler/PSOutputDev.cc | 3803 +++++++++++++++++++++++++++++++++++ + poppler/PSOutputDev.h | 312 +++ + poppler/PSTokenizer.cc | 135 ++ + poppler/PSTokenizer.h | 39 + + poppler/Page.cc | 370 ++++ + poppler/Page.h | 176 ++ + poppler/Parser.cc | 231 +++ + poppler/Parser.h | 58 + + poppler/SplashOutputDev.cc | 1348 +++++++++++++ + poppler/SplashOutputDev.h | 194 ++ + poppler/Stream-CCITT.h | 459 +++++ + poppler/Stream.cc | 3979 + +++++++++++++++++++++++++++++++++++++ + poppler/Stream.h | 841 ++++++++ + poppler/TextOutputDev.cc | 3529 +++++++++++++++++++++++++++++++++ + poppler/TextOutputDev.h | 569 ++++++ + poppler/UTF8.h | 56 + + poppler/UnicodeMap.cc | 293 +++ + poppler/UnicodeMap.h | 122 ++ + poppler/UnicodeMapTables.h | 361 ++++ + poppler/UnicodeTypeTable.cc | 299 +++ + poppler/UnicodeTypeTable.h | 18 + + poppler/XRef.cc | 1026 ++++++++++ + poppler/XRef.h | 133 ++ + poppler/poppler-config.h | 146 ++ + poppler/poppler-config.h.in | 145 ++ + splash/Makefile.am | 52 + + splash/Splash.cc | 1732 ++++++++++++++++ + splash/Splash.h | 174 ++ + splash/SplashBitmap.cc | 157 ++ + splash/SplashBitmap.h | 46 + + splash/SplashClip.cc | 270 +++ + splash/SplashClip.h | 86 + + splash/SplashErrorCodes.h | 30 + + splash/SplashFTFont.cc | 289 +++ + splash/SplashFTFont.h | 53 + + splash/SplashFTFontEngine.cc | 141 ++ + splash/SplashFTFontEngine.h | 58 + + splash/SplashFTFontFile.cc | 111 ++ + splash/SplashFTFontFile.h | 68 + + splash/SplashFont.cc | 166 ++ + splash/SplashFont.h | 87 + + splash/SplashFontEngine.cc | 245 +++ + splash/SplashFontEngine.h | 83 + + splash/SplashFontFile.cc | 55 + + splash/SplashFontFile.h | 58 + + splash/SplashFontFileID.cc | 23 + + splash/SplashFontFileID.h | 28 + + splash/SplashGlyphBitmap.h | 24 + + splash/SplashMath.h | 45 + + splash/SplashPath.cc | 177 ++ + splash/SplashPath.h | 105 + + splash/SplashPattern.cc | 64 + + splash/SplashPattern.h | 79 + + splash/SplashScreen.cc | 107 + + splash/SplashScreen.h | 38 + + splash/SplashState.cc | 99 + + splash/SplashState.h | 86 + + splash/SplashT1Font.cc | 251 +++ + splash/SplashT1Font.h | 49 + + splash/SplashT1FontEngine.cc | 124 ++ + splash/SplashT1FontEngine.h | 51 + + splash/SplashT1FontFile.cc | 96 + + splash/SplashT1FontFile.h | 55 + + splash/SplashTypes.h | 80 + + splash/SplashXPath.cc | 417 ++++ + splash/SplashXPath.h | 90 + + splash/SplashXPathScanner.cc | 271 +++ + splash/SplashXPathScanner.h | 72 + + test/Makefile.am | 48 + + test/gtk-cairo-test.cc | 298 +++ + test/gtk-splash-test.cc | 314 +++ + 177 files changed, 70512 insertions(+) diff --git a/poppler-24.05.0/ConfigureChecks.cmake b/poppler-24.05.0/ConfigureChecks.cmake new file mode 100644 index 0000000000000000000000000000000000000000..e0826caf892d67f26a11b87dfae38135a09b182d --- /dev/null +++ b/poppler-24.05.0/ConfigureChecks.cmake @@ -0,0 +1,63 @@ +# Copyright 2008 Pino Toscano, <pino@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +include(CheckIncludeFile) +include(CheckIncludeFileCXX) +include(CheckIncludeFiles) +include(CheckSymbolExists) +include(CheckFunctionExists) +include(CheckLibraryExists) +include(CheckTypeSize) +include(CheckCSourceCompiles) +include(CMakePushCheckState) + +cmake_push_check_state() +# this is going to be defined via config.h, and impacts Android's stdio.h +if (_FILE_OFFSET_BITS) + set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_FILE_OFFSET_BITS=${_FILE_OFFSET_BITS}) +endif() + +check_include_files(dlfcn.h HAVE_DLFCN_H) +check_include_files(fcntl.h HAVE_FCNTL_H) +check_include_files(stdlib.h HAVE_STDLIB_H) +check_include_files(sys/mman.h HAVE_SYS_MMAN_H) +check_include_files(sys/stat.h HAVE_SYS_STAT_H) +check_include_files(unistd.h HAVE_UNISTD_H) + +check_function_exists(fseek64 HAVE_FSEEK64) +check_symbol_exists(fseeko "stdio.h" HAVE_FSEEKO) +check_function_exists(ftell64 HAVE_FTELL64) +check_function_exists(pread64 HAVE_PREAD64) +check_function_exists(lseek64 HAVE_LSEEK64) +check_function_exists(gmtime_r HAVE_GMTIME_R) +check_function_exists(timegm HAVE_TIMEGM) +check_function_exists(gettimeofday HAVE_GETTIMEOFDAY) +check_function_exists(localtime_r HAVE_LOCALTIME_R) +check_function_exists(popen HAVE_POPEN) +check_function_exists(mkstemp HAVE_MKSTEMP) +check_function_exists(strtok_r HAVE_STRTOK_R) + +macro(CHECK_FOR_DIR include var) + check_c_source_compiles( + "#include <${include}> + +int main(int argc, char *argv[]) +{ + DIR* d = 0; + return 0; +} +" ${var}) +endmacro(CHECK_FOR_DIR) +check_for_dir("dirent.h" HAVE_DIRENT_H) +check_for_dir("ndir.h" HAVE_NDIR_H) +check_for_dir("sys/dir.h" HAVE_SYS_DIR_H) +check_for_dir("sys/ndir.h" HAVE_SYS_NDIR_H) + +check_function_exists("nanosleep" HAVE_NANOSLEEP) +if(NOT HAVE_NANOSLEEP) + check_library_exists("rt" "nanosleep" "" LIB_RT_HAS_NANOSLEEP) +endif(NOT HAVE_NANOSLEEP) + +cmake_pop_check_state() diff --git a/poppler-24.05.0/INSTALL b/poppler-24.05.0/INSTALL new file mode 100644 index 0000000000000000000000000000000000000000..8bdda8430b514a778248124fb1d4824b0461dda4 --- /dev/null +++ b/poppler-24.05.0/INSTALL @@ -0,0 +1,108 @@ +Installation Instructions +************************* + +Basic Installation +================== + +mkdir build +cd build +cmake .. +make +make install + + +CMake configuration options can be set using the -D option. eg + + cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=release + + +Build Options +============= + +Set install prefix: + + -DCMAKE_INSTALL_PREFIX=<path> + +Set build type. This sets the standard compiler flags for the build +type. + + -DCMAKE_BUILD_TYPE=debug or -DCMAKE_BUILD_TYPE=release + +Set compiler flags: + + -DCMAKE_CXX_FLAGS=<flags> or set CXXFLAGS environment variable + +Set linker flags: + + -DCMAKE_LD_FLAGS=<flags> or set LDFLAGS environment variable + + +Optional Features +================= + + -D<FEATURE>=<ON|OFF> + +eg + + -DENABLE_LIBCURL=ON -DBUILD_GTK_TESTS=OFF + +A list of all options can be display with the commmand: + + egrep '^ *(option|set.*STRING)' CMakeLists.txt + +Alternatively, the options can be edited by running "ccmake ." in the +build directory. + + +Cross Compiling +=============== + +A toolchain file is required to specify the target specific compiler +tools. Run cmake with the option: + + -DCMAKE_TOOLCHAIN_FILE=<Toolchain file> + +A sample toolchain for a 64-bit mingw build is shown below. Replace +/path/to/win/root with the install prefix for the target environment. + + set(CMAKE_SYSTEM_NAME Windows) + set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) + set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) + set(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) + set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32 /path/to/win/root ) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + + +Debugging Options +================= + +Debug Build Types +----------------- +Release build with debugging information: + -DCMAKE_BUILD_TYPE=relwithdebinfo + +Debug build with optimization except for some code re-ordering optimizations: + -DCMAKE_BUILD_TYPE=debug + +Debug build with no optimization: + -DCMAKE_BUILD_TYPE=debugfull + +Release build with debugging and profiling information: + -DCMAKE_BUILD_TYPE=profile + + +Address Sanitizer +----------------- +Ensure the extra cmake modules are available (may be a separate +package) then use -DECM_ENABLE_SANITIZERS to specify the santizers. eg + + -DECM_ENABLE_SANITIZERS='address;leak;undefined' + +Some options may only be available with clang. Use +-DCMAKE_CXX_COMPILER=clang++ to build with clang. + +The sanitizer can also be combined with fuzz testing by using Clang 6.0 +or later and additionally enabling the sanitizer fuzzer which +will enable the fuzz target cpp/tests/pdf_fuzzer. diff --git a/poppler-24.05.0/NEWS b/poppler-24.05.0/NEWS new file mode 100644 index 0000000000000000000000000000000000000000..1e07d927d0a5e30920ef40c9b79e6d236ffdf402 --- /dev/null +++ b/poppler-24.05.0/NEWS @@ -0,0 +1,4345 @@ +Release 24.05.0: + core: + * Fix signing not being totally correct in some kind of PDF files + * Assume "Adobe-Identity" for character collection. Issue #1465 + * Small improvements in annotation font rendering + * Remove some GooString methods, use std::string ones instead + * Move some GooString methods to UTF.h + * Fix crash in broken files + + cpp: + * cpp: Fix crash extracting text and font in some files. Issue #1477 + * Change base class of ustring to char16_t + + qt6: + * Add async API for certificate validation + * Fix text extraction for Landscape/Seascape pages + + qt5: + * Add async API for certificate validation + * Fix text extraction for Landscape/Seascape pages + + utils: + * pdfdetach: Small code improvements + * pdftops: Write compliant ps header + + build system: + * Increase minimum supported base to that provided by Ubuntu 22.04 + +Release 24.04.0: + core: + * Optimize page text extraction speed + * Fix clipping path handling in some files. Issue #739 + * Fix regression in text selection + * Fix text search across lines between paragraphs + + qt6: + * Fix crash in SoundObject::data + + utils: + * pdfsig: Add Catalan translation + + build system: + * Build code as C++20 + +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 + * Fix saving some annotation interior color when it's empty + * Make searching for fonts when adding annotations a bit faster + * Make sure images are compressed when adding them + * Small internal code cleanup + + utils: + * pdfimages: return exit code 2 when error opening output files + +Release 24.01.0: + core: + * Don't crash on certain documents on the NSS signature backend + * Fix infinite loop in some annotation code if there's not space for even one character + * Fix build on Android with generic font configuration + * Small internal code cleanup + +Release 23.12.0: + core: + * Rewrite FoFiType1::parse to be more flexible. Issue #1422 + * Small internal code refactoring + +Release 23.11.0: + core: + * CairoOutputDev: Use internal downscaling algorithm if image exceeds Cairo's maximum dimensions. + * Internal code improvements + * Fix crash on malformed files + + utils: + * pdftocairo: Add option to document logical structure if output is pdf + * pdftocairo: EPS output should not contain %%PageOrientation + +Release 23.10.0: + core: + * cairo: update type 3 fonts for cairo 1.18 api + * Fix crash on malformed files + + build system: + * Make a few more dependencies soft-mandatory + * Add more supported gnupg releases + * Check if linker supports version scripts + +Release 23.09.0: + core: + * Add Android-specific font matching functionality + * Fix digital signatures for NeedAppearance=true + * Forms: Don't look up same glyph multiple times + * Provide the key location for certificates you can sign with + * Add ToUnicode support for similarequal + * Fix crash on malformed files + + qt5: + * Provide the key location for certificates you can sign with + * Allow to force a rasterized overprint preview during PS conversion + + qt6: + * Provide the key location for certificates you can sign with + * Allow to force a rasterized overprint preview during PS conversion + + pdfsig: + * Provide the key location for certificates you can sign with + +Release 23.08.0: + core: + * Fix GWG 19.2 - DeviceN Overprint (White) + * Splash: avoid bogus memory allocation size in doTilingPatternFill + * Fix use-of-uninitialized-value in XRef + * Fix float-cast-overflow error in Catalog + * Cleanup gpgme backend code + * Version symbols in poppler core + + glib: + * Improve poppler_get_available_signing_certificates + * Add new members to PopplerCertificateInfo + + utils: + * pdftotext: small improvement to man page + +Release 23.07.0: + core: + * Fix reading of utf8-with-bom files + * Fix crash if CERT_ExtractPublicKey doesn't return a public key + * Fix rendering of some malformed documents. Issue #1395 + * Allow for stream compression and compress font streams in forms + * Remove method Hints::getPageRanges + + qt5: + * Fix crash when overprint preview is enabled + * Don't fail signature basics tests if backend is not configured + + qt6: + * Fix crash when overprint preview is enabled + * Don't fail signature basics tests if backend is not configured + + utils: + * pdfsig: Allow showung and selecting signature backend + * pdfsig: Describe signature dump format in manual page + + glib: + * Add signing API + + build system: + * zlib is now mandatory + +Release 23.06.0: + core: + * CairoOutputDev: Fix crash when doing type3 rendering + * Fix crash with unknown signature hashing algorithms + * Add gpgme backend for signature handling + * Windows: Fix crash when signing existing signature + * FontInfo: Make it return proper information about font substitution + * FontInfo: Try harder to get Type 3 font name + * Store embedded fonts widths table in a more effective manner + * Skip font lookup for nonprintable characters + * Windows: Look for fonts in both windows font dir and poppler fonts dir + * Windows: symbol.ttf is not a good Symbol font + * Windows: Fix memory leak when looking for fonts + * Fix crash on malformed files + + qt5: + * Add API to allow selecting signature backend (nss or gpgme) + * Convert embedded files to bytearray a bit smarter + + qt6: + * Add API to allow selecting signature backend (nss or gpgme) + * Convert embedded files to bytearray a bit smarter + +Release 23.05.0: + core: + * Fix crash when filling some forms + * Set SigFlags when signing unsigned signature + * Add some infrastructure code to support multiple signing backends + * Fix potential stack overflow in PostScriptFunction::parseCode + * Fix some minor uninitialised memory reads + +Release 23.04.0: + core: + * Fix memory issue when signing fails. Issue #1372 + * Internal improvements of signature related code + * CairoOutputDev: improve type3 font rendering + * Fix memory leak in GlobalParams::findSystemFontFileForFamilyAndStyle + + utils: + * pdftocairo: Fix crash in some special situations + * pdfsig: allow holes in -dump signature list + * pdfsig: Support --help + +Release 23.03.0: + core: + * PngWriter: Fix potential uninitialized memory use + +Release 23.02.0: + core: + * CairoOutputDev: Fix rendering of color type 3 fonts + * CairoOutputDev: Add handling matte entry + * Fix segfault on wrong nssdir + * Fix "NSS could not shutdown" + + utils: + * pdfsig: Point out supports PKCS#11 URIs as nickname + +Release 23.01.0: + core: + * PDFDoc::sign: Fix crash if font can't be found + * PDFDoc::sign: Try Arial to sign if Helvetica isn't found + * FoFiType1::parse: Be more flexible parsing the encoding content. Issue #1324 + * Gfx::opBeginMarkedContent: Support Span with Name. Issue #1327 + * Splash: Avoid color issues due to implicit rounding + * Splash: Fix crash on malformed file. + * CairoOutputDev: Ignore text rendering mode for type3 fonts + * Remove unused FoFiType1::load function + + build system: + * Increase minimum required versions of several dependencies + * Improve include path handling + + qt6: + * Use less deprecated functions + +Release 22.12.0: + core: + * Form::addFontToDefaultResources: Be stubborn in finding a font we can use. Issue #1272 + +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 + * Protect against malformed files + * Refactor code to not use strndup + * Other small code refactoring + + utils: + * pdftoppm: Avoid round-off errors when determining raster dimensions + * pdftocairo: Avoid round-off errors when determining raster dimensions + * pdftotext: Simplify memory handling + + qt: + * Take into account flagNoView when getting/setting the visible status. KDE bug #456313 + + build system: + * Fix sed invocation + +Release 22.09.0: + core: + * Splash: Do not truncate line dash patterns with more than 20 entries. Issue #1281 + * Various signature related improvements + * Fix FormField::getFullyQualifiedName in some scenarios + * Splash: Small optimization on dash pattern handling + * JBIG2Stream::readHalftoneRegionSeg: Fix potential memory leak + * Fix crashes on malformed files. Including CVE-2022-38784 + * Fix string formatting in error reporting + + glib: + * Fix two potential memory leaks in poppler_document_create_dests_tree + + utils: + * pdfsig: List signature field names when listing signature information + * pdfsig: Add support for specifying signature by field name + * pdfunite: Fix crashes on malformed files + * pdfunite: Fix potential memory leak of docs + +Release 22.08.0: + core: + * Fix rendering text on some forms + * CairoOutputDev: Support Type3 charprocs having Resources + * Fix crashes on malformed files + +Release 22.07.0: + core: + * Fix crash when filling in forms in some files. Issue #1258 + * Fix first lines of Annotations sometimes being cut off. Issue #1246 + * Signatures: Don't crash if the signature doesn't have a common name + * CairoFontEngine: increment font_face reference when retrieving from the cache + * Add ToUnicode support for lessorequalslant and greaterorequalslant + + glib: + * Add support for stamp annotation + + build system: + * Tweaks on how gperf is run + +Release 22.06.0: + core: + * Forms: Fix crash in forms with their own DR + * Refactor CairoFontEngine caching + * CairoOutputDev: preserve text color when drawing type 3 glyphs + * Windows: font code simplification + * Minor code improvements + + cpp: + * Add missing header + + utils: + * pdfattach: Assume filename is utf8 encoded + * pdftohtml: Fix type 3 font size calculation + +Release 22.05.0: + core: + * Annotations: Make sure we embed fonts for the FreeText annots + * Forms: Make sure we embedd fonts as needed + * Signatures: Make sure we embed the needed fonts + * CairoOutputDev: color type 3 fonts + * fix two bugs in multiline find_text() + * code improvements + + utils: + * pdftotext: added TSV mode + * HtmlOutputDev: don't use png.h + + cpp: + * Use time_t for time + * Add page_transition::durationReal + + qt: + * Pass leftFontSize down to `FormWidgetSignature::signDocumentWithAppearence` + +Release 22.04.0: + core: + * Fix underline sometimes being drawn only partially + * Fix Adobe Reader not reading some of the contents we write correctly + * Fix code that workarounds some broken-ish files + * FoFiTrueType: Parse CFF2 fonts too + * FoFiTrueType: Support cmap types 2 and 13 + * Fix a few small memory leaks + * code improvements + + qt: + * Handle SaveAs named action + * Annotations: don't change the text color when changing the font + + utils: + * pdftotext: print creation and modification date when using htmlmeta param + + glib: + * Fix returning internal data of temporary strings + + cpp: + * Fix code incompatibility with MSVC + + build system: + * poppler internal library is no longer forced to static on MSVC + * Error out if iconv is not available and the cpp frontend is enabled + * Require FreeType 2.8 + +Release 22.03.0: + core: + * Signature: Fix finding Signatures that are in Pages not not in the global the Forms object + * Signature: Improve getting the path to the firefox certificate database + * Splash: Fix rendering of some joints. Issue #1212 + * Fix get_poppler_localdir for relocatable Windows builds + * Minor code improvements + + qt: + * Minor code improvements + + utils: + * pdfimages: Fix the wrong Stream being passed for drawMaskedImage + + build system: + * Small code improvements + +Release 22.02.0: + core: + * Signature: Add a way to detect unsigned FormFieldSignature + * Signature: Suport background image when using left and right text + * Signature: Fix path where to search for Firefox NSS in Windows + * Signature: Fix NSS code to work correctly in Windows/Android + * Count only signature fields in PDFDoc::getNumSignatureFields + * Minor code improvements + + qt: + * Allow signing unsigned signature fields + * Allow passing a background image for the signature when signing + * Allow passing the document password when signing + * Fix leftFontSize being ignored when signing + + glib: + * try with utf8 password if latin1 fails + * New method for getting all signature fields of a document + * Fix compile with MSVC + + utils: + * pdfsig: Fix compile with MSVC + + build system: + * Fix NSS cmake check for MSVC + +Release 22.01.0: + core: + * Allow local (relative to dll) fonts dir on Windows + * TextOutputDev: require more spacing between columns. Issue #1093 + * Fix crash in Splash::gouraudTriangleShadedFill. Issue #1183 + * Fix crash when calling Form::reset() + * GfxSeparationColorSpace: Check validity of colorspace and function. Issue #1184 + * Minor code improvements + + glib: + * Include glib.h before using defines from it + * Close file descriptors on error + * Plug some memory leaks + * Replace use of deprecated g_memdup/g_time_zone_new + * Remove FD-taking functions on windows + + utils: + * pdfsig: Add support for documents with passwords + * pdfsig: Fix signing with -sign if nss password is needed + +Release 21.12.0: + core: + * Add API to add images + * CairoOutputDev: Fix de-duping of Flate images + * Fix crash on broken files when using non-default ENABLE_ZLIB_UNCOMPRESS. Issue #393 + * Minor code improvements + + glib: + * Add API for validation of signatures + * Add API to read/save to file descriptor + + utils: + * pdftohtml: Reduce sensitivity of duplicate detection. Issue #1117 + + build system: + * Increase C++ standard to 17 + +Release 21.11.0: + core: + * Fix rendering of some non-standard confirming annotations + * Support rendering of some non-standard Type3 charprocs. Issue #1150 + * TextOutputDev: Respect orientation when selecting words. Issue #499 + * CairoOutputDev: Don't override the antialias settings from the cairo_t + * StructElement: support MCID in XObjects + * Fix detection of monospace fonts + * Ignore Adobe-Identity for non embedded CID fonts + * PageLabelInfo::labelToIndex: work on some special no style intervals + * Fix crash in malformed files + * Minor code improvements + + utils: + * pdfinfo: add -url option to print all URLs in a PDF + * pdftohtml: document what zoom means in regard to DPI + + qt6: + * Require Qt 6.1 + * Minor code improvements + +Release 21.10.0: + core: + * Add support for setting custom stamp annotations + * Add default appearance for the well known stamp names + * Correct encoding of signature's properties Reason & Location + * Splash: Fix rendering of some odd patterns + * SignatureHandler::validateCertificate: Add option to not do OCSP revocation check + * SignatureHandler::validateCertificate: Add support for AIA fetching to verify certificates + * greallocn: if memory allocation fails, free the previous pointer to avoid memory leak + * Fix issues with malformed files + * Internal code improvements + + utils: + * pdfsig: Add a way to list certificate nicknames + * pdfsig: You can now add signatures from pdfsig + * pdfsig: Add option to not do OCSP revocation check + * pdfsig: Add option for AIA fetching to verify certificates + * pdfinfo: Add -custom option to print custom metadata + * pdfinfo: add metadata flags + + qt: + * Add support for setting custom stamp annotations + * Add getters for signature's properties Reason & Location + * Internal code improvements + + glib: + * Remove incorrect PopplerAttachment deprecation + +Release 21.09.0: + core: + * Splash: Massive spped improvement on files that use lots of save/restore (q/Q) operators + * Correct decoding of signature properties Reason & Location when they are Unicode + * Fix issues with malformed files + * MSVC build fixes + + build system: + * Call cmake_minium_required() before project() + * Always append to CMAKE_{C,CXX}_FLAGS_${CMAKE_BUILD_TYPE} + * correctly forward user-provided flags to try_compile() + +Release 21.08.0: + core: + * Add API to allow addition and modification of outlines into a PDF + * Use additional samples to test for constant parts of an axial gradient + * forms: Create fallback fonts for some well known font names + * Support reading the PDF Version from the Catalog + * Fix XRef::copy when there are modified objects + * Take into account that Date string may be in unicode + * JBIG2Stream: Fix regression in "Do not consider a size-0 to be an error" + * Replace a local bubble sort implementation by std::sort + * Fix issues with malformed files + + build system: + * Better error message when libjpeg is not found + * Better error messages when libopenjpeg2 is not found + + qt5/qt6: + * Document that a document has to outlive its pages + * Make getPdfVersion return a dedicated version object + + glib: + * mimick TextSelectionDumper logic change for spaceAfter + +Release 21.07.0: + core: + * JBIG2Stream: Do not consider a size-0 to be an error. Issue #535 + * PSOutputDev: fix off-by-one error for image masking in L1/L2 output. Issue #1088 + * CairoOutputDev: Fix memory leak on broken files + * Minor code improvements + + build system: + * set C standard to 11 without extensions + +Release 21.06.1: + glib: + * fix poppler_rectangle_free() regression. Issue #1087 + +Release 21.06.0: + core: + * Fix rendering of some extended latin1 characters in annotations. Issue #1070 + * Support some not so well formed documents with password. Issue #1083 + * Add API to get notified if the xref is reconstructed + * Add somewhat fancier left/right signature visual representation + * Fix crashes in malformed files + * Minor code improvements + + qt6: + * Change some functions to return std::unique_ptr + + qt5/qt6: + * Add API to get notified if the xref is reconstructed + * Add somewhat fancier left/right signature visual representation + * Don't assert when trying to invert singular matrices + + build system: + * make boost opt-out if building splash + +Release 21.05.0: + core: + * Fix crashes in malformed files + * Export SplashFont* symbols used by Scribus + * Minor code improvements + + glib: + * Enhance find to support multi-line matching + + qt5/qt6: + * Make sure new signatures are always properly oriented + * Allow to pass the border width when signing + + utils: + * pdftoppm: Fix regression when using single scaleTo. Issue #1062 + + build system: + * Allow to disable building manual tests + +Release 21.04.0: + core: + * Hide symbols by default + * TextSelectionDumper: fix word order for RTL text + * Fix rendering of text in some files. Issue #1052 + * Implement rendering of Masks of Image subtype. Issue #1058 + * Forms: fix unclicking standalone form buttons. Issue #1034 + + glib: + * Expose more fields from MediaRendition in PopplerMedia + * Use stock glib macro to define boxed type + * Remove incorrecly used volatile from enum type registration code + + qt5: + * Fix crash in files with malformed signatures + * Fix memory leak when QImage constructor "fails" + + qt6: + * Fix crash in files with malformed signatures + * Fix memory leak when QImage constructor "fails" + + utils: + * pdfsig: New paragraph for "-sign" in manpage + * pdfimages: Do not assert in "too big images". Issue #1061 + + build system: + * Require cmake >= 3.10 + * Require Qt 5 >= 5.9 + * Require glib >= 2.56 + * Require gtk 3 >= 3.22 + * Require gdk-pixbuf >= 2.36 + +Release 21.03.0: + core: + * Fix parsing text in some broken pdf files. Issue #1040 + * Fix memory issue when using threads. Issue #1050 + * TextSelectionDumper: Fix getText() for space after word + * Change signature of OutputDev:tilingPatternFill + * Make PDFDocBuilder return a std::unique_ptr + * Improve well formed check for shading functions + * Fix leak in case of fread failing + * Fix memory leak in broken file in JBIG2Stream::readGenericBitmap + * PSOutputDev: Fix stack overflow in broken files + + glib: + * poppler_annot_free_text_get_callout_line: Fix wrong static cast + * poppler-structure-element: fix memleak + * Improve documentation + * demo: keep same visual appearance between displayed and copied text + + utils: + * pdftotext: Add -cropbox option + * pdftoppm: Add -progress option + * pdftoppm: Fix rounding bug in computation of output bitmap size. Issue #927 + + qt6: + * Add missing poppler-qt6.pc.cmake + +Release 21.02.0: + core: + * GfxCal*ColorSpace: introduce Bradford transform for chromatic adaptation + * Fix memory leak if saving the file fails + * Internal code improvements + * Fix various issues handling broken files + * Make checkedAdd work for long long in MSVC + + qt5: + * Properly export NewSignatureData class + * Fix regression in QIODeviceOutStream + MSVC + + qt6: + * Properly export NewSignatureData class + * Fix regression in QIODeviceOutStream + MSVC + + utils: + * pdftohtml: Fix error() parameter type + +Release 21.01.0: + core: + * Faster routines for jpeg decoding + * Fix reading signatures in encrypted files + * Add white point correction when lcms is used + * JBIG2Stream: Fix byte counting + * Fix potential data loss if we try to fetch a non existing Ref after modifying the document + * Specifically use DeviceGray instead of DefaultGray for softmasks + * Fix various issues handling broken files + + utils: + * pdftocairo: Setmode binary for windows + * pdfsig: Add hability to digitally sign files + * pdftoppm: add options to set DeviceGray/DeviceRGB/DeviceCMYK + * pdftops: add options to set DeviceGray/DeviceRGB/DeviceCMYK + * pdfimages: Account for rotation in PPI calculation + + qt5: + * Add hability to digitally sign files + + qt6: + * Add hability to digitally sign files + + build system: + * Enable clang-tidy bugprone-signed-char-misuse + +Release 20.12.1: + core: + * PSOutputDev: fixing regression in the rasterization code. Issue #1002 + * Add missing profile copy operation in GfxICCBasedColorSpace::copy() + * Fix issue in broken files + + build system: + * Use modern CMake linking for Qt and boost + +Release 20.12.0: + core: + * Draw better circles for circle annotations + * Fix annotation line width if no appearance stream or style are given + * Tweak rendering of highlight annotations + * Fix border rendering of some annotations + * Fix rendering of some files. Issue #976 Issue #567 + * PSOutputDev: provide options to set the rasterization color space and ICC profile + * PSOutputDev: for splashModeCMYK8 and language level >=2 activate overprint emulation + * PSOutputDev: use the DeviceN8 bitmap for rasterization with CMYK-output + overprint + * Use the font name without subset tag when querying for a system font + * Splash: Fix wrong x adjustment during clipping + * Splash: Fix blitImage in uncolored tiling patterns + * timeToDateString: We forgot the ' after the minutes + * Move psLevel to PSOutputDev creation + * Fix several issues in broken files + + utils: + * pdftops: provide options to set the rasterization color space and ICC profile + * pdftops: for splashModeCMYK8 and language level >=2 activate overprint emulation + + cpp: + * New fuzzers + + glib: + * New fuzzers + + qt5: + * New fuzzers + + build system: + * gcc: Enable -fno-operator-names + * Remove obsolete bool-to-binary macro + * Remove obsolete version-check macro for pkgconfig + * Remove .pc files for private back-ends + * Remove redundant unit-test macro + +Release 20.11.0: + core: + * More work on rendering of standalone Annot Widgets. Issue #806 + * Fix crashes in embedded file handling on broken files. Issue #967 + * Fix uninitialized memory read on broken files + * Save a bit of memory in Dict data + + cpp: + * Fix crashes in embedded file handling on broken files. Issue #966 + + utils: + * pdftohtml: HTML and XML output includes font opacity. + + qt5: + * Rename ArthurOutputDev to QPainterOutputDev + + build system: + * Fix linker error when gtk is not in a default location + * Add some checks for gtk-doc support + * Reorganize GObject introspection config + * Enable CMAKE_LINK_DEPENDS_NO_SHARED + +Release 20.10.0: + core: + * Filter out repeated forms + * Implement EmbedStream::reset() + * CairoOutputDev: evict just font faces owned solely by cache. + * Splash: Rename Yd to Ydown, Xu to Xup, etc. + * Splash: fix crash in out-of-memory situation. + * Fix some undefined behaviour situation with forged files + +Release 20.09.0: + core: + * Compability fix for Forms + * Fix fetching of Objects failing in some cases + * Fix clearing date in Annot setModified/setDate + * TextSelectionPainter: support glyphless fonts + * Splash: Don't try read past end of image + * avoid abort() on large memory allocation + * Fix memory leak on broken files + * Fix potential invalid memory read + * Small code improvements + + qt5: + * Document TextAnnotation::inplaceAlign + * Make Annotation::setModification/CreationDate work on existing annots + * Be a bit more stubborn converting dates that come from xml + * Clean as many null characters from the end as possible when converting strings + + glib: + * Add accessor functions for PopplerAttachment + * Deprecate PopplerAttachment GTime fields + * Deprecate PopplerDocument date properties + + utils: + * pdftoppm: report error and exit if output file cannot be written + * Document that PDF-file can be '-' to read it from stdin + + build system: + * cmake: Modern way to link against libpng, zlib and libtiff + * cmake: Remove stray support for lcms1 in pdftocairo + +Release 20.08.0: + core: + * Sub-page objects: initialize clip max values considering the render resolution. Issue #937 + * Splash: Set initial line width to 1. Issue #674 + * Fix stack overflow with specially crafted files + * GfxShading: Simplify holding the Function + * Splash: Fix x86 + windows asm build + + qt5: + * Deprecate Document::toc + * Deprecate AnnotationUtils + +Release 0.90.1: + core: + * Fix regression on PS conversion. + Regression only happened on applications that are locale enabled + i.e. Okular but not pdftops, when using a quite new lcms and + the user locale uses , as decimal separator instead of . + * Add UTF16LE support to TextStringToUCS4. + Even if the standard clearly says it should be UTF16BE + + qt6: + * Add work in progress qt6 port. Ignore for now :) + +Release 0.90.0: + core: + * Color profile tweaks + * Small signature improvements + * BBoxOutputDev: Fix calculation when type3 fonts are involved + * Fix potential crash when reading Forms + * Fix infinite loop in broken file + + glib: + * Fix adding annots in rotated pages + * Add ability to reset forms + * Several fixes to the documentation + + qt5: + * Make it clear we require Qt 5.5 + * demo: Fix crash on broken files + * Small documentation improvements + + utils: + * pdftoppm: Add option to set display profile + * pdftops: Add a -rasterize option with values always, never, or whenneeded + + build system: + * Require cmake 3.5 + * More modern cmake way to link against curl + +Release 0.89.0: + core: + * Add support for ResetForm action. Issue #225 + * Fix crash in PDFDoc::getSignatureFields when there's no Forms at all + * Fix exporting to PS of some files with CID fonts + * Use ICC profiles in PS output (if new enough lcms is used) + * Allow almost-singular tiling pattern matrices. Issue #894 + * Fix memory leak when failing to load some fonts + * CairoOutputDev: Use stroke opacity when clipping to a stroke path + * CairoOutputDev: Fix tiling patterns when pattern cell is too far. Issue #190 + + glib: + * Add poppler_movie_get_aspect + + cpp: + * Add the font infos to the text_box object + +Release 0.88.0: + core: + * Support Widget Annotation Buttons not linked to any Form + * SplashOuputDev: Use stroking opacity when clipping to a stroke path + * Handle 1 bit RGB images in ICC colorspace + * Internal code improvements + + qt5: + * Add Document::signatures. Returns signatures not attached to any page + * ArthurOutputDev: Fix font hinting + * ArthurOutputDev: Set the opacity when filling with axial gradients + * ArthurOutputDev: Implement the clipToStrokePath method + * ArthurOutputDev: Use stroking opacity when clipping to a stroke path + + glib: + * Add poppler_page_get_bounding_box + * Add poppler_form_field_get_alternate_ui_name + * Implement rotation for 'flagNoRotate' annots. Issue #767 + + cpp: + * Add non_raw_non_physical layout for page::text() + + utils: + * pdftohtml: Fix noRoundedCoordinates->noroundcoord in man page + * pdfsig: Show also signatures that aren't attached to any page + +Release 0.87.0: + core: + * Fix leak in broken files + * Internal code improvements + + qt5: + * Add option to get form choice for export value + * ArthurOutputDev: Avoid division by zero in updateLineDash. Issue #695 + + glib: + * Internal code improvements + + utils: + * pdftohtml: Fix memory leak in HtmlOutputDev::getLinkDest + +Release 0.86.1: + core: + * Fix regression in Browse Link handling + * Internal code improvements + +Release 0.86.0: + core: + * Fix link content exfiltration attack + * Splash: Implement gouraudTriangleShadedFill for some non parametrized shadings. Issue #881 + * Fix case unsensitive search for Old Hungarian, Warang Citi, Medefaidrin and Adlam + * Internal code improvements + + glib: + * Automatic handle of page's cropbox on annots. Issue #129 + * Fix memory leak if poppler_document_new_from_file fails + * Minor speed optimization on poppler_page_get_annot_mapping + + utils: + * pdfdetach: add 'savefile' option + * pdftoppm/pdftocairo: Fix more odd/even mismatch + + qt5: + * Fix loading from iodevice + +Release 0.85.0: + core: + * Fix case unsensitive search for Deseret and Osage. Issue #853 + * Fix crash in unicodeToAscii7 + * CairoOutputDev: make initialisation thread-safe + * Fix crash on broken files. Issues #869, #870 + * Internal code improvements + + utils: + * pdftoppm/pdftocairo: Fix -e/-o printing the wrong pages. Issue #873 + * pdftohtml: Fix issue with the font size sometimes being huge + + qt5: + * Fix FormField::name encoding + * Accept UTF-16 uiNames for form fields + * Fix search for "complex" characters + * Allow to load document from QIODevice + + glib: + * make the frontend initialization thread safe. + +Release 0.84.0: + core: + * Fix crash when converting from Unicode to ASCII-7 + * Splash::scaleImageYdXu: Protect against crash if srcWidth is too big + * JBIG2Stream: fix potential crash in malformed documents + * JBIG2Stream: fix leak in reset() if called several times + * Internal code improvements + + utils: + * pdfimages: Add error message if first page is larger then number of pages. + * pdfinfo: Improved paper size recognition + * pdfsig: Fix exit code when dumping signatures + * pdftocairo: Error out when even/odd selects 0 pages + * pdftohtml: Fix memory leak + * pdftoppm: Add an option to scale before rotate + * pdftoppm: Add -hide-annotations option + * pdftoppm: Error out when even/odd selects 0 pages + * pdftops: Improve -optimizecolorspace + + qt5: + * Code cleanups + + glib: + * Fix compiler warrnings + +Release 0.83.0: + core: + * Improve when a file is recognized as Linearized + * Improve const-ness of the code + * Make code a bit more readable/maintanable + * Fix uninitialized memory uses in broken files + + utils: + * pdffonts: Make code a bit more readable/maintanable + * pdftohtml: Make code a bit more readable/maintanable + + qt5: + * Remove a bunch of unused internal functions + * trUtf8 -> tr (less warnings) + + build system: + * make-glib-api-docs: switch to python3 + +Release 0.82.0: + core: + * Fix not being able to open some files. Issue #832 + * Fix crashes in malformed files + * Fix memory leak on broken files + * Minor performance improvements + * Minor code improvements + + glib: + * Add poppler_document_new_from_bytes + * PopplerAttachment: Silence deprecation warnings for ctime/mtime + + build system: + * pdf-inspector: Support builddir != srcdir + * Install Cairo* headers if Cairo has been found + +Release 0.81.0: + core: + * Splash: Always enable support for CMYK rasterization + * CairoOutputDev: Check scaled dimensions for 0. Issue #737 + * BaseCryptStream: Fix potential uninitialized memory read + * SplashBitmap: Fix wrong width condition for splashModeDeviceN8 + * Fix crashes in malformed files + +Release 0.80.0: + core: + * Annotations: Implement support for setting a different text in the appearance stream than the real text + * Splash: Optionally use small_vector from boost + * Fix memory leaks on broken files + * Fix abort on broken files + * Small code simplifications + * Remove USE_FIXEDPOINT support. Issue #821 + + qt5: + * Fix MSVC build + * Add subsitute-font information + * Fix since marker of some functions + * Fix leak when aborting text extraction + * Small code simplifications + + glib: + * Make print scaling getter visible + * Make Duplex/NumCopies/PrintPageRange preference available in API + * Complement Movie API + + utils: + * pdftotext: Add -nodiag flag to remove diagonal text on output + + build system: + * Mark external lib include dirs as SYSTEM + +Release 0.79.0: + core: + * Fix regression on TextSelectionPainter + * Fix parsing of DefaultAppearance + * Fix memory leak in PostScriptFunction + * Fix crashes in fuzzed files + + qt5: + * Implemented support for setIcon by changing appearance + * Added option to set the form available to print + * QString::null is deprecated, use QString() + * Replace deprecated qStableSort with std::stable_sort + + build system: + * Turn README into README.md and expand it + +Release 0.78.0: + core: + * Fix line annotation arrows for usage in dimensioning + * Handle Ink annots without an InkList but with an AP + * Fix typos preventing parsing of Movie start and duration + * Fix crash on malformed files + + glib: + * Add poppler_document_create_dests_tree() + * Don't use the deprecated g_type_class_add_private() + * Document the differences between render() and render_for_printing() + * Fix introspection for poppler_document_new_from_data + * Don't create PopplerInputStream with length 0. Issue #414 + * Document G_IO_ERROR as a possible error condition + * docs: Add index for API new in 0.78 + + build system: + * Fixes cross compilation of gir in Void Linux + * Add -Wshadow to the default warning flags + * install pkg-config pc files if pkg-config is found + +Release 0.77.0: + core: + * Fix crash on signature handling. Issue #766 + * Fix small memory leak in SignatureHandler::getCertificateInfo + * Splash: Restrict filling of overlapping boxes. Issue #750 + * Fix crash on malformed files + + qt5: + * Fix optional content handling with exclusive layers + + cpp: + * Make render_page thread-safe + + utils: + * pdfsig: Fix small memory leak + * pdftotext: Fix typo in manpage + +Release 0.76.1: + core: + * Make the mul tables be calculated at compile time with constexpr. + * splash: Fix compile with SPLASH_CMYK enabled + * Some typo fixing in error messages + + qt5: + * Fix regression in annotation handling + + build system: + * Fix some typos in build system output and comments + +Release 0.76.0: + core: + * Fix regression on case-insensitive search. Issue #743 + * Remove GooList, use std::vector instead + * Fix radiobutton reporting wrong state. Issue #159 + * Handle UTF16-LE strings + * Don't error out if there's no DA in FreeText annotation + * cairo: Compute correct coverage values for box filter. + * cairo: Constrain number of cycles in rescale filter. + * Read more fields from ViewerPreferences + * Introduce and use Ref::INVALID + * Fix crashes in broken files + * Fix mismatched free/delete + * Add missing include guards + + utils: + * pdftohtml: Properly initialize HtmlOutputDev::page to avoid SIGSEGV upon error exit. Issue #742 + +Release 0.75.0: + core: + * Fix rendering of some annotations + * Fix crashes in broken files + * Small internal code improvements + + cpp: + * Improve documentation + * tests: Add showing version information to poppler-dump + + utils: + * pdfattach: new util + * pdftohtml: add -dataurls parameter + * pdftoppm: add -sep and -forcenum parameters + * pdftohtml: make singleHtml and stout not mutually exclusive + * pdfsig: fix use after free + +Release 0.74.0: + core: + * Remove support for obsolete systems. Issue #709 + * Include timezone in timeToDateString() + * Fix/silence some warnings + * Fix issues with broken files + + build system: + * Fix linking in FreeBSD + * Fix fseeko configure check on Android for API level < 24 + * Remove unused MacroPushRequiredVars.cmake + + qt5: + * Add API that lazily builds an outline by wrapping the internal objects + * Demo: Use new API to build Table Of Contents lazily + + glib: + * Improve documentation + * Fix cast from 'GTime *' (aka 'int *') to 'time_t *' (aka 'long *') + + utils: + * pdfsig: add -nssdir option + + cpp: + * Add a way to get all the named destinations in a document. + +Release 0.73.0: + core: + * Fix regression reading some encrypted files. Issue #690 + * Add X509CertificateInfo classes + * Add new 'IgnoreDiacritics' option to ::findText(). Issue #637 + * Open files with CLOEXEC flag set + * Remove Gulong, Guint, Gushort, Guchar typedefs + * Fix handling of some broken files. + + cpp: + * Make initialization of globalParams threadsafe + * Fix page::text_list encoding issue + * Improve handling of UTF-16 by considering Endianess + * Add API to specify a custom data directory + + qt5: + * Expose X509CertificateInfo + * Add the possibility of getting version + * Add new 'IgnoreDiacritics' search flag. Issue #637 + * Make initialization of globalParams threadsafe + * ArthurOutputDev: Remove all Splash code usage + + glib: + * add new 'POPPLER_FIND_IGNORE_DIACRITICS' find flag. Issue #637 + * Fix named destinations. Issue #631 + * Make PrintScaling preference available in API. Bug #92779 + + build system: + * Rename ENABLE_XPDF_HEADERS to ENABLE_UNSTABLE_API_ABI_HEADERS + * support enabling NSS on mingw + * Windows: only set SOVERSION for shared libs + +Release 0.72.0: + core: + * Fix checkbox lacking AP not bein able to change state. Issue #655 + * Draw line annotation endings (arrow, circle, ...) + * cairo: Don't use UNIQUE_ID for PS output, to avoid using PS memory on cairo >= 1.5.10 + * Be more stubborn looking for a nssdb. Issue #669 + * GooString::fromInt: Repair the return value. + * Minor performance improvements + * Avoid cycles in PDF parsing + * Stream::makeFilter: Fix memory leak + * Fix various issues with malformed files + * Rename GooString::getCString to GooString::c_str + * Regenerate UnicodeDecompTables.h from python 3.7.1 + + utils: + * pdfdetach: Check for valid embedded file before trying to save it. Issue #661 + * pdfdetach: Check for valid file name of embedded file before using it to determine save path. Issue #660 + * Fix typos in utils. + + glib: + * Fix missing PopplerAttachment destructor call + * Support getting form widget additional actions. + * docs: Small improvements + + qt5: + * Internally compile with -DQT_NO_SIGNALS_SLOTS_KEYWORDS + +Release 0.71.0: + core: + * Replace the implementation of GooString by std::string but keep the exact interface intact. + * Replace GBool, gTrue, and gFalse by bool, true, false, resp. + * Splash: Fix crash if document is malformed (too wide) + + qt5: + * Fix crash when adding Highlight Annotations + * Default to hidden symbols + * Fix two leaks in a test + + glib: + * demo: Fix build on Windows + * demo: Align property labels to top of cell + + cpp: + * Fix typos in documentation + + build system: + * Enable searching for GTK on Windows + * Remove unused files + * Add fuzzer target from oss-fuzz project + +Release 0.70.1 + glib: + * Install missing file + +Release 0.70.0 + core: + * FreeText annotations: default to font from default appearance string + * Splash: Speed improvements + * Fix security issues found by oss-fuzz + * Improve page lable parsing + * Use std some std classes instead of self grown ones + * Various internal improvements + + qt5: + * Add Page::index() method + * Improve method to get the page from a label string + + glib: + * Fix crash on missing embedded file + * Add support for PDF subtype property + * Only export symbols in the public API + + utils: + * pdftohtml: Improve font handling + +Release 0.69.0 + core: + * Add annotation font color + * Splash: Some speed improvements + * PSOutputDev: add native support for type 7 shadings when using level 3 + * Add support for PDF subtype property + * Link: Fix memory leak regarding next actions + * Fix handling of Signature Info Location and Reason + * Fix errors in computation of type3 glyphs transformation matrix + * Reimplement Dict class in a more modern way + * Fix security issues found by oss-fuzz + * Fix memory issues in GfxImageColorMap copy ctor + * Don't abort if the SampleFunction has too many samples. Issue #634 + * Document the OutputDev::clip and OutputDev::oeClip methods + * fix macOS compilation due to boolean define in jpeglib + * Split GDir and GDirEntry out of gfile.h. Issue #370 + + qt5: + * Add annotation font color + + cpp: + + utils: + * pdfinfo: Show PDF subtype + * pdftotext: Fix only outputs first page content with -bbox-layout option. Issue #88 + * pdftotext: Fix memory leak in printLine + + + build system: + * Require C++14 + +Release 0.68.0 + core: + * Add Reason and Location to SignatureInfo. Bug #107299 + * Fix memory misuse on signature handling + * Fix security issues found by oss-fuzz + * Don't give a warning when Marked value is false. Bug #107430 + + qt5: + * Add Reason and Location to SignatureInfo. Bug #107299 + + cpp: + * Add rotation() to text_box. Bug #106562 + * Fix build with MSVC + + utils: + * pdftoppm: Add -jpegopt optimize option support + * pdftocairo: Add -jpegopt optimize option support + * pdftohtml: Add option to not round coordinates + * pdftohtml: Fix possible crash. Bug #107316 + + build system: + * Use OpenJpeg cmake config file instead of pkgconfig + * Remove wchar_t- on MSVC + + +Release 0.67.0 + core: + * Fix lots of security/leak issues found by oss-fuzz + * Splash: Optimize some files, making them 20% faster (now for AABGR8) + + utils: + * pdfsig: Compile with libc != glibc. Bug #106783 + +Release 0.66.0 + core: + * Fix lots of security/leak issues found by oss-fuzz + * Splash: Optimize some files, making them 20% faster + * Splash: Correctly manipulate spot colors if SPOT_NCOMPS != 4 + * Fix compilation with some strict compilers + +Release 0.65.0 + core: + * SplashOutputDev: Add the invisible character check beginType3Char. Bug #106244 + * XRef: Fix runtime undefined behaviour. Bug #105970 + * Fix issues with malformed documents. Bug #104942, #103238 + * Remove GooHash after replacing it by std::unordered_map + * Add conversion methods between GooString and std::string. + + cpp: + * Add newline after error message + * Expose more image modes, add option to select mode in renderer. Bug #105558 + + build system: + * Fix compilation with libc++ + * Small improvement to FindLIBOPENJPEG2.cmake + + qt5: + * Add widget annot actions to FormFields + + utils: + * pdffonts: Minor formatting changes in the man page. Bug #105194 + +Release 0.64.0 + core: + * Workaround form field text not being drawn on broken files. Bug #103245 + * Add read only setter for form fields + * Add support for Link Hide action + * Add support for Next actions in Links + * Fix parsing of Annot focus out actions + * Fix PDFDoc::checkHeader() for PDFs smaller than 1 KiB. Bug #105674 + * Add const to several classes and members + * gfile: Fix build on some platforms + * Fix issues with on malformed documents. Bug #105972, #105969, #106059, #106061 + * Several small code improvements + + qt5: + * Allow setting of Form visibility status + * Allow setting of Form read only status + * Add support for Link Hide action + * Add support for Next actions in Links + * ArthurOutputDev: Implement axialShadedFill + * ArthurOutputDev: Implement drawImageMask. Bug #105531 + * ArthurOutputDev: Implement Type3 font support + + utils: + * pdfsig: Add -dump which writes signatures to disk. Bug #104881 + + glib: + * less deprecated calls + + build system: + * bring back the option to disable GObject introspection + * Add iconv include dir when compiling + * Make it possible to build poppler without fontconfig. Default for Android + +Release 0.63.0 + core: + * CairoOutputDev: support embedding CCITT image data. Bug #103399 + * CairoOutputDev: limit image size when printing. Bug #103399 + * CairoOutputDev: use GOOD instead of BEST as the default cairo filter for scaling. Bug #103136 + * Error out on save if file has changed since we opened it. Bug #103793 + * PDFDoc: use %c instead of \x to output binary. Bug #103873 + * Fix index out of bounds undefined behaviour in PSTokenizer. Bug #103583 + * Fix opening files with OutlineItem loops. Bug #102914 + * Fix some bugs in StructTreeRoot parsing of parent tree. Bug #103912 + * Remove error for wrong child type for tagged pdf. Bug #103587 + * FoFiTrueType::readPostTable() from xpdf 4.00. Bug #102880 + * GfxFontDict: merge reference generation from xpdf 4.00. Bug #104565 + * Reset lastAbortCheck on updateLevel reset + * PDFDoc::setup: Fail early if base stream length is 0. Bug #103552 + * Check curStr is actually a Stream before doing Stream operations. Bug #104518 + * Fix new Object API porting bug. Bug #104517 + * Check return code of getChar(), abort reading on error. Bug #104502 + * TextPage: Add horizontal scaling to font matrix. Bug #105259 + * Fix EmbedStream replay. Bug #103446 + * Fix memory leak on error condition + * Fix assert on malformed documents. Bug #104354 + * Fix abort in Gfx::opBeginMarkedContent if args[1] is not a name. Bug #104468 + * GfxGouraudTriangleShading::parse: Don't abort on malformed documents. Bug #104567 + * GfxFunctionShading::parse: Fix abort in malformed document. Bug #104581 + * Remove the extern C from glib.h. Bug #103621 + * Don't let ArthurOutputDev be friend of SplashPath anymore + * Fix undefined sanitizer warning about qsort + * Form.h: include time.h for time_t + * Various code improvements + + qt5: + * Add cancellation support to renderToImage and textList + * Do not assume all Screen annotation actions are Renditions. KDE bug #388175 + * qt5: Implement operator= for PageTransition + * ArthurOutputDev: 'clip' should intersect new and old clipping path + * ArthurOutputDev: Implement updateBlendMode + * ArthurOutputDev: Replace the QPainter by a stack of QPainters + * ArthurOutputDev: Rudimentary support for transparency groups + * Remove stale libcms1 code. Bug #104358 + * demo: don't crash if page is malformed + * Fix warnings due to the use of deprecated overloads of Poppler::Page::Search in tests. + + utils: + * pdfimages: Fix for files with flate encoded inline images. Bug #103446 + * pdftocairo: Remove stale libcms1 code. Bug #104358 + * pdfimages: Fix build without libtiff and libpng + * pdfseparate: Fix buffer size warning due to missing space for null terminator + + build system: + * Enable building all libs as static libs + * Enable no-missing-field-initializers + * Remove unused FindLIBOPENJPEG.cmake + * add "--owner root:0 --group root:0" options to tar command in dist target. Bug #104398 + * Add python3 support to gtkdoc.py + * gtkdoc.py: Make it work with newer gtk-doc. Bug #105075 + + cpp: + * Add page::text_list + +Release 0.62.0 + core: + * Stop supporting lcms1, you really want to use lcms2 :) + * Stop supporting openjpeg1, you really want to use openjpeg2 :) + * Open files that state 8 bits as third field of W. Bug #103469 + * GfxLabColorSpace::parse: Fix crash in broken documents. Bug #103582 + * Fix leak if parseDA fails + * Include glibc.h where needed + * Document the meaning of the 'type' integer of a shading + * Fix UTF test fail + * INSTALL: add debug options + + qt5: + * Add API to let the rendering process callback to get a partial rendering. Bug #103372 + + qt4: + * Remove the Qt4 frontend + + utils: + * Support unicode on windows console + * pdfsig: install man page + * sort encoding list + + glib: + * demo: fix warning + +Release 0.61.1 + core: + * CairoOutputDev: don't overflow y * stride when accessing image data + + cpp: + * Fix for corrupted image files on Windows. Bug #102494 + + build system: + * Fix incorrect paths in .pc files. Bug #103578 + * add the custom buildtests target only once. Bug #103003 + +Release 0.61.0 + core: + * Fix crashes in broken files + * Cleanup unused functions from GlobalParams + * Tweak LZWStream::processNextCode error handling. Bug #103174 + * Warning fixes + * Remove t1lib code + + qt5: + * Clean up the remaining Splash code in Arthur backend. Bug #103117 + * ArthurOutputDev: Properly implement saveState/restoreState. Bug #103118 + * Fix leak in ArthurOutputDev::updateFont. Bug #103508 + + build system: + * Use GNUInstallDirs. Bug #103211 + * mingw: Install pkg-config files + * mingw: change library names to include the soversion. Bug #103157 + * Fix installing a .cc file as header + * Use -pthread flag instead of -lpthread + +Release 0.60.1 + qt5: + * ArthurOutputDev: Add missing 'return' in error paths + + build system: + * FindLIBOPENJPEG.cmake: Add CheckCXXSourceCompiles + +Release 0.60.0 + core: + * Enable libcurl support by default + * PSOutputDev: Fix wrong text generation. Bug #102760 + * Added methods to get and set the font size of text fields. Bug #101692 + * CairoOutputDev: Do not extend the pattern in drawImageMaskRegular + * CairoOutputDev: do not use the custom downscaling for rendering images when using cairo >= 1.14 + * Fix build with old clang + * Fix various crashes in broken files + * Fix some warnings + * Add some constness to the basic classes + * Remove unused functions from GlobalParams + + qt5: + * Added methods to get and set the font size of text fields. Bug #101692 + * Add whether renderToImage shows annotations + * ArthurOutputDev: Replace Splash font rendering by Qt font rendering + * ArthurOutputDev: Implement the drawSoftMaskedImage method + * ArthurOutputDev: Fix several small bugs related to dash pattern handling + * Fix two minor typos + + build system: + * cmake is now the default build system + * autotools based build system has been removed + + utils: + * pdfinfo: don't truncate dest name + +Release 0.59.0 + core: + * Fix infinite recursion in NameTree parsing in broken files + + utils: + * pdfunite: Fix API porting error that caused abort in some cases + * pdfinfo: Fix crashes and memory leaks when using -dests + * pdfinfo: use GooString.append instead of sprintf/strcat + * pdfimages: Fix warning when compiling with cygwin + + build system: + * Fix cygwin 32-bit compile + * cmake tweaks + + +Release 0.58.0 + core: + * CairoOutputDev: cairo 1.14 now has high quality downscaling + * Signature related improvements. Bug #99271 + * Tweak which cmap we use. Bug #101855 + * Memory leak fixes + * Substantial rework of the internals + * win32: call ANSI functions directly. Bug #100312 + * Add some documentation + + qt5: + * Expose signature information. + * ArthurOutputDev: initialize the image with the paper color. Bug #102129 + * Fix copy'n'paste bugs: Qt4 -> Qt5 + * ArthurOutputDev: Properly set the QPainter transformation + * ArthurOutputDev: Use Qt::SvgMiterJoin instead of Qt::MiterJoin. Bug #102356 + + utils: + * pdfinfo: add -dests option to print named destinations. Bug #97262 + * pdftocairo: add -jpegopt for setting jpeg compression parameters. Bug #45727 + * pdftoppm: add -jpegopt for setting jpeg compression parameters. Bug #45727 + * pdfimages: support listing/extracting inline images. Bug #25625 + + build system: + * cmake: Various Windows fixes + * cmake: Use -std=c++11 instead of -std=gnu++11 + + cpp: + * Fix page.text() not taking page orientation into account. Bug #94517 + +Release 0.57.0 + core: + * Fix parsing of Type 1 fonts with newlines in encoding sequences. Bug #101728 + * Fix crash in broken documents + + utils: + * pdfunite: Fix crash with broken documents. Bug #101208 + * pdftohtml: skip control characters Bug #101770 + * pdfseparate: minor improvement to the documentation. Bug #101800 + + build system: + * cmake: Set RUNPATH for poppler shared libs. Bug #101945 + * configure: fix --disable-FEATURE actually enabling the feature + +Release 0.56.0 + core: + * FormFieldButton::setState() shouldn't check the field is readOnly + * Fix crashes on multiple broken files + + utils: + * pdfunite: Fix crash with broken documents. Bugs #101153 #101149 + +Release 0.55.0 + core: + * Fix abort in files with broken Decode arrays. KDE bug #379835 + * Fix memory leak (and probably logic bug) parsing broken XRef entries. Bug #100775 + * Fix memory leak when reconstructing broken files. Bug #100776 + * Minor optimization + * Fix regression in GfxIndexedColorSpace::mapColorToBase. Bug #100931 + * Fix memory leak in error condition + + cpp: + * Return nullptr if the page at index can't be fetched. Bug #100981 + + build system: + * Fail by default if libjpeg is not available + * Fail by default if libopenjpeg2/1 is not available + +Release 0.54.0 + core: + * Make XRef reconstruction a bit better. Bug #100509 + + glib: + * Expose movie play mode. Bug #99625 + * demo: Show play mode in movie properties view + + qt5: + * Compile with -DQT_NO_CAST_FROM_BYTEARRAY. Bug #100311 + + utils: + * pdfimages: don't fail listing if inline image data contains 'EI'. Bug #100737 + +Release 0.53.0 + core: + * Form support improvements + * SplashOutputDev: Fix memory leak when rendering images with colormap and matte color + * Minor fix in GlobalParams documentation + + qt5: + * Expose form calculate order + * Expose Form additional actions + + utils: + * pdfimages: support 16bpc png and tiff images. Bug #99988 + * pdftohtml: fix small memory leak when constructing some filenames + * pdfinfo: fix leak when printing JS + + build sytem: + * Compile in C++11 mode + +Release 0.52.0 + core: + * Fix assert on reading some OCGs. Bug #99768 + * Properly initialize some RichMedia variables in corner cases. Bug #99767 + + qt4: + * optcontent structure was leaking the headers items. Bug #99449 + * Cleanup objects in tests to fix memory leaks. Bug #99449 + + qt5: + * optcontent structure was leaking the headers items. Bug #99449 + * Cleanup objects in tests to fix memory leaks. Bug #99449 + + utils: + * pdftocairo.1: Fix typo + +Release 0.51.0 + core: + * Check for error from NSS in SignatureHandler construct. Bug #99363 + * Add Form[Field|Widget]::setPartialName + * Fix memory leak in PDFDoc::markAnnotations + + qt5: + * Implement digital signature support. Bug #94378 + * Add Poppler::FormField::setName + * Fix segfault/assert if LinkDestination is constructed with invalid input string. Bug #99357 + + utils: + * pdfunite: add fields to AcroForm dict. Bug #99141 + +Release 0.50.0 + core: + * PSOutputDev: Fix PS conversion for some files. Bug #63963 + * Fix Outline parsing on broken documents. Bug #98732 + * Fix PDFDoc::saveIncrementalUpdate()'s detection of document being modified. Bug #96561 + * SplashOutputDev: Read softmask into memstrean in case of matte. Bug #97803 + * Bail out if Hints nBitsNumObjects or nBitsDiffGroupLength are greater than 32. Bug #94941 + * CairoOutputDev: initialize CairoOutputDev::antialias. Bug #98983 + * Fix crash when loading some thumbnails. Bug #97870 + + utils: + * pdftoppm: Fix -tiff -gray/-mono incorrect output. + * pdftops: add -passlevel1customcolor. Bug #97193 + + + build system: + * Default to libopenjpeg2 instead of libopenjpeg1 + + qt: + * Support OCG state change links + + glib: + * Use g_slice_new0 for PopplerActionLayer. Bug #98786 + +Release 0.49.0 + core: + * Merge type3 glyph handling from xpdf 3.04. Bug #96667 + * Continue rendering in case of 'Singular matrix in shading pattern fill. Bug #98623 + * Fix memory leak in parametrized gouraudTriangleShadedFill + * Fix crash on broken files + * PDFDoc::setDocInfoStringEntry(): treat value consisting of just the unicode marker as an empty string + * Fix UBSAN warning + * Misc compile fixes + + utils: + * pdfseparate: remove extra '%' in error message + + build system: + * configure: Fix typo in disable nss help string + +Release 0.48.0 + core: + * Fix crashes and memory leaks in invalid files. + * Small memory usage improvements. + * TextOutputDev: Remove null characters from PDF text. Bug #97144 + * TextOutputDev: Break words on all whitespace characters. Bug #97399 + * Fix UTF16 decoding of document outline title. Bug #97156 + * Add functions for named destination name in name-tree/dict + + glib: + * Increase glib requirement to 2.41 + +Release 0.47.0 + core: + * Fix abort on documents where the docinfo obj is not a dict. Bug #97134 + * Check for XRefEntry existing before using it. Bug #97005 + * Fix memory leak on PDFDoc::setDocInfoStringEntry() with empty string + * Don't presume that DocInfo is a dictionary in XRef::createDocInfoIfNoneExists() + + build system: + * configure: Work with non gnu greps + +Release 0.46.0 + core: + * cairo: fix bug in setAntialias() + * cairo: Fix tiling patterns with BBox with non-zero x,y + * cairo: try finding glyphs in substitute fonts by unicode value. Bug #96994 + * Added XRef modification flag + * Added DocInfo setters & getters + * Be less strict when parsing FitH Link destinations. Bug #96661 + + utils: + * pdftocairo: revert the use of groups for blending into white page + * pdftocairo: Use fprintf for printing errors + * pdfinfo: Don't print pdf info when printing metadata, javascript, or structure. Bug #96801 + + glib: + * Added document property setters & simplified getters + * make document metatag gobject properties writeable + + cpp: + * pass len to GooString constructor in detail::ustring_to_unicode_GooString(). Bug #96426 + * Added functions to save a document + * Added document property setters & getters + + qt4: + * Added document property setters & simplified getters + + qt5: + * Added document property setters & simplified getters + + build system: + * configure: Don't use -fPIC on cygwin + * configure: Work with non gnu greps + +Release 0.45.0 + core: + * SplashOutputDev: Fix iccTransform + splashModeXBGR8 + * Fix memory leaks + * Fix crash in broken files. Bug #95567. Bug #96027 + * Emulate some non portable glibc functions when not available + + utils: + * pdftohtml: Fix crash in broken files. Bug #95563 + * pdfinfo: convert dates to local time zone + * pdfinfo: add -isodates for printing dates in ISO-8601 format + * pdfinfo: Fix memory leaks + + glib: + * return date in UTC instead of local time. Bug #94173 + + cpp: + * switched from detail::convert_date() to core's dateStringToTime() + +Release 0.44.0 + core: + * Fix Compile in 32bit linux. Bug #95492 + * Splash: type 3 chars. restore the current position also in output device. Bug #95344 + * Splash: Improve rendering of some dotted lines. Bug #84693 + * Refactor GooString::Set(). Bug #94201 + * Fix typo in GfxPatchMeshShading::parse + * Fix memory leak in PSOutputDev::filterPSLabel + * Fix memory leak in SignatureHandler::getDefaultFirefoxCertDB_Linux + * Fix potential crash in SplashOutputDev::doUpdateFont + * Fix potential crash in TextPage::coalesce + * Remove call that does nothing + + utils: + * pdftocairo: add -antialias option. Bug #94977 + +Release 0.43.0 + core: + * Implement sanity check for linearization usage. Bug #92482 + * Add SymbolMT as an alias for the Symbol font. Bug #93168 + * Fix some blank files. Bug #94756 + * cairo: fix fillToStrokePathClip crash and rendering. Bug #62905 + * cairo: Check if PDF knows the width of 'm' in case of substituted font. Bug #94054 + * cairo: save mask state and don't extend image mask. bug #94234 + * SplashOuputDev: Compile with C++11 compilers that don't define isinfinite. Bug #94761 + * typo fixes + + utils: + * pdftocairo: Calculate rotation before scaling. Bug #94655 + + qt4: + * Fix crash on certain PDF form item activation actions. Bug #94873 + + qt5: + * Fix crash on certain PDF form item activation actions. Bug #94873 + +Release 0.42.0 + core: + * Add the support for version 5 + revision 6 documents. Bug #85368 + * Add initial support for Signature handling + * Initialize gamut mapping multipliers in ::copy() functions. Bug #90697 + * Implement jpx streams support with depth < 8 + * Handle SMaskInData = 0 for JPX encoded images. Bug #93468 + * Fix rendering of some broken PDF files. Bug #92508 + * PSOutputDev: Support for LZW encoding + * PSOutputDev: Add support for Flate compression in Level 3 output. + * SplashOuputDev: Implement function shading. Bug #94441 + * SplashOuputDev: Improve rendering of some non embedded fonts. Bug #94054 + * SplashOuputDev: Fall back to Gfx implementation of tiling pattern if repetition rate is small. Bug #90596 + * SplashOuputDev: Implementation of Matte entries in softmasks of softmasked images. Bug #22473 + * SplashOuputDev: assure line width > 0 in case of text stroke. Bug #94038 + * TextOuputDev: Cache result of inner loop in visitDepthFirst. Bug #77087 + * Avoid attempting a tiling pattern fill with a singular transform matrix + + utils: + * pdfinfo: Add option to show document structure + * pdfsig: New command that gives information about signature + + qt4: + * Fix bug in links to remote documents getting the page number wrong sometimes + + qt5: + * Fix bug in links to remote documents getting the page number wrong sometimes + +Release 0.41.0 + core: + * CairoOutputDev: add missing font types (fontCIDType0COT and fontTrueTypeOT). Bug #93559 + * SplashOutputDev: Adjust limit check and check in addition bitmap pointer. Bug #94053 + + utils: + * pdfseparate: Refine resource detection + * pdfinfo: fix man page + +Release 0.40.0 + core: + * CairoOutputDev: Use shape mask with soft mask. Bug #91931 + * TextOutputDev: Handle right-to-left text in search + * TextOutputDev: Fix finding Arabic Presentation Forms ligatures + * Fix crash in invalid file. Bug #93476 + * Regression test improvements + + utils: + * pdftocairo: fix writing to stdout out with image output + * pdftocairo: document that -singlefile appends file type. Bug #86254 + * pdftocairo: ensure surface flushed before accessing image data + * pdftocairo: check for invalid use of options. Bug #92195 + * pdfunite: Fix typo in manual + + build system: + * Improve cmake build system + +Release 0.39.0 + core: + * Ignore the alternateSpace and tintTransform. Bug #92381 + * CairoOutputDev: Scale radial pattern. Bug #22098 + * CairoOutputDev: Implement function shading using mesh gradients. Bug #88394 + * Regression test improvements + * Fix typos in error messages + + build system: + * Visual Studio 2015 now supports snprintf. Bug #93116 + + utils: + * pdftops: fix %%PageBoundingBox. Bug #87161 + * pdftocairo: Fix double free when both user and owner passwords are given + + glib: + * Add duration_real to PopplerPageTransition. Bug #92040 + * Remove enum PopplerOrientation from API. Bug #93229 + * documentation improvements + * glib-demo improvements + +Release 0.38.0 + core: + * Splash: Multiply opacity in case of pattern colorspace. Bug #92592 + * Small form improvements on non ascii character rendering + * Clarify README + + build system: + * Clarify internal DCT and JPX are only provided as deprecated fallbacks + + utils: + * pdftocairo: fix fit to page transformation + +Release 0.37.0 + core: + * CairoOutputDev: Use mask for even-odd fill. Bug #84527 + * SplashOuputDev: Protect calls to set/getAA with the proper #if guards. Bug #92006 + * SplashOuputDev: Try to use an external font if the internal one is invalid + * PageTransition D is a number not an int. Bug #92040 + * Catalog::getNumPages(): validate page count + * Catalog::cachePageTree(): recover from out of memory condition + * Fix crashes in malformed documents + + build system: + * configure: fix openjpeg detection + +Release 0.36.0 + core: + * Patch to support RichMedia annotations + * Splash: Fix wrong memory access. Bug #91686 + * Cairo: fix size of transparency group surface. Bug #66229 + * Fix bounds check in Linearization::getPageFirst. Bug #91200 + * File Saving improvements + * Add premultiplied alpha channel to SplashBitmap + * Fix for xref table creation. Bug #90790 + * Fix JBIG2Decode infinite loop and stack overflow. Bug #91186 + * Minor optimization in text extraction + + qt4: + * Basic support for RichMedia annotations + * Change default image format + * Minor optimizations + + qt5: + * Basic support for RichMedia annotations + * Change default image format + * Minor optimizations + + cpp: + * Fix utf8/utf16 conversion. Bug #91644 + + build system: + * Do not hardcode -fPIC in Makefile.am + * cmake: Allow configuring SHARE_INSTALL_DIR. Bug #90293 + + utils: + * pdfunite: Insert embedded files in result pdf. Bug #90066 + * pdftotext: Add -bbox-layout option. Bug #89941 + +Release 0.35.0 + core: + * Fix assert in broken file. Bug #91344 + * Adjust memory layout computation of GooString + * Make SplashBitmap XBGR transfer alpha channel + * Splash: Fix wrong writes on non rgb outputs. Bug #90570 + * Splash: remove ifndef in Windows code + * GlobalParamsWin bugfixes. Bug #91053 + + qt4: + * Switch default image format + * Add IgnorePaperColor render flag + + qt5: + * Improve efficiency of Poppler::Page::renderToImage + * Switch default image format + * Add IgnorePaperColor render flag + + build system: + * Allow configuring SPLASH_CMYK support + * Add configure --enable-build-type. Bug #90796 + + glib: + * Explicitly link against pthread + * Deprecation fixes + + utils: + * pdftocairo: Fix cast to pointer from integer of different size on win64 + +Release 0.34.0 + core: + * Splash: Fix crash in PDF with nested softmasks. Bug #91240 + * Splash: Speed up of rendering icc based images. Bug #90171 + * PSOutputDev: Embed Type1 fonts to PostScript files correctly. Bug #19747 + * Fix pedantic memory leak + + glib: + * update new symbols section + + build system: + * cmake: Make sure ENABLE_LIBOPENJPEG is either 0 or 1 + +Release 0.33.0 + core: + * Fix regression in pdftops parameter passing. Bug #89827 + * Combine base characters and diacritical marks. Bug #87215 + * Use width from W array for WMode positioning. Bug #89621 + * Fixed adding annotation of Subtype Popup to pdf page. Bug #89136 + * CairoOutputDev: Fix memory leak in CairoFreeTypeFont::create + * SplashOutputDev: memset on error to have reproducible outputs + + qt4: + * Fix PDF Text String -> QString conversion. KDE Bug #344849 + + qt5: + * Fix PDF Text String -> QString conversion. KDE Bug #344849 + + glib: + * Add poppler_annot_markup_set_popup_rectangle() + * Fix segfault when creating PopplerAction. Bug #90093 + + utils: + * pdftohtml: Set exit status adecuately. Bug #83609 + + build system: + * configure: Fix invalid shell comparaison in libtiff test + +Release 0.32.0 + core: + * Annotations: Fix rendering of empty BG/BC arrays + * Splash: Fix wrong colour shown when GouraudTriangleShFill uses a DeviceN colorspace. Bug #89182 + * Splash: Fix use of uninitialized variable in Splash::pipeRun + * Remove unnecesary check for font validity. Bug #88939 + * Small optimization in GooString::appendfv(). Bug #89096 + * Fix crashes in malformed files + + utils: + * pdftops: Make colorpsace optimization an option instead of default + * pdfseparate: use always an unique instance for PDFDoc for savePageAs + + build system: + * cmake: If extra-cmake-modules is around include the Sanitizers module + +Release 0.31.0 + core: + * CairoOutputDev: support embedding JBIG2 image data + * Accept malformed documents whose root is a Page instead of a Pages. Bug #88172 + * Fix crash on broken documents + * JPEG2000Stream: Inline doGetChar and doLookChar + * GlobalParams cleaning + + utils: + * pdftops: Add rasterization option. Bug #85934 + + qt4: + * Expose whole-words search option + + qt5: + * Expose whole-words search option + +Release 0.30.0 + core: + * Openjpeg2 support (openjpeg 1 is preferred). Bug #58906 + * Fix potential memory corruption on TextSelectionDumper. Bug #84555 + * Check for invalid matrix in annotation. Bug #84990 + * Open some not conforming files. Bug #85919 + * PSOutputDev: Accept a list of pages indeces instead of first, last. Bug #84833 + * Fix memory leak on error condition + + cpp: + * New API to set debug output function + + build system: + * configure: Improve support with older clang versions. Bug #76963 + + utils: + * pdfunite: Support output intents, optional content and acroform + +Release 0.29.0 + core: + * Use correct LAB byte array for lcms input. Bug #86388 + * Write correct size in trailer dict. Bug #86063 + * Use Default colorspaces if present instead of Device colorspaces + * Solve blend mode problem in CYMK and DeviceN for separable blend modes + * Compilation/warning fixes on SunOS + * Regression test improvements + + glib: + * demo: Compilation fixlets + + build system: + * cofigure: print "no" instead of "auto" if lcms not found + +Release 0.28.0 + core: + * Fix rendering of file with a wrong embedded font. Bug #84270 + * Use alt colorspace to get CMYK values for an ICC based CMYK colorspace. Bug #79019 + * Map Standard/Expert encoding ligatures to AGLFN names. Bug #80093 + * Make Attribute::getName() work when UTF-16BE is used. Bug #84722 + * Fix memory leak in Dict::remove. Bug #84607 + * Fix crashes in broken files + * SplashOutputDev: Improve Overprintmode and shadings. Bug #80998 + * CairoOutputDev: fix crash when no group color space. Bug #85137 + * CairoOutputDev: Don't render text when text matrix is not invertable. Bug #78042 + * CairoOutputDev: Only embed mime data for gray/rgb/cmyk colorspaces. Bug #80719 + * CairoOutputDev: Only embed mime data if image decode map is identity + * cairo: Use matrix to determine pattern size. Bug #33364 + * Fix compile warnings + * regression test improvements + + glib: + * Fix use of uninitialized members in PopplerInputStream. Bug #82630 + * Documentation improvements + * Do not dist gir_DATA + * Remove use of GTK deprecated functions. Bug #82384. Bug #82385 + * Build introspection linking to the uninstalled libraries. Big #84526 + + qt4: + * Add a new Page::annotations() that let's you specify subtypes + + qt5: + * Add a new Page::annotations() that let's you specify subtypes + + utils: + * pdfseparate: additonal handling for annotations. Bug #77549 + * pdfdetach: fix crash when getPage() returns null. Bug #85145 + * pdftocairo: Add support for printing to a Windows printer. Bug #79936 + + build system: + * Move automake version check from autogen.sh to configure.ac. Bug #79797 + * Makefile.am cleanups. Bug #79411 + * Use poppler-data pkg-config + * Make autogen.sh work with variables with spaces + * Don't use -fPIC on mingw + * Fix build with --disable-utils. Bug #84448 + +Release 0.26.4 + core: + * CairoOutputDev: Make sure we always push a transparency group in setSoftMaskFromImageMask(). Bug #81624 + * Fix a crash when adding Annotation without contents + * Improve non-latin characters in inline notes. Bug #65956 + * Don't check for inlineImg twice. Bug #82059 + * printf() -> error() + + glib: + * Return NULL in poppler_annot_get_contents also for empty strings + * Fix a memory leak when getting text layout and attributes + +Release 0.26.3 + qt5: + * autoconf: Improve moc-qt5 detection + * Fix compilation with MinGW + + glib: + * Fix typo in api docs + * use C90-style comments in public headers + + core: + * Error out instead of exiting if allInter grows too much. Bug #78714 + + qt4: + * Update required version to Qt 4.7.0 + + build system: + * Include stdio.h from poppler-config.h + + misc: + * Update .gitignore files + +Release 0.26.2 + core: + * Make sure we have an xref before using. KDE Bug #335413 + + build system: + * autoconf: Fix typo in configure.ac + + utils: + * pdftohtml: exit with 0 with -v and -h + +Release 0.26.1 + core: + * Use field value V for radio buttons. Bug #75979 + * Fix extraction of text in some files. Bug #78145 + * Only add annotations of the current page when splitting. Bug #77549 + + build system: + * autoconf: Fix libopenjpeg 1.5 detection on some systems. Bug #78389 + + glib: + * Fix multiple definition of PopplerTextSpan + +Release 0.26.0 + qt4: + * Fix mismatched boolean logic in TextAnnotation::setInplaceIntent + + qt5: + * Fix mismatched boolean logic in TextAnnotation::setInplaceIntent + + core: + * Very small code cleanup + + cpp: + * Very small code cleanup + +Release 0.25.3 + core: + * Fix crashes on broken files + * Avoid MinGW/Cygwin warnings due to redefinition of NOMINMAX + * Fix some small memory leaks + + qt5: + * Fix some kinds of OCG models + * Cleanup some deprecated methods + + glib: + * Fix the first coord of the quadrilateral in create_poppler_quads_from_annot_quads(). Bug #76504 + + utils: + * pdftohtml: Fix typo in manpage + + qt4: + * Fix some kinds of OCG models + +Release 0.25.2 + core: + * Tagged-PDF support + * Open some broken files. Bug #75232 + * Fix crashes on broken files + * Fix regression parsing some broken files. KDE Bug #329600 + * Improve compilation under Win 8 with Visual Studio 2012. Bug #73111 + * PSOutputDev: Ensure paper size takes into account rotation. Bug #72312 + * PSOutputDev: Fix DocumentMedia/Page/Media/PageBBox DSC comments + * PSOutputDev: Use crop box as page size + * PSOutputDev: Remove origpagesizes mode and make -origpagesizes an alias for -paper match + * PSOutputDev: Only change paper size when different to previous size + * PSOutputDev: Ensure there is always a page size in the output + * PSOutputDev: Fix regression when creating level1 PS. Bug #75241 + * CairoOutputDev: Clip to crop box. Gnome Bug #649886 + * Splash: Blend usage in PDF with spot colors casue random output. Bug #74883 + * Splash: Fix off by one that caused crash in a file. Bug #76387 + * Make sure number of least objects in hints table is valid. Bug #74741 + * Limit numeric parsing of character names. Bug #38456 + + glib: + * Tagged-PDF support + * Annotation improvements + * Install error callback. Bug #73269 + * Fix gobject-introspection warnings + * demo: Fix performance in text markup annotations + * Increase gtk3 dependency + + qt4: + * Improve naming of internal export/import macros + * Add GCC visibility export attributes + * Expose document-supplied text direction + + qt5: + * Improve naming of internal export/import macros + * Add GCC visibility export attributes + * Expose document-supplied text direction + + utils: + * pdftocairo: Ensure page size and crop box works the same as pdftops + * Fix TIFF writting in Windows. Bug #75969 + + buildsystem: + * Learn about automake 1.14 + * Do not define -ansi. Bug #72499 + * cmake: Install JpegWriter.h depending on libjpeg + * cmake: Use c99 for the c compiler + +Release 0.25.1 + core: + * GooString format: Added some tests + improved documentation + * GooString format: fixed bug with printing LLONG_MIN + * regression test improvements + + qt4: + * Arthur backend font rendering improvements + * test program to save to file + + qt5: + * Arthur backend font rendering improvements + * Improve detection of Qt5 moc. Bug #72744 + * test program to save to file + + utils: + * pdfunite: Work even if there's a single file given + * pdfunite: do not lose fonts when merging some files + +Release 0.25.0 + core: + * Annotation improvements + * Tagged PDF work + * Improve speed on some files using ICC color space + * Use ICC profile in OutputIntents. Bug #34053 + * Limit use of ZapfDingbats character names. Bug #60243 + * Splash: correction for knockout transparency groups + * regression test improvements + + utils: + * pdftoppm: Added thinlinemode option setting + * pdfinfo: Indicate if pdf contains javascript + * pdfinfo: Add option to print out javascript + * pdfimages: Print size, ratio, and ppi + * pdfimages: More image output format support + * pdfseparate: allow zero-padded pagespecs + + glib: + * Annotation improvements + * Add API to get text, text layout and text attributes for a given area + * demo improvements + +Release 0.24.5 + core: + * Fix crash due to wrong formatting of error message. KDE Bug #328511 + +Release 0.24.4 + core: + * Fix regression in broken endstream detection. Bug #70854 + * Catalog: sort entries of NameTrees to make sure lookup works. Bug #26049 + * Don't infinite loop if reading from GooFile::read fails. Bug #71835 + + utils: + * pdftotext: Do not close stdout. Bug #71639 + * pdftotext: Silence warning for may be used uninitialized variable. Bug #71640 + * pdftotext: Escape the text of the xml headers + * Warn the user if he provides a wrong range + + qt4: + * Fix typo in xml API. Bug #71643 + + qt5: + * Fix typo in xml API. Bug #71643 + +Release 0.24.3 + core: + * PSOutputDev: Fix PFB font embedding. Bug #69717 + * CairoOutputDev: Do not set an invalid matrix in drawImage(). Bug #70085 + + qt4: + * Don't crash if getXRef()->copy() fails + + qt5: + * Don't crash if getXRef()->copy() fails + + utils: + * pdfseparate: Allow only one %d in the filename. Bug #69434 + +Release 0.24.2 + core: + * Windows: Fix CreateFile fails with ERROR_SHARING_VIOLATION. Bug #69597 + + utils: + * pdfseparate: improve the path building + * pdftocairo: check file opening failure in beginDocument() + +Release 0.24.1 + core: + * SplashOutputDev: use getRGBLine images if available. Bug #66928 + * SplashOutputDev: Don't copy bitmap if we don't need to. + * PSOutputDev: Fix regression in -eps -level1sep rendering. Bug #68321 + * Fix crash in malformed file 1026.asan.0.42.pdf + * use copyString instead of strdup where memory is freed with gfree. Bug #67666 + + utils: + * pdfdetach: don't mention xpdfrc + * pdftotext: Fix -bbox with stdin as input. Bug #45163 + * pdftohtml: Fix jpeg image export. Bug #48270 + * pdfimages: Fix typos in man page + + glib: + * demo: Remove GTK_DISABLE_DEPRECATED compilation flag + + qt4: + * Fix small typo in documentation + + qt5: + * Fix small typo in documentation + +Release 0.24.0 + core: + * TextOutputDev: Do not draw ligatures more than once when selected. Bug #9001 + * PSOutputDev: Make some pdftops conversions much faster + * PSOutputDev: Initialize t3FillColorOnly + * SplashOutputDev: Fallback to 1x1 bitmap if we fail to create the real size + +Release 0.23.4 + core: + * TextOutputDev: clip the selected text rendering to the selection box. Bug #66983 + * CairoImageOutputDev: Fix the bounding box of saved images + + build system: + * Improve linking against pthreads + +Release 0.23.3 + core: + * Annotation improvements + * Fix crashes on malformed files + * TextSelectionPainter: Draw glyphs after selection background + * TextOutputDev: add a method to TextPage to get the selection as a list of words + + qt5: + * Initial Qt5 port + + qt4: + * Windows compile fixes + * Demo: Allow the choose the page rotation + + build system: + * Fix mingw build + * Minor autotools fixes + +Release 0.23.2 + core: + * SplashOutputDev: Speed-up some tiling on a 10x factor + * Improve caching of lcms2 ICC color profiles + * Put some private classes in an anonymous namespace + + qt4: + * Add a thread stresser tool + + build system: + * Fix mingw build + +Release 0.23.1 + core: + * XRef stream writing: Write 32-bit offsets when possible + * Fix splashModeBGR8 rendering (Bug #64381) + + glib: + * Do not use deprecated gtk_scrolled_window_add_with_viewport() (Bug #64683) + + build system: + * Fix Large file support when using cmake + +Release 0.23.0 + core: + * Make rendering thread safe + * Large file support + * Implement Crypt filter (Bug #62800) + * Fix endstream detection (Bug #62985) + * CairoOutputDev: support uncolored tiling patterns (Bug #59179) + * SplashOutputDev: Introduce Thin Line mode support (Bug #37347) + + qt4: + * Expose Thin Line mode support + +Release 0.22.4 + core: + * Always consider a softmask transfer function (Bug #63587) + * Fix crash on malformed files (Bug #63190) + * Splash: Fix compilation with fixed point mode enabled + + utils: + * Fix crash on some files (Bug #63909) + + qt4: + * Fix name decoding of some attachments (KDE Bug #307786) + + build system: + * Fix compilation with mingw-w64 compiler + +Release 0.22.3 + core: + * Check order bounding box values in tiling pattern (Bug #62369) + * CairoImageOutputDev: Don't change image interpolation when printing (Bug #62418) + * TextOutputDev: Set text matrix when painting selection (Bug #61042) + * Only write the file once when saving (Bug #62739) + * Fix for complete rewrites in repaired files + * Fixlet regarding spec interpretation for Link Zoom value + * Fix typos in man pages + * Fix compile when not using libjpeg + + glib: + * Always start from the beginning when starting a new search on a page (Bug #59972) + + qt4: + * Fix crash in files with LinkRendition (KDE Bug #317710) + + build system: + * Small cmake improvements + +Release 0.22.2 + core: + * Correct rendering of underline and strike out annotations (Bug #61518) + * Workaround broken jpeg stream definitions (Bug #61994) + * SplashOutputDev: Restore CTM on early exits (Bug #61413) + * SplashOutputDev: Make sure we don't try to paint in x < 0 (KDE Bug #315432) + * Fix latin page labels. (Bug #61034) + * Fix compilation with jpeglib9 + * Fix minor valgrind warning + + utils: + * pdfimages: Fix extraction of some images (Bug #61168) + + build system: + * Fix the build with automake-1.13 + +Release 0.22.1 + core: + * Fix crash in some pdf files when extracting text (Bug #59561) + * Fix crashes in wrongly formed files + * Fix wrong warning when opening some files (Bug #58966) + + build system: + * Improve autoconf jpeglib.h detection (Bug #59186) + +Release 0.22.0 + core: + * Fix crash in invalid files that define a <= 0 bits per image value + * Fix a few issues in JPX decoding when not using OpenJPEG + * TextOutputDev: Use page size for max value in TextPage::visitSelection + * Fix typo in error message + + utils: + * Fix pdfunite regression (Bug #58569) + * Demo fixes and improvements + + misc: + * pdf-inspector improvements + +Release 0.21.4 + core: + * SplashOutputDev: Fix crash when rendering in monochrome mode + * SplashOutputDev: Fix line widths in monochrome mode (Bug #57294) + * PSOutputDev: Fix crop on EPS conversion (Bug #30692) + * TextOutputDev: Fix minor logic mistake + * Fix assert on some malformed files (Bug #58257) + * Move #include "jpeglib.h" into .cc file (Bug #57687) + * Filter text that may end up being written to the shell + * Fix windows compile warnings + + glib: + * Add poppler_annot_set_flags (Bug #58015) + * Demo fixes and improvements + + qt4: + * Fix check_lexer on 32-bit systems + +Release 0.21.3 + core: + * Splash: Implement bilinear image scaling (Bug #22138) + * CairoOutputDev: Update fill and stroke color in startPage (Bug #54526) + * Fix GooString::insert() + * Allow large chars in TextPage + * Fix crash on ActualText::end + * Don't use memcpy to copy classes + * Fix warnings + + glib: + * Check if words end with spaces (Bug #54504) + * Ensure text is only computed on first render + * Fix warnings while generating introspection file + * Fix returns tag in PopplerAttachmentSaveFunc api doc + * Minor demo fixes + +Release 0.21.2 + core: + * CairoOutputDev: make drawImage work with images > 32767 in width/height (Bug #56858) + * CairoOutputDev: Fix soft mask when image resolution != smask resolution (Bug #57070) + * CairoOutputDev: Fix crash in CairoImageOutputDev with setSoftMaskFromImageMask (Bug #57067) + * Remove a check on fonts that we don't need (Bug #56753) + * Misc code cleanups + + utils: + * pdftocairo: Add tiff output support (Bug #57006) + * pdfunite: Fix -v (Bug #56817) + * Misc code cleanups + +Release 0.21.1 + core: + * Annotation improvements + * Form improvements + * CairoImageOutputDev: Support parameterized Gouraud shading (Bug #56463) + * UTF validation fixes + * Do not call drawing routines if we don't need non text (Bug #54617) + * Fix Memory leak in CharCodeToUnicode (Bug #54702) + + qt4: + * Make LinkRendition properties available (Bug #55378) + * Accessors for FormWidgetChoice::editChoice + * Implement overprint + +Release 0.21.0 + core: + * Support the modification of files with Encrypt + * Annotation improvements + * Form improvements + * Splash: Implement DeviceN support + * Splash: Avoid bogus memory error for tilingPattern + * TextOutputDev: Allow multiple fonts in a TextWord + * Kill the concept of base dir + * PSOutputDev: Always write HiResBoundingBox (Bug #53159) + * Convert UTF-16 to UCS-4 when reading toUnicode cmap + * GooString formatting: add support for uppercase hexadecimal + * Use error() instead of fprintf(stderr, ...) in Annot::layoutText + * poppler-config.h: remove WITH_FONTCONFIGURATION_* macros + + glib: + * Annotation improvements + * Add poppler_page_remove_annot() + * Add poppler_document_new_from_stream + * Add poppler_document_new_from_gfile + * Add poppler_page_find_text_with_options (Bug #2951) + * Demo improvements + * Port tests and demo to GTK+3 + + qt4: + * Add accessor methods for movie poster information + * Make 'additional actions' available in Annotation API (Bug #53589) + * Add whole-page search method to Poppler::Page + * Small changes in tests + + utils: + * pdftohtml: Make the output more xhtml compliant + * pdftohtml: Add -fontfullname. (Bug #49872) + * pdftohtml: Do not invoke gs anymore + + build system: + * Add the possibility of using lcms1 even if lcms2 is installed + * Remove extra fontconfig CFLAGS and LIBS + +Release 0.20.5 + core: + * Fix crashes in malformed documents + * Fix parsing of very big numbers + * Splash: Do not render invalid font outlines (Bug #55573) + * Check for NaN in TextPage::addChar + + build system: + * Fix build using mingw64 with winpthread + * autotools: Fix compilation when lcms is on non standard locations (Bug #55326) + * Support automake-1.12 (Bug #55541) + + glib: + * Chain up finalize to the parent class (Bug #55521) + +Release 0.20.4 + core: + * Improvements regarding embedded file handling. (KDE Bug #306008) + * Fix opening some broken files (Bug #14303) + * Fix memory leaks + * Fix crashes in various broken files + * Refine warning to only complain when really needed + * Remove function declared but not implemented + * Remove execution permissions from a header file + + qt4: + * Improvements regarding embedded file handling. (KDE Bug #306008) + +Release 0.20.3 + core: + * If NULL, NULL fails as password try EMPTY, EMPTY before failing (Bug #3498) + * SplashOutputDev: Fix bogus memory allocation size in Splash::arbitraryTransformImage (Bug #49523) + * SplashOutputDev: Fix segfault when scaleImage returns NULL (Bug #52488) + * SplashOutputDev: Blend mode enhancements for CMYK + * PSOutputDev: Fix conversion when creating multiple strips (Bug #51982) + * PSOutputDev: Fix Bitmaps in level2sep or level3sep (Bug #52384) + * PSOutputDev: Fix DeviceN images with alternate Lab colorspace in level 3 PostScript (Bug #51822) + * PSOutputDev: Make sure xScale and yScale are always initialized (Bug #52215) + * Unify poppler-config.h includes in core "installed" headers (Bug #52193) + * Replace c++ style includes with c style ones (Bug #52426) + + utils: + * pdfseparate: Return 0 on success + +Release 0.20.2 + core: + * Fix compilation on Windows + * Copy resources content defined in the pages dict on save (Bug #51369) + * PSOutputDev: Correct %%DocumentCustomColors (Bug #51479) + * PSOutputDev: Fix handling of DeviceN images in level 3 PostScript (Bug #51548) + * Fix crash in malformed documents + + qt4: + * Do not hang on malformed /Annots objects (Bug #51361) + +Release 0.20.1 + core: + * Remove unnecesary transparency group handling in splash (Bug #13487) + * Include substitute font name in system font cache (Bug #49826) + * Fix logic on SplashBitmap::writeImgFile + * PSOutputDev: use setoverprintmode only if rip knows it + * Fix crash in malformed documents + + qt4: + * Make TextAnnotation constructor public + * Fix saving of default TextAnnotation to xml + * Keep page rotation into account when normalizing annotation coords + + glib: + * Fix memory leak when document fails to load + * Make sure password is always converted to latin1 + * Fix typo in documentation + + build system: + * Distribute cmake/modules/FindLCMS2.cmake (Bug #49818) + + utils: + * pdftohtml: Determine if font is bold or italic based on FontDescriptor (Bug #49758) + * pdfseparate: Syntax fixes in the man page + +Release 0.20.0 + core: + * Reconstruct xref table if xref needed but missing (Bug #40719) + * Fix getFullyQualifiedName with unicode field names (Bug #49256) + * SplashOutputDev: Fix rendering of knockout groups (Bug #12185) + * SplashOutputDev: Fix cmyk transfer bug (Bug #49341) + * Fix crashes in broken documents + * Bring back the Outputdev::begin/endMarkedContent virtuals + * Build fixes + + qt4: + * Convert propertly unicode encoded field qualified names + + glib: + * glib: Use delete[] to free array allocated with new[] (Bug #48447) + +Release 0.19.4 + core: + * Annotation improvements + * More compatible file writing + * SplashOutputDev: Fix slow rendering of pdf with a lot of image masks in pattern colorspace + * Fix crashes in broken documents + * Fix spurious warning messages + + utils: + * pdftotext: Add missing section heading to man page + * pdftohtml: Fix crash when the destination file does not exist + + build system: + * autoconf: Do not append "-ansi" to CXXFLAG, if "-std=XXX" is already specified. + * autoconf: Do not clear FREETYPE_CFLAGS, FREETYPE_LIBS before PKG_CHECK_MODULES() + * autoconf: Copying graphics library CFLAGS to cpp frontend Makefile.am + +Release 0.19.3 + core: + * Annotation improvements + * CairoOutputDev: Fix regression caused by mesh gradients + * CairoOutputDev: Use correct userfont font bbox (Bug #48399) + * CairoOutputDev: Fix paintTransparencyGroup when both mask and fill opacity are required (Bug #48453) + * CairoOutputDev: Ensure 0 width lines with stroke_adjust are aligned + * CairoOutputDev: Only align stroke coords for horizontal and vertical lines (Bug #48318) + * CairoOutputDev: Fix stroke pattern with transparency group (Bug #48468) + * Fix crash in JBIG2Stream decoding + * Fix memory leak when looking for a substitute font + * Fix page labels to not have a null character at the end + * Fix Splash CMYK merge error + * ttc<->ttf fallback is expected for CJK font list in for Windows (Bug #48046) + + qt4: + * Annotations can now be modified + * Annotations can now be added + * Annotations can now be removed + + utils: + * pdftohtml: Add producer and version to xml output + * pdftohtml: Fix the mask inversion for PNG + +Release 0.19.2 + core: + * Annotation improvements + * CairoOutputDev: update cairo mesh pattern to 1.12 api + * CairoOutputDev: fix some transparency issues (Bug #47739) + * CairoOutputDev: Fix regression in some shadings + * TextOutputDev: Don't add newline to last line extracted by TextSelectionDumper (Bug #45955) + * CJK font improvements + * Improve font matching for non embedded fonts + * Fix regression regarding forceRasterize in PSOutputDev + * Fix typos glyph names in truetype 'post' table standard mac ordering + + build system: + * minor cmake fixes + * misc autoconf fixes + * POPPLER_VERSION is now wrapped in quotes + + utils: + * pdftohtml: extract mask images even if they are not JPEG (Bug #47186) + * pdftohtml: Flip images if they need to (Bug #32340) + +Release 0.19.1 + core: + * Improve CJK suport in PSOutputDev + * CJK substitute implementation on WIndows platforms + * Do not crash on malformed files with 0 bits in the color map of an image + * Fix regression in some PSOutputDev array sizing + * Improvements to Annotation editing + * Fix logic error in Rendition parsing code (Bug #47063) + * Minor API changes to SplashOutputDev (Bug #46622) + * Fix mismatch in some functions declarations + * Update poppler copyright year + + utils: + * pdftops: Fix -passfonts regression. (Bug #46744) + * pdffonts: List the encoding of each font. (Bug #46888) + * pdftohtml: Add possibilty of controlling word breaks percentage. (Bug #47022) + + qt4: + * Support for LinkMovie object (Bug #40561) + * Support for Media Rendition + + glib: + * Add poppler_fonts_iter_get_encoding + * Improvements to the demo + +Release 0.19.0 + core: + * Merge Xpdf 3.03 + * Add support for lcms2 + * SplashOutputDev: Implement Overprint + * PSOutputDev: Implement Overprint + * Expand glyph name ligatures such as "ff", "ffi" etc to normal form (Bug #7002) + * Use an Identity CharCodeToUnicode for Adobe-Identity and Adobe-UCS collections (Bug #35468) + * CairoOutputDev: Avoid setting huge clip area when printing (Bug #44002) + * CairoOutputDev: Fix test for rotation (Bug #14619) + * CairoOutputDev: Don't read inline image streams twice (Bug #45668) + * CairoOutputDev: set mask matrix before drawing an image with a mask (Bug #40828) + * Update glyph names to Unicode values mapping (Bug #13131) + * Only use Hints table when there are no parse errors (Bug #46459) + * Expose POPPLER_VERSION in poppler-config.h + + utils: + * pdftohtml: Output images in -xml mode if no -i option is specified + * pdftohtml: Get rid of static data members; merge duplicated jpeg dumping code + * pdftohtml: Be more consistent generating the outlines + * pdftohtml: Generate outlines in pdftohtml in -xml mode (Bug #56993) + * pdftohtml: Combine UTF16 surrogate pairs (Bug #46521) + * pdfinfo: Report page rotation + * pdfinfo: Decode utf-16 surrogate pairs + * pdftoppm: Allow one of -scale-to-[xy] = -1 to mean the aspect ratio is to be preserved (Bug #43393) + * pdftocairo: Allow one of -scale-to-[xy] = -1 to mean the aspect ratio is to be preserved + * pdffonts: Add -subst option to list the substitute font name and filename + * pdfseparate: Produce PDF/X conformant pdf pages if the original PDF was PDF/X conformant + * pdfimages: Add -list option to list all images (Bug #46066) + * Improve various manpages + + glib: + * Add poppler_fonts_iter_get_substitute_name + * Demo improvements + * Update gtk-doc makefile and m4 file + * Fix typos in documentation + + qt4: + * Add the option of PSConverter creating EPS + * Form support improvements + + build system: + * autotools: Print the cairo version required if not found (Bug #44619) + * autotools: Print the glib version required if not found + * autotools: Use pkgconfig to check for libopenjpeg (Bug #21789) + * autotools: Replace openjpeg compile test with a version test + * Add a configuration option for the test data dir + +Release 0.18.4 + core: + * CairoOutputDev: Restore temporary clip used in CairoOutputDev::fill when painting a mask + * CairoOutputDev: Ensure paintTransparencyGroup uses same ctm as beginTransparencyGroup. Bug #29968 + * CairoOutputDev: Use fabs when comparing the transformed line width. Bug #43441 + * CairoOutputDev: Remove unused variable in CairoFontEngine.cc. Bug #45442 + * SplashOutputDev: Do not use 50Kb of stack in SplashXPath::addCurve. Bug #44905 + * JpegWriter: set image parameters after jpeg_set_defaults(). Bug #45224 + * OpenJPEG decoder: Set OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG if you have it. Bug #43414 + * Lexer: convert integer to real when overflow occurs. Bug #45605 + + glib: + * Various minor introspection and documentation improvements. Bug #44790 + * Fix return values. Bug #45440. Bug #45441 + * gtk-doc improvements. Bug #45549 + * Introspection improvements. Bug #45455 + + utils: + * HtmlOutputDev: Proper unicode support when dumping PDF outline. Bug #45572 + * HtmlOutputDev: Fix leaks. Bug #45805 + * HtmlOutputDev: Close li tags in generated outlines. Bug #45807 + * man pages: fix minor issues with hypens and % + + build system: + * automake: Link to lcms if needed + * automake: Fix build for builddir != srcdir. Bug #45434 + * automake: Improve moc detection when cross compiling + * Fix build with latest mingw-w64 headers. Bug #45407 + + qt4: + * remove non-existing 'qt' include dirs + +Release 0.18.3 + core: + * Do not fail if we are trying to save a file with Encrypt that has not been modified. KDE Bug #288045 + * Include .otf fonts when finding substitute fonts. Bug #44412 + * Fix stack overflow in PDFDoc::markObject(). Bug #44660 + * Include strings.h as we use memcpy. Bug #43558 + + utils: + * pdfunite: Properly initialize globalParams. Bug #44659 + * pdfseparate: Properly initialize globalParams + * Fix iniliazialization of GooString arguments + + build system: + * autoconf: Check for cairo-ft and other cairo backends. Bug #43969 + +Release 0.18.2 + core: + * Fix leak in GooString when resizing to a smaller string + * Fix crash if failing to parse the colorspace. Bug #42793 + * Make GfxColorSpace::parse accept dicts + + qt4: + * Use PDFDoc(wchar_t *, ...) on Windows. Bug #35378 + * Add missing include + * Minor fixes in documentation + + utils: + * pdftocairo: Fix crash when rendering only odd/even pages in a printing format + + build system: + * Fix pkg-config files + +Release 0.18.1 + core: + * PSOutputDev: Output PS that does not confuse libspectre + * PSOutputDev: Fix tiling pattern fill matrix. Bug #41374 + * PSOutputDev: Emit non repeating patterns just once + * PSOutputDev: Fix uncolored tiling patterns. Bug #41462 + * CairoOutputDev: Fix crash when using poppler_page_get_image() + * CairoOutputDev: Fix various setSoftMask bugs. Bug #41005 + + utils: + * pdftocairo: Flush/close files one we are done using them + * pdftocairo: Compile in Windows + + build system: + * CMake: Fix typo in option description + * CMake: Correctly include fontconfig include dir + * Remove poppler-cairo dependency from poppler-glib pkg-config file + + qt4: + * Minor fixes in documentation + +Release 0.18.0 + core: + * Fix small memory leak when dealing with marked content + * Remove DCTStream::getRawStream since Stream::getNextStream does the same + + utils: + * Rename pdfmerge to pdfunite + * Rename pdfextract to pdfseparate + * pdfseparate: Complain if %d is not present and it should + * Add pdfseparate and pdfunite man pages + + build system: + * Minor cleanup in regarding removed qt code + +Release 0.17.4 (0.18 RC) + core: + * SplashOutputDev: Compile when defining USE_FIXEDPOINT + * PNGWriter: Compile with libpng >= 1.5.0 + +Release 0.17.3 (0.18 Beta 3) + core: + * PSOutputDev: Use Patterns for tiling fill when PS level >= 2 + * PSOutputDev: Avoid using /PatternType if only one instance of the pattern is used + * PSOutputDev: Add poppler version as comment in the file + * CairoOutputDev: Set mime data for soft masked images (Bug #40192) + * CairoOutputDev: Assume printer pixel size is 1/600" when stroking 0 width lines (Bug #39067) + * CairoOutputDev: Use cairo_show_text_glyphs() when printing + * CairoOutputDev: Fix stroke patterns (Bug #11719) + * CairoOutputDev: Fix unique id mime data + * CairoOutputDev: fix stroking of very thin lines + * CairoOutputDev: align strokes when Stroke Adjust is true and line width <= 1 (Bug #4536) + * TextOutputDev: Add TextFontInfo::matches() + * Improve PNGWriter + * Rework writing of PDF files + + utils: + * Introduce pdftocairo - utility for creating png/jpeg/ps/eps/pdf/svg using CairoOutputDev + * Introduce pdfextract - utility to extract PDF pages + * Introduce pdfmerge - utility to merge PDF files + * Fix compilation warning + * pdftohtml: Support text rotation (Bug #38586) + * Update SEE ALSO section of man pages + + glib: + * Add poppler_page_get_text_attributes() + * Add text attributes information to text demo + + qt4: + * Add a way to get the fully qualified name of a FormField + * Minor documentation improvements + +Release 0.17.2 (0.18 Beta 2) + core: + * EmbeddedFile improvements + * don't gmalloc(-1) upon ftell failure + * Fix missing content in some pages (Bug #39637) + * Improve selection of CJK fonts (Bug #36474) + * SplashOutputDev: Implement overprint + * SplashOutputDev: Render dots for 0 length dashed lines (Bug #34150) + * SplashOutputDev: Fix bad memory access when not using antialias (Bug #37189) + * PSOutputDev: Make level2sep and level3sep write cmyk instead of rgb + * PSOutputDev: Make level1sep, level2sep and level3sep write gray instead of rgb for gray images + * Fix numerical overflow in libopenjpeg JPXStream (Bug #39361) + * Fix crash on truncated JPEG/DCT stream (Bug #36693) + * Make sure the dict is a page dict (Bugs #35925 #39072) + * Fix calculation of startXRefPos + * Handle missing startxref properly (Bug #38209) + * Parse the "Medium" modifier when asking fontconfig for a font + * Header cleanup + * Include cleanup + * Define cleanup + + glib: + * Add missing permissions flags to PopplerPermissions + * Add missing permission flags to info demo + * Update gtk-doc.make + * Add poppler_document_get_n_attachments() + + utils: + * pdftohtml: Fix encoding of PDF document metadata (Bug #37900) + * pdftohtml: Fix vertical spacing issues (Bug #38019) + * pdftotext: Fix -htmlmeta to correctly output U+2019 in PDF metadata (Bug #37900) + * pdftoppm: Implement overprint + + qt4: + * Rework EmbeddedFile internals + * Fix possible crash in test + +Release 0.17.1 (0.18 Beta 1) + core: + * Rework the way form fields tree is built + * Cleanup unused parameters/variables + + glib: + * Add JavaScript actions + * demo: Show javascript actions in actions view + + qt4: + * tests: Turn some assignments to bool into QVERIFY checks + +Release 0.17.0 (0.18 Alpha) + core: + * Splash: Implement tiling patterns + * Splash: Support slight hinting + * Splash: Radial shading improvements + * Splash: General speed improvements + * Arthur: Add Hinting API + * Cairo: Implement Type 4,5,6,7 shadings using cairo mesh gradients + * Cairo: Use the new cairo unique id to set the surface id when printing + * PS: Add PS level1 non standard binary output option + * PS: Allow setting the rasterization resolution + * Form support improvements + * Annotation support improvements + * General speed improvements + * Add support for handling ViewerPreferences + * Remove abiword output device + + utils: + * pdftoppm: Add -singlefile option (Bug #32025) + * pdftoppm: Add TIFF output format support (Bug #32027) + * pdftops: Add PS level1 non standard binary output option + * pdftops: Allow setting the rasterization resolution + * pdftoabw has been removed + + glib: + * Add poppler_form_field_get_action() (Bug 33174) + * Remove GDK API + * Remove test-poppler-glib + * demo: Add a tooltip with current selected character in text demo + * demo: show the activation action of form fields if there's one + + cpp: + * Add TIFF output possibility + * Add PNM output possibility + + qt4: + * Support slight hinting + * Form support improvements + + qt3: + * The Qt3 frontend has been removed + + tests: + * Merge splash and cairo tests into a single gtk-test tool + +Release 0.16.4 + core: + * Small improvements in Annot parsing + + glib: + * Add g_return macros to make sure index is correct in form field choice methods + * Fix a crash when a choice form field has no items selected in glib-demo + + utils: + * Small fixes to the pdftohtml manpage + * Fix copyright years + + qt4: + * Fix caption of push button fields + +Release 0.16.3 + core: + * Increase precision in PS output device + * Workaround bug when converting pdf to ps with level1 (Bug #31926) + * Fix crash in Splash output device in some broken pdf + * Fix infinite loop in some broken files + * Fix rendering of some substituted fonts (Bug #34522) + * Do not ask Freetype for 0x0 fonts in Splash output device (Bug #34602) + * Don't assume y1 > y3 for points of a highlight annotation (Gnome Bug #643028) + * Handle fontCIDType2OT when creating freetype font in Cairo output device (Gnome Bug #643273) + * Fix crash in some pdf that use ICC color space (Bug #34357) + + glib: + * Don't use an uninitialized local variable in demo + * Add some introspection markers + + qt4: + * Fix crash regression in unicodeToQString (again) + + utils: + * pdftotext: Do not crash when using -bbox + +Release 0.16.2 + core: + * Fix text extraction for some files + + qt4: + * Fix crash regression in unicodeToQString + +Release 0.16.1 + core: + * Fix colorspace issues in the Cairo backend (Bug #32746) + * Remove declaration of function without implementation + * Do not crash in case jpeg_create_decompress fails (Bug #32890) + * Fix variable access mismatch (Bug #33063) + * Fix converting some pdf to ps with -level1sep (Bug #32365) + * Fix line selection, dont check y for Line selections + * Include zlib header in PNGWriter.cc + * Fix leak in Splash backend when doing axial shaded fills + * Fix label to index conversion on multiple prefixes + + glib: + * Use NULL instead of FALSE for functions returning a pointer + * Fix memory leak in poppler_page_get_text_layout() for pages with no text + + qt4: + * Fix unicodeToQString() to correctly decode the Unicode sequence + +Release 0.16.0 + + core: + * Improve the correctness of radial shadings (Bug #32349) + * Adapt the zlib-based FlateStream code to API changes (Bug #32065) + * Make PreScanOutputDev be less agressive when deciding to rasterize (Bug #30107) + * Fix some warnings in newer gcc in Splash backend + * Fix the preliminary bbox/clip calculation in Splash backend + * Use A1 instead of A8 for imagemask in the Cairo backend + * Windows compile fixes + + utils: + * Do not return 99 (or 1) with -h, -v and -printenc (Bug #32149) + * Misc style improvements to pdftohtml code + * pdftohtml: Remove the -resolution flag introduced in 0.15.0 and fix the + existing -zoom flag + + build system: + * Add more warning flags to the default gcc builds + * Enable GObject introspection support in the cmake build system + + qt4: + * Windows compile fixes + +Release 0.15.3 (0.16 RC) + + core: + * Improve rendering of radial shadings + * Open a broken file (Bug #31861) + * Correct parsing of linearization table (Bug #31627) + * Find fonts inside patterns (Bug #31948) + * [win32] Simplify strtok_r implementation + * Use a std::vector<char> instead of a var-length-array of chars + * Fix crashes in broken files + * Use sets instead of arrays for looking for duplicate fonts + + cpp: + * Include correction + + utils: + * pdffonts: Remove duplicated code + +Release 0.15.2 (0.16 Beta 2) + + core: + * Improve shadings and antialias in the Splash backend (Bug #30436) + * Linearization improvements + * Small improvements to the Arthur backend + * Fix calculation of the size of some pages (Bug #30784) + * Fix crashes in broken documents + + qt4: + * Add Page::renderToPainter() method + * Add setDebugErrorFunction() method + + cpp: + * Add the hability to render pages to an image + + utils: + * Add -p flag to pdfimages + + build system: + * Remove -ansi flag for cywin and mingw + +Release 0.15.1 (0.16 Beta 1) + + core: + * Consider render value when colorizing text (Bug #2807) + * Improve rendering of Shading Type 6 and 7 + * Improve dict lookup speed for big dicts + * Fix multiple crashes in malformed PDF files + * Fix memory leak in in malformed PDF files + * Fix memory leak in the Catalog names + * Fix uninitialized uses on DCTScanInfo + * Fix a crash when drawing square/circle annots without a border (Bug #30580) + * Only clip boxes to mediabox if we are at the page level (Bug #30784) + * Do not omit the notdef glyph in the Splash backend + * Fix a crash when redering documents with invalid type 3 fonts in the Cairo backend + * Form improvements + * Add a method to get the PDF file identifier + + glib: + * Add more printing options to the API + * Add a method to get the PDF file identifier + * Add accessor for all PopplerDocument properties + * Form improvements + * Documentation improvements + * Improvements to the demo + + qt4: + * Add a callback to know which page has been printed + * Add a method to get the PDF file identifier + * Optimize GooString to QString conversion + * Some more autotests + * Update Doxyfile (enables .qch file for assistant) + + build system: + * Require Cairo 1.10 + + utils: + * pdftohtml: Add -s option to generate a single HTML page + * pdftotext: Add -bbox option + + cpp: + * Add the possibility of loading a document from raw data + * Add a method to get the PDF file identifier + * Improve Unicode to ustring conversion + * Documentation improvements + * Update Doxyfile + +Release 0.15.0 (0.16 Alpha) + + core: + * Remove exception support + * Improve creation of Annotations + * Fix failure to parse PDF with damaged internal structure. (Bugs #29189 #3870) + * Add a way to access the raw text of a page + * Speed improvements when reading multiple characters from a given Stream + * Speed improvements in the Splash backend + * Speed improvement in gray color space calculations + * Speed improvement in ICC color space calculations + * Speed improvement when reading some fonts + * Make GBool a bool instead of an int + + glib: + * Add GObject introspection support + * Improve creation of Annotations + * Add a way to get the coordinates of each character of a page + * Add a way to get the page label + * Documentation improvements + * Support password protected documents in the demo + * Support for selection in the demo + * Support for adding annotationss in the demo + * Misc improvements in the internals + + qt4: + * Add a way to access the raw text of a page + * Recognize "Print" as named action + * Documentation improvements + + build system: + * Add option for autogen.sh to skip configure + * Nicer autogen.sh output + * Improvements when build the glib frontend with CMake + + utils: + * pdftohtml: Use splash instead of external gs invocation to render the background + * pdftohtml: Let the user specify the resolution of the background. (Bug #29551) + + cpp: + * Add a way to access the raw text of a page + +Release 0.14.3 + + core: + * Tell Windows we are writing/reading binary data from stdout/stdio (Bug #29329) + * Fix crash when parsing some Movie elements (KDE Bug #249586) + +Release 0.14.2 + + core: + * Fix rendering of some documents involving tilingPatternFill in the cairo output device + * Improve rendering of some annotations + * Handle ColorTransform in DCT streams when using libjpeg (Bug #28873) + * Fix crash in the ps output device in some files (KDE Bug #246269) + * Fix crash in some malformed files (Bug #28842) + + build system: + * Improve build on windows + * Add uninstalled .pc file support when using autoconf + + glib: + * Fix a crash when a layer doesn't have a name (Bug #28842) + + utils: + * Fix padding of names in pdftoppm + +Release 0.14.1 + + core: + * Add ObjectStream caching, makes opening some files ten times faster (Bug #26759) + * Fix crash when writing to negative coordinates (Bug #28480) + * Check objects are the type we want them to be when parsing GfxICCBasedColorSpace + * Optimize Splash::compositeBackground + * Optimize color space calculations by using sqrt instead of pow 0.5 + * Fix crash in JBIG2Stream with malformed documents + + build system: + * Make sure we ship two needed cmake files + * Do not distribute glib/poppler-features.h and poppler/poppler-config.h + * Improve compilation with Sun Studio + * Fix linking of the cpp frontend when using autotools + + glib: + * Fix links/annots area for some documents (Bug #28588) + * Fix poppler_page_find_tex() when called more than once (Bug #27927) + + utils: + * Add -cropbox to pdftoppm manual + +Release 0.14.0 + + core: + * Fix crash when parsing pdf with broken JBIG2Stream (Bug #28170) + * Do not follow loops blindly when parsing XRef (Bug #28172) + * Allow quality & progressive mode to be utilised in JpegWriter + * Fix potential assert in Lexer code (KDE bug #240208) + * Fix opening of files whose /P is stored as unsigned integer + * Do not exit() when trying to allocate memory for the XRef fails + + cpp: + * Minor bugfixes + * Documentation improvements + + build system: + * Fix build in mingw32 when using autotools + * Preserve compiler flags when using cmake + +Release 0.13.4 (0.14 RC 1) + + core: + * Include standard float.h instead of unportable values.h + * Fix first color stop offset of linear gradients. Bug #27837 + * Fix compilation if JPEG nor PNG is used + * Use fabs for doubles instead of abs + * Use strtok_r instead strtok + * Adjust bbox for line annots when y1 = y2 + * Some fixes and regressions in the cairo output device + * Better check of overlapping of table cells when selecting text + + cpp: + * Make the pkg-config files really work + * Fix in/out buffer sizes in some functions + +Release 0.13.3 (0.14 Beta 2) + + core: + * Fix roll optimization in the PS function interpreter + * Correctly parse numbers with '+' sign. Gnome bug #614549 + * Add support for cached files + * Add support for reading a cached file from stdin + * Add HTTP support using libcurl, disabled by default + * Add some const correctnes to GooString + * Rework DCTStream error handling. Bug #26280 + * Use current fill_opacity when drawing soft masked images in Cairo backend. Gnome bug #614915 + * Use the topleft of the Rect of text annots to draw + * Fix saving update docs that have a compressed xref table. Bug #27450 + * Parse varius part of the document catalog on demand + * Implement colorizing image masks with pattern colorspace in Cairo backend + * Fix a crash when rendering 0x0 images in Cairo backend + * Check pattern status after setting matrix when rendering images + * Improve text selection/extraction order. Bug #3188 + * Fix pattern size when bbox is not at 0,0 + * Improve colorizing text and masks in pattern colorspace. Bug #27482 + * Silence some Illegal entry in bfrange block in ToUnicode CMap. Bug #27728 + + utils: + * Add the -o[dd] and -e[ven] options to pdftoppm + * Allow read from stdin using the new cached files feature + * Fix crash in pdftohtml when output filename was shorter than 5 characters + + glib: + * Use existing cairo api when rendering to a pixbuf + * Compile with -DGSEAL_ENABLE. Bug #27579 + +Release 0.13.2 (0.14 Beta 1) + + core: + * Improve Movie support + * Fix experimental Arthur backend to compile when if Splash backend is disable + * Fix usage of some streams in the Cairo backend + * Small improvements in the experimental Arthur backend + * Minor annotation improvements + * Rework LinkRendition to follow the spec + * Add support for Set-OCG-State actions + * Correctly initialize the grayscale softmask color in the Splash backend + * Correctly initialize actualText in TextOutputDev when initialization fails + * Various MSVC fixes + + glib: + * Add support for Movie objects + * Add support for Screen annotations + * Add support for rendition actions + * Add support for OCG State actions + * Improvements to the demo + + qt4: + * Always compile the experimental Arthur backend + * Minor speed improvement in QPainter usage + * Add a search overload that takes doubles instead of QRectF + + cpp: + * Fix iconv usage + * use gmtime() when gmtime_r() is not available + * Fix building in autotools in windows + * {from,to}_utf_8() -> {from,to}_utf8() + + build system: + * Multiple CMake build system fixes + * Fix of some DIST targets in autotools + * Make finding of Qt3 in autotools use pkg-config + +Release 0.13.1 (0.14 Alpha 2) + + core: + * New C++ frontend to interface with Poppler using only STL + * Use the right matrix for the mask in drawMaskedImage in Cairo output device. Bug #16906 + * Fix downscaling images when document is rotated in Cairo output device. Bug #26264 + * GooVector rewrite, old version had "unknown" origins/license + * Fix use after free in a error condition + * Improve handling of broken commands. Bug #24575 + * Fix potential use after free in Cairo output device. + * Fix regression in painting. Bug #26243 + * Improve handling of FontConfig. Bug #26544 + * Only assume the OC is not visible if it exists and is set to no. Bug #26532 + * Fix a potential crash in Splash font handling on out of memory conditions + * Implement writeImgFile for splashModeXBGR8 + * Several speed increases (around 40% in some documents) in the Splash output device + * Improve printing on the Cairo output device + * Do not use '\' character in PostScript names + * Omit writing of embedded fonts into temporary files in the Cairo output device. Bug #26694 + * Improve filtering of some images in the Cairo output device. Bugs #25268, #9860 + + utils: + * pdftoppm: Only swap w with h if rotation is 90 or 270 + + build system: + * Add POPPLER_WITH_GDK in cmake build system. Bug #26247 + * Fix typo: "MULTITHREAD" -> "MULTITHREADED in cmake build system + * Wrap #include <jpeglib.h> in extern "C" to fix build. Bug #26351 + * Add the Win32-specific ENABLE_RELOCATABLE option to cmake build system + * Reflect that poppler-glib needs cairo now in cmake build system + * Use pkgconfig to detect libpng on autotools build system + * Detect the need for nanosleep in solaris in cmake build system. Bug #26650 + +Release 0.13.0 (0.14 Alpha) + + core: + * Improvements to Annotation rendering. Bug #23108 + * Do not give an error when opening files without pages. Bug #24720 + * Try to read streams without Length + * Do not crop the transformation matrix at an arbitrary value. Bug #25763 + * Make poppler (optionally) relocatable on Windows + * Use a small object cache in GfxResources to cache GState objects + * Reduce the number of redundant pattern creations in the Cairo output device + * Use colToDbl() to avoid rounding error in the Cairo output device + * Fix problems with mask handling in the Cairo output device. Bug #8474 + * Use a better scale down implementation in the Cairo output device + * Various optimizations to the Splash output device + * Add the possibility to use floats instead of doubles in the Splash output device. Bug #25578 + * Write out fixed-content portion of Type 1 fonts in the PS output device + + build system: + * Improvements to the CMake build system + * Enable AM_SILENT_RULES by default in autotools + * Require glib 2.18 + * Require GTK+ 2.14 + * Make fontconfig optional with mingw compiler + * Remove makefile.vc + + glib: + * Add support for file attachment annotations + * Improvements to the demo + * Use TextOutputDev to get TextPage when we haven't rendered the page + * Remove support for the Splash output device + + utils: + * pdftoppm can now write to jpeg + * pdftoppm embeds the correct resolution in png and jpeg files + + qt4: + * Minor improvements to the tests + +Release 0.12.3 + + core: + * Be more lenient with /Decode key on images. Bug #17439 + * Correctly initialize fileName in LinkGoToR. Bug #25221 + * Improve the reconstruction of the XRef for broken files + * [Cairo backend] Do not crash on malformed files. Bug #24575 + * Accept Fontname if FontName is not present. KDE bug #217013 + * Make PSOutputDev code a bit more resilient + * Fix writing of null objects. Bug #25465 + * [Cairo backend] Fix crash in some documents. GNOME bug #603934 + * Correctly initialize profileCommands in Gfx constructor + + build system: + * Check for openjpeg in the C++ part as it uses bool in the header. Bug #25103 + +Release 0.12.2 + + core: + * Fix a memory leak when converting to PostScript + * Fix crash when reading a font fails. Bug #24525 + * Make the ICC cache per page instead of global. Bug #24686 + * Do not accept negative interval lengths in the page labels tree. Bug #24721 + * Do not crash on files Aspect of Movie objects are reals instead of integers. Bug #24733 + * Do not render patterns when using CairoImageOutputDev + * Allow Transitions dictionary to be a Ref + * Do not crash if jpeg_start_decompress fails. KDE bug #214317 + + glib: + * Fix CVE-2009-3607 + + qt4: + * Use '.' in the annotations XML instead of the decimal separator of the current locale + +Release 0.12.1 + + core: + * Fix compilation on some compilers + * Only initialize the font list once in Windows32/MSVC + * Do not crash on fonts without CharCodeToUnicode. Bug #24036 + * Fix regression due to not setting LC_NUMERIC anymore + * Improve realibility for Streams with broken Length. Bug #6841 + * Write the Info into the trailer dict if there is one. Bug #24091 + * Do not crash when saving files that come from a stream without name. Bug #24090 + * Improve relability of the save function + * Fix the Length value if it was wrong when saving + * Fix includes for those using internal headers + * Rework how hinting is used in the splash backend. It is disabled by default now + * fix constructor of DCTStream when using internal decoder + * Security fixes based xpdf 3.02pl4 + + qt4: + * Add the possibility of setting wheter to use or not font hinting + * Add a way for converters to return more exact errors they had when converting + * Check the document is not locked when converting to PS + + build system: + * Compile on Cygwin + * Use _WIN32 instead of WIN32. Bug #24259 + * Add the possibility to pass LIB_SUFFIX when using CMake + +Release 0.12.0 + + core: + * Fix printf format security warnings + * Improve rendering of radial shadings. Bug #20238 + * Better fallback when there's a font type mismatch. Bug #17252 + * Do not crash on attachments without data stream. Bug #10386 + * Fix infinite loop in JBIG2Decoder. Bug #23025 + + build system: + * Minimizes pkg-config dependencies for Qt frontends + * Add automake 1.11 support + * Use the newest automake found and not the oldest + * Support AM_SILENT_RULES when using automake 1.11 + + utils: + * Add common options to pdftoabw + +Release 0.11.3 (0.12 RC 1) + + core: + * Optimization in the Cairo renderer for some fonts + * Do not apply masks when fill color space mode is csPattern in the Cairo renderer. Bug #22216 + * Check for overflow when parsing integers. Bug #23078 + * Do not save the font file twice for FreeType fonts in the Cairo renderer. Bug #20491 + * Use current fill_opacity when drawing images in the Cairo renderer + * Fix alpha rendering in some files in the Splash renderer. Bug #22143, #22152 + * Implement tiling patterns in the Cairo renderer + * When converting a cm matrix to PS write 4 significant digits for numbers < 1 not 4 decimals. Bug #23332 + * Fix changing of locale, now poppler no longer changes LC_NUMERIC to "C" + * Return PDF version as two integers instead of as a double + + Qt4: + * Addition of the Color Management API + * Small fix to documentation + * Fix backwards text search + + utils: + * Add the -png flag to pdftoppm to output to PNG + +Release 0.11.2 (0.12 Beta 2) + + core: + * Make DecryptStream return sane values for getPos(). Bug #19706 + * Fix bug when printing pdf with multiple page sizes in duplex mode + * Initilize AnnotColot properly when the Array is not correct + * Fix crash on some files with forms. Bug #22485 + * Fix crash in files with invalid embedded files. Bug #22551 + * Improve FileSpec attribute parsing + * Cairo output device improvements. Bugs #10942, #18017, #14160 + * Implement blend modes in cairo backend + * Handle fontType1COT fonts in CairoFontEngine + * Fix generation of PS for some files. Bug #18908 + * Don't use byte_lookup table when color space doesn't support getLine methods. Bug #11027 + * Fix rendering of PDF files with malformed patterns. Bug #22835 + * Add the possibility of disabling font substitution in pdftops. Bug #23030 + * Fix some radio buttons not being detected as such + + glib: + * Improvements to the demo + + Qt4: + * Improvements to the demo + + build system: + * Use gtkbuilder rather than libglade for some tests + + utils: + * Fix bug with noCrop parameter in pdftops + +Release 0.11.1 (0.12 Beta 1) + + core: + * Support colorizing text in pattern colorspace. Bug #19670 and #19994 + * Add the possibility of forcing no hinting of fonts in the Splash backend + * Support multiple page sizes when converting to PS. Bug #19777 + * Also tokens with leading 00 when parsing the char to unicode map. Bug #22025 + * Improvements of rendering speed in documents using PS transformations a lot. Bug #21562 + * More work on Annotations support + * Use Interpolate flag to decide whether applying image interpolation during rendering. Bug #9860 + * Handle Streams in CMap definitions. Bug #22334 + * Fix some bugs in JBIG2Stream handling + * Fix dashed line in page 1 of bug 20011 + * Fix exit(1) when rendering a file + * Fix pdftops crash on file from KDE bug #174899 + * Fix PS generation in some files. Bug #20420 + * Do not create the GfxColorTransform if the lcms could not be created. Bug #20108 + * Check Mask entries are int before using them, if they are real cast to int and try to use them. Bug #21841 + * Use the correct value when creating the V field for form combo boxes + * Give an error when using level1sep in pdftops without having CMYK support. Bug #22026 + * Don't include lcms.h in GfxState.h + * Fix splashColorModeNComps to correctly include all values for each SplashColorMode + * Add splashClearColor that assigns white to the given colorptr + * Kill support for specifying extension in openTmpFile. Bug #21713 + * Fix "Conditional jump or move depends on uninitialised value". Bug #20011 + + glib: + * Add poppler_annot_markup_has_popup() + * Hyphenate UTF-8 and UTF-16BE. Bug #21953 + * Use g_strerror instead of strerror. Bug #22095 + * Fix a crash when a destination points to an invalid page + * Improvements to the demo + + Qt4: + * Add LinkDestination::destinationName() + * Do not try to resolve named destinations for GoTo links pointing to external documents + * Add Page::thumbnail() + * Improvements to the demo + * Improvements to the documentation + + build system: + * Build fix for MSVC + * Better lcms cmake check comming from kdelibs + * Use pkgconfig for autotools lcms check + * Remove unneeded files from repo. Bug #22094 + +Release 0.11.0 (0.12 Alpha) + + core: + * Add initial support for color management + * Remove case-insensitive matching of filenames in PDFDoc constructor + * Fix extraction of some ActualText content + * More work on Annotations support + * Improve font rendering in Cairo output device + * Fix bug in cairo backend with nested masks + * Fix cairo luminosity smask rendering + * Add optionally text support to Cairo output device + * Add the possibility of setting the datadir on runtime + * Return an error code instead of a boolean when saving + * Make the font scanner more versatile + * Small opimization in documents that use PostScriptFunction transforms + * Minor optimization to Stream handling + * Fix some compile warnings + + glib: + * Optional content support + * More work on Annotations support + * Improvements to the demo + * Documentation improvements + * Fix build when compiling with GTK_DISABLE_SINGLE_INCLUDES + + Qt4: + * Support URI actions for Table Of Contents items + * Documentation improvements + * Improvements to the demo + * Add a FontIterator for iterating through the fonts of the document + + utils: + * Allow the use of cropbox in pdftoppm + * Make pdftohtml output png images when the image stream is not a jpeg + * Make pdftotext accept cropping options like pdftoppm + * Support rendering non-square pixels in pdftoppm + + build system: + * Require Cairo 1.8.4 for the Cairo output device + * Require CMake 2.6 when using the CMake build system + * Optionally require libpng for pdftohtml + * Optionally require libcms for color management + +Release 0.10.6 + + core: + * Fix problems that happen when parsing broken JBIG2 files. + CVE-2009-0799, CVE-2009-0800, CVE-2009-1179, CVE-2009-1180 + CVE-2009-1181, CVE-2009-1182, CVE-2009-1183, CVE-2009-1187, CVE-2009-1188 + * Fix parsing of incorrect border arrays. Bug #19761 + * Fix clip test for fonts. Bug #20950 + * Fix getGlyphAdvance to behave correctly on font size changes. Bug #20769 + * Misc build fixes + + build system: + * Fix the Qt4 version we need + +Release 0.10.5 + + core: + * Read the UF entry if present and prefer it over F in Filespec dictionary + * Fix typo that was making CairoOutputDev crash on some files. Bug #17337 + * Make JBIG2Stream more robust to corrupt input data + * Do not blindly follow loops parsing OutlineItem. Bug #18364 + * Set up the error manager before calling jpeg_create_decompress. Bug #20484 + * Check there is an optional content config before using it. Bug #20587 + * Fix rendering of some PDF with OpenType fonts. Bug #20605 + + build system: + * Yet more support for build on windows + * Use AC_CHECK_HEADER to find headers. Bug #20538 + * Check for pkgconfig before using it + * General autotools improvements + +Release 0.10.4 + + core: + * Fix a memory leak when asking for a document-level JS + * Do not crash in some PDF we do not parse correctly. Bug #19702 + * Fix crash on unexepcted form Opt value. Bug #19790 + + utils: + * Fix pdfimages to extract i color components per pixel jpeg images. Bug #19789 + +Release 0.10.3 + + core: + * Fix a crash on documents with malformed outline. Bug #19024 + * Fix leak on AnnotScreen destructor. Bug #19095 + * Fix wrong PS generation when a large image is in Patterns. Bug #18908 + * Remove BaseFile.h it was never used. Bug #19298 + * Improve document saving + * Fix PS generation of PDF with malformed font Length2 definition + * Fix a leak while parsing annotations + * Fix rendering of some checkboxes + + Qt4: + * Fix positioning of Form rects on PDF with cropbox + * Fix positioning of Annotation rects on PDF with cropbox. Bug #18558. + * Small documentation improvements + * Make Document::fonts() work when called more than once. Bug #19405 + + build system: + * CMake: look harder for openjpeg + * CMake: update the poppler core headers installation + * Autotools: do not install Function.cc as it's not a header + + Qt: + * Fix deserialization of links right coordinate + +Release 0.10.2 + + core: + * Fix a crash when selecting text in word mode + * Fix a crash in some malformed documents (second argument of opMarkPoint is not a dictionary) + * Ensure cairo font matrix is invertable. Fixes bugs #18254 and #18429 + * Fix a memory leak (Bug #18924) + + Qt4: + * Fix deserization of links right coordinate + + misc: + * Fix build on Solaris 10 + Sun Studio 12 + * Compile with -pedantic + +Release 0.10.1 + + core: + * Improvements in Optional Content support + * Small fix in Form support + * Fix memory leak in case of error + * Fix potential crash on text search + * Try render documents with invalid indexed color space parameters. Bug #18374 + * Fix crash on text extraction when poppler-data is not installed. Bug #18023 + + Qt: + * Fix two memory leaks + + Qt4: + * Small documentation improvement + * Fix memory leak in the demo code + +Release 0.10.0 + + core: + * Fix crashes on PDF using Stitching or Axial Shading painting + * Fix rendering of PDF with Type1 fonts that have more than + one encoding definition per line + * Do not try to save documents that have Encryption as we + do not support that and the user ended with a broken file + * Fix crash on files with OptionalContentGroup but no Name + + Qt4: + * Fix the area of the links to be correctly reported on rotated documents + + misc: + * Mingw+Msys should work + +Release 0.9.3 (0.10 RC 2) + + core: + * Fix rendering regression on some embedded fonts + * Fix rendering regression of some special fonts + * Fix crash on documents with bogus jpeg data + + Qt4: + * The printing flag defaults to true on PSConverter + * Documentation improvement + + utils: + * Fix regression that made HmtlOutputDev ignore jpeg images + + misc: + * Improve compilation on mingw + +Release 0.9.2 (0.10 RC 1) + + core: + * Fix conversion to PS some files (bug #17645) + * Small Form fixes + * Small JS fixes + * Improve memory usage of the cairo renderer + + utils: + * Fix mismatched free/delete in pdftohtml + * Fix memory leak in pdftohtml + * Fix crash in pdftohtml + + glib: + * Fix a crash in forms demo + + misc: + * Compile with -pedantic + +Release 0.9.1 (0.10 Beta 2) + + Core: + * Fix crash on some AESv2 encrypted files (bugs #13972, #16092, #17523) + * Improve parsing of broken files (bug #17568) + + glib frontend: + * Minor improvements to the demo application + + utils: + * pdftohtml: Generate the outline file in the same place + of the other generated files (bug #17504) + +Release 0.9.0 (0.10 Beta 1) + + Core: + * Initial JavaScript support + * Annotation improvements + * Improvements in the Arthur based renderer + * Improvements in the Cairo based renderer + * Added a JPEG2000 decoder based on OpenJPEG + * Small fixes in ActualText implementation + * Fix jpeg rendering when not using the libjpeg based decoder + * Movie fixes + * Do not get out of memory on documents that specify huge fonts + * Emulate Adobe Reader behaviour on documents with duplicate keys in Dictionaries + * Forms improvements + + Qt4 frontend: + * Annotation improvements + * Forms improvements + * Add the possibility of extracting embedded fonts + * Initial Movie support + * Documentation improvements + * Small improvements in the PS exporter + + glib frontend: + * Annotation improvements + * Attachment fixes + + utils: + * updated man pages + * Added -listenc to pdfinfo and pdftotext + +Release 0.8.7 + + Core: + * Fix regression in Form rendering + * Fix memory leak in the cairo backend + +Release 0.8.6 + + Core: + * Call error() when font loading fails + * Be less strict parsing TTF tables (bug #16940) + * Fix crash due to uninitialized variable + + Qt 4 frontend: + * Make the paper color setting working as it should + * Make sure to use the correct page width/height for form widgets coordinates + +Release 0.8.5 + + Core: + * Fix crash on PDF that define a page thumbnail but it's not a Stream + * Fix crash when Annots object is not of the desired type + * Fix crash when obtaining fonts in PDF where XObjects link themselves in loops + * Fix crash on documents with an IRT object + * Saving should work much better now + * Plug some memory leaks in Annotation handling + + Utils: + * pdftohtml: Don't crash on documents that specify an invalid named dest for a link + * pdftohtml: Make html output to keep all the spaces with   + * pdftohtml: Improve a bit text layout + * pdftohtml: Make xml output valid xml + +Release 0.8.4 + + Core: + * Fix leak in ABWOutputDev.cc + * Fix uninitialized variable that broke file saving in some cases + * Use a single global FT_Library in CairoOutputDev. + Fixes some crashes in CairoOutputDev. + + Qt 4 frontend: + * Fix saving over existing files + + build system: + * Make sure Qt4 moc is used to generate moc files in Qt4 frontend + +Release 0.8.3 + + Core: + * Fix crash when reading some PDF with annotations + * Fix crash on PDF that reference Optional Content elements that don't exist + * Fix leaks on error conditions + * Do not limit CharCodeToUnicodeString to 8 characters + * Support for surrogates outside the BMP plane + + Qt 3 frontend: + * Fix crash when reading PDF with password + * Fix leak when calling scanForFonts() + + Qt 4 frontend: + * Fix the text() method + + Splash renderer: + * Fix compilation with --enable-fixedpoint + +Release 0.8.2 + + core: + * Fix call broken by a fix introduced in 0.8.1 + +Release 0.8.1 + + core: + * Do not call FT_Done_Face on a live cairo_font_face_t as it might cause crashes + * Do not take into account Colorspace resource subdictionary for image XObjects + * Downsample 16 bit per component images to 8 bit per component so they render + + build system: + * Link to pthread when the system needs it + + windows: + * Fix comparing against NULL instead against INVALID_HANDLE_VALUE when calling FindFirstFile + +Release 0.8.0 + + * Fix caching of members in the glib frontend causing issues with rendering + * Change glib public api to have a correct naming + * Some better error handling on corner cases + * Check the document stream is seekable when opening it + * Build fixes with autotools and with cmake + * Fix infinite recursion on some malformed documents when consulting the fonts + * Fix possible crash when asking for Movie contents + +Release 0.7.3 (0.8 RC 2) + + * Fix regression in Splash renderer + * Fix off-by-one write in Splash + * Plug some minor leaks in Optional Content code + * Improve error handling when creating a document in the glib frontend + +Release 0.7.2 (0.8 RC 1) + + Major Changes: + * Improve font matching not forcing default values onto Fontconfig + * Add preliminary annotations support in the glib frontend + * Initial Movie support in the core + * Make GDK dependency optional in glib bindings + + Minor Changes: + * Make the core able to read mime types of embedded files + * Qt4 API for accessing mime types of embedded files + * Handle correctly check state of optional content groups + regarding parents state + * Avoid setting singular CTM matrices on the Cairo backend + * Improved Qt4 API to get character position + * Qt4 api documentation improvements + * Qt4 minor stability fixes + * Proper lib64 Qt detection + * Fix build when compiling without cairo support + +Release 0.7.1 (0.8 Beta 2) + + Major Changes: + * Really distribute CMake files as optional build tool + * Initial Optional Content support in core and in the Qt4 frontend + + Minor Changes: + * Allow grouped checkboxes to be selected individually + * Qt4 demo program improvements + * Keep cairo and cairo_shape consistent + * Safety checks on Splash renderer so that it does not draw outside the allocated bitmap + * Do not try to display bitmaps of invalid size + * Fix building with exceptions + * Improvements for building with MSVC and CMake + +Release 0.7.0 (0.8 Beta 1) + + * Saving support + * Partial annotation support + * Forms improvements + * Add support for ActualText entries + * Display characters outside of unicode BMP with TT font + * CJK rendering fixes + * Implement Adobe Glyph Naming convention for fonts + * CMake as optional build tool + * Better font scaling for non embedded fonts + * Preserve PDF page labels when we output as postscript + +Release 0.6.4 + + Qt4 frontend: + * Fix crash on links that point to a non existent page + * Make Document::renderHints return the correct render hints + * Fix infinite loop when parsing LineAnnotation + + core: + * Fix crash in the Splash renderer when T3 fonts are badly defined + * Draw underlined Links correctly + + utils: + * Fix two use after free bugs in HtmlOutputDev.cc + + build system: + * Fix build on mingw32 + + tests: + * Distribute the glade file of pdf-inspector + +Release 0.6.3 + + core: + * Fix crash in extra debug code + + glib frontend: + * Make sure passwords are passed correctly to poppler core + + Qt frontend: + * Fix crash on documents that specify an empty date + + build system: + * Disable gtk tests if the user disabled glib frontend + +Release 0.6.2 + + poppler core: + * Fix CVE-2007-4352, CVE-2007-5392 and CVE-2007-5393 + * Fix a crash on documents with wrong CCITTFaxStream + * Fix a crash in the Cairo renderer with invalid embedded fonts + * Fix a crash with invalid TrueType fonts + * Check if font is inside the clip area before rendering + it to a temporary bitmap in the Splash renderer. Fixes crashes on + incorrect documents + * Do not use exit(1) on DCTStream errors + * Detect form fields at any depth level + * Do not generate appearance stream for radio buttons that are not active + * mingw fixes + + build system: + * Require fontconfig >= 2.0 + * builddir != srcdir fixes + + Qt4 frontend: + * Improved documentation + + misc: + * Fix FSF address + +Release 0.6.1 + + poppler core: + * Fix printing with different x and y scale + * Fix crash when Form Fields array contains references to non existent objects + * Fix crash in CairoOutputDev::drawMaskedImage() + * Fix embedded file description not working on some cases + + Qt4 frontend: + * Fix printing issue + * Avoid double free + * Fix memory leak when dealing with embedded files + + glib frontend: + * Fix build with --disable-cairo-output + * Do not return unknown field type for signature form fields + + build system: + * Support automake-1.10 + * More compatible sh code in qt.m4 + + utils: + * Fix build on Sun Studio compiler + +Release 0.6 + + - CairoOutputDev fixes + - Allow pdftoppm to read/write from stdin/stdout + - API work on Qt4 frontend + - Fix pdfimages produces inverted image for black & white image + - Fix error on the NFKC text matching routine + - Add support for word and line selections + - Do not enforce %%EOF at the end of file + - Pad zeroes instead of aborting when rendering 1-bit images + and the stream is too short + - Update glib bindings documentation + +Release 0.5.91 (0.6 Release Candidate 2) + + - Various memory leaks fixed + - Compile with --enable-fixedpoint. Bug #11110 + - Header cleanup + - Remove dependency on debugxml. Bug #11187 + - Allow access to document metadata in glib and qt4 frontends + - Several glib API frontend improvements + - Fix crash on accessing embedded files + - Build on Sun Force compiler + - Render '*' instead of the actual content in password form fields + - Fix pdftohtml complex output. Bug #9746 and #11610 + - Windows build fixes + - Improve Japanese font support. Bug #11413 + - Do not exit the program on files that confuse libjpeg + - Update required cairo version to 1.4 + - Fix CVE-2007-3387 + +Release 0.5.9 (0.6 Release Candidate) + + - Merge xpdf 3.02 changes + - Qt4 frontend is not marked anymore as unstable + - Support for Sound objects + - Support for Opening/Closing page actions + - Support for page duration + - Improve PS Tokenizer performance thanks to Scott Turner + - Various speed ups by Krzysztof Kowalczyk + - Beginning of Interactive Form support by Julien Rebetez + - xpdfrc is no longer used for anything + - Add AbiWord output device and pdftoabw program by Jauco Noordzij + - Fix security issue MOAB-06-01-2007 + - Lots of bugs fixed + +Release 0.5.4 + + - Automatically read in CJK encoding files if they're + installed (#2984, #7105, #7093). This works with the new + poppler-data package. + - Speed ups by Krzysztof Kowalczyk (#8112) + - Patch from Dom Lachowicz to let the utils take input on stdin. + - Bugs fixed (#8182, #4649, #7906, #8048, #7113, #4515, #3948, + #7924, #7780, #7646, #6948, #7788, #7661, #7005) + +Release 0.5.3 + + - Add poppler as a private requires of poppler-glib. + - Allow CairoFont creation to fail more gracefully (#4030). + - Back out the rest of krh's type3 font work. + - Revert splashModeRGB8 changes. + - Add missing poppler-annotation-helper.h. + +Release 0.5.2 + + - Much improved Qt bindings (Albert Astals Cid). + - Cairo backend now supports masked images (Jeff Muizelaar, #6174). + - Patches from Kouhei Sutou to make glib bindings more + language binding friendly (#6907, #6897, #6899, #6905). + - Search now works with ligatures (Ed Catmull, #2929). + - The glib bindings now has an entry point to render to a cairo_t. + - GCC 4.1 and MSVC compilation fixes. + - Memory leaks plugged: #6908, #6947, #6765, #6764, #6187 + - Misc bug fixes: #6984, #6896, #6913, #6926, #4481, #5951, + #6551, #6500, #6492, #6454, #6079, #6167. + +Release 0.5.1 + + - Support for embedded files. + - Handle 0-width lines correctly. + - Avoid external file use when opening fonts. + - Only use vector fonts returned from fontconfig (#5758). + - Fix scaled 1x1 pixmaps use for drawing lines (#3387). + - drawSoftMaskedImage support in cairo backend. + - Misc bug fixes: #5922, #5946, #5749, #5952, #4030, #5420. + +Release 0.5.0 + + - Font matching code for non embedded fonts now use fontconfig + instead of hard coded list of fonts. + - Merge in Xpdf 3.01 changes. + - Add command line tools from Xpdf. + - Make install of Xpdf header files ./configure'able. + +Release 0.4.0 + + - Real text selection. + - API breakage in glib wrapper: dropping dest_x and dest_y + arguments from poppler_page_render_to_pixbuf(). + +Release 0.3.3 + + - New glib API to get document font information (Marco). + - More document properties available as glib properties (Emil + Soleyman-Zomalan, #3359) + - Optimize color conversion for images. + - Support for constant opacity. + - Fix problems with pkg-config files. + - Bugs fixes: #3491, #2911, #3362, #3340, #3265, #3239, #3396. + +Release 0.3.2 + + - New API to get poppler version and backend type. + - Various font fixes from Albert Astals Cid. + - Update to cairo 0.5.0 API, including better font support. + - Meta data for the glib binding. + +Release 0.3.1 + + - Add qt/poppler-private.h to SOURCES + - Jeff's path to use zlib instead of builtin decompression. + - Bug fixes: #2934, segfault on invalid links, #3114 + +Release 0.3.0 + + - First cut at qt wrapper, including a getText() method for + getting text from a page. + - More glib functionality: meta data, set page orientation, + print to PS + - Performance fixes for glib cairo + - Bug fixes + +Release 0.2.0 (Tue Apr 5 12:32:10 EDT 2005) + + - Add glib wrapper for poppler, which will use cairo rendering + if available + - Support for page labels + - configure and build fixes. + +Release 0.1.2 (Wed Mar 9 10:45:58 EST 2005) + + - cairo optimizations and fixes from Jeff Muizelaar + - Bump cairo requirement to 0.4 + - Make cairo and gtk checks fail gracefully + +Release 0.1.1 + + - Fix issues with installed header files including config.h + - Fix a couple of typos in pkg-config files + - Install splash and cairo header files when necessary + +Release 0.1 - no date yet + + - First release + - More NEWS here diff --git a/poppler-24.05.0/README-XPDF b/poppler-24.05.0/README-XPDF new file mode 100644 index 0000000000000000000000000000000000000000..bad23bef48da40188807012e544e15ec44328ee4 --- /dev/null +++ b/poppler-24.05.0/README-XPDF @@ -0,0 +1,423 @@ +Xpdf +==== + +version 3.03 +2011-aug-15 + +The Xpdf software and documentation are +copyright 1996-2011, 2022 Glyph & Cog, LLC. + +Email: derekn@foolabs.com +WWW: http://www.foolabs.com/xpdf/ + +The PDF data structures, operators, and specification are +copyright 1985-2006 Adobe Systems Inc. + + +What is Xpdf? +------------- + +Xpdf is an open source viewer for Portable Document Format (PDF) +files. (These are also sometimes also called 'Acrobat' files, from +the name of Adobe's PDF software.) The Xpdf project also includes a +PDF text extractor, PDF-to-PostScript converter, and various other +utilities. + +Xpdf runs under the X Window System on UNIX, VMS, and OS/2. The non-X +components (pdftops, pdftotext, etc.) also run on Windows and Mac OSX +systems and should run on pretty much any system with a decent C++ +compiler. Xpdf will run on 32-bit and 64-bit machines. + + +License & Distribution +---------------------- + +Xpdf is licensed under the GNU General Pulbic License (GPL), version 2 +or 3. This means that you can distribute derivatives of Xpdf under +any of the following: + - GPL v2 only + - GPL v3 only + - GPL v2 or v3 + +The Xpdf source package includes the text of both GPL versions: +COPYING for GPL v2, COPYING3 for GPL v3. + +Please note that Xpdf is NOT licensed under "any later version" of the +GPL, as I have no idea what those versions will look like. + +If you are redistributing unmodified copies of Xpdf (or any of the +Xpdf tools) in binary form, you need to include all of the +documentation: README, man pages (or help files), COPYING, and +COPYING3. + +If you want to incorporate the Xpdf source code into another program +(or create a modified version of Xpdf), and you are distributing that +program, you have two options: release your program under the GPL (v2 +and/or v3), or purchase a commercial Xpdf source license. + +If you're interested in commercial licensing, please see the Glyph & +Cog web site: + + http://www.glyphandcog.com/ + + +Compatibility +------------- + +Xpdf is developed and tested on Linux. + +In addition, it has been compiled by others on Solaris, AIX, HP-UX, +Digital Unix, Irix, and numerous other Unix implementations, as well +as VMS and OS/2. It should work on pretty much any system which runs +X11 and has Unix-like libraries. You'll need ANSI C++ and C compilers +to compile it. + +The non-X components of Xpdf (pdftops, pdftotext, pdfinfo, pdffonts, +pdfdetach, pdftoppm, and pdfimages) can also be compiled on Windows +and Mac OSX systems. See the Xpdf web page for details. + +If you compile Xpdf for a system not listed on the web page, please +let me know. If you're willing to make your binary available by ftp +or on the web, I'll be happy to add a link from the Xpdf web page. I +have decided not to host any binaries I didn't compile myself (for +disk space and support reasons). + +If you can't get Xpdf to compile on your system, send me email and +I'll try to help. + +Xpdf has been ported to the Acorn, Amiga, BeOS, and EPOC. See the +Xpdf web page for links. + + +Getting Xpdf +------------ + +The latest version is available from: + + http://www.foolabs.com/xpdf/ + +or: + + ftp://ftp.foolabs.com/pub/xpdf/ + +Source code and several precompiled executables are available. + +Announcements of new versions are posted to comp.text.pdf and emailed +to a list of people. If you'd like to receive email notification of +new versions, just let me know. + + +Running Xpdf +------------ + +To run xpdf, simply type: + + xpdf file.pdf + +To generate a PostScript file, hit the "print" button in xpdf, or run +pdftops: + + pdftops file.pdf + +To generate a plain text file, run pdftotext: + + pdftotext file.pdf + +There are five additional utilities (which are fully described in +their man pages): + + pdfinfo -- dumps a PDF file's Info dictionary (plus some other + useful information) + pdffonts -- lists the fonts used in a PDF file along with various + information for each font + pdfdetach -- lists or extracts embedded files (attachments) from a + PDF file + pdftoppm -- converts a PDF file to a series of PPM/PGM/PBM-format + bitmaps + pdfimages -- extracts the images from a PDF file + +Command line options and many other details are described in the man +pages (xpdf(1), etc.) and the VMS help files (xpdf.hlp, etc.). + +All of these utilities read an optional configuration file: see the +xpdfrc(5) man page. + + +Upgrading from Xpdf 3.02 (and earlier) +-------------------------------------- + +The font configuration system has been changed. Previous versions +used mostly separate commands to configure fonts for display and for +PostScript output. As of 3.03, configuration options that make sense +for both display and PS output have been unified. + +The following xpdfrc commands have been removed: +* displayFontT1, displayFontTT: replaced with fontFile +* displayNamedCIDFontT1, displayNamedCIDFontTT: replaced with fontFile +* displayCIDFontT1, displayCIDFontTT: replaced with fontFileCC +* psFont: replaced with psResidentFont +* psNamedFont16: replaced with psResidentFont16 +* psFont16: replaced with psResidentFontCC + +See the xpdfrc(5) man page for more information on the new commands. + +Pdftops will now embed external 16-bit fonts (configured with the +fontFileCC command) when the PDF file refers to a non-embedded font. +It does not do any subsetting (yet), so the resulting PS files will be +large. + + +Compiling Xpdf +-------------- + +See the separate file, INSTALL. + + +Bugs +---- + +If you find a bug in Xpdf, i.e., if it prints an error message, +crashes, or incorrectly displays a document, and you don't see that +bug listed here, please send me email, with a pointer (URL, ftp site, +etc.) to the PDF file. + + +Acknowledgments +--------------- + +Thanks to: + +* Patrick Voigt for help with the remote server code. +* Patrick Moreau, Martin P.J. Zinser, and David Mathog for the VMS + port. +* David Boldt and Rick Rodgers for sample man pages. +* Brendan Miller for the icon idea. +* Olly Betts for help testing pdftotext. +* Peter Ganten for the OS/2 port. +* Michael Richmond for the Win32 port of pdftops and pdftotext and the + xpdf/cygwin/XFree86 build instructions. +* Frank M. Siegert for improvements in the PostScript code. +* Leo Smiers for the decryption patches. +* Rainer Menzner for creating t1lib, and for helping me adapt it to + xpdf. +* Pine Tree Systems A/S for funding the OPI and EPS support in + pdftops. +* Easy Software Products for funding several improvements to the + PostScript output code. +* Tom Kacvinsky for help with FreeType and for being my interface to + the FreeType team. +* Theppitak Karoonboonyanan for help with Thai support. +* Leonard Rosenthol for help and contributions on a bunch of things. +* Alexandros Diamantidis and Maria Adaloglou for help with Greek + support. +* Lawrence Lai for help with the CJK Unicode maps. + +Various people have contributed modifications made for use by the +pdftex project: + +* Han The Thanh +* Martin Schröder of ArtCom GmbH + + +References +---------- + +Adobe Systems Inc., _PDF Reference, sixth edition: Adobe Portable +Document Format version 1.7_. +http://www.adobe.com/devnet/pdf/pdf_reference.html +[The manual for PDF version 1.7.] + +Adobe Systems Inc., "Errata for the PDF Reference, sixth edition, +version 1.7", October 16, 2006. +http://www.adobe.com/devnet/pdf/pdf_reference.html +[The errata for the PDF 1.7 spec.] + +Adobe Systems Inc., _PostScript Language Reference_, 3rd ed. +Addison-Wesley, 1999, ISBN 0-201-37922-8. +[The official PostScript manual.] + +Adobe Systems, Inc., _The Type 42 Font Format Specification_, +Adobe Developer Support Technical Specification #5012. 1998. +http://partners.adobe.com/asn/developer/pdfs/tn/5012.Type42_Spec.pdf +[Type 42 is the format used to embed TrueType fonts in PostScript +files.] + +Adobe Systems, Inc., _Adobe CMap and CIDFont Files Specification_, +Adobe Developer Support Technical Specification #5014. 1995. +http://www.adobe.com/supportservice/devrelations/PDFS/TN/5014.CIDFont_Spec.pdf +[CMap file format needed for Japanese and Chinese font support.] + +Adobe Systems, Inc., _Adobe-Japan1-4 Character Collection for +CID-Keyed Fonts_, Adobe Developer Support Technical Note #5078. +2000. +http://partners.adobe.com/asn/developer/PDFS/TN/5078.CID_Glyph.pdf +[The Adobe Japanese character set.] + +Adobe Systems, Inc., _Adobe-GB1-4 Character Collection for +CID-Keyed Fonts_, Adobe Developer Support Technical Note #5079. +2000. +http://partners.adobe.com/asn/developer/pdfs/tn/5079.Adobe-GB1-4.pdf +[The Adobe Chinese GB (simplified) character set.] + +Adobe Systems, Inc., _Adobe-CNS1-3 Character Collection for +CID-Keyed Fonts_, Adobe Developer Support Technical Note #5080. +2000. +http://partners.adobe.com/asn/developer/PDFS/TN/5080.CNS_CharColl.pdf +[The Adobe Chinese CNS (traditional) character set.] + +Adobe Systems Inc., _Supporting the DCT Filters in PostScript Level +2_, Adobe Developer Support Technical Note #5116. 1992. +http://www.adobe.com/supportservice/devrelations/PDFS/TN/5116.PS2_DCT.PDF +[Description of the DCTDecode filter parameters.] + +Adobe Systems Inc., _Open Prepress Interface (OPI) Specification - +Version 2.0_, Adobe Developer Support Technical Note #5660. 2000. +http://partners.adobe.com/asn/developer/PDFS/TN/5660.OPI_2.0.pdf + +Adobe Systems Inc., CMap files. +ftp://ftp.oreilly.com/pub/examples/nutshell/cjkv/adobe/ +[The actual CMap files for the 16-bit CJK encodings.] + +Adobe Systems Inc., Unicode glyph lists. +http://partners.adobe.com/asn/developer/type/unicodegn.html +http://partners.adobe.com/asn/developer/type/glyphlist.txt +http://partners.adobe.com/asn/developer/type/corporateuse.txt +http://partners.adobe.com/asn/developer/type/zapfdingbats.txt +[Mappings between character names to Unicode.] + +Adobe Systems Inc., OpenType Specification v. 1.4. +http://partners.adobe.com/public/developer/opentype/index_spec.html +[The OpenType font format spec.] + +Aldus Corp., _OPI: Open Prepress Interface Specification 1.3_. 1993. +http://partners.adobe.com/asn/developer/PDFS/TN/OPI_13.pdf + +Anonymous, RC4 source code. +ftp://ftp.ox.ac.uk/pub/crypto/misc/rc4.tar.gz +ftp://idea.sec.dsi.unimi.it/pub/crypt/code/rc4.tar.gz +[This is the algorithm used to encrypt PDF files.] + +T. Boutell, et al., "PNG (Portable Network Graphics) Specification, +Version 1.0". RFC 2083. +[PDF uses the PNG filter algorithms.] + +CCITT, "Information Technology - Digital Compression and Coding of +Continuous-tone Still Images - Requirements and Guidelines", CCITT +Recommendation T.81. +http://www.w3.org/Graphics/JPEG/ +[The official JPEG spec.] + +A. Chernov, "Registration of a Cyrillic Character Set". RFC 1489. +[Documentation for the KOI8-R Cyrillic encoding.] + +Roman Czyborra, "The ISO 8859 Alphabet Soup". +http://czyborra.com/charsets/iso8859.html +[Documentation on the various ISO 859 encodings.] + +L. Peter Deutsch, "ZLIB Compressed Data Format Specification version +3.3". RFC 1950. +[Information on the general format used in FlateDecode streams.] + +L. Peter Deutsch, "DEFLATE Compressed Data Format Specification +version 1.3". RFC 1951. +[The definition of the compression algorithm used in FlateDecode +streams.] + +Morris Dworkin, "Recommendation for Block Cipher Modes of Operation", +National Institute of Standards, NIST Special Publication 800-38A, +2001. +[The cipher block chaining (CBC) mode used with AES in PDF files.] + +Federal Information Processing Standards Publication 197 (FIPS PUBS +197), "Advanced Encryption Standard (AES)", November 26, 2001. +[AES encryption, used in PDF 1.6.] + +Jim Flowers, "X Logical Font Description Conventions", Version 1.5, X +Consortium Standard, X Version 11, Release 6.1. +ftp://ftp.x.org/pub/R6.1/xc/doc/hardcopy/XLFD/xlfd.PS.Z +[The official specification of X font descriptors, including font +transformation matrices.] + +Foley, van Dam, Feiner, and Hughes, _Computer Graphics: Principles and +Practice_, 2nd ed. Addison-Wesley, 1990, ISBN 0-201-12110-7. +[Colorspace conversion functions, Bezier spline math.] + +Robert L. Hummel, _Programmer's Technical Reference: Data and Fax +Communications_. Ziff-Davis Press, 1993, ISBN 1-56276-077-7. +[CCITT Group 3 and 4 fax decoding.] + +ISO/IEC, _Information technology -- Lossy/lossless coding of bi-level +images_. ISO/IEC 14492, First edition (2001-12-15). +http://webstore.ansi.org/ +[The official JBIG2 standard. The final draft of this spec is +available from http://www.jpeg.org/jbighomepage.html.] + +ISO/IEC, _Information technology -- JPEG 2000 image coding system -- +Part 1: Core coding system_. ISO/IEC 15444-1, First edition +(2000-12-15). +http://webstore.ansi.org/ +[The official JPEG 2000 standard. The final committee draft of this +spec is available from http://www.jpeg.org/JPEG2000.html, but there +were changes made to the bitstream format between that draft and the +published spec.] + +ITU, "Standardization of Group 3 facsimile terminals for document +transmission", ITU-T Recommendation T.4, 1999. +ITU, "Facsimile coding schemes and coding control functions for Group 4 +facsimile apparatus", ITU-T Recommendation T.6, 1993. +http://www.itu.int/ +[The official Group 3 and 4 fax standards - used by the CCITTFaxDecode +stream, as well as the JBIG2Decode stream.] + +B. Kaliski, "PKCS #5: Password-Based Cryptography Specification, +Version 2.0". RFC 2898. +[Defines the padding scheme used with AES encryption in PDF files.] + +Christoph Loeffler, Adriaan Ligtenberg, George S. Moschytz, "Practical +Fast 1-D DCT Algorithms with 11 Multiplications". IEEE Intl. Conf. on +Acoustics, Speech & Signal Processing, 1989, 988-991. +[The fast IDCT algorithm used in the DCTDecode filter.] + +Microsoft, _TrueType 1.0 Font Files_, rev. 1.66. 1995. +http://www.microsoft.com/typography/tt/tt.htm +[The TrueType font spec (in MS Word format, naturally).] + +V. Ostromoukhov, R.D. Hersch, "Stochastic Clustered-Dot Dithering", +Conf. Color Imaging: Device-Independent Color, Color Hardcopy, and +Graphic Arts IV, 1999, SPIE Vol. 3648, 496-505. +http://diwww.epfl.ch/w3lsp/publications/colour/scd.html +[The stochastic dithering algorithm used in Xpdf.] + +P. Peterlin, "ISO 8859-2 (Latin 2) Resources". +http://sizif.mf.uni-lj.si/linux/cee/iso8859-2.html +[This is a web page with all sorts of useful Latin-2 character set and +font information.] + +Charles Poynton, "Color FAQ". +http://www.inforamp.net/~poynton/ColorFAQ.html +[The mapping from the CIE 1931 (XYZ) color space to RGB.] + +R. Rivest, "The MD5 Message-Digest Algorithm". RFC 1321. +[MD5 is used in PDF document encryption.] + +Thai Industrial Standard, "Standard for Thai Character Codes for +Computers", TIS-620-2533 (1990). +http://www.nectec.or.th/it-standards/std620/std620.htm +[The TIS-620 Thai encoding.] + +Unicode Consortium, "Unicode Home Page". +http://www.unicode.org/ +[Online copy of the Unicode spec.] + +W3C Recommendation, "PNG (Portable Network Graphics) Specification +Version 1.0". +http://www.w3.org/Graphics/PNG/ +[Defines the PNG image predictor.] + +Gregory K. Wallace, "The JPEG Still Picture Compression Standard". +ftp://ftp.uu.net/graphics/jpeg/wallace.ps.gz +[Good description of the JPEG standard. Also published in CACM, April +1991, and submitted to IEEE Transactions on Consumer Electronics.] + +F. Yergeau, "UTF-8, a transformation format of ISO 10646". RFC 2279. +[A commonly used Unicode encoding.] diff --git a/poppler-24.05.0/README.contributors b/poppler-24.05.0/README.contributors new file mode 100644 index 0000000000000000000000000000000000000000..798074d2327f3976e74d2cc1bd8a1e82e0333fc2 --- /dev/null +++ b/poppler-24.05.0/README.contributors @@ -0,0 +1,51 @@ +If you want to become or are a poppler contributor, this is a README for you, keep reading! + +Licensing +--------- +Only send patches to poppler if you agree to license (or relicense) them under +GPLv2 and later (or something more permissive that can be "upgraded" to GPLv2 +and later). If you do not agree to this license, please explain the problem / bug +and how you would solve it in words instead of code. + +By default all patches attached to the gitlab instance or sent to the mailing list +will be assumed to agree with the licensing expressed here. + +Channels of contact +------------------- +Poppler has three main channels of contact: + * The poppler mailing list http://lists.freedesktop.org/mailman/listinfo/poppler + * The poppler gitlab instance https://gitlab.freedesktop.org/poppler/poppler/ + * The #poppler channel at the IRC freenode network +Do not hesitate to drop by talk to people there. + +clang-format +------------ +We introduced clang-format mandatory usage in July 2020. +If you want git blame to ignore the revision in which we did the mass change you can do + git config blame.ignoreRevsFile .git-blame-ignore-revs +on your clone + +To get the clang-format warnings locally instead at CI time we recommend you +to copy the hooks/pre-commit to your .git + cp hooks/pre-commit .git/hooks/ + +We are using clang-format 15 on CI. Unfortunately clang-format is not totally +compatible with older versions of itself. If CI gives you trouble but your local +clang-format disagrees, just apply the changes suggested by CI and then commit +with the --no-verify flag. If you get stuck, don't hesitate to ask the reviewer +to help and they will reformat your commits :) + +Merge requests +-------------- + +When creating a new merge request on gitlab make sure it has a clear title and +the description includes any extra details that might be helpful for the +reviewer, such as what the aim of the change is and decisions made during +implementation. + +Also, check "Allow commits from members who can merge to the target branch" as +that enables rebase on landing. See the gitlab docs for details: + +https://docs.gitlab.com/ee/user/project/merge_requests/allow_collaboration.html + +And keep hacking on poppler! diff --git a/poppler-24.05.0/README.md b/poppler-24.05.0/README.md new file mode 100644 index 0000000000000000000000000000000000000000..3da1dc72e4b3e559572755778ffe1977800b09a8 --- /dev/null +++ b/poppler-24.05.0/README.md @@ -0,0 +1,107 @@ +Poppler, a PDF rendering library +================================ + +This is Poppler, a library for rendering PDF files, and examining or +modifying their structure. Poppler originally came from the XPDF +sources; please see the file [README-XPDF](README-XPDF) for the +original xpdf-3.03 README. + +Note that **Poppler is licensed under the GPL**, not the LGPL, so +programs which call Poppler must be licensed under the GPL as well. +See the section [History and GPL +licensing](#history-and-gpl-licensing) for more information. + +# Source code + +Poppler's source code is maintained as a Git repository in +[`gitlab.freedesktop.org`][gitlab]. You can fork that repository and +submit merge requests. + +[gitlab]: https://gitlab.freedesktop.org/poppler/poppler + +# Reporting bugs + +Please report bugs at +https://gitlab.freedesktop.org/poppler/poppler/issues + +If you want to report a rendering or parsing bug, or a missing PDF +feature, please provide an example PDF file as an attachment to your +bug report. It really helps if you can minimize the PDF to only the +items required to reproduce the bug or the missing feature, but it is +not absolutely required. **Please be careful** of publishing PDF +files that you don't want other people to see, or files whose +copyright does not allow redistribution; the bug tracker is a public +resource and attachments are visible to everyone. + +# Security + +Poppler is highly sensitive to security bugs, since it deals mainly +with untrusted files downloaded from the Internet. + +If you find a crash in Poppler, or if a tool like +Valgrind/asan/ubsan/msan detect a problem, please report a bug at +https://gitlab.freedesktop.org/poppler/poppler/issues + +# Stable and unstable APIs + +Poppler provides stable, public APIs for its various front-ends, and +an unstable API for Poppler's own internal use. The following +directories in Poppler's source tree have the **stable APIs**: + +* [cpp](cpp) - Stable C++ API for examining the structure of a PDF + file and rendering it to a raster image. + +* [glib](glib) - Stable C API with Glib/GObject idioms, to examine the + structure of a PDF file, and to render its pages to [Cairo] + contexts. + +* [qt5](qt5) - Stable C++ API with [Qt5] idioms, to examine the + structure of a PDF file, and to render its pages to `QPainter` or + `QImage` objects. + +**WARNING:** Poppler also provides direct access to its internals, +since various tools historically use the C++ header files that came +from XPDF and which became the basis for Poppler. + +* [poppler](poppler) - **UNSTABLE, INTERNAL C++ API** to operate + directly on Poppler's internal representation of PDF files. *If you + use this API, you are on your own*. This API may change at any + time, even among minor versions of Poppler! + +[Cairo]: https://www.cairographics.org/ +[Qt5]: https://www.qt.io/ + +# History and GPL licensing + +Poppler is a fork of the xpdf PDF viewer developed by Derek Noonburg +of Glyph and Cog, LLC. The purpose of forking xpdf is twofold. +First, we want to provide PDF rendering functionality as a shared +library, to centralize the maintenance effort. Today a number of +applications incorporate the xpdf code base, and whenever a security +issue is discovered, all these applications exchange patches and put +out new releases. In turn, all distributions must package and release +new version of these xpdf based viewers. It's safe to say that +there's a lot of duplicated effort with the current situation. Even if +poppler in the short term introduces yet another xpdf derived code +base to the world, we hope that over time these applications will +adopt poppler. After all, we only need one application to use poppler +to break even. + +Second, we would like to move libpoppler forward in a number of areas +that don't fit within the goals of xpdf. By design, xpdf depends on +very few libraries and runs a wide range of X based platforms. This +is a strong feature and reasonable design goal. However, with poppler +we would like to replace parts of xpdf that are now available as +standard components of modern Unix desktop environments. One such +example is fontconfig, which solves the problem of matching and +locating fonts on the system, in a standardized and well understood +way. Another example is cairo, which provides high quality 2D +rendering. + +Please note that xpdf, and thus poppler, is licensed under the GPL, +not the LGPL. Consequently, any application using poppler must also +be licensed under the GPL. If you want to incorporate Xpdf based PDF +rendering in a closed source product, please contact Glyph & Cog +(www.glyphandcog.com) for commercial licensing options. Note that +this only allows you to use xpdf in a closed source product, +not poppler itself. diff --git a/poppler-24.05.0/_clang-format b/poppler-24.05.0/_clang-format new file mode 100644 index 0000000000000000000000000000000000000000..023c81c2e027a42c382857b78125152a6b7accb0 --- /dev/null +++ b/poppler-24.05.0/_clang-format @@ -0,0 +1,77 @@ +# Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com> +# +# You may use this file under the terms of the 3-clause BSD license. +# See the file LICENSE from this package for details. + +--- +BasedOnStyle: WebKit + +Standard: Cpp11 + +ColumnLimit: 240 +# How much weight do extra characters after the line length limit have. +# PenaltyExcessCharacter: 4 + +# Disable reflow of qdoc comments: indentation rules are different. +# Translation comments are also excluded. +CommentPragmas: "^!|^:" + +# We want a space between the type and the star for pointer types. +PointerBindsToType: false + +# We use template< without space. +SpaceAfterTemplateKeyword: false + +# We want to break before the operators, but not before a '='. +BreakBeforeBinaryOperators: NonAssignment + +# Braces are usually attached, but not after functions or class declarations. +BreakBeforeBraces: Custom +BraceWrapping: + AfterClass: true + AfterControlStatement: false + AfterEnum: true + AfterFunction: true + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: true + AfterUnion: false + BeforeCatch: false + BeforeElse: false + IndentBraces: false + +# When constructor initializers do not fit on one line, put them each on a new line. +ConstructorInitializerAllOnOneLineOrOnePerLine: true +# Indent initializers by 4 spaces +ConstructorInitializerIndentWidth: 4 + +# Indent width for line continuations. +ContinuationIndentWidth: 8 + +# No indentation for namespaces. +NamespaceIndentation: None + +# Allow indentation for preprocessing directives (if/ifdef/endif). https://reviews.llvm.org/rL312125 +IndentPPDirectives: AfterHash + +# Horizontally align arguments after an open bracket. +# The coding style does not specify the following, but this is what gives +# results closest to the existing code. +AlignAfterOpenBracket: true +AlwaysBreakTemplateDeclarations: true + +# Ideally we should also allow less short function in a single line, but +# clang-format does not handle that. +AllowShortFunctionsOnASingleLine: Inline + +# The coding style specifies some include order categories, but also tells to +# separate categories with an empty line. It does not specify the order within +# the categories. Since the SortInclude feature of clang-format does not +# re-order includes separated by empty lines, the feature is not used. +SortIncludes: false + +# macros for which the opening brace stays attached. +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ] + +# Break constructor initializers before the colon and after the commas. +BreakConstructorInitializers: BeforeColon diff --git a/poppler-24.05.0/cmake/modules/COPYING-CMAKE-SCRIPTS b/poppler-24.05.0/cmake/modules/COPYING-CMAKE-SCRIPTS new file mode 100644 index 0000000000000000000000000000000000000000..4b417765f3a834ce6b0a216f6b6c0fe2d3f0bed5 --- /dev/null +++ b/poppler-24.05.0/cmake/modules/COPYING-CMAKE-SCRIPTS @@ -0,0 +1,22 @@ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/poppler-24.05.0/cmake/modules/CheckFileOffsetBits.c b/poppler-24.05.0/cmake/modules/CheckFileOffsetBits.c new file mode 100644 index 0000000000000000000000000000000000000000..bf0e24175c1a9182c6f8c7a98ccf5c52cce5b9ed --- /dev/null +++ b/poppler-24.05.0/cmake/modules/CheckFileOffsetBits.c @@ -0,0 +1,13 @@ +#include <sys/types.h> + +#define KB ((off_t)1024) +#define MB ((off_t)1024 * KB) +#define GB ((off_t)1024 * MB) +#define TB ((off_t)1024 * GB) +int t2[(((64 * GB - 1) % 671088649) == 268434537) && (((TB - (64 * GB - 1) + 255) % 1792151290) == 305159546) ? 1 : -1]; + +int main() +{ + ; + return 0; +} diff --git a/poppler-24.05.0/cmake/modules/CheckFileOffsetBits.cmake b/poppler-24.05.0/cmake/modules/CheckFileOffsetBits.cmake new file mode 100644 index 0000000000000000000000000000000000000000..b347c9366e4ad50bdcb541bb68fba4ec0335b1ca --- /dev/null +++ b/poppler-24.05.0/cmake/modules/CheckFileOffsetBits.cmake @@ -0,0 +1,44 @@ +# - Check if _FILE_OFFSET_BITS macro needed for large files +# CHECK_FILE_OFFSET_BITS () +# +# The following variables may be set before calling this macro to +# modify the way the check is run: +# +# CMAKE_REQUIRED_FLAGS = string of compile command line flags +# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) +# CMAKE_REQUIRED_INCLUDES = list of include directories +# Copyright (c) 2009, Michihiro NAKAJIMA +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +#INCLUDE(CheckCXXSourceCompiles) + +GET_FILENAME_COMPONENT(_selfdir_CheckFileOffsetBits + "${CMAKE_CURRENT_LIST_FILE}" PATH) + +MACRO (CHECK_FILE_OFFSET_BITS) + IF(NOT DEFINED _FILE_OFFSET_BITS) + MESSAGE(STATUS "Checking _FILE_OFFSET_BITS for large files") + TRY_COMPILE(__WITHOUT_FILE_OFFSET_BITS_64 + ${CMAKE_CURRENT_BINARY_DIR} + ${_selfdir_CheckFileOffsetBits}/CheckFileOffsetBits.c + COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}) + IF(NOT __WITHOUT_FILE_OFFSET_BITS_64) + TRY_COMPILE(__WITH_FILE_OFFSET_BITS_64 + ${CMAKE_CURRENT_BINARY_DIR} + ${_selfdir_CheckFileOffsetBits}/CheckFileOffsetBits.c + COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_FILE_OFFSET_BITS=64) + ENDIF(NOT __WITHOUT_FILE_OFFSET_BITS_64) + + IF(NOT __WITHOUT_FILE_OFFSET_BITS_64 AND __WITH_FILE_OFFSET_BITS_64) + SET(_FILE_OFFSET_BITS 64 CACHE INTERNAL "_FILE_OFFSET_BITS macro needed for large files") + MESSAGE(STATUS "Checking _FILE_OFFSET_BITS for large files - needed") + ELSE(NOT __WITHOUT_FILE_OFFSET_BITS_64 AND __WITH_FILE_OFFSET_BITS_64) + SET(_FILE_OFFSET_BITS "" CACHE INTERNAL "_FILE_OFFSET_BITS macro needed for large files") + MESSAGE(STATUS "Checking _FILE_OFFSET_BITS for large files - not needed") + ENDIF(NOT __WITHOUT_FILE_OFFSET_BITS_64 AND __WITH_FILE_OFFSET_BITS_64) + ENDIF(NOT DEFINED _FILE_OFFSET_BITS) + +ENDMACRO (CHECK_FILE_OFFSET_BITS) + diff --git a/poppler-24.05.0/cmake/modules/FindCairo.cmake b/poppler-24.05.0/cmake/modules/FindCairo.cmake new file mode 100644 index 0000000000000000000000000000000000000000..f0d1466a7217e1d7581340f8cfc584c6bb7cd6f6 --- /dev/null +++ b/poppler-24.05.0/cmake/modules/FindCairo.cmake @@ -0,0 +1,62 @@ +# - try to find Cairo +# Once done this will define +# +# CAIRO_FOUND - system has Cairo +# CAIRO_CFLAGS - the Cairo CFlags +# CAIRO_INCLUDE_DIRS - the Cairo include directories +# CAIRO_LIBRARIES - Link these to use Cairo +# +# Copyright (C) 2007, 2010, Pino Toscano, <pino@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if(CAIRO_INCLUDE_DIRS AND CAIRO_LIBRARIES) + + # in cache already + set(CAIRO_FOUND TRUE) + +else(CAIRO_INCLUDE_DIRS AND CAIRO_LIBRARIES) + +if(NOT WIN32) + # use pkg-config to get the directories and then use these values + # in the FIND_PATH() and FIND_LIBRARY() calls + find_package(PkgConfig REQUIRED) + if(Cairo_FIND_VERSION_COUNT GREATER 0) + set(_cairo_version_cmp ">=${Cairo_FIND_VERSION}") + endif(Cairo_FIND_VERSION_COUNT GREATER 0) + pkg_check_modules(_pc_cairo cairo${_cairo_version_cmp}) + if(_pc_cairo_FOUND) + set(CAIRO_FOUND TRUE) + endif(_pc_cairo_FOUND) +else(NOT WIN32) + # assume so, for now + set(CAIRO_FOUND TRUE) +endif(NOT WIN32) + +if(CAIRO_FOUND) + # set it back as false + set(CAIRO_FOUND FALSE) + + find_library(CAIRO_LIBRARY cairo + HINTS ${_pc_cairo_LIBRARY_DIRS} + ) + set(CAIRO_LIBRARIES "${CAIRO_LIBRARY}") + + find_path(CAIRO_INCLUDE_DIR cairo.h + HINTS ${_pc_cairo_INCLUDE_DIRS} + PATH_SUFFIXES cairo + ) + set(CAIRO_INCLUDE_DIRS "${CAIRO_INCLUDE_DIR};${_pc_cairo_INCLUDE_DIRS}") + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Cairo DEFAULT_MSG CAIRO_LIBRARIES CAIRO_INCLUDE_DIRS) +endif(CAIRO_FOUND) + +endif(CAIRO_INCLUDE_DIRS AND CAIRO_LIBRARIES) + +mark_as_advanced( + CAIRO_CFLAGS + CAIRO_INCLUDE_DIRS + CAIRO_LIBRARIES +) diff --git a/poppler-24.05.0/cmake/modules/FindGLIB.cmake b/poppler-24.05.0/cmake/modules/FindGLIB.cmake new file mode 100644 index 0000000000000000000000000000000000000000..be9d6fc8d3fb055d0a3c5549133c22d27ad4bd3f --- /dev/null +++ b/poppler-24.05.0/cmake/modules/FindGLIB.cmake @@ -0,0 +1,20 @@ +# - try to find the GLIB libraries +# Once done this will define +# +# GLIB_FOUND - system has GLib +# GLIB2_CFLAGS - the GLib CFlags +# GLIB2_LIBRARIES - Link these to use GLib +# +# Copyright 2008-2010 Pino Toscano, <pino@kde.org> +# Copyright 2013 Michael Weiser, <michael@weiser.dinsnail.net> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +include(FindPackageHandleStandardArgs) + +find_package(PkgConfig REQUIRED) + +pkg_check_modules(GLIB2 IMPORTED_TARGET "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}" "gio-2.0>=${GLIB_REQUIRED}") + +find_package_handle_standard_args(GLIB DEFAULT_MSG GLIB2_LIBRARIES GLIB2_CFLAGS) diff --git a/poppler-24.05.0/cmake/modules/FindGObjectIntrospection.cmake b/poppler-24.05.0/cmake/modules/FindGObjectIntrospection.cmake new file mode 100644 index 0000000000000000000000000000000000000000..2073c3cb17a509ef3d09c25d915800bfc49864f4 --- /dev/null +++ b/poppler-24.05.0/cmake/modules/FindGObjectIntrospection.cmake @@ -0,0 +1,61 @@ +# - try to find gobject-introspection +# +# Once done this will define +# +# INTROSPECTION_FOUND - system has gobject-introspection +# INTROSPECTION_SCANNER - the gobject-introspection scanner, g-ir-scanner +# INTROSPECTION_COMPILER - the gobject-introspection compiler, g-ir-compiler +# INTROSPECTION_GENERATE - the gobject-introspection generate, g-ir-generate +# INTROSPECTION_GIRDIR +# INTROSPECTION_TYPELIBDIR +# INTROSPECTION_CFLAGS +# INTROSPECTION_LIBS +# +# Copyright (C) 2010, Pino Toscano, <pino@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +macro(_GIR_GET_PKGCONFIG_VAR _outvar _varname) + execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=${_varname} gobject-introspection-1.0 + OUTPUT_VARIABLE _result + RESULT_VARIABLE _null + ) + + if (_null) + else() + string(REGEX REPLACE "[\r\n]" " " _result "${_result}") + string(REGEX REPLACE " +$" "" _result "${_result}") + separate_arguments(_result) + set(${_outvar} ${_result} CACHE INTERNAL "") + endif() +endmacro(_GIR_GET_PKGCONFIG_VAR) + +find_package(PkgConfig) +if(PKG_CONFIG_FOUND) + if(PACKAGE_FIND_VERSION_COUNT GREATER 0) + set(_gir_version_cmp ">=${PACKAGE_FIND_VERSION}") + endif() + pkg_check_modules(_pc_gir gobject-introspection-1.0${_gir_version_cmp}) + if(_pc_gir_FOUND) + set(INTROSPECTION_FOUND TRUE) + _gir_get_pkgconfig_var(INTROSPECTION_SCANNER "g_ir_scanner") + _gir_get_pkgconfig_var(INTROSPECTION_COMPILER "g_ir_compiler") + _gir_get_pkgconfig_var(INTROSPECTION_GENERATE "g_ir_generate") + _gir_get_pkgconfig_var(INTROSPECTION_GIRDIR "girdir") + _gir_get_pkgconfig_var(INTROSPECTION_TYPELIBDIR "typelibdir") + set(INTROSPECTION_CFLAGS "${_pc_gir_CFLAGS}") + set(INTROSPECTION_LIBS "${_pc_gir_LIBS}") + endif() +endif() + +mark_as_advanced( + INTROSPECTION_SCANNER + INTROSPECTION_COMPILER + INTROSPECTION_GENERATE + INTROSPECTION_GIRDIR + INTROSPECTION_TYPELIBDIR + INTROSPECTION_CFLAGS + INTROSPECTION_LIBS +) diff --git a/poppler-24.05.0/cmake/modules/FindGTK.cmake b/poppler-24.05.0/cmake/modules/FindGTK.cmake new file mode 100644 index 0000000000000000000000000000000000000000..20561343c5f5dfebdfb07775a61dbec69693403d --- /dev/null +++ b/poppler-24.05.0/cmake/modules/FindGTK.cmake @@ -0,0 +1,21 @@ +# - try to find GTK libraries +# Once done this will define +# +# GTK_FOUND - system has GTK +# GTK3_CFLAGS - the GTK CFlags +# GTK3_LIBRARIES - Link these to use GTK +# +# Copyright 2008-2010 Pino Toscano, <pino@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +# NOTE: As of cmake v3.18, built-in FindGTK is *only* valid for GTK1 + +include(FindPackageHandleStandardArgs) + +find_package(PkgConfig REQUIRED) + +pkg_check_modules(GTK3 IMPORTED_TARGET "gtk+-3.0>=${GTK_REQUIRED}" "gdk-pixbuf-2.0>=${GDK_PIXBUF_REQUIRED}") + +find_package_handle_standard_args(GTK DEFAULT_MSG GTK3_LIBRARIES GTK3_CFLAGS) diff --git a/poppler-24.05.0/cmake/modules/FindLCMS2.cmake b/poppler-24.05.0/cmake/modules/FindLCMS2.cmake new file mode 100644 index 0000000000000000000000000000000000000000..2ec91d04475f6509c2b2c6716be1d3ec9e229b27 --- /dev/null +++ b/poppler-24.05.0/cmake/modules/FindLCMS2.cmake @@ -0,0 +1,73 @@ +# - Find LCMS2 +# Find the LCMS2 includes and library +# This module defines +# LCMS2_INCLUDE_DIR, where to find lcms.h +# LCMS2_LIBRARIES, the libraries needed to use LCMS2. +# LCMS2_VERSION, The value of LCMS_VERSION defined in lcms.h +# LCMS2_FOUND, If false, do not try to use LCMS2. + + +# Copyright (c) 2008, Adrian Page, <adrian@pagenet.plus.com> +# Copyright (c) 2009, Cyrille Berger, <cberger@cberger.net> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +# use pkg-config to get the directories and then use these values +# in the FIND_PATH() and FIND_LIBRARY() calls +if(NOT WIN32) + find_package(PkgConfig) + pkg_check_modules(PC_LCMS2 lcms2) + set(LCMS2_DEFINITIONS ${PC_LCMS2_CFLAGS_OTHER}) +endif(NOT WIN32) + +find_path(LCMS2_INCLUDE_DIR lcms2.h + PATHS + ${PC_LCMS2_INCLUDEDIR} + ${PC_LCMS2_INCLUDE_DIRS} + PATH_SUFFIXES lcms2 liblcms2 +) + +find_library(LCMS2_LIBRARIES NAMES lcms2 liblcms2 lcms-2 liblcms-2 + PATHS + ${PC_LCMS2_LIBDIR} + ${PC_LCMS2_LIBRARY_DIRS} + PATH_SUFFIXES lcms2 +) + +if(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARIES) + set(LCMS2_FOUND TRUE) +else(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARIES) + set(LCMS2_FOUND FALSE) +endif(LCMS2_INCLUDE_DIR AND LCMS2_LIBRARIES) + +if(LCMS2_FOUND) + file(READ ${LCMS2_INCLUDE_DIR}/lcms2.h LCMS2_VERSION_CONTENT) + string(REGEX MATCH "#define LCMS_VERSION[ ]*[0-9]*\n" LCMS2_VERSION_MATCH ${LCMS2_VERSION_CONTENT}) + if(LCMS2_VERSION_MATCH) + string(REGEX REPLACE "#define LCMS_VERSION[ ]*([0-9]*)\n" "\\1" LCMS2_VERSION ${LCMS2_VERSION_MATCH}) + if(NOT LCMS2_FIND_QUIETLY) + string(SUBSTRING ${LCMS2_VERSION} 0 1 LCMS2_MAJOR_VERSION) + string(SUBSTRING ${LCMS2_VERSION} 1 2 LCMS2_MINOR_VERSION) + message(STATUS "Found lcms version ${LCMS2_MAJOR_VERSION}.${LCMS2_MINOR_VERSION}, ${LCMS2_LIBRARIES}") + endif(NOT LCMS2_FIND_QUIETLY) + else(LCMS2_VERSION_MATCH) + if(NOT LCMS2_FIND_QUIETLY) + message(STATUS "Found lcms2 but failed to find version ${LCMS2_LIBRARIES}") + endif(NOT LCMS2_FIND_QUIETLY) + set(LCMS2_VERSION NOTFOUND) + endif(LCMS2_VERSION_MATCH) +else(LCMS2_FOUND) + if(NOT LCMS2_FIND_QUIETLY) + if(LCMS2_FIND_REQUIRED) + message(FATAL_ERROR "Required package lcms2 NOT found") + else(LCMS2_FIND_REQUIRED) + message(STATUS "lcms2 NOT found") + endif(LCMS2_FIND_REQUIRED) + endif(NOT LCMS2_FIND_QUIETLY) +endif(LCMS2_FOUND) + +mark_as_advanced(LCMS2_INCLUDE_DIR LCMS2_LIBRARIES LCMS2_VERSION) + + diff --git a/poppler-24.05.0/cmake/modules/FindNSS3.cmake b/poppler-24.05.0/cmake/modules/FindNSS3.cmake new file mode 100644 index 0000000000000000000000000000000000000000..d5214a75e28d457c22f58439172d856502bfd839 --- /dev/null +++ b/poppler-24.05.0/cmake/modules/FindNSS3.cmake @@ -0,0 +1,19 @@ +# - try to find NSS3 libraries +# Once done this will define +# +# NSS3_FOUND - system has NSS3 +# PkgConfig::NSS3 - Use this in target_link_libraries to bring both includes and link libraries +# +# Copyright 2015 André Guerreiro, <aguerreiro1985@gmail.com> +# Copyright 2022 Albert Astals Cid, <aacid@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +include(FindPackageHandleStandardArgs) + +find_package(PkgConfig REQUIRED) + +pkg_check_modules(NSS3 IMPORTED_TARGET "nss>=3.68") + +find_package_handle_standard_args(NSS3 DEFAULT_MSG NSS3_LIBRARIES NSS3_CFLAGS) diff --git a/poppler-24.05.0/cmake/modules/GObjectIntrospectionMacros.cmake b/poppler-24.05.0/cmake/modules/GObjectIntrospectionMacros.cmake new file mode 100644 index 0000000000000000000000000000000000000000..cea579eb6cf1ae0e7725328f302cc51f64d6a5bc --- /dev/null +++ b/poppler-24.05.0/cmake/modules/GObjectIntrospectionMacros.cmake @@ -0,0 +1,95 @@ +# Copyright (C) 2010, Pino Toscano, <pino@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +macro(_gir_list_prefix _outvar _listvar _prefix) + set(${_outvar}) + foreach(_item IN LISTS ${_listvar}) + list(APPEND ${_outvar} ${_prefix}${_item}) + endforeach() +endmacro(_gir_list_prefix) + +macro(gir_add_introspections introspections_girs) + + set(_gir_girs) + set(_gir_typelibs) + + foreach(gir IN LISTS ${introspections_girs}) + + set(_gir_name "${gir}") + + ## Transform the gir filename to something which can reference through a variable + ## without automake/make complaining, eg Gtk-2.0.gir -> Gtk_2_0_gir + string(REPLACE "-" "_" _gir_name "${_gir_name}") + string(REPLACE "." "_" _gir_name "${_gir_name}") + + # Namespace and Version is either fetched from the gir filename + # or the _NAMESPACE/_VERSION variable combo + set(_gir_namespace "${${_gir_name}_NAMESPACE}") + if (_gir_namespace STREQUAL "") + string(REGEX REPLACE "([^-]+)-.*" "\\1" _gir_namespace "${gir}") + endif () + set(_gir_version "${${_gir_name}_VERSION}") + if (_gir_version STREQUAL "") + string(REGEX REPLACE ".*-([^-]+).gir" "\\1" _gir_version "${gir}") + endif () + + # _PROGRAM is an optional variable which needs it's own --program argument + set(_gir_program "${${_gir_name}_PROGRAM}") + if (NOT _gir_program STREQUAL "") + set(_gir_program "--program=${_gir_program}") + endif () + + # Variables which provides a list of things + _gir_list_prefix(_gir_libraries ${_gir_name}_LIBS "--library=") + _gir_list_prefix(_gir_packages ${_gir_name}_PACKAGES "--pkg=") + _gir_list_prefix(_gir_includes ${_gir_name}_INCLUDES "--include=") + _gir_list_prefix(_gir_export_packages ${_gir_name}_EXPORT_PACKAGES "--pkg-export=") + + # Reuse the LIBTOOL variable from by automake if it's set + set(_gir_libtool "--no-libtool") + + add_custom_command( + COMMAND ${INTROSPECTION_SCANNER} + ${INTROSPECTION_SCANNER_ARGS} + --namespace=${_gir_namespace} + --nsversion=${_gir_version} + ${_gir_libtool} + ${_gir_program} + ${_gir_libraries} + ${_gir_packages} + ${_gir_includes} + ${_gir_export_packages} + ${${_gir_name}_SCANNERFLAGS} + ${${_gir_name}_CFLAGS} + ${${_gir_name}_FILES} + --output ${CMAKE_CURRENT_BINARY_DIR}/${gir} + DEPENDS ${${_gir_name}_FILES} + ${${_gir_name}_LIBS} + OUTPUT ${gir} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + VERBATIM + ) + list(APPEND _gir_girs ${CMAKE_CURRENT_BINARY_DIR}/${gir}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${gir} DESTINATION ${CMAKE_INSTALL_DATADIR}/gir-1.0) + + string(REPLACE ".gir" ".typelib" _typelib "${gir}") + add_custom_command( + COMMAND ${INTROSPECTION_COMPILER} + ${INTROSPECTION_COMPILER_ARGS} + --includedir=. + ${CMAKE_CURRENT_BINARY_DIR}/${gir} + -o ${CMAKE_CURRENT_BINARY_DIR}/${_typelib} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${gir} + OUTPUT ${_typelib} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) + list(APPEND _gir_typelibs ${CMAKE_CURRENT_BINARY_DIR}/${_typelib}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_typelib} DESTINATION ${CMAKE_INSTALL_LIBDIR}/girepository-1.0) + + endforeach() + + add_custom_target(gir-typelibs ALL DEPENDS ${_gir_typelibs}) + +endmacro(gir_add_introspections) diff --git a/poppler-24.05.0/cmake/modules/MacroOptionalFindPackage.cmake b/poppler-24.05.0/cmake/modules/MacroOptionalFindPackage.cmake new file mode 100644 index 0000000000000000000000000000000000000000..d4ed48e33a59170d9ed8f9b3223a42b5c4883cfd --- /dev/null +++ b/poppler-24.05.0/cmake/modules/MacroOptionalFindPackage.cmake @@ -0,0 +1,48 @@ +# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION() +# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] ) +# This macro is a combination of OPTION() and FIND_PACKAGE(), it +# works like FIND_PACKAGE(), but additionally it automatically creates +# an option name WITH_<name>, which can be disabled via the cmake GUI. +# or via -DWITH_<name>=OFF +# The standard <name>_FOUND variables can be used in the same way +# as when using the normal FIND_PACKAGE() + +# Copyright (c) 2006-2010 Alexander Neundorf, <neundorf@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +# This is just a helper macro to set a bunch of variables empty. +# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both: +macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var) + if(DEFINED ${_name}_${_var}) + set(${_name}_${_var} "") + endif(DEFINED ${_name}_${_var}) + + string(TOUPPER ${_name} _nameUpper) + if(DEFINED ${_nameUpper}_${_var}) + set(${_nameUpper}_${_var} "") + endif(DEFINED ${_nameUpper}_${_var}) +endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var) + + +macro (MACRO_OPTIONAL_FIND_PACKAGE _name ) + option(WITH_${_name} "Search for ${_name} package" ON) + if (WITH_${_name}) + find_package(${_name} ${ARGN}) + else (WITH_${_name}) + string(TOUPPER ${_name} _nameUpper) + set(${_name}_FOUND FALSE) + set(${_nameUpper}_FOUND FALSE) + + _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS) + _mofp_set_empty_if_defined(${_name} INCLUDE_DIR) + _mofp_set_empty_if_defined(${_name} INCLUDES) + _mofp_set_empty_if_defined(${_name} LIBRARY) + _mofp_set_empty_if_defined(${_name} LIBRARIES) + _mofp_set_empty_if_defined(${_name} LIBS) + _mofp_set_empty_if_defined(${_name} FLAGS) + _mofp_set_empty_if_defined(${_name} DEFINITIONS) + endif (WITH_${_name}) +endmacro (MACRO_OPTIONAL_FIND_PACKAGE) + diff --git a/poppler-24.05.0/cmake/modules/PopplerDefaults.cmake b/poppler-24.05.0/cmake/modules/PopplerDefaults.cmake new file mode 100644 index 0000000000000000000000000000000000000000..6be7dd7da226e445f7232ce9d4786afbd9f16edf --- /dev/null +++ b/poppler-24.05.0/cmake/modules/PopplerDefaults.cmake @@ -0,0 +1,9 @@ +# enable the testing facilities +enable_testing() + +# put the include directories of the sources before other include paths +# (eg, system includes) +set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) + +# colored output +set(CMAKE_COLOR_MAKEFILE ON) diff --git a/poppler-24.05.0/cmake/modules/PopplerMacros.cmake b/poppler-24.05.0/cmake/modules/PopplerMacros.cmake new file mode 100644 index 0000000000000000000000000000000000000000..2aed0284f584a7ae6063eae2dd0ed4aeda8f0c23 --- /dev/null +++ b/poppler-24.05.0/cmake/modules/PopplerMacros.cmake @@ -0,0 +1,199 @@ +# Copyright 2008 Pino Toscano, <pino@kde.org> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +macro(POPPLER_ADD_TEST exe build_flag) + set(build_test ${${build_flag}}) + + # Omit the disabled test binaries from the "all" target + if(NOT build_test) + set(_add_executable_param ${_add_executable_param} EXCLUDE_FROM_ALL) + endif(NOT build_test) + + add_executable(${exe} ${_add_executable_param} ${ARGN}) + + # if the tests are EXCLUDE_FROM_ALL, add a target "buildtests" to build all tests + # Don't try to use custom targets if building with Visual Studio + if(NOT build_test AND NOT MSVC_IDE) + get_property(_buildtestsAdded GLOBAL PROPERTY BUILDTESTS_ADDED) + if(NOT _buildtestsAdded) + add_custom_target(buildtests) + set_property(GLOBAL PROPERTY BUILDTESTS_ADDED TRUE) + endif(NOT _buildtestsAdded) + add_dependencies(buildtests ${exe}) + endif(NOT build_test AND NOT MSVC_IDE) +endmacro(POPPLER_ADD_TEST) + +macro(POPPLER_CREATE_INSTALL_PKGCONFIG generated_file install_location) + configure_file(${generated_file}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${generated_file} @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${generated_file} DESTINATION ${install_location}) +endmacro(POPPLER_CREATE_INSTALL_PKGCONFIG) + +macro(SHOW_END_MESSAGE what value) + string(LENGTH ${what} length_what) + math(EXPR left_char "20 - ${length_what}") + set(blanks) + foreach(_i RANGE 1 ${left_char}) + set(blanks "${blanks} ") + endforeach(_i) + + message(" ${what}:${blanks} ${value}") +endmacro(SHOW_END_MESSAGE) + +macro(SHOW_END_MESSAGE_YESNO what enabled) + if(${enabled}) + set(enabled_string "yes") + else(${enabled}) + set(enabled_string "no") + endif(${enabled}) + + show_end_message("${what}" "${enabled_string}") +endmacro(SHOW_END_MESSAGE_YESNO) + +macro(POPPLER_CHECK_LINK_FLAG flag var) + set(_save_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}") + include(CheckCXXSourceCompiles) + set(CMAKE_REQUIRED_LIBRARIES "${flag}") + check_cxx_source_compiles("int main() { return 0; }" ${var}) + set(CMAKE_REQUIRED_LIBRARIES "${_save_CMAKE_REQUIRED_LIBRARIES}") +endmacro(POPPLER_CHECK_LINK_FLAG) + + +set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} + "${CMAKE_INSTALL_PREFIX}/include" ) + +set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} + "${CMAKE_INSTALL_PREFIX}/bin" ) + +set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" ) + +# under Windows dlls may be also installed in bin/ +if(WIN32) + set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} + "${CMAKE_INSTALL_PREFIX}/bin" ) +endif(WIN32) + +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE RelWithDebInfo) +endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + +string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE_UPPER) +set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE) +# We override CMAKE_CXX_FLAGS_${_CMAKE_BUILD_TYPE_UPPER} below. If the user +# selects a CMAKE_BUILD_TYPE that is not handled by the logic below, we will +# end up dropping the previous flags (e.g. those set in a cross-compilation +# CMake toolchain file). To avoid surprising compilation errors, we emit an +# error in that case, so that the user can handle the passed CMAKE_BUILD_TYPE +# in the compiler flags logic below. +if (NOT "${_CMAKE_BUILD_TYPE_UPPER}" IN_LIST _known_build_types) + message(FATAL_ERROR "Unsupported CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +endif() +set(_save_cflags "${CMAKE_C_FLAGS}") +set(_save_cxxflags "${CMAKE_CXX_FLAGS}") + +if(CMAKE_COMPILER_IS_GNUCXX) + # set the default compile warnings + set(_warn "-Wall -Wextra -Wpedantic") + set(_warn "${_warn} -Wno-unused-parameter") + set(_warn "${_warn} -Wcast-align") + set(_warn "${_warn} -Wformat-security") + set(_warn "${_warn} -Wframe-larger-than=65536") + set(_warn "${_warn} -Wlogical-op") + set(_warn "${_warn} -Wmissing-format-attribute") + set(_warn "${_warn} -Wnon-virtual-dtor") + set(_warn "${_warn} -Woverloaded-virtual") + set(_warn "${_warn} -Wmissing-declarations") + set(_warn "${_warn} -Wundef") + set(_warn "${_warn} -Wzero-as-null-pointer-constant") + set(_warn "${_warn} -Wshadow") + set(_warn "${_warn} -Wsuggest-override") + + # set extra warnings + set(_warnx "${_warnx} -Wconversion") + set(_warnx "${_warnx} -Wuseless-cast") + + set(DEFAULT_COMPILE_WARNINGS "${_warn}") + set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") + + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") + set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") + + poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED) + if(GCC_HAS_AS_NEEDED) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") + endif(GCC_HAS_AS_NEEDED) + set(_compiler_flags_changed 1) +endif (CMAKE_COMPILER_IS_GNUCXX) + +if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +# set the default compile warnings + set(_warn "-Wall -Wextra -Wpedantic") + set(_warn "${_warn} -Wno-unused-parameter") + set(_warn "${_warn} -Wcast-align") + set(_warn "${_warn} -Wformat-security") + set(_warn "${_warn} -Wframe-larger-than=65536") + set(_warn "${_warn} -Wmissing-format-attribute") + set(_warn "${_warn} -Wnon-virtual-dtor") + set(_warn "${_warn} -Woverloaded-virtual") + set(_warn "${_warn} -Wmissing-declarations") + set(_warn "${_warn} -Wundef") + set(_warn "${_warn} -Wzero-as-null-pointer-constant") + set(_warn "${_warn} -Wshadow") + set(_warn "${_warn} -Wweak-vtables") + + # set extra warnings + set(_warnx "${_warnx} -Wconversion") + + set(DEFAULT_COMPILE_WARNINGS "${_warn}") + set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") + + set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 + set(CMAKE_CXX_FLAGS_DEBUG "-g") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") + set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") + # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 + set(CMAKE_C_FLAGS_DEBUG "-g") + set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") + set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") + set(_compiler_flags_changed 1) +endif() + +if(CMAKE_C_COMPILER MATCHES "icc") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign") + set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign") + set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign") + set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign") + set(_compiler_flags_changed 1) +endif(CMAKE_C_COMPILER MATCHES "icc") + +if(_compiler_flags_changed) + # Ensure that the previous CMAKE_{C,CXX}_FLAGS are included in the current configuration flags. + foreach(_build_type ${_known_build_types}) + set(CMAKE_CXX_FLAGS_${_build_type} "${CMAKE_CXX_FLAGS_${_build_type}} ${_save_cxxflags}") + set(CMAKE_C_FLAGS_${_build_type} "${CMAKE_C_FLAGS_${_build_type}} ${_save_cflags}") + endforeach() +endif() diff --git a/poppler-24.05.0/config.h.cmake b/poppler-24.05.0/config.h.cmake new file mode 100644 index 0000000000000000000000000000000000000000..3429af6488fdc8068c32753bb9b357757eb981bd --- /dev/null +++ b/poppler-24.05.0/config.h.cmake @@ -0,0 +1,196 @@ +/* config.h. Generated from config.h.cmake by cmake. */ + +/* Build against libcurl. */ +#cmakedefine ENABLE_LIBCURL 1 + +/* Use libjpeg instead of builtin jpeg decoder. */ +#cmakedefine ENABLE_LIBJPEG 1 + +/* Use libopenjpeg instead of builtin jpeg2000 decoder. */ +#cmakedefine ENABLE_LIBOPENJPEG 1 + +/* Build against libtiff. */ +#cmakedefine ENABLE_LIBTIFF 1 + +/* Build against libpng. */ +#cmakedefine ENABLE_LIBPNG 1 + +/* Do not hardcode the library location */ +#cmakedefine ENABLE_RELOCATABLE 1 + +/* Use zlib instead of builtin zlib decoder to uncompress flate streams. */ +#cmakedefine ENABLE_ZLIB_UNCOMPRESS 1 + +/* Build against libnss3 for digital signature validation */ +#cmakedefine ENABLE_NSS3 1 + +/* Build against libgpgme for digital signature validation */ +#cmakedefine ENABLE_GPGME 1 + +/* Signatures enabled */ +#cmakedefine ENABLE_SIGNATURES 1 + +/* Default signature backend */ +#cmakedefine DEFAULT_SIGNATURE_BACKEND "${DEFAULT_SIGNATURE_BACKEND}" + +/* Use cairo for rendering. */ +#cmakedefine HAVE_CAIRO 1 + +/* Do we have any DCT decoder?. */ +#cmakedefine HAVE_DCT_DECODER 1 + +/* Do we have any JPX decoder?. */ +#cmakedefine HAVE_JPX_DECODER 1 + +/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. + */ +#cmakedefine HAVE_DIRENT_H 1 + +/* Define to 1 if you have the <dlfcn.h> header file. */ +#cmakedefine HAVE_DLFCN_H 1 + +/* Define to 1 if you have the <fcntl.h> header file. */ +#cmakedefine HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `fseek64' function. */ +#cmakedefine HAVE_FSEEK64 1 + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#cmakedefine HAVE_FSEEKO 1 + +/* Define to 1 if you have the `ftell64' function. */ +#cmakedefine HAVE_FTELL64 1 + +/* Define to 1 if you have the `pread64' function. */ +#cmakedefine HAVE_PREAD64 1 + +/* Define to 1 if you have the `lseek64' function. */ +#cmakedefine HAVE_LSEEK64 1 + +/* Defines if gettimeofday is available on your system */ +#cmakedefine HAVE_GETTIMEOFDAY 1 + +/* Defines if gmtime_r is available on your system */ +#cmakedefine HAVE_GMTIME_R 1 + +/* Defines if timegm is available on your system */ +#cmakedefine HAVE_TIMEGM 1 + +/* Define to 1 if you have the `z' library (-lz). */ +#cmakedefine HAVE_LIBZ 1 + +/* Defines if localtime_r is available on your system */ +#cmakedefine HAVE_LOCALTIME_R 1 + +/* Define to 1 if you have the `mkstemp' function. */ +#cmakedefine HAVE_MKSTEMP 1 + +/* Defines if strtok_r is available on your system */ +#cmakedefine HAVE_STRTOK_R 1 + +/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ +#cmakedefine HAVE_NDIR_H 1 + +/* Define to 1 if you have the `popen' function. */ +#cmakedefine HAVE_POPEN 1 + +/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. + */ +#cmakedefine HAVE_SYS_DIR_H 1 + +/* Define to 1 if you have the <sys/mman.h> header file. */ +#cmakedefine HAVE_SYS_MMAN_H 1 + +/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. + */ +#cmakedefine HAVE_SYS_NDIR_H 1 + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#cmakedefine HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <unistd.h> header file. */ +#cmakedefine HAVE_UNISTD_H 1 + +/* Define to 1 if you have a big endian machine */ +#cmakedefine WORDS_BIGENDIAN 1 + +/* Define as const if the declaration of iconv() needs const. */ +#define ICONV_CONST ${ICONV_CONST} + +/* Generate OPI comments in PS output. */ +#cmakedefine OPI_SUPPORT 1 + +/* Name of package */ +#define PACKAGE "poppler" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=poppler" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "poppler" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "poppler ${POPPLER_VERSION}" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "poppler" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "${POPPLER_VERSION}" + +/* Poppler data dir */ +#define POPPLER_DATADIR "${POPPLER_DATADIR}" + +/* Support for curl based doc builder is compiled in. */ +#cmakedefine POPPLER_HAS_CURL_SUPPORT 1 + +/* Enable word list support. */ +#cmakedefine TEXTOUT_WORD_LIST 1 + +/* Defines if use cms */ +#cmakedefine USE_CMS 1 + +/* Use single precision arithmetic in the Splash backend */ +#cmakedefine USE_FLOAT 1 + +/* Version number of package */ +#define VERSION "${POPPLER_VERSION}" + +/* Use fontconfig font configuration backend */ +#cmakedefine WITH_FONTCONFIGURATION_FONTCONFIG 1 + +/* Use win32 font configuration backend */ +#cmakedefine WITH_FONTCONFIGURATION_WIN32 1 + +/* Use android font configuration backend */ +#cmakedefine WITH_FONTCONFIGURATION_ANDROID 1 + +/* OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag */ +#cmakedefine WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG 1 + +/* MS defined snprintf as deprecated but then added it in Visual Studio 2015. */ +#if defined(_MSC_VER) && _MSC_VER < 1900 +#define snprintf _snprintf +#endif + +//------------------------------------------------------------------------ +// popen +//------------------------------------------------------------------------ +#if defined(_MSC_VER) || defined(__BORLANDC__) +#define popen _popen +#define pclose _pclose +#define strncasecmp _strnicmp +#define strcasecmp _stricmp +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@ + +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +/* TODO This is wrong, port if needed #undef _LARGEFILE_SOURCE */ + +/* Define for large files, on AIX-style hosts. */ +/* TODO This is wrong, port if needed #undef _LARGE_FILES */ diff --git a/poppler-24.05.0/cpp/CMakeLists.txt b/poppler-24.05.0/cpp/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..80c38a3538194853a037947e751b50ea077522db --- /dev/null +++ b/poppler-24.05.0/cpp/CMakeLists.txt @@ -0,0 +1,52 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) + +configure_file(poppler-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/poppler-version.h @ONLY) + +add_subdirectory(tests) + +set(poppler_cpp_SRCS + poppler-destination.cpp + poppler-document.cpp + poppler-embedded-file.cpp + poppler-font.cpp + poppler-global.cpp + poppler-image.cpp + poppler-page.cpp + poppler-page-renderer.cpp + poppler-page-transition.cpp + poppler-private.cpp + poppler-rectangle.cpp + poppler-toc.cpp + poppler-version.cpp +) + +add_library(poppler-cpp ${poppler_cpp_SRCS}) +generate_export_header(poppler-cpp BASE_NAME poppler-cpp EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_cpp_export.h") +set_target_properties(poppler-cpp PROPERTIES VERSION 1.0.0 SOVERSION 1) +if(MINGW AND BUILD_SHARED_LIBS) + get_target_property(POPPLER_CPP_SOVERSION poppler-cpp SOVERSION) + set_target_properties(poppler-cpp PROPERTIES SUFFIX "-${POPPLER_CPP_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") +endif() +target_link_libraries(poppler-cpp poppler Iconv::Iconv) +install(TARGETS poppler-cpp RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +install(FILES + poppler-destination.h + poppler-document.h + poppler-embedded-file.h + poppler-font.h + poppler-font-private.h + poppler-global.h + poppler-image.h + poppler-page.h + poppler-page-renderer.h + poppler-page-transition.h + poppler-rectangle.h + poppler-toc.h + ${CMAKE_CURRENT_BINARY_DIR}/poppler_cpp_export.h + ${CMAKE_CURRENT_BINARY_DIR}/poppler-version.h + DESTINATION include/poppler/cpp) + diff --git a/poppler-24.05.0/cpp/Doxyfile b/poppler-24.05.0/cpp/Doxyfile new file mode 100644 index 0000000000000000000000000000000000000000..deee0ab167b033797541db4afb245211fb628cd7 --- /dev/null +++ b/poppler-24.05.0/cpp/Doxyfile @@ -0,0 +1,1634 @@ +# Doxyfile 1.7.1 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = "Poppler CPP" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = 24.05.0 + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = NO + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = YES + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = YES + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this +# tag. The format is ext=language, where ext is a file extension, and language +# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, +# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions +# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = in=C++ + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = YES + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = NO + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = YES + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = NO + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = YES + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = YES + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = YES + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = NO + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command <command> <input-file>, where <command> is the value of +# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. The create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text " + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = *.cpp \ + *.h \ + *.h.in \ + *.dox + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = *-private.* + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = poppler::detail, \ + poppler::*_private + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command <filter> <input-file>, where <filter> +# is the value of the INPUT_FILTER tag, and <input-file> is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 4 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = APIDOCS-html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the stylesheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = NO + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters"> +# Qt Help Project / Custom Filters</a>. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes"> +# Qt Help Project / Filter Attributes</a>. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 1 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = NO + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvances is that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = APIDOCS-latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = NO + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = YES + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = YES + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = "POPPLER_CPP_EXPORT=" + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is +# allowed to run in parallel. When set to 0 (the default) doxygen will +# base this on the number of processors available in the system. You can set it +# explicitly to a value larger than 0 to get control over the balance +# between CPU load and processing speed. + +DOT_NUM_THREADS = 0 + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = NO + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff --git a/poppler-24.05.0/cpp/Mainpage.dox b/poppler-24.05.0/cpp/Mainpage.dox new file mode 100644 index 0000000000000000000000000000000000000000..345526786c3d273ce3db2a4f47eed71d42355819 --- /dev/null +++ b/poppler-24.05.0/cpp/Mainpage.dox @@ -0,0 +1,9 @@ +/** + \mainpage The Poppler CPP interface library + + The Poppler CPP interface library, called libpoppler-cpp, is a library that + allows C++ programmers to easily load and render PDF files using the Poppler + library. Unlike the other Poppler frontends, it has no additional + requirements, so can be used in any C++ application. + +*/ diff --git a/poppler-24.05.0/cpp/poppler-destination-private.h b/poppler-24.05.0/cpp/poppler-destination-private.h new file mode 100644 index 0000000000000000000000000000000000000000..3924d4c13810e8e08317cebd3e2b3044fc734900 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-destination-private.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2019, Masamichi Hosoda <trueroad@trueroad.jp> + * + * 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. + */ + +#ifndef POPPLER_DESTINATION_PRIVATE_H +#define POPPLER_DESTINATION_PRIVATE_H + +#include "poppler-global.h" +#include "poppler-destination.h" + +#include "Object.h" + +class PDFDoc; +class LinkDest; + +namespace poppler { + +class destination_private +{ +public: + destination_private(const LinkDest *ld, PDFDoc *doc); + + destination::type_enum type; + bool page_number_unresolved; + union { + Ref page_ref; + int page_number; + }; + double left, bottom; + double right, top; + double zoom; + bool change_left : 1, change_top : 1; + bool change_zoom : 1; + + PDFDoc *pdf_doc; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-destination.cpp b/poppler-24.05.0/cpp/poppler-destination.cpp new file mode 100644 index 0000000000000000000000000000000000000000..80760b89e2c8b9b6f12fe106cc09078fe16cc699 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-destination.cpp @@ -0,0 +1,273 @@ +/* + * Copyright (C) 2019, Masamichi Hosoda <trueroad@trueroad.jp> + * Copyright (C) 2019 Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2022, Oliver Sander <oliver.sander@tu-dresden.de> + * + * 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. + */ + +/** + \file poppler-destination.h + */ +#include "poppler-destination.h" + +#include "poppler-destination-private.h" + +#include "PDFDoc.h" +#include "Link.h" + +#include <utility> + +using namespace poppler; + +destination_private::destination_private(const LinkDest *ld, PDFDoc *doc) : pdf_doc(doc) +{ + if (!ld) { + type = destination::unknown; + return; + } + + switch (ld->getKind()) { + case ::destXYZ: + type = destination::xyz; + break; + case ::destFit: + type = destination::fit; + break; + case ::destFitH: + type = destination::fit_h; + break; + case ::destFitV: + type = destination::fit_v; + break; + case ::destFitR: + type = destination::fit_r; + break; + case ::destFitB: + type = destination::fit_b; + break; + case ::destFitBH: + type = destination::fit_b_h; + break; + case ::destFitBV: + type = destination::fit_b_v; + break; + default: + type = destination::unknown; + break; + } + + if (!ld->isPageRef()) { + // The page number has been resolved. + page_number_unresolved = false; + page_number = ld->getPageNum(); + } else if (doc) { + // It is necessary to resolve the page number by its accessor. + page_number_unresolved = true; + page_ref = ld->getPageRef(); + } else { + // The page number cannot be resolved because there is no PDFDoc. + page_number_unresolved = false; + page_number = 0; + } + + left = ld->getLeft(); + bottom = ld->getBottom(); + right = ld->getRight(); + top = ld->getTop(); + zoom = ld->getZoom(); + change_left = ld->getChangeLeft(); + change_top = ld->getChangeTop(); + change_zoom = ld->getChangeZoom(); +} + +/** + \class poppler::destination poppler-destination.h "poppler/cpp/poppler-destination.h" + + The information about a destination used in a PDF %document. + */ + +/** + \enum poppler::destination::type_enum + + The various types of destinations available in a PDF %document. +*/ +/** + \var poppler::destination::type_enum poppler::destination::unknown + + unknown destination +*/ +/** + \var poppler::destination::type_enum poppler::destination::xyz + + go to page with coordinates (left, top) positioned at the upper-left + corner of the window and the contents of the page magnified + by the factor zoom +*/ +/** + \var poppler::destination::type_enum poppler::destination::fit + + go to page with its contents magnified just enough to fit the entire page + within the window both horizontally and vertically +*/ +/** + \var poppler::destination::type_enum poppler::destination::fit_h + + go to page with the vertical coordinate top positioned at the top edge + of the window and the contents of the page magnified just enough to fit + the entire width of the page within the window +*/ +/** + \var poppler::destination::type_enum poppler::destination::fit_v + + go to page with the horizontal coordinate left positioned at the left edge + of the window and the contents of the page magnified just enough to fit + the entire height of the page within the window +*/ +/** + \var poppler::destination::type_enum poppler::destination::fit_r + + go to page with its contents magnified just enough to fit the rectangle + specified by the coordinates left, bottom, right, and top entirely + within the window both horizontally and vertically +*/ +/** + \var poppler::destination::type_enum poppler::destination::fit_b + + go to page with its contents magnified just enough to fit its bounding box + entirely within the window both horizontally and vertically +*/ +/** + \var poppler::destination::type_enum poppler::destination::fit_b_h + + go to page with the vertical coordinate top positioned at the top edge + of the window and the contents of the page magnified just enough to fit + the entire width of its bounding box within the window +*/ +/** + \var poppler::destination::type_enum poppler::destination::fit_b_v + + go to page with the horizontal coordinate left positioned at the left edge + of the window and the contents of the page magnified just enough to fit + the entire height of its bounding box within the window +*/ + +destination::destination(destination_private *dd) : d(dd) { } + +/** + Move constructor. + */ +destination::destination(destination &&other) noexcept +{ + *this = std::move(other); +} + +/** + \returns the type of the destination + */ +destination::type_enum destination::type() const +{ + return d->type; +} + +/** + \note It is necessary not to destruct parent poppler::document + before calling this function for the first time. + + \returns the page number of the destination + */ +int destination::page_number() const +{ + if (d->page_number_unresolved) { + d->page_number_unresolved = false; + d->page_number = d->pdf_doc->findPage(d->page_ref); + } + + return d->page_number; +} + +/** + \returns the left coordinate of the destination + */ +double destination::left() const +{ + return d->left; +} + +/** + \returns the bottom coordinate of the destination + */ +double destination::bottom() const +{ + return d->bottom; +} + +/** + \returns the right coordinate of the destination + */ +double destination::right() const +{ + return d->right; +} + +/** + \returns the top coordinate of the destination + */ +double destination::top() const +{ + return d->top; +} + +/** + \returns the scale factor of the destination + */ +double destination::zoom() const +{ + return d->zoom; +} + +/** + \returns whether left coordinate should be changed + */ +bool destination::is_change_left() const +{ + return d->change_left; +} + +/** + \returns whether top coordinate should be changed + */ +bool destination::is_change_top() const +{ + return d->change_top; +} + +/** + \returns whether scale factor should be changed + */ +bool destination::is_change_zoom() const +{ + return d->change_zoom; +} + +/** + Move assignment operator. + */ +destination &destination::operator=(destination &&other) noexcept = default; + +/** + Destructor. + */ +destination::~destination() = default; diff --git a/poppler-24.05.0/cpp/poppler-destination.h b/poppler-24.05.0/cpp/poppler-destination.h new file mode 100644 index 0000000000000000000000000000000000000000..6b0f920c249940ab3a7a22e4812b77fb7f62327f --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-destination.h @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2019, Masamichi Hosoda <trueroad@trueroad.jp> + * Copyright (C) 2019, 2021, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2022, Oliver Sander <oliver.sander@tu-dresden.de> + * + * 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. + */ + +#ifndef POPPLER_DESTINATION_H +#define POPPLER_DESTINATION_H + +#include <memory> +#include "poppler-global.h" + +namespace poppler { +class destination_private; + +class POPPLER_CPP_EXPORT destination : public poppler::noncopyable +{ +public: + enum type_enum + { + unknown, + xyz, + fit, + fit_h, + fit_v, + fit_r, + fit_b, + fit_b_h, + fit_b_v + }; + + ~destination(); + destination(destination &&other) noexcept; + + type_enum type() const; + int page_number() const; + double left() const; + double bottom() const; + double right() const; + double top() const; + double zoom() const; + bool is_change_left() const; + bool is_change_top() const; + bool is_change_zoom() const; + + destination &operator=(destination &&other) noexcept; + +private: + explicit destination(destination_private *dd); + + std::unique_ptr<destination_private> d; + friend class document; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-document-private.h b/poppler-24.05.0/cpp/poppler-document-private.h new file mode 100644 index 0000000000000000000000000000000000000000..2f6622043db9d93c3bfd8d1035c69d3df3557f79 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-document-private.h @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2009-2011, Pino Toscano <pino@kde.org> + * Copyright (C) 2018, 2020, 2022, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2018, 2020, Adam Reichold <adam.reichold@t-online.de> + * + * 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. + */ + +#ifndef POPPLER_DOCUMENT_PRIVATE_H +#define POPPLER_DOCUMENT_PRIVATE_H + +#include "poppler-global.h" + +#include "poppler-config.h" +#include "GooString.h" +#include "PDFDoc.h" +#include "GlobalParams.h" + +#include <vector> + +namespace poppler { + +class document; +class embedded_file; + +class document_private : private GlobalParamsIniter +{ +public: + document_private(std::unique_ptr<GooString> &&file_path, const std::string &owner_password, const std::string &user_password); + document_private(byte_array *file_data, const std::string &owner_password, const std::string &user_password); + document_private(const char *file_data, int file_data_length, const std::string &owner_password, const std::string &user_password); + ~document_private(); + + static document *check_document(document_private *doc, byte_array *file_data); + + PDFDoc *doc; + byte_array doc_data; + const char *raw_doc_data; + int raw_doc_data_length; + bool is_locked; + std::vector<embedded_file *> embedded_files; + +private: + document_private(); +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-document.cpp b/poppler-24.05.0/cpp/poppler-document.cpp new file mode 100644 index 0000000000000000000000000000000000000000..70cae1b64f0e73e8512453a87533d3912e0062ee --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-document.cpp @@ -0,0 +1,1230 @@ +/* + * Copyright (C) 2009-2011, Pino Toscano <pino@kde.org> + * Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com> + * Copyright (C) 2017, 2022, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2018, 2020, Adam Reichold <adam.reichold@t-online.de> + * Copyright (C) 2019, Masamichi Hosoda <trueroad@trueroad.jp> + * Copyright (C) 2019, 2020, Oliver Sander <oliver.sander@tu-dresden.de> + * + * 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. + */ + +/** + \file poppler-document.h + */ +#include "poppler-destination.h" +#include "poppler-document.h" +#include "poppler-embedded-file.h" +#include "poppler-page.h" +#include "poppler-toc.h" + +#include "poppler-destination-private.h" +#include "poppler-document-private.h" +#include "poppler-embedded-file-private.h" +#include "poppler-page-private.h" +#include "poppler-private.h" +#include "poppler-toc-private.h" + +#include "Catalog.h" +#include "DateInfo.h" +#include "ErrorCodes.h" +#include "GlobalParams.h" +#include "Link.h" +#include "Outline.h" + +#include <algorithm> +#include <iterator> +#include <memory> + +using namespace poppler; + +document_private::document_private(std::unique_ptr<GooString> &&file_path, const std::string &owner_password, const std::string &user_password) : document_private() +{ + doc = new PDFDoc(std::move(file_path), GooString(owner_password.c_str()), GooString(user_password.c_str())); +} + +document_private::document_private(byte_array *file_data, const std::string &owner_password, const std::string &user_password) : document_private() +{ + file_data->swap(doc_data); + MemStream *memstr = new MemStream(&doc_data[0], 0, doc_data.size(), Object(objNull)); + doc = new PDFDoc(memstr, GooString(owner_password.c_str()), GooString(user_password.c_str())); +} + +document_private::document_private(const char *file_data, int file_data_length, const std::string &owner_password, const std::string &user_password) : document_private() +{ + raw_doc_data = file_data; + raw_doc_data_length = file_data_length; + MemStream *memstr = new MemStream(raw_doc_data, 0, raw_doc_data_length, Object(objNull)); + doc = new PDFDoc(memstr, GooString(owner_password.c_str()), GooString(user_password.c_str())); +} + +document_private::document_private() : GlobalParamsIniter(detail::error_function), doc(nullptr), raw_doc_data(nullptr), raw_doc_data_length(0), is_locked(false) { } + +document_private::~document_private() +{ + delete_all(embedded_files); + + delete doc; +} + +document *document_private::check_document(document_private *doc, byte_array *file_data) +{ + if (doc->doc->isOk() || doc->doc->getErrorCode() == errEncrypted) { + if (doc->doc->getErrorCode() == errEncrypted) { + doc->is_locked = true; + } + return new document(*doc); + } else { + // put back the document data where it was before + if (file_data) { + file_data->swap(doc->doc_data); + } + delete doc; + } + return nullptr; +} + +/** + \class poppler::document poppler-document.h "poppler/cpp/poppler-document.h" + + Represents a PDF %document. + */ + +/** + \enum poppler::document::page_mode_enum + + The various page modes available in a PDF %document. +*/ +/** + \var poppler::document::page_mode_enum poppler::document::use_none + + The %document specifies no particular page mode. +*/ +/** + \var poppler::document::page_mode_enum poppler::document::use_outlines + + The %document specifies its TOC (table of contents) should be open. +*/ +/** + \var poppler::document::page_mode_enum poppler::document::use_thumbs + + The %document specifies that should be open a view of the thumbnails of its + pages. +*/ +/** + \var poppler::document::page_mode_enum poppler::document::fullscreen + + The %document specifies it wants to be open in a fullscreen mode. +*/ +/** + \var poppler::document::page_mode_enum poppler::document::use_oc + + The %document specifies that should be open a view of its Optional Content + (also known as layers). +*/ +/** + \var poppler::document::page_mode_enum poppler::document::use_attach + + The %document specifies that should be open a view of its %document-level + attachments. + */ + +document::document(document_private &dd) : d(&dd) { } + +document::~document() +{ + delete d; +} + +/** + \returns whether the current %document is locked + */ +bool document::is_locked() const +{ + return d->is_locked; +} + +/** + Unlocks the current document, if locked. + + \returns the new locking status of the document + */ +bool document::unlock(const std::string &owner_password, const std::string &user_password) +{ + if (d->is_locked) { + document_private *newdoc = nullptr; + if (d->doc_data.size() > 0) { + newdoc = new document_private(&d->doc_data, owner_password, user_password); + } else if (d->raw_doc_data) { + newdoc = new document_private(d->raw_doc_data, d->raw_doc_data_length, owner_password, user_password); + } else { + newdoc = new document_private(std::make_unique<GooString>(d->doc->getFileName()), owner_password, user_password); + } + if (!newdoc->doc->isOk()) { + d->doc_data.swap(newdoc->doc_data); + delete newdoc; + } else { + delete d; + d = newdoc; + d->is_locked = false; + } + } + return d->is_locked; +} + +/** + \returns the eventual page mode specified by the current PDF %document + */ +document::page_mode_enum document::page_mode() const +{ + switch (d->doc->getCatalog()->getPageMode()) { + case Catalog::pageModeNone: + return use_none; + case Catalog::pageModeOutlines: + return use_outlines; + case Catalog::pageModeThumbs: + return use_thumbs; + case Catalog::pageModeFullScreen: + return fullscreen; + case Catalog::pageModeOC: + return use_oc; + case Catalog::pageModeAttach: + return use_attach; + default: + return use_none; + } +} + +/** + \returns the eventual page layout specified by the current PDF %document + */ +document::page_layout_enum document::page_layout() const +{ + switch (d->doc->getCatalog()->getPageLayout()) { + case Catalog::pageLayoutNone: + return no_layout; + case Catalog::pageLayoutSinglePage: + return single_page; + case Catalog::pageLayoutOneColumn: + return one_column; + case Catalog::pageLayoutTwoColumnLeft: + return two_column_left; + case Catalog::pageLayoutTwoColumnRight: + return two_column_right; + case Catalog::pageLayoutTwoPageLeft: + return two_page_left; + case Catalog::pageLayoutTwoPageRight: + return two_page_right; + default: + return no_layout; + } +} + +/** + Gets the version of the current PDF %document. + + Example: + \code + poppler::document *doc = ...; + // for example, if the document is PDF 1.6: + int major = 0, minor = 0; + doc->get_pdf_version(&major, &minor); + // major == 1 + // minor == 6 + \endcode + + \param major if not NULL, will be set to the "major" number of the version + \param minor if not NULL, will be set to the "minor" number of the version + */ +void document::get_pdf_version(int *major, int *minor) const +{ + if (major) { + *major = d->doc->getPDFMajorVersion(); + } + if (minor) { + *minor = d->doc->getPDFMinorVersion(); + } +} + +/** + \returns all the information keys available in the %document + \see info_key, info_date + */ +std::vector<std::string> document::info_keys() const +{ + if (d->is_locked) { + return std::vector<std::string>(); + } + + Object info = d->doc->getDocInfo(); + if (!info.isDict()) { + return std::vector<std::string>(); + } + + Dict *info_dict = info.getDict(); + std::vector<std::string> keys(info_dict->getLength()); + for (int i = 0; i < info_dict->getLength(); ++i) { + keys[i] = std::string(info_dict->getKey(i)); + } + + return keys; +} + +/** + Gets the value of the specified \p key of the document information. + + \returns the value for the \p key, or an empty string if not available + \see info_keys, info_date + */ +ustring document::info_key(const std::string &key) const +{ + if (d->is_locked) { + return ustring(); + } + + std::unique_ptr<GooString> goo_value(d->doc->getDocInfoStringEntry(key.c_str())); + if (!goo_value.get()) { + return ustring(); + } + + return detail::unicode_GooString_to_ustring(goo_value.get()); +} + +/** + Sets the value of the specified \p key of the %document information to \p val. + If \p val is empty, the entry specified by \p key is removed. + + \returns true on success, false on failure + */ +bool document::set_info_key(const std::string &key, const ustring &val) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_val; + + if (val.empty()) { + goo_val = nullptr; + } else { + goo_val = detail::ustring_to_unicode_GooString(val); + } + + d->doc->setDocInfoStringEntry(key.c_str(), goo_val); + return true; +} + +/** + Gets the time_type value of the specified \p key of the document + information. + + \returns the time_t value for the \p key + \see info_keys, info_date + */ +time_type document::info_date(const std::string &key) const +{ + if (d->is_locked) { + return time_type(-1); + } + + std::unique_ptr<GooString> goo_date(d->doc->getDocInfoStringEntry(key.c_str())); + if (!goo_date.get()) { + return time_type(-1); + } + + return static_cast<time_type>(dateStringToTime(goo_date.get())); +} + +/** + Gets the time_t value of the specified \p key of the document + information. + + \returns the time_t value for the \p key + \see info_keys, info_date + */ +time_t document::info_date_t(const std::string &key) const +{ + if (d->is_locked) { + return time_t(-1); + } + + std::unique_ptr<GooString> goo_date(d->doc->getDocInfoStringEntry(key.c_str())); + if (!goo_date.get()) { + return time_t(-1); + } + + return dateStringToTime(goo_date.get()); +} + +/** + Sets the time_type value of the specified \p key of the %document information + to \p val. + If \p val == time_type(-1), the entry specified by \p key is removed. + + \returns true on success, false on failure + */ +bool document::set_info_date(const std::string &key, time_type val) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_date; + + if (val == time_type(-1)) { + goo_date = nullptr; + } else { + time_t t = static_cast<time_t>(val); + goo_date = timeToDateString(&t); + } + + d->doc->setDocInfoStringEntry(key.c_str(), goo_date); + return true; +} + +/** + Sets the time_t value of the specified \p key of the %document information + to \p val. + If \p val == time_t(-1), the entry specified by \p key is removed. + + \returns true on success, false on failure + */ +bool document::set_info_date_t(const std::string &key, time_t val) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_date; + + if (val == time_t(-1)) { + goo_date = nullptr; + } else { + goo_date = timeToDateString(&val); + } + + d->doc->setDocInfoStringEntry(key.c_str(), goo_date); + return true; +} + +/** + Gets the %document's title. + + \returns the document's title, or an empty string if not available + \see set_title, info_key + */ +ustring document::get_title() const +{ + if (d->is_locked) { + return ustring(); + } + + std::unique_ptr<GooString> goo_title(d->doc->getDocInfoTitle()); + if (!goo_title.get()) { + return ustring(); + } + + return detail::unicode_GooString_to_ustring(goo_title.get()); +} + +/** + Sets the %document's title to \p title. + If \p title is empty, the %document's title is removed. + + \returns true on success, false on failure + */ +bool document::set_title(const ustring &title) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_title; + + if (title.empty()) { + goo_title = nullptr; + } else { + goo_title = detail::ustring_to_unicode_GooString(title); + } + + d->doc->setDocInfoTitle(goo_title); + return true; +} + +/** + Gets the document's author. + + \returns the document's author, or an empty string if not available + \see set_author, info_key + */ +ustring document::get_author() const +{ + if (d->is_locked) { + return ustring(); + } + + std::unique_ptr<GooString> goo_author(d->doc->getDocInfoAuthor()); + if (!goo_author.get()) { + return ustring(); + } + + return detail::unicode_GooString_to_ustring(goo_author.get()); +} + +/** + Sets the %document's author to \p author. + If \p author is empty, the %document's author is removed. + + \returns true on success, false on failure + */ +bool document::set_author(const ustring &author) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_author; + + if (author.empty()) { + goo_author = nullptr; + } else { + goo_author = detail::ustring_to_unicode_GooString(author); + } + + d->doc->setDocInfoAuthor(goo_author); + return true; +} + +/** + Gets the document's subject. + + \returns the document's subject, or an empty string if not available + \see set_subject, info_key + */ +ustring document::get_subject() const +{ + if (d->is_locked) { + return ustring(); + } + + std::unique_ptr<GooString> goo_subject(d->doc->getDocInfoSubject()); + if (!goo_subject.get()) { + return ustring(); + } + + return detail::unicode_GooString_to_ustring(goo_subject.get()); +} + +/** + Sets the %document's subject to \p subject. + If \p subject is empty, the %document's subject is removed. + + \returns true on success, false on failure + */ +bool document::set_subject(const ustring &subject) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_subject; + + if (subject.empty()) { + goo_subject = nullptr; + } else { + goo_subject = detail::ustring_to_unicode_GooString(subject); + } + + d->doc->setDocInfoSubject(goo_subject); + return true; +} + +/** + Gets the document's keywords. + + \returns the document's keywords, or an empty string if not available + \see set_keywords, info_key + */ +ustring document::get_keywords() const +{ + if (d->is_locked) { + return ustring(); + } + + std::unique_ptr<GooString> goo_keywords(d->doc->getDocInfoKeywords()); + if (!goo_keywords.get()) { + return ustring(); + } + + return detail::unicode_GooString_to_ustring(goo_keywords.get()); +} + +/** + Sets the %document's keywords to \p keywords. + If \p keywords is empty, the %document's keywords are removed. + + \returns true on success, false on failure + */ +bool document::set_keywords(const ustring &keywords) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_keywords; + + if (keywords.empty()) { + goo_keywords = nullptr; + } else { + goo_keywords = detail::ustring_to_unicode_GooString(keywords); + } + + d->doc->setDocInfoKeywords(goo_keywords); + return true; +} + +/** + Gets the document's creator. + + \returns the document's creator, or an empty string if not available + \see set_creator, info_key + */ +ustring document::get_creator() const +{ + if (d->is_locked) { + return ustring(); + } + + std::unique_ptr<GooString> goo_creator(d->doc->getDocInfoCreator()); + if (!goo_creator.get()) { + return ustring(); + } + + return detail::unicode_GooString_to_ustring(goo_creator.get()); +} + +/** + Sets the %document's creator to \p creator. + If \p creator is empty, the %document's creator is removed. + + \returns true on success, false on failure + */ +bool document::set_creator(const ustring &creator) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_creator; + + if (creator.empty()) { + goo_creator = nullptr; + } else { + goo_creator = detail::ustring_to_unicode_GooString(creator); + } + + d->doc->setDocInfoCreator(goo_creator); + return true; +} + +/** + Gets the document's producer. + + \returns the document's producer, or an empty string if not available + \see set_producer, info_key + */ +ustring document::get_producer() const +{ + if (d->is_locked) { + return ustring(); + } + + std::unique_ptr<GooString> goo_producer(d->doc->getDocInfoProducer()); + if (!goo_producer.get()) { + return ustring(); + } + + return detail::unicode_GooString_to_ustring(goo_producer.get()); +} + +/** + Sets the %document's producer to \p producer. + If \p producer is empty, the %document's producer is removed. + + \returns true on success, false on failure + */ +bool document::set_producer(const ustring &producer) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_producer; + + if (producer.empty()) { + goo_producer = nullptr; + } else { + goo_producer = detail::ustring_to_unicode_GooString(producer); + } + + d->doc->setDocInfoProducer(goo_producer); + return true; +} + +/** + Gets the document's creation date as a time_type value. + + \returns the document's creation date as a time_type value + \see set_creation_date, info_date + */ +time_type document::get_creation_date() const +{ + if (d->is_locked) { + return time_type(-1); + } + + std::unique_ptr<GooString> goo_creation_date(d->doc->getDocInfoCreatDate()); + if (!goo_creation_date.get()) { + return time_type(-1); + } + + return static_cast<time_type>(dateStringToTime(goo_creation_date.get())); +} + +/** + Gets the document's creation date as a time_t value. + + \returns the document's creation date as a time_t value + \see set_creation_date, info_date + */ +time_t document::get_creation_date_t() const +{ + if (d->is_locked) { + return time_t(-1); + } + + std::unique_ptr<GooString> goo_creation_date(d->doc->getDocInfoCreatDate()); + if (!goo_creation_date.get()) { + return time_t(-1); + } + + return dateStringToTime(goo_creation_date.get()); +} + +/** + Sets the %document's creation date to \p creation_date. + If \p creation_date == time_type(-1), the %document's creation date is removed. + + \returns true on success, false on failure + */ +bool document::set_creation_date(time_type creation_date) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_creation_date; + + if (creation_date == time_type(-1)) { + goo_creation_date = nullptr; + } else { + time_t t = static_cast<time_t>(creation_date); + goo_creation_date = timeToDateString(&t); + } + + d->doc->setDocInfoCreatDate(goo_creation_date); + return true; +} + +/** + Sets the %document's creation date to \p creation_date. + If \p creation_date == time_t(-1), the %document's creation date is removed. + + \returns true on success, false on failure + */ +bool document::set_creation_date_t(time_t creation_date) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_creation_date; + + if (creation_date == time_t(-1)) { + goo_creation_date = nullptr; + } else { + goo_creation_date = timeToDateString(&creation_date); + } + + d->doc->setDocInfoCreatDate(goo_creation_date); + return true; +} + +/** + Gets the document's modification date as a time_type value. + + \returns the document's modification date as a time_type value + \see set_modification_date, info_date + */ +time_type document::get_modification_date() const +{ + if (d->is_locked) { + return time_type(-1); + } + + std::unique_ptr<GooString> goo_modification_date(d->doc->getDocInfoModDate()); + if (!goo_modification_date.get()) { + return time_type(-1); + } + + return static_cast<time_type>(dateStringToTime(goo_modification_date.get())); +} + +/** + Gets the document's modification date as a time_t value. + + \returns the document's modification date as a time_t value + \see set_modification_date, info_date + */ +time_t document::get_modification_date_t() const +{ + if (d->is_locked) { + return time_t(-1); + } + + std::unique_ptr<GooString> goo_modification_date(d->doc->getDocInfoModDate()); + if (!goo_modification_date.get()) { + return time_t(-1); + } + + return dateStringToTime(goo_modification_date.get()); +} + +/** + Sets the %document's modification date to \p mod_date. + If \p mod_date == time_type(-1), the %document's modification date is removed. + + \returns true on success, false on failure + */ +bool document::set_modification_date(time_type mod_date) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_mod_date; + + if (mod_date == time_type(-1)) { + goo_mod_date = nullptr; + } else { + time_t t = static_cast<time_t>(mod_date); + goo_mod_date = timeToDateString(&t); + } + + d->doc->setDocInfoModDate(goo_mod_date); + return true; +} + +/** + Sets the %document's modification date to \p mod_date. + If \p mod_date == time_t(-1), the %document's modification date is removed. + + \returns true on success, false on failure + */ +bool document::set_modification_date_t(time_t mod_date) +{ + if (d->is_locked) { + return false; + } + + GooString *goo_mod_date; + + if (mod_date == time_t(-1)) { + goo_mod_date = nullptr; + } else { + goo_mod_date = timeToDateString(&mod_date); + } + + d->doc->setDocInfoModDate(goo_mod_date); + return true; +} + +/** + Removes the %document's Info dictionary. + + \returns true on success, false on failure + */ +bool document::remove_info() +{ + if (d->is_locked) { + return false; + } + + d->doc->removeDocInfo(); + return true; +} + +/** + \returns whether the document is encrypted + */ +bool document::is_encrypted() const +{ + return d->doc->isEncrypted(); +} + +/** + \returns whether the document is linearized + */ +bool document::is_linearized() const +{ + return d->doc->isLinearized(); +} + +/** + Check for available "document permission". + + \returns whether the specified permission is allowed + */ +bool document::has_permission(permission_enum which) const +{ + switch (which) { + case perm_print: + return d->doc->okToPrint(); + case perm_change: + return d->doc->okToChange(); + case perm_copy: + return d->doc->okToCopy(); + case perm_add_notes: + return d->doc->okToAddNotes(); + case perm_fill_forms: + return d->doc->okToFillForm(); + case perm_accessibility: + return d->doc->okToAccessibility(); + case perm_assemble: + return d->doc->okToAssemble(); + case perm_print_high_resolution: + return d->doc->okToPrintHighRes(); + } + return true; +} + +/** + Reads the %document metadata string. + + \return the %document metadata string + */ +ustring document::metadata() const +{ + std::unique_ptr<GooString> md(d->doc->getCatalog()->readMetadata()); + if (md.get()) { + return detail::unicode_GooString_to_ustring(md.get()); + } + return ustring(); +} + +/** + Gets the IDs of the current PDF %document, if available. + + \param permanent_id if not NULL, will be set to the permanent ID of the %document + \param update_id if not NULL, will be set to the update ID of the %document + + \returns whether the document has the IDs + + \since 0.16 + */ +bool document::get_pdf_id(std::string *permanent_id, std::string *update_id) const +{ + GooString goo_permanent_id; + GooString goo_update_id; + + if (!d->doc->getID(permanent_id ? &goo_permanent_id : nullptr, update_id ? &goo_update_id : nullptr)) { + return false; + } + + if (permanent_id) { + *permanent_id = goo_permanent_id.c_str(); + } + if (update_id) { + *update_id = goo_update_id.c_str(); + } + + return true; +} + +/** + Document page count. + + \returns the number of pages of the document + */ +int document::pages() const +{ + return d->doc->getNumPages(); +} + +/** + Document page by label reading. + + This creates a new page representing the %document %page whose label is the + specified \p label. If there is no page with that \p label, NULL is returned. + + \returns a new page object or NULL + */ +page *document::create_page(const ustring &label) const +{ + std::unique_ptr<GooString> goolabel(detail::ustring_to_unicode_GooString(label)); + int index = 0; + + if (!d->doc->getCatalog()->labelToIndex(goolabel.get(), &index)) { + return nullptr; + } + return create_page(index); +} + +/** + Document page by index reading. + + This creates a new page representing the \p index -th %page of the %document. + \note the page indexes are in the range [0, pages()[. + + \returns a new page object or NULL + */ +page *document::create_page(int index) const +{ + if (index >= 0 && index < d->doc->getNumPages()) { + page *p = new page(d, index); + if (p->d->page) { + return p; + } else { + delete p; + return nullptr; + } + } else { + return nullptr; + } +} + +/** + Reads all the font information of the %document. + + \note this can be slow for big documents; prefer the use of a font_iterator + to read incrementally page by page + \see create_font_iterator + */ +std::vector<font_info> document::fonts() const +{ + std::vector<font_info> result; + font_iterator it(0, d); + while (it.has_next()) { + const std::vector<font_info> l = it.next(); + std::copy(l.begin(), l.end(), std::back_inserter(result)); + } + return result; +} + +/** + Creates a new font iterator. + + This creates a new font iterator for reading the font information of the + %document page by page, starting at the specified \p start_page (0 if not + specified). + + \returns a new font iterator + */ +font_iterator *document::create_font_iterator(int start_page) const +{ + return new font_iterator(start_page, d); +} + +/** + Reads the TOC (table of contents) of the %document. + + \returns a new toc object if a TOC is available, NULL otherwise + */ +toc *document::create_toc() const +{ + return toc_private::load_from_outline(d->doc->getOutline()); +} + +/** + Reads whether the current document has %document-level embedded files + (attachments). + + This is a very fast way to know whether there are embedded files (also known + as "attachments") at the %document-level. Note this does not take into account + files embedded in other ways (e.g. to annotations). + + \returns whether the document has embedded files + */ +bool document::has_embedded_files() const +{ + return d->doc->getCatalog()->numEmbeddedFiles() > 0; +} + +/** + Reads all the %document-level embedded files of the %document. + + \returns the %document-level embedded files + */ +std::vector<embedded_file *> document::embedded_files() const +{ + if (d->is_locked) { + return std::vector<embedded_file *>(); + } + + if (d->embedded_files.empty() && d->doc->getCatalog()->numEmbeddedFiles() > 0) { + const int num = d->doc->getCatalog()->numEmbeddedFiles(); + d->embedded_files.resize(num); + for (int i = 0; i < num; ++i) { + std::unique_ptr<FileSpec> fs = d->doc->getCatalog()->embeddedFile(i); + d->embedded_files[i] = embedded_file_private::create(std::move(fs)); + } + } + return d->embedded_files; +} + +/** + Creates a map of all the named destinations in the %document. + + \note The destination names may contain \\0 and other binary values + so they are not printable and cannot convert to null-terminated C strings. + + \returns the map of the each name and destination + + \since 0.74 + */ +std::map<std::string, destination> document::create_destination_map() const +{ + std::map<std::string, destination> m; + + Catalog *catalog = d->doc->getCatalog(); + if (!catalog) { + return m; + } + + // Iterate from name-dict + const int nDests = catalog->numDests(); + for (int i = 0; i < nDests; ++i) { + std::string key(catalog->getDestsName(i)); + std::unique_ptr<LinkDest> link_dest = catalog->getDestsDest(i); + + if (link_dest) { + destination dest(new destination_private(link_dest.get(), d->doc)); + + m.emplace(std::move(key), std::move(dest)); + } + } + + // Iterate from name-tree + const int nDestsNameTree = catalog->numDestNameTree(); + for (int i = 0; i < nDestsNameTree; ++i) { + std::string key(catalog->getDestNameTreeName(i)->c_str(), catalog->getDestNameTreeName(i)->getLength()); + std::unique_ptr<LinkDest> link_dest = catalog->getDestNameTreeDest(i); + + if (link_dest) { + destination dest(new destination_private(link_dest.get(), d->doc)); + + m.emplace(std::move(key), std::move(dest)); + } + } + + return m; +} + +/** + Saves the %document to file \p file_name. + + \returns true on success, false on failure + */ +bool document::save(const std::string &file_name) const +{ + if (d->is_locked) { + return false; + } + + GooString fname(file_name.c_str()); + return d->doc->saveAs(fname) == errNone; +} + +/** + Saves the original version of the %document to file \p file_name. + + \returns true on success, false on failure + */ +bool document::save_a_copy(const std::string &file_name) const +{ + if (d->is_locked) { + return false; + } + + GooString fname(file_name.c_str()); + return d->doc->saveWithoutChangesAs(fname) == errNone; +} + +/** + Tries to load a PDF %document from the specified file. + + \param file_name the file to open + \returns a new document if the load succeeded (even if the document is locked), + NULL otherwise + */ +document *document::load_from_file(const std::string &file_name, const std::string &owner_password, const std::string &user_password) +{ + document_private *doc = new document_private(std::make_unique<GooString>(file_name.c_str()), owner_password, user_password); + return document_private::check_document(doc, nullptr); +} + +/** + Tries to load a PDF %document from the specified data. + + \note if the loading succeeds, the document takes ownership of the + \p file_data (swap()ing it) + + \param file_data the data representing a document to open + \returns a new document if the load succeeded (even if the document is locked), + NULL otherwise + */ +document *document::load_from_data(byte_array *file_data, const std::string &owner_password, const std::string &user_password) +{ + if (!file_data || file_data->size() < 10) { + return nullptr; + } + + document_private *doc = new document_private(file_data, owner_password, user_password); + return document_private::check_document(doc, file_data); +} + +/** + Tries to load a PDF %document from the specified data buffer. + + \note the buffer must remain valid for the whole lifetime of the returned + document + + \param file_data the data buffer representing a document to open + \param file_data_length the length of the data buffer + + \returns a new document if the load succeeded (even if the document is locked), + NULL otherwise + + \since 0.16 + */ +document *document::load_from_raw_data(const char *file_data, int file_data_length, const std::string &owner_password, const std::string &user_password) +{ + if (!file_data || file_data_length < 10) { + return nullptr; + } + + document_private *doc = new document_private(file_data, file_data_length, owner_password, user_password); + return document_private::check_document(doc, nullptr); +} diff --git a/poppler-24.05.0/cpp/poppler-document.h b/poppler-24.05.0/cpp/poppler-document.h new file mode 100644 index 0000000000000000000000000000000000000000..97fd9a878558843bf7bd4fdbfea072b879c8ddf7 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-document.h @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com> + * Copyright (C) 2019, Masamichi Hosoda <trueroad@trueroad.jp> + * Copyright (C) 2019, 2021, 2022, Albert Astals Cid <aacid@kde.org> + * + * 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. + */ + +#ifndef POPPLER_DOCUMENT_H +#define POPPLER_DOCUMENT_H + +#include "poppler-global.h" +#include "poppler-font.h" + +#include <map> + +namespace poppler { + +class destination; +class document_private; +class embedded_file; +class page; +class toc; + +class POPPLER_CPP_EXPORT document : public poppler::noncopyable +{ +public: + enum page_mode_enum + { + use_none, + use_outlines, + use_thumbs, + fullscreen, + use_oc, + use_attach + }; + + enum page_layout_enum + { + no_layout, + single_page, + one_column, + two_column_left, + two_column_right, + two_page_left, + two_page_right + }; + + ~document(); + + bool is_locked() const; + bool unlock(const std::string &owner_password, const std::string &user_password); + + page_mode_enum page_mode() const; + page_layout_enum page_layout() const; + void get_pdf_version(int *major, int *minor) const; + std::vector<std::string> info_keys() const; + + ustring info_key(const std::string &key) const; + bool set_info_key(const std::string &key, const ustring &val); + + [[deprecated]] time_type info_date(const std::string &key) const; + [[deprecated]] bool set_info_date(const std::string &key, time_type val); + time_t info_date_t(const std::string &key) const; + bool set_info_date_t(const std::string &key, time_t val); + + ustring get_title() const; + bool set_title(const ustring &title); + ustring get_author() const; + bool set_author(const ustring &author); + ustring get_subject() const; + bool set_subject(const ustring &subject); + ustring get_keywords() const; + bool set_keywords(const ustring &keywords); + ustring get_creator() const; + bool set_creator(const ustring &creator); + ustring get_producer() const; + bool set_producer(const ustring &producer); + [[deprecated]] time_type get_creation_date() const; + [[deprecated]] bool set_creation_date(time_type creation_date); + time_t get_creation_date_t() const; + bool set_creation_date_t(time_t creation_date); + [[deprecated]] time_type get_modification_date() const; + [[deprecated]] bool set_modification_date(time_type mod_date); + time_t get_modification_date_t() const; + bool set_modification_date_t(time_t mod_date); + + bool remove_info(); + + bool is_encrypted() const; + bool is_linearized() const; + bool has_permission(permission_enum which) const; + ustring metadata() const; + bool get_pdf_id(std::string *permanent_id, std::string *update_id) const; + + int pages() const; + page *create_page(const ustring &label) const; + page *create_page(int index) const; + + std::vector<font_info> fonts() const; + font_iterator *create_font_iterator(int start_page = 0) const; + + toc *create_toc() const; + + bool has_embedded_files() const; + std::vector<embedded_file *> embedded_files() const; + + // Named destinations are bytestrings, not string. + // So we use std::string instead of ustring. + std::map<std::string, destination> create_destination_map() const; + + bool save(const std::string &file_name) const; + bool save_a_copy(const std::string &file_name) const; + + static document *load_from_file(const std::string &file_name, const std::string &owner_password = std::string(), const std::string &user_password = std::string()); + static document *load_from_data(byte_array *file_data, const std::string &owner_password = std::string(), const std::string &user_password = std::string()); + static document *load_from_raw_data(const char *file_data, int file_data_length, const std::string &owner_password = std::string(), const std::string &user_password = std::string()); + +private: + explicit document(document_private &dd); + + document_private *d; + friend class document_private; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-embedded-file-private.h b/poppler-24.05.0/cpp/poppler-embedded-file-private.h new file mode 100644 index 0000000000000000000000000000000000000000..733ed70fc791e8d1943de74d634a7bbe108f94d0 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-embedded-file-private.h @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2009, 2011, Pino Toscano <pino@kde.org> + * Copyright (C) 2018, 2021, 2022, Albert Astals Cid <aacid@kde.org> + * + * 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. + */ + +#ifndef POPPLER_EMBEDDED_FILE_PRIVATE_H +#define POPPLER_EMBEDDED_FILE_PRIVATE_H + +#include <FileSpec.h> + +#include <memory> + +namespace poppler { + +class embedded_file_private +{ +public: + explicit embedded_file_private(std::unique_ptr<FileSpec> &&fs); + + static embedded_file *create(std::unique_ptr<FileSpec> &&fs); + + std::unique_ptr<FileSpec> file_spec; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-embedded-file.cpp b/poppler-24.05.0/cpp/poppler-embedded-file.cpp new file mode 100644 index 0000000000000000000000000000000000000000..d0b240a0709d160de987d6e849ace34d187cb7ac --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-embedded-file.cpp @@ -0,0 +1,199 @@ +/* + * Copyright (C) 2009-2011, Pino Toscano <pino@kde.org> + * Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com> + * Copyright (C) 2018, 2020, 2022 Albert Astals Cid <aacid@kde.org> + * + * 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. + */ + +/** + \file poppler-embedded-file.h + */ +#include "poppler-embedded-file.h" + +#include "poppler-embedded-file-private.h" +#include "poppler-private.h" + +#include "Object.h" +#include "Stream.h" +#include "Catalog.h" +#include "FileSpec.h" +#include "DateInfo.h" + +using namespace poppler; + +embedded_file_private::embedded_file_private(std::unique_ptr<FileSpec> &&fs) : file_spec(std::move(fs)) { } + +embedded_file *embedded_file_private::create(std::unique_ptr<FileSpec> &&fs) +{ + return new embedded_file(*new embedded_file_private(std::move(fs))); +} + +/** + \class poppler::embedded_file poppler-embedded-file.h "poppler/cpp/poppler-embedded-file.h" + + Represents a file embedded in a PDF %document. + */ + +embedded_file::embedded_file(embedded_file_private &dd) : d(&dd) { } + +/** + Destroys the embedded file. + */ +embedded_file::~embedded_file() +{ + delete d; +} + +/** + \returns whether the embedded file is valid + */ +bool embedded_file::is_valid() const +{ + return d->file_spec->isOk(); +} + +/** + \returns the name of the embedded file + */ +std::string embedded_file::name() const +{ + const GooString *goo = d->file_spec->getFileName(); + return goo ? std::string(goo->c_str()) : std::string(); +} + +/** + \returns the description of the embedded file + */ +ustring embedded_file::description() const +{ + const GooString *goo = d->file_spec->getDescription(); + return goo ? detail::unicode_GooString_to_ustring(goo) : ustring(); +} + +/** + \note this is not always available in the PDF %document, in that case this + will return \p -1. + + \returns the size of the embedded file, if known + */ +int embedded_file::size() const +{ + const EmbFile *ef = d->file_spec->getEmbeddedFile(); + return ef ? ef->size() : -1; +} + +/** + \returns the time_type representing the modification date of the embedded file, + if available + */ +time_type embedded_file::modification_date() const +{ + const EmbFile *ef = d->file_spec->getEmbeddedFile(); + const GooString *goo = ef ? ef->modDate() : nullptr; + return goo ? static_cast<time_type>(dateStringToTime(goo)) : time_type(-1); +} + +/** + \returns the time_type representing the creation date of the embedded file, + if available + */ +time_type embedded_file::creation_date() const +{ + const EmbFile *ef = d->file_spec->getEmbeddedFile(); + const GooString *goo = ef ? ef->createDate() : nullptr; + return goo ? static_cast<time_type>(dateStringToTime(goo)) : time_type(-1); +} + +/** + \returns the time_t representing the modification date of the embedded file, + if available + */ +time_t embedded_file::modification_date_t() const +{ + const EmbFile *ef = d->file_spec->getEmbeddedFile(); + const GooString *goo = ef ? ef->modDate() : nullptr; + return goo ? dateStringToTime(goo) : time_t(-1); +} + +/** + \returns the time_t representing the creation date of the embedded file, + if available + */ +time_t embedded_file::creation_date_t() const +{ + const EmbFile *ef = d->file_spec->getEmbeddedFile(); + const GooString *goo = ef ? ef->createDate() : nullptr; + return goo ? dateStringToTime(goo) : time_t(-1); +} + +/** + \returns the checksum of the embedded file + */ +byte_array embedded_file::checksum() const +{ + const EmbFile *ef = d->file_spec->getEmbeddedFile(); + const GooString *cs = ef ? ef->checksum() : nullptr; + if (!cs) { + return byte_array(); + } + const char *ccs = cs->c_str(); + byte_array data(cs->getLength()); + for (int i = 0; i < cs->getLength(); ++i) { + data[i] = ccs[i]; + } + return data; +} + +/** + \returns the MIME type of the embedded file, if available + */ +std::string embedded_file::mime_type() const +{ + const EmbFile *ef = d->file_spec->getEmbeddedFile(); + const GooString *goo = ef ? ef->mimeType() : nullptr; + return goo ? std::string(goo->c_str()) : std::string(); +} + +/** + Reads all the data of the embedded file. + + \returns the data of the embedded file + */ +byte_array embedded_file::data() const +{ + if (!is_valid()) { + return byte_array(); + } + EmbFile *ef = d->file_spec->getEmbeddedFile(); + Stream *stream = ef ? ef->stream() : nullptr; + if (!stream) { + return byte_array(); + } + + stream->reset(); + byte_array ret(1024); + size_t data_len = 0; + int i; + while ((i = stream->getChar()) != EOF) { + if (data_len == ret.size()) { + ret.resize(ret.size() * 2); + } + ret[data_len] = (char)i; + ++data_len; + } + ret.resize(data_len); + return ret; +} diff --git a/poppler-24.05.0/cpp/poppler-embedded-file.h b/poppler-24.05.0/cpp/poppler-embedded-file.h new file mode 100644 index 0000000000000000000000000000000000000000..f39bd745489f70929443776e966732e58d6bab25 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-embedded-file.h @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2021, 2022, Albert Astals Cid <aacid@kde.org> + * + * 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. + */ + +#ifndef POPPLER_EMBEDDED_FILE_H +#define POPPLER_EMBEDDED_FILE_H + +#include "poppler-global.h" + +#include <vector> + +namespace poppler { + +class embedded_file_private; + +class POPPLER_CPP_EXPORT embedded_file : public poppler::noncopyable +{ +public: + ~embedded_file(); + + bool is_valid() const; + std::string name() const; + ustring description() const; + int size() const; + [[deprecated]] time_type modification_date() const; + [[deprecated]] time_type creation_date() const; + time_t modification_date_t() const; + time_t creation_date_t() const; + byte_array checksum() const; + std::string mime_type() const; + byte_array data() const; + +private: + explicit embedded_file(embedded_file_private &dd); + + embedded_file_private *d; + friend class embedded_file_private; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-font-private.h b/poppler-24.05.0/cpp/poppler-font-private.h new file mode 100644 index 0000000000000000000000000000000000000000..ba9c6e0db12e9ce43532794555dc242a1e1b8b7b --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-font-private.h @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2009, Pino Toscano <pino@kde.org> + * Copyright (C) 2015, Tamas Szekeres <szekerest@gmail.com> + * Copyright (C) 2020, Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> + * Copyright (C) 2021, Albert Astals Cid <aacid@kde.org> + * + * 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-font.h" + +#include "poppler-document-private.h" + +#include "FontInfo.h" + +#include <algorithm> + +using namespace poppler; + +class poppler::font_info_private +{ +public: + font_info_private() : type(font_info::unknown), is_embedded(false), is_subset(false) { } + explicit font_info_private(FontInfo *fi) : type((font_info::type_enum)fi->getType()), is_embedded(fi->getEmbedded()), is_subset(fi->getSubset()) + { + if (fi->getName()) { + font_name = fi->getName()->c_str(); + } + if (fi->getFile()) { + font_file = fi->getFile()->c_str(); + } + + ref = fi->getRef(); + emb_ref = fi->getEmbRef(); + } + + std::string font_name; + std::string font_file; + font_info::type_enum type : 5; + bool is_embedded : 1; + bool is_subset : 1; + + Ref ref; + Ref emb_ref; +}; + +class poppler::font_iterator_private +{ +public: + font_iterator_private(int start_page, document_private *dd) : font_info_scanner(dd->doc, start_page), total_pages(dd->doc->getNumPages()), current_page((std::max)(start_page, 0)) { } + ~font_iterator_private() { } + + FontInfoScanner font_info_scanner; + int total_pages; + int current_page; +}; diff --git a/poppler-24.05.0/cpp/poppler-font.cpp b/poppler-24.05.0/cpp/poppler-font.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ba046c5b33d6463cdace72ecc80d0d71338a6da6 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-font.cpp @@ -0,0 +1,190 @@ +/* + * Copyright (C) 2009, Pino Toscano <pino@kde.org> + * Copyright (C) 2015, Tamas Szekeres <szekerest@gmail.com> + * Copyright (C) 2018, Adam Reichold <adam.reichold@t-online.de> + * Copyright (C) 2019, Oliver Sander <oliver.sander@tu-dresden.de> + * Copyright (C) 2020, Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> + * + * 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. + */ + +/** + \file poppler-font.h + */ +#include "poppler-font.h" + +#include "poppler-font-private.h" + +#include "poppler-document-private.h" + +#include "FontInfo.h" + +#include <algorithm> + +using namespace poppler; + +/** + \class poppler::font_info poppler-font.h "poppler/cpp/poppler-font.h" + + The information about a font used in a PDF %document. + */ + +/** + \enum poppler::font_info::type_enum + + The various types of fonts available in a PDF %document. +*/ + +/** + Constructs an invalid font information. + */ +font_info::font_info() : d(new font_info_private()) { } + +font_info::font_info(font_info_private &dd) : d(&dd) { } + +/** + Copy constructor. + */ +font_info::font_info(const font_info &fi) : d(new font_info_private(*fi.d)) { } + +/** + Destructor. + */ +font_info::~font_info() +{ + delete d; +} + +/** + \returns the name of the font + */ +std::string font_info::name() const +{ + return d->font_name; +} + +/** + \returns the file name of the font, in case the font is not embedded nor subset + */ +std::string font_info::file() const +{ + return d->font_file; +} + +/** + \returns whether the font is totally embedded in the %document + */ +bool font_info::is_embedded() const +{ + return d->is_embedded; +} + +/** + \returns whether there is a subset of the font embedded in the %document + */ +bool font_info::is_subset() const +{ + return d->is_subset; +} + +/** + \returns the type of the font + */ +font_info::type_enum font_info::type() const +{ + return d->type; +} + +/** + Assignment operator. + */ +font_info &font_info::operator=(const font_info &fi) +{ + if (this != &fi) { + *d = *fi.d; + } + return *this; +} + +/** + \class poppler::font_iterator poppler-font.h "poppler/cpp/poppler-font.h" + + Reads the fonts in the PDF %document page by page. + + font_iterator is the way to collect the list of the fonts used in a PDF + %document, reading them incrementally page by page. + + A typical usage of this might look like: + \code +poppler::font_iterator *it = doc->create_font_iterator(); +while (it->has_next()) { + std::vector<poppler::font_info> fonts = it->next(); + // do domething with the fonts +} +// after we are done with the iterator, it must be deleted +delete it; +\endcode + */ + +font_iterator::font_iterator(int start_page, document_private *dd) : d(new font_iterator_private(start_page, dd)) { } + +/** + Destructor. + */ +font_iterator::~font_iterator() +{ + delete d; +} + +/** + \returns the fonts of the current page and advances to the next one. + */ +std::vector<font_info> font_iterator::next() +{ + if (!has_next()) { + return std::vector<font_info>(); + } + + ++d->current_page; + + /* FontInfoScanner::scan() receives a number how many pages to + * be scanned from the *current page*, not from the beginning. + * We restrict the font scanning to the current page only. + */ + const std::vector<FontInfo *> items = d->font_info_scanner.scan(1); + std::vector<font_info> fonts; + fonts.reserve(items.size()); + for (FontInfo *entry : items) { + fonts.push_back(font_info(*new font_info_private(entry))); + delete entry; + } + return fonts; +} + +/** + \returns whether the iterator has more pages to advance to +*/ +bool font_iterator::has_next() const +{ + return d->current_page < d->total_pages; +} + +/** + \returns the current page +*/ +int font_iterator::current_page() const +{ + return d->current_page; +} diff --git a/poppler-24.05.0/cpp/poppler-font.h b/poppler-24.05.0/cpp/poppler-font.h new file mode 100644 index 0000000000000000000000000000000000000000..b6bc48c50f2d7590373060cdd828a8ea399702cd --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-font.h @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2009, Pino Toscano <pino@kde.org> + * Copyright (C) 2020, Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> + * Copyright (C) 2021, Albert Astals Cid <aacid@kde.org> + * + * 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. + */ + +#ifndef POPPLER_FONT_H +#define POPPLER_FONT_H + +#include "poppler-global.h" + +#include <vector> + +namespace poppler { + +class document; +class document_private; +class font_info_private; +class font_iterator; +class font_iterator_private; + +class POPPLER_CPP_EXPORT font_info +{ +public: + enum type_enum + { + unknown, + type1, + type1c, + type1c_ot, + type3, + truetype, + truetype_ot, + cid_type0, + cid_type0c, + cid_type0c_ot, + cid_truetype, + cid_truetype_ot + }; + + font_info(); + font_info(const font_info &fi); + ~font_info(); + + std::string name() const; + std::string file() const; + bool is_embedded() const; + bool is_subset() const; + type_enum type() const; + + font_info &operator=(const font_info &fi); + +private: + explicit font_info(font_info_private &dd); + + font_info_private *d; + friend class font_iterator; + friend class page; +}; + +class POPPLER_CPP_EXPORT font_iterator : public poppler::noncopyable +{ +public: + ~font_iterator(); + + std::vector<font_info> next(); + bool has_next() const; + int current_page() const; + +private: + font_iterator(int, document_private *dd); + + font_iterator_private *d; + friend class document; + friend class page; + friend class page_private; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-global.cpp b/poppler-24.05.0/cpp/poppler-global.cpp new file mode 100644 index 0000000000000000000000000000000000000000..9cfb1d70cbf28d9901149be0b65aaf316e0edecf --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-global.cpp @@ -0,0 +1,403 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2010, Hib Eris <hib@hiberis.nl> + * Copyright (C) 2014, 2015 Hans-Peter Deifel <hpdeifel@gmx.de> + * Copyright (C) 2015, Tamas Szekeres <szekerest@gmail.com> + * Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com> + * Copyright (C) 2018, 2020-2022, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2018 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> + * Copyright (C) 2018, 2020, Adam Reichold <adam.reichold@t-online.de> + * Copyright (C) 2022, Oliver Sander <oliver.sander@tu-dresden.de> + * + * 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. + */ + +/** + \file poppler-global.h + */ +#include "poppler-global.h" + +#include "poppler-private.h" +#include "poppler-document-private.h" + +#include "DateInfo.h" + +#include <algorithm> + +#include <cerrno> +#include <cstring> +#include <ios> +#include <iostream> + +#include <iconv.h> + +#include "config.h" + +namespace { + +struct MiniIconv +{ + MiniIconv(const char *to_code, const char *from_code) : i_(iconv_open(to_code, from_code)) { } + ~MiniIconv() + { + if (is_valid()) { + iconv_close(i_); + } + } + MiniIconv(const MiniIconv &) = delete; + MiniIconv &operator=(const MiniIconv &) = delete; + bool is_valid() const { return i_ != (iconv_t)-1; } + explicit operator iconv_t() const { return i_; } + iconv_t i_; +}; + +} + +using namespace poppler; + +/** + \namespace poppler + + Single namespace containing all the classes and functions of poppler-cpp. + */ + +/** + \class poppler::noncopyable + + A class that cannot be copied. + */ + +/** + \enum poppler::rotation_enum + + The case sensitivity. +*/ +/** + \var poppler::rotation_enum poppler::rotate_0 + + A rotation of 0 degrees clockwise. +*/ +/** + \var poppler::rotation_enum poppler::rotate_90 + + A rotation of 90 degrees clockwise. +*/ +/** + \var poppler::rotation_enum poppler::rotate_180 + + A rotation of 180 degrees clockwise. +*/ +/** + \var poppler::rotation_enum poppler::rotate_270 + + A rotation of 270 degrees clockwise. +*/ + +/** + \enum poppler::page_box_enum + + A possible box of a page in a PDF %document. +*/ +/** + \var poppler::page_box_enum poppler::media_box + + The "media" box. +*/ +/** + \var poppler::page_box_enum poppler::crop_box + + The "crop" box. +*/ +/** + \var poppler::page_box_enum poppler::bleed_box + + The "bleed" box. +*/ +/** + \var poppler::page_box_enum poppler::trim_box + + The "trim" box. +*/ +/** + \var poppler::page_box_enum poppler::art_box + + The "art" box. +*/ + +/** + \enum poppler::permission_enum + + A possible permission in a PDF %document. +*/ +/** + \var poppler::permission_enum poppler::perm_print + + The permission to allow the print of a %document. +*/ +/** + \var poppler::permission_enum poppler::perm_change + + The permission to change a %document. + + This is a generic "change" permission, so other permissions could affect + some types of changes. +*/ +/** + \var poppler::permission_enum poppler::perm_copy + + The permission to allow the copy or extraction of the text in a %document. +*/ +/** + \var poppler::permission_enum poppler::perm_add_notes + + The permission to allow the addition or editing of annotations, + and the filling of interactive form fields (including signature fields). +*/ +/** + \var poppler::permission_enum poppler::perm_fill_forms + + The permission to allow the filling of interactive form fields + (including signature fields). + + \note this permission can be set even when the \ref poppler::perm_add_notes "perm_add_notes" + is not: this means that only the filling of forms is allowed. +*/ +/** + \var poppler::permission_enum poppler::perm_accessibility + + The permission to allow the extracting of content (for example, text) for + accessibility usage (e.g. for a screen reader). +*/ +/** + \var poppler::permission_enum poppler::perm_assemble + + The permission to allow to "assemble" a %document. + + This implies operations such as the insertion, the rotation and the deletion + of pages; the creation of bookmarks and thumbnail images. + + \note this permission can be set even when the \ref poppler::perm_change "perm_change" + is not +*/ +/** + \var poppler::permission_enum poppler::perm_print_high_resolution + + The permission to allow the high resolution print of a %document. +*/ + +/** + \enum poppler::case_sensitivity_enum + + The case sensitivity. +*/ + +noncopyable::noncopyable() { } + +noncopyable::~noncopyable() { } + +noncopyable &noncopyable::operator=(noncopyable &&other) noexcept = default; + +ustring::ustring() { } + +ustring::ustring(size_type len, value_type ch) : std::basic_string<value_type>(len, ch) { } + +ustring::~ustring() { } + +byte_array ustring::to_utf8() const +{ + if (!size()) { + return byte_array(); + } + +#ifdef WORDS_BIGENDIAN + MiniIconv ic("UTF-8", "UTF-16BE"); +#else + MiniIconv ic("UTF-8", "UTF-16LE"); +#endif + if (!ic.is_valid()) { + return byte_array(); + } + const value_type *me_data = data(); + byte_array str(size() * sizeof(value_type)); + char *str_data = &str[0]; + size_t me_len_char = size() * sizeof(value_type); + size_t str_len_left = str.size(); + size_t ir = iconv(static_cast<iconv_t>(ic), (ICONV_CONST char **)&me_data, &me_len_char, &str_data, &str_len_left); + if ((ir == (size_t)-1) && (errno == E2BIG)) { + const size_t delta = str_data - &str[0]; + str_len_left += str.size(); + str.resize(str.size() * 2); + str_data = &str[delta]; + ir = iconv(static_cast<iconv_t>(ic), (ICONV_CONST char **)&me_data, &me_len_char, &str_data, &str_len_left); + if (ir == (size_t)-1) { + return byte_array(); + } + } + str.resize(str.size() - str_len_left); + return str; +} + +std::string ustring::to_latin1() const +{ + if (!size()) { + return std::string(); + } + + const size_type mylength = size(); + std::string ret(mylength, '\0'); + const value_type *me = data(); + for (size_type i = 0; i < mylength; ++i) { + ret[i] = (char)*me++; + } + return ret; +} + +ustring ustring::from_utf8(const char *str, int len) +{ + if (len <= 0) { + len = std::strlen(str); + if (len <= 0) { + return ustring(); + } + } + +#ifdef WORDS_BIGENDIAN + MiniIconv ic("UTF-16BE", "UTF-8"); +#else + MiniIconv ic("UTF-16LE", "UTF-8"); +#endif + if (!ic.is_valid()) { + return ustring(); + } + + // +1, because iconv inserts byte order marks + ustring ret(len + 1, 0); + char *ret_data = reinterpret_cast<char *>(&ret[0]); + char *str_data = const_cast<char *>(str); + size_t str_len_char = len; + size_t ret_len_left = ret.size() * sizeof(ustring::value_type); + size_t ir = iconv(static_cast<iconv_t>(ic), (ICONV_CONST char **)&str_data, &str_len_char, &ret_data, &ret_len_left); + if ((ir == (size_t)-1) && (errno == E2BIG)) { + const size_t delta = ret_data - reinterpret_cast<char *>(&ret[0]); + ret_len_left += ret.size() * sizeof(ustring::value_type); + ret.resize(ret.size() * 2); + ret_data = reinterpret_cast<char *>(&ret[0]) + delta; + ir = iconv(static_cast<iconv_t>(ic), (ICONV_CONST char **)&str_data, &str_len_char, &ret_data, &ret_len_left); + if (ir == (size_t)-1) { + return ustring(); + } + } + ret.resize(ret.size() - ret_len_left / sizeof(ustring::value_type)); + + return ret; +} + +ustring ustring::from_latin1(const std::string &str) +{ + const size_type l = str.size(); + if (!l) { + return ustring(); + } + const char *c = str.data(); + ustring ret(l, 0); + for (size_type i = 0; i < l; ++i) { + ret[i] = static_cast<unsigned char>(*c); + c++; + } + return ret; +} + +/** + Converts a string representing a PDF date to a value compatible with time_type. + */ +time_type poppler::convert_date(const std::string &date) +{ + GooString gooDateStr(date.c_str()); + return static_cast<time_type>(dateStringToTime(&gooDateStr)); +} + +/** + Converts a string representing a PDF date to a value compatible with time_t. + */ +time_t poppler::convert_date_t(const std::string &date) +{ + GooString gooDateStr(date.c_str()); + return dateStringToTime(&gooDateStr); +} + +std::ostream &poppler::operator<<(std::ostream &stream, const byte_array &array) +{ + stream << "["; + const std::ios_base::fmtflags f = stream.flags(); + std::hex(stream); + const char *data = &array[0]; + const byte_array::size_type out_len = std::min<byte_array::size_type>(array.size(), 50); + for (byte_array::size_type i = 0; i < out_len; ++i) { + if (i != 0) { + stream << " "; + } + stream << ((data[i] & 0xf0) >> 4) << (data[i] & 0xf); + } + stream.flags(f); + if (out_len < array.size()) { + stream << " ..."; + } + stream << "]"; + return stream; +} + +/** + * Sets a custom data directory for initialization of global parameters + * + * If no instances of \see document currently exist, this will save the + * given path as a custom data directory to be used when the first instance + * of the \see document is constructed. + * + * \returns true on success, false on failure + * + * \since 0.73.0 + */ +bool poppler::set_data_dir(const std::string &new_data_dir) +{ + return GlobalParamsIniter::setCustomDataDir(new_data_dir); +} + +/** + \typedef poppler::debug_func + + Debug/error function. + + This function type is used for debugging & error output; + the first parameter is the actual message, the second is the unaltered + closure argument which was passed to the set_debug_error_function() call. + + \since 0.30.0 + */ + +/** + Set a new debug/error output function. + + If not set, by default error and debug messages will be sent to stderr. + + \param debug_function the new debug function + \param closure user data which will be passed as-is to the debug function + + \since 0.30.0 + */ +void poppler::set_debug_error_function(debug_func debug_function, void *closure) +{ + poppler::detail::user_debug_function = debug_function; + poppler::detail::debug_closure = closure; +} diff --git a/poppler-24.05.0/cpp/poppler-global.h b/poppler-24.05.0/cpp/poppler-global.h new file mode 100644 index 0000000000000000000000000000000000000000..248a759962a3f02dd9742b0759b9ae0db09bd1d9 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-global.h @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2010, Patrick Spendrin <ps_ml@gmx.de> + * Copyright (C) 2014, Hans-Peter Deifel <hpdeifel@gmx.de> + * Copyright (C) 2018, Adam Reichold <adam.reichold@t-online.de> + * Copyright (C) 2021, 2022, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2022, Tobias C. Berner <tcberner@gmail.com> + * Copyright (C) 2022, Oliver Sander <oliver.sander@tu-dresden.de> + * Copyright (C) 2024, hugegameartgd@gmail.com + * + * 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. + */ + +#ifndef POPPLER_GLOBAL_H +#define POPPLER_GLOBAL_H + +#include "poppler_cpp_export.h" + +#include <ctime> +#include <iosfwd> +#include <string> +#include <vector> + +namespace poppler { + +/// \cond DOXYGEN_SKIP_THIS +namespace detail { + +class POPPLER_CPP_EXPORT noncopyable +{ +public: + noncopyable(const noncopyable &) = delete; + const noncopyable &operator=(const noncopyable &) = delete; + +protected: + noncopyable(); + ~noncopyable(); + noncopyable &operator=(noncopyable &&other) noexcept; +}; + +} + +typedef detail::noncopyable noncopyable; +/// \endcond + +enum rotation_enum +{ + rotate_0, + rotate_90, + rotate_180, + rotate_270 +}; + +enum page_box_enum +{ + media_box, + crop_box, + bleed_box, + trim_box, + art_box +}; + +enum permission_enum +{ + perm_print, + perm_change, + perm_copy, + perm_add_notes, + perm_fill_forms, + perm_accessibility, + perm_assemble, + perm_print_high_resolution +}; + +enum case_sensitivity_enum +{ + case_sensitive, + case_insensitive +}; + +typedef std::vector<char> byte_array; + +typedef unsigned int /* time_t */ time_type; + +// to disable warning only for this occurrence +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4251) /* class 'A' needs to have dll interface for to be used by clients of class 'B'. */ +#endif +class POPPLER_CPP_EXPORT ustring : public std::basic_string<char16_t> +{ +public: + ustring(); + ustring(size_type len, value_type ch); + ~ustring(); + + byte_array to_utf8() const; + std::string to_latin1() const; + + static ustring from_utf8(const char *str, int len = -1); + static ustring from_latin1(const std::string &str); + +private: + // forbid implicit std::string conversions + explicit ustring(const std::string &); + explicit operator std::string() const; + ustring &operator=(const std::string &); +}; +#ifdef _MSC_VER +# pragma warning(pop) +#endif + +[[deprecated]] POPPLER_CPP_EXPORT time_type convert_date(const std::string &date); + +POPPLER_CPP_EXPORT time_t convert_date_t(const std::string &date); + +POPPLER_CPP_EXPORT std::ostream &operator<<(std::ostream &stream, const byte_array &array); + +POPPLER_CPP_EXPORT bool set_data_dir(const std::string &new_data_dir); + +typedef void (*debug_func)(const std::string &, void *); + +POPPLER_CPP_EXPORT void set_debug_error_function(debug_func debug_function, void *closure); + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-image-private.h b/poppler-24.05.0/cpp/poppler-image-private.h new file mode 100644 index 0000000000000000000000000000000000000000..53952e5db2950c61660dada6f1bd51bb6ad6034b --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-image-private.h @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2018, 2022, Albert Astals Cid <aacid@kde.org> + * + * 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. + */ + +#ifndef POPPLER_IMAGE_PRIVATE_H +#define POPPLER_IMAGE_PRIVATE_H + +#include "poppler-image.h" + +namespace poppler { + +class image_private +{ +public: + image_private(int iwidth, int iheight, image::format_enum iformat); + ~image_private(); + + image_private(const image_private &) = delete; + image_private &operator=(const image_private &) = delete; + + static image_private *create_data(int width, int height, image::format_enum format); + static image_private *create_data(char *data, int width, int height, image::format_enum format); + + int ref; + char *data; + int width; + int height; + int bytes_per_row; + int bytes_num; + image::format_enum format; + bool own_data : 1; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-image.cpp b/poppler-24.05.0/cpp/poppler-image.cpp new file mode 100644 index 0000000000000000000000000000000000000000..44739a8e1422798facf8ac43f56abd45470f53a9 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-image.cpp @@ -0,0 +1,515 @@ +/* + * Copyright (C) 2010-2011, Pino Toscano <pino@kde.org> + * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com> + * Copyright (C) 2017-2019, 2021, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2017, Jeroen Ooms <jeroenooms@gmail.com> + * Copyright (C) 2018, Zsombor Hollay-Horvath <hollay.horvath@gmail.com> + * Copyright (C) 2018, Adam Reichold <adam.reichold@t-online.de> + * + * 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. + */ + +/** + \file poppler-image.h + */ +#include "poppler-image.h" + +#include "poppler-image-private.h" + +#include <config.h> +#include "ImgWriter.h" +#if defined(ENABLE_LIBPNG) +# include "PNGWriter.h" +#endif +#if defined(ENABLE_LIBJPEG) +# include "JpegWriter.h" +#endif +#if defined(ENABLE_LIBTIFF) +# include "TiffWriter.h" +#endif +#include "NetPBMWriter.h" + +#include <cstdlib> +#include <cstring> +#include <algorithm> +#include <memory> +#include <vector> + +namespace { + +struct FileCloser +{ + inline explicit FileCloser(FILE *ff) : f(ff) { } + inline ~FileCloser() { (void)close(); } + FileCloser(const FileCloser &) = delete; + FileCloser &operator=(const FileCloser &) = delete; + inline bool close() + { + if (f) { + const int c = fclose(f); + f = nullptr; + return c == 0; + } + return true; + } + + FILE *f; +}; + +int calc_bytes_per_row(int width, poppler::image::format_enum format) +{ + switch (format) { + case poppler::image::format_invalid: + return 0; + case poppler::image::format_mono: + return (width + 7) >> 3; + case poppler::image::format_gray8: + return (width + 3) >> 2 << 2; + case poppler::image::format_rgb24: + case poppler::image::format_bgr24: + return (width * 3 + 3) >> 2 << 2; + case poppler::image::format_argb32: + return width * 4; + } + return 0; +} + +NetPBMWriter::Format pnm_format(poppler::image::format_enum format) +{ + switch (format) { + case poppler::image::format_invalid: // unused, anyway + case poppler::image::format_mono: + return NetPBMWriter::MONOCHROME; + case poppler::image::format_gray8: + case poppler::image::format_rgb24: + case poppler::image::format_bgr24: + case poppler::image::format_argb32: + return NetPBMWriter::RGB; + } + return NetPBMWriter::RGB; +} + +} + +using namespace poppler; + +image_private::image_private(int iwidth, int iheight, image::format_enum iformat) : ref(1), data(nullptr), width(iwidth), height(iheight), bytes_per_row(0), bytes_num(0), format(iformat), own_data(true) { } + +image_private::~image_private() +{ + if (own_data) { + std::free(data); + } +} + +image_private *image_private::create_data(int width, int height, image::format_enum format) +{ + if (width <= 0 || height <= 0) { + return nullptr; + } + + int bpr = calc_bytes_per_row(width, format); + if (bpr <= 0) { + return nullptr; + } + + auto d = std::make_unique<image_private>(width, height, format); + d->bytes_num = bpr * height; + d->data = reinterpret_cast<char *>(std::malloc(d->bytes_num)); + if (!d->data) { + return nullptr; + } + d->own_data = true; + d->bytes_per_row = bpr; + + return d.release(); +} + +image_private *image_private::create_data(char *data, int width, int height, image::format_enum format) +{ + if (width <= 0 || height <= 0 || !data) { + return nullptr; + } + + int bpr = calc_bytes_per_row(width, format); + if (bpr <= 0) { + return nullptr; + } + + image_private *d = new image_private(width, height, format); + d->bytes_num = bpr * height; + d->data = data; + d->own_data = false; + d->bytes_per_row = bpr; + + return d; +} + +/** + \class poppler::image poppler-image.h "poppler/cpp/poppler-image.h" + + A simple representation of image, with direct access to the data. + + This class uses implicit sharing for the internal data, so it can be used as + value class. This also means any non-const operation will make sure that the + data used by current instance is not shared with other instances (ie + \em detaching), copying the shared data. + + \since 0.16 + */ + +/** + \enum poppler::image::format_enum + + The possible formats for an image. + + format_gray8 and format_bgr24 were introduced in poppler 0.65. +*/ + +/** + Construct an invalid image. + */ +image::image() : d(nullptr) { } + +/** + Construct a new image. + + It allocates the storage needed for the image data; if the allocation fails, + the image is an invalid one. + + \param iwidth the width for the image + \param iheight the height for the image + \param iformat the format for the bits of the image + */ +image::image(int iwidth, int iheight, image::format_enum iformat) : d(image_private::create_data(iwidth, iheight, iformat)) { } + +/** + Construct a new image. + + It uses the provide data buffer for the image, so you \b must ensure it + remains valid for the whole lifetime of the image. + + \param idata the buffer to use for the image + \param iwidth the width for the image + \param iheight the height for the image + \param iformat the format for the bits of the image + */ +image::image(char *idata, int iwidth, int iheight, image::format_enum iformat) : d(image_private::create_data(idata, iwidth, iheight, iformat)) { } + +/** + Copy constructor. + */ +image::image(const image &img) : d(img.d) +{ + if (d) { + ++d->ref; + } +} + +/** + Destructor. + */ +image::~image() +{ + if (d && !--d->ref) { + delete d; + } +} + +/** + Image validity check. + + \returns whether the image is valid. + */ +bool image::is_valid() const +{ + return d && d->format != format_invalid; +} + +/** + \returns the format of the image + */ +image::format_enum image::format() const +{ + return d ? d->format : format_invalid; +} + +/** + \returns whether the width of the image + */ +int image::width() const +{ + return d ? d->width : 0; +} + +/** + \returns whether the height of the image + */ +int image::height() const +{ + return d ? d->height : 0; +} + +/** + \returns the number of bytes in each row of the image + */ +int image::bytes_per_row() const +{ + return d ? d->bytes_per_row : 0; +} + +/** + Access to the image bits. + + This function will detach and copy the shared data. + + \returns the pointer to the first pixel + */ +char *image::data() +{ + if (!d) { + return nullptr; + } + + detach(); + return d->data; +} + +/** + Access to the image bits. + + This function provides const access to the data. + + \returns the pointer to the first pixel + */ +const char *image::const_data() const +{ + return d ? d->data : nullptr; +} + +/** + Copy of a slice of the image. + + \param r the sub-area of this image to copy; if empty, the whole image is + copied + + \returns a new image representing the specified part of the current image + */ +image image::copy(const rect &r) const +{ + if (r.is_empty()) { + image img(*this); + img.detach(); + return img; + } + + // ### FIXME + return *this; +} + +/** + Saves the current image to file. + + Using this function it is possible to save the image to the specified + \p file_name, in the specified \p out_format and with a resolution of the + specified \p dpi. + + Image formats commonly supported are: + \li PNG: \c png + \li JPEG: \c jpeg, \c jpg + \li TIFF: \c tiff + \li PNM: \c pnm (with Poppler >= 0.18) + + If an image format is not supported (check the result of + supported_image_formats()), the saving fails. + + \returns whether the saving succeeded + */ +bool image::save(const std::string &file_name, const std::string &out_format, int dpi) const +{ + if (!is_valid() || file_name.empty() || out_format.empty()) { + return false; + } + + std::string fmt = out_format; + std::transform(fmt.begin(), fmt.end(), fmt.begin(), tolower); + + std::unique_ptr<ImgWriter> w; + const int actual_dpi = dpi == -1 ? 75 : dpi; + if (false) { + } +#if defined(ENABLE_LIBPNG) + else if (fmt == "png") { + w = std::make_unique<PNGWriter>(); + } +#endif +#if defined(ENABLE_LIBJPEG) + else if (fmt == "jpeg" || fmt == "jpg") { + w = std::make_unique<JpegWriter>(); + } +#endif +#if defined(ENABLE_LIBTIFF) + else if (fmt == "tiff") { + w = std::make_unique<TiffWriter>(); + } +#endif + else if (fmt == "pnm") { + w = std::make_unique<NetPBMWriter>(pnm_format(d->format)); + } + if (!w.get()) { + return false; + } + FILE *f = fopen(file_name.c_str(), "wb"); + if (!f) { + return false; + } + const FileCloser fc(f); + if (!w->init(f, d->width, d->height, actual_dpi, actual_dpi)) { + return false; + } + switch (d->format) { + case format_invalid: + return false; + case format_mono: + return false; + case format_gray8: { + std::vector<unsigned char> row(3 * d->width); + char *hptr = d->data; + for (int y = 0; y < d->height; ++y) { + unsigned char *rowptr = &row[0]; + for (int x = 0; x < d->width; ++x, rowptr += 3) { + rowptr[0] = *reinterpret_cast<unsigned char *>(hptr + x); + rowptr[1] = *reinterpret_cast<unsigned char *>(hptr + x); + rowptr[2] = *reinterpret_cast<unsigned char *>(hptr + x); + } + rowptr = &row[0]; + if (!w->writeRow(&rowptr)) { + return false; + } + hptr += d->bytes_per_row; + } + break; + } + case format_bgr24: { + std::vector<unsigned char> row(3 * d->width); + char *hptr = d->data; + for (int y = 0; y < d->height; ++y) { + unsigned char *rowptr = &row[0]; + for (int x = 0; x < d->width; ++x, rowptr += 3) { + rowptr[0] = *reinterpret_cast<unsigned char *>(hptr + x * 3 + 2); + rowptr[1] = *reinterpret_cast<unsigned char *>(hptr + x * 3 + 1); + rowptr[2] = *reinterpret_cast<unsigned char *>(hptr + x * 3); + } + rowptr = &row[0]; + if (!w->writeRow(&rowptr)) { + return false; + } + hptr += d->bytes_per_row; + } + break; + } + case format_rgb24: { + char *hptr = d->data; + for (int y = 0; y < d->height; ++y) { + if (!w->writeRow(reinterpret_cast<unsigned char **>(&hptr))) { + return false; + } + hptr += d->bytes_per_row; + } + break; + } + case format_argb32: { + std::vector<unsigned char> row(3 * d->width); + char *hptr = d->data; + for (int y = 0; y < d->height; ++y) { + unsigned char *rowptr = &row[0]; + for (int x = 0; x < d->width; ++x, rowptr += 3) { + const unsigned int pixel = *reinterpret_cast<unsigned int *>(hptr + x * 4); + rowptr[0] = (pixel >> 16) & 0xff; + rowptr[1] = (pixel >> 8) & 0xff; + rowptr[2] = pixel & 0xff; + } + rowptr = &row[0]; + if (!w->writeRow(&rowptr)) { + return false; + } + hptr += d->bytes_per_row; + } + break; + } + } + + if (!w->close()) { + return false; + } + + return true; +} + +/** + \returns a list of the supported image formats + */ +std::vector<std::string> image::supported_image_formats() +{ + std::vector<std::string> formats; +#if defined(ENABLE_LIBPNG) + formats.emplace_back("png"); +#endif +#if defined(ENABLE_LIBJPEG) + formats.emplace_back("jpeg"); + formats.emplace_back("jpg"); +#endif +#if defined(ENABLE_LIBTIFF) + formats.emplace_back("tiff"); +#endif + formats.emplace_back("pnm"); + return formats; +} + +/** + Assignment operator. + */ +image &image::operator=(const image &img) +{ + if (this == &img) { + return *this; + } + + if (img.d) { + ++img.d->ref; + } + image_private *old_d = d; + d = img.d; + if (old_d && !--old_d->ref) { + delete old_d; + } + return *this; +} + +void image::detach() +{ + if (d->ref == 1) { + return; + } + + image_private *old_d = d; + d = image_private::create_data(old_d->width, old_d->height, old_d->format); + if (d) { + std::memcpy(d->data, old_d->data, old_d->bytes_num); + --old_d->ref; + } else { + d = old_d; + } +} diff --git a/poppler-24.05.0/cpp/poppler-image.h b/poppler-24.05.0/cpp/poppler-image.h new file mode 100644 index 0000000000000000000000000000000000000000..2b98916c1ce3f81f6e1cf2b7e47b484a82a747e9 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-image.h @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2018, Zsombor Hollay-Horvath <hollay.horvath@gmail.com> + * + * 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. + */ + +#ifndef POPPLER_IMAGE_H +#define POPPLER_IMAGE_H + +#include "poppler-global.h" +#include "poppler-rectangle.h" + +namespace poppler { + +class image_private; + +class POPPLER_CPP_EXPORT image +{ +public: + enum format_enum + { + format_invalid, + format_mono, + format_rgb24, + format_argb32, + format_gray8, + format_bgr24 + }; + + image(); + image(int iwidth, int iheight, format_enum iformat); + image(char *idata, int iwidth, int iheight, format_enum iformat); + image(const image &img); + ~image(); + + bool is_valid() const; + format_enum format() const; + int width() const; + int height() const; + char *data(); + const char *const_data() const; + int bytes_per_row() const; + + image copy(const rect &r = rect()) const; + + bool save(const std::string &file_name, const std::string &out_format, int dpi = -1) const; + + static std::vector<std::string> supported_image_formats(); + + image &operator=(const image &img); + +private: + void detach(); + + image_private *d; + friend class image_private; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-page-private.h b/poppler-24.05.0/cpp/poppler-page-private.h new file mode 100644 index 0000000000000000000000000000000000000000..f0ea37f12d32e6063c061e36e86a5f85468c280c --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-page-private.h @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2009, Pino Toscano <pino@kde.org> + * Copyright (C) 2018, 2020, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2020, Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> + * + * 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. + */ + +#ifndef POPPLER_PAGE_PRIVATE_H +#define POPPLER_PAGE_PRIVATE_H + +#include "poppler-page.h" + +class Page; + +namespace poppler { + +class document_private; +class page_transition; +class font_info; + +class page_private +{ +public: + page_private(document_private *doc, int index); + ~page_private(); + + page_private(const page_private &) = delete; + page_private &operator=(const page_private &) = delete; + + document_private *doc; + Page *page; + int index; + page_transition *transition; + + static inline page_private *get(const poppler::page *p) { return const_cast<poppler::page *>(p)->d; } + + std::vector<font_info> font_info_cache; + bool font_info_cache_initialized; + void init_font_info_cache(); +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-page-renderer.cpp b/poppler-24.05.0/cpp/poppler-page-renderer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..4b07e7692751af18eaf54bd79d73b21c8ae39e67 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-page-renderer.cpp @@ -0,0 +1,303 @@ +/* + * Copyright (C) 2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2015 William Bader <williambader@hotmail.com> + * Copyright (C) 2018, Zsombor Hollay-Horvath <hollay.horvath@gmail.com> + * Copyright (C) 2019, Julián Unrrein <junrrein@gmail.com> + * Copyright (C) 2020, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2021, Hubert Figuiere <hub@figuiere.net> + * + * 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. + */ + +/** + \file poppler-page-renderer.h + */ +#include "poppler-page-renderer.h" + +#include "poppler-document-private.h" +#include "poppler-page-private.h" +#include "poppler-image.h" + +#include <config.h> +#include <poppler-config.h> + +#include "PDFDoc.h" +#include "SplashOutputDev.h" +#include "splash/SplashBitmap.h" + +using namespace poppler; + +class poppler::page_renderer_private +{ +public: + page_renderer_private() : paper_color(0xffffffff), hints(0), image_format(image::format_enum::format_argb32), line_mode(page_renderer::line_mode_enum::line_default) { } + + static bool conv_color_mode(image::format_enum mode, SplashColorMode &splash_mode); + static bool conv_line_mode(page_renderer::line_mode_enum mode, SplashThinLineMode &splash_mode); + + argb paper_color; + unsigned int hints; + image::format_enum image_format; + page_renderer::line_mode_enum line_mode; +}; + +bool page_renderer_private::conv_color_mode(image::format_enum mode, SplashColorMode &splash_mode) +{ + switch (mode) { + case image::format_enum::format_mono: + splash_mode = splashModeMono1; + break; + case image::format_enum::format_gray8: + splash_mode = splashModeMono8; + break; + case image::format_enum::format_rgb24: + splash_mode = splashModeRGB8; + break; + case image::format_enum::format_bgr24: + splash_mode = splashModeBGR8; + break; + case image::format_enum::format_argb32: + splash_mode = splashModeXBGR8; + break; + default: + return false; + } + return true; +} + +bool page_renderer_private::conv_line_mode(page_renderer::line_mode_enum mode, SplashThinLineMode &splash_mode) +{ + switch (mode) { + case page_renderer::line_mode_enum::line_default: + splash_mode = splashThinLineDefault; + break; + case page_renderer::line_mode_enum::line_solid: + splash_mode = splashThinLineSolid; + break; + case page_renderer::line_mode_enum::line_shape: + splash_mode = splashThinLineShape; + break; + default: + return false; + } + return true; +} + +/** + \class poppler::page_renderer poppler-page-renderer.h "poppler/cpp/poppler-renderer.h" + + Simple way to render a page of a PDF %document. + + \since 0.16 + */ + +/** + \enum poppler::page_renderer::render_hint + + A flag of an option taken into account when rendering +*/ + +/** + Constructs a new %page renderer. + */ +page_renderer::page_renderer() : d(new page_renderer_private()) { } + +/** + Destructor. + */ +page_renderer::~page_renderer() +{ + delete d; +} + +/** + The color used for the "paper" of the pages. + + The default color is opaque solid white (0xffffffff). + + \returns the paper color + */ +argb page_renderer::paper_color() const +{ + return d->paper_color; +} + +/** + Set a new color for the "paper". + + \param c the new color + */ +void page_renderer::set_paper_color(argb c) +{ + d->paper_color = c; +} + +/** + The hints used when rendering. + + By default no hint is set. + + \returns the render hints set + */ +unsigned int page_renderer::render_hints() const +{ + return d->hints; +} + +/** + Enable or disable a single render %hint. + + \param hint the hint to modify + \param on whether enable it or not + */ +void page_renderer::set_render_hint(page_renderer::render_hint hint, bool on) +{ + if (on) { + d->hints |= hint; + } else { + d->hints &= ~(int)hint; + } +} + +/** + Set new render %hints at once. + + \param hints the new set of render hints + */ +void page_renderer::set_render_hints(unsigned int hints) +{ + d->hints = hints; +} + +/** + The image format used when rendering. + + By default ARGB32 is set. + + \returns the image format + + \since 0.65 + */ +image::format_enum page_renderer::image_format() const +{ + return d->image_format; +} + +/** + Set new image format used when rendering. + + \param format the new image format + + \since 0.65 + */ +void page_renderer::set_image_format(image::format_enum format) +{ + d->image_format = format; +} + +/** + The line mode used when rendering. + + By default default mode is set. + + \returns the line mode + + \since 0.65 + */ +page_renderer::line_mode_enum page_renderer::line_mode() const +{ + return d->line_mode; +} + +/** + Set new line mode used when rendering. + + \param mode the new line mode + + \since 0.65 + */ +void page_renderer::set_line_mode(page_renderer::line_mode_enum mode) +{ + d->line_mode = mode; +} + +/** + Render the specified page. + + This functions renders the specified page on an image following the specified + parameters, returning it. + + \param p the page to render + \param xres the X resolution, in dot per inch (DPI) + \param yres the Y resolution, in dot per inch (DPI) + \param x the X top-right coordinate, in pixels + \param y the Y top-right coordinate, in pixels + \param w the width in pixels of the area to render + \param h the height in pixels of the area to render + \param rotate the rotation to apply when rendering the page + + \returns the rendered image, or a null one in case of errors + + \see can_render + */ +image page_renderer::render_page(const page *p, double xres, double yres, int x, int y, int w, int h, rotation_enum rotate) const +{ + if (!p) { + return image(); + } + + page_private *pp = page_private::get(p); + PDFDoc *pdfdoc = pp->doc->doc; + + SplashColorMode colorMode; + SplashThinLineMode lineMode; + + if (!d->conv_color_mode(d->image_format, colorMode) || !d->conv_line_mode(d->line_mode, lineMode)) { + return image(); + } + + SplashColor bgColor; + bgColor[0] = d->paper_color & 0xff; + bgColor[1] = (d->paper_color >> 8) & 0xff; + bgColor[2] = (d->paper_color >> 16) & 0xff; + SplashOutputDev splashOutputDev(colorMode, 4, false, bgColor, true, lineMode); + splashOutputDev.setFontAntialias(d->hints & text_antialiasing ? true : false); + splashOutputDev.setVectorAntialias(d->hints & antialiasing ? true : false); + splashOutputDev.setFreeTypeHinting(d->hints & text_hinting ? true : false, false); + splashOutputDev.startDoc(pdfdoc); + pdfdoc->displayPageSlice(&splashOutputDev, pp->index + 1, xres, yres, int(rotate) * 90, false, true, false, x, y, w, h, nullptr, nullptr, nullptr, nullptr, true); + + SplashBitmap *bitmap = splashOutputDev.getBitmap(); + const int bw = bitmap->getWidth(); + const int bh = bitmap->getHeight(); + + SplashColorPtr data_ptr = bitmap->getDataPtr(); + + const image img(reinterpret_cast<char *>(data_ptr), bw, bh, d->image_format); + return img.copy(); +} + +/** + Rendering capability test. + + page_renderer can render only if a render backend ('Splash') is compiled in + Poppler. + + \returns whether page_renderer can render + */ +bool page_renderer::can_render() +{ + return true; +} diff --git a/poppler-24.05.0/cpp/poppler-page-renderer.h b/poppler-24.05.0/cpp/poppler-page-renderer.h new file mode 100644 index 0000000000000000000000000000000000000000..166e5cdfe581f5bc8f0ddd7536a658420d5c35c6 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-page-renderer.h @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2018, Zsombor Hollay-Horvath <hollay.horvath@gmail.com> + * + * 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. + */ + +#ifndef POPPLER_PAGE_RENDERER_H +#define POPPLER_PAGE_RENDERER_H + +#include "poppler-global.h" +#include "poppler-image.h" + +namespace poppler { + +typedef unsigned int argb; + +class page; +class page_renderer_private; + +class POPPLER_CPP_EXPORT page_renderer : public poppler::noncopyable +{ +public: + enum render_hint + { + antialiasing = 0x00000001, + text_antialiasing = 0x00000002, + text_hinting = 0x00000004 + }; + + enum line_mode_enum + { + line_default, + line_solid, + line_shape + }; + + page_renderer(); + ~page_renderer(); + + argb paper_color() const; + void set_paper_color(argb c); + + unsigned int render_hints() const; + void set_render_hint(render_hint hint, bool on = true); + void set_render_hints(unsigned int hints); + + image::format_enum image_format() const; + void set_image_format(image::format_enum format); + + line_mode_enum line_mode() const; + void set_line_mode(line_mode_enum mode); + + image render_page(const page *p, double xres = 72.0, double yres = 72.0, int x = -1, int y = -1, int w = -1, int h = -1, rotation_enum rotate = rotate_0) const; + + static bool can_render(); + +private: + page_renderer_private *d; + friend class page_renderer_private; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-page-transition.cpp b/poppler-24.05.0/cpp/poppler-page-transition.cpp new file mode 100644 index 0000000000000000000000000000000000000000..7d19e910474068c71bb995997b188894b589b1d2 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-page-transition.cpp @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2011, 2021, 2022, Albert Astals Cid <aacid@kde.org> + * + * 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. + */ + +/** + \file poppler-page-transition.h + */ +#include "poppler-page-transition.h" + +#include "PageTransition.h" + +using namespace poppler; + +class poppler::page_transition_private +{ +public: + explicit page_transition_private(Object *trans) : pt(trans) { } + + PageTransition pt; +}; + +/** + \class poppler::page_transition poppler-page-transition.h "poppler/cpp/poppler-page-transition.h" + + A transition between two pages in a PDF %document. + + Usually shown in a presentation mode of a PDF viewer. + */ + +/** + \enum poppler::page_transition::type_enum + + The possible types of a %page transition. +*/ + +/** + \enum poppler::page_transition::alignment_enum + + The alignment of a %page transition. +*/ + +/** + \enum poppler::page_transition::direction_enum + + The direction of an animation in a %page transition. +*/ + +page_transition::page_transition(Object *params) : d(new page_transition_private(params)) { } + +/** + Copy constructor. + */ +page_transition::page_transition(const page_transition &pt) : d(new page_transition_private(*pt.d)) { } + +/** + Destructor. + */ +page_transition::~page_transition() +{ + delete d; +} + +page_transition::type_enum page_transition::type() const +{ + return (page_transition::type_enum)d->pt.getType(); +} + +int page_transition::duration() const +{ + return static_cast<int>(d->pt.getDuration()); +} + +double page_transition::durationReal() const +{ + return d->pt.getDuration(); +} + +page_transition::alignment_enum page_transition::alignment() const +{ + return (page_transition::alignment_enum)d->pt.getAlignment(); +} + +page_transition::direction_enum page_transition::direction() const +{ + return (page_transition::direction_enum)d->pt.getDirection(); +} + +int page_transition::angle() const +{ + return d->pt.getAngle(); +} + +double page_transition::scale() const +{ + return d->pt.getScale(); +} + +bool page_transition::is_rectangular() const +{ + return d->pt.isRectangular(); +} + +page_transition &page_transition::operator=(const page_transition &pt) +{ + if (&pt != this) { + page_transition_private *new_d = new page_transition_private(*pt.d); + delete d; + d = new_d; + } + return *this; +} diff --git a/poppler-24.05.0/cpp/poppler-page-transition.h b/poppler-24.05.0/cpp/poppler-page-transition.h new file mode 100644 index 0000000000000000000000000000000000000000..68447508678a4ebd975d45f9158b05238d3852f4 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-page-transition.h @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2009, Pino Toscano <pino@kde.org> + * Copyright (C) 2021, 2022, Albert Astals Cid <aacid@kde.org> + * + * 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. + */ + +#ifndef POPPLER_PAGE_TRANSITION_H +#define POPPLER_PAGE_TRANSITION_H + +#include "poppler-global.h" + +class Object; + +namespace poppler { + +class page; +class page_transition_private; + +class POPPLER_CPP_EXPORT page_transition +{ +public: + enum type_enum + { + replace = 0, + split, + blinds, + box, + wipe, + dissolve, + glitter, + fly, + push, + cover, + uncover, + fade + }; + + enum alignment_enum + { + horizontal = 0, + vertical + }; + + enum direction_enum + { + inward = 0, + outward + }; + + page_transition(const page_transition &pt); + ~page_transition(); + + type_enum type() const; + [[deprecated]] int duration() const; + double durationReal() const; + alignment_enum alignment() const; + direction_enum direction() const; + int angle() const; + double scale() const; + bool is_rectangular() const; + + page_transition &operator=(const page_transition &pt); + +private: + explicit page_transition(Object *params); + + page_transition_private *d; + friend class page; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-page.cpp b/poppler-24.05.0/cpp/poppler-page.cpp new file mode 100644 index 0000000000000000000000000000000000000000..526d3eea95411bffd5cee19acd8d59c5a24c4bed --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-page.cpp @@ -0,0 +1,480 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2017-2020, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2017, Jason Alan Palmer <jalanpalmer@gmail.com> + * Copyright (C) 2018, 2020, Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> + * Copyright (C) 2018, 2020, Adam Reichold <adam.reichold@t-online.de> + * Copyright (C) 2018, Zsombor Hollay-Horvath <hollay.horvath@gmail.com> + * Copyright (C) 2018, Aleksey Nikolaev <nae202@gmail.com> + * Copyright (C) 2020, Jiri Jakes <freedesktop@jirijakes.eu> + * + * 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. + */ + +/** + \file poppler-page.h + */ +#include "poppler-page.h" +#include "poppler-page-transition.h" + +#include "poppler-document-private.h" +#include "poppler-page-private.h" +#include "poppler-private.h" +#include "poppler-font-private.h" +#include "poppler-font.h" + +#include "TextOutputDev.h" + +#include <algorithm> +#include <memory> +#include <utility> + +using namespace poppler; + +page_private::page_private(document_private *_doc, int _index) : doc(_doc), page(doc->doc->getCatalog()->getPage(_index + 1)), index(_index), transition(nullptr), font_info_cache_initialized(false) { } + +page_private::~page_private() +{ + delete transition; +} + +void page_private::init_font_info_cache() +{ + if (font_info_cache_initialized) { + return; + } + + poppler::font_iterator it(index, doc); + + if (it.has_next()) { + font_info_cache = it.next(); + } + + font_info_cache_initialized = true; + return; +} + +/** + \class poppler::page poppler-page.h "poppler/cpp/poppler-page.h" + + A page in a PDF %document. + */ + +/** + \enum poppler::page::orientation_enum + + The possible orientation of a page. +*/ + +/** + \enum poppler::page::search_direction_enum + + The direction/action to follow when performing a text search. +*/ + +/** + \enum poppler::page::text_layout_enum + + A layout of the text of a page. +*/ + +page::page(document_private *doc, int index) : d(new page_private(doc, index)) { } + +/** + Destructor. + */ +page::~page() +{ + delete d; +} + +/** + \returns the orientation of the page + */ +page::orientation_enum page::orientation() const +{ + const int rotation = d->page->getRotate(); + switch (rotation) { + case 90: + return landscape; + break; + case 180: + return upside_down; + break; + case 270: + return seascape; + break; + default: + return portrait; + } +} + +/** + The eventual duration the page can be hinted to be shown in a presentation. + + If this value is positive (usually different than -1) then a PDF viewer, when + showing the page in a presentation, should show the page for at most for this + number of seconds, and then switch to the next page (if any). Note this is + purely a presentation attribute, it has no influence on the behaviour. + + \returns the duration time (in seconds) of the page + */ +double page::duration() const +{ + return d->page->getDuration(); +} + +/** + Returns the size of one rect of the page. + + \returns the size of the specified page rect + */ +rectf page::page_rect(page_box_enum box) const +{ + const PDFRectangle *r = nullptr; + switch (box) { + case media_box: + r = d->page->getMediaBox(); + break; + case crop_box: + r = d->page->getCropBox(); + break; + case bleed_box: + r = d->page->getBleedBox(); + break; + case trim_box: + r = d->page->getTrimBox(); + break; + case art_box: + r = d->page->getArtBox(); + break; + } + if (r) { + return detail::pdfrectangle_to_rectf(*r); + } + return rectf(); +} + +/** + \returns the label of the page, if any + */ +ustring page::label() const +{ + GooString goo; + if (!d->doc->doc->getCatalog()->indexToLabel(d->index, &goo)) { + return ustring(); + } + + return detail::unicode_GooString_to_ustring(&goo); +} + +/** + The transition from this page to the next one. + + If it is set, then a PDF viewer in a presentation should perform the + specified transition effect when switching from this page to the next one. + + \returns the transition effect for the switch to the next page, if any + */ +page_transition *page::transition() const +{ + if (!d->transition) { + Object o = d->page->getTrans(); + if (o.isDict()) { + d->transition = new page_transition(&o); + } + } + return d->transition; +} + +/** + Search the page for some text. + + \param text the text to search + \param[in,out] r the area where to start search, which will be set to the area + of the match (if any) + \param direction in which direction search for text + \param case_sensitivity whether search in a case sensitive way + \param rotation the rotation assumed for the page + */ +bool page::search(const ustring &text, rectf &r, search_direction_enum direction, case_sensitivity_enum case_sensitivity, rotation_enum rotation) const +{ + const size_t len = text.length(); + + if (len == 0) { + return false; + } + + std::vector<Unicode> u(len); + for (size_t i = 0; i < len; ++i) { + u[i] = text[i]; + } + + const bool sCase = case_sensitivity == case_sensitive; + const int rotation_value = (int)rotation * 90; + + bool found = false; + double rect_left = r.left(); + double rect_top = r.top(); + double rect_right = r.right(); + double rect_bottom = r.bottom(); + + TextOutputDev td(nullptr, true, 0, false, false); + d->doc->doc->displayPage(&td, d->index + 1, 72, 72, rotation_value, false, true, false); + TextPage *text_page = td.takeText(); + + switch (direction) { + case search_from_top: + found = text_page->findText(&u[0], len, true, true, false, false, sCase, false, false, &rect_left, &rect_top, &rect_right, &rect_bottom); + break; + case search_next_result: + found = text_page->findText(&u[0], len, false, true, true, false, sCase, false, false, &rect_left, &rect_top, &rect_right, &rect_bottom); + break; + case search_previous_result: + found = text_page->findText(&u[0], len, false, true, true, false, sCase, true, false, &rect_left, &rect_top, &rect_right, &rect_bottom); + break; + } + + text_page->decRefCnt(); + r.set_left(rect_left); + r.set_top(rect_top); + r.set_right(rect_right); + r.set_bottom(rect_bottom); + + return found; +} + +/** + Returns the text in the page, in its physical layout. + + \param r if not empty, it will be extracted the text in it; otherwise, the + text of the whole page + + \returns the text of the page in the specified rect or in the whole page + */ +ustring page::text(const rectf &r) const +{ + return text(r, physical_layout); +} + +static void appendToGooString(void *stream, const char *text, int len) +{ + ((GooString *)stream)->append(text, len); +} + +/** + Returns the text in the page. + + \param rect if not empty, it will be extracted the text in it; otherwise, the + text of the whole page + \param layout_mode the layout of the text + + \returns the text of the page in the specified rect or in the whole page + + \since 0.16 + */ +ustring page::text(const rectf &r, text_layout_enum layout_mode) const +{ + std::unique_ptr<GooString> out(new GooString()); + const bool use_raw_order = (layout_mode == raw_order_layout); + const bool use_physical_layout = (layout_mode == physical_layout); + TextOutputDev td(&appendToGooString, out.get(), use_physical_layout, 0, use_raw_order, false); + if (r.is_empty()) { + d->doc->doc->displayPage(&td, d->index + 1, 72, 72, 0, false, true, false); + } else { + d->doc->doc->displayPageSlice(&td, d->index + 1, 72, 72, 0, false, true, false, r.left(), r.top(), r.width(), r.height()); + } + return ustring::from_utf8(out->c_str()); +} + +/* + * text_box_font_info object for text_box + */ +text_box_font_info_data::~text_box_font_info_data() = default; + +/* + * text_box object for page::text_list() + */ +text_box_data::~text_box_data() = default; + +text_box::~text_box() = default; + +text_box &text_box::operator=(text_box &&a) noexcept = default; +text_box::text_box(text_box &&a) noexcept = default; + +text_box::text_box(text_box_data *data) : m_data { data } { } + +ustring text_box::text() const +{ + return m_data->text; +} + +rectf text_box::bbox() const +{ + return m_data->bbox; +} + +int text_box::rotation() const +{ + return m_data->rotation; +} + +rectf text_box::char_bbox(size_t i) const +{ + if (i < m_data->char_bboxes.size()) { + return m_data->char_bboxes[i]; + } + return rectf(0, 0, 0, 0); +} + +bool text_box::has_space_after() const +{ + return m_data->has_space_after; +} + +bool text_box::has_font_info() const +{ + return (m_data->text_box_font != nullptr); +} + +text_box::writing_mode_enum text_box::get_wmode(int i) const +{ + if (this->has_font_info()) { + return m_data->text_box_font->wmodes[i]; + } else { + return text_box::invalid_wmode; + } +} + +double text_box::get_font_size() const +{ + if (this->has_font_info()) { + return m_data->text_box_font->font_size; + } else { + return -1; + } +} + +std::string text_box::get_font_name(int i) const +{ + if (!this->has_font_info()) { + return std::string("*ignored*"); + } + + int j = m_data->text_box_font->glyph_to_cache_index[i]; + if (j < 0) { + return std::string(""); + } + return m_data->text_box_font->font_info_cache[j].name(); +} + +std::vector<text_box> page::text_list(int opt_flag) const +{ + std::vector<text_box> output_list; + + /* config values are same with Qt5 Page::TextList() */ + auto output_dev = std::make_unique<TextOutputDev>(nullptr, /* char* fileName */ + false, /* bool physLayoutA */ + 0, /* double fixedPitchA */ + false, /* bool rawOrderA */ + false /* bool append */ + ); + + /* + * config values are same with Qt5 Page::TextList(), + * but rotation is fixed to zero. + * Few people use non-zero values. + */ + d->doc->doc->displayPageSlice(output_dev.get(), d->index + 1, /* page */ + 72, 72, 0, /* hDPI, vDPI, rot */ + false, false, false, /* useMediaBox, crop, printing */ + -1, -1, -1, -1, /* sliceX, sliceY, sliceW, sliceH */ + nullptr, nullptr, /* abortCheckCbk(), abortCheckCbkData */ + nullptr, nullptr, /* annotDisplayDecideCbk(), annotDisplayDecideCbkData */ + true); /* copyXRef */ + + if (std::unique_ptr<TextWordList> word_list { output_dev->makeWordList() }) { + + output_list.reserve(word_list->getLength()); + for (int i = 0; i < word_list->getLength(); i++) { + TextWord *word = word_list->get(i); + + std::unique_ptr<GooString> gooWord { word->getText() }; + ustring ustr = ustring::from_utf8(gooWord->c_str()); + + double xMin, yMin, xMax, yMax; + word->getBBox(&xMin, &yMin, &xMax, &yMax); + + text_box tb { new text_box_data { ustr, { xMin, yMin, xMax - xMin, yMax - yMin }, word->getRotation(), {}, word->hasSpaceAfter() == true, nullptr } }; + + std::unique_ptr<text_box_font_info_data> tb_font_info = nullptr; + if (opt_flag & page::text_list_include_font) { + d->init_font_info_cache(); + + std::unique_ptr<text_box_font_info_data> tb_font { new text_box_font_info_data { + word->getFontSize(), // double font_size + {}, // std::vector<text_box::writing_mode> wmodes; + d->font_info_cache, // std::vector<font_info> font_info_cache; + {} // std::vector<int> glyph_to_cache_index; + } }; + + tb_font_info = std::move(tb_font); + }; + + tb.m_data->char_bboxes.reserve(word->getLength()); + for (int j = 0; j < word->getLength(); j++) { + word->getCharBBox(j, &xMin, &yMin, &xMax, &yMax); + tb.m_data->char_bboxes.emplace_back(xMin, yMin, xMax - xMin, yMax - yMin); + } + + if (tb_font_info && d->font_info_cache_initialized) { + tb_font_info->glyph_to_cache_index.reserve(word->getLength()); + for (int j = 0; j < word->getLength(); j++) { + const TextFontInfo *cur_text_font_info = word->getFontInfo(j); + + // filter-out the invalid WMode value here. + switch (cur_text_font_info->getWMode()) { + case 0: + tb_font_info->wmodes.push_back(text_box::horizontal_wmode); + break; + case 1: + tb_font_info->wmodes.push_back(text_box::vertical_wmode); + break; + default: + tb_font_info->wmodes.push_back(text_box::invalid_wmode); + }; + + tb_font_info->glyph_to_cache_index.push_back(-1); + for (size_t k = 0; k < tb_font_info->font_info_cache.size(); k++) { + if (cur_text_font_info->matches(&(tb_font_info->font_info_cache[k].d->ref))) { + tb_font_info->glyph_to_cache_index[j] = k; + break; + } + } + } + tb.m_data->text_box_font = std::move(tb_font_info); + } + + output_list.push_back(std::move(tb)); + } + } + + return output_list; +} + +std::vector<text_box> page::text_list() const +{ + return text_list(0); +} diff --git a/poppler-24.05.0/cpp/poppler-page.h b/poppler-24.05.0/cpp/poppler-page.h new file mode 100644 index 0000000000000000000000000000000000000000..6041402c8337e948321a6dc315a823a1dbf5eeef --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-page.h @@ -0,0 +1,225 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2018, 2020, Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> + * Copyright (C) 2018-2022, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2018, Zsombor Hollay-Horvath <hollay.horvath@gmail.com> + * Copyright (C) 2018, Aleksey Nikolaev <nae202@gmail.com> + * Copyright (C) 2020, Jiri Jakes <freedesktop@jirijakes.eu> + * Copyright (C) 2020, Adam Reichold <adam.reichold@t-online.de> + * + * 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. + */ + +#ifndef POPPLER_PAGE_H +#define POPPLER_PAGE_H + +#include "poppler-global.h" +#include "poppler-rectangle.h" + +#include <memory> + +namespace poppler { + +struct text_box_data; +class POPPLER_CPP_EXPORT text_box +{ + friend class page; + +public: + text_box(text_box &&) noexcept; + text_box &operator=(text_box &&) noexcept; + + ~text_box(); + + ustring text() const; + rectf bbox() const; + + /** + \since 0.68 + */ + int rotation() const; + + /** + Get a bbox for the i-th glyph + + This method returns a rectf of the bounding box for + the i-th glyph in the text_box. + + \note The text_box object owns the rectf objects, + the caller is not needed to free them. + + \warning For too large glyph index, rectf(0,0,0,0) + is returned. The number of the glyphs and ustring + codepoints might be different in some complex scripts. + */ + rectf char_bbox(size_t i) const; + bool has_space_after() const; + + /** + \since 0.89 + */ + bool has_font_info() const; + + /** + Get a writing mode for the i-th glyph + + This method returns an enum of the writing mode + for the i-th glyph in the text_box. + + \note Usually all glyphs in one text_box have the + same writing mode. Thus the default value of the + glyph index is 0. + */ + enum writing_mode_enum + { + invalid_wmode = -1, + horizontal_wmode = 0, + vertical_wmode = 1 + }; + + /** + \since 0.89 + */ + writing_mode_enum get_wmode(int i = 0) const; + + /** + Get a font size of this text_box instance. + + This method return a double floating value of the + font size from the text_box instance. + */ + + /** + \since 0.89 + */ + double get_font_size() const; + + /** + Get a font name for the i-th glyph + + This method returns a std::string object holding + the font name for the i-th glyph. + + \note The randomization prefix of the embedded fonts + are not removed. The font names including these + prefixes are insuffucient to determine whether the + two fonts are same or different. + + \note The clients should not assume that the + encoding of the font name is one of the ASCII, + Latin1 or UTF-8. Some legacy PDF producers used + in CJK market use GBK, Big5, Wansung or Shift-JIS. + */ + + /** + \since 0.89 + */ + std::string get_font_name(int i = 0) const; + +private: + explicit text_box(text_box_data *data); + + std::unique_ptr<text_box_data> m_data; +}; + +class document; +class document_private; +class page_private; +class page_transition; + +class POPPLER_CPP_EXPORT page : public poppler::noncopyable +{ +public: + enum orientation_enum + { + landscape, + portrait, + seascape, + upside_down + }; + enum search_direction_enum + { + search_from_top, + search_next_result, + search_previous_result + }; + enum text_layout_enum + { + physical_layout, + raw_order_layout, + non_raw_non_physical_layout ///< \since 0.88 + }; + + ~page(); + + orientation_enum orientation() const; + double duration() const; + rectf page_rect(page_box_enum box = crop_box) const; + ustring label() const; + + page_transition *transition() const; + + bool search(const ustring &text, rectf &r, search_direction_enum direction, case_sensitivity_enum case_sensitivity, rotation_enum rotation = rotate_0) const; + ustring text(const rectf &r = rectf()) const; + ustring text(const rectf &r, text_layout_enum layout_mode) const; + + /** + Returns a list of text of the page + + This method returns a std::vector of text_box that contain all + the text of the page, with roughly one text word of text + per text_box item. + + For text written in western languages (left-to-right and + up-to-down), the std::vector contains the text in the proper + order. + + \since 0.63 + + \note The page object owns the text_box objects as unique_ptr, + the caller is not needed to free them. + + \warning This method is not tested with Asian scripts + */ + std::vector<text_box> text_list() const; + + /* + * text_list_option_enum is a bitmask-style flags for text_list(), + * 0 means the default & simplest behaviour. + */ + enum text_list_option_enum + { + text_list_include_font = 1 // \since 0.89 + }; + + /** + Extended version of text_list() taking an option flag. + The option flag should be the multiple of text_list_option_enum. + + \since 0.89 + */ + std::vector<text_box> text_list(int opt_flag) const; + +private: + page(document_private *doc, int index); + + page_private *d; + friend class page_private; + friend class document; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-private.cpp b/poppler-24.05.0/cpp/poppler-private.cpp new file mode 100644 index 0000000000000000000000000000000000000000..9e89c7b8371889772f6925e7c1954695511137ee --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-private.cpp @@ -0,0 +1,119 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com> + * Copyright (C) 2014, Hans-Peter Deifel <hpdeifel@gmx.de> + * Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com> + * Copyright (C) 2017-2019 Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2018 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> + * Copyright (C) 2020 Adam Reichold <adam.reichold@t-online.de> + * Copyright (C) 2024 Oliver Sander <oliver.sander@tu-dresden.de> + * + * 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-private.h" + +#include "GooString.h" +#include "Page.h" +#include "UTF.h" + +#include <ctime> +#include <iostream> +#include <sstream> + +using namespace poppler; + +static void stderr_debug_function(const std::string &msg, void * /*data*/) +{ + std::cerr << "poppler/" << msg << std::endl; +} + +debug_func detail::user_debug_function = stderr_debug_function; +void *detail::debug_closure = nullptr; + +void detail::error_function(ErrorCategory /*category*/, Goffset pos, const char *msg) +{ + std::ostringstream oss; + if (pos >= 0) { + oss << "error (" << pos << "): "; + } else { + oss << "error: "; + } + oss << msg; + detail::user_debug_function(oss.str(), detail::debug_closure); +} + +rectf detail::pdfrectangle_to_rectf(const PDFRectangle &pdfrect) +{ + return rectf(pdfrect.x1, pdfrect.y1, pdfrect.x2 - pdfrect.x1, pdfrect.y2 - pdfrect.y1); +} + +ustring detail::unicode_GooString_to_ustring(const GooString *str) +{ + const char *data = str->c_str(); + const int len = str->getLength(); + + const bool is_unicodeLE = hasUnicodeByteOrderMarkLE(str->toStr()); + const bool is_unicode = hasUnicodeByteOrderMark(str->toStr()) || is_unicodeLE; + int i = is_unicode ? 2 : 0; + ustring::size_type ret_len = len - i; + if (is_unicode) { + ret_len >>= 1; + } + ustring ret(ret_len, 0); + size_t ret_index = 0; + ustring::value_type u; + if (is_unicode) { + while (i < len) { + u = is_unicodeLE ? ((data[i + 1] & 0xff) << 8) | (data[i] & 0xff) : ((data[i] & 0xff) << 8) | (data[i + 1] & 0xff); + i += 2; + ret[ret_index++] = u; + } + } else { + while (i < len) { + u = data[i] & 0xff; + ++i; + ret[ret_index++] = u; + } + } + + return ret; +} + +ustring detail::unicode_to_ustring(const Unicode *u, int length) +{ + ustring str(length, 0); + ustring::iterator it = str.begin(); + const Unicode *uu = u; + for (int i = 0; i < length; ++i) { + *it++ = ustring::value_type(*uu++ & 0xffff); + } + return str; +} + +GooString *detail::ustring_to_unicode_GooString(const ustring &str) +{ + const size_t len = str.size() * 2 + 2; + const ustring::value_type *me = str.data(); + byte_array ba(len); + ba[0] = (char)0xfe; + ba[1] = (char)0xff; + for (size_t i = 0; i < str.size(); ++i, ++me) { + ba[i * 2 + 2] = ((*me >> 8) & 0xff); + ba[i * 2 + 3] = (*me & 0xff); + } + GooString *goo = new GooString(&ba[0], len); + return goo; +} diff --git a/poppler-24.05.0/cpp/poppler-private.h b/poppler-24.05.0/cpp/poppler-private.h new file mode 100644 index 0000000000000000000000000000000000000000..6875a2a9aa504166d06c3ff5d16bf96dd668b20c --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-private.h @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2009, Pino Toscano <pino@kde.org> + * Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com> + * Copyright (C) 2014, Hans-Peter Deifel <hpdeifel@gmx.de> + * Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com> + * Copyright (C) 2018, 2020, Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> + * Copyright (C) 2018, 2020 Adam Reichold <adam.reichold@t-online.de> + * Copyright (C) 2018, 2020 Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2018, Zsombor Hollay-Horvath <hollay.horvath@gmail.com> + * + * 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. + */ + +#ifndef POPPLER_PRIVATE_H +#define POPPLER_PRIVATE_H + +#include "poppler-global.h" +#include "poppler-rectangle.h" +#include "poppler-page.h" // to use text_box::writing_mode_enum + +#include "Error.h" +#include "CharTypes.h" + +#include <cstdarg> + +class GooString; +class PDFRectangle; + +#define PSTR(str) const_cast<char *>(str) + +namespace poppler { + +namespace detail { + +extern debug_func user_debug_function; +extern void *debug_closure; +void error_function(ErrorCategory category, Goffset pos, const char *msg); + +rectf pdfrectangle_to_rectf(const PDFRectangle &pdfrect); + +ustring unicode_GooString_to_ustring(const GooString *str); +ustring unicode_to_ustring(const Unicode *u, int length); +GooString *ustring_to_unicode_GooString(const ustring &str); + +} + +template<typename ConstIterator> +void delete_all(ConstIterator it, ConstIterator end) +{ + while (it != end) { + delete *it++; + } +} + +template<typename Collection> +void delete_all(const Collection &c) +{ + delete_all(c.begin(), c.end()); +} + +class font_info; +struct text_box_font_info_data +{ + ~text_box_font_info_data(); + + double font_size; + std::vector<text_box::writing_mode_enum> wmodes; + + /* + * a duplication of the font_info_cache created by the + * poppler::font_iterator and owned by the poppler::page + * object. Its lifetime might differ from that of text_box + * object (think about collecting all text_box objects + * from all pages), so we have to duplicate it into all + * text_box instances. + */ + std::vector<font_info> font_info_cache; + + /* + * a std::vector from the glyph index in the owner + * text_box to the font_info index in font_info_cache. + * The "-1" means no corresponding fonts found in the + * cache. + */ + std::vector<int> glyph_to_cache_index; +}; + +class font_info; +struct text_box_data +{ + ~text_box_data(); + + ustring text; + rectf bbox; + int rotation; + std::vector<rectf> char_bboxes; + bool has_space_after; + + std::unique_ptr<text_box_font_info_data> text_box_font; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-rectangle.cpp b/poppler-24.05.0/cpp/poppler-rectangle.cpp new file mode 100644 index 0000000000000000000000000000000000000000..d248a4fe6bdae1471e0ad1ffd14284cc4a91db1a --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-rectangle.cpp @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * + * 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. + */ + +/** + \file poppler-rectangle.h + */ +#include "poppler-rectangle.h" + +#include <iostream> + +using namespace poppler; + +/** + \class poppler::rectangle poppler-rectangle.h "poppler/cpp/poppler-rectangle.h" + + A rectangle. + */ + +/** + \typedef poppler::rect + + A rectangle with int dimensions and coordinates. + */ + +/** + \typedef poppler::rectf + + A rectangle with float (double) dimensions and coordinates. + */ + +std::ostream &poppler::operator<<(std::ostream &stream, const rect &r) +{ + stream << "[" << r.x() << "," << r.y() << " " << r.width() << "+" << r.height() << "]"; + return stream; +} + +std::ostream &poppler::operator<<(std::ostream &stream, const rectf &r) +{ + stream << "[" << r.x() << "," << r.y() << " " << r.width() << "+" << r.height() << "]"; + return stream; +} diff --git a/poppler-24.05.0/cpp/poppler-rectangle.h b/poppler-24.05.0/cpp/poppler-rectangle.h new file mode 100644 index 0000000000000000000000000000000000000000..5657ec9a341d531cde5713044b12881d17688aca --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-rectangle.h @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * + * 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. + */ + +#ifndef POPPLER_RECTANGLE_H +#define POPPLER_RECTANGLE_H + +#include "poppler-global.h" + +namespace poppler { + +template<typename T> +class rectangle +{ +public: + rectangle() : x1(), y1(), x2(), y2() { } + rectangle(T _x, T _y, T w, T h) : x1(_x), y1(_y), x2(x1 + w), y2(y1 + h) { } + ~rectangle() { } + + bool is_empty() const { return (x1 == x2) && (y1 == y2); } + + T x() const { return x1; } + + T y() const { return y1; } + + T width() const { return x2 - x1; } + + T height() const { return y2 - y1; } + + T left() const { return x1; } + T top() const { return y1; } + T right() const { return x2; } + T bottom() const { return y2; } + + void set_left(T value) { x1 = value; } + void set_top(T value) { y1 = value; } + void set_right(T value) { x2 = value; } + void set_bottom(T value) { y2 = value; } + +private: + T x1, y1, x2, y2; +}; + +typedef rectangle<int> rect; +typedef rectangle<double> rectf; + +POPPLER_CPP_EXPORT std::ostream &operator<<(std::ostream &stream, const rect &r); +POPPLER_CPP_EXPORT std::ostream &operator<<(std::ostream &stream, const rectf &r); + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-toc-private.h b/poppler-24.05.0/cpp/poppler-toc-private.h new file mode 100644 index 0000000000000000000000000000000000000000..dd27cdd77c872a4b9ef77f3971d45088f49f1493 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-toc-private.h @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2009, Pino Toscano <pino@kde.org> + * Copyright (C) 2018, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2019, Oliver Sander <oliver.sander@tu-dresden.de> + * + * 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. + */ + +#ifndef POPPLER_TOC_PRIVATE_H +#define POPPLER_TOC_PRIVATE_H + +#include "poppler-global.h" +#include "poppler-toc.h" + +#include <vector> + +class Outline; +class OutlineItem; + +namespace poppler { + +class toc_private +{ +public: + toc_private(); + ~toc_private(); + + static toc *load_from_outline(Outline *outline); + + toc_item root; +}; + +class toc_item_private +{ +public: + toc_item_private(); + ~toc_item_private(); + + toc_item_private(const toc_item_private &) = delete; + toc_item_private &operator=(const toc_item_private &) = delete; + + void load(const OutlineItem *item); + void load_children(const std::vector<OutlineItem *> *items); + + std::vector<toc_item *> children; + ustring title; + bool is_open; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-toc.cpp b/poppler-24.05.0/cpp/poppler-toc.cpp new file mode 100644 index 0000000000000000000000000000000000000000..4a52c499eb9558097b6a510159b9c1e0e419df59 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-toc.cpp @@ -0,0 +1,188 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2018, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2019, Oliver Sander <oliver.sander@tu-dresden.de> + * Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela <sune@vuorela.dk> + * + * 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. + */ + +/** + \file poppler-toc.h + */ +#include "poppler-toc.h" + +#include "poppler-toc-private.h" +#include "poppler-private.h" + +#include "Outline.h" + +using namespace poppler; + +toc_private::toc_private() { } + +toc_private::~toc_private() { } + +toc *toc_private::load_from_outline(Outline *outline) +{ + if (!outline) { + return nullptr; + } + + const std::vector<OutlineItem *> *items = outline->getItems(); + if (!items || items->size() < 1) { + return nullptr; + } + + toc *newtoc = new toc(); + newtoc->d->root.d->is_open = true; + newtoc->d->root.d->load_children(items); + + return newtoc; +} + +toc_item_private::toc_item_private() : is_open(false) { } + +toc_item_private::~toc_item_private() +{ + delete_all(children); +} + +void toc_item_private::load(const OutlineItem *item) +{ + const std::vector<Unicode> &title_unicode = item->getTitle(); + title = detail::unicode_to_ustring(title_unicode.data(), title_unicode.size()); + is_open = item->isOpen(); +} + +void toc_item_private::load_children(const std::vector<OutlineItem *> *items) +{ + const int num_items = items->size(); + children.resize(num_items); + for (int i = 0; i < num_items; ++i) { + OutlineItem *item = (*items)[i]; + + toc_item *new_item = new toc_item(); + new_item->d->load(item); + children[i] = new_item; + + item->open(); + const std::vector<OutlineItem *> *item_children = item->getKids(); + if (item_children) { + new_item->d->load_children(item_children); + } + } +} + +/** + \class poppler::toc poppler-toc.h "poppler/cpp/poppler-toc.h" + + Represents the TOC (Table of Contents) of a PDF %document. + + The TOC of a PDF %document is represented as a tree of items. + */ + +toc::toc() : d(new toc_private()) { } + +/** + Destroys the TOC. + */ +toc::~toc() +{ + delete d; +} + +/** + Returns the "invisible item" representing the root of the TOC. + + This item is special, it has no title nor actions, it is open and its children + are the effective root items of the TOC. This is provided as a convenience + when iterating through the TOC. + + \returns the root "item" + */ +toc_item *toc::root() const +{ + return &d->root; +} + +/** + \class poppler::toc_item poppler-toc.h "poppler/cpp/poppler-toc.h" + + Represents an item of the TOC (Table of Contents) of a PDF %document. + */ + +/** + \typedef std::vector<toc_item *>::const_iterator poppler::toc_item::iterator + + An iterator for the children of a TOC item. + */ + +toc_item::toc_item() : d(new toc_item_private()) { } + +/** + Destroys the TOC item. + */ +toc_item::~toc_item() +{ + delete d; +} + +/** + \returns the title of the TOC item + */ +ustring toc_item::title() const +{ + return d->title; +} + +/** + Returns whether the TOC item should be represented as open when showing the + TOC. + + This is not a functional behaviour, but a visualisation hint of the item. + Regardless of this state, the item can be expanded and collapsed freely when + represented in a TOC view of a PDF viewer. + + \returns whether the TOC item should be open + */ +bool toc_item::is_open() const +{ + return d->is_open; +} + +/** + \returns the children of the TOC item + */ +std::vector<toc_item *> toc_item::children() const +{ + return d->children; +} + +/** + \returns an iterator to the being of the list of children of the TOC item + */ +toc_item::iterator toc_item::children_begin() const +{ + return d->children.begin(); +} + +/** + \returns an iterator to the end of the list of children of the TOC item + */ +toc_item::iterator toc_item::children_end() const +{ + return d->children.end(); +} diff --git a/poppler-24.05.0/cpp/poppler-toc.h b/poppler-24.05.0/cpp/poppler-toc.h new file mode 100644 index 0000000000000000000000000000000000000000..1e528a6e70ed6701a182633e63fb637b26d48131 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-toc.h @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2009, Pino Toscano <pino@kde.org> + * + * 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. + */ + +#ifndef POPPLER_TOC_H +#define POPPLER_TOC_H + +#include "poppler-global.h" + +#include <vector> + +namespace poppler { + +class toc_private; +class toc_item; +class toc_item_private; + +class POPPLER_CPP_EXPORT toc : public poppler::noncopyable +{ +public: + ~toc(); + + toc_item *root() const; + +private: + toc(); + + toc_private *d; + + friend class toc_private; +}; + +class POPPLER_CPP_EXPORT toc_item : public poppler::noncopyable +{ +public: + typedef std::vector<toc_item *>::const_iterator iterator; + + ~toc_item(); + + ustring title() const; + bool is_open() const; + + std::vector<toc_item *> children() const; + iterator children_begin() const; + iterator children_end() const; + +private: + toc_item(); + + toc_item_private *d; + friend class toc; + friend class toc_private; + friend class toc_item_private; +}; + +} + +#endif diff --git a/poppler-24.05.0/cpp/poppler-version.cpp b/poppler-24.05.0/cpp/poppler-version.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f6e30a6f518c14270417cd3d078137c47d1bed91 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-version.cpp @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * + * 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. + */ + +/** + \file poppler-version.h.in + \brief poppler-version.h + \remark poppler-version.h.in is the file name in Poppler's source files. + The file name as an include file is poppler-version.h. + */ +#include "poppler-version.h" + +/** + \def POPPLER_VERSION + \brief The version string of the poppler-cpp header files. + e.g. in poppler version 0.1.2 this is "0.1.2". + */ +/** + \def POPPLER_VERSION_MAJOR + \brief The "major" version number of the poppler-cpp header files. + e.g. in poppler version 0.1.2 this is 0. + */ +/** + \def POPPLER_VERSION_MINOR + \brief The "minor" version number of the poppler-cpp header files. + e.g. in poppler version 0.1.2 this is 1. + */ +/** + \def POPPLER_VERSION_MICRO + \brief The "micro" version number of the poppler-cpp header files. + e.g. in poppler version 0.1.2 this is 2. + */ + +using namespace poppler; + +/** + \returns the version string of the current poppler-cpp library + */ +std::string poppler::version_string() +{ + return std::string(POPPLER_VERSION); +} + +/** + \returns the "major" number of the version of the current poppler-cpp library + */ +unsigned int poppler::version_major() +{ + return POPPLER_VERSION_MAJOR; +} + +/** + \returns the "minor" number of the version of the current poppler-cpp library + */ +unsigned int poppler::version_minor() +{ + return POPPLER_VERSION_MINOR; +} + +/** + \returns the "micro" number of the version of the current poppler-cpp library + */ +unsigned int poppler::version_micro() +{ + return POPPLER_VERSION_MICRO; +} diff --git a/poppler-24.05.0/cpp/poppler-version.h.in b/poppler-24.05.0/cpp/poppler-version.h.in new file mode 100644 index 0000000000000000000000000000000000000000..cf6bce67de38a3c4d8d5501546836b1db1f8bc95 --- /dev/null +++ b/poppler-24.05.0/cpp/poppler-version.h.in @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2009, Pino Toscano <pino@kde.org> + * + * 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. + */ + +#ifndef POPPLER_VERSION_H +#define POPPLER_VERSION_H + +#include "poppler-global.h" + +#define POPPLER_VERSION "@POPPLER_VERSION@" +#define POPPLER_VERSION_MAJOR @POPPLER_MAJOR_VERSION@ +#define POPPLER_VERSION_MINOR @POPPLER_MINOR_VERSION@ +#define POPPLER_VERSION_MICRO @POPPLER_MICRO_VERSION@ + +namespace poppler +{ + +POPPLER_CPP_EXPORT std::string version_string(); +POPPLER_CPP_EXPORT unsigned int version_major(); +POPPLER_CPP_EXPORT unsigned int version_minor(); +POPPLER_CPP_EXPORT unsigned int version_micro(); + +} + +#endif diff --git a/poppler-24.05.0/cpp/tests/CMakeLists.txt b/poppler-24.05.0/cpp/tests/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..143af8093535c7414868f7ed90e8f9f6f505474c --- /dev/null +++ b/poppler-24.05.0/cpp/tests/CMakeLists.txt @@ -0,0 +1,26 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_BINARY_DIR}/.. + ${CMAKE_SOURCE_DIR}/utils +) + +macro(CPP_ADD_SIMPLETEST exe) + string(REPLACE "-" "" test_name ${exe}) + set(${test_name}_SOURCES + ${ARGN} + ) + poppler_add_test(${exe} BUILD_CPP_TESTS ${${test_name}_SOURCES}) + target_link_libraries(${exe} poppler-cpp poppler) +endmacro(CPP_ADD_SIMPLETEST) + +cpp_add_simpletest(poppler-dump poppler-dump.cpp ${CMAKE_SOURCE_DIR}/utils/parseargs.cc) +cpp_add_simpletest(poppler-render poppler-render.cpp ${CMAKE_SOURCE_DIR}/utils/parseargs.cc) + +if(ENABLE_FUZZER) + cpp_add_simpletest(doc_fuzzer ./fuzzing/doc_fuzzer.cc) + cpp_add_simpletest(pdf_fuzzer ./fuzzing/pdf_fuzzer.cc) + cpp_add_simpletest(pdf_file_fuzzer ./fuzzing/pdf_file_fuzzer.cc) + cpp_add_simpletest(page_label_fuzzer ./fuzzing/page_label_fuzzer.cc) + cpp_add_simpletest(page_search_fuzzer ./fuzzing/page_search_fuzzer.cc) +endif() diff --git a/poppler-24.05.0/cpp/tests/fuzzing/FuzzedDataProvider.h b/poppler-24.05.0/cpp/tests/fuzzing/FuzzedDataProvider.h new file mode 100644 index 0000000000000000000000000000000000000000..1996bcad81b11532941d4cc2c0eb25b6c1634e4c --- /dev/null +++ b/poppler-24.05.0/cpp/tests/fuzzing/FuzzedDataProvider.h @@ -0,0 +1,409 @@ +//===- FuzzedDataProvider.h - Utility header for fuzz targets ---*- C++ -* ===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// A single header library providing an utility class to break up an array of +// bytes. Whenever run on the same input, provides the same output, as long as +// its methods are called in the same order, with the same arguments. +//===----------------------------------------------------------------------===// + +#ifndef LLVM_FUZZER_FUZZED_DATA_PROVIDER_H_ +#define LLVM_FUZZER_FUZZED_DATA_PROVIDER_H_ + +#include <algorithm> +#include <climits> +#include <cstddef> +#include <cstdint> +#include <cstring> +#include <initializer_list> +#include <string> +#include <type_traits> +#include <utility> +#include <vector> + +// In addition to the comments below, the API is also briefly documented at +// https://github.com/google/fuzzing/blob/master/docs/split-inputs.md#fuzzed-data-provider +class FuzzedDataProvider +{ +public: + // |data| is an array of length |size| that the FuzzedDataProvider wraps to + // provide more granular access. |data| must outlive the FuzzedDataProvider. + FuzzedDataProvider(const uint8_t *data, size_t size) : data_ptr_(data), remaining_bytes_(size) { } + ~FuzzedDataProvider() = default; + + // See the implementation below (after the class definition) for more verbose + // comments for each of the methods. + + // Methods returning std::vector of bytes. These are the most popular choice + // when splitting fuzzing input into pieces, as every piece is put into a + // separate buffer (i.e. ASan would catch any under-/overflow) and the memory + // will be released automatically. + template<typename T> + std::vector<T> ConsumeBytes(size_t num_bytes); + template<typename T> + std::vector<T> ConsumeBytesWithTerminator(size_t num_bytes, T terminator = 0); + template<typename T> + std::vector<T> ConsumeRemainingBytes(); + + // Methods returning strings. Use only when you need a std::string or a null + // terminated C-string. Otherwise, prefer the methods returning std::vector. + std::string ConsumeBytesAsString(size_t num_bytes); + std::string ConsumeRandomLengthString(size_t max_length); + std::string ConsumeRandomLengthString(); + std::string ConsumeRemainingBytesAsString(); + + // Methods returning integer values. + template<typename T> + T ConsumeIntegral(); + template<typename T> + T ConsumeIntegralInRange(T min, T max); + + // Methods returning floating point values. + template<typename T> + T ConsumeFloatingPoint(); + template<typename T> + T ConsumeFloatingPointInRange(T min, T max); + + // 0 <= return value <= 1. + template<typename T> + T ConsumeProbability(); + + bool ConsumeBool(); + + // Returns a value chosen from the given enum. + template<typename T> + T ConsumeEnum(); + + // Returns a value from the given array. + template<typename T, size_t size> + T PickValueInArray(const T (&array)[size]); + template<typename T> + T PickValueInArray(std::initializer_list<const T> list); + + // Writes data to the given destination and returns number of bytes written. + size_t ConsumeData(void *destination, size_t num_bytes); + + // Reports the remaining bytes available for fuzzed input. + size_t remaining_bytes() { return remaining_bytes_; } + +private: + FuzzedDataProvider(const FuzzedDataProvider &) = delete; + FuzzedDataProvider &operator=(const FuzzedDataProvider &) = delete; + + void CopyAndAdvance(void *destination, size_t num_bytes); + + void Advance(size_t num_bytes); + + template<typename T> + std::vector<T> ConsumeBytes(size_t size, size_t num_bytes); + + template<typename TS, typename TU> + TS ConvertUnsignedToSigned(TU value); + + const uint8_t *data_ptr_; + size_t remaining_bytes_; +}; + +// Returns a std::vector containing |num_bytes| of input data. If fewer than +// |num_bytes| of data remain, returns a shorter std::vector containing all +// of the data that's left. Can be used with any byte sized type, such as +// char, unsigned char, uint8_t, etc. +template<typename T> +std::vector<T> FuzzedDataProvider::ConsumeBytes(size_t num_bytes) +{ + num_bytes = std::min(num_bytes, remaining_bytes_); + return ConsumeBytes<T>(num_bytes, num_bytes); +} + +// Similar to |ConsumeBytes|, but also appends the terminator value at the end +// of the resulting vector. Useful, when a mutable null-terminated C-string is +// needed, for example. But that is a rare case. Better avoid it, if possible, +// and prefer using |ConsumeBytes| or |ConsumeBytesAsString| methods. +template<typename T> +std::vector<T> FuzzedDataProvider::ConsumeBytesWithTerminator(size_t num_bytes, T terminator) +{ + num_bytes = std::min(num_bytes, remaining_bytes_); + std::vector<T> result = ConsumeBytes<T>(num_bytes + 1, num_bytes); + result.back() = terminator; + return result; +} + +// Returns a std::vector containing all remaining bytes of the input data. +template<typename T> +std::vector<T> FuzzedDataProvider::ConsumeRemainingBytes() +{ + return ConsumeBytes<T>(remaining_bytes_); +} + +// Returns a std::string containing |num_bytes| of input data. Using this and +// |.c_str()| on the resulting string is the best way to get an immutable +// null-terminated C string. If fewer than |num_bytes| of data remain, returns +// a shorter std::string containing all of the data that's left. +inline std::string FuzzedDataProvider::ConsumeBytesAsString(size_t num_bytes) +{ + static_assert(sizeof(std::string::value_type) == sizeof(uint8_t), "ConsumeBytesAsString cannot convert the data to a string."); + + num_bytes = std::min(num_bytes, remaining_bytes_); + std::string result(reinterpret_cast<const std::string::value_type *>(data_ptr_), num_bytes); + Advance(num_bytes); + return result; +} + +// Returns a std::string of length from 0 to |max_length|. When it runs out of +// input data, returns what remains of the input. Designed to be more stable +// with respect to a fuzzer inserting characters than just picking a random +// length and then consuming that many bytes with |ConsumeBytes|. +inline std::string FuzzedDataProvider::ConsumeRandomLengthString(size_t max_length) +{ + // Reads bytes from the start of |data_ptr_|. Maps "\\" to "\", and maps "\" + // followed by anything else to the end of the string. As a result of this + // logic, a fuzzer can insert characters into the string, and the string + // will be lengthened to include those new characters, resulting in a more + // stable fuzzer than picking the length of a string independently from + // picking its contents. + std::string result; + + // Reserve the anticipated capaticity to prevent several reallocations. + result.reserve(std::min(max_length, remaining_bytes_)); + for (size_t i = 0; i < max_length && remaining_bytes_ != 0; ++i) { + char next = ConvertUnsignedToSigned<char>(data_ptr_[0]); + Advance(1); + if (next == '\\' && remaining_bytes_ != 0) { + next = ConvertUnsignedToSigned<char>(data_ptr_[0]); + Advance(1); + if (next != '\\') + break; + } + result += next; + } + + result.shrink_to_fit(); + return result; +} + +// Returns a std::string of length from 0 to |remaining_bytes_|. +inline std::string FuzzedDataProvider::ConsumeRandomLengthString() +{ + return ConsumeRandomLengthString(remaining_bytes_); +} + +// Returns a std::string containing all remaining bytes of the input data. +// Prefer using |ConsumeRemainingBytes| unless you actually need a std::string +// object. +inline std::string FuzzedDataProvider::ConsumeRemainingBytesAsString() +{ + return ConsumeBytesAsString(remaining_bytes_); +} + +// Returns a number in the range [Type's min, Type's max]. The value might +// not be uniformly distributed in the given range. If there's no input data +// left, always returns |min|. +template<typename T> +T FuzzedDataProvider::ConsumeIntegral() +{ + return ConsumeIntegralInRange(std::numeric_limits<T>::min(), std::numeric_limits<T>::max()); +} + +// Returns a number in the range [min, max] by consuming bytes from the +// input data. The value might not be uniformly distributed in the given +// range. If there's no input data left, always returns |min|. |min| must +// be less than or equal to |max|. +template<typename T> +T FuzzedDataProvider::ConsumeIntegralInRange(T min, T max) +{ + static_assert(std::is_integral<T>::value, "An integral type is required."); + static_assert(sizeof(T) <= sizeof(uint64_t), "Unsupported integral type."); + + if (min > max) + abort(); + + // Use the biggest type possible to hold the range and the result. + uint64_t range = static_cast<uint64_t>(max) - min; + uint64_t result = 0; + size_t offset = 0; + + while (offset < sizeof(T) * CHAR_BIT && (range >> offset) > 0 && remaining_bytes_ != 0) { + // Pull bytes off the end of the seed data. Experimentally, this seems to + // allow the fuzzer to more easily explore the input space. This makes + // sense, since it works by modifying inputs that caused new code to run, + // and this data is often used to encode length of data read by + // |ConsumeBytes|. Separating out read lengths makes it easier modify the + // contents of the data that is actually read. + --remaining_bytes_; + result = (result << CHAR_BIT) | data_ptr_[remaining_bytes_]; + offset += CHAR_BIT; + } + + // Avoid division by 0, in case |range + 1| results in overflow. + if (range != std::numeric_limits<decltype(range)>::max()) + result = result % (range + 1); + + return static_cast<T>(min + result); +} + +// Returns a floating point value in the range [Type's lowest, Type's max] by +// consuming bytes from the input data. If there's no input data left, always +// returns approximately 0. +template<typename T> +T FuzzedDataProvider::ConsumeFloatingPoint() +{ + return ConsumeFloatingPointInRange<T>(std::numeric_limits<T>::lowest(), std::numeric_limits<T>::max()); +} + +// Returns a floating point value in the given range by consuming bytes from +// the input data. If there's no input data left, returns |min|. Note that +// |min| must be less than or equal to |max|. +template<typename T> +T FuzzedDataProvider::ConsumeFloatingPointInRange(T min, T max) +{ + if (min > max) + abort(); + + T range = .0; + T result = min; + constexpr T zero(.0); + if (max > zero && min < zero && max > min + std::numeric_limits<T>::max()) { + // The diff |max - min| would overflow the given floating point type. Use + // the half of the diff as the range and consume a bool to decide whether + // the result is in the first of the second part of the diff. + range = (max / 2.0) - (min / 2.0); + if (ConsumeBool()) { + result += range; + } + } else { + range = max - min; + } + + return result + range * ConsumeProbability<T>(); +} + +// Returns a floating point number in the range [0.0, 1.0]. If there's no +// input data left, always returns 0. +template<typename T> +T FuzzedDataProvider::ConsumeProbability() +{ + static_assert(std::is_floating_point<T>::value, "A floating point type is required."); + + // Use different integral types for different floating point types in order + // to provide better density of the resulting values. + using IntegralType = typename std::conditional<(sizeof(T) <= sizeof(uint32_t)), uint32_t, uint64_t>::type; + + T result = static_cast<T>(ConsumeIntegral<IntegralType>()); + result /= static_cast<T>(std::numeric_limits<IntegralType>::max()); + return result; +} + +// Reads one byte and returns a bool, or false when no data remains. +inline bool FuzzedDataProvider::ConsumeBool() +{ + return 1 & ConsumeIntegral<uint8_t>(); +} + +// Returns an enum value. The enum must start at 0 and be contiguous. It must +// also contain |kMaxValue| aliased to its largest (inclusive) value. Such as: +// enum class Foo { SomeValue, OtherValue, kMaxValue = OtherValue }; +template<typename T> +T FuzzedDataProvider::ConsumeEnum() +{ + static_assert(std::is_enum<T>::value, "|T| must be an enum type."); + return static_cast<T>(ConsumeIntegralInRange<uint32_t>(0, static_cast<uint32_t>(T::kMaxValue))); +} + +// Returns a copy of the value selected from the given fixed-size |array|. +template<typename T, size_t size> +T FuzzedDataProvider::PickValueInArray(const T (&array)[size]) +{ + static_assert(size > 0, "The array must be non empty."); + return array[ConsumeIntegralInRange<size_t>(0, size - 1)]; +} + +template<typename T> +T FuzzedDataProvider::PickValueInArray(std::initializer_list<const T> list) +{ + // TODO(Dor1s): switch to static_assert once C++14 is allowed. + if (!list.size()) + abort(); + + return *(list.begin() + ConsumeIntegralInRange<size_t>(0, list.size() - 1)); +} + +// Writes |num_bytes| of input data to the given destination pointer. If there +// is not enough data left, writes all remaining bytes. Return value is the +// number of bytes written. +// In general, it's better to avoid using this function, but it may be useful +// in cases when it's necessary to fill a certain buffer or object with +// fuzzing data. +inline size_t FuzzedDataProvider::ConsumeData(void *destination, size_t num_bytes) +{ + num_bytes = std::min(num_bytes, remaining_bytes_); + CopyAndAdvance(destination, num_bytes); + return num_bytes; +} + +// Private methods. +inline void FuzzedDataProvider::CopyAndAdvance(void *destination, size_t num_bytes) +{ + std::memcpy(destination, data_ptr_, num_bytes); + Advance(num_bytes); +} + +inline void FuzzedDataProvider::Advance(size_t num_bytes) +{ + if (num_bytes > remaining_bytes_) + abort(); + + data_ptr_ += num_bytes; + remaining_bytes_ -= num_bytes; +} + +template<typename T> +std::vector<T> FuzzedDataProvider::ConsumeBytes(size_t size, size_t num_bytes) +{ + static_assert(sizeof(T) == sizeof(uint8_t), "Incompatible data type."); + + // The point of using the size-based constructor below is to increase the + // odds of having a vector object with capacity being equal to the length. + // That part is always implementation specific, but at least both libc++ and + // libstdc++ allocate the requested number of bytes in that constructor, + // which seems to be a natural choice for other implementations as well. + // To increase the odds even more, we also call |shrink_to_fit| below. + std::vector<T> result(size); + if (size == 0) { + if (num_bytes != 0) + abort(); + return result; + } + + CopyAndAdvance(result.data(), num_bytes); + + // Even though |shrink_to_fit| is also implementation specific, we expect it + // to provide an additional assurance in case vector's constructor allocated + // a buffer which is larger than the actual amount of data we put inside it. + result.shrink_to_fit(); + return result; +} + +template<typename TS, typename TU> +TS FuzzedDataProvider::ConvertUnsignedToSigned(TU value) +{ + static_assert(sizeof(TS) == sizeof(TU), "Incompatible data types."); + static_assert(!std::numeric_limits<TU>::is_signed, "Source type must be unsigned."); + + // TODO(Dor1s): change to `if constexpr` once C++17 becomes mainstream. + if (std::numeric_limits<TS>::is_modulo) + return static_cast<TS>(value); + + // Avoid using implementation-defined unsigned to signed conversions. + // To learn more, see https://stackoverflow.com/questions/13150449. + if (value <= std::numeric_limits<TS>::max()) { + return static_cast<TS>(value); + } else { + constexpr auto TS_min = std::numeric_limits<TS>::min(); + return TS_min + static_cast<char>(value - TS_min); + } +} + +#endif // LLVM_FUZZER_FUZZED_DATA_PROVIDER_H_ diff --git a/poppler-24.05.0/cpp/tests/fuzzing/doc_fuzzer.cc b/poppler-24.05.0/cpp/tests/fuzzing/doc_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..1769ce40a9cc1d693970889d49c763c22d5b67a7 --- /dev/null +++ b/poppler-24.05.0/cpp/tests/fuzzing/doc_fuzzer.cc @@ -0,0 +1,49 @@ +#include <cstdint> +#include <poppler-document.h> +#include <poppler-global.h> + +#include "FuzzedDataProvider.h" + +const size_t input_size = 32; +const size_t count = 6; + +static void dummy_error_function(const std::string &, void *) { } + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + if (size < input_size * count) { + return 0; + } + poppler::set_debug_error_function(dummy_error_function, nullptr); + poppler::document *doc = poppler::document::load_from_raw_data((const char *)data, size); + if (!doc || doc->is_locked()) { + delete doc; + return 0; + } + + FuzzedDataProvider data_provider(data, size); + std::string in_auth = data_provider.ConsumeBytesAsString(input_size); + std::string in_creat = data_provider.ConsumeBytesAsString(input_size); + std::string in_key = data_provider.ConsumeBytesAsString(input_size); + std::string in_prod = data_provider.ConsumeBytesAsString(input_size); + std::string in_sub = data_provider.ConsumeBytesAsString(input_size); + std::string in_title = data_provider.ConsumeBytesAsString(input_size); + + // Testing both methods for conversion to ustring + doc->set_author(poppler::ustring::from_latin1(in_auth)); + doc->set_creator(poppler::ustring::from_latin1(in_creat)); + doc->set_keywords(poppler::ustring::from_latin1(in_key)); + doc->set_producer(poppler::ustring::from_latin1(in_prod)); + doc->set_subject(poppler::ustring::from_latin1(in_sub)); + doc->set_title(poppler::ustring::from_latin1(in_title)); + + doc->set_author(poppler::ustring::from_utf8(in_auth.c_str(), -1)); + doc->set_creator(poppler::ustring::from_utf8(in_creat.c_str(), -1)); + doc->set_keywords(poppler::ustring::from_utf8(in_key.c_str(), -1)); + doc->set_producer(poppler::ustring::from_utf8(in_prod.c_str(), -1)); + doc->set_subject(poppler::ustring::from_utf8(in_sub.c_str(), -1)); + doc->set_title(poppler::ustring::from_utf8(in_title.c_str(), -1)); + + delete doc; + return 0; +} diff --git a/poppler-24.05.0/cpp/tests/fuzzing/fuzzer_temp_file.h b/poppler-24.05.0/cpp/tests/fuzzing/fuzzer_temp_file.h new file mode 100644 index 0000000000000000000000000000000000000000..d0568ac55605cd0323a39863f03f202fbd0a3374 --- /dev/null +++ b/poppler-24.05.0/cpp/tests/fuzzing/fuzzer_temp_file.h @@ -0,0 +1,82 @@ +// Copyright 2018 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Adapter utility from fuzzer input to a temporary file, for fuzzing APIs that +// require a file instead of an input buffer. + +#ifndef FUZZER_TEMP_FILE_H_ +#define FUZZER_TEMP_FILE_H_ + +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +// Pure-C interface for creating and cleaning up temporary files. + +static char *fuzzer_get_tmpfile(const uint8_t *data, size_t size) +{ + char *filename_buffer = strdup("/tmp/generate_temporary_file.XXXXXX"); + if (!filename_buffer) { + perror("Failed to allocate file name buffer."); + abort(); + } + const int file_descriptor = mkstemp(filename_buffer); + if (file_descriptor < 0) { + perror("Failed to make temporary file."); + abort(); + } + FILE *file = fdopen(file_descriptor, "wb"); + if (!file) { + perror("Failed to open file descriptor."); + close(file_descriptor); + abort(); + } + const size_t bytes_written = fwrite(data, sizeof(uint8_t), size, file); + if (bytes_written < size) { + close(file_descriptor); + fprintf(stderr, "Failed to write all bytes to file (%zu out of %zu)", bytes_written, size); + abort(); + } + fclose(file); + return filename_buffer; +} + +static void fuzzer_release_tmpfile(char *filename) +{ + if (unlink(filename) != 0) { + perror("WARNING: Failed to delete temporary file."); + } + free(filename); +} + +// C++ RAII object for creating temporary files. + +#ifdef __cplusplus +class FuzzerTemporaryFile +{ +public: + FuzzerTemporaryFile(const uint8_t *data, size_t size) : filename_(fuzzer_get_tmpfile(data, size)) { } + + ~FuzzerTemporaryFile() { fuzzer_release_tmpfile(filename_); } + + const char *filename() const { return filename_; } + +private: + char *filename_; +}; +#endif + +#endif // FUZZER_TEMP_FILE_H_ diff --git a/poppler-24.05.0/cpp/tests/fuzzing/page_label_fuzzer.cc b/poppler-24.05.0/cpp/tests/fuzzing/page_label_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..467be74ab7c07328ddb98295d827ca9f3ff51dd7 --- /dev/null +++ b/poppler-24.05.0/cpp/tests/fuzzing/page_label_fuzzer.cc @@ -0,0 +1,41 @@ +#include <cstdint> +#include <poppler-document.h> +#include <poppler-global.h> +#include <poppler-page.h> +#include <poppler-page-renderer.h> + +#include "FuzzedDataProvider.h" + +const size_t input_size = 32; + +static void dummy_error_function(const std::string &, void *) { } + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + if (size < input_size) { + return 0; + } + poppler::set_debug_error_function(dummy_error_function, nullptr); + + poppler::document *doc = poppler::document::load_from_raw_data((const char *)data, size); + if (!doc || doc->is_locked()) { + delete doc; + return 0; + } + + poppler::page_renderer r; + FuzzedDataProvider data_provider(data, size); + std::string in_label = data_provider.ConsumeBytesAsString(input_size); + for (int i = 0; i < doc->pages(); i++) { + poppler::page *p = doc->create_page(poppler::ustring::from_utf8(in_label.c_str(), -1)); + if (!p) { + continue; + } + r.render_page(p); + p->label(); + delete p; + } + + delete doc; + return 0; +} diff --git a/poppler-24.05.0/cpp/tests/fuzzing/page_search_fuzzer.cc b/poppler-24.05.0/cpp/tests/fuzzing/page_search_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..1c6977f21109c953668f8a5794d1eebb8bb3134e --- /dev/null +++ b/poppler-24.05.0/cpp/tests/fuzzing/page_search_fuzzer.cc @@ -0,0 +1,43 @@ +#include <cstdint> +#include <poppler-document.h> +#include <poppler-global.h> +#include <poppler-page.h> +#include <poppler-page-renderer.h> + +#include "FuzzedDataProvider.h" + +const size_t input_size = 32; + +static void dummy_error_function(const std::string &, void *) { } + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + if (size < input_size) { + return 0; + } + poppler::set_debug_error_function(dummy_error_function, nullptr); + + poppler::document *doc = poppler::document::load_from_raw_data((const char *)data, size); + if (!doc || doc->is_locked()) { + delete doc; + return 0; + } + + poppler::page_renderer r; + FuzzedDataProvider data_provider(data, size); + std::string in_text = data_provider.ConsumeBytesAsString(input_size); + for (int i = 0; i < doc->pages(); i++) { + poppler::page *p = doc->create_page(i); + if (!p) { + continue; + } + poppler::rectf rect = p->page_rect(); + poppler::ustring text = poppler::ustring::from_utf8(in_text.c_str(), -1); + p->search(text, rect, poppler::page::search_from_top, poppler::case_insensitive, poppler::rotate_0); + r.render_page(p); + delete p; + } + + delete doc; + return 0; +} diff --git a/poppler-24.05.0/cpp/tests/fuzzing/pdf_file_fuzzer.cc b/poppler-24.05.0/cpp/tests/fuzzing/pdf_file_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..10374e8b7719504b0c090ec6d16328efc7dc66cd --- /dev/null +++ b/poppler-24.05.0/cpp/tests/fuzzing/pdf_file_fuzzer.cc @@ -0,0 +1,37 @@ +#include <cstdint> +#include <poppler-document.h> +#include <poppler-global.h> +#include <poppler-page.h> +#include <poppler-page-renderer.h> + +#include "fuzzer_temp_file.h" + +static void dummy_error_function(const std::string &, void *) { } + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + poppler::set_debug_error_function(dummy_error_function, nullptr); + + char *tmpfile = fuzzer_get_tmpfile(data, size); + std::string fname(tmpfile); + poppler::document *doc = poppler::document::load_from_file(fname); + if (!doc || doc->is_locked()) { + delete doc; + fuzzer_release_tmpfile(tmpfile); + return 0; + } + + poppler::page_renderer r; + for (int i = 0; i < doc->pages(); i++) { + poppler::page *p = doc->create_page(i); + if (!p) { + continue; + } + r.render_page(p); + delete p; + } + + delete doc; + fuzzer_release_tmpfile(tmpfile); + return 0; +} diff --git a/poppler-24.05.0/cpp/tests/fuzzing/pdf_fuzzer.cc b/poppler-24.05.0/cpp/tests/fuzzing/pdf_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..90cad426e4f4d10cdbf75d8fc29916b743a1e127 --- /dev/null +++ b/poppler-24.05.0/cpp/tests/fuzzing/pdf_fuzzer.cc @@ -0,0 +1,37 @@ +#include <cstdint> +#include <poppler-destination.h> +#include <poppler-document.h> +#include <poppler-global.h> +#include <poppler-page.h> +#include <poppler-page-renderer.h> + +static void dummy_error_function(const std::string &, void *) { } + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + poppler::set_debug_error_function(dummy_error_function, nullptr); + + poppler::document *doc = poppler::document::load_from_raw_data((const char *)data, size); + if (!doc || doc->is_locked()) { + delete doc; + return 0; + } + doc->metadata(); + doc->create_destination_map(); + doc->embedded_files(); + doc->fonts(); + + poppler::page_renderer r; + for (int i = 0; i < doc->pages(); i++) { + poppler::page *p = doc->create_page(i); + if (!p) { + continue; + } + r.render_page(p); + p->text_list(poppler::page::text_list_include_font); + delete p; + } + + delete doc; + return 0; +} diff --git a/poppler-24.05.0/cpp/tests/poppler-dump.cpp b/poppler-24.05.0/cpp/tests/poppler-dump.cpp new file mode 100644 index 0000000000000000000000000000000000000000..c10b8f41c91f2da4d2ae8494f8e5691173f6b1f9 --- /dev/null +++ b/poppler-24.05.0/cpp/tests/poppler-dump.cpp @@ -0,0 +1,542 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2017-2019, 2022, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2017, Jason Alan Palmer <jalanpalmer@gmail.com> + * Copyright (C) 2018, 2020, Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> + * Copyright (C) 2019, Masamichi Hosoda <trueroad@trueroad.jp> + * Copyright (C) 2020, Jiri Jakes <freedesktop@jirijakes.eu> + * + * 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 <goo/glibc.h> +#include <poppler-destination.h> +#include <poppler-document.h> +#include <poppler-embedded-file.h> +#include <poppler-font.h> +#include <poppler-page.h> +#include <poppler-toc.h> +#include <poppler-version.h> + +#include <cstdlib> +#include <cstring> +#include <ctime> +#include <algorithm> +#include <iomanip> +#include <ios> +#include <iostream> +#include <map> +#include <memory> +#include <sstream> + +#include "parseargs.h" + +#include "config.h" + +static const int out_width = 30; + +bool show_all = false; +bool show_info = false; +bool show_perm = false; +bool show_metadata = false; +bool show_toc = false; +bool show_fonts = false; +bool show_embedded_files = false; +bool show_pages = false; +bool show_destinations = false; +bool show_help = false; +bool show_version = false; +char show_text[32]; +bool show_text_list = false; +bool show_text_list_with_font = false; +poppler::page::text_layout_enum show_text_layout = poppler::page::physical_layout; + +static const ArgDesc the_args[] = { { "--show-all", argFlag, &show_all, 0, "show all the available information" }, + { "--show-info", argFlag, &show_info, 0, "show general document information" }, + { "--show-perm", argFlag, &show_perm, 0, "show document permissions" }, + { "--show-metadata", argFlag, &show_metadata, 0, "show document metadata" }, + { "--show-toc", argFlag, &show_toc, 0, "show the TOC" }, + { "--show-fonts", argFlag, &show_fonts, 0, "show the document fonts" }, + { "--show-embedded-files", argFlag, &show_embedded_files, 0, "show the document-level embedded files" }, + { "--show-pages", argFlag, &show_pages, 0, "show pages information" }, + { "--show-destinations", argFlag, &show_destinations, 0, "show named destinations" }, + { "--show-text", argString, &show_text, sizeof(show_text), "show text (physical|raw|none) extracted from all pages" }, + { "--show-text-list", argFlag, &show_text_list, 0, "show text list (experimental)" }, + { "--show-text-list-with-font", argFlag, &show_text_list_with_font, 0, "show text list with font info (experimental)" }, + { "-h", argFlag, &show_help, 0, "print usage information" }, + { "--help", argFlag, &show_help, 0, "print usage information" }, + { "--version", argFlag, &show_version, 0, "print poppler version" }, + { nullptr, argFlag, nullptr, 0, nullptr } }; + +static void error(const std::string &msg) +{ + std::cerr << "Error: " << msg << std::endl; + std::cerr << "Exiting..." << std::endl; + exit(1); +} + +static std::ostream &operator<<(std::ostream &stream, const poppler::ustring &str) +{ + const poppler::byte_array ba = str.to_utf8(); + for (const char c : ba) { + stream << c; + } + return stream; +} + +static std::string out_date(std::time_t date) +{ + if (date != std::time_t(-1)) { + struct tm time; + gmtime_r(&date, &time); + struct tm *t = &time; + char buf[32]; + strftime(buf, sizeof(buf) - 1, "%d/%m/%Y %H:%M:%S", t); + return std::string(buf); + } + return std::string("n/a"); +} + +static std::string out_size(int size) +{ + if (size >= 0) { + std::ostringstream ss; + ss << size; + return ss.str(); + } + return std::string("n/a"); +} + +static char charToHex(int x) +{ + return x < 10 ? x + '0' : x - 10 + 'a'; +} + +static std::string out_hex_string(const poppler::byte_array &str) +{ + std::string ret(str.size() * 2, '\0'); + const char *str_p = &str[0]; + for (unsigned int i = 0; i < str.size(); ++i, ++str_p) { + ret[i * 2] = charToHex((*str_p & 0xf0) >> 4); + ret[i * 2 + 1] = charToHex(*str_p & 0xf); + } + return ret; +} + +static std::string out_page_orientation(poppler::page::orientation_enum o) +{ + switch (o) { + case poppler::page::landscape: + return "landscape (90)"; + case poppler::page::portrait: + return "portrait (0)"; + case poppler::page::seascape: + return "seascape (270)"; + case poppler::page::upside_down: + return "upside_downs (180)"; + }; + return "<unknown orientation>"; +} + +static std::string out_font_info_type(poppler::font_info::type_enum t) +{ +#define OUT_FONT_TYPE(thetype) \ + case poppler::font_info::thetype: \ + return #thetype + switch (t) { + OUT_FONT_TYPE(unknown); + OUT_FONT_TYPE(type1); + OUT_FONT_TYPE(type1c); + OUT_FONT_TYPE(type1c_ot); + OUT_FONT_TYPE(type3); + OUT_FONT_TYPE(truetype); + OUT_FONT_TYPE(truetype_ot); + OUT_FONT_TYPE(cid_type0); + OUT_FONT_TYPE(cid_type0c); + OUT_FONT_TYPE(cid_type0c_ot); + OUT_FONT_TYPE(cid_truetype); + OUT_FONT_TYPE(cid_truetype_ot); + } + return "<unknown font type>"; +#undef OUT_FONT_TYPE +} + +static void print_info(poppler::document *doc) +{ + std::cout << "Document information:" << std::endl; + int major = 0, minor = 0; + doc->get_pdf_version(&major, &minor); + std::cout << std::setw(out_width) << "PDF version" + << ": " << major << "." << minor << std::endl; + std::string permanent_id, update_id; + if (doc->get_pdf_id(&permanent_id, &update_id)) { + std::cout << std::setw(out_width) << "PDF IDs" + << ": P: " << permanent_id << " - U: " << update_id << std::endl; + } else { + std::cout << std::setw(out_width) << "PDF IDs" + << ": <none>" << std::endl; + } + const std::vector<std::string> keys = doc->info_keys(); + std::vector<std::string>::const_iterator key_it = keys.begin(), key_end = keys.end(); + for (; key_it != key_end; ++key_it) { + std::cout << std::setw(out_width) << *key_it << ": " << doc->info_key(*key_it) << std::endl; + } + std::cout << std::setw(out_width) << "Date (creation)" + << ": " << out_date(doc->info_date_t("CreationDate")) << std::endl; + std::cout << std::setw(out_width) << "Date (modification)" + << ": " << out_date(doc->info_date_t("ModDate")) << std::endl; + std::cout << std::setw(out_width) << "Number of pages" + << ": " << doc->pages() << std::endl; + std::cout << std::setw(out_width) << "Linearized" + << ": " << doc->is_linearized() << std::endl; + std::cout << std::setw(out_width) << "Encrypted" + << ": " << doc->is_encrypted() << std::endl; + std::cout << std::endl; +} + +static void print_perm(poppler::document *doc) +{ + std::cout << "Document permissions:" << std::endl; +#define OUT_PERM(theperm) std::cout << std::setw(out_width) << #theperm << ": " << doc->has_permission(poppler::perm_##theperm) << std::endl + OUT_PERM(print); + OUT_PERM(change); + OUT_PERM(copy); + OUT_PERM(add_notes); + OUT_PERM(fill_forms); + OUT_PERM(accessibility); + OUT_PERM(assemble); + OUT_PERM(print_high_resolution); + std::cout << std::endl; +#undef OUT_PERM +} + +static void print_metadata(poppler::document *doc) +{ + std::cout << std::setw(out_width) << "Metadata" + << ":" << std::endl + << doc->metadata() << std::endl; + std::cout << std::endl; +} + +static void print_toc_item(poppler::toc_item *item, int indent) +{ + std::cout << std::setw(indent * 2) << " " + << "+ " << item->title() << " (" << item->is_open() << ")" << std::endl; + poppler::toc_item::iterator it = item->children_begin(), it_end = item->children_end(); + for (; it != it_end; ++it) { + print_toc_item(*it, indent + 1); + } +} + +static void print_toc(poppler::toc *doctoc) +{ + std::cout << "Document TOC:" << std::endl; + if (doctoc) { + print_toc_item(doctoc->root(), 0); + } else { + std::cout << "<no TOC>" << std::endl; + } + std::cout << std::endl; +} + +static void print_fonts(poppler::document *doc) +{ + std::cout << "Document fonts:" << std::endl; + std::vector<poppler::font_info> fl = doc->fonts(); + if (!fl.empty()) { + std::vector<poppler::font_info>::const_iterator it = fl.begin(), it_end = fl.end(); + const std::ios_base::fmtflags f = std::cout.flags(); + std::left(std::cout); + for (; it != it_end; ++it) { + std::cout << " " << std::setw(out_width + 10) << it->name() << " " << std::setw(15) << out_font_info_type(it->type()) << " " << std::setw(5) << it->is_embedded() << " " << std::setw(5) << it->is_subset() << " " << it->file() + << std::endl; + } + std::cout.flags(f); + } else { + std::cout << "<no fonts>" << std::endl; + } + std::cout << std::endl; +} + +static void print_embedded_files(poppler::document *doc) +{ + std::cout << "Document embedded files:" << std::endl; + std::vector<poppler::embedded_file *> ef = doc->embedded_files(); + if (!ef.empty()) { + std::vector<poppler::embedded_file *>::const_iterator it = ef.begin(), it_end = ef.end(); + const std::ios_base::fmtflags flags = std::cout.flags(); + std::left(std::cout); + for (; it != it_end; ++it) { + poppler::embedded_file *f = *it; + std::cout << " " << std::setw(out_width + 10) << f->name() << " " << std::setw(10) << out_size(f->size()) << " " << std::setw(20) << out_date(f->creation_date_t()) << " " << std::setw(20) << out_date(f->modification_date_t()) + << std::endl + << " "; + if (f->description().empty()) { + std::cout << "<no description>"; + } else { + std::cout << f->description(); + } + std::cout << std::endl + << " " << std::setw(35) << (f->checksum().empty() ? std::string("<no checksum>") : out_hex_string(f->checksum())) << " " << (f->mime_type().empty() ? std::string("<no mime type>") : f->mime_type()) << std::endl; + } + std::cout.flags(flags); + } else { + std::cout << "<no embedded files>" << std::endl; + } + std::cout << std::endl; +} + +static void print_page(poppler::page *p) +{ + if (p) { + std::cout << std::setw(out_width) << "Rect" + << ": " << p->page_rect() << std::endl; + std::cout << std::setw(out_width) << "Label" + << ": " << p->label() << std::endl; + std::cout << std::setw(out_width) << "Duration" + << ": " << p->duration() << std::endl; + std::cout << std::setw(out_width) << "Orientation" + << ": " << out_page_orientation(p->orientation()) << std::endl; + } else { + std::cout << std::setw(out_width) << "Broken Page. Could not be parsed" << std::endl; + } + std::cout << std::endl; +} + +static void print_destination(const poppler::destination *d) +{ + if (d) { + std::cout << std::setw(out_width) << "Type" + << ": "; + switch (d->type()) { + case poppler::destination::unknown: + std::cout << "unknown" << std::endl; + break; + case poppler::destination::xyz: + std::cout << "xyz" << std::endl + << std::setw(out_width) << "Page" + << ": " << d->page_number() << std::endl + << std::setw(out_width) << "Left" + << ": " << d->left() << std::endl + << std::setw(out_width) << "Top" + << ": " << d->top() << std::endl + << std::setw(out_width) << "Zoom" + << ": " << d->zoom() << std::endl; + break; + case poppler::destination::fit: + std::cout << "fit" << std::endl + << std::setw(out_width) << "Page" + << ": " << d->page_number() << std::endl; + break; + case poppler::destination::fit_h: + std::cout << "fit_h" << std::endl + << std::setw(out_width) << "Page" + << ": " << d->page_number() << std::endl + << std::setw(out_width) << "Top" + << ": " << d->top() << std::endl; + break; + case poppler::destination::fit_v: + std::cout << "fit_v" << std::endl + << std::setw(out_width) << "Page" + << ": " << d->page_number() << std::endl + << std::setw(out_width) << "Left" + << ": " << d->left() << std::endl; + break; + case poppler::destination::fit_r: + std::cout << "fit_r" << std::endl + << std::setw(out_width) << "Page" + << ": " << d->page_number() << std::endl + << std::setw(out_width) << "Left" + << ": " << d->left() << std::endl + << std::setw(out_width) << "Bottom" + << ": " << d->bottom() << std::endl + << std::setw(out_width) << "Right" + << ": " << d->right() << std::endl + << std::setw(out_width) << "Top" + << ": " << d->top() << std::endl; + break; + case poppler::destination::fit_b: + std::cout << "fit_b" << std::endl + << std::setw(out_width) << "Page" + << ": " << d->page_number() << std::endl; + break; + case poppler::destination::fit_b_h: + std::cout << "fit_b_h" << std::endl + << std::setw(out_width) << "Page" + << ": " << d->page_number() << std::endl + << std::setw(out_width) << "Top" + << ": " << d->top() << std::endl; + break; + case poppler::destination::fit_b_v: + std::cout << "fit_b_v" << std::endl + << std::setw(out_width) << "Page" + << ": " << d->page_number() << std::endl + << std::setw(out_width) << "Left" + << ": " << d->left() << std::endl; + break; + default: + std::cout << "error" << std::endl; + break; + } + } + std::cout << std::endl; +} + +static void print_page_text(poppler::page *p) +{ + if (p) { + std::cout << p->text(poppler::rectf(), show_text_layout) << std::endl; + } else { + std::cout << std::setw(out_width) << "Broken Page. Could not be parsed" << std::endl; + } + std::cout << std::endl; +} + +static void print_page_text_list(poppler::page *p, int opt_flag = 0) +{ + if (!p) { + std::cout << std::setw(out_width) << "Broken Page. Could not be parsed" << std::endl; + std::cout << std::endl; + return; + } + auto text_list = p->text_list(opt_flag); + + std::cout << "---" << std::endl; + for (const poppler::text_box &text : text_list) { + poppler::rectf bbox = text.bbox(); + poppler::ustring ustr = text.text(); + int wmode = text.get_wmode(); + double font_size = text.get_font_size(); + std::string font_name = text.get_font_name(); + std::cout << "[" << ustr << "] @ "; + std::cout << "( x=" << bbox.x() << " y=" << bbox.y() << " w=" << bbox.width() << " h=" << bbox.height() << " )"; + if (text.has_font_info()) { + std::cout << "( fontname=" << font_name << " fontsize=" << font_size << " wmode=" << wmode << " )"; + } + std::cout << std::endl; + } + std::cout << "---" << std::endl; +} + +int main(int argc, char *argv[]) +{ + if (!parseArgs(the_args, &argc, argv) || argc < 2 || show_help) { + printUsage(argv[0], "DOCUMENT", the_args); + exit(1); + } + + if (show_text[0]) { + if (!memcmp(show_text, "physical", 9)) { + show_text_layout = poppler::page::physical_layout; + } else if (!memcmp(show_text, "raw", 4)) { + show_text_layout = poppler::page::raw_order_layout; + } else if (!memcmp(show_text, "none", 5)) { + show_text_layout = poppler::page::non_raw_non_physical_layout; + } else { + error(std::string("unrecognized text mode: '") + show_text + "'"); + } + } + + std::string file_name(argv[1]); + + std::unique_ptr<poppler::document> doc(poppler::document::load_from_file(file_name)); + if (!doc.get()) { + error("loading error"); + } + if (doc->is_locked()) { + error("encrypted document"); + } + + std::cout.setf(std::ios_base::boolalpha); + + if (show_all) { + show_info = true; + show_perm = true; + show_metadata = true; + show_toc = true; + show_fonts = true; + show_embedded_files = true; + show_pages = true; + } + + if (show_version) { + std::cout << std::setw(out_width) << "Compiled" + << ": poppler-cpp " << POPPLER_VERSION << std::endl + << std::setw(out_width) << "Running" + << ": poppler-cpp " << poppler::version_string() << std::endl; + } + if (show_info) { + print_info(doc.get()); + } + if (show_perm) { + print_perm(doc.get()); + } + if (show_metadata) { + print_metadata(doc.get()); + } + if (show_toc) { + std::unique_ptr<poppler::toc> doctoc(doc->create_toc()); + print_toc(doctoc.get()); + } + if (show_fonts) { + print_fonts(doc.get()); + } + if (show_embedded_files) { + print_embedded_files(doc.get()); + } + if (show_pages) { + const int pages = doc->pages(); + for (int i = 0; i < pages; ++i) { + std::cout << "Page " << (i + 1) << "/" << pages << ":" << std::endl; + std::unique_ptr<poppler::page> p(doc->create_page(i)); + print_page(p.get()); + } + } + if (show_destinations) { + auto map = doc->create_destination_map(); + for (const auto &pair : map) { + std::string s = pair.first; + for (auto &c : s) { + if (c < 0x20 || c > 0x7e) { + c = '.'; + } + } + std::cout << "Named destination \"" << s << "\":" << std::endl; + print_destination(&pair.second); + } + } + if (show_text[0]) { + const int pages = doc->pages(); + for (int i = 0; i < pages; ++i) { + std::cout << "Page " << (i + 1) << "/" << pages << ":" << std::endl; + std::unique_ptr<poppler::page> p(doc->create_page(i)); + print_page_text(p.get()); + } + } + if (show_text_list || show_text_list_with_font) { + const int pages = doc->pages(); + for (int i = 0; i < pages; ++i) { + std::cout << "Page " << (i + 1) << "/" << pages << ":" << std::endl; + std::unique_ptr<poppler::page> p(doc->create_page(i)); + if (show_text_list_with_font) { + print_page_text_list(p.get(), poppler::page::text_list_include_font); + } else { + print_page_text_list(p.get(), 0); + } + } + } + + return 0; +} diff --git a/poppler-24.05.0/cpp/tests/poppler-render.cpp b/poppler-24.05.0/cpp/tests/poppler-render.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f03cad71dcf7a55bd37f4a3f1145d364d50622ce --- /dev/null +++ b/poppler-24.05.0/cpp/tests/poppler-render.cpp @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2010, Pino Toscano <pino@kde.org> + * Copyright (C) 2017, 2019, Albert Astals Cid <aacid@kde.org> + * + * 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-document.h> +#include <poppler-image.h> +#include <poppler-page.h> +#include <poppler-page-renderer.h> + +#include <cstdlib> +#include <iostream> +#include <memory> + +#include "parseargs.h" + +bool show_help = false; +bool show_formats = false; +char out_filename[4096]; +int doc_page = 0; + +static const ArgDesc the_args[] = { { "-f", argFlag, &show_formats, 0, "show supported output image formats" }, + { "--page", argInt, &doc_page, 0, "select page to render" }, + { "-o", argString, &out_filename, sizeof(out_filename), "output filename for the resulting PNG image" }, + { "-h", argFlag, &show_help, 0, "print usage information" }, + { "--help", argFlag, &show_help, 0, "print usage information" }, + { nullptr, argFlag, nullptr, 0, nullptr } }; + +static void error(const std::string &msg) +{ + std::cerr << "Error: " << msg << std::endl; + std::cerr << "Exiting..." << std::endl; + exit(1); +} + +int main(int argc, char *argv[]) +{ + if (!parseArgs(the_args, &argc, argv) || (argc < 2 && !show_formats) || show_help) { + printUsage(argv[0], "DOCUMENT", the_args); + exit(1); + } + + if (show_formats) { + const std::vector<std::string> formats = poppler::image::supported_image_formats(); + std::cout << "Supported image formats:" << std::endl; + for (const std::string &format : formats) { + std::cout << " " << format << std::endl; + } + exit(0); + } + + if (!out_filename[0]) { + error("missing output filename (-o)"); + } + + if (!poppler::page_renderer::can_render()) { + error("renderer compiled without Splash support"); + } + + const std::string file_name(argv[1]); + + std::unique_ptr<poppler::document> doc(poppler::document::load_from_file(file_name)); + if (!doc.get()) { + error("loading error"); + } + if (doc->is_locked()) { + error("encrypted document"); + } + + if (doc_page < 0 || doc_page >= doc->pages()) { + error("specified page number out of page count"); + } + std::unique_ptr<poppler::page> p(doc->create_page(doc_page)); + if (!p.get()) { + error("NULL page"); + } + + poppler::page_renderer pr; + pr.set_render_hint(poppler::page_renderer::antialiasing, true); + pr.set_render_hint(poppler::page_renderer::text_antialiasing, true); + + poppler::image img = pr.render_page(p.get()); + if (!img.is_valid()) { + error("rendering failed"); + } + + if (!img.save(out_filename, "png")) { + error("saving to file failed"); + } + + return 0; +} diff --git a/poppler-24.05.0/do-the-gnupg-2.4-dance.sh b/poppler-24.05.0/do-the-gnupg-2.4-dance.sh new file mode 100644 index 0000000000000000000000000000000000000000..c46edf833197e6a154bcfeb45fcd8dad6dca4cf5 --- /dev/null +++ b/poppler-24.05.0/do-the-gnupg-2.4-dance.sh @@ -0,0 +1,51 @@ +#! /bin/sh +set -eux + +if [ -z ${1} ] +then + echo "Destination must be provided" + exit 1 +fi + +apt-get -y install --no-install-recommends libksba-dev libgpg-error-dev libgcrypt-dev libassuan-dev libnpth-dev libgnutls28-dev pkg-config libldap-dev wget ca-certificates bzip2 patch texinfo + +DESTINATION=${1} +if [ -e "${DESTINATION}/bin/gpg" ] +then + echo "Already installed" + exit 0 +fi + +if [ -e "${DESTINATION}" ] +then + echo "Please use a nonexisting destination" + exit 1 +fi + +GNUPG_VERSION=2.4.1 +GPGME_VERSION=1.19.0 + +WORKDIR=$(mktemp -d) + +cd ${WORKDIR} + +wget https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${GNUPG_VERSION}.tar.bz2 +tar xf gnupg-${GNUPG_VERSION}.tar.bz2 +wget https://gnupg.org/ftp/gcrypt/gpgme/gpgme-${GPGME_VERSION}.tar.bz2 +tar xf gpgme-${GPGME_VERSION}.tar.bz2 + + +mkdir -p ${WORKDIR}/gnupg-${GNUPG_VERSION}/build +cd gnupg-${GNUPG_VERSION} +cd build +../configure --prefix=${DESTINATION} +make install + +cd ${WORKDIR} + +mkdir gpgme-${GPGME_VERSION}/build +cd gpgme-${GPGME_VERSION}/build +../configure --prefix=${DESTINATION} --enable-fixed-path=${DESTINATION}/bin --enable-languages=cpp +PATH=${DESTINATION}/bin:$PATH make -j5 install + + diff --git a/poppler-24.05.0/fofi/FoFiBase.cc b/poppler-24.05.0/fofi/FoFiBase.cc new file mode 100644 index 0000000000000000000000000000000000000000..07a5b95bea13feb57e8dbf318d69e828c35c7a1e --- /dev/null +++ b/poppler-24.05.0/fofi/FoFiBase.cc @@ -0,0 +1,212 @@ +//======================================================================== +// +// FoFiBase.cc +// +// Copyright 1999-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2008 Ed Avis <eda@waniasset.com> +// Copyright (C) 2011 Jim Meyering <jim@meyering.net> +// Copyright (C) 2016, 2018, 2020 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2019 Christian Persch <chpe@src.gnome.org> +// Copyright (C) 2019 LE GARREC Vincent <legarrec.vincent@gmail.com> +// Copyright (C) 2022 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 +// +//======================================================================== + +#include <config.h> + +#include <cstdio> +#include <climits> +#include "goo/gfile.h" +#include "goo/gmem.h" +#include "poppler/Error.h" +#include "FoFiBase.h" + +//------------------------------------------------------------------------ +// FoFiBase +//------------------------------------------------------------------------ + +FoFiBase::FoFiBase(const unsigned char *fileA, int lenA, bool freeFileDataA) +{ + file = fileA; + len = lenA; + freeFileData = freeFileDataA; +} + +FoFiBase::~FoFiBase() +{ + if (freeFileData) { + gfree((char *)file); + } +} + +char *FoFiBase::readFile(const char *fileName, int *fileLen) +{ + FILE *f; + char *buf; + int n; + + if (!(f = openFile(fileName, "rb"))) { + error(errIO, -1, "Cannot open '{0:s}'", fileName); + return nullptr; + } + if (fseek(f, 0, SEEK_END) != 0) { + error(errIO, -1, "Cannot seek to end of '{0:s}'", fileName); + fclose(f); + return nullptr; + } + n = (int)ftell(f); + if (n < 0) { + error(errIO, -1, "Cannot determine length of '{0:s}'", fileName); + fclose(f); + return nullptr; + } + if (fseek(f, 0, SEEK_SET) != 0) { + error(errIO, -1, "Cannot seek to start of '{0:s}'", fileName); + fclose(f); + return nullptr; + } + buf = (char *)gmalloc(n); + if ((int)fread(buf, 1, n, f) != n) { + gfree(buf); + fclose(f); + return nullptr; + } + fclose(f); + *fileLen = n; + return buf; +} + +int FoFiBase::getS8(int pos, bool *ok) const +{ + int x; + + if (pos < 0 || pos >= len) { + *ok = false; + return 0; + } + x = file[pos]; + if (x & 0x80) { + x |= ~0xff; + } + return x; +} + +int FoFiBase::getU8(int pos, bool *ok) const +{ + if (pos < 0 || pos >= len) { + *ok = false; + return 0; + } + return file[pos]; +} + +int FoFiBase::getS16BE(int pos, bool *ok) const +{ + int x; + + if (pos < 0 || pos > INT_MAX - 1 || pos + 1 >= len) { + *ok = false; + return 0; + } + x = file[pos]; + x = (x << 8) + file[pos + 1]; + if (x & 0x8000) { + x |= ~0xffff; + } + return x; +} + +int FoFiBase::getU16BE(int pos, bool *ok) const +{ + int x; + + if (pos < 0 || pos > INT_MAX - 1 || pos + 1 >= len) { + *ok = false; + return 0; + } + x = file[pos]; + x = (x << 8) + file[pos + 1]; + return x; +} + +int FoFiBase::getS32BE(int pos, bool *ok) const +{ + int x; + + if (pos < 0 || pos > INT_MAX - 3 || pos + 3 >= len) { + *ok = false; + return 0; + } + x = file[pos]; + x = (x << 8) + file[pos + 1]; + x = (x << 8) + file[pos + 2]; + x = (x << 8) + file[pos + 3]; + if (x & 0x80000000) { + x |= ~0xffffffff; + } + return x; +} + +unsigned int FoFiBase::getU32BE(int pos, bool *ok) const +{ + unsigned int x; + + if (pos < 0 || pos > INT_MAX - 3 || pos + 3 >= len) { + *ok = false; + return 0; + } + x = file[pos]; + x = (x << 8) + file[pos + 1]; + x = (x << 8) + file[pos + 2]; + x = (x << 8) + file[pos + 3]; + return x; +} + +unsigned int FoFiBase::getU32LE(int pos, bool *ok) const +{ + unsigned int x; + + if (pos < 0 || pos > INT_MAX - 3 || pos + 3 >= len) { + *ok = false; + return 0; + } + x = file[pos + 3]; + x = (x << 8) + file[pos + 2]; + x = (x << 8) + file[pos + 1]; + x = (x << 8) + file[pos]; + return x; +} + +unsigned int FoFiBase::getUVarBE(int pos, int size, bool *ok) const +{ + unsigned int x; + int i; + + if (pos < 0 || pos > INT_MAX - size || pos + size > len) { + *ok = false; + return 0; + } + x = 0; + for (i = 0; i < size; ++i) { + x = (x << 8) + file[pos + i]; + } + return x; +} + +bool FoFiBase::checkRegion(int pos, int size) const +{ + return pos >= 0 && size >= 0 && pos < INT_MAX - size && size < INT_MAX - pos && pos + size >= pos && pos + size <= len; +} diff --git a/poppler-24.05.0/fofi/FoFiBase.h b/poppler-24.05.0/fofi/FoFiBase.h new file mode 100644 index 0000000000000000000000000000000000000000..ca62e948d286fa7d4fa47d18c8aa9c1d14918c11 --- /dev/null +++ b/poppler-24.05.0/fofi/FoFiBase.h @@ -0,0 +1,66 @@ +//======================================================================== +// +// FoFiBase.h +// +// Copyright 1999-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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, 2022 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2022 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 +// +//======================================================================== + +#ifndef FOFIBASE_H +#define FOFIBASE_H + +//------------------------------------------------------------------------ + +using FoFiOutputFunc = void (*)(void *stream, const char *data, size_t len); + +//------------------------------------------------------------------------ +// FoFiBase +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT FoFiBase +{ +public: + FoFiBase(const FoFiBase &) = delete; + FoFiBase &operator=(const FoFiBase &other) = delete; + + virtual ~FoFiBase(); + +protected: + FoFiBase(const unsigned char *fileA, int lenA, bool freeFileDataA); + static char *readFile(const char *fileName, int *fileLen); + + // S = signed / U = unsigned + // 8/16/32/Var = word length, in bytes + // BE = big endian + int getS8(int pos, bool *ok) const; + int getU8(int pos, bool *ok) const; + int getS16BE(int pos, bool *ok) const; + int getU16BE(int pos, bool *ok) const; + int getS32BE(int pos, bool *ok) const; + unsigned int getU32BE(int pos, bool *ok) const; + unsigned int getU32LE(int pos, bool *ok) const; + unsigned int getUVarBE(int pos, int size, bool *ok) const; + + bool checkRegion(int pos, int size) const; + + const unsigned char *file; + int len; + bool freeFileData; +}; + +#endif diff --git a/poppler-24.05.0/fofi/FoFiEncodings.cc b/poppler-24.05.0/fofi/FoFiEncodings.cc new file mode 100644 index 0000000000000000000000000000000000000000..f026a2156c6b95a5359d002bc40dc5014bb84fb7 --- /dev/null +++ b/poppler-24.05.0/fofi/FoFiEncodings.cc @@ -0,0 +1,959 @@ +//======================================================================== +// +// FoFiEncodings.cc +// +// Copyright 1999-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2016 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2019 Volker Krause <vkrause@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> + +#include <cstdlib> +#include "FoFiEncodings.h" + +//------------------------------------------------------------------------ +// Type 1 and 1C font data +//------------------------------------------------------------------------ + +const char *const fofiType1StandardEncoding[256] = { nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "space", + "exclam", + "quotedbl", + "numbersign", + "dollar", + "percent", + "ampersand", + "quoteright", + "parenleft", + "parenright", + "asterisk", + "plus", + "comma", + "hyphen", + "period", + "slash", + "zero", + "one", + "two", + "three", + "four", + "five", + "six", + "seven", + "eight", + "nine", + "colon", + "semicolon", + "less", + "equal", + "greater", + "question", + "at", + "A", + "B", + "C", + "D", + "E", + "F", + "G", + "H", + "I", + "J", + "K", + "L", + "M", + "N", + "O", + "P", + "Q", + "R", + "S", + "T", + "U", + "V", + "W", + "X", + "Y", + "Z", + "bracketleft", + "backslash", + "bracketright", + "asciicircum", + "underscore", + "quoteleft", + "a", + "b", + "c", + "d", + "e", + "f", + "g", + "h", + "i", + "j", + "k", + "l", + "m", + "n", + "o", + "p", + "q", + "r", + "s", + "t", + "u", + "v", + "w", + "x", + "y", + "z", + "braceleft", + "bar", + "braceright", + "asciitilde", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "exclamdown", + "cent", + "sterling", + "fraction", + "yen", + "florin", + "section", + "currency", + "quotesingle", + "quotedblleft", + "guillemotleft", + "guilsinglleft", + "guilsinglright", + "fi", + "fl", + nullptr, + "endash", + "dagger", + "daggerdbl", + "periodcentered", + nullptr, + "paragraph", + "bullet", + "quotesinglbase", + "quotedblbase", + "quotedblright", + "guillemotright", + "ellipsis", + "perthousand", + nullptr, + "questiondown", + nullptr, + "grave", + "acute", + "circumflex", + "tilde", + "macron", + "breve", + "dotaccent", + "dieresis", + nullptr, + "ring", + "cedilla", + nullptr, + "hungarumlaut", + "ogonek", + "caron", + "emdash", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "AE", + nullptr, + "ordfeminine", + nullptr, + nullptr, + nullptr, + nullptr, + "Lslash", + "Oslash", + "OE", + "ordmasculine", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "ae", + nullptr, + nullptr, + nullptr, + "dotlessi", + nullptr, + nullptr, + "lslash", + "oslash", + "oe", + "germandbls", + nullptr, + nullptr, + nullptr, + nullptr }; + +const char *const fofiType1ExpertEncoding[256] = { nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "space", + "exclamsmall", + "Hungarumlautsmall", + nullptr, + "dollaroldstyle", + "dollarsuperior", + "ampersandsmall", + "Acutesmall", + "parenleftsuperior", + "parenrightsuperior", + "twodotenleader", + "onedotenleader", + "comma", + "hyphen", + "period", + "fraction", + "zerooldstyle", + "oneoldstyle", + "twooldstyle", + "threeoldstyle", + "fouroldstyle", + "fiveoldstyle", + "sixoldstyle", + "sevenoldstyle", + "eightoldstyle", + "nineoldstyle", + "colon", + "semicolon", + "commasuperior", + "threequartersemdash", + "periodsuperior", + "questionsmall", + nullptr, + "asuperior", + "bsuperior", + "centsuperior", + "dsuperior", + "esuperior", + nullptr, + nullptr, + nullptr, + "isuperior", + nullptr, + nullptr, + "lsuperior", + "msuperior", + "nsuperior", + "osuperior", + nullptr, + nullptr, + "rsuperior", + "ssuperior", + "tsuperior", + nullptr, + "ff", + "fi", + "fl", + "ffi", + "ffl", + "parenleftinferior", + nullptr, + "parenrightinferior", + "Circumflexsmall", + "hyphensuperior", + "Gravesmall", + "Asmall", + "Bsmall", + "Csmall", + "Dsmall", + "Esmall", + "Fsmall", + "Gsmall", + "Hsmall", + "Ismall", + "Jsmall", + "Ksmall", + "Lsmall", + "Msmall", + "Nsmall", + "Osmall", + "Psmall", + "Qsmall", + "Rsmall", + "Ssmall", + "Tsmall", + "Usmall", + "Vsmall", + "Wsmall", + "Xsmall", + "Ysmall", + "Zsmall", + "colonmonetary", + "onefitted", + "rupiah", + "Tildesmall", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "exclamdownsmall", + "centoldstyle", + "Lslashsmall", + nullptr, + nullptr, + "Scaronsmall", + "Zcaronsmall", + "Dieresissmall", + "Brevesmall", + "Caronsmall", + nullptr, + "Dotaccentsmall", + nullptr, + nullptr, + "Macronsmall", + nullptr, + nullptr, + "figuredash", + "hypheninferior", + nullptr, + nullptr, + "Ogoneksmall", + "Ringsmall", + "Cedillasmall", + nullptr, + nullptr, + nullptr, + "onequarter", + "onehalf", + "threequarters", + "questiondownsmall", + "oneeighth", + "threeeighths", + "fiveeighths", + "seveneighths", + "onethird", + "twothirds", + nullptr, + nullptr, + "zerosuperior", + "onesuperior", + "twosuperior", + "threesuperior", + "foursuperior", + "fivesuperior", + "sixsuperior", + "sevensuperior", + "eightsuperior", + "ninesuperior", + "zeroinferior", + "oneinferior", + "twoinferior", + "threeinferior", + "fourinferior", + "fiveinferior", + "sixinferior", + "seveninferior", + "eightinferior", + "nineinferior", + "centinferior", + "dollarinferior", + "periodinferior", + "commainferior", + "Agravesmall", + "Aacutesmall", + "Acircumflexsmall", + "Atildesmall", + "Adieresissmall", + "Aringsmall", + "AEsmall", + "Ccedillasmall", + "Egravesmall", + "Eacutesmall", + "Ecircumflexsmall", + "Edieresissmall", + "Igravesmall", + "Iacutesmall", + "Icircumflexsmall", + "Idieresissmall", + "Ethsmall", + "Ntildesmall", + "Ogravesmall", + "Oacutesmall", + "Ocircumflexsmall", + "Otildesmall", + "Odieresissmall", + "OEsmall", + "Oslashsmall", + "Ugravesmall", + "Uacutesmall", + "Ucircumflexsmall", + "Udieresissmall", + "Yacutesmall", + "Thornsmall", + "Ydieresissmall" }; + +//------------------------------------------------------------------------ +// Type 1C font data +//------------------------------------------------------------------------ + +const char *fofiType1CStdStrings[391] = { ".notdef", + "space", + "exclam", + "quotedbl", + "numbersign", + "dollar", + "percent", + "ampersand", + "quoteright", + "parenleft", + "parenright", + "asterisk", + "plus", + "comma", + "hyphen", + "period", + "slash", + "zero", + "one", + "two", + "three", + "four", + "five", + "six", + "seven", + "eight", + "nine", + "colon", + "semicolon", + "less", + "equal", + "greater", + "question", + "at", + "A", + "B", + "C", + "D", + "E", + "F", + "G", + "H", + "I", + "J", + "K", + "L", + "M", + "N", + "O", + "P", + "Q", + "R", + "S", + "T", + "U", + "V", + "W", + "X", + "Y", + "Z", + "bracketleft", + "backslash", + "bracketright", + "asciicircum", + "underscore", + "quoteleft", + "a", + "b", + "c", + "d", + "e", + "f", + "g", + "h", + "i", + "j", + "k", + "l", + "m", + "n", + "o", + "p", + "q", + "r", + "s", + "t", + "u", + "v", + "w", + "x", + "y", + "z", + "braceleft", + "bar", + "braceright", + "asciitilde", + "exclamdown", + "cent", + "sterling", + "fraction", + "yen", + "florin", + "section", + "currency", + "quotesingle", + "quotedblleft", + "guillemotleft", + "guilsinglleft", + "guilsinglright", + "fi", + "fl", + "endash", + "dagger", + "daggerdbl", + "periodcentered", + "paragraph", + "bullet", + "quotesinglbase", + "quotedblbase", + "quotedblright", + "guillemotright", + "ellipsis", + "perthousand", + "questiondown", + "grave", + "acute", + "circumflex", + "tilde", + "macron", + "breve", + "dotaccent", + "dieresis", + "ring", + "cedilla", + "hungarumlaut", + "ogonek", + "caron", + "emdash", + "AE", + "ordfeminine", + "Lslash", + "Oslash", + "OE", + "ordmasculine", + "ae", + "dotlessi", + "lslash", + "oslash", + "oe", + "germandbls", + "onesuperior", + "logicalnot", + "mu", + "trademark", + "Eth", + "onehalf", + "plusminus", + "Thorn", + "onequarter", + "divide", + "brokenbar", + "degree", + "thorn", + "threequarters", + "twosuperior", + "registered", + "minus", + "eth", + "multiply", + "threesuperior", + "copyright", + "Aacute", + "Acircumflex", + "Adieresis", + "Agrave", + "Aring", + "Atilde", + "Ccedilla", + "Eacute", + "Ecircumflex", + "Edieresis", + "Egrave", + "Iacute", + "Icircumflex", + "Idieresis", + "Igrave", + "Ntilde", + "Oacute", + "Ocircumflex", + "Odieresis", + "Ograve", + "Otilde", + "Scaron", + "Uacute", + "Ucircumflex", + "Udieresis", + "Ugrave", + "Yacute", + "Ydieresis", + "Zcaron", + "aacute", + "acircumflex", + "adieresis", + "agrave", + "aring", + "atilde", + "ccedilla", + "eacute", + "ecircumflex", + "edieresis", + "egrave", + "iacute", + "icircumflex", + "idieresis", + "igrave", + "ntilde", + "oacute", + "ocircumflex", + "odieresis", + "ograve", + "otilde", + "scaron", + "uacute", + "ucircumflex", + "udieresis", + "ugrave", + "yacute", + "ydieresis", + "zcaron", + "exclamsmall", + "Hungarumlautsmall", + "dollaroldstyle", + "dollarsuperior", + "ampersandsmall", + "Acutesmall", + "parenleftsuperior", + "parenrightsuperior", + "twodotenleader", + "onedotenleader", + "zerooldstyle", + "oneoldstyle", + "twooldstyle", + "threeoldstyle", + "fouroldstyle", + "fiveoldstyle", + "sixoldstyle", + "sevenoldstyle", + "eightoldstyle", + "nineoldstyle", + "commasuperior", + "threequartersemdash", + "periodsuperior", + "questionsmall", + "asuperior", + "bsuperior", + "centsuperior", + "dsuperior", + "esuperior", + "isuperior", + "lsuperior", + "msuperior", + "nsuperior", + "osuperior", + "rsuperior", + "ssuperior", + "tsuperior", + "ff", + "ffi", + "ffl", + "parenleftinferior", + "parenrightinferior", + "Circumflexsmall", + "hyphensuperior", + "Gravesmall", + "Asmall", + "Bsmall", + "Csmall", + "Dsmall", + "Esmall", + "Fsmall", + "Gsmall", + "Hsmall", + "Ismall", + "Jsmall", + "Ksmall", + "Lsmall", + "Msmall", + "Nsmall", + "Osmall", + "Psmall", + "Qsmall", + "Rsmall", + "Ssmall", + "Tsmall", + "Usmall", + "Vsmall", + "Wsmall", + "Xsmall", + "Ysmall", + "Zsmall", + "colonmonetary", + "onefitted", + "rupiah", + "Tildesmall", + "exclamdownsmall", + "centoldstyle", + "Lslashsmall", + "Scaronsmall", + "Zcaronsmall", + "Dieresissmall", + "Brevesmall", + "Caronsmall", + "Dotaccentsmall", + "Macronsmall", + "figuredash", + "hypheninferior", + "Ogoneksmall", + "Ringsmall", + "Cedillasmall", + "questiondownsmall", + "oneeighth", + "threeeighths", + "fiveeighths", + "seveneighths", + "onethird", + "twothirds", + "zerosuperior", + "foursuperior", + "fivesuperior", + "sixsuperior", + "sevensuperior", + "eightsuperior", + "ninesuperior", + "zeroinferior", + "oneinferior", + "twoinferior", + "threeinferior", + "fourinferior", + "fiveinferior", + "sixinferior", + "seveninferior", + "eightinferior", + "nineinferior", + "centinferior", + "dollarinferior", + "periodinferior", + "commainferior", + "Agravesmall", + "Aacutesmall", + "Acircumflexsmall", + "Atildesmall", + "Adieresissmall", + "Aringsmall", + "AEsmall", + "Ccedillasmall", + "Egravesmall", + "Eacutesmall", + "Ecircumflexsmall", + "Edieresissmall", + "Igravesmall", + "Iacutesmall", + "Icircumflexsmall", + "Idieresissmall", + "Ethsmall", + "Ntildesmall", + "Ogravesmall", + "Oacutesmall", + "Ocircumflexsmall", + "Otildesmall", + "Odieresissmall", + "OEsmall", + "Oslashsmall", + "Ugravesmall", + "Uacutesmall", + "Ucircumflexsmall", + "Udieresissmall", + "Yacutesmall", + "Thornsmall", + "Ydieresissmall", + "001.000", + "001.001", + "001.002", + "001.003", + "Black", + "Bold", + "Book", + "Light", + "Medium", + "Regular", + "Roman", + "Semibold" }; + +const unsigned short fofiType1CISOAdobeCharset[229] = { 0, 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, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228 }; + +const unsigned short fofiType1CExpertCharset[166] = { 0, 1, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 13, 14, 15, 99, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 27, 28, 249, 250, 251, 252, 253, 254, + 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 109, 110, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, + 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 158, 155, + 163, 319, 320, 321, 322, 323, 324, 325, 326, 150, 164, 169, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, + 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378 }; + +const unsigned short fofiType1CExpertSubsetCharset[87] = { 0, 1, 231, 232, 235, 236, 237, 238, 13, 14, 15, 99, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 27, 28, 249, 250, 251, 253, 254, + 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 109, 110, 267, 268, 269, 270, 272, 300, 301, 302, 305, 314, 315, 158, 155, 163, 320, + 321, 322, 323, 324, 325, 326, 150, 164, 169, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346 }; diff --git a/poppler-24.05.0/fofi/FoFiEncodings.h b/poppler-24.05.0/fofi/FoFiEncodings.h new file mode 100644 index 0000000000000000000000000000000000000000..5a154405a448b3e0b947319a901aabac9b1b6798 --- /dev/null +++ b/poppler-24.05.0/fofi/FoFiEncodings.h @@ -0,0 +1,43 @@ +//======================================================================== +// +// FoFiEncodings.h +// +// Copyright 1999-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2016 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2019 Volker Krause <vkrause@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 +// +//======================================================================== + +#ifndef FOFIENCODINGS_H +#define FOFIENCODINGS_H + +//------------------------------------------------------------------------ +// Type 1 and 1C font data +//------------------------------------------------------------------------ + +extern const char *const fofiType1StandardEncoding[256]; +extern const char *const fofiType1ExpertEncoding[256]; + +//------------------------------------------------------------------------ +// Type 1C font data +//------------------------------------------------------------------------ + +extern const char *fofiType1CStdStrings[391]; +extern const unsigned short fofiType1CISOAdobeCharset[229]; +extern const unsigned short fofiType1CExpertCharset[166]; +extern const unsigned short fofiType1CExpertSubsetCharset[87]; + +#endif diff --git a/poppler-24.05.0/fofi/FoFiIdentifier.cc b/poppler-24.05.0/fofi/FoFiIdentifier.cc new file mode 100644 index 0000000000000000000000000000000000000000..ec92b33d32df0fa103404b0b1531991b34e5f34e --- /dev/null +++ b/poppler-24.05.0/fofi/FoFiIdentifier.cc @@ -0,0 +1,628 @@ +//======================================================================== +// +// FoFiIdentifier.cc +// +// Copyright 2009 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2013 Christoph Duelli <duelli@melosgmbh.de> +// Copyright (C) 2018, 2021 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2019 Christian Persch <chpe@src.gnome.org> +// Copyright (C) 2019 LE GARREC Vincent <legarrec.vincent@gmail.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 +// +//======================================================================== + +#include <cstdio> +#include <cstring> +#include <climits> +#include "goo/gfile.h" +#include "goo/GooCheckedOps.h" +#include "FoFiIdentifier.h" + +//------------------------------------------------------------------------ + +namespace { // do not pollute global namespace + +class Reader +{ +public: + Reader() = default; + Reader(const Reader &) = delete; + Reader &operator=(const Reader &other) = delete; + + virtual ~Reader() { } + + // Read one byte. Returns -1 if past EOF. + virtual int getByte(int pos) = 0; + + // Read a big-endian unsigned 16-bit integer. Fills in *val and + // returns true if successful. + virtual bool getU16BE(int pos, int *val) = 0; + + // Read a big-endian unsigned 32-bit integer. Fills in *val and + // returns true if successful. + virtual bool getU32BE(int pos, unsigned int *val) = 0; + + // Read a little-endian unsigned 32-bit integer. Fills in *val and + // returns true if successful. + virtual bool getU32LE(int pos, unsigned int *val) = 0; + + // Read a big-endian unsigned <size>-byte integer, where 1 <= size + // <= 4. Fills in *val and returns true if successful. + virtual bool getUVarBE(int pos, int size, unsigned int *val) = 0; + + // Compare against a string. Returns true if equal. + virtual bool cmp(int pos, const char *s) = 0; +}; + +//------------------------------------------------------------------------ + +class MemReader : public Reader +{ +public: + static MemReader *make(const char *bufA, int lenA); + ~MemReader() override; + int getByte(int pos) override; + bool getU16BE(int pos, int *val) override; + bool getU32BE(int pos, unsigned int *val) override; + bool getU32LE(int pos, unsigned int *val) override; + bool getUVarBE(int pos, int size, unsigned int *val) override; + bool cmp(int pos, const char *s) override; + +private: + MemReader(const char *bufA, int lenA); + + const char *buf; + int len; +}; + +MemReader *MemReader::make(const char *bufA, int lenA) +{ + return new MemReader(bufA, lenA); +} + +MemReader::MemReader(const char *bufA, int lenA) +{ + buf = bufA; + len = lenA; +} + +MemReader::~MemReader() { } + +int MemReader::getByte(int pos) +{ + if (pos < 0 || pos >= len) { + return -1; + } + return buf[pos] & 0xff; +} + +bool MemReader::getU16BE(int pos, int *val) +{ + if (pos < 0 || pos > len - 2) { + return false; + } + *val = ((buf[pos] & 0xff) << 8) + (buf[pos + 1] & 0xff); + return true; +} + +bool MemReader::getU32BE(int pos, unsigned int *val) +{ + if (pos < 0 || pos > len - 4) { + return false; + } + *val = ((buf[pos] & 0xff) << 24) + ((buf[pos + 1] & 0xff) << 16) + ((buf[pos + 2] & 0xff) << 8) + (buf[pos + 3] & 0xff); + return true; +} + +bool MemReader::getU32LE(int pos, unsigned int *val) +{ + if (pos < 0 || pos > len - 4) { + return false; + } + *val = (buf[pos] & 0xff) + ((buf[pos + 1] & 0xff) << 8) + ((buf[pos + 2] & 0xff) << 16) + ((buf[pos + 3] & 0xff) << 24); + return true; +} + +bool MemReader::getUVarBE(int pos, int size, unsigned int *val) +{ + int i; + + if (size < 1 || size > 4 || pos < 0 || pos > len - size) { + return false; + } + *val = 0; + for (i = 0; i < size; ++i) { + *val = (*val << 8) + (buf[pos + i] & 0xff); + } + return true; +} + +bool MemReader::cmp(int pos, const char *s) +{ + int n; + + n = (int)strlen(s); + if (pos < 0 || len < n || pos > len - n) { + return false; + } + return !memcmp(buf + pos, s, n); +} + +//------------------------------------------------------------------------ + +class FileReader : public Reader +{ +public: + static FileReader *make(const char *fileName); + ~FileReader() override; + int getByte(int pos) override; + bool getU16BE(int pos, int *val) override; + bool getU32BE(int pos, unsigned int *val) override; + bool getU32LE(int pos, unsigned int *val) override; + bool getUVarBE(int pos, int size, unsigned int *val) override; + bool cmp(int pos, const char *s) override; + +private: + explicit FileReader(FILE *fA); + bool fillBuf(int pos, int len); + + FILE *f; + char buf[1024]; + int bufPos, bufLen; +}; + +FileReader *FileReader::make(const char *fileName) +{ + FILE *fA; + + if (!(fA = openFile(fileName, "rb"))) { + return nullptr; + } + return new FileReader(fA); +} + +FileReader::FileReader(FILE *fA) +{ + f = fA; + bufPos = 0; + bufLen = 0; +} + +FileReader::~FileReader() +{ + fclose(f); +} + +int FileReader::getByte(int pos) +{ + if (!fillBuf(pos, 1)) { + return -1; + } + return buf[pos - bufPos] & 0xff; +} + +bool FileReader::getU16BE(int pos, int *val) +{ + if (!fillBuf(pos, 2)) { + return false; + } + *val = ((buf[pos - bufPos] & 0xff) << 8) + (buf[pos - bufPos + 1] & 0xff); + return true; +} + +bool FileReader::getU32BE(int pos, unsigned int *val) +{ + if (!fillBuf(pos, 4)) { + return false; + } + *val = ((buf[pos - bufPos] & 0xff) << 24) + ((buf[pos - bufPos + 1] & 0xff) << 16) + ((buf[pos - bufPos + 2] & 0xff) << 8) + (buf[pos - bufPos + 3] & 0xff); + return true; +} + +bool FileReader::getU32LE(int pos, unsigned int *val) +{ + if (!fillBuf(pos, 4)) { + return false; + } + *val = (buf[pos - bufPos] & 0xff) + ((buf[pos - bufPos + 1] & 0xff) << 8) + ((buf[pos - bufPos + 2] & 0xff) << 16) + ((buf[pos - bufPos + 3] & 0xff) << 24); + return true; +} + +bool FileReader::getUVarBE(int pos, int size, unsigned int *val) +{ + int i; + + if (size < 1 || size > 4 || !fillBuf(pos, size)) { + return false; + } + *val = 0; + for (i = 0; i < size; ++i) { + *val = (*val << 8) + (buf[pos - bufPos + i] & 0xff); + } + return true; +} + +bool FileReader::cmp(int pos, const char *s) +{ + int n; + + n = (int)strlen(s); + if (!fillBuf(pos, n)) { + return false; + } + return !memcmp(buf - bufPos + pos, s, n); +} + +bool FileReader::fillBuf(int pos, int len) +{ + if (pos < 0 || len < 0 || len > (int)sizeof(buf) || pos > INT_MAX - (int)sizeof(buf)) { + return false; + } + if (pos >= bufPos && pos + len <= bufPos + bufLen) { + return true; + } + if (fseek(f, pos, SEEK_SET)) { + return false; + } + bufPos = pos; + bufLen = (int)fread(buf, 1, sizeof(buf), f); + if (bufLen < len) { + return false; + } + return true; +} + +//------------------------------------------------------------------------ + +class StreamReader : public Reader +{ +public: + static StreamReader *make(int (*getCharA)(void *data), void *dataA); + ~StreamReader() override; + int getByte(int pos) override; + bool getU16BE(int pos, int *val) override; + bool getU32BE(int pos, unsigned int *val) override; + bool getU32LE(int pos, unsigned int *val) override; + bool getUVarBE(int pos, int size, unsigned int *val) override; + bool cmp(int pos, const char *s) override; + +private: + StreamReader(int (*getCharA)(void *data), void *dataA); + bool fillBuf(int pos, int len); + + int (*getChar)(void *data); + void *data; + int streamPos; + char buf[1024]; + int bufPos, bufLen; +}; + +StreamReader *StreamReader::make(int (*getCharA)(void *data), void *dataA) +{ + return new StreamReader(getCharA, dataA); +} + +StreamReader::StreamReader(int (*getCharA)(void *data), void *dataA) +{ + getChar = getCharA; + data = dataA; + streamPos = 0; + bufPos = 0; + bufLen = 0; +} + +StreamReader::~StreamReader() { } + +int StreamReader::getByte(int pos) +{ + if (!fillBuf(pos, 1)) { + return -1; + } + return buf[pos - bufPos] & 0xff; +} + +bool StreamReader::getU16BE(int pos, int *val) +{ + if (!fillBuf(pos, 2)) { + return false; + } + *val = ((buf[pos - bufPos] & 0xff) << 8) + (buf[pos - bufPos + 1] & 0xff); + return true; +} + +bool StreamReader::getU32BE(int pos, unsigned int *val) +{ + if (!fillBuf(pos, 4)) { + return false; + } + *val = ((buf[pos - bufPos] & 0xff) << 24) + ((buf[pos - bufPos + 1] & 0xff) << 16) + ((buf[pos - bufPos + 2] & 0xff) << 8) + (buf[pos - bufPos + 3] & 0xff); + return true; +} + +bool StreamReader::getU32LE(int pos, unsigned int *val) +{ + if (!fillBuf(pos, 4)) { + return false; + } + *val = (buf[pos - bufPos] & 0xff) + ((buf[pos - bufPos + 1] & 0xff) << 8) + ((buf[pos - bufPos + 2] & 0xff) << 16) + ((buf[pos - bufPos + 3] & 0xff) << 24); + return true; +} + +bool StreamReader::getUVarBE(int pos, int size, unsigned int *val) +{ + int i; + + if (size < 1 || size > 4 || !fillBuf(pos, size)) { + return false; + } + *val = 0; + for (i = 0; i < size; ++i) { + *val = (*val << 8) + (buf[pos - bufPos + i] & 0xff); + } + return true; +} + +bool StreamReader::cmp(int pos, const char *s) +{ + const int n = (int)strlen(s); + if (!fillBuf(pos, n)) { + return false; + } + const int posDiff = pos - bufPos; + return !memcmp(buf + posDiff, s, n); +} + +bool StreamReader::fillBuf(int pos, int len) +{ + int c; + + if (pos < 0 || len < 0 || len > (int)sizeof(buf) || pos > INT_MAX - (int)sizeof(buf)) { + return false; + } + if (pos < bufPos) { + return false; + } + + // if requested region will not fit in the current buffer... + if (pos + len > bufPos + (int)sizeof(buf)) { + + // if the start of the requested data is already in the buffer, move + // it to the start of the buffer + if (pos < bufPos + bufLen) { + bufLen -= pos - bufPos; + memmove(buf, buf + (pos - bufPos), bufLen); + bufPos = pos; + + // otherwise discard data from the + // stream until we get to the requested position + } else { + bufPos += bufLen; + bufLen = 0; + while (bufPos < pos) { + if ((c = (*getChar)(data)) < 0) { + return false; + } + ++bufPos; + } + } + } + + // read the rest of the requested data + while (bufPos + bufLen < pos + len) { + if ((c = (*getChar)(data)) < 0) { + return false; + } + buf[bufLen++] = (char)c; + } + + return true; +} + +} + +//------------------------------------------------------------------------ + +static FoFiIdentifierType identify(Reader *reader); +static FoFiIdentifierType identifyOpenType(Reader *reader); +static FoFiIdentifierType identifyCFF(Reader *reader, int start); + +FoFiIdentifierType FoFiIdentifier::identifyMem(const char *file, int len) +{ + MemReader *reader; + FoFiIdentifierType type; + + if (!(reader = MemReader::make(file, len))) { + return fofiIdError; + } + type = identify(reader); + delete reader; + return type; +} + +FoFiIdentifierType FoFiIdentifier::identifyFile(const char *fileName) +{ + FileReader *reader; + FoFiIdentifierType type; + + if (!(reader = FileReader::make(fileName))) { + return fofiIdError; + } + type = identify(reader); + delete reader; + return type; +} + +FoFiIdentifierType FoFiIdentifier::identifyStream(int (*getChar)(void *data), void *data) +{ + StreamReader *reader; + FoFiIdentifierType type; + + if (!(reader = StreamReader::make(getChar, data))) { + return fofiIdError; + } + type = identify(reader); + delete reader; + return type; +} + +static FoFiIdentifierType identify(Reader *reader) +{ + unsigned int n; + + //----- PFA + if (reader->cmp(0, "%!PS-AdobeFont-1") || reader->cmp(0, "%!FontType1")) { + return fofiIdType1PFA; + } + + //----- PFB + if (reader->getByte(0) == 0x80 && reader->getByte(1) == 0x01 && reader->getU32LE(2, &n)) { + if ((n >= 16 && reader->cmp(6, "%!PS-AdobeFont-1")) || (n >= 11 && reader->cmp(6, "%!FontType1"))) { + return fofiIdType1PFB; + } + } + + //----- TrueType + if ((reader->getByte(0) == 0x00 && reader->getByte(1) == 0x01 && reader->getByte(2) == 0x00 && reader->getByte(3) == 0x00) + || (reader->getByte(0) == 0x74 && // 'true' + reader->getByte(1) == 0x72 && reader->getByte(2) == 0x75 && reader->getByte(3) == 0x65)) { + return fofiIdTrueType; + } + if (reader->getByte(0) == 0x74 && // 'ttcf' + reader->getByte(1) == 0x74 && reader->getByte(2) == 0x63 && reader->getByte(3) == 0x66) { + return fofiIdTrueTypeCollection; + } + + //----- OpenType + if (reader->getByte(0) == 0x4f && // 'OTTO + reader->getByte(1) == 0x54 && reader->getByte(2) == 0x54 && reader->getByte(3) == 0x4f) { + return identifyOpenType(reader); + } + + //----- CFF + if (reader->getByte(0) == 0x01 && reader->getByte(1) == 0x00) { + return identifyCFF(reader, 0); + } + // some tools embed CFF fonts with an extra whitespace char at the + // beginning + if (reader->getByte(1) == 0x01 && reader->getByte(2) == 0x00) { + return identifyCFF(reader, 1); + } + + return fofiIdUnknown; +} + +static FoFiIdentifierType identifyOpenType(Reader *reader) +{ + FoFiIdentifierType type; + unsigned int offset; + int nTables, i; + + if (!reader->getU16BE(4, &nTables)) { + return fofiIdUnknown; + } + for (i = 0; i < nTables; ++i) { + if (reader->cmp(12 + i * 16, "CFF ")) { + if (reader->getU32BE(12 + i * 16 + 8, &offset) && offset < (unsigned int)INT_MAX) { + type = identifyCFF(reader, (int)offset); + if (type == fofiIdCFF8Bit) { + type = fofiIdOpenTypeCFF8Bit; + } else if (type == fofiIdCFFCID) { + type = fofiIdOpenTypeCFFCID; + } + return type; + } + return fofiIdUnknown; + } + } + return fofiIdUnknown; +} + +static FoFiIdentifierType identifyCFF(Reader *reader, int start) +{ + unsigned int offset0, offset1; + int hdrSize, offSize0, offSize1, pos, endPos, b0, n, i; + + //----- read the header + if (reader->getByte(start) != 0x01 || reader->getByte(start + 1) != 0x00) { + return fofiIdUnknown; + } + if ((hdrSize = reader->getByte(start + 2)) < 0) { + return fofiIdUnknown; + } + if ((offSize0 = reader->getByte(start + 3)) < 1 || offSize0 > 4) { + return fofiIdUnknown; + } + pos = start + hdrSize; + if (pos < 0) { + return fofiIdUnknown; + } + + //----- skip the name index + if (!reader->getU16BE(pos, &n)) { + return fofiIdUnknown; + } + if (n == 0) { + pos += 2; + } else { + if ((offSize1 = reader->getByte(pos + 2)) < 1 || offSize1 > 4) { + return fofiIdUnknown; + } + if (!reader->getUVarBE(pos + 3 + n * offSize1, offSize1, &offset1) || offset1 > (unsigned int)INT_MAX) { + return fofiIdUnknown; + } + pos += 3 + (n + 1) * offSize1 + (int)offset1 - 1; + } + if (pos < 0) { + return fofiIdUnknown; + } + + //----- parse the top dict index + if (!reader->getU16BE(pos, &n) || n < 1) { + return fofiIdUnknown; + } + if ((offSize1 = reader->getByte(pos + 2)) < 1 || offSize1 > 4) { + return fofiIdUnknown; + } + if (!reader->getUVarBE(pos + 3, offSize1, &offset0) || offset0 > (unsigned int)INT_MAX || !reader->getUVarBE(pos + 3 + offSize1, offSize1, &offset1) || offset1 > (unsigned int)INT_MAX || offset0 > offset1) { + return fofiIdUnknown; + } + if (checkedAdd(pos + 3 + (n + 1) * offSize1, (int)offset0 - 1, &pos) || checkedAdd(pos + 3 + (n + 1) * offSize1, (int)offset1 - 1, &endPos) || pos < 0 || endPos < 0 || pos > endPos) { + return fofiIdUnknown; + } + + //----- parse the top dict, look for ROS as first entry + // for a CID font, the top dict starts with: + // <int> <int> <int> ROS + for (i = 0; i < 3; ++i) { + b0 = reader->getByte(pos++); + if (b0 == 0x1c) { + pos += 2; + } else if (b0 == 0x1d) { + pos += 4; + } else if (b0 >= 0xf7 && b0 <= 0xfe) { + pos += 1; + } else if (b0 < 0x20 || b0 > 0xf6) { + return fofiIdCFF8Bit; + } + if (pos >= endPos || pos < 0) { + return fofiIdCFF8Bit; + } + } + if (pos + 1 < endPos && reader->getByte(pos) == 12 && reader->getByte(pos + 1) == 30) { + return fofiIdCFFCID; + } else { + return fofiIdCFF8Bit; + } +} diff --git a/poppler-24.05.0/fofi/FoFiIdentifier.h b/poppler-24.05.0/fofi/FoFiIdentifier.h new file mode 100644 index 0000000000000000000000000000000000000000..f37ee3961218473bbec4c0dfd1f4374197eda99d --- /dev/null +++ b/poppler-24.05.0/fofi/FoFiIdentifier.h @@ -0,0 +1,52 @@ +//======================================================================== +// +// FoFiIdentifier.h +// +// Copyright 2009 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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 +// +//======================================================================== + +#ifndef FOFIIDENTIFIER_H +#define FOFIIDENTIFIER_H + +//------------------------------------------------------------------------ +// FoFiIdentifier +//------------------------------------------------------------------------ + +enum FoFiIdentifierType +{ + fofiIdType1PFA, // Type 1 font in PFA format + fofiIdType1PFB, // Type 1 font in PFB format + fofiIdCFF8Bit, // 8-bit CFF font + fofiIdCFFCID, // CID CFF font + fofiIdTrueType, // TrueType font + fofiIdTrueTypeCollection, // TrueType collection + fofiIdOpenTypeCFF8Bit, // OpenType wrapper with 8-bit CFF font + fofiIdOpenTypeCFFCID, // OpenType wrapper with CID CFF font + fofiIdUnknown, // unknown type + fofiIdError // error in reading the file +}; + +class FoFiIdentifier +{ +public: + static FoFiIdentifierType identifyMem(const char *file, int len); + static FoFiIdentifierType identifyFile(const char *fileName); + static FoFiIdentifierType identifyStream(int (*getChar)(void *data), void *data); +}; + +#endif diff --git a/poppler-24.05.0/fofi/FoFiTrueType.cc b/poppler-24.05.0/fofi/FoFiTrueType.cc new file mode 100644 index 0000000000000000000000000000000000000000..020a374c13e4e3e57cec8b4f5dc5f4cc62791271 --- /dev/null +++ b/poppler-24.05.0/fofi/FoFiTrueType.cc @@ -0,0 +1,2018 @@ +//======================================================================== +// +// FoFiTrueType.cc +// +// Copyright 1999-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Takashi Iwai <tiwai@suse.de> +// Copyright (C) 2007 Koji Otani <sho@bbr.jp> +// Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> +// Copyright (C) 2008, 2009, 2012, 2014-2022 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com> +// Copyright (C) 2012 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> +// Copyright (C) 2012, 2017 Adrian Johnson <ajohnson@redneon.com> +// Copyright (C) 2014 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2015 Aleksei Volkov <Aleksei Volkov> +// Copyright (C) 2015, 2016 William Bader <williambader@hotmail.com> +// Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de> +// Copyright (C) 2022 Zachary Travis <ztravis@everlaw.com> +// Copyright (C) 2022 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 +// +//======================================================================== + +#include <config.h> + +#include <cstdlib> +#include <cstring> +#include <climits> +#include <algorithm> +#include "goo/gmem.h" +#include "goo/GooLikely.h" +#include "goo/GooString.h" +#include "FoFiType1C.h" +#include "FoFiTrueType.h" +#include "poppler/Error.h" + +// +// Terminology +// ----------- +// +// character code = number used as an element of a text string +// +// character name = glyph name = name for a particular glyph within a +// font +// +// glyph index = GID = position (within some internal table in the font) +// where the instructions to draw a particular glyph are +// stored +// +// Type 1 fonts +// ------------ +// +// Type 1 fonts contain: +// +// Encoding: array of glyph names, maps char codes to glyph names +// +// Encoding[charCode] = charName +// +// CharStrings: dictionary of instructions, keyed by character names, +// maps character name to glyph data +// +// CharStrings[charName] = glyphData +// +// TrueType fonts +// -------------- +// +// TrueType fonts contain: +// +// 'cmap' table: mapping from character code to glyph index; there may +// be multiple cmaps in a TrueType font +// +// cmap[charCode] = gid +// +// 'post' table: mapping from glyph index to glyph name +// +// post[gid] = glyphName +// +// Type 42 fonts +// ------------- +// +// Type 42 fonts contain: +// +// Encoding: array of glyph names, maps char codes to glyph names +// +// Encoding[charCode] = charName +// +// CharStrings: dictionary of glyph indexes, keyed by character names, +// maps character name to glyph index +// +// CharStrings[charName] = gid +// + +//------------------------------------------------------------------------ + +#define ttcfTag 0x74746366 + +//------------------------------------------------------------------------ + +struct TrueTypeTable +{ + unsigned int tag; + unsigned int checksum; + int offset; + int origOffset; + int len; +}; + +struct TrueTypeCmap +{ + int platform; + int encoding; + int offset; + int len; + int fmt; +}; + +struct TrueTypeLoca +{ + int idx; + int origOffset; + int newOffset; + int len; +}; + +#define cmapTag 0x636d6170 +#define glyfTag 0x676c7966 +#define headTag 0x68656164 +#define hheaTag 0x68686561 +#define hmtxTag 0x686d7478 +#define locaTag 0x6c6f6361 +#define nameTag 0x6e616d65 +#define os2Tag 0x4f532f32 +#define postTag 0x706f7374 +#define vrt2Tag 0x76727432 +#define vertTag 0x76657274 + +struct cmpTrueTypeLocaOffsetFunctor +{ + bool operator()(const TrueTypeLoca loca1, const TrueTypeLoca loca2) + { + if (loca1.origOffset == loca2.origOffset) { + return loca1.idx < loca2.idx; + } + return loca1.origOffset < loca2.origOffset; + } +}; + +struct cmpTrueTypeLocaIdxFunctor +{ + bool operator()(const TrueTypeLoca loca1, const TrueTypeLoca loca2) { return loca1.idx < loca2.idx; } +}; + +struct cmpTrueTypeTableTagFunctor +{ + bool operator()(const TrueTypeTable &tab1, const TrueTypeTable &tab2) { return tab1.tag < tab2.tag; } +}; + +//------------------------------------------------------------------------ + +struct T42Table +{ + const char *tag; // 4-byte tag + bool required; // required by the TrueType spec? +}; + +// TrueType tables to be embedded in Type 42 fonts. +// NB: the table names must be in alphabetical order here. +#define nT42Tables 11 +static const T42Table t42Tables[nT42Tables] = { { "cvt ", true }, { "fpgm", true }, { "glyf", true }, { "head", true }, { "hhea", true }, { "hmtx", true }, + { "loca", true }, { "maxp", true }, { "prep", true }, { "vhea", false }, { "vmtx", false } }; +#define t42HeadTable 3 +#define t42LocaTable 6 +#define t42GlyfTable 2 +#define t42VheaTable 9 +#define t42VmtxTable 10 + +//------------------------------------------------------------------------ + +// Glyph names in some arbitrary standard order that Apple uses for +// their TrueType fonts. +static const char *macGlyphNames[258] = { ".notdef", + "null", + "CR", + "space", + "exclam", + "quotedbl", + "numbersign", + "dollar", + "percent", + "ampersand", + "quotesingle", + "parenleft", + "parenright", + "asterisk", + "plus", + "comma", + "hyphen", + "period", + "slash", + "zero", + "one", + "two", + "three", + "four", + "five", + "six", + "seven", + "eight", + "nine", + "colon", + "semicolon", + "less", + "equal", + "greater", + "question", + "at", + "A", + "B", + "C", + "D", + "E", + "F", + "G", + "H", + "I", + "J", + "K", + "L", + "M", + "N", + "O", + "P", + "Q", + "R", + "S", + "T", + "U", + "V", + "W", + "X", + "Y", + "Z", + "bracketleft", + "backslash", + "bracketright", + "asciicircum", + "underscore", + "grave", + "a", + "b", + "c", + "d", + "e", + "f", + "g", + "h", + "i", + "j", + "k", + "l", + "m", + "n", + "o", + "p", + "q", + "r", + "s", + "t", + "u", + "v", + "w", + "x", + "y", + "z", + "braceleft", + "bar", + "braceright", + "asciitilde", + "Adieresis", + "Aring", + "Ccedilla", + "Eacute", + "Ntilde", + "Odieresis", + "Udieresis", + "aacute", + "agrave", + "acircumflex", + "adieresis", + "atilde", + "aring", + "ccedilla", + "eacute", + "egrave", + "ecircumflex", + "edieresis", + "iacute", + "igrave", + "icircumflex", + "idieresis", + "ntilde", + "oacute", + "ograve", + "ocircumflex", + "odieresis", + "otilde", + "uacute", + "ugrave", + "ucircumflex", + "udieresis", + "dagger", + "degree", + "cent", + "sterling", + "section", + "bullet", + "paragraph", + "germandbls", + "registered", + "copyright", + "trademark", + "acute", + "dieresis", + "notequal", + "AE", + "Oslash", + "infinity", + "plusminus", + "lessequal", + "greaterequal", + "yen", + "mu", + "partialdiff", + "summation", + "product", + "pi", + "integral", + "ordfeminine", + "ordmasculine", + "Omega", + "ae", + "oslash", + "questiondown", + "exclamdown", + "logicalnot", + "radical", + "florin", + "approxequal", + "increment", + "guillemotleft", + "guillemotright", + "ellipsis", + "nbspace", + "Agrave", + "Atilde", + "Otilde", + "OE", + "oe", + "endash", + "emdash", + "quotedblleft", + "quotedblright", + "quoteleft", + "quoteright", + "divide", + "lozenge", + "ydieresis", + "Ydieresis", + "fraction", + "currency", + "guilsinglleft", + "guilsinglright", + "fi", + "fl", + "daggerdbl", + "periodcentered", + "quotesinglbase", + "quotedblbase", + "perthousand", + "Acircumflex", + "Ecircumflex", + "Aacute", + "Edieresis", + "Egrave", + "Iacute", + "Icircumflex", + "Idieresis", + "Igrave", + "Oacute", + "Ocircumflex", + "applelogo", + "Ograve", + "Uacute", + "Ucircumflex", + "Ugrave", + "dotlessi", + "circumflex", + "tilde", + "overscore", + "breve", + "dotaccent", + "ring", + "cedilla", + "hungarumlaut", + "ogonek", + "caron", + "Lslash", + "lslash", + "Scaron", + "scaron", + "Zcaron", + "zcaron", + "brokenbar", + "Eth", + "eth", + "Yacute", + "yacute", + "Thorn", + "thorn", + "minus", + "multiply", + "onesuperior", + "twosuperior", + "threesuperior", + "onehalf", + "onequarter", + "threequarters", + "franc", + "Gbreve", + "gbreve", + "Idot", + "Scedilla", + "scedilla", + "Cacute", + "cacute", + "Ccaron", + "ccaron", + "dmacron" }; + +//------------------------------------------------------------------------ +// FoFiTrueType +//------------------------------------------------------------------------ + +std::unique_ptr<FoFiTrueType> FoFiTrueType::make(const unsigned char *fileA, int lenA, int faceIndexA) +{ + // Cannot use std::make_unique, because the constructor is private + auto ff = new FoFiTrueType(fileA, lenA, false, faceIndexA); + if (!ff->parsedOk) { + delete ff; + return nullptr; + } + return std::unique_ptr<FoFiTrueType>(ff); +} + +std::unique_ptr<FoFiTrueType> FoFiTrueType::load(const char *fileName, int faceIndexA) +{ + char *fileA; + int lenA; + + if (!(fileA = FoFiBase::readFile(fileName, &lenA))) { + return nullptr; + } + // Cannot use std::make_unique, because the constructor is private + auto ff = new FoFiTrueType((unsigned char *)fileA, lenA, true, faceIndexA); + if (!ff->parsedOk) { + delete ff; + return nullptr; + } + return std::unique_ptr<FoFiTrueType>(ff); +} + +FoFiTrueType::FoFiTrueType(const unsigned char *fileA, int lenA, bool freeFileDataA, int faceIndexA) : FoFiBase(fileA, lenA, freeFileDataA) +{ + tables = nullptr; + nTables = 0; + cmaps = nullptr; + nCmaps = 0; + parsedOk = false; + faceIndex = faceIndexA; + gsubFeatureTable = 0; + gsubLookupList = 0; + + parse(); +} + +FoFiTrueType::~FoFiTrueType() +{ + gfree(tables); + gfree(cmaps); +} + +int FoFiTrueType::getNumCmaps() const +{ + return nCmaps; +} + +int FoFiTrueType::getCmapPlatform(int i) const +{ + return cmaps[i].platform; +} + +int FoFiTrueType::getCmapEncoding(int i) const +{ + return cmaps[i].encoding; +} + +int FoFiTrueType::findCmap(int platform, int encoding) const +{ + int i; + + for (i = 0; i < nCmaps; ++i) { + if (cmaps[i].platform == platform && cmaps[i].encoding == encoding) { + return i; + } + } + return -1; +} + +int FoFiTrueType::mapCodeToGID(int i, unsigned int c) const +{ + int gid; + unsigned int segCnt, segEnd, segStart, segDelta, segOffset; + unsigned int cmapFirst, cmapLen; + int pos, a, b, m; + unsigned int high, low, idx; + bool ok; + + if (i < 0 || i >= nCmaps) { + return 0; + } + ok = true; + pos = cmaps[i].offset; + switch (cmaps[i].fmt) { + case 0: + if (c + 6 >= (unsigned int)cmaps[i].len) { + return 0; + } + gid = getU8(cmaps[i].offset + 6 + c, &ok); + break; + case 2: + high = c >> 8; + low = c & 0xFFU; + idx = getU16BE(pos + 6 + high * 2, &ok); + segStart = getU16BE(pos + 6 + 512 + idx, &ok); + segCnt = getU16BE(pos + 6 + 512 + idx + 2, &ok); + segDelta = getS16BE(pos + 6 + 512 + idx + 4, &ok); + segOffset = getU16BE(pos + 6 + 512 + idx + 6, &ok); + if (low < segStart || low >= segStart + segCnt) { + gid = 0; + } else { + int val = getU16BE(pos + 6 + 512 + idx + 6 + segOffset + (low - segStart) * 2, &ok); + gid = val == 0 ? 0 : (val + segDelta) & 0xFFFFU; + } + break; + case 4: + segCnt = getU16BE(pos + 6, &ok) / 2; + a = -1; + b = segCnt - 1; + segEnd = getU16BE(pos + 14 + 2 * b, &ok); + if (c > segEnd) { + // malformed font -- the TrueType spec requires the last segEnd + // to be 0xffff + return 0; + } + // invariant: seg[a].end < code <= seg[b].end + while (b - a > 1 && ok) { + m = (a + b) / 2; + segEnd = getU16BE(pos + 14 + 2 * m, &ok); + if (segEnd < c) { + a = m; + } else { + b = m; + } + } + segStart = getU16BE(pos + 16 + 2 * segCnt + 2 * b, &ok); + segDelta = getU16BE(pos + 16 + 4 * segCnt + 2 * b, &ok); + segOffset = getU16BE(pos + 16 + 6 * segCnt + 2 * b, &ok); + if (c < segStart) { + return 0; + } + if (segOffset == 0) { + gid = (c + segDelta) & 0xffff; + } else { + gid = getU16BE(pos + 16 + 6 * segCnt + 2 * b + segOffset + 2 * (c - segStart), &ok); + if (gid != 0) { + gid = (gid + segDelta) & 0xffff; + } + } + break; + case 6: + cmapFirst = getU16BE(pos + 6, &ok); + cmapLen = getU16BE(pos + 8, &ok); + if (c < cmapFirst || c >= cmapFirst + cmapLen) { + return 0; + } + gid = getU16BE(pos + 10 + 2 * (c - cmapFirst), &ok); + break; + case 12: + case 13: + segCnt = getU32BE(pos + 12, &ok); + a = -1; + b = segCnt - 1; + segEnd = getU32BE(pos + 16 + 12 * b + 4, &ok); + if (c > segEnd) { + return 0; + } + // invariant: seg[a].end < code <= seg[b].end + while (b - a > 1 && ok) { + m = (a + b) / 2; + segEnd = getU32BE(pos + 16 + 12 * m + 4, &ok); + if (segEnd < c) { + a = m; + } else { + b = m; + } + } + segStart = getU32BE(pos + 16 + 12 * b, &ok); + segDelta = getU32BE(pos + 16 + 12 * b + 8, &ok); + if (c < segStart) { + return 0; + } + // In format 12, the glyph codes increment through + // each segment; in format 13 the same glyph code is used + // for an entire segment. + gid = segDelta + (cmaps[i].fmt == 12 ? (c - segStart) : 0); + break; + default: + return 0; + } + if (!ok) { + return 0; + } + return gid; +} + +int FoFiTrueType::mapNameToGID(const char *name) const +{ + const auto gid = nameToGID.find(name); + if (gid == nameToGID.end()) { + return 0; + } + return gid->second; +} + +bool FoFiTrueType::getCFFBlock(char **start, int *length) const +{ + int i; + + if (!openTypeCFF || !tables) { + return false; + } + i = seekTable("CFF "); + if (i < 0 || !checkRegion(tables[i].offset, tables[i].len)) { + return false; + } + *start = (char *)file + tables[i].offset; + *length = tables[i].len; + return true; +} + +int *FoFiTrueType::getCIDToGIDMap(int *nCIDs) const +{ + char *start; + int length; + FoFiType1C *ff; + int *map; + + *nCIDs = 0; + if (!getCFFBlock(&start, &length)) { + return nullptr; + } + if (!(ff = FoFiType1C::make((unsigned char *)start, length))) { + return nullptr; + } + map = ff->getCIDToGIDMap(nCIDs); + delete ff; + return map; +} + +int FoFiTrueType::getEmbeddingRights() const +{ + int i, fsType; + bool ok; + + if ((i = seekTable("OS/2")) < 0) { + return 4; + } + ok = true; + fsType = getU16BE(tables[i].offset + 8, &ok); + if (!ok) { + return 4; + } + if (fsType & 0x0008) { + return 2; + } + if (fsType & 0x0004) { + return 1; + } + if (fsType & 0x0002) { + return 0; + } + return 3; +} + +void FoFiTrueType::getFontMatrix(double *mat) const +{ + char *start; + int length; + FoFiType1C *ff; + + if (!getCFFBlock(&start, &length)) { + return; + } + if (!(ff = FoFiType1C::make((unsigned char *)start, length))) { + return; + } + ff->getFontMatrix(mat); + delete ff; +} + +void FoFiTrueType::convertToType42(const char *psName, char **encoding, int *codeToGID, FoFiOutputFunc outputFunc, void *outputStream) const +{ + int maxUsedGlyph; + bool ok; + + if (openTypeCFF) { + return; + } + + // write the header + ok = true; + std::unique_ptr<GooString> buf = GooString::format("%!PS-TrueTypeFont-{0:2g}\n", (double)getS32BE(0, &ok) / 65536.0); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + + // begin the font dictionary + (*outputFunc)(outputStream, "10 dict begin\n", 14); + (*outputFunc)(outputStream, "/FontName /", 11); + (*outputFunc)(outputStream, psName, strlen(psName)); + (*outputFunc)(outputStream, " def\n", 5); + (*outputFunc)(outputStream, "/FontType 42 def\n", 17); + (*outputFunc)(outputStream, "/FontMatrix [1 0 0 1 0 0] def\n", 30); + buf = GooString::format("/FontBBox [{0:d} {1:d} {2:d} {3:d}] def\n", bbox[0], bbox[1], bbox[2], bbox[3]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "/PaintType 0 def\n", 17); + + // write the guts of the dictionary + cvtEncoding(encoding, outputFunc, outputStream); + cvtCharStrings(encoding, codeToGID, outputFunc, outputStream); + cvtSfnts(outputFunc, outputStream, nullptr, false, &maxUsedGlyph); + + // end the dictionary and define the font + (*outputFunc)(outputStream, "FontName currentdict end definefont pop\n", 40); +} + +void FoFiTrueType::convertToType1(const char *psName, const char **newEncoding, bool ascii, FoFiOutputFunc outputFunc, void *outputStream) const +{ + char *start; + int length; + FoFiType1C *ff; + + if (!getCFFBlock(&start, &length)) { + return; + } + if (!(ff = FoFiType1C::make((unsigned char *)start, length))) { + return; + } + ff->convertToType1(psName, newEncoding, ascii, outputFunc, outputStream); + delete ff; +} + +void FoFiTrueType::convertToCIDType2(const char *psName, const int *cidMap, int nCIDs, bool needVerticalMetrics, FoFiOutputFunc outputFunc, void *outputStream) const +{ + int cid, maxUsedGlyph; + bool ok; + int i, j, k; + + if (openTypeCFF) { + return; + } + + // write the header + ok = true; + std::unique_ptr<GooString> buf = GooString::format("%!PS-TrueTypeFont-{0:2g}\n", (double)getS32BE(0, &ok) / 65536.0); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + + // begin the font dictionary + (*outputFunc)(outputStream, "20 dict begin\n", 14); + (*outputFunc)(outputStream, "/CIDFontName /", 14); + (*outputFunc)(outputStream, psName, strlen(psName)); + (*outputFunc)(outputStream, " def\n", 5); + (*outputFunc)(outputStream, "/CIDFontType 2 def\n", 19); + (*outputFunc)(outputStream, "/FontType 42 def\n", 17); + (*outputFunc)(outputStream, "/CIDSystemInfo 3 dict dup begin\n", 32); + (*outputFunc)(outputStream, " /Registry (Adobe) def\n", 24); + (*outputFunc)(outputStream, " /Ordering (Identity) def\n", 27); + (*outputFunc)(outputStream, " /Supplement 0 def\n", 20); + (*outputFunc)(outputStream, " end def\n", 10); + (*outputFunc)(outputStream, "/GDBytes 2 def\n", 15); + if (cidMap) { + buf = GooString::format("/CIDCount {0:d} def\n", nCIDs); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + if (nCIDs > 32767) { + (*outputFunc)(outputStream, "/CIDMap [", 9); + for (i = 0; i < nCIDs; i += 32768 - 16) { + (*outputFunc)(outputStream, "<\n", 2); + for (j = 0; j < 32768 - 16 && i + j < nCIDs; j += 16) { + (*outputFunc)(outputStream, " ", 2); + for (k = 0; k < 16 && i + j + k < nCIDs; ++k) { + cid = cidMap[i + j + k]; + buf = GooString::format("{0:02x}{1:02x}", (cid >> 8) & 0xff, cid & 0xff); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "\n", 1); + } + (*outputFunc)(outputStream, " >", 3); + } + (*outputFunc)(outputStream, "\n", 1); + (*outputFunc)(outputStream, "] def\n", 6); + } else { + (*outputFunc)(outputStream, "/CIDMap <\n", 10); + for (i = 0; i < nCIDs; i += 16) { + (*outputFunc)(outputStream, " ", 2); + for (j = 0; j < 16 && i + j < nCIDs; ++j) { + cid = cidMap[i + j]; + buf = GooString::format("{0:02x}{1:02x}", (cid >> 8) & 0xff, cid & 0xff); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "\n", 1); + } + (*outputFunc)(outputStream, "> def\n", 6); + } + } else { + // direct mapping - just fill the string(s) with s[i]=i + buf = GooString::format("/CIDCount {0:d} def\n", nGlyphs); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + if (nGlyphs > 32767) { + (*outputFunc)(outputStream, "/CIDMap [\n", 10); + for (i = 0; i < nGlyphs; i += 32767) { + j = nGlyphs - i < 32767 ? nGlyphs - i : 32767; + buf = GooString::format(" {0:d} string 0 1 {1:d} {{\n", 2 * j, j - 1); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + buf = GooString::format(" 2 copy dup 2 mul exch {0:d} add -8 bitshift put\n", i); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + buf = GooString::format(" 1 index exch dup 2 mul 1 add exch {0:d} add" + " 255 and put\n", + i); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, " } for\n", 8); + } + (*outputFunc)(outputStream, "] def\n", 6); + } else { + buf = GooString::format("/CIDMap {0:d} string\n", 2 * nGlyphs); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + buf = GooString::format(" 0 1 {0:d} {{\n", nGlyphs - 1); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, " 2 copy dup 2 mul exch -8 bitshift put\n", 42); + (*outputFunc)(outputStream, " 1 index exch dup 2 mul 1 add exch 255 and put\n", 50); + (*outputFunc)(outputStream, " } for\n", 8); + (*outputFunc)(outputStream, "def\n", 4); + } + } + (*outputFunc)(outputStream, "/FontMatrix [1 0 0 1 0 0] def\n", 30); + buf = GooString::format("/FontBBox [{0:d} {1:d} {2:d} {3:d}] def\n", bbox[0], bbox[1], bbox[2], bbox[3]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "/PaintType 0 def\n", 17); + (*outputFunc)(outputStream, "/Encoding [] readonly def\n", 26); + (*outputFunc)(outputStream, "/CharStrings 1 dict dup begin\n", 30); + (*outputFunc)(outputStream, " /.notdef 0 def\n", 17); + (*outputFunc)(outputStream, " end readonly def\n", 19); + + // write the guts of the dictionary + cvtSfnts(outputFunc, outputStream, nullptr, needVerticalMetrics, &maxUsedGlyph); + + // end the dictionary and define the font + (*outputFunc)(outputStream, "CIDFontName currentdict end /CIDFont defineresource pop\n", 56); +} + +void FoFiTrueType::convertToCIDType0(const char *psName, int *cidMap, int nCIDs, FoFiOutputFunc outputFunc, void *outputStream) const +{ + char *start; + int length; + FoFiType1C *ff; + + if (!getCFFBlock(&start, &length)) { + return; + } + if (!(ff = FoFiType1C::make((unsigned char *)start, length))) { + return; + } + ff->convertToCIDType0(psName, cidMap, nCIDs, outputFunc, outputStream); + delete ff; +} + +void FoFiTrueType::convertToType0(const char *psName, int *cidMap, int nCIDs, bool needVerticalMetrics, int *maxValidGlyph, FoFiOutputFunc outputFunc, void *outputStream) const +{ + GooString *sfntsName; + int maxUsedGlyph, n, i, j; + + *maxValidGlyph = -1; + + if (openTypeCFF) { + return; + } + + // write the Type 42 sfnts array + sfntsName = (new GooString(psName))->append("_sfnts"); + cvtSfnts(outputFunc, outputStream, sfntsName, needVerticalMetrics, &maxUsedGlyph); + delete sfntsName; + + // write the descendant Type 42 fonts + // (The following is a kludge: nGlyphs is the glyph count from the + // maxp table; maxUsedGlyph is the max glyph number that has a + // non-zero-length description, from the loca table. The problem is + // that some TrueType font subsets fail to change the glyph count, + // i.e., nGlyphs is much larger than maxUsedGlyph+1, which results + // in an unnecessarily huge Type 0 font. But some other PDF files + // have fonts with only zero or one used glyph, and a content stream + // that refers to one of the unused glyphs -- this results in PS + // errors if we simply use maxUsedGlyph+1 for the Type 0 font. So + // we compromise by always defining at least 256 glyphs.) + // Some fonts have a large nGlyphs but maxUsedGlyph of 0. + // These fonts might reference any glyph. + // Return the last written glyph number in maxValidGlyph. + // PSOutputDev::drawString() can use maxValidGlyph to avoid + // referencing zero-length glyphs that we trimmed. + // This allows pdftops to avoid writing huge files while still + // handling the rare PDF that uses a zero-length glyph. + if (cidMap) { + n = nCIDs; + } else if (nGlyphs > maxUsedGlyph + 256) { + if (maxUsedGlyph <= 255) { + n = 256; + } else { + n = maxUsedGlyph + 1; + } + } else { + n = nGlyphs; + } + *maxValidGlyph = n - 1; + for (i = 0; i < n; i += 256) { + (*outputFunc)(outputStream, "10 dict begin\n", 14); + (*outputFunc)(outputStream, "/FontName /", 11); + (*outputFunc)(outputStream, psName, strlen(psName)); + std::unique_ptr<GooString> buf = GooString::format("_{0:02x} def\n", i >> 8); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "/FontType 42 def\n", 17); + (*outputFunc)(outputStream, "/FontMatrix [1 0 0 1 0 0] def\n", 30); + buf = GooString::format("/FontBBox [{0:d} {1:d} {2:d} {3:d}] def\n", bbox[0], bbox[1], bbox[2], bbox[3]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "/PaintType 0 def\n", 17); + (*outputFunc)(outputStream, "/sfnts ", 7); + (*outputFunc)(outputStream, psName, strlen(psName)); + (*outputFunc)(outputStream, "_sfnts def\n", 11); + (*outputFunc)(outputStream, "/Encoding 256 array\n", 20); + for (j = 0; j < 256 && i + j < n; ++j) { + buf = GooString::format("dup {0:d} /c{1:02x} put\n", j, j); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "readonly def\n", 13); + (*outputFunc)(outputStream, "/CharStrings 257 dict dup begin\n", 32); + (*outputFunc)(outputStream, "/.notdef 0 def\n", 15); + for (j = 0; j < 256 && i + j < n; ++j) { + buf = GooString::format("/c{0:02x} {1:d} def\n", j, cidMap ? cidMap[i + j] : i + j); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "end readonly def\n", 17); + (*outputFunc)(outputStream, "FontName currentdict end definefont pop\n", 40); + } + + // write the Type 0 parent font + (*outputFunc)(outputStream, "16 dict begin\n", 14); + (*outputFunc)(outputStream, "/FontName /", 11); + (*outputFunc)(outputStream, psName, strlen(psName)); + (*outputFunc)(outputStream, " def\n", 5); + (*outputFunc)(outputStream, "/FontType 0 def\n", 16); + (*outputFunc)(outputStream, "/FontMatrix [1 0 0 1 0 0] def\n", 30); + (*outputFunc)(outputStream, "/FMapType 2 def\n", 16); + (*outputFunc)(outputStream, "/Encoding [\n", 12); + for (i = 0; i < n; i += 256) { + const std::unique_ptr<GooString> buf = GooString::format("{0:d}\n", i >> 8); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "] def\n", 6); + (*outputFunc)(outputStream, "/FDepVector [\n", 14); + for (i = 0; i < n; i += 256) { + (*outputFunc)(outputStream, "/", 1); + (*outputFunc)(outputStream, psName, strlen(psName)); + const std::unique_ptr<GooString> buf = GooString::format("_{0:02x} findfont\n", i >> 8); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "] def\n", 6); + (*outputFunc)(outputStream, "FontName currentdict end definefont pop\n", 40); +} + +void FoFiTrueType::convertToType0(const char *psName, int *cidMap, int nCIDs, FoFiOutputFunc outputFunc, void *outputStream) const +{ + char *start; + int length; + FoFiType1C *ff; + + if (!getCFFBlock(&start, &length)) { + return; + } + if (!(ff = FoFiType1C::make((unsigned char *)start, length))) { + return; + } + ff->convertToType0(psName, cidMap, nCIDs, outputFunc, outputStream); + delete ff; +} + +void FoFiTrueType::cvtEncoding(char **encoding, FoFiOutputFunc outputFunc, void *outputStream) const +{ + const char *name; + int i; + + (*outputFunc)(outputStream, "/Encoding 256 array\n", 20); + if (encoding) { + for (i = 0; i < 256; ++i) { + if (!(name = encoding[i])) { + name = ".notdef"; + } + const std::unique_ptr<GooString> buf = GooString::format("dup {0:d} /", i); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, name, strlen(name)); + (*outputFunc)(outputStream, " put\n", 5); + } + } else { + for (i = 0; i < 256; ++i) { + const std::unique_ptr<GooString> buf = GooString::format("dup {0:d} /c{1:02x} put\n", i, i); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + } + (*outputFunc)(outputStream, "readonly def\n", 13); +} + +void FoFiTrueType::cvtCharStrings(char **encoding, const int *codeToGID, FoFiOutputFunc outputFunc, void *outputStream) const +{ + const char *name; + char buf2[16]; + int i, k; + + // always define '.notdef' + (*outputFunc)(outputStream, "/CharStrings 256 dict dup begin\n", 32); + (*outputFunc)(outputStream, "/.notdef 0 def\n", 15); + + // if there's no 'cmap' table, punt + if (nCmaps == 0) { + goto err; + } + + // map char name to glyph index: + // 1. use encoding to map name to char code + // 2. use codeToGID to map char code to glyph index + // N.B. We do this in reverse order because font subsets can have + // weird encodings that use the same character name twice, and + // the first definition is probably the one we want. + k = 0; // make gcc happy + for (i = 255; i >= 0; --i) { + if (encoding) { + name = encoding[i]; + } else { + sprintf(buf2, "c%02x", i); + name = buf2; + } + if (name && strcmp(name, ".notdef")) { + k = codeToGID[i]; + // note: Distiller (maybe Adobe's PS interpreter in general) + // doesn't like TrueType fonts that have CharStrings entries + // which point to nonexistent glyphs, hence the (k < nGlyphs) + // test + if (k > 0 && k < nGlyphs) { + (*outputFunc)(outputStream, "/", 1); + (*outputFunc)(outputStream, name, strlen(name)); + const std::unique_ptr<GooString> buf = GooString::format(" {0:d} def\n", k); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + } + } + +err: + (*outputFunc)(outputStream, "end readonly def\n", 17); +} + +void FoFiTrueType::cvtSfnts(FoFiOutputFunc outputFunc, void *outputStream, const GooString *name, bool needVerticalMetrics, int *maxUsedGlyph) const +{ + unsigned char headData[54]; + TrueTypeLoca *locaTable; + unsigned char *locaData; + TrueTypeTable newTables[nT42Tables]; + unsigned char tableDir[12 + nT42Tables * 16]; + bool ok; + unsigned int checksum; + int nNewTables; + int glyfTableLen, length, pos, glyfPos, i, j, k, vmtxTabLength; + unsigned char vheaTab[36] = { + 0, 1, 0, 0, // table version number + 0, 0, // ascent + 0, 0, // descent + 0, 0, // reserved + 0, 0, // max advance height + 0, 0, // min top side bearing + 0, 0, // min bottom side bearing + 0, 0, // y max extent + 0, 0, // caret slope rise + 0, 1, // caret slope run + 0, 0, // caret offset + 0, 0, // reserved + 0, 0, // reserved + 0, 0, // reserved + 0, 0, // reserved + 0, 0, // metric data format + 0, 1 // number of advance heights in vmtx table + }; + unsigned char *vmtxTab; + bool needVhea, needVmtx; + int advance; + + *maxUsedGlyph = -1; + + // construct the 'head' table, zero out the font checksum + i = seekTable("head"); + if (i < 0 || i >= nTables) { + return; + } + pos = tables[i].offset; + if (!checkRegion(pos, 54)) { + return; + } + memcpy(headData, file + pos, 54); + headData[8] = headData[9] = headData[10] = headData[11] = (unsigned char)0; + + // check for a bogus loca format field in the 'head' table + // (I've encountered fonts with loca format set to 0x0100 instead of 0x0001) + if (locaFmt != 0 && locaFmt != 1) { + headData[50] = 0; + headData[51] = 1; + } + + // read the original 'loca' table, pad entries out to 4 bytes, and + // sort it into proper order -- some (non-compliant) fonts have + // out-of-order loca tables; in order to correctly handle the case + // where (compliant) fonts have empty entries in the middle of the + // table, cmpTrueTypeLocaOffset uses offset as its primary sort key, + // and idx as its secondary key (ensuring that adjacent entries with + // the same pos value remain in the same order) + locaTable = (TrueTypeLoca *)gmallocn(nGlyphs + 1, sizeof(TrueTypeLoca)); + i = seekTable("loca"); + pos = tables[i].offset; + i = seekTable("glyf"); + glyfTableLen = tables[i].len; + ok = true; + for (i = 0; i <= nGlyphs; ++i) { + locaTable[i].idx = i; + if (locaFmt) { + locaTable[i].origOffset = (int)getU32BE(pos + i * 4, &ok); + } else { + locaTable[i].origOffset = 2 * getU16BE(pos + i * 2, &ok); + } + if (locaTable[i].origOffset > glyfTableLen) { + locaTable[i].origOffset = glyfTableLen; + } + } + std::sort(locaTable, locaTable + nGlyphs + 1, cmpTrueTypeLocaOffsetFunctor()); + for (i = 0; i < nGlyphs; ++i) { + locaTable[i].len = locaTable[i + 1].origOffset - locaTable[i].origOffset; + } + locaTable[nGlyphs].len = 0; + std::sort(locaTable, locaTable + nGlyphs + 1, cmpTrueTypeLocaIdxFunctor()); + pos = 0; + for (i = 0; i <= nGlyphs; ++i) { + locaTable[i].newOffset = pos; + + int newPos; + if (unlikely(checkedAdd(pos, locaTable[i].len, &newPos))) { + ok = false; + } else { + pos = newPos; + if (pos & 3) { + pos += 4 - (pos & 3); + } + } + if (locaTable[i].len > 0) { + *maxUsedGlyph = i; + } + } + + // construct the new 'loca' table + locaData = (unsigned char *)gmallocn(nGlyphs + 1, (locaFmt ? 4 : 2)); + for (i = 0; i <= nGlyphs; ++i) { + pos = locaTable[i].newOffset; + if (locaFmt) { + locaData[4 * i] = (unsigned char)(pos >> 24); + locaData[4 * i + 1] = (unsigned char)(pos >> 16); + locaData[4 * i + 2] = (unsigned char)(pos >> 8); + locaData[4 * i + 3] = (unsigned char)pos; + } else { + locaData[2 * i] = (unsigned char)(pos >> 9); + locaData[2 * i + 1] = (unsigned char)(pos >> 1); + } + } + + // count the number of tables + nNewTables = 0; + for (i = 0; i < nT42Tables; ++i) { + if (t42Tables[i].required || seekTable(t42Tables[i].tag) >= 0) { + ++nNewTables; + } + } + vmtxTab = nullptr; // make gcc happy + vmtxTabLength = 0; + advance = 0; // make gcc happy + if (needVerticalMetrics) { + needVhea = seekTable("vhea") < 0; + needVmtx = seekTable("vmtx") < 0; + if (needVhea || needVmtx) { + i = seekTable("head"); + advance = getU16BE(tables[i].offset + 18, &ok); // units per em + if (needVhea) { + ++nNewTables; + } + if (needVmtx) { + ++nNewTables; + } + } + } + + // construct the new table headers, including table checksums + // (pad each table out to a multiple of 4 bytes) + pos = 12 + nNewTables * 16; + k = 0; + for (i = 0; i < nT42Tables; ++i) { + length = -1; + checksum = 0; // make gcc happy + if (i == t42HeadTable) { + length = 54; + checksum = computeTableChecksum(headData, 54); + } else if (i == t42LocaTable) { + length = (nGlyphs + 1) * (locaFmt ? 4 : 2); + checksum = computeTableChecksum(locaData, length); + } else if (i == t42GlyfTable) { + length = 0; + checksum = 0; + glyfPos = tables[seekTable("glyf")].offset; + for (j = 0; j < nGlyphs; ++j) { + length += locaTable[j].len; + if (length & 3) { + length += 4 - (length & 3); + } + if (checkRegion(glyfPos + locaTable[j].origOffset, locaTable[j].len)) { + checksum += computeTableChecksum(file + glyfPos + locaTable[j].origOffset, locaTable[j].len); + } + } + } else { + if ((j = seekTable(t42Tables[i].tag)) >= 0) { + length = tables[j].len; + if (checkRegion(tables[j].offset, length)) { + checksum = computeTableChecksum(file + tables[j].offset, length); + } + } else if (needVerticalMetrics && i == t42VheaTable) { + vheaTab[10] = advance / 256; // max advance height + vheaTab[11] = advance % 256; + length = sizeof(vheaTab); + checksum = computeTableChecksum(vheaTab, length); + } else if (needVerticalMetrics && i == t42VmtxTable) { + length = 4 + (nGlyphs - 1) * 2; + vmtxTabLength = length; + vmtxTab = (unsigned char *)gmalloc(length); + vmtxTab[0] = advance / 256; + vmtxTab[1] = advance % 256; + for (j = 2; j < length; j += 2) { + vmtxTab[j] = 0; + vmtxTab[j + 1] = 0; + } + checksum = computeTableChecksum(vmtxTab, length); + } else if (t42Tables[i].required) { + //~ error(-1, "Embedded TrueType font is missing a required table ('%s')", + //~ t42Tables[i].tag); + length = 0; + checksum = 0; + } + } + if (length >= 0) { + newTables[k].tag = ((t42Tables[i].tag[0] & 0xff) << 24) | ((t42Tables[i].tag[1] & 0xff) << 16) | ((t42Tables[i].tag[2] & 0xff) << 8) | (t42Tables[i].tag[3] & 0xff); + newTables[k].checksum = checksum; + newTables[k].offset = pos; + newTables[k].len = length; + int newPos; + if (unlikely(checkedAdd(pos, length, &newPos))) { + ok = false; + } else { + pos = newPos; + if (pos & 3) { + pos += 4 - (length & 3); + } + } + ++k; + } + } + if (unlikely(k < nNewTables)) { + error(errSyntaxWarning, -1, "unexpected number of tables"); + nNewTables = k; + } + + // construct the table directory + tableDir[0] = 0x00; // sfnt version + tableDir[1] = 0x01; + tableDir[2] = 0x00; + tableDir[3] = 0x00; + tableDir[4] = 0; // numTables + tableDir[5] = nNewTables; + tableDir[6] = 0; // searchRange + tableDir[7] = (unsigned char)128; + tableDir[8] = 0; // entrySelector + tableDir[9] = 3; + tableDir[10] = 0; // rangeShift + tableDir[11] = (unsigned char)(16 * nNewTables - 128); + pos = 12; + for (i = 0; i < nNewTables; ++i) { + tableDir[pos] = (unsigned char)(newTables[i].tag >> 24); + tableDir[pos + 1] = (unsigned char)(newTables[i].tag >> 16); + tableDir[pos + 2] = (unsigned char)(newTables[i].tag >> 8); + tableDir[pos + 3] = (unsigned char)newTables[i].tag; + tableDir[pos + 4] = (unsigned char)(newTables[i].checksum >> 24); + tableDir[pos + 5] = (unsigned char)(newTables[i].checksum >> 16); + tableDir[pos + 6] = (unsigned char)(newTables[i].checksum >> 8); + tableDir[pos + 7] = (unsigned char)newTables[i].checksum; + tableDir[pos + 8] = (unsigned char)(newTables[i].offset >> 24); + tableDir[pos + 9] = (unsigned char)(newTables[i].offset >> 16); + tableDir[pos + 10] = (unsigned char)(newTables[i].offset >> 8); + tableDir[pos + 11] = (unsigned char)newTables[i].offset; + tableDir[pos + 12] = (unsigned char)(newTables[i].len >> 24); + tableDir[pos + 13] = (unsigned char)(newTables[i].len >> 16); + tableDir[pos + 14] = (unsigned char)(newTables[i].len >> 8); + tableDir[pos + 15] = (unsigned char)newTables[i].len; + pos += 16; + } + + // compute the font checksum and store it in the head table + checksum = computeTableChecksum(tableDir, 12 + nNewTables * 16); + for (i = 0; i < nNewTables; ++i) { + checksum += newTables[i].checksum; + } + checksum = 0xb1b0afba - checksum; // because the TrueType spec says so + headData[8] = (unsigned char)(checksum >> 24); + headData[9] = (unsigned char)(checksum >> 16); + headData[10] = (unsigned char)(checksum >> 8); + headData[11] = (unsigned char)checksum; + + // start the sfnts array + if (name) { + (*outputFunc)(outputStream, "/", 1); + (*outputFunc)(outputStream, name->c_str(), name->getLength()); + (*outputFunc)(outputStream, " [\n", 3); + } else { + (*outputFunc)(outputStream, "/sfnts [\n", 9); + } + + // write the table directory + dumpString(tableDir, 12 + nNewTables * 16, outputFunc, outputStream); + + // write the tables + for (i = 0; i < nNewTables; ++i) { + if (i == t42HeadTable) { + dumpString(headData, 54, outputFunc, outputStream); + } else if (i == t42LocaTable) { + length = (nGlyphs + 1) * (locaFmt ? 4 : 2); + dumpString(locaData, length, outputFunc, outputStream); + } else if (i == t42GlyfTable) { + glyfPos = tables[seekTable("glyf")].offset; + for (j = 0; j < nGlyphs; ++j) { + if (locaTable[j].len > 0 && checkRegion(glyfPos + locaTable[j].origOffset, locaTable[j].len)) { + dumpString(file + glyfPos + locaTable[j].origOffset, locaTable[j].len, outputFunc, outputStream); + } + } + } else { + // length == 0 means the table is missing and the error was + // already reported during the construction of the table + // headers + if ((length = newTables[i].len) > 0) { + if ((j = seekTable(t42Tables[i].tag)) >= 0 && checkRegion(tables[j].offset, tables[j].len)) { + dumpString(file + tables[j].offset, tables[j].len, outputFunc, outputStream); + } else if (needVerticalMetrics && i == t42VheaTable) { + if (unlikely(length > (int)sizeof(vheaTab))) { + error(errSyntaxWarning, -1, "length bigger than vheaTab size"); + length = sizeof(vheaTab); + } + dumpString(vheaTab, length, outputFunc, outputStream); + } else if (needVerticalMetrics && i == t42VmtxTable) { + if (unlikely(length > vmtxTabLength)) { + error(errSyntaxWarning, -1, "length bigger than vmtxTab size"); + length = vmtxTabLength; + } + dumpString(vmtxTab, length, outputFunc, outputStream); + } + } + } + } + + // end the sfnts array + (*outputFunc)(outputStream, "] def\n", 6); + + gfree(locaData); + gfree(locaTable); + if (vmtxTab) { + gfree(vmtxTab); + } +} + +void FoFiTrueType::dumpString(const unsigned char *s, int length, FoFiOutputFunc outputFunc, void *outputStream) const +{ + int pad, i, j; + + (*outputFunc)(outputStream, "<", 1); + for (i = 0; i < length; i += 32) { + for (j = 0; j < 32 && i + j < length; ++j) { + const std::unique_ptr<GooString> buf = GooString::format("{0:02x}", s[i + j] & 0xff); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + if (i % (65536 - 32) == 65536 - 64) { + (*outputFunc)(outputStream, ">\n<", 3); + } else if (i + 32 < length) { + (*outputFunc)(outputStream, "\n", 1); + } + } + if (length & 3) { + pad = 4 - (length & 3); + for (i = 0; i < pad; ++i) { + (*outputFunc)(outputStream, "00", 2); + } + } + // add an extra zero byte because the Adobe Type 42 spec says so + (*outputFunc)(outputStream, "00>\n", 4); +} + +unsigned int FoFiTrueType::computeTableChecksum(const unsigned char *data, int length) const +{ + unsigned int checksum, word; + int i; + + checksum = 0; + for (i = 0; i + 3 < length; i += 4) { + word = ((data[i] & 0xff) << 24) + ((data[i + 1] & 0xff) << 16) + ((data[i + 2] & 0xff) << 8) + (data[i + 3] & 0xff); + checksum += word; + } + if (length & 3) { + word = 0; + i = length & ~3; + switch (length & 3) { + case 3: + word |= (data[i + 2] & 0xff) << 8; + // fallthrough + case 2: + word |= (data[i + 1] & 0xff) << 16; + // fallthrough + case 1: + word |= (data[i] & 0xff) << 24; + break; + } + checksum += word; + } + return checksum; +} + +void FoFiTrueType::parse() +{ + unsigned int topTag; + int pos, ver, i, j; + + parsedOk = true; + + // look for a collection (TTC) + topTag = getU32BE(0, &parsedOk); + if (!parsedOk) { + return; + } + if (topTag == ttcfTag) { + /* TTC font */ + int dircount; + + dircount = getU32BE(8, &parsedOk); + if (!parsedOk) { + return; + } + if (!dircount) { + parsedOk = false; + return; + } + + if (faceIndex >= dircount) { + faceIndex = 0; + } + pos = getU32BE(12 + faceIndex * 4, &parsedOk); + if (!parsedOk) { + return; + } + } else { + pos = 0; + } + + // check the sfnt version + ver = getU32BE(pos, &parsedOk); + if (!parsedOk) { + return; + } + openTypeCFF = ver == 0x4f54544f; // 'OTTO' + + // read the table directory + nTables = getU16BE(pos + 4, &parsedOk); + if (!parsedOk) { + return; + } + tables = (TrueTypeTable *)gmallocn(nTables, sizeof(TrueTypeTable)); + pos += 12; + j = 0; + for (i = 0; i < nTables; ++i) { + tables[j].tag = getU32BE(pos, &parsedOk); + tables[j].checksum = getU32BE(pos + 4, &parsedOk); + tables[j].offset = (int)getU32BE(pos + 8, &parsedOk); + tables[j].len = (int)getU32BE(pos + 12, &parsedOk); + if (unlikely((tables[j].offset < 0) || (tables[j].len < 0) || (tables[j].offset < INT_MAX - tables[j].len) || (tables[j].len > INT_MAX - tables[j].offset) + || (tables[j].offset + tables[j].len >= tables[j].offset && tables[j].offset + tables[j].len <= len))) { + // ignore any bogus entries in the table directory + ++j; + } + pos += 16; + } + if (nTables != j) { + nTables = j; + tables = (TrueTypeTable *)greallocn_checkoverflow(tables, nTables, sizeof(TrueTypeTable)); + } + if (!parsedOk || tables == nullptr) { + parsedOk = false; + return; + } + + // check for tables that are required by both the TrueType spec and + // the Type 42 spec + if (seekTable("head") < 0 || seekTable("hhea") < 0 || seekTable("maxp") < 0 || (!openTypeCFF && seekTable("loca") < 0) || (!openTypeCFF && seekTable("glyf") < 0) || (openTypeCFF && (seekTable("CFF ") < 0 && seekTable("CFF2") < 0))) { + parsedOk = false; + return; + } + + // read the cmaps + if ((i = seekTable("cmap")) >= 0) { + pos = tables[i].offset + 2; + nCmaps = getU16BE(pos, &parsedOk); + pos += 2; + if (!parsedOk) { + return; + } + cmaps = (TrueTypeCmap *)gmallocn(nCmaps, sizeof(TrueTypeCmap)); + for (j = 0; j < nCmaps; ++j) { + cmaps[j].platform = getU16BE(pos, &parsedOk); + cmaps[j].encoding = getU16BE(pos + 2, &parsedOk); + cmaps[j].offset = tables[i].offset + getU32BE(pos + 4, &parsedOk); + pos += 8; + cmaps[j].fmt = getU16BE(cmaps[j].offset, &parsedOk); + cmaps[j].len = getU16BE(cmaps[j].offset + 2, &parsedOk); + } + if (!parsedOk) { + return; + } + } else { + nCmaps = 0; + } + + // get the number of glyphs from the maxp table + i = seekTable("maxp"); + nGlyphs = getU16BE(tables[i].offset + 4, &parsedOk); + if (!parsedOk) { + return; + } + + // get the bbox and loca table format from the head table + i = seekTable("head"); + bbox[0] = getS16BE(tables[i].offset + 36, &parsedOk); + bbox[1] = getS16BE(tables[i].offset + 38, &parsedOk); + bbox[2] = getS16BE(tables[i].offset + 40, &parsedOk); + bbox[3] = getS16BE(tables[i].offset + 42, &parsedOk); + locaFmt = getS16BE(tables[i].offset + 50, &parsedOk); + if (!parsedOk) { + return; + } + + // read the post table + readPostTable(); +} + +void FoFiTrueType::readPostTable() +{ + std::string name; + int tablePos, postFmt, stringIdx, stringPos; + bool ok; + int i, j, n, m; + + ok = true; + if ((i = seekTable("post")) < 0) { + return; + } + tablePos = tables[i].offset; + postFmt = getU32BE(tablePos, &ok); + if (!ok) { + goto err; + } + if (postFmt == 0x00010000) { + nameToGID.reserve(258); + for (i = 0; i < 258; ++i) { + nameToGID.emplace(macGlyphNames[i], i); + } + } else if (postFmt == 0x00020000) { + nameToGID.reserve(258); + n = getU16BE(tablePos + 32, &ok); + if (!ok) { + goto err; + } + if (n > nGlyphs) { + n = nGlyphs; + } + stringIdx = 0; + stringPos = tablePos + 34 + 2 * n; + for (i = 0; i < n; ++i) { + ok = true; + j = getU16BE(tablePos + 34 + 2 * i, &ok); + if (j < 258) { + nameToGID[macGlyphNames[j]] = i; + } else { + j -= 258; + if (j != stringIdx) { + for (stringIdx = 0, stringPos = tablePos + 34 + 2 * n; stringIdx < j; ++stringIdx, stringPos += 1 + getU8(stringPos, &ok)) { + ; + } + if (!ok) { + continue; + } + } + m = getU8(stringPos, &ok); + if (!ok || !checkRegion(stringPos + 1, m)) { + continue; + } + name.assign((char *)&file[stringPos + 1], m); + nameToGID[name] = i; + ++stringIdx; + stringPos += 1 + m; + } + } + } else if (postFmt == 0x00028000) { + nameToGID.reserve(258); + for (i = 0; i < nGlyphs; ++i) { + j = getU8(tablePos + 32 + i, &ok); + if (!ok) { + continue; + } + if (j < 258) { + nameToGID[macGlyphNames[j]] = i; + } + } + } + + return; + +err: + nameToGID.clear(); +} + +int FoFiTrueType::seekTable(const char *tag) const +{ + unsigned int tagI; + int i; + + tagI = ((tag[0] & 0xff) << 24) | ((tag[1] & 0xff) << 16) | ((tag[2] & 0xff) << 8) | (tag[3] & 0xff); + for (i = 0; i < nTables; ++i) { + if (tables[i].tag == tagI) { + return i; + } + } + return -1; +} + +unsigned int FoFiTrueType::charToTag(const char *tagName) +{ + int n = strlen(tagName); + unsigned int tag = 0; + int i; + + if (n > 4) { + n = 4; + } + for (i = 0; i < n; i++) { + tag <<= 8; + tag |= tagName[i] & 0xff; + } + for (; i < 4; i++) { + tag <<= 8; + tag |= ' '; + } + return tag; +} + +/* + setup GSUB table data + Only supporting vertical text substitution. +*/ +int FoFiTrueType::setupGSUB(const char *scriptName) +{ + return setupGSUB(scriptName, nullptr); +} + +/* + setup GSUB table data + Only supporting vertical text substitution. +*/ +int FoFiTrueType::setupGSUB(const char *scriptName, const char *languageName) +{ + unsigned int gsubTable; + unsigned int i; + unsigned int scriptList, featureList; + unsigned int scriptCount; + unsigned int tag; + unsigned int scriptTable = 0; + unsigned int langSys; + unsigned int featureCount; + unsigned int featureIndex; + unsigned int ftable = 0; + unsigned int llist; + unsigned int scriptTag; + int x; + unsigned int pos; + + if (scriptName == nullptr) { + gsubFeatureTable = 0; + return 0; + } + scriptTag = charToTag(scriptName); + /* read GSUB Header */ + if ((x = seekTable("GSUB")) < 0) { + return 0; /* GSUB table not found */ + } + gsubTable = tables[x].offset; + pos = gsubTable + 4; + scriptList = getU16BE(pos, &parsedOk); + pos += 2; + featureList = getU16BE(pos, &parsedOk); + pos += 2; + llist = getU16BE(pos, &parsedOk); + + gsubLookupList = llist + gsubTable; /* change to offset from top of file */ + /* read script list table */ + pos = gsubTable + scriptList; + scriptCount = getU16BE(pos, &parsedOk); + pos += 2; + /* find script */ + for (i = 0; i < scriptCount; i++) { + tag = getU32BE(pos, &parsedOk); + pos += 4; + scriptTable = getU16BE(pos, &parsedOk); + pos += 2; + if (tag == scriptTag) { + /* found */ + break; + } + } + if (i >= scriptCount) { + /* not found */ + return 0; + } + + /* read script table */ + /* use default language system */ + pos = gsubTable + scriptList + scriptTable; + langSys = 0; + if (languageName) { + unsigned int langTag = charToTag(languageName); + unsigned int langCount = getU16BE(pos + 2, &parsedOk); + for (i = 0; i < langCount && langSys == 0; i++) { + tag = getU32BE(pos + 4 + i * (4 + 2), &parsedOk); + if (tag == langTag) { + langSys = getU16BE(pos + 4 + i * (4 + 2) + 4, &parsedOk); + } + } + } + if (langSys == 0) { + /* default language system */ + langSys = getU16BE(pos, &parsedOk); + } + + /* read LangSys table */ + if (langSys == 0) { + /* no default LangSys */ + return 0; + } + + pos = gsubTable + scriptList + scriptTable + langSys + 2; + featureIndex = getU16BE(pos, &parsedOk); /* ReqFeatureIndex */ + pos += 2; + + if (featureIndex != 0xffff) { + unsigned int tpos; + /* read feature record */ + tpos = gsubTable + featureList; + featureCount = getU16BE(tpos, &parsedOk); + tpos = gsubTable + featureList + 2 + featureIndex * (4 + 2); + tag = getU32BE(tpos, &parsedOk); + tpos += 4; + if (tag == vrt2Tag) { + /* vrt2 is preferred, overwrite vert */ + ftable = getU16BE(tpos, &parsedOk); + /* convert to offset from file top */ + gsubFeatureTable = ftable + gsubTable + featureList; + return 0; + } else if (tag == vertTag) { + ftable = getU16BE(tpos, &parsedOk); + } + } + featureCount = getU16BE(pos, &parsedOk); + pos += 2; + /* find 'vrt2' or 'vert' feature */ + for (i = 0; i < featureCount; i++) { + unsigned int oldPos; + + featureIndex = getU16BE(pos, &parsedOk); + pos += 2; + oldPos = pos; /* save position */ + /* read feature record */ + pos = gsubTable + featureList + 2 + featureIndex * (4 + 2); + tag = getU32BE(pos, &parsedOk); + pos += 4; + if (tag == vrt2Tag) { + /* vrt2 is preferred, overwrite vert */ + ftable = getU16BE(pos, &parsedOk); + break; + } else if (ftable == 0 && tag == vertTag) { + ftable = getU16BE(pos, &parsedOk); + } + pos = oldPos; /* restore old position */ + } + if (ftable == 0) { + /* vert nor vrt2 are not found */ + return 0; + } + /* convert to offset from file top */ + gsubFeatureTable = ftable + gsubTable + featureList; + return 0; +} + +unsigned int FoFiTrueType::doMapToVertGID(unsigned int orgGID) +{ + unsigned int lookupCount; + unsigned int lookupListIndex; + unsigned int i; + unsigned int gid = 0; + unsigned int pos; + + pos = gsubFeatureTable + 2; + lookupCount = getU16BE(pos, &parsedOk); + pos += 2; + for (i = 0; i < lookupCount; i++) { + lookupListIndex = getU16BE(pos, &parsedOk); + pos += 2; + if ((gid = scanLookupList(lookupListIndex, orgGID)) != 0) { + break; + } + } + return gid; +} + +unsigned int FoFiTrueType::mapToVertGID(unsigned int orgGID) +{ + unsigned int mapped; + + if (gsubFeatureTable == 0) { + return orgGID; + } + if ((mapped = doMapToVertGID(orgGID)) != 0) { + return mapped; + } + return orgGID; +} + +unsigned int FoFiTrueType::scanLookupList(unsigned int listIndex, unsigned int orgGID) +{ + unsigned int lookupTable; + unsigned int subTableCount; + unsigned int subTable; + unsigned int i; + unsigned int gid = 0; + unsigned int pos; + + if (gsubLookupList == 0) { + return 0; /* no lookup list */ + } + pos = gsubLookupList + 2 + listIndex * 2; + lookupTable = getU16BE(pos, &parsedOk); + /* read lookup table */ + pos = gsubLookupList + lookupTable + 4; + subTableCount = getU16BE(pos, &parsedOk); + pos += 2; + ; + for (i = 0; i < subTableCount; i++) { + subTable = getU16BE(pos, &parsedOk); + pos += 2; + if ((gid = scanLookupSubTable(gsubLookupList + lookupTable + subTable, orgGID)) != 0) { + break; + } + } + return gid; +} + +unsigned int FoFiTrueType::scanLookupSubTable(unsigned int subTable, unsigned int orgGID) +{ + unsigned int format; + unsigned int coverage; + int delta; + int glyphCount; + unsigned int substitute; + unsigned int gid = 0; + int coverageIndex; + int pos; + + pos = subTable; + format = getU16BE(pos, &parsedOk); + pos += 2; + coverage = getU16BE(pos, &parsedOk); + pos += 2; + if ((coverageIndex = checkGIDInCoverage(subTable + coverage, orgGID)) >= 0) { + switch (format) { + case 1: + /* format 1 */ + delta = getS16BE(pos, &parsedOk); + pos += 2; + gid = orgGID + delta; + break; + case 2: + /* format 2 */ + glyphCount = getS16BE(pos, &parsedOk); + pos += 2; + if (glyphCount > coverageIndex) { + pos += coverageIndex * 2; + substitute = getU16BE(pos, &parsedOk); + gid = substitute; + } + break; + default: + /* unknown format */ + break; + } + } + return gid; +} + +int FoFiTrueType::checkGIDInCoverage(unsigned int coverage, unsigned int orgGID) +{ + int index = -1; + unsigned int format; + unsigned int count; + unsigned int i; + unsigned int pos; + + pos = coverage; + format = getU16BE(pos, &parsedOk); + pos += 2; + switch (format) { + case 1: + count = getU16BE(pos, &parsedOk); + pos += 2; + // In some poor CJK fonts, key GIDs are not sorted, + // thus we cannot finish checking even when the range + // including orgGID seems to have already passed. + for (i = 0; i < count; i++) { + unsigned int gid; + + gid = getU16BE(pos, &parsedOk); + pos += 2; + if (gid == orgGID) { + /* found */ + index = i; + break; + } + } + break; + case 2: + count = getU16BE(pos, &parsedOk); + pos += 2; + for (i = 0; i < count; i++) { + unsigned int startGID, endGID; + unsigned int startIndex; + + startGID = getU16BE(pos, &parsedOk); + pos += 2; + endGID = getU16BE(pos, &parsedOk); + pos += 2; + startIndex = getU16BE(pos, &parsedOk); + pos += 2; + // In some poor CJK fonts, key GIDs are not sorted, + // thus we cannot finish checking even when the range + // including orgGID seems to have already passed. + if (startGID <= orgGID && orgGID <= endGID) { + /* found */ + index = startIndex + orgGID - startGID; + break; + } + } + break; + default: + break; + } + return index; +} diff --git a/poppler-24.05.0/fofi/FoFiTrueType.h b/poppler-24.05.0/fofi/FoFiTrueType.h new file mode 100644 index 0000000000000000000000000000000000000000..f98244accb373c6e688734f2d70ca7b49ff83133 --- /dev/null +++ b/poppler-24.05.0/fofi/FoFiTrueType.h @@ -0,0 +1,190 @@ +//======================================================================== +// +// FoFiTrueType.h +// +// Copyright 1999-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Takashi Iwai <tiwai@suse.de> +// Copyright (C) 2007 Koji Otani <sho@bbr.jp> +// Copyright (C) 2011, 2012, 2018-2020 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2012 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> +// Copyright (C) 2016 William Bader <williambader@hotmail.com> +// Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de> +// Copyright (C) 2022 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 +// +//======================================================================== + +#ifndef FOFITRUETYPE_H +#define FOFITRUETYPE_H + +#include <cstddef> +#include <memory> +#include <unordered_map> +#include <string> +#include "FoFiBase.h" +#include "poppler_private_export.h" + +class GooString; +struct TrueTypeTable; +struct TrueTypeCmap; + +//------------------------------------------------------------------------ +// FoFiTrueType +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT FoFiTrueType : public FoFiBase +{ +public: + // Create a FoFiTrueType object from a memory buffer. + static std::unique_ptr<FoFiTrueType> make(const unsigned char *fileA, int lenA, int faceIndexA = 0); + + // Create a FoFiTrueType object from a file on disk. + static std::unique_ptr<FoFiTrueType> load(const char *fileName, int faceIndexA = 0); + + ~FoFiTrueType() override; + + // Returns true if this an OpenType font containing CFF data, false + // if it's a TrueType font (or OpenType font with TrueType data). + bool isOpenTypeCFF() const { return openTypeCFF; } + + // Return the number of cmaps defined by this font. + int getNumCmaps() const; + + // Return the platform ID of the <i>th cmap. + int getCmapPlatform(int i) const; + + // Return the encoding ID of the <i>th cmap. + int getCmapEncoding(int i) const; + + // Return the index of the cmap for <platform>, <encoding>. Returns + // -1 if there is no corresponding cmap. + int findCmap(int platform, int encoding) const; + + // Return the GID corresponding to <c> according to the <i>th cmap. + int mapCodeToGID(int i, unsigned int c) const; + + // map gid to vertical glyph gid if exist. + // if not exist return original gid + unsigned int mapToVertGID(unsigned int orgGID); + + // Returns the GID corresponding to <name> according to the post + // table. Returns 0 if there is no mapping for <name> or if the + // font does not have a post table. + int mapNameToGID(const char *name) const; + + // Return the mapping from CIDs to GIDs, and return the number of + // CIDs in *<nCIDs>. This is only useful for CID fonts. (Only + // useful for OpenType CFF fonts.) + int *getCIDToGIDMap(int *nCIDs) const; + + // Returns the least restrictive embedding licensing right (as + // defined by the TrueType spec): + // * 4: OS/2 table is missing or invalid + // * 3: installable embedding + // * 2: editable embedding + // * 1: preview & print embedding + // * 0: restricted license embedding + int getEmbeddingRights() const; + + // Return the font matrix as an array of six numbers. (Only useful + // for OpenType CFF fonts.) + void getFontMatrix(double *mat) const; + + // Convert to a Type 42 font, suitable for embedding in a PostScript + // file. <psName> will be used as the PostScript font name (so we + // don't need to depend on the 'name' table in the font). The + // <encoding> array specifies the mapping from char codes to names. + // If <encoding> is NULL, the encoding is unknown or undefined. The + // <codeToGID> array specifies the mapping from char codes to GIDs. + // (Not useful for OpenType CFF fonts.) + void convertToType42(const char *psName, char **encoding, int *codeToGID, FoFiOutputFunc outputFunc, void *outputStream) const; + + // Convert to a Type 1 font, suitable for embedding in a PostScript + // file. This is only useful with 8-bit fonts. If <newEncoding> is + // not NULL, it will be used in place of the encoding in the Type 1C + // font. If <ascii> is true the eexec section will be hex-encoded, + // otherwise it will be left as binary data. If <psName> is + // non-NULL, it will be used as the PostScript font name. (Only + // useful for OpenType CFF fonts.) + void convertToType1(const char *psName, const char **newEncoding, bool ascii, FoFiOutputFunc outputFunc, void *outputStream) const; + + // Convert to a Type 2 CIDFont, suitable for embedding in a + // PostScript file. <psName> will be used as the PostScript font + // name (so we don't need to depend on the 'name' table in the + // font). The <cidMap> array maps CIDs to GIDs; it has <nCIDs> + // entries. (Not useful for OpenType CFF fonts.) + void convertToCIDType2(const char *psName, const int *cidMap, int nCIDs, bool needVerticalMetrics, FoFiOutputFunc outputFunc, void *outputStream) const; + + // Convert to a Type 0 CIDFont, suitable for embedding in a + // PostScript file. <psName> will be used as the PostScript font + // name. (Only useful for OpenType CFF fonts.) + void convertToCIDType0(const char *psName, int *cidMap, int nCIDs, FoFiOutputFunc outputFunc, void *outputStream) const; + + // Convert to a Type 0 (but non-CID) composite font, suitable for + // embedding in a PostScript file. <psName> will be used as the + // PostScript font name (so we don't need to depend on the 'name' + // table in the font). The <cidMap> array maps CIDs to GIDs; it has + // <nCIDs> entries. (Not useful for OpenType CFF fonts.) + void convertToType0(const char *psName, int *cidMap, int nCIDs, bool needVerticalMetrics, int *maxValidGlyph, FoFiOutputFunc outputFunc, void *outputStream) const; + + // Convert to a Type 0 (but non-CID) composite font, suitable for + // embedding in a PostScript file. <psName> will be used as the + // PostScript font name. (Only useful for OpenType CFF fonts.) + void convertToType0(const char *psName, int *cidMap, int nCIDs, FoFiOutputFunc outputFunc, void *outputStream) const; + + // Returns a pointer to the CFF font embedded in this OpenType font. + // If successful, sets *<start> and *<length>, and returns true. + // Otherwise returns false. (Only useful for OpenType CFF fonts). + bool getCFFBlock(char **start, int *length) const; + + // setup vert/vrt2 GSUB for default lang + int setupGSUB(const char *scriptName); + + // setup vert/vrt2 GSUB for specified lang + int setupGSUB(const char *scriptName, const char *languageName); + +private: + FoFiTrueType(const unsigned char *fileA, int lenA, bool freeFileDataA, int faceIndexA); + void cvtEncoding(char **encoding, FoFiOutputFunc outputFunc, void *outputStream) const; + void cvtCharStrings(char **encoding, const int *codeToGID, FoFiOutputFunc outputFunc, void *outputStream) const; + void cvtSfnts(FoFiOutputFunc outputFunc, void *outputStream, const GooString *name, bool needVerticalMetrics, int *maxUsedGlyph) const; + void dumpString(const unsigned char *s, int length, FoFiOutputFunc outputFunc, void *outputStream) const; + unsigned int computeTableChecksum(const unsigned char *data, int length) const; + void parse(); + void readPostTable(); + int seekTable(const char *tag) const; + unsigned int charToTag(const char *tagName); + unsigned int doMapToVertGID(unsigned int orgGID); + unsigned int scanLookupList(unsigned int listIndex, unsigned int orgGID); + unsigned int scanLookupSubTable(unsigned int subTable, unsigned int orgGID); + int checkGIDInCoverage(unsigned int coverage, unsigned int orgGID); + + TrueTypeTable *tables; + int nTables; + TrueTypeCmap *cmaps; + int nCmaps; + int nGlyphs; + int locaFmt; + int bbox[4]; + std::unordered_map<std::string, int> nameToGID; + bool openTypeCFF; + + bool parsedOk; + int faceIndex; + unsigned int gsubFeatureTable; + unsigned int gsubLookupList; +}; + +#endif diff --git a/poppler-24.05.0/fofi/FoFiType1.cc b/poppler-24.05.0/fofi/FoFiType1.cc new file mode 100644 index 0000000000000000000000000000000000000000..eaa741437bd10d7c823b0ff83f7e60e11966bb21 --- /dev/null +++ b/poppler-24.05.0/fofi/FoFiType1.cc @@ -0,0 +1,339 @@ +//======================================================================== +// +// FoFiType1.cc +// +// Copyright 1999-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005, 2008, 2010, 2018, 2021-2023 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com> +// Copyright (C) 2010 Jakub Wilk <jwilk@jwilk.net> +// Copyright (C) 2014 Carlos Garcia Campos <carlosgc@gnome.org> +// Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com> +// Copyright (C) 2017 Jean Ghali <jghali@libertysurf.fr> +// Copyright (C) 2022 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 +// +//======================================================================== + +#include <config.h> + +#include <charconv> +#include <optional> + +#include <cstdlib> +#include <cstring> +#include <climits> +#include "goo/glibc.h" +#include "goo/gmem.h" +#include "goo/GooLikely.h" +#include "FoFiEncodings.h" +#include "FoFiType1.h" +#include "poppler/Error.h" + +//------------------------------------------------------------------------ +// FoFiType1 +//------------------------------------------------------------------------ + +FoFiType1 *FoFiType1::make(const unsigned char *fileA, int lenA) +{ + return new FoFiType1(fileA, lenA, false); +} + +FoFiType1::FoFiType1(const unsigned char *fileA, int lenA, bool freeFileDataA) : FoFiBase(fileA, lenA, freeFileDataA) +{ + encoding = nullptr; + parsed = false; + undoPFB(); +} + +FoFiType1::~FoFiType1() +{ + if (encoding && encoding != fofiType1StandardEncoding) { + for (int i = 0; i < 256; ++i) { + gfree(encoding[i]); + } + gfree(encoding); + } +} + +std::string FoFiType1::getName() +{ + if (!parsed) { + parse(); + } + return name; +} + +char **FoFiType1::getEncoding() +{ + if (!parsed) { + parse(); + } + return encoding; +} + +void FoFiType1::writeEncoded(const char **newEncoding, FoFiOutputFunc outputFunc, void *outputStream) const +{ + char buf[512]; + char *line, *line2, *p; + int i; + + // copy everything up to the encoding + for (line = (char *)file; line && strncmp(line, "/Encoding", 9); line = getNextLine(line)) { + ; + } + if (!line) { + // no encoding - just copy the whole font file + (*outputFunc)(outputStream, (char *)file, len); + return; + } + (*outputFunc)(outputStream, (char *)file, line - (char *)file); + + // write the new encoding + (*outputFunc)(outputStream, "/Encoding 256 array\n", 20); + (*outputFunc)(outputStream, "0 1 255 {1 index exch /.notdef put} for\n", 40); + for (i = 0; i < 256; ++i) { + if (newEncoding[i]) { + sprintf(buf, "dup %d /%s put\n", i, newEncoding[i]); + (*outputFunc)(outputStream, buf, strlen(buf)); + } + } + (*outputFunc)(outputStream, "readonly def\n", 13); + + // find the end of the encoding data + //~ this ought to parse PostScript tokens + if (!strncmp(line, "/Encoding StandardEncoding def", 30)) { + line = getNextLine(line); + } else { + // skip "/Encoding" + one whitespace char, + // then look for 'def' preceded by PostScript whitespace + p = line + 10; + line = nullptr; + for (; p < (char *)file + len; ++p) { + if ((*p == ' ' || *p == '\t' || *p == '\x0a' || *p == '\x0d' || *p == '\x0c' || *p == '\0') && p + 4 <= (char *)file + len && !strncmp(p + 1, "def", 3)) { + line = p + 4; + break; + } + } + } + + // some fonts have two /Encoding entries in their dictionary, so we + // check for a second one here + if (line) { + for (line2 = line, i = 0; i < 20 && line2 && strncmp(line2, "/Encoding", 9); line2 = getNextLine(line2), ++i) { + ; + } + if (i < 20 && line2) { + (*outputFunc)(outputStream, line, line2 - line); + if (!strncmp(line2, "/Encoding StandardEncoding def", 30)) { + line = getNextLine(line2); + } else { + // skip "/Encoding" + one whitespace char, + // then look for 'def' preceded by PostScript whitespace + p = line2 + 10; + line = nullptr; + for (; p < (char *)file + len; ++p) { + if ((*p == ' ' || *p == '\t' || *p == '\x0a' || *p == '\x0d' || *p == '\x0c' || *p == '\0') && p + 4 <= (char *)file + len && !strncmp(p + 1, "def", 3)) { + line = p + 4; + break; + } + } + } + } + + // copy everything after the encoding + if (line) { + (*outputFunc)(outputStream, line, ((char *)file + len) - line); + } + } +} + +char *FoFiType1::getNextLine(char *line) const +{ + while (line < (char *)file + len && *line != '\x0a' && *line != '\x0d') { + ++line; + } + if (line < (char *)file + len && *line == '\x0d') { + ++line; + } + if (line < (char *)file + len && *line == '\x0a') { + ++line; + } + if (line >= (char *)file + len) { + return nullptr; + } + return line; +} + +static const char tokenSeparators[] = " \t\n\r"; + +class FoFiType1Tokenizer +{ +public: + explicit FoFiType1Tokenizer(std::string_view &&stringViewA) : stringView(stringViewA) { } + + std::optional<std::string_view> getToken() + { + const auto length = stringView.length(); + if (currentPos >= length) { + return {}; + } + + std::string_view::size_type pos = stringView.find_first_of(tokenSeparators, currentPos); + while (pos == currentPos) { + // skip multiple contiguous separators + ++currentPos; + pos = stringView.find_first_of(tokenSeparators, currentPos); + } + if (pos == std::string_view::npos) { + std::string_view token = stringView.substr(currentPos, length - currentPos); + currentPos = length; + return token; + } + + std::string_view token = stringView.substr(currentPos, pos - currentPos); + + currentPos = pos + 1; + + return token; + } + +private: + std::string_view::size_type currentPos = 0; + const std::string_view stringView; +}; + +void FoFiType1::parse() +{ + FoFiType1Tokenizer tokenizer(std::string_view(reinterpret_cast<const char *>(file), len)); + while (name.empty() || !encoding) { + const std::optional<std::string_view> token = tokenizer.getToken(); + + if (!token) { + break; + } + + if (name.empty() && token == "/FontName") { + const std::optional<std::string_view> fontNameToken = tokenizer.getToken(); + if (!fontNameToken) { + break; + } + + // Skip the / + name = fontNameToken->substr(1); + + } else if (!encoding && token == "/Encoding") { + const std::optional<std::string_view> token2 = tokenizer.getToken(); + if (!token2) { + break; + } + + const std::optional<std::string_view> token3 = tokenizer.getToken(); + if (!token3) { + break; + } + + if (token2 == "StandardEncoding" && token3 == "def") { + encoding = (char **)fofiType1StandardEncoding; + } else if (token2 == "256" && token3 == "array") { + encoding = (char **)gmallocn(256, sizeof(char *)); + for (int j = 0; j < 256; ++j) { + encoding[j] = nullptr; + } + + while (true) { + const std::optional<std::string_view> encodingToken = tokenizer.getToken(); + if (!encodingToken) { + break; + } + + if (encodingToken == "dup") { + std::optional<std::string_view> codeToken = tokenizer.getToken(); + if (!codeToken) { + break; + } + + std::optional<std::string_view> nameToken; + // Sometimes font data has code and name together without spacing i.e. 33/exclam + // if that happens don't call getToken again and just split codeToken in 2 + const auto slashPositionInCodeToken = codeToken->find('/'); + if (slashPositionInCodeToken != std::string_view::npos) { + nameToken = codeToken->substr(slashPositionInCodeToken, codeToken->length() - slashPositionInCodeToken); + codeToken = codeToken->substr(0, slashPositionInCodeToken); + } else { + nameToken = tokenizer.getToken(); + } + + if (!nameToken) { + break; + } + + int code = 0; + if (codeToken->length() > 2 && codeToken->at(0) == '8' && codeToken->at(1) == '#') { + std::from_chars(codeToken->data() + 2, codeToken->data() + codeToken->length(), code, 8); + } else { + std::from_chars(codeToken->data(), codeToken->data() + codeToken->length(), code); + } + + if (code >= 0 && code < 256 && nameToken->length() > 1) { + gfree(encoding[code]); + encoding[code] = copyString(nameToken->data() + 1, nameToken->length() - 1); + } + + } else if (encodingToken == "def") { + break; + } + } + } + } + } + + parsed = true; +} + +// Undo the PFB encoding, i.e., remove the PFB headers. +void FoFiType1::undoPFB() +{ + bool ok; + unsigned char *file2; + int pos1, pos2, type; + unsigned int segLen; + + ok = true; + if (getU8(0, &ok) != 0x80 || !ok) { + return; + } + file2 = (unsigned char *)gmalloc(len); + pos1 = pos2 = 0; + while (getU8(pos1, &ok) == 0x80 && ok) { + type = getU8(pos1 + 1, &ok); + if (type < 1 || type > 2 || !ok) { + break; + } + segLen = getU32LE(pos1 + 2, &ok); + pos1 += 6; + if (!ok || !checkRegion(pos1, segLen)) { + break; + } + memcpy(file2 + pos2, file + pos1, segLen); + pos1 += segLen; + pos2 += segLen; + } + if (freeFileData) { + gfree((char *)file); + } + file = file2; + freeFileData = true; + len = pos2; +} diff --git a/poppler-24.05.0/fofi/FoFiType1.h b/poppler-24.05.0/fofi/FoFiType1.h new file mode 100644 index 0000000000000000000000000000000000000000..b3cc91e8b708c1b87581c8446af82d3ff5e5358f --- /dev/null +++ b/poppler-24.05.0/fofi/FoFiType1.h @@ -0,0 +1,65 @@ +//======================================================================== +// +// FoFiType1.h +// +// Copyright 1999-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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, 2022, 2023 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2022 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 +// +//======================================================================== + +#ifndef FOFITYPE1_H +#define FOFITYPE1_H + +#include "FoFiBase.h" + +#include <string> + +//------------------------------------------------------------------------ +// FoFiType1 +//------------------------------------------------------------------------ + +class FoFiType1 : public FoFiBase +{ +public: + // Create a FoFiType1 object from a memory buffer. + static FoFiType1 *make(const unsigned char *fileA, int lenA); + + ~FoFiType1() override; + + // Return the font name. + std::string getName(); + + // Return the encoding, as an array of 256 names (any of which may + // be NULL). + char **getEncoding(); + + // Write a version of the Type 1 font file with a new encoding. + void writeEncoded(const char **newEncoding, FoFiOutputFunc outputFunc, void *outputStream) const; + +private: + FoFiType1(const unsigned char *fileA, int lenA, bool freeFileDataA); + + char *getNextLine(char *line) const; + void parse(); + void undoPFB(); + + std::string name; + char **encoding; + bool parsed; +}; + +#endif diff --git a/poppler-24.05.0/fofi/FoFiType1C.cc b/poppler-24.05.0/fofi/FoFiType1C.cc new file mode 100644 index 0000000000000000000000000000000000000000..887bd28e64e2eea01b97a1ba0758b5de68b544d8 --- /dev/null +++ b/poppler-24.05.0/fofi/FoFiType1C.cc @@ -0,0 +1,2662 @@ +//======================================================================== +// +// FoFiType1C.cc +// +// Copyright 1999-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2009, 2010, 2017-2022 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de> +// Copyright (C) 2019 Tomoyuki Kubota <himajin100000@gmail.com> +// Copyright (C) 2019 Volker Krause <vkrause@kde.org> +// Copyright (C) 2022 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 +// +//======================================================================== + +#include <config.h> + +#include <cstdlib> +#include <cstring> +#include <cmath> +#include "goo/gmem.h" +#include "goo/gstrtod.h" +#include "goo/GooLikely.h" +#include "goo/GooString.h" +#include "poppler/Error.h" +#include "FoFiEncodings.h" +#include "FoFiType1C.h" + +//------------------------------------------------------------------------ + +static const char hexChars[17] = "0123456789ABCDEF"; + +//------------------------------------------------------------------------ +// FoFiType1C +//------------------------------------------------------------------------ + +FoFiType1C *FoFiType1C::make(const unsigned char *fileA, int lenA) +{ + FoFiType1C *ff = new FoFiType1C(fileA, lenA, false); + if (!ff->parse()) { + delete ff; + return nullptr; + } + return ff; +} + +FoFiType1C *FoFiType1C::load(const char *fileName) +{ + FoFiType1C *ff; + char *fileA; + int lenA; + + if (!(fileA = FoFiBase::readFile(fileName, &lenA))) { + return nullptr; + } + ff = new FoFiType1C((unsigned char *)fileA, lenA, true); + if (!ff->parse()) { + delete ff; + return nullptr; + } + return ff; +} + +FoFiType1C::FoFiType1C(const unsigned char *fileA, int lenA, bool freeFileDataA) : FoFiBase(fileA, lenA, freeFileDataA) +{ + name = nullptr; + encoding = nullptr; + privateDicts = nullptr; + fdSelect = nullptr; + charset = nullptr; + charsetLength = 0; +} + +FoFiType1C::~FoFiType1C() +{ + int i; + + if (name) { + delete name; + } + if (encoding && encoding != fofiType1StandardEncoding && encoding != fofiType1ExpertEncoding) { + for (i = 0; i < 256; ++i) { + gfree(encoding[i]); + } + gfree(encoding); + } + if (privateDicts) { + gfree(privateDicts); + } + if (fdSelect) { + gfree(fdSelect); + } + if (charset && charset != fofiType1CISOAdobeCharset && charset != fofiType1CExpertCharset && charset != fofiType1CExpertSubsetCharset) { + gfree(const_cast<unsigned short *>(charset)); + } +} + +const char *FoFiType1C::getName() const +{ + return name ? name->c_str() : nullptr; +} + +char **FoFiType1C::getEncoding() const +{ + return encoding; +} + +GooString *FoFiType1C::getGlyphName(int gid) const +{ + char buf[256]; + bool ok; + + ok = true; + if (gid < 0 || gid >= charsetLength) { + return nullptr; + } + getString(charset[gid], buf, &ok); + if (!ok) { + return nullptr; + } + return new GooString(buf); +} + +int *FoFiType1C::getCIDToGIDMap(int *nCIDs) const +{ + int *map; + int n, i; + + // a CID font's top dict has ROS as the first operator + if (topDict.firstOp != 0x0c1e) { + *nCIDs = 0; + return nullptr; + } + + // in a CID font, the charset data is the GID-to-CID mapping, so all + // we have to do is reverse it + n = 0; + for (i = 0; i < nGlyphs && i < charsetLength; ++i) { + if (charset[i] > n) { + n = charset[i]; + } + } + ++n; + map = (int *)gmallocn(n, sizeof(int)); + memset(map, 0, n * sizeof(int)); + for (i = 0; i < nGlyphs; ++i) { + map[charset[i]] = i; + } + *nCIDs = n; + return map; +} + +void FoFiType1C::getFontMatrix(double *mat) const +{ + int i; + + if (topDict.firstOp == 0x0c1e && privateDicts[0].hasFontMatrix) { + if (topDict.hasFontMatrix) { + mat[0] = topDict.fontMatrix[0] * privateDicts[0].fontMatrix[0] + topDict.fontMatrix[1] * privateDicts[0].fontMatrix[2]; + mat[1] = topDict.fontMatrix[0] * privateDicts[0].fontMatrix[1] + topDict.fontMatrix[1] * privateDicts[0].fontMatrix[3]; + mat[2] = topDict.fontMatrix[2] * privateDicts[0].fontMatrix[0] + topDict.fontMatrix[3] * privateDicts[0].fontMatrix[2]; + mat[3] = topDict.fontMatrix[2] * privateDicts[0].fontMatrix[1] + topDict.fontMatrix[3] * privateDicts[0].fontMatrix[3]; + mat[4] = topDict.fontMatrix[4] * privateDicts[0].fontMatrix[0] + topDict.fontMatrix[5] * privateDicts[0].fontMatrix[2]; + mat[5] = topDict.fontMatrix[4] * privateDicts[0].fontMatrix[1] + topDict.fontMatrix[5] * privateDicts[0].fontMatrix[3]; + } else { + for (i = 0; i < 6; ++i) { + mat[i] = privateDicts[0].fontMatrix[i]; + } + } + } else { + for (i = 0; i < 6; ++i) { + mat[i] = topDict.fontMatrix[i]; + } + } +} + +void FoFiType1C::convertToType1(const char *psName, const char **newEncoding, bool ascii, FoFiOutputFunc outputFunc, void *outputStream) +{ + int psNameLen; + Type1CEexecBuf eb; + Type1CIndex subrIdx; + Type1CIndexVal val; + char buf2[256]; + bool ok; + int i; + + if (psName) { + psNameLen = strlen(psName); + } else { + psName = name->c_str(); + psNameLen = name->getLength(); + } + + // write header and font dictionary, up to encoding + ok = true; + (*outputFunc)(outputStream, "%!FontType1-1.0: ", 17); + (*outputFunc)(outputStream, psName, psNameLen); + if (topDict.versionSID != 0) { + getString(topDict.versionSID, buf2, &ok); + (*outputFunc)(outputStream, buf2, strlen(buf2)); + } + (*outputFunc)(outputStream, "\n", 1); + // the dictionary needs room for 12 entries: the following 9, plus + // Private and CharStrings (in the eexec section) and FID (which is + // added by definefont) + (*outputFunc)(outputStream, "12 dict begin\n", 14); + (*outputFunc)(outputStream, "/FontInfo 10 dict dup begin\n", 28); + if (topDict.versionSID != 0) { + (*outputFunc)(outputStream, "/version ", 9); + writePSString(buf2, outputFunc, outputStream); + (*outputFunc)(outputStream, " readonly def\n", 14); + } + if (topDict.noticeSID != 0) { + getString(topDict.noticeSID, buf2, &ok); + (*outputFunc)(outputStream, "/Notice ", 8); + writePSString(buf2, outputFunc, outputStream); + (*outputFunc)(outputStream, " readonly def\n", 14); + } + if (topDict.copyrightSID != 0) { + getString(topDict.copyrightSID, buf2, &ok); + (*outputFunc)(outputStream, "/Copyright ", 11); + writePSString(buf2, outputFunc, outputStream); + (*outputFunc)(outputStream, " readonly def\n", 14); + } + if (topDict.fullNameSID != 0) { + getString(topDict.fullNameSID, buf2, &ok); + (*outputFunc)(outputStream, "/FullName ", 10); + writePSString(buf2, outputFunc, outputStream); + (*outputFunc)(outputStream, " readonly def\n", 14); + } + if (topDict.familyNameSID != 0) { + getString(topDict.familyNameSID, buf2, &ok); + (*outputFunc)(outputStream, "/FamilyName ", 12); + writePSString(buf2, outputFunc, outputStream); + (*outputFunc)(outputStream, " readonly def\n", 14); + } + if (topDict.weightSID != 0) { + getString(topDict.weightSID, buf2, &ok); + (*outputFunc)(outputStream, "/Weight ", 8); + writePSString(buf2, outputFunc, outputStream); + (*outputFunc)(outputStream, " readonly def\n", 14); + } + if (topDict.isFixedPitch) { + (*outputFunc)(outputStream, "/isFixedPitch true def\n", 23); + } else { + (*outputFunc)(outputStream, "/isFixedPitch false def\n", 24); + } + std::unique_ptr<GooString> buf = GooString::format("/ItalicAngle {0:.4g} def\n", topDict.italicAngle); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + buf = GooString::format("/UnderlinePosition {0:.4g} def\n", topDict.underlinePosition); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + buf = GooString::format("/UnderlineThickness {0:.4g} def\n", topDict.underlineThickness); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "end readonly def\n", 17); + (*outputFunc)(outputStream, "/FontName /", 11); + (*outputFunc)(outputStream, psName, psNameLen); + (*outputFunc)(outputStream, " def\n", 5); + buf = GooString::format("/PaintType {0:d} def\n", topDict.paintType); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "/FontType 1 def\n", 16); + buf = GooString::format("/FontMatrix [{0:.8g} {1:.8g} {2:.8g} {3:.8g} {4:.8g} {5:.8g}] readonly def\n", topDict.fontMatrix[0], topDict.fontMatrix[1], topDict.fontMatrix[2], topDict.fontMatrix[3], topDict.fontMatrix[4], + topDict.fontMatrix[5]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + buf = GooString::format("/FontBBox [{0:.4g} {1:.4g} {2:.4g} {3:.4g}] readonly def\n", topDict.fontBBox[0], topDict.fontBBox[1], topDict.fontBBox[2], topDict.fontBBox[3]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + buf = GooString::format("/StrokeWidth {0:.4g} def\n", topDict.strokeWidth); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + if (topDict.uniqueID != 0) { + buf = GooString::format("/UniqueID {0:d} def\n", topDict.uniqueID); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + + // write the encoding + (*outputFunc)(outputStream, "/Encoding ", 10); + if (!newEncoding && encoding == fofiType1StandardEncoding) { + (*outputFunc)(outputStream, "StandardEncoding def\n", 21); + } else { + (*outputFunc)(outputStream, "256 array\n", 10); + (*outputFunc)(outputStream, "0 1 255 {1 index exch /.notdef put} for\n", 40); + const char **enc = newEncoding ? newEncoding : (const char **)encoding; + for (i = 0; i < 256; ++i) { + if (enc && enc[i]) { + buf = GooString::format("dup {0:d} /{1:s} put\n", i, enc[i]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + } + (*outputFunc)(outputStream, "readonly def\n", 13); + } + (*outputFunc)(outputStream, "currentdict end\n", 16); + + // start the binary section + (*outputFunc)(outputStream, "currentfile eexec\n", 18); + eb.outputFunc = outputFunc; + eb.outputStream = outputStream; + eb.ascii = ascii; + eb.r1 = 55665; + eb.line = 0; + + // write the private dictionary + eexecWrite(&eb, "\x83\xca\x73\xd5"); + eexecWrite(&eb, "dup /Private 32 dict dup begin\n"); + eexecWrite(&eb, + "/RD {string currentfile exch readstring pop}" + " executeonly def\n"); + eexecWrite(&eb, "/ND {noaccess def} executeonly def\n"); + eexecWrite(&eb, "/NP {noaccess put} executeonly def\n"); + eexecWrite(&eb, "/MinFeature {16 16} def\n"); + eexecWrite(&eb, "/password 5839 def\n"); + if (privateDicts[0].nBlueValues) { + eexecWrite(&eb, "/BlueValues ["); + for (i = 0; i < privateDicts[0].nBlueValues; ++i) { + buf = GooString::format("{0:s}{1:d}", i > 0 ? " " : "", privateDicts[0].blueValues[i]); + eexecWrite(&eb, buf->c_str()); + } + eexecWrite(&eb, "] def\n"); + } + if (privateDicts[0].nOtherBlues) { + eexecWrite(&eb, "/OtherBlues ["); + for (i = 0; i < privateDicts[0].nOtherBlues; ++i) { + buf = GooString::format("{0:s}{1:d}", i > 0 ? " " : "", privateDicts[0].otherBlues[i]); + eexecWrite(&eb, buf->c_str()); + } + eexecWrite(&eb, "] def\n"); + } + if (privateDicts[0].nFamilyBlues) { + eexecWrite(&eb, "/FamilyBlues ["); + for (i = 0; i < privateDicts[0].nFamilyBlues; ++i) { + buf = GooString::format("{0:s}{1:d}", i > 0 ? " " : "", privateDicts[0].familyBlues[i]); + eexecWrite(&eb, buf->c_str()); + } + eexecWrite(&eb, "] def\n"); + } + if (privateDicts[0].nFamilyOtherBlues) { + eexecWrite(&eb, "/FamilyOtherBlues ["); + for (i = 0; i < privateDicts[0].nFamilyOtherBlues; ++i) { + buf = GooString::format("{0:s}{1:d}", i > 0 ? " " : "", privateDicts[0].familyOtherBlues[i]); + eexecWrite(&eb, buf->c_str()); + } + eexecWrite(&eb, "] def\n"); + } + if (privateDicts[0].blueScale != 0.039625) { + buf = GooString::format("/BlueScale {0:.4g} def\n", privateDicts[0].blueScale); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[0].blueShift != 7) { + buf = GooString::format("/BlueShift {0:d} def\n", privateDicts[0].blueShift); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[0].blueFuzz != 1) { + buf = GooString::format("/BlueFuzz {0:d} def\n", privateDicts[0].blueFuzz); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[0].hasStdHW) { + buf = GooString::format("/StdHW [{0:.4g}] def\n", privateDicts[0].stdHW); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[0].hasStdVW) { + buf = GooString::format("/StdVW [{0:.4g}] def\n", privateDicts[0].stdVW); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[0].nStemSnapH) { + eexecWrite(&eb, "/StemSnapH ["); + for (i = 0; i < privateDicts[0].nStemSnapH; ++i) { + buf = GooString::format("{0:s}{1:.4g}", i > 0 ? " " : "", privateDicts[0].stemSnapH[i]); + eexecWrite(&eb, buf->c_str()); + } + eexecWrite(&eb, "] def\n"); + } + if (privateDicts[0].nStemSnapV) { + eexecWrite(&eb, "/StemSnapV ["); + for (i = 0; i < privateDicts[0].nStemSnapV; ++i) { + buf = GooString::format("{0:s}{1:.4g}", i > 0 ? " " : "", privateDicts[0].stemSnapV[i]); + eexecWrite(&eb, buf->c_str()); + } + eexecWrite(&eb, "] def\n"); + } + if (privateDicts[0].hasForceBold) { + buf = GooString::format("/ForceBold {0:s} def\n", privateDicts[0].forceBold ? "true" : "false"); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[0].forceBoldThreshold != 0) { + buf = GooString::format("/ForceBoldThreshold {0:.4g} def\n", privateDicts[0].forceBoldThreshold); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[0].languageGroup != 0) { + buf = GooString::format("/LanguageGroup {0:d} def\n", privateDicts[0].languageGroup); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[0].expansionFactor != 0.06) { + buf = GooString::format("/ExpansionFactor {0:.4g} def\n", privateDicts[0].expansionFactor); + eexecWrite(&eb, buf->c_str()); + } + + // set up subroutines + ok = true; + getIndex(privateDicts[0].subrsOffset, &subrIdx, &ok); + if (!ok) { + subrIdx.pos = -1; + } + + // write the CharStrings + buf = GooString::format("2 index /CharStrings {0:d} dict dup begin\n", nGlyphs); + eexecWrite(&eb, buf->c_str()); + for (i = 0; i < nGlyphs; ++i) { + ok = true; + getIndexVal(&charStringsIdx, i, &val, &ok); + if (ok && i < charsetLength) { + getString(charset[i], buf2, &ok); + if (ok) { + eexecCvtGlyph(&eb, buf2, val.pos, val.len, &subrIdx, &privateDicts[0]); + } + } + } + eexecWrite(&eb, "end\n"); + eexecWrite(&eb, "end\n"); + eexecWrite(&eb, "readonly put\n"); + eexecWrite(&eb, "noaccess put\n"); + eexecWrite(&eb, "dup /FontName get exch definefont pop\n"); + eexecWrite(&eb, "mark currentfile closefile\n"); + + // trailer + if (ascii && eb.line > 0) { + (*outputFunc)(outputStream, "\n", 1); + } + for (i = 0; i < 8; ++i) { + (*outputFunc)(outputStream, "0000000000000000000000000000000000000000000000000000000000000000\n", 65); + } + (*outputFunc)(outputStream, "cleartomark\n", 12); +} + +void FoFiType1C::convertToCIDType0(const char *psName, const int *codeMap, int nCodes, FoFiOutputFunc outputFunc, void *outputStream) +{ + int *cidMap; + GooString *charStrings; + int *charStringOffsets; + Type1CIndex subrIdx; + Type1CIndexVal val; + int nCIDs, gdBytes; + char buf2[256]; + bool ok; + int gid, offset, n, i, j, k; + + // compute the CID count and build the CID-to-GID mapping + if (codeMap) { + nCIDs = nCodes; + cidMap = (int *)gmallocn(nCIDs, sizeof(int)); + for (i = 0; i < nCodes; ++i) { + if (codeMap[i] >= 0 && codeMap[i] < nGlyphs) { + cidMap[i] = codeMap[i]; + } else { + cidMap[i] = -1; + } + } + } else if (topDict.firstOp == 0x0c1e) { + nCIDs = 0; + for (i = 0; i < nGlyphs && i < charsetLength; ++i) { + if (charset[i] >= nCIDs) { + nCIDs = charset[i] + 1; + } + } + cidMap = (int *)gmallocn(nCIDs, sizeof(int)); + for (i = 0; i < nCIDs; ++i) { + cidMap[i] = -1; + } + for (i = 0; i < nGlyphs && i < charsetLength; ++i) { + cidMap[charset[i]] = i; + } + } else { + nCIDs = nGlyphs; + cidMap = (int *)gmallocn(nCIDs, sizeof(int)); + for (i = 0; i < nCIDs; ++i) { + cidMap[i] = i; + } + } + + // build the charstrings + charStrings = new GooString(); + charStringOffsets = (int *)gmallocn(nCIDs + 1, sizeof(int)); + for (i = 0; i < nCIDs; ++i) { + charStringOffsets[i] = charStrings->getLength(); + if ((gid = cidMap[i]) >= 0) { + ok = true; + getIndexVal(&charStringsIdx, gid, &val, &ok); + if (ok) { + getIndex(privateDicts[fdSelect ? fdSelect[gid] : 0].subrsOffset, &subrIdx, &ok); + if (!ok) { + subrIdx.pos = -1; + } + std::set<int> offsetBeingParsed; + cvtGlyph(val.pos, val.len, charStrings, &subrIdx, &privateDicts[fdSelect ? fdSelect[gid] : 0], true, offsetBeingParsed); + } + } + } + charStringOffsets[nCIDs] = charStrings->getLength(); + + // compute gdBytes = number of bytes needed for charstring offsets + // (offset size needs to account for the charstring offset table, + // with a worst case of five bytes per entry, plus the charstrings + // themselves) + i = (nCIDs + 1) * 5 + charStrings->getLength(); + if (i < 0x100) { + gdBytes = 1; + } else if (i < 0x10000) { + gdBytes = 2; + } else if (i < 0x1000000) { + gdBytes = 3; + } else { + gdBytes = 4; + } + + // begin the font dictionary + (*outputFunc)(outputStream, "/CIDInit /ProcSet findresource begin\n", 37); + (*outputFunc)(outputStream, "20 dict begin\n", 14); + (*outputFunc)(outputStream, "/CIDFontName /", 14); + (*outputFunc)(outputStream, psName, strlen(psName)); + (*outputFunc)(outputStream, " def\n", 5); + (*outputFunc)(outputStream, "/CIDFontType 0 def\n", 19); + (*outputFunc)(outputStream, "/CIDSystemInfo 3 dict dup begin\n", 32); + if (topDict.registrySID > 0 && topDict.orderingSID > 0) { + ok = true; + getString(topDict.registrySID, buf2, &ok); + if (ok) { + (*outputFunc)(outputStream, " /Registry (", 13); + (*outputFunc)(outputStream, buf2, strlen(buf2)); + (*outputFunc)(outputStream, ") def\n", 6); + } + ok = true; + getString(topDict.orderingSID, buf2, &ok); + if (ok) { + (*outputFunc)(outputStream, " /Ordering (", 13); + (*outputFunc)(outputStream, buf2, strlen(buf2)); + (*outputFunc)(outputStream, ") def\n", 6); + } + } else { + (*outputFunc)(outputStream, " /Registry (Adobe) def\n", 24); + (*outputFunc)(outputStream, " /Ordering (Identity) def\n", 27); + } + std::unique_ptr<GooString> buf = GooString::format(" /Supplement {0:d} def\n", topDict.supplement); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "end def\n", 8); + if (topDict.hasFontMatrix) { + buf = GooString::format("/FontMatrix [{0:.8g} {1:.8g} {2:.8g} {3:.8g} {4:.8g} {5:.8g}] def\n", topDict.fontMatrix[0], topDict.fontMatrix[1], topDict.fontMatrix[2], topDict.fontMatrix[3], topDict.fontMatrix[4], + topDict.fontMatrix[5]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } else if (privateDicts[0].hasFontMatrix) { + (*outputFunc)(outputStream, "/FontMatrix [1 0 0 1 0 0] def\n", 30); + } else { + (*outputFunc)(outputStream, "/FontMatrix [0.001 0 0 0.001 0 0] def\n", 38); + } + buf = GooString::format("/FontBBox [{0:.4g} {1:.4g} {2:.4g} {3:.4g}] def\n", topDict.fontBBox[0], topDict.fontBBox[1], topDict.fontBBox[2], topDict.fontBBox[3]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "/FontInfo 1 dict dup begin\n", 27); + (*outputFunc)(outputStream, " /FSType 8 def\n", 16); + (*outputFunc)(outputStream, "end def\n", 8); + + // CIDFont-specific entries + buf = GooString::format("/CIDCount {0:d} def\n", nCIDs); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "/FDBytes 1 def\n", 15); + buf = GooString::format("/GDBytes {0:d} def\n", gdBytes); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "/CIDMapOffset 0 def\n", 20); + if (topDict.paintType != 0) { + buf = GooString::format("/PaintType {0:d} def\n", topDict.paintType); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + buf = GooString::format("/StrokeWidth {0:.4g} def\n", topDict.strokeWidth); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + + // FDArray entry + buf = GooString::format("/FDArray {0:d} array\n", nFDs); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + for (i = 0; i < nFDs; ++i) { + buf = GooString::format("dup {0:d} 10 dict begin\n", i); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "/FontType 1 def\n", 16); + if (privateDicts[i].hasFontMatrix) { + buf = GooString::format("/FontMatrix [{0:.8g} {1:.8g} {2:.8g} {3:.8g} {4:.8g} {5:.8g}] def\n", privateDicts[i].fontMatrix[0], privateDicts[i].fontMatrix[1], privateDicts[i].fontMatrix[2], privateDicts[i].fontMatrix[3], + privateDicts[i].fontMatrix[4], privateDicts[i].fontMatrix[5]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } else { + (*outputFunc)(outputStream, "/FontMatrix [1 0 0 1 0 0] def\n", 30); + } + buf = GooString::format("/PaintType {0:d} def\n", topDict.paintType); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "/Private 32 dict begin\n", 23); + if (privateDicts[i].nBlueValues) { + (*outputFunc)(outputStream, "/BlueValues [", 13); + for (j = 0; j < privateDicts[i].nBlueValues; ++j) { + buf = GooString::format("{0:s}{1:d}", j > 0 ? " " : "", privateDicts[i].blueValues[j]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "] def\n", 6); + } + if (privateDicts[i].nOtherBlues) { + (*outputFunc)(outputStream, "/OtherBlues [", 13); + for (j = 0; j < privateDicts[i].nOtherBlues; ++j) { + buf = GooString::format("{0:s}{1:d}", j > 0 ? " " : "", privateDicts[i].otherBlues[j]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "] def\n", 6); + } + if (privateDicts[i].nFamilyBlues) { + (*outputFunc)(outputStream, "/FamilyBlues [", 14); + for (j = 0; j < privateDicts[i].nFamilyBlues; ++j) { + buf = GooString::format("{0:s}{1:d}", j > 0 ? " " : "", privateDicts[i].familyBlues[j]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "] def\n", 6); + } + if (privateDicts[i].nFamilyOtherBlues) { + (*outputFunc)(outputStream, "/FamilyOtherBlues [", 19); + for (j = 0; j < privateDicts[i].nFamilyOtherBlues; ++j) { + buf = GooString::format("{0:s}{1:d}", j > 0 ? " " : "", privateDicts[i].familyOtherBlues[j]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "] def\n", 6); + } + if (privateDicts[i].blueScale != 0.039625) { + buf = GooString::format("/BlueScale {0:.4g} def\n", privateDicts[i].blueScale); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + if (privateDicts[i].blueShift != 7) { + buf = GooString::format("/BlueShift {0:d} def\n", privateDicts[i].blueShift); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + if (privateDicts[i].blueFuzz != 1) { + buf = GooString::format("/BlueFuzz {0:d} def\n", privateDicts[i].blueFuzz); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + if (privateDicts[i].hasStdHW) { + buf = GooString::format("/StdHW [{0:.4g}] def\n", privateDicts[i].stdHW); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + if (privateDicts[i].hasStdVW) { + buf = GooString::format("/StdVW [{0:.4g}] def\n", privateDicts[i].stdVW); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + if (privateDicts[i].nStemSnapH) { + (*outputFunc)(outputStream, "/StemSnapH [", 12); + for (j = 0; j < privateDicts[i].nStemSnapH; ++j) { + buf = GooString::format("{0:s}{1:.4g}", j > 0 ? " " : "", privateDicts[i].stemSnapH[j]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "] def\n", 6); + } + if (privateDicts[i].nStemSnapV) { + (*outputFunc)(outputStream, "/StemSnapV [", 12); + for (j = 0; j < privateDicts[i].nStemSnapV; ++j) { + buf = GooString::format("{0:s}{1:.4g}", j > 0 ? " " : "", privateDicts[i].stemSnapV[j]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "] def\n", 6); + } + if (privateDicts[i].hasForceBold) { + buf = GooString::format("/ForceBold {0:s} def\n", privateDicts[i].forceBold ? "true" : "false"); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + if (privateDicts[i].forceBoldThreshold != 0) { + buf = GooString::format("/ForceBoldThreshold {0:.4g} def\n", privateDicts[i].forceBoldThreshold); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + if (privateDicts[i].languageGroup != 0) { + buf = GooString::format("/LanguageGroup {0:d} def\n", privateDicts[i].languageGroup); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + if (privateDicts[i].expansionFactor != 0.06) { + buf = GooString::format("/ExpansionFactor {0:.4g} def\n", privateDicts[i].expansionFactor); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "currentdict end def\n", 20); + (*outputFunc)(outputStream, "currentdict end put\n", 20); + } + (*outputFunc)(outputStream, "def\n", 4); + + // start the binary section + offset = (nCIDs + 1) * (1 + gdBytes); + buf = GooString::format("(Hex) {0:d} StartData\n", offset + charStrings->getLength()); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + + // write the charstring offset (CIDMap) table + for (i = 0; i <= nCIDs; i += 6) { + for (j = 0; j < 6 && i + j <= nCIDs; ++j) { + if (i + j < nCIDs && cidMap[i + j] >= 0 && fdSelect) { + buf2[0] = (char)fdSelect[cidMap[i + j]]; + } else { + buf2[0] = (char)0; + } + n = offset + charStringOffsets[i + j]; + for (k = gdBytes; k >= 1; --k) { + buf2[k] = (char)(n & 0xff); + n >>= 8; + } + for (k = 0; k <= gdBytes; ++k) { + buf = GooString::format("{0:02x}", buf2[k] & 0xff); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + } + (*outputFunc)(outputStream, "\n", 1); + } + + // write the charstring data + n = charStrings->getLength(); + for (i = 0; i < n; i += 32) { + for (j = 0; j < 32 && i + j < n; ++j) { + buf = GooString::format("{0:02x}", charStrings->getChar(i + j) & 0xff); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + if (i + 32 >= n) { + (*outputFunc)(outputStream, ">", 1); + } + (*outputFunc)(outputStream, "\n", 1); + } + + gfree(charStringOffsets); + delete charStrings; + gfree(cidMap); +} + +void FoFiType1C::convertToType0(const char *psName, const int *codeMap, int nCodes, FoFiOutputFunc outputFunc, void *outputStream) +{ + int *cidMap; + Type1CIndex subrIdx; + Type1CIndexVal val; + int nCIDs; + Type1CEexecBuf eb; + bool ok; + int fd, i, j, k; + + // compute the CID count and build the CID-to-GID mapping + if (codeMap) { + nCIDs = nCodes; + cidMap = (int *)gmallocn(nCIDs, sizeof(int)); + for (i = 0; i < nCodes; ++i) { + if (codeMap[i] >= 0 && codeMap[i] < nGlyphs) { + cidMap[i] = codeMap[i]; + } else { + cidMap[i] = -1; + } + } + } else if (topDict.firstOp == 0x0c1e) { + nCIDs = 0; + for (i = 0; i < nGlyphs && i < charsetLength; ++i) { + if (charset[i] >= nCIDs) { + nCIDs = charset[i] + 1; + } + } + cidMap = (int *)gmallocn(nCIDs, sizeof(int)); + for (i = 0; i < nCIDs; ++i) { + cidMap[i] = -1; + } + for (i = 0; i < nGlyphs && i < charsetLength; ++i) { + cidMap[charset[i]] = i; + } + } else { + nCIDs = nGlyphs; + cidMap = (int *)gmallocn(nCIDs, sizeof(int)); + for (i = 0; i < nCIDs; ++i) { + cidMap[i] = i; + } + } + + if (privateDicts) { + // write the descendant Type 1 fonts + for (i = 0; i < nCIDs; i += 256) { + + //~ this assumes that all CIDs in this block have the same FD -- + //~ to handle multiple FDs correctly, need to somehow divide the + //~ font up by FD; as a kludge we ignore CID 0, which is .notdef + fd = 0; + // if fdSelect is NULL, we have an 8-bit font, so just leave fd=0 + if (fdSelect) { + for (j = i == 0 ? 1 : 0; j < 256 && i + j < nCIDs; ++j) { + if (cidMap[i + j] >= 0) { + fd = fdSelect[cidMap[i + j]]; + break; + } + } + } + + if (fd >= nFDs) { + continue; + } + + // font dictionary (unencrypted section) + (*outputFunc)(outputStream, "16 dict begin\n", 14); + (*outputFunc)(outputStream, "/FontName /", 11); + (*outputFunc)(outputStream, psName, strlen(psName)); + std::unique_ptr<GooString> buf = GooString::format("_{0:02x} def\n", i >> 8); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + (*outputFunc)(outputStream, "/FontType 1 def\n", 16); + if (privateDicts[fd].hasFontMatrix) { + buf = GooString::format("/FontMatrix [{0:.8g} {1:.8g} {2:.8g} {3:.8g} {4:.8g} {5:.8g}] def\n", privateDicts[fd].fontMatrix[0], privateDicts[fd].fontMatrix[1], privateDicts[fd].fontMatrix[2], privateDicts[fd].fontMatrix[3], + privateDicts[fd].fontMatrix[4], privateDicts[fd].fontMatrix[5]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } else if (topDict.hasFontMatrix) { + (*outputFunc)(outputStream, "/FontMatrix [1 0 0 1 0 0] def\n", 30); + } else { + (*outputFunc)(outputStream, "/FontMatrix [0.001 0 0 0.001 0 0] def\n", 38); + } + buf = GooString::format("/FontBBox [{0:.4g} {1:.4g} {2:.4g} {3:.4g}] def\n", topDict.fontBBox[0], topDict.fontBBox[1], topDict.fontBBox[2], topDict.fontBBox[3]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + buf = GooString::format("/PaintType {0:d} def\n", topDict.paintType); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + if (topDict.paintType != 0) { + buf = GooString::format("/StrokeWidth {0:.4g} def\n", topDict.strokeWidth); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "/Encoding 256 array\n", 20); + for (j = 0; j < 256 && i + j < nCIDs; ++j) { + buf = GooString::format("dup {0:d} /c{1:02x} put\n", j, j); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + if (j < 256) { + buf = GooString::format("{0:d} 1 255 {{ 1 index exch /.notdef put }} for\n", j); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "readonly def\n", 13); + (*outputFunc)(outputStream, "currentdict end\n", 16); + + // start the binary section + (*outputFunc)(outputStream, "currentfile eexec\n", 18); + eb.outputFunc = outputFunc; + eb.outputStream = outputStream; + eb.ascii = true; + eb.r1 = 55665; + eb.line = 0; + + // start the private dictionary + eexecWrite(&eb, "\x83\xca\x73\xd5"); + eexecWrite(&eb, "dup /Private 32 dict dup begin\n"); + eexecWrite(&eb, + "/RD {string currentfile exch readstring pop}" + " executeonly def\n"); + eexecWrite(&eb, "/ND {noaccess def} executeonly def\n"); + eexecWrite(&eb, "/NP {noaccess put} executeonly def\n"); + eexecWrite(&eb, "/MinFeature {16 16} def\n"); + eexecWrite(&eb, "/password 5839 def\n"); + if (privateDicts[fd].nBlueValues) { + eexecWrite(&eb, "/BlueValues ["); + for (k = 0; k < privateDicts[fd].nBlueValues; ++k) { + buf = GooString::format("{0:s}{1:d}", k > 0 ? " " : "", privateDicts[fd].blueValues[k]); + eexecWrite(&eb, buf->c_str()); + } + eexecWrite(&eb, "] def\n"); + } + if (privateDicts[fd].nOtherBlues) { + eexecWrite(&eb, "/OtherBlues ["); + for (k = 0; k < privateDicts[fd].nOtherBlues; ++k) { + buf = GooString::format("{0:s}{1:d}", k > 0 ? " " : "", privateDicts[fd].otherBlues[k]); + eexecWrite(&eb, buf->c_str()); + } + eexecWrite(&eb, "] def\n"); + } + if (privateDicts[fd].nFamilyBlues) { + eexecWrite(&eb, "/FamilyBlues ["); + for (k = 0; k < privateDicts[fd].nFamilyBlues; ++k) { + buf = GooString::format("{0:s}{1:d}", k > 0 ? " " : "", privateDicts[fd].familyBlues[k]); + eexecWrite(&eb, buf->c_str()); + } + eexecWrite(&eb, "] def\n"); + } + if (privateDicts[fd].nFamilyOtherBlues) { + eexecWrite(&eb, "/FamilyOtherBlues ["); + for (k = 0; k < privateDicts[fd].nFamilyOtherBlues; ++k) { + buf = GooString::format("{0:s}{1:d}", k > 0 ? " " : "", privateDicts[fd].familyOtherBlues[k]); + eexecWrite(&eb, buf->c_str()); + } + eexecWrite(&eb, "] def\n"); + } + if (privateDicts[fd].blueScale != 0.039625) { + buf = GooString::format("/BlueScale {0:.4g} def\n", privateDicts[fd].blueScale); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[fd].blueShift != 7) { + buf = GooString::format("/BlueShift {0:d} def\n", privateDicts[fd].blueShift); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[fd].blueFuzz != 1) { + buf = GooString::format("/BlueFuzz {0:d} def\n", privateDicts[fd].blueFuzz); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[fd].hasStdHW) { + buf = GooString::format("/StdHW [{0:.4g}] def\n", privateDicts[fd].stdHW); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[fd].hasStdVW) { + buf = GooString::format("/StdVW [{0:.4g}] def\n", privateDicts[fd].stdVW); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[fd].nStemSnapH) { + eexecWrite(&eb, "/StemSnapH ["); + for (k = 0; k < privateDicts[fd].nStemSnapH; ++k) { + buf = GooString::format("{0:s}{1:.4g}", k > 0 ? " " : "", privateDicts[fd].stemSnapH[k]); + eexecWrite(&eb, buf->c_str()); + } + eexecWrite(&eb, "] def\n"); + } + if (privateDicts[fd].nStemSnapV) { + eexecWrite(&eb, "/StemSnapV ["); + for (k = 0; k < privateDicts[fd].nStemSnapV; ++k) { + buf = GooString::format("{0:s}{1:.4g}", k > 0 ? " " : "", privateDicts[fd].stemSnapV[k]); + eexecWrite(&eb, buf->c_str()); + } + eexecWrite(&eb, "] def\n"); + } + if (privateDicts[fd].hasForceBold) { + buf = GooString::format("/ForceBold {0:s} def\n", privateDicts[fd].forceBold ? "true" : "false"); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[fd].forceBoldThreshold != 0) { + buf = GooString::format("/ForceBoldThreshold {0:.4g} def\n", privateDicts[fd].forceBoldThreshold); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[fd].languageGroup != 0) { + buf = GooString::format("/LanguageGroup {0:d} def\n", privateDicts[fd].languageGroup); + eexecWrite(&eb, buf->c_str()); + } + if (privateDicts[fd].expansionFactor != 0.06) { + buf = GooString::format("/ExpansionFactor {0:.4g} def\n", privateDicts[fd].expansionFactor); + eexecWrite(&eb, buf->c_str()); + } + + // set up the subroutines + ok = true; + getIndex(privateDicts[fd].subrsOffset, &subrIdx, &ok); + if (!ok) { + subrIdx.pos = -1; + } + + // start the CharStrings + eexecWrite(&eb, "2 index /CharStrings 256 dict dup begin\n"); + + // write the .notdef CharString + ok = true; + getIndexVal(&charStringsIdx, 0, &val, &ok); + if (ok) { + eexecCvtGlyph(&eb, ".notdef", val.pos, val.len, &subrIdx, &privateDicts[fd]); + } + + // write the CharStrings + for (j = 0; j < 256 && i + j < nCIDs; ++j) { + if (cidMap[i + j] >= 0) { + ok = true; + getIndexVal(&charStringsIdx, cidMap[i + j], &val, &ok); + if (ok) { + buf = GooString::format("c{0:02x}", j); + eexecCvtGlyph(&eb, buf->c_str(), val.pos, val.len, &subrIdx, &privateDicts[fd]); + } + } + } + eexecWrite(&eb, "end\n"); + eexecWrite(&eb, "end\n"); + eexecWrite(&eb, "readonly put\n"); + eexecWrite(&eb, "noaccess put\n"); + eexecWrite(&eb, "dup /FontName get exch definefont pop\n"); + eexecWrite(&eb, "mark currentfile closefile\n"); + + // trailer + if (eb.line > 0) { + (*outputFunc)(outputStream, "\n", 1); + } + for (j = 0; j < 8; ++j) { + (*outputFunc)(outputStream, "0000000000000000000000000000000000000000000000000000000000000000\n", 65); + } + (*outputFunc)(outputStream, "cleartomark\n", 12); + } + } else { + error(errSyntaxError, -1, "FoFiType1C::convertToType0 without privateDicts"); + } + + // write the Type 0 parent font + (*outputFunc)(outputStream, "16 dict begin\n", 14); + (*outputFunc)(outputStream, "/FontName /", 11); + (*outputFunc)(outputStream, psName, strlen(psName)); + (*outputFunc)(outputStream, " def\n", 5); + (*outputFunc)(outputStream, "/FontType 0 def\n", 16); + if (topDict.hasFontMatrix) { + const std::unique_ptr<GooString> buf = GooString::format("/FontMatrix [{0:.8g} {1:.8g} {2:.8g} {3:.8g} {4:.8g} {5:.8g}] def\n", topDict.fontMatrix[0], topDict.fontMatrix[1], topDict.fontMatrix[2], topDict.fontMatrix[3], + topDict.fontMatrix[4], topDict.fontMatrix[5]); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } else { + (*outputFunc)(outputStream, "/FontMatrix [1 0 0 1 0 0] def\n", 30); + } + (*outputFunc)(outputStream, "/FMapType 2 def\n", 16); + (*outputFunc)(outputStream, "/Encoding [\n", 12); + for (i = 0; i < nCIDs; i += 256) { + const std::unique_ptr<GooString> buf = GooString::format("{0:d}\n", i >> 8); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "] def\n", 6); + (*outputFunc)(outputStream, "/FDepVector [\n", 14); + for (i = 0; i < nCIDs; i += 256) { + (*outputFunc)(outputStream, "/", 1); + (*outputFunc)(outputStream, psName, strlen(psName)); + const std::unique_ptr<GooString> buf = GooString::format("_{0:02x} findfont\n", i >> 8); + (*outputFunc)(outputStream, buf->c_str(), buf->getLength()); + } + (*outputFunc)(outputStream, "] def\n", 6); + (*outputFunc)(outputStream, "FontName currentdict end definefont pop\n", 40); + + gfree(cidMap); +} + +void FoFiType1C::eexecCvtGlyph(Type1CEexecBuf *eb, const char *glyphName, int offset, int nBytes, const Type1CIndex *subrIdx, const Type1CPrivateDict *pDict) +{ + GooString *charBuf; + + // generate the charstring + charBuf = new GooString(); + std::set<int> offsetBeingParsed; + cvtGlyph(offset, nBytes, charBuf, subrIdx, pDict, true, offsetBeingParsed); + + const std::unique_ptr<GooString> buf = GooString::format("/{0:s} {1:d} RD ", glyphName, charBuf->getLength()); + eexecWrite(eb, buf->c_str()); + eexecWriteCharstring(eb, (unsigned char *)charBuf->c_str(), charBuf->getLength()); + eexecWrite(eb, " ND\n"); + + delete charBuf; +} + +void FoFiType1C::cvtGlyph(int offset, int nBytes, GooString *charBuf, const Type1CIndex *subrIdx, const Type1CPrivateDict *pDict, bool top, std::set<int> &offsetBeingParsed) +{ + Type1CIndexVal val; + bool ok, dFP; + double d, dx, dy; + unsigned short r2; + unsigned char byte; + int pos, subrBias, start, i, k; + + if (offsetBeingParsed.find(offset) != offsetBeingParsed.end()) { + return; + } + + auto offsetEmplaceResult = offsetBeingParsed.emplace(offset); + + start = charBuf->getLength(); + if (top) { + charBuf->append('\x49'); // 73; + charBuf->append('\x3A'); // 58; + charBuf->append('\x93'); // 147; + charBuf->append('\x86'); // 134; + nOps = 0; + nHints = 0; + firstOp = true; + openPath = false; + } + + pos = offset; + while (pos < offset + nBytes) { + ok = true; + pos = getOp(pos, true, &ok); + if (!ok) { + break; + } + if (!ops[nOps - 1].isNum) { + --nOps; // drop the operator + switch (ops[nOps].op) { + case 0x0001: // hstem + if (firstOp) { + cvtGlyphWidth(nOps & 1, charBuf, pDict); + firstOp = false; + } + if (nOps & 1) { + //~ error(-1, "Wrong number of args (%d) to Type 2 hstem", nOps); + } + d = 0; + dFP = false; + for (k = 0; k < nOps; k += 2) { + // convert Type 2 edge hints (-20 or -21) to Type 1 ghost hints + if (ops[k + 1].num < 0) { + d += ops[k].num + ops[k + 1].num; + dFP |= ops[k].isFP | ops[k + 1].isFP; + cvtNum(d, dFP, charBuf); + cvtNum(-ops[k + 1].num, ops[k + 1].isFP, charBuf); + } else { + d += ops[k].num; + dFP |= ops[k].isFP; + cvtNum(d, dFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + d += ops[k + 1].num; + dFP |= ops[k + 1].isFP; + } + charBuf->append((char)1); + } + nHints += nOps / 2; + nOps = 0; + break; + case 0x0003: // vstem + if (firstOp) { + cvtGlyphWidth(nOps & 1, charBuf, pDict); + firstOp = false; + } + if (nOps & 1) { + //~ error(-1, "Wrong number of args (%d) to Type 2 vstem", nOps); + } + d = 0; + dFP = false; + for (k = 0; k < nOps; k += 2) { + // convert Type 2 edge hints (-20 or -21) to Type 1 ghost hints + if (ops[k + 1].num < 0) { + d += ops[k].num + ops[k + 1].num; + dFP |= ops[k].isFP | ops[k + 1].isFP; + cvtNum(d, dFP, charBuf); + cvtNum(-ops[k + 1].num, ops[k + 1].isFP, charBuf); + } else { + d += ops[k].num; + dFP |= ops[k].isFP; + cvtNum(d, dFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + d += ops[k + 1].num; + dFP |= ops[k + 1].isFP; + } + charBuf->append((char)3); + } + nHints += nOps / 2; + nOps = 0; + break; + case 0x0004: // vmoveto + if (firstOp) { + cvtGlyphWidth(nOps == 2, charBuf, pDict); + firstOp = false; + } + if (openPath) { + charBuf->append((char)9); + openPath = false; + } + if (nOps != 1) { + //~ error(-1, "Wrong number of args (%d) to Type 2 vmoveto", nOps); + } + cvtNum(ops[0].num, ops[0].isFP, charBuf); + charBuf->append((char)4); + nOps = 0; + break; + case 0x0005: // rlineto + if (nOps < 2 || nOps % 2 != 0) { + //~ error(-1, "Wrong number of args (%d) to Type 2 rlineto", nOps); + } + for (k = 0; k < nOps; k += 2) { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + charBuf->append((char)5); + } + nOps = 0; + openPath = true; + break; + case 0x0006: // hlineto + if (nOps < 1) { + //~ error(-1, "Wrong number of args (%d) to Type 2 hlineto", nOps); + } + for (k = 0; k < nOps; ++k) { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + charBuf->append((char)((k & 1) ? 7 : 6)); + } + nOps = 0; + openPath = true; + break; + case 0x0007: // vlineto + if (nOps < 1) { + //~ error(-1, "Wrong number of args (%d) to Type 2 vlineto", nOps); + } + for (k = 0; k < nOps; ++k) { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + charBuf->append((char)((k & 1) ? 6 : 7)); + } + nOps = 0; + openPath = true; + break; + case 0x0008: // rrcurveto + if (nOps < 6 || nOps % 6 != 0) { + //~ error(-1, "Wrong number of args (%d) to Type 2 rrcurveto", nOps); + } + for (k = 0; k < nOps; k += 6) { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + cvtNum(ops[k + 4].num, ops[k + 4].isFP, charBuf); + cvtNum(ops[k + 5].num, ops[k + 5].isFP, charBuf); + charBuf->append((char)8); + } + nOps = 0; + openPath = true; + break; + case 0x000a: // callsubr + if (nOps >= 1) { + subrBias = (subrIdx->len < 1240) ? 107 : (subrIdx->len < 33900) ? 1131 : 32768; + k = subrBias + (int)ops[nOps - 1].num; + --nOps; + ok = true; + getIndexVal(subrIdx, k, &val, &ok); + if (likely(ok && val.pos != offset)) { + cvtGlyph(val.pos, val.len, charBuf, subrIdx, pDict, false, offsetBeingParsed); + } + } else { + //~ error(-1, "Too few args to Type 2 callsubr"); + } + // don't clear the stack + break; + case 0x000b: // return + // don't clear the stack + break; + case 0x000e: // endchar / seac + if (firstOp) { + cvtGlyphWidth(nOps == 1 || nOps == 5, charBuf, pDict); + firstOp = false; + } + if (openPath) { + charBuf->append((char)9); + openPath = false; + } + if (nOps == 4) { + cvtNum(0, false, charBuf); + cvtNum(ops[0].num, ops[0].isFP, charBuf); + cvtNum(ops[1].num, ops[1].isFP, charBuf); + cvtNum(ops[2].num, ops[2].isFP, charBuf); + cvtNum(ops[3].num, ops[3].isFP, charBuf); + charBuf->append((char)12)->append((char)6); + } else if (nOps == 0) { + charBuf->append((char)14); + } else { + //~ error(-1, "Wrong number of args (%d) to Type 2 endchar", nOps); + } + nOps = 0; + break; + case 0x000f: // (obsolete) + // this op is ignored, but we need the glyph width + if (firstOp) { + cvtGlyphWidth(nOps > 0, charBuf, pDict); + firstOp = false; + } + nOps = 0; + break; + case 0x0010: // blend + //~ error(-1, "Unimplemented Type 2 charstring op: %d", file[i]); + nOps = 0; + break; + case 0x0012: // hstemhm + // ignored + if (firstOp) { + cvtGlyphWidth(nOps & 1, charBuf, pDict); + firstOp = false; + } + if (nOps & 1) { + //~ error(-1, "Wrong number of args (%d) to Type 2 hstemhm", nOps); + } + nHints += nOps / 2; + nOps = 0; + break; + case 0x0013: // hintmask + // ignored + if (firstOp) { + cvtGlyphWidth(nOps & 1, charBuf, pDict); + firstOp = false; + } + if (nOps > 0) { + if (nOps & 1) { + //~ error(-1, "Wrong number of args (%d) to Type 2 hintmask/vstemhm", + //~ nOps); + } + nHints += nOps / 2; + } + pos += (nHints + 7) >> 3; + nOps = 0; + break; + case 0x0014: // cntrmask + // ignored + if (firstOp) { + cvtGlyphWidth(nOps & 1, charBuf, pDict); + firstOp = false; + } + if (nOps > 0) { + if (nOps & 1) { + //~ error(-1, "Wrong number of args (%d) to Type 2 cntrmask/vstemhm", + //~ nOps); + } + nHints += nOps / 2; + } + pos += (nHints + 7) >> 3; + nOps = 0; + break; + case 0x0015: // rmoveto + if (firstOp) { + cvtGlyphWidth(nOps == 3, charBuf, pDict); + firstOp = false; + } + if (openPath) { + charBuf->append((char)9); + openPath = false; + } + if (nOps != 2) { + //~ error(-1, "Wrong number of args (%d) to Type 2 rmoveto", nOps); + } + cvtNum(ops[0].num, ops[0].isFP, charBuf); + cvtNum(ops[1].num, ops[1].isFP, charBuf); + charBuf->append((char)21); + nOps = 0; + break; + case 0x0016: // hmoveto + if (firstOp) { + cvtGlyphWidth(nOps == 2, charBuf, pDict); + firstOp = false; + } + if (openPath) { + charBuf->append((char)9); + openPath = false; + } + if (nOps != 1) { + //~ error(-1, "Wrong number of args (%d) to Type 2 hmoveto", nOps); + } + cvtNum(ops[0].num, ops[0].isFP, charBuf); + charBuf->append((char)22); + nOps = 0; + break; + case 0x0017: // vstemhm + // ignored + if (firstOp) { + cvtGlyphWidth(nOps & 1, charBuf, pDict); + firstOp = false; + } + if (nOps & 1) { + //~ error(-1, "Wrong number of args (%d) to Type 2 vstemhm", nOps); + } + nHints += nOps / 2; + nOps = 0; + break; + case 0x0018: // rcurveline + if (nOps < 8 || (nOps - 2) % 6 != 0) { + //~ error(-1, "Wrong number of args (%d) to Type 2 rcurveline", nOps); + } + for (k = 0; k < nOps - 2; k += 6) { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + cvtNum(ops[k + 4].num, ops[k + 4].isFP, charBuf); + cvtNum(ops[k + 5].num, ops[k + 5].isFP, charBuf); + charBuf->append((char)8); + } + if (likely(k + 1 < nOps)) { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + charBuf->append((char)5); + } + nOps = 0; + openPath = true; + break; + case 0x0019: // rlinecurve + if (nOps < 8 || (nOps - 6) % 2 != 0) { + //~ error(-1, "Wrong number of args (%d) to Type 2 rlinecurve", nOps); + } + for (k = 0; k < nOps - 6; k += 2) { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + charBuf->append((char)5); + } + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + cvtNum(ops[k + 4].num, ops[k + 4].isFP, charBuf); + cvtNum(ops[k + 5].num, ops[k + 5].isFP, charBuf); + charBuf->append((char)8); + nOps = 0; + openPath = true; + break; + case 0x001a: // vvcurveto + if (nOps < 4 || !(nOps % 4 == 0 || (nOps - 1) % 4 == 0)) { + //~ error(-1, "Wrong number of args (%d) to Type 2 vvcurveto", nOps); + } + if (nOps % 2 == 1) { + cvtNum(ops[0].num, ops[0].isFP, charBuf); + cvtNum(ops[1].num, ops[1].isFP, charBuf); + cvtNum(ops[2].num, ops[2].isFP, charBuf); + cvtNum(ops[3].num, ops[3].isFP, charBuf); + cvtNum(0, false, charBuf); + cvtNum(ops[4].num, ops[4].isFP, charBuf); + charBuf->append((char)8); + k = 5; + } else { + k = 0; + } + for (; k < nOps; k += 4) { + cvtNum(0, false, charBuf); + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(0, false, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + charBuf->append((char)8); + } + nOps = 0; + openPath = true; + break; + case 0x001b: // hhcurveto + if (nOps < 4 || !(nOps % 4 == 0 || (nOps - 1) % 4 == 0)) { + //~ error(-1, "Wrong number of args (%d) to Type 2 hhcurveto", nOps); + } + if (nOps % 2 == 1) { + cvtNum(ops[1].num, ops[1].isFP, charBuf); + cvtNum(ops[0].num, ops[0].isFP, charBuf); + cvtNum(ops[2].num, ops[2].isFP, charBuf); + cvtNum(ops[3].num, ops[3].isFP, charBuf); + cvtNum(ops[4].num, ops[4].isFP, charBuf); + cvtNum(0, false, charBuf); + charBuf->append((char)8); + k = 5; + } else { + k = 0; + } + for (; k < nOps; k += 4) { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(0, false, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + cvtNum(0, false, charBuf); + charBuf->append((char)8); + } + nOps = 0; + openPath = true; + break; + case 0x001d: // callgsubr + if (nOps >= 1) { + k = gsubrBias + (int)ops[nOps - 1].num; + --nOps; + ok = true; + getIndexVal(&gsubrIdx, k, &val, &ok); + if (likely(ok && val.pos != offset)) { + cvtGlyph(val.pos, val.len, charBuf, subrIdx, pDict, false, offsetBeingParsed); + } + } else { + //~ error(-1, "Too few args to Type 2 callgsubr"); + } + // don't clear the stack + break; + case 0x001e: // vhcurveto + if (nOps < 4 || !(nOps % 4 == 0 || (nOps - 1) % 4 == 0)) { + //~ error(-1, "Wrong number of args (%d) to Type 2 vhcurveto", nOps); + } + for (k = 0; k < nOps && k != nOps - 5; k += 4) { + if (k % 8 == 0) { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + charBuf->append((char)30); + } else { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + charBuf->append((char)31); + } + } + if (k == nOps - 5) { + if (k % 8 == 0) { + cvtNum(0, false, charBuf); + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + cvtNum(ops[k + 4].num, ops[k + 4].isFP, charBuf); + } else { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(0, false, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(ops[k + 4].num, ops[k + 4].isFP, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + } + charBuf->append((char)8); + } + nOps = 0; + openPath = true; + break; + case 0x001f: // hvcurveto + if (nOps < 4 || !(nOps % 4 == 0 || (nOps - 1) % 4 == 0)) { + //~ error(-1, "Wrong number of args (%d) to Type 2 hvcurveto", nOps); + } + for (k = 0; k < nOps && k != nOps - 5; k += 4) { + if (k % 8 == 0) { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + charBuf->append((char)31); + } else { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + charBuf->append((char)30); + } + } + if (k == nOps - 5) { + if (k % 8 == 0) { + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(0, false, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(ops[k + 4].num, ops[k + 4].isFP, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + } else { + cvtNum(0, false, charBuf); + cvtNum(ops[k].num, ops[k].isFP, charBuf); + cvtNum(ops[k + 1].num, ops[k + 1].isFP, charBuf); + cvtNum(ops[k + 2].num, ops[k + 2].isFP, charBuf); + cvtNum(ops[k + 3].num, ops[k + 3].isFP, charBuf); + cvtNum(ops[k + 4].num, ops[k + 4].isFP, charBuf); + } + charBuf->append((char)8); + } + nOps = 0; + openPath = true; + break; + case 0x0c00: // dotsection (should be Type 1 only?) + // ignored + nOps = 0; + break; + case 0x0c03: // and + case 0x0c04: // or + case 0x0c05: // not + case 0x0c08: // store + case 0x0c09: // abs + case 0x0c0a: // add + case 0x0c0b: // sub + case 0x0c0c: // div + case 0x0c0d: // load + case 0x0c0e: // neg + case 0x0c0f: // eq + case 0x0c12: // drop + case 0x0c14: // put + case 0x0c15: // get + case 0x0c16: // ifelse + case 0x0c17: // random + case 0x0c18: // mul + case 0x0c1a: // sqrt + case 0x0c1b: // dup + case 0x0c1c: // exch + case 0x0c1d: // index + case 0x0c1e: // roll + //~ error(-1, "Unimplemented Type 2 charstring op: 12.%d", file[i+1]); + nOps = 0; + break; + case 0x0c22: // hflex + if (nOps != 7) { + //~ error(-1, "Wrong number of args (%d) to Type 2 hflex", nOps); + } + cvtNum(ops[0].num, ops[0].isFP, charBuf); + cvtNum(0, false, charBuf); + cvtNum(ops[1].num, ops[1].isFP, charBuf); + cvtNum(ops[2].num, ops[2].isFP, charBuf); + cvtNum(ops[3].num, ops[3].isFP, charBuf); + cvtNum(0, false, charBuf); + charBuf->append((char)8); + cvtNum(ops[4].num, ops[4].isFP, charBuf); + cvtNum(0, false, charBuf); + cvtNum(ops[5].num, ops[5].isFP, charBuf); + cvtNum(-ops[2].num, ops[2].isFP, charBuf); + cvtNum(ops[6].num, ops[6].isFP, charBuf); + cvtNum(0, false, charBuf); + charBuf->append((char)8); + nOps = 0; + openPath = true; + break; + case 0x0c23: // flex + if (nOps != 13) { + //~ error(-1, "Wrong number of args (%d) to Type 2 flex", nOps); + } + cvtNum(ops[0].num, ops[0].isFP, charBuf); + cvtNum(ops[1].num, ops[1].isFP, charBuf); + cvtNum(ops[2].num, ops[2].isFP, charBuf); + cvtNum(ops[3].num, ops[3].isFP, charBuf); + cvtNum(ops[4].num, ops[4].isFP, charBuf); + cvtNum(ops[5].num, ops[5].isFP, charBuf); + charBuf->append((char)8); + cvtNum(ops[6].num, ops[6].isFP, charBuf); + cvtNum(ops[7].num, ops[7].isFP, charBuf); + cvtNum(ops[8].num, ops[8].isFP, charBuf); + cvtNum(ops[9].num, ops[9].isFP, charBuf); + cvtNum(ops[10].num, ops[10].isFP, charBuf); + cvtNum(ops[11].num, ops[11].isFP, charBuf); + charBuf->append((char)8); + nOps = 0; + openPath = true; + break; + case 0x0c24: // hflex1 + if (nOps != 9) { + //~ error(-1, "Wrong number of args (%d) to Type 2 hflex1", nOps); + } + cvtNum(ops[0].num, ops[0].isFP, charBuf); + cvtNum(ops[1].num, ops[1].isFP, charBuf); + cvtNum(ops[2].num, ops[2].isFP, charBuf); + cvtNum(ops[3].num, ops[3].isFP, charBuf); + cvtNum(ops[4].num, ops[4].isFP, charBuf); + cvtNum(0, false, charBuf); + charBuf->append((char)8); + cvtNum(ops[5].num, ops[5].isFP, charBuf); + cvtNum(0, false, charBuf); + cvtNum(ops[6].num, ops[6].isFP, charBuf); + cvtNum(ops[7].num, ops[7].isFP, charBuf); + cvtNum(ops[8].num, ops[8].isFP, charBuf); + cvtNum(-(ops[1].num + ops[3].num + ops[7].num), ops[1].isFP | ops[3].isFP | ops[7].isFP, charBuf); + charBuf->append((char)8); + nOps = 0; + openPath = true; + break; + case 0x0c25: // flex1 + if (nOps != 11) { + //~ error(-1, "Wrong number of args (%d) to Type 2 flex1", nOps); + } + cvtNum(ops[0].num, ops[0].isFP, charBuf); + cvtNum(ops[1].num, ops[1].isFP, charBuf); + cvtNum(ops[2].num, ops[2].isFP, charBuf); + cvtNum(ops[3].num, ops[3].isFP, charBuf); + cvtNum(ops[4].num, ops[4].isFP, charBuf); + cvtNum(ops[5].num, ops[5].isFP, charBuf); + charBuf->append((char)8); + cvtNum(ops[6].num, ops[6].isFP, charBuf); + cvtNum(ops[7].num, ops[7].isFP, charBuf); + cvtNum(ops[8].num, ops[8].isFP, charBuf); + cvtNum(ops[9].num, ops[9].isFP, charBuf); + dx = ops[0].num + ops[2].num + ops[4].num + ops[6].num + ops[8].num; + dy = ops[1].num + ops[3].num + ops[5].num + ops[7].num + ops[9].num; + if (fabs(dx) > fabs(dy)) { + cvtNum(ops[10].num, ops[10].isFP, charBuf); + cvtNum(-dy, ops[1].isFP | ops[3].isFP | ops[5].isFP | ops[7].isFP | ops[9].isFP, charBuf); + } else { + cvtNum(-dx, ops[0].isFP | ops[2].isFP | ops[4].isFP | ops[6].isFP | ops[8].isFP, charBuf); + cvtNum(ops[10].num, ops[10].isFP, charBuf); + } + charBuf->append((char)8); + nOps = 0; + openPath = true; + break; + default: + //~ error(-1, "Illegal Type 2 charstring op: %04x", + //~ ops[nOps].op); + nOps = 0; + break; + } + } + } + + // charstring encryption + if (top) { + r2 = 4330; + for (i = start; i < charBuf->getLength(); ++i) { + byte = charBuf->getChar(i) ^ (r2 >> 8); + charBuf->setChar(i, byte); + r2 = (byte + r2) * 52845 + 22719; + } + } + + offsetBeingParsed.erase(offsetEmplaceResult.first); +} + +void FoFiType1C::cvtGlyphWidth(bool useOp, GooString *charBuf, const Type1CPrivateDict *pDict) +{ + double w; + bool wFP; + int i; + + if (useOp) { + w = pDict->nominalWidthX + ops[0].num; + wFP = pDict->nominalWidthXFP | ops[0].isFP; + for (i = 1; i < nOps; ++i) { + ops[i - 1] = ops[i]; + } + --nOps; + } else { + w = pDict->defaultWidthX; + wFP = pDict->defaultWidthXFP; + } + cvtNum(0, false, charBuf); + cvtNum(w, wFP, charBuf); + charBuf->append((char)13); +} + +void FoFiType1C::cvtNum(double x, bool isFP, GooString *charBuf) const +{ + unsigned char buf[12]; + int y, n; + + n = 0; + if (isFP) { + if (x >= -32768 && x < 32768) { + y = (int)(x * 256.0); + buf[0] = 255; + buf[1] = (unsigned char)(y >> 24); + buf[2] = (unsigned char)(y >> 16); + buf[3] = (unsigned char)(y >> 8); + buf[4] = (unsigned char)y; + buf[5] = 255; + buf[6] = 0; + buf[7] = 0; + buf[8] = 1; + buf[9] = 0; + buf[10] = 12; + buf[11] = 12; + n = 12; + } else { + //~ error(-1, "Type 2 fixed point constant out of range"); + } + } else { + y = (int)x; + if (y >= -107 && y <= 107) { + buf[0] = (unsigned char)(y + 139); + n = 1; + } else if (y > 107 && y <= 1131) { + y -= 108; + buf[0] = (unsigned char)((y >> 8) + 247); + buf[1] = (unsigned char)(y & 0xff); + n = 2; + } else if (y < -107 && y >= -1131) { + y = -y - 108; + buf[0] = (unsigned char)((y >> 8) + 251); + buf[1] = (unsigned char)(y & 0xff); + n = 2; + } else { + buf[0] = 255; + buf[1] = (unsigned char)(y >> 24); + buf[2] = (unsigned char)(y >> 16); + buf[3] = (unsigned char)(y >> 8); + buf[4] = (unsigned char)y; + n = 5; + } + } + charBuf->append((char *)buf, n); +} + +void FoFiType1C::eexecWrite(Type1CEexecBuf *eb, const char *s) const +{ + unsigned char *p; + unsigned char x; + + for (p = (unsigned char *)s; *p; ++p) { + x = *p ^ (eb->r1 >> 8); + eb->r1 = (x + eb->r1) * 52845 + 22719; + if (eb->ascii) { + (*eb->outputFunc)(eb->outputStream, &hexChars[x >> 4], 1); + (*eb->outputFunc)(eb->outputStream, &hexChars[x & 0x0f], 1); + eb->line += 2; + if (eb->line == 64) { + (*eb->outputFunc)(eb->outputStream, "\n", 1); + eb->line = 0; + } + } else { + (*eb->outputFunc)(eb->outputStream, (char *)&x, 1); + } + } +} + +void FoFiType1C::eexecWriteCharstring(Type1CEexecBuf *eb, const unsigned char *s, int n) const +{ + unsigned char x; + int i; + + // eexec encryption + for (i = 0; i < n; ++i) { + x = s[i] ^ (eb->r1 >> 8); + eb->r1 = (x + eb->r1) * 52845 + 22719; + if (eb->ascii) { + (*eb->outputFunc)(eb->outputStream, &hexChars[x >> 4], 1); + (*eb->outputFunc)(eb->outputStream, &hexChars[x & 0x0f], 1); + eb->line += 2; + if (eb->line == 64) { + (*eb->outputFunc)(eb->outputStream, "\n", 1); + eb->line = 0; + } + } else { + (*eb->outputFunc)(eb->outputStream, (char *)&x, 1); + } + } +} + +void FoFiType1C::writePSString(const char *s, FoFiOutputFunc outputFunc, void *outputStream) const +{ + char buf[80]; + const char *p; + int i, c; + + i = 0; + buf[i++] = '('; + for (p = s; *p; ++p) { + c = *p & 0xff; + if (c == '(' || c == ')' || c == '\\') { + buf[i++] = '\\'; + buf[i++] = c; + } else if (c < 0x20 || c >= 0x80) { + buf[i++] = '\\'; + buf[i++] = '0' + ((c >> 6) & 7); + buf[i++] = '0' + ((c >> 3) & 7); + buf[i++] = '0' + (c & 7); + } else { + buf[i++] = c; + } + if (i >= 64) { + buf[i++] = '\\'; + buf[i++] = '\n'; + (*outputFunc)(outputStream, buf, i); + i = 0; + } + } + buf[i++] = ')'; + (*outputFunc)(outputStream, buf, i); +} + +bool FoFiType1C::parse() +{ + Type1CIndex fdIdx; + Type1CIndexVal val; + int i; + + parsedOk = true; + + // some tools embed Type 1C fonts with an extra whitespace char at + // the beginning + if (len > 0 && file[0] != '\x01') { + ++file; + --len; + } + + // find the indexes + getIndex(getU8(2, &parsedOk), &nameIdx, &parsedOk); + getIndex(nameIdx.endPos, &topDictIdx, &parsedOk); + getIndex(topDictIdx.endPos, &stringIdx, &parsedOk); + getIndex(stringIdx.endPos, &gsubrIdx, &parsedOk); + if (!parsedOk) { + return false; + } + gsubrBias = (gsubrIdx.len < 1240) ? 107 : (gsubrIdx.len < 33900) ? 1131 : 32768; + + // read the first font name + getIndexVal(&nameIdx, 0, &val, &parsedOk); + if (!parsedOk) { + return false; + } + name = new GooString((char *)&file[val.pos], val.len); + + // read the top dict for the first font + readTopDict(); + + // for CID fonts: read the FDArray dicts and private dicts + if (topDict.firstOp == 0x0c1e) { + if (topDict.fdArrayOffset == 0) { + nFDs = 1; + privateDicts = (Type1CPrivateDict *)gmalloc(sizeof(Type1CPrivateDict)); + readPrivateDict(0, 0, &privateDicts[0]); + } else { + getIndex(topDict.fdArrayOffset, &fdIdx, &parsedOk); + if (!parsedOk || fdIdx.len <= 0) { + return false; + } + nFDs = fdIdx.len; + privateDicts = (Type1CPrivateDict *)gmallocn(nFDs, sizeof(Type1CPrivateDict)); + for (i = 0; i < nFDs; ++i) { + getIndexVal(&fdIdx, i, &val, &parsedOk); + if (!parsedOk) { + return false; + } + readFD(val.pos, val.len, &privateDicts[i]); + } + } + + // for 8-bit fonts: read the private dict + } else { + nFDs = 1; + privateDicts = (Type1CPrivateDict *)gmalloc(sizeof(Type1CPrivateDict)); + readPrivateDict(topDict.privateOffset, topDict.privateSize, &privateDicts[0]); + } + + // check for parse errors in the private dict(s) + if (!parsedOk) { + return false; + } + + // get the charstrings index + if (topDict.charStringsOffset <= 0) { + parsedOk = false; + return false; + } + getIndex(topDict.charStringsOffset, &charStringsIdx, &parsedOk); + if (!parsedOk) { + return false; + } + nGlyphs = charStringsIdx.len; + + // for CID fonts: read the FDSelect table + if (topDict.firstOp == 0x0c1e) { + readFDSelect(); + if (!parsedOk) { + return false; + } + } + + // read the charset + if (!readCharset()) { + parsedOk = false; + return false; + } + + // for 8-bit fonts: build the encoding + if (topDict.firstOp != 0x0c14 && topDict.firstOp != 0x0c1e) { + buildEncoding(); + if (!parsedOk) { + return false; + } + } + + return parsedOk; +} + +void FoFiType1C::readTopDict() +{ + Type1CIndexVal topDictPtr; + int pos; + + topDict.firstOp = -1; + topDict.versionSID = 0; + topDict.noticeSID = 0; + topDict.copyrightSID = 0; + topDict.fullNameSID = 0; + topDict.familyNameSID = 0; + topDict.weightSID = 0; + topDict.isFixedPitch = 0; + topDict.italicAngle = 0; + topDict.underlinePosition = -100; + topDict.underlineThickness = 50; + topDict.paintType = 0; + topDict.charstringType = 2; + topDict.fontMatrix[0] = 0.001; + topDict.fontMatrix[1] = 0; + topDict.fontMatrix[2] = 0; + topDict.fontMatrix[3] = 0.001; + topDict.fontMatrix[4] = 0; + topDict.fontMatrix[5] = 0; + topDict.hasFontMatrix = false; + topDict.uniqueID = 0; + topDict.fontBBox[0] = 0; + topDict.fontBBox[1] = 0; + topDict.fontBBox[2] = 0; + topDict.fontBBox[3] = 0; + topDict.strokeWidth = 0; + topDict.charsetOffset = 0; + topDict.encodingOffset = 0; + topDict.charStringsOffset = 0; + topDict.privateSize = 0; + topDict.privateOffset = 0; + topDict.registrySID = 0; + topDict.orderingSID = 0; + topDict.supplement = 0; + topDict.fdArrayOffset = 0; + topDict.fdSelectOffset = 0; + + getIndexVal(&topDictIdx, 0, &topDictPtr, &parsedOk); + if (!parsedOk) { + return; + } + pos = topDictPtr.pos; + nOps = 0; + while (pos < topDictPtr.pos + topDictPtr.len) { + pos = getOp(pos, false, &parsedOk); + if (!parsedOk) { + break; + } + if (!ops[nOps - 1].isNum) { + --nOps; // drop the operator + if (topDict.firstOp < 0) { + topDict.firstOp = ops[nOps].op; + } + switch (ops[nOps].op) { + case 0x0000: + topDict.versionSID = (int)ops[0].num; + break; + case 0x0001: + topDict.noticeSID = (int)ops[0].num; + break; + case 0x0c00: + topDict.copyrightSID = (int)ops[0].num; + break; + case 0x0002: + topDict.fullNameSID = (int)ops[0].num; + break; + case 0x0003: + topDict.familyNameSID = (int)ops[0].num; + break; + case 0x0004: + topDict.weightSID = (int)ops[0].num; + break; + case 0x0c01: + topDict.isFixedPitch = (int)ops[0].num; + break; + case 0x0c02: + topDict.italicAngle = ops[0].num; + break; + case 0x0c03: + topDict.underlinePosition = ops[0].num; + break; + case 0x0c04: + topDict.underlineThickness = ops[0].num; + break; + case 0x0c05: + topDict.paintType = (int)ops[0].num; + break; + case 0x0c06: + topDict.charstringType = (int)ops[0].num; + break; + case 0x0c07: + topDict.fontMatrix[0] = ops[0].num; + topDict.fontMatrix[1] = ops[1].num; + topDict.fontMatrix[2] = ops[2].num; + topDict.fontMatrix[3] = ops[3].num; + topDict.fontMatrix[4] = ops[4].num; + topDict.fontMatrix[5] = ops[5].num; + topDict.hasFontMatrix = true; + break; + case 0x000d: + topDict.uniqueID = (int)ops[0].num; + break; + case 0x0005: + topDict.fontBBox[0] = ops[0].num; + topDict.fontBBox[1] = ops[1].num; + topDict.fontBBox[2] = ops[2].num; + topDict.fontBBox[3] = ops[3].num; + break; + case 0x0c08: + topDict.strokeWidth = ops[0].num; + break; + case 0x000f: + topDict.charsetOffset = (int)ops[0].num; + break; + case 0x0010: + topDict.encodingOffset = (int)ops[0].num; + break; + case 0x0011: + topDict.charStringsOffset = (int)ops[0].num; + break; + case 0x0012: + topDict.privateSize = (int)ops[0].num; + topDict.privateOffset = (int)ops[1].num; + break; + case 0x0c1e: + topDict.registrySID = (int)ops[0].num; + topDict.orderingSID = (int)ops[1].num; + topDict.supplement = (int)ops[2].num; + break; + case 0x0c24: + topDict.fdArrayOffset = (int)ops[0].num; + break; + case 0x0c25: + topDict.fdSelectOffset = (int)ops[0].num; + break; + } + nOps = 0; + } + } +} + +// Read a CID font dict (FD) - this pulls out the private dict +// pointer, and reads the private dict. It also pulls the FontMatrix +// (if any) out of the FD. +void FoFiType1C::readFD(int offset, int length, Type1CPrivateDict *pDict) +{ + int pSize, pOffset; + double fontMatrix[6] = { 0 }; + bool hasFontMatrix; + + hasFontMatrix = false; + fontMatrix[0] = fontMatrix[1] = fontMatrix[2] = 0; // make gcc happy + fontMatrix[3] = fontMatrix[4] = fontMatrix[5] = 0; + pSize = pOffset = 0; + + int posEnd; + if (checkedAdd(offset, length, &posEnd)) { + return; + } + + int pos = offset; + nOps = 0; + while (pos < posEnd) { + pos = getOp(pos, false, &parsedOk); + if (!parsedOk) { + return; + } + if (!ops[nOps - 1].isNum) { + if (ops[nOps - 1].op == 0x0012) { + if (nOps < 3) { + parsedOk = false; + return; + } + pSize = (int)ops[0].num; + pOffset = (int)ops[1].num; + break; + } else if (ops[nOps - 1].op == 0x0c07) { + fontMatrix[0] = ops[0].num; + fontMatrix[1] = ops[1].num; + fontMatrix[2] = ops[2].num; + fontMatrix[3] = ops[3].num; + fontMatrix[4] = ops[4].num; + fontMatrix[5] = ops[5].num; + hasFontMatrix = true; + } + nOps = 0; + } + } + readPrivateDict(pOffset, pSize, pDict); + if (hasFontMatrix) { + pDict->fontMatrix[0] = fontMatrix[0]; + pDict->fontMatrix[1] = fontMatrix[1]; + pDict->fontMatrix[2] = fontMatrix[2]; + pDict->fontMatrix[3] = fontMatrix[3]; + pDict->fontMatrix[4] = fontMatrix[4]; + pDict->fontMatrix[5] = fontMatrix[5]; + pDict->hasFontMatrix = true; + } +} + +void FoFiType1C::readPrivateDict(int offset, int length, Type1CPrivateDict *pDict) +{ + pDict->hasFontMatrix = false; + pDict->nBlueValues = 0; + pDict->nOtherBlues = 0; + pDict->nFamilyBlues = 0; + pDict->nFamilyOtherBlues = 0; + pDict->blueScale = 0.039625; + pDict->blueShift = 7; + pDict->blueFuzz = 1; + pDict->hasStdHW = false; + pDict->hasStdVW = false; + pDict->nStemSnapH = 0; + pDict->nStemSnapV = 0; + pDict->hasForceBold = false; + pDict->forceBoldThreshold = 0; + pDict->languageGroup = 0; + pDict->expansionFactor = 0.06; + pDict->initialRandomSeed = 0; + pDict->subrsOffset = 0; + pDict->defaultWidthX = 0; + pDict->defaultWidthXFP = false; + pDict->nominalWidthX = 0; + pDict->nominalWidthXFP = false; + + // no dictionary + if (offset == 0 || length == 0) { + return; + } + + int posEnd; + if (checkedAdd(offset, length, &posEnd)) { + return; + } + + int pos = offset; + nOps = 0; + while (pos < posEnd) { + pos = getOp(pos, false, &parsedOk); + if (!parsedOk) { + break; + } + if (!ops[nOps - 1].isNum) { + --nOps; // drop the operator + switch (ops[nOps].op) { + case 0x0006: + pDict->nBlueValues = getDeltaIntArray(pDict->blueValues, type1CMaxBlueValues); + break; + case 0x0007: + pDict->nOtherBlues = getDeltaIntArray(pDict->otherBlues, type1CMaxOtherBlues); + break; + case 0x0008: + pDict->nFamilyBlues = getDeltaIntArray(pDict->familyBlues, type1CMaxBlueValues); + break; + case 0x0009: + pDict->nFamilyOtherBlues = getDeltaIntArray(pDict->familyOtherBlues, type1CMaxOtherBlues); + break; + case 0x0c09: + pDict->blueScale = ops[0].num; + break; + case 0x0c0a: + pDict->blueShift = (int)ops[0].num; + break; + case 0x0c0b: + pDict->blueFuzz = (int)ops[0].num; + break; + case 0x000a: + pDict->stdHW = ops[0].num; + pDict->hasStdHW = true; + break; + case 0x000b: + pDict->stdVW = ops[0].num; + pDict->hasStdVW = true; + break; + case 0x0c0c: + pDict->nStemSnapH = getDeltaFPArray(pDict->stemSnapH, type1CMaxStemSnap); + break; + case 0x0c0d: + pDict->nStemSnapV = getDeltaFPArray(pDict->stemSnapV, type1CMaxStemSnap); + break; + case 0x0c0e: + pDict->forceBold = ops[0].num != 0; + pDict->hasForceBold = true; + break; + case 0x0c0f: + pDict->forceBoldThreshold = ops[0].num; + break; + case 0x0c11: + pDict->languageGroup = (int)ops[0].num; + break; + case 0x0c12: + pDict->expansionFactor = ops[0].num; + break; + case 0x0c13: + pDict->initialRandomSeed = (int)ops[0].num; + break; + case 0x0013: + pDict->subrsOffset = offset + (int)ops[0].num; + break; + case 0x0014: + pDict->defaultWidthX = ops[0].num; + pDict->defaultWidthXFP = ops[0].isFP; + break; + case 0x0015: + pDict->nominalWidthX = ops[0].num; + pDict->nominalWidthXFP = ops[0].isFP; + break; + } + nOps = 0; + } + } +} + +void FoFiType1C::readFDSelect() +{ + int fdSelectFmt, pos, nRanges, gid0, gid1, fd; + + fdSelect = (unsigned char *)gmalloc(nGlyphs); + if (topDict.fdSelectOffset == 0) { + for (int i = 0; i < nGlyphs; ++i) { + fdSelect[i] = 0; + } + } else { + pos = topDict.fdSelectOffset; + fdSelectFmt = getU8(pos++, &parsedOk); + if (!parsedOk) { + return; + } + if (fdSelectFmt == 0) { + if (!checkRegion(pos, nGlyphs)) { + parsedOk = false; + return; + } + memcpy(fdSelect, file + pos, nGlyphs); + } else if (fdSelectFmt == 3) { + nRanges = getU16BE(pos, &parsedOk); + pos += 2; + gid0 = getU16BE(pos, &parsedOk); + pos += 2; + for (int i = 1; i <= nRanges; ++i) { + fd = getU8(pos++, &parsedOk); + gid1 = getU16BE(pos, &parsedOk); + if (!parsedOk) { + return; + } + pos += 2; + if (gid0 > gid1 || gid1 > nGlyphs) { + //~ error(-1, "Bad FDSelect table in CID font"); + parsedOk = false; + return; + } + for (int j = gid0; j < gid1; ++j) { + fdSelect[j] = fd; + } + gid0 = gid1; + } + for (int i = gid0; i < nGlyphs; ++i) { + fdSelect[i] = 0; + } + } else { + //~ error(-1, "Unknown FDSelect table format in CID font"); + for (int i = 0; i < nGlyphs; ++i) { + fdSelect[i] = 0; + } + } + } +} + +void FoFiType1C::buildEncoding() +{ + char buf[256]; + int nCodes, nRanges, encFormat; + int pos, c, sid, nLeft, nSups, i, j; + + if (topDict.encodingOffset == 0) { + encoding = (char **)fofiType1StandardEncoding; + + } else if (topDict.encodingOffset == 1) { + encoding = (char **)fofiType1ExpertEncoding; + + } else { + encoding = (char **)gmallocn(256, sizeof(char *)); + for (i = 0; i < 256; ++i) { + encoding[i] = nullptr; + } + pos = topDict.encodingOffset; + encFormat = getU8(pos++, &parsedOk); + if (!parsedOk) { + return; + } + if ((encFormat & 0x7f) == 0) { + nCodes = 1 + getU8(pos++, &parsedOk); + if (!parsedOk) { + return; + } + if (nCodes > nGlyphs) { + nCodes = nGlyphs; + } + for (i = 1; i < nCodes && i < charsetLength; ++i) { + c = getU8(pos++, &parsedOk); + if (!parsedOk) { + return; + } + if (encoding[c]) { + gfree(encoding[c]); + } + encoding[c] = copyString(getString(charset[i], buf, &parsedOk)); + } + } else if ((encFormat & 0x7f) == 1) { + nRanges = getU8(pos++, &parsedOk); + if (!parsedOk) { + return; + } + nCodes = 1; + for (i = 0; i < nRanges; ++i) { + c = getU8(pos++, &parsedOk); + nLeft = getU8(pos++, &parsedOk); + if (!parsedOk) { + return; + } + for (j = 0; j <= nLeft && nCodes < nGlyphs && nCodes < charsetLength; ++j) { + if (c < 256) { + if (encoding[c]) { + gfree(encoding[c]); + } + encoding[c] = copyString(getString(charset[nCodes], buf, &parsedOk)); + } + ++nCodes; + ++c; + } + } + } + if (encFormat & 0x80) { + nSups = getU8(pos++, &parsedOk); + if (!parsedOk) { + return; + } + for (i = 0; i < nSups; ++i) { + c = getU8(pos++, &parsedOk); + ; + if (!parsedOk) { + return; + ; + } + sid = getU16BE(pos, &parsedOk); + pos += 2; + if (!parsedOk) { + return; + } + if (encoding[c]) { + gfree(encoding[c]); + } + encoding[c] = copyString(getString(sid, buf, &parsedOk)); + } + } + } +} + +bool FoFiType1C::readCharset() +{ + int charsetFormat, c, pos; + int nLeft, i, j; + + if (topDict.charsetOffset == 0) { + charset = fofiType1CISOAdobeCharset; + charsetLength = sizeof(fofiType1CISOAdobeCharset) / sizeof(unsigned short); + } else if (topDict.charsetOffset == 1) { + charset = fofiType1CExpertCharset; + charsetLength = sizeof(fofiType1CExpertCharset) / sizeof(unsigned short); + } else if (topDict.charsetOffset == 2) { + charset = fofiType1CExpertSubsetCharset; + charsetLength = sizeof(fofiType1CExpertSubsetCharset) / sizeof(unsigned short); + } else { + unsigned short *customCharset = (unsigned short *)gmallocn(nGlyphs, sizeof(unsigned short)); + charsetLength = nGlyphs; + for (i = 0; i < nGlyphs; ++i) { + customCharset[i] = 0; + } + pos = topDict.charsetOffset; + charsetFormat = getU8(pos++, &parsedOk); + if (charsetFormat == 0) { + for (i = 1; i < nGlyphs; ++i) { + customCharset[i] = (unsigned short)getU16BE(pos, &parsedOk); + pos += 2; + if (!parsedOk) { + break; + } + } + } else if (charsetFormat == 1) { + i = 1; + while (i < nGlyphs) { + c = getU16BE(pos, &parsedOk); + pos += 2; + nLeft = getU8(pos++, &parsedOk); + if (!parsedOk) { + break; + } + for (j = 0; j <= nLeft && i < nGlyphs; ++j) { + customCharset[i++] = (unsigned short)c++; + } + } + } else if (charsetFormat == 2) { + i = 1; + while (i < nGlyphs) { + c = getU16BE(pos, &parsedOk); + pos += 2; + nLeft = getU16BE(pos, &parsedOk); + pos += 2; + if (!parsedOk) { + break; + } + for (j = 0; j <= nLeft && i < nGlyphs; ++j) { + customCharset[i++] = (unsigned short)c++; + } + } + } + if (!parsedOk) { + gfree(customCharset); + charset = nullptr; + charsetLength = 0; + return false; + } + charset = customCharset; + } + return true; +} + +int FoFiType1C::getOp(int pos, bool charstring, bool *ok) +{ + static const char nybChars[16] = "0123456789.ee -"; + Type1COp op; + char buf[65]; + int b0, b1, nyb0, nyb1, x, i; + + b0 = getU8(pos++, ok); + + if (b0 == 28) { + x = getU8(pos++, ok); + x = (x << 8) | getU8(pos++, ok); + if (x & 0x8000) { + x |= ~0xffff; + } + op.num = x; + + } else if (!charstring && b0 == 29) { + x = getU8(pos++, ok); + x = (x << 8) | getU8(pos++, ok); + x = (x << 8) | getU8(pos++, ok); + x = (x << 8) | getU8(pos++, ok); + if (x & 0x80000000) { + x |= ~0xffffffff; + } + op.num = x; + + } else if (!charstring && b0 == 30) { + i = 0; + do { + b1 = getU8(pos++, ok); + nyb0 = b1 >> 4; + nyb1 = b1 & 0x0f; + if (nyb0 == 0xf) { + break; + } + buf[i++] = nybChars[nyb0]; + if (i == 64) { + break; + } + if (nyb0 == 0xc) { + buf[i++] = '-'; + } + if (i == 64) { + break; + } + if (nyb1 == 0xf) { + break; + } + buf[i++] = nybChars[nyb1]; + if (i == 64) { + break; + } + if (nyb1 == 0xc) { + buf[i++] = '-'; + } + } while (i < 64); + buf[i] = '\0'; + op.num = gatof(buf); + op.isFP = true; + + } else if (b0 >= 32 && b0 <= 246) { + op.num = b0 - 139; + + } else if (b0 >= 247 && b0 <= 250) { + op.num = ((b0 - 247) << 8) + getU8(pos++, ok) + 108; + + } else if (b0 >= 251 && b0 <= 254) { + op.num = -((b0 - 251) << 8) - getU8(pos++, ok) - 108; + + } else if (charstring && b0 == 255) { + x = getU8(pos++, ok); + x = (x << 8) | getU8(pos++, ok); + x = (x << 8) | getU8(pos++, ok); + x = (x << 8) | getU8(pos++, ok); + if (x & 0x80000000) { + x |= ~0xffffffff; + } + op.num = (double)x / 65536.0; + op.isFP = true; + + } else if (b0 == 12) { + op.isNum = false; + op.op = 0x0c00 + getU8(pos++, ok); + + } else { + op.isNum = false; + op.op = b0; + } + + if (nOps < 49) { + ops[nOps++] = op; + } + + return pos; +} + +// Convert the delta-encoded ops array to an array of ints. +int FoFiType1C::getDeltaIntArray(int *arr, int maxLen) const +{ + int x; + int n, i; + + if ((n = nOps) > maxLen) { + n = maxLen; + } + x = 0; + for (i = 0; i < n; ++i) { + int y; + if (unlikely(std::isinf(ops[i].num))) { + return i; + } + if (checkedAdd(x, (int)ops[i].num, &y)) { + return i; + } + x = y; + arr[i] = x; + } + return n; +} + +// Convert the delta-encoded ops array to an array of doubles. +int FoFiType1C::getDeltaFPArray(double *arr, int maxLen) const +{ + double x; + int n, i; + + if ((n = nOps) > maxLen) { + n = maxLen; + } + x = 0; + for (i = 0; i < n; ++i) { + x += ops[i].num; + arr[i] = x; + } + return n; +} + +void FoFiType1C::getIndex(int pos, Type1CIndex *idx, bool *ok) const +{ + idx->pos = pos; + idx->len = getU16BE(pos, ok); + if (idx->len == 0) { + // empty indexes are legal and contain just the length field + idx->offSize = 0; + idx->startPos = idx->endPos = pos + 2; + } else { + idx->offSize = getU8(pos + 2, ok); + if (idx->offSize < 1 || idx->offSize > 4) { + *ok = false; + } + idx->startPos = pos + 3 + (idx->len + 1) * idx->offSize - 1; + if (idx->startPos < 0 || idx->startPos >= len) { + *ok = false; + } + idx->endPos = idx->startPos + getUVarBE(pos + 3 + idx->len * idx->offSize, idx->offSize, ok); + if (idx->endPos < idx->startPos || idx->endPos > len) { + *ok = false; + } + } +} + +void FoFiType1C::getIndexVal(const Type1CIndex *idx, int i, Type1CIndexVal *val, bool *ok) const +{ + int pos0, pos1; + + if (i < 0 || i >= idx->len) { + *ok = false; + return; + } + pos0 = idx->startPos + getUVarBE(idx->pos + 3 + i * idx->offSize, idx->offSize, ok); + pos1 = idx->startPos + getUVarBE(idx->pos + 3 + (i + 1) * idx->offSize, idx->offSize, ok); + if (pos0 < idx->startPos || pos0 > idx->endPos || pos1 <= idx->startPos || pos1 > idx->endPos || pos1 < pos0) { + *ok = false; + return; + } + val->pos = pos0; + val->len = pos1 - pos0; +} + +char *FoFiType1C::getString(int sid, char *buf, bool *ok) const +{ + Type1CIndexVal val; + int n; + + if (sid < 0) { + buf[0] = '\0'; + } else if (sid < 391) { + strcpy(buf, fofiType1CStdStrings[sid]); + } else { + sid -= 391; + getIndexVal(&stringIdx, sid, &val, ok); + if (*ok) { + if ((n = val.len) > 255) { + n = 255; + } + strncpy(buf, (char *)&file[val.pos], n); + buf[n] = '\0'; + } else { + buf[0] = '\0'; + } + } + return buf; +} diff --git a/poppler-24.05.0/fofi/FoFiType1C.h b/poppler-24.05.0/fofi/FoFiType1C.h new file mode 100644 index 0000000000000000000000000000000000000000..f3a9b731cf7b80b7b3ed0fa2c6ed563410eb0428 --- /dev/null +++ b/poppler-24.05.0/fofi/FoFiType1C.h @@ -0,0 +1,263 @@ +//======================================================================== +// +// FoFiType1C.h +// +// Copyright 1999-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Takashi Iwai <tiwai@suse.de> +// Copyright (C) 2012 Thomas Freitag <Thomas.Freitag@alfa.de> +// Copyright (C) 2018-2020 Albert Astals Cid <aacid@kde.org> +// Copyright (C) 2022 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 +// +//======================================================================== + +#ifndef FOFITYPE1C_H +#define FOFITYPE1C_H + +#include "FoFiBase.h" + +#include "poppler_private_export.h" + +#include <set> + +class GooString; + +//------------------------------------------------------------------------ + +struct Type1CIndex +{ + int pos; // absolute position in file + int len; // length (number of entries) + int offSize; // offset size + int startPos; // position of start of index data - 1 + int endPos; // position one byte past end of the index +}; + +struct Type1CIndexVal +{ + int pos; // absolute position in file + int len; // length, in bytes +}; + +struct Type1CTopDict +{ + int firstOp; + + int versionSID; + int noticeSID; + int copyrightSID; + int fullNameSID; + int familyNameSID; + int weightSID; + int isFixedPitch; + double italicAngle; + double underlinePosition; + double underlineThickness; + int paintType; + int charstringType; + double fontMatrix[6]; + bool hasFontMatrix; // CID fonts are allowed to put their + // FontMatrix in the FD instead of the + // top dict + int uniqueID; + double fontBBox[4]; + double strokeWidth; + int charsetOffset; + int encodingOffset; + int charStringsOffset; + int privateSize; + int privateOffset; + + // CIDFont entries + int registrySID; + int orderingSID; + int supplement; + int fdArrayOffset; + int fdSelectOffset; +}; + +#define type1CMaxBlueValues 14 +#define type1CMaxOtherBlues 10 +#define type1CMaxStemSnap 12 + +struct Type1CPrivateDict +{ + double fontMatrix[6]; + bool hasFontMatrix; + int blueValues[type1CMaxBlueValues]; + int nBlueValues; + int otherBlues[type1CMaxOtherBlues]; + int nOtherBlues; + int familyBlues[type1CMaxBlueValues]; + int nFamilyBlues; + int familyOtherBlues[type1CMaxOtherBlues]; + int nFamilyOtherBlues; + double blueScale; + int blueShift; + int blueFuzz; + double stdHW; + bool hasStdHW; + double stdVW; + bool hasStdVW; + double stemSnapH[type1CMaxStemSnap]; + int nStemSnapH; + double stemSnapV[type1CMaxStemSnap]; + int nStemSnapV; + bool forceBold; + bool hasForceBold; + double forceBoldThreshold; + int languageGroup; + double expansionFactor; + int initialRandomSeed; + int subrsOffset; + double defaultWidthX; + bool defaultWidthXFP; + double nominalWidthX; + bool nominalWidthXFP; +}; + +struct Type1COp +{ + bool isNum = true; // true -> number, false -> operator + bool isFP = false; // true -> floating point number, false -> int + union { + double num = 0; // if num is true + int op; // if num is false + }; +}; + +struct Type1CEexecBuf +{ + FoFiOutputFunc outputFunc; + void *outputStream; + bool ascii; // ASCII encoding? + unsigned short r1; // eexec encryption key + int line; // number of eexec chars left on current line +}; + +//------------------------------------------------------------------------ +// FoFiType1C +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT FoFiType1C : public FoFiBase +{ +public: + // Create a FoFiType1C object from a memory buffer. + static FoFiType1C *make(const unsigned char *fileA, int lenA); + + // Create a FoFiType1C object from a file on disk. + static FoFiType1C *load(const char *fileName); + + ~FoFiType1C() override; + + // Return the font name. + const char *getName() const; + + // Return the encoding, as an array of 256 names (any of which may + // be NULL). This is only useful with 8-bit fonts. + char **getEncoding() const; + + // Get the glyph names. + int getNumGlyphs() const { return nGlyphs; } + GooString *getGlyphName(int gid) const; + + // Return the mapping from CIDs to GIDs, and return the number of + // CIDs in *<nCIDs>. This is only useful for CID fonts. + int *getCIDToGIDMap(int *nCIDs) const; + + // Return the font matrix as an array of six numbers. + void getFontMatrix(double *mat) const; + + // Convert to a Type 1 font, suitable for embedding in a PostScript + // file. This is only useful with 8-bit fonts. If <newEncoding> is + // not NULL, it will be used in place of the encoding in the Type 1C + // font. If <ascii> is true the eexec section will be hex-encoded, + // otherwise it will be left as binary data. If <psName> is non-NULL, + // it will be used as the PostScript font name. + void convertToType1(const char *psName, const char **newEncoding, bool ascii, FoFiOutputFunc outputFunc, void *outputStream); + + // Convert to a Type 0 CIDFont, suitable for embedding in a + // PostScript file. <psName> will be used as the PostScript font + // name. There are three cases for the CID-to-GID mapping: + // (1) if <codeMap> is non-NULL, then it is the CID-to-GID mapping + // (2) if <codeMap> is NULL and this is a CID CFF font, then the + // font's internal CID-to-GID mapping is used + // (3) is <codeMap> is NULL and this is an 8-bit CFF font, then + // the identity CID-to-GID mapping is used + void convertToCIDType0(const char *psName, const int *codeMap, int nCodes, FoFiOutputFunc outputFunc, void *outputStream); + + // Convert to a Type 0 (but non-CID) composite font, suitable for + // embedding in a PostScript file. <psName> will be used as the + // PostScript font name. There are three cases for the CID-to-GID + // mapping: + // (1) if <codeMap> is non-NULL, then it is the CID-to-GID mapping + // (2) if <codeMap> is NULL and this is a CID CFF font, then the + // font's internal CID-to-GID mapping is used + // (3) is <codeMap> is NULL and this is an 8-bit CFF font, then + // the identity CID-to-GID mapping is used + void convertToType0(const char *psName, const int *codeMap, int nCodes, FoFiOutputFunc outputFunc, void *outputStream); + +private: + FoFiType1C(const unsigned char *fileA, int lenA, bool freeFileDataA); + void eexecCvtGlyph(Type1CEexecBuf *eb, const char *glyphName, int offset, int nBytes, const Type1CIndex *subrIdx, const Type1CPrivateDict *pDict); + void cvtGlyph(int offset, int nBytes, GooString *charBuf, const Type1CIndex *subrIdx, const Type1CPrivateDict *pDict, bool top, std::set<int> &offsetBeingParsed); + void cvtGlyphWidth(bool useOp, GooString *charBuf, const Type1CPrivateDict *pDict); + void cvtNum(double x, bool isFP, GooString *charBuf) const; + void eexecWrite(Type1CEexecBuf *eb, const char *s) const; + void eexecWriteCharstring(Type1CEexecBuf *eb, const unsigned char *s, int n) const; + void writePSString(const char *s, FoFiOutputFunc outputFunc, void *outputStream) const; + bool parse(); + void readTopDict(); + void readFD(int offset, int length, Type1CPrivateDict *pDict); + void readPrivateDict(int offset, int length, Type1CPrivateDict *pDict); + void readFDSelect(); + void buildEncoding(); + bool readCharset(); + int getOp(int pos, bool charstring, bool *ok); + int getDeltaIntArray(int *arr, int maxLen) const; + int getDeltaFPArray(double *arr, int maxLen) const; + void getIndex(int pos, Type1CIndex *idx, bool *ok) const; + void getIndexVal(const Type1CIndex *idx, int i, Type1CIndexVal *val, bool *ok) const; + char *getString(int sid, char *buf, bool *ok) const; + + GooString *name; + char **encoding; + + Type1CIndex nameIdx; + Type1CIndex topDictIdx; + Type1CIndex stringIdx; + Type1CIndex gsubrIdx; + Type1CIndex charStringsIdx; + + Type1CTopDict topDict; + Type1CPrivateDict *privateDicts; + + int nGlyphs; + int nFDs; + unsigned char *fdSelect; + const unsigned short *charset; + unsigned short charsetLength; + int gsubrBias; + + bool parsedOk; + + Type1COp ops[49]; // operands and operator + int nOps; // number of operands + int nHints; // number of hints for the current glyph + bool firstOp; // true if we haven't hit the first op yet + bool openPath; // true if there is an unclosed path +}; + +#endif diff --git a/poppler-24.05.0/glib/CMakeLists.txt b/poppler-24.05.0/glib/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..df7992929287aaf5fc3d71c5253bf16bf61a43a1 --- /dev/null +++ b/poppler-24.05.0/glib/CMakeLists.txt @@ -0,0 +1,158 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) + +include_directories( + SYSTEM + ${GLIB2_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} +) +add_definitions( + -DG_LOG_DOMAIN=\"Poppler\" + ${GLIB2_CFLAGS_OTHER} + ${CAIRO_CFLAGS} + ${POPPLER_GLIB_DISABLE_DEPRECATED} + ${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} +) + +configure_file(poppler-features.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler-features.h @ONLY) + +if (GTK_FOUND AND BUILD_GTK_TESTS AND NOT MSVC) + add_subdirectory(demo) + add_subdirectory(tests) +endif () + +set(poppler_glib_public_headers + poppler-action.h + poppler-date.h + poppler-document.h + poppler-page.h + poppler-attachment.h + poppler-form-field.h + poppler-annot.h + poppler-layer.h + poppler-movie.h + poppler-media.h + poppler.h + poppler-structure-element.h +) + +find_program(GLIB2_MKENUMS glib-mkenums) +find_program(GLIB2_MKENUMS_PYTHON NAMES python3 python) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h + COMMAND ${GLIB2_MKENUMS_PYTHON} + ARGS + ${GLIB2_MKENUMS} + --template poppler-enums.h.template + ${poppler_glib_public_headers} > ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${poppler_glib_public_headers} + ${CMAKE_CURRENT_SOURCE_DIR}/poppler-enums.h.template +) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c + COMMAND ${GLIB2_MKENUMS_PYTHON} + ARGS + ${GLIB2_MKENUMS} + --template poppler-enums.c.template + ${poppler_glib_public_headers} > ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${poppler_glib_public_headers} ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h + ${CMAKE_CURRENT_SOURCE_DIR}/poppler-enums.c.template +) + + +set(poppler_glib_SRCS + poppler-action.cc + poppler-date.cc + poppler-document.cc + poppler-page.cc + poppler-attachment.cc + poppler-form-field.cc + poppler-annot.cc + poppler-layer.cc + poppler-movie.cc + poppler-media.cc + poppler.cc + poppler-cached-file-loader.cc + poppler-input-stream.cc + poppler-structure-element.cc +) +set(poppler_glib_generated_SRCS + ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c + ${CMAKE_SOURCE_DIR}/poppler/CairoFontEngine.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoOutputDev.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc +) +add_library(poppler-glib ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS}) +generate_export_header(poppler-glib EXPORT_MACRO_NAME POPPLER_PUBLIC EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-macros.h") +set_target_properties(poppler-glib PROPERTIES VERSION 8.26.0 SOVERSION 8) +if(MINGW AND BUILD_SHARED_LIBS) + get_target_property(POPPLER_GLIB_SOVERSION poppler-glib SOVERSION) + set_target_properties(poppler-glib PROPERTIES SUFFIX "-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") +endif() +target_link_libraries(poppler-glib poppler PkgConfig::GLIB2 ${CAIRO_LIBRARIES} Freetype::Freetype) +target_include_directories(poppler-glib SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) +install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +if (ENABLE_NSS3) + target_include_directories(poppler-glib SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) +endif() + +install(FILES + ${poppler_glib_public_headers} + ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h + ${CMAKE_CURRENT_BINARY_DIR}/poppler-features.h + ${CMAKE_CURRENT_BINARY_DIR}/poppler-macros.h + DESTINATION include/poppler/glib) + +set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES + "${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.h ${CMAKE_CURRENT_BINARY_DIR}/poppler-enums.c" +) + +# GObject Introspection +if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS) + include(GObjectIntrospectionMacros) + + # General gir: Reset object-list for introspection & load tool args + set(INTROSPECTION_GIRS) + set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all") + set(INTROSPECTION_COMPILER_ARGS ${INTROSPECTION_COMPILER_ARGS} "--includedir=${CMAKE_CURRENT_SOURCE_DIR}") + + # Poppler: Assign package to gir & export keys + set(Poppler_0_18_gir "poppler-glib") + set(Poppler_0_18_gir_EXPORT_PACKAGES "poppler-glib") + # Then load library and header lists + set(Poppler_0_18_gir_LIBS "poppler-glib" "poppler") + set(Poppler_0_18_gir_INCLUDES "GObject-2.0" "Gio-2.0" "cairo-1.0") + + # Format list of include directories as compiler flags + get_directory_property(_tmp_includes INCLUDE_DIRECTORIES) + _gir_list_prefix(_includes _tmp_includes "-I") + # And set flags for gir compiler and scanner + set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR}) + set(Poppler_0_18_gir_SCANNERFLAGS "--c-include=poppler.h") + + # Load temporary source-file lists, including a few generated at build + set(orig_introspect_srcs ${poppler_glib_SRCS} ${poppler_glib_public_headers}) + set(gen_introspect_srcs "poppler-enums.c" "poppler-enums.h" "poppler-features.h" "poppler-macros.h") + # Prefix the files with their correct directories for full paths + _gir_list_prefix(_orig_introspect_paths orig_introspect_srcs "${CMAKE_CURRENT_SOURCE_DIR}/") + _gir_list_prefix(_gen_introspect_paths gen_introspect_srcs "${CMAKE_CURRENT_BINARY_DIR}/") + # Now load them to the final file list + set(Poppler_0_18_gir_FILES ${_orig_introspect_paths} ${_gen_introspect_paths}) + + # Finally, load the list of objects for introspection & invoke macro + list(APPEND INTROSPECTION_GIRS Poppler-0.18.gir) + gir_add_introspections(INTROSPECTION_GIRS) +endif () + +if(ENABLE_GTK_DOC) + add_subdirectory(reference) +endif() + +check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO) diff --git a/poppler-24.05.0/glib/demo/CMakeLists.txt b/poppler-24.05.0/glib/demo/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..1520d8408fe5238ab4c1df8b897f5475bb30b2de --- /dev/null +++ b/poppler-24.05.0/glib/demo/CMakeLists.txt @@ -0,0 +1,25 @@ +set(poppler_glib_demo_SRCS + main.c + find.c + fonts.c + forms.c + info.cc + images.c + links.c + outline.c + page.c + print.c + render.c + text.c + transitions.c + utils.c + annots.c + attachments.c + layers.c + selections.c + taggedstruct.c + signature.c +) +poppler_add_test(poppler-glib-demo BUILD_GTK_TESTS ${poppler_glib_demo_SRCS}) + +target_link_libraries(poppler-glib-demo ${CAIRO_LIBRARIES} poppler-glib PkgConfig::GTK3) diff --git a/poppler-24.05.0/glib/demo/annots.c b/poppler-24.05.0/glib/demo/annots.c new file mode 100644 index 0000000000000000000000000000000000000000..645a7210792102478161e59cf95b2a6a6b2a6de2 --- /dev/null +++ b/poppler-24.05.0/glib/demo/annots.c @@ -0,0 +1,1456 @@ +/* + * Copyright (C) 2008 Inigo Martinez <inigomartinez@gmail.com> + * + * 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 <gtk/gtk.h> +#include <string.h> + +#include "annots.h" +#include "utils.h" + +#define STAMP_CUSTOM_IMAGE "Custom image" + +enum +{ + ANNOTS_TYPE_COLUMN, + ANNOTS_COLOR_COLUMN, + ANNOTS_FLAG_INVISIBLE_COLUMN, + ANNOTS_FLAG_HIDDEN_COLUMN, + ANNOTS_FLAG_PRINT_COLUMN, + ANNOTS_COLUMN, + N_COLUMNS +}; + +enum +{ + SELECTED_TYPE_COLUMN, + SELECTED_LABEL_COLUMN, + SELECTED_N_COLUMNS +}; + +typedef struct +{ + const guint type; + const gchar *label; +} Annotations; + +static const Annotations supported_annots[] = { + { POPPLER_ANNOT_TEXT, "Text" }, { POPPLER_ANNOT_LINE, "Line" }, { POPPLER_ANNOT_SQUARE, "Square" }, { POPPLER_ANNOT_CIRCLE, "Circle" }, { POPPLER_ANNOT_HIGHLIGHT, "Highlight" }, + { POPPLER_ANNOT_UNDERLINE, "Underline" }, { POPPLER_ANNOT_SQUIGGLY, "Squiggly" }, { POPPLER_ANNOT_STRIKE_OUT, "Strike Out" }, { POPPLER_ANNOT_STAMP, "Stamp" }, +}; + +static const char *stamp_types[] = { [POPPLER_ANNOT_STAMP_ICON_UNKNOWN] = "Unknown", + [POPPLER_ANNOT_STAMP_ICON_APPROVED] = "APPROVED", + [POPPLER_ANNOT_STAMP_ICON_AS_IS] = "AS_IS", + [POPPLER_ANNOT_STAMP_ICON_CONFIDENTIAL] = "CONFIDENTIAL", + [POPPLER_ANNOT_STAMP_ICON_FINAL] = "FINAL", + [POPPLER_ANNOT_STAMP_ICON_EXPERIMENTAL] = "EXPERIMENTAL", + [POPPLER_ANNOT_STAMP_ICON_EXPIRED] = "EXPIRED", + [POPPLER_ANNOT_STAMP_ICON_NOT_APPROVED] = "NOT_APPROVED", + [POPPLER_ANNOT_STAMP_ICON_NOT_FOR_PUBLIC_RELEASE] = "NOT_FOR_PUBLIC_RELEASE", + [POPPLER_ANNOT_STAMP_ICON_SOLD] = "SOLD", + [POPPLER_ANNOT_STAMP_ICON_DEPARTMENTAL] = "DEPARTMENTAL", + [POPPLER_ANNOT_STAMP_ICON_FOR_COMMENT] = "FOR_COMMENT", + [POPPLER_ANNOT_STAMP_ICON_FOR_PUBLIC_RELEASE] = "FOR_PUBLIC_RELEASE", + [POPPLER_ANNOT_STAMP_ICON_TOP_SECRET] = "TOP_SECRET", + [POPPLER_ANNOT_STAMP_ICON_NONE] = "None" }; + +typedef enum +{ + MODE_NORMAL, /* Regular use as pointer in the page */ + MODE_ADD, /* To add simple annotations */ + MODE_EDIT, /* To move/edit an annotation */ + MODE_DRAWING /* To add annotations that require mouse interactions */ +} ModeType; + +typedef struct +{ + PopplerDocument *doc; + PopplerPage *page; + PopplerAnnot *active_annot; + + GtkWidget *tree_view; + GtkListStore *model; + GtkWidget *darea; + GtkWidget *annot_view; + GtkWidget *timer_label; + GtkWidget *remove_button; + GtkWidget *type_selector; + GtkWidget *stamp_selector; + GtkWidget *main_box; + + gint num_page; + gint annot_type; + char *custom_image_filename; + ModeType mode; + + cairo_surface_t *surface; + GdkRGBA annot_color; + + GdkPoint start; + GdkPoint stop; + GdkCursorType cursor; + guint annotations_idle; +} PgdAnnotsDemo; + +static void pgd_annots_viewer_queue_redraw(PgdAnnotsDemo *demo); + +static void pgd_annots_free(PgdAnnotsDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->annotations_idle > 0) { + g_source_remove(demo->annotations_idle); + demo->annotations_idle = 0; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + if (demo->page) { + g_object_unref(demo->page); + demo->page = NULL; + } + + if (demo->model) { + g_object_unref(demo->model); + demo->model = NULL; + } + + g_free(demo); +} + +static GtkWidget *pgd_annot_view_new(void) +{ + GtkWidget *frame, *label; + + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); + label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(label), "<b>Annotation Properties</b>"); + gtk_frame_set_label_widget(GTK_FRAME(frame), label); + gtk_widget_show(label); + + return frame; +} + +const gchar *get_annot_type(PopplerAnnot *poppler_annot) +{ + switch (poppler_annot_get_annot_type(poppler_annot)) { + case POPPLER_ANNOT_TEXT: + return "Text"; + case POPPLER_ANNOT_LINK: + return "Link"; + case POPPLER_ANNOT_FREE_TEXT: + return "Free Text"; + case POPPLER_ANNOT_LINE: + return "Line"; + case POPPLER_ANNOT_SQUARE: + return "Square"; + case POPPLER_ANNOT_CIRCLE: + return "Circle"; + case POPPLER_ANNOT_POLYGON: + return "Polygon"; + case POPPLER_ANNOT_POLY_LINE: + return "Poly Line"; + case POPPLER_ANNOT_HIGHLIGHT: + return "Highlight"; + case POPPLER_ANNOT_UNDERLINE: + return "Underline"; + case POPPLER_ANNOT_SQUIGGLY: + return "Squiggly"; + case POPPLER_ANNOT_STRIKE_OUT: + return "Strike Out"; + case POPPLER_ANNOT_STAMP: + return "Stamp"; + case POPPLER_ANNOT_CARET: + return "Caret"; + case POPPLER_ANNOT_INK: + return "Ink"; + case POPPLER_ANNOT_POPUP: + return "Popup"; + case POPPLER_ANNOT_FILE_ATTACHMENT: + return "File Attachment"; + case POPPLER_ANNOT_SOUND: + return "Sound"; + case POPPLER_ANNOT_MOVIE: + return "Movie"; + case POPPLER_ANNOT_WIDGET: + return "Widget"; + case POPPLER_ANNOT_SCREEN: + return "Screen"; + case POPPLER_ANNOT_PRINTER_MARK: + return "Printer Mark"; + case POPPLER_ANNOT_TRAP_NET: + return "Trap Net"; + case POPPLER_ANNOT_WATERMARK: + return "Watermark"; + case POPPLER_ANNOT_3D: + return "3D"; + default: + break; + } + + return "Unknown"; +} + +GdkPixbuf *get_annot_color(PopplerAnnot *poppler_annot) +{ + PopplerColor *poppler_color; + + if ((poppler_color = poppler_annot_get_color(poppler_annot))) { + GdkPixbuf *pixbuf_tmp, *pixbuf; + + pixbuf_tmp = pgd_pixbuf_new_for_color(poppler_color); + pixbuf = gdk_pixbuf_scale_simple(pixbuf_tmp, 16, 16, GDK_INTERP_BILINEAR); + g_object_unref(pixbuf_tmp); + + g_free(poppler_color); + + return pixbuf; + } + + return NULL; +} + +gchar *get_markup_date(PopplerAnnotMarkup *poppler_annot) +{ + GDate *date; + struct tm t; + time_t timet; + + date = poppler_annot_markup_get_date(poppler_annot); + if (!date) { + return NULL; + } + + g_date_to_struct_tm(date, &t); + g_date_free(date); + + timet = mktime(&t); + return timet == (time_t)-1 ? NULL : pgd_format_date(timet); +} + +const gchar *get_markup_reply_to(PopplerAnnotMarkup *poppler_annot) +{ + switch (poppler_annot_markup_get_reply_to(poppler_annot)) { + case POPPLER_ANNOT_MARKUP_REPLY_TYPE_R: + return "Type R"; + case POPPLER_ANNOT_MARKUP_REPLY_TYPE_GROUP: + return "Type Group"; + default: + break; + } + + return "Unknown"; +} + +const gchar *get_markup_external_data(PopplerAnnotMarkup *poppler_annot) +{ + switch (poppler_annot_markup_get_external_data(poppler_annot)) { + case POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_3D: + return "Markup 3D"; + default: + break; + } + + return "Unknown"; +} + +const gchar *get_text_state(PopplerAnnotText *poppler_annot) +{ + switch (poppler_annot_text_get_state(poppler_annot)) { + case POPPLER_ANNOT_TEXT_STATE_MARKED: + return "Marked"; + case POPPLER_ANNOT_TEXT_STATE_UNMARKED: + return "Unmarked"; + case POPPLER_ANNOT_TEXT_STATE_ACCEPTED: + return "Accepted"; + case POPPLER_ANNOT_TEXT_STATE_REJECTED: + return "Rejected"; + case POPPLER_ANNOT_TEXT_STATE_CANCELLED: + return "Cancelled"; + case POPPLER_ANNOT_TEXT_STATE_COMPLETED: + return "Completed"; + case POPPLER_ANNOT_TEXT_STATE_NONE: + return "None"; + case POPPLER_ANNOT_TEXT_STATE_UNKNOWN: + return "Unknown"; + default: + break; + } + + return "Unknown"; +} + +const gchar *get_free_text_quadding(PopplerAnnotFreeText *poppler_annot) +{ + switch (poppler_annot_free_text_get_quadding(poppler_annot)) { + case POPPLER_ANNOT_FREE_TEXT_QUADDING_LEFT_JUSTIFIED: + return "Left Justified"; + case POPPLER_ANNOT_FREE_TEXT_QUADDING_CENTERED: + return "Centered"; + case POPPLER_ANNOT_FREE_TEXT_QUADDING_RIGHT_JUSTIFIED: + return "Right Justified"; + default: + break; + } + + return "Unknown"; +} + +gchar *get_free_text_callout_line(PopplerAnnotFreeText *poppler_annot) +{ + PopplerAnnotCalloutLine *callout; + gchar *text; + + if ((callout = poppler_annot_free_text_get_callout_line(poppler_annot))) { + text = g_strdup_printf("%f,%f,%f,%f", callout->x1, callout->y1, callout->x2, callout->y2); + if (callout->multiline) { + text = g_strdup_printf("%s,%f,%f", text, callout->x3, callout->y3); + } + + return text; + } + + return NULL; +} + +static void pgd_annots_update_cursor(PgdAnnotsDemo *demo, GdkCursorType cursor_type) +{ + GdkCursor *cursor = NULL; + + if (cursor_type == demo->cursor) { + return; + } + + if (cursor_type != GDK_LAST_CURSOR) { + cursor = gdk_cursor_new_for_display(gtk_widget_get_display(demo->main_box), cursor_type); + } + + demo->cursor = cursor_type; + + gdk_window_set_cursor(gtk_widget_get_window(demo->main_box), cursor); + gdk_display_flush(gtk_widget_get_display(demo->main_box)); + if (cursor) { + g_object_unref(cursor); + } +} + +static void pgd_annots_start_add_annot(GtkWidget *button, PgdAnnotsDemo *demo) +{ + GtkTreeModel *model; + GtkTreeIter iter; + + gtk_combo_box_get_active_iter(GTK_COMBO_BOX(demo->type_selector), &iter); + model = gtk_combo_box_get_model(GTK_COMBO_BOX(demo->type_selector)); + gtk_tree_model_get(model, &iter, SELECTED_TYPE_COLUMN, &(demo->annot_type), -1); + + demo->mode = MODE_ADD; + pgd_annots_update_cursor(demo, GDK_TCROSS); +} + +static void pgd_annots_remove_annot(GtkWidget *button, PgdAnnotsDemo *demo) +{ + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(demo->tree_view)); + + if (gtk_tree_selection_get_selected(selection, &model, &iter)) { + PopplerAnnot *annot; + + gtk_tree_model_get(model, &iter, ANNOTS_COLUMN, &annot, -1); + poppler_page_remove_annot(demo->page, annot); + g_object_unref(annot); + gtk_list_store_remove(GTK_LIST_STORE(model), &iter); + + pgd_annots_viewer_queue_redraw(demo); + } +} + +static void pgd_annot_view_set_annot_markup(GtkWidget *table, PopplerAnnotMarkup *markup, gint *row) +{ + gchar *text; + PopplerRectangle rect; + + text = poppler_annot_markup_get_label(markup); + pgd_table_add_property(GTK_GRID(table), "<b>Label:</b>", text, row); + g_free(text); + + if (poppler_annot_markup_has_popup(markup)) { + pgd_table_add_property(GTK_GRID(table), "<b>Popup is open:</b>", poppler_annot_markup_get_popup_is_open(markup) ? "Yes" : "No", row); + + poppler_annot_markup_get_popup_rectangle(markup, &rect); + text = g_strdup_printf("X1: %.2f, Y1: %.2f, X2: %.2f, Y2: %.2f", rect.x1, rect.y1, rect.x2, rect.y2); + pgd_table_add_property(GTK_GRID(table), "<b>Popup Rectangle:</b>", text, row); + g_free(text); + } + + text = g_strdup_printf("%f", poppler_annot_markup_get_opacity(markup)); + pgd_table_add_property(GTK_GRID(table), "<b>Opacity:</b>", text, row); + g_free(text); + + text = get_markup_date(markup); + pgd_table_add_property(GTK_GRID(table), "<b>Date:</b>", text, row); + g_free(text); + + text = poppler_annot_markup_get_subject(markup); + pgd_table_add_property(GTK_GRID(table), "<b>Subject:</b>", text, row); + g_free(text); + + pgd_table_add_property(GTK_GRID(table), "<b>Reply To:</b>", get_markup_reply_to(markup), row); + + pgd_table_add_property(GTK_GRID(table), "<b>External Data:</b>", get_markup_external_data(markup), row); +} + +static void pgd_annot_view_set_annot_text(GtkWidget *table, PopplerAnnotText *annot, gint *row) +{ + gchar *text; + + pgd_table_add_property(GTK_GRID(table), "<b>Is open:</b>", poppler_annot_text_get_is_open(annot) ? "Yes" : "No", row); + + text = poppler_annot_text_get_icon(annot); + pgd_table_add_property(GTK_GRID(table), "<b>Icon:</b>", text, row); + g_free(text); + + pgd_table_add_property(GTK_GRID(table), "<b>State:</b>", get_text_state(annot), row); +} + +static void pgd_annot_color_changed(GtkButton *button, GParamSpec *pspec, PgdAnnotsDemo *demo) +{ + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(button), &demo->annot_color); +} + +static void pgd_annot_view_set_annot_text_markup(GtkWidget *table, PopplerAnnotTextMarkup *annot, gint *row) +{ + gint i; + gchar *text = NULL; + gchar *prev_text = NULL; + GArray *quads_array = NULL; + PopplerQuadrilateral quadrilateral; + + quads_array = poppler_annot_text_markup_get_quadrilaterals(annot); + + prev_text = g_strdup(""); + for (i = 0; i < quads_array->len; i++) { + quadrilateral = g_array_index(quads_array, PopplerQuadrilateral, i); + + text = g_strdup_printf("%s%2d:(%.2f,%.2f) (%.2f,%.2f)\n" + " (%.2f,%.2f) (%.2f,%.2f)\n", + prev_text, i + 1, quadrilateral.p1.x, quadrilateral.p1.y, quadrilateral.p2.x, quadrilateral.p2.y, quadrilateral.p3.x, quadrilateral.p3.y, quadrilateral.p4.x, quadrilateral.p4.y); + g_free(prev_text); + prev_text = text; + } + + text = g_strchomp(text); + pgd_table_add_property(GTK_GRID(table), "<b>Quadrilaterals:</b>", text, row); + + g_array_free(quads_array, TRUE); + g_free(text); +} + +static void pgd_annot_view_set_annot_free_text(GtkWidget *table, PopplerAnnotFreeText *annot, gint *row) +{ + gchar *text; + + pgd_table_add_property(GTK_GRID(table), "<b>Quadding:</b>", get_free_text_quadding(annot), row); + + text = get_free_text_callout_line(annot); + pgd_table_add_property(GTK_GRID(table), "<b>Callout:</b>", text, row); + g_free(text); +} + +static void pgd_annot_view_set_annot_stamp(GtkWidget *table, PopplerAnnotStamp *annot, gint *row) +{ + PopplerAnnotStampIcon icon; + + icon = poppler_annot_stamp_get_icon(annot); + pgd_table_add_property(GTK_GRID(table), "<b>Icon Name:</b>", stamp_types[icon], row); +} + +static void pgd_annots_file_attachment_save_dialog_response(GtkFileChooser *file_chooser, gint response, PopplerAttachment *attachment) +{ + gchar *filename; + GError *error = NULL; + + if (response != GTK_RESPONSE_ACCEPT) { + g_object_unref(attachment); + gtk_widget_destroy(GTK_WIDGET(file_chooser)); + return; + } + + filename = gtk_file_chooser_get_filename(file_chooser); + if (!poppler_attachment_save(attachment, filename, &error)) { + g_warning("%s", error->message); + g_error_free(error); + } + g_free(filename); + g_object_unref(attachment); + gtk_widget_destroy(GTK_WIDGET(file_chooser)); +} + +static void pgd_annot_save_file_attachment_button_clicked(GtkButton *button, PopplerAnnotFileAttachment *annot) +{ + GtkWidget *file_chooser; + PopplerAttachment *attachment; + + attachment = poppler_annot_file_attachment_get_attachment(annot); + if (!attachment) { + return; + } + + file_chooser = gtk_file_chooser_dialog_new("Save attachment", GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(button))), GTK_FILE_CHOOSER_ACTION_SAVE, "_Cancel", GTK_RESPONSE_CANCEL, "_Save", GTK_RESPONSE_ACCEPT, NULL); + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(file_chooser), poppler_attachment_get_name(attachment)); + g_signal_connect(G_OBJECT(file_chooser), "response", G_CALLBACK(pgd_annots_file_attachment_save_dialog_response), (gpointer)attachment); + gtk_widget_show(file_chooser); +} + +static void pgd_annot_view_set_annot_file_attachment(GtkWidget *table, PopplerAnnotFileAttachment *annot, gint *row) +{ + GtkWidget *button; + gchar *text; + + text = poppler_annot_file_attachment_get_name(annot); + pgd_table_add_property(GTK_GRID(table), "<b>Attachment Name:</b>", text, row); + g_free(text); + + button = gtk_button_new_with_label("Save Attachment"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_annot_save_file_attachment_button_clicked), (gpointer)annot); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>File Attachment:</b>", button, row); + gtk_widget_show(button); +} + +static void pgd_annot_view_set_annot_movie(GtkWidget *table, PopplerAnnotMovie *annot, gint *row) +{ + GtkWidget *movie_view; + gchar *text; + + text = poppler_annot_movie_get_title(annot); + pgd_table_add_property(GTK_GRID(table), "<b>Movie Title:</b>", text, row); + g_free(text); + + movie_view = pgd_movie_view_new(); + pgd_movie_view_set_movie(movie_view, poppler_annot_movie_get_movie(annot)); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>Movie:</b>", movie_view, row); + gtk_widget_show(movie_view); +} + +static void pgd_annot_view_set_annot_screen(GtkWidget *table, PopplerAnnotScreen *annot, gint *row) +{ + GtkWidget *action_view; + + action_view = pgd_action_view_new(NULL); + pgd_action_view_set_action(action_view, poppler_annot_screen_get_action(annot)); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>Action:</b>", action_view, row); + gtk_widget_show(action_view); +} + +static void pgd_annot_view_set_annot(PgdAnnotsDemo *demo, PopplerAnnot *annot) +{ + GtkWidget *table; + gint row = 0; + gchar *text; + time_t timet; + PopplerRectangle rect; + + table = gtk_bin_get_child(GTK_BIN(demo->annot_view)); + if (table) { + gtk_container_remove(GTK_CONTAINER(demo->annot_view), table); + } + + if (!annot) { + return; + } + + table = gtk_grid_new(); + gtk_widget_set_margin_top(table, 5); + gtk_widget_set_margin_bottom(table, 5); +#if GTK_CHECK_VERSION(3, 12, 0) + gtk_widget_set_margin_start(table, 8); + gtk_widget_set_margin_end(table, 5); +#else + gtk_widget_set_margin_left(table, 8); + gtk_widget_set_margin_right(table, 5); +#endif + gtk_grid_set_column_spacing(GTK_GRID(table), 6); + gtk_grid_set_row_spacing(GTK_GRID(table), 6); + + text = poppler_annot_get_contents(annot); + pgd_table_add_property(GTK_GRID(table), "<b>Contents:</b>", text, &row); + g_free(text); + + text = poppler_annot_get_name(annot); + pgd_table_add_property(GTK_GRID(table), "<b>Name:</b>", text, &row); + g_free(text); + + text = poppler_annot_get_modified(annot); + if (poppler_date_parse(text, &timet)) { + g_free(text); + text = pgd_format_date(timet); + } + pgd_table_add_property(GTK_GRID(table), "<b>Modified:</b>", text, &row); + g_free(text); + + poppler_annot_get_rectangle(annot, &rect); + text = g_strdup_printf("(%.2f;%.2f) (%.2f;%.2f)", rect.x1, rect.y1, rect.x2, rect.y2); + pgd_table_add_property(GTK_GRID(table), "<b>Coords:</b>", text, &row); + g_free(text); + + if (POPPLER_IS_ANNOT_MARKUP(annot)) { + pgd_annot_view_set_annot_markup(table, POPPLER_ANNOT_MARKUP(annot), &row); + } + + switch (poppler_annot_get_annot_type(annot)) { + case POPPLER_ANNOT_TEXT: + pgd_annot_view_set_annot_text(table, POPPLER_ANNOT_TEXT(annot), &row); + break; + case POPPLER_ANNOT_HIGHLIGHT: + case POPPLER_ANNOT_UNDERLINE: + case POPPLER_ANNOT_SQUIGGLY: + case POPPLER_ANNOT_STRIKE_OUT: + pgd_annot_view_set_annot_text_markup(table, POPPLER_ANNOT_TEXT_MARKUP(annot), &row); + break; + case POPPLER_ANNOT_FREE_TEXT: + pgd_annot_view_set_annot_free_text(table, POPPLER_ANNOT_FREE_TEXT(annot), &row); + break; + case POPPLER_ANNOT_FILE_ATTACHMENT: + pgd_annot_view_set_annot_file_attachment(table, POPPLER_ANNOT_FILE_ATTACHMENT(annot), &row); + break; + case POPPLER_ANNOT_MOVIE: + pgd_annot_view_set_annot_movie(table, POPPLER_ANNOT_MOVIE(annot), &row); + break; + case POPPLER_ANNOT_SCREEN: + pgd_annot_view_set_annot_screen(table, POPPLER_ANNOT_SCREEN(annot), &row); + break; + case POPPLER_ANNOT_STAMP: + pgd_annot_view_set_annot_stamp(table, POPPLER_ANNOT_STAMP(annot), &row); + break; + default: + break; + } + + gtk_container_add(GTK_CONTAINER(demo->annot_view), table); + gtk_widget_show(table); +} + +static void pgd_annots_add_annot_to_model(PgdAnnotsDemo *demo, PopplerAnnot *annot, PopplerRectangle area, gboolean selected) +{ + GtkTreeIter iter; + GdkPixbuf *pixbuf; + PopplerAnnotFlag flags; + + pixbuf = get_annot_color(annot); + flags = poppler_annot_get_flags(annot); + + gtk_list_store_append(demo->model, &iter); + gtk_list_store_set(demo->model, &iter, ANNOTS_TYPE_COLUMN, get_annot_type(annot), ANNOTS_COLOR_COLUMN, pixbuf, ANNOTS_FLAG_INVISIBLE_COLUMN, (flags & POPPLER_ANNOT_FLAG_INVISIBLE), ANNOTS_FLAG_HIDDEN_COLUMN, + (flags & POPPLER_ANNOT_FLAG_HIDDEN), ANNOTS_FLAG_PRINT_COLUMN, (flags & POPPLER_ANNOT_FLAG_PRINT), ANNOTS_COLUMN, annot, -1); + + if (selected) { + GtkTreePath *path; + + path = gtk_tree_model_get_path(GTK_TREE_MODEL(demo->model), &iter); + gtk_tree_view_set_cursor(GTK_TREE_VIEW(demo->tree_view), path, NULL, FALSE); + gtk_tree_path_free(path); + } + + if (pixbuf) { + g_object_unref(pixbuf); + } +} + +static void pgd_annots_get_annots(PgdAnnotsDemo *demo) +{ + GList *mapping, *l; + gint n_fields; + GTimer *timer; + + gtk_list_store_clear(demo->model); + pgd_annot_view_set_annot(demo, NULL); + + if (demo->page) { + g_object_unref(demo->page); + demo->page = NULL; + } + + demo->page = poppler_document_get_page(demo->doc, demo->num_page); + if (!demo->page) { + return; + } + + timer = g_timer_new(); + mapping = poppler_page_get_annot_mapping(demo->page); + g_timer_stop(timer); + + n_fields = g_list_length(mapping); + if (n_fields > 0) { + gchar *str; + + str = g_strdup_printf("<i>%d annotations found in %.4f seconds</i>", n_fields, g_timer_elapsed(timer, NULL)); + gtk_label_set_markup(GTK_LABEL(demo->timer_label), str); + g_free(str); + } else { + gtk_label_set_markup(GTK_LABEL(demo->timer_label), "<i>No annotations found</i>"); + } + + g_timer_destroy(timer); + + for (l = mapping; l; l = g_list_next(l)) { + PopplerAnnotMapping *amapping; + + amapping = (PopplerAnnotMapping *)l->data; + pgd_annots_add_annot_to_model(demo, amapping->annot, amapping->area, FALSE); + } + + poppler_page_free_annot_mapping(mapping); +} + +static void pgd_annots_page_selector_value_changed(GtkSpinButton *spinbutton, PgdAnnotsDemo *demo) +{ + demo->num_page = (gint)gtk_spin_button_get_value(spinbutton) - 1; + pgd_annots_viewer_queue_redraw(demo); + pgd_annots_get_annots(demo); +} + +static void pgd_annots_selection_changed(GtkTreeSelection *treeselection, PgdAnnotsDemo *demo) +{ + GtkTreeModel *model; + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(treeselection, &model, &iter)) { + PopplerAnnot *annot; + + gtk_tree_model_get(model, &iter, ANNOTS_COLUMN, &annot, -1); + pgd_annot_view_set_annot(demo, annot); + g_object_unref(annot); + + gtk_widget_set_sensitive(demo->remove_button, TRUE); + } else { + pgd_annot_view_set_annot(demo, NULL); + gtk_widget_set_sensitive(demo->remove_button, FALSE); + } +} + +static void pgd_annots_flags_toggled(GtkCellRendererToggle *renderer, gchar *path_str, PgdAnnotsDemo *demo, gint column, PopplerAnnotFlag flag_bit) +{ + GtkTreeIter iter; + gboolean fixed; + PopplerAnnot *annot; + PopplerAnnotFlag flags; + GtkTreePath *path = gtk_tree_path_new_from_string(path_str); + GtkTreeModel *model = GTK_TREE_MODEL(demo->model); + + gtk_tree_model_get_iter(model, &iter, path); + gtk_tree_model_get(model, &iter, column, &fixed, ANNOTS_COLUMN, &annot, -1); + + fixed ^= 1; + flags = poppler_annot_get_flags(annot); + + if (fixed) { + flags |= flag_bit; + } else { + flags &= ~flag_bit; + } + + poppler_annot_set_flags(annot, flags); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, column, fixed, -1); + + pgd_annot_view_set_annot(demo, annot); + gtk_tree_path_free(path); + + pgd_annots_viewer_queue_redraw(demo); +} + +static void pgd_annots_hidden_flag_toggled(GtkCellRendererToggle *renderer, gchar *path_str, PgdAnnotsDemo *demo) +{ + pgd_annots_flags_toggled(renderer, path_str, demo, ANNOTS_FLAG_HIDDEN_COLUMN, POPPLER_ANNOT_FLAG_HIDDEN); +} + +static void pgd_annots_print_flag_toggled(GtkCellRendererToggle *renderer, gchar *path_str, PgdAnnotsDemo *demo) +{ + pgd_annots_flags_toggled(renderer, path_str, demo, ANNOTS_FLAG_PRINT_COLUMN, POPPLER_ANNOT_FLAG_PRINT); +} + +static void pgd_annots_invisible_flag_toggled(GtkCellRendererToggle *renderer, gchar *path_str, PgdAnnotsDemo *demo) +{ + pgd_annots_flags_toggled(renderer, path_str, demo, ANNOTS_FLAG_INVISIBLE_COLUMN, POPPLER_ANNOT_FLAG_INVISIBLE); +} + +static inline void pgd_annots_set_poppler_quad_from_rectangle(PopplerQuadrilateral *quad, PopplerRectangle *rect) +{ + quad->p1.x = rect->x1; + quad->p1.y = rect->y1; + quad->p2.x = rect->x2; + quad->p2.y = rect->y1; + quad->p3.x = rect->x1; + quad->p3.y = rect->y2; + quad->p4.x = rect->x2; + quad->p4.y = rect->y2; +} + +static GArray *pgd_annots_create_quads_array_for_rectangle(PopplerRectangle *rect) +{ + GArray *quads_array; + PopplerQuadrilateral *quad; + + quads_array = g_array_sized_new(FALSE, FALSE, sizeof(PopplerQuadrilateral), 1); + g_array_set_size(quads_array, 1); + + quad = &g_array_index(quads_array, PopplerQuadrilateral, 0); + pgd_annots_set_poppler_quad_from_rectangle(quad, rect); + + return quads_array; +} + +static PopplerAnnotStampIcon get_icon_from_stamp_text(gchar *icon_text) +{ + int i; + + for (i = 1; i < G_N_ELEMENTS(stamp_types) - 1; i++) { + if (strcmp(stamp_types[i], icon_text) == 0) { + return (PopplerAnnotStampIcon)i; + } + } + + return POPPLER_ANNOT_STAMP_ICON_UNKNOWN; +} + +static void pgd_annots_add_annot(PgdAnnotsDemo *demo) +{ + PopplerRectangle rect; + PopplerColor color; + PopplerAnnot *annot; + gdouble height; + + g_assert(demo->mode == MODE_ADD); + + poppler_page_get_size(demo->page, NULL, &height); + + rect.x1 = demo->start.x; + rect.y1 = height - demo->start.y; + rect.x2 = demo->stop.x; + rect.y2 = height - demo->stop.y; + + color.red = CLAMP((guint)(demo->annot_color.red * 65535), 0, 65535); + color.green = CLAMP((guint)(demo->annot_color.green * 65535), 0, 65535); + color.blue = CLAMP((guint)(demo->annot_color.blue * 65535), 0, 65535); + + switch (demo->annot_type) { + case POPPLER_ANNOT_TEXT: + annot = poppler_annot_text_new(demo->doc, &rect); + + break; + case POPPLER_ANNOT_LINE: { + PopplerPoint start, end; + + start.x = rect.x1; + start.y = rect.y1; + end.x = rect.x2; + end.y = rect.y2; + + annot = poppler_annot_line_new(demo->doc, &rect, &start, &end); + } break; + case POPPLER_ANNOT_SQUARE: + annot = poppler_annot_square_new(demo->doc, &rect); + break; + case POPPLER_ANNOT_CIRCLE: + annot = poppler_annot_circle_new(demo->doc, &rect); + break; + case POPPLER_ANNOT_HIGHLIGHT: { + GArray *quads_array; + + quads_array = pgd_annots_create_quads_array_for_rectangle(&rect); + annot = poppler_annot_text_markup_new_highlight(demo->doc, &rect, quads_array); + g_array_free(quads_array, TRUE); + } break; + case POPPLER_ANNOT_UNDERLINE: { + GArray *quads_array; + + quads_array = pgd_annots_create_quads_array_for_rectangle(&rect); + annot = poppler_annot_text_markup_new_underline(demo->doc, &rect, quads_array); + g_array_free(quads_array, TRUE); + } break; + case POPPLER_ANNOT_SQUIGGLY: { + GArray *quads_array; + + quads_array = pgd_annots_create_quads_array_for_rectangle(&rect); + annot = poppler_annot_text_markup_new_squiggly(demo->doc, &rect, quads_array); + g_array_free(quads_array, TRUE); + } break; + case POPPLER_ANNOT_STRIKE_OUT: { + GArray *quads_array; + + quads_array = pgd_annots_create_quads_array_for_rectangle(&rect); + annot = poppler_annot_text_markup_new_strikeout(demo->doc, &rect, quads_array); + g_array_free(quads_array, TRUE); + } break; + case POPPLER_ANNOT_STAMP: { + annot = poppler_annot_stamp_new(demo->doc, &rect); + gchar *stamp_type = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(demo->stamp_selector)); + GError *error = NULL; + + if (strcmp(stamp_type, STAMP_CUSTOM_IMAGE) == 0 && demo->custom_image_filename) { + cairo_surface_t *img = cairo_image_surface_create_from_png(demo->custom_image_filename); + if (cairo_surface_status(img) == CAIRO_STATUS_SUCCESS) { + poppler_annot_stamp_set_custom_image(POPPLER_ANNOT_STAMP(annot), img, &error); + if (error) { + g_warning("%s", error->message); + g_error_free(error); + } + } + cairo_surface_destroy(img); + } else { + poppler_annot_stamp_set_icon(POPPLER_ANNOT_STAMP(annot), get_icon_from_stamp_text(stamp_type)); + } + g_free(stamp_type); + } break; + default: + g_assert_not_reached(); + } + + demo->active_annot = annot; + + if (demo->annot_type != POPPLER_ANNOT_STAMP) { + poppler_annot_set_color(annot, &color); + } + poppler_page_add_annot(demo->page, annot); + pgd_annots_add_annot_to_model(demo, annot, rect, TRUE); + g_object_unref(annot); +} + +static void pgd_annots_finish_add_annot(PgdAnnotsDemo *demo) +{ + g_assert(demo->mode == MODE_ADD || demo->mode == MODE_DRAWING); + + demo->mode = MODE_NORMAL; + demo->start.x = -1; + pgd_annots_update_cursor(demo, GDK_LAST_CURSOR); + pgd_annots_viewer_queue_redraw(demo); + + gtk_label_set_text(GTK_LABEL(demo->timer_label), NULL); +} + +static void pgd_annots_update_selected_text(PgdAnnotsDemo *demo) +{ + PopplerRectangle doc_area, *rects = NULL, *r = NULL; + gdouble width, height; + GArray *quads_array = NULL; + guint n_rects; + gint i, lines = 0; + GList *l_rects = NULL, *list; + + poppler_page_get_size(demo->page, &width, &height); + + doc_area.x1 = demo->start.x; + doc_area.y1 = demo->start.y; + doc_area.x2 = demo->stop.x; + doc_area.y2 = demo->stop.y; + + if (!poppler_page_get_text_layout_for_area(demo->page, &doc_area, &rects, &n_rects)) { + return; + } + + r = g_slice_new(PopplerRectangle); + r->x1 = G_MAXDOUBLE; + r->y1 = G_MAXDOUBLE; + r->x2 = G_MINDOUBLE; + r->y2 = G_MINDOUBLE; + + for (i = 0; i < n_rects; i++) { + /* Check if the rectangle belongs to the same line. + On a new line, start a new target rectangle. + On the same line, make an union of rectangles at + the same line */ + if (ABS(r->y2 - rects[i].y2) > 0.0001) { + if (i > 0) { + l_rects = g_list_append(l_rects, r); + } + r = g_slice_new(PopplerRectangle); + r->x1 = rects[i].x1; + r->y1 = rects[i].y1; + r->x2 = rects[i].x2; + r->y2 = rects[i].y2; + lines++; + } else { + r->x1 = MIN(r->x1, rects[i].x1); + r->y1 = MIN(r->y1, rects[i].y1); + r->x2 = MAX(r->x2, rects[i].x2); + r->y2 = MAX(r->y2, rects[i].y2); + } + } + + l_rects = g_list_append(l_rects, r); + l_rects = g_list_reverse(l_rects); + + quads_array = g_array_sized_new(TRUE, TRUE, sizeof(PopplerQuadrilateral), lines); + g_array_set_size(quads_array, lines); + + for (list = l_rects, i = 0; list; list = list->next, i++) { + PopplerQuadrilateral *quad; + + quad = &g_array_index(quads_array, PopplerQuadrilateral, i); + r = (PopplerRectangle *)list->data; + quad->p1.x = r->x1; + quad->p1.y = height - r->y1; + quad->p2.x = r->x2; + quad->p2.y = height - r->y1; + quad->p3.x = r->x1; + quad->p3.y = height - r->y2; + quad->p4.x = r->x2; + quad->p4.y = height - r->y2; + g_slice_free(PopplerRectangle, r); + } + + poppler_annot_text_markup_set_quadrilaterals(POPPLER_ANNOT_TEXT_MARKUP(demo->active_annot), quads_array); + g_array_free(quads_array, TRUE); + g_free(rects); + g_list_free(l_rects); +} + +/* Render area */ +static cairo_surface_t *pgd_annots_render_page(PgdAnnotsDemo *demo) +{ + cairo_t *cr; + PopplerPage *page; + gdouble width, height; + cairo_surface_t *surface = NULL; + + page = poppler_document_get_page(demo->doc, demo->num_page); + if (!page) { + return NULL; + } + + poppler_page_get_size(page, &width, &height); + gtk_widget_set_size_request(demo->darea, width, height); + + surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, width, height); + cr = cairo_create(surface); + + cairo_save(cr); + cairo_set_source_rgb(cr, 1, 1, 1); + cairo_rectangle(cr, 0, 0, width, height); + cairo_fill(cr); + cairo_restore(cr); + + cairo_save(cr); + poppler_page_render(page, cr); + cairo_restore(cr); + + cairo_destroy(cr); + g_object_unref(page); + + return surface; +} + +static gboolean pgd_annots_view_drawing_area_draw(GtkWidget *area, cairo_t *cr, PgdAnnotsDemo *demo) +{ + if (demo->num_page == -1) { + return FALSE; + } + + if (!demo->surface) { + demo->surface = pgd_annots_render_page(demo); + if (!demo->surface) { + return FALSE; + } + } + + cairo_set_source_surface(cr, demo->surface, 0, 0); + cairo_paint(cr); + + return TRUE; +} + +static gboolean pgd_annots_viewer_redraw(PgdAnnotsDemo *demo) +{ + cairo_surface_destroy(demo->surface); + demo->surface = NULL; + + gtk_widget_queue_draw(demo->darea); + + demo->annotations_idle = 0; + + return FALSE; +} + +static void pgd_annots_viewer_queue_redraw(PgdAnnotsDemo *demo) +{ + if (demo->annotations_idle == 0) { + demo->annotations_idle = g_idle_add((GSourceFunc)pgd_annots_viewer_redraw, demo); + } +} + +static void pgd_annots_drawing_area_realize(GtkWidget *area, PgdAnnotsDemo *demo) +{ + gtk_widget_add_events(area, GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); +} + +static gboolean pgd_annots_drawing_area_button_press(GtkWidget *area, GdkEventButton *event, PgdAnnotsDemo *demo) +{ + if (!demo->page || demo->mode != MODE_ADD || event->button != 1) { + return FALSE; + } + + demo->start.x = event->x; + demo->start.y = event->y; + demo->stop = demo->start; + + pgd_annots_add_annot(demo); + pgd_annots_viewer_queue_redraw(demo); + demo->mode = MODE_DRAWING; + + return TRUE; +} + +static void choose_custom_image(PgdAnnotsDemo *demo) +{ + GtkFileChooser *chooser_dialog; + gint response; + const gchar *chooser_dir = "/usr/share/pixmaps"; + const gchar *pics_dir; + GtkFileFilter *filter; + + chooser_dialog = GTK_FILE_CHOOSER(gtk_file_chooser_dialog_new("Select PNG Image", NULL, GTK_FILE_CHOOSER_ACTION_OPEN, "gtk-cancel", GTK_RESPONSE_CANCEL, "gtk-open", GTK_RESPONSE_ACCEPT, NULL)); + gtk_window_set_modal(GTK_WINDOW(chooser_dialog), TRUE); + gtk_dialog_set_default_response(GTK_DIALOG(chooser_dialog), GTK_RESPONSE_ACCEPT); + + gtk_file_chooser_add_shortcut_folder(chooser_dialog, chooser_dir, NULL); + pics_dir = g_get_user_special_dir(G_USER_DIRECTORY_PICTURES); + if (pics_dir != NULL) { + gtk_file_chooser_add_shortcut_folder(chooser_dialog, pics_dir, NULL); + } + + if (!g_file_test(chooser_dir, G_FILE_TEST_IS_DIR)) { + chooser_dir = g_get_home_dir(); + } + + gtk_file_chooser_set_current_folder(chooser_dialog, chooser_dir); + + filter = gtk_file_filter_new(); + gtk_file_filter_set_name(filter, "PNG images"); + gtk_file_filter_add_mime_type(filter, "image/png"); + gtk_file_chooser_add_filter(chooser_dialog, filter); + filter = gtk_file_filter_new(); + gtk_file_filter_set_name(filter, "All Files"); + gtk_file_filter_add_pattern(filter, "*"); + gtk_file_chooser_add_filter(chooser_dialog, filter); + + response = gtk_dialog_run(GTK_DIALOG(chooser_dialog)); + + if (response == GTK_RESPONSE_ACCEPT) { + if (demo->custom_image_filename) { + g_free(demo->custom_image_filename); + } + + demo->custom_image_filename = gtk_file_chooser_get_filename(chooser_dialog); + } else { + if (demo->custom_image_filename) { + g_free(demo->custom_image_filename); + demo->custom_image_filename = NULL; + } + } + + gtk_widget_destroy(GTK_WIDGET(chooser_dialog)); +} + +static void stamp_selector_changed(GtkComboBox *combo_box, PgdAnnotsDemo *demo) +{ + GtkTreeModel *model; + GtkTreeIter iter; + gchar *active; + + model = gtk_combo_box_get_model(combo_box); + gtk_combo_box_get_active_iter(combo_box, &iter); + gtk_tree_model_get(model, &iter, 0, &active, -1); + if (strcmp(active, STAMP_CUSTOM_IMAGE) == 0) { + choose_custom_image(demo); + } +} + +static void type_selector_changed(GtkComboBox *combo_box, PgdAnnotsDemo *demo) +{ + GtkTreeModel *model; + GtkTreeIter iter; + int active; + + model = gtk_combo_box_get_model(combo_box); + gtk_combo_box_get_active_iter(combo_box, &iter); + gtk_tree_model_get(model, &iter, SELECTED_TYPE_COLUMN, &active, -1); + gtk_widget_set_sensitive(demo->stamp_selector, active == POPPLER_ANNOT_STAMP); +} + +static gboolean pgd_annots_drawing_area_motion_notify(GtkWidget *area, GdkEventMotion *event, PgdAnnotsDemo *demo) +{ + PopplerRectangle rect; + PopplerPoint start, end; + gdouble width, height; + + if (!demo->page || demo->mode != MODE_DRAWING || demo->start.x == -1) { + return FALSE; + } + + demo->stop.x = event->x; + demo->stop.y = event->y; + + poppler_page_get_size(demo->page, &width, &height); + + /* Keep the drawing within the page */ + demo->stop.x = CLAMP(demo->stop.x, 0, width); + demo->stop.y = CLAMP(demo->stop.y, 0, height); + + rect.x1 = start.x = demo->start.x; + rect.y1 = start.y = height - demo->start.y; + rect.x2 = end.x = demo->stop.x; + rect.y2 = end.y = height - demo->stop.y; + + poppler_annot_set_rectangle(demo->active_annot, &rect); + + if (demo->annot_type == POPPLER_ANNOT_LINE) { + poppler_annot_line_set_vertices(POPPLER_ANNOT_LINE(demo->active_annot), &start, &end); + } + + if (POPPLER_IS_ANNOT_TEXT_MARKUP(demo->active_annot)) { + pgd_annots_update_selected_text(demo); + } + + pgd_annot_view_set_annot(demo, demo->active_annot); + pgd_annots_viewer_queue_redraw(demo); + + return TRUE; +} + +static gboolean pgd_annots_drawing_area_button_release(GtkWidget *area, GdkEventButton *event, PgdAnnotsDemo *demo) +{ + if (!demo->page || demo->mode != MODE_DRAWING || event->button != 1) { + return FALSE; + } + + pgd_annots_finish_add_annot(demo); + + return TRUE; +} + +/* Main UI */ +GtkWidget *pgd_annots_create_widget(PopplerDocument *document) +{ + PgdAnnotsDemo *demo; + GtkWidget *label; + GtkWidget *vbox, *vbox2; + GtkWidget *button; + GtkWidget *hbox, *hbox2, *page_selector; + GtkWidget *hpaned; + GtkWidget *swindow, *treeview; + GtkTreeSelection *selection; + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + GtkListStore *model; + GtkTreeIter iter; + gchar *str; + gint n_pages; + gint i; + + demo = g_new0(PgdAnnotsDemo, 1); + + demo->doc = g_object_ref(document); + demo->cursor = GDK_LAST_CURSOR; + demo->mode = MODE_NORMAL; + + n_pages = poppler_document_get_n_pages(document); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12); + + label = gtk_label_new("Page:"); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + + page_selector = gtk_spin_button_new_with_range(1, n_pages, 1); + g_signal_connect(G_OBJECT(page_selector), "value-changed", G_CALLBACK(pgd_annots_page_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(hbox), page_selector, FALSE, TRUE, 0); + gtk_widget_show(page_selector); + + str = g_strdup_printf("of %d", n_pages); + label = gtk_label_new(str); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + g_free(str); + + demo->remove_button = gtk_button_new_with_mnemonic("_Remove"); + gtk_widget_set_sensitive(demo->remove_button, FALSE); + g_signal_connect(G_OBJECT(demo->remove_button), "clicked", G_CALLBACK(pgd_annots_remove_annot), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), demo->remove_button, FALSE, FALSE, 6); + gtk_widget_show(demo->remove_button); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, TRUE, 0); + + button = gtk_button_new_with_mnemonic("_Add"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_annots_start_add_annot), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + model = gtk_list_store_new(SELECTED_N_COLUMNS, G_TYPE_INT, G_TYPE_STRING); + + for (i = 0; i < G_N_ELEMENTS(supported_annots); i++) { + gtk_list_store_append(model, &iter); + gtk_list_store_set(model, &iter, SELECTED_TYPE_COLUMN, supported_annots[i].type, SELECTED_LABEL_COLUMN, supported_annots[i].label, -1); + } + + demo->type_selector = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model)); + g_signal_connect(demo->type_selector, "changed", G_CALLBACK(type_selector_changed), (gpointer)demo); + g_object_unref(model); + + demo->stamp_selector = gtk_combo_box_text_new(); + for (i = 1; i < G_N_ELEMENTS(stamp_types) - 1; i++) { + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(demo->stamp_selector), stamp_types[i]); + } + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(demo->stamp_selector), STAMP_CUSTOM_IMAGE); + + gtk_combo_box_set_active(GTK_COMBO_BOX(demo->stamp_selector), 0); + g_signal_connect(demo->stamp_selector, "changed", G_CALLBACK(stamp_selector_changed), (gpointer)demo); + gtk_widget_set_sensitive(demo->stamp_selector, FALSE); + label = gtk_label_new("Stamp type: "); + gtk_widget_set_sensitive(label, FALSE); + g_object_bind_property(demo->stamp_selector, "sensitive", label, "sensitive", 0); + gtk_box_pack_end(GTK_BOX(hbox2), demo->stamp_selector, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(hbox2), label, FALSE, TRUE, 0); + gtk_widget_show_all(hbox2); + + renderer = gtk_cell_renderer_text_new(); + gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(demo->type_selector), renderer, TRUE); + gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(demo->type_selector), renderer, "text", SELECTED_LABEL_COLUMN, NULL); + gtk_combo_box_set_active(GTK_COMBO_BOX(demo->type_selector), 0); + gtk_box_pack_end(GTK_BOX(hbox), demo->type_selector, FALSE, FALSE, 0); + gtk_widget_show(demo->type_selector); + + button = gtk_color_button_new(); + demo->annot_color.red = 65535; + demo->annot_color.alpha = 1.0; + gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(button), &demo->annot_color); + g_signal_connect(button, "notify::color", G_CALLBACK(pgd_annot_color_changed), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, TRUE, 0); + gtk_widget_show(button); + + gtk_widget_show(hbox); + gtk_widget_show(hbox2); + + demo->timer_label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(demo->timer_label), "<i>No annotations found</i>"); + g_object_set(G_OBJECT(demo->timer_label), "xalign", 1.0, NULL); + gtk_box_pack_start(GTK_BOX(vbox), demo->timer_label, FALSE, TRUE, 0); + gtk_widget_show(demo->timer_label); + + hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); + + demo->annot_view = pgd_annot_view_new(); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + demo->model = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_OBJECT); + treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(demo->model)); + demo->tree_view = treeview; + + column = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title(column, "Type"); + gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); + + renderer = gtk_cell_renderer_pixbuf_new(); + gtk_tree_view_column_pack_start(column, renderer, TRUE); + gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", ANNOTS_COLOR_COLUMN); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(column, renderer, TRUE); + gtk_tree_view_column_add_attribute(column, renderer, "text", ANNOTS_TYPE_COLUMN); + + renderer = gtk_cell_renderer_toggle_new(); + g_signal_connect(renderer, "toggled", G_CALLBACK(pgd_annots_invisible_flag_toggled), (gpointer)demo); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), ANNOTS_FLAG_INVISIBLE_COLUMN, "Invisible", renderer, "active", ANNOTS_FLAG_INVISIBLE_COLUMN, NULL); + + renderer = gtk_cell_renderer_toggle_new(); + g_signal_connect(renderer, "toggled", G_CALLBACK(pgd_annots_hidden_flag_toggled), (gpointer)demo); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), ANNOTS_FLAG_HIDDEN_COLUMN, "Hidden", renderer, "active", ANNOTS_FLAG_HIDDEN_COLUMN, NULL); + + renderer = gtk_cell_renderer_toggle_new(); + g_signal_connect(renderer, "toggled", G_CALLBACK(pgd_annots_print_flag_toggled), (gpointer)demo); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), ANNOTS_FLAG_PRINT_COLUMN, "Print", renderer, "active", ANNOTS_FLAG_PRINT_COLUMN, NULL); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(pgd_annots_selection_changed), (gpointer)demo); + + /* Annotation's list */ + gtk_container_add(GTK_CONTAINER(swindow), treeview); + gtk_widget_show(treeview); + + gtk_box_pack_start(GTK_BOX(vbox2), swindow, TRUE, TRUE, 0); + gtk_widget_show(swindow); + + /* Annotation Properties */ + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_container_add(GTK_CONTAINER(swindow), demo->annot_view); + gtk_widget_show(demo->annot_view); + gtk_widget_show(swindow); + + gtk_box_pack_start(GTK_BOX(vbox2), swindow, TRUE, TRUE, 6); + gtk_widget_show(swindow); + + gtk_paned_add1(GTK_PANED(hpaned), vbox2); + gtk_widget_show(vbox2); + + /* Demo Area (Render) */ + demo->darea = gtk_drawing_area_new(); + g_signal_connect(demo->darea, "draw", G_CALLBACK(pgd_annots_view_drawing_area_draw), demo); + g_signal_connect(demo->darea, "realize", G_CALLBACK(pgd_annots_drawing_area_realize), (gpointer)demo); + g_signal_connect(demo->darea, "button_press_event", G_CALLBACK(pgd_annots_drawing_area_button_press), (gpointer)demo); + g_signal_connect(demo->darea, "motion_notify_event", G_CALLBACK(pgd_annots_drawing_area_motion_notify), (gpointer)demo); + g_signal_connect(demo->darea, "button_release_event", G_CALLBACK(pgd_annots_drawing_area_button_release), (gpointer)demo); + + swindow = gtk_scrolled_window_new(NULL, NULL); +#if GTK_CHECK_VERSION(3, 7, 8) + gtk_container_add(GTK_CONTAINER(swindow), demo->darea); +#else + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swindow), demo->darea); +#endif + gtk_widget_show(demo->darea); + + gtk_paned_add2(GTK_PANED(hpaned), swindow); + gtk_widget_show(swindow); + + gtk_paned_set_position(GTK_PANED(hpaned), 300); + + gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0); + gtk_widget_show(hpaned); + + g_object_weak_ref(G_OBJECT(vbox), (GWeakNotify)pgd_annots_free, demo); + + pgd_annots_viewer_queue_redraw(demo); + pgd_annots_get_annots(demo); + + demo->main_box = vbox; + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/annots.h b/poppler-24.05.0/glib/demo/annots.h new file mode 100644 index 0000000000000000000000000000000000000000..7b95658bca64c3c1e420d42874e94dab96f99bab --- /dev/null +++ b/poppler-24.05.0/glib/demo/annots.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2008 Inigo Martinez <inigomartinez@gmail.com> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _ANNOTS_H_ +# define _ANNOTS_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_annots_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _ANNOTS_H_ */ diff --git a/poppler-24.05.0/glib/demo/attachments.c b/poppler-24.05.0/glib/demo/attachments.c new file mode 100644 index 0000000000000000000000000000000000000000..4376096564092ed864ccd028b7f1b542245c3649 --- /dev/null +++ b/poppler-24.05.0/glib/demo/attachments.c @@ -0,0 +1,285 @@ +/* + * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> + +#include "attachments.h" +#include "utils.h" + +enum +{ + ATTACHMENTS_NAME_COLUMN, + ATTACHMENTS_DESCRIPTION_COLUMN, + ATTACHMENTS_SIZE_COLUMN, + ATTACHMENTS_CTIME_COLUMN, + ATTACHMENTS_MTIME_COLUMN, + ATTACHMENTS_ATTACHMENT_COLUMN, + N_COLUMNS +}; + +static void pgd_attachments_fill_model(GtkListStore *model, PopplerDocument *document) +{ + GList *list, *l; + + list = poppler_document_get_attachments(document); + + for (l = list; l && l->data; l = g_list_next(l)) { + PopplerAttachment *attachment = POPPLER_ATTACHMENT(l->data); + GtkTreeIter iter; + gchar *size; + GDateTime *ctime, *mtime; + gchar *ctime_str, *mtime_str; + const gchar *name; + const gchar *description; + + name = poppler_attachment_get_name(attachment); + description = poppler_attachment_get_description(attachment); + size = g_strdup_printf("%" G_GSIZE_FORMAT, poppler_attachment_get_size(attachment)); + ctime = poppler_attachment_get_ctime(attachment); + ctime_str = ctime ? g_date_time_format(ctime, "%c") : NULL; + mtime = poppler_attachment_get_mtime(attachment); + mtime_str = mtime ? g_date_time_format(mtime, "%c") : NULL; + + gtk_list_store_append(model, &iter); + gtk_list_store_set(model, &iter, ATTACHMENTS_NAME_COLUMN, name ? name : "Unknown", ATTACHMENTS_DESCRIPTION_COLUMN, description ? description : "Unknown", ATTACHMENTS_SIZE_COLUMN, size ? size : "Unknown", ATTACHMENTS_CTIME_COLUMN, + ctime_str ? ctime_str : "Unknown", ATTACHMENTS_MTIME_COLUMN, mtime_str ? mtime_str : "Unknown", ATTACHMENTS_ATTACHMENT_COLUMN, attachment, -1); + + g_free(size); + g_free(ctime_str); + g_free(mtime_str); + + g_object_unref(attachment); + } + + g_list_free(list); +} + +static GtkWidget *pgd_attachments_create_list(GtkTreeModel *model) +{ + GtkWidget *treeview; + GtkCellRenderer *renderer; + + treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model)); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), TRUE); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 0, "Name", renderer, "text", ATTACHMENTS_NAME_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 1, "Description", renderer, "text", ATTACHMENTS_DESCRIPTION_COLUMN, NULL); + g_object_set(G_OBJECT(renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + g_object_set(G_OBJECT(gtk_tree_view_get_column(GTK_TREE_VIEW(treeview), 1)), "expand", TRUE, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 2, "Size", renderer, "text", ATTACHMENTS_SIZE_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 3, "Creation Date", renderer, "text", ATTACHMENTS_CTIME_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 4, "Modification Date", renderer, "text", ATTACHMENTS_MTIME_COLUMN, NULL); + return treeview; +} + +static void pgd_attachments_save_dialog_response(GtkFileChooser *file_chooser, gint response, PopplerAttachment *attachment) +{ + gchar *filename; + GError *error = NULL; + + if (response != GTK_RESPONSE_ACCEPT) { + g_object_unref(attachment); + gtk_widget_destroy(GTK_WIDGET(file_chooser)); + return; + } + + filename = gtk_file_chooser_get_filename(file_chooser); + if (!poppler_attachment_save(attachment, filename, &error)) { + g_warning("%s", error->message); + g_error_free(error); + } + g_free(filename); + g_object_unref(attachment); + gtk_widget_destroy(GTK_WIDGET(file_chooser)); +} + +static void pgd_attachments_save_button_clicked(GtkButton *button, GtkTreeView *treeview) +{ + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + GtkWidget *file_chooser; + PopplerAttachment *attachment; + + selection = gtk_tree_view_get_selection(treeview); + if (!gtk_tree_selection_get_selected(selection, &model, &iter)) { + return; + } + + gtk_tree_model_get(model, &iter, ATTACHMENTS_ATTACHMENT_COLUMN, &attachment, -1); + + if (!attachment) { + return; + } + + file_chooser = gtk_file_chooser_dialog_new("Save attachment", GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(treeview))), GTK_FILE_CHOOSER_ACTION_SAVE, "_Cancel", GTK_RESPONSE_CANCEL, "_Save", GTK_RESPONSE_ACCEPT, NULL); + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(file_chooser), poppler_attachment_get_name(attachment)); + g_signal_connect(G_OBJECT(file_chooser), "response", G_CALLBACK(pgd_attachments_save_dialog_response), (gpointer)attachment); + gtk_widget_show(file_chooser); +} + +static gboolean attachment_save_callback(const gchar *buf, gsize count, gpointer data, GError **error) +{ + GChecksum *cs = (GChecksum *)data; + + g_checksum_update(cs, (guchar *)buf, count); + + return TRUE; +} + +static void message_dialog_run(GtkWindow *parent, const gchar *message) +{ + GtkWidget *dialog; + + dialog = gtk_message_dialog_new(parent, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "%s", message); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); +} + +static void pgd_attachments_validate_button_clicked(GtkButton *button, GtkTreeView *treeview) +{ + GtkTreeSelection *selection; + GtkTreeModel *model; + GtkTreeIter iter; + const GString *checksum; + GChecksum *cs; + guint8 *digest; + gsize digest_len; + PopplerAttachment *attachment; + gboolean valid = TRUE; + + selection = gtk_tree_view_get_selection(treeview); + if (!gtk_tree_selection_get_selected(selection, &model, &iter)) { + return; + } + + gtk_tree_model_get(model, &iter, ATTACHMENTS_ATTACHMENT_COLUMN, &attachment, -1); + + if (!attachment) { + return; + } + + checksum = poppler_attachment_get_checksum(attachment); + + if (checksum->len == 0) { + message_dialog_run(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(treeview))), "Impossible to validate attachment: checksum is not available"); + g_object_unref(attachment); + + return; + } + + cs = g_checksum_new(G_CHECKSUM_MD5); + poppler_attachment_save_to_callback(attachment, attachment_save_callback, (gpointer)cs, NULL); + digest_len = g_checksum_type_get_length(G_CHECKSUM_MD5); + digest = (guint8 *)g_malloc(digest_len); + g_checksum_get_digest(cs, digest, &digest_len); + g_checksum_free(cs); + + if (checksum->len == digest_len) { + gint i; + + for (i = 0; i < digest_len; i++) { + if ((guint8)checksum->str[i] != digest[i]) { + valid = FALSE; + break; + } + } + } + + if (valid) { + message_dialog_run(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(treeview))), "Attachment is valid"); + } else { + message_dialog_run(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(treeview))), "Attachment is not valid: the checksum does not match"); + } + + g_free(digest); + g_object_unref(attachment); +} + +GtkWidget *pgd_attachments_create_widget(PopplerDocument *document) +{ + GtkWidget *vbox; + GtkWidget *treeview; + GtkListStore *model; + GtkWidget *swindow; + GtkWidget *hbox, *button; + gboolean has_attachments; + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + has_attachments = poppler_document_has_attachments(document); + if (has_attachments) { + model = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_OBJECT); + pgd_attachments_fill_model(model, document); + treeview = pgd_attachments_create_list(GTK_TREE_MODEL(model)); + } else { + GtkCellRenderer *renderer; + GtkTreeIter iter; + gchar *markup; + + model = gtk_list_store_new(1, G_TYPE_STRING); + gtk_list_store_append(model, &iter); + markup = g_strdup_printf("<span size=\"larger\" style=\"italic\">%s</span>", "The document doesn't contain attachments"); + gtk_list_store_set(model, &iter, 0, markup, -1); + g_free(markup); + + treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model)); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 0, "Name", renderer, "markup", 0, NULL); + } + g_object_unref(model); + + gtk_container_add(GTK_CONTAINER(swindow), treeview); + gtk_widget_show(treeview); + + gtk_box_pack_start(GTK_BOX(vbox), swindow, TRUE, TRUE, 0); + gtk_widget_show(swindow); + + if (!has_attachments) { + return vbox; + } + + hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); + gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_SPREAD); + + button = gtk_button_new_with_label("Save"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_attachments_save_button_clicked), (gpointer)treeview); + + gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + button = gtk_button_new_with_label("Validate"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_attachments_validate_button_clicked), (gpointer)treeview); + + gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 6); + gtk_widget_show(hbox); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/attachments.h b/poppler-24.05.0/glib/demo/attachments.h new file mode 100644 index 0000000000000000000000000000000000000000..b9ce4c8f561ad7e2b5a4d7c0183a009bb0844aa4 --- /dev/null +++ b/poppler-24.05.0/glib/demo/attachments.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _ATTACHMENTS_H_ +# define _ATTACHMENTS_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_attachments_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _ATTACHMENTS_H_ */ diff --git a/poppler-24.05.0/glib/demo/find.c b/poppler-24.05.0/glib/demo/find.c new file mode 100644 index 0000000000000000000000000000000000000000..1de91f2f47d02ef2ce8f866918b0de457328637e --- /dev/null +++ b/poppler-24.05.0/glib/demo/find.c @@ -0,0 +1,479 @@ +/* + * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 "find.h" + +enum +{ + TITLE_COLUMN, + X1_COLUMN, + Y1_COLUMN, + X2_COLUMN, + Y2_COLUMN, + + VISIBLE_COLUMN, + PAGE_COLUMN, + PAGE_RECT, + N_COLUMNS +}; + +typedef struct +{ + PopplerDocument *doc; + + GtkWidget *treeview; + GtkWidget *darea; + GtkWidget *entry; + GtkWidget *progress; + + PopplerFindFlags options; + gint n_pages; + gint page_index; + + guint idle_id; + + cairo_surface_t *surface; + gint selected_page; + GdkRectangle selected_match; +} PgdFindDemo; + +static void pgd_find_free(PgdFindDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->idle_id > 0) { + g_source_remove(demo->idle_id); + demo->idle_id = 0; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + if (demo->surface) { + cairo_surface_destroy(demo->surface); + demo->surface = NULL; + } + + g_free(demo); +} + +static void pgd_find_update_progress(PgdFindDemo *demo, gint scanned) +{ + gchar *str; + + str = g_strdup_printf("Searching ... (%d%%)", MIN(scanned * 100 / demo->n_pages, 100)); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(demo->progress), str); + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(demo->progress), MIN((gdouble)scanned / demo->n_pages, 1.0)); + g_free(str); +} + +static void pgd_find_append_match(PgdFindDemo *demo, GtkTreeModel *model, GtkTreeIter *iter_child, PopplerRectangle *rect, int match_id) +{ + char *x1, *y1, *x2, *y2, *str; + str = g_strdup_printf("Match %d", match_id + 1); + x1 = g_strdup_printf("%.2f", rect->x1); + y1 = g_strdup_printf("%.2f", rect->y1); + x2 = g_strdup_printf("%.2f", rect->x2); + y2 = g_strdup_printf("%.2f", rect->y2); + gtk_tree_store_set(GTK_TREE_STORE(model), iter_child, TITLE_COLUMN, str, X1_COLUMN, x1, Y1_COLUMN, y1, X2_COLUMN, x2, Y2_COLUMN, y2, VISIBLE_COLUMN, TRUE, PAGE_COLUMN, demo->page_index, PAGE_RECT, rect, -1); + g_free(str); + g_free(x1); + g_free(y1); + g_free(x2); + g_free(y2); + g_object_weak_ref(G_OBJECT(model), (GWeakNotify)poppler_rectangle_free, rect); +} + +static gboolean pgd_find_find_text(PgdFindDemo *demo) +{ + PopplerPage *page; + GList *matches; + GTimer *timer; + GtkTreeModel *model; + + page = poppler_document_get_page(demo->doc, demo->page_index); + if (!page) { + demo->page_index++; + return demo->page_index < demo->n_pages; + } + + model = gtk_tree_view_get_model(GTK_TREE_VIEW(demo->treeview)); + timer = g_timer_new(); + matches = poppler_page_find_text_with_options(page, gtk_entry_get_text(GTK_ENTRY(demo->entry)), demo->options); + g_timer_stop(timer); + if (matches) { + GtkTreeIter iter, iter_child; + gchar *str; + GList *l; + gdouble height; + gint n_match = 0; + + gtk_tree_store_append(GTK_TREE_STORE(model), &iter, NULL); + poppler_page_get_size(page, NULL, &height); + for (l = matches; l && l->data; l = g_list_next(l)) { + PopplerRectangle *rect = (PopplerRectangle *)l->data; + gdouble tmp; + tmp = rect->y1; + rect->y1 = height - rect->y2; + rect->y2 = height - tmp; + gtk_tree_store_append(GTK_TREE_STORE(model), &iter_child, &iter); + pgd_find_append_match(demo, model, &iter_child, rect, n_match); + if (!poppler_rectangle_find_get_match_continued(rect)) { + ++n_match; + } + } + g_list_free(matches); + + str = g_strdup_printf("%d matches found on page %d in %.4f seconds", n_match, demo->page_index + 1, g_timer_elapsed(timer, NULL)); + + gtk_tree_store_set(GTK_TREE_STORE(model), &iter, TITLE_COLUMN, str, VISIBLE_COLUMN, FALSE, PAGE_COLUMN, demo->page_index, -1); + g_free(str); + } + + g_timer_destroy(timer); + g_object_unref(page); + + demo->page_index++; + pgd_find_update_progress(demo, demo->page_index); + + return demo->page_index < demo->n_pages; +} + +static void find_text_idle_finish(PgdFindDemo *demo) +{ + demo->idle_id = 0; +} + +static cairo_surface_t *pgd_find_render_page(PgdFindDemo *demo) +{ + cairo_t *cr; + PopplerPage *page; + gdouble width, height; + cairo_surface_t *surface = NULL; + + page = poppler_document_get_page(demo->doc, demo->selected_page); + if (!page) { + return NULL; + } + + poppler_page_get_size(page, &width, &height); + gtk_widget_set_size_request(demo->darea, width, height); + + surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, width, height); + cr = cairo_create(surface); + + cairo_save(cr); + cairo_set_source_rgb(cr, 1, 1, 1); + cairo_rectangle(cr, 0, 0, width, height); + cairo_fill(cr); + cairo_restore(cr); + + cairo_save(cr); + poppler_page_render(page, cr); + cairo_restore(cr); + + cairo_destroy(cr); + g_object_unref(page); + + return surface; +} + +static gboolean pgd_find_viewer_drawing_area_draw(GtkWidget *area, cairo_t *cr, PgdFindDemo *demo) +{ + if (demo->selected_page == -1) { + return FALSE; + } + + if (!demo->surface) { + demo->surface = pgd_find_render_page(demo); + if (!demo->surface) { + return FALSE; + } + } + + cairo_set_source_surface(cr, demo->surface, 0, 0); + cairo_paint(cr); + + if (demo->selected_match.width > 0 && demo->selected_match.height > 0) { + cairo_set_source_rgb(cr, 1., 1., 0.); + cairo_set_operator(cr, CAIRO_OPERATOR_MULTIPLY); + gdk_cairo_rectangle(cr, &demo->selected_match); + cairo_fill(cr); + } + + return TRUE; +} + +static gboolean pgd_find_viewer_redraw(PgdFindDemo *demo) +{ + cairo_surface_destroy(demo->surface); + demo->surface = NULL; + + gtk_widget_queue_draw(demo->darea); + + return FALSE; +} + +static void pgd_find_viewer_queue_redraw(PgdFindDemo *demo) +{ + g_idle_add((GSourceFunc)pgd_find_viewer_redraw, demo); +} + +static GtkTreeModel *pgd_find_create_model() +{ + return GTK_TREE_MODEL(gtk_tree_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_UINT, G_TYPE_POINTER)); +} + +static void pgd_find_button_clicked(GtkButton *button, PgdFindDemo *demo) +{ + GtkTreeModel *model; + + /* Delete the model and create a new one instead of + * just clearing it to make sure rectangle are free. + * This is a workaround because GtkTreeModel doesn't + * support boxed types and we have to store rectangles + * as pointers that are freed when the model is deleted. + */ + model = pgd_find_create_model(); + gtk_tree_view_set_model(GTK_TREE_VIEW(demo->treeview), model); + g_object_unref(model); + + demo->selected_page = -1; + pgd_find_viewer_queue_redraw(demo); + + demo->page_index = 0; + pgd_find_update_progress(demo, demo->page_index); + if (demo->idle_id > 0) { + g_source_remove(demo->idle_id); + } + demo->idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, (GSourceFunc)pgd_find_find_text, demo, (GDestroyNotify)find_text_idle_finish); +} + +static void pgd_find_button_sensitivity_cb(GtkWidget *button, GtkEntry *entry) +{ + const gchar *text; + + text = gtk_entry_get_text(entry); + gtk_widget_set_sensitive(button, text != NULL && text[0] != '\0'); +} + +static void pgd_find_selection_changed(GtkTreeSelection *treeselection, PgdFindDemo *demo) +{ + GtkTreeModel *model; + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(treeselection, &model, &iter)) { + guint page_index; + PopplerRectangle *rect; + + gtk_tree_model_get(model, &iter, PAGE_COLUMN, &page_index, PAGE_RECT, &rect, -1); + + if (rect) { + demo->selected_match.x = rect->x1; + demo->selected_match.y = rect->y1; + demo->selected_match.width = rect->x2 - rect->x1; + demo->selected_match.height = rect->y2 - rect->y1; + } else { + demo->selected_match.width = 0; + demo->selected_match.height = 0; + } + + if (page_index != demo->selected_page) { + demo->selected_page = page_index; + pgd_find_viewer_queue_redraw(demo); + } else { + gtk_widget_queue_draw(demo->darea); + } + } +} + +static void pgd_find_case_sensitive_toggled(GtkToggleButton *togglebutton, PgdFindDemo *demo) +{ + if (gtk_toggle_button_get_active(togglebutton)) { + demo->options |= POPPLER_FIND_CASE_SENSITIVE; + } else { + demo->options &= ~POPPLER_FIND_CASE_SENSITIVE; + } +} + +static void pgd_find_backwards_toggled(GtkToggleButton *togglebutton, PgdFindDemo *demo) +{ + if (gtk_toggle_button_get_active(togglebutton)) { + demo->options |= POPPLER_FIND_BACKWARDS; + } else { + demo->options &= ~POPPLER_FIND_BACKWARDS; + } +} + +static void pgd_find_multiline_toggled(GtkToggleButton *togglebutton, PgdFindDemo *demo) +{ + if (gtk_toggle_button_get_active(togglebutton)) { + demo->options |= POPPLER_FIND_MULTILINE; + } else { + demo->options &= ~POPPLER_FIND_MULTILINE; + } +} + +static void pgd_find_ignore_diacritics_toggled(GtkToggleButton *togglebutton, PgdFindDemo *demo) +{ + if (gtk_toggle_button_get_active(togglebutton)) { + demo->options |= POPPLER_FIND_IGNORE_DIACRITICS; + } else { + demo->options &= ~POPPLER_FIND_IGNORE_DIACRITICS; + } +} + +static void pgd_find_whole_words_toggled(GtkToggleButton *togglebutton, PgdFindDemo *demo) +{ + if (gtk_toggle_button_get_active(togglebutton)) { + demo->options |= POPPLER_FIND_WHOLE_WORDS_ONLY; + } else { + demo->options &= ~POPPLER_FIND_WHOLE_WORDS_ONLY; + } +} + +GtkWidget *pgd_find_create_widget(PopplerDocument *document) +{ + PgdFindDemo *demo; + GtkWidget *vbox, *hbox; + GtkWidget *button; + GtkWidget *swindow; + GtkWidget *checkbutton; + GtkTreeModel *model; + GtkWidget *treeview; + GtkCellRenderer *renderer; + GtkWidget *hpaned; + GtkTreeSelection *selection; + + demo = g_new0(PgdFindDemo, 1); + + demo->doc = g_object_ref(document); + + demo->n_pages = poppler_document_get_n_pages(document); + demo->selected_page = -1; + demo->options = POPPLER_FIND_DEFAULT; + + hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); + gtk_paned_set_position(GTK_PANED(hpaned), 300); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + checkbutton = gtk_check_button_new_with_label("Multi-line"); + g_signal_connect(checkbutton, "toggled", G_CALLBACK(pgd_find_multiline_toggled), demo); + gtk_box_pack_start(GTK_BOX(hbox), checkbutton, FALSE, FALSE, 0); + gtk_widget_show(checkbutton); + + checkbutton = gtk_check_button_new_with_label("Ignore diacritics"); + g_signal_connect(checkbutton, "toggled", G_CALLBACK(pgd_find_ignore_diacritics_toggled), demo); + gtk_box_pack_start(GTK_BOX(hbox), checkbutton, FALSE, FALSE, 0); + gtk_widget_show(checkbutton); + + demo->entry = gtk_entry_new(); + gtk_box_pack_start(GTK_BOX(hbox), demo->entry, FALSE, TRUE, 0); + gtk_widget_show(demo->entry); + + demo->progress = gtk_progress_bar_new(); + gtk_progress_bar_set_ellipsize(GTK_PROGRESS_BAR(demo->progress), PANGO_ELLIPSIZE_END); + gtk_box_pack_start(GTK_BOX(hbox), demo->progress, TRUE, TRUE, 0); + gtk_widget_show(demo->progress); + + button = gtk_button_new_with_label("Find"); + gtk_widget_set_sensitive(button, FALSE); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_find_button_clicked), (gpointer)demo); + g_signal_connect_swapped(G_OBJECT(demo->entry), "changed", G_CALLBACK(pgd_find_button_sensitivity_cb), (gpointer)button); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 6); + gtk_widget_show(hbox); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + checkbutton = gtk_check_button_new_with_label("Case sensitive"); + g_signal_connect(checkbutton, "toggled", G_CALLBACK(pgd_find_case_sensitive_toggled), demo); + gtk_box_pack_start(GTK_BOX(hbox), checkbutton, FALSE, FALSE, 0); + gtk_widget_show(checkbutton); + + checkbutton = gtk_check_button_new_with_label("Backwards"); + g_signal_connect(checkbutton, "toggled", G_CALLBACK(pgd_find_backwards_toggled), demo); + gtk_box_pack_start(GTK_BOX(hbox), checkbutton, FALSE, FALSE, 0); + gtk_widget_show(checkbutton); + + checkbutton = gtk_check_button_new_with_label("Whole words only"); + g_signal_connect(checkbutton, "toggled", G_CALLBACK(pgd_find_whole_words_toggled), demo); + gtk_box_pack_start(GTK_BOX(hbox), checkbutton, FALSE, FALSE, 0); + gtk_widget_show(checkbutton); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); + gtk_widget_show(hbox); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + model = pgd_find_create_model(); + treeview = gtk_tree_view_new_with_model(model); + g_object_unref(model); + demo->treeview = treeview; + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); + g_signal_connect(selection, "changed", G_CALLBACK(pgd_find_selection_changed), demo); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), TITLE_COLUMN, "Matches", renderer, "text", TITLE_COLUMN, NULL); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), X1_COLUMN, "X1", renderer, "text", X1_COLUMN, "visible", VISIBLE_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), Y1_COLUMN, "Y1", renderer, "text", Y1_COLUMN, "visible", VISIBLE_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), X2_COLUMN, "X2", renderer, "text", X2_COLUMN, "visible", VISIBLE_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), Y2_COLUMN, "Y2", renderer, "text", Y2_COLUMN, "visible", VISIBLE_COLUMN, NULL); + gtk_container_add(GTK_CONTAINER(swindow), treeview); + gtk_widget_show(treeview); + + gtk_paned_add1(GTK_PANED(hpaned), swindow); + gtk_widget_show(swindow); + + demo->darea = gtk_drawing_area_new(); + g_signal_connect(demo->darea, "draw", G_CALLBACK(pgd_find_viewer_drawing_area_draw), demo); + + swindow = gtk_scrolled_window_new(NULL, NULL); +#if GTK_CHECK_VERSION(3, 7, 8) + gtk_container_add(GTK_CONTAINER(swindow), demo->darea); +#else + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swindow), demo->darea); +#endif + gtk_widget_show(demo->darea); + + gtk_paned_add2(GTK_PANED(hpaned), swindow); + gtk_widget_show(swindow); + + gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0); + gtk_widget_show(hpaned); + + g_object_weak_ref(G_OBJECT(vbox), (GWeakNotify)pgd_find_free, (gpointer)demo); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/find.h b/poppler-24.05.0/glib/demo/find.h new file mode 100644 index 0000000000000000000000000000000000000000..0cffe6fb7fb8c30cb6fdc0a105e335aff48c5d3d --- /dev/null +++ b/poppler-24.05.0/glib/demo/find.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _FIND_H_ +# define _FIND_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_find_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _FIND_H_ */ diff --git a/poppler-24.05.0/glib/demo/fonts.c b/poppler-24.05.0/glib/demo/fonts.c new file mode 100644 index 0000000000000000000000000000000000000000..00d80fb1db27ec2d8d1c54186c77c8de81f29492 --- /dev/null +++ b/poppler-24.05.0/glib/demo/fonts.c @@ -0,0 +1,259 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> + +#include "fonts.h" + +enum +{ + FONTS_NAME_COLUMN, + FONTS_DETAILS_COLUMN, + N_COLUMNS +}; + +typedef struct +{ + PopplerDocument *doc; + + GtkWidget *treeview; + GtkWidget *progress; + + guint idle_id; +} PgdFontsDemo; + +static void pgd_fonts_free(PgdFontsDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->idle_id > 0) { + g_source_remove(demo->idle_id); + demo->idle_id = 0; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + g_free(demo); +} + +static void pdg_fonts_cell_data_func(GtkTreeViewColumn *col, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) +{ + char *name; + char *details; + char *markup; + + gtk_tree_model_get(model, iter, FONTS_NAME_COLUMN, &name, FONTS_DETAILS_COLUMN, &details, -1); + + if (details) { + markup = g_strdup_printf("<b><big>%s</big></b>\n<small>%s</small>", name, details); + } else { + markup = g_strdup_printf("<b><big>%s</big></b>", name); + } + + g_object_set(renderer, "markup", markup, NULL); + + g_free(markup); + g_free(details); + g_free(name); +} + +static const gchar *font_type_to_string(PopplerFontType type) +{ + switch (type) { + case POPPLER_FONT_TYPE_TYPE1: + return "Type 1"; + case POPPLER_FONT_TYPE_TYPE1C: + return "Type 1C"; + case POPPLER_FONT_TYPE_TYPE3: + return "Type 3"; + case POPPLER_FONT_TYPE_TRUETYPE: + return "TrueType"; + case POPPLER_FONT_TYPE_CID_TYPE0: + return "Type 1 (CID)"; + case POPPLER_FONT_TYPE_CID_TYPE0C: + return "Type 1C (CID)"; + case POPPLER_FONT_TYPE_CID_TYPE2: + return "TrueType (CID)"; + default: + return "Unknown font type"; + } +} + +static void pgd_fonts_update_progress(PgdFontsDemo *demo, gint n_pages, gint scanned) +{ + gchar *str; + + str = g_strdup_printf("Scanning fonts (%d%%)", MIN(scanned * 100 / n_pages, 100)); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(demo->progress), str); + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(demo->progress), MIN((gdouble)scanned / n_pages, 1.0)); + g_free(str); +} + +static gboolean pgd_fonts_fill_model(PgdFontsDemo *demo) +{ + GtkTreeModel *model; + PopplerFontInfo *font_info; + PopplerFontsIter *fonts_iter; + gint n_pages, scanned = 0; + + n_pages = poppler_document_get_n_pages(demo->doc); + + model = gtk_tree_view_get_model(GTK_TREE_VIEW(demo->treeview)); + g_object_ref(model); + + gtk_list_store_clear(GTK_LIST_STORE(model)); + + font_info = poppler_font_info_new(demo->doc); + + while (poppler_font_info_scan(font_info, 20, &fonts_iter)) { + pgd_fonts_update_progress(demo, n_pages, scanned); + + while (gtk_events_pending()) { + gtk_main_iteration(); + } + + scanned += 20; + + if (!fonts_iter) { + continue; + } + + do { + GtkTreeIter iter; + const gchar *name; + const gchar *type; + const gchar *embedded; + const gchar *substitute; + const gchar *filename; + const gchar *encoding; + gchar *details; + + name = poppler_fonts_iter_get_name(fonts_iter); + if (!name) { + name = "No name"; + } + + encoding = poppler_fonts_iter_get_encoding(fonts_iter); + if (!encoding) { + encoding = "None"; + } + + type = font_type_to_string(poppler_fonts_iter_get_font_type(fonts_iter)); + + if (poppler_fonts_iter_is_embedded(fonts_iter)) { + if (poppler_fonts_iter_is_subset(fonts_iter)) { + embedded = "Embedded subset"; + } else { + embedded = "Embedded"; + } + } else { + embedded = "Not embedded"; + } + + substitute = poppler_fonts_iter_get_substitute_name(fonts_iter); + filename = poppler_fonts_iter_get_file_name(fonts_iter); + + if (substitute && filename) { + details = g_markup_printf_escaped("%s\nEncoding: %s\n%s, substituting with <b>%s</b>\n(%s)", type, encoding, embedded, substitute, filename); + } else { + details = g_markup_printf_escaped("%s\nEncoding: %s\n%s", type, encoding, embedded); + } + + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, FONTS_NAME_COLUMN, name, FONTS_DETAILS_COLUMN, details, -1); + + g_free(details); + } while (poppler_fonts_iter_next(fonts_iter)); + poppler_fonts_iter_free(fonts_iter); + } + + pgd_fonts_update_progress(demo, n_pages, scanned); + + g_object_unref(font_info); + g_object_unref(model); + + return FALSE; +} + +static void pgd_fonts_scan_button_clicked(GtkButton *button, PgdFontsDemo *demo) +{ + demo->idle_id = g_idle_add((GSourceFunc)pgd_fonts_fill_model, demo); +} + +GtkWidget *pgd_fonts_create_widget(PopplerDocument *document) +{ + PgdFontsDemo *demo; + GtkWidget *vbox; + GtkListStore *model; + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + GtkWidget *swindow; + GtkWidget *hbox, *button; + + demo = g_new0(PgdFontsDemo, 1); + + demo->doc = g_object_ref(document); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + demo->progress = gtk_progress_bar_new(); + gtk_progress_bar_set_ellipsize(GTK_PROGRESS_BAR(demo->progress), PANGO_ELLIPSIZE_END); + gtk_box_pack_start(GTK_BOX(hbox), demo->progress, TRUE, TRUE, 0); + gtk_widget_show(demo->progress); + + button = gtk_button_new_with_label("Scan"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_fonts_scan_button_clicked), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 6); + gtk_widget_show(hbox); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + model = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING); + demo->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model)); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(demo->treeview), FALSE); + gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(demo->treeview)), GTK_SELECTION_NONE); + g_object_unref(model); + + column = gtk_tree_view_column_new(); + gtk_tree_view_append_column(GTK_TREE_VIEW(demo->treeview), column); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), renderer, FALSE); + gtk_tree_view_column_set_cell_data_func(column, renderer, pdg_fonts_cell_data_func, NULL, NULL); + + gtk_container_add(GTK_CONTAINER(swindow), demo->treeview); + gtk_widget_show(demo->treeview); + + gtk_box_pack_start(GTK_BOX(vbox), swindow, TRUE, TRUE, 0); + gtk_widget_show(swindow); + + g_object_weak_ref(G_OBJECT(swindow), (GWeakNotify)pgd_fonts_free, (gpointer)demo); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/fonts.h b/poppler-24.05.0/glib/demo/fonts.h new file mode 100644 index 0000000000000000000000000000000000000000..ddab8a6815ef49c25b422a7b97f4d69974b667d8 --- /dev/null +++ b/poppler-24.05.0/glib/demo/fonts.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _FONTS_H_ +# define _FONTS_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_fonts_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _FONTS_H_ */ diff --git a/poppler-24.05.0/glib/demo/forms.c b/poppler-24.05.0/glib/demo/forms.c new file mode 100644 index 0000000000000000000000000000000000000000..05c331bd227ca5c8209fadd94a9a2cf4fc94408a --- /dev/null +++ b/poppler-24.05.0/glib/demo/forms.c @@ -0,0 +1,496 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * Copyright (C) 2021 André Guerreiro <aguerreiro1985@gmail.com> + * Copyright (C) 2021 Marek Kasik <mkasik@redhat.com> + * + * 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 <gtk/gtk.h> +#include <string.h> + +#include "forms.h" +#include "utils.h" + +enum +{ + FORMS_FIELD_TYPE_COLUMN, + FORMS_ID_COLUMN, + FORMS_READ_ONLY_COLUMN, + FORMS_X1_COLUMN, + FORMS_Y1_COLUMN, + FORMS_X2_COLUMN, + FORMS_Y2_COLUMN, + FORMS_FIELD_COLUMN, + N_COLUMNS +}; + +typedef struct +{ + PopplerDocument *doc; + + GtkListStore *model; + GtkWidget *field_view; + GtkWidget *timer_label; + + gint page; +} PgdFormsDemo; + +static void pgd_forms_free(PgdFormsDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + if (demo->model) { + g_object_unref(demo->model); + demo->model = NULL; + } + + g_free(demo); +} + +static GtkWidget *pgd_form_field_view_new(void) +{ + GtkWidget *frame, *label; + + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); + label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(label), "<b>Form Field Properties</b>"); + gtk_frame_set_label_widget(GTK_FRAME(frame), label); + gtk_widget_show(label); + + return frame; +} + +static void pgd_form_field_view_add_choice_items(GtkGrid *table, PopplerFormField *field, gint *selected, gint *row) +{ + GtkWidget *label; + GtkWidget *textview, *swindow; + GtkTextBuffer *buffer; + gint i; + + label = gtk_label_new(NULL); + g_object_set(G_OBJECT(label), "xalign", 0.0, NULL); + gtk_label_set_markup(GTK_LABEL(label), "<b>Items:</b>"); + gtk_grid_attach(GTK_GRID(table), label, 0, *row, 1, 1); + gtk_widget_show(label); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + textview = gtk_text_view_new(); + gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE); + buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); + + for (i = 0; i < poppler_form_field_choice_get_n_items(field); i++) { + gchar *item; + + item = poppler_form_field_choice_get_item(field, i); + gtk_text_buffer_insert_at_cursor(buffer, item, strlen(item)); + gtk_text_buffer_insert_at_cursor(buffer, "\n", strlen("\n")); + g_free(item); + + if (poppler_form_field_choice_is_item_selected(field, i)) { + *selected = i; + } + } + + gtk_container_add(GTK_CONTAINER(swindow), textview); + gtk_widget_show(textview); + + gtk_grid_attach(GTK_GRID(table), swindow, 1, *row, 1, 1); + gtk_widget_show(swindow); + + *row += 1; +} + +static void pgd_form_field_view_set_field(GtkWidget *field_view, PopplerFormField *field) +{ + GtkWidget *table; + PopplerAction *action; + GEnumValue *enum_value; + gchar *text; + gint row = 0; + PopplerSignatureInfo *psig_info; + + table = gtk_bin_get_child(GTK_BIN(field_view)); + if (table) { + gtk_container_remove(GTK_CONTAINER(field_view), table); + } + + if (!field) { + return; + } + + table = gtk_grid_new(); + gtk_widget_set_margin_top(table, 5); + gtk_widget_set_margin_bottom(table, 5); +#if GTK_CHECK_VERSION(3, 12, 0) + gtk_widget_set_margin_start(table, 12); + gtk_widget_set_margin_end(table, 5); +#else + gtk_widget_set_margin_left(table, 12); + gtk_widget_set_margin_right(table, 5); +#endif + gtk_grid_set_column_spacing(GTK_GRID(table), 6); + gtk_grid_set_row_spacing(GTK_GRID(table), 6); + + text = poppler_form_field_get_name(field); + if (text) { + pgd_table_add_property(GTK_GRID(table), "<b>Name:</b>", text, &row); + g_free(text); + } + text = poppler_form_field_get_partial_name(field); + if (text) { + pgd_table_add_property(GTK_GRID(table), "<b>Partial Name:</b>", text, &row); + g_free(text); + } + text = poppler_form_field_get_mapping_name(field); + if (text) { + pgd_table_add_property(GTK_GRID(table), "<b>Mapping Name:</b>", text, &row); + g_free(text); + } + + action = poppler_form_field_get_action(field); + if (action) { + GtkWidget *action_view; + + action_view = pgd_action_view_new(NULL); + pgd_action_view_set_action(action_view, action); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>Action:</b>", action_view, &row); + gtk_widget_show(action_view); + } + + action = poppler_form_field_get_additional_action(field, POPPLER_ADDITIONAL_ACTION_FIELD_MODIFIED); + if (action) { + GtkWidget *action_view; + + action_view = pgd_action_view_new(NULL); + pgd_action_view_set_action(action_view, action); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>Field Modified Action:</b>", action_view, &row); + gtk_widget_show(action_view); + } + + action = poppler_form_field_get_additional_action(field, POPPLER_ADDITIONAL_ACTION_FORMAT_FIELD); + if (action) { + GtkWidget *action_view; + + action_view = pgd_action_view_new(NULL); + pgd_action_view_set_action(action_view, action); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>Field Format Action:</b>", action_view, &row); + gtk_widget_show(action_view); + } + + action = poppler_form_field_get_additional_action(field, POPPLER_ADDITIONAL_ACTION_VALIDATE_FIELD); + if (action) { + GtkWidget *action_view; + + action_view = pgd_action_view_new(NULL); + pgd_action_view_set_action(action_view, action); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>Validate Field Action:</b>", action_view, &row); + gtk_widget_show(action_view); + } + + action = poppler_form_field_get_additional_action(field, POPPLER_ADDITIONAL_ACTION_CALCULATE_FIELD); + if (action) { + GtkWidget *action_view; + + action_view = pgd_action_view_new(NULL); + pgd_action_view_set_action(action_view, action); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>Calculate Field Action:</b>", action_view, &row); + gtk_widget_show(action_view); + } + + switch (poppler_form_field_get_field_type(field)) { + case POPPLER_FORM_FIELD_BUTTON: + enum_value = g_enum_get_value((GEnumClass *)g_type_class_ref(POPPLER_TYPE_FORM_BUTTON_TYPE), poppler_form_field_button_get_button_type(field)); + pgd_table_add_property(GTK_GRID(table), "<b>Button Type:</b>", enum_value->value_name, &row); + pgd_table_add_property(GTK_GRID(table), "<b>Button State:</b>", poppler_form_field_button_get_state(field) ? "Active" : "Inactive", &row); + break; + case POPPLER_FORM_FIELD_TEXT: + enum_value = g_enum_get_value((GEnumClass *)g_type_class_ref(POPPLER_TYPE_FORM_TEXT_TYPE), poppler_form_field_text_get_text_type(field)); + pgd_table_add_property(GTK_GRID(table), "<b>Text Type:</b>", enum_value->value_name, &row); + + text = poppler_form_field_text_get_text(field); + pgd_table_add_property(GTK_GRID(table), "<b>Contents:</b>", text, &row); + g_free(text); + + text = g_strdup_printf("%d", poppler_form_field_text_get_max_len(field)); + pgd_table_add_property(GTK_GRID(table), "<b>Max Length:</b>", text, &row); + g_free(text); + + pgd_table_add_property(GTK_GRID(table), "<b>Do spellcheck:</b>", poppler_form_field_text_do_spell_check(field) ? "Yes" : "No", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Do scroll:</b>", poppler_form_field_text_do_scroll(field) ? "Yes" : "No", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Rich Text:</b>", poppler_form_field_text_is_rich_text(field) ? "Yes" : "No", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Pasword type:</b>", poppler_form_field_text_is_password(field) ? "Yes" : "No", &row); + break; + case POPPLER_FORM_FIELD_CHOICE: { + gchar *item; + gint selected = -1; + + enum_value = g_enum_get_value((GEnumClass *)g_type_class_ref(POPPLER_TYPE_FORM_CHOICE_TYPE), poppler_form_field_choice_get_choice_type(field)); + pgd_table_add_property(GTK_GRID(table), "<b>Choice Type:</b>", enum_value->value_name, &row); + pgd_table_add_property(GTK_GRID(table), "<b>Editable:</b>", poppler_form_field_choice_is_editable(field) ? "Yes" : "No", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Multiple Selection:</b>", poppler_form_field_choice_can_select_multiple(field) ? "Yes" : "No", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Do spellcheck:</b>", poppler_form_field_choice_do_spell_check(field) ? "Yes" : "No", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Commit on Change:</b>", poppler_form_field_choice_commit_on_change(field) ? "Yes" : "No", &row); + + text = g_strdup_printf("%d", poppler_form_field_choice_get_n_items(field)); + pgd_table_add_property(GTK_GRID(table), "<b>Number of items:</b>", text, &row); + g_free(text); + + pgd_form_field_view_add_choice_items(GTK_GRID(table), field, &selected, &row); + + if (selected >= 0 && poppler_form_field_choice_get_n_items(field) > selected) { + item = poppler_form_field_choice_get_item(field, selected); + text = g_strdup_printf("%d (%s)", selected, item); + g_free(item); + pgd_table_add_property(GTK_GRID(table), "<b>Selected item:</b>", text, &row); + g_free(text); + } + + text = poppler_form_field_choice_get_text(field); + pgd_table_add_property(GTK_GRID(table), "<b>Contents:</b>", text, &row); + g_free(text); + } break; + case POPPLER_FORM_FIELD_SIGNATURE: { + const gchar *signer_name; + + psig_info = poppler_form_field_signature_validate_sync( + field, POPPLER_SIGNATURE_VALIDATION_FLAG_VALIDATE_CERTIFICATE | POPPLER_SIGNATURE_VALIDATION_FLAG_WITHOUT_OCSP_REVOCATION_CHECK | POPPLER_SIGNATURE_VALIDATION_FLAG_USE_AIA_CERTIFICATE_FETCH, NULL, NULL); + signer_name = poppler_signature_info_get_signer_name(psig_info); + pgd_table_add_property(GTK_GRID(table), "<b>Signer Name:</b>", signer_name ? signer_name : "Signers name found", &row); + text = g_date_time_format(poppler_signature_info_get_local_signing_time(psig_info), "%b %d %Y %H:%M:%S"); + pgd_table_add_property(GTK_GRID(table), "<b>Signing Time:</b>", text, &row); + pgd_table_add_property(GTK_GRID(table), "<b>Signature Val Status:</b>", poppler_signature_info_get_signature_status(psig_info) == POPPLER_SIGNATURE_VALID ? "Signature is Valid" : "Signature is Invalid", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Certificate Val Status:</b>", poppler_signature_info_get_certificate_status(psig_info) == POPPLER_CERTIFICATE_TRUSTED ? "Certificate is Trusted" : "Certificate cannot be Trusted", &row); + + poppler_signature_info_free(psig_info); + g_free(text); + } break; + case POPPLER_FORM_FIELD_UNKNOWN: + break; + default: + g_assert_not_reached(); + } + + gtk_container_add(GTK_CONTAINER(field_view), table); + gtk_widget_show(table); +} + +const gchar *get_form_field_type(PopplerFormField *field) +{ + switch (poppler_form_field_get_field_type(field)) { + case POPPLER_FORM_FIELD_TEXT: + return "Text"; + case POPPLER_FORM_FIELD_BUTTON: + return "Button"; + case POPPLER_FORM_FIELD_CHOICE: + return "Choice"; + case POPPLER_FORM_FIELD_SIGNATURE: + return "Signature"; + case POPPLER_FORM_FIELD_UNKNOWN: + default: + break; + } + + return "Unknown"; +} + +static void pgd_forms_get_form_fields(GtkWidget *button, PgdFormsDemo *demo) +{ + PopplerPage *page; + GList *mapping, *l; + gint n_fields; + GTimer *timer; + + gtk_list_store_clear(demo->model); + pgd_form_field_view_set_field(demo->field_view, NULL); + + page = poppler_document_get_page(demo->doc, demo->page); + if (!page) { + return; + } + + timer = g_timer_new(); + mapping = poppler_page_get_form_field_mapping(page); + g_timer_stop(timer); + + n_fields = g_list_length(mapping); + if (n_fields > 0) { + gchar *str; + + str = g_strdup_printf("<i>%d form fields found in %.4f seconds</i>", n_fields, g_timer_elapsed(timer, NULL)); + gtk_label_set_markup(GTK_LABEL(demo->timer_label), str); + g_free(str); + } else { + gtk_label_set_markup(GTK_LABEL(demo->timer_label), "<i>No form fields found</i>"); + } + + g_timer_destroy(timer); + + for (l = mapping; l; l = g_list_next(l)) { + PopplerFormFieldMapping *fmapping; + GtkTreeIter iter; + gchar *x1, *y1, *x2, *y2; + + fmapping = (PopplerFormFieldMapping *)l->data; + + x1 = g_strdup_printf("%.2f", fmapping->area.x1); + y1 = g_strdup_printf("%.2f", fmapping->area.y1); + x2 = g_strdup_printf("%.2f", fmapping->area.x2); + y2 = g_strdup_printf("%.2f", fmapping->area.y2); + + gtk_list_store_append(demo->model, &iter); + gtk_list_store_set(demo->model, &iter, FORMS_FIELD_TYPE_COLUMN, get_form_field_type(fmapping->field), FORMS_ID_COLUMN, poppler_form_field_get_id(fmapping->field), FORMS_READ_ONLY_COLUMN, + poppler_form_field_is_read_only(fmapping->field), FORMS_X1_COLUMN, x1, FORMS_Y1_COLUMN, y1, FORMS_X2_COLUMN, x2, FORMS_Y2_COLUMN, y2, FORMS_FIELD_COLUMN, fmapping->field, -1); + g_free(x1); + g_free(y1); + g_free(x2); + g_free(y2); + } + + poppler_page_free_form_field_mapping(mapping); + g_object_unref(page); +} + +static void pgd_forms_page_selector_value_changed(GtkSpinButton *spinbutton, PgdFormsDemo *demo) +{ + demo->page = (gint)gtk_spin_button_get_value(spinbutton) - 1; +} + +static void pgd_forms_selection_changed(GtkTreeSelection *treeselection, PgdFormsDemo *demo) +{ + GtkTreeModel *model; + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(treeselection, &model, &iter)) { + PopplerFormField *field; + + gtk_tree_model_get(model, &iter, FORMS_FIELD_COLUMN, &field, -1); + pgd_form_field_view_set_field(demo->field_view, field); + g_object_unref(field); + } +} + +GtkWidget *pgd_forms_create_widget(PopplerDocument *document) +{ + PgdFormsDemo *demo; + GtkWidget *label; + GtkWidget *vbox; + GtkWidget *hbox, *page_selector; + GtkWidget *button; + GtkWidget *hpaned; + GtkWidget *swindow, *treeview; + GtkTreeSelection *selection; + GtkCellRenderer *renderer; + gchar *str; + gint n_pages; + + demo = g_new0(PgdFormsDemo, 1); + + demo->doc = g_object_ref(document); + + n_pages = poppler_document_get_n_pages(document); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Page:"); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + + page_selector = gtk_spin_button_new_with_range(1, n_pages, 1); + g_signal_connect(G_OBJECT(page_selector), "value-changed", G_CALLBACK(pgd_forms_page_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(hbox), page_selector, FALSE, TRUE, 0); + gtk_widget_show(page_selector); + + str = g_strdup_printf("of %d", n_pages); + label = gtk_label_new(str); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + g_free(str); + + button = gtk_button_new_with_label("Get Forms Fields"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_forms_get_form_fields), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + demo->timer_label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(demo->timer_label), "<i>No form fields found</i>"); + g_object_set(G_OBJECT(demo->timer_label), "xalign", 1.0, NULL); + gtk_box_pack_start(GTK_BOX(vbox), demo->timer_label, FALSE, TRUE, 0); + gtk_widget_show(demo->timer_label); + + hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); + + demo->field_view = pgd_form_field_view_new(); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + demo->model = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_OBJECT); + treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(demo->model)); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 0, "Form Field Type", renderer, "text", FORMS_FIELD_TYPE_COLUMN, NULL); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 1, "Form Field Id", renderer, "text", FORMS_ID_COLUMN, NULL); + + renderer = gtk_cell_renderer_toggle_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 2, "Read Only", renderer, "active", FORMS_READ_ONLY_COLUMN, NULL); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 3, "X1", renderer, "text", FORMS_X1_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 4, "Y1", renderer, "text", FORMS_Y1_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 5, "X2", renderer, "text", FORMS_X2_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 6, "Y2", renderer, "text", FORMS_Y2_COLUMN, NULL); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(pgd_forms_selection_changed), (gpointer)demo); + + gtk_container_add(GTK_CONTAINER(swindow), treeview); + gtk_widget_show(treeview); + + gtk_paned_add1(GTK_PANED(hpaned), swindow); + gtk_widget_show(swindow); + + gtk_paned_add2(GTK_PANED(hpaned), demo->field_view); + gtk_widget_show(demo->field_view); + + gtk_paned_set_position(GTK_PANED(hpaned), 300); + + gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0); + gtk_widget_show(hpaned); + + g_object_weak_ref(G_OBJECT(vbox), (GWeakNotify)pgd_forms_free, demo); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/forms.h b/poppler-24.05.0/glib/demo/forms.h new file mode 100644 index 0000000000000000000000000000000000000000..b514b653d035da1bbadb8baf85c1214abc2e991e --- /dev/null +++ b/poppler-24.05.0/glib/demo/forms.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _FORMS_H_ +# define _FORMS_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_forms_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _FORMS_H_ */ diff --git a/poppler-24.05.0/glib/demo/images.c b/poppler-24.05.0/glib/demo/images.c new file mode 100644 index 0000000000000000000000000000000000000000..05ced6006eb577c63c57aba8ed872cfa33623d83 --- /dev/null +++ b/poppler-24.05.0/glib/demo/images.c @@ -0,0 +1,281 @@ +/* + * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 "config.h" + +#include <gtk/gtk.h> + +#include "images.h" + +enum +{ + IMAGES_ID_COLUMN, + IMAGES_X1_COLUMN, + IMAGES_Y1_COLUMN, + IMAGES_X2_COLUMN, + IMAGES_Y2_COLUMN, + N_COLUMNS +}; + +typedef struct +{ + PopplerDocument *doc; + + GtkListStore *model; + GtkWidget *timer_label; + GtkWidget *image_view; + + gint page; +} PgdImagesDemo; + +static void pgd_images_free(PgdImagesDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + if (demo->model) { + g_object_unref(demo->model); + demo->model = NULL; + } + + g_free(demo); +} + +static gboolean pgd_image_view_drawing_area_draw(GtkWidget *area, cairo_t *cr, GtkWidget *image_view) +{ + cairo_surface_t *image; + + image = g_object_get_data(G_OBJECT(image_view), "image-surface"); + if (!image) { + return FALSE; + } + + gtk_widget_set_size_request(area, cairo_image_surface_get_width(image), cairo_image_surface_get_height(image)); + + cairo_set_source_surface(cr, image, 0, 0); + cairo_paint(cr); + + return TRUE; +} + +static GtkWidget *pgd_image_view_new() +{ + GtkWidget *swindow; + GtkWidget *darea; + + swindow = gtk_scrolled_window_new(NULL, NULL); + + darea = gtk_drawing_area_new(); + g_signal_connect(G_OBJECT(darea), "draw", G_CALLBACK(pgd_image_view_drawing_area_draw), (gpointer)swindow); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +#if GTK_CHECK_VERSION(3, 7, 8) + gtk_container_add(GTK_CONTAINER(swindow), darea); +#else + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swindow), darea); +#endif + gtk_widget_show(darea); + + return swindow; +} + +static void pgd_image_view_set_image(GtkWidget *image_view, cairo_surface_t *image) +{ + g_object_set_data_full(G_OBJECT(image_view), "image-surface", image, (GDestroyNotify)cairo_surface_destroy); + gtk_widget_queue_draw(image_view); +} + +static void pgd_images_get_images(GtkWidget *button, PgdImagesDemo *demo) +{ + PopplerPage *page; + GList *mapping, *l; + gint n_images; + GTimer *timer; + + gtk_list_store_clear(demo->model); + pgd_image_view_set_image(demo->image_view, NULL); + + page = poppler_document_get_page(demo->doc, demo->page); + if (!page) { + return; + } + + timer = g_timer_new(); + mapping = poppler_page_get_image_mapping(page); + g_timer_stop(timer); + + n_images = g_list_length(mapping); + if (n_images > 0) { + gchar *str; + + str = g_strdup_printf("<i>%d images found in %.4f seconds</i>", n_images, g_timer_elapsed(timer, NULL)); + gtk_label_set_markup(GTK_LABEL(demo->timer_label), str); + g_free(str); + } else { + gtk_label_set_markup(GTK_LABEL(demo->timer_label), "<i>No images found</i>"); + } + + g_timer_destroy(timer); + + for (l = mapping; l; l = g_list_next(l)) { + PopplerImageMapping *imapping; + GtkTreeIter iter; + gchar *x1, *y1, *x2, *y2; + + imapping = (PopplerImageMapping *)l->data; + + x1 = g_strdup_printf("%.2f", imapping->area.x1); + y1 = g_strdup_printf("%.2f", imapping->area.y1); + x2 = g_strdup_printf("%.2f", imapping->area.x2); + y2 = g_strdup_printf("%.2f", imapping->area.y2); + + gtk_list_store_append(demo->model, &iter); + gtk_list_store_set(demo->model, &iter, IMAGES_ID_COLUMN, imapping->image_id, IMAGES_X1_COLUMN, x1, IMAGES_Y1_COLUMN, y1, IMAGES_X2_COLUMN, x2, IMAGES_Y2_COLUMN, y2, -1); + g_free(x1); + g_free(y1); + g_free(x2); + g_free(y2); + } + + poppler_page_free_image_mapping(mapping); + g_object_unref(page); +} + +static void pgd_images_page_selector_value_changed(GtkSpinButton *spinbutton, PgdImagesDemo *demo) +{ + demo->page = (gint)gtk_spin_button_get_value(spinbutton) - 1; +} + +static void pgd_images_selection_changed(GtkTreeSelection *treeselection, PgdImagesDemo *demo) +{ + GtkTreeModel *model; + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(treeselection, &model, &iter)) { + PopplerPage *page; + gint image_id; + + gtk_tree_model_get(model, &iter, IMAGES_ID_COLUMN, &image_id, -1); + page = poppler_document_get_page(demo->doc, demo->page); + pgd_image_view_set_image(demo->image_view, poppler_page_get_image(page, image_id)); + g_object_unref(page); + } +} + +GtkWidget *pgd_images_create_widget(PopplerDocument *document) +{ + PgdImagesDemo *demo; + GtkWidget *label; + GtkWidget *vbox; + GtkWidget *hbox, *page_selector; + GtkWidget *button; + GtkWidget *hpaned; + GtkWidget *swindow, *treeview; + GtkTreeSelection *selection; + GtkCellRenderer *renderer; + gchar *str; + gint n_pages; + + demo = g_new0(PgdImagesDemo, 1); + + demo->doc = g_object_ref(document); + + n_pages = poppler_document_get_n_pages(document); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Page:"); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + + page_selector = gtk_spin_button_new_with_range(1, n_pages, 1); + g_signal_connect(G_OBJECT(page_selector), "value-changed", G_CALLBACK(pgd_images_page_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(hbox), page_selector, FALSE, TRUE, 0); + gtk_widget_show(page_selector); + + str = g_strdup_printf("of %d", n_pages); + label = gtk_label_new(str); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + g_free(str); + + button = gtk_button_new_with_label("Get Images"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_images_get_images), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + demo->timer_label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(demo->timer_label), "<i>No images found</i>"); + g_object_set(G_OBJECT(demo->timer_label), "xalign", 1.0, NULL); + gtk_box_pack_start(GTK_BOX(vbox), demo->timer_label, FALSE, TRUE, 0); + gtk_widget_show(demo->timer_label); + + hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); + + demo->image_view = pgd_image_view_new(); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + demo->model = gtk_list_store_new(N_COLUMNS, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(demo->model)); + + renderer = gtk_cell_renderer_text_new(); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 0, "Image", renderer, "text", IMAGES_ID_COLUMN, NULL); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 1, "X1", renderer, "text", IMAGES_X1_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 2, "Y1", renderer, "text", IMAGES_Y1_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 3, "X2", renderer, "text", IMAGES_X2_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 4, "Y2", renderer, "text", IMAGES_Y2_COLUMN, NULL); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(pgd_images_selection_changed), (gpointer)demo); + + gtk_container_add(GTK_CONTAINER(swindow), treeview); + gtk_widget_show(treeview); + + gtk_paned_add1(GTK_PANED(hpaned), swindow); + gtk_widget_show(swindow); + + gtk_paned_add2(GTK_PANED(hpaned), demo->image_view); + gtk_widget_show(demo->image_view); + + gtk_paned_set_position(GTK_PANED(hpaned), 300); + + gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0); + gtk_widget_show(hpaned); + + g_object_weak_ref(G_OBJECT(vbox), (GWeakNotify)pgd_images_free, demo); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/images.h b/poppler-24.05.0/glib/demo/images.h new file mode 100644 index 0000000000000000000000000000000000000000..aa8bc15c9e2a08af60aad8cc862173ec67a403ff --- /dev/null +++ b/poppler-24.05.0/glib/demo/images.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _IMAGES_H_ +# define _IMAGES_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_images_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _IMAGES_H_ */ diff --git a/poppler-24.05.0/glib/demo/info.cc b/poppler-24.05.0/glib/demo/info.cc new file mode 100644 index 0000000000000000000000000000000000000000..6f80757043ea55428ac296383002ef74936b01a7 --- /dev/null +++ b/poppler-24.05.0/glib/demo/info.cc @@ -0,0 +1,245 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> + +#include "config.h" +#include "info.h" +#include "utils.h" + +static void pgd_info_add_permissions(GtkGrid *table, PopplerPermissions permissions, gint *row) +{ + GtkWidget *label, *hbox, *vbox; + GtkWidget *checkbox; + + label = gtk_label_new(nullptr); + g_object_set(G_OBJECT(label), "xalign", 0.0, NULL); + gtk_label_set_markup(GTK_LABEL(label), "<b>Permissions:</b>"); + gtk_grid_attach(GTK_GRID(table), label, 0, *row, 1, 1); + gtk_widget_show(label); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + checkbox = gtk_check_button_new_with_label("Print"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), (permissions & POPPLER_PERMISSIONS_OK_TO_PRINT)); + gtk_box_pack_start(GTK_BOX(hbox), checkbox, FALSE, TRUE, 0); + gtk_widget_show(checkbox); + + checkbox = gtk_check_button_new_with_label("Copy"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), (permissions & POPPLER_PERMISSIONS_OK_TO_COPY)); + gtk_box_pack_start(GTK_BOX(hbox), checkbox, FALSE, TRUE, 0); + gtk_widget_show(checkbox); + + checkbox = gtk_check_button_new_with_label("Modify"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), (permissions & POPPLER_PERMISSIONS_OK_TO_MODIFY)); + gtk_box_pack_start(GTK_BOX(hbox), checkbox, FALSE, TRUE, 0); + gtk_widget_show(checkbox); + + checkbox = gtk_check_button_new_with_label("Add notes"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), (permissions & POPPLER_PERMISSIONS_OK_TO_ADD_NOTES)); + gtk_box_pack_start(GTK_BOX(hbox), checkbox, FALSE, TRUE, 0); + gtk_widget_show(checkbox); + + checkbox = gtk_check_button_new_with_label("Fill forms"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), (permissions & POPPLER_PERMISSIONS_OK_TO_FILL_FORM)); + gtk_box_pack_start(GTK_BOX(hbox), checkbox, FALSE, TRUE, 0); + gtk_widget_show(checkbox); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + checkbox = gtk_check_button_new_with_label("Extract contents"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), (permissions & POPPLER_PERMISSIONS_OK_TO_EXTRACT_CONTENTS)); + gtk_box_pack_start(GTK_BOX(hbox), checkbox, FALSE, TRUE, 0); + gtk_widget_show(checkbox); + + checkbox = gtk_check_button_new_with_label("Assemble"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), (permissions & POPPLER_PERMISSIONS_OK_TO_ASSEMBLE)); + gtk_box_pack_start(GTK_BOX(hbox), checkbox, FALSE, TRUE, 0); + gtk_widget_show(checkbox); + + checkbox = gtk_check_button_new_with_label("Print at high resolution"); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), (permissions & POPPLER_PERMISSIONS_OK_TO_PRINT_HIGH_RESOLUTION)); + gtk_box_pack_start(GTK_BOX(hbox), checkbox, FALSE, TRUE, 0); + gtk_widget_show(checkbox); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + gtk_grid_attach(GTK_GRID(table), vbox, 1, *row, 1, 1); + gtk_widget_show(vbox); + + *row += 1; +} + +static void pgd_info_add_metadata(GtkGrid *table, const gchar *metadata, gint *row) +{ + GtkWidget *label; + GtkWidget *textview, *swindow; + GtkTextBuffer *buffer; + + label = gtk_label_new(nullptr); + g_object_set(G_OBJECT(label), "xalign", 0.0, NULL); + gtk_label_set_markup(GTK_LABEL(label), "<b>Metadata:</b>"); + gtk_grid_attach(GTK_GRID(table), label, 0, *row, 1, 1); + gtk_widget_show(label); + + swindow = gtk_scrolled_window_new(nullptr, nullptr); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + textview = gtk_text_view_new(); + gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE); + buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); + if (metadata) { + gtk_text_buffer_set_text(buffer, metadata, -1); + } + + gtk_container_add(GTK_CONTAINER(swindow), textview); + gtk_widget_show(textview); + + gtk_grid_attach(GTK_GRID(table), swindow, 1, *row, 1, 1); + gtk_widget_set_hexpand(swindow, TRUE); + gtk_widget_set_vexpand(swindow, TRUE); + gtk_widget_show(swindow); + + *row += 1; +} + +GtkWidget *pgd_info_create_widget(PopplerDocument *document) +{ + GtkWidget *vbox; + GtkWidget *label; + GtkWidget *frame, *table; + gchar *str; + gchar *title, *format, *author, *subject; + gchar *keywords, *creator, *producer; + gchar *metadata; + gchar *perm_id; + gchar *up_id; + gboolean linearized; + GDateTime *creation_date, *mod_date; + GEnumValue *enum_value; + PopplerBackend backend; + PopplerPageLayout layout; + PopplerPageMode mode; + PopplerPermissions permissions; + PopplerViewerPreferences view_prefs; + gint row = 0; + + g_object_get(document, "title", &title, "format", &format, "author", &author, "subject", &subject, "keywords", &keywords, "creation-datetime", &creation_date, "mod-datetime", &mod_date, "creator", &creator, "producer", &producer, + "linearized", &linearized, "page-mode", &mode, "page-layout", &layout, "permissions", &permissions, "viewer-preferences", &view_prefs, "metadata", &metadata, NULL); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + + backend = poppler_get_backend(); + enum_value = g_enum_get_value((GEnumClass *)g_type_class_ref(POPPLER_TYPE_BACKEND), backend); + str = g_strdup_printf("<span weight='bold' size='larger'>Poppler %s (%s)</span>", poppler_get_version(), enum_value->value_name); + label = gtk_label_new(nullptr); + gtk_label_set_markup(GTK_LABEL(label), str); + g_free(str); + gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, TRUE, 12); + gtk_widget_show(label); + + frame = gtk_frame_new(nullptr); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); + label = gtk_label_new(nullptr); + gtk_label_set_markup(GTK_LABEL(label), "<b>Document properties</b>"); + gtk_frame_set_label_widget(GTK_FRAME(frame), label); + gtk_widget_show(label); + + table = gtk_grid_new(); + gtk_widget_set_margin_top(table, 5); + gtk_widget_set_margin_bottom(table, 5); +#if GTK_CHECK_VERSION(3, 12, 0) + gtk_widget_set_margin_start(table, 12); + gtk_widget_set_margin_end(table, 5); +#else + gtk_widget_set_margin_left(table, 12); + gtk_widget_set_margin_right(table, 5); +#endif + gtk_grid_set_column_spacing(GTK_GRID(table), 6); + gtk_grid_set_row_spacing(GTK_GRID(table), 6); + + pgd_table_add_property(GTK_GRID(table), "<b>Format:</b>", format, &row); + g_free(format); + + pgd_table_add_property(GTK_GRID(table), "<b>Title:</b>", title, &row); + g_free(title); + + pgd_table_add_property(GTK_GRID(table), "<b>Author:</b>", author, &row); + g_free(author); + + pgd_table_add_property(GTK_GRID(table), "<b>Subject:</b>", subject, &row); + g_free(subject); + + pgd_table_add_property(GTK_GRID(table), "<b>Keywords:</b>", keywords, &row); + g_free(keywords); + + pgd_table_add_property(GTK_GRID(table), "<b>Creator:</b>", creator, &row); + g_free(creator); + + pgd_table_add_property(GTK_GRID(table), "<b>Producer:</b>", producer, &row); + g_free(producer); + + pgd_table_add_property(GTK_GRID(table), "<b>Linearized:</b>", linearized ? "Yes" : "No", &row); + + str = g_date_time_format(creation_date, "%c"); + pgd_table_add_property(GTK_GRID(table), "<b>Creation Date:</b>", str, &row); + g_clear_pointer(&creation_date, g_date_time_unref); + g_free(str); + + str = g_date_time_format(mod_date, "%c"); + pgd_table_add_property(GTK_GRID(table), "<b>Modification Date:</b>", str, &row); + g_clear_pointer(&mod_date, g_date_time_unref); + g_free(str); + + enum_value = g_enum_get_value((GEnumClass *)g_type_class_peek(POPPLER_TYPE_PAGE_MODE), mode); + pgd_table_add_property(GTK_GRID(table), "<b>Page Mode:</b>", enum_value->value_name, &row); + + enum_value = g_enum_get_value((GEnumClass *)g_type_class_peek(POPPLER_TYPE_PAGE_LAYOUT), layout); + pgd_table_add_property(GTK_GRID(table), "<b>Page Layout:</b>", enum_value->value_name, &row); + + if (poppler_document_get_id(document, &perm_id, &up_id)) { + str = g_strndup(perm_id, 32); + g_free(perm_id); + pgd_table_add_property(GTK_GRID(table), "<b>Permanent ID:</b>", str, &row); + g_free(str); + str = g_strndup(up_id, 32); + g_free(up_id); + pgd_table_add_property(GTK_GRID(table), "<b>Update ID:</b>", str, &row); + g_free(str); + } + + pgd_info_add_permissions(GTK_GRID(table), permissions, &row); + + pgd_info_add_metadata(GTK_GRID(table), metadata, &row); + g_free(metadata); + + /* TODO: view_prefs */ + + gtk_container_add(GTK_CONTAINER(frame), table); + gtk_widget_show(table); + + gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0); + gtk_widget_show(frame); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/info.h b/poppler-24.05.0/glib/demo/info.h new file mode 100644 index 0000000000000000000000000000000000000000..a16d7c7d1c72b808ae2116eb5197e306da916992 --- /dev/null +++ b/poppler-24.05.0/glib/demo/info.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _INFO_H_ +# define _INFO_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_info_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _INFO_H_ */ diff --git a/poppler-24.05.0/glib/demo/layers.c b/poppler-24.05.0/glib/demo/layers.c new file mode 100644 index 0000000000000000000000000000000000000000..24d63b77aab6210715a35fa9dc92b9e85b4eb1eb --- /dev/null +++ b/poppler-24.05.0/glib/demo/layers.c @@ -0,0 +1,368 @@ +/* + * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 "config.h" + +#include <gtk/gtk.h> + +#include "layers.h" + +enum +{ + LAYERS_TITLE_COLUMN, + LAYERS_VISIBILITY_COLUMN, + LAYERS_ENABLE_COLUMN, + LAYERS_SHOWTOGGLE_COLUMN, + LAYERS_RB_GROUP_COLUMN, + LAYERS_LAYER_COLUMN, + N_COLUMNS +}; + +typedef struct +{ + PopplerDocument *doc; + guint page; + GtkWidget *treeview; + GtkWidget *darea; + + cairo_surface_t *surface; +} PgdLayersDemo; + +static void pgd_layers_free(PgdLayersDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + if (demo->surface) { + cairo_surface_destroy(demo->surface); + demo->surface = NULL; + } + + g_free(demo); +} + +static void build_tree(PopplerDocument *document, GtkTreeModel *model, GtkTreeIter *parent, PopplerLayersIter *iter) +{ + + do { + GtkTreeIter tree_iter; + PopplerLayersIter *child; + PopplerLayer *layer; + gboolean visible; + gchar *markup; + gint rb_group = 0; + + layer = poppler_layers_iter_get_layer(iter); + if (layer) { + markup = g_markup_escape_text(poppler_layer_get_title(layer), -1); + visible = poppler_layer_is_visible(layer); + rb_group = poppler_layer_get_radio_button_group_id(layer); + } else { + gchar *title; + + title = poppler_layers_iter_get_title(iter); + markup = g_markup_escape_text(title, -1); + g_free(title); + + visible = FALSE; + layer = NULL; + } + + gtk_tree_store_append(GTK_TREE_STORE(model), &tree_iter, parent); + gtk_tree_store_set(GTK_TREE_STORE(model), &tree_iter, LAYERS_TITLE_COLUMN, markup, LAYERS_VISIBILITY_COLUMN, visible, LAYERS_ENABLE_COLUMN, TRUE, /* FIXME */ + LAYERS_SHOWTOGGLE_COLUMN, (layer != NULL), LAYERS_RB_GROUP_COLUMN, rb_group, LAYERS_LAYER_COLUMN, layer, -1); + if (layer) { + g_object_unref(layer); + } + g_free(markup); + + child = poppler_layers_iter_get_child(iter); + if (child) { + build_tree(document, model, &tree_iter, child); + } + poppler_layers_iter_free(child); + } while (poppler_layers_iter_next(iter)); +} + +GtkTreeModel *pgd_layers_create_model(PopplerDocument *document) +{ + GtkTreeModel *model; + PopplerLayersIter *iter; + + iter = poppler_layers_iter_new(document); + if (iter) { + model = GTK_TREE_MODEL(gtk_tree_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_INT, G_TYPE_OBJECT)); + build_tree(document, model, NULL, iter); + poppler_layers_iter_free(iter); + } else { + GtkTreeIter tree_iter; + gchar *markup; + + model = GTK_TREE_MODEL(gtk_list_store_new(1, G_TYPE_STRING)); + gtk_list_store_append(GTK_LIST_STORE(model), &tree_iter); + markup = g_strdup_printf("<span size=\"larger\" style=\"italic\">%s</span>", "The document doesn't contain layers"); + gtk_list_store_set(GTK_LIST_STORE(model), &tree_iter, 0, markup, -1); + g_free(markup); + } + + return model; +} + +static cairo_surface_t *pgd_layers_render_page(PgdLayersDemo *demo) +{ + cairo_t *cr; + PopplerPage *page; + gdouble width, height; + cairo_surface_t *surface = NULL; + + page = poppler_document_get_page(demo->doc, demo->page); + if (!page) { + return NULL; + } + + poppler_page_get_size(page, &width, &height); + gtk_widget_set_size_request(demo->darea, width, height); + + surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, width, height); + cr = cairo_create(surface); + + cairo_save(cr); + cairo_set_source_rgb(cr, 1, 1, 1); + cairo_rectangle(cr, 0, 0, width, height); + cairo_fill(cr); + cairo_restore(cr); + + cairo_save(cr); + poppler_page_render(page, cr); + cairo_restore(cr); + + cairo_destroy(cr); + g_object_unref(page); + + return surface; +} + +static gboolean pgd_layers_viewer_drawing_area_draw(GtkWidget *area, cairo_t *cr, PgdLayersDemo *demo) +{ + if (!demo->surface) { + demo->surface = pgd_layers_render_page(demo); + if (!demo->surface) { + return FALSE; + } + } + + cairo_set_source_surface(cr, demo->surface, 0, 0); + cairo_paint(cr); + + return TRUE; +} + +static gboolean pgd_layers_viewer_redraw(PgdLayersDemo *demo) +{ + cairo_surface_destroy(demo->surface); + demo->surface = NULL; + + gtk_widget_queue_draw(demo->darea); + + return FALSE; +} + +static void pgd_layers_viewer_queue_redraw(PgdLayersDemo *demo) +{ + g_idle_add((GSourceFunc)pgd_layers_viewer_redraw, demo); +} + +static void pgd_layers_page_selector_value_changed(GtkSpinButton *spinbutton, PgdLayersDemo *demo) +{ + demo->page = (gint)gtk_spin_button_get_value(spinbutton) - 1; + pgd_layers_viewer_queue_redraw(demo); +} + +static GtkWidget *pgd_layers_create_viewer(PgdLayersDemo *demo) +{ + GtkWidget *vbox, *hbox; + GtkWidget *label; + GtkWidget *swindow; + GtkWidget *page_selector; + guint n_pages; + gchar *str; + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Page:"); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + + n_pages = poppler_document_get_n_pages(demo->doc); + page_selector = gtk_spin_button_new_with_range(1, n_pages, 1); + g_signal_connect(G_OBJECT(page_selector), "value-changed", G_CALLBACK(pgd_layers_page_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(hbox), page_selector, FALSE, TRUE, 0); + gtk_widget_show(page_selector); + + str = g_strdup_printf("of %d", n_pages); + label = gtk_label_new(str); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + g_free(str); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + demo->darea = gtk_drawing_area_new(); + g_signal_connect(G_OBJECT(demo->darea), "draw", G_CALLBACK(pgd_layers_viewer_drawing_area_draw), (gpointer)demo); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +#if GTK_CHECK_VERSION(3, 7, 8) + gtk_container_add(GTK_CONTAINER(swindow), demo->darea); +#else + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swindow), demo->darea); +#endif + gtk_widget_show(demo->darea); + + gtk_box_pack_start(GTK_BOX(vbox), swindow, TRUE, TRUE, 0); + gtk_widget_show(swindow); + + return vbox; +} + +static gboolean update_kids(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, GtkTreeIter *parent) +{ + if (gtk_tree_store_is_ancestor(GTK_TREE_STORE(model), parent, iter)) { + gboolean visible; + + gtk_tree_model_get(model, parent, LAYERS_VISIBILITY_COLUMN, &visible, -1); + gtk_tree_store_set(GTK_TREE_STORE(model), iter, LAYERS_ENABLE_COLUMN, visible, -1); + } + + return FALSE; +} + +static gboolean clear_rb_group(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gint *rb_group) +{ + gint group; + + gtk_tree_model_get(model, iter, LAYERS_RB_GROUP_COLUMN, &group, -1); + + if (group == *rb_group) { + gtk_tree_store_set(GTK_TREE_STORE(model), iter, LAYERS_VISIBILITY_COLUMN, FALSE, -1); + } + + return FALSE; +} + +static void pgd_layers_visibility_changed(GtkCellRendererToggle *cell, gchar *path_str, PgdLayersDemo *demo) +{ + GtkTreeModel *model; + GtkTreePath *path; + GtkTreeIter iter; + gboolean visible; + PopplerLayer *layer; + + model = gtk_tree_view_get_model(GTK_TREE_VIEW(demo->treeview)); + + path = gtk_tree_path_new_from_string(path_str); + gtk_tree_model_get_iter(model, &iter, path); + gtk_tree_model_get(model, &iter, LAYERS_VISIBILITY_COLUMN, &visible, LAYERS_LAYER_COLUMN, &layer, -1); + + visible = !visible; + visible ? poppler_layer_show(layer) : poppler_layer_hide(layer); + + if (visible) { + gint rb_group; + + rb_group = poppler_layer_get_radio_button_group_id(layer); + if (rb_group) { + gtk_tree_model_foreach(model, (GtkTreeModelForeachFunc)clear_rb_group, &rb_group); + } + } + + gtk_tree_store_set(GTK_TREE_STORE(model), &iter, LAYERS_VISIBILITY_COLUMN, visible, -1); + + if (poppler_layer_is_parent(layer)) { + gtk_tree_model_foreach(model, (GtkTreeModelForeachFunc)update_kids, &iter); + } + + pgd_layers_viewer_queue_redraw(demo); + + gtk_tree_path_free(path); + g_object_unref(layer); +} + +GtkWidget *pgd_layers_create_widget(PopplerDocument *document) +{ + PgdLayersDemo *demo; + GtkWidget *swindow; + GtkWidget *treeview; + GtkTreeModel *model; + GtkCellRenderer *renderer; + GtkWidget *hpaned, *viewer; + + demo = g_new0(PgdLayersDemo, 1); + demo->doc = g_object_ref(document); + + hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); + + viewer = pgd_layers_create_viewer(demo); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + model = pgd_layers_create_model(document); + treeview = gtk_tree_view_new_with_model(model); + demo->treeview = treeview; + g_object_unref(model); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 0, "Layer", renderer, "markup", LAYERS_TITLE_COLUMN, NULL); + g_object_set(G_OBJECT(renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + g_object_set(G_OBJECT(gtk_tree_view_get_column(GTK_TREE_VIEW(treeview), 0)), "expand", TRUE, NULL); + + if (GTK_IS_TREE_STORE(model)) { + renderer = gtk_cell_renderer_toggle_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 1, "Show/Hide", renderer, "active", LAYERS_VISIBILITY_COLUMN, "activatable", LAYERS_ENABLE_COLUMN, "visible", LAYERS_SHOWTOGGLE_COLUMN, NULL); + + g_signal_connect(renderer, "toggled", G_CALLBACK(pgd_layers_visibility_changed), (gpointer)demo); + gtk_tree_view_column_set_clickable(gtk_tree_view_get_column(GTK_TREE_VIEW(treeview), 1), TRUE); + } + + gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)), GTK_SELECTION_NONE); + + gtk_container_add(GTK_CONTAINER(swindow), treeview); + gtk_widget_show(treeview); + + gtk_paned_add1(GTK_PANED(hpaned), swindow); + gtk_widget_show(swindow); + + gtk_paned_add2(GTK_PANED(hpaned), viewer); + gtk_widget_show(viewer); + + gtk_paned_set_position(GTK_PANED(hpaned), 150); + + g_object_weak_ref(G_OBJECT(hpaned), (GWeakNotify)pgd_layers_free, (gpointer)demo); + + return hpaned; +} diff --git a/poppler-24.05.0/glib/demo/layers.h b/poppler-24.05.0/glib/demo/layers.h new file mode 100644 index 0000000000000000000000000000000000000000..a78a72b063d982ad2587ff838c466125ee89674a --- /dev/null +++ b/poppler-24.05.0/glib/demo/layers.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _LAYERS_H_ +# define _LAYERS_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_layers_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _LAYERS_H_ */ diff --git a/poppler-24.05.0/glib/demo/links.c b/poppler-24.05.0/glib/demo/links.c new file mode 100644 index 0000000000000000000000000000000000000000..ad9ec3680cc1b4a16a817e21d62165f0b87d63d5 --- /dev/null +++ b/poppler-24.05.0/glib/demo/links.c @@ -0,0 +1,240 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> + +#include "links.h" +#include "utils.h" + +enum +{ + LINKS_ACTION_TYPE_COLUMN, + LINKS_X1_COLUMN, + LINKS_Y1_COLUMN, + LINKS_X2_COLUMN, + LINKS_Y2_COLUMN, + LINKS_ACTION_COLUMN, + N_COLUMNS +}; + +typedef struct +{ + PopplerDocument *doc; + + GtkListStore *model; + GtkWidget *action_view; + GtkWidget *timer_label; + + gint page; +} PgdLinksDemo; + +static void pgd_links_free(PgdLinksDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + if (demo->model) { + g_object_unref(demo->model); + demo->model = NULL; + } + + g_free(demo); +} + +static void pgd_links_get_links(GtkWidget *button, PgdLinksDemo *demo) +{ + PopplerPage *page; + GList *mapping, *l; + gint n_links; + GTimer *timer; + + gtk_list_store_clear(demo->model); + pgd_action_view_set_action(demo->action_view, NULL); + + page = poppler_document_get_page(demo->doc, demo->page); + if (!page) { + return; + } + + timer = g_timer_new(); + mapping = poppler_page_get_link_mapping(page); + g_timer_stop(timer); + + n_links = g_list_length(mapping); + if (n_links > 0) { + gchar *str; + + str = g_strdup_printf("<i>%d links found in %.4f seconds</i>", n_links, g_timer_elapsed(timer, NULL)); + gtk_label_set_markup(GTK_LABEL(demo->timer_label), str); + g_free(str); + } else { + gtk_label_set_markup(GTK_LABEL(demo->timer_label), "<i>No links found</i>"); + } + + g_timer_destroy(timer); + + for (l = mapping; l; l = g_list_next(l)) { + PopplerLinkMapping *lmapping; + PopplerAction *action; + GEnumValue *enum_value; + GtkTreeIter iter; + gchar *x1, *y1, *x2, *y2; + + lmapping = (PopplerLinkMapping *)l->data; + action = poppler_action_copy(lmapping->action); + enum_value = g_enum_get_value((GEnumClass *)g_type_class_ref(POPPLER_TYPE_ACTION_TYPE), action->type); + + x1 = g_strdup_printf("%.2f", lmapping->area.x1); + y1 = g_strdup_printf("%.2f", lmapping->area.y1); + x2 = g_strdup_printf("%.2f", lmapping->area.x2); + y2 = g_strdup_printf("%.2f", lmapping->area.y2); + + gtk_list_store_append(demo->model, &iter); + gtk_list_store_set(demo->model, &iter, LINKS_ACTION_TYPE_COLUMN, enum_value->value_name, LINKS_X1_COLUMN, x1, LINKS_Y1_COLUMN, y1, LINKS_X2_COLUMN, x2, LINKS_Y2_COLUMN, y2, LINKS_ACTION_COLUMN, action, -1); + g_free(x1); + g_free(y1); + g_free(x2); + g_free(y2); + + g_object_weak_ref(G_OBJECT(demo->model), (GWeakNotify)poppler_action_free, action); + } + + poppler_page_free_link_mapping(mapping); + g_object_unref(page); +} + +static void pgd_links_page_selector_value_changed(GtkSpinButton *spinbutton, PgdLinksDemo *demo) +{ + demo->page = (gint)gtk_spin_button_get_value(spinbutton) - 1; +} + +static void pgd_links_selection_changed(GtkTreeSelection *treeselection, PgdLinksDemo *demo) +{ + GtkTreeModel *model; + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(treeselection, &model, &iter)) { + PopplerAction *action; + + gtk_tree_model_get(model, &iter, LINKS_ACTION_COLUMN, &action, -1); + pgd_action_view_set_action(demo->action_view, action); + } +} + +GtkWidget *pgd_links_create_widget(PopplerDocument *document) +{ + PgdLinksDemo *demo; + GtkWidget *label; + GtkWidget *vbox; + GtkWidget *hbox, *page_selector; + GtkWidget *button; + GtkWidget *hpaned; + GtkWidget *swindow, *treeview; + GtkTreeSelection *selection; + GtkCellRenderer *renderer; + gchar *str; + gint n_pages; + + demo = g_new0(PgdLinksDemo, 1); + + demo->doc = g_object_ref(document); + + n_pages = poppler_document_get_n_pages(document); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Page:"); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + + page_selector = gtk_spin_button_new_with_range(1, n_pages, 1); + g_signal_connect(G_OBJECT(page_selector), "value-changed", G_CALLBACK(pgd_links_page_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(hbox), page_selector, FALSE, TRUE, 0); + gtk_widget_show(page_selector); + + str = g_strdup_printf("of %d", n_pages); + label = gtk_label_new(str); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + g_free(str); + + button = gtk_button_new_with_label("Get Links"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_links_get_links), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + demo->timer_label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(demo->timer_label), "<i>No links found</i>"); + g_object_set(G_OBJECT(demo->timer_label), "xalign", 1.0, NULL); + gtk_box_pack_start(GTK_BOX(vbox), demo->timer_label, FALSE, TRUE, 0); + gtk_widget_show(demo->timer_label); + + hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); + + demo->action_view = pgd_action_view_new(document); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + demo->model = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER); + treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(demo->model)); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 0, "Action Type", renderer, "text", LINKS_ACTION_TYPE_COLUMN, NULL); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 1, "X1", renderer, "text", LINKS_X1_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 2, "Y1", renderer, "text", LINKS_Y1_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 3, "X2", renderer, "text", LINKS_X2_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 4, "Y2", renderer, "text", LINKS_Y2_COLUMN, NULL); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(pgd_links_selection_changed), (gpointer)demo); + + gtk_container_add(GTK_CONTAINER(swindow), treeview); + gtk_widget_show(treeview); + + gtk_paned_add1(GTK_PANED(hpaned), swindow); + gtk_widget_show(swindow); + + gtk_paned_add2(GTK_PANED(hpaned), demo->action_view); + gtk_widget_show(demo->action_view); + + gtk_paned_set_position(GTK_PANED(hpaned), 300); + + gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0); + gtk_widget_show(hpaned); + + g_object_weak_ref(G_OBJECT(vbox), (GWeakNotify)pgd_links_free, demo); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/links.h b/poppler-24.05.0/glib/demo/links.h new file mode 100644 index 0000000000000000000000000000000000000000..5683dcfa6d4f5d30f3ff55aea94c47b443f06337 --- /dev/null +++ b/poppler-24.05.0/glib/demo/links.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _LINKS_H_ +# define _LINKS_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_links_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _LINKS_H_ */ diff --git a/poppler-24.05.0/glib/demo/main.c b/poppler-24.05.0/glib/demo/main.c new file mode 100644 index 0000000000000000000000000000000000000000..9b95b3ed570ece29ce4ff28f975d9ca3c20ac96e --- /dev/null +++ b/poppler-24.05.0/glib/demo/main.c @@ -0,0 +1,343 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <gio/gio.h> +#include <poppler.h> +#include <string.h> + +#include "info.h" +#include "fonts.h" +#include "render.h" +#include "page.h" +#include "outline.h" +#include "links.h" +#include "forms.h" +#include "transitions.h" +#include "images.h" +#include "annots.h" +#include "attachments.h" +#include "layers.h" +#include "text.h" +#include "taggedstruct.h" +#include "find.h" +#include "print.h" +#include "selections.h" +#include "signature.h" + +enum +{ + PGD_TITLE_COLUMN, + PGD_NPAGE_COLUMN, + PGD_WIDGET_COLUMN, + N_COLUMNS +}; + +typedef struct +{ + const gchar *name; + GtkWidget *(*create_widget)(PopplerDocument *document); +} PopplerGlibDemo; + +static const PopplerGlibDemo demo_list[] = { { "Info", pgd_info_create_widget }, + { "Fonts", pgd_fonts_create_widget }, + { "Render", pgd_render_create_widget }, + { "Selections", pgd_selections_create_widget }, + { "Page Info", pgd_page_create_widget }, + { "Outline", pgd_outline_create_widget }, + { "Links", pgd_links_create_widget }, + { "Forms", pgd_forms_create_widget }, + { "Page Transitions", pgd_transitions_create_widget }, + { "Images", pgd_images_create_widget }, + { "Annotations", pgd_annots_create_widget }, + { "Attachments", pgd_attachments_create_widget }, + { "Layers", pgd_layers_create_widget }, + { "Text", pgd_text_create_widget }, + { "Tagged Structure", pgd_taggedstruct_create_widget }, + { "Find", pgd_find_create_widget }, + { "Print", pgd_print_create_widget }, + { "Signature", pgd_signature_create_widget } }; + +static void pgd_demo_changed(GtkTreeSelection *selection, GtkNotebook *notebook) +{ + GtkTreeModel *model; + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(selection, &model, &iter)) { + gint n_page; + + gtk_tree_model_get(model, &iter, PGD_NPAGE_COLUMN, &n_page, -1); + gtk_notebook_set_current_page(notebook, n_page); + } +} + +static GtkWidget *pgd_demo_list_create(void) +{ + GtkWidget *treeview; + GtkListStore *model; + GtkCellRenderer *renderer; + gint i; + + model = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_POINTER); + treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model)); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 0, "Demos", renderer, "text", PGD_TITLE_COLUMN, NULL); + + for (i = 0; i < G_N_ELEMENTS(demo_list); i++) { + GtkTreeIter iter; + + gtk_list_store_append(model, &iter); + gtk_list_store_set(model, &iter, PGD_TITLE_COLUMN, demo_list[i].name, PGD_NPAGE_COLUMN, i, -1); + } + + g_object_unref(model); + + return treeview; +} + +static GtkWidget *pgd_demo_notebook_create(PopplerDocument *document) +{ + GtkWidget *notebook; + gint i; + + notebook = gtk_notebook_new(); + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE); + gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE); + + for (i = 0; i < G_N_ELEMENTS(demo_list); i++) { + GtkWidget *demo_widget; + + demo_widget = demo_list[i].create_widget(document); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), demo_widget, NULL); + gtk_widget_show(demo_widget); + } + + return notebook; +} + +static void pgd_demo_auth_dialog_entry_changed(GtkEditable *editable, GtkDialog *dialog) +{ + const char *text; + + text = gtk_entry_get_text(GTK_ENTRY(editable)); + + gtk_dialog_set_response_sensitive(dialog, GTK_RESPONSE_OK, (text != NULL && *text != '\0')); + g_object_set_data(G_OBJECT(dialog), "pgd-password", (gpointer)text); +} + +static void pgd_demo_auth_dialog_entry_activated(GtkEntry *entry, GtkDialog *dialog) +{ + gtk_dialog_response(dialog, GTK_RESPONSE_OK); +} + +static GtkDialog *pgd_demo_get_auth_dialog(GFile *uri_file) +{ + GtkDialog *dialog; + GtkWidget *content_area; + GtkWidget *password_entry; + GtkWidget *hbox, *main_vbox, *vbox, *icon; + GtkWidget *table; + GtkWidget *label; + gchar *format, *markup, *file_name; + + dialog = GTK_DIALOG(gtk_dialog_new()); + content_area = gtk_dialog_get_content_area(dialog); + + /* Set the dialog up with HIG properties */ + gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); + gtk_box_set_spacing(GTK_BOX(content_area), 2); /* 2 * 5 + 2 = 12 */ + + gtk_window_set_title(GTK_WINDOW(dialog), "Enter password"); + gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); + gtk_window_set_icon_name(GTK_WINDOW(dialog), "dialog-password"); + gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); + + gtk_dialog_add_buttons(dialog, "_Cancel", GTK_RESPONSE_CANCEL, "_Unlock Document", GTK_RESPONSE_OK, NULL); + gtk_dialog_set_default_response(dialog, GTK_RESPONSE_OK); + gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), GTK_RESPONSE_OK, FALSE); + + /* Build contents */ + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 5); + gtk_box_pack_start(GTK_BOX(content_area), hbox, TRUE, TRUE, 0); + gtk_widget_show(hbox); + + icon = gtk_image_new_from_icon_name("dialog-password", GTK_ICON_SIZE_DIALOG); + gtk_widget_set_halign(icon, GTK_ALIGN_CENTER); + gtk_widget_set_valign(icon, GTK_ALIGN_START); + gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 0); + gtk_widget_show(icon); + + main_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 18); + gtk_box_pack_start(GTK_BOX(hbox), main_vbox, TRUE, TRUE, 0); + gtk_widget_show(main_vbox); + + label = gtk_label_new(NULL); +#if GTK_CHECK_VERSION(3, 15, 0) + gtk_label_set_xalign(GTK_LABEL(label), 0.0); + gtk_label_set_yalign(GTK_LABEL(label), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); + file_name = g_file_get_basename(uri_file); + format = g_strdup_printf("<span size=\"larger\" weight=\"bold\">%s</span>\n\n%s", "Password required", "The document “%s” is locked and requires a password before it can be opened."); + markup = g_markup_printf_escaped(format, file_name); + gtk_label_set_markup(GTK_LABEL(label), markup); + g_free(format); + g_free(markup); + g_free(file_name); + gtk_box_pack_start(GTK_BOX(main_vbox), label, FALSE, FALSE, 0); + gtk_widget_show(label); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); + gtk_box_pack_start(GTK_BOX(main_vbox), vbox, FALSE, FALSE, 0); + gtk_widget_show(vbox); + + /* The table that holds the entries */ + table = gtk_grid_new(); + gtk_grid_set_column_spacing(GTK_GRID(table), 12); + gtk_grid_set_row_spacing(GTK_GRID(table), 6); + gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); + gtk_widget_show(table); + + label = gtk_label_new_with_mnemonic("_Password:"); +#if GTK_CHECK_VERSION(3, 15, 0) + gtk_label_set_xalign(GTK_LABEL(label), 0.0); + gtk_label_set_yalign(GTK_LABEL(label), 0.5); +#else + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); +#endif + + password_entry = gtk_entry_new(); + gtk_entry_set_visibility(GTK_ENTRY(password_entry), FALSE); + g_signal_connect(password_entry, "changed", G_CALLBACK(pgd_demo_auth_dialog_entry_changed), dialog); + g_signal_connect(password_entry, "activate", G_CALLBACK(pgd_demo_auth_dialog_entry_activated), dialog); + + gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1); + gtk_widget_show(label); + + gtk_grid_attach(GTK_GRID(table), password_entry, 1, 0, 1, 1); + gtk_widget_set_hexpand(password_entry, TRUE); + gtk_widget_show(password_entry); + + gtk_label_set_mnemonic_widget(GTK_LABEL(label), password_entry); + + return dialog; +} + +gint main(gint argc, gchar **argv) +{ + PopplerDocument *document; + GtkWidget *win; + GtkWidget *hbox; + GtkWidget *notebook; + GtkWidget *treeview; + GtkTreeSelection *selection; + GFile *file; + GTimer *timer; + GError *error = NULL; + GtkAccelGroup *gtk_accel; + GClosure *closure; + + if (argc != 2) { + g_print("Usage: poppler-glib-demo FILE\n"); + return 1; + } + + gtk_init(&argc, &argv); + + file = g_file_new_for_commandline_arg(argv[1]); + + timer = g_timer_new(); + document = poppler_document_new_from_gfile(file, NULL, NULL, &error); + g_timer_stop(timer); + if (error) { + while (g_error_matches(error, POPPLER_ERROR, POPPLER_ERROR_ENCRYPTED)) { + GtkDialog *dialog; + const gchar *password; + + dialog = pgd_demo_get_auth_dialog(file); + if (gtk_dialog_run(dialog) != GTK_RESPONSE_OK) { + g_print("Error: no password provided\n"); + g_object_unref(file); + + return 1; + } + + g_clear_error(&error); + password = g_object_get_data(G_OBJECT(dialog), "pgd-password"); + + g_timer_start(timer); + document = poppler_document_new_from_gfile(file, password, NULL, &error); + g_timer_stop(timer); + + gtk_widget_destroy(GTK_WIDGET(dialog)); + } + + if (error) { + g_print("Error: %s\n", error->message); + g_error_free(error); + g_object_unref(file); + + return 1; + } + } + + g_object_unref(file); + + g_print("Document successfully loaded in %.4f seconds\n", g_timer_elapsed(timer, NULL)); + g_timer_destroy(timer); + + /* Main window */ + win = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_default_size(GTK_WINDOW(win), 1024, 768); + gtk_window_set_title(GTK_WINDOW(win), "Poppler GLib Demo"); + g_signal_connect(G_OBJECT(win), "delete-event", G_CALLBACK(gtk_main_quit), NULL); + + gtk_accel = gtk_accel_group_new(); + closure = g_cclosure_new(G_CALLBACK(gtk_main_quit), NULL, NULL); + gtk_accel_group_connect(gtk_accel, gdk_keyval_from_name("q"), GDK_CONTROL_MASK, 0, closure); + g_closure_unref(closure); + gtk_window_add_accel_group(GTK_WINDOW(win), gtk_accel); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + treeview = pgd_demo_list_create(); + gtk_box_pack_start(GTK_BOX(hbox), treeview, FALSE, TRUE, 0); + gtk_widget_show(treeview); + + notebook = pgd_demo_notebook_create(document); + gtk_box_pack_start(GTK_BOX(hbox), notebook, TRUE, TRUE, 0); + gtk_widget_show(notebook); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(pgd_demo_changed), (gpointer)notebook); + + gtk_container_add(GTK_CONTAINER(win), hbox); + gtk_widget_show(hbox); + + gtk_widget_show(win); + + gtk_main(); + + g_object_unref(document); + + return 0; +} diff --git a/poppler-24.05.0/glib/demo/outline.c b/poppler-24.05.0/glib/demo/outline.c new file mode 100644 index 0000000000000000000000000000000000000000..9ef028532988a8a6e5d13dd396408bc3acc1f55c --- /dev/null +++ b/poppler-24.05.0/glib/demo/outline.c @@ -0,0 +1,179 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> + +#include "outline.h" +#include "utils.h" + +enum +{ + OUTLINE_TITLE_COLUMN, + OUTLINE_ACTION_TYPE_COLUMN, + OUTLINE_EXPAND_COLUMN, + OUTLINE_ACTION_COLUMN, + N_COLUMNS +}; + +static void build_tree(PopplerDocument *document, GtkTreeModel *model, GtkTreeIter *parent, PopplerIndexIter *iter) +{ + + do { + GtkTreeIter tree_iter; + PopplerIndexIter *child; + PopplerAction *action; + gboolean expand; + gchar *markup; + GEnumValue *enum_value; + + action = poppler_index_iter_get_action(iter); + expand = poppler_index_iter_is_open(iter); + + if (!action) { + continue; + } + + markup = g_markup_escape_text(action->any.title, -1); + enum_value = g_enum_get_value((GEnumClass *)g_type_class_ref(POPPLER_TYPE_ACTION_TYPE), action->type); + + if (action->type == POPPLER_ACTION_GOTO_DEST && action->goto_dest.dest->type == POPPLER_DEST_NAMED) { + /* TODO */ + } + + gtk_tree_store_append(GTK_TREE_STORE(model), &tree_iter, parent); + gtk_tree_store_set(GTK_TREE_STORE(model), &tree_iter, OUTLINE_TITLE_COLUMN, markup, OUTLINE_ACTION_TYPE_COLUMN, enum_value->value_name, OUTLINE_EXPAND_COLUMN, expand, OUTLINE_ACTION_COLUMN, action, -1); + g_object_weak_ref(G_OBJECT(model), (GWeakNotify)poppler_action_free, action); + + g_free(markup); + + child = poppler_index_iter_get_child(iter); + if (child) { + build_tree(document, model, &tree_iter, child); + } + poppler_index_iter_free(child); + } while (poppler_index_iter_next(iter)); +} + +GtkTreeModel *pgd_outline_create_model(PopplerDocument *document) +{ + GtkTreeModel *model; + PopplerIndexIter *iter; + + iter = poppler_index_iter_new(document); + if (iter) { + model = GTK_TREE_MODEL(gtk_tree_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER)); + build_tree(document, model, NULL, iter); + poppler_index_iter_free(iter); + } else { + GtkTreeIter tree_iter; + gchar *markup; + + model = GTK_TREE_MODEL(gtk_list_store_new(1, G_TYPE_STRING)); + gtk_list_store_append(GTK_LIST_STORE(model), &tree_iter); + markup = g_strdup_printf("<span size=\"larger\" style=\"italic\">%s</span>", "The document doesn't contain outline"); + gtk_list_store_set(GTK_LIST_STORE(model), &tree_iter, 0, markup, -1); + g_free(markup); + } + + return model; +} + +static void expand_open_links(GtkTreeView *tree_view, GtkTreeModel *model, GtkTreeIter *parent) +{ + GtkTreeIter iter; + gboolean expand; + + if (gtk_tree_model_iter_children(model, &iter, parent)) { + do { + gtk_tree_model_get(model, &iter, OUTLINE_EXPAND_COLUMN, &expand, -1); + if (expand) { + GtkTreePath *path; + + path = gtk_tree_model_get_path(model, &iter); + gtk_tree_view_expand_row(tree_view, path, FALSE); + gtk_tree_path_free(path); + } + + expand_open_links(tree_view, model, &iter); + } while (gtk_tree_model_iter_next(model, &iter)); + } +} + +static void pgd_outline_selection_changed(GtkTreeSelection *treeselection, GtkWidget *action_view) +{ + GtkTreeModel *model; + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(treeselection, &model, &iter)) { + PopplerAction *action; + + gtk_tree_model_get(model, &iter, OUTLINE_ACTION_COLUMN, &action, -1); + pgd_action_view_set_action(action_view, action); + } +} + +GtkWidget *pgd_outline_create_widget(PopplerDocument *document) +{ + GtkWidget *swindow; + GtkWidget *treeview; + GtkTreeModel *model; + GtkCellRenderer *renderer; + GtkTreeSelection *selection; + GtkWidget *hpaned, *action; + + hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); + + action = pgd_action_view_new(document); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + model = pgd_outline_create_model(document); + treeview = gtk_tree_view_new_with_model(model); + g_object_unref(model); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 0, "Title", renderer, "markup", OUTLINE_TITLE_COLUMN, NULL); + g_object_set(G_OBJECT(renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + g_object_set(G_OBJECT(gtk_tree_view_get_column(GTK_TREE_VIEW(treeview), 0)), "expand", TRUE, NULL); + + if (GTK_IS_TREE_STORE(model)) { + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 1, "Action Type", renderer, "text", OUTLINE_ACTION_TYPE_COLUMN, NULL); + + expand_open_links(GTK_TREE_VIEW(treeview), model, NULL); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(pgd_outline_selection_changed), (gpointer)action); + } else { + gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)), GTK_SELECTION_NONE); + } + + gtk_container_add(GTK_CONTAINER(swindow), treeview); + gtk_widget_show(treeview); + + gtk_paned_add1(GTK_PANED(hpaned), swindow); + gtk_widget_show(swindow); + + gtk_paned_add2(GTK_PANED(hpaned), action); + gtk_widget_show(action); + + gtk_paned_set_position(GTK_PANED(hpaned), 300); + + return hpaned; +} diff --git a/poppler-24.05.0/glib/demo/outline.h b/poppler-24.05.0/glib/demo/outline.h new file mode 100644 index 0000000000000000000000000000000000000000..527ae5d5f73a0de14ddfbe32f68aa236f2d1c320 --- /dev/null +++ b/poppler-24.05.0/glib/demo/outline.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _OUTLINE_H_ +# define _OUTLINE_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_outline_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _OUTLINE_H_ */ diff --git a/poppler-24.05.0/glib/demo/page.c b/poppler-24.05.0/glib/demo/page.c new file mode 100644 index 0000000000000000000000000000000000000000..f6a3d82a32d929e4f8b5e97d95d9327d389a2c2a --- /dev/null +++ b/poppler-24.05.0/glib/demo/page.c @@ -0,0 +1,318 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 "config.h" + +#include <gtk/gtk.h> + +#include "page.h" +#include "utils.h" + +typedef struct +{ + PopplerDocument *doc; + + GtkWidget *index; + GtkWidget *label; + GtkWidget *size; + GtkWidget *duration; + GtkWidget *thumbnail; + GtkWidget *thumbnail_size; + + gint page; +} PgdPageDemo; + +static void pgd_page_free(PgdPageDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + g_free(demo); +} + +#ifndef POPPLER_WITH_GDK +static void image_set_from_surface(GtkImage *gtkimage, cairo_surface_t *surface) +{ + GdkPixbuf *pixbuf; + cairo_surface_t *image; + cairo_t *cr; + gboolean has_alpha; + gint width, height; + cairo_format_t surface_format; + gint pixbuf_n_channels; + gint pixbuf_rowstride; + guchar *pixbuf_pixels; + gint x, y; + + width = cairo_image_surface_get_width(surface); + height = cairo_image_surface_get_height(surface); + + surface_format = cairo_image_surface_get_format(surface); + has_alpha = (surface_format == CAIRO_FORMAT_ARGB32); + + pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height); + pixbuf_n_channels = gdk_pixbuf_get_n_channels(pixbuf); + pixbuf_rowstride = gdk_pixbuf_get_rowstride(pixbuf); + pixbuf_pixels = gdk_pixbuf_get_pixels(pixbuf); + + image = cairo_image_surface_create_for_data(pixbuf_pixels, surface_format, width, height, pixbuf_rowstride); + cr = cairo_create(image); + cairo_set_source_surface(cr, surface, 0, 0); + + if (has_alpha) { + cairo_mask_surface(cr, surface, 0, 0); + } else { + cairo_paint(cr); + } + + cairo_destroy(cr); + cairo_surface_destroy(image); + + for (y = 0; y < height; y++) { + guchar *p = pixbuf_pixels + y * pixbuf_rowstride; + + for (x = 0; x < width; x++) { + guchar tmp; + +# if G_BYTE_ORDER == G_LITTLE_ENDIAN + tmp = p[0]; + p[0] = p[2]; + p[2] = tmp; + p[3] = (has_alpha) ? p[3] : 0xff; +# else + tmp = p[0]; + p[0] = (has_alpha) ? p[3] : 0xff; + p[3] = p[2]; + p[2] = p[1]; + p[1] = tmp; +# endif + p += pixbuf_n_channels; + } + } + + gtk_image_set_from_pixbuf(gtkimage, pixbuf); + g_object_unref(pixbuf); +} +#endif /* !POPPLER_WITH_GDK */ + +static void pgd_page_set_page(PgdPageDemo *demo, PopplerPage *page) +{ +#ifdef POPPLER_WITH_GDK + GdkPixbuf *thumbnail; +#else + cairo_surface_t *thumbnail; +#endif + gchar *str; + + str = page ? g_strdup_printf("%d", poppler_page_get_index(page)) : NULL; + gtk_label_set_text(GTK_LABEL(demo->index), str); + g_free(str); + + if (page) { + str = poppler_page_get_label(page); + gtk_label_set_text(GTK_LABEL(demo->label), str); + g_free(str); + } else { + gtk_label_set_text(GTK_LABEL(demo->label), NULL); + } + + if (page) { + gdouble width, height; + + poppler_page_get_size(page, &width, &height); + str = g_strdup_printf("%.2f x %.2f", width, height); + gtk_label_set_text(GTK_LABEL(demo->size), str); + g_free(str); + } else { + gtk_label_set_text(GTK_LABEL(demo->size), NULL); + } + + str = page ? g_strdup_printf("%.2f seconds", poppler_page_get_duration(page)) : NULL; + gtk_label_set_text(GTK_LABEL(demo->duration), str); + g_free(str); + +#ifdef POPPLER_WITH_GDK + thumbnail = page ? poppler_page_get_thumbnail_pixbuf(page) : NULL; +#else + thumbnail = page ? poppler_page_get_thumbnail(page) : NULL; +#endif + if (thumbnail) { + gint width, height; + + poppler_page_get_thumbnail_size(page, &width, &height); + str = g_strdup_printf("%d x %d", width, height); + gtk_label_set_text(GTK_LABEL(demo->thumbnail_size), str); + g_free(str); + +#ifdef POPPLER_WITH_GDK + gtk_image_set_from_pixbuf(GTK_IMAGE(demo->thumbnail), thumbnail); + g_object_unref(thumbnail); +#else + image_set_from_surface(GTK_IMAGE(demo->thumbnail), thumbnail); + cairo_surface_destroy(thumbnail); +#endif + } else { + str = g_strdup("<i>No thumbnail found</i>"); + gtk_label_set_markup(GTK_LABEL(demo->thumbnail_size), str); + g_free(str); + + gtk_image_set_from_icon_name(GTK_IMAGE(demo->thumbnail), "image-missing", GTK_ICON_SIZE_DIALOG); + } +} + +static void pgd_page_get_info(GtkWidget *button, PgdPageDemo *demo) +{ + PopplerPage *page; + + page = poppler_document_get_page(demo->doc, demo->page); + pgd_page_set_page(demo, page); + g_object_unref(page); +} + +static void pgd_page_page_selector_value_changed(GtkSpinButton *spinbutton, PgdPageDemo *demo) +{ + demo->page = (gint)gtk_spin_button_get_value(spinbutton) - 1; +} + +GtkWidget *pgd_page_create_widget(PopplerDocument *document) +{ + PgdPageDemo *demo; + GtkWidget *vbox; + GtkWidget *hbox, *page_selector; + GtkWidget *button; + GtkWidget *frame; + GtkWidget *table; + GtkWidget *label; + GtkWidget *thumnail_box; + gchar *str; + gint n_pages; + gint row = 0; + + demo = g_new0(PgdPageDemo, 1); + + demo->doc = g_object_ref(document); + + n_pages = poppler_document_get_n_pages(document); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Page:"); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + + page_selector = gtk_spin_button_new_with_range(1, n_pages, 1); + g_signal_connect(G_OBJECT(page_selector), "value-changed", G_CALLBACK(pgd_page_page_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(hbox), page_selector, FALSE, TRUE, 0); + gtk_widget_show(page_selector); + + str = g_strdup_printf("of %d", n_pages); + label = gtk_label_new(str); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + g_free(str); + + button = gtk_button_new_with_label("Get Info"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_page_get_info), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); + label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(label), "<b>Page Properties</b>"); + gtk_frame_set_label_widget(GTK_FRAME(frame), label); + gtk_widget_show(label); + + table = gtk_grid_new(); + gtk_widget_set_margin_top(table, 5); + gtk_widget_set_margin_bottom(table, 5); +#if GTK_CHECK_VERSION(3, 12, 0) + gtk_widget_set_margin_start(table, 12); + gtk_widget_set_margin_end(table, 5); +#else + gtk_widget_set_margin_left(table, 12); + gtk_widget_set_margin_right(table, 5); +#endif + gtk_grid_set_column_spacing(GTK_GRID(table), 6); + gtk_grid_set_row_spacing(GTK_GRID(table), 6); + + pgd_table_add_property_with_value_widget(GTK_GRID(table), "<b>Page Index:</b>", &(demo->index), NULL, &row); + pgd_table_add_property_with_value_widget(GTK_GRID(table), "<b>Page Label:</b>", &(demo->label), NULL, &row); + pgd_table_add_property_with_value_widget(GTK_GRID(table), "<b>Page Size:</b>", &(demo->size), NULL, &row); + pgd_table_add_property_with_value_widget(GTK_GRID(table), "<b>Page Duration:</b>", &(demo->duration), NULL, &row); + + gtk_container_add(GTK_CONTAINER(frame), table); + gtk_widget_show(table); + + gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0); + gtk_widget_show(frame); + + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); + gtk_frame_set_label_align(GTK_FRAME(frame), 0.5, 0.5); + label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(label), "<b>Page Thumbnail</b>"); + gtk_frame_set_label_widget(GTK_FRAME(frame), label); + gtk_widget_show(label); + + thumnail_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); + gtk_widget_set_margin_top(thumnail_box, 5); + gtk_widget_set_margin_bottom(thumnail_box, 5); +#if GTK_CHECK_VERSION(3, 12, 0) + gtk_widget_set_margin_start(thumnail_box, 12); + gtk_widget_set_margin_end(thumnail_box, 5); +#else + gtk_widget_set_margin_left(thumnail_box, 12); + gtk_widget_set_margin_right(thumnail_box, 5); +#endif + + demo->thumbnail = gtk_image_new(); + gtk_box_pack_start(GTK_BOX(thumnail_box), demo->thumbnail, TRUE, TRUE, 0); + gtk_widget_show(demo->thumbnail); + + demo->thumbnail_size = gtk_label_new(NULL); + g_object_set(G_OBJECT(demo->thumbnail_size), "xalign", 0.5, NULL); + gtk_box_pack_start(GTK_BOX(thumnail_box), demo->thumbnail_size, TRUE, TRUE, 0); + gtk_widget_show(demo->thumbnail_size); + + gtk_container_add(GTK_CONTAINER(frame), thumnail_box); + gtk_widget_show(thumnail_box); + + gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0); + gtk_widget_show(frame); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + g_object_weak_ref(G_OBJECT(vbox), (GWeakNotify)pgd_page_free, (gpointer)demo); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/page.h b/poppler-24.05.0/glib/demo/page.h new file mode 100644 index 0000000000000000000000000000000000000000..62624dde73f2f323c82a3d4487f3e10db684d786 --- /dev/null +++ b/poppler-24.05.0/glib/demo/page.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _PAGE_H_ +# define _PAGE_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_page_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _PAGE_H_ */ diff --git a/poppler-24.05.0/glib/demo/print.c b/poppler-24.05.0/glib/demo/print.c new file mode 100644 index 0000000000000000000000000000000000000000..7cf918fcf0d7234beb3a6384aaf61ba704d6dbbc --- /dev/null +++ b/poppler-24.05.0/glib/demo/print.c @@ -0,0 +1,195 @@ +/* + * Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 "config.h" + +#include <gtk/gtk.h> +#include "print.h" + +typedef enum +{ + PRINT_DOCUMENT, + PRINT_DOCUMENT_MARKUPS, + PRINT_DOCUMENT_STAMPS +} PgdPrintOptions; + +typedef struct +{ + PopplerDocument *doc; + GtkWidget *options_combo; + PgdPrintOptions options; +} PgdPrintDemo; + +#define PGD_PRINT_OPTIONS "pgd-print-options" + +static void pgd_print_free(PgdPrintDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + g_free(demo); +} + +static void pgd_print_begin_print(GtkPrintOperation *op, GtkPrintContext *context, PgdPrintDemo *demo) +{ + gtk_print_operation_set_n_pages(op, poppler_document_get_n_pages(demo->doc)); +} + +static void pgd_print_draw_page(GtkPrintOperation *op, GtkPrintContext *context, gint page_nr, PgdPrintDemo *demo) +{ + PopplerPage *page; + cairo_t *cr; +#if 0 + GtkPrintSettings *settings; +#endif + PgdPrintOptions options; + PopplerPrintFlags flags = 0; + + page = poppler_document_get_page(demo->doc, page_nr); + if (!page) { + return; + } + +#if 0 + settings = gtk_print_operation_get_print_settings (op); + options = gtk_print_settings_get_int_with_default (settings, + PGD_PRINT_OPTIONS, + PRINT_DOCUMENT_MARKUPS); +#else + /* Workaround for gtk+ bug, we need to save the options ourselves */ + options = demo->options; +#endif + switch (options) { + case PRINT_DOCUMENT: + flags |= POPPLER_PRINT_DOCUMENT; + break; + case PRINT_DOCUMENT_MARKUPS: + flags |= POPPLER_PRINT_MARKUP_ANNOTS; + break; + case PRINT_DOCUMENT_STAMPS: + flags |= POPPLER_PRINT_STAMP_ANNOTS_ONLY; + break; + default: + g_assert_not_reached(); + } + + cr = gtk_print_context_get_cairo_context(context); + poppler_page_render_for_printing_with_options(page, cr, flags); + g_object_unref(page); +} + +static GObject *pgd_print_create_custom_widget(GtkPrintOperation *op, PgdPrintDemo *demo) +{ + GtkWidget *hbox; + GtkWidget *label, *combo; + GtkPrintSettings *settings; + PgdPrintOptions options; + + settings = gtk_print_operation_get_print_settings(op); + options = gtk_print_settings_get_int_with_default(settings, PGD_PRINT_OPTIONS, PRINT_DOCUMENT_MARKUPS); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); + gtk_container_set_border_width(GTK_CONTAINER(hbox), 12); + + label = gtk_label_new("Print: "); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); + gtk_widget_show(label); + + combo = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), "Document"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), "Document and markup"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), "Document and stamps"); + + demo->options_combo = combo; + gtk_combo_box_set_active(GTK_COMBO_BOX(combo), options); + gtk_box_pack_start(GTK_BOX(hbox), combo, FALSE, FALSE, 0); + gtk_widget_show(combo); + + return G_OBJECT(hbox); +} + +static void pgd_print_custom_widget_apply(GtkPrintOperation *op, GtkWidget *widget, PgdPrintDemo *demo) +{ + GtkPrintSettings *settings; + PgdPrintOptions options; + + settings = gtk_print_operation_get_print_settings(op); + options = gtk_combo_box_get_active(GTK_COMBO_BOX(demo->options_combo)); + /* Workaround for gtk+ bug, we need to save the options ourselves */ + demo->options = options; + gtk_print_settings_set_int(settings, PGD_PRINT_OPTIONS, options); +} + +static void pgd_print_print(GtkWidget *button, PgdPrintDemo *demo) +{ + GtkPrintOperation *op; + GError *error = NULL; + + op = gtk_print_operation_new(); + gtk_print_operation_set_custom_tab_label(op, "PDF Options"); + g_signal_connect(op, "begin-print", G_CALLBACK(pgd_print_begin_print), demo); + g_signal_connect(op, "draw-page", G_CALLBACK(pgd_print_draw_page), demo); + g_signal_connect(op, "create_custom_widget", G_CALLBACK(pgd_print_create_custom_widget), demo); + g_signal_connect(op, "custom_widget_apply", G_CALLBACK(pgd_print_custom_widget_apply), demo); + gtk_print_operation_run(op, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, GTK_WINDOW(gtk_widget_get_toplevel(button)), &error); + if (error) { + GtkWidget *dialog; + + dialog = gtk_message_dialog_new(GTK_WINDOW(gtk_widget_get_toplevel(button)), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", error->message); + g_error_free(error); + + g_signal_connect(dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL); + + gtk_widget_show(dialog); + } + g_object_unref(op); +} + +GtkWidget *pgd_print_create_widget(PopplerDocument *document) +{ + PgdPrintDemo *demo; + GtkWidget *vbox; + GtkWidget *hbox; + GtkWidget *button; + + demo = g_new0(PgdPrintDemo, 1); + + demo->doc = g_object_ref(document); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + button = gtk_button_new_with_label("Print..."); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_print_print), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + g_object_weak_ref(G_OBJECT(vbox), (GWeakNotify)pgd_print_free, (gpointer)demo); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/print.h b/poppler-24.05.0/glib/demo/print.h new file mode 100644 index 0000000000000000000000000000000000000000..5d20d83da9e89be13179cca1b1692a0d1ac394ff --- /dev/null +++ b/poppler-24.05.0/glib/demo/print.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _PRINT_H_ +# define _PRINT_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_print_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _PRINT_H_ */ diff --git a/poppler-24.05.0/glib/demo/render.c b/poppler-24.05.0/glib/demo/render.c new file mode 100644 index 0000000000000000000000000000000000000000..12656aa9981b9b236c34f612c2e0de82dcd886de --- /dev/null +++ b/poppler-24.05.0/glib/demo/render.c @@ -0,0 +1,410 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 "config.h" + +#include <gtk/gtk.h> +#include <cairo.h> + +#include "render.h" + +typedef struct +{ + PopplerDocument *doc; + + /* Properties */ + gint page; + gdouble scale; + gint rotate; + GdkRectangle slice; + gboolean printing; + + GtkWidget *swindow; + GtkWidget *darea; + GtkWidget *slice_x; + GtkWidget *slice_y; + GtkWidget *slice_w; + GtkWidget *slice_h; + GtkWidget *timer_label; + + cairo_surface_t *surface; +} PgdRenderDemo; + +static void pgd_render_free(PgdRenderDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + if (demo->surface) { + cairo_surface_destroy(demo->surface); + demo->surface = NULL; + } + + g_free(demo); +} + +static gboolean pgd_render_drawing_area_draw(GtkWidget *area, cairo_t *cr, PgdRenderDemo *demo) +{ + if (!demo->surface) { + return FALSE; + } + + cairo_set_source_surface(cr, demo->surface, 0, 0); + cairo_paint(cr); + + return TRUE; +} + +static void pgd_render_start(GtkButton *button, PgdRenderDemo *demo) +{ + PopplerPage *page; + gdouble page_width, page_height; + gdouble width, height; + gint x, y; + gchar *str; + GTimer *timer; + cairo_t *cr; + + page = poppler_document_get_page(demo->doc, demo->page); + if (!page) { + return; + } + + if (demo->surface) { + cairo_surface_destroy(demo->surface); + } + demo->surface = NULL; + + poppler_page_get_size(page, &page_width, &page_height); + + if (demo->rotate == 0 || demo->rotate == 180) { + width = demo->slice.width * demo->scale; + height = demo->slice.height * demo->scale; + x = demo->slice.x * demo->scale; + y = demo->slice.y * demo->scale; + } else { + width = demo->slice.height * demo->scale; + height = demo->slice.width * demo->scale; + x = demo->slice.y * demo->scale; + y = demo->slice.x * demo->scale; + } + + timer = g_timer_new(); + demo->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); + cr = cairo_create(demo->surface); + + cairo_save(cr); + switch (demo->rotate) { + case 90: + cairo_translate(cr, x + width, -y); + break; + case 180: + cairo_translate(cr, x + width, y + height); + break; + case 270: + cairo_translate(cr, -x, y + height); + break; + default: + cairo_translate(cr, -x, -y); + } + + if (demo->scale != 1.0) { + cairo_scale(cr, demo->scale, demo->scale); + } + + if (demo->rotate != 0) { + cairo_rotate(cr, demo->rotate * G_PI / 180.0); + } + + if (demo->printing) { + poppler_page_render_for_printing(page, cr); + } else { + poppler_page_render(page, cr); + } + cairo_restore(cr); + + cairo_set_operator(cr, CAIRO_OPERATOR_DEST_OVER); + cairo_set_source_rgb(cr, 1., 1., 1.); + cairo_paint(cr); + + g_timer_stop(timer); + + cairo_destroy(cr); + g_object_unref(page); + + str = g_strdup_printf("<i>Page rendered in %.4f seconds</i>", g_timer_elapsed(timer, NULL)); + gtk_label_set_markup(GTK_LABEL(demo->timer_label), str); + g_free(str); + + g_timer_destroy(timer); + + gtk_widget_set_size_request(demo->darea, width, height); + gtk_widget_queue_draw(demo->darea); +} + +static void pgd_render_slice_selector_setup(PgdRenderDemo *demo) +{ + PopplerPage *page; + gdouble width, height; + + page = poppler_document_get_page(demo->doc, demo->page); + if (!page) { + return; + } + + poppler_page_get_size(page, &width, &height); + + gtk_spin_button_set_range(GTK_SPIN_BUTTON(demo->slice_x), 0, width); + gtk_spin_button_set_range(GTK_SPIN_BUTTON(demo->slice_y), 0, height); + gtk_spin_button_set_range(GTK_SPIN_BUTTON(demo->slice_w), 0, width); + gtk_spin_button_set_range(GTK_SPIN_BUTTON(demo->slice_h), 0, height); + + gtk_spin_button_set_value(GTK_SPIN_BUTTON(demo->slice_x), 0); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(demo->slice_y), 0); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(demo->slice_w), width); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(demo->slice_h), height); + + g_object_unref(page); +} + +static void pgd_render_page_selector_value_changed(GtkSpinButton *spinbutton, PgdRenderDemo *demo) +{ + demo->page = (gint)gtk_spin_button_get_value(spinbutton) - 1; + pgd_render_slice_selector_setup(demo); +} + +static void pgd_render_scale_selector_value_changed(GtkSpinButton *spinbutton, PgdRenderDemo *demo) +{ + demo->scale = gtk_spin_button_get_value(spinbutton); +} + +static void pgd_render_rotate_selector_changed(GtkComboBox *combobox, PgdRenderDemo *demo) +{ + demo->rotate = gtk_combo_box_get_active(combobox) * 90; +} + +static void pgd_render_printing_selector_changed(GtkToggleButton *tooglebutton, PgdRenderDemo *demo) +{ + demo->printing = gtk_toggle_button_get_active(tooglebutton); +} + +static void pgd_render_slice_selector_value_changed(GtkSpinButton *spinbutton, PgdRenderDemo *demo) +{ + demo->slice.x = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(demo->slice_x)); + demo->slice.y = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(demo->slice_y)); + demo->slice.width = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(demo->slice_w)); + demo->slice.height = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(demo->slice_h)); +} + +GtkWidget *pgd_render_properties_selector_create(PgdRenderDemo *demo) +{ + GtkWidget *hbox, *vbox; + GtkWidget *label; + GtkWidget *page_hbox, *page_selector; + GtkWidget *scale_hbox, *scale_selector; + GtkWidget *rotate_hbox, *rotate_selector; + GtkWidget *printing_selector; + GtkWidget *slice_hbox; + GtkWidget *button; + gint n_pages; + gchar *str; + + n_pages = poppler_document_get_n_pages(demo->doc); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12); + gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); + gtk_widget_show(hbox); + + page_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Page:"); + gtk_box_pack_start(GTK_BOX(page_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + page_selector = gtk_spin_button_new_with_range(1, n_pages, 1); + g_signal_connect(G_OBJECT(page_selector), "value-changed", G_CALLBACK(pgd_render_page_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(page_hbox), page_selector, TRUE, TRUE, 0); + gtk_widget_show(page_selector); + + str = g_strdup_printf("of %d", n_pages); + label = gtk_label_new(str); + gtk_box_pack_start(GTK_BOX(page_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + g_free(str); + + gtk_box_pack_start(GTK_BOX(hbox), page_hbox, FALSE, TRUE, 0); + gtk_widget_show(page_hbox); + + scale_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Scale:"); + gtk_box_pack_start(GTK_BOX(scale_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + scale_selector = gtk_spin_button_new_with_range(0, 10.0, 0.1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(scale_selector), 1.0); + g_signal_connect(G_OBJECT(scale_selector), "value-changed", G_CALLBACK(pgd_render_scale_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(scale_hbox), scale_selector, TRUE, TRUE, 0); + gtk_widget_show(scale_selector); + + gtk_box_pack_start(GTK_BOX(hbox), scale_hbox, FALSE, TRUE, 0); + gtk_widget_show(scale_hbox); + + rotate_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Rotate:"); + gtk_box_pack_start(GTK_BOX(rotate_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + rotate_selector = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(rotate_selector), "0"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(rotate_selector), "90"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(rotate_selector), "180"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(rotate_selector), "270"); + gtk_combo_box_set_active(GTK_COMBO_BOX(rotate_selector), 0); + g_signal_connect(G_OBJECT(rotate_selector), "changed", G_CALLBACK(pgd_render_rotate_selector_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(rotate_hbox), rotate_selector, TRUE, TRUE, 0); + gtk_widget_show(rotate_selector); + + gtk_box_pack_start(GTK_BOX(hbox), rotate_hbox, FALSE, TRUE, 0); + gtk_widget_show(rotate_hbox); + + printing_selector = gtk_check_button_new_with_label("Printing"); + g_signal_connect(printing_selector, "toggled", G_CALLBACK(pgd_render_printing_selector_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(hbox), printing_selector, FALSE, TRUE, 0); + gtk_widget_show(printing_selector); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12); + gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); + gtk_widget_show(hbox); + + slice_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("x:"); + gtk_box_pack_start(GTK_BOX(slice_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + demo->slice_x = gtk_spin_button_new_with_range(0, 0, 1.0); + g_signal_connect(G_OBJECT(demo->slice_x), "value-changed", G_CALLBACK(pgd_render_slice_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(slice_hbox), demo->slice_x, TRUE, TRUE, 0); + gtk_widget_show(demo->slice_x); + + gtk_box_pack_start(GTK_BOX(hbox), slice_hbox, FALSE, TRUE, 0); + gtk_widget_show(slice_hbox); + + slice_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("y:"); + gtk_box_pack_start(GTK_BOX(slice_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + demo->slice_y = gtk_spin_button_new_with_range(0, 0, 1.0); + g_signal_connect(G_OBJECT(demo->slice_y), "value-changed", G_CALLBACK(pgd_render_slice_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(slice_hbox), demo->slice_y, TRUE, TRUE, 0); + gtk_widget_show(demo->slice_y); + + gtk_box_pack_start(GTK_BOX(hbox), slice_hbox, FALSE, TRUE, 0); + gtk_widget_show(slice_hbox); + + slice_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("width:"); + gtk_box_pack_start(GTK_BOX(slice_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + demo->slice_w = gtk_spin_button_new_with_range(0, 0, 1.0); + g_signal_connect(G_OBJECT(demo->slice_w), "value-changed", G_CALLBACK(pgd_render_slice_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(slice_hbox), demo->slice_w, TRUE, TRUE, 0); + gtk_widget_show(demo->slice_w); + + gtk_box_pack_start(GTK_BOX(hbox), slice_hbox, FALSE, TRUE, 0); + gtk_widget_show(slice_hbox); + + slice_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("height:"); + gtk_box_pack_start(GTK_BOX(slice_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + demo->slice_h = gtk_spin_button_new_with_range(0, 0, 1.0); + g_signal_connect(G_OBJECT(demo->slice_h), "value-changed", G_CALLBACK(pgd_render_slice_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(slice_hbox), demo->slice_h, TRUE, TRUE, 0); + gtk_widget_show(demo->slice_h); + + gtk_box_pack_start(GTK_BOX(hbox), slice_hbox, FALSE, TRUE, 0); + gtk_widget_show(slice_hbox); + + pgd_render_slice_selector_setup(demo); + + button = gtk_button_new_with_label("Render"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_render_start), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, TRUE, 0); + gtk_widget_show(button); + + demo->timer_label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(demo->timer_label), "<i>No page rendered</i>"); + g_object_set(G_OBJECT(demo->timer_label), "xalign", 1.0, NULL); + gtk_box_pack_end(GTK_BOX(vbox), demo->timer_label, FALSE, TRUE, 0); + gtk_widget_show(demo->timer_label); + + return vbox; +} + +GtkWidget *pgd_render_create_widget(PopplerDocument *document) +{ + PgdRenderDemo *demo; + GtkWidget *vbox, *hbox; + + demo = g_new0(PgdRenderDemo, 1); + + demo->doc = g_object_ref(document); + demo->scale = 1.0; + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); + + hbox = pgd_render_properties_selector_create(demo); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 6); + gtk_widget_show(hbox); + + demo->darea = gtk_drawing_area_new(); + g_signal_connect(G_OBJECT(demo->darea), "draw", G_CALLBACK(pgd_render_drawing_area_draw), (gpointer)demo); + + demo->swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(demo->swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +#if GTK_CHECK_VERSION(3, 7, 8) + gtk_container_add(GTK_CONTAINER(demo->swindow), demo->darea); +#else + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(demo->swindow), demo->darea); +#endif + gtk_widget_show(demo->darea); + + gtk_box_pack_start(GTK_BOX(vbox), demo->swindow, TRUE, TRUE, 0); + gtk_widget_show(demo->swindow); + + g_object_weak_ref(G_OBJECT(demo->swindow), (GWeakNotify)pgd_render_free, (gpointer)demo); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/render.h b/poppler-24.05.0/glib/demo/render.h new file mode 100644 index 0000000000000000000000000000000000000000..7b6484b38768a8431edc0b13bb764afe869e560b --- /dev/null +++ b/poppler-24.05.0/glib/demo/render.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _RENDER_H_ +# define _RENDER_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_render_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _RENDER_H_ */ diff --git a/poppler-24.05.0/glib/demo/selections.c b/poppler-24.05.0/glib/demo/selections.c new file mode 100644 index 0000000000000000000000000000000000000000..a1196daf81f60ba9999c83b36b064e33bb086eb3 --- /dev/null +++ b/poppler-24.05.0/glib/demo/selections.c @@ -0,0 +1,601 @@ +/* + * Copyright (C) 2010 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 "config.h" + +#include <gtk/gtk.h> +#include <cairo.h> + +#include "selections.h" + +typedef struct +{ + PopplerDocument *doc; + + /* Properties */ + gint page_index; + gdouble scale; + + GtkWidget *swindow; + GtkWidget *darea; + GtkWidget *fg_color_button; + GtkWidget *bg_color_button; + GtkWidget *copy_button; + + PopplerPage *page; + cairo_surface_t *surface; + + GdkPoint start; + GdkPoint stop; + PopplerRectangle doc_area; + cairo_surface_t *selection_surface; + PopplerSelectionStyle style; + PopplerColor glyph_color; + PopplerColor background_color; + guint selections_idle; + cairo_region_t *selection_region; + cairo_region_t *selected_region; + GdkCursorType cursor; + gchar *selected_text; +} PgdSelectionsDemo; + +static void pgd_selections_clear_selections(PgdSelectionsDemo *demo) +{ + demo->start.x = -1; + + if (demo->selection_surface) { + cairo_surface_destroy(demo->selection_surface); + demo->selection_surface = NULL; + } + + if (demo->selection_region) { + cairo_region_destroy(demo->selection_region); + demo->selection_region = NULL; + } + + if (demo->selected_text) { + g_free(demo->selected_text); + demo->selected_text = NULL; + } + + if (demo->selected_region) { + cairo_region_destroy(demo->selected_region); + demo->selected_region = NULL; + } +} + +static void pgd_selections_free(PgdSelectionsDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->selections_idle > 0) { + g_source_remove(demo->selections_idle); + demo->selections_idle = 0; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + if (demo->page) { + g_object_unref(demo->page); + demo->page = NULL; + } + + if (demo->surface) { + cairo_surface_destroy(demo->surface); + demo->surface = NULL; + } + + pgd_selections_clear_selections(demo); + + g_free(demo); +} + +static void pgd_selections_update_selection_region(PgdSelectionsDemo *demo) +{ + PopplerRectangle area = { 0, 0, 0, 0 }; + + if (demo->selection_region) { + cairo_region_destroy(demo->selection_region); + } + + poppler_page_get_size(demo->page, &area.x2, &area.y2); + demo->selection_region = poppler_page_get_selected_region(demo->page, 1.0, POPPLER_SELECTION_GLYPH, &area); +} + +static void pgd_selections_update_selected_text(PgdSelectionsDemo *demo) +{ + gchar *text; + + if (demo->selected_region) { + cairo_region_destroy(demo->selected_region); + } + demo->selected_region = poppler_page_get_selected_region(demo->page, 1.0, demo->style, &demo->doc_area); + if (demo->selected_text) { + g_free(demo->selected_text); + } + demo->selected_text = NULL; + + text = poppler_page_get_selected_text(demo->page, demo->style, &demo->doc_area); + if (text) { + /* For copying text from the document to the clipboard, we want a normalization + * that preserves 'canonical equivalence' i.e. that text after normalization + * is not visually different than the original text. Issue #724 */ + demo->selected_text = g_utf8_normalize(text, -1, G_NORMALIZE_NFC); + g_free(text); + gtk_widget_set_sensitive(demo->copy_button, TRUE); + } +} + +static void pgd_selections_update_cursor(PgdSelectionsDemo *demo, GdkCursorType cursor_type) +{ + GdkWindow *window = gtk_widget_get_window(demo->darea); + GdkCursor *cursor = NULL; + + if (cursor_type == demo->cursor) { + return; + } + + if (cursor_type != GDK_LAST_CURSOR) { + cursor = gdk_cursor_new_for_display(gtk_widget_get_display(demo->darea), cursor_type); + } + + demo->cursor = cursor_type; + + gdk_window_set_cursor(window, cursor); + gdk_display_flush(gtk_widget_get_display(demo->darea)); + if (cursor) { + g_object_unref(cursor); + } +} + +static gboolean pgd_selections_render_selections(PgdSelectionsDemo *demo) +{ + PopplerRectangle doc_area; + gdouble page_width, page_height; + cairo_t *cr; + + if (!demo->page || demo->start.x == -1) { + demo->selections_idle = 0; + + return FALSE; + } + + poppler_page_get_size(demo->page, &page_width, &page_height); + page_width *= demo->scale; + page_height *= demo->scale; + + doc_area.x1 = demo->start.x / demo->scale; + doc_area.y1 = demo->start.y / demo->scale; + doc_area.x2 = demo->stop.x / demo->scale; + doc_area.y2 = demo->stop.y / demo->scale; + + if (demo->selection_surface) { + cairo_surface_destroy(demo->selection_surface); + } + demo->selection_surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, page_width, page_height); + cr = cairo_create(demo->selection_surface); + if (demo->scale != 1.0) { + cairo_scale(cr, demo->scale, demo->scale); + } + poppler_page_render_selection(demo->page, cr, &doc_area, &demo->doc_area, demo->style, &demo->glyph_color, &demo->background_color); + cairo_destroy(cr); + + demo->doc_area = doc_area; + gtk_widget_queue_draw(demo->darea); + + demo->selections_idle = 0; + + return FALSE; +} + +static gboolean pgd_selections_drawing_area_draw(GtkWidget *area, cairo_t *cr, PgdSelectionsDemo *demo) +{ + if (!demo->surface) { + return FALSE; + } + + cairo_save(cr); + cairo_set_source_surface(cr, demo->surface, 0, 0); + cairo_paint(cr); + cairo_restore(cr); + + if (demo->selection_surface) { + cairo_set_source_surface(cr, demo->selection_surface, 0, 0); + cairo_paint(cr); + } + + return TRUE; +} + +static gboolean pgd_selections_drawing_area_button_press(GtkWidget *area, GdkEventButton *event, PgdSelectionsDemo *demo) +{ + if (!demo->page) { + return FALSE; + } + + if (event->button != 1) { + return FALSE; + } + + demo->start.x = event->x; + demo->start.y = event->y; + demo->stop = demo->start; + + switch (event->type) { + case GDK_2BUTTON_PRESS: + demo->style = POPPLER_SELECTION_WORD; + break; + case GDK_3BUTTON_PRESS: + demo->style = POPPLER_SELECTION_LINE; + break; + default: + demo->style = POPPLER_SELECTION_GLYPH; + } + + pgd_selections_render_selections(demo); + + return TRUE; +} + +static gboolean pgd_selections_drawing_area_motion_notify(GtkWidget *area, GdkEventMotion *event, PgdSelectionsDemo *demo) +{ + if (!demo->page) { + return FALSE; + } + + if (demo->start.x != -1) { + demo->stop.x = event->x; + demo->stop.y = event->y; + if (demo->selections_idle == 0) { + demo->selections_idle = g_idle_add((GSourceFunc)pgd_selections_render_selections, demo); + } + } else { + gboolean over_text; + + over_text = cairo_region_contains_point(demo->selection_region, event->x / demo->scale, event->y / demo->scale); + pgd_selections_update_cursor(demo, over_text ? GDK_XTERM : GDK_LAST_CURSOR); + } + + return TRUE; +} + +static gboolean pgd_selections_drawing_area_button_release(GtkWidget *area, GdkEventButton *event, PgdSelectionsDemo *demo) +{ + if (!demo->page) { + return FALSE; + } + + if (event->button != 1) { + return FALSE; + } + + if (demo->start.x != -1) { + pgd_selections_update_selected_text(demo); + } + + demo->start.x = -1; + + if (demo->selections_idle > 0) { + g_source_remove(demo->selections_idle); + demo->selections_idle = 0; + } + + return TRUE; +} + +static void pgd_selections_drawing_area_realize(GtkWidget *area, PgdSelectionsDemo *demo) +{ + GtkStyleContext *style_context = gtk_widget_get_style_context(area); + GdkRGBA rgba; + + gtk_widget_add_events(area, GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); + g_object_set(area, "has-tooltip", TRUE, NULL); + + gtk_style_context_get_color(style_context, GTK_STATE_FLAG_SELECTED, &rgba); + gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(demo->fg_color_button), &rgba); + gtk_style_context_get(style_context, GTK_STATE_FLAG_SELECTED, "background-color", &rgba, NULL); + gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(demo->bg_color_button), &rgba); +} + +static gboolean pgd_selections_drawing_area_query_tooltip(GtkWidget *area, gint x, gint y, gboolean keyboard_mode, GtkTooltip *tooltip, PgdSelectionsDemo *demo) +{ + gboolean over_selection; + + if (!demo->selected_text) { + return FALSE; + } + + over_selection = cairo_region_contains_point(demo->selected_region, x / demo->scale, y / demo->scale); + + if (over_selection) { + GdkRectangle selection_area; + + cairo_region_get_extents(demo->selected_region, (cairo_rectangle_int_t *)&selection_area); + selection_area.x *= demo->scale; + selection_area.y *= demo->scale; + selection_area.width *= demo->scale; + selection_area.height *= demo->scale; + + gtk_tooltip_set_text(tooltip, demo->selected_text); + gtk_tooltip_set_tip_area(tooltip, &selection_area); + + return TRUE; + } + + return FALSE; +} + +static void pgd_selections_render(GtkButton *button, PgdSelectionsDemo *demo) +{ + gdouble page_width, page_height; + cairo_t *cr; + + if (!demo->page) { + demo->page = poppler_document_get_page(demo->doc, demo->page_index); + } + + if (!demo->page) { + return; + } + + pgd_selections_clear_selections(demo); + pgd_selections_update_selection_region(demo); + gtk_widget_set_sensitive(demo->copy_button, FALSE); + + if (demo->surface) { + cairo_surface_destroy(demo->surface); + } + demo->surface = NULL; + + poppler_page_get_size(demo->page, &page_width, &page_height); + page_width *= demo->scale; + page_height *= demo->scale; + + demo->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, page_width, page_height); + cr = cairo_create(demo->surface); + + cairo_save(cr); + + if (demo->scale != 1.0) { + cairo_scale(cr, demo->scale, demo->scale); + } + + poppler_page_render(demo->page, cr); + cairo_restore(cr); + + cairo_set_operator(cr, CAIRO_OPERATOR_DEST_OVER); + cairo_set_source_rgb(cr, 1., 1., 1.); + cairo_paint(cr); + + cairo_destroy(cr); + + gtk_widget_set_size_request(demo->darea, page_width, page_height); + gtk_widget_queue_draw(demo->darea); +} + +static void pgd_selections_copy(GtkButton *button, PgdSelectionsDemo *demo) +{ + GtkClipboard *clipboard = gtk_clipboard_get_for_display(gdk_display_get_default(), GDK_SELECTION_CLIPBOARD); + gtk_clipboard_set_text(clipboard, demo->selected_text, -1); +} + +static void pgd_selections_page_selector_value_changed(GtkSpinButton *spinbutton, PgdSelectionsDemo *demo) +{ + demo->page_index = (gint)gtk_spin_button_get_value(spinbutton) - 1; + if (demo->page) { + g_object_unref(demo->page); + } + demo->page = NULL; +} + +static void pgd_selections_scale_selector_value_changed(GtkSpinButton *spinbutton, PgdSelectionsDemo *demo) +{ + demo->scale = gtk_spin_button_get_value(spinbutton); +} + +static void pgd_selections_fg_color_changed(GtkColorButton *button, GParamSpec *pspec, PgdSelectionsDemo *demo) +{ + GdkRGBA color; + + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(button), &color); + demo->glyph_color.red = CLAMP((guint)(color.red * 65535), 0, 65535); + demo->glyph_color.green = CLAMP((guint)(color.green * 65535), 0, 65535); + demo->glyph_color.blue = CLAMP((guint)(color.blue * 65535), 0, 65535); +} + +static void pgd_selections_bg_color_changed(GtkColorButton *button, GParamSpec *pspec, PgdSelectionsDemo *demo) +{ + GdkRGBA color; + + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(button), &color); + demo->background_color.red = CLAMP((guint)(color.red * 65535), 0, 65535); + demo->background_color.green = CLAMP((guint)(color.green * 65535), 0, 65535); + demo->background_color.blue = CLAMP((guint)(color.blue * 65535), 0, 65535); +} + +GtkWidget *pgd_selections_properties_selector_create(PgdSelectionsDemo *demo) +{ + GtkWidget *hbox, *vbox; + GtkWidget *label; + GtkWidget *page_hbox, *page_selector; + GtkWidget *scale_hbox, *scale_selector; + GtkWidget *rotate_hbox, *rotate_selector; + GtkWidget *color_hbox; + GtkWidget *button; + gint n_pages; + gchar *str; + + n_pages = poppler_document_get_n_pages(demo->doc); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12); + gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); + gtk_widget_show(hbox); + + page_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Page:"); + gtk_box_pack_start(GTK_BOX(page_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + page_selector = gtk_spin_button_new_with_range(1, n_pages, 1); + g_signal_connect(G_OBJECT(page_selector), "value-changed", G_CALLBACK(pgd_selections_page_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(page_hbox), page_selector, TRUE, TRUE, 0); + gtk_widget_show(page_selector); + + str = g_strdup_printf("of %d", n_pages); + label = gtk_label_new(str); + gtk_box_pack_start(GTK_BOX(page_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + g_free(str); + + gtk_box_pack_start(GTK_BOX(hbox), page_hbox, FALSE, TRUE, 0); + gtk_widget_show(page_hbox); + + scale_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Scale:"); + gtk_box_pack_start(GTK_BOX(scale_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + scale_selector = gtk_spin_button_new_with_range(0, 10.0, 0.1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(scale_selector), 1.0); + g_signal_connect(G_OBJECT(scale_selector), "value-changed", G_CALLBACK(pgd_selections_scale_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(scale_hbox), scale_selector, TRUE, TRUE, 0); + gtk_widget_show(scale_selector); + + gtk_box_pack_start(GTK_BOX(hbox), scale_hbox, FALSE, TRUE, 0); + gtk_widget_show(scale_hbox); + + rotate_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Rotate:"); + gtk_box_pack_start(GTK_BOX(rotate_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + rotate_selector = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(rotate_selector), "0"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(rotate_selector), "90"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(rotate_selector), "180"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(rotate_selector), "270"); + gtk_combo_box_set_active(GTK_COMBO_BOX(rotate_selector), 0); +#if 0 + g_signal_connect (G_OBJECT (rotate_selector), "changed", + G_CALLBACK (pgd_selections_rotate_selector_changed), + (gpointer)demo); +#endif + gtk_box_pack_start(GTK_BOX(rotate_hbox), rotate_selector, TRUE, TRUE, 0); + gtk_widget_show(rotate_selector); + + gtk_box_pack_start(GTK_BOX(hbox), rotate_hbox, FALSE, TRUE, 0); + gtk_widget_show(rotate_hbox); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12); + gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); + gtk_widget_show(hbox); + + color_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Foreground Color:"); + gtk_box_pack_start(GTK_BOX(color_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + demo->fg_color_button = gtk_color_button_new(); + g_signal_connect(demo->fg_color_button, "notify::color", G_CALLBACK(pgd_selections_fg_color_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(color_hbox), demo->fg_color_button, TRUE, TRUE, 0); + gtk_widget_show(demo->fg_color_button); + + gtk_box_pack_start(GTK_BOX(hbox), color_hbox, FALSE, TRUE, 0); + gtk_widget_show(color_hbox); + + color_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Background Color:"); + gtk_box_pack_start(GTK_BOX(color_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + demo->bg_color_button = gtk_color_button_new(); + g_signal_connect(demo->bg_color_button, "notify::color", G_CALLBACK(pgd_selections_bg_color_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(color_hbox), demo->bg_color_button, TRUE, TRUE, 0); + gtk_widget_show(demo->bg_color_button); + + gtk_box_pack_start(GTK_BOX(hbox), color_hbox, FALSE, TRUE, 0); + gtk_widget_show(color_hbox); + + demo->copy_button = gtk_button_new_with_label("Copy"); + g_signal_connect(G_OBJECT(demo->copy_button), "clicked", G_CALLBACK(pgd_selections_copy), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), demo->copy_button, FALSE, TRUE, 0); + gtk_widget_set_sensitive(demo->copy_button, FALSE); + gtk_widget_show(demo->copy_button); + + button = gtk_button_new_with_label("Render"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_selections_render), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, TRUE, 0); + gtk_widget_show(button); + + return vbox; +} + +GtkWidget *pgd_selections_create_widget(PopplerDocument *document) +{ + PgdSelectionsDemo *demo; + GtkWidget *vbox, *hbox; + + demo = g_new0(PgdSelectionsDemo, 1); + + demo->doc = g_object_ref(document); + demo->scale = 1.0; + demo->cursor = GDK_LAST_CURSOR; + + pgd_selections_clear_selections(demo); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); + + hbox = pgd_selections_properties_selector_create(demo); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 6); + gtk_widget_show(hbox); + + demo->darea = gtk_drawing_area_new(); + g_signal_connect(demo->darea, "realize", G_CALLBACK(pgd_selections_drawing_area_realize), (gpointer)demo); + g_signal_connect(demo->darea, "draw", G_CALLBACK(pgd_selections_drawing_area_draw), (gpointer)demo); + g_signal_connect(demo->darea, "button_press_event", G_CALLBACK(pgd_selections_drawing_area_button_press), (gpointer)demo); + g_signal_connect(demo->darea, "motion_notify_event", G_CALLBACK(pgd_selections_drawing_area_motion_notify), (gpointer)demo); + g_signal_connect(demo->darea, "button_release_event", G_CALLBACK(pgd_selections_drawing_area_button_release), (gpointer)demo); + g_signal_connect(demo->darea, "query_tooltip", G_CALLBACK(pgd_selections_drawing_area_query_tooltip), (gpointer)demo); + demo->swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(demo->swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +#if GTK_CHECK_VERSION(3, 7, 8) + gtk_container_add(GTK_CONTAINER(demo->swindow), demo->darea); +#else + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(demo->swindow), demo->darea); +#endif + gtk_widget_show(demo->darea); + + gtk_box_pack_start(GTK_BOX(vbox), demo->swindow, TRUE, TRUE, 0); + gtk_widget_show(demo->swindow); + + g_object_weak_ref(G_OBJECT(demo->swindow), (GWeakNotify)pgd_selections_free, (gpointer)demo); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/selections.h b/poppler-24.05.0/glib/demo/selections.h new file mode 100644 index 0000000000000000000000000000000000000000..49ee4178904e2cdacf8bd4c4322597d51b100384 --- /dev/null +++ b/poppler-24.05.0/glib/demo/selections.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2010 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _SELECTIONS_H_ +# define _SELECTIONS_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_selections_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _SELECTIONS_H_ */ diff --git a/poppler-24.05.0/glib/demo/signature.c b/poppler-24.05.0/glib/demo/signature.c new file mode 100644 index 0000000000000000000000000000000000000000..c73ca849c474eae8b27b4e940ac2a6b556ca7975 --- /dev/null +++ b/poppler-24.05.0/glib/demo/signature.c @@ -0,0 +1,440 @@ +/* + * Copyright (C) 2022-2023 Jan-Michael Brummer <jan.brummer@tabos.org> + * + * 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 <gtk/gtk.h> +#include <string.h> + +#include "signature.h" +#include "utils.h" + +typedef struct +{ + PopplerDocument *doc; + PopplerPage *page; + GtkWidget *darea; + cairo_surface_t *surface; + gint num_page; + gint redraw_idle; + GdkPoint start; + GdkPoint stop; + gboolean started; + GdkCursorType cursor; + GtkWidget *main_box; + gdouble scale; +} PgdSignatureDemo; + +/* Render area */ +static cairo_surface_t *pgd_signature_render_page(PgdSignatureDemo *demo) +{ + cairo_t *cr; + PopplerPage *page; + gdouble width, height; + cairo_surface_t *surface = NULL; + + page = poppler_document_get_page(demo->doc, demo->num_page); + if (!page) { + return NULL; + } + + poppler_page_get_size(page, &width, &height); + + width *= demo->scale; + height *= demo->scale; + gtk_widget_set_size_request(demo->darea, width, height); + + surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, width, height); + cr = cairo_create(surface); + + if (demo->scale != 1.0) { + cairo_scale(cr, demo->scale, demo->scale); + } + + cairo_save(cr); + cairo_set_source_rgb(cr, 1, 1, 1); + + cairo_rectangle(cr, 0, 0, width, height); + cairo_fill(cr); + cairo_restore(cr); + + cairo_save(cr); + poppler_page_render(page, cr); + cairo_restore(cr); + + cairo_destroy(cr); + g_object_unref(page); + + return surface; +} + +static void draw_selection_rect(PgdSignatureDemo *demo, cairo_t *cr) +{ + gint pos_x1, pos_x2, pos_y1, pos_y2; + gint x, y, w, h; + + pos_x1 = demo->start.x; + pos_y1 = demo->start.y; + pos_x2 = demo->stop.x; + pos_y2 = demo->stop.y; + + x = MIN(pos_x1, pos_x2); + y = MIN(pos_y1, pos_y2); + w = ABS(pos_x1 - pos_x2); + h = ABS(pos_y1 - pos_y2); + + if (w <= 0 || h <= 0) { + return; + } + + cairo_save(cr); + + cairo_rectangle(cr, x + 1, y + 1, w - 2, h - 2); + cairo_set_source_rgba(cr, 0.2, 0.6, 0.8, 0.2); + cairo_fill(cr); + + cairo_rectangle(cr, x + 0.5, y + 0.5, w - 1, h - 1); + cairo_set_source_rgba(cr, 0.2, 0.6, 0.8, 0.35); + cairo_set_line_width(cr, 1); + cairo_stroke(cr); + + cairo_restore(cr); +} + +static gboolean pgd_signature_view_drawing_area_draw(GtkWidget *area, cairo_t *cr, PgdSignatureDemo *demo) +{ + if (demo->num_page == -1) { + return FALSE; + } + + if (!demo->surface) { + demo->surface = pgd_signature_render_page(demo); + if (!demo->surface) { + return FALSE; + } + } + + cairo_set_source_surface(cr, demo->surface, 0, 0); + cairo_paint(cr); + + if (demo->started) { + draw_selection_rect(demo, cr); + } + + return TRUE; +} + +static gboolean pgd_signature_viewer_redraw(PgdSignatureDemo *demo) +{ + cairo_surface_destroy(demo->surface); + demo->surface = NULL; + + gtk_widget_queue_draw(demo->darea); + + demo->redraw_idle = 0; + + return FALSE; +} + +static void pgd_signature_viewer_queue_redraw(PgdSignatureDemo *demo) +{ + if (demo->redraw_idle == 0) { + demo->redraw_idle = g_idle_add((GSourceFunc)pgd_signature_viewer_redraw, demo); + } +} + +static void pgd_signature_page_selector_value_changed(GtkSpinButton *spinbutton, PgdSignatureDemo *demo) +{ + demo->num_page = (gint)gtk_spin_button_get_value(spinbutton) - 1; + pgd_signature_viewer_queue_redraw(demo); + + demo->page = poppler_document_get_page(demo->doc, demo->num_page); +} + +static void pgd_signature_drawing_area_realize(GtkWidget *area, PgdSignatureDemo *demo) +{ + gtk_widget_add_events(area, GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); +} + +char *password_callback(const char *in) +{ + GtkWidget *dialog; + GtkWidget *box; + GtkWidget *entry; + char *ret; + + dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, "Enter password"); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "Enter password to open: %s", in); + gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); + + box = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog)); + entry = gtk_entry_new(); + gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE); + gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); + gtk_box_pack_end(GTK_BOX(box), entry, TRUE, TRUE, 6); + gtk_widget_show_all(box); + + gtk_dialog_run(GTK_DIALOG(dialog)); + ret = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry))); + gtk_widget_destroy(dialog); + + return ret; +} + +static void pgd_signature_update_cursor(PgdSignatureDemo *demo, GdkCursorType cursor_type) +{ + GdkCursor *cursor = NULL; + + if (cursor_type == demo->cursor) { + return; + } + + if (cursor_type != GDK_LAST_CURSOR) { + cursor = gdk_cursor_new_for_display(gtk_widget_get_display(demo->main_box), cursor_type); + } + + demo->cursor = cursor_type; + + gdk_window_set_cursor(gtk_widget_get_window(demo->main_box), cursor); + gdk_display_flush(gtk_widget_get_display(demo->main_box)); + if (cursor) { + g_object_unref(cursor); + } +} + +static void pgd_signature_start_signing(GtkWidget *button, PgdSignatureDemo *demo) +{ + demo->start.x = 0; + demo->start.y = 0; + demo->stop.x = 0; + demo->stop.y = 0; + demo->started = TRUE; + pgd_signature_update_cursor(demo, GDK_TCROSS); +} + +static gboolean pgd_signature_drawing_area_button_press(GtkWidget *area, GdkEventButton *event, PgdSignatureDemo *demo) +{ + if (!demo->page || event->button != 1 || !demo->started) { + return FALSE; + } + + demo->start.x = event->x; + demo->start.y = event->y; + demo->stop = demo->start; + + pgd_signature_viewer_queue_redraw(demo); + + return TRUE; +} + +static gboolean pgd_signature_drawing_area_motion_notify(GtkWidget *area, GdkEventMotion *event, PgdSignatureDemo *demo) +{ + gdouble width, height; + + if (!demo->page || demo->start.x == -1 || !demo->started) { + return FALSE; + } + + demo->stop.x = event->x; + demo->stop.y = event->y; + + poppler_page_get_size(demo->page, &width, &height); + width *= demo->scale; + height *= demo->scale; + + /* Keep the drawing within the page */ + demo->stop.x = CLAMP(demo->stop.x, 0, width); + demo->stop.y = CLAMP(demo->stop.y, 0, height); + + pgd_signature_viewer_queue_redraw(demo); + + return TRUE; +} + +static void on_signing_done(GObject *source, GAsyncResult *result, gpointer user_data) +{ + PopplerDocument *document = POPPLER_DOCUMENT(source); + GError *error = NULL; + gboolean ret = poppler_document_sign_finish(document, result, &error); + + g_print("%s: result %d\n", __FUNCTION__, ret); + if (error) { + g_print("Error: %s", error->message); + g_error_free(error); + } +} + +static gboolean pgd_signature_drawing_area_button_release(GtkWidget *area, GdkEventButton *event, PgdSignatureDemo *demo) +{ + if (!demo->page || event->button != 1 || !demo->started) { + return FALSE; + } + + demo->started = FALSE; + pgd_signature_update_cursor(demo, GDK_LAST_CURSOR); + + /* poppler_certificate_set_nss_dir ("./glib/demo/cert"); */ + poppler_set_nss_password_callback(password_callback); + GList *available_certificates = poppler_get_available_signing_certificates(); + + if (available_certificates) { + char *signature; + char *signature_left; + PopplerSigningData *data = poppler_signing_data_new(); + PopplerRectangle rect; + PopplerCertificateInfo *certificate_info; + time_t t; + double width, height; + + certificate_info = available_certificates->data; + time(&t); + + poppler_signing_data_set_certificate_info(data, certificate_info); + poppler_signing_data_set_page(data, demo->num_page); + poppler_signing_data_set_field_partial_name(data, g_uuid_string_random()); + poppler_signing_data_set_destination_filename(data, "test.pdf"); + poppler_signing_data_set_reason(data, "I'm the author"); + poppler_signing_data_set_location(data, "At my desk"); + + poppler_page_get_size(demo->page, &width, &height); + + rect.x1 = demo->start.x > demo->stop.x ? demo->stop.x : demo->start.x; + rect.y1 = demo->start.y > demo->stop.y ? demo->stop.y : demo->start.y; + rect.x2 = demo->start.x > demo->stop.x ? demo->start.x : demo->stop.x; + rect.y2 = demo->start.y > demo->stop.y ? demo->start.y : demo->stop.y; + + /* Adjust scale */ + rect.x1 /= demo->scale; + rect.y1 /= demo->scale; + rect.x2 /= demo->scale; + rect.y2 /= demo->scale; + + rect.y1 = height - rect.y1; + rect.y2 = height - rect.y2; + + poppler_signing_data_set_signature_rectangle(data, &rect); + + signature = g_strdup_printf("Digitally signed by %s\nDate: %s", poppler_certificate_info_get_subject_common_name(certificate_info), ctime(&t)); + poppler_signing_data_set_signature_text(data, signature); + g_free(signature); + + signature_left = g_strdup_printf("%s", poppler_certificate_info_get_subject_common_name(certificate_info)); + poppler_signing_data_set_signature_text_left(data, signature_left); + g_free(signature_left); + + poppler_document_sign(demo->doc, data, NULL, on_signing_done, NULL); + } + + return TRUE; +} + +static void pgd_signature_scale_selector_value_changed(GtkSpinButton *spinbutton, PgdSignatureDemo *demo) +{ + demo->scale = gtk_spin_button_get_value(spinbutton); + pgd_signature_viewer_queue_redraw(demo); +} + +/* Main UI */ +GtkWidget *pgd_signature_create_widget(PopplerDocument *document) +{ + PgdSignatureDemo *demo; + GtkWidget *label; + GtkWidget *vbox; + GtkWidget *button; + GtkWidget *hbox, *page_selector; + GtkWidget *scale_hbox, *scale_selector; + GtkWidget *swindow; + gchar *str; + gint n_pages; + + demo = g_new0(PgdSignatureDemo, 1); + demo->cursor = GDK_LAST_CURSOR; + demo->doc = g_object_ref(document); + demo->scale = 1.0; + + n_pages = poppler_document_get_n_pages(document); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Page:"); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + + page_selector = gtk_spin_button_new_with_range(1, n_pages, 1); + g_signal_connect(G_OBJECT(page_selector), "value-changed", G_CALLBACK(pgd_signature_page_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(hbox), page_selector, FALSE, TRUE, 0); + gtk_widget_show(page_selector); + + str = g_strdup_printf("of %d", n_pages); + label = gtk_label_new(str); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + g_free(str); + + scale_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Scale:"); + gtk_box_pack_start(GTK_BOX(scale_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + scale_selector = gtk_spin_button_new_with_range(0, 10.0, 0.1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(scale_selector), 1.0); + g_signal_connect(G_OBJECT(scale_selector), "value-changed", G_CALLBACK(pgd_signature_scale_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(scale_hbox), scale_selector, TRUE, TRUE, 0); + gtk_widget_show(scale_selector); + + gtk_box_pack_start(GTK_BOX(hbox), scale_hbox, FALSE, TRUE, 0); + gtk_widget_show(scale_hbox); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + + button = gtk_button_new_with_mnemonic("_Sign"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_signature_start_signing), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + gtk_widget_show(hbox); + + /* Demo Area (Render) */ + demo->darea = gtk_drawing_area_new(); + g_signal_connect(demo->darea, "draw", G_CALLBACK(pgd_signature_view_drawing_area_draw), demo); + g_signal_connect(demo->darea, "realize", G_CALLBACK(pgd_signature_drawing_area_realize), (gpointer)demo); + g_signal_connect(demo->darea, "button_press_event", G_CALLBACK(pgd_signature_drawing_area_button_press), (gpointer)demo); + g_signal_connect(demo->darea, "motion_notify_event", G_CALLBACK(pgd_signature_drawing_area_motion_notify), (gpointer)demo); + g_signal_connect(demo->darea, "button_release_event", G_CALLBACK(pgd_signature_drawing_area_button_release), (gpointer)demo); + + swindow = gtk_scrolled_window_new(NULL, NULL); +#if GTK_CHECK_VERSION(3, 7, 8) + gtk_container_add(GTK_CONTAINER(swindow), demo->darea); +#else + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swindow), demo->darea); +#endif + gtk_widget_show(demo->darea); + + gtk_widget_show(swindow); + + gtk_box_pack_start(GTK_BOX(vbox), swindow, TRUE, TRUE, 0); + + demo->main_box = vbox; + + demo->num_page = 0; + demo->page = poppler_document_get_page(demo->doc, demo->num_page); + pgd_signature_viewer_queue_redraw(demo); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/signature.h b/poppler-24.05.0/glib/demo/signature.h new file mode 100644 index 0000000000000000000000000000000000000000..cbdf7f439f2d685861d317ad2a62e1d298b4ce3d --- /dev/null +++ b/poppler-24.05.0/glib/demo/signature.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2022 Jan-Michael Brummer <jan.brummer@tabos.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _SIGNATURE_H_ +# define _SIGNATURE_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_signature_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _SIGNATURE_H_ */ diff --git a/poppler-24.05.0/glib/demo/taggedstruct.c b/poppler-24.05.0/glib/demo/taggedstruct.c new file mode 100644 index 0000000000000000000000000000000000000000..8468a0db708377bba0daadfd1bef87e0fcd8baf7 --- /dev/null +++ b/poppler-24.05.0/glib/demo/taggedstruct.c @@ -0,0 +1,204 @@ +/* + * Copyright (C) 2013 Igalia S.L. + * + * 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 <string.h> + +#include "text.h" +#include "utils.h" + +typedef struct +{ + GtkWidget *view; + GtkTreeStore *store; + GtkWidget *type_value; + GtkWidget *lang_value; + GtkWidget *abbr_value; + GtkWidget *id_value; + GtkWidget *title_value; + GtkTextBuffer *text_buffer; +} PgdTaggedStructDemo; + +static void pgd_taggedstruct_free(PgdTaggedStructDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->store) { + g_object_unref(demo->store); + demo->store = NULL; + } + + g_free(demo); +} + +static void populate_store_aux(GtkTreeStore *store, GtkTreeIter *parent, PopplerStructureElementIter *iter) +{ + do { + PopplerStructureElementIter *child = poppler_structure_element_iter_get_child(iter); + PopplerStructureElement *element = poppler_structure_element_iter_get_element(iter); + GEnumClass *enum_class = G_ENUM_CLASS(g_type_class_ref(POPPLER_TYPE_STRUCTURE_ELEMENT_KIND)); + GEnumValue *enum_value = g_enum_get_value(enum_class, poppler_structure_element_get_kind(element)); + GtkTreeIter pos; + + gtk_tree_store_append(store, &pos, parent); + gtk_tree_store_set(store, &pos, 0, enum_value->value_nick, 1, element, -1); + + if (child) { + populate_store_aux(store, &pos, child); + poppler_structure_element_iter_free(child); + } + } while (poppler_structure_element_iter_next(iter)); +} + +static GtkTreeStore *populate_store(PopplerStructureElementIter *iter) +{ + GtkTreeStore *store = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); + + if (iter) { + populate_store_aux(store, NULL, iter); + } else { + GtkTreeIter pos; + + gtk_tree_store_append(store, &pos, NULL); + gtk_tree_store_set(store, &pos, 0, "<b>Not a Tagged-PDF</b>", 1, NULL, -1); + } + + return store; +} + +/*static void +pgd_row_activated (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, PgdTaggedStructDemo *demo) +{*/ +static void pgd_selection_changed(GtkTreeSelection *selection, PgdTaggedStructDemo *demo) +{ + GtkTreeModel *model; + PopplerStructureElement *element; + GtkTreeIter iter; + gpointer elementptr; + + if (!gtk_tree_selection_get_selected(selection, &model, &iter)) { + return; + } + + gtk_tree_model_get(model, &iter, 1, &elementptr, -1); + element = POPPLER_STRUCTURE_ELEMENT(elementptr); + + gtk_label_set_text(GTK_LABEL(demo->id_value), poppler_structure_element_get_id(element)); + gtk_label_set_text(GTK_LABEL(demo->title_value), poppler_structure_element_get_title(element)); + gtk_label_set_text(GTK_LABEL(demo->lang_value), poppler_structure_element_get_language(element)); + gtk_label_set_text(GTK_LABEL(demo->abbr_value), poppler_structure_element_get_abbreviation(element)); + gtk_text_buffer_set_text(demo->text_buffer, "", -1); + + if (poppler_structure_element_is_content(element)) { + const gchar *text = poppler_structure_element_get_text(element, FALSE); + + if (text) { + gtk_text_buffer_set_text(demo->text_buffer, text, -1); + } + gtk_label_set_text(GTK_LABEL(demo->type_value), "Content"); + } else { + if (poppler_structure_element_is_inline(element)) { + gtk_label_set_text(GTK_LABEL(demo->type_value), "Inline"); + } else if (poppler_structure_element_is_block(element)) { + gtk_label_set_text(GTK_LABEL(demo->type_value), "Block"); + } else { + gtk_label_set_text(GTK_LABEL(demo->type_value), "Structure"); + } + } +} + +GtkWidget *pgd_taggedstruct_create_widget(PopplerDocument *document) +{ + PopplerStructureElementIter *iter; + PgdTaggedStructDemo *demo; + GtkCellRenderer *renderer; + GtkTreeSelection *selection; + GtkWidget *hbox; + GtkWidget *vbox; + GtkWidget *grid; + GtkWidget *scroll; + GtkWidget *w; + gint row; + + demo = g_new0(PgdTaggedStructDemo, 1); + + iter = poppler_structure_element_iter_new(document); + demo->store = populate_store(iter); + poppler_structure_element_iter_free(iter); + + demo->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(demo->store)); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(demo->view), 0, "Type", renderer, "markup", 0, NULL); + g_object_set(G_OBJECT(gtk_tree_view_get_column(GTK_TREE_VIEW(demo->view), 0)), "expand", TRUE, NULL); + + gtk_tree_view_expand_all(GTK_TREE_VIEW(demo->view)); + gtk_tree_view_set_show_expanders(GTK_TREE_VIEW(demo->view), TRUE); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(demo->view), TRUE); + gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(demo->view), FALSE); + gtk_tree_view_set_activate_on_single_click(GTK_TREE_VIEW(demo->view), TRUE); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + scroll = gtk_scrolled_window_new(NULL, NULL); + gtk_container_add(GTK_CONTAINER(scroll), demo->view); + gtk_widget_show(demo->view); + gtk_box_pack_start(GTK_BOX(hbox), scroll, TRUE, TRUE, 0); + gtk_widget_show(scroll); + + row = 0; + grid = gtk_grid_new(); + gtk_container_set_border_width(GTK_CONTAINER(grid), 12); + gtk_grid_set_row_homogeneous(GTK_GRID(grid), FALSE); + gtk_grid_set_column_spacing(GTK_GRID(grid), 6); + gtk_grid_set_row_spacing(GTK_GRID(grid), 6); + pgd_table_add_property_with_value_widget(GTK_GRID(grid), "<b>Type:</b>", &demo->type_value, NULL, &row); + pgd_table_add_property_with_value_widget(GTK_GRID(grid), "<b>ID:</b>", &demo->id_value, NULL, &row); + pgd_table_add_property_with_value_widget(GTK_GRID(grid), "<b>Title:</b>", &demo->title_value, NULL, &row); + pgd_table_add_property_with_value_widget(GTK_GRID(grid), "<b>Language:</b>", &demo->lang_value, NULL, &row); + pgd_table_add_property_with_value_widget(GTK_GRID(grid), "<b>Abbreviation:</b>", &demo->abbr_value, NULL, &row); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6); + gtk_box_pack_start(GTK_BOX(vbox), grid, FALSE, FALSE, 0); + gtk_widget_show(grid); + + scroll = gtk_scrolled_window_new(NULL, NULL); + gtk_container_set_border_width(GTK_CONTAINER(scroll), 12); + gtk_box_pack_end(GTK_BOX(vbox), scroll, TRUE, TRUE, 0); + gtk_widget_show(scroll); + + gtk_container_add(GTK_CONTAINER(scroll), (w = gtk_text_view_new())); + gtk_widget_show(w); + + demo->text_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(w)); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(w), GTK_WRAP_WORD_CHAR); + gtk_text_view_set_editable(GTK_TEXT_VIEW(w), FALSE); + gtk_text_buffer_set_text(demo->text_buffer, "", -1); + gtk_widget_show(w); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(demo->view)); + g_signal_connect(selection, "changed", G_CALLBACK(pgd_selection_changed), demo); + + gtk_box_pack_end(GTK_BOX(hbox), vbox, TRUE, TRUE, 0); + gtk_widget_show(vbox); + + g_object_weak_ref(G_OBJECT(hbox), (GWeakNotify)pgd_taggedstruct_free, demo); + + gtk_widget_show(hbox); + return hbox; +} diff --git a/poppler-24.05.0/glib/demo/taggedstruct.h b/poppler-24.05.0/glib/demo/taggedstruct.h new file mode 100644 index 0000000000000000000000000000000000000000..c67c905547d47a5675e3d646fc8f1c90988d18ce --- /dev/null +++ b/poppler-24.05.0/glib/demo/taggedstruct.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2013 Igalia S.L. + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _TAGGEDSTRUCT_H_ +# define _TAGGEDSTRUCT_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_taggedstruct_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _TAGGEDSTRUCT_H_ */ diff --git a/poppler-24.05.0/glib/demo/text.c b/poppler-24.05.0/glib/demo/text.c new file mode 100644 index 0000000000000000000000000000000000000000..4b1669d24f2cbfc5c99e3b48d18f638ad7d7e89d --- /dev/null +++ b/poppler-24.05.0/glib/demo/text.c @@ -0,0 +1,497 @@ +/* + * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <string.h> + +#include "text.h" +#include "utils.h" + +enum +{ + TEXT_X1_COLUMN, + TEXT_Y1_COLUMN, + TEXT_X2_COLUMN, + TEXT_Y2_COLUMN, + TEXT_OFFSET_COLUMN, + TEXT_OFFPTR_COLUMN, + N_COLUMNS +}; + +typedef struct +{ + PopplerDocument *doc; + + GtkWidget *timer_label; + GtkTextBuffer *buffer; + GtkWidget *treeview; + GtkListStore *model; + GtkWidget *area_x1; + GtkWidget *area_y1; + GtkWidget *area_x2; + GtkWidget *area_y2; + + /* Text attributes */ + GList *text_attrs; + GtkWidget *font_name; + GtkWidget *font_size; + GtkWidget *is_underlined; + GtkWidget *text_color; + + gint page; + PopplerRectangle area; +} PgdTextDemo; + +static void pgd_text_free(PgdTextDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + if (demo->buffer) { + g_object_unref(demo->buffer); + demo->buffer = NULL; + } + + if (demo->text_attrs) { + poppler_page_free_text_attributes(demo->text_attrs); + demo->text_attrs = NULL; + } + + if (demo->model) { + g_object_unref(demo->model); + demo->model = NULL; + } + + g_free(demo); +} + +static void pgd_text_get_text(GtkWidget *button, PgdTextDemo *demo) +{ + PopplerPage *page; + PopplerRectangle *recs = NULL; + guint n_recs; + gchar *text; + GTimer *timer; + gint i; + + page = poppler_document_get_page(demo->doc, demo->page); + if (!page) { + return; + } + + gtk_list_store_clear(demo->model); + if (demo->text_attrs) { + poppler_page_free_text_attributes(demo->text_attrs); + } + demo->text_attrs = NULL; + + timer = g_timer_new(); + text = poppler_page_get_text_for_area(page, &demo->area); + g_timer_stop(timer); + + if (text) { + gchar *str; + gdouble text_elapsed, layout_elapsed; + + text_elapsed = g_timer_elapsed(timer, NULL); + + g_timer_start(timer); + poppler_page_get_text_layout_for_area(page, &demo->area, &recs, &n_recs); + g_timer_stop(timer); + + layout_elapsed = g_timer_elapsed(timer, NULL); + + g_timer_start(timer); + demo->text_attrs = poppler_page_get_text_attributes_for_area(page, &demo->area); + g_timer_stop(timer); + + str = g_strdup_printf("<i>got %ld chars in %.4f seconds, %u layout units in %.4f seconds, text attrs in %.4f seconds</i>", g_utf8_strlen(text, -1), text_elapsed, n_recs, layout_elapsed, g_timer_elapsed(timer, NULL)); + gtk_label_set_markup(GTK_LABEL(demo->timer_label), str); + g_free(str); + } else { + gtk_label_set_markup(GTK_LABEL(demo->timer_label), "<i>No text found</i>"); + n_recs = 0; + } + + g_timer_destroy(timer); + g_object_unref(page); + + if (text) { + gtk_text_buffer_set_text(demo->buffer, text, strlen(text)); + g_free(text); + } + + for (i = 0; i < n_recs; i++) { + GtkTreeIter iter; + gchar *x1, *y1, *x2, *y2; + gchar *offset; + + x1 = g_strdup_printf("%.2f", recs[i].x1); + y1 = g_strdup_printf("%.2f", recs[i].y1); + x2 = g_strdup_printf("%.2f", recs[i].x2); + y2 = g_strdup_printf("%.2f", recs[i].y2); + + offset = g_strdup_printf("%d", i); + + gtk_list_store_append(demo->model, &iter); + gtk_list_store_set(demo->model, &iter, TEXT_X1_COLUMN, x1, TEXT_Y1_COLUMN, y1, TEXT_X2_COLUMN, x2, TEXT_Y2_COLUMN, y2, TEXT_OFFSET_COLUMN, offset, TEXT_OFFPTR_COLUMN, GINT_TO_POINTER(i), -1); + + g_free(x1); + g_free(y1); + g_free(x2); + g_free(y2); + g_free(offset); + } + + g_free(recs); +} + +static void pgd_text_set_text_attrs_for_offset(PgdTextDemo *demo, gint offset) +{ + GList *l; + + for (l = demo->text_attrs; l; l = g_list_next(l)) { + PopplerTextAttributes *attrs = (PopplerTextAttributes *)l->data; + + if (offset >= attrs->start_index && offset <= attrs->end_index) { + gchar *str; + GdkPixbuf *pixbuf; + + gtk_label_set_text(GTK_LABEL(demo->font_name), attrs->font_name); + + str = g_strdup_printf("%.2f", attrs->font_size); + gtk_label_set_text(GTK_LABEL(demo->font_size), str); + g_free(str); + + gtk_label_set_text(GTK_LABEL(demo->is_underlined), attrs->is_underlined ? "Yes" : "No"); + + pixbuf = pgd_pixbuf_new_for_color(&(attrs->color)); + gtk_image_set_from_pixbuf(GTK_IMAGE(demo->text_color), pixbuf); + g_object_unref(pixbuf); + } + } +} + +static void pgd_text_selection_changed(GtkTreeSelection *treeselection, PgdTextDemo *demo) +{ + GtkTreeModel *model; + GtkTreeIter iter; + + if (gtk_tree_selection_get_selected(treeselection, &model, &iter)) { + gpointer offset; + GtkTextIter begin_iter, end_iter; + + gtk_tree_model_get(model, &iter, TEXT_OFFPTR_COLUMN, &offset, -1); + + gtk_text_buffer_get_iter_at_offset(demo->buffer, &begin_iter, GPOINTER_TO_INT(offset)); + end_iter = begin_iter; + gtk_text_iter_forward_char(&end_iter); + gtk_text_buffer_select_range(demo->buffer, &begin_iter, &end_iter); + + pgd_text_set_text_attrs_for_offset(demo, GPOINTER_TO_INT(offset)); + } +} + +static void pgd_text_buffer_selection_changed(GtkTextBuffer *buffer, GParamSpec *pspec, GtkWidget *textview) +{ + gtk_widget_set_has_tooltip(textview, gtk_text_buffer_get_has_selection(buffer)); +} + +static gboolean pgd_text_view_query_tooltip(GtkTextView *textview, gint x, gint y, gboolean keyboard_tip, GtkTooltip *tooltip, PgdTextDemo *demo) +{ + GtkTreeModel *model; + GtkTreeIter iter; + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(demo->treeview)); + + if (gtk_tree_selection_get_selected(selection, &model, &iter)) { + PopplerPage *page; + gchar *x1, *y1, *x2, *y2; + PopplerRectangle rect; + gchar *text; + + gtk_tree_model_get(model, &iter, TEXT_X1_COLUMN, &x1, TEXT_Y1_COLUMN, &y1, TEXT_X2_COLUMN, &x2, TEXT_Y2_COLUMN, &y2, -1); + + rect.x1 = g_strtod(x1, NULL); + rect.y1 = g_strtod(y1, NULL); + rect.x2 = g_strtod(x2, NULL); + rect.y2 = g_strtod(y2, NULL); + + g_free(x1); + g_free(y1); + g_free(x2); + g_free(y2); + + page = poppler_document_get_page(demo->doc, demo->page); + text = poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH, &rect); + gtk_tooltip_set_text(tooltip, text); + g_free(text); + g_object_unref(page); + return TRUE; + } else { + return FALSE; + } +} + +static void pgd_text_area_selector_setup(PgdTextDemo *demo) +{ + PopplerPage *page; + gdouble width, height; + + page = poppler_document_get_page(demo->doc, demo->page); + if (!page) { + return; + } + + poppler_page_get_size(page, &width, &height); + + gtk_spin_button_set_range(GTK_SPIN_BUTTON(demo->area_x1), -10, width - 10); + gtk_spin_button_set_range(GTK_SPIN_BUTTON(demo->area_y1), -10, height - 10); + gtk_spin_button_set_range(GTK_SPIN_BUTTON(demo->area_x2), 0, width + 10); + gtk_spin_button_set_range(GTK_SPIN_BUTTON(demo->area_y2), 0, height + 10); + + gtk_spin_button_set_value(GTK_SPIN_BUTTON(demo->area_x1), 0); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(demo->area_y1), 0); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(demo->area_x2), width); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(demo->area_y2), height); + + g_object_unref(page); +} + +static void pgd_text_area_selector_value_changed(GtkSpinButton *spinbutton, PgdTextDemo *demo) +{ + demo->area.x1 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(demo->area_x1)); + demo->area.y1 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(demo->area_y1)); + demo->area.x2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(demo->area_x2)); + demo->area.y2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(demo->area_y2)); +} + +static void pgd_text_page_selector_value_changed(GtkSpinButton *spinbutton, PgdTextDemo *demo) +{ + demo->page = (gint)gtk_spin_button_get_value(spinbutton) - 1; +} + +GtkWidget *pgd_text_create_widget(PopplerDocument *document) +{ + PgdTextDemo *demo; + GtkWidget *label; + GtkWidget *vbox, *vbox2; + GtkWidget *hbox, *page_selector, *area_hbox; + GtkWidget *button; + GtkWidget *swindow, *textview, *treeview; + GtkTreeSelection *selection; + GtkWidget *frame, *table; + GtkWidget *hpaned; + GtkCellRenderer *renderer; + gchar *str; + gint n_pages; + gint row = 0; + + demo = g_new0(PgdTextDemo, 1); + + demo->doc = g_object_ref(document); + + n_pages = poppler_document_get_n_pages(document); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + label = gtk_label_new("Page:"); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + + page_selector = gtk_spin_button_new_with_range(1, n_pages, 1); + g_signal_connect(G_OBJECT(page_selector), "value-changed", G_CALLBACK(pgd_text_page_selector_value_changed), (gpointer)demo); + gtk_box_pack_start(GTK_BOX(hbox), page_selector, FALSE, TRUE, 0); + gtk_widget_show(page_selector); + + str = g_strdup_printf("of %d", n_pages); + label = gtk_label_new(str); + gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); + gtk_widget_show(label); + g_free(str); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12); + + area_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + label = gtk_label_new("X1:"); + gtk_box_pack_start(GTK_BOX(area_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + demo->area_x1 = gtk_spin_button_new_with_range(0, 0, 0.01); + g_signal_connect(demo->area_x1, "value-changed", G_CALLBACK(pgd_text_area_selector_value_changed), demo); + gtk_box_pack_start(GTK_BOX(area_hbox), demo->area_x1, TRUE, TRUE, 0); + gtk_widget_show(demo->area_x1); + + gtk_box_pack_start(GTK_BOX(hbox), area_hbox, FALSE, TRUE, 0); + gtk_widget_show(area_hbox); + + area_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + label = gtk_label_new("Y1:"); + gtk_box_pack_start(GTK_BOX(area_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + demo->area_y1 = gtk_spin_button_new_with_range(0, 0, 0.01); + g_signal_connect(demo->area_y1, "value-changed", G_CALLBACK(pgd_text_area_selector_value_changed), demo); + gtk_box_pack_start(GTK_BOX(area_hbox), demo->area_y1, TRUE, TRUE, 0); + gtk_widget_show(demo->area_y1); + + gtk_box_pack_start(GTK_BOX(hbox), area_hbox, FALSE, TRUE, 0); + gtk_widget_show(area_hbox); + + area_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + label = gtk_label_new("X2:"); + gtk_box_pack_start(GTK_BOX(area_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + demo->area_x2 = gtk_spin_button_new_with_range(0, 0, 0.01); + g_signal_connect(demo->area_x2, "value-changed", G_CALLBACK(pgd_text_area_selector_value_changed), demo); + gtk_box_pack_start(GTK_BOX(area_hbox), demo->area_x2, TRUE, TRUE, 0); + gtk_widget_show(demo->area_x2); + + gtk_box_pack_start(GTK_BOX(hbox), area_hbox, FALSE, TRUE, 0); + gtk_widget_show(area_hbox); + + area_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + label = gtk_label_new("Y2:"); + gtk_box_pack_start(GTK_BOX(area_hbox), label, TRUE, TRUE, 0); + gtk_widget_show(label); + + demo->area_y2 = gtk_spin_button_new_with_range(0, 0, 0.01); + g_signal_connect(demo->area_y2, "value-changed", G_CALLBACK(pgd_text_area_selector_value_changed), demo); + gtk_box_pack_start(GTK_BOX(area_hbox), demo->area_y2, TRUE, TRUE, 0); + gtk_widget_show(demo->area_y2); + + gtk_box_pack_start(GTK_BOX(hbox), area_hbox, FALSE, TRUE, 0); + gtk_widget_show(area_hbox); + + pgd_text_area_selector_setup(demo); + + button = gtk_button_new_with_label("Get Text"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_text_get_text), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + demo->timer_label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(demo->timer_label), "<i>No text found</i>"); + g_object_set(G_OBJECT(demo->timer_label), "xalign", 1.0, NULL); + gtk_box_pack_start(GTK_BOX(vbox), demo->timer_label, FALSE, TRUE, 0); + gtk_widget_show(demo->timer_label); + + hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); + gtk_paned_set_position(GTK_PANED(hpaned), 300); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + demo->model = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER); + treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(demo->model)); + demo->treeview = treeview; + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), TEXT_X1_COLUMN, "X1", renderer, "text", TEXT_X1_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), TEXT_Y1_COLUMN, "Y1", renderer, "text", TEXT_Y1_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), TEXT_X2_COLUMN, "X2", renderer, "text", TEXT_X2_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), TEXT_Y2_COLUMN, "Y2", renderer, "text", TEXT_Y2_COLUMN, NULL); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), TEXT_OFFSET_COLUMN, "Offset", renderer, "text", TEXT_OFFSET_COLUMN, NULL); + + selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); + g_signal_connect(selection, "changed", G_CALLBACK(pgd_text_selection_changed), (gpointer)demo); + + gtk_container_add(GTK_CONTAINER(swindow), treeview); + gtk_widget_show(treeview); + + gtk_box_pack_start(GTK_BOX(vbox2), swindow, TRUE, TRUE, 0); + gtk_widget_show(swindow); + + /* Text attributes */ + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); + label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(label), "<b>Text Attributes</b>"); + gtk_frame_set_label_widget(GTK_FRAME(frame), label); + gtk_widget_show(label); + + table = gtk_grid_new(); + gtk_widget_set_margin_top(table, 5); + gtk_widget_set_margin_bottom(table, 5); +#if GTK_CHECK_VERSION(3, 12, 0) + gtk_widget_set_margin_start(table, 12); + gtk_widget_set_margin_end(table, 5); +#else + gtk_widget_set_margin_left(table, 12); + gtk_widget_set_margin_right(table, 5); +#endif + gtk_grid_set_column_spacing(GTK_GRID(table), 6); + gtk_grid_set_row_spacing(GTK_GRID(table), 6); + + demo->font_name = gtk_label_new(NULL); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>Font Name:</b>", demo->font_name, &row); + demo->font_size = gtk_label_new(NULL); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>Font Size:</b>", demo->font_size, &row); + demo->is_underlined = gtk_label_new(NULL); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>Underlined:</b>", demo->is_underlined, &row); + demo->text_color = gtk_image_new(); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>Color:</b>", demo->text_color, &row); + + gtk_container_add(GTK_CONTAINER(frame), table); + gtk_widget_show(table); + + gtk_box_pack_start(GTK_BOX(vbox2), frame, FALSE, FALSE, 12); + gtk_widget_show(frame); + gtk_paned_add1(GTK_PANED(hpaned), vbox2); + gtk_widget_show(vbox2); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + demo->buffer = gtk_text_buffer_new(NULL); + textview = gtk_text_view_new_with_buffer(demo->buffer); + g_signal_connect(textview, "query-tooltip", G_CALLBACK(pgd_text_view_query_tooltip), demo); + g_signal_connect(demo->buffer, "notify::has-selection", G_CALLBACK(pgd_text_buffer_selection_changed), textview); + + gtk_container_add(GTK_CONTAINER(swindow), textview); + gtk_widget_show(textview); + + gtk_paned_add2(GTK_PANED(hpaned), swindow); + gtk_widget_show(swindow); + + gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0); + gtk_widget_show(hpaned); + + g_object_weak_ref(G_OBJECT(vbox), (GWeakNotify)pgd_text_free, demo); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/text.h b/poppler-24.05.0/glib/demo/text.h new file mode 100644 index 0000000000000000000000000000000000000000..bbb833375f8db43683e3f4f8725b2a95623c0c17 --- /dev/null +++ b/poppler-24.05.0/glib/demo/text.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _TEXT_H_ +# define _TEXT_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_text_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _TEXT_H_ */ diff --git a/poppler-24.05.0/glib/demo/transitions.c b/poppler-24.05.0/glib/demo/transitions.c new file mode 100644 index 0000000000000000000000000000000000000000..ffcf3fc751ec23c1f459f8b261ff2f5cdcb0bab6 --- /dev/null +++ b/poppler-24.05.0/glib/demo/transitions.c @@ -0,0 +1,258 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> + +#include "transitions.h" + +enum +{ + TRANSITIONS_PAGE_COLUMN, + TRANSITIONS_TYPE_COLUMN, + TRANSITIONS_ALIGNMENT_COLUMN, + TRANSITIONS_DIRECTION_COLUMN, + TRANSITIONS_DURATION_COLUMN, + TRANSITIONS_ANGLE_COLUMN, + TRANSITIONS_SCALE_COLUMN, + TRANSITIONS_RECTANGULAR_COLUMN, + N_COLUMNS +}; + +typedef struct +{ + PopplerDocument *doc; + + GtkWidget *treeview; + GtkWidget *progress; + + guint idle_id; +} PgdTransitionsDemo; + +static void pgd_transitions_free(PgdTransitionsDemo *demo) +{ + if (!demo) { + return; + } + + if (demo->idle_id > 0) { + g_source_remove(demo->idle_id); + demo->idle_id = 0; + } + + if (demo->doc) { + g_object_unref(demo->doc); + demo->doc = NULL; + } + + g_free(demo); +} + +static const gchar *transition_type_to_string(PopplerPageTransitionType type) +{ + switch (type) { + case POPPLER_PAGE_TRANSITION_REPLACE: + return "Replace"; + case POPPLER_PAGE_TRANSITION_SPLIT: + return "Split"; + case POPPLER_PAGE_TRANSITION_BLINDS: + return "Blinds"; + case POPPLER_PAGE_TRANSITION_BOX: + return "Box"; + case POPPLER_PAGE_TRANSITION_WIPE: + return "Wipe"; + case POPPLER_PAGE_TRANSITION_DISSOLVE: + return "Dissolve"; + case POPPLER_PAGE_TRANSITION_GLITTER: + return "Glitter"; + case POPPLER_PAGE_TRANSITION_FLY: + return "Fly"; + case POPPLER_PAGE_TRANSITION_PUSH: + return "Push"; + case POPPLER_PAGE_TRANSITION_COVER: + return "Cover"; + case POPPLER_PAGE_TRANSITION_UNCOVER: + return "Uncover"; + case POPPLER_PAGE_TRANSITION_FADE: + return "Fade"; + } + + return "Unknown"; +} + +static const gchar *transition_alignment_to_string(PopplerPageTransitionAlignment alignment) +{ + return alignment == POPPLER_PAGE_TRANSITION_HORIZONTAL ? "Horizontal" : "Vertical"; +} + +static const gchar *transition_direction_to_string(PopplerPageTransitionDirection direction) +{ + return direction == POPPLER_PAGE_TRANSITION_INWARD ? "Inward" : "Outward"; +} + +static void pgd_transitions_update_progress(PgdTransitionsDemo *demo, gint n_pages, gint scanned) +{ + gchar *str; + + str = g_strdup_printf("Scanning transitions (%d%%)", MIN(scanned * 100 / n_pages, 100)); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(demo->progress), str); + gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(demo->progress), MIN((gdouble)scanned / n_pages, 1.0)); + g_free(str); +} + +static gboolean pgd_transitions_fill_model(PgdTransitionsDemo *demo) +{ + GtkTreeModel *model; + gint i, n_pages; + + n_pages = poppler_document_get_n_pages(demo->doc); + + model = gtk_tree_view_get_model(GTK_TREE_VIEW(demo->treeview)); + g_object_ref(model); + + for (i = 0; i < n_pages; i++) { + PopplerPage *page; + PopplerPageTransition *transition; + + pgd_transitions_update_progress(demo, n_pages, i); + + while (gtk_events_pending()) { + gtk_main_iteration(); + } + + page = poppler_document_get_page(demo->doc, i); + if (!page) { + continue; + } + + transition = poppler_page_get_transition(page); + if (transition) { + GtkTreeIter iter; + gchar *npage; + gchar *duration; + gchar *angle; + gchar *scale; + + npage = g_strdup_printf("%d", i + 1); + duration = g_strdup_printf("%.2f", transition->duration_real); + angle = g_strdup_printf("%d", transition->angle); + scale = g_strdup_printf("%.2f", transition->scale); + + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, TRANSITIONS_PAGE_COLUMN, npage, TRANSITIONS_TYPE_COLUMN, transition_type_to_string(transition->type), TRANSITIONS_ALIGNMENT_COLUMN, + transition_alignment_to_string(transition->alignment), TRANSITIONS_DIRECTION_COLUMN, transition_direction_to_string(transition->direction), TRANSITIONS_DURATION_COLUMN, duration, TRANSITIONS_ANGLE_COLUMN, + angle, TRANSITIONS_SCALE_COLUMN, scale, TRANSITIONS_RECTANGULAR_COLUMN, transition->rectangular ? "Yes" : "No", -1); + g_free(npage); + g_free(duration); + g_free(angle); + g_free(scale); + + poppler_page_transition_free(transition); + } + + g_object_unref(page); + } + + pgd_transitions_update_progress(demo, n_pages, n_pages); + g_object_unref(model); + + return FALSE; +} + +static void pgd_transitions_scan_button_clicked(GtkButton *button, PgdTransitionsDemo *demo) +{ + if (demo->idle_id > 0) { + g_source_remove(demo->idle_id); + } + + demo->idle_id = g_idle_add((GSourceFunc)pgd_transitions_fill_model, demo); +} + +static GtkWidget *pgd_transitions_create_list(GtkTreeModel *model) +{ + GtkWidget *treeview; + GtkCellRenderer *renderer; + + treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model)); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), TRUE); + gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)), GTK_SELECTION_NONE); + + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 0, "Page", renderer, "text", TRANSITIONS_PAGE_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 1, "Type", renderer, "text", TRANSITIONS_TYPE_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 2, "Alignment", renderer, "text", TRANSITIONS_ALIGNMENT_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 3, "Direction", renderer, "text", TRANSITIONS_DIRECTION_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 4, "Duration", renderer, "text", TRANSITIONS_DURATION_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 5, "Angle", renderer, "text", TRANSITIONS_ANGLE_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 6, "Scale", renderer, "text", TRANSITIONS_SCALE_COLUMN, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), 7, "Rectangular", renderer, "text", TRANSITIONS_RECTANGULAR_COLUMN, NULL); + return treeview; +} + +GtkWidget *pgd_transitions_create_widget(PopplerDocument *document) +{ + PgdTransitionsDemo *demo; + GtkWidget *vbox; + GtkListStore *model; + GtkWidget *swindow; + GtkWidget *hbox, *button; + + demo = g_new0(PgdTransitionsDemo, 1); + + demo->doc = g_object_ref(document); + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6); + + demo->progress = gtk_progress_bar_new(); + gtk_progress_bar_set_ellipsize(GTK_PROGRESS_BAR(demo->progress), PANGO_ELLIPSIZE_END); + gtk_box_pack_start(GTK_BOX(hbox), demo->progress, TRUE, TRUE, 0); + gtk_widget_show(demo->progress); + + button = gtk_button_new_with_label("Scan"); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(pgd_transitions_scan_button_clicked), (gpointer)demo); + gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); + gtk_widget_show(button); + + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 6); + gtk_widget_show(hbox); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + model = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + demo->treeview = pgd_transitions_create_list(GTK_TREE_MODEL(model)); + g_object_unref(model); + + gtk_container_add(GTK_CONTAINER(swindow), demo->treeview); + gtk_widget_show(demo->treeview); + + gtk_box_pack_start(GTK_BOX(vbox), swindow, TRUE, TRUE, 0); + gtk_widget_show(swindow); + + g_object_weak_ref(G_OBJECT(swindow), (GWeakNotify)pgd_transitions_free, (gpointer)demo); + + return vbox; +} diff --git a/poppler-24.05.0/glib/demo/transitions.h b/poppler-24.05.0/glib/demo/transitions.h new file mode 100644 index 0000000000000000000000000000000000000000..4606d8f7dd60edf43a240455aec1a7db80f72824 --- /dev/null +++ b/poppler-24.05.0/glib/demo/transitions.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _TRANSITIONS_H_ +# define _TRANSITIONS_H_ + +G_BEGIN_DECLS + +GtkWidget *pgd_transitions_create_widget(PopplerDocument *document); + +G_END_DECLS + +#endif /* _TRANSITIONS_H_ */ diff --git a/poppler-24.05.0/glib/demo/utils.c b/poppler-24.05.0/glib/demo/utils.c new file mode 100644 index 0000000000000000000000000000000000000000..e41b742997d223c39fe3b57d175b210f0d17dd69 --- /dev/null +++ b/poppler-24.05.0/glib/demo/utils.c @@ -0,0 +1,585 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <stdio.h> +#include <unistd.h> +#include <time.h> + +#include "utils.h" + +void pgd_table_add_property_with_custom_widget(GtkGrid *table, const gchar *markup, GtkWidget *widget, gint *row) +{ + GtkWidget *label; + + label = gtk_label_new(NULL); + g_object_set(G_OBJECT(label), "xalign", 0.0, "yalign", 0.0, NULL); + gtk_label_set_markup(GTK_LABEL(label), markup); + gtk_grid_attach(GTK_GRID(table), label, 0, *row, 1, 1); + gtk_widget_show(label); + + gtk_grid_attach(GTK_GRID(table), widget, 1, *row, 1, 1); + gtk_widget_set_hexpand(widget, TRUE); + gtk_widget_show(widget); + + *row += 1; +} + +void pgd_table_add_property_with_value_widget(GtkGrid *table, const gchar *markup, GtkWidget **value_widget, const gchar *value, gint *row) +{ + GtkWidget *label; + + *value_widget = label = gtk_label_new(value); + g_object_set(G_OBJECT(label), "xalign", 0.0, "selectable", TRUE, "ellipsize", PANGO_ELLIPSIZE_END, NULL); + pgd_table_add_property_with_custom_widget(table, markup, label, row); +} + +void pgd_table_add_property(GtkGrid *table, const gchar *markup, const gchar *value, gint *row) +{ + GtkWidget *label; + + pgd_table_add_property_with_value_widget(table, markup, &label, value, row); +} + +GtkWidget *pgd_action_view_new(PopplerDocument *document) +{ + GtkWidget *frame, *label; + + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); + label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(label), "<b>Action Properties</b>"); + gtk_frame_set_label_widget(GTK_FRAME(frame), label); + gtk_widget_show(label); + + g_object_set_data(G_OBJECT(frame), "document", document); + + return frame; +} + +static void pgd_action_view_add_destination(GtkWidget *action_view, GtkGrid *table, PopplerDest *dest, gboolean remote, gint *row) +{ + PopplerDocument *document; + GEnumValue *enum_value; + gchar *str; + + pgd_table_add_property(table, "<b>Type:</b>", "Destination", row); + + enum_value = g_enum_get_value((GEnumClass *)g_type_class_ref(POPPLER_TYPE_DEST_TYPE), dest->type); + pgd_table_add_property(table, "<b>Destination Type:</b>", enum_value->value_name, row); + + document = g_object_get_data(G_OBJECT(action_view), "document"); + + if (dest->type != POPPLER_DEST_NAMED) { + str = NULL; + + if (document && !remote) { + PopplerPage *poppler_page; + gchar *page_label; + + poppler_page = poppler_document_get_page(document, MAX(0, dest->page_num - 1)); + + g_object_get(G_OBJECT(poppler_page), "label", &page_label, NULL); + if (page_label) { + str = g_strdup_printf("%d (%s)", dest->page_num, page_label); + g_free(page_label); + } + } + + if (!str) { + str = g_strdup_printf("%d", dest->page_num); + } + pgd_table_add_property(table, "<b>Page:</b>", str, row); + g_free(str); + + str = g_strdup_printf("%.2f", dest->left); + pgd_table_add_property(table, "<b>Left:</b>", str, row); + g_free(str); + + str = g_strdup_printf("%.2f", dest->right); + pgd_table_add_property(table, "<b>Right:</b>", str, row); + g_free(str); + + str = g_strdup_printf("%.2f", dest->top); + pgd_table_add_property(table, "<b>Top:</b>", str, row); + g_free(str); + + str = g_strdup_printf("%.2f", dest->bottom); + pgd_table_add_property(table, "<b>Bottom:</b>", str, row); + g_free(str); + + str = g_strdup_printf("%.2f", dest->zoom); + pgd_table_add_property(table, "<b>Zoom:</b>", str, row); + g_free(str); + } else { + if (document && !remote) { + PopplerDest *new_dest; + + new_dest = poppler_document_find_dest(document, dest->named_dest); + if (new_dest) { + GtkWidget *new_table; + gint new_row = 0; + + new_table = gtk_grid_new(); + gtk_widget_set_margin_top(new_table, 5); + gtk_widget_set_margin_bottom(new_table, 5); +#if GTK_CHECK_VERSION(3, 12, 0) + gtk_widget_set_margin_start(new_table, 12); + gtk_widget_set_margin_end(new_table, 5); +#else + gtk_widget_set_margin_left(new_table, 12); + gtk_widget_set_margin_right(new_table, 5); +#endif + gtk_grid_set_column_spacing(GTK_GRID(new_table), 6); + gtk_grid_set_row_spacing(GTK_GRID(new_table), 6); + + pgd_action_view_add_destination(action_view, GTK_GRID(new_table), new_dest, FALSE, &new_row); + poppler_dest_free(new_dest); + + gtk_grid_attach(GTK_GRID(table), new_table, 0, *row, 1, 1); + gtk_widget_show(new_table); + + *row += 1; + } + } + } +} + +static const gchar *get_movie_op(PopplerActionMovieOperation op) +{ + switch (op) { + case POPPLER_ACTION_MOVIE_PLAY: + return "Play"; + case POPPLER_ACTION_MOVIE_PAUSE: + return "Pause"; + case POPPLER_ACTION_MOVIE_RESUME: + return "Resume"; + case POPPLER_ACTION_MOVIE_STOP: + return "Stop"; + } + return NULL; +} + +static void free_tmp_file(GFile *tmp_file) +{ + + g_file_delete(tmp_file, NULL, NULL); + g_object_unref(tmp_file); +} + +static gboolean save_helper(const gchar *buf, gsize count, gpointer data, GError **error) +{ + gint fd = GPOINTER_TO_INT(data); + + return write(fd, buf, count) == count; +} + +static void pgd_action_view_play_rendition(GtkWidget *button, PopplerMedia *media) +{ + GFile *file = NULL; + gchar *uri; + + if (poppler_media_is_embedded(media)) { + gint fd; + gchar *tmp_filename = NULL; + + fd = g_file_open_tmp(NULL, &tmp_filename, NULL); + if (fd != -1) { + if (poppler_media_save_to_callback(media, save_helper, GINT_TO_POINTER(fd), NULL)) { + file = g_file_new_for_path(tmp_filename); + g_object_set_data_full(G_OBJECT(media), "tmp-file", g_object_ref(file), (GDestroyNotify)free_tmp_file); + } else { + g_free(tmp_filename); + } + close(fd); + } else if (tmp_filename) { + g_free(tmp_filename); + } + + } else { + const gchar *filename; + + filename = poppler_media_get_filename(media); + if (g_path_is_absolute(filename)) { + file = g_file_new_for_path(filename); + } else if (g_strrstr(filename, "://")) { + file = g_file_new_for_uri(filename); + } else { + gchar *cwd; + gchar *path; + + // FIXME: relative to doc uri, not cwd + cwd = g_get_current_dir(); + path = g_build_filename(cwd, filename, NULL); + g_free(cwd); + + file = g_file_new_for_path(path); + g_free(path); + } + } + + if (file) { + uri = g_file_get_uri(file); + g_object_unref(file); + if (uri) { +#if GTK_CHECK_VERSION(3, 22, 0) + GtkWidget *toplevel; + + toplevel = gtk_widget_get_toplevel(button); + gtk_show_uri_on_window(gtk_widget_is_toplevel(toplevel) ? GTK_WINDOW(toplevel) : NULL, uri, GDK_CURRENT_TIME, NULL); +#else + gtk_show_uri(gtk_widget_get_screen(button), uri, GDK_CURRENT_TIME, NULL); +#endif + g_free(uri); + } + } +} + +static void pgd_action_view_do_action_layer(GtkWidget *button, GList *state_list) +{ + GList *l, *m; + + for (l = state_list; l; l = g_list_next(l)) { + PopplerActionLayer *action_layer = (PopplerActionLayer *)l->data; + + for (m = action_layer->layers; m; m = g_list_next(m)) { + PopplerLayer *layer = (PopplerLayer *)m->data; + + switch (action_layer->action) { + case POPPLER_ACTION_LAYER_ON: + poppler_layer_show(layer); + break; + case POPPLER_ACTION_LAYER_OFF: + poppler_layer_hide(layer); + break; + case POPPLER_ACTION_LAYER_TOGGLE: + if (poppler_layer_is_visible(layer)) { + poppler_layer_hide(layer); + } else { + poppler_layer_show(layer); + } + break; + } + } + } +} + +void pgd_action_view_set_action(GtkWidget *action_view, PopplerAction *action) +{ + GtkWidget *table; + gint row = 0; + + table = gtk_bin_get_child(GTK_BIN(action_view)); + if (table) { + gtk_container_remove(GTK_CONTAINER(action_view), table); + } + + if (!action) { + return; + } + + table = gtk_grid_new(); + gtk_widget_set_margin_top(table, 5); + gtk_widget_set_margin_bottom(table, 5); +#if GTK_CHECK_VERSION(3, 12, 0) + gtk_widget_set_margin_start(table, 12); + gtk_widget_set_margin_end(table, 5); +#else + gtk_widget_set_margin_left(table, 12); + gtk_widget_set_margin_right(table, 5); +#endif + gtk_grid_set_column_spacing(GTK_GRID(table), 6); + gtk_grid_set_row_spacing(GTK_GRID(table), 6); + + pgd_table_add_property(GTK_GRID(table), "<b>Title:</b>", action->any.title, &row); + + switch (action->type) { + case POPPLER_ACTION_UNKNOWN: + pgd_table_add_property(GTK_GRID(table), "<b>Type:</b>", "Unknown", &row); + break; + case POPPLER_ACTION_NONE: + pgd_table_add_property(GTK_GRID(table), "<b>Type:</b>", "None", &row); + break; + case POPPLER_ACTION_GOTO_DEST: + pgd_action_view_add_destination(action_view, GTK_GRID(table), action->goto_dest.dest, FALSE, &row); + break; + case POPPLER_ACTION_GOTO_REMOTE: + pgd_table_add_property(GTK_GRID(table), "<b>Type:</b>", "Remote Destination", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Filename:</b>", action->goto_remote.file_name, &row); + pgd_action_view_add_destination(action_view, GTK_GRID(table), action->goto_remote.dest, TRUE, &row); + break; + case POPPLER_ACTION_LAUNCH: + pgd_table_add_property(GTK_GRID(table), "<b>Type:</b>", "Launch", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Filename:</b>", action->launch.file_name, &row); + pgd_table_add_property(GTK_GRID(table), "<b>Params:</b>", action->launch.params, &row); + break; + case POPPLER_ACTION_URI: + pgd_table_add_property(GTK_GRID(table), "<b>Type:</b>", "External URI", &row); + pgd_table_add_property(GTK_GRID(table), "<b>URI</b>", action->uri.uri, &row); + break; + case POPPLER_ACTION_NAMED: + pgd_table_add_property(GTK_GRID(table), "<b>Type:</b>", "Named Action", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Name:</b>", action->named.named_dest, &row); + break; + case POPPLER_ACTION_MOVIE: { + GtkWidget *movie_view = pgd_movie_view_new(); + + pgd_table_add_property(GTK_GRID(table), "<b>Type:</b>", "Movie", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Operation:</b>", get_movie_op(action->movie.operation), &row); + pgd_movie_view_set_movie(movie_view, action->movie.movie); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), "<b>Movie:</b>", movie_view, &row); + } break; + case POPPLER_ACTION_RENDITION: { + gchar *text; + + pgd_table_add_property(GTK_GRID(table), "<b>Type:</b>", "Rendition", &row); + text = g_strdup_printf("%d", action->rendition.op); + pgd_table_add_property(GTK_GRID(table), "<b>Operation:</b>", text, &row); + g_free(text); + if (action->rendition.media) { + gboolean embedded = poppler_media_is_embedded(action->rendition.media); + GtkWidget *button; + + pgd_table_add_property(GTK_GRID(table), "<b>Embedded:</b>", embedded ? "Yes" : "No", &row); + if (embedded) { + const gchar *mime_type = poppler_media_get_mime_type(action->rendition.media); + pgd_table_add_property(GTK_GRID(table), "<b>Mime type:</b>", mime_type ? mime_type : "", &row); + } else { + pgd_table_add_property(GTK_GRID(table), "<b>Filename:</b>", poppler_media_get_filename(action->rendition.media), &row); + } + + button = gtk_button_new_with_mnemonic("_Play"); + g_signal_connect(button, "clicked", G_CALLBACK(pgd_action_view_play_rendition), action->rendition.media); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), NULL, button, &row); + gtk_widget_show(button); + } + } break; + case POPPLER_ACTION_OCG_STATE: { + GList *l; + GtkWidget *button; + + pgd_table_add_property(GTK_GRID(table), "<b>Type:</b>", "OCGState", &row); + + for (l = action->ocg_state.state_list; l; l = g_list_next(l)) { + PopplerActionLayer *action_layer = (PopplerActionLayer *)l->data; + gchar *text = NULL; + gint n_layers = g_list_length(action_layer->layers); + + switch (action_layer->action) { + case POPPLER_ACTION_LAYER_ON: + text = g_strdup_printf("%d layers On", n_layers); + break; + case POPPLER_ACTION_LAYER_OFF: + text = g_strdup_printf("%d layers Off", n_layers); + break; + case POPPLER_ACTION_LAYER_TOGGLE: + text = g_strdup_printf("%d layers Toggle", n_layers); + break; + } + pgd_table_add_property(GTK_GRID(table), "<b>Action:</b>", text, &row); + g_free(text); + } + + button = gtk_button_new_with_label("Do action"); + g_signal_connect(button, "clicked", G_CALLBACK(pgd_action_view_do_action_layer), action->ocg_state.state_list); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), NULL, button, &row); + gtk_widget_show(button); + } break; + case POPPLER_ACTION_JAVASCRIPT: { + GtkTextBuffer *buffer; + GtkWidget *textview; + GtkWidget *swindow; + + pgd_table_add_property(GTK_GRID(table), "<b>Type:</b>", "JavaScript", &row); + + buffer = gtk_text_buffer_new(NULL); + if (action->javascript.script) { + gtk_text_buffer_set_text(buffer, action->javascript.script, -1); + } + + textview = gtk_text_view_new_with_buffer(buffer); + gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE); + g_object_unref(buffer); + + swindow = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_container_add(GTK_CONTAINER(swindow), textview); + gtk_widget_show(textview); + + pgd_table_add_property_with_custom_widget(GTK_GRID(table), NULL, swindow, &row); + gtk_widget_show(swindow); + } break; + case POPPLER_ACTION_RESET_FORM: + pgd_table_add_property(GTK_GRID(table), "<b>Type:</b>", "ResetForm", &row); + break; + default: + g_assert_not_reached(); + } + + gtk_container_add(GTK_CONTAINER(action_view), table); + gtk_widget_show(table); +} + +gchar *pgd_format_date(time_t utime) +{ + GDateTime *dt = NULL; + gchar *s = NULL; + + if (utime == 0) { + return NULL; + } + dt = g_date_time_new_from_unix_local(utime); + if (dt == NULL) { + return NULL; + } + s = g_date_time_format(dt, "%c"); + g_date_time_unref(dt); + + return s; +} + +GtkWidget *pgd_movie_view_new(void) +{ + GtkWidget *frame, *label; + + frame = gtk_frame_new(NULL); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); + label = gtk_label_new(NULL); + gtk_label_set_markup(GTK_LABEL(label), "<b>Movie Properties</b>"); + gtk_frame_set_label_widget(GTK_FRAME(frame), label); + gtk_widget_show(label); + + return frame; +} + +static void pgd_movie_view_play_movie(GtkWidget *button, PopplerMovie *movie) +{ + const gchar *filename; + GFile *file; + gchar *uri; + + filename = poppler_movie_get_filename(movie); + if (g_path_is_absolute(filename)) { + file = g_file_new_for_path(filename); + } else if (g_strrstr(filename, "://")) { + file = g_file_new_for_uri(filename); + } else { + gchar *cwd; + gchar *path; + + // FIXME: relative to doc uri, not cwd + cwd = g_get_current_dir(); + path = g_build_filename(cwd, filename, NULL); + g_free(cwd); + + file = g_file_new_for_path(path); + g_free(path); + } + + uri = g_file_get_uri(file); + g_object_unref(file); + if (uri) { +#if GTK_CHECK_VERSION(3, 22, 0) + GtkWidget *toplevel; + + toplevel = gtk_widget_get_toplevel(button); + gtk_show_uri_on_window(gtk_widget_is_toplevel(toplevel) ? GTK_WINDOW(toplevel) : NULL, uri, GDK_CURRENT_TIME, NULL); +#else + gtk_show_uri(gtk_widget_get_screen(button), uri, GDK_CURRENT_TIME, NULL); +#endif + g_free(uri); + } +} + +void pgd_movie_view_set_movie(GtkWidget *movie_view, PopplerMovie *movie) +{ + GtkWidget *table; + GtkWidget *button; + GEnumValue *enum_value; + gint width, height; + gint row = 0; + + table = gtk_bin_get_child(GTK_BIN(movie_view)); + if (table) { + gtk_container_remove(GTK_CONTAINER(movie_view), table); + } + + if (!movie) { + return; + } + + table = gtk_grid_new(); + gtk_widget_set_margin_top(table, 5); + gtk_widget_set_margin_bottom(table, 5); +#if GTK_CHECK_VERSION(3, 12, 0) + gtk_widget_set_margin_start(table, 12); + gtk_widget_set_margin_end(table, 5); +#else + gtk_widget_set_margin_left(table, 12); + gtk_widget_set_margin_right(table, 5); +#endif + gtk_grid_set_column_spacing(GTK_GRID(table), 6); + gtk_grid_set_row_spacing(GTK_GRID(table), 6); + + pgd_table_add_property(GTK_GRID(table), "<b>Filename:</b>", poppler_movie_get_filename(movie), &row); + pgd_table_add_property(GTK_GRID(table), "<b>Need Poster:</b>", poppler_movie_need_poster(movie) ? "Yes" : "No", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Show Controls:</b>", poppler_movie_show_controls(movie) ? "Yes" : "No", &row); + enum_value = g_enum_get_value((GEnumClass *)g_type_class_ref(POPPLER_TYPE_MOVIE_PLAY_MODE), poppler_movie_get_play_mode(movie)); + pgd_table_add_property(GTK_GRID(table), "<b>Play Mode:</b>", enum_value->value_name, &row); + pgd_table_add_property(GTK_GRID(table), "<b>Synchronous Play:</b>", poppler_movie_is_synchronous(movie) ? "Yes" : "No", &row); + pgd_table_add_property(GTK_GRID(table), "<b>Volume:</b>", g_strdup_printf("%g", poppler_movie_get_volume(movie)), &row); + pgd_table_add_property(GTK_GRID(table), "<b>Rate:</b>", g_strdup_printf("%g", poppler_movie_get_rate(movie)), &row); + pgd_table_add_property(GTK_GRID(table), "<b>Start:</b>", g_strdup_printf("%g s", poppler_movie_get_start(movie) / 1e9), &row); + pgd_table_add_property(GTK_GRID(table), "<b>Duration:</b>", g_strdup_printf("%g s", poppler_movie_get_duration(movie) / 1e9), &row); + pgd_table_add_property(GTK_GRID(table), "<b>Rotation Angle:</b>", g_strdup_printf("%u", poppler_movie_get_rotation_angle(movie)), &row); + poppler_movie_get_aspect(movie, &width, &height); + pgd_table_add_property(GTK_GRID(table), "<b>Aspect:</b>", g_strdup_printf("%dx%d", width, height), &row); + + button = gtk_button_new_with_mnemonic("_Play"); + g_signal_connect(button, "clicked", G_CALLBACK(pgd_movie_view_play_movie), movie); + pgd_table_add_property_with_custom_widget(GTK_GRID(table), NULL, button, &row); + gtk_widget_show(button); + + gtk_container_add(GTK_CONTAINER(movie_view), table); + gtk_widget_show(table); +} + +GdkPixbuf *pgd_pixbuf_new_for_color(PopplerColor *poppler_color) +{ + GdkPixbuf *pixbuf; + gint num, x; + guchar *pixels; + + if (!poppler_color) { + return NULL; + } + + pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, 64, 16); + + pixels = gdk_pixbuf_get_pixels(pixbuf); + num = gdk_pixbuf_get_width(pixbuf) * gdk_pixbuf_get_height(pixbuf); + + for (x = 0; x < num; x++) { + pixels[0] = poppler_color->red; + pixels[1] = poppler_color->green; + pixels[2] = poppler_color->blue; + pixels += 3; + } + + return pixbuf; +} diff --git a/poppler-24.05.0/glib/demo/utils.h b/poppler-24.05.0/glib/demo/utils.h new file mode 100644 index 0000000000000000000000000000000000000000..0b3fcdf34723871e5bec9f6a3c7913a38f2084e1 --- /dev/null +++ b/poppler-24.05.0/glib/demo/utils.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <gtk/gtk.h> +#include <poppler.h> + +#ifndef _UTILS_H_ +# define _UTILS_H_ + +G_BEGIN_DECLS + +void pgd_table_add_property(GtkGrid *table, const gchar *markup, const gchar *value, gint *row); +void pgd_table_add_property_with_value_widget(GtkGrid *table, const gchar *markup, GtkWidget **value_widget, const gchar *value, gint *row); +void pgd_table_add_property_with_custom_widget(GtkGrid *table, const gchar *markup, GtkWidget *widget, gint *row); +GtkWidget *pgd_action_view_new(PopplerDocument *document); +void pgd_action_view_set_action(GtkWidget *action_view, PopplerAction *action); +gchar *pgd_format_date(time_t utime); +GtkWidget *pgd_movie_view_new(void); +void pgd_movie_view_set_movie(GtkWidget *movie_view, PopplerMovie *movie); +GdkPixbuf *pgd_pixbuf_new_for_color(PopplerColor *poppler_color); + +G_END_DECLS + +#endif /* _UTILS_H_ */ diff --git a/poppler-24.05.0/glib/poppler-action.cc b/poppler-24.05.0/glib/poppler-action.cc new file mode 100644 index 0000000000000000000000000000000000000000..726daedf236ea62f1a48f820cf738fad3a0c6d45 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-action.cc @@ -0,0 +1,696 @@ +/* poppler-action.cc: glib wrapper for poppler -*- c-basic-offset: 8 -*- + * Copyright (C) 2005, Red Hat, Inc. + * + * 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.h" +#include "poppler-private.h" + +/** + * SECTION:poppler-action + * @short_description: Action links + * @title: PopplerAction + */ + +G_DEFINE_BOXED_TYPE(PopplerDest, poppler_dest, poppler_dest_copy, poppler_dest_free) + +/** + * poppler_dest_copy: + * @dest: a #PopplerDest + * + * Copies @dest, creating an identical #PopplerDest. + * + * Return value: a new destination identical to @dest + **/ +PopplerDest *poppler_dest_copy(PopplerDest *dest) +{ + PopplerDest *new_dest; + + new_dest = g_slice_dup(PopplerDest, dest); + + if (dest->named_dest) { + new_dest->named_dest = g_strdup(dest->named_dest); + } + + return new_dest; +} + +/** + * poppler_dest_free: + * @dest: a #PopplerDest + * + * Frees @dest + **/ +void poppler_dest_free(PopplerDest *dest) +{ + if (!dest) { + return; + } + + if (dest->named_dest) { + g_free(dest->named_dest); + } + + g_slice_free(PopplerDest, dest); +} + +static void poppler_action_layer_free(PopplerActionLayer *action_layer) +{ + if (!action_layer) { + return; + } + + if (action_layer->layers) { + g_list_free_full(action_layer->layers, g_object_unref); + action_layer->layers = nullptr; + } + + g_slice_free(PopplerActionLayer, action_layer); +} + +static PopplerActionLayer *poppler_action_layer_copy(PopplerActionLayer *action_layer) +{ + PopplerActionLayer *retval = g_slice_dup(PopplerActionLayer, action_layer); + + retval->layers = g_list_copy(action_layer->layers); + for (GList *l = retval->layers; l != nullptr; l = l->next) { + g_object_ref(l->data); + } + + return retval; +} + +G_DEFINE_BOXED_TYPE(PopplerAction, poppler_action, poppler_action_copy, poppler_action_free) + +/** + * poppler_action_free: + * @action: a #PopplerAction + * + * Frees @action + **/ +void poppler_action_free(PopplerAction *action) +{ + if (action == nullptr) { + return; + } + + /* Action specific stuff */ + switch (action->type) { + case POPPLER_ACTION_GOTO_DEST: + poppler_dest_free(action->goto_dest.dest); + break; + case POPPLER_ACTION_GOTO_REMOTE: + poppler_dest_free(action->goto_remote.dest); + g_free(action->goto_remote.file_name); + break; + case POPPLER_ACTION_URI: + g_free(action->uri.uri); + break; + case POPPLER_ACTION_LAUNCH: + g_free(action->launch.file_name); + g_free(action->launch.params); + break; + case POPPLER_ACTION_NAMED: + g_free(action->named.named_dest); + break; + case POPPLER_ACTION_MOVIE: + if (action->movie.movie) { + g_object_unref(action->movie.movie); + } + break; + case POPPLER_ACTION_RENDITION: + if (action->rendition.media) { + g_object_unref(action->rendition.media); + } + break; + case POPPLER_ACTION_OCG_STATE: + if (action->ocg_state.state_list) { + g_list_free_full(action->ocg_state.state_list, (GDestroyNotify)poppler_action_layer_free); + } + break; + case POPPLER_ACTION_JAVASCRIPT: + if (action->javascript.script) { + g_free(action->javascript.script); + } + break; + case POPPLER_ACTION_RESET_FORM: + if (action->reset_form.fields) { + g_list_free_full(action->reset_form.fields, g_free); + } + break; + default: + break; + } + + g_free(action->any.title); + g_slice_free(PopplerAction, action); +} + +/** + * poppler_action_copy: + * @action: a #PopplerAction + * + * Copies @action, creating an identical #PopplerAction. + * + * Return value: a new action identical to @action + **/ +PopplerAction *poppler_action_copy(PopplerAction *action) +{ + PopplerAction *new_action; + + g_return_val_if_fail(action != nullptr, NULL); + + /* Do a straight copy of the memory */ + new_action = g_slice_dup(PopplerAction, action); + + if (action->any.title != nullptr) { + new_action->any.title = g_strdup(action->any.title); + } + + switch (action->type) { + case POPPLER_ACTION_GOTO_DEST: + new_action->goto_dest.dest = poppler_dest_copy(action->goto_dest.dest); + break; + case POPPLER_ACTION_GOTO_REMOTE: + new_action->goto_remote.dest = poppler_dest_copy(action->goto_remote.dest); + if (action->goto_remote.file_name) { + new_action->goto_remote.file_name = g_strdup(action->goto_remote.file_name); + } + break; + case POPPLER_ACTION_URI: + if (action->uri.uri) { + new_action->uri.uri = g_strdup(action->uri.uri); + } + break; + case POPPLER_ACTION_LAUNCH: + if (action->launch.file_name) { + new_action->launch.file_name = g_strdup(action->launch.file_name); + } + if (action->launch.params) { + new_action->launch.params = g_strdup(action->launch.params); + } + break; + case POPPLER_ACTION_NAMED: + if (action->named.named_dest) { + new_action->named.named_dest = g_strdup(action->named.named_dest); + } + break; + case POPPLER_ACTION_MOVIE: + if (action->movie.movie) { + new_action->movie.movie = (PopplerMovie *)g_object_ref(action->movie.movie); + } + break; + case POPPLER_ACTION_RENDITION: + if (action->rendition.media) { + new_action->rendition.media = (PopplerMedia *)g_object_ref(action->rendition.media); + } + break; + case POPPLER_ACTION_OCG_STATE: + if (action->ocg_state.state_list) { + GList *l; + GList *new_list = nullptr; + + for (l = action->ocg_state.state_list; l; l = g_list_next(l)) { + PopplerActionLayer *alayer = (PopplerActionLayer *)l->data; + new_list = g_list_prepend(new_list, poppler_action_layer_copy(alayer)); + } + + new_action->ocg_state.state_list = g_list_reverse(new_list); + } + + break; + case POPPLER_ACTION_JAVASCRIPT: + if (action->javascript.script) { + new_action->javascript.script = g_strdup(action->javascript.script); + } + break; + case POPPLER_ACTION_RESET_FORM: + if (action->reset_form.fields) { + GList *iter; + + new_action->reset_form.fields = nullptr; + for (iter = action->reset_form.fields; iter != nullptr; iter = iter->next) { + new_action->reset_form.fields = g_list_append(new_action->reset_form.fields, g_strdup((char *)iter->data)); + } + } + break; + default: + break; + } + + return new_action; +} + +static PopplerDest *dest_new_goto(PopplerDocument *document, const LinkDest *link_dest) +{ + PopplerDest *dest; + + dest = g_slice_new0(PopplerDest); + + if (link_dest == nullptr) { + dest->type = POPPLER_DEST_UNKNOWN; + return dest; + } + + switch (link_dest->getKind()) { + case destXYZ: + dest->type = POPPLER_DEST_XYZ; + break; + case destFit: + dest->type = POPPLER_DEST_FIT; + break; + case destFitH: + dest->type = POPPLER_DEST_FITH; + break; + case destFitV: + dest->type = POPPLER_DEST_FITV; + break; + case destFitR: + dest->type = POPPLER_DEST_FITR; + break; + case destFitB: + dest->type = POPPLER_DEST_FITB; + break; + case destFitBH: + dest->type = POPPLER_DEST_FITBH; + break; + case destFitBV: + dest->type = POPPLER_DEST_FITBV; + break; + default: + dest->type = POPPLER_DEST_UNKNOWN; + } + + if (link_dest->isPageRef()) { + if (document) { + const Ref page_ref = link_dest->getPageRef(); + dest->page_num = document->doc->findPage(page_ref); + } else { + /* FIXME: We don't keep areound the page_ref for the + * remote doc, so we can't look this up. Guess that + * it's 0*/ + dest->page_num = 0; + } + } else { + dest->page_num = link_dest->getPageNum(); + } + + dest->left = link_dest->getLeft(); + dest->bottom = link_dest->getBottom(); + dest->right = link_dest->getRight(); + dest->top = link_dest->getTop(); + dest->zoom = link_dest->getZoom(); + dest->change_left = link_dest->getChangeLeft(); + dest->change_top = link_dest->getChangeTop(); + dest->change_zoom = link_dest->getChangeZoom(); + + if (document && dest->page_num > 0) { + PopplerPage *page; + + page = poppler_document_get_page(document, dest->page_num - 1); + + if (page) { + dest->left -= page->page->getCropBox()->x1; + dest->bottom -= page->page->getCropBox()->x1; + dest->right -= page->page->getCropBox()->y1; + dest->top -= page->page->getCropBox()->y1; + + g_object_unref(page); + } else { + g_warning("Invalid page %d in Link Destination\n", dest->page_num); + dest->page_num = 0; + } + } + + return dest; +} + +static PopplerDest *dest_new_named(const GooString *named_dest) +{ + PopplerDest *dest; + + dest = g_slice_new0(PopplerDest); + + if (named_dest == nullptr) { + dest->type = POPPLER_DEST_UNKNOWN; + return dest; + } + + const std::string &str = named_dest->toStr(); + + dest->type = POPPLER_DEST_NAMED; + dest->named_dest = poppler_named_dest_from_bytestring((const guint8 *)str.data(), str.size()); + + return dest; +} + +static void build_goto_dest(PopplerDocument *document, PopplerAction *action, const LinkGoTo *link) +{ + const LinkDest *link_dest; + const GooString *named_dest; + + /* Return if it isn't OK */ + if (!link->isOk()) { + action->goto_dest.dest = dest_new_goto(nullptr, nullptr); + return; + } + + link_dest = link->getDest(); + named_dest = link->getNamedDest(); + + if (link_dest != nullptr) { + action->goto_dest.dest = dest_new_goto(document, link_dest); + } else if (named_dest != nullptr) { + action->goto_dest.dest = dest_new_named(named_dest); + } else { + action->goto_dest.dest = dest_new_goto(document, nullptr); + } +} + +static void build_goto_remote(PopplerAction *action, const LinkGoToR *link) +{ + const LinkDest *link_dest; + const GooString *named_dest; + + /* Return if it isn't OK */ + if (!link->isOk()) { + action->goto_remote.dest = dest_new_goto(nullptr, nullptr); + return; + } + + action->goto_remote.file_name = _poppler_goo_string_to_utf8(link->getFileName()); + + link_dest = link->getDest(); + named_dest = link->getNamedDest(); + + if (link_dest != nullptr) { + action->goto_remote.dest = dest_new_goto(nullptr, link_dest); + } else if (named_dest != nullptr) { + action->goto_remote.dest = dest_new_named(named_dest); + } else { + action->goto_remote.dest = dest_new_goto(nullptr, nullptr); + } +} + +static void build_launch(PopplerAction *action, const LinkLaunch *link) +{ + if (link->getFileName()) { + action->launch.file_name = g_strdup(link->getFileName()->c_str()); + } + if (link->getParams()) { + action->launch.params = g_strdup(link->getParams()->c_str()); + } +} + +static void build_uri(PopplerAction *action, const LinkURI *link) +{ + const gchar *uri = link->getURI().c_str(); + if (uri != nullptr) { + action->uri.uri = g_strdup(uri); + } +} + +static void build_named(PopplerAction *action, const LinkNamed *link) +{ + const gchar *name = link->getName().c_str(); + if (name != nullptr) { + action->named.named_dest = g_strdup(name); + } +} + +static AnnotMovie *find_annot_movie_for_action(PopplerDocument *document, const LinkMovie *link) +{ + AnnotMovie *annot = nullptr; + XRef *xref = document->doc->getXRef(); + Object annotObj; + + if (link->hasAnnotRef()) { + const Ref *ref = link->getAnnotRef(); + + annotObj = xref->fetch(*ref); + } else if (link->hasAnnotTitle()) { + const std::string &title = link->getAnnotTitle(); + int i; + + for (i = 1; i <= document->doc->getNumPages(); ++i) { + Page *p = document->doc->getPage(i); + if (!p) { + continue; + } + + Object annots = p->getAnnotsObject(); + if (annots.isArray()) { + int j; + bool found = false; + + for (j = 0; j < annots.arrayGetLength() && !found; ++j) { + annotObj = annots.arrayGet(j); + if (annotObj.isDict()) { + Object obj1 = annotObj.dictLookup("Subtype"); + if (!obj1.isName("Movie")) { + continue; + } + + obj1 = annotObj.dictLookup("T"); + if (obj1.isString() && obj1.getString()->toStr() == title) { + found = true; + } + } + if (!found) { + annotObj.setToNull(); + } + } + if (found) { + break; + } else { + annotObj.setToNull(); + } + } + } + } + + if (annotObj.isDict()) { + Object tmp; + + annot = new AnnotMovie(document->doc, std::move(annotObj), &tmp); + if (!annot->isOk()) { + delete annot; + annot = nullptr; + } + } + + return annot; +} + +static void build_movie(PopplerDocument *document, PopplerAction *action, const LinkMovie *link) +{ + AnnotMovie *annot; + + switch (link->getOperation()) { + case LinkMovie::operationTypePause: + action->movie.operation = POPPLER_ACTION_MOVIE_PAUSE; + break; + case LinkMovie::operationTypeResume: + action->movie.operation = POPPLER_ACTION_MOVIE_RESUME; + break; + case LinkMovie::operationTypeStop: + action->movie.operation = POPPLER_ACTION_MOVIE_STOP; + break; + default: + case LinkMovie::operationTypePlay: + action->movie.operation = POPPLER_ACTION_MOVIE_PLAY; + break; + } + + annot = find_annot_movie_for_action(document, link); + if (annot) { + action->movie.movie = _poppler_movie_new(annot->getMovie()); + delete annot; + } +} + +static void build_javascript(PopplerAction *action, const LinkJavaScript *link) +{ + if (link->isOk()) { + const GooString script(link->getScript()); + action->javascript.script = _poppler_goo_string_to_utf8(&script); + } +} + +static void build_reset_form(PopplerAction *action, const LinkResetForm *link) +{ + const std::vector<std::string> &fields = link->getFields(); + + if (action->reset_form.fields != nullptr) { + g_list_free_full(action->reset_form.fields, g_free); + } + + action->reset_form.fields = nullptr; + for (const auto &field : fields) { + action->reset_form.fields = g_list_append(action->reset_form.fields, g_strdup(field.c_str())); + } + + action->reset_form.exclude = link->getExclude(); +} + +static void build_rendition(PopplerAction *action, const LinkRendition *link) +{ + action->rendition.op = link->getOperation(); + if (link->getMedia()) { + action->rendition.media = _poppler_media_new(link->getMedia()); + } + // TODO: annotation reference +} + +static PopplerLayer *get_layer_for_ref(PopplerDocument *document, GList *layers, const Ref ref, gboolean preserve_rb) +{ + GList *l; + + for (l = layers; l; l = g_list_next(l)) { + Layer *layer = (Layer *)l->data; + + if (layer->oc) { + const Ref ocgRef = layer->oc->getRef(); + + if (ref == ocgRef) { + GList *rb_group = nullptr; + + if (preserve_rb) { + rb_group = _poppler_document_get_layer_rbgroup(document, layer); + } + return _poppler_layer_new(document, layer, rb_group); + } + } + + if (layer->kids) { + PopplerLayer *retval = get_layer_for_ref(document, layer->kids, ref, preserve_rb); + if (retval) { + return retval; + } + } + } + + return nullptr; +} + +static void build_ocg_state(PopplerDocument *document, PopplerAction *action, const LinkOCGState *ocg_state) +{ + const std::vector<LinkOCGState::StateList> &st_list = ocg_state->getStateList(); + bool preserve_rb = ocg_state->getPreserveRB(); + GList *layer_state = nullptr; + + if (!document->layers) { + if (!_poppler_document_get_layers(document)) { + return; + } + } + + for (const LinkOCGState::StateList &list : st_list) { + PopplerActionLayer *action_layer = g_slice_new0(PopplerActionLayer); + + switch (list.st) { + case LinkOCGState::On: + action_layer->action = POPPLER_ACTION_LAYER_ON; + break; + case LinkOCGState::Off: + action_layer->action = POPPLER_ACTION_LAYER_OFF; + break; + case LinkOCGState::Toggle: + action_layer->action = POPPLER_ACTION_LAYER_TOGGLE; + break; + } + + for (const Ref &ref : list.list) { + PopplerLayer *layer = get_layer_for_ref(document, document->layers, ref, preserve_rb); + + action_layer->layers = g_list_prepend(action_layer->layers, layer); + } + + layer_state = g_list_prepend(layer_state, action_layer); + } + + action->ocg_state.state_list = g_list_reverse(layer_state); +} + +PopplerAction *_poppler_action_new(PopplerDocument *document, const LinkAction *link, const gchar *title) +{ + PopplerAction *action; + + action = g_slice_new0(PopplerAction); + + if (title) { + action->any.title = g_strdup(title); + } + + if (link == nullptr) { + action->type = POPPLER_ACTION_NONE; + return action; + } + + switch (link->getKind()) { + case actionGoTo: + action->type = POPPLER_ACTION_GOTO_DEST; + build_goto_dest(document, action, static_cast<const LinkGoTo *>(link)); + break; + case actionGoToR: + action->type = POPPLER_ACTION_GOTO_REMOTE; + build_goto_remote(action, static_cast<const LinkGoToR *>(link)); + break; + case actionLaunch: + action->type = POPPLER_ACTION_LAUNCH; + build_launch(action, static_cast<const LinkLaunch *>(link)); + break; + case actionURI: + action->type = POPPLER_ACTION_URI; + build_uri(action, static_cast<const LinkURI *>(link)); + break; + case actionNamed: + action->type = POPPLER_ACTION_NAMED; + build_named(action, static_cast<const LinkNamed *>(link)); + break; + case actionMovie: + action->type = POPPLER_ACTION_MOVIE; + build_movie(document, action, static_cast<const LinkMovie *>(link)); + break; + case actionRendition: + action->type = POPPLER_ACTION_RENDITION; + build_rendition(action, static_cast<const LinkRendition *>(link)); + break; + case actionOCGState: + action->type = POPPLER_ACTION_OCG_STATE; + build_ocg_state(document, action, static_cast<const LinkOCGState *>(link)); + break; + case actionJavaScript: + action->type = POPPLER_ACTION_JAVASCRIPT; + build_javascript(action, static_cast<const LinkJavaScript *>(link)); + break; + case actionResetForm: + action->type = POPPLER_ACTION_RESET_FORM; + build_reset_form(action, dynamic_cast<const LinkResetForm *>(link)); + break; + case actionUnknown: + default: + action->type = POPPLER_ACTION_UNKNOWN; + break; + } + + return action; +} + +PopplerDest *_poppler_dest_new_goto(PopplerDocument *document, LinkDest *link_dest) +{ + return dest_new_goto(document, link_dest); +} diff --git a/poppler-24.05.0/glib/poppler-action.h b/poppler-24.05.0/glib/poppler-action.h new file mode 100644 index 0000000000000000000000000000000000000000..b4ea01e59d854f441dfb205c80318f6673cea127 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-action.h @@ -0,0 +1,454 @@ +/* poppler-action.h: glib interface to poppler + * Copyright (C) 2004, Red Hat, Inc. + * + * 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. + */ + +#ifndef __POPPLER_ACTION_H__ +#define __POPPLER_ACTION_H__ + +#include <glib-object.h> +#include "poppler.h" + +G_BEGIN_DECLS + +/** + * PopplerActionType: + * @POPPLER_ACTION_UNKNOWN: unknown action + * @POPPLER_ACTION_NONE: no action specified + * @POPPLER_ACTION_GOTO_DEST: go to destination + * @POPPLER_ACTION_GOTO_REMOTE: go to destination in another document + * @POPPLER_ACTION_LAUNCH: launch app (or open document) + * @POPPLER_ACTION_URI: URI + * @POPPLER_ACTION_NAMED: predefined action + * @POPPLER_ACTION_MOVIE: play movies. Since 0.14 + * @POPPLER_ACTION_RENDITION: play multimedia content. Since 0.14 + * @POPPLER_ACTION_OCG_STATE: state of layer. Since 0.14 + * @POPPLER_ACTION_JAVASCRIPT: Javascript. Since 0.18 + * @POPPLER_ACTION_RESET_FORM: resets form. Since 0.90 + * + * Action types + */ +typedef enum +{ + POPPLER_ACTION_UNKNOWN, /* unknown action */ + POPPLER_ACTION_NONE, /* no action specified */ + POPPLER_ACTION_GOTO_DEST, /* go to destination */ + POPPLER_ACTION_GOTO_REMOTE, /* go to destination in new file */ + POPPLER_ACTION_LAUNCH, /* launch app (or open document) */ + POPPLER_ACTION_URI, /* URI */ + POPPLER_ACTION_NAMED, /* named action*/ + POPPLER_ACTION_MOVIE, /* movie action */ + POPPLER_ACTION_RENDITION, /* rendition action */ + POPPLER_ACTION_OCG_STATE, /* Set-OCG-State action */ + POPPLER_ACTION_JAVASCRIPT, /* Javascript action */ + POPPLER_ACTION_RESET_FORM /* ResetForm action */ +} PopplerActionType; + +/** + * PopplerDestType: + * @POPPLER_DEST_UNKNOWN: unknown destination + * @POPPLER_DEST_XYZ: go to page with coordinates (left, top) + * positioned at the upper-left corner of the window and the contents of + * the page magnified by the factor zoom + * @POPPLER_DEST_FIT: go to page with its contents magnified just + * enough to fit the entire page within the window both horizontally and + * vertically + * @POPPLER_DEST_FITH: go to page with the vertical coordinate top + * positioned at the top edge of the window and the contents of the page + * magnified just enough to fit the entire width of the page within the window + * @POPPLER_DEST_FITV: go to page with the horizontal coordinate + * left positioned at the left edge of the window and the contents of the + * page magnified just enough to fit the entire height of the page within the window + * @POPPLER_DEST_FITR: go to page with its contents magnified just + * enough to fit the rectangle specified by the coordinates left, bottom, + * right, and top entirely within the window both horizontally and vertically + * @POPPLER_DEST_FITB: go to page with its contents magnified just enough to fit + * its bounding box entirely within the window both horizontally and vertically + * @POPPLER_DEST_FITBH: go to page with the vertical + * coordinate top positioned at the top edge of the window and the + * contents of the page magnified just enough to fit the entire width of its + * bounding box within the window + * @POPPLER_DEST_FITBV: go to page with the horizontal + * coordinate left positioned at the left edge of the window and the + * contents of the page magnified just enough to fit the entire height of its + * bounding box within the window + * @POPPLER_DEST_NAMED: got to page specified by a name. See poppler_document_find_dest() + * + * Destination types + */ +typedef enum +{ + POPPLER_DEST_UNKNOWN, + POPPLER_DEST_XYZ, + POPPLER_DEST_FIT, + POPPLER_DEST_FITH, + POPPLER_DEST_FITV, + POPPLER_DEST_FITR, + POPPLER_DEST_FITB, + POPPLER_DEST_FITBH, + POPPLER_DEST_FITBV, + POPPLER_DEST_NAMED +} PopplerDestType; + +/** + * PopplerActionMovieOperation: + * @POPPLER_ACTION_MOVIE_PLAY: play movie + * @POPPLER_ACTION_MOVIE_PAUSE: pause playing movie + * @POPPLER_ACTION_MOVIE_RESUME: resume paused movie + * @POPPLER_ACTION_MOVIE_STOP: stop playing movie + * + * Movie operations + * + * Since: 0.14 + */ +typedef enum +{ + POPPLER_ACTION_MOVIE_PLAY, + POPPLER_ACTION_MOVIE_PAUSE, + POPPLER_ACTION_MOVIE_RESUME, + POPPLER_ACTION_MOVIE_STOP +} PopplerActionMovieOperation; + +/** + * PopplerActionLayerAction: + * @POPPLER_ACTION_LAYER_ON: set layer visibility on + * @POPPLER_ACTION_LAYER_OFF: set layer visibility off + * @POPPLER_ACTION_LAYER_TOGGLE: reverse the layer visibility state + * + * Layer actions + * + * Since: 0.14 + */ +typedef enum +{ + POPPLER_ACTION_LAYER_ON, + POPPLER_ACTION_LAYER_OFF, + POPPLER_ACTION_LAYER_TOGGLE +} PopplerActionLayerAction; + +/* Define the PopplerAction types */ +typedef struct _PopplerActionAny PopplerActionAny; +typedef struct _PopplerActionGotoDest PopplerActionGotoDest; +typedef struct _PopplerActionGotoRemote PopplerActionGotoRemote; +typedef struct _PopplerActionLaunch PopplerActionLaunch; +typedef struct _PopplerActionUri PopplerActionUri; +typedef struct _PopplerActionNamed PopplerActionNamed; +typedef struct _PopplerActionMovie PopplerActionMovie; +typedef struct _PopplerActionRendition PopplerActionRendition; +typedef struct _PopplerActionOCGState PopplerActionOCGState; +typedef struct _PopplerActionJavascript PopplerActionJavascript; +typedef struct _PopplerActionResetForm PopplerActionResetForm; + +/** + * PopplerDest: + * @type: type of destination + * @page_num: page number + * @left: left coordinate + * @bottom: bottom coordinate + * @right: right coordinate + * @top: top coordinate + * @zoom: scale factor + * @named_dest: name of the destination (#POPPLER_DEST_NAMED only) + * @change_left: whether left coordinate should be changed + * @change_top: whether top coordinate should be changed + * @change_zoom: whether scale factor should be changed + * + * Data structure for holding a destination + * + * Note that @named_dest is the string representation of the named + * destination. This is the right form to pass to poppler functions, + * e.g. poppler_document_find_dest(), but to get the destination as + * it appears in the PDF itself, you need to convert it to a bytestring + * with poppler_named_dest_to_bytestring() first. + * Also note that @named_dest does not have a defined encoding and + * is not in a form suitable to be displayed to the user. + */ +struct _PopplerDest +{ + PopplerDestType type; + + int page_num; + double left; + double bottom; + double right; + double top; + double zoom; + gchar *named_dest; + guint change_left : 1; + guint change_top : 1; + guint change_zoom : 1; +}; + +/** + * PopplerActionLayer: + * @action: a #PopplerActionLayerAction + * @layers: (element-type PopplerLayer): list of #PopplerLayer<!-- -->s + * + * Action to perform over a list of layers + */ +struct _PopplerActionLayer +{ + PopplerActionLayerAction action; + GList *layers; +}; + +/** + * PopplerActionAny: + * @type: action type + * @title: action title + * + * Fields common to all #PopplerAction<!-- -->s + */ +struct _PopplerActionAny +{ + PopplerActionType type; + gchar *title; +}; + +/** + * PopplerActionGotoDest: + * @type: action type (%POPPLER_ACTION_GOTO_DEST) + * @title: action title + * @dest: destination + * + * Go to destination + */ +struct _PopplerActionGotoDest +{ + PopplerActionType type; + gchar *title; + + PopplerDest *dest; +}; + +/** + * PopplerActionGotoRemote: + * @type: action type (%POPPLER_ACTION_GOTO_REMOTE) + * @title: action title + * @file_name: file name + * @dest: destination + * + * Go to destination in another document + */ +struct _PopplerActionGotoRemote +{ + PopplerActionType type; + gchar *title; + + gchar *file_name; + PopplerDest *dest; +}; + +/** + * PopplerActionLaunch: + * @type: action type (%POPPLER_ACTION_LAUNCH) + * @title: action title + * @file_name: file name + * @params: parameters + * + * Launch app (or open document) + */ +struct _PopplerActionLaunch +{ + PopplerActionType type; + gchar *title; + + gchar *file_name; + gchar *params; +}; + +/** + * PopplerActionUri: + * @type: action type (%POPPLER_ACTION_URI) + * @title: action title + * @uri: URI + * + * URI + */ +struct _PopplerActionUri +{ + PopplerActionType type; + gchar *title; + + char *uri; +}; + +/** + * PopplerActionNamed: + * @type: action type (%POPPLER_ACTION_NAMED) + * @title: action title + * @named_dest: named destination + * + * Predefined action + */ +struct _PopplerActionNamed +{ + PopplerActionType type; + gchar *title; + + gchar *named_dest; +}; + +/** + * PopplerActionMovie: + * @type: action type (%POPPLER_ACTION_MOVIE) + * @title: action title + * @operation: operation + * @movie: movie + * + * Play movies. + * + * Since: 0.14 + */ +struct _PopplerActionMovie +{ + PopplerActionType type; + gchar *title; + + PopplerActionMovieOperation operation; + PopplerMovie *movie; +}; + +/** + * PopplerActionRendition: + * @type: action type (%POPPLER_ACTION_RENDITION) + * @title: action title + * @op: operation + * @media: media + * + * Play multimedia content. + * + * Since: 0.14 + */ +struct _PopplerActionRendition +{ + PopplerActionType type; + gchar *title; + + gint op; + PopplerMedia *media; +}; + +/** + * PopplerActionOCGState: + * @type: action type (%POPPLER_ACTION_OCG_STATE) + * @title: action title + * @state_list: (element-type PopplerActionLayer): list of #PopplerActionLayer<!-- -->s + * + * State of layer. + * + * Since: 0.14 + */ +struct _PopplerActionOCGState +{ + PopplerActionType type; + gchar *title; + + GList *state_list; +}; + +/** + * PopplerActionJavascript: + * @type: action type (%POPPLER_ACTION_JAVASCRIPT) + * @title: action title + * @script: javascript + * + * Javascript. + * + * Since: 0.18 + */ +struct _PopplerActionJavascript +{ + PopplerActionType type; + gchar *title; + + gchar *script; +}; + +/** + * PopplerActionResetForm: + * @type: action type (%POPPLER_ACTION_RESET_FORM) + * @title: action title + * @fields: (element-type utf8) (nullable): list of field names to + * reset / retain + * @exclude: whether to reset all but the listed fields + * + * Resets some or all fields within a PDF form. + * + * The default behavior resets only the list of @fields, but setting + * @exclude to %TRUE will cause the action to reset all fields but those + * listed. Providing an empty list of fields resets the entire form. + * + * Since: 0.90 + */ +struct _PopplerActionResetForm +{ + PopplerActionType type; + gchar *title; + + GList *fields; + gboolean exclude; +}; + +/** + * PopplerAction: + * + * A generic wrapper for actions that exposes only #PopplerActionType. + */ +union _PopplerAction { + PopplerActionType type; + PopplerActionAny any; + PopplerActionGotoDest goto_dest; + PopplerActionGotoRemote goto_remote; + PopplerActionLaunch launch; + PopplerActionUri uri; + PopplerActionNamed named; + PopplerActionMovie movie; + PopplerActionRendition rendition; + PopplerActionOCGState ocg_state; + PopplerActionJavascript javascript; + PopplerActionResetForm reset_form; +}; + +#define POPPLER_TYPE_ACTION (poppler_action_get_type()) +#define POPPLER_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ACTION, PopplerAction)) + +POPPLER_PUBLIC +GType poppler_action_get_type(void) G_GNUC_CONST; + +POPPLER_PUBLIC +void poppler_action_free(PopplerAction *action); +POPPLER_PUBLIC +PopplerAction *poppler_action_copy(PopplerAction *action); + +#define POPPLER_TYPE_DEST (poppler_dest_get_type()) +POPPLER_PUBLIC +GType poppler_dest_get_type(void) G_GNUC_CONST; + +POPPLER_PUBLIC +void poppler_dest_free(PopplerDest *dest); +POPPLER_PUBLIC +PopplerDest *poppler_dest_copy(PopplerDest *dest); + +POPPLER_PUBLIC +char *poppler_named_dest_from_bytestring(const guint8 *data, gsize length); + +POPPLER_PUBLIC +guint8 *poppler_named_dest_to_bytestring(const char *name, gsize *length); + +G_END_DECLS + +#endif /* __POPPLER_GLIB_H__ */ diff --git a/poppler-24.05.0/glib/poppler-annot.cc b/poppler-24.05.0/glib/poppler-annot.cc new file mode 100644 index 0000000000000000000000000000000000000000..b995f03759b02feb02ba6f76670d69b60ffedf83 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-annot.cc @@ -0,0 +1,2201 @@ +/* poppler-annot.cc: glib interface to poppler + * + * Copyright (C) 2007 Inigo Martinez <inigomartinez@gmail.com> + * Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org> + * Copyright (C) 2013 German Poo-Caamano <gpoo@gnome.org> + * + * 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 "config.h" +#include "poppler.h" +#include "poppler-private.h" + +#define ZERO_CROPBOX(c) (!(c && (c->x1 > 0.01 || c->y1 > 0.01))) + +const PDFRectangle *_poppler_annot_get_cropbox_and_page(PopplerAnnot *poppler_annot, Page **page_out); +AnnotStampImageHelper *_poppler_convert_cairo_image_to_stamp_image_helper(cairo_surface_t *image, PDFDoc *doc, GError **error); + +/** + * SECTION:poppler-annot + * @short_description: Annotations + * @title: PopplerAnnot + */ + +typedef struct _PopplerAnnotClass PopplerAnnotClass; +typedef struct _PopplerAnnotMarkupClass PopplerAnnotMarkupClass; +typedef struct _PopplerAnnotFreeTextClass PopplerAnnotFreeTextClass; +typedef struct _PopplerAnnotTextClass PopplerAnnotTextClass; +typedef struct _PopplerAnnotTextMarkupClass PopplerAnnotTextMarkupClass; +typedef struct _PopplerAnnotFileAttachmentClass PopplerAnnotFileAttachmentClass; +typedef struct _PopplerAnnotMovieClass PopplerAnnotMovieClass; +typedef struct _PopplerAnnotScreenClass PopplerAnnotScreenClass; +typedef struct _PopplerAnnotLineClass PopplerAnnotLineClass; +typedef struct _PopplerAnnotCircleClass PopplerAnnotCircleClass; +typedef struct _PopplerAnnotSquareClass PopplerAnnotSquareClass; +typedef struct _PopplerAnnotStampClass PopplerAnnotStampClass; + +struct _PopplerAnnotClass +{ + GObjectClass parent_class; +}; + +struct _PopplerAnnotMarkup +{ + PopplerAnnot parent_instance; +}; + +struct _PopplerAnnotMarkupClass +{ + PopplerAnnotClass parent_class; +}; + +struct _PopplerAnnotText +{ + PopplerAnnotMarkup parent_instance; +}; + +struct _PopplerAnnotTextClass +{ + PopplerAnnotMarkupClass parent_class; +}; + +struct _PopplerAnnotTextMarkup +{ + PopplerAnnotMarkup parent_instance; +}; + +struct _PopplerAnnotTextMarkupClass +{ + PopplerAnnotMarkupClass parent_class; +}; + +struct _PopplerAnnotFreeText +{ + PopplerAnnotMarkup parent_instance; +}; + +struct _PopplerAnnotFreeTextClass +{ + PopplerAnnotMarkupClass parent_class; +}; + +struct _PopplerAnnotFileAttachment +{ + PopplerAnnotMarkup parent_instance; +}; + +struct _PopplerAnnotFileAttachmentClass +{ + PopplerAnnotMarkupClass parent_class; +}; + +struct _PopplerAnnotMovie +{ + PopplerAnnot parent_instance; + + PopplerMovie *movie; +}; + +struct _PopplerAnnotMovieClass +{ + PopplerAnnotClass parent_class; +}; + +struct _PopplerAnnotScreen +{ + PopplerAnnot parent_instance; + + PopplerAction *action; +}; + +struct _PopplerAnnotScreenClass +{ + PopplerAnnotClass parent_class; +}; + +struct _PopplerAnnotLine +{ + PopplerAnnotMarkup parent_instance; +}; + +struct _PopplerAnnotLineClass +{ + PopplerAnnotMarkupClass parent_class; +}; + +struct _PopplerAnnotCircle +{ + PopplerAnnotMarkup parent_instance; +}; + +struct _PopplerAnnotCircleClass +{ + PopplerAnnotMarkupClass parent_class; +}; + +struct _PopplerAnnotSquare +{ + PopplerAnnotMarkup parent_instance; +}; + +struct _PopplerAnnotSquareClass +{ + PopplerAnnotMarkupClass parent_class; +}; +struct _PopplerAnnotStamp +{ + PopplerAnnot parent_instance; +}; +struct _PopplerAnnotStampClass +{ + PopplerAnnotClass parent_class; +}; + +G_DEFINE_TYPE(PopplerAnnot, poppler_annot, G_TYPE_OBJECT) +G_DEFINE_TYPE(PopplerAnnotMarkup, poppler_annot_markup, POPPLER_TYPE_ANNOT) +G_DEFINE_TYPE(PopplerAnnotTextMarkup, poppler_annot_text_markup, POPPLER_TYPE_ANNOT_MARKUP) +G_DEFINE_TYPE(PopplerAnnotText, poppler_annot_text, POPPLER_TYPE_ANNOT_MARKUP) +G_DEFINE_TYPE(PopplerAnnotFreeText, poppler_annot_free_text, POPPLER_TYPE_ANNOT_MARKUP) +G_DEFINE_TYPE(PopplerAnnotFileAttachment, poppler_annot_file_attachment, POPPLER_TYPE_ANNOT_MARKUP) +G_DEFINE_TYPE(PopplerAnnotMovie, poppler_annot_movie, POPPLER_TYPE_ANNOT) +G_DEFINE_TYPE(PopplerAnnotScreen, poppler_annot_screen, POPPLER_TYPE_ANNOT) +G_DEFINE_TYPE(PopplerAnnotLine, poppler_annot_line, POPPLER_TYPE_ANNOT_MARKUP) +G_DEFINE_TYPE(PopplerAnnotCircle, poppler_annot_circle, POPPLER_TYPE_ANNOT_MARKUP) +G_DEFINE_TYPE(PopplerAnnotSquare, poppler_annot_square, POPPLER_TYPE_ANNOT_MARKUP) +G_DEFINE_TYPE(PopplerAnnotStamp, poppler_annot_stamp, POPPLER_TYPE_ANNOT) + +static PopplerAnnot *_poppler_create_annot(GType annot_type, Annot *annot) +{ + PopplerAnnot *poppler_annot; + + poppler_annot = POPPLER_ANNOT(g_object_new(annot_type, nullptr)); + poppler_annot->annot = annot; + annot->incRefCnt(); + + return poppler_annot; +} + +static void poppler_annot_finalize(GObject *object) +{ + PopplerAnnot *poppler_annot = POPPLER_ANNOT(object); + + if (poppler_annot->annot) { + poppler_annot->annot->decRefCnt(); + poppler_annot->annot = nullptr; + } + + G_OBJECT_CLASS(poppler_annot_parent_class)->finalize(object); +} + +static void poppler_annot_init(PopplerAnnot *poppler_annot) { } + +static void poppler_annot_class_init(PopplerAnnotClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->finalize = poppler_annot_finalize; +} + +PopplerAnnot *_poppler_annot_new(Annot *annot) +{ + return _poppler_create_annot(POPPLER_TYPE_ANNOT, annot); +} + +static void poppler_annot_markup_init(PopplerAnnotMarkup *poppler_annot) { } + +static void poppler_annot_markup_class_init(PopplerAnnotMarkupClass *klass) { } + +static void poppler_annot_text_init(PopplerAnnotText *poppler_annot) { } + +static void poppler_annot_text_class_init(PopplerAnnotTextClass *klass) { } + +PopplerAnnot *_poppler_annot_text_new(Annot *annot) +{ + return _poppler_create_annot(POPPLER_TYPE_ANNOT_TEXT, annot); +} + +/** + * poppler_annot_text_new: + * @doc: a #PopplerDocument + * @rect: a #PopplerRectangle + * + * Creates a new Text annotation that will be + * located on @rect when added to a page. See + * poppler_page_add_annot() + * + * Return value: A newly created #PopplerAnnotText annotation + * + * Since: 0.16 + */ +PopplerAnnot *poppler_annot_text_new(PopplerDocument *doc, PopplerRectangle *rect) +{ + Annot *annot; + PDFRectangle pdf_rect(rect->x1, rect->y1, rect->x2, rect->y2); + + annot = new AnnotText(doc->doc, &pdf_rect); + + return _poppler_annot_text_new(annot); +} + +PopplerAnnot *_poppler_annot_text_markup_new(Annot *annot) +{ + return _poppler_create_annot(POPPLER_TYPE_ANNOT_TEXT_MARKUP, annot); +} + +static AnnotQuadrilaterals *create_annot_quads_from_poppler_quads(GArray *quads) +{ + g_assert(quads->len > 0); + + auto quads_array = std::make_unique<AnnotQuadrilaterals::AnnotQuadrilateral[]>(quads->len); + for (guint i = 0; i < quads->len; i++) { + PopplerQuadrilateral *quadrilateral = &g_array_index(quads, PopplerQuadrilateral, i); + + quads_array[i] = AnnotQuadrilaterals::AnnotQuadrilateral(quadrilateral->p1.x, quadrilateral->p1.y, quadrilateral->p2.x, quadrilateral->p2.y, quadrilateral->p3.x, quadrilateral->p3.y, quadrilateral->p4.x, quadrilateral->p4.y); + } + + return new AnnotQuadrilaterals(std::move(quads_array), quads->len); +} + +/* If @crop_box parameter is non null, it will substract the crop_box offset + * from the coordinates of the returned #PopplerQuadrilateral array */ +static GArray *create_poppler_quads_from_annot_quads(AnnotQuadrilaterals *quads_array, const PDFRectangle *crop_box) +{ + GArray *quads; + guint quads_len; + PDFRectangle zerobox; + + if (!crop_box) { + zerobox = PDFRectangle(); + crop_box = &zerobox; + } + + quads_len = quads_array->getQuadrilateralsLength(); + quads = g_array_sized_new(FALSE, FALSE, sizeof(PopplerQuadrilateral), quads_len); + g_array_set_size(quads, quads_len); + + for (guint i = 0; i < quads_len; ++i) { + PopplerQuadrilateral *quadrilateral = &g_array_index(quads, PopplerQuadrilateral, i); + + quadrilateral->p1.x = quads_array->getX1(i) - crop_box->x1; + quadrilateral->p1.y = quads_array->getY1(i) - crop_box->y1; + quadrilateral->p2.x = quads_array->getX2(i) - crop_box->x1; + quadrilateral->p2.y = quads_array->getY2(i) - crop_box->y1; + quadrilateral->p3.x = quads_array->getX3(i) - crop_box->x1; + quadrilateral->p3.y = quads_array->getY3(i) - crop_box->y1; + quadrilateral->p4.x = quads_array->getX4(i) - crop_box->x1; + quadrilateral->p4.y = quads_array->getY4(i) - crop_box->y1; + } + + return quads; +} + +static void poppler_annot_text_markup_init(PopplerAnnotTextMarkup *poppler_annot) { } + +static void poppler_annot_text_markup_class_init(PopplerAnnotTextMarkupClass *klass) { } + +/** + * poppler_annot_text_markup_new_highlight: + * @doc: a #PopplerDocument + * @rect: a #PopplerRectangle + * @quadrilaterals: (element-type PopplerQuadrilateral): A #GArray of + * #PopplerQuadrilateral<!-- -->s + * + * Creates a new Highlight Text annotation that will be + * located on @rect when added to a page. See poppler_page_add_annot() + * + * Return value: (transfer full): A newly created #PopplerAnnotTextMarkup annotation + * + * Since: 0.26 + */ +PopplerAnnot *poppler_annot_text_markup_new_highlight(PopplerDocument *doc, PopplerRectangle *rect, GArray *quadrilaterals) +{ + PopplerAnnot *poppler_annot; + AnnotTextMarkup *annot; + PDFRectangle pdf_rect(rect->x1, rect->y1, rect->x2, rect->y2); + + annot = new AnnotTextMarkup(doc->doc, &pdf_rect, Annot::typeHighlight); + + poppler_annot = _poppler_annot_text_markup_new(annot); + poppler_annot_text_markup_set_quadrilaterals(POPPLER_ANNOT_TEXT_MARKUP(poppler_annot), quadrilaterals); + return poppler_annot; +} + +/** + * poppler_annot_text_markup_new_squiggly: + * @doc: a #PopplerDocument + * @rect: a #PopplerRectangle + * @quadrilaterals: (element-type PopplerQuadrilateral): A #GArray of + * #PopplerQuadrilateral<!-- -->s + * + * Creates a new Squiggly Text annotation that will be + * located on @rect when added to a page. See poppler_page_add_annot() + * + * Return value: (transfer full): A newly created #PopplerAnnotTextMarkup annotation + * + * Since: 0.26 + */ +PopplerAnnot *poppler_annot_text_markup_new_squiggly(PopplerDocument *doc, PopplerRectangle *rect, GArray *quadrilaterals) +{ + PopplerAnnot *poppler_annot; + AnnotTextMarkup *annot; + PDFRectangle pdf_rect(rect->x1, rect->y1, rect->x2, rect->y2); + + g_return_val_if_fail(quadrilaterals != nullptr && quadrilaterals->len > 0, NULL); + + annot = new AnnotTextMarkup(doc->doc, &pdf_rect, Annot::typeSquiggly); + + poppler_annot = _poppler_annot_text_markup_new(annot); + poppler_annot_text_markup_set_quadrilaterals(POPPLER_ANNOT_TEXT_MARKUP(poppler_annot), quadrilaterals); + return poppler_annot; +} + +/** + * poppler_annot_text_markup_new_strikeout: + * @doc: a #PopplerDocument + * @rect: a #PopplerRectangle + * @quadrilaterals: (element-type PopplerQuadrilateral): A #GArray of + * #PopplerQuadrilateral<!-- -->s + * + * Creates a new Strike Out Text annotation that will be + * located on @rect when added to a page. See poppler_page_add_annot() + * + * Return value: (transfer full): A newly created #PopplerAnnotTextMarkup annotation + * + * Since: 0.26 + */ +PopplerAnnot *poppler_annot_text_markup_new_strikeout(PopplerDocument *doc, PopplerRectangle *rect, GArray *quadrilaterals) +{ + PopplerAnnot *poppler_annot; + AnnotTextMarkup *annot; + PDFRectangle pdf_rect(rect->x1, rect->y1, rect->x2, rect->y2); + + g_return_val_if_fail(quadrilaterals != nullptr && quadrilaterals->len > 0, NULL); + + annot = new AnnotTextMarkup(doc->doc, &pdf_rect, Annot::typeStrikeOut); + + poppler_annot = _poppler_annot_text_markup_new(annot); + poppler_annot_text_markup_set_quadrilaterals(POPPLER_ANNOT_TEXT_MARKUP(poppler_annot), quadrilaterals); + return poppler_annot; +} + +/** + * poppler_annot_text_markup_new_underline: + * @doc: a #PopplerDocument + * @rect: a #PopplerRectangle + * @quadrilaterals: (element-type PopplerQuadrilateral): A #GArray of + * #PopplerQuadrilateral<!-- -->s + * + * Creates a new Underline Text annotation that will be + * located on @rect when added to a page. See poppler_page_add_annot() + * + * Return value: (transfer full): A newly created #PopplerAnnotTextMarkup annotation + * + * Since: 0.26 + */ +PopplerAnnot *poppler_annot_text_markup_new_underline(PopplerDocument *doc, PopplerRectangle *rect, GArray *quadrilaterals) +{ + PopplerAnnot *poppler_annot; + AnnotTextMarkup *annot; + PDFRectangle pdf_rect(rect->x1, rect->y1, rect->x2, rect->y2); + + g_return_val_if_fail(quadrilaterals != nullptr && quadrilaterals->len > 0, NULL); + + annot = new AnnotTextMarkup(doc->doc, &pdf_rect, Annot::typeUnderline); + + poppler_annot = _poppler_annot_text_markup_new(annot); + poppler_annot_text_markup_set_quadrilaterals(POPPLER_ANNOT_TEXT_MARKUP(poppler_annot), quadrilaterals); + return poppler_annot; +} + +static void poppler_annot_free_text_init(PopplerAnnotFreeText *poppler_annot) { } + +static void poppler_annot_free_text_class_init(PopplerAnnotFreeTextClass *klass) { } + +PopplerAnnot *_poppler_annot_free_text_new(Annot *annot) +{ + return _poppler_create_annot(POPPLER_TYPE_ANNOT_FREE_TEXT, annot); +} + +static void poppler_annot_file_attachment_init(PopplerAnnotFileAttachment *poppler_annot) { } + +static void poppler_annot_file_attachment_class_init(PopplerAnnotFileAttachmentClass *klass) { } + +PopplerAnnot *_poppler_annot_file_attachment_new(Annot *annot) +{ + return _poppler_create_annot(POPPLER_TYPE_ANNOT_FILE_ATTACHMENT, annot); +} + +static void poppler_annot_movie_finalize(GObject *object) +{ + PopplerAnnotMovie *annot_movie = POPPLER_ANNOT_MOVIE(object); + + if (annot_movie->movie) { + g_object_unref(annot_movie->movie); + annot_movie->movie = nullptr; + } + + G_OBJECT_CLASS(poppler_annot_movie_parent_class)->finalize(object); +} + +static void poppler_annot_movie_init(PopplerAnnotMovie *poppler_annot) { } + +static void poppler_annot_movie_class_init(PopplerAnnotMovieClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->finalize = poppler_annot_movie_finalize; +} + +PopplerAnnot *_poppler_annot_movie_new(Annot *annot) +{ + PopplerAnnot *poppler_annot; + AnnotMovie *annot_movie; + + poppler_annot = _poppler_create_annot(POPPLER_TYPE_ANNOT_MOVIE, annot); + annot_movie = static_cast<AnnotMovie *>(poppler_annot->annot); + POPPLER_ANNOT_MOVIE(poppler_annot)->movie = _poppler_movie_new(annot_movie->getMovie()); + + return poppler_annot; +} + +static void poppler_annot_screen_finalize(GObject *object) +{ + PopplerAnnotScreen *annot_screen = POPPLER_ANNOT_SCREEN(object); + + if (annot_screen->action) { + poppler_action_free(annot_screen->action); + annot_screen->action = nullptr; + } + + G_OBJECT_CLASS(poppler_annot_screen_parent_class)->finalize(object); +} + +static void poppler_annot_screen_init(PopplerAnnotScreen *poppler_annot) { } + +static void poppler_annot_screen_class_init(PopplerAnnotScreenClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->finalize = poppler_annot_screen_finalize; +} + +PopplerAnnot *_poppler_annot_screen_new(PopplerDocument *doc, Annot *annot) +{ + PopplerAnnot *poppler_annot; + AnnotScreen *annot_screen; + LinkAction *action; + + poppler_annot = _poppler_create_annot(POPPLER_TYPE_ANNOT_SCREEN, annot); + annot_screen = static_cast<AnnotScreen *>(poppler_annot->annot); + action = annot_screen->getAction(); + if (action) { + POPPLER_ANNOT_SCREEN(poppler_annot)->action = _poppler_action_new(doc, action, nullptr); + } + + return poppler_annot; +} + +PopplerAnnot *_poppler_annot_line_new(Annot *annot) +{ + return _poppler_create_annot(POPPLER_TYPE_ANNOT_LINE, annot); +} + +static void poppler_annot_line_init(PopplerAnnotLine *poppler_annot) { } + +static void poppler_annot_line_class_init(PopplerAnnotLineClass *klass) { } + +/** + * poppler_annot_line_new: + * @doc: a #PopplerDocument + * @rect: a #PopplerRectangle + * @start: a #PopplerPoint of the starting vertice + * @end: a #PopplerPoint of the ending vertice + * + * Creates a new Line annotation that will be + * located on @rect when added to a page. See + * poppler_page_add_annot() + * + * Return value: A newly created #PopplerAnnotLine annotation + * + * Since: 0.26 + */ +PopplerAnnot *poppler_annot_line_new(PopplerDocument *doc, PopplerRectangle *rect, PopplerPoint *start, PopplerPoint *end) +{ + PopplerAnnot *poppler_annot; + Annot *annot; + PDFRectangle pdf_rect(rect->x1, rect->y1, rect->x2, rect->y2); + + annot = new AnnotLine(doc->doc, &pdf_rect); + + poppler_annot = _poppler_annot_line_new(annot); + poppler_annot_line_set_vertices(POPPLER_ANNOT_LINE(poppler_annot), start, end); + return poppler_annot; +} + +PopplerAnnot *_poppler_annot_circle_new(Annot *annot) +{ + return _poppler_create_annot(POPPLER_TYPE_ANNOT_CIRCLE, annot); +} + +static void poppler_annot_circle_init(PopplerAnnotCircle *poppler_annot) { } + +static void poppler_annot_circle_class_init(PopplerAnnotCircleClass *klass) { } + +/** + * poppler_annot_circle_new: + * @doc: a #PopplerDocument + * @rect: a #PopplerRectangle + * + * Creates a new Circle annotation that will be + * located on @rect when added to a page. See + * poppler_page_add_annot() + * + * Return value: a newly created #PopplerAnnotCircle annotation + * + * Since: 0.26 + **/ +PopplerAnnot *poppler_annot_circle_new(PopplerDocument *doc, PopplerRectangle *rect) +{ + Annot *annot; + PDFRectangle pdf_rect(rect->x1, rect->y1, rect->x2, rect->y2); + + annot = new AnnotGeometry(doc->doc, &pdf_rect, Annot::typeCircle); + + return _poppler_annot_circle_new(annot); +} + +PopplerAnnot *_poppler_annot_square_new(Annot *annot) +{ + return _poppler_create_annot(POPPLER_TYPE_ANNOT_SQUARE, annot); +} + +static void poppler_annot_square_init(PopplerAnnotSquare *poppler_annot) { } + +static void poppler_annot_square_class_init(PopplerAnnotSquareClass *klass) { } + +/** + * poppler_annot_square_new: + * @doc: a #PopplerDocument + * @rect: a #PopplerRectangle + * + * Creates a new Square annotation that will be + * located on @rect when added to a page. See + * poppler_page_add_annot() + * + * Return value: a newly created #PopplerAnnotSquare annotation + * + * Since: 0.26 + **/ +PopplerAnnot *poppler_annot_square_new(PopplerDocument *doc, PopplerRectangle *rect) +{ + Annot *annot; + PDFRectangle pdf_rect(rect->x1, rect->y1, rect->x2, rect->y2); + + annot = new AnnotGeometry(doc->doc, &pdf_rect, Annot::typeSquare); + + return _poppler_annot_square_new(annot); +} + +static void poppler_annot_stamp_finalize(GObject *object) +{ + G_OBJECT_CLASS(poppler_annot_stamp_parent_class)->finalize(object); +} + +static void poppler_annot_stamp_init(PopplerAnnotStamp *poppler_annot) { } + +static void poppler_annot_stamp_class_init(PopplerAnnotStampClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->finalize = poppler_annot_stamp_finalize; +} + +PopplerAnnot *_poppler_annot_stamp_new(Annot *annot) +{ + PopplerAnnot *poppler_annot; + + poppler_annot = _poppler_create_annot(POPPLER_TYPE_ANNOT_STAMP, annot); + + return poppler_annot; +} + +/** + * poppler_annot_stamp_new: + * @doc: a #PopplerDocument + * @rect: a #PopplerRectangle + * + * Creates a new Stamp annotation that will be + * located on @rect when added to a page. See + * poppler_page_add_annot() + * + * Return value: a newly created #PopplerAnnotStamp annotation + * + * Since: 22.07.0 + **/ +PopplerAnnot *poppler_annot_stamp_new(PopplerDocument *doc, PopplerRectangle *rect) +{ + Annot *annot; + PDFRectangle pdf_rect(rect->x1, rect->y1, rect->x2, rect->y2); + + annot = new AnnotStamp(doc->doc, &pdf_rect); + + return _poppler_annot_stamp_new(annot); +} + +static gboolean get_raw_data_from_cairo_image(cairo_surface_t *image, cairo_format_t format, const int width, const int height, const size_t rowstride_c, GByteArray *data, GByteArray *soft_mask_data) +{ + gboolean has_alpha = format == CAIRO_FORMAT_ARGB32; + +#if G_BYTE_ORDER == G_LITTLE_ENDIAN + static const size_t CAIRO_B = 0; + static const size_t CAIRO_G = 1; + static const size_t CAIRO_R = 2; + static const size_t CAIRO_A = 3; +#elif G_BYTE_ORDER == G_BIG_ENDIAN + static const size_t CAIRO_A = 0; + static const size_t CAIRO_R = 1; + static const size_t CAIRO_G = 2; + static const size_t CAIRO_B = 3; +#else +# error "Unsupported endian type" +#endif + + cairo_surface_flush(image); + unsigned char *pixels_c = cairo_image_surface_get_data(image); + + if (format == CAIRO_FORMAT_ARGB32 || format == CAIRO_FORMAT_RGB24) { + unsigned char pixel[3]; + + for (int h = 0; h < height; h++) { + unsigned char *iter_c = pixels_c + h * rowstride_c; + for (int w = 0; w < width; w++) { + pixel[0] = iter_c[CAIRO_R]; + pixel[1] = iter_c[CAIRO_G]; + pixel[2] = iter_c[CAIRO_B]; + iter_c += 4; + + g_byte_array_append(data, (guint8 *)pixel, 3); + if (has_alpha) { + g_byte_array_append(soft_mask_data, (guint8 *)&iter_c[CAIRO_A], 1); + } + } + } + return TRUE; + } + + return FALSE; +} + +AnnotStampImageHelper *_poppler_convert_cairo_image_to_stamp_image_helper(cairo_surface_t *image, PDFDoc *doc, GError **error) +{ + AnnotStampImageHelper *annotImg; + GByteArray *data; + GByteArray *sMaskData; + + int bitsPerComponent; + const int width = cairo_image_surface_get_width(image); + const int height = cairo_image_surface_get_height(image); + const size_t rowstride_c = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width); + cairo_format_t format = cairo_image_surface_get_format(image); + + ColorSpace colorSpace; + + if (format == CAIRO_FORMAT_ARGB32 || format == CAIRO_FORMAT_RGB24) { + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + } else { + g_set_error(error, POPPLER_ERROR, POPPLER_ERROR_INVALID, "Invalid or unsupported cairo image type %u", (unsigned int)format); + return nullptr; + } + + data = g_byte_array_sized_new((guint)((width * 4) + rowstride_c) * height); + sMaskData = g_byte_array_sized_new((guint)((width * 4) + rowstride_c) * height); + + if (!get_raw_data_from_cairo_image(image, format, width, height, rowstride_c, data, sMaskData)) { + g_set_error(error, POPPLER_ERROR, POPPLER_ERROR_INVALID, "Failed to get raw data from cairo image"); + g_byte_array_unref(data); + g_byte_array_unref(sMaskData); + return nullptr; + } + + if (sMaskData->len > 0) { + AnnotStampImageHelper sMask(doc, width, height, ColorSpace::DeviceGray, 8, (char *)sMaskData->data, (int)sMaskData->len); + annotImg = new AnnotStampImageHelper(doc, width, height, colorSpace, bitsPerComponent, (char *)data->data, (int)data->len, sMask.getRef()); + } else { + annotImg = new AnnotStampImageHelper(doc, width, height, colorSpace, bitsPerComponent, (char *)data->data, (int)data->len); + } + + g_byte_array_unref(data); + g_byte_array_unref(sMaskData); + + return annotImg; +} + +/* Public methods */ +/** + * poppler_annot_get_annot_type: + * @poppler_annot: a #PopplerAnnot + * + * Gets the type of @poppler_annot + * + * Return value: #PopplerAnnotType of @poppler_annot. + **/ +PopplerAnnotType poppler_annot_get_annot_type(PopplerAnnot *poppler_annot) +{ + g_return_val_if_fail(POPPLER_IS_ANNOT(poppler_annot), POPPLER_ANNOT_UNKNOWN); + + switch (poppler_annot->annot->getType()) { + case Annot::typeText: + return POPPLER_ANNOT_TEXT; + case Annot::typeLink: + return POPPLER_ANNOT_LINK; + case Annot::typeFreeText: + return POPPLER_ANNOT_FREE_TEXT; + case Annot::typeLine: + return POPPLER_ANNOT_LINE; + case Annot::typeSquare: + return POPPLER_ANNOT_SQUARE; + case Annot::typeCircle: + return POPPLER_ANNOT_CIRCLE; + case Annot::typePolygon: + return POPPLER_ANNOT_POLYGON; + case Annot::typePolyLine: + return POPPLER_ANNOT_POLY_LINE; + case Annot::typeHighlight: + return POPPLER_ANNOT_HIGHLIGHT; + case Annot::typeUnderline: + return POPPLER_ANNOT_UNDERLINE; + case Annot::typeSquiggly: + return POPPLER_ANNOT_SQUIGGLY; + case Annot::typeStrikeOut: + return POPPLER_ANNOT_STRIKE_OUT; + case Annot::typeStamp: + return POPPLER_ANNOT_STAMP; + case Annot::typeCaret: + return POPPLER_ANNOT_CARET; + case Annot::typeInk: + return POPPLER_ANNOT_INK; + case Annot::typePopup: + return POPPLER_ANNOT_POPUP; + case Annot::typeFileAttachment: + return POPPLER_ANNOT_FILE_ATTACHMENT; + case Annot::typeSound: + return POPPLER_ANNOT_SOUND; + case Annot::typeMovie: + return POPPLER_ANNOT_MOVIE; + case Annot::typeWidget: + return POPPLER_ANNOT_WIDGET; + case Annot::typeScreen: + return POPPLER_ANNOT_SCREEN; + case Annot::typePrinterMark: + return POPPLER_ANNOT_PRINTER_MARK; + case Annot::typeTrapNet: + return POPPLER_ANNOT_TRAP_NET; + case Annot::typeWatermark: + return POPPLER_ANNOT_WATERMARK; + case Annot::type3D: + return POPPLER_ANNOT_3D; + default: + g_warning("Unsupported Annot Type"); + } + + return POPPLER_ANNOT_UNKNOWN; +} + +/** + * poppler_annot_get_contents: + * @poppler_annot: a #PopplerAnnot + * + * Retrieves the contents of @poppler_annot. + * + * Return value: a new allocated string with the contents of @poppler_annot. It + * must be freed with g_free() when done. + **/ +gchar *poppler_annot_get_contents(PopplerAnnot *poppler_annot) +{ + const GooString *contents; + + g_return_val_if_fail(POPPLER_IS_ANNOT(poppler_annot), NULL); + + contents = poppler_annot->annot->getContents(); + + return contents && contents->getLength() > 0 ? _poppler_goo_string_to_utf8(contents) : nullptr; +} + +/** + * poppler_annot_set_contents: + * @poppler_annot: a #PopplerAnnot + * @contents: a text string containing the new contents + * + * Sets the contents of @poppler_annot to the given value, + * replacing the current contents. + * + * Since: 0.12 + **/ +void poppler_annot_set_contents(PopplerAnnot *poppler_annot, const gchar *contents) +{ + gchar *tmp; + gsize length = 0; + + g_return_if_fail(POPPLER_IS_ANNOT(poppler_annot)); + + tmp = contents ? g_convert(contents, -1, "UTF-16BE", "UTF-8", nullptr, &length, nullptr) : nullptr; + poppler_annot->annot->setContents(std::make_unique<GooString>(tmp, length)); + g_free(tmp); +} + +/** + * poppler_annot_get_name: + * @poppler_annot: a #PopplerAnnot + * + * Retrieves the name of @poppler_annot. + * + * Return value: a new allocated string with the name of @poppler_annot. It must + * be freed with g_free() when done. + **/ +gchar *poppler_annot_get_name(PopplerAnnot *poppler_annot) +{ + const GooString *name; + + g_return_val_if_fail(POPPLER_IS_ANNOT(poppler_annot), NULL); + + name = poppler_annot->annot->getName(); + + return name ? _poppler_goo_string_to_utf8(name) : nullptr; +} + +/** + * poppler_annot_get_modified: + * @poppler_annot: a #PopplerAnnot + * + * Retrieves the last modification data of @poppler_annot. The returned + * string will be either a PDF format date or a text string. + * See also #poppler_date_parse() + * + * Return value: a new allocated string with the last modification data of + * @poppler_annot. It must be freed with g_free() when done. + **/ +gchar *poppler_annot_get_modified(PopplerAnnot *poppler_annot) +{ + const GooString *text; + + g_return_val_if_fail(POPPLER_IS_ANNOT(poppler_annot), NULL); + + text = poppler_annot->annot->getModified(); + + return text ? _poppler_goo_string_to_utf8(text) : nullptr; +} + +/** + * poppler_annot_get_flags: + * @poppler_annot: a #PopplerAnnot + * + * Retrieves the flag field specifying various characteristics of the + * @poppler_annot. + * + * Return value: the flag field of @poppler_annot. + **/ +PopplerAnnotFlag poppler_annot_get_flags(PopplerAnnot *poppler_annot) +{ + g_return_val_if_fail(POPPLER_IS_ANNOT(poppler_annot), (PopplerAnnotFlag)0); + + return (PopplerAnnotFlag)poppler_annot->annot->getFlags(); +} + +/** + * poppler_annot_set_flags: + * @poppler_annot: a #PopplerAnnot + * @flags: a #PopplerAnnotFlag + * + * Sets the flag field specifying various characteristics of the + * @poppler_annot. + * + * Since: 0.22 + **/ +void poppler_annot_set_flags(PopplerAnnot *poppler_annot, PopplerAnnotFlag flags) +{ + g_return_if_fail(POPPLER_IS_ANNOT(poppler_annot)); + + if (poppler_annot_get_flags(poppler_annot) == flags) { + return; + } + + poppler_annot->annot->setFlags((guint)flags); +} + +static PopplerColor *create_poppler_color_from_annot_color(AnnotColor *color) +{ + PopplerColor *poppler_color = nullptr; + + if (color) { + const double *values = color->getValues(); + + switch (color->getSpace()) { + case AnnotColor::colorGray: + poppler_color = g_new(PopplerColor, 1); + + poppler_color->red = (guint16)(values[0] * 65535); + poppler_color->green = poppler_color->red; + poppler_color->blue = poppler_color->red; + + break; + case AnnotColor::colorRGB: + poppler_color = g_new(PopplerColor, 1); + + poppler_color->red = (guint16)(values[0] * 65535); + poppler_color->green = (guint16)(values[1] * 65535); + poppler_color->blue = (guint16)(values[2] * 65535); + + break; + case AnnotColor::colorCMYK: + g_warning("Unsupported Annot Color: colorCMYK"); + case AnnotColor::colorTransparent: + break; + } + } + + return poppler_color; +} + +static std::unique_ptr<AnnotColor> create_annot_color_from_poppler_color(PopplerColor *poppler_color) +{ + if (!poppler_color) { + return nullptr; + } + + return std::make_unique<AnnotColor>((double)poppler_color->red / 65535, (double)poppler_color->green / 65535, (double)poppler_color->blue / 65535); +} + +/** + * poppler_annot_get_color: + * @poppler_annot: a #PopplerAnnot + * + * Retrieves the color of @poppler_annot. + * + * Return value: a new allocated #PopplerColor with the color values of + * @poppler_annot, or %NULL. It must be freed with g_free() when done. + **/ +PopplerColor *poppler_annot_get_color(PopplerAnnot *poppler_annot) +{ + g_return_val_if_fail(POPPLER_IS_ANNOT(poppler_annot), NULL); + + return create_poppler_color_from_annot_color(poppler_annot->annot->getColor()); +} + +/** + * poppler_annot_set_color: + * @poppler_annot: a #PopplerAnnot + * @poppler_color: (allow-none): a #PopplerColor, or %NULL + * + * Sets the color of @poppler_annot. + * + * Since: 0.16 + */ +void poppler_annot_set_color(PopplerAnnot *poppler_annot, PopplerColor *poppler_color) +{ + poppler_annot->annot->setColor(create_annot_color_from_poppler_color(poppler_color)); +} + +/** + * poppler_annot_get_page_index: + * @poppler_annot: a #PopplerAnnot + * + * Returns the page index to which @poppler_annot is associated, or -1 if unknown + * + * Return value: page index or -1 + * + * Since: 0.14 + **/ +gint poppler_annot_get_page_index(PopplerAnnot *poppler_annot) +{ + gint page_num; + + g_return_val_if_fail(POPPLER_IS_ANNOT(poppler_annot), -1); + + page_num = poppler_annot->annot->getPageNum(); + return page_num <= 0 ? -1 : page_num - 1; +} + +/* Returns cropbox rect for the page where the passed in @poppler_annot is in, + * or NULL when could not retrieve the cropbox. If @page_out is non-null then + * it will be set with the page that @poppler_annot is in. */ +const PDFRectangle *_poppler_annot_get_cropbox_and_page(PopplerAnnot *poppler_annot, Page **page_out) +{ + int page_index; + + /* A returned zero means annot is not added to any page yet */ + page_index = poppler_annot->annot->getPageNum(); + + if (page_index) { + Page *page; + + page = poppler_annot->annot->getDoc()->getPage(page_index); + if (page) { + if (page_out) { + *page_out = page; + } + + return page->getCropBox(); + } + } + + return nullptr; +} + +/* Returns cropbox rect for the page where the passed in @poppler_annot is in, + * or NULL when could not retrieve the cropbox */ +const PDFRectangle *_poppler_annot_get_cropbox(PopplerAnnot *poppler_annot) +{ + return _poppler_annot_get_cropbox_and_page(poppler_annot, nullptr); +} + +/** + * poppler_annot_get_rectangle: + * @poppler_annot: a #PopplerAnnot + * @poppler_rect: (out): a #PopplerRectangle to store the annotation's coordinates + * + * Retrieves the rectangle representing the page coordinates where the + * annotation @poppler_annot is placed. + * + * Since: 0.26 + */ +void poppler_annot_get_rectangle(PopplerAnnot *poppler_annot, PopplerRectangle *poppler_rect) +{ + const PDFRectangle *crop_box; + PDFRectangle zerobox; + Page *page = nullptr; + + g_return_if_fail(POPPLER_IS_ANNOT(poppler_annot)); + g_return_if_fail(poppler_rect != nullptr); + + crop_box = _poppler_annot_get_cropbox_and_page(poppler_annot, &page); + if (!crop_box) { + zerobox = PDFRectangle(); + crop_box = &zerobox; + } + + const PDFRectangle &annot_rect = poppler_annot->annot->getRect(); + poppler_rect->x1 = annot_rect.x1 - crop_box->x1; + poppler_rect->x2 = annot_rect.x2 - crop_box->x1; + poppler_rect->y1 = annot_rect.y1 - crop_box->y1; + poppler_rect->y2 = annot_rect.y2 - crop_box->y1; +} + +/** + * poppler_annot_set_rectangle: + * @poppler_annot: a #PopplerAnnot + * @poppler_rect: a #PopplerRectangle with the new annotation's coordinates + * + * Move the annotation to the rectangle representing the page coordinates + * where the annotation @poppler_annot should be placed. + * + * Since: 0.26 + */ +void poppler_annot_set_rectangle(PopplerAnnot *poppler_annot, PopplerRectangle *poppler_rect) +{ + const PDFRectangle *crop_box; + PDFRectangle zerobox; + double x1, y1, x2, y2; + Page *page = nullptr; + + g_return_if_fail(POPPLER_IS_ANNOT(poppler_annot)); + g_return_if_fail(poppler_rect != nullptr); + + crop_box = _poppler_annot_get_cropbox_and_page(poppler_annot, &page); + if (!crop_box) { + zerobox = PDFRectangle(); + crop_box = &zerobox; + } + + x1 = poppler_rect->x1; + y1 = poppler_rect->y1; + x2 = poppler_rect->x2; + y2 = poppler_rect->y2; + + if (page && SUPPORTED_ROTATION(page->getRotate())) { + /* annot is inside a rotated page, as core poppler rect must be saved + * un-rotated, let's proceed to un-rotate rect before saving */ + _unrotate_rect_for_annot_and_page(page, poppler_annot->annot, &x1, &y1, &x2, &y2); + } + + poppler_annot->annot->setRect(x1 + crop_box->x1, y1 + crop_box->y1, x2 + crop_box->x1, y2 + crop_box->y1); +} + +/* PopplerAnnotMarkup */ +/** + * poppler_annot_markup_get_label: + * @poppler_annot: a #PopplerAnnotMarkup + * + * Retrieves the label text of @poppler_annot. + * + * Return value: the label text of @poppler_annot. + */ +gchar *poppler_annot_markup_get_label(PopplerAnnotMarkup *poppler_annot) +{ + AnnotMarkup *annot; + const GooString *text; + + g_return_val_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot), NULL); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + + text = annot->getLabel(); + + return text ? _poppler_goo_string_to_utf8(text) : nullptr; +} + +/** + * poppler_annot_markup_set_label: + * @poppler_annot: a #PopplerAnnotMarkup + * @label: (allow-none): a text string containing the new label, or %NULL + * + * Sets the label text of @poppler_annot, replacing the current one + * + * Since: 0.16 + */ +void poppler_annot_markup_set_label(PopplerAnnotMarkup *poppler_annot, const gchar *label) +{ + AnnotMarkup *annot; + gchar *tmp; + gsize length = 0; + + g_return_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot)); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + + tmp = label ? g_convert(label, -1, "UTF-16BE", "UTF-8", nullptr, &length, nullptr) : nullptr; + annot->setLabel(std::make_unique<GooString>(tmp, length)); + g_free(tmp); +} + +/** + * poppler_annot_markup_has_popup: + * @poppler_annot: a #PopplerAnnotMarkup + * + * Return %TRUE if the markup annotation has a popup window associated + * + * Return value: %TRUE, if @poppler_annot has popup, %FALSE otherwise + * + * Since: 0.12 + **/ +gboolean poppler_annot_markup_has_popup(PopplerAnnotMarkup *poppler_annot) +{ + AnnotMarkup *annot; + + g_return_val_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot), FALSE); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + + return annot->getPopup() != nullptr; +} + +/** + * poppler_annot_markup_set_popup: + * @poppler_annot: a #PopplerAnnotMarkup + * @popup_rect: a #PopplerRectangle + * + * Associates a new popup window for editing contents of @poppler_annot. + * Popup window shall be displayed by viewers at @popup_rect on the page. + * + * Since: 0.16 + */ +void poppler_annot_markup_set_popup(PopplerAnnotMarkup *poppler_annot, PopplerRectangle *popup_rect) +{ + AnnotMarkup *annot; + PDFRectangle pdf_rect(popup_rect->x1, popup_rect->y1, popup_rect->x2, popup_rect->y2); + + g_return_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot)); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + annot->setPopup(std::make_unique<AnnotPopup>(annot->getDoc(), &pdf_rect)); +} + +/** + * poppler_annot_markup_get_popup_is_open: + * @poppler_annot: a #PopplerAnnotMarkup + * + * Retrieves the state of the popup window related to @poppler_annot. + * + * Return value: the state of @poppler_annot. %TRUE if it's open, %FALSE in + * other case. + **/ +gboolean poppler_annot_markup_get_popup_is_open(PopplerAnnotMarkup *poppler_annot) +{ + AnnotMarkup *annot; + AnnotPopup *annot_popup; + + g_return_val_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot), FALSE); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + + if ((annot_popup = annot->getPopup())) { + return annot_popup->getOpen(); + } + + return FALSE; +} + +/** + * poppler_annot_markup_set_popup_is_open: + * @poppler_annot: a #PopplerAnnotMarkup + * @is_open: whether popup window should initially be displayed open + * + * Sets the state of the popup window related to @poppler_annot. + * + * Since: 0.16 + **/ +void poppler_annot_markup_set_popup_is_open(PopplerAnnotMarkup *poppler_annot, gboolean is_open) +{ + AnnotMarkup *annot; + AnnotPopup *annot_popup; + + g_return_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot)); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + + annot_popup = annot->getPopup(); + if (!annot_popup) { + return; + } + + if (annot_popup->getOpen() != is_open) { + annot_popup->setOpen(is_open); + } +} + +/** + * poppler_annot_markup_get_popup_rectangle: + * @poppler_annot: a #PopplerAnnotMarkup + * @poppler_rect: (out): a #PopplerRectangle to store the popup rectangle + * + * Retrieves the rectangle of the popup window related to @poppler_annot. + * + * Return value: %TRUE if #PopplerRectangle was correctly filled, %FALSE otherwise + * + * Since: 0.12 + **/ +gboolean poppler_annot_markup_get_popup_rectangle(PopplerAnnotMarkup *poppler_annot, PopplerRectangle *poppler_rect) +{ + AnnotMarkup *annot; + Annot *annot_popup; + + g_return_val_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot), FALSE); + g_return_val_if_fail(poppler_rect != nullptr, FALSE); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + annot_popup = annot->getPopup(); + if (!annot_popup) { + return FALSE; + } + + const PDFRectangle &annot_rect = annot_popup->getRect(); + poppler_rect->x1 = annot_rect.x1; + poppler_rect->x2 = annot_rect.x2; + poppler_rect->y1 = annot_rect.y1; + poppler_rect->y2 = annot_rect.y2; + + return TRUE; +} + +/** + * poppler_annot_markup_set_popup_rectangle: + * @poppler_annot: a #PopplerAnnotMarkup + * @poppler_rect: a #PopplerRectangle to set + * + * Sets the rectangle of the popup window related to @poppler_annot. + * This doesn't have any effect if @poppler_annot doesn't have a + * popup associated, use poppler_annot_markup_set_popup() to associate + * a popup window to a #PopplerAnnotMarkup. + * + * Since: 0.33 + */ +void poppler_annot_markup_set_popup_rectangle(PopplerAnnotMarkup *poppler_annot, PopplerRectangle *poppler_rect) +{ + AnnotMarkup *annot; + Annot *annot_popup; + + g_return_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot)); + g_return_if_fail(poppler_rect != nullptr); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + annot_popup = annot->getPopup(); + if (!annot_popup) { + return; + } + + annot_popup->setRect(poppler_rect->x1, poppler_rect->y1, poppler_rect->x2, poppler_rect->y2); +} + +/** + * poppler_annot_markup_get_opacity: + * @poppler_annot: a #PopplerAnnotMarkup + * + * Retrieves the opacity value of @poppler_annot. + * + * Return value: the opacity value of @poppler_annot, + * between 0 (transparent) and 1 (opaque) + */ +gdouble poppler_annot_markup_get_opacity(PopplerAnnotMarkup *poppler_annot) +{ + AnnotMarkup *annot; + + g_return_val_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot), 0); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + + return annot->getOpacity(); +} + +/** + * poppler_annot_markup_set_opacity: + * @poppler_annot: a #PopplerAnnotMarkup + * @opacity: a constant opacity value, between 0 (transparent) and 1 (opaque) + * + * Sets the opacity of @poppler_annot. This value applies to + * all visible elements of @poppler_annot in its closed state, + * but not to the pop-up window that appears when it's openened + * + * Since: 0.16 + */ +void poppler_annot_markup_set_opacity(PopplerAnnotMarkup *poppler_annot, gdouble opacity) +{ + AnnotMarkup *annot; + + g_return_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot)); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + annot->setOpacity(opacity); +} + +/** + * poppler_annot_markup_get_date: + * @poppler_annot: a #PopplerAnnotMarkup + * + * Returns the date and time when the annotation was created + * + * Return value: (transfer full): a #GDate representing the date and time + * when the annotation was created, or %NULL + */ +GDate *poppler_annot_markup_get_date(PopplerAnnotMarkup *poppler_annot) +{ + AnnotMarkup *annot; + const GooString *annot_date; + time_t timet; + + g_return_val_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot), NULL); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + annot_date = annot->getDate(); + if (!annot_date) { + return nullptr; + } + + if (_poppler_convert_pdf_date_to_gtime(annot_date, &timet)) { + GDate *date; + + date = g_date_new(); + g_date_set_time_t(date, timet); + + return date; + } + + return nullptr; +} + +/** + * poppler_annot_markup_get_subject: + * @poppler_annot: a #PopplerAnnotMarkup + * + * Retrives the subject text of @poppler_annot. + * + * Return value: the subject text of @poppler_annot. + */ +gchar *poppler_annot_markup_get_subject(PopplerAnnotMarkup *poppler_annot) +{ + AnnotMarkup *annot; + const GooString *text; + + g_return_val_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot), NULL); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + + text = annot->getSubject(); + + return text ? _poppler_goo_string_to_utf8(text) : nullptr; +} + +/** + * poppler_annot_markup_get_reply_to: + * @poppler_annot: a #PopplerAnnotMarkup + * + * Gets the reply type of @poppler_annot. + * + * Return value: #PopplerAnnotMarkupReplyType of @poppler_annot. + */ +PopplerAnnotMarkupReplyType poppler_annot_markup_get_reply_to(PopplerAnnotMarkup *poppler_annot) +{ + AnnotMarkup *annot; + + g_return_val_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot), POPPLER_ANNOT_MARKUP_REPLY_TYPE_R); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + + switch (annot->getReplyTo()) { + case AnnotMarkup::replyTypeR: + return POPPLER_ANNOT_MARKUP_REPLY_TYPE_R; + case AnnotMarkup::replyTypeGroup: + return POPPLER_ANNOT_MARKUP_REPLY_TYPE_GROUP; + default: + g_warning("Unsupported Annot Markup Reply To Type"); + } + + return POPPLER_ANNOT_MARKUP_REPLY_TYPE_R; +} + +/** + * poppler_annot_markup_get_external_data: + * @poppler_annot: a #PopplerAnnotMarkup + * + * Gets the external data type of @poppler_annot. + * + * Return value: #PopplerAnnotExternalDataType of @poppler_annot. + */ +PopplerAnnotExternalDataType poppler_annot_markup_get_external_data(PopplerAnnotMarkup *poppler_annot) +{ + AnnotMarkup *annot; + + g_return_val_if_fail(POPPLER_IS_ANNOT_MARKUP(poppler_annot), POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_UNKNOWN); + + annot = static_cast<AnnotMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + + switch (annot->getExData()) { + case annotExternalDataMarkup3D: + return POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_3D; + case annotExternalDataMarkupUnknown: + return POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_UNKNOWN; + default: + g_warning("Unsupported Annot Markup External Data"); + } + + return POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_UNKNOWN; +} + +/* PopplerAnnotText */ +/** + * poppler_annot_text_get_is_open: + * @poppler_annot: a #PopplerAnnotText + * + * Retrieves the state of @poppler_annot. + * + * Return value: the state of @poppler_annot. %TRUE if it's open, %FALSE in + * other case. + **/ +gboolean poppler_annot_text_get_is_open(PopplerAnnotText *poppler_annot) +{ + AnnotText *annot; + + g_return_val_if_fail(POPPLER_IS_ANNOT_TEXT(poppler_annot), FALSE); + + annot = static_cast<AnnotText *>(POPPLER_ANNOT(poppler_annot)->annot); + + return annot->getOpen(); +} + +/** + * poppler_annot_text_set_is_open: + * @poppler_annot: a #PopplerAnnotText + * @is_open: whether annotation should initially be displayed open + * + * Sets whether @poppler_annot should initially be displayed open + * + * Since: 0.16 + */ +void poppler_annot_text_set_is_open(PopplerAnnotText *poppler_annot, gboolean is_open) +{ + AnnotText *annot; + + g_return_if_fail(POPPLER_IS_ANNOT_TEXT(poppler_annot)); + + annot = static_cast<AnnotText *>(POPPLER_ANNOT(poppler_annot)->annot); + annot->setOpen(is_open); +} + +/** + * poppler_annot_text_get_icon: + * @poppler_annot: a #PopplerAnnotText + * + * Gets name of the icon of @poppler_annot. + * + * Return value: a new allocated string containing the icon name + */ +gchar *poppler_annot_text_get_icon(PopplerAnnotText *poppler_annot) +{ + AnnotText *annot; + const GooString *text; + + g_return_val_if_fail(POPPLER_IS_ANNOT_TEXT(poppler_annot), NULL); + + annot = static_cast<AnnotText *>(POPPLER_ANNOT(poppler_annot)->annot); + + text = annot->getIcon(); + + return text ? _poppler_goo_string_to_utf8(text) : nullptr; +} + +/** + * poppler_annot_text_set_icon: + * @poppler_annot: a #PopplerAnnotText + * @icon: the name of an icon + * + * Sets the icon of @poppler_annot. The following predefined + * icons are currently supported: + * <variablelist> + * <varlistentry> + * <term>#POPPLER_ANNOT_TEXT_ICON_NOTE</term> + * </varlistentry> + * <varlistentry> + * <term>#POPPLER_ANNOT_TEXT_ICON_COMMENT</term> + * </varlistentry> + * <varlistentry> + * <term>#POPPLER_ANNOT_TEXT_ICON_KEY</term> + * </varlistentry> + * <varlistentry> + * <term>#POPPLER_ANNOT_TEXT_ICON_HELP</term> + * </varlistentry> + * <varlistentry> + * <term>#POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH</term> + * </varlistentry> + * <varlistentry> + * <term>#POPPLER_ANNOT_TEXT_ICON_PARAGRAPH</term> + * </varlistentry> + * <varlistentry> + * <term>#POPPLER_ANNOT_TEXT_ICON_INSERT</term> + * </varlistentry> + * <varlistentry> + * <term>#POPPLER_ANNOT_TEXT_ICON_CROSS</term> + * </varlistentry> + * <varlistentry> + * <term>#POPPLER_ANNOT_TEXT_ICON_CIRCLE</term> + * </varlistentry> + * </variablelist> + * + * Since: 0.16 + */ +void poppler_annot_text_set_icon(PopplerAnnotText *poppler_annot, const gchar *icon) +{ + AnnotText *annot; + GooString *text; + + g_return_if_fail(POPPLER_IS_ANNOT_TEXT(poppler_annot)); + + annot = static_cast<AnnotText *>(POPPLER_ANNOT(poppler_annot)->annot); + + text = new GooString(icon); + annot->setIcon(text); + delete text; +} + +/** + * poppler_annot_text_get_state: + * @poppler_annot: a #PopplerAnnotText + * + * Retrieves the state of @poppler_annot. + * + * Return value: #PopplerAnnotTextState of @poppler_annot. + **/ +PopplerAnnotTextState poppler_annot_text_get_state(PopplerAnnotText *poppler_annot) +{ + AnnotText *annot; + + g_return_val_if_fail(POPPLER_IS_ANNOT_TEXT(poppler_annot), POPPLER_ANNOT_TEXT_STATE_UNKNOWN); + + annot = static_cast<AnnotText *>(POPPLER_ANNOT(poppler_annot)->annot); + + switch (annot->getState()) { + case AnnotText::stateUnknown: + return POPPLER_ANNOT_TEXT_STATE_UNKNOWN; + case AnnotText::stateMarked: + return POPPLER_ANNOT_TEXT_STATE_MARKED; + case AnnotText::stateUnmarked: + return POPPLER_ANNOT_TEXT_STATE_UNMARKED; + case AnnotText::stateAccepted: + return POPPLER_ANNOT_TEXT_STATE_ACCEPTED; + case AnnotText::stateRejected: + return POPPLER_ANNOT_TEXT_STATE_REJECTED; + case AnnotText::stateCancelled: + return POPPLER_ANNOT_TEXT_STATE_CANCELLED; + case AnnotText::stateCompleted: + return POPPLER_ANNOT_TEXT_STATE_COMPLETED; + case AnnotText::stateNone: + return POPPLER_ANNOT_TEXT_STATE_NONE; + default: + g_warning("Unsupported Annot Text State"); + } + + return POPPLER_ANNOT_TEXT_STATE_UNKNOWN; +} + +/* PopplerAnnotTextMarkup */ +/** + * poppler_annot_text_markup_set_quadrilaterals: + * @poppler_annot: A #PopplerAnnotTextMarkup + * @quadrilaterals: (element-type PopplerQuadrilateral): A #GArray of + * #PopplerQuadrilateral<!-- -->s + * + * Set the regions (Quadrilaterals) to apply the text markup in @poppler_annot. + * + * Since: 0.26 + **/ +void poppler_annot_text_markup_set_quadrilaterals(PopplerAnnotTextMarkup *poppler_annot, GArray *quadrilaterals) +{ + AnnotQuadrilaterals *quads, *quads_temp; + AnnotTextMarkup *annot; + const PDFRectangle *crop_box; + Page *page = nullptr; + + g_return_if_fail(POPPLER_IS_ANNOT_TEXT_MARKUP(poppler_annot)); + g_return_if_fail(quadrilaterals != nullptr && quadrilaterals->len > 0); + + annot = static_cast<AnnotTextMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + crop_box = _poppler_annot_get_cropbox_and_page(POPPLER_ANNOT(poppler_annot), &page); + quads = create_annot_quads_from_poppler_quads(quadrilaterals); + + if (page && SUPPORTED_ROTATION(page->getRotate())) { + quads_temp = _page_new_quads_unrotated(page, quads); + delete quads; + quads = quads_temp; + } + + if (!ZERO_CROPBOX(crop_box)) { + quads_temp = quads; + quads = new_quads_from_offset_cropbox(crop_box, quads, TRUE); + delete quads_temp; + } + + annot->setQuadrilaterals(quads); + delete quads; +} + +/** + * poppler_annot_text_markup_get_quadrilaterals: + * @poppler_annot: A #PopplerAnnotTextMarkup + * + * Returns a #GArray of #PopplerQuadrilateral items that map from a + * location on @page to a #PopplerAnnotTextMarkup. This array must be freed + * when done. + * + * Return value: (element-type PopplerQuadrilateral) (transfer full): A #GArray of #PopplerQuadrilateral + * + * Since: 0.26 + **/ +GArray *poppler_annot_text_markup_get_quadrilaterals(PopplerAnnotTextMarkup *poppler_annot) +{ + const PDFRectangle *crop_box; + AnnotTextMarkup *annot; + + g_return_val_if_fail(POPPLER_IS_ANNOT_TEXT_MARKUP(poppler_annot), NULL); + + annot = static_cast<AnnotTextMarkup *>(POPPLER_ANNOT(poppler_annot)->annot); + crop_box = _poppler_annot_get_cropbox(POPPLER_ANNOT(poppler_annot)); + AnnotQuadrilaterals *quads = annot->getQuadrilaterals(); + + return create_poppler_quads_from_annot_quads(quads, crop_box); +} + +/* PopplerAnnotFreeText */ +/** + * poppler_annot_free_text_get_quadding: + * @poppler_annot: a #PopplerAnnotFreeText + * + * Retrieves the justification of the text of @poppler_annot. + * + * Return value: #PopplerAnnotFreeTextQuadding of @poppler_annot. + **/ +PopplerAnnotFreeTextQuadding poppler_annot_free_text_get_quadding(PopplerAnnotFreeText *poppler_annot) +{ + AnnotFreeText *annot; + + g_return_val_if_fail(POPPLER_IS_ANNOT_FREE_TEXT(poppler_annot), POPPLER_ANNOT_FREE_TEXT_QUADDING_LEFT_JUSTIFIED); + + annot = static_cast<AnnotFreeText *>(POPPLER_ANNOT(poppler_annot)->annot); + + switch (annot->getQuadding()) { + case VariableTextQuadding::leftJustified: + return POPPLER_ANNOT_FREE_TEXT_QUADDING_LEFT_JUSTIFIED; + case VariableTextQuadding::centered: + return POPPLER_ANNOT_FREE_TEXT_QUADDING_CENTERED; + case VariableTextQuadding::rightJustified: + return POPPLER_ANNOT_FREE_TEXT_QUADDING_RIGHT_JUSTIFIED; + default: + g_warning("Unsupported Annot Free Text Quadding"); + } + + return POPPLER_ANNOT_FREE_TEXT_QUADDING_LEFT_JUSTIFIED; +} + +/** + * poppler_annot_free_text_get_callout_line: + * @poppler_annot: a #PopplerAnnotFreeText + * + * Retrieves a #PopplerAnnotCalloutLine of four or six numbers specifying a callout + * line attached to the @poppler_annot. + * + * Return value: a new allocated #PopplerAnnotCalloutLine if the annot has a callout + * line, %NULL in other case. It must be freed with g_free() when + * done. + **/ +PopplerAnnotCalloutLine *poppler_annot_free_text_get_callout_line(PopplerAnnotFreeText *poppler_annot) +{ + AnnotFreeText *annot; + AnnotCalloutLine *line; + + g_return_val_if_fail(POPPLER_IS_ANNOT_FREE_TEXT(poppler_annot), NULL); + + annot = static_cast<AnnotFreeText *>(POPPLER_ANNOT(poppler_annot)->annot); + + if ((line = annot->getCalloutLine())) { + AnnotCalloutMultiLine *multiline; + PopplerAnnotCalloutLine *callout = g_new0(PopplerAnnotCalloutLine, 1); + + callout->x1 = line->getX1(); + callout->y1 = line->getY1(); + callout->x2 = line->getX2(); + callout->y2 = line->getY2(); + + if ((multiline = dynamic_cast<AnnotCalloutMultiLine *>(line))) { + callout->multiline = TRUE; + callout->x3 = multiline->getX3(); + callout->y3 = multiline->getY3(); + return callout; + } + + callout->multiline = FALSE; + return callout; + } + + return nullptr; +} + +/* PopplerAnnotFileAttachment */ +/** + * poppler_annot_file_attachment_get_attachment: + * @poppler_annot: a #PopplerAnnotFileAttachment + * + * Creates a #PopplerAttachment for the file of the file attachment annotation @annot. + * The #PopplerAttachment must be unrefed with g_object_unref by the caller. + * + * Return value: (transfer full): @PopplerAttachment + * + * Since: 0.14 + **/ +PopplerAttachment *poppler_annot_file_attachment_get_attachment(PopplerAnnotFileAttachment *poppler_annot) +{ + AnnotFileAttachment *annot; + PopplerAttachment *attachment; + + g_return_val_if_fail(POPPLER_IS_ANNOT_FILE_ATTACHMENT(poppler_annot), NULL); + + annot = static_cast<AnnotFileAttachment *>(POPPLER_ANNOT(poppler_annot)->annot); + + FileSpec *file = new FileSpec(annot->getFile()); + attachment = _poppler_attachment_new(file); + delete file; + + return attachment; +} + +/** + * poppler_annot_file_attachment_get_name: + * @poppler_annot: a #PopplerAnnotFileAttachment + * + * Retrieves the name of @poppler_annot. + * + * Return value: a new allocated string with the name of @poppler_annot. It must + * be freed with g_free() when done. + * Since: 0.14 + **/ +gchar *poppler_annot_file_attachment_get_name(PopplerAnnotFileAttachment *poppler_annot) +{ + AnnotFileAttachment *annot; + const GooString *name; + + g_return_val_if_fail(POPPLER_IS_ANNOT_FILE_ATTACHMENT(poppler_annot), NULL); + + annot = static_cast<AnnotFileAttachment *>(POPPLER_ANNOT(poppler_annot)->annot); + name = annot->getName(); + + return name ? _poppler_goo_string_to_utf8(name) : nullptr; +} + +/* PopplerAnnotCalloutLine */ +G_DEFINE_BOXED_TYPE(PopplerAnnotCalloutLine, poppler_annot_callout_line, poppler_annot_callout_line_copy, poppler_annot_callout_line_free) + +/** + * poppler_annot_callout_line_new: + * + * Creates a new empty #PopplerAnnotCalloutLine. + * + * Return value: a new allocated #PopplerAnnotCalloutLine, %NULL in other case. + * It must be freed when done. + **/ +PopplerAnnotCalloutLine *poppler_annot_callout_line_new(void) +{ + return g_new0(PopplerAnnotCalloutLine, 1); +} + +/** + * poppler_annot_callout_line_copy: + * @callout: the #PopplerAnnotCalloutLine to be copied. + * + * It does copy @callout to a new #PopplerAnnotCalloutLine. + * + * Return value: a new allocated #PopplerAnnotCalloutLine as exact copy of + * @callout, %NULL in other case. It must be freed when done. + **/ +PopplerAnnotCalloutLine *poppler_annot_callout_line_copy(PopplerAnnotCalloutLine *callout) +{ + PopplerAnnotCalloutLine *new_callout; + + g_return_val_if_fail(callout != nullptr, NULL); + + new_callout = g_new0(PopplerAnnotCalloutLine, 1); + *new_callout = *callout; + + return new_callout; +} + +/** + * poppler_annot_callout_line_free: + * @callout: a #PopplerAnnotCalloutLine + * + * Frees the memory used by #PopplerAnnotCalloutLine. + **/ +void poppler_annot_callout_line_free(PopplerAnnotCalloutLine *callout) +{ + g_free(callout); +} + +/* PopplerAnnotMovie */ +/** + * poppler_annot_movie_get_title: + * @poppler_annot: a #PopplerAnnotMovie + * + * Retrieves the movie title of @poppler_annot. + * + * Return value: the title text of @poppler_annot. + * + * Since: 0.14 + */ +gchar *poppler_annot_movie_get_title(PopplerAnnotMovie *poppler_annot) +{ + AnnotMovie *annot; + const GooString *title; + + g_return_val_if_fail(POPPLER_IS_ANNOT_MOVIE(poppler_annot), NULL); + + annot = static_cast<AnnotMovie *>(POPPLER_ANNOT(poppler_annot)->annot); + + title = annot->getTitle(); + + return title ? _poppler_goo_string_to_utf8(title) : nullptr; +} + +/** + * poppler_annot_movie_get_movie: + * @poppler_annot: a #PopplerAnnotMovie + * + * Retrieves the movie object (PopplerMovie) stored in the @poppler_annot. + * + * Return value: (transfer none): the movie object stored in the @poppler_annot. The returned + * object is owned by #PopplerAnnotMovie and should not be freed + * + * Since: 0.14 + */ +PopplerMovie *poppler_annot_movie_get_movie(PopplerAnnotMovie *poppler_annot) +{ + return poppler_annot->movie; +} + +/* PopplerAnnotScreen */ +/** + * poppler_annot_screen_get_action: + * @poppler_annot: a #PopplerAnnotScreen + * + * Retrieves the action (#PopplerAction) that shall be performed when @poppler_annot is activated + * + * Return value: (transfer none): the action to perform. The returned + * object is owned by @poppler_annot and should not be freed + * + * Since: 0.14 + */ +PopplerAction *poppler_annot_screen_get_action(PopplerAnnotScreen *poppler_annot) +{ + return poppler_annot->action; +} + +/* PopplerAnnotLine */ +/** + * poppler_annot_line_set_vertices: + * @poppler_annot: a #PopplerAnnotLine + * @start: a #PopplerPoint of the starting vertice + * @end: a #PopplerPoint of the ending vertice + * + * Set the coordinate points where the @poppler_annot starts and ends. + * + * Since: 0.26 + */ +void poppler_annot_line_set_vertices(PopplerAnnotLine *poppler_annot, PopplerPoint *start, PopplerPoint *end) +{ + AnnotLine *annot; + + g_return_if_fail(POPPLER_IS_ANNOT_LINE(poppler_annot)); + g_return_if_fail(start != nullptr); + g_return_if_fail(end != nullptr); + + annot = static_cast<AnnotLine *>(POPPLER_ANNOT(poppler_annot)->annot); + annot->setVertices(start->x, start->y, end->x, end->y); +} + +/* PopplerAnnotCircle and PopplerAnnotSquare helpers */ +static PopplerColor *poppler_annot_geometry_get_interior_color(PopplerAnnot *poppler_annot) +{ + AnnotGeometry *annot; + + annot = static_cast<AnnotGeometry *>(POPPLER_ANNOT(poppler_annot)->annot); + + return create_poppler_color_from_annot_color(annot->getInteriorColor()); +} + +static void poppler_annot_geometry_set_interior_color(PopplerAnnot *poppler_annot, PopplerColor *poppler_color) +{ + AnnotGeometry *annot; + + annot = static_cast<AnnotGeometry *>(POPPLER_ANNOT(poppler_annot)->annot); + + annot->setInteriorColor(create_annot_color_from_poppler_color(poppler_color)); +} + +/* PopplerAnnotCircle */ +/** + * poppler_annot_circle_get_interior_color: + * @poppler_annot: a #PopplerAnnotCircle + * + * Retrieves the interior color of @poppler_annot. + * + * Return value: a new allocated #PopplerColor with the color values of + * @poppler_annot, or %NULL. It must be freed with g_free() when done. + * + * Since: 0.26 + */ +PopplerColor *poppler_annot_circle_get_interior_color(PopplerAnnotCircle *poppler_annot) +{ + g_return_val_if_fail(POPPLER_IS_ANNOT_CIRCLE(poppler_annot), NULL); + + return poppler_annot_geometry_get_interior_color(POPPLER_ANNOT(poppler_annot)); +} + +/** + * poppler_annot_circle_set_interior_color: + * @poppler_annot: a #PopplerAnnotCircle + * @poppler_color: (allow-none): a #PopplerColor, or %NULL + * + * Sets the interior color of @poppler_annot. + * + * Since: 0.26 + */ +void poppler_annot_circle_set_interior_color(PopplerAnnotCircle *poppler_annot, PopplerColor *poppler_color) +{ + g_return_if_fail(POPPLER_IS_ANNOT_CIRCLE(poppler_annot)); + + poppler_annot_geometry_set_interior_color(POPPLER_ANNOT(poppler_annot), poppler_color); +} + +/* PopplerAnnotSquare */ +/** + * poppler_annot_square_get_interior_color: + * @poppler_annot: a #PopplerAnnotSquare + * + * Retrieves the interior color of @poppler_annot. + * + * Return value: a new allocated #PopplerColor with the color values of + * @poppler_annot, or %NULL. It must be freed with g_free() when done. + * + * Since: 0.26 + */ +PopplerColor *poppler_annot_square_get_interior_color(PopplerAnnotSquare *poppler_annot) +{ + g_return_val_if_fail(POPPLER_IS_ANNOT_SQUARE(poppler_annot), NULL); + + return poppler_annot_geometry_get_interior_color(POPPLER_ANNOT(poppler_annot)); +} + +/** + * poppler_annot_square_set_interior_color: + * @poppler_annot: a #PopplerAnnotSquare + * @poppler_color: (allow-none): a #PopplerColor, or %NULL + * + * Sets the interior color of @poppler_annot. + * + * Since: 0.26 + */ +void poppler_annot_square_set_interior_color(PopplerAnnotSquare *poppler_annot, PopplerColor *poppler_color) +{ + g_return_if_fail(POPPLER_IS_ANNOT_SQUARE(poppler_annot)); + + poppler_annot_geometry_set_interior_color(POPPLER_ANNOT(poppler_annot), poppler_color); +} + +/** + * poppler_annot_stamp_get_icon: + * @poppler_annot: a #PopplerAnnotStamp + * + * Return value: the corresponding #PopplerAnnotStampIcon of the icon + * + * Since: 22.07.0 + */ +PopplerAnnotStampIcon poppler_annot_stamp_get_icon(PopplerAnnotStamp *poppler_annot) +{ + AnnotStamp *annot; + const GooString *text; + + g_return_val_if_fail(POPPLER_IS_ANNOT_STAMP(poppler_annot), POPPLER_ANNOT_STAMP_ICON_UNKNOWN); + + annot = static_cast<AnnotStamp *>(POPPLER_ANNOT(poppler_annot)->annot); + + text = annot->getIcon(); + + if (!text) { + return POPPLER_ANNOT_STAMP_ICON_NONE; + } + + if (!text->cmp("Approved")) { + return POPPLER_ANNOT_STAMP_ICON_APPROVED; + } else if (!text->cmp("AsIs")) { + return POPPLER_ANNOT_STAMP_ICON_AS_IS; + } else if (!text->cmp("Confidential")) { + return POPPLER_ANNOT_STAMP_ICON_CONFIDENTIAL; + } else if (!text->cmp("Final")) { + return POPPLER_ANNOT_STAMP_ICON_FINAL; + } else if (!text->cmp("Experimental")) { + return POPPLER_ANNOT_STAMP_ICON_EXPERIMENTAL; + } else if (!text->cmp("Expired")) { + return POPPLER_ANNOT_STAMP_ICON_EXPIRED; + } else if (!text->cmp("NotApproved")) { + return POPPLER_ANNOT_STAMP_ICON_NOT_APPROVED; + } else if (!text->cmp("NotForPublicRelease")) { + return POPPLER_ANNOT_STAMP_ICON_NOT_FOR_PUBLIC_RELEASE; + } else if (!text->cmp("Sold")) { + return POPPLER_ANNOT_STAMP_ICON_SOLD; + } else if (!text->cmp("Departmental")) { + return POPPLER_ANNOT_STAMP_ICON_DEPARTMENTAL; + } else if (!text->cmp("ForComment")) { + return POPPLER_ANNOT_STAMP_ICON_FOR_COMMENT; + } else if (!text->cmp("ForPublicRelease")) { + return POPPLER_ANNOT_STAMP_ICON_FOR_PUBLIC_RELEASE; + } else if (!text->cmp("TopSecret")) { + return POPPLER_ANNOT_STAMP_ICON_TOP_SECRET; + } + + return POPPLER_ANNOT_STAMP_ICON_UNKNOWN; +} + +/** + * poppler_annot_stamp_set_icon: + * @poppler_annot: a #PopplerAnnotStamp + * @icon: the #PopplerAnnotStampIcon type of the icon + * + * Sets the icon of @poppler_annot to be one of the predefined values in #PopplerAnnotStampIcon + * + * Since: 22.07.0 + */ +void poppler_annot_stamp_set_icon(PopplerAnnotStamp *poppler_annot, PopplerAnnotStampIcon icon) +{ + AnnotStamp *annot; + GooString *goo_str; + const gchar *text; + + g_return_if_fail(POPPLER_IS_ANNOT_STAMP(poppler_annot)); + + annot = static_cast<AnnotStamp *>(POPPLER_ANNOT(poppler_annot)->annot); + + if (icon == POPPLER_ANNOT_STAMP_ICON_NONE) { + annot->setIcon(nullptr); + return; + } + + if (icon == POPPLER_ANNOT_STAMP_ICON_APPROVED) { + text = "Approved"; + } else if (icon == POPPLER_ANNOT_STAMP_ICON_AS_IS) { + text = "AsIs"; + } else if (icon == POPPLER_ANNOT_STAMP_ICON_CONFIDENTIAL) { + text = "Confidential"; + } else if (icon == POPPLER_ANNOT_STAMP_ICON_FINAL) { + text = "Final"; + } else if (icon == POPPLER_ANNOT_STAMP_ICON_EXPERIMENTAL) { + text = "Experimental"; + } else if (icon == POPPLER_ANNOT_STAMP_ICON_EXPIRED) { + text = "Expired"; + } else if (icon == POPPLER_ANNOT_STAMP_ICON_NOT_APPROVED) { + text = "NotApproved"; + } else if (icon == POPPLER_ANNOT_STAMP_ICON_NOT_FOR_PUBLIC_RELEASE) { + text = "NotForPublicRelease"; + } else if (icon == POPPLER_ANNOT_STAMP_ICON_SOLD) { + text = "Sold"; + } else if (icon == POPPLER_ANNOT_STAMP_ICON_DEPARTMENTAL) { + text = "Departmental"; + } else if (icon == POPPLER_ANNOT_STAMP_ICON_FOR_COMMENT) { + text = "ForComment"; + } else if (icon == POPPLER_ANNOT_STAMP_ICON_FOR_PUBLIC_RELEASE) { + text = "ForPublicRelease"; + } else if (icon == POPPLER_ANNOT_STAMP_ICON_TOP_SECRET) { + text = "TopSecret"; + } else { + return; /* POPPLER_ANNOT_STAMP_ICON_UNKNOWN */ + } + + goo_str = new GooString(text); + annot->setIcon(goo_str); + delete goo_str; +} + +/** + * poppler_annot_stamp_set_custom_image: + * @poppler_annot: a #PopplerAnnotStamp + * @image: an image cairo surface + * @error: (nullable): return location for error, or %NULL. + * + * Sets the custom image of @poppler_annot to be @image + * + * Return value: %TRUE on success, %FALSE otherwise. + * + * Since: 22.07.0 + */ +gboolean poppler_annot_stamp_set_custom_image(PopplerAnnotStamp *poppler_annot, cairo_surface_t *image, GError **error) +{ + AnnotStamp *annot; + AnnotStampImageHelper *annot_image_helper; + + g_return_val_if_fail(POPPLER_IS_ANNOT_STAMP(poppler_annot), FALSE); + + annot = static_cast<AnnotStamp *>(POPPLER_ANNOT(poppler_annot)->annot); + annot_image_helper = _poppler_convert_cairo_image_to_stamp_image_helper(image, annot->getDoc(), error); + if (!annot_image_helper) { + return FALSE; + } + annot->setCustomImage(annot_image_helper); + + return TRUE; +} diff --git a/poppler-24.05.0/glib/poppler-annot.h b/poppler-24.05.0/glib/poppler-annot.h new file mode 100644 index 0000000000000000000000000000000000000000..509ecdff00821ecdd9bbdfb0430409e864faee3f --- /dev/null +++ b/poppler-24.05.0/glib/poppler-annot.h @@ -0,0 +1,368 @@ +/* poppler-annot.h: glib interface to poppler + * + * Copyright (C) 2007 Inigo Martinez <inigomartinez@gmail.com> + * Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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. + */ + +#ifndef __POPPLER_ANNOT_H__ +#define __POPPLER_ANNOT_H__ + +#include <glib-object.h> +#include "poppler.h" + +G_BEGIN_DECLS + +#define POPPLER_TYPE_ANNOT (poppler_annot_get_type()) +#define POPPLER_ANNOT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ANNOT, PopplerAnnot)) +#define POPPLER_IS_ANNOT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ANNOT)) + +#define POPPLER_TYPE_ANNOT_MARKUP (poppler_annot_markup_get_type()) +#define POPPLER_ANNOT_MARKUP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ANNOT_MARKUP, PopplerAnnotMarkup)) +#define POPPLER_IS_ANNOT_MARKUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ANNOT_MARKUP)) + +#define POPPLER_TYPE_ANNOT_TEXT (poppler_annot_text_get_type()) +#define POPPLER_ANNOT_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ANNOT_TEXT, PopplerAnnotText)) +#define POPPLER_IS_ANNOT_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ANNOT_TEXT)) + +#define POPPLER_TYPE_ANNOT_TEXT_MARKUP (poppler_annot_text_markup_get_type()) +#define POPPLER_ANNOT_TEXT_MARKUP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ANNOT_TEXT_MARKUP, PopplerAnnotTextMarkup)) +#define POPPLER_IS_ANNOT_TEXT_MARKUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ANNOT_TEXT_MARKUP)) + +#define POPPLER_TYPE_ANNOT_FREE_TEXT (poppler_annot_free_text_get_type()) +#define POPPLER_ANNOT_FREE_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ANNOT_FREE_TEXT, PopplerAnnotFreeText)) +#define POPPLER_IS_ANNOT_FREE_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ANNOT_FREE_TEXT)) + +#define POPPLER_TYPE_ANNOT_FILE_ATTACHMENT (poppler_annot_file_attachment_get_type()) +#define POPPLER_ANNOT_FILE_ATTACHMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ANNOT_MARKUP, PopplerAnnotFileAttachment)) +#define POPPLER_IS_ANNOT_FILE_ATTACHMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ANNOT_FILE_ATTACHMENT)) + +#define POPPLER_TYPE_ANNOT_MOVIE (poppler_annot_movie_get_type()) +#define POPPLER_ANNOT_MOVIE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ANNOT_MOVIE, PopplerAnnotMovie)) +#define POPPLER_IS_ANNOT_MOVIE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ANNOT_MOVIE)) + +#define POPPLER_TYPE_ANNOT_SCREEN (poppler_annot_screen_get_type()) +#define POPPLER_ANNOT_SCREEN(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ANNOT_SCREEN, PopplerAnnotScreen)) +#define POPPLER_IS_ANNOT_SCREEN(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ANNOT_SCREEN)) + +#define POPPLER_TYPE_ANNOT_LINE (poppler_annot_line_get_type()) +#define POPPLER_ANNOT_LINE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ANNOT_LINE, PopplerAnnotLine)) +#define POPPLER_IS_ANNOT_LINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ANNOT_LINE)) + +#define POPPLER_TYPE_ANNOT_CALLOUT_LINE (poppler_annot_callout_line_get_type()) + +#define POPPLER_TYPE_ANNOT_CIRCLE (poppler_annot_circle_get_type()) +#define POPPLER_ANNOT_CIRCLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ANNOT_CIRCLE, PopplerAnnotCircle)) +#define POPPLER_IS_ANNOT_CIRCLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ANNOT_CIRCLE)) + +#define POPPLER_TYPE_ANNOT_SQUARE (poppler_annot_square_get_type()) +#define POPPLER_ANNOT_SQUARE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ANNOT_SQUARE, PopplerAnnotSquare)) +#define POPPLER_IS_ANNOT_SQUARE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ANNOT_SQUARE)) + +#define POPPLER_TYPE_ANNOT_STAMP (poppler_annot_stamp_get_type()) +#define POPPLER_ANNOT_STAMP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ANNOT_STAMP, PopplerAnnotStamp)) +#define POPPLER_IS_ANNOT_STAMP(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ANNOT_STAMP)) + +typedef enum +{ + POPPLER_ANNOT_UNKNOWN, + POPPLER_ANNOT_TEXT, + POPPLER_ANNOT_LINK, + POPPLER_ANNOT_FREE_TEXT, + POPPLER_ANNOT_LINE, + POPPLER_ANNOT_SQUARE, + POPPLER_ANNOT_CIRCLE, + POPPLER_ANNOT_POLYGON, + POPPLER_ANNOT_POLY_LINE, + POPPLER_ANNOT_HIGHLIGHT, + POPPLER_ANNOT_UNDERLINE, + POPPLER_ANNOT_SQUIGGLY, + POPPLER_ANNOT_STRIKE_OUT, + POPPLER_ANNOT_STAMP, + POPPLER_ANNOT_CARET, + POPPLER_ANNOT_INK, + POPPLER_ANNOT_POPUP, + POPPLER_ANNOT_FILE_ATTACHMENT, + POPPLER_ANNOT_SOUND, + POPPLER_ANNOT_MOVIE, + POPPLER_ANNOT_WIDGET, + POPPLER_ANNOT_SCREEN, + POPPLER_ANNOT_PRINTER_MARK, + POPPLER_ANNOT_TRAP_NET, + POPPLER_ANNOT_WATERMARK, + POPPLER_ANNOT_3D +} PopplerAnnotType; + +typedef enum /*< flags >*/ +{ + POPPLER_ANNOT_FLAG_UNKNOWN = 0, + POPPLER_ANNOT_FLAG_INVISIBLE = 1 << 0, + POPPLER_ANNOT_FLAG_HIDDEN = 1 << 1, + POPPLER_ANNOT_FLAG_PRINT = 1 << 2, + POPPLER_ANNOT_FLAG_NO_ZOOM = 1 << 3, + POPPLER_ANNOT_FLAG_NO_ROTATE = 1 << 4, + POPPLER_ANNOT_FLAG_NO_VIEW = 1 << 5, + POPPLER_ANNOT_FLAG_READ_ONLY = 1 << 6, + POPPLER_ANNOT_FLAG_LOCKED = 1 << 7, + POPPLER_ANNOT_FLAG_TOGGLE_NO_VIEW = 1 << 8, + POPPLER_ANNOT_FLAG_LOCKED_CONTENTS = 1 << 9 +} PopplerAnnotFlag; + +typedef enum +{ + POPPLER_ANNOT_MARKUP_REPLY_TYPE_R, + POPPLER_ANNOT_MARKUP_REPLY_TYPE_GROUP +} PopplerAnnotMarkupReplyType; + +typedef enum +{ + POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_3D, + POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_UNKNOWN +} PopplerAnnotExternalDataType; + +#define POPPLER_ANNOT_TEXT_ICON_NOTE "Note" +#define POPPLER_ANNOT_TEXT_ICON_COMMENT "Comment" +#define POPPLER_ANNOT_TEXT_ICON_KEY "Key" +#define POPPLER_ANNOT_TEXT_ICON_HELP "Help" +#define POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH "NewParagraph" +#define POPPLER_ANNOT_TEXT_ICON_PARAGRAPH "Paragraph" +#define POPPLER_ANNOT_TEXT_ICON_INSERT "Insert" +#define POPPLER_ANNOT_TEXT_ICON_CROSS "Cross" +#define POPPLER_ANNOT_TEXT_ICON_CIRCLE "Circle" + +typedef enum +{ + POPPLER_ANNOT_TEXT_STATE_MARKED, + POPPLER_ANNOT_TEXT_STATE_UNMARKED, + POPPLER_ANNOT_TEXT_STATE_ACCEPTED, + POPPLER_ANNOT_TEXT_STATE_REJECTED, + POPPLER_ANNOT_TEXT_STATE_CANCELLED, + POPPLER_ANNOT_TEXT_STATE_COMPLETED, + POPPLER_ANNOT_TEXT_STATE_NONE, + POPPLER_ANNOT_TEXT_STATE_UNKNOWN +} PopplerAnnotTextState; + +typedef enum +{ + POPPLER_ANNOT_FREE_TEXT_QUADDING_LEFT_JUSTIFIED, + POPPLER_ANNOT_FREE_TEXT_QUADDING_CENTERED, + POPPLER_ANNOT_FREE_TEXT_QUADDING_RIGHT_JUSTIFIED +} PopplerAnnotFreeTextQuadding; + +struct _PopplerAnnotCalloutLine +{ + gboolean multiline; + gdouble x1; + gdouble y1; + gdouble x2; + gdouble y2; + gdouble x3; + gdouble y3; +}; + +typedef enum +{ + POPPLER_ANNOT_STAMP_ICON_UNKNOWN = 0, + POPPLER_ANNOT_STAMP_ICON_APPROVED, + POPPLER_ANNOT_STAMP_ICON_AS_IS, + POPPLER_ANNOT_STAMP_ICON_CONFIDENTIAL, + POPPLER_ANNOT_STAMP_ICON_FINAL, + POPPLER_ANNOT_STAMP_ICON_EXPERIMENTAL, + POPPLER_ANNOT_STAMP_ICON_EXPIRED, + POPPLER_ANNOT_STAMP_ICON_NOT_APPROVED, + POPPLER_ANNOT_STAMP_ICON_NOT_FOR_PUBLIC_RELEASE, + POPPLER_ANNOT_STAMP_ICON_SOLD, + POPPLER_ANNOT_STAMP_ICON_DEPARTMENTAL, + POPPLER_ANNOT_STAMP_ICON_FOR_COMMENT, + POPPLER_ANNOT_STAMP_ICON_FOR_PUBLIC_RELEASE, + POPPLER_ANNOT_STAMP_ICON_TOP_SECRET, + POPPLER_ANNOT_STAMP_ICON_NONE +} PopplerAnnotStampIcon; + +POPPLER_PUBLIC +GType poppler_annot_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerAnnotType poppler_annot_get_annot_type(PopplerAnnot *poppler_annot); +POPPLER_PUBLIC +gchar *poppler_annot_get_contents(PopplerAnnot *poppler_annot); +POPPLER_PUBLIC +void poppler_annot_set_contents(PopplerAnnot *poppler_annot, const gchar *contents); +POPPLER_PUBLIC +gchar *poppler_annot_get_name(PopplerAnnot *poppler_annot); +POPPLER_PUBLIC +gchar *poppler_annot_get_modified(PopplerAnnot *poppler_annot); +POPPLER_PUBLIC +PopplerAnnotFlag poppler_annot_get_flags(PopplerAnnot *poppler_annot); +POPPLER_PUBLIC +void poppler_annot_set_flags(PopplerAnnot *poppler_annot, PopplerAnnotFlag flags); +POPPLER_PUBLIC +PopplerColor *poppler_annot_get_color(PopplerAnnot *poppler_annot); +POPPLER_PUBLIC +void poppler_annot_set_color(PopplerAnnot *poppler_annot, PopplerColor *poppler_color); +POPPLER_PUBLIC +gint poppler_annot_get_page_index(PopplerAnnot *poppler_annot); +POPPLER_PUBLIC +void poppler_annot_get_rectangle(PopplerAnnot *poppler_annot, PopplerRectangle *poppler_rect); +POPPLER_PUBLIC +void poppler_annot_set_rectangle(PopplerAnnot *poppler_annot, PopplerRectangle *poppler_rect); + +/* PopplerAnnotMarkup */ +POPPLER_PUBLIC +GType poppler_annot_markup_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +gchar *poppler_annot_markup_get_label(PopplerAnnotMarkup *poppler_annot); +POPPLER_PUBLIC +void poppler_annot_markup_set_label(PopplerAnnotMarkup *poppler_annot, const gchar *label); +POPPLER_PUBLIC +gboolean poppler_annot_markup_has_popup(PopplerAnnotMarkup *poppler_annot); +POPPLER_PUBLIC +void poppler_annot_markup_set_popup(PopplerAnnotMarkup *poppler_annot, PopplerRectangle *popup_rect); +POPPLER_PUBLIC +gboolean poppler_annot_markup_get_popup_is_open(PopplerAnnotMarkup *poppler_annot); +POPPLER_PUBLIC +void poppler_annot_markup_set_popup_is_open(PopplerAnnotMarkup *poppler_annot, gboolean is_open); +POPPLER_PUBLIC +gboolean poppler_annot_markup_get_popup_rectangle(PopplerAnnotMarkup *poppler_annot, PopplerRectangle *poppler_rect); +POPPLER_PUBLIC +void poppler_annot_markup_set_popup_rectangle(PopplerAnnotMarkup *poppler_annot, PopplerRectangle *poppler_rect); +POPPLER_PUBLIC +gdouble poppler_annot_markup_get_opacity(PopplerAnnotMarkup *poppler_annot); +POPPLER_PUBLIC +void poppler_annot_markup_set_opacity(PopplerAnnotMarkup *poppler_annot, gdouble opacity); +POPPLER_PUBLIC +GDate *poppler_annot_markup_get_date(PopplerAnnotMarkup *poppler_annot); +POPPLER_PUBLIC +gchar *poppler_annot_markup_get_subject(PopplerAnnotMarkup *poppler_annot); +POPPLER_PUBLIC +PopplerAnnotMarkupReplyType poppler_annot_markup_get_reply_to(PopplerAnnotMarkup *poppler_annot); +POPPLER_PUBLIC +PopplerAnnotExternalDataType poppler_annot_markup_get_external_data(PopplerAnnotMarkup *poppler_annot); + +/* PopplerAnnotText */ +POPPLER_PUBLIC +GType poppler_annot_text_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerAnnot *poppler_annot_text_new(PopplerDocument *doc, PopplerRectangle *rect); +POPPLER_PUBLIC +gboolean poppler_annot_text_get_is_open(PopplerAnnotText *poppler_annot); +POPPLER_PUBLIC +void poppler_annot_text_set_is_open(PopplerAnnotText *poppler_annot, gboolean is_open); +POPPLER_PUBLIC +gchar *poppler_annot_text_get_icon(PopplerAnnotText *poppler_annot); +POPPLER_PUBLIC +void poppler_annot_text_set_icon(PopplerAnnotText *poppler_annot, const gchar *icon); +POPPLER_PUBLIC +PopplerAnnotTextState poppler_annot_text_get_state(PopplerAnnotText *poppler_annot); + +/* PopplerAnnotTextMarkup */ +POPPLER_PUBLIC +GType poppler_annot_text_markup_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerAnnot *poppler_annot_text_markup_new_highlight(PopplerDocument *doc, PopplerRectangle *rect, GArray *quadrilaterals); +POPPLER_PUBLIC +PopplerAnnot *poppler_annot_text_markup_new_squiggly(PopplerDocument *doc, PopplerRectangle *rect, GArray *quadrilaterals); +POPPLER_PUBLIC +PopplerAnnot *poppler_annot_text_markup_new_strikeout(PopplerDocument *doc, PopplerRectangle *rect, GArray *quadrilaterals); +POPPLER_PUBLIC +PopplerAnnot *poppler_annot_text_markup_new_underline(PopplerDocument *doc, PopplerRectangle *rect, GArray *quadrilaterals); +POPPLER_PUBLIC +void poppler_annot_text_markup_set_quadrilaterals(PopplerAnnotTextMarkup *poppler_annot, GArray *quadrilaterals); +POPPLER_PUBLIC +GArray *poppler_annot_text_markup_get_quadrilaterals(PopplerAnnotTextMarkup *poppler_annot); + +/* PopplerAnnotFreeText */ +POPPLER_PUBLIC +GType poppler_annot_free_text_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerAnnotFreeTextQuadding poppler_annot_free_text_get_quadding(PopplerAnnotFreeText *poppler_annot); +POPPLER_PUBLIC +PopplerAnnotCalloutLine *poppler_annot_free_text_get_callout_line(PopplerAnnotFreeText *poppler_annot); + +/* PopplerAnnotFileAttachment */ +POPPLER_PUBLIC +GType poppler_annot_file_attachment_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerAttachment *poppler_annot_file_attachment_get_attachment(PopplerAnnotFileAttachment *poppler_annot); +POPPLER_PUBLIC +gchar *poppler_annot_file_attachment_get_name(PopplerAnnotFileAttachment *poppler_annot); + +/* PopplerAnnotMovie */ +POPPLER_PUBLIC +GType poppler_annot_movie_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +gchar *poppler_annot_movie_get_title(PopplerAnnotMovie *poppler_annot); +POPPLER_PUBLIC +PopplerMovie *poppler_annot_movie_get_movie(PopplerAnnotMovie *poppler_annot); + +/* PopplerAnnotScreen */ +POPPLER_PUBLIC +GType poppler_annot_screen_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerAction *poppler_annot_screen_get_action(PopplerAnnotScreen *poppler_annot); + +/* PopplerAnnotLine */ +POPPLER_PUBLIC +GType poppler_annot_line_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerAnnot *poppler_annot_line_new(PopplerDocument *doc, PopplerRectangle *rect, PopplerPoint *start, PopplerPoint *end); +POPPLER_PUBLIC +void poppler_annot_line_set_vertices(PopplerAnnotLine *poppler_annot, PopplerPoint *start, PopplerPoint *end); + +/* PopplerAnnotCalloutLine */ +POPPLER_PUBLIC +GType poppler_annot_callout_line_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerAnnotCalloutLine *poppler_annot_callout_line_new(void); +POPPLER_PUBLIC +PopplerAnnotCalloutLine *poppler_annot_callout_line_copy(PopplerAnnotCalloutLine *callout); +POPPLER_PUBLIC +void poppler_annot_callout_line_free(PopplerAnnotCalloutLine *callout); + +/* PopplerAnnotCircle */ +POPPLER_PUBLIC +GType poppler_annot_circle_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerAnnot *poppler_annot_circle_new(PopplerDocument *doc, PopplerRectangle *rect); +POPPLER_PUBLIC +void poppler_annot_circle_set_interior_color(PopplerAnnotCircle *poppler_annot, PopplerColor *poppler_color); +POPPLER_PUBLIC +PopplerColor *poppler_annot_circle_get_interior_color(PopplerAnnotCircle *poppler_annot); + +/* PopplerAnnotGeometry */ +POPPLER_PUBLIC +GType poppler_annot_square_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerAnnot *poppler_annot_square_new(PopplerDocument *doc, PopplerRectangle *rect); +POPPLER_PUBLIC +void poppler_annot_square_set_interior_color(PopplerAnnotSquare *poppler_annot, PopplerColor *poppler_color); +POPPLER_PUBLIC +PopplerColor *poppler_annot_square_get_interior_color(PopplerAnnotSquare *poppler_annot); + +/* PopplerAnnotStamp */ +POPPLER_PUBLIC +GType poppler_annot_stamp_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerAnnot *poppler_annot_stamp_new(PopplerDocument *doc, PopplerRectangle *rect); +POPPLER_PUBLIC +PopplerAnnotStampIcon poppler_annot_stamp_get_icon(PopplerAnnotStamp *poppler_annot); +POPPLER_PUBLIC +void poppler_annot_stamp_set_icon(PopplerAnnotStamp *poppler_annot, PopplerAnnotStampIcon icon); +POPPLER_PUBLIC +gboolean poppler_annot_stamp_set_custom_image(PopplerAnnotStamp *poppler_annot, cairo_surface_t *image, GError **error); + +G_END_DECLS + +#endif /* __POPPLER_ANNOT_H__ */ diff --git a/poppler-24.05.0/glib/poppler-attachment.cc b/poppler-24.05.0/glib/poppler-attachment.cc new file mode 100644 index 0000000000000000000000000000000000000000..51a6f95f9729f40527743b18caaf43310be9cdd3 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-attachment.cc @@ -0,0 +1,383 @@ +/* poppler-attachment.cc: glib wrapper for poppler + * Copyright (C) 2006, Red Hat, Inc. + * + * 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 "config.h" +#include <cerrno> + +#include <goo/gfile.h> + +#include "poppler.h" +#include "poppler-private.h" + +#include <new> + +/** + * SECTION:poppler-attachment + * @short_description: Attachments + * @title: PopplerAttachment + */ + +/* FIXME: We need to add gettext support sometime */ +#define _(x) (x) + +struct PopplerAttachmentPrivate +{ + Object obj_stream {}; + GDateTime *mtime; + GDateTime *ctime; +}; + +static void poppler_attachment_finalize(GObject *obj); + +G_DEFINE_TYPE_WITH_PRIVATE(PopplerAttachment, poppler_attachment, G_TYPE_OBJECT) + +#define GET_PRIVATE(obj) ((PopplerAttachmentPrivate *)poppler_attachment_get_instance_private(obj)) + +static void poppler_attachment_init(PopplerAttachment *attachment) +{ + void *place; + + place = GET_PRIVATE(attachment); + new (place) PopplerAttachmentPrivate(); +} + +static void poppler_attachment_class_init(PopplerAttachmentClass *klass) +{ + G_OBJECT_CLASS(klass)->finalize = poppler_attachment_finalize; +} + +static void poppler_attachment_finalize(GObject *obj) +{ + PopplerAttachment *attachment; + PopplerAttachmentPrivate *priv; + + attachment = (PopplerAttachment *)obj; + priv = GET_PRIVATE(attachment); + + if (attachment->name) { + g_free(attachment->name); + } + attachment->name = nullptr; + + if (attachment->description) { + g_free(attachment->description); + } + attachment->description = nullptr; + + if (attachment->checksum) { + g_string_free(attachment->checksum, TRUE); + } + attachment->checksum = nullptr; + + g_clear_pointer(&priv->mtime, g_date_time_unref); + g_clear_pointer(&priv->ctime, g_date_time_unref); + + priv->~PopplerAttachmentPrivate(); + + G_OBJECT_CLASS(poppler_attachment_parent_class)->finalize(obj); +} + +/* Public functions */ + +PopplerAttachment *_poppler_attachment_new(FileSpec *emb_file) +{ + PopplerAttachment *attachment; + PopplerAttachmentPrivate *priv; + EmbFile *embFile; + + g_assert(emb_file != nullptr); + + attachment = (PopplerAttachment *)g_object_new(POPPLER_TYPE_ATTACHMENT, nullptr); + priv = GET_PRIVATE(attachment); + + if (emb_file->getFileName()) { + attachment->name = _poppler_goo_string_to_utf8(emb_file->getFileName()); + } + if (emb_file->getDescription()) { + attachment->description = _poppler_goo_string_to_utf8(emb_file->getDescription()); + } + + embFile = emb_file->getEmbeddedFile(); + if (embFile != nullptr && embFile->streamObject()->isStream()) { + attachment->size = embFile->size(); + + if (embFile->createDate()) { + priv->ctime = _poppler_convert_pdf_date_to_date_time(embFile->createDate()); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS + /* This will overflow on dates from after 2038. This field is + * deprecated, only kept for backward compatibility. */ + attachment->ctime = (GTime)g_date_time_to_unix(priv->ctime); + G_GNUC_END_IGNORE_DEPRECATIONS + } + if (embFile->modDate()) { + priv->mtime = _poppler_convert_pdf_date_to_date_time(embFile->modDate()); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS + /* This will overflow on dates from after 2038. This field is + * deprecated, only kept for backward compatibility. */ + attachment->mtime = (GTime)g_date_time_to_unix(priv->mtime); + G_GNUC_END_IGNORE_DEPRECATIONS + } + + if (embFile->checksum() && embFile->checksum()->getLength() > 0) { + attachment->checksum = g_string_new_len(embFile->checksum()->c_str(), embFile->checksum()->getLength()); + } + priv->obj_stream = embFile->streamObject()->copy(); + } else { + g_warning("Missing stream object for embedded file"); + g_clear_object(&attachment); + } + + return attachment; +} + +/** + * poppler_attachment_get_checksum: + * @attachment: a #PopplerAttachment + * + * Returns: The attachment's checksum. + * + * Since: 20.09.0 + */ +const GString *poppler_attachment_get_checksum(PopplerAttachment *attachment) +{ + return attachment->checksum; +} + +/** + * poppler_attachment_get_ctime: + * @attachment: a #PopplerAttachment + * + * Returns: (transfer none) (nullable): The attachment's creation date and time + * as a #GDateTime, or %NULL if the creation date and time is not available. + * + * Since: 20.09.0 + */ +GDateTime *poppler_attachment_get_ctime(PopplerAttachment *attachment) +{ + return GET_PRIVATE(attachment)->ctime; +} + +/** + * poppler_attachment_get_description: + * @attachment: a #PopplerAttachment + * + * Returns: The attachment's descriptive text. + * + * Since: 20.09.0 + */ +const gchar *poppler_attachment_get_description(PopplerAttachment *attachment) +{ + return attachment->description; +} + +/** + * poppler_attachment_get_mtime: + * @attachment: a #PopplerAttachment + * + * Returns: (transfer none) (nullable): The attachment's modification date and + * time as a #GDateTime, or %NULL if the modification date and time is not + * available. + * + * Since: 20.09.0 + */ +GDateTime *poppler_attachment_get_mtime(PopplerAttachment *attachment) +{ + return GET_PRIVATE(attachment)->mtime; +} + +/** + * poppler_attachment_get_name: + * @attachment: a #PopplerAttachment + * + * Returns: The attachment's name. + * + * Since: 20.09.0 + */ +const gchar *poppler_attachment_get_name(PopplerAttachment *attachment) +{ + return attachment->name; +} + +/** + * poppler_attachment_get_size: + * @attachment: a #PopplerAttachment + * + * Returns: The attachment's size. + * + * Since: 20.09.0 + */ +gsize poppler_attachment_get_size(PopplerAttachment *attachment) +{ + return attachment->size; +} + +static gboolean save_helper(const gchar *buf, gsize count, gpointer data, GError **error) +{ + FILE *f = (FILE *)data; + gsize n; + + n = fwrite(buf, 1, count, f); + if (n != count) { + int errsv = errno; + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errsv), _("Error writing to image file: %s"), g_strerror(errsv)); + return FALSE; + } + + return TRUE; +} + +/** + * poppler_attachment_save: + * @attachment: A #PopplerAttachment. + * @filename: name of file to save + * @error: (allow-none): return location for error, or %NULL. + * + * Saves @attachment to a file indicated by @filename. If @error is set, %FALSE + * will be returned. Possible errors include those in the #G_FILE_ERROR domain + * and whatever the save function generates. + * + * Return value: %TRUE, if the file successfully saved + **/ +gboolean poppler_attachment_save(PopplerAttachment *attachment, const char *filename, GError **error) +{ + gboolean result; + FILE *f; + + g_return_val_if_fail(POPPLER_IS_ATTACHMENT(attachment), FALSE); + + f = openFile(filename, "wb"); + + if (f == nullptr) { + gchar *display_name = g_filename_display_name(filename); + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errno), _("Failed to open '%s' for writing: %s"), display_name, g_strerror(errno)); + g_free(display_name); + return FALSE; + } + + result = poppler_attachment_save_to_callback(attachment, save_helper, f, error); + + if (fclose(f) < 0) { + gchar *display_name = g_filename_display_name(filename); + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errno), _("Failed to close '%s', all data may not have been saved: %s"), display_name, g_strerror(errno)); + g_free(display_name); + return FALSE; + } + + return result; +} + +#ifndef G_OS_WIN32 + +/** + * poppler_attachment_save_to_fd: + * @attachment: A #PopplerAttachment. + * @fd: a valid file descriptor open for writing + * @error: (allow-none): return location for error, or %NULL. + * + * Saves @attachment to a file referred to by @fd. If @error is set, %FALSE + * will be returned. Possible errors include those in the #G_FILE_ERROR domain + * and whatever the save function generates. + * Note that this function takes ownership of @fd; you must not operate on it + * again, nor close it. + * + * Return value: %TRUE, if the file successfully saved + * + * Since: 21.12.0 + **/ +gboolean poppler_attachment_save_to_fd(PopplerAttachment *attachment, int fd, GError **error) +{ + gboolean result; + FILE *f; + + g_return_val_if_fail(POPPLER_IS_ATTACHMENT(attachment), FALSE); + g_return_val_if_fail(fd != -1, FALSE); + g_return_val_if_fail(error == nullptr || *error == nullptr, FALSE); + + f = fdopen(fd, "wb"); + if (f == nullptr) { + int errsv = errno; + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errsv), _("Failed to open FD %d for writing: %s"), fd, g_strerror(errsv)); + close(fd); + return FALSE; + } + + result = poppler_attachment_save_to_callback(attachment, save_helper, f, error); + + if (fclose(f) < 0) { + int errsv = errno; + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errsv), _("Failed to close FD %d, all data may not have been saved: %s"), fd, g_strerror(errsv)); + return FALSE; + } + + return result; +} + +#endif /* !G_OS_WIN32 */ + +#define BUF_SIZE 1024 + +/** + * poppler_attachment_save_to_callback: + * @attachment: A #PopplerAttachment. + * @save_func: (scope call): a function that is called to save each block of data that the save routine generates. + * @user_data: user data to pass to the save function. + * @error: (allow-none): return location for error, or %NULL. + * + * Saves @attachment by feeding the produced data to @save_func. Can be used + * when you want to store the attachment to something other than a file, such as + * an in-memory buffer or a socket. If @error is set, %FALSE will be + * returned. Possible errors include those in the #G_FILE_ERROR domain and + * whatever the save function generates. + * + * Return value: %TRUE, if the save successfully completed + **/ +gboolean poppler_attachment_save_to_callback(PopplerAttachment *attachment, PopplerAttachmentSaveFunc save_func, gpointer user_data, GError **error) +{ + PopplerAttachmentPrivate *priv; + Stream *stream; + gchar buf[BUF_SIZE]; + int i; + gboolean eof_reached = FALSE; + + g_return_val_if_fail(POPPLER_IS_ATTACHMENT(attachment), FALSE); + priv = GET_PRIVATE(attachment); + + stream = priv->obj_stream.getStream(); + stream->reset(); + + do { + int data; + + for (i = 0; i < BUF_SIZE; i++) { + data = stream->getChar(); + if (data == EOF) { + eof_reached = TRUE; + break; + } + buf[i] = data; + } + + if (i > 0) { + if (!(save_func)(buf, i, user_data, error)) { + return FALSE; + } + } + } while (!eof_reached); + + return TRUE; +} diff --git a/poppler-24.05.0/glib/poppler-attachment.h b/poppler-24.05.0/glib/poppler-attachment.h new file mode 100644 index 0000000000000000000000000000000000000000..664a566e858cce8e6aedc13a862bae526274ba19 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-attachment.h @@ -0,0 +1,123 @@ +/* poppler-attachment.h: glib interface to poppler + * Copyright (C) 2004, Red Hat, Inc. + * + * 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. + */ + +#ifndef __POPPLER_ATTACHMENT_H__ +#define __POPPLER_ATTACHMENT_H__ + +#include <glib.h> +#include <glib-object.h> + +#include "poppler.h" + +G_BEGIN_DECLS + +#define POPPLER_TYPE_ATTACHMENT (poppler_attachment_get_type()) +#define POPPLER_ATTACHMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_ATTACHMENT, PopplerAttachment)) +#define POPPLER_IS_ATTACHMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_ATTACHMENT)) + +/** + * PopplerAttachmentSaveFunc: + * @buf: (array length=count) (element-type guint8): buffer containing + * bytes to be written. + * @count: number of bytes in @buf. + * @data: (closure): user data passed to poppler_attachment_save_to_callback() + * @error: GError to set on error, or %NULL + * + * Specifies the type of the function passed to + * poppler_attachment_save_to_callback(). It is called once for each block of + * bytes that is "written" by poppler_attachment_save_to_callback(). If + * successful it should return %TRUE. If an error occurs it should set + * @error and return %FALSE, in which case poppler_attachment_save_to_callback() + * will fail with the same error. + * + * Returns: %TRUE if successful, %FALSE (with @error set) if failed. + */ +typedef gboolean (*PopplerAttachmentSaveFunc)(const gchar *buf, gsize count, gpointer data, GError **error); + +/** + * PopplerAttachment: + * @name: The filename. Deprecated in poppler 20.09.0. Use + * poppler_attachment_get_name() instead. + * @description: Descriptive text. Deprecated in poppler 20.09.0. Use + * poppler_attachment_get_description() instead. + * @size: The size of the file. Deprecated in poppler 20.09.0. Use + * poppler_attachment_get_size() instead. + * @mtime: The date and time when the file was last modified. Deprecated in + * poppler 20.09.0. Use poppler_attachment_get_mtime() instead. + * @ctime: The date and time when the file was created. Deprecated in poppler + * 20.09.0. Use poppler_attachment_get_ctime() instead. + * @checksum: A 16-byte checksum of the file. Deprecated in poppler 20.09.0. Use + * poppler_attachment_get_checksum() instead. + */ +struct _PopplerAttachment +{ + GObject parent; + + /*< public >*/ + gchar *name; + gchar *description; + gsize size; + + /* GTime is deprecated, but is part of our ABI here (see #715, #765). */ + G_GNUC_BEGIN_IGNORE_DEPRECATIONS + GTime mtime; + GTime ctime; + G_GNUC_END_IGNORE_DEPRECATIONS + + GString *checksum; +}; + +/* This struct was not intended to be public, but can't be moved to + * poppler-attachment.cc without breaking the API stability. + */ +/** + * PopplerAttachmentClass: + * + * The GObject class structure of #PopplerAttachment. + */ +typedef struct _PopplerAttachmentClass +{ + GObjectClass parent_class; +} PopplerAttachmentClass; + +POPPLER_PUBLIC +GType poppler_attachment_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +const GString *poppler_attachment_get_checksum(PopplerAttachment *attachment); +POPPLER_PUBLIC +GDateTime *poppler_attachment_get_ctime(PopplerAttachment *attachment); +POPPLER_PUBLIC +const gchar *poppler_attachment_get_description(PopplerAttachment *attachment); +POPPLER_PUBLIC +GDateTime *poppler_attachment_get_mtime(PopplerAttachment *attachment); +POPPLER_PUBLIC +const gchar *poppler_attachment_get_name(PopplerAttachment *attachment); +POPPLER_PUBLIC +gsize poppler_attachment_get_size(PopplerAttachment *attachment); +POPPLER_PUBLIC +gboolean poppler_attachment_save(PopplerAttachment *attachment, const char *filename, GError **error); +#ifndef G_OS_WIN32 +POPPLER_PUBLIC +gboolean poppler_attachment_save_to_fd(PopplerAttachment *attachment, int fd, GError **error); +#endif +POPPLER_PUBLIC +gboolean poppler_attachment_save_to_callback(PopplerAttachment *attachment, PopplerAttachmentSaveFunc save_func, gpointer user_data, GError **error); + +G_END_DECLS + +#endif /* __POPPLER_ATTACHMENT_H__ */ diff --git a/poppler-24.05.0/glib/poppler-cached-file-loader.cc b/poppler-24.05.0/glib/poppler-cached-file-loader.cc new file mode 100644 index 0000000000000000000000000000000000000000..9e747a041c05fa2c5c1c061db73ba21146d393e3 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-cached-file-loader.cc @@ -0,0 +1,110 @@ +/* poppler-cached-file-loader.h: glib interface to poppler + * + * Copyright (C) 2012 Carlos Garcia Campos <carlosgc@gnome.org> + * Copyright (C) 2022 Albert Astals Cid <aacid@kde.org> + * + * 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 "config.h" +#include "poppler-cached-file-loader.h" + +PopplerCachedFileLoader::PopplerCachedFileLoader(GInputStream *inputStreamA, GCancellable *cancellableA, goffset lengthA) +{ + inputStream = (GInputStream *)g_object_ref(inputStreamA); + cancellable = cancellableA ? (GCancellable *)g_object_ref(cancellableA) : nullptr; + length = lengthA; + cachedFile = nullptr; +} + +PopplerCachedFileLoader::~PopplerCachedFileLoader() +{ + g_object_unref(inputStream); + if (cancellable) { + g_object_unref(cancellable); + } +} + +size_t PopplerCachedFileLoader::init(CachedFile *cachedFileA) +{ + size_t size; + gssize bytesRead; + char buf[CachedFileChunkSize]; + + cachedFile = cachedFileA; + + if (length != (goffset)-1) { + return length; + } + + if (G_IS_FILE_INPUT_STREAM(inputStream)) { + GFileInfo *info; + + info = g_file_input_stream_query_info(G_FILE_INPUT_STREAM(inputStream), G_FILE_ATTRIBUTE_STANDARD_SIZE, cancellable, nullptr); + if (!info) { + error(errInternal, -1, "Failed to get size."); + return (size_t)-1; + } + + length = g_file_info_get_size(info); + g_object_unref(info); + + return length; + } + + // Unknown stream length, read the whole stream and return the size. + CachedFileWriter writer = CachedFileWriter(cachedFile, nullptr); + size = 0; + do { + bytesRead = g_input_stream_read(inputStream, buf, CachedFileChunkSize, cancellable, nullptr); + if (bytesRead == -1) { + break; + } + + writer.write(buf, bytesRead); + size += bytesRead; + } while (bytesRead > 0); + + return size; +} + +int PopplerCachedFileLoader::load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer) +{ + char buf[CachedFileChunkSize]; + gssize bytesRead; + size_t rangeBytesRead, bytesToRead; + + if (length == (goffset)-1) { + return 0; + } + + for (const ByteRange &range : ranges) { + bytesToRead = MIN(CachedFileChunkSize, range.length); + rangeBytesRead = 0; + g_seekable_seek(G_SEEKABLE(inputStream), range.offset, G_SEEK_SET, cancellable, nullptr); + do { + bytesRead = g_input_stream_read(inputStream, buf, bytesToRead, cancellable, nullptr); + if (bytesRead == -1) { + return -1; + } + + writer->write(buf, bytesRead); + rangeBytesRead += bytesRead; + bytesToRead = range.length - rangeBytesRead; + } while (bytesRead > 0 && bytesToRead > 0); + } + + return 0; +} diff --git a/poppler-24.05.0/glib/poppler-cached-file-loader.h b/poppler-24.05.0/glib/poppler-cached-file-loader.h new file mode 100644 index 0000000000000000000000000000000000000000..464fb5e4b33aff676765fbb869d723b562128942 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-cached-file-loader.h @@ -0,0 +1,45 @@ +/* poppler-cached-file-loader.h: glib interface to poppler + * + * Copyright (C) 2012 Carlos Garcia Campos <carlosgc@gnome.org> + * Copyright (C) 2022 Albert Astals Cid <aacid@kde.org> + * + * 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. + */ + +#ifndef __POPPLER_CACHED_FILE_LOADER_H__ +#define __POPPLER_CACHED_FILE_LOADER_H__ + +#include <gio/gio.h> +#ifndef __GI_SCANNER__ +# include <CachedFile.h> + +class PopplerCachedFileLoader : public CachedFileLoader +{ +public: + PopplerCachedFileLoader(GInputStream *inputStreamA, GCancellable *cancellableA, goffset lengthA = -1); + ~PopplerCachedFileLoader() override; + size_t init(CachedFile *cachedFile) override; + int load(const std::vector<ByteRange> &ranges, CachedFileWriter *writer) override; + +private: + GInputStream *inputStream; + GCancellable *cancellable; + goffset length; + CachedFile *cachedFile; +}; + +#endif /* __GI_SCANNER__ */ + +#endif /* __POPPLER_CACHED_FILE_LOADER_H__ */ diff --git a/poppler-24.05.0/glib/poppler-date.cc b/poppler-24.05.0/glib/poppler-date.cc new file mode 100644 index 0000000000000000000000000000000000000000..9957d11e0cef46cab285f5ea794b83712559fdc3 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-date.cc @@ -0,0 +1,48 @@ +/* poppler-date.cc: glib interface to poppler + * + * Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 <goo/glibc.h> +#include <DateInfo.h> + +#include "poppler-date.h" + +/** + * poppler_date_parse: + * @date: string to parse + * @timet: an uninitialized #time_t + * + * Parses a PDF format date string and converts it to a #time_t. Returns #FALSE + * if the parsing fails or the input string is not a valid PDF format date string + * + * Return value: #TRUE, if @timet was set + * + * Since: 0.12 + **/ +gboolean poppler_date_parse(const gchar *date, time_t *timet) +{ + time_t t; + GooString dateString(date); + t = dateStringToTime(&dateString); + if (t == (time_t)-1) { + return FALSE; + } + + *timet = t; + return TRUE; +} diff --git a/poppler-24.05.0/glib/poppler-date.h b/poppler-24.05.0/glib/poppler-date.h new file mode 100644 index 0000000000000000000000000000000000000000..26b8a3f5cd2d1450c33eac967cb81312ba0e6308 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-date.h @@ -0,0 +1,32 @@ +/* poppler-date.h: glib interface to poppler + * + * Copyright (C) 2009 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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. + */ + +#ifndef __POPPLER_DATE_H__ +#define __POPPLER_DATE_H__ + +#include "poppler.h" + +G_BEGIN_DECLS + +POPPLER_PUBLIC +gboolean poppler_date_parse(const gchar *date, time_t *timet); + +G_END_DECLS + +#endif /* __POPPLER_DATE_H__ */ diff --git a/poppler-24.05.0/glib/poppler-document.cc b/poppler-24.05.0/glib/poppler-document.cc new file mode 100644 index 0000000000000000000000000000000000000000..fac52af86a7e087d567ecbd857d692d90dc69688 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-document.cc @@ -0,0 +1,3917 @@ +/* poppler-document.cc: glib wrapper for poppler + * Copyright (C) 2005, Red Hat, Inc. + * + * Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com> + * Copyright (C) 2018, 2019, 2021, 2022 Marek Kasik <mkasik@redhat.com> + * Copyright (C) 2019 Masamichi Hosoda <trueroad@trueroad.jp> + * Copyright (C) 2019, 2021, 2024 Oliver Sander <oliver.sander@tu-dresden.de> + * Copyright (C) 2020, 2022 Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2021 André Guerreiro <aguerreiro1985@gmail.com> + * Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela <sune@vuorela.dk> + * + * 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 "config.h" +#include <cstring> + +#include <glib.h> + +#ifndef G_OS_WIN32 +# include <fcntl.h> +# include <sys/stat.h> +# include <sys/types.h> +# include <unistd.h> +#endif + +#ifndef __GI_SCANNER__ +# include <memory> + +# include <goo/gfile.h> +# include <splash/SplashBitmap.h> +# include <CachedFile.h> +# include <DateInfo.h> +# include <FILECacheLoader.h> +# include <GlobalParams.h> +# include <PDFDoc.h> +# include <SignatureInfo.h> +# include <Outline.h> +# include <ErrorCodes.h> +# include <UnicodeMap.h> +# include <GfxState.h> +# include <SplashOutputDev.h> +# include <Stream.h> +# include <FontInfo.h> +# include <PDFDocEncoding.h> +# include <OptionalContent.h> +# include <ViewerPreferences.h> +# include "UTF.h" +#endif + +#include "poppler.h" +#include "poppler-private.h" +#include "poppler-enums.h" +#include "poppler-input-stream.h" +#include "poppler-cached-file-loader.h" + +#ifdef G_OS_WIN32 +# include <stringapiset.h> +#endif + +/** + * SECTION:poppler-document + * @short_description: Information about a document + * @title: PopplerDocument + * + * The #PopplerDocument is an object used to refer to a main document. + */ + +enum +{ + PROP_0, + PROP_TITLE, + PROP_FORMAT, + PROP_FORMAT_MAJOR, + PROP_FORMAT_MINOR, + PROP_SUBTYPE, + PROP_SUBTYPE_STRING, + PROP_SUBTYPE_PART, + PROP_SUBTYPE_CONF, + PROP_AUTHOR, + PROP_SUBJECT, + PROP_KEYWORDS, + PROP_CREATOR, + PROP_PRODUCER, + PROP_CREATION_DATE, + PROP_MOD_DATE, + PROP_LINEARIZED, + PROP_PAGE_LAYOUT, + PROP_PAGE_MODE, + PROP_VIEWER_PREFERENCES, + PROP_PERMISSIONS, + PROP_METADATA, + PROP_PRINT_SCALING, + PROP_PRINT_DUPLEX, + PROP_PRINT_N_COPIES, + PROP_CREATION_DATETIME, + PROP_MOD_DATETIME +}; + +static void poppler_document_layers_free(PopplerDocument *document); + +typedef struct _PopplerDocumentClass PopplerDocumentClass; +struct _PopplerDocumentClass +{ + GObjectClass parent_class; +}; + +G_DEFINE_TYPE(PopplerDocument, poppler_document, G_TYPE_OBJECT) + +static PopplerDocument *_poppler_document_new_from_pdfdoc(std::unique_ptr<GlobalParamsIniter> &&initer, PDFDoc *newDoc, GError **error) +{ + PopplerDocument *document; + + if (!newDoc->isOk()) { + int fopen_errno; + switch (newDoc->getErrorCode()) { + case errOpenFile: + // If there was an error opening the file, count it as a G_FILE_ERROR + // and set the GError parameters accordingly. (this assumes that the + // only way to get an errOpenFile error is if newDoc was created using + // a filename and thus fopen was called, which right now is true. + fopen_errno = newDoc->getFopenErrno(); + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(fopen_errno), "%s", g_strerror(fopen_errno)); + break; + case errBadCatalog: + g_set_error(error, POPPLER_ERROR, POPPLER_ERROR_BAD_CATALOG, "Failed to read the document catalog"); + break; + case errDamaged: + g_set_error(error, POPPLER_ERROR, POPPLER_ERROR_DAMAGED, "PDF document is damaged"); + break; + case errEncrypted: + g_set_error(error, POPPLER_ERROR, POPPLER_ERROR_ENCRYPTED, "Document is encrypted"); + break; + default: + g_set_error(error, POPPLER_ERROR, POPPLER_ERROR_INVALID, "Failed to load document"); + } + + delete newDoc; + return nullptr; + } + + document = (PopplerDocument *)g_object_new(POPPLER_TYPE_DOCUMENT, nullptr); + document->initer = std::move(initer); + document->doc = newDoc; + + document->output_dev = new CairoOutputDev(); + document->output_dev->startDoc(document->doc); + + return document; +} + +static std::optional<GooString> poppler_password_to_latin1(const gchar *password) +{ + gchar *password_latin; + + if (!password) { + return {}; + } + + password_latin = g_convert(password, -1, "ISO-8859-1", "UTF-8", nullptr, nullptr, nullptr); + std::optional<GooString> password_g = GooString(password_latin); + g_free(password_latin); + + return password_g; +} + +/** + * poppler_document_new_from_file: + * @uri: uri of the file to load + * @password: (allow-none): password to unlock the file with, or %NULL + * @error: (allow-none): Return location for an error, or %NULL + * + * Creates a new #PopplerDocument. If %NULL is returned, then @error will be + * set. Possible errors include those in the #POPPLER_ERROR and #G_FILE_ERROR + * domains. + * + * Return value: A newly created #PopplerDocument, or %NULL + **/ +PopplerDocument *poppler_document_new_from_file(const char *uri, const char *password, GError **error) +{ + PDFDoc *newDoc; + char *filename; + + auto initer = std::make_unique<GlobalParamsIniter>(_poppler_error_cb); + + filename = g_filename_from_uri(uri, nullptr, error); + if (!filename) { + return nullptr; + } + + const std::optional<GooString> password_g = poppler_password_to_latin1(password); + +#ifdef G_OS_WIN32 + wchar_t *filenameW; + int length; + + length = MultiByteToWideChar(CP_UTF8, 0, filename, -1, nullptr, 0); + + filenameW = new WCHAR[length]; + if (!filenameW) + return nullptr; + + length = MultiByteToWideChar(CP_UTF8, 0, filename, -1, filenameW, length); + + newDoc = new PDFDoc(filenameW, length, password_g, password_g); + if (!newDoc->isOk() && newDoc->getErrorCode() == errEncrypted && password) { + /* Try again with original password (which comes from GTK in UTF8) Issue #824 */ + delete newDoc; + newDoc = new PDFDoc(filenameW, length, GooString(password), GooString(password)); + } + delete[] filenameW; +#else + newDoc = new PDFDoc(std::make_unique<GooString>(filename), password_g, password_g); + if (!newDoc->isOk() && newDoc->getErrorCode() == errEncrypted && password) { + /* Try again with original password (which comes from GTK in UTF8) Issue #824 */ + delete newDoc; + newDoc = new PDFDoc(std::make_unique<GooString>(filename), GooString(password), GooString(password)); + } +#endif + g_free(filename); + + return _poppler_document_new_from_pdfdoc(std::move(initer), newDoc, error); +} + +/** + * poppler_document_new_from_data: + * @data: (array length=length) (element-type guint8): the pdf data + * @length: the length of #data + * @password: (nullable): password to unlock the file with, or %NULL + * @error: (nullable): Return location for an error, or %NULL + * + * Creates a new #PopplerDocument. If %NULL is returned, then @error will be + * set. Possible errors include those in the #POPPLER_ERROR and #G_FILE_ERROR + * domains. + * + * Note that @data is not copied nor is a new reference to it created. + * It must remain valid and cannot be destroyed as long as the returned + * document exists. + * + * Return value: A newly created #PopplerDocument, or %NULL + * + * Deprecated: 0.82: This requires directly managing @length and @data. + * Use poppler_document_new_from_bytes() instead. + **/ +PopplerDocument *poppler_document_new_from_data(char *data, int length, const char *password, GError **error) +{ + PDFDoc *newDoc; + MemStream *str; + + auto initer = std::make_unique<GlobalParamsIniter>(_poppler_error_cb); + + // create stream + str = new MemStream(data, 0, length, Object(objNull)); + + const std::optional<GooString> password_g = poppler_password_to_latin1(password); + newDoc = new PDFDoc(str, password_g, password_g); + if (!newDoc->isOk() && newDoc->getErrorCode() == errEncrypted && password) { + /* Try again with original password (which comes from GTK in UTF8) Issue #824 */ + str = dynamic_cast<MemStream *>(str->copy()); + delete newDoc; + newDoc = new PDFDoc(str, GooString(password), GooString(password)); + } + + return _poppler_document_new_from_pdfdoc(std::move(initer), newDoc, error); +} + +class BytesStream : public MemStream +{ + std::unique_ptr<GBytes, decltype(&g_bytes_unref)> m_bytes; + +public: + BytesStream(GBytes *bytes, Object &&dictA) : MemStream(static_cast<const char *>(g_bytes_get_data(bytes, nullptr)), 0, g_bytes_get_size(bytes), std::move(dictA)), m_bytes { g_bytes_ref(bytes), &g_bytes_unref } { } + ~BytesStream() override; +}; + +BytesStream::~BytesStream() = default; + +class OwningFileStream final : public FileStream +{ +public: + OwningFileStream(std::unique_ptr<GooFile> fileA, Object &&dictA) : FileStream(fileA.get(), 0, false, fileA->size(), std::move(dictA)), file(std::move(fileA)) { } + + ~OwningFileStream() override; + +private: + std::unique_ptr<GooFile> file; +}; + +OwningFileStream::~OwningFileStream() = default; + +/** + * poppler_document_new_from_bytes: + * @bytes: a #GBytes + * @password: (allow-none): password to unlock the file with, or %NULL + * @error: (allow-none): Return location for an error, or %NULL + * + * Creates a new #PopplerDocument from @bytes. The returned document + * will hold a reference to @bytes. + * + * On error, %NULL is returned, with @error set. Possible errors include + * those in the #POPPLER_ERROR and #G_FILE_ERROR domains. + * + * Return value: (transfer full): a newly created #PopplerDocument, or %NULL + * + * Since: 0.82 + **/ +PopplerDocument *poppler_document_new_from_bytes(GBytes *bytes, const char *password, GError **error) +{ + PDFDoc *newDoc; + BytesStream *str; + + g_return_val_if_fail(bytes != nullptr, nullptr); + g_return_val_if_fail(error == nullptr || *error == nullptr, nullptr); + + auto initer = std::make_unique<GlobalParamsIniter>(_poppler_error_cb); + + // create stream + str = new BytesStream(bytes, Object(objNull)); + + const std::optional<GooString> password_g = poppler_password_to_latin1(password); + newDoc = new PDFDoc(str, password_g, password_g); + if (!newDoc->isOk() && newDoc->getErrorCode() == errEncrypted && password) { + /* Try again with original password (which comes from GTK in UTF8) Issue #824 */ + str = dynamic_cast<BytesStream *>(str->copy()); + delete newDoc; + newDoc = new PDFDoc(str, GooString(password), GooString(password)); + } + + return _poppler_document_new_from_pdfdoc(std::move(initer), newDoc, error); +} + +static inline gboolean stream_is_memory_buffer_or_local_file(GInputStream *stream) +{ + return G_IS_MEMORY_INPUT_STREAM(stream) || (G_IS_FILE_INPUT_STREAM(stream) && strcmp(g_type_name_from_instance((GTypeInstance *)stream), "GLocalFileInputStream") == 0); +} + +/** + * poppler_document_new_from_stream: + * @stream: a #GInputStream to read from + * @length: the stream length, or -1 if not known + * @password: (allow-none): password to unlock the file with, or %NULL + * @cancellable: (allow-none): a #GCancellable, or %NULL + * @error: (allow-none): Return location for an error, or %NULL + * + * Creates a new #PopplerDocument reading the PDF contents from @stream. + * Note that the given #GInputStream must be seekable or %G_IO_ERROR_NOT_SUPPORTED + * will be returned. + * Possible errors include those in the #POPPLER_ERROR, #G_FILE_ERROR + * and #G_IO_ERROR domains. + * + * Returns: (transfer full): a new #PopplerDocument, or %NULL + * + * Since: 0.22 + */ +PopplerDocument *poppler_document_new_from_stream(GInputStream *stream, goffset length, const char *password, GCancellable *cancellable, GError **error) +{ + PDFDoc *newDoc; + BaseStream *str; + + g_return_val_if_fail(G_IS_INPUT_STREAM(stream), NULL); + g_return_val_if_fail(length == (goffset)-1 || length > 0, NULL); + + auto initer = std::make_unique<GlobalParamsIniter>(_poppler_error_cb); + + if (!G_IS_SEEKABLE(stream) || !g_seekable_can_seek(G_SEEKABLE(stream))) { + g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, "Stream is not seekable"); + return nullptr; + } + + if (stream_is_memory_buffer_or_local_file(stream)) { + if (length == (goffset)-1) { + if (!g_seekable_seek(G_SEEKABLE(stream), 0, G_SEEK_END, cancellable, error)) { + g_prefix_error(error, "Unable to determine length of stream: "); + return nullptr; + } + length = g_seekable_tell(G_SEEKABLE(stream)); + } + str = new PopplerInputStream(stream, cancellable, 0, false, length, Object(objNull)); + } else { + CachedFile *cachedFile = new CachedFile(new PopplerCachedFileLoader(stream, cancellable, length)); + str = new CachedFileStream(cachedFile, 0, false, cachedFile->getLength(), Object(objNull)); + } + + const std::optional<GooString> password_g = poppler_password_to_latin1(password); + newDoc = new PDFDoc(str, password_g, password_g); + if (!newDoc->isOk() && newDoc->getErrorCode() == errEncrypted && password) { + /* Try again with original password (which comes from GTK in UTF8) Issue #824 */ + str = str->copy(); + delete newDoc; + newDoc = new PDFDoc(str, GooString(password), GooString(password)); + } + + return _poppler_document_new_from_pdfdoc(std::move(initer), newDoc, error); +} + +/** + * poppler_document_new_from_gfile: + * @file: a #GFile to load + * @password: (allow-none): password to unlock the file with, or %NULL + * @cancellable: (allow-none): a #GCancellable, or %NULL + * @error: (allow-none): Return location for an error, or %NULL + * + * Creates a new #PopplerDocument reading the PDF contents from @file. + * Possible errors include those in the #POPPLER_ERROR and #G_FILE_ERROR + * domains. + * + * Returns: (transfer full): a new #PopplerDocument, or %NULL + * + * Since: 0.22 + */ +PopplerDocument *poppler_document_new_from_gfile(GFile *file, const char *password, GCancellable *cancellable, GError **error) +{ + PopplerDocument *document; + GFileInputStream *stream; + + g_return_val_if_fail(G_IS_FILE(file), NULL); + + if (g_file_is_native(file)) { + gchar *uri; + + uri = g_file_get_uri(file); + document = poppler_document_new_from_file(uri, password, error); + g_free(uri); + + return document; + } + + stream = g_file_read(file, cancellable, error); + if (!stream) { + return nullptr; + } + + document = poppler_document_new_from_stream(G_INPUT_STREAM(stream), -1, password, cancellable, error); + g_object_unref(stream); + + return document; +} + +#ifndef G_OS_WIN32 + +/** + * poppler_document_new_from_fd: + * @fd: a valid file descriptor + * @password: (allow-none): password to unlock the file with, or %NULL + * @error: (allow-none): Return location for an error, or %NULL + * + * Creates a new #PopplerDocument reading the PDF contents from the file + * descriptor @fd. @fd must refer to a regular file, or STDIN, and be open + * for reading. + * Possible errors include those in the #POPPLER_ERROR and #G_FILE_ERROR + * domains. + * Note that this function takes ownership of @fd; you must not operate on it + * again, nor close it. + * + * Returns: (transfer full): a new #PopplerDocument, or %NULL + * + * Since: 21.12.0 + */ +PopplerDocument *poppler_document_new_from_fd(int fd, const char *password, GError **error) +{ + struct stat statbuf; + int flags; + BaseStream *stream; + PDFDoc *newDoc; + + g_return_val_if_fail(fd != -1, nullptr); + + auto initer = std::make_unique<GlobalParamsIniter>(_poppler_error_cb); + + if (fstat(fd, &statbuf) == -1 || (flags = fcntl(fd, F_GETFL, &flags)) == -1) { + int errsv = errno; + g_set_error_literal(error, G_FILE_ERROR, g_file_error_from_errno(errsv), g_strerror(errsv)); + close(fd); + return nullptr; + } + + switch (flags & O_ACCMODE) { + case O_RDONLY: + case O_RDWR: + break; + case O_WRONLY: + default: + g_set_error(error, G_FILE_ERROR, G_FILE_ERROR_BADF, "File descriptor %d is not readable", fd); + close(fd); + return nullptr; + } + + if (fd == fileno(stdin) || !S_ISREG(statbuf.st_mode)) { + FILE *file; + if (fd == fileno(stdin)) { + file = stdin; + } else { + file = fdopen(fd, "rb"); + if (!file) { + int errsv = errno; + g_set_error_literal(error, G_FILE_ERROR, g_file_error_from_errno(errsv), g_strerror(errsv)); + close(fd); + return nullptr; + } + } + + CachedFile *cachedFile = new CachedFile(new FILECacheLoader(file)); + stream = new CachedFileStream(cachedFile, 0, false, cachedFile->getLength(), Object(objNull)); + } else { + stream = new OwningFileStream(GooFile::open(fd), Object(objNull)); + } + + const std::optional<GooString> password_g = poppler_password_to_latin1(password); + newDoc = new PDFDoc(stream, password_g, password_g); + if (!newDoc->isOk() && newDoc->getErrorCode() == errEncrypted && password) { + /* Try again with original password (which comes from GTK in UTF8) Issue #824 */ + stream = stream->copy(); + delete newDoc; + newDoc = new PDFDoc(stream, GooString(password), GooString(password)); + } + + return _poppler_document_new_from_pdfdoc(std::move(initer), newDoc, error); +} + +#endif /* !G_OS_WIN32 */ + +static gboolean handle_save_error(int err_code, GError **error) +{ + switch (err_code) { + case errNone: + break; + case errOpenFile: + g_set_error(error, POPPLER_ERROR, POPPLER_ERROR_OPEN_FILE, "Failed to open file for writing"); + break; + case errEncrypted: + g_set_error(error, POPPLER_ERROR, POPPLER_ERROR_ENCRYPTED, "Document is encrypted"); + break; + default: + g_set_error(error, POPPLER_ERROR, POPPLER_ERROR_INVALID, "Failed to save document"); + } + + return err_code == errNone; +} + +/** + * poppler_document_save: + * @document: a #PopplerDocument + * @uri: uri of file to save + * @error: (allow-none): return location for an error, or %NULL + * + * Saves @document. Any change made in the document such as + * form fields filled, annotations added or modified + * will be saved. + * If @error is set, %FALSE will be returned. Possible errors + * include those in the #G_FILE_ERROR domain. + * + * Return value: %TRUE, if the document was successfully saved + **/ +gboolean poppler_document_save(PopplerDocument *document, const char *uri, GError **error) +{ + char *filename; + gboolean retval = FALSE; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), FALSE); + + filename = g_filename_from_uri(uri, nullptr, error); + if (filename != nullptr) { + GooString fname(filename); + int err_code; + g_free(filename); + + err_code = document->doc->saveAs(fname); + retval = handle_save_error(err_code, error); + } + + return retval; +} + +/** + * poppler_document_save_a_copy: + * @document: a #PopplerDocument + * @uri: uri of file to save + * @error: (allow-none): return location for an error, or %NULL + * + * Saves a copy of the original @document. + * Any change made in the document such as + * form fields filled by the user will not be saved. + * If @error is set, %FALSE will be returned. Possible errors + * include those in the #G_FILE_ERROR domain. + * + * Return value: %TRUE, if the document was successfully saved + **/ +gboolean poppler_document_save_a_copy(PopplerDocument *document, const char *uri, GError **error) +{ + char *filename; + gboolean retval = FALSE; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), FALSE); + + filename = g_filename_from_uri(uri, nullptr, error); + if (filename != nullptr) { + GooString fname(filename); + int err_code; + g_free(filename); + + err_code = document->doc->saveWithoutChangesAs(fname); + retval = handle_save_error(err_code, error); + } + + return retval; +} + +#ifndef G_OS_WIN32 + +/** + * poppler_document_save_to_fd: + * @document: a #PopplerDocument + * @fd: a valid file descriptor open for writing + * @include_changes: whether to include user changes (e.g. form fills) + * @error: (allow-none): return location for an error, or %NULL + * + * Saves @document. Any change made in the document such as + * form fields filled, annotations added or modified + * will be saved if @include_changes is %TRUE, or discarded i + * @include_changes is %FALSE. + * + * Note that this function takes ownership of @fd; you must not operate on it + * again, nor close it. + * + * If @error is set, %FALSE will be returned. Possible errors + * include those in the #G_FILE_ERROR domain. + * + * Return value: %TRUE, if the document was successfully saved + * + * Since: 21.12.0 + **/ +gboolean poppler_document_save_to_fd(PopplerDocument *document, int fd, gboolean include_changes, GError **error) +{ + FILE *file; + OutStream *stream; + int rv; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), FALSE); + g_return_val_if_fail(fd != -1, FALSE); + + file = fdopen(fd, "wb"); + if (file == nullptr) { + int errsv = errno; + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errsv), "Failed to open FD %d for writing: %s", fd, g_strerror(errsv)); + return FALSE; + } + + stream = new FileOutStream(file, 0); + if (include_changes) { + rv = document->doc->saveAs(stream); + } else { + rv = document->doc->saveWithoutChangesAs(stream); + } + delete stream; + + return handle_save_error(rv, error); +} + +#endif /* !G_OS_WIN32 */ + +static void poppler_document_finalize(GObject *object) +{ + PopplerDocument *document = POPPLER_DOCUMENT(object); + + poppler_document_layers_free(document); + delete document->output_dev; + delete document->doc; + delete document->initer.release(); + + G_OBJECT_CLASS(poppler_document_parent_class)->finalize(object); +} + +/** + * poppler_document_get_id: + * @document: A #PopplerDocument + * @permanent_id: (out) (allow-none): location to store an allocated string, use g_free() to free the returned string + * @update_id: (out) (allow-none): location to store an allocated string, use g_free() to free the returned string + * + * Returns the PDF file identifier represented as two byte string arrays of size 32. + * @permanent_id is the permanent identifier that is built based on the file + * contents at the time it was originally created, so that this identifer + * never changes. @update_id is the update identifier that is built based on + * the file contents at the time it was last updated. + * + * Note that returned strings are not null-terminated, they have a fixed + * size of 32 bytes. + * + * Returns: %TRUE if the @document contains an id, %FALSE otherwise + * + * Since: 0.16 + */ +gboolean poppler_document_get_id(PopplerDocument *document, gchar **permanent_id, gchar **update_id) +{ + GooString permanent; + GooString update; + gboolean retval = FALSE; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), FALSE); + + if (permanent_id) { + *permanent_id = nullptr; + } + if (update_id) { + *update_id = nullptr; + } + + if (document->doc->getID(permanent_id ? &permanent : nullptr, update_id ? &update : nullptr)) { + if (permanent_id) { + *permanent_id = g_new(char, 32); + memcpy(*permanent_id, permanent.c_str(), 32); + } + if (update_id) { + *update_id = g_new(char, 32); + memcpy(*update_id, update.c_str(), 32); + } + + retval = TRUE; + } + + return retval; +} + +/** + * poppler_document_get_n_pages: + * @document: A #PopplerDocument + * + * Returns the number of pages in a loaded document. + * + * Return value: Number of pages + **/ +int poppler_document_get_n_pages(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), 0); + + return document->doc->getNumPages(); +} + +/** + * poppler_document_get_page: + * @document: A #PopplerDocument + * @index: a page index + * + * Returns the #PopplerPage indexed at @index. This object is owned by the + * caller. + * + * Return value: (transfer full) : The #PopplerPage at @index + **/ +PopplerPage *poppler_document_get_page(PopplerDocument *document, int index) +{ + Page *page; + + g_return_val_if_fail(0 <= index && index < poppler_document_get_n_pages(document), NULL); + + page = document->doc->getPage(index + 1); + if (!page) { + return nullptr; + } + + return _poppler_page_new(document, page, index); +} + +/** + * poppler_document_get_page_by_label: + * @document: A #PopplerDocument + * @label: a page label + * + * Returns the #PopplerPage reference by @label. This object is owned by the + * caller. @label is a human-readable string representation of the page number, + * and can be document specific. Typically, it is a value such as "iii" or "3". + * + * By default, "1" refers to the first page. + * + * Return value: (transfer full) :The #PopplerPage referenced by @label + **/ +PopplerPage *poppler_document_get_page_by_label(PopplerDocument *document, const char *label) +{ + Catalog *catalog; + GooString label_g(label); + int index; + + catalog = document->doc->getCatalog(); + if (!catalog->labelToIndex(&label_g, &index)) { + return nullptr; + } + + return poppler_document_get_page(document, index); +} + +/** + * poppler_document_get_n_attachments: + * @document: A #PopplerDocument + * + * Returns the number of attachments in a loaded document. + * See also poppler_document_get_attachments() + * + * Return value: Number of attachments + * + * Since: 0.18 + */ +guint poppler_document_get_n_attachments(PopplerDocument *document) +{ + Catalog *catalog; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), 0); + + catalog = document->doc->getCatalog(); + + return catalog && catalog->isOk() ? catalog->numEmbeddedFiles() : 0; +} + +/** + * poppler_document_has_attachments: + * @document: A #PopplerDocument + * + * Returns %TRUE of @document has any attachments. + * + * Return value: %TRUE, if @document has attachments. + **/ +gboolean poppler_document_has_attachments(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), FALSE); + + return (poppler_document_get_n_attachments(document) != 0); +} + +/** + * poppler_document_get_attachments: + * @document: A #PopplerDocument + * + * Returns a #GList containing #PopplerAttachment<!-- -->s. These attachments + * are unowned, and must be unreffed, and the list must be freed with + * g_list_free(). + * + * Return value: (element-type PopplerAttachment) (transfer full): a list of available attachments. + **/ +GList *poppler_document_get_attachments(PopplerDocument *document) +{ + Catalog *catalog; + int n_files, i; + GList *retval = nullptr; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + + catalog = document->doc->getCatalog(); + if (catalog == nullptr || !catalog->isOk()) { + return nullptr; + } + + n_files = catalog->numEmbeddedFiles(); + for (i = 0; i < n_files; i++) { + PopplerAttachment *attachment; + + const std::unique_ptr<FileSpec> emb_file = catalog->embeddedFile(i); + if (!emb_file->isOk() || !emb_file->getEmbeddedFile()->isOk()) { + continue; + } + + attachment = _poppler_attachment_new(emb_file.get()); + + if (attachment != nullptr) { + retval = g_list_prepend(retval, attachment); + } + } + return g_list_reverse(retval); +} + +/** + * poppler_named_dest_from_bytestring: + * @data: (array length=length): the bytestring data + * @length: the bytestring length + * + * Converts a bytestring into a zero-terminated string suitable to + * pass to poppler_document_find_dest(). + * + * Note that the returned string has no defined encoding and is not + * suitable for display to the user. + * + * The returned data must be freed using g_free(). + * + * Returns: (transfer full): the named dest + * + * Since: 0.73 + */ +char *poppler_named_dest_from_bytestring(const guint8 *data, gsize length) +{ + const guint8 *p, *pend; + char *dest, *q; + + g_return_val_if_fail(length != 0 || data != nullptr, nullptr); + /* Each source byte needs maximally 2 destination chars (\\ or \0) */ + q = dest = (gchar *)g_malloc(length * 2 + 1); + + pend = data + length; + for (p = data; p < pend; ++p) { + switch (*p) { + case '\0': + *q++ = '\\'; + *q++ = '0'; + break; + case '\\': + *q++ = '\\'; + *q++ = '\\'; + break; + default: + *q++ = *p; + break; + } + } + + *q = 0; /* zero terminate */ + return dest; +} + +/** + * poppler_named_dest_to_bytestring: + * @name: the named dest string + * @length: (out): a location to store the length of the returned bytestring + * + * Converts a named dest string (e.g. from #PopplerDest.named_dest) into a + * bytestring, inverting the transformation of + * poppler_named_dest_from_bytestring(). + * + * Note that the returned data is not zero terminated and may also + * contains embedded NUL bytes. + * + * If @name is not a valid named dest string, returns %NULL. + * + * The returned data must be freed using g_free(). + * + * Returns: (array length=length) (transfer full) (nullable): a new bytestring, + * or %NULL + * + * Since: 0.73 + */ +guint8 *poppler_named_dest_to_bytestring(const char *name, gsize *length) +{ + const char *p; + guint8 *data, *q; + gsize len; + + g_return_val_if_fail(name != nullptr, nullptr); + g_return_val_if_fail(length != nullptr, nullptr); + + len = strlen(name); + q = data = (guint8 *)g_malloc(len); + for (p = name; *p; ++p) { + if (*p == '\\') { + p++; + len--; + if (*p == '0') { + *q++ = '\0'; + } else if (*p == '\\') { + *q++ = '\\'; + } else { + goto invalid; + } + } else { + *q++ = *p; + } + } + + *length = len; + return data; + +invalid: + g_free(data); + *length = 0; + return nullptr; +} + +/** + * poppler_document_find_dest: + * @document: A #PopplerDocument + * @link_name: a named destination + * + * Creates a #PopplerDest for the named destination @link_name in @document. + * + * Note that named destinations are bytestrings, not string. That means that + * unless @link_name was returned by a poppler function (e.g. is + * #PopplerDest.named_dest), it needs to be converted to string + * using poppler_named_dest_from_bytestring() before being passed to this + * function. + * + * The returned value must be freed with poppler_dest_free(). + * + * Return value: (transfer full): a new #PopplerDest destination, or %NULL if + * @link_name is not a destination. + **/ +PopplerDest *poppler_document_find_dest(PopplerDocument *document, const gchar *link_name) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), nullptr); + g_return_val_if_fail(link_name != nullptr, nullptr); + + gsize len; + guint8 *data = poppler_named_dest_to_bytestring(link_name, &len); + if (data == nullptr) { + return nullptr; + } + + GooString g_link_name((const char *)data, (int)len); + g_free(data); + + std::unique_ptr<LinkDest> link_dest = document->doc->findDest(&g_link_name); + if (link_dest == nullptr) { + return nullptr; + } + + PopplerDest *dest = _poppler_dest_new_goto(document, link_dest.get()); + + return dest; +} + +static gint _poppler_dest_compare_keys(gconstpointer a, gconstpointer b, gpointer user_data) +{ + return g_strcmp0(static_cast<const gchar *>(a), static_cast<const gchar *>(b)); +} + +static void _poppler_dest_destroy_value(gpointer value) +{ + poppler_dest_free(static_cast<PopplerDest *>(value)); +} + +/** + * poppler_document_create_dests_tree: + * @document: A #PopplerDocument + * + * Creates a balanced binary tree of all named destinations in @document + * + * The tree key is strings in the form returned by + * poppler_named_dest_to_bytestring() which constains a destination name. + * The tree value is the #PopplerDest which contains a named destination. + * The return value must be freed with g_tree_destroy(). + * + * Returns: (transfer full) (nullable): the #GTree, or %NULL + * Since: 0.78 + **/ +GTree *poppler_document_create_dests_tree(PopplerDocument *document) +{ + GTree *tree; + Catalog *catalog; + PopplerDest *dest; + int i; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), nullptr); + + catalog = document->doc->getCatalog(); + if (catalog == nullptr) { + return nullptr; + } + + tree = g_tree_new_full(_poppler_dest_compare_keys, nullptr, g_free, _poppler_dest_destroy_value); + + // Iterate from name-dict + const int nDests = catalog->numDests(); + for (i = 0; i < nDests; ++i) { + // The names of name-dict cannot contain \0, + // so we can use strlen(). + auto name = catalog->getDestsName(i); + std::unique_ptr<LinkDest> link_dest = catalog->getDestsDest(i); + if (link_dest) { + gchar *key = poppler_named_dest_from_bytestring(reinterpret_cast<const guint8 *>(name), strlen(name)); + dest = _poppler_dest_new_goto(document, link_dest.get()); + g_tree_insert(tree, key, dest); + } + } + + // Iterate form name-tree + const int nDestsNameTree = catalog->numDestNameTree(); + for (i = 0; i < nDestsNameTree; ++i) { + auto name = catalog->getDestNameTreeName(i); + std::unique_ptr<LinkDest> link_dest = catalog->getDestNameTreeDest(i); + if (link_dest) { + gchar *key = poppler_named_dest_from_bytestring(reinterpret_cast<const guint8 *>(name->c_str()), name->getLength()); + dest = _poppler_dest_new_goto(document, link_dest.get()); + g_tree_insert(tree, key, dest); + } + } + + return tree; +} + +char *_poppler_goo_string_to_utf8(const GooString *s) +{ + if (s == nullptr) { + return nullptr; + } + + char *result; + + if (hasUnicodeByteOrderMark(s->toStr())) { + result = g_convert(s->c_str() + 2, s->getLength() - 2, "UTF-8", "UTF-16BE", nullptr, nullptr, nullptr); + } else if (hasUnicodeByteOrderMarkLE(s->toStr())) { + result = g_convert(s->c_str() + 2, s->getLength() - 2, "UTF-8", "UTF-16LE", nullptr, nullptr, nullptr); + } else { + int len; + gunichar *ucs4_temp; + int i; + + len = s->getLength(); + ucs4_temp = g_new(gunichar, len + 1); + for (i = 0; i < len; ++i) { + ucs4_temp[i] = pdfDocEncoding[(unsigned char)s->getChar(i)]; + } + ucs4_temp[i] = 0; + + result = g_ucs4_to_utf8(ucs4_temp, -1, nullptr, nullptr, nullptr); + + g_free(ucs4_temp); + } + + return result; +} + +static GooString *_poppler_goo_string_from_utf8(const gchar *src) +{ + if (src == nullptr) { + return nullptr; + } + + gsize outlen; + + gchar *utf16 = g_convert(src, -1, "UTF-16BE", "UTF-8", nullptr, &outlen, nullptr); + if (utf16 == nullptr) { + return nullptr; + } + + GooString *result = new GooString(utf16, outlen); + g_free(utf16); + + if (!hasUnicodeByteOrderMark(result->toStr())) { + prependUnicodeByteOrderMark(result->toNonConstStr()); + } + + return result; +} + +static PopplerPageLayout convert_page_layout(Catalog::PageLayout pageLayout) +{ + switch (pageLayout) { + case Catalog::pageLayoutSinglePage: + return POPPLER_PAGE_LAYOUT_SINGLE_PAGE; + case Catalog::pageLayoutOneColumn: + return POPPLER_PAGE_LAYOUT_ONE_COLUMN; + case Catalog::pageLayoutTwoColumnLeft: + return POPPLER_PAGE_LAYOUT_TWO_COLUMN_LEFT; + case Catalog::pageLayoutTwoColumnRight: + return POPPLER_PAGE_LAYOUT_TWO_COLUMN_RIGHT; + case Catalog::pageLayoutTwoPageLeft: + return POPPLER_PAGE_LAYOUT_TWO_PAGE_LEFT; + case Catalog::pageLayoutTwoPageRight: + return POPPLER_PAGE_LAYOUT_TWO_PAGE_RIGHT; + case Catalog::pageLayoutNone: + default: + return POPPLER_PAGE_LAYOUT_UNSET; + } +} + +static PopplerPageMode convert_page_mode(Catalog::PageMode pageMode) +{ + switch (pageMode) { + case Catalog::pageModeOutlines: + return POPPLER_PAGE_MODE_USE_OUTLINES; + case Catalog::pageModeThumbs: + return POPPLER_PAGE_MODE_USE_THUMBS; + case Catalog::pageModeFullScreen: + return POPPLER_PAGE_MODE_FULL_SCREEN; + case Catalog::pageModeOC: + return POPPLER_PAGE_MODE_USE_OC; + case Catalog::pageModeAttach: + return POPPLER_PAGE_MODE_USE_ATTACHMENTS; + case Catalog::pageModeNone: + default: + return POPPLER_PAGE_MODE_UNSET; + } +} + +static PopplerPDFSubtype convert_pdf_subtype(PDFSubtype pdfSubtype) +{ + switch (pdfSubtype) { + case subtypePDFA: + return POPPLER_PDF_SUBTYPE_PDF_A; + case subtypePDFE: + return POPPLER_PDF_SUBTYPE_PDF_E; + case subtypePDFUA: + return POPPLER_PDF_SUBTYPE_PDF_UA; + case subtypePDFVT: + return POPPLER_PDF_SUBTYPE_PDF_VT; + case subtypePDFX: + return POPPLER_PDF_SUBTYPE_PDF_X; + case subtypeNone: + return POPPLER_PDF_SUBTYPE_NONE; + case subtypeNull: + default: + return POPPLER_PDF_SUBTYPE_UNSET; + } +} + +static PopplerPDFPart convert_pdf_subtype_part(PDFSubtypePart pdfSubtypePart) +{ + switch (pdfSubtypePart) { + case subtypePart1: + return POPPLER_PDF_SUBTYPE_PART_1; + case subtypePart2: + return POPPLER_PDF_SUBTYPE_PART_2; + case subtypePart3: + return POPPLER_PDF_SUBTYPE_PART_3; + case subtypePart4: + return POPPLER_PDF_SUBTYPE_PART_4; + case subtypePart5: + return POPPLER_PDF_SUBTYPE_PART_5; + case subtypePart6: + return POPPLER_PDF_SUBTYPE_PART_6; + case subtypePart7: + return POPPLER_PDF_SUBTYPE_PART_7; + case subtypePart8: + return POPPLER_PDF_SUBTYPE_PART_8; + case subtypePartNone: + return POPPLER_PDF_SUBTYPE_PART_NONE; + case subtypePartNull: + default: + return POPPLER_PDF_SUBTYPE_PART_UNSET; + } +} + +static PopplerPDFConformance convert_pdf_subtype_conformance(PDFSubtypeConformance pdfSubtypeConf) +{ + switch (pdfSubtypeConf) { + case subtypeConfA: + return POPPLER_PDF_SUBTYPE_CONF_A; + case subtypeConfB: + return POPPLER_PDF_SUBTYPE_CONF_B; + case subtypeConfG: + return POPPLER_PDF_SUBTYPE_CONF_G; + case subtypeConfN: + return POPPLER_PDF_SUBTYPE_CONF_N; + case subtypeConfP: + return POPPLER_PDF_SUBTYPE_CONF_P; + case subtypeConfPG: + return POPPLER_PDF_SUBTYPE_CONF_PG; + case subtypeConfU: + return POPPLER_PDF_SUBTYPE_CONF_U; + case subtypeConfNone: + return POPPLER_PDF_SUBTYPE_CONF_NONE; + case subtypeConfNull: + default: + return POPPLER_PDF_SUBTYPE_CONF_UNSET; + } +} + +/** + * poppler_document_get_pdf_version_string: + * @document: A #PopplerDocument + * + * Returns the PDF version of @document as a string (e.g. PDF-1.6) + * + * Return value: a new allocated string containing the PDF version + * of @document, or %NULL + * + * Since: 0.16 + **/ +gchar *poppler_document_get_pdf_version_string(PopplerDocument *document) +{ + gchar *retval; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + + retval = g_strndup("PDF-", 15); /* allocates 16 chars, pads with \0s */ + g_ascii_formatd(retval + 4, 15 + 1 - 4, "%.2g", document->doc->getPDFMajorVersion() + document->doc->getPDFMinorVersion() / 10.0); + return retval; +} + +/** + * poppler_document_get_pdf_version: + * @document: A #PopplerDocument + * @major_version: (out) (nullable): return location for the PDF major version number + * @minor_version: (out) (nullable): return location for the PDF minor version number + * + * Updates values referenced by @major_version & @minor_version with the + * major and minor PDF versions of @document. + * + * Since: 0.16 + **/ +void poppler_document_get_pdf_version(PopplerDocument *document, guint *major_version, guint *minor_version) +{ + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + + if (major_version) { + *major_version = document->doc->getPDFMajorVersion(); + } + if (minor_version) { + *minor_version = document->doc->getPDFMinorVersion(); + } +} + +/** + * poppler_document_get_title: + * @document: A #PopplerDocument + * + * Returns the document's title + * + * Return value: a new allocated string containing the title + * of @document, or %NULL + * + * Since: 0.16 + **/ +gchar *poppler_document_get_title(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + + const std::unique_ptr<GooString> goo_title = document->doc->getDocInfoTitle(); + return _poppler_goo_string_to_utf8(goo_title.get()); +} + +/** + * poppler_document_set_title: + * @document: A #PopplerDocument + * @title: A new title + * + * Sets the document's title. If @title is %NULL, Title entry + * is removed from the document's Info dictionary. + * + * Since: 0.46 + **/ +void poppler_document_set_title(PopplerDocument *document, const gchar *title) +{ + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + + GooString *goo_title; + if (!title) { + goo_title = nullptr; + } else { + goo_title = _poppler_goo_string_from_utf8(title); + if (!goo_title) { + return; + } + } + document->doc->setDocInfoTitle(goo_title); +} + +/** + * poppler_document_get_author: + * @document: A #PopplerDocument + * + * Returns the author of the document + * + * Return value: a new allocated string containing the author + * of @document, or %NULL + * + * Since: 0.16 + **/ +gchar *poppler_document_get_author(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + + const std::unique_ptr<GooString> goo_author = document->doc->getDocInfoAuthor(); + return _poppler_goo_string_to_utf8(goo_author.get()); +} + +/** + * poppler_document_set_author: + * @document: A #PopplerDocument + * @author: A new author + * + * Sets the document's author. If @author is %NULL, Author + * entry is removed from the document's Info dictionary. + * + * Since: 0.46 + **/ +void poppler_document_set_author(PopplerDocument *document, const gchar *author) +{ + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + + GooString *goo_author; + if (!author) { + goo_author = nullptr; + } else { + goo_author = _poppler_goo_string_from_utf8(author); + if (!goo_author) { + return; + } + } + document->doc->setDocInfoAuthor(goo_author); +} + +/** + * poppler_document_get_subject: + * @document: A #PopplerDocument + * + * Returns the subject of the document + * + * Return value: a new allocated string containing the subject + * of @document, or %NULL + * + * Since: 0.16 + **/ +gchar *poppler_document_get_subject(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + + const std::unique_ptr<GooString> goo_subject = document->doc->getDocInfoSubject(); + return _poppler_goo_string_to_utf8(goo_subject.get()); +} + +/** + * poppler_document_set_subject: + * @document: A #PopplerDocument + * @subject: A new subject + * + * Sets the document's subject. If @subject is %NULL, Subject + * entry is removed from the document's Info dictionary. + * + * Since: 0.46 + **/ +void poppler_document_set_subject(PopplerDocument *document, const gchar *subject) +{ + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + + GooString *goo_subject; + if (!subject) { + goo_subject = nullptr; + } else { + goo_subject = _poppler_goo_string_from_utf8(subject); + if (!goo_subject) { + return; + } + } + document->doc->setDocInfoSubject(goo_subject); +} + +/** + * poppler_document_get_keywords: + * @document: A #PopplerDocument + * + * Returns the keywords associated to the document + * + * Return value: a new allocated string containing keywords associated + * to @document, or %NULL + * + * Since: 0.16 + **/ +gchar *poppler_document_get_keywords(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + + const std::unique_ptr<GooString> goo_keywords = document->doc->getDocInfoKeywords(); + return _poppler_goo_string_to_utf8(goo_keywords.get()); +} + +/** + * poppler_document_set_keywords: + * @document: A #PopplerDocument + * @keywords: New keywords + * + * Sets the document's keywords. If @keywords is %NULL, + * Keywords entry is removed from the document's Info dictionary. + * + * Since: 0.46 + **/ +void poppler_document_set_keywords(PopplerDocument *document, const gchar *keywords) +{ + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + + GooString *goo_keywords; + if (!keywords) { + goo_keywords = nullptr; + } else { + goo_keywords = _poppler_goo_string_from_utf8(keywords); + if (!goo_keywords) { + return; + } + } + document->doc->setDocInfoKeywords(goo_keywords); +} + +/** + * poppler_document_get_creator: + * @document: A #PopplerDocument + * + * Returns the creator of the document. If the document was converted + * from another format, the creator is the name of the product + * that created the original document from which it was converted. + * + * Return value: a new allocated string containing the creator + * of @document, or %NULL + * + * Since: 0.16 + **/ +gchar *poppler_document_get_creator(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + + const std::unique_ptr<GooString> goo_creator = document->doc->getDocInfoCreator(); + return _poppler_goo_string_to_utf8(goo_creator.get()); +} + +/** + * poppler_document_set_creator: + * @document: A #PopplerDocument + * @creator: A new creator + * + * Sets the document's creator. If @creator is %NULL, Creator + * entry is removed from the document's Info dictionary. + * + * Since: 0.46 + **/ +void poppler_document_set_creator(PopplerDocument *document, const gchar *creator) +{ + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + + GooString *goo_creator; + if (!creator) { + goo_creator = nullptr; + } else { + goo_creator = _poppler_goo_string_from_utf8(creator); + if (!goo_creator) { + return; + } + } + document->doc->setDocInfoCreator(goo_creator); +} + +/** + * poppler_document_get_producer: + * @document: A #PopplerDocument + * + * Returns the producer of the document. If the document was converted + * from another format, the producer is the name of the product + * that converted it to PDF + * + * Return value: a new allocated string containing the producer + * of @document, or %NULL + * + * Since: 0.16 + **/ +gchar *poppler_document_get_producer(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + + const std::unique_ptr<GooString> goo_producer = document->doc->getDocInfoProducer(); + return _poppler_goo_string_to_utf8(goo_producer.get()); +} + +/** + * poppler_document_set_producer: + * @document: A #PopplerDocument + * @producer: A new producer + * + * Sets the document's producer. If @producer is %NULL, + * Producer entry is removed from the document's Info dictionary. + * + * Since: 0.46 + **/ +void poppler_document_set_producer(PopplerDocument *document, const gchar *producer) +{ + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + + GooString *goo_producer; + if (!producer) { + goo_producer = nullptr; + } else { + goo_producer = _poppler_goo_string_from_utf8(producer); + if (!goo_producer) { + return; + } + } + document->doc->setDocInfoProducer(goo_producer); +} + +/** + * poppler_document_get_creation_date: + * @document: A #PopplerDocument + * + * Returns the date the document was created as seconds since the Epoch + * + * Return value: the date the document was created, or -1 + * + * Since: 0.16 + **/ +time_t poppler_document_get_creation_date(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), (time_t)-1); + + const std::unique_ptr<GooString> str = document->doc->getDocInfoCreatDate(); + if (!str) { + return (time_t)-1; + } + + time_t date; + gboolean success = _poppler_convert_pdf_date_to_gtime(str.get(), &date); + + return (success) ? date : (time_t)-1; +} + +/** + * poppler_document_set_creation_date: + * @document: A #PopplerDocument + * @creation_date: A new creation date + * + * Sets the document's creation date. If @creation_date is -1, CreationDate + * entry is removed from the document's Info dictionary. + * + * Since: 0.46 + **/ +void poppler_document_set_creation_date(PopplerDocument *document, time_t creation_date) +{ + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + + GooString *str = creation_date == (time_t)-1 ? nullptr : timeToDateString(&creation_date); + document->doc->setDocInfoCreatDate(str); +} + +/** + * poppler_document_get_creation_date_time: + * @document: A #PopplerDocument + * + * Returns the date the document was created as a #GDateTime + * + * Returns: (nullable): the date the document was created, or %NULL + * + * Since: 20.09.0 + **/ +GDateTime *poppler_document_get_creation_date_time(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), nullptr); + + std::unique_ptr<GooString> str { document->doc->getDocInfoCreatDate() }; + + if (!str) { + return nullptr; + } + + return _poppler_convert_pdf_date_to_date_time(str.get()); +} + +/** + * poppler_document_set_creation_date_time: + * @document: A #PopplerDocument + * @creation_datetime: (nullable): A new creation #GDateTime + * + * Sets the document's creation date. If @creation_datetime is %NULL, + * CreationDate entry is removed from the document's Info dictionary. + * + * Since: 20.09.0 + **/ +void poppler_document_set_creation_date_time(PopplerDocument *document, GDateTime *creation_datetime) +{ + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + + GooString *str = nullptr; + + if (creation_datetime) { + str = _poppler_convert_date_time_to_pdf_date(creation_datetime); + } + + document->doc->setDocInfoCreatDate(str); +} + +/** + * poppler_document_get_modification_date: + * @document: A #PopplerDocument + * + * Returns the date the document was most recently modified as seconds since the Epoch + * + * Return value: the date the document was most recently modified, or -1 + * + * Since: 0.16 + **/ +time_t poppler_document_get_modification_date(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), (time_t)-1); + + const std::unique_ptr<GooString> str = document->doc->getDocInfoModDate(); + if (!str) { + return (time_t)-1; + } + + time_t date; + gboolean success = _poppler_convert_pdf_date_to_gtime(str.get(), &date); + + return (success) ? date : (time_t)-1; +} + +/** + * poppler_document_set_modification_date: + * @document: A #PopplerDocument + * @modification_date: A new modification date + * + * Sets the document's modification date. If @modification_date is -1, ModDate + * entry is removed from the document's Info dictionary. + * + * Since: 0.46 + **/ +void poppler_document_set_modification_date(PopplerDocument *document, time_t modification_date) +{ + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + + GooString *str = modification_date == (time_t)-1 ? nullptr : timeToDateString(&modification_date); + document->doc->setDocInfoModDate(str); +} + +/** + * poppler_document_get_modification_date_time: + * @document: A #PopplerDocument + * + * Returns the date the document was most recently modified as a #GDateTime + * + * Returns: (nullable): the date the document was modified, or %NULL + * + * Since: 20.09.0 + **/ +GDateTime *poppler_document_get_modification_date_time(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), nullptr); + + std::unique_ptr<GooString> str { document->doc->getDocInfoModDate() }; + + if (!str) { + return nullptr; + } + + return _poppler_convert_pdf_date_to_date_time(str.get()); +} + +/** + * poppler_document_set_modification_date_time: + * @document: A #PopplerDocument + * @modification_datetime: (nullable): A new modification #GDateTime + * + * Sets the document's modification date. If @modification_datetime is %NULL, + * ModDate entry is removed from the document's Info dictionary. + * + * Since: 20.09.0 + **/ +void poppler_document_set_modification_date_time(PopplerDocument *document, GDateTime *modification_datetime) +{ + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + + GooString *str = nullptr; + + if (modification_datetime) { + str = _poppler_convert_date_time_to_pdf_date(modification_datetime); + } + + document->doc->setDocInfoModDate(str); +} + +/** + * poppler_document_is_linearized: + * @document: A #PopplerDocument + * + * Returns whether @document is linearized or not. Linearization of PDF + * enables efficient incremental access of the PDF file in a network environment. + * + * Return value: %TRUE if @document is linearized, %FALSE otherwise + * + * Since: 0.16 + **/ +gboolean poppler_document_is_linearized(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), FALSE); + + return document->doc->isLinearized(); +} + +/** + * poppler_document_get_n_signatures: + * @document: A #PopplerDocument + * + * Returns how many digital signatures @document contains. + * PDF digital signatures ensure that the content hash not been altered since last edit and + * that it was produced by someone the user can trust + * + * Return value: The number of signatures found in the document + * + * Since: 21.12.0 + **/ +gint poppler_document_get_n_signatures(const PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), 0); + + return document->doc->getSignatureFields().size(); +} + +/** + * poppler_document_get_signature_fields: + * @document: A #PopplerDocument + * + * Returns a #GList containing all signature #PopplerFormField<!-- -->s in the document. + * + * Return value: (element-type PopplerFormField) (transfer full): a list of all signature form fields. + * + * Since: 22.02.0 + **/ +GList *poppler_document_get_signature_fields(PopplerDocument *document) +{ + std::vector<FormFieldSignature *> signature_fields; + FormWidget *widget; + GList *result = nullptr; + gsize i; + + signature_fields = document->doc->getSignatureFields(); + + for (i = 0; i < signature_fields.size(); i++) { + widget = signature_fields[i]->getCreateWidget(); + + if (widget != nullptr) { + result = g_list_prepend(result, _poppler_form_field_new(document, widget)); + } + } + + return g_list_reverse(result); +} + +/** + * poppler_document_get_page_layout: + * @document: A #PopplerDocument + * + * Returns the page layout that should be used when the document is opened + * + * Return value: a #PopplerPageLayout that should be used when the document is opened + * + * Since: 0.16 + **/ +PopplerPageLayout poppler_document_get_page_layout(PopplerDocument *document) +{ + Catalog *catalog; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), POPPLER_PAGE_LAYOUT_UNSET); + + catalog = document->doc->getCatalog(); + if (catalog && catalog->isOk()) { + return convert_page_layout(catalog->getPageLayout()); + } + + return POPPLER_PAGE_LAYOUT_UNSET; +} + +/** + * poppler_document_get_page_mode: + * @document: A #PopplerDocument + * + * Returns a #PopplerPageMode representing how the document should + * be initially displayed when opened. + * + * Return value: a #PopplerPageMode that should be used when document is opened + * + * Since: 0.16 + **/ +PopplerPageMode poppler_document_get_page_mode(PopplerDocument *document) +{ + Catalog *catalog; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), POPPLER_PAGE_MODE_UNSET); + + catalog = document->doc->getCatalog(); + if (catalog && catalog->isOk()) { + return convert_page_mode(catalog->getPageMode()); + } + + return POPPLER_PAGE_MODE_UNSET; +} + +/** + * poppler_document_get_print_scaling: + * @document: A #PopplerDocument + * + * Returns the print scaling value suggested by author of the document. + * + * Return value: a #PopplerPrintScaling that should be used when document is printed + * + * Since: 0.73 + **/ +PopplerPrintScaling poppler_document_get_print_scaling(PopplerDocument *document) +{ + Catalog *catalog; + ViewerPreferences *preferences; + PopplerPrintScaling print_scaling = POPPLER_PRINT_SCALING_APP_DEFAULT; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), POPPLER_PRINT_SCALING_APP_DEFAULT); + + catalog = document->doc->getCatalog(); + if (catalog && catalog->isOk()) { + preferences = catalog->getViewerPreferences(); + if (preferences) { + switch (preferences->getPrintScaling()) { + default: + case ViewerPreferences::PrintScaling::printScalingAppDefault: + print_scaling = POPPLER_PRINT_SCALING_APP_DEFAULT; + break; + case ViewerPreferences::PrintScaling::printScalingNone: + print_scaling = POPPLER_PRINT_SCALING_NONE; + break; + } + } + } + + return print_scaling; +} + +/** + * poppler_document_get_print_duplex: + * @document: A #PopplerDocument + * + * Returns the duplex mode value suggested for printing by author of the document. + * Value POPPLER_PRINT_DUPLEX_NONE means that the document does not specify this + * preference. + * + * Returns: a #PopplerPrintDuplex that should be used when document is printed + * + * Since: 0.80 + **/ +PopplerPrintDuplex poppler_document_get_print_duplex(PopplerDocument *document) +{ + Catalog *catalog; + ViewerPreferences *preferences; + PopplerPrintDuplex duplex = POPPLER_PRINT_DUPLEX_NONE; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), POPPLER_PRINT_DUPLEX_NONE); + + catalog = document->doc->getCatalog(); + if (catalog && catalog->isOk()) { + preferences = catalog->getViewerPreferences(); + if (preferences) { + switch (preferences->getDuplex()) { + default: + case ViewerPreferences::Duplex::duplexNone: + duplex = POPPLER_PRINT_DUPLEX_NONE; + break; + case ViewerPreferences::Duplex::duplexSimplex: + duplex = POPPLER_PRINT_DUPLEX_SIMPLEX; + break; + case ViewerPreferences::Duplex::duplexDuplexFlipShortEdge: + duplex = POPPLER_PRINT_DUPLEX_DUPLEX_FLIP_SHORT_EDGE; + break; + case ViewerPreferences::Duplex::duplexDuplexFlipLongEdge: + duplex = POPPLER_PRINT_DUPLEX_DUPLEX_FLIP_LONG_EDGE; + break; + } + } + } + + return duplex; +} + +/** + * poppler_document_get_print_n_copies: + * @document: A #PopplerDocument + * + * Returns the suggested number of copies to be printed. + * This preference should be applied only if returned value + * is greater than 1 since value 1 usually means that + * the document does not specify it. + * + * Returns: Number of copies + * + * Since: 0.80 + **/ +gint poppler_document_get_print_n_copies(PopplerDocument *document) +{ + Catalog *catalog; + ViewerPreferences *preferences; + gint retval = 1; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), 1); + + catalog = document->doc->getCatalog(); + if (catalog && catalog->isOk()) { + preferences = catalog->getViewerPreferences(); + if (preferences) { + retval = preferences->getNumCopies(); + } + } + + return retval; +} + +/** + * poppler_document_get_print_page_ranges: + * @document: A #PopplerDocument + * @n_ranges: (out): return location for number of ranges + * + * Returns the suggested page ranges to print in the form of array + * of #PopplerPageRange<!-- -->s and number of ranges. + * %NULL pointer means that the document does not specify page ranges + * for printing. + * + * Returns: (array length=n_ranges) (transfer full): an array + * of #PopplerPageRange<!-- -->s or %NULL. Free the array when + * it is no longer needed. + * + * Since: 0.80 + **/ +PopplerPageRange *poppler_document_get_print_page_ranges(PopplerDocument *document, int *n_ranges) +{ + Catalog *catalog; + ViewerPreferences *preferences; + std::vector<std::pair<int, int>> ranges; + PopplerPageRange *result = nullptr; + + g_return_val_if_fail(n_ranges != nullptr, nullptr); + *n_ranges = 0; + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), nullptr); + + catalog = document->doc->getCatalog(); + if (catalog && catalog->isOk()) { + preferences = catalog->getViewerPreferences(); + if (preferences) { + ranges = preferences->getPrintPageRange(); + + *n_ranges = ranges.size(); + result = g_new(PopplerPageRange, ranges.size()); + for (size_t i = 0; i < ranges.size(); ++i) { + result[i].start_page = ranges[i].first; + result[i].end_page = ranges[i].second; + } + } + } + + return result; +} + +/** + * poppler_document_get_permissions: + * @document: A #PopplerDocument + * + * Returns the flags specifying which operations are permitted when the document is opened. + * + * Return value: a set of flags from #PopplerPermissions enumeration + * + * Since: 0.16 + **/ +PopplerPermissions poppler_document_get_permissions(PopplerDocument *document) +{ + guint flag = 0; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), POPPLER_PERMISSIONS_FULL); + + if (document->doc->okToPrint()) { + flag |= POPPLER_PERMISSIONS_OK_TO_PRINT; + } + if (document->doc->okToChange()) { + flag |= POPPLER_PERMISSIONS_OK_TO_MODIFY; + } + if (document->doc->okToCopy()) { + flag |= POPPLER_PERMISSIONS_OK_TO_COPY; + } + if (document->doc->okToAddNotes()) { + flag |= POPPLER_PERMISSIONS_OK_TO_ADD_NOTES; + } + if (document->doc->okToFillForm()) { + flag |= POPPLER_PERMISSIONS_OK_TO_FILL_FORM; + } + if (document->doc->okToAccessibility()) { + flag |= POPPLER_PERMISSIONS_OK_TO_EXTRACT_CONTENTS; + } + if (document->doc->okToAssemble()) { + flag |= POPPLER_PERMISSIONS_OK_TO_ASSEMBLE; + } + if (document->doc->okToPrintHighRes()) { + flag |= POPPLER_PERMISSIONS_OK_TO_PRINT_HIGH_RESOLUTION; + } + + return (PopplerPermissions)flag; +} + +/** + * poppler_document_get_pdf_subtype_string: + * @document: A #PopplerDocument + * + * Returns the PDF subtype version of @document as a string. + * + * Returns: (transfer full) (nullable): a newly allocated string containing + * the PDF subtype version of @document, or %NULL + * + * Since: 0.70 + **/ +gchar *poppler_document_get_pdf_subtype_string(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + + std::unique_ptr<GooString> infostring; + + switch (document->doc->getPDFSubtype()) { + case subtypePDFA: + infostring = document->doc->getDocInfoStringEntry("GTS_PDFA1Version"); + break; + case subtypePDFE: + infostring = document->doc->getDocInfoStringEntry("GTS_PDFEVersion"); + break; + case subtypePDFUA: + infostring = document->doc->getDocInfoStringEntry("GTS_PDFUAVersion"); + break; + case subtypePDFVT: + infostring = document->doc->getDocInfoStringEntry("GTS_PDFVTVersion"); + break; + case subtypePDFX: + infostring = document->doc->getDocInfoStringEntry("GTS_PDFXVersion"); + break; + case subtypeNone: + case subtypeNull: + default: { + /* nothing */ + } + } + + return _poppler_goo_string_to_utf8(infostring.get()); +} + +/** + * poppler_document_get_pdf_subtype: + * @document: A #PopplerDocument + * + * Returns the subtype of @document as a #PopplerPDFSubtype. + * + * Returns: the document's subtype + * + * Since: 0.70 + **/ +PopplerPDFSubtype poppler_document_get_pdf_subtype(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), POPPLER_PDF_SUBTYPE_NONE); + + return convert_pdf_subtype(document->doc->getPDFSubtype()); +} + +/** + * poppler_document_get_pdf_part: + * @document: A #PopplerDocument + * + * Returns the part of the conforming standard that the @document adheres to + * as a #PopplerPDFSubtype. + * + * Returns: the document's subtype part + * + * Since: 0.70 + **/ +PopplerPDFPart poppler_document_get_pdf_part(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), POPPLER_PDF_SUBTYPE_PART_NONE); + + return convert_pdf_subtype_part(document->doc->getPDFSubtypePart()); +} + +/** + * poppler_document_get_pdf_conformance: + * @document: A #PopplerDocument + * + * Returns the conformance level of the @document as #PopplerPDFConformance. + * + * Returns: the document's subtype conformance level + * + * Since: 0.70 + **/ +PopplerPDFConformance poppler_document_get_pdf_conformance(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), POPPLER_PDF_SUBTYPE_CONF_NONE); + + return convert_pdf_subtype_conformance(document->doc->getPDFSubtypeConformance()); +} + +/** + * poppler_document_get_metadata: + * @document: A #PopplerDocument + * + * Returns the XML metadata string of the document + * + * Return value: a new allocated string containing the XML + * metadata, or %NULL + * + * Since: 0.16 + **/ +gchar *poppler_document_get_metadata(PopplerDocument *document) +{ + Catalog *catalog; + gchar *retval = nullptr; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + + catalog = document->doc->getCatalog(); + if (catalog && catalog->isOk()) { + std::unique_ptr<GooString> s = catalog->readMetadata(); + + if (s) { + retval = g_strdup(s->c_str()); + } + } + + return retval; +} + +/** + * poppler_document_reset_form: + * @document: A #PopplerDocument + * @fields: (element-type utf8) (nullable): list of fields to reset + * @exclude_fields: whether to reset all fields except those in @fields + * + * Resets the form fields specified by fields if exclude_fields is FALSE. + * Resets all others if exclude_fields is TRUE. + * All form fields are reset regardless of the exclude_fields flag + * if fields is empty. + * + * Since: 0.90 + **/ +void poppler_document_reset_form(PopplerDocument *document, GList *fields, gboolean exclude_fields) +{ + std::vector<std::string> list; + Catalog *catalog; + GList *iter; + Form *form; + + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + + catalog = document->doc->getCatalog(); + if (catalog && catalog->isOk()) { + form = catalog->getForm(); + + if (form) { + for (iter = fields; iter != nullptr; iter = iter->next) { + list.emplace_back((char *)iter->data); + } + + form->reset(list, exclude_fields); + } + } +} + +/** + * poppler_document_has_javascript: + * @document: A #PopplerDocument + * + * Returns whether @document has any javascript in it. + * + * Since: 0.90 + **/ +gboolean poppler_document_has_javascript(PopplerDocument *document) +{ + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), FALSE); + + return document->doc->hasJavascript(); +} + +static void poppler_document_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) +{ + PopplerDocument *document = POPPLER_DOCUMENT(object); + guint version; + + switch (prop_id) { + case PROP_TITLE: + g_value_take_string(value, poppler_document_get_title(document)); + break; + case PROP_FORMAT: + g_value_take_string(value, poppler_document_get_pdf_version_string(document)); + break; + case PROP_FORMAT_MAJOR: + poppler_document_get_pdf_version(document, &version, nullptr); + g_value_set_uint(value, version); + break; + case PROP_FORMAT_MINOR: + poppler_document_get_pdf_version(document, nullptr, &version); + g_value_set_uint(value, version); + break; + case PROP_AUTHOR: + g_value_take_string(value, poppler_document_get_author(document)); + break; + case PROP_SUBJECT: + g_value_take_string(value, poppler_document_get_subject(document)); + break; + case PROP_KEYWORDS: + g_value_take_string(value, poppler_document_get_keywords(document)); + break; + case PROP_CREATOR: + g_value_take_string(value, poppler_document_get_creator(document)); + break; + case PROP_PRODUCER: + g_value_take_string(value, poppler_document_get_producer(document)); + break; + case PROP_CREATION_DATE: + g_value_set_int(value, poppler_document_get_creation_date(document)); + break; + case PROP_CREATION_DATETIME: + g_value_take_boxed(value, poppler_document_get_creation_date_time(document)); + break; + case PROP_MOD_DATE: + g_value_set_int(value, poppler_document_get_modification_date(document)); + break; + case PROP_MOD_DATETIME: + g_value_take_boxed(value, poppler_document_get_modification_date_time(document)); + break; + case PROP_LINEARIZED: + g_value_set_boolean(value, poppler_document_is_linearized(document)); + break; + case PROP_PAGE_LAYOUT: + g_value_set_enum(value, poppler_document_get_page_layout(document)); + break; + case PROP_PAGE_MODE: + g_value_set_enum(value, poppler_document_get_page_mode(document)); + break; + case PROP_VIEWER_PREFERENCES: + /* FIXME: write... */ + g_value_set_flags(value, POPPLER_VIEWER_PREFERENCES_UNSET); + break; + case PROP_PRINT_SCALING: + g_value_set_enum(value, poppler_document_get_print_scaling(document)); + break; + case PROP_PRINT_DUPLEX: + g_value_set_enum(value, poppler_document_get_print_duplex(document)); + break; + case PROP_PRINT_N_COPIES: + g_value_set_int(value, poppler_document_get_print_n_copies(document)); + break; + case PROP_PERMISSIONS: + g_value_set_flags(value, poppler_document_get_permissions(document)); + break; + case PROP_SUBTYPE: + g_value_set_enum(value, poppler_document_get_pdf_subtype(document)); + break; + case PROP_SUBTYPE_STRING: + g_value_take_string(value, poppler_document_get_pdf_subtype_string(document)); + break; + case PROP_SUBTYPE_PART: + g_value_set_enum(value, poppler_document_get_pdf_part(document)); + break; + case PROP_SUBTYPE_CONF: + g_value_set_enum(value, poppler_document_get_pdf_conformance(document)); + break; + case PROP_METADATA: + g_value_take_string(value, poppler_document_get_metadata(document)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void poppler_document_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) +{ + PopplerDocument *document = POPPLER_DOCUMENT(object); + + switch (prop_id) { + case PROP_TITLE: + poppler_document_set_title(document, g_value_get_string(value)); + break; + case PROP_AUTHOR: + poppler_document_set_author(document, g_value_get_string(value)); + break; + case PROP_SUBJECT: + poppler_document_set_subject(document, g_value_get_string(value)); + break; + case PROP_KEYWORDS: + poppler_document_set_keywords(document, g_value_get_string(value)); + break; + case PROP_CREATOR: + poppler_document_set_creator(document, g_value_get_string(value)); + break; + case PROP_PRODUCER: + poppler_document_set_producer(document, g_value_get_string(value)); + break; + case PROP_CREATION_DATE: + poppler_document_set_creation_date(document, g_value_get_int(value)); + break; + case PROP_CREATION_DATETIME: + poppler_document_set_creation_date_time(document, (GDateTime *)g_value_get_boxed(value)); + break; + case PROP_MOD_DATE: + poppler_document_set_modification_date(document, g_value_get_int(value)); + break; + case PROP_MOD_DATETIME: + poppler_document_set_modification_date_time(document, (GDateTime *)g_value_get_boxed(value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void poppler_document_class_init(PopplerDocumentClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->finalize = poppler_document_finalize; + gobject_class->get_property = poppler_document_get_property; + gobject_class->set_property = poppler_document_set_property; + + /** + * PopplerDocument:title: + * + * The document's title or %NULL + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_TITLE, g_param_spec_string("title", "Document Title", "The title of the document", nullptr, G_PARAM_READWRITE)); + + /** + * PopplerDocument:format: + * + * The PDF version as string. See also poppler_document_get_pdf_version_string() + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_FORMAT, g_param_spec_string("format", "PDF Format", "The PDF version of the document", nullptr, G_PARAM_READABLE)); + + /** + * PopplerDocument:format-major: + * + * The PDF major version number. See also poppler_document_get_pdf_version() + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_FORMAT_MAJOR, g_param_spec_uint("format-major", "PDF Format Major", "The PDF major version number of the document", 0, G_MAXUINT, 1, G_PARAM_READABLE)); + + /** + * PopplerDocument:format-minor: + * + * The PDF minor version number. See also poppler_document_get_pdf_version() + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_FORMAT_MINOR, g_param_spec_uint("format-minor", "PDF Format Minor", "The PDF minor version number of the document", 0, G_MAXUINT, 0, G_PARAM_READABLE)); + + /** + * PopplerDocument:author: + * + * The author of the document + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_AUTHOR, g_param_spec_string("author", "Author", "The author of the document", nullptr, G_PARAM_READWRITE)); + + /** + * PopplerDocument:subject: + * + * The subject of the document + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_SUBJECT, g_param_spec_string("subject", "Subject", "Subjects the document touches", nullptr, G_PARAM_READWRITE)); + + /** + * PopplerDocument:keywords: + * + * The keywords associated to the document + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_KEYWORDS, g_param_spec_string("keywords", "Keywords", "Keywords", nullptr, G_PARAM_READWRITE)); + + /** + * PopplerDocument:creator: + * + * The creator of the document. See also poppler_document_get_creator() + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_CREATOR, g_param_spec_string("creator", "Creator", "The software that created the document", nullptr, G_PARAM_READWRITE)); + + /** + * PopplerDocument:producer: + * + * The producer of the document. See also poppler_document_get_producer() + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_PRODUCER, g_param_spec_string("producer", "Producer", "The software that converted the document", nullptr, G_PARAM_READWRITE)); + + /** + * PopplerDocument:creation-date: + * + * The date the document was created as seconds since the Epoch, or -1 + * + * Deprecated: 20.09.0: This will overflow in 2038. Use creation-datetime + * instead. + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_CREATION_DATE, + g_param_spec_int("creation-date", "Creation Date", "The date and time the document was created", -1, G_MAXINT, -1, (GParamFlags)(G_PARAM_READWRITE | G_PARAM_DEPRECATED))); + + /** + * PopplerDocument:creation-datetime: + * The #GDateTime the document was created. + * + * Since: 20.09.0 + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_CREATION_DATETIME, g_param_spec_boxed("creation-datetime", "Creation DateTime", "The date and time the document was created", G_TYPE_DATE_TIME, G_PARAM_READWRITE)); + + /** + * PopplerDocument:mod-date: + * + * The date the document was most recently modified as seconds since the Epoch, or -1 + * + * Deprecated: 20.09.0: This will overflow in 2038. Use mod-datetime instead. + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_MOD_DATE, + g_param_spec_int("mod-date", "Modification Date", "The date and time the document was modified", -1, G_MAXINT, -1, (GParamFlags)(G_PARAM_READWRITE | G_PARAM_DEPRECATED))); + + /** + * PopplerDocument:mod-datetime: + * + * The #GDateTime the document was most recently modified. + * + * Since: 20.09.0 + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_MOD_DATETIME, g_param_spec_boxed("mod-datetime", "Modification DateTime", "The date and time the document was modified", G_TYPE_DATE_TIME, G_PARAM_READWRITE)); + + /** + * PopplerDocument:linearized: + * + * Whether document is linearized. See also poppler_document_is_linearized() + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_LINEARIZED, g_param_spec_boolean("linearized", "Fast Web View Enabled", "Is the document optimized for web viewing?", FALSE, G_PARAM_READABLE)); + + /** + * PopplerDocument:page-layout: + * + * The page layout that should be used when the document is opened + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_PAGE_LAYOUT, g_param_spec_enum("page-layout", "Page Layout", "Initial Page Layout", POPPLER_TYPE_PAGE_LAYOUT, POPPLER_PAGE_LAYOUT_UNSET, G_PARAM_READABLE)); + + /** + * PopplerDocument:page-mode: + * + * The mode that should be used when the document is opened + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_PAGE_MODE, g_param_spec_enum("page-mode", "Page Mode", "Page Mode", POPPLER_TYPE_PAGE_MODE, POPPLER_PAGE_MODE_UNSET, G_PARAM_READABLE)); + + /** + * PopplerDocument:viewer-preferences: + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_VIEWER_PREFERENCES, + g_param_spec_flags("viewer-preferences", "Viewer Preferences", "Viewer Preferences", POPPLER_TYPE_VIEWER_PREFERENCES, POPPLER_VIEWER_PREFERENCES_UNSET, G_PARAM_READABLE)); + + /** + * PopplerDocument:print-scaling: + * + * Since: 0.73 + */ + g_object_class_install_property( + G_OBJECT_CLASS(klass), PROP_PRINT_SCALING, + g_param_spec_enum("print-scaling", "Print Scaling", "Print Scaling Viewer Preference", POPPLER_TYPE_PRINT_SCALING, POPPLER_PRINT_SCALING_APP_DEFAULT, (GParamFlags)(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS))); + + /** + * PopplerDocument:print-duplex: + * + * Since: 0.80 + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_PRINT_DUPLEX, + g_param_spec_enum("print-duplex", "Print Duplex", "Duplex Viewer Preference", POPPLER_TYPE_PRINT_DUPLEX, POPPLER_PRINT_DUPLEX_NONE, (GParamFlags)(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS))); + + /** + * PopplerDocument:print-n-copies: + * + * Suggested number of copies to be printed for this document + * + * Since: 0.80 + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_PRINT_N_COPIES, + g_param_spec_int("print-n-copies", "Number of Copies to Print", "Number of Copies Viewer Preference", 1, G_MAXINT, 1, (GParamFlags)(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS))); + + /** + * PopplerDocument:permissions: + * + * Flags specifying which operations are permitted when the document is opened + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_PERMISSIONS, g_param_spec_flags("permissions", "Permissions", "Permissions", POPPLER_TYPE_PERMISSIONS, POPPLER_PERMISSIONS_FULL, G_PARAM_READABLE)); + + /** + * PopplerDocument:subtype: + * + * Document PDF subtype type + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_SUBTYPE, g_param_spec_enum("subtype", "PDF Format Subtype Type", "The PDF subtype of the document", POPPLER_TYPE_PDF_SUBTYPE, POPPLER_PDF_SUBTYPE_UNSET, G_PARAM_READABLE)); + + /** + * PopplerDocument:subtype-string: + * + * Document PDF subtype. See also poppler_document_get_pdf_subtype_string() + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_SUBTYPE_STRING, g_param_spec_string("subtype-string", "PDF Format Subtype", "The PDF subtype of the document", nullptr, G_PARAM_READABLE)); + + /** + * PopplerDocument:subtype-part: + * + * Document PDF subtype part + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_SUBTYPE_PART, + g_param_spec_enum("subtype-part", "PDF Format Subtype Part", "The part of PDF conformance", POPPLER_TYPE_PDF_PART, POPPLER_PDF_SUBTYPE_PART_UNSET, G_PARAM_READABLE)); + + /** + * PopplerDocument:subtype-conformance: + * + * Document PDF subtype conformance + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_SUBTYPE_CONF, + g_param_spec_enum("subtype-conformance", "PDF Format Subtype Conformance", "The conformance level of PDF subtype", POPPLER_TYPE_PDF_CONFORMANCE, POPPLER_PDF_SUBTYPE_CONF_UNSET, G_PARAM_READABLE)); + + /** + * PopplerDocument:metadata: + * + * Document metadata in XML format, or %NULL + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_METADATA, g_param_spec_string("metadata", "XML Metadata", "Embedded XML metadata", nullptr, G_PARAM_READABLE)); +} + +static void poppler_document_init(PopplerDocument *document) { } + +/* PopplerIndexIter: For determining the index of a tree */ +struct _PopplerIndexIter +{ + PopplerDocument *document; + const std::vector<OutlineItem *> *items; + int index; +}; + +G_DEFINE_BOXED_TYPE(PopplerIndexIter, poppler_index_iter, poppler_index_iter_copy, poppler_index_iter_free) + +/** + * poppler_index_iter_copy: + * @iter: a #PopplerIndexIter + * + * Creates a new #PopplerIndexIter as a copy of @iter. This must be freed with + * poppler_index_iter_free(). + * + * Return value: a new #PopplerIndexIter + **/ +PopplerIndexIter *poppler_index_iter_copy(PopplerIndexIter *iter) +{ + PopplerIndexIter *new_iter; + + g_return_val_if_fail(iter != nullptr, NULL); + + new_iter = g_slice_dup(PopplerIndexIter, iter); + new_iter->document = (PopplerDocument *)g_object_ref(new_iter->document); + + return new_iter; +} + +/** + * poppler_index_iter_new: + * @document: a #PopplerDocument + * + * Returns the root #PopplerIndexIter for @document, or %NULL. This must be + * freed with poppler_index_iter_free(). + * + * Certain documents have an index associated with them. This index can be used + * to help the user navigate the document, and is similar to a table of + * contents. Each node in the index will contain a #PopplerAction that can be + * displayed to the user — typically a #POPPLER_ACTION_GOTO_DEST or a + * #POPPLER_ACTION_URI<!-- -->. + * + * Here is a simple example of some code that walks the full index: + * + * <informalexample><programlisting> + * static void + * walk_index (PopplerIndexIter *iter) + * { + * do + * { + * /<!-- -->* Get the action and do something with it *<!-- -->/ + * PopplerIndexIter *child = poppler_index_iter_get_child (iter); + * if (child) + * walk_index (child); + * poppler_index_iter_free (child); + * } + * while (poppler_index_iter_next (iter)); + * } + * ... + * { + * iter = poppler_index_iter_new (document); + * walk_index (iter); + * poppler_index_iter_free (iter); + * } + *</programlisting></informalexample> + * + * Return value: a new #PopplerIndexIter + **/ +PopplerIndexIter *poppler_index_iter_new(PopplerDocument *document) +{ + PopplerIndexIter *iter; + Outline *outline; + const std::vector<OutlineItem *> *items; + + outline = document->doc->getOutline(); + if (outline == nullptr) { + return nullptr; + } + + items = outline->getItems(); + if (items == nullptr) { + return nullptr; + } + + iter = g_slice_new(PopplerIndexIter); + iter->document = (PopplerDocument *)g_object_ref(document); + iter->items = items; + iter->index = 0; + + return iter; +} + +/** + * poppler_index_iter_get_child: + * @parent: a #PopplerIndexIter + * + * Returns a newly created child of @parent, or %NULL if the iter has no child. + * See poppler_index_iter_new() for more information on this function. + * + * Return value: a new #PopplerIndexIter + **/ +PopplerIndexIter *poppler_index_iter_get_child(PopplerIndexIter *parent) +{ + PopplerIndexIter *child; + OutlineItem *item; + + g_return_val_if_fail(parent != nullptr, NULL); + + item = (*parent->items)[parent->index]; + item->open(); + if (!(item->hasKids() && item->getKids())) { + return nullptr; + } + + child = g_slice_new0(PopplerIndexIter); + child->document = (PopplerDocument *)g_object_ref(parent->document); + child->items = item->getKids(); + + g_assert(child->items); + + return child; +} + +static gchar *unicode_to_char(const Unicode *unicode, int len) +{ + const UnicodeMap *uMap = globalParams->getUtf8Map(); + + GooString gstr; + gchar buf[8]; /* 8 is enough for mapping an unicode char to a string */ + int i, n; + + for (i = 0; i < len; ++i) { + n = uMap->mapUnicode(unicode[i], buf, sizeof(buf)); + gstr.append(buf, n); + } + + return g_strdup(gstr.c_str()); +} + +/** + * poppler_index_iter_is_open: + * @iter: a #PopplerIndexIter + * + * Returns whether this node should be expanded by default to the user. The + * document can provide a hint as to how the document's index should be expanded + * initially. + * + * Return value: %TRUE, if the document wants @iter to be expanded + **/ +gboolean poppler_index_iter_is_open(PopplerIndexIter *iter) +{ + OutlineItem *item; + + item = (*iter->items)[iter->index]; + + return item->isOpen(); +} + +/** + * poppler_index_iter_get_action: + * @iter: a #PopplerIndexIter + * + * Returns the #PopplerAction associated with @iter. It must be freed with + * poppler_action_free(). + * + * Return value: a new #PopplerAction + **/ +PopplerAction *poppler_index_iter_get_action(PopplerIndexIter *iter) +{ + OutlineItem *item; + const LinkAction *link_action; + PopplerAction *action; + gchar *title; + + g_return_val_if_fail(iter != nullptr, NULL); + + item = (*iter->items)[iter->index]; + link_action = item->getAction(); + + const std::vector<Unicode> &itemTitle = item->getTitle(); + title = unicode_to_char(itemTitle.data(), itemTitle.size()); + + action = _poppler_action_new(iter->document, link_action, title); + g_free(title); + + return action; +} + +/** + * poppler_index_iter_next: + * @iter: a #PopplerIndexIter + * + * Sets @iter to point to the next action at the current level, if valid. See + * poppler_index_iter_new() for more information. + * + * Return value: %TRUE, if @iter was set to the next action + **/ +gboolean poppler_index_iter_next(PopplerIndexIter *iter) +{ + g_return_val_if_fail(iter != nullptr, FALSE); + + iter->index++; + if (iter->index >= (int)iter->items->size()) { + return FALSE; + } + + return TRUE; +} + +/** + * poppler_index_iter_free: + * @iter: a #PopplerIndexIter + * + * Frees @iter. + **/ +void poppler_index_iter_free(PopplerIndexIter *iter) +{ + if (G_UNLIKELY(iter == nullptr)) { + return; + } + + g_object_unref(iter->document); + g_slice_free(PopplerIndexIter, iter); +} + +struct _PopplerFontsIter +{ + std::vector<FontInfo *> items; + int index; +}; + +G_DEFINE_BOXED_TYPE(PopplerFontsIter, poppler_fonts_iter, poppler_fonts_iter_copy, poppler_fonts_iter_free) + +/** + * poppler_fonts_iter_get_full_name: + * @iter: a #PopplerFontsIter + * + * Returns the full name of the font associated with @iter + * + * Returns: the font full name + */ +const char *poppler_fonts_iter_get_full_name(PopplerFontsIter *iter) +{ + FontInfo *info; + + info = iter->items[iter->index]; + + const std::optional<std::string> &name = info->getName(); + if (name) { + return name->c_str(); + } else { + return nullptr; + } +} + +/** + * poppler_fonts_iter_get_name: + * @iter: a #PopplerFontsIter + * + * Returns the name of the font associated with @iter + * + * Returns: the font name + */ +const char *poppler_fonts_iter_get_name(PopplerFontsIter *iter) +{ + FontInfo *info; + const char *name; + + name = poppler_fonts_iter_get_full_name(iter); + info = iter->items[iter->index]; + + if (info->getSubset() && name) { + while (*name && *name != '+') { + name++; + } + + if (*name) { + name++; + } + } + + return name; +} + +/** + * poppler_fonts_iter_get_substitute_name: + * @iter: a #PopplerFontsIter + * + * The name of the substitute font of the font associated with @iter or %NULL if + * the font is embedded + * + * Returns: the name of the substitute font or %NULL if font is embedded + * + * Since: 0.20 + */ +const char *poppler_fonts_iter_get_substitute_name(PopplerFontsIter *iter) +{ + FontInfo *info; + + info = iter->items[iter->index]; + + const std::optional<std::string> &name = info->getSubstituteName(); + if (name) { + return name->c_str(); + } else { + return nullptr; + } +} + +/** + * poppler_fonts_iter_get_file_name: + * @iter: a #PopplerFontsIter + * + * The filename of the font associated with @iter or %NULL if + * the font is embedded + * + * Returns: the filename of the font or %NULL if font is embedded + */ +const char *poppler_fonts_iter_get_file_name(PopplerFontsIter *iter) +{ + FontInfo *info; + + info = iter->items[iter->index]; + + const std::optional<std::string> &file = info->getFile(); + if (file) { + return file->c_str(); + } else { + return nullptr; + } +} + +/** + * poppler_fonts_iter_get_font_type: + * @iter: a #PopplerFontsIter + * + * Returns the type of the font associated with @iter + * + * Returns: the font type + */ +PopplerFontType poppler_fonts_iter_get_font_type(PopplerFontsIter *iter) +{ + FontInfo *info; + + g_return_val_if_fail(iter != nullptr, POPPLER_FONT_TYPE_UNKNOWN); + + info = iter->items[iter->index]; + + return (PopplerFontType)info->getType(); +} + +/** + * poppler_fonts_iter_get_encoding: + * @iter: a #PopplerFontsIter + * + * Returns the encoding of the font associated with @iter + * + * Returns: the font encoding + * + * Since: 0.20 + */ +const char *poppler_fonts_iter_get_encoding(PopplerFontsIter *iter) +{ + FontInfo *info; + + info = iter->items[iter->index]; + + const std::string &encoding = info->getEncoding(); + if (!encoding.empty()) { + return encoding.c_str(); + } else { + return nullptr; + } +} + +/** + * poppler_fonts_iter_is_embedded: + * @iter: a #PopplerFontsIter + * + * Returns whether the font associated with @iter is embedded in the document + * + * Returns: %TRUE if font is embedded, %FALSE otherwise + */ +gboolean poppler_fonts_iter_is_embedded(PopplerFontsIter *iter) +{ + FontInfo *info; + + info = iter->items[iter->index]; + + return info->getEmbedded(); +} + +/** + * poppler_fonts_iter_is_subset: + * @iter: a #PopplerFontsIter + * + * Returns whether the font associated with @iter is a subset of another font + * + * Returns: %TRUE if font is a subset, %FALSE otherwise + */ +gboolean poppler_fonts_iter_is_subset(PopplerFontsIter *iter) +{ + FontInfo *info; + + info = iter->items[iter->index]; + + return info->getSubset(); +} + +/** + * poppler_fonts_iter_next: + * @iter: a #PopplerFontsIter + * + * Sets @iter to point to the next font + * + * Returns: %TRUE, if @iter was set to the next font + **/ +gboolean poppler_fonts_iter_next(PopplerFontsIter *iter) +{ + g_return_val_if_fail(iter != nullptr, FALSE); + + iter->index++; + if (iter->index >= (int)iter->items.size()) { + return FALSE; + } + + return TRUE; +} + +/** + * poppler_fonts_iter_copy: + * @iter: a #PopplerFontsIter to copy + * + * Creates a copy of @iter + * + * Returns: a new allocated copy of @iter + */ +PopplerFontsIter *poppler_fonts_iter_copy(PopplerFontsIter *iter) +{ + PopplerFontsIter *new_iter; + + g_return_val_if_fail(iter != nullptr, NULL); + + new_iter = g_slice_dup(PopplerFontsIter, iter); + + new_iter->items.resize(iter->items.size()); + for (std::size_t i = 0; i < iter->items.size(); i++) { + FontInfo *info = iter->items[i]; + new_iter->items[i] = new FontInfo(*info); + } + + return new_iter; +} + +/** + * poppler_fonts_iter_free: + * @iter: a #PopplerFontsIter + * + * Frees the given #PopplerFontsIter + */ +void poppler_fonts_iter_free(PopplerFontsIter *iter) +{ + if (G_UNLIKELY(iter == nullptr)) { + return; + } + + for (auto entry : iter->items) { + delete entry; + } + iter->items.~vector<FontInfo *>(); + + g_slice_free(PopplerFontsIter, iter); +} + +static PopplerFontsIter *poppler_fonts_iter_new(std::vector<FontInfo *> &&items) +{ + PopplerFontsIter *iter; + + iter = g_slice_new(PopplerFontsIter); + new ((void *)&iter->items) std::vector<FontInfo *>(std::move(items)); + iter->index = 0; + + return iter; +} + +typedef struct _PopplerFontInfoClass PopplerFontInfoClass; +struct _PopplerFontInfoClass +{ + GObjectClass parent_class; +}; + +G_DEFINE_TYPE(PopplerFontInfo, poppler_font_info, G_TYPE_OBJECT) + +static void poppler_font_info_finalize(GObject *object); + +static void poppler_font_info_class_init(PopplerFontInfoClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->finalize = poppler_font_info_finalize; +} + +static void poppler_font_info_init(PopplerFontInfo *font_info) +{ + font_info->document = nullptr; + font_info->scanner = nullptr; +} + +static void poppler_font_info_finalize(GObject *object) +{ + PopplerFontInfo *font_info = POPPLER_FONT_INFO(object); + + delete font_info->scanner; + g_object_unref(font_info->document); + + G_OBJECT_CLASS(poppler_font_info_parent_class)->finalize(object); +} + +/** + * poppler_font_info_new: + * @document: a #PopplerDocument + * + * Creates a new #PopplerFontInfo object + * + * Returns: a new #PopplerFontInfo instance + */ +PopplerFontInfo *poppler_font_info_new(PopplerDocument *document) +{ + PopplerFontInfo *font_info; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + + font_info = (PopplerFontInfo *)g_object_new(POPPLER_TYPE_FONT_INFO, nullptr); + font_info->document = (PopplerDocument *)g_object_ref(document); + font_info->scanner = new FontInfoScanner(document->doc); + + return font_info; +} + +/** + * poppler_font_info_scan: + * @font_info: a #PopplerFontInfo + * @n_pages: number of pages to scan + * @iter: (out): return location for a #PopplerFontsIter + * + * Scans the document associated with @font_info for fonts. At most + * @n_pages will be scanned starting from the current iterator. @iter will + * point to the first font scanned. + * + * Here is a simple example of code to scan fonts in a document + * + * <informalexample><programlisting> + * font_info = poppler_font_info_new (document); + * while (poppler_font_info_scan (font_info, 20, &fonts_iter)) { + * if (!fonts_iter) + * continue; /<!-- -->* No fonts found in these 20 pages *<!-- -->/ + * do { + * /<!-- -->* Do something with font iter *<!-- -->/ + * g_print ("Font Name: %s\n", poppler_fonts_iter_get_name (fonts_iter)); + * } while (poppler_fonts_iter_next (fonts_iter)); + * poppler_fonts_iter_free (fonts_iter); + * } + * </programlisting></informalexample> + * + * Returns: %TRUE, if there are more fonts left to scan + */ +gboolean poppler_font_info_scan(PopplerFontInfo *font_info, int n_pages, PopplerFontsIter **iter) +{ + g_return_val_if_fail(iter != nullptr, FALSE); + + std::vector<FontInfo *> items = font_info->scanner->scan(n_pages); + + if (items.empty()) { + *iter = nullptr; + return FALSE; + } else { + *iter = poppler_fonts_iter_new(std::move(items)); + } + + return TRUE; +} + +/* For backward compatibility */ +void poppler_font_info_free(PopplerFontInfo *font_info) +{ + g_return_if_fail(font_info != nullptr); + + g_object_unref(font_info); +} + +/* Optional content (layers) */ +static Layer *layer_new(OptionalContentGroup *oc) +{ + Layer *layer; + + layer = g_slice_new0(Layer); + layer->oc = oc; + + return layer; +} + +static void layer_free(Layer *layer) +{ + if (G_UNLIKELY(!layer)) { + return; + } + + if (layer->kids) { + g_list_free_full(layer->kids, (GDestroyNotify)layer_free); + } + + if (layer->label) { + g_free(layer->label); + } + + g_slice_free(Layer, layer); +} + +static GList *get_optional_content_rbgroups(OCGs *ocg) +{ + Array *rb; + GList *groups = nullptr; + + rb = ocg->getRBGroupsArray(); + + if (rb) { + int i, j; + + for (i = 0; i < rb->getLength(); ++i) { + Array *rb_array; + GList *group = nullptr; + + Object obj = rb->get(i); + if (!obj.isArray()) { + continue; + } + + rb_array = obj.getArray(); + for (j = 0; j < rb_array->getLength(); ++j) { + OptionalContentGroup *oc; + + const Object &ref = rb_array->getNF(j); + if (!ref.isRef()) { + continue; + } + + oc = ocg->findOcgByRef(ref.getRef()); + group = g_list_prepend(group, oc); + } + + groups = g_list_prepend(groups, group); + } + } + + return groups; +} + +GList *_poppler_document_get_layer_rbgroup(PopplerDocument *document, Layer *layer) +{ + GList *l; + + for (l = document->layers_rbgroups; l && l->data; l = g_list_next(l)) { + GList *group = (GList *)l->data; + + if (g_list_find(group, layer->oc)) { + return group; + } + } + + return nullptr; +} + +static GList *get_optional_content_items_sorted(OCGs *ocg, Layer *parent, Array *order) +{ + GList *items = nullptr; + Layer *last_item = parent; + int i; + + for (i = 0; i < order->getLength(); ++i) { + Object orderItem = order->get(i); + + if (orderItem.isDict()) { + const Object &ref = order->getNF(i); + if (ref.isRef()) { + OptionalContentGroup *oc = ocg->findOcgByRef(ref.getRef()); + Layer *layer = layer_new(oc); + + items = g_list_prepend(items, layer); + last_item = layer; + } + } else if (orderItem.isArray() && orderItem.arrayGetLength() > 0) { + if (!last_item) { + last_item = layer_new(nullptr); + items = g_list_prepend(items, last_item); + } + last_item->kids = get_optional_content_items_sorted(ocg, last_item, orderItem.getArray()); + last_item = nullptr; + } else if (orderItem.isString()) { + last_item->label = _poppler_goo_string_to_utf8(orderItem.getString()); + } + } + + return g_list_reverse(items); +} + +static GList *get_optional_content_items(OCGs *ocg) +{ + Array *order; + GList *items = nullptr; + + order = ocg->getOrderArray(); + + if (order) { + items = get_optional_content_items_sorted(ocg, nullptr, order); + } else { + const auto &ocgs = ocg->getOCGs(); + + for (const auto &oc : ocgs) { + Layer *layer = layer_new(oc.second.get()); + + items = g_list_prepend(items, layer); + } + + items = g_list_reverse(items); + } + + return items; +} + +GList *_poppler_document_get_layers(PopplerDocument *document) +{ + if (!document->layers) { + Catalog *catalog = document->doc->getCatalog(); + OCGs *ocg = catalog->getOptContentConfig(); + + if (!ocg) { + return nullptr; + } + + document->layers = get_optional_content_items(ocg); + document->layers_rbgroups = get_optional_content_rbgroups(ocg); + } + + return document->layers; +} + +static void poppler_document_layers_free(PopplerDocument *document) +{ + if (G_UNLIKELY(!document->layers)) { + return; + } + + g_list_free_full(document->layers, (GDestroyNotify)layer_free); + g_list_free_full(document->layers_rbgroups, (GDestroyNotify)g_list_free); + + document->layers = nullptr; + document->layers_rbgroups = nullptr; +} + +/* PopplerLayersIter */ +struct _PopplerLayersIter +{ + PopplerDocument *document; + GList *items; + int index; +}; + +G_DEFINE_BOXED_TYPE(PopplerLayersIter, poppler_layers_iter, poppler_layers_iter_copy, poppler_layers_iter_free) + +/** + * poppler_layers_iter_copy: + * @iter: a #PopplerLayersIter + * + * Creates a new #PopplerLayersIter as a copy of @iter. This must be freed with + * poppler_layers_iter_free(). + * + * Return value: a new #PopplerLayersIter + * + * Since 0.12 + **/ +PopplerLayersIter *poppler_layers_iter_copy(PopplerLayersIter *iter) +{ + PopplerLayersIter *new_iter; + + g_return_val_if_fail(iter != nullptr, NULL); + + new_iter = g_slice_dup(PopplerLayersIter, iter); + new_iter->document = (PopplerDocument *)g_object_ref(new_iter->document); + + return new_iter; +} + +/** + * poppler_layers_iter_free: + * @iter: a #PopplerLayersIter + * + * Frees @iter. + * + * Since: 0.12 + **/ +void poppler_layers_iter_free(PopplerLayersIter *iter) +{ + if (G_UNLIKELY(iter == nullptr)) { + return; + } + + g_object_unref(iter->document); + g_slice_free(PopplerLayersIter, iter); +} + +/** + * poppler_layers_iter_new: + * @document: a #PopplerDocument + * + * Since: 0.12 + **/ +PopplerLayersIter *poppler_layers_iter_new(PopplerDocument *document) +{ + PopplerLayersIter *iter; + GList *items; + + items = _poppler_document_get_layers(document); + + if (!items) { + return nullptr; + } + + iter = g_slice_new0(PopplerLayersIter); + iter->document = (PopplerDocument *)g_object_ref(document); + iter->items = items; + + return iter; +} + +/** + * poppler_layers_iter_get_child: + * @parent: a #PopplerLayersIter + * + * Returns a newly created child of @parent, or %NULL if the iter has no child. + * See poppler_layers_iter_new() for more information on this function. + * + * Return value: a new #PopplerLayersIter, or %NULL + * + * Since: 0.12 + **/ +PopplerLayersIter *poppler_layers_iter_get_child(PopplerLayersIter *parent) +{ + PopplerLayersIter *child; + Layer *layer; + + g_return_val_if_fail(parent != nullptr, NULL); + + layer = (Layer *)g_list_nth_data(parent->items, parent->index); + if (!layer || !layer->kids) { + return nullptr; + } + + child = g_slice_new0(PopplerLayersIter); + child->document = (PopplerDocument *)g_object_ref(parent->document); + child->items = layer->kids; + + g_assert(child->items); + + return child; +} + +/** + * poppler_layers_iter_get_title: + * @iter: a #PopplerLayersIter + * + * Returns the title associated with @iter. It must be freed with + * g_free(). + * + * Return value: a new string containing the @iter's title or %NULL if @iter doesn't have a title. + * The returned string should be freed with g_free() when no longer needed. + * + * Since: 0.12 + **/ +gchar *poppler_layers_iter_get_title(PopplerLayersIter *iter) +{ + Layer *layer; + + g_return_val_if_fail(iter != nullptr, NULL); + + layer = (Layer *)g_list_nth_data(iter->items, iter->index); + + return layer->label ? g_strdup(layer->label) : nullptr; +} + +/** + * poppler_layers_iter_get_layer: + * @iter: a #PopplerLayersIter + * + * Returns the #PopplerLayer associated with @iter. + * + * Return value: (transfer full): a new #PopplerLayer, or %NULL if + * there isn't any layer associated with @iter + * + * Since: 0.12 + **/ +PopplerLayer *poppler_layers_iter_get_layer(PopplerLayersIter *iter) +{ + Layer *layer; + PopplerLayer *poppler_layer = nullptr; + + g_return_val_if_fail(iter != nullptr, NULL); + + layer = (Layer *)g_list_nth_data(iter->items, iter->index); + if (layer->oc) { + GList *rb_group = nullptr; + + rb_group = _poppler_document_get_layer_rbgroup(iter->document, layer); + poppler_layer = _poppler_layer_new(iter->document, layer, rb_group); + } + + return poppler_layer; +} + +/** + * poppler_layers_iter_next: + * @iter: a #PopplerLayersIter + * + * Sets @iter to point to the next action at the current level, if valid. See + * poppler_layers_iter_new() for more information. + * + * Return value: %TRUE, if @iter was set to the next action + * + * Since: 0.12 + **/ +gboolean poppler_layers_iter_next(PopplerLayersIter *iter) +{ + g_return_val_if_fail(iter != nullptr, FALSE); + + iter->index++; + if (iter->index >= (gint)g_list_length(iter->items)) { + return FALSE; + } + + return TRUE; +} + +typedef struct _PopplerPSFileClass PopplerPSFileClass; +struct _PopplerPSFileClass +{ + GObjectClass parent_class; +}; + +G_DEFINE_TYPE(PopplerPSFile, poppler_ps_file, G_TYPE_OBJECT) + +static void poppler_ps_file_finalize(GObject *object); + +static void poppler_ps_file_class_init(PopplerPSFileClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->finalize = poppler_ps_file_finalize; +} + +static void poppler_ps_file_init(PopplerPSFile *ps_file) +{ + ps_file->out = nullptr; + ps_file->fd = -1; + ps_file->filename = nullptr; + ps_file->paper_width = -1; + ps_file->paper_height = -1; + ps_file->duplex = FALSE; +} + +static void poppler_ps_file_finalize(GObject *object) +{ + PopplerPSFile *ps_file = POPPLER_PS_FILE(object); + + delete ps_file->out; + g_object_unref(ps_file->document); + g_free(ps_file->filename); +#ifndef G_OS_WIN32 + if (ps_file->fd != -1) { + close(ps_file->fd); + } +#endif /* !G_OS_WIN32 */ + + G_OBJECT_CLASS(poppler_ps_file_parent_class)->finalize(object); +} + +/** + * poppler_ps_file_new: + * @document: a #PopplerDocument + * @filename: the path of the output filename + * @first_page: the first page to print + * @n_pages: the number of pages to print + * + * Create a new postscript file to render to + * + * Return value: (transfer full): a PopplerPSFile + **/ +PopplerPSFile *poppler_ps_file_new(PopplerDocument *document, const char *filename, int first_page, int n_pages) +{ + PopplerPSFile *ps_file; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + g_return_val_if_fail(filename != nullptr, NULL); + g_return_val_if_fail(n_pages > 0, NULL); + + ps_file = (PopplerPSFile *)g_object_new(POPPLER_TYPE_PS_FILE, nullptr); + ps_file->document = (PopplerDocument *)g_object_ref(document); + ps_file->filename = g_strdup(filename); + ps_file->first_page = first_page + 1; + ps_file->last_page = first_page + 1 + n_pages - 1; + + return ps_file; +} + +#ifndef G_OS_WIN32 + +/** + * poppler_ps_file_new_fd: + * @document: a #PopplerDocument + * @fd: a valid file descriptor open for writing + * @first_page: the first page to print + * @n_pages: the number of pages to print + * + * Create a new postscript file to render to. + * Note that this function takes ownership of @fd; you must not operate on it + * again, nor close it. + * + * Return value: (transfer full): a #PopplerPSFile + * + * Since: 21.12.0 + **/ +PopplerPSFile *poppler_ps_file_new_fd(PopplerDocument *document, int fd, int first_page, int n_pages) +{ + PopplerPSFile *ps_file; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), nullptr); + g_return_val_if_fail(fd != -1, nullptr); + g_return_val_if_fail(n_pages > 0, nullptr); + + ps_file = (PopplerPSFile *)g_object_new(POPPLER_TYPE_PS_FILE, nullptr); + ps_file->document = (PopplerDocument *)g_object_ref(document); + ps_file->fd = fd; + ps_file->first_page = first_page + 1; + ps_file->last_page = first_page + 1 + n_pages - 1; + + return ps_file; +} + +#endif /* !G_OS_WIN32 */ + +/** + * poppler_ps_file_set_paper_size: + * @ps_file: a PopplerPSFile which was not yet printed to. + * @width: the paper width in 1/72 inch + * @height: the paper height in 1/72 inch + * + * Set the output paper size. These values will end up in the + * DocumentMedia, the BoundingBox DSC comments and other places in the + * generated PostScript. + * + **/ +void poppler_ps_file_set_paper_size(PopplerPSFile *ps_file, double width, double height) +{ + g_return_if_fail(ps_file->out == nullptr); + + ps_file->paper_width = width; + ps_file->paper_height = height; +} + +/** + * poppler_ps_file_set_duplex: + * @ps_file: a PopplerPSFile which was not yet printed to + * @duplex: whether to force duplex printing (on printers which support this) + * + * Enable or disable Duplex printing. + * + **/ +void poppler_ps_file_set_duplex(PopplerPSFile *ps_file, gboolean duplex) +{ + g_return_if_fail(ps_file->out == nullptr); + + ps_file->duplex = duplex; +} + +/** + * poppler_ps_file_free: + * @ps_file: a PopplerPSFile + * + * Frees @ps_file + * + **/ +void poppler_ps_file_free(PopplerPSFile *ps_file) +{ + g_return_if_fail(ps_file != nullptr); + g_object_unref(ps_file); +} + +/** + * poppler_document_get_form_field: + * @document: a #PopplerDocument + * @id: an id of a #PopplerFormField + * + * Returns the #PopplerFormField for the given @id. It must be freed with + * g_object_unref() + * + * Return value: (transfer full): a new #PopplerFormField or %NULL if + * not found + **/ +PopplerFormField *poppler_document_get_form_field(PopplerDocument *document, gint id) +{ + Page *page; + unsigned pageNum; + unsigned fieldNum; + FormWidget *field; + + FormWidget::decodeID(id, &pageNum, &fieldNum); + + page = document->doc->getPage(pageNum); + if (!page) { + return nullptr; + } + + const std::unique_ptr<FormPageWidgets> widgets = page->getFormWidgets(); + if (!widgets) { + return nullptr; + } + + field = widgets->getWidget(fieldNum); + if (field) { + return _poppler_form_field_new(document, field); + } + + return nullptr; +} + +gboolean _poppler_convert_pdf_date_to_gtime(const GooString *date, time_t *gdate) +{ + gchar *date_string; + gboolean retval; + + if (hasUnicodeByteOrderMark(date->toStr())) { + date_string = g_convert(date->c_str() + 2, date->getLength() - 2, "UTF-8", "UTF-16BE", nullptr, nullptr, nullptr); + } else { + date_string = g_strndup(date->c_str(), date->getLength()); + } + + retval = poppler_date_parse(date_string, gdate); + g_free(date_string); + + return retval; +} + +/** + * _poppler_convert_pdf_date_to_date_time: + * @date: a PDF date + * + * Converts the PDF date in @date to a #GDateTime. + * + * Returns: The converted date, or %NULL on error. + **/ +GDateTime *_poppler_convert_pdf_date_to_date_time(const GooString *date) +{ + GDateTime *date_time = nullptr; + GTimeZone *time_zone = nullptr; + int year, mon, day, hour, min, sec, tzHours, tzMins; + char tz; + + if (parseDateString(date, &year, &mon, &day, &hour, &min, &sec, &tz, &tzHours, &tzMins)) { + if (tz == '+' || tz == '-') { + gchar *identifier; + + identifier = g_strdup_printf("%c%02u:%02u", tz, tzHours, tzMins); +#if GLIB_CHECK_VERSION(2, 68, 0) + time_zone = g_time_zone_new_identifier(identifier); + if (!time_zone) { + g_debug("Failed to create time zone for identifier \"%s\"", identifier); + time_zone = g_time_zone_new_utc(); + } +#else + time_zone = g_time_zone_new(identifier); +#endif + g_free(identifier); + } else if (tz == '\0' || tz == 'Z') { + time_zone = g_time_zone_new_utc(); + } else { + g_warning("unexpected tz val '%c'", tz); + time_zone = g_time_zone_new_utc(); + } + + date_time = g_date_time_new(time_zone, year, mon, day, hour, min, sec); + g_time_zone_unref(time_zone); + } + + return date_time; +} + +/** + * _poppler_convert_date_time_to_pdf_date: + * @datetime: a #GDateTime + * + * Converts a #GDateTime to a PDF date. + * + * Returns: The converted date + **/ +GooString *_poppler_convert_date_time_to_pdf_date(GDateTime *datetime) +{ + int offset_min; + gchar *date_str; + std::unique_ptr<GooString> out_str; + + offset_min = g_date_time_get_utc_offset(datetime) / 1000000 / 60; + date_str = g_date_time_format(datetime, "D:%Y%m%d%H%M%S"); + + if (offset_min == 0) { + out_str = GooString::format("{0:s}Z", date_str); + } else { + char tz = offset_min > 0 ? '+' : '-'; + + out_str = GooString::format("{0:s}{1:c}{2:02d}'{3:02d}'", date_str, tz, offset_min / 60, offset_min % 60); + } + + g_free(date_str); + return out_str.release(); +} + +static void _poppler_sign_document_thread(GTask *task, PopplerDocument *document, const PopplerSigningData *signing_data, GCancellable *cancellable) +{ + const PopplerCertificateInfo *certificate_info; + const char *signing_data_signature_text; + const PopplerColor *font_color; + const PopplerColor *border_color; + const PopplerColor *background_color; + gboolean ret; + + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + g_return_if_fail(signing_data != nullptr); + + signing_data_signature_text = poppler_signing_data_get_signature_text(signing_data); + if (signing_data_signature_text == nullptr) { + g_task_return_new_error(task, POPPLER_ERROR, POPPLER_ERROR_SIGNING, "No signature given"); + return; + } + + certificate_info = poppler_signing_data_get_certificate_info(signing_data); + if (certificate_info == nullptr) { + g_task_return_new_error(task, POPPLER_ERROR, POPPLER_ERROR_SIGNING, "Invalid certificate information provided for signing"); + return; + } + + PopplerPage *page = poppler_document_get_page(document, poppler_signing_data_get_page(signing_data)); + if (page == nullptr) { + g_task_return_new_error(task, POPPLER_ERROR, POPPLER_ERROR_SIGNING, "Invalid page number selected for signing"); + return; + } + + font_color = poppler_signing_data_get_font_color(signing_data); + border_color = poppler_signing_data_get_border_color(signing_data); + background_color = poppler_signing_data_get_background_color(signing_data); + + std::unique_ptr<GooString> signature_text = std::make_unique<GooString>(utf8ToUtf16WithBom(signing_data_signature_text)); + std::unique_ptr<GooString> signature_text_left = std::make_unique<GooString>(utf8ToUtf16WithBom(poppler_signing_data_get_signature_text_left(signing_data))); + const auto field_partial_name = new GooString(poppler_signing_data_get_field_partial_name(signing_data), strlen(poppler_signing_data_get_field_partial_name(signing_data))); + const auto owner_pwd = std::optional<GooString>(poppler_signing_data_get_document_owner_password(signing_data)); + const auto user_pwd = std::optional<GooString>(poppler_signing_data_get_document_user_password(signing_data)); + const auto reason = std::unique_ptr<GooString>(poppler_signing_data_get_reason(signing_data) ? new GooString(poppler_signing_data_get_reason(signing_data), strlen(poppler_signing_data_get_reason(signing_data))) : nullptr); + const auto location = std::unique_ptr<GooString>(poppler_signing_data_get_location(signing_data) ? new GooString(poppler_signing_data_get_location(signing_data), strlen(poppler_signing_data_get_location(signing_data))) : nullptr); + const PopplerRectangle *rect = poppler_signing_data_get_signature_rectangle(signing_data); + + ret = document->doc->sign(poppler_signing_data_get_destination_filename(signing_data), poppler_certificate_info_get_id((PopplerCertificateInfo *)certificate_info), + poppler_signing_data_get_password(signing_data) ? poppler_signing_data_get_password(signing_data) : "", field_partial_name, poppler_signing_data_get_page(signing_data) + 1, + PDFRectangle(rect->x1, rect->y1, rect->x2, rect->y2), *signature_text, *signature_text_left, poppler_signing_data_get_font_size(signing_data), poppler_signing_data_get_left_font_size(signing_data), + std::make_unique<AnnotColor>(font_color->red, font_color->green, font_color->blue), poppler_signing_data_get_border_width(signing_data), + std::make_unique<AnnotColor>(border_color->red, border_color->green, border_color->blue), std::make_unique<AnnotColor>(background_color->red, background_color->green, background_color->blue), reason.get(), + location.get(), poppler_signing_data_get_image_path(signing_data) ? poppler_signing_data_get_image_path(signing_data) : "", owner_pwd, user_pwd); + + g_task_return_boolean(task, ret); +} + +/** + * poppler_document_sign: + * @document: a #PopplerDocument + * @signing_data: a #PopplerSigningData + * @cancellable: a #GCancellable + * @callback: a #GAsyncReadyCallback + * @user_data: user data used by callback function + * + * Sign #document using #signing_data. + * + * Since: 23.07.0 + **/ +void poppler_document_sign(PopplerDocument *document, const PopplerSigningData *signing_data, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) +{ + GTask *task; + + g_return_if_fail(POPPLER_IS_DOCUMENT(document)); + g_return_if_fail(signing_data != nullptr); + + task = g_task_new(document, cancellable, callback, user_data); + g_task_set_task_data(task, (void *)signing_data, nullptr); + + g_task_run_in_thread(task, (GTaskThreadFunc)_poppler_sign_document_thread); + g_object_unref(task); +} + +/** + * poppler_document_sign_finish: + * @document: a #PopplerDocument + * @result: a #GAsyncResult + * @error: a #GError + * + * Finish poppler_sign_document and get return status or error. + * + * Returns: %TRUE on successful signing a document, otherwise %FALSE and error is set. + * + * Since: 23.07.0 + **/ +gboolean poppler_document_sign_finish(PopplerDocument *document, GAsyncResult *result, GError **error) +{ + g_return_val_if_fail(g_task_is_valid(result, document), FALSE); + + return g_task_propagate_boolean(G_TASK(result), error); +} diff --git a/poppler-24.05.0/glib/poppler-document.h b/poppler-24.05.0/glib/poppler-document.h new file mode 100644 index 0000000000000000000000000000000000000000..a793e08bd4ed316a52dcf054369e3bbdc05eeca6 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-document.h @@ -0,0 +1,546 @@ +/* poppler-document.h: glib interface to poppler + * Copyright (C) 2004, Red Hat, Inc. + * + * Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com> + * Copyright (C) 2018, 2019, 2021, 2022 Marek Kasik <mkasik@redhat.com> + * Copyright (C) 2019 Masamichi Hosoda <trueroad@trueroad.jp> + * Copyright (C) 2021 André Guerreiro <aguerreiro1985@gmail.com> + * + * 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. + */ + +#ifndef __POPPLER_DOCUMENT_H__ +#define __POPPLER_DOCUMENT_H__ + +#include <glib-object.h> +#include <gio/gio.h> +#include "poppler.h" + +G_BEGIN_DECLS + +#define POPPLER_TYPE_DOCUMENT (poppler_document_get_type()) +#define POPPLER_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_DOCUMENT, PopplerDocument)) +#define POPPLER_IS_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_DOCUMENT)) + +/** + * PopplerPageLayout: + * @POPPLER_PAGE_LAYOUT_UNSET: no specific layout set + * @POPPLER_PAGE_LAYOUT_SINGLE_PAGE: one page at a time + * @POPPLER_PAGE_LAYOUT_ONE_COLUMN: pages in one column + * @POPPLER_PAGE_LAYOUT_TWO_COLUMN_LEFT: pages in two columns with odd numbered pages on the left + * @POPPLER_PAGE_LAYOUT_TWO_COLUMN_RIGHT: pages in two columns with odd numbered pages on the right + * @POPPLER_PAGE_LAYOUT_TWO_PAGE_LEFT: two pages at a time with odd numbered pages on the left + * @POPPLER_PAGE_LAYOUT_TWO_PAGE_RIGHT: two pages at a time with odd numbered pages on the right + * + * Page layout types + */ +typedef enum +{ + POPPLER_PAGE_LAYOUT_UNSET, + POPPLER_PAGE_LAYOUT_SINGLE_PAGE, + POPPLER_PAGE_LAYOUT_ONE_COLUMN, + POPPLER_PAGE_LAYOUT_TWO_COLUMN_LEFT, + POPPLER_PAGE_LAYOUT_TWO_COLUMN_RIGHT, + POPPLER_PAGE_LAYOUT_TWO_PAGE_LEFT, + POPPLER_PAGE_LAYOUT_TWO_PAGE_RIGHT +} PopplerPageLayout; + +/** + * PopplerPageMode: + * @POPPLER_PAGE_MODE_UNSET: no specific mode set + * @POPPLER_PAGE_MODE_NONE: neither document outline nor thumbnails visible + * @POPPLER_PAGE_MODE_USE_OUTLINES: document outline visible + * @POPPLER_PAGE_MODE_USE_THUMBS: thumbnails visible + * @POPPLER_PAGE_MODE_FULL_SCREEN: full-screen mode + * @POPPLER_PAGE_MODE_USE_OC: layers panel visible + * @POPPLER_PAGE_MODE_USE_ATTACHMENTS: attachments panel visible + * + * Page modes + */ +typedef enum +{ + POPPLER_PAGE_MODE_UNSET, + POPPLER_PAGE_MODE_NONE, + POPPLER_PAGE_MODE_USE_OUTLINES, + POPPLER_PAGE_MODE_USE_THUMBS, + POPPLER_PAGE_MODE_FULL_SCREEN, + POPPLER_PAGE_MODE_USE_OC, + POPPLER_PAGE_MODE_USE_ATTACHMENTS +} PopplerPageMode; + +/** + * PopplerFontType: + * @POPPLER_FONT_TYPE_UNKNOWN: unknown font type + * @POPPLER_FONT_TYPE_TYPE1: Type 1 font type + * @POPPLER_FONT_TYPE_TYPE1C: Type 1 font type embedded in Compact Font Format (CFF) font program + * @POPPLER_FONT_TYPE_TYPE1COT: Type 1 font type embedded in OpenType font program + * @POPPLER_FONT_TYPE_TYPE3: A font type that is defined with PDF graphics operators + * @POPPLER_FONT_TYPE_TRUETYPE: TrueType font type + * @POPPLER_FONT_TYPE_TRUETYPEOT: TrueType font type embedded in OpenType font program + * @POPPLER_FONT_TYPE_CID_TYPE0: CIDFont type based on Type 1 font technology + * @POPPLER_FONT_TYPE_CID_TYPE0C: CIDFont type based on Type 1 font technology embedded in CFF font program + * @POPPLER_FONT_TYPE_CID_TYPE0COT: CIDFont type based on Type 1 font technology embedded in OpenType font program + * @POPPLER_FONT_TYPE_CID_TYPE2: CIDFont type based on TrueType font technology + * @POPPLER_FONT_TYPE_CID_TYPE2OT: CIDFont type based on TrueType font technology embedded in OpenType font program + * + * Font types + */ +typedef enum +{ + POPPLER_FONT_TYPE_UNKNOWN, + POPPLER_FONT_TYPE_TYPE1, + POPPLER_FONT_TYPE_TYPE1C, + POPPLER_FONT_TYPE_TYPE1COT, + POPPLER_FONT_TYPE_TYPE3, + POPPLER_FONT_TYPE_TRUETYPE, + POPPLER_FONT_TYPE_TRUETYPEOT, + POPPLER_FONT_TYPE_CID_TYPE0, + POPPLER_FONT_TYPE_CID_TYPE0C, + POPPLER_FONT_TYPE_CID_TYPE0COT, + POPPLER_FONT_TYPE_CID_TYPE2, + POPPLER_FONT_TYPE_CID_TYPE2OT +} PopplerFontType; + +/** + * PopplerViewerPreferences: + * @POPPLER_VIEWER_PREFERENCES_UNSET: no preferences set + * @POPPLER_VIEWER_PREFERENCES_HIDE_TOOLBAR: hider toolbars when document is active + * @POPPLER_VIEWER_PREFERENCES_HIDE_MENUBAR: hide menu bar when document is active + * @POPPLER_VIEWER_PREFERENCES_HIDE_WINDOWUI: hide UI elements in document's window + * @POPPLER_VIEWER_PREFERENCES_FIT_WINDOW: resize document's window to fit the size of the first displayed page + * @POPPLER_VIEWER_PREFERENCES_CENTER_WINDOW: position the document's window in the center of the screen + * @POPPLER_VIEWER_PREFERENCES_DISPLAY_DOC_TITLE: display document title in window's title bar + * @POPPLER_VIEWER_PREFERENCES_DIRECTION_RTL: the predominant reading order for text is right to left + * + * Viewer preferences + */ +typedef enum /*< flags >*/ +{ + POPPLER_VIEWER_PREFERENCES_UNSET = 0, + POPPLER_VIEWER_PREFERENCES_HIDE_TOOLBAR = 1 << 0, + POPPLER_VIEWER_PREFERENCES_HIDE_MENUBAR = 1 << 1, + POPPLER_VIEWER_PREFERENCES_HIDE_WINDOWUI = 1 << 2, + POPPLER_VIEWER_PREFERENCES_FIT_WINDOW = 1 << 3, + POPPLER_VIEWER_PREFERENCES_CENTER_WINDOW = 1 << 4, + POPPLER_VIEWER_PREFERENCES_DISPLAY_DOC_TITLE = 1 << 5, + POPPLER_VIEWER_PREFERENCES_DIRECTION_RTL = 1 << 6 +} PopplerViewerPreferences; + +/** + * PopplerPrintScaling: + * @POPPLER_PRINT_SCALING_APP_DEFAULT: application's default page scaling + * @POPPLER_PRINT_SCALING_NONE: no page scaling + * + * PrintScaling viewer preference + * + * Since: 0.73 + */ +typedef enum +{ + POPPLER_PRINT_SCALING_APP_DEFAULT, + POPPLER_PRINT_SCALING_NONE +} PopplerPrintScaling; + +/** + * PopplerPrintDuplex: + * @POPPLER_PRINT_DUPLEX_NONE: No preference on duplex printing + * @POPPLER_PRINT_DUPLEX_SIMPLEX: Print single-sided + * @POPPLER_PRINT_DUPLEX_DUPLEX_FLIP_SHORT_EDGE: Duplex and flip on the short edge of the sheet + * @POPPLER_PRINT_DUPLEX_DUPLEX_FLIP_LONG_EDGE: Duplex and flip on the long edge of the sheet + * + * Duplex viewer preference + * + * Since: 0.80 + */ +typedef enum +{ + POPPLER_PRINT_DUPLEX_NONE, + POPPLER_PRINT_DUPLEX_SIMPLEX, + POPPLER_PRINT_DUPLEX_DUPLEX_FLIP_SHORT_EDGE, + POPPLER_PRINT_DUPLEX_DUPLEX_FLIP_LONG_EDGE +} PopplerPrintDuplex; + +/** + * PopplerPermissions: + * @POPPLER_PERMISSIONS_OK_TO_PRINT: document can be printer + * @POPPLER_PERMISSIONS_OK_TO_MODIFY: document contents can be modified + * @POPPLER_PERMISSIONS_OK_TO_COPY: document can be copied + * @POPPLER_PERMISSIONS_OK_TO_ADD_NOTES: annotations can added to the document + * @POPPLER_PERMISSIONS_OK_TO_FILL_FORM: interactive form fields can be filled in + * @POPPLER_PERMISSIONS_OK_TO_EXTRACT_CONTENTS: extract text and graphics + * (in support of accessibility to users with disabilities or for other purposes). Since 0.18 + * @POPPLER_PERMISSIONS_OK_TO_ASSEMBLE: assemble the document (insert, rotate, or delete pages and create + * bookmarks or thumbnail images). Since 0.18 + * @POPPLER_PERMISSIONS_OK_TO_PRINT_HIGH_RESOLUTION: document can be printer at high resolution. Since 0.18 + * @POPPLER_PERMISSIONS_FULL: document permits all operations + * + * Permissions + */ +/* clang-format off */ +typedef enum /*< flags >*/ +{ + POPPLER_PERMISSIONS_OK_TO_PRINT = 1 << 0, + POPPLER_PERMISSIONS_OK_TO_MODIFY = 1 << 1, + POPPLER_PERMISSIONS_OK_TO_COPY = 1 << 2, + POPPLER_PERMISSIONS_OK_TO_ADD_NOTES = 1 << 3, + POPPLER_PERMISSIONS_OK_TO_FILL_FORM = 1 << 4, + POPPLER_PERMISSIONS_OK_TO_EXTRACT_CONTENTS = 1 << 5, + POPPLER_PERMISSIONS_OK_TO_ASSEMBLE = 1 << 6, + POPPLER_PERMISSIONS_OK_TO_PRINT_HIGH_RESOLUTION = 1 << 7, + POPPLER_PERMISSIONS_FULL = (POPPLER_PERMISSIONS_OK_TO_PRINT | POPPLER_PERMISSIONS_OK_TO_MODIFY | POPPLER_PERMISSIONS_OK_TO_COPY | POPPLER_PERMISSIONS_OK_TO_ADD_NOTES | POPPLER_PERMISSIONS_OK_TO_FILL_FORM | POPPLER_PERMISSIONS_OK_TO_EXTRACT_CONTENTS | POPPLER_PERMISSIONS_OK_TO_ASSEMBLE | POPPLER_PERMISSIONS_OK_TO_PRINT_HIGH_RESOLUTION) + +} PopplerPermissions; +/* clang-format on */ + +/** + * PopplerPDFSubtype: + * @POPPLER_PDF_SUBTYPE_UNSET: Null + * @POPPLER_PDF_SUBTYPE_PDF_A: ISO 19005 - Document management -- Electronic document file format for long-term preservation (PDF/A) + * @POPPLER_PDF_SUBTYPE_PDF_E: ISO 24517 - Document management -- Engineering document format using PDF (PDF/E) + * @POPPLER_PDF_SUBTYPE_PDF_UA: ISO 14289 - Document management applications -- Electronic document file format enhancement for accessibility (PDF/UA) + * @POPPLER_PDF_SUBTYPE_PDF_VT: ISO 16612 - Graphic technology -- Variable data exchange (PDF/VT) + * @POPPLER_PDF_SUBTYPE_PDF_X: ISO 15930 - Graphic technology -- Prepress digital data exchange (PDF/X) + * @POPPLER_PDF_SUBTYPE_NONE: Not compliant with the above standards + * + * PDF Subtype + * + * Since: 0.70 + */ +typedef enum +{ + POPPLER_PDF_SUBTYPE_UNSET, + POPPLER_PDF_SUBTYPE_PDF_A, + POPPLER_PDF_SUBTYPE_PDF_E, + POPPLER_PDF_SUBTYPE_PDF_UA, + POPPLER_PDF_SUBTYPE_PDF_VT, + POPPLER_PDF_SUBTYPE_PDF_X, + POPPLER_PDF_SUBTYPE_NONE +} PopplerPDFSubtype; + +/** + * PopplerPDFPart: + * @POPPLER_PDF_SUBTYPE_PART_UNSET: Null + * @POPPLER_PDF_SUBTYPE_PART_1: 1 + * @POPPLER_PDF_SUBTYPE_PART_2: 2 + * @POPPLER_PDF_SUBTYPE_PART_3: 3 + * @POPPLER_PDF_SUBTYPE_PART_4: 4 + * @POPPLER_PDF_SUBTYPE_PART_5: 5 + * @POPPLER_PDF_SUBTYPE_PART_6: 6 + * @POPPLER_PDF_SUBTYPE_PART_7: 7 + * @POPPLER_PDF_SUBTYPE_PART_8: 8 + * @POPPLER_PDF_SUBTYPE_PART_NONE: No part available + * + * PDF Subtype Part + * + * Since: 0.70 + */ +typedef enum +{ + POPPLER_PDF_SUBTYPE_PART_UNSET, + POPPLER_PDF_SUBTYPE_PART_1, + POPPLER_PDF_SUBTYPE_PART_2, + POPPLER_PDF_SUBTYPE_PART_3, + POPPLER_PDF_SUBTYPE_PART_4, + POPPLER_PDF_SUBTYPE_PART_5, + POPPLER_PDF_SUBTYPE_PART_6, + POPPLER_PDF_SUBTYPE_PART_7, + POPPLER_PDF_SUBTYPE_PART_8, + POPPLER_PDF_SUBTYPE_PART_NONE +} PopplerPDFPart; + +/** + * PopplerPDFConformance: + * @POPPLER_PDF_SUBTYPE_CONF_UNSET: Null + * @POPPLER_PDF_SUBTYPE_CONF_A: Level A (accessible) conformance (PDF/A) + * @POPPLER_PDF_SUBTYPE_CONF_B: Level B (basic) conformance (PDF/A) + * @POPPLER_PDF_SUBTYPE_CONF_G: Level G (external graphical content) (PDF/X) + * @POPPLER_PDF_SUBTYPE_CONF_N: Level N (external ICC Profile) (PDF/X) + * @POPPLER_PDF_SUBTYPE_CONF_P: Level P (ICC Profile) (PDF/X) + * @POPPLER_PDF_SUBTYPE_CONF_PG: Level PG (conjunction of P and G) (PDF/X) + * @POPPLER_PDF_SUBTYPE_CONF_U: Level U (Unicode) conformance (PDF/A) + * @POPPLER_PDF_SUBTYPE_CONF_NONE: No conformance level available + * + * PDF Subtype Conformance + * + * Since: 0.70 + */ +typedef enum +{ + POPPLER_PDF_SUBTYPE_CONF_UNSET, + POPPLER_PDF_SUBTYPE_CONF_A, + POPPLER_PDF_SUBTYPE_CONF_B, + POPPLER_PDF_SUBTYPE_CONF_G, + POPPLER_PDF_SUBTYPE_CONF_N, + POPPLER_PDF_SUBTYPE_CONF_P, + POPPLER_PDF_SUBTYPE_CONF_PG, + POPPLER_PDF_SUBTYPE_CONF_U, + POPPLER_PDF_SUBTYPE_CONF_NONE +} PopplerPDFConformance; + +POPPLER_PUBLIC +GType poppler_document_get_type(void) G_GNUC_CONST; + +POPPLER_PUBLIC +PopplerDocument *poppler_document_new_from_file(const char *uri, const char *password, GError **error); +POPPLER_PUBLIC +PopplerDocument *poppler_document_new_from_data(char *data, int length, const char *password, GError **error) G_GNUC_DEPRECATED_FOR(poppler_document_new_from_bytes); +POPPLER_PUBLIC +PopplerDocument *poppler_document_new_from_bytes(GBytes *bytes, const char *password, GError **error); +POPPLER_PUBLIC +PopplerDocument *poppler_document_new_from_stream(GInputStream *stream, goffset length, const char *password, GCancellable *cancellable, GError **error); +POPPLER_PUBLIC +PopplerDocument *poppler_document_new_from_gfile(GFile *file, const char *password, GCancellable *cancellable, GError **error); +#ifndef G_OS_WIN32 +POPPLER_PUBLIC +PopplerDocument *poppler_document_new_from_fd(int fd, const char *password, GError **error); +#endif +POPPLER_PUBLIC +gboolean poppler_document_save(PopplerDocument *document, const char *uri, GError **error); +POPPLER_PUBLIC +gboolean poppler_document_save_a_copy(PopplerDocument *document, const char *uri, GError **error); +#ifndef G_OS_WIN32 +POPPLER_PUBLIC +gboolean poppler_document_save_to_fd(PopplerDocument *document, int fd, gboolean include_changes, GError **error); +#endif +POPPLER_PUBLIC +gboolean poppler_document_get_id(PopplerDocument *document, gchar **permanent_id, gchar **update_id); +POPPLER_PUBLIC +int poppler_document_get_n_pages(PopplerDocument *document); +POPPLER_PUBLIC +PopplerPage *poppler_document_get_page(PopplerDocument *document, int index); +POPPLER_PUBLIC +PopplerPage *poppler_document_get_page_by_label(PopplerDocument *document, const char *label); +POPPLER_PUBLIC +gchar *poppler_document_get_pdf_version_string(PopplerDocument *document); +POPPLER_PUBLIC +void poppler_document_get_pdf_version(PopplerDocument *document, guint *major_version, guint *minor_version); +POPPLER_PUBLIC +gchar *poppler_document_get_title(PopplerDocument *document); +POPPLER_PUBLIC +void poppler_document_set_title(PopplerDocument *document, const gchar *title); +POPPLER_PUBLIC +gchar *poppler_document_get_author(PopplerDocument *document); +POPPLER_PUBLIC +void poppler_document_set_author(PopplerDocument *document, const gchar *author); +POPPLER_PUBLIC +gchar *poppler_document_get_subject(PopplerDocument *document); +POPPLER_PUBLIC +void poppler_document_set_subject(PopplerDocument *document, const gchar *subject); +POPPLER_PUBLIC +gchar *poppler_document_get_keywords(PopplerDocument *document); +POPPLER_PUBLIC +void poppler_document_set_keywords(PopplerDocument *document, const gchar *keywords); +POPPLER_PUBLIC +gchar *poppler_document_get_creator(PopplerDocument *document); +POPPLER_PUBLIC +void poppler_document_set_creator(PopplerDocument *document, const gchar *creator); +POPPLER_PUBLIC +gchar *poppler_document_get_producer(PopplerDocument *document); +POPPLER_PUBLIC +void poppler_document_set_producer(PopplerDocument *document, const gchar *producer); +POPPLER_PUBLIC +time_t poppler_document_get_creation_date(PopplerDocument *document); +POPPLER_PUBLIC +void poppler_document_set_creation_date(PopplerDocument *document, time_t creation_date); +POPPLER_PUBLIC +GDateTime *poppler_document_get_creation_date_time(PopplerDocument *document); +POPPLER_PUBLIC +void poppler_document_set_creation_date_time(PopplerDocument *document, GDateTime *creation_datetime); +POPPLER_PUBLIC +time_t poppler_document_get_modification_date(PopplerDocument *document); +POPPLER_PUBLIC +void poppler_document_set_modification_date(PopplerDocument *document, time_t modification_date); +POPPLER_PUBLIC +GDateTime *poppler_document_get_modification_date_time(PopplerDocument *document); +POPPLER_PUBLIC +void poppler_document_set_modification_date_time(PopplerDocument *document, GDateTime *modification_datetime); +POPPLER_PUBLIC +gboolean poppler_document_is_linearized(PopplerDocument *document); +POPPLER_PUBLIC +PopplerPageLayout poppler_document_get_page_layout(PopplerDocument *document); +POPPLER_PUBLIC +PopplerPageMode poppler_document_get_page_mode(PopplerDocument *document); +POPPLER_PUBLIC +PopplerPermissions poppler_document_get_permissions(PopplerDocument *document); +POPPLER_PUBLIC +gchar *poppler_document_get_pdf_subtype_string(PopplerDocument *document); +POPPLER_PUBLIC +PopplerPDFSubtype poppler_document_get_pdf_subtype(PopplerDocument *document); +POPPLER_PUBLIC +PopplerPDFPart poppler_document_get_pdf_part(PopplerDocument *document); +POPPLER_PUBLIC +PopplerPDFConformance poppler_document_get_pdf_conformance(PopplerDocument *document); +POPPLER_PUBLIC +gchar *poppler_document_get_metadata(PopplerDocument *document); +POPPLER_PUBLIC +PopplerPrintScaling poppler_document_get_print_scaling(PopplerDocument *document); +POPPLER_PUBLIC +PopplerPrintDuplex poppler_document_get_print_duplex(PopplerDocument *document); +POPPLER_PUBLIC +gint poppler_document_get_print_n_copies(PopplerDocument *document); +POPPLER_PUBLIC +PopplerPageRange *poppler_document_get_print_page_ranges(PopplerDocument *document, int *n_ranges) G_GNUC_MALLOC; + +/* Attachments */ +POPPLER_PUBLIC +guint poppler_document_get_n_attachments(PopplerDocument *document); +POPPLER_PUBLIC +gboolean poppler_document_has_attachments(PopplerDocument *document); +POPPLER_PUBLIC +GList *poppler_document_get_attachments(PopplerDocument *document); + +/* Links */ +POPPLER_PUBLIC +PopplerDest *poppler_document_find_dest(PopplerDocument *document, const gchar *link_name); +POPPLER_PUBLIC +GTree *poppler_document_create_dests_tree(PopplerDocument *document); + +/* Form */ +POPPLER_PUBLIC +PopplerFormField *poppler_document_get_form_field(PopplerDocument *document, gint id); + +POPPLER_PUBLIC +void poppler_document_reset_form(PopplerDocument *document, GList *fields, gboolean exclude_fields); +/* Javascript */ +POPPLER_PUBLIC +gboolean poppler_document_has_javascript(PopplerDocument *document); + +/* Signatures */ +POPPLER_PUBLIC +GList *poppler_document_get_signature_fields(PopplerDocument *document); +POPPLER_PUBLIC +gint poppler_document_get_n_signatures(const PopplerDocument *document); + +/* Interface for getting the Index of a poppler_document */ +#define POPPLER_TYPE_INDEX_ITER (poppler_index_iter_get_type()) +POPPLER_PUBLIC +GType poppler_index_iter_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerIndexIter *poppler_index_iter_new(PopplerDocument *document); +POPPLER_PUBLIC +PopplerIndexIter *poppler_index_iter_copy(PopplerIndexIter *iter); +POPPLER_PUBLIC +void poppler_index_iter_free(PopplerIndexIter *iter); + +POPPLER_PUBLIC +PopplerIndexIter *poppler_index_iter_get_child(PopplerIndexIter *parent); +POPPLER_PUBLIC +gboolean poppler_index_iter_is_open(PopplerIndexIter *iter); +POPPLER_PUBLIC +PopplerAction *poppler_index_iter_get_action(PopplerIndexIter *iter); +POPPLER_PUBLIC +gboolean poppler_index_iter_next(PopplerIndexIter *iter); + +/* Interface for getting the Fonts of a poppler_document */ +#define POPPLER_TYPE_FONT_INFO (poppler_font_info_get_type()) +#define POPPLER_FONT_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_FONT_INFO, PopplerFontInfo)) +#define POPPLER_IS_FONT_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_FONT_INFO)) +POPPLER_PUBLIC +GType poppler_font_info_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerFontInfo *poppler_font_info_new(PopplerDocument *document); +POPPLER_PUBLIC +gboolean poppler_font_info_scan(PopplerFontInfo *font_info, int n_pages, PopplerFontsIter **iter); +POPPLER_PUBLIC +void poppler_font_info_free(PopplerFontInfo *font_info); + +#define POPPLER_TYPE_FONTS_ITER (poppler_fonts_iter_get_type()) +POPPLER_PUBLIC +GType poppler_fonts_iter_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerFontsIter *poppler_fonts_iter_copy(PopplerFontsIter *iter); +POPPLER_PUBLIC +void poppler_fonts_iter_free(PopplerFontsIter *iter); +POPPLER_PUBLIC +const char *poppler_fonts_iter_get_name(PopplerFontsIter *iter); +POPPLER_PUBLIC +const char *poppler_fonts_iter_get_full_name(PopplerFontsIter *iter); +POPPLER_PUBLIC +const char *poppler_fonts_iter_get_substitute_name(PopplerFontsIter *iter); +POPPLER_PUBLIC +const char *poppler_fonts_iter_get_file_name(PopplerFontsIter *iter); +POPPLER_PUBLIC +PopplerFontType poppler_fonts_iter_get_font_type(PopplerFontsIter *iter); +POPPLER_PUBLIC +const char *poppler_fonts_iter_get_encoding(PopplerFontsIter *iter); +POPPLER_PUBLIC +gboolean poppler_fonts_iter_is_embedded(PopplerFontsIter *iter); +POPPLER_PUBLIC +gboolean poppler_fonts_iter_is_subset(PopplerFontsIter *iter); +POPPLER_PUBLIC +gboolean poppler_fonts_iter_next(PopplerFontsIter *iter); + +/* Interface for getting the Layers of a poppler_document */ +#define POPPLER_TYPE_LAYERS_ITER (poppler_layers_iter_get_type()) +POPPLER_PUBLIC +GType poppler_layers_iter_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerLayersIter *poppler_layers_iter_new(PopplerDocument *document); +POPPLER_PUBLIC +PopplerLayersIter *poppler_layers_iter_copy(PopplerLayersIter *iter); +POPPLER_PUBLIC +void poppler_layers_iter_free(PopplerLayersIter *iter); + +POPPLER_PUBLIC +PopplerLayersIter *poppler_layers_iter_get_child(PopplerLayersIter *parent); +POPPLER_PUBLIC +gchar *poppler_layers_iter_get_title(PopplerLayersIter *iter); +POPPLER_PUBLIC +PopplerLayer *poppler_layers_iter_get_layer(PopplerLayersIter *iter); +POPPLER_PUBLIC +gboolean poppler_layers_iter_next(PopplerLayersIter *iter); + +/* Export to ps */ +#define POPPLER_TYPE_PS_FILE (poppler_ps_file_get_type()) +#define POPPLER_PS_FILE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_PS_FILE, PopplerPSFile)) +#define POPPLER_IS_PS_FILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_PS_FILE)) +POPPLER_PUBLIC +GType poppler_ps_file_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerPSFile *poppler_ps_file_new(PopplerDocument *document, const char *filename, int first_page, int n_pages); +#ifndef G_OS_WIN32 +POPPLER_PUBLIC +PopplerPSFile *poppler_ps_file_new_fd(PopplerDocument *document, int fd, int first_page, int n_pages); +#endif +POPPLER_PUBLIC +void poppler_ps_file_set_paper_size(PopplerPSFile *ps_file, double width, double height); +POPPLER_PUBLIC +void poppler_ps_file_set_duplex(PopplerPSFile *ps_file, gboolean duplex); +POPPLER_PUBLIC +void poppler_ps_file_free(PopplerPSFile *ps_file); + +POPPLER_PUBLIC +void poppler_document_sign(PopplerDocument *document, const PopplerSigningData *signing_data, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); +POPPLER_PUBLIC +gboolean poppler_document_sign_finish(PopplerDocument *document, GAsyncResult *result, GError **error); + +/** + * PopplerPageRange: + * @start_page: first page in the range of pages + * @end_page: last page in the range of pages + * + * A #PopplerPageRange is used to specify a range of pages. + * + * Since: 0.80 + */ +struct _PopplerPageRange +{ + gint start_page; + gint end_page; +}; + +G_END_DECLS + +#endif /* __POPPLER_DOCUMENT_H__ */ diff --git a/poppler-24.05.0/glib/poppler-enums.c.template b/poppler-24.05.0/glib/poppler-enums.c.template new file mode 100644 index 0000000000000000000000000000000000000000..eefc7697085c8d26d03fd7a3864a49d00c12d8b2 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-enums.c.template @@ -0,0 +1,44 @@ +/*** BEGIN file-header ***/ +#include <config.h> + +#include "poppler-enums.h" + +/*** END file-header ***/ + +/*** BEGIN file-production ***/ +/* enumerations from "@filename@" */ +#include "@filename@" +/*** END file-production ***/ + + +/*** BEGIN value-header ***/ +GType +@enum_name@_get_type (void) +{ + static volatile gsize g_define_type_id = 0; + + if (g_once_init_enter (&g_define_type_id)) { + static const G@Type@Value values[] = { +/*** END value-header ***/ + +/*** BEGIN value-production ***/ + { @VALUENAME@, "@VALUENAME@", "@valuenick@" }, +/*** END value-production ***/ + +/*** BEGIN value-tail ***/ + { 0, NULL, NULL } + }; + GType type = + g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); + + g_once_init_leave (&g_define_type_id, type); + } + + return g_define_type_id; +} + +/*** END value-tail ***/ + +/*** BEGIN file-tail ***/ + +/*** END file-tail ***/ diff --git a/poppler-24.05.0/glib/poppler-enums.h.template b/poppler-24.05.0/glib/poppler-enums.h.template new file mode 100644 index 0000000000000000000000000000000000000000..84c5b7d0e7b27425b18dafe4fd793bc815c2dff1 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-enums.h.template @@ -0,0 +1,28 @@ +/*** BEGIN file-header ***/ + +#ifndef POPPLER_ENUMS_H +#define POPPLER_ENUMS_H + +#include <glib-object.h> + +#include "poppler.h" + +G_BEGIN_DECLS +/*** END file-header ***/ + +/*** BEGIN file-production ***/ + +/* enumerations from "@filename@" */ +/*** END file-production ***/ + +/*** BEGIN value-header ***/ +POPPLER_PUBLIC +GType @enum_name@_get_type (void) G_GNUC_CONST; +#define POPPLER_TYPE_@ENUMSHORT@ (@enum_name@_get_type ()) +/*** END value-header ***/ + +/*** BEGIN file-tail ***/ +G_END_DECLS + +#endif /* !POPPLER_ENUMS_H */ +/*** END file-tail ***/ diff --git a/poppler-24.05.0/glib/poppler-features.h.cmake b/poppler-24.05.0/glib/poppler-features.h.cmake new file mode 100644 index 0000000000000000000000000000000000000000..e6b3a8ee421af501413317c9a14dfae3ba7011d3 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-features.h.cmake @@ -0,0 +1,88 @@ +/* poppler-features.h: glib interface to poppler + * Copyright (C) 2006, Red Hat, Inc. + * + * 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. + */ + +#ifndef __POPPLER_FEATURES_H__ +#define __POPPLER_FEATURES_H__ + +/** + * SECTION:poppler-features + * @short_description: Variables and functions to check the poppler version and features + * @Title: Version and Features Information + * + * Poppler provides version information, and information about features + * enabled at compile time. This is primarily useful in configure checks + * for builds that have a configure script, or for allowing code to optionally + * depend but not require a specific poppler version. + */ + +/** + * POPPLER_HAS_CAIRO: + * + * Defined if poppler was compiled with cairo support. + */ +@CAIRO_FEATURE@ + +/** + * POPPLER_MAJOR_VERSION: + * + * The major version number of the poppler header files (e.g. in poppler version + * 0.1.2 this is 0.) + * + * Since: 0.12 + */ +#define POPPLER_MAJOR_VERSION (@POPPLER_MAJOR_VERSION@) + +/** + * POPPLER_MINOR_VERSION: + * + * The major version number of the poppler header files (e.g. in poppler version + * 0.1.2 this is 1.) + * + * Since: 0.12 + */ +#define POPPLER_MINOR_VERSION (@POPPLER_MINOR_VERSION@) + +/** + * POPPLER_MICRO_VERSION: + * + * The micro version number of the poppler header files (e.g. in poppler version + * 0.1.2 this is 2.) + * + * Since: 0.12 + */ +#define POPPLER_MICRO_VERSION (@POPPLER_MICRO_VERSION@) + +/** + * POPPLER_CHECK_VERSION: + * @major: major version (e.g. 0 for version 0.1.2) + * @minor: minor version (e.g. 1 for version 0.1.2) + * @micro: micro version (e.g. 2 for version 0.1.2) + * + * Checks the version fo the poppler library + * + * Returns: %TRUE if the version of the poppler header files is the same + * as or newer than the passed-in version + * + * Since: 0.12 + */ +#define POPPLER_CHECK_VERSION(major,minor,micro) \ + (POPPLER_MAJOR_VERSION > (major) || \ + (POPPLER_MAJOR_VERSION == (major) && POPPLER_MINOR_VERSION > (minor)) || \ + (POPPLER_MAJOR_VERSION == (major) && POPPLER_MINOR_VERSION == (minor) && POPPLER_MICRO_VERSION >= (micro))) + +#endif /* __POPPLER_FEATURES_H__ */ diff --git a/poppler-24.05.0/glib/poppler-form-field.cc b/poppler-24.05.0/glib/poppler-form-field.cc new file mode 100644 index 0000000000000000000000000000000000000000..bb67ebb2b83a890db74f65949416c5e78c4ebf04 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-form-field.cc @@ -0,0 +1,2317 @@ +/* poppler-form-field.cc: glib interface to poppler + * + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * Copyright (C) 2006 Julien Rebetez + * Copyright (C) 2020 Oliver Sander <oliver.sander@tu-dresden.de> + * Copyright (C) 2021 André Guerreiro <aguerreiro1985@gmail.com> + * Copyright (C) 2021, 2023 Marek Kasik <mkasik@redhat.com> + * Copyright (C) 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela <sune@vuorela.dk> + * + * 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 <memory> + +#include "poppler.h" +#include "poppler-private.h" + +#include <CertificateInfo.h> +#ifdef ENABLE_NSS3 +# include <NSSCryptoSignBackend.h> +#endif +#include <CryptoSignBackend.h> + +/** + * SECTION:poppler-form-field + * @short_description: Form Field + * @title: PopplerFormField + */ + +typedef struct _PopplerFormFieldClass PopplerFormFieldClass; +struct _PopplerFormFieldClass +{ + GObjectClass parent_class; +}; + +G_DEFINE_TYPE(PopplerFormField, poppler_form_field, G_TYPE_OBJECT) + +static void poppler_form_field_finalize(GObject *object) +{ + PopplerFormField *field = POPPLER_FORM_FIELD(object); + + if (field->document) { + g_object_unref(field->document); + field->document = nullptr; + } + if (field->action) { + poppler_action_free(field->action); + field->action = nullptr; + } + field->widget = nullptr; + + G_OBJECT_CLASS(poppler_form_field_parent_class)->finalize(object); +} + +static void poppler_form_field_init(PopplerFormField *field) { } + +static void poppler_form_field_class_init(PopplerFormFieldClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->finalize = poppler_form_field_finalize; +} + +PopplerFormField *_poppler_form_field_new(PopplerDocument *document, FormWidget *field) +{ + PopplerFormField *poppler_field; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + g_return_val_if_fail(field != nullptr, NULL); + + poppler_field = POPPLER_FORM_FIELD(g_object_new(POPPLER_TYPE_FORM_FIELD, nullptr)); + + poppler_field->document = (PopplerDocument *)g_object_ref(document); + poppler_field->widget = field; + + return poppler_field; +} + +/* Public methods */ +/** + * poppler_form_field_get_field_type: + * @field: a #PopplerFormField + * + * Gets the type of @field + * + * Return value: #PopplerFormFieldType of @field + **/ +PopplerFormFieldType poppler_form_field_get_field_type(PopplerFormField *field) +{ + g_return_val_if_fail(POPPLER_IS_FORM_FIELD(field), POPPLER_FORM_FIELD_UNKNOWN); + + switch (field->widget->getType()) { + case formButton: + return POPPLER_FORM_FIELD_BUTTON; + case formText: + return POPPLER_FORM_FIELD_TEXT; + case formChoice: + return POPPLER_FORM_FIELD_CHOICE; + case formSignature: + return POPPLER_FORM_FIELD_SIGNATURE; + default: + g_warning("Unsupported Form Field Type"); + } + + return POPPLER_FORM_FIELD_UNKNOWN; +} + +/** + * poppler_form_field_get_id: + * @field: a #PopplerFormField + * + * Gets the id of @field + * + * Return value: the id of @field + **/ +gint poppler_form_field_get_id(PopplerFormField *field) +{ + g_return_val_if_fail(POPPLER_IS_FORM_FIELD(field), -1); + + return field->widget->getID(); +} + +/** + * poppler_form_field_get_font_size: + * @field: a #PopplerFormField + * + * Gets the font size of @field + * + * WARNING: This function always returns 0. Contact the poppler + * mailing list if you're interested in implementing it properly + * + * Return value: the font size of @field + **/ +gdouble poppler_form_field_get_font_size(PopplerFormField *field) +{ + g_return_val_if_fail(POPPLER_IS_FORM_FIELD(field), 0); + + return 0; +} + +/** + * poppler_form_field_is_read_only: + * @field: a #PopplerFormField + * + * Checks whether @field is read only + * + * Return value: %TRUE if @field is read only + **/ +gboolean poppler_form_field_is_read_only(PopplerFormField *field) +{ + g_return_val_if_fail(POPPLER_IS_FORM_FIELD(field), FALSE); + + return field->widget->isReadOnly(); +} + +/** + * poppler_form_field_get_action: + * @field: a #PopplerFormField + * + * Retrieves the action (#PopplerAction) that shall be + * performed when @field is activated, or %NULL + * + * Return value: (transfer none): the action to perform. The returned + * object is owned by @field and should not be freed + * + * Since: 0.18 + */ +PopplerAction *poppler_form_field_get_action(PopplerFormField *field) +{ + LinkAction *action; + + if (field->action) { + return field->action; + } + + action = field->widget->getActivationAction(); + if (!action) { + return nullptr; + } + + field->action = _poppler_action_new(field->document, action, nullptr); + + return field->action; +} + +/** + * poppler_form_field_get_additional_action: + * @field: a #PopplerFormField + * @type: the type of additional action + * + * Retrieves the action (#PopplerAction) that shall be performed when + * an additional action is triggered on @field, or %NULL. + * + * Return value: (transfer none): the action to perform. The returned + * object is owned by @field and should not be freed. + * + * + * Since: 0.72 + */ +PopplerAction *poppler_form_field_get_additional_action(PopplerFormField *field, PopplerAdditionalActionType type) +{ + Annot::FormAdditionalActionsType form_action; + PopplerAction **action; + + switch (type) { + case POPPLER_ADDITIONAL_ACTION_FIELD_MODIFIED: + form_action = Annot::actionFieldModified; + action = &field->field_modified_action; + break; + case POPPLER_ADDITIONAL_ACTION_FORMAT_FIELD: + form_action = Annot::actionFormatField; + action = &field->format_field_action; + break; + case POPPLER_ADDITIONAL_ACTION_VALIDATE_FIELD: + form_action = Annot::actionValidateField; + action = &field->validate_field_action; + break; + case POPPLER_ADDITIONAL_ACTION_CALCULATE_FIELD: + form_action = Annot::actionCalculateField; + action = &field->calculate_field_action; + break; + default: + g_return_val_if_reached(nullptr); + return nullptr; + } + + if (*action) { + return *action; + } + + std::unique_ptr<LinkAction> link_action = field->widget->getAdditionalAction(form_action); + if (!link_action) { + return nullptr; + } + + *action = _poppler_action_new(nullptr, link_action.get(), nullptr); + + return *action; +} + +/* Button Field */ +/** + * poppler_form_field_button_get_button_type: + * @field: a #PopplerFormField + * + * Gets the button type of @field + * + * Return value: #PopplerFormButtonType of @field + **/ +PopplerFormButtonType poppler_form_field_button_get_button_type(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formButton, POPPLER_FORM_BUTTON_PUSH); + + switch (static_cast<FormWidgetButton *>(field->widget)->getButtonType()) { + case formButtonPush: + return POPPLER_FORM_BUTTON_PUSH; + case formButtonCheck: + return POPPLER_FORM_BUTTON_CHECK; + case formButtonRadio: + return POPPLER_FORM_BUTTON_RADIO; + default: + g_assert_not_reached(); + } +} + +/** + * poppler_form_field_button_get_state: + * @field: a #PopplerFormField + * + * Queries a #PopplerFormField and returns its current state. Returns %TRUE if + * @field is pressed in and %FALSE if it is raised. + * + * Return value: current state of @field + **/ +gboolean poppler_form_field_button_get_state(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formButton, FALSE); + + return static_cast<FormWidgetButton *>(field->widget)->getState(); +} + +/** + * poppler_form_field_button_set_state: + * @field: a #PopplerFormField + * @state: %TRUE or %FALSE + * + * Sets the status of @field. Set to %TRUE if you want the #PopplerFormField + * to be 'pressed in', and %FALSE to raise it. + **/ +void poppler_form_field_button_set_state(PopplerFormField *field, gboolean state) +{ + g_return_if_fail(field->widget->getType() == formButton); + + static_cast<FormWidgetButton *>(field->widget)->setState((bool)state); +} + +/** + * poppler_form_field_get_partial_name: + * @field: a #PopplerFormField + * + * Gets the partial name of @field. + * + * Return value: a new allocated string. It must be freed with g_free() when done. + * + * Since: 0.16 + **/ +gchar *poppler_form_field_get_partial_name(PopplerFormField *field) +{ + const GooString *tmp; + + g_return_val_if_fail(POPPLER_IS_FORM_FIELD(field), NULL); + + tmp = field->widget->getPartialName(); + + return tmp ? _poppler_goo_string_to_utf8(tmp) : nullptr; +} + +/** + * poppler_form_field_get_mapping_name: + * @field: a #PopplerFormField + * + * Gets the mapping name of @field that is used when + * exporting interactive form field data from the document + * + * Return value: a new allocated string. It must be freed with g_free() when done. + * + * Since: 0.16 + **/ +gchar *poppler_form_field_get_mapping_name(PopplerFormField *field) +{ + const GooString *tmp; + + g_return_val_if_fail(POPPLER_IS_FORM_FIELD(field), NULL); + + tmp = field->widget->getMappingName(); + + return tmp ? _poppler_goo_string_to_utf8(tmp) : nullptr; +} + +/** + * poppler_form_field_get_name: + * @field: a #PopplerFormField + * + * Gets the fully qualified name of @field. It's constructed by concatenating + * the partial field names of the field and all of its ancestors. + * + * Return value: a new allocated string. It must be freed with g_free() when done. + * + * Since: 0.16 + **/ +gchar *poppler_form_field_get_name(PopplerFormField *field) +{ + GooString *tmp; + + g_return_val_if_fail(POPPLER_IS_FORM_FIELD(field), NULL); + + tmp = field->widget->getFullyQualifiedName(); + + return tmp ? _poppler_goo_string_to_utf8(tmp) : nullptr; +} + +/** + * poppler_form_field_get_alternate_ui_name: + * @field: a #PopplerFormField + * + * Gets the alternate ui name of @field. This name is also commonly + * used by pdf producers/readers to show it as a tooltip when @field area + * is hovered by a pointing device (eg. mouse). + * + * Return value: a new allocated string. It must be freed with g_free() when done. + * + * Since: 0.88 + **/ +gchar *poppler_form_field_get_alternate_ui_name(PopplerFormField *field) +{ + const GooString *tmp; + + g_return_val_if_fail(POPPLER_IS_FORM_FIELD(field), NULL); + + tmp = field->widget->getAlternateUiName(); + + return tmp ? _poppler_goo_string_to_utf8(tmp) : nullptr; +} + +/** + * PopplerCertificateInfo: + * + * PopplerCertificateInfo contains detailed info about a signing certificate. + * + * Since: 23.07.0 + */ +struct _PopplerCertificateInfo +{ + char *id; + char *subject_common_name; + char *subject_organization; + char *subject_email; + char *issuer_common_name; + char *issuer_organization; + char *issuer_email; + GDateTime *issued; + GDateTime *expires; +}; + +typedef struct _PopplerCertificateInfo PopplerCertificateInfo; + +G_DEFINE_BOXED_TYPE(PopplerCertificateInfo, poppler_certificate_info, poppler_certificate_info_copy, poppler_certificate_info_free) + +/** + * PopplerSignatureInfo: + * + * PopplerSignatureInfo contains detailed info about a signature + * contained in a form field. + * + * Since: 21.12.0 + **/ +struct _PopplerSignatureInfo +{ + PopplerSignatureStatus sig_status; + PopplerCertificateStatus cert_status; + char *signer_name; + GDateTime *local_signing_time; + PopplerCertificateInfo *certificate_info; +}; + +static PopplerSignatureInfo *_poppler_form_field_signature_validate(PopplerFormField *field, PopplerSignatureValidationFlags flags, gboolean force_revalidation, GError **error) +{ + FormFieldSignature *sig_field; + SignatureInfo *sig_info; + PopplerSignatureInfo *poppler_sig_info; + const X509CertificateInfo *certificate_info; + + if (poppler_form_field_get_field_type(field) != POPPLER_FORM_FIELD_SIGNATURE) { + g_set_error(error, POPPLER_ERROR, POPPLER_ERROR_INVALID, "Wrong FormField type"); + return nullptr; + } + + sig_field = static_cast<FormFieldSignature *>(field->widget->getField()); + + sig_info = sig_field->validateSignatureAsync(flags & POPPLER_SIGNATURE_VALIDATION_FLAG_VALIDATE_CERTIFICATE, force_revalidation, -1, flags & POPPLER_SIGNATURE_VALIDATION_FLAG_WITHOUT_OCSP_REVOCATION_CHECK, + flags & POPPLER_SIGNATURE_VALIDATION_FLAG_USE_AIA_CERTIFICATE_FETCH, {}); + CertificateValidationStatus certificateStatus = sig_field->validateSignatureResult(); + + poppler_sig_info = g_new0(PopplerSignatureInfo, 1); + switch (sig_info->getSignatureValStatus()) { + case SIGNATURE_VALID: + poppler_sig_info->sig_status = POPPLER_SIGNATURE_VALID; + break; + case SIGNATURE_INVALID: + poppler_sig_info->sig_status = POPPLER_SIGNATURE_INVALID; + break; + case SIGNATURE_DIGEST_MISMATCH: + poppler_sig_info->sig_status = POPPLER_SIGNATURE_DIGEST_MISMATCH; + break; + case SIGNATURE_DECODING_ERROR: + poppler_sig_info->sig_status = POPPLER_SIGNATURE_DECODING_ERROR; + break; + case SIGNATURE_GENERIC_ERROR: + poppler_sig_info->sig_status = POPPLER_SIGNATURE_GENERIC_ERROR; + break; + case SIGNATURE_NOT_FOUND: + poppler_sig_info->sig_status = POPPLER_SIGNATURE_NOT_FOUND; + break; + case SIGNATURE_NOT_VERIFIED: + poppler_sig_info->sig_status = POPPLER_SIGNATURE_NOT_VERIFIED; + break; + } + + switch (certificateStatus) { + case CERTIFICATE_TRUSTED: + poppler_sig_info->cert_status = POPPLER_CERTIFICATE_TRUSTED; + break; + case CERTIFICATE_UNTRUSTED_ISSUER: + poppler_sig_info->cert_status = POPPLER_CERTIFICATE_UNTRUSTED_ISSUER; + break; + case CERTIFICATE_UNKNOWN_ISSUER: + poppler_sig_info->cert_status = POPPLER_CERTIFICATE_UNKNOWN_ISSUER; + break; + case CERTIFICATE_REVOKED: + poppler_sig_info->cert_status = POPPLER_CERTIFICATE_REVOKED; + break; + case CERTIFICATE_EXPIRED: + poppler_sig_info->cert_status = POPPLER_CERTIFICATE_EXPIRED; + break; + case CERTIFICATE_GENERIC_ERROR: + poppler_sig_info->cert_status = POPPLER_CERTIFICATE_GENERIC_ERROR; + break; + case CERTIFICATE_NOT_VERIFIED: + poppler_sig_info->cert_status = POPPLER_CERTIFICATE_NOT_VERIFIED; + break; + } + + std::string signerName = sig_info->getSignerName(); + poppler_sig_info->signer_name = g_strdup(signerName.c_str()); + poppler_sig_info->local_signing_time = g_date_time_new_from_unix_local(sig_info->getSigningTime()); + + certificate_info = sig_info->getCertificateInfo(); + if (certificate_info != nullptr) { + const X509CertificateInfo::EntityInfo &subject_info = certificate_info->getSubjectInfo(); + const X509CertificateInfo::EntityInfo &issuer_info = certificate_info->getIssuerInfo(); + const X509CertificateInfo::Validity &validity = certificate_info->getValidity(); + + poppler_sig_info->certificate_info = poppler_certificate_info_new(); + poppler_sig_info->certificate_info->subject_common_name = g_strdup(subject_info.commonName.c_str()); + poppler_sig_info->certificate_info->subject_organization = g_strdup(subject_info.organization.c_str()); + poppler_sig_info->certificate_info->subject_email = g_strdup(subject_info.email.c_str()); + poppler_sig_info->certificate_info->issuer_common_name = g_strdup(issuer_info.commonName.c_str()); + poppler_sig_info->certificate_info->issuer_email = g_strdup(issuer_info.email.c_str()); + poppler_sig_info->certificate_info->issuer_organization = g_strdup(issuer_info.organization.c_str()); + poppler_sig_info->certificate_info->issued = g_date_time_new_from_unix_utc(validity.notBefore); + poppler_sig_info->certificate_info->expires = g_date_time_new_from_unix_utc(validity.notAfter); + } + + return poppler_sig_info; +} + +static void signature_validate_thread(GTask *task, gpointer source_object, gpointer task_data, GCancellable *cancellable) +{ + PopplerSignatureValidationFlags flags = (PopplerSignatureValidationFlags)GPOINTER_TO_INT(task_data); + PopplerSignatureInfo *signature_info; + PopplerFormField *field = (PopplerFormField *)source_object; + GError *error = nullptr; + + signature_info = _poppler_form_field_signature_validate(field, flags, FALSE, &error); + if (signature_info == nullptr && error != nullptr) { + g_task_return_error(task, error); + return; + } + + if (g_task_set_return_on_cancel(task, FALSE)) { + g_task_return_pointer(task, signature_info, (GDestroyNotify)poppler_signature_info_free); + } +} + +/** + * poppler_form_field_signature_validate_sync: + * @field: a #PopplerFormField that represents a signature annotation + * @flags: #PopplerSignatureValidationFlags flags influencing process of validation of the field signature + * @cancellable: (nullable): optional #GCancellable object + * @error: a #GError + * + * Synchronously validates the cryptographic signature contained in @signature_field. + * + * Return value: (transfer full): a #PopplerSignatureInfo structure containing signature metadata and validation status + * Free the returned structure with poppler_signature_info_free(). + * + * Since: 21.12.0 + **/ +PopplerSignatureInfo *poppler_form_field_signature_validate_sync(PopplerFormField *field, PopplerSignatureValidationFlags flags, GCancellable *cancellable, GError **error) +{ + PopplerSignatureInfo *signature_info; + GTask *task; + + g_return_val_if_fail(error == NULL || *error == NULL, NULL); + + task = g_task_new(field, cancellable, nullptr, nullptr); + g_task_set_task_data(task, GINT_TO_POINTER(flags), nullptr); + g_task_set_return_on_cancel(task, TRUE); + + g_task_run_in_thread_sync(task, signature_validate_thread); + + signature_info = (PopplerSignatureInfo *)g_task_propagate_pointer(task, error); + g_object_unref(task); + + return signature_info; +} + +/** + * poppler_form_field_signature_validate_async: + * @field: a #PopplerFormField that represents a signature annotation + * @flags: #PopplerSignatureValidationFlags flags influencing process of validation of the field signature + * @cancellable: (nullable): optional #GCancellable object + * @callback: (scope async): a #GAsyncReadyCallback to call when the signature is validated + * @user_data: (closure): the data to pass to callback function + * + * Asynchronously validates the cryptographic signature contained in @signature_field. + * + * Since: 21.12.0 + **/ +void poppler_form_field_signature_validate_async(PopplerFormField *field, PopplerSignatureValidationFlags flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) +{ + GTask *task; + + task = g_task_new(field, cancellable, callback, user_data); + g_task_set_task_data(task, GINT_TO_POINTER(flags), nullptr); + g_task_set_return_on_cancel(task, TRUE); + + g_task_run_in_thread(task, signature_validate_thread); + + g_object_unref(task); +} + +/** + * poppler_form_field_signature_validate_finish: + * @field: a #PopplerFormField that represents a signature annotation + * @result: a #GAsyncResult + * @error: a #GError + * + * Finishes validation of the cryptographic signature contained in @signature_field. + * See poppler_form_field_signature_validate_async(). + * + * Return value: (transfer full): a #PopplerSignatureInfo structure containing signature metadata and validation status + * Free the returned structure with poppler_signature_info_free(). + * + * Since: 21.12.0 + **/ +PopplerSignatureInfo *poppler_form_field_signature_validate_finish(PopplerFormField *field, GAsyncResult *result, GError **error) +{ + g_return_val_if_fail(g_task_is_valid(result, field), NULL); + + return (PopplerSignatureInfo *)g_task_propagate_pointer(G_TASK(result), error); +} + +G_DEFINE_BOXED_TYPE(PopplerSignatureInfo, poppler_signature_info, poppler_signature_info_copy, poppler_signature_info_free) + +/** + * poppler_signature_info_copy: + * @siginfo: a #PopplerSignatureInfo structure containing signature metadata and validation status + * + * Copies @siginfo, creating an identical #PopplerSignatureInfo. + * + * Return value: (transfer full): a new #PopplerSignatureInfo structure identical to @siginfo + * + * Since: 21.12.0 + **/ +PopplerSignatureInfo *poppler_signature_info_copy(const PopplerSignatureInfo *siginfo) +{ + PopplerSignatureInfo *new_info; + + g_return_val_if_fail(siginfo != NULL, NULL); + + new_info = g_new(PopplerSignatureInfo, 1); + new_info->sig_status = siginfo->sig_status; + new_info->cert_status = siginfo->cert_status; + new_info->signer_name = g_strdup(siginfo->signer_name); + new_info->local_signing_time = g_date_time_ref(siginfo->local_signing_time); + new_info->certificate_info = poppler_certificate_info_copy(siginfo->certificate_info); + + return new_info; +} + +/** + * poppler_signature_info_free: + * @siginfo: a #PopplerSignatureInfo structure containing signature metadata and validation status + * + * Frees @siginfo + * + * Since: 21.12.0 + **/ +void poppler_signature_info_free(PopplerSignatureInfo *siginfo) +{ + if (siginfo == nullptr) { + return; + } + + g_date_time_unref(siginfo->local_signing_time); + g_free(siginfo->signer_name); + poppler_certificate_info_free(siginfo->certificate_info); + g_free(siginfo); +} + +/** + * poppler_signature_info_get_signature_status: + * @siginfo: a #PopplerSignatureInfo + * + * Returns status of the signature for given PopplerSignatureInfo. + * + * Return value: signature status of the signature + * + * Since: 21.12.0 + **/ +PopplerSignatureStatus poppler_signature_info_get_signature_status(const PopplerSignatureInfo *siginfo) +{ + g_return_val_if_fail(siginfo != NULL, POPPLER_SIGNATURE_GENERIC_ERROR); + + return siginfo->sig_status; +} + +/** + * poppler_signature_info_get_certificate_info: + * @siginfo: a #PopplerSignatureInfo + * + * Returns PopplerCertificateInfo for given PopplerSignatureInfo. + * + * Return value: (transfer none): certificate info of the signature + * + * Since: 23.08.0 + **/ +PopplerCertificateInfo *poppler_signature_info_get_certificate_info(const PopplerSignatureInfo *siginfo) +{ + g_return_val_if_fail(siginfo != NULL, NULL); + + return siginfo->certificate_info; +} + +/** + * poppler_signature_info_get_certificate_status: + * @siginfo: a #PopplerSignatureInfo + * + * Returns status of the certificate for given PopplerSignatureInfo. + * + * Return value: certificate status of the signature + * + * Since: 21.12.0 + **/ +PopplerCertificateStatus poppler_signature_info_get_certificate_status(const PopplerSignatureInfo *siginfo) +{ + g_return_val_if_fail(siginfo != NULL, POPPLER_CERTIFICATE_GENERIC_ERROR); + + return siginfo->cert_status; +} + +/** + * poppler_signature_info_get_signer_name: + * @siginfo: a #PopplerSignatureInfo + * + * Returns name of signer for given PopplerSignatureInfo. + * + * Return value: (transfer none): A string. + * + * Since: 21.12.0 + **/ +const gchar *poppler_signature_info_get_signer_name(const PopplerSignatureInfo *siginfo) +{ + g_return_val_if_fail(siginfo != NULL, NULL); + + return siginfo->signer_name; +} + +/** + * poppler_signature_info_get_local_signing_time: + * @siginfo: a #PopplerSignatureInfo + * + * Returns local time of signing as GDateTime. This does not + * contain information about time zone since it has not been + * preserved during conversion. + * Do not modify returned value since it is internal to + * PopplerSignatureInfo. + * + * Return value: (transfer none): GDateTime + * + * Since: 21.12.0 + **/ +GDateTime *poppler_signature_info_get_local_signing_time(const PopplerSignatureInfo *siginfo) +{ + g_return_val_if_fail(siginfo != NULL, NULL); + + return siginfo->local_signing_time; +} + +/* Text Field */ +/** + * poppler_form_field_text_get_text_type: + * @field: a #PopplerFormField + * + * Gets the text type of @field. + * + * Return value: #PopplerFormTextType of @field + **/ +PopplerFormTextType poppler_form_field_text_get_text_type(PopplerFormField *field) +{ + FormWidgetText *text_field; + + g_return_val_if_fail(field->widget->getType() == formText, POPPLER_FORM_TEXT_NORMAL); + + text_field = static_cast<FormWidgetText *>(field->widget); + + if (text_field->isMultiline()) { + return POPPLER_FORM_TEXT_MULTILINE; + } else if (text_field->isFileSelect()) { + return POPPLER_FORM_TEXT_FILE_SELECT; + } + + return POPPLER_FORM_TEXT_NORMAL; +} + +/** + * poppler_form_field_text_get_text: + * @field: a #PopplerFormField + * + * Retrieves the contents of @field. + * + * Return value: a new allocated string. It must be freed with g_free() when done. + **/ +gchar *poppler_form_field_text_get_text(PopplerFormField *field) +{ + FormWidgetText *text_field; + const GooString *tmp; + + g_return_val_if_fail(field->widget->getType() == formText, NULL); + + text_field = static_cast<FormWidgetText *>(field->widget); + tmp = text_field->getContent(); + + return tmp ? _poppler_goo_string_to_utf8(tmp) : nullptr; +} + +/** + * poppler_form_field_text_set_text: + * @field: a #PopplerFormField + * @text: the new text + * + * Sets the text in @field to the given value, replacing the current contents. + **/ +void poppler_form_field_text_set_text(PopplerFormField *field, const gchar *text) +{ + GooString *goo_tmp; + gchar *tmp; + gsize length = 0; + + g_return_if_fail(field->widget->getType() == formText); + + tmp = text ? g_convert(text, -1, "UTF-16BE", "UTF-8", nullptr, &length, nullptr) : nullptr; + goo_tmp = new GooString(tmp, length); + g_free(tmp); + static_cast<FormWidgetText *>(field->widget)->setContent(goo_tmp); + delete goo_tmp; +} + +/** + * poppler_form_field_text_get_max_len: + * @field: a #PopplerFormField + * + * Retrieves the maximum allowed length of the text in @field + * + * Return value: the maximum allowed number of characters in @field, or -1 if there is no maximum. + **/ +gint poppler_form_field_text_get_max_len(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formText, 0); + + return static_cast<FormWidgetText *>(field->widget)->getMaxLen(); +} + +/** + * poppler_form_field_text_do_spell_check: + * @field: a #PopplerFormField + * + * Checks whether spell checking should be done for the contents of @field + * + * Return value: %TRUE if spell checking should be done for @field + **/ +gboolean poppler_form_field_text_do_spell_check(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formText, FALSE); + + return !static_cast<FormWidgetText *>(field->widget)->noSpellCheck(); +} + +gboolean poppler_form_field_text_do_scroll(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formText, FALSE); + + return !static_cast<FormWidgetText *>(field->widget)->noScroll(); +} + +/** + * poppler_form_field_text_is_rich_text: + * @field: a #PopplerFormField + * + * Checks whether the contents of @field are rich text + * + * Return value: %TRUE if the contents of @field are rich text + **/ +gboolean poppler_form_field_text_is_rich_text(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formText, FALSE); + + return static_cast<FormWidgetText *>(field->widget)->isRichText(); +} + +/** + * poppler_form_field_text_is_password: + * @field: a #PopplerFormField + * + * Checks whether content of @field is a password and it must be hidden + * + * Return value: %TRUE if the content of @field is a password + **/ +gboolean poppler_form_field_text_is_password(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formText, FALSE); + + return static_cast<FormWidgetText *>(field->widget)->isPassword(); +} + +/* Choice Field */ +/** + * poppler_form_field_choice_get_choice_type: + * @field: a #PopplerFormField + * + * Gets the choice type of @field + * + * Return value: #PopplerFormChoiceType of @field + **/ +PopplerFormChoiceType poppler_form_field_choice_get_choice_type(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formChoice, POPPLER_FORM_CHOICE_COMBO); + + if (static_cast<FormWidgetChoice *>(field->widget)->isCombo()) { + return POPPLER_FORM_CHOICE_COMBO; + } else { + return POPPLER_FORM_CHOICE_LIST; + } +} + +/** + * poppler_form_field_choice_is_editable: + * @field: a #PopplerFormField + * + * Checks whether @field is editable + * + * Return value: %TRUE if @field is editable + **/ +gboolean poppler_form_field_choice_is_editable(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formChoice, FALSE); + + return static_cast<FormWidgetChoice *>(field->widget)->hasEdit(); +} + +/** + * poppler_form_field_choice_can_select_multiple: + * @field: a #PopplerFormField + * + * Checks whether @field allows multiple choices to be selected + * + * Return value: %TRUE if @field allows multiple choices to be selected + **/ +gboolean poppler_form_field_choice_can_select_multiple(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formChoice, FALSE); + + return static_cast<FormWidgetChoice *>(field->widget)->isMultiSelect(); +} + +/** + * poppler_form_field_choice_do_spell_check: + * @field: a #PopplerFormField + * + * Checks whether spell checking should be done for the contents of @field + * + * Return value: %TRUE if spell checking should be done for @field + **/ +gboolean poppler_form_field_choice_do_spell_check(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formChoice, FALSE); + + return !static_cast<FormWidgetChoice *>(field->widget)->noSpellCheck(); +} + +gboolean poppler_form_field_choice_commit_on_change(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formChoice, FALSE); + + return static_cast<FormWidgetChoice *>(field->widget)->commitOnSelChange(); +} + +/** + * poppler_form_field_choice_get_n_items: + * @field: a #PopplerFormField + * + * Returns the number of items on @field + * + * Return value: the number of items on @field + **/ +gint poppler_form_field_choice_get_n_items(PopplerFormField *field) +{ + g_return_val_if_fail(field->widget->getType() == formChoice, -1); + + return static_cast<FormWidgetChoice *>(field->widget)->getNumChoices(); +} + +/** + * poppler_form_field_choice_get_item: + * @field: a #PopplerFormField + * @index: the index of the item + * + * Returns the contents of the item on @field at the given index + * + * Return value: a new allocated string. It must be freed with g_free() when done. + **/ +gchar *poppler_form_field_choice_get_item(PopplerFormField *field, gint index) +{ + const GooString *tmp; + + g_return_val_if_fail(field->widget->getType() == formChoice, NULL); + g_return_val_if_fail(index >= 0 && index < poppler_form_field_choice_get_n_items(field), NULL); + + tmp = static_cast<FormWidgetChoice *>(field->widget)->getChoice(index); + return tmp ? _poppler_goo_string_to_utf8(tmp) : nullptr; +} + +/** + * poppler_form_field_choice_is_item_selected: + * @field: a #PopplerFormField + * @index: the index of the item + * + * Checks whether the item at the given index on @field is currently selected + * + * Return value: %TRUE if item at @index is currently selected + **/ +gboolean poppler_form_field_choice_is_item_selected(PopplerFormField *field, gint index) +{ + g_return_val_if_fail(field->widget->getType() == formChoice, FALSE); + g_return_val_if_fail(index >= 0 && index < poppler_form_field_choice_get_n_items(field), FALSE); + + return static_cast<FormWidgetChoice *>(field->widget)->isSelected(index); +} + +/** + * poppler_form_field_choice_select_item: + * @field: a #PopplerFormField + * @index: the index of the item + * + * Selects the item at the given index on @field + **/ +void poppler_form_field_choice_select_item(PopplerFormField *field, gint index) +{ + g_return_if_fail(field->widget->getType() == formChoice); + g_return_if_fail(index >= 0 && index < poppler_form_field_choice_get_n_items(field)); + + static_cast<FormWidgetChoice *>(field->widget)->select(index); +} + +/** + * poppler_form_field_choice_unselect_all: + * @field: a #PopplerFormField + * + * Unselects all the items on @field + **/ +void poppler_form_field_choice_unselect_all(PopplerFormField *field) +{ + g_return_if_fail(field->widget->getType() == formChoice); + + static_cast<FormWidgetChoice *>(field->widget)->deselectAll(); +} + +/** + * poppler_form_field_choice_toggle_item: + * @field: a #PopplerFormField + * @index: the index of the item + * + * Changes the state of the item at the given index + **/ +void poppler_form_field_choice_toggle_item(PopplerFormField *field, gint index) +{ + g_return_if_fail(field->widget->getType() == formChoice); + g_return_if_fail(index >= 0 && index < poppler_form_field_choice_get_n_items(field)); + + static_cast<FormWidgetChoice *>(field->widget)->toggle(index); +} + +/** + * poppler_form_field_choice_set_text: + * @field: a #PopplerFormField + * @text: the new text + * + * Sets the text in @field to the given value, replacing the current contents + **/ +void poppler_form_field_choice_set_text(PopplerFormField *field, const gchar *text) +{ + GooString *goo_tmp; + gchar *tmp; + gsize length = 0; + + g_return_if_fail(field->widget->getType() == formChoice); + + tmp = text ? g_convert(text, -1, "UTF-16BE", "UTF-8", nullptr, &length, nullptr) : nullptr; + goo_tmp = new GooString(tmp, length); + g_free(tmp); + static_cast<FormWidgetChoice *>(field->widget)->setEditChoice(goo_tmp); + delete goo_tmp; +} + +/** + * poppler_form_field_choice_get_text: + * @field: a #PopplerFormField + * + * Retrieves the contents of @field. + * + * Return value: a new allocated string. It must be freed with g_free() when done. + **/ +gchar *poppler_form_field_choice_get_text(PopplerFormField *field) +{ + const GooString *tmp; + + g_return_val_if_fail(field->widget->getType() == formChoice, NULL); + + tmp = static_cast<FormWidgetChoice *>(field->widget)->getEditChoice(); + return tmp ? _poppler_goo_string_to_utf8(tmp) : nullptr; +} + +/* Signing Data */ + +struct _PopplerSigningData +{ + char *destination_filename; + PopplerCertificateInfo *certificate_info; + int page; + + char *signature_text; + char *signature_text_left; + PopplerRectangle signature_rect; + + PopplerColor font_color; + gdouble font_size; + gdouble left_font_size; + + PopplerColor border_color; + gdouble border_width; + + PopplerColor background_color; + + char *field_partial_name; + char *reason; + char *location; + char *image_path; + char *password; + char *document_owner_password; + char *document_user_password; +}; + +typedef struct _PopplerSigningData PopplerSigningData; + +G_DEFINE_BOXED_TYPE(PopplerSigningData, poppler_signing_data, poppler_signing_data_copy, poppler_signing_data_free) + +/** + * poppler_signing_data_new: + * + * Creates a new #PopplerSigningData with default content. + * + * Return value: a new #PopplerSigningData. It must be freed with poppler_signing_data_free() when done. + * + * Since: 23.07.0 + **/ +PopplerSigningData *poppler_signing_data_new(void) +{ + PopplerSigningData *data = (PopplerSigningData *)g_malloc0(sizeof(PopplerSigningData)); + + data->password = g_strdup(""); + data->page = 0; + + data->font_size = 10.0; + data->left_font_size = 20.0; + data->border_width = 1.5; + + /* Grey background */ + auto background_color = PopplerColor(); + background_color.red = 0xEF; + background_color.green = 0xEF; + background_color.blue = 0xEF; + poppler_signing_data_set_background_color(data, &background_color); + + /* Red border color */ + auto border_color = PopplerColor(); + border_color.red = 0xFF; + border_color.green = 0x00; + border_color.blue = 0x00; + poppler_signing_data_set_border_color(data, &border_color); + + /* Red font color */ + auto font_color = PopplerColor(); + font_color.red = 0xFF; + font_color.green = 0x00; + border_color.blue = 0x00; + poppler_signing_data_set_font_color(data, &font_color); + + return data; +} + +/** + * poppler_signing_data_copy: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Copies @signing_data, creating an identical #PopplerSigningData. + * + * Return value: (transfer full): a new #PopplerSigningData structure identical to @signing_data + * + * Since: 23.07.0 + **/ +PopplerSigningData *poppler_signing_data_copy(const PopplerSigningData *signing_data) +{ + PopplerSigningData *data; + + g_return_val_if_fail(signing_data != nullptr, nullptr); + + data = (PopplerSigningData *)g_malloc0(sizeof(PopplerSigningData)); + data->destination_filename = g_strdup(signing_data->destination_filename); + data->certificate_info = poppler_certificate_info_copy(signing_data->certificate_info); + data->page = signing_data->page; + + data->signature_text = g_strdup(signing_data->signature_text); + data->signature_text_left = g_strdup(signing_data->signature_text_left); + memcpy(&data->signature_rect, &signing_data->signature_rect, sizeof(PopplerRectangle)); + + memcpy(&data->font_color, &signing_data->font_color, sizeof(PopplerColor)); + data->font_size = signing_data->font_size; + data->left_font_size = signing_data->left_font_size; + + memcpy(&data->border_color, &signing_data->border_color, sizeof(PopplerColor)); + data->border_width = signing_data->border_width; + + memcpy(&data->background_color, &signing_data->background_color, sizeof(PopplerColor)); + + data->field_partial_name = g_strdup(signing_data->field_partial_name); + data->reason = g_strdup(signing_data->reason); + data->location = g_strdup(signing_data->location); + data->image_path = g_strdup(signing_data->image_path); + data->password = g_strdup(signing_data->password); + data->document_owner_password = g_strdup(signing_data->document_owner_password); + data->document_user_password = g_strdup(signing_data->document_user_password); + + return data; +} + +/** + * poppler_signing_data_free: + * @signing_data: (nullable): a #PopplerSigningData structure containing signing data + * + * Frees @signing_data + * + * Since: 23.07.0 + **/ +void poppler_signing_data_free(PopplerSigningData *signing_data) +{ + if (!signing_data) { + return; + } + + g_clear_pointer(&signing_data->destination_filename, g_free); + g_clear_pointer(&signing_data->certificate_info, poppler_certificate_info_free); + g_clear_pointer(&signing_data->signature_text, g_free); + g_clear_pointer(&signing_data->signature_text_left, g_free); + g_clear_pointer(&signing_data->field_partial_name, g_free); + g_clear_pointer(&signing_data->reason, g_free); + g_clear_pointer(&signing_data->location, g_free); + g_clear_pointer(&signing_data->image_path, g_free); + + if (signing_data->password) { +#ifdef HAVE_EXPLICIT_BZERO + explicit_bzero(signing_data->password, strlen(signing_data->password)); +#else + memset(signing_data->password, 0, strlen(signing_data->password)); +#endif + g_clear_pointer(&signing_data->password, g_free); + } + + if (signing_data->document_owner_password) { +#ifdef HAVE_EXPLICIT_BZERO + explicit_bzero(signing_data->document_owner_password, strlen(signing_data->document_owner_password)); +#else + memset(signing_data->document_owner_password, 0, strlen(signing_data->document_owner_password)); +#endif + g_clear_pointer(&signing_data->document_owner_password, g_free); + } + + if (signing_data->document_user_password) { +#ifdef HAVE_EXPLICIT_BZERO + explicit_bzero(signing_data->document_user_password, strlen(signing_data->document_user_password)); +#else + memset(signing_data->document_user_password, 0, strlen(signing_data->document_user_password)); +#endif + g_clear_pointer(&signing_data->document_user_password, g_free); + } + + g_free(signing_data); +} + +/** + * poppler_signing_data_set_destination_filename: + * @signing_data: a #PopplerSigningData structure containing signing data + * @filename: destination filename + * + * Set destination file name. + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_destination_filename(PopplerSigningData *signing_data, const gchar *filename) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(filename != nullptr); + + if (signing_data->destination_filename == filename) { + return; + } + + g_clear_pointer(&signing_data->destination_filename, g_free); + signing_data->destination_filename = g_strdup(filename); +} + +/** + * poppler_signing_data_get_destination_filename: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get destination file name. + * + * Return value: destination filename + * + * Since: 23.07.0 + **/ +const gchar *poppler_signing_data_get_destination_filename(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + + return signing_data->destination_filename; +} + +/** + * poppler_signing_data_set_certificate_info: + * @signing_data: a #PopplerSigningData structure containing signing data + * @certificate_info: a #PopplerCertificateInfo + * + * Set certification information. + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_certificate_info(PopplerSigningData *signing_data, const PopplerCertificateInfo *certificate_info) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(certificate_info != nullptr); + + if (signing_data->certificate_info == certificate_info) { + return; + } + + g_clear_pointer(&signing_data->certificate_info, poppler_certificate_info_free); + signing_data->certificate_info = poppler_certificate_info_copy(certificate_info); +} + +/** + * poppler_signing_data_get_certificate_info: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get certification information. + * + * Return value: a #PopplerCertificateInfo + * + * Since: 23.07.0 + **/ +const PopplerCertificateInfo *poppler_signing_data_get_certificate_info(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + return signing_data->certificate_info; +} + +/** + * poppler_signing_data_set_page: + * @signing_data: a #PopplerSigningData structure containing signing data + * @page: a page number + * + * Set page (>=0). + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_page(PopplerSigningData *signing_data, int page) +{ + g_return_if_fail(signing_data != nullptr); + + if (page < 0) { + return; + } + + signing_data->page = page; +} + +/** + * poppler_signing_data_get_page: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get page. + * + * Return value: page number + * + * Since: 23.07.0 + **/ +int poppler_signing_data_get_page(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, 0); + return signing_data->page; +} + +/** + * poppler_signing_data_set_signature_text: + * @signing_data: a #PopplerSigningData structure containing signing data + * @signature_text: text to show as main signature + * + * Set signature text. + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_signature_text(PopplerSigningData *signing_data, const gchar *signature_text) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(signature_text != nullptr); + + if (signing_data->signature_text == signature_text) { + return; + } + + g_clear_pointer(&signing_data->signature_text, g_free); + signing_data->signature_text = g_strdup(signature_text); +} + +/** + * poppler_signing_data_get_signature_text: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get signature text. + * + * Return value: signature text + * + * Since: 23.07.0 + **/ +const gchar *poppler_signing_data_get_signature_text(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + return signing_data->signature_text; +} + +/** + * poppler_signing_data_set_signature_text_left: + * @signing_data: a #PopplerSigningData structure containing signing data + * @signature_text_left: text to show as small left signature + * + * Set small signature text on the left hand. + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_signature_text_left(PopplerSigningData *signing_data, const gchar *signature_text_left) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(signature_text_left != nullptr); + + if (signing_data->signature_text_left == signature_text_left) { + return; + } + + g_clear_pointer(&signing_data->signature_text_left, g_free); + signing_data->signature_text_left = g_strdup(signature_text_left); +} + +/** + * poppler_signing_data_get_signature_text_left: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get signature text left. + * + * Return value: signature text left + * + * Since: 23.07.0 + **/ +const gchar *poppler_signing_data_get_signature_text_left(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + return signing_data->signature_text_left; +} + +/** + * poppler_signing_data_set_signature_rectangle: + * @signing_data: a #PopplerSigningData structure containing signing data + * @signature_rect: a #PopplerRectangle where signature should be shown + * + * Set signature rectangle. + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_signature_rectangle(PopplerSigningData *signing_data, const PopplerRectangle *signature_rect) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(signature_rect != nullptr); + + memcpy(&signing_data->signature_rect, signature_rect, sizeof(PopplerRectangle)); +} + +/** + * poppler_signing_data_get_signature_rectangle: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get signature rectangle. + * + * Return value: a #PopplerRectangle + * + * Since: 23.07.0 + **/ +const PopplerRectangle *poppler_signing_data_get_signature_rectangle(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + return &signing_data->signature_rect; +} + +/** + * poppler_signing_data_set_font_color: + * @signing_data: a #PopplerSigningData structure containing signing data + * @font_color: a #PopplerColor to be used as signature font color + * + * Set signature font color. + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_font_color(PopplerSigningData *signing_data, const PopplerColor *font_color) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(font_color != nullptr); + + memcpy(&signing_data->font_color, font_color, sizeof(PopplerColor)); +} + +/** + * poppler_signing_data_get_font_color: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get signature font color. + * + * Return value: a #PopplerColor + * + * Since: 23.07.0 + **/ +const PopplerColor *poppler_signing_data_get_font_color(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + return &signing_data->font_color; +} + +/** + * poppler_signing_data_set_font_size: + * @signing_data: a #PopplerSigningData structure containing signing data + * @font_size: signature font size + * + * Set signature font size (>0). + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_font_size(PopplerSigningData *signing_data, gdouble font_size) +{ + g_return_if_fail(signing_data != nullptr); + + if (font_size <= 0) { + return; + } + + signing_data->font_size = font_size; +} + +/** + * poppler_signing_data_get_font_size: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get signature font size. + * + * Return value: font size + * + * Since: 23.07.0 + **/ +gdouble poppler_signing_data_get_font_size(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, 20.0f); + return signing_data->font_size; +} + +/** + * poppler_signing_data_set_left_font_size: + * @signing_data: a #PopplerSigningData structure containing signing data + * @font_size: signature font size + * + * Set signature left font size (> 0). + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_left_font_size(PopplerSigningData *signing_data, gdouble left_font_size) +{ + g_return_if_fail(signing_data != nullptr); + + if (left_font_size <= 0) { + return; + } + + signing_data->left_font_size = left_font_size; +} + +/** + * poppler_signing_data_get_left_font_size: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get signature left font size. + * + * Return value: left font size + * + * Since: 23.07.0 + **/ +gdouble poppler_signing_data_get_left_font_size(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, 12.0); + return signing_data->left_font_size; +} + +/** + * poppler_signing_data_set_border_color: + * @signing_data: a #PopplerSigningData structure containing signing data + * @border_color: a #PopplerColor to be used for signature border + * + * Set signature border color. + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_border_color(PopplerSigningData *signing_data, const PopplerColor *border_color) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(border_color != nullptr); + + memcpy(&signing_data->border_color, border_color, sizeof(PopplerColor)); +} + +/** + * poppler_signing_data_get_border_color: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get signature border color. + * + * Return value: a #PopplerColor + * + * Since: 23.07.0 + **/ +const PopplerColor *poppler_signing_data_get_border_color(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + return &signing_data->border_color; +} + +/** + * poppler_signing_data_set_border_width: + * @signing_data: a #PopplerSigningData structure containing signing data + * @border_width: border width + * + * Set signature border width. + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_border_width(PopplerSigningData *signing_data, gdouble border_width) +{ + g_return_if_fail(signing_data != nullptr); + + if (border_width < 0) { + return; + } + + signing_data->border_width = border_width; +} + +/** + * poppler_signing_data_get_border_width: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get signature border width. + * + * Return value: border width + * + * Since: 23.07.0 + **/ +gdouble poppler_signing_data_get_border_width(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, 12); + return signing_data->border_width; +} + +/** + * poppler_signing_data_set_background_color: + * @signing_data: a #PopplerSigningData structure containing signing data + * @background_color: a #PopplerColor to be used for signature background + * + * Set signature background color. + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_background_color(PopplerSigningData *signing_data, const PopplerColor *background_color) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(background_color != nullptr); + + memcpy(&signing_data->background_color, background_color, sizeof(PopplerColor)); +} + +/** + * poppler_signing_data_get_background_color: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get signature background color. + * + * Return value: a #PopplerColor + * + * Since: 23.07.0 + **/ +const PopplerColor *poppler_signing_data_get_background_color(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + return &signing_data->background_color; +} + +/** + * poppler_signing_data_set_field_partial_name: + * @signing_data: a #PopplerSigningData structure containing signing data + * @field_partial_name: a field partial name + * + * Set field partial name (existing field id or a new one) where signature is placed. + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_field_partial_name(PopplerSigningData *signing_data, const gchar *field_partial_name) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(field_partial_name != nullptr); + + g_clear_pointer(&signing_data->field_partial_name, g_free); + signing_data->field_partial_name = g_strdup(field_partial_name); +} + +/** + * poppler_signing_data_get_field_partial_name: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get field partial name. + * + * Return value: field partial name + * + * Since: 23.07.0 + **/ +const gchar *poppler_signing_data_get_field_partial_name(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, ""); + return signing_data->field_partial_name; +} + +/** + * poppler_signing_data_set_reason: + * @signing_data: a #PopplerSigningData structure containing signing data + * @reason: a reason + * + * Set reason for signature (e.g. I'm approver). + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_reason(PopplerSigningData *signing_data, const gchar *reason) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(reason != nullptr); + + if (signing_data->reason == reason) { + return; + } + + g_clear_pointer(&signing_data->reason, g_free); + signing_data->reason = g_strdup(reason); +} + +/** + * poppler_signing_data_get_reason: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get reason. + * + * Return value: reason + * + * Since: 23.07.0 + **/ +const gchar *poppler_signing_data_get_reason(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + return signing_data->reason; +} + +/** + * poppler_signing_data_set_location: + * @signing_data: a #PopplerSigningData structure containing signing data + * @location: a location + * + * Set signature location (e.g. "At my desk"). + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_location(PopplerSigningData *signing_data, const gchar *location) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(location != nullptr); + + if (signing_data->location == location) { + return; + } + + g_clear_pointer(&signing_data->location, g_free); + signing_data->location = g_strdup(location); +} + +/** + * poppler_signing_data_get_location: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get location. + * + * Return value: location + * + * Since: 23.07.0 + **/ +const gchar *poppler_signing_data_get_location(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + return signing_data->location; +} + +/** + * poppler_signing_data_set_image_path: + * @signing_data: a #PopplerSigningData structure containing signing data + * @image_path: signature image path + * + * Set signature background (watermark) image path. + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_image_path(PopplerSigningData *signing_data, const gchar *image_path) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(image_path != nullptr); + + if (signing_data->image_path == image_path) { + return; + } + + g_clear_pointer(&signing_data->image_path, g_free); + signing_data->image_path = g_strdup(image_path); +} + +/** + * poppler_signing_data_get_image_path: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get image path. + * + * Return value: image path + * + * Since: 23.07.0 + **/ +const gchar *poppler_signing_data_get_image_path(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + return signing_data->image_path; +} + +/** + * poppler_signing_data_set_password: + * @signing_data: a #PopplerSigningData structure containing signing data + * @password: a password + * + * Set password for the signing key. + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_password(PopplerSigningData *signing_data, const gchar *password) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(password != nullptr); + + if (signing_data->password == password) { + return; + } + + g_clear_pointer(&signing_data->password, g_free); + signing_data->password = g_strdup(password); +} + +/** + * poppler_signing_data_get_password: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get signing key password. + * + * Return value: password + * + * Since: 23.07.0 + **/ +const gchar *poppler_signing_data_get_password(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + return signing_data->password; +} + +/** + * poppler_signing_data_set_document_owner_password: + * @signing_data: a #PopplerSigningData structure containing signing data + * @document_owner_password: document owner password + * + * Set document owner password (for encrypted files). + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_document_owner_password(PopplerSigningData *signing_data, const gchar *document_owner_password) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(document_owner_password != nullptr); + + if (signing_data->document_owner_password == document_owner_password) { + return; + } + + g_clear_pointer(&signing_data->document_owner_password, g_free); + signing_data->document_owner_password = g_strdup(document_owner_password); +} + +/** + * poppler_signing_data_get_document_owner_password: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get document owner password. + * + * Return value: document owner password (for encrypted files) + * + * Since: 23.07.0 + **/ +const gchar *poppler_signing_data_get_document_owner_password(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, nullptr); + return signing_data->document_owner_password; +} + +/** + * poppler_signing_data_set_document_user_password: + * @signing_data: a #PopplerSigningData structure containing signing data + * @document_user_password: document user password + * + * Set document user password (for encrypted files). + * + * Since: 23.07.0 + **/ +void poppler_signing_data_set_document_user_password(PopplerSigningData *signing_data, const gchar *document_user_password) +{ + g_return_if_fail(signing_data != nullptr); + g_return_if_fail(document_user_password != nullptr); + + if (signing_data->document_user_password == document_user_password) { + return; + } + + g_clear_pointer(&signing_data->document_user_password, g_free); + signing_data->document_user_password = g_strdup(document_user_password); +} + +/** + * poppler_signing_data_get_document_user_password: + * @signing_data: a #PopplerSigningData structure containing signing data + * + * Get document user password. + * + * Return value: document user password (for encrypted files) + * + * Since: 23.07.0 + **/ +const gchar *poppler_signing_data_get_document_user_password(const PopplerSigningData *signing_data) +{ + g_return_val_if_fail(signing_data != nullptr, ""); + return signing_data->document_user_password; +} + +/* Certificate Information */ + +/** + * poppler_certificate_info_new: + * + * Creates a new #PopplerCertificateInfo + * + * Return value: a new #PopplerCertificateInfo. It must be freed with poppler_certificate_info_free() when done. + * + * Since: 23.07.0 + **/ +PopplerCertificateInfo *poppler_certificate_info_new(void) +{ + return (PopplerCertificateInfo *)g_malloc0(sizeof(PopplerCertificateInfo)); +} + +/** + * poppler_certificate_info_get_id: + * @certificate_info: a #PopplerCertificateInfo structure containing certificate information + * + * Get certificate nick name + * + * Return value: certificate nick name + * + * Since: 23.07.0 + **/ +const char *poppler_certificate_info_get_id(const PopplerCertificateInfo *certificate_info) +{ + g_return_val_if_fail(certificate_info != nullptr, nullptr); + return certificate_info->id; +} + +/** + * poppler_certificate_info_get_subject_common_name: + * @certificate_info: a #PopplerCertificateInfo structure containing certificate information + * + * Get certificate subject common name + * + * Return value: certificate subject common name + * + * Since: 23.07.0 + **/ +const char *poppler_certificate_info_get_subject_common_name(const PopplerCertificateInfo *certificate_info) +{ + g_return_val_if_fail(certificate_info != nullptr, nullptr); + return certificate_info->subject_common_name; +} + +/** + * poppler_certificate_info_get_subject_organization: + * @certificate_info: a #PopplerCertificateInfo structure containing certificate information + * + * Get certificate subject organization + * + * Return value: certificate subject organization + * + * Since: 23.08.0 + **/ +const char *poppler_certificate_info_get_subject_organization(const PopplerCertificateInfo *certificate_info) +{ + g_return_val_if_fail(certificate_info != nullptr, nullptr); + return certificate_info->subject_organization; +} + +/** + * poppler_certificate_info_get_subject_email: + * @certificate_info: a #PopplerCertificateInfo structure containing certificate information + * + * Get certificate subject email + * + * Return value: certificate subject email + * + * Since: 23.08.0 + **/ +const char *poppler_certificate_info_get_subject_email(const PopplerCertificateInfo *certificate_info) +{ + g_return_val_if_fail(certificate_info != nullptr, nullptr); + return certificate_info->subject_email; +} + +/** + * poppler_certificate_info_get_issuer_common_name: + * @certificate_info: a #PopplerCertificateInfo structure containing certificate information + * + * Get certificate issuer common name + * + * Return value: certificate issuer common name + * + * Since: 23.08.0 + **/ +const char *poppler_certificate_info_get_issuer_common_name(const PopplerCertificateInfo *certificate_info) +{ + g_return_val_if_fail(certificate_info != nullptr, nullptr); + return certificate_info->issuer_common_name; +} + +/** + * poppler_certificate_info_get_issuer_organization: + * @certificate_info: a #PopplerCertificateInfo structure containing certificate information + * + * Get certificate issuer organization + * + * Return value: certificate issuer organization + * + * Since: 23.08.0 + **/ +const char *poppler_certificate_info_get_issuer_organization(const PopplerCertificateInfo *certificate_info) +{ + g_return_val_if_fail(certificate_info != nullptr, nullptr); + return certificate_info->issuer_organization; +} + +/** + * poppler_certificate_info_get_issuer_email: + * @certificate_info: a #PopplerCertificateInfo structure containing certificate information + * + * Get certificate issuer email + * + * Return value: certificate issuer email + * + * Since: 23.08.0 + **/ +const char *poppler_certificate_info_get_issuer_email(const PopplerCertificateInfo *certificate_info) +{ + g_return_val_if_fail(certificate_info != nullptr, nullptr); + return certificate_info->issuer_email; +} + +/** + * poppler_certificate_info_get_issuance_time: + * @certificate_info: a #PopplerCertificateInfo structure containing certificate information + * + * Get certificate issuance time + * + * Return value: (transfer none): certificate issuance time + * + * Since: 23.08.0 + **/ +GDateTime *poppler_certificate_info_get_issuance_time(const PopplerCertificateInfo *certificate_info) +{ + g_return_val_if_fail(certificate_info != nullptr, nullptr); + return certificate_info->issued; +} + +/** + * poppler_certificate_info_get_expiration_time: + * @certificate_info: a #PopplerCertificateInfo structure containing certificate information + * + * Get certificate expiration time + * + * Return value: (transfer none): certificate expiration time + * + * Since: 23.08.0 + **/ +GDateTime *poppler_certificate_info_get_expiration_time(const PopplerCertificateInfo *certificate_info) +{ + g_return_val_if_fail(certificate_info != nullptr, nullptr); + return certificate_info->expires; +} + +static PopplerCertificateInfo *create_certificate_info(const X509CertificateInfo *ci) +{ + PopplerCertificateInfo *certificate_info; + + g_return_val_if_fail(ci != nullptr, nullptr); + + const X509CertificateInfo::EntityInfo &subject_info = ci->getSubjectInfo(); + const X509CertificateInfo::EntityInfo &issuer_info = ci->getIssuerInfo(); + const X509CertificateInfo::Validity &validity = ci->getValidity(); + + certificate_info = poppler_certificate_info_new(); + certificate_info->id = g_strdup(ci->getNickName().c_str()); + certificate_info->subject_common_name = g_strdup(subject_info.commonName.c_str()); + certificate_info->subject_organization = g_strdup(subject_info.organization.c_str()); + certificate_info->subject_email = g_strdup(subject_info.email.c_str()); + certificate_info->issuer_common_name = g_strdup(issuer_info.commonName.c_str()); + certificate_info->issuer_organization = g_strdup(issuer_info.organization.c_str()); + certificate_info->issuer_email = g_strdup(issuer_info.email.c_str()); + certificate_info->issued = g_date_time_new_from_unix_utc(validity.notBefore); + certificate_info->expires = g_date_time_new_from_unix_utc(validity.notAfter); + + return certificate_info; +} + +/** + * poppler_certificate_info_copy: + * @certificate_info: a #PopplerCertificateInfo structure containing certificate information + * + * Copies @certificate_info, creating an identical #PopplerCertificateInfo. + * + * Return value: (transfer full): a new #PopplerCertificateInfo structure identical to @certificate_info + * + * Since: 23.07.0 + **/ +PopplerCertificateInfo *poppler_certificate_info_copy(const PopplerCertificateInfo *certificate_info) +{ + PopplerCertificateInfo *dup; + + g_return_val_if_fail(certificate_info != nullptr, nullptr); + + dup = (PopplerCertificateInfo *)g_malloc0(sizeof(PopplerCertificateInfo)); + dup->id = g_strdup(certificate_info->id); + dup->subject_common_name = g_strdup(certificate_info->subject_common_name); + dup->subject_organization = g_strdup(certificate_info->subject_organization); + dup->subject_email = g_strdup(certificate_info->subject_email); + dup->issuer_common_name = g_strdup(certificate_info->issuer_common_name); + dup->issuer_organization = g_strdup(certificate_info->issuer_organization); + dup->issuer_email = g_strdup(certificate_info->issuer_email); + dup->issued = g_date_time_ref(certificate_info->issued); + dup->expires = g_date_time_ref(certificate_info->expires); + + return dup; +} + +/** + * poppler_certificate_info_free: + * @certificate_info: a #PopplerCertificateInfo structure containing certificate information + * + * Frees @certificate_info + * + * Since: 23.07.0 + **/ +void poppler_certificate_info_free(PopplerCertificateInfo *certificate_info) +{ + if (certificate_info == nullptr) { + return; + } + + g_clear_pointer(&certificate_info->id, g_free); + g_clear_pointer(&certificate_info->subject_common_name, g_free); + g_clear_pointer(&certificate_info->subject_organization, g_free); + g_clear_pointer(&certificate_info->subject_email, g_free); + g_clear_pointer(&certificate_info->issuer_common_name, g_free); + g_clear_pointer(&certificate_info->issuer_organization, g_free); + g_clear_pointer(&certificate_info->issuer_email, g_free); + g_clear_pointer(&certificate_info->issued, g_date_time_unref); + g_clear_pointer(&certificate_info->expires, g_date_time_unref); + + g_free(certificate_info); +} + +/** + * poppler_get_available_signing_certificates: + * + * Get all available signing certificate information + * + * Returns: (transfer full) (element-type PopplerCertificateInfo): all available signing certificate information + **/ +GList *poppler_get_available_signing_certificates(void) +{ + GList *list = nullptr; + auto backend = CryptoSign::Factory::createActive(); + + if (!backend) { + return nullptr; + } + + std::vector<std::unique_ptr<X509CertificateInfo>> vCerts = backend->getAvailableSigningCertificates(); + for (auto &cert : vCerts) { + PopplerCertificateInfo *certificate_info = create_certificate_info(cert.get()); + list = g_list_append(list, certificate_info); + } + return list; +} + +/** + * poppler_get_certificate_info_by_id: + * + * Get certificate by nick name + * + * Returns: (transfer full): a #PopplerCertificateInfo or %NULL if not found + **/ +PopplerCertificateInfo *poppler_get_certificate_info_by_id(const char *id) +{ + PopplerCertificateInfo *ret = nullptr; + GList *certificate_info = poppler_get_available_signing_certificates(); + GList *list; + + for (list = certificate_info; list != nullptr; list = list->next) { + PopplerCertificateInfo *info = (PopplerCertificateInfo *)list->data; + + if (g_strcmp0(info->id, id) == 0) { + ret = poppler_certificate_info_copy(info); + break; + } + } + + g_list_free_full(certificate_info, (GDestroyNotify)poppler_certificate_info_free); + + return ret; +} + +/* NSS functions */ + +/** + * poppler_set_nss_dir: + * + * Set NSS directory + * + * Since: 23.07.0 + **/ +void poppler_set_nss_dir(const char *path) +{ +#ifdef ENABLE_NSS3 + NSSSignatureConfiguration::setNSSDir(GooString(path)); +#else + (void)path; +#endif +} + +/** + * poppler_get_nss_dir: + * + * Get NSS directory + * + * Return value: (transfer full): nss directroy. + * + * Since: 23.07.0 + **/ +char *poppler_get_nss_dir(void) +{ +#ifdef ENABLE_NSS3 + return g_strdup(NSSSignatureConfiguration::getNSSDir().c_str()); +#else + return nullptr; +#endif +} + +/** + * poppler_set_nss_password_callback: + * @func: (scope call): a #PopplerNssPasswordFunc that represents a signature annotation + * + * A callback which asks for certificate password + * + * Since: 23.07.0 + **/ +void poppler_set_nss_password_callback(PopplerNssPasswordFunc func) +{ +#ifdef ENABLE_NSS3 + NSSSignatureConfiguration::setNSSPasswordCallback(func); +#else + g_warning("poppler_set_nss_password_callback called but this poppler is built without NSS support"); + (void)func; +#endif +} diff --git a/poppler-24.05.0/glib/poppler-form-field.h b/poppler-24.05.0/glib/poppler-form-field.h new file mode 100644 index 0000000000000000000000000000000000000000..6cdf22405b80b7419d14c8a7fd5d0ba13db5ff91 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-form-field.h @@ -0,0 +1,384 @@ +/* poppler-form-field.h: glib interface to poppler + * + * Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org> + * Copyright (C) 2021 André Guerreiro <aguerreiro1985@gmail.com> + * Copyright (C) 2021, 2023 Marek Kasik <mkasik@redhat.com> + * + * 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. + */ + +#ifndef __POPPLER_FORM_FIELD_H__ +#define __POPPLER_FORM_FIELD_H__ + +#include <glib-object.h> +#include "poppler.h" + +G_BEGIN_DECLS + +#define POPPLER_TYPE_FORM_FIELD (poppler_form_field_get_type()) +#define POPPLER_FORM_FIELD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_FORM_FIELD, PopplerFormField)) +#define POPPLER_IS_FORM_FIELD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_FORM_FIELD)) + +/** + * PopplerSignatureStatus + * @POPPLER_SIGNATURE_VALID: signature is cryptographically valid + * @POPPLER_SIGNATURE_INVALID: signature is cryptographically invalid + * @POPPLER_SIGNATURE_DIGEST_MISMATCH: document content was changed after the signature was applied + * @POPPLER_SIGNATURE_DECODING_ERROR: signature CMS/PKCS7 structure is malformed + * @POPPLER_SIGNATURE_GENERIC_ERROR: failed to verify signature + * @POPPLER_SIGNATURE_NOT_FOUND: requested signature is not present in the document + * @POPPLER_SIGNATURE_NOT_VERIFIED: signature not yet verified + * + * Signature verification results + * + * Since: 21.12.0 + */ +typedef enum +{ + POPPLER_SIGNATURE_VALID, + POPPLER_SIGNATURE_INVALID, + POPPLER_SIGNATURE_DIGEST_MISMATCH, + POPPLER_SIGNATURE_DECODING_ERROR, + POPPLER_SIGNATURE_GENERIC_ERROR, + POPPLER_SIGNATURE_NOT_FOUND, + POPPLER_SIGNATURE_NOT_VERIFIED +} PopplerSignatureStatus; + +/** + * PopplerCertificateStatus + * @POPPLER_CERTIFICATE_TRUSTED: certificate is considered trusted + * @POPPLER_CERTIFICATE_UNTRUSTED_ISSUER: the issuer of this certificate has been marked as untrusted by the user + * @POPPLER_CERTIFICATE_UNKNOWN_ISSUER: this certificate trust chain has not finished in a trusted root certificate + * @POPPLER_CERTIFICATE_REVOKED: certificate was revoked by the issuing certificate authority + * @POPPLER_CERTIFICATE_EXPIRED: signing time is outside the validity bounds of this certificate + * @POPPLER_CERTIFICATE_GENERIC_ERROR: failed to verify certificate + * @POPPLER_CERTIFICATE_NOT_VERIFIED: certificate not yet verified + * + * Signature certificate verification results + * + * Since: 21.12.0 + */ +typedef enum +{ + POPPLER_CERTIFICATE_TRUSTED, + POPPLER_CERTIFICATE_UNTRUSTED_ISSUER, + POPPLER_CERTIFICATE_UNKNOWN_ISSUER, + POPPLER_CERTIFICATE_REVOKED, + POPPLER_CERTIFICATE_EXPIRED, + POPPLER_CERTIFICATE_GENERIC_ERROR, + POPPLER_CERTIFICATE_NOT_VERIFIED +} PopplerCertificateStatus; + +/** + * PopplerSignatureValidationFlags + * @POPPLER_SIGNATURE_VALIDATION_FLAG_VALIDATE_CERTIFICATE: Whether to validate also the certificate of the signature + * @POPPLER_SIGNATURE_VALIDATION_FLAG_WITHOUT_OCSP_REVOCATION_CHECK: Whether to not do OCSP (Online Certificate Status Protocol) revocation check + * @POPPLER_SIGNATURE_VALIDATION_FLAG_USE_AIA_CERTIFICATE_FETCH: Whether to use AIA (Authority Information Access) extension for certificate fetching + * + * Signature validation flags + * + * Since: 21.12.0 + */ +typedef enum /*< flags >*/ +{ + POPPLER_SIGNATURE_VALIDATION_FLAG_VALIDATE_CERTIFICATE = 1 << 0, + POPPLER_SIGNATURE_VALIDATION_FLAG_WITHOUT_OCSP_REVOCATION_CHECK = 1 << 1, + POPPLER_SIGNATURE_VALIDATION_FLAG_USE_AIA_CERTIFICATE_FETCH = 1 << 2, +} PopplerSignatureValidationFlags; + +typedef enum +{ + POPPLER_FORM_FIELD_UNKNOWN, + POPPLER_FORM_FIELD_BUTTON, + POPPLER_FORM_FIELD_TEXT, + POPPLER_FORM_FIELD_CHOICE, + POPPLER_FORM_FIELD_SIGNATURE +} PopplerFormFieldType; + +typedef enum +{ + POPPLER_FORM_BUTTON_PUSH, + POPPLER_FORM_BUTTON_CHECK, + POPPLER_FORM_BUTTON_RADIO +} PopplerFormButtonType; + +typedef enum +{ + POPPLER_FORM_TEXT_NORMAL, + POPPLER_FORM_TEXT_MULTILINE, + POPPLER_FORM_TEXT_FILE_SELECT +} PopplerFormTextType; + +typedef enum +{ + POPPLER_FORM_CHOICE_COMBO, + POPPLER_FORM_CHOICE_LIST +} PopplerFormChoiceType; + +/** + * PopplerAdditionalActionType: + * @POPPLER_ADDITIONAL_ACTION_FIELD_MODIFIED: The action to be performed when the user modifies the field. + * @POPPLER_ADDITIONAL_ACTION_FORMAT_FIELD: The action to be performed before the field is formatted to + * display its value. + * @POPPLER_ADDITIONAL_ACTION_VALIDATE_FIELD: The action to be performed when the field value changes. + * @POPPLER_ADDITIONAL_ACTION_CALCULATE_FIELD: The action to be performed when the field needs to be + * recalculated. + * + * Form field additional action types to be passed to @poppler_form_field_get_additional_action + * + * Since: 0.72 + */ +typedef enum +{ + POPPLER_ADDITIONAL_ACTION_FIELD_MODIFIED, + POPPLER_ADDITIONAL_ACTION_FORMAT_FIELD, + POPPLER_ADDITIONAL_ACTION_VALIDATE_FIELD, + POPPLER_ADDITIONAL_ACTION_CALCULATE_FIELD +} PopplerAdditionalActionType; + +POPPLER_PUBLIC +GType poppler_form_field_get_type(void) G_GNUC_CONST; + +POPPLER_PUBLIC +PopplerFormFieldType poppler_form_field_get_field_type(PopplerFormField *field); +POPPLER_PUBLIC +gint poppler_form_field_get_id(PopplerFormField *field); +POPPLER_PUBLIC +gdouble poppler_form_field_get_font_size(PopplerFormField *field); +POPPLER_PUBLIC +gboolean poppler_form_field_is_read_only(PopplerFormField *field); +POPPLER_PUBLIC +gchar *poppler_form_field_get_partial_name(PopplerFormField *field); +POPPLER_PUBLIC +gchar *poppler_form_field_get_mapping_name(PopplerFormField *field); +POPPLER_PUBLIC +gchar *poppler_form_field_get_name(PopplerFormField *field); +POPPLER_PUBLIC +PopplerAction *poppler_form_field_get_action(PopplerFormField *field); +POPPLER_PUBLIC +PopplerAction *poppler_form_field_get_additional_action(PopplerFormField *field, PopplerAdditionalActionType type); +POPPLER_PUBLIC +gchar *poppler_form_field_get_alternate_ui_name(PopplerFormField *field); + +/* Button Field */ +POPPLER_PUBLIC +PopplerFormButtonType poppler_form_field_button_get_button_type(PopplerFormField *field); +POPPLER_PUBLIC +gboolean poppler_form_field_button_get_state(PopplerFormField *field); +POPPLER_PUBLIC +void poppler_form_field_button_set_state(PopplerFormField *field, gboolean state); + +/* Text Field */ +POPPLER_PUBLIC +PopplerFormTextType poppler_form_field_text_get_text_type(PopplerFormField *field); +POPPLER_PUBLIC +gchar *poppler_form_field_text_get_text(PopplerFormField *field); +POPPLER_PUBLIC +void poppler_form_field_text_set_text(PopplerFormField *field, const gchar *text); +POPPLER_PUBLIC +gint poppler_form_field_text_get_max_len(PopplerFormField *field); +POPPLER_PUBLIC +gboolean poppler_form_field_text_do_spell_check(PopplerFormField *field); +POPPLER_PUBLIC +gboolean poppler_form_field_text_do_scroll(PopplerFormField *field); +POPPLER_PUBLIC +gboolean poppler_form_field_text_is_rich_text(PopplerFormField *field); +POPPLER_PUBLIC +gboolean poppler_form_field_text_is_password(PopplerFormField *field); + +/* Choice Field */ +POPPLER_PUBLIC +PopplerFormChoiceType poppler_form_field_choice_get_choice_type(PopplerFormField *field); +POPPLER_PUBLIC +gboolean poppler_form_field_choice_is_editable(PopplerFormField *field); +POPPLER_PUBLIC +gboolean poppler_form_field_choice_can_select_multiple(PopplerFormField *field); +POPPLER_PUBLIC +gboolean poppler_form_field_choice_do_spell_check(PopplerFormField *field); +POPPLER_PUBLIC +gboolean poppler_form_field_choice_commit_on_change(PopplerFormField *field); +POPPLER_PUBLIC +gint poppler_form_field_choice_get_n_items(PopplerFormField *field); +POPPLER_PUBLIC +gchar *poppler_form_field_choice_get_item(PopplerFormField *field, gint index); +POPPLER_PUBLIC +gboolean poppler_form_field_choice_is_item_selected(PopplerFormField *field, gint index); +POPPLER_PUBLIC +void poppler_form_field_choice_select_item(PopplerFormField *field, gint index); +POPPLER_PUBLIC +void poppler_form_field_choice_unselect_all(PopplerFormField *field); +POPPLER_PUBLIC +void poppler_form_field_choice_toggle_item(PopplerFormField *field, gint index); +POPPLER_PUBLIC +void poppler_form_field_choice_set_text(PopplerFormField *field, const gchar *text); +POPPLER_PUBLIC +gchar *poppler_form_field_choice_get_text(PopplerFormField *field); +POPPLER_PUBLIC +PopplerSignatureInfo *poppler_form_field_signature_validate_sync(PopplerFormField *field, PopplerSignatureValidationFlags flags, GCancellable *cancellable, GError **error); +POPPLER_PUBLIC +void poppler_form_field_signature_validate_async(PopplerFormField *field, PopplerSignatureValidationFlags flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); +POPPLER_PUBLIC +PopplerSignatureInfo *poppler_form_field_signature_validate_finish(PopplerFormField *field, GAsyncResult *result, GError **error); + +/* Signature Field */ +#define POPPLER_TYPE_SIGNATURE_INFO (poppler_signature_info_get_type()) +POPPLER_PUBLIC +GType poppler_signature_info_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerSignatureInfo *poppler_signature_info_copy(const PopplerSignatureInfo *siginfo); +POPPLER_PUBLIC +void poppler_signature_info_free(PopplerSignatureInfo *siginfo); +POPPLER_PUBLIC +PopplerSignatureStatus poppler_signature_info_get_signature_status(const PopplerSignatureInfo *siginfo); +POPPLER_PUBLIC +PopplerCertificateStatus poppler_signature_info_get_certificate_status(const PopplerSignatureInfo *siginfo); +POPPLER_PUBLIC +PopplerCertificateInfo *poppler_signature_info_get_certificate_info(const PopplerSignatureInfo *siginfo); +POPPLER_PUBLIC +const gchar *poppler_signature_info_get_signer_name(const PopplerSignatureInfo *siginfo); +POPPLER_PUBLIC +GDateTime *poppler_signature_info_get_local_signing_time(const PopplerSignatureInfo *siginfo); + +/* Signing Data */ +#define POPPLER_TYPE_SIGNING_DATA (poppler_signing_data_get_type()) +POPPLER_PUBLIC +GType poppler_signing_data_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerSigningData *poppler_signing_data_new(void); +POPPLER_PUBLIC +PopplerSigningData *poppler_signing_data_copy(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_free(PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_destination_filename(PopplerSigningData *signing_data, const gchar *filename); +POPPLER_PUBLIC +const gchar *poppler_signing_data_get_destination_filename(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_certificate_info(PopplerSigningData *signing_data, const PopplerCertificateInfo *certificate_info); +POPPLER_PUBLIC +const PopplerCertificateInfo *poppler_signing_data_get_certificate_info(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_page(PopplerSigningData *signing_data, int page); +POPPLER_PUBLIC +int poppler_signing_data_get_page(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_signature_text(PopplerSigningData *signing_data, const gchar *signature_text); +POPPLER_PUBLIC +const gchar *poppler_signing_data_get_signature_text(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_signature_text_left(PopplerSigningData *signing_data, const gchar *signature_text_left); +POPPLER_PUBLIC +const gchar *poppler_signing_data_get_signature_text_left(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_signature_rectangle(PopplerSigningData *signing_data, const PopplerRectangle *signature_rect); +POPPLER_PUBLIC +const PopplerRectangle *poppler_signing_data_get_signature_rectangle(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_font_color(PopplerSigningData *signing_data, const PopplerColor *font_color); +POPPLER_PUBLIC +const PopplerColor *poppler_signing_data_get_font_color(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_font_size(PopplerSigningData *signing_data, gdouble font_size); +POPPLER_PUBLIC +gdouble poppler_signing_data_get_font_size(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_left_font_size(PopplerSigningData *signing_data, gdouble font_size); +POPPLER_PUBLIC +gdouble poppler_signing_data_get_left_font_size(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_border_color(PopplerSigningData *signing_data, const PopplerColor *border_color); +POPPLER_PUBLIC +const PopplerColor *poppler_signing_data_get_border_color(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_border_width(PopplerSigningData *signing_data, gdouble border_width); +POPPLER_PUBLIC +gdouble poppler_signing_data_get_border_width(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_background_color(PopplerSigningData *signing_data, const PopplerColor *background_color); +POPPLER_PUBLIC +const PopplerColor *poppler_signing_data_get_background_color(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_field_partial_name(PopplerSigningData *signing_data, const gchar *field_partial_name); +POPPLER_PUBLIC +const gchar *poppler_signing_data_get_field_partial_name(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_reason(PopplerSigningData *signing_data, const gchar *reason); +POPPLER_PUBLIC +const gchar *poppler_signing_data_get_reason(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_location(PopplerSigningData *signing_data, const gchar *location); +POPPLER_PUBLIC +const gchar *poppler_signing_data_get_location(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_image_path(PopplerSigningData *signing_data, const gchar *image_path); +POPPLER_PUBLIC +const gchar *poppler_signing_data_get_image_path(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_password(PopplerSigningData *signing_data, const gchar *password); +POPPLER_PUBLIC +const gchar *poppler_signing_data_get_password(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_document_owner_password(PopplerSigningData *signing_data, const gchar *document_owner_password); +POPPLER_PUBLIC +const gchar *poppler_signing_data_get_document_owner_password(const PopplerSigningData *signing_data); +POPPLER_PUBLIC +void poppler_signing_data_set_document_user_password(PopplerSigningData *signing_data, const gchar *document_user_password); +POPPLER_PUBLIC +const gchar *poppler_signing_data_get_document_user_password(const PopplerSigningData *signing_data); + +/* Certificate Information */ +#define POPPLER_TYPE_CERTIFICATE_INFO (poppler_certificate_info_get_type()) +POPPLER_PUBLIC +GType poppler_certificate_info_get_type(void) G_GNUC_CONST; +PopplerCertificateInfo *poppler_certificate_info_new(void); +POPPLER_PUBLIC +PopplerCertificateInfo *poppler_certificate_info_copy(const PopplerCertificateInfo *certificate_info); +POPPLER_PUBLIC +void poppler_certificate_info_free(PopplerCertificateInfo *certificate_info); +POPPLER_PUBLIC +const char *poppler_certificate_info_get_id(const PopplerCertificateInfo *certificate_info); +POPPLER_PUBLIC +const char *poppler_certificate_info_get_subject_common_name(const PopplerCertificateInfo *certificate_info); +POPPLER_PUBLIC +const char *poppler_certificate_info_get_subject_organization(const PopplerCertificateInfo *certificate_info); +POPPLER_PUBLIC +const char *poppler_certificate_info_get_subject_email(const PopplerCertificateInfo *certificate_info); +POPPLER_PUBLIC +const char *poppler_certificate_info_get_issuer_common_name(const PopplerCertificateInfo *certificate_info); +POPPLER_PUBLIC +const char *poppler_certificate_info_get_issuer_organization(const PopplerCertificateInfo *certificate_info); +POPPLER_PUBLIC +const char *poppler_certificate_info_get_issuer_email(const PopplerCertificateInfo *certificate_info); +POPPLER_PUBLIC +GDateTime *poppler_certificate_info_get_issuance_time(const PopplerCertificateInfo *certificate_info); +POPPLER_PUBLIC +GDateTime *poppler_certificate_info_get_expiration_time(const PopplerCertificateInfo *certificate_info); +POPPLER_PUBLIC +PopplerCertificateInfo *poppler_get_certificate_info_by_id(const char *id); +POPPLER_PUBLIC +GList *poppler_get_available_signing_certificates(void); + +/* NSS */ +POPPLER_PUBLIC +void poppler_set_nss_dir(const char *path); +POPPLER_PUBLIC +char *poppler_get_nss_dir(void); +typedef char *(*PopplerNssPasswordFunc)(const gchar *text); +POPPLER_PUBLIC +void poppler_set_nss_password_callback(PopplerNssPasswordFunc func); + +G_END_DECLS + +#endif /* __POPPLER_FORM_FIELD_H__ */ diff --git a/poppler-24.05.0/glib/poppler-input-stream.cc b/poppler-24.05.0/glib/poppler-input-stream.cc new file mode 100644 index 0000000000000000000000000000000000000000..25251813487ceccdd3016083fa176da2281982b6 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-input-stream.cc @@ -0,0 +1,63 @@ +/* poppler-input-stream.cc: glib interface to poppler + * + * Copyright (C) 2012 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 "config.h" +#include "poppler-input-stream.h" + +PopplerInputStream::PopplerInputStream(GInputStream *inputStreamA, GCancellable *cancellableA, Goffset startA, bool limitedA, Goffset lengthA, Object &&dictA) : BaseSeekInputStream(startA, limitedA, lengthA, std::move(dictA)) +{ + inputStream = (GInputStream *)g_object_ref(inputStreamA); + cancellable = cancellableA ? (GCancellable *)g_object_ref(cancellableA) : nullptr; +} + +PopplerInputStream::~PopplerInputStream() +{ + close(); + g_object_unref(inputStream); + if (cancellable) { + g_object_unref(cancellable); + } +} + +BaseStream *PopplerInputStream::copy() +{ + return new PopplerInputStream(inputStream, cancellable, start, limited, length, dict.copy()); +} + +Stream *PopplerInputStream::makeSubStream(Goffset startA, bool limitedA, Goffset lengthA, Object &&dictA) +{ + return new PopplerInputStream(inputStream, cancellable, startA, limitedA, lengthA, std::move(dictA)); +} + +Goffset PopplerInputStream::currentPos() const +{ + GSeekable *seekable = G_SEEKABLE(inputStream); + return g_seekable_tell(seekable); +} + +void PopplerInputStream::setCurrentPos(Goffset offset) +{ + GSeekable *seekable = G_SEEKABLE(inputStream); + g_seekable_seek(seekable, offset, G_SEEK_SET, cancellable, nullptr); +} + +Goffset PopplerInputStream::read(char *buffer, Goffset count) +{ + return g_input_stream_read(inputStream, buffer, count, cancellable, nullptr); +} diff --git a/poppler-24.05.0/glib/poppler-input-stream.h b/poppler-24.05.0/glib/poppler-input-stream.h new file mode 100644 index 0000000000000000000000000000000000000000..66dee3f0f8dcc7b0bbaf6131b6c9c0f48f4d82bc --- /dev/null +++ b/poppler-24.05.0/glib/poppler-input-stream.h @@ -0,0 +1,48 @@ +/* poppler-input-stream.h: glib interface to poppler + * + * Copyright (C) 2012 Carlos Garcia Campos <carlosgc@gnome.org> + * Copyright (C) 2019 Albert Astals Cid <aacid@kde.org> + * + * 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. + */ + +#ifndef __POPPLER_INPUT_STREAM_H__ +#define __POPPLER_INPUT_STREAM_H__ + +#include <gio/gio.h> +#ifndef __GI_SCANNER__ +# include <Object.h> +# include <Stream.h> + +class PopplerInputStream : public BaseSeekInputStream +{ +public: + PopplerInputStream(GInputStream *inputStream, GCancellable *cancellableA, Goffset startA, bool limitedA, Goffset lengthA, Object &&dictA); + ~PopplerInputStream() override; + BaseStream *copy() override; + Stream *makeSubStream(Goffset start, bool limited, Goffset lengthA, Object &&dictA) override; + +private: + Goffset currentPos() const override; + void setCurrentPos(Goffset offset) override; + Goffset read(char *buffer, Goffset count) override; + + GInputStream *inputStream; + GCancellable *cancellable; +}; + +#endif /* __GI_SCANNER__ */ + +#endif /* __POPPLER_INPUT_STREAM_H__ */ diff --git a/poppler-24.05.0/glib/poppler-layer.cc b/poppler-24.05.0/glib/poppler-layer.cc new file mode 100644 index 0000000000000000000000000000000000000000..053211ccfba3c8db28172cfdcacde48910e7f7d0 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-layer.cc @@ -0,0 +1,209 @@ +/* poppler-layer.cc: glib interface to poppler + * + * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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-layer.h" +#include "poppler-private.h" + +/** + * SECTION:poppler-layer + * @short_description: Layers + * @title: PopplerLayer + */ + +typedef struct _PopplerLayerClass PopplerLayerClass; +struct _PopplerLayerClass +{ + GObjectClass parent_class; +}; + +G_DEFINE_TYPE(PopplerLayer, poppler_layer, G_TYPE_OBJECT) + +static void poppler_layer_finalize(GObject *object) +{ + PopplerLayer *poppler_layer = POPPLER_LAYER(object); + + if (poppler_layer->document) { + g_object_unref(poppler_layer->document); + poppler_layer->document = nullptr; + } + + if (poppler_layer->title) { + g_free(poppler_layer->title); + poppler_layer->title = nullptr; + } + poppler_layer->layer = nullptr; + poppler_layer->rbgroup = nullptr; + + G_OBJECT_CLASS(poppler_layer_parent_class)->finalize(object); +} + +static void poppler_layer_init(PopplerLayer *layer) { } + +static void poppler_layer_class_init(PopplerLayerClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->finalize = poppler_layer_finalize; +} + +PopplerLayer *_poppler_layer_new(PopplerDocument *document, Layer *layer, GList *rbgroup) +{ + PopplerLayer *poppler_layer; + const GooString *layer_name; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + g_return_val_if_fail(layer != nullptr, NULL); + + poppler_layer = POPPLER_LAYER(g_object_new(POPPLER_TYPE_LAYER, nullptr)); + + poppler_layer->document = (PopplerDocument *)g_object_ref(document); + poppler_layer->layer = layer; + poppler_layer->rbgroup = rbgroup; + layer_name = layer->oc->getName(); + poppler_layer->title = layer_name ? _poppler_goo_string_to_utf8(layer_name) : nullptr; + + return poppler_layer; +} + +/** + * poppler_layer_get_title: + * @layer: a #PopplerLayer + * + * Returns the name of the layer suitable for + * presentation as a title in a viewer's GUI + * + * Return value: a string containing the title of the layer + * + * Since: 0.12 + **/ +const gchar *poppler_layer_get_title(PopplerLayer *poppler_layer) +{ + g_return_val_if_fail(POPPLER_IS_LAYER(poppler_layer), NULL); + + return poppler_layer->title; +} + +/** + * poppler_layer_is_visible: + * @layer: a #PopplerLayer + * + * Returns whether @layer is visible + * + * Return value: %TRUE if @layer is visible + * + * Since: 0.12 + **/ +gboolean poppler_layer_is_visible(PopplerLayer *poppler_layer) +{ + g_return_val_if_fail(POPPLER_IS_LAYER(poppler_layer), FALSE); + + return poppler_layer->layer->oc->getState() == OptionalContentGroup::On; +} + +/** + * poppler_layer_show: + * @layer: a #PopplerLayer + * + * Shows @layer + * + * Since: 0.12 + **/ +void poppler_layer_show(PopplerLayer *poppler_layer) +{ + GList *l; + Layer *layer; + + g_return_if_fail(POPPLER_IS_LAYER(poppler_layer)); + + layer = poppler_layer->layer; + + if (layer->oc->getState() == OptionalContentGroup::On) { + return; + } + + layer->oc->setState(OptionalContentGroup::On); + + for (l = poppler_layer->rbgroup; l && l->data; l = g_list_next(l)) { + OptionalContentGroup *oc = (OptionalContentGroup *)l->data; + + if (oc != layer->oc) { + oc->setState(OptionalContentGroup::Off); + } + } +} + +/** + * poppler_layer_hide: + * @layer: a #PopplerLayer + * + * Hides @layer. If @layer is the parent of other nested layers, + * such layers will be also hidden and will be blocked until @layer + * is shown again + * + * Since: 0.12 + **/ +void poppler_layer_hide(PopplerLayer *poppler_layer) +{ + Layer *layer; + + g_return_if_fail(POPPLER_IS_LAYER(poppler_layer)); + + layer = poppler_layer->layer; + + if (layer->oc->getState() == OptionalContentGroup::Off) { + return; + } + + layer->oc->setState(OptionalContentGroup::Off); +} + +/** + * poppler_layer_is_parent: + * @layer: a #PopplerLayer + * + * Returns whether @layer is parent of other nested layers. + * + * Return value: %TRUE if @layer is a parent layer + * + * Since: 0.12 + **/ +gboolean poppler_layer_is_parent(PopplerLayer *poppler_layer) +{ + g_return_val_if_fail(POPPLER_IS_LAYER(poppler_layer), FALSE); + + return poppler_layer->layer->kids != nullptr; +} + +/** + * poppler_layer_get_radio_button_group_id: + * @layer: a #PopplerLayer + * + * Returns the numeric ID the radio button group associated with @layer. + * + * Return value: the ID of the radio button group associated with @layer, + * or 0 if the layer is not associated to any radio button group + * + * Since: 0.12 + **/ +gint poppler_layer_get_radio_button_group_id(PopplerLayer *poppler_layer) +{ + g_return_val_if_fail(POPPLER_IS_LAYER(poppler_layer), FALSE); + + return GPOINTER_TO_INT(poppler_layer->rbgroup); +} diff --git a/poppler-24.05.0/glib/poppler-layer.h b/poppler-24.05.0/glib/poppler-layer.h new file mode 100644 index 0000000000000000000000000000000000000000..12dfd9a44b630cdb7f06b1688fbe051a0daf25e6 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-layer.h @@ -0,0 +1,50 @@ +/* poppler-layer.h: glib interface to poppler + * + * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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. + */ + +#ifndef __POPPLER_LAYER_H__ +#define __POPPLER_LAYER_H__ + +#include <glib-object.h> +#include "poppler.h" + +G_BEGIN_DECLS + +#define POPPLER_TYPE_LAYER (poppler_layer_get_type()) +#define POPPLER_LAYER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_LAYER, PopplerLayer)) +#define POPPLER_IS_LAYER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_LAYER)) + +POPPLER_PUBLIC +GType poppler_layer_get_type(void) G_GNUC_CONST; + +POPPLER_PUBLIC +const gchar *poppler_layer_get_title(PopplerLayer *layer); +POPPLER_PUBLIC +gboolean poppler_layer_is_visible(PopplerLayer *layer); +POPPLER_PUBLIC +void poppler_layer_show(PopplerLayer *layer); +POPPLER_PUBLIC +void poppler_layer_hide(PopplerLayer *layer); +POPPLER_PUBLIC +gboolean poppler_layer_is_parent(PopplerLayer *layer); +POPPLER_PUBLIC +gint poppler_layer_get_radio_button_group_id(PopplerLayer *layer); + +G_END_DECLS + +#endif /* __POPPLER_LAYER_H__ */ diff --git a/poppler-24.05.0/glib/poppler-media.cc b/poppler-24.05.0/glib/poppler-media.cc new file mode 100644 index 0000000000000000000000000000000000000000..c4f8d24f23d8c31a792176ce497c01a422c8711f --- /dev/null +++ b/poppler-24.05.0/glib/poppler-media.cc @@ -0,0 +1,384 @@ +/* poppler-media.cc: glib interface to MediaRendition + * + * Copyright (C) 2010 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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 "config.h" + +#include <cerrno> + +#include <goo/gfile.h> + +#include "poppler-media.h" +#include "poppler-private.h" + +/** + * SECTION: poppler-media + * @short_description: Media + * @title: PopplerMedia + */ + +typedef struct _PopplerMediaClass PopplerMediaClass; + +struct _PopplerMedia +{ + GObject parent_instance; + + gchar *filename; + gboolean auto_play; + gboolean show_controls; + gfloat repeat_count; + + gchar *mime_type; + Object stream; +}; + +struct _PopplerMediaClass +{ + GObjectClass parent_class; +}; + +G_DEFINE_TYPE(PopplerMedia, poppler_media, G_TYPE_OBJECT) + +static void poppler_media_finalize(GObject *object) +{ + PopplerMedia *media = POPPLER_MEDIA(object); + + if (media->filename) { + g_free(media->filename); + media->filename = nullptr; + } + + if (media->mime_type) { + g_free(media->mime_type); + media->mime_type = nullptr; + } + + media->stream = Object(); + + G_OBJECT_CLASS(poppler_media_parent_class)->finalize(object); +} + +static void poppler_media_class_init(PopplerMediaClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->finalize = poppler_media_finalize; +} + +static void poppler_media_init(PopplerMedia *media) { } + +PopplerMedia *_poppler_media_new(const MediaRendition *poppler_media) +{ + PopplerMedia *media; + + g_assert(poppler_media != nullptr); + + media = POPPLER_MEDIA(g_object_new(POPPLER_TYPE_MEDIA, nullptr)); + + if (poppler_media->getIsEmbedded()) { + const GooString *mime_type; + + media->stream = poppler_media->getEmbbededStreamObject()->copy(); + mime_type = poppler_media->getContentType(); + if (mime_type) { + media->mime_type = g_strdup(mime_type->c_str()); + } + } else { + media->filename = g_strdup(poppler_media->getFileName()->c_str()); + } + + const MediaParameters *mp = poppler_media->getBEParameters(); + mp = mp ? mp : poppler_media->getMHParameters(); + + media->auto_play = mp ? mp->autoPlay : false; + media->show_controls = mp ? mp->showControls : false; + media->repeat_count = mp ? mp->repeatCount : 1.f; + + return media; +} + +/** + * poppler_media_get_filename: + * @poppler_media: a #PopplerMedia + * + * Returns the media clip filename, in case of non-embedded media. filename might be + * a local relative or absolute path or a URI + * + * Return value: a filename, return value is owned by #PopplerMedia and should not be freed + * + * Since: 0.14 + */ +const gchar *poppler_media_get_filename(PopplerMedia *poppler_media) +{ + g_return_val_if_fail(POPPLER_IS_MEDIA(poppler_media), NULL); + g_return_val_if_fail(!poppler_media->stream.isStream(), NULL); + + return poppler_media->filename; +} + +/** + * poppler_media_is_embedded: + * @poppler_media: a #PopplerMedia + * + * Whether the media clip is embedded in the PDF. If the result is %TRUE, the embedded stream + * can be saved with poppler_media_save() or poppler_media_save_to_callback() function. + * If the result is %FALSE, the media clip filename can be retrieved with + * poppler_media_get_filename() function. + * + * Return value: %TRUE if media clip is embedded, %FALSE otherwise + * + * Since: 0.14 + */ +gboolean poppler_media_is_embedded(PopplerMedia *poppler_media) +{ + g_return_val_if_fail(POPPLER_IS_MEDIA(poppler_media), FALSE); + + return poppler_media->stream.isStream(); +} + +/** + * poppler_media_get_auto_play: + * @poppler_media: a #PopplerMedia + * + * Returns the auto-play parameter. + * + * Return value: %TRUE if media should auto-play, %FALSE otherwise + * + * Since: 20.04.0 + */ +gboolean poppler_media_get_auto_play(PopplerMedia *poppler_media) +{ + g_return_val_if_fail(POPPLER_IS_MEDIA(poppler_media), FALSE); + + return poppler_media->auto_play; +} + +/** + * poppler_media_get_show_controls: + * @poppler_media: a #PopplerMedia + * + * Returns the show controls parameter. + * + * Return value: %TRUE if media should show controls, %FALSE otherwise + * + * Since: 20.04.0 + */ +gboolean poppler_media_get_show_controls(PopplerMedia *poppler_media) +{ + g_return_val_if_fail(POPPLER_IS_MEDIA(poppler_media), FALSE); + + return poppler_media->show_controls; +} + +/** + * poppler_media_get_repeat_count: + * @poppler_media: a #PopplerMedia + * + * Returns the repeat count parameter. + * + * Return value: Repeat count parameter (float) + * + * Since: 20.04.0 + */ +gfloat poppler_media_get_repeat_count(PopplerMedia *poppler_media) +{ + g_return_val_if_fail(POPPLER_IS_MEDIA(poppler_media), FALSE); + + return poppler_media->repeat_count; +} + +/** + * poppler_media_get_mime_type: + * @poppler_media: a #PopplerMedia + * + * Returns the media clip mime-type + * + * Return value: the mime-type, return value is owned by #PopplerMedia and should not be freed + * + * Since: 0.14 + */ +const gchar *poppler_media_get_mime_type(PopplerMedia *poppler_media) +{ + g_return_val_if_fail(POPPLER_IS_MEDIA(poppler_media), NULL); + + return poppler_media->mime_type; +} + +static gboolean save_helper(const gchar *buf, gsize count, gpointer data, GError **error) +{ + FILE *f = (FILE *)data; + gsize n; + + n = fwrite(buf, 1, count, f); + if (n != count) { + int errsv = errno; + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errsv), "Error writing to media file: %s", g_strerror(errsv)); + return FALSE; + } + + return TRUE; +} + +/** + * poppler_media_save: + * @poppler_media: a #PopplerMedia + * @filename: name of file to save + * @error: (allow-none): return location for error, or %NULL. + * + * Saves embedded stream of @poppler_media to a file indicated by @filename. + * If @error is set, %FALSE will be returned. + * Possible errors include those in the #G_FILE_ERROR domain + * and whatever the save function generates. + * + * Return value: %TRUE, if the file successfully saved + * + * Since: 0.14 + */ +gboolean poppler_media_save(PopplerMedia *poppler_media, const char *filename, GError **error) +{ + gboolean result; + FILE *f; + + g_return_val_if_fail(POPPLER_IS_MEDIA(poppler_media), FALSE); + g_return_val_if_fail(poppler_media->stream.isStream(), FALSE); + + f = openFile(filename, "wb"); + + if (f == nullptr) { + gchar *display_name = g_filename_display_name(filename); + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errno), "Failed to open '%s' for writing: %s", display_name, g_strerror(errno)); + g_free(display_name); + return FALSE; + } + + result = poppler_media_save_to_callback(poppler_media, save_helper, f, error); + + if (fclose(f) < 0) { + gchar *display_name = g_filename_display_name(filename); + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errno), "Failed to close '%s', all data may not have been saved: %s", display_name, g_strerror(errno)); + g_free(display_name); + return FALSE; + } + + return result; +} + +#ifndef G_OS_WIN32 + +/** + * poppler_media_save_to_fd: + * @poppler_media: a #PopplerMedia + * @fd: a valid file descriptor open for writing + * @error: (allow-none): return location for error, or %NULL. + * + * Saves embedded stream of @poppler_media to a file referred to by @fd. + * If @error is set, %FALSE will be returned. + * Possible errors include those in the #G_FILE_ERROR domain + * and whatever the save function generates. + * Note that this function takes ownership of @fd; you must not operate on it + * again, nor close it. + * + * Return value: %TRUE, if the file successfully saved + * + * Since: 21.12.0 + */ +gboolean poppler_media_save_to_fd(PopplerMedia *poppler_media, int fd, GError **error) +{ + gboolean result; + FILE *f; + + g_return_val_if_fail(POPPLER_IS_MEDIA(poppler_media), FALSE); + g_return_val_if_fail(poppler_media->stream.isStream(), FALSE); + + f = fdopen(fd, "wb"); + if (f == nullptr) { + int errsv = errno; + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errsv), "Failed to open FD %d for writing: %s", fd, g_strerror(errsv)); + close(fd); + return FALSE; + } + + result = poppler_media_save_to_callback(poppler_media, save_helper, f, error); + + if (fclose(f) < 0) { + int errsv = errno; + g_set_error(error, G_FILE_ERROR, g_file_error_from_errno(errsv), "Failed to close FD %d, all data may not have been saved: %s", fd, g_strerror(errsv)); + return FALSE; + } + + return result; +} + +#endif /* !G_OS_WIN32 */ + +#define BUF_SIZE 1024 + +/** + * poppler_media_save_to_callback: + * @poppler_media: a #PopplerMedia + * @save_func: (scope call): a function that is called to save each block of data that the save routine generates. + * @user_data: user data to pass to the save function. + * @error: (allow-none): return location for error, or %NULL. + * + * Saves embedded stream of @poppler_media by feeding the produced data to @save_func. Can be used + * when you want to store the media clip stream to something other than a file, such as + * an in-memory buffer or a socket. If @error is set, %FALSE will be + * returned. Possible errors include those in the #G_FILE_ERROR domain and + * whatever the save function generates. + * + * Return value: %TRUE, if the save successfully completed + * + * Since: 0.14 + */ +gboolean poppler_media_save_to_callback(PopplerMedia *poppler_media, PopplerMediaSaveFunc save_func, gpointer user_data, GError **error) +{ + Stream *stream; + gchar buf[BUF_SIZE]; + int i; + gboolean eof_reached = FALSE; + + g_return_val_if_fail(POPPLER_IS_MEDIA(poppler_media), FALSE); + g_return_val_if_fail(poppler_media->stream.isStream(), FALSE); + + stream = poppler_media->stream.getStream(); + stream->reset(); + + do { + int data; + + for (i = 0; i < BUF_SIZE; i++) { + data = stream->getChar(); + if (data == EOF) { + eof_reached = TRUE; + break; + } + buf[i] = data; + } + + if (i > 0) { + if (!(save_func)(buf, i, user_data, error)) { + stream->close(); + return FALSE; + } + } + } while (!eof_reached); + + stream->close(); + + return TRUE; +} diff --git a/poppler-24.05.0/glib/poppler-media.h b/poppler-24.05.0/glib/poppler-media.h new file mode 100644 index 0000000000000000000000000000000000000000..72094b389b7f9fe5a59af51b10a99e3f59fe82ce --- /dev/null +++ b/poppler-24.05.0/glib/poppler-media.h @@ -0,0 +1,80 @@ +/* poppler-media.h: glib interface to MediaRendition + * + * Copyright (C) 2010 Carlos Garcia Campos <carlosgc@gnome.org> + * + * 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. + */ + +#ifndef __POPPLER_MEDIA_H__ +#define __POPPLER_MEDIA_H__ + +#include <glib-object.h> +#include "poppler.h" + +G_BEGIN_DECLS + +#define POPPLER_TYPE_MEDIA (poppler_media_get_type()) +#define POPPLER_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_MEDIA, PopplerMedia)) +#define POPPLER_IS_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_MEDIA)) + +/* FIXME: this should be generic (PopplerSaveToCallbackFunc) */ + +/** + * PopplerMediaSaveFunc: + * @buf: (array length=count) (element-type guint8): buffer containing + * bytes to be written. + * @count: number of bytes in @buf. + * @data: (closure): user data passed to poppler_media_save_to_callback() + * @error: GError to set on error, or %NULL + * + * Specifies the type of the function passed to + * poppler_media_save_to_callback(). It is called once for each block of + * bytes that is "written" by poppler_media_save_to_callback(). If + * successful it should return %TRUE. If an error occurs it should set + * @error and return %FALSE, in which case poppler_media_save_to_callback() + * will fail with the same error. + * + * Returns: %TRUE if successful, %FALSE (with @error set) if failed. + * + * Since: 0.14 + */ +typedef gboolean (*PopplerMediaSaveFunc)(const gchar *buf, gsize count, gpointer data, GError **error); + +POPPLER_PUBLIC +GType poppler_media_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +gboolean poppler_media_is_embedded(PopplerMedia *poppler_media); +POPPLER_PUBLIC +const gchar *poppler_media_get_filename(PopplerMedia *poppler_media); +POPPLER_PUBLIC +const gchar *poppler_media_get_mime_type(PopplerMedia *poppler_media); +POPPLER_PUBLIC +gboolean poppler_media_get_auto_play(PopplerMedia *poppler_media); +POPPLER_PUBLIC +gboolean poppler_media_get_show_controls(PopplerMedia *poppler_media); +POPPLER_PUBLIC +gfloat poppler_media_get_repeat_count(PopplerMedia *poppler_media); +POPPLER_PUBLIC +gboolean poppler_media_save(PopplerMedia *poppler_media, const char *filename, GError **error); +#ifndef G_OS_WIN32 +POPPLER_PUBLIC +gboolean poppler_media_save_to_fd(PopplerMedia *poppler_media, int fd, GError **error); +#endif +POPPLER_PUBLIC +gboolean poppler_media_save_to_callback(PopplerMedia *poppler_media, PopplerMediaSaveFunc save_func, gpointer user_data, GError **error); + +G_END_DECLS + +#endif /* __POPPLER_MEDIA_H__ */ diff --git a/poppler-24.05.0/glib/poppler-movie.cc b/poppler-24.05.0/glib/poppler-movie.cc new file mode 100644 index 0000000000000000000000000000000000000000..c8b9c2dd6eae31350afe64ff93b55e641eec33bc --- /dev/null +++ b/poppler-24.05.0/glib/poppler-movie.cc @@ -0,0 +1,329 @@ +/* poppler-movie.cc: glib interface to Movie + * + * Copyright (C) 2010 Carlos Garcia Campos <carlosgc@gnome.org> + * Copyright (C) 2008 Hugo Mercier <hmercier31[@]gmail.com> + * Copyright (C) 2017 Francesco Poli <invernomuto@paranoici.org> + * + * 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-movie.h" +#include "poppler-private.h" + +/** + * SECTION: poppler-movie + * @short_description: Movies + * @title: PopplerMovie + */ + +typedef struct _PopplerMovieClass PopplerMovieClass; + +struct _PopplerMovie +{ + GObject parent_instance; + + gchar *filename; + gboolean need_poster; + gboolean show_controls; + PopplerMoviePlayMode mode; + gboolean synchronous_play; + gdouble volume; + gdouble rate; + guint64 start; + guint64 duration; + gushort rotation_angle; + gint width; + gint height; +}; + +struct _PopplerMovieClass +{ + GObjectClass parent_class; +}; + +G_DEFINE_TYPE(PopplerMovie, poppler_movie, G_TYPE_OBJECT) + +static void poppler_movie_finalize(GObject *object) +{ + PopplerMovie *movie = POPPLER_MOVIE(object); + + if (movie->filename) { + g_free(movie->filename); + movie->filename = nullptr; + } + + G_OBJECT_CLASS(poppler_movie_parent_class)->finalize(object); +} + +static void poppler_movie_class_init(PopplerMovieClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->finalize = poppler_movie_finalize; +} + +static void poppler_movie_init(PopplerMovie *movie) { } + +PopplerMovie *_poppler_movie_new(const Movie *poppler_movie) +{ + PopplerMovie *movie; + + g_assert(poppler_movie != nullptr); + + movie = POPPLER_MOVIE(g_object_new(POPPLER_TYPE_MOVIE, nullptr)); + + movie->filename = g_strdup(poppler_movie->getFileName()->c_str()); + if (poppler_movie->getShowPoster()) { + Object tmp = poppler_movie->getPoster(); + movie->need_poster = (!tmp.isRef() && !tmp.isStream()); + } + + movie->show_controls = poppler_movie->getActivationParameters()->showControls; + + switch (poppler_movie->getActivationParameters()->repeatMode) { + case MovieActivationParameters::repeatModeOnce: + movie->mode = POPPLER_MOVIE_PLAY_MODE_ONCE; + break; + case MovieActivationParameters::repeatModeOpen: + movie->mode = POPPLER_MOVIE_PLAY_MODE_OPEN; + break; + case MovieActivationParameters::repeatModeRepeat: + movie->mode = POPPLER_MOVIE_PLAY_MODE_REPEAT; + break; + case MovieActivationParameters::repeatModePalindrome: + movie->mode = POPPLER_MOVIE_PLAY_MODE_PALINDROME; + break; + } + + movie->synchronous_play = poppler_movie->getActivationParameters()->synchronousPlay; + + // map 0 - 100 to 0.0 - 1.0 + movie->volume = poppler_movie->getActivationParameters()->volume / 100.0; + + movie->rate = poppler_movie->getActivationParameters()->rate; + + if (poppler_movie->getActivationParameters()->start.units_per_second > 0 && poppler_movie->getActivationParameters()->start.units <= G_MAXUINT64 / 1000000000) { + movie->start = 1000000000L * poppler_movie->getActivationParameters()->start.units / poppler_movie->getActivationParameters()->start.units_per_second; + } else { + movie->start = 0L; + } + + if (poppler_movie->getActivationParameters()->duration.units_per_second > 0 && poppler_movie->getActivationParameters()->duration.units <= G_MAXUINT64 / 1000000000) { + movie->duration = 1000000000L * poppler_movie->getActivationParameters()->duration.units / poppler_movie->getActivationParameters()->duration.units_per_second; + } else { + movie->duration = 0L; + } + + movie->rotation_angle = poppler_movie->getRotationAngle(); + + poppler_movie->getAspect(&movie->width, &movie->height); + + return movie; +} + +/** + * poppler_movie_get_filename: + * @poppler_movie: a #PopplerMovie + * + * Returns the local filename identifying a self-describing movie file + * + * Return value: a local filename, return value is owned by #PopplerMovie and + * should not be freed + * + * Since: 0.14 + */ +const gchar *poppler_movie_get_filename(PopplerMovie *poppler_movie) +{ + g_return_val_if_fail(POPPLER_IS_MOVIE(poppler_movie), NULL); + + return poppler_movie->filename; +} + +/** + * poppler_movie_need_poster: + * @poppler_movie: a #PopplerMovie + * + * Returns whether a poster image representing the Movie + * shall be displayed. The poster image must be retrieved + * from the movie file. + * + * Return value: %TRUE if move needs a poster image, %FALSE otherwise + * + * Since: 0.14 + */ +gboolean poppler_movie_need_poster(PopplerMovie *poppler_movie) +{ + g_return_val_if_fail(POPPLER_IS_MOVIE(poppler_movie), FALSE); + + return poppler_movie->need_poster; +} + +/** + * poppler_movie_show_controls: + * @poppler_movie: a #PopplerMovie + * + * Returns whether to display a movie controller bar while playing the movie + * + * Return value: %TRUE if controller bar should be displayed, %FALSE otherwise + * + * Since: 0.14 + */ +gboolean poppler_movie_show_controls(PopplerMovie *poppler_movie) +{ + g_return_val_if_fail(POPPLER_IS_MOVIE(poppler_movie), FALSE); + + return poppler_movie->show_controls; +} + +/** + * poppler_movie_get_play_mode: + * @poppler_movie: a #PopplerMovie + * + * Returns the play mode of @poppler_movie. + * + * Return value: a #PopplerMoviePlayMode. + * + * Since: 0.54 + */ +PopplerMoviePlayMode poppler_movie_get_play_mode(PopplerMovie *poppler_movie) +{ + g_return_val_if_fail(POPPLER_IS_MOVIE(poppler_movie), POPPLER_MOVIE_PLAY_MODE_ONCE); + + return poppler_movie->mode; +} + +/** + * poppler_movie_is_synchronous: + * @poppler_movie: a #PopplerMovie + * + * Returns whether the user must wait for the movie to be finished before + * the PDF viewer accepts any interactive action + * + * Return value: %TRUE if yes, %FALSE otherwise + * + * Since: 0.80 + */ +gboolean poppler_movie_is_synchronous(PopplerMovie *poppler_movie) +{ + g_return_val_if_fail(POPPLER_IS_MOVIE(poppler_movie), FALSE); + + return poppler_movie->synchronous_play; +} + +/** + * poppler_movie_get_volume: + * @poppler_movie: a #PopplerMovie + * + * Returns the playback audio volume + * + * Return value: volume setting for the movie (0.0 - 1.0) + * + * Since: 0.80 + */ +gdouble poppler_movie_get_volume(PopplerMovie *poppler_movie) +{ + g_return_val_if_fail(POPPLER_IS_MOVIE(poppler_movie), 0); + + return poppler_movie->volume; +} + +/** + * poppler_movie_get_rate: + * @poppler_movie: a #PopplerMovie + * + * Returns the relative speed of the movie + * + * Return value: the relative speed of the movie (1 means no change) + * + * Since: 0.80 + */ +gdouble poppler_movie_get_rate(PopplerMovie *poppler_movie) +{ + g_return_val_if_fail(POPPLER_IS_MOVIE(poppler_movie), 0); + + return poppler_movie->rate; +} + +/** + * poppler_movie_get_rotation_angle: + * @poppler_movie: a #PopplerMovie + * + * Returns the rotation angle + * + * Return value: the number of degrees the movie should be rotated (positive, + * multiples of 90: 0, 90, 180, 270) + * + * Since: 0.80 + */ +gushort poppler_movie_get_rotation_angle(PopplerMovie *poppler_movie) +{ + g_return_val_if_fail(POPPLER_IS_MOVIE(poppler_movie), 0); + + return poppler_movie->rotation_angle; +} + +/** + * poppler_movie_get_start: + * @poppler_movie: a #PopplerMovie + * + * Returns the start position of the movie playback + * + * Return value: the start position of the movie playback (in ns) + * + * Since: 0.80 + */ +guint64 poppler_movie_get_start(PopplerMovie *poppler_movie) +{ + g_return_val_if_fail(POPPLER_IS_MOVIE(poppler_movie), 0L); + + return poppler_movie->start; +} + +/** + * poppler_movie_get_duration: + * @poppler_movie: a #PopplerMovie + * + * Returns the duration of the movie playback + * + * Return value: the duration of the movie playback (in ns) + * + * Since: 0.80 + */ +guint64 poppler_movie_get_duration(PopplerMovie *poppler_movie) +{ + g_return_val_if_fail(POPPLER_IS_MOVIE(poppler_movie), 0L); + + return poppler_movie->duration; +} + +/** + * poppler_movie_get_aspect: + * @poppler_movie: a #PopplerMovie + * @width: width of the movie's bounding box + * @height: height of the movie's bounding box + * + * Returns the dimensions of the movie's bounding box (in pixels). + * The respective PDF movie dictionary entry is optional; if missing, + * -1x-1 will be returned. + * + * Since: 0.89 + */ +void poppler_movie_get_aspect(PopplerMovie *poppler_movie, gint *width, gint *height) +{ + g_return_if_fail(POPPLER_IS_MOVIE(poppler_movie)); + + *width = poppler_movie->width; + *height = poppler_movie->height; +} diff --git a/poppler-24.05.0/glib/poppler-movie.h b/poppler-24.05.0/glib/poppler-movie.h new file mode 100644 index 0000000000000000000000000000000000000000..abd69ba9db83a5cb9d976560aec7016274369314 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-movie.h @@ -0,0 +1,81 @@ +/* poppler-movie.h: glib interface to Movie + * + * Copyright (C) 2010 Carlos Garcia Campos <carlosgc@gnome.org> + * Copyright (C) 2008 Hugo Mercier <hmercier31[@]gmail.com> + * Copyright (C) 2017 Francesco Poli <invernomuto@paranoici.org> + * + * 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. + */ + +#ifndef __POPPLER_MOVIE_H__ +#define __POPPLER_MOVIE_H__ + +#include <glib-object.h> +#include "poppler.h" + +G_BEGIN_DECLS + +#define POPPLER_TYPE_MOVIE (poppler_movie_get_type()) +#define POPPLER_MOVIE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_MOVIE, PopplerMovie)) +#define POPPLER_IS_MOVIE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_MOVIE)) + +/** + * PopplerMoviePlayMode: + * @POPPLER_MOVIE_PLAY_MODE_ONCE: the movie should be played once and controls should be closed at the end. + * @POPPLER_MOVIE_PLAY_MODE_OPEN: the movie should be played once, but controls should be left open. + * @POPPLER_MOVIE_PLAY_MODE_REPEAT: the movie should be played in loop, until manually stopped. + * @POPPLER_MOVIE_PLAY_MODE_PALINDROME: the movie should be played forward and backward, forward and backward, + * and so forth, until manually stopped. + * + * Play mode enum values. + * + * Since: 0.54 + */ +typedef enum +{ + POPPLER_MOVIE_PLAY_MODE_ONCE, + POPPLER_MOVIE_PLAY_MODE_OPEN, + POPPLER_MOVIE_PLAY_MODE_REPEAT, + POPPLER_MOVIE_PLAY_MODE_PALINDROME +} PopplerMoviePlayMode; + +POPPLER_PUBLIC +GType poppler_movie_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +const gchar *poppler_movie_get_filename(PopplerMovie *poppler_movie); +POPPLER_PUBLIC +gboolean poppler_movie_need_poster(PopplerMovie *poppler_movie); +POPPLER_PUBLIC +gboolean poppler_movie_show_controls(PopplerMovie *poppler_movie); +POPPLER_PUBLIC +PopplerMoviePlayMode poppler_movie_get_play_mode(PopplerMovie *poppler_movie); +POPPLER_PUBLIC +gboolean poppler_movie_is_synchronous(PopplerMovie *poppler_movie); +POPPLER_PUBLIC +gdouble poppler_movie_get_volume(PopplerMovie *poppler_movie); +POPPLER_PUBLIC +gdouble poppler_movie_get_rate(PopplerMovie *poppler_movie); +POPPLER_PUBLIC +gushort poppler_movie_get_rotation_angle(PopplerMovie *poppler_movie); +POPPLER_PUBLIC +guint64 poppler_movie_get_start(PopplerMovie *poppler_movie); +POPPLER_PUBLIC +guint64 poppler_movie_get_duration(PopplerMovie *poppler_movie); +POPPLER_PUBLIC +void poppler_movie_get_aspect(PopplerMovie *poppler_movie, gint *width, gint *height); + +G_END_DECLS + +#endif /* __POPPLER_MOVIE_H__ */ diff --git a/poppler-24.05.0/glib/poppler-page.cc b/poppler-24.05.0/glib/poppler-page.cc new file mode 100644 index 0000000000000000000000000000000000000000..7f47cd5bbb4d6be819b7778418b9791aa6b26c07 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-page.cc @@ -0,0 +1,2574 @@ +/* poppler-page.cc: glib wrapper for poppler + * Copyright (C) 2005, Red Hat, Inc. + * + * 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 "config.h" +#include <cmath> + +#ifndef __GI_SCANNER__ +# include <GlobalParams.h> +# include <PDFDoc.h> +# include <Outline.h> +# include <ErrorCodes.h> +# include <UnicodeMap.h> +# include <GfxState.h> +# include <PageTransition.h> +# include <BBoxOutputDev.h> +#endif + +#include "poppler.h" +#include "poppler-private.h" + +static void _page_unrotate_xy(Page *page, double *x, double *y); + +/** + * SECTION:poppler-page + * @short_description: Information about a page in a document + * @title: PopplerPage + */ + +enum +{ + PROP_0, + PROP_LABEL +}; + +static PopplerRectangleExtended *poppler_rectangle_extended_new(); + +typedef struct _PopplerPageClass PopplerPageClass; +struct _PopplerPageClass +{ + GObjectClass parent_class; +}; + +G_DEFINE_TYPE(PopplerPage, poppler_page, G_TYPE_OBJECT) + +PopplerPage *_poppler_page_new(PopplerDocument *document, Page *page, int index) +{ + PopplerPage *poppler_page; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(document), NULL); + + poppler_page = (PopplerPage *)g_object_new(POPPLER_TYPE_PAGE, nullptr, NULL); + poppler_page->document = (PopplerDocument *)g_object_ref(document); + poppler_page->page = page; + poppler_page->index = index; + + return poppler_page; +} + +static void poppler_page_finalize(GObject *object) +{ + PopplerPage *page = POPPLER_PAGE(object); + + g_object_unref(page->document); + page->document = nullptr; + + if (page->text != nullptr) { + page->text->decRefCnt(); + } + /* page->page is owned by the document */ + + G_OBJECT_CLASS(poppler_page_parent_class)->finalize(object); +} + +/** + * poppler_page_get_size: + * @page: A #PopplerPage + * @width: (out) (allow-none): return location for the width of @page + * @height: (out) (allow-none): return location for the height of @page + * + * Gets the size of @page at the current scale and rotation. + **/ +void poppler_page_get_size(PopplerPage *page, double *width, double *height) +{ + double page_width, page_height; + int rotate; + + g_return_if_fail(POPPLER_IS_PAGE(page)); + + rotate = page->page->getRotate(); + if (rotate == 90 || rotate == 270) { + page_height = page->page->getCropWidth(); + page_width = page->page->getCropHeight(); + } else { + page_width = page->page->getCropWidth(); + page_height = page->page->getCropHeight(); + } + + if (width != nullptr) { + *width = page_width; + } + if (height != nullptr) { + *height = page_height; + } +} + +/** + * poppler_page_get_index: + * @page: a #PopplerPage + * + * Returns the index of @page + * + * Return value: index value of @page + **/ +int poppler_page_get_index(PopplerPage *page) +{ + g_return_val_if_fail(POPPLER_IS_PAGE(page), 0); + + return page->index; +} + +/** + * poppler_page_get_label: + * @page: a #PopplerPage + * + * Returns the label of @page. Note that page labels + * and page indices might not coincide. + * + * Return value: a new allocated string containing the label of @page, + * or %NULL if @page doesn't have a label + * + * Since: 0.16 + **/ +gchar *poppler_page_get_label(PopplerPage *page) +{ + GooString label; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + + page->document->doc->getCatalog()->indexToLabel(page->index, &label); + return _poppler_goo_string_to_utf8(&label); +} + +/** + * poppler_page_get_duration: + * @page: a #PopplerPage + * + * Returns the duration of @page + * + * Return value: duration in seconds of @page or -1. + **/ +double poppler_page_get_duration(PopplerPage *page) +{ + g_return_val_if_fail(POPPLER_IS_PAGE(page), -1); + + return page->page->getDuration(); +} + +/** + * poppler_page_get_transition: + * @page: a #PopplerPage + * + * Returns the transition effect of @page + * + * Return value: a #PopplerPageTransition or %NULL. + **/ +PopplerPageTransition *poppler_page_get_transition(PopplerPage *page) +{ + PageTransition *trans; + PopplerPageTransition *transition; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + + Object obj = page->page->getTrans(); + trans = new PageTransition(&obj); + + if (!trans->isOk()) { + delete trans; + return nullptr; + } + + transition = poppler_page_transition_new(); + + switch (trans->getType()) { + case transitionReplace: + transition->type = POPPLER_PAGE_TRANSITION_REPLACE; + break; + case transitionSplit: + transition->type = POPPLER_PAGE_TRANSITION_SPLIT; + break; + case transitionBlinds: + transition->type = POPPLER_PAGE_TRANSITION_BLINDS; + break; + case transitionBox: + transition->type = POPPLER_PAGE_TRANSITION_BOX; + break; + case transitionWipe: + transition->type = POPPLER_PAGE_TRANSITION_WIPE; + break; + case transitionDissolve: + transition->type = POPPLER_PAGE_TRANSITION_DISSOLVE; + break; + case transitionGlitter: + transition->type = POPPLER_PAGE_TRANSITION_GLITTER; + break; + case transitionFly: + transition->type = POPPLER_PAGE_TRANSITION_FLY; + break; + case transitionPush: + transition->type = POPPLER_PAGE_TRANSITION_PUSH; + break; + case transitionCover: + transition->type = POPPLER_PAGE_TRANSITION_COVER; + break; + case transitionUncover: + transition->type = POPPLER_PAGE_TRANSITION_UNCOVER; + break; + case transitionFade: + transition->type = POPPLER_PAGE_TRANSITION_FADE; + break; + default: + g_assert_not_reached(); + } + + transition->alignment = (trans->getAlignment() == transitionHorizontal) ? POPPLER_PAGE_TRANSITION_HORIZONTAL : POPPLER_PAGE_TRANSITION_VERTICAL; + + transition->direction = (trans->getDirection() == transitionInward) ? POPPLER_PAGE_TRANSITION_INWARD : POPPLER_PAGE_TRANSITION_OUTWARD; + + transition->duration = trans->getDuration(); + transition->duration_real = trans->getDuration(); + transition->angle = trans->getAngle(); + transition->scale = trans->getScale(); + transition->rectangular = trans->isRectangular(); + + delete trans; + + return transition; +} + +static TextPage *poppler_page_get_text_page(PopplerPage *page) +{ + if (page->text == nullptr) { + TextOutputDev *text_dev; + Gfx *gfx; + + text_dev = new TextOutputDev(nullptr, true, 0, false, false); + gfx = page->page->createGfx(text_dev, 72.0, 72.0, 0, false, /* useMediaBox */ + true, /* Crop */ + -1, -1, -1, -1, false, /* printing */ + nullptr, nullptr); + page->page->display(gfx); + text_dev->endPage(); + + page->text = text_dev->takeText(); + delete gfx; + delete text_dev; + } + + return page->text; +} + +static gboolean annot_is_markup(Annot *annot) +{ + switch (annot->getType()) { + case Annot::typeLink: + case Annot::typePopup: + case Annot::typeMovie: + case Annot::typeScreen: + case Annot::typePrinterMark: + case Annot::typeTrapNet: + case Annot::typeWatermark: + case Annot::type3D: + case Annot::typeWidget: + return FALSE; + default: + return TRUE; + } +} + +static bool poppler_print_annot_cb(Annot *annot, void *user_data) +{ + PopplerPrintFlags user_print_flags = (PopplerPrintFlags)GPOINTER_TO_INT(user_data); + + if (annot->getFlags() & Annot::flagHidden) { + return false; + } + + if (user_print_flags & POPPLER_PRINT_STAMP_ANNOTS_ONLY) { + return (annot->getType() == Annot::typeStamp) ? (annot->getFlags() & Annot::flagPrint) : (annot->getType() == Annot::typeWidget); + } + + if (user_print_flags & POPPLER_PRINT_MARKUP_ANNOTS) { + return annot_is_markup(annot) ? (annot->getFlags() & Annot::flagPrint) : (annot->getType() == Annot::typeWidget); + } + + /* Print document only, form fields are always printed */ + return (annot->getType() == Annot::typeWidget); +} + +static void _poppler_page_render(PopplerPage *page, cairo_t *cairo, bool printing, PopplerPrintFlags print_flags) +{ + CairoOutputDev *output_dev; + + g_return_if_fail(POPPLER_IS_PAGE(page)); + + output_dev = page->document->output_dev; + output_dev->setCairo(cairo); + output_dev->setPrinting(printing); + + if (!printing && page->text == nullptr) { + page->text = new TextPage(false); + output_dev->setTextPage(page->text); + } + /* NOTE: instead of passing -1 we should/could use cairo_clip_extents() + * to get a bounding box */ + cairo_save(cairo); + page->page->displaySlice(output_dev, 72.0, 72.0, 0, false, /* useMediaBox */ + true, /* Crop */ + -1, -1, -1, -1, printing, nullptr, nullptr, printing ? poppler_print_annot_cb : nullptr, printing ? GINT_TO_POINTER((gint)print_flags) : nullptr); + cairo_restore(cairo); + + output_dev->setCairo(nullptr); + output_dev->setTextPage(nullptr); +} + +/** + * poppler_page_render: + * @page: the page to render from + * @cairo: cairo context to render to + * + * Render the page to the given cairo context. This function + * is for rendering a page that will be displayed. If you want + * to render a page that will be printed use + * poppler_page_render_for_printing() instead. Please see the documentation + * for that function for the differences between rendering to the screen and + * rendering to a printer. + **/ +void poppler_page_render(PopplerPage *page, cairo_t *cairo) +{ + g_return_if_fail(POPPLER_IS_PAGE(page)); + + _poppler_page_render(page, cairo, false, (PopplerPrintFlags)0); +} + +/** + * poppler_page_render_for_printing_with_options: + * @page: the page to render from + * @cairo: cairo context to render to + * @options: print options + * + * Render the page to the given cairo context for printing + * with the specified options + * + * See the documentation for poppler_page_render_for_printing() for the + * differences between rendering to the screen and rendering to a printer. + * + * Since: 0.16 + **/ +void poppler_page_render_for_printing_with_options(PopplerPage *page, cairo_t *cairo, PopplerPrintFlags options) +{ + g_return_if_fail(POPPLER_IS_PAGE(page)); + + _poppler_page_render(page, cairo, true, options); +} + +/** + * poppler_page_render_for_printing: + * @page: the page to render from + * @cairo: cairo context to render to + * + * Render the page to the given cairo context for printing with + * #POPPLER_PRINT_ALL flags selected. If you want a different set of flags, + * use poppler_page_render_for_printing_with_options(). + * + * The difference between poppler_page_render() and this function is that some + * things get rendered differently between screens and printers: + * + * <itemizedlist> + * <listitem> + * PDF annotations get rendered according to their #PopplerAnnotFlag value. + * For example, #POPPLER_ANNOT_FLAG_PRINT refers to whether an annotation + * is printed or not, whereas #POPPLER_ANNOT_FLAG_NO_VIEW refers to whether + * an annotation is invisible when displaying to the screen. + * </listitem> + * <listitem> + * PDF supports "hairlines" of width 0.0, which often get rendered as + * having a width of 1 device pixel. When displaying on a screen, Cairo + * may render such lines wide so that they are hard to see, and Poppler + * makes use of PDF's Stroke Adjust graphics parameter to make the lines + * easier to see. However, when printing, Poppler is able to directly use a + * printer's pixel size instead. + * </listitem> + * <listitem> + * Some advanced features in PDF may require an image to be rasterized + * before sending off to a printer. This may produce raster images which + * exceed Cairo's limits. The "printing" functions will detect this condition + * and try to down-scale the intermediate surfaces as appropriate. + * </listitem> + * </itemizedlist> + * + **/ +void poppler_page_render_for_printing(PopplerPage *page, cairo_t *cairo) +{ + g_return_if_fail(POPPLER_IS_PAGE(page)); + + _poppler_page_render(page, cairo, true, POPPLER_PRINT_ALL); +} + +static cairo_surface_t *create_surface_from_thumbnail_data(guchar *data, gint width, gint height, gint rowstride) +{ + guchar *cairo_pixels; + gint cairo_stride; + cairo_surface_t *surface; + int j; + + surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, width, height); + if (cairo_surface_status(surface)) { + return nullptr; + } + + cairo_pixels = cairo_image_surface_get_data(surface); + cairo_stride = cairo_image_surface_get_stride(surface); + + for (j = height; j; j--) { + guchar *p = data; + guchar *q = cairo_pixels; + guchar *end = p + 3 * width; + + while (p < end) { +#if G_BYTE_ORDER == G_LITTLE_ENDIAN + q[0] = p[2]; + q[1] = p[1]; + q[2] = p[0]; +#else + q[1] = p[0]; + q[2] = p[1]; + q[3] = p[2]; +#endif + p += 3; + q += 4; + } + + data += rowstride; + cairo_pixels += cairo_stride; + } + + return surface; +} + +/** + * poppler_page_get_thumbnail: + * @page: the #PopplerPage to get the thumbnail for + * + * Get the embedded thumbnail for the specified page. If the document + * doesn't have an embedded thumbnail for the page, this function + * returns %NULL. + * + * Return value: the tumbnail as a cairo_surface_t or %NULL if the document + * doesn't have a thumbnail for this page. + **/ +cairo_surface_t *poppler_page_get_thumbnail(PopplerPage *page) +{ + unsigned char *data; + int width, height, rowstride; + cairo_surface_t *surface; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + + if (!page->page->loadThumb(&data, &width, &height, &rowstride)) { + return nullptr; + } + + surface = create_surface_from_thumbnail_data(data, width, height, rowstride); + gfree(data); + + return surface; +} + +/** + * poppler_page_render_selection: + * @page: the #PopplerPage for which to render selection + * @cairo: cairo context to render to + * @selection: start and end point of selection as a rectangle + * @old_selection: previous selection + * @style: a #PopplerSelectionStyle + * @glyph_color: color to use for drawing glyphs + * @background_color: color to use for the selection background + * + * Render the selection specified by @selection for @page to + * the given cairo context. The selection will be rendered, using + * @glyph_color for the glyphs and @background_color for the selection + * background. + * + * If non-NULL, @old_selection specifies the selection that is already + * rendered to @cairo, in which case this function will (some day) + * only render the changed part of the selection. + **/ +void poppler_page_render_selection(PopplerPage *page, cairo_t *cairo, PopplerRectangle *selection, PopplerRectangle *old_selection, PopplerSelectionStyle style, PopplerColor *glyph_color, PopplerColor *background_color) +{ + CairoOutputDev *output_dev; + TextPage *text; + SelectionStyle selection_style = selectionStyleGlyph; + PDFRectangle pdf_selection(selection->x1, selection->y1, selection->x2, selection->y2); + + GfxColor gfx_background_color = { { background_color->red, background_color->green, background_color->blue } }; + GfxColor gfx_glyph_color = { { glyph_color->red, glyph_color->green, glyph_color->blue } }; + + switch (style) { + case POPPLER_SELECTION_GLYPH: + selection_style = selectionStyleGlyph; + break; + case POPPLER_SELECTION_WORD: + selection_style = selectionStyleWord; + break; + case POPPLER_SELECTION_LINE: + selection_style = selectionStyleLine; + break; + } + + output_dev = page->document->output_dev; + output_dev->setCairo(cairo); + + text = poppler_page_get_text_page(page); + text->drawSelection(output_dev, 1.0, 0, &pdf_selection, selection_style, &gfx_glyph_color, &gfx_background_color); + + output_dev->setCairo(nullptr); +} + +/** + * poppler_page_get_thumbnail_size: + * @page: A #PopplerPage + * @width: (out): return location for width + * @height: (out): return location for height + * + * Returns %TRUE if @page has a thumbnail associated with it. It also + * fills in @width and @height with the width and height of the + * thumbnail. The values of width and height are not changed if no + * appropriate thumbnail exists. + * + * Return value: %TRUE, if @page has a thumbnail associated with it. + **/ +gboolean poppler_page_get_thumbnail_size(PopplerPage *page, int *width, int *height) +{ + Dict *dict; + gboolean retval = FALSE; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), FALSE); + g_return_val_if_fail(width != nullptr, FALSE); + g_return_val_if_fail(height != nullptr, FALSE); + + Object thumb = page->page->getThumb(); + if (!thumb.isStream()) { + return FALSE; + } + + dict = thumb.streamGetDict(); + + /* Theoretically, this could succeed and you would still fail when + * loading the thumb */ + if (dict->lookupInt("Width", "W", width) && dict->lookupInt("Height", "H", height)) { + retval = TRUE; + } + + return retval; +} + +/** + * poppler_page_get_selection_region: + * @page: a #PopplerPage + * @scale: scale specified as pixels per point + * @style: a #PopplerSelectionStyle + * @selection: start and end point of selection as a rectangle + * + * Returns a region containing the area that would be rendered by + * poppler_page_render_selection() as a #GList of + * #PopplerRectangle. The returned list must be freed with + * poppler_page_selection_region_free(). + * + * Return value: (element-type PopplerRectangle) (transfer full): a #GList of #PopplerRectangle + * + * Deprecated: 0.16: Use poppler_page_get_selected_region() instead. + **/ +GList *poppler_page_get_selection_region(PopplerPage *page, gdouble scale, PopplerSelectionStyle style, PopplerRectangle *selection) +{ + PDFRectangle poppler_selection; + TextPage *text; + SelectionStyle selection_style = selectionStyleGlyph; + GList *region = nullptr; + + poppler_selection.x1 = selection->x1; + poppler_selection.y1 = selection->y1; + poppler_selection.x2 = selection->x2; + poppler_selection.y2 = selection->y2; + + switch (style) { + case POPPLER_SELECTION_GLYPH: + selection_style = selectionStyleGlyph; + break; + case POPPLER_SELECTION_WORD: + selection_style = selectionStyleWord; + break; + case POPPLER_SELECTION_LINE: + selection_style = selectionStyleLine; + break; + } + + text = poppler_page_get_text_page(page); + std::vector<PDFRectangle *> *list = text->getSelectionRegion(&poppler_selection, selection_style, scale); + + for (const PDFRectangle *selection_rect : *list) { + PopplerRectangle *rect; + + rect = poppler_rectangle_new_from_pdf_rectangle(selection_rect); + + region = g_list_prepend(region, rect); + + delete selection_rect; + } + + delete list; + + return g_list_reverse(region); +} + +/** + * poppler_page_selection_region_free: + * @region: (element-type PopplerRectangle): a #GList of + * #PopplerRectangle + * + * Frees @region + * + * Deprecated: 0.16: Use only to free deprecated regions created by + * poppler_page_get_selection_region(). Regions created by + * poppler_page_get_selected_region() should be freed with + * cairo_region_destroy() instead. + */ +void poppler_page_selection_region_free(GList *region) +{ + if (G_UNLIKELY(!region)) { + return; + } + + g_list_free_full(region, (GDestroyNotify)poppler_rectangle_free); +} + +/** + * poppler_page_get_selected_region: + * @page: a #PopplerPage + * @scale: scale specified as pixels per point + * @style: a #PopplerSelectionStyle + * @selection: start and end point of selection as a rectangle + * + * Returns a region containing the area that would be rendered by + * poppler_page_render_selection(). + * The returned region must be freed with cairo_region_destroy() + * + * Return value: (transfer full): a cairo_region_t + * + * Since: 0.16 + **/ +cairo_region_t *poppler_page_get_selected_region(PopplerPage *page, gdouble scale, PopplerSelectionStyle style, PopplerRectangle *selection) +{ + PDFRectangle poppler_selection; + TextPage *text; + SelectionStyle selection_style = selectionStyleGlyph; + cairo_region_t *region; + + poppler_selection.x1 = selection->x1; + poppler_selection.y1 = selection->y1; + poppler_selection.x2 = selection->x2; + poppler_selection.y2 = selection->y2; + + switch (style) { + case POPPLER_SELECTION_GLYPH: + selection_style = selectionStyleGlyph; + break; + case POPPLER_SELECTION_WORD: + selection_style = selectionStyleWord; + break; + case POPPLER_SELECTION_LINE: + selection_style = selectionStyleLine; + break; + } + + text = poppler_page_get_text_page(page); + std::vector<PDFRectangle *> *list = text->getSelectionRegion(&poppler_selection, selection_style, 1.0); + + region = cairo_region_create(); + + for (const PDFRectangle *selection_rect : *list) { + cairo_rectangle_int_t rect; + + rect.x = (gint)((selection_rect->x1 * scale) + 0.5); + rect.y = (gint)((selection_rect->y1 * scale) + 0.5); + rect.width = (gint)(((selection_rect->x2 - selection_rect->x1) * scale) + 0.5); + rect.height = (gint)(((selection_rect->y2 - selection_rect->y1) * scale) + 0.5); + cairo_region_union_rectangle(region, &rect); + + delete selection_rect; + } + + delete list; + + return region; +} + +/** + * poppler_page_get_selected_text: + * @page: a #PopplerPage + * @style: a #PopplerSelectionStyle + * @selection: the #PopplerRectangle including the text + * + * Retrieves the contents of the specified @selection as text. + * + * Return value: a pointer to the contents of the @selection + * as a string + * Since: 0.16 + **/ +char *poppler_page_get_selected_text(PopplerPage *page, PopplerSelectionStyle style, PopplerRectangle *selection) +{ + GooString *sel_text; + char *result; + TextPage *text; + SelectionStyle selection_style = selectionStyleGlyph; + PDFRectangle pdf_selection; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + g_return_val_if_fail(selection != nullptr, NULL); + + pdf_selection.x1 = selection->x1; + pdf_selection.y1 = selection->y1; + pdf_selection.x2 = selection->x2; + pdf_selection.y2 = selection->y2; + + switch (style) { + case POPPLER_SELECTION_GLYPH: + selection_style = selectionStyleGlyph; + break; + case POPPLER_SELECTION_WORD: + selection_style = selectionStyleWord; + break; + case POPPLER_SELECTION_LINE: + selection_style = selectionStyleLine; + break; + } + + text = poppler_page_get_text_page(page); + sel_text = text->getSelectionText(&pdf_selection, selection_style); + result = g_strdup(sel_text->c_str()); + delete sel_text; + + return result; +} + +/** + * poppler_page_get_text: + * @page: a #PopplerPage + * + * Retrieves the text of @page. + * + * Return value: a pointer to the text of the @page + * as a string + * Since: 0.16 + **/ +char *poppler_page_get_text(PopplerPage *page) +{ + PopplerRectangle rectangle = { 0, 0, 0, 0 }; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + + poppler_page_get_size(page, &rectangle.x2, &rectangle.y2); + + return poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH, &rectangle); +} + +/** + * poppler_page_get_text_for_area: + * @page: a #PopplerPage + * @area: a #PopplerRectangle + * + * Retrieves the text of @page contained in @area. + * + * Return value: a pointer to the text as a string + * + * Since: 0.26 + **/ +char *poppler_page_get_text_for_area(PopplerPage *page, PopplerRectangle *area) +{ + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + g_return_val_if_fail(area != nullptr, NULL); + + return poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH, area); +} + +/** + * poppler_page_find_text_with_options: + * @page: a #PopplerPage + * @text: the text to search for (UTF-8 encoded) + * @options: find options + * + * Finds @text in @page with the given #PopplerFindFlags options and + * returns a #GList of rectangles for each occurrence of the text on the page. + * The coordinates are in PDF points. + * + * When %POPPLER_FIND_MULTILINE is passed in @options, matches may span more than + * one line. In this case, the returned list will contain one #PopplerRectangle + * for each part of a match. The function poppler_rectangle_find_get_match_continued() + * will return %TRUE for all rectangles belonging to the same match, except for + * the last one. If a hyphen was ignored at the end of the part of the match, + * poppler_rectangle_find_get_ignored_hyphen() will return %TRUE for that + * rectangle. + * + * Note that currently matches spanning more than two lines are not found. + * (This limitation may be lifted in a future version.) + * + * Note also that currently finding multi-line matches backwards is not + * implemented; if you pass %POPPLER_FIND_BACKWARDS and %POPPLER_FIND_MULTILINE + * together, %POPPLER_FIND_MULTILINE will be ignored. + * + * Return value: (element-type PopplerRectangle) (transfer full): a newly allocated list + * of newly allocated #PopplerRectangle. Free with g_list_free_full() using poppler_rectangle_free(). + * + * Since: 0.22 + **/ +GList *poppler_page_find_text_with_options(PopplerPage *page, const char *text, PopplerFindFlags options) +{ + PopplerRectangleExtended *match; + GList *matches; + double xMin, yMin, xMax, yMax; + PDFRectangle continueMatch; + bool ignoredHyphen; + gunichar *ucs4; + glong ucs4_len; + double height; + TextPage *text_dev; + gboolean backwards; + gboolean start_at_last = FALSE; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + g_return_val_if_fail(text != nullptr, NULL); + + text_dev = poppler_page_get_text_page(page); + + ucs4 = g_utf8_to_ucs4_fast(text, -1, &ucs4_len); + poppler_page_get_size(page, nullptr, &height); + + const bool multiline = (options & POPPLER_FIND_MULTILINE); + backwards = options & POPPLER_FIND_BACKWARDS; + matches = nullptr; + xMin = 0; + yMin = backwards ? height : 0; + + continueMatch.x1 = std::numeric_limits<double>::max(); // we use this to detect valid returned values + + while (text_dev->findText(ucs4, ucs4_len, false, true, // startAtTop, stopAtBottom + start_at_last, + false, // stopAtLast + options & POPPLER_FIND_CASE_SENSITIVE, options & POPPLER_FIND_IGNORE_DIACRITICS, options & POPPLER_FIND_MULTILINE, backwards, options & POPPLER_FIND_WHOLE_WORDS_ONLY, &xMin, &yMin, &xMax, &yMax, &continueMatch, + &ignoredHyphen)) { + match = poppler_rectangle_extended_new(); + match->x1 = xMin; + match->y1 = height - yMax; + match->x2 = xMax; + match->y2 = height - yMin; + match->match_continued = false; + match->ignored_hyphen = false; + matches = g_list_prepend(matches, match); + start_at_last = TRUE; + + if (continueMatch.x1 != std::numeric_limits<double>::max()) { + // received rect for next-line part of a multi-line match, add it. + if (multiline) { + match->match_continued = true; + match->ignored_hyphen = ignoredHyphen; + match = poppler_rectangle_extended_new(); + match->x1 = continueMatch.x1; + match->y1 = height - continueMatch.y1; + match->x2 = continueMatch.x2; + match->y2 = height - continueMatch.y2; + match->match_continued = false; + match->ignored_hyphen = false; + matches = g_list_prepend(matches, match); + } + + continueMatch.x1 = std::numeric_limits<double>::max(); + } + } + + g_free(ucs4); + + return g_list_reverse(matches); +} + +/** + * poppler_page_find_text: + * @page: a #PopplerPage + * @text: the text to search for (UTF-8 encoded) + * + * Finds @text in @page with the default options (%POPPLER_FIND_DEFAULT) and + * returns a #GList of rectangles for each occurrence of the text on the page. + * The coordinates are in PDF points. + * + * Return value: (element-type PopplerRectangle) (transfer full): a #GList of #PopplerRectangle, + **/ +GList *poppler_page_find_text(PopplerPage *page, const char *text) +{ + return poppler_page_find_text_with_options(page, text, POPPLER_FIND_DEFAULT); +} + +static CairoImageOutputDev *poppler_page_get_image_output_dev(PopplerPage *page, bool (*imgDrawDeviceCbk)(int img_id, void *data), void *imgDrawCbkData) +{ + CairoImageOutputDev *image_dev; + Gfx *gfx; + + image_dev = new CairoImageOutputDev(); + + if (imgDrawDeviceCbk) { + image_dev->setImageDrawDecideCbk(imgDrawDeviceCbk, imgDrawCbkData); + } + + gfx = page->page->createGfx(image_dev, 72.0, 72.0, 0, false, /* useMediaBox */ + true, /* Crop */ + -1, -1, -1, -1, false, /* printing */ + nullptr, nullptr); + page->page->display(gfx); + delete gfx; + + return image_dev; +} + +/** + * poppler_page_get_image_mapping: + * @page: A #PopplerPage + * + * Returns a list of #PopplerImageMapping items that map from a + * location on @page to an image of the page. This list must be freed + * with poppler_page_free_image_mapping() when done. + * + * Return value: (element-type PopplerImageMapping) (transfer full): A #GList of #PopplerImageMapping + **/ +GList *poppler_page_get_image_mapping(PopplerPage *page) +{ + GList *map_list = nullptr; + CairoImageOutputDev *out; + gint i; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + + out = poppler_page_get_image_output_dev(page, nullptr, nullptr); + + for (i = 0; i < out->getNumImages(); i++) { + PopplerImageMapping *mapping; + CairoImage *image; + + image = out->getImage(i); + + /* Create the mapping */ + mapping = poppler_image_mapping_new(); + + image->getRect(&(mapping->area.x1), &(mapping->area.y1), &(mapping->area.x2), &(mapping->area.y2)); + mapping->image_id = i; + + mapping->area.x1 -= page->page->getCropBox()->x1; + mapping->area.x2 -= page->page->getCropBox()->x1; + mapping->area.y1 -= page->page->getCropBox()->y1; + mapping->area.y2 -= page->page->getCropBox()->y1; + + map_list = g_list_prepend(map_list, mapping); + } + + delete out; + + return map_list; +} + +static bool image_draw_decide_cb(int image_id, void *data) +{ + return (image_id == GPOINTER_TO_INT(data)); +} + +/** + * poppler_page_get_image: + * @page: A #PopplerPage + * @image_id: The image identifier + * + * Returns a cairo surface for the image of the @page + * + * Return value: A cairo surface for the image + **/ +cairo_surface_t *poppler_page_get_image(PopplerPage *page, gint image_id) +{ + CairoImageOutputDev *out; + cairo_surface_t *image; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + + out = poppler_page_get_image_output_dev(page, image_draw_decide_cb, GINT_TO_POINTER(image_id)); + + if (image_id >= out->getNumImages()) { + delete out; + + return nullptr; + } + + image = out->getImage(image_id)->getImage(); + if (!image) { + delete out; + + return nullptr; + } + + cairo_surface_reference(image); + delete out; + + return image; +} + +/** + * poppler_page_free_image_mapping: + * @list: (element-type PopplerImageMapping): A list of + * #PopplerImageMapping<!-- -->s + * + * Frees a list of #PopplerImageMapping<!-- -->s allocated by + * poppler_page_get_image_mapping(). + **/ +void poppler_page_free_image_mapping(GList *list) +{ + if (G_UNLIKELY(list == nullptr)) { + return; + } + + g_list_free_full(list, (GDestroyNotify)poppler_image_mapping_free); +} + +/** + * poppler_page_render_to_ps: + * @page: a #PopplerPage + * @ps_file: the PopplerPSFile to render to + * + * Render the page on a postscript file + * + **/ +void poppler_page_render_to_ps(PopplerPage *page, PopplerPSFile *ps_file) +{ + g_return_if_fail(POPPLER_IS_PAGE(page)); + g_return_if_fail(ps_file != nullptr); + + if (!ps_file->out) { + std::vector<int> pages; + for (int i = ps_file->first_page; i <= ps_file->last_page; ++i) { + pages.push_back(i); + } + if (ps_file->fd != -1) { + ps_file->out = + new PSOutputDev(ps_file->fd, ps_file->document->doc, nullptr, pages, psModePS, (int)ps_file->paper_width, (int)ps_file->paper_height, false, ps_file->duplex, 0, 0, 0, 0, psRasterizeWhenNeeded, false, nullptr, nullptr); + } else { + ps_file->out = new PSOutputDev(ps_file->filename, ps_file->document->doc, nullptr, pages, psModePS, (int)ps_file->paper_width, (int)ps_file->paper_height, false, ps_file->duplex, 0, 0, 0, 0, psRasterizeWhenNeeded, false, + nullptr, nullptr); + } + } + + ps_file->document->doc->displayPage(ps_file->out, page->index + 1, 72.0, 72.0, 0, false, true, false); +} + +static void poppler_page_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) +{ + PopplerPage *page = POPPLER_PAGE(object); + + switch (prop_id) { + case PROP_LABEL: + g_value_take_string(value, poppler_page_get_label(page)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + +static void poppler_page_class_init(PopplerPageClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->finalize = poppler_page_finalize; + gobject_class->get_property = poppler_page_get_property; + + /** + * PopplerPage:label: + * + * The label of the page or %NULL. See also poppler_page_get_label() + */ + g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_LABEL, g_param_spec_string("label", "Page Label", "The label of the page", nullptr, G_PARAM_READABLE)); +} + +static void poppler_page_init(PopplerPage *page) { } + +/** + * poppler_page_get_link_mapping: + * @page: A #PopplerPage + * + * Returns a list of #PopplerLinkMapping items that map from a + * location on @page to a #PopplerAction. This list must be freed + * with poppler_page_free_link_mapping() when done. + * + * Return value: (element-type PopplerLinkMapping) (transfer full): A #GList of #PopplerLinkMapping + **/ +GList *poppler_page_get_link_mapping(PopplerPage *page) +{ + GList *map_list = nullptr; + Links *links; + double width, height; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + + links = new Links(page->page->getAnnots()); + + if (links == nullptr) { + return nullptr; + } + + poppler_page_get_size(page, &width, &height); + + for (AnnotLink *link : links->getLinks()) { + PopplerLinkMapping *mapping; + PopplerRectangle rect; + LinkAction *link_action; + + link_action = link->getAction(); + + /* Create the mapping */ + mapping = poppler_link_mapping_new(); + mapping->action = _poppler_action_new(page->document, link_action, nullptr); + + link->getRect(&rect.x1, &rect.y1, &rect.x2, &rect.y2); + + rect.x1 -= page->page->getCropBox()->x1; + rect.x2 -= page->page->getCropBox()->x1; + rect.y1 -= page->page->getCropBox()->y1; + rect.y2 -= page->page->getCropBox()->y1; + + switch (page->page->getRotate()) { + case 90: + mapping->area.x1 = rect.y1; + mapping->area.y1 = height - rect.x2; + mapping->area.x2 = mapping->area.x1 + (rect.y2 - rect.y1); + mapping->area.y2 = mapping->area.y1 + (rect.x2 - rect.x1); + + break; + case 180: + mapping->area.x1 = width - rect.x2; + mapping->area.y1 = height - rect.y2; + mapping->area.x2 = mapping->area.x1 + (rect.x2 - rect.x1); + mapping->area.y2 = mapping->area.y1 + (rect.y2 - rect.y1); + + break; + case 270: + mapping->area.x1 = width - rect.y2; + mapping->area.y1 = rect.x1; + mapping->area.x2 = mapping->area.x1 + (rect.y2 - rect.y1); + mapping->area.y2 = mapping->area.y1 + (rect.x2 - rect.x1); + + break; + default: + mapping->area.x1 = rect.x1; + mapping->area.y1 = rect.y1; + mapping->area.x2 = rect.x2; + mapping->area.y2 = rect.y2; + } + + map_list = g_list_prepend(map_list, mapping); + } + + delete links; + + return map_list; +} + +/** + * poppler_page_free_link_mapping: + * @list: (element-type PopplerLinkMapping): A list of + * #PopplerLinkMapping<!-- -->s + * + * Frees a list of #PopplerLinkMapping<!-- -->s allocated by + * poppler_page_get_link_mapping(). It also frees the #PopplerAction<!-- -->s + * that each mapping contains, so if you want to keep them around, you need to + * copy them with poppler_action_copy(). + **/ +void poppler_page_free_link_mapping(GList *list) +{ + if (G_UNLIKELY(list == nullptr)) { + return; + } + + g_list_free_full(list, (GDestroyNotify)poppler_link_mapping_free); +} + +/** + * poppler_page_get_form_field_mapping: + * @page: A #PopplerPage + * + * Returns a list of #PopplerFormFieldMapping items that map from a + * location on @page to a form field. This list must be freed + * with poppler_page_free_form_field_mapping() when done. + * + * Return value: (element-type PopplerFormFieldMapping) (transfer full): A #GList of #PopplerFormFieldMapping + **/ +GList *poppler_page_get_form_field_mapping(PopplerPage *page) +{ + GList *map_list = nullptr; + gint i; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + + const std::unique_ptr<FormPageWidgets> forms = page->page->getFormWidgets(); + + if (forms == nullptr) { + return nullptr; + } + + for (i = 0; i < forms->getNumWidgets(); i++) { + PopplerFormFieldMapping *mapping; + FormWidget *field; + + mapping = poppler_form_field_mapping_new(); + + field = forms->getWidget(i); + + mapping->field = _poppler_form_field_new(page->document, field); + field->getRect(&(mapping->area.x1), &(mapping->area.y1), &(mapping->area.x2), &(mapping->area.y2)); + + mapping->area.x1 -= page->page->getCropBox()->x1; + mapping->area.x2 -= page->page->getCropBox()->x1; + mapping->area.y1 -= page->page->getCropBox()->y1; + mapping->area.y2 -= page->page->getCropBox()->y1; + + map_list = g_list_prepend(map_list, mapping); + } + + return map_list; +} + +/** + * poppler_page_free_form_field_mapping: + * @list: (element-type PopplerFormFieldMapping): A list of + * #PopplerFormFieldMapping<!-- -->s + * + * Frees a list of #PopplerFormFieldMapping<!-- -->s allocated by + * poppler_page_get_form_field_mapping(). + **/ +void poppler_page_free_form_field_mapping(GList *list) +{ + if (G_UNLIKELY(list == nullptr)) { + return; + } + + g_list_free_full(list, (GDestroyNotify)poppler_form_field_mapping_free); +} + +/** + * poppler_page_get_annot_mapping: + * @page: A #PopplerPage + * + * Returns a list of #PopplerAnnotMapping items that map from a location on + * @page to a #PopplerAnnot. This list must be freed with + * poppler_page_free_annot_mapping() when done. + * + * Return value: (element-type PopplerAnnotMapping) (transfer full): A #GList of #PopplerAnnotMapping + **/ +GList *poppler_page_get_annot_mapping(PopplerPage *page) +{ + GList *map_list = nullptr; + double width, height; + Annots *annots; + const PDFRectangle *crop_box; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + + annots = page->page->getAnnots(); + if (!annots) { + return nullptr; + } + + poppler_page_get_size(page, &width, &height); + crop_box = page->page->getCropBox(); + + for (Annot *annot : annots->getAnnots()) { + PopplerAnnotMapping *mapping; + PopplerRectangle rect; + gboolean flag_no_rotate; + gint rotation = 0; + + flag_no_rotate = annot->getFlags() & Annot::flagNoRotate; + + /* Create the mapping */ + mapping = poppler_annot_mapping_new(); + + switch (annot->getType()) { + case Annot::typeText: + mapping->annot = _poppler_annot_text_new(annot); + break; + case Annot::typeFreeText: + mapping->annot = _poppler_annot_free_text_new(annot); + break; + case Annot::typeFileAttachment: + mapping->annot = _poppler_annot_file_attachment_new(annot); + break; + case Annot::typeMovie: + mapping->annot = _poppler_annot_movie_new(annot); + break; + case Annot::typeScreen: + mapping->annot = _poppler_annot_screen_new(page->document, annot); + break; + case Annot::typeLine: + mapping->annot = _poppler_annot_line_new(annot); + break; + case Annot::typeSquare: + mapping->annot = _poppler_annot_square_new(annot); + break; + case Annot::typeCircle: + mapping->annot = _poppler_annot_circle_new(annot); + break; + case Annot::typeHighlight: + case Annot::typeUnderline: + case Annot::typeSquiggly: + case Annot::typeStrikeOut: + mapping->annot = _poppler_annot_text_markup_new(annot); + break; + case Annot::typeStamp: + mapping->annot = _poppler_annot_stamp_new(annot); + break; + default: + mapping->annot = _poppler_annot_new(annot); + break; + } + + const PDFRectangle &annot_rect = annot->getRect(); + rect.x1 = annot_rect.x1 - crop_box->x1; + rect.y1 = annot_rect.y1 - crop_box->y1; + rect.x2 = annot_rect.x2 - crop_box->x1; + rect.y2 = annot_rect.y2 - crop_box->y1; + + rotation = page->page->getRotate(); + + if (rotation == 0 || !SUPPORTED_ROTATION(rotation)) { /* zero or unknown rotation */ + mapping->area.x1 = rect.x1; + mapping->area.y1 = rect.y1; + mapping->area.x2 = rect.x2; + mapping->area.y2 = rect.y2; + } else { + gdouble annot_height = rect.y2 - rect.y1; + gdouble annot_width = rect.x2 - rect.x1; + + if (flag_no_rotate) { + if (rotation == 90) { + mapping->area.x1 = rect.y2; + mapping->area.y1 = height - (rect.x1 + annot_height); + mapping->area.x2 = rect.y2 + annot_width; + mapping->area.y2 = height - rect.x1; + } else if (rotation == 180) { + mapping->area.x1 = width - rect.x1; + mapping->area.x2 = MIN(mapping->area.x1 + annot_width, width); + mapping->area.y2 = height - rect.y2; + mapping->area.y1 = MAX(0, mapping->area.y2 - annot_height); + } else if (rotation == 270) { + mapping->area.x1 = width - rect.y2; + mapping->area.x2 = MIN(mapping->area.x1 + annot_width, width); + mapping->area.y2 = rect.x1; + mapping->area.y1 = MAX(0, mapping->area.y2 - annot_height); + } + } else { /* !flag_no_rotate */ + if (rotation == 90) { + mapping->area.x1 = rect.y1; + mapping->area.y1 = height - rect.x2; + mapping->area.x2 = mapping->area.x1 + annot_height; + mapping->area.y2 = mapping->area.y1 + annot_width; + } else if (rotation == 180) { + mapping->area.x1 = width - rect.x2; + mapping->area.y1 = height - rect.y2; + mapping->area.x2 = mapping->area.x1 + annot_width; + mapping->area.y2 = mapping->area.y1 + annot_height; + } else if (rotation == 270) { + mapping->area.x1 = width - rect.y2; + mapping->area.y1 = rect.x1; + mapping->area.x2 = mapping->area.x1 + annot_height; + mapping->area.y2 = mapping->area.y1 + annot_width; + } + } + } + + map_list = g_list_prepend(map_list, mapping); + } + + return g_list_reverse(map_list); +} + +/** + * poppler_page_free_annot_mapping: + * @list: (element-type PopplerAnnotMapping): A list of + * #PopplerAnnotMapping<!-- -->s + * + * Frees a list of #PopplerAnnotMapping<!-- -->s allocated by + * poppler_page_get_annot_mapping(). It also unreferences the #PopplerAnnot<!-- -->s + * that each mapping contains, so if you want to keep them around, you need to + * reference them with g_object_ref(). + **/ +void poppler_page_free_annot_mapping(GList *list) +{ + if (G_UNLIKELY(!list)) { + return; + } + + g_list_free_full(list, (GDestroyNotify)poppler_annot_mapping_free); +} + +/* Adds or removes (according to @add parameter) the passed in @crop_box from the + * passed in @quads and returns it as a new #AnnotQuadrilaterals object */ +AnnotQuadrilaterals *new_quads_from_offset_cropbox(const PDFRectangle *crop_box, AnnotQuadrilaterals *quads, gboolean add) +{ + int len = quads->getQuadrilateralsLength(); + auto quads_array = std::make_unique<AnnotQuadrilaterals::AnnotQuadrilateral[]>(len); + for (int i = 0; i < len; i++) { + if (add) { + quads_array[i] = AnnotQuadrilaterals::AnnotQuadrilateral(quads->getX1(i) + crop_box->x1, quads->getY1(i) + crop_box->y1, quads->getX2(i) + crop_box->x1, quads->getY2(i) + crop_box->y1, quads->getX3(i) + crop_box->x1, + quads->getY3(i) + crop_box->y1, quads->getX4(i) + crop_box->x1, quads->getY4(i) + crop_box->y1); + } else { + quads_array[i] = AnnotQuadrilaterals::AnnotQuadrilateral(quads->getX1(i) - crop_box->x1, quads->getY1(i) - crop_box->y1, quads->getX2(i) - crop_box->x1, quads->getY2(i) - crop_box->y1, quads->getX3(i) - crop_box->x1, + quads->getY3(i) - crop_box->y1, quads->getX4(i) - crop_box->x1, quads->getY4(i) - crop_box->y1); + } + } + + return new AnnotQuadrilaterals(std::move(quads_array), len); +} + +/* This function undoes the rotation of @page in the passed-in @x @y point. + * In other words, it moves the point to where it'll be located if @page + * was put to zero rotation (unrotated) */ +static void _page_unrotate_xy(Page *page, double *x, double *y) +{ + double page_width, page_height, temp; + gint rotation = page->getRotate(); + + if (rotation == 90 || rotation == 270) { + page_height = page->getCropWidth(); + page_width = page->getCropHeight(); + } else { + page_width = page->getCropWidth(); + page_height = page->getCropHeight(); + } + + if (rotation == 90) { + temp = *x; + *x = page_height - *y; + *y = temp; + } else if (rotation == 180) { + *x = page_width - *x; + *y = page_height - *y; + } else if (rotation == 270) { + temp = *x; + *x = *y; + *y = page_width - temp; + } +} + +AnnotQuadrilaterals *_page_new_quads_unrotated(Page *page, AnnotQuadrilaterals *quads) +{ + double x1, y1, x2, y2, x3, y3, x4, y4; + int len = quads->getQuadrilateralsLength(); + auto quads_array = std::make_unique<AnnotQuadrilaterals::AnnotQuadrilateral[]>(len); + + for (int i = 0; i < len; i++) { + x1 = quads->getX1(i); + y1 = quads->getY1(i); + x2 = quads->getX2(i); + y2 = quads->getY2(i); + x3 = quads->getX3(i); + y3 = quads->getY3(i); + x4 = quads->getX4(i); + y4 = quads->getY4(i); + + _page_unrotate_xy(page, &x1, &y1); + _page_unrotate_xy(page, &x2, &y2); + _page_unrotate_xy(page, &x3, &y3); + _page_unrotate_xy(page, &x4, &y4); + + quads_array[i] = AnnotQuadrilaterals::AnnotQuadrilateral(x1, y1, x2, y2, x3, y3, x4, y4); + } + + return new AnnotQuadrilaterals(std::move(quads_array), len); +} + +/* @x1 @y1 @x2 @y2 are both 'in' and 'out' parameters, representing + * the diagonal of a rectangle which is the 'rect' area of @annot + * which is inside @page. + * + * If @page is unrotated (i.e. has zero rotation) this function does + * nothing, otherwise this function un-rotates the passed-in rect + * coords according to @page rotation so as the returned coords are + * those of the rect if page was put to zero rotation (unrotated). + * This is mandated by PDF spec when saving annotation coords (see + * 8.4.2 Annotation Flags) which also explains the special rotation + * that needs to be done when @annot has the flagNoRotate set to + * true, which this function follows. */ +void _unrotate_rect_for_annot_and_page(Page *page, Annot *annot, double *x1, double *y1, double *x2, double *y2) +{ + gboolean flag_no_rotate; + + if (!SUPPORTED_ROTATION(page->getRotate())) { + return; + } + /* Normalize received rect diagonal to be from UpperLeft to BottomRight, + * as our algorithm follows that */ + if (*y2 > *y1) { + double temp = *y1; + *y1 = *y2; + *y2 = temp; + } + if (G_UNLIKELY(*x1 > *x2)) { + double temp = *x1; + *x1 = *x2; + *x2 = temp; + } + flag_no_rotate = annot->getFlags() & Annot::flagNoRotate; + if (flag_no_rotate) { + /* For this case rotating just the upperleft point is enough */ + double annot_height = *y1 - *y2; + double annot_width = *x2 - *x1; + _page_unrotate_xy(page, x1, y1); + *x2 = *x1 + annot_width; + *y2 = *y1 - annot_height; + } else { + _page_unrotate_xy(page, x1, y1); + _page_unrotate_xy(page, x2, y2); + } +} + +/** + * poppler_page_add_annot: + * @page: a #PopplerPage + * @annot: a #PopplerAnnot to add + * + * Adds annotation @annot to @page. + * + * Since: 0.16 + */ +void poppler_page_add_annot(PopplerPage *page, PopplerAnnot *annot) +{ + double x1, y1, x2, y2; + gboolean page_is_rotated; + const PDFRectangle *crop_box; + const PDFRectangle *page_crop_box; + + g_return_if_fail(POPPLER_IS_PAGE(page)); + g_return_if_fail(POPPLER_IS_ANNOT(annot)); + + /* Add the page's cropBox to the coordinates of rect field of annot */ + page_crop_box = page->page->getCropBox(); + annot->annot->getRect(&x1, &y1, &x2, &y2); + + page_is_rotated = SUPPORTED_ROTATION(page->page->getRotate()); + if (page_is_rotated) { + /* annot is inside a rotated page, as core poppler rect must be saved + * un-rotated, let's proceed to un-rotate rect before saving */ + _unrotate_rect_for_annot_and_page(page->page, annot->annot, &x1, &y1, &x2, &y2); + } + + annot->annot->setRect(x1 + page_crop_box->x1, y1 + page_crop_box->y1, x2 + page_crop_box->x1, y2 + page_crop_box->y1); + + AnnotTextMarkup *annot_markup = dynamic_cast<AnnotTextMarkup *>(annot->annot); + if (annot_markup) { + AnnotQuadrilaterals *quads; + crop_box = _poppler_annot_get_cropbox(annot); + if (crop_box) { + /* Handle hypothetical case of annot being added is already existing on a prior page, so + * first remove cropbox of the prior page before adding cropbox of the new page later */ + quads = new_quads_from_offset_cropbox(crop_box, annot_markup->getQuadrilaterals(), FALSE); + annot_markup->setQuadrilaterals(quads); + } + if (page_is_rotated) { + /* Quadrilateral's coords need to be saved un-rotated (same as rect coords) */ + quads = _page_new_quads_unrotated(page->page, annot_markup->getQuadrilaterals()); + annot_markup->setQuadrilaterals(quads); + } + /* Add to annot's quadrilaterals the offset for the cropbox of the new page */ + quads = new_quads_from_offset_cropbox(page_crop_box, annot_markup->getQuadrilaterals(), TRUE); + annot_markup->setQuadrilaterals(quads); + } + + page->page->addAnnot(annot->annot); +} + +/** + * poppler_page_remove_annot: + * @page: a #PopplerPage + * @annot: a #PopplerAnnot to remove + * + * Removes annotation @annot from @page + * + * Since: 0.22 + */ +void poppler_page_remove_annot(PopplerPage *page, PopplerAnnot *annot) +{ + g_return_if_fail(POPPLER_IS_PAGE(page)); + g_return_if_fail(POPPLER_IS_ANNOT(annot)); + + page->page->removeAnnot(annot->annot); +} + +/* PopplerRectangle type */ + +G_DEFINE_BOXED_TYPE(PopplerRectangle, poppler_rectangle, poppler_rectangle_copy, poppler_rectangle_free) + +static PopplerRectangleExtended *poppler_rectangle_extended_new() +{ + return g_slice_new0(PopplerRectangleExtended); +} + +PopplerRectangle *poppler_rectangle_new_from_pdf_rectangle(const PDFRectangle *rect) +{ + auto r = poppler_rectangle_extended_new(); + r->x1 = rect->x1; + r->y1 = rect->y1; + r->x2 = rect->x2; + r->y2 = rect->y2; + + return reinterpret_cast<PopplerRectangle *>(r); +} + +/** + * poppler_rectangle_new: + * + * Creates a new #PopplerRectangle + * + * Returns: a new #PopplerRectangle, use poppler_rectangle_free() to free it + */ +PopplerRectangle *poppler_rectangle_new(void) +{ + return reinterpret_cast<PopplerRectangle *>(poppler_rectangle_extended_new()); +} + +/** + * poppler_rectangle_copy: + * @rectangle: a #PopplerRectangle to copy + * + * Creates a copy of @rectangle. + * + * Note that you must only use this function on an allocated PopplerRectangle, as + * returned by poppler_rectangle_new(), poppler_rectangle_copy(), or the list elements + * returned from poppler_page_find_text() or poppler_page_find_text_with_options(). + * Returns: a new allocated copy of @rectangle + */ +PopplerRectangle *poppler_rectangle_copy(PopplerRectangle *rectangle) +{ + g_return_val_if_fail(rectangle != nullptr, NULL); + + auto ext_rectangle = reinterpret_cast<PopplerRectangleExtended *>(rectangle); + return reinterpret_cast<PopplerRectangle *>(g_slice_dup(PopplerRectangleExtended, ext_rectangle)); +} + +/** + * poppler_rectangle_free: + * @rectangle: a #PopplerRectangle + * + * Frees the given #PopplerRectangle. + * + * Note that you must only use this function on an allocated PopplerRectangle, as + * returned by poppler_rectangle_new(), poppler_rectangle_copy(), or the list elements + * returned from poppler_page_find_text() or poppler_page_find_text_with_options(). + */ +void poppler_rectangle_free(PopplerRectangle *rectangle) +{ + auto ext_rectangle = reinterpret_cast<PopplerRectangleExtended *>(rectangle); + g_slice_free(PopplerRectangleExtended, ext_rectangle); +} + +/** + * poppler_rectangle_find_get_match_continued: + * @rectangle: a #PopplerRectangle + * + * When using poppler_page_find_text_with_options() with the + * %POPPLER_FIND_MULTILINE flag, a match may span more than one line + * and thus consist of more than one rectangle. Every rectangle belonging + * to the same match will return %TRUE from this function, except for + * the last rectangle, where this function will return %FALSE. + * + * Note that you must only call this function on a #PopplerRectangle + * returned in the list from poppler_page_find_text() or + * poppler_page_find_text_with_options(). + * + * Returns: whether there are more rectangles belonging to the same match + * + * Since: 21.05.0 + */ +gboolean poppler_rectangle_find_get_match_continued(const PopplerRectangle *rectangle) +{ + g_return_val_if_fail(rectangle != nullptr, false); + + auto ext_rectangle = reinterpret_cast<const PopplerRectangleExtended *>(rectangle); + return ext_rectangle->match_continued; +} + +/** + * poppler_rectangle_find_get_ignored_hyphen: + * @rectangle: a #PopplerRectangle + * + * When using poppler_page_find_text_with_options() with the + * %POPPLER_FIND_MULTILINE flag, a match may span more than one line, + * and may have been formed by ignoring a hyphen at the end of the line. + * When this happens at the end of the line corresponding to @rectangle, + * this function returns %TRUE (and then poppler_rectangle_find_get_match_continued() + * will also return %TRUE); otherwise it returns %FALSE. + * + * Note that you must only call this function on a #PopplerRectangle + * returned in the list from poppler_page_find_text() or + * poppler_page_find_text_with_options(). + * + * Returns: whether a hyphen was ignored at the end of the line corresponding to @rectangle. + * + * Since: 21.05.0 + */ +gboolean poppler_rectangle_find_get_ignored_hyphen(const PopplerRectangle *rectangle) +{ + g_return_val_if_fail(rectangle != nullptr, false); + + auto ext_rectangle = reinterpret_cast<const PopplerRectangleExtended *>(rectangle); + return ext_rectangle->ignored_hyphen; +} + +G_DEFINE_BOXED_TYPE(PopplerPoint, poppler_point, poppler_point_copy, poppler_point_free) + +/** + * poppler_point_new: + * + * Creates a new #PopplerPoint. It must be freed with poppler_point_free() after use. + * + * Returns: a new #PopplerPoint + * + * Since: 0.26 + **/ +PopplerPoint *poppler_point_new(void) +{ + return g_slice_new0(PopplerPoint); +} + +/** + * poppler_point_copy: + * @point: a #PopplerPoint to copy + * + * Creates a copy of @point. The copy must be freed with poppler_point_free() + * after use. + * + * Returns: a new allocated copy of @point + * + * Since: 0.26 + **/ +PopplerPoint *poppler_point_copy(PopplerPoint *point) +{ + g_return_val_if_fail(point != nullptr, NULL); + + return g_slice_dup(PopplerPoint, point); +} + +/** + * poppler_point_free: + * @point: a #PopplerPoint + * + * Frees the memory used by @point + * + * Since: 0.26 + **/ +void poppler_point_free(PopplerPoint *point) +{ + g_slice_free(PopplerPoint, point); +} + +/* PopplerQuadrilateral type */ + +G_DEFINE_BOXED_TYPE(PopplerQuadrilateral, poppler_quadrilateral, poppler_quadrilateral_copy, poppler_quadrilateral_free) + +/** + * poppler_quadrilateral_new: + * + * Creates a new #PopplerQuadrilateral. It must be freed with poppler_quadrilateral_free() after use. + * + * Returns: a new #PopplerQuadrilateral. + * + * Since: 0.26 + **/ +PopplerQuadrilateral *poppler_quadrilateral_new(void) +{ + return g_slice_new0(PopplerQuadrilateral); +} + +/** + * poppler_quadrilateral_copy: + * @quad: a #PopplerQuadrilateral to copy + * + * Creates a copy of @quad. The copy must be freed with poppler_quadrilateral_free() after use. + * + * Returns: a new allocated copy of @quad + * + * Since: 0.26 + **/ +PopplerQuadrilateral *poppler_quadrilateral_copy(PopplerQuadrilateral *quad) +{ + g_return_val_if_fail(quad != nullptr, NULL); + + return g_slice_dup(PopplerQuadrilateral, quad); +} + +/** + * poppler_quadrilateral_free: + * @quad: a #PopplerQuadrilateral + * + * Frees the memory used by @quad + * + * Since: 0.26 + **/ +void poppler_quadrilateral_free(PopplerQuadrilateral *quad) +{ + g_slice_free(PopplerQuadrilateral, quad); +} + +/* PopplerTextAttributes type */ + +G_DEFINE_BOXED_TYPE(PopplerTextAttributes, poppler_text_attributes, poppler_text_attributes_copy, poppler_text_attributes_free) + +/** + * poppler_text_attributes_new: + * + * Creates a new #PopplerTextAttributes + * + * Returns: a new #PopplerTextAttributes, use poppler_text_attributes_free() to free it + * + * Since: 0.18 + */ +PopplerTextAttributes *poppler_text_attributes_new(void) +{ + return (PopplerTextAttributes *)g_slice_new0(PopplerTextAttributes); +} + +static gchar *get_font_name_from_word(const TextWord *word, gint word_i) +{ + const GooString *font_name = word->getFontName(word_i); + const gchar *name; + gboolean subset; + gint i; + + if (!font_name || font_name->getLength() == 0) { + return g_strdup("Default"); + } + + // check for a font subset name: capital letters followed by a '+' sign + for (i = 0; i < font_name->getLength(); ++i) { + if (font_name->getChar(i) < 'A' || font_name->getChar(i) > 'Z') { + break; + } + } + subset = i > 0 && i < font_name->getLength() && font_name->getChar(i) == '+'; + name = font_name->c_str(); + if (subset) { + name += i + 1; + } + + return g_strdup(name); +} + +/* + * Allocates a new PopplerTextAttributes with word attributes + */ +static PopplerTextAttributes *poppler_text_attributes_new_from_word(const TextWord *word, gint i) +{ + PopplerTextAttributes *attrs = poppler_text_attributes_new(); + gdouble r, g, b; + + attrs->font_name = get_font_name_from_word(word, i); + attrs->font_size = word->getFontSize(); + attrs->is_underlined = word->isUnderlined(); + word->getColor(&r, &g, &b); + attrs->color.red = (int)(r * 65535. + 0.5); + attrs->color.green = (int)(g * 65535. + 0.5); + attrs->color.blue = (int)(b * 65535. + 0.5); + + return attrs; +} + +/** + * poppler_text_attributes_copy: + * @text_attrs: a #PopplerTextAttributes to copy + * + * Creates a copy of @text_attrs + * + * Returns: a new allocated copy of @text_attrs + * + * Since: 0.18 + */ +PopplerTextAttributes *poppler_text_attributes_copy(PopplerTextAttributes *text_attrs) +{ + PopplerTextAttributes *attrs; + + attrs = g_slice_dup(PopplerTextAttributes, text_attrs); + attrs->font_name = g_strdup(text_attrs->font_name); + return attrs; +} + +/** + * poppler_text_attributes_free: + * @text_attrs: a #PopplerTextAttributes + * + * Frees the given #PopplerTextAttributes + * + * Since: 0.18 + */ +void poppler_text_attributes_free(PopplerTextAttributes *text_attrs) +{ + g_free(text_attrs->font_name); + g_slice_free(PopplerTextAttributes, text_attrs); +} + +/** + * SECTION:poppler-color + * @short_description: Colors + * @title: PopplerColor + */ + +/* PopplerColor type */ +G_DEFINE_BOXED_TYPE(PopplerColor, poppler_color, poppler_color_copy, poppler_color_free) + +/** + * poppler_color_new: + * + * Creates a new #PopplerColor + * + * Returns: a new #PopplerColor, use poppler_color_free() to free it + */ +PopplerColor *poppler_color_new(void) +{ + return (PopplerColor *)g_new0(PopplerColor, 1); +} + +/** + * poppler_color_copy: + * @color: a #PopplerColor to copy + * + * Creates a copy of @color + * + * Returns: a new allocated copy of @color + */ +PopplerColor *poppler_color_copy(PopplerColor *color) +{ + PopplerColor *new_color; + + new_color = g_new(PopplerColor, 1); + *new_color = *color; + + return new_color; +} + +/** + * poppler_color_free: + * @color: a #PopplerColor + * + * Frees the given #PopplerColor + */ +void poppler_color_free(PopplerColor *color) +{ + g_free(color); +} + +/* PopplerLinkMapping type */ +G_DEFINE_BOXED_TYPE(PopplerLinkMapping, poppler_link_mapping, poppler_link_mapping_copy, poppler_link_mapping_free) + +/** + * poppler_link_mapping_new: + * + * Creates a new #PopplerLinkMapping + * + * Returns: a new #PopplerLinkMapping, use poppler_link_mapping_free() to free it + */ +PopplerLinkMapping *poppler_link_mapping_new(void) +{ + return g_slice_new0(PopplerLinkMapping); +} + +/** + * poppler_link_mapping_copy: + * @mapping: a #PopplerLinkMapping to copy + * + * Creates a copy of @mapping + * + * Returns: a new allocated copy of @mapping + */ +PopplerLinkMapping *poppler_link_mapping_copy(PopplerLinkMapping *mapping) +{ + PopplerLinkMapping *new_mapping; + + new_mapping = g_slice_dup(PopplerLinkMapping, mapping); + + if (new_mapping->action) { + new_mapping->action = poppler_action_copy(new_mapping->action); + } + + return new_mapping; +} + +/** + * poppler_link_mapping_free: + * @mapping: a #PopplerLinkMapping + * + * Frees the given #PopplerLinkMapping + */ +void poppler_link_mapping_free(PopplerLinkMapping *mapping) +{ + if (G_UNLIKELY(!mapping)) { + return; + } + + if (mapping->action) { + poppler_action_free(mapping->action); + } + + g_slice_free(PopplerLinkMapping, mapping); +} + +/* Poppler Image mapping type */ +G_DEFINE_BOXED_TYPE(PopplerImageMapping, poppler_image_mapping, poppler_image_mapping_copy, poppler_image_mapping_free) + +/** + * poppler_image_mapping_new: + * + * Creates a new #PopplerImageMapping + * + * Returns: a new #PopplerImageMapping, use poppler_image_mapping_free() to free it + */ +PopplerImageMapping *poppler_image_mapping_new(void) +{ + return g_slice_new0(PopplerImageMapping); +} + +/** + * poppler_image_mapping_copy: + * @mapping: a #PopplerImageMapping to copy + * + * Creates a copy of @mapping + * + * Returns: a new allocated copy of @mapping + */ +PopplerImageMapping *poppler_image_mapping_copy(PopplerImageMapping *mapping) +{ + return g_slice_dup(PopplerImageMapping, mapping); +} + +/** + * poppler_image_mapping_free: + * @mapping: a #PopplerImageMapping + * + * Frees the given #PopplerImageMapping + */ +void poppler_image_mapping_free(PopplerImageMapping *mapping) +{ + g_slice_free(PopplerImageMapping, mapping); +} + +/* Page Transition */ +G_DEFINE_BOXED_TYPE(PopplerPageTransition, poppler_page_transition, poppler_page_transition_copy, poppler_page_transition_free) + +/** + * poppler_page_transition_new: + * + * Creates a new #PopplerPageTransition + * + * Returns: a new #PopplerPageTransition, use poppler_page_transition_free() to free it + */ +PopplerPageTransition *poppler_page_transition_new(void) +{ + return (PopplerPageTransition *)g_new0(PopplerPageTransition, 1); +} + +/** + * poppler_page_transition_copy: + * @transition: a #PopplerPageTransition to copy + * + * Creates a copy of @transition + * + * Returns: a new allocated copy of @transition + */ +PopplerPageTransition *poppler_page_transition_copy(PopplerPageTransition *transition) +{ + PopplerPageTransition *new_transition; + + new_transition = poppler_page_transition_new(); + *new_transition = *transition; + + return new_transition; +} + +/** + * poppler_page_transition_free: + * @transition: a #PopplerPageTransition + * + * Frees the given #PopplerPageTransition + */ +void poppler_page_transition_free(PopplerPageTransition *transition) +{ + g_free(transition); +} + +/* Form Field Mapping Type */ +G_DEFINE_BOXED_TYPE(PopplerFormFieldMapping, poppler_form_field_mapping, poppler_form_field_mapping_copy, poppler_form_field_mapping_free) + +/** + * poppler_form_field_mapping_new: + * + * Creates a new #PopplerFormFieldMapping + * + * Returns: a new #PopplerFormFieldMapping, use poppler_form_field_mapping_free() to free it + */ +PopplerFormFieldMapping *poppler_form_field_mapping_new(void) +{ + return g_slice_new0(PopplerFormFieldMapping); +} + +/** + * poppler_form_field_mapping_copy: + * @mapping: a #PopplerFormFieldMapping to copy + * + * Creates a copy of @mapping + * + * Returns: a new allocated copy of @mapping + */ +PopplerFormFieldMapping *poppler_form_field_mapping_copy(PopplerFormFieldMapping *mapping) +{ + PopplerFormFieldMapping *new_mapping; + + new_mapping = g_slice_dup(PopplerFormFieldMapping, mapping); + + if (mapping->field) { + new_mapping->field = (PopplerFormField *)g_object_ref(mapping->field); + } + + return new_mapping; +} + +/** + * poppler_form_field_mapping_free: + * @mapping: a #PopplerFormFieldMapping + * + * Frees the given #PopplerFormFieldMapping + */ +void poppler_form_field_mapping_free(PopplerFormFieldMapping *mapping) +{ + if (G_UNLIKELY(!mapping)) { + return; + } + + if (mapping->field) { + g_object_unref(mapping->field); + } + + g_slice_free(PopplerFormFieldMapping, mapping); +} + +/* PopplerAnnot Mapping Type */ +G_DEFINE_BOXED_TYPE(PopplerAnnotMapping, poppler_annot_mapping, poppler_annot_mapping_copy, poppler_annot_mapping_free) + +/** + * poppler_annot_mapping_new: + * + * Creates a new #PopplerAnnotMapping + * + * Returns: a new #PopplerAnnotMapping, use poppler_annot_mapping_free() to free it + */ +PopplerAnnotMapping *poppler_annot_mapping_new(void) +{ + return g_slice_new0(PopplerAnnotMapping); +} + +/** + * poppler_annot_mapping_copy: + * @mapping: a #PopplerAnnotMapping to copy + * + * Creates a copy of @mapping + * + * Returns: a new allocated copy of @mapping + */ +PopplerAnnotMapping *poppler_annot_mapping_copy(PopplerAnnotMapping *mapping) +{ + PopplerAnnotMapping *new_mapping; + + new_mapping = g_slice_dup(PopplerAnnotMapping, mapping); + + if (mapping->annot) { + new_mapping->annot = (PopplerAnnot *)g_object_ref(mapping->annot); + } + + return new_mapping; +} + +/** + * poppler_annot_mapping_free: + * @mapping: a #PopplerAnnotMapping + * + * Frees the given #PopplerAnnotMapping + */ +void poppler_annot_mapping_free(PopplerAnnotMapping *mapping) +{ + if (G_UNLIKELY(!mapping)) { + return; + } + + if (mapping->annot) { + g_object_unref(mapping->annot); + } + + g_slice_free(PopplerAnnotMapping, mapping); +} + +/** + * poppler_page_get_crop_box: + * @page: a #PopplerPage + * @rect: (out): a #PopplerRectangle to fill + * + * Retrurns the crop box of @page + */ +void poppler_page_get_crop_box(PopplerPage *page, PopplerRectangle *rect) +{ + const PDFRectangle *cropBox = page->page->getCropBox(); + + rect->x1 = cropBox->x1; + rect->x2 = cropBox->x2; + rect->y1 = cropBox->y1; + rect->y2 = cropBox->y2; +} + +/* + * poppler_page_get_bounding_box: + * @page: A #PopplerPage + * @rect: (out) return the bounding box of the page + * + * Returns the bounding box of the page, a rectangle enclosing all text, vector + * graphics (lines, rectangles and curves) and raster images in the page. + * Includes invisible text but not (yet) annotations like highlights and form + * elements. + * + * Return value: %TRUE if the page contains graphics, %FALSE otherwise + * + * Since: 0.88 + */ +gboolean poppler_page_get_bounding_box(PopplerPage *page, PopplerRectangle *rect) +{ + BBoxOutputDev *bb_out; + bool hasGraphics; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), false); + g_return_val_if_fail(rect != nullptr, false); + + bb_out = new BBoxOutputDev(); + + page->page->displaySlice(bb_out, 72.0, 72.0, 0, false, /* useMediaBox */ + true, /* Crop */ + -1, -1, -1, -1, false, /* printing */ + nullptr, nullptr, nullptr, nullptr); + hasGraphics = bb_out->getHasGraphics(); + if (hasGraphics) { + rect->x1 = bb_out->getX1(); + rect->y1 = bb_out->getY1(); + rect->x2 = bb_out->getX2(); + rect->y2 = bb_out->getY2(); + } + + delete bb_out; + return hasGraphics; +} + +/** + * poppler_page_get_text_layout: + * @page: A #PopplerPage + * @rectangles: (out) (array length=n_rectangles) (transfer container): return location for an array of #PopplerRectangle + * @n_rectangles: (out): length of returned array + * + * Obtains the layout of the text as a list of #PopplerRectangle + * This array must be freed with g_free() when done. + * + * The position in the array represents an offset in the text returned by + * poppler_page_get_text() + * + * See also poppler_page_get_text_layout_for_area(). + * + * Return value: %TRUE if the page contains text, %FALSE otherwise + * + * Since: 0.16 + **/ +gboolean poppler_page_get_text_layout(PopplerPage *page, PopplerRectangle **rectangles, guint *n_rectangles) +{ + PopplerRectangle selection = { 0, 0, 0, 0 }; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), FALSE); + + poppler_page_get_size(page, &selection.x2, &selection.y2); + + return poppler_page_get_text_layout_for_area(page, &selection, rectangles, n_rectangles); +} + +/** + * poppler_page_get_text_layout_for_area: + * @page: A #PopplerPage + * @area: a #PopplerRectangle + * @rectangles: (out) (array length=n_rectangles) (transfer container): return location for an array of #PopplerRectangle + * @n_rectangles: (out): length of returned array + * + * Obtains the layout of the text contained in @area as a list of #PopplerRectangle + * This array must be freed with g_free() when done. + * + * The position in the array represents an offset in the text returned by + * poppler_page_get_text_for_area() + * + * Return value: %TRUE if the page contains text, %FALSE otherwise + * + * Since: 0.26 + **/ +gboolean poppler_page_get_text_layout_for_area(PopplerPage *page, PopplerRectangle *area, PopplerRectangle **rectangles, guint *n_rectangles) +{ + TextPage *text; + PopplerRectangle *rect; + PDFRectangle selection; + int i, k; + guint offset = 0; + guint n_rects = 0; + gdouble x1, y1, x2, y2; + gdouble x3, y3, x4, y4; + int n_lines; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), FALSE); + g_return_val_if_fail(area != nullptr, FALSE); + + *n_rectangles = 0; + + selection.x1 = area->x1; + selection.y1 = area->y1; + selection.x2 = area->x2; + selection.y2 = area->y2; + + text = poppler_page_get_text_page(page); + std::vector<TextWordSelection *> **word_list = text->getSelectionWords(&selection, selectionStyleGlyph, &n_lines); + if (!word_list) { + return FALSE; + } + + n_rects += n_lines - 1; + for (i = 0; i < n_lines; i++) { + std::vector<TextWordSelection *> *line_words = word_list[i]; + n_rects += line_words->size() - 1; + for (std::size_t j = 0; j < line_words->size(); j++) { + const TextWordSelection *word_sel = (*line_words)[j]; + n_rects += word_sel->getEnd() - word_sel->getBegin(); + if (!word_sel->getWord()->hasSpaceAfter() && j < line_words->size() - 1) { + n_rects--; + } + } + } + + *rectangles = g_new(PopplerRectangle, n_rects); + *n_rectangles = n_rects; + + for (i = 0; i < n_lines; i++) { + std::vector<TextWordSelection *> *line_words = word_list[i]; + for (std::size_t j = 0; j < line_words->size(); j++) { + TextWordSelection *word_sel = (*line_words)[j]; + const TextWord *word = word_sel->getWord(); + int end = word_sel->getEnd(); + + for (k = word_sel->getBegin(); k < end; k++) { + rect = *rectangles + offset; + word->getCharBBox(k, &(rect->x1), &(rect->y1), &(rect->x2), &(rect->y2)); + offset++; + } + + rect = *rectangles + offset; + word->getBBox(&x1, &y1, &x2, &y2); + + if (word->hasSpaceAfter() && j < line_words->size() - 1) { + TextWordSelection *next_word_sel = (*line_words)[j + 1]; + + next_word_sel->getWord()->getBBox(&x3, &y3, &x4, &y4); + // space is from one word to other and with the same height as + // first word. + rect->x1 = x2; + rect->y1 = y1; + rect->x2 = x3; + rect->y2 = y2; + offset++; + } + + delete word_sel; + } + + if (i < n_lines - 1 && offset > 0) { + // end of line + rect->x1 = x2; + rect->y1 = y2; + rect->x2 = x2; + rect->y2 = y2; + offset++; + } + + delete line_words; + } + + gfree(word_list); + + return TRUE; +} + +/** + * poppler_page_free_text_attributes: + * @list: (element-type PopplerTextAttributes): A list of + * #PopplerTextAttributes<!-- -->s + * + * Frees a list of #PopplerTextAttributes<!-- -->s allocated by + * poppler_page_get_text_attributes(). + * + * Since: 0.18 + **/ +void poppler_page_free_text_attributes(GList *list) +{ + if (G_UNLIKELY(list == nullptr)) { + return; + } + + g_list_free_full(list, (GDestroyNotify)poppler_text_attributes_free); +} + +static gboolean word_text_attributes_equal(const TextWord *a, gint ai, const TextWord *b, gint bi) +{ + double ar, ag, ab, br, bg, bb; + + if (!a->getFontInfo(ai)->matches(b->getFontInfo(bi))) { + return FALSE; + } + + if (a->getFontSize() != b->getFontSize()) { + return FALSE; + } + + if (a->isUnderlined() != b->isUnderlined()) { + return FALSE; + } + + a->getColor(&ar, &ag, &ab); + b->getColor(&br, &bg, &bb); + return (ar == br && ag == bg && ab == bb); +} + +/** + * poppler_page_get_text_attributes: + * @page: A #PopplerPage + * + * Obtains the attributes of the text as a #GList of #PopplerTextAttributes. + * This list must be freed with poppler_page_free_text_attributes() when done. + * + * Each list element is a #PopplerTextAttributes struct where start_index and + * end_index indicates the range of text (as returned by poppler_page_get_text()) + * to which text attributes apply. + * + * See also poppler_page_get_text_attributes_for_area() + * + * Return value: (element-type PopplerTextAttributes) (transfer full): A #GList of #PopplerTextAttributes + * + * Since: 0.18 + **/ +GList *poppler_page_get_text_attributes(PopplerPage *page) +{ + PopplerRectangle selection = { 0, 0, 0, 0 }; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + + poppler_page_get_size(page, &selection.x2, &selection.y2); + + return poppler_page_get_text_attributes_for_area(page, &selection); +} + +/** + * poppler_page_get_text_attributes_for_area: + * @page: A #PopplerPage + * @area: a #PopplerRectangle + * + * Obtains the attributes of the text in @area as a #GList of #PopplerTextAttributes. + * This list must be freed with poppler_page_free_text_attributes() when done. + * + * Each list element is a #PopplerTextAttributes struct where start_index and + * end_index indicates the range of text (as returned by poppler_page_get_text_for_area()) + * to which text attributes apply. + * + * Return value: (element-type PopplerTextAttributes) (transfer full): A #GList of #PopplerTextAttributes + * + * Since: 0.26 + **/ +GList *poppler_page_get_text_attributes_for_area(PopplerPage *page, PopplerRectangle *area) +{ + TextPage *text; + PDFRectangle selection; + int n_lines; + PopplerTextAttributes *attrs = nullptr; + const TextWord *word, *prev_word = nullptr; + gint word_i, prev_word_i; + gint i; + gint offset = 0; + GList *attributes = nullptr; + + g_return_val_if_fail(POPPLER_IS_PAGE(page), NULL); + g_return_val_if_fail(area != nullptr, nullptr); + + selection.x1 = area->x1; + selection.y1 = area->y1; + selection.x2 = area->x2; + selection.y2 = area->y2; + + text = poppler_page_get_text_page(page); + std::vector<TextWordSelection *> **word_list = text->getSelectionWords(&selection, selectionStyleGlyph, &n_lines); + if (!word_list) { + return nullptr; + } + + for (i = 0; i < n_lines; i++) { + std::vector<TextWordSelection *> *line_words = word_list[i]; + for (std::size_t j = 0; j < line_words->size(); j++) { + TextWordSelection *word_sel = (*line_words)[j]; + int end = word_sel->getEnd(); + + word = word_sel->getWord(); + + for (word_i = word_sel->getBegin(); word_i < end; word_i++) { + if (!prev_word || !word_text_attributes_equal(word, word_i, prev_word, prev_word_i)) { + attrs = poppler_text_attributes_new_from_word(word, word_i); + attrs->start_index = offset; + attributes = g_list_prepend(attributes, attrs); + } + attrs->end_index = offset; + offset++; + prev_word = word; + prev_word_i = word_i; + } + + if (word->hasSpaceAfter() && j < line_words->size() - 1) { + attrs->end_index = offset; + offset++; + } + + delete word_sel; + } + + if (i < n_lines - 1) { + attrs->end_index = offset; + offset++; + } + + delete line_words; + } + + gfree(word_list); + + return g_list_reverse(attributes); +} diff --git a/poppler-24.05.0/glib/poppler-page.h b/poppler-24.05.0/glib/poppler-page.h new file mode 100644 index 0000000000000000000000000000000000000000..2d037d8e6efb47d4c10f1066ae9cbe3a33a82559 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-page.h @@ -0,0 +1,424 @@ +/* poppler-page.h: glib interface to poppler + * Copyright (C) 2004, Red Hat, Inc. + * + * 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. + */ + +#ifndef __POPPLER_PAGE_H__ +#define __POPPLER_PAGE_H__ + +#include <glib-object.h> + +#include "poppler.h" + +#include <cairo.h> + +G_BEGIN_DECLS + +#define POPPLER_TYPE_PAGE (poppler_page_get_type()) +#define POPPLER_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_PAGE, PopplerPage)) +#define POPPLER_IS_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_PAGE)) + +POPPLER_PUBLIC +GType poppler_page_get_type(void) G_GNUC_CONST; + +POPPLER_PUBLIC +void poppler_page_render(PopplerPage *page, cairo_t *cairo); +POPPLER_PUBLIC +void poppler_page_render_for_printing(PopplerPage *page, cairo_t *cairo); +POPPLER_PUBLIC +void poppler_page_render_for_printing_with_options(PopplerPage *page, cairo_t *cairo, PopplerPrintFlags options); +POPPLER_PUBLIC +cairo_surface_t *poppler_page_get_thumbnail(PopplerPage *page); +POPPLER_PUBLIC +void poppler_page_render_selection(PopplerPage *page, cairo_t *cairo, PopplerRectangle *selection, PopplerRectangle *old_selection, PopplerSelectionStyle style, PopplerColor *glyph_color, PopplerColor *background_color); + +POPPLER_PUBLIC +void poppler_page_get_size(PopplerPage *page, double *width, double *height); +POPPLER_PUBLIC +int poppler_page_get_index(PopplerPage *page); +POPPLER_PUBLIC +gchar *poppler_page_get_label(PopplerPage *page); +POPPLER_PUBLIC +double poppler_page_get_duration(PopplerPage *page); +POPPLER_PUBLIC +PopplerPageTransition *poppler_page_get_transition(PopplerPage *page); +POPPLER_PUBLIC +gboolean poppler_page_get_thumbnail_size(PopplerPage *page, int *width, int *height); +POPPLER_PUBLIC +GList *poppler_page_find_text_with_options(PopplerPage *page, const char *text, PopplerFindFlags options); +POPPLER_PUBLIC +GList *poppler_page_find_text(PopplerPage *page, const char *text); +POPPLER_PUBLIC +void poppler_page_render_to_ps(PopplerPage *page, PopplerPSFile *ps_file); +POPPLER_PUBLIC +char *poppler_page_get_text(PopplerPage *page); +POPPLER_PUBLIC +char *poppler_page_get_text_for_area(PopplerPage *page, PopplerRectangle *area); +POPPLER_PUBLIC +char *poppler_page_get_selected_text(PopplerPage *page, PopplerSelectionStyle style, PopplerRectangle *selection); +POPPLER_PUBLIC +cairo_region_t *poppler_page_get_selected_region(PopplerPage *page, gdouble scale, PopplerSelectionStyle style, PopplerRectangle *selection); +POPPLER_PUBLIC +GList *poppler_page_get_selection_region(PopplerPage *page, gdouble scale, PopplerSelectionStyle style, PopplerRectangle *selection) G_GNUC_DEPRECATED_FOR(poppler_page_get_selected_region); +POPPLER_PUBLIC +void poppler_page_selection_region_free(GList *region) G_GNUC_DEPRECATED_FOR(cairo_region_destroy); +POPPLER_PUBLIC +GList *poppler_page_get_link_mapping(PopplerPage *page); +POPPLER_PUBLIC +void poppler_page_free_link_mapping(GList *list); +POPPLER_PUBLIC +GList *poppler_page_get_image_mapping(PopplerPage *page); +POPPLER_PUBLIC +void poppler_page_free_image_mapping(GList *list); +POPPLER_PUBLIC +cairo_surface_t *poppler_page_get_image(PopplerPage *page, gint image_id); +POPPLER_PUBLIC +GList *poppler_page_get_form_field_mapping(PopplerPage *page); +POPPLER_PUBLIC +void poppler_page_free_form_field_mapping(GList *list); +POPPLER_PUBLIC +GList *poppler_page_get_annot_mapping(PopplerPage *page); +POPPLER_PUBLIC +void poppler_page_free_annot_mapping(GList *list); +POPPLER_PUBLIC +void poppler_page_add_annot(PopplerPage *page, PopplerAnnot *annot); +POPPLER_PUBLIC +void poppler_page_remove_annot(PopplerPage *page, PopplerAnnot *annot); +POPPLER_PUBLIC +void poppler_page_get_crop_box(PopplerPage *page, PopplerRectangle *rect); +POPPLER_PUBLIC +gboolean poppler_page_get_bounding_box(PopplerPage *page, PopplerRectangle *rect); +POPPLER_PUBLIC +gboolean poppler_page_get_text_layout(PopplerPage *page, PopplerRectangle **rectangles, guint *n_rectangles); +POPPLER_PUBLIC +gboolean poppler_page_get_text_layout_for_area(PopplerPage *page, PopplerRectangle *area, PopplerRectangle **rectangles, guint *n_rectangles); +POPPLER_PUBLIC +GList *poppler_page_get_text_attributes(PopplerPage *page); +POPPLER_PUBLIC +void poppler_page_free_text_attributes(GList *list); +POPPLER_PUBLIC +GList *poppler_page_get_text_attributes_for_area(PopplerPage *page, PopplerRectangle *area); + +/* A rectangle on a page, with coordinates in PDF points. */ +#define POPPLER_TYPE_RECTANGLE (poppler_rectangle_get_type()) +/** + * PopplerRectangle: + * @x1: x coordinate of lower left corner + * @y1: y coordinate of lower left corner + * @x2: x coordinate of upper right corner + * @y2: y coordinate of upper right corner + * + * A #PopplerRectangle is used to describe + * locations on a page and bounding boxes + */ +struct _PopplerRectangle +{ + gdouble x1; + gdouble y1; + gdouble x2; + gdouble y2; +}; + +POPPLER_PUBLIC +GType poppler_rectangle_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerRectangle *poppler_rectangle_new(void); +POPPLER_PUBLIC +PopplerRectangle *poppler_rectangle_copy(PopplerRectangle *rectangle); +POPPLER_PUBLIC +void poppler_rectangle_free(PopplerRectangle *rectangle); +POPPLER_PUBLIC +gboolean poppler_rectangle_find_get_match_continued(const PopplerRectangle *rectangle); +POPPLER_PUBLIC +gboolean poppler_rectangle_find_get_ignored_hyphen(const PopplerRectangle *rectangle); + +/* A point on a page, with coordinates in PDF points. */ +#define POPPLER_TYPE_POINT (poppler_point_get_type()) +/** + * PopplerPoint: + * @x: x coordinate + * @y: y coordinate + * + * A #PopplerPoint is used to describe a location point on a page + */ +struct _PopplerPoint +{ + gdouble x; + gdouble y; +}; + +POPPLER_PUBLIC +GType poppler_point_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerPoint *poppler_point_new(void); +POPPLER_PUBLIC +PopplerPoint *poppler_point_copy(PopplerPoint *point); +POPPLER_PUBLIC +void poppler_point_free(PopplerPoint *point); + +/* PopplerQuadrilateral */ + +/* A quadrilateral encompasses a word or group of contiguous words in the + * text underlying the annotation. The coordinates for each quadrilateral are + * given in the order x1 y1 x2 y2 x3 y3 x4 y4 specifying the quadrilateral’s four + * vertices in counterclockwise order */ + +#define POPPLER_TYPE_QUADRILATERAL (poppler_quadrilateral_get_type()) +/** + * PopplerQuadrilateral: + * @p1: a #PopplerPoint with the first vertex coordinates + * @p2: a #PopplerPoint with the second vertex coordinates + * @p3: a #PopplerPoint with the third vertex coordinates + * @p4: a #PopplerPoint with the fourth vertex coordinates + * + * A #PopplerQuadrilateral is used to describe rectangle-like polygon + * with arbitrary inclination on a page. + * + * Since: 0.26 + **/ +struct _PopplerQuadrilateral +{ + PopplerPoint p1; + PopplerPoint p2; + PopplerPoint p3; + PopplerPoint p4; +}; + +POPPLER_PUBLIC +GType poppler_quadrilateral_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerQuadrilateral *poppler_quadrilateral_new(void); +POPPLER_PUBLIC +PopplerQuadrilateral *poppler_quadrilateral_copy(PopplerQuadrilateral *quad); +POPPLER_PUBLIC +void poppler_quadrilateral_free(PopplerQuadrilateral *quad); + +/* A color in RGB */ +#define POPPLER_TYPE_COLOR (poppler_color_get_type()) + +/** + * PopplerColor: + * @red: the red component of color + * @green: the green component of color + * @blue: the blue component of color + * + * A #PopplerColor describes a RGB color. Color components + * are values between 0 and 65535 + */ +struct _PopplerColor +{ + guint16 red; + guint16 green; + guint16 blue; +}; + +POPPLER_PUBLIC +GType poppler_color_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerColor *poppler_color_new(void); +POPPLER_PUBLIC +PopplerColor *poppler_color_copy(PopplerColor *color); +POPPLER_PUBLIC +void poppler_color_free(PopplerColor *color); + +/* Text attributes. */ +#define POPPLER_TYPE_TEXT_ATTRIBUTES (poppler_text_attributes_get_type()) +/** + * PopplerTextAttributes: + * @font_name: font name + * @font_size: font size + * @is_underlined: if text is underlined + * @color: a #PopplerColor, the foreground color + * @start_index: start position this text attributes apply + * @end_index: end position this text attributes apply + * + * A #PopplerTextAttributes is used to describe text attributes of a range of text + * + * Since: 0.18 + */ +struct _PopplerTextAttributes +{ + gchar *font_name; + gdouble font_size; + gboolean is_underlined; + PopplerColor color; + + gint start_index; + gint end_index; +}; + +POPPLER_PUBLIC +GType poppler_text_attributes_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerTextAttributes *poppler_text_attributes_new(void); +POPPLER_PUBLIC +PopplerTextAttributes *poppler_text_attributes_copy(PopplerTextAttributes *text_attrs); +POPPLER_PUBLIC +void poppler_text_attributes_free(PopplerTextAttributes *text_attrs); + +/* Mapping between areas on the current page and PopplerActions */ +#define POPPLER_TYPE_LINK_MAPPING (poppler_link_mapping_get_type()) + +/** + * PopplerLinkMapping: + * @area: a #PopplerRectangle representing an area of the page + * @action: a #PopplerAction + * + * A #PopplerLinkMapping structure represents the location + * of @action on the page + */ +struct _PopplerLinkMapping +{ + PopplerRectangle area; + PopplerAction *action; +}; + +POPPLER_PUBLIC +GType poppler_link_mapping_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerLinkMapping *poppler_link_mapping_new(void); +POPPLER_PUBLIC +PopplerLinkMapping *poppler_link_mapping_copy(PopplerLinkMapping *mapping); +POPPLER_PUBLIC +void poppler_link_mapping_free(PopplerLinkMapping *mapping); + +/* Page Transition */ +#define POPPLER_TYPE_PAGE_TRANSITION (poppler_page_transition_get_type()) + +/** + * PopplerPageTransition: + * @type: the type of transtition + * @alignment: the dimension in which the transition effect shall occur. + * Only for #POPPLER_PAGE_TRANSITION_SPLIT and #POPPLER_PAGE_TRANSITION_BLINDS transition types + * @direction: the direction of motion for the transition effect. + * Only for #POPPLER_PAGE_TRANSITION_SPLIT, #POPPLER_PAGE_TRANSITION_BOX and #POPPLER_PAGE_TRANSITION_FLY + * transition types + * @duration: the duration of the transition effect + * @angle: the direction in which the specified transition effect shall moves, + * expressed in degrees counterclockwise starting from a left-to-right direction. + * Only for #POPPLER_PAGE_TRANSITION_WIPE, #POPPLER_PAGE_TRANSITION_GLITTER, #POPPLER_PAGE_TRANSITION_FLY, + * #POPPLER_PAGE_TRANSITION_COVER, #POPPLER_PAGE_TRANSITION_UNCOVER and #POPPLER_PAGE_TRANSITION_PUSH + * transition types + * @scale: the starting or ending scale at which the changes shall be drawn. + * Only for #POPPLER_PAGE_TRANSITION_FLY transition type + * @rectangular: whether the area that will be flown is rectangular and opaque. + * Only for #POPPLER_PAGE_TRANSITION_FLY transition type + * + * A #PopplerPageTransition structures describes a visual transition + * to use when moving between pages during a presentation + */ +struct _PopplerPageTransition +{ + PopplerPageTransitionType type; + PopplerPageTransitionAlignment alignment; + PopplerPageTransitionDirection direction; + gint duration; + gint angle; + gdouble scale; + gboolean rectangular; + gdouble duration_real; +}; + +POPPLER_PUBLIC +GType poppler_page_transition_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerPageTransition *poppler_page_transition_new(void); +POPPLER_PUBLIC +PopplerPageTransition *poppler_page_transition_copy(PopplerPageTransition *transition); +POPPLER_PUBLIC +void poppler_page_transition_free(PopplerPageTransition *transition); + +/* Mapping between areas on the current page and images */ +#define POPPLER_TYPE_IMAGE_MAPPING (poppler_image_mapping_get_type()) + +/** + * PopplerImageMapping: + * @area: a #PopplerRectangle representing an area of the page + * @image_id: an image identifier + * + * A #PopplerImageMapping structure represents the location + * of an image on the page + */ +struct _PopplerImageMapping +{ + PopplerRectangle area; + gint image_id; +}; + +POPPLER_PUBLIC +GType poppler_image_mapping_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerImageMapping *poppler_image_mapping_new(void); +POPPLER_PUBLIC +PopplerImageMapping *poppler_image_mapping_copy(PopplerImageMapping *mapping); +POPPLER_PUBLIC +void poppler_image_mapping_free(PopplerImageMapping *mapping); + +/* Mapping between areas on the current page and form fields */ +#define POPPLER_TYPE_FORM_FIELD_MAPPING (poppler_form_field_mapping_get_type()) + +/** + * PopplerFormFieldMapping: + * @area: a #PopplerRectangle representing an area of the page + * @field: a #PopplerFormField + * + * A #PopplerFormFieldMapping structure represents the location + * of @field on the page + */ +struct _PopplerFormFieldMapping +{ + PopplerRectangle area; + PopplerFormField *field; +}; + +POPPLER_PUBLIC +GType poppler_form_field_mapping_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerFormFieldMapping *poppler_form_field_mapping_new(void); +POPPLER_PUBLIC +PopplerFormFieldMapping *poppler_form_field_mapping_copy(PopplerFormFieldMapping *mapping); +POPPLER_PUBLIC +void poppler_form_field_mapping_free(PopplerFormFieldMapping *mapping); + +/* Mapping between areas on the current page and annots */ +#define POPPLER_TYPE_ANNOT_MAPPING (poppler_annot_mapping_get_type()) + +/** + * PopplerAnnotMapping: + * @area: a #PopplerRectangle representing an area of the page + * @annot: a #PopplerAnnot + * + * A #PopplerAnnotMapping structure represents the location + * of @annot on the page + */ +struct _PopplerAnnotMapping +{ + PopplerRectangle area; + PopplerAnnot *annot; +}; + +POPPLER_PUBLIC +GType poppler_annot_mapping_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerAnnotMapping *poppler_annot_mapping_new(void); +POPPLER_PUBLIC +PopplerAnnotMapping *poppler_annot_mapping_copy(PopplerAnnotMapping *mapping); +POPPLER_PUBLIC +void poppler_annot_mapping_free(PopplerAnnotMapping *mapping); + +G_END_DECLS + +#endif /* __POPPLER_PAGE_H__ */ diff --git a/poppler-24.05.0/glib/poppler-private.h b/poppler-24.05.0/glib/poppler-private.h new file mode 100644 index 0000000000000000000000000000000000000000..758c7021472f1f3133faabb1be3e1ad1410675e4 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-private.h @@ -0,0 +1,171 @@ +#ifndef __POPPLER_PRIVATE_H__ +#define __POPPLER_PRIVATE_H__ + +#include <config.h> + +#ifndef __GI_SCANNER__ +# include <PDFDoc.h> +# include <PSOutputDev.h> +# include <Link.h> +# include <Movie.h> +# include <Rendition.h> +# include <Form.h> +# include <Gfx.h> +# include <FontInfo.h> +# include <TextOutputDev.h> +# include <Catalog.h> +# include <OptionalContent.h> +# include <CairoOutputDev.h> +# include <FileSpec.h> +# include <StructElement.h> +# include <SignatureInfo.h> +#endif + +#define SUPPORTED_ROTATION(r) (r == 90 || r == 180 || r == 270) + +struct _PopplerDocument +{ + /*< private >*/ + GObject parent_instance; + std::unique_ptr<GlobalParamsIniter> initer; + PDFDoc *doc; + + GList *layers; + GList *layers_rbgroups; + CairoOutputDev *output_dev; +}; + +struct _PopplerPSFile +{ + /*< private >*/ + GObject parent_instance; + + PopplerDocument *document; + PSOutputDev *out; + int fd; + char *filename; + int first_page; + int last_page; + double paper_width; + double paper_height; + gboolean duplex; +}; + +struct _PopplerFontInfo +{ + /*< private >*/ + GObject parent_instance; + PopplerDocument *document; + FontInfoScanner *scanner; +}; + +struct _PopplerPage +{ + /*< private >*/ + GObject parent_instance; + PopplerDocument *document; + Page *page; + int index; + TextPage *text; +}; + +struct _PopplerFormField +{ + /*< private >*/ + GObject parent_instance; + PopplerDocument *document; + FormWidget *widget; + PopplerAction *action; + PopplerAction *field_modified_action; + PopplerAction *format_field_action; + PopplerAction *validate_field_action; + PopplerAction *calculate_field_action; +}; + +struct _PopplerAnnot +{ + GObject parent_instance; + Annot *annot; +}; + +typedef struct _Layer +{ + /*< private >*/ + GList *kids; + gchar *label; + OptionalContentGroup *oc; +} Layer; + +struct _PopplerLayer +{ + /*< private >*/ + GObject parent_instance; + PopplerDocument *document; + Layer *layer; + GList *rbgroup; + gchar *title; +}; + +struct _PopplerStructureElement +{ + /*< private >*/ + GObject parent_instance; + PopplerDocument *document; + const StructElement *elem; +}; + +/* + * PopplerRectangleExtended: + * + * The real type behind the public PopplerRectangle. + * Must be ABI compatible to it! + */ +typedef struct +{ + /*< private >*/ + double x1; + double y1; + double x2; + double y2; + bool match_continued; /* Described in poppler_rectangle_find_get_match_continued() */ + bool ignored_hyphen; /* Described in poppler_rectangle_find_get_ignored_hyphen() */ +} PopplerRectangleExtended; + +PopplerRectangle *poppler_rectangle_new_from_pdf_rectangle(const PDFRectangle *rect); + +GList *_poppler_document_get_layers(PopplerDocument *document); +GList *_poppler_document_get_layer_rbgroup(PopplerDocument *document, Layer *layer); +PopplerPage *_poppler_page_new(PopplerDocument *document, Page *page, int index); +void _unrotate_rect_for_annot_and_page(Page *page, Annot *annot, double *x1, double *y1, double *x2, double *y2); +AnnotQuadrilaterals *_page_new_quads_unrotated(Page *page, AnnotQuadrilaterals *quads); +AnnotQuadrilaterals *new_quads_from_offset_cropbox(const PDFRectangle *crop_box, AnnotQuadrilaterals *quads, gboolean add); +PopplerAction *_poppler_action_new(PopplerDocument *document, const LinkAction *link, const gchar *title); +PopplerLayer *_poppler_layer_new(PopplerDocument *document, Layer *layer, GList *rbgroup); +PopplerDest *_poppler_dest_new_goto(PopplerDocument *document, LinkDest *link_dest); +PopplerFormField *_poppler_form_field_new(PopplerDocument *document, FormWidget *field); +PopplerAttachment *_poppler_attachment_new(FileSpec *file); +PopplerMovie *_poppler_movie_new(const Movie *movie); +PopplerMedia *_poppler_media_new(const MediaRendition *media); +PopplerAnnot *_poppler_annot_new(Annot *annot); +PopplerAnnot *_poppler_annot_text_new(Annot *annot); +PopplerAnnot *_poppler_annot_free_text_new(Annot *annot); +PopplerAnnot *_poppler_annot_text_markup_new(Annot *annot); +PopplerAnnot *_poppler_annot_file_attachment_new(Annot *annot); +PopplerAnnot *_poppler_annot_movie_new(Annot *annot); +PopplerAnnot *_poppler_annot_screen_new(PopplerDocument *doc, Annot *annot); +PopplerAnnot *_poppler_annot_line_new(Annot *annot); +PopplerAnnot *_poppler_annot_circle_new(Annot *annot); +PopplerAnnot *_poppler_annot_square_new(Annot *annot); +PopplerAnnot *_poppler_annot_stamp_new(Annot *annot); + +const PDFRectangle *_poppler_annot_get_cropbox(PopplerAnnot *poppler_annot); + +char *_poppler_goo_string_to_utf8(const GooString *s); +gboolean _poppler_convert_pdf_date_to_gtime(const GooString *date, time_t *gdate); +GDateTime *_poppler_convert_pdf_date_to_date_time(const GooString *date); +GooString *_poppler_convert_date_time_to_pdf_date(GDateTime *datetime); +AnnotStampImageHelper *_poppler_convert_cairo_image_to_stamp_image_helper(const cairo_surface_t *image); + +void _poppler_error_cb(ErrorCategory category, Goffset pos, const char *message); + +#endif diff --git a/poppler-24.05.0/glib/poppler-structure-element.cc b/poppler-24.05.0/glib/poppler-structure-element.cc new file mode 100644 index 0000000000000000000000000000000000000000..4c6cd02630e9c94df2ec398b98c589dea8da900e --- /dev/null +++ b/poppler-24.05.0/glib/poppler-structure-element.cc @@ -0,0 +1,2015 @@ +/* poppler-structure.cc: glib interface to poppler + * + * Copyright (C) 2013 Igalia S.L. + * Copyright (C) 2018 Albert Astals Cid <aacid@kde.org> + * + * 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 "config.h" + +#ifndef __GI_SCANNER__ +# include <StructTreeRoot.h> +# include <StructElement.h> +# include <GlobalParams.h> +# include <UnicodeMap.h> +# include <cmath> +#endif /* !__GI_SCANNER__ */ + +#include "poppler.h" +#include "poppler-private.h" +#include "poppler-structure-element.h" + +/** + * SECTION:poppler-structure-element + * @short_description: Document structure element. + * @title: PopplerStructureElement + * + * Instances of #PopplerStructureElement are used to describe the structure + * of a #PopplerDocument. To access the elements in the structure of the + * document, use poppler_structure_element_iter_new() to obtain an iterator + * for the top-level #PopplerStructureElement, and then use the + * #PopplerStructureElementIter methods to traverse the structure tree. + */ + +typedef struct _PopplerStructureElementClass +{ + GObjectClass parent_class; +} PopplerStructureElementClass; + +G_DEFINE_TYPE(PopplerStructureElement, poppler_structure_element, G_TYPE_OBJECT) + +static PopplerStructureElement *_poppler_structure_element_new(PopplerDocument *document, const StructElement *element) +{ + PopplerStructureElement *poppler_structure_element; + + g_assert(POPPLER_IS_DOCUMENT(document)); + g_assert(element); + + poppler_structure_element = (PopplerStructureElement *)g_object_new(POPPLER_TYPE_STRUCTURE_ELEMENT, nullptr, NULL); + poppler_structure_element->document = (PopplerDocument *)g_object_ref(document); + poppler_structure_element->elem = element; + + return poppler_structure_element; +} + +static void poppler_structure_element_init(PopplerStructureElement *poppler_structure_element) { } + +static void poppler_structure_element_finalize(GObject *object) +{ + PopplerStructureElement *poppler_structure_element = POPPLER_STRUCTURE_ELEMENT(object); + + /* poppler_structure_element->elem is owned by the StructTreeRoot */ + g_object_unref(poppler_structure_element->document); + + G_OBJECT_CLASS(poppler_structure_element_parent_class)->finalize(object); +} + +static void poppler_structure_element_class_init(PopplerStructureElementClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + gobject_class->finalize = poppler_structure_element_finalize; +} + +/** + * poppler_structure_element_get_kind: + * @poppler_structure_element: A #PopplerStructureElement + * + * Return value: A #PopplerStructureElementKind value. + * + * Since: 0.26 + */ +PopplerStructureElementKind poppler_structure_element_get_kind(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), POPPLER_STRUCTURE_ELEMENT_CONTENT); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, POPPLER_STRUCTURE_ELEMENT_CONTENT); + + switch (poppler_structure_element->elem->getType()) { + case StructElement::MCID: + return POPPLER_STRUCTURE_ELEMENT_CONTENT; + case StructElement::OBJR: + return POPPLER_STRUCTURE_ELEMENT_OBJECT_REFERENCE; + case StructElement::Document: + return POPPLER_STRUCTURE_ELEMENT_DOCUMENT; + case StructElement::Part: + return POPPLER_STRUCTURE_ELEMENT_PART; + case StructElement::Art: + return POPPLER_STRUCTURE_ELEMENT_ARTICLE; + case StructElement::Sect: + return POPPLER_STRUCTURE_ELEMENT_SECTION; + case StructElement::Div: + return POPPLER_STRUCTURE_ELEMENT_DIV; + case StructElement::Span: + return POPPLER_STRUCTURE_ELEMENT_SPAN; + case StructElement::Quote: + return POPPLER_STRUCTURE_ELEMENT_QUOTE; + case StructElement::Note: + return POPPLER_STRUCTURE_ELEMENT_NOTE; + case StructElement::Reference: + return POPPLER_STRUCTURE_ELEMENT_REFERENCE; + case StructElement::BibEntry: + return POPPLER_STRUCTURE_ELEMENT_BIBENTRY; + case StructElement::Code: + return POPPLER_STRUCTURE_ELEMENT_CODE; + case StructElement::Link: + return POPPLER_STRUCTURE_ELEMENT_LINK; + case StructElement::Annot: + return POPPLER_STRUCTURE_ELEMENT_ANNOT; + case StructElement::BlockQuote: + return POPPLER_STRUCTURE_ELEMENT_BLOCKQUOTE; + case StructElement::Caption: + return POPPLER_STRUCTURE_ELEMENT_CAPTION; + case StructElement::NonStruct: + return POPPLER_STRUCTURE_ELEMENT_NONSTRUCT; + case StructElement::TOC: + return POPPLER_STRUCTURE_ELEMENT_TOC; + case StructElement::TOCI: + return POPPLER_STRUCTURE_ELEMENT_TOC_ITEM; + case StructElement::Index: + return POPPLER_STRUCTURE_ELEMENT_INDEX; + case StructElement::Private: + return POPPLER_STRUCTURE_ELEMENT_PRIVATE; + case StructElement::P: + return POPPLER_STRUCTURE_ELEMENT_PARAGRAPH; + case StructElement::H: + return POPPLER_STRUCTURE_ELEMENT_HEADING; + case StructElement::H1: + return POPPLER_STRUCTURE_ELEMENT_HEADING_1; + case StructElement::H2: + return POPPLER_STRUCTURE_ELEMENT_HEADING_2; + case StructElement::H3: + return POPPLER_STRUCTURE_ELEMENT_HEADING_3; + case StructElement::H4: + return POPPLER_STRUCTURE_ELEMENT_HEADING_4; + case StructElement::H5: + return POPPLER_STRUCTURE_ELEMENT_HEADING_5; + case StructElement::H6: + return POPPLER_STRUCTURE_ELEMENT_HEADING_6; + case StructElement::L: + return POPPLER_STRUCTURE_ELEMENT_LIST; + case StructElement::LI: + return POPPLER_STRUCTURE_ELEMENT_LIST_ITEM; + case StructElement::Lbl: + return POPPLER_STRUCTURE_ELEMENT_LIST_LABEL; + case StructElement::LBody: + return POPPLER_STRUCTURE_ELEMENT_LIST_BODY; + case StructElement::Table: + return POPPLER_STRUCTURE_ELEMENT_TABLE; + case StructElement::TR: + return POPPLER_STRUCTURE_ELEMENT_TABLE_ROW; + case StructElement::TH: + return POPPLER_STRUCTURE_ELEMENT_TABLE_HEADING; + case StructElement::TD: + return POPPLER_STRUCTURE_ELEMENT_TABLE_DATA; + case StructElement::THead: + return POPPLER_STRUCTURE_ELEMENT_TABLE_HEADER; + case StructElement::TFoot: + return POPPLER_STRUCTURE_ELEMENT_TABLE_FOOTER; + case StructElement::TBody: + return POPPLER_STRUCTURE_ELEMENT_TABLE_BODY; + case StructElement::Ruby: + return POPPLER_STRUCTURE_ELEMENT_RUBY; + case StructElement::RB: + return POPPLER_STRUCTURE_ELEMENT_RUBY_BASE_TEXT; + case StructElement::RT: + return POPPLER_STRUCTURE_ELEMENT_RUBY_ANNOT_TEXT; + case StructElement::RP: + return POPPLER_STRUCTURE_ELEMENT_RUBY_PUNCTUATION; + case StructElement::Warichu: + return POPPLER_STRUCTURE_ELEMENT_WARICHU; + case StructElement::WT: + return POPPLER_STRUCTURE_ELEMENT_WARICHU_TEXT; + case StructElement::WP: + return POPPLER_STRUCTURE_ELEMENT_WARICHU_PUNCTUATION; + case StructElement::Figure: + return POPPLER_STRUCTURE_ELEMENT_FIGURE; + case StructElement::Formula: + return POPPLER_STRUCTURE_ELEMENT_FORMULA; + case StructElement::Form: + return POPPLER_STRUCTURE_ELEMENT_FORM; + + /* There should never be elements of type StructElement::Unknown */ + case StructElement::Unknown: + g_assert_not_reached(); + } + + g_assert_not_reached(); + return POPPLER_STRUCTURE_ELEMENT_CONTENT; +} + +template<typename EnumType> +struct EnumNameValue +{ + const gchar *name; + EnumType value; + + static const EnumNameValue<EnumType> values[]; + static const Attribute::Type attribute_type; +}; + +#define ENUM_VALUES(E, A) \ + template<> \ + const Attribute::Type EnumNameValue<E>::attribute_type = Attribute::A; \ + template<> \ + const EnumNameValue<E> EnumNameValue<E>::values[] = + +ENUM_VALUES(PopplerStructurePlacement, Placement) { { "Block", POPPLER_STRUCTURE_PLACEMENT_BLOCK }, { "Inline", POPPLER_STRUCTURE_PLACEMENT_INLINE }, { "Before", POPPLER_STRUCTURE_PLACEMENT_BEFORE }, + { "Start", POPPLER_STRUCTURE_PLACEMENT_START }, { "End", POPPLER_STRUCTURE_PLACEMENT_END }, {} }; + +ENUM_VALUES(PopplerStructureWritingMode, WritingMode) { { "LrTb", POPPLER_STRUCTURE_WRITING_MODE_LR_TB }, { "RlTb", POPPLER_STRUCTURE_WRITING_MODE_RL_TB }, { "TbRl", POPPLER_STRUCTURE_WRITING_MODE_TB_RL }, {} }; + +ENUM_VALUES(PopplerStructureBorderStyle, BorderStyle) { { "None", POPPLER_STRUCTURE_BORDER_STYLE_NONE }, { "Hidden", POPPLER_STRUCTURE_BORDER_STYLE_HIDDEN }, + { "Dotted", POPPLER_STRUCTURE_BORDER_STYLE_DOTTED }, { "Dashed", POPPLER_STRUCTURE_BORDER_STYLE_DASHED }, + { "Solid", POPPLER_STRUCTURE_BORDER_STYLE_SOLID }, { "Double", POPPLER_STRUCTURE_BORDER_STYLE_DOUBLE }, + { "Groove", POPPLER_STRUCTURE_BORDER_STYLE_GROOVE }, { "Inset", POPPLER_STRUCTURE_BORDER_STYLE_INSET }, + { "Outset", POPPLER_STRUCTURE_BORDER_STYLE_OUTSET }, {} }; + +ENUM_VALUES(PopplerStructureTextAlign, + TextAlign) { { "Start", POPPLER_STRUCTURE_TEXT_ALIGN_START }, { "Center", POPPLER_STRUCTURE_TEXT_ALIGN_CENTER }, { "End", POPPLER_STRUCTURE_TEXT_ALIGN_END }, { "Justify", POPPLER_STRUCTURE_TEXT_ALIGN_JUSTIFY }, {} }; + +ENUM_VALUES(PopplerStructureBlockAlign, + BlockAlign) { { "Before", POPPLER_STRUCTURE_BLOCK_ALIGN_BEFORE }, { "Middle", POPPLER_STRUCTURE_BLOCK_ALIGN_MIDDLE }, { "After", POPPLER_STRUCTURE_BLOCK_ALIGN_AFTER }, { "Justify", POPPLER_STRUCTURE_BLOCK_ALIGN_JUSTIFY }, {} }; + +ENUM_VALUES(PopplerStructureInlineAlign, InlineAlign) { { "Start", POPPLER_STRUCTURE_INLINE_ALIGN_START }, { "Center", POPPLER_STRUCTURE_INLINE_ALIGN_CENTER }, { "End", POPPLER_STRUCTURE_INLINE_ALIGN_END }, {} }; + +ENUM_VALUES(PopplerStructureTextDecoration, TextDecorationType) { { "None", POPPLER_STRUCTURE_TEXT_DECORATION_NONE }, + { "Underline", POPPLER_STRUCTURE_TEXT_DECORATION_UNDERLINE }, + { "Overline", POPPLER_STRUCTURE_TEXT_DECORATION_OVERLINE }, + { "LineThrough", POPPLER_STRUCTURE_TEXT_DECORATION_LINETHROUGH }, + {} }; + +ENUM_VALUES(PopplerStructureRubyAlign, RubyAlign) { { "Start", POPPLER_STRUCTURE_RUBY_ALIGN_START }, { "Center", POPPLER_STRUCTURE_RUBY_ALIGN_CENTER }, { "End", POPPLER_STRUCTURE_RUBY_ALIGN_END }, + { "Justify", POPPLER_STRUCTURE_RUBY_ALIGN_JUSTIFY }, { "Distribute", POPPLER_STRUCTURE_RUBY_ALIGN_DISTRIBUTE }, {} }; + +ENUM_VALUES(PopplerStructureRubyPosition, RubyPosition) { + { "Before", POPPLER_STRUCTURE_RUBY_POSITION_BEFORE }, { "After", POPPLER_STRUCTURE_RUBY_POSITION_AFTER }, { "Warichu", POPPLER_STRUCTURE_RUBY_POSITION_WARICHU }, { "Inline", POPPLER_STRUCTURE_RUBY_POSITION_INLINE }, {} +}; + +ENUM_VALUES(PopplerStructureGlyphOrientation, GlyphOrientationVertical) { { "Auto", POPPLER_STRUCTURE_GLYPH_ORIENTATION_AUTO }, { "90", POPPLER_STRUCTURE_GLYPH_ORIENTATION_90 }, + { "180", POPPLER_STRUCTURE_GLYPH_ORIENTATION_180 }, { "270", POPPLER_STRUCTURE_GLYPH_ORIENTATION_270 }, + { "360", POPPLER_STRUCTURE_GLYPH_ORIENTATION_0 }, { "-90", POPPLER_STRUCTURE_GLYPH_ORIENTATION_270 }, + { "-180", POPPLER_STRUCTURE_GLYPH_ORIENTATION_180 }, {} }; + +ENUM_VALUES(PopplerStructureListNumbering, ListNumbering) { { "None", POPPLER_STRUCTURE_LIST_NUMBERING_NONE }, + { "Disc", POPPLER_STRUCTURE_LIST_NUMBERING_DISC }, + { "Circle", POPPLER_STRUCTURE_LIST_NUMBERING_CIRCLE }, + { "Square", POPPLER_STRUCTURE_LIST_NUMBERING_SQUARE }, + { "Decimal", POPPLER_STRUCTURE_LIST_NUMBERING_DECIMAL }, + { "UpperRoman", POPPLER_STRUCTURE_LIST_NUMBERING_UPPER_ROMAN }, + { "LowerRoman", POPPLER_STRUCTURE_LIST_NUMBERING_LOWER_ROMAN }, + { "UpperAlpha", POPPLER_STRUCTURE_LIST_NUMBERING_UPPER_ALPHA }, + { "LowerAlpha", POPPLER_STRUCTURE_LIST_NUMBERING_LOWER_ALPHA }, + {} }; + +ENUM_VALUES(PopplerStructureFormRole, + Role) { { "rb", POPPLER_STRUCTURE_FORM_ROLE_RADIO_BUTTON }, { "cb", POPPLER_STRUCTURE_FORM_ROLE_CHECKBOX }, { "pb", POPPLER_STRUCTURE_FORM_ROLE_PUSH_BUTTON }, { "tv", POPPLER_STRUCTURE_FORM_ROLE_TEXT_VALUE }, {} }; + +ENUM_VALUES(PopplerStructureFormState, checked) { { "on", POPPLER_STRUCTURE_FORM_STATE_ON }, { "off", POPPLER_STRUCTURE_FORM_STATE_OFF }, { "neutral", POPPLER_STRUCTURE_FORM_STATE_NEUTRAL }, {} }; + +ENUM_VALUES(PopplerStructureTableScope, Scope) { { "Row", POPPLER_STRUCTURE_TABLE_SCOPE_ROW }, { "Column", POPPLER_STRUCTURE_TABLE_SCOPE_COLUMN }, { "Both", POPPLER_STRUCTURE_TABLE_SCOPE_BOTH }, {} }; + +#undef ENUM_VALUES + +template<typename EnumType> +static EnumType name_to_enum(const Object *name_value) +{ + /* + * Non-NULL names must always be valid because Poppler + * discards the invalid attributes when parsing them. + */ + g_assert(name_value != nullptr); + + for (const EnumNameValue<EnumType> *item = EnumNameValue<EnumType>::values; item->name; item++) { + if (name_value->isName(item->name)) { + return item->value; + } + } + + g_assert_not_reached(); + return static_cast<EnumType>(-1); +} + +template<typename EnumType> +static EnumType attr_to_enum(PopplerStructureElement *poppler_structure_element) +{ + const Attribute *attr = poppler_structure_element->elem->findAttribute(EnumNameValue<EnumType>::attribute_type, true); + return name_to_enum<EnumType>((attr != nullptr) ? attr->getValue() : Attribute::getDefaultValue(EnumNameValue<EnumType>::attribute_type)); +} + +static inline const Object *attr_value_or_default(PopplerStructureElement *poppler_structure_element, Attribute::Type attribute_type) +{ + const Attribute *attr = poppler_structure_element->elem->findAttribute(attribute_type, true); + return attr ? attr->getValue() : Attribute::getDefaultValue(attribute_type); +} + +/** + * poppler_structure_element_get_page: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the page number in which the element is contained. + * + * Return value: Number of the page that contains the element, of + * <code>-1</code> if not defined. + * + * Since: 0.26 + */ +gint poppler_structure_element_get_page(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), -1); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, -1); + + Ref ref; + if (poppler_structure_element->elem->getPageRef(ref)) { + return poppler_structure_element->document->doc->findPage(ref) - 1; + } + + return -1; +} + +/** + * poppler_structure_element_is_content: + * @poppler_structure_element: A #PopplerStructureElement + * + * Checks whether an element is actual document content. + * + * Return value: %TRUE if the element is content, or %FALSE otherwise. + * + * Since: 0.26 + */ +gboolean poppler_structure_element_is_content(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), FALSE); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, FALSE); + + return poppler_structure_element->elem->isContent(); +} + +/** + * poppler_structure_element_is_inline: + * @poppler_structure_element: A #PopplerStructureElement + * + * Checks whether an element is an inline element. + * + * Return value: %TRUE if the element is an inline element, or %FALSE otherwise. + * + * Since: 0.26 + */ +gboolean poppler_structure_element_is_inline(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), FALSE); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, FALSE); + + return poppler_structure_element->elem->isInline(); +} + +/** + * poppler_structure_element_is_block: + * @poppler_structure_element: A #PopplerStructureElement + * + * Checks whether an element is a block element. + * + * Return value: %TRUE if the element is a block element, or %FALSE otherwise. + * + * Since: 0.26 + */ +gboolean poppler_structure_element_is_block(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), FALSE); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, FALSE); + + return poppler_structure_element->elem->isBlock(); +} + +/** + * poppler_structure_element_is_grouping: + * @poppler_structure_element: A #PopplerStructureElement + * + * Checks whether an element is a grouping element. + * + * Return value: %TRUE if the element is a grouping element, %FALSE + * otherwise. + * + * Since: 0.26 + */ +gboolean poppler_structure_element_is_grouping(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), FALSE); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, FALSE); + + return poppler_structure_element->elem->isGrouping(); +} + +/** + * poppler_structure_element_get_id: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the identifier of an element. + * + * Return value: (transfer full): The identifier of the element (if + * defined), or %NULL. + * + * Since: 0.26 + */ +gchar *poppler_structure_element_get_id(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), NULL); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, NULL); + + const GooString *string = poppler_structure_element->elem->getID(); + return string ? _poppler_goo_string_to_utf8(string) : nullptr; +} + +/** + * poppler_structure_element_get_title: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the title of an element. + * + * Return value: (transfer full): The title of the element, or %NULL. + * + * Since: 0.26 + */ +gchar *poppler_structure_element_get_title(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), NULL); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, NULL); + + const GooString *string = poppler_structure_element->elem->getTitle(); + return string ? _poppler_goo_string_to_utf8(string) : nullptr; +} + +/** + * poppler_structure_element_get_abbreviation: + * @poppler_structure_element: A #PopplerStructureElement + * + * Acronyms and abbreviations contained in elements of type + * #POPPLER_STRUCTURE_ELEMENT_SPAN may have an associated expanded + * text form, which can be retrieved using this function. + * + * Return value: (transfer full): Text of the expanded abbreviation if the + * element text is an abbreviation or acrony, %NULL if not. + * + * Since: 0.26 + */ +gchar *poppler_structure_element_get_abbreviation(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), NULL); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, NULL); + + if (poppler_structure_element->elem->getType() != StructElement::Span) { + return nullptr; + } + + const GooString *string = poppler_structure_element->elem->getExpandedAbbr(); + return string ? _poppler_goo_string_to_utf8(string) : nullptr; +} + +/** + * poppler_structure_element_get_language: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the language and country code for the content in an element, + * in two-letter ISO format, e.g. <code>en_ES</code>, or %NULL if not + * defined. + * + * Return value: (transfer full): language and country code, or %NULL. + * + * Since: 0.26 + */ +gchar *poppler_structure_element_get_language(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), NULL); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, NULL); + + const GooString *string = poppler_structure_element->elem->getLanguage(); + return string ? _poppler_goo_string_to_utf8(string) : nullptr; +} + +/** + * poppler_structure_element_get_alt_text: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the “alternate” text representation of the element (and its child + * elements). This is mostly used for non-text elements like images and + * figures, to specify a textual description of the element. + * + * Note that for elements containing proper text, the function + * poppler_structure_element_get_text() must be used instead. + * + * Return value: (transfer full): The alternate text representation for the + * element, or %NULL if not defined. + * + * Since: 0.26 + */ +gchar *poppler_structure_element_get_alt_text(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), NULL); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, NULL); + + const GooString *string = poppler_structure_element->elem->getAltText(); + return string ? _poppler_goo_string_to_utf8(string) : nullptr; +} + +/** + * poppler_structure_element_get_actual_text: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the actual text enclosed by the element (and its child elements). + * The actual text is mostly used for non-text elements like images and + * figures which <emphasis>do</emphasis> have the graphical appearance of text, like + * a logo. For those the actual text is the equivalent text to those + * graphical elements which look like text when rendered. + * + * Note that for elements containing proper text, the function + * poppler_structure_element_get_text() must be used instead. + * + * Return value: (transfer full): The actual text for the element, or %NULL + * if not defined. + * + * Since: 0.26 + */ +gchar *poppler_structure_element_get_actual_text(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), NULL); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, NULL); + + const GooString *string = poppler_structure_element->elem->getActualText(); + return string ? _poppler_goo_string_to_utf8(string) : nullptr; +} + +/** + * poppler_structure_element_get_text: + * @poppler_structure_element: A #PopplerStructureElement + * @flags: A #PopplerStructureGetTextFlags value, or + * %POPPLER_STRUCTURE_GET_TEXT_NONE to disable all the flags. + * + * Obtains the text enclosed by an element, or the text enclosed by the + * elements in the subtree (including the element itself). + * + * Return value: (transfer full): A string. + * + * Since: 0.26 + */ +gchar *poppler_structure_element_get_text(PopplerStructureElement *poppler_structure_element, PopplerStructureGetTextFlags flags) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), NULL); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, NULL); + + GooString *string = poppler_structure_element->elem->getText(flags & POPPLER_STRUCTURE_GET_TEXT_RECURSIVE); + gchar *result = string ? _poppler_goo_string_to_utf8(string) : nullptr; + delete string; + return result; +} + +struct _PopplerStructureElementIter +{ + PopplerDocument *document; + union { + const StructElement *elem; + const StructTreeRoot *root; + }; + gboolean is_root; + unsigned index; +}; + +G_DEFINE_BOXED_TYPE(PopplerStructureElementIter, poppler_structure_element_iter, poppler_structure_element_iter_copy, poppler_structure_element_iter_free) + +/** + * poppler_structure_element_iter_copy: + * @iter: a #PopplerStructureElementIter + * + * Creates a new #PopplerStructureElementIter as a copy of @iter. The + * returned value must be freed with poppler_structure_element_iter_free(). + * + * Return value: (transfer full): a new #PopplerStructureElementIter + * + * Since: 0.26 + */ +PopplerStructureElementIter *poppler_structure_element_iter_copy(PopplerStructureElementIter *iter) +{ + PopplerStructureElementIter *new_iter; + + g_return_val_if_fail(iter != nullptr, NULL); + + new_iter = g_slice_dup(PopplerStructureElementIter, iter); + new_iter->document = (PopplerDocument *)g_object_ref(new_iter->document); + + return new_iter; +} + +/** + * poppler_structure_element_iter_free: + * @iter: a #PopplerStructureElementIter + * + * Frees @iter. + * + * Since: 0.26 + */ +void poppler_structure_element_iter_free(PopplerStructureElementIter *iter) +{ + if (G_UNLIKELY(iter == nullptr)) { + return; + } + + g_object_unref(iter->document); + g_slice_free(PopplerStructureElementIter, iter); +} + +/** + * poppler_structure_element_iter_new: + * @poppler_document: a #PopplerDocument. + * + * Returns the root #PopplerStructureElementIter for @document, or %NULL. The + * returned value must be freed with poppler_structure_element_iter_free(). + * + * Documents may have an associated structure tree —mostly, Tagged-PDF + * compliant documents— which can be used to obtain information about + * the document structure and its contents. Each node in the tree contains + * a #PopplerStructureElement. + * + * Here is a simple example that walks the whole tree: + * + * <informalexample><programlisting> + * static void + * walk_structure (PopplerStructureElementIter *iter) + * { + * do { + * /<!-- -->* Get the element and do something with it *<!-- -->/ + * PopplerStructureElementIter *child = poppler_structure_element_iter_get_child (iter); + * if (child) + * walk_structure (child); + * poppler_structure_element_iter_free (child); + * } while (poppler_structure_element_iter_next (iter)); + * } + * ... + * { + * iter = poppler_structure_element_iter_new (document); + * walk_structure (iter); + * poppler_structure_element_iter_free (iter); + * } + * </programlisting></informalexample> + * + * Return value: (transfer full): a new #PopplerStructureElementIter, or %NULL if document + * doesn't have structure tree. + * + * Since: 0.26 + */ +PopplerStructureElementIter *poppler_structure_element_iter_new(PopplerDocument *poppler_document) +{ + PopplerStructureElementIter *iter; + + g_return_val_if_fail(POPPLER_IS_DOCUMENT(poppler_document), NULL); + + const StructTreeRoot *root = poppler_document->doc->getStructTreeRoot(); + if (root == nullptr) { + return nullptr; + } + + if (root->getNumChildren() == 0) { + return nullptr; + } + + iter = g_slice_new0(PopplerStructureElementIter); + iter->document = (PopplerDocument *)g_object_ref(poppler_document); + iter->is_root = TRUE; + iter->root = root; + + return iter; +} + +/** + * poppler_structure_element_iter_next: + * @iter: a #PopplerStructureElementIter + * + * Sets @iter to point to the next structure element at the current level + * of the tree, if valid. See poppler_structure_element_iter_new() for more + * information. + * + * Return value: %TRUE, if @iter was set to the next structure element + * + * Since: 0.26 + */ +gboolean poppler_structure_element_iter_next(PopplerStructureElementIter *iter) +{ + unsigned elements; + + g_return_val_if_fail(iter != nullptr, FALSE); + + elements = iter->is_root ? iter->root->getNumChildren() : iter->elem->getNumChildren(); + + return ++iter->index < elements; +} + +/** + * poppler_structure_element_iter_get_element: + * @iter: a #PopplerStructureElementIter + * + * Returns the #PopplerStructureElementIter associated with @iter. + * + * Return value: (transfer full): a new #PopplerStructureElementIter + * + * Since: 0.26 + */ +PopplerStructureElement *poppler_structure_element_iter_get_element(PopplerStructureElementIter *iter) +{ + g_return_val_if_fail(iter != nullptr, NULL); + + const StructElement *elem = iter->is_root ? iter->root->getChild(iter->index) : iter->elem->getChild(iter->index); + + return _poppler_structure_element_new(iter->document, elem); +} + +/** + * poppler_structure_element_iter_get_child: + * @parent: a #PopplerStructureElementIter + * + * Returns a new iterator to the children elements of the + * #PopplerStructureElement associated with @iter. The returned value must + * be freed with poppler_structure_element_iter_free(). + * + * Return value: a new #PopplerStructureElementIter + * + * Since: 0.26 + */ +PopplerStructureElementIter *poppler_structure_element_iter_get_child(PopplerStructureElementIter *parent) +{ + const StructElement *elem; + + g_return_val_if_fail(parent != nullptr, NULL); + + elem = parent->is_root ? parent->root->getChild(parent->index) : parent->elem->getChild(parent->index); + + if (elem->getNumChildren() > 0) { + PopplerStructureElementIter *child = g_slice_new0(PopplerStructureElementIter); + child->document = (PopplerDocument *)g_object_ref(parent->document); + child->elem = elem; + return child; + } + + return nullptr; +} + +struct _PopplerTextSpan +{ + gchar *text; + gchar *font_name; + guint flags; + PopplerColor color; +}; + +G_DEFINE_BOXED_TYPE(PopplerTextSpan, poppler_text_span, poppler_text_span_copy, poppler_text_span_free) + +enum +{ + POPPLER_TEXT_SPAN_FIXED_WIDTH = (1 << 0), + POPPLER_TEXT_SPAN_SERIF = (1 << 1), + POPPLER_TEXT_SPAN_ITALIC = (1 << 2), + POPPLER_TEXT_SPAN_BOLD = (1 << 3), +}; + +static PopplerTextSpan *text_span_poppler_text_span(const TextSpan &span) +{ + PopplerTextSpan *new_span = g_slice_new0(PopplerTextSpan); + if (GooString *text = span.getText()) { + new_span->text = _poppler_goo_string_to_utf8(text); + } + + new_span->color.red = colToDbl(span.getColor().r) * 65535; + new_span->color.green = colToDbl(span.getColor().g) * 65535; + new_span->color.blue = colToDbl(span.getColor().b) * 65535; + + if (span.getFont()) { + // GfxFont sometimes does not have a family name but there + // is always a font name that can be used as fallback. + const GooString *font_name = span.getFont()->getFamily(); + if (font_name) { + new_span->font_name = _poppler_goo_string_to_utf8(font_name); + } else if (span.getFont()->getName()) { + const GooString aux(*span.getFont()->getName()); + new_span->font_name = _poppler_goo_string_to_utf8(&aux); + } else { + new_span->font_name = nullptr; + } + + if (span.getFont()->isFixedWidth()) { + new_span->flags |= POPPLER_TEXT_SPAN_FIXED_WIDTH; + } + if (span.getFont()->isSerif()) { + new_span->flags |= POPPLER_TEXT_SPAN_SERIF; + } + if (span.getFont()->isItalic()) { + new_span->flags |= POPPLER_TEXT_SPAN_ITALIC; + } + if (span.getFont()->isBold()) { + new_span->flags |= POPPLER_TEXT_SPAN_BOLD; + } + + /* isBold() can return false for some fonts whose weight is heavy */ + switch (span.getFont()->getWeight()) { + case GfxFont::W500: + case GfxFont::W600: + case GfxFont::W700: + case GfxFont::W800: + case GfxFont::W900: + new_span->flags |= POPPLER_TEXT_SPAN_BOLD; + default: + break; + } + } + + return new_span; +} + +/** + * poppler_text_span_copy: + * @poppler_text_span: a #PopplerTextSpan + * + * Makes a copy of a text span. + * + * Return value: (transfer full): A new #PopplerTextSpan + * + * Since: 0.26 + */ +PopplerTextSpan *poppler_text_span_copy(PopplerTextSpan *poppler_text_span) +{ + PopplerTextSpan *new_span; + + g_return_val_if_fail(poppler_text_span != nullptr, NULL); + + new_span = g_slice_dup(PopplerTextSpan, poppler_text_span); + new_span->text = g_strdup(poppler_text_span->text); + if (poppler_text_span->font_name) { + new_span->font_name = g_strdup(poppler_text_span->font_name); + } + return new_span; +} + +/** + * poppler_text_span_free: + * @poppler_text_span: A #PopplerTextSpan + * + * Frees a text span. + * + * Since: 0.26 + */ +void poppler_text_span_free(PopplerTextSpan *poppler_text_span) +{ + if (G_UNLIKELY(poppler_text_span == nullptr)) { + return; + } + + g_free(poppler_text_span->text); + g_free(poppler_text_span->font_name); + g_slice_free(PopplerTextSpan, poppler_text_span); +} + +/** + * poppler_text_span_is_fixed_width_font: + * @poppler_text_span: a #PopplerTextSpan + * + * Check wether a text span is meant to be rendered using a fixed-width font. + * + * Return value: Whether the span uses a fixed-width font. + * + * Since: 0.26 + */ +gboolean poppler_text_span_is_fixed_width_font(PopplerTextSpan *poppler_text_span) +{ + g_return_val_if_fail(poppler_text_span != nullptr, FALSE); + + return (poppler_text_span->flags & POPPLER_TEXT_SPAN_FIXED_WIDTH); +} + +/** + * poppler_text_span_is_serif_font: + * @poppler_text_span: a #PopplerTextSpan + * + * Check whether a text span is meant to be rendered using a serif font. + * + * Return value: Whether the span uses a serif font. + * + * Since: 0.26 + */ +gboolean poppler_text_span_is_serif_font(PopplerTextSpan *poppler_text_span) +{ + g_return_val_if_fail(poppler_text_span != nullptr, FALSE); + + return (poppler_text_span->flags & POPPLER_TEXT_SPAN_SERIF); +} + +/** + * poppler_text_span_is_bold_font: + * @poppler_text_span: a #PopplerTextSpan + * + * Check whether a text span is meant to be rendered using a bold font. + * + * Return value: Whether the span uses bold font. + * + * Since: 0.26 + */ +gboolean poppler_text_span_is_bold_font(PopplerTextSpan *poppler_text_span) +{ + g_return_val_if_fail(poppler_text_span != nullptr, FALSE); + + return (poppler_text_span->flags & POPPLER_TEXT_SPAN_BOLD); +} + +/** + * poppler_text_span_get_color: + * @poppler_text_span: a #PopplerTextSpan + * @color: (out): a return location for a #PopplerColor + * + * Obtains the color in which the text is to be rendered. + * + * Since: 0.26 + */ +void poppler_text_span_get_color(PopplerTextSpan *poppler_text_span, PopplerColor *color) +{ + g_return_if_fail(poppler_text_span != nullptr); + g_return_if_fail(color != nullptr); + + *color = poppler_text_span->color; +} + +/** + * poppler_text_span_get_text: + * @poppler_text_span: a #PopplerTextSpan + * + * Obtains the text contained in the span. + * + * Return value: (transfer none): A string. + * + * Since: 0.26 + */ +const gchar *poppler_text_span_get_text(PopplerTextSpan *poppler_text_span) +{ + g_return_val_if_fail(poppler_text_span != nullptr, NULL); + + return poppler_text_span->text; +} + +/** + * poppler_text_span_get_font_name: + * @poppler_text_span: a #PopplerTextSpan + * + * Obtains the name of the font in which the span is to be rendered. + * + * Return value: (transfer none): A string containing the font name, or + * %NULL if a font is not defined. + * + * Since: 0.26 + */ +const gchar *poppler_text_span_get_font_name(PopplerTextSpan *poppler_text_span) +{ + g_return_val_if_fail(poppler_text_span != nullptr, NULL); + + return poppler_text_span->font_name; +} + +/** + * poppler_structure_element_get_text_spans: + * @poppler_structure_element: A #PopplerStructureElement + * @n_text_spans: (out): A pointer to the location where the number of elements in + * the returned array will be stored. + * + * Obtains the text enclosed by an element, as an array of #PopplerTextSpan + * structures. Each item in the list is a piece of text which share the same + * attributes, plus its attributes. The following example shows how to + * obtain and free the text spans of an element: + * + * <informalexample><programlisting> + * guint i, n_spans; + * PopplerTextSpan **text_spans = + * poppler_structure_element_get_text_spans (element, &n_spans); + * /<!-- -->* Use the text spans *<!-- -->/ + * for (i = 0; i < n_spans; i++) + * poppler_text_span_free (text_spans[i]); + * g_free (text_spans); + * </programlisting></informalexample> + * + * Return value: (transfer full) (array length=n_text_spans) (element-type PopplerTextSpan): + * An array of #PopplerTextSpan elements. + * + * Since: 0.26 + */ +PopplerTextSpan **poppler_structure_element_get_text_spans(PopplerStructureElement *poppler_structure_element, guint *n_text_spans) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), NULL); + g_return_val_if_fail(n_text_spans != nullptr, NULL); + g_return_val_if_fail(poppler_structure_element->elem != nullptr, NULL); + + if (!poppler_structure_element->elem->isContent()) { + return nullptr; + } + + const TextSpanArray spans(poppler_structure_element->elem->getTextSpans()); + PopplerTextSpan **text_spans = g_new0(PopplerTextSpan *, spans.size()); + + size_t i = 0; + for (const TextSpan &s : spans) { + text_spans[i++] = text_span_poppler_text_span(s); + } + + *n_text_spans = spans.size(); + + return text_spans; +} + +/* General Layout Attributes */ + +/** + * poppler_structure_element_get_placement: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the placement type of the structure element. + * + * Return value: A #PopplerStructurePlacement value. + * + * Since: 0.26 + */ +PopplerStructurePlacement poppler_structure_element_get_placement(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), EnumNameValue<PopplerStructurePlacement>::values[0].value); + return attr_to_enum<PopplerStructurePlacement>(poppler_structure_element); +} + +/** + * poppler_structure_element_get_writing_mode: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the writing mode (writing direction) of the content associated + * with a structure element. + * + * Return value: A #PopplerStructureWritingMode value. + * + * Since: 0.26 + */ +PopplerStructureWritingMode poppler_structure_element_get_writing_mode(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), EnumNameValue<PopplerStructureWritingMode>::values[0].value); + return attr_to_enum<PopplerStructureWritingMode>(poppler_structure_element); +} + +static void convert_border_style(const Object *object, PopplerStructureBorderStyle *values) +{ + g_assert(object != nullptr); + g_assert(values != nullptr); + + if (object->isArray()) { + g_assert(object->arrayGetLength() == 4); + for (guint i = 0; i < 4; i++) { + Object item = object->arrayGet(i); + values[i] = name_to_enum<PopplerStructureBorderStyle>(&item); + } + } else { + values[0] = values[1] = values[2] = values[3] = name_to_enum<PopplerStructureBorderStyle>(object); + } +} + +/** + * poppler_structure_element_get_border_style: + * @poppler_structure_element: A #PopplerStructureElement + * @border_styles: (out) (array fixed-size=4) (element-type PopplerStructureBorderStyle): + * An array of four #PopplerStructureBorderStyle elements. + * + * Obtains the border style of a structure element. The result values + * are in before-after-start-end ordering. For example, using Western + * left-to-right writing, that is top-bottom-left-right. + * + * Since: 0.26 + */ +void poppler_structure_element_get_border_style(PopplerStructureElement *poppler_structure_element, PopplerStructureBorderStyle *border_styles) +{ + g_return_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element)); + g_return_if_fail(border_styles != nullptr); + + convert_border_style(attr_value_or_default(poppler_structure_element, Attribute::BorderStyle), border_styles); +} + +static inline void convert_doubles_array(const Object *object, gdouble **values, guint *n_values) +{ + g_assert(object->isArray()); + g_assert(n_values != nullptr); + g_assert(values != nullptr); + + *n_values = object->arrayGetLength(); + gdouble *doubles = g_new(gdouble, *n_values); + + for (guint i = 0; i < *n_values; i++) { + doubles[i] = object->arrayGet(i).getNum(); + } + + values = &doubles; +} + +static inline void convert_color(const Object *object, PopplerColor *color) +{ + g_assert(color != nullptr); + g_assert(object->isArray() && object->arrayGetLength() != 3); + + color->red = object->arrayGet(0).getNum() * 65535; + color->green = object->arrayGet(1).getNum() * 65535; + color->blue = object->arrayGet(2).getNum() * 65535; +} + +/** + * poppler_structure_element_get_color: + * @poppler_structure_element: A #PopplerStructureElement + * @color: (out): A #PopplerColor. + * + * Obtains the color of the content contained in the element. + * If this attribute is not specified, the color for this element shall + * be the current text fill color in effect at the start of its associated content. + * + * Return value: %TRUE if a color is defined for the element, + * %FALSE otherwise. + * + * Since: 0.26 + */ +gboolean poppler_structure_element_get_color(PopplerStructureElement *poppler_structure_element, PopplerColor *color) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), FALSE); + g_return_val_if_fail(color != nullptr, FALSE); + + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::Color); + if (value == nullptr) { + return FALSE; + } + + convert_color(value, color); + return TRUE; +} + +/** + * poppler_structure_element_get_background_color: + * @poppler_structure_element: A #PopplerStructureElement + * @color: (out): A #PopplerColor. + * + * Obtains the background color of the element. If this attribute is + * not specified, the element shall be treated as if it were transparent. + * + * Return value: %TRUE if a color is defined for the element, + * %FALSE otherwise. + * + * Since: 0.26 + */ +gboolean poppler_structure_element_get_background_color(PopplerStructureElement *poppler_structure_element, PopplerColor *color) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), FALSE); + g_return_val_if_fail(color != nullptr, FALSE); + + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::BackgroundColor); + if (value == nullptr) { + return FALSE; + } + + convert_color(value, color); + return TRUE; +} + +/** + * poppler_structure_element_get_border_color: + * @poppler_structure_element: A #PopplerStructureElement + * @colors: (out) (array fixed-size=4) (element-type PopplerColor): An array + * of four #PopplerColor. + * + * Obtains the color of border around the element. The result values + * are in before-after-start-end ordering (for the typical Western + * left-to-right writing, that is top-bottom-left-right). + * If this attribute is not specified, the border color for this element shall + * be the current text fill color in effect at the start of its associated + * content. + * + * Return value: %TRUE if a color is defined for the element, + * %FALSE otherwise. + * + * Since: 0.26 + */ +gboolean poppler_structure_element_get_border_color(PopplerStructureElement *poppler_structure_element, PopplerColor *colors) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), FALSE); + g_return_val_if_fail(colors != nullptr, FALSE); + + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::BorderColor); + if (value == nullptr) { + return FALSE; + } + + g_assert(value->isArray()); + if (value->arrayGetLength() == 4) { + // One color per side. + for (guint i = 0; i < 4; i++) { + Object item = value->arrayGet(i); + convert_color(&item, &colors[i]); + } + } else { + // Same color in all sides. + g_assert(value->arrayGetLength() == 3); + convert_color(value, &colors[0]); + colors[1] = colors[2] = colors[3] = colors[0]; + } + + return TRUE; +} + +static inline void convert_double_or_4_doubles(const Object *object, gdouble *value) +{ + g_assert(object != nullptr); + + if (object->isArray()) { + g_assert(object->arrayGetLength() == 4); + for (guint i = 0; i < 4; i++) { + value[i] = object->arrayGet(i).getNum(); + } + } else { + g_assert(object->isNum()); + value[0] = value[1] = value[2] = value[3] = object->getNum(); + } +} + +/** + * poppler_structure_element_get_border_thickness: + * @poppler_structure_element: A #PopplerStructureElement + * @border_thicknesses: (out) (array fixed-size=4) (element-type gdouble): + * Array with the four values of border thicknesses. + * + * Obtains the thickness of the border of an element. The result values + * are in before-after-start-end ordering (for the typical Western + * left-to-right writing, that is top-bottom-left-right). + * A value of 0 indicates that the border shall not be drawn. + * + * Return value: %TRUE if the border thickness attribute is defined for + * the element, %FALSE otherwise. + * + * Since: 0.26 + */ +gboolean poppler_structure_element_get_border_thickness(PopplerStructureElement *poppler_structure_element, gdouble *border_thicknesses) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), FALSE); + g_return_val_if_fail(border_thicknesses != nullptr, FALSE); + + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::BorderThickness); + if (value == nullptr) { + return FALSE; + } + + convert_double_or_4_doubles(value, border_thicknesses); + return TRUE; +} + +/** + * poppler_structure_element_get_padding: + * @poppler_structure_element: A #PopplerStructureElement + * @paddings: (out) (array fixed-size=4) (element-type gdouble): + * Padding for the four sides of the element. + * + * Obtains the padding of an element (space around it). The result + * values are in before-after-start-end ordering. For example using + * Western left-to-right writing, that is top-bottom-left-right. + * + * Since: 0.26 + */ +void poppler_structure_element_get_padding(PopplerStructureElement *poppler_structure_element, gdouble *paddings) +{ + g_return_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element)); + g_return_if_fail(paddings != nullptr); + + convert_double_or_4_doubles(attr_value_or_default(poppler_structure_element, Attribute::Padding), paddings); +} + +/* Layout Attributes for block-level structure elements */ + +/** + * poppler_structure_element_get_space_before: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the amount of empty space before the block-level structure element. + * + * Return value: A positive value. + * + * Since: 0.26 + */ +gdouble poppler_structure_element_get_space_before(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_block(poppler_structure_element), NAN); + return attr_value_or_default(poppler_structure_element, Attribute::SpaceBefore)->getNum(); +} + +/** + * poppler_structure_element_get_space_after: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the amount of empty space after the block-level structure element. + * + * Return value: A positive value. + * + * Since: 0.26 + */ +gdouble poppler_structure_element_get_space_after(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_block(poppler_structure_element), NAN); + return attr_value_or_default(poppler_structure_element, Attribute::SpaceAfter)->getNum(); +} + +/** + * poppler_structure_element_get_start_indent: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the amount of indentation at the beginning of the block-level structure element. + * + * Return value: A numeric value. + * + * Since: 0.26 + */ +gdouble poppler_structure_element_get_start_indent(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_block(poppler_structure_element), NAN); + return attr_value_or_default(poppler_structure_element, Attribute::StartIndent)->getNum(); +} + +/** + * poppler_structure_element_get_end_indent: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the amount of indentation at the end of the block-level structure element. + * + * Return value: A numeric value. + * + * Since: 0.26 + */ +gdouble poppler_structure_element_get_end_indent(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_block(poppler_structure_element), NAN); + return attr_value_or_default(poppler_structure_element, Attribute::EndIndent)->getNum(); +} + +/** + * poppler_structure_element_get_text_indent: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the amount of indentation of the text contained in the block-level structure element. + * + * Return value: A numeric value. + * + * Since: 0.26 + */ +gdouble poppler_structure_element_get_text_indent(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_block(poppler_structure_element), NAN); + return attr_value_or_default(poppler_structure_element, Attribute::TextIndent)->getNum(); +} + +/** + * poppler_structure_element_get_text_align: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the text alignment mode of the text contained into a + * block-level structure element. + * + * Return value: A #PopplerStructureTextAlign value. + * + * Since: 0.26 + */ +PopplerStructureTextAlign poppler_structure_element_get_text_align(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_block(poppler_structure_element), EnumNameValue<PopplerStructureTextAlign>::values[0].value); + return attr_to_enum<PopplerStructureTextAlign>(poppler_structure_element); +} + +/** + * poppler_structure_element_get_bounding_box: + * @poppler_structure_element: A #PopplerStructureElement + * @bounding_box: (out): A #PopplerRectangle. + * + * Obtains the size of the bounding box of a block-level structure element. + * + * Return value: %TRUE if a bounding box is defined for the element, + * %FALSE otherwise. + * + * Since: 0.26 + */ +gboolean poppler_structure_element_get_bounding_box(PopplerStructureElement *poppler_structure_element, PopplerRectangle *bounding_box) +{ + g_return_val_if_fail(poppler_structure_element_is_block(poppler_structure_element), FALSE); + g_return_val_if_fail(bounding_box != nullptr, FALSE); + + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::BBox); + if (value == nullptr) { + return FALSE; + } + + gdouble dimensions[4]; + convert_double_or_4_doubles(value, dimensions); + + bounding_box->x1 = dimensions[0]; + bounding_box->y1 = dimensions[1]; + bounding_box->x2 = dimensions[2]; + bounding_box->y2 = dimensions[3]; + + return TRUE; +} + +/** + * poppler_structure_element_get_width: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the width of the block-level structure element. Note that for elements which do + * not specify a width, it has to be calculated, and in this case -1 is returned. + * + * Return value: A positive value if a width is defined, or -1 + * if the width is to be calculated automatically. + * + * Since: 0.26 + */ +gdouble poppler_structure_element_get_width(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_block(poppler_structure_element), NAN); + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::Width); + return value->isName("Auto") ? -1.0 : value->getNum(); +} + +/** + * poppler_structure_element_get_height: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the height of the block-level structure element. Note that for elements which do + * not specify a height, it has to be calculated, and in this case -1 is returned. + * + * Return value: A positive value if a width is defined, or -1 + * if the height is to be calculated automatically. + * + * Since: 0.26 + */ +gdouble poppler_structure_element_get_height(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_block(poppler_structure_element), NAN); + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::Height); + return value->isName("Auto") ? -1.0 : value->getNum(); +} + +/** + * poppler_structure_element_get_block_align: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the block-alignment mode of the block-level structure element. + * + * Return value: A #PopplerStructureBlockAlign value. + * + * Since: 0.26 + */ +PopplerStructureBlockAlign poppler_structure_element_get_block_align(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_block(poppler_structure_element), EnumNameValue<PopplerStructureBlockAlign>::values[0].value); + return attr_to_enum<PopplerStructureBlockAlign>(poppler_structure_element); +} + +/** + * poppler_structure_element_get_inline_align: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the inline-alignment mode of the block-level structure element. + * + * Return value: A #PopplerStructureInlineAlign value. + * + * Since: 0.26 + */ +PopplerStructureInlineAlign poppler_structure_element_get_inline_align(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_block(poppler_structure_element), EnumNameValue<PopplerStructureInlineAlign>::values[0].value); + return attr_to_enum<PopplerStructureInlineAlign>(poppler_structure_element); +} + +/** + * poppler_structure_element_get_table_border_style: + * @poppler_structure_element: A #PopplerStructureElement + * @border_styles: (out) (array fixed-size=4) (element-type PopplerStructureBorderStyle): + * An array of four #PopplerStructureBorderStyle elements. + * + * Obtains the table cell border style of a block-level structure element. The result values + * are in before-after-start-end ordering. For example, using Western + * left-to-right writing, that is top-bottom-left-right. + * + * Since: 0.26 + */ +void poppler_structure_element_get_table_border_style(PopplerStructureElement *poppler_structure_element, PopplerStructureBorderStyle *border_styles) +{ + g_return_if_fail(poppler_structure_element_is_block(poppler_structure_element)); + g_return_if_fail(border_styles != nullptr); + + convert_border_style(attr_value_or_default(poppler_structure_element, Attribute::TBorderStyle), border_styles); +} + +/** + * poppler_structure_element_get_table_padding: + * @poppler_structure_element: A #PopplerStructureElement + * @paddings: (out) (array fixed-size=4) (element-type gdouble): + * Padding for the four sides of the element. + * + * Obtains the padding between the table cell’s content rectangle and the + * surrounding border of a block-level structure element. The result + * values are in before-after-start-end ordering (for the typical + * Western left-to-right writing, that is top-bottom-left-right). + * + * Since: 0.26 + */ +void poppler_structure_element_get_table_padding(PopplerStructureElement *poppler_structure_element, gdouble *paddings) +{ + g_return_if_fail(poppler_structure_element_is_block(poppler_structure_element)); + g_return_if_fail(paddings != nullptr); + + convert_double_or_4_doubles(attr_value_or_default(poppler_structure_element, Attribute::TPadding), paddings); +} + +/* Layout Attributes for inline-level structure elements */ + +/** + * poppler_structure_element_get_baseline_shift: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains how much the text contained in the inline-level structure element should be shifted, + * measuring from the baseline of the glyphs. + * + * Return value: A numeric value. + * + * Since: 0.26 + */ +gdouble poppler_structure_element_get_baseline_shift(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_inline(poppler_structure_element), NAN); + return attr_value_or_default(poppler_structure_element, Attribute::BaselineShift)->getNum(); +} + +/** + * poppler_structure_element_get_line_height: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the line height for the text contained in the inline-level structure element. + * Note that for elements which do not specify a line height, it has to be calculated, + * and in this case -1 is returned. + * + * Return value: A positive value if a line height is defined, or -1 + * if the height is to be calculated automatically. + * + * Since: 0.26 + */ +gdouble poppler_structure_element_get_line_height(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_inline(poppler_structure_element), NAN); + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::LineHeight); + return (value->isName("Normal") || value->isName("Auto")) ? -1.0 : value->getNum(); +} + +/** + * poppler_structure_element_get_text_decoration_color: + * @poppler_structure_element: A #PopplerStructureElement + * @color: (out): A #PopplerColor. + * + * Obtains the color of the text decoration for the text contained + * in the inline-level structure element. + * If this attribute is not specified, the color for this element shall be the current fill + * color in effect at the start of its associated content. + * + * Return value: %TRUE if a color is defined for the element, + * %FALSE otherwise. + * + * Since: 0.26 + */ +gboolean poppler_structure_element_get_text_decoration_color(PopplerStructureElement *poppler_structure_element, PopplerColor *color) +{ + g_return_val_if_fail(poppler_structure_element_is_inline(poppler_structure_element), FALSE); + g_return_val_if_fail(color != nullptr, FALSE); + + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::TextDecorationColor); + if (value == nullptr) { + return FALSE; + } + + convert_color(value, color); + return FALSE; +} + +/** + * poppler_structure_element_get_text_decoration_thickness: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the thickness of the text decoration for the text contained + * in the inline-level structure element. + * If this attribute is not specified, it shall be derived from the current + * stroke thickness in effect at the start of the element’s associated content. + * + * Return value: Thickness of the text decoration, or NAN if not defined. + * + * Since: 0.26 + */ +gdouble poppler_structure_element_get_text_decoration_thickness(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_inline(poppler_structure_element), NAN); + + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::TextDecorationThickness); + return (value == nullptr) ? NAN : value->getNum(); +} + +/** + * poppler_structure_element_get_text_decoration_type: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the text decoration type of the text contained in the + * inline-level structure element. + * + * Return value: A #PopplerStructureTextDecoration value. + * + * Since: 0.26 + */ +PopplerStructureTextDecoration poppler_structure_element_get_text_decoration_type(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_inline(poppler_structure_element), EnumNameValue<PopplerStructureTextDecoration>::values[0].value); + return attr_to_enum<PopplerStructureTextDecoration>(poppler_structure_element); +} + +/** + * poppler_structure_element_get_ruby_align: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the alignment for the ruby text contained in a + * inline-level structure element. + * + * Return value: A #PopplerStructureRubyAlign value. + * + * Since: 0.26 + */ +PopplerStructureRubyAlign poppler_structure_element_get_ruby_align(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_inline(poppler_structure_element), EnumNameValue<PopplerStructureRubyAlign>::values[0].value); + return attr_to_enum<PopplerStructureRubyAlign>(poppler_structure_element); +} + +/** + * poppler_structure_element_get_ruby_position: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the position for the ruby text contained in a + * inline-level structure element. + * + * Return value: A #PopplerStructureRubyPosition value. + * + * Since: 0.26 + */ +PopplerStructureRubyPosition poppler_structure_element_get_ruby_position(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_inline(poppler_structure_element), EnumNameValue<PopplerStructureRubyPosition>::values[0].value); + return attr_to_enum<PopplerStructureRubyPosition>(poppler_structure_element); +} + +/** + * poppler_structure_element_get_glyph_orientation: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the glyph orientation for the text contained in a + * inline-level structure element. + * + * Return value: A #PopplerStructureGlyphOrientation value. + * + * Since: 0.26 + */ +PopplerStructureGlyphOrientation poppler_structure_element_get_glyph_orientation(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_inline(poppler_structure_element), EnumNameValue<PopplerStructureGlyphOrientation>::values[0].value); + return attr_to_enum<PopplerStructureGlyphOrientation>(poppler_structure_element); +} + +/* Column Attributes */ + +/** + * poppler_structure_element_get_column_count: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the number of columns used to lay out the content contained + * in the grouping element. + * + * Return value: Number of columns. + * + * Since: 0.26 + */ +guint poppler_structure_element_get_column_count(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_is_grouping(poppler_structure_element), 0); + return static_cast<guint>(attr_value_or_default(poppler_structure_element, Attribute::ColumnCount)->getInt()); +} + +/** + * poppler_structure_element_get_column_gaps: + * @poppler_structure_element: A #PopplerStructureElement + * @n_values: (out): Size of the returned array. + * + * Obtains the size of the gaps in between adjacent columns. Returns an + * array of elements: the first one is the size of the gap in between + * columns 1 and 2, second is the size between columns 2 and 3, and so on. + * + * For elements which use a single column, %NULL is returned and @n_values + * is set to zero. + * + * If the attribute is undefined, %NULL is returned and @n_values is set + * to a non-zero value. + * + * The array with the results is allocated by the function. When it is + * not needed anymore, be sure to call g_free() on it. + * + * Return value: (transfer full) (array length=n_values) (element-type gdouble): + * Array containing the values for the column gaps, or %NULL if the + * array is empty or the attribute is not defined. + * + * Since: 0.26 + */ +gdouble *poppler_structure_element_get_column_gaps(PopplerStructureElement *poppler_structure_element, guint *n_values) +{ + g_return_val_if_fail(poppler_structure_element_is_grouping(poppler_structure_element), NULL); + g_return_val_if_fail(n_values != nullptr, NULL); + + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::ColumnGap); + if (value == nullptr) { + *n_values = static_cast<guint>(-1); + return nullptr; + } + + gdouble *result = nullptr; + convert_doubles_array(value, &result, n_values); + return result; +} + +/** + * poppler_structure_element_get_column_widths: + * @poppler_structure_element: A #PopplerStructureElement + * @n_values: (out): Size of the returned array. + * + * Obtains an array with the widths of the columns. + * + * The array with the results is allocated by the function. When it is + * not needed anymore, be sure to call g_free() on it. + * + * Return value: (transfer full) (array length=n_values) (element-type gdouble): + * Array containing widths of the columns, or %NULL if the attribute + * is not defined. + * + * Since: 0.26 + */ +gdouble *poppler_structure_element_get_column_widths(PopplerStructureElement *poppler_structure_element, guint *n_values) +{ + g_return_val_if_fail(poppler_structure_element_is_grouping(poppler_structure_element), NULL); + g_return_val_if_fail(n_values != nullptr, NULL); + + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::ColumnWidths); + if (value == nullptr) { + return nullptr; + } + + gdouble *result = nullptr; + convert_doubles_array(value, &result, n_values); + return result; +} + +/* List Attribute */ + +/** + * poppler_structure_element_get_list_numbering: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the list numbering style for list items. + * + * Return value: A #PopplerStructureListNumbering value. + * + * Since: 0.26 + */ +PopplerStructureListNumbering poppler_structure_element_get_list_numbering(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_get_kind(poppler_structure_element) == POPPLER_STRUCTURE_ELEMENT_LIST_ITEM, EnumNameValue<PopplerStructureListNumbering>::values[0].value); + return attr_to_enum<PopplerStructureListNumbering>(poppler_structure_element); +} + +/* PrintField Attributes */ + +/** + * poppler_structure_element_get_form_role: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the role of a form structure element that is part of a form, or is + * a form field. This hints how the control for the element is intended + * to be rendered. + * + * Return value: A #PopplerStructureFormRole value. + * + * Since: 0.26 + */ +PopplerStructureFormRole poppler_structure_element_get_form_role(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_get_kind(poppler_structure_element) == POPPLER_STRUCTURE_ELEMENT_FORM, EnumNameValue<PopplerStructureFormRole>::values[0].value); + + /* + * The Role attribute can actually be undefined. + */ + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::Role); + if (value == nullptr) { + return POPPLER_STRUCTURE_FORM_ROLE_UNDEFINED; + } + + return name_to_enum<PopplerStructureFormRole>(value); +} + +/** + * poppler_structure_element_get_form_state: + * @poppler_structure_element: A #PopplerStructureElement + * + * For a structure element that is a form field, obtains in which state + * the associated control is expected to be rendered. + * + * Return value: A #PopplerStructureFormState value. + * + * Since: 0.26 + */ +PopplerStructureFormState poppler_structure_element_get_form_state(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_get_kind(poppler_structure_element) == POPPLER_STRUCTURE_ELEMENT_FORM, EnumNameValue<PopplerStructureFormState>::values[0].value); + return attr_to_enum<PopplerStructureFormState>(poppler_structure_element); +} + +/** + * poppler_structure_element_get_form_description: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the textual description of the form element. Note that the + * description is for informative purposes, and it is not intended + * to be rendered. For example, assistive technologies may use the + * description field to provide an alternate way of presenting an + * element to the user. + * + * The returned string is allocated by the function. When it is + * not needed anymore, be sure to call g_free() on it. + * + * Return value: (transfer full): A string, or %NULL if the attribute + * is not defined. + * + * Since: 0.26 + */ +gchar *poppler_structure_element_get_form_description(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_get_kind(poppler_structure_element) == POPPLER_STRUCTURE_ELEMENT_FORM, NULL); + + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::Desc); + if (value == nullptr) { + return nullptr; + } + if (value->isString()) { + return _poppler_goo_string_to_utf8(value->getString()); + } + if (value->isName()) { + return g_strdup(value->getName()); + } + + g_assert_not_reached(); + return nullptr; +} + +/* Table Attributes */ + +/** + * poppler_structure_element_get_table_row_span: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the number of rows the table element spans to. + * + * Return value: A positive, non-zero value. + * + * Since: 0.26 + */ +guint poppler_structure_element_get_table_row_span(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_get_kind(poppler_structure_element) == POPPLER_STRUCTURE_ELEMENT_TABLE, 0); + return static_cast<guint>(attr_value_or_default(poppler_structure_element, Attribute::RowSpan)->getInt()); +} + +/** + * poppler_structure_element_get_table_column_span: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the number of columns the table element spans to. + * + * Return value: A positive, non-zero value. + * + * Since: 0.26 + */ +guint poppler_structure_element_get_table_column_span(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_get_kind(poppler_structure_element) == POPPLER_STRUCTURE_ELEMENT_TABLE, 0); + return static_cast<guint>(attr_value_or_default(poppler_structure_element, Attribute::ColSpan)->getInt()); +} + +/** + * poppler_structure_element_get_table_headers: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains an array with the names of the table column headers. This is only + * useful for table header row elements. + * + * The array with the results is allocated by the function. The number + * of items in the returned array can be obtained with g_strv_length(). + * The returned value must be freed using g_strfreev(). + * + * Return value: (transfer full) (array zero-terminated=1) (element-type gchar*): + * Zero-terminated array of strings with the table header names, + * or %NULL if the attribute is not defined. + * + * Since: 0.26 + */ +gchar **poppler_structure_element_get_table_headers(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_get_kind(poppler_structure_element) == POPPLER_STRUCTURE_ELEMENT_TABLE, NULL); + + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::Headers); + if (value == nullptr) { + return nullptr; + } + + g_assert(value->isArray()); + + const guint n_values = value->arrayGetLength(); + gchar **result = g_new0(gchar *, n_values + 1); + + for (guint i = 0; i < n_values; i++) { + Object item = value->arrayGet(i); + + if (item.isString()) { + result[i] = _poppler_goo_string_to_utf8(item.getString()); + } else if (item.isName()) { + result[i] = g_strdup(item.getName()); + } else { + g_assert_not_reached(); + } + } + + return result; +} + +/** + * poppler_structure_element_get_table_scope: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the scope of a table structure element. + * + * Return value: A #PopplerStructureTableScope value. + * + * Since: 0.26 + */ +PopplerStructureTableScope poppler_structure_element_get_table_scope(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(poppler_structure_element_get_kind(poppler_structure_element) == POPPLER_STRUCTURE_ELEMENT_TABLE, EnumNameValue<PopplerStructureTableScope>::values[0].value); + return attr_to_enum<PopplerStructureTableScope>(poppler_structure_element); +} + +/** + * poppler_structure_element_get_table_summary: + * @poppler_structure_element: A #PopplerStructureElement + * + * Obtains the textual summary of the contents of the table element. Note that + * the summary is meant for informative purposes, and it is not intended + * to be rendered. For example, assistive technologies may use the + * description field to provide an alternate way of presenting an element + * to the user, or a document indexer may want to scan it for additional + * keywords. + * + * The returned string is allocated by the function. When it is + * not needed anymore, be sure to call g_free() on it. + * + * Return value: (transfer full): A string, or %NULL if the attribute + * is not defined. + * + * Since: 0.26 + */ +gchar *poppler_structure_element_get_table_summary(PopplerStructureElement *poppler_structure_element) +{ + g_return_val_if_fail(POPPLER_IS_STRUCTURE_ELEMENT(poppler_structure_element), NULL); + + const Object *value = attr_value_or_default(poppler_structure_element, Attribute::Summary); + if (value == nullptr) { + return nullptr; + } + if (value->isString()) { + return _poppler_goo_string_to_utf8(value->getString()); + } + if (value->isName()) { + return g_strdup(value->getName()); + } + + g_assert_not_reached(); + return nullptr; +} diff --git a/poppler-24.05.0/glib/poppler-structure-element.h b/poppler-24.05.0/glib/poppler-structure-element.h new file mode 100644 index 0000000000000000000000000000000000000000..05cef08e3a4cb76b7aabe96dd635af2927969f86 --- /dev/null +++ b/poppler-24.05.0/glib/poppler-structure-element.h @@ -0,0 +1,425 @@ +/* poppler-structure-element.h: glib interface to poppler + * + * Copyright (C) 2013 Igalia S.L. + * + * 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. + */ + +#ifndef __POPPLER_STRUCTURE_ELEMENT_H__ +#define __POPPLER_STRUCTURE_ELEMENT_H__ + +#include <glib-object.h> +#include "poppler.h" + +G_BEGIN_DECLS + +#define POPPLER_TYPE_STRUCTURE_ELEMENT (poppler_structure_element_get_type()) +#define POPPLER_STRUCTURE_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), POPPLER_TYPE_STRUCTURE_ELEMENT, PopplerStructureElement)) +#define POPPLER_IS_STRUCTURE_ELEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), POPPLER_TYPE_STRUCTURE_ELEMENT)) + +/** + * PopplerStructureElementKind: + */ +typedef enum +{ + POPPLER_STRUCTURE_ELEMENT_CONTENT, + POPPLER_STRUCTURE_ELEMENT_OBJECT_REFERENCE, + POPPLER_STRUCTURE_ELEMENT_DOCUMENT, + POPPLER_STRUCTURE_ELEMENT_PART, + POPPLER_STRUCTURE_ELEMENT_ARTICLE, + POPPLER_STRUCTURE_ELEMENT_SECTION, + POPPLER_STRUCTURE_ELEMENT_DIV, + POPPLER_STRUCTURE_ELEMENT_SPAN, + POPPLER_STRUCTURE_ELEMENT_QUOTE, + POPPLER_STRUCTURE_ELEMENT_NOTE, + POPPLER_STRUCTURE_ELEMENT_REFERENCE, + POPPLER_STRUCTURE_ELEMENT_BIBENTRY, + POPPLER_STRUCTURE_ELEMENT_CODE, + POPPLER_STRUCTURE_ELEMENT_LINK, + POPPLER_STRUCTURE_ELEMENT_ANNOT, + POPPLER_STRUCTURE_ELEMENT_BLOCKQUOTE, + POPPLER_STRUCTURE_ELEMENT_CAPTION, + POPPLER_STRUCTURE_ELEMENT_NONSTRUCT, + POPPLER_STRUCTURE_ELEMENT_TOC, + POPPLER_STRUCTURE_ELEMENT_TOC_ITEM, + POPPLER_STRUCTURE_ELEMENT_INDEX, + POPPLER_STRUCTURE_ELEMENT_PRIVATE, + POPPLER_STRUCTURE_ELEMENT_PARAGRAPH, + POPPLER_STRUCTURE_ELEMENT_HEADING, + POPPLER_STRUCTURE_ELEMENT_HEADING_1, + POPPLER_STRUCTURE_ELEMENT_HEADING_2, + POPPLER_STRUCTURE_ELEMENT_HEADING_3, + POPPLER_STRUCTURE_ELEMENT_HEADING_4, + POPPLER_STRUCTURE_ELEMENT_HEADING_5, + POPPLER_STRUCTURE_ELEMENT_HEADING_6, + POPPLER_STRUCTURE_ELEMENT_LIST, + POPPLER_STRUCTURE_ELEMENT_LIST_ITEM, + POPPLER_STRUCTURE_ELEMENT_LIST_LABEL, + POPPLER_STRUCTURE_ELEMENT_LIST_BODY, + POPPLER_STRUCTURE_ELEMENT_TABLE, + POPPLER_STRUCTURE_ELEMENT_TABLE_ROW, + POPPLER_STRUCTURE_ELEMENT_TABLE_HEADING, + POPPLER_STRUCTURE_ELEMENT_TABLE_DATA, + POPPLER_STRUCTURE_ELEMENT_TABLE_HEADER, + POPPLER_STRUCTURE_ELEMENT_TABLE_FOOTER, + POPPLER_STRUCTURE_ELEMENT_TABLE_BODY, + POPPLER_STRUCTURE_ELEMENT_RUBY, + POPPLER_STRUCTURE_ELEMENT_RUBY_BASE_TEXT, + POPPLER_STRUCTURE_ELEMENT_RUBY_ANNOT_TEXT, + POPPLER_STRUCTURE_ELEMENT_RUBY_PUNCTUATION, + POPPLER_STRUCTURE_ELEMENT_WARICHU, + POPPLER_STRUCTURE_ELEMENT_WARICHU_TEXT, + POPPLER_STRUCTURE_ELEMENT_WARICHU_PUNCTUATION, + POPPLER_STRUCTURE_ELEMENT_FIGURE, + POPPLER_STRUCTURE_ELEMENT_FORMULA, + POPPLER_STRUCTURE_ELEMENT_FORM, +} PopplerStructureElementKind; + +/** + * PopplerStructureGetTextFlags: + * @POPPLER_STRUCTURE_GET_TEXT_NONE: No flags. + * @POPPLER_STRUCTURE_GET_TEXT_RECURSIVE: For non-leaf, non-content + * elements, recursively obtain the text from all the elements + * enclosed in the subtree. + */ +typedef enum +{ + POPPLER_STRUCTURE_GET_TEXT_NONE = 0, + POPPLER_STRUCTURE_GET_TEXT_RECURSIVE = (1 << 0), +} PopplerStructureGetTextFlags; + +/** + * PopplerStructurePlacement: + */ +typedef enum +{ + POPPLER_STRUCTURE_PLACEMENT_BLOCK, + POPPLER_STRUCTURE_PLACEMENT_INLINE, + POPPLER_STRUCTURE_PLACEMENT_BEFORE, + POPPLER_STRUCTURE_PLACEMENT_START, + POPPLER_STRUCTURE_PLACEMENT_END, +} PopplerStructurePlacement; + +/** + * PopplerStructureWritingMode: + */ +typedef enum +{ + POPPLER_STRUCTURE_WRITING_MODE_LR_TB, + POPPLER_STRUCTURE_WRITING_MODE_RL_TB, + POPPLER_STRUCTURE_WRITING_MODE_TB_RL, +} PopplerStructureWritingMode; + +/** + * PopplerStructureBorderStyle: + */ +typedef enum +{ + POPPLER_STRUCTURE_BORDER_STYLE_NONE, + POPPLER_STRUCTURE_BORDER_STYLE_HIDDEN, + POPPLER_STRUCTURE_BORDER_STYLE_DOTTED, + POPPLER_STRUCTURE_BORDER_STYLE_DASHED, + POPPLER_STRUCTURE_BORDER_STYLE_SOLID, + POPPLER_STRUCTURE_BORDER_STYLE_DOUBLE, + POPPLER_STRUCTURE_BORDER_STYLE_GROOVE, + POPPLER_STRUCTURE_BORDER_STYLE_INSET, + POPPLER_STRUCTURE_BORDER_STYLE_OUTSET, +} PopplerStructureBorderStyle; + +/** + * PopplerStructureTextAlign: + */ +typedef enum +{ + POPPLER_STRUCTURE_TEXT_ALIGN_START, + POPPLER_STRUCTURE_TEXT_ALIGN_CENTER, + POPPLER_STRUCTURE_TEXT_ALIGN_END, + POPPLER_STRUCTURE_TEXT_ALIGN_JUSTIFY, +} PopplerStructureTextAlign; + +/** + * PopplerStructureBlockAlign: + */ +typedef enum +{ + POPPLER_STRUCTURE_BLOCK_ALIGN_BEFORE, + POPPLER_STRUCTURE_BLOCK_ALIGN_MIDDLE, + POPPLER_STRUCTURE_BLOCK_ALIGN_AFTER, + POPPLER_STRUCTURE_BLOCK_ALIGN_JUSTIFY, +} PopplerStructureBlockAlign; + +/** + * PopplerStructureInlineAlign: + */ +typedef enum +{ + POPPLER_STRUCTURE_INLINE_ALIGN_START, + POPPLER_STRUCTURE_INLINE_ALIGN_CENTER, + POPPLER_STRUCTURE_INLINE_ALIGN_END, +} PopplerStructureInlineAlign; + +/** + * PopplerStructureTextDecoration: + */ +typedef enum +{ + POPPLER_STRUCTURE_TEXT_DECORATION_NONE, + POPPLER_STRUCTURE_TEXT_DECORATION_UNDERLINE, + POPPLER_STRUCTURE_TEXT_DECORATION_OVERLINE, + POPPLER_STRUCTURE_TEXT_DECORATION_LINETHROUGH, +} PopplerStructureTextDecoration; + +/** + * PopplerStructureRubyAlign: + */ +typedef enum +{ + POPPLER_STRUCTURE_RUBY_ALIGN_START, + POPPLER_STRUCTURE_RUBY_ALIGN_CENTER, + POPPLER_STRUCTURE_RUBY_ALIGN_END, + POPPLER_STRUCTURE_RUBY_ALIGN_JUSTIFY, + POPPLER_STRUCTURE_RUBY_ALIGN_DISTRIBUTE, +} PopplerStructureRubyAlign; + +/** + * PopplerStructureRubyPosition: + */ +typedef enum +{ + POPPLER_STRUCTURE_RUBY_POSITION_BEFORE, + POPPLER_STRUCTURE_RUBY_POSITION_AFTER, + POPPLER_STRUCTURE_RUBY_POSITION_WARICHU, + POPPLER_STRUCTURE_RUBY_POSITION_INLINE, +} PopplerStructureRubyPosition; + +/** + * PopplerStructureGlyphOrientation: + */ +typedef enum +{ + POPPLER_STRUCTURE_GLYPH_ORIENTATION_AUTO, + POPPLER_STRUCTURE_GLYPH_ORIENTATION_0 = POPPLER_STRUCTURE_GLYPH_ORIENTATION_AUTO, + POPPLER_STRUCTURE_GLYPH_ORIENTATION_90, + POPPLER_STRUCTURE_GLYPH_ORIENTATION_180, + POPPLER_STRUCTURE_GLYPH_ORIENTATION_270, +} PopplerStructureGlyphOrientation; + +/** + * PopplerStructureListNumbering: + */ +typedef enum +{ + POPPLER_STRUCTURE_LIST_NUMBERING_NONE, + POPPLER_STRUCTURE_LIST_NUMBERING_DISC, + POPPLER_STRUCTURE_LIST_NUMBERING_CIRCLE, + POPPLER_STRUCTURE_LIST_NUMBERING_SQUARE, + POPPLER_STRUCTURE_LIST_NUMBERING_DECIMAL, + POPPLER_STRUCTURE_LIST_NUMBERING_UPPER_ROMAN, + POPPLER_STRUCTURE_LIST_NUMBERING_LOWER_ROMAN, + POPPLER_STRUCTURE_LIST_NUMBERING_UPPER_ALPHA, + POPPLER_STRUCTURE_LIST_NUMBERING_LOWER_ALPHA, +} PopplerStructureListNumbering; + +/** + * PopplerStructureFormRole: + */ +typedef enum +{ + POPPLER_STRUCTURE_FORM_ROLE_UNDEFINED, + POPPLER_STRUCTURE_FORM_ROLE_RADIO_BUTTON, + POPPLER_STRUCTURE_FORM_ROLE_PUSH_BUTTON, + POPPLER_STRUCTURE_FORM_ROLE_TEXT_VALUE, + POPPLER_STRUCTURE_FORM_ROLE_CHECKBOX, +} PopplerStructureFormRole; + +/** + * PopplerStructureFormState: + */ +typedef enum +{ + POPPLER_STRUCTURE_FORM_STATE_ON, + POPPLER_STRUCTURE_FORM_STATE_OFF, + POPPLER_STRUCTURE_FORM_STATE_NEUTRAL, +} PopplerStructureFormState; + +/** + * PopplerStructureTableScope: + */ +typedef enum +{ + POPPLER_STRUCTURE_TABLE_SCOPE_ROW, + POPPLER_STRUCTURE_TABLE_SCOPE_COLUMN, + POPPLER_STRUCTURE_TABLE_SCOPE_BOTH, +} PopplerStructureTableScope; + +POPPLER_PUBLIC +GType poppler_structure_element_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerStructureElementKind poppler_structure_element_get_kind(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gint poppler_structure_element_get_page(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gboolean poppler_structure_element_is_content(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gboolean poppler_structure_element_is_inline(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gboolean poppler_structure_element_is_block(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gboolean poppler_structure_element_is_grouping(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gchar *poppler_structure_element_get_id(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gchar *poppler_structure_element_get_title(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gchar *poppler_structure_element_get_abbreviation(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gchar *poppler_structure_element_get_language(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gchar *poppler_structure_element_get_text(PopplerStructureElement *poppler_structure_element, PopplerStructureGetTextFlags flags); +POPPLER_PUBLIC +gchar *poppler_structure_element_get_alt_text(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gchar *poppler_structure_element_get_actual_text(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +PopplerTextSpan **poppler_structure_element_get_text_spans(PopplerStructureElement *poppler_structure_element, guint *n_text_spans); + +POPPLER_PUBLIC +PopplerStructurePlacement poppler_structure_element_get_placement(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +PopplerStructureWritingMode poppler_structure_element_get_writing_mode(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gboolean poppler_structure_element_get_background_color(PopplerStructureElement *poppler_structure_element, PopplerColor *color); +POPPLER_PUBLIC +gboolean poppler_structure_element_get_border_color(PopplerStructureElement *poppler_structure_element, PopplerColor *colors); +POPPLER_PUBLIC +void poppler_structure_element_get_border_style(PopplerStructureElement *poppler_structure_element, PopplerStructureBorderStyle *border_styles); +POPPLER_PUBLIC +gboolean poppler_structure_element_get_border_thickness(PopplerStructureElement *poppler_structure_element, gdouble *border_thicknesses); +POPPLER_PUBLIC +void poppler_structure_element_get_padding(PopplerStructureElement *poppler_structure_element, gdouble *paddings); +POPPLER_PUBLIC +gboolean poppler_structure_element_get_color(PopplerStructureElement *poppler_structure_element, PopplerColor *color); + +POPPLER_PUBLIC +gdouble poppler_structure_element_get_space_before(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gdouble poppler_structure_element_get_space_after(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gdouble poppler_structure_element_get_start_indent(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gdouble poppler_structure_element_get_end_indent(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gdouble poppler_structure_element_get_text_indent(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +PopplerStructureTextAlign poppler_structure_element_get_text_align(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gboolean poppler_structure_element_get_bounding_box(PopplerStructureElement *poppler_structure_element, PopplerRectangle *bounding_box); +POPPLER_PUBLIC +gdouble poppler_structure_element_get_width(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gdouble poppler_structure_element_get_height(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +PopplerStructureBlockAlign poppler_structure_element_get_block_align(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +PopplerStructureInlineAlign poppler_structure_element_get_inline_align(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +void poppler_structure_element_get_table_border_style(PopplerStructureElement *poppler_structure_element, PopplerStructureBorderStyle *border_styles); +POPPLER_PUBLIC +void poppler_structure_element_get_table_padding(PopplerStructureElement *poppler_structure_element, gdouble *paddings); + +POPPLER_PUBLIC +gdouble poppler_structure_element_get_baseline_shift(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gdouble poppler_structure_element_get_line_height(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gboolean poppler_structure_element_get_text_decoration_color(PopplerStructureElement *poppler_structure_element, PopplerColor *color); +POPPLER_PUBLIC +gdouble poppler_structure_element_get_text_decoration_thickness(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +PopplerStructureTextDecoration poppler_structure_element_get_text_decoration_type(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +PopplerStructureRubyAlign poppler_structure_element_get_ruby_align(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +PopplerStructureRubyPosition poppler_structure_element_get_ruby_position(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +PopplerStructureGlyphOrientation poppler_structure_element_get_glyph_orientation(PopplerStructureElement *poppler_structure_element); + +POPPLER_PUBLIC +guint poppler_structure_element_get_column_count(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gdouble *poppler_structure_element_get_column_gaps(PopplerStructureElement *poppler_structure_element, guint *n_values); +POPPLER_PUBLIC +gdouble *poppler_structure_element_get_column_widths(PopplerStructureElement *poppler_structure_element, guint *n_values); + +POPPLER_PUBLIC +PopplerStructureListNumbering poppler_structure_element_get_list_numbering(PopplerStructureElement *poppler_structure_element); + +POPPLER_PUBLIC +PopplerStructureFormRole poppler_structure_element_get_form_role(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +PopplerStructureFormState poppler_structure_element_get_form_state(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gchar *poppler_structure_element_get_form_description(PopplerStructureElement *poppler_structure_element); + +POPPLER_PUBLIC +guint poppler_structure_element_get_table_row_span(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +guint poppler_structure_element_get_table_column_span(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gchar **poppler_structure_element_get_table_headers(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +PopplerStructureTableScope poppler_structure_element_get_table_scope(PopplerStructureElement *poppler_structure_element); +POPPLER_PUBLIC +gchar *poppler_structure_element_get_table_summary(PopplerStructureElement *poppler_structure_element); + +#define POPPLER_TYPE_STRUCTURE_ELEMENT_ITER (poppler_structure_element_iter_get_type()) +POPPLER_PUBLIC +GType poppler_structure_element_iter_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerStructureElementIter *poppler_structure_element_iter_new(PopplerDocument *poppler_document); +POPPLER_PUBLIC +PopplerStructureElementIter *poppler_structure_element_iter_get_child(PopplerStructureElementIter *parent); +POPPLER_PUBLIC +PopplerStructureElementIter *poppler_structure_element_iter_copy(PopplerStructureElementIter *iter); +POPPLER_PUBLIC +PopplerStructureElement *poppler_structure_element_iter_get_element(PopplerStructureElementIter *iter); +POPPLER_PUBLIC +gboolean poppler_structure_element_iter_next(PopplerStructureElementIter *iter); +POPPLER_PUBLIC +void poppler_structure_element_iter_free(PopplerStructureElementIter *iter); + +#define POPPLER_TYPE_TEXT_SPAN (poppler_text_span_get_type()) +POPPLER_PUBLIC +GType poppler_text_span_get_type(void) G_GNUC_CONST; +POPPLER_PUBLIC +PopplerTextSpan *poppler_text_span_copy(PopplerTextSpan *poppler_text_span); +POPPLER_PUBLIC +void poppler_text_span_free(PopplerTextSpan *poppler_text_span); +POPPLER_PUBLIC +gboolean poppler_text_span_is_fixed_width_font(PopplerTextSpan *poppler_text_span); +POPPLER_PUBLIC +gboolean poppler_text_span_is_serif_font(PopplerTextSpan *poppler_text_span); +POPPLER_PUBLIC +gboolean poppler_text_span_is_bold_font(PopplerTextSpan *poppler_text_span); +POPPLER_PUBLIC +void poppler_text_span_get_color(PopplerTextSpan *poppler_text_span, PopplerColor *color); +POPPLER_PUBLIC +const gchar *poppler_text_span_get_text(PopplerTextSpan *poppler_text_span); +POPPLER_PUBLIC +const gchar *poppler_text_span_get_font_name(PopplerTextSpan *poppler_text_span); + +G_END_DECLS + +#endif /* !__POPPLER_STRUCTURE_ELEMENT_H__ */ diff --git a/poppler-24.05.0/glib/poppler.cc b/poppler-24.05.0/glib/poppler.cc new file mode 100644 index 0000000000000000000000000000000000000000..9f83679498d4ff244fa0f392452c44b3e429075e --- /dev/null +++ b/poppler-24.05.0/glib/poppler.cc @@ -0,0 +1,95 @@ +/* poppler.cc: glib wrapper for poppler + * Copyright (C) 2005, Red Hat, Inc. + * + * 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 <config.h> +#include "poppler.h" + +#ifndef __GI_SCANNER__ +# include <Error.h> +#endif + +#include "poppler-private.h" + +/** + * SECTION: poppler-errors + * @title: Error handling + * @short_description: Error domain and codes + * + */ + +/** + * POPPLER_ERROR: + * + * Error domain for poppler operations. Errors in this domain will + * be from the #PopplerError enumeration. See #GError for information + * on error domains. + */ + +GQuark poppler_error_quark(void) +{ + static GQuark q = 0; + + if (q == 0) { + q = g_quark_from_static_string("poppler-quark"); + } + + return q; +} + +/** + * poppler_get_backend: + * + * Returns the backend compiled into the poppler library. + * + * Return value: The backend used by poppler + **/ +PopplerBackend poppler_get_backend(void) +{ + return POPPLER_BACKEND_CAIRO; +} + +static const char poppler_version[] = PACKAGE_VERSION; + +/** + * poppler_get_version: + * + * Returns the version of poppler in use. This result is not to be freed. + * + * Return value: the version of poppler. + **/ +const char *poppler_get_version(void) +{ + return poppler_version; +} + +/* We want to install an error callback so that PDF syntax warnings etc + * can be redirected through the GLib logging API instead of always just + * going to stderr. + */ + +void _poppler_error_cb(ErrorCategory category, Goffset pos, const char *message) +{ + static const char *const cat_str[] = { "Syntax warning", "Syntax error", nullptr, nullptr, "IO error", nullptr, "Unimplemented feature", "Internal error" }; + + /* The following will never occur in poppler-glib */ + if (category == errConfig || category == errCommandLine || category == errNotAllowed) { + return; + } + + g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, "%s at position %" G_GOFFSET_FORMAT ": %s", cat_str[category], (goffset)pos, message); +} diff --git a/poppler-24.05.0/glib/poppler.h b/poppler-24.05.0/glib/poppler.h new file mode 100644 index 0000000000000000000000000000000000000000..70f2172a3e749b131a6ee0d13f4f4b570abf4e51 --- /dev/null +++ b/poppler-24.05.0/glib/poppler.h @@ -0,0 +1,263 @@ +/* poppler.h: glib interface to poppler + * Copyright (C) 2004, Red Hat, Inc. + * Copyright (C) 2021 André Guerreiro <aguerreiro1985@gmail.com> + * + * 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. + */ + +#ifndef __POPPLER_GLIB_H__ +#define __POPPLER_GLIB_H__ + +#include <glib-object.h> + +#include "poppler-macros.h" + +G_BEGIN_DECLS + +POPPLER_PUBLIC +GQuark poppler_error_quark(void); + +#define POPPLER_ERROR poppler_error_quark() + +/** + * PopplerError: + * @POPPLER_ERROR_INVALID: Generic error when a document operation fails + * @POPPLER_ERROR_ENCRYPTED: Document is encrypted + * @POPPLER_ERROR_OPEN_FILE: File could not be opened for writing when saving document + * @POPPLER_ERROR_BAD_CATALOG: Failed to read the document catalog + * @POPPLER_ERROR_DAMAGED: Document is damaged + * + * Error codes returned by #PopplerDocument + */ +typedef enum +{ + POPPLER_ERROR_INVALID, + POPPLER_ERROR_ENCRYPTED, + POPPLER_ERROR_OPEN_FILE, + POPPLER_ERROR_BAD_CATALOG, + POPPLER_ERROR_DAMAGED, + POPPLER_ERROR_SIGNING +} PopplerError; + +/** + * PopplerPageTransitionType: + * @POPPLER_PAGE_TRANSITION_REPLACE: the new page replace the old one + * @POPPLER_PAGE_TRANSITION_SPLIT: two lines sweep across the screen, revealing the new page + * @POPPLER_PAGE_TRANSITION_BLINDS: multiple lines, evenly spaced across the screen, synchronously + * sweep in the same direction to reveal the new page + * @POPPLER_PAGE_TRANSITION_BOX: a rectangular box sweeps inward from the edges of the page or + * outward from the center revealing the new page + * @POPPLER_PAGE_TRANSITION_WIPE: a single line sweeps across the screen from one edge to the other + * revealing the new page + * @POPPLER_PAGE_TRANSITION_DISSOLVE: the old page dissolves gradually to reveal the new one + * @POPPLER_PAGE_TRANSITION_GLITTER: similar to #POPPLER_PAGE_TRANSITION_DISSOLVE, except that the effect + * sweeps across the page in a wide band moving from one side of the screen to the other + * @POPPLER_PAGE_TRANSITION_FLY: changes are flown out or in to or from a location that is offscreen + * @POPPLER_PAGE_TRANSITION_PUSH: the old page slides off the screen while the new page slides in + * @POPPLER_PAGE_TRANSITION_COVER: the new page slides on to the screen covering the old page + * @POPPLER_PAGE_TRANSITION_UNCOVER: the old page slides off the screen uncovering the new page + * @POPPLER_PAGE_TRANSITION_FADE: the new page gradually becomes visible through the old one + * + * Page transition types + */ +typedef enum +{ + POPPLER_PAGE_TRANSITION_REPLACE, + POPPLER_PAGE_TRANSITION_SPLIT, + POPPLER_PAGE_TRANSITION_BLINDS, + POPPLER_PAGE_TRANSITION_BOX, + POPPLER_PAGE_TRANSITION_WIPE, + POPPLER_PAGE_TRANSITION_DISSOLVE, + POPPLER_PAGE_TRANSITION_GLITTER, + POPPLER_PAGE_TRANSITION_FLY, + POPPLER_PAGE_TRANSITION_PUSH, + POPPLER_PAGE_TRANSITION_COVER, + POPPLER_PAGE_TRANSITION_UNCOVER, + POPPLER_PAGE_TRANSITION_FADE +} PopplerPageTransitionType; + +/** + * PopplerPageTransitionAlignment: + * @POPPLER_PAGE_TRANSITION_HORIZONTAL: horizontal dimension + * @POPPLER_PAGE_TRANSITION_VERTICAL: vertical dimension + * + * Page transition alignment types for #POPPLER_PAGE_TRANSITION_SPLIT + * and #POPPLER_PAGE_TRANSITION_BLINDS transition types + */ +typedef enum +{ + POPPLER_PAGE_TRANSITION_HORIZONTAL, + POPPLER_PAGE_TRANSITION_VERTICAL +} PopplerPageTransitionAlignment; + +/** + * PopplerPageTransitionDirection: + * @POPPLER_PAGE_TRANSITION_INWARD: inward from the edges of the page + * @POPPLER_PAGE_TRANSITION_OUTWARD: outward from the center of the page + * + * Page transition direction types for #POPPLER_PAGE_TRANSITION_SPLIT, + * #POPPLER_PAGE_TRANSITION_BOX and #POPPLER_PAGE_TRANSITION_FLY transition types + */ +typedef enum +{ + POPPLER_PAGE_TRANSITION_INWARD, + POPPLER_PAGE_TRANSITION_OUTWARD +} PopplerPageTransitionDirection; + +/** + * PopplerSelectionStyle: + * @POPPLER_SELECTION_GLYPH: glyph is the minimum unit for selection + * @POPPLER_SELECTION_WORD: word is the minimum unit for selection + * @POPPLER_SELECTION_LINE: line is the minimum unit for selection + * + * Selection styles + */ +typedef enum +{ + POPPLER_SELECTION_GLYPH, + POPPLER_SELECTION_WORD, + POPPLER_SELECTION_LINE +} PopplerSelectionStyle; + +/** + * PopplerPrintFlags: + * @POPPLER_PRINT_DOCUMENT: print main document contents + * @POPPLER_PRINT_MARKUP_ANNOTS: print document and markup annotations + * @POPPLER_PRINT_STAMP_ANNOTS_ONLY: print document and only stamp annotations + * @POPPLER_PRINT_ALL: print main document contents and all markup annotations + * + * Printing flags + * + * Since: 0.16 + */ +typedef enum /*< flags >*/ +{ + POPPLER_PRINT_DOCUMENT = 0, + POPPLER_PRINT_MARKUP_ANNOTS = 1 << 0, + POPPLER_PRINT_STAMP_ANNOTS_ONLY = 1 << 1, + POPPLER_PRINT_ALL = POPPLER_PRINT_MARKUP_ANNOTS +} PopplerPrintFlags; + +/** + * PopplerFindFlags: + * @POPPLER_FIND_DEFAULT: use default search settings + * @POPPLER_FIND_CASE_SENSITIVE: do case sensitive search + * @POPPLER_FIND_BACKWARDS: search backwards + * @POPPLER_FIND_WHOLE_WORDS_ONLY: search only whole words + * @POPPLER_FIND_IGNORE_DIACRITICS: do diacritics insensitive search, + * i.e. ignore accents, umlauts, diaeresis,etc. while matching. This + * option will be ignored if the search term is not pure ascii. Since 0.73. + * @POPPLER_FIND_MULTILINE: allows to match on text spanning from + * end of a line to the next line. (Currently it won't match on text spanning + * more than two lines.) Automatically ignores hyphen at end of line, and + * allows whitespace in search term to match on newline char. Since: 21.05.0. + * + * Flags using while searching text in a page + * + * Since: 0.22 + */ +typedef enum /*< flags >*/ +{ + POPPLER_FIND_DEFAULT = 0, + POPPLER_FIND_CASE_SENSITIVE = 1 << 0, + POPPLER_FIND_BACKWARDS = 1 << 1, + POPPLER_FIND_WHOLE_WORDS_ONLY = 1 << 2, + POPPLER_FIND_IGNORE_DIACRITICS = 1 << 3, + POPPLER_FIND_MULTILINE = 1 << 4 +} PopplerFindFlags; + +typedef struct _PopplerDocument PopplerDocument; +typedef struct _PopplerIndexIter PopplerIndexIter; +typedef struct _PopplerFontsIter PopplerFontsIter; +typedef struct _PopplerLayersIter PopplerLayersIter; +typedef struct _PopplerPoint PopplerPoint; +typedef struct _PopplerRectangle PopplerRectangle; +typedef struct _PopplerTextAttributes PopplerTextAttributes; +typedef struct _PopplerColor PopplerColor; +typedef struct _PopplerLinkMapping PopplerLinkMapping; +typedef struct _PopplerPageTransition PopplerPageTransition; +typedef struct _PopplerImageMapping PopplerImageMapping; +typedef struct _PopplerFormFieldMapping PopplerFormFieldMapping; +typedef struct _PopplerAnnotMapping PopplerAnnotMapping; +typedef struct _PopplerPage PopplerPage; +typedef struct _PopplerFontInfo PopplerFontInfo; +typedef struct _PopplerLayer PopplerLayer; +typedef struct _PopplerPSFile PopplerPSFile; +typedef union _PopplerAction PopplerAction; +typedef struct _PopplerDest PopplerDest; +typedef struct _PopplerActionLayer PopplerActionLayer; +typedef struct _PopplerFormField PopplerFormField; +typedef struct _PopplerAttachment PopplerAttachment; +typedef struct _PopplerMovie PopplerMovie; +typedef struct _PopplerMedia PopplerMedia; +typedef struct _PopplerAnnot PopplerAnnot; +typedef struct _PopplerAnnotMarkup PopplerAnnotMarkup; +typedef struct _PopplerAnnotText PopplerAnnotText; +typedef struct _PopplerAnnotTextMarkup PopplerAnnotTextMarkup; +typedef struct _PopplerAnnotFreeText PopplerAnnotFreeText; +typedef struct _PopplerAnnotFileAttachment PopplerAnnotFileAttachment; +typedef struct _PopplerAnnotMovie PopplerAnnotMovie; +typedef struct _PopplerAnnotScreen PopplerAnnotScreen; +typedef struct _PopplerAnnotCalloutLine PopplerAnnotCalloutLine; +typedef struct _PopplerAnnotLine PopplerAnnotLine; +typedef struct _PopplerAnnotCircle PopplerAnnotCircle; +typedef struct _PopplerAnnotSquare PopplerAnnotSquare; +typedef struct _PopplerQuadrilateral PopplerQuadrilateral; +typedef struct _PopplerStructureElement PopplerStructureElement; +typedef struct _PopplerStructureElementIter PopplerStructureElementIter; +typedef struct _PopplerTextSpan PopplerTextSpan; +typedef struct _PopplerPageRange PopplerPageRange; +typedef struct _PopplerSignatureInfo PopplerSignatureInfo; +typedef struct _PopplerAnnotStamp PopplerAnnotStamp; +typedef struct _PopplerCertificateInfo PopplerCertificateInfo; +typedef struct _PopplerSigningData PopplerSigningData; + +/** + * PopplerBackend: + * @POPPLER_BACKEND_UNKNOWN: Unknown backend + * @POPPLER_BACKEND_SPLASH: Splash backend + * @POPPLER_BACKEND_CAIRO: Cairo backend + * + * Backend codes returned by poppler_get_backend(). + */ +typedef enum +{ + POPPLER_BACKEND_UNKNOWN, + POPPLER_BACKEND_SPLASH, + POPPLER_BACKEND_CAIRO +} PopplerBackend; + +POPPLER_PUBLIC +PopplerBackend poppler_get_backend(void); +POPPLER_PUBLIC +const char *poppler_get_version(void); + +G_END_DECLS + +#include "poppler-features.h" +#include "poppler-document.h" +#include "poppler-page.h" +#include "poppler-layer.h" +#include "poppler-action.h" +#include "poppler-form-field.h" +#include "poppler-enums.h" +#include "poppler-attachment.h" +#include "poppler-annot.h" +#include "poppler-date.h" +#include "poppler-movie.h" +#include "poppler-media.h" +#include "poppler-structure-element.h" + +#endif /* __POPPLER_GLIB_H__ */ diff --git a/poppler-24.05.0/glib/reference/CMakeLists.txt b/poppler-24.05.0/glib/reference/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..155154061f4c38e5be23979ab31c28924867823a --- /dev/null +++ b/poppler-24.05.0/glib/reference/CMakeLists.txt @@ -0,0 +1,12 @@ +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glib-docs-build.stamp + DEPENDS poppler-glib + COMMAND ${CMAKE_SOURCE_DIR}/make-glib-api-docs --src-dir=${CMAKE_SOURCE_DIR} --build-dir=${CMAKE_BINARY_DIR} + COMMAND touch ${CMAKE_CURRENT_BINARY_DIR}/glib-docs-build.stamp +) + +add_custom_target(glib-docs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/glib-docs-build.stamp) + +install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ + DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html/poppler" +) diff --git a/poppler-24.05.0/glib/reference/html/PopplerAction.html b/poppler-24.05.0/glib/reference/html/PopplerAction.html new file mode 100644 index 0000000000000000000000000000000000000000..f1936970d460e239e7387e68800fed3e31d03c3b --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/PopplerAction.html @@ -0,0 +1,1177 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>PopplerAction: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

PopplerAction

+

PopplerAction — Action links

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + +
+PopplerAction * + +poppler_action_copy () +
+void + +poppler_action_free () +
+PopplerDest * + +poppler_dest_copy () +
+void + +poppler_dest_free () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 PopplerAction
 PopplerDest
structPopplerActionAny
structPopplerActionGotoDest
structPopplerActionGotoRemote
structPopplerActionLaunch
structPopplerActionUri
structPopplerActionNamed
structPopplerActionMovie
structPopplerActionRendition
structPopplerActionResetForm
structPopplerActionOCGState
structPopplerActionJavascript
enumPopplerActionType
enumPopplerDestType
enumPopplerActionMovieOperation
 PopplerActionLayer
enumPopplerActionLayerAction
+
+
+

Object Hierarchy

+
    GBoxed
+    ├── PopplerAction
+    ╰── PopplerDest
+    GEnum
+    ├── PopplerActionLayerAction
+    ├── PopplerActionMovieOperation
+    ├── PopplerActionType
+    ╰── PopplerDestType
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+
+
+

Functions

+
+

poppler_action_copy ()

+
PopplerAction *
+poppler_action_copy (PopplerAction *action);
+

Copies action +, creating an identical PopplerAction.

+
+

Parameters

+
+++++ + + + + + +

action

a PopplerAction

 
+
+
+

Returns

+

a new action identical to action +

+
+
+
+
+

poppler_action_free ()

+
void
+poppler_action_free (PopplerAction *action);
+

Frees action +

+
+

Parameters

+
+++++ + + + + + +

action

a PopplerAction

 
+
+
+
+
+

poppler_dest_copy ()

+
PopplerDest *
+poppler_dest_copy (PopplerDest *dest);
+

Copies dest +, creating an identical PopplerDest.

+
+

Parameters

+
+++++ + + + + + +

dest

a PopplerDest

 
+
+
+

Returns

+

a new destination identical to dest +

+
+
+
+
+

poppler_dest_free ()

+
void
+poppler_dest_free (PopplerDest *dest);
+

Frees dest +

+
+

Parameters

+
+++++ + + + + + +

dest

a PopplerDest

 
+
+
+
+
+

Types and Values

+
+

PopplerAction

+

A generic wrapper for actions that exposes only PopplerActionType.

+
+
+
+

PopplerDest

+
typedef struct {
+    PopplerDestType type;
+
+    int page_num;
+    double left;
+    double bottom;
+    double right;
+    double top;
+    double zoom;
+    gchar *named_dest;
+    guint change_left : 1;
+    guint change_top : 1;
+    guint change_zoom : 1;
+} PopplerDest;
+
+

Data structure for holding a destination

+

Note that named_dest + is the string representation of the named +destination. This is the right form to pass to poppler functions, +e.g. poppler_document_find_dest(), but to get the destination as +it appears in the PDF itself, you need to convert it to a bytestring +with poppler_named_dest_to_bytestring() first. +Also note that named_dest + does not have a defined encoding and +is not in a form suitable to be displayed to the user.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

PopplerDestType type;

type of destination

 

int page_num;

page number

 

double left;

left coordinate

 

double bottom;

bottom coordinate

 

double right;

right coordinate

 

double top;

top coordinate

 

double zoom;

scale factor

 

gchar *named_dest;

name of the destination (POPPLER_DEST_NAMED only)

 

guint change_left : 1;

whether left coordinate should be changed

 

guint change_top : 1;

whether top coordinate should be changed

 

guint change_zoom : 1;

whether scale factor should be changed

 
+
+
+
+
+

struct PopplerActionAny

+
struct PopplerActionAny {
+    PopplerActionType type;
+    gchar *title;
+};
+
+

Fields common to all PopplerActions

+
+

Members

+
+++++ + + + + + + + + + + + + +

PopplerActionType type;

action type

 

gchar *title;

action title

 
+
+
+
+
+

struct PopplerActionGotoDest

+
struct PopplerActionGotoDest {
+    PopplerActionType type;
+    gchar *title;
+
+    PopplerDest *dest;
+};
+
+

Go to destination

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

PopplerActionType type;

action type (POPPLER_ACTION_GOTO_DEST)

 

gchar *title;

action title

 

PopplerDest *dest;

destination

 
+
+
+
+
+

struct PopplerActionGotoRemote

+
struct PopplerActionGotoRemote {
+    PopplerActionType type;
+    gchar *title;
+
+    gchar *file_name;
+    PopplerDest *dest;
+};
+
+

Go to destination in another document

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

PopplerActionType type;

action type (POPPLER_ACTION_GOTO_REMOTE)

 

gchar *title;

action title

 

gchar *file_name;

file name

 

PopplerDest *dest;

destination

 
+
+
+
+
+

struct PopplerActionLaunch

+
struct PopplerActionLaunch {
+    PopplerActionType type;
+    gchar *title;
+
+    gchar *file_name;
+    gchar *params;
+};
+
+

Launch app (or open document)

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

PopplerActionType type;

action type (POPPLER_ACTION_LAUNCH)

 

gchar *title;

action title

 

gchar *file_name;

file name

 

gchar *params;

parameters

 
+
+
+
+
+

struct PopplerActionUri

+
struct PopplerActionUri {
+    PopplerActionType type;
+    gchar *title;
+
+    char *uri;
+};
+
+

URI

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

PopplerActionType type;

action type (POPPLER_ACTION_URI)

 

gchar *title;

action title

 

char *uri;

URI

 
+
+
+
+
+

struct PopplerActionNamed

+
struct PopplerActionNamed {
+    PopplerActionType type;
+    gchar *title;
+
+    gchar *named_dest;
+};
+
+

Predefined action

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

PopplerActionType type;

action type (POPPLER_ACTION_NAMED)

 

gchar *title;

action title

 

gchar *named_dest;

named destination

 
+
+
+
+
+

struct PopplerActionMovie

+
struct PopplerActionMovie {
+    PopplerActionType type;
+    gchar *title;
+
+    PopplerActionMovieOperation operation;
+    PopplerMovie *movie;
+};
+
+

Play movies.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

PopplerActionType type;

action type (POPPLER_ACTION_MOVIE)

 

gchar *title;

action title

 

PopplerActionMovieOperation operation;

operation

 

PopplerMovie *movie;

movie

 
+
+

Since: 0.14

+
+
+
+

struct PopplerActionRendition

+
struct PopplerActionRendition {
+    PopplerActionType type;
+    gchar *title;
+
+    gint op;
+    PopplerMedia *media;
+};
+
+

Play multimedia content.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

PopplerActionType type;

action type (POPPLER_ACTION_RENDITION)

 

gchar *title;

action title

 

gint op;

operation

 

PopplerMedia *media;

media

 
+
+

Since: 0.14

+
+
+
+

struct PopplerActionResetForm

+
struct PopplerActionResetForm {
+    PopplerActionType type;
+    gchar *title;
+
+    GList *fields;
+    gboolean exclude;
+};
+
+

Resets some or all fields within a PDF form.

+

The default behavior resets only the list of fields +, but setting +exclude + to TRUE will cause the action to reset all fields but those +listed. Providing an empty list of fields resets the entire form.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

PopplerActionType type;

action type (POPPLER_ACTION_RESET_FORM)

 

gchar *title;

action title

 

GList *fields;

list of field names to +reset / retain.

[element-type utf8][nullable]

gboolean exclude;

whether to reset all but the listed fields

 
+
+

Since: 0.90

+
+
+
+

struct PopplerActionOCGState

+
struct PopplerActionOCGState {
+    PopplerActionType type;
+    gchar *title;
+
+    GList *state_list;
+};
+
+

State of layer.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

PopplerActionType type;

action type (POPPLER_ACTION_OCG_STATE)

 

gchar *title;

action title

 

GList *state_list;

list of PopplerActionLayers.

[element-type PopplerActionLayer]
+
+

Since: 0.14

+
+
+
+

struct PopplerActionJavascript

+
struct PopplerActionJavascript {
+    PopplerActionType type;
+    gchar *title;
+
+    gchar *script;
+};
+
+

Javascript.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

PopplerActionType type;

action type (POPPLER_ACTION_JAVASCRIPT)

 

gchar *title;

action title

 

gchar *script;

javascript

 
+
+

Since: 0.18

+
+
+
+

enum PopplerActionType

+

Action types

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_ACTION_UNKNOWN

 +

unknown action

+		 

POPPLER_ACTION_NONE

 +

no action specified

+		 

POPPLER_ACTION_GOTO_DEST

 +

go to destination

+		 

POPPLER_ACTION_GOTO_REMOTE

 +

go to destination in another document

+		 

POPPLER_ACTION_LAUNCH

 +

launch app (or open document)

+		 

POPPLER_ACTION_URI

 +

URI

+		 

POPPLER_ACTION_NAMED

 +

predefined action

+		 

POPPLER_ACTION_MOVIE

 +

play movies. Since 0.14

+		 

POPPLER_ACTION_RENDITION

 +

play multimedia content. Since 0.14

+		 

POPPLER_ACTION_OCG_STATE

 +

state of layer. Since 0.14

+		 

POPPLER_ACTION_JAVASCRIPT

 +

Javascript. Since 0.18

+		 

POPPLER_ACTION_RESET_FORM

 +

resets form. Since 0.90

+		 
+
+
+
+
+

enum PopplerDestType

+

Destination types

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_DEST_UNKNOWN

 +

unknown destination

+		 

POPPLER_DEST_XYZ

 +

go to page with coordinates (left, top) +positioned at the upper-left corner of the window and the contents of +the page magnified by the factor zoom

+		 

POPPLER_DEST_FIT

 +

go to page with its contents magnified just +enough to fit the entire page within the window both horizontally and +vertically

+		 

POPPLER_DEST_FITH

 +

go to page with the vertical coordinate top +positioned at the top edge of the window and the contents of the page +magnified just enough to fit the entire width of the page within the window

+		 

POPPLER_DEST_FITV

 +

go to page with the horizontal coordinate +left positioned at the left edge of the window and the contents of the +page magnified just enough to fit the entire height of the page within the window

+		 

POPPLER_DEST_FITR

 +

go to page with its contents magnified just +enough to fit the rectangle specified by the coordinates left, bottom, +right, and top entirely within the window both horizontally and vertically

+		 

POPPLER_DEST_FITB

 +

go to page with its contents magnified just enough to fit +its bounding box entirely within the window both horizontally and vertically

+		 

POPPLER_DEST_FITBH

 +

go to page with the vertical +coordinate top positioned at the top edge of the window and the +contents of the page magnified just enough to fit the entire width of its +bounding box within the window

+		 

POPPLER_DEST_FITBV

 +

go to page with the horizontal +coordinate left positioned at the left edge of the window and the +contents of the page magnified just enough to fit the entire height of its +bounding box within the window

+		 

POPPLER_DEST_NAMED

 +

got to page specified by a name. See poppler_document_find_dest()

+		 
+
+
+
+
+

enum PopplerActionMovieOperation

+

Movie operations

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_ACTION_MOVIE_PLAY

 +

play movie

+		 

POPPLER_ACTION_MOVIE_PAUSE

 +

pause playing movie

+		 

POPPLER_ACTION_MOVIE_RESUME

 +

resume paused movie

+		 

POPPLER_ACTION_MOVIE_STOP

 +

stop playing movie

+		 
+
+

Since: 0.14

+
+
+
+

PopplerActionLayer

+
typedef struct {
+    PopplerActionLayerAction action;
+    GList *layers;
+} PopplerActionLayer;
+
+

Action to perform over a list of layers

+
+

Members

+
+++++ + + + + + + + + + + + + +

PopplerActionLayerAction action;

a PopplerActionLayerAction

 

GList *layers;

list of PopplerLayers.

[element-type PopplerLayer]
+
+
+
+
+

enum PopplerActionLayerAction

+

Layer actions

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

POPPLER_ACTION_LAYER_ON

 +

set layer visibility on

+		 

POPPLER_ACTION_LAYER_OFF

 +

set layer visibility off

+		 

POPPLER_ACTION_LAYER_TOGGLE

 +

reverse the layer visibility state

+		 
+
+

Since: 0.14

+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/PopplerAttachment.html b/poppler-24.05.0/glib/reference/html/PopplerAttachment.html new file mode 100644 index 0000000000000000000000000000000000000000..933b570f9e454387b32065c55545e36550a948e2 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/PopplerAttachment.html @@ -0,0 +1,585 @@ + + + + +PopplerAttachment: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

PopplerAttachment

+

PopplerAttachment — Attachments

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+gboolean + +(*PopplerAttachmentSaveFunc) () +
const GString * + +poppler_attachment_get_checksum () +
+GDateTime * + +poppler_attachment_get_ctime () +
const gchar * + +poppler_attachment_get_description () +
+GDateTime * + +poppler_attachment_get_mtime () +
const gchar * + +poppler_attachment_get_name () +
+gsize + +poppler_attachment_get_size () +
+gboolean + +poppler_attachment_save () +
+gboolean + +poppler_attachment_save_to_fd () +
+gboolean + +poppler_attachment_save_to_callback () +
+
+
+

Types and Values

+
++++ + + + + +
 PopplerAttachment
+
+
+

Object Hierarchy

+
    GObject
+    ╰── PopplerAttachment
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+
+
+

Functions

+
+

PopplerAttachmentSaveFunc ()

+
gboolean
+(*PopplerAttachmentSaveFunc) (const gchar *buf,
+                              gsize count,
+                              gpointer data,
+                              GError **error);
+

Specifies the type of the function passed to +poppler_attachment_save_to_callback(). It is called once for each block of +bytes that is "written" by poppler_attachment_save_to_callback(). If +successful it should return TRUE. If an error occurs it should set +error + and return FALSE, in which case poppler_attachment_save_to_callback() +will fail with the same error.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

buf

buffer containing +bytes to be written.

[array length=count][element-type guint8]

count

number of bytes in buf +.

 

data

user data passed to poppler_attachment_save_to_callback().

[closure]

error

GError to set on error, or NULL

 
+
+
+

Returns

+

TRUE if successful, FALSE (with error +set) if failed.

+
+
+
+
+

poppler_attachment_get_checksum ()

+
const GString *
+poppler_attachment_get_checksum (PopplerAttachment *attachment);
+
+

Parameters

+
+++++ + + + + + +

attachment

a PopplerAttachment

 
+
+
+

Returns

+

The attachment's checksum.

+
+

Since: 20.09.0

+
+
+
+

poppler_attachment_get_ctime ()

+
GDateTime *
+poppler_attachment_get_ctime (PopplerAttachment *attachment);
+
+

Parameters

+
+++++ + + + + + +

attachment

a PopplerAttachment

 
+
+
+

Returns

+

The attachment's creation date and time +as a GDateTime, or NULL if the creation date and time is not available.

+

[transfer none][nullable]

+
+

Since: 20.09.0

+
+
+
+

poppler_attachment_get_description ()

+
const gchar *
+poppler_attachment_get_description (PopplerAttachment *attachment);
+
+

Parameters

+
+++++ + + + + + +

attachment

a PopplerAttachment

 
+
+
+

Returns

+

The attachment's descriptive text.

+
+

Since: 20.09.0

+
+
+
+

poppler_attachment_get_mtime ()

+
GDateTime *
+poppler_attachment_get_mtime (PopplerAttachment *attachment);
+
+

Parameters

+
+++++ + + + + + +

attachment

a PopplerAttachment

 
+
+
+

Returns

+

The attachment's modification date and +time as a GDateTime, or NULL if the modification date and time is not +available.

+

[transfer none][nullable]

+
+

Since: 20.09.0

+
+
+
+

poppler_attachment_get_name ()

+
const gchar *
+poppler_attachment_get_name (PopplerAttachment *attachment);
+
+

Parameters

+
+++++ + + + + + +

attachment

a PopplerAttachment

 
+
+
+

Returns

+

The attachment's name.

+
+

Since: 20.09.0

+
+
+
+

poppler_attachment_get_size ()

+
gsize
+poppler_attachment_get_size (PopplerAttachment *attachment);
+
+

Parameters

+
+++++ + + + + + +

attachment

a PopplerAttachment

 
+
+
+

Returns

+

The attachment's size.

+
+

Since: 20.09.0

+
+
+
+

poppler_attachment_save ()

+
gboolean
+poppler_attachment_save (PopplerAttachment *attachment,
+                         const char *filename,
+                         GError **error);
+

Saves attachment + to a file indicated by filename +. If error + is set, FALSE +will be returned. Possible errors include those in the G_FILE_ERROR domain +and whatever the save function generates.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

attachment

A PopplerAttachment.

 

filename

name of file to save

 

error

return location for error, or NULL.

[allow-none]
+
+
+

Returns

+

TRUE, if the file successfully saved

+
+
+
+
+

poppler_attachment_save_to_fd ()

+
gboolean
+poppler_attachment_save_to_fd (PopplerAttachment *attachment,
+                               int fd,
+                               GError **error);
+

Saves attachment + to a file referred to by fd +. If error + is set, FALSE +will be returned. Possible errors include those in the G_FILE_ERROR domain +and whatever the save function generates. +Note that this function takes ownership of fd +; you must not operate on it +again, nor close it.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

attachment

A PopplerAttachment.

 

fd

a valid file descriptor open for writing

 

error

return location for error, or NULL.

[allow-none]
+
+
+

Returns

+

TRUE, if the file successfully saved

+
+

Since: 21.12.0

+
+
+
+

poppler_attachment_save_to_callback ()

+
gboolean
+poppler_attachment_save_to_callback (PopplerAttachment *attachment,
+                                     PopplerAttachmentSaveFunc save_func,
+                                     gpointer user_data,
+                                     GError **error);
+

Saves attachment + by feeding the produced data to save_func +. Can be used +when you want to store the attachment to something other than a file, such as +an in-memory buffer or a socket. If error + is set, FALSE will be +returned. Possible errors include those in the G_FILE_ERROR domain and +whatever the save function generates.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

attachment

A PopplerAttachment.

 

save_func

a function that is called to save each block of data that the save routine generates.

[scope call]

user_data

user data to pass to the save function.

 

error

return location for error, or NULL.

[allow-none]
+
+
+

Returns

+

TRUE, if the save successfully completed

+
+
+
+
+

Types and Values

+
+

PopplerAttachment

+
typedef struct {
+    gchar *name;
+    gchar *description;
+    gsize size;
+
+    /* GTime is deprecated, but is part of our ABI here (see #715, #765). */
+    GTime mtime;
+    GTime ctime;
+
+    GString *checksum;
+} PopplerAttachment;
+
+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

gchar *name;

The filename. Deprecated in poppler 20.09.0. Use +poppler_attachment_get_name() instead.

 

gchar *description;

Descriptive text. Deprecated in poppler 20.09.0. Use +poppler_attachment_get_description() instead.

 

gsize size;

The size of the file. Deprecated in poppler 20.09.0. Use +poppler_attachment_get_size() instead.

 

GTime mtime;

The date and time when the file was last modified. Deprecated in +poppler 20.09.0. Use poppler_attachment_get_mtime() instead.

 

GTime ctime;

The date and time when the file was created. Deprecated in poppler +20.09.0. Use poppler_attachment_get_ctime() instead.

 

GString *checksum;

A 16-byte checksum of the file. Deprecated in poppler 20.09.0. Use +poppler_attachment_get_checksum() instead.

 
+
+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/PopplerDocument.html b/poppler-24.05.0/glib/reference/html/PopplerDocument.html new file mode 100644 index 0000000000000000000000000000000000000000..0050c58ae5ac36302f26b2acd60824fb80d98560 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/PopplerDocument.html @@ -0,0 +1,5118 @@ + + + + +PopplerDocument: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

PopplerDocument

+

PopplerDocument — Information about a document

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+GTree * + +poppler_document_create_dests_tree () +
+PopplerDest * + +poppler_document_find_dest () +
+GList * + +poppler_document_get_attachments () +
+gchar * + +poppler_document_get_author () +
+time_t + +poppler_document_get_creation_date () +
+GDateTime * + +poppler_document_get_creation_date_time () +
+gchar * + +poppler_document_get_creator () +
+PopplerFormField * + +poppler_document_get_form_field () +
+gboolean + +poppler_document_get_id () +
+gchar * + +poppler_document_get_keywords () +
+gchar * + +poppler_document_get_metadata () +
+time_t + +poppler_document_get_modification_date () +
+GDateTime * + +poppler_document_get_modification_date_time () +
+guint + +poppler_document_get_n_attachments () +
+int + +poppler_document_get_n_pages () +
+gint + +poppler_document_get_n_signatures () +
+PopplerPage * + +poppler_document_get_page () +
+PopplerPage * + +poppler_document_get_page_by_label () +
+PopplerPageLayout + +poppler_document_get_page_layout () +
+PopplerPageMode + +poppler_document_get_page_mode () +
+PopplerPDFConformance + +poppler_document_get_pdf_conformance () +
+PopplerPDFPart + +poppler_document_get_pdf_part () +
+PopplerPDFSubtype + +poppler_document_get_pdf_subtype () +
+gchar * + +poppler_document_get_pdf_subtype_string () +
+void + +poppler_document_get_pdf_version () +
+gchar * + +poppler_document_get_pdf_version_string () +
+PopplerPermissions + +poppler_document_get_permissions () +
+PopplerPrintDuplex + +poppler_document_get_print_duplex () +
+gint + +poppler_document_get_print_n_copies () +
+PopplerPageRange * + +poppler_document_get_print_page_ranges () +
+PopplerPrintScaling + +poppler_document_get_print_scaling () +
+gchar * + +poppler_document_get_producer () +
+GList * + +poppler_document_get_signature_fields () +
+gchar * + +poppler_document_get_subject () +
+gchar * + +poppler_document_get_title () +
+gboolean + +poppler_document_has_attachments () +
+gboolean + +poppler_document_has_javascript () +
+gboolean + +poppler_document_is_linearized () +
+PopplerDocument * + +poppler_document_new_from_bytes () +
+PopplerDocument * + +poppler_document_new_from_data () +
+PopplerDocument * + +poppler_document_new_from_fd () +
+PopplerDocument * + +poppler_document_new_from_file () +
+PopplerDocument * + +poppler_document_new_from_gfile () +
+PopplerDocument * + +poppler_document_new_from_stream () +
+void + +poppler_document_reset_form () +
+gboolean + +poppler_document_save () +
+gboolean + +poppler_document_save_a_copy () +
+gboolean + +poppler_document_save_to_fd () +
+void + +poppler_document_set_author () +
+void + +poppler_document_set_creation_date () +
+void + +poppler_document_set_creation_date_time () +
+void + +poppler_document_set_creator () +
+void + +poppler_document_set_keywords () +
+void + +poppler_document_set_modification_date () +
+void + +poppler_document_set_modification_date_time () +
+void + +poppler_document_set_producer () +
+void + +poppler_document_set_subject () +
+void + +poppler_document_set_title () +
+void + +poppler_font_info_free () +
+PopplerFontInfo * + +poppler_font_info_new () +
+gboolean + +poppler_font_info_scan () +
+PopplerFontsIter * + +poppler_fonts_iter_copy () +
+void + +poppler_fonts_iter_free () +
const char * + +poppler_fonts_iter_get_encoding () +
const char * + +poppler_fonts_iter_get_file_name () +
+PopplerFontType + +poppler_fonts_iter_get_font_type () +
const char * + +poppler_fonts_iter_get_full_name () +
const char * + +poppler_fonts_iter_get_name () +
const char * + +poppler_fonts_iter_get_substitute_name () +
+gboolean + +poppler_fonts_iter_is_embedded () +
+gboolean + +poppler_fonts_iter_is_subset () +
+gboolean + +poppler_fonts_iter_next () +
+PopplerIndexIter * + +poppler_index_iter_copy () +
+void + +poppler_index_iter_free () +
+PopplerAction * + +poppler_index_iter_get_action () +
+PopplerIndexIter * + +poppler_index_iter_get_child () +
+gboolean + +poppler_index_iter_is_open () +
+PopplerIndexIter * + +poppler_index_iter_new () +
+gboolean + +poppler_index_iter_next () +
+PopplerLayersIter * + +poppler_layers_iter_copy () +
+void + +poppler_layers_iter_free () +
+PopplerLayersIter * + +poppler_layers_iter_get_child () +
+PopplerLayer * + +poppler_layers_iter_get_layer () +
+gchar * + +poppler_layers_iter_get_title () +
+PopplerLayersIter * + +poppler_layers_iter_new () +
+gboolean + +poppler_layers_iter_next () +
+void + +poppler_ps_file_free () +
+PopplerPSFile * + +poppler_ps_file_new () +
+PopplerPSFile * + +poppler_ps_file_new_fd () +
+void + +poppler_ps_file_set_duplex () +
+void + +poppler_ps_file_set_paper_size () +
+
+
+

Properties

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+char *authorRead / Write
intcreation-dateRead / Write
+GDateTime *creation-datetimeRead / Write
+char *creatorRead / Write
+char *formatRead
guintformat-majorRead
guintformat-minorRead
+char *keywordsRead / Write
gbooleanlinearizedRead
+char *metadataRead
intmod-dateRead / Write
+GDateTime *mod-datetimeRead / Write
PopplerPageLayoutpage-layoutRead
PopplerPageModepage-modeRead
PopplerPermissionspermissionsRead
PopplerPrintDuplexprint-duplexRead
intprint-n-copiesRead
PopplerPrintScalingprint-scalingRead
+char *producerRead / Write
+char *subjectRead / Write
PopplerPDFSubtypesubtypeRead
PopplerPDFConformancesubtype-conformanceRead
PopplerPDFPartsubtype-partRead
+char *subtype-stringRead
+char *titleRead / Write
PopplerViewerPreferencesviewer-preferencesRead
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 PopplerDocument
 PopplerFontInfo
enumPopplerFontType
 PopplerFontsIter
 PopplerIndexIter
 PopplerLayersIter
enumPopplerPDFConformance
enumPopplerPDFPart
enumPopplerPDFSubtype
 PopplerPSFile
enumPopplerPageLayout
enumPopplerPageMode
 PopplerPageRange
enumPopplerPermissions
enumPopplerPrintDuplex
enumPopplerPrintScaling
enumPopplerViewerPreferences
+
+
+

Object Hierarchy

+
    GBoxed
+    ├── PopplerFontsIter
+    ├── PopplerIndexIter
+    ╰── PopplerLayersIter
+    GEnum
+    ├── PopplerFontType
+    ├── PopplerPDFConformance
+    ├── PopplerPDFPart
+    ├── PopplerPDFSubtype
+    ├── PopplerPageLayout
+    ├── PopplerPageMode
+    ├── PopplerPrintDuplex
+    ╰── PopplerPrintScaling
+    GFlags
+    ├── PopplerPermissions
+    ╰── PopplerViewerPreferences
+    GObject
+    ├── PopplerDocument
+    ├── PopplerFontInfo
+    ╰── PopplerPSFile
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+

The PopplerDocument is an object used to refer to a main document.

+
+
+

Functions

+
+

poppler_document_create_dests_tree ()

+
GTree *
+poppler_document_create_dests_tree (PopplerDocument *document);
+

Creates a balanced binary tree of all named destinations in document +

+

The tree key is strings in the form returned by +poppler_named_dest_to_bytestring() which constains a destination name. +The tree value is the PopplerDest which contains a named destination. +The return value must be freed with g_tree_destroy().

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

the GTree, or NULL.

+

[transfer full][nullable]

+
+

Since: 0.78

+
+
+
+

poppler_document_find_dest ()

+
PopplerDest *
+poppler_document_find_dest (PopplerDocument *document,
+                            const gchar *link_name);
+

Creates a PopplerDest for the named destination link_name + in document +.

+

Note that named destinations are bytestrings, not string. That means that +unless link_name + was returned by a poppler function (e.g. is +PopplerDest.named_dest), it needs to be converted to string +using poppler_named_dest_from_bytestring() before being passed to this +function.

+

The returned value must be freed with poppler_dest_free().

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

link_name

a named destination

 
+
+
+

Returns

+

a new PopplerDest destination, or NULL if +link_name +is not a destination.

+

[transfer full]

+
+
+
+
+

poppler_document_get_attachments ()

+
GList *
+poppler_document_get_attachments (PopplerDocument *document);
+

Returns a GList containing PopplerAttachments. These attachments +are unowned, and must be unreffed, and the list must be freed with +g_list_free().

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a list of available attachments.

+

[element-type PopplerAttachment][transfer full]

+
+
+
+
+

poppler_document_get_author ()

+
gchar *
+poppler_document_get_author (PopplerDocument *document);
+

Returns the author of the document

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a new allocated string containing the author +of document +, or NULL

+
+

Since: 0.16

+
+
+
+

poppler_document_get_creation_date ()

+
time_t
+poppler_document_get_creation_date (PopplerDocument *document);
+

Returns the date the document was created as seconds since the Epoch

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

the date the document was created, or -1

+
+

Since: 0.16

+
+
+
+

poppler_document_get_creation_date_time ()

+
GDateTime *
+poppler_document_get_creation_date_time
+                               (PopplerDocument *document);
+

Returns the date the document was created as a GDateTime

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

the date the document was created, or NULL.

+

[nullable]

+
+

Since: 20.09.0

+
+
+
+

poppler_document_get_creator ()

+
gchar *
+poppler_document_get_creator (PopplerDocument *document);
+

Returns the creator of the document. If the document was converted +from another format, the creator is the name of the product +that created the original document from which it was converted.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a new allocated string containing the creator +of document +, or NULL

+
+

Since: 0.16

+
+
+
+

poppler_document_get_form_field ()

+
PopplerFormField *
+poppler_document_get_form_field (PopplerDocument *document,
+                                 gint id);
+

Returns the PopplerFormField for the given id +. It must be freed with +g_object_unref()

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

a PopplerDocument

 

id

an id of a PopplerFormField

 
+
+
+

Returns

+

a new PopplerFormField or NULL if +not found.

+

[transfer full]

+
+
+
+
+

poppler_document_get_id ()

+
gboolean
+poppler_document_get_id (PopplerDocument *document,
+                         gchar **permanent_id,
+                         gchar **update_id);
+

Returns the PDF file identifier represented as two byte string arrays of size 32. +permanent_id + is the permanent identifier that is built based on the file +contents at the time it was originally created, so that this identifer +never changes. update_id + is the update identifier that is built based on +the file contents at the time it was last updated.

+

Note that returned strings are not null-terminated, they have a fixed +size of 32 bytes.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

document

A PopplerDocument

 

permanent_id

location to store an allocated string, use g_free() to free the returned string.

[out][allow-none]

update_id

location to store an allocated string, use g_free() to free the returned string.

[out][allow-none]
+
+
+

Returns

+

TRUE if the document +contains an id, FALSE otherwise

+
+

Since: 0.16

+
+
+
+

poppler_document_get_keywords ()

+
gchar *
+poppler_document_get_keywords (PopplerDocument *document);
+

Returns the keywords associated to the document

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a new allocated string containing keywords associated +to document +, or NULL

+
+

Since: 0.16

+
+
+
+

poppler_document_get_metadata ()

+
gchar *
+poppler_document_get_metadata (PopplerDocument *document);
+

Returns the XML metadata string of the document

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a new allocated string containing the XML +metadata, or NULL

+
+

Since: 0.16

+
+
+
+

poppler_document_get_modification_date ()

+
time_t
+poppler_document_get_modification_date
+                               (PopplerDocument *document);
+

Returns the date the document was most recently modified as seconds since the Epoch

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

the date the document was most recently modified, or -1

+
+

Since: 0.16

+
+
+
+

poppler_document_get_modification_date_time ()

+
GDateTime *
+poppler_document_get_modification_date_time
+                               (PopplerDocument *document);
+

Returns the date the document was most recently modified as a GDateTime

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

the date the document was modified, or NULL.

+

[nullable]

+
+

Since: 20.09.0

+
+
+
+

poppler_document_get_n_attachments ()

+
guint
+poppler_document_get_n_attachments (PopplerDocument *document);
+

Returns the number of attachments in a loaded document. +See also poppler_document_get_attachments()

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

Number of attachments

+
+

Since: 0.18

+
+
+
+

poppler_document_get_n_pages ()

+
int
+poppler_document_get_n_pages (PopplerDocument *document);
+

Returns the number of pages in a loaded document.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

Number of pages

+
+
+
+
+

poppler_document_get_n_signatures ()

+
gint
+poppler_document_get_n_signatures (const PopplerDocument *document);
+

Returns how many digital signatures document + contains. +PDF digital signatures ensure that the content hash not been altered since last edit and +that it was produced by someone the user can trust

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

The number of signatures found in the document

+
+

Since: 21.12.0

+
+
+
+

poppler_document_get_page ()

+
PopplerPage *
+poppler_document_get_page (PopplerDocument *document,
+                           int index);
+

Returns the PopplerPage indexed at index +. This object is owned by the +caller.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

index

a page index

 
+
+
+

Returns

+

(transfer full) : The PopplerPage at index +

+
+
+
+
+

poppler_document_get_page_by_label ()

+
PopplerPage *
+poppler_document_get_page_by_label (PopplerDocument *document,
+                                    const char *label);
+

Returns the PopplerPage reference by label +. This object is owned by the +caller. label + is a human-readable string representation of the page number, +and can be document specific. Typically, it is a value such as "iii" or "3".

+

By default, "1" refers to the first page.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

label

a page label

 
+
+
+

Returns

+

(transfer full) :The PopplerPage referenced by label +

+
+
+
+
+

poppler_document_get_page_layout ()

+
PopplerPageLayout
+poppler_document_get_page_layout (PopplerDocument *document);
+

Returns the page layout that should be used when the document is opened

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a PopplerPageLayout that should be used when the document is opened

+
+

Since: 0.16

+
+
+
+

poppler_document_get_page_mode ()

+
PopplerPageMode
+poppler_document_get_page_mode (PopplerDocument *document);
+

Returns a PopplerPageMode representing how the document should +be initially displayed when opened.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a PopplerPageMode that should be used when document is opened

+
+

Since: 0.16

+
+
+
+

poppler_document_get_pdf_conformance ()

+
PopplerPDFConformance
+poppler_document_get_pdf_conformance (PopplerDocument *document);
+

Returns the conformance level of the document + as PopplerPDFConformance.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

the document's subtype conformance level

+
+

Since: 0.70

+
+
+
+

poppler_document_get_pdf_part ()

+
PopplerPDFPart
+poppler_document_get_pdf_part (PopplerDocument *document);
+

Returns the part of the conforming standard that the document + adheres to +as a PopplerPDFSubtype.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

the document's subtype part

+
+

Since: 0.70

+
+
+
+

poppler_document_get_pdf_subtype ()

+
PopplerPDFSubtype
+poppler_document_get_pdf_subtype (PopplerDocument *document);
+

Returns the subtype of document + as a PopplerPDFSubtype.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

the document's subtype

+
+

Since: 0.70

+
+
+
+

poppler_document_get_pdf_subtype_string ()

+
gchar *
+poppler_document_get_pdf_subtype_string
+                               (PopplerDocument *document);
+

Returns the PDF subtype version of document + as a string.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a newly allocated string containing +the PDF subtype version of document +, or NULL.

+

[transfer full][nullable]

+
+

Since: 0.70

+
+
+
+

poppler_document_get_pdf_version ()

+
void
+poppler_document_get_pdf_version (PopplerDocument *document,
+                                  guint *major_version,
+                                  guint *minor_version);
+

Updates values referenced by major_version + & minor_version + with the +major and minor PDF versions of document +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

document

A PopplerDocument

 

major_version

return location for the PDF major version number.

[out][nullable]

minor_version

return location for the PDF minor version number.

[out][nullable]
+
+

Since: 0.16

+
+
+
+

poppler_document_get_pdf_version_string ()

+
gchar *
+poppler_document_get_pdf_version_string
+                               (PopplerDocument *document);
+

Returns the PDF version of document + as a string (e.g. PDF-1.6)

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a new allocated string containing the PDF version +of document +, or NULL

+
+

Since: 0.16

+
+
+
+

poppler_document_get_permissions ()

+
PopplerPermissions
+poppler_document_get_permissions (PopplerDocument *document);
+

Returns the flags specifying which operations are permitted when the document is opened.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a set of flags from PopplerPermissions enumeration

+
+

Since: 0.16

+
+
+
+

poppler_document_get_print_duplex ()

+
PopplerPrintDuplex
+poppler_document_get_print_duplex (PopplerDocument *document);
+

Returns the duplex mode value suggested for printing by author of the document. +Value POPPLER_PRINT_DUPLEX_NONE means that the document does not specify this +preference.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a PopplerPrintDuplex that should be used when document is printed

+
+

Since: 0.80

+
+
+
+

poppler_document_get_print_n_copies ()

+
gint
+poppler_document_get_print_n_copies (PopplerDocument *document);
+

Returns the suggested number of copies to be printed. +This preference should be applied only if returned value +is greater than 1 since value 1 usually means that +the document does not specify it.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

Number of copies

+
+

Since: 0.80

+
+
+
+

poppler_document_get_print_page_ranges ()

+
PopplerPageRange *
+poppler_document_get_print_page_ranges
+                               (PopplerDocument *document,
+                                int *n_ranges);
+

Returns the suggested page ranges to print in the form of array +of PopplerPageRanges and number of ranges. +NULL pointer means that the document does not specify page ranges +for printing.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

n_ranges

return location for number of ranges.

[out]
+
+
+

Returns

+

an array +of PopplerPageRanges or NULL. Free the array when +it is no longer needed.

+

[array length=n_ranges][transfer full]

+
+

Since: 0.80

+
+
+
+

poppler_document_get_print_scaling ()

+
PopplerPrintScaling
+poppler_document_get_print_scaling (PopplerDocument *document);
+

Returns the print scaling value suggested by author of the document.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a PopplerPrintScaling that should be used when document is printed

+
+

Since: 0.73

+
+
+
+

poppler_document_get_producer ()

+
gchar *
+poppler_document_get_producer (PopplerDocument *document);
+

Returns the producer of the document. If the document was converted +from another format, the producer is the name of the product +that converted it to PDF

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a new allocated string containing the producer +of document +, or NULL

+
+

Since: 0.16

+
+
+
+

poppler_document_get_signature_fields ()

+
GList *
+poppler_document_get_signature_fields (PopplerDocument *document);
+

Returns a GList containing all signature PopplerFormFields in the document.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a list of all signature form fields.

+

[element-type PopplerFormField][transfer full]

+
+

Since: 22.02.0

+
+
+
+

poppler_document_get_subject ()

+
gchar *
+poppler_document_get_subject (PopplerDocument *document);
+

Returns the subject of the document

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a new allocated string containing the subject +of document +, or NULL

+
+

Since: 0.16

+
+
+
+

poppler_document_get_title ()

+
gchar *
+poppler_document_get_title (PopplerDocument *document);
+

Returns the document's title

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

a new allocated string containing the title +of document +, or NULL

+
+

Since: 0.16

+
+
+
+

poppler_document_has_attachments ()

+
gboolean
+poppler_document_has_attachments (PopplerDocument *document);
+

Returns TRUE of document + has any attachments.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

TRUE, if document +has attachments.

+
+
+
+
+

poppler_document_has_javascript ()

+
gboolean
+poppler_document_has_javascript (PopplerDocument *document);
+

Returns whether document + has any javascript in it.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+

Since: 0.90

+
+
+
+

poppler_document_is_linearized ()

+
gboolean
+poppler_document_is_linearized (PopplerDocument *document);
+

Returns whether document + is linearized or not. Linearization of PDF +enables efficient incremental access of the PDF file in a network environment.

+
+

Parameters

+
+++++ + + + + + +

document

A PopplerDocument

 
+
+
+

Returns

+

TRUE if document +is linearized, FALSE otherwise

+
+

Since: 0.16

+
+
+
+

poppler_document_new_from_bytes ()

+
PopplerDocument *
+poppler_document_new_from_bytes (GBytes *bytes,
+                                 const char *password,
+                                 GError **error);
+

Creates a new PopplerDocument from bytes +. The returned document +will hold a reference to bytes +.

+

On error, NULL is returned, with error + set. Possible errors include +those in the POPPLER_ERROR and G_FILE_ERROR domains.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

bytes

a GBytes

 

password

password to unlock the file with, or NULL.

[allow-none]

error

Return location for an error, or NULL.

[allow-none]
+
+
+

Returns

+

a newly created PopplerDocument, or NULL.

+

[transfer full]

+
+

Since: 0.82

+
+
+
+

poppler_document_new_from_data ()

+
PopplerDocument *
+poppler_document_new_from_data (char *data,
+                                int length,
+                                const char *password,
+                                GError **error);
+
+

poppler_document_new_from_data has been deprecated since version 0.82 and should not be used in newly-written code.

+

This requires directly managing length + and data +. +Use poppler_document_new_from_bytes() instead.

+
+

Creates a new PopplerDocument. If NULL is returned, then error + will be +set. Possible errors include those in the POPPLER_ERROR and G_FILE_ERROR +domains.

+

Note that data + is not copied nor is a new reference to it created. +It must remain valid and cannot be destroyed as long as the returned +document exists.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

data

the pdf data.

[array length=length][element-type guint8]

length

the length of data

 

password

password to unlock the file with, or NULL.

[nullable]

error

Return location for an error, or NULL.

[nullable]
+
+
+

Returns

+

A newly created PopplerDocument, or NULL

+
+
+
+
+

poppler_document_new_from_fd ()

+
PopplerDocument *
+poppler_document_new_from_fd (int fd,
+                              const char *password,
+                              GError **error);
+

Creates a new PopplerDocument reading the PDF contents from the file +descriptor fd +. fd + must refer to a regular file, or STDIN, and be open +for reading. +Possible errors include those in the POPPLER_ERROR and G_FILE_ERROR +domains. +Note that this function takes ownership of fd +; you must not operate on it +again, nor close it.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

fd

a valid file descriptor

 

password

password to unlock the file with, or NULL.

[allow-none]

error

Return location for an error, or NULL.

[allow-none]
+
+
+

Returns

+

a new PopplerDocument, or NULL.

+

[transfer full]

+
+

Since: 21.12.0

+
+
+
+

poppler_document_new_from_file ()

+
PopplerDocument *
+poppler_document_new_from_file (const char *uri,
+                                const char *password,
+                                GError **error);
+

Creates a new PopplerDocument. If NULL is returned, then error + will be +set. Possible errors include those in the POPPLER_ERROR and G_FILE_ERROR +domains.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

uri

uri of the file to load

 

password

password to unlock the file with, or NULL.

[allow-none]

error

Return location for an error, or NULL.

[allow-none]
+
+
+

Returns

+

A newly created PopplerDocument, or NULL

+
+
+
+
+

poppler_document_new_from_gfile ()

+
PopplerDocument *
+poppler_document_new_from_gfile (GFile *file,
+                                 const char *password,
+                                 GCancellable *cancellable,
+                                 GError **error);
+

Creates a new PopplerDocument reading the PDF contents from file +. +Possible errors include those in the POPPLER_ERROR and G_FILE_ERROR +domains.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

file

a GFile to load

 

password

password to unlock the file with, or NULL.

[allow-none]

cancellable

a GCancellable, or NULL.

[allow-none]

error

Return location for an error, or NULL.

[allow-none]
+
+
+

Returns

+

a new PopplerDocument, or NULL.

+

[transfer full]

+
+

Since: 0.22

+
+
+
+

poppler_document_new_from_stream ()

+
PopplerDocument *
+poppler_document_new_from_stream (GInputStream *stream,
+                                  goffset length,
+                                  const char *password,
+                                  GCancellable *cancellable,
+                                  GError **error);
+

Creates a new PopplerDocument reading the PDF contents from stream +. +Note that the given GInputStream must be seekable or G_IO_ERROR_NOT_SUPPORTED +will be returned. +Possible errors include those in the POPPLER_ERROR, G_FILE_ERROR +and G_IO_ERROR domains.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

stream

a GInputStream to read from

 

length

the stream length, or -1 if not known

 

password

password to unlock the file with, or NULL.

[allow-none]

cancellable

a GCancellable, or NULL.

[allow-none]

error

Return location for an error, or NULL.

[allow-none]
+
+
+

Returns

+

a new PopplerDocument, or NULL.

+

[transfer full]

+
+

Since: 0.22

+
+
+
+

poppler_document_reset_form ()

+
void
+poppler_document_reset_form (PopplerDocument *document,
+                             GList *fields,
+                             gboolean exclude_fields);
+

Resets the form fields specified by fields if exclude_fields is FALSE. +Resets all others if exclude_fields is TRUE. +All form fields are reset regardless of the exclude_fields flag +if fields is empty.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

document

A PopplerDocument

 

fields

list of fields to reset.

[element-type utf8][nullable]

exclude_fields

whether to reset all fields except those in fields +

 
+
+

Since: 0.90

+
+
+
+

poppler_document_save ()

+
gboolean
+poppler_document_save (PopplerDocument *document,
+                       const char *uri,
+                       GError **error);
+

Saves document +. Any change made in the document such as +form fields filled, annotations added or modified +will be saved. +If error + is set, FALSE will be returned. Possible errors +include those in the G_FILE_ERROR domain.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

document

a PopplerDocument

 

uri

uri of file to save

 

error

return location for an error, or NULL.

[allow-none]
+
+
+

Returns

+

TRUE, if the document was successfully saved

+
+
+
+
+

poppler_document_save_a_copy ()

+
gboolean
+poppler_document_save_a_copy (PopplerDocument *document,
+                              const char *uri,
+                              GError **error);
+

Saves a copy of the original document +. +Any change made in the document such as +form fields filled by the user will not be saved. +If error + is set, FALSE will be returned. Possible errors +include those in the G_FILE_ERROR domain.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

document

a PopplerDocument

 

uri

uri of file to save

 

error

return location for an error, or NULL.

[allow-none]
+
+
+

Returns

+

TRUE, if the document was successfully saved

+
+
+
+
+

poppler_document_save_to_fd ()

+
gboolean
+poppler_document_save_to_fd (PopplerDocument *document,
+                             int fd,
+                             gboolean include_changes,
+                             GError **error);
+

Saves document +. Any change made in the document such as +form fields filled, annotations added or modified +will be saved if include_changes + is TRUE, or discarded i +include_changes + is FALSE.

+

Note that this function takes ownership of fd +; you must not operate on it +again, nor close it.

+

If error + is set, FALSE will be returned. Possible errors +include those in the G_FILE_ERROR domain.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

document

a PopplerDocument

 

fd

a valid file descriptor open for writing

 

include_changes

whether to include user changes (e.g. form fills)

 

error

return location for an error, or NULL.

[allow-none]
+
+
+

Returns

+

TRUE, if the document was successfully saved

+
+

Since: 21.12.0

+
+
+
+

poppler_document_set_author ()

+
void
+poppler_document_set_author (PopplerDocument *document,
+                             const gchar *author);
+

Sets the document's author. If author + is NULL, Author +entry is removed from the document's Info dictionary.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

author

A new author

 
+
+

Since: 0.46

+
+
+
+

poppler_document_set_creation_date ()

+
void
+poppler_document_set_creation_date (PopplerDocument *document,
+                                    time_t creation_date);
+

Sets the document's creation date. If creation_date + is -1, CreationDate +entry is removed from the document's Info dictionary.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

creation_date

A new creation date

 
+
+

Since: 0.46

+
+
+
+

poppler_document_set_creation_date_time ()

+
void
+poppler_document_set_creation_date_time
+                               (PopplerDocument *document,
+                                GDateTime *creation_datetime);
+

Sets the document's creation date. If creation_datetime + is NULL, +CreationDate entry is removed from the document's Info dictionary.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

creation_datetime

A new creation GDateTime.

[nullable]
+
+

Since: 20.09.0

+
+
+
+

poppler_document_set_creator ()

+
void
+poppler_document_set_creator (PopplerDocument *document,
+                              const gchar *creator);
+

Sets the document's creator. If creator + is NULL, Creator +entry is removed from the document's Info dictionary.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

creator

A new creator

 
+
+

Since: 0.46

+
+
+
+

poppler_document_set_keywords ()

+
void
+poppler_document_set_keywords (PopplerDocument *document,
+                               const gchar *keywords);
+

Sets the document's keywords. If keywords + is NULL, +Keywords entry is removed from the document's Info dictionary.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

keywords

New keywords

 
+
+

Since: 0.46

+
+
+
+

poppler_document_set_modification_date ()

+
void
+poppler_document_set_modification_date
+                               (PopplerDocument *document,
+                                time_t modification_date);
+

Sets the document's modification date. If modification_date + is -1, ModDate +entry is removed from the document's Info dictionary.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

modification_date

A new modification date

 
+
+

Since: 0.46

+
+
+
+

poppler_document_set_modification_date_time ()

+
void
+poppler_document_set_modification_date_time
+                               (PopplerDocument *document,
+                                GDateTime *modification_datetime);
+

Sets the document's modification date. If modification_datetime + is NULL, +ModDate entry is removed from the document's Info dictionary.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

modification_datetime

A new modification GDateTime.

[nullable]
+
+

Since: 20.09.0

+
+
+
+

poppler_document_set_producer ()

+
void
+poppler_document_set_producer (PopplerDocument *document,
+                               const gchar *producer);
+

Sets the document's producer. If producer + is NULL, +Producer entry is removed from the document's Info dictionary.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

producer

A new producer

 
+
+

Since: 0.46

+
+
+
+

poppler_document_set_subject ()

+
void
+poppler_document_set_subject (PopplerDocument *document,
+                              const gchar *subject);
+

Sets the document's subject. If subject + is NULL, Subject +entry is removed from the document's Info dictionary.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

subject

A new subject

 
+
+

Since: 0.46

+
+
+
+

poppler_document_set_title ()

+
void
+poppler_document_set_title (PopplerDocument *document,
+                            const gchar *title);
+

Sets the document's title. If title + is NULL, Title entry +is removed from the document's Info dictionary.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

document

A PopplerDocument

 

title

A new title

 
+
+

Since: 0.46

+
+
+
+

poppler_font_info_free ()

+
void
+poppler_font_info_free (PopplerFontInfo *font_info);
+
+
+
+

poppler_font_info_new ()

+
PopplerFontInfo *
+poppler_font_info_new (PopplerDocument *document);
+

Creates a new PopplerFontInfo object

+
+

Parameters

+
+++++ + + + + + +

document

a PopplerDocument

 
+
+
+

Returns

+

a new PopplerFontInfo instance

+
+
+
+
+

poppler_font_info_scan ()

+
gboolean
+poppler_font_info_scan (PopplerFontInfo *font_info,
+                        int n_pages,
+                        PopplerFontsIter **iter);
+

Scans the document associated with font_info + for fonts. At most +n_pages + will be scanned starting from the current iterator. iter + will +point to the first font scanned.

+

Here is a simple example of code to scan fonts in a document

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
font_info = poppler_font_info_new (document);
+while (poppler_font_info_scan (font_info, 20, &fonts_iter)) {
+        if (!fonts_iter)
+                continue; /* No fonts found in these 20 pages */
+        do {
+                /* Do something with font iter */
+                g_print ("Font Name: %s\n", poppler_fonts_iter_get_name (fonts_iter));
+        } while (poppler_fonts_iter_next (fonts_iter));
+        poppler_fonts_iter_free (fonts_iter);
+}
+
+ +
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

font_info

a PopplerFontInfo

 

n_pages

number of pages to scan

 

iter

return location for a PopplerFontsIter.

[out]
+
+
+

Returns

+

TRUE, if there are more fonts left to scan

+
+
+
+
+

poppler_fonts_iter_copy ()

+
PopplerFontsIter *
+poppler_fonts_iter_copy (PopplerFontsIter *iter);
+

Creates a copy of iter +

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerFontsIter to copy

 
+
+
+

Returns

+

a new allocated copy of iter +

+
+
+
+
+

poppler_fonts_iter_free ()

+
void
+poppler_fonts_iter_free (PopplerFontsIter *iter);
+

Frees the given PopplerFontsIter

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerFontsIter

 
+
+
+
+
+

poppler_fonts_iter_get_encoding ()

+
const char *
+poppler_fonts_iter_get_encoding (PopplerFontsIter *iter);
+

Returns the encoding of the font associated with iter +

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerFontsIter

 
+
+
+

Returns

+

the font encoding

+
+

Since: 0.20

+
+
+
+

poppler_fonts_iter_get_file_name ()

+
const char *
+poppler_fonts_iter_get_file_name (PopplerFontsIter *iter);
+

The filename of the font associated with iter + or NULL if +the font is embedded

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerFontsIter

 
+
+
+

Returns

+

the filename of the font or NULL if font is embedded

+
+
+
+
+

poppler_fonts_iter_get_font_type ()

+
PopplerFontType
+poppler_fonts_iter_get_font_type (PopplerFontsIter *iter);
+

Returns the type of the font associated with iter +

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerFontsIter

 
+
+
+

Returns

+

the font type

+
+
+
+
+

poppler_fonts_iter_get_full_name ()

+
const char *
+poppler_fonts_iter_get_full_name (PopplerFontsIter *iter);
+

Returns the full name of the font associated with iter +

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerFontsIter

 
+
+
+

Returns

+

the font full name

+
+
+
+
+

poppler_fonts_iter_get_name ()

+
const char *
+poppler_fonts_iter_get_name (PopplerFontsIter *iter);
+

Returns the name of the font associated with iter +

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerFontsIter

 
+
+
+

Returns

+

the font name

+
+
+
+
+

poppler_fonts_iter_get_substitute_name ()

+
const char *
+poppler_fonts_iter_get_substitute_name
+                               (PopplerFontsIter *iter);
+

The name of the substitute font of the font associated with iter + or NULL if +the font is embedded

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerFontsIter

 
+
+
+

Returns

+

the name of the substitute font or NULL if font is embedded

+
+

Since: 0.20

+
+
+
+

poppler_fonts_iter_is_embedded ()

+
gboolean
+poppler_fonts_iter_is_embedded (PopplerFontsIter *iter);
+

Returns whether the font associated with iter + is embedded in the document

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerFontsIter

 
+
+
+

Returns

+

TRUE if font is embedded, FALSE otherwise

+
+
+
+
+

poppler_fonts_iter_is_subset ()

+
gboolean
+poppler_fonts_iter_is_subset (PopplerFontsIter *iter);
+

Returns whether the font associated with iter + is a subset of another font

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerFontsIter

 
+
+
+

Returns

+

TRUE if font is a subset, FALSE otherwise

+
+
+
+
+

poppler_fonts_iter_next ()

+
gboolean
+poppler_fonts_iter_next (PopplerFontsIter *iter);
+

Sets iter + to point to the next font

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerFontsIter

 
+
+
+

Returns

+

TRUE, if iter +was set to the next font

+
+
+
+
+

poppler_index_iter_copy ()

+
PopplerIndexIter *
+poppler_index_iter_copy (PopplerIndexIter *iter);
+

Creates a new PopplerIndexIter as a copy of iter +. This must be freed with +poppler_index_iter_free().

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerIndexIter

 
+
+
+

Returns

+

a new PopplerIndexIter

+
+
+
+
+

poppler_index_iter_free ()

+
void
+poppler_index_iter_free (PopplerIndexIter *iter);
+

Frees iter +.

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerIndexIter

 
+
+
+
+
+

poppler_index_iter_get_action ()

+
PopplerAction *
+poppler_index_iter_get_action (PopplerIndexIter *iter);
+

Returns the PopplerAction associated with iter +. It must be freed with +poppler_action_free().

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerIndexIter

 
+
+
+

Returns

+

a new PopplerAction

+
+
+
+
+

poppler_index_iter_get_child ()

+
PopplerIndexIter *
+poppler_index_iter_get_child (PopplerIndexIter *parent);
+

Returns a newly created child of parent +, or NULL if the iter has no child. +See poppler_index_iter_new() for more information on this function.

+
+

Parameters

+
+++++ + + + + + +

parent

a PopplerIndexIter

 
+
+
+

Returns

+

a new PopplerIndexIter

+
+
+
+
+

poppler_index_iter_is_open ()

+
gboolean
+poppler_index_iter_is_open (PopplerIndexIter *iter);
+

Returns whether this node should be expanded by default to the user. The +document can provide a hint as to how the document's index should be expanded +initially.

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerIndexIter

 
+
+
+

Returns

+

TRUE, if the document wants iter +to be expanded

+
+
+
+
+

poppler_index_iter_new ()

+
PopplerIndexIter *
+poppler_index_iter_new (PopplerDocument *document);
+

Returns the root PopplerIndexIter for document +, or NULL. This must be +freed with poppler_index_iter_free().

+

Certain documents have an index associated with them. This index can be used +to help the user navigate the document, and is similar to a table of +contents. Each node in the index will contain a PopplerAction that can be +displayed to the user — typically a POPPLER_ACTION_GOTO_DEST or a +POPPLER_ACTION_URI.

+

Here is a simple example of some code that walks the full index:

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
static void
+walk_index (PopplerIndexIter *iter)
+{
+  do
+    {
+      /* Get the action and do something with it */
+      PopplerIndexIter *child = poppler_index_iter_get_child (iter);
+      if (child)
+        walk_index (child);
+      poppler_index_iter_free (child);
+    }
+  while (poppler_index_iter_next (iter));
+}
+...
+{
+  iter = poppler_index_iter_new (document);
+  walk_index (iter);
+  poppler_index_iter_free (iter);
+}
+
+ +
+

Parameters

+
+++++ + + + + + +

document

a PopplerDocument

 
+
+
+

Returns

+

a new PopplerIndexIter

+
+
+
+
+

poppler_index_iter_next ()

+
gboolean
+poppler_index_iter_next (PopplerIndexIter *iter);
+

Sets iter + to point to the next action at the current level, if valid. See +poppler_index_iter_new() for more information.

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerIndexIter

 
+
+
+

Returns

+

TRUE, if iter +was set to the next action

+
+
+
+
+

poppler_layers_iter_copy ()

+
PopplerLayersIter *
+poppler_layers_iter_copy (PopplerLayersIter *iter);
+

Creates a new PopplerLayersIter as a copy of iter +. This must be freed with +poppler_layers_iter_free().

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerLayersIter

 
+
+
+

Returns

+

a new PopplerLayersIter

+

Since 0.12

+
+
+
+
+

poppler_layers_iter_free ()

+
void
+poppler_layers_iter_free (PopplerLayersIter *iter);
+

Frees iter +.

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerLayersIter

 
+
+

Since: 0.12

+
+
+
+

poppler_layers_iter_get_child ()

+
PopplerLayersIter *
+poppler_layers_iter_get_child (PopplerLayersIter *parent);
+

Returns a newly created child of parent +, or NULL if the iter has no child. +See poppler_layers_iter_new() for more information on this function.

+
+

Parameters

+
+++++ + + + + + +

parent

a PopplerLayersIter

 
+
+
+

Returns

+

a new PopplerLayersIter, or NULL

+
+

Since: 0.12

+
+
+
+

poppler_layers_iter_get_layer ()

+
PopplerLayer *
+poppler_layers_iter_get_layer (PopplerLayersIter *iter);
+

Returns the PopplerLayer associated with iter +.

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerLayersIter

 
+
+
+

Returns

+

a new PopplerLayer, or NULL if +there isn't any layer associated with iter +.

+

[transfer full]

+
+

Since: 0.12

+
+
+
+

poppler_layers_iter_get_title ()

+
gchar *
+poppler_layers_iter_get_title (PopplerLayersIter *iter);
+

Returns the title associated with iter +. It must be freed with +g_free().

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerLayersIter

 
+
+
+

Returns

+

a new string containing the iter +'s title or NULL if iter +doesn't have a title. +The returned string should be freed with g_free() when no longer needed.

+
+

Since: 0.12

+
+
+
+

poppler_layers_iter_new ()

+
PopplerLayersIter *
+poppler_layers_iter_new (PopplerDocument *document);
+
+

Parameters

+
+++++ + + + + + +

document

a PopplerDocument

 
+
+

Since: 0.12

+
+
+
+

poppler_layers_iter_next ()

+
gboolean
+poppler_layers_iter_next (PopplerLayersIter *iter);
+

Sets iter + to point to the next action at the current level, if valid. See +poppler_layers_iter_new() for more information.

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerLayersIter

 
+
+
+

Returns

+

TRUE, if iter +was set to the next action

+
+

Since: 0.12

+
+
+
+

poppler_ps_file_free ()

+
void
+poppler_ps_file_free (PopplerPSFile *ps_file);
+

Frees ps_file +

+
+

Parameters

+
+++++ + + + + + +

ps_file

a PopplerPSFile

 
+
+
+
+
+

poppler_ps_file_new ()

+
PopplerPSFile *
+poppler_ps_file_new (PopplerDocument *document,
+                     const char *filename,
+                     int first_page,
+                     int n_pages);
+

Create a new postscript file to render to

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

document

a PopplerDocument

 

filename

the path of the output filename

 

first_page

the first page to print

 

n_pages

the number of pages to print

 
+
+
+

Returns

+

a PopplerPSFile.

+

[transfer full]

+
+
+
+
+

poppler_ps_file_new_fd ()

+
PopplerPSFile *
+poppler_ps_file_new_fd (PopplerDocument *document,
+                        int fd,
+                        int first_page,
+                        int n_pages);
+

Create a new postscript file to render to. +Note that this function takes ownership of fd +; you must not operate on it +again, nor close it.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

document

a PopplerDocument

 

fd

a valid file descriptor open for writing

 

first_page

the first page to print

 

n_pages

the number of pages to print

 
+
+
+

Returns

+

a PopplerPSFile.

+

[transfer full]

+
+

Since: 21.12.0

+
+
+
+

poppler_ps_file_set_duplex ()

+
void
+poppler_ps_file_set_duplex (PopplerPSFile *ps_file,
+                            gboolean duplex);
+

Enable or disable Duplex printing.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

ps_file

a PopplerPSFile which was not yet printed to

 

duplex

whether to force duplex printing (on printers which support this)

 
+
+
+
+
+

poppler_ps_file_set_paper_size ()

+
void
+poppler_ps_file_set_paper_size (PopplerPSFile *ps_file,
+                                double width,
+                                double height);
+

Set the output paper size. These values will end up in the +DocumentMedia, the BoundingBox DSC comments and other places in the +generated PostScript.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

ps_file

a PopplerPSFile which was not yet printed to.

 

width

the paper width in 1/72 inch

 

height

the paper height in 1/72 inch

 
+
+
+
+
+

Types and Values

+
+

PopplerDocument

+
typedef struct _PopplerDocument PopplerDocument;
+
+
+
+

PopplerFontInfo

+
typedef struct _PopplerFontInfo PopplerFontInfo;
+
+
+
+

enum PopplerFontType

+

Font types

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_FONT_TYPE_UNKNOWN

 +

unknown font type

+		 

POPPLER_FONT_TYPE_TYPE1

 +

Type 1 font type

+		 

POPPLER_FONT_TYPE_TYPE1C

 +

Type 1 font type embedded in Compact Font Format (CFF) font program

+		 

POPPLER_FONT_TYPE_TYPE1COT

 +

Type 1 font type embedded in OpenType font program

+		 

POPPLER_FONT_TYPE_TYPE3

 +

A font type that is defined with PDF graphics operators

+		 

POPPLER_FONT_TYPE_TRUETYPE

 +

TrueType font type

+		 

POPPLER_FONT_TYPE_TRUETYPEOT

 +

TrueType font type embedded in OpenType font program

+		 

POPPLER_FONT_TYPE_CID_TYPE0

 +

CIDFont type based on Type 1 font technology

+		 

POPPLER_FONT_TYPE_CID_TYPE0C

 +

CIDFont type based on Type 1 font technology embedded in CFF font program

+		 

POPPLER_FONT_TYPE_CID_TYPE0COT

 +

CIDFont type based on Type 1 font technology embedded in OpenType font program

+		 

POPPLER_FONT_TYPE_CID_TYPE2

 +

CIDFont type based on TrueType font technology

+		 

POPPLER_FONT_TYPE_CID_TYPE2OT

 +

CIDFont type based on TrueType font technology embedded in OpenType font program

+		 
+
+
+
+
+

PopplerFontsIter

+
typedef struct _PopplerFontsIter PopplerFontsIter;
+
+
+
+

PopplerIndexIter

+
typedef struct _PopplerIndexIter PopplerIndexIter;
+
+
+
+

PopplerLayersIter

+
typedef struct _PopplerLayersIter PopplerLayersIter;
+
+
+
+

enum PopplerPDFConformance

+

PDF Subtype Conformance

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_PDF_SUBTYPE_CONF_UNSET

 +

Null

+		 

POPPLER_PDF_SUBTYPE_CONF_A

 +

Level A (accessible) conformance (PDF/A)

+		 

POPPLER_PDF_SUBTYPE_CONF_B

 +

Level B (basic) conformance (PDF/A)

+		 

POPPLER_PDF_SUBTYPE_CONF_G

 +

Level G (external graphical content) (PDF/X)

+		 

POPPLER_PDF_SUBTYPE_CONF_N

 +

Level N (external ICC Profile) (PDF/X)

+		 

POPPLER_PDF_SUBTYPE_CONF_P

 +

Level P (ICC Profile) (PDF/X)

+		 

POPPLER_PDF_SUBTYPE_CONF_PG

 +

Level PG (conjunction of P and G) (PDF/X)

+		 

POPPLER_PDF_SUBTYPE_CONF_U

 +

Level U (Unicode) conformance (PDF/A)

+		 

POPPLER_PDF_SUBTYPE_CONF_NONE

 +

No conformance level available

+		 
+
+

Since: 0.70

+
+
+
+

enum PopplerPDFPart

+

PDF Subtype Part

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_PDF_SUBTYPE_PART_UNSET

 +

Null

+		 

POPPLER_PDF_SUBTYPE_PART_1

 +

1

+		 

POPPLER_PDF_SUBTYPE_PART_2

 +

2

+		 

POPPLER_PDF_SUBTYPE_PART_3

 +

3

+		 

POPPLER_PDF_SUBTYPE_PART_4

 +

4

+		 

POPPLER_PDF_SUBTYPE_PART_5

 +

5

+		 

POPPLER_PDF_SUBTYPE_PART_6

 +

6

+		 

POPPLER_PDF_SUBTYPE_PART_7

 +

7

+		 

POPPLER_PDF_SUBTYPE_PART_8

 +

8

+		 

POPPLER_PDF_SUBTYPE_PART_NONE

 +

No part available

+		 
+
+

Since: 0.70

+
+
+
+

enum PopplerPDFSubtype

+

PDF Subtype

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_PDF_SUBTYPE_UNSET

 +

Null

+		 

POPPLER_PDF_SUBTYPE_PDF_A

 +

ISO 19005 - Document management -- Electronic document file format for long-term preservation (PDF/A)

+		 

POPPLER_PDF_SUBTYPE_PDF_E

 +

ISO 24517 - Document management -- Engineering document format using PDF (PDF/E)

+		 

POPPLER_PDF_SUBTYPE_PDF_UA

 +

ISO 14289 - Document management applications -- Electronic document file format enhancement for accessibility (PDF/UA)

+		 

POPPLER_PDF_SUBTYPE_PDF_VT

 +

ISO 16612 - Graphic technology -- Variable data exchange (PDF/VT)

+		 

POPPLER_PDF_SUBTYPE_PDF_X

 +

ISO 15930 - Graphic technology -- Prepress digital data exchange (PDF/X)

+		 

POPPLER_PDF_SUBTYPE_NONE

 +

Not compliant with the above standards

+		 
+
+

Since: 0.70

+
+
+
+

PopplerPSFile

+
typedef struct _PopplerPSFile PopplerPSFile;
+
+
+
+

enum PopplerPageLayout

+

Page layout types

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_PAGE_LAYOUT_UNSET

 +

no specific layout set

+		 

POPPLER_PAGE_LAYOUT_SINGLE_PAGE

 +

one page at a time

+		 

POPPLER_PAGE_LAYOUT_ONE_COLUMN

 +

pages in one column

+		 

POPPLER_PAGE_LAYOUT_TWO_COLUMN_LEFT

 +

pages in two columns with odd numbered pages on the left

+		 

POPPLER_PAGE_LAYOUT_TWO_COLUMN_RIGHT

 +

pages in two columns with odd numbered pages on the right

+		 

POPPLER_PAGE_LAYOUT_TWO_PAGE_LEFT

 +

two pages at a time with odd numbered pages on the left

+		 

POPPLER_PAGE_LAYOUT_TWO_PAGE_RIGHT

 +

two pages at a time with odd numbered pages on the right

+		 
+
+
+
+
+

enum PopplerPageMode

+

Page modes

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_PAGE_MODE_UNSET

 +

no specific mode set

+		 

POPPLER_PAGE_MODE_NONE

 +

neither document outline nor thumbnails visible

+		 

POPPLER_PAGE_MODE_USE_OUTLINES

 +

document outline visible

+		 

POPPLER_PAGE_MODE_USE_THUMBS

 +

thumbnails visible

+		 

POPPLER_PAGE_MODE_FULL_SCREEN

 +

full-screen mode

+		 

POPPLER_PAGE_MODE_USE_OC

 +

layers panel visible

+		 

POPPLER_PAGE_MODE_USE_ATTACHMENTS

 +

attachments panel visible

+		 
+
+
+
+
+

PopplerPageRange

+
typedef struct {
+    gint start_page;
+    gint end_page;
+} PopplerPageRange;
+
+

A PopplerPageRange is used to specify a range of pages.

+
+

Members

+
+++++ + + + + + + + + + + + + +

gint start_page;

first page in the range of pages

 

gint end_page;

last page in the range of pages

 
+
+

Since: 0.80

+
+
+
+

enum PopplerPermissions

+

Permissions

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_PERMISSIONS_OK_TO_PRINT

 +

document can be printer

+		 

POPPLER_PERMISSIONS_OK_TO_MODIFY

 +

document contents can be modified

+		 

POPPLER_PERMISSIONS_OK_TO_COPY

 +

document can be copied

+		 

POPPLER_PERMISSIONS_OK_TO_ADD_NOTES

 +

annotations can added to the document

+		 

POPPLER_PERMISSIONS_OK_TO_FILL_FORM

 +

interactive form fields can be filled in

+		 

POPPLER_PERMISSIONS_OK_TO_EXTRACT_CONTENTS

 +

extract text and graphics +(in support of accessibility to users with disabilities or for other purposes). Since 0.18

+		 

POPPLER_PERMISSIONS_OK_TO_ASSEMBLE

 +

assemble the document (insert, rotate, or delete pages and create +bookmarks or thumbnail images). Since 0.18

+		 

POPPLER_PERMISSIONS_OK_TO_PRINT_HIGH_RESOLUTION

 +

document can be printer at high resolution. Since 0.18

+		 

POPPLER_PERMISSIONS_FULL

 +

document permits all operations

+		 
+
+
+
+
+

enum PopplerPrintDuplex

+

Duplex viewer preference

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_PRINT_DUPLEX_NONE

 +

No preference on duplex printing

+		 

POPPLER_PRINT_DUPLEX_SIMPLEX

 +

Print single-sided

+		 

POPPLER_PRINT_DUPLEX_DUPLEX_FLIP_SHORT_EDGE

 +

Duplex and flip on the short edge of the sheet

+		 

POPPLER_PRINT_DUPLEX_DUPLEX_FLIP_LONG_EDGE

 +

Duplex and flip on the long edge of the sheet

+		 
+
+

Since: 0.80

+
+
+
+

enum PopplerPrintScaling

+

PrintScaling viewer preference

+
+

Members

+
+++++ + + + + + + + + + + + + +

POPPLER_PRINT_SCALING_APP_DEFAULT

 +

application's default page scaling

+		 

POPPLER_PRINT_SCALING_NONE

 +

no page scaling

+		 
+
+

Since: 0.73

+
+
+
+

enum PopplerViewerPreferences

+

Viewer preferences

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_VIEWER_PREFERENCES_UNSET

 +

no preferences set

+		 

POPPLER_VIEWER_PREFERENCES_HIDE_TOOLBAR

 +

hider toolbars when document is active

+		 

POPPLER_VIEWER_PREFERENCES_HIDE_MENUBAR

 +

hide menu bar when document is active

+		 

POPPLER_VIEWER_PREFERENCES_HIDE_WINDOWUI

 +

hide UI elements in document's window

+		 

POPPLER_VIEWER_PREFERENCES_FIT_WINDOW

 +

resize document's window to fit the size of the first displayed page

+		 

POPPLER_VIEWER_PREFERENCES_CENTER_WINDOW

 +

position the document's window in the center of the screen

+		 

POPPLER_VIEWER_PREFERENCES_DISPLAY_DOC_TITLE

 +

display document title in window's title bar

+		 

POPPLER_VIEWER_PREFERENCES_DIRECTION_RTL

 +

the predominant reading order for text is right to left

+		 
+
+
+
+
+

Property Details

+
+

The “author” property

+
  “author”                   char *
+

The author of the document

+

Owner: PopplerDocument

+

Flags: Read / Write

+

Default value: NULL

+
+
+
+

The “creation-date” property

+
  “creation-date”            int
+

The date the document was created as seconds since the Epoch, or -1

+
+

PopplerDocument:creation-date has been deprecated since version 20.09.0 and should not be used in newly-written code.

+

This will overflow in 2038. Use creation-datetime +instead.

+
+

Owner: PopplerDocument

+

Flags: Read / Write

+

Allowed values: >= -1

+

Default value: -1

+
+
+
+

The “creation-datetime” property

+
  “creation-datetime”        GDateTime *
+

The date and time the document was created.

+

Owner: PopplerDocument

+

Flags: Read / Write

+

Since: 20.09.0

+
+
+
+

The “creator” property

+
  “creator”                  char *
+

The creator of the document. See also poppler_document_get_creator()

+

Owner: PopplerDocument

+

Flags: Read / Write

+

Default value: NULL

+
+
+
+

The “format” property

+
  “format”                   char *
+

The PDF version as string. See also poppler_document_get_pdf_version_string()

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “format-major” property

+
  “format-major”             guint
+

The PDF major version number. See also poppler_document_get_pdf_version()

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: 1

+
+
+
+

The “format-minor” property

+
  “format-minor”             guint
+

The PDF minor version number. See also poppler_document_get_pdf_version()

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: 0

+
+
+
+

The “keywords” property

+
  “keywords”                 char *
+

The keywords associated to the document

+

Owner: PopplerDocument

+

Flags: Read / Write

+

Default value: NULL

+
+
+
+

The “linearized” property

+
  “linearized”               gboolean
+

Whether document is linearized. See also poppler_document_is_linearized()

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: FALSE

+
+
+
+

The “metadata” property

+
  “metadata”                 char *
+

Document metadata in XML format, or NULL

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “mod-date” property

+
  “mod-date”                 int
+

The date the document was most recently modified as seconds since the Epoch, or -1

+
+

PopplerDocument:mod-date has been deprecated since version 20.09.0 and should not be used in newly-written code.

+

This will overflow in 2038. Use mod-datetime instead.

+
+

Owner: PopplerDocument

+

Flags: Read / Write

+

Allowed values: >= -1

+

Default value: -1

+
+
+
+

The “mod-datetime” property

+
  “mod-datetime”             GDateTime *
+

The GDateTime the document was most recently modified.

+

Owner: PopplerDocument

+

Flags: Read / Write

+

Since: 20.09.0

+
+
+
+

The “page-layout” property

+
  “page-layout”              PopplerPageLayout
+

The page layout that should be used when the document is opened

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: POPPLER_PAGE_LAYOUT_UNSET

+
+
+
+

The “page-mode” property

+
  “page-mode”                PopplerPageMode
+

The mode that should be used when the document is opened

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: POPPLER_PAGE_MODE_UNSET

+
+
+
+

The “permissions” property

+
  “permissions”              PopplerPermissions
+

Flags specifying which operations are permitted when the document is opened

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: POPPLER_PERMISSIONS_OK_TO_PRINT | POPPLER_PERMISSIONS_OK_TO_MODIFY | POPPLER_PERMISSIONS_OK_TO_COPY | POPPLER_PERMISSIONS_OK_TO_ADD_NOTES | POPPLER_PERMISSIONS_OK_TO_FILL_FORM | POPPLER_PERMISSIONS_OK_TO_EXTRACT_CONTENTS | POPPLER_PERMISSIONS_OK_TO_ASSEMBLE | POPPLER_PERMISSIONS_OK_TO_PRINT_HIGH_RESOLUTION

+
+
+
+

The “print-duplex” property

+
  “print-duplex”             PopplerPrintDuplex
+

Duplex Viewer Preference.

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: POPPLER_PRINT_DUPLEX_NONE

+

Since: 0.80

+
+
+
+

The “print-n-copies” property

+
  “print-n-copies”           int
+

Suggested number of copies to be printed for this document

+

Owner: PopplerDocument

+

Flags: Read

+

Allowed values: >= 1

+

Default value: 1

+

Since: 0.80

+
+
+
+

The “print-scaling” property

+
  “print-scaling”            PopplerPrintScaling
+

Print Scaling Viewer Preference.

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: POPPLER_PRINT_SCALING_APP_DEFAULT

+

Since: 0.73

+
+
+
+

The “producer” property

+
  “producer”                 char *
+

The producer of the document. See also poppler_document_get_producer()

+

Owner: PopplerDocument

+

Flags: Read / Write

+

Default value: NULL

+
+
+
+

The “subject” property

+
  “subject”                  char *
+

The subject of the document

+

Owner: PopplerDocument

+

Flags: Read / Write

+

Default value: NULL

+
+
+
+

The “subtype” property

+
  “subtype”                  PopplerPDFSubtype
+

Document PDF subtype type

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: POPPLER_PDF_SUBTYPE_UNSET

+
+
+
+

The “subtype-conformance” property

+
  “subtype-conformance”      PopplerPDFConformance
+

Document PDF subtype conformance

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: POPPLER_PDF_SUBTYPE_CONF_UNSET

+
+
+
+

The “subtype-part” property

+
  “subtype-part”             PopplerPDFPart
+

Document PDF subtype part

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: POPPLER_PDF_SUBTYPE_PART_UNSET

+
+
+
+

The “subtype-string” property

+
  “subtype-string”           char *
+

Document PDF subtype. See also poppler_document_get_pdf_subtype_string()

+

Owner: PopplerDocument

+

Flags: Read

+

Default value: NULL

+
+
+
+

The “title” property

+
  “title”                    char *
+

The document's title or NULL

+

Owner: PopplerDocument

+

Flags: Read / Write

+

Default value: NULL

+
+
+
+

The “viewer-preferences” property

+
  “viewer-preferences”       PopplerViewerPreferences
+

Viewer Preferences.

+

Owner: PopplerDocument

+

Flags: Read

+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/PopplerFormField.html b/poppler-24.05.0/glib/reference/html/PopplerFormField.html new file mode 100644 index 0000000000000000000000000000000000000000..0069b0073420f4376aec77c138c6881131b20e25 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/PopplerFormField.html @@ -0,0 +1,4136 @@ + + + + +PopplerFormField: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

PopplerFormField

+

PopplerFormField — Form Field

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+GDateTime * + +poppler_certificate_info_get_expiration_time () +
+GDateTime * + +poppler_certificate_info_get_issuance_time () +
const char * + +poppler_certificate_info_get_issuer_common_name () +
const char * + +poppler_certificate_info_get_issuer_email () +
const char * + +poppler_certificate_info_get_issuer_organization () +
const char * + +poppler_certificate_info_get_subject_common_name () +
const char * + +poppler_certificate_info_get_subject_email () +
const char * + +poppler_certificate_info_get_subject_organization () +
+PopplerFormButtonType + +poppler_form_field_button_get_button_type () +
+gboolean + +poppler_form_field_button_get_state () +
+void + +poppler_form_field_button_set_state () +
+gboolean + +poppler_form_field_choice_can_select_multiple () +
+gboolean + +poppler_form_field_choice_commit_on_change () +
+gboolean + +poppler_form_field_choice_do_spell_check () +
+PopplerFormChoiceType + +poppler_form_field_choice_get_choice_type () +
+gchar * + +poppler_form_field_choice_get_item () +
+gint + +poppler_form_field_choice_get_n_items () +
+gchar * + +poppler_form_field_choice_get_text () +
+gboolean + +poppler_form_field_choice_is_editable () +
+gboolean + +poppler_form_field_choice_is_item_selected () +
+void + +poppler_form_field_choice_select_item () +
+void + +poppler_form_field_choice_set_text () +
+void + +poppler_form_field_choice_toggle_item () +
+void + +poppler_form_field_choice_unselect_all () +
+PopplerAction * + +poppler_form_field_get_action () +
+PopplerAction * + +poppler_form_field_get_additional_action () +
+gchar * + +poppler_form_field_get_alternate_ui_name () +
+PopplerFormFieldType + +poppler_form_field_get_field_type () +
+gdouble + +poppler_form_field_get_font_size () +
+gint + +poppler_form_field_get_id () +
+gchar * + +poppler_form_field_get_mapping_name () +
+gchar * + +poppler_form_field_get_name () +
+gchar * + +poppler_form_field_get_partial_name () +
+gboolean + +poppler_form_field_is_read_only () +
+void + +poppler_form_field_signature_validate_async () +
+PopplerSignatureInfo * + +poppler_form_field_signature_validate_finish () +
+PopplerSignatureInfo * + +poppler_form_field_signature_validate_sync () +
+gboolean + +poppler_form_field_text_do_scroll () +
+gboolean + +poppler_form_field_text_do_spell_check () +
+gint + +poppler_form_field_text_get_max_len () +
+gchar * + +poppler_form_field_text_get_text () +
+PopplerFormTextType + +poppler_form_field_text_get_text_type () +
+gboolean + +poppler_form_field_text_is_password () +
+gboolean + +poppler_form_field_text_is_rich_text () +
+void + +poppler_form_field_text_set_text () +
+PopplerSignatureInfo * + +poppler_signature_info_copy () +
+void + +poppler_signature_info_free () +
+PopplerCertificateInfo * + +poppler_signature_info_get_certificate_info () +
+PopplerCertificateStatus + +poppler_signature_info_get_certificate_status () +
+PopplerSignatureStatus + +poppler_signature_info_get_signature_status () +
const gchar * + +poppler_signature_info_get_signer_name () +
+GDateTime * + +poppler_signature_info_get_local_signing_time () +
+PopplerSigningData * + +poppler_signing_data_new () +
+PopplerSigningData * + +poppler_signing_data_copy () +
+void + +poppler_signing_data_free () +
+void + +poppler_signing_data_set_destination_filename () +
+void + +poppler_signing_data_set_certificate_info () +
+void + +poppler_signing_data_set_page () +
+void + +poppler_signing_data_set_signature_text () +
+void + +poppler_signing_data_set_signature_text_left () +
+void + +poppler_signing_data_set_signature_rectangle () +
+void + +poppler_signing_data_set_font_color () +
+void + +poppler_signing_data_set_font_size () +
+void + +poppler_signing_data_set_left_font_size () +
+void + +poppler_signing_data_set_border_color () +
+void + +poppler_signing_data_set_border_width () +
+void + +poppler_signing_data_set_background_color () +
+void + +poppler_signing_data_set_field_partial_name () +
+void + +poppler_signing_data_set_reason () +
+void + +poppler_signing_data_set_location () +
+void + +poppler_signing_data_set_image_path () +
+void + +poppler_signing_data_set_password () +
+void + +poppler_signing_data_set_document_owner_password () +
+void + +poppler_signing_data_set_document_user_password () +
const gchar * + +poppler_signing_data_get_destination_filename () +
const PopplerCertificateInfo * + +poppler_signing_data_get_certificate_info () +
+int + +poppler_signing_data_get_page () +
const gchar * + +poppler_signing_data_get_signature_text () +
const gchar * + +poppler_signing_data_get_signature_text_left () +
const PopplerRectangle * + +poppler_signing_data_get_signature_rectangle () +
const PopplerColor * + +poppler_signing_data_get_font_color () +
+gdouble + +poppler_signing_data_get_font_size () +
+gdouble + +poppler_signing_data_get_left_font_size () +
const PopplerColor * + +poppler_signing_data_get_border_color () +
+gdouble + +poppler_signing_data_get_border_width () +
const PopplerColor * + +poppler_signing_data_get_background_color () +
const gchar * + +poppler_signing_data_get_field_partial_name () +
const gchar * + +poppler_signing_data_get_reason () +
const gchar * + +poppler_signing_data_get_location () +
const gchar * + +poppler_signing_data_get_image_path () +
const gchar * + +poppler_signing_data_get_password () +
const gchar * + +poppler_signing_data_get_document_owner_password () +
const gchar * + +poppler_signing_data_get_document_user_password () +
+PopplerCertificateInfo * + +poppler_certificate_info_new () +
+PopplerCertificateInfo * + +poppler_certificate_info_copy () +
+void + +poppler_set_nss_dir () +
+char * + +poppler_get_nss_dir () +
+void + +poppler_set_nss_password_callback () +
+GList * + +poppler_get_available_signing_certificates () +
+void + +poppler_certificate_info_free () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 PopplerFormField
enumPopplerAdditionalActionType
 PopplerCertificateInfo
enumPopplerCertificateStatus
enumPopplerFormFieldType
enumPopplerFormButtonType
enumPopplerFormChoiceType
enumPopplerFormTextType
 PopplerSignatureInfo
enumPopplerSignatureStatus
enumPopplerSignatureValidationFlags
+
+
+

Object Hierarchy

+
    GBoxed
+    ├── PopplerCertificateInfo
+    ╰── PopplerSignatureInfo
+    GEnum
+    ├── PopplerAdditionalActionType
+    ├── PopplerCertificateStatus
+    ├── PopplerFormButtonType
+    ├── PopplerFormChoiceType
+    ├── PopplerFormFieldType
+    ├── PopplerFormTextType
+    ╰── PopplerSignatureStatus
+    GFlags
+    ╰── PopplerSignatureValidationFlags
+    GObject
+    ╰── PopplerFormField
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+
+
+

Functions

+
+

poppler_certificate_info_get_expiration_time ()

+
GDateTime *
+poppler_certificate_info_get_expiration_time
+                               (const PopplerCertificateInfo *certificate_info);
+

Get certificate expiration time

+
+

Parameters

+
+++++ + + + + + +

certificate_info

a PopplerCertificateInfo structure containing certificate information

 
+
+
+

Returns

+

certificate expiration time.

+

[transfer none]

+
+

Since: 23.08.0

+
+
+
+

poppler_certificate_info_get_issuance_time ()

+
GDateTime *
+poppler_certificate_info_get_issuance_time
+                               (const PopplerCertificateInfo *certificate_info);
+

Get certificate issuance time

+
+

Parameters

+
+++++ + + + + + +

certificate_info

a PopplerCertificateInfo structure containing certificate information

 
+
+
+

Returns

+

certificate issuance time.

+

[transfer none]

+
+

Since: 23.08.0

+
+
+
+

poppler_certificate_info_get_issuer_common_name ()

+
const char *
+poppler_certificate_info_get_issuer_common_name
+                               (const PopplerCertificateInfo *certificate_info);
+

Get certificate issuer common name

+
+

Parameters

+
+++++ + + + + + +

certificate_info

a PopplerCertificateInfo structure containing certificate information

 
+
+
+

Returns

+

certificate issuer common name

+
+

Since: 23.08.0

+
+
+
+

poppler_certificate_info_get_issuer_email ()

+
const char *
+poppler_certificate_info_get_issuer_email
+                               (const PopplerCertificateInfo *certificate_info);
+

Get certificate issuer email

+
+

Parameters

+
+++++ + + + + + +

certificate_info

a PopplerCertificateInfo structure containing certificate information

 
+
+
+

Returns

+

certificate issuer email

+
+

Since: 23.08.0

+
+
+
+

poppler_certificate_info_get_issuer_organization ()

+
const char *
+poppler_certificate_info_get_issuer_organization
+                               (const PopplerCertificateInfo *certificate_info);
+

Get certificate issuer organization

+
+

Parameters

+
+++++ + + + + + +

certificate_info

a PopplerCertificateInfo structure containing certificate information

 
+
+
+

Returns

+

certificate issuer organization

+
+

Since: 23.08.0

+
+
+
+

poppler_certificate_info_get_subject_common_name ()

+
const char *
+poppler_certificate_info_get_subject_common_name
+                               (const PopplerCertificateInfo *certificate_info);
+

Get certificate subject common name

+
+

Parameters

+
+++++ + + + + + +

certificate_info

a PopplerCertificateInfo structure containing certificate information

 
+
+
+

Returns

+

certificate subject common name

+
+

Since: 23.07.0

+
+
+
+

poppler_certificate_info_get_subject_email ()

+
const char *
+poppler_certificate_info_get_subject_email
+                               (const PopplerCertificateInfo *certificate_info);
+

Get certificate subject email

+
+

Parameters

+
+++++ + + + + + +

certificate_info

a PopplerCertificateInfo structure containing certificate information

 
+
+
+

Returns

+

certificate subject email

+
+

Since: 23.08.0

+
+
+
+

poppler_certificate_info_get_subject_organization ()

+
const char *
+poppler_certificate_info_get_subject_organization
+                               (const PopplerCertificateInfo *certificate_info);
+

Get certificate subject organization

+
+

Parameters

+
+++++ + + + + + +

certificate_info

a PopplerCertificateInfo structure containing certificate information

 
+
+
+

Returns

+

certificate subject organization

+
+

Since: 23.08.0

+
+
+
+

poppler_form_field_button_get_button_type ()

+
PopplerFormButtonType
+poppler_form_field_button_get_button_type
+                               (PopplerFormField *field);
+

Gets the button type of field +

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

PopplerFormButtonType of field +

+
+
+
+
+

poppler_form_field_button_get_state ()

+
gboolean
+poppler_form_field_button_get_state (PopplerFormField *field);
+

Queries a PopplerFormField and returns its current state. Returns TRUE if +field + is pressed in and FALSE if it is raised.

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

current state of field +

+
+
+
+
+

poppler_form_field_button_set_state ()

+
void
+poppler_form_field_button_set_state (PopplerFormField *field,
+                                     gboolean state);
+

Sets the status of field +. Set to TRUE if you want the PopplerFormField +to be 'pressed in', and FALSE to raise it.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

field

a PopplerFormField

 

state

TRUE or FALSE

 
+
+
+
+
+

poppler_form_field_choice_can_select_multiple ()

+
gboolean
+poppler_form_field_choice_can_select_multiple
+                               (PopplerFormField *field);
+

Checks whether field + allows multiple choices to be selected

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

TRUE if field +allows multiple choices to be selected

+
+
+
+
+

poppler_form_field_choice_commit_on_change ()

+
gboolean
+poppler_form_field_choice_commit_on_change
+                               (PopplerFormField *field);
+
+
+
+

poppler_form_field_choice_do_spell_check ()

+
gboolean
+poppler_form_field_choice_do_spell_check
+                               (PopplerFormField *field);
+

Checks whether spell checking should be done for the contents of field +

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

TRUE if spell checking should be done for field +

+
+
+
+
+

poppler_form_field_choice_get_choice_type ()

+
PopplerFormChoiceType
+poppler_form_field_choice_get_choice_type
+                               (PopplerFormField *field);
+

Gets the choice type of field +

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

PopplerFormChoiceType of field +

+
+
+
+
+

poppler_form_field_choice_get_item ()

+
gchar *
+poppler_form_field_choice_get_item (PopplerFormField *field,
+                                    gint index);
+

Returns the contents of the item on field + at the given index

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

field

a PopplerFormField

 

index

the index of the item

 
+
+
+

Returns

+

a new allocated string. It must be freed with g_free() when done.

+
+
+
+
+

poppler_form_field_choice_get_n_items ()

+
gint
+poppler_form_field_choice_get_n_items (PopplerFormField *field);
+

Returns the number of items on field +

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

the number of items on field +

+
+
+
+
+

poppler_form_field_choice_get_text ()

+
gchar *
+poppler_form_field_choice_get_text (PopplerFormField *field);
+

Retrieves the contents of field +.

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

a new allocated string. It must be freed with g_free() when done.

+
+
+
+
+

poppler_form_field_choice_is_editable ()

+
gboolean
+poppler_form_field_choice_is_editable (PopplerFormField *field);
+

Checks whether field + is editable

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

TRUE if field +is editable

+
+
+
+
+

poppler_form_field_choice_is_item_selected ()

+
gboolean
+poppler_form_field_choice_is_item_selected
+                               (PopplerFormField *field,
+                                gint index);
+

Checks whether the item at the given index on field + is currently selected

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

field

a PopplerFormField

 

index

the index of the item

 
+
+
+

Returns

+

TRUE if item at index +is currently selected

+
+
+
+
+

poppler_form_field_choice_select_item ()

+
void
+poppler_form_field_choice_select_item (PopplerFormField *field,
+                                       gint index);
+

Selects the item at the given index on field +

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

field

a PopplerFormField

 

index

the index of the item

 
+
+
+
+
+

poppler_form_field_choice_set_text ()

+
void
+poppler_form_field_choice_set_text (PopplerFormField *field,
+                                    const gchar *text);
+

Sets the text in field + to the given value, replacing the current contents

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

field

a PopplerFormField

 

text

the new text

 
+
+
+
+
+

poppler_form_field_choice_toggle_item ()

+
void
+poppler_form_field_choice_toggle_item (PopplerFormField *field,
+                                       gint index);
+

Changes the state of the item at the given index

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

field

a PopplerFormField

 

index

the index of the item

 
+
+
+
+
+

poppler_form_field_choice_unselect_all ()

+
void
+poppler_form_field_choice_unselect_all
+                               (PopplerFormField *field);
+

Unselects all the items on field +

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+
+
+

poppler_form_field_get_action ()

+
PopplerAction *
+poppler_form_field_get_action (PopplerFormField *field);
+

Retrieves the action (PopplerAction) that shall be +performed when field + is activated, or NULL

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

the action to perform. The returned +object is owned by field +and should not be freed.

+

[transfer none]

+
+

Since: 0.18

+
+
+
+

poppler_form_field_get_additional_action ()

+
PopplerAction *
+poppler_form_field_get_additional_action
+                               (PopplerFormField *field,
+                                PopplerAdditionalActionType type);
+

Retrieves the action (PopplerAction) that shall be performed when +an additional action is triggered on field +, or NULL.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

field

a PopplerFormField

 

type

the type of additional action

 
+
+
+

Returns

+

the action to perform. The returned +object is owned by field +and should not be freed.

+

[transfer none]

+
+

Since: 0.72

+
+
+
+

poppler_form_field_get_alternate_ui_name ()

+
gchar *
+poppler_form_field_get_alternate_ui_name
+                               (PopplerFormField *field);
+

Gets the alternate ui name of field +. This name is also commonly +used by pdf producers/readers to show it as a tooltip when field + area +is hovered by a pointing device (eg. mouse).

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

a new allocated string. It must be freed with g_free() when done.

+
+

Since: 0.88

+
+
+
+

poppler_form_field_get_field_type ()

+
PopplerFormFieldType
+poppler_form_field_get_field_type (PopplerFormField *field);
+

Gets the type of field +

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

PopplerFormFieldType of field +

+
+
+
+
+

poppler_form_field_get_font_size ()

+
gdouble
+poppler_form_field_get_font_size (PopplerFormField *field);
+

Gets the font size of field +

+

WARNING: This function always returns 0. Contact the poppler +mailing list if you're interested in implementing it properly

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

the font size of field +

+
+
+
+
+

poppler_form_field_get_id ()

+
gint
+poppler_form_field_get_id (PopplerFormField *field);
+

Gets the id of field +

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

the id of field +

+
+
+
+
+

poppler_form_field_get_mapping_name ()

+
gchar *
+poppler_form_field_get_mapping_name (PopplerFormField *field);
+

Gets the mapping name of field + that is used when +exporting interactive form field data from the document

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

a new allocated string. It must be freed with g_free() when done.

+
+

Since: 0.16

+
+
+
+

poppler_form_field_get_name ()

+
gchar *
+poppler_form_field_get_name (PopplerFormField *field);
+

Gets the fully qualified name of field +. It's constructed by concatenating +the partial field names of the field and all of its ancestors.

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

a new allocated string. It must be freed with g_free() when done.

+
+

Since: 0.16

+
+
+
+

poppler_form_field_get_partial_name ()

+
gchar *
+poppler_form_field_get_partial_name (PopplerFormField *field);
+

Gets the partial name of field +.

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

a new allocated string. It must be freed with g_free() when done.

+
+

Since: 0.16

+
+
+
+

poppler_form_field_is_read_only ()

+
gboolean
+poppler_form_field_is_read_only (PopplerFormField *field);
+

Checks whether field + is read only

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

TRUE if field +is read only

+
+
+
+
+

poppler_form_field_signature_validate_async ()

+
void
+poppler_form_field_signature_validate_async
+                               (PopplerFormField *field,
+                                PopplerSignatureValidationFlags flags,
+                                GCancellable *cancellable,
+                                GAsyncReadyCallback callback,
+                                gpointer user_data);
+

Asynchronously validates the cryptographic signature contained in signature_field +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

field

a PopplerFormField that represents a signature annotation

 

flags

PopplerSignatureValidationFlags flags influencing process of validation of the field signature

 

cancellable

optional GCancellable object.

[nullable]

callback

a GAsyncReadyCallback to call when the signature is validated.

[scope async]

user_data

the data to pass to callback function.

[closure]
+
+

Since: 21.12.0

+
+
+
+

poppler_form_field_signature_validate_finish ()

+
PopplerSignatureInfo *
+poppler_form_field_signature_validate_finish
+                               (PopplerFormField *field,
+                                GAsyncResult *result,
+                                GError **error);
+

Finishes validation of the cryptographic signature contained in signature_field +. +See poppler_form_field_signature_validate_async().

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

field

a PopplerFormField that represents a signature annotation

 

result

a GAsyncResult

 

error

a GError

 
+
+
+

Returns

+

a PopplerSignatureInfo structure containing signature metadata and validation status +Free the returned structure with poppler_signature_info_free().

+

[transfer full]

+
+

Since: 21.12.0

+
+
+
+

poppler_form_field_signature_validate_sync ()

+
PopplerSignatureInfo *
+poppler_form_field_signature_validate_sync
+                               (PopplerFormField *field,
+                                PopplerSignatureValidationFlags flags,
+                                GCancellable *cancellable,
+                                GError **error);
+

Synchronously validates the cryptographic signature contained in signature_field +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

field

a PopplerFormField that represents a signature annotation

 

flags

PopplerSignatureValidationFlags flags influencing process of validation of the field signature

 

cancellable

optional GCancellable object.

[nullable]

error

a GError

 
+
+
+

Returns

+

a PopplerSignatureInfo structure containing signature metadata and validation status +Free the returned structure with poppler_signature_info_free().

+

[transfer full]

+
+

Since: 21.12.0

+
+
+
+

poppler_form_field_text_do_scroll ()

+
gboolean
+poppler_form_field_text_do_scroll (PopplerFormField *field);
+
+
+
+

poppler_form_field_text_do_spell_check ()

+
gboolean
+poppler_form_field_text_do_spell_check
+                               (PopplerFormField *field);
+

Checks whether spell checking should be done for the contents of field +

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

TRUE if spell checking should be done for field +

+
+
+
+
+

poppler_form_field_text_get_max_len ()

+
gint
+poppler_form_field_text_get_max_len (PopplerFormField *field);
+

Retrieves the maximum allowed length of the text in field +

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

the maximum allowed number of characters in field +, or -1 if there is no maximum.

+
+
+
+
+

poppler_form_field_text_get_text ()

+
gchar *
+poppler_form_field_text_get_text (PopplerFormField *field);
+

Retrieves the contents of field +.

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

a new allocated string. It must be freed with g_free() when done.

+
+
+
+
+

poppler_form_field_text_get_text_type ()

+
PopplerFormTextType
+poppler_form_field_text_get_text_type (PopplerFormField *field);
+

Gets the text type of field +.

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

PopplerFormTextType of field +

+
+
+
+
+

poppler_form_field_text_is_password ()

+
gboolean
+poppler_form_field_text_is_password (PopplerFormField *field);
+

Checks whether content of field + is a password and it must be hidden

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

TRUE if the content of field +is a password

+
+
+
+
+

poppler_form_field_text_is_rich_text ()

+
gboolean
+poppler_form_field_text_is_rich_text (PopplerFormField *field);
+

Checks whether the contents of field + are rich text

+
+

Parameters

+
+++++ + + + + + +

field

a PopplerFormField

 
+
+
+

Returns

+

TRUE if the contents of field +are rich text

+
+
+
+
+

poppler_form_field_text_set_text ()

+
void
+poppler_form_field_text_set_text (PopplerFormField *field,
+                                  const gchar *text);
+

Sets the text in field + to the given value, replacing the current contents.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

field

a PopplerFormField

 

text

the new text

 
+
+
+
+
+

poppler_signature_info_copy ()

+
PopplerSignatureInfo *
+poppler_signature_info_copy (const PopplerSignatureInfo *siginfo);
+

Copies siginfo +, creating an identical PopplerSignatureInfo.

+
+

Parameters

+
+++++ + + + + + +

siginfo

a PopplerSignatureInfo structure containing signature metadata and validation status

 
+
+
+

Returns

+

a new PopplerSignatureInfo structure identical to siginfo +.

+

[transfer full]

+
+

Since: 21.12.0

+
+
+
+

poppler_signature_info_free ()

+
void
+poppler_signature_info_free (PopplerSignatureInfo *siginfo);
+

Frees siginfo +

+
+

Parameters

+
+++++ + + + + + +

siginfo

a PopplerSignatureInfo structure containing signature metadata and validation status

 
+
+

Since: 21.12.0

+
+
+
+

poppler_signature_info_get_certificate_info ()

+
PopplerCertificateInfo *
+poppler_signature_info_get_certificate_info
+                               (const PopplerSignatureInfo *siginfo);
+

Returns PopplerCertificateInfo for given PopplerSignatureInfo.

+
+

Parameters

+
+++++ + + + + + +

siginfo

a PopplerSignatureInfo

 
+
+
+

Returns

+

certificate info of the signature.

+

[transfer none]

+
+

Since: 23.08.0

+
+
+
+

poppler_signature_info_get_certificate_status ()

+
PopplerCertificateStatus
+poppler_signature_info_get_certificate_status
+                               (const PopplerSignatureInfo *siginfo);
+

Returns status of the certificate for given PopplerSignatureInfo.

+
+

Parameters

+
+++++ + + + + + +

siginfo

a PopplerSignatureInfo

 
+
+
+

Returns

+

certificate status of the signature

+
+

Since: 21.12.0

+
+
+
+

poppler_signature_info_get_signature_status ()

+
PopplerSignatureStatus
+poppler_signature_info_get_signature_status
+                               (const PopplerSignatureInfo *siginfo);
+

Returns status of the signature for given PopplerSignatureInfo.

+
+

Parameters

+
+++++ + + + + + +

siginfo

a PopplerSignatureInfo

 
+
+
+

Returns

+

signature status of the signature

+
+

Since: 21.12.0

+
+
+
+

poppler_signature_info_get_signer_name ()

+
const gchar *
+poppler_signature_info_get_signer_name
+                               (const PopplerSignatureInfo *siginfo);
+

Returns name of signer for given PopplerSignatureInfo.

+
+

Parameters

+
+++++ + + + + + +

siginfo

a PopplerSignatureInfo

 
+
+
+

Returns

+

A string.

+

[transfer none]

+
+

Since: 21.12.0

+
+
+
+

poppler_signature_info_get_local_signing_time ()

+
GDateTime *
+poppler_signature_info_get_local_signing_time
+                               (const PopplerSignatureInfo *siginfo);
+

Returns local time of signing as GDateTime. This does not +contain information about time zone since it has not been +preserved during conversion. +Do not modify returned value since it is internal to +PopplerSignatureInfo.

+
+

Parameters

+
+++++ + + + + + +

siginfo

a PopplerSignatureInfo

 
+
+
+

Returns

+

GDateTime.

+

[transfer none]

+
+

Since: 21.12.0

+
+
+
+

poppler_signing_data_new ()

+
PopplerSigningData *
+poppler_signing_data_new (void);
+

Creates a new PopplerSigningData with default content.

+
+

Returns

+

a new PopplerSigningData. It must be freed with poppler_signing_data_free() when done.

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_copy ()

+
PopplerSigningData *
+poppler_signing_data_copy (const PopplerSigningData *signing_data);
+

Copies signing_data +, creating an identical PopplerSigningData.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

a new PopplerSigningData structure identical to signing_data +.

+

[transfer full]

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_free ()

+
void
+poppler_signing_data_free (PopplerSigningData *signing_data);
+

Frees signing_data +

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data.

[nullable]
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_destination_filename ()

+
void
+poppler_signing_data_set_destination_filename
+                               (PopplerSigningData *signing_data,
+                                const gchar *filename);
+

Set destination file name.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

filename

destination filename

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_certificate_info ()

+
void
+poppler_signing_data_set_certificate_info
+                               (PopplerSigningData *signing_data,
+                                const PopplerCertificateInfo *certificate_info);
+

Set certification information.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

certificate_info

a PopplerCertificateInfo

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_page ()

+
void
+poppler_signing_data_set_page (PopplerSigningData *signing_data,
+                               int page);
+

Set page (>=0).

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

page

a page number

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_signature_text ()

+
void
+poppler_signing_data_set_signature_text
+                               (PopplerSigningData *signing_data,
+                                const gchar *signature_text);
+

Set signature text.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

signature_text

text to show as main signature

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_signature_text_left ()

+
void
+poppler_signing_data_set_signature_text_left
+                               (PopplerSigningData *signing_data,
+                                const gchar *signature_text_left);
+

Set small signature text on the left hand.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

signature_text_left

text to show as small left signature

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_signature_rectangle ()

+
void
+poppler_signing_data_set_signature_rectangle
+                               (PopplerSigningData *signing_data,
+                                const PopplerRectangle *signature_rect);
+

Set signature rectangle.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

signature_rect

a PopplerRectangle where signature should be shown

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_font_color ()

+
void
+poppler_signing_data_set_font_color (PopplerSigningData *signing_data,
+                                     const PopplerColor *font_color);
+

Set signature font color.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

font_color

a PopplerColor to be used as signature font color

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_font_size ()

+
void
+poppler_signing_data_set_font_size (PopplerSigningData *signing_data,
+                                    gdouble font_size);
+

Set signature font size (>0).

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

font_size

signature font size

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_left_font_size ()

+
void
+poppler_signing_data_set_left_font_size
+                               (PopplerSigningData *signing_data,
+                                gdouble font_size);
+

Set signature left font size (> 0).

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

font_size

signature font size

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_border_color ()

+
void
+poppler_signing_data_set_border_color (PopplerSigningData *signing_data,
+                                       const PopplerColor *border_color);
+

Set signature border color.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

border_color

a PopplerColor to be used for signature border

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_border_width ()

+
void
+poppler_signing_data_set_border_width (PopplerSigningData *signing_data,
+                                       gdouble border_width);
+

Set signature border width.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

border_width

border width

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_background_color ()

+
void
+poppler_signing_data_set_background_color
+                               (PopplerSigningData *signing_data,
+                                const PopplerColor *background_color);
+

Set signature background color.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

background_color

a PopplerColor to be used for signature background

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_field_partial_name ()

+
void
+poppler_signing_data_set_field_partial_name
+                               (PopplerSigningData *signing_data,
+                                const gchar *field_partial_name);
+

Set field partial name (existing field id or a new one) where signature is placed.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

field_partial_name

a field partial name

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_reason ()

+
void
+poppler_signing_data_set_reason (PopplerSigningData *signing_data,
+                                 const gchar *reason);
+

Set reason for signature (e.g. I'm approver).

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

reason

a reason

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_location ()

+
void
+poppler_signing_data_set_location (PopplerSigningData *signing_data,
+                                   const gchar *location);
+

Set signature location (e.g. "At my desk").

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

location

a location

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_image_path ()

+
void
+poppler_signing_data_set_image_path (PopplerSigningData *signing_data,
+                                     const gchar *image_path);
+

Set signature background (watermark) image path.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

image_path

signature image path

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_password ()

+
void
+poppler_signing_data_set_password (PopplerSigningData *signing_data,
+                                   const gchar *password);
+

Set password for the signing key.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

password

a password

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_document_owner_password ()

+
void
+poppler_signing_data_set_document_owner_password
+                               (PopplerSigningData *signing_data,
+                                const gchar *document_owner_password);
+

Set document owner password (for encrypted files).

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

document_owner_password

document owner password

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_set_document_user_password ()

+
void
+poppler_signing_data_set_document_user_password
+                               (PopplerSigningData *signing_data,
+                                const gchar *document_user_password);
+

Set document user password (for encrypted files).

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 

document_user_password

document user password

 
+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_destination_filename ()

+
const gchar *
+poppler_signing_data_get_destination_filename
+                               (const PopplerSigningData *signing_data);
+

Get destination file name.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

destination filename

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_certificate_info ()

+
const PopplerCertificateInfo *
+poppler_signing_data_get_certificate_info
+                               (const PopplerSigningData *signing_data);
+

Get certification information.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

a PopplerCertificateInfo

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_page ()

+
int
+poppler_signing_data_get_page (const PopplerSigningData *signing_data);
+

Get page.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

page number

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_signature_text ()

+
const gchar *
+poppler_signing_data_get_signature_text
+                               (const PopplerSigningData *signing_data);
+

Get signature text.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

signature text

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_signature_text_left ()

+
const gchar *
+poppler_signing_data_get_signature_text_left
+                               (const PopplerSigningData *signing_data);
+

Get signature text left.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

signature text left

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_signature_rectangle ()

+
const PopplerRectangle *
+poppler_signing_data_get_signature_rectangle
+                               (const PopplerSigningData *signing_data);
+

Get signature rectangle.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

a PopplerRectangle

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_font_color ()

+
const PopplerColor *
+poppler_signing_data_get_font_color (const PopplerSigningData *signing_data);
+

Get signature font color.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

a PopplerColor

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_font_size ()

+
gdouble
+poppler_signing_data_get_font_size (const PopplerSigningData *signing_data);
+

Get signature font size.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

font size

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_left_font_size ()

+
gdouble
+poppler_signing_data_get_left_font_size
+                               (const PopplerSigningData *signing_data);
+

Get signature left font size.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

left font size

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_border_color ()

+
const PopplerColor *
+poppler_signing_data_get_border_color (const PopplerSigningData *signing_data);
+

Get signature border color.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

a PopplerColor

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_border_width ()

+
gdouble
+poppler_signing_data_get_border_width (const PopplerSigningData *signing_data);
+

Get signature border width.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

border width

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_background_color ()

+
const PopplerColor *
+poppler_signing_data_get_background_color
+                               (const PopplerSigningData *signing_data);
+

Get signature background color.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

a PopplerColor

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_field_partial_name ()

+
const gchar *
+poppler_signing_data_get_field_partial_name
+                               (const PopplerSigningData *signing_data);
+

Get field partial name.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

field partial name

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_reason ()

+
const gchar *
+poppler_signing_data_get_reason (const PopplerSigningData *signing_data);
+

Get reason.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

reason

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_location ()

+
const gchar *
+poppler_signing_data_get_location (const PopplerSigningData *signing_data);
+

Get location.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

location

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_image_path ()

+
const gchar *
+poppler_signing_data_get_image_path (const PopplerSigningData *signing_data);
+

Get image path.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

image path

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_password ()

+
const gchar *
+poppler_signing_data_get_password (const PopplerSigningData *signing_data);
+

Get signing key password.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

password

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_document_owner_password ()

+
const gchar *
+poppler_signing_data_get_document_owner_password
+                               (const PopplerSigningData *signing_data);
+

Get document owner password.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

document owner password (for encrypted files)

+
+

Since: 23.07.0

+
+
+
+

poppler_signing_data_get_document_user_password ()

+
const gchar *
+poppler_signing_data_get_document_user_password
+                               (const PopplerSigningData *signing_data);
+

Get document user password.

+
+

Parameters

+
+++++ + + + + + +

signing_data

a PopplerSigningData structure containing signing data

 
+
+
+

Returns

+

document user password (for encrypted files)

+
+

Since: 23.07.0

+
+
+
+

poppler_certificate_info_new ()

+
PopplerCertificateInfo *
+poppler_certificate_info_new (void);
+

Creates a new PopplerCertificateInfo

+
+

Returns

+

a new PopplerCertificateInfo. It must be freed with poppler_certificate_info_free() when done.

+
+

Since: 23.07.0

+
+
+
+

poppler_certificate_info_copy ()

+
PopplerCertificateInfo *
+poppler_certificate_info_copy (const PopplerCertificateInfo *certificate_info);
+

Copies certificate_info +, creating an identical PopplerCertificateInfo.

+
+

Parameters

+
+++++ + + + + + +

certificate_info

a PopplerCertificateInfo structure containing certificate information

 
+
+
+

Returns

+

a new PopplerCertificateInfo structure identical to certificate_info +.

+

[transfer full]

+
+

Since: 23.07.0

+
+
+
+

poppler_set_nss_dir ()

+
void
+poppler_set_nss_dir (const char *path);
+

Set NSS directory

+

Since: 23.07.0

+
+
+
+

poppler_get_nss_dir ()

+
char *
+poppler_get_nss_dir (void);
+

Get NSS directory

+
+

Returns

+

nss directroy.

+

[transfer full]

+
+

Since: 23.07.0

+
+
+
+

poppler_set_nss_password_callback ()

+
void
+poppler_set_nss_password_callback (PopplerNssPasswordFunc func);
+

A callback which asks for certificate password

+
+

Parameters

+
+++++ + + + + + +

func

a PopplerNssPasswordFunc that represents a signature annotation.

[scope call]
+
+

Since: 23.07.0

+
+
+
+

poppler_get_available_signing_certificates ()

+
GList *
+poppler_get_available_signing_certificates
+                               (void);
+

Get all available signing certificate information

+
+

Returns

+

all available signing certificate information.

+

[transfer full][element-type PopplerCertificateInfo]

+
+
+
+
+

poppler_certificate_info_free ()

+
void
+poppler_certificate_info_free (PopplerCertificateInfo *certificate_info);
+

Frees certificate_info +

+
+

Parameters

+
+++++ + + + + + +

certificate_info

a PopplerCertificateInfo structure containing certificate information

 
+
+

Since: 23.07.0

+
+
+
+

Types and Values

+
+

PopplerFormField

+
typedef struct _PopplerFormField PopplerFormField;
+
+
+
+

enum PopplerAdditionalActionType

+

Form field additional action types to be passed to poppler_form_field_get_additional_action +

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_ADDITIONAL_ACTION_FIELD_MODIFIED

 +

The action to be performed when the user modifies the field.

+		 

POPPLER_ADDITIONAL_ACTION_FORMAT_FIELD

 +

The action to be performed before the field is formatted to +display its value.

+		 

POPPLER_ADDITIONAL_ACTION_VALIDATE_FIELD

 +

The action to be performed when the field value changes.

+		 

POPPLER_ADDITIONAL_ACTION_CALCULATE_FIELD

 +

The action to be performed when the field needs to be +recalculated.

+		 
+
+

Since: 0.72

+
+
+
+

PopplerCertificateInfo

+
typedef struct _PopplerCertificateInfo PopplerCertificateInfo;
+

PopplerCertificateInfo contains detailed info about a signing certificate.

+

Since: 23.07.0

+
+
+
+

enum PopplerCertificateStatus

+

Signature certificate verification results

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_CERTIFICATE_TRUSTED

 +

certificate is considered trusted

+		 

POPPLER_CERTIFICATE_UNTRUSTED_ISSUER

 +

the issuer of this certificate has been marked as untrusted by the user

+		 

POPPLER_CERTIFICATE_UNKNOWN_ISSUER

 +

this certificate trust chain has not finished in a trusted root certificate

+		 

POPPLER_CERTIFICATE_REVOKED

 +

certificate was revoked by the issuing certificate authority

+		 

POPPLER_CERTIFICATE_EXPIRED

 +

signing time is outside the validity bounds of this certificate

+		 

POPPLER_CERTIFICATE_GENERIC_ERROR

 +

failed to verify certificate

+		 

POPPLER_CERTIFICATE_NOT_VERIFIED

 +

certificate not yet verified

+		 
+
+

Since: 21.12.0

+
+
+
+

enum PopplerFormFieldType

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_FORM_FIELD_UNKNOWN

  

POPPLER_FORM_FIELD_BUTTON

  

POPPLER_FORM_FIELD_TEXT

  

POPPLER_FORM_FIELD_CHOICE

  

POPPLER_FORM_FIELD_SIGNATURE

  
+
+
+
+
+

enum PopplerFormButtonType

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

POPPLER_FORM_BUTTON_PUSH

  

POPPLER_FORM_BUTTON_CHECK

  

POPPLER_FORM_BUTTON_RADIO

  
+
+
+
+
+

enum PopplerFormChoiceType

+
+

Members

+
+++++ + + + + + + + + + + + + +

POPPLER_FORM_CHOICE_COMBO

  

POPPLER_FORM_CHOICE_LIST

  
+
+
+
+
+

enum PopplerFormTextType

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

POPPLER_FORM_TEXT_NORMAL

  

POPPLER_FORM_TEXT_MULTILINE

  

POPPLER_FORM_TEXT_FILE_SELECT

  
+
+
+
+
+

PopplerSignatureInfo

+
typedef struct _PopplerSignatureInfo PopplerSignatureInfo;
+

PopplerSignatureInfo contains detailed info about a signature +contained in a form field.

+

Since: 21.12.0

+
+
+
+

enum PopplerSignatureStatus

+

Signature verification results

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_SIGNATURE_VALID

 +

signature is cryptographically valid

+		 

POPPLER_SIGNATURE_INVALID

 +

signature is cryptographically invalid

+		 

POPPLER_SIGNATURE_DIGEST_MISMATCH

 +

document content was changed after the signature was applied

+		 

POPPLER_SIGNATURE_DECODING_ERROR

 +

signature CMS/PKCS7 structure is malformed

+		 

POPPLER_SIGNATURE_GENERIC_ERROR

 +

failed to verify signature

+		 

POPPLER_SIGNATURE_NOT_FOUND

 +

requested signature is not present in the document

+		 

POPPLER_SIGNATURE_NOT_VERIFIED

 +

signature not yet verified

+		 
+
+

Since: 21.12.0

+
+
+
+

enum PopplerSignatureValidationFlags

+

Signature validation flags

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

POPPLER_SIGNATURE_VALIDATION_FLAG_VALIDATE_CERTIFICATE

 +

Whether to validate also the certificate of the signature

+		 

POPPLER_SIGNATURE_VALIDATION_FLAG_WITHOUT_OCSP_REVOCATION_CHECK

 +

Whether to not do OCSP (Online Certificate Status Protocol) revocation check

+		 

POPPLER_SIGNATURE_VALIDATION_FLAG_USE_AIA_CERTIFICATE_FETCH

 +

Whether to use AIA (Authority Information Access) extension for certificate fetching

+		 
+
+

Since: 21.12.0

+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/PopplerStructureElement.html b/poppler-24.05.0/glib/reference/html/PopplerStructureElement.html new file mode 100644 index 0000000000000000000000000000000000000000..3468e7cbbcabe9d390460a4fd33a985a29a12596 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/PopplerStructureElement.html @@ -0,0 +1,3525 @@ + + + + +PopplerStructureElement: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

PopplerStructureElement

+

PopplerStructureElement — Document structure element.

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+gchar * + +poppler_structure_element_get_abbreviation () +
+gchar * + +poppler_structure_element_get_actual_text () +
+gchar * + +poppler_structure_element_get_alt_text () +
+gboolean + +poppler_structure_element_get_background_color () +
+gdouble + +poppler_structure_element_get_baseline_shift () +
+PopplerStructureBlockAlign + +poppler_structure_element_get_block_align () +
+gboolean + +poppler_structure_element_get_border_color () +
+void + +poppler_structure_element_get_border_style () +
+gboolean + +poppler_structure_element_get_border_thickness () +
+gboolean + +poppler_structure_element_get_bounding_box () +
+gboolean + +poppler_structure_element_get_color () +
+guint + +poppler_structure_element_get_column_count () +
+gdouble * + +poppler_structure_element_get_column_gaps () +
+gdouble * + +poppler_structure_element_get_column_widths () +
+gdouble + +poppler_structure_element_get_end_indent () +
+gchar * + +poppler_structure_element_get_form_description () +
+PopplerStructureFormRole + +poppler_structure_element_get_form_role () +
+PopplerStructureFormState + +poppler_structure_element_get_form_state () +
+PopplerStructureGlyphOrientation + +poppler_structure_element_get_glyph_orientation () +
+gdouble + +poppler_structure_element_get_height () +
+gchar * + +poppler_structure_element_get_id () +
+PopplerStructureInlineAlign + +poppler_structure_element_get_inline_align () +
+PopplerStructureElementKind + +poppler_structure_element_get_kind () +
+gchar * + +poppler_structure_element_get_language () +
+gdouble + +poppler_structure_element_get_line_height () +
+PopplerStructureListNumbering + +poppler_structure_element_get_list_numbering () +
+void + +poppler_structure_element_get_padding () +
+gint + +poppler_structure_element_get_page () +
+PopplerStructurePlacement + +poppler_structure_element_get_placement () +
+PopplerStructureRubyAlign + +poppler_structure_element_get_ruby_align () +
+PopplerStructureRubyPosition + +poppler_structure_element_get_ruby_position () +
+gdouble + +poppler_structure_element_get_space_after () +
+gdouble + +poppler_structure_element_get_space_before () +
+gdouble + +poppler_structure_element_get_start_indent () +
+void + +poppler_structure_element_get_table_border_style () +
+guint + +poppler_structure_element_get_table_column_span () +
+gchar ** + +poppler_structure_element_get_table_headers () +
+void + +poppler_structure_element_get_table_padding () +
+guint + +poppler_structure_element_get_table_row_span () +
+PopplerStructureTableScope + +poppler_structure_element_get_table_scope () +
+gchar * + +poppler_structure_element_get_table_summary () +
+gchar * + +poppler_structure_element_get_text () +
+PopplerStructureTextAlign + +poppler_structure_element_get_text_align () +
+gboolean + +poppler_structure_element_get_text_decoration_color () +
+gdouble + +poppler_structure_element_get_text_decoration_thickness () +
+PopplerStructureTextDecoration + +poppler_structure_element_get_text_decoration_type () +
+gdouble + +poppler_structure_element_get_text_indent () +
+PopplerTextSpan ** + +poppler_structure_element_get_text_spans () +
+gchar * + +poppler_structure_element_get_title () +
+gdouble + +poppler_structure_element_get_width () +
+PopplerStructureWritingMode + +poppler_structure_element_get_writing_mode () +
+gboolean + +poppler_structure_element_is_block () +
+gboolean + +poppler_structure_element_is_content () +
+gboolean + +poppler_structure_element_is_grouping () +
+gboolean + +poppler_structure_element_is_inline () +
+PopplerStructureElementIter * + +poppler_structure_element_iter_copy () +
+void + +poppler_structure_element_iter_free () +
+PopplerStructureElementIter * + +poppler_structure_element_iter_get_child () +
+PopplerStructureElement * + +poppler_structure_element_iter_get_element () +
+PopplerStructureElementIter * + +poppler_structure_element_iter_new () +
+gboolean + +poppler_structure_element_iter_next () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
enumPopplerStructureBlockAlign
enumPopplerStructureBorderStyle
 PopplerStructureElement
 PopplerStructureElementIter
enumPopplerStructureElementKind
enumPopplerStructureFormRole
enumPopplerStructureFormState
enumPopplerStructureGetTextFlags
enumPopplerStructureGlyphOrientation
enumPopplerStructureInlineAlign
enumPopplerStructureListNumbering
enumPopplerStructurePlacement
enumPopplerStructureRubyAlign
enumPopplerStructureRubyPosition
enumPopplerStructureTableScope
enumPopplerStructureTextAlign
enumPopplerStructureTextDecoration
enumPopplerStructureWritingMode
+
+
+

Object Hierarchy

+
    GBoxed
+    ╰── PopplerStructureElementIter
+    GEnum
+    ├── PopplerStructureBlockAlign
+    ├── PopplerStructureBorderStyle
+    ├── PopplerStructureElementKind
+    ├── PopplerStructureFormRole
+    ├── PopplerStructureFormState
+    ├── PopplerStructureGlyphOrientation
+    ├── PopplerStructureInlineAlign
+    ├── PopplerStructureListNumbering
+    ├── PopplerStructurePlacement
+    ├── PopplerStructureRubyAlign
+    ├── PopplerStructureRubyPosition
+    ├── PopplerStructureTableScope
+    ├── PopplerStructureTextAlign
+    ├── PopplerStructureTextDecoration
+    ╰── PopplerStructureWritingMode
+    GFlags
+    ╰── PopplerStructureGetTextFlags
+    GObject
+    ╰── PopplerStructureElement
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+

Instances of PopplerStructureElement are used to describe the structure +of a PopplerDocument. To access the elements in the structure of the +document, use poppler_structure_element_iter_new() to obtain an iterator +for the top-level PopplerStructureElement, and then use the +PopplerStructureElementIter methods to traverse the structure tree.

+
+
+

Functions

+
+

poppler_structure_element_get_abbreviation ()

+
gchar *
+poppler_structure_element_get_abbreviation
+                               (PopplerStructureElement *poppler_structure_element);
+

Acronyms and abbreviations contained in elements of type +POPPLER_STRUCTURE_ELEMENT_SPAN may have an associated expanded +text form, which can be retrieved using this function.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

Text of the expanded abbreviation if the +element text is an abbreviation or acrony, NULL if not.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_actual_text ()

+
gchar *
+poppler_structure_element_get_actual_text
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the actual text enclosed by the element (and its child elements). +The actual text is mostly used for non-text elements like images and +figures which do have the graphical appearance of text, like +a logo. For those the actual text is the equivalent text to those +graphical elements which look like text when rendered.

+

Note that for elements containing proper text, the function +poppler_structure_element_get_text() must be used instead.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

The actual text for the element, or NULL +if not defined.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_alt_text ()

+
gchar *
+poppler_structure_element_get_alt_text
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the “alternate” text representation of the element (and its child +elements). This is mostly used for non-text elements like images and +figures, to specify a textual description of the element.

+

Note that for elements containing proper text, the function +poppler_structure_element_get_text() must be used instead.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

The alternate text representation for the +element, or NULL if not defined.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_background_color ()

+
gboolean
+poppler_structure_element_get_background_color
+                               (PopplerStructureElement *poppler_structure_element,
+                                PopplerColor *color);
+

Obtains the background color of the element. If this attribute is +not specified, the element shall be treated as if it were transparent.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

color

A PopplerColor.

[out]
+
+
+

Returns

+

TRUE if a color is defined for the element, +FALSE otherwise.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_baseline_shift ()

+
gdouble
+poppler_structure_element_get_baseline_shift
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains how much the text contained in the inline-level structure element should be shifted, +measuring from the baseline of the glyphs.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A numeric value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_block_align ()

+
PopplerStructureBlockAlign
+poppler_structure_element_get_block_align
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the block-alignment mode of the block-level structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureBlockAlign value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_border_color ()

+
gboolean
+poppler_structure_element_get_border_color
+                               (PopplerStructureElement *poppler_structure_element,
+                                PopplerColor *colors);
+

Obtains the color of border around the element. The result values +are in before-after-start-end ordering (for the typical Western +left-to-right writing, that is top-bottom-left-right). +If this attribute is not specified, the border color for this element shall +be the current text fill color in effect at the start of its associated +content.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

colors

An array +of four PopplerColor.

[out][array fixed-size=4][element-type PopplerColor]
+
+
+

Returns

+

TRUE if a color is defined for the element, +FALSE otherwise.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_border_style ()

+
void
+poppler_structure_element_get_border_style
+                               (PopplerStructureElement *poppler_structure_element,
+                                PopplerStructureBorderStyle *border_styles);
+

Obtains the border style of a structure element. The result values +are in before-after-start-end ordering. For example, using Western +left-to-right writing, that is top-bottom-left-right.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

border_styles

An array of four PopplerStructureBorderStyle elements.

[out][array fixed-size=4][element-type PopplerStructureBorderStyle]
+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_border_thickness ()

+
gboolean
+poppler_structure_element_get_border_thickness
+                               (PopplerStructureElement *poppler_structure_element,
+                                gdouble *border_thicknesses);
+

Obtains the thickness of the border of an element. The result values +are in before-after-start-end ordering (for the typical Western +left-to-right writing, that is top-bottom-left-right). +A value of 0 indicates that the border shall not be drawn.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

border_thicknesses

Array with the four values of border thicknesses.

[out][array fixed-size=4][element-type gdouble]
+
+
+

Returns

+

TRUE if the border thickness attribute is defined for +the element, FALSE otherwise.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_bounding_box ()

+
gboolean
+poppler_structure_element_get_bounding_box
+                               (PopplerStructureElement *poppler_structure_element,
+                                PopplerRectangle *bounding_box);
+

Obtains the size of the bounding box of a block-level structure element.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

bounding_box

A PopplerRectangle.

[out]
+
+
+

Returns

+

TRUE if a bounding box is defined for the element, +FALSE otherwise.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_color ()

+
gboolean
+poppler_structure_element_get_color (PopplerStructureElement *poppler_structure_element,
+                                     PopplerColor *color);
+

Obtains the color of the content contained in the element. +If this attribute is not specified, the color for this element shall +be the current text fill color in effect at the start of its associated content.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

color

A PopplerColor.

[out]
+
+
+

Returns

+

TRUE if a color is defined for the element, +FALSE otherwise.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_column_count ()

+
guint
+poppler_structure_element_get_column_count
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the number of columns used to lay out the content contained +in the grouping element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

Number of columns.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_column_gaps ()

+
gdouble *
+poppler_structure_element_get_column_gaps
+                               (PopplerStructureElement *poppler_structure_element,
+                                guint *n_values);
+

Obtains the size of the gaps in between adjacent columns. Returns an +array of elements: the first one is the size of the gap in between +columns 1 and 2, second is the size between columns 2 and 3, and so on.

+

For elements which use a single column, NULL is returned and n_values + +is set to zero.

+

If the attribute is undefined, NULL is returned and n_values + is set +to a non-zero value.

+

The array with the results is allocated by the function. When it is +not needed anymore, be sure to call g_free() on it.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

n_values

Size of the returned array.

[out]
+
+
+

Returns

+

Array containing the values for the column gaps, or NULL if the +array is empty or the attribute is not defined.

+

[transfer full][array length=n_values][element-type gdouble]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_column_widths ()

+
gdouble *
+poppler_structure_element_get_column_widths
+                               (PopplerStructureElement *poppler_structure_element,
+                                guint *n_values);
+

Obtains an array with the widths of the columns.

+

The array with the results is allocated by the function. When it is +not needed anymore, be sure to call g_free() on it.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

n_values

Size of the returned array.

[out]
+
+
+

Returns

+

Array containing widths of the columns, or NULL if the attribute +is not defined.

+

[transfer full][array length=n_values][element-type gdouble]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_end_indent ()

+
gdouble
+poppler_structure_element_get_end_indent
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the amount of indentation at the end of the block-level structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A numeric value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_form_description ()

+
gchar *
+poppler_structure_element_get_form_description
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the textual description of the form element. Note that the +description is for informative purposes, and it is not intended +to be rendered. For example, assistive technologies may use the +description field to provide an alternate way of presenting an +element to the user.

+

The returned string is allocated by the function. When it is +not needed anymore, be sure to call g_free() on it.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A string, or NULL if the attribute +is not defined.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_form_role ()

+
PopplerStructureFormRole
+poppler_structure_element_get_form_role
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the role of a form structure element that is part of a form, or is +a form field. This hints how the control for the element is intended +to be rendered.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureFormRole value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_form_state ()

+
PopplerStructureFormState
+poppler_structure_element_get_form_state
+                               (PopplerStructureElement *poppler_structure_element);
+

For a structure element that is a form field, obtains in which state +the associated control is expected to be rendered.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureFormState value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_glyph_orientation ()

+
PopplerStructureGlyphOrientation
+poppler_structure_element_get_glyph_orientation
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the glyph orientation for the text contained in a +inline-level structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureGlyphOrientation value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_height ()

+
gdouble
+poppler_structure_element_get_height (PopplerStructureElement *poppler_structure_element);
+

Obtains the height of the block-level structure element. Note that for elements which do +not specify a height, it has to be calculated, and in this case -1 is returned.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A positive value if a width is defined, or -1 +if the height is to be calculated automatically.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_id ()

+
gchar *
+poppler_structure_element_get_id (PopplerStructureElement *poppler_structure_element);
+

Obtains the identifier of an element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

The identifier of the element (if +defined), or NULL.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_inline_align ()

+
PopplerStructureInlineAlign
+poppler_structure_element_get_inline_align
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the inline-alignment mode of the block-level structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureInlineAlign value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_kind ()

+
PopplerStructureElementKind
+poppler_structure_element_get_kind (PopplerStructureElement *poppler_structure_element);
+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureElementKind value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_language ()

+
gchar *
+poppler_structure_element_get_language
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the language and country code for the content in an element, +in two-letter ISO format, e.g. en_ES, or NULL if not +defined.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

language and country code, or NULL.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_line_height ()

+
gdouble
+poppler_structure_element_get_line_height
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the line height for the text contained in the inline-level structure element. +Note that for elements which do not specify a line height, it has to be calculated, +and in this case -1 is returned.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A positive value if a line height is defined, or -1 +if the height is to be calculated automatically.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_list_numbering ()

+
PopplerStructureListNumbering
+poppler_structure_element_get_list_numbering
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the list numbering style for list items.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureListNumbering value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_padding ()

+
void
+poppler_structure_element_get_padding (PopplerStructureElement *poppler_structure_element,
+                                       gdouble *paddings);
+

Obtains the padding of an element (space around it). The result +values are in before-after-start-end ordering. For example using +Western left-to-right writing, that is top-bottom-left-right.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

paddings

Padding for the four sides of the element.

[out][array fixed-size=4][element-type gdouble]
+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_page ()

+
gint
+poppler_structure_element_get_page (PopplerStructureElement *poppler_structure_element);
+

Obtains the page number in which the element is contained.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

Number of the page that contains the element, of

+-1 if not defined. +
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_placement ()

+
PopplerStructurePlacement
+poppler_structure_element_get_placement
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the placement type of the structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructurePlacement value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_ruby_align ()

+
PopplerStructureRubyAlign
+poppler_structure_element_get_ruby_align
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the alignment for the ruby text contained in a +inline-level structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureRubyAlign value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_ruby_position ()

+
PopplerStructureRubyPosition
+poppler_structure_element_get_ruby_position
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the position for the ruby text contained in a +inline-level structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureRubyPosition value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_space_after ()

+
gdouble
+poppler_structure_element_get_space_after
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the amount of empty space after the block-level structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A positive value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_space_before ()

+
gdouble
+poppler_structure_element_get_space_before
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the amount of empty space before the block-level structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A positive value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_start_indent ()

+
gdouble
+poppler_structure_element_get_start_indent
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the amount of indentation at the beginning of the block-level structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A numeric value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_table_border_style ()

+
void
+poppler_structure_element_get_table_border_style
+                               (PopplerStructureElement *poppler_structure_element,
+                                PopplerStructureBorderStyle *border_styles);
+

Obtains the table cell border style of a block-level structure element. The result values +are in before-after-start-end ordering. For example, using Western +left-to-right writing, that is top-bottom-left-right.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

border_styles

An array of four PopplerStructureBorderStyle elements.

[out][array fixed-size=4][element-type PopplerStructureBorderStyle]
+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_table_column_span ()

+
guint
+poppler_structure_element_get_table_column_span
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the number of columns the table element spans to.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A positive, non-zero value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_table_headers ()

+
gchar **
+poppler_structure_element_get_table_headers
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains an array with the names of the table column headers. This is only +useful for table header row elements.

+

The array with the results is allocated by the function. The number +of items in the returned array can be obtained with g_strv_length(). +The returned value must be freed using g_strfreev().

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

Zero-terminated array of strings with the table header names, +or NULL if the attribute is not defined.

+

[transfer full][array zero-terminated=1][element-type gchar*]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_table_padding ()

+
void
+poppler_structure_element_get_table_padding
+                               (PopplerStructureElement *poppler_structure_element,
+                                gdouble *paddings);
+

Obtains the padding between the table cell’s content rectangle and the +surrounding border of a block-level structure element. The result +values are in before-after-start-end ordering (for the typical +Western left-to-right writing, that is top-bottom-left-right).

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

paddings

Padding for the four sides of the element.

[out][array fixed-size=4][element-type gdouble]
+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_table_row_span ()

+
guint
+poppler_structure_element_get_table_row_span
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the number of rows the table element spans to.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A positive, non-zero value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_table_scope ()

+
PopplerStructureTableScope
+poppler_structure_element_get_table_scope
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the scope of a table structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureTableScope value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_table_summary ()

+
gchar *
+poppler_structure_element_get_table_summary
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the textual summary of the contents of the table element. Note that +the summary is meant for informative purposes, and it is not intended +to be rendered. For example, assistive technologies may use the +description field to provide an alternate way of presenting an element +to the user, or a document indexer may want to scan it for additional +keywords.

+

The returned string is allocated by the function. When it is +not needed anymore, be sure to call g_free() on it.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A string, or NULL if the attribute +is not defined.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_text ()

+
gchar *
+poppler_structure_element_get_text (PopplerStructureElement *poppler_structure_element,
+                                    PopplerStructureGetTextFlags flags);
+

Obtains the text enclosed by an element, or the text enclosed by the +elements in the subtree (including the element itself).

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

flags

A PopplerStructureGetTextFlags value, or +POPPLER_STRUCTURE_GET_TEXT_NONE to disable all the flags.

 
+
+
+

Returns

+

A string.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_text_align ()

+
PopplerStructureTextAlign
+poppler_structure_element_get_text_align
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the text alignment mode of the text contained into a +block-level structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureTextAlign value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_text_decoration_color ()

+
gboolean
+poppler_structure_element_get_text_decoration_color
+                               (PopplerStructureElement *poppler_structure_element,
+                                PopplerColor *color);
+

Obtains the color of the text decoration for the text contained +in the inline-level structure element. +If this attribute is not specified, the color for this element shall be the current fill +color in effect at the start of its associated content.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

color

A PopplerColor.

[out]
+
+
+

Returns

+

TRUE if a color is defined for the element, +FALSE otherwise.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_text_decoration_thickness ()

+
gdouble
+poppler_structure_element_get_text_decoration_thickness
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the thickness of the text decoration for the text contained +in the inline-level structure element. +If this attribute is not specified, it shall be derived from the current +stroke thickness in effect at the start of the element’s associated content.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

Thickness of the text decoration, or NAN if not defined.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_text_decoration_type ()

+
PopplerStructureTextDecoration
+poppler_structure_element_get_text_decoration_type
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the text decoration type of the text contained in the +inline-level structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureTextDecoration value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_text_indent ()

+
gdouble
+poppler_structure_element_get_text_indent
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the amount of indentation of the text contained in the block-level structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A numeric value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_text_spans ()

+
PopplerTextSpan **
+poppler_structure_element_get_text_spans
+                               (PopplerStructureElement *poppler_structure_element,
+                                guint *n_text_spans);
+

Obtains the text enclosed by an element, as an array of PopplerTextSpan +structures. Each item in the list is a piece of text which share the same +attributes, plus its attributes. The following example shows how to +obtain and free the text spans of an element:

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
guint i, n_spans;
+PopplerTextSpan **text_spans =
+   poppler_structure_element_get_text_spans (element, &n_spans);
+/* Use the text spans */
+for (i = 0; i < n_spans; i++)
+   poppler_text_span_free (text_spans[i]);
+g_free (text_spans);
+
+ +
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_structure_element

A PopplerStructureElement

 

n_text_spans

A pointer to the location where the number of elements in +the returned array will be stored.

[out]
+
+
+

Returns

+

An array of PopplerTextSpan elements.

+

[transfer full][array length=n_text_spans][element-type PopplerTextSpan]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_title ()

+
gchar *
+poppler_structure_element_get_title (PopplerStructureElement *poppler_structure_element);
+

Obtains the title of an element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

The title of the element, or NULL.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_width ()

+
gdouble
+poppler_structure_element_get_width (PopplerStructureElement *poppler_structure_element);
+

Obtains the width of the block-level structure element. Note that for elements which do +not specify a width, it has to be calculated, and in this case -1 is returned.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A positive value if a width is defined, or -1 +if the width is to be calculated automatically.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_get_writing_mode ()

+
PopplerStructureWritingMode
+poppler_structure_element_get_writing_mode
+                               (PopplerStructureElement *poppler_structure_element);
+

Obtains the writing mode (writing direction) of the content associated +with a structure element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

A PopplerStructureWritingMode value.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_is_block ()

+
gboolean
+poppler_structure_element_is_block (PopplerStructureElement *poppler_structure_element);
+

Checks whether an element is a block element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

TRUE if the element is a block element, or FALSE otherwise.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_is_content ()

+
gboolean
+poppler_structure_element_is_content (PopplerStructureElement *poppler_structure_element);
+

Checks whether an element is actual document content.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

TRUE if the element is content, or FALSE otherwise.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_is_grouping ()

+
gboolean
+poppler_structure_element_is_grouping (PopplerStructureElement *poppler_structure_element);
+

Checks whether an element is a grouping element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

TRUE if the element is a grouping element, FALSE +otherwise.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_is_inline ()

+
gboolean
+poppler_structure_element_is_inline (PopplerStructureElement *poppler_structure_element);
+

Checks whether an element is an inline element.

+
+

Parameters

+
+++++ + + + + + +

poppler_structure_element

A PopplerStructureElement

 
+
+
+

Returns

+

TRUE if the element is an inline element, or FALSE otherwise.

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_iter_copy ()

+
PopplerStructureElementIter *
+poppler_structure_element_iter_copy (PopplerStructureElementIter *iter);
+

Creates a new PopplerStructureElementIter as a copy of iter +. The +returned value must be freed with poppler_structure_element_iter_free().

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerStructureElementIter

 
+
+
+

Returns

+

a new PopplerStructureElementIter.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_iter_free ()

+
void
+poppler_structure_element_iter_free (PopplerStructureElementIter *iter);
+

Frees iter +.

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerStructureElementIter

 
+
+

Since: 0.26

+
+
+
+

poppler_structure_element_iter_get_child ()

+
PopplerStructureElementIter *
+poppler_structure_element_iter_get_child
+                               (PopplerStructureElementIter *parent);
+

Returns a new iterator to the children elements of the +PopplerStructureElement associated with iter +. The returned value must +be freed with poppler_structure_element_iter_free().

+
+

Parameters

+
+++++ + + + + + +

parent

a PopplerStructureElementIter

 
+
+
+

Returns

+

a new PopplerStructureElementIter

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_iter_get_element ()

+
PopplerStructureElement *
+poppler_structure_element_iter_get_element
+                               (PopplerStructureElementIter *iter);
+

Returns the PopplerStructureElementIter associated with iter +.

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerStructureElementIter

 
+
+
+

Returns

+

a new PopplerStructureElementIter.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_iter_new ()

+
PopplerStructureElementIter *
+poppler_structure_element_iter_new (PopplerDocument *poppler_document);
+

Returns the root PopplerStructureElementIter for document +, or NULL. The +returned value must be freed with poppler_structure_element_iter_free().

+

Documents may have an associated structure tree —mostly, Tagged-PDF +compliant documents— which can be used to obtain information about +the document structure and its contents. Each node in the tree contains +a PopplerStructureElement.

+

Here is a simple example that walks the whole tree:

+
+ + + + + + + + 
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
static void
+walk_structure (PopplerStructureElementIter *iter)
+{
+  do {
+    /* Get the element and do something with it */
+    PopplerStructureElementIter *child = poppler_structure_element_iter_get_child (iter);
+    if (child)
+      walk_structure (child);
+    poppler_structure_element_iter_free (child);
+  } while (poppler_structure_element_iter_next (iter));
+}
+...
+{
+  iter = poppler_structure_element_iter_new (document);
+  walk_structure (iter);
+  poppler_structure_element_iter_free (iter);
+}
+
+ +
+

Parameters

+
+++++ + + + + + +

poppler_document

a PopplerDocument.

 
+
+
+

Returns

+

a new PopplerStructureElementIter, or NULL if document +doesn't have structure tree.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_structure_element_iter_next ()

+
gboolean
+poppler_structure_element_iter_next (PopplerStructureElementIter *iter);
+

Sets iter + to point to the next structure element at the current level +of the tree, if valid. See poppler_structure_element_iter_new() for more +information.

+
+

Parameters

+
+++++ + + + + + +

iter

a PopplerStructureElementIter

 
+
+
+

Returns

+

TRUE, if iter +was set to the next structure element

+
+

Since: 0.26

+
+
+
+

Types and Values

+
+

enum PopplerStructureBlockAlign

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_BLOCK_ALIGN_BEFORE

  

POPPLER_STRUCTURE_BLOCK_ALIGN_MIDDLE

  

POPPLER_STRUCTURE_BLOCK_ALIGN_AFTER

  

POPPLER_STRUCTURE_BLOCK_ALIGN_JUSTIFY

  
+
+
+
+
+

enum PopplerStructureBorderStyle

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_BORDER_STYLE_NONE

  

POPPLER_STRUCTURE_BORDER_STYLE_HIDDEN

  

POPPLER_STRUCTURE_BORDER_STYLE_DOTTED

  

POPPLER_STRUCTURE_BORDER_STYLE_DASHED

  

POPPLER_STRUCTURE_BORDER_STYLE_SOLID

  

POPPLER_STRUCTURE_BORDER_STYLE_DOUBLE

  

POPPLER_STRUCTURE_BORDER_STYLE_GROOVE

  

POPPLER_STRUCTURE_BORDER_STYLE_INSET

  

POPPLER_STRUCTURE_BORDER_STYLE_OUTSET

  
+
+
+
+
+

PopplerStructureElement

+
typedef struct _PopplerStructureElement PopplerStructureElement;
+
+
+
+

PopplerStructureElementIter

+
typedef struct _PopplerStructureElementIter PopplerStructureElementIter;
+
+
+
+

enum PopplerStructureElementKind

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_ELEMENT_CONTENT

  

POPPLER_STRUCTURE_ELEMENT_OBJECT_REFERENCE

  

POPPLER_STRUCTURE_ELEMENT_DOCUMENT

  

POPPLER_STRUCTURE_ELEMENT_PART

  

POPPLER_STRUCTURE_ELEMENT_ARTICLE

  

POPPLER_STRUCTURE_ELEMENT_SECTION

  

POPPLER_STRUCTURE_ELEMENT_DIV

  

POPPLER_STRUCTURE_ELEMENT_SPAN

  

POPPLER_STRUCTURE_ELEMENT_QUOTE

  

POPPLER_STRUCTURE_ELEMENT_NOTE

  

POPPLER_STRUCTURE_ELEMENT_REFERENCE

  

POPPLER_STRUCTURE_ELEMENT_BIBENTRY

  

POPPLER_STRUCTURE_ELEMENT_CODE

  

POPPLER_STRUCTURE_ELEMENT_LINK

  

POPPLER_STRUCTURE_ELEMENT_ANNOT

  

POPPLER_STRUCTURE_ELEMENT_BLOCKQUOTE

  

POPPLER_STRUCTURE_ELEMENT_CAPTION

  

POPPLER_STRUCTURE_ELEMENT_NONSTRUCT

  

POPPLER_STRUCTURE_ELEMENT_TOC

  

POPPLER_STRUCTURE_ELEMENT_TOC_ITEM

  

POPPLER_STRUCTURE_ELEMENT_INDEX

  

POPPLER_STRUCTURE_ELEMENT_PRIVATE

  

POPPLER_STRUCTURE_ELEMENT_PARAGRAPH

  

POPPLER_STRUCTURE_ELEMENT_HEADING

  

POPPLER_STRUCTURE_ELEMENT_HEADING_1

  

POPPLER_STRUCTURE_ELEMENT_HEADING_2

  

POPPLER_STRUCTURE_ELEMENT_HEADING_3

  

POPPLER_STRUCTURE_ELEMENT_HEADING_4

  

POPPLER_STRUCTURE_ELEMENT_HEADING_5

  

POPPLER_STRUCTURE_ELEMENT_HEADING_6

  

POPPLER_STRUCTURE_ELEMENT_LIST

  

POPPLER_STRUCTURE_ELEMENT_LIST_ITEM

  

POPPLER_STRUCTURE_ELEMENT_LIST_LABEL

  

POPPLER_STRUCTURE_ELEMENT_LIST_BODY

  

POPPLER_STRUCTURE_ELEMENT_TABLE

  

POPPLER_STRUCTURE_ELEMENT_TABLE_ROW

  

POPPLER_STRUCTURE_ELEMENT_TABLE_HEADING

  

POPPLER_STRUCTURE_ELEMENT_TABLE_DATA

  

POPPLER_STRUCTURE_ELEMENT_TABLE_HEADER

  

POPPLER_STRUCTURE_ELEMENT_TABLE_FOOTER

  

POPPLER_STRUCTURE_ELEMENT_TABLE_BODY

  

POPPLER_STRUCTURE_ELEMENT_RUBY

  

POPPLER_STRUCTURE_ELEMENT_RUBY_BASE_TEXT

  

POPPLER_STRUCTURE_ELEMENT_RUBY_ANNOT_TEXT

  

POPPLER_STRUCTURE_ELEMENT_RUBY_PUNCTUATION

  

POPPLER_STRUCTURE_ELEMENT_WARICHU

  

POPPLER_STRUCTURE_ELEMENT_WARICHU_TEXT

  

POPPLER_STRUCTURE_ELEMENT_WARICHU_PUNCTUATION

  

POPPLER_STRUCTURE_ELEMENT_FIGURE

  

POPPLER_STRUCTURE_ELEMENT_FORMULA

  

POPPLER_STRUCTURE_ELEMENT_FORM

  
+
+
+
+
+

enum PopplerStructureFormRole

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_FORM_ROLE_UNDEFINED

  

POPPLER_STRUCTURE_FORM_ROLE_RADIO_BUTTON

  

POPPLER_STRUCTURE_FORM_ROLE_PUSH_BUTTON

  

POPPLER_STRUCTURE_FORM_ROLE_TEXT_VALUE

  

POPPLER_STRUCTURE_FORM_ROLE_CHECKBOX

  
+
+
+
+
+

enum PopplerStructureFormState

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_FORM_STATE_ON

  

POPPLER_STRUCTURE_FORM_STATE_OFF

  

POPPLER_STRUCTURE_FORM_STATE_NEUTRAL

  
+
+
+
+
+

enum PopplerStructureGetTextFlags

+
+

Members

+
+++++ + + + + + + + + + + + + +

POPPLER_STRUCTURE_GET_TEXT_NONE

 +

No flags.

+		 

POPPLER_STRUCTURE_GET_TEXT_RECURSIVE

 +

For non-leaf, non-content +elements, recursively obtain the text from all the elements +enclosed in the subtree.

+		 
+
+
+
+
+

enum PopplerStructureGlyphOrientation

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_GLYPH_ORIENTATION_AUTO

  

POPPLER_STRUCTURE_GLYPH_ORIENTATION_0

  

POPPLER_STRUCTURE_GLYPH_ORIENTATION_90

  

POPPLER_STRUCTURE_GLYPH_ORIENTATION_180

  

POPPLER_STRUCTURE_GLYPH_ORIENTATION_270

  
+
+
+
+
+

enum PopplerStructureInlineAlign

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_INLINE_ALIGN_START

  

POPPLER_STRUCTURE_INLINE_ALIGN_CENTER

  

POPPLER_STRUCTURE_INLINE_ALIGN_END

  
+
+
+
+
+

enum PopplerStructureListNumbering

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_LIST_NUMBERING_NONE

  

POPPLER_STRUCTURE_LIST_NUMBERING_DISC

  

POPPLER_STRUCTURE_LIST_NUMBERING_CIRCLE

  

POPPLER_STRUCTURE_LIST_NUMBERING_SQUARE

  

POPPLER_STRUCTURE_LIST_NUMBERING_DECIMAL

  

POPPLER_STRUCTURE_LIST_NUMBERING_UPPER_ROMAN

  

POPPLER_STRUCTURE_LIST_NUMBERING_LOWER_ROMAN

  

POPPLER_STRUCTURE_LIST_NUMBERING_UPPER_ALPHA

  

POPPLER_STRUCTURE_LIST_NUMBERING_LOWER_ALPHA

  
+
+
+
+
+

enum PopplerStructurePlacement

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_PLACEMENT_BLOCK

  

POPPLER_STRUCTURE_PLACEMENT_INLINE

  

POPPLER_STRUCTURE_PLACEMENT_BEFORE

  

POPPLER_STRUCTURE_PLACEMENT_START

  

POPPLER_STRUCTURE_PLACEMENT_END

  
+
+
+
+
+

enum PopplerStructureRubyAlign

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_RUBY_ALIGN_START

  

POPPLER_STRUCTURE_RUBY_ALIGN_CENTER

  

POPPLER_STRUCTURE_RUBY_ALIGN_END

  

POPPLER_STRUCTURE_RUBY_ALIGN_JUSTIFY

  

POPPLER_STRUCTURE_RUBY_ALIGN_DISTRIBUTE

  
+
+
+
+
+

enum PopplerStructureRubyPosition

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_RUBY_POSITION_BEFORE

  

POPPLER_STRUCTURE_RUBY_POSITION_AFTER

  

POPPLER_STRUCTURE_RUBY_POSITION_WARICHU

  

POPPLER_STRUCTURE_RUBY_POSITION_INLINE

  
+
+
+
+
+

enum PopplerStructureTableScope

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_TABLE_SCOPE_ROW

  

POPPLER_STRUCTURE_TABLE_SCOPE_COLUMN

  

POPPLER_STRUCTURE_TABLE_SCOPE_BOTH

  
+
+
+
+
+

enum PopplerStructureTextAlign

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_TEXT_ALIGN_START

  

POPPLER_STRUCTURE_TEXT_ALIGN_CENTER

  

POPPLER_STRUCTURE_TEXT_ALIGN_END

  

POPPLER_STRUCTURE_TEXT_ALIGN_JUSTIFY

  
+
+
+
+
+

enum PopplerStructureTextDecoration

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_TEXT_DECORATION_NONE

  

POPPLER_STRUCTURE_TEXT_DECORATION_UNDERLINE

  

POPPLER_STRUCTURE_TEXT_DECORATION_OVERLINE

  

POPPLER_STRUCTURE_TEXT_DECORATION_LINETHROUGH

  
+
+
+
+
+

enum PopplerStructureWritingMode

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

POPPLER_STRUCTURE_WRITING_MODE_LR_TB

  

POPPLER_STRUCTURE_WRITING_MODE_RL_TB

  

POPPLER_STRUCTURE_WRITING_MODE_TB_RL

  
+
+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/annotation-glossary.html b/poppler-24.05.0/glib/reference/html/annotation-glossary.html new file mode 100644 index 0000000000000000000000000000000000000000..3079684237bca5b1c022096acea8133edd41e3e0 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/annotation-glossary.html @@ -0,0 +1,69 @@ + + + + +Annotation Glossary: Poppler Reference Manual + + + + + + + + + + + + + + + +
+

+Annotation Glossary

+

A

+
allow-none
+

NULL is OK, both for passing and for returning.

+
array
+

Parameter points to an array of items.

+

C

+
closure
+

This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.

+

E

+
element-type
+

Generics and defining elements of containers and arrays.

+

N

+
nullable
+

NULL may be passed as the value in, out, in-out; or as a return value.

+

O

+
out
+

Parameter for returning results. Default is transfer full.

+

S

+
scope async
+

The callback is valid until first called.

+
scope call
+

The callback is valid only during the call to the method.

+

T

+
transfer container
+

The caller owns the data container, but not the data inside it.

+
transfer full
+

The caller owns the data, and is responsible for free it.

+
transfer none
+

The data is owned by the callee, which is responsible of freeing it.

+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-12.html b/poppler-24.05.0/glib/reference/html/api-index-0-12.html new file mode 100644 index 0000000000000000000000000000000000000000..5fe203cf0d38cf7c4694580a667e5cdb73cbd957 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-12.html @@ -0,0 +1,122 @@ + + + + +Index of new symbols in 0.12: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.12

+

A

+
+poppler_annot_markup_get_popup_rectangle, function in Poppler Annotation +
+
+
+poppler_annot_markup_has_popup, function in Poppler Annotation +
+
+
+poppler_annot_set_contents, function in Poppler Annotation +
+
+

C

+
+POPPLER_CHECK_VERSION, macro in Poppler Features +
+
+

D

+
+poppler_date_parse, function in PDF Utility functions +
+
+

L

+
+poppler_layers_iter_free, function in PopplerDocument +
+
+
+poppler_layers_iter_get_child, function in PopplerDocument +
+
+
+poppler_layers_iter_get_layer, function in PopplerDocument +
+
+
+poppler_layers_iter_get_title, function in PopplerDocument +
+
+
+poppler_layers_iter_new, function in PopplerDocument +
+
+
+poppler_layers_iter_next, function in PopplerDocument +
+
+
+poppler_layer_get_radio_button_group_id, function in Poppler Layer +
+
+
+poppler_layer_get_title, function in Poppler Layer +
+
+
+poppler_layer_hide, function in Poppler Layer +
+
+
+poppler_layer_is_parent, function in Poppler Layer +
+
+
+poppler_layer_is_visible, function in Poppler Layer +
+
+
+poppler_layer_show, function in Poppler Layer +
+
+

M

+
+POPPLER_MAJOR_VERSION, macro in Poppler Features +
+
+
+POPPLER_MICRO_VERSION, macro in Poppler Features +
+
+
+POPPLER_MINOR_VERSION, macro in Poppler Features +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-14.html b/poppler-24.05.0/glib/reference/html/api-index-0-14.html new file mode 100644 index 0000000000000000000000000000000000000000..fab89ab56507f5c4a471e59b0eb4ddb71a9868d2 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-14.html @@ -0,0 +1,113 @@ + + + + +Index of new symbols in 0.14: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.14

+

A

+
+PopplerActionLayerAction, enum in PopplerAction +
+
+
+PopplerActionMovie, struct in PopplerAction +
+
+
+PopplerActionMovieOperation, enum in PopplerAction +
+
+
+PopplerActionOCGState, struct in PopplerAction +
+
+
+PopplerActionRendition, struct in PopplerAction +
+
+
+poppler_annot_file_attachment_get_attachment, function in Poppler Annotation +
+
+
+poppler_annot_file_attachment_get_name, function in Poppler Annotation +
+
+
+poppler_annot_get_page_index, function in Poppler Annotation +
+
+
+poppler_annot_movie_get_movie, function in Poppler Annotation +
+
+
+poppler_annot_movie_get_title, function in Poppler Annotation +
+
+
+poppler_annot_screen_get_action, function in Poppler Annotation +
+
+

M

+
+PopplerMediaSaveFunc, user_function in Poppler Media +
+
+
+poppler_media_get_filename, function in Poppler Media +
+
+
+poppler_media_get_mime_type, function in Poppler Media +
+
+
+poppler_media_is_embedded, function in Poppler Media +
+
+
+poppler_media_save, function in Poppler Media +
+
+
+poppler_media_save_to_callback, function in Poppler Media +
+
+
+poppler_movie_get_filename, function in Poppler Movie +
+
+
+poppler_movie_need_poster, function in Poppler Movie +
+
+
+poppler_movie_show_controls, function in Poppler Movie +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-16.html b/poppler-24.05.0/glib/reference/html/api-index-0-16.html new file mode 100644 index 0000000000000000000000000000000000000000..2e9d0fb73cefea2e76788813af4baa8b7bf25f64 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-16.html @@ -0,0 +1,179 @@ + + + + +Index of new symbols in 0.16: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.16

+

A

+
+poppler_annot_markup_set_label, function in Poppler Annotation +
+
+
+poppler_annot_markup_set_opacity, function in Poppler Annotation +
+
+
+poppler_annot_markup_set_popup, function in Poppler Annotation +
+
+
+poppler_annot_markup_set_popup_is_open, function in Poppler Annotation +
+
+
+poppler_annot_set_color, function in Poppler Annotation +
+
+
+poppler_annot_text_new, function in Poppler Annotation +
+
+
+poppler_annot_text_set_icon, function in Poppler Annotation +
+
+
+poppler_annot_text_set_is_open, function in Poppler Annotation +
+
+

D

+
+poppler_document_get_author, function in PopplerDocument +
+
+
+poppler_document_get_creation_date, function in PopplerDocument +
+
+
+poppler_document_get_creator, function in PopplerDocument +
+
+
+poppler_document_get_id, function in PopplerDocument +
+
+
+poppler_document_get_keywords, function in PopplerDocument +
+
+
+poppler_document_get_metadata, function in PopplerDocument +
+
+
+poppler_document_get_modification_date, function in PopplerDocument +
+
+
+poppler_document_get_page_layout, function in PopplerDocument +
+
+
+poppler_document_get_page_mode, function in PopplerDocument +
+
+
+poppler_document_get_pdf_version, function in PopplerDocument +
+
+
+poppler_document_get_pdf_version_string, function in PopplerDocument +
+
+
+poppler_document_get_permissions, function in PopplerDocument +
+
+
+poppler_document_get_producer, function in PopplerDocument +
+
+
+poppler_document_get_subject, function in PopplerDocument +
+
+
+poppler_document_get_title, function in PopplerDocument +
+
+
+poppler_document_is_linearized, function in PopplerDocument +
+
+

F

+
+poppler_form_field_get_mapping_name, function in PopplerFormField +
+
+
+poppler_form_field_get_name, function in PopplerFormField +
+
+
+poppler_form_field_get_partial_name, function in PopplerFormField +
+
+

P

+
+poppler_page_add_annot, function in Poppler Page +
+
+
+poppler_page_get_label, function in Poppler Page +
+
+
+poppler_page_get_selected_region, function in Poppler Page +
+
+
+poppler_page_get_selected_text, function in Poppler Page +
+
+
+poppler_page_get_text, function in Poppler Page +
+
+
+poppler_page_get_text_layout, function in Poppler Page +
+
+
+poppler_page_render_for_printing_with_options, function in Poppler Page +
+
+
+PopplerPrintFlags, enum in Poppler Page +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-18.html b/poppler-24.05.0/glib/reference/html/api-index-0-18.html new file mode 100644 index 0000000000000000000000000000000000000000..360577e45c3e5576c5f75a576a5cc25e47b1c90a --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-18.html @@ -0,0 +1,78 @@ + + + + +Index of new symbols in 0.18: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.18

+

A

+
+PopplerActionJavascript, struct in PopplerAction +
+
+

D

+
+poppler_document_get_n_attachments, function in PopplerDocument +
+
+

F

+
+poppler_form_field_get_action, function in PopplerFormField +
+
+

P

+
+poppler_page_free_text_attributes, function in Poppler Page +
+
+
+poppler_page_get_text_attributes, function in Poppler Page +
+
+

T

+
+PopplerTextAttributes, struct in Poppler Page +
+
+
+poppler_text_attributes_copy, function in Poppler Page +
+
+
+poppler_text_attributes_free, function in Poppler Page +
+
+
+poppler_text_attributes_new, function in Poppler Page +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-20.html b/poppler-24.05.0/glib/reference/html/api-index-0-20.html new file mode 100644 index 0000000000000000000000000000000000000000..6a5b7cfa58fa2f14ece0cde2f0aa86d2005a7d50 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-20.html @@ -0,0 +1,38 @@ + + + + +Index of new symbols in 0.20: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.20

+

F

+
+poppler_fonts_iter_get_encoding, function in PopplerDocument +
+
+
+poppler_fonts_iter_get_substitute_name, function in PopplerDocument +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-22.html b/poppler-24.05.0/glib/reference/html/api-index-0-22.html new file mode 100644 index 0000000000000000000000000000000000000000..08ab46dc913941e93a6697f86c54925ccfecb034 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-22.html @@ -0,0 +1,63 @@ + + + + +Index of new symbols in 0.22: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.22

+

A

+
+poppler_annot_set_flags, function in Poppler Annotation +
+
+

D

+
+poppler_document_new_from_gfile, function in PopplerDocument +
+
+
+poppler_document_new_from_stream, function in PopplerDocument +
+
+

F

+
+PopplerFindFlags, enum in Poppler Page +
+
+

P

+
+poppler_page_find_text_with_options, function in Poppler Page +
+
+
+poppler_page_remove_annot, function in Poppler Page +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-26.html b/poppler-24.05.0/glib/reference/html/api-index-0-26.html new file mode 100644 index 0000000000000000000000000000000000000000..10173b24ae33ef6b41ee2b19bdca56a05c8c7955 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-26.html @@ -0,0 +1,422 @@ + + + + +Index of new symbols in 0.26: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.26

+

A

+
+poppler_annot_circle_get_interior_color, function in Poppler Annotation +
+
+
+poppler_annot_circle_new, function in Poppler Annotation +
+
+
+poppler_annot_circle_set_interior_color, function in Poppler Annotation +
+
+
+poppler_annot_get_rectangle, function in Poppler Annotation +
+
+
+poppler_annot_line_new, function in Poppler Annotation +
+
+
+poppler_annot_line_set_vertices, function in Poppler Annotation +
+
+
+poppler_annot_set_rectangle, function in Poppler Annotation +
+
+
+poppler_annot_square_get_interior_color, function in Poppler Annotation +
+
+
+poppler_annot_square_new, function in Poppler Annotation +
+
+
+poppler_annot_square_set_interior_color, function in Poppler Annotation +
+
+
+poppler_annot_text_markup_get_quadrilaterals, function in Poppler Annotation +
+
+
+poppler_annot_text_markup_new_highlight, function in Poppler Annotation +
+
+
+poppler_annot_text_markup_new_squiggly, function in Poppler Annotation +
+
+
+poppler_annot_text_markup_new_strikeout, function in Poppler Annotation +
+
+
+poppler_annot_text_markup_new_underline, function in Poppler Annotation +
+
+
+poppler_annot_text_markup_set_quadrilaterals, function in Poppler Annotation +
+
+

P

+
+poppler_page_get_text_attributes_for_area, function in Poppler Page +
+
+
+poppler_page_get_text_for_area, function in Poppler Page +
+
+
+poppler_page_get_text_layout_for_area, function in Poppler Page +
+
+
+poppler_point_copy, function in Poppler Page +
+
+
+poppler_point_free, function in Poppler Page +
+
+
+poppler_point_new, function in Poppler Page +
+
+

Q

+
+PopplerQuadrilateral, struct in Poppler Page +
+
+
+poppler_quadrilateral_copy, function in Poppler Page +
+
+
+poppler_quadrilateral_free, function in Poppler Page +
+
+
+poppler_quadrilateral_new, function in Poppler Page +
+
+

S

+
+poppler_structure_element_get_abbreviation, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_actual_text, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_alt_text, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_background_color, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_baseline_shift, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_block_align, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_border_color, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_border_style, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_border_thickness, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_bounding_box, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_color, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_column_count, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_column_gaps, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_column_widths, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_end_indent, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_form_description, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_form_role, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_form_state, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_glyph_orientation, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_height, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_id, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_inline_align, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_kind, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_language, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_line_height, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_list_numbering, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_padding, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_page, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_placement, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_ruby_align, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_ruby_position, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_space_after, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_space_before, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_start_indent, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_border_style, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_column_span, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_headers, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_padding, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_row_span, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_scope, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_summary, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text_align, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text_decoration_color, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text_decoration_thickness, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text_decoration_type, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text_indent, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text_spans, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_title, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_width, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_writing_mode, function in PopplerStructureElement +
+
+
+poppler_structure_element_is_block, function in PopplerStructureElement +
+
+
+poppler_structure_element_is_content, function in PopplerStructureElement +
+
+
+poppler_structure_element_is_grouping, function in PopplerStructureElement +
+
+
+poppler_structure_element_is_inline, function in PopplerStructureElement +
+
+
+poppler_structure_element_iter_copy, function in PopplerStructureElement +
+
+
+poppler_structure_element_iter_free, function in PopplerStructureElement +
+
+
+poppler_structure_element_iter_get_child, function in PopplerStructureElement +
+
+
+poppler_structure_element_iter_get_element, function in PopplerStructureElement +
+
+
+poppler_structure_element_iter_new, function in PopplerStructureElement +
+
+
+poppler_structure_element_iter_next, function in PopplerStructureElement +
+
+

T

+
+poppler_text_span_copy, function in Poppler Text Span +
+
+
+poppler_text_span_free, function in Poppler Text Span +
+
+
+poppler_text_span_get_color, function in Poppler Text Span +
+
+
+poppler_text_span_get_font_name, function in Poppler Text Span +
+
+
+poppler_text_span_get_text, function in Poppler Text Span +
+
+
+poppler_text_span_is_bold_font, function in Poppler Text Span +
+
+
+poppler_text_span_is_fixed_width_font, function in Poppler Text Span +
+
+
+poppler_text_span_is_serif_font, function in Poppler Text Span +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-33.html b/poppler-24.05.0/glib/reference/html/api-index-0-33.html new file mode 100644 index 0000000000000000000000000000000000000000..13009f24a9589c1d92f052a82156bf32d6f9b4ae --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-33.html @@ -0,0 +1,34 @@ + + + + +Index of new symbols in 0.33: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.33

+

A

+
+poppler_annot_markup_set_popup_rectangle, function in Poppler Annotation +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-46.html b/poppler-24.05.0/glib/reference/html/api-index-0-46.html new file mode 100644 index 0000000000000000000000000000000000000000..bf1d723e09994edb7fda82676efc0e4dc0f1e5a4 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-46.html @@ -0,0 +1,62 @@ + + + + +Index of new symbols in 0.46: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.46

+

D

+
+poppler_document_set_author, function in PopplerDocument +
+
+
+poppler_document_set_creation_date, function in PopplerDocument +
+
+
+poppler_document_set_creator, function in PopplerDocument +
+
+
+poppler_document_set_keywords, function in PopplerDocument +
+
+
+poppler_document_set_modification_date, function in PopplerDocument +
+
+
+poppler_document_set_producer, function in PopplerDocument +
+
+
+poppler_document_set_subject, function in PopplerDocument +
+
+
+poppler_document_set_title, function in PopplerDocument +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-54.html b/poppler-24.05.0/glib/reference/html/api-index-0-54.html new file mode 100644 index 0000000000000000000000000000000000000000..6ff09849724c154d4fcbfc34db2c7eff9945b1f3 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-54.html @@ -0,0 +1,38 @@ + + + + +Index of new symbols in 0.54: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.54

+

M

+
+PopplerMoviePlayMode, enum in Poppler Movie +
+
+
+poppler_movie_get_play_mode, function in Poppler Movie +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-70.html b/poppler-24.05.0/glib/reference/html/api-index-0-70.html new file mode 100644 index 0000000000000000000000000000000000000000..d070b5f26e0fa2801bbfeb889d5c6ecb83303f42 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-70.html @@ -0,0 +1,61 @@ + + + + +Index of new symbols in 0.70: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.70

+

D

+
+poppler_document_get_pdf_conformance, function in PopplerDocument +
+
+
+poppler_document_get_pdf_part, function in PopplerDocument +
+
+
+poppler_document_get_pdf_subtype, function in PopplerDocument +
+
+
+poppler_document_get_pdf_subtype_string, function in PopplerDocument +
+
+

P

+
+PopplerPDFConformance, enum in PopplerDocument +
+
+
+PopplerPDFPart, enum in PopplerDocument +
+
+
+PopplerPDFSubtype, enum in PopplerDocument +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-72.html b/poppler-24.05.0/glib/reference/html/api-index-0-72.html new file mode 100644 index 0000000000000000000000000000000000000000..0e33e81873a59620b9ef72eef868cdc74533447f --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-72.html @@ -0,0 +1,41 @@ + + + + +Index of new symbols in 0.72: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.72

+

A

+
+PopplerAdditionalActionType, enum in PopplerFormField +
+
+

F

+
+poppler_form_field_get_additional_action, function in PopplerFormField +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-73.html b/poppler-24.05.0/glib/reference/html/api-index-0-73.html new file mode 100644 index 0000000000000000000000000000000000000000..87120832fcae40b4e998f3afa4def4975fd6c2e1 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-73.html @@ -0,0 +1,56 @@ + + + + +Index of new symbols in 0.73: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.73

+

D

+
+PopplerDocument:print-scaling, object property in PopplerDocument +
+
+
+poppler_document_get_print_scaling, function in PopplerDocument +
+
+

N

+
+poppler_named_dest_from_bytestring, function in PDF Utility functions +
+
+
+poppler_named_dest_to_bytestring, function in PDF Utility functions +
+
+

P

+
+PopplerPrintScaling, enum in PopplerDocument +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-78.html b/poppler-24.05.0/glib/reference/html/api-index-0-78.html new file mode 100644 index 0000000000000000000000000000000000000000..d72d029da32eacf32668d73b4c787a94b52b6ecb --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-78.html @@ -0,0 +1,34 @@ + + + + +Index of new symbols in 0.78: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.78

+

D

+
+poppler_document_create_dests_tree, function in PopplerDocument +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-80.html b/poppler-24.05.0/glib/reference/html/api-index-0-80.html new file mode 100644 index 0000000000000000000000000000000000000000..48a2071d559fbab5ef23610605fff1e71742769a --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-80.html @@ -0,0 +1,88 @@ + + + + +Index of new symbols in 0.80: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.80

+

D

+
+PopplerDocument:print-duplex, object property in PopplerDocument +
+
+
+PopplerDocument:print-n-copies, object property in PopplerDocument +
+
+
+poppler_document_get_print_duplex, function in PopplerDocument +
+
+
+poppler_document_get_print_n_copies, function in PopplerDocument +
+
+
+poppler_document_get_print_page_ranges, function in PopplerDocument +
+
+

M

+
+poppler_movie_get_duration, function in Poppler Movie +
+
+
+poppler_movie_get_rate, function in Poppler Movie +
+
+
+poppler_movie_get_rotation_angle, function in Poppler Movie +
+
+
+poppler_movie_get_start, function in Poppler Movie +
+
+
+poppler_movie_get_volume, function in Poppler Movie +
+
+
+poppler_movie_is_synchronous, function in Poppler Movie +
+
+

P

+
+PopplerPageRange, struct in PopplerDocument +
+
+
+PopplerPrintDuplex, enum in PopplerDocument +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-82.html b/poppler-24.05.0/glib/reference/html/api-index-0-82.html new file mode 100644 index 0000000000000000000000000000000000000000..5118e3a744bfe6e029bbf62695e6f80aaa53af8e --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-82.html @@ -0,0 +1,34 @@ + + + + +Index of new symbols in 0.82: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.82

+

D

+
+poppler_document_new_from_bytes, function in PopplerDocument +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-88.html b/poppler-24.05.0/glib/reference/html/api-index-0-88.html new file mode 100644 index 0000000000000000000000000000000000000000..52a2eee02bb567a77c2817a687733fcf786722f1 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-88.html @@ -0,0 +1,34 @@ + + + + +Index of new symbols in 0.88: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.88

+

F

+
+poppler_form_field_get_alternate_ui_name, function in PopplerFormField +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-89.html b/poppler-24.05.0/glib/reference/html/api-index-0-89.html new file mode 100644 index 0000000000000000000000000000000000000000..5d57009e118f6debed9935a002ef46a25afb6906 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-89.html @@ -0,0 +1,34 @@ + + + + +Index of new symbols in 0.89: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.89

+

M

+
+poppler_movie_get_aspect, function in Poppler Movie +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-0-90.html b/poppler-24.05.0/glib/reference/html/api-index-0-90.html new file mode 100644 index 0000000000000000000000000000000000000000..ce8c2cc722a0452427314a5a9b8067549716f35d --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-0-90.html @@ -0,0 +1,45 @@ + + + + +Index of new symbols in 0.90: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 0.90

+

A

+
+PopplerActionResetForm, struct in PopplerAction +
+
+

D

+
+poppler_document_has_javascript, function in PopplerDocument +
+
+
+poppler_document_reset_form, function in PopplerDocument +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-20-04-0.html b/poppler-24.05.0/glib/reference/html/api-index-20-04-0.html new file mode 100644 index 0000000000000000000000000000000000000000..69eefe62e697cca7af1d2aabe2a19de4be034844 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-20-04-0.html @@ -0,0 +1,42 @@ + + + + +Index of new symbols in 20.04.0: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 20.04.0

+

M

+
+poppler_media_get_auto_play, function in Poppler Media +
+
+
+poppler_media_get_repeat_count, function in Poppler Media +
+
+
+poppler_media_get_show_controls, function in Poppler Media +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-20-09-0.html b/poppler-24.05.0/glib/reference/html/api-index-20-09-0.html new file mode 100644 index 0000000000000000000000000000000000000000..47cfa4376a0c877147c4cb61bc2c09954a65da61 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-20-09-0.html @@ -0,0 +1,81 @@ + + + + +Index of new symbols in 20.09.0: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 20.09.0

+

A

+
+poppler_attachment_get_checksum, function in PopplerAttachment +
+
+
+poppler_attachment_get_ctime, function in PopplerAttachment +
+
+
+poppler_attachment_get_description, function in PopplerAttachment +
+
+
+poppler_attachment_get_mtime, function in PopplerAttachment +
+
+
+poppler_attachment_get_name, function in PopplerAttachment +
+
+
+poppler_attachment_get_size, function in PopplerAttachment +
+
+

D

+
+PopplerDocument:creation-datetime, object property in PopplerDocument +
+
+
+PopplerDocument:mod-datetime, object property in PopplerDocument +
+
+
+poppler_document_get_creation_date_time, function in PopplerDocument +
+
+
+poppler_document_get_modification_date_time, function in PopplerDocument +
+
+
+poppler_document_set_creation_date_time, function in PopplerDocument +
+
+
+poppler_document_set_modification_date_time, function in PopplerDocument +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-21-05-0.html b/poppler-24.05.0/glib/reference/html/api-index-21-05-0.html new file mode 100644 index 0000000000000000000000000000000000000000..f1876f432ff8f21d6ad78fa92c1a8e10fdd244e4 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-21-05-0.html @@ -0,0 +1,38 @@ + + + + +Index of new symbols in 21.05.0: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 21.05.0

+

R

+
+poppler_rectangle_find_get_ignored_hyphen, function in Poppler Page +
+
+
+poppler_rectangle_find_get_match_continued, function in Poppler Page +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-21-12-0.html b/poppler-24.05.0/glib/reference/html/api-index-21-12-0.html new file mode 100644 index 0000000000000000000000000000000000000000..b0825c69a8733c4519cec584c635257c92e70a8e --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-21-12-0.html @@ -0,0 +1,124 @@ + + + + +Index of new symbols in 21.12.0: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of new symbols in 21.12.0

+

A

+
+poppler_attachment_save_to_fd, function in PopplerAttachment +
+
+

C

+
+PopplerCertificateStatus, enum in PopplerFormField +
+
+

D

+
+poppler_document_get_n_signatures, function in PopplerDocument +
+
+
+poppler_document_new_from_fd, function in PopplerDocument +
+
+
+poppler_document_save_to_fd, function in PopplerDocument +
+
+

F

+
+poppler_form_field_signature_validate_async, function in PopplerFormField +
+
+
+poppler_form_field_signature_validate_finish, function in PopplerFormField +
+
+
+poppler_form_field_signature_validate_sync, function in PopplerFormField +
+
+

M

+
+poppler_media_save_to_fd, function in Poppler Media +
+
+

P

+
+poppler_ps_file_new_fd, function in PopplerDocument +
+
+

S

+
+PopplerSignatureInfo, struct in PopplerFormField +
+
+
+PopplerSignatureStatus, enum in PopplerFormField +
+
+
+PopplerSignatureValidationFlags, enum in PopplerFormField +
+
+
+poppler_signature_info_copy, function in PopplerFormField +
+
+
+poppler_signature_info_free, function in PopplerFormField +
+
+
+poppler_signature_info_get_certificate_status, function in PopplerFormField +
+
+
+poppler_signature_info_get_local_signing_time, function in PopplerFormField +
+
+
+poppler_signature_info_get_signature_status, function in PopplerFormField +
+
+
+poppler_signature_info_get_signer_name, function in PopplerFormField +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/api-index-full.html b/poppler-24.05.0/glib/reference/html/api-index-full.html new file mode 100644 index 0000000000000000000000000000000000000000..0417e84cdd5ad334c65f309dd149f0cd647e1c78 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/api-index-full.html @@ -0,0 +1,2429 @@ + + + + +Index of all symbols: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Index of all symbols

+

A

+
+PopplerAction, union in PopplerAction +
+
+
+PopplerActionAny, struct in PopplerAction +
+
+
+PopplerActionGotoDest, struct in PopplerAction +
+
+
+PopplerActionGotoRemote, struct in PopplerAction +
+
+
+PopplerActionJavascript, struct in PopplerAction +
+
+
+PopplerActionLaunch, struct in PopplerAction +
+
+
+PopplerActionLayer, struct in PopplerAction +
+
+
+PopplerActionLayerAction, enum in PopplerAction +
+
+
+PopplerActionMovie, struct in PopplerAction +
+
+
+PopplerActionMovieOperation, enum in PopplerAction +
+
+
+PopplerActionNamed, struct in PopplerAction +
+
+
+PopplerActionOCGState, struct in PopplerAction +
+
+
+PopplerActionRendition, struct in PopplerAction +
+
+
+PopplerActionResetForm, struct in PopplerAction +
+
+
+PopplerActionType, enum in PopplerAction +
+
+
+PopplerActionUri, struct in PopplerAction +
+
+
+poppler_action_copy, function in PopplerAction +
+
+
+poppler_action_free, function in PopplerAction +
+
+
+PopplerAdditionalActionType, enum in PopplerFormField +
+
+
+PopplerAnnot, struct in Poppler Annotation +
+
+
+PopplerAnnotCalloutLine, struct in Poppler Annotation +
+
+
+PopplerAnnotCircle, struct in Poppler Annotation +
+
+
+PopplerAnnotExternalDataType, enum in Poppler Annotation +
+
+
+PopplerAnnotFileAttachment, struct in Poppler Annotation +
+
+
+PopplerAnnotFlag, enum in Poppler Annotation +
+
+
+PopplerAnnotFreeText, struct in Poppler Annotation +
+
+
+PopplerAnnotFreeTextQuadding, enum in Poppler Annotation +
+
+
+PopplerAnnotLine, struct in Poppler Annotation +
+
+
+PopplerAnnotMapping, struct in Poppler Page +
+
+
+PopplerAnnotMarkup, struct in Poppler Annotation +
+
+
+PopplerAnnotMarkupReplyType, enum in Poppler Annotation +
+
+
+PopplerAnnotMovie, struct in Poppler Annotation +
+
+
+PopplerAnnotScreen, struct in Poppler Annotation +
+
+
+PopplerAnnotSquare, struct in Poppler Annotation +
+
+
+PopplerAnnotStamp, struct in Poppler Annotation +
+
+
+PopplerAnnotStampIcon, enum in Poppler Annotation +
+
+
+PopplerAnnotText, struct in Poppler Annotation +
+
+
+PopplerAnnotTextMarkup, struct in Poppler Annotation +
+
+
+PopplerAnnotTextState, enum in Poppler Annotation +
+
+
+PopplerAnnotType, enum in Poppler Annotation +
+
+
+poppler_annot_callout_line_copy, function in Poppler Annotation +
+
+
+poppler_annot_callout_line_free, function in Poppler Annotation +
+
+
+poppler_annot_callout_line_new, function in Poppler Annotation +
+
+
+poppler_annot_circle_get_interior_color, function in Poppler Annotation +
+
+
+poppler_annot_circle_new, function in Poppler Annotation +
+
+
+poppler_annot_circle_set_interior_color, function in Poppler Annotation +
+
+
+poppler_annot_file_attachment_get_attachment, function in Poppler Annotation +
+
+
+poppler_annot_file_attachment_get_name, function in Poppler Annotation +
+
+
+poppler_annot_free_text_get_callout_line, function in Poppler Annotation +
+
+
+poppler_annot_free_text_get_quadding, function in Poppler Annotation +
+
+
+poppler_annot_get_annot_type, function in Poppler Annotation +
+
+
+poppler_annot_get_color, function in Poppler Annotation +
+
+
+poppler_annot_get_contents, function in Poppler Annotation +
+
+
+poppler_annot_get_flags, function in Poppler Annotation +
+
+
+poppler_annot_get_modified, function in Poppler Annotation +
+
+
+poppler_annot_get_name, function in Poppler Annotation +
+
+
+poppler_annot_get_page_index, function in Poppler Annotation +
+
+
+poppler_annot_get_rectangle, function in Poppler Annotation +
+
+
+poppler_annot_line_new, function in Poppler Annotation +
+
+
+poppler_annot_line_set_vertices, function in Poppler Annotation +
+
+
+poppler_annot_mapping_copy, function in Poppler Page +
+
+
+poppler_annot_mapping_free, function in Poppler Page +
+
+
+poppler_annot_mapping_new, function in Poppler Page +
+
+
+poppler_annot_markup_get_date, function in Poppler Annotation +
+
+
+poppler_annot_markup_get_external_data, function in Poppler Annotation +
+
+
+poppler_annot_markup_get_label, function in Poppler Annotation +
+
+
+poppler_annot_markup_get_opacity, function in Poppler Annotation +
+
+
+poppler_annot_markup_get_popup_is_open, function in Poppler Annotation +
+
+
+poppler_annot_markup_get_popup_rectangle, function in Poppler Annotation +
+
+
+poppler_annot_markup_get_reply_to, function in Poppler Annotation +
+
+
+poppler_annot_markup_get_subject, function in Poppler Annotation +
+
+
+poppler_annot_markup_has_popup, function in Poppler Annotation +
+
+
+poppler_annot_markup_set_label, function in Poppler Annotation +
+
+
+poppler_annot_markup_set_opacity, function in Poppler Annotation +
+
+
+poppler_annot_markup_set_popup, function in Poppler Annotation +
+
+
+poppler_annot_markup_set_popup_is_open, function in Poppler Annotation +
+
+
+poppler_annot_markup_set_popup_rectangle, function in Poppler Annotation +
+
+
+poppler_annot_movie_get_movie, function in Poppler Annotation +
+
+
+poppler_annot_movie_get_title, function in Poppler Annotation +
+
+
+poppler_annot_screen_get_action, function in Poppler Annotation +
+
+
+poppler_annot_set_color, function in Poppler Annotation +
+
+
+poppler_annot_set_contents, function in Poppler Annotation +
+
+
+poppler_annot_set_flags, function in Poppler Annotation +
+
+
+poppler_annot_set_rectangle, function in Poppler Annotation +
+
+
+poppler_annot_square_get_interior_color, function in Poppler Annotation +
+
+
+poppler_annot_square_new, function in Poppler Annotation +
+
+
+poppler_annot_square_set_interior_color, function in Poppler Annotation +
+
+
+poppler_annot_stamp_get_icon, function in Poppler Annotation +
+
+
+poppler_annot_stamp_new, function in Poppler Annotation +
+
+
+poppler_annot_stamp_set_custom_image, function in Poppler Annotation +
+
+
+poppler_annot_stamp_set_icon, function in Poppler Annotation +
+
+
+poppler_annot_text_get_icon, function in Poppler Annotation +
+
+
+poppler_annot_text_get_is_open, function in Poppler Annotation +
+
+
+poppler_annot_text_get_state, function in Poppler Annotation +
+
+
+POPPLER_ANNOT_TEXT_ICON_CIRCLE, macro in Poppler Annotation +
+
+
+POPPLER_ANNOT_TEXT_ICON_COMMENT, macro in Poppler Annotation +
+
+
+POPPLER_ANNOT_TEXT_ICON_CROSS, macro in Poppler Annotation +
+
+
+POPPLER_ANNOT_TEXT_ICON_HELP, macro in Poppler Annotation +
+
+
+POPPLER_ANNOT_TEXT_ICON_INSERT, macro in Poppler Annotation +
+
+
+POPPLER_ANNOT_TEXT_ICON_KEY, macro in Poppler Annotation +
+
+
+POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH, macro in Poppler Annotation +
+
+
+POPPLER_ANNOT_TEXT_ICON_NOTE, macro in Poppler Annotation +
+
+
+POPPLER_ANNOT_TEXT_ICON_PARAGRAPH, macro in Poppler Annotation +
+
+
+poppler_annot_text_markup_get_quadrilaterals, function in Poppler Annotation +
+
+
+poppler_annot_text_markup_new_highlight, function in Poppler Annotation +
+
+
+poppler_annot_text_markup_new_squiggly, function in Poppler Annotation +
+
+
+poppler_annot_text_markup_new_strikeout, function in Poppler Annotation +
+
+
+poppler_annot_text_markup_new_underline, function in Poppler Annotation +
+
+
+poppler_annot_text_markup_set_quadrilaterals, function in Poppler Annotation +
+
+
+poppler_annot_text_new, function in Poppler Annotation +
+
+
+poppler_annot_text_set_icon, function in Poppler Annotation +
+
+
+poppler_annot_text_set_is_open, function in Poppler Annotation +
+
+
+PopplerAttachment, struct in PopplerAttachment +
+
+
+PopplerAttachmentSaveFunc, user_function in PopplerAttachment +
+
+
+poppler_attachment_get_checksum, function in PopplerAttachment +
+
+
+poppler_attachment_get_ctime, function in PopplerAttachment +
+
+
+poppler_attachment_get_description, function in PopplerAttachment +
+
+
+poppler_attachment_get_mtime, function in PopplerAttachment +
+
+
+poppler_attachment_get_name, function in PopplerAttachment +
+
+
+poppler_attachment_get_size, function in PopplerAttachment +
+
+
+poppler_attachment_save, function in PopplerAttachment +
+
+
+poppler_attachment_save_to_callback, function in PopplerAttachment +
+
+
+poppler_attachment_save_to_fd, function in PopplerAttachment +
+
+

B

+
+PopplerBackend, enum in Poppler Features +
+
+

C

+
+PopplerCertificateInfo, struct in PopplerFormField +
+
+
+PopplerCertificateStatus, enum in PopplerFormField +
+
+
+poppler_certificate_info_copy, function in PopplerFormField +
+
+
+poppler_certificate_info_free, function in PopplerFormField +
+
+
+poppler_certificate_info_get_expiration_time, function in PopplerFormField +
+
+
+poppler_certificate_info_get_issuance_time, function in PopplerFormField +
+
+
+poppler_certificate_info_get_issuer_common_name, function in PopplerFormField +
+
+
+poppler_certificate_info_get_issuer_email, function in PopplerFormField +
+
+
+poppler_certificate_info_get_issuer_organization, function in PopplerFormField +
+
+
+poppler_certificate_info_get_subject_common_name, function in PopplerFormField +
+
+
+poppler_certificate_info_get_subject_email, function in PopplerFormField +
+
+
+poppler_certificate_info_get_subject_organization, function in PopplerFormField +
+
+
+poppler_certificate_info_new, function in PopplerFormField +
+
+
+POPPLER_CHECK_VERSION, macro in Poppler Features +
+
+
+PopplerColor, struct in Poppler Color +
+
+
+poppler_color_copy, function in Poppler Color +
+
+
+poppler_color_free, function in Poppler Color +
+
+
+poppler_color_new, function in Poppler Color +
+
+

D

+
+poppler_date_parse, function in PDF Utility functions +
+
+
+PopplerDest, struct in PopplerAction +
+
+
+PopplerDestType, enum in PopplerAction +
+
+
+poppler_dest_copy, function in PopplerAction +
+
+
+poppler_dest_free, function in PopplerAction +
+
+
+PopplerDocument, struct in PopplerDocument +
+
+
+PopplerDocument:author, object property in PopplerDocument +
+
+
+PopplerDocument:creation-date, object property in PopplerDocument +
+
+
+PopplerDocument:creation-datetime, object property in PopplerDocument +
+
+
+PopplerDocument:creator, object property in PopplerDocument +
+
+
+PopplerDocument:format, object property in PopplerDocument +
+
+
+PopplerDocument:format-major, object property in PopplerDocument +
+
+
+PopplerDocument:format-minor, object property in PopplerDocument +
+
+
+PopplerDocument:keywords, object property in PopplerDocument +
+
+
+PopplerDocument:linearized, object property in PopplerDocument +
+
+
+PopplerDocument:metadata, object property in PopplerDocument +
+
+
+PopplerDocument:mod-date, object property in PopplerDocument +
+
+
+PopplerDocument:mod-datetime, object property in PopplerDocument +
+
+
+PopplerDocument:page-layout, object property in PopplerDocument +
+
+
+PopplerDocument:page-mode, object property in PopplerDocument +
+
+
+PopplerDocument:permissions, object property in PopplerDocument +
+
+
+PopplerDocument:print-duplex, object property in PopplerDocument +
+
+
+PopplerDocument:print-n-copies, object property in PopplerDocument +
+
+
+PopplerDocument:print-scaling, object property in PopplerDocument +
+
+
+PopplerDocument:producer, object property in PopplerDocument +
+
+
+PopplerDocument:subject, object property in PopplerDocument +
+
+
+PopplerDocument:subtype, object property in PopplerDocument +
+
+
+PopplerDocument:subtype-conformance, object property in PopplerDocument +
+
+
+PopplerDocument:subtype-part, object property in PopplerDocument +
+
+
+PopplerDocument:subtype-string, object property in PopplerDocument +
+
+
+PopplerDocument:title, object property in PopplerDocument +
+
+
+PopplerDocument:viewer-preferences, object property in PopplerDocument +
+
+
+poppler_document_create_dests_tree, function in PopplerDocument +
+
+
+poppler_document_find_dest, function in PopplerDocument +
+
+
+poppler_document_get_attachments, function in PopplerDocument +
+
+
+poppler_document_get_author, function in PopplerDocument +
+
+
+poppler_document_get_creation_date, function in PopplerDocument +
+
+
+poppler_document_get_creation_date_time, function in PopplerDocument +
+
+
+poppler_document_get_creator, function in PopplerDocument +
+
+
+poppler_document_get_form_field, function in PopplerDocument +
+
+
+poppler_document_get_id, function in PopplerDocument +
+
+
+poppler_document_get_keywords, function in PopplerDocument +
+
+
+poppler_document_get_metadata, function in PopplerDocument +
+
+
+poppler_document_get_modification_date, function in PopplerDocument +
+
+
+poppler_document_get_modification_date_time, function in PopplerDocument +
+
+
+poppler_document_get_n_attachments, function in PopplerDocument +
+
+
+poppler_document_get_n_pages, function in PopplerDocument +
+
+
+poppler_document_get_n_signatures, function in PopplerDocument +
+
+
+poppler_document_get_page, function in PopplerDocument +
+
+
+poppler_document_get_page_by_label, function in PopplerDocument +
+
+
+poppler_document_get_page_layout, function in PopplerDocument +
+
+
+poppler_document_get_page_mode, function in PopplerDocument +
+
+
+poppler_document_get_pdf_conformance, function in PopplerDocument +
+
+
+poppler_document_get_pdf_part, function in PopplerDocument +
+
+
+poppler_document_get_pdf_subtype, function in PopplerDocument +
+
+
+poppler_document_get_pdf_subtype_string, function in PopplerDocument +
+
+
+poppler_document_get_pdf_version, function in PopplerDocument +
+
+
+poppler_document_get_pdf_version_string, function in PopplerDocument +
+
+
+poppler_document_get_permissions, function in PopplerDocument +
+
+
+poppler_document_get_print_duplex, function in PopplerDocument +
+
+
+poppler_document_get_print_n_copies, function in PopplerDocument +
+
+
+poppler_document_get_print_page_ranges, function in PopplerDocument +
+
+
+poppler_document_get_print_scaling, function in PopplerDocument +
+
+
+poppler_document_get_producer, function in PopplerDocument +
+
+
+poppler_document_get_signature_fields, function in PopplerDocument +
+
+
+poppler_document_get_subject, function in PopplerDocument +
+
+
+poppler_document_get_title, function in PopplerDocument +
+
+
+poppler_document_has_attachments, function in PopplerDocument +
+
+
+poppler_document_has_javascript, function in PopplerDocument +
+
+
+poppler_document_is_linearized, function in PopplerDocument +
+
+
+poppler_document_new_from_bytes, function in PopplerDocument +
+
+
+poppler_document_new_from_data, function in PopplerDocument +
+
+
+poppler_document_new_from_fd, function in PopplerDocument +
+
+
+poppler_document_new_from_file, function in PopplerDocument +
+
+
+poppler_document_new_from_gfile, function in PopplerDocument +
+
+
+poppler_document_new_from_stream, function in PopplerDocument +
+
+
+poppler_document_reset_form, function in PopplerDocument +
+
+
+poppler_document_save, function in PopplerDocument +
+
+
+poppler_document_save_a_copy, function in PopplerDocument +
+
+
+poppler_document_save_to_fd, function in PopplerDocument +
+
+
+poppler_document_set_author, function in PopplerDocument +
+
+
+poppler_document_set_creation_date, function in PopplerDocument +
+
+
+poppler_document_set_creation_date_time, function in PopplerDocument +
+
+
+poppler_document_set_creator, function in PopplerDocument +
+
+
+poppler_document_set_keywords, function in PopplerDocument +
+
+
+poppler_document_set_modification_date, function in PopplerDocument +
+
+
+poppler_document_set_modification_date_time, function in PopplerDocument +
+
+
+poppler_document_set_producer, function in PopplerDocument +
+
+
+poppler_document_set_subject, function in PopplerDocument +
+
+
+poppler_document_set_title, function in PopplerDocument +
+
+

E

+
+POPPLER_ERROR, macro in Error handling +
+
+
+PopplerError, enum in Error handling +
+
+

F

+
+PopplerFindFlags, enum in Poppler Page +
+
+
+PopplerFontInfo, struct in PopplerDocument +
+
+
+PopplerFontsIter, struct in PopplerDocument +
+
+
+poppler_fonts_iter_copy, function in PopplerDocument +
+
+
+poppler_fonts_iter_free, function in PopplerDocument +
+
+
+poppler_fonts_iter_get_encoding, function in PopplerDocument +
+
+
+poppler_fonts_iter_get_file_name, function in PopplerDocument +
+
+
+poppler_fonts_iter_get_font_type, function in PopplerDocument +
+
+
+poppler_fonts_iter_get_full_name, function in PopplerDocument +
+
+
+poppler_fonts_iter_get_name, function in PopplerDocument +
+
+
+poppler_fonts_iter_get_substitute_name, function in PopplerDocument +
+
+
+poppler_fonts_iter_is_embedded, function in PopplerDocument +
+
+
+poppler_fonts_iter_is_subset, function in PopplerDocument +
+
+
+poppler_fonts_iter_next, function in PopplerDocument +
+
+
+PopplerFontType, enum in PopplerDocument +
+
+
+poppler_font_info_free, function in PopplerDocument +
+
+
+poppler_font_info_new, function in PopplerDocument +
+
+
+poppler_font_info_scan, function in PopplerDocument +
+
+
+PopplerFormButtonType, enum in PopplerFormField +
+
+
+PopplerFormChoiceType, enum in PopplerFormField +
+
+
+PopplerFormField, struct in PopplerFormField +
+
+
+PopplerFormFieldMapping, struct in Poppler Page +
+
+
+PopplerFormFieldType, enum in PopplerFormField +
+
+
+PopplerFormTextType, enum in PopplerFormField +
+
+
+poppler_form_field_button_get_button_type, function in PopplerFormField +
+
+
+poppler_form_field_button_get_state, function in PopplerFormField +
+
+
+poppler_form_field_button_set_state, function in PopplerFormField +
+
+
+poppler_form_field_choice_can_select_multiple, function in PopplerFormField +
+
+
+poppler_form_field_choice_commit_on_change, function in PopplerFormField +
+
+
+poppler_form_field_choice_do_spell_check, function in PopplerFormField +
+
+
+poppler_form_field_choice_get_choice_type, function in PopplerFormField +
+
+
+poppler_form_field_choice_get_item, function in PopplerFormField +
+
+
+poppler_form_field_choice_get_n_items, function in PopplerFormField +
+
+
+poppler_form_field_choice_get_text, function in PopplerFormField +
+
+
+poppler_form_field_choice_is_editable, function in PopplerFormField +
+
+
+poppler_form_field_choice_is_item_selected, function in PopplerFormField +
+
+
+poppler_form_field_choice_select_item, function in PopplerFormField +
+
+
+poppler_form_field_choice_set_text, function in PopplerFormField +
+
+
+poppler_form_field_choice_toggle_item, function in PopplerFormField +
+
+
+poppler_form_field_choice_unselect_all, function in PopplerFormField +
+
+
+poppler_form_field_get_action, function in PopplerFormField +
+
+
+poppler_form_field_get_additional_action, function in PopplerFormField +
+
+
+poppler_form_field_get_alternate_ui_name, function in PopplerFormField +
+
+
+poppler_form_field_get_field_type, function in PopplerFormField +
+
+
+poppler_form_field_get_font_size, function in PopplerFormField +
+
+
+poppler_form_field_get_id, function in PopplerFormField +
+
+
+poppler_form_field_get_mapping_name, function in PopplerFormField +
+
+
+poppler_form_field_get_name, function in PopplerFormField +
+
+
+poppler_form_field_get_partial_name, function in PopplerFormField +
+
+
+poppler_form_field_is_read_only, function in PopplerFormField +
+
+
+poppler_form_field_mapping_copy, function in Poppler Page +
+
+
+poppler_form_field_mapping_free, function in Poppler Page +
+
+
+poppler_form_field_mapping_new, function in Poppler Page +
+
+
+poppler_form_field_signature_validate_async, function in PopplerFormField +
+
+
+poppler_form_field_signature_validate_finish, function in PopplerFormField +
+
+
+poppler_form_field_signature_validate_sync, function in PopplerFormField +
+
+
+poppler_form_field_text_do_scroll, function in PopplerFormField +
+
+
+poppler_form_field_text_do_spell_check, function in PopplerFormField +
+
+
+poppler_form_field_text_get_max_len, function in PopplerFormField +
+
+
+poppler_form_field_text_get_text, function in PopplerFormField +
+
+
+poppler_form_field_text_get_text_type, function in PopplerFormField +
+
+
+poppler_form_field_text_is_password, function in PopplerFormField +
+
+
+poppler_form_field_text_is_rich_text, function in PopplerFormField +
+
+
+poppler_form_field_text_set_text, function in PopplerFormField +
+
+

G

+
+poppler_get_available_signing_certificates, function in PopplerFormField +
+
+
+poppler_get_backend, function in Poppler Features +
+
+
+poppler_get_nss_dir, function in PopplerFormField +
+
+
+poppler_get_version, function in Poppler Features +
+
+

H

+
+POPPLER_HAS_CAIRO, macro in Poppler Features +
+
+

I

+
+PopplerImageMapping, struct in Poppler Page +
+
+
+poppler_image_mapping_copy, function in Poppler Page +
+
+
+poppler_image_mapping_free, function in Poppler Page +
+
+
+poppler_image_mapping_new, function in Poppler Page +
+
+
+PopplerIndexIter, struct in PopplerDocument +
+
+
+poppler_index_iter_copy, function in PopplerDocument +
+
+
+poppler_index_iter_free, function in PopplerDocument +
+
+
+poppler_index_iter_get_action, function in PopplerDocument +
+
+
+poppler_index_iter_get_child, function in PopplerDocument +
+
+
+poppler_index_iter_is_open, function in PopplerDocument +
+
+
+poppler_index_iter_new, function in PopplerDocument +
+
+
+poppler_index_iter_next, function in PopplerDocument +
+
+

L

+
+PopplerLayer, struct in Poppler Layer +
+
+
+PopplerLayersIter, struct in PopplerDocument +
+
+
+poppler_layers_iter_copy, function in PopplerDocument +
+
+
+poppler_layers_iter_free, function in PopplerDocument +
+
+
+poppler_layers_iter_get_child, function in PopplerDocument +
+
+
+poppler_layers_iter_get_layer, function in PopplerDocument +
+
+
+poppler_layers_iter_get_title, function in PopplerDocument +
+
+
+poppler_layers_iter_new, function in PopplerDocument +
+
+
+poppler_layers_iter_next, function in PopplerDocument +
+
+
+poppler_layer_get_radio_button_group_id, function in Poppler Layer +
+
+
+poppler_layer_get_title, function in Poppler Layer +
+
+
+poppler_layer_hide, function in Poppler Layer +
+
+
+poppler_layer_is_parent, function in Poppler Layer +
+
+
+poppler_layer_is_visible, function in Poppler Layer +
+
+
+poppler_layer_show, function in Poppler Layer +
+
+
+PopplerLinkMapping, struct in Poppler Page +
+
+
+poppler_link_mapping_copy, function in Poppler Page +
+
+
+poppler_link_mapping_free, function in Poppler Page +
+
+
+poppler_link_mapping_new, function in Poppler Page +
+
+

M

+
+POPPLER_MAJOR_VERSION, macro in Poppler Features +
+
+
+PopplerMedia, struct in Poppler Media +
+
+
+PopplerMediaSaveFunc, user_function in Poppler Media +
+
+
+poppler_media_get_auto_play, function in Poppler Media +
+
+
+poppler_media_get_filename, function in Poppler Media +
+
+
+poppler_media_get_mime_type, function in Poppler Media +
+
+
+poppler_media_get_repeat_count, function in Poppler Media +
+
+
+poppler_media_get_show_controls, function in Poppler Media +
+
+
+poppler_media_is_embedded, function in Poppler Media +
+
+
+poppler_media_save, function in Poppler Media +
+
+
+poppler_media_save_to_callback, function in Poppler Media +
+
+
+poppler_media_save_to_fd, function in Poppler Media +
+
+
+POPPLER_MICRO_VERSION, macro in Poppler Features +
+
+
+POPPLER_MINOR_VERSION, macro in Poppler Features +
+
+
+PopplerMovie, struct in Poppler Movie +
+
+
+PopplerMoviePlayMode, enum in Poppler Movie +
+
+
+poppler_movie_get_aspect, function in Poppler Movie +
+
+
+poppler_movie_get_duration, function in Poppler Movie +
+
+
+poppler_movie_get_filename, function in Poppler Movie +
+
+
+poppler_movie_get_play_mode, function in Poppler Movie +
+
+
+poppler_movie_get_rate, function in Poppler Movie +
+
+
+poppler_movie_get_rotation_angle, function in Poppler Movie +
+
+
+poppler_movie_get_start, function in Poppler Movie +
+
+
+poppler_movie_get_volume, function in Poppler Movie +
+
+
+poppler_movie_is_synchronous, function in Poppler Movie +
+
+
+poppler_movie_need_poster, function in Poppler Movie +
+
+
+poppler_movie_show_controls, function in Poppler Movie +
+
+

N

+
+poppler_named_dest_from_bytestring, function in PDF Utility functions +
+
+
+poppler_named_dest_to_bytestring, function in PDF Utility functions +
+
+

P

+
+PopplerPage, struct in Poppler Page +
+
+
+PopplerPage:label, object property in Poppler Page +
+
+
+PopplerPageLayout, enum in PopplerDocument +
+
+
+PopplerPageMode, enum in PopplerDocument +
+
+
+PopplerPageRange, struct in PopplerDocument +
+
+
+PopplerPageTransition, struct in Poppler Page +
+
+
+PopplerPageTransitionAlignment, enum in Poppler Page +
+
+
+PopplerPageTransitionDirection, enum in Poppler Page +
+
+
+PopplerPageTransitionType, enum in Poppler Page +
+
+
+poppler_page_add_annot, function in Poppler Page +
+
+
+poppler_page_find_text, function in Poppler Page +
+
+
+poppler_page_find_text_with_options, function in Poppler Page +
+
+
+poppler_page_free_annot_mapping, function in Poppler Page +
+
+
+poppler_page_free_form_field_mapping, function in Poppler Page +
+
+
+poppler_page_free_image_mapping, function in Poppler Page +
+
+
+poppler_page_free_link_mapping, function in Poppler Page +
+
+
+poppler_page_free_text_attributes, function in Poppler Page +
+
+
+poppler_page_get_annot_mapping, function in Poppler Page +
+
+
+poppler_page_get_bounding_box, function in Poppler Page +
+
+
+poppler_page_get_crop_box, function in Poppler Page +
+
+
+poppler_page_get_duration, function in Poppler Page +
+
+
+poppler_page_get_form_field_mapping, function in Poppler Page +
+
+
+poppler_page_get_image, function in Poppler Page +
+
+
+poppler_page_get_image_mapping, function in Poppler Page +
+
+
+poppler_page_get_index, function in Poppler Page +
+
+
+poppler_page_get_label, function in Poppler Page +
+
+
+poppler_page_get_link_mapping, function in Poppler Page +
+
+
+poppler_page_get_selected_region, function in Poppler Page +
+
+
+poppler_page_get_selected_text, function in Poppler Page +
+
+
+poppler_page_get_selection_region, function in Poppler Page +
+
+
+poppler_page_get_size, function in Poppler Page +
+
+
+poppler_page_get_text, function in Poppler Page +
+
+
+poppler_page_get_text_attributes, function in Poppler Page +
+
+
+poppler_page_get_text_attributes_for_area, function in Poppler Page +
+
+
+poppler_page_get_text_for_area, function in Poppler Page +
+
+
+poppler_page_get_text_layout, function in Poppler Page +
+
+
+poppler_page_get_text_layout_for_area, function in Poppler Page +
+
+
+poppler_page_get_thumbnail, function in Poppler Page +
+
+
+poppler_page_get_thumbnail_size, function in Poppler Page +
+
+
+poppler_page_get_transition, function in Poppler Page +
+
+
+poppler_page_remove_annot, function in Poppler Page +
+
+
+poppler_page_render, function in Poppler Page +
+
+
+poppler_page_render_for_printing, function in Poppler Page +
+
+
+poppler_page_render_for_printing_with_options, function in Poppler Page +
+
+
+poppler_page_render_selection, function in Poppler Page +
+
+
+poppler_page_render_to_ps, function in Poppler Page +
+
+
+poppler_page_selection_region_free, function in Poppler Page +
+
+
+poppler_page_transition_copy, function in Poppler Page +
+
+
+poppler_page_transition_free, function in Poppler Page +
+
+
+poppler_page_transition_new, function in Poppler Page +
+
+
+PopplerPDFConformance, enum in PopplerDocument +
+
+
+PopplerPDFPart, enum in PopplerDocument +
+
+
+PopplerPDFSubtype, enum in PopplerDocument +
+
+
+PopplerPermissions, enum in PopplerDocument +
+
+
+PopplerPoint, struct in Poppler Page +
+
+
+poppler_point_copy, function in Poppler Page +
+
+
+poppler_point_free, function in Poppler Page +
+
+
+poppler_point_new, function in Poppler Page +
+
+
+PopplerPrintDuplex, enum in PopplerDocument +
+
+
+PopplerPrintFlags, enum in Poppler Page +
+
+
+PopplerPrintScaling, enum in PopplerDocument +
+
+
+PopplerPSFile, struct in PopplerDocument +
+
+
+poppler_ps_file_free, function in PopplerDocument +
+
+
+poppler_ps_file_new, function in PopplerDocument +
+
+
+poppler_ps_file_new_fd, function in PopplerDocument +
+
+
+poppler_ps_file_set_duplex, function in PopplerDocument +
+
+
+poppler_ps_file_set_paper_size, function in PopplerDocument +
+
+

Q

+
+PopplerQuadrilateral, struct in Poppler Page +
+
+
+poppler_quadrilateral_copy, function in Poppler Page +
+
+
+poppler_quadrilateral_free, function in Poppler Page +
+
+
+poppler_quadrilateral_new, function in Poppler Page +
+
+

R

+
+PopplerRectangle, struct in Poppler Page +
+
+
+poppler_rectangle_copy, function in Poppler Page +
+
+
+poppler_rectangle_find_get_ignored_hyphen, function in Poppler Page +
+
+
+poppler_rectangle_find_get_match_continued, function in Poppler Page +
+
+
+poppler_rectangle_free, function in Poppler Page +
+
+
+poppler_rectangle_new, function in Poppler Page +
+
+

S

+
+PopplerSelectionStyle, enum in Poppler Page +
+
+
+poppler_set_nss_dir, function in PopplerFormField +
+
+
+poppler_set_nss_password_callback, function in PopplerFormField +
+
+
+PopplerSignatureInfo, struct in PopplerFormField +
+
+
+PopplerSignatureStatus, enum in PopplerFormField +
+
+
+PopplerSignatureValidationFlags, enum in PopplerFormField +
+
+
+poppler_signature_info_copy, function in PopplerFormField +
+
+
+poppler_signature_info_free, function in PopplerFormField +
+
+
+poppler_signature_info_get_certificate_info, function in PopplerFormField +
+
+
+poppler_signature_info_get_certificate_status, function in PopplerFormField +
+
+
+poppler_signature_info_get_local_signing_time, function in PopplerFormField +
+
+
+poppler_signature_info_get_signature_status, function in PopplerFormField +
+
+
+poppler_signature_info_get_signer_name, function in PopplerFormField +
+
+
+poppler_signing_data_copy, function in PopplerFormField +
+
+
+poppler_signing_data_free, function in PopplerFormField +
+
+
+poppler_signing_data_get_background_color, function in PopplerFormField +
+
+
+poppler_signing_data_get_border_color, function in PopplerFormField +
+
+
+poppler_signing_data_get_border_width, function in PopplerFormField +
+
+
+poppler_signing_data_get_certificate_info, function in PopplerFormField +
+
+
+poppler_signing_data_get_destination_filename, function in PopplerFormField +
+
+
+poppler_signing_data_get_document_owner_password, function in PopplerFormField +
+
+
+poppler_signing_data_get_document_user_password, function in PopplerFormField +
+
+
+poppler_signing_data_get_field_partial_name, function in PopplerFormField +
+
+
+poppler_signing_data_get_font_color, function in PopplerFormField +
+
+
+poppler_signing_data_get_font_size, function in PopplerFormField +
+
+
+poppler_signing_data_get_image_path, function in PopplerFormField +
+
+
+poppler_signing_data_get_left_font_size, function in PopplerFormField +
+
+
+poppler_signing_data_get_location, function in PopplerFormField +
+
+
+poppler_signing_data_get_page, function in PopplerFormField +
+
+
+poppler_signing_data_get_password, function in PopplerFormField +
+
+
+poppler_signing_data_get_reason, function in PopplerFormField +
+
+
+poppler_signing_data_get_signature_rectangle, function in PopplerFormField +
+
+
+poppler_signing_data_get_signature_text, function in PopplerFormField +
+
+
+poppler_signing_data_get_signature_text_left, function in PopplerFormField +
+
+
+poppler_signing_data_new, function in PopplerFormField +
+
+
+poppler_signing_data_set_background_color, function in PopplerFormField +
+
+
+poppler_signing_data_set_border_color, function in PopplerFormField +
+
+
+poppler_signing_data_set_border_width, function in PopplerFormField +
+
+
+poppler_signing_data_set_certificate_info, function in PopplerFormField +
+
+
+poppler_signing_data_set_destination_filename, function in PopplerFormField +
+
+
+poppler_signing_data_set_document_owner_password, function in PopplerFormField +
+
+
+poppler_signing_data_set_document_user_password, function in PopplerFormField +
+
+
+poppler_signing_data_set_field_partial_name, function in PopplerFormField +
+
+
+poppler_signing_data_set_font_color, function in PopplerFormField +
+
+
+poppler_signing_data_set_font_size, function in PopplerFormField +
+
+
+poppler_signing_data_set_image_path, function in PopplerFormField +
+
+
+poppler_signing_data_set_left_font_size, function in PopplerFormField +
+
+
+poppler_signing_data_set_location, function in PopplerFormField +
+
+
+poppler_signing_data_set_page, function in PopplerFormField +
+
+
+poppler_signing_data_set_password, function in PopplerFormField +
+
+
+poppler_signing_data_set_reason, function in PopplerFormField +
+
+
+poppler_signing_data_set_signature_rectangle, function in PopplerFormField +
+
+
+poppler_signing_data_set_signature_text, function in PopplerFormField +
+
+
+poppler_signing_data_set_signature_text_left, function in PopplerFormField +
+
+
+PopplerStructureBlockAlign, enum in PopplerStructureElement +
+
+
+PopplerStructureBorderStyle, enum in PopplerStructureElement +
+
+
+PopplerStructureElement, struct in PopplerStructureElement +
+
+
+PopplerStructureElementIter, struct in PopplerStructureElement +
+
+
+PopplerStructureElementKind, enum in PopplerStructureElement +
+
+
+PopplerStructureFormRole, enum in PopplerStructureElement +
+
+
+PopplerStructureFormState, enum in PopplerStructureElement +
+
+
+PopplerStructureGetTextFlags, enum in PopplerStructureElement +
+
+
+PopplerStructureGlyphOrientation, enum in PopplerStructureElement +
+
+
+PopplerStructureInlineAlign, enum in PopplerStructureElement +
+
+
+PopplerStructureListNumbering, enum in PopplerStructureElement +
+
+
+PopplerStructurePlacement, enum in PopplerStructureElement +
+
+
+PopplerStructureRubyAlign, enum in PopplerStructureElement +
+
+
+PopplerStructureRubyPosition, enum in PopplerStructureElement +
+
+
+PopplerStructureTableScope, enum in PopplerStructureElement +
+
+
+PopplerStructureTextAlign, enum in PopplerStructureElement +
+
+
+PopplerStructureTextDecoration, enum in PopplerStructureElement +
+
+
+PopplerStructureWritingMode, enum in PopplerStructureElement +
+
+
+poppler_structure_element_get_abbreviation, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_actual_text, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_alt_text, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_background_color, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_baseline_shift, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_block_align, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_border_color, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_border_style, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_border_thickness, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_bounding_box, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_color, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_column_count, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_column_gaps, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_column_widths, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_end_indent, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_form_description, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_form_role, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_form_state, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_glyph_orientation, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_height, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_id, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_inline_align, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_kind, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_language, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_line_height, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_list_numbering, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_padding, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_page, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_placement, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_ruby_align, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_ruby_position, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_space_after, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_space_before, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_start_indent, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_border_style, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_column_span, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_headers, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_padding, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_row_span, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_scope, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_table_summary, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text_align, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text_decoration_color, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text_decoration_thickness, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text_decoration_type, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text_indent, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_text_spans, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_title, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_width, function in PopplerStructureElement +
+
+
+poppler_structure_element_get_writing_mode, function in PopplerStructureElement +
+
+
+poppler_structure_element_is_block, function in PopplerStructureElement +
+
+
+poppler_structure_element_is_content, function in PopplerStructureElement +
+
+
+poppler_structure_element_is_grouping, function in PopplerStructureElement +
+
+
+poppler_structure_element_is_inline, function in PopplerStructureElement +
+
+
+poppler_structure_element_iter_copy, function in PopplerStructureElement +
+
+
+poppler_structure_element_iter_free, function in PopplerStructureElement +
+
+
+poppler_structure_element_iter_get_child, function in PopplerStructureElement +
+
+
+poppler_structure_element_iter_get_element, function in PopplerStructureElement +
+
+
+poppler_structure_element_iter_new, function in PopplerStructureElement +
+
+
+poppler_structure_element_iter_next, function in PopplerStructureElement +
+
+

T

+
+PopplerTextAttributes, struct in Poppler Page +
+
+
+PopplerTextSpan, struct in Poppler Text Span +
+
+
+poppler_text_attributes_copy, function in Poppler Page +
+
+
+poppler_text_attributes_free, function in Poppler Page +
+
+
+poppler_text_attributes_new, function in Poppler Page +
+
+
+poppler_text_span_copy, function in Poppler Text Span +
+
+
+poppler_text_span_free, function in Poppler Text Span +
+
+
+poppler_text_span_get_color, function in Poppler Text Span +
+
+
+poppler_text_span_get_font_name, function in Poppler Text Span +
+
+
+poppler_text_span_get_text, function in Poppler Text Span +
+
+
+poppler_text_span_is_bold_font, function in Poppler Text Span +
+
+
+poppler_text_span_is_fixed_width_font, function in Poppler Text Span +
+
+
+poppler_text_span_is_serif_font, function in Poppler Text Span +
+
+

V

+
+PopplerViewerPreferences, enum in PopplerDocument +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/ch01.html b/poppler-24.05.0/glib/reference/html/ch01.html new file mode 100644 index 0000000000000000000000000000000000000000..26ae3ffb69bdf570dfb82e50268c1b5b318d444f --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/ch01.html @@ -0,0 +1,76 @@ + + + + +Poppler: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+

+Poppler

+
+
+PopplerDocument — Information about a document +
+
+PopplerPage — Information about a page in a document +
+
+PopplerAction — Action links +
+
+PopplerAttachment — Attachments +
+
+PopplerFormField — Form Field +
+
+PopplerAnnot — Annotations +
+
+PopplerLayer — Layers +
+
+PopplerMedia — Media +
+
+PopplerMovie — Movies +
+
+PopplerStructureElement — Document structure element. +
+
+PopplerColor — Colors +
+
+Error handling — Error domain and codes +
+
+PDF Utility functions +
+
+Version and Features Information — Variables and functions to check the poppler version and features +
+
+Poppler Text Span +
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/home.png b/poppler-24.05.0/glib/reference/html/home.png new file mode 100644 index 0000000000000000000000000000000000000000..9346b336a784463192c7daab5133a3673dd69845 Binary files /dev/null and b/poppler-24.05.0/glib/reference/html/home.png differ diff --git a/poppler-24.05.0/glib/reference/html/index.html b/poppler-24.05.0/glib/reference/html/index.html new file mode 100644 index 0000000000000000000000000000000000000000..da495f3f1767903c5b298b057ce2ca91cfe1e0b6 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/index.html @@ -0,0 +1,102 @@ + + + + +Poppler Reference Manual: Poppler Reference Manual + + + + + + + +
+
+
+
+

+ for Poppler 24.05.0 +

+
+
+
+
+
Poppler
+
+
+PopplerDocument — Information about a document +
+
+PopplerPage — Information about a page in a document +
+
+PopplerAction — Action links +
+
+PopplerAttachment — Attachments +
+
+PopplerFormField — Form Field +
+
+PopplerAnnot — Annotations +
+
+PopplerLayer — Layers +
+
+PopplerMedia — Media +
+
+PopplerMovie — Movies +
+
+PopplerStructureElement — Document structure element. +
+
+PopplerColor — Colors +
+
+Error handling — Error domain and codes +
+
+PDF Utility functions +
+
+Version and Features Information — Variables and functions to check the poppler version and features +
+
+Poppler Text Span +
+
+
Index of all symbols
+
Index of new symbols in 0.12
+
Index of new symbols in 0.14
+
Index of new symbols in 0.16
+
Index of new symbols in 0.18
+
Index of new symbols in 0.20
+
Index of new symbols in 0.22
+
Index of new symbols in 0.26
+
Index of new symbols in 0.33
+
Index of new symbols in 0.46
+
Index of new symbols in 0.54
+
Index of new symbols in 0.70
+
Index of new symbols in 0.72
+
Index of new symbols in 0.73
+
Index of new symbols in 0.78
+
Index of new symbols in 0.80
+
Index of new symbols in 0.82
+
Index of new symbols in 0.88
+
Index of new symbols in 0.89
+
Index of new symbols in 0.90
+
Index of new symbols in 20.04.0
+
Index of new symbols in 20.09.0
+
Index of new symbols in 21.05.0
+
Index of new symbols in 21.12.0
+
Annotation Glossary
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/left-insensitive.png b/poppler-24.05.0/glib/reference/html/left-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..3269393a7f72af744a772c437bd7b3976c23709d Binary files /dev/null and b/poppler-24.05.0/glib/reference/html/left-insensitive.png differ diff --git a/poppler-24.05.0/glib/reference/html/left.png b/poppler-24.05.0/glib/reference/html/left.png new file mode 100644 index 0000000000000000000000000000000000000000..2abde032b0c98b756b12d380da4318205cd78470 Binary files /dev/null and b/poppler-24.05.0/glib/reference/html/left.png differ diff --git a/poppler-24.05.0/glib/reference/html/poppler-Error-handling.html b/poppler-24.05.0/glib/reference/html/poppler-Error-handling.html new file mode 100644 index 0000000000000000000000000000000000000000..04a0f7b7d5a65335030957d5301b8e564c7e89bf --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/poppler-Error-handling.html @@ -0,0 +1,144 @@ + + + + +Error handling: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

Error handling

+

Error handling — Error domain and codes

+
+
+

Types and Values

+
++++ + + + + + + + + + + +
#definePOPPLER_ERROR
enumPopplerError
+
+
+

Object Hierarchy

+
    GEnum
+    ╰── PopplerError
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+
+
+

Functions

+

+
+
+

Types and Values

+
+

POPPLER_ERROR

+
#define POPPLER_ERROR poppler_error_quark()
+
+

Error domain for poppler operations. Errors in this domain will +be from the PopplerError enumeration. See GError for information +on error domains.

+
+
+
+

enum PopplerError

+

Error codes returned by PopplerDocument

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_ERROR_INVALID

 +

Generic error when a document operation fails

+		 

POPPLER_ERROR_ENCRYPTED

 +

Document is encrypted

+		 

POPPLER_ERROR_OPEN_FILE

 +

File could not be opened for writing when saving document

+		 

POPPLER_ERROR_BAD_CATALOG

 +

Failed to read the document catalog

+		 

POPPLER_ERROR_DAMAGED

 +

Document is damaged

+		 

POPPLER_ERROR_SIGNING

  
+
+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/poppler-PDF-Utility-functions.html b/poppler-24.05.0/glib/reference/html/poppler-PDF-Utility-functions.html new file mode 100644 index 0000000000000000000000000000000000000000..450b102a33eedfe07da4af4ee8273a4d9024cc2c --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/poppler-PDF-Utility-functions.html @@ -0,0 +1,204 @@ + + + + +PDF Utility functions: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

PDF Utility functions

+

PDF Utility functions

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
+gboolean + +poppler_date_parse () +
+char * + +poppler_named_dest_from_bytestring () +
+guint8 * + +poppler_named_dest_to_bytestring () +
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+
+
+

Functions

+
+

poppler_date_parse ()

+
gboolean
+poppler_date_parse (const gchar *date,
+                    time_t *timet);
+

Parses a PDF format date string and converts it to a time_t. Returns FALSE +if the parsing fails or the input string is not a valid PDF format date string

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

date

string to parse

 

timet

an uninitialized time_t

 
+
+
+

Returns

+

TRUE, if timet +was set

+
+

Since: 0.12

+
+
+
+

poppler_named_dest_from_bytestring ()

+
char *
+poppler_named_dest_from_bytestring (const guint8 *data,
+                                    gsize length);
+

Converts a bytestring into a zero-terminated string suitable to +pass to poppler_document_find_dest().

+

Note that the returned string has no defined encoding and is not +suitable for display to the user.

+

The returned data must be freed using g_free().

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

data

the bytestring data.

[array length=length]

length

the bytestring length

 
+
+
+

Returns

+

the named dest.

+

[transfer full]

+
+

Since: 0.73

+
+
+
+

poppler_named_dest_to_bytestring ()

+
guint8 *
+poppler_named_dest_to_bytestring (const char *name,
+                                  gsize *length);
+

Converts a named dest string (e.g. from PopplerDest.named_dest) into a +bytestring, inverting the transformation of +poppler_named_dest_from_bytestring().

+

Note that the returned data is not zero terminated and may also +contains embedded NUL bytes.

+

If name + is not a valid named dest string, returns NULL.

+

The returned data must be freed using g_free().

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

name

the named dest string

 

length

a location to store the length of the returned bytestring.

[out]
+
+
+

Returns

+

a new bytestring, +or NULL.

+

[array length=length][transfer full][nullable]

+
+

Since: 0.73

+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/poppler-Poppler-Annotation.html b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Annotation.html new file mode 100644 index 0000000000000000000000000000000000000000..76ad77c633cae1d92695840eabebf1af3b0d6c7f --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Annotation.html @@ -0,0 +1,3267 @@ + + + + +PopplerAnnot: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

PopplerAnnot

+

PopplerAnnot — Annotations

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+PopplerAnnotType + +poppler_annot_get_annot_type () +
+PopplerAnnotCalloutLine * + +poppler_annot_callout_line_copy () +
+void + +poppler_annot_callout_line_free () +
+PopplerAnnotCalloutLine * + +poppler_annot_callout_line_new () +
+PopplerColor * + +poppler_annot_circle_get_interior_color () +
+PopplerAnnot * + +poppler_annot_circle_new () +
+void + +poppler_annot_circle_set_interior_color () +
+PopplerAttachment * + +poppler_annot_file_attachment_get_attachment () +
+gchar * + +poppler_annot_file_attachment_get_name () +
+PopplerAnnotCalloutLine * + +poppler_annot_free_text_get_callout_line () +
+PopplerAnnotFreeTextQuadding + +poppler_annot_free_text_get_quadding () +
+PopplerColor * + +poppler_annot_get_color () +
+gchar * + +poppler_annot_get_contents () +
+PopplerAnnotFlag + +poppler_annot_get_flags () +
+gchar * + +poppler_annot_get_modified () +
+gchar * + +poppler_annot_get_name () +
+gint + +poppler_annot_get_page_index () +
+void + +poppler_annot_get_rectangle () +
+PopplerAnnot * + +poppler_annot_line_new () +
+void + +poppler_annot_line_set_vertices () +
+GDate * + +poppler_annot_markup_get_date () +
+PopplerAnnotExternalDataType + +poppler_annot_markup_get_external_data () +
+gchar * + +poppler_annot_markup_get_label () +
+gdouble + +poppler_annot_markup_get_opacity () +
+gboolean + +poppler_annot_markup_get_popup_is_open () +
+gboolean + +poppler_annot_markup_get_popup_rectangle () +
+PopplerAnnotMarkupReplyType + +poppler_annot_markup_get_reply_to () +
+gchar * + +poppler_annot_markup_get_subject () +
+gboolean + +poppler_annot_markup_has_popup () +
+void + +poppler_annot_markup_set_label () +
+void + +poppler_annot_markup_set_opacity () +
+void + +poppler_annot_markup_set_popup () +
+void + +poppler_annot_markup_set_popup_is_open () +
+void + +poppler_annot_markup_set_popup_rectangle () +
+PopplerMovie * + +poppler_annot_movie_get_movie () +
+gchar * + +poppler_annot_movie_get_title () +
+PopplerAction * + +poppler_annot_screen_get_action () +
+void + +poppler_annot_set_color () +
+void + +poppler_annot_set_contents () +
+void + +poppler_annot_set_flags () +
+void + +poppler_annot_set_rectangle () +
+PopplerColor * + +poppler_annot_square_get_interior_color () +
+PopplerAnnot * + +poppler_annot_square_new () +
+void + +poppler_annot_square_set_interior_color () +
+PopplerAnnotStampIcon + +poppler_annot_stamp_get_icon () +
+PopplerAnnot * + +poppler_annot_stamp_new () +
+gboolean + +poppler_annot_stamp_set_custom_image () +
+void + +poppler_annot_stamp_set_icon () +
+gchar * + +poppler_annot_text_get_icon () +
+gboolean + +poppler_annot_text_get_is_open () +
+PopplerAnnotTextState + +poppler_annot_text_get_state () +
+GArray * + +poppler_annot_text_markup_get_quadrilaterals () +
+PopplerAnnot * + +poppler_annot_text_markup_new_highlight () +
+PopplerAnnot * + +poppler_annot_text_markup_new_squiggly () +
+PopplerAnnot * + +poppler_annot_text_markup_new_strikeout () +
+PopplerAnnot * + +poppler_annot_text_markup_new_underline () +
+void + +poppler_annot_text_markup_set_quadrilaterals () +
+PopplerAnnot * + +poppler_annot_text_new () +
+void + +poppler_annot_text_set_icon () +
+void + +poppler_annot_text_set_is_open () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 PopplerAnnotCalloutLine
 PopplerAnnot
 PopplerAnnotCircle
 PopplerAnnotFileAttachment
 PopplerAnnotFreeText
 PopplerAnnotLine
 PopplerAnnotMarkup
 PopplerAnnotMovie
 PopplerAnnotScreen
 PopplerAnnotSquare
 PopplerAnnotStamp
 PopplerAnnotText
 PopplerAnnotTextMarkup
enumPopplerAnnotExternalDataType
enumPopplerAnnotFlag
enumPopplerAnnotFreeTextQuadding
enumPopplerAnnotMarkupReplyType
enumPopplerAnnotTextState
enumPopplerAnnotStampIcon
enumPopplerAnnotType
#definePOPPLER_ANNOT_TEXT_ICON_CIRCLE
#definePOPPLER_ANNOT_TEXT_ICON_COMMENT
#definePOPPLER_ANNOT_TEXT_ICON_CROSS
#definePOPPLER_ANNOT_TEXT_ICON_HELP
#definePOPPLER_ANNOT_TEXT_ICON_INSERT
#definePOPPLER_ANNOT_TEXT_ICON_KEY
#definePOPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH
#definePOPPLER_ANNOT_TEXT_ICON_NOTE
#definePOPPLER_ANNOT_TEXT_ICON_PARAGRAPH
+
+
+

Object Hierarchy

+
    GBoxed
+    ╰── PopplerAnnotCalloutLine
+    GEnum
+    ├── PopplerAnnotExternalDataType
+    ├── PopplerAnnotFreeTextQuadding
+    ├── PopplerAnnotMarkupReplyType
+    ├── PopplerAnnotStampIcon
+    ├── PopplerAnnotTextState
+    ╰── PopplerAnnotType
+    GFlags
+    ╰── PopplerAnnotFlag
+    GObject
+    ╰── PopplerAnnot
+        ├── PopplerAnnotMarkup
+        │   ├── PopplerAnnotCircle
+        │   ├── PopplerAnnotFileAttachment
+        │   ├── PopplerAnnotFreeText
+        │   ├── PopplerAnnotLine
+        │   ├── PopplerAnnotSquare
+        │   ├── PopplerAnnotText
+        │   ├── PopplerAnnotTextMarkup
+        │   ├── PopplerAnnotCircle
+        │   ├── PopplerAnnotFileAttachment
+        │   ├── PopplerAnnotFreeText
+        │   ╰── PopplerAnnotLine
+        ├── PopplerAnnotMovie
+        ├── PopplerAnnotScreen
+        ╰── PopplerAnnotStamp
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+
+
+

Functions

+
+

poppler_annot_get_annot_type ()

+
PopplerAnnotType
+poppler_annot_get_annot_type (PopplerAnnot *poppler_annot);
+

Gets the type of poppler_annot +

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnot

 
+
+
+

Returns

+

PopplerAnnotType of poppler_annot +.

+
+
+
+
+

poppler_annot_callout_line_copy ()

+
PopplerAnnotCalloutLine *
+poppler_annot_callout_line_copy (PopplerAnnotCalloutLine *callout);
+

It does copy callout + to a new PopplerAnnotCalloutLine.

+
+

Parameters

+
+++++ + + + + + +

callout

the PopplerAnnotCalloutLine to be copied.

 
+
+
+

Returns

+

a new allocated PopplerAnnotCalloutLine as exact copy of +callout +, NULL in other case. It must be freed when done.

+
+
+
+
+

poppler_annot_callout_line_free ()

+
void
+poppler_annot_callout_line_free (PopplerAnnotCalloutLine *callout);
+

Frees the memory used by PopplerAnnotCalloutLine.

+
+

Parameters

+
+++++ + + + + + +

callout

a PopplerAnnotCalloutLine

 
+
+
+
+
+

poppler_annot_callout_line_new ()

+
PopplerAnnotCalloutLine *
+poppler_annot_callout_line_new (void);
+

Creates a new empty PopplerAnnotCalloutLine.

+
+

Returns

+

a new allocated PopplerAnnotCalloutLine, NULL in other case. +It must be freed when done.

+
+
+
+
+

poppler_annot_circle_get_interior_color ()

+
PopplerColor *
+poppler_annot_circle_get_interior_color
+                               (PopplerAnnotCircle *poppler_annot);
+

Retrieves the interior color of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotCircle

 
+
+
+

Returns

+

a new allocated PopplerColor with the color values of +poppler_annot +, or NULL. It must be freed with g_free() when done.

+
+

Since: 0.26

+
+
+
+

poppler_annot_circle_new ()

+
PopplerAnnot *
+poppler_annot_circle_new (PopplerDocument *doc,
+                          PopplerRectangle *rect);
+

Creates a new Circle annotation that will be +located on rect + when added to a page. See +poppler_page_add_annot()

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

doc

a PopplerDocument

 

rect

a PopplerRectangle

 
+
+
+

Returns

+

a newly created PopplerAnnotCircle annotation

+
+

Since: 0.26

+
+
+
+

poppler_annot_circle_set_interior_color ()

+
void
+poppler_annot_circle_set_interior_color
+                               (PopplerAnnotCircle *poppler_annot,
+                                PopplerColor *poppler_color);
+

Sets the interior color of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotCircle

 

poppler_color

a PopplerColor, or NULL.

[allow-none]
+
+

Since: 0.26

+
+
+
+

poppler_annot_file_attachment_get_attachment ()

+
PopplerAttachment *
+poppler_annot_file_attachment_get_attachment
+                               (PopplerAnnotFileAttachment *poppler_annot);
+

Creates a PopplerAttachment for the file of the file attachment annotation annot +. +The PopplerAttachment must be unrefed with g_object_unref by the caller.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotFileAttachment

 
+
+
+

Returns

+

PopplerAttachment +.

+

[transfer full]

+
+

Since: 0.14

+
+
+
+

poppler_annot_file_attachment_get_name ()

+
gchar *
+poppler_annot_file_attachment_get_name
+                               (PopplerAnnotFileAttachment *poppler_annot);
+

Retrieves the name of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotFileAttachment

 
+
+
+

Returns

+

a new allocated string with the name of poppler_annot +. It must +be freed with g_free() when done.

+
+

Since: 0.14

+
+
+
+

poppler_annot_free_text_get_callout_line ()

+
PopplerAnnotCalloutLine *
+poppler_annot_free_text_get_callout_line
+                               (PopplerAnnotFreeText *poppler_annot);
+

Retrieves a PopplerAnnotCalloutLine of four or six numbers specifying a callout +line attached to the poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotFreeText

 
+
+
+

Returns

+

a new allocated PopplerAnnotCalloutLine if the annot has a callout +line, NULL in other case. It must be freed with g_free() when +done.

+
+
+
+
+

poppler_annot_free_text_get_quadding ()

+
PopplerAnnotFreeTextQuadding
+poppler_annot_free_text_get_quadding (PopplerAnnotFreeText *poppler_annot);
+

Retrieves the justification of the text of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotFreeText

 
+
+
+

Returns

+

PopplerAnnotFreeTextQuadding of poppler_annot +.

+
+
+
+
+

poppler_annot_get_color ()

+
PopplerColor *
+poppler_annot_get_color (PopplerAnnot *poppler_annot);
+

Retrieves the color of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnot

 
+
+
+

Returns

+

a new allocated PopplerColor with the color values of +poppler_annot +, or NULL. It must be freed with g_free() when done.

+
+
+
+
+

poppler_annot_get_contents ()

+
gchar *
+poppler_annot_get_contents (PopplerAnnot *poppler_annot);
+

Retrieves the contents of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnot

 
+
+
+

Returns

+

a new allocated string with the contents of poppler_annot +. It +must be freed with g_free() when done.

+
+
+
+
+

poppler_annot_get_flags ()

+
PopplerAnnotFlag
+poppler_annot_get_flags (PopplerAnnot *poppler_annot);
+

Retrieves the flag field specifying various characteristics of the +poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnot

 
+
+
+

Returns

+

the flag field of poppler_annot +.

+
+
+
+
+

poppler_annot_get_modified ()

+
gchar *
+poppler_annot_get_modified (PopplerAnnot *poppler_annot);
+

Retrieves the last modification data of poppler_annot +. The returned +string will be either a PDF format date or a text string. +See also poppler_date_parse()

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnot

 
+
+
+

Returns

+

a new allocated string with the last modification data of +poppler_annot +. It must be freed with g_free() when done.

+
+
+
+
+

poppler_annot_get_name ()

+
gchar *
+poppler_annot_get_name (PopplerAnnot *poppler_annot);
+

Retrieves the name of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnot

 
+
+
+

Returns

+

a new allocated string with the name of poppler_annot +. It must +be freed with g_free() when done.

+
+
+
+
+

poppler_annot_get_page_index ()

+
gint
+poppler_annot_get_page_index (PopplerAnnot *poppler_annot);
+

Returns the page index to which poppler_annot + is associated, or -1 if unknown

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnot

 
+
+
+

Returns

+

page index or -1

+
+

Since: 0.14

+
+
+
+

poppler_annot_get_rectangle ()

+
void
+poppler_annot_get_rectangle (PopplerAnnot *poppler_annot,
+                             PopplerRectangle *poppler_rect);
+

Retrieves the rectangle representing the page coordinates where the +annotation poppler_annot + is placed.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnot

 

poppler_rect

a PopplerRectangle to store the annotation's coordinates.

[out]
+
+

Since: 0.26

+
+
+
+

poppler_annot_line_new ()

+
PopplerAnnot *
+poppler_annot_line_new (PopplerDocument *doc,
+                        PopplerRectangle *rect,
+                        PopplerPoint *start,
+                        PopplerPoint *end);
+

Creates a new Line annotation that will be +located on rect + when added to a page. See +poppler_page_add_annot()

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

doc

a PopplerDocument

 

rect

a PopplerRectangle

 

start

a PopplerPoint of the starting vertice

 

end

a PopplerPoint of the ending vertice

 
+
+
+

Returns

+

A newly created PopplerAnnotLine annotation

+
+

Since: 0.26

+
+
+
+

poppler_annot_line_set_vertices ()

+
void
+poppler_annot_line_set_vertices (PopplerAnnotLine *poppler_annot,
+                                 PopplerPoint *start,
+                                 PopplerPoint *end);
+

Set the coordinate points where the poppler_annot + starts and ends.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotLine

 

start

a PopplerPoint of the starting vertice

 

end

a PopplerPoint of the ending vertice

 
+
+

Since: 0.26

+
+
+
+

poppler_annot_markup_get_date ()

+
GDate *
+poppler_annot_markup_get_date (PopplerAnnotMarkup *poppler_annot);
+

Returns the date and time when the annotation was created

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotMarkup

 
+
+
+

Returns

+

a GDate representing the date and time +when the annotation was created, or NULL.

+

[transfer full]

+
+
+
+
+

poppler_annot_markup_get_external_data ()

+
PopplerAnnotExternalDataType
+poppler_annot_markup_get_external_data
+                               (PopplerAnnotMarkup *poppler_annot);
+

Gets the external data type of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotMarkup

 
+
+
+

Returns

+

PopplerAnnotExternalDataType of poppler_annot +.

+
+
+
+
+

poppler_annot_markup_get_label ()

+
gchar *
+poppler_annot_markup_get_label (PopplerAnnotMarkup *poppler_annot);
+

Retrieves the label text of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotMarkup

 
+
+
+

Returns

+

the label text of poppler_annot +.

+
+
+
+
+

poppler_annot_markup_get_opacity ()

+
gdouble
+poppler_annot_markup_get_opacity (PopplerAnnotMarkup *poppler_annot);
+

Retrieves the opacity value of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotMarkup

 
+
+
+

Returns

+

the opacity value of poppler_annot +, +between 0 (transparent) and 1 (opaque)

+
+
+
+
+

poppler_annot_markup_get_popup_is_open ()

+
gboolean
+poppler_annot_markup_get_popup_is_open
+                               (PopplerAnnotMarkup *poppler_annot);
+

Retrieves the state of the popup window related to poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotMarkup

 
+
+
+

Returns

+

the state of poppler_annot +. TRUE if it's open, FALSE in +other case.

+
+
+
+
+

poppler_annot_markup_get_popup_rectangle ()

+
gboolean
+poppler_annot_markup_get_popup_rectangle
+                               (PopplerAnnotMarkup *poppler_annot,
+                                PopplerRectangle *poppler_rect);
+

Retrieves the rectangle of the popup window related to poppler_annot +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotMarkup

 

poppler_rect

a PopplerRectangle to store the popup rectangle.

[out]
+
+
+

Returns

+

TRUE if PopplerRectangle was correctly filled, FALSE otherwise

+
+

Since: 0.12

+
+
+
+

poppler_annot_markup_get_reply_to ()

+
PopplerAnnotMarkupReplyType
+poppler_annot_markup_get_reply_to (PopplerAnnotMarkup *poppler_annot);
+

Gets the reply type of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotMarkup

 
+
+
+

Returns

+

PopplerAnnotMarkupReplyType of poppler_annot +.

+
+
+
+
+

poppler_annot_markup_get_subject ()

+
gchar *
+poppler_annot_markup_get_subject (PopplerAnnotMarkup *poppler_annot);
+

Retrives the subject text of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotMarkup

 
+
+
+

Returns

+

the subject text of poppler_annot +.

+
+
+
+
+

poppler_annot_markup_has_popup ()

+
gboolean
+poppler_annot_markup_has_popup (PopplerAnnotMarkup *poppler_annot);
+

Return TRUE if the markup annotation has a popup window associated

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotMarkup

 
+
+
+

Returns

+

TRUE, if poppler_annot +has popup, FALSE otherwise

+
+

Since: 0.12

+
+
+
+

poppler_annot_markup_set_label ()

+
void
+poppler_annot_markup_set_label (PopplerAnnotMarkup *poppler_annot,
+                                const gchar *label);
+

Sets the label text of poppler_annot +, replacing the current one

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotMarkup

 

label

a text string containing the new label, or NULL.

[allow-none]
+
+

Since: 0.16

+
+
+
+

poppler_annot_markup_set_opacity ()

+
void
+poppler_annot_markup_set_opacity (PopplerAnnotMarkup *poppler_annot,
+                                  gdouble opacity);
+

Sets the opacity of poppler_annot +. This value applies to +all visible elements of poppler_annot + in its closed state, +but not to the pop-up window that appears when it's openened

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotMarkup

 

opacity

a constant opacity value, between 0 (transparent) and 1 (opaque)

 
+
+

Since: 0.16

+
+
+
+

poppler_annot_markup_set_popup ()

+
void
+poppler_annot_markup_set_popup (PopplerAnnotMarkup *poppler_annot,
+                                PopplerRectangle *popup_rect);
+

Associates a new popup window for editing contents of poppler_annot +. +Popup window shall be displayed by viewers at popup_rect + on the page.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotMarkup

 

popup_rect

a PopplerRectangle

 
+
+

Since: 0.16

+
+
+
+

poppler_annot_markup_set_popup_is_open ()

+
void
+poppler_annot_markup_set_popup_is_open
+                               (PopplerAnnotMarkup *poppler_annot,
+                                gboolean is_open);
+

Sets the state of the popup window related to poppler_annot +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotMarkup

 

is_open

whether popup window should initially be displayed open

 
+
+

Since: 0.16

+
+
+
+

poppler_annot_markup_set_popup_rectangle ()

+
void
+poppler_annot_markup_set_popup_rectangle
+                               (PopplerAnnotMarkup *poppler_annot,
+                                PopplerRectangle *poppler_rect);
+

Sets the rectangle of the popup window related to poppler_annot +. +This doesn't have any effect if poppler_annot + doesn't have a +popup associated, use poppler_annot_markup_set_popup() to associate +a popup window to a PopplerAnnotMarkup.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotMarkup

 

poppler_rect

a PopplerRectangle to set

 
+
+

Since: 0.33

+
+
+
+

poppler_annot_movie_get_movie ()

+
PopplerMovie *
+poppler_annot_movie_get_movie (PopplerAnnotMovie *poppler_annot);
+

Retrieves the movie object (PopplerMovie) stored in the poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotMovie

 
+
+
+

Returns

+

the movie object stored in the poppler_annot +. The returned +object is owned by PopplerAnnotMovie and should not be freed.

+

[transfer none]

+
+

Since: 0.14

+
+
+
+

poppler_annot_movie_get_title ()

+
gchar *
+poppler_annot_movie_get_title (PopplerAnnotMovie *poppler_annot);
+

Retrieves the movie title of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotMovie

 
+
+
+

Returns

+

the title text of poppler_annot +.

+
+

Since: 0.14

+
+
+
+

poppler_annot_screen_get_action ()

+
PopplerAction *
+poppler_annot_screen_get_action (PopplerAnnotScreen *poppler_annot);
+

Retrieves the action (PopplerAction) that shall be performed when poppler_annot + is activated

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotScreen

 
+
+
+

Returns

+

the action to perform. The returned +object is owned by poppler_annot +and should not be freed.

+

[transfer none]

+
+

Since: 0.14

+
+
+
+

poppler_annot_set_color ()

+
void
+poppler_annot_set_color (PopplerAnnot *poppler_annot,
+                         PopplerColor *poppler_color);
+

Sets the color of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnot

 

poppler_color

a PopplerColor, or NULL.

[allow-none]
+
+

Since: 0.16

+
+
+
+

poppler_annot_set_contents ()

+
void
+poppler_annot_set_contents (PopplerAnnot *poppler_annot,
+                            const gchar *contents);
+

Sets the contents of poppler_annot + to the given value, +replacing the current contents.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnot

 

contents

a text string containing the new contents

 
+
+

Since: 0.12

+
+
+
+

poppler_annot_set_flags ()

+
void
+poppler_annot_set_flags (PopplerAnnot *poppler_annot,
+                         PopplerAnnotFlag flags);
+

Sets the flag field specifying various characteristics of the +poppler_annot +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnot

 

flags

a PopplerAnnotFlag

 
+
+

Since: 0.22

+
+
+
+

poppler_annot_set_rectangle ()

+
void
+poppler_annot_set_rectangle (PopplerAnnot *poppler_annot,
+                             PopplerRectangle *poppler_rect);
+

Move the annotation to the rectangle representing the page coordinates +where the annotation poppler_annot + should be placed.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnot

 

poppler_rect

a PopplerRectangle with the new annotation's coordinates

 
+
+

Since: 0.26

+
+
+
+

poppler_annot_square_get_interior_color ()

+
PopplerColor *
+poppler_annot_square_get_interior_color
+                               (PopplerAnnotSquare *poppler_annot);
+

Retrieves the interior color of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotSquare

 
+
+
+

Returns

+

a new allocated PopplerColor with the color values of +poppler_annot +, or NULL. It must be freed with g_free() when done.

+
+

Since: 0.26

+
+
+
+

poppler_annot_square_new ()

+
PopplerAnnot *
+poppler_annot_square_new (PopplerDocument *doc,
+                          PopplerRectangle *rect);
+

Creates a new Square annotation that will be +located on rect + when added to a page. See +poppler_page_add_annot()

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

doc

a PopplerDocument

 

rect

a PopplerRectangle

 
+
+
+

Returns

+

a newly created PopplerAnnotSquare annotation

+
+

Since: 0.26

+
+
+
+

poppler_annot_square_set_interior_color ()

+
void
+poppler_annot_square_set_interior_color
+                               (PopplerAnnotSquare *poppler_annot,
+                                PopplerColor *poppler_color);
+

Sets the interior color of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotSquare

 

poppler_color

a PopplerColor, or NULL.

[allow-none]
+
+

Since: 0.26

+
+
+
+

poppler_annot_stamp_get_icon ()

+
PopplerAnnotStampIcon
+poppler_annot_stamp_get_icon (PopplerAnnotStamp *poppler_annot);
+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotStamp

 
+
+
+

Returns

+

the corresponding PopplerAnnotStampIcon of the icon

+
+

Since: 22.07.0

+
+
+
+

poppler_annot_stamp_new ()

+
PopplerAnnot *
+poppler_annot_stamp_new (PopplerDocument *doc,
+                         PopplerRectangle *rect);
+

Creates a new Stamp annotation that will be +located on rect + when added to a page. See +poppler_page_add_annot()

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

doc

a PopplerDocument

 

rect

a PopplerRectangle

 
+
+
+

Returns

+

a newly created PopplerAnnotStamp annotation

+
+

Since: 22.07.0

+
+
+
+

poppler_annot_stamp_set_custom_image ()

+
gboolean
+poppler_annot_stamp_set_custom_image (PopplerAnnotStamp *poppler_annot,
+                                      cairo_surface_t *image,
+                                      GError **error);
+

Sets the custom image of poppler_annot + to be image +

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotStamp

 

image

an image cairo surface

 

error

return location for error, or NULL.

[nullable]
+
+
+

Returns

+

TRUE on success, FALSE otherwise.

+
+

Since: 22.07.0

+
+
+
+

poppler_annot_stamp_set_icon ()

+
void
+poppler_annot_stamp_set_icon (PopplerAnnotStamp *poppler_annot,
+                              PopplerAnnotStampIcon icon);
+

Sets the icon of poppler_annot + to be one of the predefined values in PopplerAnnotStampIcon

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotStamp

 

icon

the PopplerAnnotStampIcon type of the icon

 
+
+

Since: 22.07.0

+
+
+
+

poppler_annot_text_get_icon ()

+
gchar *
+poppler_annot_text_get_icon (PopplerAnnotText *poppler_annot);
+

Gets name of the icon of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotText

 
+
+
+

Returns

+

a new allocated string containing the icon name

+
+
+
+
+

poppler_annot_text_get_is_open ()

+
gboolean
+poppler_annot_text_get_is_open (PopplerAnnotText *poppler_annot);
+

Retrieves the state of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotText

 
+
+
+

Returns

+

the state of poppler_annot +. TRUE if it's open, FALSE in +other case.

+
+
+
+
+

poppler_annot_text_get_state ()

+
PopplerAnnotTextState
+poppler_annot_text_get_state (PopplerAnnotText *poppler_annot);
+

Retrieves the state of poppler_annot +.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

a PopplerAnnotText

 
+
+
+

Returns

+

PopplerAnnotTextState of poppler_annot +.

+
+
+
+
+

poppler_annot_text_markup_get_quadrilaterals ()

+
GArray *
+poppler_annot_text_markup_get_quadrilaterals
+                               (PopplerAnnotTextMarkup *poppler_annot);
+

Returns a GArray of PopplerQuadrilateral items that map from a +location on page + to a PopplerAnnotTextMarkup. This array must be freed +when done.

+
+

Parameters

+
+++++ + + + + + +

poppler_annot

A PopplerAnnotTextMarkup

 
+
+
+

Returns

+

A GArray of PopplerQuadrilateral.

+

[element-type PopplerQuadrilateral][transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_annot_text_markup_new_highlight ()

+
PopplerAnnot *
+poppler_annot_text_markup_new_highlight
+                               (PopplerDocument *doc,
+                                PopplerRectangle *rect,
+                                GArray *quadrilaterals);
+

Creates a new Highlight Text annotation that will be +located on rect + when added to a page. See poppler_page_add_annot()

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

doc

a PopplerDocument

 

rect

a PopplerRectangle

 

quadrilaterals

A GArray of +PopplerQuadrilaterals.

[element-type PopplerQuadrilateral]
+
+
+

Returns

+

A newly created PopplerAnnotTextMarkup annotation.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_annot_text_markup_new_squiggly ()

+
PopplerAnnot *
+poppler_annot_text_markup_new_squiggly
+                               (PopplerDocument *doc,
+                                PopplerRectangle *rect,
+                                GArray *quadrilaterals);
+

Creates a new Squiggly Text annotation that will be +located on rect + when added to a page. See poppler_page_add_annot()

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

doc

a PopplerDocument

 

rect

a PopplerRectangle

 

quadrilaterals

A GArray of +PopplerQuadrilaterals.

[element-type PopplerQuadrilateral]
+
+
+

Returns

+

A newly created PopplerAnnotTextMarkup annotation.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_annot_text_markup_new_strikeout ()

+
PopplerAnnot *
+poppler_annot_text_markup_new_strikeout
+                               (PopplerDocument *doc,
+                                PopplerRectangle *rect,
+                                GArray *quadrilaterals);
+

Creates a new Strike Out Text annotation that will be +located on rect + when added to a page. See poppler_page_add_annot()

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

doc

a PopplerDocument

 

rect

a PopplerRectangle

 

quadrilaterals

A GArray of +PopplerQuadrilaterals.

[element-type PopplerQuadrilateral]
+
+
+

Returns

+

A newly created PopplerAnnotTextMarkup annotation.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_annot_text_markup_new_underline ()

+
PopplerAnnot *
+poppler_annot_text_markup_new_underline
+                               (PopplerDocument *doc,
+                                PopplerRectangle *rect,
+                                GArray *quadrilaterals);
+

Creates a new Underline Text annotation that will be +located on rect + when added to a page. See poppler_page_add_annot()

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

doc

a PopplerDocument

 

rect

a PopplerRectangle

 

quadrilaterals

A GArray of +PopplerQuadrilaterals.

[element-type PopplerQuadrilateral]
+
+
+

Returns

+

A newly created PopplerAnnotTextMarkup annotation.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_annot_text_markup_set_quadrilaterals ()

+
void
+poppler_annot_text_markup_set_quadrilaterals
+                               (PopplerAnnotTextMarkup *poppler_annot,
+                                GArray *quadrilaterals);
+

Set the regions (Quadrilaterals) to apply the text markup in poppler_annot +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

A PopplerAnnotTextMarkup

 

quadrilaterals

A GArray of +PopplerQuadrilaterals.

[element-type PopplerQuadrilateral]
+
+

Since: 0.26

+
+
+
+

poppler_annot_text_new ()

+
PopplerAnnot *
+poppler_annot_text_new (PopplerDocument *doc,
+                        PopplerRectangle *rect);
+

Creates a new Text annotation that will be +located on rect + when added to a page. See +poppler_page_add_annot()

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

doc

a PopplerDocument

 

rect

a PopplerRectangle

 
+
+
+

Returns

+

A newly created PopplerAnnotText annotation

+
+

Since: 0.16

+
+
+
+

poppler_annot_text_set_icon ()

+
void
+poppler_annot_text_set_icon (PopplerAnnotText *poppler_annot,
+                             const gchar *icon);
+

Sets the icon of poppler_annot +. The following predefined +icons are currently supported:

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_ANNOT_TEXT_ICON_NOTE

POPPLER_ANNOT_TEXT_ICON_COMMENT

POPPLER_ANNOT_TEXT_ICON_KEY

POPPLER_ANNOT_TEXT_ICON_HELP

POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH

POPPLER_ANNOT_TEXT_ICON_PARAGRAPH

POPPLER_ANNOT_TEXT_ICON_INSERT

POPPLER_ANNOT_TEXT_ICON_CROSS

POPPLER_ANNOT_TEXT_ICON_CIRCLE

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotText

 

icon

the name of an icon

 
+
+

Since: 0.16

+
+
+
+

poppler_annot_text_set_is_open ()

+
void
+poppler_annot_text_set_is_open (PopplerAnnotText *poppler_annot,
+                                gboolean is_open);
+

Sets whether poppler_annot + should initially be displayed open

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_annot

a PopplerAnnotText

 

is_open

whether annotation should initially be displayed open

 
+
+

Since: 0.16

+
+
+
+

Types and Values

+
+

PopplerAnnotCalloutLine

+
typedef struct {
+    gboolean multiline;
+    gdouble x1;
+    gdouble y1;
+    gdouble x2;
+    gdouble y2;
+    gdouble x3;
+    gdouble y3;
+} PopplerAnnotCalloutLine;
+
+
+
+
+

PopplerAnnot

+
typedef struct _PopplerAnnot PopplerAnnot;
+
+
+
+

PopplerAnnotCircle

+
typedef struct _PopplerAnnotCircle PopplerAnnotCircle;
+
+
+
+

PopplerAnnotFileAttachment

+
typedef struct _PopplerAnnotFileAttachment PopplerAnnotFileAttachment;
+
+
+
+

PopplerAnnotFreeText

+
typedef struct _PopplerAnnotFreeText PopplerAnnotFreeText;
+
+
+
+

PopplerAnnotLine

+
typedef struct _PopplerAnnotLine PopplerAnnotLine;
+
+
+
+

PopplerAnnotMarkup

+
typedef struct _PopplerAnnotMarkup PopplerAnnotMarkup;
+
+
+
+

PopplerAnnotMovie

+
typedef struct _PopplerAnnotMovie PopplerAnnotMovie;
+
+
+
+

PopplerAnnotScreen

+
typedef struct _PopplerAnnotScreen PopplerAnnotScreen;
+
+
+
+

PopplerAnnotSquare

+
typedef struct _PopplerAnnotSquare PopplerAnnotSquare;
+
+
+
+

PopplerAnnotStamp

+
typedef struct _PopplerAnnotStamp PopplerAnnotStamp;
+
+
+
+

PopplerAnnotText

+
typedef struct _PopplerAnnotText PopplerAnnotText;
+
+
+
+

PopplerAnnotTextMarkup

+
typedef struct _PopplerAnnotTextMarkup PopplerAnnotTextMarkup;
+
+
+
+

enum PopplerAnnotExternalDataType

+
+

Members

+
+++++ + + + + + + + + + + + + +

POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_3D

  

POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_UNKNOWN

  
+
+
+
+
+

enum PopplerAnnotFlag

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_ANNOT_FLAG_UNKNOWN

  

POPPLER_ANNOT_FLAG_INVISIBLE

  

POPPLER_ANNOT_FLAG_HIDDEN

  

POPPLER_ANNOT_FLAG_PRINT

  

POPPLER_ANNOT_FLAG_NO_ZOOM

  

POPPLER_ANNOT_FLAG_NO_ROTATE

  

POPPLER_ANNOT_FLAG_NO_VIEW

  

POPPLER_ANNOT_FLAG_READ_ONLY

  

POPPLER_ANNOT_FLAG_LOCKED

  

POPPLER_ANNOT_FLAG_TOGGLE_NO_VIEW

  

POPPLER_ANNOT_FLAG_LOCKED_CONTENTS

  
+
+
+
+
+

enum PopplerAnnotFreeTextQuadding

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

POPPLER_ANNOT_FREE_TEXT_QUADDING_LEFT_JUSTIFIED

  

POPPLER_ANNOT_FREE_TEXT_QUADDING_CENTERED

  

POPPLER_ANNOT_FREE_TEXT_QUADDING_RIGHT_JUSTIFIED

  
+
+
+
+
+

enum PopplerAnnotMarkupReplyType

+
+

Members

+
+++++ + + + + + + + + + + + + +

POPPLER_ANNOT_MARKUP_REPLY_TYPE_R

  

POPPLER_ANNOT_MARKUP_REPLY_TYPE_GROUP

  
+
+
+
+
+

enum PopplerAnnotTextState

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_ANNOT_TEXT_STATE_MARKED

  

POPPLER_ANNOT_TEXT_STATE_UNMARKED

  

POPPLER_ANNOT_TEXT_STATE_ACCEPTED

  

POPPLER_ANNOT_TEXT_STATE_REJECTED

  

POPPLER_ANNOT_TEXT_STATE_CANCELLED

  

POPPLER_ANNOT_TEXT_STATE_COMPLETED

  

POPPLER_ANNOT_TEXT_STATE_NONE

  

POPPLER_ANNOT_TEXT_STATE_UNKNOWN

  
+
+
+
+
+

enum PopplerAnnotStampIcon

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_ANNOT_STAMP_ICON_UNKNOWN

  

POPPLER_ANNOT_STAMP_ICON_APPROVED

  

POPPLER_ANNOT_STAMP_ICON_AS_IS

  

POPPLER_ANNOT_STAMP_ICON_CONFIDENTIAL

  

POPPLER_ANNOT_STAMP_ICON_FINAL

  

POPPLER_ANNOT_STAMP_ICON_EXPERIMENTAL

  

POPPLER_ANNOT_STAMP_ICON_EXPIRED

  

POPPLER_ANNOT_STAMP_ICON_NOT_APPROVED

  

POPPLER_ANNOT_STAMP_ICON_NOT_FOR_PUBLIC_RELEASE

  

POPPLER_ANNOT_STAMP_ICON_SOLD

  

POPPLER_ANNOT_STAMP_ICON_DEPARTMENTAL

  

POPPLER_ANNOT_STAMP_ICON_FOR_COMMENT

  

POPPLER_ANNOT_STAMP_ICON_FOR_PUBLIC_RELEASE

  

POPPLER_ANNOT_STAMP_ICON_TOP_SECRET

  

POPPLER_ANNOT_STAMP_ICON_NONE

  
+
+
+
+
+

enum PopplerAnnotType

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_ANNOT_UNKNOWN

  

POPPLER_ANNOT_TEXT

  

POPPLER_ANNOT_LINK

  

POPPLER_ANNOT_FREE_TEXT

  

POPPLER_ANNOT_LINE

  

POPPLER_ANNOT_SQUARE

  

POPPLER_ANNOT_CIRCLE

  

POPPLER_ANNOT_POLYGON

  

POPPLER_ANNOT_POLY_LINE

  

POPPLER_ANNOT_HIGHLIGHT

  

POPPLER_ANNOT_UNDERLINE

  

POPPLER_ANNOT_SQUIGGLY

  

POPPLER_ANNOT_STRIKE_OUT

  

POPPLER_ANNOT_STAMP

  

POPPLER_ANNOT_CARET

  

POPPLER_ANNOT_INK

  

POPPLER_ANNOT_POPUP

  

POPPLER_ANNOT_FILE_ATTACHMENT

  

POPPLER_ANNOT_SOUND

  

POPPLER_ANNOT_MOVIE

  

POPPLER_ANNOT_WIDGET

  

POPPLER_ANNOT_SCREEN

  

POPPLER_ANNOT_PRINTER_MARK

  

POPPLER_ANNOT_TRAP_NET

  

POPPLER_ANNOT_WATERMARK

  

POPPLER_ANNOT_3D

  
+
+
+
+
+

POPPLER_ANNOT_TEXT_ICON_CIRCLE

+
#define POPPLER_ANNOT_TEXT_ICON_CIRCLE "Circle"
+
+
+
+
+

POPPLER_ANNOT_TEXT_ICON_COMMENT

+
#define POPPLER_ANNOT_TEXT_ICON_COMMENT "Comment"
+
+
+
+
+

POPPLER_ANNOT_TEXT_ICON_CROSS

+
#define POPPLER_ANNOT_TEXT_ICON_CROSS "Cross"
+
+
+
+
+

POPPLER_ANNOT_TEXT_ICON_HELP

+
#define POPPLER_ANNOT_TEXT_ICON_HELP "Help"
+
+
+
+
+

POPPLER_ANNOT_TEXT_ICON_INSERT

+
#define POPPLER_ANNOT_TEXT_ICON_INSERT "Insert"
+
+
+
+
+

POPPLER_ANNOT_TEXT_ICON_KEY

+
#define POPPLER_ANNOT_TEXT_ICON_KEY "Key"
+
+
+
+
+

POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH

+
#define POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH "NewParagraph"
+
+
+
+
+

POPPLER_ANNOT_TEXT_ICON_NOTE

+
#define POPPLER_ANNOT_TEXT_ICON_NOTE "Note"
+
+
+
+
+

POPPLER_ANNOT_TEXT_ICON_PARAGRAPH

+
#define POPPLER_ANNOT_TEXT_ICON_PARAGRAPH "Paragraph"
+
+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/poppler-Poppler-Color.html b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Color.html new file mode 100644 index 0000000000000000000000000000000000000000..af29a7356423e182b196a9a7f6163b3bdb505e28 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Color.html @@ -0,0 +1,205 @@ + + + + +PopplerColor: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

PopplerColor

+

PopplerColor — Colors

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
+PopplerColor * + +poppler_color_copy () +
+void + +poppler_color_free () +
+PopplerColor * + +poppler_color_new () +
+
+
+

Types and Values

+
++++ + + + + +
 PopplerColor
+
+
+

Object Hierarchy

+
    GBoxed
+    ╰── PopplerColor
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+
+
+

Functions

+
+

poppler_color_copy ()

+
PopplerColor *
+poppler_color_copy (PopplerColor *color);
+

Creates a copy of color +

+
+

Parameters

+
+++++ + + + + + +

color

a PopplerColor to copy

 
+
+
+

Returns

+

a new allocated copy of color +

+
+
+
+
+

poppler_color_free ()

+
void
+poppler_color_free (PopplerColor *color);
+

Frees the given PopplerColor

+
+

Parameters

+
+++++ + + + + + +

color

a PopplerColor

 
+
+
+
+
+

poppler_color_new ()

+
PopplerColor *
+poppler_color_new (void);
+

Creates a new PopplerColor

+
+

Returns

+

a new PopplerColor, use poppler_color_free() to free it

+
+
+
+
+

Types and Values

+
+

PopplerColor

+
typedef struct {
+    guint16 red;
+    guint16 green;
+    guint16 blue;
+} PopplerColor;
+
+

A PopplerColor describes a RGB color. Color components +are values between 0 and 65535

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

guint16 red;

the red component of color

 

guint16 green;

the green component of color

 

guint16 blue;

the blue component of color

 
+
+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/poppler-Poppler-Features.html b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Features.html new file mode 100644 index 0000000000000000000000000000000000000000..b3b46c6f7717ef66e0f58c5fcedd0e24c45d9785 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Features.html @@ -0,0 +1,257 @@ + + + + +Version and Features Information: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

Version and Features Information

+

Version and Features Information — Variables and functions to check the poppler version and features

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
#define +POPPLER_CHECK_VERSION() +
+PopplerBackend + +poppler_get_backend () +
const char * + +poppler_get_version () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + +
#definePOPPLER_HAS_CAIRO
#definePOPPLER_MAJOR_VERSION
#definePOPPLER_MICRO_VERSION
#definePOPPLER_MINOR_VERSION
enumPopplerBackend
+
+
+

Object Hierarchy

+
    GEnum
+    ╰── PopplerBackend
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+

Poppler provides version information, and information about features +enabled at compile time. This is primarily useful in configure checks +for builds that have a configure script, or for allowing code to optionally +depend but not require a specific poppler version.

+
+
+

Functions

+
+

POPPLER_CHECK_VERSION()

+
#define             POPPLER_CHECK_VERSION(major,minor,micro)
+

Checks the version fo the poppler library

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

major

major version (e.g. 0 for version 0.1.2)

 

minor

minor version (e.g. 1 for version 0.1.2)

 

micro

micro version (e.g. 2 for version 0.1.2)

 
+
+
+

Returns

+

TRUE if the version of the poppler header files is the same +as or newer than the passed-in version

+
+

Since: 0.12

+
+
+
+

poppler_get_backend ()

+
PopplerBackend
+poppler_get_backend (void);
+

Returns the backend compiled into the poppler library.

+
+

Returns

+

The backend used by poppler

+
+
+
+
+

poppler_get_version ()

+
const char *
+poppler_get_version (void);
+

Returns the version of poppler in use. This result is not to be freed.

+
+

Returns

+

the version of poppler.

+
+
+
+
+

Types and Values

+
+

POPPLER_HAS_CAIRO

+
#define POPPLER_HAS_CAIRO 1
+
+

Defined if poppler was compiled with cairo support.

+
+
+
+

POPPLER_MAJOR_VERSION

+
#define POPPLER_MAJOR_VERSION (24)
+
+

The major version number of the poppler header files (e.g. in poppler version +0.1.2 this is 0.)

+

Since: 0.12

+
+
+
+

POPPLER_MICRO_VERSION

+
#define POPPLER_MICRO_VERSION (0)
+
+

The micro version number of the poppler header files (e.g. in poppler version +0.1.2 this is 2.)

+

Since: 0.12

+
+
+
+

POPPLER_MINOR_VERSION

+
#define POPPLER_MINOR_VERSION (5)
+
+

The major version number of the poppler header files (e.g. in poppler version +0.1.2 this is 1.)

+

Since: 0.12

+
+
+
+

enum PopplerBackend

+

Backend codes returned by poppler_get_backend().

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

POPPLER_BACKEND_UNKNOWN

 +

Unknown backend

+		 

POPPLER_BACKEND_SPLASH

 +

Splash backend

+		 

POPPLER_BACKEND_CAIRO

 +

Cairo backend

+		 
+
+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/poppler-Poppler-Layer.html b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Layer.html new file mode 100644 index 0000000000000000000000000000000000000000..ae1e0dc937367c756e90a295f2c1020acd7d278c --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Layer.html @@ -0,0 +1,302 @@ + + + + +PopplerLayer: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

PopplerLayer

+

PopplerLayer — Layers

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+gint + +poppler_layer_get_radio_button_group_id () +
const gchar * + +poppler_layer_get_title () +
+void + +poppler_layer_hide () +
+gboolean + +poppler_layer_is_parent () +
+gboolean + +poppler_layer_is_visible () +
+void + +poppler_layer_show () +
+
+
+

Types and Values

+
++++ + + + + +
 PopplerLayer
+
+
+

Object Hierarchy

+
    GObject
+    ╰── PopplerLayer
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+
+
+

Functions

+
+

poppler_layer_get_radio_button_group_id ()

+
gint
+poppler_layer_get_radio_button_group_id
+                               (PopplerLayer *layer);
+

Returns the numeric ID the radio button group associated with layer +.

+
+

Parameters

+
+++++ + + + + + +

layer

a PopplerLayer

 
+
+
+

Returns

+

the ID of the radio button group associated with layer +, +or 0 if the layer is not associated to any radio button group

+
+

Since: 0.12

+
+
+
+

poppler_layer_get_title ()

+
const gchar *
+poppler_layer_get_title (PopplerLayer *layer);
+

Returns the name of the layer suitable for +presentation as a title in a viewer's GUI

+
+

Parameters

+
+++++ + + + + + +

layer

a PopplerLayer

 
+
+
+

Returns

+

a string containing the title of the layer

+
+

Since: 0.12

+
+
+
+

poppler_layer_hide ()

+
void
+poppler_layer_hide (PopplerLayer *layer);
+

Hides layer +. If layer + is the parent of other nested layers, +such layers will be also hidden and will be blocked until layer + +is shown again

+
+

Parameters

+
+++++ + + + + + +

layer

a PopplerLayer

 
+
+

Since: 0.12

+
+
+
+

poppler_layer_is_parent ()

+
gboolean
+poppler_layer_is_parent (PopplerLayer *layer);
+

Returns whether layer + is parent of other nested layers.

+
+

Parameters

+
+++++ + + + + + +

layer

a PopplerLayer

 
+
+
+

Returns

+

TRUE if layer +is a parent layer

+
+

Since: 0.12

+
+
+
+

poppler_layer_is_visible ()

+
gboolean
+poppler_layer_is_visible (PopplerLayer *layer);
+

Returns whether layer + is visible

+
+

Parameters

+
+++++ + + + + + +

layer

a PopplerLayer

 
+
+
+

Returns

+

TRUE if layer +is visible

+
+

Since: 0.12

+
+
+
+

poppler_layer_show ()

+
void
+poppler_layer_show (PopplerLayer *layer);
+

Shows layer +

+
+

Parameters

+
+++++ + + + + + +

layer

a PopplerLayer

 
+
+

Since: 0.12

+
+
+
+

Types and Values

+
+

PopplerLayer

+
typedef struct _PopplerLayer PopplerLayer;
+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/poppler-Poppler-Media.html b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Media.html new file mode 100644 index 0000000000000000000000000000000000000000..bac7ebeb7add81f85e0cf6549470d566c06bbcff --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Media.html @@ -0,0 +1,537 @@ + + + + +PopplerMedia: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

PopplerMedia

+

PopplerMedia — Media

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+gboolean + +(*PopplerMediaSaveFunc) () +
+gboolean + +poppler_media_get_auto_play () +
const gchar * + +poppler_media_get_filename () +
const gchar * + +poppler_media_get_mime_type () +
+gfloat + +poppler_media_get_repeat_count () +
+gboolean + +poppler_media_get_show_controls () +
+gboolean + +poppler_media_is_embedded () +
+gboolean + +poppler_media_save () +
+gboolean + +poppler_media_save_to_fd () +
+gboolean + +poppler_media_save_to_callback () +
+
+
+

Types and Values

+
++++ + + + + +
 PopplerMedia
+
+
+

Object Hierarchy

+
    GObject
+    ╰── PopplerMedia
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+
+
+

Functions

+
+

PopplerMediaSaveFunc ()

+
gboolean
+(*PopplerMediaSaveFunc) (const gchar *buf,
+                         gsize count,
+                         gpointer data,
+                         GError **error);
+

Specifies the type of the function passed to +poppler_media_save_to_callback(). It is called once for each block of +bytes that is "written" by poppler_media_save_to_callback(). If +successful it should return TRUE. If an error occurs it should set +error + and return FALSE, in which case poppler_media_save_to_callback() +will fail with the same error.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

buf

buffer containing +bytes to be written.

[array length=count][element-type guint8]

count

number of bytes in buf +.

 

data

user data passed to poppler_media_save_to_callback().

[closure]

error

GError to set on error, or NULL

 
+
+
+

Returns

+

TRUE if successful, FALSE (with error +set) if failed.

+
+

Since: 0.14

+
+
+
+

poppler_media_get_auto_play ()

+
gboolean
+poppler_media_get_auto_play (PopplerMedia *poppler_media);
+

Returns the auto-play parameter.

+
+

Parameters

+
+++++ + + + + + +

poppler_media

a PopplerMedia

 
+
+
+

Returns

+

TRUE if media should auto-play, FALSE otherwise

+
+

Since: 20.04.0

+
+
+
+

poppler_media_get_filename ()

+
const gchar *
+poppler_media_get_filename (PopplerMedia *poppler_media);
+

Returns the media clip filename, in case of non-embedded media. filename might be +a local relative or absolute path or a URI

+
+

Parameters

+
+++++ + + + + + +

poppler_media

a PopplerMedia

 
+
+
+

Returns

+

a filename, return value is owned by PopplerMedia and should not be freed

+
+

Since: 0.14

+
+
+
+

poppler_media_get_mime_type ()

+
const gchar *
+poppler_media_get_mime_type (PopplerMedia *poppler_media);
+

Returns the media clip mime-type

+
+

Parameters

+
+++++ + + + + + +

poppler_media

a PopplerMedia

 
+
+
+

Returns

+

the mime-type, return value is owned by PopplerMedia and should not be freed

+
+

Since: 0.14

+
+
+
+

poppler_media_get_repeat_count ()

+
gfloat
+poppler_media_get_repeat_count (PopplerMedia *poppler_media);
+

Returns the repeat count parameter.

+
+

Parameters

+
+++++ + + + + + +

poppler_media

a PopplerMedia

 
+
+
+

Returns

+

Repeat count parameter (float)

+
+

Since: 20.04.0

+
+
+
+

poppler_media_get_show_controls ()

+
gboolean
+poppler_media_get_show_controls (PopplerMedia *poppler_media);
+

Returns the show controls parameter.

+
+

Parameters

+
+++++ + + + + + +

poppler_media

a PopplerMedia

 
+
+
+

Returns

+

TRUE if media should show controls, FALSE otherwise

+
+

Since: 20.04.0

+
+
+
+

poppler_media_is_embedded ()

+
gboolean
+poppler_media_is_embedded (PopplerMedia *poppler_media);
+

Whether the media clip is embedded in the PDF. If the result is TRUE, the embedded stream +can be saved with poppler_media_save() or poppler_media_save_to_callback() function. +If the result is FALSE, the media clip filename can be retrieved with +poppler_media_get_filename() function.

+
+

Parameters

+
+++++ + + + + + +

poppler_media

a PopplerMedia

 
+
+
+

Returns

+

TRUE if media clip is embedded, FALSE otherwise

+
+

Since: 0.14

+
+
+
+

poppler_media_save ()

+
gboolean
+poppler_media_save (PopplerMedia *poppler_media,
+                    const char *filename,
+                    GError **error);
+

Saves embedded stream of poppler_media + to a file indicated by filename +. +If error + is set, FALSE will be returned. +Possible errors include those in the G_FILE_ERROR domain +and whatever the save function generates.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

poppler_media

a PopplerMedia

 

filename

name of file to save

 

error

return location for error, or NULL.

[allow-none]
+
+
+

Returns

+

TRUE, if the file successfully saved

+
+

Since: 0.14

+
+
+
+

poppler_media_save_to_fd ()

+
gboolean
+poppler_media_save_to_fd (PopplerMedia *poppler_media,
+                          int fd,
+                          GError **error);
+

Saves embedded stream of poppler_media + to a file referred to by fd +. +If error + is set, FALSE will be returned. +Possible errors include those in the G_FILE_ERROR domain +and whatever the save function generates. +Note that this function takes ownership of fd +; you must not operate on it +again, nor close it.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

poppler_media

a PopplerMedia

 

fd

a valid file descriptor open for writing

 

error

return location for error, or NULL.

[allow-none]
+
+
+

Returns

+

TRUE, if the file successfully saved

+
+

Since: 21.12.0

+
+
+
+

poppler_media_save_to_callback ()

+
gboolean
+poppler_media_save_to_callback (PopplerMedia *poppler_media,
+                                PopplerMediaSaveFunc save_func,
+                                gpointer user_data,
+                                GError **error);
+

Saves embedded stream of poppler_media + by feeding the produced data to save_func +. Can be used +when you want to store the media clip stream to something other than a file, such as +an in-memory buffer or a socket. If error + is set, FALSE will be +returned. Possible errors include those in the G_FILE_ERROR domain and +whatever the save function generates.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

poppler_media

a PopplerMedia

 

save_func

a function that is called to save each block of data that the save routine generates.

[scope call]

user_data

user data to pass to the save function.

 

error

return location for error, or NULL.

[allow-none]
+
+
+

Returns

+

TRUE, if the save successfully completed

+
+

Since: 0.14

+
+
+
+

Types and Values

+
+

PopplerMedia

+
typedef struct _PopplerMedia PopplerMedia;
+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/poppler-Poppler-Movie.html b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Movie.html new file mode 100644 index 0000000000000000000000000000000000000000..d3697fb9120f7b90102b59f12133316394e1f607 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Movie.html @@ -0,0 +1,543 @@ + + + + +PopplerMovie: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

PopplerMovie

+

PopplerMovie — Movies

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+void + +poppler_movie_get_aspect () +
+guint64 + +poppler_movie_get_duration () +
const gchar * + +poppler_movie_get_filename () +
+PopplerMoviePlayMode + +poppler_movie_get_play_mode () +
+gdouble + +poppler_movie_get_rate () +
+gushort + +poppler_movie_get_rotation_angle () +
+guint64 + +poppler_movie_get_start () +
+gdouble + +poppler_movie_get_volume () +
+gboolean + +poppler_movie_is_synchronous () +
+gboolean + +poppler_movie_need_poster () +
+gboolean + +poppler_movie_show_controls () +
+
+
+

Types and Values

+
++++ + + + + + + + + + + +
 PopplerMovie
enumPopplerMoviePlayMode
+
+
+

Object Hierarchy

+
    GEnum
+    ╰── PopplerMoviePlayMode
+    GObject
+    ╰── PopplerMovie
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+
+
+

Functions

+
+

poppler_movie_get_aspect ()

+
void
+poppler_movie_get_aspect (PopplerMovie *poppler_movie,
+                          gint *width,
+                          gint *height);
+

Returns the dimensions of the movie's bounding box (in pixels). +The respective PDF movie dictionary entry is optional; if missing, +-1x-1 will be returned.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

poppler_movie

a PopplerMovie

 

width

width of the movie's bounding box

 

height

height of the movie's bounding box

 
+
+

Since: 0.89

+
+
+
+

poppler_movie_get_duration ()

+
guint64
+poppler_movie_get_duration (PopplerMovie *poppler_movie);
+

Returns the duration of the movie playback

+
+

Parameters

+
+++++ + + + + + +

poppler_movie

a PopplerMovie

 
+
+
+

Returns

+

the duration of the movie playback (in ns)

+
+

Since: 0.80

+
+
+
+

poppler_movie_get_filename ()

+
const gchar *
+poppler_movie_get_filename (PopplerMovie *poppler_movie);
+

Returns the local filename identifying a self-describing movie file

+
+

Parameters

+
+++++ + + + + + +

poppler_movie

a PopplerMovie

 
+
+
+

Returns

+

a local filename, return value is owned by PopplerMovie and +should not be freed

+
+

Since: 0.14

+
+
+
+

poppler_movie_get_play_mode ()

+
PopplerMoviePlayMode
+poppler_movie_get_play_mode (PopplerMovie *poppler_movie);
+

Returns the play mode of poppler_movie +.

+
+

Parameters

+
+++++ + + + + + +

poppler_movie

a PopplerMovie

 
+
+
+

Returns

+

a PopplerMoviePlayMode.

+
+

Since: 0.54

+
+
+
+

poppler_movie_get_rate ()

+
gdouble
+poppler_movie_get_rate (PopplerMovie *poppler_movie);
+

Returns the relative speed of the movie

+
+

Parameters

+
+++++ + + + + + +

poppler_movie

a PopplerMovie

 
+
+
+

Returns

+

the relative speed of the movie (1 means no change)

+
+

Since: 0.80

+
+
+
+

poppler_movie_get_rotation_angle ()

+
gushort
+poppler_movie_get_rotation_angle (PopplerMovie *poppler_movie);
+

Returns the rotation angle

+
+

Parameters

+
+++++ + + + + + +

poppler_movie

a PopplerMovie

 
+
+
+

Returns

+

the number of degrees the movie should be rotated (positive, +multiples of 90: 0, 90, 180, 270)

+
+

Since: 0.80

+
+
+
+

poppler_movie_get_start ()

+
guint64
+poppler_movie_get_start (PopplerMovie *poppler_movie);
+

Returns the start position of the movie playback

+
+

Parameters

+
+++++ + + + + + +

poppler_movie

a PopplerMovie

 
+
+
+

Returns

+

the start position of the movie playback (in ns)

+
+

Since: 0.80

+
+
+
+

poppler_movie_get_volume ()

+
gdouble
+poppler_movie_get_volume (PopplerMovie *poppler_movie);
+

Returns the playback audio volume

+
+

Parameters

+
+++++ + + + + + +

poppler_movie

a PopplerMovie

 
+
+
+

Returns

+

volume setting for the movie (0.0 - 1.0)

+
+

Since: 0.80

+
+
+
+

poppler_movie_is_synchronous ()

+
gboolean
+poppler_movie_is_synchronous (PopplerMovie *poppler_movie);
+

Returns whether the user must wait for the movie to be finished before +the PDF viewer accepts any interactive action

+
+

Parameters

+
+++++ + + + + + +

poppler_movie

a PopplerMovie

 
+
+
+

Returns

+

TRUE if yes, FALSE otherwise

+
+

Since: 0.80

+
+
+
+

poppler_movie_need_poster ()

+
gboolean
+poppler_movie_need_poster (PopplerMovie *poppler_movie);
+

Returns whether a poster image representing the Movie +shall be displayed. The poster image must be retrieved +from the movie file.

+
+

Parameters

+
+++++ + + + + + +

poppler_movie

a PopplerMovie

 
+
+
+

Returns

+

TRUE if move needs a poster image, FALSE otherwise

+
+

Since: 0.14

+
+
+
+

poppler_movie_show_controls ()

+
gboolean
+poppler_movie_show_controls (PopplerMovie *poppler_movie);
+

Returns whether to display a movie controller bar while playing the movie

+
+

Parameters

+
+++++ + + + + + +

poppler_movie

a PopplerMovie

 
+
+
+

Returns

+

TRUE if controller bar should be displayed, FALSE otherwise

+
+

Since: 0.14

+
+
+
+

Types and Values

+
+

PopplerMovie

+
typedef struct _PopplerMovie PopplerMovie;
+
+
+
+

enum PopplerMoviePlayMode

+

Play mode enum values.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_MOVIE_PLAY_MODE_ONCE

 +

the movie should be played once and controls should be closed at the end.

+		 

POPPLER_MOVIE_PLAY_MODE_OPEN

 +

the movie should be played once, but controls should be left open.

+		 

POPPLER_MOVIE_PLAY_MODE_REPEAT

 +

the movie should be played in loop, until manually stopped.

+		 

POPPLER_MOVIE_PLAY_MODE_PALINDROME

 +

the movie should be played forward and backward, forward and backward, +and so forth, until manually stopped.

+		 
+
+

Since: 0.54

+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/poppler-Poppler-Page.html b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Page.html new file mode 100644 index 0000000000000000000000000000000000000000..6c4dfba035c5ef362576cbb7d62e76e405dae975 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Page.html @@ -0,0 +1,3444 @@ + + + + +PopplerPage: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

PopplerPage

+

PopplerPage — Information about a page in a document

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+PopplerAnnotMapping * + +poppler_annot_mapping_copy () +
+void + +poppler_annot_mapping_free () +
+PopplerAnnotMapping * + +poppler_annot_mapping_new () +
+PopplerFormFieldMapping * + +poppler_form_field_mapping_copy () +
+void + +poppler_form_field_mapping_free () +
+PopplerFormFieldMapping * + +poppler_form_field_mapping_new () +
+PopplerImageMapping * + +poppler_image_mapping_copy () +
+void + +poppler_image_mapping_free () +
+PopplerImageMapping * + +poppler_image_mapping_new () +
+PopplerLinkMapping * + +poppler_link_mapping_copy () +
+void + +poppler_link_mapping_free () +
+PopplerLinkMapping * + +poppler_link_mapping_new () +
+void + +poppler_page_add_annot () +
+GList * + +poppler_page_find_text () +
+GList * + +poppler_page_find_text_with_options () +
+void + +poppler_page_free_annot_mapping () +
+void + +poppler_page_free_form_field_mapping () +
+void + +poppler_page_free_image_mapping () +
+void + +poppler_page_free_link_mapping () +
+void + +poppler_page_free_text_attributes () +
+GList * + +poppler_page_get_annot_mapping () +
+gboolean + +poppler_page_get_bounding_box () +
+void + +poppler_page_get_crop_box () +
+double + +poppler_page_get_duration () +
+GList * + +poppler_page_get_form_field_mapping () +
+cairo_surface_t * + +poppler_page_get_image () +
+GList * + +poppler_page_get_image_mapping () +
+int + +poppler_page_get_index () +
+gchar * + +poppler_page_get_label () +
+GList * + +poppler_page_get_link_mapping () +
+cairo_region_t * + +poppler_page_get_selected_region () +
+char * + +poppler_page_get_selected_text () +
+GList * + +poppler_page_get_selection_region () +
+void + +poppler_page_get_size () +
+char * + +poppler_page_get_text () +
+GList * + +poppler_page_get_text_attributes () +
+GList * + +poppler_page_get_text_attributes_for_area () +
+char * + +poppler_page_get_text_for_area () +
+gboolean + +poppler_page_get_text_layout () +
+gboolean + +poppler_page_get_text_layout_for_area () +
+cairo_surface_t * + +poppler_page_get_thumbnail () +
+gboolean + +poppler_page_get_thumbnail_size () +
+PopplerPageTransition * + +poppler_page_get_transition () +
+void + +poppler_page_remove_annot () +
+void + +poppler_page_render () +
+void + +poppler_page_render_for_printing () +
+void + +poppler_page_render_for_printing_with_options () +
+void + +poppler_page_render_selection () +
+void + +poppler_page_render_to_ps () +
+void + +poppler_page_selection_region_free () +
+PopplerPageTransition * + +poppler_page_transition_copy () +
+void + +poppler_page_transition_free () +
+PopplerPageTransition * + +poppler_page_transition_new () +
+PopplerPoint * + +poppler_point_copy () +
+void + +poppler_point_free () +
+PopplerPoint * + +poppler_point_new () +
+PopplerQuadrilateral * + +poppler_quadrilateral_copy () +
+void + +poppler_quadrilateral_free () +
+PopplerQuadrilateral * + +poppler_quadrilateral_new () +
+PopplerRectangle * + +poppler_rectangle_copy () +
+gboolean + +poppler_rectangle_find_get_match_continued () +
+gboolean + +poppler_rectangle_find_get_ignored_hyphen () +
+void + +poppler_rectangle_free () +
+PopplerRectangle * + +poppler_rectangle_new () +
+PopplerTextAttributes * + +poppler_text_attributes_copy () +
+void + +poppler_text_attributes_free () +
+PopplerTextAttributes * + +poppler_text_attributes_new () +
+
+
+

Properties

+
+++++ + + + + + +
+char *labelRead
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 PopplerAnnotMapping
enumPopplerFindFlags
 PopplerFormFieldMapping
 PopplerImageMapping
 PopplerLinkMapping
 PopplerPage
 PopplerPageTransition
enumPopplerPageTransitionAlignment
enumPopplerPageTransitionDirection
enumPopplerPageTransitionType
 PopplerPoint
enumPopplerPrintFlags
 PopplerQuadrilateral
 PopplerRectangle
enumPopplerSelectionStyle
 PopplerTextAttributes
+
+
+

Object Hierarchy

+
    GBoxed
+    ├── PopplerAnnotMapping
+    ├── PopplerFormFieldMapping
+    ├── PopplerImageMapping
+    ├── PopplerLinkMapping
+    ├── PopplerPageTransition
+    ├── PopplerPoint
+    ├── PopplerQuadrilateral
+    ├── PopplerRectangle
+    ╰── PopplerTextAttributes
+    GEnum
+    ├── PopplerPageTransitionAlignment
+    ├── PopplerPageTransitionDirection
+    ├── PopplerPageTransitionType
+    ╰── PopplerSelectionStyle
+    GFlags
+    ├── PopplerFindFlags
+    ╰── PopplerPrintFlags
+    GObject
+    ╰── PopplerPage
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+
+
+

Functions

+
+

poppler_annot_mapping_copy ()

+
PopplerAnnotMapping *
+poppler_annot_mapping_copy (PopplerAnnotMapping *mapping);
+

Creates a copy of mapping +

+
+

Parameters

+
+++++ + + + + + +

mapping

a PopplerAnnotMapping to copy

 
+
+
+

Returns

+

a new allocated copy of mapping +

+
+
+
+
+

poppler_annot_mapping_free ()

+
void
+poppler_annot_mapping_free (PopplerAnnotMapping *mapping);
+

Frees the given PopplerAnnotMapping

+
+

Parameters

+
+++++ + + + + + +

mapping

a PopplerAnnotMapping

 
+
+
+
+
+

poppler_annot_mapping_new ()

+
PopplerAnnotMapping *
+poppler_annot_mapping_new (void);
+

Creates a new PopplerAnnotMapping

+
+

Returns

+

a new PopplerAnnotMapping, use poppler_annot_mapping_free() to free it

+
+
+
+
+

poppler_form_field_mapping_copy ()

+
PopplerFormFieldMapping *
+poppler_form_field_mapping_copy (PopplerFormFieldMapping *mapping);
+

Creates a copy of mapping +

+
+

Parameters

+
+++++ + + + + + +

mapping

a PopplerFormFieldMapping to copy

 
+
+
+

Returns

+

a new allocated copy of mapping +

+
+
+
+
+

poppler_form_field_mapping_free ()

+
void
+poppler_form_field_mapping_free (PopplerFormFieldMapping *mapping);
+

Frees the given PopplerFormFieldMapping

+
+

Parameters

+
+++++ + + + + + +

mapping

a PopplerFormFieldMapping

 
+
+
+
+
+

poppler_form_field_mapping_new ()

+
PopplerFormFieldMapping *
+poppler_form_field_mapping_new (void);
+

Creates a new PopplerFormFieldMapping

+
+

Returns

+

a new PopplerFormFieldMapping, use poppler_form_field_mapping_free() to free it

+
+
+
+
+

poppler_image_mapping_copy ()

+
PopplerImageMapping *
+poppler_image_mapping_copy (PopplerImageMapping *mapping);
+

Creates a copy of mapping +

+
+

Parameters

+
+++++ + + + + + +

mapping

a PopplerImageMapping to copy

 
+
+
+

Returns

+

a new allocated copy of mapping +

+
+
+
+
+

poppler_image_mapping_free ()

+
void
+poppler_image_mapping_free (PopplerImageMapping *mapping);
+

Frees the given PopplerImageMapping

+
+

Parameters

+
+++++ + + + + + +

mapping

a PopplerImageMapping

 
+
+
+
+
+

poppler_image_mapping_new ()

+
PopplerImageMapping *
+poppler_image_mapping_new (void);
+

Creates a new PopplerImageMapping

+
+

Returns

+

a new PopplerImageMapping, use poppler_image_mapping_free() to free it

+
+
+
+
+

poppler_link_mapping_copy ()

+
PopplerLinkMapping *
+poppler_link_mapping_copy (PopplerLinkMapping *mapping);
+

Creates a copy of mapping +

+
+

Parameters

+
+++++ + + + + + +

mapping

a PopplerLinkMapping to copy

 
+
+
+

Returns

+

a new allocated copy of mapping +

+
+
+
+
+

poppler_link_mapping_free ()

+
void
+poppler_link_mapping_free (PopplerLinkMapping *mapping);
+

Frees the given PopplerLinkMapping

+
+

Parameters

+
+++++ + + + + + +

mapping

a PopplerLinkMapping

 
+
+
+
+
+

poppler_link_mapping_new ()

+
PopplerLinkMapping *
+poppler_link_mapping_new (void);
+

Creates a new PopplerLinkMapping

+
+

Returns

+

a new PopplerLinkMapping, use poppler_link_mapping_free() to free it

+
+
+
+
+

poppler_page_add_annot ()

+
void
+poppler_page_add_annot (PopplerPage *page,
+                        PopplerAnnot *annot);
+

Adds annotation annot + to page +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

page

a PopplerPage

 

annot

a PopplerAnnot to add

 
+
+

Since: 0.16

+
+
+
+

poppler_page_find_text ()

+
GList *
+poppler_page_find_text (PopplerPage *page,
+                        const char *text);
+

Finds text + in page + with the default options (POPPLER_FIND_DEFAULT) and +returns a GList of rectangles for each occurrence of the text on the page. +The coordinates are in PDF points.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

page

a PopplerPage

 

text

the text to search for (UTF-8 encoded)

 
+
+
+

Returns

+

a GList of PopplerRectangle,.

+

[element-type PopplerRectangle][transfer full]

+
+
+
+
+

poppler_page_find_text_with_options ()

+
GList *
+poppler_page_find_text_with_options (PopplerPage *page,
+                                     const char *text,
+                                     PopplerFindFlags options);
+

Finds text + in page + with the given PopplerFindFlags options and +returns a GList of rectangles for each occurrence of the text on the page. +The coordinates are in PDF points.

+

When POPPLER_FIND_MULTILINE is passed in options +, matches may span more than +one line. In this case, the returned list will contain one PopplerRectangle +for each part of a match. The function poppler_rectangle_find_get_match_continued() +will return TRUE for all rectangles belonging to the same match, except for +the last one. If a hyphen was ignored at the end of the part of the match, +poppler_rectangle_find_get_ignored_hyphen() will return TRUE for that +rectangle.

+

Note that currently matches spanning more than two lines are not found. +(This limitation may be lifted in a future version.)

+

Note also that currently finding multi-line matches backwards is not +implemented; if you pass POPPLER_FIND_BACKWARDS and POPPLER_FIND_MULTILINE +together, POPPLER_FIND_MULTILINE will be ignored.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

page

a PopplerPage

 

text

the text to search for (UTF-8 encoded)

 

options

find options

 
+
+
+

Returns

+

a newly allocated list +of newly allocated PopplerRectangle. Free with g_list_free_full() using poppler_rectangle_free().

+

[element-type PopplerRectangle][transfer full]

+
+

Since: 0.22

+
+
+
+

poppler_page_free_annot_mapping ()

+
void
+poppler_page_free_annot_mapping (GList *list);
+

Frees a list of PopplerAnnotMappings allocated by +poppler_page_get_annot_mapping(). It also unreferences the PopplerAnnots +that each mapping contains, so if you want to keep them around, you need to +reference them with g_object_ref().

+
+

Parameters

+
+++++ + + + + + +

list

A list of +PopplerAnnotMappings.

[element-type PopplerAnnotMapping]
+
+
+
+
+

poppler_page_free_form_field_mapping ()

+
void
+poppler_page_free_form_field_mapping (GList *list);
+

Frees a list of PopplerFormFieldMappings allocated by +poppler_page_get_form_field_mapping().

+
+

Parameters

+
+++++ + + + + + +

list

A list of +PopplerFormFieldMappings.

[element-type PopplerFormFieldMapping]
+
+
+
+
+

poppler_page_free_image_mapping ()

+
void
+poppler_page_free_image_mapping (GList *list);
+

Frees a list of PopplerImageMappings allocated by +poppler_page_get_image_mapping().

+
+

Parameters

+
+++++ + + + + + +

list

A list of +PopplerImageMappings.

[element-type PopplerImageMapping]
+
+
+
+
+

poppler_page_free_link_mapping ()

+
void
+poppler_page_free_link_mapping (GList *list);
+

Frees a list of PopplerLinkMappings allocated by +poppler_page_get_link_mapping(). It also frees the PopplerActions +that each mapping contains, so if you want to keep them around, you need to +copy them with poppler_action_copy().

+
+

Parameters

+
+++++ + + + + + +

list

A list of +PopplerLinkMappings.

[element-type PopplerLinkMapping]
+
+
+
+
+

poppler_page_free_text_attributes ()

+
void
+poppler_page_free_text_attributes (GList *list);
+

Frees a list of PopplerTextAttributess allocated by +poppler_page_get_text_attributes().

+
+

Parameters

+
+++++ + + + + + +

list

A list of +PopplerTextAttributess.

[element-type PopplerTextAttributes]
+
+

Since: 0.18

+
+
+
+

poppler_page_get_annot_mapping ()

+
GList *
+poppler_page_get_annot_mapping (PopplerPage *page);
+

Returns a list of PopplerAnnotMapping items that map from a location on +page + to a PopplerAnnot. This list must be freed with +poppler_page_free_annot_mapping() when done.

+
+

Parameters

+
+++++ + + + + + +

page

A PopplerPage

 
+
+
+

Returns

+

A GList of PopplerAnnotMapping.

+

[element-type PopplerAnnotMapping][transfer full]

+
+
+
+
+

poppler_page_get_bounding_box ()

+
gboolean
+poppler_page_get_bounding_box (PopplerPage *page,
+                               PopplerRectangle *rect);
+
+
+
+

poppler_page_get_crop_box ()

+
void
+poppler_page_get_crop_box (PopplerPage *page,
+                           PopplerRectangle *rect);
+

Retrurns the crop box of page +

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

page

a PopplerPage

 

rect

a PopplerRectangle to fill.

[out]
+
+
+
+
+

poppler_page_get_duration ()

+
double
+poppler_page_get_duration (PopplerPage *page);
+

Returns the duration of page +

+
+

Parameters

+
+++++ + + + + + +

page

a PopplerPage

 
+
+
+

Returns

+

duration in seconds of page +or -1.

+
+
+
+
+

poppler_page_get_form_field_mapping ()

+
GList *
+poppler_page_get_form_field_mapping (PopplerPage *page);
+

Returns a list of PopplerFormFieldMapping items that map from a +location on page + to a form field. This list must be freed +with poppler_page_free_form_field_mapping() when done.

+
+

Parameters

+
+++++ + + + + + +

page

A PopplerPage

 
+
+
+

Returns

+

A GList of PopplerFormFieldMapping.

+

[element-type PopplerFormFieldMapping][transfer full]

+
+
+
+
+

poppler_page_get_image ()

+
cairo_surface_t *
+poppler_page_get_image (PopplerPage *page,
+                        gint image_id);
+

Returns a cairo surface for the image of the page +

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

page

A PopplerPage

 

image_id

The image identifier

 
+
+
+

Returns

+

A cairo surface for the image

+
+
+
+
+

poppler_page_get_image_mapping ()

+
GList *
+poppler_page_get_image_mapping (PopplerPage *page);
+

Returns a list of PopplerImageMapping items that map from a +location on page + to an image of the page. This list must be freed +with poppler_page_free_image_mapping() when done.

+
+

Parameters

+
+++++ + + + + + +

page

A PopplerPage

 
+
+
+

Returns

+

A GList of PopplerImageMapping.

+

[element-type PopplerImageMapping][transfer full]

+
+
+
+
+

poppler_page_get_index ()

+
int
+poppler_page_get_index (PopplerPage *page);
+

Returns the index of page +

+
+

Parameters

+
+++++ + + + + + +

page

a PopplerPage

 
+
+
+

Returns

+

index value of page +

+
+
+
+
+

poppler_page_get_label ()

+
gchar *
+poppler_page_get_label (PopplerPage *page);
+

Returns the label of page +. Note that page labels +and page indices might not coincide.

+
+

Parameters

+
+++++ + + + + + +

page

a PopplerPage

 
+
+
+

Returns

+

a new allocated string containing the label of page +, +or NULL if page +doesn't have a label

+
+

Since: 0.16

+
+
+
+

poppler_page_get_link_mapping ()

+
GList *
+poppler_page_get_link_mapping (PopplerPage *page);
+

Returns a list of PopplerLinkMapping items that map from a +location on page + to a PopplerAction. This list must be freed +with poppler_page_free_link_mapping() when done.

+
+

Parameters

+
+++++ + + + + + +

page

A PopplerPage

 
+
+
+

Returns

+

A GList of PopplerLinkMapping.

+

[element-type PopplerLinkMapping][transfer full]

+
+
+
+
+

poppler_page_get_selected_region ()

+
cairo_region_t *
+poppler_page_get_selected_region (PopplerPage *page,
+                                  gdouble scale,
+                                  PopplerSelectionStyle style,
+                                  PopplerRectangle *selection);
+

Returns a region containing the area that would be rendered by +poppler_page_render_selection(). +The returned region must be freed with cairo_region_destroy()

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

page

a PopplerPage

 

scale

scale specified as pixels per point

 

style

a PopplerSelectionStyle

 

selection

start and end point of selection as a rectangle

 
+
+
+

Returns

+

a cairo_region_t.

+

[transfer full]

+
+

Since: 0.16

+
+
+
+

poppler_page_get_selected_text ()

+
char *
+poppler_page_get_selected_text (PopplerPage *page,
+                                PopplerSelectionStyle style,
+                                PopplerRectangle *selection);
+

Retrieves the contents of the specified selection + as text.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

page

a PopplerPage

 

style

a PopplerSelectionStyle

 

selection

the PopplerRectangle including the text

 
+
+
+

Returns

+

a pointer to the contents of the selection +as a string

+
+

Since: 0.16

+
+
+
+

poppler_page_get_selection_region ()

+
GList *
+poppler_page_get_selection_region (PopplerPage *page,
+                                   gdouble scale,
+                                   PopplerSelectionStyle style,
+                                   PopplerRectangle *selection);
+
+

poppler_page_get_selection_region has been deprecated since version 0.16 and should not be used in newly-written code.

+

Use poppler_page_get_selected_region() instead.

+
+

Returns a region containing the area that would be rendered by +poppler_page_render_selection() as a GList of +PopplerRectangle. The returned list must be freed with +poppler_page_selection_region_free().

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

page

a PopplerPage

 

scale

scale specified as pixels per point

 

style

a PopplerSelectionStyle

 

selection

start and end point of selection as a rectangle

 
+
+
+

Returns

+

a GList of PopplerRectangle.

+

[element-type PopplerRectangle][transfer full]

+
+
+
+
+

poppler_page_get_size ()

+
void
+poppler_page_get_size (PopplerPage *page,
+                       double *width,
+                       double *height);
+

Gets the size of page + at the current scale and rotation.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

page

A PopplerPage

 

width

return location for the width of page +.

[out][allow-none]

height

return location for the height of page +.

[out][allow-none]
+
+
+
+
+

poppler_page_get_text ()

+
char *
+poppler_page_get_text (PopplerPage *page);
+

Retrieves the text of page +.

+
+

Parameters

+
+++++ + + + + + +

page

a PopplerPage

 
+
+
+

Returns

+

a pointer to the text of the page +as a string

+
+

Since: 0.16

+
+
+
+

poppler_page_get_text_attributes ()

+
GList *
+poppler_page_get_text_attributes (PopplerPage *page);
+

Obtains the attributes of the text as a GList of PopplerTextAttributes. +This list must be freed with poppler_page_free_text_attributes() when done.

+

Each list element is a PopplerTextAttributes struct where start_index and +end_index indicates the range of text (as returned by poppler_page_get_text()) +to which text attributes apply.

+

See also poppler_page_get_text_attributes_for_area()

+
+

Parameters

+
+++++ + + + + + +

page

A PopplerPage

 
+
+
+

Returns

+

A GList of PopplerTextAttributes.

+

[element-type PopplerTextAttributes][transfer full]

+
+

Since: 0.18

+
+
+
+

poppler_page_get_text_attributes_for_area ()

+
GList *
+poppler_page_get_text_attributes_for_area
+                               (PopplerPage *page,
+                                PopplerRectangle *area);
+

Obtains the attributes of the text in area + as a GList of PopplerTextAttributes. +This list must be freed with poppler_page_free_text_attributes() when done.

+

Each list element is a PopplerTextAttributes struct where start_index and +end_index indicates the range of text (as returned by poppler_page_get_text_for_area()) +to which text attributes apply.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

page

A PopplerPage

 

area

a PopplerRectangle

 
+
+
+

Returns

+

A GList of PopplerTextAttributes.

+

[element-type PopplerTextAttributes][transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_page_get_text_for_area ()

+
char *
+poppler_page_get_text_for_area (PopplerPage *page,
+                                PopplerRectangle *area);
+

Retrieves the text of page + contained in area +.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

page

a PopplerPage

 

area

a PopplerRectangle

 
+
+
+

Returns

+

a pointer to the text as a string

+
+

Since: 0.26

+
+
+
+

poppler_page_get_text_layout ()

+
gboolean
+poppler_page_get_text_layout (PopplerPage *page,
+                              PopplerRectangle **rectangles,
+                              guint *n_rectangles);
+

Obtains the layout of the text as a list of PopplerRectangle +This array must be freed with g_free() when done.

+

The position in the array represents an offset in the text returned by +poppler_page_get_text()

+

See also poppler_page_get_text_layout_for_area().

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

page

A PopplerPage

 

rectangles

return location for an array of PopplerRectangle.

[out][array length=n_rectangles][transfer container]

n_rectangles

length of returned array.

[out]
+
+
+

Returns

+

TRUE if the page contains text, FALSE otherwise

+
+

Since: 0.16

+
+
+
+

poppler_page_get_text_layout_for_area ()

+
gboolean
+poppler_page_get_text_layout_for_area (PopplerPage *page,
+                                       PopplerRectangle *area,
+                                       PopplerRectangle **rectangles,
+                                       guint *n_rectangles);
+

Obtains the layout of the text contained in area + as a list of PopplerRectangle +This array must be freed with g_free() when done.

+

The position in the array represents an offset in the text returned by +poppler_page_get_text_for_area()

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

page

A PopplerPage

 

area

a PopplerRectangle

 

rectangles

return location for an array of PopplerRectangle.

[out][array length=n_rectangles][transfer container]

n_rectangles

length of returned array.

[out]
+
+
+

Returns

+

TRUE if the page contains text, FALSE otherwise

+
+

Since: 0.26

+
+
+
+

poppler_page_get_thumbnail ()

+
cairo_surface_t *
+poppler_page_get_thumbnail (PopplerPage *page);
+

Get the embedded thumbnail for the specified page. If the document +doesn't have an embedded thumbnail for the page, this function +returns NULL.

+
+

Parameters

+
+++++ + + + + + +

page

the PopplerPage to get the thumbnail for

 
+
+
+

Returns

+

the tumbnail as a cairo_surface_t or NULL if the document +doesn't have a thumbnail for this page.

+
+
+
+
+

poppler_page_get_thumbnail_size ()

+
gboolean
+poppler_page_get_thumbnail_size (PopplerPage *page,
+                                 int *width,
+                                 int *height);
+

Returns TRUE if page + has a thumbnail associated with it. It also +fills in width + and height + with the width and height of the +thumbnail. The values of width and height are not changed if no +appropriate thumbnail exists.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

page

A PopplerPage

 

width

return location for width.

[out]

height

return location for height.

[out]
+
+
+

Returns

+

TRUE, if page +has a thumbnail associated with it.

+
+
+
+
+

poppler_page_get_transition ()

+
PopplerPageTransition *
+poppler_page_get_transition (PopplerPage *page);
+

Returns the transition effect of page +

+
+

Parameters

+
+++++ + + + + + +

page

a PopplerPage

 
+
+
+

Returns

+

a PopplerPageTransition or NULL.

+
+
+
+
+

poppler_page_remove_annot ()

+
void
+poppler_page_remove_annot (PopplerPage *page,
+                           PopplerAnnot *annot);
+

Removes annotation annot + from page +

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

page

a PopplerPage

 

annot

a PopplerAnnot to remove

 
+
+

Since: 0.22

+
+
+
+

poppler_page_render ()

+
void
+poppler_page_render (PopplerPage *page,
+                     cairo_t *cairo);
+

Render the page to the given cairo context. This function +is for rendering a page that will be displayed. If you want +to render a page that will be printed use +poppler_page_render_for_printing() instead. Please see the documentation +for that function for the differences between rendering to the screen and +rendering to a printer.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

page

the page to render from

 

cairo

cairo context to render to

 
+
+
+
+
+

poppler_page_render_for_printing ()

+
void
+poppler_page_render_for_printing (PopplerPage *page,
+                                  cairo_t *cairo);
+

Render the page to the given cairo context for printing with +POPPLER_PRINT_ALL flags selected. If you want a different set of flags, +use poppler_page_render_for_printing_with_options().

+

The difference between poppler_page_render() and this function is that some +things get rendered differently between screens and printers:

+
    +
  • + PDF annotations get rendered according to their PopplerAnnotFlag value. + For example, POPPLER_ANNOT_FLAG_PRINT refers to whether an annotation + is printed or not, whereas POPPLER_ANNOT_FLAG_NO_VIEW refers to whether + an annotation is invisible when displaying to the screen. +
    • +
  • + PDF supports "hairlines" of width 0.0, which often get rendered as + having a width of 1 device pixel. When displaying on a screen, Cairo + may render such lines wide so that they are hard to see, and Poppler + makes use of PDF's Stroke Adjust graphics parameter to make the lines + easier to see. However, when printing, Poppler is able to directly use a + printer's pixel size instead. +
    • +
  • + Some advanced features in PDF may require an image to be rasterized + before sending off to a printer. This may produce raster images which + exceed Cairo's limits. The "printing" functions will detect this condition + and try to down-scale the intermediate surfaces as appropriate. +
    • +
+
+

Parameters

+
+++++ + + + + + + + + + + + + +

page

the page to render from

 

cairo

cairo context to render to

 
+
+
+
+
+

poppler_page_render_for_printing_with_options ()

+
void
+poppler_page_render_for_printing_with_options
+                               (PopplerPage *page,
+                                cairo_t *cairo,
+                                PopplerPrintFlags options);
+

Render the page to the given cairo context for printing +with the specified options

+

See the documentation for poppler_page_render_for_printing() for the +differences between rendering to the screen and rendering to a printer.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + +

page

the page to render from

 

cairo

cairo context to render to

 

options

print options

 
+
+

Since: 0.16

+
+
+
+

poppler_page_render_selection ()

+
void
+poppler_page_render_selection (PopplerPage *page,
+                               cairo_t *cairo,
+                               PopplerRectangle *selection,
+                               PopplerRectangle *old_selection,
+                               PopplerSelectionStyle style,
+                               PopplerColor *glyph_color,
+                               PopplerColor *background_color);
+

Render the selection specified by selection + for page + to +the given cairo context. The selection will be rendered, using +glyph_color + for the glyphs and background_color + for the selection +background.

+

If non-NULL, old_selection + specifies the selection that is already +rendered to cairo +, in which case this function will (some day) +only render the changed part of the selection.

+
+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

page

the PopplerPage for which to render selection

 

cairo

cairo context to render to

 

selection

start and end point of selection as a rectangle

 

old_selection

previous selection

 

style

a PopplerSelectionStyle

 

glyph_color

color to use for drawing glyphs

 

background_color

color to use for the selection background

 
+
+
+
+
+

poppler_page_render_to_ps ()

+
void
+poppler_page_render_to_ps (PopplerPage *page,
+                           PopplerPSFile *ps_file);
+

Render the page on a postscript file

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

page

a PopplerPage

 

ps_file

the PopplerPSFile to render to

 
+
+
+
+
+

poppler_page_selection_region_free ()

+
void
+poppler_page_selection_region_free (GList *region);
+
+

poppler_page_selection_region_free has been deprecated since version 0.16 and should not be used in newly-written code.

+

Use only to free deprecated regions created by +poppler_page_get_selection_region(). Regions created by +poppler_page_get_selected_region() should be freed with +cairo_region_destroy() instead.

+
+

Frees region +

+
+

Parameters

+
+++++ + + + + + +

region

a GList of +PopplerRectangle.

[element-type PopplerRectangle]
+
+
+
+
+

poppler_page_transition_copy ()

+
PopplerPageTransition *
+poppler_page_transition_copy (PopplerPageTransition *transition);
+

Creates a copy of transition +

+
+

Parameters

+
+++++ + + + + + +

transition

a PopplerPageTransition to copy

 
+
+
+

Returns

+

a new allocated copy of transition +

+
+
+
+
+

poppler_page_transition_free ()

+
void
+poppler_page_transition_free (PopplerPageTransition *transition);
+

Frees the given PopplerPageTransition

+
+

Parameters

+
+++++ + + + + + +

transition

a PopplerPageTransition

 
+
+
+
+
+

poppler_page_transition_new ()

+
PopplerPageTransition *
+poppler_page_transition_new (void);
+

Creates a new PopplerPageTransition

+
+

Returns

+

a new PopplerPageTransition, use poppler_page_transition_free() to free it

+
+
+
+
+

poppler_point_copy ()

+
PopplerPoint *
+poppler_point_copy (PopplerPoint *point);
+

Creates a copy of point +. The copy must be freed with poppler_point_free() +after use.

+
+

Parameters

+
+++++ + + + + + +

point

a PopplerPoint to copy

 
+
+
+

Returns

+

a new allocated copy of point +

+
+

Since: 0.26

+
+
+
+

poppler_point_free ()

+
void
+poppler_point_free (PopplerPoint *point);
+

Frees the memory used by point +

+
+

Parameters

+
+++++ + + + + + +

point

a PopplerPoint

 
+
+

Since: 0.26

+
+
+
+

poppler_point_new ()

+
PopplerPoint *
+poppler_point_new (void);
+

Creates a new PopplerPoint. It must be freed with poppler_point_free() after use.

+
+

Returns

+

a new PopplerPoint

+
+

Since: 0.26

+
+
+
+

poppler_quadrilateral_copy ()

+
PopplerQuadrilateral *
+poppler_quadrilateral_copy (PopplerQuadrilateral *quad);
+

Creates a copy of quad +. The copy must be freed with poppler_quadrilateral_free() after use.

+
+

Parameters

+
+++++ + + + + + +

quad

a PopplerQuadrilateral to copy

 
+
+
+

Returns

+

a new allocated copy of quad +

+
+

Since: 0.26

+
+
+
+

poppler_quadrilateral_free ()

+
void
+poppler_quadrilateral_free (PopplerQuadrilateral *quad);
+

Frees the memory used by quad +

+
+

Parameters

+
+++++ + + + + + +

quad

a PopplerQuadrilateral

 
+
+

Since: 0.26

+
+
+
+

poppler_quadrilateral_new ()

+
PopplerQuadrilateral *
+poppler_quadrilateral_new (void);
+

Creates a new PopplerQuadrilateral. It must be freed with poppler_quadrilateral_free() after use.

+
+

Returns

+

a new PopplerQuadrilateral.

+
+

Since: 0.26

+
+
+
+

poppler_rectangle_copy ()

+
PopplerRectangle *
+poppler_rectangle_copy (PopplerRectangle *rectangle);
+

Creates a copy of rectangle +.

+

Note that you must only use this function on an allocated PopplerRectangle, as +returned by poppler_rectangle_new(), poppler_rectangle_copy(), or the list elements +returned from poppler_page_find_text() or poppler_page_find_text_with_options().

+
+

Parameters

+
+++++ + + + + + +

rectangle

a PopplerRectangle to copy

 
+
+
+

Returns

+

a new allocated copy of rectangle +

+
+
+
+
+

poppler_rectangle_find_get_match_continued ()

+
gboolean
+poppler_rectangle_find_get_match_continued
+                               (const PopplerRectangle *rectangle);
+

When using poppler_page_find_text_with_options() with the +POPPLER_FIND_MULTILINE flag, a match may span more than one line +and thus consist of more than one rectangle. Every rectangle belonging +to the same match will return TRUE from this function, except for +the last rectangle, where this function will return FALSE.

+

Note that you must only call this function on a PopplerRectangle +returned in the list from poppler_page_find_text() or +poppler_page_find_text_with_options().

+
+

Parameters

+
+++++ + + + + + +

rectangle

a PopplerRectangle

 
+
+
+

Returns

+

whether there are more rectangles belonging to the same match

+
+

Since: 21.05.0

+
+
+
+

poppler_rectangle_find_get_ignored_hyphen ()

+
gboolean
+poppler_rectangle_find_get_ignored_hyphen
+                               (const PopplerRectangle *rectangle);
+

When using poppler_page_find_text_with_options() with the +POPPLER_FIND_MULTILINE flag, a match may span more than one line, +and may have been formed by ignoring a hyphen at the end of the line. +When this happens at the end of the line corresponding to rectangle +, +this function returns TRUE (and then poppler_rectangle_find_get_match_continued() +will also return TRUE); otherwise it returns FALSE.

+

Note that you must only call this function on a PopplerRectangle +returned in the list from poppler_page_find_text() or +poppler_page_find_text_with_options().

+
+

Parameters

+
+++++ + + + + + +

rectangle

a PopplerRectangle

 
+
+
+

Returns

+

whether a hyphen was ignored at the end of the line corresponding to rectangle +.

+
+

Since: 21.05.0

+
+
+
+

poppler_rectangle_free ()

+
void
+poppler_rectangle_free (PopplerRectangle *rectangle);
+

Frees the given PopplerRectangle.

+

Note that you must only use this function on an allocated PopplerRectangle, as +returned by poppler_rectangle_new(), poppler_rectangle_copy(), or the list elements +returned from poppler_page_find_text() or poppler_page_find_text_with_options().

+
+

Parameters

+
+++++ + + + + + +

rectangle

a PopplerRectangle

 
+
+
+
+
+

poppler_rectangle_new ()

+
PopplerRectangle *
+poppler_rectangle_new (void);
+

Creates a new PopplerRectangle

+
+

Returns

+

a new PopplerRectangle, use poppler_rectangle_free() to free it

+
+
+
+
+

poppler_text_attributes_copy ()

+
PopplerTextAttributes *
+poppler_text_attributes_copy (PopplerTextAttributes *text_attrs);
+

Creates a copy of text_attrs +

+
+

Parameters

+
+++++ + + + + + +

text_attrs

a PopplerTextAttributes to copy

 
+
+
+

Returns

+

a new allocated copy of text_attrs +

+
+

Since: 0.18

+
+
+
+

poppler_text_attributes_free ()

+
void
+poppler_text_attributes_free (PopplerTextAttributes *text_attrs);
+

Frees the given PopplerTextAttributes

+
+

Parameters

+
+++++ + + + + + +

text_attrs

a PopplerTextAttributes

 
+
+

Since: 0.18

+
+
+
+

poppler_text_attributes_new ()

+
PopplerTextAttributes *
+poppler_text_attributes_new (void);
+

Creates a new PopplerTextAttributes

+
+

Returns

+

a new PopplerTextAttributes, use poppler_text_attributes_free() to free it

+
+

Since: 0.18

+
+
+
+

Types and Values

+
+

PopplerAnnotMapping

+
typedef struct {
+    PopplerRectangle area;
+    PopplerAnnot *annot;
+} PopplerAnnotMapping;
+
+

A PopplerAnnotMapping structure represents the location +of annot + on the page

+
+

Members

+
+++++ + + + + + + + + + + + + +

PopplerRectangle area;

a PopplerRectangle representing an area of the page

 

PopplerAnnot *annot;

a PopplerAnnot

 
+
+
+
+
+

enum PopplerFindFlags

+

Flags using while searching text in a page

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_FIND_DEFAULT

 +

use default search settings

+		 

POPPLER_FIND_CASE_SENSITIVE

 +

do case sensitive search

+		 

POPPLER_FIND_BACKWARDS

 +

search backwards

+		 

POPPLER_FIND_WHOLE_WORDS_ONLY

 +

search only whole words

+		 

POPPLER_FIND_IGNORE_DIACRITICS

 +

do diacritics insensitive search, +i.e. ignore accents, umlauts, diaeresis,etc. while matching. This +option will be ignored if the search term is not pure ascii. Since 0.73.

+		 

POPPLER_FIND_MULTILINE

 +

allows to match on text spanning from +end of a line to the next line. (Currently it won't match on text spanning +more than two lines.) Automatically ignores hyphen at end of line, and +allows whitespace in search term to match on newline char. Since: 21.05.0.

+		 
+
+

Since: 0.22

+
+
+
+

PopplerFormFieldMapping

+
typedef struct {
+    PopplerRectangle area;
+    PopplerFormField *field;
+} PopplerFormFieldMapping;
+
+

A PopplerFormFieldMapping structure represents the location +of field + on the page

+
+

Members

+
+++++ + + + + + + + + + + + + +

PopplerRectangle area;

a PopplerRectangle representing an area of the page

 

PopplerFormField *field;

a PopplerFormField

 
+
+
+
+
+

PopplerImageMapping

+
typedef struct {
+    PopplerRectangle area;
+    gint image_id;
+} PopplerImageMapping;
+
+

A PopplerImageMapping structure represents the location +of an image on the page

+
+

Members

+
+++++ + + + + + + + + + + + + +

PopplerRectangle area;

a PopplerRectangle representing an area of the page

 

gint image_id;

an image identifier

 
+
+
+
+
+

PopplerLinkMapping

+
typedef struct {
+    PopplerRectangle area;
+    PopplerAction *action;
+} PopplerLinkMapping;
+
+

A PopplerLinkMapping structure represents the location +of action + on the page

+
+

Members

+
+++++ + + + + + + + + + + + + +

PopplerRectangle area;

a PopplerRectangle representing an area of the page

 

PopplerAction *action;

a PopplerAction

 
+
+
+
+
+

PopplerPage

+
typedef struct _PopplerPage PopplerPage;
+
+
+
+

PopplerPageTransition

+
typedef struct {
+    PopplerPageTransitionType type;
+    PopplerPageTransitionAlignment alignment;
+    PopplerPageTransitionDirection direction;
+    gint duration;
+    gint angle;
+    gdouble scale;
+    gboolean rectangular;
+    gdouble duration_real;
+} PopplerPageTransition;
+
+

A PopplerPageTransition structures describes a visual transition +to use when moving between pages during a presentation

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

PopplerPageTransitionType type;

the type of transtition

 

PopplerPageTransitionAlignment alignment;

the dimension in which the transition effect shall occur. +Only for POPPLER_PAGE_TRANSITION_SPLIT and POPPLER_PAGE_TRANSITION_BLINDS transition types

 

PopplerPageTransitionDirection direction;

the direction of motion for the transition effect. +Only for POPPLER_PAGE_TRANSITION_SPLIT, POPPLER_PAGE_TRANSITION_BOX and POPPLER_PAGE_TRANSITION_FLY +transition types

 

gint duration;

the duration of the transition effect

 

gint angle;

the direction in which the specified transition effect shall moves, +expressed in degrees counterclockwise starting from a left-to-right direction. +Only for POPPLER_PAGE_TRANSITION_WIPE, POPPLER_PAGE_TRANSITION_GLITTER, POPPLER_PAGE_TRANSITION_FLY, +POPPLER_PAGE_TRANSITION_COVER, POPPLER_PAGE_TRANSITION_UNCOVER and POPPLER_PAGE_TRANSITION_PUSH +transition types

 

gdouble scale;

the starting or ending scale at which the changes shall be drawn. +Only for POPPLER_PAGE_TRANSITION_FLY transition type

 

gboolean rectangular;

whether the area that will be flown is rectangular and opaque. +Only for POPPLER_PAGE_TRANSITION_FLY transition type

 

gdouble duration_real;

  
+
+
+
+
+

enum PopplerPageTransitionAlignment

+

Page transition alignment types for POPPLER_PAGE_TRANSITION_SPLIT +and POPPLER_PAGE_TRANSITION_BLINDS transition types

+
+

Members

+
+++++ + + + + + + + + + + + + +

POPPLER_PAGE_TRANSITION_HORIZONTAL

 +

horizontal dimension

+		 

POPPLER_PAGE_TRANSITION_VERTICAL

 +

vertical dimension

+		 
+
+
+
+
+

enum PopplerPageTransitionDirection

+

Page transition direction types for POPPLER_PAGE_TRANSITION_SPLIT, +POPPLER_PAGE_TRANSITION_BOX and POPPLER_PAGE_TRANSITION_FLY transition types

+
+

Members

+
+++++ + + + + + + + + + + + + +

POPPLER_PAGE_TRANSITION_INWARD

 +

inward from the edges of the page

+		 

POPPLER_PAGE_TRANSITION_OUTWARD

 +

outward from the center of the page

+		 
+
+
+
+
+

enum PopplerPageTransitionType

+

Page transition types

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_PAGE_TRANSITION_REPLACE

 +

the new page replace the old one

+		 

POPPLER_PAGE_TRANSITION_SPLIT

 +

two lines sweep across the screen, revealing the new page

+		 

POPPLER_PAGE_TRANSITION_BLINDS

 +

multiple lines, evenly spaced across the screen, synchronously +sweep in the same direction to reveal the new page

+		 

POPPLER_PAGE_TRANSITION_BOX

 +

a rectangular box sweeps inward from the edges of the page or +outward from the center revealing the new page

+		 

POPPLER_PAGE_TRANSITION_WIPE

 +

a single line sweeps across the screen from one edge to the other +revealing the new page

+		 

POPPLER_PAGE_TRANSITION_DISSOLVE

 +

the old page dissolves gradually to reveal the new one

+		 

POPPLER_PAGE_TRANSITION_GLITTER

 +

similar to POPPLER_PAGE_TRANSITION_DISSOLVE, except that the effect +sweeps across the page in a wide band moving from one side of the screen to the other

+		 

POPPLER_PAGE_TRANSITION_FLY

 +

changes are flown out or in to or from a location that is offscreen

+		 

POPPLER_PAGE_TRANSITION_PUSH

 +

the old page slides off the screen while the new page slides in

+		 

POPPLER_PAGE_TRANSITION_COVER

 +

the new page slides on to the screen covering the old page

+		 

POPPLER_PAGE_TRANSITION_UNCOVER

 +

the old page slides off the screen uncovering the new page

+		 

POPPLER_PAGE_TRANSITION_FADE

 +

the new page gradually becomes visible through the old one

+		 
+
+
+
+
+

PopplerPoint

+
typedef struct {
+    gdouble x;
+    gdouble y;
+} PopplerPoint;
+
+

A PopplerPoint is used to describe a location point on a page

+
+

Members

+
+++++ + + + + + + + + + + + + +

gdouble x;

x coordinate

 

gdouble y;

y coordinate

 
+
+
+
+
+

enum PopplerPrintFlags

+

Printing flags

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

POPPLER_PRINT_DOCUMENT

 +

print main document contents

+		 

POPPLER_PRINT_MARKUP_ANNOTS

 +

print document and markup annotations

+		 

POPPLER_PRINT_STAMP_ANNOTS_ONLY

 +

print document and only stamp annotations

+		 

POPPLER_PRINT_ALL

 +

print main document contents and all markup annotations

+		 
+
+

Since: 0.16

+
+
+
+

PopplerQuadrilateral

+
typedef struct {
+    PopplerPoint p1;
+    PopplerPoint p2;
+    PopplerPoint p3;
+    PopplerPoint p4;
+} PopplerQuadrilateral;
+
+

A PopplerQuadrilateral is used to describe rectangle-like polygon + with arbitrary inclination on a page.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

PopplerPoint p1;

a PopplerPoint with the first vertex coordinates

 

PopplerPoint p2;

a PopplerPoint with the second vertex coordinates

 

PopplerPoint p3;

a PopplerPoint with the third vertex coordinates

 

PopplerPoint p4;

a PopplerPoint with the fourth vertex coordinates

 
+
+

Since: 0.26

+
+
+
+

PopplerRectangle

+
typedef struct {
+    gdouble x1;
+    gdouble y1;
+    gdouble x2;
+    gdouble y2;
+} PopplerRectangle;
+
+

A PopplerRectangle is used to describe +locations on a page and bounding boxes

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

gdouble x1;

x coordinate of lower left corner

 

gdouble y1;

y coordinate of lower left corner

 

gdouble x2;

x coordinate of upper right corner

 

gdouble y2;

y coordinate of upper right corner

 
+
+
+
+
+

enum PopplerSelectionStyle

+

Selection styles

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + +

POPPLER_SELECTION_GLYPH

 +

glyph is the minimum unit for selection

+		 

POPPLER_SELECTION_WORD

 +

word is the minimum unit for selection

+		 

POPPLER_SELECTION_LINE

 +

line is the minimum unit for selection

+		 
+
+
+
+
+

PopplerTextAttributes

+
typedef struct {
+    gchar *font_name;
+    gdouble font_size;
+    gboolean is_underlined;
+    PopplerColor color;
+
+    gint start_index;
+    gint end_index;
+} PopplerTextAttributes;
+
+

A PopplerTextAttributes is used to describe text attributes of a range of text

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

gchar *font_name;

font name

 

gdouble font_size;

font size

 

gboolean is_underlined;

if text is underlined

 

PopplerColor color;

a PopplerColor, the foreground color

 

gint start_index;

start position this text attributes apply

 

gint end_index;

end position this text attributes apply

 
+
+

Since: 0.18

+
+
+
+

Property Details

+
+

The “label” property

+
  “label”                    char *
+

The label of the page or NULL. See also poppler_page_get_label()

+

Owner: PopplerPage

+

Flags: Read

+

Default value: NULL

+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/poppler-Poppler-Text-Span.html b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Text-Span.html new file mode 100644 index 0000000000000000000000000000000000000000..e72cc84fa05351ad446d1f1e32362c77601ee689 --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/poppler-Poppler-Text-Span.html @@ -0,0 +1,368 @@ + + + + +Poppler Text Span: Poppler Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

Poppler Text Span

+

Poppler Text Span

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+PopplerTextSpan * + +poppler_text_span_copy () +
+void + +poppler_text_span_free () +
+void + +poppler_text_span_get_color () +
const gchar * + +poppler_text_span_get_font_name () +
const gchar * + +poppler_text_span_get_text () +
+gboolean + +poppler_text_span_is_bold_font () +
+gboolean + +poppler_text_span_is_fixed_width_font () +
+gboolean + +poppler_text_span_is_serif_font () +
+
+
+

Types and Values

+
++++ + + + + +
 PopplerTextSpan
+
+
+

Object Hierarchy

+
    GBoxed
+    ╰── PopplerTextSpan
+
+
+
+

Includes

+
#include <poppler.h>
+
+
+
+

Description

+
+
+

Functions

+
+

poppler_text_span_copy ()

+
PopplerTextSpan *
+poppler_text_span_copy (PopplerTextSpan *poppler_text_span);
+

Makes a copy of a text span.

+
+

Parameters

+
+++++ + + + + + +

poppler_text_span

a PopplerTextSpan

 
+
+
+

Returns

+

A new PopplerTextSpan.

+

[transfer full]

+
+

Since: 0.26

+
+
+
+

poppler_text_span_free ()

+
void
+poppler_text_span_free (PopplerTextSpan *poppler_text_span);
+

Frees a text span.

+
+

Parameters

+
+++++ + + + + + +

poppler_text_span

A PopplerTextSpan

 
+
+

Since: 0.26

+
+
+
+

poppler_text_span_get_color ()

+
void
+poppler_text_span_get_color (PopplerTextSpan *poppler_text_span,
+                             PopplerColor *color);
+

Obtains the color in which the text is to be rendered.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

poppler_text_span

a PopplerTextSpan

 

color

a return location for a PopplerColor.

[out]
+
+

Since: 0.26

+
+
+
+

poppler_text_span_get_font_name ()

+
const gchar *
+poppler_text_span_get_font_name (PopplerTextSpan *poppler_text_span);
+

Obtains the name of the font in which the span is to be rendered.

+
+

Parameters

+
+++++ + + + + + +

poppler_text_span

a PopplerTextSpan

 
+
+
+

Returns

+

A string containing the font name, or +NULL if a font is not defined.

+

[transfer none]

+
+

Since: 0.26

+
+
+
+

poppler_text_span_get_text ()

+
const gchar *
+poppler_text_span_get_text (PopplerTextSpan *poppler_text_span);
+

Obtains the text contained in the span.

+
+

Parameters

+
+++++ + + + + + +

poppler_text_span

a PopplerTextSpan

 
+
+
+

Returns

+

A string.

+

[transfer none]

+
+

Since: 0.26

+
+
+
+

poppler_text_span_is_bold_font ()

+
gboolean
+poppler_text_span_is_bold_font (PopplerTextSpan *poppler_text_span);
+

Check whether a text span is meant to be rendered using a bold font.

+
+

Parameters

+
+++++ + + + + + +

poppler_text_span

a PopplerTextSpan

 
+
+
+

Returns

+

Whether the span uses bold font.

+
+

Since: 0.26

+
+
+
+

poppler_text_span_is_fixed_width_font ()

+
gboolean
+poppler_text_span_is_fixed_width_font (PopplerTextSpan *poppler_text_span);
+

Check wether a text span is meant to be rendered using a fixed-width font.

+
+

Parameters

+
+++++ + + + + + +

poppler_text_span

a PopplerTextSpan

 
+
+
+

Returns

+

Whether the span uses a fixed-width font.

+
+

Since: 0.26

+
+
+
+

poppler_text_span_is_serif_font ()

+
gboolean
+poppler_text_span_is_serif_font (PopplerTextSpan *poppler_text_span);
+

Check whether a text span is meant to be rendered using a serif font.

+
+

Parameters

+
+++++ + + + + + +

poppler_text_span

a PopplerTextSpan

 
+
+
+

Returns

+

Whether the span uses a serif font.

+
+

Since: 0.26

+
+
+
+

Types and Values

+
+

PopplerTextSpan

+
typedef struct _PopplerTextSpan PopplerTextSpan;
+
+
+
+
+
Generated by GTK-Doc V1.34.0
+ + \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/poppler.devhelp2 b/poppler-24.05.0/glib/reference/html/poppler.devhelp2 new file mode 100644 index 0000000000000000000000000000000000000000..cf629d4aa129fea61af8622edcdb0e1cf74df40a --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/poppler.devhelp2 @@ -0,0 +1,1096 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/poppler-24.05.0/glib/reference/html/right-insensitive.png b/poppler-24.05.0/glib/reference/html/right-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..4c95785b907b978f36674cd98bf5302669c15c1b Binary files /dev/null and b/poppler-24.05.0/glib/reference/html/right-insensitive.png differ diff --git a/poppler-24.05.0/glib/reference/html/right.png b/poppler-24.05.0/glib/reference/html/right.png new file mode 100644 index 0000000000000000000000000000000000000000..76260ec8865f4e13cd269ec62eccd78a33adba3c Binary files /dev/null and b/poppler-24.05.0/glib/reference/html/right.png differ diff --git a/poppler-24.05.0/glib/reference/html/style.css b/poppler-24.05.0/glib/reference/html/style.css new file mode 100644 index 0000000000000000000000000000000000000000..437e8601a85a7c53c5eb0d8d94dd7a09e574606a --- /dev/null +++ b/poppler-24.05.0/glib/reference/html/style.css @@ -0,0 +1,531 @@ +body +{ + font-family: cantarell, sans-serif; +} +.synopsis, .classsynopsis +{ + /* tango:aluminium 1/2 */ + background: #eeeeec; + background: rgba(238, 238, 236, 0.5); + border: solid 1px rgb(238, 238, 236); + padding: 0.5em; +} +.programlisting +{ + /* tango:sky blue 0/1 */ + /* fallback for no rgba support */ + background: #e6f3ff; + border: solid 1px #729fcf; + background: rgba(114, 159, 207, 0.1); + border: solid 1px rgba(114, 159, 207, 0.2); + padding: 0.5em; +} +.variablelist +{ + padding: 4px; + margin-left: 3em; +} +.variablelist td:first-child +{ + vertical-align: top; +} + +span.nowrap { + white-space: nowrap; +} + +div.gallery-float +{ + float: left; + padding: 10px; +} +div.gallery-float img +{ + border-style: none; +} +div.gallery-spacer +{ + clear: both; +} + +a, a:visited +{ + text-decoration: none; + /* tango:sky blue 2 */ + color: #3465a4; +} +a:hover +{ + text-decoration: underline; + /* tango:sky blue 1 */ + color: #729fcf; +} + +.function_type, +.variable_type, +.property_type, +.signal_type, +.parameter_name, +.struct_member_name, +.union_member_name, +.define_keyword, +.datatype_keyword, +.typedef_keyword +{ + text-align: right; +} + +/* dim non-primary columns */ +.c_punctuation, +.function_type, +.variable_type, +.property_type, +.signal_type, +.define_keyword, +.datatype_keyword, +.typedef_keyword, +.property_flags, +.signal_flags, +.parameter_annotations, +.enum_member_annotations, +.struct_member_annotations, +.union_member_annotations +{ + color: #888a85; +} + +.function_type a, +.function_type a:visited, +.function_type a:hover, +.property_type a, +.property_type a:visited, +.property_type a:hover, +.signal_type a, +.signal_type a:visited, +.signal_type a:hover, +.signal_flags a, +.signal_flags a:visited, +.signal_flags a:hover +{ + color: #729fcf; +} + +td p +{ + margin: 0.25em; +} + +div.informaltable table[border="1"], +div.table table +{ + border-collapse: collapse; + border-spacing: 0px; + /* tango:aluminium 3 */ + border: solid 1px #babdb6; +} + +div.informaltable table[border="1"] td, +div.informaltable table th, +div.table table td, div.table table th +{ + /* tango:aluminium 3 */ + border: solid 1px #babdb6; + padding: 3px; + vertical-align: top; +} + +div.informaltable table[border="1"] th, +div.table table th +{ + /* tango:aluminium 2 */ + background-color: #d3d7cf; +} + +h4 +{ + color: #555753; + margin-top: 1em; + margin-bottom: 1em; +} + +hr +{ + /* tango:aluminium 1 */ + color: #d3d7cf; + background: #d3d7cf; + border: none 0px; + height: 1px; + clear: both; + margin: 2.0em 0em 2.0em 0em; +} + +dl.toc dt +{ + padding-bottom: 0.25em; +} + +dl.toc > dt +{ + padding-top: 0.25em; + padding-bottom: 0.25em; + font-weight: bold; +} + +dl.toc > dl +{ + padding-bottom: 0.5em; +} + +.parameter +{ + font-style: normal; +} + +.footer +{ + padding-top: 3.5em; + /* tango:aluminium 3 */ + color: #babdb6; + text-align: center; + font-size: 80%; +} + +.informalfigure, +.figure +{ + margin: 1em; +} + +.informalexample, +.example +{ + margin-top: 1em; + margin-bottom: 1em; +} + +.warning +{ + /* tango:orange 0/1 */ + background: #ffeed9; + background: rgba(252, 175, 62, 0.1); + border-color: #ffb04f; + border-color: rgba(252, 175, 62, 0.2); +} +.note +{ + /* tango:chameleon 0/0.5 */ + background: #d8ffb2; + background: rgba(138, 226, 52, 0.1); + border-color: #abf562; + border-color: rgba(138, 226, 52, 0.2); +} +div.blockquote +{ + border-color: #eeeeec; +} +.note, .warning, div.blockquote +{ + padding: 0.5em; + border-width: 1px; + border-style: solid; + margin: 2em; +} +.note p, .warning p +{ + margin: 0; +} + +div.warning h3.title, +div.note h3.title +{ + display: none; +} + +p + div.section +{ + margin-top: 1em; +} + +div.refnamediv, +div.refsynopsisdiv, +div.refsect1, +div.refsect2, +div.toc, +div.section +{ + margin-bottom: 1em; +} + +/* blob links */ +h2 .extralinks, h3 .extralinks +{ + float: right; + /* tango:aluminium 3 */ + color: #babdb6; + font-size: 80%; + font-weight: normal; +} + +.lineart +{ + color: #d3d7cf; + font-weight: normal; +} + +.annotation +{ + /* tango:aluminium 5 */ + color: #555753; + font-weight: normal; +} + +.structfield +{ + font-style: normal; + font-weight: normal; +} + +acronym,abbr +{ + border-bottom: 1px dotted gray; +} + +.listing_frame { + /* tango:sky blue 1 */ + border: solid 1px #729fcf; + border: solid 1px rgba(114, 159, 207, 0.2); + padding: 0px; +} + +.listing_lines, .listing_code { + margin-top: 0px; + margin-bottom: 0px; + padding: 0.5em; +} +.listing_lines { + /* tango:sky blue 0.5 */ + background: #a6c5e3; + background: rgba(114, 159, 207, 0.2); + /* tango:aluminium 6 */ + color: #2e3436; +} +.listing_code { + /* tango:sky blue 0 */ + background: #e6f3ff; + background: rgba(114, 159, 207, 0.1); +} +.listing_code .programlisting { + /* override from previous */ + border: none 0px; + padding: 0px; + background: none; +} +.listing_lines pre, .listing_code pre { + margin: 0px; +} + +@media screen { + /* these have a as a first child, but since there are no parent selectors + * we can't use that. */ + a.footnote + { + position: relative; + top: 0em ! important; + } + /* this is needed so that the local anchors are displayed below the naviagtion */ + div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] + { + display: inline-block; + position: relative; + top:-5em; + } + /* this seems to be a bug in the xsl style sheets when generating indexes */ + div.index div.index + { + top: 0em; + } + /* make space for the fixed navigation bar and add space at the bottom so that + * link targets appear somewhat close to top + */ + body + { + padding-top: 2.5em; + padding-bottom: 500px; + max-width: 60em; + } + p + { + max-width: 60em; + } + /* style and size the navigation bar */ + table.navigation#top + { + position: fixed; + background: #e2e2e2; + border-bottom: solid 1px #babdb6; + border-spacing: 5px; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + z-index: 10; + } + table.navigation#top td + { + padding-left: 6px; + padding-right: 6px; + } + .navigation a, .navigation a:visited + { + /* tango:sky blue 3 */ + color: #204a87; + } + .navigation a:hover + { + /* tango:sky blue 2 */ + color: #3465a4; + } + td.shortcuts + { + /* tango:sky blue 2 */ + color: #3465a4; + font-size: 80%; + white-space: nowrap; + } + td.shortcuts .dim + { + color: #babdb6; + } + .navigation .title + { + font-size: 80%; + max-width: none; + margin: 0px; + font-weight: normal; + } +} +@media screen and (min-width: 60em) { + /* screen larger than 60em */ + body { margin: auto; } +} +@media screen and (max-width: 60em) { + /* screen less than 60em */ + #nav_hierarchy { display: none; } + #nav_interfaces { display: none; } + #nav_prerequisites { display: none; } + #nav_derived_interfaces { display: none; } + #nav_implementations { display: none; } + #nav_child_properties { display: none; } + #nav_style_properties { display: none; } + #nav_index { display: none; } + #nav_glossary { display: none; } + .gallery_image { display: none; } + .property_flags { display: none; } + .signal_flags { display: none; } + .parameter_annotations { display: none; } + .enum_member_annotations { display: none; } + .struct_member_annotations { display: none; } + .union_member_annotations { display: none; } + /* now that a column is hidden, optimize space */ + col.parameters_name { width: auto; } + col.parameters_description { width: auto; } + col.struct_members_name { width: auto; } + col.struct_members_description { width: auto; } + col.enum_members_name { width: auto; } + col.enum_members_description { width: auto; } + col.union_members_name { width: auto; } + col.union_members_description { width: auto; } + .listing_lines { display: none; } +} +@media print { + table.navigation { + visibility: collapse; + display: none; + } + div.titlepage table.navigation { + visibility: visible; + display: table; + background: #e2e2e2; + border: solid 1px #babdb6; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + height: 3em; + } +} + +pre { line-height: 125%; } +td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } +span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } +td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } +span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } +.hll { background-color: #ffffcc } +.c { color: #3D7B7B; font-style: italic } /* Comment */ +.err { border: 1px solid #FF0000 } /* Error */ +.k { color: #008000; font-weight: bold } /* Keyword */ +.o { color: #666666 } /* Operator */ +.ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */ +.cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */ +.cp { color: #9C6500 } /* Comment.Preproc */ +.cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */ +.c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */ +.cs { color: #3D7B7B; font-style: italic } /* Comment.Special */ +.gd { color: #A00000 } /* Generic.Deleted */ +.ge { font-style: italic } /* Generic.Emph */ +.ges { font-weight: bold; font-style: italic } /* Generic.EmphStrong */ +.gr { color: #E40000 } /* Generic.Error */ +.gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.gi { color: #008400 } /* Generic.Inserted */ +.go { color: #717171 } /* Generic.Output */ +.gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +.gs { font-weight: bold } /* Generic.Strong */ +.gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.gt { color: #0044DD } /* Generic.Traceback */ +.kc { color: #008000; font-weight: bold } /* Keyword.Constant */ +.kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ +.kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ +.kp { color: #008000 } /* Keyword.Pseudo */ +.kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ +.kt { color: #B00040 } /* Keyword.Type */ +.m { color: #666666 } /* Literal.Number */ +.s { color: #BA2121 } /* Literal.String */ +.na { color: #687822 } /* Name.Attribute */ +.nb { color: #008000 } /* Name.Builtin */ +.nc { color: #0000FF; font-weight: bold } /* Name.Class */ +.no { color: #880000 } /* Name.Constant */ +.nd { color: #AA22FF } /* Name.Decorator */ +.ni { color: #717171; font-weight: bold } /* Name.Entity */ +.ne { color: #CB3F38; font-weight: bold } /* Name.Exception */ +.nf { color: #0000FF } /* Name.Function */ +.nl { color: #767600 } /* Name.Label */ +.nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ +.nt { color: #008000; font-weight: bold } /* Name.Tag */ +.nv { color: #19177C } /* Name.Variable */ +.ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +.w { color: #bbbbbb } /* Text.Whitespace */ +.mb { color: #666666 } /* Literal.Number.Bin */ +.mf { color: #666666 } /* Literal.Number.Float */ +.mh { color: #666666 } /* Literal.Number.Hex */ +.mi { color: #666666 } /* Literal.Number.Integer */ +.mo { color: #666666 } /* Literal.Number.Oct */ +.sa { color: #BA2121 } /* Literal.String.Affix */ +.sb { color: #BA2121 } /* Literal.String.Backtick */ +.sc { color: #BA2121 } /* Literal.String.Char */ +.dl { color: #BA2121 } /* Literal.String.Delimiter */ +.sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ +.s2 { color: #BA2121 } /* Literal.String.Double */ +.se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */ +.sh { color: #BA2121 } /* Literal.String.Heredoc */ +.si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */ +.sx { color: #008000 } /* Literal.String.Other */ +.sr { color: #A45A77 } /* Literal.String.Regex */ +.s1 { color: #BA2121 } /* Literal.String.Single */ +.ss { color: #19177C } /* Literal.String.Symbol */ +.bp { color: #008000 } /* Name.Builtin.Pseudo */ +.fm { color: #0000FF } /* Name.Function.Magic */ +.vc { color: #19177C } /* Name.Variable.Class */ +.vg { color: #19177C } /* Name.Variable.Global */ +.vi { color: #19177C } /* Name.Variable.Instance */ +.vm { color: #19177C } /* Name.Variable.Magic */ +.il { color: #666666 } /* Literal.Number.Integer.Long */ \ No newline at end of file diff --git a/poppler-24.05.0/glib/reference/html/up-insensitive.png b/poppler-24.05.0/glib/reference/html/up-insensitive.png new file mode 100644 index 0000000000000000000000000000000000000000..f40498606db349a7321cf6b470523e836ee7ac2e Binary files /dev/null and b/poppler-24.05.0/glib/reference/html/up-insensitive.png differ diff --git a/poppler-24.05.0/glib/reference/html/up.png b/poppler-24.05.0/glib/reference/html/up.png new file mode 100644 index 0000000000000000000000000000000000000000..80b4b37e997d69b2e128bc3090bc447ccb74bbe9 Binary files /dev/null and b/poppler-24.05.0/glib/reference/html/up.png differ diff --git a/poppler-24.05.0/glib/reference/poppler-docs.sgml b/poppler-24.05.0/glib/reference/poppler-docs.sgml new file mode 100644 index 0000000000000000000000000000000000000000..c1b5e2b50682be12cf0bad37cf496b765590e339 --- /dev/null +++ b/poppler-24.05.0/glib/reference/poppler-docs.sgml @@ -0,0 +1,135 @@ + + +]> + + + Poppler Reference Manual + + for Poppler &version; + + + + + Poppler + + + + + + + + + + + + + + + + + + + Index of all symbols + + + + Index of deprecated symbols + + + + Index of new symbols in 0.12 + + + + Index of new symbols in 0.14 + + + + Index of new symbols in 0.16 + + + + Index of new symbols in 0.18 + + + + Index of new symbols in 0.20 + + + + Index of new symbols in 0.22 + + + + Index of new symbols in 0.26 + + + + Index of new symbols in 0.33 + + + + Index of new symbols in 0.46 + + + + Index of new symbols in 0.54 + + + + Index of new symbols in 0.70 + + + + Index of new symbols in 0.72 + + + + Index of new symbols in 0.73 + + + + Index of new symbols in 0.78 + + + + Index of new symbols in 0.80 + + + + Index of new symbols in 0.82 + + + + Index of new symbols in 0.88 + + + + Index of new symbols in 0.89 + + + + Index of new symbols in 0.90 + + + + Index of new symbols in 20.04.0 + + + + Index of new symbols in 20.09.0 + + + + Index of new symbols in 21.05.0 + + + + Index of new symbols in 21.12.0 + + + + + diff --git a/poppler-24.05.0/glib/reference/poppler-overrides.txt b/poppler-24.05.0/glib/reference/poppler-overrides.txt new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/poppler-24.05.0/glib/reference/poppler-sections.txt b/poppler-24.05.0/glib/reference/poppler-sections.txt new file mode 100644 index 0000000000000000000000000000000000000000..6ed80d30bbd7b9840089d7ed0108206fe1b003df --- /dev/null +++ b/poppler-24.05.0/glib/reference/poppler-sections.txt @@ -0,0 +1,910 @@ +poppler.h + +
+poppler-color +Poppler Color +POPPLER_TYPE_COLOR +poppler_color_get_type +
+ +
+poppler-page +Poppler Page +PopplerAnnotMapping +PopplerFindFlags +PopplerFormFieldMapping +PopplerImageMapping +PopplerLinkMapping +PopplerPage +PopplerPageTransition +PopplerPageTransitionAlignment +PopplerPageTransitionDirection +PopplerPageTransitionType +PopplerPoint +PopplerPrintFlags +PopplerQuadrilateral +PopplerRectangle +PopplerSelectionStyle +PopplerTextAttributes +poppler_annot_mapping_copy +poppler_annot_mapping_free +poppler_annot_mapping_new +poppler_form_field_mapping_copy +poppler_form_field_mapping_free +poppler_form_field_mapping_new +poppler_image_mapping_copy +poppler_image_mapping_free +poppler_image_mapping_new +poppler_link_mapping_copy +poppler_link_mapping_free +poppler_link_mapping_new +poppler_page_add_annot +poppler_page_find_text +poppler_page_find_text_with_options +poppler_page_free_annot_mapping +poppler_page_free_form_field_mapping +poppler_page_free_image_mapping +poppler_page_free_link_mapping +poppler_page_free_text_attributes +poppler_page_get_annot_mapping +poppler_page_get_bounding_box +poppler_page_get_crop_box +poppler_page_get_duration +poppler_page_get_form_field_mapping +poppler_page_get_image +poppler_page_get_image_mapping +poppler_page_get_index +poppler_page_get_label +poppler_page_get_link_mapping +poppler_page_get_selected_region +poppler_page_get_selected_text +poppler_page_get_selection_region +poppler_page_get_size +poppler_page_get_text +poppler_page_get_text_attributes +poppler_page_get_text_attributes_for_area +poppler_page_get_text_for_area +poppler_page_get_text_layout +poppler_page_get_text_layout_for_area +poppler_page_get_thumbnail +poppler_page_get_thumbnail_size +poppler_page_get_transition +poppler_page_remove_annot +poppler_page_render +poppler_page_render_for_printing +poppler_page_render_for_printing_with_options +poppler_page_render_selection +poppler_page_render_to_ps +poppler_page_selection_region_free +poppler_page_transition_copy +poppler_page_transition_free +poppler_page_transition_new +poppler_point_copy +poppler_point_free +poppler_point_new +poppler_quadrilateral_copy +poppler_quadrilateral_free +poppler_quadrilateral_new +poppler_rectangle_copy +poppler_rectangle_find_get_match_continued +poppler_rectangle_find_get_ignored_hyphen +poppler_rectangle_free +poppler_rectangle_new +poppler_text_attributes_copy +poppler_text_attributes_free +poppler_text_attributes_new + + +POPPLER_PAGE +POPPLER_IS_PAGE +POPPLER_TYPE_ANNOT_MAPPING +POPPLER_TYPE_FIND_FLAGS +POPPLER_TYPE_FORM_FIELD_MAPPING +POPPLER_TYPE_IMAGE_MAPPING +POPPLER_TYPE_LINK_MAPPING +POPPLER_TYPE_PAGE +POPPLER_TYPE_PAGE_TRANSITION +POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT +POPPLER_TYPE_PAGE_TRANSITION_DIRECTION +POPPLER_TYPE_PAGE_TRANSITION_TYPE +POPPLER_TYPE_POINT +POPPLER_TYPE_PRINT_FLAGS +POPPLER_TYPE_QUADRILATERAL +POPPLER_TYPE_RECTANGLE +POPPLER_TYPE_SELECTION_STYLE +POPPLER_TYPE_TEXT_ATTRIBUTES +poppler_annot_mapping_get_type +poppler_find_flags_get_type +poppler_form_field_mapping_get_type +poppler_image_mapping_get_type +poppler_link_mapping_get_type +poppler_page_get_type +poppler_page_transition_alignment_get_type +poppler_page_transition_direction_get_type +poppler_page_transition_get_type +poppler_page_transition_type_get_type +poppler_point_get_type +poppler_print_flags_get_type +poppler_quadrilateral_get_type +poppler_rectangle_get_type +poppler_selection_style_get_type +poppler_signature_info_get_type +poppler_text_attributes_get_type +
+ +
+poppler-document +PopplerDocument +PopplerDocument +PopplerFontInfo +PopplerFontType +PopplerFontsIter +PopplerIndexIter +PopplerLayersIter +PopplerPDFConformance +PopplerPDFPart +PopplerPDFSubtype +PopplerPSFile +PopplerPageLayout +PopplerPageMode +PopplerPageRange +PopplerPermissions +PopplerPrintDuplex +PopplerPrintScaling +PopplerViewerPreferences +poppler_document_create_dests_tree +poppler_document_find_dest +poppler_document_get_attachments +poppler_document_get_author +poppler_document_get_creation_date +poppler_document_get_creation_date_time +poppler_document_get_creator +poppler_document_get_form_field +poppler_document_get_id +poppler_document_get_keywords +poppler_document_get_metadata +poppler_document_get_modification_date +poppler_document_get_modification_date_time +poppler_document_get_n_attachments +poppler_document_get_n_pages +poppler_document_get_n_signatures +poppler_document_get_page +poppler_document_get_page_by_label +poppler_document_get_page_layout +poppler_document_get_page_mode +poppler_document_get_pdf_conformance +poppler_document_get_pdf_part +poppler_document_get_pdf_subtype +poppler_document_get_pdf_subtype_string +poppler_document_get_pdf_version +poppler_document_get_pdf_version_string +poppler_document_get_permissions +poppler_document_get_print_duplex +poppler_document_get_print_n_copies +poppler_document_get_print_page_ranges +poppler_document_get_print_scaling +poppler_document_get_producer +poppler_document_get_signature_fields +poppler_document_get_subject +poppler_document_get_title +poppler_document_has_attachments +poppler_document_has_javascript +poppler_document_is_linearized +poppler_document_new_from_bytes +poppler_document_new_from_data +poppler_document_new_from_fd +poppler_document_new_from_file +poppler_document_new_from_gfile +poppler_document_new_from_stream +poppler_document_reset_form +poppler_document_save +poppler_document_save_a_copy +poppler_document_save_to_fd +poppler_document_set_author +poppler_document_set_creation_date +poppler_document_set_creation_date_time +poppler_document_set_creator +poppler_document_set_keywords +poppler_document_set_modification_date +poppler_document_set_modification_date_time +poppler_document_set_producer +poppler_document_set_subject +poppler_document_set_title +poppler_font_info_free +poppler_font_info_new +poppler_font_info_scan +poppler_fonts_iter_copy +poppler_fonts_iter_free +poppler_fonts_iter_get_encoding +poppler_fonts_iter_get_file_name +poppler_fonts_iter_get_font_type +poppler_fonts_iter_get_full_name +poppler_fonts_iter_get_name +poppler_fonts_iter_get_substitute_name +poppler_fonts_iter_is_embedded +poppler_fonts_iter_is_subset +poppler_fonts_iter_next +poppler_index_iter_copy +poppler_index_iter_free +poppler_index_iter_get_action +poppler_index_iter_get_child +poppler_index_iter_is_open +poppler_index_iter_new +poppler_index_iter_next +poppler_layers_iter_copy +poppler_layers_iter_free +poppler_layers_iter_get_child +poppler_layers_iter_get_layer +poppler_layers_iter_get_title +poppler_layers_iter_new +poppler_layers_iter_next +poppler_ps_file_free +poppler_ps_file_new +poppler_ps_file_new_fd +poppler_ps_file_set_duplex +poppler_ps_file_set_paper_size + + +POPPLER_DOCUMENT +POPPLER_FONT_INFO +POPPLER_PS_FILE +POPPLER_IS_DOCUMENT +POPPLER_IS_FONT_INFO +POPPLER_IS_PS_FILE +POPPLER_TYPE_DOCUMENT +POPPLER_TYPE_FONTS_ITER +POPPLER_TYPE_FONT_INFO +POPPLER_TYPE_FONT_TYPE +POPPLER_TYPE_INDEX_ITER +POPPLER_TYPE_LAYER +POPPLER_TYPE_LAYERS_ITER +POPPLER_TYPE_PAGE_LAYOUT +POPPLER_TYPE_PAGE_MODE +POPPLER_TYPE_PDF_CONFORMANCE +POPPLER_TYPE_PDF_PART +POPPLER_TYPE_PDF_SUBTYPE +POPPLER_TYPE_PERMISSIONS +POPPLER_TYPE_PRINT_DUPLEX +POPPLER_TYPE_PRINT_SCALING +POPPLER_TYPE_PS_FILE +POPPLER_TYPE_VIEWER_PREFERENCES +poppler_document_get_type +poppler_font_info_get_type +poppler_font_type_get_type +poppler_fonts_iter_get_type +poppler_index_iter_get_type +poppler_layers_iter_get_type +poppler_page_layout_get_type +poppler_page_mode_get_type +poppler_pdf_conformance_get_type +poppler_pdf_part_get_type +poppler_pdf_subtype_get_type +poppler_permissions_get_type +poppler_print_duplex_get_type +poppler_print_scaling_get_type +poppler_ps_file_get_type +poppler_viewer_preferences_get_type +
+ +
+poppler-action +PopplerAction +PopplerAction +PopplerDest +PopplerActionAny +PopplerActionGotoDest +PopplerActionGotoRemote +PopplerActionLaunch +PopplerActionUri +PopplerActionNamed +PopplerActionMovie +PopplerActionRendition +PopplerActionResetForm +PopplerActionOCGState +PopplerActionJavascript +PopplerActionType +PopplerDestType +PopplerActionMovieOperation +PopplerActionLayer +PopplerActionLayerAction +poppler_action_copy +poppler_action_free +poppler_dest_copy +poppler_dest_free + + +POPPLER_ACTION +POPPLER_TYPE_ACTION +POPPLER_TYPE_ACTION_TYPE +POPPLER_TYPE_DEST +POPPLER_TYPE_DEST_TYPE +POPPLER_TYPE_ACTION_LAYER_ACTION +POPPLER_TYPE_ACTION_MOVIE_OPERATION + + + +poppler_action_get_type +poppler_dest_get_type +poppler_action_type_get_type +poppler_dest_type_get_type +poppler_action_layer_action_get_type +poppler_action_movie_operation_get_type +
+ +
+poppler-attachment +PopplerAttachment +PopplerAttachment +PopplerAttachmentSaveFunc +poppler_attachment_get_checksum +poppler_attachment_get_ctime +poppler_attachment_get_description +poppler_attachment_get_mtime +poppler_attachment_get_name +poppler_attachment_get_size +poppler_attachment_save +poppler_attachment_save_to_fd +poppler_attachment_save_to_callback + + +POPPLER_ATTACHMENT +POPPLER_IS_ATTACHMENT +POPPLER_TYPE_ATTACHMENT + + +poppler_attachment_get_type +
+ +
+poppler-form-field +PopplerFormField +PopplerFormField +PopplerAdditionalActionType +PopplerCertificateInfo +PopplerCertificateStatus +PopplerFormFieldType +PopplerFormButtonType +PopplerFormChoiceType +PopplerFormTextType +PopplerSignatureInfo +PopplerSignatureStatus +PopplerSignatureValidationFlags +poppler_certificate_info_get_expiration_time +poppler_certificate_info_get_issuance_time +poppler_certificate_info_get_issuer_common_name +poppler_certificate_info_get_issuer_email +poppler_certificate_info_get_issuer_organization +poppler_certificate_info_get_subject_common_name +poppler_certificate_info_get_subject_email +poppler_certificate_info_get_subject_organization +poppler_form_field_button_get_button_type +poppler_form_field_button_get_state +poppler_form_field_button_set_state +poppler_form_field_choice_can_select_multiple +poppler_form_field_choice_commit_on_change +poppler_form_field_choice_do_spell_check +poppler_form_field_choice_get_choice_type +poppler_form_field_choice_get_item +poppler_form_field_choice_get_n_items +poppler_form_field_choice_get_text +poppler_form_field_choice_is_editable +poppler_form_field_choice_is_item_selected +poppler_form_field_choice_select_item +poppler_form_field_choice_set_text +poppler_form_field_choice_toggle_item +poppler_form_field_choice_unselect_all +poppler_form_field_get_action +poppler_form_field_get_additional_action +poppler_form_field_get_alternate_ui_name +poppler_form_field_get_field_type +poppler_form_field_get_font_size +poppler_form_field_get_id +poppler_form_field_get_mapping_name +poppler_form_field_get_name +poppler_form_field_get_partial_name +poppler_form_field_is_read_only +poppler_form_field_signature_validate_async +poppler_form_field_signature_validate_finish +poppler_form_field_signature_validate_sync +poppler_form_field_text_do_scroll +poppler_form_field_text_do_spell_check +poppler_form_field_text_get_max_len +poppler_form_field_text_get_text +poppler_form_field_text_get_text_type +poppler_form_field_text_is_password +poppler_form_field_text_is_rich_text +poppler_form_field_text_set_text +poppler_signature_info_copy +poppler_signature_info_free +poppler_signature_info_get_certificate_info +poppler_signature_info_get_certificate_status +poppler_signature_info_get_signature_status +poppler_signature_info_get_signer_name +poppler_signature_info_get_local_signing_time +poppler_signing_data_new +poppler_signing_data_copy +poppler_signing_data_free +poppler_signing_data_set_destination_filename +poppler_signing_data_set_certificate_info +poppler_signing_data_set_page +poppler_signing_data_set_signature_text +poppler_signing_data_set_signature_text_left +poppler_signing_data_set_signature_rectangle +poppler_signing_data_set_font_color +poppler_signing_data_set_font_size +poppler_signing_data_set_left_font_size +poppler_signing_data_set_border_color +poppler_signing_data_set_border_width +poppler_signing_data_set_background_color +poppler_signing_data_set_field_partial_name +poppler_signing_data_set_reason +poppler_signing_data_set_location +poppler_signing_data_set_image_path +poppler_signing_data_set_password +poppler_signing_data_set_document_owner_password +poppler_signing_data_set_document_user_password +poppler_signing_data_get_destination_filename +poppler_signing_data_get_certificate_info +poppler_signing_data_get_page +poppler_signing_data_get_signature_text +poppler_signing_data_get_signature_text_left +poppler_signing_data_get_signature_rectangle +poppler_signing_data_get_font_color +poppler_signing_data_get_font_size +poppler_signing_data_get_left_font_size +poppler_signing_data_get_border_color +poppler_signing_data_get_border_width +poppler_signing_data_get_background_color +poppler_signing_data_get_field_partial_name +poppler_signing_data_get_reason +poppler_signing_data_get_location +poppler_signing_data_get_image_path +poppler_signing_data_get_password +poppler_signing_data_get_document_owner_password +poppler_signing_data_get_document_user_password +poppler_certificate_info_new +poppler_certificate_info_copy +poppler_certificate_info_get_nick_name +poppler_certificate_info_get_subject_common_name +poppler_get_certificate_info_by_nick_name +poppler_set_nss_dir +poppler_get_nss_dir +poppler_set_nss_password_callback +poppler_get_available_signing_certificates +poppler_certificate_info_free + + +POPPLER_FORM_FIELD +POPPLER_IS_FORM_FIELD +POPPLER_TYPE_ADDITIONAL_ACTION_TYPE +POPPLER_TYPE_CERTIFICATE_STATUS +POPPLER_TYPE_FORM_BUTTON_TYPE +POPPLER_TYPE_FORM_CHOICE_TYPE +POPPLER_TYPE_FORM_FIELD +POPPLER_TYPE_FORM_FIELD_TYPE +POPPLER_TYPE_FORM_TEXT_TYPE +POPPLER_TYPE_SIGNATURE_INFO +POPPLER_TYPE_SIGNATURE_STATUS +poppler_additional_action_type_get_type +poppler_certificate_status_get_type +poppler_form_button_type_get_type +poppler_form_choice_type_get_type +poppler_form_field_get_type +poppler_form_field_type_get_type +poppler_form_text_type_get_type +poppler_signature_info_get_type +poppler_signature_status_get_type +poppler_signature_validation_flags_get_type +
+ +
+poppler-annot +Poppler Annotation +PopplerAnnotCalloutLine +PopplerAnnot +PopplerAnnotCircle +PopplerAnnotFileAttachment +PopplerAnnotFreeText +PopplerAnnotLine +PopplerAnnotMarkup +PopplerAnnotMovie +PopplerAnnotScreen +PopplerAnnotSquare +PopplerAnnotStamp +PopplerAnnotText +PopplerAnnotTextMarkup +PopplerAnnotExternalDataType +PopplerAnnotFlag +PopplerAnnotFreeTextQuadding +PopplerAnnotMarkupReplyType +PopplerAnnotTextState +PopplerAnnotStampIcon +PopplerAnnotType +poppler_annot_get_annot_type +POPPLER_ANNOT_TEXT_ICON_CIRCLE +POPPLER_ANNOT_TEXT_ICON_COMMENT +POPPLER_ANNOT_TEXT_ICON_CROSS +POPPLER_ANNOT_TEXT_ICON_HELP +POPPLER_ANNOT_TEXT_ICON_INSERT +POPPLER_ANNOT_TEXT_ICON_KEY +POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH +POPPLER_ANNOT_TEXT_ICON_NOTE +POPPLER_ANNOT_TEXT_ICON_PARAGRAPH +poppler_annot_callout_line_copy +poppler_annot_callout_line_free +poppler_annot_callout_line_new +poppler_annot_circle_get_interior_color +poppler_annot_circle_new +poppler_annot_circle_set_interior_color +poppler_annot_file_attachment_get_attachment +poppler_annot_file_attachment_get_name +poppler_annot_free_text_get_callout_line +poppler_annot_free_text_get_quadding +poppler_annot_get_color +poppler_annot_get_contents +poppler_annot_get_flags +poppler_annot_get_modified +poppler_annot_get_name +poppler_annot_get_page_index +poppler_annot_get_rectangle +poppler_annot_line_new +poppler_annot_line_set_vertices +poppler_annot_markup_get_date +poppler_annot_markup_get_external_data +poppler_annot_markup_get_label +poppler_annot_markup_get_opacity +poppler_annot_markup_get_popup_is_open +poppler_annot_markup_get_popup_rectangle +poppler_annot_markup_get_reply_to +poppler_annot_markup_get_subject +poppler_annot_markup_has_popup +poppler_annot_markup_set_label +poppler_annot_markup_set_opacity +poppler_annot_markup_set_popup +poppler_annot_markup_set_popup_is_open +poppler_annot_markup_set_popup_rectangle +poppler_annot_movie_get_movie +poppler_annot_movie_get_title +poppler_annot_screen_get_action +poppler_annot_set_color +poppler_annot_set_contents +poppler_annot_set_flags +poppler_annot_set_rectangle +poppler_annot_square_get_interior_color +poppler_annot_square_new +poppler_annot_square_set_interior_color +poppler_annot_stamp_get_icon +poppler_annot_stamp_new +poppler_annot_stamp_set_custom_image +poppler_annot_stamp_set_icon +poppler_annot_text_get_icon +poppler_annot_text_get_is_open +poppler_annot_text_get_state +poppler_annot_text_markup_get_quadrilaterals +poppler_annot_text_markup_new_highlight +poppler_annot_text_markup_new_squiggly +poppler_annot_text_markup_new_strikeout +poppler_annot_text_markup_new_underline +poppler_annot_text_markup_set_quadrilaterals +poppler_annot_text_new +poppler_annot_text_set_icon +poppler_annot_text_set_is_open + + +POPPLER_ANNOT +POPPLER_ANNOT_CIRCLE +POPPLER_ANNOT_FILE_ATTACHMENT +POPPLER_ANNOT_FREE_TEXT +POPPLER_ANNOT_LINE +POPPLER_ANNOT_MARKUP +POPPLER_ANNOT_MOVIE +POPPLER_ANNOT_SCREEN +POPPLER_ANNOT_SQUARE +POPPLER_ANNOT_STAMP +POPPLER_ANNOT_TEXT +POPPLER_ANNOT_TEXT_MARKUP +POPPLER_IS_ANNOT +POPPLER_IS_ANNOT_CIRCLE +POPPLER_IS_ANNOT_FILE_ATTACHMENT +POPPLER_IS_ANNOT_FREE_TEXT +POPPLER_IS_ANNOT_LINE +POPPLER_IS_ANNOT_MARKUP +POPPLER_IS_ANNOT_MOVIE +POPPLER_IS_ANNOT_SCREEN +POPPLER_IS_ANNOT_SQUARE +POPPLER_IS_ANNOT_STAMP +POPPLER_IS_ANNOT_TEXT +POPPLER_IS_ANNOT_TEXT_MARKUP +POPPLER_TYPE_ANNOT +POPPLER_TYPE_ANNOT_CALLOUT_LINE +POPPLER_TYPE_ANNOT_CIRCLE +POPPLER_TYPE_ANNOT_EXTERNAL_DATA_TYPE +POPPLER_TYPE_ANNOT_FILE_ATTACHMENT +POPPLER_TYPE_ANNOT_FLAG +POPPLER_TYPE_ANNOT_FREE_TEXT +POPPLER_TYPE_ANNOT_FREE_TEXT_QUADDING +POPPLER_TYPE_ANNOT_LINE +POPPLER_TYPE_ANNOT_MARKUP +POPPLER_TYPE_ANNOT_MARKUP_REPLY_TYPE +POPPLER_TYPE_ANNOT_MOVIE +POPPLER_TYPE_ANNOT_SCREEN +POPPLER_TYPE_ANNOT_SQUARE +POPPLER_TYPE_ANNOT_STAMP +POPPLER_TYPE_ANNOT_TEXT +POPPLER_TYPE_ANNOT_TEXT_MARKUP +POPPLER_TYPE_ANNOT_TEXT_STATE +POPPLER_TYPE_ANNOT_TYPE +poppler_annot_callout_line_get_type +poppler_annot_circle_get_type +poppler_annot_external_data_type_get_type +poppler_annot_file_attachment_get_type +poppler_annot_flag_get_type +poppler_annot_free_text_get_type +poppler_annot_free_text_quadding_get_type +poppler_annot_get_type +poppler_annot_line_get_type +poppler_annot_markup_get_type +poppler_annot_markup_reply_type_get_type +poppler_annot_movie_get_type +poppler_annot_screen_get_type +poppler_annot_square_get_type +poppler_annot_stamp_get_type +poppler_annot_text_get_type +poppler_annot_text_markup_get_type +poppler_annot_text_state_get_type +poppler_annot_type_get_type +
+ +
+poppler-layer +Poppler Layer +PopplerLayer +poppler_layer_get_radio_button_group_id +poppler_layer_get_title +poppler_layer_hide +poppler_layer_is_parent +poppler_layer_is_visible +poppler_layer_show + + +POPPLER_LAYER +POPPLER_IS_LAYER +POPPLER_TYPE_LAYER +poppler_layer_get_type +
+ +
+poppler-media +Poppler Media +PopplerMedia +PopplerMediaSaveFunc +poppler_media_get_auto_play +poppler_media_get_filename +poppler_media_get_mime_type +poppler_media_get_repeat_count +poppler_media_get_show_controls +poppler_media_is_embedded +poppler_media_save +poppler_media_save_to_fd +poppler_media_save_to_callback + + +POPPLER_MEDIA +POPPLER_IS_MEDIA +POPPLER_TYPE_MEDIA +poppler_media_get_type +
+ +
+poppler-movie +Poppler Movie +PopplerMovie +PopplerMoviePlayMode +poppler_movie_get_aspect +poppler_movie_get_duration +poppler_movie_get_filename +poppler_movie_get_play_mode +poppler_movie_get_rate +poppler_movie_get_rotation_angle +poppler_movie_get_start +poppler_movie_get_volume +poppler_movie_is_synchronous +poppler_movie_need_poster +poppler_movie_show_controls + + +POPPLER_MOVIE +POPPLER_IS_MOVIE +POPPLER_TYPE_MOVIE +poppler_movie_get_type +POPPLER_TYPE_MOVIE_PLAY_MODE +poppler_movie_play_mode_get_type +
+ +
+poppler-structure-element +PopplerStructureElement +PopplerStructureBlockAlign +PopplerStructureBorderStyle +PopplerStructureElement +PopplerStructureElementIter +PopplerStructureElementKind +PopplerStructureFormRole +PopplerStructureFormState +PopplerStructureGetTextFlags +PopplerStructureGlyphOrientation +PopplerStructureInlineAlign +PopplerStructureListNumbering +PopplerStructurePlacement +PopplerStructureRubyAlign +PopplerStructureRubyPosition +PopplerStructureTableScope +PopplerStructureTextAlign +PopplerStructureTextDecoration +PopplerStructureWritingMode +poppler_structure_element_get_abbreviation +poppler_structure_element_get_actual_text +poppler_structure_element_get_alt_text +poppler_structure_element_get_background_color +poppler_structure_element_get_baseline_shift +poppler_structure_element_get_block_align +poppler_structure_element_get_border_color +poppler_structure_element_get_border_style +poppler_structure_element_get_border_thickness +poppler_structure_element_get_bounding_box +poppler_structure_element_get_color +poppler_structure_element_get_column_count +poppler_structure_element_get_column_gaps +poppler_structure_element_get_column_widths +poppler_structure_element_get_end_indent +poppler_structure_element_get_form_description +poppler_structure_element_get_form_role +poppler_structure_element_get_form_state +poppler_structure_element_get_glyph_orientation +poppler_structure_element_get_height +poppler_structure_element_get_id +poppler_structure_element_get_inline_align +poppler_structure_element_get_kind +poppler_structure_element_get_language +poppler_structure_element_get_line_height +poppler_structure_element_get_list_numbering +poppler_structure_element_get_padding +poppler_structure_element_get_page +poppler_structure_element_get_placement +poppler_structure_element_get_ruby_align +poppler_structure_element_get_ruby_position +poppler_structure_element_get_space_after +poppler_structure_element_get_space_before +poppler_structure_element_get_start_indent +poppler_structure_element_get_table_border_style +poppler_structure_element_get_table_column_span +poppler_structure_element_get_table_headers +poppler_structure_element_get_table_padding +poppler_structure_element_get_table_row_span +poppler_structure_element_get_table_scope +poppler_structure_element_get_table_summary +poppler_structure_element_get_text +poppler_structure_element_get_text_align +poppler_structure_element_get_text_decoration_color +poppler_structure_element_get_text_decoration_thickness +poppler_structure_element_get_text_decoration_type +poppler_structure_element_get_text_indent +poppler_structure_element_get_text_spans +poppler_structure_element_get_title +poppler_structure_element_get_width +poppler_structure_element_get_writing_mode +poppler_structure_element_is_block +poppler_structure_element_is_content +poppler_structure_element_is_grouping +poppler_structure_element_is_inline +poppler_structure_element_iter_copy +poppler_structure_element_iter_free +poppler_structure_element_iter_get_child +poppler_structure_element_iter_get_element +poppler_structure_element_iter_new +poppler_structure_element_iter_next + + +POPPLER_STRUCTURE_ELEMENT +POPPLER_IS_STRUCTURE_ELEMENT +POPPLER_TYPE_STRUCTURE_BLOCK_ALIGN +POPPLER_TYPE_STRUCTURE_BORDER_STYLE +POPPLER_TYPE_STRUCTURE_ELEMENT +POPPLER_TYPE_STRUCTURE_ELEMENT_ITER +POPPLER_TYPE_STRUCTURE_ELEMENT_KIND +POPPLER_TYPE_STRUCTURE_FORM_ROLE +POPPLER_TYPE_STRUCTURE_FORM_STATE +POPPLER_TYPE_STRUCTURE_GET_TEXT_FLAGS +POPPLER_TYPE_STRUCTURE_GLYPH_ORIENTATION +POPPLER_TYPE_STRUCTURE_INLINE_ALIGN +POPPLER_TYPE_STRUCTURE_LIST_NUMBERING +POPPLER_TYPE_STRUCTURE_PLACEMENT +POPPLER_TYPE_STRUCTURE_REFERENCE +POPPLER_TYPE_STRUCTURE_RUBY_ALIGN +POPPLER_TYPE_STRUCTURE_RUBY_POSITION +POPPLER_TYPE_STRUCTURE_TABLE_SCOPE +POPPLER_TYPE_STRUCTURE_TEXT_ALIGN +POPPLER_TYPE_STRUCTURE_TEXT_DECORATION +POPPLER_TYPE_STRUCTURE_WRITING_MODE +poppler_structure_block_align_get_type +poppler_structure_border_style_get_type +poppler_structure_element_get_type +poppler_structure_element_iter_get_type +poppler_structure_element_kind_get_type +poppler_structure_form_role_get_type +poppler_structure_form_state_get_type +poppler_structure_get_text_flags_get_type +poppler_structure_glyph_orientation_get_type +poppler_structure_inline_align_get_type +poppler_structure_list_numbering_get_type +poppler_structure_placement_get_type +poppler_structure_ruby_align_get_type +poppler_structure_ruby_position_get_type +poppler_structure_table_scope_get_type +poppler_structure_text_align_get_type +poppler_structure_text_decoration_get_type +poppler_structure_writing_mode_get_type +
+ +
+poppler-text-span +Poppler Text Span +PopplerTextSpan +poppler_text_span_copy +poppler_text_span_free +poppler_text_span_get_color +poppler_text_span_get_font_name +poppler_text_span_get_text +poppler_text_span_is_bold_font +poppler_text_span_is_fixed_width_font +poppler_text_span_is_serif_font + + +POPPLER_TYPE_TEXT_SPAN +poppler_text_span_get_type +
+ +
+poppler-pdf-utility-functions +PDF Utility functions +poppler_date_parse +poppler_named_dest_from_bytestring +poppler_named_dest_to_bytestring +
+ +
+poppler-features +Poppler Features +POPPLER_HAS_CAIRO +POPPLER_CHECK_VERSION +POPPLER_MAJOR_VERSION +POPPLER_MICRO_VERSION +POPPLER_MINOR_VERSION +PopplerBackend +poppler_get_backend +poppler_get_version + + +POPPLER_TYPE_BACKEND +poppler_backend_get_type + + +POPPLER_PUBLIC +
+ +
+poppler-errors +POPPLER_ERROR +PopplerError + + +POPPLER_TYPE_ERROR +poppler_error_get_type +poppler_error_quark +
diff --git a/poppler-24.05.0/glib/reference/poppler.types b/poppler-24.05.0/glib/reference/poppler.types new file mode 100644 index 0000000000000000000000000000000000000000..e5b924e8a0a990db012e3331f5c6bb4881928c97 --- /dev/null +++ b/poppler-24.05.0/glib/reference/poppler.types @@ -0,0 +1,97 @@ +poppler_action_get_type +poppler_action_layer_action_get_type +poppler_action_movie_operation_get_type +poppler_action_type_get_type +poppler_additional_action_type_get_type +poppler_annot_callout_line_get_type +poppler_annot_circle_get_type +poppler_annot_external_data_type_get_type +poppler_annot_file_attachment_get_type +poppler_annot_flag_get_type +poppler_annot_free_text_get_type +poppler_annot_free_text_quadding_get_type +poppler_annot_get_type +poppler_annot_line_get_type +poppler_annot_mapping_get_type +poppler_annot_markup_get_type +poppler_annot_markup_reply_type_get_type +poppler_annot_movie_get_type +poppler_annot_screen_get_type +poppler_annot_square_get_type +poppler_annot_stamp_get_type +poppler_annot_text_get_type +poppler_annot_text_markup_get_type +poppler_annot_text_state_get_type +poppler_annot_type_get_type +poppler_attachment_get_type +poppler_backend_get_type +poppler_certificate_info_get_type +poppler_certificate_status_get_type +poppler_color_get_type +poppler_dest_get_type +poppler_dest_type_get_type +poppler_document_get_type +poppler_error_get_type +poppler_find_flags_get_type +poppler_font_info_get_type +poppler_font_type_get_type +poppler_fonts_iter_get_type +poppler_form_button_type_get_type +poppler_form_choice_type_get_type +poppler_form_field_get_type +poppler_form_field_mapping_get_type +poppler_form_field_type_get_type +poppler_form_text_type_get_type +poppler_image_mapping_get_type +poppler_index_iter_get_type +poppler_layer_get_type +poppler_layers_iter_get_type +poppler_link_mapping_get_type +poppler_media_get_type +poppler_movie_get_type +poppler_movie_play_mode_get_type +poppler_page_get_type +poppler_page_layout_get_type +poppler_page_mode_get_type +poppler_page_transition_alignment_get_type +poppler_page_transition_direction_get_type +poppler_page_transition_get_type +poppler_page_transition_type_get_type +poppler_pdf_conformance_get_type +poppler_pdf_part_get_type +poppler_pdf_subtype_get_type +poppler_permissions_get_type +poppler_point_get_type +poppler_print_duplex_get_type +poppler_print_flags_get_type +poppler_print_scaling_get_type +poppler_ps_file_get_type +poppler_quadrilateral_get_type +poppler_rectangle_get_type +poppler_selection_style_get_type +poppler_signature_info_get_type +poppler_signature_status_get_type +poppler_signature_validation_flags_get_type +poppler_structure_block_align_get_type +poppler_structure_border_style_get_type +poppler_structure_element_get_type +poppler_structure_element_iter_get_type +poppler_structure_element_kind_get_type +poppler_structure_form_role_get_type +poppler_structure_form_state_get_type +poppler_structure_get_text_flags_get_type +poppler_structure_glyph_orientation_get_type +poppler_structure_inline_align_get_type +poppler_structure_list_numbering_get_type +poppler_structure_placement_get_type +poppler_structure_ruby_align_get_type +poppler_structure_ruby_position_get_type +poppler_structure_table_scope_get_type +poppler_structure_text_align_get_type +poppler_structure_text_decoration_get_type +poppler_structure_writing_mode_get_type +poppler_text_attributes_get_type +poppler_text_span_get_type +poppler_viewer_preferences_get_type +poppler_signing_data_get_type +poppler_certificate_info_get_type \ No newline at end of file diff --git a/poppler-24.05.0/glib/tests/CMakeLists.txt b/poppler-24.05.0/glib/tests/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..19ebf57e994244b6a819d8cc336afa339326f5b6 --- /dev/null +++ b/poppler-24.05.0/glib/tests/CMakeLists.txt @@ -0,0 +1,62 @@ +macro(POPPLER_ADD_TESTCASE exe arg1) + add_test(${exe}-${arg1} ${EXE} ${EXECUTABLE_OUTPUT_PATH}/poppler-check-bb ${TESTDATADIR}/unittestcases/${arg1} ${ARGN}) +endmacro(POPPLER_ADD_TESTCASE) + +add_definitions(-DTESTDATADIR=\"${TESTDATADIR}\") + +set(poppler_check_text_SRCS + check_text.c +) +poppler_add_test(poppler-check-text BUILD_GTK_TESTS ${poppler_check_text_SRCS}) +add_test(poppler-check-text ${EXECUTABLE_OUTPUT_PATH}/poppler-check-text) + +set(poppler_check_bb_SRCS + check_bb.c +) +poppler_add_test(poppler-check-bb BUILD_GTK_TESTS ${poppler_check_bb_SRCS}) + +target_link_libraries(poppler-check-text poppler-glib PkgConfig::GTK3) +target_link_libraries(poppler-check-bb poppler-glib PkgConfig::GTK3) + +poppler_add_testcase(poppler-check-bb shapes+attachments.pdf 42.5 42.5 557.5 557.5) +poppler_add_testcase(poppler-check-bb orientation.pdf 34 34 83.74 49 793 34 808 97.19 488.02 793 561 808 34 503.61 49 561) +poppler_add_testcase(poppler-check-bb xr01.pdf 148.71 126.35 308.11 704.57) +poppler_add_testcase(poppler-check-bb xr02.pdf 133.77 124.81 308.11 704.57 133.77 124.80 308.11 704.57) +poppler_add_testcase(poppler-check-bb russian.pdf 71.5 76.81 197.69 131.09) +poppler_add_testcase(poppler-check-bb vis_policy_test.pdf 90 77.93 312.01 265.13) +poppler_add_testcase(poppler-check-bb searchAcrossLines.pdf 107.15 105.23 523.85 691 85.04 94 538.59 762.19) +poppler_add_testcase(poppler-check-bb deseret.pdf 56.8 57.15 109.5 72.8) +poppler_add_testcase(poppler-check-bb fieldWithUtf16Names.pdf 56.65 56.65 264.55 83.05) +poppler_add_testcase(poppler-check-bb bug7063.pdf 56.8 57.46 244.29 118.79) +poppler_add_testcase(poppler-check-bb WithActualText.pdf 100 90.72 331.01 102.35) +poppler_add_testcase(poppler-check-bb Issue637.pdf 70.87 53 293 105.37) +poppler_add_testcase(poppler-check-bb truetype.pdf 17.5 17.5 577.5 225.62) +poppler_add_testcase(poppler-check-bb form_set_icon.pdf 0 0 362.835 272.126) +poppler_add_testcase(poppler-check-bb imageretrieve+attachment.pdf 0 0 610.56 792) +poppler_add_testcase(poppler-check-bb checkbox_issue_159.pdf 2.84 14.17 553.18 840.87) +poppler_add_testcase(poppler-check-bb NestedLayers.pdf 0 191 612 792) +poppler_add_testcase(poppler-check-bb A6EmbeddedFiles.pdf 18 18 558.36 751.92) +poppler_add_testcase(poppler-check-bb latex-hyperref-checkbox-issue-655.pdf 148.71 123.81 308.11 704.57) +poppler_add_testcase(poppler-check-bb utf16le-annot.pdf 55.47 54.78 98.74 96.12) +poppler_add_testcase(poppler-check-bb type3.pdf -p 10 125.80 130 509.30 695 125.80 132 538.03 693) + +add_executable(pdfdrawbb pdfdrawbb.c) +target_link_libraries(pdfdrawbb poppler-glib) + +macro(GLIB_ADD_FUZZER exe) + string(REPLACE "-" "" test_name ${exe}) + set(${test_name}_SOURCES + ${ARGN} + ) + poppler_add_test(${exe} BUILD_GTK_TESTS ${${test_name}_SOURCES}) + target_link_libraries(${exe} poppler-glib PkgConfig::GTK3) +endmacro(GLIB_ADD_FUZZER) + +if(ENABLE_FUZZER) + glib_add_fuzzer(annot_fuzzer ./fuzzing/annot_fuzzer.cc) + glib_add_fuzzer(doc_attr_fuzzer ./fuzzing/doc_attr_fuzzer.cc) + glib_add_fuzzer(find_text_fuzzer ./fuzzing/find_text_fuzzer.cc) + glib_add_fuzzer(util_fuzzer ./fuzzing/util_fuzzer.cc) + glib_add_fuzzer(label_fuzzer ./fuzzing/label_fuzzer.cc) + glib_add_fuzzer(pdf_draw_fuzzer ./fuzzing/pdf_draw_fuzzer.cc) +endif() diff --git a/poppler-24.05.0/glib/tests/check_bb.c b/poppler-24.05.0/glib/tests/check_bb.c new file mode 100644 index 0000000000000000000000000000000000000000..7a4805fdfd00445db3571fc2e6c8051d6399be50 --- /dev/null +++ b/poppler-24.05.0/glib/tests/check_bb.c @@ -0,0 +1,97 @@ +/* + * testing program for the boundingbox function + */ + +#include +#include +#include +#include + +#include + +/* + * compare floating-point coordinates + */ +int equal(double a, double b, double precision) +{ + return fabs(a - b) < precision; +} + +/* + * main + */ +int main(int argc, char *argv[]) +{ + GFile *infile; + PopplerDocument *doc; + PopplerPage *page; + int npages, n; + gboolean hg; + PopplerRectangle bb, correct; + GError *err = NULL; + int argx; + double precision = 0.01; + + /* open file */ + + g_print("file: %s\n", argv[1]); + infile = g_file_new_for_path(argv[1]); + if (!infile) { + exit(EXIT_FAILURE); + } + + doc = poppler_document_new_from_gfile(infile, NULL, NULL, &err); + if (doc == NULL) { + g_printerr("error opening pdf file: %s\n", err->message); + g_error_free(err); + exit(EXIT_FAILURE); + } + + /* precision */ + + argx = 2; + if (!strcmp(argv[argx], "-p")) { + precision = atof(argv[argx + 1]); + argx += 2; + } + + /* pages */ + + npages = poppler_document_get_n_pages(doc); + if (npages < 1) { + g_printerr("no page in document\n"); + exit(EXIT_FAILURE); + } + + /* check the bounding box */ + + for (n = 0; n < poppler_document_get_n_pages(doc); n++) { + g_print(" page: %d\n", n + 1); + + page = poppler_document_get_page(doc, n); + hg = poppler_page_get_bounding_box(page, &bb); + if (!hg) { + g_printerr("no graphics in page\n"); + exit(EXIT_FAILURE); + } + g_print(" bounding box: %g,%g - %g,%g\n", bb.x1, bb.y1, bb.x2, bb.y2); + + if (argc - argx < 4) { + g_print("not enough arguments\n"); + exit(EXIT_FAILURE); + } + correct.x1 = atof(argv[argx++]); + correct.y1 = atof(argv[argx++]); + correct.x2 = atof(argv[argx++]); + correct.y2 = atof(argv[argx++]); + g_print(" correct: %g,%g - %g,%g\n", correct.x1, correct.y1, correct.x2, correct.y2); + if (!equal(bb.x1, correct.x1, precision) || !equal(bb.x2, correct.x2, precision) || !equal(bb.y1, correct.y1, precision) || !equal(bb.y2, correct.y2, precision)) { + g_print("bounding box differs from expected\n"); + exit(EXIT_FAILURE); + } + + g_object_unref(page); + } + + return EXIT_SUCCESS; +} diff --git a/poppler-24.05.0/glib/tests/check_text.c b/poppler-24.05.0/glib/tests/check_text.c new file mode 100644 index 0000000000000000000000000000000000000000..9ab99ba68f5516d826c1aa9936eaa8d66d394204 --- /dev/null +++ b/poppler-24.05.0/glib/tests/check_text.c @@ -0,0 +1,97 @@ +/* + * testing program for the get_text function + */ + +#include +#include +#include + +#include + +/* + * main + */ +int main(int argc, char *argv[]) +{ + GFile *infile; + PopplerDocument *doc; + PopplerPage *page; + PopplerRectangle *areas = NULL; + guint n_glyph_areas, n_utf8_chars; + int npages, n; + char *text; + GError *err = NULL; + + /* open file */ + + infile = g_file_new_for_path(TESTDATADIR "/unittestcases/WithActualText.pdf"); + if (!infile) { + exit(EXIT_FAILURE); + } + + doc = poppler_document_new_from_gfile(infile, NULL, NULL, &err); + if (doc == NULL) { + g_printerr("error opening pdf file: %s\n", err->message); + g_error_free(err); + exit(EXIT_FAILURE); + } + + /* pages */ + + npages = poppler_document_get_n_pages(doc); + if (npages < 1) { + g_printerr("no page in document\n"); + exit(EXIT_FAILURE); + } + + /* check text */ + + n = 0; + page = poppler_document_get_page(doc, n); + text = poppler_page_get_text(page); + g_print("%s\n", text); + g_assert_cmpstr(text, ==, "The slow brown fox jumps over the black dog."); + + /* Cleanup vars for next test */ + g_clear_object(&page); + g_clear_object(&doc); + g_clear_object(&infile); + g_clear_pointer(&text, g_free); + + /* Test for consistency between utf8 characters returned by poppler_page_get_text() + * and glyph layout areas returned by poppler_page_get_text_layout(). Issue #1100 */ + g_print("Consistency test between poppler_page_get_text() and poppler_page_get_text_layout()\n"); + g_print("Issue #1100 \n"); + infile = g_file_new_for_path(TESTDATADIR "/unittestcases/searchAcrossLines.pdf"); + if (!infile) { + exit(EXIT_FAILURE); + } + + doc = poppler_document_new_from_gfile(infile, NULL, NULL, &err); + if (doc == NULL) { + g_printerr("error opening pdf file: %s\n", err->message); + g_error_free(err); + exit(EXIT_FAILURE); + } + + page = poppler_document_get_page(doc, 0); + if (page == NULL || !POPPLER_IS_PAGE(page)) { + g_print("error opening pdf page\n"); + exit(EXIT_FAILURE); + } + + text = poppler_page_get_text(page); + n_utf8_chars = (guint)g_utf8_strlen(text, -1); + poppler_page_get_text_layout(page, &areas, &n_glyph_areas); + g_assert_cmpuint(n_glyph_areas, ==, n_utf8_chars); + g_print("Test: OK ('layout glyph areas' match amount of 'utf8 characters')\n"); + + /* Cleanup vars for next test */ + g_clear_object(&page); + g_clear_object(&doc); + g_clear_object(&infile); + g_clear_pointer(&areas, g_free); + g_clear_pointer(&text, g_free); + + return EXIT_SUCCESS; +} diff --git a/poppler-24.05.0/glib/tests/fuzzing/annot_fuzzer.cc b/poppler-24.05.0/glib/tests/fuzzing/annot_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..d36da68ef7209d63c8ce5bf7864e98fbbd389f80 --- /dev/null +++ b/poppler-24.05.0/glib/tests/fuzzing/annot_fuzzer.cc @@ -0,0 +1,77 @@ +#include +#include +#include +#include + +#include "fuzzer_temp_file.h" + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + GError *err = NULL; + PopplerDocument *doc; + PopplerPage *page; + PopplerAnnot *annot; + PopplerRectangle bb; + gdouble width, height; + gboolean hg; + int npages; + + cairo_t *cr; + cairo_surface_t *surface; + cairo_status_t status; + + doc = poppler_document_new_from_data((char *)data, size, NULL, &err); + if (doc == NULL) { + g_error_free(err); + return 0; + } + npages = poppler_document_get_n_pages(doc); + if (npages < 1) { + g_object_unref(doc); + return 0; + } + + char *tmpfile = fuzzer_get_tmpfile(data, size); + surface = cairo_pdf_surface_create(tmpfile, 1.0, 1.0); + status = cairo_surface_status(surface); + if (status != CAIRO_STATUS_SUCCESS) { + g_object_unref(doc); + fuzzer_release_tmpfile(tmpfile); + return 0; + } + + for (int n = 0; n < npages; n++) { + page = poppler_document_get_page(doc, n); + if (!page) { + continue; + } + + poppler_page_get_size(page, &width, &height); + cairo_pdf_surface_set_size(surface, width, height); + hg = poppler_page_get_bounding_box(page, &bb); + if (hg) { + annot = poppler_annot_text_new(doc, &bb); + if (annot != NULL) { + g_object_unref(page); + continue; + } + poppler_page_add_annot(page, annot); + } + + cr = cairo_create(surface); + status = cairo_status(cr); + if (status != CAIRO_STATUS_SUCCESS) { + cairo_destroy(cr); + g_object_unref(page); + continue; + } + poppler_page_render_for_printing(page, cr); + cairo_surface_show_page(surface); + cairo_destroy(cr); + g_object_unref(page); + } + cairo_surface_destroy(surface); + fuzzer_release_tmpfile(tmpfile); + g_object_unref(doc); + return 0; +} diff --git a/poppler-24.05.0/glib/tests/fuzzing/doc_attr_fuzzer.cc b/poppler-24.05.0/glib/tests/fuzzing/doc_attr_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..18d3811fbfb0fa0cbc5852e64571c72703d78e84 --- /dev/null +++ b/poppler-24.05.0/glib/tests/fuzzing/doc_attr_fuzzer.cc @@ -0,0 +1,33 @@ +#include +#include +#include +#include + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + GError *err = NULL; + PopplerDocument *doc; + PopplerPage *page; + char *buf; + int npages, n; + + doc = poppler_document_new_from_data((char *)data, size, NULL, &err); + if (doc == NULL) { + g_error_free(err); + return 0; + } + + buf = (char *)calloc(size + 1, sizeof(char)); + memcpy(buf, data, size); + buf[size] = '\0'; + + poppler_document_set_author(doc, buf); + poppler_document_set_creator(doc, buf); + poppler_document_set_keywords(doc, buf); + poppler_document_set_producer(doc, buf); + poppler_document_set_subject(doc, buf); + poppler_document_set_title(doc, buf); + + free(buf); + return 0; +} diff --git a/poppler-24.05.0/glib/tests/fuzzing/find_text_fuzzer.cc b/poppler-24.05.0/glib/tests/fuzzing/find_text_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..e7d0ba908528b49123c2dcf7a66339a10db3b3b2 --- /dev/null +++ b/poppler-24.05.0/glib/tests/fuzzing/find_text_fuzzer.cc @@ -0,0 +1,39 @@ +#include +#include +#include +#include + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + GError *err = NULL; + PopplerDocument *doc; + PopplerPage *page; + char *buf; + int npages; + + doc = poppler_document_new_from_data((char *)data, size, NULL, &err); + if (doc == NULL) { + g_error_free(err); + return 0; + } + + npages = poppler_document_get_n_pages(doc); + if (npages < 1) { + return 0; + } + + buf = (char *)calloc(size + 1, sizeof(char)); + memcpy(buf, data, size); + buf[size] = '\0'; + + for (int n = 0; n < npages; n++) { + page = poppler_document_get_page(doc, n); + if (!page) { + continue; + } + poppler_page_find_text(page, buf); + g_object_unref(page); + } + free(buf); + return 0; +} diff --git a/poppler-24.05.0/glib/tests/fuzzing/fuzzer_temp_file.h b/poppler-24.05.0/glib/tests/fuzzing/fuzzer_temp_file.h new file mode 100644 index 0000000000000000000000000000000000000000..d0568ac55605cd0323a39863f03f202fbd0a3374 --- /dev/null +++ b/poppler-24.05.0/glib/tests/fuzzing/fuzzer_temp_file.h @@ -0,0 +1,82 @@ +// Copyright 2018 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Adapter utility from fuzzer input to a temporary file, for fuzzing APIs that +// require a file instead of an input buffer. + +#ifndef FUZZER_TEMP_FILE_H_ +#define FUZZER_TEMP_FILE_H_ + +#include +#include +#include +#include +#include + +// Pure-C interface for creating and cleaning up temporary files. + +static char *fuzzer_get_tmpfile(const uint8_t *data, size_t size) +{ + char *filename_buffer = strdup("/tmp/generate_temporary_file.XXXXXX"); + if (!filename_buffer) { + perror("Failed to allocate file name buffer."); + abort(); + } + const int file_descriptor = mkstemp(filename_buffer); + if (file_descriptor < 0) { + perror("Failed to make temporary file."); + abort(); + } + FILE *file = fdopen(file_descriptor, "wb"); + if (!file) { + perror("Failed to open file descriptor."); + close(file_descriptor); + abort(); + } + const size_t bytes_written = fwrite(data, sizeof(uint8_t), size, file); + if (bytes_written < size) { + close(file_descriptor); + fprintf(stderr, "Failed to write all bytes to file (%zu out of %zu)", bytes_written, size); + abort(); + } + fclose(file); + return filename_buffer; +} + +static void fuzzer_release_tmpfile(char *filename) +{ + if (unlink(filename) != 0) { + perror("WARNING: Failed to delete temporary file."); + } + free(filename); +} + +// C++ RAII object for creating temporary files. + +#ifdef __cplusplus +class FuzzerTemporaryFile +{ +public: + FuzzerTemporaryFile(const uint8_t *data, size_t size) : filename_(fuzzer_get_tmpfile(data, size)) { } + + ~FuzzerTemporaryFile() { fuzzer_release_tmpfile(filename_); } + + const char *filename() const { return filename_; } + +private: + char *filename_; +}; +#endif + +#endif // FUZZER_TEMP_FILE_H_ diff --git a/poppler-24.05.0/glib/tests/fuzzing/label_fuzzer.cc b/poppler-24.05.0/glib/tests/fuzzing/label_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..825a57aa4a0bc2c3f75a7b68e5fe733ae3de09b7 --- /dev/null +++ b/poppler-24.05.0/glib/tests/fuzzing/label_fuzzer.cc @@ -0,0 +1,38 @@ +#include +#include +#include +#include + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + GError *err = NULL; + PopplerDocument *doc; + PopplerPage *page; + char *buf; + int npages; + + doc = poppler_document_new_from_data((char *)data, size, NULL, &err); + if (doc == NULL) { + g_error_free(err); + return 0; + } + + npages = poppler_document_get_n_pages(doc); + if (npages < 1) { + return 0; + } + + buf = (char *)calloc(size + 1, sizeof(char)); + memcpy(buf, data, size); + buf[size] = '\0'; + + for (int n = 0; n < npages; n++) { + page = poppler_document_get_page_by_label(doc, buf); + if (!page) { + continue; + } + g_object_unref(page); + } + free(buf); + return 0; +} diff --git a/poppler-24.05.0/glib/tests/fuzzing/pdf_draw_fuzzer.cc b/poppler-24.05.0/glib/tests/fuzzing/pdf_draw_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..357fbf20749a179aec7f91c757f9fc599ae2c998 --- /dev/null +++ b/poppler-24.05.0/glib/tests/fuzzing/pdf_draw_fuzzer.cc @@ -0,0 +1,74 @@ +#include +#include +#include +#include + +#include "fuzzer_temp_file.h" + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + GError *err = NULL; + PopplerDocument *doc; + PopplerPage *page; + PopplerRectangle bb; + gdouble width, height; + gboolean hg; + int npages; + + cairo_t *cr; + cairo_surface_t *surface; + cairo_status_t status; + + doc = poppler_document_new_from_data((char *)data, size, NULL, &err); + if (doc == NULL) { + g_error_free(err); + return 0; + } + + npages = poppler_document_get_n_pages(doc); + if (npages < 1) { + g_object_unref(doc); + return 0; + } + + char *tmpfile = fuzzer_get_tmpfile(data, size); + surface = cairo_pdf_surface_create(tmpfile, 1.0, 1.0); + status = cairo_surface_status(surface); + if (status != CAIRO_STATUS_SUCCESS) { + g_object_unref(doc); + fuzzer_release_tmpfile(tmpfile); + return 0; + } + + for (int n = 0; n < npages; n++) { + page = poppler_document_get_page(doc, n); + if (!page) { + continue; + } + + poppler_page_get_size(page, &width, &height); + cairo_pdf_surface_set_size(surface, width, height); + hg = poppler_page_get_bounding_box(page, &bb); + + cr = cairo_create(surface); + status = cairo_status(cr); + if (status != CAIRO_STATUS_SUCCESS) { + g_object_unref(page); + continue; + } + if (hg) { + cairo_set_source_rgb(cr, 0.6, 0.6, 1.0); + cairo_rectangle(cr, bb.x1, bb.y1, bb.x2 - bb.x1, bb.y2 - bb.y1); + cairo_stroke(cr); + } + + poppler_page_render_for_printing(page, cr); + cairo_surface_show_page(surface); + cairo_destroy(cr); + g_object_unref(page); + } + cairo_surface_destroy(surface); + g_object_unref(doc); + fuzzer_release_tmpfile(tmpfile); + return 0; +} diff --git a/poppler-24.05.0/glib/tests/fuzzing/util_fuzzer.cc b/poppler-24.05.0/glib/tests/fuzzing/util_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..6b6b10c3bc6d2671d74164ded17bed3a8ca3f0b4 --- /dev/null +++ b/poppler-24.05.0/glib/tests/fuzzing/util_fuzzer.cc @@ -0,0 +1,24 @@ +#include +#include +#include +#include + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + char *tmp_ch; + char *buf; + gsize length; + guint8 *tmp_uint; + + buf = (char *)calloc(size + 1, sizeof(char)); + memcpy(buf, data, size); + buf[size] = '\0'; + + tmp_ch = poppler_named_dest_from_bytestring((const guint8 *)buf, size); + tmp_uint = poppler_named_dest_to_bytestring(buf, &length); + + g_free(tmp_ch); + g_free(tmp_uint); + free(buf); + return 0; +} diff --git a/poppler-24.05.0/glib/tests/pdfdrawbb.c b/poppler-24.05.0/glib/tests/pdfdrawbb.c new file mode 100644 index 0000000000000000000000000000000000000000..74f5d2a0b685624ecfbb5b3ff17732d695951057 --- /dev/null +++ b/poppler-24.05.0/glib/tests/pdfdrawbb.c @@ -0,0 +1,147 @@ +/* + * pdfdrawbb.c + * + * draw the bounding box of each page + */ + +#include +#include +#include +#include + +#include +#include +#include + +/* + * add suffix to a pdf filename + */ +char *pdfaddsuffix(char *infile, char *suffix) +{ + char *basename; + char *outfile; + char *pos; + + basename = g_path_get_basename(infile); + + outfile = malloc(strlen(infile) + strlen(suffix) + 10); + strcpy(outfile, basename); + g_free(basename); + + pos = strrchr(outfile, '.'); + if (pos != NULL && (!strcmp(pos, ".pdf") || !strcmp(pos, ".PDF"))) { + *pos = '\0'; + } + + strcat(outfile, "-"); + strcat(outfile, suffix); + strcat(outfile, ".pdf"); + return outfile; +} + +/* + * main + */ +int main(int argc, char *argv[]) +{ + int opt; + gboolean usage = FALSE; + char *infilename, *outfilename; + + GError *err = NULL; + GFile *infile; + PopplerDocument *doc; + PopplerPage *page; + int npages, n; + PopplerRectangle bb; + gboolean hg; + + gdouble width, height; + cairo_surface_t *surface; + cairo_t *cr; + + /* arguments */ + + while ((opt = getopt(argc, argv, "h")) != -1) { + switch (opt) { + case 'h': + usage = TRUE; + break; + } + } + + if (!usage && argc - 1 < optind) { + g_print("input file name missing\n"); + usage = TRUE; + } + if (usage) { + g_print("usage:\n"); + g_print("\tpdfdrawbb"); + g_print("[-h] file.pdf\n"); + g_print("\t\t-h\t\tthis help\n"); + exit(EXIT_FAILURE); + } + infilename = argv[optind]; + if (!infilename) { + exit(EXIT_FAILURE); + } + outfilename = pdfaddsuffix(argv[optind], "bb"); + + /* open file */ + + infile = g_file_new_for_path(infilename); + if (infile == NULL) { + exit(EXIT_FAILURE); + } + + doc = poppler_document_new_from_gfile(infile, NULL, NULL, &err); + if (doc == NULL) { + g_printerr("error opening pdf file: %s\n", err->message); + g_error_free(err); + exit(EXIT_FAILURE); + } + + /* pages */ + + npages = poppler_document_get_n_pages(doc); + if (npages < 1) { + g_print("no page in document\n"); + exit(EXIT_FAILURE); + } + + /* copy to destination */ + + surface = cairo_pdf_surface_create(outfilename, 1.0, 1.0); + + g_print("infile: %s\n", infilename); + g_print("outfile: %s\n", outfilename); + + for (n = 0; n < npages; n++) { + g_print("page %d:\n", n); + page = poppler_document_get_page(doc, n); + poppler_page_get_size(page, &width, &height); + cairo_pdf_surface_set_size(surface, width, height); + + hg = poppler_page_get_bounding_box(page, &bb); + if (hg) { + g_print("bounding box %g,%g - %g,%g", bb.x1, bb.y1, bb.x2, bb.y2); + } + g_print("\n"); + + cr = cairo_create(surface); + poppler_page_render_for_printing(page, cr); + if (hg) { + cairo_set_source_rgb(cr, 0.6, 0.6, 1.0); + cairo_rectangle(cr, bb.x1, bb.y1, bb.x2 - bb.x1, bb.y2 - bb.y1); + cairo_stroke(cr); + } + cairo_destroy(cr); + cairo_surface_show_page(surface); + + g_object_unref(page); + } + + cairo_surface_destroy(surface); + + return EXIT_SUCCESS; +} diff --git a/poppler-24.05.0/goo/GooCheckedOps.h b/poppler-24.05.0/goo/GooCheckedOps.h new file mode 100644 index 0000000000000000000000000000000000000000..0cb743372eb7b4e42d8a9597ffd5f3891b9e2e00 --- /dev/null +++ b/poppler-24.05.0/goo/GooCheckedOps.h @@ -0,0 +1,116 @@ +//======================================================================== +// +// GooCheckedOps.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019 LE GARREC Vincent +// Copyright (C) 2019-2021 Albert Astals Cid +// +//======================================================================== + +#ifndef GOO_CHECKED_OPS_H +#define GOO_CHECKED_OPS_H + +#include +#include + +template +inline bool checkedAssign(long long lz, T *z) +{ + static_assert((std::numeric_limits::max)() > (std::numeric_limits::max)(), "The max of long long type must be larger to perform overflow checks."); + static_assert((std::numeric_limits::min)() < (std::numeric_limits::min)(), "The min of long long type must be smaller to perform overflow checks."); + + if (lz > (std::numeric_limits::max)() || lz < (std::numeric_limits::min)()) { + return true; + } + + *z = static_cast(lz); + return false; +} + +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif + +template +inline bool checkedAdd(T x, T y, T *z) +{ +// The __GNUC__ checks can not be removed until we depend on GCC >= 10.1 +// which is the first version that returns true for __has_builtin(__builtin_add_overflow) +#if __GNUC__ >= 5 || __has_builtin(__builtin_add_overflow) + return __builtin_add_overflow(x, y, z); +#else + const auto lz = static_cast(x) + static_cast(y); + return checkedAssign(lz, z); +#endif +} + +template<> +inline bool checkedAdd(long long x, long long y, long long *z) +{ +#if __GNUC__ >= 5 || __has_builtin(__builtin_add_overflow) + return __builtin_add_overflow(x, y, z); +#else + if (x > 0 && y > 0) { + if (x > (std::numeric_limits::max)() - y) { + return true; + } + } else if (x < 0 && y < 0) { + if (x < (std::numeric_limits::min)() - y) { + return true; + } + } + *z = x + y; + return false; +#endif +} + +template +inline bool checkedSubtraction(T x, T y, T *z) +{ +#if __GNUC__ >= 5 || __has_builtin(__builtin_sub_overflow) + return __builtin_sub_overflow(x, y, z); +#else + const auto lz = static_cast(x) - static_cast(y); + return checkedAssign(lz, z); +#endif +} + +template +inline bool checkedMultiply(T x, T y, T *z) +{ +#if __GNUC__ >= 5 || __has_builtin(__builtin_mul_overflow) + return __builtin_mul_overflow(x, y, z); +#else + const auto lz = static_cast(x) * static_cast(y); + return checkedAssign(lz, z); +#endif +} + +template<> +inline bool checkedMultiply(long long x, long long y, long long *z) +{ +#if __GNUC__ >= 5 || __has_builtin(__builtin_mul_overflow) + return __builtin_mul_overflow(x, y, z); +#else + if (x != 0 && (std::numeric_limits::max)() / x < y) { + return true; + } + + *z = x * y; + return false; +#endif +} + +template +inline T safeAverage(T a, T b) +{ + static_assert((std::numeric_limits::max)() > (std::numeric_limits::max)(), "The max of long long type must be larger to perform overflow checks."); + static_assert((std::numeric_limits::min)() < (std::numeric_limits::min)(), "The min of long long type must be smaller to perform overflow checks."); + + return static_cast((static_cast(a) + static_cast(b)) / 2); +} + +#endif // GOO_CHECKED_OPS_H diff --git a/poppler-24.05.0/goo/GooLikely.h b/poppler-24.05.0/goo/GooLikely.h new file mode 100644 index 0000000000000000000000000000000000000000..76128a71f958b2a07f887aaa6f19f3d503edbc4b --- /dev/null +++ b/poppler-24.05.0/goo/GooLikely.h @@ -0,0 +1,22 @@ +//======================================================================== +// +// GooLikely.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2008 Kees Cook +// +//======================================================================== + +#ifndef GOOLIKELY_H +#define GOOLIKELY_H + +#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__) +# define likely(x) __builtin_expect((x), 1) +# define unlikely(x) __builtin_expect((x), 0) +#else +# define likely(x) (x) +# define unlikely(x) (x) +#endif + +#endif diff --git a/poppler-24.05.0/goo/GooString.cc b/poppler-24.05.0/goo/GooString.cc new file mode 100644 index 0000000000000000000000000000000000000000..a657e82fc3f6f97b5920f07b26823a8898e7dd9a --- /dev/null +++ b/poppler-24.05.0/goo/GooString.cc @@ -0,0 +1,622 @@ +//======================================================================== +// +// GooString.cc +// +// Simple variable-length string type. +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Kristian Høgsberg +// Copyright (C) 2006 Krzysztof Kowalczyk +// Copyright (C) 2007 Jeff Muizelaar +// Copyright (C) 2008-2011, 2016-2018, 2022 Albert Astals Cid +// Copyright (C) 2011 Kenji Uno +// Copyright (C) 2012, 2013 Fabio D'Urso +// Copyright (C) 2012, 2017 Adrian Johnson +// Copyright (C) 2012 Pino Toscano +// Copyright (C) 2013 Jason Crain +// Copyright (C) 2015 William Bader +// Copyright (C) 2016 Jakub Alba +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2018 Greg Knight +// Copyright (C) 2019, 2022-2024 Oliver Sander +// Copyright (C) 2023 Even Rouault +// +// 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 + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "gmem.h" +#include "Error.h" +#include "GooString.h" + +//------------------------------------------------------------------------ + +namespace { + +union GooStringFormatArg { + int i; + unsigned int ui; + long l; + unsigned long ul; + long long ll; + unsigned long long ull; + double f; + char c; + char *s; + GooString *gs; +}; + +enum GooStringFormatType +{ + fmtIntDecimal, + fmtIntHex, + fmtIntHexUpper, + fmtIntOctal, + fmtIntBinary, + fmtUIntDecimal, + fmtUIntHex, + fmtUIntHexUpper, + fmtUIntOctal, + fmtUIntBinary, + fmtLongDecimal, + fmtLongHex, + fmtLongHexUpper, + fmtLongOctal, + fmtLongBinary, + fmtULongDecimal, + fmtULongHex, + fmtULongHexUpper, + fmtULongOctal, + fmtULongBinary, + fmtLongLongDecimal, + fmtLongLongHex, + fmtLongLongHexUpper, + fmtLongLongOctal, + fmtLongLongBinary, + fmtULongLongDecimal, + fmtULongLongHex, + fmtULongLongHexUpper, + fmtULongLongOctal, + fmtULongLongBinary, + fmtDouble, + fmtDoubleTrimSmallAware, + fmtDoubleTrim, + fmtChar, + fmtString, + fmtGooString, + fmtSpace +}; + +const char *const formatStrings[] = { "d", "x", "X", "o", "b", "ud", "ux", "uX", "uo", "ub", "ld", "lx", "lX", "lo", "lb", "uld", "ulx", "ulX", "ulo", + "ulb", "lld", "llx", "llX", "llo", "llb", "ulld", "ullx", "ullX", "ullo", "ullb", "f", "gs", "g", "c", "s", "t", "w", nullptr }; + +void formatInt(long long x, char *buf, int bufSize, bool zeroFill, int width, int base, const char **p, int *len, bool upperCase = false); + +void formatUInt(unsigned long long x, char *buf, int bufSize, bool zeroFill, int width, int base, const char **p, int *len, bool upperCase = false); + +void formatDouble(double x, char *buf, int bufSize, int prec, bool trim, const char **p, int *len); + +void formatDoubleSmallAware(double x, char *buf, int bufSize, int prec, bool trim, const char **p, int *len); + +} + +//------------------------------------------------------------------------ + +std::unique_ptr GooString::format(const char *fmt, ...) +{ + auto s = std::make_unique(); + + va_list argList; + va_start(argList, fmt); + s->appendfv(fmt, argList); + va_end(argList); + + return s; +} + +std::unique_ptr GooString::formatv(const char *fmt, va_list argList) +{ + auto s = std::make_unique(); + + s->appendfv(fmt, argList); + + return s; +} + +GooString *GooString::appendf(const char *fmt, ...) +{ + va_list argList; + va_start(argList, fmt); + appendfv(fmt, argList); + va_end(argList); + + return this; +} + +GooString *GooString::appendfv(const char *fmt, va_list argList) +{ + GooStringFormatArg *args; + int argsLen, argsSize; + GooStringFormatArg arg; + int idx, width, prec; + bool reverseAlign, zeroFill; + GooStringFormatType ft; + char buf[65]; + int len, i; + const char *p0, *p1; + const char *str; + GooStringFormatArg argsBuf[8]; + + argsLen = 0; + argsSize = sizeof(argsBuf) / sizeof(argsBuf[0]); + args = argsBuf; + + p0 = fmt; + while (*p0) { + if (*p0 == '{') { + ++p0; + if (*p0 == '{') { + ++p0; + append('{'); + } else { + + // parse the format string + if (!(*p0 >= '0' && *p0 <= '9')) { + break; + } + idx = *p0 - '0'; + for (++p0; *p0 >= '0' && *p0 <= '9'; ++p0) { + idx = 10 * idx + (*p0 - '0'); + } + if (*p0 != ':') { + break; + } + ++p0; + if (*p0 == '-') { + reverseAlign = true; + ++p0; + } else { + reverseAlign = false; + } + width = 0; + zeroFill = *p0 == '0'; + for (; *p0 >= '0' && *p0 <= '9'; ++p0) { + width = 10 * width + (*p0 - '0'); + } + if (width < 0) { + width = 0; + } + if (*p0 == '.') { + ++p0; + prec = 0; + for (; *p0 >= '0' && *p0 <= '9'; ++p0) { + prec = 10 * prec + (*p0 - '0'); + } + } else { + prec = 0; + } + for (ft = (GooStringFormatType)0; formatStrings[ft]; ft = (GooStringFormatType)(ft + 1)) { + if (!strncmp(p0, formatStrings[ft], strlen(formatStrings[ft]))) { + break; + } + } + if (!formatStrings[ft]) { + break; + } + p0 += strlen(formatStrings[ft]); + if (*p0 != '}') { + break; + } + ++p0; + + // fetch the argument + if (idx > argsLen) { + break; + } + if (idx == argsLen) { + if (argsLen == argsSize) { + argsSize *= 2; + if (args == argsBuf) { + args = (GooStringFormatArg *)gmallocn(argsSize, sizeof(GooStringFormatArg)); + memcpy(args, argsBuf, argsLen * sizeof(GooStringFormatArg)); + } else { + args = (GooStringFormatArg *)greallocn(args, argsSize, sizeof(GooStringFormatArg)); + } + } + switch (ft) { + case fmtIntDecimal: + case fmtIntHex: + case fmtIntHexUpper: + case fmtIntOctal: + case fmtIntBinary: + case fmtSpace: + args[argsLen].i = va_arg(argList, int); + break; + case fmtUIntDecimal: + case fmtUIntHex: + case fmtUIntHexUpper: + case fmtUIntOctal: + case fmtUIntBinary: + args[argsLen].ui = va_arg(argList, unsigned int); + break; + case fmtLongDecimal: + case fmtLongHex: + case fmtLongHexUpper: + case fmtLongOctal: + case fmtLongBinary: + args[argsLen].l = va_arg(argList, long); + break; + case fmtULongDecimal: + case fmtULongHex: + case fmtULongHexUpper: + case fmtULongOctal: + case fmtULongBinary: + args[argsLen].ul = va_arg(argList, unsigned long); + break; + case fmtLongLongDecimal: + case fmtLongLongHex: + case fmtLongLongHexUpper: + case fmtLongLongOctal: + case fmtLongLongBinary: + args[argsLen].ll = va_arg(argList, long long); + break; + case fmtULongLongDecimal: + case fmtULongLongHex: + case fmtULongLongHexUpper: + case fmtULongLongOctal: + case fmtULongLongBinary: + args[argsLen].ull = va_arg(argList, unsigned long long); + break; + case fmtDouble: + case fmtDoubleTrim: + case fmtDoubleTrimSmallAware: + args[argsLen].f = va_arg(argList, double); + break; + case fmtChar: + args[argsLen].c = (char)va_arg(argList, int); + break; + case fmtString: + args[argsLen].s = va_arg(argList, char *); + break; + case fmtGooString: + args[argsLen].gs = va_arg(argList, GooString *); + break; + } + ++argsLen; + } + + // format the argument + arg = args[idx]; + switch (ft) { + case fmtIntDecimal: + formatInt(arg.i, buf, sizeof(buf), zeroFill, width, 10, &str, &len); + break; + case fmtIntHex: + formatInt(arg.i, buf, sizeof(buf), zeroFill, width, 16, &str, &len); + break; + case fmtIntHexUpper: + formatInt(arg.i, buf, sizeof(buf), zeroFill, width, 16, &str, &len, true); + break; + case fmtIntOctal: + formatInt(arg.i, buf, sizeof(buf), zeroFill, width, 8, &str, &len); + break; + case fmtIntBinary: + formatInt(arg.i, buf, sizeof(buf), zeroFill, width, 2, &str, &len); + break; + case fmtUIntDecimal: + formatUInt(arg.ui, buf, sizeof(buf), zeroFill, width, 10, &str, &len); + break; + case fmtUIntHex: + formatUInt(arg.ui, buf, sizeof(buf), zeroFill, width, 16, &str, &len); + break; + case fmtUIntHexUpper: + formatUInt(arg.ui, buf, sizeof(buf), zeroFill, width, 16, &str, &len, true); + break; + case fmtUIntOctal: + formatUInt(arg.ui, buf, sizeof(buf), zeroFill, width, 8, &str, &len); + break; + case fmtUIntBinary: + formatUInt(arg.ui, buf, sizeof(buf), zeroFill, width, 2, &str, &len); + break; + case fmtLongDecimal: + formatInt(arg.l, buf, sizeof(buf), zeroFill, width, 10, &str, &len); + break; + case fmtLongHex: + formatInt(arg.l, buf, sizeof(buf), zeroFill, width, 16, &str, &len); + break; + case fmtLongHexUpper: + formatInt(arg.l, buf, sizeof(buf), zeroFill, width, 16, &str, &len, true); + break; + case fmtLongOctal: + formatInt(arg.l, buf, sizeof(buf), zeroFill, width, 8, &str, &len); + break; + case fmtLongBinary: + formatInt(arg.l, buf, sizeof(buf), zeroFill, width, 2, &str, &len); + break; + case fmtULongDecimal: + formatUInt(arg.ul, buf, sizeof(buf), zeroFill, width, 10, &str, &len); + break; + case fmtULongHex: + formatUInt(arg.ul, buf, sizeof(buf), zeroFill, width, 16, &str, &len); + break; + case fmtULongHexUpper: + formatUInt(arg.ul, buf, sizeof(buf), zeroFill, width, 16, &str, &len, true); + break; + case fmtULongOctal: + formatUInt(arg.ul, buf, sizeof(buf), zeroFill, width, 8, &str, &len); + break; + case fmtULongBinary: + formatUInt(arg.ul, buf, sizeof(buf), zeroFill, width, 2, &str, &len); + break; + case fmtLongLongDecimal: + formatInt(arg.ll, buf, sizeof(buf), zeroFill, width, 10, &str, &len); + break; + case fmtLongLongHex: + formatInt(arg.ll, buf, sizeof(buf), zeroFill, width, 16, &str, &len); + break; + case fmtLongLongHexUpper: + formatInt(arg.ll, buf, sizeof(buf), zeroFill, width, 16, &str, &len, true); + break; + case fmtLongLongOctal: + formatInt(arg.ll, buf, sizeof(buf), zeroFill, width, 8, &str, &len); + break; + case fmtLongLongBinary: + formatInt(arg.ll, buf, sizeof(buf), zeroFill, width, 2, &str, &len); + break; + case fmtULongLongDecimal: + formatUInt(arg.ull, buf, sizeof(buf), zeroFill, width, 10, &str, &len); + break; + case fmtULongLongHex: + formatUInt(arg.ull, buf, sizeof(buf), zeroFill, width, 16, &str, &len); + break; + case fmtULongLongHexUpper: + formatUInt(arg.ull, buf, sizeof(buf), zeroFill, width, 16, &str, &len, true); + break; + case fmtULongLongOctal: + formatUInt(arg.ull, buf, sizeof(buf), zeroFill, width, 8, &str, &len); + break; + case fmtULongLongBinary: + formatUInt(arg.ull, buf, sizeof(buf), zeroFill, width, 2, &str, &len); + break; + case fmtDouble: + formatDouble(arg.f, buf, sizeof(buf), prec, false, &str, &len); + break; + case fmtDoubleTrim: + formatDouble(arg.f, buf, sizeof(buf), prec, true, &str, &len); + break; + case fmtDoubleTrimSmallAware: + formatDoubleSmallAware(arg.f, buf, sizeof(buf), prec, true, &str, &len); + break; + case fmtChar: + buf[0] = arg.c; + str = buf; + len = 1; + reverseAlign = !reverseAlign; + break; + case fmtString: { + str = arg.s; + const size_t strlen_str = strlen(str); + if (strlen_str > static_cast(std::numeric_limits::max())) { + error(errSyntaxWarning, 0, "String truncated to INT_MAX bytes"); + len = std::numeric_limits::max(); + } else { + len = static_cast(strlen_str); + } + reverseAlign = !reverseAlign; + break; + } + case fmtGooString: + if (arg.gs) { + str = arg.gs->c_str(); + len = arg.gs->getLength(); + } else { + str = "(null)"; + len = 6; + } + reverseAlign = !reverseAlign; + break; + case fmtSpace: + str = buf; + len = 0; + width = arg.i; + break; + } + + // append the formatted arg, handling width and alignment + if (!reverseAlign && len < width) { + for (i = len; i < width; ++i) { + append(' '); + } + } + append(str, len); + if (reverseAlign && len < width) { + for (i = len; i < width; ++i) { + append(' '); + } + } + } + + } else if (*p0 == '}') { + ++p0; + if (*p0 == '}') { + ++p0; + } + append('}'); + + } else { + for (p1 = p0 + 1; *p1 && *p1 != '{' && *p1 != '}'; ++p1) { + ; + } + append(p0, p1 - p0); + p0 = p1; + } + } + + if (args != argsBuf) { + gfree(args); + } + + return this; +} + +namespace { + +const char lowerCaseDigits[17] = "0123456789abcdef"; +const char upperCaseDigits[17] = "0123456789ABCDEF"; + +void formatInt(long long x, char *buf, int bufSize, bool zeroFill, int width, int base, const char **p, int *len, bool upperCase) +{ + const char *vals = upperCase ? upperCaseDigits : lowerCaseDigits; + bool neg; + int start, i, j; + unsigned long long abs_x; + + i = bufSize; + if ((neg = x < 0)) { + abs_x = -x; + } else { + abs_x = x; + } + start = neg ? 1 : 0; + if (abs_x == 0) { + buf[--i] = '0'; + } else { + while (i > start && abs_x) { + buf[--i] = vals[abs_x % base]; + abs_x /= base; + } + } + if (zeroFill) { + for (j = bufSize - i; i > start && j < width - start; ++j) { + buf[--i] = '0'; + } + } + if (neg) { + buf[--i] = '-'; + } + *p = buf + i; + *len = bufSize - i; +} + +void formatUInt(unsigned long long x, char *buf, int bufSize, bool zeroFill, int width, int base, const char **p, int *len, bool upperCase) +{ + const char *vals = upperCase ? upperCaseDigits : lowerCaseDigits; + int i, j; + + i = bufSize; + if (x == 0) { + buf[--i] = '0'; + } else { + while (i > 0 && x) { + buf[--i] = vals[x % base]; + x /= base; + } + } + if (zeroFill) { + for (j = bufSize - i; i > 0 && j < width; ++j) { + buf[--i] = '0'; + } + } + *p = buf + i; + *len = bufSize - i; +} + +void formatDouble(double x, char *buf, int bufSize, int prec, bool trim, const char **p, int *len) +{ + bool neg, started; + double x2; + int d, i, j; + + if ((neg = x < 0)) { + x = -x; + } + x = floor(x * pow(10.0, prec) + 0.5); + i = bufSize; + started = !trim; + for (j = 0; j < prec && i > 1; ++j) { + x2 = floor(0.1 * (x + 0.5)); + d = (int)floor(x - 10 * x2 + 0.5); + if (started || d != 0) { + buf[--i] = '0' + d; + started = true; + } + x = x2; + } + if (i > 1 && started) { + buf[--i] = '.'; + } + if (i > 1) { + do { + x2 = floor(0.1 * (x + 0.5)); + d = (int)floor(x - 10 * x2 + 0.5); + buf[--i] = '0' + d; + x = x2; + } while (i > 1 && x); + } + if (neg) { + buf[--i] = '-'; + } + *p = buf + i; + *len = bufSize - i; +} + +void formatDoubleSmallAware(double x, char *buf, int bufSize, int prec, bool trim, const char **p, int *len) +{ + double absX = fabs(x); + if (absX >= 0.1) { + formatDouble(x, buf, bufSize, prec, trim, p, len); + } else { + while (absX < 0.1 && prec < 16) { + absX = absX * 10; + prec++; + } + formatDouble(x, buf, bufSize, prec, trim, p, len); + } +} + +} + +GooString *GooString::lowerCase() +{ + lowerCase(*this); + return this; +} + +void GooString::lowerCase(std::string &s) +{ + for (auto &c : s) { + if (std::isupper(c)) { + c = std::tolower(c); + } + } +} + +std::string GooString::toLowerCase(const std::string &s) +{ + std::string newString = s; + lowerCase(newString); + return s; +} diff --git a/poppler-24.05.0/goo/GooString.h b/poppler-24.05.0/goo/GooString.h new file mode 100644 index 0000000000000000000000000000000000000000..5659b34b34de6dd1c91e5b7fc5358eed279bade2 --- /dev/null +++ b/poppler-24.05.0/goo/GooString.h @@ -0,0 +1,247 @@ +//======================================================================== +// +// GooString.h +// +// Simple variable-length string type. +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Kristian Høgsberg +// Copyright (C) 2006 Krzysztof Kowalczyk +// Copyright (C) 2008-2010, 2012, 2014, 2017-2022 Albert Astals Cid +// Copyright (C) 2012-2014 Fabio D'Urso +// Copyright (C) 2013 Jason Crain +// Copyright (C) 2015, 2018 Adam Reichold +// Copyright (C) 2016 Jakub Alba +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2019 Christophe Fergeau +// Copyright (C) 2019 Tomoyuki Kubota +// Copyright (C) 2019, 2020, 2022-2024 Oliver Sander +// Copyright (C) 2019 Hans-Ulrich Jüttner +// Copyright (C) 2020 Thorsten Behrens +// Copyright (C) 2022 Even Rouault +// +// 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 +// +//======================================================================== + +#ifndef GooString_H +#define GooString_H + +#include "poppler_private_export.h" + +#include +#include +#include + +#ifdef __clang__ +# define GOOSTRING_FORMAT __attribute__((__annotate__("gooformat"))) +#else +# define GOOSTRING_FORMAT +#endif + +class GooString : private std::string +{ +public: + // Create an empty string. + GooString() = default; + + // Destructor. + ~GooString() = default; + + GooString(GooString &&other) = default; + GooString &operator=(GooString &&other) = default; + + GooString(const GooString &other) = delete; + GooString &operator=(const GooString &other) = delete; + + // Create a string from a C string. + explicit GooString(const char *sA) : std::string(sA ? sA : "") { } + + // Zero-cost conversion from and to std::string + explicit GooString(const std::string &str) : std::string(str) { } + explicit GooString(std::string &&str) : std::string(std::move(str)) { } + + const std::string &toStr() const { return *this; } + std::string &toNonConstStr() { return *this; } + + // Create a string from chars at . This string + // can contain null characters. + GooString(const char *sA, size_t lengthA) : std::string(sA ? sA : "", sA ? lengthA : 0) { } + + // Create a string from chars at in . + GooString(const GooString *str, int idx, size_t lengthA) : std::string(*str, idx, lengthA) { } + GooString(const std::string &str, int idx, size_t lengthA) : std::string(str, idx, lengthA) { } + + // Set content of a string to . + GooString *Set(const GooString *newStr) + { + assign(newStr ? static_cast(*newStr) : std::string {}); + return this; + } + GooString *Set(const char *newStr) + { + assign(newStr ? newStr : ""); + return this; + } + GooString *Set(const char *newStr, int newLen) + { + assign(newStr ? newStr : "", newStr ? newLen : 0); + return this; + } + + // Copy a string. + explicit GooString(const GooString *str) : std::string(str ? static_cast(*str) : std::string {}) { } + GooString *copy() const { return new GooString(this); } + + // Concatenate two strings. + GooString(const GooString *str1, const GooString *str2) + { + reserve(str1->size() + str2->size()); + static_cast(*this).append(*str1); + static_cast(*this).append(*str2); + } + + // Create a formatted string. Similar to printf, but without the + // string overflow issues. Formatting elements consist of: + // {:[][.]} + // where: + // - is the argument number (arg 0 is the first argument + // following the format string) -- NB: args must be first used in + // order; they can be reused in any order + // - is the field width -- negative to reverse the alignment; + // starting with a leading zero to zero-fill (for integers) + // - is the number of digits to the right of the decimal + // point (for floating point numbers) + // - is one of: + // d, x, X, o, b -- int in decimal, lowercase hex, uppercase hex, octal, binary + // ud, ux, uX, uo, ub -- unsigned int + // ld, lx, lX, lo, lb, uld, ulx, ulX, ulo, ulb -- long, unsigned long + // lld, llx, llX, llo, llb, ulld, ullx, ullX, ullo, ullb + // -- long long, unsigned long long + // f, g, gs -- floating point (float or double) + // f -- always prints trailing zeros (eg 1.0 with .2f will print 1.00) + // g -- omits trailing zeros and, if possible, the dot (eg 1.0 shows up as 1) + // gs -- is like g, but treats as number of significant + // digits to show (eg 0.0123 with .2gs will print 0.012) + // c -- character (char, short or int) + // s -- string (char *) + // t -- GooString * + // w -- blank space; arg determines width + // To get literal curly braces, use {{ or }}. + POPPLER_PRIVATE_EXPORT static std::unique_ptr format(const char *fmt, ...) GOOSTRING_FORMAT; + POPPLER_PRIVATE_EXPORT static std::unique_ptr formatv(const char *fmt, va_list argList); + + // Get length. + int getLength() const { return size(); } + + // Get C string. + using std::string::c_str; + + // Get th character. + char getChar(size_t i) const { return (*this)[i]; } + + // Change th character. + void setChar(int i, char c) { (*this)[i] = c; } + + // Clear string to zero length. + using std::string::clear; + + // Append a character or string. + GooString *append(char c) + { + push_back(c); + return this; + } + GooString *append(const GooString *str) + { + static_cast(*this).append(*str); + return this; + } + GooString *append(const std::string &str) + { + static_cast(*this).append(str); + return this; + } + GooString *append(const char *str) + { + static_cast(*this).append(str); + return this; + } + GooString *append(const char *str, size_t lengthA) + { + static_cast(*this).append(str, lengthA); + return this; + } + + // Append a formatted string. + POPPLER_PRIVATE_EXPORT GooString *appendf(const char *fmt, ...) GOOSTRING_FORMAT; + POPPLER_PRIVATE_EXPORT GooString *appendfv(const char *fmt, va_list argList); + + // Insert a character or string. + GooString *insert(int i, char c) + { + static_cast(*this).insert(i, 1, c); + return this; + } + GooString *insert(int i, const GooString *str) + { + static_cast(*this).insert(i, *str); + return this; + } + GooString *insert(int i, const std::string &str) + { + static_cast(*this).insert(i, str); + return this; + } + GooString *insert(int i, const char *str) + { + static_cast(*this).insert(i, str); + return this; + } + GooString *insert(int i, const char *str, int lengthA) + { + static_cast(*this).insert(i, str, lengthA); + return this; + } + + // Delete a character or range of characters. + GooString *del(int i, int n = 1) + { + erase(i, n); + return this; + } + + // Convert string to all-lower case. + POPPLER_PRIVATE_EXPORT GooString *lowerCase(); + POPPLER_PRIVATE_EXPORT static void lowerCase(std::string &s); + + // Returns a new string converted to all-lower case. + POPPLER_PRIVATE_EXPORT static std::string toLowerCase(const std::string &s); + + // Compare two strings: -1:< 0:= +1:> + int cmp(const GooString *str) const { return compare(*str); } + int cmp(const std::string &str) const { return compare(str); } + int cmpN(GooString *str, int n) const { return compare(0, n, *str); } + int cmp(const char *sA) const { return compare(sA); } + int cmpN(const char *sA, int n) const { return compare(0, n, sA); } + + // Return true if strings starts with prefix + using std::string::starts_with; + + // Return true if string ends with suffix + using std::string::ends_with; +}; + +#endif diff --git a/poppler-24.05.0/goo/GooTimer.cc b/poppler-24.05.0/goo/GooTimer.cc new file mode 100644 index 0000000000000000000000000000000000000000..43225af40e74f7e026627cccd80f051af2c86ff0 --- /dev/null +++ b/poppler-24.05.0/goo/GooTimer.cc @@ -0,0 +1,94 @@ +//======================================================================== +// +// GooTimer.cc +// +// This file is licensed under GPLv2 or later +// +// Copyright 2005 Jonathan Blandford +// Copyright 2007 Krzysztof Kowalczyk +// Copyright 2010 Hib Eris +// Inspired by gtimer.c in glib, which is Copyright 2000 by the GLib Team +// +//======================================================================== + +#include + +#include "GooTimer.h" +#include + +#define USEC_PER_SEC 1000000 + +//------------------------------------------------------------------------ +// GooTimer +//------------------------------------------------------------------------ + +GooTimer::GooTimer() +{ + start(); +} + +void GooTimer::start() +{ +#ifdef HAVE_GETTIMEOFDAY + gettimeofday(&start_time, nullptr); +#elif defined(_WIN32) + QueryPerformanceCounter(&start_time); +#endif + active = true; +} + +void GooTimer::stop() +{ +#ifdef HAVE_GETTIMEOFDAY + gettimeofday(&end_time, nullptr); +#elif defined(_WIN32) + QueryPerformanceCounter(&end_time); +#endif + active = false; +} + +#ifdef HAVE_GETTIMEOFDAY +double GooTimer::getElapsed() +{ + double total; + struct timeval elapsed; + + if (active) { + gettimeofday(&end_time, nullptr); + } + + if (start_time.tv_usec > end_time.tv_usec) { + end_time.tv_usec += USEC_PER_SEC; + end_time.tv_sec--; + } + + elapsed.tv_usec = end_time.tv_usec - start_time.tv_usec; + elapsed.tv_sec = end_time.tv_sec - start_time.tv_sec; + + total = elapsed.tv_sec + ((double)elapsed.tv_usec / 1e6); + if (total < 0) { + total = 0; + } + + return total; +} +#elif defined(_WIN32) +double GooTimer::getElapsed() +{ + LARGE_INTEGER freq; + double time_in_secs; + QueryPerformanceFrequency(&freq); + + if (active) + QueryPerformanceCounter(&end_time); + + time_in_secs = (double)(end_time.QuadPart - start_time.QuadPart) / (double)freq.QuadPart; + return time_in_secs * 1000.0; +} +#else +double GooTimer::getElapsed() +{ +# warning "no support for GooTimer" + return 0; +} +#endif diff --git a/poppler-24.05.0/goo/GooTimer.h b/poppler-24.05.0/goo/GooTimer.h new file mode 100644 index 0000000000000000000000000000000000000000..00b85618fe929662773d9f583602651a53a1fc34 --- /dev/null +++ b/poppler-24.05.0/goo/GooTimer.h @@ -0,0 +1,59 @@ +//======================================================================== +// +// GooTimer.cc +// +// This file is licensed under GPLv2 or later +// +// Copyright 2005 Jonathan Blandford +// Copyright 2007 Krzysztof Kowalczyk +// Copyright 2010 Hib Eris +// Copyright 2011 Albert Astals cid +// Copyright 2014 Bogdan Cristea +// Copyright 2014 Peter Breitenlohner +// Inspired by gtimer.c in glib, which is Copyright 2000 by the GLib Team +// +//======================================================================== + +#ifndef GOOTIMER_H +#define GOOTIMER_H + +#include "poppler-config.h" +#include "poppler_private_export.h" + +#ifdef HAVE_GETTIMEOFDAY +# include +#endif + +#ifdef _WIN32 +# ifndef NOMINMAX +# define NOMINMAX +# endif +# include +#endif + +//------------------------------------------------------------------------ +// GooTimer +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GooTimer +{ +public: + // Create a new timer. + GooTimer(); + + void start(); + void stop(); + double getElapsed(); + +private: +#ifdef HAVE_GETTIMEOFDAY + struct timeval start_time; + struct timeval end_time; +#elif defined(_WIN32) + LARGE_INTEGER start_time; + LARGE_INTEGER end_time; +#endif + bool active; +}; + +#endif diff --git a/poppler-24.05.0/goo/ImgWriter.cc b/poppler-24.05.0/goo/ImgWriter.cc new file mode 100644 index 0000000000000000000000000000000000000000..071fc7cfedb20ed9b9d693b1cb70642513103cfd --- /dev/null +++ b/poppler-24.05.0/goo/ImgWriter.cc @@ -0,0 +1,13 @@ +//======================================================================== +// +// ImgWriter.cpp +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2009 Albert Astals Cid +// +//======================================================================== + +#include "ImgWriter.h" + +ImgWriter::~ImgWriter() { } diff --git a/poppler-24.05.0/goo/ImgWriter.h b/poppler-24.05.0/goo/ImgWriter.h new file mode 100644 index 0000000000000000000000000000000000000000..860b310f7899e8145ca099cf6331c0a5dfbaa431 --- /dev/null +++ b/poppler-24.05.0/goo/ImgWriter.h @@ -0,0 +1,39 @@ +//======================================================================== +// +// ImgWriter.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2009 Stefan Thomas +// Copyright (C) 2009, 2011, 2018, 2022 Albert Astals Cid +// Copyright (C) 2010 Adrian Johnson +// Copyright (C) 2010 Brian Cameron +// Copyright (C) 2011 Thomas Freitag +// +//======================================================================== + +#ifndef IMGWRITER_H +#define IMGWRITER_H + +#include "poppler_private_export.h" + +#include + +class POPPLER_PRIVATE_EXPORT ImgWriter +{ +public: + ImgWriter() = default; + ImgWriter(const ImgWriter &) = delete; + ImgWriter &operator=(const ImgWriter &other) = delete; + + virtual ~ImgWriter(); + virtual bool init(FILE *f, int width, int height, double hDPI, double vDPI) = 0; + + virtual bool writePointers(unsigned char **rowPointers, int rowCount) = 0; + virtual bool writeRow(unsigned char **row) = 0; + + virtual bool close() = 0; + virtual bool supportCMYK() { return false; } +}; + +#endif diff --git a/poppler-24.05.0/goo/JpegWriter.cc b/poppler-24.05.0/goo/JpegWriter.cc new file mode 100644 index 0000000000000000000000000000000000000000..6451dee55c7e2ef2664bde906c3bbddd41b4976e --- /dev/null +++ b/poppler-24.05.0/goo/JpegWriter.cc @@ -0,0 +1,210 @@ +//======================================================================== +// +// JpegWriter.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2009 Stefan Thomas +// Copyright (C) 2010, 2012, 2017 Adrian Johnson +// Copyright (C) 2010 Harry Roberts +// Copyright (C) 2011 Thomas Freitag +// Copyright (C) 2013 Peter Breitenlohner +// Copyright (C) 2017, 2018, 2022 Albert Astals Cid +// Copyright (C) 2018 Martin Packman +// Copyright (C) 2018 Ed Porras +// Copyright (C) 2021 Peter Williams +// Copyright (C) 2023 Jordan Abrahams-Whitehead +// +//======================================================================== + +#include "JpegWriter.h" + +#include + +#ifdef ENABLE_LIBJPEG + +# include "poppler/Error.h" +# include +extern "C" { +# include +} + +struct JpegWriterPrivate +{ + bool progressive; + bool optimize; + int quality; + JpegWriter::Format format; + struct jpeg_compress_struct cinfo; + struct jpeg_error_mgr jerr; +}; + +static void outputMessage(j_common_ptr cinfo) +{ + char buffer[JMSG_LENGTH_MAX]; + + // Create the message + (*cinfo->err->format_message)(cinfo, buffer); + + // Send it to poppler's error handler + error(errInternal, -1, "{0:s}", buffer); +} + +JpegWriter::JpegWriter(int q, bool p, Format formatA) +{ + priv = new JpegWriterPrivate; + priv->progressive = p; + priv->optimize = false; + priv->quality = q; + priv->format = formatA; +} + +JpegWriter::JpegWriter(Format formatA) : JpegWriter(-1, false, formatA) { } + +JpegWriter::~JpegWriter() +{ + // cleanup + jpeg_destroy_compress(&priv->cinfo); + delete priv; +} + +void JpegWriter::setQuality(int quality) +{ + priv->quality = quality; +} + +void JpegWriter::setProgressive(bool progressive) +{ + priv->progressive = progressive; +} + +void JpegWriter::setOptimize(bool optimize) +{ + priv->optimize = optimize; +} + +bool JpegWriter::init(FILE *f, int width, int height, double hDPI, double vDPI) +{ + if (hDPI < 0 || vDPI < 0 || hDPI > std::numeric_limits::max() || vDPI > std::numeric_limits::max()) { + error(errInternal, -1, "JpegWriter::init: hDPI or vDPI values are invalid {0:f} {1:f}", hDPI, vDPI); + return false; + } + + // Setup error handler + priv->cinfo.err = jpeg_std_error(&priv->jerr); + priv->jerr.output_message = &outputMessage; + + // Initialize libjpeg + jpeg_create_compress(&priv->cinfo); + + // First set colorspace and call jpeg_set_defaults() since + // jpeg_set_defaults() sets default values for all fields in + // cinfo based on the colorspace. + switch (priv->format) { + case RGB: + priv->cinfo.in_color_space = JCS_RGB; + break; + case GRAY: + priv->cinfo.in_color_space = JCS_GRAYSCALE; + break; + case CMYK: + priv->cinfo.in_color_space = JCS_CMYK; + break; + default: + return false; + } + jpeg_set_defaults(&priv->cinfo); + + // Set destination file + jpeg_stdio_dest(&priv->cinfo, f); + + // Set libjpeg configuration + priv->cinfo.image_width = width; + priv->cinfo.image_height = height; + priv->cinfo.density_unit = 1; // dots per inch + priv->cinfo.X_density = static_cast(hDPI); + priv->cinfo.Y_density = static_cast(vDPI); + switch (priv->format) { + case GRAY: + priv->cinfo.input_components = 1; + break; + case RGB: + priv->cinfo.input_components = 3; + break; + case CMYK: + priv->cinfo.input_components = 4; + jpeg_set_colorspace(&priv->cinfo, JCS_YCCK); + priv->cinfo.write_JFIF_header = TRUE; + break; + default: + return false; + } + + // Set quality + if (priv->quality >= 0 && priv->quality <= 100) { + jpeg_set_quality(&priv->cinfo, priv->quality, TRUE); + } + + // Use progressive mode + if (priv->progressive) { + jpeg_simple_progression(&priv->cinfo); + } + + // Set whether to compute optimal Huffman coding tables + priv->cinfo.optimize_coding = static_cast(priv->optimize); + + // Get ready for data + jpeg_start_compress(&priv->cinfo, TRUE); + + return true; +} + +bool JpegWriter::writePointers(unsigned char **rowPointers, int rowCount) +{ + if (priv->format == CMYK) { + for (int y = 0; y < rowCount; y++) { + unsigned char *row = rowPointers[y]; + for (unsigned int x = 0; x < priv->cinfo.image_width; x++) { + for (int n = 0; n < 4; n++) { + *row = 0xff - *row; + row++; + } + } + } + } + // Write all rows to the file + jpeg_write_scanlines(&priv->cinfo, rowPointers, rowCount); + + return true; +} + +bool JpegWriter::writeRow(unsigned char **rowPointer) +{ + if (priv->format == CMYK) { + unsigned char *row = rowPointer[0]; + for (unsigned int x = 0; x < priv->cinfo.image_width; x++) { + for (int n = 0; n < 4; n++) { + *row = 0xff - *row; + row++; + } + } + } + // Write the row to the file + jpeg_write_scanlines(&priv->cinfo, rowPointer, 1); + + return true; +} + +bool JpegWriter::close() +{ + jpeg_finish_compress(&priv->cinfo); + + return true; +} + +bool JpegWriter::supportCMYK() +{ + return priv->format == CMYK; +} + +#endif diff --git a/poppler-24.05.0/goo/JpegWriter.h b/poppler-24.05.0/goo/JpegWriter.h new file mode 100644 index 0000000000000000000000000000000000000000..4b94c51ecab70d4eb523255886f14b6f6a801dda --- /dev/null +++ b/poppler-24.05.0/goo/JpegWriter.h @@ -0,0 +1,69 @@ +//======================================================================== +// +// JpegWriter.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2009 Stefan Thomas +// Copyright (C) 2010, 2012, 2017 Adrian Johnson +// Copyright (C) 2010 Jürg Billeter +// Copyright (C) 2010 Harry Roberts +// Copyright (C) 2010 Brian Cameron +// Copyright (C) 2011, 2021, 2022 Albert Astals Cid +// Copyright (C) 2011 Thomas Freitag +// Copyright (C) 2018 Martin Packman +// +//======================================================================== + +#ifndef JPEGWRITER_H +#define JPEGWRITER_H + +#include "poppler-config.h" +#include "poppler_private_export.h" + +#ifdef ENABLE_LIBJPEG + +# include +# include "ImgWriter.h" + +struct JpegWriterPrivate; + +class POPPLER_PRIVATE_EXPORT JpegWriter : public ImgWriter +{ +public: + /* RGB - 3 bytes/pixel + * GRAY - 1 byte/pixel + * CMYK - 4 bytes/pixel + */ + enum Format + { + RGB, + GRAY, + CMYK + }; + + JpegWriter(int quality, bool progressive, Format format = RGB); + explicit JpegWriter(Format format = RGB); + ~JpegWriter() override; + + JpegWriter(const JpegWriter &other) = delete; + JpegWriter &operator=(const JpegWriter &other) = delete; + + void setQuality(int quality); + void setProgressive(bool progressive); + void setOptimize(bool optimize); + bool init(FILE *f, int width, int height, double hDPI, double vDPI) override; + + bool writePointers(unsigned char **rowPointers, int rowCount) override; + bool writeRow(unsigned char **row) override; + + bool close() override; + bool supportCMYK() override; + +private: + JpegWriterPrivate *priv; +}; + +#endif + +#endif diff --git a/poppler-24.05.0/goo/NetPBMWriter.cc b/poppler-24.05.0/goo/NetPBMWriter.cc new file mode 100644 index 0000000000000000000000000000000000000000..44302fd8b8fb511a32f2eff8bff301d2ab4f6b81 --- /dev/null +++ b/poppler-24.05.0/goo/NetPBMWriter.cc @@ -0,0 +1,82 @@ +//======================================================================== +// +// NetPBMWriter.h +// +// Copyright 1998-2003 Glyph & Cog, LLC +// +//======================================================================== +// +//======================================================================== +// +// 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) 2005, 2007, 2011, 2022 Albert Astals Cid +// Copyright (C) 2006 Rainer Keller +// Copyright (C) 2008 Timothy Lee +// Copyright (C) 2008 Vasile Gaburici +// Copyright (C) 2009 Carlos Garcia Campos +// Copyright (C) 2009 William Bader +// Copyright (C) 2010 Jakob Voss +// Copyright (C) 2012, 2013 Adrian Johnson +// Copyright (C) 2013 Thomas Fischer +// +// 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 "poppler-config.h" + +#include "NetPBMWriter.h" + +// Writer for the NetPBM formats (PBM and PPM) +// This format is documented at: +// http://netpbm.sourceforge.net/doc/pbm.html +// http://netpbm.sourceforge.net/doc/ppm.html + +NetPBMWriter::NetPBMWriter(Format formatA) : format(formatA) { } + +bool NetPBMWriter::init(FILE *f, int widthA, int heightA, double /*hDPI*/, double /*vDPI*/) +{ + file = f; + width = widthA; + if (format == MONOCHROME) { + fprintf(file, "P4\n"); + fprintf(file, "%d %d\n", widthA, heightA); + } else { + fprintf(file, "P6\n"); + fprintf(file, "%d %d\n", widthA, heightA); + fprintf(file, "255\n"); + } + return true; +} + +bool NetPBMWriter::writePointers(unsigned char **rowPointers, int rowCount) +{ + for (int i = 0; i < rowCount; i++) { + writeRow(&rowPointers[i]); + } + return true; +} + +bool NetPBMWriter::writeRow(unsigned char **row) +{ + if (format == MONOCHROME) { + // PBM uses 0 = white, 1 = black so we need to invert the colors + int size = (width + 7) / 8; + for (int i = 0; i < size; i++) { + fputc((*row)[i] ^ 0xff, file); + } + } else { + fwrite(*row, 1, width * 3, file); + } + return true; +} + +bool NetPBMWriter::close() +{ + return true; +} diff --git a/poppler-24.05.0/goo/NetPBMWriter.h b/poppler-24.05.0/goo/NetPBMWriter.h new file mode 100644 index 0000000000000000000000000000000000000000..a942a574b0b10f3717175d07608078b0b88eebce --- /dev/null +++ b/poppler-24.05.0/goo/NetPBMWriter.h @@ -0,0 +1,56 @@ +//======================================================================== +// +// NetPBMWriter.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2009 Stefan Thomas +// Copyright (C) 2009, 2011, 2021, 2022 Albert Astals Cid +// Copyright (C) 2010, 2013 Adrian Johnson +// Copyright (C) 2010 Brian Cameron +// Copyright (C) 2011 Thomas Freitag +// +//======================================================================== + +#ifndef NETPBMWRITER_H +#define NETPBMWRITER_H + +#include "poppler-config.h" +#include "poppler_private_export.h" + +#include "ImgWriter.h" + +// Writer for the NetPBM formats (PBM and PPM) +// This format is documented at: +// http://netpbm.sourceforge.net/doc/pbm.html +// http://netpbm.sourceforge.net/doc/ppm.html + +class POPPLER_PRIVATE_EXPORT NetPBMWriter : public ImgWriter +{ +public: + /* RGB - 3 bytes/pixel + * MONOCHROME - 8 pixels/byte + */ + enum Format + { + RGB, + MONOCHROME + }; + + explicit NetPBMWriter(Format formatA = RGB); + ~NetPBMWriter() override = default; + + bool init(FILE *f, int width, int height, double /*hDPI*/, double /*vDPI*/) override; + + bool writePointers(unsigned char **rowPointers, int rowCount) override; + bool writeRow(unsigned char **row) override; + + bool close() override; + +private: + FILE *file; + Format format; + int width; +}; + +#endif diff --git a/poppler-24.05.0/goo/PNGWriter.cc b/poppler-24.05.0/goo/PNGWriter.cc new file mode 100644 index 0000000000000000000000000000000000000000..58d5560622c1712cb6b8ca9b941c998d9e60fd6f --- /dev/null +++ b/poppler-24.05.0/goo/PNGWriter.cc @@ -0,0 +1,207 @@ +//======================================================================== +// +// PNGWriter.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2009 Warren Toomey +// Copyright (C) 2009 Shen Liang +// Copyright (C) 2009, 2011-2023 Albert Astals Cid +// Copyright (C) 2009 Stefan Thomas +// Copyright (C) 2010, 2011, 2013, 2017 Adrian Johnson +// Copyright (C) 2011 Thomas Klausner +// Copyright (C) 2012 Pino Toscano +// +//======================================================================== + +#include "PNGWriter.h" + +#ifdef ENABLE_LIBPNG + +# include +# include +# include + +# include "poppler/Error.h" +# include "goo/gmem.h" + +# include + +struct PNGWriterPrivate +{ + explicit PNGWriterPrivate(PNGWriter::Format f) : format(f) { } + + PNGWriter::Format format; + png_structp png_ptr = nullptr; + png_infop info_ptr = nullptr; + unsigned char *icc_data = nullptr; + int icc_data_size = 0; + char *icc_name = nullptr; + bool sRGB_profile = false; + + PNGWriterPrivate(const PNGWriterPrivate &) = delete; + PNGWriterPrivate &operator=(const PNGWriterPrivate &) = delete; +}; + +PNGWriter::PNGWriter(Format formatA) +{ + priv = new PNGWriterPrivate(formatA); +} + +PNGWriter::~PNGWriter() +{ + /* cleanup heap allocation */ + png_destroy_write_struct(&priv->png_ptr, &priv->info_ptr); + if (priv->icc_data) { + gfree(priv->icc_data); + free(priv->icc_name); + } + + delete priv; +} + +void PNGWriter::setICCProfile(const char *name, unsigned char *data, int size) +{ + priv->icc_data = (unsigned char *)gmalloc(size); + memcpy(priv->icc_data, data, size); + priv->icc_data_size = size; + priv->icc_name = strdup(name); +} + +void PNGWriter::setSRGBProfile() +{ + priv->sRGB_profile = true; +} + +bool PNGWriter::init(FILE *f, int width, int height, double hDPI, double vDPI) +{ + /* libpng changed the png_set_iCCP() prototype in 1.5.0 */ +# if PNG_LIBPNG_VER < 10500 + png_charp icc_data_ptr = (png_charp)priv->icc_data; +# else + png_const_bytep icc_data_ptr = (png_const_bytep)priv->icc_data; +# endif + + if (hDPI < 0 || vDPI < 0) { + error(errInternal, -1, "PNGWriter::init: hDPI or vDPI values are invalid {0:f} {1:f}", hDPI, vDPI); + return false; + } + + const double png_res_x = hDPI / 0.0254; + const double png_res_y = vDPI / 0.0254; + if (png_res_x > std::numeric_limits::max() || png_res_y > std::numeric_limits::max()) { + error(errInternal, -1, "PNGWriter::init: hDPI or vDPI values are invalid {0:f} {1:f}", hDPI, vDPI); + return false; + } + + /* initialize stuff */ + priv->png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); + if (!priv->png_ptr) { + error(errInternal, -1, "png_create_write_struct failed"); + return false; + } + + priv->info_ptr = png_create_info_struct(priv->png_ptr); + if (!priv->info_ptr) { + error(errInternal, -1, "png_create_info_struct failed"); + return false; + } + + if (setjmp(png_jmpbuf(priv->png_ptr))) { + error(errInternal, -1, "png_jmpbuf failed"); + return false; + } + + /* write header */ + png_init_io(priv->png_ptr, f); + if (setjmp(png_jmpbuf(priv->png_ptr))) { + error(errInternal, -1, "Error during writing header"); + return false; + } + + // Set up the type of PNG image and the compression level + png_set_compression_level(priv->png_ptr, Z_BEST_COMPRESSION); + + // Silence silly gcc + png_byte bit_depth = -1; + png_byte color_type = -1; + switch (priv->format) { + case RGB: + bit_depth = 8; + color_type = PNG_COLOR_TYPE_RGB; + break; + case RGB48: + bit_depth = 16; + color_type = PNG_COLOR_TYPE_RGB; + break; + case RGBA: + bit_depth = 8; + color_type = PNG_COLOR_TYPE_RGB_ALPHA; + break; + case GRAY: + bit_depth = 8; + color_type = PNG_COLOR_TYPE_GRAY; + break; + case MONOCHROME: + bit_depth = 1; + color_type = PNG_COLOR_TYPE_GRAY; + break; + } + png_byte interlace_type = PNG_INTERLACE_NONE; + + png_set_IHDR(priv->png_ptr, priv->info_ptr, width, height, bit_depth, color_type, interlace_type, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + + png_set_pHYs(priv->png_ptr, priv->info_ptr, static_cast(png_res_x), static_cast(png_res_y), PNG_RESOLUTION_METER); + + if (priv->icc_data) { + png_set_iCCP(priv->png_ptr, priv->info_ptr, priv->icc_name, PNG_COMPRESSION_TYPE_BASE, icc_data_ptr, priv->icc_data_size); + } else if (priv->sRGB_profile) { + png_set_sRGB(priv->png_ptr, priv->info_ptr, PNG_sRGB_INTENT_RELATIVE); + } + + png_write_info(priv->png_ptr, priv->info_ptr); + if (setjmp(png_jmpbuf(priv->png_ptr))) { + error(errInternal, -1, "error during writing png info bytes"); + return false; + } + + return true; +} + +bool PNGWriter::writePointers(unsigned char **rowPointers, int rowCount) +{ + png_write_image(priv->png_ptr, rowPointers); + /* write bytes */ + if (setjmp(png_jmpbuf(priv->png_ptr))) { + error(errInternal, -1, "Error during writing bytes"); + return false; + } + + return true; +} + +bool PNGWriter::writeRow(unsigned char **row) +{ + // Write the row to the file + png_write_rows(priv->png_ptr, row, 1); + if (setjmp(png_jmpbuf(priv->png_ptr))) { + error(errInternal, -1, "error during png row write"); + return false; + } + + return true; +} + +bool PNGWriter::close() +{ + /* end write */ + png_write_end(priv->png_ptr, priv->info_ptr); + if (setjmp(png_jmpbuf(priv->png_ptr))) { + error(errInternal, -1, "Error during end of write"); + return false; + } + + return true; +} + +#endif diff --git a/poppler-24.05.0/goo/PNGWriter.h b/poppler-24.05.0/goo/PNGWriter.h new file mode 100644 index 0000000000000000000000000000000000000000..cd0ce4b8a83de769879111dba3b8f8bc8c2421d4 --- /dev/null +++ b/poppler-24.05.0/goo/PNGWriter.h @@ -0,0 +1,68 @@ +//======================================================================== +// +// PNGWriter.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2009 Warren Toomey +// Copyright (C) 2009 Shen Liang +// Copyright (C) 2009, 2011-2013, 2021, 2022 Albert Astals Cid +// Copyright (C) 2009 Stefan Thomas +// Copyright (C) 2010, 2011, 2013, 2017 Adrian Johnson +// Copyright (C) 2012 Pino Toscano +// +//======================================================================== + +#ifndef PNGWRITER_H +#define PNGWRITER_H + +#include "poppler-config.h" +#include "poppler_private_export.h" + +#ifdef ENABLE_LIBPNG + +# include "ImgWriter.h" + +struct PNGWriterPrivate; + +class POPPLER_PRIVATE_EXPORT PNGWriter : public ImgWriter +{ +public: + /* RGB - 3 bytes/pixel + * RGBA - 4 bytes/pixel + * GRAY - 1 byte/pixel + * MONOCHROME - 8 pixels/byte + * RGB48 - 6 bytes/pixel + */ + enum Format + { + RGB, + RGBA, + GRAY, + MONOCHROME, + RGB48 + }; + + explicit PNGWriter(Format format = RGB); + ~PNGWriter() override; + + PNGWriter(const PNGWriter &other) = delete; + PNGWriter &operator=(const PNGWriter &other) = delete; + + void setICCProfile(const char *name, unsigned char *data, int size); + void setSRGBProfile(); + + bool init(FILE *f, int width, int height, double hDPI, double vDPI) override; + + bool writePointers(unsigned char **rowPointers, int rowCount) override; + bool writeRow(unsigned char **row) override; + + bool close() override; + +private: + PNGWriterPrivate *priv; +}; + +#endif + +#endif diff --git a/poppler-24.05.0/goo/TiffWriter.cc b/poppler-24.05.0/goo/TiffWriter.cc new file mode 100644 index 0000000000000000000000000000000000000000..967a92de9e874888fae4e0b2759574c2752bc1db --- /dev/null +++ b/poppler-24.05.0/goo/TiffWriter.cc @@ -0,0 +1,243 @@ +//======================================================================== +// +// TiffWriter.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2010, 2012 William Bader +// Copyright (C) 2012, 2021, 2022 Albert Astals Cid +// Copyright (C) 2012, 2017 Adrian Johnson +// Copyright (C) 2012 Pino Toscano +// Copyright (C) 2014 Steven Lee +// +//======================================================================== + +#include "TiffWriter.h" + +#ifdef ENABLE_LIBTIFF + +# include + +# ifdef _WIN32 +# include +# endif + +extern "C" { +# include +} + +# include + +struct TiffWriterPrivate +{ + TIFF *f; // LibTiff file context + int numRows; // number of rows in the image + int curRow; // number of rows written + const char *compressionString; // compression type + TiffWriter::Format format; // format of image data +}; + +TiffWriter::~TiffWriter() +{ + delete priv; +} + +TiffWriter::TiffWriter(Format formatA) +{ + priv = new TiffWriterPrivate; + priv->f = nullptr; + priv->numRows = 0; + priv->curRow = 0; + priv->compressionString = nullptr; + priv->format = formatA; +} + +// Set the compression type + +void TiffWriter::setCompressionString(const char *compressionStringArg) +{ + priv->compressionString = compressionStringArg; +} + +// Write a TIFF file. + +bool TiffWriter::init(FILE *openedFile, int width, int height, double hDPI, double vDPI) +{ + unsigned int compression; + uint16_t photometric = 0; + uint32_t rowsperstrip = (uint32_t)-1; + int bitspersample; + uint16_t samplesperpixel = 0; + const struct compression_name_tag + { + const char *compressionName; // name of the compression option from the command line + unsigned int compressionCode; // internal libtiff code + const char *compressionDescription; // descriptive name + } compressionList[] = { { "none", COMPRESSION_NONE, "no compression" }, + { "ccittrle", COMPRESSION_CCITTRLE, "CCITT modified Huffman RLE" }, + { "ccittfax3", COMPRESSION_CCITTFAX3, "CCITT Group 3 fax encoding" }, + { "ccittt4", COMPRESSION_CCITT_T4, "CCITT T.4 (TIFF 6 name)" }, + { "ccittfax4", COMPRESSION_CCITTFAX4, "CCITT Group 4 fax encoding" }, + { "ccittt6", COMPRESSION_CCITT_T6, "CCITT T.6 (TIFF 6 name)" }, + { "lzw", COMPRESSION_LZW, "Lempel-Ziv & Welch" }, + { "ojpeg", COMPRESSION_OJPEG, "!6.0 JPEG" }, + { "jpeg", COMPRESSION_JPEG, "%JPEG DCT compression" }, + { "next", COMPRESSION_NEXT, "NeXT 2-bit RLE" }, + { "packbits", COMPRESSION_PACKBITS, "Macintosh RLE" }, + { "ccittrlew", COMPRESSION_CCITTRLEW, "CCITT modified Huffman RLE w/ word alignment" }, + { "deflate", COMPRESSION_DEFLATE, "Deflate compression" }, + { "adeflate", COMPRESSION_ADOBE_DEFLATE, "Deflate compression, as recognized by Adobe" }, + { "dcs", COMPRESSION_DCS, "Kodak DCS encoding" }, + { "jbig", COMPRESSION_JBIG, "ISO JBIG" }, + { "jp2000", COMPRESSION_JP2000, "Leadtools JPEG2000" }, + { nullptr, 0, nullptr } }; + + // Initialize + + priv->f = nullptr; + priv->curRow = 0; + + // Store the number of rows + + priv->numRows = height; + + // Set the compression + + compression = COMPRESSION_NONE; + + if (priv->compressionString == nullptr || strcmp(priv->compressionString, "") == 0) { + compression = COMPRESSION_NONE; + } else { + int i; + for (i = 0; compressionList[i].compressionName != nullptr; i++) { + if (strcmp(priv->compressionString, compressionList[i].compressionName) == 0) { + compression = compressionList[i].compressionCode; + break; + } + } + if (compressionList[i].compressionName == nullptr) { + fprintf(stderr, "TiffWriter: Unknown compression type '%.10s', using 'none'.\n", priv->compressionString); + fprintf(stderr, "Known compression types (the tiff library might not support every type)\n"); + for (i = 0; compressionList[i].compressionName != nullptr; i++) { + fprintf(stderr, "%10s %s\n", compressionList[i].compressionName, compressionList[i].compressionDescription); + } + } + } + + // Set bits per sample, samples per pixel, and photometric type from format + + bitspersample = (priv->format == MONOCHROME ? 1 : 8); + + switch (priv->format) { + case MONOCHROME: + case GRAY: + samplesperpixel = 1; + photometric = PHOTOMETRIC_MINISBLACK; + break; + + case RGB: + samplesperpixel = 3; + photometric = PHOTOMETRIC_RGB; + break; + + case RGBA_PREMULTIPLIED: + samplesperpixel = 4; + photometric = PHOTOMETRIC_RGB; + break; + + case CMYK: + samplesperpixel = 4; + photometric = PHOTOMETRIC_SEPARATED; + break; + + case RGB48: + samplesperpixel = 3; + bitspersample = 16; + photometric = PHOTOMETRIC_RGB; + break; + } + + // Open the file + + if (openedFile == nullptr) { + fprintf(stderr, "TiffWriter: No output file given.\n"); + return false; + } + +# ifdef _WIN32 + // Convert C Library handle to Win32 Handle + priv->f = TIFFFdOpen(_get_osfhandle(fileno(openedFile)), "-", "w"); +# else + priv->f = TIFFFdOpen(fileno(openedFile), "-", "w"); +# endif + + if (!priv->f) { + return false; + } + + // Set TIFF tags + + TIFFSetField(priv->f, TIFFTAG_IMAGEWIDTH, width); + TIFFSetField(priv->f, TIFFTAG_IMAGELENGTH, height); + TIFFSetField(priv->f, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); + TIFFSetField(priv->f, TIFFTAG_SAMPLESPERPIXEL, samplesperpixel); + TIFFSetField(priv->f, TIFFTAG_BITSPERSAMPLE, bitspersample); + TIFFSetField(priv->f, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); + TIFFSetField(priv->f, TIFFTAG_PHOTOMETRIC, photometric); + TIFFSetField(priv->f, TIFFTAG_COMPRESSION, (uint16_t)compression); + TIFFSetField(priv->f, TIFFTAG_ROWSPERSTRIP, TIFFDefaultStripSize(priv->f, rowsperstrip)); + TIFFSetField(priv->f, TIFFTAG_XRESOLUTION, hDPI); + TIFFSetField(priv->f, TIFFTAG_YRESOLUTION, vDPI); + TIFFSetField(priv->f, TIFFTAG_RESOLUTIONUNIT, RESUNIT_INCH); + + if (priv->format == RGBA_PREMULTIPLIED) { + uint16_t extra = EXTRASAMPLE_ASSOCALPHA; + TIFFSetField(priv->f, TIFFTAG_EXTRASAMPLES, 1, &extra); + } + + if (priv->format == CMYK) { + TIFFSetField(priv->f, TIFFTAG_INKSET, INKSET_CMYK); + TIFFSetField(priv->f, TIFFTAG_NUMBEROFINKS, 4); + } + + return true; +} + +bool TiffWriter::writePointers(unsigned char **rowPointers, int rowCount) +{ + // Write all rows to the file + + for (int row = 0; row < rowCount; row++) { + if (TIFFWriteScanline(priv->f, rowPointers[row], row, 0) < 0) { + fprintf(stderr, "TiffWriter: Error writing tiff row %d\n", row); + return false; + } + } + + return true; +} + +bool TiffWriter::writeRow(unsigned char **rowData) +{ + // Add a single row + + if (TIFFWriteScanline(priv->f, *rowData, priv->curRow, 0) < 0) { + fprintf(stderr, "TiffWriter: Error writing tiff row %d\n", priv->curRow); + return false; + } + + priv->curRow++; + + return true; +} + +bool TiffWriter::close() +{ + // Close the file + + TIFFClose(priv->f); + + return true; +} + +#endif diff --git a/poppler-24.05.0/goo/TiffWriter.h b/poppler-24.05.0/goo/TiffWriter.h new file mode 100644 index 0000000000000000000000000000000000000000..3691a6e2d5a608c656fcab592a1018628fbba9a2 --- /dev/null +++ b/poppler-24.05.0/goo/TiffWriter.h @@ -0,0 +1,70 @@ +//======================================================================== +// +// TiffWriter.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2010, 2012 William Bader +// Copyright (C) 2011, 2012, 2021, 2022 Albert Astals Cid +// Copyright (C) 2012, 2017 Adrian Johnson +// Copyright (C) 2012 Pino Toscano +// +//======================================================================== + +#ifndef TIFFWRITER_H +#define TIFFWRITER_H + +#include "poppler-config.h" +#include "poppler_private_export.h" + +#ifdef ENABLE_LIBTIFF + +# include +# include "ImgWriter.h" + +struct TiffWriterPrivate; + +class POPPLER_PRIVATE_EXPORT TiffWriter : public ImgWriter +{ +public: + /* RGB - 3 bytes/pixel + * RGBA_PREMULTIPLIED - 4 bytes/pixel premultiplied by alpha + * GRAY - 1 byte/pixel + * MONOCHROME - 8 pixels/byte + * CMYK - 4 bytes/pixel + * RGB48 - 6 bytes/pixel + */ + enum Format + { + RGB, + RGBA_PREMULTIPLIED, + GRAY, + MONOCHROME, + CMYK, + RGB48 + }; + + explicit TiffWriter(Format format = RGB); + ~TiffWriter() override; + + TiffWriter(const TiffWriter &other) = delete; + TiffWriter &operator=(const TiffWriter &other) = delete; + + void setCompressionString(const char *compressionStringArg); + + bool init(FILE *openedFile, int width, int height, double hDPI, double vDPI) override; + + bool writePointers(unsigned char **rowPointers, int rowCount) override; + bool writeRow(unsigned char **rowData) override; + + bool supportCMYK() override { return true; } + + bool close() override; + +private: + TiffWriterPrivate *priv; +}; + +#endif + +#endif diff --git a/poppler-24.05.0/goo/ft_utils.cc b/poppler-24.05.0/goo/ft_utils.cc new file mode 100644 index 0000000000000000000000000000000000000000..fc89302e9fc30fba8d9bfdcb03eab686359131ac --- /dev/null +++ b/poppler-24.05.0/goo/ft_utils.cc @@ -0,0 +1,71 @@ +//======================================================================== +// +// ft_util.cc +// +// FreeType helper functions. +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2022 Adrian Johnson +// +//======================================================================== + +#include + +#include "ft_utils.h" +#include "gfile.h" + +#ifdef _WIN32 +static unsigned long ft_stream_read(FT_Stream stream, unsigned long offset, unsigned char *buffer, unsigned long count) +{ + FILE *file = (FILE *)stream->descriptor.pointer; + fseek(file, offset, SEEK_SET); + return fread(buffer, 1, count, file); +} + +static void ft_stream_close(FT_Stream stream) +{ + FILE *file = (FILE *)stream->descriptor.pointer; + fclose(file); + delete stream; +} +#endif + +// Same as FT_New_Face() but handles UTF-8 filenames on Windows +FT_Error ft_new_face_from_file(FT_Library library, const char *filename_utf8, FT_Long face_index, FT_Face *aface) +{ +#ifdef _WIN32 + FILE *file; + long size; + + if (!filename_utf8) + return FT_Err_Invalid_Argument; + + file = openFile(filename_utf8, "rb"); + if (!file) + return FT_Err_Cannot_Open_Resource; + + fseek(file, 0, SEEK_END); + size = ftell(file); + rewind(file); + + if (size <= 0) + return FT_Err_Cannot_Open_Stream; + + FT_StreamRec *stream = new FT_StreamRec; + *stream = {}; + stream->size = size; + stream->read = ft_stream_read; + stream->close = ft_stream_close; + stream->descriptor.pointer = file; + + FT_Open_Args args = {}; + args.flags = FT_OPEN_STREAM; + args.stream = stream; + + return FT_Open_Face(library, &args, face_index, aface); +#else + // On POSIX, FT_New_Face mmaps font files. If not Windows, prefer FT_New_Face over our stdio.h based FT_Open_Face. + return FT_New_Face(library, filename_utf8, face_index, aface); +#endif +} diff --git a/poppler-24.05.0/goo/ft_utils.h b/poppler-24.05.0/goo/ft_utils.h new file mode 100644 index 0000000000000000000000000000000000000000..7f4118dc1de157d018e4ed8296b38508f1cfd10e --- /dev/null +++ b/poppler-24.05.0/goo/ft_utils.h @@ -0,0 +1,25 @@ +//======================================================================== +// +// ft_util.h +// +// FreeType helper functions. +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2022 Adrian Johnson +// +//======================================================================== + +#ifndef FT_UTILS_H +#define FT_UTILS_H + +#include "config.h" +#include "poppler_private_export.h" + +#include +#include FT_FREETYPE_H + +// Same as FT_New_Face() but handles UTF-8 filenames on Windows +POPPLER_PRIVATE_EXPORT FT_Error ft_new_face_from_file(FT_Library library, const char *filename_utf8, FT_Long face_index, FT_Face *aface); + +#endif // FT_UTILS_H diff --git a/poppler-24.05.0/goo/gbase64.cc b/poppler-24.05.0/goo/gbase64.cc new file mode 100644 index 0000000000000000000000000000000000000000..2cbc8ae607e99d8a14be8661128d281a9d52694b --- /dev/null +++ b/poppler-24.05.0/goo/gbase64.cc @@ -0,0 +1,50 @@ +//======================================================================== +// +// gbase64.cc +// +// Implementation of a base64 encoder, because another one did not immediately +// avail itself. +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2018 Greg Knight +// +//======================================================================== + +#include "gbase64.h" +#include + +static void b64encodeTriplet(char output[4], unsigned char a, unsigned char b, unsigned char c) +{ + static const char *base64table = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + output[0] = base64table[((a >> 2) & 0x3f)]; // upper 6 of first byte + output[1] = base64table[((a << 4) & 0x30) | ((b >> 4) & 0x0f)]; // lower 2 of first byte, upper 4 of second byte + output[2] = base64table[((b << 2) & 0x3c) | ((c >> 6) & 0x03)]; // lower 4 of second byte, upper 2 of third byte + output[3] = base64table[((c)&0x3f)]; // lower 6 of third byte +} + +std::string gbase64Encode(const void *input, size_t len) +{ + char quad[4]; + size_t pos = 0; + std::stringstream buf; + auto bytes = static_cast(input); + for (; pos + 3 <= len; pos += 3) { + b64encodeTriplet(quad, bytes[0], bytes[1], bytes[2]); + buf.write(&quad[0], 4); + bytes += 3; + } + switch (len - pos) { + case 1: + b64encodeTriplet(quad, bytes[0], 0, 0); + quad[2] = quad[3] = '='; + buf.write(&quad[0], 4); + break; + case 2: + b64encodeTriplet(quad, bytes[0], bytes[1], 0); + quad[3] = '='; + buf.write(&quad[0], 4); + break; + } + return buf.str(); +} diff --git a/poppler-24.05.0/goo/gbase64.h b/poppler-24.05.0/goo/gbase64.h new file mode 100644 index 0000000000000000000000000000000000000000..08990687229fa11f24b8331393c5aea4bb482e9d --- /dev/null +++ b/poppler-24.05.0/goo/gbase64.h @@ -0,0 +1,35 @@ +//======================================================================== +// +// gbase64.h +// +// Implementation of a base64 encoder, because another one did not immediately +// avail itself. +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2018 Greg Knight +// Copyright (C) 2019 Albert Astals Cid +// +//======================================================================== + +#ifndef GOO_GBASE64_H +#define GOO_GBASE64_H + +#include "poppler_private_export.h" + +#include +#include + +std::string POPPLER_PRIVATE_EXPORT gbase64Encode(const void *input, size_t len); + +inline std::string gbase64Encode(const std::vector &input) +{ + return input.empty() ? std::string() : gbase64Encode(&input[0], input.size()); +} + +inline std::string gbase64Encode(const std::vector &input) +{ + return input.empty() ? std::string() : gbase64Encode(&input[0], input.size()); +} + +#endif // ndef GOO_GBASE64_H diff --git a/poppler-24.05.0/goo/gbasename.cc b/poppler-24.05.0/goo/gbasename.cc new file mode 100644 index 0000000000000000000000000000000000000000..69236d8101f7a50c1f9f0a55578b7095cc57daa4 --- /dev/null +++ b/poppler-24.05.0/goo/gbasename.cc @@ -0,0 +1,61 @@ +//======================================================================== +// +// gbasename.cc +// +// Wrapper for libgen's basename() call which returns a std::string. +// This is a convenience method working around questionable behavior +// in the copy of basename() provided by libgen.h. +// +// According to man 3 basename: +// +// Both dirname() and basename() may modify the contents of path, so it +// may be desirable to pass a copy when calling one of these functions. +// +// ... +// +// These functions may return pointers to statically allocated memory +// which may be overwritten by subsequent calls. Alternatively, they +// may return a pointer to some part of path, so that the string +// referred to by path should not be modified or freed until the pointer +// returned by the function is no longer required. +// +// Because basename can modify filename (for some reason), we have to +// duplicate our input into a mutable buffer before we can call it. +// The return value might be part of this mutable temporary, but not +// generally the front, so 'char *' cannot be used as our return value. +// The return value might also be a statically allocated string, +// rendering basename (and thus gbasename) non-thread-safe. Because +// we don't know how basename()'s return value is lifecycled, we need +// to duplicate it again into something whose lifecycle we can predict. +// +// This is how a method that should amount to finding the last slash +// in a string ends up requiring two memory allocations while managing +// not to be thread-safe. In a way, it's kind of impressive. +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2018, 2019 Greg Knight +// Copyright (C) 2019 Albert Astals Cid +// +//======================================================================== + +#include "gbasename.h" +#ifndef _MSC_VER +# include +#endif +#include +#include + +std::string gbasename(const char *filename) +{ +#ifdef _MSC_VER + char fname[_MAX_FNAME] = {}, fext[_MAX_EXT] = {}; + errno_t z = _splitpath_s(filename, NULL, 0, NULL, 0, fname, _countof(fname), fext, _countof(fext)); + return std::string(fname) + std::string(fext); +#else + char *mutabl = strdup(filename); + std::string retu = basename(mutabl); + free(mutabl); + return retu; +#endif +} diff --git a/poppler-24.05.0/goo/gbasename.h b/poppler-24.05.0/goo/gbasename.h new file mode 100644 index 0000000000000000000000000000000000000000..33e97649b3ed50508f99373233c4b51a11ceedd4 --- /dev/null +++ b/poppler-24.05.0/goo/gbasename.h @@ -0,0 +1,24 @@ +//======================================================================== +// +// gbasename.h +// +// Wrapper for libgen's basename() call which returns a std::string. +// This is a convenience method working around questionable behavior +// in the copy of basename() provided by libgen.h. +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2018 Greg Knight +// Copyright (C) 2019 Albert Astals Cid +// +//======================================================================== + +#ifndef GBASENAME_H +#define GBASENAME_H + +#include +#include "poppler_private_export.h" + +std::string POPPLER_PRIVATE_EXPORT gbasename(const char *filename); + +#endif // ndef GBASENAME_H diff --git a/poppler-24.05.0/goo/gdir.h b/poppler-24.05.0/goo/gdir.h new file mode 100644 index 0000000000000000000000000000000000000000..760687919cda357b1ce98859cae504700543dee7 --- /dev/null +++ b/poppler-24.05.0/goo/gdir.h @@ -0,0 +1,96 @@ +//======================================================================== +// +// gfile.h +// +// Miscellaneous file and directory name manipulation. +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Kristian Høgsberg +// Copyright (C) 2009, 2011, 2012, 2017, 2018, 2021, 2022 Albert Astals Cid +// Copyright (C) 2009 Kovid Goyal +// Copyright (C) 2013 Adam Reichold +// Copyright (C) 2013, 2017 Adrian Johnson +// Copyright (C) 2014 Bogdan Cristea +// Copyright (C) 2014 Peter Breitenlohner +// Copyright (C) 2017 Christoph Cullmann +// Copyright (C) 2017 Thomas Freitag +// Copyright (C) 2018 Mojca Miklavec +// Copyright (C) 2019 Christian Persch +// +// 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 +// +//======================================================================== + +#ifndef GDIR_H +#define GDIR_H + +#include "poppler-config.h" + +#include + +class GooString; + +#if defined(_WIN32) +# include +#else +# include +#endif + +//------------------------------------------------------------------------ +// GDir and GDirEntry +//------------------------------------------------------------------------ + +class GDirEntry +{ +public: + GDirEntry(const char *dirPath, const char *nameA, bool doStat); + ~GDirEntry(); + + GDirEntry(const GDirEntry &other) = delete; + GDirEntry &operator=(const GDirEntry &other) = delete; + + const GooString *getName() const { return name; } + const GooString *getFullPath() const { return fullPath; } + bool isDir() const { return dir; } + +private: + GooString *name; // dir/file name + GooString *fullPath; + bool dir; // is it a directory? +}; + +class GDir +{ +public: + explicit GDir(const char *name, bool doStatA = true); + ~GDir(); + + GDir(const GDir &other) = delete; + GDir &operator=(const GDir &other) = delete; + + std::unique_ptr getNextEntry(); + void rewind(); + +private: + GooString *path; // directory path + bool doStat; // call stat() for each entry? +#if defined(_WIN32) + WIN32_FIND_DATAA ffd; + HANDLE hnd; +#else + DIR *dir; // the DIR structure from opendir() +#endif +}; + +#endif diff --git a/poppler-24.05.0/goo/gfile.cc b/poppler-24.05.0/goo/gfile.cc new file mode 100644 index 0000000000000000000000000000000000000000..5ae4ffcba9c2e43920e3273236534cd679218628 --- /dev/null +++ b/poppler-24.05.0/goo/gfile.cc @@ -0,0 +1,545 @@ +//======================================================================== +// +// gfile.cc +// +// Miscellaneous file and directory name manipulation. +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Takashi Iwai +// Copyright (C) 2006 Kristian Høgsberg +// Copyright (C) 2008 Adam Batkin +// Copyright (C) 2008, 2010, 2012, 2013 Hib Eris +// Copyright (C) 2009, 2012, 2014, 2017, 2018, 2021, 2022 Albert Astals Cid +// Copyright (C) 2009 Kovid Goyal +// Copyright (C) 2013, 2018 Adam Reichold +// Copyright (C) 2013, 2017 Adrian Johnson +// Copyright (C) 2013 Peter Breitenlohner +// Copyright (C) 2013, 2017 Thomas Freitag +// Copyright (C) 2017 Christoph Cullmann +// Copyright (C) 2018 Mojca Miklavec +// Copyright (C) 2019, 2021 Christian Persch +// +// 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 + +#ifndef _WIN32 +# include +# include +# include +# include +# include +# include +#endif // _WIN32 +#include +#include +#include "GooString.h" +#include "gfile.h" +#include "gdir.h" + +// Some systems don't define this, so just make it something reasonably +// large. +#ifndef PATH_MAX +# define PATH_MAX 1024 +#endif + +#ifndef _WIN32 + +using namespace std::string_literals; + +namespace { + +template +struct void_type +{ + using type = void; +}; + +template +using void_t = typename void_type::type; + +template> +struct StatMtim +{ + static const struct timespec &value(const Stat &stbuf) { return stbuf.st_mtim; } +}; + +// Mac OS X uses a different field name than POSIX and this detects it. +template +struct StatMtim> +{ + static const struct timespec &value(const Stat &stbuf) { return stbuf.st_mtimespec; } +}; + +inline const struct timespec &mtim(const struct stat &stbuf) +{ + return StatMtim::value(stbuf); +} + +} + +#endif + +//------------------------------------------------------------------------ + +GooString *appendToPath(GooString *path, const char *fileName) +{ +#ifdef _WIN32 + //---------- Win32 ---------- + GooString *tmp; + char buf[256]; + char *fp; + + tmp = new GooString(path); + tmp->append('/'); + tmp->append(fileName); + GetFullPathNameA(tmp->c_str(), sizeof(buf), buf, &fp); + delete tmp; + path->clear(); + path->append(buf); + return path; + +#else + //---------- Unix ---------- + int i; + + // appending "." does nothing + if (!strcmp(fileName, ".")) { + return path; + } + + // appending ".." goes up one directory + if (!strcmp(fileName, "..")) { + for (i = path->getLength() - 2; i >= 0; --i) { + if (path->getChar(i) == '/') { + break; + } + } + if (i <= 0) { + if (path->getChar(0) == '/') { + path->del(1, path->getLength() - 1); + } else { + path->clear(); + path->append(".."); + } + } else { + path->del(i, path->getLength() - i); + } + return path; + } + + // otherwise, append "/" and new path component + if (path->getLength() > 0 && path->getChar(path->getLength() - 1) != '/') { + path->append('/'); + } + path->append(fileName); + return path; +#endif +} + +#ifndef _WIN32 + +static bool makeFileDescriptorCloexec(int fd) +{ +# ifdef FD_CLOEXEC + int flags = fcntl(fd, F_GETFD); + if (flags >= 0 && !(flags & FD_CLOEXEC)) { + flags = fcntl(fd, F_SETFD, flags | FD_CLOEXEC); + } + + return flags >= 0; +# else + return true; +# endif +} + +int openFileDescriptor(const char *path, int flags) +{ +# ifdef O_CLOEXEC + return open(path, flags | O_CLOEXEC); +# else + int fd = open(path, flags); + if (fd == -1) + return fd; + + if (!makeFileDescriptorCloexec(fd)) { + close(fd); + return -1; + } + + return fd; +# endif +} + +#endif + +FILE *openFile(const char *path, const char *mode) +{ +#ifdef _WIN32 + OSVERSIONINFO version; + wchar_t wPath[_MAX_PATH + 1]; + char nPath[_MAX_PATH + 1]; + wchar_t wMode[8]; + const char *p; + size_t i; + + // NB: _wfopen is only available in NT + version.dwOSVersionInfoSize = sizeof(version); + GetVersionEx(&version); + if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) { + for (p = path, i = 0; *p && i < _MAX_PATH; ++i) { + if ((p[0] & 0xe0) == 0xc0 && p[1] && (p[1] & 0xc0) == 0x80) { + wPath[i] = (wchar_t)(((p[0] & 0x1f) << 6) | (p[1] & 0x3f)); + p += 2; + } else if ((p[0] & 0xf0) == 0xe0 && p[1] && (p[1] & 0xc0) == 0x80 && p[2] && (p[2] & 0xc0) == 0x80) { + wPath[i] = (wchar_t)(((p[0] & 0x0f) << 12) | ((p[1] & 0x3f) << 6) | (p[2] & 0x3f)); + p += 3; + } else { + wPath[i] = (wchar_t)(p[0] & 0xff); + p += 1; + } + } + wPath[i] = (wchar_t)0; + for (i = 0; (i < sizeof(mode) - 1) && mode[i]; ++i) { + wMode[i] = (wchar_t)(mode[i] & 0xff); + } + wMode[i] = (wchar_t)0; + return _wfopen(wPath, wMode); + } else { + for (p = path, i = 0; *p && i < _MAX_PATH; ++i) { + if ((p[0] & 0xe0) == 0xc0 && p[1] && (p[1] & 0xc0) == 0x80) { + nPath[i] = (char)(((p[0] & 0x1f) << 6) | (p[1] & 0x3f)); + p += 2; + } else if ((p[0] & 0xf0) == 0xe0 && p[1] && (p[1] & 0xc0) == 0x80 && p[2] && (p[2] & 0xc0) == 0x80) { + nPath[i] = (char)(((p[1] & 0x3f) << 6) | (p[2] & 0x3f)); + p += 3; + } else { + nPath[i] = p[0]; + p += 1; + } + } + nPath[i] = '\0'; + return fopen(nPath, mode); + } +#else + // First try to atomically open the file with CLOEXEC + const std::string modeStr = mode + "e"s; + FILE *file = fopen(path, modeStr.c_str()); + if (file != nullptr) { + return file; + } + + // Fall back to the provided mode and apply CLOEXEC afterwards + file = fopen(path, mode); + if (file == nullptr) { + return nullptr; + } + + if (!makeFileDescriptorCloexec(fileno(file))) { + fclose(file); + return nullptr; + } + + return file; +#endif +} + +char *getLine(char *buf, int size, FILE *f) +{ + int c, i; + + i = 0; + while (i < size - 1) { + if ((c = fgetc(f)) == EOF) { + break; + } + buf[i++] = (char)c; + if (c == '\x0a') { + break; + } + if (c == '\x0d') { + c = fgetc(f); + if (c == '\x0a' && i < size - 1) { + buf[i++] = (char)c; + } else if (c != EOF) { + ungetc(c, f); + } + break; + } + } + buf[i] = '\0'; + if (i == 0) { + return nullptr; + } + return buf; +} + +int Gfseek(FILE *f, Goffset offset, int whence) +{ +#if defined(HAVE_FSEEKO) + return fseeko(f, offset, whence); +#elif defined(HAVE_FSEEK64) + return fseek64(f, offset, whence); +#elif defined(__MINGW32__) + return fseeko64(f, offset, whence); +#elif defined(_WIN32) + return _fseeki64(f, offset, whence); +#else + return fseek(f, offset, whence); +#endif +} + +Goffset Gftell(FILE *f) +{ +#if defined(HAVE_FSEEKO) + return ftello(f); +#elif defined(HAVE_FSEEK64) + return ftell64(f); +#elif defined(__MINGW32__) + return ftello64(f); +#elif defined(_WIN32) + return _ftelli64(f); +#else + return ftell(f); +#endif +} + +Goffset GoffsetMax() +{ +#if defined(HAVE_FSEEKO) + return (std::numeric_limits::max)(); +#elif defined(HAVE_FSEEK64) || defined(__MINGW32__) + return (std::numeric_limits::max)(); +#elif defined(_WIN32) + return (std::numeric_limits<__int64>::max)(); +#else + return (std::numeric_limits::max)(); +#endif +} + +//------------------------------------------------------------------------ +// GooFile +//------------------------------------------------------------------------ + +#ifdef _WIN32 + +GooFile::GooFile(HANDLE handleA) : handle(handleA) +{ + GetFileTime(handleA, nullptr, nullptr, &modifiedTimeOnOpen); +} + +int GooFile::read(char *buf, int n, Goffset offset) const +{ + DWORD m; + + LARGE_INTEGER largeInteger = {}; + largeInteger.QuadPart = offset; + + OVERLAPPED overlapped = {}; + overlapped.Offset = largeInteger.LowPart; + overlapped.OffsetHigh = largeInteger.HighPart; + + return FALSE == ReadFile(handle, buf, n, &m, &overlapped) ? -1 : m; +} + +Goffset GooFile::size() const +{ + LARGE_INTEGER size = { (DWORD)-1, -1 }; + + GetFileSizeEx(handle, &size); + + return size.QuadPart; +} + +std::unique_ptr GooFile::open(const std::string &fileName) +{ + HANDLE handle = CreateFileA(fileName.c_str(), GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); + + return handle == INVALID_HANDLE_VALUE ? std::unique_ptr() : std::unique_ptr(new GooFile(handle)); +} + +std::unique_ptr GooFile::open(const wchar_t *fileName) +{ + HANDLE handle = CreateFileW(fileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); + + return handle == INVALID_HANDLE_VALUE ? std::unique_ptr() : std::unique_ptr(new GooFile(handle)); +} + +bool GooFile::modificationTimeChangedSinceOpen() const +{ + struct _FILETIME lastModified; + GetFileTime(handle, nullptr, nullptr, &lastModified); + + return modifiedTimeOnOpen.dwHighDateTime != lastModified.dwHighDateTime || modifiedTimeOnOpen.dwLowDateTime != lastModified.dwLowDateTime; +} + +#else + +int GooFile::read(char *buf, int n, Goffset offset) const +{ +# ifdef HAVE_PREAD64 + return pread64(fd, buf, n, offset); +# else + return pread(fd, buf, n, offset); +# endif +} + +Goffset GooFile::size() const +{ +# ifdef HAVE_LSEEK64 + return lseek64(fd, 0, SEEK_END); +# else + return lseek(fd, 0, SEEK_END); +# endif +} + +std::unique_ptr GooFile::open(const std::string &fileName) +{ + int fd = openFileDescriptor(fileName.c_str(), O_RDONLY); + + return GooFile::open(fd); +} + +std::unique_ptr GooFile::open(int fdA) +{ + return fdA < 0 ? std::unique_ptr() : std::unique_ptr(new GooFile(fdA)); +} + +GooFile::GooFile(int fdA) : fd(fdA) +{ + struct stat statbuf; + fstat(fd, &statbuf); + modifiedTimeOnOpen = mtim(statbuf); +} + +bool GooFile::modificationTimeChangedSinceOpen() const +{ + struct stat statbuf; + fstat(fd, &statbuf); + + return modifiedTimeOnOpen.tv_sec != mtim(statbuf).tv_sec || modifiedTimeOnOpen.tv_nsec != mtim(statbuf).tv_nsec; +} + +#endif // _WIN32 + +//------------------------------------------------------------------------ +// GDir and GDirEntry +//------------------------------------------------------------------------ + +GDirEntry::GDirEntry(const char *dirPath, const char *nameA, bool doStat) +{ +#ifdef _WIN32 + DWORD fa; +#else + struct stat st; +#endif + + name = new GooString(nameA); + dir = false; + fullPath = new GooString(dirPath); + appendToPath(fullPath, nameA); + if (doStat) { +#ifdef _WIN32 + fa = GetFileAttributesA(fullPath->c_str()); + dir = (fa != 0xFFFFFFFF && (fa & FILE_ATTRIBUTE_DIRECTORY)); +#else + if (stat(fullPath->c_str(), &st) == 0) { + dir = S_ISDIR(st.st_mode); + } +#endif + } +} + +GDirEntry::~GDirEntry() +{ + delete fullPath; + delete name; +} + +GDir::GDir(const char *name, bool doStatA) +{ + path = new GooString(name); + doStat = doStatA; +#ifdef _WIN32 + GooString *tmp; + + tmp = path->copy(); + tmp->append("/*.*"); + hnd = FindFirstFileA(tmp->c_str(), &ffd); + delete tmp; +#else + dir = opendir(name); +#endif +} + +GDir::~GDir() +{ + delete path; +#ifdef _WIN32 + if (hnd != INVALID_HANDLE_VALUE) { + FindClose(hnd); + hnd = INVALID_HANDLE_VALUE; + } +#else + if (dir) { + closedir(dir); + } +#endif +} + +std::unique_ptr GDir::getNextEntry() +{ +#ifdef _WIN32 + if (hnd != INVALID_HANDLE_VALUE) { + auto e = std::make_unique(path->c_str(), ffd.cFileName, doStat); + if (!FindNextFileA(hnd, &ffd)) { + FindClose(hnd); + hnd = INVALID_HANDLE_VALUE; + } + return e; + } +#else + struct dirent *ent; + if (dir) { + do { + ent = readdir(dir); + } while (ent && (!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, ".."))); + if (ent) { + return std::make_unique(path->c_str(), ent->d_name, doStat); + } + } +#endif + + return {}; +} + +void GDir::rewind() +{ +#ifdef _WIN32 + GooString *tmp; + + if (hnd != INVALID_HANDLE_VALUE) + FindClose(hnd); + tmp = path->copy(); + tmp->append("/*.*"); + hnd = FindFirstFileA(tmp->c_str(), &ffd); + delete tmp; +#else + if (dir) { + rewinddir(dir); + } +#endif +} diff --git a/poppler-24.05.0/goo/gfile.h b/poppler-24.05.0/goo/gfile.h new file mode 100644 index 0000000000000000000000000000000000000000..516c2fc289061a77cc978cfa2efd82e35a3fda82 --- /dev/null +++ b/poppler-24.05.0/goo/gfile.h @@ -0,0 +1,156 @@ +//======================================================================== +// +// gfile.h +// +// Miscellaneous file and directory name manipulation. +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Kristian Høgsberg +// Copyright (C) 2009, 2011, 2012, 2017, 2018, 2021, 2022 Albert Astals Cid +// Copyright (C) 2009 Kovid Goyal +// Copyright (C) 2013 Adam Reichold +// Copyright (C) 2013, 2017 Adrian Johnson +// Copyright (C) 2014 Bogdan Cristea +// Copyright (C) 2014 Peter Breitenlohner +// Copyright (C) 2017 Christoph Cullmann +// Copyright (C) 2017 Thomas Freitag +// Copyright (C) 2018 Mojca Miklavec +// Copyright (C) 2019, 2021 Christian Persch +// +// 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 +// +//======================================================================== + +#ifndef GFILE_H +#define GFILE_H + +#include "poppler-config.h" +#include "poppler_private_export.h" +#include +#include +#include +#include +#include +extern "C" { +#if defined(_WIN32) +# include +# ifdef FPTEX +# include +# else +# ifndef NOMINMAX +# define NOMINMAX +# endif +# include +# endif +#else +# include +# include +# if defined(HAVE_DIRENT_H) +# include +# define NAMLEN(d) strlen((d)->d_name) +# else +# define dirent direct +# define NAMLEN(d) (d)->d_namlen +# ifdef HAVE_SYS_NDIR_H +# include +# endif +# ifdef HAVE_SYS_DIR_H +# include +# endif +# ifdef HAVE_NDIR_H +# include +# endif +# endif +#endif +} + +#include + +class GooString; + +/* Integer type for all file offsets and file sizes */ +typedef long long Goffset; + +//------------------------------------------------------------------------ + +// Append a file name to a path string. may be an empty +// string, denoting the current directory). Returns . +extern GooString POPPLER_PRIVATE_EXPORT *appendToPath(GooString *path, const char *fileName); + +#ifndef _WIN32 +// Open a file descriptor +// Could be implemented on WIN32 too, but the only external caller of +// this function is not used on WIN32 +extern int POPPLER_PRIVATE_EXPORT openFileDescriptor(const char *path, int flags); +#endif + +// Open a file. On Windows, this converts the path from UTF-8 to +// UCS-2 and calls _wfopen (if available). On other OSes, this simply +// calls fopen. +extern FILE POPPLER_PRIVATE_EXPORT *openFile(const char *path, const char *mode); + +// Just like fgets, but handles Unix, Mac, and/or DOS end-of-line +// conventions. +extern char POPPLER_PRIVATE_EXPORT *getLine(char *buf, int size, FILE *f); + +// Like fseek/ftell but uses platform specific variants that support large files +extern int POPPLER_PRIVATE_EXPORT Gfseek(FILE *f, Goffset offset, int whence); +extern Goffset POPPLER_PRIVATE_EXPORT Gftell(FILE *f); + +// Largest offset supported by Gfseek/Gftell +extern Goffset GoffsetMax(); + +//------------------------------------------------------------------------ +// GooFile +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GooFile +{ +public: + GooFile(const GooFile &) = delete; + GooFile &operator=(const GooFile &other) = delete; + + int read(char *buf, int n, Goffset offset) const; + Goffset size() const; + + static std::unique_ptr open(const std::string &fileName); +#ifndef _WIN32 + static std::unique_ptr open(int fdA); +#endif + +#ifdef _WIN32 + static std::unique_ptr open(const wchar_t *fileName); + + ~GooFile() { CloseHandle(handle); } + + // Asuming than on windows you can't change files that are already open + bool modificationTimeChangedSinceOpen() const; + +private: + GooFile(HANDLE handleA); + HANDLE handle; + struct _FILETIME modifiedTimeOnOpen; +#else + ~GooFile() { close(fd); } + + bool modificationTimeChangedSinceOpen() const; + +private: + explicit GooFile(int fdA); + int fd; + struct timespec modifiedTimeOnOpen; +#endif // _WIN32 +}; + +#endif diff --git a/poppler-24.05.0/goo/glibc.cc b/poppler-24.05.0/goo/glibc.cc new file mode 100644 index 0000000000000000000000000000000000000000..93968ed7123cb218253f70be153d5ee33804d836 --- /dev/null +++ b/poppler-24.05.0/goo/glibc.cc @@ -0,0 +1,59 @@ +//======================================================================== +// +// glibc.h +// +// Emulate various non-portable glibc functions. +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2016 Adrian Johnson +// Copyright (C) 2022 Albert Astals Cid +// +//======================================================================== + +#include "glibc.h" + +#ifndef HAVE_GMTIME_R +struct tm *gmtime_r(const time_t *timep, struct tm *result) +{ + struct tm *gt; + gt = gmtime(timep); + if (gt) + *result = *gt; + return gt; +} +#endif + +#ifndef HAVE_LOCALTIME_R +struct tm *localtime_r(const time_t *timep, struct tm *result) +{ + struct tm *lt; + lt = localtime(timep); + *result = *lt; + return lt; +} +#endif + +#ifndef HAVE_TIMEGM +// Get offset of local time from UTC in seconds. DST is ignored. +static time_t getLocalTimeZoneOffset() +{ + time_t utc, local; + struct tm tm_utc; + time(&utc); + gmtime_r(&utc, &tm_utc); + local = mktime(&tm_utc); + return static_cast(difftime(utc, local)); +} + +time_t timegm(struct tm *tm) +{ + tm->tm_isdst = 0; + time_t t = mktime(tm); + if (t == -1) + return t; + + t += getLocalTimeZoneOffset(); + return t; +} +#endif diff --git a/poppler-24.05.0/goo/glibc.h b/poppler-24.05.0/goo/glibc.h new file mode 100644 index 0000000000000000000000000000000000000000..3de68e9f5dfc89288b06eb4f7c583d607c2f036a --- /dev/null +++ b/poppler-24.05.0/goo/glibc.h @@ -0,0 +1,38 @@ +//======================================================================== +// +// glibc.h +// +// Emulate various non-portable glibc functions. +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2016, 2017 Adrian Johnson +// Copyright (C) 2017 Albert Astals Cid +// +//======================================================================== + +#ifndef GLIBC_H +#define GLIBC_H + +#include "config.h" +#include "poppler_private_export.h" + +#include + +#ifndef HAVE_GMTIME_R +struct tm POPPLER_PRIVATE_EXPORT *gmtime_r(const time_t *timep, struct tm *result); +#endif + +#ifndef HAVE_LOCALTIME_R +struct tm POPPLER_PRIVATE_EXPORT *localtime_r(const time_t *timep, struct tm *result); +#endif + +#ifndef HAVE_TIMEGM +time_t POPPLER_PRIVATE_EXPORT timegm(struct tm *tm); +#endif + +#ifndef HAVE_STRTOK_R +char *strtok_r(char *s, const char *delim, char **save_ptr); +#endif + +#endif // GLIBC_H diff --git a/poppler-24.05.0/goo/glibc_strtok_r.cc b/poppler-24.05.0/goo/glibc_strtok_r.cc new file mode 100644 index 0000000000000000000000000000000000000000..38fa0397435b5c100eee492d90c9aa00fe216853 --- /dev/null +++ b/poppler-24.05.0/goo/glibc_strtok_r.cc @@ -0,0 +1,96 @@ +/* Reentrant string tokenizer. Generic version. + Copyright (C) 1991,1996-1999,2001,2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* Copyright (C) 1991,93,96,97,99,2000,2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Based on strlen implementation by Torbjorn Granlund (tege@sics.se), + with help from Dan Sahlin (dan@sics.se) and + commentary by Jim Blandy (jimb@ai.mit.edu); + adaptation to memchr suggested by Dick Karpinski (dick@cca.ucsf.edu), + and implemented by Roland McGrath (roland@ai.mit.edu). + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +//======================================================================== +// +// 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) 2012 Alexey Pavlov +// Copyright (C) 2012 Albert Astals Cid +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2017 Pekka Vuorela +// +// 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 "glibc.h" + +#ifndef HAVE_STRTOK_R + +# include + +# define __rawmemchr strchr + +char *strtok_r(char *s, const char *delim, char **save_ptr) +{ + char *token; + + if (s == NULL) + s = *save_ptr; + + /* Scan leading delimiters. */ + s += strspn(s, delim); + if (*s == '\0') { + *save_ptr = s; + return NULL; + } + + /* Find the end of the token. */ + token = s; + s = strpbrk(token, delim); + if (s == NULL) + /* This token finishes the string. */ + *save_ptr = __rawmemchr(token, '\0'); + else { + /* Terminate the token and make *SAVE_PTR point past it. */ + *s = '\0'; + *save_ptr = s + 1; + } + return token; +} + +#endif diff --git a/poppler-24.05.0/goo/gmem.h b/poppler-24.05.0/goo/gmem.h new file mode 100644 index 0000000000000000000000000000000000000000..100c9b36db133a1af78a63bf0ee43b78c905b2f6 --- /dev/null +++ b/poppler-24.05.0/goo/gmem.h @@ -0,0 +1,203 @@ +/* + * gmem.h + * + * Memory routines with out-of-memory checking. + * + * Copyright 1996-2003 Glyph & Cog, LLC + */ + +//======================================================================== +// +// 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) 2005 Takashi Iwai +// Copyright (C) 2007-2010, 2017, 2019, 2022 Albert Astals Cid +// Copyright (C) 2008 Jonathan Kew +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2021 Even Rouault +// +// 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 +// +//======================================================================== + +#ifndef GMEM_H +#define GMEM_H + +#include +#include +#include +#include + +#include "GooCheckedOps.h" + +/// Same as malloc, but prints error message and exits if malloc() returns NULL. +inline void *gmalloc(size_t size, bool checkoverflow = false) +{ + if (size == 0) { + return nullptr; + } + + if (void *p = std::malloc(size)) { + return p; + } + + std::fputs("Out of memory\n", stderr); + + if (checkoverflow) { + return nullptr; + } + + std::abort(); +} + +inline void *gmalloc_checkoverflow(size_t size) +{ + return gmalloc(size, true); +} + +/// Same as free +inline void gfree(void *p) +{ + std::free(p); +} + +/// Same as realloc, but prints error message and exits if realloc() returns NULL. +/// If

is NULL, calls malloc() instead of realloc(). +inline void *grealloc(void *p, size_t size, bool checkoverflow = false) +{ + if (size == 0) { + gfree(p); + return nullptr; + } + + if (void *q = p ? std::realloc(p, size) : std::malloc(size)) { + return q; + } + + std::fputs("Out of memory\n", stderr); + + if (checkoverflow) { + return nullptr; + } + + std::abort(); +} + +inline void *grealloc_checkoverflow(void *p, size_t size) +{ + return grealloc(p, size, true); +} + +/* + * These are similar to gmalloc and grealloc, but take an object count + * and size. The result is similar to allocating * + * bytes, but there is an additional error check that the total size + * doesn't overflow an int. + * The gmallocn_checkoverflow variant returns NULL instead of exiting + * the application if a overflow is detected. + */ + +inline void *gmallocn(int count, int size, bool checkoverflow = false) +{ + if (count == 0) { + return nullptr; + } + + int bytes; + if (count < 0 || size <= 0 || checkedMultiply(count, size, &bytes)) { + std::fputs("Bogus memory allocation size\n", stderr); + + if (checkoverflow) { + return nullptr; + } + + std::abort(); + } + + return gmalloc(bytes, checkoverflow); +} + +inline void *gmallocn_checkoverflow(int count, int size) +{ + return gmallocn(count, size, true); +} + +inline void *gmallocn3(int width, int height, int size, bool checkoverflow = false) +{ + if (width == 0 || height == 0) { + return nullptr; + } + + int count; + int bytes; + if (width < 0 || height < 0 || size <= 0 || checkedMultiply(width, height, &count) || checkedMultiply(count, size, &bytes)) { + std::fputs("Bogus memory allocation size\n", stderr); + + if (checkoverflow) { + return nullptr; + } + + std::abort(); + } + + return gmalloc(bytes, checkoverflow); +} + +inline void *greallocn(void *p, int count, int size, bool checkoverflow = false, bool free_p = true) +{ + if (count == 0) { + if (free_p) { + gfree(p); + } + return nullptr; + } + + int bytes; + if (count < 0 || size <= 0 || checkedMultiply(count, size, &bytes)) { + std::fputs("Bogus memory allocation size\n", stderr); + + if (checkoverflow) { + if (free_p) { + gfree(p); + } + return nullptr; + } + + std::abort(); + } + + assert(bytes > 0); + if (void *q = grealloc(p, bytes, checkoverflow)) { + return q; + } + if (free_p) { + gfree(p); + } + return nullptr; +} + +inline void *greallocn_checkoverflow(void *p, int count, int size) +{ + return greallocn(p, count, size, true); +} + +/// Allocate memory and copy a string into it. +inline char *copyString(const char *s) +{ + char *r = static_cast(gmalloc(std::strlen(s) + 1, false)); + return std::strcpy(r, s); +} + +/// Allocate memory and copy a limited-length string to it. +inline char *copyString(const char *s, size_t n) +{ + char *r = static_cast(gmalloc(n + 1, false)); + r[n] = '\0'; + return std::strncpy(r, s, n); +} + +#endif // GMEM_H diff --git a/poppler-24.05.0/goo/grandom.cc b/poppler-24.05.0/goo/grandom.cc new file mode 100644 index 0000000000000000000000000000000000000000..90909b0f1680e20c8502e1423f5356b05f67f134 --- /dev/null +++ b/poppler-24.05.0/goo/grandom.cc @@ -0,0 +1,40 @@ +/* + * grandom.cc + * + * This file is licensed under the GPLv2 or later + * + * Pseudo-random number generation + * + * Copyright (C) 2012 Fabio D'Urso + * Copyright (C) 2018 Adam Reichold + * Copyright (C) 2022 Albert Astals Cid + */ + +#include "grandom.h" + +#include + +namespace { + +auto &grandom_engine() +{ + static thread_local std::default_random_engine engine { std::random_device {}() }; + return engine; +} + +} + +void grandom_fill(unsigned char *buff, int size) +{ + auto &engine = grandom_engine(); + std::uniform_int_distribution distribution { std::numeric_limits::min(), std::numeric_limits::max() }; + for (int index = 0; index < size; ++index) { + buff[index] = static_cast(distribution(engine)); + } +} + +double grandom_double() +{ + auto &engine = grandom_engine(); + return std::generate_canonical::digits>(engine); +} diff --git a/poppler-24.05.0/goo/grandom.h b/poppler-24.05.0/goo/grandom.h new file mode 100644 index 0000000000000000000000000000000000000000..2d535ee7670ce239db284a0bc2afe46bb676712b --- /dev/null +++ b/poppler-24.05.0/goo/grandom.h @@ -0,0 +1,21 @@ +/* + * grandom.h + * + * This file is licensed under the GPLv2 or later + * + * Pseudo-random number generation + * + * Copyright (C) 2012 Fabio D'Urso + * Copyright (C) 2018 Adam Reichold + */ + +#ifndef GRANDOM_H +#define GRANDOM_H + +/// Fills the given buffer with random bytes +void grandom_fill(unsigned char *buff, int size); + +/// Returns a random number in [0,1) +double grandom_double(); + +#endif diff --git a/poppler-24.05.0/goo/gstrtod.cc b/poppler-24.05.0/goo/gstrtod.cc new file mode 100644 index 0000000000000000000000000000000000000000..cf5732757e68a604fc2b07af5a7cbe9b2fe7ac42 --- /dev/null +++ b/poppler-24.05.0/goo/gstrtod.cc @@ -0,0 +1,155 @@ +/* This file is part of Libspectre. + * + * Copyright (C) 2007, 2012 Albert Astals Cid + * Copyright (C) 2007 Carlos Garcia Campos + * + * Libspectre 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. + * + * Libspectre 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. + */ + +/* This function comes from spectre-utils from libspectre */ + +#include "gstrtod.h" + +#include +#include +#include +#include + +#define ascii_isspace(c) (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v') +#define ascii_isdigit(c) (c >= '0' && c <= '9') + +double gatof(const char *nptr) +{ + return gstrtod(nptr, nullptr); +} + +double gstrtod(const char *nptr, char **endptr) +{ + char *fail_pos; + double val; + struct lconv *locale_data; + const char *decimal_point; + int decimal_point_len; + const char *p, *decimal_point_pos; + const char *end = nullptr; /* Silence gcc */ + int strtod_errno; + + fail_pos = nullptr; + + locale_data = localeconv(); + decimal_point = locale_data->decimal_point; + decimal_point_len = strlen(decimal_point); + + decimal_point_pos = nullptr; + end = nullptr; + + if (decimal_point[0] != '.' || decimal_point[1] != 0) { + p = nptr; + /* Skip leading space */ + while (ascii_isspace(*p)) { + p++; + } + + /* Skip leading optional sign */ + if (*p == '+' || *p == '-') { + p++; + } + + if (ascii_isdigit(*p) || *p == '.') { + while (ascii_isdigit(*p)) { + p++; + } + + if (*p == '.') { + decimal_point_pos = p++; + } + + while (ascii_isdigit(*p)) { + p++; + } + + if (*p == 'e' || *p == 'E') { + p++; + } + if (*p == '+' || *p == '-') { + p++; + } + while (ascii_isdigit(*p)) { + p++; + } + + end = p; + } + /* For the other cases, we need not convert the decimal point */ + } + + if (decimal_point_pos) { + char *copy, *c; + + /* We need to convert the '.' to the locale specific decimal point */ + copy = (char *)malloc(end - nptr + 1 + decimal_point_len); + + c = copy; + memcpy(c, nptr, decimal_point_pos - nptr); + c += decimal_point_pos - nptr; + memcpy(c, decimal_point, decimal_point_len); + c += decimal_point_len; + memcpy(c, decimal_point_pos + 1, end - (decimal_point_pos + 1)); + c += end - (decimal_point_pos + 1); + *c = 0; + + errno = 0; + val = strtod(copy, &fail_pos); + strtod_errno = errno; + + if (fail_pos) { + if (fail_pos - copy > decimal_point_pos - nptr) { + fail_pos = (char *)nptr + (fail_pos - copy) - (decimal_point_len - 1); + } else { + fail_pos = (char *)nptr + (fail_pos - copy); + } + } + + free(copy); + } else if (end) { + char *copy; + + copy = (char *)malloc(end - (char *)nptr + 1); + memcpy(copy, nptr, end - nptr); + *(copy + (end - (char *)nptr)) = 0; + + errno = 0; + val = strtod(copy, &fail_pos); + strtod_errno = errno; + + if (fail_pos) { + fail_pos = (char *)nptr + (fail_pos - copy); + } + + free(copy); + } else { + errno = 0; + val = strtod(nptr, &fail_pos); + strtod_errno = errno; + } + + if (endptr) { + *endptr = fail_pos; + } + + errno = strtod_errno; + + return val; +} diff --git a/poppler-24.05.0/goo/gstrtod.h b/poppler-24.05.0/goo/gstrtod.h new file mode 100644 index 0000000000000000000000000000000000000000..fbf1872fb213fa3e56a63c0f6ff1602fbf1d2749 --- /dev/null +++ b/poppler-24.05.0/goo/gstrtod.h @@ -0,0 +1,45 @@ +/* This file is part of Libspectre. + * + * Copyright (C) 2007 Albert Astals Cid + * Copyright (C) 2007 Carlos Garcia Campos + * + * Libspectre 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. + * + * Libspectre 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. + */ + +/* This function comes from spectre-utils from libspectre */ + +#ifndef GSTRTOD_H +#define GSTRTOD_H + +#include "poppler_private_export.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* This function behaves like the standard atof()/(strtod() function + * does in the C locale. It does this without actually changing + * the current locale, since that would not be thread-safe. + * A limitation of the implementation is that this function + * will still accept localized versions of infinities and NANs. + */ +double POPPLER_PRIVATE_EXPORT gatof(const char *nptr); +double gstrtod(const char *nptr, char **endptr); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/poppler-24.05.0/gtkdoc.py b/poppler-24.05.0/gtkdoc.py new file mode 100644 index 0000000000000000000000000000000000000000..b019d346d04bec970c665471e18fe359d236b9a1 --- /dev/null +++ b/poppler-24.05.0/gtkdoc.py @@ -0,0 +1,451 @@ +# Copyright (C) 2011 Igalia S.L. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +from __future__ import absolute_import, division, print_function + +import errno +import logging +import os +import os.path +import subprocess +import sys + +PY2 = sys.version_info[0] == 2 +if PY2: + input = raw_input + + +class GTKDoc(object): + + """Class that controls a gtkdoc run. + + Each instance of this class represents one gtkdoc configuration + and set of documentation. The gtkdoc package is a series of tools + run consecutively which converts inline C/C++ documentation into + docbook files and then into HTML. This class is suitable for + generating documentation or simply verifying correctness. + + Keyword arguments: + output_dir -- The path where gtkdoc output should be placed. Generation + may overwrite file in this directory. Required. + module_name -- The name of the documentation module. For libraries this + is typically the library name. Required if not library path + is given. + source_dirs -- A list of paths to directories of source code to be scanned. + Required if headers is not specified. + ignored_files -- A list of filenames to ignore in the source directory. It is + only necessary to provide the basenames of these files. + Typically it is important to provide an updated list of + ignored files to prevent warnings about undocumented symbols. + headers -- A list of paths to headers to be scanned. Required if source_dirs + is not specified. + namespace -- The library namespace. + decorator -- If a decorator is used to unhide certain symbols in header + files this parameter is required for successful scanning. + (default '') + deprecation_guard -- gtkdoc tries to ensure that symbols marked as deprecated + are encased in this C preprocessor define. This is required + to avoid gtkdoc warnings. (default '') + cflags -- This parameter specifies any preprocessor flags necessary for + building the scanner binary during gtkdoc-scanobj. Typically + this includes all absolute include paths necessary to resolve + all header dependencies. (default '') + ldflags -- This parameter specifies any linker flags necessary for + building the scanner binary during gtkdoc-scanobj. Typically + this includes "-lyourlibraryname". (default '') + library_path -- This parameter specifies the path to the directory where you + library resides used for building the scanner binary during + gtkdoc-scanobj. (default '') + + doc_dir -- The path to other documentation files necessary to build + the documentation. This files in this directory as well as + the files in the 'html' subdirectory will be copied + recursively into the output directory. (default '') + main_sgml_file -- The path or name (if a doc_dir is given) of the SGML file + that is the considered the main page of your documentation. + (default: -docs.sgml) + version -- The version number of the module. If this is provided, + a version.xml file containing the version will be created + in the output directory during documentation generation. + + interactive -- Whether or not errors or warnings should prompt the user + to continue or not. When this value is false, generation + will continue despite warnings. (default False) + + virtual_root -- A temporary installation directory which is used as the root + where the actual installation prefix lives; this is mostly + useful for packagers, and should be set to what is given to + make install as DESTDIR. + """ + + def __init__(self, args): + + # Parameters specific to scanning. + self.module_name = '' + self.source_dirs = [] + self.headers = [] + self.ignored_files = [] + self.namespace = '' + self.decorator = '' + self.deprecation_guard = '' + + # Parameters specific to gtkdoc-scanobj. + self.cflags = '' + self.ldflags = '' + self.library_path = '' + + # Parameters specific to generation. + self.output_dir = '' + self.doc_dir = '' + self.main_sgml_file = '' + + # Parameters specific to gtkdoc-fixxref. + self.cross_reference_deps = [] + + self.interactive = False + + self.logger = logging.getLogger('gtkdoc') + + for key, value in iter(args.items()): + setattr(self, key, value) + + if not getattr(self, 'output_dir'): + raise Exception('output_dir not specified.') + if not getattr(self, 'module_name'): + raise Exception('module_name not specified.') + if not getattr(self, 'source_dirs') and not getattr(self, 'headers'): + raise Exception('Neither source_dirs nor headers specified.' % key) + + # Make all paths absolute in case we were passed relative paths, since + # we change the current working directory when executing subcommands. + self.output_dir = os.path.abspath(self.output_dir) + self.source_dirs = [os.path.abspath(x) for x in self.source_dirs] + self.headers = [os.path.abspath(x) for x in self.headers] + if self.library_path: + self.library_path = os.path.abspath(self.library_path) + + if not self.main_sgml_file: + self.main_sgml_file = self.module_name + "-docs.sgml" + + def generate(self, html=True): + self.saw_warnings = False + + self._copy_doc_files_to_output_dir(html) + self._write_version_xml() + self._run_gtkdoc_scan() + self._run_gtkdoc_scangobj() + self._run_gtkdoc_mkdb() + + if not html: + return + + self._run_gtkdoc_mkhtml() + self._run_gtkdoc_fixxref() + + def _delete_file_if_exists(self, path): + if not os.access(path, os.F_OK | os.R_OK): + return + self.logger.debug('deleting %s', path) + os.unlink(path) + + def _create_directory_if_nonexistent(self, path): + try: + os.makedirs(path) + except OSError as error: + if error.errno != errno.EEXIST: + raise + + def _raise_exception_if_file_inaccessible(self, path): + if not os.path.exists(path) or not os.access(path, os.R_OK): + raise Exception("Could not access file at: %s" % path) + + def _output_has_warnings(self, outputs): + for output in outputs: + if output and output.find('warning'): + return True + return False + + def _ask_yes_or_no_question(self, question): + if not self.interactive: + return True + + question += ' [y/N] ' + answer = None + while answer != 'y' and answer != 'n' and answer != '': + answer = input(question).lower() + return answer == 'y' + + def _run_command(self, args, env=None, cwd=None, print_output=True, ignore_warnings=False): + if print_output: + self.logger.debug("Running %s", args[0]) + self.logger.debug("Full command args: %s", str(args)) + + process = subprocess.Popen(args, env=env, cwd=cwd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + stdout, stderr = [b.decode("utf-8") for b in process.communicate()] + + if print_output: + if stdout: + if PY2: + try: + sys.stdout.write(stdout.encode("utf-8")) + except UnicodeDecodeError: + sys.stdout.write(stdout) + else: + sys.stdout.write(stdout) + if stderr: + if PY2: + try: + sys.stderr.write(stderr.encode("utf-8")) + except UnicodeDecodeError: + sys.stderr.write(stderr) + else: + sys.stderr.write(stderr) + + if process.returncode != 0: + raise Exception('%s produced a non-zero return code %i' + % (args[0], process.returncode)) + + if not ignore_warnings and ('warning' in stderr or 'warning' in stdout): + self.saw_warnings = True + if not self._ask_yes_or_no_question('%s produced warnings, ' + 'try to continue?' % args[0]): + raise Exception('%s step failed' % args[0]) + + return stdout.strip() + + def _copy_doc_files_to_output_dir(self, html=True): + if not self.doc_dir: + self.logger.info('Not copying any files from doc directory,' + ' because no doc directory given.') + return + + def copy_file_replacing_existing(src, dest): + if os.path.isdir(src): + self.logger.debug('skipped directory %s', src) + return + if not os.access(src, os.F_OK | os.R_OK): + self.logger.debug('skipped unreadable %s', src) + return + + self._delete_file_if_exists(dest) + + self.logger.debug('created %s', dest) + try: + os.link(src, dest) + except OSError: + os.symlink(src, dest) + + def copy_all_files_in_directory(src, dest): + for path in os.listdir(src): + copy_file_replacing_existing(os.path.join(src, path), + os.path.join(dest, path)) + + self.logger.debug('Copying template files to output directory...') + self._create_directory_if_nonexistent(self.output_dir) + copy_all_files_in_directory(self.doc_dir, self.output_dir) + + if not html: + return + + self.logger.debug('Copying HTML files to output directory...') + html_src_dir = os.path.join(self.doc_dir, 'html') + html_dest_dir = os.path.join(self.output_dir, 'html') + self._create_directory_if_nonexistent(html_dest_dir) + + if os.path.exists(html_src_dir): + copy_all_files_in_directory(html_src_dir, html_dest_dir) + + def _write_version_xml(self): + if not self.version: + self.logger.info('No version specified, so not writing version.xml') + return + + version_xml_path = os.path.join(self.output_dir, 'version.xml') + src_version_xml_path = os.path.join(self.doc_dir, 'version.xml') + + # Don't overwrite version.xml if it was in the doc directory. + if os.path.exists(version_xml_path) and \ + os.path.exists(src_version_xml_path): + return + + output_file = open(version_xml_path, 'w') + output_file.write(self.version) + output_file.close() + + def _ignored_files_basenames(self): + return ' '.join([os.path.basename(x) for x in self.ignored_files]) + + def _run_gtkdoc_scan(self): + args = ['gtkdoc-scan', + '--module=%s' % self.module_name, + '--rebuild-types'] + + if not self.headers: + # Each source directory should be have its own "--source-dir=" prefix. + args.extend(['--source-dir=%s' % path for path in self.source_dirs]) + + if self.decorator: + args.append('--ignore-decorators=%s' % self.decorator) + if self.deprecation_guard: + args.append('--deprecated-guards=%s' % self.deprecation_guard) + if self.output_dir: + args.append('--output-dir=%s' % self.output_dir) + + # We only need to pass the list of ignored files if the we are not using an explicit list of headers. + if not self.headers: + # gtkdoc-scan wants the basenames of ignored headers, so strip the + # dirname. Different from "--source-dir", the headers should be + # specified as one long string. + ignored_files_basenames = self._ignored_files_basenames() + if ignored_files_basenames: + args.append('--ignore-headers=%s' % ignored_files_basenames) + + if self.headers: + args.extend(self.headers) + + self._run_command(args) + + def _run_gtkdoc_scangobj(self): + env = os.environ + ldflags = self.ldflags + if self.library_path: + additional_ldflags = '' + for arg in env.get('LDFLAGS', '').split(' '): + if arg.startswith('-L'): + additional_ldflags = '%s %s' % (additional_ldflags, arg) + ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags + current_ld_library_path = env.get('LD_LIBRARY_PATH') + if current_ld_library_path: + env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path) + else: + env['LD_LIBRARY_PATH'] = self.library_path + + if ldflags: + env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', '')) + if self.cflags: + env['CFLAGS'] = '%s %s' % (self.cflags, env.get('CFLAGS', '')) + + if 'CFLAGS' in env: + self.logger.debug('CFLAGS=%s', env['CFLAGS']) + if 'LDFLAGS' in env: + self.logger.debug('LDFLAGS %s', env['LDFLAGS']) + if 'RUN' in env: + self.logger.debug('RUN=%s', env['RUN']) + self._run_command(['gtkdoc-scangobj', '--module=%s' % self.module_name], + env=env, cwd=self.output_dir) + + def _run_gtkdoc_mkdb(self): + sgml_file = os.path.join(self.output_dir, self.main_sgml_file) + self._raise_exception_if_file_inaccessible(sgml_file) + + args = ['gtkdoc-mkdb', + '--module=%s' % self.module_name, + '--main-sgml-file=%s' % sgml_file, + '--source-suffixes=h,c,cpp,cc', + '--output-format=xml', + '--sgml-mode'] + + if self.namespace: + args.append('--name-space=%s' % self.namespace) + + ignored_files_basenames = self._ignored_files_basenames() + if ignored_files_basenames: + args.append('--ignore-files=%s' % ignored_files_basenames) + + # Each directory should be have its own "--source-dir=" prefix. + args.extend(['--source-dir=%s' % path for path in self.source_dirs]) + self._run_command(args, cwd=self.output_dir) + + def _run_gtkdoc_mkhtml(self): + html_dest_dir = os.path.join(self.output_dir, 'html') + if not os.path.isdir(html_dest_dir): + raise Exception("%s is not a directory, could not generate HTML" + % html_dest_dir) + elif not os.access(html_dest_dir, os.X_OK | os.R_OK | os.W_OK): + raise Exception("Could not access %s to generate HTML" + % html_dest_dir) + + # gtkdoc-mkhtml expects the SGML path to be absolute. + sgml_file = os.path.join(os.path.abspath(self.output_dir), + self.main_sgml_file) + self._raise_exception_if_file_inaccessible(sgml_file) + + self._run_command(['gtkdoc-mkhtml', self.module_name, sgml_file], + cwd=html_dest_dir) + + def _run_gtkdoc_fixxref(self): + args = ['gtkdoc-fixxref', + '--module=%s' % self.module_name, + '--module-dir=html', + '--html-dir=html'] + args.extend(['--extra-dir=%s' % extra_dir for extra_dir in self.cross_reference_deps]) + self._run_command(args, cwd=self.output_dir, ignore_warnings=True) + + def rebase_installed_docs(self): + if not os.path.isdir(self.output_dir): + raise Exception("Tried to rebase documentation before generating it.") + html_dir = os.path.join(self.virtual_root + self.prefix, 'share', 'gtk-doc', 'html', self.module_name) + if not os.path.isdir(html_dir): + return + args = ['gtkdoc-rebase', + '--relative', + '--html-dir=%s' % html_dir] + args.extend(['--other-dir=%s' % extra_dir for extra_dir in self.cross_reference_deps]) + if self.virtual_root: + args.extend(['--dest-dir=%s' % self.virtual_root]) + self._run_command(args, cwd=self.output_dir) + + def api_missing_documentation(self): + unused_doc_file = os.path.join(self.output_dir, self.module_name + "-unused.txt") + if not os.path.exists(unused_doc_file) or not os.access(unused_doc_file, os.R_OK): + return [] + return open(unused_doc_file).read().splitlines() + +class PkgConfigGTKDoc(GTKDoc): + + """Class reads a library's pkgconfig file to guess gtkdoc parameters. + + Some gtkdoc parameters can be guessed by reading a library's pkgconfig + file, including the cflags, ldflags and version parameters. If you + provide these parameters as well, they will be appended to the ones + guessed via the pkgconfig file. + + Keyword arguments: + pkg_config_path -- Path to the pkgconfig file for the library. Required. + """ + + def __init__(self, pkg_config_path, args): + super(PkgConfigGTKDoc, self).__init__(args) + + pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') + + if not os.path.exists(pkg_config_path): + raise Exception('Could not find pkg-config file at: %s' + % pkg_config_path) + + self.cflags += " " + self._run_command([pkg_config, + pkg_config_path, + '--cflags'], print_output=False) + self.ldflags += " " + self._run_command([pkg_config, + pkg_config_path, + '--libs'], print_output=False) + self.version = self._run_command([pkg_config, + pkg_config_path, + '--modversion'], print_output=False) + self.prefix = self._run_command([pkg_config, + pkg_config_path, + '--variable=prefix'], print_output=False) diff --git a/poppler-24.05.0/hooks/pre-commit b/poppler-24.05.0/hooks/pre-commit new file mode 100644 index 0000000000000000000000000000000000000000..6337bbbde678b5d4633f52c8126085a762beb50d --- /dev/null +++ b/poppler-24.05.0/hooks/pre-commit @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +readonly output=$(git clang-format -v --diff) + +if [[ "$output" == *"no modified files to format"* ]]; then exit 0; fi +if [[ "$output" == *"clang-format did not modify any files"* ]]; then exit 0; fi + +echo "ERROR: you need to run git clang-format on your commit" +echo " git clang-format -f is potentially what you want" +exit 1 diff --git a/poppler-24.05.0/make-glib-api-docs b/poppler-24.05.0/make-glib-api-docs new file mode 100644 index 0000000000000000000000000000000000000000..f1399910b87c7c42ea697f3fdb55e1058ebb8456 --- /dev/null +++ b/poppler-24.05.0/make-glib-api-docs @@ -0,0 +1,67 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2017 Carlos Garcia Campos +# Copyright (C) 2019 Albert Astals Cid +# +# 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 of the License, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +import argparse +import logging +import os +from gtkdoc import PkgConfigGTKDoc + +def configure_logging(verbose): + level = logging.DEBUG if verbose else logging.INFO + logger = logging.getLogger('gtkdoc') + logger.setLevel(level) + handler = logging.StreamHandler() + handler.setLevel(level) + logger.addHandler(handler) + if level == logging.DEBUG: + handler.setFormatter(logging.Formatter('[%(asctime)s] %(message)s')) + else: + handler.setFormatter(logging.Formatter('%(message)s')) + + +parser = argparse.ArgumentParser(description='Make poppler GLib API documentation.') +parser.add_argument('-v', '--verbose', action='store_true', default = False, + help='Whether or not to run in verbose mode.') +parser.add_argument('--skip-html', action='store_true', + help='Whether or not to skip HTML generation, which can be slow.') +parser.add_argument('-s', '--src-dir', action='store', default='.', dest='src_dir', + help='The source directory') +parser.add_argument('-b', '--build-dir', action='store', default='build', dest='build_dir', + help='The build directory') +args = parser.parse_args() +configure_logging(args.verbose) + +pkgconfig_file = os.path.join(args.build_dir, 'poppler-glib.pc') +pkgconfig_path = os.environ.get("PKG_CONFIG_PATH") +os.environ['PKG_CONFIG_PATH'] = args.build_dir +if pkgconfig_path: + os.environ['PKG_CONFIG_PATH'] += ':' + pkgconfig_path + +gtkdoc = PkgConfigGTKDoc(pkgconfig_file, { + 'library_path': os.path.join(args.build_dir, 'glib'), + 'module_name': 'poppler', + 'doc_dir': os.path.join(args.src_dir, 'glib', 'reference'), + 'output_dir': os.path.join(args.build_dir, 'glib', 'reference'), + 'main_sgml_file': 'poppler-docs.sgml', + 'source_dirs': [os.path.join(args.src_dir, 'glib'), os.path.join(args.build_dir, 'glib')], + 'cflags': '-I%s' % os.path.join(args.src_dir, 'glib'), + 'ignored_files': ['poppler-private.h', 'poppler-input-stream.h', 'poppler-cached-file-loader.h', 'demo'] +}) + +gtkdoc.generate(not args.skip_html) diff --git a/poppler-24.05.0/poppler-cpp.pc.cmake b/poppler-24.05.0/poppler-cpp.pc.cmake new file mode 100644 index 0000000000000000000000000000000000000000..3eb68b3810c16ab484c3e873a486de4cb7f45e3b --- /dev/null +++ b/poppler-24.05.0/poppler-cpp.pc.cmake @@ -0,0 +1,12 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + +Name: poppler-cpp +Description: cpp backend for Poppler PDF rendering library +Version: @POPPLER_VERSION@ +Requires: @PC_REQUIRES@ +@PC_REQUIRES_PRIVATE@ + +Libs: -L${libdir} -lpoppler-cpp +Cflags: -I${includedir}/poppler/cpp diff --git a/poppler-24.05.0/poppler-glib.pc.cmake b/poppler-24.05.0/poppler-glib.pc.cmake new file mode 100644 index 0000000000000000000000000000000000000000..b096cbefa080c9de080660de8ad5c06ce25c4378 --- /dev/null +++ b/poppler-24.05.0/poppler-glib.pc.cmake @@ -0,0 +1,12 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + +Name: poppler-glib +Description: GLib wrapper for poppler +Version: @POPPLER_VERSION@ +Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ @PC_REQUIRES@ +@PC_REQUIRES_PRIVATE@ + +Libs: -L${libdir} -lpoppler-glib +Cflags: -I${includedir}/poppler/glib diff --git a/poppler-24.05.0/poppler-qt5.pc.cmake b/poppler-24.05.0/poppler-qt5.pc.cmake new file mode 100644 index 0000000000000000000000000000000000000000..946368922087a328bf19ab26a513e6a6e0231ca3 --- /dev/null +++ b/poppler-24.05.0/poppler-qt5.pc.cmake @@ -0,0 +1,12 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + +Name: poppler-qt5 +Description: Qt5 bindings for poppler +Version: @POPPLER_VERSION@ +Requires: @PC_REQUIRES@ +@PC_REQUIRES_PRIVATE@ + +Libs: -L${libdir} -lpoppler-qt5 +Cflags: -I${includedir}/poppler/qt5 diff --git a/poppler-24.05.0/poppler-qt6.pc.cmake b/poppler-24.05.0/poppler-qt6.pc.cmake new file mode 100644 index 0000000000000000000000000000000000000000..03169a34aef9a8b00edd9bacc4c413ccecb5d574 --- /dev/null +++ b/poppler-24.05.0/poppler-qt6.pc.cmake @@ -0,0 +1,12 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + +Name: poppler-qt6 +Description: Qt6 bindings for poppler +Version: @POPPLER_VERSION@ +Requires: @PC_REQUIRES@ +@PC_REQUIRES_PRIVATE@ + +Libs: -L${libdir} -lpoppler-qt6 +Cflags: -I${includedir}/poppler/qt6 diff --git a/poppler-24.05.0/poppler.pc.cmake b/poppler-24.05.0/poppler.pc.cmake new file mode 100644 index 0000000000000000000000000000000000000000..00b734883c34fe4808fbe74b804b31d2d8fd76aa --- /dev/null +++ b/poppler-24.05.0/poppler.pc.cmake @@ -0,0 +1,10 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + +Name: poppler +Description: PDF rendering library +Version: @POPPLER_VERSION@ + +Libs: -L${libdir} -lpoppler +Cflags: -I${includedir}/poppler diff --git a/poppler-24.05.0/poppler/Annot.cc b/poppler-24.05.0/poppler/Annot.cc new file mode 100644 index 0000000000000000000000000000000000000000..7841637ceb115f3a76b099735617aeb9edaf40cd --- /dev/null +++ b/poppler-24.05.0/poppler/Annot.cc @@ -0,0 +1,7660 @@ +//======================================================================== +// +// Annot.cc +// +// Copyright 2000-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Scott Turner +// Copyright (C) 2007, 2008 Julien Rebetez +// Copyright (C) 2007-2013, 2015-2024 Albert Astals Cid +// Copyright (C) 2007-2013, 2018 Carlos Garcia Campos +// Copyright (C) 2007, 2008 Iñigo Martínez +// Copyright (C) 2007 Jeff Muizelaar +// Copyright (C) 2008, 2011 Pino Toscano +// Copyright (C) 2008 Michael Vrable +// Copyright (C) 2008 Hugo Mercier +// Copyright (C) 2009 Ilya Gorenbein +// Copyright (C) 2011, 2013, 2019 José Aliste +// Copyright (C) 2012, 2013 Fabio D'Urso +// Copyright (C) 2012, 2013 Thomas Freitag +// Copyright (C) 2012, 2015 Tobias Koenig +// Copyright (C) 2013 Peter Breitenlohner +// Copyright (C) 2013, 2017 Adrian Johnson +// Copyright (C) 2014, 2015 Marek Kasik +// Copyright (C) 2014 Jiri Slaby +// Copyright (C) 2014 Anuj Khare +// Copyright (C) 2015 Petr Gajdos +// Copyright (C) 2015 Philipp Reinkemeier +// Copyright (C) 2015 Tamas Szekeres +// Copyright (C) 2017 Hans-Ulrich Jüttner +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright 2018 Andre Heinecke +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2018 Dileep Sankhla +// Copyright (C) 2018-2020 Tobias Deiminger +// Copyright (C) 2018-2020, 2022, 2024 Oliver Sander +// Copyright (C) 2019 Umang Malik +// Copyright (C) 2019 João Netto +// Copyright (C) 2020, 2024 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden +// Copyright (C) 2020 Katarina Behrens +// Copyright (C) 2020 Thorsten Behrens +// Copyright (C) 2020 Nelson Benítez León +// Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, . +// Copyright (C) 2021 Zachary Travis +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Georgiy Sgibnev . Work sponsored by lab50.net. +// Copyright (C) 2022 Martin +// Copyright (C) 2022 Andreas Naumann <42870-ANaumann85@users.noreply.gitlab.freedesktop.org> +// Copyright (C) 2022, 2024 Erich E. Hoover +// Copyright (C) 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// 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 + +#include +#include +#include +#include "goo/gmem.h" +#include "goo/gstrtod.h" +#include "Error.h" +#include "Object.h" +#include "Catalog.h" +#include "Gfx.h" +#include "Lexer.h" +#include "PDFDoc.h" +#include "Page.h" +#include "Annot.h" +#include "GfxFont.h" +#include "CharCodeToUnicode.h" +#include "PDFDocEncoding.h" +#include "Form.h" +#include "Error.h" +#include "XRef.h" +#include "Movie.h" +#include "OptionalContent.h" +#include "Sound.h" +#include "FileSpec.h" +#include "DateInfo.h" +#include "Link.h" +#include "UTF.h" +#include +#include + +#include "annot_stamp_approved.h" +#include "annot_stamp_as_is.h" +#include "annot_stamp_confidential.h" +#include "annot_stamp_departmental.h" +#include "annot_stamp_final.h" +#include "annot_stamp_for_comment.h" +#include "annot_stamp_experimental.h" +#include "annot_stamp_expired.h" +#include "annot_stamp_not_approved.h" +#include "annot_stamp_not_for_public_release.h" +#include "annot_stamp_sold.h" +#include "annot_stamp_top_secret.h" +#include "annot_stamp_for_public_release.h" +#include "annot_stamp_draft.h" + +#ifndef M_PI +# define M_PI 3.14159265358979323846 +#endif + +#define fieldFlagReadOnly 0x00000001 +#define fieldFlagRequired 0x00000002 +#define fieldFlagNoExport 0x00000004 +#define fieldFlagMultiline 0x00001000 +#define fieldFlagPassword 0x00002000 +#define fieldFlagNoToggleToOff 0x00004000 +#define fieldFlagRadio 0x00008000 +#define fieldFlagPushbutton 0x00010000 +#define fieldFlagCombo 0x00020000 +#define fieldFlagEdit 0x00040000 +#define fieldFlagSort 0x00080000 +#define fieldFlagFileSelect 0x00100000 +#define fieldFlagMultiSelect 0x00200000 +#define fieldFlagDoNotSpellCheck 0x00400000 +#define fieldFlagDoNotScroll 0x00800000 +#define fieldFlagComb 0x01000000 +#define fieldFlagRichText 0x02000000 +#define fieldFlagRadiosInUnison 0x02000000 +#define fieldFlagCommitOnSelChange 0x04000000 + +// distance of Bezier control point from center for circle approximation +// = (4 * (sqrt(2) - 1) / 3) * r +#define bezierCircle 0.55228475 + +static AnnotLineEndingStyle parseAnnotLineEndingStyle(const GooString *string) +{ + if (string != nullptr) { + if (!string->cmp("Square")) { + return annotLineEndingSquare; + } else if (!string->cmp("Circle")) { + return annotLineEndingCircle; + } else if (!string->cmp("Diamond")) { + return annotLineEndingDiamond; + } else if (!string->cmp("OpenArrow")) { + return annotLineEndingOpenArrow; + } else if (!string->cmp("ClosedArrow")) { + return annotLineEndingClosedArrow; + } else if (!string->cmp("Butt")) { + return annotLineEndingButt; + } else if (!string->cmp("ROpenArrow")) { + return annotLineEndingROpenArrow; + } else if (!string->cmp("RClosedArrow")) { + return annotLineEndingRClosedArrow; + } else if (!string->cmp("Slash")) { + return annotLineEndingSlash; + } else { + return annotLineEndingNone; + } + } else { + return annotLineEndingNone; + } +} + +static const char *convertAnnotLineEndingStyle(AnnotLineEndingStyle style) +{ + switch (style) { + case annotLineEndingSquare: + return "Square"; + case annotLineEndingCircle: + return "Circle"; + case annotLineEndingDiamond: + return "Diamond"; + case annotLineEndingOpenArrow: + return "OpenArrow"; + case annotLineEndingClosedArrow: + return "ClosedArrow"; + case annotLineEndingButt: + return "Butt"; + case annotLineEndingROpenArrow: + return "ROpenArrow"; + case annotLineEndingRClosedArrow: + return "RClosedArrow"; + case annotLineEndingSlash: + return "Slash"; + default: + return "None"; + } +} + +static AnnotExternalDataType parseAnnotExternalData(Dict *dict) +{ + AnnotExternalDataType type; + + Object obj1 = dict->lookup("Subtype"); + if (obj1.isName()) { + const char *typeName = obj1.getName(); + + if (!strcmp(typeName, "Markup3D")) { + type = annotExternalDataMarkup3D; + } else { + type = annotExternalDataMarkupUnknown; + } + } else { + type = annotExternalDataMarkupUnknown; + } + + return type; +} + +static std::unique_ptr parseDiffRectangle(Array *array, PDFRectangle *rect) +{ + if (array->getLength() == 4) { + // deltas + const double dx1 = array->get(0).getNumWithDefaultValue(0); + const double dy1 = array->get(1).getNumWithDefaultValue(0); + const double dx2 = array->get(2).getNumWithDefaultValue(0); + const double dy2 = array->get(3).getNumWithDefaultValue(0); + + // checking that the numbers are valid (i.e. >= 0), + // and that applying the differences still give us a valid rect + if (dx1 >= 0 && dy1 >= 0 && dx2 >= 0 && dy2 && (rect->x2 - rect->x1 - dx1 - dx2) >= 0 && (rect->y2 - rect->y1 - dy1 - dy2) >= 0) { + auto newRect = std::make_unique(); + newRect->x1 = rect->x1 + dx1; + newRect->y1 = rect->y1 + dy1; + newRect->x2 = rect->x2 - dx2; + newRect->y2 = rect->y2 - dy2; + return newRect; + } + } + return nullptr; +} + +static std::unique_ptr getAdditionalAction(Annot::AdditionalActionsType type, Object *additionalActions, PDFDoc *doc) +{ + Object additionalActionsObject = additionalActions->fetch(doc->getXRef()); + + if (additionalActionsObject.isDict()) { + const char *key = (type == Annot::actionCursorEntering ? "E" + : type == Annot::actionCursorLeaving ? "X" + : type == Annot::actionMousePressed ? "D" + : type == Annot::actionMouseReleased ? "U" + : type == Annot::actionFocusIn ? "Fo" + : type == Annot::actionFocusOut ? "Bl" + : type == Annot::actionPageOpening ? "PO" + : type == Annot::actionPageClosing ? "PC" + : type == Annot::actionPageVisible ? "PV" + : type == Annot::actionPageInvisible ? "PI" + : nullptr); + + Object actionObject = additionalActionsObject.dictLookup(key); + if (actionObject.isDict()) { + return LinkAction::parseAction(&actionObject, doc->getCatalog()->getBaseURI()); + } + } + + return nullptr; +} + +static const char *getFormAdditionalActionKey(Annot::FormAdditionalActionsType type) +{ + return (type == Annot::actionFieldModified ? "K" : type == Annot::actionFormatField ? "F" : type == Annot::actionValidateField ? "V" : type == Annot::actionCalculateField ? "C" : nullptr); +} + +static const char *determineFallbackFont(const std::string &tok, const char *defaultFallback) +{ + // TODO: adjust these based on other example PDFs. + if (tok == "/ZaDb") { + return "ZapfDingbats"; + } else if (tok == "/Cour") { + return "Courier"; + } else if (tok == "/TiRo") { + return "TimesNewRoman"; + } else if (tok == "/Helvetica-Bold") { + return "Helvetica-Bold"; + } + return defaultFallback; +} + +//------------------------------------------------------------------------ +// AnnotBorderEffect +//------------------------------------------------------------------------ + +AnnotBorderEffect::AnnotBorderEffect(Dict *dict) +{ + Object obj1; + + obj1 = dict->lookup("S"); + if (obj1.isName()) { + const char *effectName = obj1.getName(); + + if (!strcmp(effectName, "C")) { + effectType = borderEffectCloudy; + } else { + effectType = borderEffectNoEffect; + } + } else { + effectType = borderEffectNoEffect; + } + + if (effectType == borderEffectCloudy) { + intensity = dict->lookup("I").getNumWithDefaultValue(0); + } else { + intensity = 0; + } +} + +//------------------------------------------------------------------------ +// AnnotPath +//------------------------------------------------------------------------ + +AnnotPath::AnnotPath() = default; + +AnnotPath::AnnotPath(Array *array) +{ + parsePathArray(array); +} + +AnnotPath::AnnotPath(std::vector &&coordsA) +{ + coords = std::move(coordsA); +} + +AnnotPath::~AnnotPath() = default; + +double AnnotPath::getX(int coord) const +{ + if (coord >= 0 && coord < getCoordsLength()) { + return coords[coord].getX(); + } + return 0; +} + +double AnnotPath::getY(int coord) const +{ + if (coord >= 0 && coord < getCoordsLength()) { + return coords[coord].getY(); + } + return 0; +} + +AnnotCoord *AnnotPath::getCoord(int coord) +{ + if (coord >= 0 && coord < getCoordsLength()) { + return &coords[coord]; + } + return nullptr; +} + +void AnnotPath::parsePathArray(Array *array) +{ + if (array->getLength() % 2) { + error(errSyntaxError, -1, "Bad Annot Path"); + return; + } + + const auto tempLength = array->getLength() / 2; + std::vector tempCoords; + tempCoords.reserve(tempLength); + for (int i = 0; i < tempLength; i++) { + double x = 0, y = 0; + + Object obj1 = array->get(i * 2); + if (obj1.isNum()) { + x = obj1.getNum(); + } else { + return; + } + + obj1 = array->get((i * 2) + 1); + if (obj1.isNum()) { + y = obj1.getNum(); + } else { + return; + } + + tempCoords.emplace_back(x, y); + } + + coords = std::move(tempCoords); +} + +//------------------------------------------------------------------------ +// AnnotCalloutLine +//------------------------------------------------------------------------ + +AnnotCalloutLine::AnnotCalloutLine(double x1, double y1, double x2, double y2) : coord1(x1, y1), coord2(x2, y2) { } + +AnnotCalloutLine::~AnnotCalloutLine() = default; + +//------------------------------------------------------------------------ +// AnnotCalloutMultiLine +//------------------------------------------------------------------------ + +AnnotCalloutMultiLine::AnnotCalloutMultiLine(double x1, double y1, double x2, double y2, double x3, double y3) : AnnotCalloutLine(x1, y1, x2, y2), coord3(x3, y3) { } + +AnnotCalloutMultiLine::~AnnotCalloutMultiLine() = default; + +//------------------------------------------------------------------------ +// AnnotQuadrilateral +//------------------------------------------------------------------------ + +AnnotQuadrilaterals::AnnotQuadrilaterals(Array *array, PDFRectangle *rect) +{ + int arrayLength = array->getLength(); + int quadsLength = 0; + double quadArray[8]; + + // default values + quadrilateralsLength = 0; + + if ((arrayLength % 8) == 0) { + int i; + + quadsLength = arrayLength / 8; + auto quads = std::make_unique(quadsLength); + for (i = 0; i < quadsLength; i++) { + for (int j = 0; j < 8; j++) { + Object obj = array->get(i * 8 + j); + if (obj.isNum()) { + quadArray[j] = obj.getNum(); + } else { + error(errSyntaxError, -1, "Invalid QuadPoint in annot"); + return; + } + } + + quads[i] = AnnotQuadrilateral(quadArray[0], quadArray[1], quadArray[2], quadArray[3], quadArray[4], quadArray[5], quadArray[6], quadArray[7]); + } + + quadrilateralsLength = quadsLength; + quadrilaterals = std::move(quads); + } +} + +AnnotQuadrilaterals::AnnotQuadrilaterals(std::unique_ptr &&quads, int quadsLength) +{ + quadrilaterals = std::move(quads); + quadrilateralsLength = quadsLength; +} + +AnnotQuadrilaterals::~AnnotQuadrilaterals() = default; + +double AnnotQuadrilaterals::getX1(int quadrilateral) +{ + if (quadrilateral >= 0 && quadrilateral < quadrilateralsLength) { + return quadrilaterals[quadrilateral].coord1.getX(); + } + return 0; +} + +double AnnotQuadrilaterals::getY1(int quadrilateral) +{ + if (quadrilateral >= 0 && quadrilateral < quadrilateralsLength) { + return quadrilaterals[quadrilateral].coord1.getY(); + } + return 0; +} + +double AnnotQuadrilaterals::getX2(int quadrilateral) +{ + if (quadrilateral >= 0 && quadrilateral < quadrilateralsLength) { + return quadrilaterals[quadrilateral].coord2.getX(); + } + return 0; +} + +double AnnotQuadrilaterals::getY2(int quadrilateral) +{ + if (quadrilateral >= 0 && quadrilateral < quadrilateralsLength) { + return quadrilaterals[quadrilateral].coord2.getY(); + } + return 0; +} + +double AnnotQuadrilaterals::getX3(int quadrilateral) +{ + if (quadrilateral >= 0 && quadrilateral < quadrilateralsLength) { + return quadrilaterals[quadrilateral].coord3.getX(); + } + return 0; +} + +double AnnotQuadrilaterals::getY3(int quadrilateral) +{ + if (quadrilateral >= 0 && quadrilateral < quadrilateralsLength) { + return quadrilaterals[quadrilateral].coord3.getY(); + } + return 0; +} + +double AnnotQuadrilaterals::getX4(int quadrilateral) +{ + if (quadrilateral >= 0 && quadrilateral < quadrilateralsLength) { + return quadrilaterals[quadrilateral].coord4.getX(); + } + return 0; +} + +double AnnotQuadrilaterals::getY4(int quadrilateral) +{ + if (quadrilateral >= 0 && quadrilateral < quadrilateralsLength) { + return quadrilaterals[quadrilateral].coord4.getY(); + } + return 0; +} + +AnnotQuadrilaterals::AnnotQuadrilateral::AnnotQuadrilateral() = default; + +AnnotQuadrilaterals::AnnotQuadrilateral::AnnotQuadrilateral(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4) : coord1(x1, y1), coord2(x2, y2), coord3(x3, y3), coord4(x4, y4) { } + +//------------------------------------------------------------------------ +// AnnotBorder +//------------------------------------------------------------------------ +AnnotBorder::AnnotBorder() +{ + width = 1; + style = borderSolid; +} + +bool AnnotBorder::parseDashArray(Object *dashObj) +{ + bool correct = true; + const int tempLength = dashObj->arrayGetLength(); + std::vector tempDash(tempLength); + + // TODO: check not all zero (Line Dash Pattern Page 217 PDF 8.1) + for (int i = 0; i < tempLength && i < DASH_LIMIT && correct; i++) { + const Object obj1 = dashObj->arrayGet(i); + if (obj1.isNum()) { + tempDash[i] = obj1.getNum(); + + correct = tempDash[i] >= 0; + } else { + correct = false; + } + } + + if (correct) { + dash = std::move(tempDash); + style = borderDashed; + } + + return correct; +} + +AnnotBorder::~AnnotBorder() = default; + +//------------------------------------------------------------------------ +// AnnotBorderArray +//------------------------------------------------------------------------ + +AnnotBorderArray::AnnotBorderArray() +{ + horizontalCorner = 0; + verticalCorner = 0; +} + +AnnotBorderArray::AnnotBorderArray(Array *array) +{ + Object obj1; + int arrayLength = array->getLength(); + + bool correct = true; + if (arrayLength == 3 || arrayLength == 4) { + // implementation note 81 in Appendix H. + + obj1 = array->get(0); + if (obj1.isNum()) { + horizontalCorner = obj1.getNum(); + } else { + correct = false; + } + + obj1 = array->get(1); + if (obj1.isNum()) { + verticalCorner = obj1.getNum(); + } else { + correct = false; + } + + obj1 = array->get(2); + if (obj1.isNum()) { + width = obj1.getNum(); + } else { + correct = false; + } + + if (arrayLength == 4) { + obj1 = array->get(3); + if (obj1.isArray()) { + correct = parseDashArray(&obj1); + } else { + correct = false; + } + } + } else { + correct = false; + } + + if (!correct) { + width = 0; + } +} + +std::unique_ptr AnnotBorderArray::copy() const +{ + AnnotBorderArray *res = new AnnotBorderArray(); + res->type = type; + res->width = width; + res->dash = dash; + res->style = style; + res->horizontalCorner = horizontalCorner; + res->verticalCorner = verticalCorner; + return std::unique_ptr(res); +} + +Object AnnotBorderArray::writeToObject(XRef *xref) const +{ + Array *borderArray = new Array(xref); + borderArray->add(Object(horizontalCorner)); + borderArray->add(Object(verticalCorner)); + borderArray->add(Object(width)); + + if (dash.size() > 0) { + Array *a = new Array(xref); + + for (double d : dash) { + a->add(Object(d)); + } + + borderArray->add(Object(a)); + } + + return Object(borderArray); +} + +//------------------------------------------------------------------------ +// AnnotBorderBS +//------------------------------------------------------------------------ + +AnnotBorderBS::AnnotBorderBS() { } + +AnnotBorderBS::AnnotBorderBS(Dict *dict) +{ + // Border width (in points) + Object obj1 = dict->lookup("W"); + width = obj1.getNumWithDefaultValue(1.0); + + // Border style + obj1 = dict->lookup("S"); + if (obj1.isName()) { + const char *styleName = obj1.getName(); + + if (!strcmp(styleName, "S")) { + style = borderSolid; + } else if (!strcmp(styleName, "D")) { + style = borderDashed; + } else if (!strcmp(styleName, "B")) { + style = borderBeveled; + } else if (!strcmp(styleName, "I")) { + style = borderInset; + } else if (!strcmp(styleName, "U")) { + style = borderUnderlined; + } else { + style = borderSolid; + } + } else { + style = borderSolid; + } + + // Border dash style + if (style == borderDashed) { + obj1 = dict->lookup("D"); + if (!obj1.isArray() || !parseDashArray(&obj1)) { + dash = { 3 }; + } + } +} + +const char *AnnotBorderBS::getStyleName() const +{ + switch (style) { + case borderSolid: + return "S"; + case borderDashed: + return "D"; + case borderBeveled: + return "B"; + case borderInset: + return "I"; + case borderUnderlined: + return "U"; + } + + return "S"; +} + +std::unique_ptr AnnotBorderBS::copy() const +{ + AnnotBorderBS *res = new AnnotBorderBS(); + res->type = type; + res->width = width; + res->dash = dash; + res->style = style; + return std::unique_ptr(res); +} + +Object AnnotBorderBS::writeToObject(XRef *xref) const +{ + Dict *dict = new Dict(xref); + dict->set("W", Object(width)); + dict->set("S", Object(objName, getStyleName())); + if (style == borderDashed && dash.size() > 0) { + Array *a = new Array(xref); + + for (double d : dash) { + a->add(Object(d)); + } + dict->set("D", Object(a)); + } + return Object(dict); +} + +//------------------------------------------------------------------------ +// AnnotColor +//------------------------------------------------------------------------ + +AnnotColor::AnnotColor() +{ + length = 0; +} + +AnnotColor::AnnotColor(double gray) +{ + length = 1; + + values[0] = gray; +} + +AnnotColor::AnnotColor(double r, double g, double b) +{ + length = 3; + + values[0] = r; + values[1] = g; + values[2] = b; +} + +AnnotColor::AnnotColor(double c, double m, double y, double k) +{ + length = 4; + + values[0] = c; + values[1] = m; + values[2] = y; + values[3] = k; +} + +// If is +1, color is brightened; +// if is -1, color is darkened; +// otherwise color is not modified. +AnnotColor::AnnotColor(Array *array, int adjust) +{ + int i; + + length = array->getLength(); + if (length > 4) { + length = 4; + } + + for (i = 0; i < length; i++) { + Object obj1 = array->get(i); + if (obj1.isNum()) { + values[i] = obj1.getNum(); + + if (values[i] < 0 || values[i] > 1) { + values[i] = 0; + } + } else { + values[i] = 0; + } + } + + if (adjust != 0) { + adjustColor(adjust); + } +} + +void AnnotColor::adjustColor(int adjust) +{ + int i; + + if (length == 4) { + adjust = -adjust; + } + if (adjust > 0) { + for (i = 0; i < length; ++i) { + values[i] = 0.5 * values[i] + 0.5; + } + } else if (adjust < 0) { + for (i = 0; i < length; ++i) { + values[i] = 0.5 * values[i]; + } + } +} + +Object AnnotColor::writeToObject(XRef *xref) const +{ + if (length == 0) { + return Object(objNull); // Transparent (no color) + } else { + Array *a = new Array(xref); + for (int i = 0; i < length; ++i) { + a->add(Object(values[i])); + } + return Object(a); + } +} + +//------------------------------------------------------------------------ +// DefaultAppearance +//------------------------------------------------------------------------ + +DefaultAppearance::DefaultAppearance(Object &&fontNameA, double fontPtSizeA, std::unique_ptr &&fontColorA) : fontName(std::move(fontNameA)), fontPtSize(fontPtSizeA), fontColor(std::move(fontColorA)) { } + +DefaultAppearance::DefaultAppearance(const GooString *da) +{ + fontPtSize = -1; + + if (da) { + std::vector daToks; + int i = FormFieldText::tokenizeDA(da->toStr(), &daToks, "Tf"); + + if (i >= 1) { + fontPtSize = gatof(daToks[i - 1].c_str()); + } + if (i >= 2) { + // We are expecting a name, therefore the first letter should be '/'. + const std::string &fontToken = daToks[i - 2]; + if (fontToken.size() > 1 && fontToken[0] == '/') { + // The +1 is here to skip the leading '/'. + fontName = Object(objName, fontToken.c_str() + 1); + } + } + // Scan backwards: we are looking for the last set value + for (i = daToks.size() - 1; i >= 0; --i) { + if (!fontColor) { + if (daToks[i] == "g" && i >= 1) { + fontColor = std::make_unique(gatof(daToks[i - 1].c_str())); + } else if (daToks[i] == "rg" && i >= 3) { + fontColor = std::make_unique(gatof(daToks[i - 3].c_str()), gatof(daToks[i - 2].c_str()), gatof(daToks[i - 1].c_str())); + } else if (daToks[i] == "k" && i >= 4) { + fontColor = std::make_unique(gatof(daToks[i - 4].c_str()), gatof(daToks[i - 3].c_str()), gatof(daToks[i - 2].c_str()), gatof(daToks[i - 1].c_str())); + } + } + } + } +} + +void DefaultAppearance::setFontName(Object &&fontNameA) +{ + fontName = std::move(fontNameA); +} + +void DefaultAppearance::setFontPtSize(double fontPtSizeA) +{ + fontPtSize = fontPtSizeA; +} + +void DefaultAppearance::setFontColor(std::unique_ptr fontColorA) +{ + fontColor = std::move(fontColorA); +} + +std::string DefaultAppearance::toAppearanceString() const +{ + AnnotAppearanceBuilder appearBuilder; + if (fontColor) { + appearBuilder.setDrawColor(fontColor.get(), true); + } + appearBuilder.setTextFont(fontName, fontPtSize); + return appearBuilder.buffer()->toStr(); +} + +//------------------------------------------------------------------------ +// AnnotIconFit +//------------------------------------------------------------------------ + +AnnotIconFit::AnnotIconFit(Dict *dict) +{ + Object obj1; + + obj1 = dict->lookup("SW"); + if (obj1.isName()) { + const char *scaleName = obj1.getName(); + + if (!strcmp(scaleName, "B")) { + scaleWhen = scaleBigger; + } else if (!strcmp(scaleName, "S")) { + scaleWhen = scaleSmaller; + } else if (!strcmp(scaleName, "N")) { + scaleWhen = scaleNever; + } else { + scaleWhen = scaleAlways; + } + } else { + scaleWhen = scaleAlways; + } + + obj1 = dict->lookup("S"); + if (obj1.isName()) { + const char *scaleName = obj1.getName(); + + if (!strcmp(scaleName, "A")) { + scale = scaleAnamorphic; + } else { + scale = scaleProportional; + } + } else { + scale = scaleProportional; + } + + obj1 = dict->lookup("A"); + if (obj1.isArray() && obj1.arrayGetLength() == 2) { + left = obj1.arrayGet(0).getNumWithDefaultValue(0); + bottom = obj1.arrayGet(1).getNumWithDefaultValue(0); + + if (left < 0 || left > 1) { + left = 0.5; + } + + if (bottom < 0 || bottom > 1) { + bottom = 0.5; + } + + } else { + left = bottom = 0.5; + } + + fullyBounds = dict->lookup("FB").getBoolWithDefaultValue(false); +} + +//------------------------------------------------------------------------ +// AnnotAppearance +//------------------------------------------------------------------------ + +AnnotAppearance::AnnotAppearance(PDFDoc *docA, Object *dict) +{ + assert(dict->isDict()); + doc = docA; + appearDict = dict->copy(); +} + +AnnotAppearance::~AnnotAppearance() { } + +Object AnnotAppearance::getAppearanceStream(AnnotAppearanceType type, const char *state) +{ + Object apData; + + // Obtain dictionary or stream associated to appearance type + switch (type) { + case appearRollover: + apData = appearDict.dictLookupNF("R").copy(); + if (apData.isNull()) { + apData = appearDict.dictLookupNF("N").copy(); + } + break; + case appearDown: + apData = appearDict.dictLookupNF("D").copy(); + if (apData.isNull()) { + apData = appearDict.dictLookupNF("N").copy(); + } + break; + case appearNormal: + apData = appearDict.dictLookupNF("N").copy(); + break; + } + + if (apData.isDict() && state) { + return apData.dictLookupNF(state).copy(); + } else if (apData.isRef()) { + return apData; + } + + return Object(); +} + +std::unique_ptr AnnotAppearance::getStateKey(int i) +{ + const Object &obj1 = appearDict.dictLookupNF("N"); + if (obj1.isDict()) { + return std::make_unique(obj1.dictGetKey(i)); + } + return nullptr; +} + +int AnnotAppearance::getNumStates() +{ + int res = 0; + const Object &obj1 = appearDict.dictLookupNF("N"); + if (obj1.isDict()) { + res = obj1.dictGetLength(); + } + return res; +} + +// Test if stateObj (a Ref or a Dict) points to the specified stream +bool AnnotAppearance::referencesStream(const Object *stateObj, Ref refToStream) +{ + if (stateObj->isRef()) { + const Ref r = stateObj->getRef(); + if (r == refToStream) { + return true; + } + } else if (stateObj->isDict()) { // Test each value + const int size = stateObj->dictGetLength(); + for (int i = 0; i < size; ++i) { + const Object &obj1 = stateObj->dictGetValNF(i); + if (obj1.isRef()) { + const Ref r = obj1.getRef(); + if (r == refToStream) { + return true; + } + } + } + } + return false; // Not found +} + +// Test if this AnnotAppearance references the specified stream +bool AnnotAppearance::referencesStream(Ref refToStream) +{ + bool found; + + // Scan each state's ref/subdictionary + const Object &objN = appearDict.dictLookupNF("N"); + found = referencesStream(&objN, refToStream); + if (found) { + return true; + } + + const Object &objR = appearDict.dictLookupNF("R"); + found = referencesStream(&objR, refToStream); + if (found) { + return true; + } + + const Object &objD = appearDict.dictLookupNF("D"); + found = referencesStream(&objD, refToStream); + return found; +} + +// If this is the only annotation in the document that references the +// specified appearance stream, remove the appearance stream +void AnnotAppearance::removeStream(Ref refToStream) +{ + const int lastpage = doc->getNumPages(); + for (int pg = 1; pg <= lastpage; ++pg) { // Scan all annotations in the document + Page *page = doc->getPage(pg); + if (!page) { + error(errSyntaxError, -1, "Failed check for shared annotation stream at page {0:d}", pg); + continue; + } + Annots *annots = page->getAnnots(); + for (Annot *annot : annots->getAnnots()) { + AnnotAppearance *annotAp = annot->getAppearStreams(); + if (annotAp && annotAp != this && annotAp->referencesStream(refToStream)) { + return; // Another annotation points to the stream -> Don't delete it + } + } + } + + // TODO: stream resources (e.g. font), AP name tree + doc->getXRef()->removeIndirectObject(refToStream); +} + +// Removes stream if obj is a Ref, or removes pointed streams if obj is a Dict +void AnnotAppearance::removeStateStreams(const Object *state) +{ + if (state->isRef()) { + removeStream(state->getRef()); + } else if (state->isDict()) { + const int size = state->dictGetLength(); + for (int i = 0; i < size; ++i) { + const Object &obj2 = state->dictGetValNF(i); + if (obj2.isRef()) { + removeStream(obj2.getRef()); + } + } + } +} + +void AnnotAppearance::removeAllStreams() +{ + const Object &objN = appearDict.dictLookupNF("N"); + removeStateStreams(&objN); + const Object &objR = appearDict.dictLookupNF("R"); + removeStateStreams(&objR); + const Object &objD = appearDict.dictLookupNF("D"); + removeStateStreams(&objD); +} + +//------------------------------------------------------------------------ +// AnnotAppearanceCharacs +//------------------------------------------------------------------------ + +AnnotAppearanceCharacs::AnnotAppearanceCharacs(Dict *dict) +{ + Object obj1; + + if (!dict) { + rotation = 0; + position = captionNoIcon; + return; + } + + obj1 = dict->lookup("R"); + if (obj1.isInt()) { + rotation = obj1.getInt(); + } else { + rotation = 0; + } + + obj1 = dict->lookup("BC"); + if (obj1.isArray()) { + Array *colorComponents = obj1.getArray(); + if (colorComponents->getLength() > 0) { + borderColor = std::make_unique(colorComponents); + } + } + + obj1 = dict->lookup("BG"); + if (obj1.isArray()) { + Array *colorComponents = obj1.getArray(); + if (colorComponents->getLength() > 0) { + backColor = std::make_unique(colorComponents); + } + } + + obj1 = dict->lookup("CA"); + if (obj1.isString()) { + normalCaption = std::make_unique(obj1.getString()); + } + + obj1 = dict->lookup("RC"); + if (obj1.isString()) { + rolloverCaption = std::make_unique(obj1.getString()); + } + + obj1 = dict->lookup("AC"); + if (obj1.isString()) { + alternateCaption = std::make_unique(obj1.getString()); + } + + obj1 = dict->lookup("IF"); + if (obj1.isDict()) { + iconFit = std::make_unique(obj1.getDict()); + } + + obj1 = dict->lookup("TP"); + if (obj1.isInt()) { + position = (AnnotAppearanceCharacsTextPos)obj1.getInt(); + } else { + position = captionNoIcon; + } +} + +AnnotAppearanceCharacs::~AnnotAppearanceCharacs() = default; + +std::unique_ptr AnnotAppearanceCharacs::copy() const +{ + AnnotAppearanceCharacs *res = new AnnotAppearanceCharacs(nullptr); + res->rotation = rotation; + if (borderColor) { + res->borderColor = std::make_unique(*borderColor); + } + if (backColor) { + res->backColor = std::make_unique(*backColor); + } + if (normalCaption) { + res->normalCaption = std::unique_ptr(normalCaption->copy()); + } + if (rolloverCaption) { + res->rolloverCaption = std::unique_ptr(rolloverCaption->copy()); + } + if (alternateCaption) { + res->alternateCaption = std::unique_ptr(alternateCaption->copy()); + } + if (iconFit) { + res->iconFit = std::make_unique(*iconFit); + } + res->position = position; + return std::unique_ptr(res); +} + +//------------------------------------------------------------------------ +// AnnotAppearanceBBox +//------------------------------------------------------------------------ + +AnnotAppearanceBBox::AnnotAppearanceBBox(PDFRectangle *rect) +{ + origX = rect->x1; + origY = rect->y1; + borderWidth = 0; + + // Initially set the same size as rect + minX = 0; + minY = 0; + maxX = rect->x2 - rect->x1; + maxY = rect->y2 - rect->y1; +} + +void AnnotAppearanceBBox::extendTo(double x, double y) +{ + if (x < minX) { + minX = x; + } else if (x > maxX) { + maxX = x; + } + if (y < minY) { + minY = y; + } else if (y > maxY) { + maxY = y; + } +} + +void AnnotAppearanceBBox::getBBoxRect(double bbox[4]) const +{ + bbox[0] = minX - borderWidth; + bbox[1] = minY - borderWidth; + bbox[2] = maxX + borderWidth; + bbox[3] = maxY + borderWidth; +} + +double AnnotAppearanceBBox::getPageXMin() const +{ + return origX + minX - borderWidth; +} + +double AnnotAppearanceBBox::getPageYMin() const +{ + return origY + minY - borderWidth; +} + +double AnnotAppearanceBBox::getPageXMax() const +{ + return origX + maxX + borderWidth; +} + +double AnnotAppearanceBBox::getPageYMax() const +{ + return origY + maxY + borderWidth; +} + +//------------------------------------------------------------------------ +// Annot +//------------------------------------------------------------------------ + +#define annotLocker() const std::scoped_lock locker(mutex) + +Annot::Annot(PDFDoc *docA, PDFRectangle *rectA) +{ + + refCnt = 1; + flags = flagUnknown; + type = typeUnknown; + + Array *a = new Array(docA->getXRef()); + a->add(Object(rectA->x1)); + a->add(Object(rectA->y1)); + a->add(Object(rectA->x2)); + a->add(Object(rectA->y2)); + + annotObj = Object(new Dict(docA->getXRef())); + annotObj.dictSet("Type", Object(objName, "Annot")); + annotObj.dictSet("Rect", Object(a)); + + ref = docA->getXRef()->addIndirectObject(annotObj); + + initialize(docA, annotObj.getDict()); +} + +Annot::Annot(PDFDoc *docA, Object &&dictObject) +{ + refCnt = 1; + hasRef = false; + flags = flagUnknown; + type = typeUnknown; + annotObj = std::move(dictObject); + initialize(docA, annotObj.getDict()); +} + +Annot::Annot(PDFDoc *docA, Object &&dictObject, const Object *obj) +{ + refCnt = 1; + if (obj->isRef()) { + hasRef = true; + ref = obj->getRef(); + } else { + hasRef = false; + } + flags = flagUnknown; + type = typeUnknown; + annotObj = std::move(dictObject); + initialize(docA, annotObj.getDict()); +} + +void Annot::initialize(PDFDoc *docA, Dict *dict) +{ + Object apObj, asObj, obj1; + + ok = true; + doc = docA; + + appearance.setToNull(); + + //----- parse the rectangle + rect = std::make_unique(); + obj1 = dict->lookup("Rect"); + if (obj1.isArray() && obj1.arrayGetLength() == 4) { + rect->x1 = obj1.arrayGet(0).getNumWithDefaultValue(0); + rect->y1 = obj1.arrayGet(1).getNumWithDefaultValue(0); + rect->x2 = obj1.arrayGet(2).getNumWithDefaultValue(1); + rect->y2 = obj1.arrayGet(3).getNumWithDefaultValue(1); + + if (rect->x1 > rect->x2) { + double t = rect->x1; + rect->x1 = rect->x2; + rect->x2 = t; + } + + if (rect->y1 > rect->y2) { + double t = rect->y1; + rect->y1 = rect->y2; + rect->y2 = t; + } + } else { + rect->x1 = rect->y1 = 0; + rect->x2 = rect->y2 = 1; + error(errSyntaxError, -1, "Bad bounding box for annotation"); + ok = false; + } + + obj1 = dict->lookup("Contents"); + if (obj1.isString()) { + contents.reset(obj1.getString()->copy()); + } else { + contents = std::make_unique(); + } + + // Note: This value is overwritten by Annots ctor + const Object &pObj = dict->lookupNF("P"); + if (pObj.isRef()) { + const Ref pRef = pObj.getRef(); + + page = doc->getCatalog()->findPage(pRef); + } else { + page = 0; + } + + obj1 = dict->lookup("NM"); + if (obj1.isString()) { + name.reset(obj1.getString()->copy()); + } + + obj1 = dict->lookup("M"); + if (obj1.isString()) { + modified.reset(obj1.getString()->copy()); + } + + //----- get the flags + obj1 = dict->lookup("F"); + if (obj1.isInt()) { + flags |= obj1.getInt(); + } else { + flags = flagUnknown; + } + + //----- get the annotation appearance dictionary + apObj = dict->lookup("AP"); + if (apObj.isDict()) { + appearStreams = std::make_unique(doc, &apObj); + } + + //----- get the appearance state + asObj = dict->lookup("AS"); + if (asObj.isName()) { + appearState = std::make_unique(asObj.getName()); + } else if (appearStreams && appearStreams->getNumStates() != 0) { + error(errSyntaxError, -1, "Invalid or missing AS value in annotation containing one or more appearance subdictionaries"); + // AS value is required in this case, but if the + // N dictionary contains only one entry + // take it as default appearance. + if (appearStreams->getNumStates() == 1) { + appearState = appearStreams->getStateKey(0); + } + } + if (!appearState) { + appearState = std::make_unique("Off"); + } + + //----- get the annotation appearance + if (appearStreams) { + appearance = appearStreams->getAppearanceStream(AnnotAppearance::appearNormal, appearState->c_str()); + } + + //----- parse the border style + // According to the spec if neither the Border nor the BS entry is present, + // the border shall be drawn as a solid line with a width of 1 point. But acroread + // seems to ignore the Border entry for annots that can't have a BS entry. So, we only + // follow this rule for annots tha can have a BS entry. + obj1 = dict->lookup("Border"); + if (obj1.isArray()) { + border = std::make_unique(obj1.getArray()); + } + + obj1 = dict->lookup("C"); + if (obj1.isArray()) { + color = std::make_unique(obj1.getArray()); + } + + obj1 = dict->lookup("StructParent"); + if (obj1.isInt()) { + treeKey = obj1.getInt(); + } else { + treeKey = 0; + } + + oc = dict->lookupNF("OC").copy(); +} + +void Annot::getRect(double *x1, double *y1, double *x2, double *y2) const +{ + *x1 = rect->x1; + *y1 = rect->y1; + *x2 = rect->x2; + *y2 = rect->y2; +} + +void Annot::setRect(const PDFRectangle *rectA) +{ + setRect(rectA->x1, rectA->y1, rectA->x2, rectA->y2); +} + +void Annot::setRect(double x1, double y1, double x2, double y2) +{ + if (x1 < x2) { + rect->x1 = x1; + rect->x2 = x2; + } else { + rect->x1 = x2; + rect->x2 = x1; + } + + if (y1 < y2) { + rect->y1 = y1; + rect->y2 = y2; + } else { + rect->y1 = y2; + rect->y2 = y1; + } + + Array *a = new Array(doc->getXRef()); + a->add(Object(rect->x1)); + a->add(Object(rect->y1)); + a->add(Object(rect->x2)); + a->add(Object(rect->y2)); + + update("Rect", Object(a)); + invalidateAppearance(); +} + +bool Annot::inRect(double x, double y) const +{ + return rect->contains(x, y); +} + +void Annot::update(const char *key, Object &&value) +{ + annotLocker(); + /* Set M to current time, unless we are updating M itself */ + if (strcmp(key, "M") != 0) { + modified.reset(timeToDateString(nullptr)); + + annotObj.dictSet("M", Object(modified->copy())); + } + + annotObj.dictSet(const_cast(key), std::move(value)); + + doc->getXRef()->setModifiedObject(&annotObj, ref); + + hasBeenUpdated = true; +} + +void Annot::setContents(std::unique_ptr &&new_content) +{ + annotLocker(); + + if (new_content) { + contents = std::move(new_content); + // append the unicode marker if needed + if (!hasUnicodeByteOrderMark(contents->toStr())) { + prependUnicodeByteOrderMark(contents->toNonConstStr()); + } + } else { + contents = std::make_unique(); + } + + update("Contents", Object(contents->copy())); +} + +void Annot::setName(GooString *new_name) +{ + annotLocker(); + + if (new_name) { + name = std::make_unique(new_name); + } else { + name = std::make_unique(); + } + + update("NM", Object(name->copy())); +} + +void Annot::setModified(GooString *new_modified) +{ + annotLocker(); + + if (new_modified) { + modified = std::make_unique(new_modified); + update("M", Object(modified->copy())); + } else { + modified.reset(nullptr); + update("M", Object(objNull)); + } +} + +void Annot::setFlags(unsigned int new_flags) +{ + annotLocker(); + flags = new_flags; + update("F", Object(int(flags))); +} + +void Annot::setBorder(std::unique_ptr &&new_border) +{ + annotLocker(); + + if (new_border) { + Object obj1 = new_border->writeToObject(doc->getXRef()); + update(new_border->getType() == AnnotBorder::typeArray ? "Border" : "BS", std::move(obj1)); + border = std::move(new_border); + } else { + border = nullptr; + } + invalidateAppearance(); +} + +void Annot::setColor(std::unique_ptr &&new_color) +{ + annotLocker(); + + if (new_color) { + Object obj1 = new_color->writeToObject(doc->getXRef()); + update("C", std::move(obj1)); + color = std::move(new_color); + } else { + color = nullptr; + } + invalidateAppearance(); +} + +void Annot::setPage(int pageIndex, bool updateP) +{ + annotLocker(); + Page *pageobj = doc->getPage(pageIndex); + Object obj1(objNull); + + if (pageobj) { + const Ref pageRef = pageobj->getRef(); + obj1 = Object(pageRef); + page = pageIndex; + } else { + page = 0; + } + + if (updateP) { + update("P", std::move(obj1)); + } +} + +void Annot::setAppearanceState(const char *state) +{ + annotLocker(); + if (!state) { + return; + } + + appearState = std::make_unique(state); + appearBBox = nullptr; + + update("AS", Object(objName, state)); + + // The appearance state determines the current appearance stream + if (appearStreams) { + appearance = appearStreams->getAppearanceStream(AnnotAppearance::appearNormal, appearState->c_str()); + } else { + appearance.setToNull(); + } +} + +void Annot::invalidateAppearance() +{ + annotLocker(); + if (appearStreams) { // Remove existing appearance streams + appearStreams->removeAllStreams(); + } + appearStreams = nullptr; + appearState = nullptr; + appearBBox = nullptr; + appearance.setToNull(); + + Object obj2 = annotObj.dictLookup("AP"); + if (!obj2.isNull()) { + update("AP", Object(objNull)); // Remove AP + } + + obj2 = annotObj.dictLookup("AS"); + if (!obj2.isNull()) { + update("AS", Object(objNull)); // Remove AS + } +} + +double Annot::getXMin() +{ + return rect->x1; +} + +double Annot::getYMin() +{ + return rect->y1; +} + +double Annot::getXMax() +{ + return rect->x2; +} + +double Annot::getYMax() +{ + return rect->y2; +} + +void Annot::readArrayNum(Object *pdfArray, int key, double *value) +{ + Object valueObject = pdfArray->arrayGet(key); + if (valueObject.isNum()) { + *value = valueObject.getNum(); + } else { + *value = 0; + ok = false; + } +} + +void Annot::removeReferencedObjects() +{ + // Remove appearance streams (if any) + invalidateAppearance(); +} + +void Annot::incRefCnt() +{ + refCnt++; +} + +void Annot::decRefCnt() +{ + if (--refCnt == 0) { + delete this; + } +} + +Annot::~Annot() { } + +void AnnotAppearanceBuilder::setDrawColor(const AnnotColor *drawColor, bool fill) +{ + const double *values = drawColor->getValues(); + + switch (drawColor->getSpace()) { + case AnnotColor::colorCMYK: + appearBuf->appendf("{0:.5f} {1:.5f} {2:.5f} {3:.5f} {4:c}\n", values[0], values[1], values[2], values[3], fill ? 'k' : 'K'); + break; + case AnnotColor::colorRGB: + appearBuf->appendf("{0:.5f} {1:.5f} {2:.5f} {3:s}\n", values[0], values[1], values[2], fill ? "rg" : "RG"); + break; + case AnnotColor::colorGray: + appearBuf->appendf("{0:.5f} {1:c}\n", values[0], fill ? 'g' : 'G'); + break; + case AnnotColor::colorTransparent: + default: + break; + } +} + +void AnnotAppearanceBuilder::setTextFont(const Object &fontName, double fontSize) +{ + if (fontName.isName() && strlen(fontName.getName()) > 0) { + appearBuf->appendf("/{0:s} {1:.2f} Tf\n", fontName.getName(), fontSize); + } +} + +void AnnotAppearanceBuilder::setLineStyleForBorder(const AnnotBorder *border) +{ + switch (border->getStyle()) { + case AnnotBorder::borderDashed: + appearBuf->append("["); + for (double dash : border->getDash()) { + appearBuf->appendf(" {0:.2f}", dash); + } + appearBuf->append(" ] 0 d\n"); + break; + default: + appearBuf->append("[] 0 d\n"); + break; + } + appearBuf->appendf("{0:.2f} w\n", border->getWidth()); +} + +// Draw an (approximate) circle of radius centered at (, ). +// If is true, the circle is filled; otherwise it is stroked. +void AnnotAppearanceBuilder::drawCircle(double cx, double cy, double r, bool fill) +{ + if (fill) { + drawEllipse(cx, cy, r, r, true, false); + } else { + drawEllipse(cx, cy, r, r, false, true); + } +} + +// Draw an (approximate) ellipse of radius on x-axis and on y-axis, centered at (, ). +// If is true, the ellipse is filled with current color for non-stroking operations. +// If is true, the ellipse path ist stroked with current color and color space for stroking operations. +// Path will be closed if either fill or stroke is true; otherwise it's left open. +void AnnotAppearanceBuilder::drawEllipse(double cx, double cy, double rx, double ry, bool fill, bool stroke) +{ + appearBuf->appendf("{0:.2f} {1:.2f} m\n", cx + rx, cy); + appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n", cx + rx, cy + bezierCircle * ry, cx + bezierCircle * rx, cy + ry, cx, cy + ry); + appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n", cx - bezierCircle * rx, cy + ry, cx - rx, cy + bezierCircle * ry, cx - rx, cy); + appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n", cx - rx, cy - bezierCircle * ry, cx - bezierCircle * rx, cy - ry, cx, cy - ry); + appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n", cx + bezierCircle * rx, cy - ry, cx + rx, cy - bezierCircle * ry, cx + rx, cy); + if (!fill && stroke) { + appearBuf->append("s\n"); + } else if (fill && !stroke) { + appearBuf->append("f\n"); + } else if (fill && stroke) { + appearBuf->append("b\n"); + } +} + +// Draw the top-left half of an (approximate) circle of radius +// centered at (, ). +void AnnotAppearanceBuilder::drawCircleTopLeft(double cx, double cy, double r) +{ + double r2; + + r2 = r / sqrt(2.0); + appearBuf->appendf("{0:.2f} {1:.2f} m\n", cx + r2, cy + r2); + appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n", cx + (1 - bezierCircle) * r2, cy + (1 + bezierCircle) * r2, cx - (1 - bezierCircle) * r2, cy + (1 + bezierCircle) * r2, cx - r2, cy + r2); + appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n", cx - (1 + bezierCircle) * r2, cy + (1 - bezierCircle) * r2, cx - (1 + bezierCircle) * r2, cy - (1 - bezierCircle) * r2, cx - r2, cy - r2); + appearBuf->append("S\n"); +} + +// Draw the bottom-right half of an (approximate) circle of radius +// centered at (, ). +void AnnotAppearanceBuilder::drawCircleBottomRight(double cx, double cy, double r) +{ + double r2; + + r2 = r / sqrt(2.0); + appearBuf->appendf("{0:.2f} {1:.2f} m\n", cx - r2, cy - r2); + appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n", cx - (1 - bezierCircle) * r2, cy - (1 + bezierCircle) * r2, cx + (1 - bezierCircle) * r2, cy - (1 + bezierCircle) * r2, cx + r2, cy - r2); + appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n", cx + (1 + bezierCircle) * r2, cy - (1 - bezierCircle) * r2, cx + (1 + bezierCircle) * r2, cy + (1 - bezierCircle) * r2, cx + r2, cy + r2); + appearBuf->append("S\n"); +} + +void AnnotAppearanceBuilder::drawLineEndSquare(double x, double y, double size, bool fill, const Matrix &m) +{ + const double halfSize { size / 2. }; + const double x1[3] { x - size, x - size, x }; + const double y1[3] { y + halfSize, y - halfSize, y - halfSize }; + double tx, ty; + + m.transform(x, y + halfSize, &tx, &ty); + appendf("{0:.2f} {1:.2f} m\n", tx, ty); + for (int i = 0; i < 3; i++) { + m.transform(x1[i], y1[i], &tx, &ty); + appendf("{0:.2f} {1:.2f} l\n", tx, ty); + } + appearBuf->append(fill ? "b\n" : "s\n"); +} + +void AnnotAppearanceBuilder::drawLineEndCircle(double x, double y, double size, bool fill, const Matrix &m) +{ + const double halfSize { size / 2. }; + const double x1[4] { x, x - halfSize - bezierCircle * halfSize, x - size, x - halfSize + bezierCircle * halfSize }; + const double x2[4] { x - halfSize + bezierCircle * halfSize, x - size, x - halfSize - bezierCircle * halfSize, x }; + const double x3[4] { x - halfSize, x - size, x - halfSize, x }; + const double y1[4] { y + bezierCircle * halfSize, y + halfSize, y - bezierCircle * halfSize, y - halfSize }; + const double y2[4] { y + halfSize, y + bezierCircle * halfSize, y - halfSize, y - bezierCircle * halfSize }; + const double y3[4] { y + halfSize, y, y - halfSize, y }; + double tx[3]; + double ty[3]; + + m.transform(x, y, &tx[0], &ty[0]); + appearBuf->appendf("{0:.2f} {1:.2f} m\n", tx[0], ty[0]); + for (int i = 0; i < 4; i++) { + m.transform(x1[i], y1[i], &tx[0], &ty[0]); + m.transform(x2[i], y2[i], &tx[1], &ty[1]); + m.transform(x3[i], y3[i], &tx[2], &ty[2]); + appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n", tx[0], ty[0], tx[1], ty[1], tx[2], ty[2]); + } + appearBuf->append(fill ? "b\n" : "s\n"); +} + +void AnnotAppearanceBuilder::drawLineEndDiamond(double x, double y, double size, bool fill, const Matrix &m) +{ + const double halfSize { size / 2. }; + const double x1[3] { x - halfSize, x - size, x - halfSize }; + const double y1[3] { y + halfSize, y, y - halfSize }; + double tx, ty; + + m.transform(x, y, &tx, &ty); + appendf("{0:.2f} {1:.2f} m\n", tx, ty); + for (int i = 0; i < 3; i++) { + m.transform(x1[i], y1[i], &tx, &ty); + appendf("{0:.2f} {1:.2f} l\n", tx, ty); + } + appearBuf->append(fill ? "b\n" : "s\n"); +} + +void AnnotAppearanceBuilder::drawLineEndArrow(double x, double y, double size, int orientation, bool isOpen, bool fill, const Matrix &m) +{ + const double alpha { M_PI / 6. }; + const double xOffs { orientation * size }; + const double yOffs { tan(alpha) * size }; + double tx, ty; + + m.transform(x - xOffs, y + yOffs, &tx, &ty); + appendf("{0:.2f} {1:.2f} m\n", tx, ty); + m.transform(x, y, &tx, &ty); + appendf("{0:.2f} {1:.2f} l\n", tx, ty); + m.transform(x - xOffs, y - yOffs, &tx, &ty); + appendf("{0:.2f} {1:.2f} l\n", tx, ty); + + if (isOpen) { + appearBuf->append("S\n"); + } else { + appearBuf->append(fill ? "b\n" : "s\n"); + } +} + +void AnnotAppearanceBuilder::drawLineEndSlash(double x, double y, double size, const Matrix &m) +{ + const double halfSize { size / 2. }; + const double xOffs { cos(M_PI / 3.) * halfSize }; + double tx, ty; + + m.transform(x - xOffs, y - halfSize, &tx, &ty); + appendf("{0:.2f} {1:.2f} m\n", tx, ty); + m.transform(x + xOffs, y + halfSize, &tx, &ty); + appendf("{0:.2f} {1:.2f} l\n", tx, ty); + appearBuf->append("S\n"); +} + +void AnnotAppearanceBuilder::drawLineEnding(AnnotLineEndingStyle endingStyle, double x, double y, double size, bool fill, const Matrix &m) +{ + switch (endingStyle) { + case annotLineEndingSquare: + drawLineEndSquare(x, y, size, fill, m); + break; + case annotLineEndingCircle: + drawLineEndCircle(x, y, size, fill, m); + break; + case annotLineEndingDiamond: + drawLineEndDiamond(x, y, size, fill, m); + break; + case annotLineEndingOpenArrow: + drawLineEndArrow(x, y, size, 1, true, fill, m); + break; + case annotLineEndingClosedArrow: + drawLineEndArrow(x, y, size, 1, false, fill, m); + break; + case annotLineEndingButt: { + const double halfSize { size / 2. }; + double tx, ty; + m.transform(x, y + halfSize, &tx, &ty); + appendf("{0:.2f} {1:.2f} m\n", tx, ty); + m.transform(x, y - halfSize, &tx, &ty); + appendf("{0:.2f} {1:.2f} l S\n", tx, ty); + } break; + case annotLineEndingROpenArrow: + drawLineEndArrow(x, y, size, -1, true, fill, m); + break; + case annotLineEndingRClosedArrow: + drawLineEndArrow(x, y, size, -1, false, fill, m); + break; + case annotLineEndingSlash: + drawLineEndSlash(x, y, size, m); + break; + default: + break; + } +} + +double AnnotAppearanceBuilder::lineEndingXShorten(AnnotLineEndingStyle endingStyle, double size) +{ + switch (endingStyle) { + case annotLineEndingCircle: + case annotLineEndingClosedArrow: + case annotLineEndingDiamond: + case annotLineEndingSquare: + return size; + default: + break; + } + return 0; +} + +double AnnotAppearanceBuilder::lineEndingXExtendBBox(AnnotLineEndingStyle endingStyle, double size) +{ + switch (endingStyle) { + case annotLineEndingRClosedArrow: + case annotLineEndingROpenArrow: + return size; + case annotLineEndingSlash: + return cos(M_PI / 3.) * size / 2.; + default: + break; + } + return 0; +} + +Object Annot::createForm(const GooString *appearBuf, const double *bbox, bool transparencyGroup, Dict *resDict) +{ + return createForm(appearBuf, bbox, transparencyGroup, resDict ? Object(resDict) : Object()); +} + +Object Annot::createForm(const GooString *appearBuf, const double *bbox, bool transparencyGroup, Object &&resDictObject) +{ + Dict *appearDict = new Dict(doc->getXRef()); + appearDict->set("Length", Object(appearBuf->getLength())); + appearDict->set("Subtype", Object(objName, "Form")); + + Array *a = new Array(doc->getXRef()); + a->add(Object(bbox[0])); + a->add(Object(bbox[1])); + a->add(Object(bbox[2])); + a->add(Object(bbox[3])); + appearDict->set("BBox", Object(a)); + if (transparencyGroup) { + Dict *d = new Dict(doc->getXRef()); + d->set("S", Object(objName, "Transparency")); + appearDict->set("Group", Object(d)); + } + if (resDictObject.isDict()) { + appearDict->set("Resources", std::move(resDictObject)); + } + + Stream *mStream = new AutoFreeMemStream(copyString(appearBuf->c_str()), 0, appearBuf->getLength(), Object(appearDict)); + return Object(mStream); +} + +Dict *Annot::createResourcesDict(const char *formName, Object &&formStream, const char *stateName, double opacity, const char *blendMode) +{ + Dict *gsDict = new Dict(doc->getXRef()); + if (opacity != 1) { + gsDict->set("CA", Object(opacity)); + gsDict->set("ca", Object(opacity)); + } + if (blendMode) { + gsDict->set("BM", Object(objName, blendMode)); + } + Dict *stateDict = new Dict(doc->getXRef()); + stateDict->set(stateName, Object(gsDict)); + Dict *formDict = new Dict(doc->getXRef()); + formDict->set(formName, std::move(formStream)); + + Dict *resDict = new Dict(doc->getXRef()); + resDict->set("ExtGState", Object(stateDict)); + resDict->set("XObject", Object(formDict)); + + return resDict; +} + +Object Annot::getAppearanceResDict() +{ + Object obj1, obj2; + + // Fetch appearance's resource dict (if any) + obj1 = appearance.fetch(doc->getXRef()); + if (obj1.isStream()) { + obj2 = obj1.streamGetDict()->lookup("Resources"); + if (obj2.isDict()) { + return obj2; + } + } + + return Object(objNull); +} + +bool Annot::isVisible(bool printing) +{ + // check the flags + if ((flags & flagHidden) || (printing && !(flags & flagPrint)) || (!printing && (flags & flagNoView))) { + return false; + } + + // check the OC + OCGs *optContentConfig = doc->getCatalog()->getOptContentConfig(); + if (optContentConfig) { + if (!optContentConfig->optContentIsVisible(&oc)) { + return false; + } + } + + return true; +} + +int Annot::getRotation() const +{ + Page *pageobj = doc->getPage(page); + assert(pageobj != nullptr); + + if (flags & flagNoRotate) { + return (360 - pageobj->getRotate()) % 360; + } else { + return 0; + } +} + +void Annot::draw(Gfx *gfx, bool printing) +{ + annotLocker(); + if (!isVisible(printing)) { + return; + } + + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); +} + +void Annot::setNewAppearance(Object &&newAppearance) +{ + if (newAppearance.isNull()) { + return; + } + + annotLocker(); + if (newAppearance.getType() == ObjType::objStream) { + invalidateAppearance(); + appearance = std::move(newAppearance); + + Ref updatedAppearanceStream = doc->getXRef()->addIndirectObject(appearance); + + Object obj1 = Object(new Dict(doc->getXRef())); + obj1.dictAdd("N", Object(updatedAppearanceStream)); + update("AP", std::move(obj1)); + update("AS", Object(objName, "N")); + + Object updatedAP = annotObj.dictLookup("AP"); + appearStreams = std::make_unique(doc, &updatedAP); + } else { + appearStreams = std::make_unique(doc, &newAppearance); + update("AP", std::move(newAppearance)); + + if (appearStreams) { + appearance = appearStreams->getAppearanceStream(AnnotAppearance::appearNormal, appearState->c_str()); + } + } +} + +Object Annot::getAppearance() const +{ + return appearance.fetch(doc->getXRef()); +} + +//------------------------------------------------------------------------ +// AnnotPopup +//------------------------------------------------------------------------ + +AnnotPopup::AnnotPopup(PDFDoc *docA, PDFRectangle *rectA) : Annot(docA, rectA) +{ + type = typePopup; + + annotObj.dictSet("Subtype", Object(objName, "Popup")); + initialize(docA, annotObj.getDict()); +} + +AnnotPopup::AnnotPopup(PDFDoc *docA, Object &&dictObject, const Object *obj) : Annot(docA, std::move(dictObject), obj) +{ + type = typePopup; + initialize(docA, annotObj.getDict()); +} + +AnnotPopup::~AnnotPopup() { } + +void AnnotPopup::initialize(PDFDoc *docA, Dict *dict) +{ + const Object &parentObj = dict->lookupNF("Parent"); + if (parentObj.isRef()) { + parentRef = parentObj.getRef(); + } else { + parentRef = Ref::INVALID(); + } + + open = dict->lookup("Open").getBoolWithDefaultValue(false); +} + +void AnnotPopup::setParent(Annot *parentA) +{ + parentRef = parentA->getRef(); + update("Parent", Object(parentRef)); +} + +void AnnotPopup::setOpen(bool openA) +{ + open = openA; + update("Open", Object(open)); +} + +//------------------------------------------------------------------------ +// AnnotMarkup +//------------------------------------------------------------------------ +AnnotMarkup::AnnotMarkup(PDFDoc *docA, PDFRectangle *rectA) : Annot(docA, rectA) +{ + initialize(docA, annotObj.getDict()); +} + +AnnotMarkup::AnnotMarkup(PDFDoc *docA, Object &&dictObject, const Object *obj) : Annot(docA, std::move(dictObject), obj) +{ + initialize(docA, annotObj.getDict()); +} + +AnnotMarkup::~AnnotMarkup() = default; + +void AnnotMarkup::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + obj1 = dict->lookup("T"); + if (obj1.isString()) { + label.reset(obj1.getString()->copy()); + } + + Object popupObj = dict->lookup("Popup"); + const Object &obj2 = dict->lookupNF("Popup"); + if (popupObj.isDict() && obj2.isRef()) { + popup = std::make_unique(docA, std::move(popupObj), &obj2); + } + + opacity = dict->lookup("CA").getNumWithDefaultValue(1.0); + + obj1 = dict->lookup("CreationDate"); + if (obj1.isString()) { + date.reset(obj1.getString()->copy()); + } + + const Object &irtObj = dict->lookupNF("IRT"); + if (irtObj.isRef()) { + inReplyTo = irtObj.getRef(); + } else { + inReplyTo = Ref::INVALID(); + } + + obj1 = dict->lookup("Subj"); + if (obj1.isString()) { + subject.reset(obj1.getString()->copy()); + } + + obj1 = dict->lookup("RT"); + if (obj1.isName()) { + const char *replyName = obj1.getName(); + + if (!strcmp(replyName, "R")) { + replyTo = replyTypeR; + } else if (!strcmp(replyName, "Group")) { + replyTo = replyTypeGroup; + } else { + replyTo = replyTypeR; + } + } else { + replyTo = replyTypeR; + } + + obj1 = dict->lookup("ExData"); + if (obj1.isDict()) { + exData = parseAnnotExternalData(obj1.getDict()); + } else { + exData = annotExternalDataMarkupUnknown; + } +} + +void AnnotMarkup::setLabel(std::unique_ptr &&new_label) +{ + if (new_label) { + label = std::move(new_label); + // append the unicode marker if needed + if (!hasUnicodeByteOrderMark(label->toStr())) { + prependUnicodeByteOrderMark(label->toNonConstStr()); + } + } else { + label = std::make_unique(); + } + + update("T", Object(label->copy())); +} + +void AnnotMarkup::setPopup(std::unique_ptr &&new_popup) +{ + // If there exists an old popup annotation that is already + // associated with a page, then we need to remove that + // popup annotation from the page. Otherwise we would have + // dangling references to it. + if (popup && popup->getPageNum() != 0) { + Page *pageobj = doc->getPage(popup->getPageNum()); + if (pageobj) { + pageobj->removeAnnot(popup.get()); + } + } + + if (new_popup) { + const Ref popupRef = new_popup->getRef(); + update("Popup", Object(popupRef)); + + new_popup->setParent(this); + popup = std::move(new_popup); + + // If this annotation is already added to a page, then we + // add the new popup annotation to the same page. + if (page != 0) { + Page *pageobj = doc->getPage(page); + assert(pageobj != nullptr); // pageobj should exist in doc (see setPage()) + + pageobj->addAnnot(popup.get()); + } + } else { + popup = nullptr; + } +} + +void AnnotMarkup::setOpacity(double opacityA) +{ + opacity = opacityA; + update("CA", Object(opacity)); + invalidateAppearance(); +} + +void AnnotMarkup::setDate(GooString *new_date) +{ + if (new_date) { + date = std::make_unique(new_date); + update("CreationDate", Object(date->copy())); + } else { + date.reset(nullptr); + update("CreationDate", Object(objNull)); + } +} + +void AnnotMarkup::removeReferencedObjects() +{ + Page *pageobj = doc->getPage(page); + assert(pageobj != nullptr); // We're called when removing an annot from a page + + // Remove popup + if (popup) { + pageobj->removeAnnot(popup.get()); + } + + Annot::removeReferencedObjects(); +} + +//------------------------------------------------------------------------ +// AnnotText +//------------------------------------------------------------------------ + +AnnotText::AnnotText(PDFDoc *docA, PDFRectangle *rectA) : AnnotMarkup(docA, rectA) +{ + type = typeText; + flags |= flagNoZoom | flagNoRotate; + + annotObj.dictSet("Subtype", Object(objName, "Text")); + initialize(docA, annotObj.getDict()); +} + +AnnotText::AnnotText(PDFDoc *docA, Object &&dictObject, const Object *obj) : AnnotMarkup(docA, std::move(dictObject), obj) +{ + + type = typeText; + flags |= flagNoZoom | flagNoRotate; + initialize(docA, annotObj.getDict()); +} + +AnnotText::~AnnotText() = default; + +void AnnotText::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + open = dict->lookup("Open").getBoolWithDefaultValue(false); + + obj1 = dict->lookup("Name"); + if (obj1.isName()) { + icon = std::make_unique(obj1.getName()); + } else { + icon = std::make_unique("Note"); + } + + obj1 = dict->lookup("StateModel"); + if (obj1.isString()) { + const GooString *modelName = obj1.getString(); + + Object obj2 = dict->lookup("State"); + if (obj2.isString()) { + const GooString *stateName = obj2.getString(); + + if (!stateName->cmp("Marked")) { + state = stateMarked; + } else if (!stateName->cmp("Unmarked")) { + state = stateUnmarked; + } else if (!stateName->cmp("Accepted")) { + state = stateAccepted; + } else if (!stateName->cmp("Rejected")) { + state = stateRejected; + } else if (!stateName->cmp("Cancelled")) { + state = stateCancelled; + } else if (!stateName->cmp("Completed")) { + state = stateCompleted; + } else if (!stateName->cmp("None")) { + state = stateNone; + } else { + state = stateUnknown; + } + } else { + state = stateUnknown; + } + + if (!modelName->cmp("Marked")) { + switch (state) { + case stateUnknown: + state = stateMarked; + break; + case stateAccepted: + case stateRejected: + case stateCancelled: + case stateCompleted: + case stateNone: + state = stateUnknown; + break; + default: + break; + } + } else if (!modelName->cmp("Review")) { + switch (state) { + case stateUnknown: + state = stateNone; + break; + case stateMarked: + case stateUnmarked: + state = stateUnknown; + break; + default: + break; + } + } else { + state = stateUnknown; + } + } else { + state = stateUnknown; + } +} + +void AnnotText::setOpen(bool openA) +{ + open = openA; + update("Open", Object(open)); +} + +void AnnotText::setIcon(GooString *new_icon) +{ + if (new_icon && icon->cmp(new_icon) == 0) { + return; + } + + if (new_icon) { + icon = std::make_unique(new_icon); + } else { + icon = std::make_unique("Note"); + } + + update("Name", Object(objName, icon->c_str())); + invalidateAppearance(); +} + +#define ANNOT_TEXT_AP_NOTE \ + "3.602 24 m 20.398 24 l 22.387 24 24 22.387 24 20.398 c 24 3.602 l 24\n" \ + "1.613 22.387 0 20.398 0 c 3.602 0 l 1.613 0 0 1.613 0 3.602 c 0 20.398\n" \ + "l 0 22.387 1.613 24 3.602 24 c h\n" \ + "3.602 24 m f\n" \ + "0.533333 0.541176 0.521569 RG 2 w\n" \ + "1 J\n" \ + "1 j\n" \ + "[] 0.0 d\n" \ + "4 M 9 18 m 4 18 l 4 7 4 4 6 3 c 20 3 l 18 4 18 7 18 18 c 17 18 l S\n" \ + "1.5 w\n" \ + "0 j\n" \ + "10 16 m 14 21 l S\n" \ + "1.85625 w\n" \ + "1 j\n" \ + "15.07 20.523 m 15.07 19.672 14.379 18.977 13.523 18.977 c 12.672 18.977\n" \ + "11.977 19.672 11.977 20.523 c 11.977 21.379 12.672 22.07 13.523 22.07 c\n" \ + "14.379 22.07 15.07 21.379 15.07 20.523 c h\n" \ + "15.07 20.523 m S\n" \ + "1 w\n" \ + "0 j\n" \ + "6.5 13.5 m 15.5 13.5 l S\n" \ + "6.5 10.5 m 13.5 10.5 l S\n" \ + "6.801 7.5 m 15.5 7.5 l S\n" \ + "0.729412 0.741176 0.713725 RG 2 w\n" \ + "1 j\n" \ + "9 19 m 4 19 l 4 8 4 5 6 4 c 20 4 l 18 5 18 8 18 19 c 17 19 l S\n" \ + "1.5 w\n" \ + "0 j\n" \ + "10 17 m 14 22 l S\n" \ + "1.85625 w\n" \ + "1 j\n" \ + "15.07 21.523 m 15.07 20.672 14.379 19.977 13.523 19.977 c 12.672 19.977\n" \ + "11.977 20.672 11.977 21.523 c 11.977 22.379 12.672 23.07 13.523 23.07 c\n" \ + "14.379 23.07 15.07 22.379 15.07 21.523 c h\n" \ + "15.07 21.523 m S\n" \ + "1 w\n" \ + "0 j\n" \ + "6.5 14.5 m 15.5 14.5 l S\n" \ + "6.5 11.5 m 13.5 11.5 l S\n" \ + "6.801 8.5 m 15.5 8.5 l S\n" + +#define ANNOT_TEXT_AP_COMMENT \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 2 w\n" \ + "0 J\n" \ + "1 j\n" \ + "[] 0.0 d\n" \ + "4 M 8 20 m 16 20 l 18.363 20 20 18.215 20 16 c 20 13 l 20 10.785 18.363 9\n" \ + "16 9 c 13 9 l 8 3 l 8 9 l 8 9 l 5.637 9 4 10.785 4 13 c 4 16 l 4 18.215\n" \ + "5.637 20 8 20 c h\n" \ + "8 20 m S\n" \ + "0.729412 0.741176 0.713725 RG 8 21 m 16 21 l 18.363 21 20 19.215 20 17\n" \ + "c 20 14 l 20 11.785 18.363 10\n" \ + "16 10 c 13 10 l 8 4 l 8 10 l 8 10 l 5.637 10 4 11.785 4 14 c 4 17 l 4\n" \ + "19.215 5.637 21 8 21 c h\n" \ + "8 21 m S\n" + +#define ANNOT_TEXT_AP_KEY \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 2 w\n" \ + "1 J\n" \ + "0 j\n" \ + "[] 0.0 d\n" \ + "4 M 11.895 18.754 m 13.926 20.625 17.09 20.496 18.961 18.465 c 20.832\n" \ + "16.434 20.699 13.27 18.668 11.398 c 17.164 10.016 15.043 9.746 13.281\n" \ + "10.516 c 12.473 9.324 l 11.281 10.078 l 9.547 8.664 l 9.008 6.496 l\n" \ + "7.059 6.059 l 6.34 4.121 l 5.543 3.668 l 3.375 4.207 l 2.938 6.156 l\n" \ + "10.57 13.457 l 9.949 15.277 10.391 17.367 11.895 18.754 c h\n" \ + "11.895 18.754 m S\n" \ + "1.5 w\n" \ + "16.059 15.586 m 16.523 15.078 17.316 15.043 17.824 15.512 c 18.332\n" \ + "15.98 18.363 16.77 17.895 17.277 c 17.43 17.785 16.637 17.816 16.129\n" \ + "17.352 c 15.621 16.883 15.59 16.094 16.059 15.586 c h\n" \ + "16.059 15.586 m S\n" \ + "0.729412 0.741176 0.713725 RG 2 w\n" \ + "11.895 19.754 m 13.926 21.625 17.09 21.496 18.961 19.465 c 20.832\n" \ + "17.434 20.699 14.27 18.668 12.398 c 17.164 11.016 15.043 10.746 13.281\n" \ + "11.516 c 12.473 10.324 l 11.281 11.078 l 9.547 9.664 l 9.008 7.496 l\n" \ + "7.059 7.059 l 6.34 5.121 l 5.543 4.668 l 3.375 5.207 l 2.938 7.156 l\n" \ + "10.57 14.457 l 9.949 16.277 10.391 18.367 11.895 19.754 c h\n" \ + "11.895 19.754 m S\n" \ + "1.5 w\n" \ + "16.059 16.586 m 16.523 16.078 17.316 16.043 17.824 16.512 c 18.332\n" \ + "16.98 18.363 17.77 17.895 18.277 c 17.43 18.785 16.637 18.816 16.129\n" \ + "18.352 c 15.621 17.883 15.59 17.094 16.059 16.586 c h\n" \ + "16.059 16.586 m S\n" + +#define ANNOT_TEXT_AP_HELP \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 2.5 w\n" \ + "1 J\n" \ + "1 j\n" \ + "[] 0.0 d\n" \ + "4 M 8.289 16.488 m 8.824 17.828 10.043 18.773 11.473 18.965 c 12.902 19.156\n" \ + "14.328 18.559 15.195 17.406 c 16.062 16.254 16.242 14.723 15.664 13.398\n" \ + "c S\n" \ + "0 j\n" \ + "12 8 m 12 12 16 11 16 15 c S\n" \ + "1.539286 w\n" \ + "1 j\n" \ + "q 1 0 0 -0.999991 0 24 cm\n" \ + "12.684 20.891 m 12.473 21.258 12.004 21.395 11.629 21.196 c 11.254\n" \ + "20.992 11.105 20.531 11.297 20.149 c 11.488 19.77 11.945 19.61 12.332\n" \ + "19.789 c 12.719 19.969 12.891 20.426 12.719 20.817 c S Q\n" \ + "0.729412 0.741176 0.713725 RG 2.5 w\n" \ + "8.289 17.488 m 9.109 19.539 11.438 20.535 13.488 19.711 c 15.539 18.891\n" \ + "16.535 16.562 15.711 14.512 c 15.699 14.473 15.684 14.438 15.664 14.398\n" \ + "c S\n" \ + "0 j\n" \ + "12 9 m 12 13 16 12 16 16 c S\n" \ + "1.539286 w\n" \ + "1 j\n" \ + "q 1 0 0 -0.999991 0 24 cm\n" \ + "12.684 19.891 m 12.473 20.258 12.004 20.395 11.629 20.195 c 11.254\n" \ + "19.992 11.105 19.531 11.297 19.149 c 11.488 18.77 11.945 18.61 12.332\n" \ + "18.789 c 12.719 18.969 12.891 19.426 12.719 19.817 c S Q\n" + +#define ANNOT_TEXT_AP_NEW_PARAGRAPH \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 4 w\n" \ + "0 J\n" \ + "2 j\n" \ + "[] 0.0 d\n" \ + "4 M q 1 0 0 -1 0 24 cm\n" \ + "9.211 11.988 m 8.449 12.07 7.711 11.707 7.305 11.059 c 6.898 10.41\n" \ + "6.898 9.59 7.305 8.941 c 7.711 8.293 8.449 7.93 9.211 8.012 c S Q\n" \ + "1.004413 w\n" \ + "1 J\n" \ + "1 j\n" \ + "q 1 0 0 -0.991232 0 24 cm\n" \ + "18.07 11.511 m 15.113 10.014 l 12.199 11.602 l 12.711 8.323 l 10.301\n" \ + "6.045 l 13.574 5.517 l 14.996 2.522 l 16.512 5.474 l 19.801 5.899 l\n" \ + "17.461 8.252 l 18.07 11.511 l h\n" \ + "18.07 11.511 m S Q\n" \ + "2 w\n" \ + "0 j\n" \ + "11 17 m 10 17 l 10 3 l S\n" \ + "14 3 m 14 13 l S\n" \ + "0.729412 0.741176 0.713725 RG 4 w\n" \ + "0 J\n" \ + "2 j\n" \ + "q 1 0 0 -1 0 24 cm\n" \ + "9.211 10.988 m 8.109 11.105 7.125 10.309 7.012 9.211 c 6.895 8.109\n" \ + "7.691 7.125 8.789 7.012 c 8.93 6.996 9.07 6.996 9.211 7.012 c S Q\n" \ + "1.004413 w\n" \ + "1 J\n" \ + "1 j\n" \ + "q 1 0 0 -0.991232 0 24 cm\n" \ + "18.07 10.502 m 15.113 9.005 l 12.199 10.593 l 12.711 7.314 l 10.301\n" \ + "5.036 l 13.574 4.508 l 14.996 1.513 l 16.512 4.465 l 19.801 4.891 l\n" \ + "17.461 7.243 l 18.07 10.502 l h\n" \ + "18.07 10.502 m S Q\n" \ + "2 w\n" \ + "0 j\n" \ + "11 18 m 10 18 l 10 4 l S\n" \ + "14 4 m 14 14 l S\n" + +#define ANNOT_TEXT_AP_PARAGRAPH \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 2 w\n" \ + "1 J\n" \ + "1 j\n" \ + "[] 0.0 d\n" \ + "4 M 15 3 m 15 18 l 11 18 l 11 3 l S\n" \ + "4 w\n" \ + "q 1 0 0 -1 0 24 cm\n" \ + "9.777 10.988 m 8.746 10.871 7.973 9.988 8 8.949 c 8.027 7.91 8.844\n" \ + "7.066 9.879 7.004 c S Q\n" \ + "0.729412 0.741176 0.713725 RG 2 w\n" \ + "15 4 m 15 19 l 11 19 l 11 4 l S\n" \ + "4 w\n" \ + "q 1 0 0 -1 0 24 cm\n" \ + "9.777 9.988 m 8.746 9.871 7.973 8.988 8 7.949 c 8.027 6.91 8.844 6.066\n" \ + "9.879 6.004 c S Q\n" + +#define ANNOT_TEXT_AP_INSERT \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 2 w\n" \ + "1 J\n" \ + "0 j\n" \ + "[] 0.0 d\n" \ + "4 M 12 18.012 m 20 18 l S\n" \ + "9 10 m 17 10 l S\n" \ + "12 14.012 m 20 14 l S\n" \ + "12 6.012 m 20 6.012 l S\n" \ + "4 12 m 6 10 l 4 8 l S\n" \ + "4 12 m 4 8 l S\n" \ + "0.729412 0.741176 0.713725 RG 12 19.012 m 20 19 l S\n" \ + "9 11 m 17 11 l S\n" \ + "12 15.012 m 20 15 l S\n" \ + "12 7.012 m 20 7.012 l S\n" \ + "4 13 m 6 11 l 4 9 l S\n" \ + "4 13 m 4 9 l S\n" + +#define ANNOT_TEXT_AP_CROSS \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 2.5 w\n" \ + "1 J\n" \ + "0 j\n" \ + "[] 0.0 d\n" \ + "4 M 18 5 m 6 17 l S\n" \ + "6 5 m 18 17 l S\n" \ + "0.729412 0.741176 0.713725 RG 18 6 m 6 18 l S\n" \ + "6 6 m 18 18 l S\n" + +#define ANNOT_TEXT_AP_CIRCLE \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 2.5 w\n" \ + "1 J\n" \ + "1 j\n" \ + "[] 0.0 d\n" \ + "4 M 19.5 11.5 m 19.5 7.359 16.141 4 12 4 c 7.859 4 4.5 7.359 4.5 11.5 c 4.5\n" \ + "15.641 7.859 19 12 19 c 16.141 19 19.5 15.641 19.5 11.5 c h\n" \ + "19.5 11.5 m S\n" \ + "0.729412 0.741176 0.713725 RG 19.5 12.5 m 19.5 8.359 16.141 5 12 5 c\n" \ + "7.859 5 4.5 8.359 4.5 12.5 c 4.5\n" \ + "16.641 7.859 20 12 20 c 16.141 20 19.5 16.641 19.5 12.5 c h\n" \ + "19.5 12.5 m S\n" + +void AnnotText::draw(Gfx *gfx, bool printing) +{ + double ca = 1; + + if (!isVisible(printing)) { + return; + } + + annotLocker(); + if (appearance.isNull()) { + ca = opacity; + + AnnotAppearanceBuilder appearBuilder; + + appearBuilder.append("q\n"); + if (color) { + appearBuilder.setDrawColor(color.get(), true); + } else { + appearBuilder.append("1 1 1 rg\n"); + } + if (!icon->cmp("Note")) { + appearBuilder.append(ANNOT_TEXT_AP_NOTE); + } else if (!icon->cmp("Comment")) { + appearBuilder.append(ANNOT_TEXT_AP_COMMENT); + } else if (!icon->cmp("Key")) { + appearBuilder.append(ANNOT_TEXT_AP_KEY); + } else if (!icon->cmp("Help")) { + appearBuilder.append(ANNOT_TEXT_AP_HELP); + } else if (!icon->cmp("NewParagraph")) { + appearBuilder.append(ANNOT_TEXT_AP_NEW_PARAGRAPH); + } else if (!icon->cmp("Paragraph")) { + appearBuilder.append(ANNOT_TEXT_AP_PARAGRAPH); + } else if (!icon->cmp("Insert")) { + appearBuilder.append(ANNOT_TEXT_AP_INSERT); + } else if (!icon->cmp("Cross")) { + appearBuilder.append(ANNOT_TEXT_AP_CROSS); + } else if (!icon->cmp("Circle")) { + appearBuilder.append(ANNOT_TEXT_AP_CIRCLE); + } + appearBuilder.append("Q\n"); + + // Force 24x24 rectangle + PDFRectangle fixedRect(rect->x1, rect->y2 - 24, rect->x1 + 24, rect->y2); + appearBBox = std::make_unique(&fixedRect); + double bbox[4]; + appearBBox->getBBoxRect(bbox); + if (ca == 1) { + appearance = createForm(appearBuilder.buffer(), bbox, false, nullptr); + } else { + Object aStream = createForm(appearBuilder.buffer(), bbox, true, nullptr); + + GooString appearBuf("/GS0 gs\n/Fm0 Do"); + Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr); + appearance = createForm(&appearBuf, bbox, false, resDict); + } + } + + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + if (appearBBox) { + gfx->drawAnnot(&obj, nullptr, color.get(), appearBBox->getPageXMin(), appearBBox->getPageYMin(), appearBBox->getPageXMax(), appearBBox->getPageYMax(), getRotation()); + } else { + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); + } +} + +//------------------------------------------------------------------------ +// AnnotLink +//------------------------------------------------------------------------ +AnnotLink::AnnotLink(PDFDoc *docA, PDFRectangle *rectA) : Annot(docA, rectA) +{ + type = typeLink; + annotObj.dictSet("Subtype", Object(objName, "Link")); + initialize(docA, annotObj.getDict()); +} + +AnnotLink::AnnotLink(PDFDoc *docA, Object &&dictObject, const Object *obj) : Annot(docA, std::move(dictObject), obj) +{ + + type = typeLink; + initialize(docA, annotObj.getDict()); +} + +AnnotLink::~AnnotLink() = default; + +void AnnotLink::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + // look for destination + obj1 = dict->lookup("Dest"); + if (!obj1.isNull()) { + action = LinkAction::parseDest(&obj1); + // look for action + } else { + obj1 = dict->lookup("A"); + if (obj1.isDict()) { + action = LinkAction::parseAction(&obj1, doc->getCatalog()->getBaseURI()); + } + } + + obj1 = dict->lookup("H"); + if (obj1.isName()) { + const char *effect = obj1.getName(); + + if (!strcmp(effect, "N")) { + linkEffect = effectNone; + } else if (!strcmp(effect, "I")) { + linkEffect = effectInvert; + } else if (!strcmp(effect, "O")) { + linkEffect = effectOutline; + } else if (!strcmp(effect, "P")) { + linkEffect = effectPush; + } else { + linkEffect = effectInvert; + } + } else { + linkEffect = effectInvert; + } + /* + obj1 = dict->lookup("PA"); + if (obj1.isDict()) { + uriAction = NULL; + } else { + uriAction = NULL; + } + obj1.free(); + */ + obj1 = dict->lookup("QuadPoints"); + if (obj1.isArray()) { + quadrilaterals = std::make_unique(obj1.getArray(), rect.get()); + } + + obj1 = dict->lookup("BS"); + if (obj1.isDict()) { + border = std::make_unique(obj1.getDict()); + } else if (!border) { + border = std::make_unique(); + } +} + +void AnnotLink::draw(Gfx *gfx, bool printing) +{ + if (!isVisible(printing)) { + return; + } + + annotLocker(); + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + gfx->drawAnnot(&obj, border.get(), color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); +} + +//------------------------------------------------------------------------ +// AnnotFreeText +//------------------------------------------------------------------------ +const double AnnotFreeText::undefinedFontPtSize = 10.; + +AnnotFreeText::AnnotFreeText(PDFDoc *docA, PDFRectangle *rectA) : AnnotMarkup(docA, rectA) +{ + type = typeFreeText; + + annotObj.dictSet("Subtype", Object(objName, "FreeText")); + annotObj.dictSet("DA", Object(new GooString())); + + initialize(docA, annotObj.getDict()); +} + +AnnotFreeText::AnnotFreeText(PDFDoc *docA, Object &&dictObject, const Object *obj) : AnnotMarkup(docA, std::move(dictObject), obj) +{ + type = typeFreeText; + initialize(docA, annotObj.getDict()); +} + +AnnotFreeText::~AnnotFreeText() = default; + +void AnnotFreeText::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + obj1 = dict->lookup("DA"); + if (obj1.isString()) { + appearanceString.reset(obj1.getString()->copy()); + } else { + appearanceString = std::make_unique(); + error(errSyntaxWarning, -1, "Bad appearance for annotation"); + } + + obj1 = dict->lookup("Q"); + if (obj1.isInt()) { + quadding = (VariableTextQuadding)obj1.getInt(); + } else { + quadding = VariableTextQuadding::leftJustified; + } + + obj1 = dict->lookup("DS"); + if (obj1.isString()) { + styleString.reset(obj1.getString()->copy()); + } + + obj1 = dict->lookup("CL"); + if (obj1.isArray() && obj1.arrayGetLength() >= 4) { + const double x1 = obj1.arrayGet(0).getNumWithDefaultValue(0); + const double y1 = obj1.arrayGet(1).getNumWithDefaultValue(0); + const double x2 = obj1.arrayGet(2).getNumWithDefaultValue(0); + const double y2 = obj1.arrayGet(3).getNumWithDefaultValue(0); + + if (obj1.arrayGetLength() == 6) { + const double x3 = obj1.arrayGet(4).getNumWithDefaultValue(0); + const double y3 = obj1.arrayGet(5).getNumWithDefaultValue(0); + calloutLine = std::make_unique(x1, y1, x2, y2, x3, y3); + } else { + calloutLine = std::make_unique(x1, y1, x2, y2); + } + } + + obj1 = dict->lookup("IT"); + if (obj1.isName()) { + const char *intentName = obj1.getName(); + + if (!strcmp(intentName, "FreeText")) { + intent = intentFreeText; + } else if (!strcmp(intentName, "FreeTextCallout")) { + intent = intentFreeTextCallout; + } else if (!strcmp(intentName, "FreeTextTypeWriter")) { + intent = intentFreeTextTypeWriter; + } else { + intent = intentFreeText; + } + } else { + intent = intentFreeText; + } + + obj1 = dict->lookup("BS"); + if (obj1.isDict()) { + border = std::make_unique(obj1.getDict()); + } else if (!border) { + border = std::make_unique(); + } + + obj1 = dict->lookup("BE"); + if (obj1.isDict()) { + borderEffect = std::make_unique(obj1.getDict()); + } + + obj1 = dict->lookup("RD"); + if (obj1.isArray()) { + rectangle = parseDiffRectangle(obj1.getArray(), rect.get()); + } + + obj1 = dict->lookup("LE"); + if (obj1.isName()) { + GooString styleName(obj1.getName()); + endStyle = parseAnnotLineEndingStyle(&styleName); + } else { + endStyle = annotLineEndingNone; + } +} + +void AnnotFreeText::setContents(std::unique_ptr &&new_content) +{ + Annot::setContents(std::move(new_content)); + invalidateAppearance(); +} + +void AnnotFreeText::setDefaultAppearance(const DefaultAppearance &da) +{ + appearanceString = std::make_unique(da.toAppearanceString()); + + update("DA", Object(appearanceString->copy())); + invalidateAppearance(); +} + +void AnnotFreeText::setQuadding(VariableTextQuadding new_quadding) +{ + quadding = new_quadding; + update("Q", Object((int)quadding)); + invalidateAppearance(); +} + +void AnnotFreeText::setStyleString(GooString *new_string) +{ + if (new_string) { + styleString = std::make_unique(new_string); + // append the unicode marker if needed + if (!hasUnicodeByteOrderMark(styleString->toStr())) { + prependUnicodeByteOrderMark(styleString->toNonConstStr()); + } + } else { + styleString = std::make_unique(); + } + + update("DS", Object(styleString->copy())); +} + +void AnnotFreeText::setCalloutLine(AnnotCalloutLine *line) +{ + Object obj1; + if (line == nullptr) { + obj1.setToNull(); + calloutLine = nullptr; + } else { + double x1 = line->getX1(), y1 = line->getY1(); + double x2 = line->getX2(), y2 = line->getY2(); + obj1 = Object(new Array(doc->getXRef())); + obj1.arrayAdd(Object(x1)); + obj1.arrayAdd(Object(y1)); + obj1.arrayAdd(Object(x2)); + obj1.arrayAdd(Object(y2)); + + AnnotCalloutMultiLine *mline = dynamic_cast(line); + if (mline) { + double x3 = mline->getX3(), y3 = mline->getY3(); + obj1.arrayAdd(Object(x3)); + obj1.arrayAdd(Object(y3)); + calloutLine = std::make_unique(x1, y1, x2, y2, x3, y3); + } else { + calloutLine = std::make_unique(x1, y1, x2, y2); + } + } + + update("CL", std::move(obj1)); + invalidateAppearance(); +} + +void AnnotFreeText::setIntent(AnnotFreeTextIntent new_intent) +{ + const char *intentName; + + intent = new_intent; + if (new_intent == intentFreeText) { + intentName = "FreeText"; + } else if (new_intent == intentFreeTextCallout) { + intentName = "FreeTextCallout"; + } else { // intentFreeTextTypeWriter + intentName = "FreeTextTypeWriter"; + } + update("IT", Object(objName, intentName)); +} + +std::unique_ptr AnnotFreeText::getDefaultAppearance() const +{ + return std::make_unique(appearanceString.get()); +} + +static std::unique_ptr createAnnotDrawFont(XRef *xref, Dict *fontParentDict, const char *resourceName = "AnnotDrawFont", const char *fontname = "Helvetica") +{ + const Ref dummyRef = { -1, -1 }; + + Dict *fontDict = new Dict(xref); + fontDict->add("BaseFont", Object(objName, fontname)); + fontDict->add("Subtype", Object(objName, "Type1")); + if (strcmp(fontname, "ZapfDingbats") && strcmp(fontname, "Symbol")) { + fontDict->add("Encoding", Object(objName, "WinAnsiEncoding")); + } + + Object fontsDictObj = fontParentDict->lookup("Font"); + if (!fontsDictObj.isDict()) { + fontsDictObj = Object(new Dict(xref)); + fontParentDict->add("Font", fontsDictObj.copy()); // This is not a copy it's a ref + } + + fontsDictObj.dictSet(resourceName, Object(fontDict)); + + return GfxFont::makeFont(xref, resourceName, dummyRef, fontDict); +} + +class HorizontalTextLayouter +{ +public: + HorizontalTextLayouter() = default; + + HorizontalTextLayouter(const GooString *text, const Form *form, const GfxFont *font, std::optional availableWidth, const bool noReencode) + { + int i = 0; + double blockWidth; + bool newFontNeeded = false; + GooString outputText; + const bool isUnicode = hasUnicodeByteOrderMark(text->toStr()); + int charCount; + + Annot::layoutText(text, &outputText, &i, *font, &blockWidth, availableWidth ? *availableWidth : 0.0, &charCount, noReencode, !noReencode ? &newFontNeeded : nullptr); + data.emplace_back(outputText.toStr(), std::string(), blockWidth, charCount); + if (availableWidth) { + *availableWidth -= blockWidth; + } + + while (newFontNeeded && (!availableWidth || *availableWidth > 0 || (isUnicode && i == 2) || (!isUnicode && i == 0))) { + if (!form) { + // There's no fonts to look for, so just skip the characters + i += isUnicode ? 2 : 1; + error(errSyntaxError, -1, "HorizontalTextLayouter, found character that the font can't represent"); + newFontNeeded = false; + } else { + Unicode uChar; + if (isUnicode) { + uChar = (unsigned char)(text->getChar(i)) << 8; + uChar += (unsigned char)(text->getChar(i + 1)); + } else { + uChar = pdfDocEncoding[text->getChar(i) & 0xff]; + } + const std::string auxFontName = form->getFallbackFontForChar(uChar, *font); + if (!auxFontName.empty()) { + std::shared_ptr auxFont = form->getDefaultResources()->lookupFont(auxFontName.c_str()); + + // Here we just layout one char, we don't know if the one afterwards can be layouted with the original font + GooString auxContents = GooString(text->toStr().substr(i, isUnicode ? 2 : 1)); + if (isUnicode) { + prependUnicodeByteOrderMark(auxContents.toNonConstStr()); + } + int auxI = 0; + Annot::layoutText(&auxContents, &outputText, &auxI, *auxFont, &blockWidth, availableWidth ? *availableWidth : 0.0, &charCount, false, &newFontNeeded); + assert(!newFontNeeded); + if (availableWidth) { + *availableWidth -= blockWidth; + } + // layoutText will always at least layout one character even if it doesn't fit in + // the given space which makes sense (except in the case of switching fonts, so we control if we ran out of space here manually) + // we also need to allow the character if we have not layouted anything yet because otherwise we will end up in an infinite loop + // because it is assumed we at least layout one character + if (!availableWidth || *availableWidth > 0 || (isUnicode && i == 2) || (!isUnicode && i == 0)) { + i += isUnicode ? 2 : 1; + data.emplace_back(outputText.toStr(), auxFontName, blockWidth, charCount); + } + } else { + error(errSyntaxError, -1, "HorizontalTextLayouter, couldn't find a font for character U+{0:04uX}", uChar); + newFontNeeded = false; + i += isUnicode ? 2 : 1; + } + } + // Now layout the rest of the text with the original font + if (!availableWidth || *availableWidth > 0) { + Annot::layoutText(text, &outputText, &i, *font, &blockWidth, availableWidth ? *availableWidth : 0.0, &charCount, false, &newFontNeeded); + if (availableWidth) { + *availableWidth -= blockWidth; + } + // layoutText will always at least layout one character even if it doesn't fit in + // the given space which makes sense (except in the case of switching fonts, so we control if we ran out of space here manually) + if (!availableWidth || *availableWidth > 0) { + data.emplace_back(outputText.toStr(), std::string(), blockWidth, charCount); + } else { + i -= isUnicode ? 2 : 1; + } + } + } + consumedText = i; + } + + HorizontalTextLayouter(const HorizontalTextLayouter &) = delete; + HorizontalTextLayouter &operator=(const HorizontalTextLayouter &) = delete; + + double totalWidth() const + { + double totalWidth = 0; + for (const Data &d : data) { + totalWidth += d.width; + } + return totalWidth; + } + + int totalCharCount() const + { + int total = 0; + for (const Data &d : data) { + total += d.charCount; + } + return total; + } + + struct Data + { + Data(const std::string &t, const std::string &fName, double w, int cc) : text(t), fontName(fName), width(w), charCount(cc) { } + + const std::string text; + const std::string fontName; + const double width; + const int charCount; + }; + + std::vector data; + int consumedText; +}; + +double Annot::calculateFontSize(const Form *form, const GfxFont *font, const GooString *text, double wMax, double hMax, const bool forceZapfDingbats) +{ + const bool isUnicode = hasUnicodeByteOrderMark(text->toStr()); + double fontSize; + + for (fontSize = 20; fontSize > 1; --fontSize) { + const double availableWidthInFontSize = wMax / fontSize; + double y = hMax - 3; + int i = 0; + while (i < text->getLength()) { + GooString lineText(text->toStr().substr(i)); + if (!hasUnicodeByteOrderMark(lineText.toStr()) && isUnicode) { + prependUnicodeByteOrderMark(lineText.toNonConstStr()); + } + const HorizontalTextLayouter textLayouter(&lineText, form, font, availableWidthInFontSize, forceZapfDingbats); + y -= fontSize; + if (i == 0) { + i += textLayouter.consumedText; + } else { + i += textLayouter.consumedText - (isUnicode ? 2 : 0); + } + } + // approximate the descender for the last line + if (y >= 0.33 * fontSize) { + break; + } + } + return fontSize; +} + +struct DrawMultiLineTextResult +{ + std::string text; + int nLines = 0; +}; + +// if fontName is empty it is assumed it is sent from the outside +// so for text that is in font no Tf is added and for text that is in the aux fonts +// a pair of q/Q is added +static DrawMultiLineTextResult drawMultiLineText(const GooString &text, double availableWidth, const Form *form, const GfxFont &font, const std::string &fontName, double fontSize, VariableTextQuadding quadding, double borderWidth) +{ + DrawMultiLineTextResult result; + int i = 0; + double xPosPrev = 0; + const double availableTextWidthInFontPtSize = availableWidth / fontSize; + while (i < text.getLength()) { + GooString lineText(text.toStr().substr(i)); + if (!hasUnicodeByteOrderMark(lineText.toStr()) && hasUnicodeByteOrderMark(text.toStr())) { + prependUnicodeByteOrderMark(lineText.toNonConstStr()); + } + const HorizontalTextLayouter textLayouter(&lineText, form, &font, availableTextWidthInFontPtSize, false); + + const double totalWidth = textLayouter.totalWidth() * fontSize; + + auto calculateX = [quadding, availableWidth, totalWidth, borderWidth] { + switch (quadding) { + case VariableTextQuadding::centered: + return (availableWidth - totalWidth) / 2; + break; + case VariableTextQuadding::rightJustified: + return availableWidth - totalWidth - borderWidth; + break; + default: // VariableTextQuadding::lLeftJustified: + return borderWidth; + break; + } + }; + const double xPos = calculateX(); + + AnnotAppearanceBuilder builder; + bool first = true; + double prevBlockWidth = 0; + for (const HorizontalTextLayouter::Data &d : textLayouter.data) { + const std::string &fName = d.fontName.empty() ? fontName : d.fontName; + if (!fName.empty()) { + if (fontName.empty()) { + builder.append(" q\n"); + } + builder.appendf("/{0:s} {1:.2f} Tf\n", fName.c_str(), fontSize); + } + + const double yDiff = first ? -fontSize : 0; + const double xDiff = first ? xPos - xPosPrev : prevBlockWidth; + + builder.appendf("{0:.2f} {1:.2f} Td\n", xDiff, yDiff); + builder.writeString(d.text); + builder.append(" Tj\n"); + first = false; + prevBlockWidth = d.width * fontSize; + + if (!fName.empty() && fontName.empty()) { + builder.append(" Q\n"); + } + } + xPosPrev = xPos + totalWidth - prevBlockWidth; + + result.text += builder.buffer()->toStr(); + result.nLines += 1; + if (i == 0) { + i += textLayouter.consumedText; + } else { + i += textLayouter.consumedText - (hasUnicodeByteOrderMark(text.toStr()) ? 2 : 0); + } + } + return result; +} + +void AnnotFreeText::generateFreeTextAppearance() +{ + double borderWidth, ca = opacity; + + AnnotAppearanceBuilder appearBuilder; + appearBuilder.append("q\n"); + + borderWidth = border->getWidth(); + if (borderWidth > 0) { + appearBuilder.setLineStyleForBorder(border.get()); + } + + // Box size + const double width = rect->x2 - rect->x1; + const double height = rect->y2 - rect->y1; + + // Parse some properties from the appearance string + DefaultAppearance da { appearanceString.get() }; + + // Default values + if (!da.getFontName().isName()) { + da.setFontName(Object(objName, "AnnotDrawFont")); + } + if (da.getFontPtSize() <= 0) { + da.setFontPtSize(undefinedFontPtSize); + } + if (!da.getFontColor()) { + da.setFontColor(std::make_unique(0, 0, 0)); + } + if (!contents) { + contents = std::make_unique(); + } + + // Draw box + bool doFill = (color && color->getSpace() != AnnotColor::colorTransparent); + bool doStroke = (borderWidth != 0); + if (doFill || doStroke) { + if (doStroke) { + appearBuilder.setDrawColor(da.getFontColor(), false); // Border color: same as font color + } + appearBuilder.appendf("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re\n", borderWidth / 2, width - borderWidth, height - borderWidth); + if (doFill) { + appearBuilder.setDrawColor(color.get(), true); + appearBuilder.append(doStroke ? "B\n" : "f\n"); + } else { + appearBuilder.append("S\n"); + } + } + + // Setup text clipping + const double textmargin = borderWidth * 2; + const double textwidth = width - 2 * textmargin; + appearBuilder.appendf("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re W n\n", textmargin, textwidth, height - 2 * textmargin); + + std::unique_ptr font = nullptr; + + // look for font name in the default resources + Form *form = doc->getCatalog()->getForm(); // form is owned by catalog, no need to clean it up + + Object resourceObj; + if (form && form->getDefaultResourcesObj() && form->getDefaultResourcesObj()->isDict()) { + resourceObj = form->getDefaultResourcesObj()->copy(); // No real copy, but increment refcount of /DR Dict + + Dict *resDict = resourceObj.getDict(); + Object fontResources = resDict->lookup("Font"); // The 'Font' subdictionary + + if (!fontResources.isDict()) { + error(errSyntaxWarning, -1, "Font subdictionary is not a dictionary"); + } else { + // Get the font dictionary for the actual requested font + Ref fontReference; + Object fontDictionary = fontResources.getDict()->lookup(da.getFontName().getName(), &fontReference); + + if (fontDictionary.isDict()) { + font = GfxFont::makeFont(doc->getXRef(), da.getFontName().getName(), fontReference, fontDictionary.getDict()); + } else { + error(errSyntaxWarning, -1, "Font dictionary is not a dictionary"); + } + } + } + + // if fontname is not in the default resources, create a Helvetica fake font + if (!font) { + Dict *fontResDict = new Dict(doc->getXRef()); + resourceObj = Object(fontResDict); + font = createAnnotDrawFont(doc->getXRef(), fontResDict, da.getFontName().getName()); + } + + // Set font state + appearBuilder.setDrawColor(da.getFontColor(), true); + appearBuilder.appendf("BT 1 0 0 1 {0:.2f} {1:.2f} Tm\n", textmargin, height - textmargin); + const DrawMultiLineTextResult textCommands = drawMultiLineText(*contents, textwidth, form, *font, da.getFontName().getName(), da.getFontPtSize(), quadding, 0 /*borderWidth*/); + appearBuilder.append(textCommands.text.c_str()); + appearBuilder.append("ET Q\n"); + + double bbox[4]; + bbox[0] = bbox[1] = 0; + bbox[2] = rect->x2 - rect->x1; + bbox[3] = rect->y2 - rect->y1; + + Object newAppearance; + if (ca == 1) { + newAppearance = createForm(appearBuilder.buffer(), bbox, false, std::move(resourceObj)); + } else { + Object aStream = createForm(appearBuilder.buffer(), bbox, true, std::move(resourceObj)); + + GooString appearBuf("/GS0 gs\n/Fm0 Do"); + Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr); + newAppearance = createForm(&appearBuf, bbox, false, resDict); + } + if (hasBeenUpdated) { + // We should technically do this for all annots but AnnotFreeText + // is particularly special since we're potentially embeddeing a font so we really need + // to set the AP and not let other renderers guess it from the contents + setNewAppearance(std::move(newAppearance)); + } else { + appearance = std::move(newAppearance); + } +} + +void AnnotFreeText::draw(Gfx *gfx, bool printing) +{ + if (!isVisible(printing)) { + return; + } + + annotLocker(); + if (appearance.isNull()) { + generateFreeTextAppearance(); + } + + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); +} + +// Before retrieving the res dict, regenerate the appearance stream if needed, +// because AnnotFreeText::draw needs to store font info in the res dict +Object AnnotFreeText::getAppearanceResDict() +{ + if (appearance.isNull()) { + generateFreeTextAppearance(); + } + return Annot::getAppearanceResDict(); +} + +//------------------------------------------------------------------------ +// AnnotLine +//------------------------------------------------------------------------ + +AnnotLine::AnnotLine(PDFDoc *docA, PDFRectangle *rectA) : AnnotMarkup(docA, rectA) +{ + type = typeLine; + annotObj.dictSet("Subtype", Object(objName, "Line")); + + initialize(docA, annotObj.getDict()); +} + +AnnotLine::AnnotLine(PDFDoc *docA, Object &&dictObject, const Object *obj) : AnnotMarkup(docA, std::move(dictObject), obj) +{ + type = typeLine; + initialize(docA, annotObj.getDict()); +} + +AnnotLine::~AnnotLine() = default; + +void AnnotLine::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + obj1 = dict->lookup("L"); + if (obj1.isArray() && obj1.arrayGetLength() == 4) { + const double x1 = obj1.arrayGet(0).getNumWithDefaultValue(0); + const double y1 = obj1.arrayGet(1).getNumWithDefaultValue(0); + const double x2 = obj1.arrayGet(2).getNumWithDefaultValue(0); + const double y2 = obj1.arrayGet(3).getNumWithDefaultValue(0); + + coord1 = std::make_unique(x1, y1); + coord2 = std::make_unique(x2, y2); + } else { + coord1 = std::make_unique(); + coord2 = std::make_unique(); + } + + obj1 = dict->lookup("LE"); + if (obj1.isArray() && obj1.arrayGetLength() == 2) { + Object obj2; + + obj2 = obj1.arrayGet(0); + if (obj2.isName()) { + GooString leName(obj2.getName()); + startStyle = parseAnnotLineEndingStyle(&leName); + } else { + startStyle = annotLineEndingNone; + } + + obj2 = obj1.arrayGet(1); + if (obj2.isName()) { + GooString leName(obj2.getName()); + endStyle = parseAnnotLineEndingStyle(&leName); + } else { + endStyle = annotLineEndingNone; + } + + } else { + startStyle = endStyle = annotLineEndingNone; + } + + obj1 = dict->lookup("IC"); + if (obj1.isArray()) { + interiorColor = std::make_unique(obj1.getArray()); + } + + leaderLineLength = dict->lookup("LL").getNumWithDefaultValue(0); + + leaderLineExtension = dict->lookup("LLE").getNumWithDefaultValue(0); + if (leaderLineExtension < 0) { + leaderLineExtension = 0; + } + + caption = dict->lookup("Cap").getBoolWithDefaultValue(false); + + obj1 = dict->lookup("IT"); + if (obj1.isName()) { + const char *intentName = obj1.getName(); + + if (!strcmp(intentName, "LineArrow")) { + intent = intentLineArrow; + } else if (!strcmp(intentName, "LineDimension")) { + intent = intentLineDimension; + } else { + intent = intentLineArrow; + } + } else { + intent = intentLineArrow; + } + + leaderLineOffset = dict->lookup("LLO").getNumWithDefaultValue(0); + if (leaderLineOffset < 0) { + leaderLineOffset = 0; + } + + obj1 = dict->lookup("CP"); + if (obj1.isName()) { + const char *captionName = obj1.getName(); + + if (!strcmp(captionName, "Inline")) { + captionPos = captionPosInline; + } else if (!strcmp(captionName, "Top")) { + captionPos = captionPosTop; + } else { + captionPos = captionPosInline; + } + } else { + captionPos = captionPosInline; + } + + obj1 = dict->lookup("Measure"); + if (obj1.isDict()) { + measure = nullptr; + } else { + measure = nullptr; + } + + obj1 = dict->lookup("CO"); + if (obj1.isArray() && (obj1.arrayGetLength() == 2)) { + captionTextHorizontal = obj1.arrayGet(0).getNumWithDefaultValue(0); + captionTextVertical = obj1.arrayGet(1).getNumWithDefaultValue(0); + } else { + captionTextHorizontal = captionTextVertical = 0; + } + + obj1 = dict->lookup("BS"); + if (obj1.isDict()) { + border = std::make_unique(obj1.getDict()); + } else if (!border) { + border = std::make_unique(); + } +} + +void AnnotLine::setContents(std::unique_ptr &&new_content) +{ + Annot::setContents(std::move(new_content)); + if (caption) { + invalidateAppearance(); + } +} + +void AnnotLine::setVertices(double x1, double y1, double x2, double y2) +{ + coord1 = std::make_unique(x1, y1); + coord2 = std::make_unique(x2, y2); + + Array *lArray = new Array(doc->getXRef()); + lArray->add(Object(x1)); + lArray->add(Object(y1)); + lArray->add(Object(x2)); + lArray->add(Object(y2)); + + update("L", Object(lArray)); + invalidateAppearance(); +} + +void AnnotLine::setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyle end) +{ + startStyle = start; + endStyle = end; + + Array *leArray = new Array(doc->getXRef()); + leArray->add(Object(objName, convertAnnotLineEndingStyle(startStyle))); + leArray->add(Object(objName, convertAnnotLineEndingStyle(endStyle))); + + update("LE", Object(leArray)); + invalidateAppearance(); +} + +void AnnotLine::setInteriorColor(std::unique_ptr &&new_color) +{ + if (new_color) { + Object obj1 = new_color->writeToObject(doc->getXRef()); + update("IC", std::move(obj1)); + interiorColor = std::move(new_color); + } else { + interiorColor = nullptr; + } + invalidateAppearance(); +} + +void AnnotLine::setLeaderLineLength(double len) +{ + leaderLineLength = len; + update("LL", Object(len)); + invalidateAppearance(); +} + +void AnnotLine::setLeaderLineExtension(double len) +{ + leaderLineExtension = len; + update("LLE", Object(len)); + + // LL is required if LLE is present + update("LL", Object(leaderLineLength)); + invalidateAppearance(); +} + +void AnnotLine::setCaption(bool new_cap) +{ + caption = new_cap; + update("Cap", Object(new_cap)); + invalidateAppearance(); +} + +void AnnotLine::setIntent(AnnotLineIntent new_intent) +{ + const char *intentName; + + intent = new_intent; + if (new_intent == intentLineArrow) { + intentName = "LineArrow"; + } else { // intentLineDimension + intentName = "LineDimension"; + } + update("IT", Object(objName, intentName)); +} + +void AnnotLine::generateLineAppearance() +{ + double borderWidth, ca = opacity; + bool fill = false; + + appearBBox = std::make_unique(rect.get()); + AnnotAppearanceBuilder appearBuilder; + appearBuilder.append("q\n"); + if (color) { + appearBuilder.setDrawColor(color.get(), false); + } + if (interiorColor) { + appearBuilder.setDrawColor(interiorColor.get(), true); + fill = true; + } + appearBuilder.setLineStyleForBorder(border.get()); + borderWidth = border->getWidth(); + appearBBox->setBorderWidth(std::max(1., borderWidth)); + + const double x1 = coord1->getX(); + const double y1 = coord1->getY(); + const double x2 = coord2->getX(); + const double y2 = coord2->getY(); + + // Main segment length + const double main_len = sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)); + + // Main segment becomes positive x direction, coord1 becomes (0,0) + Matrix matr; + const double angle = atan2(y2 - y1, x2 - x1); + matr.m[0] = matr.m[3] = cos(angle); + matr.m[1] = sin(angle); + matr.m[2] = -matr.m[1]; + matr.m[4] = x1 - rect->x1; + matr.m[5] = y1 - rect->y1; + + double tx, ty, captionwidth = 0, captionheight = 0; + AnnotLineCaptionPos actualCaptionPos = captionPos; + const double fontsize = 9; + const double captionhmargin = 2; // Left and right margin (inline caption only) + const double captionmaxwidth = main_len - 2 * captionhmargin; + const double lineendingSize = std::min(6. * borderWidth, main_len / 2); + + Dict *fontResDict; + std::unique_ptr font; + + // Calculate caption width and height + if (caption) { + fontResDict = new Dict(doc->getXRef()); + font = createAnnotDrawFont(doc->getXRef(), fontResDict); + int lines = 0; + int i = 0; + while (i < contents->getLength()) { + GooString out; + double linewidth; + layoutText(contents.get(), &out, &i, *font, &linewidth, 0, nullptr, false); + linewidth *= fontsize; + if (linewidth > captionwidth) { + captionwidth = linewidth; + } + ++lines; + } + captionheight = lines * fontsize; + // If text is longer than available space, turn into captionPosTop + if (captionwidth > captionmaxwidth) { + actualCaptionPos = captionPosTop; + } + } else { + fontResDict = nullptr; + font = nullptr; + } + + // Draw main segment + matr.transform(AnnotAppearanceBuilder::lineEndingXShorten(startStyle, lineendingSize), leaderLineLength, &tx, &ty); + appearBuilder.appendf("{0:.2f} {1:.2f} m\n", tx, ty); + appearBBox->extendTo(tx, ty); + + if (captionwidth != 0 && actualCaptionPos == captionPosInline) { // Break in the middle + matr.transform((main_len - captionwidth) / 2 - captionhmargin, leaderLineLength, &tx, &ty); + appearBuilder.appendf("{0:.2f} {1:.2f} l S\n", tx, ty); + + matr.transform((main_len + captionwidth) / 2 + captionhmargin, leaderLineLength, &tx, &ty); + appearBuilder.appendf("{0:.2f} {1:.2f} m\n", tx, ty); + } + + matr.transform(main_len - AnnotAppearanceBuilder::lineEndingXShorten(endStyle, lineendingSize), leaderLineLength, &tx, &ty); + appearBuilder.appendf("{0:.2f} {1:.2f} l S\n", tx, ty); + appearBBox->extendTo(tx, ty); + + if (startStyle != annotLineEndingNone) { + const double extendX { -AnnotAppearanceBuilder::lineEndingXExtendBBox(startStyle, lineendingSize) }; + appearBuilder.drawLineEnding(startStyle, 0, leaderLineLength, -lineendingSize, fill, matr); + matr.transform(extendX, leaderLineLength + lineendingSize / 2., &tx, &ty); + appearBBox->extendTo(tx, ty); + matr.transform(extendX, leaderLineLength - lineendingSize / 2., &tx, &ty); + appearBBox->extendTo(tx, ty); + } + + if (endStyle != annotLineEndingNone) { + const double extendX { AnnotAppearanceBuilder::lineEndingXExtendBBox(endStyle, lineendingSize) }; + appearBuilder.drawLineEnding(endStyle, main_len, leaderLineLength, lineendingSize, fill, matr); + matr.transform(main_len + extendX, leaderLineLength + lineendingSize / 2., &tx, &ty); + appearBBox->extendTo(tx, ty); + matr.transform(main_len + extendX, leaderLineLength - lineendingSize / 2., &tx, &ty); + appearBBox->extendTo(tx, ty); + } + + // Draw caption text + if (caption) { + double tlx = (main_len - captionwidth) / 2, tly; // Top-left coords + if (actualCaptionPos == captionPosInline) { + tly = leaderLineLength + captionheight / 2; + } else { + tly = leaderLineLength + captionheight + 2 * borderWidth; + } + + tlx += captionTextHorizontal; + tly += captionTextVertical; + + // Adjust bounding box + matr.transform(tlx, tly - captionheight, &tx, &ty); + appearBBox->extendTo(tx, ty); + matr.transform(tlx + captionwidth, tly - captionheight, &tx, &ty); + appearBBox->extendTo(tx, ty); + matr.transform(tlx + captionwidth, tly, &tx, &ty); + appearBBox->extendTo(tx, ty); + matr.transform(tlx, tly, &tx, &ty); + appearBBox->extendTo(tx, ty); + + // Setup text state (reusing transformed top-left coord) + appearBuilder.appendf("0 g BT /AnnotDrawFont {0:.2f} Tf\n", fontsize); // Font color: black + appearBuilder.appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} Tm\n", matr.m[0], matr.m[1], matr.m[2], matr.m[3], tx, ty); + appearBuilder.appendf("0 {0:.2f} Td\n", -fontsize * font->getDescent()); + // Draw text + int i = 0; + double xposPrev = 0; + while (i < contents->getLength()) { + GooString out; + double linewidth, xpos; + layoutText(contents.get(), &out, &i, *font, &linewidth, 0, nullptr, false); + linewidth *= fontsize; + xpos = (captionwidth - linewidth) / 2; + appearBuilder.appendf("{0:.2f} {1:.2f} Td\n", xpos - xposPrev, -fontsize); + appearBuilder.writeString(out.toStr()); + appearBuilder.append("Tj\n"); + xposPrev = xpos; + } + appearBuilder.append("ET\n"); + } + + // Draw leader lines + double ll_len = fabs(leaderLineLength) + leaderLineExtension; + double sign = leaderLineLength >= 0 ? 1 : -1; + if (ll_len != 0) { + matr.transform(0, 0, &tx, &ty); + appearBuilder.appendf("{0:.2f} {1:.2f} m\n", tx, ty); + appearBBox->extendTo(tx, ty); + matr.transform(0, sign * ll_len, &tx, &ty); + appearBuilder.appendf("{0:.2f} {1:.2f} l S\n", tx, ty); + appearBBox->extendTo(tx, ty); + + matr.transform(main_len, 0, &tx, &ty); + appearBuilder.appendf("{0:.2f} {1:.2f} m\n", tx, ty); + appearBBox->extendTo(tx, ty); + matr.transform(main_len, sign * ll_len, &tx, &ty); + appearBuilder.appendf("{0:.2f} {1:.2f} l S\n", tx, ty); + appearBBox->extendTo(tx, ty); + } + + appearBuilder.append("Q\n"); + + double bbox[4]; + appearBBox->getBBoxRect(bbox); + if (ca == 1) { + appearance = createForm(appearBuilder.buffer(), bbox, false, fontResDict); + } else { + Object aStream = createForm(appearBuilder.buffer(), bbox, true, fontResDict); + + GooString appearBuf("/GS0 gs\n/Fm0 Do"); + Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr); + appearance = createForm(&appearBuf, bbox, false, resDict); + } +} + +void AnnotLine::draw(Gfx *gfx, bool printing) +{ + if (!isVisible(printing)) { + return; + } + + annotLocker(); + if (appearance.isNull()) { + generateLineAppearance(); + } + + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + if (appearBBox) { + gfx->drawAnnot(&obj, nullptr, color.get(), appearBBox->getPageXMin(), appearBBox->getPageYMin(), appearBBox->getPageXMax(), appearBBox->getPageYMax(), getRotation()); + } else { + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); + } +} + +// Before retrieving the res dict, regenerate the appearance stream if needed, +// because AnnotLine::draw may need to store font info in the res dict +Object AnnotLine::getAppearanceResDict() +{ + if (appearance.isNull()) { + generateLineAppearance(); + } + return Annot::getAppearanceResDict(); +} + +//------------------------------------------------------------------------ +// AnnotTextMarkup +//------------------------------------------------------------------------ +AnnotTextMarkup::AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rectA, AnnotSubtype subType) : AnnotMarkup(docA, rectA) +{ + switch (subType) { + case typeHighlight: + annotObj.dictSet("Subtype", Object(objName, "Highlight")); + break; + case typeUnderline: + annotObj.dictSet("Subtype", Object(objName, "Underline")); + break; + case typeSquiggly: + annotObj.dictSet("Subtype", Object(objName, "Squiggly")); + break; + case typeStrikeOut: + annotObj.dictSet("Subtype", Object(objName, "StrikeOut")); + break; + default: + assert(0 && "Invalid subtype for AnnotTextMarkup\n"); + } + + // Store dummy quadrilateral with null coordinates + Array *quadPoints = new Array(doc->getXRef()); + for (int i = 0; i < 4 * 2; ++i) { + quadPoints->add(Object(0.)); + } + annotObj.dictSet("QuadPoints", Object(quadPoints)); + + initialize(docA, annotObj.getDict()); +} + +AnnotTextMarkup::AnnotTextMarkup(PDFDoc *docA, Object &&dictObject, const Object *obj) : AnnotMarkup(docA, std::move(dictObject), obj) +{ + // the real type will be read in initialize() + type = typeHighlight; + initialize(docA, annotObj.getDict()); +} + +AnnotTextMarkup::~AnnotTextMarkup() = default; + +void AnnotTextMarkup::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + obj1 = dict->lookup("Subtype"); + if (obj1.isName()) { + GooString typeName(obj1.getName()); + if (!typeName.cmp("Highlight")) { + type = typeHighlight; + } else if (!typeName.cmp("Underline")) { + type = typeUnderline; + } else if (!typeName.cmp("Squiggly")) { + type = typeSquiggly; + } else if (!typeName.cmp("StrikeOut")) { + type = typeStrikeOut; + } + } + + obj1 = dict->lookup("QuadPoints"); + if (obj1.isArray()) { + quadrilaterals = std::make_unique(obj1.getArray(), rect.get()); + } else { + error(errSyntaxError, -1, "Bad Annot Text Markup QuadPoints"); + ok = false; + } +} + +void AnnotTextMarkup::setType(AnnotSubtype new_type) +{ + const char *typeName = nullptr; /* squelch bogus compiler warning */ + + switch (new_type) { + case typeHighlight: + typeName = "Highlight"; + break; + case typeUnderline: + typeName = "Underline"; + break; + case typeSquiggly: + typeName = "Squiggly"; + break; + case typeStrikeOut: + typeName = "StrikeOut"; + break; + default: + assert(!"Invalid subtype"); + } + + type = new_type; + update("Subtype", Object(objName, typeName)); + invalidateAppearance(); +} + +void AnnotTextMarkup::setQuadrilaterals(AnnotQuadrilaterals *quadPoints) +{ + Array *a = new Array(doc->getXRef()); + + for (int i = 0; i < quadPoints->getQuadrilateralsLength(); ++i) { + a->add(Object(quadPoints->getX1(i))); + a->add(Object(quadPoints->getY1(i))); + a->add(Object(quadPoints->getX2(i))); + a->add(Object(quadPoints->getY2(i))); + a->add(Object(quadPoints->getX3(i))); + a->add(Object(quadPoints->getY3(i))); + a->add(Object(quadPoints->getX4(i))); + a->add(Object(quadPoints->getY4(i))); + } + + quadrilaterals = std::make_unique(a, rect.get()); + + annotObj.dictSet("QuadPoints", Object(a)); + invalidateAppearance(); +} + +bool AnnotTextMarkup::shouldCreateApperance(Gfx *gfx) const +{ + if (appearance.isNull()) { + return true; + } + + // Adobe Reader seems to have a complex condition for when to use the + // appearance stream of typeHighlight, which is "use it if it has a Resources dictionary with ExtGState" + // this is reverse engineering of me editing a file by hand and checking what it does so the real + // condition may be more or less complex + if (type == typeHighlight) { + XRef *xref = gfx->getXRef(); + const Object fetchedApperance = appearance.fetch(xref); + if (fetchedApperance.isStream()) { + const Object resources = fetchedApperance.streamGetDict()->lookup("Resources"); + if (resources.isDict()) { + if (resources.dictLookup("ExtGState").isDict()) { + return false; + } + } + } + return true; + } + + return false; +} + +void AnnotTextMarkup::draw(Gfx *gfx, bool printing) +{ + double ca = 1; + int i; + + if (!isVisible(printing)) { + return; + } + + annotLocker(); + if (shouldCreateApperance(gfx)) { + bool blendMultiply = true; + ca = opacity; + + AnnotAppearanceBuilder appearBuilder; + appearBuilder.append("q\n"); + + /* Adjust BBox */ + appearBBox = std::make_unique(rect.get()); + for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) { + appearBBox->extendTo(quadrilaterals->getX1(i) - rect->x1, quadrilaterals->getY1(i) - rect->y1); + appearBBox->extendTo(quadrilaterals->getX2(i) - rect->x1, quadrilaterals->getY2(i) - rect->y1); + appearBBox->extendTo(quadrilaterals->getX3(i) - rect->x1, quadrilaterals->getY3(i) - rect->y1); + appearBBox->extendTo(quadrilaterals->getX4(i) - rect->x1, quadrilaterals->getY4(i) - rect->y1); + } + + switch (type) { + case typeUnderline: + if (color) { + appearBuilder.setDrawColor(color.get(), false); + } + appearBuilder.append("[] 0 d 1 w\n"); + // use a borderwidth, which is consistent with the line width + appearBBox->setBorderWidth(1.0); + + for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) { + double x3, y3, x4, y4; + + x3 = quadrilaterals->getX3(i); + y3 = quadrilaterals->getY3(i); + x4 = quadrilaterals->getX4(i); + y4 = quadrilaterals->getY4(i); + + appearBuilder.appendf("{0:.2f} {1:.2f} m\n", x3, y3); + appearBuilder.appendf("{0:.2f} {1:.2f} l\n", x4, y4); + appearBuilder.append("S\n"); + } + break; + case typeStrikeOut: + if (color) { + appearBuilder.setDrawColor(color.get(), false); + } + blendMultiply = false; + appearBuilder.append("[] 0 d 1 w\n"); + + for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) { + double x1, y1, x2, y2; + double x3, y3, x4, y4; + + x1 = quadrilaterals->getX1(i); + y1 = quadrilaterals->getY1(i); + x2 = quadrilaterals->getX2(i); + y2 = quadrilaterals->getY2(i); + + x3 = quadrilaterals->getX3(i); + y3 = quadrilaterals->getY3(i); + x4 = quadrilaterals->getX4(i); + y4 = quadrilaterals->getY4(i); + + appearBuilder.appendf("{0:.2f} {1:.2f} m\n", (x1 + x3) / 2., (y1 + y3) / 2.); + appearBuilder.appendf("{0:.2f} {1:.2f} l\n", (x2 + x4) / 2., (y2 + y4) / 2.); + appearBuilder.append("S\n"); + } + break; + case typeSquiggly: + if (color) { + appearBuilder.setDrawColor(color.get(), false); + } + appearBuilder.append("[] 0 d 1 w\n"); + + for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) { + double x1, y1, x2, y3; + double h6; + + x1 = quadrilaterals->getX1(i); + y1 = quadrilaterals->getY1(i); + x2 = quadrilaterals->getX2(i); + y3 = quadrilaterals->getY3(i); + h6 = (y1 - y3) / 6.0; + + appearBuilder.appendf("{0:.2f} {1:.2f} m\n", x1, y3 + h6); + bool down = false; + do { + down = !down; // Zigzag line + x1 += 2; + appearBuilder.appendf("{0:.2f} {1:.2f} l\n", x1, y3 + (down ? 0 : h6)); + } while (x1 < x2); + appearBuilder.append("S\n"); + } + break; + default: + case typeHighlight: + if (color) { + appearBuilder.setDrawColor(color.get(), true); + } + + double biggestBorder = 0; + for (i = 0; i < quadrilaterals->getQuadrilateralsLength(); ++i) { + double x1, y1, x2, y2, x3, y3, x4, y4; + double h4; + + x1 = quadrilaterals->getX1(i); + y1 = quadrilaterals->getY1(i); + x2 = quadrilaterals->getX2(i); + y2 = quadrilaterals->getY2(i); + x3 = quadrilaterals->getX3(i); + y3 = quadrilaterals->getY3(i); + x4 = quadrilaterals->getX4(i); + y4 = quadrilaterals->getY4(i); + h4 = fabs(y1 - y3) / 4.0; + + if (h4 > biggestBorder) { + biggestBorder = h4; + } + + appearBuilder.appendf("{0:.2f} {1:.2f} m\n", x3, y3); + appearBuilder.appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n", x3 - h4, y3 + h4, x1 - h4, y1 - h4, x1, y1); + appearBuilder.appendf("{0:.2f} {1:.2f} l\n", x2, y2); + appearBuilder.appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n", x2 + h4, y2 - h4, x4 + h4, y4 + h4, x4, y4); + appearBuilder.append("f\n"); + } + appearBBox->setBorderWidth(biggestBorder); + break; + } + appearBuilder.append("Q\n"); + + double bbox[4]; + bbox[0] = appearBBox->getPageXMin(); + bbox[1] = appearBBox->getPageYMin(); + bbox[2] = appearBBox->getPageXMax(); + bbox[3] = appearBBox->getPageYMax(); + Object aStream = createForm(appearBuilder.buffer(), bbox, true, nullptr); + + GooString appearBuf("/GS0 gs\n/Fm0 Do"); + Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", 1, blendMultiply ? "Multiply" : nullptr); + if (ca == 1) { + appearance = createForm(&appearBuf, bbox, false, resDict); + } else { + aStream = createForm(&appearBuf, bbox, true, resDict); + + Dict *resDict2 = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr); + appearance = createForm(&appearBuf, bbox, false, resDict2); + } + } + + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + if (appearBBox) { + gfx->drawAnnot(&obj, nullptr, color.get(), appearBBox->getPageXMin(), appearBBox->getPageYMin(), appearBBox->getPageXMax(), appearBBox->getPageYMax(), getRotation()); + } else { + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); + } +} + +//------------------------------------------------------------------------ +// AnnotWidget +//------------------------------------------------------------------------ + +AnnotWidget::AnnotWidget(PDFDoc *docA, Object &&dictObject, const Object *obj) : Annot(docA, std::move(dictObject), obj) +{ + type = typeWidget; + field = nullptr; + initialize(docA, annotObj.getDict()); +} + +AnnotWidget::AnnotWidget(PDFDoc *docA, Object *dictObject, Object *obj, FormField *fieldA) : Annot(docA, dictObject->copy(), obj) +{ + type = typeWidget; + field = fieldA; + initialize(docA, dictObject->getDict()); +} + +AnnotWidget::~AnnotWidget() = default; + +void AnnotWidget::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + form = doc->getCatalog()->getForm(); + + obj1 = dict->lookup("H"); + if (obj1.isName()) { + const char *modeName = obj1.getName(); + + if (!strcmp(modeName, "N")) { + mode = highlightModeNone; + } else if (!strcmp(modeName, "O")) { + mode = highlightModeOutline; + } else if (!strcmp(modeName, "P") || !strcmp(modeName, "T")) { + mode = highlightModePush; + } else { + mode = highlightModeInvert; + } + } else { + mode = highlightModeInvert; + } + + obj1 = dict->lookup("MK"); + if (obj1.isDict()) { + appearCharacs = std::make_unique(obj1.getDict()); + } + + obj1 = dict->lookup("A"); + if (obj1.isDict()) { + action = LinkAction::parseAction(&obj1, doc->getCatalog()->getBaseURI()); + } + + additionalActions = dict->lookupNF("AA").copy(); + + obj1 = dict->lookup("Parent"); + if (obj1.isDict()) { + parent = nullptr; + } else { + parent = nullptr; + } + + obj1 = dict->lookup("BS"); + if (obj1.isDict()) { + border = std::make_unique(obj1.getDict()); + } + + updatedAppearanceStream = Ref::INVALID(); +} + +std::unique_ptr AnnotWidget::getAdditionalAction(AdditionalActionsType additionalActionType) +{ + return ::getAdditionalAction(additionalActionType, &additionalActions, doc); +} + +std::unique_ptr AnnotWidget::getFormAdditionalAction(FormAdditionalActionsType formAdditionalActionType) +{ + Object additionalActionsObject = additionalActions.fetch(doc->getXRef()); + + if (additionalActionsObject.isDict()) { + const char *key = getFormAdditionalActionKey(formAdditionalActionType); + + Object actionObject = additionalActionsObject.dictLookup(key); + if (actionObject.isDict()) { + return LinkAction::parseAction(&actionObject, doc->getCatalog()->getBaseURI()); + } + } + + return nullptr; +} + +bool AnnotWidget::setFormAdditionalAction(FormAdditionalActionsType formAdditionalActionType, const std::string &js) +{ + Object additionalActionsObject = additionalActions.fetch(doc->getXRef()); + + if (!additionalActionsObject.isDict()) { + additionalActionsObject = Object(new Dict(doc->getXRef())); + annotObj.dictSet("AA", additionalActionsObject.copy()); + } + + additionalActionsObject.dictSet(getFormAdditionalActionKey(formAdditionalActionType), LinkJavaScript::createObject(doc->getXRef(), js)); + + if (additionalActions.isRef()) { + doc->getXRef()->setModifiedObject(&additionalActionsObject, additionalActions.getRef()); + } else if (hasRef) { + doc->getXRef()->setModifiedObject(&annotObj, ref); + } else { + error(errInternal, -1, "AnnotWidget::setFormAdditionalAction, where neither additionalActions is ref nor annotobj itself is ref"); + return false; + } + return true; +} + +// Grand unified handler for preparing text strings to be drawn into form +// fields. Takes as input a text string (in PDFDocEncoding or UTF-16). +// Converts some or all of this string to the appropriate encoding for the +// specified font, and computes the width of the text. Can optionally stop +// converting when a specified width has been reached, to perform line-breaking +// for multi-line fields. +// +// Parameters: +// text: input text string to convert +// outBuf: buffer for writing re-encoded string +// i: index at which to start converting; will be updated to point just after +// last character processed +// font: the font which will be used for display +// width: computed width (unscaled by font size) will be stored here +// widthLimit: if non-zero, stop converting to keep width under this value +// (should be scaled down by font size) +// charCount: count of number of characters will be stored here +// noReencode: if set, do not try to translate the character encoding +// (useful for Zapf Dingbats or other unusual encodings) +// can only be used with simple fonts, not CID-keyed fonts +// +// TODO: Handle surrogate pairs in UTF-16. +// Should be able to generate output for any CID-keyed font. +// Doesn't handle vertical fonts--should it? +void Annot::layoutText(const GooString *text, GooString *outBuf, int *i, const GfxFont &font, double *width, double widthLimit, int *charCount, bool noReencode, bool *newFontNeeded) +{ + CharCode c; + Unicode uChar; + const Unicode *uAux; + double w = 0.0; + int uLen, n; + double dx, dy, ox, oy; + + if (newFontNeeded) { + *newFontNeeded = false; + } + if (width != nullptr) { + *width = 0.0; + } + if (charCount != nullptr) { + *charCount = 0; + } + + if (!text) { + return; + } + bool unicode = hasUnicodeByteOrderMark(text->toStr()); + bool spacePrev; // previous character was a space + + // State for backtracking when more text has been processed than fits within + // widthLimit. We track for both input (text) and output (outBuf) the offset + // to the first character to discard. + // + // We keep track of several points: + // 1 - end of previous completed word which fits + // 2 - previous character which fit + int last_i1, last_i2, last_o1, last_o2; + + if (unicode && text->getLength() % 2 != 0) { + error(errSyntaxError, -1, "AnnotWidget::layoutText, bad unicode string"); + return; + } + + // skip Unicode marker on string if needed + if (unicode && *i == 0) { + *i = 2; + } + + // Start decoding and copying characters, until either: + // we reach the end of the string + // we reach the maximum width + // we reach a newline character + // As we copy characters, keep track of the last full word to fit, so that we + // can backtrack if we exceed the maximum width. + last_i1 = last_i2 = *i; + last_o1 = last_o2 = 0; + spacePrev = false; + outBuf->clear(); + + while (*i < text->getLength()) { + last_i2 = *i; + last_o2 = outBuf->getLength(); + + if (unicode) { + uChar = (unsigned char)(text->getChar(*i)) << 8; + uChar += (unsigned char)(text->getChar(*i + 1)); + *i += 2; + } else { + if (noReencode) { + uChar = text->getChar(*i) & 0xff; + } else { + uChar = pdfDocEncoding[text->getChar(*i) & 0xff]; + } + *i += 1; + } + + // Explicit line break? + if (uChar == '\r' || uChar == '\n') { + // Treat a sequence as a single line break + if (uChar == '\r' && *i < text->getLength()) { + if (unicode && text->getChar(*i) == '\0' && text->getChar(*i + 1) == '\n') { + *i += 2; + } else if (!unicode && text->getChar(*i) == '\n') { + *i += 1; + } + } + + break; + } + + if (noReencode) { + outBuf->append(uChar); + } else { + const CharCodeToUnicode *ccToUnicode = font.getToUnicode(); + if (!ccToUnicode) { + // This assumes an identity CMap. + outBuf->append((uChar >> 8) & 0xff); + outBuf->append(uChar & 0xff); + } else if (ccToUnicode->mapToCharCode(&uChar, &c, 1)) { + if (font.isCIDFont()) { + auto cidFont = static_cast(&font); + if (c < cidFont->getCIDToGIDLen()) { + const int glyph = cidFont->getCIDToGID()[c]; + if (glyph > 0 || c == 0) { + outBuf->append((c >> 8) & 0xff); + outBuf->append(c & 0xff); + } else { + if (newFontNeeded) { + *newFontNeeded = true; + *i -= unicode ? 2 : 1; + break; + } + outBuf->append((c >> 8) & 0xff); + outBuf->append(c & 0xff); + error(errSyntaxError, -1, "AnnotWidget::layoutText, font doesn't have glyph for charcode U+{0:04uX}", c); + } + } else { + // TODO: This assumes an identity CMap. It should be extended to + // handle the general case. + outBuf->append((c >> 8) & 0xff); + outBuf->append(c & 0xff); + } + } else { + // 8-bit font + outBuf->append(c); + } + } else { + if (newFontNeeded) { + *newFontNeeded = true; + *i -= unicode ? 2 : 1; + break; + } else { + error(errSyntaxError, -1, "AnnotWidget::layoutText, cannot convert U+{0:04uX}", uChar); + } + } + } + + // If we see a space, then we have a linebreak opportunity. + if (uChar == ' ') { + last_i1 = *i; + if (!spacePrev) { + last_o1 = last_o2; + } + spacePrev = true; + } else { + spacePrev = false; + } + + // Compute width of character just output + if (outBuf->getLength() > last_o2) { + dx = 0.0; + font.getNextChar(outBuf->c_str() + last_o2, outBuf->getLength() - last_o2, &c, &uAux, &uLen, &dx, &dy, &ox, &oy); + w += dx; + } + + // Current line over-full now? + if (widthLimit > 0.0 && w > widthLimit) { + if (last_o1 > 0) { + // Back up to the previous word which fit, if there was a previous + // word. + *i = last_i1; + outBuf->del(last_o1, outBuf->getLength() - last_o1); + } else if (last_o2 > 0) { + // Otherwise, back up to the previous character (in the only word on + // this line) + *i = last_i2; + outBuf->del(last_o2, outBuf->getLength() - last_o2); + } else { + // Otherwise, we were trying to fit the first character; include it + // anyway even if it overflows the space--no updates to make. + } + break; + } + } + + // If splitting input into lines because we reached the width limit, then + // consume any remaining trailing spaces that would go on this line from the + // input. If in doing so we reach a newline, consume that also. This code + // won't run if we stopped at a newline above, since in that case w <= + // widthLimit still. + if (widthLimit > 0.0 && w > widthLimit) { + if (unicode) { + while (*i < text->getLength() && text->getChar(*i) == '\0' && text->getChar(*i + 1) == ' ') { + *i += 2; + } + if (*i < text->getLength() && text->getChar(*i) == '\0' && text->getChar(*i + 1) == '\r') { + *i += 2; + } + if (*i < text->getLength() && text->getChar(*i) == '\0' && text->getChar(*i + 1) == '\n') { + *i += 2; + } + } else { + while (*i < text->getLength() && text->getChar(*i) == ' ') { + *i += 1; + } + if (*i < text->getLength() && text->getChar(*i) == '\r') { + *i += 1; + } + if (*i < text->getLength() && text->getChar(*i) == '\n') { + *i += 1; + } + } + } + + // Compute the actual width and character count of the final string, based on + // breakpoint, if this information is requested by the caller. + if (width != nullptr || charCount != nullptr) { + const char *s = outBuf->c_str(); + int len = outBuf->getLength(); + + while (len > 0) { + dx = 0.0; + n = font.getNextChar(s, len, &c, &uAux, &uLen, &dx, &dy, &ox, &oy); + + if (n == 0) { + break; + } + + if (width != nullptr) { + *width += dx; + } + if (charCount != nullptr) { + *charCount += 1; + } + + s += n; + len -= n; + } + } +} + +// Copy the given string to appearBuf, adding parentheses around it and +// escaping characters as appropriate. +void AnnotAppearanceBuilder::writeString(const std::string &str) +{ + appearBuf->append('('); + + for (const char c : str) { + if (c == '(' || c == ')' || c == '\\') { + appearBuf->append('\\'); + appearBuf->append(c); + } else if (c < 0x20) { + appearBuf->appendf("\\{0:03o}", (unsigned char)c); + } else { + appearBuf->append(c); + } + } + + appearBuf->append(')'); +} + +// Draw the variable text or caption for a field. +bool AnnotAppearanceBuilder::drawText(const GooString *text, const Form *form, const GooString *da, const GfxResources *resources, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, + const VariableTextQuadding quadding, XRef *xref, Dict *resourcesDict, const int flags, const int nCombs) +{ + const bool forceZapfDingbats = flags & ForceZapfDingbatsDrawTextFlag; + + std::vector daToks; + const GfxFont *font; + double fontSize; + int tfPos, tmPos; + bool freeText = false; // true if text should be freed before return + std::unique_ptr fontToFree = nullptr; + + //~ if there is no MK entry, this should use the existing content stream, + //~ and only replace the marked content portion of it + //~ (this is only relevant for Tx fields) + + // parse the default appearance string + tfPos = tmPos = -1; + if (da) { + FormFieldText::tokenizeDA(da->toStr(), &daToks, nullptr /*searchTok*/); + for (int i = 2; i < (int)daToks.size(); ++i) { + if (i >= 2 && daToks[i] == "Tf") { + tfPos = i - 2; + } else if (i >= 6 && daToks[i] == "Tm") { + tmPos = i - 6; + } + } + } + + // get the font and font size + font = nullptr; + fontSize = 0; + if (tfPos >= 0) { + std::string &tok = daToks[tfPos]; + if (forceZapfDingbats) { + assert(xref != nullptr); + if (tok != "/ZaDb") { + tok = "/ZaDb"; + } + } + if (tok.size() >= 1 && tok[0] == '/') { + if (!resources || !(font = resources->lookupFont(tok.c_str() + 1).get())) { + if (xref != nullptr && resourcesDict != nullptr) { + const char *fallback = determineFallbackFont(tok, forceZapfDingbats ? "ZapfDingbats" : "Helvetica"); + // The font variable sometimes points to an object that needs to be deleted + // and sometimes not, depending on whether the call to lookupFont above fails. + // When the code path right here is taken, the destructor of fontToFree + // (which is a std::unique_ptr) will delete the font object at the end of this method. + fontToFree = createAnnotDrawFont(xref, resourcesDict, tok.c_str() + 1, fallback); + font = fontToFree.get(); + } else { + error(errSyntaxError, -1, "Unknown font in field's DA string"); + } + } + } else { + error(errSyntaxError, -1, "Invalid font name in 'Tf' operator in field's DA string"); + } + fontSize = gatof(daToks[tfPos + 1].c_str()); + } else { + error(errSyntaxError, -1, "Missing 'Tf' operator in field's DA string"); + } + if (!font) { + return false; + } + + if (tmPos < 0) { + // Add fake Tm to the DA tokens + tmPos = daToks.size(); + daToks.insert(daToks.end(), { "1", "0", "0", "1", "0", "0", "Tm" }); + } + + // get the border width + const double borderWidth = border ? border->getWidth() : 0; + + // for a password field, replace all characters with asterisks + if (flags & TurnTextToStarsDrawTextFlag) { + int len; + if (hasUnicodeByteOrderMark(text->toStr())) { + len = (text->getLength() - 2) / 2; + } else { + len = text->getLength(); + } + + GooString *newText = new GooString; + for (int i = 0; i < len; ++i) { + newText->append('*'); + } + text = newText; + freeText = true; + } + + // setup + if (flags & EmitMarkedContentDrawTextFlag) { + appearBuf->append("/Tx BMC\n"); + } + appearBuf->append("q\n"); + auto calculateDxDy = [this, appearCharacs, rect]() -> std::tuple { + const int rot = appearCharacs ? appearCharacs->getRotation() : 0; + switch (rot) { + case 90: + appearBuf->appendf("0 1 -1 0 {0:.2f} 0 cm\n", rect->x2 - rect->x1); + return { rect->y2 - rect->y1, rect->x2 - rect->x1 }; + + case 180: + appearBuf->appendf("-1 0 0 -1 {0:.2f} {1:.2f} cm\n", rect->x2 - rect->x1, rect->y2 - rect->y1); + return { rect->x2 - rect->y2, rect->y2 - rect->y1 }; + + case 270: + appearBuf->appendf("0 -1 1 0 0 {0:.2f} cm\n", rect->y2 - rect->y1); + return { rect->y2 - rect->y1, rect->x2 - rect->x1 }; + + default: // assume rot == 0 + return { rect->x2 - rect->x1, rect->y2 - rect->y1 }; + } + }; + const auto dxdy = calculateDxDy(); + const double dx = std::get<0>(dxdy); + const double dy = std::get<1>(dxdy); + appearBuf->append("BT\n"); + // multi-line text + if (flags & MultilineDrawTextFlag) { + // note: comb is ignored in multiline mode as mentioned in the spec + + const double wMax = dx - 2 * borderWidth - 4; + + // compute font autosize + if (fontSize == 0) { + fontSize = Annot::calculateFontSize(form, font, text, wMax, dy, forceZapfDingbats); + daToks[tfPos + 1] = GooString().appendf("{0:.2f}", fontSize)->toStr(); + } + + // starting y coordinate + // (note: each line of text starts with a Td operator that moves + // down a line) + const double y = dy - 3; + + // set the font matrix + daToks[tmPos + 4] = "0"; + daToks[tmPos + 5] = GooString().appendf("{0:.2f}", y)->toStr(); + + // write the DA string + for (const std::string &daTok : daToks) { + appearBuf->append(daTok)->append(' '); + } + + const DrawMultiLineTextResult textCommands = drawMultiLineText(*text, dx, form, *font, std::string(), fontSize, quadding, borderWidth + 2); + appearBuf->append(textCommands.text); + + // single-line text + } else { + //~ replace newlines with spaces? - what does Acrobat do? + + // comb formatting + if (nCombs > 0) { + // compute comb spacing + const double w = (dx - 2 * borderWidth) / nCombs; + + // compute font autosize + if (fontSize == 0) { + fontSize = dy - 2 * borderWidth; + if (w < fontSize) { + fontSize = w; + } + fontSize = floor(fontSize); + daToks[tfPos + 1] = GooString().appendf("{0:.2f}", fontSize)->toStr(); + } + + const HorizontalTextLayouter textLayouter(text, form, font, {}, forceZapfDingbats); + + const int charCount = std::min(textLayouter.totalCharCount(), nCombs); + + // compute starting text cell + auto calculateX = [quadding, borderWidth, nCombs, charCount, w] { + switch (quadding) { + case VariableTextQuadding::leftJustified: + default: + return borderWidth; + case VariableTextQuadding::centered: + return borderWidth + (nCombs - charCount) / 2.0 * w; + case VariableTextQuadding::rightJustified: + return borderWidth + (nCombs - charCount) * w; + } + }; + const double x = calculateX(); + const double y = 0.5 * dy - 0.4 * fontSize; + + // set the font matrix + daToks[tmPos + 4] = GooString().appendf("{0:.2f}", x)->toStr(); + daToks[tmPos + 5] = GooString().appendf("{0:.2f}", y)->toStr(); + + // write the DA string + for (const std::string &daTok : daToks) { + appearBuf->append(daTok)->append(' '); + } + + // write the text string + int i = 0; + double xPrev = w; // so that first character is placed properly + for (const HorizontalTextLayouter::Data &d : textLayouter.data) { + const char *s = d.text.c_str(); + int len = d.text.size(); + while (i < nCombs && len > 0) { + CharCode code; + const Unicode *uAux; + int uLen, n; + double char_dx, char_dy, ox, oy; + + const GfxFont *currentFont = font; + if (!d.fontName.empty()) { + appearBuf->append(" q\n"); + appearBuf->appendf("/{0:s} {1:.2f} Tf\n", d.fontName.c_str(), fontSize); + currentFont = form->getDefaultResources()->lookupFont(d.fontName.c_str()).get(); + } + + char_dx = 0.0; + n = currentFont->getNextChar(s, len, &code, &uAux, &uLen, &char_dx, &char_dy, &ox, &oy); + char_dx *= fontSize; + + // center each character within its cell, by advancing the text + // position the appropriate amount relative to the start of the + // previous character + const double combX = 0.5 * (w - char_dx); + appearBuf->appendf("{0:.2f} 0 Td\n", combX - xPrev + w); + + GooString charBuf(s, n); + writeString(charBuf.toStr()); + appearBuf->append(" Tj\n"); + + if (!d.fontName.empty()) { + appearBuf->append(" Q\n"); + } + + i++; + s += n; + len -= n; + xPrev = combX; + } + } + + // regular (non-comb) formatting + } else { + const HorizontalTextLayouter textLayouter(text, form, font, {}, forceZapfDingbats); + + const double usedWidthUnscaled = textLayouter.totalWidth(); + + // compute font autosize + if (fontSize == 0) { + fontSize = dy - 2 * borderWidth; + if (usedWidthUnscaled > 0) { + const double fontSize2 = (dx - 4 - 2 * borderWidth) / usedWidthUnscaled; + if (fontSize2 < fontSize) { + fontSize = fontSize2; + } + } + fontSize = floor(fontSize); + daToks[tfPos + 1] = GooString().appendf("{0:.2f}", fontSize)->toStr(); + } + + // compute text start position + const double usedWidth = usedWidthUnscaled * fontSize; + auto calculateX = [quadding, borderWidth, dx, usedWidth] { + switch (quadding) { + case VariableTextQuadding::leftJustified: + default: + return borderWidth + 2; + case VariableTextQuadding::centered: + return (dx - usedWidth) / 2; + case VariableTextQuadding::rightJustified: + return dx - borderWidth - 2 - usedWidth; + } + }; + const double x = calculateX(); + const double y = 0.5 * dy - 0.4 * fontSize; + + // set the font matrix + daToks[tmPos + 4] = GooString().appendf("{0:.2f}", x)->toStr(); + daToks[tmPos + 5] = GooString().appendf("{0:.2f}", y)->toStr(); + + // write the DA string + for (const std::string &daTok : daToks) { + appearBuf->append(daTok)->append(' '); + } + // This newline is not neeed at all but it makes for easier reading + // and our auto tests "wrongly" assume it will be there, so add it anyway + appearBuf->append("\n"); + + // write the text strings + for (const HorizontalTextLayouter::Data &d : textLayouter.data) { + if (!d.fontName.empty()) { + appearBuf->append(" q\n"); + appearBuf->appendf("/{0:s} {1:.2f} Tf\n", d.fontName.c_str(), fontSize); + } + writeString(d.text); + appearBuf->append(" Tj\n"); + if (!d.fontName.empty()) { + appearBuf->append(" Q\n"); + } + } + } + } + // cleanup + appearBuf->append("ET\n"); + appearBuf->append("Q\n"); + if (flags & EmitMarkedContentDrawTextFlag) { + appearBuf->append("EMC\n"); + } + if (freeText) { + delete text; + } + + return true; +} + +// Draw the variable text or caption for a field. +bool AnnotAppearanceBuilder::drawListBox(const FormFieldChoice *fieldChoice, const AnnotBorder *border, const PDFRectangle *rect, const GooString *da, const GfxResources *resources, VariableTextQuadding quadding, XRef *xref, + Dict *resourcesDict) +{ + std::vector daToks; + GooString *tok; + GooString convertedText; + const GfxFont *font; + double fontSize, borderWidth, x, y; + int tfPos, tmPos, i, j; + std::unique_ptr fontToFree; + + //~ if there is no MK entry, this should use the existing content stream, + //~ and only replace the marked content portion of it + //~ (this is only relevant for Tx fields) + + // parse the default appearance string + tfPos = tmPos = -1; + if (da) { + i = 0; + while (i < da->getLength()) { + while (i < da->getLength() && Lexer::isSpace(da->getChar(i))) { + ++i; + } + if (i < da->getLength()) { + for (j = i + 1; j < da->getLength() && !Lexer::isSpace(da->getChar(j)); ++j) { + ; + } + daToks.push_back(new GooString(da, i, j - i)); + i = j; + } + } + for (std::size_t k = 2; k < daToks.size(); ++k) { + if (k >= 2 && !(daToks[k])->cmp("Tf")) { + tfPos = k - 2; + } else if (k >= 6 && !(daToks[k])->cmp("Tm")) { + tmPos = k - 6; + } + } + } + + // get the font and font size + font = nullptr; + fontSize = 0; + if (tfPos >= 0) { + tok = daToks[tfPos]; + if (tok->getLength() >= 1 && tok->getChar(0) == '/') { + if (!resources || !(font = resources->lookupFont(tok->c_str() + 1).get())) { + if (xref != nullptr && resourcesDict != nullptr) { + const char *fallback = determineFallbackFont(tok->toStr(), "Helvetica"); + // The font variable sometimes points to an object that needs to be deleted + // and sometimes not, depending on whether the call to lookupFont above fails. + // When the code path right here is taken, the destructor of fontToFree + // (which is a std::unique_ptr) will delete the font object at the end of this method. + fontToFree = createAnnotDrawFont(xref, resourcesDict, tok->c_str() + 1, fallback); + font = fontToFree.get(); + } else { + error(errSyntaxError, -1, "Unknown font in field's DA string"); + } + } + } else { + error(errSyntaxError, -1, "Invalid font name in 'Tf' operator in field's DA string"); + } + tok = daToks[tfPos + 1]; + fontSize = gatof(tok->c_str()); + } else { + error(errSyntaxError, -1, "Missing 'Tf' operator in field's DA string"); + } + if (!font) { + for (auto entry : daToks) { + delete entry; + } + return false; + } + + // get the border width + borderWidth = border ? border->getWidth() : 0; + + // compute font autosize + if (fontSize == 0) { + double wMax = 0; + for (i = 0; i < fieldChoice->getNumChoices(); ++i) { + j = 0; + if (fieldChoice->getChoice(i) == nullptr) { + error(errSyntaxError, -1, "Invalid annotation listbox"); + for (auto entry : daToks) { + delete entry; + } + return false; + } + double w; + Annot::layoutText(fieldChoice->getChoice(i), &convertedText, &j, *font, &w, 0.0, nullptr, false); + if (w > wMax) { + wMax = w; + } + } + fontSize = rect->y2 - rect->y1 - 2 * borderWidth; + const double fontSize2 = (rect->x2 - rect->x1 - 4 - 2 * borderWidth) / wMax; + if (fontSize2 < fontSize) { + fontSize = fontSize2; + } + fontSize = floor(fontSize); + if (tfPos >= 0) { + tok = daToks[tfPos + 1]; + tok->clear(); + tok->appendf("{0:.2f}", fontSize); + } + } + // draw the text + y = rect->y2 - rect->y1 - 1.1 * fontSize; + for (i = fieldChoice->getTopIndex(); i < fieldChoice->getNumChoices(); ++i) { + // setup + appearBuf->append("q\n"); + + // draw the background if selected + if (fieldChoice->isSelected(i)) { + appearBuf->append("0 g f\n"); + appearBuf->appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} re f\n", borderWidth, y - 0.2 * fontSize, rect->x2 - rect->x1 - 2 * borderWidth, 1.1 * fontSize); + } + + // setup + appearBuf->append("BT\n"); + + // compute text width and start position + j = 0; + double w; + Annot::layoutText(fieldChoice->getChoice(i), &convertedText, &j, *font, &w, 0.0, nullptr, false); + w *= fontSize; + switch (quadding) { + case VariableTextQuadding::leftJustified: + default: + x = borderWidth + 2; + break; + case VariableTextQuadding::centered: + x = (rect->x2 - rect->x1 - w) / 2; + break; + case VariableTextQuadding::rightJustified: + x = rect->x2 - rect->x1 - borderWidth - 2 - w; + break; + } + + // set the font matrix + if (tmPos >= 0) { + tok = daToks[tmPos + 4]; + tok->clear(); + tok->appendf("{0:.2f}", x); + tok = daToks[tmPos + 5]; + tok->clear(); + tok->appendf("{0:.2f}", y); + } + + // write the DA string + for (const GooString *daTok : daToks) { + appearBuf->append(daTok)->append(' '); + } + + // write the font matrix (if not part of the DA string) + if (tmPos < 0) { + appearBuf->appendf("1 0 0 1 {0:.2f} {1:.2f} Tm\n", x, y); + } + + // change the text color if selected + if (fieldChoice->isSelected(i)) { + appearBuf->append("1 g\n"); + } + + // write the text string + writeString(convertedText.toStr()); + appearBuf->append(" Tj\n"); + + // cleanup + appearBuf->append("ET\n"); + appearBuf->append("Q\n"); + + // next line + y -= 1.1 * fontSize; + } + + for (auto entry : daToks) { + delete entry; + } + + return true; +} + +void AnnotAppearanceBuilder::drawFieldBorder(const FormField *field, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect) +{ + AnnotColor adjustedColor; + const double w = border->getWidth(); + + const AnnotColor *aColor = appearCharacs->getBorderColor(); + if (!aColor) { + aColor = appearCharacs->getBackColor(); + } + if (!aColor) { + return; + } + + const double dx = rect->x2 - rect->x1; + const double dy = rect->y2 - rect->y1; + + // radio buttons with no caption have a round border + const bool hasCaption = appearCharacs->getNormalCaption() != nullptr; + if (field->getType() == formButton && static_cast(field)->getButtonType() == formButtonRadio && !hasCaption) { + double r = 0.5 * (dx < dy ? dx : dy); + switch (border->getStyle()) { + case AnnotBorder::borderDashed: + appearBuf->append("["); + for (double dash : border->getDash()) { + appearBuf->appendf(" {0:.2f}", dash); + } + appearBuf->append("] 0 d\n"); + // fallthrough + case AnnotBorder::borderSolid: + case AnnotBorder::borderUnderlined: + appearBuf->appendf("{0:.2f} w\n", w); + setDrawColor(aColor, false); + drawCircle(0.5 * dx, 0.5 * dy, r - 0.5 * w, false); + break; + case AnnotBorder::borderBeveled: + case AnnotBorder::borderInset: + appearBuf->appendf("{0:.2f} w\n", 0.5 * w); + setDrawColor(aColor, false); + drawCircle(0.5 * dx, 0.5 * dy, r - 0.25 * w, false); + adjustedColor = AnnotColor(*aColor); + adjustedColor.adjustColor(border->getStyle() == AnnotBorder::borderBeveled ? 1 : -1); + setDrawColor(&adjustedColor, false); + drawCircleTopLeft(0.5 * dx, 0.5 * dy, r - 0.75 * w); + adjustedColor = AnnotColor(*aColor); + adjustedColor.adjustColor(border->getStyle() == AnnotBorder::borderBeveled ? -1 : 1); + setDrawColor(&adjustedColor, false); + drawCircleBottomRight(0.5 * dx, 0.5 * dy, r - 0.75 * w); + break; + } + } else { + switch (border->getStyle()) { + case AnnotBorder::borderDashed: + appearBuf->append("["); + for (double dash : border->getDash()) { + appearBuf->appendf(" {0:.2f}", dash); + } + appearBuf->append("] 0 d\n"); + // fallthrough + case AnnotBorder::borderSolid: + appearBuf->appendf("{0:.2f} w\n", w); + setDrawColor(aColor, false); + appearBuf->appendf("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re s\n", 0.5 * w, dx - w, dy - w); + break; + case AnnotBorder::borderBeveled: + case AnnotBorder::borderInset: + adjustedColor = AnnotColor(*aColor); + adjustedColor.adjustColor(border->getStyle() == AnnotBorder::borderBeveled ? 1 : -1); + setDrawColor(&adjustedColor, true); + appearBuf->append("0 0 m\n"); + appearBuf->appendf("0 {0:.2f} l\n", dy); + appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx, dy); + appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx - w, dy - w); + appearBuf->appendf("{0:.2f} {1:.2f} l\n", w, dy - w); + appearBuf->appendf("{0:.2f} {0:.2f} l\n", w); + appearBuf->append("f\n"); + adjustedColor = AnnotColor(*aColor); + adjustedColor.adjustColor(border->getStyle() == AnnotBorder::borderBeveled ? -1 : 1); + setDrawColor(&adjustedColor, true); + appearBuf->append("0 0 m\n"); + appearBuf->appendf("{0:.2f} 0 l\n", dx); + appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx, dy); + appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx - w, dy - w); + appearBuf->appendf("{0:.2f} {1:.2f} l\n", dx - w, w); + appearBuf->appendf("{0:.2f} {0:.2f} l\n", w); + appearBuf->append("f\n"); + break; + case AnnotBorder::borderUnderlined: + appearBuf->appendf("{0:.2f} w\n", w); + setDrawColor(aColor, false); + appearBuf->appendf("0 0 m {0:.2f} 0 l s\n", dx); + break; + } + + // clip to the inside of the border + appearBuf->appendf("{0:.2f} {0:.2f} {1:.2f} {2:.2f} re W n\n", w, dx - 2 * w, dy - 2 * w); + } +} + +bool AnnotAppearanceBuilder::drawFormField(const FormField *field, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, + const GooString *appearState, XRef *xref, Dict *resourcesDict) +{ + // draw the field contents + switch (field->getType()) { + case formButton: + return drawFormFieldButton(static_cast(field), form, resources, da, border, appearCharacs, rect, appearState, xref, resourcesDict); + break; + case formText: + return drawFormFieldText(static_cast(field), form, resources, da, border, appearCharacs, rect, xref, resourcesDict); + case formChoice: + return drawFormFieldChoice(static_cast(field), form, resources, da, border, appearCharacs, rect, xref, resourcesDict); + break; + case formSignature: + return drawSignatureFieldText(static_cast(field), form, resources, da, border, appearCharacs, rect, xref, resourcesDict); + break; + case formUndef: + default: + error(errSyntaxError, -1, "Unknown field type"); + } + + return false; +} + +bool AnnotAppearanceBuilder::drawFormFieldButton(const FormFieldButton *field, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, + const PDFRectangle *rect, const GooString *appearState, XRef *xref, Dict *resourcesDict) +{ + const GooString *caption = nullptr; + if (appearCharacs) { + caption = appearCharacs->getNormalCaption(); + } + + switch (field->getButtonType()) { + case formButtonRadio: { + //~ Acrobat doesn't draw a caption if there is no AP dict (?) + if (appearState && appearState->cmp("Off") != 0 && field->getState(appearState->c_str())) { + if (caption) { + return drawText(caption, form, da, resources, border, appearCharacs, rect, VariableTextQuadding::centered, xref, resourcesDict, ForceZapfDingbatsDrawTextFlag); + } else if (appearCharacs) { + const AnnotColor *aColor = appearCharacs->getBorderColor(); + if (aColor) { + const double dx = rect->x2 - rect->x1; + const double dy = rect->y2 - rect->y1; + setDrawColor(aColor, true); + drawCircle(0.5 * dx, 0.5 * dy, 0.2 * (dx < dy ? dx : dy), true); + } + return true; + } + } + } break; + case formButtonPush: + if (caption) { + return drawText(caption, form, da, resources, border, appearCharacs, rect, VariableTextQuadding::centered, xref, resourcesDict); + } + break; + case formButtonCheck: + if (appearState && appearState->cmp("Off") != 0) { + if (!caption) { + GooString checkMark("3"); + return drawText(&checkMark, form, da, resources, border, appearCharacs, rect, VariableTextQuadding::centered, xref, resourcesDict, ForceZapfDingbatsDrawTextFlag); + } else { + return drawText(caption, form, da, resources, border, appearCharacs, rect, VariableTextQuadding::centered, xref, resourcesDict, ForceZapfDingbatsDrawTextFlag); + } + } + break; + } + + return true; +} + +bool AnnotAppearanceBuilder::drawFormFieldText(const FormFieldText *fieldText, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, + const PDFRectangle *rect, XRef *xref, Dict *resourcesDict) +{ + VariableTextQuadding quadding; + const GooString *contents; + + contents = fieldText->getAppearanceContent(); + if (contents) { + if (fieldText->hasTextQuadding()) { + quadding = fieldText->getTextQuadding(); + } else if (form) { + quadding = form->getTextQuadding(); + } else { + quadding = VariableTextQuadding::leftJustified; + } + + const int nCombs = fieldText->isComb() ? fieldText->getMaxLen() : 0; + + int flags = EmitMarkedContentDrawTextFlag; + if (fieldText->isMultiline()) { + flags = flags | MultilineDrawTextFlag; + } + if (fieldText->isPassword()) { + flags = flags | TurnTextToStarsDrawTextFlag; + } + return drawText(contents, form, da, resources, border, appearCharacs, rect, quadding, xref, resourcesDict, flags, nCombs); + } + + return true; +} + +static void setChildDictEntryValue(Dict *parentDict, const char *childDictName, const char *childDictEntryName, const Ref childDictEntryValue, XRef *xref) +{ + Object childDictionaryObj = parentDict->lookup(childDictName); + if (!childDictionaryObj.isDict()) { + childDictionaryObj = Object(new Dict(xref)); + parentDict->set(childDictName, childDictionaryObj.copy()); + } + childDictionaryObj.dictSet(childDictEntryName, Object(childDictEntryValue)); +} + +bool AnnotAppearanceBuilder::drawSignatureFieldText(const FormFieldSignature *field, const Form *form, const GfxResources *resources, const GooString *_da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, + const PDFRectangle *rect, XRef *xref, Dict *resourcesDict) +{ + const GooString &contents = field->getCustomAppearanceContent(); + if (contents.toStr().empty()) { + return false; + } + + if (field->getImageResource() != Ref::INVALID()) { + const double width = rect->x2 - rect->x1; + const double height = rect->y2 - rect->y1; + static const char *imageResourceId = "SigImg"; + setChildDictEntryValue(resourcesDict, "XObject", imageResourceId, field->getImageResource(), xref); + Matrix matrix = { 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 }; + matrix.scale(width, height); + static const char *IMG_TMPL = "\nq {0:.1g} {1:.1g} {2:.1g} {3:.1g} {4:.1g} {5:.1g} cm /{6:s} Do Q\n"; + const std::unique_ptr imgBuffer = GooString::format(IMG_TMPL, matrix.m[0], matrix.m[1], matrix.m[2], matrix.m[3], matrix.m[4], matrix.m[5], imageResourceId); + append(imgBuffer->c_str()); + } + + const GooString &leftText = field->getCustomAppearanceLeftContent(); + if (leftText.toStr().empty()) { + drawSignatureFieldText(contents, form, DefaultAppearance(_da), border, rect, xref, resourcesDict, 0, false /* don't center vertically */, false /* don't center horizontally */); + } else { + DefaultAppearance daLeft(_da); + daLeft.setFontPtSize(field->getCustomAppearanceLeftFontSize()); + const double halfWidth = (rect->x2 - rect->x1) / 2; + PDFRectangle rectLeft(rect->x1, rect->y1, rect->x1 + halfWidth, rect->y2); + drawSignatureFieldText(leftText, form, daLeft, border, &rectLeft, xref, resourcesDict, 0, true /* center vertically */, true /* center horizontally */); + + PDFRectangle rectRight(rectLeft.x2, rect->y1, rect->x2, rect->y2); + drawSignatureFieldText(contents, form, DefaultAppearance(_da), border, &rectRight, xref, resourcesDict, halfWidth, true /* center vertically */, false /* don't center horizontally */); + } + + return true; +} + +void AnnotAppearanceBuilder::drawSignatureFieldText(const GooString &text, const Form *form, const DefaultAppearance &da, const AnnotBorder *border, const PDFRectangle *rect, XRef *xref, Dict *resourcesDict, double leftMargin, + bool centerVertically, bool centerHorizontally) +{ + double borderWidth = 0; + append("q\n"); + + if (border) { + borderWidth = border->getWidth(); + if (borderWidth > 0) { + setLineStyleForBorder(border); + } + } + + // Box size + const double width = rect->x2 - rect->x1; + const double height = rect->y2 - rect->y1; + const double textmargin = borderWidth * 2; + const double textwidth = width - 2 * textmargin; + + // create a Helvetica fake font + std::shared_ptr font = form ? form->getDefaultResources()->lookupFont(da.getFontName().getName()) : nullptr; + if (!font) { + font = createAnnotDrawFont(xref, resourcesDict, da.getFontName().getName()); + } + + // Setup text clipping + appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} re W n\n", leftMargin + textmargin, textmargin, textwidth, height - 2 * textmargin); + setDrawColor(da.getFontColor(), true); + const DrawMultiLineTextResult textCommands = + drawMultiLineText(text, textwidth, form, *font, da.getFontName().getName(), da.getFontPtSize(), centerHorizontally ? VariableTextQuadding::centered : VariableTextQuadding::leftJustified, 0 /*borderWidth*/); + + double yDelta = height - textmargin; + if (centerVertically) { + const double outTextHeight = textCommands.nLines * da.getFontPtSize(); + if (outTextHeight < height) { + yDelta = height - (height - outTextHeight) / 2; + } + } + appendf("BT 1 0 0 1 {0:.2f} {1:.2f} Tm\n", leftMargin + textmargin, yDelta); + append(textCommands.text.c_str()); + append("ET Q\n"); +} + +bool AnnotAppearanceBuilder::drawFormFieldChoice(const FormFieldChoice *fieldChoice, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, + const PDFRectangle *rect, XRef *xref, Dict *resourcesDict) +{ + const GooString *selected; + VariableTextQuadding quadding; + + if (fieldChoice->hasTextQuadding()) { + quadding = fieldChoice->getTextQuadding(); + } else if (form) { + quadding = form->getTextQuadding(); + } else { + quadding = VariableTextQuadding::leftJustified; + } + + if (fieldChoice->isCombo()) { + selected = fieldChoice->getSelectedChoice(); + if (selected) { + return drawText(selected, form, da, resources, border, appearCharacs, rect, quadding, xref, resourcesDict, EmitMarkedContentDrawTextFlag); + //~ Acrobat draws a popup icon on the right side + } + // list box + } else { + return drawListBox(fieldChoice, border, rect, da, resources, quadding, xref, resourcesDict); + } + + return true; +} + +// Should we also merge Arrays? +static void recursiveMergeDicts(Dict *primary, const Dict *secondary, RefRecursionChecker *alreadySeenDicts) +{ + for (int i = 0; i < secondary->getLength(); ++i) { + const char *key = secondary->getKey(i); + if (!primary->hasKey(key)) { + primary->add(key, secondary->lookup(key).deepCopy()); + } else { + Ref primaryRef; + Object primaryObj = primary->lookup(key, &primaryRef); + if (primaryObj.isDict()) { + Ref secondaryRef; + Object secondaryObj = secondary->lookup(key, &secondaryRef); + if (secondaryObj.isDict()) { + if (!alreadySeenDicts->insert(primaryRef) || !alreadySeenDicts->insert(secondaryRef)) { + // bad PDF + return; + } + recursiveMergeDicts(primaryObj.getDict(), secondaryObj.getDict(), alreadySeenDicts); + } + } + } + } +} + +static void recursiveMergeDicts(Dict *primary, const Dict *secondary) +{ + RefRecursionChecker alreadySeenDicts; + recursiveMergeDicts(primary, secondary, &alreadySeenDicts); +} + +void AnnotWidget::generateFieldAppearance() +{ + const GooString *da; + + AnnotAppearanceBuilder appearBuilder; + + // draw the background + if (appearCharacs) { + const AnnotColor *aColor = appearCharacs->getBackColor(); + if (aColor) { + appearBuilder.setDrawColor(aColor, true); + appearBuilder.appendf("0 0 {0:.2f} {1:.2f} re f\n", rect->x2 - rect->x1, rect->y2 - rect->y1); + } + } + + // draw the border + if (appearCharacs && border && border->getWidth() > 0) { + appearBuilder.drawFieldBorder(field, border.get(), appearCharacs.get(), rect.get()); + } + + da = field->getDefaultAppearance(); + if (!da && form) { + da = form->getDefaultAppearance(); + } + + Dict *appearDict = new Dict(doc->getXRef()); + + // Let's init resourcesDictObj and resources. + // In PDF 1.2, an additional entry in the field dictionary, DR, was defined. + // Beginning with PDF 1.5, this entry is obsolete. + // And yet Acrobat Reader seems to be taking a field's DR into account. + Object resourcesDictObj; + const GfxResources *resources = nullptr; + GfxResources *resourcesToFree = nullptr; + if (field->getObj() && field->getObj()->isDict()) { + // Let's use a field's resource dictionary. + resourcesDictObj = field->getObj()->dictLookup("DR"); + if (resourcesDictObj.isDict()) { + if (form && form->getDefaultResourcesObj()->isDict()) { + resourcesDictObj = resourcesDictObj.deepCopy(); + recursiveMergeDicts(resourcesDictObj.getDict(), form->getDefaultResourcesObj()->getDict()); + } + resourcesToFree = new GfxResources(doc->getXRef(), resourcesDictObj.getDict(), nullptr); + resources = resourcesToFree; + } + } + if (!resourcesDictObj.isDict()) { + // No luck with a field's resource dictionary. Let's use an AcroForm's resource dictionary. + if (form && form->getDefaultResourcesObj()->isDict()) { + resourcesDictObj = form->getDefaultResourcesObj()->deepCopy(); + resources = form->getDefaultResources(); + } + } + if (!resourcesDictObj.isDict()) { + resourcesDictObj = Object(new Dict(doc->getXRef())); + } + + const bool success = appearBuilder.drawFormField(field, form, resources, da, border.get(), appearCharacs.get(), rect.get(), appearState.get(), doc->getXRef(), resourcesDictObj.getDict()); + if (!success && form && da != form->getDefaultAppearance()) { + da = form->getDefaultAppearance(); + appearBuilder.drawFormField(field, form, resources, da, border.get(), appearCharacs.get(), rect.get(), appearState.get(), doc->getXRef(), resourcesDictObj.getDict()); + } + + const GooString *appearBuf = appearBuilder.buffer(); + // fill the appearance stream dictionary + appearDict->add("Length", Object(appearBuf->getLength())); + appearDict->add("Subtype", Object(objName, "Form")); + Array *bbox = new Array(doc->getXRef()); + bbox->add(Object(0)); + bbox->add(Object(0)); + bbox->add(Object(rect->x2 - rect->x1)); + bbox->add(Object(rect->y2 - rect->y1)); + appearDict->add("BBox", Object(bbox)); + + // set the resource dictionary + if (resourcesDictObj.getDict()->getLength() > 0) { + appearDict->set("Resources", std::move(resourcesDictObj)); + } + + // build the appearance stream + Stream *appearStream = new AutoFreeMemStream(copyString(appearBuf->c_str()), 0, appearBuf->getLength(), Object(appearDict)); + if (hasBeenUpdated) { + // We should technically do this for all annots but AnnotFreeText + // forms are particularly special since we're potentially embeddeing a font so we really need + // to set the AP and not let other renderers guess it from the contents + setNewAppearance(Object(appearStream)); + } else { + appearance = Object(appearStream); + } + + if (resourcesToFree) { + delete resourcesToFree; + } +} + +void AnnotWidget::updateAppearanceStream() +{ + // If this the first time updateAppearanceStream() is called on this widget, + // destroy the AP dictionary because we are going to create a new one. + if (updatedAppearanceStream == Ref::INVALID()) { + invalidateAppearance(); // Delete AP dictionary and all referenced streams + } + + // There's no need to create a new appearance stream if NeedAppearances is + // set, because it will be ignored next time anyway. + // except if signature type; most readers can't figure out how to create an + // appearance for those and thus renders nothing. + if (form && form->getNeedAppearances()) { + if (field->getType() != FormFieldType::formSignature) { + return; + } + } + + // Create the new appearance + generateFieldAppearance(); + + // Fetch the appearance stream we've just created + Object obj1 = appearance.fetch(doc->getXRef()); + + // If this the first time updateAppearanceStream() is called on this widget, + // create a new AP dictionary containing the new appearance stream. + // Otherwise, just update the stream we had created previously. + if (updatedAppearanceStream == Ref::INVALID()) { + // Write the appearance stream + updatedAppearanceStream = doc->getXRef()->addIndirectObject(obj1); + + // Write the AP dictionary + obj1 = Object(new Dict(doc->getXRef())); + obj1.dictAdd("N", Object(updatedAppearanceStream)); + + // Update our internal pointers to the appearance dictionary + appearStreams = std::make_unique(doc, &obj1); + + update("AP", std::move(obj1)); + } else { + // Replace the existing appearance stream + doc->getXRef()->setModifiedObject(&obj1, updatedAppearanceStream); + } +} + +void AnnotWidget::draw(Gfx *gfx, bool printing) +{ + if (!isVisible(printing)) { + return; + } + + annotLocker(); + + // Only construct the appearance stream when + // - annot doesn't have an AP or + // - NeedAppearances is true and it isn't a Signature. There isn't enough data in our objects to generate it for signatures + if (field) { + if (appearance.isNull() || (field->getType() != FormFieldType::formSignature && form && form->getNeedAppearances())) { + generateFieldAppearance(); + } + } + + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); +} + +void AnnotWidget::invalidateAppearance() +{ + updatedAppearanceStream = Ref::INVALID(); + Annot::invalidateAppearance(); +} + +//------------------------------------------------------------------------ +// AnnotMovie +//------------------------------------------------------------------------ +AnnotMovie::AnnotMovie(PDFDoc *docA, PDFRectangle *rectA, Movie *movieA) : Annot(docA, rectA) +{ + type = typeMovie; + annotObj.dictSet("Subtype", Object(objName, "Movie")); + + movie = movieA->copy(); + // TODO: create movie dict from movieA + + initialize(docA, annotObj.getDict()); +} + +AnnotMovie::AnnotMovie(PDFDoc *docA, Object &&dictObject, const Object *obj) : Annot(docA, std::move(dictObject), obj) +{ + type = typeMovie; + initialize(docA, annotObj.getDict()); +} + +AnnotMovie::~AnnotMovie() = default; + +void AnnotMovie::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + obj1 = dict->lookup("T"); + if (obj1.isString()) { + title.reset(obj1.getString()->copy()); + } + + Object movieDict = dict->lookup("Movie"); + if (movieDict.isDict()) { + Object obj2 = dict->lookup("A"); + if (obj2.isDict()) { + movie = std::make_unique(&movieDict, &obj2); + } else { + movie = std::make_unique(&movieDict); + } + if (!movie->isOk()) { + movie = nullptr; + ok = false; + } + } else { + error(errSyntaxError, -1, "Bad Annot Movie"); + ok = false; + } +} + +void AnnotMovie::draw(Gfx *gfx, bool printing) +{ + if (!isVisible(printing)) { + return; + } + + annotLocker(); + if (appearance.isNull() && movie->getShowPoster()) { + int width, height; + Object poster = movie->getPoster(); + movie->getAspect(&width, &height); + + if (width != -1 && height != -1 && !poster.isNone()) { + auto appearBuf = std::make_unique(); + appearBuf->append("q\n"); + appearBuf->appendf("{0:d} 0 0 {1:d} 0 0 cm\n", width, height); + appearBuf->append("/MImg Do\n"); + appearBuf->append("Q\n"); + + Dict *imgDict = new Dict(gfx->getXRef()); + imgDict->set("MImg", std::move(poster)); + + Dict *resDict = new Dict(gfx->getXRef()); + resDict->set("XObject", Object(imgDict)); + + Dict *formDict = new Dict(gfx->getXRef()); + formDict->set("Length", Object(appearBuf->getLength())); + formDict->set("Subtype", Object(objName, "Form")); + formDict->set("Name", Object(objName, "FRM")); + Array *bboxArray = new Array(gfx->getXRef()); + bboxArray->add(Object(0)); + bboxArray->add(Object(0)); + bboxArray->add(Object(width)); + bboxArray->add(Object(height)); + formDict->set("BBox", Object(bboxArray)); + Array *matrix = new Array(gfx->getXRef()); + matrix->add(Object(1)); + matrix->add(Object(0)); + matrix->add(Object(0)); + matrix->add(Object(1)); + matrix->add(Object(-width / 2)); + matrix->add(Object(-height / 2)); + formDict->set("Matrix", Object(matrix)); + formDict->set("Resources", Object(resDict)); + + Stream *mStream = new AutoFreeMemStream(copyString(appearBuf->c_str()), 0, appearBuf->getLength(), Object(formDict)); + + Dict *dict = new Dict(gfx->getXRef()); + dict->set("FRM", Object(mStream)); + + Dict *resDict2 = new Dict(gfx->getXRef()); + resDict2->set("XObject", Object(dict)); + + appearBuf = std::make_unique(); + appearBuf->append("q\n"); + appearBuf->appendf("0 0 {0:d} {1:d} re W n\n", width, height); + appearBuf->append("q\n"); + appearBuf->appendf("0 0 {0:d} {1:d} re W n\n", width, height); + appearBuf->appendf("1 0 0 1 {0:d} {1:d} cm\n", width / 2, height / 2); + appearBuf->append("/FRM Do\n"); + appearBuf->append("Q\n"); + appearBuf->append("Q\n"); + + double bbox[4]; + bbox[0] = bbox[1] = 0; + bbox[2] = width; + bbox[3] = height; + appearance = createForm(appearBuf.get(), bbox, false, resDict2); + } + } + + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); +} + +//------------------------------------------------------------------------ +// AnnotScreen +//------------------------------------------------------------------------ +AnnotScreen::AnnotScreen(PDFDoc *docA, PDFRectangle *rectA) : Annot(docA, rectA) +{ + type = typeScreen; + + annotObj.dictSet("Subtype", Object(objName, "Screen")); + initialize(docA, annotObj.getDict()); +} + +AnnotScreen::AnnotScreen(PDFDoc *docA, Object &&dictObject, const Object *obj) : Annot(docA, std::move(dictObject), obj) +{ + type = typeScreen; + initialize(docA, annotObj.getDict()); +} + +AnnotScreen::~AnnotScreen() = default; + +void AnnotScreen::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + obj1 = dict->lookup("T"); + if (obj1.isString()) { + title.reset(obj1.getString()->copy()); + } + + obj1 = dict->lookup("A"); + if (obj1.isDict()) { + action = LinkAction::parseAction(&obj1, doc->getCatalog()->getBaseURI()); + if (action && action->getKind() == actionRendition && page == 0) { + error(errSyntaxError, -1, "Invalid Rendition action: associated screen annotation without P"); + action = nullptr; + ok = false; + } + } + + additionalActions = dict->lookupNF("AA").copy(); + + obj1 = dict->lookup("MK"); + if (obj1.isDict()) { + appearCharacs = std::make_unique(obj1.getDict()); + } +} + +std::unique_ptr AnnotScreen::getAdditionalAction(AdditionalActionsType additionalActionType) +{ + if (additionalActionType == actionFocusIn || additionalActionType == actionFocusOut) { // not defined for screen annotation + return nullptr; + } + + return ::getAdditionalAction(additionalActionType, &additionalActions, doc); +} + +//------------------------------------------------------------------------ +// AnnotStamp +//------------------------------------------------------------------------ +AnnotStamp::AnnotStamp(PDFDoc *docA, PDFRectangle *rectA) : AnnotMarkup(docA, rectA) +{ + type = typeStamp; + annotObj.dictSet("Subtype", Object(objName, "Stamp")); + initialize(docA, annotObj.getDict()); +} + +AnnotStamp::AnnotStamp(PDFDoc *docA, Object &&dictObject, const Object *obj) : AnnotMarkup(docA, std::move(dictObject), obj) +{ + type = typeStamp; + initialize(docA, annotObj.getDict()); +} + +AnnotStamp::~AnnotStamp() +{ + delete stampImageHelper; +} + +void AnnotStamp::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1 = dict->lookup("Name"); + if (obj1.isName()) { + icon = std::make_unique(obj1.getName()); + } else { + icon = std::make_unique("Draft"); + } + + stampImageHelper = nullptr; + updatedAppearanceStream = Ref::INVALID(); +} + +void AnnotStamp::generateStampCustomAppearance() +{ + Ref imgRef = stampImageHelper->getRef(); + const std::string imgStrName = "X" + std::to_string(imgRef.num); + + AnnotAppearanceBuilder appearBuilder; + appearBuilder.append("q\n"); + appearBuilder.append("/GS0 gs\n"); + appearBuilder.appendf("{0:.3f} 0 0 {1:.3f} 0 0 cm\n", rect->x2 - rect->x1, rect->y2 - rect->y1); + appearBuilder.append("/"); + appearBuilder.append(imgStrName.c_str()); + appearBuilder.append(" Do\n"); + appearBuilder.append("Q\n"); + + Dict *resDict = createResourcesDict(imgStrName.c_str(), Object(imgRef), "GS0", opacity, nullptr); + + const double bboxArray[4] = { 0, 0, rect->x2 - rect->x1, rect->y2 - rect->y1 }; + const GooString *appearBuf = appearBuilder.buffer(); + appearance = createForm(appearBuf, bboxArray, false, resDict); +} + +void AnnotStamp::generateStampDefaultAppearance() +{ + Dict *extGStateDict = nullptr; + AnnotAppearanceBuilder defaultAppearanceBuilder; + + double stampUnscaledWidth; + double stampUnscaledHeight; + const char *stampCode; + if (!icon->cmp("Approved")) { + stampUnscaledWidth = ANNOT_STAMP_APPROVED_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_APPROVED_HEIGHT; + stampCode = ANNOT_STAMP_APPROVED; + extGStateDict = getApprovedStampExtGStateDict(doc); + } else if (!icon->cmp("AsIs")) { + stampUnscaledWidth = ANNOT_STAMP_AS_IS_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_AS_IS_HEIGHT; + stampCode = ANNOT_STAMP_AS_IS; + extGStateDict = getAsIsStampExtGStateDict(doc); + } else if (!icon->cmp("Confidential")) { + stampUnscaledWidth = ANNOT_STAMP_CONFIDENTIAL_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_CONFIDENTIAL_HEIGHT; + stampCode = ANNOT_STAMP_CONFIDENTIAL; + extGStateDict = getConfidentialStampExtGStateDict(doc); + } else if (!icon->cmp("Final")) { + stampUnscaledWidth = ANNOT_STAMP_FINAL_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_FINAL_HEIGHT; + stampCode = ANNOT_STAMP_FINAL; + extGStateDict = getFinalStampExtGStateDict(doc); + } else if (!icon->cmp("Experimental")) { + stampUnscaledWidth = ANNOT_STAMP_EXPERIMENTAL_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_EXPERIMENTAL_HEIGHT; + stampCode = ANNOT_STAMP_EXPERIMENTAL; + extGStateDict = getExperimentalStampExtGStateDict(doc); + } else if (!icon->cmp("Expired")) { + stampUnscaledWidth = ANNOT_STAMP_EXPIRED_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_EXPIRED_HEIGHT; + stampCode = ANNOT_STAMP_EXPIRED; + extGStateDict = getExpiredStampExtGStateDict(doc); + } else if (!icon->cmp("NotApproved")) { + stampUnscaledWidth = ANNOT_STAMP_NOT_APPROVED_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_NOT_APPROVED_HEIGHT; + stampCode = ANNOT_STAMP_NOT_APPROVED; + extGStateDict = getNotApprovedStampExtGStateDict(doc); + } else if (!icon->cmp("NotForPublicRelease")) { + stampUnscaledWidth = ANNOT_STAMP_NOT_FOR_PUBLIC_RELEASE_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_NOT_FOR_PUBLIC_RELEASE_HEIGHT; + stampCode = ANNOT_STAMP_NOT_FOR_PUBLIC_RELEASE; + extGStateDict = getNotForPublicReleaseStampExtGStateDict(doc); + } else if (!icon->cmp("Sold")) { + stampUnscaledWidth = ANNOT_STAMP_SOLD_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_SOLD_HEIGHT; + stampCode = ANNOT_STAMP_SOLD; + extGStateDict = getSoldStampExtGStateDict(doc); + } else if (!icon->cmp("Departmental")) { + stampUnscaledWidth = ANNOT_STAMP_DEPARTMENTAL_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_DEPARTMENTAL_HEIGHT; + stampCode = ANNOT_STAMP_DEPARTMENTAL; + extGStateDict = getDepartmentalStampExtGStateDict(doc); + } else if (!icon->cmp("ForComment")) { + stampUnscaledWidth = ANNOT_STAMP_FOR_COMMENT_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_FOR_COMMENT_HEIGHT; + stampCode = ANNOT_STAMP_FOR_COMMENT; + extGStateDict = getForCommentStampExtGStateDict(doc); + } else if (!icon->cmp("ForPublicRelease")) { + stampUnscaledWidth = ANNOT_STAMP_FOR_PUBLIC_RELEASE_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_FOR_PUBLIC_RELEASE_HEIGHT; + stampCode = ANNOT_STAMP_FOR_PUBLIC_RELEASE; + extGStateDict = getForPublicReleaseStampExtGStateDict(doc); + } else if (!icon->cmp("TopSecret")) { + stampUnscaledWidth = ANNOT_STAMP_TOP_SECRET_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_TOP_SECRET_HEIGHT; + stampCode = ANNOT_STAMP_TOP_SECRET; + extGStateDict = getTopSecretStampExtGStateDict(doc); + } else { + stampUnscaledWidth = ANNOT_STAMP_DRAFT_WIDTH; + stampUnscaledHeight = ANNOT_STAMP_DRAFT_HEIGHT; + stampCode = ANNOT_STAMP_DRAFT; + extGStateDict = getDraftStampExtGStateDict(doc); + } + + const double bboxArray[4] = { 0, 0, rect->x2 - rect->x1, rect->y2 - rect->y1 }; + const std::unique_ptr scale = GooString::format("{0:.6g} 0 0 {1:.6g} 0 0 cm\nq\n", bboxArray[2] / stampUnscaledWidth, bboxArray[3] / stampUnscaledHeight); + defaultAppearanceBuilder.append(scale->c_str()); + defaultAppearanceBuilder.append(stampCode); + defaultAppearanceBuilder.append("Q\n"); + + Dict *resDict = new Dict(doc->getXRef()); + resDict->add("ExtGState", Object(extGStateDict)); + + Object aStream = createForm(defaultAppearanceBuilder.buffer(), bboxArray, true, resDict); + + AnnotAppearanceBuilder appearanceBuilder; + appearanceBuilder.append("/GS0 gs\n/Fm0 Do"); + resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", opacity, nullptr); + appearance = createForm(appearanceBuilder.buffer(), bboxArray, false, resDict); +} + +void AnnotStamp::draw(Gfx *gfx, bool printing) +{ + if (!isVisible(printing)) { + return; + } + + annotLocker(); + if (appearance.isNull()) { + if (stampImageHelper != nullptr) { + generateStampCustomAppearance(); + } else { + generateStampDefaultAppearance(); + } + } + + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + if (appearBBox) { + gfx->drawAnnot(&obj, nullptr, color.get(), appearBBox->getPageXMin(), appearBBox->getPageYMin(), appearBBox->getPageXMax(), appearBBox->getPageYMax(), getRotation()); + } else { + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); + } +} + +void AnnotStamp::setIcon(GooString *new_icon) +{ + if (new_icon) { + icon = std::make_unique(new_icon); + } else { + icon = std::make_unique(); + } + + update("Name", Object(objName, icon->c_str())); + invalidateAppearance(); +} + +void AnnotStamp::setCustomImage(AnnotStampImageHelper *stampImageHelperA) +{ + if (!stampImageHelperA) { + return; + } + + annotLocker(); + clearCustomImage(); + + stampImageHelper = stampImageHelperA; + generateStampCustomAppearance(); + + if (updatedAppearanceStream == Ref::INVALID()) { + updatedAppearanceStream = doc->getXRef()->addIndirectObject(appearance); + } else { + Object obj1 = appearance.fetch(doc->getXRef()); + doc->getXRef()->setModifiedObject(&obj1, updatedAppearanceStream); + } + + Object obj1 = Object(new Dict(doc->getXRef())); + obj1.dictAdd("N", Object(updatedAppearanceStream)); + update("AP", std::move(obj1)); +} + +void AnnotStamp::clearCustomImage() +{ + if (stampImageHelper != nullptr) { + stampImageHelper->removeAnnotStampImageObject(); + delete stampImageHelper; + stampImageHelper = nullptr; + invalidateAppearance(); + } +} + +//------------------------------------------------------------------------ +// AnnotGeometry +//------------------------------------------------------------------------ +AnnotGeometry::AnnotGeometry(PDFDoc *docA, PDFRectangle *rectA, AnnotSubtype subType) : AnnotMarkup(docA, rectA) +{ + switch (subType) { + case typeSquare: + annotObj.dictSet("Subtype", Object(objName, "Square")); + break; + case typeCircle: + annotObj.dictSet("Subtype", Object(objName, "Circle")); + break; + default: + assert(0 && "Invalid subtype for AnnotGeometry\n"); + } + + initialize(docA, annotObj.getDict()); +} + +AnnotGeometry::AnnotGeometry(PDFDoc *docA, Object &&dictObject, const Object *obj) : AnnotMarkup(docA, std::move(dictObject), obj) +{ + // the real type will be read in initialize() + type = typeSquare; + initialize(docA, annotObj.getDict()); +} + +AnnotGeometry::~AnnotGeometry() = default; + +void AnnotGeometry::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + obj1 = dict->lookup("Subtype"); + if (obj1.isName()) { + GooString typeName(obj1.getName()); + if (!typeName.cmp("Square")) { + type = typeSquare; + } else if (!typeName.cmp("Circle")) { + type = typeCircle; + } + } + + obj1 = dict->lookup("IC"); + if (obj1.isArray()) { + interiorColor = std::make_unique(obj1.getArray()); + } + + obj1 = dict->lookup("BS"); + if (obj1.isDict()) { + border = std::make_unique(obj1.getDict()); + } else if (!border) { + border = std::make_unique(); + } + + obj1 = dict->lookup("BE"); + if (obj1.isDict()) { + borderEffect = std::make_unique(obj1.getDict()); + } + + obj1 = dict->lookup("RD"); + if (obj1.isArray()) { + geometryRect = parseDiffRectangle(obj1.getArray(), rect.get()); + } +} + +void AnnotGeometry::setType(AnnotSubtype new_type) +{ + const char *typeName = nullptr; /* squelch bogus compiler warning */ + + switch (new_type) { + case typeSquare: + typeName = "Square"; + break; + case typeCircle: + typeName = "Circle"; + break; + default: + assert(!"Invalid subtype"); + } + + type = new_type; + update("Subtype", Object(objName, typeName)); + invalidateAppearance(); +} + +void AnnotGeometry::setInteriorColor(std::unique_ptr &&new_color) +{ + if (new_color) { + Object obj1 = new_color->writeToObject(doc->getXRef()); + update("IC", std::move(obj1)); + interiorColor = std::move(new_color); + } else { + interiorColor = nullptr; + update("IC", Object(objNull)); + } + invalidateAppearance(); +} + +void AnnotGeometry::draw(Gfx *gfx, bool printing) +{ + double ca = 1; + + if (!isVisible(printing)) { + return; + } + + annotLocker(); + if (appearance.isNull()) { + const bool fill = interiorColor && interiorColor->getSpace() != AnnotColor::colorTransparent; + ca = opacity; + + AnnotAppearanceBuilder appearBuilder; + appearBuilder.append("q\n"); + if (color) { + appearBuilder.setDrawColor(color.get(), false); + } + + double borderWidth = border->getWidth(); + appearBuilder.setLineStyleForBorder(border.get()); + + if (interiorColor) { + appearBuilder.setDrawColor(interiorColor.get(), true); + } + + if (type == typeSquare) { + appearBuilder.appendf("{0:.2f} {1:.2f} {2:.2f} {3:.2f} re\n", borderWidth / 2.0, borderWidth / 2.0, (rect->x2 - rect->x1) - borderWidth, (rect->y2 - rect->y1) - borderWidth); + if (fill) { + if (borderWidth > 0) { + appearBuilder.append("b\n"); + } else { + appearBuilder.append("f\n"); + } + } else if (borderWidth > 0) { + appearBuilder.append("S\n"); + } + } else { + const double rx { (rect->x2 - rect->x1) / 2. }; + const double ry { (rect->y2 - rect->y1) / 2. }; + const double bwHalf { borderWidth / 2.0 }; + appearBuilder.drawEllipse(rx, ry, rx - bwHalf, ry - bwHalf, fill, borderWidth > 0); + } + appearBuilder.append("Q\n"); + + double bbox[4]; + bbox[0] = bbox[1] = 0; + bbox[2] = rect->x2 - rect->x1; + bbox[3] = rect->y2 - rect->y1; + if (ca == 1) { + appearance = createForm(appearBuilder.buffer(), bbox, false, nullptr); + } else { + Object aStream = createForm(appearBuilder.buffer(), bbox, true, nullptr); + + GooString appearBuf("/GS0 gs\n/Fm0 Do"); + Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr); + appearance = createForm(&appearBuf, bbox, false, resDict); + } + } + + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); +} + +//------------------------------------------------------------------------ +// AnnotPolygon +//------------------------------------------------------------------------ +AnnotPolygon::AnnotPolygon(PDFDoc *docA, PDFRectangle *rectA, AnnotSubtype subType) : AnnotMarkup(docA, rectA) +{ + switch (subType) { + case typePolygon: + annotObj.dictSet("Subtype", Object(objName, "Polygon")); + break; + case typePolyLine: + annotObj.dictSet("Subtype", Object(objName, "PolyLine")); + break; + default: + assert(0 && "Invalid subtype for AnnotGeometry\n"); + } + + // Store dummy path with one null vertex only + Array *a = new Array(doc->getXRef()); + a->add(Object(0.)); + a->add(Object(0.)); + annotObj.dictSet("Vertices", Object(a)); + + initialize(docA, annotObj.getDict()); +} + +AnnotPolygon::AnnotPolygon(PDFDoc *docA, Object &&dictObject, const Object *obj) : AnnotMarkup(docA, std::move(dictObject), obj) +{ + // the real type will be read in initialize() + type = typePolygon; + initialize(docA, annotObj.getDict()); +} + +AnnotPolygon::~AnnotPolygon() = default; + +void AnnotPolygon::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + obj1 = dict->lookup("Subtype"); + if (obj1.isName()) { + GooString typeName(obj1.getName()); + if (!typeName.cmp("Polygon")) { + type = typePolygon; + } else if (!typeName.cmp("PolyLine")) { + type = typePolyLine; + } + } + + obj1 = dict->lookup("Vertices"); + if (obj1.isArray()) { + vertices = std::make_unique(obj1.getArray()); + } else { + vertices = std::make_unique(); + error(errSyntaxError, -1, "Bad Annot Polygon Vertices"); + ok = false; + } + + obj1 = dict->lookup("LE"); + if (obj1.isArray() && obj1.arrayGetLength() == 2) { + Object obj2 = obj1.arrayGet(0); + if (obj2.isName()) { + const GooString leName(obj2.getName()); + startStyle = parseAnnotLineEndingStyle(&leName); + } else { + startStyle = annotLineEndingNone; + } + obj2 = obj1.arrayGet(1); + if (obj2.isName()) { + const GooString leName(obj2.getName()); + endStyle = parseAnnotLineEndingStyle(&leName); + } else { + endStyle = annotLineEndingNone; + } + } else { + startStyle = endStyle = annotLineEndingNone; + } + + obj1 = dict->lookup("IC"); + if (obj1.isArray()) { + interiorColor = std::make_unique(obj1.getArray()); + } + + obj1 = dict->lookup("BS"); + if (obj1.isDict()) { + border = std::make_unique(obj1.getDict()); + } else if (!border) { + border = std::make_unique(); + } + + obj1 = dict->lookup("BE"); + if (obj1.isDict()) { + borderEffect = std::make_unique(obj1.getDict()); + } + + obj1 = dict->lookup("IT"); + if (obj1.isName()) { + const char *intentName = obj1.getName(); + + if (!strcmp(intentName, "PolygonCloud")) { + intent = polygonCloud; + } else if (!strcmp(intentName, "PolyLineDimension")) { + intent = polylineDimension; + } else { + intent = polygonDimension; + } + } else { + intent = polygonCloud; + } +} + +void AnnotPolygon::setType(AnnotSubtype new_type) +{ + const char *typeName = nullptr; /* squelch bogus compiler warning */ + + switch (new_type) { + case typePolygon: + typeName = "Polygon"; + break; + case typePolyLine: + typeName = "PolyLine"; + break; + default: + assert(!"Invalid subtype"); + } + + type = new_type; + update("Subtype", Object(objName, typeName)); + invalidateAppearance(); +} + +void AnnotPolygon::setVertices(AnnotPath *path) +{ + Array *a = new Array(doc->getXRef()); + for (int i = 0; i < path->getCoordsLength(); i++) { + a->add(Object(path->getX(i))); + a->add(Object(path->getY(i))); + } + + vertices = std::make_unique(a); + + update("Vertices", Object(a)); + invalidateAppearance(); +} + +void AnnotPolygon::setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyle end) +{ + startStyle = start; + endStyle = end; + + Array *a = new Array(doc->getXRef()); + a->add(Object(objName, convertAnnotLineEndingStyle(startStyle))); + a->add(Object(objName, convertAnnotLineEndingStyle(endStyle))); + + update("LE", Object(a)); + invalidateAppearance(); +} + +void AnnotPolygon::setInteriorColor(std::unique_ptr &&new_color) +{ + if (new_color) { + Object obj1 = new_color->writeToObject(doc->getXRef()); + update("IC", std::move(obj1)); + interiorColor = std::move(new_color); + } else { + interiorColor = nullptr; + update("IC", Object(objNull)); + } + invalidateAppearance(); +} + +void AnnotPolygon::setIntent(AnnotPolygonIntent new_intent) +{ + const char *intentName; + + intent = new_intent; + if (new_intent == polygonCloud) { + intentName = "PolygonCloud"; + } else if (new_intent == polylineDimension) { + intentName = "PolyLineDimension"; + } else { // polygonDimension + intentName = "PolygonDimension"; + } + update("IT", Object(objName, intentName)); +} + +void AnnotPolygon::generatePolyLineAppearance(AnnotAppearanceBuilder *appearBuilder) +{ + const bool fill = (bool)interiorColor; + const double x1 = vertices->getX(0); + const double y1 = vertices->getY(0); + const double x2 = vertices->getX(1); + const double y2 = vertices->getY(1); + const double x3 = vertices->getX(vertices->getCoordsLength() - 2); + const double y3 = vertices->getY(vertices->getCoordsLength() - 2); + const double x4 = vertices->getX(vertices->getCoordsLength() - 1); + const double y4 = vertices->getY(vertices->getCoordsLength() - 1); + + const double len_1 = sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)); + // length of last segment + const double len_2 = sqrt((x4 - x3) * (x4 - x3) + (y4 - y3) * (y4 - y3)); + + // segments become positive x direction, coord1 becomes (0,0). + Matrix matr1, matr2; + const double angle1 = atan2(y2 - y1, x2 - x1); + const double angle2 = atan2(y4 - y3, x4 - x3); + + matr1.m[0] = matr1.m[3] = cos(angle1); + matr1.m[1] = sin(angle1); + matr1.m[2] = -matr1.m[1]; + matr1.m[4] = x1 - rect->x1; + matr1.m[5] = y1 - rect->y1; + + matr2.m[0] = matr2.m[3] = cos(angle2); + matr2.m[1] = sin(angle2); + matr2.m[2] = -matr2.m[1]; + matr2.m[4] = x3 - rect->x1; + matr2.m[5] = y3 - rect->y1; + + const double lineEndingSize1 { std::min(6. * border->getWidth(), len_1 / 2) }; + const double lineEndingSize2 { std::min(6. * border->getWidth(), len_2 / 2) }; + + if (vertices->getCoordsLength() != 0) { + double tx, ty; + matr1.transform(AnnotAppearanceBuilder::lineEndingXShorten(startStyle, lineEndingSize1), 0, &tx, &ty); + appearBuilder->appendf("{0:.2f} {1:.2f} m\n", tx, ty); + appearBBox->extendTo(tx, ty); + + for (int i = 1; i < vertices->getCoordsLength() - 1; ++i) { + appearBuilder->appendf("{0:.2f} {1:.2f} l\n", vertices->getX(i) - rect->x1, vertices->getY(i) - rect->y1); + appearBBox->extendTo(vertices->getX(i) - rect->x1, vertices->getY(i) - rect->y1); + } + + if (vertices->getCoordsLength() > 1) { + matr2.transform(len_2 - AnnotAppearanceBuilder::lineEndingXShorten(endStyle, lineEndingSize2), 0, &tx, &ty); + appearBuilder->appendf("{0:.2f} {1:.2f} l S\n", tx, ty); + appearBBox->extendTo(tx, ty); + } + } + + if (startStyle != annotLineEndingNone) { + const double extendX { -AnnotAppearanceBuilder::lineEndingXExtendBBox(startStyle, lineEndingSize1) }; + double tx, ty; + appearBuilder->drawLineEnding(startStyle, 0, 0, -lineEndingSize1, fill, matr1); + matr1.transform(extendX, lineEndingSize1 / 2., &tx, &ty); + appearBBox->extendTo(tx, ty); + matr1.transform(extendX, -lineEndingSize1 / 2., &tx, &ty); + appearBBox->extendTo(tx, ty); + } + + if (endStyle != annotLineEndingNone) { + const double extendX { AnnotAppearanceBuilder::lineEndingXExtendBBox(endStyle, lineEndingSize2) }; + double tx, ty; + appearBuilder->drawLineEnding(endStyle, len_2, 0, lineEndingSize2, fill, matr2); + matr2.transform(len_2 + extendX, lineEndingSize2 / 2., &tx, &ty); + appearBBox->extendTo(tx, ty); + matr2.transform(len_2 + extendX, -lineEndingSize2 / 2., &tx, &ty); + appearBBox->extendTo(tx, ty); + } +} + +void AnnotPolygon::draw(Gfx *gfx, bool printing) +{ + double ca = 1; + + if (!isVisible(printing)) { + return; + } + + annotLocker(); + if (appearance.isNull()) { + appearBBox = std::make_unique(rect.get()); + ca = opacity; + + AnnotAppearanceBuilder appearBuilder; + appearBuilder.append("q\n"); + + if (color) { + appearBuilder.setDrawColor(color.get(), false); + } + + appearBuilder.setLineStyleForBorder(border.get()); + appearBBox->setBorderWidth(std::max(1., border->getWidth())); + + if (interiorColor) { + appearBuilder.setDrawColor(interiorColor.get(), true); + } + + if (type == typePolyLine) { + generatePolyLineAppearance(&appearBuilder); + } else { + if (vertices->getCoordsLength() != 0) { + appearBuilder.appendf("{0:.2f} {1:.2f} m\n", vertices->getX(0) - rect->x1, vertices->getY(0) - rect->y1); + appearBBox->extendTo(vertices->getX(0) - rect->x1, vertices->getY(0) - rect->y1); + + for (int i = 1; i < vertices->getCoordsLength(); ++i) { + appearBuilder.appendf("{0:.2f} {1:.2f} l\n", vertices->getX(i) - rect->x1, vertices->getY(i) - rect->y1); + appearBBox->extendTo(vertices->getX(i) - rect->x1, vertices->getY(i) - rect->y1); + } + + const double borderWidth = border->getWidth(); + if (interiorColor && interiorColor->getSpace() != AnnotColor::colorTransparent) { + if (borderWidth > 0) { + appearBuilder.append("b\n"); + } else { + appearBuilder.append("f\n"); + } + } else if (borderWidth > 0) { + appearBuilder.append("s\n"); + } + } + } + appearBuilder.append("Q\n"); + + double bbox[4]; + appearBBox->getBBoxRect(bbox); + if (ca == 1) { + appearance = createForm(appearBuilder.buffer(), bbox, false, nullptr); + } else { + Object aStream = createForm(appearBuilder.buffer(), bbox, true, nullptr); + + GooString appearBuf("/GS0 gs\n/Fm0 Do"); + Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr); + appearance = createForm(&appearBuf, bbox, false, resDict); + } + } + + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + if (appearBBox) { + gfx->drawAnnot(&obj, nullptr, color.get(), appearBBox->getPageXMin(), appearBBox->getPageYMin(), appearBBox->getPageXMax(), appearBBox->getPageYMax(), getRotation()); + } else { + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); + } +} + +//------------------------------------------------------------------------ +// AnnotCaret +//------------------------------------------------------------------------ +AnnotCaret::AnnotCaret(PDFDoc *docA, PDFRectangle *rectA) : AnnotMarkup(docA, rectA) +{ + type = typeCaret; + + annotObj.dictSet("Subtype", Object(objName, "Caret")); + initialize(docA, annotObj.getDict()); +} + +AnnotCaret::AnnotCaret(PDFDoc *docA, Object &&dictObject, const Object *obj) : AnnotMarkup(docA, std::move(dictObject), obj) +{ + type = typeCaret; + initialize(docA, annotObj.getDict()); +} + +AnnotCaret::~AnnotCaret() = default; + +void AnnotCaret::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + symbol = symbolNone; + obj1 = dict->lookup("Sy"); + if (obj1.isName()) { + GooString typeName(obj1.getName()); + if (!typeName.cmp("P")) { + symbol = symbolP; + } else if (!typeName.cmp("None")) { + symbol = symbolNone; + } + } + + obj1 = dict->lookup("RD"); + if (obj1.isArray()) { + caretRect = parseDiffRectangle(obj1.getArray(), rect.get()); + } +} + +void AnnotCaret::setSymbol(AnnotCaretSymbol new_symbol) +{ + symbol = new_symbol; + update("Sy", Object(objName, new_symbol == symbolP ? "P" : "None")); + invalidateAppearance(); +} + +//------------------------------------------------------------------------ +// AnnotInk +//------------------------------------------------------------------------ +AnnotInk::AnnotInk(PDFDoc *docA, PDFRectangle *rectA) : AnnotMarkup(docA, rectA) +{ + type = typeInk; + + annotObj.dictSet("Subtype", Object(objName, "Ink")); + + // Store dummy path with one null vertex only + Array *inkListArray = new Array(doc->getXRef()); + Array *vList = new Array(doc->getXRef()); + vList->add(Object(0.)); + vList->add(Object(0.)); + inkListArray->add(Object(vList)); + annotObj.dictSet("InkList", Object(inkListArray)); + + initialize(docA, annotObj.getDict()); +} + +AnnotInk::AnnotInk(PDFDoc *docA, Object &&dictObject, const Object *obj) : AnnotMarkup(docA, std::move(dictObject), obj) +{ + type = typeInk; + initialize(docA, annotObj.getDict()); +} + +AnnotInk::~AnnotInk() +{ + freeInkList(); +} + +void AnnotInk::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1; + + obj1 = dict->lookup("InkList"); + if (obj1.isArray()) { + parseInkList(obj1.getArray()); + } else { + inkListLength = 0; + inkList = nullptr; + error(errSyntaxError, -1, "Bad Annot Ink List"); + + obj1 = dict->lookup("AP"); + // Although InkList is required, it should be ignored + // when there is an AP entry in the Annot, so do not fail + // when that happens + if (!obj1.isDict()) { + ok = false; + } + } + + obj1 = dict->lookup("BS"); + if (obj1.isDict()) { + border = std::make_unique(obj1.getDict()); + } else if (!border) { + border = std::make_unique(); + } +} + +void AnnotInk::writeInkList(AnnotPath **paths, int n_paths, Array *dest_array) +{ + for (int i = 0; i < n_paths; ++i) { + AnnotPath *path = paths[i]; + Array *a = new Array(doc->getXRef()); + for (int j = 0; j < path->getCoordsLength(); ++j) { + a->add(Object(path->getX(j))); + a->add(Object(path->getY(j))); + } + dest_array->add(Object(a)); + } +} + +void AnnotInk::parseInkList(Array *array) +{ + inkListLength = array->getLength(); + inkList = (AnnotPath **)gmallocn((inkListLength), sizeof(AnnotPath *)); + memset(inkList, 0, inkListLength * sizeof(AnnotPath *)); + for (int i = 0; i < inkListLength; i++) { + Object obj2 = array->get(i); + if (obj2.isArray()) { + inkList[i] = new AnnotPath(obj2.getArray()); + } + } +} + +void AnnotInk::freeInkList() +{ + if (inkList) { + for (int i = 0; i < inkListLength; ++i) { + delete inkList[i]; + } + gfree(inkList); + } +} + +void AnnotInk::setInkList(AnnotPath **paths, int n_paths) +{ + freeInkList(); + + Array *a = new Array(doc->getXRef()); + writeInkList(paths, n_paths, a); + + parseInkList(a); + annotObj.dictSet("InkList", Object(a)); + invalidateAppearance(); +} + +void AnnotInk::draw(Gfx *gfx, bool printing) +{ + double ca = 1; + + if (!isVisible(printing)) { + return; + } + + annotLocker(); + if (appearance.isNull()) { + appearBBox = std::make_unique(rect.get()); + ca = opacity; + + AnnotAppearanceBuilder appearBuilder; + appearBuilder.append("q\n"); + + if (color) { + appearBuilder.setDrawColor(color.get(), false); + } + + appearBuilder.setLineStyleForBorder(border.get()); + appearBBox->setBorderWidth(std::max(1., border->getWidth())); + + for (int i = 0; i < inkListLength; ++i) { + const AnnotPath *path = inkList[i]; + if (path && path->getCoordsLength() != 0) { + appearBuilder.appendf("{0:.2f} {1:.2f} m\n", path->getX(0) - rect->x1, path->getY(0) - rect->y1); + appearBBox->extendTo(path->getX(0) - rect->x1, path->getY(0) - rect->y1); + + for (int j = 1; j < path->getCoordsLength(); ++j) { + appearBuilder.appendf("{0:.2f} {1:.2f} l\n", path->getX(j) - rect->x1, path->getY(j) - rect->y1); + appearBBox->extendTo(path->getX(j) - rect->x1, path->getY(j) - rect->y1); + } + + appearBuilder.append("S\n"); + } + } + + appearBuilder.append("Q\n"); + + double bbox[4]; + appearBBox->getBBoxRect(bbox); + if (ca == 1) { + appearance = createForm(appearBuilder.buffer(), bbox, false, nullptr); + } else { + Object aStream = createForm(appearBuilder.buffer(), bbox, true, nullptr); + + GooString appearBuf("/GS0 gs\n/Fm0 Do"); + Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr); + appearance = createForm(&appearBuf, bbox, false, resDict); + } + } + + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + if (appearBBox) { + gfx->drawAnnot(&obj, nullptr, color.get(), appearBBox->getPageXMin(), appearBBox->getPageYMin(), appearBBox->getPageXMax(), appearBBox->getPageYMax(), getRotation()); + } else { + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); + } +} + +//------------------------------------------------------------------------ +// AnnotFileAttachment +//------------------------------------------------------------------------ +AnnotFileAttachment::AnnotFileAttachment(PDFDoc *docA, PDFRectangle *rectA, GooString *filename) : AnnotMarkup(docA, rectA) +{ + type = typeFileAttachment; + + annotObj.dictSet("Subtype", Object(objName, "FileAttachment")); + annotObj.dictSet("FS", Object(filename->copy())); + + initialize(docA, annotObj.getDict()); +} + +AnnotFileAttachment::AnnotFileAttachment(PDFDoc *docA, Object &&dictObject, const Object *obj) : AnnotMarkup(docA, std::move(dictObject), obj) +{ + type = typeFileAttachment; + initialize(docA, annotObj.getDict()); +} + +AnnotFileAttachment::~AnnotFileAttachment() = default; + +void AnnotFileAttachment::initialize(PDFDoc *docA, Dict *dict) +{ + Object objFS = dict->lookup("FS"); + if (objFS.isDict() || objFS.isString()) { + file = std::move(objFS); + } else { + error(errSyntaxError, -1, "Bad Annot File Attachment"); + ok = false; + } + + Object objName = dict->lookup("Name"); + if (objName.isName()) { + name = std::make_unique(objName.getName()); + } else { + name = std::make_unique("PushPin"); + } +} + +#define ANNOT_FILE_ATTACHMENT_AP_PUSHPIN \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 2 w\n" \ + "1 J\n" \ + "1 j\n" \ + "[] 0.0 d\n" \ + "4 M 5 4 m 6 5 l S\n" \ + "2 w\n" \ + "11 14 m 9 12 l 6 12 l 13 5 l 13 8 l 15 10 l 18 11 l 20 11 l 12 19 l 12\n" \ + "17 l 11 14 l h\n" \ + "11 14 m S\n" \ + "3 w\n" \ + "6 5 m 9 8 l S\n" \ + "0.729412 0.741176 0.713725 RG 2 w\n" \ + "5 5 m 6 6 l S\n" \ + "2 w\n" \ + "11 15 m 9 13 l 6 13 l 13 6 l 13 9 l 15 11 l 18 12 l 20 12 l 12 20 l 12\n" \ + "18 l 11 15 l h\n" \ + "11 15 m S\n" \ + "3 w\n" \ + "6 6 m 9 9 l S\n" + +#define ANNOT_FILE_ATTACHMENT_AP_PAPERCLIP \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 2 w\n" \ + "1 J\n" \ + "1 j\n" \ + "[] 0.0 d\n" \ + "4 M 16.645 12.035 m 12.418 7.707 l 10.902 6.559 6.402 11.203 8.09 12.562 c\n" \ + "14.133 18.578 l 14.949 19.387 16.867 19.184 17.539 18.465 c 20.551\n" \ + "15.23 l 21.191 14.66 21.336 12.887 20.426 12.102 c 13.18 4.824 l 12.18\n" \ + "3.82 6.25 2.566 4.324 4.461 c 3 6.395 3.383 11.438 4.711 12.801 c 9.648\n" \ + "17.887 l S\n" \ + "0.729412 0.741176 0.713725 RG 16.645 13.035 m 12.418 8.707 l\n" \ + "10.902 7.559 6.402 12.203 8.09 13.562 c\n" \ + "14.133 19.578 l 14.949 20.387 16.867 20.184 17.539 19.465 c 20.551\n" \ + "16.23 l 21.191 15.66 21.336 13.887 20.426 13.102 c 13.18 5.824 l 12.18\n" \ + "4.82 6.25 3.566 4.324 5.461 c 3 7.395 3.383 12.438 4.711 13.801 c 9.648\n" \ + "18.887 l S\n" + +#define ANNOT_FILE_ATTACHMENT_AP_GRAPH \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 1 w\n" \ + "1 J\n" \ + "0 j\n" \ + "[] 0.0 d\n" \ + "4 M 18.5 15.5 m 18.5 13.086 l 16.086 15.5 l 18.5 15.5 l h\n" \ + "18.5 15.5 m S\n" \ + "7 7 m 10 11 l 13 9 l 18 15 l S\n" \ + "0.729412 0.741176 0.713725 RG 7 8 m 10 12 l 13 10 l 18 16 l S\n" \ + "18.5 16.5 m 18.5 14.086 l 16.086 16.5 l 18.5 16.5 l h\n" \ + "18.5 16.5 m S\n" \ + "0.533333 0.541176 0.521569 RG 2 w\n" \ + "1 j\n" \ + "3 19 m 3 3 l 21 3 l S\n" \ + "0.729412 0.741176 0.713725 RG 3 20 m 3 4 l 21 4 l S\n" + +#define ANNOT_FILE_ATTACHMENT_AP_TAG \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 0.999781 w\n" \ + "1 J\n" \ + "1 j\n" \ + "[] 0.0 d\n" \ + "4 M q 1 0 0 -1 0 24 cm\n" \ + "8.492 8.707 m 8.492 9.535 7.82 10.207 6.992 10.207 c 6.164 10.207 5.492\n" \ + "9.535 5.492 8.707 c 5.492 7.879 6.164 7.207 6.992 7.207 c 7.82 7.207\n" \ + "8.492 7.879 8.492 8.707 c h\n" \ + "8.492 8.707 m S Q\n" \ + "2 w\n" \ + "20.078 11.414 m 20.891 10.602 20.785 9.293 20.078 8.586 c 14.422 2.93 l\n" \ + "13.715 2.223 12.301 2.223 11.594 2.93 c 3.816 10.707 l 3.109 11.414\n" \ + "2.402 17.781 3.816 19.195 c 5.23 20.609 11.594 19.902 12.301 19.195 c\n" \ + "20.078 11.414 l h\n" \ + "20.078 11.414 m S\n" \ + "0.729412 0.741176 0.713725 RG 20.078 12.414 m\n" \ + "20.891 11.605 20.785 10.293 20.078 9.586 c 14.422 3.93 l\n" \ + "13.715 3.223 12.301 3.223 11.594 3.93 c 3.816 11.707 l 3.109 12.414\n" \ + "2.402 18.781 3.816 20.195 c 5.23 21.609 11.594 20.902 12.301 20.195 c\n" \ + "20.078 12.414 l h\n" \ + "20.078 12.414 m S\n" \ + "0.533333 0.541176 0.521569 RG 1 w\n" \ + "0 j\n" \ + "11.949 13.184 m 16.191 8.941 l S\n" \ + "0.729412 0.741176 0.713725 RG 11.949 14.184 m 16.191 9.941 l S\n" \ + "0.533333 0.541176 0.521569 RG 14.07 6.82 m 9.828 11.062 l S\n" \ + "0.729412 0.741176 0.713725 RG 14.07 7.82 m 9.828 12.062 l S\n" \ + "0.533333 0.541176 0.521569 RG 6.93 15.141 m 8 20 14.27 20.5 16 20.5 c\n" \ + "18.094 20.504 19.5 20 19.5 18 c 19.5 16.699 20.91 16.418 22.5 16.5 c S\n" \ + "0.729412 0.741176 0.713725 RG 0.999781 w\n" \ + "1 j\n" \ + "q 1 0 0 -1 0 24 cm\n" \ + "8.492 7.707 m 8.492 8.535 7.82 9.207 6.992 9.207 c 6.164 9.207 5.492\n" \ + "8.535 5.492 7.707 c 5.492 6.879 6.164 6.207 6.992 6.207 c 7.82 6.207\n" \ + "8.492 6.879 8.492 7.707 c h\n" \ + "8.492 7.707 m S Q\n" \ + "1 w\n" \ + "0 j\n" \ + "6.93 16.141 m 8 21 14.27 21.5 16 21.5 c 18.094 21.504 19.5 21 19.5 19 c\n" \ + "19.5 17.699 20.91 17.418 22.5 17.5 c S\n" + +void AnnotFileAttachment::draw(Gfx *gfx, bool printing) +{ + double ca = 1; + + if (!isVisible(printing)) { + return; + } + + annotLocker(); + if (appearance.isNull()) { + ca = opacity; + + AnnotAppearanceBuilder appearBuilder; + + appearBuilder.append("q\n"); + if (color) { + appearBuilder.setDrawColor(color.get(), true); + } else { + appearBuilder.append("1 1 1 rg\n"); + } + if (!name->cmp("PushPin")) { + appearBuilder.append(ANNOT_FILE_ATTACHMENT_AP_PUSHPIN); + } else if (!name->cmp("Paperclip")) { + appearBuilder.append(ANNOT_FILE_ATTACHMENT_AP_PAPERCLIP); + } else if (!name->cmp("Graph")) { + appearBuilder.append(ANNOT_FILE_ATTACHMENT_AP_GRAPH); + } else if (!name->cmp("Tag")) { + appearBuilder.append(ANNOT_FILE_ATTACHMENT_AP_TAG); + } + appearBuilder.append("Q\n"); + + double bbox[4]; + bbox[0] = bbox[1] = 0; + bbox[2] = bbox[3] = 24; + if (ca == 1) { + appearance = createForm(appearBuilder.buffer(), bbox, false, nullptr); + } else { + Object aStream = createForm(appearBuilder.buffer(), bbox, true, nullptr); + + GooString appearBuf("/GS0 gs\n/Fm0 Do"); + Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr); + appearance = createForm(&appearBuf, bbox, false, resDict); + } + } + + // draw the appearance stream + Object obj = appearance.fetch(gfx->getXRef()); + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); +} + +//------------------------------------------------------------------------ +// AnnotSound +//------------------------------------------------------------------------ +AnnotSound::AnnotSound(PDFDoc *docA, PDFRectangle *rectA, Sound *soundA) : AnnotMarkup(docA, rectA) +{ + type = typeSound; + + annotObj.dictSet("Subtype", Object(objName, "Sound")); + annotObj.dictSet("Sound", soundA->getObject()->copy()); + + initialize(docA, annotObj.getDict()); +} + +AnnotSound::AnnotSound(PDFDoc *docA, Object &&dictObject, const Object *obj) : AnnotMarkup(docA, std::move(dictObject), obj) +{ + type = typeSound; + initialize(docA, annotObj.getDict()); +} + +AnnotSound::~AnnotSound() = default; + +void AnnotSound::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1 = dict->lookup("Sound"); + + sound = Sound::parseSound(&obj1); + if (!sound) { + error(errSyntaxError, -1, "Bad Annot Sound"); + ok = false; + } + + obj1 = dict->lookup("Name"); + if (obj1.isName()) { + name = std::make_unique(obj1.getName()); + } else { + name = std::make_unique("Speaker"); + } +} + +#define ANNOT_SOUND_AP_SPEAKER \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 2 w\n" \ + "0 J\n" \ + "1 j\n" \ + "[] 0.0 d\n" \ + "4 M 4 14 m 4.086 8.043 l 7 8 l 11 4 l 11 18 l 7 14 l 4 14 l h\n" \ + "4 14 m S\n" \ + "1 w\n" \ + "1 J\n" \ + "0 j\n" \ + "13.699 15.398 m 14.699 13.398 14.699 9.398 13.699 7.398 c S\n" \ + "18.199 19.398 m 21.199 17.398 21.199 5.398 18.199 3.398 c S\n" \ + "16 17.398 m 18 16.398 18 7.398 16 5.398 c S\n" \ + "0.729412 0.741176 0.713725 RG 2 w\n" \ + "0 J\n" \ + "1 j\n" \ + "4 15 m 4.086 9.043 l 7 9 l 11 5 l 11 19 l 7 15 l 4 15 l h\n" \ + "4 15 m S\n" \ + "1 w\n" \ + "1 J\n" \ + "0 j\n" \ + "13.699 16 m 14.699 14 14.699 10 13.699 8 c S\n" \ + "18.199 20 m 21.199 18 21.199 6 18.199 4 c S\n" \ + "16 18 m 18 17 18 8 16 6 c S\n" + +#define ANNOT_SOUND_AP_MIC \ + "4.301 23 m 19.699 23 l 21.523 23 23 21.523 23 19.699 c 23 4.301 l 23\n" \ + "2.477 21.523 1 19.699 1 c 4.301 1 l 2.477 1 1 2.477 1 4.301 c 1 19.699\n" \ + "l 1 21.523 2.477 23 4.301 23 c h\n" \ + "4.301 23 m f\n" \ + "0.533333 0.541176 0.521569 RG 2 w\n" \ + "1 J\n" \ + "0 j\n" \ + "[] 0.0 d\n" \ + "4 M 12 20 m 12 20 l 13.656 20 15 18.656 15 17 c 15 13 l 15 11.344 13.656 10\n" \ + "12 10 c 12 10 l 10.344 10 9 11.344 9 13 c 9 17 l 9 18.656 10.344 20 12\n" \ + "20 c h\n" \ + "12 20 m S\n" \ + "1 w\n" \ + "17.5 14.5 m 17.5 11.973 l 17.5 8.941 15.047 6.5 12 6.5 c 8.953 6.5 6.5\n" \ + "8.941 6.5 11.973 c 6.5 14.5 l S\n" \ + "2 w\n" \ + "0 J\n" \ + "12 6.52 m 12 3 l S\n" \ + "1 J\n" \ + "8 3 m 16 3 l S\n" \ + "0.729412 0.741176 0.713725 RG 12 21 m 12 21 l 13.656 21 15 19.656 15 18 c\n" \ + "15 14 l 15 12.344 13.656 11 12 11 c 12 11 l 10.344 11 9 12.344 9 14 c\n" \ + "9 18 l 9 19.656 10.344 21 12 21 c h\n" \ + "12 21 m S\n" \ + "1 w\n" \ + "17.5 15.5 m 17.5 12.973 l 17.5 9.941 15.047 7.5 12 7.5 c 8.953 7.5 6.5\n" \ + "9.941 6.5 12.973 c 6.5 15.5 l S\n" \ + "2 w\n" \ + "0 J\n" \ + "12 7.52 m 12 4 l S\n" \ + "1 J\n" \ + "8 4 m 16 4 l S\n" + +void AnnotSound::draw(Gfx *gfx, bool printing) +{ + Object obj; + double ca = 1; + + if (!isVisible(printing)) { + return; + } + + annotLocker(); + if (appearance.isNull()) { + ca = opacity; + + AnnotAppearanceBuilder appearBuilder; + + appearBuilder.append("q\n"); + if (color) { + appearBuilder.setDrawColor(color.get(), true); + } else { + appearBuilder.append("1 1 1 rg\n"); + } + if (!name->cmp("Speaker")) { + appearBuilder.append(ANNOT_SOUND_AP_SPEAKER); + } else if (!name->cmp("Mic")) { + appearBuilder.append(ANNOT_SOUND_AP_MIC); + } + appearBuilder.append("Q\n"); + + double bbox[4]; + bbox[0] = bbox[1] = 0; + bbox[2] = bbox[3] = 24; + if (ca == 1) { + appearance = createForm(appearBuilder.buffer(), bbox, false, nullptr); + } else { + Object aStream = createForm(appearBuilder.buffer(), bbox, true, nullptr); + + GooString appearBuf("/GS0 gs\n/Fm0 Do"); + Dict *resDict = createResourcesDict("Fm0", std::move(aStream), "GS0", ca, nullptr); + appearance = createForm(&appearBuf, bbox, false, resDict); + } + } + + // draw the appearance stream + obj = appearance.fetch(gfx->getXRef()); + gfx->drawAnnot(&obj, nullptr, color.get(), rect->x1, rect->y1, rect->x2, rect->y2, getRotation()); +} + +//------------------------------------------------------------------------ +// Annot3D +//------------------------------------------------------------------------ +Annot3D::Annot3D(PDFDoc *docA, PDFRectangle *rectA) : Annot(docA, rectA) +{ + type = type3D; + + annotObj.dictSet("Subtype", Object(objName, "3D")); + + initialize(docA, annotObj.getDict()); +} + +Annot3D::Annot3D(PDFDoc *docA, Object &&dictObject, const Object *obj) : Annot(docA, std::move(dictObject), obj) +{ + type = type3D; + initialize(docA, annotObj.getDict()); +} + +Annot3D::~Annot3D() = default; + +void Annot3D::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1 = dict->lookup("3DA"); + if (obj1.isDict()) { + activation = std::make_unique(obj1.getDict()); + } +} + +Annot3D::Activation::Activation(Dict *dict) +{ + Object obj1; + + obj1 = dict->lookup("A"); + if (obj1.isName()) { + const char *name = obj1.getName(); + + if (!strcmp(name, "PO")) { + aTrigger = aTriggerPageOpened; + } else if (!strcmp(name, "PV")) { + aTrigger = aTriggerPageVisible; + } else if (!strcmp(name, "XA")) { + aTrigger = aTriggerUserAction; + } else { + aTrigger = aTriggerUnknown; + } + } else { + aTrigger = aTriggerUnknown; + } + + obj1 = dict->lookup("AIS"); + if (obj1.isName()) { + const char *name = obj1.getName(); + + if (!strcmp(name, "I")) { + aState = aStateEnabled; + } else if (!strcmp(name, "L")) { + aState = aStateDisabled; + } else { + aState = aStateUnknown; + } + } else { + aState = aStateUnknown; + } + + obj1 = dict->lookup("D"); + if (obj1.isName()) { + const char *name = obj1.getName(); + + if (!strcmp(name, "PC")) { + dTrigger = dTriggerPageClosed; + } else if (!strcmp(name, "PI")) { + dTrigger = dTriggerPageInvisible; + } else if (!strcmp(name, "XD")) { + dTrigger = dTriggerUserAction; + } else { + dTrigger = dTriggerUnknown; + } + } else { + dTrigger = dTriggerUnknown; + } + + obj1 = dict->lookup("DIS"); + if (obj1.isName()) { + const char *name = obj1.getName(); + + if (!strcmp(name, "U")) { + dState = dStateUninstantiaded; + } else if (!strcmp(name, "I")) { + dState = dStateInstantiated; + } else if (!strcmp(name, "L")) { + dState = dStateLive; + } else { + dState = dStateUnknown; + } + } else { + dState = dStateUnknown; + } + + displayToolbar = dict->lookup("TB").getBoolWithDefaultValue(true); + + displayNavigation = dict->lookup("NP").getBoolWithDefaultValue(false); +} + +//------------------------------------------------------------------------ +// AnnotRichMedia +//------------------------------------------------------------------------ +AnnotRichMedia::AnnotRichMedia(PDFDoc *docA, PDFRectangle *rectA) : Annot(docA, rectA) +{ + type = typeRichMedia; + + annotObj.dictSet("Subtype", Object(objName, "RichMedia")); + + initialize(docA, annotObj.getDict()); +} + +AnnotRichMedia::AnnotRichMedia(PDFDoc *docA, Object &&dictObject, const Object *obj) : Annot(docA, std::move(dictObject), obj) +{ + type = typeRichMedia; + initialize(docA, annotObj.getDict()); +} + +AnnotRichMedia::~AnnotRichMedia() = default; + +void AnnotRichMedia::initialize(PDFDoc *docA, Dict *dict) +{ + Object obj1 = dict->lookup("RichMediaContent"); + if (obj1.isDict()) { + content = std::make_unique(obj1.getDict()); + } + + obj1 = dict->lookup("RichMediaSettings"); + if (obj1.isDict()) { + settings = std::make_unique(obj1.getDict()); + } +} + +AnnotRichMedia::Content *AnnotRichMedia::getContent() const +{ + return content.get(); +} + +AnnotRichMedia::Settings *AnnotRichMedia::getSettings() const +{ + return settings.get(); +} + +AnnotRichMedia::Settings::Settings(Dict *dict) +{ + Object obj1 = dict->lookup("Activation"); + if (obj1.isDict()) { + activation = std::make_unique(obj1.getDict()); + } + + obj1 = dict->lookup("Deactivation"); + if (obj1.isDict()) { + deactivation = std::make_unique(obj1.getDict()); + } +} + +AnnotRichMedia::Settings::~Settings() = default; + +AnnotRichMedia::Activation *AnnotRichMedia::Settings::getActivation() const +{ + return activation.get(); +} + +AnnotRichMedia::Deactivation *AnnotRichMedia::Settings::getDeactivation() const +{ + return deactivation.get(); +} + +AnnotRichMedia::Activation::Activation(Dict *dict) +{ + Object obj1 = dict->lookup("Condition"); + if (obj1.isName()) { + const char *name = obj1.getName(); + + if (!strcmp(name, "PO")) { + condition = conditionPageOpened; + } else if (!strcmp(name, "PV")) { + condition = conditionPageVisible; + } else if (!strcmp(name, "XA")) { + condition = conditionUserAction; + } else { + condition = conditionUserAction; + } + } else { + condition = conditionUserAction; + } +} + +AnnotRichMedia::Activation::Condition AnnotRichMedia::Activation::getCondition() const +{ + return condition; +} + +AnnotRichMedia::Deactivation::Deactivation(Dict *dict) +{ + Object obj1 = dict->lookup("Condition"); + if (obj1.isName()) { + const char *name = obj1.getName(); + + if (!strcmp(name, "PC")) { + condition = conditionPageClosed; + } else if (!strcmp(name, "PI")) { + condition = conditionPageInvisible; + } else if (!strcmp(name, "XD")) { + condition = conditionUserAction; + } else { + condition = conditionUserAction; + } + } else { + condition = conditionUserAction; + } +} + +AnnotRichMedia::Deactivation::Condition AnnotRichMedia::Deactivation::getCondition() const +{ + return condition; +} + +AnnotRichMedia::Content::Content(Dict *dict) +{ + Object obj1 = dict->lookup("Configurations"); + if (obj1.isArray()) { + nConfigurations = obj1.arrayGetLength(); + + configurations = (Configuration **)gmallocn(nConfigurations, sizeof(Configuration *)); + + for (int i = 0; i < nConfigurations; ++i) { + Object obj2 = obj1.arrayGet(i); + if (obj2.isDict()) { + configurations[i] = new AnnotRichMedia::Configuration(obj2.getDict()); + } else { + configurations[i] = nullptr; + } + } + } else { + nConfigurations = 0; + configurations = nullptr; + } + + nAssets = 0; + assets = nullptr; + obj1 = dict->lookup("Assets"); + if (obj1.isDict()) { + Object obj2 = obj1.getDict()->lookup("Names"); + if (obj2.isArray()) { + const int length = obj2.arrayGetLength() / 2; + + assets = (Asset **)gmallocn(length, sizeof(Asset *)); + for (int i = 0; i < length; ++i) { + Object objKey = obj2.arrayGet(2 * i); + Object objVal = obj2.arrayGet(2 * i + 1); + + if (!objKey.isString() || objVal.isNull()) { + error(errSyntaxError, -1, "Bad Annot Asset"); + continue; + } + + assets[nAssets] = new AnnotRichMedia::Asset; + assets[nAssets]->name = std::make_unique(objKey.getString()); + assets[nAssets]->fileSpec = std::move(objVal); + ++nAssets; + } + } + } +} + +AnnotRichMedia::Content::~Content() +{ + if (configurations) { + for (int i = 0; i < nConfigurations; ++i) { + delete configurations[i]; + } + gfree(configurations); + } + + if (assets) { + for (int i = 0; i < nAssets; ++i) { + delete assets[i]; + } + gfree(assets); + } +} + +int AnnotRichMedia::Content::getConfigurationsCount() const +{ + return nConfigurations; +} + +AnnotRichMedia::Configuration *AnnotRichMedia::Content::getConfiguration(int index) const +{ + if (index < 0 || index >= nConfigurations) { + return nullptr; + } + + return configurations[index]; +} + +int AnnotRichMedia::Content::getAssetsCount() const +{ + return nAssets; +} + +AnnotRichMedia::Asset *AnnotRichMedia::Content::getAsset(int index) const +{ + if (index < 0 || index >= nAssets) { + return nullptr; + } + + return assets[index]; +} + +AnnotRichMedia::Asset::Asset() = default; + +AnnotRichMedia::Asset::~Asset() = default; + +const GooString *AnnotRichMedia::Asset::getName() const +{ + return name.get(); +} + +Object *AnnotRichMedia::Asset::getFileSpec() const +{ + return const_cast(&fileSpec); +} + +AnnotRichMedia::Configuration::Configuration(Dict *dict) +{ + Object obj1 = dict->lookup("Instances"); + if (obj1.isArray()) { + nInstances = obj1.arrayGetLength(); + + instances = (Instance **)gmallocn(nInstances, sizeof(Instance *)); + + for (int i = 0; i < nInstances; ++i) { + Object obj2 = obj1.arrayGet(i); + if (obj2.isDict()) { + instances[i] = new AnnotRichMedia::Instance(obj2.getDict()); + } else { + instances[i] = nullptr; + } + } + } else { + instances = nullptr; + } + + obj1 = dict->lookup("Name"); + if (obj1.isString()) { + name = std::make_unique(obj1.getString()); + } + + obj1 = dict->lookup("Subtype"); + if (obj1.isName()) { + const char *subtypeName = obj1.getName(); + + if (!strcmp(subtypeName, "3D")) { + type = type3D; + } else if (!strcmp(subtypeName, "Flash")) { + type = typeFlash; + } else if (!strcmp(subtypeName, "Sound")) { + type = typeSound; + } else if (!strcmp(subtypeName, "Video")) { + type = typeVideo; + } else { + // determine from first non null instance + type = typeFlash; // default in case all instances are null + if (instances && nInstances > 0) { + for (int i = 0; i < nInstances; ++i) { + AnnotRichMedia::Instance *instance = instances[i]; + if (instance) { + switch (instance->getType()) { + case AnnotRichMedia::Instance::type3D: + type = type3D; + break; + case AnnotRichMedia::Instance::typeFlash: + type = typeFlash; + break; + case AnnotRichMedia::Instance::typeSound: + type = typeSound; + break; + case AnnotRichMedia::Instance::typeVideo: + type = typeVideo; + break; + } + // break the loop since we found the first non null instance + break; + } + } + } + } + } +} + +AnnotRichMedia::Configuration::~Configuration() +{ + if (instances) { + for (int i = 0; i < nInstances; ++i) { + delete instances[i]; + } + gfree(instances); + } +} + +int AnnotRichMedia::Configuration::getInstancesCount() const +{ + return nInstances; +} + +AnnotRichMedia::Instance *AnnotRichMedia::Configuration::getInstance(int index) const +{ + if (index < 0 || index >= nInstances) { + return nullptr; + } + + return instances[index]; +} + +const GooString *AnnotRichMedia::Configuration::getName() const +{ + return name.get(); +} + +AnnotRichMedia::Configuration::Type AnnotRichMedia::Configuration::getType() const +{ + return type; +} + +AnnotRichMedia::Instance::Instance(Dict *dict) +{ + Object obj1 = dict->lookup("Subtype"); + const char *name = obj1.isName() ? obj1.getName() : ""; + + if (!strcmp(name, "3D")) { + type = type3D; + } else if (!strcmp(name, "Flash")) { + type = typeFlash; + } else if (!strcmp(name, "Sound")) { + type = typeSound; + } else if (!strcmp(name, "Video")) { + type = typeVideo; + } else { + type = typeFlash; + } + + obj1 = dict->lookup("Params"); + if (obj1.isDict()) { + params = std::make_unique(obj1.getDict()); + } +} + +AnnotRichMedia::Instance::~Instance() = default; + +AnnotRichMedia::Instance::Type AnnotRichMedia::Instance::getType() const +{ + return type; +} + +AnnotRichMedia::Params *AnnotRichMedia::Instance::getParams() const +{ + return params.get(); +} + +AnnotRichMedia::Params::Params(Dict *dict) +{ + Object obj1 = dict->lookup("FlashVars"); + if (obj1.isString()) { + flashVars = std::make_unique(obj1.getString()); + } +} + +AnnotRichMedia::Params::~Params() = default; + +const GooString *AnnotRichMedia::Params::getFlashVars() const +{ + return flashVars.get(); +} + +//------------------------------------------------------------------------ +// Annots +//------------------------------------------------------------------------ + +Annots::Annots(PDFDoc *docA, int page, Object *annotsObj) +{ + Annot *annot; + int i; + + doc = docA; + + if (annotsObj->isArray()) { + for (i = 0; i < annotsObj->arrayGetLength(); ++i) { + // get the Ref to this annot and pass it to Annot constructor + // this way, it'll be possible for the annot to retrieve the corresponding + // form widget + Object obj1 = annotsObj->arrayGet(i); + if (obj1.isDict()) { + const Object &obj2 = annotsObj->arrayGetNF(i); + annot = createAnnot(std::move(obj1), &obj2); + if (annot) { + if (annot->isOk()) { + annot->setPage(page, false); // Don't change /P + appendAnnot(annot); + } + annot->decRefCnt(); + } + } + } + } +} + +void Annots::appendAnnot(Annot *annot) +{ + if (annot && annot->isOk()) { + annots.push_back(annot); + annot->incRefCnt(); + } +} + +bool Annots::removeAnnot(Annot *annot) +{ + auto idx = std::find(annots.begin(), annots.end(), annot); + + if (idx == annots.end()) { + return false; + } else { + annot->decRefCnt(); + annots.erase(idx); + return true; + } +} + +Annot *Annots::createAnnot(Object &&dictObject, const Object *obj) +{ + Annot *annot = nullptr; + Object obj1 = dictObject.dictLookup("Subtype"); + if (obj1.isName()) { + const char *typeName = obj1.getName(); + + if (!strcmp(typeName, "Text")) { + annot = new AnnotText(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Link")) { + annot = new AnnotLink(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "FreeText")) { + annot = new AnnotFreeText(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Line")) { + annot = new AnnotLine(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Square")) { + annot = new AnnotGeometry(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Circle")) { + annot = new AnnotGeometry(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Polygon")) { + annot = new AnnotPolygon(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "PolyLine")) { + annot = new AnnotPolygon(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Highlight")) { + annot = new AnnotTextMarkup(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Underline")) { + annot = new AnnotTextMarkup(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Squiggly")) { + annot = new AnnotTextMarkup(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "StrikeOut")) { + annot = new AnnotTextMarkup(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Stamp")) { + annot = new AnnotStamp(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Caret")) { + annot = new AnnotCaret(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Ink")) { + annot = new AnnotInk(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "FileAttachment")) { + annot = new AnnotFileAttachment(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Sound")) { + annot = new AnnotSound(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Movie")) { + annot = new AnnotMovie(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Widget")) { + // Find the annot in forms + if (obj->isRef()) { + Form *form = doc->getCatalog()->getForm(); + if (form) { + FormWidget *widget = form->findWidgetByRef(obj->getRef()); + if (widget) { + annot = widget->getWidgetAnnotation(); + annot->incRefCnt(); + } + } + } + if (!annot) { + annot = new AnnotWidget(doc, std::move(dictObject), obj); + } + } else if (!strcmp(typeName, "Screen")) { + annot = new AnnotScreen(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "PrinterMark")) { + annot = new Annot(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "TrapNet")) { + annot = new Annot(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Watermark")) { + annot = new Annot(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "3D")) { + annot = new Annot3D(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "RichMedia")) { + annot = new AnnotRichMedia(doc, std::move(dictObject), obj); + } else if (!strcmp(typeName, "Popup")) { + /* Popup annots are already handled by markup annots + * Here we only care about popup annots without a + * markup annotation associated + */ + Object obj2 = dictObject.dictLookup("Parent"); + if (obj2.isNull()) { + annot = new AnnotPopup(doc, std::move(dictObject), obj); + } else { + annot = nullptr; + } + } else { + annot = new Annot(doc, std::move(dictObject), obj); + } + } + + return annot; +} + +Annot *Annots::findAnnot(Ref *ref) +{ + for (auto *annot : annots) { + if (annot->match(ref)) { + return annot; + } + } + return nullptr; +} + +Annots::~Annots() +{ + for (auto *annot : annots) { + annot->decRefCnt(); + } +} + +//------------------------------------------------------------------------ +// AnnotAppearanceBuilder +//------------------------------------------------------------------------ + +AnnotAppearanceBuilder::AnnotAppearanceBuilder() : appearBuf(new GooString()) { } + +AnnotAppearanceBuilder::~AnnotAppearanceBuilder() +{ + delete appearBuf; +} + +void AnnotAppearanceBuilder::append(const char *text) +{ + appearBuf->append(text); +} + +void AnnotAppearanceBuilder::appendf(const char *fmt, ...) GOOSTRING_FORMAT +{ + va_list argList; + + va_start(argList, fmt); + appearBuf->appendfv(fmt, argList); + va_end(argList); +} + +const GooString *AnnotAppearanceBuilder::buffer() const +{ + return appearBuf; +} diff --git a/poppler-24.05.0/poppler/Annot.h b/poppler-24.05.0/poppler/Annot.h new file mode 100644 index 0000000000000000000000000000000000000000..5d96e7532124a93311d0de827f3f936b36460737 --- /dev/null +++ b/poppler-24.05.0/poppler/Annot.h @@ -0,0 +1,1787 @@ +//======================================================================== +// +// Annot.h +// +// Copyright 2000-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Scott Turner +// Copyright (C) 2007, 2008 Julien Rebetez +// Copyright (C) 2007-2011, 2013, 2015, 2018 Carlos Garcia Campos +// Copyright (C) 2007, 2008 Iñigo Martínez +// Copyright (C) 2008 Michael Vrable +// Copyright (C) 2008 Hugo Mercier +// Copyright (C) 2008 Pino Toscano +// Copyright (C) 2008 Tomas Are Haavet +// Copyright (C) 2009-2011, 2013, 2016-2023 Albert Astals Cid +// Copyright (C) 2012, 2013 Fabio D'Urso +// Copyright (C) 2012, 2015 Tobias Koenig +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2013, 2017, 2023 Adrian Johnson +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Dileep Sankhla +// Copyright (C) 2018-2020 Tobias Deiminger +// Copyright (C) 2018, 2020, 2022 Oliver Sander +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019 Umang Malik +// Copyright (C) 2019 João Netto +// Copyright (C) 2020 Nelson Benítez León +// Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden +// Copyright (C) 2020 Katarina Behrens +// Copyright (C) 2020 Thorsten Behrens +// Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, . +// Copyright (C) 2021 Zachary Travis +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Georgiy Sgibnev . Work sponsored by lab50.net. +// Copyright (C) 2022 Martin +// Copyright (C) 2024 Erich E. Hoover +// +// 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 +// +//======================================================================== + +#ifndef ANNOT_H +#define ANNOT_H + +#include +#include +#include +#include + +#include "AnnotStampImageHelper.h" +#include "Object.h" +#include "poppler_private_export.h" + +class XRef; +class Gfx; +class CharCodeToUnicode; +class GfxFont; +class GfxResources; +class Page; +class PDFDoc; +class Form; +class FormWidget; +class FormField; +class FormFieldButton; +class FormFieldText; +class FormFieldChoice; +class FormFieldSignature; +class PDFRectangle; +class Movie; +class LinkAction; +class Sound; +class FileSpec; + +enum AnnotLineEndingStyle +{ + annotLineEndingSquare, // Square + annotLineEndingCircle, // Circle + annotLineEndingDiamond, // Diamond + annotLineEndingOpenArrow, // OpenArrow + annotLineEndingClosedArrow, // ClosedArrow + annotLineEndingNone, // None + annotLineEndingButt, // Butt + annotLineEndingROpenArrow, // ROpenArrow + annotLineEndingRClosedArrow, // RClosedArrow + annotLineEndingSlash // Slash +}; + +enum AnnotExternalDataType +{ + annotExternalDataMarkupUnknown, + annotExternalDataMarkup3D // Markup3D +}; + +enum class VariableTextQuadding +{ + leftJustified, + centered, + rightJustified +}; + +//------------------------------------------------------------------------ +// AnnotCoord +//------------------------------------------------------------------------ + +class AnnotCoord +{ +public: + AnnotCoord() : x(0), y(0) { } + AnnotCoord(double _x, double _y) : x(_x), y(_y) { } + + double getX() const { return x; } + double getY() const { return y; } + +protected: + double x, y; +}; + +//------------------------------------------------------------------------ +// AnnotPath +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotPath +{ +public: + AnnotPath(); + explicit AnnotPath(Array *array); + explicit AnnotPath(std::vector &&coords); + ~AnnotPath(); + + AnnotPath(const AnnotPath &) = delete; + AnnotPath &operator=(const AnnotPath &other) = delete; + + double getX(int coord) const; + double getY(int coord) const; + AnnotCoord *getCoord(int coord); + int getCoordsLength() const { return coords.size(); } + +protected: + std::vector coords; + + void parsePathArray(Array *array); +}; + +//------------------------------------------------------------------------ +// AnnotCalloutLine +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotCalloutLine +{ +public: + AnnotCalloutLine(double x1, double y1, double x2, double y2); + virtual ~AnnotCalloutLine(); + + AnnotCalloutLine(const AnnotCalloutLine &) = delete; + AnnotCalloutLine &operator=(const AnnotCalloutLine &other) = delete; + + double getX1() const { return coord1.getX(); } + double getY1() const { return coord1.getY(); } + double getX2() const { return coord2.getX(); } + double getY2() const { return coord2.getY(); } + +protected: + AnnotCoord coord1, coord2; +}; + +//------------------------------------------------------------------------ +// AnnotCalloutMultiLine +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotCalloutMultiLine : public AnnotCalloutLine +{ +public: + AnnotCalloutMultiLine(double x1, double y1, double x2, double y2, double x3, double y3); + ~AnnotCalloutMultiLine() override; + + double getX3() const { return coord3.getX(); } + double getY3() const { return coord3.getY(); } + +protected: + AnnotCoord coord3; +}; + +//------------------------------------------------------------------------ +// AnnotBorderEffect +//------------------------------------------------------------------------ + +class AnnotBorderEffect +{ +public: + enum AnnotBorderEffectType + { + borderEffectNoEffect, // S + borderEffectCloudy // C + }; + + explicit AnnotBorderEffect(Dict *dict); + + AnnotBorderEffectType getEffectType() const { return effectType; } + double getIntensity() const { return intensity; } + +private: + AnnotBorderEffectType effectType; // S (Default S) + double intensity; // I (Default 0) +}; + +//------------------------------------------------------------------------ +// AnnotQuadrilateral +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotQuadrilaterals +{ +public: + class POPPLER_PRIVATE_EXPORT AnnotQuadrilateral + { + public: + AnnotQuadrilateral(); + AnnotQuadrilateral(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4); + + AnnotCoord coord1, coord2, coord3, coord4; + }; + + AnnotQuadrilaterals(Array *array, PDFRectangle *rect); + AnnotQuadrilaterals(std::unique_ptr &&quads, int quadsLength); + ~AnnotQuadrilaterals(); + + AnnotQuadrilaterals(const AnnotQuadrilaterals &) = delete; + AnnotQuadrilaterals &operator=(const AnnotQuadrilaterals &other) = delete; + + double getX1(int quadrilateral); + double getY1(int quadrilateral); + double getX2(int quadrilateral); + double getY2(int quadrilateral); + double getX3(int quadrilateral); + double getY3(int quadrilateral); + double getX4(int quadrilateral); + double getY4(int quadrilateral); + int getQuadrilateralsLength() const { return quadrilateralsLength; } + +protected: + std::unique_ptr quadrilaterals; + int quadrilateralsLength; +}; + +//------------------------------------------------------------------------ +// AnnotBorder +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotBorder +{ +public: + enum AnnotBorderType + { + typeArray, + typeBS + }; + + enum AnnotBorderStyle + { + borderSolid, // Solid + borderDashed, // Dashed + borderBeveled, // Beveled + borderInset, // Inset + borderUnderlined // Underlined + }; + + virtual ~AnnotBorder(); + + AnnotBorder(const AnnotBorder &) = delete; + AnnotBorder &operator=(const AnnotBorder &other) = delete; + + virtual void setWidth(double new_width) { width = new_width; } + + virtual AnnotBorderType getType() const = 0; + virtual double getWidth() const { return width; } + virtual const std::vector &getDash() const { return dash; } + virtual AnnotBorderStyle getStyle() const { return style; } + + virtual Object writeToObject(XRef *xref) const = 0; + virtual std::unique_ptr copy() const = 0; + +protected: + AnnotBorder(); + + bool parseDashArray(Object *dashObj); + + AnnotBorderType type; + double width; + static const int DASH_LIMIT = 10; // implementation note 82 in Appendix H. + std::vector dash; + AnnotBorderStyle style; +}; + +//------------------------------------------------------------------------ +// AnnotBorderArray +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotBorderArray : public AnnotBorder +{ +public: + AnnotBorderArray(); + explicit AnnotBorderArray(Array *array); + + void setHorizontalCorner(double hc) { horizontalCorner = hc; } + void setVerticalCorner(double vc) { verticalCorner = vc; } + + double getHorizontalCorner() const { return horizontalCorner; } + double getVerticalCorner() const { return verticalCorner; } + + std::unique_ptr copy() const override; + +private: + AnnotBorderType getType() const override { return typeArray; } + Object writeToObject(XRef *xref) const override; + + double horizontalCorner; // (Default 0) + double verticalCorner; // (Default 0) + // double width; // (Default 1) (inherited from AnnotBorder) +}; + +//------------------------------------------------------------------------ +// AnnotBorderBS +//------------------------------------------------------------------------ + +class AnnotBorderBS : public AnnotBorder +{ +public: + AnnotBorderBS(); + explicit AnnotBorderBS(Dict *dict); + +private: + AnnotBorderType getType() const override { return typeBS; } + Object writeToObject(XRef *xref) const override; + + const char *getStyleName() const; + + std::unique_ptr copy() const override; + + // double width; // W (Default 1) (inherited from AnnotBorder) + // AnnotBorderStyle style; // S (Default S) (inherited from AnnotBorder) + // double *dash; // D (Default [3]) (inherited from AnnotBorder) +}; + +//------------------------------------------------------------------------ +// AnnotColor +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotColor +{ +public: + enum AnnotColorSpace + { + colorTransparent = 0, + colorGray = 1, + colorRGB = 3, + colorCMYK = 4 + }; + + AnnotColor(); + explicit AnnotColor(double gray); + AnnotColor(double r, double g, double b); + AnnotColor(double c, double m, double y, double k); + explicit AnnotColor(Array *array, int adjust = 0); + + void adjustColor(int adjust); + + AnnotColorSpace getSpace() const { return (AnnotColorSpace)length; } + const double *getValues() const { return values; } + + Object writeToObject(XRef *xref) const; + +private: + double values[4]; + int length; +}; + +//------------------------------------------------------------------------ +// DefaultAppearance +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT DefaultAppearance +{ +public: + DefaultAppearance(Object &&fontNameA, double fontPtSizeA, std::unique_ptr &&fontColorA); + explicit DefaultAppearance(const GooString *da); + void setFontName(Object &&fontNameA); + const Object &getFontName() const { return fontName; } + void setFontPtSize(double fontPtSizeA); + double getFontPtSize() const { return fontPtSize; } + void setFontColor(std::unique_ptr fontColorA); + const AnnotColor *getFontColor() const { return fontColor.get(); } + std::string toAppearanceString() const; + + DefaultAppearance(const DefaultAppearance &) = delete; + DefaultAppearance &operator=(const DefaultAppearance &) = delete; + +private: + Object fontName; + double fontPtSize; + std::unique_ptr fontColor; +}; + +//------------------------------------------------------------------------ +// AnnotIconFit +//------------------------------------------------------------------------ + +class AnnotIconFit +{ +public: + enum AnnotIconFitScaleWhen + { + scaleAlways, // A + scaleBigger, // B + scaleSmaller, // S + scaleNever // N + }; + + enum AnnotIconFitScale + { + scaleAnamorphic, // A + scaleProportional // P + }; + + explicit AnnotIconFit(Dict *dict); + + AnnotIconFitScaleWhen getScaleWhen() { return scaleWhen; } + AnnotIconFitScale getScale() { return scale; } + double getLeft() { return left; } + double getBottom() { return bottom; } + bool getFullyBounds() { return fullyBounds; } + +protected: + AnnotIconFitScaleWhen scaleWhen; // SW (Default A) + AnnotIconFitScale scale; // S (Default P) + double left; // A (Default [0.5 0.5] + double bottom; // Only if scale is P + bool fullyBounds; // FB (Default false) +}; + +//------------------------------------------------------------------------ +// AnnotAppearance +//------------------------------------------------------------------------ + +class AnnotAppearance +{ +public: + enum AnnotAppearanceType + { + appearNormal, + appearRollover, + appearDown + }; + + AnnotAppearance(PDFDoc *docA, Object *dict); + ~AnnotAppearance(); + + // State is ignored if no subdictionary is present + Object getAppearanceStream(AnnotAppearanceType type, const char *state); + + // Access keys in normal appearance subdictionary (N) + std::unique_ptr getStateKey(int i); + int getNumStates(); + + // Removes all associated streams in the xref table. Caller is required to + // reset parent annotation's AP and AS after this call. + void removeAllStreams(); + + // Test if this AnnotAppearance references the specified stream + bool referencesStream(Ref refToStream); + +private: + static bool referencesStream(const Object *stateObj, Ref refToStream); + void removeStream(Ref refToStream); + void removeStateStreams(const Object *state); + +protected: + PDFDoc *doc; + Object appearDict; // Annotation's AP +}; + +//------------------------------------------------------------------------ +// AnnotAppearanceCharacs +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotAppearanceCharacs +{ +public: + enum AnnotAppearanceCharacsTextPos + { + captionNoIcon, // 0 + captionNoCaption, // 1 + captionBelow, // 2 + captionAbove, // 3 + captionRight, // 4 + captionLeft, // 5 + captionOverlaid // 6 + }; + + explicit AnnotAppearanceCharacs(Dict *dict); + ~AnnotAppearanceCharacs(); + + AnnotAppearanceCharacs(const AnnotAppearanceCharacs &) = delete; + AnnotAppearanceCharacs &operator=(const AnnotAppearanceCharacs &) = delete; + + int getRotation() const { return rotation; } + const AnnotColor *getBorderColor() const { return borderColor.get(); } + void setBorderColor(std::unique_ptr &&color) { borderColor = std::move(color); } + const AnnotColor *getBackColor() const { return backColor.get(); } + void setBackColor(std::unique_ptr &&color) { backColor = std::move(color); } + const GooString *getNormalCaption() const { return normalCaption.get(); } + const GooString *getRolloverCaption() { return rolloverCaption.get(); } + const GooString *getAlternateCaption() { return alternateCaption.get(); } + const AnnotIconFit *getIconFit() { return iconFit.get(); } + AnnotAppearanceCharacsTextPos getPosition() const { return position; } + + std::unique_ptr copy() const; + +protected: + int rotation; // R (Default 0) + std::unique_ptr borderColor; // BC + std::unique_ptr backColor; // BG + std::unique_ptr normalCaption; // CA + std::unique_ptr rolloverCaption; // RC + std::unique_ptr alternateCaption; // AC + // I + // RI + // IX + std::unique_ptr iconFit; // IF + AnnotAppearanceCharacsTextPos position; // TP (Default 0) +}; + +//------------------------------------------------------------------------ +// AnnotAppearanceBBox +//------------------------------------------------------------------------ + +class AnnotAppearanceBBox +{ +public: + explicit AnnotAppearanceBBox(PDFRectangle *rect); + + void setBorderWidth(double w) { borderWidth = w; } + + // The following functions operate on coords relative to [origX origY] + void extendTo(double x, double y); + void getBBoxRect(double bbox[4]) const; + + // Get boundaries in page coordinates + double getPageXMin() const; + double getPageYMin() const; + double getPageXMax() const; + double getPageYMax() const; + +private: + double origX, origY, borderWidth; + double minX, minY, maxX, maxY; +}; + +//------------------------------------------------------------------------ +// AnnotAppearanceBuilder +//------------------------------------------------------------------------ +class Matrix; + +class AnnotAppearanceBuilder +{ +public: + AnnotAppearanceBuilder(); + ~AnnotAppearanceBuilder(); + + AnnotAppearanceBuilder(const AnnotAppearanceBuilder &) = delete; + AnnotAppearanceBuilder &operator=(const AnnotAppearanceBuilder &) = delete; + + void setDrawColor(const AnnotColor *color, bool fill); + void setLineStyleForBorder(const AnnotBorder *border); + void setTextFont(const Object &fontName, double fontSize); + void drawCircle(double cx, double cy, double r, bool fill); + void drawEllipse(double cx, double cy, double rx, double ry, bool fill, bool stroke); + void drawCircleTopLeft(double cx, double cy, double r); + void drawCircleBottomRight(double cx, double cy, double r); + void drawLineEnding(AnnotLineEndingStyle endingStyle, double x, double y, double size, bool fill, const Matrix &m); + void drawLineEndSquare(double x, double y, double size, bool fill, const Matrix &m); + void drawLineEndCircle(double x, double y, double size, bool fill, const Matrix &m); + void drawLineEndDiamond(double x, double y, double size, bool fill, const Matrix &m); + void drawLineEndArrow(double x, double y, double size, int orientation, bool isOpen, bool fill, const Matrix &m); + void drawLineEndSlash(double x, double y, double size, const Matrix &m); + void drawFieldBorder(const FormField *field, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect); + bool drawFormField(const FormField *field, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, + const GooString *appearState, XRef *xref, Dict *resourcesDict); + static double lineEndingXShorten(AnnotLineEndingStyle endingStyle, double size); + static double lineEndingXExtendBBox(AnnotLineEndingStyle endingStyle, double size); + void writeString(const std::string &str); + + void append(const char *text); + void appendf(const char *fmt, ...) GOOSTRING_FORMAT; + + const GooString *buffer() const; + +private: + enum DrawTextFlags + { + NoDrawTextFlags = 0, + MultilineDrawTextFlag = 1, + EmitMarkedContentDrawTextFlag = 2, + ForceZapfDingbatsDrawTextFlag = 4, + TurnTextToStarsDrawTextFlag = 8 + }; + + bool drawListBox(const FormFieldChoice *fieldChoice, const AnnotBorder *border, const PDFRectangle *rect, const GooString *da, const GfxResources *resources, VariableTextQuadding quadding, XRef *xref, Dict *resourcesDict); + bool drawFormFieldButton(const FormFieldButton *field, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, + const GooString *appearState, XRef *xref, Dict *resourcesDict); + bool drawFormFieldText(const FormFieldText *fieldText, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, XRef *xref, + Dict *resourcesDict); + bool drawFormFieldChoice(const FormFieldChoice *fieldChoice, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, + XRef *xref, Dict *resourcesDict); + bool drawSignatureFieldText(const FormFieldSignature *field, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, + XRef *xref, Dict *resourcesDict); + void drawSignatureFieldText(const GooString &text, const Form *form, const DefaultAppearance &da, const AnnotBorder *border, const PDFRectangle *rect, XRef *xref, Dict *resourcesDict, double leftMargin, bool centerVertically, + bool centerHorizontally); + bool drawText(const GooString *text, const Form *form, const GooString *da, const GfxResources *resources, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, + const VariableTextQuadding quadding, XRef *xref, Dict *resourcesDict, const int flags = NoDrawTextFlags, const int nCombs = 0); + void drawArrowPath(double x, double y, const Matrix &m, int orientation = 1); + + GooString *appearBuf; +}; + +//------------------------------------------------------------------------ +// Annot +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT Annot +{ + friend class Annots; + friend class Page; + +public: + enum AnnotFlag + { + flagUnknown = 0x0000, + flagInvisible = 0x0001, + flagHidden = 0x0002, + flagPrint = 0x0004, + flagNoZoom = 0x0008, + flagNoRotate = 0x0010, + flagNoView = 0x0020, + flagReadOnly = 0x0040, + flagLocked = 0x0080, + flagToggleNoView = 0x0100, + flagLockedContents = 0x0200 + }; + + enum AnnotSubtype + { + typeUnknown, // 0 + typeText, // Text 1 + typeLink, // Link 2 + typeFreeText, // FreeText 3 + typeLine, // Line 4 + typeSquare, // Square 5 + typeCircle, // Circle 6 + typePolygon, // Polygon 7 + typePolyLine, // PolyLine 8 + typeHighlight, // Highlight 9 + typeUnderline, // Underline 10 + typeSquiggly, // Squiggly 11 + typeStrikeOut, // StrikeOut 12 + typeStamp, // Stamp 13 + typeCaret, // Caret 14 + typeInk, // Ink 15 + typePopup, // Popup 16 + typeFileAttachment, // FileAttachment 17 + typeSound, // Sound 18 + typeMovie, // Movie 19 + typeWidget, // Widget 20 + typeScreen, // Screen 21 + typePrinterMark, // PrinterMark 22 + typeTrapNet, // TrapNet 23 + typeWatermark, // Watermark 24 + type3D, // 3D 25 + typeRichMedia // RichMedia 26 + }; + + /** + * Describes the additional actions of a screen or widget annotation. + */ + enum AdditionalActionsType + { + actionCursorEntering, ///< Performed when the cursor enters the annotation's active area + actionCursorLeaving, ///< Performed when the cursor exists the annotation's active area + actionMousePressed, ///< Performed when the mouse button is pressed inside the annotation's active area + actionMouseReleased, ///< Performed when the mouse button is released inside the annotation's active area + actionFocusIn, ///< Performed when the annotation receives the input focus + actionFocusOut, ///< Performed when the annotation loses the input focus + actionPageOpening, ///< Performed when the page containing the annotation is opened + actionPageClosing, ///< Performed when the page containing the annotation is closed + actionPageVisible, ///< Performed when the page containing the annotation becomes visible + actionPageInvisible ///< Performed when the page containing the annotation becomes invisible + }; + + enum FormAdditionalActionsType + { + actionFieldModified, ///< Performed when the when the user modifies the field + actionFormatField, ///< Performed before the field is formatted to display its value + actionValidateField, ///< Performed when the field value changes + actionCalculateField, ///< Performed when the field needs to be recalculated + }; + + Annot(PDFDoc *docA, PDFRectangle *rectA); + Annot(PDFDoc *docA, Object &&dictObject); + Annot(PDFDoc *docA, Object &&dictObject, const Object *obj); + bool isOk() { return ok; } + + static double calculateFontSize(const Form *form, const GfxFont *font, const GooString *text, const double wMax, const double hMax, const bool forceZapfDingbats = {}); + + void incRefCnt(); + void decRefCnt(); + + virtual void draw(Gfx *gfx, bool printing); + // Get the resource dict of the appearance stream + virtual Object getAppearanceResDict(); + + bool match(const Ref *refA) const { return ref == *refA; } + + double getXMin(); + double getYMin(); + double getXMax(); + double getYMax(); + + void setRect(const PDFRectangle *rect); + void setRect(double x1, double y1, double x2, double y2); + + // Sets the annot contents to new_content + // new_content should never be NULL + virtual void setContents(std::unique_ptr &&new_content); + void setName(GooString *new_name); + void setModified(GooString *new_modified); + void setFlags(unsigned int new_flags); + + void setBorder(std::unique_ptr &&new_border); + void setColor(std::unique_ptr &&new_color); + + void setAppearanceState(const char *state); + + // getters + PDFDoc *getDoc() const { return doc; } + bool getHasRef() const { return hasRef; } + Ref getRef() const { return ref; } + const Object &getAnnotObj() const { return annotObj; } + AnnotSubtype getType() const { return type; } + const PDFRectangle &getRect() const { return *rect; } + void getRect(double *x1, double *y1, double *x2, double *y2) const; + const GooString *getContents() const { return contents.get(); } + int getPageNum() const { return page; } + const GooString *getName() const { return name.get(); } + const GooString *getModified() const { return modified.get(); } + unsigned int getFlags() const { return flags; } + Object getAppearance() const; + void setNewAppearance(Object &&newAppearance); + AnnotAppearance *getAppearStreams() const { return appearStreams.get(); } + const GooString *getAppearState() const { return appearState.get(); } + AnnotBorder *getBorder() const { return border.get(); } + AnnotColor *getColor() const { return color.get(); } + int getTreeKey() const { return treeKey; } + + int getId() { return ref.num; } + + // Check if point is inside the annot rectangle. + bool inRect(double x, double y) const; + + // If newFontNeeded is not null, it will contain whether the given font has glyphs to represent the needed text + static void layoutText(const GooString *text, GooString *outBuf, int *i, const GfxFont &font, double *width, double widthLimit, int *charCount, bool noReencode, bool *newFontNeeded = nullptr); + +private: + void readArrayNum(Object *pdfArray, int key, double *value); + // write vStr[i:j[ in appearBuf + + void initialize(PDFDoc *docA, Dict *dict); + void setPage(int pageIndex, bool updateP); // Called by Page::addAnnot and Annots ctor + +protected: + virtual ~Annot(); + virtual void removeReferencedObjects(); // Called by Page::removeAnnot + Object createForm(const GooString *appearBuf, const double *bbox, bool transparencyGroup, Dict *resDict); + Object createForm(const GooString *appearBuf, const double *bbox, bool transparencyGroup, Object &&resDictObject); // overload to support incRef/decRef + Dict *createResourcesDict(const char *formName, Object &&formStream, const char *stateName, double opacity, const char *blendMode); + bool isVisible(bool printing); + int getRotation() const; + + // Updates the field key of the annotation dictionary + // and sets M to the current time + void update(const char *key, Object &&value); + + // Delete appearance streams and reset appearance state + virtual void invalidateAppearance(); + + Object annotObj; + + std::atomic_int refCnt; + + // required data + AnnotSubtype type; // Annotation type + std::unique_ptr rect; // Rect + + // optional data + std::unique_ptr contents; // Contents + std::unique_ptr name; // NM + std::unique_ptr modified; // M + int page; // P + unsigned int flags; // F (must be a 32 bit unsigned int) + std::unique_ptr appearStreams; // AP + Object appearance; // a reference to the Form XObject stream + // for the normal appearance + std::unique_ptr appearBBox; // BBox of generated appearance + std::unique_ptr appearState; // AS + int treeKey; // Struct Parent; + Object oc; // OC + + PDFDoc *doc; + Ref ref; // object ref identifying this annotation + std::unique_ptr border; // Border, BS + std::unique_ptr color; // C + bool ok; + + bool hasRef; + mutable std::recursive_mutex mutex; + + bool hasBeenUpdated = false; +}; + +//------------------------------------------------------------------------ +// AnnotPopup +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotPopup : public Annot +{ +public: + AnnotPopup(PDFDoc *docA, PDFRectangle *rect); + AnnotPopup(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotPopup() override; + + bool hasParent() const { return parentRef != Ref::INVALID(); } + void setParent(Annot *parentA); + bool getOpen() const { return open; } + void setOpen(bool openA); + +protected: + void initialize(PDFDoc *docA, Dict *dict); + + Ref parentRef; // Parent + bool open; // Open +}; + +//------------------------------------------------------------------------ +// AnnotMarkup +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotMarkup : public Annot +{ +public: + enum AnnotMarkupReplyType + { + replyTypeR, // R + replyTypeGroup // Group + }; + + AnnotMarkup(PDFDoc *docA, PDFRectangle *rect); + AnnotMarkup(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotMarkup() override; + + // getters + const GooString *getLabel() const { return label.get(); } + AnnotPopup *getPopup() const { return popup.get(); } + double getOpacity() const { return opacity; } + // getRC + const GooString *getDate() const { return date.get(); } + bool isInReplyTo() const { return inReplyTo != Ref::INVALID(); } + int getInReplyToID() const { return inReplyTo.num; } + const GooString *getSubject() const { return subject.get(); } + AnnotMarkupReplyType getReplyTo() const { return replyTo; } + AnnotExternalDataType getExData() const { return exData; } + + // The annotation takes the ownership of new_popup + void setPopup(std::unique_ptr &&new_popup); + void setLabel(std::unique_ptr &&new_label); + void setOpacity(double opacityA); + void setDate(GooString *new_date); + +protected: + void removeReferencedObjects() override; + + std::unique_ptr label; // T (Default author) + std::unique_ptr popup; // Popup + double opacity; // CA (Default 1.0) + // RC + std::unique_ptr date; // CreationDate + Ref inReplyTo; // IRT + std::unique_ptr subject; // Subj + AnnotMarkupReplyType replyTo; // RT (Default R) + // this object is overridden by the custom intent fields defined in some + // annotation types. + // GooString *intent; // IT + AnnotExternalDataType exData; // ExData + +private: + void initialize(PDFDoc *docA, Dict *dict); +}; + +//------------------------------------------------------------------------ +// AnnotText +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotText : public AnnotMarkup +{ +public: + enum AnnotTextState + { + stateUnknown, + // Marked state model + stateMarked, // Marked + stateUnmarked, // Unmarked + // Review state model + stateAccepted, // Accepted + stateRejected, // Rejected + stateCancelled, // Cancelled + stateCompleted, // Completed + stateNone // None + }; + + AnnotText(PDFDoc *docA, PDFRectangle *rect); + AnnotText(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotText() override; + + void draw(Gfx *gfx, bool printing) override; + + // getters + bool getOpen() const { return open; } + const GooString *getIcon() const { return icon.get(); } + AnnotTextState getState() const { return state; } + + void setOpen(bool openA); + void setIcon(GooString *new_icon); + +private: + void initialize(PDFDoc *docA, Dict *dict); + + bool open; // Open (Default false) + std::unique_ptr icon; // Name (Default Note) + AnnotTextState state; // State (Default Umarked if + // StateModel Marked + // None if StareModel Review) +}; + +//------------------------------------------------------------------------ +// AnnotMovie +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotMovie : public Annot +{ +public: + AnnotMovie(PDFDoc *docA, PDFRectangle *rect, Movie *movieA); + AnnotMovie(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotMovie() override; + + void draw(Gfx *gfx, bool printing) override; + + const GooString *getTitle() const { return title.get(); } + Movie *getMovie() { return movie.get(); } + +private: + void initialize(PDFDoc *docA, Dict *dict); + + std::unique_ptr title; // T + std::unique_ptr movie; // Movie + A +}; + +//------------------------------------------------------------------------ +// AnnotScreen +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotScreen : public Annot +{ +public: + AnnotScreen(PDFDoc *docA, PDFRectangle *rect); + AnnotScreen(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotScreen() override; + + const GooString *getTitle() const { return title.get(); } + + AnnotAppearanceCharacs *getAppearCharacs() { return appearCharacs.get(); } + LinkAction *getAction() { return action.get(); } // The caller should not delete the result + std::unique_ptr getAdditionalAction(AdditionalActionsType type); + +private: + void initialize(PDFDoc *docA, Dict *dict); + + std::unique_ptr title; // T + + std::unique_ptr appearCharacs; // MK + + std::unique_ptr action; // A + Object additionalActions; // AA +}; + +//------------------------------------------------------------------------ +// AnnotLink +//------------------------------------------------------------------------ + +class AnnotLink : public Annot +{ +public: + enum AnnotLinkEffect + { + effectNone, // N + effectInvert, // I + effectOutline, // O + effectPush // P + }; + + AnnotLink(PDFDoc *docA, PDFRectangle *rect); + AnnotLink(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotLink() override; + + void draw(Gfx *gfx, bool printing) override; + + // getters + LinkAction *getAction() const { return action.get(); } + AnnotLinkEffect getLinkEffect() const { return linkEffect; } + AnnotQuadrilaterals *getQuadrilaterals() const { return quadrilaterals.get(); } + +protected: + void initialize(PDFDoc *docA, Dict *dict); + + std::unique_ptr action; // A, Dest + AnnotLinkEffect linkEffect; // H (Default I) + // Dict *uriAction; // PA + + std::unique_ptr quadrilaterals; // QuadPoints +}; + +//------------------------------------------------------------------------ +// AnnotFreeText +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotFreeText : public AnnotMarkup +{ +public: + enum AnnotFreeTextIntent + { + intentFreeText, // FreeText + intentFreeTextCallout, // FreeTextCallout + intentFreeTextTypeWriter // FreeTextTypeWriter + }; + + static const double undefinedFontPtSize; + + AnnotFreeText(PDFDoc *docA, PDFRectangle *rect); + AnnotFreeText(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotFreeText() override; + + void draw(Gfx *gfx, bool printing) override; + Object getAppearanceResDict() override; + void setContents(std::unique_ptr &&new_content) override; + + void setDefaultAppearance(const DefaultAppearance &da); + void setQuadding(VariableTextQuadding new_quadding); + void setStyleString(GooString *new_string); + void setCalloutLine(AnnotCalloutLine *line); + void setIntent(AnnotFreeTextIntent new_intent); + + // getters + std::unique_ptr getDefaultAppearance() const; + VariableTextQuadding getQuadding() const { return quadding; } + // return rc + const GooString *getStyleString() const { return styleString.get(); } + AnnotCalloutLine *getCalloutLine() const { return calloutLine.get(); } + AnnotFreeTextIntent getIntent() const { return intent; } + AnnotBorderEffect *getBorderEffect() const { return borderEffect.get(); } + PDFRectangle *getRectangle() const { return rectangle.get(); } + AnnotLineEndingStyle getEndStyle() const { return endStyle; } + +protected: + void initialize(PDFDoc *docA, Dict *dict); + void generateFreeTextAppearance(); + + // required + std::unique_ptr appearanceString; // DA + + // optional + VariableTextQuadding quadding; // Q (Default 0) + // RC + std::unique_ptr styleString; // DS + std::unique_ptr calloutLine; // CL + AnnotFreeTextIntent intent; // IT + std::unique_ptr borderEffect; // BE + std::unique_ptr rectangle; // RD + // inherited from Annot + // AnnotBorderBS border; // BS + AnnotLineEndingStyle endStyle; // LE (Default None) +}; + +//------------------------------------------------------------------------ +// AnnotLine +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotLine : public AnnotMarkup +{ +public: + enum AnnotLineIntent + { + intentLineArrow, // LineArrow + intentLineDimension // LineDimension + }; + + enum AnnotLineCaptionPos + { + captionPosInline, // Inline + captionPosTop // Top + }; + + AnnotLine(PDFDoc *docA, PDFRectangle *rect); + AnnotLine(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotLine() override; + + void draw(Gfx *gfx, bool printing) override; + Object getAppearanceResDict() override; + void setContents(std::unique_ptr &&new_content) override; + + void setVertices(double x1, double y1, double x2, double y2); + void setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyle end); + void setInteriorColor(std::unique_ptr &&new_color); + void setLeaderLineLength(double len); + void setLeaderLineExtension(double len); + void setCaption(bool new_cap); + void setIntent(AnnotLineIntent new_intent); + + // getters + AnnotLineEndingStyle getStartStyle() const { return startStyle; } + AnnotLineEndingStyle getEndStyle() const { return endStyle; } + AnnotColor *getInteriorColor() const { return interiorColor.get(); } + double getLeaderLineLength() const { return leaderLineLength; } + double getLeaderLineExtension() const { return leaderLineExtension; } + bool getCaption() const { return caption; } + AnnotLineIntent getIntent() const { return intent; } + double getLeaderLineOffset() const { return leaderLineOffset; } + AnnotLineCaptionPos getCaptionPos() const { return captionPos; } + Dict *getMeasure() const { return measure; } + double getCaptionTextHorizontal() const { return captionTextHorizontal; } + double getCaptionTextVertical() const { return captionTextVertical; } + double getX1() const { return coord1->getX(); } + double getY1() const { return coord1->getY(); } + double getX2() const { return coord2->getX(); } + double getY2() const { return coord2->getY(); } + +protected: + void initialize(PDFDoc *docA, Dict *dict); + void generateLineAppearance(); + + // required + std::unique_ptr coord1; + std::unique_ptr coord2; + + // optional + // inherited from Annot + // AnnotBorderBS border; // BS + AnnotLineEndingStyle startStyle; // LE (Default [/None /None]) + AnnotLineEndingStyle endStyle; // + std::unique_ptr interiorColor; // IC + double leaderLineLength; // LL (Default 0) + double leaderLineExtension; // LLE (Default 0) + bool caption; // Cap (Default false) + AnnotLineIntent intent; // IT + double leaderLineOffset; // LLO + AnnotLineCaptionPos captionPos; // CP (Default Inline) + Dict *measure; // Measure + double captionTextHorizontal; // CO (Default [0, 0]) + double captionTextVertical; // +}; + +//------------------------------------------------------------------------ +// AnnotTextMarkup +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotTextMarkup : public AnnotMarkup +{ +public: + AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType); + AnnotTextMarkup(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotTextMarkup() override; + + void draw(Gfx *gfx, bool printing) override; + + // typeHighlight, typeUnderline, typeSquiggly or typeStrikeOut + void setType(AnnotSubtype new_type); + + void setQuadrilaterals(AnnotQuadrilaterals *quadPoints); + + AnnotQuadrilaterals *getQuadrilaterals() const { return quadrilaterals.get(); } + +protected: + void initialize(PDFDoc *docA, Dict *dict); + + std::unique_ptr quadrilaterals; // QuadPoints + +private: + bool shouldCreateApperance(Gfx *gfx) const; +}; + +//------------------------------------------------------------------------ +// AnnotStamp +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotStamp : public AnnotMarkup +{ +public: + AnnotStamp(PDFDoc *docA, PDFRectangle *rect); + AnnotStamp(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotStamp() override; + + void draw(Gfx *gfx, bool printing) override; + + void setIcon(GooString *new_icon); + + void setCustomImage(AnnotStampImageHelper *stampImageHelperA); + + void clearCustomImage(); + + // getters + const GooString *getIcon() const { return icon.get(); } + +private: + void initialize(PDFDoc *docA, Dict *dict); + void generateStampDefaultAppearance(); + void generateStampCustomAppearance(); + + std::unique_ptr icon; // Name (Default Draft) + AnnotStampImageHelper *stampImageHelper; + Ref updatedAppearanceStream; +}; + +//------------------------------------------------------------------------ +// AnnotGeometry +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotGeometry : public AnnotMarkup +{ +public: + AnnotGeometry(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType); + AnnotGeometry(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotGeometry() override; + + void draw(Gfx *gfx, bool printing) override; + + void setType(AnnotSubtype new_type); // typeSquare or typeCircle + void setInteriorColor(std::unique_ptr &&new_color); + + // getters + AnnotColor *getInteriorColor() const { return interiorColor.get(); } + AnnotBorderEffect *getBorderEffect() const { return borderEffect.get(); } + PDFRectangle *getGeometryRect() const { return geometryRect.get(); } + +private: + void initialize(PDFDoc *docA, Dict *dict); + + std::unique_ptr interiorColor; // IC + std::unique_ptr borderEffect; // BE + std::unique_ptr geometryRect; // RD (combined with Rect) +}; + +//------------------------------------------------------------------------ +// AnnotPolygon +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotPolygon : public AnnotMarkup +{ +public: + enum AnnotPolygonIntent + { + polygonCloud, // PolygonCloud + polylineDimension, // PolyLineDimension + polygonDimension // PolygonDimension + }; + + AnnotPolygon(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype subType); + AnnotPolygon(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotPolygon() override; + + void draw(Gfx *gfx, bool printing) override; + void generatePolyLineAppearance(AnnotAppearanceBuilder *appearBuilder); + void setType(AnnotSubtype new_type); // typePolygon or typePolyLine + void setVertices(AnnotPath *path); + void setStartEndStyle(AnnotLineEndingStyle start, AnnotLineEndingStyle end); + void setInteriorColor(std::unique_ptr &&new_color); + void setIntent(AnnotPolygonIntent new_intent); + + // getters + AnnotPath *getVertices() const { return vertices.get(); } + AnnotLineEndingStyle getStartStyle() const { return startStyle; } + AnnotLineEndingStyle getEndStyle() const { return endStyle; } + AnnotColor *getInteriorColor() const { return interiorColor.get(); } + AnnotBorderEffect *getBorderEffect() const { return borderEffect.get(); } + AnnotPolygonIntent getIntent() const { return intent; } + +private: + void initialize(PDFDoc *docA, Dict *dict); + + // required + std::unique_ptr vertices; // Vertices + + // optional + AnnotLineEndingStyle startStyle; // LE (Default [/None /None]) + AnnotLineEndingStyle endStyle; // + // inherited from Annot + // AnnotBorderBS border; // BS + std::unique_ptr interiorColor; // IC + std::unique_ptr borderEffect; // BE + AnnotPolygonIntent intent; // IT + // Measure +}; + +//------------------------------------------------------------------------ +// AnnotCaret +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotCaret : public AnnotMarkup +{ +public: + enum AnnotCaretSymbol + { + symbolNone, // None + symbolP // P + }; + + AnnotCaret(PDFDoc *docA, PDFRectangle *rect); + AnnotCaret(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotCaret() override; + + void setSymbol(AnnotCaretSymbol new_symbol); + + // getters + AnnotCaretSymbol getSymbol() const { return symbol; } + PDFRectangle *getCaretRect() const { return caretRect.get(); } + +private: + void initialize(PDFDoc *docA, Dict *dict); + + AnnotCaretSymbol symbol; // Sy (Default None) + std::unique_ptr caretRect; // RD (combined with Rect) +}; + +//------------------------------------------------------------------------ +// AnnotInk +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotInk : public AnnotMarkup +{ +public: + AnnotInk(PDFDoc *docA, PDFRectangle *rect); + AnnotInk(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotInk() override; + + void draw(Gfx *gfx, bool printing) override; + + void setInkList(AnnotPath **paths, int n_paths); + + // getters + AnnotPath **getInkList() const { return inkList; } + int getInkListLength() const { return inkListLength; } + +private: + void initialize(PDFDoc *docA, Dict *dict); + void writeInkList(AnnotPath **paths, int n_paths, Array *dest_array); + void parseInkList(Array *src_array); + void freeInkList(); + + // required + AnnotPath **inkList; // InkList + int inkListLength; + + // optional + // inherited from Annot + // AnnotBorderBS border; // BS +}; + +//------------------------------------------------------------------------ +// AnnotFileAttachment +//------------------------------------------------------------------------ + +class AnnotFileAttachment : public AnnotMarkup +{ +public: + AnnotFileAttachment(PDFDoc *docA, PDFRectangle *rect, GooString *filename); + AnnotFileAttachment(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotFileAttachment() override; + + void draw(Gfx *gfx, bool printing) override; + + // getters + Object *getFile() { return &file; } + const GooString *getName() const { return name.get(); } + +private: + void initialize(PDFDoc *docA, Dict *dict); + + // required + Object file; // FS + + // optional + std::unique_ptr name; // Name +}; + +//------------------------------------------------------------------------ +// AnnotSound +//------------------------------------------------------------------------ + +class AnnotSound : public AnnotMarkup +{ +public: + AnnotSound(PDFDoc *docA, PDFRectangle *rect, Sound *soundA); + AnnotSound(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotSound() override; + + void draw(Gfx *gfx, bool printing) override; + + // getters + Sound *getSound() { return sound.get(); } + const GooString *getName() const { return name.get(); } + +private: + void initialize(PDFDoc *docA, Dict *dict); + + // required + std::unique_ptr sound; // Sound + + // optional + std::unique_ptr name; // Name +}; + +//------------------------------------------------------------------------ +// AnnotWidget +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotWidget : public Annot +{ +public: + enum AnnotWidgetHighlightMode + { + highlightModeNone, // N + highlightModeInvert, // I + highlightModeOutline, // O + highlightModePush // P,T + }; + + AnnotWidget(PDFDoc *docA, Object &&dictObject, const Object *obj); + AnnotWidget(PDFDoc *docA, Object *dictObject, Object *obj, FormField *fieldA); + ~AnnotWidget() override; + + void draw(Gfx *gfx, bool printing) override; + void invalidateAppearance() override; + + void generateFieldAppearance(); + void updateAppearanceStream(); + + AnnotWidgetHighlightMode getMode() { return mode; } + AnnotAppearanceCharacs *getAppearCharacs() { return appearCharacs.get(); } + void setAppearCharacs(std::unique_ptr &&appearCharacsA) { appearCharacs = std::move(appearCharacsA); } + LinkAction *getAction() { return action.get(); } // The caller should not delete the result + std::unique_ptr getAdditionalAction(AdditionalActionsType type); + std::unique_ptr getFormAdditionalAction(FormAdditionalActionsType type); + Dict *getParent() { return parent; } + + bool setFormAdditionalAction(FormAdditionalActionsType type, const std::string &js); + + void setField(FormField *f) { field = f; }; + +private: + void initialize(PDFDoc *docA, Dict *dict); + + Form *form; + FormField *field; // FormField object for this annotation + AnnotWidgetHighlightMode mode; // H (Default I) + std::unique_ptr appearCharacs; // MK + std::unique_ptr action; // A + Object additionalActions; // AA + // inherited from Annot + // AnnotBorderBS border; // BS + Dict *parent; // Parent + Ref updatedAppearanceStream; // {-1,-1} if updateAppearanceStream has never been called +}; + +//------------------------------------------------------------------------ +// Annot3D +//------------------------------------------------------------------------ + +class Annot3D : public Annot +{ + class Activation + { + public: + enum ActivationATrigger + { + aTriggerUnknown, + aTriggerPageOpened, // PO + aTriggerPageVisible, // PV + aTriggerUserAction // XA + }; + + enum ActivationAState + { + aStateUnknown, + aStateEnabled, // I + aStateDisabled // L + }; + + enum ActivationDTrigger + { + dTriggerUnknown, + dTriggerPageClosed, // PC + dTriggerPageInvisible, // PI + dTriggerUserAction // XD + }; + + enum ActivationDState + { + dStateUnknown, + dStateUninstantiaded, // U + dStateInstantiated, // I + dStateLive // L + }; + + explicit Activation(Dict *dict); + + private: + ActivationATrigger aTrigger; // A (Default XA) + ActivationAState aState; // AIS (Default L) + ActivationDTrigger dTrigger; // D (Default PI) + ActivationDState dState; // DIS (Default U) + bool displayToolbar; // TB (Default true) + bool displayNavigation; // NP (Default false); + }; + +public: + Annot3D(PDFDoc *docA, PDFRectangle *rect); + Annot3D(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~Annot3D() override; + + // getters + +private: + void initialize(PDFDoc *docA, Dict *dict); + + std::unique_ptr activation; // 3DA +}; + +//------------------------------------------------------------------------ +// AnnotRichMedia +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT AnnotRichMedia : public Annot +{ +public: + class POPPLER_PRIVATE_EXPORT Params + { + public: + explicit Params(Dict *dict); + ~Params(); + + Params(const Params &) = delete; + Params &operator=(const Params &) = delete; + + const GooString *getFlashVars() const; + + private: + // optional + std::unique_ptr flashVars; // FlashVars + }; + + class POPPLER_PRIVATE_EXPORT Instance + { + public: + enum Type + { + type3D, // 3D + typeFlash, // Flash + typeSound, // Sound + typeVideo // Video + }; + + explicit Instance(Dict *dict); + ~Instance(); + + Instance(const Instance &) = delete; + Instance &operator=(const Instance &) = delete; + + Type getType() const; + Params *getParams() const; + + private: + // optional + Type type; // Subtype + std::unique_ptr params; // Params + }; + + class POPPLER_PRIVATE_EXPORT Configuration + { + public: + enum Type + { + type3D, // 3D + typeFlash, // Flash + typeSound, // Sound + typeVideo // Video + }; + + explicit Configuration(Dict *dict); + ~Configuration(); + + Configuration(const Configuration &) = delete; + Configuration &operator=(const Configuration &) = delete; + + Type getType() const; + const GooString *getName() const; + int getInstancesCount() const; + Instance *getInstance(int index) const; + + private: + // optional + Type type; // Subtype + std::unique_ptr name; // Name + Instance **instances; // Instances + int nInstances; + }; + + class Content; + + class POPPLER_PRIVATE_EXPORT Asset + { + public: + Asset(); + ~Asset(); + + Asset(const Asset &) = delete; + Asset &operator=(const Asset &) = delete; + + const GooString *getName() const; + Object *getFileSpec() const; + + private: + friend class AnnotRichMedia::Content; + + std::unique_ptr name; + Object fileSpec; + }; + + class POPPLER_PRIVATE_EXPORT Content + { + public: + explicit Content(Dict *dict); + ~Content(); + + Content(const Content &) = delete; + Content &operator=(const Content &) = delete; + + int getConfigurationsCount() const; + Configuration *getConfiguration(int index) const; + + int getAssetsCount() const; + Asset *getAsset(int index) const; + + private: + // optional + Configuration **configurations; // Configurations + int nConfigurations; + + Asset **assets; // Assets + int nAssets; + }; + + class POPPLER_PRIVATE_EXPORT Activation + { + public: + enum Condition + { + conditionPageOpened, // PO + conditionPageVisible, // PV + conditionUserAction // XA + }; + + explicit Activation(Dict *dict); + + Condition getCondition() const; + + private: + // optional + Condition condition; + }; + + class POPPLER_PRIVATE_EXPORT Deactivation + { + public: + enum Condition + { + conditionPageClosed, // PC + conditionPageInvisible, // PI + conditionUserAction // XD + }; + + explicit Deactivation(Dict *dict); + + Condition getCondition() const; + + private: + // optional + Condition condition; + }; + + class POPPLER_PRIVATE_EXPORT Settings + { + public: + explicit Settings(Dict *dict); + ~Settings(); + + Settings(const Settings &) = delete; + Settings &operator=(const Settings &) = delete; + + Activation *getActivation() const; + Deactivation *getDeactivation() const; + + private: + // optional + std::unique_ptr activation; + std::unique_ptr deactivation; + }; + + AnnotRichMedia(PDFDoc *docA, PDFRectangle *rect); + AnnotRichMedia(PDFDoc *docA, Object &&dictObject, const Object *obj); + ~AnnotRichMedia() override; + + Content *getContent() const; + + Settings *getSettings() const; + +private: + void initialize(PDFDoc *docA, Dict *dict); + + // required + std::unique_ptr content; // RichMediaContent + + // optional + std::unique_ptr settings; // RichMediaSettings +}; + +//------------------------------------------------------------------------ +// Annots +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT Annots +{ +public: + // Build a list of Annot objects and call setPage on them + Annots(PDFDoc *docA, int page, Object *annotsObj); + + ~Annots(); + + Annots(const Annots &) = delete; + Annots &operator=(const Annots &) = delete; + + const std::vector &getAnnots() { return annots; } + + void appendAnnot(Annot *annot); + bool removeAnnot(Annot *annot); + +private: + Annot *createAnnot(Object &&dictObject, const Object *obj); + Annot *findAnnot(Ref *ref); + + PDFDoc *doc; + std::vector annots; +}; + +#endif diff --git a/poppler-24.05.0/poppler/AnnotStampImageHelper.cc b/poppler-24.05.0/poppler/AnnotStampImageHelper.cc new file mode 100644 index 0000000000000000000000000000000000000000..7d8fd85e66cce08168bf1d846700f2f68c58fc6a --- /dev/null +++ b/poppler-24.05.0/poppler/AnnotStampImageHelper.cc @@ -0,0 +1,79 @@ +//======================================================================== +// +// AnnotStampImageHelper.cc +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#include "AnnotStampImageHelper.h" + +#include "goo/gmem.h" +#include "goo/gstrtod.h" +#include "PDFDoc.h" +#include "Stream.h" +#include "Dict.h" + +#include + +AnnotStampImageHelper::AnnotStampImageHelper(PDFDoc *docA, int widthA, int heightA, ColorSpace colorSpace, int bitsPerComponent, char *data, int dataLength) +{ + initialize(docA, widthA, heightA, colorSpace, bitsPerComponent, data, dataLength); +} + +AnnotStampImageHelper::AnnotStampImageHelper(PDFDoc *docA, int widthA, int heightA, ColorSpace colorSpace, int bitsPerComponent, char *data, int dataLength, Ref softMaskRef) +{ + initialize(docA, widthA, heightA, colorSpace, bitsPerComponent, data, dataLength); + + sMaskRef = softMaskRef; + Dict *dict = imgObj.streamGetDict(); + dict->add("SMask", Object(sMaskRef)); +} + +void AnnotStampImageHelper::initialize(PDFDoc *docA, int widthA, int heightA, ColorSpace colorSpace, int bitsPerComponent, char *data, int dataLength) +{ + doc = docA; + width = widthA; + height = heightA; + sMaskRef = Ref::INVALID(); + + Dict *dict = new Dict(docA->getXRef()); + dict->add("Type", Object(objName, "XObject")); + dict->add("Subtype", Object(objName, "Image")); + dict->add("Width", Object(width)); + dict->add("Height", Object(height)); + dict->add("ImageMask", Object(false)); + dict->add("BitsPerComponent", Object(bitsPerComponent)); + dict->add("Length", Object(dataLength)); + + switch (colorSpace) { + case ColorSpace::DeviceGray: + dict->add("ColorSpace", Object(objName, "DeviceGray")); + break; + case ColorSpace::DeviceRGB: + dict->add("ColorSpace", Object(objName, "DeviceRGB")); + break; + case ColorSpace::DeviceCMYK: + dict->add("ColorSpace", Object(objName, "DeviceCMYK")); + break; + } + + char *dataCopied = (char *)gmalloc(sizeof(char) * (dataLength)); + std::memcpy(dataCopied, data, dataLength); + + Stream *dataStream = new AutoFreeMemStream(dataCopied, 0, dataLength, Object(dict)); + imgObj = Object(dataStream); + ref = doc->getXRef()->addIndirectObject(imgObj); +} + +void AnnotStampImageHelper::removeAnnotStampImageObject() +{ + if (sMaskRef != Ref::INVALID()) { + doc->getXRef()->removeIndirectObject(sMaskRef); + } + + doc->getXRef()->removeIndirectObject(ref); +} diff --git a/poppler-24.05.0/poppler/AnnotStampImageHelper.h b/poppler-24.05.0/poppler/AnnotStampImageHelper.h new file mode 100644 index 0000000000000000000000000000000000000000..ebe6e9191570d1b97db1d9a35c480eb6fd3df310 --- /dev/null +++ b/poppler-24.05.0/poppler/AnnotStampImageHelper.h @@ -0,0 +1,68 @@ +//======================================================================== +// +// AnnotStampImageHelper.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOTSTAMPIMAGEHELPER_H +#define ANNOTSTAMPIMAGEHELPER_H + +#include "Object.h" + +class PDFDoc; + +enum ColorSpace +{ + DeviceGray, + DeviceRGB, + DeviceCMYK +}; + +/** + * This class is used only to load Image XObjects into stamp annotations. It takes in + * the image parameters in its constructors and creates a new Image XObject that gets + * added to the XRef table, so that the annotations that would like to use it be able + * to get its ref number. + * + * To have transparency in the image, you should first try to create the soft + * mask of the image, by creating a AnnotStampImageHelper object giving it the soft + * image data normally. You would then need to pass in the created soft mask Image XObject + * ref to the actual image you'd like to be created by this helper class. + */ +class POPPLER_PRIVATE_EXPORT AnnotStampImageHelper +{ +public: + AnnotStampImageHelper(PDFDoc *docA, int widthA, int heightA, ColorSpace colorSpace, int bitsPerComponent, char *data, int dataLength); + AnnotStampImageHelper(PDFDoc *docA, int widthA, int heightA, ColorSpace colorSpace, int bitsPerComponent, char *data, int dataLength, Ref softMaskRef); + ~AnnotStampImageHelper() { } + + // Returns the ref to the created Image XObject + Ref getRef() const { return ref; } + + // Returns the width of the image + int getWidth() const { return width; } + // Returns the height of the image + int getHeight() const { return height; } + + // Removes the created Image XObject as well as its soft mask from the XRef Table + void removeAnnotStampImageObject(); + +private: + void initialize(PDFDoc *docA, int widthA, int heightA, ColorSpace colorSpace, int bitsPerComponent, char *data, int dataLength); + + PDFDoc *doc; + + Object imgObj; + Ref ref; + Ref sMaskRef; + + int width; + int height; +}; + +#endif diff --git a/poppler-24.05.0/poppler/Array.cc b/poppler-24.05.0/poppler/Array.cc new file mode 100644 index 0000000000000000000000000000000000000000..6f32b3c416477c6508f010a6b8d846b1390fdce4 --- /dev/null +++ b/poppler-24.05.0/poppler/Array.cc @@ -0,0 +1,128 @@ +//======================================================================== +// +// Array.cc +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Kristian Høgsberg +// Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2013, 2017, 2019, 2022 Albert Astals Cid +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018, 2019 Adam Reichold +// +// 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 + +#include + +#include "Object.h" +#include "Array.h" + +//------------------------------------------------------------------------ +// Array +//------------------------------------------------------------------------ + +#define arrayLocker() const std::scoped_lock locker(mutex) + +Array::Array(XRef *xrefA) +{ + xref = xrefA; + ref = 1; +} + +Array::~Array() { } + +Array *Array::copy(XRef *xrefA) const +{ + arrayLocker(); + Array *a = new Array(xrefA); + a->elems.reserve(elems.size()); + for (const auto &elem : elems) { + a->elems.push_back(elem.copy()); + } + return a; +} + +Array *Array::deepCopy() const +{ + arrayLocker(); + Array *a = new Array(xref); + a->elems.reserve(elems.size()); + for (const auto &elem : elems) { + a->elems.push_back(elem.deepCopy()); + } + return a; +} + +void Array::add(Object &&elem) +{ + arrayLocker(); + elems.push_back(std::move(elem)); +} + +void Array::remove(int i) +{ + arrayLocker(); + if (i < 0 || std::size_t(i) >= elems.size()) { + assert(i >= 0 && std::size_t(i) < elems.size()); + return; + } + elems.erase(elems.begin() + i); +} + +Object Array::get(int i, int recursion) const +{ + if (i < 0 || std::size_t(i) >= elems.size()) { + return Object(objNull); + } + return elems[i].fetch(xref, recursion); +} + +Object Array::get(int i, Ref *returnRef, int recursion) const +{ + if (i < 0 || std::size_t(i) >= elems.size()) { + *returnRef = Ref::INVALID(); + return Object(objNull); + } + if (elems[i].getType() == objRef) { + *returnRef = elems[i].getRef(); + } else { + *returnRef = Ref::INVALID(); + } + return elems[i].fetch(xref, recursion); +} + +const Object &Array::getNF(int i) const +{ + if (i < 0 || std::size_t(i) >= elems.size()) { + static Object nullObj(objNull); + return nullObj; + } + return elems[i]; +} + +bool Array::getString(int i, GooString *string) const +{ + const Object &obj = getNF(i); + if (obj.isString()) { + string->clear(); + string->append(obj.getString()); + return true; + } else { + return false; + } +} diff --git a/poppler-24.05.0/poppler/Array.h b/poppler-24.05.0/poppler/Array.h new file mode 100644 index 0000000000000000000000000000000000000000..50bc9d0aff4a54d2654b57cbd1fbb84b9fa665fb --- /dev/null +++ b/poppler-24.05.0/poppler/Array.h @@ -0,0 +1,92 @@ +//======================================================================== +// +// Array.h +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Kristian Høgsberg +// Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2017-2019, 2021 Albert Astals Cid +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018, 2019 Adam Reichold +// +// 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 +// +//======================================================================== + +#ifndef ARRAY_H +#define ARRAY_H + +#include +#include +#include + +#include "poppler-config.h" +#include "poppler_private_export.h" +#include "Object.h" + +class XRef; + +//------------------------------------------------------------------------ +// Array +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT Array +{ +public: + // Constructor. + explicit Array(XRef *xrefA); + + // Destructor. + ~Array(); + + Array(const Array &) = delete; + Array &operator=(const Array &) = delete; + + // Get number of elements. + int getLength() const { return elems.size(); } + + // Copy array with new xref + Array *copy(XRef *xrefA) const; + + Array *deepCopy() const; + + // Add an element + // elem becomes a dead object after this call + void add(Object &&elem); + + // Remove an element by position + void remove(int i); + + // Accessors. + Object get(int i, int recursion = 0) const; + // Same as above but if the returned object is a fetched Ref returns such Ref in returnRef, otherwise returnRef is Ref::INVALID() + Object get(int i, Ref *returnRef, int recursion = 0) const; + const Object &getNF(int i) const; + bool getString(int i, GooString *string) const; + +private: + friend class Object; // for incRef/decRef + + // Reference counting. + int incRef() { return ++ref; } + int decRef() { return --ref; } + + XRef *xref; // the xref table for this PDF file + std::vector elems; // array of elements + std::atomic_int ref; // reference count + mutable std::recursive_mutex mutex; +}; + +#endif diff --git a/poppler-24.05.0/poppler/BBoxOutputDev.cc b/poppler-24.05.0/poppler/BBoxOutputDev.cc new file mode 100644 index 0000000000000000000000000000000000000000..88b044e26b2fd30ada57fee841f1c962bf286e97 --- /dev/null +++ b/poppler-24.05.0/poppler/BBoxOutputDev.cc @@ -0,0 +1,228 @@ +//======================================================================== +// +// BBoxOutputDev.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2020 sgerwk +// Copyright 2022 Oliver Sander +// +//======================================================================== + +#include +#include +#include + +#define writingModeHorizontal 0 +#define writingModeVertical 1 + +BBoxOutputDev::BBoxOutputDev() : BBoxOutputDev(true, true, true) { } + +BBoxOutputDev::BBoxOutputDev(bool textA, bool vectorA, bool rasterA) : BBoxOutputDev(textA, vectorA, rasterA, true) { } + +BBoxOutputDev::BBoxOutputDev(bool textA, bool vectorA, bool rasterA, bool lwidthA) +{ + hasGraphics = false; + text = textA; + vector = vectorA; + raster = rasterA; + lwidth = lwidthA; +} + +double BBoxOutputDev::getX1() const +{ + return bb.x1; +} + +double BBoxOutputDev::getY1() const +{ + return bb.y1; +} + +double BBoxOutputDev::getX2() const +{ + return bb.x2; +} + +double BBoxOutputDev::getY2() const +{ + return bb.y2; +} + +double BBoxOutputDev::getHasGraphics() const +{ + return hasGraphics; +} + +void BBoxOutputDev::endPage() { } + +void BBoxOutputDev::stroke(GfxState *state) +{ + updatePath(&bb, state->getPath(), state); +} + +void BBoxOutputDev::fill(GfxState *state) +{ + updatePath(&bb, state->getPath(), state); +} + +void BBoxOutputDev::eoFill(GfxState *state) +{ + updatePath(&bb, state->getPath(), state); +} + +void BBoxOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) +{ + updateImage(&bb, state); +} + +void BBoxOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) +{ + updateImage(&bb, state); +} + +void BBoxOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, bool maskInvert, bool maskInterpolate) +{ + updateImage(&bb, state); +} + +void BBoxOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap, + bool maskInterpolate) +{ + updateImage(&bb, state); +} + +void BBoxOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) +{ + double leftent, rightent, ascent, descent; + const double *fm, *fb; + double fontSize, w, adjust; + double fx, fy; + + if (!text) { + return; + } + + const GfxFont *const font = state->getFont().get(); + if (!font) { + return; + } + + if (code == (CharCode)0x20) { + return; + } + + fontSize = state->getFontSize(); + + fb = font->getFontBBox(); + if (font->getWMode() == writingModeHorizontal) { + leftent = 0; + rightent = 0; + ascent = font->getAscent(); + descent = font->getDescent(); + } else { + if (fb[0] == 0 && fb[1] == 0 && fb[2] == 0 && fb[3] == 0) { + leftent = -0.5; + rightent = 0.5; + } else { + leftent = fb[1]; + rightent = fb[3]; + } + ascent = 0; + descent = 0; + } + + if (font->getType() != fontType3) { + adjust = 1; + } else { + // adjust font size for type3 fonts, + // similar to TextPage::updateFont() + w = ((Gfx8BitFont *)font)->getWidth(code); + adjust = w / 0.5; + fm = font->getFontMatrix(); + if (fm[0] != 0) { + adjust *= fabs(fm[3] / fm[0]); + } + } + + ascent *= adjust * fontSize; + descent *= adjust * fontSize; + leftent *= adjust * fontSize; + rightent *= adjust * fontSize; + + state->textTransformDelta(leftent, descent, &fx, &fy); + updatePoint(&bb, fx + x, fy + y, state); + + state->textTransformDelta(rightent, ascent, &fx, &fy); + updatePoint(&bb, fx + x, fy + y, state); + + state->textTransformDelta(leftent, descent, &fx, &fy); + updatePoint(&bb, fx + x + dx, fy + y + dy, state); + + state->textTransformDelta(rightent, ascent, &fx, &fy); + updatePoint(&bb, fx + x + dx, fy + y + dy, state); +} + +/* update the bounding box with a new point */ +void BBoxOutputDev::updatePoint(PDFRectangle *bbA, double x, double y, const GfxState *state) +{ + Matrix o = { 1, 0, 0, 1, 0, 0 }; + double tx, ty; + double xMin, yMin, xMax, yMax; + + state->getClipBBox(&xMin, &yMin, &xMax, &yMax); + + o.scale(1, -1); + o.translate(0, -state->getPageHeight()); + + state->transform(x, y, &tx, &ty); + tx = tx < xMin ? xMin : tx > xMax ? xMax : tx; + ty = ty < yMin ? yMin : ty > yMax ? yMax : ty; + o.transform(tx, ty, &x, &y); + + if (!hasGraphics || bbA->x1 > x) { + bbA->x1 = x; + } + if (!hasGraphics || bbA->y1 > y) { + bbA->y1 = y; + } + if (!hasGraphics || bbA->x2 < x) { + bbA->x2 = x; + } + if (!hasGraphics || bbA->y2 < y) { + bbA->y2 = y; + } + hasGraphics = true; +} + +/* update the bounding box with a new path */ +void BBoxOutputDev::updatePath(PDFRectangle *bbA, const GfxPath *path, const GfxState *state) +{ + int i, j; + const GfxSubpath *subpath; + double x, y; + double w; + if (!vector) { + return; + } + w = lwidth ? state->getLineWidth() : 0; + for (i = 0; i < path->getNumSubpaths(); i++) { + subpath = path->getSubpath(i); + for (j = 0; j < subpath->getNumPoints(); j++) { + x = subpath->getX(j); + y = subpath->getY(j); + updatePoint(bbA, x - w / 2, y - w / 2, state); + updatePoint(bbA, x + w / 2, y + w / 2, state); + } + } +} + +/* update the bounding box with a new image */ +void BBoxOutputDev::updateImage(PDFRectangle *bbA, const GfxState *state) +{ + if (!raster) { + return; + } + updatePoint(bbA, 0, 1, state); + updatePoint(bbA, 1, 0, state); +} diff --git a/poppler-24.05.0/poppler/BBoxOutputDev.h b/poppler-24.05.0/poppler/BBoxOutputDev.h new file mode 100644 index 0000000000000000000000000000000000000000..e48122fd48edcb2bd5844594be618936884cca12 --- /dev/null +++ b/poppler-24.05.0/poppler/BBoxOutputDev.h @@ -0,0 +1,54 @@ +//======================================================================== +// +// BBoxOutputDev.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2020 sgerwk +// +//======================================================================== + +#include +#include +#include + +class POPPLER_PRIVATE_EXPORT BBoxOutputDev : public OutputDev +{ +public: + bool upsideDown() override { return false; } + bool useDrawChar() override { return true; } + bool interpretType3Chars() override { return false; } + + BBoxOutputDev(); + BBoxOutputDev(bool text, bool vector, bool raster); + BBoxOutputDev(bool text, bool vector, bool raster, bool lwidth); + void endPage() override; + void stroke(GfxState *state) override; + void fill(GfxState *state) override; + void eoFill(GfxState *state) override; + void drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) override; + void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) override; + void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) override; + void drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, bool maskInvert, bool maskInterpolate) override; + void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap, + bool maskInterpolate) override; + + double getX1() const; + double getY1() const; + double getX2() const; + double getY2() const; + double getHasGraphics() const; + +private: + PDFRectangle bb; + bool hasGraphics; + + bool text; + bool vector; + bool raster; + bool lwidth; + + void updatePoint(PDFRectangle *bbA, double x, double y, const GfxState *state); + void updatePath(PDFRectangle *bbA, const GfxPath *path, const GfxState *state); + void updateImage(PDFRectangle *bbA, const GfxState *state); +}; diff --git a/poppler-24.05.0/poppler/BuiltinFont.h b/poppler-24.05.0/poppler/BuiltinFont.h new file mode 100644 index 0000000000000000000000000000000000000000..8ed030586eaa7c5a3ee816c643f087a361b25d4c --- /dev/null +++ b/poppler-24.05.0/poppler/BuiltinFont.h @@ -0,0 +1,93 @@ +//======================================================================== +// +// BuiltinFont.h +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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, 2020 Albert Astals Cid +// +// 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 +// +//======================================================================== + +#ifndef BUILTINFONT_H +#define BUILTINFONT_H + +#include "BuiltinFontWidth.h" + +//------------------------------------------------------------------------ + +using GetWidthFunction = const BuiltinFontWidth *(*)(const char *str, size_t len); + +struct BuiltinFont +{ + const char *name; + const char **defaultBaseEnc; + short ascent; + short descent; + short bbox[4]; + GetWidthFunction f; + + bool getWidth(const char *n, unsigned short *w) const + { + const struct BuiltinFontWidth *bfw = f(n, strlen(n)); + if (!bfw) { + return false; + } + + *w = bfw->width; + return true; + } +}; + +//------------------------------------------------------------------------ + +extern "C" { +// define the gperf generated Lookup functions +const struct BuiltinFontWidth *CourierWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *CourierBoldWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *CourierBoldObliqueWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *CourierObliqueWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *HelveticaWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *HelveticaBoldWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *HelveticaBoldObliqueWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *HelveticaObliqueWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *SymbolWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *TimesBoldWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *TimesBoldItalicWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *TimesItalicWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *TimesRomanWidthsLookup(const char *str, size_t len); +const struct BuiltinFontWidth *ZapfDingbatsWidthsLookup(const char *str, size_t len); +} + +static const BuiltinFont builtinFonts[] = { { "Courier", standardEncoding, 629, -157, { -23, -250, 715, 805 }, &CourierWidthsLookup }, + { "Courier-Bold", standardEncoding, 629, -157, { -113, -250, 749, 801 }, &CourierBoldWidthsLookup }, + { "Courier-BoldOblique", standardEncoding, 629, -157, { -57, -250, 869, 801 }, &CourierBoldObliqueWidthsLookup }, + { "Courier-Oblique", standardEncoding, 629, -157, { -27, -250, 849, 805 }, &CourierObliqueWidthsLookup }, + { "Helvetica", standardEncoding, 718, -207, { -166, -225, 1000, 931 }, &HelveticaWidthsLookup }, + { "Helvetica-Bold", standardEncoding, 718, -207, { -170, -228, 1003, 962 }, &HelveticaBoldWidthsLookup }, + { "Helvetica-BoldOblique", standardEncoding, 718, -207, { -174, -228, 1114, 962 }, &HelveticaBoldObliqueWidthsLookup }, + { "Helvetica-Oblique", standardEncoding, 718, -207, { -170, -225, 1116, 931 }, &HelveticaObliqueWidthsLookup }, + { "Symbol", symbolEncoding, 1010, -293, { -180, -293, 1090, 1010 }, &SymbolWidthsLookup }, + { "Times-Bold", standardEncoding, 683, -217, { -168, -218, 1000, 935 }, &TimesBoldWidthsLookup }, + { "Times-BoldItalic", standardEncoding, 683, -217, { -200, -218, 996, 921 }, &TimesBoldItalicWidthsLookup }, + { "Times-Italic", standardEncoding, 683, -217, { -169, -217, 1010, 883 }, &TimesItalicWidthsLookup }, + { "Times-Roman", standardEncoding, 683, -217, { -168, -218, 1000, 898 }, &TimesRomanWidthsLookup }, + { "ZapfDingbats", zapfDingbatsEncoding, 820, -143, { -1, -143, 981, 820 }, &ZapfDingbatsWidthsLookup } }; + +static const BuiltinFont *builtinFontSubst[] = { &builtinFonts[0], &builtinFonts[3], &builtinFonts[1], &builtinFonts[2], &builtinFonts[4], &builtinFonts[7], + &builtinFonts[5], &builtinFonts[6], &builtinFonts[12], &builtinFonts[11], &builtinFonts[9], &builtinFonts[10] }; + +//------------------------------------------------------------------------ + +#endif diff --git a/poppler-24.05.0/poppler/BuiltinFontWidth.h b/poppler-24.05.0/poppler/BuiltinFontWidth.h new file mode 100644 index 0000000000000000000000000000000000000000..bff5d36cc0cd2e92c807f2f4095f9fe8564a5151 --- /dev/null +++ b/poppler-24.05.0/poppler/BuiltinFontWidth.h @@ -0,0 +1,32 @@ +//======================================================================== +// +// BuiltinFontWidth.h +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2020 Albert Astals Cid +// +// 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 +// +//======================================================================== + +#ifndef BUILTINFONTWIDTH_H +#define BUILTINFONTWIDTH_H + +struct BuiltinFontWidth +{ + const char *name; + unsigned short width; +}; + +#endif diff --git a/poppler-24.05.0/poppler/CIDFontsWidthsBuilder.h b/poppler-24.05.0/poppler/CIDFontsWidthsBuilder.h new file mode 100644 index 0000000000000000000000000000000000000000..164016d04c11fcf8e1a56960327ef1dc94a8bb9d --- /dev/null +++ b/poppler-24.05.0/poppler/CIDFontsWidthsBuilder.h @@ -0,0 +1,190 @@ +//======================================================================== +// +// CIDFontsWidthsBuilder.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela +//======================================================================== + +#ifndef CIDFontsWidthsBuilder_H +#define CIDFontsWidthsBuilder_H + +#include +#include +#include +#include +#include + +/** Class to help build the widths array as defined in + pdf standard 9.7.4.3 Glyph Metrcis in CIDFonts in + ISO 32000-2:2020 + + The way to use this is to create a builder, then add all the widths + and their attached code in order using \ref addWidth and finally call \ref takeSegments + + The resulting value is a list of segments of either \ref ListSegment or + \ref RangeSegment + */ +class CIDFontsWidthsBuilder +{ +public: + /// Segment that should be encoded as a first index and a list of n number specifying the next n widths + class ListSegment + { + public: + int first; + std::vector widths; + }; + /// Segment that should be encoded as 3 integers, first, last (included) and the width for that group. + class RangeSegment + { + public: + int first; + int last; + int width; + }; + using Segment = std::variant; + + /** + * Adds a width for a given index. + * + * Must be called with ever increasing indices until \ref takeSegments + * has been called + */ + void addWidth(int index, int width) + { + if (m_currentSegment.m_lastIndex.has_value() && index <= m_currentSegment.m_lastIndex) { + assert(false); // this is likely a error originating from the user of this code that this function gets called twice with the same or decreasing value. + return; + } + while (!m_currentSegment.accept(index, width)) { + segmentDone(); + } + } + + /** + * \return the resulting segments and resets this font builder + */ + [[nodiscard]] std::vector takeSegments() + { + finish(); + auto rv = std::move(m_segments); + m_segments = {}; + return rv; + } + +private: + void finish() + { + while (m_currentSegment.m_values.size()) { + segmentDone(); + } + m_currentSegment = {}; + } + class SegmentBuilder + { + // How many elements at the end has this + int uniqueElementsFromEnd(int value) + { + auto lastDifferent = std::find_if(m_values.rbegin(), m_values.rend(), [value](auto &&element) { return element != value; }); + return std::distance(m_values.rbegin(), lastDifferent); + } + + public: + /** Tries to add a index/width combo. + * If a value is not accepted, caller should + * build a segment and repeat the accept call. + * + * \return if accepted or not + */ + bool accept(int index, int value) + { + if (m_lastIndex.has_value() && m_lastIndex != index - 1) { + // we have gaps. That's okay. We just need to ensure to finish the segment + return false; + } + if (!m_firstIndex) { + m_firstIndex = index; + } + if (m_values.size() < 4) { + m_values.push_back(value); + if (m_values.front() != value) { + differentValues = true; + } + m_lastIndex = index; + return true; + } + if (!differentValues) { + if (m_values.back() == value) { + m_values.push_back(value); + m_lastIndex = index; + return true; + } else { + // We need to end a range segment + // to start a new segment with different value + return false; + } + } else { + if (uniqueElementsFromEnd(value) >= 3) { + // We now have at least 3 unique elements + // at the end, so we should finish the previous + // list segment and then start a range segment + return false; + } else { + m_values.push_back(value); + m_lastIndex = index; + return true; + } + } + } + /** + * Builds the segment of the values so far. + */ + Segment build() + { + if (differentValues || m_values.size() < 4) { + std::vector savedValues; + if (m_values.size() >= 4) { + auto lastDifferent = std::find_if(m_values.rbegin(), m_values.rend(), [value = m_values.back()](auto &&element) { return element != value; }); + if (std::distance(m_values.rbegin(), lastDifferent) >= 3) { + savedValues.push_back(m_values.back()); + m_values.pop_back(); + while (m_values.size() && m_values.back() == savedValues.back()) { + savedValues.push_back(m_values.back()); + m_values.pop_back(); + } + } + } + + ListSegment segment { m_firstIndex.value(), std::move(m_values) }; + if (!savedValues.empty()) { + m_firstIndex = m_lastIndex.value() - savedValues.size() + 1; + } else { + m_firstIndex = {}; + m_lastIndex = {}; + } + m_values = std::move(savedValues); + differentValues = false; + return segment; + } else { + auto segment = RangeSegment { m_firstIndex.value(), m_lastIndex.value(), m_values.back() }; + m_values.clear(); + m_firstIndex = {}; + m_lastIndex = {}; + differentValues = false; + return segment; + } + } + std::vector m_values; + std::optional m_lastIndex; + std::optional m_firstIndex; + bool differentValues = false; + }; + std::vector m_segments; + SegmentBuilder m_currentSegment; + + void segmentDone() { m_segments.push_back(m_currentSegment.build()); } +}; + +#endif // CIDFontsWidthsBuilder_H diff --git a/poppler-24.05.0/poppler/CMap.cc b/poppler-24.05.0/poppler/CMap.cc new file mode 100644 index 0000000000000000000000000000000000000000..71c357b57e7006c82bc60434f24e64d0eeae46e8 --- /dev/null +++ b/poppler-24.05.0/poppler/CMap.cc @@ -0,0 +1,438 @@ +//======================================================================== +// +// CMap.cc +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2008 Koji Otani +// Copyright (C) 2008, 2009, 2017-2021 Albert Astals Cid +// Copyright (C) 2013 Fabio D'Urso +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019 LE GARREC Vincent +// +// 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 + +#include +#include +#include +#include +#include "goo/gmem.h" +#include "goo/gfile.h" +#include "goo/GooString.h" +#include "Error.h" +#include "GlobalParams.h" +#include "PSTokenizer.h" +#include "CMap.h" +#include "Object.h" + +//------------------------------------------------------------------------ + +struct CMapVectorEntry +{ + bool isVector; + union { + CMapVectorEntry *vector; + CID cid; + }; +}; + +//------------------------------------------------------------------------ + +static int getCharFromFile(void *data) +{ + return fgetc((FILE *)data); +} + +static int getCharFromStream(void *data) +{ + return ((Stream *)data)->getChar(); +} + +//------------------------------------------------------------------------ + +std::shared_ptr CMap::parse(CMapCache *cache, const GooString *collectionA, Object *obj) +{ + std::shared_ptr cMap; + GooString *cMapNameA; + + if (obj->isName()) { + cMapNameA = new GooString(obj->getName()); + if (!(cMap = globalParams->getCMap(collectionA, cMapNameA))) { + error(errSyntaxError, -1, "Unknown CMap '{0:t}' for character collection '{1:t}'", cMapNameA, collectionA); + } + delete cMapNameA; + } else if (obj->isStream()) { + if (!(cMap = CMap::parse(nullptr, collectionA, obj->getStream()))) { + error(errSyntaxError, -1, "Invalid CMap in Type 0 font"); + } + } else { + error(errSyntaxError, -1, "Invalid Encoding in Type 0 font"); + return {}; + } + return cMap; +} + +std::shared_ptr CMap::parse(CMapCache *cache, const GooString *collectionA, const GooString *cMapNameA) +{ + FILE *f; + + if (!(f = globalParams->findCMapFile(collectionA, cMapNameA))) { + + // Check for an identity CMap. + if (!cMapNameA->cmp("Identity") || !cMapNameA->cmp("Identity-H")) { + return std::shared_ptr(new CMap(collectionA->copy(), cMapNameA->copy(), 0)); + } + if (!cMapNameA->cmp("Identity-V")) { + return std::shared_ptr(new CMap(collectionA->copy(), cMapNameA->copy(), 1)); + } + + error(errSyntaxError, -1, "Couldn't find '{0:t}' CMap file for '{1:t}' collection", cMapNameA, collectionA); + return {}; + } + + auto cMap = std::shared_ptr(new CMap(collectionA->copy(), cMapNameA->copy())); + cMap->parse2(cache, &getCharFromFile, f); + + fclose(f); + + return cMap; +} + +std::shared_ptr CMap::parse(CMapCache *cache, const GooString *collectionA, Stream *str) +{ + auto cMap = std::shared_ptr(new CMap(collectionA->copy(), nullptr)); + Object obj1 = str->getDict()->lookup("UseCMap"); + if (!obj1.isNull()) { + cMap->useCMap(cache, &obj1); + } + + str->reset(); + cMap->parse2(cache, &getCharFromStream, str); + str->close(); + return cMap; +} + +void CMap::parse2(CMapCache *cache, int (*getCharFunc)(void *), void *data) +{ + PSTokenizer *pst; + char tok1[256], tok2[256], tok3[256]; + int n1, n2, n3; + unsigned int start = 0, end = 0, code; + + pst = new PSTokenizer(getCharFunc, data); + pst->getToken(tok1, sizeof(tok1), &n1); + while (pst->getToken(tok2, sizeof(tok2), &n2)) { + if (!strcmp(tok2, "usecmap")) { + if (tok1[0] == '/') { + useCMap(cache, tok1 + 1); + } + pst->getToken(tok1, sizeof(tok1), &n1); + } else if (!strcmp(tok1, "/WMode")) { + wMode = atoi(tok2); + pst->getToken(tok1, sizeof(tok1), &n1); + } else if (!strcmp(tok2, "begincidchar")) { + while (pst->getToken(tok1, sizeof(tok1), &n1)) { + if (!strcmp(tok1, "endcidchar")) { + break; + } + if (!pst->getToken(tok2, sizeof(tok2), &n2) || !strcmp(tok2, "endcidchar")) { + error(errSyntaxError, -1, "Illegal entry in cidchar block in CMap"); + break; + } + if (!(tok1[0] == '<' && tok1[n1 - 1] == '>' && n1 >= 4 && (n1 & 1) == 0)) { + error(errSyntaxError, -1, "Illegal entry in cidchar block in CMap"); + continue; + } + tok1[n1 - 1] = '\0'; + if (sscanf(tok1 + 1, "%x", &code) != 1) { + error(errSyntaxError, -1, "Illegal entry in cidchar block in CMap"); + continue; + } + n1 = (n1 - 2) / 2; + addCIDs(code, code, n1, (CID)atoi(tok2)); + } + pst->getToken(tok1, sizeof(tok1), &n1); + } else if (!strcmp(tok2, "begincidrange")) { + while (pst->getToken(tok1, sizeof(tok1), &n1)) { + if (!strcmp(tok1, "endcidrange")) { + break; + } + if (!pst->getToken(tok2, sizeof(tok2), &n2) || !strcmp(tok2, "endcidrange") || !pst->getToken(tok3, sizeof(tok3), &n3) || !strcmp(tok3, "endcidrange")) { + error(errSyntaxError, -1, "Illegal entry in cidrange block in CMap"); + break; + } + if (tok1[0] == '<' && tok2[0] == '<' && n1 == n2 && n1 >= 4 && (n1 & 1) == 0) { + tok1[n1 - 1] = tok2[n1 - 1] = '\0'; + sscanf(tok1 + 1, "%x", &start); + sscanf(tok2 + 1, "%x", &end); + n1 = (n1 - 2) / 2; + addCIDs(start, end, n1, (CID)atoi(tok3)); + } + } + pst->getToken(tok1, sizeof(tok1), &n1); + } else { + strcpy(tok1, tok2); + } + } + delete pst; +} + +CMap::CMap(GooString *collectionA, GooString *cMapNameA) +{ + int i; + + collection = collectionA; + cMapName = cMapNameA; + isIdent = false; + wMode = 0; + vector = (CMapVectorEntry *)gmallocn(256, sizeof(CMapVectorEntry)); + for (i = 0; i < 256; ++i) { + vector[i].isVector = false; + vector[i].cid = 0; + } +} + +CMap::CMap(GooString *collectionA, GooString *cMapNameA, int wModeA) +{ + collection = collectionA; + cMapName = cMapNameA; + isIdent = true; + wMode = wModeA; + vector = nullptr; +} + +void CMap::useCMap(CMapCache *cache, const char *useName) +{ + GooString *useNameStr; + std::shared_ptr subCMap; + + useNameStr = new GooString(useName); + // if cache is non-NULL, we already have a lock, and we can use + // CMapCache::getCMap() directly; otherwise, we need to use + // GlobalParams::getCMap() in order to acqure the lock need to use + // GlobalParams::getCMap + if (cache) { + subCMap = cache->getCMap(collection, useNameStr); + } else { + subCMap = globalParams->getCMap(collection, useNameStr); + } + delete useNameStr; + if (!subCMap) { + return; + } + isIdent = subCMap->isIdent; + if (subCMap->vector) { + copyVector(vector, subCMap->vector); + } +} + +void CMap::useCMap(CMapCache *cache, Object *obj) +{ + std::shared_ptr subCMap = CMap::parse(cache, collection, obj); + if (!subCMap) { + return; + } + isIdent = subCMap->isIdent; + if (subCMap->vector) { + copyVector(vector, subCMap->vector); + } +} + +void CMap::copyVector(CMapVectorEntry *dest, CMapVectorEntry *src) +{ + int i, j; + + for (i = 0; i < 256; ++i) { + if (src[i].isVector) { + if (!dest[i].isVector) { + dest[i].isVector = true; + dest[i].vector = (CMapVectorEntry *)gmallocn(256, sizeof(CMapVectorEntry)); + for (j = 0; j < 256; ++j) { + dest[i].vector[j].isVector = false; + dest[i].vector[j].cid = 0; + } + } + copyVector(dest[i].vector, src[i].vector); + } else { + if (dest[i].isVector) { + error(errSyntaxError, -1, "Collision in usecmap"); + } else { + dest[i].cid = src[i].cid; + } + } + } +} + +void CMap::addCIDs(unsigned int start, unsigned int end, unsigned int nBytes, CID firstCID) +{ + if (nBytes > 4) { + error(errSyntaxError, -1, "Illegal entry in cidchar block in CMap"); + return; + } + + const unsigned int start1 = start & 0xffffff00; + const unsigned int end1 = end & 0xffffff00; + for (unsigned int i = start1; i <= end1; i += 0x100) { + CMapVectorEntry *vec = vector; + for (unsigned int j = nBytes - 1; j >= 1; --j) { + const int byte = (i >> (8 * j)) & 0xff; + if (!vec[byte].isVector) { + vec[byte].isVector = true; + vec[byte].vector = (CMapVectorEntry *)gmallocn(256, sizeof(CMapVectorEntry)); + for (unsigned int k = 0; k < 256; ++k) { + vec[byte].vector[k].isVector = false; + vec[byte].vector[k].cid = 0; + } + } + vec = vec[byte].vector; + } + const int byte0 = (i < start) ? (start & 0xff) : 0; + const int byte1 = (i + 0xff > end) ? (end & 0xff) : 0xff; + for (int byte = byte0; byte <= byte1; ++byte) { + if (vec[byte].isVector) { + error(errSyntaxError, -1, "Invalid CID ({0:ux} [{1:ud} bytes]) in CMap", i, nBytes); + } else { + vec[byte].cid = firstCID + ((i + byte) - start); + } + } + } +} + +CMap::~CMap() +{ + delete collection; + delete cMapName; + if (vector) { + freeCMapVector(vector); + } +} + +void CMap::freeCMapVector(CMapVectorEntry *vec) +{ + int i; + + for (i = 0; i < 256; ++i) { + if (vec[i].isVector) { + freeCMapVector(vec[i].vector); + } + } + gfree(vec); +} + +bool CMap::match(const GooString *collectionA, const GooString *cMapNameA) +{ + return !collection->cmp(collectionA) && !cMapName->cmp(cMapNameA); +} + +CID CMap::getCID(const char *s, int len, CharCode *c, int *nUsed) +{ + CMapVectorEntry *vec; + CharCode cc; + int n, i; + + vec = vector; + cc = 0; + n = 0; + while (vec && n < len) { + i = s[n++] & 0xff; + cc = (cc << 8) | i; + if (!vec[i].isVector) { + *c = cc; + *nUsed = n; + return vec[i].cid; + } + vec = vec[i].vector; + } + if (isIdent && len >= 2) { + // identity CMap + *nUsed = 2; + *c = cc = ((s[0] & 0xff) << 8) + (s[1] & 0xff); + return cc; + } + *nUsed = 1; + *c = s[0] & 0xff; + return 0; +} + +void CMap::setReverseMapVector(unsigned int startCode, CMapVectorEntry *vec, unsigned int *rmap, unsigned int rmapSize, unsigned int ncand) +{ + int i; + + if (vec == nullptr) { + return; + } + for (i = 0; i < 256; i++) { + if (vec[i].isVector) { + setReverseMapVector((startCode + i) << 8, vec[i].vector, rmap, rmapSize, ncand); + } else { + unsigned int cid = vec[i].cid; + + if (cid < rmapSize) { + unsigned int cand; + + for (cand = 0; cand < ncand; cand++) { + unsigned int code = startCode + i; + unsigned int idx = cid * ncand + cand; + if (rmap[idx] == 0) { + rmap[idx] = code; + break; + } else if (rmap[idx] == code) { + break; + } + } + } + } + } +} + +void CMap::setReverseMap(unsigned int *rmap, unsigned int rmapSize, unsigned int ncand) +{ + setReverseMapVector(0, vector, rmap, rmapSize, ncand); +} + +//------------------------------------------------------------------------ + +CMapCache::CMapCache() { } + +std::shared_ptr CMapCache::getCMap(const GooString *collection, const GooString *cMapName) +{ + int i, j; + + if (cache[0] && cache[0]->match(collection, cMapName)) { + return cache[0]; + } + for (i = 1; i < cMapCacheSize; ++i) { + if (cache[i] && cache[i]->match(collection, cMapName)) { + std::shared_ptr cmap = cache[i]; + for (j = i; j >= 1; --j) { + cache[j] = cache[j - 1]; + } + cache[0] = cmap; + return cmap; + } + } + std::shared_ptr cmap = CMap::parse(this, collection, cMapName); + if (cmap) { + for (j = cMapCacheSize - 1; j >= 1; --j) { + cache[j] = cache[j - 1]; + } + cache[0] = cmap; + return cmap; + } + return {}; +} diff --git a/poppler-24.05.0/poppler/CMap.h b/poppler-24.05.0/poppler/CMap.h new file mode 100644 index 0000000000000000000000000000000000000000..9ef876e9ea0d36ded0ce83aa3591735e2dc643a1 --- /dev/null +++ b/poppler-24.05.0/poppler/CMap.h @@ -0,0 +1,128 @@ +//======================================================================== +// +// CMap.h +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2008 Koji Otani +// Copyright (C) 2009, 2018-2020, 2022 Albert Astals Cid +// Copyright (C) 2012, 2017 Adrian Johnson +// Copyright (C) 2018 Adam Reichold +// +// 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 +// +//======================================================================== + +#ifndef CMAP_H +#define CMAP_H + +#include +#include +#include + +#include "poppler-config.h" +#include "CharTypes.h" + +class GooString; +class Object; +struct CMapVectorEntry; +class CMapCache; +class Stream; + +//------------------------------------------------------------------------ + +class CMap +{ +public: + // Parse a CMap from , which can be a name or a stream. Sets + // the initial reference count to 1. Returns NULL on failure. + static std::shared_ptr parse(CMapCache *cache, const GooString *collectionA, Object *obj); + + // Create the CMap specified by and . Sets + // the initial reference count to 1. Returns NULL on failure. + static std::shared_ptr parse(CMapCache *cache, const GooString *collectionA, const GooString *cMapNameA); + + // Parse a CMap from . Sets the initial reference count to 1. + // Returns NULL on failure. + static std::shared_ptr parse(CMapCache *cache, const GooString *collectionA, Stream *str); + + ~CMap(); + + CMap(const CMap &) = delete; + CMap &operator=(const CMap &) = delete; + + // Return collection name (-). + const GooString *getCollection() const { return collection; } + + const GooString *getCMapName() const { return cMapName; } + + // Return true if this CMap matches the specified , and + // . + bool match(const GooString *collectionA, const GooString *cMapNameA); + + // Return the CID corresponding to the character code starting at + // , which contains bytes. Sets * to the char code, and + // * to the number of bytes used by the char code. + CID getCID(const char *s, int len, CharCode *c, int *nUsed); + + // Return the writing mode (0=horizontal, 1=vertical). + int getWMode() const { return wMode; } + + void setReverseMap(unsigned int *rmap, unsigned int rmapSize, unsigned int ncand); + +private: + void parse2(CMapCache *cache, int (*getCharFunc)(void *), void *data); + CMap(GooString *collectionA, GooString *cMapNameA); + CMap(GooString *collectionA, GooString *cMapNameA, int wModeA); + void useCMap(CMapCache *cache, const char *useName); + void useCMap(CMapCache *cache, Object *obj); + void copyVector(CMapVectorEntry *dest, CMapVectorEntry *src); + void addCIDs(unsigned int start, unsigned int end, unsigned int nBytes, CID firstCID); + void freeCMapVector(CMapVectorEntry *vec); + void setReverseMapVector(unsigned int startCode, CMapVectorEntry *vec, unsigned int *rmap, unsigned int rmapSize, unsigned int ncand); + + GooString *collection; + GooString *cMapName; + bool isIdent; // true if this CMap is an identity mapping, + // or is based on one (via usecmap) + int wMode; // writing mode (0=horizontal, 1=vertical) + CMapVectorEntry *vector; // vector for first byte (NULL for + // identity CMap) +}; + +//------------------------------------------------------------------------ + +#define cMapCacheSize 4 + +class CMapCache +{ +public: + CMapCache(); + ~CMapCache() = default; + + CMapCache(const CMapCache &) = delete; + CMapCache &operator=(const CMapCache &) = delete; + + // Get the CMap for the specified character collection. + // Increments its reference count; there will be one reference for + // the cache plus one for the caller of this function. + // Stream is a stream containing the CMap, can be NULL and + // this means the CMap will be searched in the CMap files + // Returns NULL on failure. + std::shared_ptr getCMap(const GooString *collection, const GooString *cMapName); + +private: + std::array, cMapCacheSize> cache; +}; + +#endif diff --git a/poppler-24.05.0/poppler/CachedFile.cc b/poppler-24.05.0/poppler/CachedFile.cc new file mode 100644 index 0000000000000000000000000000000000000000..149a61267cd6b5c9e4060b16f1cb9e8cf8b8198a --- /dev/null +++ b/poppler-24.05.0/poppler/CachedFile.cc @@ -0,0 +1,275 @@ +//======================================================================== +// +// CachedFile.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2009 Stefan Thomas +// Copyright 2010, 2011 Hib Eris +// Copyright 2010, 2018-2020, 2022 Albert Astals Cid +// Copyright (C) 2013 Julien Nabet +// +//======================================================================== + +#include +#include "CachedFile.h" + +//------------------------------------------------------------------------ +// CachedFile +//------------------------------------------------------------------------ + +CachedFile::CachedFile(CachedFileLoader *cacheLoader) +{ + loader = cacheLoader; + + streamPos = 0; + chunks = new std::vector(); + length = 0; + + length = loader->init(this); + refCnt = 1; + + if (length != ((size_t)-1)) { + chunks->resize(length / CachedFileChunkSize + 1); + } else { + error(errInternal, -1, "Failed to initialize file cache."); + chunks->resize(0); + } +} + +CachedFile::~CachedFile() +{ + delete loader; + delete chunks; +} + +void CachedFile::incRefCnt() +{ + refCnt++; +} + +void CachedFile::decRefCnt() +{ + if (--refCnt == 0) { + delete this; + } +} + +long int CachedFile::tell() +{ + return streamPos; +} + +int CachedFile::seek(long int offset, int origin) +{ + if (origin == SEEK_SET) { + streamPos = offset; + } else if (origin == SEEK_CUR) { + streamPos += offset; + } else { + streamPos = length + offset; + } + + if (streamPos > length) { + streamPos = 0; + return 1; + } + + return 0; +} + +int CachedFile::cache(const std::vector &origRanges) +{ + std::vector loadChunks; + int numChunks = length / CachedFileChunkSize + 1; + std::vector chunkNeeded(numChunks); + int startChunk, endChunk; + std::vector chunk_ranges, all; + ByteRange range; + const std::vector *ranges = &origRanges; + + if (ranges->empty()) { + range.offset = 0; + range.length = length; + all.push_back(range); + ranges = &all; + } + + for (int i = 0; i < numChunks; ++i) { + chunkNeeded[i] = false; + } + for (const ByteRange &r : *ranges) { + + if (r.length == 0) { + continue; + } + if (r.offset >= length) { + continue; + } + + const size_t start = r.offset; + size_t end = start + r.length - 1; + if (end >= length) { + end = length - 1; + } + + startChunk = start / CachedFileChunkSize; + endChunk = end / CachedFileChunkSize; + for (int chunk = startChunk; chunk <= endChunk; chunk++) { + if ((*chunks)[chunk].state == chunkStateNew) { + chunkNeeded[chunk] = true; + } + } + } + + int chunk = 0; + while (chunk < numChunks) { + while (!chunkNeeded[chunk] && (++chunk != numChunks)) { + ; + } + if (chunk == numChunks) { + break; + } + startChunk = chunk; + loadChunks.push_back(chunk); + + while ((++chunk != numChunks) && chunkNeeded[chunk]) { + loadChunks.push_back(chunk); + } + endChunk = chunk - 1; + + range.offset = startChunk * CachedFileChunkSize; + range.length = (endChunk - startChunk + 1) * CachedFileChunkSize; + + chunk_ranges.push_back(range); + } + + if (chunk_ranges.size() > 0) { + CachedFileWriter writer = CachedFileWriter(this, &loadChunks); + return loader->load(chunk_ranges, &writer); + } + + return 0; +} + +size_t CachedFile::read(void *ptr, size_t unitsize, size_t count) +{ + size_t bytes = unitsize * count; + if (length < (streamPos + bytes)) { + bytes = length - streamPos; + } + + if (bytes == 0) { + return 0; + } + + // Load data + if (cache(streamPos, bytes) != 0) { + return 0; + } + + // Copy data to buffer + size_t toCopy = bytes; + while (toCopy) { + int chunk = streamPos / CachedFileChunkSize; + int offset = streamPos % CachedFileChunkSize; + size_t len = CachedFileChunkSize - offset; + + if (len > toCopy) { + len = toCopy; + } + + memcpy(ptr, (*chunks)[chunk].data + offset, len); + streamPos += len; + toCopy -= len; + ptr = (char *)ptr + len; + } + + return bytes; +} + +int CachedFile::cache(size_t rangeOffset, size_t rangeLength) +{ + std::vector r; + ByteRange range; + range.offset = rangeOffset; + range.length = rangeLength; + r.push_back(range); + return cache(r); +} + +//------------------------------------------------------------------------ +// CachedFileWriter +//------------------------------------------------------------------------ + +CachedFileWriter::CachedFileWriter(CachedFile *cachedFileA, std::vector *chunksA) +{ + cachedFile = cachedFileA; + chunks = chunksA; + + if (chunks) { + offset = 0; + it = (*chunks).begin(); + } +} + +CachedFileWriter::~CachedFileWriter() { } + +size_t CachedFileWriter::write(const char *ptr, size_t size) +{ + const char *cp = ptr; + size_t len = size; + size_t nfree, ncopy; + size_t written = 0; + size_t chunk; + + if (!len) { + return 0; + } + + while (len) { + if (chunks) { + if (offset == CachedFileChunkSize) { + ++it; + if (it == (*chunks).end()) { + return written; + } + offset = 0; + } + chunk = *it; + } else { + offset = cachedFile->length % CachedFileChunkSize; + chunk = cachedFile->length / CachedFileChunkSize; + } + + if (chunk >= cachedFile->chunks->size()) { + cachedFile->chunks->resize(chunk + 1); + } + + nfree = CachedFileChunkSize - offset; + ncopy = (len >= nfree) ? nfree : len; + memcpy(&((*cachedFile->chunks)[chunk].data[offset]), cp, ncopy); + len -= ncopy; + cp += ncopy; + offset += ncopy; + written += ncopy; + + if (!chunks) { + cachedFile->length += ncopy; + } + + if (offset == CachedFileChunkSize) { + (*cachedFile->chunks)[chunk].state = CachedFile::chunkStateLoaded; + } + } + + if ((chunk == (cachedFile->length / CachedFileChunkSize)) && (offset == (cachedFile->length % CachedFileChunkSize))) { + (*cachedFile->chunks)[chunk].state = CachedFile::chunkStateLoaded; + } + + return written; +} + +CachedFileLoader::~CachedFileLoader() = default; + +//------------------------------------------------------------------------ diff --git a/poppler-24.05.0/poppler/CachedFile.h b/poppler-24.05.0/poppler/CachedFile.h new file mode 100644 index 0000000000000000000000000000000000000000..854692ea764ce8150edec8c179d30647bdc3c364 --- /dev/null +++ b/poppler-24.05.0/poppler/CachedFile.h @@ -0,0 +1,149 @@ +//======================================================================== +// +// CachedFile.h +// +// Caching files support. +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2009 Stefan Thomas +// Copyright 2010 Hib Eris +// Copyright 2010, 2018-2020, 2022 Albert Astals Cid +// +//======================================================================== + +#ifndef CACHEDFILE_H +#define CACHEDFILE_H + +#include "poppler-config.h" +#include "poppler_private_export.h" + +#include "Object.h" +#include "Stream.h" + +#include + +//------------------------------------------------------------------------ + +#define CachedFileChunkSize 8192 // This should be a multiple of cachedStreamBufSize + +class GooString; +class CachedFileLoader; + +//------------------------------------------------------------------------ +// CachedFile +// +// CachedFile gives FILE-like access to a document at a specified URI. +// In the constructor, you specify a CachedFileLoader that handles loading +// the data from the document. The CachedFile requests no more data then it +// needs from the CachedFileLoader. +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT CachedFile +{ + + friend class CachedFileWriter; + +public: + explicit CachedFile(CachedFileLoader *cacheLoader); + + CachedFile(const CachedFile &) = delete; + CachedFile &operator=(const CachedFile &) = delete; + + unsigned int getLength() const { return length; } + long int tell(); + int seek(long int offset, int origin); + size_t read(void *ptr, size_t unitsize, size_t count); + size_t write(const char *ptr, size_t size, size_t fromByte); + int cache(const std::vector &ranges); + + // Reference counting. + void incRefCnt(); + void decRefCnt(); + +private: + ~CachedFile(); + + enum ChunkState + { + chunkStateNew = 0, + chunkStateLoaded + }; + + typedef struct + { + ChunkState state; + char data[CachedFileChunkSize]; + } Chunk; + + int cache(size_t offset, size_t length); + + CachedFileLoader *loader; + + size_t length; + size_t streamPos; + + std::vector *chunks; + + int refCnt; // reference count +}; + +//------------------------------------------------------------------------ +// CachedFileWriter +// +// CachedFileWriter handles sequential writes to a CachedFile. +// On construction, you specify the CachedFile and the chunks of it to which data +// should be written. +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT CachedFileWriter +{ + +public: + // Construct a CachedFile Writer. + // The caller is responsible for deleting the cachedFile and chunksA. + CachedFileWriter(CachedFile *cachedFile, std::vector *chunksA); + + ~CachedFileWriter(); + + // Writes size bytes from ptr to cachedFile, returns number of bytes written. + size_t write(const char *ptr, size_t size); + +private: + CachedFile *cachedFile; + std::vector *chunks; + std::vector::iterator it; + size_t offset; +}; + +//------------------------------------------------------------------------ +// CachedFileLoader +// +// CachedFileLoader is an abstact class that specifies the interface for +// loadng data from an URI into a CachedFile. +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT CachedFileLoader +{ + +public: + CachedFileLoader() = default; + virtual ~CachedFileLoader(); + + CachedFileLoader(const CachedFileLoader &) = delete; + CachedFileLoader &operator=(const CachedFileLoader &) = delete; + + // Initializes the file load. + // Returns the length of the file. + // The caller is responsible for deleting cachedFile. + virtual size_t init(CachedFile *cachedFile) = 0; + + // Loads specified byte ranges and passes it to the writer to store them. + // Returns 0 on success, Anything but 0 on failure. + // The caller is responsible for deleting the writer. + virtual int load(const std::vector &ranges, CachedFileWriter *writer) = 0; +}; + +//------------------------------------------------------------------------ + +#endif diff --git a/poppler-24.05.0/poppler/CairoFontEngine.cc b/poppler-24.05.0/poppler/CairoFontEngine.cc new file mode 100644 index 0000000000000000000000000000000000000000..b6dbdb95abe39e328e703b3fe40a96c12232ce1c --- /dev/null +++ b/poppler-24.05.0/poppler/CairoFontEngine.cc @@ -0,0 +1,683 @@ +//======================================================================== +// +// CairoFontEngine.cc +// +// Copyright 2003 Glyph & Cog, LLC +// Copyright 2004 Red Hat, Inc +// +//======================================================================== + +//======================================================================== +// +// 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) 2005-2007 Jeff Muizelaar +// Copyright (C) 2005, 2006 Kristian Høgsberg +// Copyright (C) 2005 Martin Kretzschmar +// Copyright (C) 2005, 2009, 2012, 2013, 2015, 2017-2019, 2021, 2022 Albert Astals Cid +// Copyright (C) 2006, 2007, 2010, 2011 Carlos Garcia Campos +// Copyright (C) 2007 Koji Otani +// Copyright (C) 2008, 2009 Chris Wilson +// Copyright (C) 2008, 2012, 2014, 2016, 2017, 2022, 2023 Adrian Johnson +// Copyright (C) 2009 Darren Kenny +// Copyright (C) 2010 Suzuki Toshiya +// Copyright (C) 2010 Jan Kümmel +// Copyright (C) 2012 Hib Eris +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2015, 2016 Jason Crain +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019 Christian Persch +// Copyright (C) 2020 Michal +// Copyright (C) 2021, 2022 Oliver Sander +// Copyright (C) 2022 Marcel Fabian Krüger +// Copyright (C) 2023 Pablo Correa Gómez +// Copyright (C) 2023 Frederic Germain +// Copyright (C) 2023 Ilia Kats +// +// 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 + +#include +#include +#include "CairoFontEngine.h" +#include "CairoOutputDev.h" +#include "GlobalParams.h" +#include +#include +#include "goo/ft_utils.h" +#include "goo/gfile.h" +#include "Error.h" +#include "XRef.h" +#include "Gfx.h" +#include "Page.h" + +//------------------------------------------------------------------------ +// CairoFont +//------------------------------------------------------------------------ + +CairoFont::CairoFont(Ref refA, cairo_font_face_t *cairo_font_faceA, std::vector &&codeToGIDA, bool substituteA, bool printingA) : ref(refA), cairo_font_face(cairo_font_faceA), substitute(substituteA), printing(printingA) +{ + codeToGID = std::move(codeToGIDA); +} + +CairoFont::~CairoFont() +{ + cairo_font_face_destroy(cairo_font_face); +} + +bool CairoFont::matches(Ref &other, bool printingA) +{ + return (other == ref); +} + +cairo_font_face_t *CairoFont::getFontFace() +{ + return cairo_font_face; +} + +unsigned long CairoFont::getGlyph(CharCode code, const Unicode *u, int uLen) +{ + FT_UInt gid; + + if (code < codeToGID.size()) { + gid = (FT_UInt)codeToGID[code]; + } else { + gid = (FT_UInt)code; + } + return gid; +} + +double CairoFont::getSubstitutionCorrection(const std::shared_ptr &gfxFont) +{ + double w1, w2, w3; + CharCode code; + const char *name; + + // for substituted fonts: adjust the font matrix -- compare the + // width of 'm' in the original font and the substituted font + if (isSubstitute() && !gfxFont->isCIDFont()) { + for (code = 0; code < 256; ++code) { + if ((name = std::static_pointer_cast(gfxFont)->getCharName(code)) && name[0] == 'm' && name[1] == '\0') { + break; + } + } + if (code < 256) { + w1 = std::static_pointer_cast(gfxFont)->getWidth(code); + { + cairo_matrix_t m; + cairo_matrix_init_identity(&m); + cairo_font_options_t *options = cairo_font_options_create(); + cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_NONE); + cairo_font_options_set_hint_metrics(options, CAIRO_HINT_METRICS_OFF); + cairo_scaled_font_t *scaled_font = cairo_scaled_font_create(cairo_font_face, &m, &m, options); + + cairo_text_extents_t extents; + cairo_scaled_font_text_extents(scaled_font, "m", &extents); + + cairo_scaled_font_destroy(scaled_font); + cairo_font_options_destroy(options); + w2 = extents.x_advance; + } + w3 = std::static_pointer_cast(gfxFont)->getWidth(0); + if (!gfxFont->isSymbolic() && w2 > 0 && w1 > w3) { + // if real font is substantially narrower than substituted + // font, reduce the font size accordingly + if (w1 > 0.01 && w1 < 0.9 * w2) { + w1 /= w2; + return w1; + } + } + } + } + return 1.0; +} + +//------------------------------------------------------------------------ +// CairoFreeTypeFont +//------------------------------------------------------------------------ + +static cairo_user_data_key_t ft_cairo_key; + +// Font resources to be freed when cairo_font_face_t is destroyed +struct FreeTypeFontResource +{ + FT_Face face; + std::vector font_data; +}; + +// cairo callback for when cairo_font_face_t is destroyed +static void _ft_done_face(void *closure) +{ + FreeTypeFontResource *resource = (FreeTypeFontResource *)closure; + + FT_Done_Face(resource->face); + delete resource; +} + +CairoFreeTypeFont::CairoFreeTypeFont(Ref refA, cairo_font_face_t *cairo_font_faceA, std::vector &&codeToGIDA, bool substituteA) : CairoFont(refA, cairo_font_faceA, std::move(codeToGIDA), substituteA, true) { } + +CairoFreeTypeFont::~CairoFreeTypeFont() { } + +// Create a cairo_font_face_t for the given font filename OR font data. +static std::optional createFreeTypeFontFace(FT_Library lib, const std::string &filename, std::vector &&font_data) +{ + FreeTypeFontResource *resource = new FreeTypeFontResource; + FreeTypeFontFace font_face; + + if (font_data.empty()) { + FT_Error err = ft_new_face_from_file(lib, filename.c_str(), 0, &resource->face); + if (err) { + delete resource; + return {}; + } + } else { + resource->font_data = std::move(font_data); + FT_Error err = FT_New_Memory_Face(lib, (FT_Byte *)resource->font_data.data(), resource->font_data.size(), 0, &resource->face); + if (err) { + delete resource; + return {}; + } + } + + font_face.cairo_font_face = cairo_ft_font_face_create_for_ft_face(resource->face, FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP); + if (cairo_font_face_set_user_data(font_face.cairo_font_face, &ft_cairo_key, resource, _ft_done_face)) { + cairo_font_face_destroy(font_face.cairo_font_face); + _ft_done_face(resource); + return {}; + } + + font_face.face = resource->face; + return font_face; +} + +// Create a cairo_font_face_t for the given font filename OR font data. First checks if external font +// is in the cache. +std::optional CairoFreeTypeFont::getFreeTypeFontFace(CairoFontEngine *fontEngine, FT_Library lib, const std::string &filename, std::vector &&font_data) +{ + if (font_data.empty()) { + return fontEngine->getExternalFontFace(lib, filename); + } + + return createFreeTypeFontFace(lib, filename, std::move(font_data)); +} + +CairoFreeTypeFont *CairoFreeTypeFont::create(const std::shared_ptr &gfxFont, XRef *xref, FT_Library lib, CairoFontEngine *fontEngine, bool useCIDs) +{ + std::string fileName; + std::vector font_data; + int i, n; + std::optional fontLoc; + char **enc; + const char *name; + FoFiType1C *ff1c; + std::optional font_face; + std::vector codeToGID; + bool substitute = false; + + Ref ref = *gfxFont->getID(); + Ref embFontID = Ref::INVALID(); + gfxFont->getEmbeddedFontID(&embFontID); + GfxFontType fontType = gfxFont->getType(); + + if (!(fontLoc = gfxFont->locateFont(xref, nullptr))) { + error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + goto err2; + } + + // embedded font + if (fontLoc->locType == gfxFontLocEmbedded) { + auto fd = gfxFont->readEmbFontFile(xref); + if (!fd || fd->empty()) { + goto err2; + } + font_data = std::move(fd.value()); + + // external font + } else { // gfxFontLocExternal + fileName = fontLoc->path; + fontType = fontLoc->fontType; + substitute = true; + } + + switch (fontType) { + case fontType1: + case fontType1C: + case fontType1COT: + font_face = getFreeTypeFontFace(fontEngine, lib, fileName, std::move(font_data)); + if (!font_face) { + error(errSyntaxError, -1, "could not create type1 face"); + goto err2; + } + + enc = std::static_pointer_cast(gfxFont)->getEncoding(); + + codeToGID.resize(256); + for (i = 0; i < 256; ++i) { + codeToGID[i] = 0; + if ((name = enc[i])) { + codeToGID[i] = FT_Get_Name_Index(font_face->face, (char *)name); + if (codeToGID[i] == 0) { + Unicode u; + u = globalParams->mapNameToUnicodeText(name); + codeToGID[i] = FT_Get_Char_Index(font_face->face, u); + } + if (codeToGID[i] == 0) { + name = GfxFont::getAlternateName(name); + if (name) { + codeToGID[i] = FT_Get_Name_Index(font_face->face, (char *)name); + } + } + } + } + break; + case fontCIDType2: + case fontCIDType2OT: + if (std::static_pointer_cast(gfxFont)->getCIDToGID()) { + n = std::static_pointer_cast(gfxFont)->getCIDToGIDLen(); + if (n) { + const int *src = std::static_pointer_cast(gfxFont)->getCIDToGID(); + codeToGID.reserve(n); + codeToGID.insert(codeToGID.begin(), src, src + n); + } + } else { + std::unique_ptr ff; + if (!font_data.empty()) { + ff = FoFiTrueType::make(font_data.data(), font_data.size()); + } else { + ff = FoFiTrueType::load(fileName.c_str()); + } + if (!ff) { + goto err2; + } + int *src = std::static_pointer_cast(gfxFont)->getCodeToGIDMap(ff.get(), &n); + codeToGID.reserve(n); + codeToGID.insert(codeToGID.begin(), src, src + n); + gfree(src); + } + /* Fall through */ + case fontTrueType: + case fontTrueTypeOT: { + std::unique_ptr ff; + if (!font_data.empty()) { + ff = FoFiTrueType::make(font_data.data(), font_data.size()); + } else { + ff = FoFiTrueType::load(fileName.c_str()); + } + if (!ff) { + error(errSyntaxError, -1, "failed to load truetype font\n"); + goto err2; + } + /* This might be set already for the CIDType2 case */ + if (fontType == fontTrueType || fontType == fontTrueTypeOT) { + int *src = std::static_pointer_cast(gfxFont)->getCodeToGIDMap(ff.get()); + codeToGID.reserve(256); + codeToGID.insert(codeToGID.begin(), src, src + 256); + gfree(src); + } + font_face = getFreeTypeFontFace(fontEngine, lib, fileName, std::move(font_data)); + if (!font_face) { + error(errSyntaxError, -1, "could not create truetype face\n"); + goto err2; + } + break; + } + case fontCIDType0: + case fontCIDType0C: + if (!useCIDs) { + if (!font_data.empty()) { + ff1c = FoFiType1C::make(font_data.data(), font_data.size()); + } else { + ff1c = FoFiType1C::load(fileName.c_str()); + } + if (ff1c) { + int *src = ff1c->getCIDToGIDMap(&n); + codeToGID.reserve(n); + codeToGID.insert(codeToGID.begin(), src, src + n); + gfree(src); + delete ff1c; + } + } + + font_face = getFreeTypeFontFace(fontEngine, lib, fileName, std::move(font_data)); + if (!font_face) { + error(errSyntaxError, -1, "could not create cid face\n"); + goto err2; + } + break; + + case fontCIDType0COT: + if (std::static_pointer_cast(gfxFont)->getCIDToGID()) { + n = std::static_pointer_cast(gfxFont)->getCIDToGIDLen(); + if (n) { + const int *src = std::static_pointer_cast(gfxFont)->getCIDToGID(); + codeToGID.reserve(n); + codeToGID.insert(codeToGID.begin(), src, src + n); + } + } + + if (codeToGID.empty()) { + if (!useCIDs) { + std::unique_ptr ff; + if (!font_data.empty()) { + ff = FoFiTrueType::make(font_data.data(), font_data.size()); + } else { + ff = FoFiTrueType::load(fileName.c_str()); + } + if (ff) { + if (ff->isOpenTypeCFF()) { + int *src = ff->getCIDToGIDMap(&n); + codeToGID.reserve(n); + codeToGID.insert(codeToGID.begin(), src, src + n); + gfree(src); + } + } + } + } + font_face = getFreeTypeFontFace(fontEngine, lib, fileName, std::move(font_data)); + if (!font_face) { + error(errSyntaxError, -1, "could not create cid (OT) face\n"); + goto err2; + } + break; + + default: + fprintf(stderr, "font type %d not handled\n", (int)fontType); + goto err2; + break; + } + + return new CairoFreeTypeFont(ref, font_face->cairo_font_face, std::move(codeToGID), substitute); + +err2: + fprintf(stderr, "some font thing failed\n"); + return nullptr; +} + +//------------------------------------------------------------------------ +// CairoType3Font +//------------------------------------------------------------------------ + +static const cairo_user_data_key_t type3_font_key = { 0 }; + +typedef struct _type3_font_info +{ + _type3_font_info(const std::shared_ptr &fontA, PDFDoc *docA, CairoFontEngine *fontEngineA, CairoOutputDev *outputDevA, Gfx *gfxA) : font(fontA), doc(docA), fontEngine(fontEngineA), outputDev(outputDevA), gfx(gfxA) { } + + std::shared_ptr font; + PDFDoc *doc; + CairoFontEngine *fontEngine; + CairoOutputDev *outputDev; + Gfx *gfx; +} type3_font_info_t; + +static void _free_type3_font_info(void *closure) +{ + type3_font_info_t *info = (type3_font_info_t *)closure; + delete info->gfx; + delete info->outputDev; + delete info; +} + +static cairo_status_t _init_type3_glyph(cairo_scaled_font_t *scaled_font, cairo_t *cr, cairo_font_extents_t *extents) +{ + type3_font_info_t *info; + + info = (type3_font_info_t *)cairo_font_face_get_user_data(cairo_scaled_font_get_font_face(scaled_font), &type3_font_key); + const double *mat = info->font->getFontBBox(); + extents->ascent = mat[3]; /* y2 */ + extents->descent = -mat[3]; /* -y1 */ + extents->height = extents->ascent + extents->descent; + extents->max_x_advance = mat[2] - mat[1]; /* x2 - x1 */ + extents->max_y_advance = 0; + + return CAIRO_STATUS_SUCCESS; +} + +static cairo_status_t _render_type3_glyph(cairo_scaled_font_t *scaled_font, unsigned long glyph, cairo_t *cr, cairo_text_extents_t *metrics, bool color) +{ + Dict *charProcs; + Object charProc; + cairo_matrix_t matrix, invert_y_axis; + const double *mat; + double wx, wy; + type3_font_info_t *info; + Gfx *gfx; + cairo_status_t status; + + info = (type3_font_info_t *)cairo_font_face_get_user_data(cairo_scaled_font_get_font_face(scaled_font), &type3_font_key); + + charProcs = std::static_pointer_cast(info->font)->getCharProcs(); + if (!charProcs) { + return CAIRO_STATUS_USER_FONT_ERROR; + } + + if ((int)glyph >= charProcs->getLength()) { + return CAIRO_STATUS_USER_FONT_ERROR; + } + + mat = info->font->getFontMatrix(); + matrix.xx = mat[0]; + matrix.yx = mat[1]; + matrix.xy = mat[2]; + matrix.yy = mat[3]; + matrix.x0 = mat[4]; + matrix.y0 = mat[5]; + cairo_matrix_init_scale(&invert_y_axis, 1, -1); + cairo_matrix_multiply(&matrix, &matrix, &invert_y_axis); + cairo_transform(cr, &matrix); + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 18, 0) + cairo_set_source(cr, cairo_user_scaled_font_get_foreground_marker(scaled_font)); +#endif + + CairoOutputDev *output_dev = info->outputDev; + output_dev->setCairo(cr); + + gfx = info->gfx; + gfx->saveState(); + + output_dev->startDoc(info->doc, info->fontEngine); + output_dev->startType3Render(gfx->getState(), gfx->getXRef()); + output_dev->setType3RenderType(color ? CairoOutputDev::Type3RenderColor : CairoOutputDev::Type3RenderMask); + charProc = charProcs->getVal(glyph); + if (!charProc.isStream()) { + return CAIRO_STATUS_USER_FONT_ERROR; + } + Object charProcResObject = charProc.streamGetDict()->lookup("Resources"); + if (charProcResObject.isDict()) { + gfx->pushResources(charProcResObject.getDict()); + } + gfx->display(&charProc); + if (charProcResObject.isDict()) { + gfx->popResources(); + } + + output_dev->getType3GlyphWidth(&wx, &wy); + cairo_matrix_transform_distance(&matrix, &wx, &wy); + metrics->x_advance = wx; + metrics->y_advance = wy; + if (output_dev->hasType3GlyphBBox()) { + double *bbox = output_dev->getType3GlyphBBox(); + + cairo_matrix_transform_point(&matrix, &bbox[0], &bbox[1]); + cairo_matrix_transform_point(&matrix, &bbox[2], &bbox[3]); + metrics->x_bearing = bbox[0]; + metrics->y_bearing = bbox[1]; + metrics->width = bbox[2] - bbox[0]; + metrics->height = bbox[3] - bbox[1]; + } + + status = CAIRO_STATUS_SUCCESS; + + // If this is a render color glyph callback but the Type 3 glyph + // specified non-color, return NOT_IMPLEMENTED. Cairo will then + // call the render non-color glyph callback. + if (color && !output_dev->type3GlyphHasColor()) { + status = CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED; + } + + return status; +} + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 18, 0) +static cairo_status_t _render_type3_color_glyph(cairo_scaled_font_t *scaled_font, unsigned long glyph, cairo_t *cr, cairo_text_extents_t *metrics) +{ + return _render_type3_glyph(scaled_font, glyph, cr, metrics, true); +} +#endif + +static cairo_status_t _render_type3_noncolor_glyph(cairo_scaled_font_t *scaled_font, unsigned long glyph, cairo_t *cr, cairo_text_extents_t *metrics) +{ + return _render_type3_glyph(scaled_font, glyph, cr, metrics, false); +} + +CairoType3Font *CairoType3Font::create(const std::shared_ptr &gfxFont, PDFDoc *doc, CairoFontEngine *fontEngine, bool printing, XRef *xref) +{ + std::vector codeToGID; + char *name; + const double *mat; + + Dict *charProcs = std::static_pointer_cast(gfxFont)->getCharProcs(); + Ref ref = *gfxFont->getID(); + cairo_font_face_t *font_face = cairo_user_font_face_create(); + cairo_user_font_face_set_init_func(font_face, _init_type3_glyph); +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 18, 0) + // When both callbacks are set, Cairo will call the color glyph + // callback first. If that returns NOT_IMPLEMENTED, Cairo will + // then call the non-color glyph callback. + cairo_user_font_face_set_render_color_glyph_func(font_face, _render_type3_color_glyph); +#endif + cairo_user_font_face_set_render_glyph_func(font_face, _render_type3_noncolor_glyph); + + CairoOutputDev *output_dev = new CairoOutputDev(); + output_dev->setPrinting(printing); + + Dict *resDict = std::static_pointer_cast(gfxFont)->getResources(); + mat = gfxFont->getFontBBox(); + PDFRectangle box; + box.x1 = mat[0]; + box.y1 = mat[1]; + box.x2 = mat[2]; + box.y2 = mat[3]; + Gfx *gfx = new Gfx(doc, output_dev, resDict, &box, nullptr); + + type3_font_info_t *info = new type3_font_info_t(gfxFont, doc, fontEngine, output_dev, gfx); + cairo_font_face_set_user_data(font_face, &type3_font_key, (void *)info, _free_type3_font_info); + + char **enc = std::static_pointer_cast(gfxFont)->getEncoding(); + codeToGID.resize(256); + for (int i = 0; i < 256; ++i) { + codeToGID[i] = 0; + if (charProcs && (name = enc[i])) { + for (int j = 0; j < charProcs->getLength(); j++) { + if (strcmp(name, charProcs->getKey(j)) == 0) { + codeToGID[i] = j; + } + } + } + } + + return new CairoType3Font(ref, font_face, std::move(codeToGID), printing, xref); +} + +CairoType3Font::CairoType3Font(Ref refA, cairo_font_face_t *cairo_font_faceA, std::vector &&codeToGIDA, bool printingA, XRef *xref) : CairoFont(refA, cairo_font_faceA, std::move(codeToGIDA), false, printingA) { } + +CairoType3Font::~CairoType3Font() { } + +bool CairoType3Font::matches(Ref &other, bool printingA) +{ + return (other == ref && printing == printingA); +} + +//------------------------------------------------------------------------ +// CairoFontEngine +//------------------------------------------------------------------------ + +std::unordered_map CairoFontEngine::fontFileCache; +std::recursive_mutex CairoFontEngine::fontFileCacheMutex; + +CairoFontEngine::CairoFontEngine(FT_Library libA) +{ + lib = libA; + fontCache.reserve(cairoFontCacheSize); + + FT_Int major, minor, patch; + // as of FT 2.1.8, CID fonts are indexed by CID instead of GID + FT_Library_Version(lib, &major, &minor, &patch); + useCIDs = major > 2 || (major == 2 && (minor > 1 || (minor == 1 && patch > 7))); +} + +CairoFontEngine::~CairoFontEngine() { } + +std::shared_ptr CairoFontEngine::getFont(const std::shared_ptr &gfxFont, PDFDoc *doc, bool printing, XRef *xref) +{ + std::scoped_lock lock(mutex); + Ref ref = *gfxFont->getID(); + std::shared_ptr font; + + // Check if font is in the MRU cache, and move it to the end if it is. + for (auto it = fontCache.rbegin(); it != fontCache.rend(); ++it) { + if ((*it)->matches(ref, printing)) { + font = *it; + // move it to the end + if (it != fontCache.rbegin()) { + // https://stackoverflow.com/questions/1830158/how-to-call-erase-with-a-reverse-iterator + fontCache.erase(std::next(it).base()); + fontCache.push_back(font); + } + return font; + } + } + + GfxFontType fontType = gfxFont->getType(); + if (fontType == fontType3) { + font = std::shared_ptr(CairoType3Font::create(gfxFont, doc, this, printing, xref)); + } else { + font = std::shared_ptr(CairoFreeTypeFont::create(gfxFont, xref, lib, this, useCIDs)); + } + + if (font) { + if (fontCache.size() == cairoFontCacheSize) { + fontCache.erase(fontCache.begin()); + } + fontCache.push_back(font); + } + return font; +} + +std::optional CairoFontEngine::getExternalFontFace(FT_Library ftlib, const std::string &filename) +{ + std::scoped_lock lock(fontFileCacheMutex); + + auto it = fontFileCache.find(filename); + if (it != fontFileCache.end()) { + FreeTypeFontFace font = it->second; + cairo_font_face_reference(font.cairo_font_face); + return font; + } + + std::optional font_face = createFreeTypeFontFace(ftlib, filename, {}); + if (font_face) { + cairo_font_face_reference(font_face->cairo_font_face); + fontFileCache[filename] = *font_face; + } + + it = fontFileCache.begin(); + while (it != fontFileCache.end()) { + if (cairo_font_face_get_reference_count(it->second.cairo_font_face) == 1) { + cairo_font_face_destroy(it->second.cairo_font_face); + it = fontFileCache.erase(it); + } else { + ++it; + } + } + + return font_face; +} diff --git a/poppler-24.05.0/poppler/CairoFontEngine.h b/poppler-24.05.0/poppler/CairoFontEngine.h new file mode 100644 index 0000000000000000000000000000000000000000..c97e0ea45d6b3235d89b9c740beb011952fdf7e1 --- /dev/null +++ b/poppler-24.05.0/poppler/CairoFontEngine.h @@ -0,0 +1,143 @@ +//======================================================================== +// +// CairoFontEngine.h +// +// Copyright 2003 Glyph & Cog, LLC +// Copyright 2004 Red Hat, Inc +// +//======================================================================== + +//======================================================================== +// +// 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) 2005, 2006 Kristian Høgsberg +// Copyright (C) 2005, 2018, 2019, 2021 Albert Astals Cid +// Copyright (C) 2006, 2007 Jeff Muizelaar +// Copyright (C) 2006, 2010 Carlos Garcia Campos +// Copyright (C) 2008, 2017, 2022 Adrian Johnson +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2022 Oliver Sander +// Copyright (C) 2022 Marek Kasik +// +// 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 +// +//======================================================================== + +#ifndef CAIROFONTENGINE_H +#define CAIROFONTENGINE_H + +#include +#include +#include +#include + +#include "poppler-config.h" +#include + +#include "GfxFont.h" +#include "PDFDoc.h" + +class CairoFontEngine; + +class CairoFont +{ +public: + CairoFont(Ref refA, cairo_font_face_t *cairo_font_faceA, std::vector &&codeToGIDA, bool substituteA, bool printingA); + virtual ~CairoFont(); + CairoFont(const CairoFont &) = delete; + CairoFont &operator=(const CairoFont &other) = delete; + + virtual bool matches(Ref &other, bool printing); + cairo_font_face_t *getFontFace(); + unsigned long getGlyph(CharCode code, const Unicode *u, int uLen); + double getSubstitutionCorrection(const std::shared_ptr &gfxFont); + + bool isSubstitute() { return substitute; } + + Ref getRef() { return ref; } + +protected: + Ref ref; + cairo_font_face_t *cairo_font_face; + + std::vector codeToGID; + + bool substitute; + bool printing; +}; + +//------------------------------------------------------------------------ + +struct FreeTypeFontFace +{ + FT_Face face; + cairo_font_face_t *cairo_font_face; +}; + +class CairoFreeTypeFont : public CairoFont +{ +public: + static CairoFreeTypeFont *create(const std::shared_ptr &gfxFont, XRef *xref, FT_Library lib, CairoFontEngine *fontEngine, bool useCIDs); + ~CairoFreeTypeFont() override; + +private: + CairoFreeTypeFont(Ref ref, cairo_font_face_t *cairo_font_face, std::vector &&codeToGID, bool substitute); + + static std::optional getFreeTypeFontFace(CairoFontEngine *fontEngine, FT_Library lib, const std::string &filename, std::vector &&data); +}; + +//------------------------------------------------------------------------ + +class CairoType3Font : public CairoFont +{ +public: + static CairoType3Font *create(const std::shared_ptr &gfxFont, PDFDoc *doc, CairoFontEngine *fontEngine, bool printing, XRef *xref); + ~CairoType3Font() override; + + bool matches(Ref &other, bool printing) override; + +private: + CairoType3Font(Ref ref, cairo_font_face_t *cairo_font_face, std::vector &&codeToGIDA, bool printing, XRef *xref); +}; + +//------------------------------------------------------------------------ + +//------------------------------------------------------------------------ +// CairoFontEngine +//------------------------------------------------------------------------ + +class CairoFontEngine +{ +public: + // Create a font engine. + explicit CairoFontEngine(FT_Library libA); + ~CairoFontEngine(); + CairoFontEngine(const CairoFontEngine &) = delete; + CairoFontEngine &operator=(const CairoFontEngine &other) = delete; + + std::shared_ptr getFont(const std::shared_ptr &gfxFont, PDFDoc *doc, bool printing, XRef *xref); + + static std::optional getExternalFontFace(FT_Library ftlib, const std::string &filename); + +private: + FT_Library lib; + bool useCIDs; + mutable std::mutex mutex; + + // Cache of CairoFont for current document + // Most recently used is at the end of the vector. + static const size_t cairoFontCacheSize = 64; + std::vector> fontCache; + + // Global cache of cairo_font_face_t for external font files. + static std::unordered_map fontFileCache; + static std::recursive_mutex fontFileCacheMutex; +}; + +#endif diff --git a/poppler-24.05.0/poppler/CairoOutputDev.cc b/poppler-24.05.0/poppler/CairoOutputDev.cc new file mode 100644 index 0000000000000000000000000000000000000000..5d7abbb2313aa069113a01b797ff475bde354546 --- /dev/null +++ b/poppler-24.05.0/poppler/CairoOutputDev.cc @@ -0,0 +1,4137 @@ +//======================================================================== +// +// CairoOutputDev.cc +// +// Copyright 2003 Glyph & Cog, LLC +// Copyright 2004 Red Hat, Inc +// +//======================================================================== + +//======================================================================== +// +// 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) 2005-2008 Jeff Muizelaar +// Copyright (C) 2005, 2006 Kristian Høgsberg +// Copyright (C) 2005, 2009, 2012, 2017-2021, 2023 Albert Astals Cid +// Copyright (C) 2005 Nickolay V. Shmyrev +// Copyright (C) 2006-2011, 2013, 2014, 2017, 2018 Carlos Garcia Campos +// Copyright (C) 2008 Carl Worth +// Copyright (C) 2008-2018, 2021-2023 Adrian Johnson +// Copyright (C) 2008 Michael Vrable +// Copyright (C) 2008, 2009 Chris Wilson +// Copyright (C) 2008, 2012 Hib Eris +// Copyright (C) 2009, 2010 David Benjamin +// Copyright (C) 2011-2014 Thomas Freitag +// Copyright (C) 2012 Patrick Pfeifer +// Copyright (C) 2012, 2015, 2016 Jason Crain +// Copyright (C) 2015 Suzuki Toshiya +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018, 2020 Adam Reichold +// Copyright (C) 2019, 2020, 2022 Marek Kasik +// Copyright (C) 2020 Michal +// Copyright (C) 2020, 2022 Oliver Sander +// Copyright (C) 2021 Uli Schlachter +// Copyright (C) 2021 Christian Persch +// Copyright (C) 2022 Zachary Travis +// Copyright (C) 2023 Artemy Gordon +// Copyright (C) 2023 Anton Thomasson +// +// 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 + +#include +#include +#include +#include +#include + +#include "goo/gfile.h" +#include "GlobalParams.h" +#include "Error.h" +#include "Object.h" +#include "Gfx.h" +#include "GfxState.h" +#include "GfxFont.h" +#include "Page.h" +#include "Link.h" +#include "FontEncodingTables.h" +#include "PDFDocEncoding.h" +#include +#include +#include "CairoOutputDev.h" +#include "CairoFontEngine.h" +#include "CairoRescaleBox.h" +#include "UnicodeMap.h" +#include "UTF.h" +#include "JBIG2Stream.h" +//------------------------------------------------------------------------ + +// #define LOG_CAIRO + +// To limit memory usage and improve performance when printing, limit +// cairo images to this size. 8192 is sufficient for an A2 sized +// 300ppi image. +#define MAX_PRINT_IMAGE_SIZE 8192 +// Cairo has a max size for image surfaces due to their fixed-point +// coordinate handling, namely INT16_MAX, aka 32767. +#define MAX_CAIRO_IMAGE_SIZE 32767 + +#ifdef LOG_CAIRO +# define LOG(x) (x) +#else +# define LOG(x) +#endif + +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) + +//------------------------------------------------------------------------ +// CairoImage +//------------------------------------------------------------------------ + +CairoImage::CairoImage(double x1A, double y1A, double x2A, double y2A) +{ + image = nullptr; + x1 = x1A; + y1 = y1A; + x2 = x2A; + y2 = y2A; +} + +CairoImage::~CairoImage() +{ + if (image) { + cairo_surface_destroy(image); + } +} + +void CairoImage::setImage(cairo_surface_t *i) +{ + if (image) { + cairo_surface_destroy(image); + } + image = cairo_surface_reference(i); +} + +//------------------------------------------------------------------------ +// CairoOutputDev +//------------------------------------------------------------------------ + +// We cannot tie the lifetime of an FT_Library object to that of +// CairoOutputDev, since any FT_Faces created with it may end up with a +// reference by Cairo which can be held long after the CairoOutputDev is +// deleted. The simplest way to avoid problems is to never tear down the +// FT_Library instance; to avoid leaks, just use a single global instance +// initialized the first time it is needed. +FT_Library CairoOutputDev::ft_lib; +std::once_flag CairoOutputDev::ft_lib_once_flag; + +CairoOutputDev::CairoOutputDev() +{ + doc = nullptr; + + std::call_once(ft_lib_once_flag, FT_Init_FreeType, &ft_lib); + + fontEngine = nullptr; + fontEngine_owner = false; + glyphs = nullptr; + fill_pattern = nullptr; + fill_color = {}; + stroke_pattern = nullptr; + stroke_color = {}; + stroke_opacity = 1.0; + fill_opacity = 1.0; + textClipPath = nullptr; + strokePathClip = nullptr; + cairo = nullptr; + currentFont = nullptr; +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0) + prescaleImages = false; +#else + prescaleImages = true; +#endif + printing = true; + use_show_text_glyphs = false; + inUncoloredPattern = false; + t3_render_state = Type3RenderNone; + t3_glyph_has_bbox = false; + t3_glyph_has_color = false; + text_matrix_valid = true; + + groupColorSpaceStack = nullptr; + group = nullptr; + mask = nullptr; + shape = nullptr; + cairo_shape = nullptr; + knockoutCount = 0; + + textPage = nullptr; + actualText = nullptr; + logicalStruct = false; + pdfPageNum = 0; + cairoPageNum = 0; + + // the SA parameter supposedly defaults to false, but Acrobat + // apparently hardwires it to true + stroke_adjust = true; + align_stroke_coords = false; + adjusted_stroke_width = false; + xref = nullptr; + currentStructParents = -1; +} + +CairoOutputDev::~CairoOutputDev() +{ + if (fontEngine_owner && fontEngine) { + delete fontEngine; + } + if (textClipPath) { + cairo_path_destroy(textClipPath); + textClipPath = nullptr; + } + + if (cairo) { + cairo_destroy(cairo); + } + cairo_pattern_destroy(stroke_pattern); + cairo_pattern_destroy(fill_pattern); + if (group) { + cairo_pattern_destroy(group); + } + if (mask) { + cairo_pattern_destroy(mask); + } + if (shape) { + cairo_pattern_destroy(shape); + } + if (textPage) { + textPage->decRefCnt(); + } + if (actualText) { + delete actualText; + } +} + +void CairoOutputDev::setCairo(cairo_t *c) +{ + if (cairo != nullptr) { + cairo_status_t status = cairo_status(cairo); + if (status) { + error(errInternal, -1, "cairo context error: {0:s}\n", cairo_status_to_string(status)); + } + cairo_destroy(cairo); + assert(!cairo_shape); + } + if (c != nullptr) { + cairo = cairo_reference(c); + /* save the initial matrix so that we can use it for type3 fonts. */ + // XXX: is this sufficient? could we miss changes to the matrix somehow? + cairo_get_matrix(cairo, &orig_matrix); + } else { + cairo = nullptr; + cairo_shape = nullptr; + } +} + +bool CairoOutputDev::isPDF() +{ + if (cairo) { + return cairo_surface_get_type(cairo_get_target(cairo)) == CAIRO_SURFACE_TYPE_PDF; + } + return false; +} + +void CairoOutputDev::setTextPage(TextPage *text) +{ + if (textPage) { + textPage->decRefCnt(); + } + if (actualText) { + delete actualText; + } + if (text) { + textPage = text; + textPage->incRefCnt(); + actualText = new ActualText(text); + } else { + textPage = nullptr; + actualText = nullptr; + } +} + +void CairoOutputDev::copyAntialias(cairo_t *cr, cairo_t *source_cr) +{ + cairo_set_antialias(cr, cairo_get_antialias(source_cr)); + + cairo_font_options_t *font_options = cairo_font_options_create(); + cairo_get_font_options(source_cr, font_options); + cairo_set_font_options(cr, font_options); + cairo_font_options_destroy(font_options); +} + +void CairoOutputDev::startDoc(PDFDoc *docA, CairoFontEngine *parentFontEngine) +{ + doc = docA; + if (parentFontEngine) { + fontEngine = parentFontEngine; + } else { + if (fontEngine) { + delete fontEngine; + } + fontEngine = new CairoFontEngine(ft_lib); + fontEngine_owner = true; + } + xref = doc->getXRef(); + + mcidEmitted.clear(); + destsMap.clear(); + emittedDestinations.clear(); + pdfPageToCairoPageMap.clear(); + pdfPageRefToCairoPageNumMap.clear(); + cairoPageNum = 0; + firstPage = true; +} + +void CairoOutputDev::textStringToQuotedUtf8(const GooString *text, GooString *s) +{ + std::string utf8 = TextStringToUtf8(text->toStr()); + s->Set("'"); + for (char c : utf8) { + if (c == '\\' || c == '\'') { + s->append("\\"); + } + s->append(c); + } + s->append("'"); +} + +// Initialization that needs to be performed after setCairo() is called. +void CairoOutputDev::startFirstPage(int pageNum, GfxState *state, XRef *xrefA) +{ + if (xrefA) { + xref = xrefA; + } + + if (logicalStruct && isPDF()) { + int numDests = doc->getCatalog()->numDestNameTree(); + for (int i = 0; i < numDests; i++) { + const GooString *name = doc->getCatalog()->getDestNameTreeName(i); + std::unique_ptr dest = doc->getCatalog()->getDestNameTreeDest(i); + if (dest->isPageRef()) { + Ref ref = dest->getPageRef(); + destsMap[ref].insert({ std::string(name->toStr()), std::move(dest) }); + } + } + + numDests = doc->getCatalog()->numDests(); + for (int i = 0; i < numDests; i++) { + const char *name = doc->getCatalog()->getDestsName(i); + std::unique_ptr dest = doc->getCatalog()->getDestsDest(i); + if (dest->isPageRef()) { + Ref ref = dest->getPageRef(); + destsMap[ref].insert({ std::string(name), std::move(dest) }); + } + } + } +} + +void CairoOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA) +{ + if (firstPage) { + startFirstPage(pageNum, state, xrefA); + firstPage = false; + } + + /* set up some per page defaults */ + cairo_pattern_destroy(fill_pattern); + cairo_pattern_destroy(stroke_pattern); + + fill_pattern = cairo_pattern_create_rgb(0., 0., 0.); + fill_color = { 0, 0, 0 }; + stroke_pattern = cairo_pattern_reference(fill_pattern); + stroke_color = { 0, 0, 0 }; + + if (textPage) { + textPage->startPage(state); + } + + pdfPageNum = pageNum; + cairoPageNum++; + pdfPageToCairoPageMap[pdfPageNum] = cairoPageNum; + + if (logicalStruct && isPDF()) { + Object obj = doc->getPage(pageNum)->getAnnotsObject(xref); + Annots *annots = new Annots(doc, pageNum, &obj); + + for (Annot *annot : annots->getAnnots()) { + if (annot->getType() == Annot::typeLink) { + annot->incRefCnt(); + annotations.push_back(annot); + } + } + + delete annots; + + // emit dests + Ref *ref = doc->getCatalog()->getPageRef(pageNum); + pdfPageRefToCairoPageNumMap[*ref] = cairoPageNum; + auto pageDests = destsMap.find(*ref); + if (pageDests != destsMap.end()) { + for (auto &it : pageDests->second) { + GooString quoted_name; + GooString name(it.first); + textStringToQuotedUtf8(&name, "ed_name); + emittedDestinations.insert(quoted_name.toStr()); + + GooString attrib; + attrib.appendf("name={0:t} ", "ed_name); + if (it.second->getChangeLeft()) { + attrib.appendf("x={0:g} ", it.second->getLeft()); + } + if (it.second->getChangeTop()) { + attrib.appendf("y={0:g} ", state->getPageHeight() - it.second->getTop()); + } + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 18, 0) + cairo_tag_begin(cairo, CAIRO_TAG_DEST, attrib.c_str()); + cairo_tag_end(cairo, CAIRO_TAG_DEST); +#endif + } + } + + currentStructParents = doc->getPage(pageNum)->getStructParents(); + } +} + +void CairoOutputDev::endPage() +{ + if (textPage) { + textPage->endPage(); + textPage->coalesce(true, 0, false); + } +} + +void CairoOutputDev::beginForm(Object *obj, Ref id) +{ + if (logicalStruct && isPDF()) { + structParentsStack.push_back(currentStructParents); + + const Object tmp = obj->streamGetDict()->lookup("StructParents"); + if (!(tmp.isInt() || tmp.isNull())) { + error(errSyntaxError, -1, "XObject StructParents object is wrong type ({0:s})", tmp.getTypeName()); + } else if (tmp.isInt()) { + currentStructParents = tmp.getInt(); + } + } +} + +void CairoOutputDev::endForm(Object *obj, Ref id) +{ + if (logicalStruct && isPDF()) { + currentStructParents = structParentsStack.back(); + structParentsStack.pop_back(); + } +} + +void CairoOutputDev::quadToCairoRect(AnnotQuadrilaterals *quads, int idx, double pageHeight, cairo_rectangle_t *rect) +{ + double x1, x2, y1, y2; + x1 = x2 = quads->getX1(idx); + y1 = y2 = quads->getX2(idx); + + x1 = std::min(x1, quads->getX2(idx)); + x1 = std::min(x1, quads->getX3(idx)); + x1 = std::min(x1, quads->getX4(idx)); + + y1 = std::min(y1, quads->getY2(idx)); + y1 = std::min(y1, quads->getY3(idx)); + y1 = std::min(y1, quads->getY4(idx)); + + x2 = std::max(x2, quads->getX2(idx)); + x2 = std::max(x2, quads->getX3(idx)); + x2 = std::max(x2, quads->getX4(idx)); + + y2 = std::max(y2, quads->getY2(idx)); + y2 = std::max(y2, quads->getY3(idx)); + y2 = std::max(y2, quads->getY4(idx)); + + rect->x = x1; + rect->y = pageHeight - y2; + rect->width = x2 - x1; + rect->height = y2 - y1; +} + +bool CairoOutputDev::appendLinkDestRef(GooString *s, const LinkDest *dest) +{ + Ref ref = dest->getPageRef(); + auto pageNum = pdfPageRefToCairoPageNumMap.find(ref); + if (pageNum != pdfPageRefToCairoPageNumMap.end()) { + auto cairoPage = pdfPageToCairoPageMap.find(pageNum->second); + if (cairoPage != pdfPageToCairoPageMap.end()) { + s->appendf("page={0:d} ", cairoPage->second); + double destPageHeight = doc->getPageMediaHeight(dest->getPageNum()); + appendLinkDestXY(s, dest, destPageHeight); + return true; + } + } + return false; +} + +void CairoOutputDev::appendLinkDestXY(GooString *s, const LinkDest *dest, double destPageHeight) +{ + double x = 0; + double y = 0; + + if (dest->getChangeLeft()) { + x = dest->getLeft(); + } + + if (dest->getChangeTop()) { + y = dest->getTop(); + } + + // if pageHeight is 0, dest is remote document, cairo uses PDF coords in this + // case. So don't flip coords when pageHeight is 0. + s->appendf("pos=[{0:g} {1:g}] ", x, destPageHeight ? destPageHeight - y : y); +} + +bool CairoOutputDev::beginLinkTag(AnnotLink *annotLink) +{ + int page_num = annotLink->getPageNum(); + double height = doc->getPageMediaHeight(page_num); + + GooString attrib; + attrib.appendf("link_page={0:d} ", page_num); + attrib.append("rect=["); + AnnotQuadrilaterals *quads = annotLink->getQuadrilaterals(); + if (quads && quads->getQuadrilateralsLength() > 0) { + for (int i = 0; i < quads->getQuadrilateralsLength(); i++) { + cairo_rectangle_t rect; + quadToCairoRect(quads, i, height, &rect); + attrib.appendf("{0:g} {1:g} {2:g} {3:g} ", rect.x, rect.y, rect.width, rect.height); + } + } else { + double x1, x2, y1, y2; + annotLink->getRect(&x1, &y1, &x2, &y2); + attrib.appendf("{0:g} {1:g} {2:g} {3:g} ", x1, height - y2, x2 - x1, y2 - y1); + } + attrib.append("] "); + + LinkAction *action = annotLink->getAction(); + if (action->getKind() == actionGoTo) { + LinkGoTo *act = static_cast(action); + if (act->isOk()) { + const GooString *namedDest = act->getNamedDest(); + const LinkDest *linkDest = act->getDest(); + if (namedDest) { + GooString name; + textStringToQuotedUtf8(namedDest, &name); + if (emittedDestinations.count(name.toStr()) == 0) { + return false; + } + attrib.appendf("dest={0:t} ", &name); + } else if (linkDest && linkDest->isOk() && linkDest->isPageRef()) { + bool ok = appendLinkDestRef(&attrib, linkDest); + if (!ok) { + return false; + } + } + } + } else if (action->getKind() == actionGoToR) { + LinkGoToR *act = static_cast(action); + attrib.appendf("file='{0:t}' ", act->getFileName()); + const GooString *namedDest = act->getNamedDest(); + const LinkDest *linkDest = act->getDest(); + if (namedDest) { + GooString name; + textStringToQuotedUtf8(namedDest, &name); + if (emittedDestinations.count(name.toStr()) == 0) { + return false; + } + attrib.appendf("dest={0:t} ", &name); + } else if (linkDest && linkDest->isOk() && !linkDest->isPageRef()) { + auto cairoPage = pdfPageToCairoPageMap.find(linkDest->getPageNum()); + if (cairoPage != pdfPageToCairoPageMap.end()) { + attrib.appendf("page={0:d} ", cairoPage->second); + appendLinkDestXY(&attrib, linkDest, 0.0); + } else { + return false; + } + } + } else if (action->getKind() == actionURI) { + LinkURI *act = static_cast(action); + if (act->isOk()) { + attrib.appendf("uri='{0:s}'", act->getURI().c_str()); + } + } +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 18, 0) + cairo_tag_begin(cairo, CAIRO_TAG_LINK, attrib.c_str()); +#endif + return true; +} + +AnnotLink *CairoOutputDev::findLinkObject(const StructElement *elem) +{ + if (elem->isObjectRef()) { + Ref ref = elem->getObjectRef(); + for (Annot *annot : annotations) { + if (annot->getType() == Annot::typeLink && annot->match(&ref)) { + return static_cast(annot); + } + } + } + + for (unsigned i = 0; i < elem->getNumChildren(); i++) { + AnnotLink *link = findLinkObject(elem->getChild(i)); + if (link) { + return link; + } + } + + return nullptr; +} + +bool CairoOutputDev::beginLink(const StructElement *linkElem) +{ + bool emitted = true; + AnnotLink *linkAnnot = findLinkObject(linkElem); + if (linkAnnot) { + emitted = beginLinkTag(linkAnnot); + } else { +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 18, 0) + cairo_tag_begin(cairo, linkElem->getTypeName(), nullptr); +#endif + } + return emitted; +} + +void CairoOutputDev::getStructElemAttributeString(const StructElement *elem) +{ + int mcid = 0; + GooString attribs; + Ref ref = elem->getObjectRef(); + attribs.appendf("id='{0:d}_{1:d}_{2:d}'", ref.num, ref.gen, mcid); + attribs.appendf(" parent='{0:d}_{1:d}'", ref.num, ref.gen); +} + +int CairoOutputDev::getContentElementStructParents(const StructElement *element) +{ + int structParents = -1; + Ref ref; + + if (element->hasStmRef()) { + element->getStmRef(ref); + Object xobjectObj = xref->fetch(ref); + const Object &spObj = xobjectObj.streamGetDict()->lookup("StructParents"); + if (spObj.isInt()) { + structParents = spObj.getInt(); + } + } else if (element->hasPageRef()) { + element->getPageRef(ref); + Object pageObj = xref->fetch(ref); + const Object &spObj = pageObj.dictLookup("StructParents"); + if (spObj.isInt()) { + structParents = spObj.getInt(); + } + } + + if (structParents == -1) { + error(errSyntaxError, -1, "Unable to find StructParents object for StructElement"); + } + return structParents; +} + +bool CairoOutputDev::checkIfStructElementNeeded(const StructElement *element) +{ + if (element->isContent() && !element->isObjectRef()) { + int structParents = getContentElementStructParents(element); + int mcid = element->getMCID(); + if (mcidEmitted.count(std::pair(structParents, mcid)) > 0) { + structElementNeeded.insert(element); + return true; + } + } else if (!element->isContent()) { + bool needed = false; + for (unsigned i = 0; i < element->getNumChildren(); i++) { + if (checkIfStructElementNeeded(element->getChild(i))) { + needed = true; + } + } + if (needed) { + structElementNeeded.insert(element); + } + return needed; + } + return false; +} + +void CairoOutputDev::emitStructElement(const StructElement *element) +{ + if (structElementNeeded.count(element) == 0) { + return; + } + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 18, 0) + if (element->isContent() && !element->isObjectRef()) { + int structParents = getContentElementStructParents(element); + int mcid = element->getMCID(); + GooString attribs; + attribs.appendf("ref='{0:d}_{1:d}'", structParents, mcid); + cairo_tag_begin(cairo, CAIRO_TAG_CONTENT_REF, attribs.c_str()); + cairo_tag_end(cairo, CAIRO_TAG_CONTENT_REF); + } else if (!element->isContent()) { + if (element->getType() == StructElement::Link) { + bool ok = beginLink(element); + if (!ok) { + return; + } + } else { + cairo_tag_begin(cairo, element->getTypeName(), ""); + } + for (unsigned i = 0; i < element->getNumChildren(); i++) { + emitStructElement(element->getChild(i)); + } + cairo_tag_end(cairo, element->getTypeName()); + } +#endif +} + +void CairoOutputDev::emitStructTree() +{ + if (logicalStruct && isPDF()) { + const StructTreeRoot *root = doc->getStructTreeRoot(); + if (!root) { + return; + } + + for (unsigned i = 0; i < root->getNumChildren(); i++) { + checkIfStructElementNeeded(root->getChild(i)); + } + + for (unsigned i = 0; i < root->getNumChildren(); i++) { + emitStructElement(root->getChild(i)); + } + } +} + +void CairoOutputDev::startType3Render(GfxState *state, XRef *xrefA) +{ + /* When cairo calls a user font render function, the default + * source set on the provided cairo_t must be used, except in the + * case of a color user font explicitly setting a color. + * + * As startPage() resets the source to solid black, this function + * is used instead to initialise the CairoOutputDev when rendering + * a user font glyph. + * + * As noted in the Cairo documentation, the default source of a + * render callback contains an internal marker denoting the + * foreground color is to be used when the glyph is rendered, even + * though querying the default source will reveal solid black. + * For this reason, fill_color and stroke_color are set to nullopt + * to ensure updateFillColor()/updateStrokeColor() will update the + * color even if the new color is black. + * + * The saveState()/restoreState() functions also ensure the + * default source is saved and restored, and the fill_color and + * stroke_color is reset to nullopt for the same reason. + */ + + /* Initialise fill and stroke pattern to the current source pattern */ + fill_pattern = cairo_pattern_reference(cairo_get_source(cairo)); + stroke_pattern = cairo_pattern_reference(cairo_get_source(cairo)); + fill_color = {}; + stroke_color = {}; + t3_glyph_has_bbox = false; + t3_glyph_has_color = false; + + if (xrefA != nullptr) { + xref = xrefA; + } +} + +void CairoOutputDev::saveState(GfxState *state) +{ + LOG(printf("save\n")); + cairo_save(cairo); + if (cairo_shape) { + cairo_save(cairo_shape); + } + + /* To ensure the current source, potentially containing the hidden + * foreground color maker, is saved and restored as required by + * _render_type3_glyph, we avoid using the update color and + * opacity functions in restoreState() and instead be careful to + * save all the color related variables that have been set by the + * update functions on the stack. */ + SaveStateElement elem; + elem.fill_pattern = cairo_pattern_reference(fill_pattern); + elem.fill_opacity = fill_opacity; + elem.stroke_pattern = cairo_pattern_reference(stroke_pattern); + 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) { + strokePathClip->ref_count++; + } +} + +void CairoOutputDev::restoreState(GfxState *state) +{ + LOG(printf("restore\n")); + cairo_restore(cairo); + if (cairo_shape) { + cairo_restore(cairo_shape); + } + + text_matrix_valid = true; + + cairo_pattern_destroy(fill_pattern); + fill_pattern = saveStateStack.back().fill_pattern; + fill_color = {}; + fill_opacity = saveStateStack.back().fill_opacity; + + cairo_pattern_destroy(stroke_pattern); + stroke_pattern = saveStateStack.back().stroke_pattern; + 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); + + if (mask) { + cairo_pattern_destroy(mask); + } + mask = saveStateStack.back().mask; + mask_matrix = saveStateStack.back().mask_matrix; + saveStateStack.pop_back(); + + if (strokePathClip && --strokePathClip->ref_count == 0) { + delete strokePathClip->path; + if (strokePathClip->dashes) { + gfree(strokePathClip->dashes); + } + gfree(strokePathClip); + strokePathClip = nullptr; + } +} + +void CairoOutputDev::updateAll(GfxState *state) +{ + updateLineDash(state); + updateLineJoin(state); + updateLineCap(state); + updateLineWidth(state); + updateFlatness(state); + updateMiterLimit(state); + updateFillColor(state); + updateStrokeColor(state); + updateFillOpacity(state); + updateStrokeOpacity(state); + updateBlendMode(state); + needFontUpdate = true; + if (textPage) { + textPage->updateFont(state); + } +} + +void CairoOutputDev::setDefaultCTM(const double *ctm) +{ + cairo_matrix_t matrix; + matrix.xx = ctm[0]; + matrix.yx = ctm[1]; + matrix.xy = ctm[2]; + matrix.yy = ctm[3]; + matrix.x0 = ctm[4]; + matrix.y0 = ctm[5]; + + cairo_transform(cairo, &matrix); + if (cairo_shape) { + cairo_transform(cairo_shape, &matrix); + } + + OutputDev::setDefaultCTM(ctm); +} + +void CairoOutputDev::updateCTM(GfxState *state, double m11, double m12, double m21, double m22, double m31, double m32) +{ + cairo_matrix_t matrix, invert_matrix; + matrix.xx = m11; + matrix.yx = m12; + matrix.xy = m21; + matrix.yy = m22; + matrix.x0 = m31; + matrix.y0 = m32; + + /* Make sure the matrix is invertible before setting it. + * cairo will blow up if we give it a matrix that's not + * invertible, so we need to check before passing it + * to cairo_transform. Ignoring it is likely to give better + * results than not rendering anything at all. See #14398 + * + * Ideally, we could do the cairo_transform + * and then check if anything went wrong and fix it then + * instead of having to invert the matrix. */ + invert_matrix = matrix; + if (cairo_matrix_invert(&invert_matrix)) { + error(errSyntaxWarning, -1, "matrix not invertible\n"); + return; + } + + cairo_transform(cairo, &matrix); + if (cairo_shape) { + cairo_transform(cairo_shape, &matrix); + } + updateLineDash(state); + updateLineJoin(state); + updateLineCap(state); + updateLineWidth(state); +} + +void CairoOutputDev::updateLineDash(GfxState *state) +{ + double dashStart; + + const std::vector &dashPattern = state->getLineDash(&dashStart); + cairo_set_dash(cairo, dashPattern.data(), dashPattern.size(), dashStart); + if (cairo_shape) { + cairo_set_dash(cairo_shape, dashPattern.data(), dashPattern.size(), dashStart); + } +} + +void CairoOutputDev::updateFlatness(GfxState *state) +{ + // cairo_set_tolerance (cairo, state->getFlatness()); +} + +void CairoOutputDev::updateLineJoin(GfxState *state) +{ + switch (state->getLineJoin()) { + case 0: + cairo_set_line_join(cairo, CAIRO_LINE_JOIN_MITER); + break; + case 1: + cairo_set_line_join(cairo, CAIRO_LINE_JOIN_ROUND); + break; + case 2: + cairo_set_line_join(cairo, CAIRO_LINE_JOIN_BEVEL); + break; + } + if (cairo_shape) { + cairo_set_line_join(cairo_shape, cairo_get_line_join(cairo)); + } +} + +void CairoOutputDev::updateLineCap(GfxState *state) +{ + switch (state->getLineCap()) { + case 0: + cairo_set_line_cap(cairo, CAIRO_LINE_CAP_BUTT); + break; + case 1: + cairo_set_line_cap(cairo, CAIRO_LINE_CAP_ROUND); + break; + case 2: + cairo_set_line_cap(cairo, CAIRO_LINE_CAP_SQUARE); + break; + } + if (cairo_shape) { + cairo_set_line_cap(cairo_shape, cairo_get_line_cap(cairo)); + } +} + +void CairoOutputDev::updateMiterLimit(GfxState *state) +{ + cairo_set_miter_limit(cairo, state->getMiterLimit()); + if (cairo_shape) { + cairo_set_miter_limit(cairo_shape, state->getMiterLimit()); + } +} + +void CairoOutputDev::updateLineWidth(GfxState *state) +{ + LOG(printf("line width: %f\n", state->getLineWidth())); + adjusted_stroke_width = false; + double width = state->getLineWidth(); + if (stroke_adjust && !printing) { + double x, y; + x = y = width; + + /* find out line width in device units */ + cairo_user_to_device_distance(cairo, &x, &y); + if (fabs(x) <= 1.0 && fabs(y) <= 1.0) { + /* adjust width to at least one device pixel */ + x = y = 1.0; + cairo_device_to_user_distance(cairo, &x, &y); + width = MIN(fabs(x), fabs(y)); + adjusted_stroke_width = true; + } + } else if (width == 0.0) { + /* Cairo does not support 0 line width == 1 device pixel. Find out + * how big pixels (device unit) are in the x and y + * directions. Choose the smaller of the two as our line width. + */ + double x = 1.0, y = 1.0; + if (printing) { + // assume printer pixel size is 1/600 inch + x = 72.0 / 600; + y = 72.0 / 600; + } + cairo_device_to_user_distance(cairo, &x, &y); + width = MIN(fabs(x), fabs(y)); + } + cairo_set_line_width(cairo, width); + if (cairo_shape) { + cairo_set_line_width(cairo_shape, cairo_get_line_width(cairo)); + } +} + +void CairoOutputDev::updateFillColor(GfxState *state) +{ + if (inUncoloredPattern) { + return; + } + + GfxRGB new_color; + state->getFillRGB(&new_color); + bool color_match = fill_color && *fill_color == new_color; + if (cairo_pattern_get_type(fill_pattern) != CAIRO_PATTERN_TYPE_SOLID || !color_match) { + cairo_pattern_destroy(fill_pattern); + fill_pattern = cairo_pattern_create_rgba(colToDbl(new_color.r), colToDbl(new_color.g), colToDbl(new_color.b), fill_opacity); + fill_color = new_color; + LOG(printf("fill color: %d %d %d\n", fill_color->r, fill_color->g, fill_color->b)); + } +} + +void CairoOutputDev::updateStrokeColor(GfxState *state) +{ + + if (inUncoloredPattern) { + return; + } + + GfxRGB new_color; + state->getStrokeRGB(&new_color); + bool color_match = stroke_color && *stroke_color == new_color; + if (cairo_pattern_get_type(fill_pattern) != CAIRO_PATTERN_TYPE_SOLID || !color_match) { + cairo_pattern_destroy(stroke_pattern); + stroke_pattern = cairo_pattern_create_rgba(colToDbl(new_color.r), colToDbl(new_color.g), colToDbl(new_color.b), stroke_opacity); + stroke_color = new_color; + LOG(printf("stroke color: %d %d %d\n", stroke_color->r, stroke_color->g, stroke_color->b)); + } +} + +void CairoOutputDev::updateFillOpacity(GfxState *state) +{ + double opacity = fill_opacity; + + if (inUncoloredPattern) { + return; + } + + fill_opacity = state->getFillOpacity(); + if (opacity != fill_opacity) { + if (!fill_color) { + GfxRGB color; + state->getFillRGB(&color); + fill_color = color; + } + cairo_pattern_destroy(fill_pattern); + fill_pattern = cairo_pattern_create_rgba(colToDbl(fill_color->r), colToDbl(fill_color->g), colToDbl(fill_color->b), fill_opacity); + + LOG(printf("fill opacity: %f\n", fill_opacity)); + } +} + +void CairoOutputDev::updateStrokeOpacity(GfxState *state) +{ + double opacity = stroke_opacity; + + if (inUncoloredPattern) { + return; + } + + stroke_opacity = state->getStrokeOpacity(); + if (opacity != stroke_opacity) { + if (!stroke_color) { + GfxRGB color; + state->getStrokeRGB(&color); + stroke_color = color; + } + cairo_pattern_destroy(stroke_pattern); + stroke_pattern = cairo_pattern_create_rgba(colToDbl(stroke_color->r), colToDbl(stroke_color->g), colToDbl(stroke_color->b), stroke_opacity); + + LOG(printf("stroke opacity: %f\n", stroke_opacity)); + } +} + +void CairoOutputDev::updateFillColorStop(GfxState *state, double offset) +{ + if (inUncoloredPattern) { + return; + } + + GfxRGB color; + state->getFillRGB(&color); + + // If stroke pattern is set then the current fill is clipped + // to a stroke path. In that case, the stroke opacity has to be used + // rather than the fill opacity. + // See https://gitlab.freedesktop.org/poppler/poppler/issues/178 + auto opacity = (state->getStrokePattern()) ? state->getStrokeOpacity() : state->getFillOpacity(); + + cairo_pattern_add_color_stop_rgba(fill_pattern, offset, colToDbl(color.r), colToDbl(color.g), colToDbl(color.b), opacity); + LOG(printf("fill color stop: %f (%d, %d, %d, %d)\n", offset, color.r, color.g, color.b, dblToCol(opacity))); +} + +void CairoOutputDev::updateBlendMode(GfxState *state) +{ + switch (state->getBlendMode()) { + default: + case gfxBlendNormal: + cairo_set_operator(cairo, CAIRO_OPERATOR_OVER); + break; + case gfxBlendMultiply: + cairo_set_operator(cairo, CAIRO_OPERATOR_MULTIPLY); + break; + case gfxBlendScreen: + cairo_set_operator(cairo, CAIRO_OPERATOR_SCREEN); + break; + case gfxBlendOverlay: + cairo_set_operator(cairo, CAIRO_OPERATOR_OVERLAY); + break; + case gfxBlendDarken: + cairo_set_operator(cairo, CAIRO_OPERATOR_DARKEN); + break; + case gfxBlendLighten: + cairo_set_operator(cairo, CAIRO_OPERATOR_LIGHTEN); + break; + case gfxBlendColorDodge: + cairo_set_operator(cairo, CAIRO_OPERATOR_COLOR_DODGE); + break; + case gfxBlendColorBurn: + cairo_set_operator(cairo, CAIRO_OPERATOR_COLOR_BURN); + break; + case gfxBlendHardLight: + cairo_set_operator(cairo, CAIRO_OPERATOR_HARD_LIGHT); + break; + case gfxBlendSoftLight: + cairo_set_operator(cairo, CAIRO_OPERATOR_SOFT_LIGHT); + break; + case gfxBlendDifference: + cairo_set_operator(cairo, CAIRO_OPERATOR_DIFFERENCE); + break; + case gfxBlendExclusion: + cairo_set_operator(cairo, CAIRO_OPERATOR_EXCLUSION); + break; + case gfxBlendHue: + cairo_set_operator(cairo, CAIRO_OPERATOR_HSL_HUE); + break; + case gfxBlendSaturation: + cairo_set_operator(cairo, CAIRO_OPERATOR_HSL_SATURATION); + break; + case gfxBlendColor: + cairo_set_operator(cairo, CAIRO_OPERATOR_HSL_COLOR); + break; + case gfxBlendLuminosity: + cairo_set_operator(cairo, CAIRO_OPERATOR_HSL_LUMINOSITY); + break; + } + LOG(printf("blend mode: %d\n", (int)state->getBlendMode())); +} + +void CairoOutputDev::updateFont(GfxState *state) +{ + cairo_font_face_t *font_face; + cairo_matrix_t matrix, invert_matrix; + + LOG(printf("updateFont() font=%s\n", state->getFont()->getName()->c_str())); + + needFontUpdate = false; + + // FIXME: use cairo font engine? + if (textPage) { + textPage->updateFont(state); + } + + currentFont = fontEngine->getFont(state->getFont(), doc, printing, xref); + + if (!currentFont) { + return; + } + + font_face = currentFont->getFontFace(); + cairo_set_font_face(cairo, font_face); + + use_show_text_glyphs = state->getFont()->hasToUnicodeCMap() && cairo_surface_has_show_text_glyphs(cairo_get_target(cairo)); + + double fontSize = state->getFontSize(); + const double *m = state->getTextMat(); + /* NOTE: adjusting by a constant is hack. The correct solution + * is probably to use user-fonts and compute the scale on a per + * glyph basis instead of for the entire font */ + double w = currentFont->getSubstitutionCorrection(state->getFont()); + matrix.xx = m[0] * fontSize * state->getHorizScaling() * w; + matrix.yx = m[1] * fontSize * state->getHorizScaling() * w; + matrix.xy = -m[2] * fontSize; + matrix.yy = -m[3] * fontSize; + matrix.x0 = 0; + matrix.y0 = 0; + + LOG(printf("font matrix: %f %f %f %f\n", matrix.xx, matrix.yx, matrix.xy, matrix.yy)); + + /* Make sure the font matrix is invertible before setting it. cairo + * will blow up if we give it a matrix that's not invertible, so we + * need to check before passing it to cairo_set_font_matrix. Ignoring it + * is likely to give better results than not rendering anything at + * all. See #18254. + */ + invert_matrix = matrix; + if (cairo_matrix_invert(&invert_matrix)) { + error(errSyntaxWarning, -1, "font matrix not invertible"); + text_matrix_valid = false; + return; + } + + cairo_set_font_matrix(cairo, &matrix); + text_matrix_valid = true; +} + +/* Tolerance in pixels for checking if strokes are horizontal or vertical + * lines in device space */ +#define STROKE_COORD_TOLERANCE 0.5 + +/* Align stroke coordinate i if the point is the start or end of a + * horizontal or vertical line */ +void CairoOutputDev::alignStrokeCoords(const GfxSubpath *subpath, int i, double *x, double *y) +{ + double x1, y1, x2, y2; + bool align = false; + + x1 = subpath->getX(i); + y1 = subpath->getY(i); + cairo_user_to_device(cairo, &x1, &y1); + + // Does the current coord and prev coord form a horiz or vert line? + if (i > 0 && !subpath->getCurve(i - 1)) { + x2 = subpath->getX(i - 1); + y2 = subpath->getY(i - 1); + cairo_user_to_device(cairo, &x2, &y2); + if (fabs(x2 - x1) < STROKE_COORD_TOLERANCE || fabs(y2 - y1) < STROKE_COORD_TOLERANCE) { + align = true; + } + } + + // Does the current coord and next coord form a horiz or vert line? + if (i < subpath->getNumPoints() - 1 && !subpath->getCurve(i + 1)) { + x2 = subpath->getX(i + 1); + y2 = subpath->getY(i + 1); + cairo_user_to_device(cairo, &x2, &y2); + if (fabs(x2 - x1) < STROKE_COORD_TOLERANCE || fabs(y2 - y1) < STROKE_COORD_TOLERANCE) { + align = true; + } + } + + *x = subpath->getX(i); + *y = subpath->getY(i); + if (align) { + /* see http://www.cairographics.org/FAQ/#sharp_lines */ + cairo_user_to_device(cairo, x, y); + *x = floor(*x) + 0.5; + *y = floor(*y) + 0.5; + cairo_device_to_user(cairo, x, y); + } +} + +#undef STROKE_COORD_TOLERANCE + +void CairoOutputDev::doPath(cairo_t *c, GfxState *state, const GfxPath *path) +{ + int i, j; + double x, y; + cairo_new_path(c); + for (i = 0; i < path->getNumSubpaths(); ++i) { + const GfxSubpath *subpath = path->getSubpath(i); + if (subpath->getNumPoints() > 0) { + if (align_stroke_coords) { + alignStrokeCoords(subpath, 0, &x, &y); + } else { + x = subpath->getX(0); + y = subpath->getY(0); + } + cairo_move_to(c, x, y); + j = 1; + while (j < subpath->getNumPoints()) { + if (subpath->getCurve(j)) { + if (align_stroke_coords) { + alignStrokeCoords(subpath, j + 2, &x, &y); + } else { + x = subpath->getX(j + 2); + y = subpath->getY(j + 2); + } + cairo_curve_to(c, subpath->getX(j), subpath->getY(j), subpath->getX(j + 1), subpath->getY(j + 1), x, y); + + j += 3; + } else { + if (align_stroke_coords) { + alignStrokeCoords(subpath, j, &x, &y); + } else { + x = subpath->getX(j); + y = subpath->getY(j); + } + cairo_line_to(c, x, y); + ++j; + } + } + if (subpath->isClosed()) { + LOG(printf("close\n")); + cairo_close_path(c); + } + } + } +} + +void CairoOutputDev::stroke(GfxState *state) +{ + if (t3_render_state == Type3RenderMask) { + GfxGray gray; + state->getFillGray(&gray); + if (colToDbl(gray) > 0.5) { + return; + } + } + + if (adjusted_stroke_width) { + align_stroke_coords = true; + } + doPath(cairo, state, state->getPath()); + align_stroke_coords = false; + cairo_set_source(cairo, stroke_pattern); + LOG(printf("stroke\n")); + if (strokePathClip) { + cairo_push_group(cairo); + cairo_stroke(cairo); + cairo_pop_group_to_source(cairo); + fillToStrokePathClip(state); + } else { + cairo_stroke(cairo); + } + if (cairo_shape) { + doPath(cairo_shape, state, state->getPath()); + cairo_stroke(cairo_shape); + } +} + +void CairoOutputDev::fill(GfxState *state) +{ + if (t3_render_state == Type3RenderMask) { + GfxGray gray; + state->getFillGray(&gray); + if (colToDbl(gray) > 0.5) { + return; + } + } + + doPath(cairo, state, state->getPath()); + cairo_set_fill_rule(cairo, CAIRO_FILL_RULE_WINDING); + cairo_set_source(cairo, fill_pattern); + LOG(printf("fill\n")); + // XXX: how do we get the path + if (mask) { + cairo_save(cairo); + cairo_clip(cairo); + if (strokePathClip) { + cairo_push_group(cairo); + fillToStrokePathClip(state); + cairo_pop_group_to_source(cairo); + } + cairo_set_matrix(cairo, &mask_matrix); + cairo_mask(cairo, mask); + cairo_restore(cairo); + } else if (strokePathClip) { + fillToStrokePathClip(state); + } else { + cairo_fill(cairo); + } + if (cairo_shape) { + cairo_set_fill_rule(cairo_shape, CAIRO_FILL_RULE_WINDING); + doPath(cairo_shape, state, state->getPath()); + cairo_fill(cairo_shape); + } +} + +void CairoOutputDev::eoFill(GfxState *state) +{ + doPath(cairo, state, state->getPath()); + cairo_set_fill_rule(cairo, CAIRO_FILL_RULE_EVEN_ODD); + cairo_set_source(cairo, fill_pattern); + LOG(printf("fill-eo\n")); + + if (mask) { + cairo_save(cairo); + cairo_clip(cairo); + cairo_set_matrix(cairo, &mask_matrix); + cairo_mask(cairo, mask); + cairo_restore(cairo); + } else { + cairo_fill(cairo); + } + if (cairo_shape) { + cairo_set_fill_rule(cairo_shape, CAIRO_FILL_RULE_EVEN_ODD); + doPath(cairo_shape, state, state->getPath()); + cairo_fill(cairo_shape); + } +} + +bool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) +{ + PDFRectangle box; + Gfx *gfx; + cairo_pattern_t *pattern; + cairo_surface_t *surface; + cairo_matrix_t matrix; + cairo_matrix_t pattern_matrix; + cairo_t *old_cairo; + double xMin, yMin, xMax, yMax; + double width, height; + double scaleX, scaleY; + int surface_width, surface_height; + StrokePathClip *strokePathTmp; + bool adjusted_stroke_width_tmp; + cairo_pattern_t *maskTmp; + const double *bbox = tPat->getBBox(); + const double *pmat = tPat->getMatrix(); + const int paintType = tPat->getPaintType(); + Dict *resDict = tPat->getResDict(); + Object *str = tPat->getContentStream(); + + width = bbox[2] - bbox[0]; + height = bbox[3] - bbox[1]; + + if (xStep != width || yStep != height) { + return false; + } + /* TODO: implement the other cases here too */ + + // Find the width and height of the transformed pattern + cairo_get_matrix(cairo, &matrix); + cairo_matrix_init(&pattern_matrix, mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]); + cairo_matrix_multiply(&matrix, &matrix, &pattern_matrix); + + double widthX = width, widthY = 0; + cairo_matrix_transform_distance(&matrix, &widthX, &widthY); + surface_width = ceil(sqrt(widthX * widthX + widthY * widthY)); + + double heightX = 0, heightY = height; + cairo_matrix_transform_distance(&matrix, &heightX, &heightY); + surface_height = ceil(sqrt(heightX * heightX + heightY * heightY)); + scaleX = surface_width / width; + scaleY = surface_height / height; + + surface = cairo_surface_create_similar(cairo_get_target(cairo), CAIRO_CONTENT_COLOR_ALPHA, surface_width, surface_height); + if (cairo_surface_status(surface)) { + return false; + } + + old_cairo = cairo; + cairo = cairo_create(surface); + cairo_surface_destroy(surface); + copyAntialias(cairo, old_cairo); + + box.x1 = bbox[0]; + box.y1 = bbox[1]; + box.x2 = bbox[2]; + box.y2 = bbox[3]; + cairo_scale(cairo, scaleX, scaleY); + cairo_translate(cairo, -box.x1, -box.y1); + + strokePathTmp = strokePathClip; + strokePathClip = nullptr; + adjusted_stroke_width_tmp = adjusted_stroke_width; + maskTmp = mask; + mask = nullptr; + gfx = new Gfx(doc, this, resDict, &box, nullptr, nullptr, nullptr, gfxA); + if (paintType == 2) { + inUncoloredPattern = true; + } + gfx->display(str); + if (paintType == 2) { + inUncoloredPattern = false; + } + delete gfx; + strokePathClip = strokePathTmp; + adjusted_stroke_width = adjusted_stroke_width_tmp; + mask = maskTmp; + + pattern = cairo_pattern_create_for_surface(cairo_get_target(cairo)); + cairo_destroy(cairo); + cairo = old_cairo; + if (cairo_pattern_status(pattern)) { + return false; + } + + // Cairo can fail if the pattern translation is too large. Fix by making the + // translation smaller. + const double det = pmat[0] * pmat[3] - pmat[1] * pmat[2]; + + // Find the number of repetitions of pattern we need to shift by. Transform + // the translation component of pmat (pmat[4] and pmat[5]) into the pattern's + // coordinate system by multiplying by inverse of pmat, then divide by + // pattern size (xStep and yStep). + const double xoffset = round((pmat[3] * pmat[4] - pmat[2] * pmat[5]) / (xStep * det)); + const double yoffset = -round((pmat[1] * pmat[4] - pmat[0] * pmat[5]) / (yStep * det)); + + if (!std::isfinite(xoffset) || !std::isfinite(yoffset)) { + error(errSyntaxWarning, -1, "CairoOutputDev: Singular matrix in tilingPatternFill"); + return false; + } + + // Shift pattern_matrix by multiples of the pattern size. + pattern_matrix.x0 -= xoffset * pattern_matrix.xx * xStep + yoffset * pattern_matrix.xy * yStep; + pattern_matrix.y0 -= xoffset * pattern_matrix.yx * xStep + yoffset * pattern_matrix.yy * yStep; + + state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax); + cairo_rectangle(cairo, xMin, yMin, xMax - xMin, yMax - yMin); + + cairo_matrix_init_scale(&matrix, scaleX, scaleY); + cairo_matrix_translate(&matrix, -box.x1, -box.y1); + cairo_pattern_set_matrix(pattern, &matrix); + + cairo_transform(cairo, &pattern_matrix); + cairo_set_source(cairo, pattern); + cairo_pattern_set_extend(pattern, CAIRO_EXTEND_REPEAT); + if (strokePathClip) { + fillToStrokePathClip(state); + } else { + cairo_fill(cairo); + } + + cairo_pattern_destroy(pattern); + + return true; +} + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0) +bool CairoOutputDev::functionShadedFill(GfxState *state, GfxFunctionShading *shading) +{ + // Function shaded fills are subdivided to rectangles that are the + // following size in device space. Note when printing this size is + // in points. + const int subdivide_pixels = 10; + + double x_begin, x_end, x1, x2; + double y_begin, y_end, y1, y2; + double x_step; + double y_step; + GfxColor color; + GfxRGB rgb; + cairo_matrix_t mat; + + const double *matrix = shading->getMatrix(); + mat.xx = matrix[0]; + mat.yx = matrix[1]; + mat.xy = matrix[2]; + mat.yy = matrix[3]; + mat.x0 = matrix[4]; + mat.y0 = matrix[5]; + if (cairo_matrix_invert(&mat)) { + error(errSyntaxWarning, -1, "matrix not invertible\n"); + return false; + } + + // get cell size in pattern space + x_step = y_step = subdivide_pixels; + cairo_matrix_transform_distance(&mat, &x_step, &y_step); + + cairo_pattern_destroy(fill_pattern); + fill_pattern = cairo_pattern_create_mesh(); + cairo_pattern_set_matrix(fill_pattern, &mat); + shading->getDomain(&x_begin, &y_begin, &x_end, &y_end); + + for (x1 = x_begin; x1 < x_end; x1 += x_step) { + x2 = x1 + x_step; + if (x2 > x_end) { + x2 = x_end; + } + + for (y1 = y_begin; y1 < y_end; y1 += y_step) { + y2 = y1 + y_step; + if (y2 > y_end) { + y2 = y_end; + } + + cairo_mesh_pattern_begin_patch(fill_pattern); + cairo_mesh_pattern_move_to(fill_pattern, x1, y1); + cairo_mesh_pattern_line_to(fill_pattern, x2, y1); + cairo_mesh_pattern_line_to(fill_pattern, x2, y2); + cairo_mesh_pattern_line_to(fill_pattern, x1, y2); + + shading->getColor(x1, y1, &color); + shading->getColorSpace()->getRGB(&color, &rgb); + cairo_mesh_pattern_set_corner_color_rgb(fill_pattern, 0, colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b)); + + shading->getColor(x2, y1, &color); + shading->getColorSpace()->getRGB(&color, &rgb); + cairo_mesh_pattern_set_corner_color_rgb(fill_pattern, 1, colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b)); + + shading->getColor(x2, y2, &color); + shading->getColorSpace()->getRGB(&color, &rgb); + cairo_mesh_pattern_set_corner_color_rgb(fill_pattern, 2, colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b)); + + shading->getColor(x1, y2, &color); + shading->getColorSpace()->getRGB(&color, &rgb); + cairo_mesh_pattern_set_corner_color_rgb(fill_pattern, 3, colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b)); + + cairo_mesh_pattern_end_patch(fill_pattern); + } + } + + double xMin, yMin, xMax, yMax; + // get the clip region bbox + state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax); + state->moveTo(xMin, yMin); + state->lineTo(xMin, yMax); + state->lineTo(xMax, yMax); + state->lineTo(xMax, yMin); + state->closePath(); + fill(state); + state->clearPath(); + + return true; +} +#endif /* CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0) */ + +bool CairoOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) +{ + double x0, y0, x1, y1; + double dx, dy; + + shading->getCoords(&x0, &y0, &x1, &y1); + dx = x1 - x0; + dy = y1 - y0; + + cairo_pattern_destroy(fill_pattern); + fill_pattern = cairo_pattern_create_linear(x0 + tMin * dx, y0 + tMin * dy, x0 + tMax * dx, y0 + tMax * dy); + if (!shading->getExtend0() && !shading->getExtend1()) { + cairo_pattern_set_extend(fill_pattern, CAIRO_EXTEND_NONE); + } else { + cairo_pattern_set_extend(fill_pattern, CAIRO_EXTEND_PAD); + } + + LOG(printf("axial-sh\n")); + + // TODO: use the actual stops in the shading in the case + // of linear interpolation (Type 2 Exponential functions with N=1) + return false; +} + +bool CairoOutputDev::axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) +{ + return (shading->getExtend0() == shading->getExtend1()); +} + +bool CairoOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax) +{ + double x0, y0, r0, x1, y1, r1; + double dx, dy, dr; + cairo_matrix_t matrix; + double scale; + + shading->getCoords(&x0, &y0, &r0, &x1, &y1, &r1); + dx = x1 - x0; + dy = y1 - y0; + dr = r1 - r0; + + // Cairo/pixman do not work well with a very large or small scaled + // matrix. See cairo bug #81657. + // + // As a workaround, scale the pattern by the average of the vertical + // and horizontal scaling of the current transformation matrix. + cairo_get_matrix(cairo, &matrix); + scale = (sqrt(matrix.xx * matrix.xx + matrix.yx * matrix.yx) + sqrt(matrix.xy * matrix.xy + matrix.yy * matrix.yy)) / 2; + cairo_matrix_init_scale(&matrix, scale, scale); + + cairo_pattern_destroy(fill_pattern); + fill_pattern = cairo_pattern_create_radial((x0 + sMin * dx) * scale, (y0 + sMin * dy) * scale, (r0 + sMin * dr) * scale, (x0 + sMax * dx) * scale, (y0 + sMax * dy) * scale, (r0 + sMax * dr) * scale); + cairo_pattern_set_matrix(fill_pattern, &matrix); + if (shading->getExtend0() && shading->getExtend1()) { + cairo_pattern_set_extend(fill_pattern, CAIRO_EXTEND_PAD); + } else { + cairo_pattern_set_extend(fill_pattern, CAIRO_EXTEND_NONE); + } + + LOG(printf("radial-sh\n")); + + return false; +} + +bool CairoOutputDev::radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading) +{ + return (shading->getExtend0() == shading->getExtend1()); +} + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0) +bool CairoOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading) +{ + double x0, y0, x1, y1, x2, y2; + GfxColor color[3]; + int i, j; + GfxRGB rgb; + + cairo_pattern_destroy(fill_pattern); + fill_pattern = cairo_pattern_create_mesh(); + + for (i = 0; i < shading->getNTriangles(); i++) { + if (shading->isParameterized()) { + double color0, color1, color2; + shading->getTriangle(i, &x0, &y0, &color0, &x1, &y1, &color1, &x2, &y2, &color2); + shading->getParameterizedColor(color0, &color[0]); + shading->getParameterizedColor(color1, &color[1]); + shading->getParameterizedColor(color2, &color[2]); + } else { + shading->getTriangle(i, &x0, &y0, &color[0], &x1, &y1, &color[1], &x2, &y2, &color[2]); + } + + cairo_mesh_pattern_begin_patch(fill_pattern); + + cairo_mesh_pattern_move_to(fill_pattern, x0, y0); + cairo_mesh_pattern_line_to(fill_pattern, x1, y1); + cairo_mesh_pattern_line_to(fill_pattern, x2, y2); + + for (j = 0; j < 3; j++) { + shading->getColorSpace()->getRGB(&color[j], &rgb); + cairo_mesh_pattern_set_corner_color_rgb(fill_pattern, j, colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b)); + } + + cairo_mesh_pattern_end_patch(fill_pattern); + } + + double xMin, yMin, xMax, yMax; + // get the clip region bbox + state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax); + state->moveTo(xMin, yMin); + state->lineTo(xMin, yMax); + state->lineTo(xMax, yMax); + state->lineTo(xMax, yMin); + state->closePath(); + fill(state); + state->clearPath(); + + return true; +} + +bool CairoOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading) +{ + int i, j, k; + + cairo_pattern_destroy(fill_pattern); + fill_pattern = cairo_pattern_create_mesh(); + + for (i = 0; i < shading->getNPatches(); i++) { + const GfxPatch *patch = shading->getPatch(i); + GfxColor color; + GfxRGB rgb; + + cairo_mesh_pattern_begin_patch(fill_pattern); + + cairo_mesh_pattern_move_to(fill_pattern, patch->x[0][0], patch->y[0][0]); + cairo_mesh_pattern_curve_to(fill_pattern, patch->x[0][1], patch->y[0][1], patch->x[0][2], patch->y[0][2], patch->x[0][3], patch->y[0][3]); + + cairo_mesh_pattern_curve_to(fill_pattern, patch->x[1][3], patch->y[1][3], patch->x[2][3], patch->y[2][3], patch->x[3][3], patch->y[3][3]); + + cairo_mesh_pattern_curve_to(fill_pattern, patch->x[3][2], patch->y[3][2], patch->x[3][1], patch->y[3][1], patch->x[3][0], patch->y[3][0]); + + cairo_mesh_pattern_curve_to(fill_pattern, patch->x[2][0], patch->y[2][0], patch->x[1][0], patch->y[1][0], patch->x[0][0], patch->y[0][0]); + + cairo_mesh_pattern_set_control_point(fill_pattern, 0, patch->x[1][1], patch->y[1][1]); + cairo_mesh_pattern_set_control_point(fill_pattern, 1, patch->x[1][2], patch->y[1][2]); + cairo_mesh_pattern_set_control_point(fill_pattern, 2, patch->x[2][2], patch->y[2][2]); + cairo_mesh_pattern_set_control_point(fill_pattern, 3, patch->x[2][1], patch->y[2][1]); + + for (j = 0; j < 4; j++) { + int u, v; + + switch (j) { + case 0: + u = 0; + v = 0; + break; + case 1: + u = 0; + v = 1; + break; + case 2: + u = 1; + v = 1; + break; + case 3: + u = 1; + v = 0; + break; + } + + if (shading->isParameterized()) { + shading->getParameterizedColor(patch->color[u][v].c[0], &color); + } else { + for (k = 0; k < shading->getColorSpace()->getNComps(); k++) { + // simply cast to the desired type; that's all what is needed. + color.c[k] = GfxColorComp(patch->color[u][v].c[k]); + } + } + + shading->getColorSpace()->getRGB(&color, &rgb); + cairo_mesh_pattern_set_corner_color_rgb(fill_pattern, j, colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b)); + } + cairo_mesh_pattern_end_patch(fill_pattern); + } + + double xMin, yMin, xMax, yMax; + // get the clip region bbox + state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax); + state->moveTo(xMin, yMin); + state->lineTo(xMin, yMax); + state->lineTo(xMax, yMax); + state->lineTo(xMax, yMin); + state->closePath(); + fill(state); + state->clearPath(); + + return true; +} +#endif /* CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0) */ + +void CairoOutputDev::clip(GfxState *state) +{ + doPath(cairo, state, state->getPath()); + cairo_set_fill_rule(cairo, CAIRO_FILL_RULE_WINDING); + cairo_clip(cairo); + LOG(printf("clip\n")); + if (cairo_shape) { + doPath(cairo_shape, state, state->getPath()); + cairo_set_fill_rule(cairo_shape, CAIRO_FILL_RULE_WINDING); + cairo_clip(cairo_shape); + } +} + +void CairoOutputDev::eoClip(GfxState *state) +{ + doPath(cairo, state, state->getPath()); + cairo_set_fill_rule(cairo, CAIRO_FILL_RULE_EVEN_ODD); + cairo_clip(cairo); + LOG(printf("clip-eo\n")); + if (cairo_shape) { + doPath(cairo_shape, state, state->getPath()); + cairo_set_fill_rule(cairo_shape, CAIRO_FILL_RULE_EVEN_ODD); + cairo_clip(cairo_shape); + } +} + +void CairoOutputDev::clipToStrokePath(GfxState *state) +{ + LOG(printf("clip-to-stroke-path\n")); + strokePathClip = (StrokePathClip *)gmalloc(sizeof(*strokePathClip)); + strokePathClip->path = state->getPath()->copy(); + cairo_get_matrix(cairo, &strokePathClip->ctm); + strokePathClip->line_width = cairo_get_line_width(cairo); + strokePathClip->dash_count = cairo_get_dash_count(cairo); + if (strokePathClip->dash_count) { + strokePathClip->dashes = (double *)gmallocn(sizeof(double), strokePathClip->dash_count); + cairo_get_dash(cairo, strokePathClip->dashes, &strokePathClip->dash_offset); + } else { + strokePathClip->dashes = nullptr; + } + strokePathClip->cap = cairo_get_line_cap(cairo); + strokePathClip->join = cairo_get_line_join(cairo); + strokePathClip->miter = cairo_get_miter_limit(cairo); + strokePathClip->ref_count = 1; +} + +void CairoOutputDev::fillToStrokePathClip(GfxState *state) +{ + cairo_save(cairo); + + cairo_set_matrix(cairo, &strokePathClip->ctm); + cairo_set_line_width(cairo, strokePathClip->line_width); + cairo_set_dash(cairo, strokePathClip->dashes, strokePathClip->dash_count, strokePathClip->dash_offset); + cairo_set_line_cap(cairo, strokePathClip->cap); + cairo_set_line_join(cairo, strokePathClip->join); + cairo_set_miter_limit(cairo, strokePathClip->miter); + doPath(cairo, state, strokePathClip->path); + cairo_stroke(cairo); + + cairo_restore(cairo); +} + +void CairoOutputDev::beginString(GfxState *state, const GooString *s) +{ + int len = s->getLength(); + + if (needFontUpdate) { + updateFont(state); + } + + if (!currentFont) { + return; + } + + glyphs = (cairo_glyph_t *)gmallocn(len, sizeof(cairo_glyph_t)); + glyphCount = 0; + if (use_show_text_glyphs) { + clusters = (cairo_text_cluster_t *)gmallocn(len, sizeof(cairo_text_cluster_t)); + clusterCount = 0; + utf8Max = len * 2; // start with twice the number of glyphs. we will realloc if we need more. + utf8 = (char *)gmalloc(utf8Max); + utf8Count = 0; + } +} + +void CairoOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) +{ + if (currentFont) { + glyphs[glyphCount].index = currentFont->getGlyph(code, u, uLen); + glyphs[glyphCount].x = x - originX; + glyphs[glyphCount].y = y - originY; + glyphCount++; + if (use_show_text_glyphs) { + const UnicodeMap *utf8Map = globalParams->getUtf8Map(); + if (utf8Max - utf8Count < uLen * 6) { + // utf8 encoded characters can be up to 6 bytes + if (utf8Max > uLen * 6) { + utf8Max *= 2; + } else { + utf8Max += 2 * uLen * 6; + } + utf8 = (char *)grealloc(utf8, utf8Max); + } + clusters[clusterCount].num_bytes = 0; + for (int i = 0; i < uLen; i++) { + int size = utf8Map->mapUnicode(u[i], utf8 + utf8Count, utf8Max - utf8Count); + utf8Count += size; + clusters[clusterCount].num_bytes += size; + } + clusters[clusterCount].num_glyphs = 1; + clusterCount++; + } + } + + if (!textPage) { + return; + } + actualText->addChar(state, x, y, dx, dy, code, nBytes, u, uLen); +} + +void CairoOutputDev::endString(GfxState *state) +{ + int render; + + if (!currentFont) { + return; + } + + // endString can be called without a corresponding beginString. If this + // happens glyphs will be null so don't draw anything, just return. + // XXX: OutputDevs should probably not have to deal with this... + if (!glyphs) { + return; + } + + // ignore empty strings and invisible text -- this is used by + // Acrobat Capture + render = state->getRender(); + if (render == 3 || glyphCount == 0 || !text_matrix_valid) { + goto finish; + } + + if (state->getFont()->getType() == fontType3 && render != 7) { + // If the current font is a type 3 font, we should ignore the text rendering mode + // (and use the default of 0) as long as we are going to either fill or stroke. + render = 0; + } + + if (!(render & 1)) { + LOG(printf("fill string\n")); + cairo_set_source(cairo, fill_pattern); + if (use_show_text_glyphs) { + cairo_show_text_glyphs(cairo, utf8, utf8Count, glyphs, glyphCount, clusters, clusterCount, (cairo_text_cluster_flags_t)0); + } else { + cairo_show_glyphs(cairo, glyphs, glyphCount); + } + if (cairo_shape) { + cairo_show_glyphs(cairo_shape, glyphs, glyphCount); + } + } + + // stroke + if ((render & 3) == 1 || (render & 3) == 2) { + LOG(printf("stroke string\n")); + cairo_set_source(cairo, stroke_pattern); + cairo_glyph_path(cairo, glyphs, glyphCount); + cairo_stroke(cairo); + if (cairo_shape) { + cairo_glyph_path(cairo_shape, glyphs, glyphCount); + cairo_stroke(cairo_shape); + } + } + + // clip + if ((render & 4)) { + LOG(printf("clip string\n")); + // append the glyph path to textClipPath. + + // set textClipPath as the currentPath + if (textClipPath) { + cairo_append_path(cairo, textClipPath); + if (cairo_shape) { + cairo_append_path(cairo_shape, textClipPath); + } + cairo_path_destroy(textClipPath); + } + + // append the glyph path + cairo_glyph_path(cairo, glyphs, glyphCount); + + // move the path back into textClipPath + // and clear the current path + textClipPath = cairo_copy_path(cairo); + cairo_new_path(cairo); + if (cairo_shape) { + cairo_new_path(cairo_shape); + } + } + +finish: + gfree(glyphs); + glyphs = nullptr; + if (use_show_text_glyphs) { + gfree(clusters); + clusters = nullptr; + gfree(utf8); + utf8 = nullptr; + } +} + +bool CairoOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, const Unicode *u, int uLen) +{ + + cairo_save(cairo); + cairo_matrix_t matrix; + + const double *ctm = state->getCTM(); + matrix.xx = ctm[0]; + matrix.yx = ctm[1]; + matrix.xy = ctm[2]; + matrix.yy = ctm[3]; + matrix.x0 = ctm[4]; + matrix.y0 = ctm[5]; + /* Restore the original matrix and then transform to matrix needed for the + * type3 font. This is ugly but seems to work. Perhaps there is a better way to do it?*/ + cairo_set_matrix(cairo, &orig_matrix); + cairo_transform(cairo, &matrix); + if (cairo_shape) { + cairo_save(cairo_shape); + cairo_set_matrix(cairo_shape, &orig_matrix); + cairo_transform(cairo_shape, &matrix); + } + cairo_pattern_destroy(stroke_pattern); + cairo_pattern_reference(fill_pattern); + stroke_pattern = fill_pattern; + return false; +} + +void CairoOutputDev::endType3Char(GfxState *state) +{ + cairo_restore(cairo); + if (cairo_shape) { + cairo_restore(cairo_shape); + } +} + +void CairoOutputDev::type3D0(GfxState *state, double wx, double wy) +{ + t3_glyph_wx = wx; + t3_glyph_wy = wy; + t3_glyph_has_color = true; +} + +void CairoOutputDev::type3D1(GfxState *state, double wx, double wy, double llx, double lly, double urx, double ury) +{ + t3_glyph_wx = wx; + t3_glyph_wy = wy; + t3_glyph_bbox[0] = llx; + t3_glyph_bbox[1] = lly; + t3_glyph_bbox[2] = urx; + t3_glyph_bbox[3] = ury; + t3_glyph_has_bbox = true; + t3_glyph_has_color = false; +} + +void CairoOutputDev::beginTextObject(GfxState *state) { } + +void CairoOutputDev::endTextObject(GfxState *state) +{ + if (textClipPath) { + // clip the accumulated text path + cairo_append_path(cairo, textClipPath); + cairo_clip(cairo); + if (cairo_shape) { + cairo_append_path(cairo_shape, textClipPath); + cairo_clip(cairo_shape); + } + cairo_path_destroy(textClipPath); + textClipPath = nullptr; + } +} + +void CairoOutputDev::beginActualText(GfxState *state, const GooString *text) +{ + if (textPage) { + actualText->begin(state, text); + } +} + +void CairoOutputDev::endActualText(GfxState *state) +{ + if (textPage) { + actualText->end(state); + } +} + +static inline int splashRound(SplashCoord x) +{ + return (int)floor(x + 0.5); +} + +static inline int splashCeil(SplashCoord x) +{ + return (int)ceil(x); +} + +static inline int splashFloor(SplashCoord x) +{ + return (int)floor(x); +} + +static cairo_surface_t *cairo_surface_create_similar_clip(cairo_t *cairo, cairo_content_t content) +{ + cairo_pattern_t *pattern; + cairo_surface_t *surface = nullptr; + + cairo_push_group_with_content(cairo, content); + pattern = cairo_pop_group(cairo); + cairo_pattern_get_surface(pattern, &surface); + cairo_surface_reference(surface); + cairo_pattern_destroy(pattern); + return surface; +} + +void CairoOutputDev::beginTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/, GfxColorSpace *blendingColorSpace, bool /*isolated*/, bool knockout, bool forSoftMask) +{ + /* push color space */ + ColorSpaceStack *css = new ColorSpaceStack; + css->cs = blendingColorSpace; + css->knockout = knockout; + cairo_get_matrix(cairo, &css->group_matrix); + css->next = groupColorSpaceStack; + groupColorSpaceStack = css; + + LOG(printf("begin transparency group. knockout: %s\n", knockout ? "yes" : "no")); + + if (knockout) { + knockoutCount++; + if (!cairo_shape) { + /* create a surface for tracking the shape */ + cairo_surface_t *cairo_shape_surface = cairo_surface_create_similar_clip(cairo, CAIRO_CONTENT_ALPHA); + cairo_shape = cairo_create(cairo_shape_surface); + cairo_surface_destroy(cairo_shape_surface); + copyAntialias(cairo_shape, cairo); + + /* the color doesn't matter as long as it is opaque */ + cairo_set_source_rgb(cairo_shape, 0, 0, 0); + cairo_matrix_t matrix; + cairo_get_matrix(cairo, &matrix); + cairo_set_matrix(cairo_shape, &matrix); + } + } + if (groupColorSpaceStack->next && groupColorSpaceStack->next->knockout) { + /* we need to track the shape */ + cairo_push_group(cairo_shape); + } + if (false && forSoftMask) { + cairo_push_group_with_content(cairo, CAIRO_CONTENT_ALPHA); + } else { + cairo_push_group(cairo); + } + + /* push_group has an implicit cairo_save() */ + if (knockout) { + /*XXX: let's hope this matches the semantics needed */ + cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE); + } else { + cairo_set_operator(cairo, CAIRO_OPERATOR_OVER); + } +} + +void CairoOutputDev::endTransparencyGroup(GfxState * /*state*/) +{ + if (group) { + cairo_pattern_destroy(group); + } + group = cairo_pop_group(cairo); + + LOG(printf("end transparency group\n")); + + if (groupColorSpaceStack->next && groupColorSpaceStack->next->knockout) { + if (shape) { + cairo_pattern_destroy(shape); + } + shape = cairo_pop_group(cairo_shape); + } +} + +void CairoOutputDev::paintTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/) +{ + LOG(printf("paint transparency group\n")); + + cairo_save(cairo); + cairo_set_matrix(cairo, &groupColorSpaceStack->group_matrix); + + if (shape) { + /* OPERATOR_SOURCE w/ a mask is defined as (src IN mask) ADD (dest OUT mask) + * however our source has already been clipped to mask so we only need to + * do ADD and OUT */ + + /* clear the shape mask */ + cairo_set_source(cairo, shape); + cairo_set_operator(cairo, CAIRO_OPERATOR_DEST_OUT); + cairo_paint(cairo); + cairo_set_operator(cairo, CAIRO_OPERATOR_ADD); + } + cairo_set_source(cairo, group); + + if (!mask) { + cairo_paint_with_alpha(cairo, fill_opacity); + cairo_status_t status = cairo_status(cairo); + if (status) { + printf("BAD status: %s\n", cairo_status_to_string(status)); + } + } else { + if (fill_opacity < 1.0) { + cairo_push_group(cairo); + } + cairo_save(cairo); + cairo_set_matrix(cairo, &mask_matrix); + cairo_mask(cairo, mask); + cairo_restore(cairo); + if (fill_opacity < 1.0) { + cairo_pop_group_to_source(cairo); + cairo_paint_with_alpha(cairo, fill_opacity); + } + cairo_pattern_destroy(mask); + mask = nullptr; + } + + if (shape) { + if (cairo_shape) { + cairo_set_source(cairo_shape, shape); + cairo_paint(cairo_shape); + cairo_set_source_rgb(cairo_shape, 0, 0, 0); + } + cairo_pattern_destroy(shape); + shape = nullptr; + } + + popTransparencyGroup(); + cairo_restore(cairo); +} + +static int luminocity(uint32_t x) +{ + int r = (x >> 16) & 0xff; + int g = (x >> 8) & 0xff; + int b = (x >> 0) & 0xff; + // an arbitrary integer approximation of .3*r + .59*g + .11*b + int y = (r * 19661 + g * 38666 + b * 7209 + 32829) >> 16; + return y; +} + +/* XXX: do we need to deal with shape here? */ +void CairoOutputDev::setSoftMask(GfxState *state, const double *bbox, bool alpha, Function *transferFunc, GfxColor *backdropColor) +{ + cairo_pattern_destroy(mask); + + LOG(printf("set softMask\n")); + + if (!alpha || transferFunc) { + /* We need to mask according to the luminocity of the group. + * So we paint the group to an image surface convert it to a luminocity map + * and then use that as the mask. */ + + /* Get clip extents in device space */ + double x1, y1, x2, y2, x_min, y_min, x_max, y_max; + cairo_clip_extents(cairo, &x1, &y1, &x2, &y2); + cairo_user_to_device(cairo, &x1, &y1); + cairo_user_to_device(cairo, &x2, &y2); + x_min = MIN(x1, x2); + y_min = MIN(y1, y2); + x_max = MAX(x1, x2); + y_max = MAX(y1, y2); + cairo_clip_extents(cairo, &x1, &y1, &x2, &y2); + cairo_user_to_device(cairo, &x1, &y2); + cairo_user_to_device(cairo, &x2, &y1); + x_min = MIN(x_min, MIN(x1, x2)); + y_min = MIN(y_min, MIN(y1, y2)); + x_max = MAX(x_max, MAX(x1, x2)); + y_max = MAX(y_max, MAX(y1, y2)); + + int width = (int)(ceil(x_max) - floor(x_min)); + int height = (int)(ceil(y_max) - floor(y_min)); + + /* Get group device offset */ + double x_offset, y_offset; + if (cairo_get_group_target(cairo) == cairo_get_target(cairo)) { + cairo_surface_get_device_offset(cairo_get_group_target(cairo), &x_offset, &y_offset); + } else { + cairo_surface_t *pats; + cairo_pattern_get_surface(group, &pats); + cairo_surface_get_device_offset(pats, &x_offset, &y_offset); + } + + /* Adjust extents by group offset */ + x_min += x_offset; + y_min += y_offset; + + cairo_surface_t *source = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); + cairo_t *maskCtx = cairo_create(source); + copyAntialias(maskCtx, cairo); + + // XXX: hopefully this uses the correct color space */ + if (!alpha && groupColorSpaceStack->cs) { + GfxRGB backdropColorRGB; + groupColorSpaceStack->cs->getRGB(backdropColor, &backdropColorRGB); + /* paint the backdrop */ + cairo_set_source_rgb(maskCtx, colToDbl(backdropColorRGB.r), colToDbl(backdropColorRGB.g), colToDbl(backdropColorRGB.b)); + } + cairo_paint(maskCtx); + + /* Copy source ctm to mask ctm and translate origin so that the + * mask appears it the same location on the source surface. */ + cairo_matrix_t mat, tmat; + cairo_matrix_init_translate(&tmat, -x_min, -y_min); + cairo_get_matrix(cairo, &mat); + cairo_matrix_multiply(&mat, &mat, &tmat); + cairo_set_matrix(maskCtx, &mat); + + /* make the device offset of the new mask match that of the group */ + cairo_surface_set_device_offset(source, x_offset, y_offset); + + /* paint the group */ + cairo_set_source(maskCtx, group); + cairo_paint(maskCtx); + + /* XXX status = cairo_status(maskCtx); */ + cairo_destroy(maskCtx); + + /* convert to a luminocity map */ + uint32_t *source_data = reinterpret_cast(cairo_image_surface_get_data(source)); + if (source_data) { + /* get stride in units of 32 bits */ + ptrdiff_t stride = cairo_image_surface_get_stride(source) / 4; + for (int y = 0; y < height; y++) { + for (int x = 0; x < width; x++) { + int lum = alpha ? fill_opacity : luminocity(source_data[y * stride + x]); + if (transferFunc) { + double lum_in, lum_out; + lum_in = lum / 256.0; + transferFunc->transform(&lum_in, &lum_out); + lum = (int)(lum_out * 255.0 + 0.5); + } + source_data[y * stride + x] = lum << 24; + } + } + cairo_surface_mark_dirty(source); + } + + /* setup the new mask pattern */ + mask = cairo_pattern_create_for_surface(source); + cairo_get_matrix(cairo, &mask_matrix); + + if (cairo_get_group_target(cairo) == cairo_get_target(cairo)) { + cairo_pattern_set_matrix(mask, &mat); + } else { + cairo_matrix_t patMatrix; + cairo_pattern_get_matrix(group, &patMatrix); + /* Apply x_min, y_min offset to it appears in the same location as source. */ + cairo_matrix_multiply(&patMatrix, &patMatrix, &tmat); + cairo_pattern_set_matrix(mask, &patMatrix); + } + + cairo_surface_destroy(source); + } else if (alpha) { + mask = cairo_pattern_reference(group); + cairo_get_matrix(cairo, &mask_matrix); + } + + popTransparencyGroup(); +} + +void CairoOutputDev::popTransparencyGroup() +{ + /* pop color space */ + ColorSpaceStack *css = groupColorSpaceStack; + if (css->knockout) { + knockoutCount--; + if (!knockoutCount) { + /* we don't need to track the shape anymore because + * we are not above any knockout groups */ + cairo_destroy(cairo_shape); + cairo_shape = nullptr; + } + } + groupColorSpaceStack = css->next; + delete css; +} + +void CairoOutputDev::clearSoftMask(GfxState * /*state*/) +{ + if (mask) { + cairo_pattern_destroy(mask); + } + mask = nullptr; +} + +/* Taken from cairo/doc/tutorial/src/singular.c */ +static void get_singular_values(const cairo_matrix_t *matrix, double *major, double *minor) +{ + double xx = matrix->xx, xy = matrix->xy; + double yx = matrix->yx, yy = matrix->yy; + + double a = xx * xx + yx * yx; + double b = xy * xy + yy * yy; + double k = xx * xy + yx * yy; + + double f = (a + b) * .5; + double g = (a - b) * .5; + double delta = sqrt(g * g + k * k); + + if (major) { + *major = sqrt(f + delta); + } + if (minor) { + *minor = sqrt(f - delta); + } +} + +void CairoOutputDev::getScaledSize(const cairo_matrix_t *matrix, int orig_width, int orig_height, int *scaledWidth, int *scaledHeight) +{ + double xScale; + double yScale; + if (orig_width > orig_height) { + get_singular_values(matrix, &xScale, &yScale); + } else { + get_singular_values(matrix, &yScale, &xScale); + } + + int tx, tx2, ty, ty2; /* the integer co-ordinates of the resulting image */ + if (xScale >= 0) { + tx = splashRound(matrix->x0 - 0.01); + tx2 = splashRound(matrix->x0 + xScale + 0.01) - 1; + } else { + tx = splashRound(matrix->x0 + 0.01) - 1; + tx2 = splashRound(matrix->x0 + xScale - 0.01); + } + *scaledWidth = abs(tx2 - tx) + 1; + // scaledWidth = splashRound(fabs(xScale)); + if (*scaledWidth == 0) { + // technically, this should draw nothing, but it generally seems + // better to draw a one-pixel-wide stripe rather than throwing it + // away + *scaledWidth = 1; + } + if (yScale >= 0) { + ty = splashFloor(matrix->y0 + 0.01); + ty2 = splashCeil(matrix->y0 + yScale - 0.01); + } else { + ty = splashCeil(matrix->y0 - 0.01); + ty2 = splashFloor(matrix->y0 + yScale + 0.01); + } + *scaledHeight = abs(ty2 - ty); + if (*scaledHeight == 0) { + *scaledHeight = 1; + } +} + +cairo_filter_t CairoOutputDev::getFilterForSurface(cairo_surface_t *image, bool interpolate) +{ + if (interpolate) { + return CAIRO_FILTER_GOOD; + } + + int orig_width = cairo_image_surface_get_width(image); + int orig_height = cairo_image_surface_get_height(image); + if (orig_width == 0 || orig_height == 0) { + return CAIRO_FILTER_NEAREST; + } + + /* When printing, don't change the interpolation. */ + if (printing) { + return CAIRO_FILTER_NEAREST; + } + + cairo_matrix_t matrix; + cairo_get_matrix(cairo, &matrix); + int scaled_width, scaled_height; + getScaledSize(&matrix, orig_width, orig_height, &scaled_width, &scaled_height); + + /* When scale factor is >= 400% we don't interpolate. See bugs #25268, #9860 */ + if (scaled_width / orig_width >= 4 || scaled_height / orig_height >= 4) { + return CAIRO_FILTER_NEAREST; + } + + return CAIRO_FILTER_GOOD; +} + +void CairoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) +{ + + /* FIXME: Doesn't the image mask support any colorspace? */ + cairo_set_source(cairo, fill_pattern); + + /* work around a cairo bug when scaling 1x1 surfaces */ + if (width == 1 && height == 1) { + ImageStream *imgStr; + unsigned char pix; + int invert_bit; + + imgStr = new ImageStream(str, width, 1, 1); + imgStr->reset(); + imgStr->getPixel(&pix); + imgStr->close(); + delete imgStr; + + invert_bit = invert ? 1 : 0; + if (pix ^ invert_bit) { + return; + } + + cairo_save(cairo); + cairo_rectangle(cairo, 0., 0., width, height); + cairo_fill(cairo); + cairo_restore(cairo); + if (cairo_shape) { + cairo_save(cairo_shape); + cairo_rectangle(cairo_shape, 0., 0., width, height); + cairo_fill(cairo_shape); + cairo_restore(cairo_shape); + } + return; + } + + /* shape is 1.0 for painted areas, 0.0 for unpainted ones */ + + cairo_matrix_t matrix; + cairo_get_matrix(cairo, &matrix); + // XXX: it is possible that we should only do sub pixel positioning if + // we are rendering fonts */ + if (!printing + && prescaleImages + /* not rotated */ + && matrix.xy == 0 + && matrix.yx == 0 + /* axes not flipped / not 180 deg rotated */ + && matrix.xx > 0 && (upsideDown() ? -1 : 1) * matrix.yy > 0) { + drawImageMaskPrescaled(state, ref, str, width, height, invert, interpolate, inlineImg); + } else { + drawImageMaskRegular(state, ref, str, width, height, invert, interpolate, inlineImg); + } +} + +void CairoOutputDev::setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool inlineImg, double *baseMatrix) +{ + + /* FIXME: Doesn't the image mask support any colorspace? */ + cairo_set_source(cairo, fill_pattern); + + /* work around a cairo bug when scaling 1x1 surfaces */ + if (width == 1 && height == 1) { + ImageStream *imgStr; + unsigned char pix; + int invert_bit; + + imgStr = new ImageStream(str, width, 1, 1); + imgStr->reset(); + imgStr->getPixel(&pix); + imgStr->close(); + delete imgStr; + + invert_bit = invert ? 1 : 0; + if (!(pix ^ invert_bit)) { + cairo_save(cairo); + cairo_rectangle(cairo, 0., 0., width, height); + cairo_fill(cairo); + cairo_restore(cairo); + if (cairo_shape) { + cairo_save(cairo_shape); + cairo_rectangle(cairo_shape, 0., 0., width, height); + cairo_fill(cairo_shape); + cairo_restore(cairo_shape); + } + } + } else { + cairo_push_group_with_content(cairo, CAIRO_CONTENT_ALPHA); + + /* shape is 1.0 for painted areas, 0.0 for unpainted ones */ + + cairo_matrix_t matrix; + cairo_get_matrix(cairo, &matrix); + // XXX: it is possible that we should only do sub pixel positioning if + // we are rendering fonts */ + if (!printing && prescaleImages && matrix.xy == 0.0 && matrix.yx == 0.0) { + drawImageMaskPrescaled(state, ref, str, width, height, invert, false, inlineImg); + } else { + drawImageMaskRegular(state, ref, str, width, height, invert, false, inlineImg); + } + + if (state->getFillColorSpace()->getMode() == csPattern) { + cairo_set_source_rgb(cairo, 1, 1, 1); + cairo_set_matrix(cairo, &mask_matrix); + cairo_mask(cairo, mask); + } + + if (mask) { + cairo_pattern_destroy(mask); + } + mask = cairo_pop_group(cairo); + } + + saveState(state); + double bbox[4] = { 0, 0, 1, 1 }; // dummy + beginTransparencyGroup(state, bbox, state->getFillColorSpace(), true, false, false); +} + +void CairoOutputDev::unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) +{ + double bbox[4] = { 0, 0, 1, 1 }; // dummy + + endTransparencyGroup(state); + restoreState(state); + paintTransparencyGroup(state, bbox); + clearSoftMask(state); +} + +void CairoOutputDev::drawImageMaskRegular(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) +{ + unsigned char *buffer; + unsigned char *dest; + cairo_surface_t *image; + cairo_pattern_t *pattern; + int x, y, i, bit; + ImageStream *imgStr; + unsigned char *pix; + cairo_matrix_t matrix; + int invert_bit; + ptrdiff_t row_stride; + cairo_filter_t filter; + + /* TODO: Do we want to cache these? */ + imgStr = new ImageStream(str, width, 1, 1); + imgStr->reset(); + + image = cairo_image_surface_create(CAIRO_FORMAT_A1, width, height); + if (cairo_surface_status(image)) { + goto cleanup; + } + + buffer = cairo_image_surface_get_data(image); + row_stride = cairo_image_surface_get_stride(image); + + invert_bit = invert ? 1 : 0; + + for (y = 0; y < height; y++) { + pix = imgStr->getLine(); + dest = buffer + y * row_stride; + i = 0; + bit = 0; + for (x = 0; x < width; x++) { + if (bit == 0) { + dest[i] = 0; + } + if (!(pix[x] ^ invert_bit)) { +#ifdef WORDS_BIGENDIAN + dest[i] |= (1 << (7 - bit)); +#else + dest[i] |= (1 << bit); +#endif + } + bit++; + if (bit > 7) { + bit = 0; + i++; + } + } + } + + filter = getFilterForSurface(image, interpolate); + + cairo_surface_mark_dirty(image); + pattern = cairo_pattern_create_for_surface(image); + cairo_surface_destroy(image); + if (cairo_pattern_status(pattern)) { + goto cleanup; + } + + LOG(printf("drawImageMask %dx%d\n", width, height)); + + cairo_pattern_set_filter(pattern, filter); + + cairo_matrix_init_translate(&matrix, 0, height); + cairo_matrix_scale(&matrix, width, -height); + cairo_pattern_set_matrix(pattern, &matrix); + if (cairo_pattern_status(pattern)) { + cairo_pattern_destroy(pattern); + goto cleanup; + } + + if (state->getFillColorSpace()->getMode() == csPattern) { + mask = cairo_pattern_reference(pattern); + cairo_get_matrix(cairo, &mask_matrix); + } else if (!printing) { + cairo_save(cairo); + cairo_rectangle(cairo, 0., 0., 1., 1.); + cairo_clip(cairo); + if (strokePathClip) { + cairo_push_group(cairo); + fillToStrokePathClip(state); + cairo_pop_group_to_source(cairo); + } + cairo_mask(cairo, pattern); + cairo_restore(cairo); + } else { + cairo_mask(cairo, pattern); + } + + if (cairo_shape) { + cairo_save(cairo_shape); + cairo_set_source(cairo_shape, pattern); + if (!printing) { + cairo_rectangle(cairo_shape, 0., 0., 1., 1.); + cairo_fill(cairo_shape); + } else { + cairo_mask(cairo_shape, pattern); + } + cairo_restore(cairo_shape); + } + + cairo_pattern_destroy(pattern); + +cleanup: + imgStr->close(); + delete imgStr; +} + +void CairoOutputDev::drawImageMaskPrescaled(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) +{ + unsigned char *buffer; + cairo_surface_t *image; + cairo_pattern_t *pattern; + ImageStream *imgStr; + unsigned char *pix; + cairo_matrix_t matrix; + int invert_bit; + ptrdiff_t row_stride; + + /* cairo does a very poor job of scaling down images so we scale them ourselves */ + + LOG(printf("drawImageMaskPrescaled %dx%d\n", width, height)); + + /* this scaling code is adopted from the splash image scaling code */ + cairo_get_matrix(cairo, &matrix); +#if 0 + printf("[%f %f], [%f %f], %f %f\n", matrix.xx, matrix.xy, matrix.yx, matrix.yy, matrix.x0, matrix.y0); +#endif + /* this whole computation should be factored out */ + double xScale = matrix.xx; + double yScale = matrix.yy; + int tx, tx2, ty, ty2; /* the integer co-ordinates of the resulting image */ + int scaledHeight; + int scaledWidth; + if (xScale >= 0) { + tx = splashRound(matrix.x0 - 0.01); + tx2 = splashRound(matrix.x0 + xScale + 0.01) - 1; + } else { + tx = splashRound(matrix.x0 + 0.01) - 1; + tx2 = splashRound(matrix.x0 + xScale - 0.01); + } + scaledWidth = abs(tx2 - tx) + 1; + // scaledWidth = splashRound(fabs(xScale)); + if (scaledWidth == 0) { + // technically, this should draw nothing, but it generally seems + // better to draw a one-pixel-wide stripe rather than throwing it + // away + scaledWidth = 1; + } + if (yScale >= 0) { + ty = splashFloor(matrix.y0 + 0.01); + ty2 = splashCeil(matrix.y0 + yScale - 0.01); + } else { + ty = splashCeil(matrix.y0 - 0.01); + ty2 = splashFloor(matrix.y0 + yScale + 0.01); + } + scaledHeight = abs(ty2 - ty); + if (scaledHeight == 0) { + scaledHeight = 1; + } +#if 0 + printf("xscale: %g, yscale: %g\n", xScale, yScale); + printf("width: %d, height: %d\n", width, height); + printf("scaledWidth: %d, scaledHeight: %d\n", scaledWidth, scaledHeight); +#endif + + /* compute the required padding */ + /* Padding is used to preserve the aspect ratio. + We compute total_pad to make (height+total_pad)/scaledHeight as close to height/yScale as possible */ + int head_pad = 0; + int tail_pad = 0; + int total_pad = splashRound(height * (scaledHeight / fabs(yScale)) - height); + + /* compute the two pieces of padding */ + if (total_pad > 0) { + // XXX: i'm not positive fabs() is correct + float tail_error = fabs(matrix.y0 - ty); + float head_error = fabs(ty2 - (matrix.y0 + yScale)); + float tail_fraction = tail_error / (tail_error + head_error); + tail_pad = splashRound(total_pad * tail_fraction); + head_pad = total_pad - tail_pad; + } else { + tail_pad = 0; + head_pad = 0; + } + int origHeight = height; + height += tail_pad; + height += head_pad; +#if 0 + printf("head_pad: %d tail_pad: %d\n", head_pad, tail_pad); + printf("origHeight: %d height: %d\n", origHeight, height); + printf("ty: %d, ty2: %d\n", ty, ty2); +#endif + + /* TODO: Do we want to cache these? */ + imgStr = new ImageStream(str, width, 1, 1); + imgStr->reset(); + + invert_bit = invert ? 1 : 0; + + image = cairo_image_surface_create(CAIRO_FORMAT_A8, scaledWidth, scaledHeight); + if (cairo_surface_status(image)) { + imgStr->close(); + delete imgStr; + return; + } + + buffer = cairo_image_surface_get_data(image); + row_stride = cairo_image_surface_get_stride(image); + + int yp = height / scaledHeight; + int yq = height % scaledHeight; + int xp = width / scaledWidth; + int xq = width % scaledWidth; + int yt = 0; + int origHeight_c = origHeight; + /* use MIN() because yp might be > origHeight because of padding */ + unsigned char *pixBuf = (unsigned char *)malloc(MIN(yp + 1, origHeight) * width); + int lastYStep = 1; + int total = 0; + for (int y = 0; y < scaledHeight; y++) { + // y scale Bresenham + int yStep = yp; + yt += yq; + + if (yt >= scaledHeight) { + yt -= scaledHeight; + ++yStep; + } + + // read row (s) from image ignoring the padding as appropriate + { + int n = (yp > 0) ? yStep : lastYStep; + total += n; + if (n > 0) { + unsigned char *p = pixBuf; + int head_pad_count = head_pad; + int origHeight_count = origHeight; + int tail_pad_count = tail_pad; + for (int i = 0; i < n; i++) { + // get row + if (head_pad_count) { + head_pad_count--; + } else if (origHeight_count) { + pix = imgStr->getLine(); + for (int j = 0; j < width; j++) { + if (pix[j] ^ invert_bit) { + p[j] = 0; + } else { + p[j] = 255; + } + } + origHeight_count--; + p += width; + } else if (tail_pad_count) { + tail_pad_count--; + } else { + printf("%d %d\n", n, total); + assert(0 && "over run\n"); + } + } + } + } + + lastYStep = yStep; + + int xt = 0; + int xSrc = 0; + int n = yStep > 0 ? yStep : 1; + int origN = n; + + /* compute the size of padding and pixels that will be used for this row */ + int head_pad_size = MIN(n, head_pad); + n -= head_pad_size; + head_pad -= MIN(head_pad_size, yStep); + + int pix_size = MIN(n, origHeight); + n -= pix_size; + origHeight -= MIN(pix_size, yStep); + + int tail_pad_size = MIN(n, tail_pad); + n -= tail_pad_size; + tail_pad -= MIN(tail_pad_size, yStep); + if (n != 0) { + printf("n = %d (%d %d %d)\n", n, head_pad_size, pix_size, tail_pad_size); + assert(n == 0); + } + + for (int x = 0; x < scaledWidth; ++x) { + int xStep = xp; + xt += xq; + if (xt >= scaledWidth) { + xt -= scaledWidth; + ++xStep; + } + int m = xStep > 0 ? xStep : 1; + float pixAcc0 = 0; + /* could m * head_pad_size * tail_pad_size overflow? */ + if (invert_bit) { + pixAcc0 += m * head_pad_size * tail_pad_size * 255; + } else { + pixAcc0 += m * head_pad_size * tail_pad_size * 0; + } + /* Accumulate all of the source pixels for the destination pixel */ + for (int i = 0; i < pix_size; ++i) { + for (int j = 0; j < m; ++j) { + if (xSrc + i * width + j > MIN(yp + 1, origHeight_c) * width) { + printf("%d > %d (%d %d %d %d) (%d %d %d)\n", xSrc + i * width + j, MIN(yp + 1, origHeight_c) * width, xSrc, i, width, j, yp, origHeight_c, width); + printf("%d %d %d\n", head_pad_size, pix_size, tail_pad_size); + assert(0 && "bad access\n"); + } + pixAcc0 += pixBuf[xSrc + i * width + j]; + } + } + buffer[y * row_stride + x] = splashFloor(pixAcc0 / (origN * m)); + xSrc += xStep; + } + } + free(pixBuf); + + cairo_surface_mark_dirty(image); + pattern = cairo_pattern_create_for_surface(image); + cairo_surface_destroy(image); + if (cairo_pattern_status(pattern)) { + imgStr->close(); + delete imgStr; + return; + } + + /* we should actually be using CAIRO_FILTER_NEAREST here. However, + * cairo doesn't yet do minifaction filtering causing scaled down + * images with CAIRO_FILTER_NEAREST to look really bad */ + cairo_pattern_set_filter(pattern, interpolate ? CAIRO_FILTER_GOOD : CAIRO_FILTER_FAST); + + if (state->getFillColorSpace()->getMode() == csPattern) { + cairo_matrix_init_translate(&matrix, 0, scaledHeight); + cairo_matrix_scale(&matrix, scaledWidth, -scaledHeight); + cairo_pattern_set_matrix(pattern, &matrix); + if (cairo_pattern_status(pattern)) { + cairo_pattern_destroy(pattern); + imgStr->close(); + delete imgStr; + return; + } + + mask = cairo_pattern_reference(pattern); + cairo_get_matrix(cairo, &mask_matrix); + } else { + cairo_save(cairo); + + /* modify our current transformation so that the prescaled image + * goes where it is supposed to */ + cairo_get_matrix(cairo, &matrix); + cairo_scale(cairo, 1.0 / matrix.xx, 1.0 / matrix.yy); + // get integer co-ords + cairo_translate(cairo, tx - matrix.x0, ty2 - matrix.y0); + if (yScale > 0) { + cairo_scale(cairo, 1, -1); + } + + cairo_rectangle(cairo, 0., 0., scaledWidth, scaledHeight); + cairo_clip(cairo); + if (strokePathClip) { + cairo_push_group(cairo); + fillToStrokePathClip(state); + cairo_pop_group_to_source(cairo); + } + cairo_mask(cairo, pattern); + + // cairo_get_matrix(cairo, &matrix); + // printf("mask at: [%f %f], [%f %f], %f %f\n\n", matrix.xx, matrix.xy, matrix.yx, matrix.yy, matrix.x0, matrix.y0); + cairo_restore(cairo); + } + + if (cairo_shape) { + cairo_save(cairo_shape); + + /* modify our current transformation so that the prescaled image + * goes where it is supposed to */ + cairo_get_matrix(cairo_shape, &matrix); + cairo_scale(cairo_shape, 1.0 / matrix.xx, 1.0 / matrix.yy); + // get integer co-ords + cairo_translate(cairo_shape, tx - matrix.x0, ty2 - matrix.y0); + if (yScale > 0) { + cairo_scale(cairo_shape, 1, -1); + } + + cairo_rectangle(cairo_shape, 0., 0., scaledWidth, scaledHeight); + cairo_fill(cairo_shape); + + cairo_restore(cairo_shape); + } + + cairo_pattern_destroy(pattern); + + imgStr->close(); + delete imgStr; +} + +void CairoOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, bool maskInvert, bool maskInterpolate) +{ + ImageStream *maskImgStr, *imgStr; + ptrdiff_t row_stride; + unsigned char *maskBuffer, *buffer; + unsigned char *maskDest; + unsigned int *dest; + cairo_surface_t *maskImage, *image; + cairo_pattern_t *maskPattern, *pattern; + cairo_matrix_t matrix; + cairo_matrix_t maskMatrix; + unsigned char *pix; + int x, y; + int invert_bit; + cairo_filter_t filter; + cairo_filter_t maskFilter; + + maskImgStr = new ImageStream(maskStr, maskWidth, 1, 1); + maskImgStr->reset(); + + maskImage = cairo_image_surface_create(CAIRO_FORMAT_A8, maskWidth, maskHeight); + if (cairo_surface_status(maskImage)) { + maskImgStr->close(); + delete maskImgStr; + return; + } + + maskBuffer = cairo_image_surface_get_data(maskImage); + row_stride = cairo_image_surface_get_stride(maskImage); + + invert_bit = maskInvert ? 1 : 0; + + for (y = 0; y < maskHeight; y++) { + pix = maskImgStr->getLine(); + maskDest = maskBuffer + y * row_stride; + for (x = 0; x < maskWidth; x++) { + if (pix[x] ^ invert_bit) { + *maskDest++ = 0; + } else { + *maskDest++ = 255; + } + } + } + + maskImgStr->close(); + delete maskImgStr; + + maskFilter = getFilterForSurface(maskImage, maskInterpolate); + + cairo_surface_mark_dirty(maskImage); + maskPattern = cairo_pattern_create_for_surface(maskImage); + cairo_surface_destroy(maskImage); + if (cairo_pattern_status(maskPattern)) { + return; + } + +#if 0 + /* ICCBased color space doesn't do any color correction + * so check its underlying color space as well */ + int is_identity_transform; + is_identity_transform = colorMap->getColorSpace()->getMode() == csDeviceRGB || + (colorMap->getColorSpace()->getMode() == csICCBased && + ((GfxICCBasedColorSpace*)colorMap->getColorSpace())->getAlt()->getMode() == csDeviceRGB); +#endif + + /* TODO: Do we want to cache these? */ + imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); + + image = cairo_image_surface_create(CAIRO_FORMAT_RGB24, width, height); + if (cairo_surface_status(image)) { + goto cleanup; + } + + buffer = cairo_image_surface_get_data(image); + row_stride = cairo_image_surface_get_stride(image); + for (y = 0; y < height; y++) { + dest = reinterpret_cast(buffer + y * row_stride); + pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + } + + filter = getFilterForSurface(image, interpolate); + + cairo_surface_mark_dirty(image); + pattern = cairo_pattern_create_for_surface(image); + cairo_surface_destroy(image); + if (cairo_pattern_status(pattern)) { + goto cleanup; + } + + LOG(printf("drawMaskedImage %dx%d\n", width, height)); + + cairo_pattern_set_filter(pattern, filter); + cairo_pattern_set_filter(maskPattern, maskFilter); + + if (!printing) { + cairo_pattern_set_extend(pattern, CAIRO_EXTEND_PAD); + cairo_pattern_set_extend(maskPattern, CAIRO_EXTEND_PAD); + } + + cairo_matrix_init_translate(&matrix, 0, height); + cairo_matrix_scale(&matrix, width, -height); + cairo_pattern_set_matrix(pattern, &matrix); + if (cairo_pattern_status(pattern)) { + cairo_pattern_destroy(pattern); + cairo_pattern_destroy(maskPattern); + goto cleanup; + } + + cairo_matrix_init_translate(&maskMatrix, 0, maskHeight); + cairo_matrix_scale(&maskMatrix, maskWidth, -maskHeight); + cairo_pattern_set_matrix(maskPattern, &maskMatrix); + if (cairo_pattern_status(maskPattern)) { + cairo_pattern_destroy(maskPattern); + cairo_pattern_destroy(pattern); + goto cleanup; + } + + if (!printing) { + cairo_save(cairo); + cairo_set_source(cairo, pattern); + cairo_rectangle(cairo, 0., 0., 1., 1.); + cairo_clip(cairo); + cairo_mask(cairo, maskPattern); + cairo_restore(cairo); + } else { + cairo_set_source(cairo, pattern); + cairo_mask(cairo, maskPattern); + } + + if (cairo_shape) { + cairo_save(cairo_shape); + cairo_set_source(cairo_shape, pattern); + if (!printing) { + cairo_rectangle(cairo_shape, 0., 0., 1., 1.); + cairo_fill(cairo_shape); + } else { + cairo_mask(cairo_shape, pattern); + } + cairo_restore(cairo_shape); + } + + cairo_pattern_destroy(maskPattern); + cairo_pattern_destroy(pattern); + +cleanup: + imgStr->close(); + delete imgStr; +} + +static inline void getMatteColorRgb(GfxImageColorMap *colorMap, const GfxColor *matteColorIn, GfxRGB *matteColorRgb) +{ + colorMap->getColorSpace()->getRGB(matteColorIn, matteColorRgb); + matteColorRgb->r = colToByte(matteColorRgb->r); + matteColorRgb->g = colToByte(matteColorRgb->g); + matteColorRgb->b = colToByte(matteColorRgb->b); +} + +static inline void applyMask(unsigned int *imagePointer, int length, GfxRGB matteColor, unsigned char *alphaPointer) +{ + unsigned char *p, r, g, b; + int i; + + for (i = 0, p = (unsigned char *)imagePointer; i < length; i++, p += 4, alphaPointer++) { + if (*alphaPointer) { + b = std::clamp(matteColor.b + (int)(p[0] - matteColor.b) * 255 / *alphaPointer, 0, 255); + g = std::clamp(matteColor.g + (int)(p[1] - matteColor.g) * 255 / *alphaPointer, 0, 255); + r = std::clamp(matteColor.r + (int)(p[2] - matteColor.r) * 255 / *alphaPointer, 0, 255); + imagePointer[i] = (r << 16) | (g << 8) | (b << 0); + } + } +} + +// XXX: is this affect by AIS(alpha is shape)? +void CairoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap, + bool maskInterpolate) +{ + ImageStream *maskImgStr, *imgStr; + ptrdiff_t row_stride, mask_row_stride; + unsigned char *maskBuffer, *buffer; + unsigned char *maskDest; + unsigned int *dest; + cairo_surface_t *maskImage, *image; + cairo_pattern_t *maskPattern, *pattern; + cairo_matrix_t maskMatrix, matrix; + unsigned char *pix; + int y; + cairo_filter_t filter; + cairo_filter_t maskFilter; + GfxRGB matteColorRgb; + + const GfxColor *matteColor = maskColorMap->getMatteColor(); + if (matteColor != nullptr) { + getMatteColorRgb(colorMap, matteColor, &matteColorRgb); + } + + maskImgStr = new ImageStream(maskStr, maskWidth, maskColorMap->getNumPixelComps(), maskColorMap->getBits()); + maskImgStr->reset(); + + maskImage = cairo_image_surface_create(CAIRO_FORMAT_A8, maskWidth, maskHeight); + if (cairo_surface_status(maskImage)) { + maskImgStr->close(); + delete maskImgStr; + return; + } + + maskBuffer = cairo_image_surface_get_data(maskImage); + mask_row_stride = cairo_image_surface_get_stride(maskImage); + for (y = 0; y < maskHeight; y++) { + maskDest = (unsigned char *)(maskBuffer + y * mask_row_stride); + pix = maskImgStr->getLine(); + if (likely(pix != nullptr)) { + maskColorMap->getGrayLine(pix, maskDest, maskWidth); + } + } + + maskImgStr->close(); + delete maskImgStr; + + maskFilter = getFilterForSurface(maskImage, maskInterpolate); + + cairo_surface_mark_dirty(maskImage); + maskPattern = cairo_pattern_create_for_surface(maskImage); + cairo_surface_destroy(maskImage); + if (cairo_pattern_status(maskPattern)) { + return; + } + +#if 0 + /* ICCBased color space doesn't do any color correction + * so check its underlying color space as well */ + int is_identity_transform; + is_identity_transform = colorMap->getColorSpace()->getMode() == csDeviceRGB || + (colorMap->getColorSpace()->getMode() == csICCBased && + ((GfxICCBasedColorSpace*)colorMap->getColorSpace())->getAlt()->getMode() == csDeviceRGB); +#endif + + /* TODO: Do we want to cache these? */ + imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); + + image = cairo_image_surface_create(CAIRO_FORMAT_RGB24, width, height); + if (cairo_surface_status(image)) { + goto cleanup; + } + + buffer = cairo_image_surface_get_data(image); + row_stride = cairo_image_surface_get_stride(image); + for (y = 0; y < height; y++) { + dest = reinterpret_cast(buffer + y * row_stride); + pix = imgStr->getLine(); + if (likely(pix != nullptr)) { + colorMap->getRGBLine(pix, dest, width); + if (matteColor != nullptr) { + maskDest = (unsigned char *)(maskBuffer + y * mask_row_stride); + applyMask(dest, width, matteColorRgb, maskDest); + } + } + } + + filter = getFilterForSurface(image, interpolate); + + cairo_surface_mark_dirty(image); + + if (matteColor == nullptr) { + setMimeData(state, str, ref, colorMap, image, height); + } + + pattern = cairo_pattern_create_for_surface(image); + cairo_surface_destroy(image); + if (cairo_pattern_status(pattern)) { + goto cleanup; + } + + LOG(printf("drawSoftMaskedImage %dx%d\n", width, height)); + + cairo_pattern_set_filter(pattern, filter); + cairo_pattern_set_filter(maskPattern, maskFilter); + + if (!printing) { + cairo_pattern_set_extend(pattern, CAIRO_EXTEND_PAD); + cairo_pattern_set_extend(maskPattern, CAIRO_EXTEND_PAD); + } + + cairo_matrix_init_translate(&matrix, 0, height); + cairo_matrix_scale(&matrix, width, -height); + cairo_pattern_set_matrix(pattern, &matrix); + if (cairo_pattern_status(pattern)) { + cairo_pattern_destroy(pattern); + cairo_pattern_destroy(maskPattern); + goto cleanup; + } + + cairo_matrix_init_translate(&maskMatrix, 0, maskHeight); + cairo_matrix_scale(&maskMatrix, maskWidth, -maskHeight); + cairo_pattern_set_matrix(maskPattern, &maskMatrix); + if (cairo_pattern_status(maskPattern)) { + cairo_pattern_destroy(maskPattern); + cairo_pattern_destroy(pattern); + goto cleanup; + } + + if (fill_opacity != 1.0) { + cairo_push_group(cairo); + } else { + cairo_save(cairo); + } + + cairo_set_source(cairo, pattern); + if (!printing) { + cairo_rectangle(cairo, 0., 0., 1., 1.); + cairo_clip(cairo); + } + cairo_mask(cairo, maskPattern); + + if (fill_opacity != 1.0) { + cairo_pop_group_to_source(cairo); + cairo_save(cairo); + if (!printing) { + cairo_rectangle(cairo, 0., 0., 1., 1.); + cairo_clip(cairo); + } + cairo_paint_with_alpha(cairo, fill_opacity); + } + cairo_restore(cairo); + + if (cairo_shape) { + cairo_save(cairo_shape); + cairo_set_source(cairo_shape, pattern); + if (!printing) { + cairo_rectangle(cairo_shape, 0., 0., 1., 1.); + cairo_fill(cairo_shape); + } else { + cairo_mask(cairo_shape, pattern); + } + cairo_restore(cairo_shape); + } + + cairo_pattern_destroy(maskPattern); + cairo_pattern_destroy(pattern); + +cleanup: + imgStr->close(); + delete imgStr; +} + +bool CairoOutputDev::getStreamData(Stream *str, char **buffer, int *length) +{ + int len, i; + char *strBuffer; + + len = 0; + str->close(); + str->reset(); + while (str->getChar() != EOF) { + len++; + } + if (len == 0) { + return false; + } + + strBuffer = (char *)gmalloc(len); + + str->close(); + str->reset(); + for (i = 0; i < len; ++i) { + strBuffer[i] = str->getChar(); + } + + *buffer = strBuffer; + *length = len; + + return true; +} + +static bool colorMapHasIdentityDecodeMap(GfxImageColorMap *colorMap) +{ + for (int i = 0; i < colorMap->getNumPixelComps(); i++) { + if (colorMap->getDecodeLow(i) != 0.0 || colorMap->getDecodeHigh(i) != 1.0) { + return false; + } + } + return true; +} + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2) +static cairo_status_t setMimeIdFromRef(cairo_surface_t *surface, const char *mime_type, const char *mime_id_prefix, Ref ref) +{ + GooString *mime_id; + char *idBuffer; + cairo_status_t status; + + mime_id = new GooString; + + if (mime_id_prefix) { + mime_id->append(mime_id_prefix); + } + + mime_id->appendf("{0:d}-{1:d}", ref.gen, ref.num); + + idBuffer = copyString(mime_id->c_str()); + status = cairo_surface_set_mime_data(surface, mime_type, (const unsigned char *)idBuffer, mime_id->getLength(), gfree, idBuffer); + delete mime_id; + if (status) { + gfree(idBuffer); + } + return status; +} +#endif + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0) +bool CairoOutputDev::setMimeDataForJBIG2Globals(Stream *str, cairo_surface_t *image) +{ + JBIG2Stream *jb2Str = static_cast(str); + Object *globalsStr = jb2Str->getGlobalsStream(); + char *globalsBuffer; + int globalsLength; + + // nothing to do for JBIG2 stream without Globals + if (!globalsStr->isStream()) { + return true; + } + + if (setMimeIdFromRef(image, CAIRO_MIME_TYPE_JBIG2_GLOBAL_ID, nullptr, jb2Str->getGlobalsStreamRef())) { + return false; + } + + if (!getStreamData(globalsStr->getStream(), &globalsBuffer, &globalsLength)) { + return false; + } + + if (cairo_surface_set_mime_data(image, CAIRO_MIME_TYPE_JBIG2_GLOBAL, (const unsigned char *)globalsBuffer, globalsLength, gfree, (void *)globalsBuffer)) { + gfree(globalsBuffer); + return false; + } + + return true; +} +#endif + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 15, 10) +bool CairoOutputDev::setMimeDataForCCITTParams(Stream *str, cairo_surface_t *image, int height) +{ + CCITTFaxStream *ccittStr = static_cast(str); + + GooString params; + params.appendf("Columns={0:d}", ccittStr->getColumns()); + params.appendf(" Rows={0:d}", height); + params.appendf(" K={0:d}", ccittStr->getEncoding()); + params.appendf(" EndOfLine={0:d}", ccittStr->getEndOfLine() ? 1 : 0); + params.appendf(" EncodedByteAlign={0:d}", ccittStr->getEncodedByteAlign() ? 1 : 0); + params.appendf(" EndOfBlock={0:d}", ccittStr->getEndOfBlock() ? 1 : 0); + params.appendf(" BlackIs1={0:d}", ccittStr->getBlackIs1() ? 1 : 0); + params.appendf(" DamagedRowsBeforeError={0:d}", ccittStr->getDamagedRowsBeforeError()); + + char *p = strdup(params.c_str()); + if (cairo_surface_set_mime_data(image, CAIRO_MIME_TYPE_CCITT_FAX_PARAMS, (const unsigned char *)p, params.getLength(), gfree, (void *)p)) { + gfree(p); + return false; + } + + return true; +} +#endif + +void CairoOutputDev::setMimeData(GfxState *state, Stream *str, Object *ref, GfxImageColorMap *colorMap, cairo_surface_t *image, int height) +{ + char *strBuffer; + int len; + Object obj; + GfxColorSpace *colorSpace; + StreamKind strKind = str->getKind(); + const char *mime_type; + cairo_status_t status; + + if (!printing) { + return; + } + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2) + // Since 1.5.10 the cairo PS backend stores images with UNIQUE_ID in PS memory so the + // image can be re-used multiple times. As we don't know how large the images are or + // how many times they are used, there is no benefit in enabling this. Issue #106 + if (cairo_surface_get_type(cairo_get_target(cairo)) != CAIRO_SURFACE_TYPE_PS) { + if (ref && ref->isRef()) { + status = setMimeIdFromRef(image, CAIRO_MIME_TYPE_UNIQUE_ID, "poppler-surface-", ref->getRef()); + if (status) { + return; + } + } + } +#endif + + switch (strKind) { + case strDCT: + mime_type = CAIRO_MIME_TYPE_JPEG; + break; + case strJPX: + mime_type = CAIRO_MIME_TYPE_JP2; + break; +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0) + case strJBIG2: + mime_type = CAIRO_MIME_TYPE_JBIG2; + break; +#endif +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 15, 10) + case strCCITTFax: + mime_type = CAIRO_MIME_TYPE_CCITT_FAX; + break; +#endif + default: + mime_type = nullptr; + break; + } + + obj = str->getDict()->lookup("ColorSpace"); + colorSpace = GfxColorSpace::parse(nullptr, &obj, this, state); + + // colorspace in stream dict may be different from colorspace in jpx + // data + if (strKind == strJPX && colorSpace) { + return; + } + + // only embed mime data for gray, rgb, and cmyk colorspaces. + if (colorSpace) { + GfxColorSpaceMode mode = colorSpace->getMode(); + delete colorSpace; + switch (mode) { + case csDeviceGray: + case csCalGray: + case csDeviceRGB: + case csCalRGB: + case csDeviceCMYK: + case csICCBased: + break; + + case csLab: + case csIndexed: + case csSeparation: + case csDeviceN: + case csPattern: + return; + } + } + + if (!colorMapHasIdentityDecodeMap(colorMap)) { + return; + } + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0) + if (strKind == strJBIG2 && !setMimeDataForJBIG2Globals(str, image)) { + return; + } +#endif + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 15, 10) + if (strKind == strCCITTFax && !setMimeDataForCCITTParams(str, image, height)) { + return; + } +#endif + + if (mime_type) { + if (getStreamData(str->getNextStream(), &strBuffer, &len)) { + status = cairo_surface_set_mime_data(image, mime_type, (const unsigned char *)strBuffer, len, gfree, strBuffer); + } + + if (status) { + gfree(strBuffer); + } + } +} + +class RescaleDrawImage : public CairoRescaleBox +{ +private: + ImageStream *imgStr; + GfxRGB *lookup; + int width; + GfxImageColorMap *colorMap; + const int *maskColors; + int current_row; + bool imageError; + +public: + ~RescaleDrawImage() override; + cairo_surface_t *getSourceImage(Stream *str, int widthA, int height, int scaledWidth, int scaledHeight, bool printing, GfxImageColorMap *colorMapA, const int *maskColorsA) + { + cairo_surface_t *image = nullptr; + int i; + + lookup = nullptr; + colorMap = colorMapA; + maskColors = maskColorsA; + width = widthA; + current_row = -1; + imageError = false; + + /* TODO: Do we want to cache these? */ + imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); + +#if 0 + /* ICCBased color space doesn't do any color correction + * so check its underlying color space as well */ + int is_identity_transform; + is_identity_transform = colorMap->getColorSpace()->getMode() == csDeviceRGB || + (colorMap->getColorSpace()->getMode() == csICCBased && + ((GfxICCBasedColorSpace*)colorMap->getColorSpace())->getAlt()->getMode() == csDeviceRGB); +#endif + + // special case for one-channel (monochrome/gray/separation) images: + // build a lookup table here + if (colorMap->getNumPixelComps() == 1) { + int n; + unsigned char pix; + + n = 1 << colorMap->getBits(); + lookup = (GfxRGB *)gmallocn(n, sizeof(GfxRGB)); + for (i = 0; i < n; ++i) { + pix = (unsigned char)i; + + colorMap->getRGB(&pix, &lookup[i]); + } + } + + bool needsCustomDownscaling = (width > MAX_CAIRO_IMAGE_SIZE || height > MAX_CAIRO_IMAGE_SIZE); + + if (printing) { + if (width > MAX_PRINT_IMAGE_SIZE || height > MAX_PRINT_IMAGE_SIZE) { + if (width > height) { + scaledWidth = MAX_PRINT_IMAGE_SIZE; + scaledHeight = MAX_PRINT_IMAGE_SIZE * (double)height / width; + } else { + scaledHeight = MAX_PRINT_IMAGE_SIZE; + scaledWidth = MAX_PRINT_IMAGE_SIZE * (double)width / height; + } + needsCustomDownscaling = true; + + if (scaledWidth == 0) { + scaledWidth = 1; + } + if (scaledHeight == 0) { + scaledHeight = 1; + } + } + } + + if (!needsCustomDownscaling || scaledWidth >= width || scaledHeight >= height) { + // No downscaling. Create cairo image containing the source image data. + unsigned char *buffer; + ptrdiff_t stride; + + image = cairo_image_surface_create(maskColors ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24, width, height); + if (cairo_surface_status(image)) { + goto cleanup; + } + + buffer = cairo_image_surface_get_data(image); + stride = cairo_image_surface_get_stride(image); + for (int y = 0; y < height; y++) { + uint32_t *dest = reinterpret_cast(buffer + y * stride); + getRow(y, dest); + } + } else { + // Downscaling required. Create cairo image the size of the + // rescaled image and downscale the source image data into + // the cairo image. downScaleImage() will call getRow() to read + // source image data from the image stream. This avoids having + // to create an image the size of the source image which may + // exceed cairo's 32767x32767 image size limit (and also saves a + // lot of memory). + image = cairo_image_surface_create(maskColors ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24, scaledWidth, scaledHeight); + if (cairo_surface_status(image)) { + goto cleanup; + } + + downScaleImage(width, height, scaledWidth, scaledHeight, 0, 0, scaledWidth, scaledHeight, image); + } + cairo_surface_mark_dirty(image); + + cleanup: + gfree(lookup); + imgStr->close(); + delete imgStr; + return image; + } + + void getRow(int row_num, uint32_t *row_data) override + { + unsigned char *pix; + + if (row_num <= current_row) { + return; + } + + while (current_row < row_num) { + pix = imgStr->getLine(); + current_row++; + } + + if (unlikely(pix == nullptr)) { + memset(row_data, 0, width * 4); + if (!imageError) { + error(errInternal, -1, "Bad image stream"); + imageError = true; + } + } else if (lookup) { + unsigned char *p = pix; + GfxRGB rgb; + + for (int i = 0; i < width; i++) { + rgb = lookup[*p]; + row_data[i] = ((int)colToByte(rgb.r) << 16) | ((int)colToByte(rgb.g) << 8) | ((int)colToByte(rgb.b) << 0); + p++; + } + } else { + colorMap->getRGBLine(pix, row_data, width); + } + + if (maskColors) { + for (int x = 0; x < width; x++) { + bool is_opaque = false; + for (int i = 0; i < colorMap->getNumPixelComps(); ++i) { + if (pix[i] < maskColors[2 * i] || pix[i] > maskColors[2 * i + 1]) { + is_opaque = true; + break; + } + } + if (is_opaque) { + *row_data |= 0xff000000; + } else { + *row_data = 0; + } + row_data++; + pix += colorMap->getNumPixelComps(); + } + } + } +}; + +RescaleDrawImage::~RescaleDrawImage() = default; + +void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int widthA, int heightA, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) +{ + cairo_surface_t *image; + cairo_pattern_t *pattern, *maskPattern; + cairo_matrix_t matrix; + int width, height; + int scaledWidth, scaledHeight; + cairo_filter_t filter = CAIRO_FILTER_GOOD; + RescaleDrawImage rescale; + + LOG(printf("drawImage %dx%d\n", widthA, heightA)); + + cairo_get_matrix(cairo, &matrix); + getScaledSize(&matrix, widthA, heightA, &scaledWidth, &scaledHeight); + image = rescale.getSourceImage(str, widthA, heightA, scaledWidth, scaledHeight, printing, colorMap, maskColors); + if (!image) { + return; + } + + width = cairo_image_surface_get_width(image); + height = cairo_image_surface_get_height(image); + if (width == widthA && height == heightA) { + filter = getFilterForSurface(image, interpolate); + } + + if (!inlineImg) { /* don't read stream twice if it is an inline image */ + // cairo 1.15.10 allows mime image data to have different size to cairo image + // mime image size will be scaled to same size as cairo image +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 15, 10) + bool requireSameSize = false; +#else + bool requireSameSize = true; +#endif + if (!requireSameSize || (width == widthA && height == heightA)) { + setMimeData(state, str, ref, colorMap, image, heightA); + } + } + + pattern = cairo_pattern_create_for_surface(image); + cairo_surface_destroy(image); + if (cairo_pattern_status(pattern)) { + return; + } + + cairo_pattern_set_filter(pattern, filter); + + if (!printing) { + cairo_pattern_set_extend(pattern, CAIRO_EXTEND_PAD); + } + + cairo_matrix_init_translate(&matrix, 0, height); + cairo_matrix_scale(&matrix, width, -height); + cairo_pattern_set_matrix(pattern, &matrix); + if (cairo_pattern_status(pattern)) { + cairo_pattern_destroy(pattern); + return; + } + + if (!mask && fill_opacity != 1.0) { + maskPattern = cairo_pattern_create_rgba(1., 1., 1., fill_opacity); + } else if (mask) { + maskPattern = cairo_pattern_reference(mask); + } else { + maskPattern = nullptr; + } + + cairo_save(cairo); + cairo_set_source(cairo, pattern); + if (!printing) { + cairo_rectangle(cairo, 0., 0., 1., 1.); + } + if (maskPattern) { + if (!printing) { + cairo_clip(cairo); + } + if (mask) { + cairo_set_matrix(cairo, &mask_matrix); + } + cairo_mask(cairo, maskPattern); + } else { + if (printing) { + cairo_paint(cairo); + } else { + cairo_fill(cairo); + } + } + cairo_restore(cairo); + + cairo_pattern_destroy(maskPattern); + + if (cairo_shape) { + cairo_save(cairo_shape); + cairo_set_source(cairo_shape, pattern); + if (printing) { + cairo_paint(cairo_shape); + } else { + cairo_rectangle(cairo_shape, 0., 0., 1., 1.); + cairo_fill(cairo_shape); + } + cairo_restore(cairo_shape); + } + + cairo_pattern_destroy(pattern); +} + +void CairoOutputDev::beginMarkedContent(const char *name, Dict *properties) +{ + if (!logicalStruct || !isPDF()) { + return; + } + + if (strcmp(name, "Artifact") == 0) { + markedContentStack.emplace_back(name); +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 18, 0) + cairo_tag_begin(cairo, name, nullptr); +#endif + return; + } + + int mcid = -1; + if (properties) { + properties->lookupInt("MCID", nullptr, &mcid); + } + + if (mcid == -1) { + return; + } + + GooString attribs; + attribs.appendf("tag_name='{0:s}' id='{1:d}_{2:d}'", name, currentStructParents, mcid); + mcidEmitted.insert(std::pair(currentStructParents, mcid)); + + std::string tag; +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 18, 0) + tag = CAIRO_TAG_CONTENT; + cairo_tag_begin(cairo, CAIRO_TAG_CONTENT, attribs.c_str()); +#endif + + markedContentStack.push_back(tag); +} + +void CairoOutputDev::endMarkedContent(GfxState *state) +{ + if (!logicalStruct || !isPDF()) { + return; + } + + if (markedContentStack.size() == 0) { + return; + } + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 18, 0) + cairo_tag_end(cairo, markedContentStack.back().c_str()); +#endif + markedContentStack.pop_back(); +} + +//------------------------------------------------------------------------ +// ImageOutputDev +//------------------------------------------------------------------------ + +CairoImageOutputDev::CairoImageOutputDev() +{ + images = nullptr; + numImages = 0; + size = 0; + imgDrawCbk = nullptr; + imgDrawCbkData = nullptr; +} + +CairoImageOutputDev::~CairoImageOutputDev() +{ + int i; + + for (i = 0; i < numImages; i++) { + delete images[i]; + } + gfree(images); +} + +void CairoImageOutputDev::saveImage(CairoImage *image) +{ + if (numImages >= size) { + size += 16; + images = (CairoImage **)greallocn(images, size, sizeof(CairoImage *)); + } + images[numImages++] = image; +} + +void CairoImageOutputDev::getBBox(GfxState *state, int width, int height, double *x1, double *y1, double *x2, double *y2) +{ + const double *ctm = state->getCTM(); + cairo_matrix_t matrix; + cairo_matrix_init(&matrix, ctm[0], ctm[1], -ctm[2], -ctm[3], ctm[2] + ctm[4], ctm[3] + ctm[5]); + + int scaledWidth, scaledHeight; + getScaledSize(&matrix, width, height, &scaledWidth, &scaledHeight); + + if (matrix.xx >= 0) { + *x1 = matrix.x0; + } else { + *x1 = matrix.x0 - scaledWidth; + } + *x2 = *x1 + scaledWidth; + + if (matrix.yy >= 0) { + *y1 = matrix.y0; + } else { + *y1 = matrix.y0 - scaledHeight; + } + *y2 = *y1 + scaledHeight; +} + +void CairoImageOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) +{ + cairo_t *cr; + cairo_surface_t *surface; + double x1, y1, x2, y2; + CairoImage *image; + + getBBox(state, width, height, &x1, &y1, &x2, &y2); + + image = new CairoImage(x1, y1, x2, y2); + saveImage(image); + + if (imgDrawCbk && imgDrawCbk(numImages - 1, imgDrawCbkData)) { + surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); + cr = cairo_create(surface); + setCairo(cr); + cairo_translate(cr, 0, height); + cairo_scale(cr, width, -height); + + CairoOutputDev::drawImageMask(state, ref, str, width, height, invert, interpolate, inlineImg); + image->setImage(surface); + + setCairo(nullptr); + cairo_surface_destroy(surface); + cairo_destroy(cr); + } +} + +void CairoImageOutputDev::setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool inlineImg, double *baseMatrix) +{ + cairo_t *cr; + cairo_surface_t *surface; + double x1, y1, x2, y2; + CairoImage *image; + + getBBox(state, width, height, &x1, &y1, &x2, &y2); + + image = new CairoImage(x1, y1, x2, y2); + saveImage(image); + + if (imgDrawCbk && imgDrawCbk(numImages - 1, imgDrawCbkData)) { + surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); + cr = cairo_create(surface); + setCairo(cr); + cairo_translate(cr, 0, height); + cairo_scale(cr, width, -height); + + CairoOutputDev::drawImageMask(state, ref, str, width, height, invert, inlineImg, false); + if (state->getFillColorSpace()->getMode() == csPattern) { + cairo_mask(cairo, mask); + } + image->setImage(surface); + + setCairo(nullptr); + cairo_surface_destroy(surface); + cairo_destroy(cr); + } +} + +void CairoImageOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) +{ + cairo_t *cr; + cairo_surface_t *surface; + double x1, y1, x2, y2; + CairoImage *image; + + getBBox(state, width, height, &x1, &y1, &x2, &y2); + + image = new CairoImage(x1, y1, x2, y2); + saveImage(image); + + if (imgDrawCbk && imgDrawCbk(numImages - 1, imgDrawCbkData)) { + surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); + cr = cairo_create(surface); + setCairo(cr); + cairo_translate(cr, 0, height); + cairo_scale(cr, width, -height); + + CairoOutputDev::drawImage(state, ref, str, width, height, colorMap, interpolate, maskColors, inlineImg); + image->setImage(surface); + + setCairo(nullptr); + cairo_surface_destroy(surface); + cairo_destroy(cr); + } +} + +void CairoImageOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap, + bool maskInterpolate) +{ + cairo_t *cr; + cairo_surface_t *surface; + double x1, y1, x2, y2; + CairoImage *image; + + getBBox(state, width, height, &x1, &y1, &x2, &y2); + + image = new CairoImage(x1, y1, x2, y2); + saveImage(image); + + if (imgDrawCbk && imgDrawCbk(numImages - 1, imgDrawCbkData)) { + surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); + cr = cairo_create(surface); + setCairo(cr); + cairo_translate(cr, 0, height); + cairo_scale(cr, width, -height); + + CairoOutputDev::drawSoftMaskedImage(state, ref, str, width, height, colorMap, interpolate, maskStr, maskWidth, maskHeight, maskColorMap, maskInterpolate); + image->setImage(surface); + + setCairo(nullptr); + cairo_surface_destroy(surface); + cairo_destroy(cr); + } +} + +void CairoImageOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, bool maskInvert, bool maskInterpolate) +{ + cairo_t *cr; + cairo_surface_t *surface; + double x1, y1, x2, y2; + CairoImage *image; + + getBBox(state, width, height, &x1, &y1, &x2, &y2); + + image = new CairoImage(x1, y1, x2, y2); + saveImage(image); + + if (imgDrawCbk && imgDrawCbk(numImages - 1, imgDrawCbkData)) { + surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); + cr = cairo_create(surface); + setCairo(cr); + cairo_translate(cr, 0, height); + cairo_scale(cr, width, -height); + + CairoOutputDev::drawMaskedImage(state, ref, str, width, height, colorMap, interpolate, maskStr, maskWidth, maskHeight, maskInvert, maskInterpolate); + image->setImage(surface); + + setCairo(nullptr); + cairo_surface_destroy(surface); + cairo_destroy(cr); + } +} diff --git a/poppler-24.05.0/poppler/CairoOutputDev.h b/poppler-24.05.0/poppler/CairoOutputDev.h new file mode 100644 index 0000000000000000000000000000000000000000..a955115e89e09efaaf3beda0158dc12a8bd1b6be --- /dev/null +++ b/poppler-24.05.0/poppler/CairoOutputDev.h @@ -0,0 +1,537 @@ +//======================================================================== +// +// CairoOutputDev.h +// +// Copyright 2003 Glyph & Cog, LLC +// Copyright 2004 Red Hat, INC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005-2008 Jeff Muizelaar +// Copyright (C) 2005, 2006 Kristian Høgsberg +// Copyright (C) 2005 Nickolay V. Shmyrev +// Copyright (C) 2006-2011, 2013 Carlos Garcia Campos +// Copyright (C) 2008, 2009, 2011-2017, 2022, 2023 Adrian Johnson +// Copyright (C) 2008 Michael Vrable +// Copyright (C) 2010-2013 Thomas Freitag +// Copyright (C) 2015 Suzuki Toshiya +// Copyright (C) 2016 Jason Crain +// Copyright (C) 2018, 2019, 2021 Albert Astals Cid +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2020 Michal +// Copyright (C) 2021 Christian Persch +// Copyright (C) 2022 Marek Kasik +// +// 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 +// +//======================================================================== + +#ifndef CAIROOUTPUTDEV_H +#define CAIROOUTPUTDEV_H + +#include + +#include +#include "OutputDev.h" +#include "TextOutputDev.h" +#include "GfxState.h" +#include "StructElement.h" +#include "StructTreeRoot.h" +#include "Annot.h" +#include "Link.h" + +class PDFDoc; +class GfxState; +class GfxPath; +class Gfx8BitFont; +struct GfxRGB; +class CairoFontEngine; +class CairoFont; + +//------------------------------------------------------------------------ + +//------------------------------------------------------------------------ +// CairoImage +//------------------------------------------------------------------------ +class CairoImage +{ +public: + // Constructor. + CairoImage(double x1, double y1, double x2, double y2); + + // Destructor. + ~CairoImage(); + + CairoImage(const CairoImage &) = delete; + CairoImage &operator=(const CairoImage &) = delete; + + // Set the image cairo surface + void setImage(cairo_surface_t *image); + + // Get the image cairo surface + cairo_surface_t *getImage() const { return image; } + + // Get the image rectangle + void getRect(double *xa1, double *ya1, double *xa2, double *ya2) + { + *xa1 = x1; + *ya1 = y1; + *xa2 = x2; + *ya2 = y2; + } + +private: + cairo_surface_t *image; // image cairo surface + double x1, y1; // upper left corner + double x2, y2; // lower right corner +}; + +//------------------------------------------------------------------------ +// CairoOutputDev +//------------------------------------------------------------------------ + +class CairoOutputDev : public OutputDev +{ +public: + // Constructor. + CairoOutputDev(); + + // Destructor. + ~CairoOutputDev() override; + + //----- get info about output device + + // Does this device use upside-down coordinates? + // (Upside-down means (0,0) is the top left corner of the page.) + bool upsideDown() override { return true; } + + // Does this device use drawChar() or drawString()? + bool useDrawChar() override { return true; } + + // Does this device use tilingPatternFill()? If this returns false, + // tiling pattern fills will be reduced to a series of other drawing + // operations. + bool useTilingPatternFill() override { return true; } + + // Does this device use functionShadedFill(), axialShadedFill(), and + // radialShadedFill()? If this returns false, these shaded fills + // will be reduced to a series of other drawing operations. +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0) + bool useShadedFills(int type) override { return type <= 7; } +#else + bool useShadedFills(int type) override { return type > 1 && type < 4; } +#endif + + // Does this device use FillColorStop()? + bool useFillColorStop() override { return true; } + + // Does this device use beginType3Char/endType3Char? Otherwise, + // text in Type 3 fonts will be drawn with drawChar/drawString. + bool interpretType3Chars() override { return false; } + + // Does this device need to clip pages to the crop box even when the + // box is the crop box? + bool needClipToCropBox() override { return true; } + + //----- initialization and control + + // Start a page. + void startPage(int pageNum, GfxState *state, XRef *xref) override; + + // End a page. + void endPage() override; + + // Must be called before last call to endPage() + void emitStructTree(); + + void beginForm(Object *obj, Ref id) override; + void endForm(Object *obj, Ref id) override; + + //----- save/restore graphics state + void saveState(GfxState *state) override; + void restoreState(GfxState *state) override; + + //----- update graphics state + void updateAll(GfxState *state) override; + void setDefaultCTM(const double *ctm) override; + void updateCTM(GfxState *state, double m11, double m12, double m21, double m22, double m31, double m32) override; + void updateLineDash(GfxState *state) override; + void updateFlatness(GfxState *state) override; + void updateLineJoin(GfxState *state) override; + void updateLineCap(GfxState *state) override; + void updateMiterLimit(GfxState *state) override; + void updateLineWidth(GfxState *state) override; + void updateFillColor(GfxState *state) override; + void updateStrokeColor(GfxState *state) override; + void updateFillOpacity(GfxState *state) override; + void updateStrokeOpacity(GfxState *state) override; + void updateFillColorStop(GfxState *state, double offset) override; + void updateBlendMode(GfxState *state) override; + + //----- update text state + void updateFont(GfxState *state) override; + + //----- path painting + void stroke(GfxState *state) override; + void fill(GfxState *state) override; + void eoFill(GfxState *state) override; + void clipToStrokePath(GfxState *state) override; + bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override; +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0) + bool functionShadedFill(GfxState *state, GfxFunctionShading *shading) override; +#endif + bool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override; + bool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) override; + bool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax) override; + bool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading) override; +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0) + bool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading) override; + bool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading) override; +#endif + + //----- path clipping + void clip(GfxState *state) override; + void eoClip(GfxState *state) override; + + //----- text drawing + void beginString(GfxState *state, const GooString *s) override; + void endString(GfxState *state) override; + void drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) override; + void beginActualText(GfxState *state, const GooString *text) override; + void endActualText(GfxState *state) override; + + bool beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, const Unicode *u, int uLen) override; + void endType3Char(GfxState *state) override; + void beginTextObject(GfxState *state) override; + void endTextObject(GfxState *state) override; + + void beginMarkedContent(const char *name, Dict *properties) override; + void endMarkedContent(GfxState *state) override; + + //----- image drawing + void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) override; + void setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool inlineImg, double *baseMatrix) override; + void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) override; + void drawImageMaskPrescaled(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg); + void drawImageMaskRegular(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg); + + void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) override; + void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap, + bool maskInterpolate) override; + + void drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, bool maskInvert, bool maskInterpolate) override; + + //----- transparency groups and soft masks + void beginTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/, GfxColorSpace * /*blendingColorSpace*/, bool /*isolated*/, bool /*knockout*/, bool /*forSoftMask*/) override; + void endTransparencyGroup(GfxState * /*state*/) override; + void popTransparencyGroup(); + void paintTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/) override; + void setSoftMask(GfxState * /*state*/, const double * /*bbox*/, bool /*alpha*/, Function * /*transferFunc*/, GfxColor * /*backdropColor*/) override; + void clearSoftMask(GfxState * /*state*/) override; + + //----- Type 3 font operators + void type3D0(GfxState *state, double wx, double wy) override; + void type3D1(GfxState *state, double wx, double wy, double llx, double lly, double urx, double ury) override; + + //----- special access + + // Called to indicate that a new PDF document has been loaded. + void startDoc(PDFDoc *docA, CairoFontEngine *fontEngine = nullptr); + + // Called to prepare this output dev for rendering CairoType3Font. + void startType3Render(GfxState *state, XRef *xref); + + bool isReverseVideo() { return false; } + + void setCairo(cairo_t *cr); + void setTextPage(TextPage *text); + void setPrinting(bool printingA) + { + printing = printingA; + needFontUpdate = true; + } + void copyAntialias(cairo_t *cr, cairo_t *source_cr); + void setLogicalStructure(bool logStruct) { this->logicalStruct = logStruct; } + + enum Type3RenderType + { + Type3RenderNone, + Type3RenderMask, + Type3RenderColor + }; + void setType3RenderType(Type3RenderType state) { t3_render_state = state; } + void getType3GlyphWidth(double *wx, double *wy) + { + *wx = t3_glyph_wx; + *wy = t3_glyph_wy; + } + bool hasType3GlyphBBox() { return t3_glyph_has_bbox; } + double *getType3GlyphBBox() { return t3_glyph_bbox; } + bool type3GlyphHasColor() { return t3_glyph_has_color; } + +protected: + void doPath(cairo_t *cairo, GfxState *state, const GfxPath *path); + cairo_surface_t *downscaleSurface(cairo_surface_t *orig_surface); + void getScaledSize(const cairo_matrix_t *matrix, int orig_width, int orig_height, int *scaledWidth, int *scaledHeight); + cairo_filter_t getFilterForSurface(cairo_surface_t *image, bool interpolate); + bool getStreamData(Stream *str, char **buffer, int *length); + void setMimeData(GfxState *state, Stream *str, Object *ref, GfxImageColorMap *colorMap, cairo_surface_t *image, int height); + void fillToStrokePathClip(GfxState *state); + void alignStrokeCoords(const GfxSubpath *subpath, int i, double *x, double *y); + AnnotLink *findLinkObject(const StructElement *elem); + void quadToCairoRect(AnnotQuadrilaterals *quads, int idx, double destPageHeight, cairo_rectangle_t *rect); + bool appendLinkDestRef(GooString *s, const LinkDest *dest); + void appendLinkDestXY(GooString *s, const LinkDest *dest, double destPageHeight); + bool beginLinkTag(AnnotLink *annotLink); + bool beginLink(const StructElement *linkElem); + void getStructElemAttributeString(const StructElement *elem); + int getContentElementStructParents(const StructElement *element); + bool checkIfStructElementNeeded(const StructElement *element); + void emitStructElement(const StructElement *elem); + void startFirstPage(int pageNum, GfxState *state, XRef *xrefA); +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0) + bool setMimeDataForJBIG2Globals(Stream *str, cairo_surface_t *image); +#endif +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 15, 10) + bool setMimeDataForCCITTParams(Stream *str, cairo_surface_t *image, int height); +#endif + static void textStringToQuotedUtf8(const GooString *text, GooString *s); + bool isPDF(); + + std::optional fill_color, stroke_color; + cairo_pattern_t *fill_pattern, *stroke_pattern; + double fill_opacity; + double stroke_opacity; + bool stroke_adjust; + bool adjusted_stroke_width; + bool align_stroke_coords; + std::shared_ptr currentFont; + XRef *xref; + + struct StrokePathClip + { + GfxPath *path; + cairo_matrix_t ctm; + double line_width; + double *dashes; + int dash_count; + double dash_offset; + cairo_line_cap_t cap; + cairo_line_join_t join; + double miter; + int ref_count; + } *strokePathClip; + + PDFDoc *doc; // the current document + + static FT_Library ft_lib; + static std::once_flag ft_lib_once_flag; + + CairoFontEngine *fontEngine; + bool fontEngine_owner; + + cairo_t *cairo; + cairo_matrix_t orig_matrix; + bool needFontUpdate; // set when the font needs to be updated + bool printing; + bool use_show_text_glyphs; + bool text_matrix_valid; + cairo_glyph_t *glyphs; + int glyphCount; + cairo_text_cluster_t *clusters; + int clusterCount; + char *utf8; + int utf8Count; + int utf8Max; + cairo_path_t *textClipPath; + bool inUncoloredPattern; // inside a uncolored pattern (PaintType = 2) + Type3RenderType t3_render_state; + double t3_glyph_wx, t3_glyph_wy; + bool t3_glyph_has_bbox; + bool t3_glyph_has_color; + bool has_color; + double t3_glyph_bbox[4]; + bool prescaleImages; + bool logicalStruct; + bool firstPage; + int pdfPageNum; // page number of the PDF file + int cairoPageNum; // page number in cairo output + std::vector markedContentStack; + std::vector annotations; + std::set emittedDestinations; + std::map pdfPageToCairoPageMap; + + TextPage *textPage; // text for the current page + ActualText *actualText; + + cairo_pattern_t *group; + cairo_pattern_t *shape; + cairo_pattern_t *mask; + cairo_matrix_t mask_matrix; + cairo_t *cairo_shape; + int knockoutCount; + struct ColorSpaceStack + { + bool knockout; + GfxColorSpace *cs; + cairo_matrix_t group_matrix; + struct ColorSpaceStack *next; + } *groupColorSpaceStack; + + struct SaveStateElement + { + // These patterns hold a reference + cairo_pattern_t *fill_pattern; + cairo_pattern_t *stroke_pattern; + double fill_opacity; + double stroke_opacity; + cairo_pattern_t *mask; // can be null + cairo_matrix_t mask_matrix; + Ref fontRef; + }; + std::vector saveStateStack; + + std::map>> destsMap; + std::map pdfPageRefToCairoPageNumMap; + std::vector structParentsStack; + int currentStructParents; + + struct StructParentsMcidHash + { + size_t operator()(std::pair x) const { return x.first << 16 | x.second; } + }; + std::unordered_set, StructParentsMcidHash> mcidEmitted; // + + std::unordered_set structElementNeeded; +}; + +//------------------------------------------------------------------------ +// CairoImageOutputDev +//------------------------------------------------------------------------ + +// XXX: this should ideally not inherit from CairoOutputDev but use it instead perhaps +class CairoImageOutputDev : public CairoOutputDev +{ +public: + // Constructor. + CairoImageOutputDev(); + + // Destructor. + ~CairoImageOutputDev() override; + + //----- get info about output device + + // Does this device use upside-down coordinates? + // (Upside-down means (0,0) is the top left corner of the page.) + bool upsideDown() override { return true; } + + // Does this device use drawChar() or drawString()? + bool useDrawChar() override { return false; } + + // Does this device use tilingPatternFill()? If this returns false, + // tiling pattern fills will be reduced to a series of other drawing + // operations. + bool useTilingPatternFill() override { return true; } + + // Does this device use functionShadedFill(), axialShadedFill(), and + // radialShadedFill()? If this returns false, these shaded fills + // will be reduced to a series of other drawing operations. +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2) + bool useShadedFills(int type) override { return type <= 7; } +#else + bool useShadedFills(int type) override { return type < 4; } +#endif + + // Does this device use FillColorStop()? + bool useFillColorStop() override { return false; } + + // Does this device use beginType3Char/endType3Char? Otherwise, + // text in Type 3 fonts will be drawn with drawChar/drawString. + bool interpretType3Chars() override { return false; } + + // Does this device need non-text content? + bool needNonText() override { return true; } + + //----- save/restore graphics state + void saveState(GfxState *state) override { } + void restoreState(GfxState *state) override { } + + //----- update graphics state + void updateAll(GfxState *state) override { } + void setDefaultCTM(const double *ctm) override { } + void updateCTM(GfxState *state, double m11, double m12, double m21, double m22, double m31, double m32) override { } + void updateLineDash(GfxState *state) override { } + void updateFlatness(GfxState *state) override { } + void updateLineJoin(GfxState *state) override { } + void updateLineCap(GfxState *state) override { } + void updateMiterLimit(GfxState *state) override { } + void updateLineWidth(GfxState *state) override { } + void updateFillColor(GfxState *state) override { } + void updateStrokeColor(GfxState *state) override { } + void updateFillOpacity(GfxState *state) override { } + void updateStrokeOpacity(GfxState *state) override { } + void updateBlendMode(GfxState *state) override { } + + //----- update text state + void updateFont(GfxState *state) override { } + + //----- path painting + void stroke(GfxState *state) override { } + void fill(GfxState *state) override { } + void eoFill(GfxState *state) override { } + void clipToStrokePath(GfxState *state) override { } + bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override { return true; } + bool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override { return true; } + bool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax) override { return true; } + + //----- path clipping + void clip(GfxState *state) override { } + void eoClip(GfxState *state) override { } + + //----- image drawing + void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) override; + void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) override; + void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap, + bool maskInterpolate) override; + void drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, bool maskInvert, bool maskInterpolate) override; + void setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool inlineImg, double *baseMatrix) override; + void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) override { } + + //----- transparency groups and soft masks + void beginTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/, GfxColorSpace * /*blendingColorSpace*/, bool /*isolated*/, bool /*knockout*/, bool /*forSoftMask*/) override { } + void endTransparencyGroup(GfxState * /*state*/) override { } + void paintTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/) override { } + void setSoftMask(GfxState * /*state*/, const double * /*bbox*/, bool /*alpha*/, Function * /*transferFunc*/, GfxColor * /*backdropColor*/) override { } + void clearSoftMask(GfxState * /*state*/) override { } + + //----- Image list + // By default images are not rendred + void setImageDrawDecideCbk(bool (*cbk)(int img_id, void *data), void *data) + { + imgDrawCbk = cbk; + imgDrawCbkData = data; + } + // Iterate through list of images. + int getNumImages() const { return numImages; } + CairoImage *getImage(int i) const { return images[i]; } + +private: + void saveImage(CairoImage *image); + void getBBox(GfxState *state, int width, int height, double *x1, double *y1, double *x2, double *y2); + + CairoImage **images; + int numImages; + int size; + bool (*imgDrawCbk)(int img_id, void *data); + void *imgDrawCbkData; +}; + +#endif diff --git a/poppler-24.05.0/poppler/CairoRescaleBox.cc b/poppler-24.05.0/poppler/CairoRescaleBox.cc new file mode 100644 index 0000000000000000000000000000000000000000..4d09e58f9f2398ceade1afa963580983249ac73c --- /dev/null +++ b/poppler-24.05.0/poppler/CairoRescaleBox.cc @@ -0,0 +1,354 @@ +/* -*- Mode: c; c-basic-offset: 4; tab-width: 8; indent-tabs-mode: t; -*- */ +/* + * Copyright © 2009 Mozilla Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Mozilla Corporation not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Mozilla Corporation makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * MOZILLA CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT + * SHALL MOZILLA CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + * + * Author: Jeff Muizelaar, Mozilla Corp. + */ + +//======================================================================== +// +// 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) 2012 Hib Eris +// Copyright (C) 2012, 2017 Adrian Johnson +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019 Albert Astals Cid +// Copyright (C) 2019 Marek Kasik +// +// 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 +// +//======================================================================== + +/* This implements a box filter that supports non-integer box sizes */ + +#include + +#include +#include +#include +#include +#include +#include +#include "goo/gmem.h" +#include "CairoRescaleBox.h" + +/* we work in fixed point where 1. == 1 << 24 */ +#define FIXED_SHIFT 24 + +static void downsample_row_box_filter(int start, int width, uint32_t *src, const uint32_t *src_limit, uint32_t *dest, const int coverage[], int pixel_coverage) +{ + /* we need an array of the pixel contribution of each destination pixel on the boundaries. + * we invert the value to get the value on the other size of the box */ + /* + + value = a * contribution * 1/box_size + value += a * 1/box_size + value += a * 1/box_size + value += a * 1/box_size + value += a * (1 - contribution) * 1/box_size + a * (1/box_size - contribution * 1/box_size) + + box size is constant + + + value = a * contribution_a * 1/box_size + b * contribution_b * 1/box_size + contribution_b = (1 - contribution_a) + = (1 - contribution_a_next) + */ + + /* box size = ceil(src_width/dest_width) */ + int x = 0; + + /* skip to start */ + /* XXX: it might be possible to do this directly instead of iteratively, however + * the iterative solution is simple */ + while (x < start && src < src_limit) { + int box = 1 << FIXED_SHIFT; + int start_coverage = coverage[x]; + box -= start_coverage; + src++; + while (box >= pixel_coverage && src < src_limit) { + src++; + box -= pixel_coverage; + } + x++; + } + + while (x < start + width && src < src_limit) { + uint32_t a = 0; + uint32_t r = 0; + uint32_t g = 0; + uint32_t b = 0; + int box = 1 << FIXED_SHIFT; + int start_coverage = coverage[x]; + + a = ((*src >> 24) & 0xff) * start_coverage; + r = ((*src >> 16) & 0xff) * start_coverage; + g = ((*src >> 8) & 0xff) * start_coverage; + b = ((*src >> 0) & 0xff) * start_coverage; + src++; + x++; + box -= start_coverage; + + while (box >= pixel_coverage && src < src_limit) { + a += ((*src >> 24) & 0xff) * pixel_coverage; + r += ((*src >> 16) & 0xff) * pixel_coverage; + g += ((*src >> 8) & 0xff) * pixel_coverage; + b += ((*src >> 0) & 0xff) * pixel_coverage; + src++; + + box -= pixel_coverage; + } + + /* multiply by whatever is leftover + * this ensures that we don't bias down. + * i.e. start_coverage + n*pixel_coverage + box == 1 << 24 */ + if (box > 0 && src < src_limit) { + a += ((*src >> 24) & 0xff) * box; + r += ((*src >> 16) & 0xff) * box; + g += ((*src >> 8) & 0xff) * box; + b += ((*src >> 0) & 0xff) * box; + } + + a >>= FIXED_SHIFT; + r >>= FIXED_SHIFT; + g >>= FIXED_SHIFT; + b >>= FIXED_SHIFT; + + *dest = (a << 24) | (r << 16) | (g << 8) | b; + dest++; + } +} + +static void downsample_columns_box_filter(int n, int start_coverage, int pixel_coverage, uint32_t *src, uint32_t *dest) +{ + int stride = n; + while (n--) { + uint32_t a = 0; + uint32_t r = 0; + uint32_t g = 0; + uint32_t b = 0; + uint32_t *column_src = src; + int box = 1 << FIXED_SHIFT; + + a = ((*column_src >> 24) & 0xff) * start_coverage; + r = ((*column_src >> 16) & 0xff) * start_coverage; + g = ((*column_src >> 8) & 0xff) * start_coverage; + b = ((*column_src >> 0) & 0xff) * start_coverage; + column_src += stride; + box -= start_coverage; + + while (box >= pixel_coverage) { + a += ((*column_src >> 24) & 0xff) * pixel_coverage; + r += ((*column_src >> 16) & 0xff) * pixel_coverage; + g += ((*column_src >> 8) & 0xff) * pixel_coverage; + b += ((*column_src >> 0) & 0xff) * pixel_coverage; + column_src += stride; + box -= pixel_coverage; + } + + if (box > 0) { + a += ((*column_src >> 24) & 0xff) * box; + r += ((*column_src >> 16) & 0xff) * box; + g += ((*column_src >> 8) & 0xff) * box; + b += ((*column_src >> 0) & 0xff) * box; + } + + a >>= FIXED_SHIFT; + r >>= FIXED_SHIFT; + g >>= FIXED_SHIFT; + b >>= FIXED_SHIFT; + + *dest = (a << 24) | (r << 16) | (g << 8) | b; + dest++; + src++; + } +} + +static int compute_coverage(int coverage[], int src_length, int dest_length) +{ + int i; + /* num = src_length/dest_length + total = sum(pixel) / num + + pixel * 1/num == pixel * dest_length / src_length + */ + /* the average contribution of each source pixel */ + int ratio = ((1 << 24) * (long long int)dest_length) / src_length; + /* because ((1 << 24)*(long long int)dest_length) won't always be divisible by src_length + * we'll need someplace to put the other bits. + * + * We want to ensure a + n*ratio < 1<<24 + * + * 1<<24 + * */ + + double scale = (double)src_length / dest_length; + + /* for each destination pixel compute the coverage of the left most pixel included in the box */ + /* I have a proof of this, which this margin is too narrow to contain */ + for (i = 0; i < dest_length; i++) { + double left_side = i * scale; + double right_side = (i + 1) * scale; + double right_fract = right_side - floor(right_side); + double left_fract = ceil(left_side) - left_side; + int overage; + /* find out how many source pixels will be used to fill the box */ + int count = floor(right_side) - ceil(left_side); + /* what's the maximum value this expression can become? + floor((i+1)*scale) - ceil(i*scale) + + (i+1)*scale - i*scale == scale + + since floor((i+1)*scale) <= (i+1)*scale + and ceil(i*scale) >= i*scale + + floor((i+1)*scale) - ceil(i*scale) <= scale + + further since: floor((i+1)*scale) - ceil(i*scale) is an integer + + therefore: + floor((i+1)*scale) - ceil(i*scale) <= floor(scale) + */ + + if (left_fract == 0.) { + count--; + } + + /* compute how much the right-most pixel contributes */ + overage = ratio * (right_fract); + + /* the remainder is the amount that the left-most pixel + * contributes */ + coverage[i] = (1 << 24) - (count * ratio + overage); + } + + return ratio; +} + +bool CairoRescaleBox::downScaleImage(unsigned orig_width, unsigned orig_height, signed scaled_width, signed scaled_height, unsigned short int start_column, unsigned short int start_row, unsigned short int width, unsigned short int height, + cairo_surface_t *dest_surface) +{ + int pixel_coverage_x, pixel_coverage_y; + int dest_y; + int src_y = 0; + uint32_t *scanline; + int *x_coverage = nullptr; + int *y_coverage = nullptr; + uint32_t *temp_buf = nullptr; + bool retval = false; + unsigned int *dest; + int dst_stride; + + dest = reinterpret_cast(cairo_image_surface_get_data(dest_surface)); + dst_stride = cairo_image_surface_get_stride(dest_surface); + + scanline = (uint32_t *)gmallocn(orig_width, sizeof(int)); + + x_coverage = (int *)gmallocn(orig_width, sizeof(int)); + y_coverage = (int *)gmallocn(orig_height, sizeof(int)); + + /* we need to allocate enough room for ceil(src_height/dest_height)+1 + Example: + src_height = 140 + dest_height = 50 + src_height/dest_height = 2.8 + + |-------------| 2.8 pixels + |----|----|----|----| 4 pixels + need to sample 3 pixels + + |-------------| 2.8 pixels + |----|----|----|----| 4 pixels + need to sample 4 pixels + */ + + temp_buf = (uint32_t *)gmallocn3((orig_height + scaled_height - 1) / scaled_height + 1, scaled_width, sizeof(uint32_t)); + + if (!x_coverage || !y_coverage || !scanline || !temp_buf) { + goto cleanup; + } + + pixel_coverage_x = compute_coverage(x_coverage, orig_width, scaled_width); + pixel_coverage_y = compute_coverage(y_coverage, orig_height, scaled_height); + + assert(width + start_column <= scaled_width); + + /* skip the rows at the beginning */ + for (dest_y = 0; dest_y < start_row; dest_y++) { + int box = 1 << FIXED_SHIFT; + int start_coverage_y = y_coverage[dest_y]; + box -= start_coverage_y; + src_y++; + while (box >= pixel_coverage_y) { + box -= pixel_coverage_y; + src_y++; + } + } + + for (; dest_y < start_row + height; dest_y++) { + int columns = 0; + int box = 1 << FIXED_SHIFT; + int start_coverage_y = y_coverage[dest_y]; + + getRow(src_y, scanline); + downsample_row_box_filter(start_column, width, scanline, scanline + orig_width, temp_buf + width * columns, x_coverage, pixel_coverage_x); + columns++; + src_y++; + box -= start_coverage_y; + + while (box >= pixel_coverage_y) { + getRow(src_y, scanline); + downsample_row_box_filter(start_column, width, scanline, scanline + orig_width, temp_buf + width * columns, x_coverage, pixel_coverage_x); + columns++; + src_y++; + box -= pixel_coverage_y; + } + + /* downsample any leftovers */ + if (box > 0) { + getRow(src_y, scanline); + downsample_row_box_filter(start_column, width, scanline, scanline + orig_width, temp_buf + width * columns, x_coverage, pixel_coverage_x); + columns++; + } + + /* now scale the rows we just downsampled in the y direction */ + downsample_columns_box_filter(width, start_coverage_y, pixel_coverage_y, temp_buf, dest); + dest += dst_stride / 4; + + // assert(width*columns <= ((orig_height + scaled_height-1)/scaled_height+1) * width); + } + // assert (src_y<=orig_height); + + retval = true; + +cleanup: + free(x_coverage); + free(y_coverage); + free(temp_buf); + free(scanline); + + return retval; +} diff --git a/poppler-24.05.0/poppler/CairoRescaleBox.h b/poppler-24.05.0/poppler/CairoRescaleBox.h new file mode 100644 index 0000000000000000000000000000000000000000..2766d483bf33ce11375abb30d7e15fa04c2d882c --- /dev/null +++ b/poppler-24.05.0/poppler/CairoRescaleBox.h @@ -0,0 +1,60 @@ +/* + * Copyright © 2009 Mozilla Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Mozilla Corporation not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Mozilla Corporation makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * MOZILLA CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT + * SHALL MOZILLA CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + * + * Author: Jeff Muizelaar, Mozilla Corp. + */ + +//======================================================================== +// +// 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) 2012 Adrian Johnson +// Copyright (C) 2018 Albert Astals Cid +// +// 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 +// +//======================================================================== + +#ifndef CAIRO_RESCALE_BOX_H +#define CAIRO_RESCALE_BOX_H + +#include + +class CairoRescaleBox +{ +public: + CairoRescaleBox() {}; + virtual ~CairoRescaleBox() {}; + + CairoRescaleBox(const CairoRescaleBox &) = delete; + CairoRescaleBox &operator=(const CairoRescaleBox &) = delete; + + virtual bool downScaleImage(unsigned orig_width, unsigned orig_height, signed scaled_width, signed scaled_height, unsigned short int start_column, unsigned short int start_row, unsigned short int width, unsigned short int height, + cairo_surface_t *dest_surface); + + virtual void getRow(int row_num, uint32_t *row_data) = 0; +}; + +#endif /* CAIRO_RESCALE_BOX_H */ diff --git a/poppler-24.05.0/poppler/Catalog.cc b/poppler-24.05.0/poppler/Catalog.cc new file mode 100644 index 0000000000000000000000000000000000000000..211197a4b39d688a80c896f07ed84543aa885f3a --- /dev/null +++ b/poppler-24.05.0/poppler/Catalog.cc @@ -0,0 +1,1237 @@ +//======================================================================== +// +// Catalog.cc +// +// Copyright 1996-2007 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Kristian Høgsberg +// Copyright (C) 2005-2013, 2015, 2017-2024 Albert Astals Cid +// Copyright (C) 2005 Jeff Muizelaar +// Copyright (C) 2005 Jonathan Blandford +// Copyright (C) 2005 Marco Pesenti Gritti +// Copyright (C) 2005, 2006, 2008 Brad Hards +// Copyright (C) 2006, 2008, 2011 Carlos Garcia Campos +// Copyright (C) 2007 Julien Rebetez +// Copyright (C) 2008, 2011 Pino Toscano +// Copyright (C) 2009 Ilya Gorenbein +// Copyright (C) 2010 Hib Eris +// Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2013 Julien Nabet +// Copyright (C) 2013 Adrian Perez de Castro +// Copyright (C) 2013, 2017 Adrian Johnson +// Copyright (C) 2013 José Aliste +// Copyright (C) 2014 Ed Porras +// Copyright (C) 2015 Even Rouault +// Copyright (C) 2016 Masamichi Hosoda +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2020 Oliver Sander +// Copyright (C) 2020 Katarina Behrens +// Copyright (C) 2020 Thorsten Behrens +// Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden +// Copyright (C) 2021 RM +// Copyright (C) 2023 Ilaï Deutel +// +// 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 + +#include +#include +#include "goo/gmem.h" +#include "Object.h" +#include "PDFDoc.h" +#include "XRef.h" +#include "Array.h" +#include "Dict.h" +#include "Page.h" +#include "Error.h" +#include "Link.h" +#include "PageLabelInfo.h" +#include "Catalog.h" +#include "Form.h" +#include "OptionalContent.h" +#include "ViewerPreferences.h" +#include "FileSpec.h" +#include "StructTreeRoot.h" + +//------------------------------------------------------------------------ +// Catalog +//------------------------------------------------------------------------ + +#define catalogLocker() const std::scoped_lock locker(mutex) + +Catalog::Catalog(PDFDoc *docA) +{ + ok = true; + doc = docA; + xref = doc->getXRef(); + numPages = -1; + pageLabelInfo = nullptr; + form = nullptr; + optContent = nullptr; + pageMode = pageModeNull; + pageLayout = pageLayoutNull; + destNameTree = nullptr; + embeddedFileNameTree = nullptr; + jsNameTree = nullptr; + viewerPrefs = nullptr; + structTreeRoot = nullptr; + + pagesList = nullptr; + pagesRefList = nullptr; + attrsList = nullptr; + kidsIdxList = nullptr; + markInfo = markInfoNull; + + Object catDict = xref->getCatalog(); + if (!catDict.isDict()) { + error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catDict.getTypeName()); + ok = false; + return; + } + // get the AcroForm dictionary + acroForm = catDict.getDict()->lookup("AcroForm"); + + // read base URI + Object obj = catDict.getDict()->lookupEnsureEncryptedIfNeeded("URI"); + if (obj.isDict()) { + Object obj2 = obj.getDict()->lookupEnsureEncryptedIfNeeded("Base"); + if (obj2.isString()) { + baseURI = obj2.getString()->toStr(); + } + } + + // get the Optional Content dictionary + Object optContentProps = catDict.dictLookup("OCProperties"); + if (optContentProps.isDict()) { + optContent = new OCGs(&optContentProps, xref); + if (!optContent->isOk()) { + delete optContent; + optContent = nullptr; + } + } + + // actions + additionalActions = catDict.dictLookupNF("AA").copy(); + + // get the ViewerPreferences dictionary + viewerPreferences = catDict.dictLookup("ViewerPreferences"); + + const Object version = catDict.dictLookup("Version"); + if (version.isName()) { + const int res = sscanf(version.getName(), "%d.%d", &catalogPdfMajorVersion, &catalogPdfMinorVersion); + if (res != 2) { + catalogPdfMajorVersion = -1; + catalogPdfMinorVersion = -1; + } + } +} + +Catalog::~Catalog() +{ + delete kidsIdxList; + if (attrsList) { + std::vector::iterator it; + for (it = attrsList->begin(); it != attrsList->end(); ++it) { + delete *it; + } + delete attrsList; + } + delete pagesRefList; + delete pagesList; + delete destNameTree; + delete embeddedFileNameTree; + delete jsNameTree; + delete pageLabelInfo; + delete form; + delete optContent; + delete viewerPrefs; + delete structTreeRoot; +} + +std::unique_ptr Catalog::readMetadata() +{ + catalogLocker(); + if (metadata.isNone()) { + Object catDict = xref->getCatalog(); + if (catDict.isDict()) { + metadata = catDict.dictLookup("Metadata"); + } else { + error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catDict.getTypeName()); + metadata.setToNull(); + } + } + + if (!metadata.isStream()) { + return {}; + } + Object obj = metadata.streamGetDict()->lookup("Subtype"); + if (!obj.isName("XML")) { + error(errSyntaxWarning, -1, "Unknown Metadata type: '{0:s}'", obj.isName() ? obj.getName() : "???"); + } + std::unique_ptr s = std::make_unique(); + metadata.getStream()->fillGooString(s.get()); + metadata.streamClose(); + return s; +} + +Page *Catalog::getPage(int i) +{ + if (i < 1) { + return nullptr; + } + + catalogLocker(); + if (std::size_t(i) > pages.size()) { + bool cached = cachePageTree(i); + if (cached == false) { + return nullptr; + } + } + return pages[i - 1].first.get(); +} + +Ref *Catalog::getPageRef(int i) +{ + if (i < 1) { + return nullptr; + } + + catalogLocker(); + if (std::size_t(i) > pages.size()) { + bool cached = cachePageTree(i); + if (cached == false) { + return nullptr; + } + } + return &pages[i - 1].second; +} + +bool Catalog::cachePageTree(int page) +{ + if (pagesList == nullptr) { + + Ref pagesRef; + + Object catDict = xref->getCatalog(); + + if (catDict.isDict()) { + const Object &pagesDictRef = catDict.dictLookupNF("Pages"); + if (pagesDictRef.isRef() && pagesDictRef.getRefNum() >= 0 && pagesDictRef.getRefNum() < xref->getNumObjects()) { + pagesRef = pagesDictRef.getRef(); + } else { + error(errSyntaxError, -1, "Catalog dictionary does not contain a valid \"Pages\" entry"); + return false; + } + } else { + error(errSyntaxError, -1, "Could not find catalog dictionary"); + return false; + } + + Object obj = catDict.dictLookup("Pages"); + // This should really be isDict("Pages"), but I've seen at least one + // PDF file where the /Type entry is missing. + if (!obj.isDict()) { + error(errSyntaxError, -1, "Top-level pages object is wrong type ({0:s})", obj.getTypeName()); + return false; + } + + pages.clear(); + attrsList = new std::vector(); + attrsList->push_back(new PageAttrs(nullptr, obj.getDict())); + pagesList = new std::vector(); + pagesList->push_back(std::move(obj)); + pagesRefList = new std::vector(); + pagesRefList->push_back(pagesRef); + kidsIdxList = new std::vector(); + kidsIdxList->push_back(0); + } + + while (true) { + + if (std::size_t(page) <= pages.size()) { + return true; + } + + if (pagesList->empty()) { + return false; + } + + Object kids = pagesList->back().dictLookup("Kids"); + if (!kids.isArray()) { + error(errSyntaxError, -1, "Kids object (page {0:uld}) is wrong type ({1:s})", pages.size() + 1, kids.getTypeName()); + return false; + } + + int kidsIdx = kidsIdxList->back(); + if (kidsIdx >= kids.arrayGetLength()) { + pagesList->pop_back(); + pagesRefList->pop_back(); + delete attrsList->back(); + attrsList->pop_back(); + kidsIdxList->pop_back(); + if (!kidsIdxList->empty()) { + kidsIdxList->back()++; + } + continue; + } + + const Object &kidRef = kids.arrayGetNF(kidsIdx); + if (!kidRef.isRef()) { + error(errSyntaxError, -1, "Kid object (page {0:uld}) is not an indirect reference ({1:s})", pages.size() + 1, kidRef.getTypeName()); + return false; + } + + bool loop = false; + ; + for (const Ref &pageRef : *pagesRefList) { + if (pageRef.num == kidRef.getRefNum()) { + loop = true; + break; + } + } + if (loop) { + error(errSyntaxError, -1, "Loop in Pages tree"); + kidsIdxList->back()++; + continue; + } + + Object kid = kids.arrayGet(kidsIdx); + if (kid.isDict("Page") || (kid.isDict() && !kid.getDict()->hasKey("Kids"))) { + PageAttrs *attrs = new PageAttrs(attrsList->back(), kid.getDict()); + auto p = std::make_unique(doc, pages.size() + 1, std::move(kid), kidRef.getRef(), attrs, form); + if (!p->isOk()) { + error(errSyntaxError, -1, "Failed to create page (page {0:uld})", pages.size() + 1); + return false; + } + + if (pages.size() >= std::size_t(numPages)) { + error(errSyntaxError, -1, "Page count in top-level pages object is incorrect"); + return false; + } + + pages.emplace_back(std::move(p), kidRef.getRef()); + + kidsIdxList->back()++; + + // This should really be isDict("Pages"), but I've seen at least one + // PDF file where the /Type entry is missing. + } else if (kid.isDict()) { + attrsList->push_back(new PageAttrs(attrsList->back(), kid.getDict())); + pagesRefList->push_back(kidRef.getRef()); + pagesList->push_back(std::move(kid)); + kidsIdxList->push_back(0); + } else { + error(errSyntaxError, -1, "Kid object (page {0:uld}) is wrong type ({1:s})", pages.size() + 1, kid.getTypeName()); + kidsIdxList->back()++; + } + } + + return false; +} + +int Catalog::findPage(const Ref pageRef) +{ + int i; + + for (i = 0; i < getNumPages(); ++i) { + Ref *ref = getPageRef(i + 1); + if (ref != nullptr && *ref == pageRef) { + return i + 1; + } + } + return 0; +} + +std::unique_ptr Catalog::findDest(const GooString *name) +{ + // try named destination dictionary then name tree + if (getDests()->isDict()) { + Object obj1 = getDests()->dictLookup(name->c_str()); + return createLinkDest(&obj1); + } + + catalogLocker(); + Object obj2 = getDestNameTree()->lookup(name); + return createLinkDest(&obj2); +} + +std::unique_ptr Catalog::createLinkDest(Object *obj) +{ + std::unique_ptr dest; + if (obj->isArray()) { + dest = std::make_unique(obj->getArray()); + } else if (obj->isDict()) { + Object obj2 = obj->dictLookup("D"); + if (obj2.isArray()) { + dest = std::make_unique(obj2.getArray()); + } else { + error(errSyntaxWarning, -1, "Bad named destination value"); + } + } else { + error(errSyntaxWarning, -1, "Bad named destination value"); + } + if (dest && !dest->isOk()) { + dest.reset(); + } + + return dest; +} + +int Catalog::numDests() +{ + Object *obj; + + obj = getDests(); + if (!obj->isDict()) { + return 0; + } + return obj->dictGetLength(); +} + +const char *Catalog::getDestsName(int i) +{ + Object *obj; + + obj = getDests(); + if (!obj->isDict()) { + return nullptr; + } + return obj->dictGetKey(i); +} + +std::unique_ptr Catalog::getDestsDest(int i) +{ + Object *obj = getDests(); + if (!obj->isDict()) { + return nullptr; + } + Object obj1 = obj->dictGetVal(i); + return createLinkDest(&obj1); +} + +std::unique_ptr Catalog::getDestNameTreeDest(int i) +{ + Object obj; + + catalogLocker(); + Object *aux = getDestNameTree()->getValue(i); + if (aux) { + obj = aux->fetch(xref); + } + return createLinkDest(&obj); +} + +std::unique_ptr Catalog::embeddedFile(int i) +{ + catalogLocker(); + Object *obj = getEmbeddedFileNameTree()->getValue(i); + if (obj->isRef()) { + Object fsDict = obj->fetch(xref); + return std::make_unique(&fsDict); + } else if (obj->isDict()) { + return std::make_unique(obj); + } else { + Object null; + return std::make_unique(&null); + } +} + +bool Catalog::hasEmbeddedFile(const std::string &fileName) +{ + NameTree *ef = getEmbeddedFileNameTree(); + for (int i = 0; i < ef->numEntries(); ++i) { + if (fileName == ef->getName(i)->toStr()) { + return true; + } + } + return false; +} + +void Catalog::addEmbeddedFile(GooFile *file, const std::string &fileName) +{ + catalogLocker(); + + const Ref fileSpecRef = xref->addIndirectObject(FileSpec::newFileSpecObject(xref, file, fileName)); + + Object catDict = xref->getCatalog(); + Ref namesObjRef; + Object namesObj = catDict.getDict()->lookup("Names", &namesObjRef); + if (!namesObj.isDict()) { + // Need to create the names Dict + catDict.dictSet("Names", Object(new Dict(xref))); + namesObj = catDict.getDict()->lookup("Names"); + + // Trigger getting the names dict again when needed + names = Object(); + } + + Dict *namesDict = namesObj.getDict(); + + // We create a new EmbeddedFiles nametree, this replaces the existing one (if any), but it's not a problem + Object embeddedFilesObj = Object(new Dict(xref)); + const Ref embeddedFilesRef = xref->addIndirectObject(embeddedFilesObj); + + Array *embeddedFilesNamesArray = new Array(xref); + + // This flattens out the existing EmbeddedFiles nametree (if any), should not be a problem + NameTree *ef = getEmbeddedFileNameTree(); + bool fileAlreadyAdded = false; + for (int i = 0; i < ef->numEntries(); ++i) { + const GooString *efNameI = ef->getName(i); + + // we need to add the file if it has not been added yet and the name is smaller or equal lexicographically + // than the current item + const bool sameFileName = fileName == efNameI->toStr(); + const bool addFile = !fileAlreadyAdded && (sameFileName || fileName < efNameI->toStr()); + if (addFile) { + // If the new name is smaller lexicographically than an existing file add it in its correct position + embeddedFilesNamesArray->add(Object(new GooString(fileName))); + embeddedFilesNamesArray->add(Object(fileSpecRef)); + fileAlreadyAdded = true; + } + if (sameFileName) { + // If the new name is the same lexicographically than an existing file then don't add the existing file (i.e. replace) + continue; + } + embeddedFilesNamesArray->add(Object(efNameI->copy())); + embeddedFilesNamesArray->add(ef->getValue(i)->copy()); + } + + if (!fileAlreadyAdded) { + // The new file is bigger lexicographically than the existing ones + embeddedFilesNamesArray->add(Object(new GooString(fileName))); + embeddedFilesNamesArray->add(Object(fileSpecRef)); + } + + embeddedFilesObj.dictSet("Names", Object(embeddedFilesNamesArray)); + namesDict->set("EmbeddedFiles", Object(embeddedFilesRef)); + + if (namesObjRef != Ref::INVALID()) { + xref->setModifiedObject(&namesObj, namesObjRef); + } else { + xref->setModifiedObject(&catDict, { xref->getRootNum(), xref->getRootGen() }); + } + + // recreate Nametree on next call that uses it + delete embeddedFileNameTree; + embeddedFileNameTree = nullptr; +} + +GooString *Catalog::getJS(int i) +{ + Object obj; + // getJSNameTree()->getValue(i) returns a shallow copy of the object so we + // do not need to free it + catalogLocker(); + Object *aux = getJSNameTree()->getValue(i); + if (aux) { + obj = aux->fetch(xref); + } + + if (!obj.isDict()) { + return nullptr; + } + Object obj2 = obj.dictLookup("S"); + if (!obj2.isName()) { + return nullptr; + } + if (strcmp(obj2.getName(), "JavaScript")) { + return nullptr; + } + obj2 = obj.dictLookup("JS"); + GooString *js = nullptr; + if (obj2.isString()) { + js = new GooString(obj2.getString()); + } else if (obj2.isStream()) { + Stream *stream = obj2.getStream(); + js = new GooString(); + stream->fillGooString(js); + } + return js; +} + +Catalog::PageMode Catalog::getPageMode() +{ + + catalogLocker(); + if (pageMode == pageModeNull) { + + pageMode = pageModeNone; + + Object catDict = xref->getCatalog(); + if (!catDict.isDict()) { + error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catDict.getTypeName()); + return pageMode; + } + + Object obj = catDict.dictLookup("PageMode"); + if (obj.isName()) { + if (obj.isName("UseNone")) { + pageMode = pageModeNone; + } else if (obj.isName("UseOutlines")) { + pageMode = pageModeOutlines; + } else if (obj.isName("UseThumbs")) { + pageMode = pageModeThumbs; + } else if (obj.isName("FullScreen")) { + pageMode = pageModeFullScreen; + } else if (obj.isName("UseOC")) { + pageMode = pageModeOC; + } else if (obj.isName("UseAttachments")) { + pageMode = pageModeAttach; + } + } + } + return pageMode; +} + +Catalog::PageLayout Catalog::getPageLayout() +{ + + catalogLocker(); + if (pageLayout == pageLayoutNull) { + + pageLayout = pageLayoutNone; + + Object catDict = xref->getCatalog(); + if (!catDict.isDict()) { + error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catDict.getTypeName()); + return pageLayout; + } + + pageLayout = pageLayoutNone; + Object obj = catDict.dictLookup("PageLayout"); + if (obj.isName()) { + if (obj.isName("SinglePage")) { + pageLayout = pageLayoutSinglePage; + } + if (obj.isName("OneColumn")) { + pageLayout = pageLayoutOneColumn; + } + if (obj.isName("TwoColumnLeft")) { + pageLayout = pageLayoutTwoColumnLeft; + } + if (obj.isName("TwoColumnRight")) { + pageLayout = pageLayoutTwoColumnRight; + } + if (obj.isName("TwoPageLeft")) { + pageLayout = pageLayoutTwoPageLeft; + } + if (obj.isName("TwoPageRight")) { + pageLayout = pageLayoutTwoPageRight; + } + } + } + return pageLayout; +} + +NameTree::NameTree() +{ + size = 0; + length = 0; + entries = nullptr; +} + +NameTree::~NameTree() +{ + int i; + + for (i = 0; i < length; i++) { + delete entries[i]; + } + + gfree(entries); +} + +NameTree::Entry::Entry(Array *array, int index) +{ + if (!array->getString(index, &name)) { + Object aux = array->get(index); + if (aux.isString()) { + name.append(aux.getString()); + } else { + error(errSyntaxError, -1, "Invalid page tree"); + } + } + value = array->getNF(index + 1).copy(); +} + +NameTree::Entry::~Entry() { } + +void NameTree::addEntry(Entry *entry) +{ + if (length == size) { + if (length == 0) { + size = 8; + } else { + size *= 2; + } + entries = (Entry **)grealloc(entries, sizeof(Entry *) * size); + } + + entries[length] = entry; + ++length; +} + +int NameTree::Entry::cmpEntry(const void *voidEntry, const void *voidOtherEntry) +{ + Entry *entry = *(NameTree::Entry **)voidEntry; + Entry *otherEntry = *(NameTree::Entry **)voidOtherEntry; + + return entry->name.cmp(&otherEntry->name); +} + +void NameTree::init(XRef *xrefA, Object *tree) +{ + xref = xrefA; + RefRecursionChecker seen; + parse(tree, seen); + if (entries && length > 0) { + qsort(entries, length, sizeof(Entry *), Entry::cmpEntry); + } +} + +void NameTree::parse(const Object *tree, RefRecursionChecker &seen) +{ + if (!tree->isDict()) { + return; + } + + // leaf node + Object names = tree->dictLookup("Names"); + if (names.isArray()) { + for (int i = 0; i < names.arrayGetLength(); i += 2) { + NameTree::Entry *entry; + + entry = new Entry(names.getArray(), i); + addEntry(entry); + } + } + + // root or intermediate node + Ref ref; + const Object kids = tree->getDict()->lookup("Kids", &ref); + if (!seen.insert(ref)) { + error(errSyntaxError, -1, "loop in NameTree (numObj: {0:d})", ref.num); + return; + } + if (kids.isArray()) { + for (int i = 0; i < kids.arrayGetLength(); ++i) { + const Object kid = kids.getArray()->get(i, &ref); + if (!seen.insert(ref)) { + error(errSyntaxError, -1, "loop in NameTree (numObj: {0:d})", ref.num); + continue; + } + if (kid.isDict()) { + parse(&kid, seen); + } + } + } +} + +int NameTree::Entry::cmp(const void *voidKey, const void *voidEntry) +{ + GooString *key = (GooString *)voidKey; + Entry *entry = *(NameTree::Entry **)voidEntry; + + return key->cmp(&entry->name); +} + +Object NameTree::lookup(const GooString *name) +{ + Entry **entry; + + entry = (Entry **)bsearch(name, entries, length, sizeof(Entry *), Entry::cmp); + if (entry != nullptr) { + return (*entry)->value.fetch(xref); + } else { + error(errSyntaxError, -1, "failed to look up ({0:s})", name->c_str()); + return Object(objNull); + } +} + +Object *NameTree::getValue(int index) +{ + if (index < length) { + return &entries[index]->value; + } else { + return nullptr; + } +} + +const GooString *NameTree::getName(int index) const +{ + if (index < length) { + return &entries[index]->name; + } else { + return nullptr; + } +} + +bool Catalog::labelToIndex(GooString *label, int *index) +{ + char *end; + + PageLabelInfo *pli = getPageLabelInfo(); + if (pli != nullptr) { + if (!pli->labelToIndex(label, index)) { + return false; + } + } else { + *index = strtol(label->c_str(), &end, 10) - 1; + if (*end != '\0') { + return false; + } + } + + if (*index < 0 || *index >= getNumPages()) { + return false; + } + + return true; +} + +bool Catalog::indexToLabel(int index, GooString *label) +{ + char buffer[32]; + + if (index < 0 || index >= getNumPages()) { + return false; + } + + PageLabelInfo *pli = getPageLabelInfo(); + if (pli != nullptr) { + return pli->indexToLabel(index, label); + } else { + snprintf(buffer, sizeof(buffer), "%d", index + 1); + label->append(buffer); + return true; + } +} + +int Catalog::getNumPages() +{ + catalogLocker(); + if (numPages == -1) { + Object catDict = xref->getCatalog(); + if (!catDict.isDict()) { + error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catDict.getTypeName()); + return 0; + } + Object pagesDict = catDict.dictLookup("Pages"); + + // This should really be isDict("Pages"), but I've seen at least one + // PDF file where the /Type entry is missing. + if (!pagesDict.isDict()) { + error(errSyntaxError, -1, "Top-level pages object is wrong type ({0:s})", pagesDict.getTypeName()); + return 0; + } + + Object obj = pagesDict.dictLookup("Count"); + // some PDF files actually use real numbers here ("/Count 9.0") + if (!obj.isNum()) { + if (pagesDict.dictIs("Page")) { + const Object &pageRootRef = catDict.dictLookupNF("Pages"); + + error(errSyntaxError, -1, "Pages top-level is a single Page. The document is malformed, trying to recover..."); + + Dict *pageDict = pagesDict.getDict(); + if (pageRootRef.isRef()) { + const Ref pageRef = pageRootRef.getRef(); + auto p = std::make_unique(doc, 1, std::move(pagesDict), pageRef, new PageAttrs(nullptr, pageDict), form); + if (p->isOk()) { + pages.emplace_back(std::move(p), pageRef); + + numPages = 1; + } else { + numPages = 0; + } + } else { + numPages = 0; + } + } else { + error(errSyntaxError, -1, "Page count in top-level pages object is wrong type ({0:s})", obj.getTypeName()); + numPages = 0; + } + } else { + if (obj.isInt()) { + numPages = obj.getInt(); + } else if (obj.isInt64()) { + numPages = obj.getInt64(); + } else { + numPages = obj.getNum(); + } + if (numPages <= 0) { + error(errSyntaxError, -1, "Invalid page count {0:d}", numPages); + numPages = 0; + } else if (numPages > xref->getNumObjects()) { + error(errSyntaxError, -1, "Page count ({0:d}) larger than number of objects ({1:d})", numPages, xref->getNumObjects()); + numPages = 0; + } + } + } + + return numPages; +} + +PageLabelInfo *Catalog::getPageLabelInfo() +{ + catalogLocker(); + if (!pageLabelInfo) { + Object catDict = xref->getCatalog(); + if (!catDict.isDict()) { + error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catDict.getTypeName()); + return nullptr; + } + + Object obj = catDict.dictLookup("PageLabels"); + if (obj.isDict()) { + pageLabelInfo = new PageLabelInfo(&obj, getNumPages()); + } + } + + return pageLabelInfo; +} + +StructTreeRoot *Catalog::getStructTreeRoot() +{ + catalogLocker(); + if (!structTreeRoot) { + Object catalog = xref->getCatalog(); + if (!catalog.isDict()) { + error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catalog.getTypeName()); + return nullptr; + } + + Object root = catalog.dictLookup("StructTreeRoot"); + if (root.isDict("StructTreeRoot")) { + structTreeRoot = new StructTreeRoot(doc, root.getDict()); + } + } + return structTreeRoot; +} + +unsigned int Catalog::getMarkInfo() +{ + if (markInfo == markInfoNull) { + markInfo = 0; + + catalogLocker(); + Object catDict = xref->getCatalog(); + + if (catDict.isDict()) { + Object markInfoDict = catDict.dictLookup("MarkInfo"); + if (markInfoDict.isDict()) { + Object value = markInfoDict.dictLookup("Marked"); + if (value.isBool()) { + if (value.getBool()) { + markInfo |= markInfoMarked; + } + } else if (!value.isNull()) { + error(errSyntaxError, -1, "Marked object is wrong type ({0:s})", value.getTypeName()); + } + + value = markInfoDict.dictLookup("Suspects"); + if (value.isBool() && value.getBool()) { + markInfo |= markInfoSuspects; + } else if (!value.isNull()) { + error(errSyntaxError, -1, "Suspects object is wrong type ({0:s})", value.getTypeName()); + } + + value = markInfoDict.dictLookup("UserProperties"); + if (value.isBool() && value.getBool()) { + markInfo |= markInfoUserProperties; + } else if (!value.isNull()) { + error(errSyntaxError, -1, "UserProperties object is wrong type ({0:s})", value.getTypeName()); + } + } else if (!markInfoDict.isNull()) { + error(errSyntaxError, -1, "MarkInfo object is wrong type ({0:s})", markInfoDict.getTypeName()); + } + } else { + error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catDict.getTypeName()); + } + } + return markInfo; +} + +Object *Catalog::getCreateOutline() +{ + + catalogLocker(); + Object catDict = xref->getCatalog(); + + // If there is no Object in the outline variable, + // check if there is an Outline dict in the catalog + if (outline.isNone()) { + if (catDict.isDict()) { + Object outline_obj = catDict.dictLookup("Outlines"); + if (outline_obj.isDict()) { + return &outline; + } + } else { + // catalog is not a dict, give up? + return &outline; + } + } + + // If there is an Object in variable, make sure it's a dict + if (outline.isDict()) { + return &outline; + } + + // setup an empty outline dict + outline = Object(new Dict(doc->getXRef())); + outline.dictSet("Type", Object(objName, "Outlines")); + outline.dictSet("Count", Object(0)); + + const Ref outlineRef = doc->getXRef()->addIndirectObject(outline); + catDict.dictAdd("Outlines", Object(outlineRef)); + xref->setModifiedObject(&catDict, { xref->getRootNum(), xref->getRootGen() }); + + return &outline; +} + +Object *Catalog::getOutline() +{ + catalogLocker(); + if (outline.isNone()) { + Object catDict = xref->getCatalog(); + if (catDict.isDict()) { + outline = catDict.dictLookup("Outlines"); + } else { + error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catDict.getTypeName()); + outline.setToNull(); + } + } + + return &outline; +} + +Object *Catalog::getDests() +{ + catalogLocker(); + if (dests.isNone()) { + Object catDict = xref->getCatalog(); + if (catDict.isDict()) { + dests = catDict.dictLookup("Dests"); + } else { + error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catDict.getTypeName()); + dests.setToNull(); + } + } + + return &dests; +} + +Catalog::FormType Catalog::getFormType() +{ + Object xfa; + FormType res = NoForm; + + if (acroForm.isDict()) { + xfa = acroForm.dictLookup("XFA"); + if (xfa.isStream() || xfa.isArray()) { + res = XfaForm; + } else { + res = AcroForm; + } + } + + return res; +} + +Form *Catalog::getCreateForm() +{ + catalogLocker(); + if (!form) { + + Object catDict = xref->getCatalog(); + if (!catDict.isDict()) { + error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catDict.getTypeName()); + return nullptr; + } + + if (!acroForm.isDict()) { + acroForm = Object(new Dict(xref)); + acroForm.dictSet("Fields", Object(new Array(xref))); + + const Ref newFormRef = xref->addIndirectObject(acroForm); + catDict.dictSet("AcroForm", Object(newFormRef)); + + xref->setModifiedObject(&catDict, { xref->getRootNum(), xref->getRootGen() }); + } + } + + return getForm(); +} + +Form *Catalog::getForm() +{ + catalogLocker(); + if (!form) { + if (acroForm.isDict()) { + form = new Form(doc); + // perform form-related loading after all widgets have been loaded + form->postWidgetsLoad(); + } + } + + return form; +} + +void Catalog::addFormToAcroForm(const Ref formRef) +{ + catalogLocker(); + + if (!acroForm.isDict()) { + getCreateForm(); + } + + // append to field array + Ref fieldRef; + Object fieldArray = acroForm.getDict()->lookup("Fields", &fieldRef); + fieldArray.getArray()->add(Object(formRef)); + + setAcroFormModified(); +} + +void Catalog::setAcroFormModified() +{ + Object catDict = xref->getCatalog(); + Ref acroFormRef; + catDict.getDict()->lookup("AcroForm", &acroFormRef); + + if (acroFormRef != Ref::INVALID()) { + xref->setModifiedObject(&acroForm, acroFormRef); + } else { + catDict.dictSet("AcroForm", acroForm.copy()); + xref->setModifiedObject(&catDict, { xref->getRootNum(), xref->getRootGen() }); + } +} + +void Catalog::removeFormFromAcroForm(const Ref formRef) +{ + catalogLocker(); + + Object catDict = xref->getCatalog(); + if (acroForm.isDict()) { + // remove from field array + Ref fieldRef; + Object fieldArrayO = acroForm.getDict()->lookup("Fields", &fieldRef); + Array *fieldArray = fieldArrayO.getArray(); + for (int i = 0; i < fieldArray->getLength(); ++i) { + const Object &o = fieldArray->getNF(i); + if (o.isRef() && o.getRef() == formRef) { + fieldArray->remove(i); + break; + } + } + + setAcroFormModified(); + } +} + +ViewerPreferences *Catalog::getViewerPreferences() +{ + catalogLocker(); + if (!viewerPrefs) { + if (viewerPreferences.isDict()) { + viewerPrefs = new ViewerPreferences(viewerPreferences.getDict()); + } + } + + return viewerPrefs; +} + +Object *Catalog::getNames() +{ + if (names.isNone()) { + Object catDict = xref->getCatalog(); + if (catDict.isDict()) { + names = catDict.dictLookup("Names"); + } else { + error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catDict.getTypeName()); + names.setToNull(); + } + } + + return &names; +} + +NameTree *Catalog::getDestNameTree() +{ + if (!destNameTree) { + + destNameTree = new NameTree(); + + if (getNames()->isDict()) { + Object obj = getNames()->dictLookup("Dests"); + destNameTree->init(xref, &obj); + } + } + + return destNameTree; +} + +NameTree *Catalog::getEmbeddedFileNameTree() +{ + if (!embeddedFileNameTree) { + + embeddedFileNameTree = new NameTree(); + + if (getNames()->isDict()) { + Object obj = getNames()->dictLookup("EmbeddedFiles"); + embeddedFileNameTree->init(xref, &obj); + } + } + + return embeddedFileNameTree; +} + +NameTree *Catalog::getJSNameTree() +{ + if (!jsNameTree) { + + jsNameTree = new NameTree(); + + if (getNames()->isDict()) { + Object obj = getNames()->dictLookup("JavaScript"); + jsNameTree->init(xref, &obj); + } + } + + return jsNameTree; +} + +std::unique_ptr Catalog::getAdditionalAction(DocumentAdditionalActionsType type) +{ + Object additionalActionsObject = additionalActions.fetch(doc->getXRef()); + if (additionalActionsObject.isDict()) { + const char *key = (type == actionCloseDocument ? "WC" + : type == actionSaveDocumentStart ? "WS" + : type == actionSaveDocumentFinish ? "DS" + : type == actionPrintDocumentStart ? "WP" + : type == actionPrintDocumentFinish ? "DP" + : nullptr); + + Object actionObject = additionalActionsObject.dictLookup(key); + if (actionObject.isDict()) { + return LinkAction::parseAction(&actionObject, doc->getCatalog()->getBaseURI()); + } + } + return nullptr; +} diff --git a/poppler-24.05.0/poppler/Catalog.h b/poppler-24.05.0/poppler/Catalog.h new file mode 100644 index 0000000000000000000000000000000000000000..8848e44a4d547ff43724a835454cfc805b7e1036 --- /dev/null +++ b/poppler-24.05.0/poppler/Catalog.h @@ -0,0 +1,321 @@ +//======================================================================== +// +// Catalog.h +// +// Copyright 1996-2007 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Kristian Høgsberg +// Copyright (C) 2005, 2007, 2009-2011, 2013, 2017-2023 Albert Astals Cid +// Copyright (C) 2005 Jonathan Blandford +// Copyright (C) 2005, 2006, 2008 Brad Hards +// Copyright (C) 2007 Julien Rebetez +// Copyright (C) 2008, 2011 Pino Toscano +// Copyright (C) 2010 Hib Eris +// Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2013 Adrian Perez de Castro +// Copyright (C) 2013, 2017 Adrian Johnson +// Copyright (C) 2013 José Aliste +// Copyright (C) 2016 Masamichi Hosoda +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2020 Oliver Sander +// Copyright (C) 2020 Katarina Behrens +// Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden +// Copyright (C) 2021 RM +// +// 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 +// +//======================================================================== + +#ifndef CATALOG_H +#define CATALOG_H + +#include "poppler-config.h" +#include "poppler_private_export.h" +#include "Object.h" +#include "Link.h" + +#include +#include +#include + +class PDFDoc; +class XRef; +class Object; +class Page; +class PageAttrs; +struct Ref; +class PageLabelInfo; +class Form; +class OCGs; +class ViewerPreferences; +class FileSpec; +class StructTreeRoot; + +//------------------------------------------------------------------------ +// NameTree +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT NameTree +{ +public: + NameTree(); + ~NameTree(); + + NameTree(const NameTree &) = delete; + NameTree &operator=(const NameTree &) = delete; + + void init(XRef *xref, Object *tree); + Object lookup(const GooString *name); + int numEntries() { return length; }; + // iterator accessor, note it returns a pointer to the internal object, do not free nor delete it + Object *getValue(int i); + const GooString *getName(int i) const; + +private: + struct Entry + { + Entry(Array *array, int index); + ~Entry(); + GooString name; + Object value; + static int cmpEntry(const void *voidEntry, const void *voidOtherEntry); + static int cmp(const void *key, const void *entry); + }; + + void parse(const Object *tree, RefRecursionChecker &seen); + void addEntry(Entry *entry); + + XRef *xref; + Entry **entries; + int size, length; // size is the number of entries in + // the array of Entry* + // length is the number of real Entry +}; + +//------------------------------------------------------------------------ +// Catalog +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT Catalog +{ +public: + // Constructor. + explicit Catalog(PDFDoc *docA); + + // Destructor. + ~Catalog(); + + Catalog(const Catalog &) = delete; + Catalog &operator=(const Catalog &) = delete; + + // Is catalog valid? + bool isOk() { return ok; } + + // Get number of pages. + int getNumPages(); + + // Get a page. + Page *getPage(int i); + + // Get the reference for a page object. + Ref *getPageRef(int i); + + // Return base URI, or NULL if none. + const std::optional &getBaseURI() const { return baseURI; } + + // Return the contents of the metadata stream, or NULL if there is + // no metadata. + std::unique_ptr readMetadata(); + + // Return the structure tree root object. + StructTreeRoot *getStructTreeRoot(); + + // Return values from the MarkInfo dictionary as flags in a bitfield. + enum MarkInfoFlags + { + markInfoNull = 1 << 0, + markInfoMarked = 1 << 1, + markInfoUserProperties = 1 << 2, + markInfoSuspects = 1 << 3, + }; + unsigned int getMarkInfo(); + + // Find a page, given its object ID. Returns page number, or 0 if + // not found. + int findPage(const Ref pageRef); + + // Find a named destination. Returns the link destination, or + // NULL if is not a destination. + std::unique_ptr findDest(const GooString *name); + + Object *getDests(); + + // Get the number of named destinations in name-dict + int numDests(); + + // Get the i'th named destination name in name-dict + const char *getDestsName(int i); + + // Get the i'th named destination link destination in name-dict + std::unique_ptr getDestsDest(int i); + + // Get the number of named destinations in name-tree + int numDestNameTree() { return getDestNameTree()->numEntries(); } + + // Get the i'th named destination name in name-tree + const GooString *getDestNameTreeName(int i) { return getDestNameTree()->getName(i); } + + // Get the i'th named destination link destination in name-tree + std::unique_ptr getDestNameTreeDest(int i); + + // Get the number of embedded files + int numEmbeddedFiles() { return getEmbeddedFileNameTree()->numEntries(); } + + // Get the i'th file embedded (at the Document level) in the document + std::unique_ptr embeddedFile(int i); + + // Is there an embedded file with the given name? + bool hasEmbeddedFile(const std::string &fileName); + + // Adds and embeddedFile + // If there is already an existing embedded file with the given fileName + // it gets replaced, if that's not what you want check hasEmbeddedFile first + void addEmbeddedFile(GooFile *file, const std::string &fileName); + + // Get the number of javascript scripts + int numJS() { return getJSNameTree()->numEntries(); } + const GooString *getJSName(int i) { return getJSNameTree()->getName(i); } + + // Get the i'th JavaScript script (at the Document level) in the document + GooString *getJS(int i); + + // Convert between page indices and page labels. + bool labelToIndex(GooString *label, int *index); + bool indexToLabel(int index, GooString *label); + + Object *getOutline(); + // returns the existing outline or new one if it doesn't exist + Object *getCreateOutline(); + + Object *getAcroForm() { return &acroForm; } + void addFormToAcroForm(const Ref formRef); + void removeFormFromAcroForm(const Ref formRef); + void setAcroFormModified(); + + OCGs *getOptContentConfig() { return optContent; } + + int getPDFMajorVersion() const { return catalogPdfMajorVersion; } + int getPDFMinorVersion() const { return catalogPdfMinorVersion; } + + enum FormType + { + NoForm, + AcroForm, + XfaForm + }; + + FormType getFormType(); + // This can return nullptr if the document is in a very damaged state + Form *getCreateForm(); + Form *getForm(); + + ViewerPreferences *getViewerPreferences(); + + enum PageMode + { + pageModeNone, + pageModeOutlines, + pageModeThumbs, + pageModeFullScreen, + pageModeOC, + pageModeAttach, + pageModeNull + }; + enum PageLayout + { + pageLayoutNone, + pageLayoutSinglePage, + pageLayoutOneColumn, + pageLayoutTwoColumnLeft, + pageLayoutTwoColumnRight, + pageLayoutTwoPageLeft, + pageLayoutTwoPageRight, + pageLayoutNull + }; + + // Returns the page mode. + PageMode getPageMode(); + PageLayout getPageLayout(); + + enum DocumentAdditionalActionsType + { + actionCloseDocument, ///< Performed before closing the document + actionSaveDocumentStart, ///< Performed before saving the document + actionSaveDocumentFinish, ///< Performed after saving the document + actionPrintDocumentStart, ///< Performed before printing the document + actionPrintDocumentFinish, ///< Performed after printing the document + }; + + std::unique_ptr getAdditionalAction(DocumentAdditionalActionsType type); + +private: + // Get page label info. + PageLabelInfo *getPageLabelInfo(); + + PDFDoc *doc; + XRef *xref; // the xref table for this PDF file + std::vector, Ref>> pages; + std::vector *pagesList; + std::vector *pagesRefList; + std::vector *attrsList; + std::vector *kidsIdxList; + Form *form; + ViewerPreferences *viewerPrefs; + int numPages; // number of pages + Object dests; // named destination dictionary + Object names; // named names dictionary + NameTree *destNameTree; // named destination name-tree + NameTree *embeddedFileNameTree; // embedded file name-tree + NameTree *jsNameTree; // Java Script name-tree + std::optional baseURI; // base URI for URI-type links + Object metadata; // metadata stream + StructTreeRoot *structTreeRoot; // structure tree root + unsigned int markInfo; // Flags from MarkInfo dictionary + Object outline; // outline dictionary + Object acroForm; // AcroForm dictionary + Object viewerPreferences; // ViewerPreference dictionary + OCGs *optContent; // Optional Content groups + bool ok; // true if catalog is valid + PageLabelInfo *pageLabelInfo; // info about page labels + PageMode pageMode; // page mode + PageLayout pageLayout; // page layout + Object additionalActions; // page additional actions + + bool cachePageTree(int page); // Cache first pages. + Object *findDestInTree(Object *tree, GooString *name, Object *obj); + + Object *getNames(); + NameTree *getDestNameTree(); + NameTree *getEmbeddedFileNameTree(); + NameTree *getJSNameTree(); + std::unique_ptr createLinkDest(Object *obj); + + int catalogPdfMajorVersion = -1; + int catalogPdfMinorVersion = -1; + + mutable std::recursive_mutex mutex; +}; + +#endif diff --git a/poppler-24.05.0/poppler/CertificateInfo.cc b/poppler-24.05.0/poppler/CertificateInfo.cc new file mode 100644 index 0000000000000000000000000000000000000000..d4ae8f640946267b4246f2e1768e1177ca400996 --- /dev/null +++ b/poppler-24.05.0/poppler/CertificateInfo.cc @@ -0,0 +1,131 @@ +//======================================================================== +// +// CertificateInfo.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2018 Chinmoy Ranjan Pradhan +// Copyright 2018, 2019, 2022 Albert Astals Cid +// Copyright 2018 Oliver Sander +// Copyright 2020 Thorsten Behrens +// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +//======================================================================== + +#include "CertificateInfo.h" + +#include +#include + +X509CertificateInfo::X509CertificateInfo() : ku_extensions(KU_NONE), cert_version(-1), is_self_signed(false), keyLocation(KeyLocation::Unknown) { } + +X509CertificateInfo::~X509CertificateInfo() = default; + +int X509CertificateInfo::getVersion() const +{ + return cert_version; +} + +const GooString &X509CertificateInfo::getSerialNumber() const +{ + return cert_serial; +} + +const GooString &X509CertificateInfo::getNickName() const +{ + return cert_nick; +} + +const X509CertificateInfo::EntityInfo &X509CertificateInfo::getIssuerInfo() const +{ + return issuer_info; +} + +const X509CertificateInfo::Validity &X509CertificateInfo::getValidity() const +{ + return cert_validity; +} + +const X509CertificateInfo::EntityInfo &X509CertificateInfo::getSubjectInfo() const +{ + return subject_info; +} + +const X509CertificateInfo::PublicKeyInfo &X509CertificateInfo::getPublicKeyInfo() const +{ + return public_key_info; +} + +unsigned int X509CertificateInfo::getKeyUsageExtensions() const +{ + return ku_extensions; +} + +const GooString &X509CertificateInfo::getCertificateDER() const +{ + return cert_der; +} + +bool X509CertificateInfo::getIsSelfSigned() const +{ + return is_self_signed; +} + +void X509CertificateInfo::setVersion(int version) +{ + cert_version = version; +} + +void X509CertificateInfo::setSerialNumber(const GooString &serialNumber) +{ + cert_serial.Set(&serialNumber); +} + +void X509CertificateInfo::setNickName(const GooString &nickName) +{ + cert_nick.Set(&nickName); +} + +void X509CertificateInfo::setIssuerInfo(EntityInfo &&issuerInfo) +{ + issuer_info = std::move(issuerInfo); +} + +void X509CertificateInfo::setValidity(Validity validity) +{ + cert_validity = validity; +} + +void X509CertificateInfo::setSubjectInfo(EntityInfo &&subjectInfo) +{ + subject_info = std::move(subjectInfo); +} + +void X509CertificateInfo::setPublicKeyInfo(PublicKeyInfo &&pkInfo) +{ + public_key_info = std::move(pkInfo); +} + +void X509CertificateInfo::setKeyUsageExtensions(unsigned int keyUsages) +{ + ku_extensions = keyUsages; +} + +void X509CertificateInfo::setCertificateDER(const GooString &certDer) +{ + cert_der.Set(&certDer); +} + +void X509CertificateInfo::setIsSelfSigned(bool isSelfSigned) +{ + is_self_signed = isSelfSigned; +} +KeyLocation X509CertificateInfo::getKeyLocation() const +{ + return keyLocation; +} + +void X509CertificateInfo::setKeyLocation(KeyLocation location) +{ + keyLocation = location; +} diff --git a/poppler-24.05.0/poppler/CertificateInfo.h b/poppler-24.05.0/poppler/CertificateInfo.h new file mode 100644 index 0000000000000000000000000000000000000000..d2dbc34f4020acbd8f46916ec229eb506e269dda --- /dev/null +++ b/poppler-24.05.0/poppler/CertificateInfo.h @@ -0,0 +1,149 @@ +//======================================================================== +// +// CertificateInfo.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2018 Chinmoy Ranjan Pradhan +// Copyright 2018, 2019 Albert Astals Cid +// Copyright 2018 Oliver Sander +// Copyright 2020 Thorsten Behrens +// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +//======================================================================== + +#ifndef CERTIFICATEINFO_H +#define CERTIFICATEINFO_H + +#include +#include +#include "goo/GooString.h" +#include "poppler_private_export.h" + +enum CertificateKeyUsageExtension +{ + KU_DIGITAL_SIGNATURE = 0x80, + KU_NON_REPUDIATION = 0x40, + KU_KEY_ENCIPHERMENT = 0x20, + KU_DATA_ENCIPHERMENT = 0x10, + KU_KEY_AGREEMENT = 0x08, + KU_KEY_CERT_SIGN = 0x04, + KU_CRL_SIGN = 0x02, + KU_ENCIPHER_ONLY = 0x01, + KU_NONE = 0x00 +}; + +enum PublicKeyType +{ + RSAKEY, + DSAKEY, + ECKEY, + OTHERKEY +}; + +/** A signing key can be located in different places + sometimes. For the user, it might be easier to pick + the key located on a card if it has some visual + indicator that it is somehow removable. + + \note a keylocation for a certificate without a private + key (cannot be used for signing) will likely be "Unknown" + */ +enum class KeyLocation +{ + Unknown, /** We don't know the location */ + Other, /** We know the location, but it is somehow not covered by this enum */ + Computer, /** The key is on this computer */ + HardwareToken /** The key is on a dedicated hardware token, either a smartcard or a dedicated usb token (e.g. gnuk, nitrokey or yubikey) */ +}; + +class POPPLER_PRIVATE_EXPORT X509CertificateInfo +{ +public: + X509CertificateInfo(); + ~X509CertificateInfo(); + + X509CertificateInfo(const X509CertificateInfo &) = delete; + X509CertificateInfo &operator=(const X509CertificateInfo &) = delete; + + struct PublicKeyInfo + { + PublicKeyInfo() = default; + + PublicKeyInfo(PublicKeyInfo &&) noexcept = default; + PublicKeyInfo &operator=(PublicKeyInfo &&) noexcept = default; + + PublicKeyInfo(const PublicKeyInfo &) = delete; + PublicKeyInfo &operator=(const PublicKeyInfo &) = delete; + + GooString publicKey; + PublicKeyType publicKeyType = OTHERKEY; + unsigned int publicKeyStrength = 0; // in bits + }; + + struct EntityInfo + { + EntityInfo() = default; + ~EntityInfo() = default; + + EntityInfo(EntityInfo &&) noexcept = default; + EntityInfo &operator=(EntityInfo &&) noexcept = default; + + EntityInfo(const EntityInfo &) = delete; + EntityInfo &operator=(const EntityInfo &) = delete; + + std::string commonName; + std::string distinguishedName; + std::string email; + std::string organization; + }; + + struct Validity + { + Validity() : notBefore(0), notAfter(0) { } + + time_t notBefore; + time_t notAfter; + }; + + /* GETTERS */ + int getVersion() const; + const GooString &getSerialNumber() const; + const GooString &getNickName() const; + const EntityInfo &getIssuerInfo() const; + const Validity &getValidity() const; + const EntityInfo &getSubjectInfo() const; + const PublicKeyInfo &getPublicKeyInfo() const; + unsigned int getKeyUsageExtensions() const; + const GooString &getCertificateDER() const; + bool getIsSelfSigned() const; + KeyLocation getKeyLocation() const; + + /* SETTERS */ + void setVersion(int); + void setSerialNumber(const GooString &); + void setNickName(const GooString &); + void setIssuerInfo(EntityInfo &&); + void setValidity(Validity); + void setSubjectInfo(EntityInfo &&); + void setPublicKeyInfo(PublicKeyInfo &&); + void setKeyUsageExtensions(unsigned int); + void setCertificateDER(const GooString &); + void setIsSelfSigned(bool); + void setKeyLocation(KeyLocation location); + +private: + EntityInfo issuer_info; + EntityInfo subject_info; + PublicKeyInfo public_key_info; + Validity cert_validity; + GooString cert_serial; + GooString cert_der; + GooString cert_nick; + unsigned int ku_extensions; + int cert_version; + bool is_self_signed; + KeyLocation keyLocation; +}; + +#endif diff --git a/poppler-24.05.0/poppler/CharCodeToUnicode.cc b/poppler-24.05.0/poppler/CharCodeToUnicode.cc new file mode 100644 index 0000000000000000000000000000000000000000..7c92e0ac36fd25878fe5c36c1368ec07a8d3cb30 --- /dev/null +++ b/poppler-24.05.0/poppler/CharCodeToUnicode.cc @@ -0,0 +1,648 @@ +//======================================================================== +// +// CharCodeToUnicode.cc +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006, 2008-2010, 2012, 2018-2022, 2024 Albert Astals Cid +// Copyright (C) 2007 Julien Rebetez +// Copyright (C) 2007 Koji Otani +// Copyright (C) 2008 Michael Vrable +// Copyright (C) 2008 Vasile Gaburici +// Copyright (C) 2010 William Bader +// Copyright (C) 2010 Jakub Wilk +// Copyright (C) 2012 Thomas Freitag +// Copyright (C) 2012, 2017 Adrian Johnson +// Copyright (C) 2014 Jiri Slaby +// Copyright (C) 2015 Marek Kasik +// Copyright (C) 2017 Jean Ghali +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019 +// Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// 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 + +#include +#include +#include +#include "goo/glibc.h" +#include "goo/gmem.h" +#include "goo/gfile.h" +#include "goo/GooLikely.h" +#include "goo/GooString.h" +#include "Error.h" +#include "GlobalParams.h" +#include "PSTokenizer.h" +#include "CharCodeToUnicode.h" +#include "UTF.h" + +//------------------------------------------------------------------------ + +//------------------------------------------------------------------------ + +static int getCharFromString(void *data) +{ + unsigned char *p; + int c; + + p = *(unsigned char **)data; + if (*p) { + c = *p++; + *(unsigned char **)data = p; + } else { + c = EOF; + } + return c; +} + +static int getCharFromFile(void *data) +{ + return fgetc((FILE *)data); +} + +//------------------------------------------------------------------------ + +static const int hexCharVals[256] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 0x + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 1x + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 2x + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, // 3x + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 4x + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 5x + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 6x + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 7x + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 8x + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // 9x + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Ax + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Bx + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Cx + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Dx + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Ex + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 // Fx +}; + +// Parse a -byte hex string into *. Returns false on +// error. +static bool parseHex(const char *s, int len, unsigned int *val) +{ + int i, x, v = 0; + + for (i = 0; i < len; ++i) { + x = hexCharVals[s[i] & 0xff]; + if (x < 0) { + *val = 0; + return false; + } + v = (v << 4) + x; + } + *val = v; + return true; +} + +//------------------------------------------------------------------------ + +CharCodeToUnicode *CharCodeToUnicode::makeIdentityMapping() +{ + CharCodeToUnicode *ctu = new CharCodeToUnicode(); + ctu->isIdentity = true; + ctu->map.resize(1, 0); + return ctu; +} +CharCodeToUnicode *CharCodeToUnicode::parseCIDToUnicode(const char *fileName, const GooString *collection) +{ + FILE *f; + CharCode size; + char buf[64]; + Unicode u; + + if (!(f = openFile(fileName, "r"))) { + error(errIO, -1, "Couldn't open cidToUnicode file '{0:s}'", fileName); + return nullptr; + } + + size = 32768; + std::vector mapA; + mapA.resize(size, 0); + CharCode mapLenA = 0; + + while (getLine(buf, sizeof(buf), f)) { + if (mapLenA == size) { + size *= 2; + mapA.resize(size); + } + if (sscanf(buf, "%x", &u) == 1) { + mapA[mapLenA] = u; + } else { + error(errSyntaxWarning, -1, "Bad line ({0:d}) in cidToUnicode file '{1:s}'", (int)(mapLenA + 1), fileName); + mapA[mapLenA] = 0; + } + ++mapLenA; + } + fclose(f); + mapA.resize(mapLenA); + + return new CharCodeToUnicode(collection->toStr(), std::move(mapA), {}); +} + +CharCodeToUnicode *CharCodeToUnicode::make8BitToUnicode(Unicode *toUnicode) +{ + std::vector data(toUnicode, toUnicode + 256); + return new CharCodeToUnicode({}, std::move(data), {}); +} + +CharCodeToUnicode *CharCodeToUnicode::parseCMap(const GooString *buf, int nBits) +{ + CharCodeToUnicode *ctu; + + ctu = new CharCodeToUnicode(std::optional()); + const char *p = buf->c_str(); + if (!ctu->parseCMap1(&getCharFromString, &p, nBits)) { + delete ctu; + return nullptr; + } + return ctu; +} + +CharCodeToUnicode *CharCodeToUnicode::parseCMapFromFile(const GooString *fileName, int nBits) +{ + CharCodeToUnicode *ctu; + FILE *f; + + ctu = new CharCodeToUnicode(std::optional()); + if ((f = globalParams->findToUnicodeFile(fileName))) { + if (!ctu->parseCMap1(&getCharFromFile, f, nBits)) { + delete ctu; + fclose(f); + return nullptr; + } + } else { + error(errSyntaxError, -1, "Couldn't find ToUnicode CMap file for '{0:t}'", fileName); + } + return ctu; +} + +void CharCodeToUnicode::mergeCMap(const GooString *buf, int nBits) +{ + const char *p = buf->c_str(); + parseCMap1(&getCharFromString, &p, nBits); +} + +bool CharCodeToUnicode::parseCMap1(int (*getCharFunc)(void *), void *data, int nBits) +{ + PSTokenizer *pst; + char tok1[256], tok2[256], tok3[256]; + int n1, n2, n3; + CharCode i; + CharCode maxCode, code1, code2; + GooString *name; + FILE *f; + + bool ok = false; + maxCode = (nBits == 8) ? 0xff : (nBits == 16) ? 0xffff : 0xffffffff; + pst = new PSTokenizer(getCharFunc, data); + pst->getToken(tok1, sizeof(tok1), &n1); + while (pst->getToken(tok2, sizeof(tok2), &n2)) { + if (!strcmp(tok2, "usecmap")) { + if (tok1[0] == '/') { + name = new GooString(tok1 + 1); + if ((f = globalParams->findToUnicodeFile(name))) { + if (parseCMap1(&getCharFromFile, f, nBits)) { + ok = true; + } + fclose(f); + } else { + error(errSyntaxError, -1, "Couldn't find ToUnicode CMap file for '{0:t}'", name); + } + delete name; + } + pst->getToken(tok1, sizeof(tok1), &n1); + } else if (!strcmp(tok2, "beginbfchar")) { + while (pst->getToken(tok1, sizeof(tok1), &n1)) { + if (!strcmp(tok1, "endbfchar")) { + break; + } + if (!pst->getToken(tok2, sizeof(tok2), &n2) || !strcmp(tok2, "endbfchar")) { + error(errSyntaxWarning, -1, "Illegal entry in bfchar block in ToUnicode CMap"); + break; + } + if (!(tok1[0] == '<' && tok1[n1 - 1] == '>' && tok2[0] == '<' && tok2[n2 - 1] == '>')) { + error(errSyntaxWarning, -1, "Illegal entry in bfchar block in ToUnicode CMap"); + continue; + } + tok1[n1 - 1] = tok2[n2 - 1] = '\0'; + if (!parseHex(tok1 + 1, n1 - 2, &code1)) { + error(errSyntaxWarning, -1, "Illegal entry in bfchar block in ToUnicode CMap"); + continue; + } + if (code1 > maxCode) { + error(errSyntaxWarning, -1, "Invalid entry in bfchar block in ToUnicode CMap"); + } + addMapping(code1, tok2 + 1, n2 - 2, 0); + ok = true; + } + pst->getToken(tok1, sizeof(tok1), &n1); + } else if (!strcmp(tok2, "beginbfrange")) { + while (pst->getToken(tok1, sizeof(tok1), &n1)) { + if (!strcmp(tok1, "endbfrange")) { + break; + } + if (!pst->getToken(tok2, sizeof(tok2), &n2) || !strcmp(tok2, "endbfrange") || !pst->getToken(tok3, sizeof(tok3), &n3) || !strcmp(tok3, "endbfrange")) { + error(errSyntaxWarning, -1, "Illegal entry in bfrange block in ToUnicode CMap"); + break; + } + if (!(tok1[0] == '<' && tok1[n1 - 1] == '>' && tok2[0] == '<' && tok2[n2 - 1] == '>')) { + error(errSyntaxWarning, -1, "Illegal entry in bfrange block in ToUnicode CMap"); + continue; + } + tok1[n1 - 1] = tok2[n2 - 1] = '\0'; + if (!parseHex(tok1 + 1, n1 - 2, &code1) || !parseHex(tok2 + 1, n2 - 2, &code2)) { + error(errSyntaxWarning, -1, "Illegal entry in bfrange block in ToUnicode CMap"); + continue; + } + if (code1 > maxCode || code2 > maxCode) { + error(errSyntaxWarning, -1, "Invalid entry in bfrange block in ToUnicode CMap"); + if (code1 > maxCode) { + code1 = maxCode; + } + if (code2 > maxCode) { + code2 = maxCode; + } + } + if (!strcmp(tok3, "[")) { + i = 0; + while (pst->getToken(tok1, sizeof(tok1), &n1) && code1 + i <= code2) { + if (!strcmp(tok1, "]")) { + break; + } + if (tok1[0] == '<' && tok1[n1 - 1] == '>') { + tok1[n1 - 1] = '\0'; + addMapping(code1 + i, tok1 + 1, n1 - 2, 0); + ok = true; + } else { + error(errSyntaxWarning, -1, "Illegal entry in bfrange block in ToUnicode CMap"); + } + ++i; + } + } else if (tok3[0] == '<' && tok3[n3 - 1] == '>') { + tok3[n3 - 1] = '\0'; + for (i = 0; code1 <= code2; ++code1, ++i) { + addMapping(code1, tok3 + 1, n3 - 2, i); + ok = true; + } + + } else { + error(errSyntaxWarning, -1, "Illegal entry in bfrange block in ToUnicode CMap"); + } + } + pst->getToken(tok1, sizeof(tok1), &n1); + } else if (!strcmp(tok2, "begincidchar")) { + // the begincidchar operator is not allowed in ToUnicode CMaps, + // but some buggy PDF generators incorrectly use + // code-to-CID-type CMaps here + error(errSyntaxWarning, -1, "Invalid 'begincidchar' operator in ToUnicode CMap"); + while (pst->getToken(tok1, sizeof(tok1), &n1)) { + if (!strcmp(tok1, "endcidchar")) { + break; + } + if (!pst->getToken(tok2, sizeof(tok2), &n2) || !strcmp(tok2, "endcidchar")) { + error(errSyntaxWarning, -1, "Illegal entry in cidchar block in ToUnicode CMap"); + break; + } + if (!(tok1[0] == '<' && tok1[n1 - 1] == '>')) { + error(errSyntaxWarning, -1, "Illegal entry in cidchar block in ToUnicode CMap"); + continue; + } + tok1[n1 - 1] = '\0'; + if (!parseHex(tok1 + 1, n1 - 2, &code1)) { + error(errSyntaxWarning, -1, "Illegal entry in cidchar block in ToUnicode CMap"); + continue; + } + if (code1 > maxCode) { + error(errSyntaxWarning, -1, "Invalid entry in cidchar block in ToUnicode CMap"); + } + addMappingInt(code1, atoi(tok2)); + ok = true; + } + pst->getToken(tok1, sizeof(tok1), &n1); + } else if (!strcmp(tok2, "begincidrange")) { + // the begincidrange operator is not allowed in ToUnicode CMaps, + // but some buggy PDF generators incorrectly use + // code-to-CID-type CMaps here + error(errSyntaxWarning, -1, "Invalid 'begincidrange' operator in ToUnicode CMap"); + while (pst->getToken(tok1, sizeof(tok1), &n1)) { + if (!strcmp(tok1, "endcidrange")) { + break; + } + if (!pst->getToken(tok2, sizeof(tok2), &n2) || !strcmp(tok2, "endcidrange") || !pst->getToken(tok3, sizeof(tok3), &n3) || !strcmp(tok3, "endcidrange")) { + error(errSyntaxWarning, -1, "Illegal entry in cidrange block in ToUnicode CMap"); + break; + } + if (!(tok1[0] == '<' && tok1[n1 - 1] == '>' && tok2[0] == '<' && tok2[n2 - 1] == '>')) { + error(errSyntaxWarning, -1, "Illegal entry in cidrange block in ToUnicode CMap"); + continue; + } + tok1[n1 - 1] = tok2[n2 - 1] = '\0'; + if (!parseHex(tok1 + 1, n1 - 2, &code1) || !parseHex(tok2 + 1, n2 - 2, &code2)) { + error(errSyntaxWarning, -1, "Illegal entry in cidrange block in ToUnicode CMap"); + continue; + } + if (code1 > maxCode || code2 > maxCode) { + error(errSyntaxWarning, -1, "Invalid entry in cidrange block in ToUnicode CMap"); + if (code2 > maxCode) { + code2 = maxCode; + } + } + for (i = atoi(tok3); code1 <= code2; ++code1, ++i) { + addMappingInt(code1, i); + ok = true; + } + } + pst->getToken(tok1, sizeof(tok1), &n1); + } else { + strcpy(tok1, tok2); + } + } + delete pst; + return ok; +} + +void CharCodeToUnicode::addMapping(CharCode code, char *uStr, int n, int offset) +{ + Unicode u; + int j; + + if (code > 0xffffff) { + // This is an arbitrary limit to avoid integer overflow issues. + // (I've seen CMaps with mappings for .) + return; + } + if (code >= map.size()) { + size_t oldLen = map.size(); + auto newLen = oldLen ? 2 * oldLen : 256; + if (code >= newLen) { + newLen = (code + 256) & ~255; + } + if (unlikely(code >= newLen)) { + error(errSyntaxWarning, -1, "Illegal code value in CharCodeToUnicode::addMapping"); + return; + } else { + map.resize(newLen, 0); + } + } + if (n <= 4) { + if (!parseHex(uStr, n, &u)) { + error(errSyntaxWarning, -1, "Illegal entry in ToUnicode CMap"); + return; + } + map[code] = u + offset; + if (!UnicodeIsValid(map[code])) { + map[code] = 0xfffd; + } + } else { + map[code] = 0; + int utf16Len = n / 4; + std::vector utf16(utf16Len); + utf16.resize(utf16Len); + for (j = 0; j < utf16Len; ++j) { + if (!parseHex(uStr + j * 4, 4, &utf16[j])) { + error(errSyntaxWarning, -1, "Illegal entry in ToUnicode CMap"); + return; + } + } + utf16[utf16Len - 1] += offset; + sMap.push_back({ code, UTF16toUCS4(utf16.data(), utf16.size()) }); + } +} + +void CharCodeToUnicode::addMappingInt(CharCode code, Unicode u) +{ + if (code > 0xffffff) { + // This is an arbitrary limit to avoid integer overflow issues. + // (I've seen CMaps with mappings for .) + return; + } + if (code >= map.size()) { + size_t oldLen = map.size(); + size_t newLen = oldLen ? 2 * oldLen : 256; + if (code >= newLen) { + newLen = (code + 256) & ~255; + } + map.resize(newLen, 0); + } + map[code] = u; +} + +CharCodeToUnicode::CharCodeToUnicode() +{ + refCnt = 1; + isIdentity = false; +} + +CharCodeToUnicode::CharCodeToUnicode(const std::optional &tagA) : tag(tagA) +{ + map.resize(256, 0); + refCnt = 1; + isIdentity = false; +} +CharCodeToUnicode::CharCodeToUnicode(const std::optional &tagA, std::vector &&mapA, std::vector &&sMapA) : tag(tagA) +{ + map = std::move(mapA); + sMap = std::move(sMapA); + refCnt = 1; + isIdentity = false; +} + +void CharCodeToUnicode::incRefCnt() +{ + ++refCnt; +} + +void CharCodeToUnicode::decRefCnt() +{ + if (--refCnt == 0) { + delete this; + } +} + +bool CharCodeToUnicode::match(const GooString *tagA) +{ + return tag && tag == tagA->toStr(); +} + +void CharCodeToUnicode::setMapping(CharCode c, Unicode *u, int len) +{ + size_t i; + int j; + + if (map.empty() || isIdentity) { + return; + } + if (len == 1) { + map[c] = u[0]; + } else { + std::optional> element; + for (i = 0; i < sMap.size(); ++i) { + if (sMap[i].c == c) { + sMap[i].u.clear(); + element = std::ref(sMap[i]); + break; + } + } + if (!element) { + sMap.emplace_back(); + element = std::ref(sMap.back()); + } + map[c] = 0; + element->get().c = c; + element->get().u.reserve(len); + for (j = 0; j < len; ++j) { + if (UnicodeIsValid(u[j])) { + element->get().u.push_back(u[j]); + } else { + element->get().u.push_back(0xfffd); + } + } + } +} + +int CharCodeToUnicode::mapToUnicode(CharCode c, Unicode const **u) const +{ + if (isIdentity) { + auto that = const_cast(this); + that->map[0] = (Unicode)c; + *u = map.data(); + return 1; + } + if (c >= map.size()) { + return 0; + } + if (map[c]) { + *u = &map[c]; + return 1; + } + for (auto i = sMap.size(); i > 0; --i) { // in reverse so CMap takes precedence + if (sMap[i - 1].c == c) { + *u = sMap[i - 1].u.data(); + return sMap[i - 1].u.size(); + } + } + return 0; +} + +int CharCodeToUnicode::mapToCharCode(const Unicode *u, CharCode *c, int usize) const +{ + // look for charcode in map + if (usize == 1 || (usize > 1 && !(*u & ~0xff))) { + if (isIdentity) { + *c = (CharCode)*u; + return 1; + } + for (CharCode i = 0; i < map.size(); i++) { + if (map[i] == *u) { + *c = i; + return 1; + } + } + *c = 'x'; + } else { + size_t j; + // for each entry in the sMap + for (const auto &element : sMap) { + // if the entry's unicode length isn't the same are usize, the strings + // are obviously different + if (element.u.size() != size_t(usize)) { + continue; + } + // compare the string char by char + for (j = 0; j < element.u.size(); j++) { + if (element.u[j] != u[j]) { + break; + } + } + + // we have the same strings + if (j == element.u.size()) { + *c = element.c; + return 1; + } + } + } + return 0; +} + +//------------------------------------------------------------------------ + +CharCodeToUnicodeCache::CharCodeToUnicodeCache(int sizeA) +{ + int i; + + size = sizeA; + cache = (CharCodeToUnicode **)gmallocn(size, sizeof(CharCodeToUnicode *)); + for (i = 0; i < size; ++i) { + cache[i] = nullptr; + } +} + +CharCodeToUnicodeCache::~CharCodeToUnicodeCache() +{ + int i; + + for (i = 0; i < size; ++i) { + if (cache[i]) { + cache[i]->decRefCnt(); + } + } + gfree(cache); +} + +CharCodeToUnicode *CharCodeToUnicodeCache::getCharCodeToUnicode(const GooString *tag) +{ + CharCodeToUnicode *ctu; + int i, j; + + if (cache[0] && cache[0]->match(tag)) { + cache[0]->incRefCnt(); + return cache[0]; + } + for (i = 1; i < size; ++i) { + if (cache[i] && cache[i]->match(tag)) { + ctu = cache[i]; + for (j = i; j >= 1; --j) { + cache[j] = cache[j - 1]; + } + cache[0] = ctu; + ctu->incRefCnt(); + return ctu; + } + } + return nullptr; +} + +void CharCodeToUnicodeCache::add(CharCodeToUnicode *ctu) +{ + int i; + + if (cache[size - 1]) { + cache[size - 1]->decRefCnt(); + } + for (i = size - 1; i >= 1; --i) { + cache[i] = cache[i - 1]; + } + cache[0] = ctu; + ctu->incRefCnt(); +} diff --git a/poppler-24.05.0/poppler/CharCodeToUnicode.h b/poppler-24.05.0/poppler/CharCodeToUnicode.h new file mode 100644 index 0000000000000000000000000000000000000000..dc2fa84c40b8ce23e0ec739ecfb35f98e19864ca --- /dev/null +++ b/poppler-24.05.0/poppler/CharCodeToUnicode.h @@ -0,0 +1,138 @@ +//======================================================================== +// +// CharCodeToUnicode.h +// +// Mapping from character codes to Unicode. +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2007 Julien Rebetez +// Copyright (C) 2007 Koji Otani +// Copyright (C) 2008, 2011, 2012, 2018, 2019, 2021, 2022 Albert Astals Cid +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019 +// Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// 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 +// +//======================================================================== + +#ifndef CHARCODETOUNICODE_H +#define CHARCODETOUNICODE_H + +#include +#include +#include + +#include "poppler-config.h" +#include "CharTypes.h" + +class GooString; + +//------------------------------------------------------------------------ + +class CharCodeToUnicode +{ + friend class UnicodeToCharCode; + +public: + // Create an identity mapping (Unicode = CharCode). + static CharCodeToUnicode *makeIdentityMapping(); + + // Read the CID-to-Unicode mapping for from the file + // specified by . Sets the initial reference count to 1. + // Returns NULL on failure. + static CharCodeToUnicode *parseCIDToUnicode(const char *fileName, const GooString *collection); + + // Create the CharCode-to-Unicode mapping for an 8-bit font. + // is an array of 256 Unicode indexes. Sets the initial + // reference count to 1. + static CharCodeToUnicode *make8BitToUnicode(Unicode *toUnicode); + + // Parse a ToUnicode CMap for an 8- or 16-bit font. + static CharCodeToUnicode *parseCMap(const GooString *buf, int nBits); + static CharCodeToUnicode *parseCMapFromFile(const GooString *fileName, int nBits); + + // Parse a ToUnicode CMap for an 8- or 16-bit font, merging it into + // . + void mergeCMap(const GooString *buf, int nBits); + + ~CharCodeToUnicode() = default; + + CharCodeToUnicode(const CharCodeToUnicode &) = delete; + CharCodeToUnicode &operator=(const CharCodeToUnicode &) = delete; + + void incRefCnt(); + void decRefCnt(); + + // Return true if this mapping matches the specified . + bool match(const GooString *tagA); + + // Set the mapping for . + void setMapping(CharCode c, Unicode *u, int len); + + // Map a CharCode to Unicode. Returns a pointer in u to internal storage + // so never store the pointers it returns, just the data, otherwise + // your pointed values might get changed by future calls + int mapToUnicode(CharCode c, Unicode const **u) const; + + // Map a Unicode to CharCode. + int mapToCharCode(const Unicode *u, CharCode *c, int usize) const; + +private: + struct CharCodeToUnicodeString + { + CharCode c; + std::vector u; + }; + bool parseCMap1(int (*getCharFunc)(void *), void *data, int nBits); + void addMapping(CharCode code, char *uStr, int n, int offset); + void addMappingInt(CharCode code, Unicode u); + CharCodeToUnicode(); + explicit CharCodeToUnicode(const std::optional &tagA); + CharCodeToUnicode(const std::optional &tagA, std::vector &&mapA, std::vector &&sMapA); + + const std::optional tag; + std::vector map; + std::vector sMap; + std::atomic_int refCnt; + bool isIdentity; +}; + +//------------------------------------------------------------------------ + +class CharCodeToUnicodeCache +{ +public: + explicit CharCodeToUnicodeCache(int sizeA); + ~CharCodeToUnicodeCache(); + + CharCodeToUnicodeCache(const CharCodeToUnicodeCache &) = delete; + CharCodeToUnicodeCache &operator=(const CharCodeToUnicodeCache &) = delete; + + // Get the CharCodeToUnicode object for . Increments its + // reference count; there will be one reference for the cache plus + // one for the caller of this function. Returns NULL on failure. + CharCodeToUnicode *getCharCodeToUnicode(const GooString *tag); + + // Insert into the cache, in the most-recently-used position. + void add(CharCodeToUnicode *ctu); + +private: + CharCodeToUnicode **cache; + int size; +}; + +#endif diff --git a/poppler-24.05.0/poppler/CharTypes.h b/poppler-24.05.0/poppler/CharTypes.h new file mode 100644 index 0000000000000000000000000000000000000000..d0df630d0c937cc9af2cf09882cde242a7a8097f --- /dev/null +++ b/poppler-24.05.0/poppler/CharTypes.h @@ -0,0 +1,24 @@ +//======================================================================== +// +// CharTypes.h +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +#ifndef CHARTYPES_H +#define CHARTYPES_H + +// Unicode character. +typedef unsigned int Unicode; + +// Character ID for CID character collections. +typedef unsigned int CID; + +// This is large enough to hold any of the following: +// - 8-bit char code +// - 16-bit CID +// - Unicode +typedef unsigned int CharCode; + +#endif diff --git a/poppler-24.05.0/poppler/CourierBoldObliqueWidths.gperf b/poppler-24.05.0/poppler/CourierBoldObliqueWidths.gperf new file mode 100644 index 0000000000000000000000000000000000000000..f713ff5c3abbf3fb1cb5ccd122bb7c58f2b05026 --- /dev/null +++ b/poppler-24.05.0/poppler/CourierBoldObliqueWidths.gperf @@ -0,0 +1,330 @@ +%{ +#include +#include "BuiltinFontWidth.h" +%} +%language=ANSI-C +%define initializer-suffix ,0 +%define lookup-function-name CourierBoldObliqueWidthsLookup +%struct-type +%omit-struct-type +%readonly-tables +struct BuiltinFontWidth +%% +#### +Ntilde, 600 +rcaron, 600 +kcommaaccent, 600 +Ncommaaccent, 600 +Zacute, 600 +comma, 600 +cedilla, 600 +plusminus, 600 +circumflex, 600 +dotaccent, 600 +edotaccent, 600 +asciitilde, 600 +colon, 600 +onehalf, 600 +dollar, 600 +Lcaron, 600 +ntilde, 600 +Aogonek, 600 +ncommaaccent, 600 +minus, 600 +Iogonek, 600 +zacute, 600 +yen, 600 +space, 600 +Omacron, 600 +questiondown, 600 +emdash, 600 +Agrave, 600 +three, 600 +numbersign, 600 +lcaron, 600 +A, 600 +B, 600 +C, 600 +aogonek, 600 +D, 600 +E, 600 +onequarter, 600 +F, 600 +G, 600 +H, 600 +I, 600 +J, 600 +K, 600 +iogonek, 600 +backslash, 600 +L, 600 +periodcentered, 600 +M, 600 +N, 600 +omacron, 600 +Tcommaaccent, 600 +O, 600 +P, 600 +Q, 600 +Uhungarumlaut, 600 +R, 600 +Aacute, 600 +caron, 600 +S, 600 +T, 600 +U, 600 +agrave, 600 +V, 600 +W, 600 +X, 600 +question, 600 +equal, 600 +Y, 600 +Z, 600 +four, 600 +a, 600 +Gcommaaccent, 600 +b, 600 +c, 600 +d, 600 +e, 600 +f, 600 +g, 600 +bullet, 600 +h, 600 +i, 600 +Oslash, 600 +dagger, 600 +j, 600 +k, 600 +l, 600 +m, 600 +n, 600 +tcommaaccent, 600 +o, 600 +ordfeminine, 600 +ring, 600 +p, 600 +q, 600 +uhungarumlaut, 600 +r, 600 +twosuperior, 600 +aacute, 600 +s, 600 +OE, 600 +t, 600 +divide, 600 +u, 600 +Ccaron, 600 +v, 600 +w, 600 +x, 600 +y, 600 +z, 600 +Gbreve, 600 +commaaccent, 600 +hungarumlaut, 600 +Idotaccent, 600 +Nacute, 600 +quotedbl, 600 +gcommaaccent, 600 +mu, 600 +greaterequal, 600 +Scaron, 600 +Lslash, 600 +semicolon, 600 +oslash, 600 +lessequal, 600 +lozenge, 600 +parenright, 600 +ccaron, 600 +Ecircumflex, 600 +gbreve, 600 +trademark, 600 +daggerdbl, 600 +nacute, 600 +macron, 600 +Otilde, 600 +Emacron, 600 +ellipsis, 600 +scaron, 600 +AE, 600 +Ucircumflex, 600 +lslash, 600 +quotedblleft, 600 +guilsinglright, 600 +hyphen, 600 +quotesingle, 600 +eight, 600 +exclamdown, 600 +endash, 600 +oe, 600 +Abreve, 600 +Umacron, 600 +ecircumflex, 600 +Adieresis, 600 +copyright, 600 +Egrave, 600 +slash, 600 +Edieresis, 600 +otilde, 600 +Idieresis, 600 +parenleft, 600 +one, 600 +emacron, 600 +Odieresis, 600 +ucircumflex, 600 +bracketleft, 600 +Ugrave, 600 +quoteright, 600 +Udieresis, 600 +perthousand, 600 +Ydieresis, 600 +umacron, 600 +abreve, 600 +Eacute, 600 +adieresis, 600 +egrave, 600 +edieresis, 600 +idieresis, 600 +Eth, 600 +ae, 600 +asterisk, 600 +odieresis, 600 +Uacute, 600 +ugrave, 600 +nine, 600 +five, 600 +udieresis, 600 +Zcaron, 600 +Scommaaccent, 600 +threequarters, 600 +guillemotright, 600 +Ccedilla, 600 +ydieresis, 600 +tilde, 600 +at, 600 +eacute, 600 +underscore, 600 +Euro, 600 +Dcroat, 600 +multiply, 600 +zero, 600 +eth, 600 +Scedilla, 600 +Ograve, 600 +Racute, 600 +partialdiff, 600 +uacute, 600 +braceleft, 600 +Thorn, 600 +zcaron, 600 +scommaaccent, 600 +ccedilla, 600 +Dcaron, 600 +dcroat, 600 +Ocircumflex, 600 +Oacute, 600 +scedilla, 600 +ogonek, 600 +ograve, 600 +racute, 600 +Tcaron, 600 +Eogonek, 600 +thorn, 600 +degree, 600 +registered, 600 +radical, 600 +Aring, 600 +percent, 600 +six, 600 +paragraph, 600 +dcaron, 600 +Uogonek, 600 +two, 600 +summation, 600 +Igrave, 600 +Lacute, 600 +ocircumflex, 600 +oacute, 600 +Uring, 600 +Lcommaaccent, 600 +tcaron, 600 +eogonek, 600 +Delta, 600 +Ohungarumlaut, 600 +asciicircum, 600 +aring, 600 +grave, 600 +uogonek, 600 +bracketright, 600 +Iacute, 600 +ampersand, 600 +igrave, 600 +lacute, 600 +Ncaron, 600 +plus, 600 +uring, 600 +quotesinglbase, 600 +lcommaaccent, 600 +Yacute, 600 +ohungarumlaut, 600 +threesuperior, 600 +acute, 600 +section, 600 +dieresis, 600 +iacute, 600 +quotedblbase, 600 +ncaron, 600 +florin, 600 +yacute, 600 +Rcommaaccent, 600 +fi, 600 +fl, 600 +Acircumflex, 600 +Cacute, 600 +Icircumflex, 600 +guillemotleft, 600 +germandbls, 600 +Amacron, 600 +seven, 600 +Sacute, 600 +ordmasculine, 600 +dotlessi, 600 +sterling, 600 +notequal, 600 +Imacron, 600 +rcommaaccent, 600 +Zdotaccent, 600 +acircumflex, 600 +cacute, 600 +Ecaron, 600 +icircumflex, 600 +braceright, 600 +quotedblright, 600 +amacron, 600 +sacute, 600 +imacron, 600 +cent, 600 +currency, 600 +logicalnot, 600 +zdotaccent, 600 +Atilde, 600 +breve, 600 +bar, 600 +fraction, 600 +less, 600 +ecaron, 600 +guilsinglleft, 600 +exclam, 600 +period, 600 +Rcaron, 600 +Kcommaaccent, 600 +greater, 600 +atilde, 600 +brokenbar, 600 +quoteleft, 600 +Edotaccent, 600 +onesuperior, 600 +#### +%% diff --git a/poppler-24.05.0/poppler/CourierBoldObliqueWidths.pregenerated.c b/poppler-24.05.0/poppler/CourierBoldObliqueWidths.pregenerated.c new file mode 100644 index 0000000000000000000000000000000000000000..1232aeebcb49440872ce711ab74ae32eeb2bcf68 --- /dev/null +++ b/poppler-24.05.0/poppler/CourierBoldObliqueWidths.pregenerated.c @@ -0,0 +1,1437 @@ +/* ANSI-C code produced by gperf version 3.1 */ +/* Command-line: gperf poppler/CourierBoldObliqueWidths.gperf */ +/* Computed positions: -k'1-2,5,$' */ + +#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) && ('-' == 45) && ('.' == 46) && ('/' == 47) \ + && ('0' == 48) && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) && ('=' == 61) && ('>' == 62) \ + && ('?' == 63) && ('A' == 65) && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) && ('N' == 78) \ + && ('O' == 79) && ('P' == 80) && ('Q' == 81) && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ + && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) && ('k' == 107) && ('l' == 108) \ + && ('m' == 109) && ('n' == 110) && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ + && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) +/* The character set is not based on ISO-646. */ +# error "gperf generated tables don't work with this execution character set. Please report a bug to ." +#endif + +#line 1 "poppler/CourierBoldObliqueWidths.gperf" + +#include +#include "BuiltinFontWidth.h" + +#define TOTAL_KEYWORDS 315 +#define MIN_WORD_LENGTH 1 +#define MAX_WORD_LENGTH 14 +#define MIN_HASH_VALUE 1 +#define MAX_HASH_VALUE 1041 +/* maximum key range = 1041, duplicates = 0 */ + +#ifdef __GNUC__ +__inline +#else +# ifdef __cplusplus +inline +# endif +#endif + static unsigned int + hash(register const char *str, register size_t len) +{ + static const unsigned short asso_values[] = { 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 270, 415, 28, 8, 150, 390, 290, 375, 370, 335, 5, 455, 330, 405, 355, 325, 310, 3, 320, 160, 240, 225, + 145, 70, 410, 460, 1042, 1042, 1042, 1042, 1042, 1042, 20, 345, 30, 115, 0, 395, 140, 165, 135, 35, 380, 170, 130, 15, 45, 215, 260, 100, 65, + 10, 155, 400, 300, 305, 280, 315, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042 }; + register unsigned int hval = len; + + switch (hval) { + default: + hval += asso_values[(unsigned char)str[4]]; + /*FALLTHROUGH*/ + case 4: + case 3: + case 2: + hval += asso_values[(unsigned char)str[1]]; + /*FALLTHROUGH*/ + case 1: + hval += asso_values[(unsigned char)str[0]]; + break; + } + return hval + asso_values[(unsigned char)str[len - 1]]; +} + +const struct BuiltinFontWidth *CourierBoldObliqueWidthsLookup(register const char *str, register size_t len) +{ + static const struct BuiltinFontWidth wordlist[] = { { "", 0 }, +#line 90 "poppler/CourierBoldObliqueWidths.gperf" + { "e", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 70 "poppler/CourierBoldObliqueWidths.gperf" + { "R", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 57 "poppler/CourierBoldObliqueWidths.gperf" + { "K", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 49 "poppler/CourierBoldObliqueWidths.gperf" + { "D", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 115 "poppler/CourierBoldObliqueWidths.gperf" + { "t", 600 }, +#line 191 "poppler/CourierBoldObliqueWidths.gperf" + { "ae", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 102 "poppler/CourierBoldObliqueWidths.gperf" + { "n", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 207 "poppler/CourierBoldObliqueWidths.gperf" + { "eacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 216 "poppler/CourierBoldObliqueWidths.gperf" + { "Racute", 600 }, + { "", 0 }, +#line 85 "poppler/CourierBoldObliqueWidths.gperf" + { "a", 600 }, +#line 206 "poppler/CourierBoldObliqueWidths.gperf" + { "at", 600 }, + { "", 0 }, +#line 308 "poppler/CourierBoldObliqueWidths.gperf" + { "cent", 600 }, + { "", 0 }, + { "", 0 }, +#line 161 "poppler/CourierBoldObliqueWidths.gperf" + { "oe", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 145 "poppler/CourierBoldObliqueWidths.gperf" + { "nacute", 600 }, + { "", 0 }, +#line 254 "poppler/CourierBoldObliqueWidths.gperf" + { "Delta", 600 }, + { "", 0 }, +#line 273 "poppler/CourierBoldObliqueWidths.gperf" + { "acute", 600 }, +#line 112 "poppler/CourierBoldObliqueWidths.gperf" + { "aacute", 600 }, +#line 47 "poppler/CourierBoldObliqueWidths.gperf" + { "C", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 88 "poppler/CourierBoldObliqueWidths.gperf" + { "c", 600 }, + { "", 0 }, +#line 173 "poppler/CourierBoldObliqueWidths.gperf" + { "one", 600 }, +#line 285 "poppler/CourierBoldObliqueWidths.gperf" + { "Cacute", 600 }, + { "", 0 }, +#line 300 "poppler/CourierBoldObliqueWidths.gperf" + { "cacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 98 "poppler/CourierBoldObliqueWidths.gperf" + { "j", 600 }, + { "", 0 }, + { "", 0 }, +#line 210 "poppler/CourierBoldObliqueWidths.gperf" + { "Dcroat", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 249 "poppler/CourierBoldObliqueWidths.gperf" + { "oacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 72 "poppler/CourierBoldObliqueWidths.gperf" + { "caron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 104 "poppler/CourierBoldObliqueWidths.gperf" + { "o", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 317 "poppler/CourierBoldObliqueWidths.gperf" + { "ecaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 321 "poppler/CourierBoldObliqueWidths.gperf" + { "Rcaron", 600 }, +#line 290 "poppler/CourierBoldObliqueWidths.gperf" + { "seven", 600 }, +#line 306 "poppler/CourierBoldObliqueWidths.gperf" + { "sacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 224 "poppler/CourierBoldObliqueWidths.gperf" + { "Dcaron", 600 }, + { "", 0 }, +#line 252 "poppler/CourierBoldObliqueWidths.gperf" + { "tcaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 26 "poppler/CourierBoldObliqueWidths.gperf" + { "colon", 600 }, +#line 278 "poppler/CourierBoldObliqueWidths.gperf" + { "ncaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 125 "poppler/CourierBoldObliqueWidths.gperf" + { "commaaccent", 600 }, + { "", 0 }, + { "", 0 }, +#line 135 "poppler/CourierBoldObliqueWidths.gperf" + { "semicolon", 600 }, +#line 19 "poppler/CourierBoldObliqueWidths.gperf" + { "comma", 600 }, +#line 235 "poppler/CourierBoldObliqueWidths.gperf" + { "degree", 600 }, + { "", 0 }, + { "", 0 }, +#line 118 "poppler/CourierBoldObliqueWidths.gperf" + { "Ccaron", 600 }, + { "", 0 }, +#line 140 "poppler/CourierBoldObliqueWidths.gperf" + { "ccaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 113 "poppler/CourierBoldObliqueWidths.gperf" + { "s", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 231 "poppler/CourierBoldObliqueWidths.gperf" + { "racute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 79 "poppler/CourierBoldObliqueWidths.gperf" + { "X", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 30 "poppler/CourierBoldObliqueWidths.gperf" + { "ntilde", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 205 "poppler/CourierBoldObliqueWidths.gperf" + { "tilde", 600 }, +#line 324 "poppler/CourierBoldObliqueWidths.gperf" + { "atilde", 600 }, + { "", 0 }, + { "", 0 }, +#line 196 "poppler/CourierBoldObliqueWidths.gperf" + { "nine", 600 }, +#line 24 "poppler/CourierBoldObliqueWidths.gperf" + { "edotaccent", 600 }, +#line 105 "poppler/CourierBoldObliqueWidths.gperf" + { "ordfeminine", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 158 "poppler/CourierBoldObliqueWidths.gperf" + { "eight", 600 }, +#line 150 "poppler/CourierBoldObliqueWidths.gperf" + { "scaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 276 "poppler/CourierBoldObliqueWidths.gperf" + { "iacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 170 "poppler/CourierBoldObliqueWidths.gperf" + { "otilde", 600 }, +#line 292 "poppler/CourierBoldObliqueWidths.gperf" + { "ordmasculine", 600 }, +#line 213 "poppler/CourierBoldObliqueWidths.gperf" + { "eth", 600 }, + { "", 0 }, +#line 42 "poppler/CourierBoldObliqueWidths.gperf" + { "three", 600 }, +#line 225 "poppler/CourierBoldObliqueWidths.gperf" + { "dcroat", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 281 "poppler/CourierBoldObliqueWidths.gperf" + { "Rcommaaccent", 600 }, +#line 185 "poppler/CourierBoldObliqueWidths.gperf" + { "Eacute", 600 }, +#line 322 "poppler/CourierBoldObliqueWidths.gperf" + { "Kcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 218 "poppler/CourierBoldObliqueWidths.gperf" + { "uacute", 600 }, +#line 103 "poppler/CourierBoldObliqueWidths.gperf" + { "tcommaaccent", 600 }, + { "", 0 }, +#line 166 "poppler/CourierBoldObliqueWidths.gperf" + { "copyright", 600 }, +#line 43 "poppler/CourierBoldObliqueWidths.gperf" + { "numbersign", 600 }, +#line 15 "poppler/CourierBoldObliqueWidths.gperf" + { "rcaron", 600 }, +#line 32 "poppler/CourierBoldObliqueWidths.gperf" + { "ncommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 110 "poppler/CourierBoldObliqueWidths.gperf" + { "r", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 264 "poppler/CourierBoldObliqueWidths.gperf" + { "lacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 23 "poppler/CourierBoldObliqueWidths.gperf" + { "dotaccent", 600 }, +#line 234 "poppler/CourierBoldObliqueWidths.gperf" + { "thorn", 600 }, +#line 242 "poppler/CourierBoldObliqueWidths.gperf" + { "dcaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 146 "poppler/CourierBoldObliqueWidths.gperf" + { "macron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 203 "poppler/CourierBoldObliqueWidths.gperf" + { "Ccedilla", 600 }, +#line 274 "poppler/CourierBoldObliqueWidths.gperf" + { "section", 600 }, +#line 223 "poppler/CourierBoldObliqueWidths.gperf" + { "ccedilla", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 20 "poppler/CourierBoldObliqueWidths.gperf" + { "cedilla", 600 }, + { "", 0 }, + { "", 0 }, +#line 25 "poppler/CourierBoldObliqueWidths.gperf" + { "asciitilde", 600 }, +#line 89 "poppler/CourierBoldObliqueWidths.gperf" + { "d", 600 }, +#line 239 "poppler/CourierBoldObliqueWidths.gperf" + { "percent", 600 }, + { "", 0 }, + { "", 0 }, +#line 288 "poppler/CourierBoldObliqueWidths.gperf" + { "germandbls", 600 }, + { "", 0 }, +#line 138 "poppler/CourierBoldObliqueWidths.gperf" + { "lozenge", 600 }, + { "", 0 }, +#line 316 "poppler/CourierBoldObliqueWidths.gperf" + { "less", 600 }, + { "", 0 }, +#line 97 "poppler/CourierBoldObliqueWidths.gperf" + { "dagger", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 258 "poppler/CourierBoldObliqueWidths.gperf" + { "grave", 600 }, +#line 301 "poppler/CourierBoldObliqueWidths.gperf" + { "Ecaron", 600 }, +#line 222 "poppler/CourierBoldObliqueWidths.gperf" + { "scommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 160 "poppler/CourierBoldObliqueWidths.gperf" + { "endash", 600 }, +#line 174 "poppler/CourierBoldObliqueWidths.gperf" + { "emacron", 600 }, +#line 201 "poppler/CourierBoldObliqueWidths.gperf" + { "threequarters", 600 }, + { "", 0 }, + { "", 0 }, +#line 232 "poppler/CourierBoldObliqueWidths.gperf" + { "Tcaron", 600 }, + { "", 0 }, +#line 228 "poppler/CourierBoldObliqueWidths.gperf" + { "scedilla", 600 }, + { "", 0 }, + { "", 0 }, +#line 101 "poppler/CourierBoldObliqueWidths.gperf" + { "m", 600 }, + { "", 0 }, + { "", 0 }, +#line 245 "poppler/CourierBoldObliqueWidths.gperf" + { "summation", 600 }, +#line 310 "poppler/CourierBoldObliqueWidths.gperf" + { "logicalnot", 600 }, +#line 44 "poppler/CourierBoldObliqueWidths.gperf" + { "lcaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 172 "poppler/CourierBoldObliqueWidths.gperf" + { "parenleft", 600 }, +#line 139 "poppler/CourierBoldObliqueWidths.gperf" + { "parenright", 600 }, +#line 95 "poppler/CourierBoldObliqueWidths.gperf" + { "i", 600 }, +#line 305 "poppler/CourierBoldObliqueWidths.gperf" + { "amacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 194 "poppler/CourierBoldObliqueWidths.gperf" + { "Uacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 208 "poppler/CourierBoldObliqueWidths.gperf" + { "underscore", 600 }, +#line 92 "poppler/CourierBoldObliqueWidths.gperf" + { "g", 600 }, +#line 297 "poppler/CourierBoldObliqueWidths.gperf" + { "rcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, +#line 37 "poppler/CourierBoldObliqueWidths.gperf" + { "space", 600 }, +#line 28 "poppler/CourierBoldObliqueWidths.gperf" + { "dollar", 600 }, + { "", 0 }, +#line 272 "poppler/CourierBoldObliqueWidths.gperf" + { "threesuperior", 600 }, +#line 188 "poppler/CourierBoldObliqueWidths.gperf" + { "edieresis", 600 }, +#line 236 "poppler/CourierBoldObliqueWidths.gperf" + { "registered", 600 }, +#line 78 "poppler/CourierBoldObliqueWidths.gperf" + { "W", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 64 "poppler/CourierBoldObliqueWidths.gperf" + { "omacron", 600 }, +#line 36 "poppler/CourierBoldObliqueWidths.gperf" + { "yen", 600 }, + { "", 0 }, + { "", 0 }, +#line 50 "poppler/CourierBoldObliqueWidths.gperf" + { "E", 600 }, + { "", 0 }, +#line 293 "poppler/CourierBoldObliqueWidths.gperf" + { "dotlessi", 600 }, + { "", 0 }, +#line 327 "poppler/CourierBoldObliqueWidths.gperf" + { "Edotaccent", 600 }, +#line 71 "poppler/CourierBoldObliqueWidths.gperf" + { "Aacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 186 "poppler/CourierBoldObliqueWidths.gperf" + { "adieresis", 600 }, + { "", 0 }, +#line 117 "poppler/CourierBoldObliqueWidths.gperf" + { "u", 600 }, + { "", 0 }, + { "", 0 }, +#line 144 "poppler/CourierBoldObliqueWidths.gperf" + { "daggerdbl", 600 }, + { "", 0 }, +#line 280 "poppler/CourierBoldObliqueWidths.gperf" + { "yacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 74 "poppler/CourierBoldObliqueWidths.gperf" + { "T", 600 }, +#line 130 "poppler/CourierBoldObliqueWidths.gperf" + { "gcommaaccent", 600 }, +#line 275 "poppler/CourierBoldObliqueWidths.gperf" + { "dieresis", 600 }, + { "", 0 }, +#line 51 "poppler/CourierBoldObliqueWidths.gperf" + { "onequarter", 600 }, +#line 328 "poppler/CourierBoldObliqueWidths.gperf" + { "onesuperior", 600 }, +#line 237 "poppler/CourierBoldObliqueWidths.gperf" + { "radical", 600 }, +#line 190 "poppler/CourierBoldObliqueWidths.gperf" + { "Eth", 600 }, + { "", 0 }, + { "", 0 }, +#line 94 "poppler/CourierBoldObliqueWidths.gperf" + { "h", 600 }, + { "", 0 }, + { "", 0 }, +#line 193 "poppler/CourierBoldObliqueWidths.gperf" + { "odieresis", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 100 "poppler/CourierBoldObliqueWidths.gperf" + { "l", 600 }, +#line 65 "poppler/CourierBoldObliqueWidths.gperf" + { "Tcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 136 "poppler/CourierBoldObliqueWidths.gperf" + { "oslash", 600 }, + { "", 0 }, + { "", 0 }, +#line 137 "poppler/CourierBoldObliqueWidths.gperf" + { "lessequal", 600 }, +#line 159 "poppler/CourierBoldObliqueWidths.gperf" + { "exclamdown", 600 }, +#line 35 "poppler/CourierBoldObliqueWidths.gperf" + { "zacute", 600 }, +#line 269 "poppler/CourierBoldObliqueWidths.gperf" + { "lcommaaccent", 600 }, + { "", 0 }, +#line 209 "poppler/CourierBoldObliqueWidths.gperf" + { "Euro", 600 }, + { "", 0 }, +#line 291 "poppler/CourierBoldObliqueWidths.gperf" + { "Sacute", 600 }, +#line 323 "poppler/CourierBoldObliqueWidths.gperf" + { "greater", 600 }, +#line 244 "poppler/CourierBoldObliqueWidths.gperf" + { "two", 600 }, + { "", 0 }, +#line 220 "poppler/CourierBoldObliqueWidths.gperf" + { "Thorn", 600 }, +#line 256 "poppler/CourierBoldObliqueWidths.gperf" + { "asciicircum", 600 }, +#line 126 "poppler/CourierBoldObliqueWidths.gperf" + { "hungarumlaut", 600 }, + { "", 0 }, +#line 212 "poppler/CourierBoldObliqueWidths.gperf" + { "zero", 600 }, + { "", 0 }, +#line 40 "poppler/CourierBoldObliqueWidths.gperf" + { "emdash", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 116 "poppler/CourierBoldObliqueWidths.gperf" + { "divide", 600 }, + { "", 0 }, +#line 271 "poppler/CourierBoldObliqueWidths.gperf" + { "ohungarumlaut", 600 }, +#line 262 "poppler/CourierBoldObliqueWidths.gperf" + { "ampersand", 600 }, + { "", 0 }, +#line 164 "poppler/CourierBoldObliqueWidths.gperf" + { "ecircumflex", 600 }, + { "", 0 }, + { "", 0 }, +#line 106 "poppler/CourierBoldObliqueWidths.gperf" + { "ring", 600 }, + { "", 0 }, +#line 320 "poppler/CourierBoldObliqueWidths.gperf" + { "period", 600 }, + { "", 0 }, +#line 318 "poppler/CourierBoldObliqueWidths.gperf" + { "guilsinglleft", 600 }, +#line 155 "poppler/CourierBoldObliqueWidths.gperf" + { "guilsinglright", 600 }, + { "", 0 }, + { "", 0 }, +#line 307 "poppler/CourierBoldObliqueWidths.gperf" + { "imacron", 600 }, + { "", 0 }, +#line 61 "poppler/CourierBoldObliqueWidths.gperf" + { "periodcentered", 600 }, + { "", 0 }, +#line 227 "poppler/CourierBoldObliqueWidths.gperf" + { "Oacute", 600 }, + { "", 0 }, +#line 294 "poppler/CourierBoldObliqueWidths.gperf" + { "sterling", 600 }, + { "", 0 }, + { "", 0 }, +#line 299 "poppler/CourierBoldObliqueWidths.gperf" + { "acircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 33 "poppler/CourierBoldObliqueWidths.gperf" + { "minus", 600 }, +#line 312 "poppler/CourierBoldObliqueWidths.gperf" + { "Atilde", 600 }, +#line 148 "poppler/CourierBoldObliqueWidths.gperf" + { "Emacron", 600 }, + { "", 0 }, + { "", 0 }, +#line 257 "poppler/CourierBoldObliqueWidths.gperf" + { "aring", 600 }, +#line 261 "poppler/CourierBoldObliqueWidths.gperf" + { "Iacute", 600 }, +#line 183 "poppler/CourierBoldObliqueWidths.gperf" + { "umacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 221 "poppler/CourierBoldObliqueWidths.gperf" + { "zcaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 133 "poppler/CourierBoldObliqueWidths.gperf" + { "Scaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 248 "poppler/CourierBoldObliqueWidths.gperf" + { "ocircumflex", 600 }, + { "", 0 }, + { "", 0 }, +#line 189 "poppler/CourierBoldObliqueWidths.gperf" + { "idieresis", 600 }, + { "", 0 }, +#line 157 "poppler/CourierBoldObliqueWidths.gperf" + { "quotesingle", 600 }, +#line 277 "poppler/CourierBoldObliqueWidths.gperf" + { "quotedblbase", 600 }, + { "", 0 }, +#line 268 "poppler/CourierBoldObliqueWidths.gperf" + { "quotesinglbase", 600 }, + { "", 0 }, +#line 107 "poppler/CourierBoldObliqueWidths.gperf" + { "p", 600 }, +#line 132 "poppler/CourierBoldObliqueWidths.gperf" + { "greaterequal", 600 }, + { "", 0 }, +#line 326 "poppler/CourierBoldObliqueWidths.gperf" + { "quoteleft", 600 }, +#line 179 "poppler/CourierBoldObliqueWidths.gperf" + { "quoteright", 600 }, + { "", 0 }, +#line 154 "poppler/CourierBoldObliqueWidths.gperf" + { "quotedblleft", 600 }, +#line 304 "poppler/CourierBoldObliqueWidths.gperf" + { "quotedblright", 600 }, +#line 169 "poppler/CourierBoldObliqueWidths.gperf" + { "Edieresis", 600 }, + { "", 0 }, +#line 128 "poppler/CourierBoldObliqueWidths.gperf" + { "Nacute", 600 }, +#line 131 "poppler/CourierBoldObliqueWidths.gperf" + { "mu", 600 }, + { "", 0 }, +#line 198 "poppler/CourierBoldObliqueWidths.gperf" + { "udieresis", 600 }, + { "", 0 }, +#line 270 "poppler/CourierBoldObliqueWidths.gperf" + { "Yacute", 600 }, +#line 253 "poppler/CourierBoldObliqueWidths.gperf" + { "eogonek", 600 }, +#line 80 "poppler/CourierBoldObliqueWidths.gperf" + { "question", 600 }, + { "", 0 }, +#line 313 "poppler/CourierBoldObliqueWidths.gperf" + { "breve", 600 }, +#line 77 "poppler/CourierBoldObliqueWidths.gperf" + { "V", 600 }, +#line 39 "poppler/CourierBoldObliqueWidths.gperf" + { "questiondown", 600 }, + { "", 0 }, +#line 266 "poppler/CourierBoldObliqueWidths.gperf" + { "plus", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 149 "poppler/CourierBoldObliqueWidths.gperf" + { "ellipsis", 600 }, + { "", 0 }, + { "", 0 }, +#line 319 "poppler/CourierBoldObliqueWidths.gperf" + { "exclam", 600 }, + { "", 0 }, + { "", 0 }, +#line 219 "poppler/CourierBoldObliqueWidths.gperf" + { "braceleft", 600 }, +#line 303 "poppler/CourierBoldObliqueWidths.gperf" + { "braceright", 600 }, +#line 156 "poppler/CourierBoldObliqueWidths.gperf" + { "hyphen", 600 }, +#line 48 "poppler/CourierBoldObliqueWidths.gperf" + { "aogonek", 600 }, +#line 314 "poppler/CourierBoldObliqueWidths.gperf" + { "bar", 600 }, + { "", 0 }, +#line 311 "poppler/CourierBoldObliqueWidths.gperf" + { "zdotaccent", 600 }, +#line 153 "poppler/CourierBoldObliqueWidths.gperf" + { "lslash", 600 }, +#line 86 "poppler/CourierBoldObliqueWidths.gperf" + { "Gcommaaccent", 600 }, +#line 309 "poppler/CourierBoldObliqueWidths.gperf" + { "currency", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 75 "poppler/CourierBoldObliqueWidths.gperf" + { "U", 600 }, +#line 27 "poppler/CourierBoldObliqueWidths.gperf" + { "onehalf", 600 }, +#line 109 "poppler/CourierBoldObliqueWidths.gperf" + { "uhungarumlaut", 600 }, + { "", 0 }, + { "", 0 }, +#line 147 "poppler/CourierBoldObliqueWidths.gperf" + { "Otilde", 600 }, + { "", 0 }, +#line 287 "poppler/CourierBoldObliqueWidths.gperf" + { "guillemotleft", 600 }, +#line 202 "poppler/CourierBoldObliqueWidths.gperf" + { "guillemotright", 600 }, + { "", 0 }, +#line 247 "poppler/CourierBoldObliqueWidths.gperf" + { "Lacute", 600 }, +#line 163 "poppler/CourierBoldObliqueWidths.gperf" + { "Umacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 18 "poppler/CourierBoldObliqueWidths.gperf" + { "Zacute", 600 }, + { "", 0 }, +#line 295 "poppler/CourierBoldObliqueWidths.gperf" + { "notequal", 600 }, +#line 143 "poppler/CourierBoldObliqueWidths.gperf" + { "trademark", 600 }, + { "", 0 }, +#line 265 "poppler/CourierBoldObliqueWidths.gperf" + { "Ncaron", 600 }, +#line 200 "poppler/CourierBoldObliqueWidths.gperf" + { "Scommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 181 "poppler/CourierBoldObliqueWidths.gperf" + { "perthousand", 600 }, + { "", 0 }, +#line 240 "poppler/CourierBoldObliqueWidths.gperf" + { "six", 600 }, + { "", 0 }, + { "", 0 }, +#line 302 "poppler/CourierBoldObliqueWidths.gperf" + { "icircumflex", 600 }, + { "", 0 }, +#line 214 "poppler/CourierBoldObliqueWidths.gperf" + { "Scedilla", 600 }, + { "", 0 }, + { "", 0 }, +#line 93 "poppler/CourierBoldObliqueWidths.gperf" + { "bullet", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 108 "poppler/CourierBoldObliqueWidths.gperf" + { "q", 600 }, +#line 289 "poppler/CourierBoldObliqueWidths.gperf" + { "Amacron", 600 }, + { "", 0 }, + { "", 0 }, +#line 127 "poppler/CourierBoldObliqueWidths.gperf" + { "Idotaccent", 600 }, +#line 141 "poppler/CourierBoldObliqueWidths.gperf" + { "Ecircumflex", 600 }, + { "", 0 }, +#line 315 "poppler/CourierBoldObliqueWidths.gperf" + { "fraction", 600 }, +#line 180 "poppler/CourierBoldObliqueWidths.gperf" + { "Udieresis", 600 }, + { "", 0 }, +#line 176 "poppler/CourierBoldObliqueWidths.gperf" + { "ucircumflex", 600 }, + { "", 0 }, + { "", 0 }, +#line 197 "poppler/CourierBoldObliqueWidths.gperf" + { "five", 600 }, + { "", 0 }, +#line 14 "poppler/CourierBoldObliqueWidths.gperf" + { "Ntilde", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 267 "poppler/CourierBoldObliqueWidths.gperf" + { "uring", 600 }, +#line 45 "poppler/CourierBoldObliqueWidths.gperf" + { "A", 600 }, + { "", 0 }, + { "", 0 }, +#line 84 "poppler/CourierBoldObliqueWidths.gperf" + { "four", 600 }, + { "", 0 }, +#line 187 "poppler/CourierBoldObliqueWidths.gperf" + { "egrave", 600 }, + { "", 0 }, + { "", 0 }, +#line 241 "poppler/CourierBoldObliqueWidths.gperf" + { "paragraph", 600 }, + { "", 0 }, +#line 29 "poppler/CourierBoldObliqueWidths.gperf" + { "Lcaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 325 "poppler/CourierBoldObliqueWidths.gperf" + { "brokenbar", 600 }, + { "", 0 }, +#line 199 "poppler/CourierBoldObliqueWidths.gperf" + { "Zcaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 165 "poppler/CourierBoldObliqueWidths.gperf" + { "Adieresis", 600 }, + { "", 0 }, +#line 122 "poppler/CourierBoldObliqueWidths.gperf" + { "y", 600 }, +#line 16 "poppler/CourierBoldObliqueWidths.gperf" + { "kcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 76 "poppler/CourierBoldObliqueWidths.gperf" + { "agrave", 600 }, + { "", 0 }, +#line 69 "poppler/CourierBoldObliqueWidths.gperf" + { "Uhungarumlaut", 600 }, +#line 204 "poppler/CourierBoldObliqueWidths.gperf" + { "ydieresis", 600 }, +#line 168 "poppler/CourierBoldObliqueWidths.gperf" + { "slash", 600 }, +#line 229 "poppler/CourierBoldObliqueWidths.gperf" + { "ogonek", 600 }, +#line 151 "poppler/CourierBoldObliqueWidths.gperf" + { "AE", 600 }, +#line 192 "poppler/CourierBoldObliqueWidths.gperf" + { "asterisk", 600 }, + { "", 0 }, + { "", 0 }, +#line 111 "poppler/CourierBoldObliqueWidths.gperf" + { "twosuperior", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 53 "poppler/CourierBoldObliqueWidths.gperf" + { "G", 600 }, +#line 58 "poppler/CourierBoldObliqueWidths.gperf" + { "iogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 17 "poppler/CourierBoldObliqueWidths.gperf" + { "Ncommaaccent", 600 }, + { "", 0 }, +#line 21 "poppler/CourierBoldObliqueWidths.gperf" + { "plusminus", 600 }, + { "", 0 }, +#line 230 "poppler/CourierBoldObliqueWidths.gperf" + { "ograve", 600 }, + { "", 0 }, +#line 129 "poppler/CourierBoldObliqueWidths.gperf" + { "quotedbl", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 233 "poppler/CourierBoldObliqueWidths.gperf" + { "Eogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 120 "poppler/CourierBoldObliqueWidths.gperf" + { "w", 600 }, +#line 259 "poppler/CourierBoldObliqueWidths.gperf" + { "uogonek", 600 }, + { "", 0 }, +#line 59 "poppler/CourierBoldObliqueWidths.gperf" + { "backslash", 600 }, +#line 81 "poppler/CourierBoldObliqueWidths.gperf" + { "equal", 600 }, + { "", 0 }, +#line 38 "poppler/CourierBoldObliqueWidths.gperf" + { "Omacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 121 "poppler/CourierBoldObliqueWidths.gperf" + { "x", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 298 "poppler/CourierBoldObliqueWidths.gperf" + { "Zdotaccent", 600 }, +#line 152 "poppler/CourierBoldObliqueWidths.gperf" + { "Ucircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 68 "poppler/CourierBoldObliqueWidths.gperf" + { "Q", 600 }, +#line 296 "poppler/CourierBoldObliqueWidths.gperf" + { "Imacron", 600 }, + { "", 0 }, + { "", 0 }, +#line 250 "poppler/CourierBoldObliqueWidths.gperf" + { "Uring", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 123 "poppler/CourierBoldObliqueWidths.gperf" + { "z", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 22 "poppler/CourierBoldObliqueWidths.gperf" + { "circumflex", 600 }, + { "", 0 }, +#line 251 "poppler/CourierBoldObliqueWidths.gperf" + { "Lcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 73 "poppler/CourierBoldObliqueWidths.gperf" + { "S", 600 }, + { "", 0 }, + { "", 0 }, +#line 175 "poppler/CourierBoldObliqueWidths.gperf" + { "Odieresis", 600 }, + { "", 0 }, +#line 284 "poppler/CourierBoldObliqueWidths.gperf" + { "Acircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 67 "poppler/CourierBoldObliqueWidths.gperf" + { "P", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 238 "poppler/CourierBoldObliqueWidths.gperf" + { "Aring", 600 }, +#line 96 "poppler/CourierBoldObliqueWidths.gperf" + { "Oslash", 600 }, +#line 114 "poppler/CourierBoldObliqueWidths.gperf" + { "OE", 600 }, + { "", 0 }, +#line 171 "poppler/CourierBoldObliqueWidths.gperf" + { "Idieresis", 600 }, + { "", 0 }, +#line 62 "poppler/CourierBoldObliqueWidths.gperf" + { "M", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 282 "poppler/CourierBoldObliqueWidths.gperf" + { "fi", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 56 "poppler/CourierBoldObliqueWidths.gperf" + { "J", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 263 "poppler/CourierBoldObliqueWidths.gperf" + { "igrave", 600 }, + { "", 0 }, +#line 255 "poppler/CourierBoldObliqueWidths.gperf" + { "Ohungarumlaut", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 243 "poppler/CourierBoldObliqueWidths.gperf" + { "Uogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 87 "poppler/CourierBoldObliqueWidths.gperf" + { "b", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 167 "poppler/CourierBoldObliqueWidths.gperf" + { "Egrave", 600 }, + { "", 0 }, + { "", 0 }, +#line 182 "poppler/CourierBoldObliqueWidths.gperf" + { "Ydieresis", 600 }, + { "", 0 }, +#line 195 "poppler/CourierBoldObliqueWidths.gperf" + { "ugrave", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 211 "poppler/CourierBoldObliqueWidths.gperf" + { "multiply", 600 }, + { "", 0 }, + { "", 0 }, +#line 66 "poppler/CourierBoldObliqueWidths.gperf" + { "O", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 31 "poppler/CourierBoldObliqueWidths.gperf" + { "Aogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 279 "poppler/CourierBoldObliqueWidths.gperf" + { "florin", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 226 "poppler/CourierBoldObliqueWidths.gperf" + { "Ocircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 283 "poppler/CourierBoldObliqueWidths.gperf" + { "fl", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 55 "poppler/CourierBoldObliqueWidths.gperf" + { "I", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 286 "poppler/CourierBoldObliqueWidths.gperf" + { "Icircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 54 "poppler/CourierBoldObliqueWidths.gperf" + { "H", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 134 "poppler/CourierBoldObliqueWidths.gperf" + { "Lslash", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 99 "poppler/CourierBoldObliqueWidths.gperf" + { "k", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 184 "poppler/CourierBoldObliqueWidths.gperf" + { "abreve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 217 "poppler/CourierBoldObliqueWidths.gperf" + { "partialdiff", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 52 "poppler/CourierBoldObliqueWidths.gperf" + { "F", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 178 "poppler/CourierBoldObliqueWidths.gperf" + { "Ugrave", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 91 "poppler/CourierBoldObliqueWidths.gperf" + { "f", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 119 "poppler/CourierBoldObliqueWidths.gperf" + { "v", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 63 "poppler/CourierBoldObliqueWidths.gperf" + { "N", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 41 "poppler/CourierBoldObliqueWidths.gperf" + { "Agrave", 600 }, +#line 34 "poppler/CourierBoldObliqueWidths.gperf" + { "Iogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 82 "poppler/CourierBoldObliqueWidths.gperf" + { "Y", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 46 "poppler/CourierBoldObliqueWidths.gperf" + { "B", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 177 "poppler/CourierBoldObliqueWidths.gperf" + { "bracketleft", 600 }, +#line 260 "poppler/CourierBoldObliqueWidths.gperf" + { "bracketright", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 142 "poppler/CourierBoldObliqueWidths.gperf" + { "gbreve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 215 "poppler/CourierBoldObliqueWidths.gperf" + { "Ograve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 60 "poppler/CourierBoldObliqueWidths.gperf" + { "L", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 246 "poppler/CourierBoldObliqueWidths.gperf" + { "Igrave", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 83 "poppler/CourierBoldObliqueWidths.gperf" + { "Z", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 162 "poppler/CourierBoldObliqueWidths.gperf" + { "Abreve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 124 "poppler/CourierBoldObliqueWidths.gperf" + { "Gbreve", 600 } }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { + register unsigned int key = hash(str, len); + + if (key <= MAX_HASH_VALUE) { + register const char *s = wordlist[key].name; + + if (*str == *s && !strcmp(str + 1, s + 1)) + return &wordlist[key]; + } + } + return 0; +} +#line 330 "poppler/CourierBoldObliqueWidths.gperf" diff --git a/poppler-24.05.0/poppler/CourierBoldWidths.gperf b/poppler-24.05.0/poppler/CourierBoldWidths.gperf new file mode 100644 index 0000000000000000000000000000000000000000..3cd6f114f98daf1bd2cb03c2d5bea31717cd7250 --- /dev/null +++ b/poppler-24.05.0/poppler/CourierBoldWidths.gperf @@ -0,0 +1,330 @@ +%{ +#include +#include "BuiltinFontWidth.h" +%} +%language=ANSI-C +%define initializer-suffix ,0 +%define lookup-function-name CourierBoldWidthsLookup +%struct-type +%omit-struct-type +%readonly-tables +struct BuiltinFontWidth +%% +#### +Ntilde, 600 +rcaron, 600 +kcommaaccent, 600 +Ncommaaccent, 600 +Zacute, 600 +comma, 600 +cedilla, 600 +plusminus, 600 +circumflex, 600 +dotaccent, 600 +edotaccent, 600 +asciitilde, 600 +colon, 600 +onehalf, 600 +dollar, 600 +Lcaron, 600 +ntilde, 600 +Aogonek, 600 +ncommaaccent, 600 +minus, 600 +Iogonek, 600 +zacute, 600 +yen, 600 +space, 600 +Omacron, 600 +questiondown, 600 +emdash, 600 +Agrave, 600 +three, 600 +numbersign, 600 +lcaron, 600 +A, 600 +B, 600 +C, 600 +aogonek, 600 +D, 600 +E, 600 +onequarter, 600 +F, 600 +G, 600 +H, 600 +I, 600 +J, 600 +K, 600 +iogonek, 600 +backslash, 600 +L, 600 +periodcentered, 600 +M, 600 +N, 600 +omacron, 600 +Tcommaaccent, 600 +O, 600 +P, 600 +Q, 600 +Uhungarumlaut, 600 +R, 600 +Aacute, 600 +caron, 600 +S, 600 +T, 600 +U, 600 +agrave, 600 +V, 600 +W, 600 +X, 600 +question, 600 +equal, 600 +Y, 600 +Z, 600 +four, 600 +a, 600 +Gcommaaccent, 600 +b, 600 +c, 600 +d, 600 +e, 600 +f, 600 +g, 600 +bullet, 600 +h, 600 +i, 600 +Oslash, 600 +dagger, 600 +j, 600 +k, 600 +l, 600 +m, 600 +n, 600 +tcommaaccent, 600 +o, 600 +ordfeminine, 600 +ring, 600 +p, 600 +q, 600 +uhungarumlaut, 600 +r, 600 +twosuperior, 600 +aacute, 600 +s, 600 +OE, 600 +t, 600 +divide, 600 +u, 600 +Ccaron, 600 +v, 600 +w, 600 +x, 600 +y, 600 +z, 600 +Gbreve, 600 +commaaccent, 600 +hungarumlaut, 600 +Idotaccent, 600 +Nacute, 600 +quotedbl, 600 +gcommaaccent, 600 +mu, 600 +greaterequal, 600 +Scaron, 600 +Lslash, 600 +semicolon, 600 +oslash, 600 +lessequal, 600 +lozenge, 600 +parenright, 600 +ccaron, 600 +Ecircumflex, 600 +gbreve, 600 +trademark, 600 +daggerdbl, 600 +nacute, 600 +macron, 600 +Otilde, 600 +Emacron, 600 +ellipsis, 600 +scaron, 600 +AE, 600 +Ucircumflex, 600 +lslash, 600 +quotedblleft, 600 +guilsinglright, 600 +hyphen, 600 +quotesingle, 600 +eight, 600 +exclamdown, 600 +endash, 600 +oe, 600 +Abreve, 600 +Umacron, 600 +ecircumflex, 600 +Adieresis, 600 +copyright, 600 +Egrave, 600 +slash, 600 +Edieresis, 600 +otilde, 600 +Idieresis, 600 +parenleft, 600 +one, 600 +emacron, 600 +Odieresis, 600 +ucircumflex, 600 +bracketleft, 600 +Ugrave, 600 +quoteright, 600 +Udieresis, 600 +perthousand, 600 +Ydieresis, 600 +umacron, 600 +abreve, 600 +Eacute, 600 +adieresis, 600 +egrave, 600 +edieresis, 600 +idieresis, 600 +Eth, 600 +ae, 600 +asterisk, 600 +odieresis, 600 +Uacute, 600 +ugrave, 600 +nine, 600 +five, 600 +udieresis, 600 +Zcaron, 600 +Scommaaccent, 600 +threequarters, 600 +guillemotright, 600 +Ccedilla, 600 +ydieresis, 600 +tilde, 600 +at, 600 +eacute, 600 +underscore, 600 +Euro, 600 +Dcroat, 600 +multiply, 600 +zero, 600 +eth, 600 +Scedilla, 600 +Ograve, 600 +Racute, 600 +partialdiff, 600 +uacute, 600 +braceleft, 600 +Thorn, 600 +zcaron, 600 +scommaaccent, 600 +ccedilla, 600 +Dcaron, 600 +dcroat, 600 +Ocircumflex, 600 +Oacute, 600 +scedilla, 600 +ogonek, 600 +ograve, 600 +racute, 600 +Tcaron, 600 +Eogonek, 600 +thorn, 600 +degree, 600 +registered, 600 +radical, 600 +Aring, 600 +percent, 600 +six, 600 +paragraph, 600 +dcaron, 600 +Uogonek, 600 +two, 600 +summation, 600 +Igrave, 600 +Lacute, 600 +ocircumflex, 600 +oacute, 600 +Uring, 600 +Lcommaaccent, 600 +tcaron, 600 +eogonek, 600 +Delta, 600 +Ohungarumlaut, 600 +asciicircum, 600 +aring, 600 +grave, 600 +uogonek, 600 +bracketright, 600 +Iacute, 600 +ampersand, 600 +igrave, 600 +lacute, 600 +Ncaron, 600 +plus, 600 +uring, 600 +quotesinglbase, 600 +lcommaaccent, 600 +Yacute, 600 +ohungarumlaut, 600 +threesuperior, 600 +acute, 600 +section, 600 +dieresis, 600 +iacute, 600 +quotedblbase, 600 +ncaron, 600 +florin, 600 +yacute, 600 +Rcommaaccent, 600 +fi, 600 +fl, 600 +Acircumflex, 600 +Cacute, 600 +Icircumflex, 600 +guillemotleft, 600 +germandbls, 600 +Amacron, 600 +seven, 600 +Sacute, 600 +ordmasculine, 600 +dotlessi, 600 +sterling, 600 +notequal, 600 +Imacron, 600 +rcommaaccent, 600 +Zdotaccent, 600 +acircumflex, 600 +cacute, 600 +Ecaron, 600 +icircumflex, 600 +braceright, 600 +quotedblright, 600 +amacron, 600 +sacute, 600 +imacron, 600 +cent, 600 +currency, 600 +logicalnot, 600 +zdotaccent, 600 +Atilde, 600 +breve, 600 +bar, 600 +fraction, 600 +less, 600 +ecaron, 600 +guilsinglleft, 600 +exclam, 600 +period, 600 +Rcaron, 600 +Kcommaaccent, 600 +greater, 600 +atilde, 600 +brokenbar, 600 +quoteleft, 600 +Edotaccent, 600 +onesuperior, 600 +#### +%% diff --git a/poppler-24.05.0/poppler/CourierBoldWidths.pregenerated.c b/poppler-24.05.0/poppler/CourierBoldWidths.pregenerated.c new file mode 100644 index 0000000000000000000000000000000000000000..abb59bca17b92d8cf942fc3e87d54a2e5a53ad6d --- /dev/null +++ b/poppler-24.05.0/poppler/CourierBoldWidths.pregenerated.c @@ -0,0 +1,1437 @@ +/* ANSI-C code produced by gperf version 3.1 */ +/* Command-line: gperf poppler/CourierBoldWidths.gperf */ +/* Computed positions: -k'1-2,5,$' */ + +#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) && ('-' == 45) && ('.' == 46) && ('/' == 47) \ + && ('0' == 48) && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) && ('=' == 61) && ('>' == 62) \ + && ('?' == 63) && ('A' == 65) && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) && ('N' == 78) \ + && ('O' == 79) && ('P' == 80) && ('Q' == 81) && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ + && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) && ('k' == 107) && ('l' == 108) \ + && ('m' == 109) && ('n' == 110) && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ + && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) +/* The character set is not based on ISO-646. */ +# error "gperf generated tables don't work with this execution character set. Please report a bug to ." +#endif + +#line 1 "poppler/CourierBoldWidths.gperf" + +#include +#include "BuiltinFontWidth.h" + +#define TOTAL_KEYWORDS 315 +#define MIN_WORD_LENGTH 1 +#define MAX_WORD_LENGTH 14 +#define MIN_HASH_VALUE 1 +#define MAX_HASH_VALUE 1041 +/* maximum key range = 1041, duplicates = 0 */ + +#ifdef __GNUC__ +__inline +#else +# ifdef __cplusplus +inline +# endif +#endif + static unsigned int + hash(register const char *str, register size_t len) +{ + static const unsigned short asso_values[] = { 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 270, 415, 28, 8, 150, 390, 290, 375, 370, 335, 5, 455, 330, 405, 355, 325, 310, 3, 320, 160, 240, 225, + 145, 70, 410, 460, 1042, 1042, 1042, 1042, 1042, 1042, 20, 345, 30, 115, 0, 395, 140, 165, 135, 35, 380, 170, 130, 15, 45, 215, 260, 100, 65, + 10, 155, 400, 300, 305, 280, 315, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042 }; + register unsigned int hval = len; + + switch (hval) { + default: + hval += asso_values[(unsigned char)str[4]]; + /*FALLTHROUGH*/ + case 4: + case 3: + case 2: + hval += asso_values[(unsigned char)str[1]]; + /*FALLTHROUGH*/ + case 1: + hval += asso_values[(unsigned char)str[0]]; + break; + } + return hval + asso_values[(unsigned char)str[len - 1]]; +} + +const struct BuiltinFontWidth *CourierBoldWidthsLookup(register const char *str, register size_t len) +{ + static const struct BuiltinFontWidth wordlist[] = { { "", 0 }, +#line 90 "poppler/CourierBoldWidths.gperf" + { "e", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 70 "poppler/CourierBoldWidths.gperf" + { "R", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 57 "poppler/CourierBoldWidths.gperf" + { "K", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 49 "poppler/CourierBoldWidths.gperf" + { "D", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 115 "poppler/CourierBoldWidths.gperf" + { "t", 600 }, +#line 191 "poppler/CourierBoldWidths.gperf" + { "ae", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 102 "poppler/CourierBoldWidths.gperf" + { "n", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 207 "poppler/CourierBoldWidths.gperf" + { "eacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 216 "poppler/CourierBoldWidths.gperf" + { "Racute", 600 }, + { "", 0 }, +#line 85 "poppler/CourierBoldWidths.gperf" + { "a", 600 }, +#line 206 "poppler/CourierBoldWidths.gperf" + { "at", 600 }, + { "", 0 }, +#line 308 "poppler/CourierBoldWidths.gperf" + { "cent", 600 }, + { "", 0 }, + { "", 0 }, +#line 161 "poppler/CourierBoldWidths.gperf" + { "oe", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 145 "poppler/CourierBoldWidths.gperf" + { "nacute", 600 }, + { "", 0 }, +#line 254 "poppler/CourierBoldWidths.gperf" + { "Delta", 600 }, + { "", 0 }, +#line 273 "poppler/CourierBoldWidths.gperf" + { "acute", 600 }, +#line 112 "poppler/CourierBoldWidths.gperf" + { "aacute", 600 }, +#line 47 "poppler/CourierBoldWidths.gperf" + { "C", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 88 "poppler/CourierBoldWidths.gperf" + { "c", 600 }, + { "", 0 }, +#line 173 "poppler/CourierBoldWidths.gperf" + { "one", 600 }, +#line 285 "poppler/CourierBoldWidths.gperf" + { "Cacute", 600 }, + { "", 0 }, +#line 300 "poppler/CourierBoldWidths.gperf" + { "cacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 98 "poppler/CourierBoldWidths.gperf" + { "j", 600 }, + { "", 0 }, + { "", 0 }, +#line 210 "poppler/CourierBoldWidths.gperf" + { "Dcroat", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 249 "poppler/CourierBoldWidths.gperf" + { "oacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 72 "poppler/CourierBoldWidths.gperf" + { "caron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 104 "poppler/CourierBoldWidths.gperf" + { "o", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 317 "poppler/CourierBoldWidths.gperf" + { "ecaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 321 "poppler/CourierBoldWidths.gperf" + { "Rcaron", 600 }, +#line 290 "poppler/CourierBoldWidths.gperf" + { "seven", 600 }, +#line 306 "poppler/CourierBoldWidths.gperf" + { "sacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 224 "poppler/CourierBoldWidths.gperf" + { "Dcaron", 600 }, + { "", 0 }, +#line 252 "poppler/CourierBoldWidths.gperf" + { "tcaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 26 "poppler/CourierBoldWidths.gperf" + { "colon", 600 }, +#line 278 "poppler/CourierBoldWidths.gperf" + { "ncaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 125 "poppler/CourierBoldWidths.gperf" + { "commaaccent", 600 }, + { "", 0 }, + { "", 0 }, +#line 135 "poppler/CourierBoldWidths.gperf" + { "semicolon", 600 }, +#line 19 "poppler/CourierBoldWidths.gperf" + { "comma", 600 }, +#line 235 "poppler/CourierBoldWidths.gperf" + { "degree", 600 }, + { "", 0 }, + { "", 0 }, +#line 118 "poppler/CourierBoldWidths.gperf" + { "Ccaron", 600 }, + { "", 0 }, +#line 140 "poppler/CourierBoldWidths.gperf" + { "ccaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 113 "poppler/CourierBoldWidths.gperf" + { "s", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 231 "poppler/CourierBoldWidths.gperf" + { "racute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 79 "poppler/CourierBoldWidths.gperf" + { "X", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 30 "poppler/CourierBoldWidths.gperf" + { "ntilde", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 205 "poppler/CourierBoldWidths.gperf" + { "tilde", 600 }, +#line 324 "poppler/CourierBoldWidths.gperf" + { "atilde", 600 }, + { "", 0 }, + { "", 0 }, +#line 196 "poppler/CourierBoldWidths.gperf" + { "nine", 600 }, +#line 24 "poppler/CourierBoldWidths.gperf" + { "edotaccent", 600 }, +#line 105 "poppler/CourierBoldWidths.gperf" + { "ordfeminine", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 158 "poppler/CourierBoldWidths.gperf" + { "eight", 600 }, +#line 150 "poppler/CourierBoldWidths.gperf" + { "scaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 276 "poppler/CourierBoldWidths.gperf" + { "iacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 170 "poppler/CourierBoldWidths.gperf" + { "otilde", 600 }, +#line 292 "poppler/CourierBoldWidths.gperf" + { "ordmasculine", 600 }, +#line 213 "poppler/CourierBoldWidths.gperf" + { "eth", 600 }, + { "", 0 }, +#line 42 "poppler/CourierBoldWidths.gperf" + { "three", 600 }, +#line 225 "poppler/CourierBoldWidths.gperf" + { "dcroat", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 281 "poppler/CourierBoldWidths.gperf" + { "Rcommaaccent", 600 }, +#line 185 "poppler/CourierBoldWidths.gperf" + { "Eacute", 600 }, +#line 322 "poppler/CourierBoldWidths.gperf" + { "Kcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 218 "poppler/CourierBoldWidths.gperf" + { "uacute", 600 }, +#line 103 "poppler/CourierBoldWidths.gperf" + { "tcommaaccent", 600 }, + { "", 0 }, +#line 166 "poppler/CourierBoldWidths.gperf" + { "copyright", 600 }, +#line 43 "poppler/CourierBoldWidths.gperf" + { "numbersign", 600 }, +#line 15 "poppler/CourierBoldWidths.gperf" + { "rcaron", 600 }, +#line 32 "poppler/CourierBoldWidths.gperf" + { "ncommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 110 "poppler/CourierBoldWidths.gperf" + { "r", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 264 "poppler/CourierBoldWidths.gperf" + { "lacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 23 "poppler/CourierBoldWidths.gperf" + { "dotaccent", 600 }, +#line 234 "poppler/CourierBoldWidths.gperf" + { "thorn", 600 }, +#line 242 "poppler/CourierBoldWidths.gperf" + { "dcaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 146 "poppler/CourierBoldWidths.gperf" + { "macron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 203 "poppler/CourierBoldWidths.gperf" + { "Ccedilla", 600 }, +#line 274 "poppler/CourierBoldWidths.gperf" + { "section", 600 }, +#line 223 "poppler/CourierBoldWidths.gperf" + { "ccedilla", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 20 "poppler/CourierBoldWidths.gperf" + { "cedilla", 600 }, + { "", 0 }, + { "", 0 }, +#line 25 "poppler/CourierBoldWidths.gperf" + { "asciitilde", 600 }, +#line 89 "poppler/CourierBoldWidths.gperf" + { "d", 600 }, +#line 239 "poppler/CourierBoldWidths.gperf" + { "percent", 600 }, + { "", 0 }, + { "", 0 }, +#line 288 "poppler/CourierBoldWidths.gperf" + { "germandbls", 600 }, + { "", 0 }, +#line 138 "poppler/CourierBoldWidths.gperf" + { "lozenge", 600 }, + { "", 0 }, +#line 316 "poppler/CourierBoldWidths.gperf" + { "less", 600 }, + { "", 0 }, +#line 97 "poppler/CourierBoldWidths.gperf" + { "dagger", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 258 "poppler/CourierBoldWidths.gperf" + { "grave", 600 }, +#line 301 "poppler/CourierBoldWidths.gperf" + { "Ecaron", 600 }, +#line 222 "poppler/CourierBoldWidths.gperf" + { "scommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 160 "poppler/CourierBoldWidths.gperf" + { "endash", 600 }, +#line 174 "poppler/CourierBoldWidths.gperf" + { "emacron", 600 }, +#line 201 "poppler/CourierBoldWidths.gperf" + { "threequarters", 600 }, + { "", 0 }, + { "", 0 }, +#line 232 "poppler/CourierBoldWidths.gperf" + { "Tcaron", 600 }, + { "", 0 }, +#line 228 "poppler/CourierBoldWidths.gperf" + { "scedilla", 600 }, + { "", 0 }, + { "", 0 }, +#line 101 "poppler/CourierBoldWidths.gperf" + { "m", 600 }, + { "", 0 }, + { "", 0 }, +#line 245 "poppler/CourierBoldWidths.gperf" + { "summation", 600 }, +#line 310 "poppler/CourierBoldWidths.gperf" + { "logicalnot", 600 }, +#line 44 "poppler/CourierBoldWidths.gperf" + { "lcaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 172 "poppler/CourierBoldWidths.gperf" + { "parenleft", 600 }, +#line 139 "poppler/CourierBoldWidths.gperf" + { "parenright", 600 }, +#line 95 "poppler/CourierBoldWidths.gperf" + { "i", 600 }, +#line 305 "poppler/CourierBoldWidths.gperf" + { "amacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 194 "poppler/CourierBoldWidths.gperf" + { "Uacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 208 "poppler/CourierBoldWidths.gperf" + { "underscore", 600 }, +#line 92 "poppler/CourierBoldWidths.gperf" + { "g", 600 }, +#line 297 "poppler/CourierBoldWidths.gperf" + { "rcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, +#line 37 "poppler/CourierBoldWidths.gperf" + { "space", 600 }, +#line 28 "poppler/CourierBoldWidths.gperf" + { "dollar", 600 }, + { "", 0 }, +#line 272 "poppler/CourierBoldWidths.gperf" + { "threesuperior", 600 }, +#line 188 "poppler/CourierBoldWidths.gperf" + { "edieresis", 600 }, +#line 236 "poppler/CourierBoldWidths.gperf" + { "registered", 600 }, +#line 78 "poppler/CourierBoldWidths.gperf" + { "W", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 64 "poppler/CourierBoldWidths.gperf" + { "omacron", 600 }, +#line 36 "poppler/CourierBoldWidths.gperf" + { "yen", 600 }, + { "", 0 }, + { "", 0 }, +#line 50 "poppler/CourierBoldWidths.gperf" + { "E", 600 }, + { "", 0 }, +#line 293 "poppler/CourierBoldWidths.gperf" + { "dotlessi", 600 }, + { "", 0 }, +#line 327 "poppler/CourierBoldWidths.gperf" + { "Edotaccent", 600 }, +#line 71 "poppler/CourierBoldWidths.gperf" + { "Aacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 186 "poppler/CourierBoldWidths.gperf" + { "adieresis", 600 }, + { "", 0 }, +#line 117 "poppler/CourierBoldWidths.gperf" + { "u", 600 }, + { "", 0 }, + { "", 0 }, +#line 144 "poppler/CourierBoldWidths.gperf" + { "daggerdbl", 600 }, + { "", 0 }, +#line 280 "poppler/CourierBoldWidths.gperf" + { "yacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 74 "poppler/CourierBoldWidths.gperf" + { "T", 600 }, +#line 130 "poppler/CourierBoldWidths.gperf" + { "gcommaaccent", 600 }, +#line 275 "poppler/CourierBoldWidths.gperf" + { "dieresis", 600 }, + { "", 0 }, +#line 51 "poppler/CourierBoldWidths.gperf" + { "onequarter", 600 }, +#line 328 "poppler/CourierBoldWidths.gperf" + { "onesuperior", 600 }, +#line 237 "poppler/CourierBoldWidths.gperf" + { "radical", 600 }, +#line 190 "poppler/CourierBoldWidths.gperf" + { "Eth", 600 }, + { "", 0 }, + { "", 0 }, +#line 94 "poppler/CourierBoldWidths.gperf" + { "h", 600 }, + { "", 0 }, + { "", 0 }, +#line 193 "poppler/CourierBoldWidths.gperf" + { "odieresis", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 100 "poppler/CourierBoldWidths.gperf" + { "l", 600 }, +#line 65 "poppler/CourierBoldWidths.gperf" + { "Tcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 136 "poppler/CourierBoldWidths.gperf" + { "oslash", 600 }, + { "", 0 }, + { "", 0 }, +#line 137 "poppler/CourierBoldWidths.gperf" + { "lessequal", 600 }, +#line 159 "poppler/CourierBoldWidths.gperf" + { "exclamdown", 600 }, +#line 35 "poppler/CourierBoldWidths.gperf" + { "zacute", 600 }, +#line 269 "poppler/CourierBoldWidths.gperf" + { "lcommaaccent", 600 }, + { "", 0 }, +#line 209 "poppler/CourierBoldWidths.gperf" + { "Euro", 600 }, + { "", 0 }, +#line 291 "poppler/CourierBoldWidths.gperf" + { "Sacute", 600 }, +#line 323 "poppler/CourierBoldWidths.gperf" + { "greater", 600 }, +#line 244 "poppler/CourierBoldWidths.gperf" + { "two", 600 }, + { "", 0 }, +#line 220 "poppler/CourierBoldWidths.gperf" + { "Thorn", 600 }, +#line 256 "poppler/CourierBoldWidths.gperf" + { "asciicircum", 600 }, +#line 126 "poppler/CourierBoldWidths.gperf" + { "hungarumlaut", 600 }, + { "", 0 }, +#line 212 "poppler/CourierBoldWidths.gperf" + { "zero", 600 }, + { "", 0 }, +#line 40 "poppler/CourierBoldWidths.gperf" + { "emdash", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 116 "poppler/CourierBoldWidths.gperf" + { "divide", 600 }, + { "", 0 }, +#line 271 "poppler/CourierBoldWidths.gperf" + { "ohungarumlaut", 600 }, +#line 262 "poppler/CourierBoldWidths.gperf" + { "ampersand", 600 }, + { "", 0 }, +#line 164 "poppler/CourierBoldWidths.gperf" + { "ecircumflex", 600 }, + { "", 0 }, + { "", 0 }, +#line 106 "poppler/CourierBoldWidths.gperf" + { "ring", 600 }, + { "", 0 }, +#line 320 "poppler/CourierBoldWidths.gperf" + { "period", 600 }, + { "", 0 }, +#line 318 "poppler/CourierBoldWidths.gperf" + { "guilsinglleft", 600 }, +#line 155 "poppler/CourierBoldWidths.gperf" + { "guilsinglright", 600 }, + { "", 0 }, + { "", 0 }, +#line 307 "poppler/CourierBoldWidths.gperf" + { "imacron", 600 }, + { "", 0 }, +#line 61 "poppler/CourierBoldWidths.gperf" + { "periodcentered", 600 }, + { "", 0 }, +#line 227 "poppler/CourierBoldWidths.gperf" + { "Oacute", 600 }, + { "", 0 }, +#line 294 "poppler/CourierBoldWidths.gperf" + { "sterling", 600 }, + { "", 0 }, + { "", 0 }, +#line 299 "poppler/CourierBoldWidths.gperf" + { "acircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 33 "poppler/CourierBoldWidths.gperf" + { "minus", 600 }, +#line 312 "poppler/CourierBoldWidths.gperf" + { "Atilde", 600 }, +#line 148 "poppler/CourierBoldWidths.gperf" + { "Emacron", 600 }, + { "", 0 }, + { "", 0 }, +#line 257 "poppler/CourierBoldWidths.gperf" + { "aring", 600 }, +#line 261 "poppler/CourierBoldWidths.gperf" + { "Iacute", 600 }, +#line 183 "poppler/CourierBoldWidths.gperf" + { "umacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 221 "poppler/CourierBoldWidths.gperf" + { "zcaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 133 "poppler/CourierBoldWidths.gperf" + { "Scaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 248 "poppler/CourierBoldWidths.gperf" + { "ocircumflex", 600 }, + { "", 0 }, + { "", 0 }, +#line 189 "poppler/CourierBoldWidths.gperf" + { "idieresis", 600 }, + { "", 0 }, +#line 157 "poppler/CourierBoldWidths.gperf" + { "quotesingle", 600 }, +#line 277 "poppler/CourierBoldWidths.gperf" + { "quotedblbase", 600 }, + { "", 0 }, +#line 268 "poppler/CourierBoldWidths.gperf" + { "quotesinglbase", 600 }, + { "", 0 }, +#line 107 "poppler/CourierBoldWidths.gperf" + { "p", 600 }, +#line 132 "poppler/CourierBoldWidths.gperf" + { "greaterequal", 600 }, + { "", 0 }, +#line 326 "poppler/CourierBoldWidths.gperf" + { "quoteleft", 600 }, +#line 179 "poppler/CourierBoldWidths.gperf" + { "quoteright", 600 }, + { "", 0 }, +#line 154 "poppler/CourierBoldWidths.gperf" + { "quotedblleft", 600 }, +#line 304 "poppler/CourierBoldWidths.gperf" + { "quotedblright", 600 }, +#line 169 "poppler/CourierBoldWidths.gperf" + { "Edieresis", 600 }, + { "", 0 }, +#line 128 "poppler/CourierBoldWidths.gperf" + { "Nacute", 600 }, +#line 131 "poppler/CourierBoldWidths.gperf" + { "mu", 600 }, + { "", 0 }, +#line 198 "poppler/CourierBoldWidths.gperf" + { "udieresis", 600 }, + { "", 0 }, +#line 270 "poppler/CourierBoldWidths.gperf" + { "Yacute", 600 }, +#line 253 "poppler/CourierBoldWidths.gperf" + { "eogonek", 600 }, +#line 80 "poppler/CourierBoldWidths.gperf" + { "question", 600 }, + { "", 0 }, +#line 313 "poppler/CourierBoldWidths.gperf" + { "breve", 600 }, +#line 77 "poppler/CourierBoldWidths.gperf" + { "V", 600 }, +#line 39 "poppler/CourierBoldWidths.gperf" + { "questiondown", 600 }, + { "", 0 }, +#line 266 "poppler/CourierBoldWidths.gperf" + { "plus", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 149 "poppler/CourierBoldWidths.gperf" + { "ellipsis", 600 }, + { "", 0 }, + { "", 0 }, +#line 319 "poppler/CourierBoldWidths.gperf" + { "exclam", 600 }, + { "", 0 }, + { "", 0 }, +#line 219 "poppler/CourierBoldWidths.gperf" + { "braceleft", 600 }, +#line 303 "poppler/CourierBoldWidths.gperf" + { "braceright", 600 }, +#line 156 "poppler/CourierBoldWidths.gperf" + { "hyphen", 600 }, +#line 48 "poppler/CourierBoldWidths.gperf" + { "aogonek", 600 }, +#line 314 "poppler/CourierBoldWidths.gperf" + { "bar", 600 }, + { "", 0 }, +#line 311 "poppler/CourierBoldWidths.gperf" + { "zdotaccent", 600 }, +#line 153 "poppler/CourierBoldWidths.gperf" + { "lslash", 600 }, +#line 86 "poppler/CourierBoldWidths.gperf" + { "Gcommaaccent", 600 }, +#line 309 "poppler/CourierBoldWidths.gperf" + { "currency", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 75 "poppler/CourierBoldWidths.gperf" + { "U", 600 }, +#line 27 "poppler/CourierBoldWidths.gperf" + { "onehalf", 600 }, +#line 109 "poppler/CourierBoldWidths.gperf" + { "uhungarumlaut", 600 }, + { "", 0 }, + { "", 0 }, +#line 147 "poppler/CourierBoldWidths.gperf" + { "Otilde", 600 }, + { "", 0 }, +#line 287 "poppler/CourierBoldWidths.gperf" + { "guillemotleft", 600 }, +#line 202 "poppler/CourierBoldWidths.gperf" + { "guillemotright", 600 }, + { "", 0 }, +#line 247 "poppler/CourierBoldWidths.gperf" + { "Lacute", 600 }, +#line 163 "poppler/CourierBoldWidths.gperf" + { "Umacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 18 "poppler/CourierBoldWidths.gperf" + { "Zacute", 600 }, + { "", 0 }, +#line 295 "poppler/CourierBoldWidths.gperf" + { "notequal", 600 }, +#line 143 "poppler/CourierBoldWidths.gperf" + { "trademark", 600 }, + { "", 0 }, +#line 265 "poppler/CourierBoldWidths.gperf" + { "Ncaron", 600 }, +#line 200 "poppler/CourierBoldWidths.gperf" + { "Scommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 181 "poppler/CourierBoldWidths.gperf" + { "perthousand", 600 }, + { "", 0 }, +#line 240 "poppler/CourierBoldWidths.gperf" + { "six", 600 }, + { "", 0 }, + { "", 0 }, +#line 302 "poppler/CourierBoldWidths.gperf" + { "icircumflex", 600 }, + { "", 0 }, +#line 214 "poppler/CourierBoldWidths.gperf" + { "Scedilla", 600 }, + { "", 0 }, + { "", 0 }, +#line 93 "poppler/CourierBoldWidths.gperf" + { "bullet", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 108 "poppler/CourierBoldWidths.gperf" + { "q", 600 }, +#line 289 "poppler/CourierBoldWidths.gperf" + { "Amacron", 600 }, + { "", 0 }, + { "", 0 }, +#line 127 "poppler/CourierBoldWidths.gperf" + { "Idotaccent", 600 }, +#line 141 "poppler/CourierBoldWidths.gperf" + { "Ecircumflex", 600 }, + { "", 0 }, +#line 315 "poppler/CourierBoldWidths.gperf" + { "fraction", 600 }, +#line 180 "poppler/CourierBoldWidths.gperf" + { "Udieresis", 600 }, + { "", 0 }, +#line 176 "poppler/CourierBoldWidths.gperf" + { "ucircumflex", 600 }, + { "", 0 }, + { "", 0 }, +#line 197 "poppler/CourierBoldWidths.gperf" + { "five", 600 }, + { "", 0 }, +#line 14 "poppler/CourierBoldWidths.gperf" + { "Ntilde", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 267 "poppler/CourierBoldWidths.gperf" + { "uring", 600 }, +#line 45 "poppler/CourierBoldWidths.gperf" + { "A", 600 }, + { "", 0 }, + { "", 0 }, +#line 84 "poppler/CourierBoldWidths.gperf" + { "four", 600 }, + { "", 0 }, +#line 187 "poppler/CourierBoldWidths.gperf" + { "egrave", 600 }, + { "", 0 }, + { "", 0 }, +#line 241 "poppler/CourierBoldWidths.gperf" + { "paragraph", 600 }, + { "", 0 }, +#line 29 "poppler/CourierBoldWidths.gperf" + { "Lcaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 325 "poppler/CourierBoldWidths.gperf" + { "brokenbar", 600 }, + { "", 0 }, +#line 199 "poppler/CourierBoldWidths.gperf" + { "Zcaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 165 "poppler/CourierBoldWidths.gperf" + { "Adieresis", 600 }, + { "", 0 }, +#line 122 "poppler/CourierBoldWidths.gperf" + { "y", 600 }, +#line 16 "poppler/CourierBoldWidths.gperf" + { "kcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 76 "poppler/CourierBoldWidths.gperf" + { "agrave", 600 }, + { "", 0 }, +#line 69 "poppler/CourierBoldWidths.gperf" + { "Uhungarumlaut", 600 }, +#line 204 "poppler/CourierBoldWidths.gperf" + { "ydieresis", 600 }, +#line 168 "poppler/CourierBoldWidths.gperf" + { "slash", 600 }, +#line 229 "poppler/CourierBoldWidths.gperf" + { "ogonek", 600 }, +#line 151 "poppler/CourierBoldWidths.gperf" + { "AE", 600 }, +#line 192 "poppler/CourierBoldWidths.gperf" + { "asterisk", 600 }, + { "", 0 }, + { "", 0 }, +#line 111 "poppler/CourierBoldWidths.gperf" + { "twosuperior", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 53 "poppler/CourierBoldWidths.gperf" + { "G", 600 }, +#line 58 "poppler/CourierBoldWidths.gperf" + { "iogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 17 "poppler/CourierBoldWidths.gperf" + { "Ncommaaccent", 600 }, + { "", 0 }, +#line 21 "poppler/CourierBoldWidths.gperf" + { "plusminus", 600 }, + { "", 0 }, +#line 230 "poppler/CourierBoldWidths.gperf" + { "ograve", 600 }, + { "", 0 }, +#line 129 "poppler/CourierBoldWidths.gperf" + { "quotedbl", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 233 "poppler/CourierBoldWidths.gperf" + { "Eogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 120 "poppler/CourierBoldWidths.gperf" + { "w", 600 }, +#line 259 "poppler/CourierBoldWidths.gperf" + { "uogonek", 600 }, + { "", 0 }, +#line 59 "poppler/CourierBoldWidths.gperf" + { "backslash", 600 }, +#line 81 "poppler/CourierBoldWidths.gperf" + { "equal", 600 }, + { "", 0 }, +#line 38 "poppler/CourierBoldWidths.gperf" + { "Omacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 121 "poppler/CourierBoldWidths.gperf" + { "x", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 298 "poppler/CourierBoldWidths.gperf" + { "Zdotaccent", 600 }, +#line 152 "poppler/CourierBoldWidths.gperf" + { "Ucircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 68 "poppler/CourierBoldWidths.gperf" + { "Q", 600 }, +#line 296 "poppler/CourierBoldWidths.gperf" + { "Imacron", 600 }, + { "", 0 }, + { "", 0 }, +#line 250 "poppler/CourierBoldWidths.gperf" + { "Uring", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 123 "poppler/CourierBoldWidths.gperf" + { "z", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 22 "poppler/CourierBoldWidths.gperf" + { "circumflex", 600 }, + { "", 0 }, +#line 251 "poppler/CourierBoldWidths.gperf" + { "Lcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 73 "poppler/CourierBoldWidths.gperf" + { "S", 600 }, + { "", 0 }, + { "", 0 }, +#line 175 "poppler/CourierBoldWidths.gperf" + { "Odieresis", 600 }, + { "", 0 }, +#line 284 "poppler/CourierBoldWidths.gperf" + { "Acircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 67 "poppler/CourierBoldWidths.gperf" + { "P", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 238 "poppler/CourierBoldWidths.gperf" + { "Aring", 600 }, +#line 96 "poppler/CourierBoldWidths.gperf" + { "Oslash", 600 }, +#line 114 "poppler/CourierBoldWidths.gperf" + { "OE", 600 }, + { "", 0 }, +#line 171 "poppler/CourierBoldWidths.gperf" + { "Idieresis", 600 }, + { "", 0 }, +#line 62 "poppler/CourierBoldWidths.gperf" + { "M", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 282 "poppler/CourierBoldWidths.gperf" + { "fi", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 56 "poppler/CourierBoldWidths.gperf" + { "J", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 263 "poppler/CourierBoldWidths.gperf" + { "igrave", 600 }, + { "", 0 }, +#line 255 "poppler/CourierBoldWidths.gperf" + { "Ohungarumlaut", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 243 "poppler/CourierBoldWidths.gperf" + { "Uogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 87 "poppler/CourierBoldWidths.gperf" + { "b", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 167 "poppler/CourierBoldWidths.gperf" + { "Egrave", 600 }, + { "", 0 }, + { "", 0 }, +#line 182 "poppler/CourierBoldWidths.gperf" + { "Ydieresis", 600 }, + { "", 0 }, +#line 195 "poppler/CourierBoldWidths.gperf" + { "ugrave", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 211 "poppler/CourierBoldWidths.gperf" + { "multiply", 600 }, + { "", 0 }, + { "", 0 }, +#line 66 "poppler/CourierBoldWidths.gperf" + { "O", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 31 "poppler/CourierBoldWidths.gperf" + { "Aogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 279 "poppler/CourierBoldWidths.gperf" + { "florin", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 226 "poppler/CourierBoldWidths.gperf" + { "Ocircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 283 "poppler/CourierBoldWidths.gperf" + { "fl", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 55 "poppler/CourierBoldWidths.gperf" + { "I", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 286 "poppler/CourierBoldWidths.gperf" + { "Icircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 54 "poppler/CourierBoldWidths.gperf" + { "H", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 134 "poppler/CourierBoldWidths.gperf" + { "Lslash", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 99 "poppler/CourierBoldWidths.gperf" + { "k", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 184 "poppler/CourierBoldWidths.gperf" + { "abreve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 217 "poppler/CourierBoldWidths.gperf" + { "partialdiff", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 52 "poppler/CourierBoldWidths.gperf" + { "F", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 178 "poppler/CourierBoldWidths.gperf" + { "Ugrave", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 91 "poppler/CourierBoldWidths.gperf" + { "f", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 119 "poppler/CourierBoldWidths.gperf" + { "v", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 63 "poppler/CourierBoldWidths.gperf" + { "N", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 41 "poppler/CourierBoldWidths.gperf" + { "Agrave", 600 }, +#line 34 "poppler/CourierBoldWidths.gperf" + { "Iogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 82 "poppler/CourierBoldWidths.gperf" + { "Y", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 46 "poppler/CourierBoldWidths.gperf" + { "B", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 177 "poppler/CourierBoldWidths.gperf" + { "bracketleft", 600 }, +#line 260 "poppler/CourierBoldWidths.gperf" + { "bracketright", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 142 "poppler/CourierBoldWidths.gperf" + { "gbreve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 215 "poppler/CourierBoldWidths.gperf" + { "Ograve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 60 "poppler/CourierBoldWidths.gperf" + { "L", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 246 "poppler/CourierBoldWidths.gperf" + { "Igrave", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 83 "poppler/CourierBoldWidths.gperf" + { "Z", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 162 "poppler/CourierBoldWidths.gperf" + { "Abreve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 124 "poppler/CourierBoldWidths.gperf" + { "Gbreve", 600 } }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { + register unsigned int key = hash(str, len); + + if (key <= MAX_HASH_VALUE) { + register const char *s = wordlist[key].name; + + if (*str == *s && !strcmp(str + 1, s + 1)) + return &wordlist[key]; + } + } + return 0; +} +#line 330 "poppler/CourierBoldWidths.gperf" diff --git a/poppler-24.05.0/poppler/CourierObliqueWidths.gperf b/poppler-24.05.0/poppler/CourierObliqueWidths.gperf new file mode 100644 index 0000000000000000000000000000000000000000..fd321d2d966a7f1c63a61c6bf5fc9dc5f089c49e --- /dev/null +++ b/poppler-24.05.0/poppler/CourierObliqueWidths.gperf @@ -0,0 +1,330 @@ +%{ +#include +#include "BuiltinFontWidth.h" +%} +%language=ANSI-C +%define initializer-suffix ,0 +%define lookup-function-name CourierObliqueWidthsLookup +%struct-type +%omit-struct-type +%readonly-tables +struct BuiltinFontWidth +%% +#### +Ntilde, 600 +rcaron, 600 +kcommaaccent, 600 +Ncommaaccent, 600 +Zacute, 600 +comma, 600 +cedilla, 600 +plusminus, 600 +circumflex, 600 +dotaccent, 600 +edotaccent, 600 +asciitilde, 600 +colon, 600 +onehalf, 600 +dollar, 600 +Lcaron, 600 +ntilde, 600 +Aogonek, 600 +ncommaaccent, 600 +minus, 600 +Iogonek, 600 +zacute, 600 +yen, 600 +space, 600 +Omacron, 600 +questiondown, 600 +emdash, 600 +Agrave, 600 +three, 600 +numbersign, 600 +lcaron, 600 +A, 600 +B, 600 +C, 600 +aogonek, 600 +D, 600 +E, 600 +onequarter, 600 +F, 600 +G, 600 +H, 600 +I, 600 +J, 600 +K, 600 +iogonek, 600 +backslash, 600 +L, 600 +periodcentered, 600 +M, 600 +N, 600 +omacron, 600 +Tcommaaccent, 600 +O, 600 +P, 600 +Q, 600 +Uhungarumlaut, 600 +R, 600 +Aacute, 600 +caron, 600 +S, 600 +T, 600 +U, 600 +agrave, 600 +V, 600 +W, 600 +X, 600 +question, 600 +equal, 600 +Y, 600 +Z, 600 +four, 600 +a, 600 +Gcommaaccent, 600 +b, 600 +c, 600 +d, 600 +e, 600 +f, 600 +g, 600 +bullet, 600 +h, 600 +i, 600 +Oslash, 600 +dagger, 600 +j, 600 +k, 600 +l, 600 +m, 600 +n, 600 +tcommaaccent, 600 +o, 600 +ordfeminine, 600 +ring, 600 +p, 600 +q, 600 +uhungarumlaut, 600 +r, 600 +twosuperior, 600 +aacute, 600 +s, 600 +OE, 600 +t, 600 +divide, 600 +u, 600 +Ccaron, 600 +v, 600 +w, 600 +x, 600 +y, 600 +z, 600 +Gbreve, 600 +commaaccent, 600 +hungarumlaut, 600 +Idotaccent, 600 +Nacute, 600 +quotedbl, 600 +gcommaaccent, 600 +mu, 600 +greaterequal, 600 +Scaron, 600 +Lslash, 600 +semicolon, 600 +oslash, 600 +lessequal, 600 +lozenge, 600 +parenright, 600 +ccaron, 600 +Ecircumflex, 600 +gbreve, 600 +trademark, 600 +daggerdbl, 600 +nacute, 600 +macron, 600 +Otilde, 600 +Emacron, 600 +ellipsis, 600 +scaron, 600 +AE, 600 +Ucircumflex, 600 +lslash, 600 +quotedblleft, 600 +guilsinglright, 600 +hyphen, 600 +quotesingle, 600 +eight, 600 +exclamdown, 600 +endash, 600 +oe, 600 +Abreve, 600 +Umacron, 600 +ecircumflex, 600 +Adieresis, 600 +copyright, 600 +Egrave, 600 +slash, 600 +Edieresis, 600 +otilde, 600 +Idieresis, 600 +parenleft, 600 +one, 600 +emacron, 600 +Odieresis, 600 +ucircumflex, 600 +bracketleft, 600 +Ugrave, 600 +quoteright, 600 +Udieresis, 600 +perthousand, 600 +Ydieresis, 600 +umacron, 600 +abreve, 600 +Eacute, 600 +adieresis, 600 +egrave, 600 +edieresis, 600 +idieresis, 600 +Eth, 600 +ae, 600 +asterisk, 600 +odieresis, 600 +Uacute, 600 +ugrave, 600 +nine, 600 +five, 600 +udieresis, 600 +Zcaron, 600 +Scommaaccent, 600 +threequarters, 600 +guillemotright, 600 +Ccedilla, 600 +ydieresis, 600 +tilde, 600 +at, 600 +eacute, 600 +underscore, 600 +Euro, 600 +Dcroat, 600 +multiply, 600 +zero, 600 +eth, 600 +Scedilla, 600 +Ograve, 600 +Racute, 600 +partialdiff, 600 +uacute, 600 +braceleft, 600 +Thorn, 600 +zcaron, 600 +scommaaccent, 600 +ccedilla, 600 +Dcaron, 600 +dcroat, 600 +Ocircumflex, 600 +Oacute, 600 +scedilla, 600 +ogonek, 600 +ograve, 600 +racute, 600 +Tcaron, 600 +Eogonek, 600 +thorn, 600 +degree, 600 +registered, 600 +radical, 600 +Aring, 600 +percent, 600 +six, 600 +paragraph, 600 +dcaron, 600 +Uogonek, 600 +two, 600 +summation, 600 +Igrave, 600 +Lacute, 600 +ocircumflex, 600 +oacute, 600 +Uring, 600 +Lcommaaccent, 600 +tcaron, 600 +eogonek, 600 +Delta, 600 +Ohungarumlaut, 600 +asciicircum, 600 +aring, 600 +grave, 600 +uogonek, 600 +bracketright, 600 +Iacute, 600 +ampersand, 600 +igrave, 600 +lacute, 600 +Ncaron, 600 +plus, 600 +uring, 600 +quotesinglbase, 600 +lcommaaccent, 600 +Yacute, 600 +ohungarumlaut, 600 +threesuperior, 600 +acute, 600 +section, 600 +dieresis, 600 +iacute, 600 +quotedblbase, 600 +ncaron, 600 +florin, 600 +yacute, 600 +Rcommaaccent, 600 +fi, 600 +fl, 600 +Acircumflex, 600 +Cacute, 600 +Icircumflex, 600 +guillemotleft, 600 +germandbls, 600 +Amacron, 600 +seven, 600 +Sacute, 600 +ordmasculine, 600 +dotlessi, 600 +sterling, 600 +notequal, 600 +Imacron, 600 +rcommaaccent, 600 +Zdotaccent, 600 +acircumflex, 600 +cacute, 600 +Ecaron, 600 +icircumflex, 600 +braceright, 600 +quotedblright, 600 +amacron, 600 +sacute, 600 +imacron, 600 +cent, 600 +currency, 600 +logicalnot, 600 +zdotaccent, 600 +Atilde, 600 +breve, 600 +bar, 600 +fraction, 600 +less, 600 +ecaron, 600 +guilsinglleft, 600 +exclam, 600 +period, 600 +Rcaron, 600 +Kcommaaccent, 600 +greater, 600 +atilde, 600 +brokenbar, 600 +quoteleft, 600 +Edotaccent, 600 +onesuperior, 600 +#### +%% diff --git a/poppler-24.05.0/poppler/CourierObliqueWidths.pregenerated.c b/poppler-24.05.0/poppler/CourierObliqueWidths.pregenerated.c new file mode 100644 index 0000000000000000000000000000000000000000..6bd7908eaa0c0988190e76df943c6cfa2910f42e --- /dev/null +++ b/poppler-24.05.0/poppler/CourierObliqueWidths.pregenerated.c @@ -0,0 +1,1437 @@ +/* ANSI-C code produced by gperf version 3.1 */ +/* Command-line: gperf poppler/CourierObliqueWidths.gperf */ +/* Computed positions: -k'1-2,5,$' */ + +#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) && ('-' == 45) && ('.' == 46) && ('/' == 47) \ + && ('0' == 48) && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) && ('=' == 61) && ('>' == 62) \ + && ('?' == 63) && ('A' == 65) && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) && ('N' == 78) \ + && ('O' == 79) && ('P' == 80) && ('Q' == 81) && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ + && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) && ('k' == 107) && ('l' == 108) \ + && ('m' == 109) && ('n' == 110) && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ + && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) +/* The character set is not based on ISO-646. */ +# error "gperf generated tables don't work with this execution character set. Please report a bug to ." +#endif + +#line 1 "poppler/CourierObliqueWidths.gperf" + +#include +#include "BuiltinFontWidth.h" + +#define TOTAL_KEYWORDS 315 +#define MIN_WORD_LENGTH 1 +#define MAX_WORD_LENGTH 14 +#define MIN_HASH_VALUE 1 +#define MAX_HASH_VALUE 1041 +/* maximum key range = 1041, duplicates = 0 */ + +#ifdef __GNUC__ +__inline +#else +# ifdef __cplusplus +inline +# endif +#endif + static unsigned int + hash(register const char *str, register size_t len) +{ + static const unsigned short asso_values[] = { 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 270, 415, 28, 8, 150, 390, 290, 375, 370, 335, 5, 455, 330, 405, 355, 325, 310, 3, 320, 160, 240, 225, + 145, 70, 410, 460, 1042, 1042, 1042, 1042, 1042, 1042, 20, 345, 30, 115, 0, 395, 140, 165, 135, 35, 380, 170, 130, 15, 45, 215, 260, 100, 65, + 10, 155, 400, 300, 305, 280, 315, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042 }; + register unsigned int hval = len; + + switch (hval) { + default: + hval += asso_values[(unsigned char)str[4]]; + /*FALLTHROUGH*/ + case 4: + case 3: + case 2: + hval += asso_values[(unsigned char)str[1]]; + /*FALLTHROUGH*/ + case 1: + hval += asso_values[(unsigned char)str[0]]; + break; + } + return hval + asso_values[(unsigned char)str[len - 1]]; +} + +const struct BuiltinFontWidth *CourierObliqueWidthsLookup(register const char *str, register size_t len) +{ + static const struct BuiltinFontWidth wordlist[] = { { "", 0 }, +#line 90 "poppler/CourierObliqueWidths.gperf" + { "e", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 70 "poppler/CourierObliqueWidths.gperf" + { "R", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 57 "poppler/CourierObliqueWidths.gperf" + { "K", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 49 "poppler/CourierObliqueWidths.gperf" + { "D", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 115 "poppler/CourierObliqueWidths.gperf" + { "t", 600 }, +#line 191 "poppler/CourierObliqueWidths.gperf" + { "ae", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 102 "poppler/CourierObliqueWidths.gperf" + { "n", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 207 "poppler/CourierObliqueWidths.gperf" + { "eacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 216 "poppler/CourierObliqueWidths.gperf" + { "Racute", 600 }, + { "", 0 }, +#line 85 "poppler/CourierObliqueWidths.gperf" + { "a", 600 }, +#line 206 "poppler/CourierObliqueWidths.gperf" + { "at", 600 }, + { "", 0 }, +#line 308 "poppler/CourierObliqueWidths.gperf" + { "cent", 600 }, + { "", 0 }, + { "", 0 }, +#line 161 "poppler/CourierObliqueWidths.gperf" + { "oe", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 145 "poppler/CourierObliqueWidths.gperf" + { "nacute", 600 }, + { "", 0 }, +#line 254 "poppler/CourierObliqueWidths.gperf" + { "Delta", 600 }, + { "", 0 }, +#line 273 "poppler/CourierObliqueWidths.gperf" + { "acute", 600 }, +#line 112 "poppler/CourierObliqueWidths.gperf" + { "aacute", 600 }, +#line 47 "poppler/CourierObliqueWidths.gperf" + { "C", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 88 "poppler/CourierObliqueWidths.gperf" + { "c", 600 }, + { "", 0 }, +#line 173 "poppler/CourierObliqueWidths.gperf" + { "one", 600 }, +#line 285 "poppler/CourierObliqueWidths.gperf" + { "Cacute", 600 }, + { "", 0 }, +#line 300 "poppler/CourierObliqueWidths.gperf" + { "cacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 98 "poppler/CourierObliqueWidths.gperf" + { "j", 600 }, + { "", 0 }, + { "", 0 }, +#line 210 "poppler/CourierObliqueWidths.gperf" + { "Dcroat", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 249 "poppler/CourierObliqueWidths.gperf" + { "oacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 72 "poppler/CourierObliqueWidths.gperf" + { "caron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 104 "poppler/CourierObliqueWidths.gperf" + { "o", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 317 "poppler/CourierObliqueWidths.gperf" + { "ecaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 321 "poppler/CourierObliqueWidths.gperf" + { "Rcaron", 600 }, +#line 290 "poppler/CourierObliqueWidths.gperf" + { "seven", 600 }, +#line 306 "poppler/CourierObliqueWidths.gperf" + { "sacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 224 "poppler/CourierObliqueWidths.gperf" + { "Dcaron", 600 }, + { "", 0 }, +#line 252 "poppler/CourierObliqueWidths.gperf" + { "tcaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 26 "poppler/CourierObliqueWidths.gperf" + { "colon", 600 }, +#line 278 "poppler/CourierObliqueWidths.gperf" + { "ncaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 125 "poppler/CourierObliqueWidths.gperf" + { "commaaccent", 600 }, + { "", 0 }, + { "", 0 }, +#line 135 "poppler/CourierObliqueWidths.gperf" + { "semicolon", 600 }, +#line 19 "poppler/CourierObliqueWidths.gperf" + { "comma", 600 }, +#line 235 "poppler/CourierObliqueWidths.gperf" + { "degree", 600 }, + { "", 0 }, + { "", 0 }, +#line 118 "poppler/CourierObliqueWidths.gperf" + { "Ccaron", 600 }, + { "", 0 }, +#line 140 "poppler/CourierObliqueWidths.gperf" + { "ccaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 113 "poppler/CourierObliqueWidths.gperf" + { "s", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 231 "poppler/CourierObliqueWidths.gperf" + { "racute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 79 "poppler/CourierObliqueWidths.gperf" + { "X", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 30 "poppler/CourierObliqueWidths.gperf" + { "ntilde", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 205 "poppler/CourierObliqueWidths.gperf" + { "tilde", 600 }, +#line 324 "poppler/CourierObliqueWidths.gperf" + { "atilde", 600 }, + { "", 0 }, + { "", 0 }, +#line 196 "poppler/CourierObliqueWidths.gperf" + { "nine", 600 }, +#line 24 "poppler/CourierObliqueWidths.gperf" + { "edotaccent", 600 }, +#line 105 "poppler/CourierObliqueWidths.gperf" + { "ordfeminine", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 158 "poppler/CourierObliqueWidths.gperf" + { "eight", 600 }, +#line 150 "poppler/CourierObliqueWidths.gperf" + { "scaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 276 "poppler/CourierObliqueWidths.gperf" + { "iacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 170 "poppler/CourierObliqueWidths.gperf" + { "otilde", 600 }, +#line 292 "poppler/CourierObliqueWidths.gperf" + { "ordmasculine", 600 }, +#line 213 "poppler/CourierObliqueWidths.gperf" + { "eth", 600 }, + { "", 0 }, +#line 42 "poppler/CourierObliqueWidths.gperf" + { "three", 600 }, +#line 225 "poppler/CourierObliqueWidths.gperf" + { "dcroat", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 281 "poppler/CourierObliqueWidths.gperf" + { "Rcommaaccent", 600 }, +#line 185 "poppler/CourierObliqueWidths.gperf" + { "Eacute", 600 }, +#line 322 "poppler/CourierObliqueWidths.gperf" + { "Kcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 218 "poppler/CourierObliqueWidths.gperf" + { "uacute", 600 }, +#line 103 "poppler/CourierObliqueWidths.gperf" + { "tcommaaccent", 600 }, + { "", 0 }, +#line 166 "poppler/CourierObliqueWidths.gperf" + { "copyright", 600 }, +#line 43 "poppler/CourierObliqueWidths.gperf" + { "numbersign", 600 }, +#line 15 "poppler/CourierObliqueWidths.gperf" + { "rcaron", 600 }, +#line 32 "poppler/CourierObliqueWidths.gperf" + { "ncommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 110 "poppler/CourierObliqueWidths.gperf" + { "r", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 264 "poppler/CourierObliqueWidths.gperf" + { "lacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 23 "poppler/CourierObliqueWidths.gperf" + { "dotaccent", 600 }, +#line 234 "poppler/CourierObliqueWidths.gperf" + { "thorn", 600 }, +#line 242 "poppler/CourierObliqueWidths.gperf" + { "dcaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 146 "poppler/CourierObliqueWidths.gperf" + { "macron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 203 "poppler/CourierObliqueWidths.gperf" + { "Ccedilla", 600 }, +#line 274 "poppler/CourierObliqueWidths.gperf" + { "section", 600 }, +#line 223 "poppler/CourierObliqueWidths.gperf" + { "ccedilla", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 20 "poppler/CourierObliqueWidths.gperf" + { "cedilla", 600 }, + { "", 0 }, + { "", 0 }, +#line 25 "poppler/CourierObliqueWidths.gperf" + { "asciitilde", 600 }, +#line 89 "poppler/CourierObliqueWidths.gperf" + { "d", 600 }, +#line 239 "poppler/CourierObliqueWidths.gperf" + { "percent", 600 }, + { "", 0 }, + { "", 0 }, +#line 288 "poppler/CourierObliqueWidths.gperf" + { "germandbls", 600 }, + { "", 0 }, +#line 138 "poppler/CourierObliqueWidths.gperf" + { "lozenge", 600 }, + { "", 0 }, +#line 316 "poppler/CourierObliqueWidths.gperf" + { "less", 600 }, + { "", 0 }, +#line 97 "poppler/CourierObliqueWidths.gperf" + { "dagger", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 258 "poppler/CourierObliqueWidths.gperf" + { "grave", 600 }, +#line 301 "poppler/CourierObliqueWidths.gperf" + { "Ecaron", 600 }, +#line 222 "poppler/CourierObliqueWidths.gperf" + { "scommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 160 "poppler/CourierObliqueWidths.gperf" + { "endash", 600 }, +#line 174 "poppler/CourierObliqueWidths.gperf" + { "emacron", 600 }, +#line 201 "poppler/CourierObliqueWidths.gperf" + { "threequarters", 600 }, + { "", 0 }, + { "", 0 }, +#line 232 "poppler/CourierObliqueWidths.gperf" + { "Tcaron", 600 }, + { "", 0 }, +#line 228 "poppler/CourierObliqueWidths.gperf" + { "scedilla", 600 }, + { "", 0 }, + { "", 0 }, +#line 101 "poppler/CourierObliqueWidths.gperf" + { "m", 600 }, + { "", 0 }, + { "", 0 }, +#line 245 "poppler/CourierObliqueWidths.gperf" + { "summation", 600 }, +#line 310 "poppler/CourierObliqueWidths.gperf" + { "logicalnot", 600 }, +#line 44 "poppler/CourierObliqueWidths.gperf" + { "lcaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 172 "poppler/CourierObliqueWidths.gperf" + { "parenleft", 600 }, +#line 139 "poppler/CourierObliqueWidths.gperf" + { "parenright", 600 }, +#line 95 "poppler/CourierObliqueWidths.gperf" + { "i", 600 }, +#line 305 "poppler/CourierObliqueWidths.gperf" + { "amacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 194 "poppler/CourierObliqueWidths.gperf" + { "Uacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 208 "poppler/CourierObliqueWidths.gperf" + { "underscore", 600 }, +#line 92 "poppler/CourierObliqueWidths.gperf" + { "g", 600 }, +#line 297 "poppler/CourierObliqueWidths.gperf" + { "rcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, +#line 37 "poppler/CourierObliqueWidths.gperf" + { "space", 600 }, +#line 28 "poppler/CourierObliqueWidths.gperf" + { "dollar", 600 }, + { "", 0 }, +#line 272 "poppler/CourierObliqueWidths.gperf" + { "threesuperior", 600 }, +#line 188 "poppler/CourierObliqueWidths.gperf" + { "edieresis", 600 }, +#line 236 "poppler/CourierObliqueWidths.gperf" + { "registered", 600 }, +#line 78 "poppler/CourierObliqueWidths.gperf" + { "W", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 64 "poppler/CourierObliqueWidths.gperf" + { "omacron", 600 }, +#line 36 "poppler/CourierObliqueWidths.gperf" + { "yen", 600 }, + { "", 0 }, + { "", 0 }, +#line 50 "poppler/CourierObliqueWidths.gperf" + { "E", 600 }, + { "", 0 }, +#line 293 "poppler/CourierObliqueWidths.gperf" + { "dotlessi", 600 }, + { "", 0 }, +#line 327 "poppler/CourierObliqueWidths.gperf" + { "Edotaccent", 600 }, +#line 71 "poppler/CourierObliqueWidths.gperf" + { "Aacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 186 "poppler/CourierObliqueWidths.gperf" + { "adieresis", 600 }, + { "", 0 }, +#line 117 "poppler/CourierObliqueWidths.gperf" + { "u", 600 }, + { "", 0 }, + { "", 0 }, +#line 144 "poppler/CourierObliqueWidths.gperf" + { "daggerdbl", 600 }, + { "", 0 }, +#line 280 "poppler/CourierObliqueWidths.gperf" + { "yacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 74 "poppler/CourierObliqueWidths.gperf" + { "T", 600 }, +#line 130 "poppler/CourierObliqueWidths.gperf" + { "gcommaaccent", 600 }, +#line 275 "poppler/CourierObliqueWidths.gperf" + { "dieresis", 600 }, + { "", 0 }, +#line 51 "poppler/CourierObliqueWidths.gperf" + { "onequarter", 600 }, +#line 328 "poppler/CourierObliqueWidths.gperf" + { "onesuperior", 600 }, +#line 237 "poppler/CourierObliqueWidths.gperf" + { "radical", 600 }, +#line 190 "poppler/CourierObliqueWidths.gperf" + { "Eth", 600 }, + { "", 0 }, + { "", 0 }, +#line 94 "poppler/CourierObliqueWidths.gperf" + { "h", 600 }, + { "", 0 }, + { "", 0 }, +#line 193 "poppler/CourierObliqueWidths.gperf" + { "odieresis", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 100 "poppler/CourierObliqueWidths.gperf" + { "l", 600 }, +#line 65 "poppler/CourierObliqueWidths.gperf" + { "Tcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 136 "poppler/CourierObliqueWidths.gperf" + { "oslash", 600 }, + { "", 0 }, + { "", 0 }, +#line 137 "poppler/CourierObliqueWidths.gperf" + { "lessequal", 600 }, +#line 159 "poppler/CourierObliqueWidths.gperf" + { "exclamdown", 600 }, +#line 35 "poppler/CourierObliqueWidths.gperf" + { "zacute", 600 }, +#line 269 "poppler/CourierObliqueWidths.gperf" + { "lcommaaccent", 600 }, + { "", 0 }, +#line 209 "poppler/CourierObliqueWidths.gperf" + { "Euro", 600 }, + { "", 0 }, +#line 291 "poppler/CourierObliqueWidths.gperf" + { "Sacute", 600 }, +#line 323 "poppler/CourierObliqueWidths.gperf" + { "greater", 600 }, +#line 244 "poppler/CourierObliqueWidths.gperf" + { "two", 600 }, + { "", 0 }, +#line 220 "poppler/CourierObliqueWidths.gperf" + { "Thorn", 600 }, +#line 256 "poppler/CourierObliqueWidths.gperf" + { "asciicircum", 600 }, +#line 126 "poppler/CourierObliqueWidths.gperf" + { "hungarumlaut", 600 }, + { "", 0 }, +#line 212 "poppler/CourierObliqueWidths.gperf" + { "zero", 600 }, + { "", 0 }, +#line 40 "poppler/CourierObliqueWidths.gperf" + { "emdash", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 116 "poppler/CourierObliqueWidths.gperf" + { "divide", 600 }, + { "", 0 }, +#line 271 "poppler/CourierObliqueWidths.gperf" + { "ohungarumlaut", 600 }, +#line 262 "poppler/CourierObliqueWidths.gperf" + { "ampersand", 600 }, + { "", 0 }, +#line 164 "poppler/CourierObliqueWidths.gperf" + { "ecircumflex", 600 }, + { "", 0 }, + { "", 0 }, +#line 106 "poppler/CourierObliqueWidths.gperf" + { "ring", 600 }, + { "", 0 }, +#line 320 "poppler/CourierObliqueWidths.gperf" + { "period", 600 }, + { "", 0 }, +#line 318 "poppler/CourierObliqueWidths.gperf" + { "guilsinglleft", 600 }, +#line 155 "poppler/CourierObliqueWidths.gperf" + { "guilsinglright", 600 }, + { "", 0 }, + { "", 0 }, +#line 307 "poppler/CourierObliqueWidths.gperf" + { "imacron", 600 }, + { "", 0 }, +#line 61 "poppler/CourierObliqueWidths.gperf" + { "periodcentered", 600 }, + { "", 0 }, +#line 227 "poppler/CourierObliqueWidths.gperf" + { "Oacute", 600 }, + { "", 0 }, +#line 294 "poppler/CourierObliqueWidths.gperf" + { "sterling", 600 }, + { "", 0 }, + { "", 0 }, +#line 299 "poppler/CourierObliqueWidths.gperf" + { "acircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 33 "poppler/CourierObliqueWidths.gperf" + { "minus", 600 }, +#line 312 "poppler/CourierObliqueWidths.gperf" + { "Atilde", 600 }, +#line 148 "poppler/CourierObliqueWidths.gperf" + { "Emacron", 600 }, + { "", 0 }, + { "", 0 }, +#line 257 "poppler/CourierObliqueWidths.gperf" + { "aring", 600 }, +#line 261 "poppler/CourierObliqueWidths.gperf" + { "Iacute", 600 }, +#line 183 "poppler/CourierObliqueWidths.gperf" + { "umacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 221 "poppler/CourierObliqueWidths.gperf" + { "zcaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 133 "poppler/CourierObliqueWidths.gperf" + { "Scaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 248 "poppler/CourierObliqueWidths.gperf" + { "ocircumflex", 600 }, + { "", 0 }, + { "", 0 }, +#line 189 "poppler/CourierObliqueWidths.gperf" + { "idieresis", 600 }, + { "", 0 }, +#line 157 "poppler/CourierObliqueWidths.gperf" + { "quotesingle", 600 }, +#line 277 "poppler/CourierObliqueWidths.gperf" + { "quotedblbase", 600 }, + { "", 0 }, +#line 268 "poppler/CourierObliqueWidths.gperf" + { "quotesinglbase", 600 }, + { "", 0 }, +#line 107 "poppler/CourierObliqueWidths.gperf" + { "p", 600 }, +#line 132 "poppler/CourierObliqueWidths.gperf" + { "greaterequal", 600 }, + { "", 0 }, +#line 326 "poppler/CourierObliqueWidths.gperf" + { "quoteleft", 600 }, +#line 179 "poppler/CourierObliqueWidths.gperf" + { "quoteright", 600 }, + { "", 0 }, +#line 154 "poppler/CourierObliqueWidths.gperf" + { "quotedblleft", 600 }, +#line 304 "poppler/CourierObliqueWidths.gperf" + { "quotedblright", 600 }, +#line 169 "poppler/CourierObliqueWidths.gperf" + { "Edieresis", 600 }, + { "", 0 }, +#line 128 "poppler/CourierObliqueWidths.gperf" + { "Nacute", 600 }, +#line 131 "poppler/CourierObliqueWidths.gperf" + { "mu", 600 }, + { "", 0 }, +#line 198 "poppler/CourierObliqueWidths.gperf" + { "udieresis", 600 }, + { "", 0 }, +#line 270 "poppler/CourierObliqueWidths.gperf" + { "Yacute", 600 }, +#line 253 "poppler/CourierObliqueWidths.gperf" + { "eogonek", 600 }, +#line 80 "poppler/CourierObliqueWidths.gperf" + { "question", 600 }, + { "", 0 }, +#line 313 "poppler/CourierObliqueWidths.gperf" + { "breve", 600 }, +#line 77 "poppler/CourierObliqueWidths.gperf" + { "V", 600 }, +#line 39 "poppler/CourierObliqueWidths.gperf" + { "questiondown", 600 }, + { "", 0 }, +#line 266 "poppler/CourierObliqueWidths.gperf" + { "plus", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 149 "poppler/CourierObliqueWidths.gperf" + { "ellipsis", 600 }, + { "", 0 }, + { "", 0 }, +#line 319 "poppler/CourierObliqueWidths.gperf" + { "exclam", 600 }, + { "", 0 }, + { "", 0 }, +#line 219 "poppler/CourierObliqueWidths.gperf" + { "braceleft", 600 }, +#line 303 "poppler/CourierObliqueWidths.gperf" + { "braceright", 600 }, +#line 156 "poppler/CourierObliqueWidths.gperf" + { "hyphen", 600 }, +#line 48 "poppler/CourierObliqueWidths.gperf" + { "aogonek", 600 }, +#line 314 "poppler/CourierObliqueWidths.gperf" + { "bar", 600 }, + { "", 0 }, +#line 311 "poppler/CourierObliqueWidths.gperf" + { "zdotaccent", 600 }, +#line 153 "poppler/CourierObliqueWidths.gperf" + { "lslash", 600 }, +#line 86 "poppler/CourierObliqueWidths.gperf" + { "Gcommaaccent", 600 }, +#line 309 "poppler/CourierObliqueWidths.gperf" + { "currency", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 75 "poppler/CourierObliqueWidths.gperf" + { "U", 600 }, +#line 27 "poppler/CourierObliqueWidths.gperf" + { "onehalf", 600 }, +#line 109 "poppler/CourierObliqueWidths.gperf" + { "uhungarumlaut", 600 }, + { "", 0 }, + { "", 0 }, +#line 147 "poppler/CourierObliqueWidths.gperf" + { "Otilde", 600 }, + { "", 0 }, +#line 287 "poppler/CourierObliqueWidths.gperf" + { "guillemotleft", 600 }, +#line 202 "poppler/CourierObliqueWidths.gperf" + { "guillemotright", 600 }, + { "", 0 }, +#line 247 "poppler/CourierObliqueWidths.gperf" + { "Lacute", 600 }, +#line 163 "poppler/CourierObliqueWidths.gperf" + { "Umacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 18 "poppler/CourierObliqueWidths.gperf" + { "Zacute", 600 }, + { "", 0 }, +#line 295 "poppler/CourierObliqueWidths.gperf" + { "notequal", 600 }, +#line 143 "poppler/CourierObliqueWidths.gperf" + { "trademark", 600 }, + { "", 0 }, +#line 265 "poppler/CourierObliqueWidths.gperf" + { "Ncaron", 600 }, +#line 200 "poppler/CourierObliqueWidths.gperf" + { "Scommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 181 "poppler/CourierObliqueWidths.gperf" + { "perthousand", 600 }, + { "", 0 }, +#line 240 "poppler/CourierObliqueWidths.gperf" + { "six", 600 }, + { "", 0 }, + { "", 0 }, +#line 302 "poppler/CourierObliqueWidths.gperf" + { "icircumflex", 600 }, + { "", 0 }, +#line 214 "poppler/CourierObliqueWidths.gperf" + { "Scedilla", 600 }, + { "", 0 }, + { "", 0 }, +#line 93 "poppler/CourierObliqueWidths.gperf" + { "bullet", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 108 "poppler/CourierObliqueWidths.gperf" + { "q", 600 }, +#line 289 "poppler/CourierObliqueWidths.gperf" + { "Amacron", 600 }, + { "", 0 }, + { "", 0 }, +#line 127 "poppler/CourierObliqueWidths.gperf" + { "Idotaccent", 600 }, +#line 141 "poppler/CourierObliqueWidths.gperf" + { "Ecircumflex", 600 }, + { "", 0 }, +#line 315 "poppler/CourierObliqueWidths.gperf" + { "fraction", 600 }, +#line 180 "poppler/CourierObliqueWidths.gperf" + { "Udieresis", 600 }, + { "", 0 }, +#line 176 "poppler/CourierObliqueWidths.gperf" + { "ucircumflex", 600 }, + { "", 0 }, + { "", 0 }, +#line 197 "poppler/CourierObliqueWidths.gperf" + { "five", 600 }, + { "", 0 }, +#line 14 "poppler/CourierObliqueWidths.gperf" + { "Ntilde", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 267 "poppler/CourierObliqueWidths.gperf" + { "uring", 600 }, +#line 45 "poppler/CourierObliqueWidths.gperf" + { "A", 600 }, + { "", 0 }, + { "", 0 }, +#line 84 "poppler/CourierObliqueWidths.gperf" + { "four", 600 }, + { "", 0 }, +#line 187 "poppler/CourierObliqueWidths.gperf" + { "egrave", 600 }, + { "", 0 }, + { "", 0 }, +#line 241 "poppler/CourierObliqueWidths.gperf" + { "paragraph", 600 }, + { "", 0 }, +#line 29 "poppler/CourierObliqueWidths.gperf" + { "Lcaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 325 "poppler/CourierObliqueWidths.gperf" + { "brokenbar", 600 }, + { "", 0 }, +#line 199 "poppler/CourierObliqueWidths.gperf" + { "Zcaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 165 "poppler/CourierObliqueWidths.gperf" + { "Adieresis", 600 }, + { "", 0 }, +#line 122 "poppler/CourierObliqueWidths.gperf" + { "y", 600 }, +#line 16 "poppler/CourierObliqueWidths.gperf" + { "kcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 76 "poppler/CourierObliqueWidths.gperf" + { "agrave", 600 }, + { "", 0 }, +#line 69 "poppler/CourierObliqueWidths.gperf" + { "Uhungarumlaut", 600 }, +#line 204 "poppler/CourierObliqueWidths.gperf" + { "ydieresis", 600 }, +#line 168 "poppler/CourierObliqueWidths.gperf" + { "slash", 600 }, +#line 229 "poppler/CourierObliqueWidths.gperf" + { "ogonek", 600 }, +#line 151 "poppler/CourierObliqueWidths.gperf" + { "AE", 600 }, +#line 192 "poppler/CourierObliqueWidths.gperf" + { "asterisk", 600 }, + { "", 0 }, + { "", 0 }, +#line 111 "poppler/CourierObliqueWidths.gperf" + { "twosuperior", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 53 "poppler/CourierObliqueWidths.gperf" + { "G", 600 }, +#line 58 "poppler/CourierObliqueWidths.gperf" + { "iogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 17 "poppler/CourierObliqueWidths.gperf" + { "Ncommaaccent", 600 }, + { "", 0 }, +#line 21 "poppler/CourierObliqueWidths.gperf" + { "plusminus", 600 }, + { "", 0 }, +#line 230 "poppler/CourierObliqueWidths.gperf" + { "ograve", 600 }, + { "", 0 }, +#line 129 "poppler/CourierObliqueWidths.gperf" + { "quotedbl", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 233 "poppler/CourierObliqueWidths.gperf" + { "Eogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 120 "poppler/CourierObliqueWidths.gperf" + { "w", 600 }, +#line 259 "poppler/CourierObliqueWidths.gperf" + { "uogonek", 600 }, + { "", 0 }, +#line 59 "poppler/CourierObliqueWidths.gperf" + { "backslash", 600 }, +#line 81 "poppler/CourierObliqueWidths.gperf" + { "equal", 600 }, + { "", 0 }, +#line 38 "poppler/CourierObliqueWidths.gperf" + { "Omacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 121 "poppler/CourierObliqueWidths.gperf" + { "x", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 298 "poppler/CourierObliqueWidths.gperf" + { "Zdotaccent", 600 }, +#line 152 "poppler/CourierObliqueWidths.gperf" + { "Ucircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 68 "poppler/CourierObliqueWidths.gperf" + { "Q", 600 }, +#line 296 "poppler/CourierObliqueWidths.gperf" + { "Imacron", 600 }, + { "", 0 }, + { "", 0 }, +#line 250 "poppler/CourierObliqueWidths.gperf" + { "Uring", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 123 "poppler/CourierObliqueWidths.gperf" + { "z", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 22 "poppler/CourierObliqueWidths.gperf" + { "circumflex", 600 }, + { "", 0 }, +#line 251 "poppler/CourierObliqueWidths.gperf" + { "Lcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 73 "poppler/CourierObliqueWidths.gperf" + { "S", 600 }, + { "", 0 }, + { "", 0 }, +#line 175 "poppler/CourierObliqueWidths.gperf" + { "Odieresis", 600 }, + { "", 0 }, +#line 284 "poppler/CourierObliqueWidths.gperf" + { "Acircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 67 "poppler/CourierObliqueWidths.gperf" + { "P", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 238 "poppler/CourierObliqueWidths.gperf" + { "Aring", 600 }, +#line 96 "poppler/CourierObliqueWidths.gperf" + { "Oslash", 600 }, +#line 114 "poppler/CourierObliqueWidths.gperf" + { "OE", 600 }, + { "", 0 }, +#line 171 "poppler/CourierObliqueWidths.gperf" + { "Idieresis", 600 }, + { "", 0 }, +#line 62 "poppler/CourierObliqueWidths.gperf" + { "M", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 282 "poppler/CourierObliqueWidths.gperf" + { "fi", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 56 "poppler/CourierObliqueWidths.gperf" + { "J", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 263 "poppler/CourierObliqueWidths.gperf" + { "igrave", 600 }, + { "", 0 }, +#line 255 "poppler/CourierObliqueWidths.gperf" + { "Ohungarumlaut", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 243 "poppler/CourierObliqueWidths.gperf" + { "Uogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 87 "poppler/CourierObliqueWidths.gperf" + { "b", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 167 "poppler/CourierObliqueWidths.gperf" + { "Egrave", 600 }, + { "", 0 }, + { "", 0 }, +#line 182 "poppler/CourierObliqueWidths.gperf" + { "Ydieresis", 600 }, + { "", 0 }, +#line 195 "poppler/CourierObliqueWidths.gperf" + { "ugrave", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 211 "poppler/CourierObliqueWidths.gperf" + { "multiply", 600 }, + { "", 0 }, + { "", 0 }, +#line 66 "poppler/CourierObliqueWidths.gperf" + { "O", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 31 "poppler/CourierObliqueWidths.gperf" + { "Aogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 279 "poppler/CourierObliqueWidths.gperf" + { "florin", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 226 "poppler/CourierObliqueWidths.gperf" + { "Ocircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 283 "poppler/CourierObliqueWidths.gperf" + { "fl", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 55 "poppler/CourierObliqueWidths.gperf" + { "I", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 286 "poppler/CourierObliqueWidths.gperf" + { "Icircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 54 "poppler/CourierObliqueWidths.gperf" + { "H", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 134 "poppler/CourierObliqueWidths.gperf" + { "Lslash", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 99 "poppler/CourierObliqueWidths.gperf" + { "k", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 184 "poppler/CourierObliqueWidths.gperf" + { "abreve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 217 "poppler/CourierObliqueWidths.gperf" + { "partialdiff", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 52 "poppler/CourierObliqueWidths.gperf" + { "F", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 178 "poppler/CourierObliqueWidths.gperf" + { "Ugrave", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 91 "poppler/CourierObliqueWidths.gperf" + { "f", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 119 "poppler/CourierObliqueWidths.gperf" + { "v", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 63 "poppler/CourierObliqueWidths.gperf" + { "N", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 41 "poppler/CourierObliqueWidths.gperf" + { "Agrave", 600 }, +#line 34 "poppler/CourierObliqueWidths.gperf" + { "Iogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 82 "poppler/CourierObliqueWidths.gperf" + { "Y", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 46 "poppler/CourierObliqueWidths.gperf" + { "B", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 177 "poppler/CourierObliqueWidths.gperf" + { "bracketleft", 600 }, +#line 260 "poppler/CourierObliqueWidths.gperf" + { "bracketright", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 142 "poppler/CourierObliqueWidths.gperf" + { "gbreve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 215 "poppler/CourierObliqueWidths.gperf" + { "Ograve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 60 "poppler/CourierObliqueWidths.gperf" + { "L", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 246 "poppler/CourierObliqueWidths.gperf" + { "Igrave", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 83 "poppler/CourierObliqueWidths.gperf" + { "Z", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 162 "poppler/CourierObliqueWidths.gperf" + { "Abreve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 124 "poppler/CourierObliqueWidths.gperf" + { "Gbreve", 600 } }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { + register unsigned int key = hash(str, len); + + if (key <= MAX_HASH_VALUE) { + register const char *s = wordlist[key].name; + + if (*str == *s && !strcmp(str + 1, s + 1)) + return &wordlist[key]; + } + } + return 0; +} +#line 330 "poppler/CourierObliqueWidths.gperf" diff --git a/poppler-24.05.0/poppler/CourierWidths.gperf b/poppler-24.05.0/poppler/CourierWidths.gperf new file mode 100644 index 0000000000000000000000000000000000000000..89804dd94ff5ba726556ae312139eddd4de5e4d0 --- /dev/null +++ b/poppler-24.05.0/poppler/CourierWidths.gperf @@ -0,0 +1,330 @@ +%{ +#include +#include "BuiltinFontWidth.h" +%} +%language=ANSI-C +%define initializer-suffix ,0 +%define lookup-function-name CourierWidthsLookup +%struct-type +%omit-struct-type +%readonly-tables +struct BuiltinFontWidth +%% +#### +Ntilde, 600 +rcaron, 600 +kcommaaccent, 600 +Ncommaaccent, 600 +Zacute, 600 +comma, 600 +cedilla, 600 +plusminus, 603 +circumflex, 600 +dotaccent, 600 +edotaccent, 600 +asciitilde, 600 +colon, 600 +onehalf, 600 +dollar, 600 +Lcaron, 600 +ntilde, 600 +Aogonek, 600 +ncommaaccent, 600 +minus, 600 +Iogonek, 600 +zacute, 600 +yen, 600 +space, 600 +Omacron, 600 +questiondown, 600 +emdash, 600 +Agrave, 600 +three, 600 +numbersign, 600 +lcaron, 600 +A, 600 +B, 600 +C, 600 +aogonek, 600 +D, 600 +E, 600 +onequarter, 600 +F, 600 +G, 600 +H, 600 +I, 600 +J, 600 +K, 600 +iogonek, 600 +L, 600 +backslash, 600 +periodcentered, 600 +M, 600 +N, 600 +omacron, 600 +Tcommaaccent, 600 +O, 600 +P, 600 +Q, 600 +Uhungarumlaut, 600 +R, 600 +Aacute, 600 +caron, 600 +S, 600 +T, 600 +U, 600 +agrave, 600 +V, 600 +W, 600 +equal, 600 +question, 600 +X, 600 +Y, 600 +Z, 600 +four, 600 +a, 600 +Gcommaaccent, 600 +b, 600 +c, 600 +d, 600 +e, 600 +f, 600 +g, 600 +bullet, 600 +h, 600 +i, 600 +Oslash, 600 +dagger, 600 +j, 600 +k, 600 +l, 600 +m, 600 +n, 600 +tcommaaccent, 600 +o, 600 +ordfeminine, 600 +ring, 600 +p, 600 +q, 600 +uhungarumlaut, 600 +r, 600 +twosuperior, 600 +aacute, 600 +s, 600 +OE, 600 +t, 600 +divide, 600 +u, 600 +Ccaron, 600 +v, 600 +w, 600 +x, 600 +y, 600 +z, 600 +Gbreve, 600 +commaaccent, 600 +hungarumlaut, 600 +Idotaccent, 600 +Nacute, 600 +quotedbl, 600 +gcommaaccent, 600 +mu, 600 +greaterequal, 600 +Scaron, 600 +Lslash, 600 +semicolon, 600 +oslash, 600 +lessequal, 600 +lozenge, 600 +parenright, 600 +ccaron, 600 +Ecircumflex, 600 +gbreve, 600 +trademark, 600 +daggerdbl, 600 +nacute, 600 +macron, 600 +Otilde, 600 +Emacron, 600 +ellipsis, 600 +scaron, 600 +AE, 600 +Ucircumflex, 600 +lslash, 600 +quotedblleft, 600 +hyphen, 600 +guilsinglright, 600 +quotesingle, 600 +eight, 600 +exclamdown, 600 +endash, 600 +oe, 600 +Abreve, 600 +Umacron, 600 +ecircumflex, 600 +Adieresis, 600 +copyright, 600 +Egrave, 600 +slash, 600 +Edieresis, 600 +otilde, 600 +Idieresis, 600 +parenleft, 600 +one, 600 +emacron, 600 +Odieresis, 600 +ucircumflex, 600 +bracketleft, 600 +Ugrave, 600 +quoteright, 600 +Udieresis, 600 +perthousand, 600 +Ydieresis, 600 +umacron, 600 +abreve, 600 +Eacute, 600 +adieresis, 600 +egrave, 600 +edieresis, 600 +idieresis, 600 +Eth, 600 +ae, 600 +asterisk, 600 +odieresis, 600 +Uacute, 600 +ugrave, 600 +five, 600 +nine, 600 +udieresis, 600 +Zcaron, 600 +Scommaaccent, 600 +threequarters, 600 +guillemotright, 600 +Ccedilla, 600 +ydieresis, 600 +tilde, 600 +at, 600 +eacute, 600 +underscore, 600 +Euro, 600 +Dcroat, 600 +zero, 600 +multiply, 600 +eth, 600 +Scedilla, 600 +Racute, 600 +Ograve, 600 +partialdiff, 600 +uacute, 600 +braceleft, 600 +Thorn, 600 +zcaron, 600 +scommaaccent, 600 +ccedilla, 600 +Dcaron, 600 +dcroat, 600 +scedilla, 600 +Oacute, 600 +Ocircumflex, 600 +ogonek, 600 +ograve, 600 +racute, 600 +Tcaron, 600 +Eogonek, 600 +thorn, 600 +degree, 600 +registered, 600 +radical, 600 +Aring, 600 +percent, 600 +six, 600 +paragraph, 600 +dcaron, 600 +Uogonek, 600 +two, 600 +summation, 600 +Igrave, 600 +Lacute, 600 +ocircumflex, 600 +oacute, 600 +Uring, 600 +Lcommaaccent, 600 +tcaron, 600 +eogonek, 600 +Delta, 600 +Ohungarumlaut, 600 +asciicircum, 600 +aring, 600 +grave, 600 +uogonek, 600 +bracketright, 600 +ampersand, 600 +Iacute, 600 +lacute, 600 +igrave, 600 +Ncaron, 600 +plus, 600 +uring, 600 +quotesinglbase, 600 +lcommaaccent, 600 +Yacute, 600 +ohungarumlaut, 600 +threesuperior, 600 +acute, 600 +section, 600 +dieresis, 600 +quotedblbase, 600 +iacute, 600 +ncaron, 600 +florin, 600 +yacute, 600 +Rcommaaccent, 600 +fi, 600 +fl, 600 +Acircumflex, 600 +Cacute, 600 +Icircumflex, 600 +guillemotleft, 600 +germandbls, 600 +seven, 600 +Amacron, 600 +Sacute, 600 +ordmasculine, 600 +dotlessi, 600 +sterling, 600 +notequal, 600 +Imacron, 600 +rcommaaccent, 600 +Zdotaccent, 600 +acircumflex, 600 +cacute, 600 +Ecaron, 600 +braceright, 600 +icircumflex, 600 +quotedblright, 600 +amacron, 600 +sacute, 600 +imacron, 600 +cent, 600 +currency, 600 +logicalnot, 600 +zdotaccent, 600 +Atilde, 600 +breve, 600 +bar, 600 +fraction, 600 +less, 600 +ecaron, 600 +guilsinglleft, 600 +exclam, 600 +period, 600 +Rcaron, 600 +Kcommaaccent, 600 +greater, 600 +atilde, 600 +brokenbar, 600 +quoteleft, 600 +Edotaccent, 600 +onesuperior, 600 +#### +%% diff --git a/poppler-24.05.0/poppler/CourierWidths.pregenerated.c b/poppler-24.05.0/poppler/CourierWidths.pregenerated.c new file mode 100644 index 0000000000000000000000000000000000000000..89dc214619641e94ea0f0f71e140c102e24a6942 --- /dev/null +++ b/poppler-24.05.0/poppler/CourierWidths.pregenerated.c @@ -0,0 +1,1437 @@ +/* ANSI-C code produced by gperf version 3.1 */ +/* Command-line: gperf poppler/CourierWidths.gperf */ +/* Computed positions: -k'1-2,5,$' */ + +#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) && ('-' == 45) && ('.' == 46) && ('/' == 47) \ + && ('0' == 48) && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) && ('=' == 61) && ('>' == 62) \ + && ('?' == 63) && ('A' == 65) && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) && ('N' == 78) \ + && ('O' == 79) && ('P' == 80) && ('Q' == 81) && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ + && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) && ('k' == 107) && ('l' == 108) \ + && ('m' == 109) && ('n' == 110) && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ + && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) +/* The character set is not based on ISO-646. */ +# error "gperf generated tables don't work with this execution character set. Please report a bug to ." +#endif + +#line 1 "poppler/CourierWidths.gperf" + +#include +#include "BuiltinFontWidth.h" + +#define TOTAL_KEYWORDS 315 +#define MIN_WORD_LENGTH 1 +#define MAX_WORD_LENGTH 14 +#define MIN_HASH_VALUE 1 +#define MAX_HASH_VALUE 1041 +/* maximum key range = 1041, duplicates = 0 */ + +#ifdef __GNUC__ +__inline +#else +# ifdef __cplusplus +inline +# endif +#endif + static unsigned int + hash(register const char *str, register size_t len) +{ + static const unsigned short asso_values[] = { 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 270, 415, 28, 8, 150, 390, 290, 375, 370, 335, 5, 455, 330, 405, 355, 325, 310, 3, 320, 160, 240, 225, + 145, 70, 410, 460, 1042, 1042, 1042, 1042, 1042, 1042, 20, 345, 30, 115, 0, 395, 140, 165, 135, 35, 380, 170, 130, 15, 45, 215, 260, 100, 65, + 10, 155, 400, 300, 305, 280, 315, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, + 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042, 1042 }; + register unsigned int hval = len; + + switch (hval) { + default: + hval += asso_values[(unsigned char)str[4]]; + /*FALLTHROUGH*/ + case 4: + case 3: + case 2: + hval += asso_values[(unsigned char)str[1]]; + /*FALLTHROUGH*/ + case 1: + hval += asso_values[(unsigned char)str[0]]; + break; + } + return hval + asso_values[(unsigned char)str[len - 1]]; +} + +const struct BuiltinFontWidth *CourierWidthsLookup(register const char *str, register size_t len) +{ + static const struct BuiltinFontWidth wordlist[] = { { "", 0 }, +#line 90 "poppler/CourierWidths.gperf" + { "e", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 70 "poppler/CourierWidths.gperf" + { "R", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 57 "poppler/CourierWidths.gperf" + { "K", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 49 "poppler/CourierWidths.gperf" + { "D", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 115 "poppler/CourierWidths.gperf" + { "t", 600 }, +#line 191 "poppler/CourierWidths.gperf" + { "ae", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 102 "poppler/CourierWidths.gperf" + { "n", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 207 "poppler/CourierWidths.gperf" + { "eacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 215 "poppler/CourierWidths.gperf" + { "Racute", 600 }, + { "", 0 }, +#line 85 "poppler/CourierWidths.gperf" + { "a", 600 }, +#line 206 "poppler/CourierWidths.gperf" + { "at", 600 }, + { "", 0 }, +#line 308 "poppler/CourierWidths.gperf" + { "cent", 600 }, + { "", 0 }, + { "", 0 }, +#line 161 "poppler/CourierWidths.gperf" + { "oe", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 145 "poppler/CourierWidths.gperf" + { "nacute", 600 }, + { "", 0 }, +#line 254 "poppler/CourierWidths.gperf" + { "Delta", 600 }, + { "", 0 }, +#line 273 "poppler/CourierWidths.gperf" + { "acute", 600 }, +#line 112 "poppler/CourierWidths.gperf" + { "aacute", 600 }, +#line 47 "poppler/CourierWidths.gperf" + { "C", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 88 "poppler/CourierWidths.gperf" + { "c", 600 }, + { "", 0 }, +#line 173 "poppler/CourierWidths.gperf" + { "one", 600 }, +#line 285 "poppler/CourierWidths.gperf" + { "Cacute", 600 }, + { "", 0 }, +#line 300 "poppler/CourierWidths.gperf" + { "cacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 98 "poppler/CourierWidths.gperf" + { "j", 600 }, + { "", 0 }, + { "", 0 }, +#line 210 "poppler/CourierWidths.gperf" + { "Dcroat", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 249 "poppler/CourierWidths.gperf" + { "oacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 72 "poppler/CourierWidths.gperf" + { "caron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 104 "poppler/CourierWidths.gperf" + { "o", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 317 "poppler/CourierWidths.gperf" + { "ecaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 321 "poppler/CourierWidths.gperf" + { "Rcaron", 600 }, +#line 289 "poppler/CourierWidths.gperf" + { "seven", 600 }, +#line 306 "poppler/CourierWidths.gperf" + { "sacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 224 "poppler/CourierWidths.gperf" + { "Dcaron", 600 }, + { "", 0 }, +#line 252 "poppler/CourierWidths.gperf" + { "tcaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 26 "poppler/CourierWidths.gperf" + { "colon", 600 }, +#line 278 "poppler/CourierWidths.gperf" + { "ncaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 125 "poppler/CourierWidths.gperf" + { "commaaccent", 600 }, + { "", 0 }, + { "", 0 }, +#line 135 "poppler/CourierWidths.gperf" + { "semicolon", 600 }, +#line 19 "poppler/CourierWidths.gperf" + { "comma", 600 }, +#line 235 "poppler/CourierWidths.gperf" + { "degree", 600 }, + { "", 0 }, + { "", 0 }, +#line 118 "poppler/CourierWidths.gperf" + { "Ccaron", 600 }, + { "", 0 }, +#line 140 "poppler/CourierWidths.gperf" + { "ccaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 113 "poppler/CourierWidths.gperf" + { "s", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 231 "poppler/CourierWidths.gperf" + { "racute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 81 "poppler/CourierWidths.gperf" + { "X", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 30 "poppler/CourierWidths.gperf" + { "ntilde", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 205 "poppler/CourierWidths.gperf" + { "tilde", 600 }, +#line 324 "poppler/CourierWidths.gperf" + { "atilde", 600 }, + { "", 0 }, + { "", 0 }, +#line 197 "poppler/CourierWidths.gperf" + { "nine", 600 }, +#line 24 "poppler/CourierWidths.gperf" + { "edotaccent", 600 }, +#line 105 "poppler/CourierWidths.gperf" + { "ordfeminine", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 158 "poppler/CourierWidths.gperf" + { "eight", 600 }, +#line 150 "poppler/CourierWidths.gperf" + { "scaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 277 "poppler/CourierWidths.gperf" + { "iacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 170 "poppler/CourierWidths.gperf" + { "otilde", 600 }, +#line 292 "poppler/CourierWidths.gperf" + { "ordmasculine", 600 }, +#line 213 "poppler/CourierWidths.gperf" + { "eth", 600 }, + { "", 0 }, +#line 42 "poppler/CourierWidths.gperf" + { "three", 600 }, +#line 225 "poppler/CourierWidths.gperf" + { "dcroat", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 281 "poppler/CourierWidths.gperf" + { "Rcommaaccent", 600 }, +#line 185 "poppler/CourierWidths.gperf" + { "Eacute", 600 }, +#line 322 "poppler/CourierWidths.gperf" + { "Kcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 218 "poppler/CourierWidths.gperf" + { "uacute", 600 }, +#line 103 "poppler/CourierWidths.gperf" + { "tcommaaccent", 600 }, + { "", 0 }, +#line 166 "poppler/CourierWidths.gperf" + { "copyright", 600 }, +#line 43 "poppler/CourierWidths.gperf" + { "numbersign", 600 }, +#line 15 "poppler/CourierWidths.gperf" + { "rcaron", 600 }, +#line 32 "poppler/CourierWidths.gperf" + { "ncommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 110 "poppler/CourierWidths.gperf" + { "r", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 263 "poppler/CourierWidths.gperf" + { "lacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 23 "poppler/CourierWidths.gperf" + { "dotaccent", 600 }, +#line 234 "poppler/CourierWidths.gperf" + { "thorn", 600 }, +#line 242 "poppler/CourierWidths.gperf" + { "dcaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 146 "poppler/CourierWidths.gperf" + { "macron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 203 "poppler/CourierWidths.gperf" + { "Ccedilla", 600 }, +#line 274 "poppler/CourierWidths.gperf" + { "section", 600 }, +#line 223 "poppler/CourierWidths.gperf" + { "ccedilla", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 20 "poppler/CourierWidths.gperf" + { "cedilla", 600 }, + { "", 0 }, + { "", 0 }, +#line 25 "poppler/CourierWidths.gperf" + { "asciitilde", 600 }, +#line 89 "poppler/CourierWidths.gperf" + { "d", 600 }, +#line 239 "poppler/CourierWidths.gperf" + { "percent", 600 }, + { "", 0 }, + { "", 0 }, +#line 288 "poppler/CourierWidths.gperf" + { "germandbls", 600 }, + { "", 0 }, +#line 138 "poppler/CourierWidths.gperf" + { "lozenge", 600 }, + { "", 0 }, +#line 316 "poppler/CourierWidths.gperf" + { "less", 600 }, + { "", 0 }, +#line 97 "poppler/CourierWidths.gperf" + { "dagger", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 258 "poppler/CourierWidths.gperf" + { "grave", 600 }, +#line 301 "poppler/CourierWidths.gperf" + { "Ecaron", 600 }, +#line 222 "poppler/CourierWidths.gperf" + { "scommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 160 "poppler/CourierWidths.gperf" + { "endash", 600 }, +#line 174 "poppler/CourierWidths.gperf" + { "emacron", 600 }, +#line 201 "poppler/CourierWidths.gperf" + { "threequarters", 600 }, + { "", 0 }, + { "", 0 }, +#line 232 "poppler/CourierWidths.gperf" + { "Tcaron", 600 }, + { "", 0 }, +#line 226 "poppler/CourierWidths.gperf" + { "scedilla", 600 }, + { "", 0 }, + { "", 0 }, +#line 101 "poppler/CourierWidths.gperf" + { "m", 600 }, + { "", 0 }, + { "", 0 }, +#line 245 "poppler/CourierWidths.gperf" + { "summation", 600 }, +#line 310 "poppler/CourierWidths.gperf" + { "logicalnot", 600 }, +#line 44 "poppler/CourierWidths.gperf" + { "lcaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 172 "poppler/CourierWidths.gperf" + { "parenleft", 600 }, +#line 139 "poppler/CourierWidths.gperf" + { "parenright", 600 }, +#line 95 "poppler/CourierWidths.gperf" + { "i", 600 }, +#line 305 "poppler/CourierWidths.gperf" + { "amacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 194 "poppler/CourierWidths.gperf" + { "Uacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 208 "poppler/CourierWidths.gperf" + { "underscore", 600 }, +#line 92 "poppler/CourierWidths.gperf" + { "g", 600 }, +#line 297 "poppler/CourierWidths.gperf" + { "rcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, +#line 37 "poppler/CourierWidths.gperf" + { "space", 600 }, +#line 28 "poppler/CourierWidths.gperf" + { "dollar", 600 }, + { "", 0 }, +#line 272 "poppler/CourierWidths.gperf" + { "threesuperior", 600 }, +#line 188 "poppler/CourierWidths.gperf" + { "edieresis", 600 }, +#line 236 "poppler/CourierWidths.gperf" + { "registered", 600 }, +#line 78 "poppler/CourierWidths.gperf" + { "W", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 64 "poppler/CourierWidths.gperf" + { "omacron", 600 }, +#line 36 "poppler/CourierWidths.gperf" + { "yen", 600 }, + { "", 0 }, + { "", 0 }, +#line 50 "poppler/CourierWidths.gperf" + { "E", 600 }, + { "", 0 }, +#line 293 "poppler/CourierWidths.gperf" + { "dotlessi", 600 }, + { "", 0 }, +#line 327 "poppler/CourierWidths.gperf" + { "Edotaccent", 600 }, +#line 71 "poppler/CourierWidths.gperf" + { "Aacute", 600 }, + { "", 0 }, + { "", 0 }, +#line 186 "poppler/CourierWidths.gperf" + { "adieresis", 600 }, + { "", 0 }, +#line 117 "poppler/CourierWidths.gperf" + { "u", 600 }, + { "", 0 }, + { "", 0 }, +#line 144 "poppler/CourierWidths.gperf" + { "daggerdbl", 600 }, + { "", 0 }, +#line 280 "poppler/CourierWidths.gperf" + { "yacute", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 74 "poppler/CourierWidths.gperf" + { "T", 600 }, +#line 130 "poppler/CourierWidths.gperf" + { "gcommaaccent", 600 }, +#line 275 "poppler/CourierWidths.gperf" + { "dieresis", 600 }, + { "", 0 }, +#line 51 "poppler/CourierWidths.gperf" + { "onequarter", 600 }, +#line 328 "poppler/CourierWidths.gperf" + { "onesuperior", 600 }, +#line 237 "poppler/CourierWidths.gperf" + { "radical", 600 }, +#line 190 "poppler/CourierWidths.gperf" + { "Eth", 600 }, + { "", 0 }, + { "", 0 }, +#line 94 "poppler/CourierWidths.gperf" + { "h", 600 }, + { "", 0 }, + { "", 0 }, +#line 193 "poppler/CourierWidths.gperf" + { "odieresis", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 100 "poppler/CourierWidths.gperf" + { "l", 600 }, +#line 65 "poppler/CourierWidths.gperf" + { "Tcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 136 "poppler/CourierWidths.gperf" + { "oslash", 600 }, + { "", 0 }, + { "", 0 }, +#line 137 "poppler/CourierWidths.gperf" + { "lessequal", 600 }, +#line 159 "poppler/CourierWidths.gperf" + { "exclamdown", 600 }, +#line 35 "poppler/CourierWidths.gperf" + { "zacute", 600 }, +#line 269 "poppler/CourierWidths.gperf" + { "lcommaaccent", 600 }, + { "", 0 }, +#line 209 "poppler/CourierWidths.gperf" + { "Euro", 600 }, + { "", 0 }, +#line 291 "poppler/CourierWidths.gperf" + { "Sacute", 600 }, +#line 323 "poppler/CourierWidths.gperf" + { "greater", 600 }, +#line 244 "poppler/CourierWidths.gperf" + { "two", 600 }, + { "", 0 }, +#line 220 "poppler/CourierWidths.gperf" + { "Thorn", 600 }, +#line 256 "poppler/CourierWidths.gperf" + { "asciicircum", 600 }, +#line 126 "poppler/CourierWidths.gperf" + { "hungarumlaut", 600 }, + { "", 0 }, +#line 211 "poppler/CourierWidths.gperf" + { "zero", 600 }, + { "", 0 }, +#line 40 "poppler/CourierWidths.gperf" + { "emdash", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 116 "poppler/CourierWidths.gperf" + { "divide", 600 }, + { "", 0 }, +#line 271 "poppler/CourierWidths.gperf" + { "ohungarumlaut", 600 }, +#line 261 "poppler/CourierWidths.gperf" + { "ampersand", 600 }, + { "", 0 }, +#line 164 "poppler/CourierWidths.gperf" + { "ecircumflex", 600 }, + { "", 0 }, + { "", 0 }, +#line 106 "poppler/CourierWidths.gperf" + { "ring", 600 }, + { "", 0 }, +#line 320 "poppler/CourierWidths.gperf" + { "period", 600 }, + { "", 0 }, +#line 318 "poppler/CourierWidths.gperf" + { "guilsinglleft", 600 }, +#line 156 "poppler/CourierWidths.gperf" + { "guilsinglright", 600 }, + { "", 0 }, + { "", 0 }, +#line 307 "poppler/CourierWidths.gperf" + { "imacron", 600 }, + { "", 0 }, +#line 61 "poppler/CourierWidths.gperf" + { "periodcentered", 600 }, + { "", 0 }, +#line 227 "poppler/CourierWidths.gperf" + { "Oacute", 600 }, + { "", 0 }, +#line 294 "poppler/CourierWidths.gperf" + { "sterling", 600 }, + { "", 0 }, + { "", 0 }, +#line 299 "poppler/CourierWidths.gperf" + { "acircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 33 "poppler/CourierWidths.gperf" + { "minus", 600 }, +#line 312 "poppler/CourierWidths.gperf" + { "Atilde", 600 }, +#line 148 "poppler/CourierWidths.gperf" + { "Emacron", 600 }, + { "", 0 }, + { "", 0 }, +#line 257 "poppler/CourierWidths.gperf" + { "aring", 600 }, +#line 262 "poppler/CourierWidths.gperf" + { "Iacute", 600 }, +#line 183 "poppler/CourierWidths.gperf" + { "umacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 221 "poppler/CourierWidths.gperf" + { "zcaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 133 "poppler/CourierWidths.gperf" + { "Scaron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 248 "poppler/CourierWidths.gperf" + { "ocircumflex", 600 }, + { "", 0 }, + { "", 0 }, +#line 189 "poppler/CourierWidths.gperf" + { "idieresis", 600 }, + { "", 0 }, +#line 157 "poppler/CourierWidths.gperf" + { "quotesingle", 600 }, +#line 276 "poppler/CourierWidths.gperf" + { "quotedblbase", 600 }, + { "", 0 }, +#line 268 "poppler/CourierWidths.gperf" + { "quotesinglbase", 600 }, + { "", 0 }, +#line 107 "poppler/CourierWidths.gperf" + { "p", 600 }, +#line 132 "poppler/CourierWidths.gperf" + { "greaterequal", 600 }, + { "", 0 }, +#line 326 "poppler/CourierWidths.gperf" + { "quoteleft", 600 }, +#line 179 "poppler/CourierWidths.gperf" + { "quoteright", 600 }, + { "", 0 }, +#line 154 "poppler/CourierWidths.gperf" + { "quotedblleft", 600 }, +#line 304 "poppler/CourierWidths.gperf" + { "quotedblright", 600 }, +#line 169 "poppler/CourierWidths.gperf" + { "Edieresis", 600 }, + { "", 0 }, +#line 128 "poppler/CourierWidths.gperf" + { "Nacute", 600 }, +#line 131 "poppler/CourierWidths.gperf" + { "mu", 600 }, + { "", 0 }, +#line 198 "poppler/CourierWidths.gperf" + { "udieresis", 600 }, + { "", 0 }, +#line 270 "poppler/CourierWidths.gperf" + { "Yacute", 600 }, +#line 253 "poppler/CourierWidths.gperf" + { "eogonek", 600 }, +#line 80 "poppler/CourierWidths.gperf" + { "question", 600 }, + { "", 0 }, +#line 313 "poppler/CourierWidths.gperf" + { "breve", 600 }, +#line 77 "poppler/CourierWidths.gperf" + { "V", 600 }, +#line 39 "poppler/CourierWidths.gperf" + { "questiondown", 600 }, + { "", 0 }, +#line 266 "poppler/CourierWidths.gperf" + { "plus", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 149 "poppler/CourierWidths.gperf" + { "ellipsis", 600 }, + { "", 0 }, + { "", 0 }, +#line 319 "poppler/CourierWidths.gperf" + { "exclam", 600 }, + { "", 0 }, + { "", 0 }, +#line 219 "poppler/CourierWidths.gperf" + { "braceleft", 600 }, +#line 302 "poppler/CourierWidths.gperf" + { "braceright", 600 }, +#line 155 "poppler/CourierWidths.gperf" + { "hyphen", 600 }, +#line 48 "poppler/CourierWidths.gperf" + { "aogonek", 600 }, +#line 314 "poppler/CourierWidths.gperf" + { "bar", 600 }, + { "", 0 }, +#line 311 "poppler/CourierWidths.gperf" + { "zdotaccent", 600 }, +#line 153 "poppler/CourierWidths.gperf" + { "lslash", 600 }, +#line 86 "poppler/CourierWidths.gperf" + { "Gcommaaccent", 600 }, +#line 309 "poppler/CourierWidths.gperf" + { "currency", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 75 "poppler/CourierWidths.gperf" + { "U", 600 }, +#line 27 "poppler/CourierWidths.gperf" + { "onehalf", 600 }, +#line 109 "poppler/CourierWidths.gperf" + { "uhungarumlaut", 600 }, + { "", 0 }, + { "", 0 }, +#line 147 "poppler/CourierWidths.gperf" + { "Otilde", 600 }, + { "", 0 }, +#line 287 "poppler/CourierWidths.gperf" + { "guillemotleft", 600 }, +#line 202 "poppler/CourierWidths.gperf" + { "guillemotright", 600 }, + { "", 0 }, +#line 247 "poppler/CourierWidths.gperf" + { "Lacute", 600 }, +#line 163 "poppler/CourierWidths.gperf" + { "Umacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 18 "poppler/CourierWidths.gperf" + { "Zacute", 600 }, + { "", 0 }, +#line 295 "poppler/CourierWidths.gperf" + { "notequal", 600 }, +#line 143 "poppler/CourierWidths.gperf" + { "trademark", 600 }, + { "", 0 }, +#line 265 "poppler/CourierWidths.gperf" + { "Ncaron", 600 }, +#line 200 "poppler/CourierWidths.gperf" + { "Scommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 181 "poppler/CourierWidths.gperf" + { "perthousand", 600 }, + { "", 0 }, +#line 240 "poppler/CourierWidths.gperf" + { "six", 600 }, + { "", 0 }, + { "", 0 }, +#line 303 "poppler/CourierWidths.gperf" + { "icircumflex", 600 }, + { "", 0 }, +#line 214 "poppler/CourierWidths.gperf" + { "Scedilla", 600 }, + { "", 0 }, + { "", 0 }, +#line 93 "poppler/CourierWidths.gperf" + { "bullet", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 108 "poppler/CourierWidths.gperf" + { "q", 600 }, +#line 290 "poppler/CourierWidths.gperf" + { "Amacron", 600 }, + { "", 0 }, + { "", 0 }, +#line 127 "poppler/CourierWidths.gperf" + { "Idotaccent", 600 }, +#line 141 "poppler/CourierWidths.gperf" + { "Ecircumflex", 600 }, + { "", 0 }, +#line 315 "poppler/CourierWidths.gperf" + { "fraction", 600 }, +#line 180 "poppler/CourierWidths.gperf" + { "Udieresis", 600 }, + { "", 0 }, +#line 176 "poppler/CourierWidths.gperf" + { "ucircumflex", 600 }, + { "", 0 }, + { "", 0 }, +#line 196 "poppler/CourierWidths.gperf" + { "five", 600 }, + { "", 0 }, +#line 14 "poppler/CourierWidths.gperf" + { "Ntilde", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 267 "poppler/CourierWidths.gperf" + { "uring", 600 }, +#line 45 "poppler/CourierWidths.gperf" + { "A", 600 }, + { "", 0 }, + { "", 0 }, +#line 84 "poppler/CourierWidths.gperf" + { "four", 600 }, + { "", 0 }, +#line 187 "poppler/CourierWidths.gperf" + { "egrave", 600 }, + { "", 0 }, + { "", 0 }, +#line 241 "poppler/CourierWidths.gperf" + { "paragraph", 600 }, + { "", 0 }, +#line 29 "poppler/CourierWidths.gperf" + { "Lcaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 325 "poppler/CourierWidths.gperf" + { "brokenbar", 600 }, + { "", 0 }, +#line 199 "poppler/CourierWidths.gperf" + { "Zcaron", 600 }, + { "", 0 }, + { "", 0 }, +#line 165 "poppler/CourierWidths.gperf" + { "Adieresis", 600 }, + { "", 0 }, +#line 122 "poppler/CourierWidths.gperf" + { "y", 600 }, +#line 16 "poppler/CourierWidths.gperf" + { "kcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 76 "poppler/CourierWidths.gperf" + { "agrave", 600 }, + { "", 0 }, +#line 69 "poppler/CourierWidths.gperf" + { "Uhungarumlaut", 600 }, +#line 204 "poppler/CourierWidths.gperf" + { "ydieresis", 600 }, +#line 168 "poppler/CourierWidths.gperf" + { "slash", 600 }, +#line 229 "poppler/CourierWidths.gperf" + { "ogonek", 600 }, +#line 151 "poppler/CourierWidths.gperf" + { "AE", 600 }, +#line 192 "poppler/CourierWidths.gperf" + { "asterisk", 600 }, + { "", 0 }, + { "", 0 }, +#line 111 "poppler/CourierWidths.gperf" + { "twosuperior", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 53 "poppler/CourierWidths.gperf" + { "G", 600 }, +#line 58 "poppler/CourierWidths.gperf" + { "iogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 17 "poppler/CourierWidths.gperf" + { "Ncommaaccent", 600 }, + { "", 0 }, +#line 21 "poppler/CourierWidths.gperf" + { "plusminus", 603 }, + { "", 0 }, +#line 230 "poppler/CourierWidths.gperf" + { "ograve", 600 }, + { "", 0 }, +#line 129 "poppler/CourierWidths.gperf" + { "quotedbl", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 233 "poppler/CourierWidths.gperf" + { "Eogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 120 "poppler/CourierWidths.gperf" + { "w", 600 }, +#line 259 "poppler/CourierWidths.gperf" + { "uogonek", 600 }, + { "", 0 }, +#line 60 "poppler/CourierWidths.gperf" + { "backslash", 600 }, +#line 79 "poppler/CourierWidths.gperf" + { "equal", 600 }, + { "", 0 }, +#line 38 "poppler/CourierWidths.gperf" + { "Omacron", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 121 "poppler/CourierWidths.gperf" + { "x", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 298 "poppler/CourierWidths.gperf" + { "Zdotaccent", 600 }, +#line 152 "poppler/CourierWidths.gperf" + { "Ucircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 68 "poppler/CourierWidths.gperf" + { "Q", 600 }, +#line 296 "poppler/CourierWidths.gperf" + { "Imacron", 600 }, + { "", 0 }, + { "", 0 }, +#line 250 "poppler/CourierWidths.gperf" + { "Uring", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 123 "poppler/CourierWidths.gperf" + { "z", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 22 "poppler/CourierWidths.gperf" + { "circumflex", 600 }, + { "", 0 }, +#line 251 "poppler/CourierWidths.gperf" + { "Lcommaaccent", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 73 "poppler/CourierWidths.gperf" + { "S", 600 }, + { "", 0 }, + { "", 0 }, +#line 175 "poppler/CourierWidths.gperf" + { "Odieresis", 600 }, + { "", 0 }, +#line 284 "poppler/CourierWidths.gperf" + { "Acircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 67 "poppler/CourierWidths.gperf" + { "P", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 238 "poppler/CourierWidths.gperf" + { "Aring", 600 }, +#line 96 "poppler/CourierWidths.gperf" + { "Oslash", 600 }, +#line 114 "poppler/CourierWidths.gperf" + { "OE", 600 }, + { "", 0 }, +#line 171 "poppler/CourierWidths.gperf" + { "Idieresis", 600 }, + { "", 0 }, +#line 62 "poppler/CourierWidths.gperf" + { "M", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 282 "poppler/CourierWidths.gperf" + { "fi", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 56 "poppler/CourierWidths.gperf" + { "J", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 264 "poppler/CourierWidths.gperf" + { "igrave", 600 }, + { "", 0 }, +#line 255 "poppler/CourierWidths.gperf" + { "Ohungarumlaut", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 243 "poppler/CourierWidths.gperf" + { "Uogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 87 "poppler/CourierWidths.gperf" + { "b", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 167 "poppler/CourierWidths.gperf" + { "Egrave", 600 }, + { "", 0 }, + { "", 0 }, +#line 182 "poppler/CourierWidths.gperf" + { "Ydieresis", 600 }, + { "", 0 }, +#line 195 "poppler/CourierWidths.gperf" + { "ugrave", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 212 "poppler/CourierWidths.gperf" + { "multiply", 600 }, + { "", 0 }, + { "", 0 }, +#line 66 "poppler/CourierWidths.gperf" + { "O", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 31 "poppler/CourierWidths.gperf" + { "Aogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 279 "poppler/CourierWidths.gperf" + { "florin", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 228 "poppler/CourierWidths.gperf" + { "Ocircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 283 "poppler/CourierWidths.gperf" + { "fl", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 55 "poppler/CourierWidths.gperf" + { "I", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 286 "poppler/CourierWidths.gperf" + { "Icircumflex", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 54 "poppler/CourierWidths.gperf" + { "H", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 134 "poppler/CourierWidths.gperf" + { "Lslash", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 99 "poppler/CourierWidths.gperf" + { "k", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 184 "poppler/CourierWidths.gperf" + { "abreve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 217 "poppler/CourierWidths.gperf" + { "partialdiff", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 52 "poppler/CourierWidths.gperf" + { "F", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 178 "poppler/CourierWidths.gperf" + { "Ugrave", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 91 "poppler/CourierWidths.gperf" + { "f", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 119 "poppler/CourierWidths.gperf" + { "v", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 63 "poppler/CourierWidths.gperf" + { "N", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 41 "poppler/CourierWidths.gperf" + { "Agrave", 600 }, +#line 34 "poppler/CourierWidths.gperf" + { "Iogonek", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 82 "poppler/CourierWidths.gperf" + { "Y", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 46 "poppler/CourierWidths.gperf" + { "B", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 177 "poppler/CourierWidths.gperf" + { "bracketleft", 600 }, +#line 260 "poppler/CourierWidths.gperf" + { "bracketright", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 142 "poppler/CourierWidths.gperf" + { "gbreve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 216 "poppler/CourierWidths.gperf" + { "Ograve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 59 "poppler/CourierWidths.gperf" + { "L", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 246 "poppler/CourierWidths.gperf" + { "Igrave", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 83 "poppler/CourierWidths.gperf" + { "Z", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 162 "poppler/CourierWidths.gperf" + { "Abreve", 600 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, + { "", 0 }, +#line 124 "poppler/CourierWidths.gperf" + { "Gbreve", 600 } }; + + if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) { + register unsigned int key = hash(str, len); + + if (key <= MAX_HASH_VALUE) { + register const char *s = wordlist[key].name; + + if (*str == *s && !strcmp(str + 1, s + 1)) + return &wordlist[key]; + } + } + return 0; +} +#line 330 "poppler/CourierWidths.gperf" diff --git a/poppler-24.05.0/poppler/CryptoSignBackend.cc b/poppler-24.05.0/poppler/CryptoSignBackend.cc new file mode 100644 index 0000000000000000000000000000000000000000..426ece5eea6dc32943b106d26983978c5da7c540 --- /dev/null +++ b/poppler-24.05.0/poppler/CryptoSignBackend.cc @@ -0,0 +1,116 @@ +//======================================================================== +// +// CryptoSignBackend.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela +//======================================================================== +#include "CryptoSignBackend.h" +#include "config.h" +#ifdef ENABLE_GPGME +# include "GPGMECryptoSignBackend.h" +#endif +#ifdef ENABLE_NSS3 +# include "NSSCryptoSignBackend.h" +#endif + +namespace CryptoSign { + +void Factory::setPreferredBackend(CryptoSign::Backend::Type backend) +{ + preferredBackend = backend; +} +static std::string_view toStringView(const char *str) +{ + if (str) { + return std::string_view(str); + } + return {}; +} + +std::optional Factory::typeFromString(std::string_view string) +{ + if (string.empty()) { + return std::nullopt; + } + if ("GPG" == string) { + return Backend::Type::GPGME; + } + if ("NSS" == string) { + return Backend::Type::NSS3; + } + return std::nullopt; +} + +std::optional Factory::getActive() +{ + if (preferredBackend) { + return *preferredBackend; + } + static auto backendFromEnvironment = typeFromString(toStringView(getenv("POPPLER_SIGNATURE_BACKEND"))); + if (backendFromEnvironment) { + return *backendFromEnvironment; + } + static auto backendFromCompiledDefault = typeFromString(toStringView(DEFAULT_SIGNATURE_BACKEND)); + if (backendFromCompiledDefault) { + return *backendFromCompiledDefault; + } + + return std::nullopt; +} +static std::vector createAvailableBackends() +{ + std::vector backends; +#ifdef ENABLE_NSS3 + backends.push_back(Backend::Type::NSS3); +#endif +#ifdef ENABLE_GPGME + if (GpgSignatureBackend::hasSufficientVersion()) { + backends.push_back(Backend::Type::GPGME); + } +#endif + return backends; +} +std::vector Factory::getAvailable() +{ + static std::vector availableBackends = createAvailableBackends(); + return availableBackends; +} +std::unique_ptr Factory::createActive() +{ + auto active = getActive(); + if (active) { + return create(active.value()); + } + return nullptr; +} +std::unique_ptr CryptoSign::Factory::create(Backend::Type backend) +{ + switch (backend) { + case Backend::Type::NSS3: +#ifdef ENABLE_NSS3 + return std::make_unique(); +#else + return nullptr; +#endif + case Backend::Type::GPGME: { +#ifdef ENABLE_GPGME + return std::make_unique(); +#else + return nullptr; +#endif + } + } + return nullptr; +} +/// backend specific settings + +// Android build wants some methods out of line in the interfaces +Backend::~Backend() = default; +SigningInterface::~SigningInterface() = default; +VerificationInterface::~VerificationInterface() = default; + +std::optional Factory::preferredBackend = std::nullopt; + +} // namespace Signature; diff --git a/poppler-24.05.0/poppler/CryptoSignBackend.h b/poppler-24.05.0/poppler/CryptoSignBackend.h new file mode 100644 index 0000000000000000000000000000000000000000..6c9f23250c18efeed3206672db90901b1c4833f7 --- /dev/null +++ b/poppler-24.05.0/poppler/CryptoSignBackend.h @@ -0,0 +1,105 @@ +//======================================================================== +// +// CryptoSignBackend.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +//======================================================================== + +#ifndef SIGNATUREBACKEND_H +#define SIGNATUREBACKEND_H + +#include +#include +#include +#include +#include +#include "HashAlgorithm.h" +#include "CertificateInfo.h" +#include "SignatureInfo.h" +#include "goo/GooString.h" +#include "poppler_private_export.h" + +namespace CryptoSign { + +// experiments seems to say that this is a bit above +// what we have seen in the wild, and much larger than +// what we have managed to get nss and gpgme to create. +static const int maxSupportedSignatureSize = 10000; + +// Classes to help manage signature backends + +class VerificationInterface +{ +public: + virtual void addData(unsigned char *data_block, int data_len) = 0; + virtual SignatureValidationStatus validateSignature() = 0; + virtual std::chrono::system_clock::time_point getSigningTime() const = 0; + virtual std::string getSignerName() const = 0; + virtual std::string getSignerSubjectDN() const = 0; + virtual HashAlgorithm getHashAlgorithm() const = 0; + + // Blocking if doneCallback to validateCertificateAsync has not yet been called + virtual CertificateValidationStatus validateCertificateResult() = 0; + virtual void validateCertificateAsync(std::chrono::system_clock::time_point validation_time, bool ocspRevocationCheck, bool useAIACertFetch, const std::function &doneCallback) = 0; + virtual std::unique_ptr getCertificateInfo() const = 0; + virtual ~VerificationInterface(); + VerificationInterface() = default; + VerificationInterface(const VerificationInterface &other) = delete; + VerificationInterface &operator=(const VerificationInterface &other) = delete; +}; + +class SigningInterface +{ +public: + virtual void addData(unsigned char *data_block, int data_len) = 0; + virtual std::unique_ptr getCertificateInfo() const = 0; + virtual std::optional signDetached(const std::string &password) = 0; + virtual ~SigningInterface(); + SigningInterface() = default; + SigningInterface(const SigningInterface &other) = delete; + SigningInterface &operator=(const SigningInterface &other) = delete; +}; + +class Backend +{ +public: + enum class Type + { + NSS3, + GPGME + }; + virtual std::unique_ptr createVerificationHandler(std::vector &&pkcs7) = 0; + virtual std::unique_ptr createSigningHandler(const std::string &certID, HashAlgorithm digestAlgTag) = 0; + virtual std::vector> getAvailableSigningCertificates() = 0; + virtual ~Backend(); + Backend() = default; + Backend(const Backend &other) = delete; + Backend &operator=(const Backend &other) = delete; +}; + +class POPPLER_PRIVATE_EXPORT Factory +{ +public: + // Sets the user preferred backend + static void setPreferredBackend(Backend::Type backend); + // Gets the current active backend + // prioritized from 1) setPreferredBackend, + // 2) POPPLER_SIGNATURE_BACKEND + // 3) Compiled in default + static std::optional getActive(); + static std::vector getAvailable(); + static std::unique_ptr createActive(); + static std::unique_ptr create(Backend::Type); + static std::optional typeFromString(std::string_view string); + Factory() = delete; + /// backend specific settings + +private: + static std::optional preferredBackend; +}; + +} + +#endif // SIGNATUREBACKEND_H diff --git a/poppler-24.05.0/poppler/CurlCachedFile.cc b/poppler-24.05.0/poppler/CurlCachedFile.cc new file mode 100644 index 0000000000000000000000000000000000000000..4ec0e200808af3c69a2766769790ff055e749536 --- /dev/null +++ b/poppler-24.05.0/poppler/CurlCachedFile.cc @@ -0,0 +1,94 @@ +//======================================================================== +// +// CurlCachedFile.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2009 Stefan Thomas +// Copyright 2010, 2011 Hib Eris +// Copyright 2010, 2019, 2021, 2022 Albert Astals Cid +// +//======================================================================== + +#include + +#include "CurlCachedFile.h" + +#include "goo/GooString.h" + +//------------------------------------------------------------------------ + +CurlCachedFileLoader::CurlCachedFileLoader(const std::string &urlA) : url(urlA) +{ + cachedFile = nullptr; + curl = nullptr; +} + +CurlCachedFileLoader::~CurlCachedFileLoader() +{ + curl_easy_cleanup(curl); +} + +static size_t noop_cb(char *ptr, size_t size, size_t nmemb, void *ptr2) +{ + return size * nmemb; +} + +size_t CurlCachedFileLoader::init(CachedFile *cachedFileA) +{ + curl_off_t contentLength = -1; + long code = 0; + size_t size; + + cachedFile = cachedFileA; + curl = curl_easy_init(); + + curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); + curl_easy_setopt(curl, CURLOPT_HEADER, 1); + curl_easy_setopt(curl, CURLOPT_NOBODY, 1); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &noop_cb); + curl_easy_perform(curl); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code); + if (code) { + curl_easy_getinfo(curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &contentLength); + size = contentLength; + } else { + error(errInternal, -1, "Failed to get size of '{0:s}'.", url.c_str()); + size = -1; + } + curl_easy_reset(curl); + + return size; +} + +static size_t load_cb(const char *ptr, size_t size, size_t nmemb, void *data) +{ + CachedFileWriter *writer = (CachedFileWriter *)data; + return (writer->write)(ptr, size * nmemb); +} + +int CurlCachedFileLoader::load(const std::vector &ranges, CachedFileWriter *writer) +{ + CURLcode r = CURLE_OK; + unsigned long long fromByte, toByte; + for (const ByteRange &bRange : ranges) { + + fromByte = bRange.offset; + toByte = fromByte + bRange.length - 1; + const std::unique_ptr range = GooString::format("{0:ulld}-{1:ulld}", fromByte, toByte); + + curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, load_cb); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, writer); + curl_easy_setopt(curl, CURLOPT_RANGE, range->c_str()); + r = curl_easy_perform(curl); + curl_easy_reset(curl); + + if (r != CURLE_OK) { + break; + } + } + return r; +} + +//------------------------------------------------------------------------ diff --git a/poppler-24.05.0/poppler/CurlCachedFile.h b/poppler-24.05.0/poppler/CurlCachedFile.h new file mode 100644 index 0000000000000000000000000000000000000000..752b7005b493a56a827542106f0b3c5d1969afee --- /dev/null +++ b/poppler-24.05.0/poppler/CurlCachedFile.h @@ -0,0 +1,37 @@ +//======================================================================== +// +// CurlCachedFile.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2010 Hib Eris +// Copyright 2010, 2022 Albert Astals Cid +// +//======================================================================== + +#ifndef CURLCACHELOADER_H +#define CURLCACHELOADER_H + +#include "poppler-config.h" +#include "CachedFile.h" + +#include + +//------------------------------------------------------------------------ + +class CurlCachedFileLoader : public CachedFileLoader +{ + +public: + explicit CurlCachedFileLoader(const std::string &urlA); + ~CurlCachedFileLoader() override; + size_t init(CachedFile *cachedFile) override; + int load(const std::vector &ranges, CachedFileWriter *writer) override; + +private: + const std::string url; + CachedFile *cachedFile; + CURL *curl; +}; + +#endif diff --git a/poppler-24.05.0/poppler/CurlPDFDocBuilder.cc b/poppler-24.05.0/poppler/CurlPDFDocBuilder.cc new file mode 100644 index 0000000000000000000000000000000000000000..57ae7a50966fce3c2e4f24e683ffe3682f628ada --- /dev/null +++ b/poppler-24.05.0/poppler/CurlPDFDocBuilder.cc @@ -0,0 +1,46 @@ +//======================================================================== +// +// CurlPDFDocBuilder.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2010 Hib Eris +// Copyright 2010, 2017, 2022 Albert Astals Cid +// Copyright 2021 Oliver Sander +// +//======================================================================== + +#include + +#include "CurlPDFDocBuilder.h" + +#include "CachedFile.h" +#include "CurlCachedFile.h" +#include "ErrorCodes.h" + +//------------------------------------------------------------------------ +// CurlPDFDocBuilder +//------------------------------------------------------------------------ + +std::unique_ptr CurlPDFDocBuilder::buildPDFDoc(const GooString &uri, const std::optional &ownerPassword, const std::optional &userPassword, void *guiDataA) +{ + CachedFile *cachedFile = new CachedFile(new CurlCachedFileLoader(uri.toStr())); + + if (cachedFile->getLength() == ((unsigned int)-1)) { + cachedFile->decRefCnt(); + return PDFDoc::ErrorPDFDoc(errOpenFile, std::unique_ptr(uri.copy())); + } + + BaseStream *str = new CachedFileStream(cachedFile, 0, false, cachedFile->getLength(), Object(objNull)); + + return std::make_unique(str, ownerPassword, userPassword, guiDataA); +} + +bool CurlPDFDocBuilder::supports(const GooString &uri) +{ + if (uri.cmpN("http://", 7) == 0 || uri.cmpN("https://", 8) == 0) { + return true; + } else { + return false; + } +} diff --git a/poppler-24.05.0/poppler/CurlPDFDocBuilder.h b/poppler-24.05.0/poppler/CurlPDFDocBuilder.h new file mode 100644 index 0000000000000000000000000000000000000000..f1106b3513ef8ef3ec78900ca28a74941de9772c --- /dev/null +++ b/poppler-24.05.0/poppler/CurlPDFDocBuilder.h @@ -0,0 +1,32 @@ +//======================================================================== +// +// CurlPDFDocBuilder.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2010 Hib Eris +// Copyright 2010, 2018, 2022 Albert Astals Cid +// Copyright 2021 Oliver Sander +// +//======================================================================== + +#ifndef CURLPDFDOCBUILDER_H +#define CURLPDFDOCBUILDER_H + +#include "PDFDocBuilder.h" + +//------------------------------------------------------------------------ +// CurlPDFDocBuilder +// +// The CurlPDFDocBuilder implements a PDFDocBuilder for 'http(s)://'. +//------------------------------------------------------------------------ + +class CurlPDFDocBuilder : public PDFDocBuilder +{ + +public: + std::unique_ptr buildPDFDoc(const GooString &uri, const std::optional &ownerPassword = {}, const std::optional &userPassword = {}, void *guiDataA = nullptr) override; + bool supports(const GooString &uri) override; +}; + +#endif /* CURLPDFDOCBUILDER_H */ diff --git a/poppler-24.05.0/poppler/DCTStream.cc b/poppler-24.05.0/poppler/DCTStream.cc new file mode 100644 index 0000000000000000000000000000000000000000..cff9101daeba90e8b13508bc95a7f7a87f2bcdee --- /dev/null +++ b/poppler-24.05.0/poppler/DCTStream.cc @@ -0,0 +1,266 @@ +//======================================================================== +// +// DCTStream.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2005 Jeff Muizelaar +// Copyright 2005-2010, 2012, 2017, 2020-2023 Albert Astals Cid +// Copyright 2009 Ryszard Trojnacki +// Copyright 2010 Carlos Garcia Campos +// Copyright 2011 Daiki Ueno +// Copyright 2011 Tomas Hoger +// Copyright 2012, 2013 Thomas Freitag +// Copyright 2017 Adrian Johnson +// Copyright 2020 Lluís Batlle i Rossell +// +//======================================================================== + +#include "DCTStream.h" + +static void str_init_source(j_decompress_ptr cinfo) { } + +static boolean str_fill_input_buffer(j_decompress_ptr cinfo) +{ + int c; + struct str_src_mgr *src = (struct str_src_mgr *)cinfo->src; + if (src->index == 0) { + c = 0xFF; + src->index++; + } else if (src->index == 1) { + c = 0xD8; + src->index++; + } else { + c = src->str->getChar(); + } + src->buffer = c; + src->pub.next_input_byte = &src->buffer; + src->pub.bytes_in_buffer = 1; + if (c != EOF) { + return TRUE; + } else { + return FALSE; + } +} + +static void str_skip_input_data(j_decompress_ptr cinfo, long num_bytes) +{ + struct str_src_mgr *src = (struct str_src_mgr *)cinfo->src; + if (num_bytes > 0) { + while (num_bytes > (long)src->pub.bytes_in_buffer) { + num_bytes -= (long)src->pub.bytes_in_buffer; + str_fill_input_buffer(cinfo); + } + src->pub.next_input_byte += (size_t)num_bytes; + src->pub.bytes_in_buffer -= (size_t)num_bytes; + } +} + +static void str_term_source(j_decompress_ptr cinfo) { } + +DCTStream::DCTStream(Stream *strA, int colorXformA, Dict *dict, int recursion) : FilterStream(strA) +{ + colorXform = colorXformA; + if (dict != nullptr) { + Object obj = dict->lookup("Width", recursion); + err.width = (obj.isInt() && obj.getInt() <= JPEG_MAX_DIMENSION) ? obj.getInt() : 0; + obj = dict->lookup("Height", recursion); + err.height = (obj.isInt() && obj.getInt() <= JPEG_MAX_DIMENSION) ? obj.getInt() : 0; + } else { + err.height = err.width = 0; + } + init(); +} + +DCTStream::~DCTStream() +{ + jpeg_destroy_decompress(&cinfo); + delete str; +} + +static void exitErrorHandler(jpeg_common_struct *error) +{ + j_decompress_ptr cinfo = (j_decompress_ptr)error; + str_error_mgr *err = (struct str_error_mgr *)cinfo->err; + if (cinfo->err->msg_code == JERR_IMAGE_TOO_BIG && err->width != 0 && err->height != 0) { + cinfo->image_height = err->height; + cinfo->image_width = err->width; + } else { + longjmp(err->setjmp_buffer, 1); + } +} + +void DCTStream::init() +{ + jpeg_std_error(&err.pub); + err.pub.error_exit = &exitErrorHandler; + src.pub.init_source = str_init_source; + src.pub.fill_input_buffer = str_fill_input_buffer; + src.pub.skip_input_data = str_skip_input_data; + src.pub.resync_to_restart = jpeg_resync_to_restart; + src.pub.term_source = str_term_source; + src.pub.bytes_in_buffer = 0; + src.pub.next_input_byte = nullptr; + src.str = str; + src.index = 0; + current = nullptr; + limit = nullptr; + + cinfo.err = &err.pub; + if (!setjmp(err.setjmp_buffer)) { + jpeg_create_decompress(&cinfo); + cinfo.src = (jpeg_source_mgr *)&src; + } + row_buffer = nullptr; +} + +void DCTStream::reset() +{ + int row_stride; + + str->reset(); + + if (row_buffer) { + jpeg_destroy_decompress(&cinfo); + init(); + } + + // JPEG data has to start with 0xFF 0xD8 + // but some pdf like the one on + // https://bugs.freedesktop.org/show_bug.cgi?id=3299 + // does have some garbage before that this seeks for + // the start marker... + bool startFound = false; + int c = 0, c2 = 0; + while (!startFound) { + if (!c) { + c = str->getChar(); + if (c == -1) { + error(errSyntaxError, -1, "Could not find start of jpeg data"); + return; + } + if (c != 0xFF) { + c = 0; + } + } else { + c2 = str->getChar(); + if (c2 != 0xD8) { + c = 0; + c2 = 0; + } else { + startFound = true; + } + } + } + + if (!setjmp(err.setjmp_buffer)) { + if (jpeg_read_header(&cinfo, TRUE) != JPEG_SUSPENDED) { + // figure out color transform + if (colorXform == -1 && !cinfo.saw_Adobe_marker) { + if (cinfo.num_components == 3) { + if (cinfo.saw_JFIF_marker) { + colorXform = 1; + } else if (cinfo.cur_comp_info[0]->component_id == 82 && cinfo.cur_comp_info[1]->component_id == 71 && cinfo.cur_comp_info[2]->component_id == 66) { // ASCII "RGB" + colorXform = 0; + } else { + colorXform = 1; + } + } else { + colorXform = 0; + } + } else if (cinfo.saw_Adobe_marker) { + colorXform = cinfo.Adobe_transform; + } + + switch (cinfo.num_components) { + case 3: + cinfo.jpeg_color_space = colorXform ? JCS_YCbCr : JCS_RGB; + break; + case 4: + cinfo.jpeg_color_space = colorXform ? JCS_YCCK : JCS_CMYK; + break; + } + + jpeg_start_decompress(&cinfo); + + row_stride = cinfo.output_width * cinfo.output_components; + row_buffer = cinfo.mem->alloc_sarray((j_common_ptr)&cinfo, JPOOL_IMAGE, row_stride, 1); + } + } +} + +bool DCTStream::readLine() +{ + if (cinfo.output_scanline < cinfo.output_height) { + if (!setjmp(err.setjmp_buffer)) { + if (!jpeg_read_scanlines(&cinfo, row_buffer, 1)) { + return false; + } else { + current = &row_buffer[0][0]; + limit = &row_buffer[0][(cinfo.output_width - 1) * cinfo.output_components] + cinfo.output_components; + return true; + } + } else { + return false; + } + } else { + return false; + } +} + +int DCTStream::getChar() +{ + if (current == limit) { + if (!readLine()) { + return EOF; + } + } + + return *current++; +} + +int DCTStream::getChars(int nChars, unsigned char *buffer) +{ + for (int i = 0; i < nChars;) { + if (current == limit) { + if (!readLine()) { + return i; + } + } + intptr_t left = limit - current; + if (left + i > nChars) { + left = nChars - i; + } + memcpy(buffer + i, current, left); + current += left; + i += static_cast(left); + } + return nChars; +} + +int DCTStream::lookChar() +{ + if (unlikely(current == nullptr)) { + return EOF; + } + return *current; +} + +GooString *DCTStream::getPSFilter(int psLevel, const char *indent) +{ + GooString *s; + + if (psLevel < 2) { + return nullptr; + } + if (!(s = str->getPSFilter(psLevel, indent))) { + return nullptr; + } + s->append(indent)->append("<< >> /DCTDecode filter\n"); + return s; +} + +bool DCTStream::isBinary(bool last) const +{ + return str->isBinary(true); +} diff --git a/poppler-24.05.0/poppler/DCTStream.h b/poppler-24.05.0/poppler/DCTStream.h new file mode 100644 index 0000000000000000000000000000000000000000..2aaee12cb1d158adb295b352ec2f7cdffb5a0e3b --- /dev/null +++ b/poppler-24.05.0/poppler/DCTStream.h @@ -0,0 +1,86 @@ +//======================================================================== +// +// DCTStream.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2005 Jeff Muizelaar +// Copyright 2005 Martin Kretzschmar +// Copyright 2005-2007, 2009-2011, 2017, 2019, 2021 Albert Astals Cid +// Copyright 2010 Carlos Garcia Campos +// Copyright 2011 Daiki Ueno +// Copyright 2013 Thomas Freitag +// Copyright 2020 Lluís Batlle i Rossell +// +//======================================================================== + +#ifndef DCTSTREAM_H +#define DCTSTREAM_H + +#include "poppler-config.h" +#include +#include +#include +#include +#ifdef HAVE_UNISTD_H +# include +#endif +#include +#include +#include "goo/gmem.h" +#include "goo/gfile.h" +#include "Error.h" +#include "Object.h" +#include "Decrypt.h" +#include "Stream.h" + +extern "C" { +#include +#include +} + +struct str_src_mgr +{ + struct jpeg_source_mgr pub; + JOCTET buffer; + Stream *str; + int index; +}; + +struct str_error_mgr +{ + struct jpeg_error_mgr pub; + jmp_buf setjmp_buffer; + int width; + int height; +}; + +class DCTStream : public FilterStream +{ +public: + DCTStream(Stream *strA, int colorXformA, Dict *dict, int recursion); + ~DCTStream() override; + StreamKind getKind() const override { return strDCT; } + void reset() override; + int getChar() override; + int lookChar() override; + GooString *getPSFilter(int psLevel, const char *indent) override; + bool isBinary(bool last = true) const override; + +private: + void init(); + + bool hasGetChars() override { return true; } + bool readLine(); + int getChars(int nChars, unsigned char *buffer) override; + + int colorXform; + JSAMPLE *current; + JSAMPLE *limit; + struct jpeg_decompress_struct cinfo; + struct str_error_mgr err; + struct str_src_mgr src; + JSAMPARRAY row_buffer; +}; + +#endif diff --git a/poppler-24.05.0/poppler/DateInfo.cc b/poppler-24.05.0/poppler/DateInfo.cc new file mode 100644 index 0000000000000000000000000000000000000000..d34ce996632902f5ce2dc1224b0031e686b0c398 --- /dev/null +++ b/poppler-24.05.0/poppler/DateInfo.cc @@ -0,0 +1,169 @@ +//======================================================================== +// +// DateInfo.cc +// +// Copyright (C) 2008, 2018, 2019, 2021, 2022 Albert Astals Cid +// Copyright (C) 2009 Carlos Garcia Campos +// Copyright (C) 2015 André Guerreiro +// Copyright (C) 2015 André Esser +// Copyright (C) 2016, 2018, 2021 Adrian Johnson +// Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden +// Copyright (C) 2021 Albert Astals Cid +// Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// Copyright (C) 2024 Erich E. Hoover +// +// 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 +// +//======================================================================== + +//======================================================================== +// +// Based on code from pdfinfo.cc +// +// Copyright 1998-2003 Glyph & Cog, LLC +// +//======================================================================== + +#include + +#include "glibc.h" +#include "gmem.h" +#include "DateInfo.h" +#include "UTF.h" + +#include +#include + +/* See PDF Reference 1.3, Section 3.8.2 for PDF Date representation */ +bool parseDateString(const GooString *date, int *year, int *month, int *day, int *hour, int *minute, int *second, char *tz, int *tzHour, int *tzMinute) +{ + std::vector u = TextStringToUCS4(date->toStr()); + GooString s; + for (auto &c : u) { + // Ignore any non ASCII characters + if (c < 128) { + s.append(c); + } + } + const char *dateString = s.c_str(); + + if (strlen(dateString) < 2) { + return false; + } + + if (dateString[0] == 'D' && dateString[1] == ':') { + dateString += 2; + } + + *month = 1; + *day = 1; + *hour = 0; + *minute = 0; + *second = 0; + *tz = 0x00; + *tzHour = 0; + *tzMinute = 0; + + if (sscanf(dateString, "%4d%2d%2d%2d%2d%2d%c%2d%*c%2d", year, month, day, hour, minute, second, tz, tzHour, tzMinute) > 0) { + /* Workaround for y2k bug in Distiller 3 stolen from gpdf, hoping that it won't + * be used after y2.2k */ + if (*year < 1930 && strlen(dateString) > 14) { + int century, years_since_1900; + if (sscanf(dateString, "%2d%3d%2d%2d%2d%2d%2d", ¢ury, &years_since_1900, month, day, hour, minute, second) == 7) { + *year = century * 100 + years_since_1900; + } else { + return false; + } + } + + if (*year <= 0) { + return false; + } + + return true; + } + + return false; +} + +std::string timeToStringWithFormat(const time_t *timeA, const char *format) +{ + const time_t timet = timeA ? *timeA : time(nullptr); + + struct tm localtime_tm; + localtime_r(&timet, &localtime_tm); + + char timeOffset[12]; + + // strftime "%z" does not work on windows (it prints zone name, not offset) + // calculate time zone offset by comparing local and gmtime time_t value for same + // time. + const time_t timeg = timegm(&localtime_tm); + const int offset = static_cast(difftime(timeg, timet)); // find time zone offset in seconds + if (offset > 0) { + snprintf(timeOffset, sizeof(timeOffset), "+%02d'%02d'", offset / 3600, (offset % 3600) / 60); + } else if (offset < 0) { + snprintf(timeOffset, sizeof(timeOffset), "-%02d'%02d'", -offset / 3600, (-offset % 3600) / 60); + } else { + snprintf(timeOffset, sizeof(timeOffset), "Z"); + } + std::string fmt(format); + const char timeOffsetPattern[] = "%z"; + size_t timeOffsetPosition = fmt.find(timeOffsetPattern); + if (timeOffsetPosition != std::string::npos) { + fmt.replace(timeOffsetPosition, sizeof(timeOffsetPattern) - 1, timeOffset); + } + + if (fmt.length() == 0) { + return ""; + } + size_t bufLen = 50; + std::string buf(bufLen, ' '); + while (strftime(&buf[0], buf.size(), fmt.c_str(), &localtime_tm) == 0) { + buf.resize(bufLen *= 2); + } + return buf; +} + +GooString *timeToDateString(const time_t *timeA) +{ + return new GooString(timeToStringWithFormat(timeA, "D:%Y%m%d%H%M%S%z")); +} + +// Convert PDF date string to time. Returns -1 if conversion fails. +time_t dateStringToTime(const GooString *dateString) +{ + int year, mon, day, hour, min, sec, tz_hour, tz_minute; + char tz; + struct tm tm; + time_t time; + + if (!parseDateString(dateString, &year, &mon, &day, &hour, &min, &sec, &tz, &tz_hour, &tz_minute)) { + return -1; + } + + tm.tm_year = year - 1900; + tm.tm_mon = mon - 1; + tm.tm_mday = day; + tm.tm_hour = hour; + tm.tm_min = min; + tm.tm_sec = sec; + tm.tm_wday = -1; + tm.tm_yday = -1; + tm.tm_isdst = -1; /* 0 = DST off, 1 = DST on, -1 = don't know */ + + /* compute tm_wday and tm_yday and check date */ + time = timegm(&tm); + if (time == (time_t)-1) { + return time; + } + + time_t offset = (tz_hour * 60 + tz_minute) * 60; + if (tz == '-') { + offset *= -1; + } + time -= offset; + + return time; +} diff --git a/poppler-24.05.0/poppler/DateInfo.h b/poppler-24.05.0/poppler/DateInfo.h new file mode 100644 index 0000000000000000000000000000000000000000..200536a087c98ce043d1170ae0eaf8ffb5772885 --- /dev/null +++ b/poppler-24.05.0/poppler/DateInfo.h @@ -0,0 +1,51 @@ +//======================================================================== +// +// DateInfo.h +// +// Copyright (C) 2008, 2018, 2019 Albert Astals Cid +// Copyright (C) 2009 Carlos Garcia Campos +// Copyright (C) 2015 André Guerreiro +// Copyright (C) 2015 André Esser +// Copyright (C) 2016, 2021 Adrian Johnson +// Copyright (C) 2024 Erich E. Hoover +// +// 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 +// +//======================================================================== + +//======================================================================== +// +// Based on code from pdfinfo.cc +// +// Copyright 1998-2003 Glyph & Cog, LLC +// +//======================================================================== + +#ifndef DATE_INFO_H +#define DATE_INFO_H + +#include "goo/GooString.h" +#include "poppler_private_export.h" +#include + +bool POPPLER_PRIVATE_EXPORT parseDateString(const GooString *date, int *year, int *month, int *day, int *hour, int *minute, int *second, char *tz, int *tzHour, int *tzMinute); + +/* Converts the time_t into a PDF Date format string. + * If timeA is NULL, current time is used. + * Returns new GooString. Free with delete. + */ +GooString POPPLER_PRIVATE_EXPORT *timeToDateString(const time_t *timeA); + +/* Converts the time_t into a string with the specified format. + * If timeA is NULL, current time is used. + * Returns std::string + */ +std::string POPPLER_PRIVATE_EXPORT timeToStringWithFormat(const time_t *timeA, const char *format); + +/* Convert PDF date string to time. + * Returns -1 if conversion fails. + */ +time_t POPPLER_PRIVATE_EXPORT dateStringToTime(const GooString *dateString); + +#endif diff --git a/poppler-24.05.0/poppler/Decrypt.cc b/poppler-24.05.0/poppler/Decrypt.cc new file mode 100644 index 0000000000000000000000000000000000000000..5e72951d8bfb4b105e31d5f9b6d7c1f750fc1e9e --- /dev/null +++ b/poppler-24.05.0/poppler/Decrypt.cc @@ -0,0 +1,1831 @@ +//======================================================================== +// +// Decrypt.cc +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2008 Julien Rebetez +// Copyright (C) 2008, 2010, 2016-2021 Albert Astals Cid +// Copyright (C) 2009 Matthias Franz +// Copyright (C) 2009 David Benjamin +// Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2013, 2017 Adrian Johnson +// Copyright (C) 2016 Alok Anand +// Copyright (C) 2016 Thomas Freitag +// Copyright (C) 2018 Adam Reichold +// +// 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 + +#include +#include +#include "goo/gmem.h" +#include "goo/grandom.h" +#include "Decrypt.h" +#include "Error.h" + +static void rc4InitKey(const unsigned char *key, int keyLen, unsigned char *state); +static unsigned char rc4DecryptByte(unsigned char *state, unsigned char *x, unsigned char *y, unsigned char c); + +static bool aesReadBlock(Stream *str, unsigned char *in, bool addPadding); + +static void aesKeyExpansion(DecryptAESState *s, const unsigned char *objKey, int objKeyLen, bool decrypt); +static void aesEncryptBlock(DecryptAESState *s, const unsigned char *in); +static void aesDecryptBlock(DecryptAESState *s, const unsigned char *in, bool last); + +static void aes256KeyExpansion(DecryptAES256State *s, const unsigned char *objKey, int objKeyLen, bool decrypt); +static void aes256EncryptBlock(DecryptAES256State *s, const unsigned char *in); +static void aes256DecryptBlock(DecryptAES256State *s, const unsigned char *in, bool last); + +static void sha256(unsigned char *msg, int msgLen, unsigned char *hash); +static void sha384(unsigned char *msg, int msgLen, unsigned char *hash); +static void sha512(unsigned char *msg, int msgLen, unsigned char *hash); + +static void revision6Hash(const GooString *inputPassword, unsigned char *K, const char *userKey); + +static const unsigned char passwordPad[32] = { 0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41, 0x64, 0x00, 0x4e, 0x56, 0xff, 0xfa, 0x01, 0x08, 0x2e, 0x2e, 0x00, 0xb6, 0xd0, 0x68, 0x3e, 0x80, 0x2f, 0x0c, 0xa9, 0xfe, 0x64, 0x53, 0x69, 0x7a }; + +//------------------------------------------------------------------------ +// Decrypt +//------------------------------------------------------------------------ + +bool Decrypt::makeFileKey(int encVersion, int encRevision, int keyLength, const GooString *ownerKey, const GooString *userKey, const GooString *ownerEnc, const GooString *userEnc, int permissions, const GooString *fileID, + const GooString *ownerPassword, const GooString *userPassword, unsigned char *fileKey, bool encryptMetadata, bool *ownerPasswordOk) +{ + DecryptAES256State state; + unsigned char test[127 + 56], test2[32]; + GooString *userPassword2; + unsigned char fState[256]; + unsigned char tmpKey[16]; + unsigned char fx, fy; + int len, i, j; + + *ownerPasswordOk = false; + + if (encRevision == 5 || encRevision == 6) { + + // check the owner password + if (ownerPassword) { + //~ this is supposed to convert the password to UTF-8 using "SASLprep" + len = ownerPassword->getLength(); + if (len > 127) { + len = 127; + } + memcpy(test, ownerPassword->c_str(), len); + memcpy(test + len, ownerKey->c_str() + 32, 8); + memcpy(test + len + 8, userKey->c_str(), 48); + sha256(test, len + 56, test); + if (encRevision == 6) { + // test contains the initial SHA-256 hash as input K. + revision6Hash(ownerPassword, test, userKey->c_str()); + } + if (!memcmp(test, ownerKey->c_str(), 32)) { + + // compute the file key from the owner password + memcpy(test, ownerPassword->c_str(), len); + memcpy(test + len, ownerKey->c_str() + 40, 8); + memcpy(test + len + 8, userKey->c_str(), 48); + sha256(test, len + 56, test); + if (encRevision == 6) { + // test contains the initial SHA-256 hash input K. + revision6Hash(ownerPassword, test, userKey->c_str()); + } + aes256KeyExpansion(&state, test, 32, true); + for (i = 0; i < 16; ++i) { + state.cbc[i] = 0; + } + aes256DecryptBlock(&state, (unsigned char *)ownerEnc->c_str(), false); + memcpy(fileKey, state.buf, 16); + aes256DecryptBlock(&state, (unsigned char *)ownerEnc->c_str() + 16, false); + memcpy(fileKey + 16, state.buf, 16); + + *ownerPasswordOk = true; + return true; + } + } + + // check the user password + if (userPassword) { + //~ this is supposed to convert the password to UTF-8 using "SASLprep" + len = userPassword->getLength(); + if (len > 127) { + len = 127; + } + memcpy(test, userPassword->c_str(), len); + memcpy(test + len, userKey->c_str() + 32, 8); + sha256(test, len + 8, test); + if (encRevision == 6) { + // test contains the initial SHA-256 hash input K. + // user key is not used in checking user password. + revision6Hash(userPassword, test, nullptr); + } + if (!memcmp(test, userKey->c_str(), 32)) { + + // compute the file key from the user password + memcpy(test, userPassword->c_str(), len); + memcpy(test + len, userKey->c_str() + 40, 8); + sha256(test, len + 8, test); + if (encRevision == 6) { + // test contains the initial SHA-256 hash input K. + // user key is not used in computing intermediate user key. + revision6Hash(userPassword, test, nullptr); + } + aes256KeyExpansion(&state, test, 32, true); + for (i = 0; i < 16; ++i) { + state.cbc[i] = 0; + } + aes256DecryptBlock(&state, (unsigned char *)userEnc->c_str(), false); + memcpy(fileKey, state.buf, 16); + aes256DecryptBlock(&state, (unsigned char *)userEnc->c_str() + 16, false); + memcpy(fileKey + 16, state.buf, 16); + + return true; + } + } + + return false; + } else { + + // try using the supplied owner password to generate the user password + if (ownerPassword) { + len = ownerPassword->getLength(); + if (len < 32) { + memcpy(test, ownerPassword->c_str(), len); + memcpy(test + len, passwordPad, 32 - len); + } else { + memcpy(test, ownerPassword->c_str(), 32); + } + md5(test, 32, test); + if (encRevision == 3) { + for (i = 0; i < 50; ++i) { + md5(test, keyLength, test); + } + } + if (encRevision == 2) { + rc4InitKey(test, keyLength, fState); + fx = fy = 0; + for (i = 0; i < 32; ++i) { + test2[i] = rc4DecryptByte(fState, &fx, &fy, ownerKey->getChar(i)); + } + } else { + memcpy(test2, ownerKey->c_str(), 32); + for (i = 19; i >= 0; --i) { + for (j = 0; j < keyLength; ++j) { + tmpKey[j] = test[j] ^ i; + } + rc4InitKey(tmpKey, keyLength, fState); + fx = fy = 0; + for (j = 0; j < 32; ++j) { + test2[j] = rc4DecryptByte(fState, &fx, &fy, test2[j]); + } + } + } + userPassword2 = new GooString((char *)test2, 32); + if (makeFileKey2(encVersion, encRevision, keyLength, ownerKey, userKey, permissions, fileID, userPassword2, fileKey, encryptMetadata)) { + *ownerPasswordOk = true; + delete userPassword2; + return true; + } + delete userPassword2; + } + + // try using the supplied user password + return makeFileKey2(encVersion, encRevision, keyLength, ownerKey, userKey, permissions, fileID, userPassword, fileKey, encryptMetadata); + } +} + +bool Decrypt::makeFileKey2(int encVersion, int encRevision, int keyLength, const GooString *ownerKey, const GooString *userKey, int permissions, const GooString *fileID, const GooString *userPassword, unsigned char *fileKey, + bool encryptMetadata) +{ + unsigned char *buf; + unsigned char test[32]; + unsigned char fState[256]; + unsigned char tmpKey[16]; + unsigned char fx, fy; + int len, i, j; + bool ok; + + // generate file key + buf = (unsigned char *)gmalloc(72 + fileID->getLength()); + if (userPassword) { + len = userPassword->getLength(); + if (len < 32) { + memcpy(buf, userPassword->c_str(), len); + memcpy(buf + len, passwordPad, 32 - len); + } else { + memcpy(buf, userPassword->c_str(), 32); + } + } else { + memcpy(buf, passwordPad, 32); + } + memcpy(buf + 32, ownerKey->c_str(), 32); + buf[64] = permissions & 0xff; + buf[65] = (permissions >> 8) & 0xff; + buf[66] = (permissions >> 16) & 0xff; + buf[67] = (permissions >> 24) & 0xff; + memcpy(buf + 68, fileID->c_str(), fileID->getLength()); + len = 68 + fileID->getLength(); + if (!encryptMetadata) { + buf[len++] = 0xff; + buf[len++] = 0xff; + buf[len++] = 0xff; + buf[len++] = 0xff; + } + md5(buf, len, fileKey); + if (encRevision == 3) { + for (i = 0; i < 50; ++i) { + md5(fileKey, keyLength, fileKey); + } + } + + // test user password + if (encRevision == 2) { + rc4InitKey(fileKey, keyLength, fState); + fx = fy = 0; + for (i = 0; i < 32; ++i) { + test[i] = rc4DecryptByte(fState, &fx, &fy, userKey->getChar(i)); + } + ok = memcmp(test, passwordPad, 32) == 0; + } else if (encRevision == 3) { + memcpy(test, userKey->c_str(), 32); + for (i = 19; i >= 0; --i) { + for (j = 0; j < keyLength; ++j) { + tmpKey[j] = fileKey[j] ^ i; + } + rc4InitKey(tmpKey, keyLength, fState); + fx = fy = 0; + for (j = 0; j < 32; ++j) { + test[j] = rc4DecryptByte(fState, &fx, &fy, test[j]); + } + } + memcpy(buf, passwordPad, 32); + memcpy(buf + 32, fileID->c_str(), fileID->getLength()); + md5(buf, 32 + fileID->getLength(), buf); + ok = memcmp(test, buf, 16) == 0; + } else { + ok = false; + } + + gfree(buf); + return ok; +} + +//------------------------------------------------------------------------ +// BaseCryptStream +//------------------------------------------------------------------------ + +BaseCryptStream::BaseCryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, int keyLength, Ref refA) : FilterStream(strA) +{ + algo = algoA; + + // construct object key + for (int i = 0; i < keyLength; ++i) { + objKey[i] = fileKey[i]; + } + for (std::size_t i = keyLength; i < sizeof(objKey); ++i) { + objKey[i] = 0; + } + + switch (algo) { + case cryptRC4: + if (likely(keyLength < static_cast(sizeof(objKey) - 4))) { + objKey[keyLength] = refA.num & 0xff; + objKey[keyLength + 1] = (refA.num >> 8) & 0xff; + objKey[keyLength + 2] = (refA.num >> 16) & 0xff; + objKey[keyLength + 3] = refA.gen & 0xff; + objKey[keyLength + 4] = (refA.gen >> 8) & 0xff; + md5(objKey, keyLength + 5, objKey); + } + if ((objKeyLength = keyLength + 5) > 16) { + objKeyLength = 16; + } + break; + case cryptAES: + objKey[keyLength] = refA.num & 0xff; + objKey[keyLength + 1] = (refA.num >> 8) & 0xff; + objKey[keyLength + 2] = (refA.num >> 16) & 0xff; + objKey[keyLength + 3] = refA.gen & 0xff; + objKey[keyLength + 4] = (refA.gen >> 8) & 0xff; + objKey[keyLength + 5] = 0x73; // 's' + objKey[keyLength + 6] = 0x41; // 'A' + objKey[keyLength + 7] = 0x6c; // 'l' + objKey[keyLength + 8] = 0x54; // 'T' + md5(objKey, keyLength + 9, objKey); + if ((objKeyLength = keyLength + 5) > 16) { + objKeyLength = 16; + } + break; + case cryptAES256: + objKeyLength = keyLength; + break; + case cryptNone: + break; + } + + charactersRead = 0; + nextCharBuff = EOF; + autoDelete = true; +} + +BaseCryptStream::~BaseCryptStream() +{ + if (autoDelete) { + delete str; + } +} + +void BaseCryptStream::reset() +{ + charactersRead = 0; + nextCharBuff = EOF; + str->reset(); +} + +Goffset BaseCryptStream::getPos() +{ + return charactersRead; +} + +int BaseCryptStream::getChar() +{ + // Read next character and empty the buffer, so that a new character will be read next time + int c = lookChar(); + nextCharBuff = EOF; + + if (c != EOF) { + charactersRead++; + } + return c; +} + +bool BaseCryptStream::isBinary(bool last) const +{ + return str->isBinary(last); +} + +void BaseCryptStream::setAutoDelete(bool val) +{ + autoDelete = val; +} + +//------------------------------------------------------------------------ +// EncryptStream +//------------------------------------------------------------------------ + +EncryptStream::EncryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, int keyLength, Ref refA) : BaseCryptStream(strA, fileKey, algoA, keyLength, refA) +{ + // Fill the CBC initialization vector for AES and AES-256 + switch (algo) { + case cryptAES: + grandom_fill(state.aes.cbc, 16); + break; + case cryptAES256: + grandom_fill(state.aes256.cbc, 16); + break; + default: + break; + } +} + +EncryptStream::~EncryptStream() { } + +void EncryptStream::reset() +{ + BaseCryptStream::reset(); + + switch (algo) { + case cryptRC4: + state.rc4.x = state.rc4.y = 0; + rc4InitKey(objKey, objKeyLength, state.rc4.state); + break; + case cryptAES: + aesKeyExpansion(&state.aes, objKey, objKeyLength, false); + memcpy(state.aes.buf, state.aes.cbc, 16); // Copy CBC IV to buf + state.aes.bufIdx = 0; + state.aes.paddingReached = false; + break; + case cryptAES256: + aes256KeyExpansion(&state.aes256, objKey, objKeyLength, false); + memcpy(state.aes256.buf, state.aes256.cbc, 16); // Copy CBC IV to buf + state.aes256.bufIdx = 0; + state.aes256.paddingReached = false; + break; + case cryptNone: + break; + } +} + +int EncryptStream::lookChar() +{ + unsigned char in[16]; + int c; + + if (nextCharBuff != EOF) { + return nextCharBuff; + } + + c = EOF; // make gcc happy + switch (algo) { + case cryptRC4: + if ((c = str->getChar()) != EOF) { + // RC4 is XOR-based: the decryption algorithm works for encryption too + c = rc4DecryptByte(state.rc4.state, &state.rc4.x, &state.rc4.y, (unsigned char)c); + } + break; + case cryptAES: + if (state.aes.bufIdx == 16 && !state.aes.paddingReached) { + state.aes.paddingReached = !aesReadBlock(str, in, true); + aesEncryptBlock(&state.aes, in); + } + if (state.aes.bufIdx == 16) { + c = EOF; + } else { + c = state.aes.buf[state.aes.bufIdx++]; + } + break; + case cryptAES256: + if (state.aes256.bufIdx == 16 && !state.aes256.paddingReached) { + state.aes256.paddingReached = !aesReadBlock(str, in, true); + aes256EncryptBlock(&state.aes256, in); + } + if (state.aes256.bufIdx == 16) { + c = EOF; + } else { + c = state.aes256.buf[state.aes256.bufIdx++]; + } + break; + case cryptNone: + break; + } + return (nextCharBuff = c); +} + +//------------------------------------------------------------------------ +// DecryptStream +//------------------------------------------------------------------------ + +DecryptStream::DecryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, int keyLength, Ref refA) : BaseCryptStream(strA, fileKey, algoA, keyLength, refA) { } + +DecryptStream::~DecryptStream() { } + +void DecryptStream::reset() +{ + int i; + BaseCryptStream::reset(); + + switch (algo) { + case cryptRC4: + state.rc4.x = state.rc4.y = 0; + rc4InitKey(objKey, objKeyLength, state.rc4.state); + break; + case cryptAES: + aesKeyExpansion(&state.aes, objKey, objKeyLength, true); + for (i = 0; i < 16; ++i) { + state.aes.cbc[i] = str->getChar(); + } + state.aes.bufIdx = 16; + break; + case cryptAES256: + aes256KeyExpansion(&state.aes256, objKey, objKeyLength, true); + for (i = 0; i < 16; ++i) { + state.aes256.cbc[i] = str->getChar(); + } + state.aes256.bufIdx = 16; + break; + case cryptNone: + break; + } +} + +int DecryptStream::lookChar() +{ + unsigned char in[16]; + int c; + + if (nextCharBuff != EOF) { + return nextCharBuff; + } + + c = EOF; // make gcc happy + switch (algo) { + case cryptRC4: + if ((c = str->getChar()) != EOF) { + c = rc4DecryptByte(state.rc4.state, &state.rc4.x, &state.rc4.y, (unsigned char)c); + } + break; + case cryptAES: + if (state.aes.bufIdx == 16) { + if (aesReadBlock(str, in, false)) { + aesDecryptBlock(&state.aes, in, str->lookChar() == EOF); + } + } + if (state.aes.bufIdx == 16) { + c = EOF; + } else { + c = state.aes.buf[state.aes.bufIdx++]; + } + break; + case cryptAES256: + if (state.aes256.bufIdx == 16) { + if (aesReadBlock(str, in, false)) { + aes256DecryptBlock(&state.aes256, in, str->lookChar() == EOF); + } + } + if (state.aes256.bufIdx == 16) { + c = EOF; + } else { + c = state.aes256.buf[state.aes256.bufIdx++]; + } + break; + case cryptNone: + break; + } + return (nextCharBuff = c); +} + +//------------------------------------------------------------------------ +// RC4-compatible decryption +//------------------------------------------------------------------------ + +static void rc4InitKey(const unsigned char *key, int keyLen, unsigned char *state) +{ + unsigned char index1, index2; + unsigned char t; + int i; + + for (i = 0; i < 256; ++i) { + state[i] = i; + } + + if (unlikely(keyLen == 0)) { + return; + } + + index1 = index2 = 0; + for (i = 0; i < 256; ++i) { + index2 = (key[index1] + state[i] + index2) % 256; + t = state[i]; + state[i] = state[index2]; + state[index2] = t; + index1 = (index1 + 1) % keyLen; + } +} + +static unsigned char rc4DecryptByte(unsigned char *state, unsigned char *x, unsigned char *y, unsigned char c) +{ + unsigned char x1, y1, tx, ty; + + x1 = *x = (*x + 1) % 256; + y1 = *y = (state[*x] + *y) % 256; + tx = state[x1]; + ty = state[y1]; + state[x1] = ty; + state[y1] = tx; + return c ^ state[(tx + ty) % 256]; +} + +//------------------------------------------------------------------------ +// AES decryption +//------------------------------------------------------------------------ + +// Returns false if EOF was reached, true otherwise +static bool aesReadBlock(Stream *str, unsigned char *in, bool addPadding) +{ + int c, i; + + for (i = 0; i < 16; ++i) { + if ((c = str->getChar()) != EOF) { + in[i] = (unsigned char)c; + } else { + break; + } + } + + if (i == 16) { + return true; + } else { + if (addPadding) { + c = 16 - i; + while (i < 16) { + in[i++] = (unsigned char)c; + } + } + return false; + } +} + +static const unsigned char sbox[256] = { 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, + 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75, + 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf, + 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, + 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73, 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb, + 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08, + 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, + 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 }; + +static const unsigned char invSbox[256] = { 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, + 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e, 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25, + 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84, + 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, + 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73, 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e, + 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4, + 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, + 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61, 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d }; + +static const unsigned int rcon[11] = { 0x00000000, // unused + 0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000, 0x20000000, 0x40000000, 0x80000000, 0x1b000000, 0x36000000 }; + +static inline unsigned int subWord(unsigned int x) +{ + return (sbox[x >> 24] << 24) | (sbox[(x >> 16) & 0xff] << 16) | (sbox[(x >> 8) & 0xff] << 8) | sbox[x & 0xff]; +} + +static inline unsigned int rotWord(unsigned int x) +{ + return ((x << 8) & 0xffffffff) | (x >> 24); +} + +static inline void subBytes(unsigned char *state) +{ + int i; + + for (i = 0; i < 16; ++i) { + state[i] = sbox[state[i]]; + } +} + +static inline void invSubBytes(unsigned char *state) +{ + int i; + + for (i = 0; i < 16; ++i) { + state[i] = invSbox[state[i]]; + } +} + +static inline void shiftRows(unsigned char *state) +{ + unsigned char t; + + t = state[4]; + state[4] = state[5]; + state[5] = state[6]; + state[6] = state[7]; + state[7] = t; + + t = state[8]; + state[8] = state[10]; + state[10] = t; + t = state[9]; + state[9] = state[11]; + state[11] = t; + + t = state[15]; + state[15] = state[14]; + state[14] = state[13]; + state[13] = state[12]; + state[12] = t; +} + +static inline void invShiftRows(unsigned char *state) +{ + unsigned char t; + + t = state[7]; + state[7] = state[6]; + state[6] = state[5]; + state[5] = state[4]; + state[4] = t; + + t = state[8]; + state[8] = state[10]; + state[10] = t; + t = state[9]; + state[9] = state[11]; + state[11] = t; + + t = state[12]; + state[12] = state[13]; + state[13] = state[14]; + state[14] = state[15]; + state[15] = t; +} + +// {02} \cdot s +struct Mul02Table +{ + constexpr Mul02Table() : values() + { + for (int s = 0; s < 256; s++) { + values[s] = (s & 0x80) ? ((s << 1) ^ 0x1b) : (s << 1); + } + } + + constexpr unsigned char operator()(uint8_t i) const { return values[i]; } + + unsigned char values[256]; +}; + +static constexpr Mul02Table mul02; + +// {03} \cdot s +struct Mul03Table +{ + constexpr Mul03Table() : values() + { + for (int s = 0; s < 256; s++) { + const unsigned char s2 = (s & 0x80) ? ((s << 1) ^ 0x1b) : (s << 1); + values[s] = s ^ s2; + } + } + + constexpr unsigned char operator()(uint8_t i) const { return values[i]; } + + unsigned char values[256]; +}; + +static constexpr Mul03Table mul03; + +// {09} \cdot s +struct Mul09Table +{ + constexpr Mul09Table() : values() + { + for (int s = 0; s < 256; s++) { + const unsigned char s2 = (s & 0x80) ? ((s << 1) ^ 0x1b) : (s << 1); + const unsigned char s4 = (s2 & 0x80) ? ((s2 << 1) ^ 0x1b) : (s2 << 1); + const unsigned char s8 = (s4 & 0x80) ? ((s4 << 1) ^ 0x1b) : (s4 << 1); + values[s] = s ^ s8; + } + } + + constexpr unsigned char operator()(uint8_t i) const { return values[i]; } + + unsigned char values[256]; +}; + +static constexpr Mul09Table mul09; + +// {0b} \cdot s +struct Mul0bTable +{ + constexpr Mul0bTable() : values() + { + for (int s = 0; s < 256; s++) { + const unsigned char s2 = (s & 0x80) ? ((s << 1) ^ 0x1b) : (s << 1); + const unsigned char s4 = (s2 & 0x80) ? ((s2 << 1) ^ 0x1b) : (s2 << 1); + const unsigned char s8 = (s4 & 0x80) ? ((s4 << 1) ^ 0x1b) : (s4 << 1); + values[s] = s ^ s2 ^ s8; + } + } + + constexpr unsigned char operator()(uint8_t i) const { return values[i]; } + + unsigned char values[256]; +}; + +static constexpr Mul0bTable mul0b; + +// {0d} \cdot s +struct Mul0dTable +{ + constexpr Mul0dTable() : values() + { + for (int s = 0; s < 256; s++) { + const unsigned char s2 = (s & 0x80) ? ((s << 1) ^ 0x1b) : (s << 1); + const unsigned char s4 = (s2 & 0x80) ? ((s2 << 1) ^ 0x1b) : (s2 << 1); + const unsigned char s8 = (s4 & 0x80) ? ((s4 << 1) ^ 0x1b) : (s4 << 1); + values[s] = s ^ s4 ^ s8; + } + } + + constexpr unsigned char operator()(uint8_t i) const { return values[i]; } + + unsigned char values[256]; +}; + +static constexpr Mul0dTable mul0d; + +// {0e} \cdot s +struct Mul0eTable +{ + constexpr Mul0eTable() : values() + { + for (int s = 0; s < 256; s++) { + const unsigned char s2 = (s & 0x80) ? ((s << 1) ^ 0x1b) : (s << 1); + const unsigned char s4 = (s2 & 0x80) ? ((s2 << 1) ^ 0x1b) : (s2 << 1); + const unsigned char s8 = (s4 & 0x80) ? ((s4 << 1) ^ 0x1b) : (s4 << 1); + values[s] = s2 ^ s4 ^ s8; + } + } + + constexpr unsigned char operator()(uint8_t i) const { return values[i]; } + + unsigned char values[256]; +}; + +static constexpr Mul0eTable mul0e; + +static inline void mixColumns(unsigned char *state) +{ + int c; + unsigned char s0, s1, s2, s3; + + for (c = 0; c < 4; ++c) { + s0 = state[c]; + s1 = state[4 + c]; + s2 = state[8 + c]; + s3 = state[12 + c]; + state[c] = mul02(s0) ^ mul03(s1) ^ s2 ^ s3; + state[4 + c] = s0 ^ mul02(s1) ^ mul03(s2) ^ s3; + state[8 + c] = s0 ^ s1 ^ mul02(s2) ^ mul03(s3); + state[12 + c] = mul03(s0) ^ s1 ^ s2 ^ mul02(s3); + } +} + +static inline void invMixColumns(unsigned char *state) +{ + int c; + unsigned char s0, s1, s2, s3; + + for (c = 0; c < 4; ++c) { + s0 = state[c]; + s1 = state[4 + c]; + s2 = state[8 + c]; + s3 = state[12 + c]; + state[c] = mul0e(s0) ^ mul0b(s1) ^ mul0d(s2) ^ mul09(s3); + state[4 + c] = mul09(s0) ^ mul0e(s1) ^ mul0b(s2) ^ mul0d(s3); + state[8 + c] = mul0d(s0) ^ mul09(s1) ^ mul0e(s2) ^ mul0b(s3); + state[12 + c] = mul0b(s0) ^ mul0d(s1) ^ mul09(s2) ^ mul0e(s3); + } +} + +static inline void invMixColumnsW(unsigned int *w) +{ + int c; + unsigned char s0, s1, s2, s3; + + for (c = 0; c < 4; ++c) { + s0 = w[c] >> 24; + s1 = w[c] >> 16; + s2 = w[c] >> 8; + s3 = w[c]; + w[c] = ((mul0e(s0) ^ mul0b(s1) ^ mul0d(s2) ^ mul09(s3)) << 24) | ((mul09(s0) ^ mul0e(s1) ^ mul0b(s2) ^ mul0d(s3)) << 16) | ((mul0d(s0) ^ mul09(s1) ^ mul0e(s2) ^ mul0b(s3)) << 8) | (mul0b(s0) ^ mul0d(s1) ^ mul09(s2) ^ mul0e(s3)); + } +} + +static inline void addRoundKey(unsigned char *state, const unsigned int *w) +{ + int c; + + for (c = 0; c < 4; ++c) { + state[c] ^= w[c] >> 24; + state[4 + c] ^= w[c] >> 16; + state[8 + c] ^= w[c] >> 8; + state[12 + c] ^= w[c]; + } +} + +static void aesKeyExpansion(DecryptAESState *s, const unsigned char *objKey, int /*objKeyLen*/, bool decrypt) +{ + unsigned int temp; + int i, round; + + //~ this assumes objKeyLen == 16 + + for (i = 0; i < 4; ++i) { + s->w[i] = (objKey[4 * i] << 24) + (objKey[4 * i + 1] << 16) + (objKey[4 * i + 2] << 8) + objKey[4 * i + 3]; + } + for (i = 4; i < 44; ++i) { + temp = s->w[i - 1]; + if (!(i & 3)) { + temp = subWord(rotWord(temp)) ^ rcon[i / 4]; + } + s->w[i] = s->w[i - 4] ^ temp; + } + + /* In case of decryption, adjust the key schedule for the equivalent inverse cipher */ + if (decrypt) { + for (round = 1; round <= 9; ++round) { + invMixColumnsW(&s->w[round * 4]); + } + } +} + +static void aesEncryptBlock(DecryptAESState *s, const unsigned char *in) +{ + int c, round; + + // initial state (input is xor'd with previous output because of CBC) + for (c = 0; c < 4; ++c) { + s->state[c] = in[4 * c] ^ s->buf[4 * c]; + s->state[4 + c] = in[4 * c + 1] ^ s->buf[4 * c + 1]; + s->state[8 + c] = in[4 * c + 2] ^ s->buf[4 * c + 2]; + s->state[12 + c] = in[4 * c + 3] ^ s->buf[4 * c + 3]; + } + + // round 0 + addRoundKey(s->state, &s->w[0]); + + // rounds 1-9 + for (round = 1; round <= 9; ++round) { + subBytes(s->state); + shiftRows(s->state); + mixColumns(s->state); + addRoundKey(s->state, &s->w[round * 4]); + } + + // round 10 + subBytes(s->state); + shiftRows(s->state); + addRoundKey(s->state, &s->w[10 * 4]); + + for (c = 0; c < 4; ++c) { + s->buf[4 * c] = s->state[c]; + s->buf[4 * c + 1] = s->state[4 + c]; + s->buf[4 * c + 2] = s->state[8 + c]; + s->buf[4 * c + 3] = s->state[12 + c]; + } + + s->bufIdx = 0; +} + +static void aesDecryptBlock(DecryptAESState *s, const unsigned char *in, bool last) +{ + int c, round, n, i; + + // initial state + for (c = 0; c < 4; ++c) { + s->state[c] = in[4 * c]; + s->state[4 + c] = in[4 * c + 1]; + s->state[8 + c] = in[4 * c + 2]; + s->state[12 + c] = in[4 * c + 3]; + } + + // round 0 + addRoundKey(s->state, &s->w[10 * 4]); + + // rounds 1-9 + for (round = 9; round >= 1; --round) { + invSubBytes(s->state); + invShiftRows(s->state); + invMixColumns(s->state); + addRoundKey(s->state, &s->w[round * 4]); + } + + // round 10 + invSubBytes(s->state); + invShiftRows(s->state); + addRoundKey(s->state, &s->w[0]); + + // CBC + for (c = 0; c < 4; ++c) { + s->buf[4 * c] = s->state[c] ^ s->cbc[4 * c]; + s->buf[4 * c + 1] = s->state[4 + c] ^ s->cbc[4 * c + 1]; + s->buf[4 * c + 2] = s->state[8 + c] ^ s->cbc[4 * c + 2]; + s->buf[4 * c + 3] = s->state[12 + c] ^ s->cbc[4 * c + 3]; + } + + // save the input block for the next CBC + for (i = 0; i < 16; ++i) { + s->cbc[i] = in[i]; + } + + // remove padding + s->bufIdx = 0; + if (last) { + n = s->buf[15]; + if (n < 1 || n > 16) { // this should never happen + n = 16; + } + for (i = 15; i >= n; --i) { + s->buf[i] = s->buf[i - n]; + } + s->bufIdx = n; + } +} + +//------------------------------------------------------------------------ +// AES-256 decryption +//------------------------------------------------------------------------ + +static void aes256KeyExpansion(DecryptAES256State *s, const unsigned char *objKey, int objKeyLen, bool decrypt) +{ + unsigned int temp; + int i, round; + + //~ this assumes objKeyLen == 32 + + for (i = 0; i < 8; ++i) { + s->w[i] = (objKey[4 * i] << 24) + (objKey[4 * i + 1] << 16) + (objKey[4 * i + 2] << 8) + objKey[4 * i + 3]; + } + for (i = 8; i < 60; ++i) { + temp = s->w[i - 1]; + if ((i & 7) == 0) { + temp = subWord(rotWord(temp)) ^ rcon[i / 8]; + } else if ((i & 7) == 4) { + temp = subWord(temp); + } + s->w[i] = s->w[i - 8] ^ temp; + } + + /* In case of decryption, adjust the key schedule for the equivalent inverse cipher */ + if (decrypt) { + for (round = 1; round <= 13; ++round) { + invMixColumnsW(&s->w[round * 4]); + } + } +} + +static void aes256EncryptBlock(DecryptAES256State *s, const unsigned char *in) +{ + int c, round; + + // initial state (input is xor'd with previous output because of CBC) + for (c = 0; c < 4; ++c) { + s->state[c] = in[4 * c] ^ s->buf[4 * c]; + s->state[4 + c] = in[4 * c + 1] ^ s->buf[4 * c + 1]; + s->state[8 + c] = in[4 * c + 2] ^ s->buf[4 * c + 2]; + s->state[12 + c] = in[4 * c + 3] ^ s->buf[4 * c + 3]; + } + + // round 0 + addRoundKey(s->state, &s->w[0]); + + // rounds 1-13 + for (round = 1; round <= 13; ++round) { + subBytes(s->state); + shiftRows(s->state); + mixColumns(s->state); + addRoundKey(s->state, &s->w[round * 4]); + } + + // round 14 + subBytes(s->state); + shiftRows(s->state); + addRoundKey(s->state, &s->w[14 * 4]); + + for (c = 0; c < 4; ++c) { + s->buf[4 * c] = s->state[c]; + s->buf[4 * c + 1] = s->state[4 + c]; + s->buf[4 * c + 2] = s->state[8 + c]; + s->buf[4 * c + 3] = s->state[12 + c]; + } + + s->bufIdx = 0; +} + +static void aes256DecryptBlock(DecryptAES256State *s, const unsigned char *in, bool last) +{ + int c, round, n, i; + + // initial state + for (c = 0; c < 4; ++c) { + s->state[c] = in[4 * c]; + s->state[4 + c] = in[4 * c + 1]; + s->state[8 + c] = in[4 * c + 2]; + s->state[12 + c] = in[4 * c + 3]; + } + + // round 0 + addRoundKey(s->state, &s->w[14 * 4]); + + // rounds 13-1 + for (round = 13; round >= 1; --round) { + invSubBytes(s->state); + invShiftRows(s->state); + invMixColumns(s->state); + addRoundKey(s->state, &s->w[round * 4]); + } + + // round 14 + invSubBytes(s->state); + invShiftRows(s->state); + addRoundKey(s->state, &s->w[0]); + + // CBC + for (c = 0; c < 4; ++c) { + s->buf[4 * c] = s->state[c] ^ s->cbc[4 * c]; + s->buf[4 * c + 1] = s->state[4 + c] ^ s->cbc[4 * c + 1]; + s->buf[4 * c + 2] = s->state[8 + c] ^ s->cbc[4 * c + 2]; + s->buf[4 * c + 3] = s->state[12 + c] ^ s->cbc[4 * c + 3]; + } + + // save the input block for the next CBC + for (i = 0; i < 16; ++i) { + s->cbc[i] = in[i]; + } + + // remove padding + s->bufIdx = 0; + if (last) { + n = s->buf[15]; + if (n < 1 || n > 16) { // this should never happen + n = 16; + } + for (i = 15; i >= n; --i) { + s->buf[i] = s->buf[i - n]; + } + s->bufIdx = n; + if (n > 16) { + error(errSyntaxError, -1, "Reducing bufIdx from {0:d} to 16 to not crash", n); + s->bufIdx = 16; + } + } +} + +//------------------------------------------------------------------------ +// MD5 message digest +//------------------------------------------------------------------------ + +// this works around a bug in older Sun compilers +static inline unsigned long rotateLeft(unsigned long x, int r) +{ + x &= 0xffffffff; + return ((x << r) | (x >> (32 - r))) & 0xffffffff; +} + +static inline unsigned long md5Round1(unsigned long a, unsigned long b, unsigned long c, unsigned long d, unsigned long Xk, unsigned long s, unsigned long Ti) +{ + return b + rotateLeft((a + ((b & c) | (~b & d)) + Xk + Ti), s); +} + +static inline unsigned long md5Round2(unsigned long a, unsigned long b, unsigned long c, unsigned long d, unsigned long Xk, unsigned long s, unsigned long Ti) +{ + return b + rotateLeft((a + ((b & d) | (c & ~d)) + Xk + Ti), s); +} + +static inline unsigned long md5Round3(unsigned long a, unsigned long b, unsigned long c, unsigned long d, unsigned long Xk, unsigned long s, unsigned long Ti) +{ + return b + rotateLeft((a + (b ^ c ^ d) + Xk + Ti), s); +} + +static inline unsigned long md5Round4(unsigned long a, unsigned long b, unsigned long c, unsigned long d, unsigned long Xk, unsigned long s, unsigned long Ti) +{ + return b + rotateLeft((a + (c ^ (b | ~d)) + Xk + Ti), s); +} + +struct MD5State +{ + unsigned long a, b, c, d; + unsigned char buf[64]; + int bufLen; + int msgLen; + unsigned char digest[16]; +}; + +static void md5Start(MD5State *state) +{ + state->a = 0x67452301; + state->b = 0xefcdab89; + state->c = 0x98badcfe; + state->d = 0x10325476; + state->bufLen = 0; + state->msgLen = 0; +} + +static void md5ProcessBlock(MD5State *state) +{ + unsigned long x[16]; + + for (int i = 0; i < 16; ++i) { + x[i] = state->buf[4 * i] | (state->buf[4 * i + 1] << 8) | (state->buf[4 * i + 2] << 16) | (state->buf[4 * i + 3] << 24); + } + + unsigned long a = state->a; + unsigned long b = state->b; + unsigned long c = state->c; + unsigned long d = state->d; + + // round 1 + a = md5Round1(a, b, c, d, x[0], 7, 0xd76aa478); + d = md5Round1(d, a, b, c, x[1], 12, 0xe8c7b756); + c = md5Round1(c, d, a, b, x[2], 17, 0x242070db); + b = md5Round1(b, c, d, a, x[3], 22, 0xc1bdceee); + a = md5Round1(a, b, c, d, x[4], 7, 0xf57c0faf); + d = md5Round1(d, a, b, c, x[5], 12, 0x4787c62a); + c = md5Round1(c, d, a, b, x[6], 17, 0xa8304613); + b = md5Round1(b, c, d, a, x[7], 22, 0xfd469501); + a = md5Round1(a, b, c, d, x[8], 7, 0x698098d8); + d = md5Round1(d, a, b, c, x[9], 12, 0x8b44f7af); + c = md5Round1(c, d, a, b, x[10], 17, 0xffff5bb1); + b = md5Round1(b, c, d, a, x[11], 22, 0x895cd7be); + a = md5Round1(a, b, c, d, x[12], 7, 0x6b901122); + d = md5Round1(d, a, b, c, x[13], 12, 0xfd987193); + c = md5Round1(c, d, a, b, x[14], 17, 0xa679438e); + b = md5Round1(b, c, d, a, x[15], 22, 0x49b40821); + + // round 2 + a = md5Round2(a, b, c, d, x[1], 5, 0xf61e2562); + d = md5Round2(d, a, b, c, x[6], 9, 0xc040b340); + c = md5Round2(c, d, a, b, x[11], 14, 0x265e5a51); + b = md5Round2(b, c, d, a, x[0], 20, 0xe9b6c7aa); + a = md5Round2(a, b, c, d, x[5], 5, 0xd62f105d); + d = md5Round2(d, a, b, c, x[10], 9, 0x02441453); + c = md5Round2(c, d, a, b, x[15], 14, 0xd8a1e681); + b = md5Round2(b, c, d, a, x[4], 20, 0xe7d3fbc8); + a = md5Round2(a, b, c, d, x[9], 5, 0x21e1cde6); + d = md5Round2(d, a, b, c, x[14], 9, 0xc33707d6); + c = md5Round2(c, d, a, b, x[3], 14, 0xf4d50d87); + b = md5Round2(b, c, d, a, x[8], 20, 0x455a14ed); + a = md5Round2(a, b, c, d, x[13], 5, 0xa9e3e905); + d = md5Round2(d, a, b, c, x[2], 9, 0xfcefa3f8); + c = md5Round2(c, d, a, b, x[7], 14, 0x676f02d9); + b = md5Round2(b, c, d, a, x[12], 20, 0x8d2a4c8a); + + // round 3 + a = md5Round3(a, b, c, d, x[5], 4, 0xfffa3942); + d = md5Round3(d, a, b, c, x[8], 11, 0x8771f681); + c = md5Round3(c, d, a, b, x[11], 16, 0x6d9d6122); + b = md5Round3(b, c, d, a, x[14], 23, 0xfde5380c); + a = md5Round3(a, b, c, d, x[1], 4, 0xa4beea44); + d = md5Round3(d, a, b, c, x[4], 11, 0x4bdecfa9); + c = md5Round3(c, d, a, b, x[7], 16, 0xf6bb4b60); + b = md5Round3(b, c, d, a, x[10], 23, 0xbebfbc70); + a = md5Round3(a, b, c, d, x[13], 4, 0x289b7ec6); + d = md5Round3(d, a, b, c, x[0], 11, 0xeaa127fa); + c = md5Round3(c, d, a, b, x[3], 16, 0xd4ef3085); + b = md5Round3(b, c, d, a, x[6], 23, 0x04881d05); + a = md5Round3(a, b, c, d, x[9], 4, 0xd9d4d039); + d = md5Round3(d, a, b, c, x[12], 11, 0xe6db99e5); + c = md5Round3(c, d, a, b, x[15], 16, 0x1fa27cf8); + b = md5Round3(b, c, d, a, x[2], 23, 0xc4ac5665); + + // round 4 + a = md5Round4(a, b, c, d, x[0], 6, 0xf4292244); + d = md5Round4(d, a, b, c, x[7], 10, 0x432aff97); + c = md5Round4(c, d, a, b, x[14], 15, 0xab9423a7); + b = md5Round4(b, c, d, a, x[5], 21, 0xfc93a039); + a = md5Round4(a, b, c, d, x[12], 6, 0x655b59c3); + d = md5Round4(d, a, b, c, x[3], 10, 0x8f0ccc92); + c = md5Round4(c, d, a, b, x[10], 15, 0xffeff47d); + b = md5Round4(b, c, d, a, x[1], 21, 0x85845dd1); + a = md5Round4(a, b, c, d, x[8], 6, 0x6fa87e4f); + d = md5Round4(d, a, b, c, x[15], 10, 0xfe2ce6e0); + c = md5Round4(c, d, a, b, x[6], 15, 0xa3014314); + b = md5Round4(b, c, d, a, x[13], 21, 0x4e0811a1); + a = md5Round4(a, b, c, d, x[4], 6, 0xf7537e82); + d = md5Round4(d, a, b, c, x[11], 10, 0xbd3af235); + c = md5Round4(c, d, a, b, x[2], 15, 0x2ad7d2bb); + b = md5Round4(b, c, d, a, x[9], 21, 0xeb86d391); + + // increment a, b, c, d + state->a += a; + state->b += b; + state->c += c; + state->d += d; + + state->bufLen = 0; +} + +static void md5Append(MD5State *state, const unsigned char *data, int dataLen) +{ + const unsigned char *p = data; + int remain = dataLen; + while (state->bufLen + remain >= 64) { + const int k = 64 - state->bufLen; + memcpy(state->buf + state->bufLen, p, k); + state->bufLen = 64; + md5ProcessBlock(state); + p += k; + remain -= k; + } + if (remain > 0) { + memcpy(state->buf + state->bufLen, p, remain); + state->bufLen += remain; + } + state->msgLen += dataLen; +} + +static void md5Finish(MD5State *state) +{ + // padding and length + state->buf[state->bufLen++] = 0x80; + if (state->bufLen > 56) { + while (state->bufLen < 64) { + state->buf[state->bufLen++] = 0x00; + } + md5ProcessBlock(state); + } + while (state->bufLen < 56) { + state->buf[state->bufLen++] = 0x00; + } + state->buf[56] = (unsigned char)(state->msgLen << 3); + state->buf[57] = (unsigned char)(state->msgLen >> 5); + state->buf[58] = (unsigned char)(state->msgLen >> 13); + state->buf[59] = (unsigned char)(state->msgLen >> 21); + state->buf[60] = (unsigned char)(state->msgLen >> 29); + state->buf[61] = (unsigned char)0; + state->buf[62] = (unsigned char)0; + state->buf[63] = (unsigned char)0; + state->bufLen = 64; + md5ProcessBlock(state); + + // break digest into bytes + state->digest[0] = (unsigned char)state->a; + state->digest[1] = (unsigned char)(state->a >> 8); + state->digest[2] = (unsigned char)(state->a >> 16); + state->digest[3] = (unsigned char)(state->a >> 24); + state->digest[4] = (unsigned char)state->b; + state->digest[5] = (unsigned char)(state->b >> 8); + state->digest[6] = (unsigned char)(state->b >> 16); + state->digest[7] = (unsigned char)(state->b >> 24); + state->digest[8] = (unsigned char)state->c; + state->digest[9] = (unsigned char)(state->c >> 8); + state->digest[10] = (unsigned char)(state->c >> 16); + state->digest[11] = (unsigned char)(state->c >> 24); + state->digest[12] = (unsigned char)state->d; + state->digest[13] = (unsigned char)(state->d >> 8); + state->digest[14] = (unsigned char)(state->d >> 16); + state->digest[15] = (unsigned char)(state->d >> 24); +} + +void md5(const unsigned char *msg, int msgLen, unsigned char *digest) +{ + if (msgLen < 0) { + return; + } + MD5State state; + md5Start(&state); + md5Append(&state, msg, msgLen); + md5Finish(&state); + for (int i = 0; i < 16; ++i) { + digest[i] = state.digest[i]; + } +} + +//------------------------------------------------------------------------ +// SHA-256 hash +//------------------------------------------------------------------------ + +static const unsigned int sha256K[64] = { 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, + 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, + 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, + 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 }; + +static inline unsigned int rotr(unsigned int x, unsigned int n) +{ + return (x >> n) | (x << (32 - n)); +} + +static inline unsigned int sha256Ch(unsigned int x, unsigned int y, unsigned int z) +{ + return (x & y) ^ (~x & z); +} + +static inline unsigned int sha256Maj(unsigned int x, unsigned int y, unsigned int z) +{ + return (x & y) ^ (x & z) ^ (y & z); +} + +static inline unsigned int sha256Sigma0(unsigned int x) +{ + return rotr(x, 2) ^ rotr(x, 13) ^ rotr(x, 22); +} + +static inline unsigned int sha256Sigma1(unsigned int x) +{ + return rotr(x, 6) ^ rotr(x, 11) ^ rotr(x, 25); +} + +static inline unsigned int sha256sigma0(unsigned int x) +{ + return rotr(x, 7) ^ rotr(x, 18) ^ (x >> 3); +} + +static inline unsigned int sha256sigma1(unsigned int x) +{ + return rotr(x, 17) ^ rotr(x, 19) ^ (x >> 10); +} + +static void sha256HashBlock(const unsigned char *blk, unsigned int *H) +{ + unsigned int W[64]; + unsigned int a, b, c, d, e, f, g, h; + unsigned int T1, T2; + unsigned int t; + + // 1. prepare the message schedule + for (t = 0; t < 16; ++t) { + W[t] = (blk[t * 4] << 24) | (blk[t * 4 + 1] << 16) | (blk[t * 4 + 2] << 8) | blk[t * 4 + 3]; + } + for (t = 16; t < 64; ++t) { + W[t] = sha256sigma1(W[t - 2]) + W[t - 7] + sha256sigma0(W[t - 15]) + W[t - 16]; + } + + // 2. initialize the eight working variables + a = H[0]; + b = H[1]; + c = H[2]; + d = H[3]; + e = H[4]; + f = H[5]; + g = H[6]; + h = H[7]; + + // 3. + for (t = 0; t < 64; ++t) { + T1 = h + sha256Sigma1(e) + sha256Ch(e, f, g) + sha256K[t] + W[t]; + T2 = sha256Sigma0(a) + sha256Maj(a, b, c); + h = g; + g = f; + f = e; + e = d + T1; + d = c; + c = b; + b = a; + a = T1 + T2; + } + + // 4. compute the intermediate hash value + H[0] += a; + H[1] += b; + H[2] += c; + H[3] += d; + H[4] += e; + H[5] += f; + H[6] += g; + H[7] += h; +} + +static void sha256(unsigned char *msg, int msgLen, unsigned char *hash) +{ + unsigned char blk[64]; + unsigned int H[8]; + int blkLen, i; + + H[0] = 0x6a09e667; + H[1] = 0xbb67ae85; + H[2] = 0x3c6ef372; + H[3] = 0xa54ff53a; + H[4] = 0x510e527f; + H[5] = 0x9b05688c; + H[6] = 0x1f83d9ab; + H[7] = 0x5be0cd19; + + blkLen = 0; + for (i = 0; i + 64 <= msgLen; i += 64) { + sha256HashBlock(msg + i, H); + } + blkLen = msgLen - i; + if (blkLen > 0) { + memcpy(blk, msg + i, blkLen); + } + + // pad the message + blk[blkLen++] = 0x80; + if (blkLen > 56) { + while (blkLen < 64) { + blk[blkLen++] = 0; + } + sha256HashBlock(blk, H); + blkLen = 0; + } + while (blkLen < 56) { + blk[blkLen++] = 0; + } + blk[56] = 0; + blk[57] = 0; + blk[58] = 0; + blk[59] = 0; + blk[60] = (unsigned char)(msgLen >> 21); + blk[61] = (unsigned char)(msgLen >> 13); + blk[62] = (unsigned char)(msgLen >> 5); + blk[63] = (unsigned char)(msgLen << 3); + sha256HashBlock(blk, H); + + // copy the output into the buffer (convert words to bytes) + for (i = 0; i < 8; ++i) { + hash[i * 4] = (unsigned char)(H[i] >> 24); + hash[i * 4 + 1] = (unsigned char)(H[i] >> 16); + hash[i * 4 + 2] = (unsigned char)(H[i] >> 8); + hash[i * 4 + 3] = (unsigned char)H[i]; + } +} +//------------------------------------------------------------------------ +// SHA-512 hash (see FIPS 180-4) +//------------------------------------------------------------------------ +// SHA 384 and SHA 512 use the same sequence of eighty constant 64 bit words. +static const uint64_t shaK[80] = { 0x428a2f98d728ae22ull, 0x7137449123ef65cdull, 0xb5c0fbcfec4d3b2full, 0xe9b5dba58189dbbcull, 0x3956c25bf348b538ull, 0x59f111f1b605d019ull, 0x923f82a4af194f9bull, 0xab1c5ed5da6d8118ull, + 0xd807aa98a3030242ull, 0x12835b0145706fbeull, 0x243185be4ee4b28cull, 0x550c7dc3d5ffb4e2ull, 0x72be5d74f27b896full, 0x80deb1fe3b1696b1ull, 0x9bdc06a725c71235ull, 0xc19bf174cf692694ull, + 0xe49b69c19ef14ad2ull, 0xefbe4786384f25e3ull, 0x0fc19dc68b8cd5b5ull, 0x240ca1cc77ac9c65ull, 0x2de92c6f592b0275ull, 0x4a7484aa6ea6e483ull, 0x5cb0a9dcbd41fbd4ull, 0x76f988da831153b5ull, + 0x983e5152ee66dfabull, 0xa831c66d2db43210ull, 0xb00327c898fb213full, 0xbf597fc7beef0ee4ull, 0xc6e00bf33da88fc2ull, 0xd5a79147930aa725ull, 0x06ca6351e003826full, 0x142929670a0e6e70ull, + 0x27b70a8546d22ffcull, 0x2e1b21385c26c926ull, 0x4d2c6dfc5ac42aedull, 0x53380d139d95b3dfull, 0x650a73548baf63deull, 0x766a0abb3c77b2a8ull, 0x81c2c92e47edaee6ull, 0x92722c851482353bull, + 0xa2bfe8a14cf10364ull, 0xa81a664bbc423001ull, 0xc24b8b70d0f89791ull, 0xc76c51a30654be30ull, 0xd192e819d6ef5218ull, 0xd69906245565a910ull, 0xf40e35855771202aull, 0x106aa07032bbd1b8ull, + 0x19a4c116b8d2d0c8ull, 0x1e376c085141ab53ull, 0x2748774cdf8eeb99ull, 0x34b0bcb5e19b48a8ull, 0x391c0cb3c5c95a63ull, 0x4ed8aa4ae3418acbull, 0x5b9cca4f7763e373ull, 0x682e6ff3d6b2b8a3ull, + 0x748f82ee5defb2fcull, 0x78a5636f43172f60ull, 0x84c87814a1f0ab72ull, 0x8cc702081a6439ecull, 0x90befffa23631e28ull, 0xa4506cebde82bde9ull, 0xbef9a3f7b2c67915ull, 0xc67178f2e372532bull, + 0xca273eceea26619cull, 0xd186b8c721c0c207ull, 0xeada7dd6cde0eb1eull, 0xf57d4f7fee6ed178ull, 0x06f067aa72176fbaull, 0x0a637dc5a2c898a6ull, 0x113f9804bef90daeull, 0x1b710b35131c471bull, + 0x28db77f523047d84ull, 0x32caab7b40c72493ull, 0x3c9ebe0a15c9bebcull, 0x431d67c49c100d4cull, 0x4cc5d4becb3e42b6ull, 0x597f299cfc657e2aull, 0x5fcb6fab3ad6faecull, 0x6c44198c4a475817ull }; + +static inline uint64_t rotr(uint64_t x, uint64_t n) +{ + return (x >> n) | (x << (64 - n)); +} +static inline uint64_t sha512Ch(uint64_t x, uint64_t y, uint64_t z) +{ + return (x & y) ^ (~x & z); +} +static inline uint64_t sha512Maj(uint64_t x, uint64_t y, uint64_t z) +{ + return (x & y) ^ (x & z) ^ (y & z); +} +static inline uint64_t sha512Sigma0(uint64_t x) +{ + return rotr(x, 28) ^ rotr(x, 34) ^ rotr(x, 39); +} +static inline uint64_t sha512Sigma1(uint64_t x) +{ + return rotr(x, 14) ^ rotr(x, 18) ^ rotr(x, 41); +} +static inline uint64_t sha512sigma0(uint64_t x) +{ + return rotr(x, 1) ^ rotr(x, 8) ^ (x >> 7); +} +static inline uint64_t sha512sigma1(uint64_t x) +{ + return rotr(x, 19) ^ rotr(x, 61) ^ (x >> 6); +} + +static void sha512HashBlock(const unsigned char *blk, uint64_t *H) +{ + uint64_t W[80]; + uint64_t a, b, c, d, e, f, g, h; + uint64_t T1, T2; + unsigned int t; + + // 1. prepare the message schedule + for (t = 0; t < 16; ++t) { + W[t] = (((uint64_t)blk[t * 8] << 56) | ((uint64_t)blk[t * 8 + 1] << 48) | ((uint64_t)blk[t * 8 + 2] << 40) | ((uint64_t)blk[t * 8 + 3] << 32) | ((uint64_t)blk[t * 8 + 4] << 24) | ((uint64_t)blk[t * 8 + 5] << 16) + | ((uint64_t)blk[t * 8 + 6] << 8) | ((uint64_t)blk[t * 8 + 7])); + } + for (t = 16; t < 80; ++t) { + W[t] = sha512sigma1(W[t - 2]) + W[t - 7] + sha512sigma0(W[t - 15]) + W[t - 16]; + } + + // 2. initialize the eight working variables + a = H[0]; + b = H[1]; + c = H[2]; + d = H[3]; + e = H[4]; + f = H[5]; + g = H[6]; + h = H[7]; + + // 3. + for (t = 0; t < 80; ++t) { + T1 = h + sha512Sigma1(e) + sha512Ch(e, f, g) + shaK[t] + W[t]; + T2 = sha512Sigma0(a) + sha512Maj(a, b, c); + h = g; + g = f; + f = e; + e = d + T1; + d = c; + c = b; + b = a; + a = T1 + T2; + } + + // 4. compute the intermediate hash value + H[0] += a; + H[1] += b; + H[2] += c; + H[3] += d; + H[4] += e; + H[5] += f; + H[6] += g; + H[7] += h; +} + +static void sha512(unsigned char *msg, int msgLen, unsigned char *hash) +{ + unsigned char blk[128]; + uint64_t H[8]; + int blkLen = 0, i; + // setting the initial hash value. + H[0] = 0x6a09e667f3bcc908ull; + H[1] = 0xbb67ae8584caa73bull; + H[2] = 0x3c6ef372fe94f82bull; + H[3] = 0xa54ff53a5f1d36f1ull; + H[4] = 0x510e527fade682d1ull; + H[5] = 0x9b05688c2b3e6c1full; + H[6] = 0x1f83d9abfb41bd6bull; + H[7] = 0x5be0cd19137e2179ull; + + for (i = 0; i + 128 <= msgLen; i += 128) { + sha512HashBlock(msg + i, H); + } + blkLen = msgLen - i; + if (blkLen > 0) { + memcpy(blk, msg + i, blkLen); + } + + // pad the message + blk[blkLen++] = 0x80; + if (blkLen > 112) { + while (blkLen < 128) { + blk[blkLen++] = 0; + } + sha512HashBlock(blk, H); + blkLen = 0; + } + while (blkLen < 112) { + blk[blkLen++] = 0; + } + blk[112] = 0; + blk[113] = 0; + blk[114] = 0; + blk[115] = 0; + blk[116] = 0; + blk[117] = 0; + blk[118] = 0; + blk[119] = 0; + blk[120] = 0; + blk[121] = 0; + blk[122] = 0; + blk[123] = 0; + blk[124] = (unsigned char)(msgLen >> 21); + blk[125] = (unsigned char)(msgLen >> 13); + blk[126] = (unsigned char)(msgLen >> 5); + blk[127] = (unsigned char)(msgLen << 3); + + sha512HashBlock(blk, H); + + // copy the output into the buffer (convert words to bytes) + for (i = 0; i < 8; ++i) { + hash[i * 8] = (unsigned char)(H[i] >> 56); + hash[i * 8 + 1] = (unsigned char)(H[i] >> 48); + hash[i * 8 + 2] = (unsigned char)(H[i] >> 40); + hash[i * 8 + 3] = (unsigned char)(H[i] >> 32); + hash[i * 8 + 4] = (unsigned char)(H[i] >> 24); + hash[i * 8 + 5] = (unsigned char)(H[i] >> 16); + hash[i * 8 + 6] = (unsigned char)(H[i] >> 8); + hash[i * 8 + 7] = (unsigned char)H[i]; + } +} + +//------------------------------------------------------------------------ +// SHA-384 (see FIPS 180-4) +//------------------------------------------------------------------------ +// The algorithm is defined in the exact same manner as SHA 512 with 2 exceptions +// 1.Initial hash value is different. +// 2.A 384 bit message digest is obtained by truncating the final hash value. +static void sha384(unsigned char *msg, int msgLen, unsigned char *hash) +{ + unsigned char blk[128]; + uint64_t H[8]; + int blkLen, i; + // setting initial hash values + H[0] = 0xcbbb9d5dc1059ed8ull; + H[1] = 0x629a292a367cd507ull; + H[2] = 0x9159015a3070dd17ull; + H[3] = 0x152fecd8f70e5939ull; + H[4] = 0x67332667ffc00b31ull; + H[5] = 0x8eb44a8768581511ull; + H[6] = 0xdb0c2e0d64f98fa7ull; + H[7] = 0x47b5481dbefa4fa4ull; + // SHA 384 will use the same sha512HashBlock function. + blkLen = 0; + for (i = 0; i + 128 <= msgLen; i += 128) { + sha512HashBlock(msg + i, H); + } + blkLen = msgLen - i; + if (blkLen > 0) { + memcpy(blk, msg + i, blkLen); + } + + // pad the message + blk[blkLen++] = 0x80; + if (blkLen > 112) { + while (blkLen < 128) { + blk[blkLen++] = 0; + } + sha512HashBlock(blk, H); + blkLen = 0; + } + while (blkLen < 112) { + blk[blkLen++] = 0; + } + blk[112] = 0; + blk[113] = 0; + blk[114] = 0; + blk[115] = 0; + blk[116] = 0; + blk[117] = 0; + blk[118] = 0; + blk[119] = 0; + blk[120] = 0; + blk[121] = 0; + blk[122] = 0; + blk[123] = 0; + blk[124] = (unsigned char)(msgLen >> 21); + blk[125] = (unsigned char)(msgLen >> 13); + blk[126] = (unsigned char)(msgLen >> 5); + blk[127] = (unsigned char)(msgLen << 3); + + sha512HashBlock(blk, H); + + // copy the output into the buffer (convert words to bytes) + // hash is truncated to 384 bits. + for (i = 0; i < 6; ++i) { + hash[i * 8] = (unsigned char)(H[i] >> 56); + hash[i * 8 + 1] = (unsigned char)(H[i] >> 48); + hash[i * 8 + 2] = (unsigned char)(H[i] >> 40); + hash[i * 8 + 3] = (unsigned char)(H[i] >> 32); + hash[i * 8 + 4] = (unsigned char)(H[i] >> 24); + hash[i * 8 + 5] = (unsigned char)(H[i] >> 16); + hash[i * 8 + 6] = (unsigned char)(H[i] >> 8); + hash[i * 8 + 7] = (unsigned char)H[i]; + } +} + +//------------------------------------------------------------------------ +// Section 7.6.3.3 (Encryption Key algorithm) of ISO/DIS 32000-2 +// Algorithm 2.B:Computing a hash (for revision 6). +//------------------------------------------------------------------------ +static void revision6Hash(const GooString *inputPassword, unsigned char *K, const char *userKey) +{ + unsigned char K1[64 * (127 + 64 + 48)]; + unsigned char E[64 * (127 + 64 + 48)]; + DecryptAESState state; + unsigned char aesKey[16]; + unsigned char BE16byteNumber[16]; + + int inputPasswordLength = inputPassword->getLength(); + int KLength = 32; + const int userKeyLength = userKey ? 48 : 0; + int sequenceLength; + int totalLength; + int rounds = 0; + + while (rounds < 64 || rounds < E[totalLength - 1] + 32) { + sequenceLength = inputPasswordLength + KLength + userKeyLength; + totalLength = 64 * sequenceLength; + // a.make the string K1 + memcpy(K1, inputPassword->c_str(), inputPasswordLength); + memcpy(K1 + inputPasswordLength, K, KLength); + if (userKey) { + memcpy(K1 + inputPasswordLength + KLength, userKey, userKeyLength); + } + for (int i = 1; i < 64; ++i) { + memcpy(K1 + (i * sequenceLength), K1, sequenceLength); + } + // b.Encrypt K1 + memcpy(aesKey, K, 16); + memcpy(state.cbc, K + 16, 16); + memcpy(state.buf, state.cbc, 16); // Copy CBC IV to buf + state.bufIdx = 0; + state.paddingReached = false; + aesKeyExpansion(&state, aesKey, 16, false); + + for (int i = 0; i < (4 * sequenceLength); i++) { + aesEncryptBlock(&state, K1 + (16 * i)); + memcpy(E + (16 * i), state.buf, 16); + } + memcpy(BE16byteNumber, E, 16); + // c.Taking the first 16 Bytes of E as unsigned big-endian integer, + // compute the remainder,modulo 3. + uint64_t N1 = 0, N2 = 0, N3 = 0; + // N1 contains first 8 bytes of BE16byteNumber + N1 = ((uint64_t)BE16byteNumber[0] << 56 | (uint64_t)BE16byteNumber[1] << 48 | (uint64_t)BE16byteNumber[2] << 40 | (uint64_t)BE16byteNumber[3] << 32 | (uint64_t)BE16byteNumber[4] << 24 | (uint64_t)BE16byteNumber[5] << 16 + | (uint64_t)BE16byteNumber[6] << 8 | (uint64_t)BE16byteNumber[7]); + uint64_t rem = N1 % 3; + // N2 contains 0s in higher 4 bytes and 9th to 12 th bytes of BE16byteNumber in lower 4 bytes. + N2 = ((uint64_t)BE16byteNumber[8] << 24 | (uint64_t)BE16byteNumber[9] << 16 | (uint64_t)BE16byteNumber[10] << 8 | (uint64_t)BE16byteNumber[11]); + rem = ((rem << 32) | N2) % 3; + // N3 contains 0s in higher 4 bytes and 13th to 16th bytes of BE16byteNumber in lower 4 bytes. + N3 = ((uint64_t)BE16byteNumber[12] << 24 | (uint64_t)BE16byteNumber[13] << 16 | (uint64_t)BE16byteNumber[14] << 8 | (uint64_t)BE16byteNumber[15]); + rem = ((rem << 32) | N3) % 3; + + // d.If remainder is 0 perform SHA-256 + if (rem == 0) { + KLength = 32; + sha256(E, totalLength, K); + } + // remainder is 1 perform SHA-384 + else if (rem == 1) { + KLength = 48; + sha384(E, totalLength, K); + } + // remainder is 2 perform SHA-512 + else if (rem == 2) { + KLength = 64; + sha512(E, totalLength, K); + } + rounds++; + } + // the first 32 bytes of the final K are the output of the function. +} diff --git a/poppler-24.05.0/poppler/Decrypt.h b/poppler-24.05.0/poppler/Decrypt.h new file mode 100644 index 0000000000000000000000000000000000000000..4f0c6d288c154369f59a208001a3bba7d1ce00ed --- /dev/null +++ b/poppler-24.05.0/poppler/Decrypt.h @@ -0,0 +1,147 @@ +//======================================================================== +// +// Decrypt.h +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2008 Julien Rebetez +// Copyright (C) 2009 David Benjamin +// Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2013 Adrian Johnson +// Copyright (C) 2013, 2018, 2019, 2021 Albert Astals Cid +// Copyright (C) 2013 Thomas Freitag +// +// 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 +// +//======================================================================== + +#ifndef DECRYPT_H +#define DECRYPT_H + +#include "goo/GooString.h" +#include "Object.h" +#include "Stream.h" + +//------------------------------------------------------------------------ +// Decrypt +//------------------------------------------------------------------------ + +class Decrypt +{ +public: + // Generate a file key. The buffer must have space for at + // least 16 bytes. Checks and then + // and returns true if either is correct. Sets if + // the owner password was correct. Either or both of the passwords + // may be NULL, which is treated as an empty string. + static bool makeFileKey(int encVersion, int encRevision, int keyLength, const GooString *ownerKey, const GooString *userKey, const GooString *ownerEnc, const GooString *userEnc, int permissions, const GooString *fileID, + const GooString *ownerPassword, const GooString *userPassword, unsigned char *fileKey, bool encryptMetadata, bool *ownerPasswordOk); + +private: + static bool makeFileKey2(int encVersion, int encRevision, int keyLength, const GooString *ownerKey, const GooString *userKey, int permissions, const GooString *fileID, const GooString *userPassword, unsigned char *fileKey, + bool encryptMetadata); +}; + +//------------------------------------------------------------------------ +// Helper classes +//------------------------------------------------------------------------ + +/* DecryptRC4State, DecryptAESState, DecryptAES256State are named like this for + * historical reasons, but they're used for encryption too. + * In case of decryption, the cbc field in AES and AES-256 contains the previous + * input block or the CBC initialization vector (IV) if the stream has just been + * reset). In case of encryption, it always contains the IV, whereas the + * previous output is kept in buf. The paddingReached field is only used in + * case of encryption. */ +struct DecryptRC4State +{ + unsigned char state[256]; + unsigned char x, y; +}; + +struct DecryptAESState +{ + unsigned int w[44]; + unsigned char state[16]; + unsigned char cbc[16]; + unsigned char buf[16]; + bool paddingReached; // encryption only + int bufIdx; +}; + +struct DecryptAES256State +{ + unsigned int w[60]; + unsigned char state[16]; + unsigned char cbc[16]; + unsigned char buf[16]; + bool paddingReached; // encryption only + int bufIdx; +}; + +class BaseCryptStream : public FilterStream +{ +public: + BaseCryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, int keyLength, Ref ref); + ~BaseCryptStream() override; + StreamKind getKind() const override { return strCrypt; } + void reset() override; + int getChar() override; + int lookChar() override = 0; + Goffset getPos() override; + bool isBinary(bool last) const override; + Stream *getUndecodedStream() override { return this; } + void setAutoDelete(bool val); + +protected: + CryptAlgorithm algo; + int objKeyLength; + unsigned char objKey[32]; + Goffset charactersRead; // so that getPos() can be correct + int nextCharBuff; // EOF means not read yet + bool autoDelete; + + union { + DecryptRC4State rc4; + DecryptAESState aes; + DecryptAES256State aes256; + } state; +}; + +//------------------------------------------------------------------------ +// EncryptStream / DecryptStream +//------------------------------------------------------------------------ + +class EncryptStream : public BaseCryptStream +{ +public: + EncryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, int keyLength, Ref ref); + ~EncryptStream() override; + void reset() override; + int lookChar() override; +}; + +class DecryptStream : public BaseCryptStream +{ +public: + DecryptStream(Stream *strA, const unsigned char *fileKey, CryptAlgorithm algoA, int keyLength, Ref ref); + ~DecryptStream() override; + void reset() override; + int lookChar() override; +}; + +//------------------------------------------------------------------------ + +extern void md5(const unsigned char *msg, int msgLen, unsigned char *digest); + +#endif diff --git a/poppler-24.05.0/poppler/Dict.cc b/poppler-24.05.0/poppler/Dict.cc new file mode 100644 index 0000000000000000000000000000000000000000..789f90edc3973cdca2bc1cfb94620969c1a10b1e --- /dev/null +++ b/poppler-24.05.0/poppler/Dict.cc @@ -0,0 +1,259 @@ +//======================================================================== +// +// Dict.cc +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Kristian Høgsberg +// Copyright (C) 2006 Krzysztof Kowalczyk +// Copyright (C) 2007-2008 Julien Rebetez +// Copyright (C) 2008, 2010, 2013, 2014, 2017, 2019, 2020, 2022 Albert Astals Cid +// Copyright (C) 2010 Paweł Wiejacha +// Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2014 Scott West +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018 Adam Reichold +// +// 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 + +#include + +#include "XRef.h" +#include "Dict.h" + +//------------------------------------------------------------------------ +// Dict +//------------------------------------------------------------------------ + +#define dictLocker() const std::scoped_lock locker(mutex) + +constexpr int SORT_LENGTH_LOWER_LIMIT = 32; + +struct Dict::CmpDictEntry +{ + bool operator()(const DictEntry &lhs, const DictEntry &rhs) const { return lhs.first < rhs.first; } + bool operator()(const DictEntry &lhs, const char *rhs) const { return lhs.first < rhs; } + bool operator()(const char *lhs, const DictEntry &rhs) const { return lhs < rhs.first; } +}; + +Dict::Dict(XRef *xrefA) +{ + xref = xrefA; + ref = 1; + + sorted = false; +} + +Dict::Dict(const Dict *dictA) +{ + xref = dictA->xref; + ref = 1; + + entries.reserve(dictA->entries.size()); + for (const auto &entry : dictA->entries) { + entries.emplace_back(entry.first, entry.second.copy()); + } + + sorted = dictA->sorted.load(); +} + +Dict *Dict::copy(XRef *xrefA) const +{ + dictLocker(); + Dict *dictA = new Dict(this); + dictA->xref = xrefA; + for (auto &entry : dictA->entries) { + if (entry.second.getType() == objDict) { + entry.second = Object(entry.second.getDict()->copy(xrefA)); + } + } + return dictA; +} + +Dict *Dict::deepCopy() const +{ + dictLocker(); + Dict *dictA = new Dict(xref); + + dictA->entries.reserve(entries.size()); + for (auto &entry : entries) { + dictA->entries.emplace_back(entry.first, entry.second.deepCopy()); + } + return dictA; +} + +void Dict::add(const char *key, Object &&val) +{ + dictLocker(); + entries.emplace_back(key, std::move(val)); + sorted = false; +} + +inline const Dict::DictEntry *Dict::find(const char *key) const +{ + if (entries.size() >= SORT_LENGTH_LOWER_LIMIT) { + if (!sorted) { + dictLocker(); + if (!sorted) { + Dict *that = const_cast(this); + + std::sort(that->entries.begin(), that->entries.end(), CmpDictEntry {}); + that->sorted = true; + } + } + } + + if (sorted) { + const auto pos = std::lower_bound(entries.begin(), entries.end(), key, CmpDictEntry {}); + if (pos != entries.end() && pos->first == key) { + return &*pos; + } + } else { + const auto pos = std::find_if(entries.rbegin(), entries.rend(), [key](const DictEntry &entry) { return entry.first == key; }); + if (pos != entries.rend()) { + return &*pos; + } + } + return nullptr; +} + +inline Dict::DictEntry *Dict::find(const char *key) +{ + return const_cast(const_cast(this)->find(key)); +} + +void Dict::remove(const char *key) +{ + dictLocker(); + if (auto *entry = find(key)) { + if (sorted) { + const auto index = entry - &entries.front(); + entries.erase(entries.begin() + index); + } else { + swap(*entry, entries.back()); + entries.pop_back(); + } + } +} + +void Dict::set(const char *key, Object &&val) +{ + if (val.isNull()) { + remove(key); + return; + } + dictLocker(); + if (auto *entry = find(key)) { + entry->second = std::move(val); + } else { + add(key, std::move(val)); + } +} + +bool Dict::is(const char *type) const +{ + if (const auto *entry = find("Type")) { + return entry->second.isName(type); + } + return false; +} + +Object Dict::lookup(const char *key, int recursion) const +{ + if (const auto *entry = find(key)) { + return entry->second.fetch(xref, recursion); + } + return Object(objNull); +} + +Object Dict::lookup(const char *key, Ref *returnRef, int recursion) const +{ + if (const auto *entry = find(key)) { + if (entry->second.getType() == objRef) { + *returnRef = entry->second.getRef(); + } else { + *returnRef = Ref::INVALID(); + } + return entry->second.fetch(xref, recursion); + } + *returnRef = Ref::INVALID(); + return Object(objNull); +} + +Object Dict::lookupEnsureEncryptedIfNeeded(const char *key) const +{ + const auto *entry = find(key); + if (!entry) { + return Object(objNull); + } + + if (entry->second.getType() == objRef && xref->isEncrypted() && !xref->isRefEncrypted(entry->second.getRef())) { + error(errSyntaxError, -1, "{0:s} is not encrypted and the document is. This may be a hacking attempt", key); + return Object(objNull); + } + + return entry->second.fetch(xref); +} + +const Object &Dict::lookupNF(const char *key) const +{ + if (const auto *entry = find(key)) { + return entry->second; + } + static Object nullObj(objNull); + return nullObj; +} + +bool Dict::lookupInt(const char *key, const char *alt_key, int *value) const +{ + auto obj1 = lookup(key); + if (obj1.isNull() && alt_key != nullptr) { + obj1 = lookup(alt_key); + } + if (obj1.isInt()) { + *value = obj1.getInt(); + return true; + } + return false; +} + +Object Dict::getVal(int i, Ref *returnRef) const +{ + const DictEntry &entry = entries[i]; + if (entry.second.getType() == objRef) { + *returnRef = entry.second.getRef(); + } else { + *returnRef = Ref::INVALID(); + } + return entry.second.fetch(xref); +} + +bool Dict::hasKey(const char *key) const +{ + return find(key) != nullptr; +} + +std::string Dict::findAvailableKey(const std::string &suggestedKey) +{ + int i = 0; + std::string res = suggestedKey; + while (find(res.c_str())) { + res = suggestedKey + std::to_string(i++); + } + return res; +} diff --git a/poppler-24.05.0/poppler/Dict.h b/poppler-24.05.0/poppler/Dict.h new file mode 100644 index 0000000000000000000000000000000000000000..621b76a2096e2c283786d85d2314731c26943e73 --- /dev/null +++ b/poppler-24.05.0/poppler/Dict.h @@ -0,0 +1,131 @@ +//======================================================================== +// +// Dict.h +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Kristian Høgsberg +// Copyright (C) 2006 Krzysztof Kowalczyk +// Copyright (C) 2007-2008 Julien Rebetez +// Copyright (C) 2010, 2017-2022 Albert Astals Cid +// Copyright (C) 2010 Paweł Wiejacha +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018 Adam Reichold +// +// 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 +// +//======================================================================== + +#ifndef DICT_H +#define DICT_H + +#include +#include +#include +#include +#include + +#include "poppler-config.h" +#include "poppler_private_export.h" +#include "Object.h" + +//------------------------------------------------------------------------ +// Dict +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT Dict +{ +public: + // Constructor. + explicit Dict(XRef *xrefA); + explicit Dict(const Dict *dictA); + Dict *copy(XRef *xrefA) const; + + Dict *deepCopy() const; + + Dict(const Dict &) = delete; + Dict &operator=(const Dict &) = delete; + + // Get number of entries. + int getLength() const { return static_cast(entries.size()); } + + // Add an entry. (Copies key into Dict.) + // val becomes a dead object after the call + void add(const char *key, Object &&val); + + // Add an entry. (Takes ownership of key.) + void add(char *key, Object &&val) = delete; + + // Update the value of an existing entry, otherwise create it + // val becomes a dead object after the call + void set(const char *key, Object &&val); + // Remove an entry. This invalidate indexes + void remove(const char *key); + + // Check if dictionary is of specified type. + bool is(const char *type) const; + + // Look up an entry and return the value. Returns a null object + // if is not in the dictionary. + Object lookup(const char *key, int recursion = 0) const; + // Same as above but if the returned object is a fetched Ref returns such Ref in returnRef, otherwise returnRef is Ref::INVALID() + Object lookup(const char *key, Ref *returnRef, int recursion = 0) const; + // Look up an entry and return the value. Returns a null object + // if is not in the dictionary or if it is a ref to a non encrypted object in a partially encrypted document + Object lookupEnsureEncryptedIfNeeded(const char *key) const; + const Object &lookupNF(const char *key) const; + bool lookupInt(const char *key, const char *alt_key, int *value) const; + + // Iterative accessors. + const char *getKey(int i) const { return entries[i].first.c_str(); } + Object getVal(int i) const { return entries[i].second.fetch(xref); } + // Same as above but if the returned object is a fetched Ref returns such Ref in returnRef, otherwise returnRef is Ref::INVALID() + Object getVal(int i, Ref *returnRef) const; + const Object &getValNF(int i) const { return entries[i].second; } + + // Set the xref pointer. This is only used in one special case: the + // trailer dictionary, which is read before the xref table is + // parsed. + void setXRef(XRef *xrefA) { xref = xrefA; } + + XRef *getXRef() const { return xref; } + + bool hasKey(const char *key) const; + + // Returns a key name that is not in the dictionary + // It will be suggestedKey itself if available + // otherwise it will start adding 0, 1, 2, 3, etc. to suggestedKey until there's one available + std::string findAvailableKey(const std::string &suggestedKey); + +private: + friend class Object; // for incRef/decRef + + // Reference counting. + int incRef() { return ++ref; } + int decRef() { return --ref; } + + using DictEntry = std::pair; + struct CmpDictEntry; + + XRef *xref; // the xref table for this PDF file + std::vector entries; + std::atomic_int ref; // reference count + std::atomic_bool sorted; + mutable std::recursive_mutex mutex; + + const DictEntry *find(const char *key) const; + DictEntry *find(const char *key); +}; + +#endif diff --git a/poppler-24.05.0/poppler/DistinguishedNameParser.h b/poppler-24.05.0/poppler/DistinguishedNameParser.h new file mode 100644 index 0000000000000000000000000000000000000000..dfabc97e07d615cab971ce49f28ba3a1501bdc77 --- /dev/null +++ b/poppler-24.05.0/poppler/DistinguishedNameParser.h @@ -0,0 +1,321 @@ +//======================================================================== +// +// DistinguishedNameParser.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2002 g10 Code GmbH +// Copyright 2004 Klarälvdalens Datakonsult AB +// Copyright 2021 g10 Code GmbH +// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// Derived from libkleopatra (KDE key management library) dn.cpp +// +//======================================================================== + +#ifndef DISTINGUISHEDNAMEPARSER_H +#define DISTINGUISHEDNAMEPARSER_H + +#include +#include +#include +#include +#include + +namespace DN { +namespace detail { + +inline std::string_view removeLeadingSpaces(std::string_view view) +{ + auto pos = view.find_first_not_of(' '); + if (pos > view.size()) { + return {}; + } + return view.substr(pos); +} + +inline std::string_view removeTrailingSpaces(std::string_view view) +{ + auto pos = view.find_last_not_of(' '); + if (pos > view.size()) { + return {}; + } + return view.substr(0, pos + 1); +} + +inline unsigned char xtoi(unsigned char c) +{ + if (c <= '9') { + return c - '0'; + } + if (c <= 'F') { + return c - 'A' + 10; + } + return c < 'a' + 10; +} + +inline unsigned char xtoi(unsigned char first, unsigned char second) +{ + return 16 * xtoi(first) + xtoi(second); +} +// Parses a hex string into actual content +inline std::optional parseHexString(std::string_view view) +{ + auto size = view.size(); + if (size == 0 || (size % 2 == 1)) { + return std::nullopt; + } + // It is only supposed to be called with actual hex strings + // but this is just to be extra sure + auto endHex = view.find_first_not_of("1234567890abcdefABCDEF"); + if (endHex != std::string_view::npos) { + return {}; + } + std::string result; + result.reserve(size / 2); + for (size_t i = 0; i < (view.size() - 1); i += 2) { + result.push_back(xtoi(view[i], view[i + 1])); + } + return result; +} + +static const std::vector> oidmap = { + // clang-format off + // keep them ordered by oid: + {"NameDistinguisher", "0.2.262.1.10.7.20" }, + {"EMAIL", "1.2.840.113549.1.9.1"}, + {"CN", "2.5.4.3" }, + {"SN", "2.5.4.4" }, + {"SerialNumber", "2.5.4.5" }, + {"T", "2.5.4.12" }, + {"D", "2.5.4.13" }, + {"BC", "2.5.4.15" }, + {"ADDR", "2.5.4.16" }, + {"PC", "2.5.4.17" }, + {"GN", "2.5.4.42" }, + {"Pseudo", "2.5.4.65" }, + // clang-format on +}; + +static std::string_view attributeNameForOID(std::string_view oid) +{ + if (oid.substr(0, 4) == std::string_view { "OID." } || oid.substr(0, 4) == std::string_view { "oid." }) { // c++20 has starts_with. we don't have that yet. + oid.remove_prefix(4); + } + for (const auto &m : oidmap) { + if (oid == m.second) { + return m.first; + } + } + return {}; +} + +/* Parse a DN and return an array-ized one. This is not a validating + parser and it does not support any old-stylish syntax; gpgme is + expected to return only rfc2253 compatible strings. */ +static std::pair, std::pair> parse_dn_part(std::string_view stringv) +{ + std::pair dnPair; + auto separatorPos = stringv.find_first_of('='); + if (separatorPos == 0 || separatorPos == std::string_view::npos) { + return {}; /* empty key */ + } + + std::string_view key = stringv.substr(0, separatorPos); + key = removeTrailingSpaces(key); + // map OIDs to their names: + if (auto name = attributeNameForOID(key); !name.empty()) { + key = name; + } + + dnPair.first = std::string { key }; + stringv = removeLeadingSpaces(stringv.substr(separatorPos + 1)); + if (stringv.empty()) { + return {}; + } + + if (stringv.front() == '#') { + /* hexstring */ + stringv.remove_prefix(1); + auto endHex = stringv.find_first_not_of("1234567890abcdefABCDEF"); + if (!endHex || (endHex % 2 == 1)) { + return {}; /* empty or odd number of digits */ + } + auto value = parseHexString(stringv.substr(0, endHex)); + if (!value.has_value()) { + return {}; + } + stringv = stringv.substr(endHex); + dnPair.second = value.value(); + } else if (stringv.front() == '"') { + stringv.remove_prefix(1); + std::string value; + bool stop = false; + while (!stringv.empty() && !stop) { + switch (stringv.front()) { + case '\\': { + if (stringv.size() < 2) { + return {}; + } + if (stringv[1] == '"') { + value.push_back('"'); + stringv.remove_prefix(2); + } else { + // it is a bit unclear in rfc2253 if escaped hex chars should + // be decoded inside quotes. Let's just forward the verbatim + // for now + value.push_back(stringv.front()); + value.push_back(stringv[1]); + stringv.remove_prefix(2); + } + break; + } + case '"': { + stop = true; + stringv.remove_prefix(1); + break; + } + default: { + value.push_back(stringv.front()); + stringv.remove_prefix(1); + } + } + } + if (!stop) { + // we have reached end of string, but never an actual ", so error out + return {}; + } + dnPair.second = value; + } else { + std::string value; + bool stop = false; + bool lastAddedEscapedSpace = false; + while (!stringv.empty() && !stop) { + switch (stringv.front()) { + case '\\': //_escaping + { + stringv.remove_prefix(1); + if (stringv.empty()) { + return {}; + } + switch (stringv.front()) { + case ',': + case '=': + case '+': + case '<': + case '>': + case '#': + case ';': + case '\\': + case '"': + case ' ': { + if (stringv.front() == ' ') { + lastAddedEscapedSpace = true; + } else { + lastAddedEscapedSpace = false; + } + value.push_back(stringv.front()); + stringv.remove_prefix(1); + break; + } + default: { + if (stringv.size() < 2) { + // this should be double hex-ish, but isn't. + return {}; + } + if (std::isxdigit(stringv.front()) && std::isxdigit(stringv[1])) { + lastAddedEscapedSpace = false; + value.push_back(xtoi(stringv.front(), stringv[1])); + stringv.remove_prefix(2); + break; + } else { + // invalid escape + return {}; + } + } + } + break; + } + case '"': + // unescaped " in the middle; not allowed + return {}; + case ',': + case '=': + case '+': + case '<': + case '>': + case '#': + case ';': { + stop = true; + break; // + } + default: + lastAddedEscapedSpace = false; + value.push_back(stringv.front()); + stringv.remove_prefix(1); + } + } + if (lastAddedEscapedSpace) { + dnPair.second = value; + } else { + dnPair.second = std::string { removeTrailingSpaces(value) }; + } + } + return { stringv, dnPair }; +} +} + +using Result = std::vector>; + +/* Parse a DN and return an array-ized one. This is not a validating + parser and it does not support any old-stylish syntax; gpgme is + expected to return only rfc2253 compatible strings. */ +static Result parseString(std::string_view string) +{ + Result result; + while (!string.empty()) { + string = detail::removeLeadingSpaces(string); + if (string.empty()) { + break; + } + + auto [partResult, dnPair] = detail::parse_dn_part(string); + if (!partResult.has_value()) { + return {}; + } + + string = partResult.value(); + if (dnPair.first.size() && dnPair.second.size()) { + result.emplace_back(std::move(dnPair)); + } + + string = detail::removeLeadingSpaces(string); + if (string.empty()) { + break; + } + switch (string.front()) { + case ',': + case ';': + case '+': + string.remove_prefix(1); + break; + default: + // some unexpected characters here + return {}; + } + } + return result; +} + +/// returns the first value of a given key (note. there can be multiple) +/// or nullopt if key is not available +inline std::optional FindFirstValue(const Result &dn, std::string_view key) +{ + auto first = std::find_if(dn.begin(), dn.end(), [&key](const auto &it) { return it.first == key; }); + if (first == dn.end()) { + return {}; + } + return first->second; +} +} // namespace DN +#endif // DISTINGUISHEDNAMEPARSER_H diff --git a/poppler-24.05.0/poppler/Error.cc b/poppler-24.05.0/poppler/Error.cc new file mode 100644 index 0000000000000000000000000000000000000000..f821bba9ec5219d0fc6f55094594085f37406acd --- /dev/null +++ b/poppler-24.05.0/poppler/Error.cc @@ -0,0 +1,79 @@ +//======================================================================== +// +// Error.cc +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005, 2007 Jeff Muizelaar +// Copyright (C) 2005, 2018, 2022 Albert Astals Cid +// Copyright (C) 2007 Krzysztof Kowalczyk +// Copyright (C) 2012 Marek Kasik +// Copyright (C) 2013, 2017 Adrian Johnson +// Copyright (C) 2020 Adam Reichold +// +// 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 +#include + +#include +#include +#include +#include "GooString.h" +#include "GlobalParams.h" +#include "Error.h" + +static const char *errorCategoryNames[] = { "Syntax Warning", "Syntax Error", "Config Error", "Command Line Error", "I/O Error", "Permission Error", "Unimplemented Feature", "Internal Error" }; + +static ErrorCallback errorCbk = nullptr; + +void setErrorCallback(ErrorCallback cbk) +{ + errorCbk = cbk; +} + +void CDECL error(ErrorCategory category, Goffset pos, const char *msg, ...) +{ + va_list args; + + // NB: this can be called before the globalParams object is created + if (!errorCbk && globalParams && globalParams->getErrQuiet()) { + return; + } + va_start(args, msg); + const std::unique_ptr s = GooString::formatv(msg, args); + va_end(args); + + GooString sanitized; + for (int i = 0; i < s->getLength(); ++i) { + const char c = s->getChar(i); + if (c < (char)0x20 || c >= (char)0x7f) { + sanitized.appendf("<{0:02x}>", c & 0xff); + } else { + sanitized.append(c); + } + } + + if (errorCbk) { + (*errorCbk)(category, pos, sanitized.c_str()); + } else { + if (pos >= 0) { + fprintf(stderr, "%s (%lld): %s\n", errorCategoryNames[category], (long long)pos, sanitized.c_str()); + } else { + fprintf(stderr, "%s: %s\n", errorCategoryNames[category], sanitized.c_str()); + } + fflush(stderr); + } +} diff --git a/poppler-24.05.0/poppler/Error.h b/poppler-24.05.0/poppler/Error.h new file mode 100644 index 0000000000000000000000000000000000000000..b292afcf7419c6988ccf8ec05fd92e6a68ce3cb7 --- /dev/null +++ b/poppler-24.05.0/poppler/Error.h @@ -0,0 +1,59 @@ +//======================================================================== +// +// Error.h +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005, 2007 Jeff Muizelaar +// Copyright (C) 2005, 2018 Albert Astals Cid +// Copyright (C) 2005 Kristian Høgsberg +// Copyright (C) 2013 Adrian Johnson +// Copyright (C) 2014 Fabio D'Urso +// Copyright (C) 2020 Adam Reichold +// +// 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 +// +//======================================================================== + +#ifndef ERROR_H +#define ERROR_H + +#include +#include "poppler-config.h" +#include "poppler_private_export.h" +#include "goo/gfile.h" +#include "goo/GooString.h" + +enum ErrorCategory +{ + errSyntaxWarning, // PDF syntax error which can be worked around; + // output will probably be correct + errSyntaxError, // PDF syntax error which can be worked around; + // output will probably be incorrect + errConfig, // error in Xpdf config info (xpdfrc file, etc.) + errCommandLine, // error in user-supplied parameters, action not + // allowed, etc. (only used by command-line tools) + errIO, // error in file I/O + errNotAllowed, // action not allowed by PDF permission bits + errUnimplemented, // unimplemented PDF feature - display will be + // incorrect + errInternal // internal error - malfunction within the Xpdf code +}; + +using ErrorCallback = void (*)(ErrorCategory category, Goffset pos, const char *msg); + +extern void POPPLER_PRIVATE_EXPORT setErrorCallback(ErrorCallback cbk); + +extern void CDECL POPPLER_PRIVATE_EXPORT error(ErrorCategory category, Goffset pos, const char *msg, ...) GOOSTRING_FORMAT; + +#endif diff --git a/poppler-24.05.0/poppler/ErrorCodes.h b/poppler-24.05.0/poppler/ErrorCodes.h new file mode 100644 index 0000000000000000000000000000000000000000..34fd86ab2dca81bec951c371d875315a1a41c1f5 --- /dev/null +++ b/poppler-24.05.0/poppler/ErrorCodes.h @@ -0,0 +1,54 @@ +//======================================================================== +// +// ErrorCodes.h +// +// Copyright 2002-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2017 Albert Astals Cid +// +// 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 +// +//======================================================================== + +#ifndef ERRORCODES_H +#define ERRORCODES_H + +#define errNone 0 // no error + +#define errOpenFile 1 // couldn't open the PDF file + +#define errBadCatalog 2 // couldn't read the page catalog + +#define errDamaged \ + 3 // PDF file was damaged and couldn't be + // repaired + +#define errEncrypted \ + 4 // file was encrypted and password was + // incorrect or not supplied + +#define errHighlightFile 5 // nonexistent or invalid highlight file + +#define errBadPrinter 6 // invalid printer + +#define errPrinting 7 // error during printing + +#define errPermission 8 // PDF file doesn't allow that operation + +#define errBadPageNum 9 // invalid page number + +#define errFileIO 10 // file I/O error + +#define errFileChangedSinceOpen 11 // file has changed since opening and save can't be done + +#endif diff --git a/poppler-24.05.0/poppler/FDPDFDocBuilder.cc b/poppler-24.05.0/poppler/FDPDFDocBuilder.cc new file mode 100644 index 0000000000000000000000000000000000000000..dcfbbaccc7ff1c0c992364925b2eb2d45664391d --- /dev/null +++ b/poppler-24.05.0/poppler/FDPDFDocBuilder.cc @@ -0,0 +1,61 @@ +//======================================================================== +// +// FileDescriptorPDFDocBuilder.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2010 Hib Eris +// Copyright 2010, 2017, 2021, 2022 Albert Astals Cid +// Copyright 2021 Oliver Sander +// Copyright 2021 Christian Persch +// +//======================================================================== + +#include + +#include + +#include "FDPDFDocBuilder.h" +#include "FILECacheLoader.h" +#include "CachedFile.h" + +//------------------------------------------------------------------------ +// FileDescriptorPDFDocBuilder +//------------------------------------------------------------------------ + +int FileDescriptorPDFDocBuilder::parseFdFromUri(const GooString &uri) +{ + int fd = -1; + char c; + if (sscanf(uri.c_str(), "fd://%d%c", &fd, &c) != 1) { + return -1; + } + + return fd; +} + +std::unique_ptr FileDescriptorPDFDocBuilder::buildPDFDoc(const GooString &uri, const std::optional &ownerPassword, const std::optional &userPassword, void *guiDataA) +{ + const auto fd = parseFdFromUri(uri); + if (fd == -1) { + return {}; + } + + FILE *file; + if (fd == fileno(stdin)) { + file = stdin; + } else { + file = fdopen(fd, "rb"); + } + if (!file) { + return {}; + } + + CachedFile *cachedFile = new CachedFile(new FILECacheLoader(file)); + return std::make_unique(new CachedFileStream(cachedFile, 0, false, cachedFile->getLength(), Object(objNull)), ownerPassword, userPassword); +} + +bool FileDescriptorPDFDocBuilder::supports(const GooString &uri) +{ + return parseFdFromUri(uri) != -1; +} diff --git a/poppler-24.05.0/poppler/FDPDFDocBuilder.h b/poppler-24.05.0/poppler/FDPDFDocBuilder.h new file mode 100644 index 0000000000000000000000000000000000000000..42c0ff6b2549222cc124fa0a2a2f704e42bffd3e --- /dev/null +++ b/poppler-24.05.0/poppler/FDPDFDocBuilder.h @@ -0,0 +1,36 @@ +//======================================================================== +// +// FileDescriptorPDFDocBuilder.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2010 Hib Eris +// Copyright 2010, 2018, 2022 Albert Astals Cid +// Copyright 2021 Oliver Sander +// Copyright 2021 Christian Persch +// +//======================================================================== + +#ifndef FDPDFDOCBUILDER_H +#define FDPDFDOCBUILDER_H + +#include "PDFDocBuilder.h" + +//------------------------------------------------------------------------ +// FileDescriptorPDFDocBuilder +// +// The FileDescriptorPDFDocBuilder implements a PDFDocBuilder that read from a file descriptor. +//------------------------------------------------------------------------ + +class FileDescriptorPDFDocBuilder : public PDFDocBuilder +{ + +public: + std::unique_ptr buildPDFDoc(const GooString &uri, const std::optional &ownerPassword = {}, const std::optional &userPassword = {}, void *guiDataA = nullptr) override; + bool supports(const GooString &uri) override; + +private: + int parseFdFromUri(const GooString &uri); +}; + +#endif /* FDPDFDOCBUILDER_H */ diff --git a/poppler-24.05.0/poppler/FILECacheLoader.cc b/poppler-24.05.0/poppler/FILECacheLoader.cc new file mode 100644 index 0000000000000000000000000000000000000000..4deb2ff6c6104a31551311fbbd2825f545909989 --- /dev/null +++ b/poppler-24.05.0/poppler/FILECacheLoader.cc @@ -0,0 +1,53 @@ +//======================================================================== +// +// FILECacheLoader.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2010 Hib Eris +// Copyright 2010, 2022 Albert Astals Cid +// Copyright 2010 Jonathan Liu +// Copyright 2021 Peter Williams +// Copyright 2021 Christian Persch +// +//======================================================================== + +#include + +#include "FILECacheLoader.h" + +#if defined(_WIN32) || defined(__CYGWIN__) +# include // for O_BINARY +# include // for _setmode +#endif + +FILECacheLoader::~FILECacheLoader() +{ + if (file != stdin) { + fclose(file); + } +} + +size_t FILECacheLoader::init(CachedFile *cachedFile) +{ + size_t read, size = 0; + char buf[CachedFileChunkSize]; + +#if defined(_WIN32) || defined(__CYGWIN__) + _setmode(fileno(file), O_BINARY); +#endif + + CachedFileWriter writer = CachedFileWriter(cachedFile, nullptr); + do { + read = fread(buf, 1, CachedFileChunkSize, file); + (writer.write)(buf, CachedFileChunkSize); + size += read; + } while (read == CachedFileChunkSize); + + return size; +} + +int FILECacheLoader::load(const std::vector &ranges, CachedFileWriter *writer) +{ + return 0; +} diff --git a/poppler-24.05.0/poppler/FILECacheLoader.h b/poppler-24.05.0/poppler/FILECacheLoader.h new file mode 100644 index 0000000000000000000000000000000000000000..6662ebcf8bd6e501d5e470905c9ac4ea1d17a0da --- /dev/null +++ b/poppler-24.05.0/poppler/FILECacheLoader.h @@ -0,0 +1,34 @@ +//======================================================================== +// +// FILECacheLoader.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2010 Hib Eris +// Copyright 2010, 2022 Albert Astals Cid +// Copyright 2021 Christian Persch +// +//======================================================================== + +#ifndef FILECACHELOADER_H +#define FILECACHELOADER_H + +#include "CachedFile.h" + +#include + +class POPPLER_PRIVATE_EXPORT FILECacheLoader : public CachedFileLoader +{ + FILE *file = stdin; + +public: + FILECacheLoader() = default; + ~FILECacheLoader() override; + + explicit FILECacheLoader(FILE *fileA) : file(fileA) { } + + size_t init(CachedFile *cachedFile) override; + int load(const std::vector &ranges, CachedFileWriter *writer) override; +}; + +#endif diff --git a/poppler-24.05.0/poppler/FileSpec.cc b/poppler-24.05.0/poppler/FileSpec.cc new file mode 100644 index 0000000000000000000000000000000000000000..849ad045ff9b70d7df98af9077dea165e38d9971 --- /dev/null +++ b/poppler-24.05.0/poppler/FileSpec.cc @@ -0,0 +1,320 @@ +//======================================================================== +// +// FileSpec.cc +// +// All changes made under the Poppler project to this file are licensed +// under GPL version 2 or later +// +// Copyright (C) 2008-2009 Carlos Garcia Campos +// Copyright (C) 2009 Kovid Goyal +// Copyright (C) 2012, 2017-2021 Albert Astals Cid +// Copyright (C) 2012 Hib Eris +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019 Christian Persch +// Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// 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 +// +//======================================================================== + +//======================================================================== +// +// Most of the code from Link.cc and PSOutputDev.cc +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +#include + +#include "FileSpec.h" +#include "XRef.h" +#include "goo/gfile.h" + +EmbFile::EmbFile(Object &&efStream) +{ + m_size = -1; + m_createDate = nullptr; + m_modDate = nullptr; + m_checksum = nullptr; + m_mimetype = nullptr; + + m_objStr = std::move(efStream); + + if (m_objStr.isStream()) { + // dataDict corresponds to Table 3.41 in the PDF1.6 spec. + Dict *dataDict = m_objStr.streamGetDict(); + + // subtype is normally the mimetype + Object subtypeName = dataDict->lookup("Subtype"); + if (subtypeName.isName()) { + m_mimetype = new GooString(subtypeName.getName()); + } + + // paramDict corresponds to Table 3.42 in the PDF1.6 spec + Object paramDict = dataDict->lookup("Params"); + if (paramDict.isDict()) { + Object paramObj = paramDict.dictLookup("ModDate"); + if (paramObj.isString()) { + m_modDate = new GooString(paramObj.getString()); + } + + paramObj = paramDict.dictLookup("CreationDate"); + if (paramObj.isString()) { + m_createDate = new GooString(paramObj.getString()); + } + + paramObj = paramDict.dictLookup("Size"); + if (paramObj.isInt()) { + m_size = paramObj.getInt(); + } + + paramObj = paramDict.dictLookup("CheckSum"); + if (paramObj.isString()) { + m_checksum = new GooString(paramObj.getString()); + } + } + } +} + +EmbFile::~EmbFile() +{ + delete m_createDate; + delete m_modDate; + delete m_checksum; + delete m_mimetype; +} + +bool EmbFile::save(const std::string &path) +{ + FILE *f; + bool ret; + + if (!(f = openFile(path.c_str(), "wb"))) { + return false; + } + ret = save2(f); + fclose(f); + return ret; +} + +bool EmbFile::save2(FILE *f) +{ + int c; + + if (unlikely(!m_objStr.isStream())) { + return false; + } + + m_objStr.streamReset(); + while ((c = m_objStr.streamGetChar()) != EOF) { + fputc(c, f); + } + return true; +} + +FileSpec::FileSpec(const Object *fileSpecA) +{ + ok = true; + fileName = nullptr; + platformFileName = nullptr; + embFile = nullptr; + desc = nullptr; + fileSpec = fileSpecA->copy(); + + Object obj1 = getFileSpecName(fileSpecA); + if (!obj1.isString()) { + ok = false; + error(errSyntaxError, -1, "Invalid FileSpec"); + return; + } + + fileName = obj1.getString()->copy(); + + if (fileSpec.isDict()) { + obj1 = fileSpec.dictLookup("EF"); + if (obj1.isDict()) { + fileStream = obj1.dictLookupNF("F").copy(); + if (!fileStream.isRef()) { + ok = false; + fileStream.setToNull(); + error(errSyntaxError, -1, "Invalid FileSpec: Embedded file stream is not an indirect reference"); + return; + } + } + + obj1 = fileSpec.dictLookup("Desc"); + if (obj1.isString()) { + desc = obj1.getString()->copy(); + } + } +} + +FileSpec::~FileSpec() +{ + delete fileName; + delete platformFileName; + delete embFile; + delete desc; +} + +EmbFile *FileSpec::getEmbeddedFile() +{ + if (!ok || !fileSpec.isDict()) { + return nullptr; + } + + if (embFile) { + return embFile; + } + + XRef *xref = fileSpec.getDict()->getXRef(); + embFile = new EmbFile(fileStream.fetch(xref)); + + return embFile; +} + +Object FileSpec::newFileSpecObject(XRef *xref, GooFile *file, const std::string &fileName) +{ + Object paramsDict = Object(new Dict(xref)); + paramsDict.dictSet("Size", Object(file->size())); + + // No Subtype in the embedded file stream dictionary for now + Object streamDict = Object(new Dict(xref)); + streamDict.dictSet("Length", Object(file->size())); + streamDict.dictSet("Params", std::move(paramsDict)); + + FileStream *fStream = new FileStream(file, 0, false, file->size(), std::move(streamDict)); + fStream->setNeedsEncryptionOnSave(true); + Stream *stream = fStream; + const Ref streamRef = xref->addIndirectObject(Object(stream)); + + Dict *efDict = new Dict(xref); + efDict->set("F", Object(streamRef)); + + Dict *fsDict = new Dict(xref); + fsDict->set("Type", Object(objName, "Filespec")); + fsDict->set("UF", Object(new GooString(fileName))); + fsDict->set("EF", Object(efDict)); + + return Object(fsDict); +} + +GooString *FileSpec::getFileNameForPlatform() +{ + if (platformFileName) { + return platformFileName; + } + + Object obj1 = getFileSpecNameForPlatform(&fileSpec); + if (obj1.isString()) { + platformFileName = obj1.getString()->copy(); + } + + return platformFileName; +} + +Object getFileSpecName(const Object *fileSpec) +{ + if (fileSpec->isString()) { + return fileSpec->copy(); + } + + if (fileSpec->isDict()) { + Object fileName = fileSpec->dictLookup("UF"); + if (fileName.isString()) { + return fileName; + } + fileName = fileSpec->dictLookup("F"); + if (fileName.isString()) { + return fileName; + } + fileName = fileSpec->dictLookup("DOS"); + if (fileName.isString()) { + return fileName; + } + fileName = fileSpec->dictLookup("Mac"); + if (fileName.isString()) { + return fileName; + } + fileName = fileSpec->dictLookup("Unix"); + if (fileName.isString()) { + return fileName; + } + } + return Object(); +} + +Object getFileSpecNameForPlatform(const Object *fileSpec) +{ + if (fileSpec->isString()) { + return fileSpec->copy(); + } + + Object fileName; + if (fileSpec->isDict()) { + fileName = fileSpec->dictLookup("UF"); + if (!fileName.isString()) { + fileName = fileSpec->dictLookup("F"); + if (!fileName.isString()) { +#ifdef _WIN32 + const char *platform = "DOS"; +#else + const char *platform = "Unix"; +#endif + fileName = fileSpec->dictLookup(platform); + if (!fileName.isString()) { + error(errSyntaxError, -1, "Illegal file spec"); + return Object(); + } + } + } + } else { + error(errSyntaxError, -1, "Illegal file spec"); + return Object(); + } + + // system-dependent path manipulation +#ifdef _WIN32 + int i, j; + GooString *name = fileName.getString()->copy(); + // "//...." --> "\...." + // "/x/...." --> "x:\...." + // "/server/share/...." --> "\\server\share\...." + // convert escaped slashes to slashes and unescaped slashes to backslashes + i = 0; + if (name->getChar(0) == '/') { + if (name->getLength() >= 2 && name->getChar(1) == '/') { + name->del(0); + i = 0; + } else if (name->getLength() >= 2 && ((name->getChar(1) >= 'a' && name->getChar(1) <= 'z') || (name->getChar(1) >= 'A' && name->getChar(1) <= 'Z')) && (name->getLength() == 2 || name->getChar(2) == '/')) { + name->setChar(0, name->getChar(1)); + name->setChar(1, ':'); + i = 2; + } else { + for (j = 2; j < name->getLength(); ++j) { + if (name->getChar(j - 1) != '\\' && name->getChar(j) == '/') { + break; + } + } + if (j < name->getLength()) { + name->setChar(0, '\\'); + name->insert(0, '\\'); + i = 2; + } + } + } + for (; i < name->getLength(); ++i) { + if (name->getChar(i) == '/') { + name->setChar(i, '\\'); + } else if (name->getChar(i) == '\\' && i + 1 < name->getLength() && name->getChar(i + 1) == '/') { + name->del(i); + } + } + fileName = Object(name); +#endif /* _WIN32 */ + + return fileName; +} diff --git a/poppler-24.05.0/poppler/FileSpec.h b/poppler-24.05.0/poppler/FileSpec.h new file mode 100644 index 0000000000000000000000000000000000000000..1650b89e792702bfa6eda152edbea10ebe46546f --- /dev/null +++ b/poppler-24.05.0/poppler/FileSpec.h @@ -0,0 +1,86 @@ +//======================================================================== +// +// FileSpec.h +// +// All changes made under the Poppler project to this file are licensed +// under GPL version 2 or later +// +// Copyright (C) 2008 Carlos Garcia Campos +// Copyright (C) 2017-2019, 2021 Albert Astals Cid +// Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// 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 +// +//======================================================================== + +#ifndef FILE_SPEC_H +#define FILE_SPEC_H + +#include "Object.h" +#include "poppler_private_export.h" + +class POPPLER_PRIVATE_EXPORT EmbFile +{ +public: + explicit EmbFile(Object &&efStream); + ~EmbFile(); + + EmbFile(const EmbFile &) = delete; + EmbFile &operator=(const EmbFile &) = delete; + + int size() const { return m_size; } + const GooString *modDate() const { return m_modDate; } + const GooString *createDate() const { return m_createDate; } + const GooString *checksum() const { return m_checksum; } + const GooString *mimeType() const { return m_mimetype; } + Object *streamObject() { return &m_objStr; } + Stream *stream() { return isOk() ? m_objStr.getStream() : nullptr; } + bool isOk() const { return m_objStr.isStream(); } + bool save(const std::string &path); + +private: + bool save2(FILE *f); + + int m_size; + GooString *m_createDate; + GooString *m_modDate; + GooString *m_checksum; + GooString *m_mimetype; + Object m_objStr; +}; + +class POPPLER_PRIVATE_EXPORT FileSpec +{ +public: + explicit FileSpec(const Object *fileSpec); + ~FileSpec(); + + FileSpec(const FileSpec &) = delete; + FileSpec &operator=(const FileSpec &) = delete; + + bool isOk() const { return ok; } + + const GooString *getFileName() const { return fileName; } + GooString *getFileNameForPlatform(); + const GooString *getDescription() const { return desc; } + EmbFile *getEmbeddedFile(); + + static Object newFileSpecObject(XRef *xref, GooFile *file, const std::string &fileName); + +private: + bool ok; + + Object fileSpec; + + GooString *fileName; // F, UF, DOS, Mac, Unix + GooString *platformFileName; + Object fileStream; // Ref to F entry in UF + EmbFile *embFile; + GooString *desc; // Desc +}; + +Object getFileSpecName(const Object *fileSpec); +Object POPPLER_PRIVATE_EXPORT getFileSpecNameForPlatform(const Object *fileSpec); + +#endif /* FILE_SPEC_H */ diff --git a/poppler-24.05.0/poppler/FlateEncoder.cc b/poppler-24.05.0/poppler/FlateEncoder.cc new file mode 100644 index 0000000000000000000000000000000000000000..0ae1d5287cd51481efd61661344bba3b27d5f669 --- /dev/null +++ b/poppler-24.05.0/poppler/FlateEncoder.cc @@ -0,0 +1,151 @@ +//======================================================================== +// +// FlateEncoder.cc +// +// Copyright (C) 2016, William Bader +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2021 Even Rouault +// Copyright (C) 2022 Albert Astals Cid +// +// This file is under the GPLv2 or later license +// +//======================================================================== + +#include + +#include "FlateEncoder.h" + +//------------------------------------------------------------------------ +// FlateEncoder +//------------------------------------------------------------------------ + +FlateEncoder::FlateEncoder(Stream *strA) : FilterStream(strA) +{ + int zlib_status; + + outBufPtr = outBufEnd = outBuf; + inBufEof = outBufEof = false; + + // We used to assign Z_NULL to the 3 following members of zlib_stream, + // but as Z_NULL is a #define to 0, using it triggers the + // -Wzero-as-null-pointer-constant warning. + // For safety, check that the Z_NULL definition is equivalent to + // 0 / null pointer. + static_assert(static_cast(Z_NULL) == 0); + zlib_stream.zalloc = nullptr; + zlib_stream.zfree = nullptr; + zlib_stream.opaque = nullptr; + + zlib_status = deflateInit(&zlib_stream, Z_DEFAULT_COMPRESSION); + + if (zlib_status != Z_OK) { + inBufEof = outBufEof = true; + error(errInternal, -1, "Internal: deflateInit() failed in FlateEncoder::FlateEncoder()"); + } + + zlib_stream.next_out = outBufEnd; + zlib_stream.avail_out = 1; /* anything but 0 to trigger a read */ +} + +FlateEncoder::~FlateEncoder() +{ + deflateEnd(&zlib_stream); + if (str->isEncoder()) { + delete str; + } +} + +void FlateEncoder::reset() +{ + int zlib_status; + + str->reset(); + + outBufPtr = outBufEnd = outBuf; + inBufEof = outBufEof = false; + + deflateEnd(&zlib_stream); + + zlib_status = deflateInit(&zlib_stream, Z_DEFAULT_COMPRESSION); + + if (zlib_status != Z_OK) { + inBufEof = outBufEof = true; + error(errInternal, -1, "Internal: deflateInit() failed in FlateEncoder::reset()"); + } + + zlib_stream.next_out = outBufEnd; + zlib_stream.avail_out = 1; /* anything but 0 to trigger a read */ +} + +bool FlateEncoder::fillBuf() +{ + unsigned int starting_avail_out; + int zlib_status; + + /* If the output is done, don't try to read more. */ + + if (outBufEof) { + return false; + } + + /* The output buffer should be empty. */ + /* If it is not empty, push any processed data to the start. */ + + if (outBufPtr > outBuf && outBufPtr < outBufEnd) { + const ptrdiff_t n = outBufEnd - outBufPtr; + memmove(outBuf, outBufPtr, n); + outBufEnd = &outBuf[n]; + } else { + outBufEnd = outBuf; + } + outBufPtr = outBuf; + + /* Keep feeding zlib until we get output. */ + /* zlib might consume a few input buffers */ + /* before it starts producing output. */ + + do { + + /* avail_out > 0 means that zlib has depleted its input */ + /* and needs a new chunk of input in order to generate */ + /* more output. */ + + if (zlib_stream.avail_out != 0) { + + /* Fill the input buffer */ + + const int n = (inBufEof ? 0 : str->doGetChars(inBufSize, inBuf)); + + if (n == 0) { + inBufEof = true; + } + + zlib_stream.next_in = inBuf; + zlib_stream.avail_in = n; + } + + /* Ask zlib for output. */ + + zlib_stream.next_out = outBufEnd; + starting_avail_out = static_cast(&outBuf[outBufSize] - outBufEnd); + zlib_stream.avail_out = starting_avail_out; + + zlib_status = deflate(&zlib_stream, (inBufEof ? Z_FINISH : Z_NO_FLUSH)); + + if (zlib_status == Z_STREAM_ERROR || zlib_stream.avail_out > starting_avail_out) { + /* Unrecoverable error */ + inBufEof = outBufEof = true; + error(errInternal, -1, "Internal: deflate() failed in FlateEncoder::fillBuf()"); + return false; + } + + } while (zlib_stream.avail_out == outBufSize && !inBufEof); + + outBufEnd = &outBuf[outBufSize] - zlib_stream.avail_out; + + if (inBufEof && zlib_stream.avail_out != 0) { + outBufEof = true; + } + + return outBufPtr < outBufEnd; +} diff --git a/poppler-24.05.0/poppler/FlateEncoder.h b/poppler-24.05.0/poppler/FlateEncoder.h new file mode 100644 index 0000000000000000000000000000000000000000..e42dc4e267ee46418ffe7b20f741e4483a120cd4 --- /dev/null +++ b/poppler-24.05.0/poppler/FlateEncoder.h @@ -0,0 +1,67 @@ +//======================================================================== +// +// FlateEncoder.h +// +// Copyright (C) 2016, William Bader +// Copyright (C) 2018, 2019, 2021 Albert Astals Cid +// +// This file is under the GPLv2 or later license +// +//======================================================================== + +#ifndef FLATEENCODE_H +#define FLATEENCODE_H + +#include "poppler-config.h" +#include +#include +#include +#ifdef HAVE_UNISTD_H +# include +#endif +#include +#include +#include "goo/gmem.h" +#include "goo/gfile.h" +#include "Error.h" +#include "Object.h" +#include "Decrypt.h" + +#include "Stream.h" + +extern "C" { +#include +} + +//------------------------------------------------------------------------ +// FlateEncoder +//------------------------------------------------------------------------ + +class FlateEncoder : public FilterStream +{ +public: + explicit FlateEncoder(Stream *strA); + ~FlateEncoder() override; + StreamKind getKind() const override { return strWeird; } + void reset() override; + int getChar() override { return (outBufPtr >= outBufEnd && !fillBuf()) ? EOF : (*outBufPtr++ & 0xff); } + int lookChar() override { return (outBufPtr >= outBufEnd && !fillBuf()) ? EOF : (*outBufPtr & 0xff); } + GooString *getPSFilter(int psLevel, const char *indent) override { return nullptr; } + bool isBinary(bool last = true) const override { return true; } + bool isEncoder() const override { return true; } + +private: + static const int inBufSize = 16384; + static const int outBufSize = inBufSize; + unsigned char inBuf[inBufSize]; + unsigned char outBuf[outBufSize]; + unsigned char *outBufPtr; + unsigned char *outBufEnd; + bool inBufEof; + bool outBufEof; + z_stream zlib_stream; + + bool fillBuf(); +}; + +#endif diff --git a/poppler-24.05.0/poppler/FlateStream.cc b/poppler-24.05.0/poppler/FlateStream.cc new file mode 100644 index 0000000000000000000000000000000000000000..a97b687bb6ef79cc5cb5367d0d127d18c2e4fff1 --- /dev/null +++ b/poppler-24.05.0/poppler/FlateStream.cc @@ -0,0 +1,152 @@ +//======================================================================== +// +// FlateStream.cc +// +// Copyright (C) 2005, Jeff Muizelaar +// Copyright (C) 2010, 2021, Albert Astals Cid +// Copyright (C) 2016, William Bader +// Copyright (C) 2017, Adrian Johnson +// +// This file is under the GPLv2 or later license +// +//======================================================================== + +#include + +#include "poppler-config.h" + +#ifdef ENABLE_ZLIB_UNCOMPRESS + +# include "FlateStream.h" + +FlateStream::FlateStream(Stream *strA, int predictor, int columns, int colors, int bits) : FilterStream(strA) +{ + if (predictor != 1) { + pred = new StreamPredictor(this, predictor, columns, colors, bits); + if (!pred->isOk()) { + delete pred; + pred = nullptr; + } + } else { + pred = NULL; + } + out_pos = 0; + memset(&d_stream, 0, sizeof(d_stream)); + inflateInit(&d_stream); +} + +FlateStream::~FlateStream() +{ + inflateEnd(&d_stream); + delete pred; + delete str; +} + +void FlateStream::reset() +{ + // FIXME: what are the semantics of reset? + // i.e. how much initialization has to happen in the constructor? + + /* reinitialize zlib */ + inflateEnd(&d_stream); + memset(&d_stream, 0, sizeof(d_stream)); + inflateInit(&d_stream); + + str->reset(); + d_stream.avail_in = 0; + status = Z_OK; + out_pos = 0; + out_buf_len = 0; +} + +int FlateStream::getRawChar() +{ + return doGetRawChar(); +} + +void FlateStream::getRawChars(int nChars, int *buffer) +{ + for (int i = 0; i < nChars; ++i) + buffer[i] = doGetRawChar(); +} + +int FlateStream::getChar() +{ + if (pred) + return pred->getChar(); + else + return getRawChar(); +} + +int FlateStream::lookChar() +{ + if (pred) + return pred->lookChar(); + + if (fill_buffer()) + return EOF; + + return out_buf[out_pos]; +} + +int FlateStream::fill_buffer() +{ + /* only fill the buffer if it has all been used */ + if (out_pos >= out_buf_len) { + /* check if the flatestream has been exhausted */ + if (status == Z_STREAM_END) { + return -1; + } + + /* set to the beginning of out_buf */ + d_stream.avail_out = sizeof(out_buf); + d_stream.next_out = out_buf; + out_pos = 0; + + while (1) { + /* buffer is empty so we need to fill it */ + if (d_stream.avail_in == 0) { + int c; + /* read from the source stream */ + while (d_stream.avail_in < sizeof(in_buf) && (c = str->getChar()) != EOF) { + in_buf[d_stream.avail_in++] = c; + } + d_stream.next_in = in_buf; + } + + /* keep decompressing until we can't anymore */ + if (d_stream.avail_out == 0 || d_stream.avail_in == 0 || (status != Z_OK && status != Z_BUF_ERROR)) + break; + status = inflate(&d_stream, Z_SYNC_FLUSH); + } + + out_buf_len = sizeof(out_buf) - d_stream.avail_out; + if (status != Z_OK && status != Z_STREAM_END) + return -1; + if (!out_buf_len) + return -1; + } + + return 0; +} + +GooString *FlateStream::getPSFilter(int psLevel, const char *indent) +{ + GooString *s; + + if (psLevel < 3 || pred) { + return NULL; + } + if (!(s = str->getPSFilter(psLevel, indent))) { + return NULL; + } + s->append(indent)->append("<< >> /FlateDecode filter\n"); + return s; +} + +bool FlateStream::isBinary(bool last) const +{ + return str->isBinary(true); +} + +#endif diff --git a/poppler-24.05.0/poppler/FlateStream.h b/poppler-24.05.0/poppler/FlateStream.h new file mode 100644 index 0000000000000000000000000000000000000000..88f69bea81140529dcb385ab8b3a96873ddbc6c3 --- /dev/null +++ b/poppler-24.05.0/poppler/FlateStream.h @@ -0,0 +1,69 @@ +//======================================================================== +// +// FlateStream.h +// +// Copyright (C) 2005, Jeff Muizelaar +// Copyright (C) 2010, 2011, 2019, 2021, Albert Astals Cid +// +// This file is under the GPLv2 or later license +// +//======================================================================== + +#ifndef FLATESTREAM_H +#define FLATESTREAM_H + +#include "poppler-config.h" +#include +#include +#include +#ifdef HAVE_UNISTD_H +# include +#endif +#include +#include +#include "goo/gmem.h" +#include "goo/gfile.h" +#include "Error.h" +#include "Object.h" +#include "Decrypt.h" +#include "Stream.h" + +extern "C" { +#include +} + +class FlateStream : public FilterStream +{ +public: + FlateStream(Stream *strA, int predictor, int columns, int colors, int bits); + virtual ~FlateStream(); + StreamKind getKind() const override { return strFlate; } + void reset() override; + int getChar() override; + int lookChar() override; + int getRawChar() override; + void getRawChars(int nChars, int *buffer) override; + GooString *getPSFilter(int psLevel, const char *indent) override; + bool isBinary(bool last = true) const override; + +private: + inline int doGetRawChar() + { + if (fill_buffer()) + return EOF; + + return out_buf[out_pos++]; + } + + int fill_buffer(void); + z_stream d_stream; + StreamPredictor *pred; + int status; + /* in_buf currently needs to be 1 or we over read from EmbedStreams */ + unsigned char in_buf[1]; + unsigned char out_buf[4096]; + int out_pos; + int out_buf_len; +}; + +#endif diff --git a/poppler-24.05.0/poppler/FontEncodingTables.cc b/poppler-24.05.0/poppler/FontEncodingTables.cc new file mode 100644 index 0000000000000000000000000000000000000000..7bc6e8c4623cacf27f042daed56aab069b5b9916 --- /dev/null +++ b/poppler-24.05.0/poppler/FontEncodingTables.cc @@ -0,0 +1,1566 @@ +//======================================================================== +// +// FontEncodingTables.cc +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +#include +#include +#include "FontEncodingTables.h" + +const char *macRomanEncoding[256] = { nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "space", + "exclam", + "quotedbl", + "numbersign", + "dollar", + "percent", + "ampersand", + "quotesingle", + "parenleft", + "parenright", + "asterisk", + "plus", + "comma", + "hyphen", + "period", + "slash", + "zero", + "one", + "two", + "three", + "four", + "five", + "six", + "seven", + "eight", + "nine", + "colon", + "semicolon", + "less", + "equal", + "greater", + "question", + "at", + "A", + "B", + "C", + "D", + "E", + "F", + "G", + "H", + "I", + "J", + "K", + "L", + "M", + "N", + "O", + "P", + "Q", + "R", + "S", + "T", + "U", + "V", + "W", + "X", + "Y", + "Z", + "bracketleft", + "backslash", + "bracketright", + "asciicircum", + "underscore", + "grave", + "a", + "b", + "c", + "d", + "e", + "f", + "g", + "h", + "i", + "j", + "k", + "l", + "m", + "n", + "o", + "p", + "q", + "r", + "s", + "t", + "u", + "v", + "w", + "x", + "y", + "z", + "braceleft", + "bar", + "braceright", + "asciitilde", + nullptr, + "Adieresis", + "Aring", + "Ccedilla", + "Eacute", + "Ntilde", + "Odieresis", + "Udieresis", + "aacute", + "agrave", + "acircumflex", + "adieresis", + "atilde", + "aring", + "ccedilla", + "eacute", + "egrave", + "ecircumflex", + "edieresis", + "iacute", + "igrave", + "icircumflex", + "idieresis", + "ntilde", + "oacute", + "ograve", + "ocircumflex", + "odieresis", + "otilde", + "uacute", + "ugrave", + "ucircumflex", + "udieresis", + "dagger", + "degree", + "cent", + "sterling", + "section", + "bullet", + "paragraph", + "germandbls", + "registered", + "copyright", + "trademark", + "acute", + "dieresis", + "notequal", + "AE", + "Oslash", + "infinity", + "plusminus", + "lessequal", + "greaterequal", + "yen", + "mu", + "partialdiff", + "summation", + "product", + "pi", + "integral", + "ordfeminine", + "ordmasculine", + "Omega", + "ae", + "oslash", + "questiondown", + "exclamdown", + "logicalnot", + "radical", + "florin", + "approxequal", + "Delta", + "guillemotleft", + "guillemotright", + "ellipsis", + "space", + "Agrave", + "Atilde", + "Otilde", + "OE", + "oe", + "endash", + "emdash", + "quotedblleft", + "quotedblright", + "quoteleft", + "quoteright", + "divide", + "lozenge", + "ydieresis", + "Ydieresis", + "fraction", + "currency", + "guilsinglleft", + "guilsinglright", + "fi", + "fl", + "daggerdbl", + "periodcentered", + "quotesinglbase", + "quotedblbase", + "perthousand", + "Acircumflex", + "Ecircumflex", + "Aacute", + "Edieresis", + "Egrave", + "Iacute", + "Icircumflex", + "Idieresis", + "Igrave", + "Oacute", + "Ocircumflex", + "apple", + "Ograve", + "Uacute", + "Ucircumflex", + "Ugrave", + "dotlessi", + "circumflex", + "tilde", + "macron", + "breve", + "dotaccent", + "ring", + "cedilla", + "hungarumlaut", + "ogonek", + "caron" }; + +const char *macExpertEncoding[256] = { nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "space", + "exclamsmall", + "Hungarumlautsmall", + "centoldstyle", + "dollaroldstyle", + "dollarsuperior", + "ampersandsmall", + "Acutesmall", + "parenleftsuperior", + "parenrightsuperior", + "twodotenleader", + "onedotenleader", + "comma", + "hyphen", + "period", + "fraction", + "zerooldstyle", + "oneoldstyle", + "twooldstyle", + "threeoldstyle", + "fouroldstyle", + "fiveoldstyle", + "sixoldstyle", + "sevenoldstyle", + "eightoldstyle", + "nineoldstyle", + "colon", + "semicolon", + nullptr, + "threequartersemdash", + nullptr, + "questionsmall", + nullptr, + nullptr, + nullptr, + nullptr, + "Ethsmall", + nullptr, + nullptr, + "onequarter", + "onehalf", + "threequarters", + "oneeighth", + "threeeighths", + "fiveeighths", + "seveneighths", + "onethird", + "twothirds", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "ff", + "fi", + "fl", + "ffi", + "ffl", + "parenleftinferior", + nullptr, + "parenrightinferior", + "Circumflexsmall", + "hypheninferior", + "Gravesmall", + "Asmall", + "Bsmall", + "Csmall", + "Dsmall", + "Esmall", + "Fsmall", + "Gsmall", + "Hsmall", + "Ismall", + "Jsmall", + "Ksmall", + "Lsmall", + "Msmall", + "Nsmall", + "Osmall", + "Psmall", + "Qsmall", + "Rsmall", + "Ssmall", + "Tsmall", + "Usmall", + "Vsmall", + "Wsmall", + "Xsmall", + "Ysmall", + "Zsmall", + "colonmonetary", + "onefitted", + "rupiah", + "Tildesmall", + nullptr, + nullptr, + "asuperior", + "centsuperior", + nullptr, + nullptr, + nullptr, + nullptr, + "Aacutesmall", + "Agravesmall", + "Acircumflexsmall", + "Adieresissmall", + "Atildesmall", + "Aringsmall", + "Ccedillasmall", + "Eacutesmall", + "Egravesmall", + "Ecircumflexsmall", + "Edieresissmall", + "Iacutesmall", + "Igravesmall", + "Icircumflexsmall", + "Idieresissmall", + "Ntildesmall", + "Oacutesmall", + "Ogravesmall", + "Ocircumflexsmall", + "Odieresissmall", + "Otildesmall", + "Uacutesmall", + "Ugravesmall", + "Ucircumflexsmall", + "Udieresissmall", + nullptr, + "eightsuperior", + "fourinferior", + "threeinferior", + "sixinferior", + "eightinferior", + "seveninferior", + "Scaronsmall", + nullptr, + "centinferior", + "twoinferior", + nullptr, + "Dieresissmall", + nullptr, + "Caronsmall", + "osuperior", + "fiveinferior", + nullptr, + "commainferior", + "periodinferior", + "Yacutesmall", + nullptr, + "dollarinferior", + nullptr, + nullptr, + "Thornsmall", + nullptr, + "nineinferior", + "zeroinferior", + "Zcaronsmall", + "AEsmall", + "Oslashsmall", + "questiondownsmall", + "oneinferior", + "Lslashsmall", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "Cedillasmall", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "OEsmall", + "figuredash", + "hyphensuperior", + nullptr, + nullptr, + nullptr, + nullptr, + "exclamdownsmall", + nullptr, + "Ydieresissmall", + nullptr, + "onesuperior", + "twosuperior", + "threesuperior", + "foursuperior", + "fivesuperior", + "sixsuperior", + "sevensuperior", + "ninesuperior", + "zerosuperior", + nullptr, + "esuperior", + "rsuperior", + "tsuperior", + nullptr, + nullptr, + "isuperior", + "ssuperior", + "dsuperior", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "lsuperior", + "Ogoneksmall", + "Brevesmall", + "Macronsmall", + "bsuperior", + "nsuperior", + "msuperior", + "commasuperior", + "periodsuperior", + "Dotaccentsmall", + "Ringsmall", + nullptr, + nullptr, + nullptr, + nullptr }; + +const char *winAnsiEncoding[256] = { nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "space", + "exclam", + "quotedbl", + "numbersign", + "dollar", + "percent", + "ampersand", + "quotesingle", + "parenleft", + "parenright", + "asterisk", + "plus", + "comma", + "hyphen", + "period", + "slash", + "zero", + "one", + "two", + "three", + "four", + "five", + "six", + "seven", + "eight", + "nine", + "colon", + "semicolon", + "less", + "equal", + "greater", + "question", + "at", + "A", + "B", + "C", + "D", + "E", + "F", + "G", + "H", + "I", + "J", + "K", + "L", + "M", + "N", + "O", + "P", + "Q", + "R", + "S", + "T", + "U", + "V", + "W", + "X", + "Y", + "Z", + "bracketleft", + "backslash", + "bracketright", + "asciicircum", + "underscore", + "grave", + "a", + "b", + "c", + "d", + "e", + "f", + "g", + "h", + "i", + "j", + "k", + "l", + "m", + "n", + "o", + "p", + "q", + "r", + "s", + "t", + "u", + "v", + "w", + "x", + "y", + "z", + "braceleft", + "bar", + "braceright", + "asciitilde", + "bullet", + "Euro", + "bullet", + "quotesinglbase", + "florin", + "quotedblbase", + "ellipsis", + "dagger", + "daggerdbl", + "circumflex", + "perthousand", + "Scaron", + "guilsinglleft", + "OE", + "bullet", + "Zcaron", + "bullet", + "bullet", + "quoteleft", + "quoteright", + "quotedblleft", + "quotedblright", + "bullet", + "endash", + "emdash", + "tilde", + "trademark", + "scaron", + "guilsinglright", + "oe", + "bullet", + "zcaron", + "Ydieresis", + "space", + "exclamdown", + "cent", + "sterling", + "currency", + "yen", + "brokenbar", + "section", + "dieresis", + "copyright", + "ordfeminine", + "guillemotleft", + "logicalnot", + "hyphen", + "registered", + "macron", + "degree", + "plusminus", + "twosuperior", + "threesuperior", + "acute", + "mu", + "paragraph", + "periodcentered", + "cedilla", + "onesuperior", + "ordmasculine", + "guillemotright", + "onequarter", + "onehalf", + "threequarters", + "questiondown", + "Agrave", + "Aacute", + "Acircumflex", + "Atilde", + "Adieresis", + "Aring", + "AE", + "Ccedilla", + "Egrave", + "Eacute", + "Ecircumflex", + "Edieresis", + "Igrave", + "Iacute", + "Icircumflex", + "Idieresis", + "Eth", + "Ntilde", + "Ograve", + "Oacute", + "Ocircumflex", + "Otilde", + "Odieresis", + "multiply", + "Oslash", + "Ugrave", + "Uacute", + "Ucircumflex", + "Udieresis", + "Yacute", + "Thorn", + "germandbls", + "agrave", + "aacute", + "acircumflex", + "atilde", + "adieresis", + "aring", + "ae", + "ccedilla", + "egrave", + "eacute", + "ecircumflex", + "edieresis", + "igrave", + "iacute", + "icircumflex", + "idieresis", + "eth", + "ntilde", + "ograve", + "oacute", + "ocircumflex", + "otilde", + "odieresis", + "divide", + "oslash", + "ugrave", + "uacute", + "ucircumflex", + "udieresis", + "yacute", + "thorn", + "ydieresis" }; + +const char *standardEncoding[256] = { nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "space", + "exclam", + "quotedbl", + "numbersign", + "dollar", + "percent", + "ampersand", + "quoteright", + "parenleft", + "parenright", + "asterisk", + "plus", + "comma", + "hyphen", + "period", + "slash", + "zero", + "one", + "two", + "three", + "four", + "five", + "six", + "seven", + "eight", + "nine", + "colon", + "semicolon", + "less", + "equal", + "greater", + "question", + "at", + "A", + "B", + "C", + "D", + "E", + "F", + "G", + "H", + "I", + "J", + "K", + "L", + "M", + "N", + "O", + "P", + "Q", + "R", + "S", + "T", + "U", + "V", + "W", + "X", + "Y", + "Z", + "bracketleft", + "backslash", + "bracketright", + "asciicircum", + "underscore", + "quoteleft", + "a", + "b", + "c", + "d", + "e", + "f", + "g", + "h", + "i", + "j", + "k", + "l", + "m", + "n", + "o", + "p", + "q", + "r", + "s", + "t", + "u", + "v", + "w", + "x", + "y", + "z", + "braceleft", + "bar", + "braceright", + "asciitilde", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "exclamdown", + "cent", + "sterling", + "fraction", + "yen", + "florin", + "section", + "currency", + "quotesingle", + "quotedblleft", + "guillemotleft", + "guilsinglleft", + "guilsinglright", + "fi", + "fl", + nullptr, + "endash", + "dagger", + "daggerdbl", + "periodcentered", + nullptr, + "paragraph", + "bullet", + "quotesinglbase", + "quotedblbase", + "quotedblright", + "guillemotright", + "ellipsis", + "perthousand", + nullptr, + "questiondown", + nullptr, + "grave", + "acute", + "circumflex", + "tilde", + "macron", + "breve", + "dotaccent", + "dieresis", + nullptr, + "ring", + "cedilla", + nullptr, + "hungarumlaut", + "ogonek", + "caron", + "emdash", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "AE", + nullptr, + "ordfeminine", + nullptr, + nullptr, + nullptr, + nullptr, + "Lslash", + "Oslash", + "OE", + "ordmasculine", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "ae", + nullptr, + nullptr, + nullptr, + "dotlessi", + nullptr, + nullptr, + "lslash", + "oslash", + "oe", + "germandbls", + nullptr, + nullptr, + nullptr, + nullptr }; + +const char *expertEncoding[256] = { nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "space", + "exclamsmall", + "Hungarumlautsmall", + nullptr, + "dollaroldstyle", + "dollarsuperior", + "ampersandsmall", + "Acutesmall", + "parenleftsuperior", + "parenrightsuperior", + "twodotenleader", + "onedotenleader", + "comma", + "hyphen", + "period", + "fraction", + "zerooldstyle", + "oneoldstyle", + "twooldstyle", + "threeoldstyle", + "fouroldstyle", + "fiveoldstyle", + "sixoldstyle", + "sevenoldstyle", + "eightoldstyle", + "nineoldstyle", + "colon", + "semicolon", + "commasuperior", + "threequartersemdash", + "periodsuperior", + "questionsmall", + nullptr, + "asuperior", + "bsuperior", + "centsuperior", + "dsuperior", + "esuperior", + nullptr, + nullptr, + nullptr, + "isuperior", + nullptr, + nullptr, + "lsuperior", + "msuperior", + "nsuperior", + "osuperior", + nullptr, + nullptr, + "rsuperior", + "ssuperior", + "tsuperior", + nullptr, + "ff", + "fi", + "fl", + "ffi", + "ffl", + "parenleftinferior", + nullptr, + "parenrightinferior", + "Circumflexsmall", + "hyphensuperior", + "Gravesmall", + "Asmall", + "Bsmall", + "Csmall", + "Dsmall", + "Esmall", + "Fsmall", + "Gsmall", + "Hsmall", + "Ismall", + "Jsmall", + "Ksmall", + "Lsmall", + "Msmall", + "Nsmall", + "Osmall", + "Psmall", + "Qsmall", + "Rsmall", + "Ssmall", + "Tsmall", + "Usmall", + "Vsmall", + "Wsmall", + "Xsmall", + "Ysmall", + "Zsmall", + "colonmonetary", + "onefitted", + "rupiah", + "Tildesmall", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "exclamdownsmall", + "centoldstyle", + "Lslashsmall", + nullptr, + nullptr, + "Scaronsmall", + "Zcaronsmall", + "Dieresissmall", + "Brevesmall", + "Caronsmall", + nullptr, + "Dotaccentsmall", + nullptr, + nullptr, + "Macronsmall", + nullptr, + nullptr, + "figuredash", + "hypheninferior", + nullptr, + nullptr, + "Ogoneksmall", + "Ringsmall", + "Cedillasmall", + nullptr, + nullptr, + nullptr, + "onequarter", + "onehalf", + "threequarters", + "questiondownsmall", + "oneeighth", + "threeeighths", + "fiveeighths", + "seveneighths", + "onethird", + "twothirds", + nullptr, + nullptr, + "zerosuperior", + "onesuperior", + "twosuperior", + "threesuperior", + "foursuperior", + "fivesuperior", + "sixsuperior", + "sevensuperior", + "eightsuperior", + "ninesuperior", + "zeroinferior", + "oneinferior", + "twoinferior", + "threeinferior", + "fourinferior", + "fiveinferior", + "sixinferior", + "seveninferior", + "eightinferior", + "nineinferior", + "centinferior", + "dollarinferior", + "periodinferior", + "commainferior", + "Agravesmall", + "Aacutesmall", + "Acircumflexsmall", + "Atildesmall", + "Adieresissmall", + "Aringsmall", + "AEsmall", + "Ccedillasmall", + "Egravesmall", + "Eacutesmall", + "Ecircumflexsmall", + "Edieresissmall", + "Igravesmall", + "Iacutesmall", + "Icircumflexsmall", + "Idieresissmall", + "Ethsmall", + "Ntildesmall", + "Ogravesmall", + "Oacutesmall", + "Ocircumflexsmall", + "Otildesmall", + "Odieresissmall", + "OEsmall", + "Oslashsmall", + "Ugravesmall", + "Uacutesmall", + "Ucircumflexsmall", + "Udieresissmall", + "Yacutesmall", + "Thornsmall", + "Ydieresissmall" }; + +const char *symbolEncoding[256] = { nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "space", + "exclam", + "universal", + "numbersign", + "existential", + "percent", + "ampersand", + "suchthat", + "parenleft", + "parenright", + "asteriskmath", + "plus", + "comma", + "minus", + "period", + "slash", + "zero", + "one", + "two", + "three", + "four", + "five", + "six", + "seven", + "eight", + "nine", + "colon", + "semicolon", + "less", + "equal", + "greater", + "question", + "congruent", + "Alpha", + "Beta", + "Chi", + "Delta", + "Epsilon", + "Phi", + "Gamma", + "Eta", + "Iota", + "theta1", + "Kappa", + "Lambda", + "Mu", + "Nu", + "Omicron", + "Pi", + "Theta", + "Rho", + "Sigma", + "Tau", + "Upsilon", + "sigma1", + "Omega", + "Xi", + "Psi", + "Zeta", + "bracketleft", + "therefore", + "bracketright", + "perpendicular", + "underscore", + "radicalex", + "alpha", + "beta", + "chi", + "delta", + "epsilon", + "phi", + "gamma", + "eta", + "iota", + "phi1", + "kappa", + "lambda", + "mu", + "nu", + "omicron", + "pi", + "theta", + "rho", + "sigma", + "tau", + "upsilon", + "omega1", + "omega", + "xi", + "psi", + "zeta", + "braceleft", + "bar", + "braceright", + "similar", + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + nullptr, + "Upsilon1", + "minute", + "lessequal", + "fraction", + "infinity", + "florin", + "club", + "diamond", + "heart", + "spade", + "arrowboth", + "arrowleft", + "arrowup", + "arrowright", + "arrowdown", + "degree", + "plusminus", + "second", + "greaterequal", + "multiply", + "proportional", + "partialdiff", + "bullet", + "divide", + "notequal", + "equivalence", + "approxequal", + "ellipsis", + "arrowvertex", + "arrowhorizex", + "carriagereturn", + "aleph", + "Ifraktur", + "Rfraktur", + "weierstrass", + "circlemultiply", + "circleplus", + "emptyset", + "intersection", + "union", + "propersuperset", + "reflexsuperset", + "notsubset", + "propersubset", + "reflexsubset", + "element", + "notelement", + "angle", + "gradient", + "registerserif", + "copyrightserif", + "trademarkserif", + "product", + "radical", + "dotmath", + "logicalnot", + "logicaland", + "logicalor", + "arrowdblboth", + "arrowdblleft", + "arrowdblup", + "arrowdblright", + "arrowdbldown", + "lozenge", + "angleleft", + "registersans", + "copyrightsans", + "trademarksans", + "summation", + "parenlefttp", + "parenleftex", + "parenleftbt", + "bracketlefttp", + "bracketleftex", + "bracketleftbt", + "bracelefttp", + "braceleftmid", + "braceleftbt", + "braceex", + nullptr, + "angleright", + "integral", + "integraltp", + "integralex", + "integralbt", + "parenrighttp", + "parenrightex", + "parenrightbt", + "bracketrighttp", + "bracketrightex", + "bracketrightbt", + "bracerighttp", + "bracerightmid", + "bracerightbt", + nullptr }; + +const char *zapfDingbatsEncoding[256] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, "space", "a1", "a2", "a202", "a3", "a4", "a5", "a119", "a118", "a117", "a11", "a12", + "a13", "a14", "a15", "a16", "a105", "a17", "a18", "a19", "a20", "a21", "a22", "a23", "a24", "a25", "a26", "a27", "a28", "a6", "a7", "a8", "a9", "a10", + "a29", "a30", "a31", "a32", "a33", "a34", "a35", "a36", "a37", "a38", "a39", "a40", "a41", "a42", "a43", "a44", "a45", "a46", "a47", "a48", "a49", "a50", + "a51", "a52", "a53", "a54", "a55", "a56", "a57", "a58", "a59", "a60", "a61", "a62", "a63", "a64", "a65", "a66", "a67", "a68", "a69", "a70", "a71", "a72", + "a73", "a74", "a203", "a75", "a204", "a76", "a77", "a78", "a79", "a81", "a82", "a83", "a84", "a97", "a98", "a99", "a100", nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, "a101", "a102", "a103", "a104", "a106", "a107", "a108", "a112", "a111", "a110", "a109", "a120", "a121", "a122", "a123", + "a124", "a125", "a126", "a127", "a128", "a129", "a130", "a131", "a132", "a133", "a134", "a135", "a136", "a137", "a138", "a139", "a140", "a141", "a142", "a143", "a144", "a145", + "a146", "a147", "a148", "a149", "a150", "a151", "a152", "a153", "a154", "a155", "a156", "a157", "a158", "a159", "a160", "a161", "a163", "a164", "a196", "a165", "a192", "a166", + "a167", "a168", "a169", "a170", "a171", "a172", "a173", "a162", "a174", "a175", "a176", "a177", "a178", "a179", "a193", "a180", "a199", "a181", "a200", "a182", nullptr, "a201", + "a183", "a184", "a197", "a185", "a194", "a198", "a186", "a195", "a187", "a188", "a189", "a190", "a191", nullptr }; diff --git a/poppler-24.05.0/poppler/FontEncodingTables.h b/poppler-24.05.0/poppler/FontEncodingTables.h new file mode 100644 index 0000000000000000000000000000000000000000..a417b324e48087cbb6264cbe366a2c6bb1817c69 --- /dev/null +++ b/poppler-24.05.0/poppler/FontEncodingTables.h @@ -0,0 +1,20 @@ +//======================================================================== +// +// FontEncodingTables.h +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +#ifndef FONTENCODINGTABLES_H +#define FONTENCODINGTABLES_H + +extern const char *macRomanEncoding[]; +extern const char *macExpertEncoding[]; +extern const char *winAnsiEncoding[]; +extern const char *standardEncoding[]; +extern const char *expertEncoding[]; +extern const char *symbolEncoding[]; +extern const char *zapfDingbatsEncoding[]; + +#endif diff --git a/poppler-24.05.0/poppler/FontInfo.cc b/poppler-24.05.0/poppler/FontInfo.cc new file mode 100644 index 0000000000000000000000000000000000000000..2f1ff7fc4efc2c9a8f5417eb35d88dae7896fea9 --- /dev/null +++ b/poppler-24.05.0/poppler/FontInfo.cc @@ -0,0 +1,206 @@ +//======================================================================== +// +// FontInfo.cc +// +// Copyright (C) 2005, 2006 Kristian Høgsberg +// Copyright (C) 2005-2008, 2010, 2017-2020, 2023 Albert Astals Cid +// Copyright (C) 2005 Brad Hards +// Copyright (C) 2006 Kouhei Sutou +// Copyright (C) 2009 Pino Toscano +// Copyright (C) 2010 Hib Eris +// Copyright (C) 2010, 2012 Adrian Johnson +// Copyright (C) 2010, 2013 Thomas Freitag +// Copyright (C) 2011 Carlos Garcia Campos +// Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018, 2019 Adam Reichold +// Copyright (C) 2019, 2021, 2022 Oliver Sander +// Copyright (C) 2023 Suzuki Toshiya +// +// 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 +// +//======================================================================== + +//======================================================================== +// +// Based on code from pdffonts.cc +// +// Copyright 2001-2007 Glyph & Cog, LLC +// +//======================================================================== + +#include "config.h" +#include +#include +#include +#include +#include +#include "GlobalParams.h" +#include "Error.h" +#include "Object.h" +#include "Dict.h" +#include "GfxFont.h" +#include "Annot.h" +#include "PDFDoc.h" +#include "FontInfo.h" + +FontInfoScanner::FontInfoScanner(PDFDoc *docA, int firstPage) +{ + doc = docA; + currentPage = firstPage + 1; +} + +FontInfoScanner::~FontInfoScanner() { } + +std::vector FontInfoScanner::scan(int nPages) +{ + Page *page; + Dict *resDict; + Annots *annots; + int lastPage; + + std::vector result; + + if (currentPage > doc->getNumPages()) { + return result; + } + + lastPage = currentPage + nPages; + if (lastPage > doc->getNumPages() + 1) { + lastPage = doc->getNumPages() + 1; + } + + std::unique_ptr xrefA(doc->getXRef()->copy()); + for (int pg = currentPage; pg < lastPage; ++pg) { + page = doc->getPage(pg); + if (!page) { + continue; + } + + if ((resDict = page->getResourceDictCopy(xrefA.get()))) { + scanFonts(xrefA.get(), resDict, &result); + delete resDict; + } + annots = page->getAnnots(); + for (Annot *annot : annots->getAnnots()) { + Object obj1 = annot->getAppearanceResDict(); + if (obj1.isDict()) { + scanFonts(xrefA.get(), obj1.getDict(), &result); + } + } + } + + currentPage = lastPage; + + return result; +} + +void FontInfoScanner::scanFonts(XRef *xrefA, Dict *resDict, std::vector *fontsList) +{ + GfxFontDict *gfxFontDict; + + // scan the fonts in this resource dictionary + gfxFontDict = nullptr; + const Object &fontObj = resDict->lookupNF("Font"); + if (fontObj.isRef()) { + Object obj2 = fontObj.fetch(xrefA); + if (obj2.isDict()) { + Ref r = fontObj.getRef(); + gfxFontDict = new GfxFontDict(xrefA, &r, obj2.getDict()); + } + } else if (fontObj.isDict()) { + gfxFontDict = new GfxFontDict(xrefA, nullptr, fontObj.getDict()); + } + if (gfxFontDict) { + for (int i = 0; i < gfxFontDict->getNumFonts(); ++i) { + if (const std::shared_ptr &font = gfxFontDict->getFont(i)) { + Ref fontRef = *font->getID(); + + // add this font to the list if not already found + if (fonts.insert(fontRef.num).second) { + fontsList->push_back(new FontInfo(font.get(), xrefA)); + } + } + } + delete gfxFontDict; + } + + // recursively scan any resource dictionaries in objects in this + // resource dictionary + const char *resTypes[] = { "XObject", "Pattern" }; + for (const char *resType : resTypes) { + Ref objDictRef; + Object objDict = resDict->lookup(resType, &objDictRef); + if (!visitedObjects.insert(objDictRef)) { + continue; + } + if (objDict.isDict()) { + for (int i = 0; i < objDict.dictGetLength(); ++i) { + Ref obj2Ref; + const Object obj2 = objDict.getDict()->getVal(i, &obj2Ref); + // check for an already-seen object + if (!visitedObjects.insert(obj2Ref)) { + continue; + } + + if (obj2.isStream()) { + Ref resourcesRef; + const Object resObj = obj2.streamGetDict()->lookup("Resources", &resourcesRef); + if (!visitedObjects.insert(resourcesRef)) { + continue; + } + + if (resObj.isDict() && resObj.getDict() != resDict) { + scanFonts(xrefA, resObj.getDict(), fontsList); + } + } + } + } + } +} + +FontInfo::FontInfo(GfxFont *font, XRef *xref) +{ + fontRef = *font->getID(); + + // font name + const std::optional &origName = font->getName(); + if (origName) { + name = *font->getName(); + } + + // font type + type = (FontInfo::Type)font->getType(); + + // check for an embedded font + if (font->getType() == fontType3) { + emb = true; + embRef = Ref::INVALID(); + } else { + emb = font->getEmbeddedFontID(&embRef); + } + + if (!emb) { + GooString substituteNameAux; + const std::optional fontLoc = font->locateFont(xref, nullptr, &substituteNameAux); + if (fontLoc && fontLoc->locType == gfxFontLocExternal) { + file = fontLoc->path; + } + if (substituteNameAux.getLength() > 0) { + substituteName = substituteNameAux.toStr(); + } + } + encoding = font->getEncodingName(); + + // look for a ToUnicode map + hasToUnicode = false; + Object fontObj = xref->fetch(fontRef); + if (fontObj.isDict()) { + hasToUnicode = fontObj.dictLookup("ToUnicode").isStream(); + } + + // check for a font subset name: capital letters followed by a '+' + // sign + subset = font->isSubset(); +} diff --git a/poppler-24.05.0/poppler/FontInfo.h b/poppler-24.05.0/poppler/FontInfo.h new file mode 100644 index 0000000000000000000000000000000000000000..ba37a742a0664dbc47cf1c2b758931a2dc64c4a1 --- /dev/null +++ b/poppler-24.05.0/poppler/FontInfo.h @@ -0,0 +1,109 @@ +//======================================================================== +// +// FontInfo.h +// +// Copyright (C) 2005 Kristian Høgsberg +// Copyright (C) 2005-2008, 2010, 2011, 2018, 2019, 2021, 2023 Albert Astals Cid +// Copyright (C) 2005 Brad Hards +// Copyright (C) 2009 Pino Toscano +// Copyright (C) 2012 Adrian Johnson +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2019, 2021, 2022 Oliver Sander +// Copyright (C) 2019 Adam Reichold +// +// 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 +// +//======================================================================== + +//======================================================================== +// +// Based on code from pdffonts.cc +// +// Copyright 2001-2007 Glyph & Cog, LLC +// +//======================================================================== + +#ifndef FONT_INFO_H +#define FONT_INFO_H + +#include "Object.h" +#include "poppler_private_export.h" + +#include +#include +#include + +class GfxFont; +class PDFDoc; + +class POPPLER_PRIVATE_EXPORT FontInfo +{ +public: + enum Type + { + unknown, + Type1, + Type1C, + Type1COT, + Type3, + TrueType, + TrueTypeOT, + CIDType0, + CIDType0C, + CIDType0COT, + CIDTrueType, + CIDTrueTypeOT + }; + + // Constructor. + FontInfo(GfxFont *fontA, XRef *xrefA); + // Copy constructor + FontInfo(const FontInfo &f) = default; + + FontInfo &operator=(const FontInfo &) = delete; + + const std::optional &getName() const { return name; }; + const std::optional &getSubstituteName() const { return substituteName; }; + const std::optional &getFile() const { return file; }; + const std::string &getEncoding() const { return encoding; }; + Type getType() const { return type; }; + bool getEmbedded() const { return emb; }; + bool getSubset() const { return subset; }; + bool getToUnicode() const { return hasToUnicode; }; + Ref getRef() const { return fontRef; }; + Ref getEmbRef() const { return embRef; }; + +private: + std::optional name; + std::optional substituteName; + std::optional file; + std::string encoding; + Type type; + bool emb; + bool subset; + bool hasToUnicode; + Ref fontRef; + Ref embRef; +}; + +class POPPLER_PRIVATE_EXPORT FontInfoScanner +{ +public: + // Constructor. + explicit FontInfoScanner(PDFDoc *doc, int firstPage = 0); + // Destructor. + ~FontInfoScanner(); + + std::vector scan(int nPages); + +private: + PDFDoc *doc; + int currentPage; + std::unordered_set fonts; + RefRecursionChecker visitedObjects; + + void scanFonts(XRef *xrefA, Dict *resDict, std::vector *fontsList); +}; + +#endif diff --git a/poppler-24.05.0/poppler/Form.cc b/poppler-24.05.0/poppler/Form.cc new file mode 100644 index 0000000000000000000000000000000000000000..1d974666e58802579ae683ca8dbfd5c2c2ce47db --- /dev/null +++ b/poppler-24.05.0/poppler/Form.cc @@ -0,0 +1,3315 @@ +//======================================================================== +// +// Form.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2006-2008 Julien Rebetez +// Copyright 2007-2012, 2015-2023 Albert Astals Cid +// Copyright 2007-2008, 2011 Carlos Garcia Campos +// Copyright 2007, 2013, 2016, 2019, 2022 Adrian Johnson +// Copyright 2007 Iñigo Martínez +// Copyright 2008, 2011 Pino Toscano +// Copyright 2008 Michael Vrable +// Copyright 2009 Matthias Drochner +// Copyright 2009 KDAB via Guillermo Amaral +// Copyright 2010, 2012 Mark Riedesel +// Copyright 2012 Fabio D'Urso +// Copyright 2015 André Guerreiro +// Copyright 2015 André Esser +// Copyright 2017 Hans-Ulrich Jüttner +// Copyright 2017 Bernd Kuhls +// Copyright 2018 Andre Heinecke +// Copyright 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright 2018 Chinmoy Ranjan Pradhan +// Copyright 2018 Adam Reichold +// Copyright 2018-2022 Nelson Benítez León +// Copyright 2019, 2020 2024, Oliver Sander +// Copyright 2019 Tomoyuki Kubota +// Copyright 2019 João Netto +// Copyright 2020-2022 Marek Kasik +// Copyright 2020 Thorsten Behrens +// Copyright 2020, 2023, 2024 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden +// Copyright 2021 Georgiy Sgibnev . Work sponsored by lab50.net. +// Copyright 2021 Theofilos Intzoglou +// Copyright 2021 Even Rouault +// Copyright 2022 Alexander Sulfrian +// Copyright 2022, 2024 Erich E. Hoover +// Copyright 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +//======================================================================== + +#include + +#include +#include +#include +#include +#include +#include +#include +#include "goo/ft_utils.h" +#include "goo/gmem.h" +#include "goo/gfile.h" +#include "goo/GooString.h" +#include "Error.h" +#include "ErrorCodes.h" +#include "CharCodeToUnicode.h" +#include "Object.h" +#include "Array.h" +#include "Dict.h" +#include "Gfx.h" +#include "GfxFont.h" +#include "GlobalParams.h" +#include "Form.h" +#include "PDFDoc.h" +#include "DateInfo.h" +#include "CryptoSignBackend.h" +#include "SignatureInfo.h" +#include "CertificateInfo.h" +#include "XRef.h" +#include "PDFDocEncoding.h" +#include "Annot.h" +#include "Link.h" +#include "Lexer.h" +#include "Parser.h" +#include "CIDFontsWidthsBuilder.h" +#include "UTF.h" + +#include "fofi/FoFiTrueType.h" +#include "fofi/FoFiIdentifier.h" + +#include +#include FT_FREETYPE_H +#include + +// helper for using std::visit to get a dependent false for static_asserts +// to help get compile errors if one ever extends variants +template +inline constexpr bool always_false_v = false; + +// return a newly allocated char* containing an UTF16BE string of size length +char *pdfDocEncodingToUTF16(const std::string &orig, int *length) +{ + // double size, a unicode char takes 2 char, add 2 for the unicode marker + *length = 2 + 2 * orig.size(); + char *result = new char[(*length)]; + const char *cstring = orig.c_str(); + // unicode marker + result[0] = '\xfe'; + result[1] = '\xff'; + // convert to utf16 + for (int i = 2, j = 0; i < (*length); i += 2, j++) { + Unicode u = pdfDocEncoding[(unsigned int)((unsigned char)cstring[j])] & 0xffff; + result[i] = (u >> 8) & 0xff; + result[i + 1] = u & 0xff; + } + return result; +} + +static GooString *convertToUtf16(GooString *pdfDocEncodingString) +{ + int tmp_length; + char *tmp_str = pdfDocEncodingToUTF16(pdfDocEncodingString->toStr(), &tmp_length); + delete pdfDocEncodingString; + pdfDocEncodingString = new GooString(tmp_str + 2, tmp_length - 2); // Remove the unicode BOM + delete[] tmp_str; + return pdfDocEncodingString; +} + +FormWidget::FormWidget(PDFDoc *docA, Object *aobj, unsigned num, Ref aref, FormField *fieldA) +{ + ref = aref; + ID = 0; + childNum = num; + doc = docA; + xref = doc->getXRef(); + obj = aobj->copy(); + type = formUndef; + field = fieldA; + widget = nullptr; +} + +FormWidget::~FormWidget() +{ + if (widget) { + widget->decRefCnt(); + } +} + +void FormWidget::print(int indent) +{ + printf("%*s+ (%d %d): [widget]\n", indent, "", ref.num, ref.gen); +} + +void FormWidget::createWidgetAnnotation() +{ + if (widget) { + return; + } + + Object obj1(ref); + widget = new AnnotWidget(doc, &obj, &obj1, field); +} + +bool FormWidget::inRect(double x, double y) const +{ + return widget ? widget->inRect(x, y) : false; +} + +void FormWidget::getRect(double *x1, double *y1, double *x2, double *y2) const +{ + if (widget) { + widget->getRect(x1, y1, x2, y2); + } +} + +bool FormWidget::isReadOnly() const +{ + return field->isReadOnly(); +} + +void FormWidget::setReadOnly(bool value) +{ + field->setReadOnly(value); +} + +int FormWidget::encodeID(unsigned pageNum, unsigned fieldNum) +{ + return (pageNum << 4 * sizeof(unsigned)) + fieldNum; +} + +void FormWidget::decodeID(unsigned id, unsigned *pageNum, unsigned *fieldNum) +{ + *pageNum = id >> 4 * sizeof(unsigned); + *fieldNum = (id << 4 * sizeof(unsigned)) >> 4 * sizeof(unsigned); +} + +const GooString *FormWidget::getPartialName() const +{ + return field->getPartialName(); +} + +void FormWidget::setPartialName(const GooString &name) +{ + field->setPartialName(name); +} + +const GooString *FormWidget::getAlternateUiName() const +{ + return field->getAlternateUiName(); +} + +const GooString *FormWidget::getMappingName() const +{ + return field->getMappingName(); +} + +GooString *FormWidget::getFullyQualifiedName() +{ + return field->getFullyQualifiedName(); +} + +LinkAction *FormWidget::getActivationAction() +{ + return widget ? widget->getAction() : nullptr; +} + +std::unique_ptr FormWidget::getAdditionalAction(Annot::FormAdditionalActionsType t) +{ + return widget ? widget->getFormAdditionalAction(t) : nullptr; +} + +bool FormWidget::setAdditionalAction(Annot::FormAdditionalActionsType t, const std::string &js) +{ + if (!widget) { + return false; + } + + return widget->setFormAdditionalAction(t, js); +} + +FormWidgetButton::FormWidgetButton(PDFDoc *docA, Object *dictObj, unsigned num, Ref refA, FormField *p) : FormWidget(docA, dictObj, num, refA, p) +{ + type = formButton; + onStr = nullptr; + + // Find the name of the ON state in the AP dictionary + // The reference say the Off state, if it exists, _must_ be stored in the AP dict under the name /Off + // The "on" state may be stored under any other name + Object obj1 = obj.dictLookup("AP"); + if (obj1.isDict()) { + Object obj2 = obj1.dictLookup("N"); + if (obj2.isDict()) { + for (int i = 0; i < obj2.dictGetLength(); i++) { + const char *key = obj2.dictGetKey(i); + if (strcmp(key, "Off") != 0) { + onStr = new GooString(key); + break; + } + } + } + } +} + +const char *FormWidgetButton::getOnStr() const +{ + if (onStr) { + return onStr->c_str(); + } + + // 12.7.4.2.3 Check Boxes + // Yes should be used as the name for the on state + return parent()->getButtonType() == formButtonCheck ? "Yes" : nullptr; +} + +FormWidgetButton::~FormWidgetButton() +{ + delete onStr; +} + +FormButtonType FormWidgetButton::getButtonType() const +{ + return parent()->getButtonType(); +} + +void FormWidgetButton::setAppearanceState(const char *state) +{ + if (!widget) { + return; + } + widget->setAppearanceState(state); +} + +void FormWidgetButton::updateWidgetAppearance() +{ + // The appearance stream must NOT be regenerated for this widget type +} + +void FormWidgetButton::setState(bool astate) +{ + // pushButtons don't have state + if (parent()->getButtonType() == formButtonPush) { + return; + } + + // Silently return if can't set ON state + if (astate && !getOnStr()) { + return; + } + + parent()->setState(astate ? getOnStr() : (char *)"Off"); + // Parent will call setAppearanceState() + + // Now handle standAlone fields which are related to this one by having the same + // fully qualified name. This is *partially* by spec, as seen in "Field names" + // section inside "8.6.2 Field Dictionaries" in 1.7 PDF spec. Issue #1034 + + if (!astate) { // We're only interested when this field is being set to ON, + return; // to check if it has related fields and then set them OFF + } + + unsigned this_page_num, this_field_num; + decodeID(getID(), &this_page_num, &this_field_num); + Page *this_page = doc->getCatalog()->getPage(this_page_num); + const FormField *this_field = getField(); + if (!this_page->hasStandaloneFields() || this_field == nullptr) { + return; + } + + auto this_page_widgets = this_page->getFormWidgets(); + const FormButtonType this_button_type = getButtonType(); + + const int tot = this_page_widgets->getNumWidgets(); + for (int i = 0; i < tot; i++) { + bool found_related = false; + FormWidget *wid = this_page_widgets->getWidget(i); + const bool same_fqn = wid->getFullyQualifiedName()->cmp(getFullyQualifiedName()) == 0; + const bool same_button_type = wid->getType() == formButton && static_cast(wid)->getButtonType() == this_button_type; + + if (same_fqn && same_button_type) { + if (this_field->isStandAlone()) { + //'this_field' is standAlone, so we need to search in both standAlone fields and normal fields + if (this_field != wid->getField()) { // so take care to not choose our same field + found_related = true; + } + } else { + //'this_field' is not standAlone, so we just need to search in standAlone fields + if (wid->getField()->isStandAlone()) { + found_related = true; + } + } + } + + if (found_related) { + FormFieldButton *ffb = static_cast(wid->getField()); + if (ffb == nullptr) { + error(errInternal, -1, "FormWidgetButton::setState : FormFieldButton expected\n"); + continue; + } + ffb->setState((char *)"Off", true); + } + } +} + +bool FormWidgetButton::getState() const +{ + return getOnStr() ? parent()->getState(getOnStr()) : false; +} + +FormFieldButton *FormWidgetButton::parent() const +{ + return static_cast(field); +} + +FormWidgetText::FormWidgetText(PDFDoc *docA, Object *dictObj, unsigned num, Ref refA, FormField *p) : FormWidget(docA, dictObj, num, refA, p) +{ + type = formText; +} + +const GooString *FormWidgetText::getContent() const +{ + return parent()->getContent(); +} + +void FormWidgetText::updateWidgetAppearance() +{ + if (widget) { + widget->updateAppearanceStream(); + } +} + +bool FormWidgetText::isMultiline() const +{ + return parent()->isMultiline(); +} + +bool FormWidgetText::isPassword() const +{ + return parent()->isPassword(); +} + +bool FormWidgetText::isFileSelect() const +{ + return parent()->isFileSelect(); +} + +bool FormWidgetText::noSpellCheck() const +{ + return parent()->noSpellCheck(); +} + +bool FormWidgetText::noScroll() const +{ + return parent()->noScroll(); +} + +bool FormWidgetText::isComb() const +{ + return parent()->isComb(); +} + +bool FormWidgetText::isRichText() const +{ + return parent()->isRichText(); +} + +int FormWidgetText::getMaxLen() const +{ + return parent()->getMaxLen(); +} + +double FormWidgetText::getTextFontSize() +{ + return parent()->getTextFontSize(); +} + +void FormWidgetText::setTextFontSize(int fontSize) +{ + parent()->setTextFontSize(fontSize); +} + +void FormWidgetText::setContent(const GooString *new_content) +{ + parent()->setContentCopy(new_content); +} + +void FormWidgetText::setAppearanceContent(const GooString *new_content) +{ + parent()->setAppearanceContentCopy(new_content); +} + +FormFieldText *FormWidgetText::parent() const +{ + return static_cast(field); +} + +FormWidgetChoice::FormWidgetChoice(PDFDoc *docA, Object *dictObj, unsigned num, Ref refA, FormField *p) : FormWidget(docA, dictObj, num, refA, p) +{ + type = formChoice; +} + +FormWidgetChoice::~FormWidgetChoice() { } + +bool FormWidgetChoice::_checkRange(int i) const +{ + if (i < 0 || i >= parent()->getNumChoices()) { + error(errInternal, -1, "FormWidgetChoice::_checkRange i out of range : {0:d}", i); + return false; + } + return true; +} + +void FormWidgetChoice::select(int i) +{ + if (!_checkRange(i)) { + return; + } + parent()->select(i); +} + +void FormWidgetChoice::toggle(int i) +{ + if (!_checkRange(i)) { + return; + } + parent()->toggle(i); +} + +void FormWidgetChoice::deselectAll() +{ + parent()->deselectAll(); +} + +const GooString *FormWidgetChoice::getEditChoice() const +{ + if (!hasEdit()) { + error(errInternal, -1, "FormFieldChoice::getEditChoice called on a non-editable choice\n"); + return nullptr; + } + return parent()->getEditChoice(); +} + +void FormWidgetChoice::updateWidgetAppearance() +{ + if (widget) { + widget->updateAppearanceStream(); + } +} + +bool FormWidgetChoice::isSelected(int i) const +{ + if (!_checkRange(i)) { + return false; + } + return parent()->isSelected(i); +} + +void FormWidgetChoice::setEditChoice(const GooString *new_content) +{ + if (!hasEdit()) { + error(errInternal, -1, "FormFieldChoice::setEditChoice : trying to edit an non-editable choice\n"); + return; + } + + parent()->setEditChoice(new_content); +} + +int FormWidgetChoice::getNumChoices() const +{ + return parent()->getNumChoices(); +} + +const GooString *FormWidgetChoice::getChoice(int i) const +{ + return parent()->getChoice(i); +} + +const GooString *FormWidgetChoice::getExportVal(int i) const +{ + return parent()->getExportVal(i); +} + +bool FormWidgetChoice::isCombo() const +{ + return parent()->isCombo(); +} + +bool FormWidgetChoice::hasEdit() const +{ + return parent()->hasEdit(); +} + +bool FormWidgetChoice::isMultiSelect() const +{ + return parent()->isMultiSelect(); +} + +bool FormWidgetChoice::noSpellCheck() const +{ + return parent()->noSpellCheck(); +} + +bool FormWidgetChoice::commitOnSelChange() const +{ + return parent()->commitOnSelChange(); +} + +bool FormWidgetChoice::isListBox() const +{ + return parent()->isListBox(); +} + +FormFieldChoice *FormWidgetChoice::parent() const +{ + return static_cast(field); +} + +FormWidgetSignature::FormWidgetSignature(PDFDoc *docA, Object *dictObj, unsigned num, Ref refA, FormField *p) : FormWidget(docA, dictObj, num, refA, p) +{ + type = formSignature; +} + +const GooString *FormWidgetSignature::getSignature() const +{ + return static_cast(field)->getSignature(); +} + +SignatureInfo *FormWidgetSignature::validateSignatureAsync(bool doVerifyCert, bool forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool enableAIA, const std::function &doneCallback) +{ + return static_cast(field)->validateSignatureAsync(doVerifyCert, forceRevalidation, validationTime, ocspRevocationCheck, enableAIA, doneCallback); +} + +CertificateValidationStatus FormWidgetSignature::validateSignatureResult() +{ + return static_cast(field)->validateSignatureResult(); +} + +// update hash with the specified range of data from the file +static bool hashFileRange(FILE *f, CryptoSign::SigningInterface *handler, Goffset start, Goffset end) +{ + if (!handler) { + return false; + } + const int BUF_SIZE = 65536; + + unsigned char *buf = new unsigned char[BUF_SIZE]; + + while (start < end) { + if (Gfseek(f, start, SEEK_SET) != 0) { + delete[] buf; + return false; + } + int len = BUF_SIZE; + if (end - start < len) { + len = static_cast(end - start); + } + if (fread(buf, 1, len, f) != static_cast(len)) { + delete[] buf; + return false; + } + handler->addData(buf, len); + start += len; + } + delete[] buf; + return true; +} + +bool FormWidgetSignature::signDocument(const std::string &saveFilename, const std::string &certNickname, const std::string &password, const GooString *reason, const GooString *location, const std::optional &ownerPassword, + const std::optional &userPassword) +{ + auto backend = CryptoSign::Factory::createActive(); + if (!backend) { + return false; + } + if (certNickname.empty()) { + fprintf(stderr, "signDocument: Empty nickname\n"); + return false; + } + + auto sigHandler = backend->createSigningHandler(certNickname, HashAlgorithm::Sha256); + + FormFieldSignature *signatureField = static_cast(field); + std::unique_ptr certInfo = sigHandler->getCertificateInfo(); + if (!certInfo) { + fprintf(stderr, "signDocument: error getting signature info\n"); + return false; + } + const std::string signerName = certInfo->getSubjectInfo().commonName; + signatureField->setCertificateInfo(certInfo); + updateWidgetAppearance(); // add visible signing info to appearance + + Object vObj(new Dict(xref)); + Ref vref = xref->addIndirectObject(vObj); + if (!createSignature(vObj, vref, GooString(signerName), CryptoSign::maxSupportedSignatureSize, reason, location)) { + return false; + } + + // Incremental save to avoid breaking any existing signatures + const GooString fname(saveFilename); + if (doc->saveAs(fname, writeForceIncremental) != errNone) { + fprintf(stderr, "signDocument: error saving to file \"%s\"\n", saveFilename.c_str()); + return false; + } + + // Get start/end offset of signature object in the saved PDF + Goffset objStart, objEnd; + if (!getObjectStartEnd(fname, vref.num, &objStart, &objEnd, ownerPassword, userPassword)) { + fprintf(stderr, "signDocument: unable to get signature object offsets\n"); + return false; + } + + // Update byte range of signature in the saved PDF + Goffset sigStart, sigEnd, fileSize; + FILE *file = openFile(saveFilename.c_str(), "r+b"); + if (!updateOffsets(file, objStart, objEnd, &sigStart, &sigEnd, &fileSize)) { + fprintf(stderr, "signDocument: unable update byte range\n"); + fclose(file); + return false; + } + + // compute hash of byte ranges + if (!hashFileRange(file, sigHandler.get(), 0LL, sigStart)) { + fclose(file); + return false; + } + if (!hashFileRange(file, sigHandler.get(), sigEnd, fileSize)) { + fclose(file); + return false; + } + + // and sign it + auto signature = sigHandler->signDetached(password); + if (!signature) { + fclose(file); + return false; + } + + if (signature->getLength() > CryptoSign::maxSupportedSignatureSize) { + fclose(file); + return false; + } + + // pad with zeroes to placeholder length + auto length = signature->getLength(); + signature->append(std::string(CryptoSign::maxSupportedSignatureSize - length, '\0')); + + // write signature to saved file + if (!updateSignature(file, sigStart, sigEnd, signature.value())) { + fprintf(stderr, "signDocument: unable update signature\n"); + fclose(file); + return false; + } + signatureField->setSignature(*signature); + + fclose(file); + + return true; +} + +static std::tuple calculateDxDy(int rot, const PDFRectangle *rect) +{ + switch (rot) { + case 90: + return { rect->y2 - rect->y1, rect->x2 - rect->x1 }; + + case 180: + return { rect->x2 - rect->y2, rect->y2 - rect->y1 }; + + case 270: + return { rect->y2 - rect->y1, rect->x2 - rect->x1 }; + + default: // assume rot == 0 + return { rect->x2 - rect->x1, rect->y2 - rect->y1 }; + } +} + +bool FormWidgetSignature::signDocumentWithAppearance(const std::string &saveFilename, const std::string &certNickname, const std::string &password, const GooString *reason, const GooString *location, + const std::optional &ownerPassword, const std::optional &userPassword, const GooString &signatureText, const GooString &signatureTextLeft, double fontSize, + double leftFontSize, std::unique_ptr &&fontColor, double borderWidth, std::unique_ptr &&borderColor, std::unique_ptr &&backgroundColor) +{ + // Set the appearance + GooString *aux = getField()->getDefaultAppearance(); + std::string originalDefaultAppearance = aux ? aux->toStr() : std::string(); + + Form *form = doc->getCatalog()->getCreateForm(); + const std::string pdfFontName = form->findPdfFontNameToUseForSigning(); + if (pdfFontName.empty()) { + return false; + } + std::shared_ptr font = form->getDefaultResources()->lookupFont(pdfFontName.c_str()); + + double x1, y1, x2, y2; + getRect(&x1, &y1, &x2, &y2); + const PDFRectangle rect(x1, y1, x2, y2); + std::unique_ptr origAppearCharacs = getWidgetAnnotation()->getAppearCharacs() ? getWidgetAnnotation()->getAppearCharacs()->copy() : nullptr; + const int rot = origAppearCharacs ? origAppearCharacs->getRotation() : 0; + const auto dxdy = calculateDxDy(rot, &rect); + const double dx = std::get<0>(dxdy); + const double dy = std::get<1>(dxdy); + const double wMax = dx - 2 * borderWidth - 4; + const double hMax = dy - 2 * borderWidth; + if (fontSize == 0) { + fontSize = Annot::calculateFontSize(form, font.get(), &signatureText, wMax / 2.0, hMax); + } + if (leftFontSize == 0) { + leftFontSize = Annot::calculateFontSize(form, font.get(), &signatureTextLeft, wMax / 2.0, hMax); + } + const DefaultAppearance da { { objName, pdfFontName.c_str() }, fontSize, std::move(fontColor) }; + getField()->setDefaultAppearance(da.toAppearanceString()); + + auto appearCharacs = std::make_unique(nullptr); + appearCharacs->setBorderColor(std::move(borderColor)); + appearCharacs->setBackColor(std::move(backgroundColor)); + getWidgetAnnotation()->setAppearCharacs(std::move(appearCharacs)); + + std::unique_ptr origBorderCopy = getWidgetAnnotation()->getBorder() ? getWidgetAnnotation()->getBorder()->copy() : nullptr; + std::unique_ptr border(new AnnotBorderArray()); + border->setWidth(borderWidth); + getWidgetAnnotation()->setBorder(std::move(border)); + + getWidgetAnnotation()->generateFieldAppearance(); + getWidgetAnnotation()->updateAppearanceStream(); + + form->ensureFontsForAllCharacters(&signatureText, pdfFontName); + form->ensureFontsForAllCharacters(&signatureTextLeft, pdfFontName); + + ::FormFieldSignature *ffs = static_cast<::FormFieldSignature *>(getField()); + ffs->setCustomAppearanceContent(signatureText); + ffs->setCustomAppearanceLeftContent(signatureTextLeft); + ffs->setCustomAppearanceLeftFontSize(leftFontSize); + + // say that there a now signatures and that we should append only + doc->getCatalog()->getAcroForm()->dictSet("SigFlags", Object(3)); + + const bool success = signDocument(saveFilename, certNickname, password, reason, location, ownerPassword, userPassword); + + // Now bring back the annotation appearance back to what it was + ffs->setDefaultAppearance(originalDefaultAppearance); + ffs->setCustomAppearanceContent({}); + ffs->setCustomAppearanceLeftContent({}); + getWidgetAnnotation()->setAppearCharacs(std::move(origAppearCharacs)); + getWidgetAnnotation()->setBorder(std::move(origBorderCopy)); + getWidgetAnnotation()->generateFieldAppearance(); + getWidgetAnnotation()->updateAppearanceStream(); + + return success; +} + +// Get start and end file position of objNum in the PDF named filename. +bool FormWidgetSignature::getObjectStartEnd(const GooString &filename, int objNum, Goffset *objStart, Goffset *objEnd, const std::optional &ownerPassword, const std::optional &userPassword) +{ + PDFDoc newDoc(std::unique_ptr(filename.copy()), ownerPassword, userPassword); + if (!newDoc.isOk()) { + return false; + } + + XRef *newXref = newDoc.getXRef(); + XRefEntry *entry = newXref->getEntry(objNum); + if (entry->type != xrefEntryUncompressed) { + return false; + } + + *objStart = entry->offset; + newXref->fetch(objNum, entry->gen, 0, objEnd); + return true; +} + +// find next offset containing the dummy offset '9999999999' and overwrite with offset +static char *setNextOffset(char *start, Goffset offset) +{ + char buf[50]; + sprintf(buf, "%lld", offset); + strcat(buf, " "); // add some padding + + char *p = strstr(start, "9999999999"); + if (p) { + memcpy(p, buf, 10); // overwrite exact size. + p += 10; + } else { + return nullptr; + } + return p; +} + +// Updates the ByteRange array of the signature object in the file. +// Returns start/end of signature string and file size. +bool FormWidgetSignature::updateOffsets(FILE *f, Goffset objStart, Goffset objEnd, Goffset *sigStart, Goffset *sigEnd, Goffset *fileSize) +{ + if (Gfseek(f, 0, SEEK_END) != 0) { + return false; + } + *fileSize = Gftell(f); + + if (objEnd > *fileSize) { + objEnd = *fileSize; + } + + // sanity check object offsets + if (objEnd <= objStart || (objEnd - objStart >= INT_MAX)) { + return false; + } + + const size_t bufSize = static_cast(objEnd - objStart); + if (Gfseek(f, objStart, SEEK_SET) != 0) { + return false; + } + std::vector buf(bufSize + 1); + if (fread(buf.data(), 1, bufSize, f) != bufSize) { + return false; + } + buf[bufSize] = 0; // prevent string functions from searching past the end + + // search for the Contents field which contains the signature placeholder + // which always must start with hex digits 000 + *sigStart = -1; + *sigEnd = -1; + for (size_t i = 0; i < bufSize - 14; i++) { + if (buf[i] == '/' && strncmp(&buf[i], "/Contents <000", 14) == 0) { + *sigStart = objStart + i + 10; + char *p = strchr(&buf[i], '>'); + if (p) { + *sigEnd = objStart + (p - buf.data()) + 1; + } + break; + } + } + + if (*sigStart == -1 || *sigEnd == -1) { + return false; + } + + // Search for ByteRange array and update offsets + for (size_t i = 0; i < bufSize - 10; i++) { + if (buf[i] == '/' && strncmp(&buf[i], "/ByteRange", 10) == 0) { + // update range + char *p = setNextOffset(&buf[i], *sigStart); + if (!p) { + return false; + } + p = setNextOffset(p, *sigEnd); + if (!p) { + return false; + } + p = setNextOffset(p, *fileSize - *sigEnd); + if (!p) { + return false; + } + break; + } + } + + // write buffer back to disk + if (Gfseek(f, objStart, SEEK_SET) != 0) { + return false; + } + fwrite(buf.data(), bufSize, 1, f); + return true; +} + +// Overwrite signature string in the file with new signature +bool FormWidgetSignature::updateSignature(FILE *f, Goffset sigStart, Goffset sigEnd, const GooString &signature) +{ + if (signature.getLength() * 2 + 2 != sigEnd - sigStart) { + return false; + } + + if (Gfseek(f, sigStart, SEEK_SET) != 0) { + return false; + } + const char *c = signature.c_str(); + fprintf(f, "<"); + for (int i = 0; i < signature.getLength(); i++) { + unsigned char value = *(c + i) & 0x000000ff; + fprintf(f, "%2.2x", value); + } + fprintf(f, "> "); + return true; +} + +bool FormWidgetSignature::createSignature(Object &vObj, Ref vRef, const GooString &name, int placeholderLength, const GooString *reason, const GooString *location) +{ + vObj.dictAdd("Type", Object(objName, "Sig")); + vObj.dictAdd("Filter", Object(objName, "Adobe.PPKLite")); + vObj.dictAdd("SubFilter", Object(objName, "adbe.pkcs7.detached")); + vObj.dictAdd("Name", Object(name.copy())); + GooString *date = timeToDateString(nullptr); + vObj.dictAdd("M", Object(date)); + if (reason && (reason->getLength() > 0)) { + vObj.dictAdd("Reason", Object(reason->copy())); + } + if (location && (location->getLength() > 0)) { + vObj.dictAdd("Location", Object(location->copy())); + } + + vObj.dictAdd("Contents", Object(objHexString, new GooString(std::string(placeholderLength, '\0')))); + Object bObj(new Array(xref)); + // reserve space in byte range for maximum number of bytes + bObj.arrayAdd(Object(static_cast(0LL))); + bObj.arrayAdd(Object(static_cast(9999999999LL))); + bObj.arrayAdd(Object(static_cast(9999999999LL))); + bObj.arrayAdd(Object(static_cast(9999999999LL))); + vObj.dictAdd("ByteRange", bObj.copy()); + obj.dictSet("V", Object(vRef)); + xref->setModifiedObject(&obj, ref); + return true; +} + +std::vector FormWidgetSignature::getSignedRangeBounds() const +{ + return static_cast(field)->getSignedRangeBounds(); +} + +std::optional FormWidgetSignature::getCheckedSignature(Goffset *checkedFileSize) +{ + return static_cast(field)->getCheckedSignature(checkedFileSize); +} + +void FormWidgetSignature::updateWidgetAppearance() +{ + if (widget) { + widget->updateAppearanceStream(); + } +} + +//======================================================================== +// FormField +//======================================================================== + +FormField::FormField(PDFDoc *docA, Object &&aobj, const Ref aref, FormField *parentA, std::set *usedParents, FormFieldType ty) +{ + doc = docA; + xref = doc->getXRef(); + obj = std::move(aobj); + Dict *dict = obj.getDict(); + ref = aref; + type = ty; + parent = parentA; + numChildren = 0; + children = nullptr; + terminal = false; + widgets = nullptr; + readOnly = false; + defaultAppearance = nullptr; + fullyQualifiedName = nullptr; + quadding = VariableTextQuadding::leftJustified; + hasQuadding = false; + standAlone = false; + + // childs + Object obj1 = dict->lookup("Kids"); + if (obj1.isArray()) { + // Load children + for (int i = 0; i < obj1.arrayGetLength(); i++) { + Ref childRef; + Object childObj = obj1.getArray()->get(i, &childRef); + if (childRef == Ref::INVALID()) { + error(errSyntaxError, -1, "Invalid form field renference"); + continue; + } + if (!childObj.isDict()) { + error(errSyntaxError, -1, "Form field child is not a dictionary"); + continue; + } + + if (usedParents->find(childRef.num) == usedParents->end()) { + // Field child: it could be a form field or a widget or composed dict + const Object &objParent = childObj.dictLookupNF("Parent"); + Object obj3 = childObj.dictLookup("Parent"); + if (objParent.isRef() || obj3.isDict()) { + // Child is a form field or composed dict + // We create the field, if it's composed + // it will create the widget as a child + std::set usedParentsAux = *usedParents; + usedParentsAux.insert(childRef.num); + + if (terminal) { + error(errSyntaxWarning, -1, "Field can't have both Widget AND Field as kids\n"); + continue; + } + + numChildren++; + children = (FormField **)greallocn(children, numChildren, sizeof(FormField *)); + children[numChildren - 1] = Form::createFieldFromDict(std::move(childObj), doc, childRef, this, &usedParentsAux); + } else { + Object obj2 = childObj.dictLookup("Subtype"); + if (obj2.isName("Widget")) { + // Child is a widget annotation + if (!terminal && numChildren > 0) { + error(errSyntaxWarning, -1, "Field can't have both Widget AND Field as kids\n"); + continue; + } + _createWidget(&childObj, childRef); + } + } + } + } + } else { + // No children, if it's a composed dict, create the child widget + obj1 = dict->lookup("Subtype"); + if (obj1.isName("Widget")) { + _createWidget(&obj, ref); + } + } + + // flags + obj1 = Form::fieldLookup(dict, "Ff"); + if (obj1.isInt()) { + int flags = obj1.getInt(); + if (flags & 0x1) { // 1 -> ReadOnly + readOnly = true; + } + if (flags & 0x2) { // 2 -> Required + // TODO + } + if (flags & 0x4) { // 3 -> NoExport + // TODO + } + } + + // Variable Text + obj1 = Form::fieldLookup(dict, "DA"); + if (obj1.isString()) { + defaultAppearance = obj1.getString()->copy(); + } + + obj1 = Form::fieldLookup(dict, "Q"); + if (obj1.isInt()) { + const VariableTextQuadding aux = static_cast(obj1.getInt()); + hasQuadding = aux == VariableTextQuadding::leftJustified || aux == VariableTextQuadding::centered || aux == VariableTextQuadding::rightJustified; + if (likely(hasQuadding)) { + quadding = static_cast(aux); + } + } + + obj1 = dict->lookup("T"); + if (obj1.isString()) { + partialName = obj1.getString()->copy(); + } else { + partialName = nullptr; + } + + obj1 = dict->lookup("TU"); + if (obj1.isString()) { + alternateUiName = obj1.getString()->copy(); + } else { + alternateUiName = nullptr; + } + + obj1 = dict->lookup("TM"); + if (obj1.isString()) { + mappingName = obj1.getString()->copy(); + } else { + mappingName = nullptr; + } +} + +void FormField::setDefaultAppearance(const std::string &appearance) +{ + delete defaultAppearance; + defaultAppearance = new GooString(appearance); +} + +void FormField::setPartialName(const GooString &name) +{ + delete partialName; + partialName = name.copy(); + + obj.getDict()->set("T", Object(name.copy())); + xref->setModifiedObject(&obj, ref); +} + +FormField::~FormField() +{ + if (!terminal) { + if (children) { + for (int i = 0; i < numChildren; i++) { + delete children[i]; + } + gfree(children); + } + } else { + for (int i = 0; i < numChildren; ++i) { + delete widgets[i]; + } + gfree(widgets); + } + + delete defaultAppearance; + delete partialName; + delete alternateUiName; + delete mappingName; + delete fullyQualifiedName; +} + +void FormField::print(int indent) +{ + printf("%*s- (%d %d): [container] terminal: %s children: %d\n", indent, "", ref.num, ref.gen, terminal ? "Yes" : "No", numChildren); +} + +void FormField::printTree(int indent) +{ + print(indent); + if (terminal) { + for (int i = 0; i < numChildren; i++) { + widgets[i]->print(indent + 4); + } + } else { + for (int i = 0; i < numChildren; i++) { + children[i]->printTree(indent + 4); + } + } +} + +void FormField::fillChildrenSiblingsID() +{ + if (terminal) { + return; + } + for (int i = 0; i < numChildren; i++) { + children[i]->fillChildrenSiblingsID(); + } +} + +void FormField::createWidgetAnnotations() +{ + if (terminal) { + for (int i = 0; i < numChildren; i++) { + widgets[i]->createWidgetAnnotation(); + } + } else { + for (int i = 0; i < numChildren; i++) { + children[i]->createWidgetAnnotations(); + } + } +} + +void FormField::_createWidget(Object *objA, Ref aref) +{ + terminal = true; + numChildren++; + widgets = (FormWidget **)greallocn(widgets, numChildren, sizeof(FormWidget *)); + // ID = index in "widgets" table + switch (type) { + case formButton: + widgets[numChildren - 1] = new FormWidgetButton(doc, objA, numChildren - 1, aref, this); + break; + case formText: + widgets[numChildren - 1] = new FormWidgetText(doc, objA, numChildren - 1, aref, this); + break; + case formChoice: + widgets[numChildren - 1] = new FormWidgetChoice(doc, objA, numChildren - 1, aref, this); + break; + case formSignature: + widgets[numChildren - 1] = new FormWidgetSignature(doc, objA, numChildren - 1, aref, this); + break; + default: + error(errSyntaxWarning, -1, "SubType on non-terminal field, invalid document?"); + numChildren--; + } +} + +FormWidget *FormField::findWidgetByRef(Ref aref) +{ + if (terminal) { + for (int i = 0; i < numChildren; i++) { + if (widgets[i]->getRef() == aref) { + return widgets[i]; + } + } + } else { + for (int i = 0; i < numChildren; i++) { + FormWidget *result = children[i]->findWidgetByRef(aref); + if (result) { + return result; + } + } + } + return nullptr; +} + +GooString *FormField::getFullyQualifiedName() +{ + Object parentObj; + const GooString *parent_name; + bool unicode_encoded = false; + + if (fullyQualifiedName) { + return fullyQualifiedName; + } + + fullyQualifiedName = new GooString(); + + std::set parsedRefs; + Ref parentRef; + parentObj = obj.getDict()->lookup("Parent", &parentRef); + if (parentRef != Ref::INVALID()) { + parsedRefs.insert(parentRef.num); + } + while (parentObj.isDict()) { + Object obj2 = parentObj.dictLookup("T"); + if (obj2.isString()) { + parent_name = obj2.getString(); + + if (unicode_encoded) { + fullyQualifiedName->insert(0, "\0.", 2); // 2-byte unicode period + if (hasUnicodeByteOrderMark(parent_name->toStr())) { + fullyQualifiedName->insert(0, parent_name->c_str() + 2, parent_name->getLength() - 2); // Remove the unicode BOM + } else { + int tmp_length; + char *tmp_str = pdfDocEncodingToUTF16(parent_name->toStr(), &tmp_length); + fullyQualifiedName->insert(0, tmp_str + 2, tmp_length - 2); // Remove the unicode BOM + delete[] tmp_str; + } + } else { + fullyQualifiedName->insert(0, '.'); // 1-byte ascii period + if (hasUnicodeByteOrderMark(parent_name->toStr())) { + unicode_encoded = true; + fullyQualifiedName = convertToUtf16(fullyQualifiedName); + fullyQualifiedName->insert(0, parent_name->c_str() + 2, parent_name->getLength() - 2); // Remove the unicode BOM + } else { + fullyQualifiedName->insert(0, parent_name); + } + } + } + parentObj = parentObj.getDict()->lookup("Parent", &parentRef); + if (parentRef != Ref::INVALID() && !parsedRefs.insert(parentRef.num).second) { + error(errSyntaxError, -1, "FormField: Loop while trying to look for Parents\n"); + return fullyQualifiedName; + } + } + + if (partialName) { + if (unicode_encoded) { + if (hasUnicodeByteOrderMark(partialName->toStr())) { + fullyQualifiedName->append(partialName->c_str() + 2, partialName->getLength() - 2); // Remove the unicode BOM + } else { + int tmp_length; + char *tmp_str = pdfDocEncodingToUTF16(partialName->toStr(), &tmp_length); + fullyQualifiedName->append(tmp_str + 2, tmp_length - 2); // Remove the unicode BOM + delete[] tmp_str; + } + } else { + if (hasUnicodeByteOrderMark(partialName->toStr())) { + unicode_encoded = true; + fullyQualifiedName = convertToUtf16(fullyQualifiedName); + fullyQualifiedName->append(partialName->c_str() + 2, partialName->getLength() - 2); // Remove the unicode BOM + } else { + fullyQualifiedName->append(partialName); + } + } + } else { + int len = fullyQualifiedName->getLength(); + // Remove the last period + if (unicode_encoded) { + if (len > 1) { + fullyQualifiedName->del(len - 2, 2); + } + } else { + if (len > 0) { + fullyQualifiedName->del(len - 1, 1); + } + } + } + + if (unicode_encoded) { + prependUnicodeByteOrderMark(fullyQualifiedName->toNonConstStr()); + } + + return fullyQualifiedName; +} + +void FormField::updateChildrenAppearance() +{ + // Recursively update each child's appearance + if (terminal) { + for (int i = 0; i < numChildren; i++) { + widgets[i]->updateWidgetAppearance(); + } + } else { + for (int i = 0; i < numChildren; i++) { + children[i]->updateChildrenAppearance(); + } + } +} + +void FormField::setReadOnly(bool value) +{ + if (value == readOnly) { + return; + } + + readOnly = value; + + Dict *dict = obj.getDict(); + + const Object obj1 = Form::fieldLookup(dict, "Ff"); + int flags = 0; + if (obj1.isInt()) { + flags = obj1.getInt(); + } + if (value) { + flags |= 1; + } else { + flags &= ~1; + } + + dict->set("Ff", Object(flags)); + xref->setModifiedObject(&obj, ref); + updateChildrenAppearance(); +} + +void FormField::reset(const std::vector &excludedFields) +{ + resetChildren(excludedFields); +} + +void FormField::resetChildren(const std::vector &excludedFields) +{ + if (!terminal) { + for (int i = 0; i < numChildren; i++) { + children[i]->reset(excludedFields); + } + } +} + +bool FormField::isAmongExcludedFields(const std::vector &excludedFields) +{ + Ref fieldRef; + + for (const std::string &field : excludedFields) { + if (field.compare(field.size() - 2, 2, " R") == 0) { + if (sscanf(field.c_str(), "%d %d R", &fieldRef.num, &fieldRef.gen) == 2 && fieldRef == getRef()) { + return true; + } + } else { + if (field == getFullyQualifiedName()->toStr()) { + return true; + } + } + } + + return false; +} + +FormField *FormField::findFieldByRef(Ref aref) +{ + if (terminal) { + if (this->getRef() == aref) { + return this; + } + } else { + for (int i = 0; i < numChildren; i++) { + FormField *result = children[i]->findFieldByRef(aref); + if (result) { + return result; + } + } + } + return nullptr; +} + +FormField *FormField::findFieldByFullyQualifiedName(const std::string &name) +{ + if (terminal) { + if (getFullyQualifiedName()->cmp(name.c_str()) == 0) { + return this; + } + } else { + for (int i = 0; i < numChildren; i++) { + FormField *result = children[i]->findFieldByFullyQualifiedName(name); + if (result) { + return result; + } + } + } + return nullptr; +} + +//------------------------------------------------------------------------ +// FormFieldButton +//------------------------------------------------------------------------ +FormFieldButton::FormFieldButton(PDFDoc *docA, Object &&dictObj, const Ref refA, FormField *parentA, std::set *usedParents) : FormField(docA, std::move(dictObj), refA, parentA, usedParents, formButton) +{ + Dict *dict = obj.getDict(); + active_child = -1; + noAllOff = false; + siblings = nullptr; + numSiblings = 0; + appearanceState.setToNull(); + defaultAppearanceState.setToNull(); + + btype = formButtonCheck; + Object obj1 = Form::fieldLookup(dict, "Ff"); + if (obj1.isInt()) { + int flags = obj1.getInt(); + + if (flags & 0x10000) { // 17 -> push button + btype = formButtonPush; + } else if (flags & 0x8000) { // 16 -> radio button + btype = formButtonRadio; + if (flags & 0x4000) { // 15 -> noToggleToOff + noAllOff = true; + } + } + if (flags & 0x1000000) { // 26 -> radiosInUnison + error(errUnimplemented, -1, "FormFieldButton:: radiosInUnison flag unimplemented, please report a bug with a testcase\n"); + } + } + + bool isChildRadiobutton = btype == formButtonRadio && terminal && parent && parent->getType() == formButton; + // Ignore "V" for child radiobuttons, so FormFieldButton::getState() does not use it and instead uses the + // "V" of the parent, which is the real value indicating the active field in the radio group. Issue #159 + if (btype != formButtonPush && !isChildRadiobutton) { + // Even though V is inheritable we are interested in the value of this + // field, if not present it's probably because it's a button in a set. + appearanceState = dict->lookup("V"); + defaultAppearanceState = Form::fieldLookup(dict, "DV"); + } +} + +static const char *_getButtonType(FormButtonType type) +{ + switch (type) { + case formButtonPush: + return "push"; + case formButtonCheck: + return "check"; + case formButtonRadio: + return "radio"; + default: + break; + } + return "unknown"; +} + +void FormFieldButton::print(int indent) +{ + printf("%*s- (%d %d): [%s] terminal: %s children: %d\n", indent, "", ref.num, ref.gen, _getButtonType(btype), terminal ? "Yes" : "No", numChildren); +} + +void FormFieldButton::setNumSiblings(int num) +{ + numSiblings = num; + siblings = (FormFieldButton **)greallocn(siblings, numSiblings, sizeof(FormFieldButton *)); +} + +void FormFieldButton::fillChildrenSiblingsID() +{ + if (!terminal) { + for (int i = 0; i < numChildren; i++) { + FormFieldButton *child = dynamic_cast(children[i]); + if (child != nullptr) { + // Fill the siblings of this node childs + child->setNumSiblings(numChildren - 1); + for (int j = 0, counter = 0; j < numChildren; j++) { + FormFieldButton *otherChild = dynamic_cast(children[j]); + if (i == j) { + continue; + } + if (child == otherChild) { + continue; + } + child->setSibling(counter, otherChild); + counter++; + } + + // now call ourselves on the child + // to fill its children data + child->fillChildrenSiblingsID(); + } + } + } +} + +bool FormFieldButton::setState(const char *state, bool ignoreToggleOff) +{ + // A check button could behave as a radio button + // when it's in a set of more than 1 buttons + if (btype != formButtonRadio && btype != formButtonCheck) { + return false; + } + + if (terminal && parent && parent->getType() == formButton && appearanceState.isNull()) { + // It's button in a set, set state on parent + if (static_cast(parent)->setState(state)) { + return true; + } + return false; + } + + bool isOn = strcmp(state, "Off") != 0; + + if (!isOn && noAllOff && !ignoreToggleOff) { + return false; // Don't allow to set all radio to off + } + + const char *current = getAppearanceState(); + bool currentFound = false, newFound = false; + + for (int i = 0; i < numChildren; i++) { + FormWidgetButton *widget; + + // If radio button is a terminal field we want the widget at i, but + // if it's not terminal, the child widget is a composed dict, so + // we want the ony child widget of the children at i + if (terminal) { + widget = static_cast(widgets[i]); + } else { + widget = static_cast(children[i]->getWidget(0)); + } + + if (!widget->getOnStr()) { + continue; + } + + const char *onStr = widget->getOnStr(); + if (current && strcmp(current, onStr) == 0) { + widget->setAppearanceState("Off"); + if (!isOn) { + break; + } + currentFound = true; + } + + if (isOn && strcmp(state, onStr) == 0) { + widget->setAppearanceState(state); + newFound = true; + } + + if (currentFound && newFound) { + break; + } + } + + updateState(state); + + return true; +} + +bool FormFieldButton::getState(const char *state) const +{ + if (appearanceState.isName(state)) { + return true; + } + + return (parent && parent->getType() == formButton) ? static_cast(parent)->getState(state) : false; +} + +void FormFieldButton::updateState(const char *state) +{ + appearanceState = Object(objName, state); + obj.getDict()->set("V", appearanceState.copy()); + xref->setModifiedObject(&obj, ref); +} + +FormFieldButton::~FormFieldButton() +{ + if (siblings) { + gfree(siblings); + } +} + +void FormFieldButton::reset(const std::vector &excludedFields) +{ + if (!isAmongExcludedFields(excludedFields)) { + if (getDefaultAppearanceState()) { + setState(getDefaultAppearanceState()); + } else { + obj.getDict()->remove("V"); + + // Clear check button if it doesn't have default value. + // This behaviour is what Adobe Reader does, it is not written in specification. + if (btype == formButtonCheck) { + setState("Off"); + } + } + } + + resetChildren(excludedFields); +} + +//------------------------------------------------------------------------ +// FormFieldText +//------------------------------------------------------------------------ +FormFieldText::FormFieldText(PDFDoc *docA, Object &&dictObj, const Ref refA, FormField *parentA, std::set *usedParents) : FormField(docA, std::move(dictObj), refA, parentA, usedParents, formText) +{ + Dict *dict = obj.getDict(); + Object obj1; + content = nullptr; + internalContent = nullptr; + defaultContent = nullptr; + multiline = password = fileSelect = doNotSpellCheck = doNotScroll = comb = richText = false; + maxLen = 0; + + obj1 = Form::fieldLookup(dict, "Ff"); + if (obj1.isInt()) { + int flags = obj1.getInt(); + if (flags & 0x1000) { // 13 -> Multiline + multiline = true; + } + if (flags & 0x2000) { // 14 -> Password + password = true; + } + if (flags & 0x100000) { // 21 -> FileSelect + fileSelect = true; + } + if (flags & 0x400000) { // 23 -> DoNotSpellCheck + doNotSpellCheck = true; + } + if (flags & 0x800000) { // 24 -> DoNotScroll + doNotScroll = true; + } + if (flags & 0x1000000) { // 25 -> Comb + comb = true; + } + if (flags & 0x2000000) { // 26 -> RichText + richText = true; + } + } + + obj1 = Form::fieldLookup(dict, "MaxLen"); + if (obj1.isInt()) { + maxLen = obj1.getInt(); + } + + fillContent(fillDefaultValue); + fillContent(fillValue); +} + +void FormFieldText::fillContent(FillValueType fillType) +{ + Dict *dict = obj.getDict(); + Object obj1; + + obj1 = Form::fieldLookup(dict, fillType == fillDefaultValue ? "DV" : "V"); + if (obj1.isString()) { + if (hasUnicodeByteOrderMark(obj1.getString()->toStr())) { + if (obj1.getString()->getLength() > 2) { + if (fillType == fillDefaultValue) { + defaultContent = obj1.getString()->copy(); + } else { + content = obj1.getString()->copy(); + } + } + } else if (obj1.getString()->getLength() > 0) { + // non-unicode string -- assume pdfDocEncoding and try to convert to UTF16BE + int tmp_length; + char *tmp_str = pdfDocEncodingToUTF16(obj1.getString()->toStr(), &tmp_length); + + if (fillType == fillDefaultValue) { + defaultContent = new GooString(tmp_str, tmp_length); + } else { + content = new GooString(tmp_str, tmp_length); + } + + delete[] tmp_str; + } + } +} + +void FormFieldText::print(int indent) +{ + printf("%*s- (%d %d): [text] terminal: %s children: %d\n", indent, "", ref.num, ref.gen, terminal ? "Yes" : "No", numChildren); +} + +void FormFieldText::setContentCopy(const GooString *new_content) +{ + delete content; + content = nullptr; + + if (new_content) { + content = new_content->copy(); + + // append the unicode marker if needed + if (!hasUnicodeByteOrderMark(content->toStr())) { + prependUnicodeByteOrderMark(content->toNonConstStr()); + } + Form *form = doc->getCatalog()->getForm(); + if (form) { + DefaultAppearance da(defaultAppearance); + if (da.getFontName().isName()) { + const std::string fontName = da.getFontName().getName(); + if (!fontName.empty()) { + // Use the field resource dictionary if it exists + Object fieldResourcesDictObj = obj.dictLookup("DR"); + if (fieldResourcesDictObj.isDict()) { + GfxResources fieldResources(doc->getXRef(), fieldResourcesDictObj.getDict(), form->getDefaultResources()); + const std::vector 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(content, fontName); + } + } + } else { + // This is wrong, there has to be a Tf in DA + } + } + } + + obj.getDict()->set("V", Object(content ? content->copy() : new GooString(""))); + xref->setModifiedObject(&obj, ref); + updateChildrenAppearance(); +} + +void FormFieldText::setAppearanceContentCopy(const GooString *new_content) +{ + delete internalContent; + internalContent = nullptr; + + if (new_content) { + internalContent = new_content->copy(); + } + updateChildrenAppearance(); +} + +FormFieldText::~FormFieldText() +{ + delete content; + delete internalContent; + delete defaultContent; +} + +void FormFieldText::reset(const std::vector &excludedFields) +{ + if (!isAmongExcludedFields(excludedFields)) { + setContentCopy(defaultContent); + if (defaultContent == nullptr) { + obj.getDict()->remove("V"); + } + } + + resetChildren(excludedFields); +} + +double FormFieldText::getTextFontSize() +{ + std::vector daToks; + int idx = parseDA(&daToks); + double fontSize = -1; + if (idx >= 0) { + char *p = nullptr; + fontSize = strtod(daToks[idx].c_str(), &p); + if (!p || *p) { + fontSize = -1; + } + } + return fontSize; +} + +void FormFieldText::setTextFontSize(int fontSize) +{ + if (fontSize > 0 && obj.isDict()) { + std::vector daToks; + int idx = parseDA(&daToks); + if (idx == -1) { + error(errSyntaxError, -1, "FormFieldText:: invalid DA object\n"); + return; + } + if (defaultAppearance) { + delete defaultAppearance; + } + defaultAppearance = new GooString; + for (std::size_t i = 0; i < daToks.size(); ++i) { + if (i > 0) { + defaultAppearance->append(' '); + } + if (i == (std::size_t)idx) { + defaultAppearance->appendf("{0:d}", fontSize); + } else { + defaultAppearance->append(daToks[i]); + } + } + obj.dictSet("DA", Object(defaultAppearance->copy())); + xref->setModifiedObject(&obj, ref); + updateChildrenAppearance(); + } +} + +int FormFieldText::tokenizeDA(const std::string &da, std::vector *daToks, const char *searchTok) +{ + int idx = -1; + if (daToks) { + size_t i = 0; + size_t j = 0; + while (i < da.size()) { + while (i < da.size() && Lexer::isSpace(da[i])) { + ++i; + } + if (i < da.size()) { + for (j = i + 1; j < da.size() && !Lexer::isSpace(da[j]); ++j) { } + std::string tok(da, i, j - i); + if (searchTok && tok == searchTok) { + idx = daToks->size(); + } + daToks->emplace_back(std::move(tok)); + i = j; + } + } + } + return idx; +} + +int FormFieldText::parseDA(std::vector *daToks) +{ + int idx = -1; + if (obj.isDict()) { + Object objDA(obj.dictLookup("DA")); + if (objDA.isString()) { + const GooString *da = objDA.getString(); + idx = tokenizeDA(da->toStr(), daToks, "Tf") - 1; + } + } + return idx; +} + +//------------------------------------------------------------------------ +// FormFieldChoice +//------------------------------------------------------------------------ +FormFieldChoice::FormFieldChoice(PDFDoc *docA, Object &&aobj, const Ref refA, FormField *parentA, std::set *usedParents) : FormField(docA, std::move(aobj), refA, parentA, usedParents, formChoice) +{ + numChoices = 0; + choices = nullptr; + defaultChoices = nullptr; + editedChoice = nullptr; + topIdx = 0; + + Dict *dict = obj.getDict(); + Object obj1; + + combo = edit = multiselect = doNotSpellCheck = doCommitOnSelChange = false; + + obj1 = Form::fieldLookup(dict, "Ff"); + if (obj1.isInt()) { + int flags = obj1.getInt(); + if (flags & 0x20000) { // 18 -> Combo + combo = true; + } + if (flags & 0x40000) { // 19 -> Edit + edit = true; + } + if (flags & 0x200000) { // 22 -> MultiSelect + multiselect = true; + } + if (flags & 0x400000) { // 23 -> DoNotSpellCheck + doNotSpellCheck = true; + } + if (flags & 0x4000000) { // 27 -> CommitOnSelChange + doCommitOnSelChange = true; + } + } + + 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"); + if (obj1.isArray()) { + numChoices = obj1.arrayGetLength(); + choices = new ChoiceOpt[numChoices]; + memset(choices, 0, sizeof(ChoiceOpt) * numChoices); + + for (int i = 0; i < numChoices; i++) { + Object obj2 = obj1.arrayGet(i); + if (obj2.isString()) { + choices[i].optionName = obj2.getString()->copy(); + } else if (obj2.isArray()) { // [Export_value, Displayed_text] + if (obj2.arrayGetLength() < 2) { + error(errSyntaxError, -1, "FormWidgetChoice:: invalid Opt entry -- array's length < 2\n"); + continue; + } + Object obj3 = obj2.arrayGet(0); + if (obj3.isString()) { + choices[i].exportVal = obj3.getString()->copy(); + } else { + error(errSyntaxError, -1, "FormWidgetChoice:: invalid Opt entry -- exported value not a string\n"); + } + + obj3 = obj2.arrayGet(1); + if (obj3.isString()) { + choices[i].optionName = obj3.getString()->copy(); + } else { + error(errSyntaxError, -1, "FormWidgetChoice:: invalid Opt entry -- choice name not a string\n"); + } + } else { + error(errSyntaxError, -1, "FormWidgetChoice:: invalid {0:d} Opt entry\n", i); + } + } + } else { + // empty choice + } + + // Find selected items + // Note: PDF specs say that /V has precedence over /I, but acroread seems to + // do the opposite. We do the same. + obj1 = Form::fieldLookup(dict, "I"); + if (obj1.isArray()) { + for (int i = 0; i < obj1.arrayGetLength(); i++) { + Object obj2 = obj1.arrayGet(i); + if (obj2.isInt() && obj2.getInt() >= 0 && obj2.getInt() < numChoices) { + choices[obj2.getInt()].selected = true; + } + } + } else { + // Note: According to PDF specs, /V should *never* contain the exportVal. + // However, if /Opt is an array of (exportVal,optionName) pairs, acroread + // seems to expect the exportVal instead of the optionName and so we do too. + fillChoices(fillValue); + } + + fillChoices(fillDefaultValue); +} + +void FormFieldChoice::fillChoices(FillValueType fillType) +{ + const char *key = fillType == fillDefaultValue ? "DV" : "V"; + Dict *dict = obj.getDict(); + Object obj1; + + obj1 = Form::fieldLookup(dict, key); + if (obj1.isString() || obj1.isArray()) { + if (fillType == fillDefaultValue) { + defaultChoices = new bool[numChoices]; + memset(defaultChoices, 0, sizeof(bool) * numChoices); + } + + if (obj1.isString()) { + bool optionFound = false; + + for (int i = 0; i < numChoices; i++) { + if (choices[i].exportVal) { + if (choices[i].exportVal->cmp(obj1.getString()) == 0) { + optionFound = true; + } + } else if (choices[i].optionName) { + if (choices[i].optionName->cmp(obj1.getString()) == 0) { + optionFound = true; + } + } + + if (optionFound) { + if (fillType == fillDefaultValue) { + defaultChoices[i] = true; + } else { + choices[i].selected = true; + } + break; // We've determined that this option is selected. No need to keep on scanning + } + } + + // Set custom value if /V doesn't refer to any predefined option and the field is user-editable + if (fillType == fillValue && !optionFound && edit) { + editedChoice = obj1.getString()->copy(); + } + } else if (obj1.isArray()) { + for (int i = 0; i < numChoices; i++) { + for (int j = 0; j < obj1.arrayGetLength(); j++) { + const Object obj2 = obj1.arrayGet(j); + if (!obj2.isString()) { + error(errSyntaxError, -1, "FormWidgetChoice:: {0:s} array contains a non string object", key); + continue; + } + + bool matches = false; + + if (choices[i].exportVal) { + if (choices[i].exportVal->cmp(obj2.getString()) == 0) { + matches = true; + } + } else if (choices[i].optionName) { + if (choices[i].optionName->cmp(obj2.getString()) == 0) { + matches = true; + } + } + + if (matches) { + if (fillType == fillDefaultValue) { + defaultChoices[i] = true; + } else { + choices[i].selected = true; + } + break; // We've determined that this option is selected. No need to keep on scanning + } + } + } + } + } +} + +FormFieldChoice::~FormFieldChoice() +{ + for (int i = 0; i < numChoices; i++) { + delete choices[i].exportVal; + delete choices[i].optionName; + } + delete[] choices; + delete[] defaultChoices; + delete editedChoice; +} + +void FormFieldChoice::print(int indent) +{ + printf("%*s- (%d %d): [choice] terminal: %s children: %d\n", indent, "", ref.num, ref.gen, terminal ? "Yes" : "No", numChildren); +} + +void FormFieldChoice::updateSelection() +{ + Object objV; + Object objI(objNull); + + if (edit && editedChoice) { + // This is an editable combo-box with user-entered text + objV = Object(editedChoice->copy()); + } else { + const int numSelected = getNumSelected(); + + // Create /I array only if multiple selection is allowed (as per PDF spec) + if (multiselect) { + objI = Object(new Array(xref)); + } + + if (numSelected == 0) { + // No options are selected + objV = Object(new GooString("")); + } else if (numSelected == 1) { + // Only one option is selected + for (int i = 0; i < numChoices; i++) { + if (choices[i].selected) { + if (multiselect) { + objI.arrayAdd(Object(i)); + } + + if (choices[i].exportVal) { + objV = Object(choices[i].exportVal->copy()); + } else if (choices[i].optionName) { + objV = Object(choices[i].optionName->copy()); + } + + break; // We've just written the selected option. No need to keep on scanning + } + } + } else { + // More than one option is selected + objV = Object(new Array(xref)); + for (int i = 0; i < numChoices; i++) { + if (choices[i].selected) { + if (multiselect) { + objI.arrayAdd(Object(i)); + } + + if (choices[i].exportVal) { + objV.arrayAdd(Object(choices[i].exportVal->copy())); + } else if (choices[i].optionName) { + objV.arrayAdd(Object(choices[i].optionName->copy())); + } + } + } + } + } + + obj.getDict()->set("V", std::move(objV)); + obj.getDict()->set("I", std::move(objI)); + xref->setModifiedObject(&obj, ref); + updateChildrenAppearance(); +} + +void FormFieldChoice::unselectAll() +{ + for (int i = 0; i < numChoices; i++) { + choices[i].selected = false; + } +} + +void FormFieldChoice::deselectAll() +{ + delete editedChoice; + editedChoice = nullptr; + + unselectAll(); + updateSelection(); +} + +void FormFieldChoice::toggle(int i) +{ + delete editedChoice; + editedChoice = nullptr; + + choices[i].selected = !choices[i].selected; + updateSelection(); +} + +void FormFieldChoice::select(int i) +{ + delete editedChoice; + editedChoice = nullptr; + + if (!multiselect) { + unselectAll(); + } + + choices[i].selected = true; + updateSelection(); +} + +void FormFieldChoice::setEditChoice(const GooString *new_content) +{ + delete editedChoice; + editedChoice = nullptr; + + unselectAll(); + + if (new_content) { + editedChoice = new_content->copy(); + + // append the unicode marker if needed + if (!hasUnicodeByteOrderMark(editedChoice->toStr())) { + prependUnicodeByteOrderMark(editedChoice->toNonConstStr()); + } + } + updateSelection(); +} + +const GooString *FormFieldChoice::getEditChoice() const +{ + return editedChoice; +} + +int FormFieldChoice::getNumSelected() +{ + int cnt = 0; + for (int i = 0; i < numChoices; i++) { + if (choices[i].selected) { + cnt++; + } + } + return cnt; +} + +const GooString *FormFieldChoice::getSelectedChoice() const +{ + if (edit && editedChoice) { + return editedChoice; + } + + for (int i = 0; i < numChoices; i++) { + if (choices[i].optionName && choices[i].selected) { + return choices[i].optionName; + } + } + + return nullptr; +} + +void FormFieldChoice::reset(const std::vector &excludedFields) +{ + if (!isAmongExcludedFields(excludedFields)) { + delete editedChoice; + editedChoice = nullptr; + + if (defaultChoices) { + for (int i = 0; i < numChoices; i++) { + choices[i].selected = defaultChoices[i]; + } + } else { + unselectAll(); + } + } + + resetChildren(excludedFields); + + updateSelection(); +} + +//------------------------------------------------------------------------ +// FormFieldSignature +//------------------------------------------------------------------------ +FormFieldSignature::FormFieldSignature(PDFDoc *docA, Object &&dict, const Ref refA, FormField *parentA, std::set *usedParents) + : FormField(docA, std::move(dict), refA, parentA, usedParents, formSignature), signature_type(unsigned_signature_field), signature(nullptr) +{ + signature_info = new SignatureInfo(); + parseInfo(); +} + +FormFieldSignature::~FormFieldSignature() +{ + delete signature_info; + delete signature; +} + +void FormFieldSignature::setSignature(const GooString &sig) +{ + delete signature; + signature = sig.copy(); +} + +const GooString &FormFieldSignature::getCustomAppearanceContent() const +{ + return customAppearanceContent; +} + +void FormFieldSignature::setCustomAppearanceContent(const GooString &s) +{ + customAppearanceContent = GooString(s.toStr()); +} + +const GooString &FormFieldSignature::getCustomAppearanceLeftContent() const +{ + return customAppearanceLeftContent; +} + +void FormFieldSignature::setCustomAppearanceLeftContent(const GooString &s) +{ + customAppearanceLeftContent = GooString(s.toStr()); +} + +double FormFieldSignature::getCustomAppearanceLeftFontSize() const +{ + return customAppearanceLeftFontSize; +} + +void FormFieldSignature::setCustomAppearanceLeftFontSize(double size) +{ + customAppearanceLeftFontSize = size; +} + +Ref FormFieldSignature::getImageResource() const +{ + return imageResource; +} + +void FormFieldSignature::setImageResource(const Ref imageResourceA) +{ + imageResource = imageResourceA; +} + +void FormFieldSignature::setCertificateInfo(std::unique_ptr &certInfo) +{ + certificate_info.swap(certInfo); +} + +FormWidget *FormFieldSignature::getCreateWidget() +{ + ::FormWidget *fw = getWidget(0); + if (!fw) { + error(errSyntaxError, 0, "FormFieldSignature: was asked for widget and didn't had one, creating it"); + _createWidget(&obj, ref); + fw = getWidget(0); + fw->createWidgetAnnotation(); + } + return fw; +} + +void FormFieldSignature::parseInfo() +{ + if (!obj.isDict()) { + return; + } + + // retrieve PKCS#7 + Object sig_dict = obj.dictLookup("V"); + if (!sig_dict.isDict()) { + return; + } + + Object contents_obj = sig_dict.dictLookup("Contents"); + if (contents_obj.isString()) { + signature = contents_obj.getString()->copy(); + } + + byte_range = sig_dict.dictLookup("ByteRange"); + + const Object location_obj = sig_dict.dictLookup("Location"); + if (location_obj.isString()) { + signature_info->setLocation(location_obj.getString()); + } + + const Object reason_obj = sig_dict.dictLookup("Reason"); + if (reason_obj.isString()) { + signature_info->setReason(reason_obj.getString()); + } + + // retrieve SigningTime + Object time_of_signing = sig_dict.dictLookup("M"); + if (time_of_signing.isString()) { + const GooString *time_str = time_of_signing.getString(); + signature_info->setSigningTime(dateStringToTime(time_str)); // Put this information directly in SignatureInfo object + } + + // check if subfilter is supported for signature validation, only detached signatures work for now + Object subfilterName = sig_dict.dictLookup("SubFilter"); + if (subfilterName.isName("adbe.pkcs7.sha1")) { + signature_type = adbe_pkcs7_sha1; + signature_info->setSubFilterSupport(true); + } else if (subfilterName.isName("adbe.pkcs7.detached")) { + signature_type = adbe_pkcs7_detached; + signature_info->setSubFilterSupport(true); + } else if (subfilterName.isName("ETSI.CAdES.detached")) { + signature_type = ETSI_CAdES_detached; + signature_info->setSubFilterSupport(true); + } else { + signature_type = unknown_signature_type; + } +} + +void FormFieldSignature::hashSignedDataBlock(CryptoSign::VerificationInterface *handler, Goffset block_len) +{ + if (!handler) { + return; + } + const int BLOCK_SIZE = 4096; + unsigned char signed_data_buffer[BLOCK_SIZE]; + + Goffset i = 0; + while (i < block_len) { + Goffset bytes_left = block_len - i; + if (bytes_left < BLOCK_SIZE) { + doc->getBaseStream()->doGetChars(static_cast(bytes_left), signed_data_buffer); + handler->addData(signed_data_buffer, static_cast(bytes_left)); + i = block_len; + } else { + doc->getBaseStream()->doGetChars(BLOCK_SIZE, signed_data_buffer); + handler->addData(signed_data_buffer, BLOCK_SIZE); + i += BLOCK_SIZE; + } + } +} + +FormSignatureType FormWidgetSignature::signatureType() const +{ + return static_cast(field)->getSignatureType(); +} + +void FormWidgetSignature::setSignatureType(FormSignatureType fst) +{ + static_cast(field)->setSignatureType(fst); +} + +SignatureInfo *FormFieldSignature::validateSignatureAsync(bool doVerifyCert, bool forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool enableAIA, const std::function &doneCallback) +{ + auto backend = CryptoSign::Factory::createActive(); + if (!backend) { + if (doneCallback) { + doneCallback(); + } + return signature_info; + } + + if (signature_info->getSignatureValStatus() != SIGNATURE_NOT_VERIFIED && !forceRevalidation) { + if (doneCallback) { + doneCallback(); + } + return signature_info; + } + + if (signature == nullptr) { + error(errSyntaxError, 0, "Invalid or missing Signature string"); + if (doneCallback) { + doneCallback(); + } + return signature_info; + } + + if (!byte_range.isArray()) { + error(errSyntaxError, 0, "Invalid or missing ByteRange array"); + if (doneCallback) { + doneCallback(); + } + return signature_info; + } + + int arrayLen = byte_range.arrayGetLength(); + if (arrayLen < 2) { + error(errSyntaxError, 0, "Too few elements in ByteRange array"); + if (doneCallback) { + doneCallback(); + } + return signature_info; + } + + const int signature_len = signature->getLength(); + std::vector signatureData(signature_len); + memcpy(signatureData.data(), signature->c_str(), signature_len); + signature_handler = backend->createVerificationHandler(std::move(signatureData)); + + Goffset fileLength = doc->getBaseStream()->getLength(); + for (int i = 0; i < arrayLen / 2; i++) { + Object offsetObj = byte_range.arrayGet(i * 2); + Object lenObj = byte_range.arrayGet(i * 2 + 1); + + if (!offsetObj.isIntOrInt64() || !lenObj.isIntOrInt64()) { + error(errSyntaxError, 0, "Illegal values in ByteRange array"); + if (doneCallback) { + doneCallback(); + } + return signature_info; + } + + Goffset offset = offsetObj.getIntOrInt64(); + Goffset len = lenObj.getIntOrInt64(); + + if (offset < 0 || offset >= fileLength || len < 0 || len > fileLength || offset + len > fileLength) { + error(errSyntaxError, 0, "Illegal values in ByteRange array"); + if (doneCallback) { + doneCallback(); + } + return signature_info; + } + + doc->getBaseStream()->setPos(offset); + hashSignedDataBlock(signature_handler.get(), len); + } + + if (!signature_info->isSubfilterSupported()) { + error(errUnimplemented, 0, "Unable to validate this type of signature"); + if (doneCallback) { + doneCallback(); + } + return signature_info; + } + const SignatureValidationStatus sig_val_state = signature_handler->validateSignature(); + signature_info->setSignatureValStatus(sig_val_state); + signature_info->setSignerName(signature_handler->getSignerName()); + signature_info->setSubjectDN(signature_handler->getSignerSubjectDN()); + signature_info->setHashAlgorithm(signature_handler->getHashAlgorithm()); + + // verify if signature contains a 'signing time' attribute + if (signature_handler->getSigningTime() != std::chrono::system_clock::time_point {}) { + signature_info->setSigningTime(std::chrono::system_clock::to_time_t(signature_handler->getSigningTime())); + } + + signature_info->setCertificateInfo(signature_handler->getCertificateInfo()); + + if (sig_val_state != SIGNATURE_VALID || !doVerifyCert) { + if (doneCallback) { + doneCallback(); + } + return signature_info; + } + + signature_handler->validateCertificateAsync(std::chrono::system_clock::from_time_t(validationTime), ocspRevocationCheck, enableAIA, doneCallback); + + return signature_info; +} + +CertificateValidationStatus FormFieldSignature::validateSignatureResult() +{ + if (!signature_handler) { + return CERTIFICATE_GENERIC_ERROR; + } + return signature_handler->validateCertificateResult(); +} + +std::vector FormFieldSignature::getSignedRangeBounds() const +{ + std::vector range_vec; + if (byte_range.isArray()) { + if (byte_range.arrayGetLength() == 4) { + for (int i = 0; i < 2; ++i) { + const Object offsetObj(byte_range.arrayGet(2 * i)); + const Object lenObj(byte_range.arrayGet(2 * i + 1)); + if (offsetObj.isIntOrInt64() && lenObj.isIntOrInt64()) { + const Goffset offset = offsetObj.getIntOrInt64(); + const Goffset len = lenObj.getIntOrInt64(); + range_vec.push_back(offset); + range_vec.push_back(offset + len); + } + } + } + } + return range_vec; +} + +std::optional FormFieldSignature::getCheckedSignature(Goffset *checkedFileSize) +{ + Goffset start = 0; + Goffset end = 0; + const std::vector ranges = getSignedRangeBounds(); + if (ranges.size() == 4) { + start = ranges[1]; + end = ranges[2]; + } + if (end >= start + 6) { + BaseStream *stream = doc->getBaseStream(); + *checkedFileSize = stream->getLength(); + Goffset len = end - start; + stream->setPos(end - 1); + int c2 = stream->lookChar(); + stream->setPos(start); + int c1 = stream->getChar(); + // PDF signatures are first ASN1 DER, then hex encoded PKCS#7 structures, + // possibly padded with 0 characters and enclosed in '<' and '>'. + // The ASN1 DER encoding of a PKCS#7 structure must start with the tag 0x30 + // for SEQUENCE. The next byte must be 0x80 for ASN1 DER indefinite length + // encoding or (0x80 + n) for ASN1 DER definite length encoding + // where n is the number of subsequent "length bytes" which big-endian + // encode the length of the content of the SEQUENCE following them. + if (len <= std::numeric_limits::max() && *checkedFileSize > end && c1 == '<' && c2 == '>') { + GooString gstr; + ++start; + --end; + len = end - start; + Goffset pos = 0; + do { + c1 = stream->getChar(); + if (c1 == EOF) { + return {}; + } + gstr.append(static_cast(c1)); + } while (++pos < len); + if (gstr.getChar(0) == '3' && gstr.getChar(1) == '0') { + if (gstr.getChar(2) == '8' && gstr.getChar(3) == '0') { + // ASN1 DER indefinite length encoding: + // We only check that all characters up to the enclosing '>' + // are hex characters and that there are two hex encoded 0 bytes + // just before the enclosing '>' marking the end of the indefinite + // length encoding. + int paddingCount = 0; + while (gstr.getChar(len - 1) == '0' && gstr.getChar(len - 2) == '0') { + ++paddingCount; + len -= 2; + } + if (paddingCount < 2 || len % 2 == 1) { + len = 0; + } + } else if (gstr.getChar(2) == '8') { + // ASN1 DER definite length encoding: + // We calculate the length of the following bytes from the length bytes and + // check that after the length bytes and the following calculated number of + // bytes all bytes up to the enclosing '>' character are hex encoded 0 bytes. + int lenBytes = gstr.getChar(3) - '0'; + if (lenBytes > 0 && lenBytes <= 4) { + int sigLen = 0; + for (int i = 0; i < 2 * lenBytes; ++i) { + sigLen <<= 4; + char c = gstr.getChar(i + 4); + if (isdigit(c)) { + sigLen += c - '0'; + } else if (isxdigit(c) && c >= 'a') { + sigLen += c - 'a' + 10; + } else if (isxdigit(c) && c >= 'A') { + sigLen += c - 'A' + 10; + } else { + len = 0; + break; + } + } + if (sigLen > 0 && 2 * (sigLen + lenBytes) <= len - 4) { + for (Goffset i = 2 * (sigLen + lenBytes) + 4; i < len; ++i) { + if (gstr.getChar(i) != '0') { + len = 0; + break; + } + } + } else { + len = 0; + } + } + } + for (const char c : gstr.toStr()) { + if (!isxdigit(c)) { + len = 0; + } + } + if (len > 0) { + return GooString(&gstr, 0, len); + } + } + } + } + return {}; +} + +void FormFieldSignature::print(int indent) +{ + printf("%*s- (%d %d): [signature] terminal: %s children: %d\n", indent, "", ref.num, ref.gen, terminal ? "Yes" : "No", numChildren); +} + +//------------------------------------------------------------------------ +// Form +//------------------------------------------------------------------------ + +Form::Form(PDFDoc *docA) : doc(docA) +{ + Object obj1; + + XRef *xref = doc->getXRef(); + + size = 0; + numFields = 0; + rootFields = nullptr; + quadding = VariableTextQuadding::leftJustified; + defaultAppearance = nullptr; + defaultResources = nullptr; + + Object *acroForm = doc->getCatalog()->getAcroForm(); + + needAppearances = acroForm->dictLookup("NeedAppearances").getBoolWithDefaultValue(false); + + obj1 = acroForm->dictLookup("DA"); + if (obj1.isString()) { + defaultAppearance = obj1.getString()->copy(); + } + + obj1 = acroForm->dictLookup("Q"); + if (obj1.isInt()) { + const VariableTextQuadding aux = static_cast(obj1.getInt()); + if (aux == VariableTextQuadding::leftJustified || aux == VariableTextQuadding::centered || aux == VariableTextQuadding::rightJustified) { + quadding = static_cast(aux); + } + } + + resDict = acroForm->dictLookup("DR"); + if (resDict.isDict()) { + // At a minimum, this dictionary shall contain a Font entry + obj1 = resDict.dictLookup("Font"); + if (obj1.isDict()) { + defaultResources = new GfxResources(xref, resDict.getDict(), nullptr); + } + } + if (!defaultResources) { + resDict.setToNull(); + } + + obj1 = acroForm->dictLookup("Fields"); + if (obj1.isArray()) { + Array *array = obj1.getArray(); + std::set alreadyReadRefs; + for (int i = 0; i < array->getLength(); i++) { + Object obj2 = array->get(i); + const Object &oref = array->getNF(i); + if (!oref.isRef()) { + error(errSyntaxWarning, -1, "Direct object in rootFields"); + continue; + } + + if (!obj2.isDict()) { + error(errSyntaxWarning, -1, "Reference in Fields array to an invalid or non existent object"); + continue; + } + + if (alreadyReadRefs.find(oref.getRef()) != alreadyReadRefs.end()) { + continue; + } + alreadyReadRefs.insert(oref.getRef()); + + if (numFields >= size) { + size += 16; + rootFields = (FormField **)greallocn(rootFields, size, sizeof(FormField *)); + } + + std::set usedParents; + rootFields[numFields++] = createFieldFromDict(std::move(obj2), doc, oref.getRef(), nullptr, &usedParents); + } + } else { + error(errSyntaxError, -1, "Can't get Fields array\n"); + } + + obj1 = acroForm->dictLookup("CO"); + if (obj1.isArray()) { + Array *array = obj1.getArray(); + calculateOrder.reserve(array->getLength()); + for (int i = 0; i < array->getLength(); i++) { + const Object &oref = array->getNF(i); + if (!oref.isRef()) { + error(errSyntaxWarning, -1, "Direct object in CO"); + continue; + } + calculateOrder.push_back(oref.getRef()); + } + } + + // for (int i = 0; i < numFields; i++) + // rootFields[i]->printTree(); +} + +Form::~Form() +{ + int i; + for (i = 0; i < numFields; ++i) { + delete rootFields[i]; + } + gfree(rootFields); + delete defaultAppearance; + delete defaultResources; +} + +// Look up an inheritable field dictionary entry. +static Object fieldLookup(Dict *field, const char *key, std::set *usedParents) +{ + Dict *dict = field; + Object obj = dict->lookup(key); + if (!obj.isNull()) { + return obj; + } + const Object &parent = dict->lookupNF("Parent"); + if (parent.isRef()) { + const Ref ref = parent.getRef(); + if (usedParents->find(ref.num) == usedParents->end()) { + usedParents->insert(ref.num); + + Object obj2 = parent.fetch(dict->getXRef()); + if (obj2.isDict()) { + return fieldLookup(obj2.getDict(), key, usedParents); + } + } + } else if (parent.isDict()) { + return fieldLookup(parent.getDict(), key, usedParents); + } + return Object(objNull); +} + +Object Form::fieldLookup(Dict *field, const char *key) +{ + std::set usedParents; + return ::fieldLookup(field, key, &usedParents); +} + +FormField *Form::createFieldFromDict(Object &&obj, PDFDoc *docA, const Ref aref, FormField *parent, std::set *usedParents) +{ + FormField *field; + + const Object obj2 = Form::fieldLookup(obj.getDict(), "FT"); + if (obj2.isName("Btn")) { + field = new FormFieldButton(docA, std::move(obj), aref, parent, usedParents); + } else if (obj2.isName("Tx")) { + field = new FormFieldText(docA, std::move(obj), aref, parent, usedParents); + } else if (obj2.isName("Ch")) { + field = new FormFieldChoice(docA, std::move(obj), aref, parent, usedParents); + } else if (obj2.isName("Sig")) { + field = new FormFieldSignature(docA, std::move(obj), aref, parent, usedParents); + } else { // we don't have an FT entry => non-terminal field + field = new FormField(docA, std::move(obj), aref, parent, usedParents); + } + + return field; +} + +static const std::string kOurDictFontNamePrefix = "popplerfont"; + +std::string Form::findFontInDefaultResources(const std::string &fontFamily, const std::string &fontStyle) const +{ + if (!resDict.isDict()) { + return {}; + } + + const std::string fontFamilyAndStyle = fontStyle.empty() ? fontFamily : fontFamily + " " + fontStyle; + + Object fontDictObj = resDict.dictLookup("Font"); + assert(fontDictObj.isDict()); + + const Dict *fontDict = fontDictObj.getDict(); + for (int i = 0; i < fontDict->getLength(); ++i) { + const char *key = fontDict->getKey(i); + if (std::string_view(key).starts_with(kOurDictFontNamePrefix)) { + const Object fontObj = fontDict->getVal(i); + if (fontObj.isDict() && fontObj.dictIs("Font")) { + const Object fontBaseFontObj = fontObj.dictLookup("BaseFont"); + if (fontBaseFontObj.isName(fontFamilyAndStyle.c_str())) { + return key; + } + } + } + } + + return {}; +} + +Form::AddFontResult Form::addFontToDefaultResources(const std::string &fontFamily, const std::string &fontStyle, bool forceName) +{ + FamilyStyleFontSearchResult findFontRes = globalParams->findSystemFontFileForFamilyAndStyle(fontFamily, fontStyle); + std::vector filesToIgnore; + while (!findFontRes.filepath.empty()) { + Form::AddFontResult addFontRes = addFontToDefaultResources(findFontRes.filepath, findFontRes.faceIndex, fontFamily, fontStyle, forceName); + if (!addFontRes.fontName.empty()) { + return addFontRes; + } + filesToIgnore.emplace_back(findFontRes.filepath); + findFontRes = globalParams->findSystemFontFileForFamilyAndStyle(fontFamily, fontStyle, filesToIgnore); + } + return {}; +} + +Form::AddFontResult Form::addFontToDefaultResources(const std::string &filepath, int faceIndex, const std::string &fontFamily, const std::string &fontStyle, bool forceName) +{ + if (!filepath.ends_with(".ttf") && !filepath.ends_with(".ttc") && !filepath.ends_with(".otf")) { + error(errIO, -1, "We only support embedding ttf/ttc/otf fonts for now. The font file for {0:s} {1:s} was {2:s}", fontFamily.c_str(), fontStyle.c_str(), filepath.c_str()); + return {}; + } + + const FoFiIdentifierType fontFoFiType = FoFiIdentifier::identifyFile(filepath.c_str()); + if (fontFoFiType != fofiIdTrueType && fontFoFiType != fofiIdTrueTypeCollection && fontFoFiType != fofiIdOpenTypeCFF8Bit && fontFoFiType != fofiIdOpenTypeCFFCID) { + error(errIO, -1, "We only support embedding ttf/ttc/otf fonts for now. The font file for {0:s} {1:s} was {2:s} of type {3:d}", fontFamily.c_str(), fontStyle.c_str(), filepath.c_str(), fontFoFiType); + return {}; + } + + const std::string fontFamilyAndStyle = fontStyle.empty() ? fontFamily : fontFamily + " " + fontStyle; + + if (forceName && defaultResources && defaultResources->lookupFont(fontFamilyAndStyle.c_str())) { + error(errInternal, -1, "Form::addFontToDefaultResources: Asked to forceName but font name exists {0:s}", fontFamilyAndStyle.c_str()); + return {}; + } + + XRef *xref = doc->getXRef(); + Object fontDict(new Dict(xref)); + fontDict.dictSet("Type", Object(objName, "Font")); + fontDict.dictSet("Subtype", Object(objName, "Type0")); + fontDict.dictSet("BaseFont", Object(objName, fontFamilyAndStyle.c_str())); + + fontDict.dictSet("Encoding", Object(objName, "Identity-H")); + + { + std::unique_ptr descendantFonts = std::make_unique(xref); + + const bool isTrueType = (fontFoFiType == fofiIdTrueType || fontFoFiType == fofiIdTrueTypeCollection); + std::unique_ptr descendantFont = std::make_unique(xref); + descendantFont->set("Type", Object(objName, "Font")); + descendantFont->set("Subtype", Object(objName, isTrueType ? "CIDFontType2" : "CIDFontType0")); + descendantFont->set("BaseFont", Object(objName, fontFamilyAndStyle.c_str())); + + { + // We only support fonts with identity cmaps for now + Dict *cidSystemInfo = new Dict(xref); + cidSystemInfo->set("Registry", Object(new GooString("Adobe"))); + cidSystemInfo->set("Ordering", Object(new GooString("Identity"))); + cidSystemInfo->set("Supplement", Object(0)); + descendantFont->set("CIDSystemInfo", Object(cidSystemInfo)); + } + + FT_Library freetypeLib; + if (FT_Init_FreeType(&freetypeLib)) { + error(errIO, -1, "FT_Init_FreeType failed"); + return {}; + } + const std::unique_ptr freetypeLibDeleter(&freetypeLib, [](FT_Library *l) { FT_Done_FreeType(*l); }); + + FT_Face face; + if (ft_new_face_from_file(freetypeLib, filepath.c_str(), faceIndex, &face)) { + error(errIO, -1, "ft_new_face_from_file failed for {0:s}", filepath.c_str()); + return {}; + } + const std::unique_ptr faceDeleter(&face, [](FT_Face *f) { FT_Done_Face(*f); }); + + if (FT_Set_Char_Size(face, 1000, 1000, 0, 0)) { + error(errIO, -1, "FT_Set_Char_Size failed for {0:s}", filepath.c_str()); + return {}; + } + + { + std::unique_ptr fontDescriptor = std::make_unique(xref); + fontDescriptor->set("Type", Object(objName, "FontDescriptor")); + fontDescriptor->set("FontName", Object(objName, fontFamilyAndStyle.c_str())); + + // a bit arbirary but the Flags field is mandatory... + const std::string lowerCaseFontFamily = GooString::toLowerCase(fontFamily); + if (lowerCaseFontFamily.find("serif") != std::string::npos && lowerCaseFontFamily.find("sans") == std::string::npos) { + fontDescriptor->set("Flags", Object(2)); // Serif + } else { + fontDescriptor->set("Flags", Object(0)); // Sans Serif + } + + Array *fontBBox = new Array(xref); + fontBBox->add(Object(static_cast(face->bbox.xMin))); + fontBBox->add(Object(static_cast(face->bbox.yMin))); + fontBBox->add(Object(static_cast(face->bbox.xMax))); + fontBBox->add(Object(static_cast(face->bbox.yMax))); + fontDescriptor->set("FontBBox", Object(fontBBox)); + + fontDescriptor->set("Ascent", Object(static_cast(face->ascender))); + + fontDescriptor->set("Descent", Object(static_cast(face->descender))); + + { + const std::unique_ptr file(GooFile::open(filepath)); + if (!file) { + error(errIO, -1, "Failed to open {0:s}", filepath.c_str()); + return {}; + } + const Goffset fileSize = file->size(); + if (fileSize < 0) { + error(errIO, -1, "Failed to get file size for {0:s}", filepath.c_str()); + return {}; + } + // GooFile::read only takes an integer so for now we don't support huge fonts + if (fileSize > std::numeric_limits::max()) { + error(errIO, -1, "Font size is too big {0:s}", filepath.c_str()); + return {}; + } + char *dataPtr = static_cast(gmalloc(fileSize)); + const Goffset bytesRead = file->read(dataPtr, static_cast(fileSize), 0); + if (bytesRead != fileSize) { + error(errIO, -1, "Failed to read contents of {0:s}", filepath.c_str()); + gfree(dataPtr); + return {}; + } + + if (isTrueType) { + const Ref fontFile2Ref = xref->addStreamObject(new Dict(xref), dataPtr, fileSize, StreamCompression::Compress); + fontDescriptor->set("FontFile2", Object(fontFile2Ref)); + } else { + Dict *fontFileStreamDict = new Dict(xref); + fontFileStreamDict->set("Subtype", Object(objName, "OpenType")); + const Ref fontFile3Ref = xref->addStreamObject(fontFileStreamDict, dataPtr, fileSize, StreamCompression::Compress); + fontDescriptor->set("FontFile3", Object(fontFile3Ref)); + } + } + + const Ref fontDescriptorRef = xref->addIndirectObject(Object(fontDescriptor.release())); + descendantFont->set("FontDescriptor", Object(fontDescriptorRef)); + } + + static const int basicMultilingualMaxCode = 65535; + + const std::unique_ptr fft = FoFiTrueType::load(filepath.c_str()); + if (fft) { + + // Look for the Unicode BMP cmaps, which are 0/3 or 3/1 + int unicodeBMPCMap = fft->findCmap(0, 3); + if (unicodeBMPCMap < 0) { + unicodeBMPCMap = fft->findCmap(3, 1); + } + if (unicodeBMPCMap < 0) { + error(errIO, -1, "Font does not have an unicode BMP cmap {0:s}", filepath.c_str()); + return {}; + } + + CIDFontsWidthsBuilder fontsWidths; + + for (int code = 0; code <= basicMultilingualMaxCode; ++code) { + const int glyph = fft->mapCodeToGID(unicodeBMPCMap, code); + if (FT_Load_Glyph(face, glyph, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING)) { + fontsWidths.addWidth(code, 0); + } else { + fontsWidths.addWidth(code, static_cast(face->glyph->metrics.horiAdvance)); + } + } + Array *widths = new Array(xref); + for (const auto &segment : fontsWidths.takeSegments()) { + std::visit( + [&widths, &xref](auto &&s) { + using T = std::decay_t; + if constexpr (std::is_same_v) { + widths->add(Object(s.first)); + auto widthsInner = std::make_unique(xref); + for (const auto &w : s.widths) { + widthsInner->add(Object(w)); + } + widths->add(Object(widthsInner.release())); + } else if constexpr (std::is_same_v) { + widths->add(Object(s.first)); + widths->add(Object(s.last)); + widths->add(Object(s.width)); + } else { + static_assert(always_false_v, "non-exhaustive visitor"); + } + }, + segment); + } + descendantFont->set("W", Object(widths)); + + char *dataPtr = static_cast(gmalloc(2 * (basicMultilingualMaxCode + 1))); + int i = 0; + + for (int code = 0; code <= basicMultilingualMaxCode; ++code) { + const int glyph = fft->mapCodeToGID(unicodeBMPCMap, code); + dataPtr[i++] = (unsigned char)(glyph >> 8); + dataPtr[i++] = (unsigned char)(glyph & 0xff); + } + const Ref cidToGidMapStream = xref->addStreamObject(new Dict(xref), dataPtr, basicMultilingualMaxCode * 2, StreamCompression::Compress); + descendantFont->set("CIDToGIDMap", Object(cidToGidMapStream)); + } + + descendantFonts->add(Object(descendantFont.release())); + + fontDict.dictSet("DescendantFonts", Object(descendantFonts.release())); + } + + const Ref fontDictRef = xref->addIndirectObject(fontDict); + + std::string dictFontName = forceName ? fontFamilyAndStyle : kOurDictFontNamePrefix; + Object *acroForm = doc->getCatalog()->getAcroForm(); + if (resDict.isDict()) { + Ref fontDictObjRef; + Object fontDictObj = resDict.getDict()->lookup("Font", &fontDictObjRef); + assert(fontDictObj.isDict()); + dictFontName = fontDictObj.getDict()->findAvailableKey(dictFontName); + fontDictObj.dictSet(dictFontName.c_str(), Object(fontDictRef)); + + if (fontDictObjRef != Ref::INVALID()) { + xref->setModifiedObject(&fontDictObj, fontDictObjRef); + } else { + Ref resDictRef; + acroForm->getDict()->lookup("DR", &resDictRef); + if (resDictRef != Ref::INVALID()) { + xref->setModifiedObject(&resDict, resDictRef); + } else { + doc->getCatalog()->setAcroFormModified(); + } + } + + // maybe we can do something to reuse the existing data instead of recreating from scratch? + delete defaultResources; + defaultResources = new GfxResources(xref, resDict.getDict(), nullptr); + } else { + Dict *fontsDict = new Dict(xref); + fontsDict->set(dictFontName.c_str(), Object(fontDictRef)); + + Dict *defaultResourcesDict = new Dict(xref); + defaultResourcesDict->set("Font", Object(fontsDict)); + + assert(!defaultResources); + defaultResources = new GfxResources(xref, defaultResourcesDict, nullptr); + resDict = Object(defaultResourcesDict); + + acroForm->dictSet("DR", resDict.copy()); + doc->getCatalog()->setAcroFormModified(); + } + + return { dictFontName, fontDictRef }; +} + +std::string Form::getFallbackFontForChar(Unicode uChar, const GfxFont &fontToEmulate) const +{ + const UCharFontSearchResult res = globalParams->findSystemFontFileForUChar(uChar, fontToEmulate); + + return findFontInDefaultResources(res.family, res.style); +} + +std::vector Form::ensureFontsForAllCharacters(const GooString *unicodeText, const std::string &pdfFontNameToEmulate, GfxResources *fieldResources) +{ + GfxResources *resources = fieldResources ? fieldResources : defaultResources; + std::shared_ptr f; + if (!resources) { + // There's no resources, so create one with the needed font name + addFontToDefaultResources(pdfFontNameToEmulate, "", /*forceName*/ true); + resources = defaultResources; + } + f = resources->lookupFont(pdfFontNameToEmulate.c_str()); + const CharCodeToUnicode *ccToUnicode = f ? f->getToUnicode() : nullptr; + if (!ccToUnicode) { + error(errInternal, -1, "Form::ensureFontsForAllCharacters: No ccToUnicode, this should not happen\n"); + return {}; // will never happen with current code + } + + std::vector newFonts; + + // If the text has some characters that are not available in the font, try adding a font for those + std::unordered_set seen; + for (int i = 2; i < unicodeText->getLength(); i += 2) { + Unicode uChar = (unsigned char)(unicodeText->getChar(i)) << 8; + uChar += (unsigned char)(unicodeText->getChar(i + 1)); + + if (uChar < 128 && !std::isprint(static_cast(uChar))) { + continue; + } + if (seen.find(uChar) != seen.end()) { + continue; + } + seen.insert(uChar); + + CharCode c; + bool addFont = false; + if (ccToUnicode->mapToCharCode(&uChar, &c, 1)) { + if (f->isCIDFont()) { + auto cidFont = static_cast(f.get()); + if (c < cidFont->getCIDToGIDLen() && c != 0 && c != '\r' && c != '\n') { + const int glyph = cidFont->getCIDToGID()[c]; + if (glyph == 0) { + addFont = true; + } + } + } + } else { + addFont = true; + } + + if (addFont) { + Form::AddFontResult res = doGetAddFontToDefaultResources(uChar, *f); + if (res.ref != Ref::INVALID()) { + newFonts.emplace_back(res); + } + } + } + + return newFonts; +} + +Form::AddFontResult Form::doGetAddFontToDefaultResources(Unicode uChar, const GfxFont &fontToEmulate) +{ + const UCharFontSearchResult res = globalParams->findSystemFontFileForUChar(uChar, fontToEmulate); + + std::string pdfFontName = findFontInDefaultResources(res.family, res.style); + if (pdfFontName.empty()) { + return addFontToDefaultResources(res.filepath, res.faceIndex, res.family, res.style); + } + return { pdfFontName, Ref::INVALID() }; +} + +void Form::postWidgetsLoad() +{ + // We create the widget annotations associated to + // every form widget here, because the AnnotWidget constructor + // needs the form object that gets from the catalog. When constructing + // a FormWidget the Catalog is still creating the form object + for (int i = 0; i < numFields; i++) { + rootFields[i]->fillChildrenSiblingsID(); + rootFields[i]->createWidgetAnnotations(); + } +} + +FormWidget *Form::findWidgetByRef(Ref aref) +{ + for (int i = 0; i < numFields; i++) { + FormWidget *result = rootFields[i]->findWidgetByRef(aref); + if (result) { + return result; + } + } + return nullptr; +} + +FormField *Form::findFieldByRef(Ref aref) const +{ + for (int i = 0; i < numFields; i++) { + FormField *result = rootFields[i]->findFieldByRef(aref); + if (result) { + return result; + } + } + return nullptr; +} + +FormField *Form::findFieldByFullyQualifiedName(const std::string &name) const +{ + for (int i = 0; i < numFields; i++) { + FormField *result = rootFields[i]->findFieldByFullyQualifiedName(name); + if (result) { + return result; + } + } + return nullptr; +} + +void Form::reset(const std::vector &fields, bool excludeFields) +{ + FormField *foundField; + const bool resetAllFields = fields.empty(); + + if (resetAllFields) { + for (int i = 0; i < numFields; i++) { + rootFields[i]->reset(std::vector()); + } + } else { + if (!excludeFields) { + for (const std::string &field : fields) { + Ref fieldRef; + + if (field.size() > 1 && field.compare(field.size() - 2, 2, " R") == 0 && sscanf(field.c_str(), "%d %d R", &fieldRef.num, &fieldRef.gen) == 2) { + foundField = findFieldByRef(fieldRef); + } else { + foundField = findFieldByFullyQualifiedName(field); + } + + if (foundField) { + foundField->reset(std::vector()); + } + } + } else { + for (int i = 0; i < numFields; i++) { + rootFields[i]->reset(fields); + } + } + } +} + +std::string Form::findPdfFontNameToUseForSigning() +{ + static constexpr std::array fontsToUseToSign = { "Helvetica", "Arial" }; + for (const char *fontToUseToSign : fontsToUseToSign) { + std::string pdfFontName = findFontInDefaultResources(fontToUseToSign, ""); + if (!pdfFontName.empty()) { + return pdfFontName; + } + + pdfFontName = addFontToDefaultResources(fontToUseToSign, "").fontName; + if (!pdfFontName.empty()) { + return pdfFontName; + } + } + + error(errInternal, -1, "Form::findPdfFontNameToUseForSigning: No suitable font found'\n"); + + return {}; +} + +//------------------------------------------------------------------------ +// FormPageWidgets +//------------------------------------------------------------------------ + +FormPageWidgets::FormPageWidgets(Annots *annots, unsigned int page, Form *form) +{ + numWidgets = 0; + widgets = nullptr; + size = 0; + + if (annots && !annots->getAnnots().empty() && form) { + size = annots->getAnnots().size(); + widgets = (FormWidget **)greallocn(widgets, size, sizeof(FormWidget *)); + + /* For each entry in the page 'Annots' dict, try to find + a matching form field */ + for (Annot *annot : annots->getAnnots()) { + + if (annot->getType() != Annot::typeWidget) { + continue; + } + + if (!annot->getHasRef()) { + /* Since all entry in a form field's kid dict needs to be + indirect references, if this annot isn't indirect, it isn't + related to a form field */ + continue; + } + + Ref r = annot->getRef(); + + /* Try to find a form field which either has this Annot in its Kids entry + or is merged with this Annot */ + FormWidget *tmp = form->findWidgetByRef(r); + if (tmp) { + // We've found a corresponding form field, link it + tmp->setID(FormWidget::encodeID(page, numWidgets)); + widgets[numWidgets++] = tmp; + } + } + } +} + +void FormPageWidgets::addWidgets(const std::vector &addedWidgets, unsigned int page) +{ + if (addedWidgets.empty()) { + return; + } + + size += addedWidgets.size(); + widgets = (FormWidget **)greallocn(widgets, size, sizeof(FormWidget *)); + + for (auto frmField : addedWidgets) { + FormWidget *frmWidget = frmField->getWidget(0); + frmWidget->setID(FormWidget::encodeID(page, numWidgets)); + widgets[numWidgets++] = frmWidget; + } +} + +FormPageWidgets::~FormPageWidgets() +{ + gfree(widgets); +} diff --git a/poppler-24.05.0/poppler/Form.h b/poppler-24.05.0/poppler/Form.h new file mode 100644 index 0000000000000000000000000000000000000000..f2b2d57a5e621cc5be41e1568e9984565383f11a --- /dev/null +++ b/poppler-24.05.0/poppler/Form.h @@ -0,0 +1,793 @@ +//======================================================================== +// +// Form.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2006 Julien Rebetez +// Copyright 2007, 2008, 2011 Carlos Garcia Campos +// Copyright 2007-2010, 2012, 2015-2023 Albert Astals Cid +// Copyright 2010 Mark Riedesel +// Copyright 2011 Pino Toscano +// Copyright 2012 Fabio D'Urso +// Copyright 2013 Adrian Johnson +// Copyright 2015 André Guerreiro +// Copyright 2015 André Esser +// Copyright 2017 Roland Hieber +// Copyright 2017 Hans-Ulrich Jüttner +// Copyright 2018 Andre Heinecke +// Copyright 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright 2018 Chinmoy Ranjan Pradhan +// Copyright 2019, 2020 Oliver Sander +// Copyright 2019 João Netto +// Copyright 2020, 2021 Nelson Benítez León +// Copyright 2020 Marek Kasik +// Copyright 2020 Thorsten Behrens +// Copyright 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden +// Copyright 2021 Georgiy Sgibnev . Work sponsored by lab50.net. +// Copyright 2021 Theofilos Intzoglou +// Copyright 2022 Alexander Sulfrian +// Copyright 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +//======================================================================== + +#ifndef FORM_H +#define FORM_H + +#include "Annot.h" +#include "CharTypes.h" +#include "Object.h" +#include "poppler_private_export.h" +#include "SignatureInfo.h" + +#include + +#include +#include +#include +#include + +class GooString; +class Array; +class Dict; +class Annot; +class AnnotWidget; +class Annots; +class LinkAction; +class GfxResources; +class PDFDoc; +class X509CertificateInfo; +namespace CryptoSign { +class VerificationInterface; +} + +enum FormFieldType +{ + formButton, + formText, + formChoice, + formSignature, + formUndef +}; + +enum FormButtonType +{ + formButtonCheck, + formButtonPush, + formButtonRadio +}; + +enum FormSignatureType +{ + adbe_pkcs7_sha1, + adbe_pkcs7_detached, + ETSI_CAdES_detached, + unknown_signature_type, + unsigned_signature_field +}; + +enum FillValueType +{ + fillValue, + fillDefaultValue +}; + +class Form; +class FormField; +class FormFieldButton; +class FormFieldText; +class FormFieldSignature; +class FormFieldChoice; + +//------------------------------------------------------------------------ +// FormWidget +// A FormWidget represents the graphical part of a field and is "attached" +// to a page. +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT FormWidget +{ +public: + virtual ~FormWidget(); + + // Check if point is inside the field bounding rect + bool inRect(double x, double y) const; + + // Get the field bounding rect + void getRect(double *x1, double *y1, double *x2, double *y2) const; + + unsigned getID() { return ID; } + void setID(unsigned int i) { ID = i; } + + FormField *getField() { return field; } + FormFieldType getType() { return type; } + + Object *getObj() { return &obj; } + Ref getRef() { return ref; } + + void setChildNum(unsigned i) { childNum = i; } + unsigned getChildNum() { return childNum; } + + const GooString *getPartialName() const; + void setPartialName(const GooString &name); + const GooString *getAlternateUiName() const; + const GooString *getMappingName() const; + GooString *getFullyQualifiedName(); + + bool isModified() const; + + bool isReadOnly() const; + void setReadOnly(bool value); + + LinkAction *getActivationAction(); // The caller should not delete the result + std::unique_ptr getAdditionalAction(Annot::FormAdditionalActionsType type); + bool setAdditionalAction(Annot::FormAdditionalActionsType t, const std::string &js); + + // return the unique ID corresponding to pageNum/fieldNum + static int encodeID(unsigned pageNum, unsigned fieldNum); + // decode id and retrieve pageNum and fieldNum + static void decodeID(unsigned id, unsigned *pageNum, unsigned *fieldNum); + + void createWidgetAnnotation(); + AnnotWidget *getWidgetAnnotation() const { return widget; } + void setWidgetAnnotation(AnnotWidget *_widget) { widget = _widget; } + + virtual void updateWidgetAppearance() = 0; + + void print(int indent = 0); + +protected: + FormWidget(PDFDoc *docA, Object *aobj, unsigned num, Ref aref, FormField *fieldA); + + AnnotWidget *widget; + FormField *field; + FormFieldType type; + Object obj; + Ref ref; + PDFDoc *doc; + XRef *xref; + + // index of this field in the parent's child list + unsigned childNum; + + /* + Field ID is an (unsigned) integer, calculated as follow : + the first sizeof/2 bits are the field number, relative to the page + the last sizeof/2 bits are the page number + [page number | field number] + (encoding) id = (pageNum << 4*sizeof(unsigned)) + fieldNum; + (decoding) pageNum = id >> 4*sizeof(unsigned); fieldNum = (id << 4*sizeof(unsigned)) >> 4*sizeof(unsigned); + */ + unsigned ID; +}; + +//------------------------------------------------------------------------ +// FormWidgetButton +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT FormWidgetButton : public FormWidget +{ +public: + FormWidgetButton(PDFDoc *docA, Object *dictObj, unsigned num, Ref ref, FormField *p); + ~FormWidgetButton() override; + + FormButtonType getButtonType() const; + + void setState(bool state); + bool getState() const; + + const char *getOnStr() const; + void setAppearanceState(const char *state); + void updateWidgetAppearance() override; + +protected: + FormFieldButton *parent() const; + GooString *onStr; +}; + +//------------------------------------------------------------------------ +// FormWidgetText +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT FormWidgetText : public FormWidget +{ +public: + FormWidgetText(PDFDoc *docA, Object *dictObj, unsigned num, Ref ref, FormField *p); + // return the field's content (UTF16BE) + const GooString *getContent() const; + + // expects a UTF16BE string + void setContent(const GooString *new_content); + // sets the text inside the field appearance stream + void setAppearanceContent(const GooString *new_content); + + void updateWidgetAppearance() override; + + bool isMultiline() const; + bool isPassword() const; + bool isFileSelect() const; + bool noSpellCheck() const; + bool noScroll() const; + bool isComb() const; + bool isRichText() const; + int getMaxLen() const; + // return the font size of the field's text + double getTextFontSize(); + // set the font size of the field's text (currently only integer values) + void setTextFontSize(int fontSize); + +protected: + FormFieldText *parent() const; +}; + +//------------------------------------------------------------------------ +// FormWidgetChoice +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT FormWidgetChoice : public FormWidget +{ +public: + FormWidgetChoice(PDFDoc *docA, Object *dictObj, unsigned num, Ref ref, FormField *p); + ~FormWidgetChoice() override; + + int getNumChoices() const; + // return the display name of the i-th choice (UTF16BE) + const GooString *getChoice(int i) const; + const GooString *getExportVal(int i) const; + // select the i-th choice + void select(int i); + + // toggle selection of the i-th choice + void toggle(int i); + + // deselect everything + void deselectAll(); + + // except a UTF16BE string + // only work for editable combo box, set the user-entered text as the current choice + void setEditChoice(const GooString *new_content); + + const GooString *getEditChoice() const; + + void updateWidgetAppearance() override; + bool isSelected(int i) const; + + bool isCombo() const; + bool hasEdit() const; + bool isMultiSelect() const; + bool noSpellCheck() const; + bool commitOnSelChange() const; + bool isListBox() const; + +protected: + bool _checkRange(int i) const; + FormFieldChoice *parent() const; +}; + +//------------------------------------------------------------------------ +// FormWidgetSignature +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT FormWidgetSignature : public FormWidget +{ +public: + FormWidgetSignature(PDFDoc *docA, Object *dictObj, unsigned num, Ref ref, FormField *p); + void updateWidgetAppearance() override; + + FormSignatureType signatureType() const; + void setSignatureType(FormSignatureType fst); + + // Use -1 for now as validationTime + // ocspRevocation and aiafetch might happen async in the Background + // doneCallback will be invoked once there is a result + // Note: Validation callback will likely happen from an auxillary + // thread and it is the caller of this method who is responsible + // for moving back to the main thread + // For synchronous code, don't provide validation callback + // and just call validateSignatureResult afterwards + // The returned SignatureInfo from this method does + // not have validated the certificate. + SignatureInfo *validateSignatureAsync(bool doVerifyCert, bool forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool enableAIA, const std::function &doneCallback); + + /// Waits, if needed, on validation callback and + /// returns a signatureinfo with validated certificates + CertificateValidationStatus validateSignatureResult(); + + // returns a list with the boundaries of the signed ranges + // the elements of the list are of type Goffset + std::vector getSignedRangeBounds() const; + + // Creates or replaces the dictionary name "V" in the signature dictionary and + // fills it with the fields of the signature; the field "Contents" is the signature + // in PKCS#7 format, which is calculated over the byte range encompassing the whole + // document except for the signature itself; this byte range is specified in the + // field "ByteRange" in the dictionary "V". + // Arguments reason and location are UTF-16 big endian strings with BOM. An empty string and nullptr are acceptable too. + // Returns success. + bool signDocument(const std::string &filename, const std::string &certNickname, const std::string &password, const GooString *reason = nullptr, const GooString *location = nullptr, const std::optional &ownerPassword = {}, + const std::optional &userPassword = {}); + + // Same as above but adds text, font color, etc. + bool signDocumentWithAppearance(const std::string &filename, const std::string &certNickname, const std::string &password, const GooString *reason = nullptr, const GooString *location = nullptr, + const std::optional &ownerPassword = {}, const std::optional &userPassword = {}, const GooString &signatureText = {}, const GooString &signatureTextLeft = {}, double fontSize = {}, + double leftFontSize = {}, std::unique_ptr &&fontColor = {}, double borderWidth = {}, std::unique_ptr &&borderColor = {}, std::unique_ptr &&backgroundColor = {}); + + // checks the length encoding of the signature and returns the hex encoded signature + // if the check passed (and the checked file size as output parameter in checkedFileSize) + // otherwise a nullptr is returned + std::optional getCheckedSignature(Goffset *checkedFileSize); + + const GooString *getSignature() const; + +private: + bool createSignature(Object &vObj, Ref vRef, const GooString &name, int placeholderLength, const GooString *reason = nullptr, const GooString *location = nullptr); + bool getObjectStartEnd(const GooString &filename, int objNum, Goffset *objStart, Goffset *objEnd, const std::optional &ownerPassword, const std::optional &userPassword); + bool updateOffsets(FILE *f, Goffset objStart, Goffset objEnd, Goffset *sigStart, Goffset *sigEnd, Goffset *fileSize); + + bool updateSignature(FILE *f, Goffset sigStart, Goffset sigEnd, const GooString &signature); +}; + +//------------------------------------------------------------------------ +// FormField +// A FormField implements the logical side of a field and is "attached" to +// the Catalog. This is an internal class and client applications should +// only interact with FormWidgets. +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT FormField +{ +public: + FormField(PDFDoc *docA, Object &&aobj, const Ref aref, FormField *parent, std::set *usedParents, FormFieldType t = formUndef); + + virtual ~FormField(); + + // Accessors. + FormFieldType getType() const { return type; } + Object *getObj() { return &obj; } + Ref getRef() { return ref; } + + void setReadOnly(bool value); + bool isReadOnly() const { return readOnly; } + void setStandAlone(bool value) { standAlone = value; } + bool isStandAlone() const { return standAlone; } + + GooString *getDefaultAppearance() const { return defaultAppearance; } + void setDefaultAppearance(const std::string &appearance); + + bool hasTextQuadding() const { return hasQuadding; } + VariableTextQuadding getTextQuadding() const { return quadding; } + + const GooString *getPartialName() const { return partialName; } + void setPartialName(const GooString &name); + const GooString *getAlternateUiName() const { return alternateUiName; } + const GooString *getMappingName() const { return mappingName; } + GooString *getFullyQualifiedName(); + + FormWidget *findWidgetByRef(Ref aref); + int getNumWidgets() const { return terminal ? numChildren : 0; } + FormWidget *getWidget(int i) const { return terminal ? widgets[i] : nullptr; } + int getNumChildren() const { return !terminal ? numChildren : 0; } + FormField *getChildren(int i) const { return children[i]; } + + // only implemented in FormFieldButton + virtual void fillChildrenSiblingsID(); + + void createWidgetAnnotations(); + + void printTree(int indent = 0); + virtual void print(int indent = 0); + virtual void reset(const std::vector &excludedFields); + void resetChildren(const std::vector &excludedFields); + FormField *findFieldByRef(Ref aref); + FormField *findFieldByFullyQualifiedName(const std::string &name); + +protected: + void _createWidget(Object *obj, Ref aref); + void createChildren(std::set *usedParents); + void updateChildrenAppearance(); + bool isAmongExcludedFields(const std::vector &excludedFields); + + FormFieldType type; // field type + Ref ref; + bool terminal; + Object obj; + PDFDoc *doc; + XRef *xref; + FormField **children; + FormField *parent; + int numChildren; + FormWidget **widgets; + bool readOnly; + + GooString *partialName; // T field + GooString *alternateUiName; // TU field + GooString *mappingName; // TM field + GooString *fullyQualifiedName; + + // Variable Text + GooString *defaultAppearance; + bool hasQuadding; + VariableTextQuadding quadding; + + // True when FormField is not part of Catalog's Field array (or there isn't one). + bool standAlone; + +private: + FormField() { } +}; + +//------------------------------------------------------------------------ +// FormFieldButton +//------------------------------------------------------------------------ + +class FormFieldButton : public FormField +{ +public: + FormFieldButton(PDFDoc *docA, Object &&dict, const Ref ref, FormField *parent, std::set *usedParents); + + FormButtonType getButtonType() const { return btype; } + + bool noToggleToOff() const { return noAllOff; } + + // returns true if the state modification is accepted + bool setState(const char *state, bool ignoreToggleOff = false); + bool getState(const char *state) const; + + const char *getAppearanceState() const { return appearanceState.isName() ? appearanceState.getName() : nullptr; } + const char *getDefaultAppearanceState() const { return defaultAppearanceState.isName() ? defaultAppearanceState.getName() : nullptr; } + + void fillChildrenSiblingsID() override; + + void setNumSiblings(int num); + void setSibling(int i, FormFieldButton *id) { siblings[i] = id; } + + // For radio buttons, return the fields of the other radio buttons in the same group + FormFieldButton *getSibling(int i) const { return siblings[i]; } + int getNumSiblings() const { return numSiblings; } + + void print(int indent) override; + void reset(const std::vector &excludedFields) override; + + ~FormFieldButton() override; + +protected: + void updateState(const char *state); + + FormFieldButton **siblings; // IDs of dependent buttons (each button of a radio field has all the others buttons + // of the same field in this array) + int numSiblings; + + FormButtonType btype; + int size; + int active_child; // only used for combo box + bool noAllOff; + Object appearanceState; // V + Object defaultAppearanceState; // DV +}; + +//------------------------------------------------------------------------ +// FormFieldText +//------------------------------------------------------------------------ + +class FormFieldText : public FormField +{ +public: + FormFieldText(PDFDoc *docA, Object &&dictObj, const Ref ref, FormField *parent, std::set *usedParents); + + const GooString *getContent() const { return content; } + const GooString *getAppearanceContent() const { return internalContent ? internalContent : content; } + void setContentCopy(const GooString *new_content); + void setAppearanceContentCopy(const GooString *new_content); + ~FormFieldText() override; + + bool isMultiline() const { return multiline; } + bool isPassword() const { return password; } + bool isFileSelect() const { return fileSelect; } + bool noSpellCheck() const { return doNotSpellCheck; } + bool noScroll() const { return doNotScroll; } + bool isComb() const { return comb; } + bool isRichText() const { return richText; } + + int getMaxLen() const { return maxLen; } + + // return the font size of the field's text + double getTextFontSize(); + // set the font size of the field's text (currently only integer values) + void setTextFontSize(int fontSize); + + void print(int indent) override; + void reset(const std::vector &excludedFields) override; + + static int tokenizeDA(const std::string &daString, std::vector *daToks, const char *searchTok); + +protected: + int parseDA(std::vector *daToks); + void fillContent(FillValueType fillType); + + GooString *content; + GooString *internalContent; + GooString *defaultContent; + bool multiline; + bool password; + bool fileSelect; + bool doNotSpellCheck; + bool doNotScroll; + bool comb; + bool richText; + int maxLen; +}; + +//------------------------------------------------------------------------ +// FormFieldChoice +//------------------------------------------------------------------------ + +class FormFieldChoice : public FormField +{ +public: + FormFieldChoice(PDFDoc *docA, Object &&aobj, const Ref ref, FormField *parent, std::set *usedParents); + + ~FormFieldChoice() override; + + int getNumChoices() const { return numChoices; } + const GooString *getChoice(int i) const { return choices ? choices[i].optionName : nullptr; } + const GooString *getExportVal(int i) const { return choices ? choices[i].exportVal : nullptr; } + // For multi-select choices it returns the first one + const GooString *getSelectedChoice() const; + + // select the i-th choice + void select(int i); + + // toggle selection of the i-th choice + void toggle(int i); + + // deselect everything + void deselectAll(); + + // only work for editable combo box, set the user-entered text as the current choice + void setEditChoice(const GooString *new_content); + + const GooString *getEditChoice() const; + + bool isSelected(int i) const { return choices[i].selected; } + + int getNumSelected(); + + bool isCombo() const { return combo; } + bool hasEdit() const { return edit; } + bool isMultiSelect() const { return multiselect; } + bool noSpellCheck() const { return doNotSpellCheck; } + bool commitOnSelChange() const { return doCommitOnSelChange; } + bool isListBox() const { return !combo; } + + int getTopIndex() const { return topIdx; } + + void print(int indent) override; + void reset(const std::vector &excludedFields) override; + +protected: + void unselectAll(); + void updateSelection(); + void fillChoices(FillValueType fillType); + + bool combo; + bool edit; + bool multiselect; + bool doNotSpellCheck; + bool doCommitOnSelChange; + + struct ChoiceOpt + { + GooString *exportVal; // the export value ("internal" name) + GooString *optionName; // displayed name + bool selected; // if this choice is selected + }; + + int numChoices; + ChoiceOpt *choices; + bool *defaultChoices; + GooString *editedChoice; + int topIdx; // TI +}; + +//------------------------------------------------------------------------ +// FormFieldSignature +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT FormFieldSignature : public FormField +{ +public: + FormFieldSignature(PDFDoc *docA, Object &&dict, const Ref ref, FormField *parent, std::set *usedParents); + + // Use -1 for now as validationTime + SignatureInfo *validateSignatureAsync(bool doVerifyCert, bool forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool enableAIA, const std::function &doneCallback); + + CertificateValidationStatus validateSignatureResult(); + + // returns a list with the boundaries of the signed ranges + // the elements of the list are of type Goffset + std::vector getSignedRangeBounds() const; + + // checks the length encoding of the signature and returns the hex encoded signature + // if the check passed (and the checked file size as output parameter in checkedFileSize) + // otherwise a nullptr is returned + std::optional getCheckedSignature(Goffset *checkedFileSize); + + ~FormFieldSignature() override; + Object *getByteRange() { return &byte_range; } + const GooString *getSignature() const { return signature; } + void setSignature(const GooString &sig); + FormSignatureType getSignatureType() const { return signature_type; } + void setSignatureType(FormSignatureType t) { signature_type = t; } + + const GooString &getCustomAppearanceContent() const; + void setCustomAppearanceContent(const GooString &s); + + const GooString &getCustomAppearanceLeftContent() const; + void setCustomAppearanceLeftContent(const GooString &s); + + double getCustomAppearanceLeftFontSize() const; + void setCustomAppearanceLeftFontSize(double size); + + // Background image (ref to an object of type XObject). Invalid ref if not required. + Ref getImageResource() const; + void setImageResource(const Ref imageResourceA); + + void setCertificateInfo(std::unique_ptr &); + + FormWidget *getCreateWidget(); + +private: + void parseInfo(); + void hashSignedDataBlock(CryptoSign::VerificationInterface *handler, Goffset block_len); + + FormSignatureType signature_type; + Object byte_range; + GooString *signature; + SignatureInfo *signature_info; + GooString customAppearanceContent; + GooString customAppearanceLeftContent; + double customAppearanceLeftFontSize = 20; + Ref imageResource = Ref::INVALID(); + std::unique_ptr certificate_info; + std::unique_ptr signature_handler; + + void print(int indent) override; +}; + +//------------------------------------------------------------------------ +// Form +// This class handle the document-wide part of Form (things in the acroForm +// Catalog entry). +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT Form +{ +public: + explicit Form(PDFDoc *doc); + + ~Form(); + + Form(const Form &) = delete; + Form &operator=(const Form &) = delete; + + // Look up an inheritable field dictionary entry. + static Object fieldLookup(Dict *field, const char *key); + + /* Creates a new Field of the type specified in obj's dict. + used in Form::Form , FormField::FormField and + Page::loadStandaloneFields */ + static FormField *createFieldFromDict(Object &&obj, PDFDoc *docA, const Ref aref, FormField *parent, std::set *usedParents); + + // Finds in the default resources dictionary a font named popplerfontXXX that + // has the given fontFamily and fontStyle. This makes us relatively sure that we added that font ourselves + std::string findFontInDefaultResources(const std::string &fontFamily, const std::string &fontStyle) const; + + // Finds in the default resources a font that is suitable to create a signature annotation. + // If none is found then it is added to the default resources. + std::string findPdfFontNameToUseForSigning(); + + struct AddFontResult + { + std::string fontName; + Ref ref; + }; + + // Finds in the system a font name matching the given fontFamily and fontStyle + // And adds it to the default resources dictionary, font name there will be popplerfontXXX except if forceName is true, + // in that case the font name will be fontFamily + " " + fontStyle (if fontStyle is empty just fontFamily) + AddFontResult addFontToDefaultResources(const std::string &fontFamily, const std::string &fontStyle, bool forceName = false); + + // Finds in the default resources dictionary a font named popplerfontXXX that + // emulates fontToEmulate and can draw the given char + std::string getFallbackFontForChar(Unicode uChar, const GfxFont &fontToEmulate) const; + + // Makes sure the default resources has fonts to draw all the given chars and as close as possible to the given pdfFontNameToEmulate + // If needed adds fonts to the default resources dictionary, font names will be popplerfontXXX + // If fieldResources is not nullptr, it is used instead of the to query the font to emulate instead of the default resources + // Returns a list of all the added fonts (if any) + std::vector ensureFontsForAllCharacters(const GooString *unicodeText, const std::string &pdfFontNameToEmulate, GfxResources *fieldResources = nullptr); + + bool getNeedAppearances() const { return needAppearances; } + int getNumFields() const { return numFields; } + FormField *getRootField(int i) const { return rootFields[i]; } + const GooString *getDefaultAppearance() const { return defaultAppearance; } + VariableTextQuadding getTextQuadding() const { return quadding; } + GfxResources *getDefaultResources() const { return defaultResources; } + Object *getDefaultResourcesObj() { return &resDict; } + + FormWidget *findWidgetByRef(Ref aref); + FormField *findFieldByRef(Ref aref) const; + FormField *findFieldByFullyQualifiedName(const std::string &name) const; + + void postWidgetsLoad(); + + const std::vector &getCalculateOrder() const { return calculateOrder; } + + void reset(const std::vector &fields, bool excludeFields); + +private: + // Finds in the system a font name matching the given fontFamily and fontStyle + // And adds it to the default resources dictionary, font name there will be popplerfontXXX except if forceName is true, + // in that case the font name will be fontFamily + " " + fontStyle (if fontStyle is empty just fontFamily) + AddFontResult addFontToDefaultResources(const std::string &filepath, int faceIndex, const std::string &fontFamily, const std::string &fontStyle, bool forceName = false); + + AddFontResult doGetAddFontToDefaultResources(Unicode uChar, const GfxFont &fontToEmulate); + + FormField **rootFields; + int numFields; + int size; + PDFDoc *const doc; + bool needAppearances; + GfxResources *defaultResources; + Object resDict; + std::vector calculateOrder; + + // Variable Text + GooString *defaultAppearance; + VariableTextQuadding quadding; +}; + +//------------------------------------------------------------------------ +// FormPageWidgets +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT FormPageWidgets +{ +public: + FormPageWidgets(Annots *annots, unsigned int page, Form *form); + ~FormPageWidgets(); + + FormPageWidgets(const FormPageWidgets &) = delete; + FormPageWidgets &operator=(const FormPageWidgets &) = delete; + + int getNumWidgets() const { return numWidgets; } + FormWidget *getWidget(int i) const { return widgets[i]; } + void addWidgets(const std::vector &addedWidgets, unsigned int page); + +private: + FormWidget **widgets; + int numWidgets; + int size; +}; + +#endif diff --git a/poppler-24.05.0/poppler/Function.cc b/poppler-24.05.0/poppler/Function.cc new file mode 100644 index 0000000000000000000000000000000000000000..d2be7d711b0bc1c0601d41d3a394866cadbc639a --- /dev/null +++ b/poppler-24.05.0/poppler/Function.cc @@ -0,0 +1,1707 @@ +//======================================================================== +// +// Function.cc +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006, 2008-2010, 2013-2015, 2017-2020, 2022-2024 Albert Astals Cid +// Copyright (C) 2006 Jeff Muizelaar +// Copyright (C) 2010 Christian Feuersänger +// Copyright (C) 2011 Andrea Canciani +// Copyright (C) 2012 Thomas Freitag +// Copyright (C) 2012 Adam Reichold +// Copyright (C) 2013 Fabio D'Urso +// +// 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 + +#include +#include +#include +#include +#include "goo/gmem.h" +#include "goo/gstrtod.h" +#include "Object.h" +#include "Dict.h" +#include "Stream.h" +#include "Error.h" +#include "Function.h" + +#ifndef M_PI +# define M_PI 3.14159265358979323846 +#endif + +//------------------------------------------------------------------------ +// Function +//------------------------------------------------------------------------ + +Function::Function() : domain {} { } + +Function::~Function() { } + +Function *Function::parse(Object *funcObj) +{ + std::set usedParents; + return parse(funcObj, &usedParents); +} + +Function *Function::parse(Object *funcObj, std::set *usedParents) +{ + Function *func; + Dict *dict; + int funcType; + + if (funcObj->isStream()) { + dict = funcObj->streamGetDict(); + } else if (funcObj->isDict()) { + dict = funcObj->getDict(); + } else if (funcObj->isName("Identity")) { + return new IdentityFunction(); + } else { + error(errSyntaxError, -1, "Expected function dictionary or stream"); + return nullptr; + } + + Object obj1 = dict->lookup("FunctionType"); + if (!obj1.isInt()) { + error(errSyntaxError, -1, "Function type is missing or wrong type"); + return nullptr; + } + funcType = obj1.getInt(); + + if (funcType == 0) { + func = new SampledFunction(funcObj, dict); + } else if (funcType == 2) { + func = new ExponentialFunction(funcObj, dict); + } else if (funcType == 3) { + func = new StitchingFunction(funcObj, dict, usedParents); + } else if (funcType == 4) { + func = new PostScriptFunction(funcObj, dict); + } else { + error(errSyntaxError, -1, "Unimplemented function type ({0:d})", funcType); + return nullptr; + } + if (!func->isOk()) { + delete func; + return nullptr; + } + + return func; +} + +Function::Function(const Function *func) +{ + m = func->m; + n = func->n; + + memcpy(domain, func->domain, funcMaxInputs * 2 * sizeof(double)); + memcpy(range, func->range, funcMaxOutputs * 2 * sizeof(double)); + + hasRange = func->hasRange; +} + +bool Function::init(Dict *dict) +{ + Object obj1; + int i; + + //----- Domain + obj1 = dict->lookup("Domain"); + if (!obj1.isArray()) { + error(errSyntaxError, -1, "Function is missing domain"); + return false; + } + m = obj1.arrayGetLength() / 2; + if (m > funcMaxInputs) { + error(errSyntaxError, -1, "Functions with more than {0:d} inputs are unsupported", funcMaxInputs); + return false; + } + for (i = 0; i < m; ++i) { + Object obj2 = obj1.arrayGet(2 * i); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Illegal value in function domain array"); + return false; + } + domain[i][0] = obj2.getNum(); + obj2 = obj1.arrayGet(2 * i + 1); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Illegal value in function domain array"); + return false; + } + domain[i][1] = obj2.getNum(); + } + + //----- Range + hasRange = false; + n = 0; + obj1 = dict->lookup("Range"); + if (obj1.isArray()) { + hasRange = true; + n = obj1.arrayGetLength() / 2; + if (n > funcMaxOutputs) { + error(errSyntaxError, -1, "Functions with more than {0:d} outputs are unsupported", funcMaxOutputs); + return false; + } + for (i = 0; i < n; ++i) { + Object obj2 = obj1.arrayGet(2 * i); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Illegal value in function range array"); + return false; + } + range[i][0] = obj2.getNum(); + obj2 = obj1.arrayGet(2 * i + 1); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Illegal value in function range array"); + return false; + } + range[i][1] = obj2.getNum(); + } + } + + return true; +} + +//------------------------------------------------------------------------ +// IdentityFunction +//------------------------------------------------------------------------ + +IdentityFunction::IdentityFunction() +{ + int i; + + // fill these in with arbitrary values just in case they get used + // somewhere + m = funcMaxInputs; + n = funcMaxOutputs; + for (i = 0; i < funcMaxInputs; ++i) { + domain[i][0] = 0; + domain[i][1] = 1; + } + hasRange = false; +} + +IdentityFunction::~IdentityFunction() { } + +void IdentityFunction::transform(const double *in, double *out) const +{ + int i; + + for (i = 0; i < funcMaxOutputs; ++i) { + out[i] = in[i]; + } +} + +//------------------------------------------------------------------------ +// SampledFunction +//------------------------------------------------------------------------ + +SampledFunction::SampledFunction(Object *funcObj, Dict *dict) : cacheOut {} +{ + Stream *str; + int sampleBits; + double sampleMul; + Object obj1; + unsigned int buf, bitMask; + int bits; + unsigned int s; + double in[funcMaxInputs]; + int i, j, t, bit, idx; + + idxOffset = nullptr; + samples = nullptr; + sBuf = nullptr; + ok = false; + + //----- initialize the generic stuff + if (!init(dict)) { + return; + } + if (!hasRange) { + error(errSyntaxError, -1, "Type 0 function is missing range"); + return; + } + if (m > sampledFuncMaxInputs) { + error(errSyntaxError, -1, "Sampled functions with more than {0:d} inputs are unsupported", sampledFuncMaxInputs); + return; + } + + //----- buffer + sBuf = (double *)gmallocn(1 << m, sizeof(double)); + + //----- get the stream + if (!funcObj->isStream()) { + error(errSyntaxError, -1, "Type 0 function isn't a stream"); + return; + } + str = funcObj->getStream(); + + //----- Size + obj1 = dict->lookup("Size"); + if (!obj1.isArray() || obj1.arrayGetLength() != m) { + error(errSyntaxError, -1, "Function has missing or invalid size array"); + return; + } + for (i = 0; i < m; ++i) { + Object obj2 = obj1.arrayGet(i); + if (!obj2.isInt()) { + error(errSyntaxError, -1, "Illegal value in function size array"); + return; + } + sampleSize[i] = obj2.getInt(); + if (sampleSize[i] <= 0) { + error(errSyntaxError, -1, "Illegal non-positive value in function size array"); + return; + } + } + idxOffset = (int *)gmallocn(1 << m, sizeof(int)); + for (i = 0; i < (1 << m); ++i) { + idx = 0; + for (j = m - 1, t = i; j >= 1; --j, t <<= 1) { + if (sampleSize[j] == 1) { + bit = 0; + } else { + bit = (t >> (m - 1)) & 1; + } + idx = (idx + bit) * sampleSize[j - 1]; + } + if (m > 0 && sampleSize[0] == 1) { + bit = 0; + } else { + bit = (t >> (m - 1)) & 1; + } + idxOffset[i] = (idx + bit) * n; + } + + //----- BitsPerSample + obj1 = dict->lookup("BitsPerSample"); + if (!obj1.isInt()) { + error(errSyntaxError, -1, "Function has missing or invalid BitsPerSample"); + return; + } + sampleBits = obj1.getInt(); + if (unlikely(sampleBits < 1 || sampleBits > 32)) { + error(errSyntaxError, -1, "Function invalid BitsPerSample"); + return; + } + sampleMul = 1.0 / (pow(2.0, (double)sampleBits) - 1); + + //----- Encode + obj1 = dict->lookup("Encode"); + if (obj1.isArray() && obj1.arrayGetLength() == 2 * m) { + for (i = 0; i < m; ++i) { + Object obj2 = obj1.arrayGet(2 * i); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Illegal value in function encode array"); + return; + } + encode[i][0] = obj2.getNum(); + obj2 = obj1.arrayGet(2 * i + 1); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Illegal value in function encode array"); + return; + } + encode[i][1] = obj2.getNum(); + } + } else { + for (i = 0; i < m; ++i) { + encode[i][0] = 0; + encode[i][1] = sampleSize[i] - 1; + } + } + for (i = 0; i < m; ++i) { + if (unlikely((domain[i][1] - domain[i][0]) == 0)) { + error(errSyntaxError, -1, "Illegal value in function domain array"); + return; + } + inputMul[i] = (encode[i][1] - encode[i][0]) / (domain[i][1] - domain[i][0]); + } + + //----- Decode + obj1 = dict->lookup("Decode"); + if (obj1.isArray() && obj1.arrayGetLength() == 2 * n) { + for (i = 0; i < n; ++i) { + Object obj2 = obj1.arrayGet(2 * i); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Illegal value in function decode array"); + return; + } + decode[i][0] = obj2.getNum(); + obj2 = obj1.arrayGet(2 * i + 1); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Illegal value in function decode array"); + return; + } + decode[i][1] = obj2.getNum(); + } + } else { + for (i = 0; i < n; ++i) { + decode[i][0] = range[i][0]; + decode[i][1] = range[i][1]; + } + } + + //----- samples + nSamples = n; + for (i = 0; i < m; ++i) { + nSamples *= sampleSize[i]; + } + samples = (double *)gmallocn_checkoverflow(nSamples, sizeof(double)); + if (!samples) { + error(errSyntaxError, -1, "Function has invalid number of samples"); + return; + } + buf = 0; + bits = 0; + bitMask = (1 << sampleBits) - 1; + str->reset(); + for (i = 0; i < nSamples; ++i) { + if (sampleBits == 8) { + s = str->getChar(); + } else if (sampleBits == 16) { + s = str->getChar(); + s = (s << 8) + str->getChar(); + } else if (sampleBits == 32) { + s = str->getChar(); + s = (s << 8) + str->getChar(); + s = (s << 8) + str->getChar(); + s = (s << 8) + str->getChar(); + } else { + while (bits < sampleBits) { + buf = (buf << 8) | (str->getChar() & 0xff); + bits += 8; + } + s = (buf >> (bits - sampleBits)) & bitMask; + bits -= sampleBits; + } + samples[i] = (double)s * sampleMul; + } + str->close(); + + // set up the cache + for (i = 0; i < m; ++i) { + in[i] = domain[i][0]; + cacheIn[i] = in[i] - 1; + } + transform(in, cacheOut); + + ok = true; +} + +SampledFunction::~SampledFunction() +{ + if (idxOffset) { + gfree(idxOffset); + } + if (samples) { + gfree(samples); + } + if (sBuf) { + gfree(sBuf); + } +} + +SampledFunction::SampledFunction(const SampledFunction *func) : Function(func) +{ + memcpy(sampleSize, func->sampleSize, funcMaxInputs * sizeof(int)); + + memcpy(encode, func->encode, funcMaxInputs * 2 * sizeof(double)); + memcpy(decode, func->decode, funcMaxOutputs * 2 * sizeof(double)); + + memcpy(inputMul, func->inputMul, funcMaxInputs * sizeof(double)); + + nSamples = func->nSamples; + + idxOffset = (int *)gmallocn(1 << m, sizeof(int)); + memcpy(idxOffset, func->idxOffset, (1 << m) * (int)sizeof(int)); + + samples = (double *)gmallocn(nSamples, sizeof(double)); + memcpy(samples, func->samples, nSamples * sizeof(double)); + + sBuf = (double *)gmallocn(1 << m, sizeof(double)); + + memcpy(cacheIn, func->cacheIn, funcMaxInputs * sizeof(double)); + memcpy(cacheOut, func->cacheOut, funcMaxOutputs * sizeof(double)); + + ok = func->ok; +} + +void SampledFunction::transform(const double *in, double *out) const +{ + double x; + int e[funcMaxInputs]; + double efrac0[funcMaxInputs]; + double efrac1[funcMaxInputs]; + + // check the cache + bool inCache = true; + for (int i = 0; i < m; ++i) { + if (in[i] != cacheIn[i]) { + inCache = false; + break; + } + } + if (inCache) { + for (int i = 0; i < n; ++i) { + out[i] = cacheOut[i]; + } + return; + } + + // map input values into sample array + for (int i = 0; i < m; ++i) { + x = (in[i] - domain[i][0]) * inputMul[i] + encode[i][0]; + if (x < 0 || std::isnan(x)) { + x = 0; + } else if (x > sampleSize[i] - 1) { + x = sampleSize[i] - 1; + } + e[i] = (int)x; + if (e[i] == sampleSize[i] - 1 && sampleSize[i] > 1) { + // this happens if in[i] = domain[i][1] + e[i] = sampleSize[i] - 2; + } + efrac1[i] = x - e[i]; + efrac0[i] = 1 - efrac1[i]; + } + + // compute index for the first sample to be used + int idx0 = 0; + for (int k = m - 1; k >= 1; --k) { + idx0 = (idx0 + e[k]) * sampleSize[k - 1]; + } + idx0 = (idx0 + e[0]) * n; + + // for each output, do m-linear interpolation + for (int i = 0; i < n; ++i) { + + // pull 2^m values out of the sample array + for (int j = 0; j < (1 << m); ++j) { + int idx = idx0 + idxOffset[j] + i; + if (likely(idx >= 0 && idx < nSamples)) { + sBuf[j] = samples[idx]; + } else { + sBuf[j] = 0; // TODO Investigate if this is what Adobe does + } + } + + // do m sets of interpolations + for (int j = 0, t = (1 << m); j < m; ++j, t >>= 1) { + for (int k = 0; k < t; k += 2) { + sBuf[k >> 1] = efrac0[j] * sBuf[k] + efrac1[j] * sBuf[k + 1]; + } + } + + // map output value to range + out[i] = sBuf[0] * (decode[i][1] - decode[i][0]) + decode[i][0]; + if (out[i] < range[i][0]) { + out[i] = range[i][0]; + } else if (out[i] > range[i][1]) { + out[i] = range[i][1]; + } + } + + // save current result in the cache + for (int i = 0; i < m; ++i) { + cacheIn[i] = in[i]; + } + for (int i = 0; i < n; ++i) { + cacheOut[i] = out[i]; + } +} + +bool SampledFunction::hasDifferentResultSet(const Function *func) const +{ + if (func->getType() == Type::Sampled) { + SampledFunction *compTo = (SampledFunction *)func; + if (compTo->getSampleNumber() != nSamples) { + return true; + } + const double *compSamples = compTo->getSamples(); + for (int i = 0; i < nSamples; i++) { + if (samples[i] != compSamples[i]) { + return true; + } + } + } + return false; +} + +//------------------------------------------------------------------------ +// ExponentialFunction +//------------------------------------------------------------------------ + +ExponentialFunction::ExponentialFunction(Object *funcObj, Dict *dict) +{ + Object obj1; + + ok = false; + + //----- initialize the generic stuff + if (!init(dict)) { + return; + } + if (m != 1) { + error(errSyntaxError, -1, "Exponential function with more than one input"); + return; + } + + //----- C0 + obj1 = dict->lookup("C0"); + if (obj1.isArray()) { + if (hasRange && obj1.arrayGetLength() != n) { + error(errSyntaxError, -1, "Function's C0 array is wrong length"); + return; + } + n = obj1.arrayGetLength(); + if (unlikely(n > funcMaxOutputs)) { + error(errSyntaxError, -1, "Function's C0 array is wrong length"); + n = funcMaxOutputs; + } + for (int i = 0; i < n; ++i) { + Object obj2 = obj1.arrayGet(i); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Illegal value in function C0 array"); + return; + } + c0[i] = obj2.getNum(); + } + } else { + if (hasRange && n != 1) { + error(errSyntaxError, -1, "Function's C0 array is wrong length"); + return; + } + n = 1; + c0[0] = 0; + } + + //----- C1 + obj1 = dict->lookup("C1"); + if (obj1.isArray()) { + if (obj1.arrayGetLength() != n) { + error(errSyntaxError, -1, "Function's C1 array is wrong length"); + return; + } + for (int i = 0; i < n; ++i) { + Object obj2 = obj1.arrayGet(i); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Illegal value in function C1 array"); + return; + } + c1[i] = obj2.getNum(); + } + } else { + if (n != 1) { + error(errSyntaxError, -1, "Function's C1 array is wrong length"); + return; + } + c1[0] = 1; + } + + //----- N (exponent) + obj1 = dict->lookup("N"); + if (!obj1.isNum()) { + error(errSyntaxError, -1, "Function has missing or invalid N"); + return; + } + e = obj1.getNum(); + + isLinear = fabs(e - 1.) < 1e-10; + ok = true; +} + +ExponentialFunction::~ExponentialFunction() { } + +ExponentialFunction::ExponentialFunction(const ExponentialFunction *func) : Function(func) +{ + memcpy(c0, func->c0, funcMaxOutputs * sizeof(double)); + memcpy(c1, func->c1, funcMaxOutputs * sizeof(double)); + + e = func->e; + isLinear = func->isLinear; + ok = func->ok; +} + +void ExponentialFunction::transform(const double *in, double *out) const +{ + double x; + int i; + + if (in[0] < domain[0][0]) { + x = domain[0][0]; + } else if (in[0] > domain[0][1]) { + x = domain[0][1]; + } else { + x = in[0]; + } + for (i = 0; i < n; ++i) { + out[i] = c0[i] + (isLinear ? x : pow(x, e)) * (c1[i] - c0[i]); + if (hasRange) { + if (out[i] < range[i][0]) { + out[i] = range[i][0]; + } else if (out[i] > range[i][1]) { + out[i] = range[i][1]; + } + } + } + return; +} + +//------------------------------------------------------------------------ +// StitchingFunction +//------------------------------------------------------------------------ + +StitchingFunction::StitchingFunction(Object *funcObj, Dict *dict, std::set *usedParents) +{ + Object obj1; + int i; + + ok = false; + funcs = nullptr; + bounds = nullptr; + encode = nullptr; + scale = nullptr; + + //----- initialize the generic stuff + if (!init(dict)) { + return; + } + if (m != 1) { + error(errSyntaxError, -1, "Stitching function with more than one input"); + return; + } + + //----- Functions + obj1 = dict->lookup("Functions"); + if (!obj1.isArray()) { + error(errSyntaxError, -1, "Missing 'Functions' entry in stitching function"); + return; + } + k = obj1.arrayGetLength(); + funcs = (Function **)gmallocn(k, sizeof(Function *)); + bounds = (double *)gmallocn(k + 1, sizeof(double)); + encode = (double *)gmallocn(2 * k, sizeof(double)); + scale = (double *)gmallocn(k, sizeof(double)); + for (i = 0; i < k; ++i) { + funcs[i] = nullptr; + } + for (i = 0; i < k; ++i) { + std::set usedParentsAux = *usedParents; + Ref ref; + Object obj2 = obj1.getArray()->get(i, &ref); + if (ref != Ref::INVALID()) { + if (usedParentsAux.find(ref.num) == usedParentsAux.end()) { + usedParentsAux.insert(ref.num); + } else { + return; + } + } + if (!(funcs[i] = Function::parse(&obj2, &usedParentsAux))) { + return; + } + if (funcs[i]->getInputSize() != 1 || (i > 0 && funcs[i]->getOutputSize() != funcs[0]->getOutputSize())) { + error(errSyntaxError, -1, "Incompatible subfunctions in stitching function"); + return; + } + } + + //----- Bounds + obj1 = dict->lookup("Bounds"); + if (!obj1.isArray() || obj1.arrayGetLength() != k - 1) { + error(errSyntaxError, -1, "Missing or invalid 'Bounds' entry in stitching function"); + return; + } + bounds[0] = domain[0][0]; + for (i = 1; i < k; ++i) { + Object obj2 = obj1.arrayGet(i - 1); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Invalid type in 'Bounds' array in stitching function"); + return; + } + bounds[i] = obj2.getNum(); + } + bounds[k] = domain[0][1]; + + //----- Encode + obj1 = dict->lookup("Encode"); + if (!obj1.isArray() || obj1.arrayGetLength() != 2 * k) { + error(errSyntaxError, -1, "Missing or invalid 'Encode' entry in stitching function"); + return; + } + for (i = 0; i < 2 * k; ++i) { + Object obj2 = obj1.arrayGet(i); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Invalid type in 'Encode' array in stitching function"); + return; + } + encode[i] = obj2.getNum(); + } + + //----- pre-compute the scale factors + for (i = 0; i < k; ++i) { + if (bounds[i] == bounds[i + 1]) { + // avoid a divide-by-zero -- in this situation, function i will + // never be used anyway + scale[i] = 0; + } else { + scale[i] = (encode[2 * i + 1] - encode[2 * i]) / (bounds[i + 1] - bounds[i]); + } + } + + n = funcs[0]->getOutputSize(); + ok = true; + return; +} + +StitchingFunction::StitchingFunction(const StitchingFunction *func) : Function(func) +{ + k = func->k; + + funcs = (Function **)gmallocn(k, sizeof(Function *)); + for (int i = 0; i < k; ++i) { + funcs[i] = func->funcs[i]->copy(); + } + + bounds = (double *)gmallocn(k + 1, sizeof(double)); + memcpy(bounds, func->bounds, (k + 1) * sizeof(double)); + + encode = (double *)gmallocn(2 * k, sizeof(double)); + memcpy(encode, func->encode, 2 * k * sizeof(double)); + + scale = (double *)gmallocn(k, sizeof(double)); + memcpy(scale, func->scale, k * sizeof(double)); + + ok = func->ok; +} + +StitchingFunction::~StitchingFunction() +{ + int i; + + if (funcs) { + for (i = 0; i < k; ++i) { + if (funcs[i]) { + delete funcs[i]; + } + } + } + gfree(funcs); + gfree(bounds); + gfree(encode); + gfree(scale); +} + +void StitchingFunction::transform(const double *in, double *out) const +{ + double x; + int i; + + if (in[0] < domain[0][0]) { + x = domain[0][0]; + } else if (in[0] > domain[0][1]) { + x = domain[0][1]; + } else { + x = in[0]; + } + for (i = 0; i < k - 1; ++i) { + if (x < bounds[i + 1]) { + break; + } + } + x = encode[2 * i] + (x - bounds[i]) * scale[i]; + funcs[i]->transform(&x, out); +} + +//------------------------------------------------------------------------ +// PostScriptFunction +//------------------------------------------------------------------------ + +enum PSOp +{ + psOpAbs, + psOpAdd, + psOpAnd, + psOpAtan, + psOpBitshift, + psOpCeiling, + psOpCopy, + psOpCos, + psOpCvi, + psOpCvr, + psOpDiv, + psOpDup, + psOpEq, + psOpExch, + psOpExp, + psOpFalse, + psOpFloor, + psOpGe, + psOpGt, + psOpIdiv, + psOpIndex, + psOpLe, + psOpLn, + psOpLog, + psOpLt, + psOpMod, + psOpMul, + psOpNe, + psOpNeg, + psOpNot, + psOpOr, + psOpPop, + psOpRoll, + psOpRound, + psOpSin, + psOpSqrt, + psOpSub, + psOpTrue, + psOpTruncate, + psOpXor, + psOpIf, + psOpIfelse, + psOpReturn +}; + +// Note: 'if' and 'ifelse' are parsed separately. +// The rest are listed here in alphabetical order. +// The index in this table is equivalent to the entry in PSOp. +static const char *psOpNames[] = { "abs", "add", "and", "atan", "bitshift", "ceiling", "copy", "cos", "cvi", "cvr", "div", "dup", "eq", "exch", "exp", "false", "floor", "ge", "gt", "idiv", + "index", "le", "ln", "log", "lt", "mod", "mul", "ne", "neg", "not", "or", "pop", "roll", "round", "sin", "sqrt", "sub", "true", "truncate", "xor" }; + +#define nPSOps (sizeof(psOpNames) / sizeof(char *)) + +enum PSObjectType +{ + psBool, + psInt, + psReal, + psOperator, + psBlock +}; + +// In the code array, 'if'/'ifelse' operators take up three slots +// plus space for the code in the subclause(s). +// +// +---------------------------------+ +// | psOperator: psOpIf / psOpIfelse | +// +---------------------------------+ +// | psBlock: ptr= | +// +---------------------------------+ +// | psBlock: ptr= | +// +---------------------------------+ +// | if clause | +// | ... | +// | psOperator: psOpReturn | +// +---------------------------------+ +// | else clause | +// | ... | +// | psOperator: psOpReturn | +// +---------------------------------+ +// | ... | +// +// For 'if', pointer is present in the code stream but unused. + +struct PSObject +{ + PSObjectType type; + union { + bool booln; // boolean (stack only) + int intg; // integer (stack and code) + double real; // real (stack and code) + PSOp op; // operator (code only) + int blk; // if/ifelse block pointer (code only) + }; +}; + +#define psStackSize 100 + +class PSStack +{ +public: + PSStack() { sp = psStackSize; } + void clear() { sp = psStackSize; } + void pushBool(bool booln) + { + if (checkOverflow()) { + stack[--sp].type = psBool; + stack[sp].booln = booln; + } + } + void pushInt(int intg) + { + if (checkOverflow()) { + stack[--sp].type = psInt; + stack[sp].intg = intg; + } + } + void pushReal(double real) + { + if (checkOverflow()) { + stack[--sp].type = psReal; + stack[sp].real = real; + } + } + bool popBool() + { + if (checkUnderflow() && checkType(psBool, psBool)) { + return stack[sp++].booln; + } + return false; + } + int popInt() + { + if (checkUnderflow() && checkType(psInt, psInt)) { + return stack[sp++].intg; + } + return 0; + } + double popNum() + { + double ret; + + if (checkUnderflow() && checkType(psInt, psReal)) { + ret = (stack[sp].type == psInt) ? (double)stack[sp].intg : stack[sp].real; + ++sp; + return ret; + } + return 0; + } + bool empty() { return sp == psStackSize; } + bool topIsInt() { return sp < psStackSize && stack[sp].type == psInt; } + bool topTwoAreInts() { return sp < psStackSize - 1 && stack[sp].type == psInt && stack[sp + 1].type == psInt; } + bool topIsReal() { return sp < psStackSize && stack[sp].type == psReal; } + bool topTwoAreNums() { return sp < psStackSize - 1 && (stack[sp].type == psInt || stack[sp].type == psReal) && (stack[sp + 1].type == psInt || stack[sp + 1].type == psReal); } + void copy(int n); + void roll(int n, int j); + void index(int i) + { + if (!checkOverflow()) { + return; + } + --sp; + if (unlikely(sp + i + 1 >= psStackSize)) { + error(errSyntaxError, -1, "Stack underflow in PostScript function"); + return; + } + if (unlikely(sp + i + 1 < 0)) { + error(errSyntaxError, -1, "Stack overflow in PostScript function"); + return; + } + stack[sp] = stack[sp + 1 + i]; + } + void pop() + { + if (!checkUnderflow()) { + return; + } + ++sp; + } + +private: + bool checkOverflow(int n = 1) + { + if (sp - n < 0) { + error(errSyntaxError, -1, "Stack overflow in PostScript function"); + return false; + } + return true; + } + bool checkUnderflow() + { + if (sp == psStackSize) { + error(errSyntaxError, -1, "Stack underflow in PostScript function"); + return false; + } + return true; + } + bool checkType(PSObjectType t1, PSObjectType t2) + { + if (stack[sp].type != t1 && stack[sp].type != t2) { + error(errSyntaxError, -1, "Type mismatch in PostScript function"); + return false; + } + return true; + } + PSObject stack[psStackSize]; + int sp; +}; + +void PSStack::copy(int n) +{ + int i; + + int aux; + if (unlikely(checkedAdd(sp, n, &aux) || aux > psStackSize)) { + error(errSyntaxError, -1, "Stack underflow in PostScript function"); + return; + } + if (unlikely(checkedSubtraction(sp, n, &aux) || aux > psStackSize)) { + error(errSyntaxError, -1, "Stack underflow in PostScript function"); + return; + } + if (!checkOverflow(n)) { + return; + } + for (i = sp + n - 1; i >= sp; --i) { + stack[i - n] = stack[i]; + } + sp -= n; +} + +void PSStack::roll(int n, int j) +{ + PSObject obj; + int i, k; + + if (unlikely(n == 0)) { + return; + } + if (j >= 0) { + j %= n; + } else { + j = -j % n; + if (j != 0) { + j = n - j; + } + } + if (n <= 0 || j == 0 || n > psStackSize || sp + n > psStackSize) { + return; + } + if (j <= n / 2) { + for (i = 0; i < j; ++i) { + obj = stack[sp]; + for (k = sp; k < sp + n - 1; ++k) { + stack[k] = stack[k + 1]; + } + stack[sp + n - 1] = obj; + } + } else { + j = n - j; + for (i = 0; i < j; ++i) { + obj = stack[sp + n - 1]; + for (k = sp + n - 1; k > sp; --k) { + stack[k] = stack[k - 1]; + } + stack[sp] = obj; + } + } +} + +PostScriptFunction::PostScriptFunction(Object *funcObj, Dict *dict) +{ + Stream *str; + int codePtr; + double in[funcMaxInputs]; + int i; + + code = nullptr; + codeString = nullptr; + codeSize = 0; + ok = false; + + //----- initialize the generic stuff + if (!init(dict)) { + goto err1; + } + if (!hasRange) { + error(errSyntaxError, -1, "Type 4 function is missing range"); + goto err1; + } + + //----- get the stream + if (!funcObj->isStream()) { + error(errSyntaxError, -1, "Type 4 function isn't a stream"); + goto err1; + } + str = funcObj->getStream(); + + //----- parse the function + codeString = new GooString(); + str->reset(); + if (getToken(str)->cmp("{") != 0) { + error(errSyntaxError, -1, "Expected '{{' at start of PostScript function"); + goto err1; + } + codePtr = 0; + if (!parseCode(str, &codePtr)) { + goto err2; + } + str->close(); + + //----- set up the cache + for (i = 0; i < m; ++i) { + in[i] = domain[i][0]; + cacheIn[i] = in[i] - 1; + } + transform(in, cacheOut); + + ok = true; + +err2: + str->close(); +err1: + return; +} + +PostScriptFunction::PostScriptFunction(const PostScriptFunction *func) : Function(func) +{ + codeSize = func->codeSize; + + code = (PSObject *)gmallocn(codeSize, sizeof(PSObject)); + memcpy(code, func->code, codeSize * sizeof(PSObject)); + + codeString = func->codeString->copy(); + + memcpy(cacheIn, func->cacheIn, funcMaxInputs * sizeof(double)); + memcpy(cacheOut, func->cacheOut, funcMaxOutputs * sizeof(double)); + + ok = func->ok; +} + +PostScriptFunction::~PostScriptFunction() +{ + gfree(code); + delete codeString; +} + +void PostScriptFunction::transform(const double *in, double *out) const +{ + PSStack stack; + int i; + + // check the cache + for (i = 0; i < m; ++i) { + if (in[i] != cacheIn[i]) { + break; + } + } + if (i == m) { + for (i = 0; i < n; ++i) { + out[i] = cacheOut[i]; + } + return; + } + + for (i = 0; i < m; ++i) { + //~ may need to check for integers here + stack.pushReal(in[i]); + } + exec(&stack, 0); + for (i = n - 1; i >= 0; --i) { + out[i] = stack.popNum(); + if (out[i] < range[i][0]) { + out[i] = range[i][0]; + } else if (out[i] > range[i][1]) { + out[i] = range[i][1]; + } + } + stack.clear(); + + // if (!stack->empty()) { + // error(errSyntaxWarning, -1, + // "Extra values on stack at end of PostScript function"); + // } + + // save current result in the cache + for (i = 0; i < m; ++i) { + cacheIn[i] = in[i]; + } + for (i = 0; i < n; ++i) { + cacheOut[i] = out[i]; + } +} + +bool PostScriptFunction::parseCode(Stream *str, int *codePtr) +{ + bool isReal; + int opPtr, elsePtr; + int a, b, mid, cmp; + + while (true) { + // This needs to be on the heap to help make parseCode + // able to call itself more times recursively + std::unique_ptr tok = getToken(str); + const char *p = tok->c_str(); + if (isdigit(*p) || *p == '.' || *p == '-') { + isReal = false; + for (; *p; ++p) { + if (*p == '.') { + isReal = true; + break; + } + } + resizeCode(*codePtr); + if (isReal) { + code[*codePtr].type = psReal; + code[*codePtr].real = gatof(tok->c_str()); + } else { + code[*codePtr].type = psInt; + code[*codePtr].intg = atoi(tok->c_str()); + } + ++*codePtr; + } else if (!tok->cmp("{")) { + opPtr = *codePtr; + *codePtr += 3; + resizeCode(opPtr + 2); + if (!parseCode(str, codePtr)) { + return false; + } + tok = getToken(str); + if (!tok->cmp("{")) { + elsePtr = *codePtr; + if (!parseCode(str, codePtr)) { + return false; + } + tok = getToken(str); + } else { + elsePtr = -1; + } + if (!tok->cmp("if")) { + if (elsePtr >= 0) { + error(errSyntaxError, -1, "Got 'if' operator with two blocks in PostScript function"); + return false; + } + code[opPtr].type = psOperator; + code[opPtr].op = psOpIf; + code[opPtr + 2].type = psBlock; + code[opPtr + 2].blk = *codePtr; + } else if (!tok->cmp("ifelse")) { + if (elsePtr < 0) { + error(errSyntaxError, -1, "Got 'ifelse' operator with one block in PostScript function"); + return false; + } + code[opPtr].type = psOperator; + code[opPtr].op = psOpIfelse; + code[opPtr + 1].type = psBlock; + code[opPtr + 1].blk = elsePtr; + code[opPtr + 2].type = psBlock; + code[opPtr + 2].blk = *codePtr; + } else { + error(errSyntaxError, -1, "Expected if/ifelse operator in PostScript function"); + return false; + } + } else if (!tok->cmp("}")) { + resizeCode(*codePtr); + code[*codePtr].type = psOperator; + code[*codePtr].op = psOpReturn; + ++*codePtr; + break; + } else { + a = -1; + b = nPSOps; + cmp = 0; // make gcc happy + // invariant: psOpNames[a] < tok < psOpNames[b] + while (b - a > 1) { + mid = (a + b) / 2; + cmp = tok->cmp(psOpNames[mid]); + if (cmp > 0) { + a = mid; + } else if (cmp < 0) { + b = mid; + } else { + a = b = mid; + } + } + if (cmp != 0) { + error(errSyntaxError, -1, "Unknown operator '{0:t}' in PostScript function", tok.get()); + return false; + } + resizeCode(*codePtr); + code[*codePtr].type = psOperator; + code[*codePtr].op = (PSOp)a; + ++*codePtr; + } + } + return true; +} + +std::unique_ptr PostScriptFunction::getToken(Stream *str) +{ + int c; + bool comment; + + std::string s; + comment = false; + while (true) { + if ((c = str->getChar()) == EOF) { + break; + } + codeString->append(c); + if (comment) { + if (c == '\x0a' || c == '\x0d') { + comment = false; + } + } else if (c == '%') { + comment = true; + } else if (!isspace(c)) { + break; + } + } + if (c == '{' || c == '}') { + s.push_back((char)c); + } else if (isdigit(c) || c == '.' || c == '-') { + while (true) { + s.push_back((char)c); + c = str->lookChar(); + if (c == EOF || !(isdigit(c) || c == '.' || c == '-')) { + break; + } + str->getChar(); + codeString->append(c); + } + } else { + while (true) { + s.push_back((char)c); + c = str->lookChar(); + if (c == EOF || !isalnum(c)) { + break; + } + str->getChar(); + codeString->append(c); + } + } + return std::make_unique(s); +} + +void PostScriptFunction::resizeCode(int newSize) +{ + if (newSize >= codeSize) { + codeSize += 64; + code = (PSObject *)greallocn(code, codeSize, sizeof(PSObject)); + } +} + +void PostScriptFunction::exec(PSStack *stack, int codePtr) const +{ + int i1, i2; + double r1, r2, result; + bool b1, b2; + + while (true) { + switch (code[codePtr].type) { + case psInt: + stack->pushInt(code[codePtr++].intg); + break; + case psReal: + stack->pushReal(code[codePtr++].real); + break; + case psOperator: + switch (code[codePtr++].op) { + case psOpAbs: + if (stack->topIsInt()) { + stack->pushInt(abs(stack->popInt())); + } else { + stack->pushReal(fabs(stack->popNum())); + } + break; + case psOpAdd: + if (stack->topTwoAreInts()) { + i2 = stack->popInt(); + i1 = stack->popInt(); + stack->pushInt(i1 + i2); + } else { + r2 = stack->popNum(); + r1 = stack->popNum(); + stack->pushReal(r1 + r2); + } + break; + case psOpAnd: + if (stack->topTwoAreInts()) { + i2 = stack->popInt(); + i1 = stack->popInt(); + stack->pushInt(i1 & i2); + } else { + b2 = stack->popBool(); + b1 = stack->popBool(); + stack->pushBool(b1 && b2); + } + break; + case psOpAtan: + r2 = stack->popNum(); + r1 = stack->popNum(); + result = atan2(r1, r2) * 180.0 / M_PI; + if (result < 0) { + result += 360.0; + } + stack->pushReal(result); + break; + case psOpBitshift: + i2 = stack->popInt(); + i1 = stack->popInt(); + if (i2 > 0) { + stack->pushInt(i1 << i2); + } else if (i2 < 0) { + stack->pushInt((int)((unsigned int)i1 >> -i2)); + } else { + stack->pushInt(i1); + } + break; + case psOpCeiling: + if (!stack->topIsInt()) { + stack->pushReal(ceil(stack->popNum())); + } + break; + case psOpCopy: + stack->copy(stack->popInt()); + break; + case psOpCos: + stack->pushReal(cos(stack->popNum() * M_PI / 180.0)); + break; + case psOpCvi: + if (!stack->topIsInt()) { + stack->pushInt((int)stack->popNum()); + } + break; + case psOpCvr: + if (!stack->topIsReal()) { + stack->pushReal(stack->popNum()); + } + break; + case psOpDiv: + r2 = stack->popNum(); + r1 = stack->popNum(); + stack->pushReal(r1 / r2); + break; + case psOpDup: + stack->copy(1); + break; + case psOpEq: + if (stack->topTwoAreInts()) { + i2 = stack->popInt(); + i1 = stack->popInt(); + stack->pushBool(i1 == i2); + } else if (stack->topTwoAreNums()) { + r2 = stack->popNum(); + r1 = stack->popNum(); + stack->pushBool(r1 == r2); + } else { + b2 = stack->popBool(); + b1 = stack->popBool(); + stack->pushBool(b1 == b2); + } + break; + case psOpExch: + stack->roll(2, 1); + break; + case psOpExp: + r2 = stack->popNum(); + r1 = stack->popNum(); + stack->pushReal(pow(r1, r2)); + break; + case psOpFalse: + stack->pushBool(false); + break; + case psOpFloor: + if (!stack->topIsInt()) { + stack->pushReal(floor(stack->popNum())); + } + break; + case psOpGe: + if (stack->topTwoAreInts()) { + i2 = stack->popInt(); + i1 = stack->popInt(); + stack->pushBool(i1 >= i2); + } else { + r2 = stack->popNum(); + r1 = stack->popNum(); + stack->pushBool(r1 >= r2); + } + break; + case psOpGt: + if (stack->topTwoAreInts()) { + i2 = stack->popInt(); + i1 = stack->popInt(); + stack->pushBool(i1 > i2); + } else { + r2 = stack->popNum(); + r1 = stack->popNum(); + stack->pushBool(r1 > r2); + } + break; + case psOpIdiv: + i2 = stack->popInt(); + i1 = stack->popInt(); + if (likely((i2 != 0) && !(i2 == -1 && i1 == INT_MIN))) { + stack->pushInt(i1 / i2); + } + break; + case psOpIndex: + stack->index(stack->popInt()); + break; + case psOpLe: + if (stack->topTwoAreInts()) { + i2 = stack->popInt(); + i1 = stack->popInt(); + stack->pushBool(i1 <= i2); + } else { + r2 = stack->popNum(); + r1 = stack->popNum(); + stack->pushBool(r1 <= r2); + } + break; + case psOpLn: + stack->pushReal(log(stack->popNum())); + break; + case psOpLog: + stack->pushReal(log10(stack->popNum())); + break; + case psOpLt: + if (stack->topTwoAreInts()) { + i2 = stack->popInt(); + i1 = stack->popInt(); + stack->pushBool(i1 < i2); + } else { + r2 = stack->popNum(); + r1 = stack->popNum(); + stack->pushBool(r1 < r2); + } + break; + case psOpMod: + i2 = stack->popInt(); + i1 = stack->popInt(); + if (likely(i2 != 0)) { + stack->pushInt(i1 % i2); + } + break; + case psOpMul: + if (stack->topTwoAreInts()) { + i2 = stack->popInt(); + i1 = stack->popInt(); + //~ should check for out-of-range, and push a real instead + stack->pushInt(i1 * i2); + } else { + r2 = stack->popNum(); + r1 = stack->popNum(); + stack->pushReal(r1 * r2); + } + break; + case psOpNe: + if (stack->topTwoAreInts()) { + i2 = stack->popInt(); + i1 = stack->popInt(); + stack->pushBool(i1 != i2); + } else if (stack->topTwoAreNums()) { + r2 = stack->popNum(); + r1 = stack->popNum(); + stack->pushBool(r1 != r2); + } else { + b2 = stack->popBool(); + b1 = stack->popBool(); + stack->pushBool(b1 != b2); + } + break; + case psOpNeg: + if (stack->topIsInt()) { + stack->pushInt(-stack->popInt()); + } else { + stack->pushReal(-stack->popNum()); + } + break; + case psOpNot: + if (stack->topIsInt()) { + stack->pushInt(~stack->popInt()); + } else { + stack->pushBool(!stack->popBool()); + } + break; + case psOpOr: + if (stack->topTwoAreInts()) { + i2 = stack->popInt(); + i1 = stack->popInt(); + stack->pushInt(i1 | i2); + } else { + b2 = stack->popBool(); + b1 = stack->popBool(); + stack->pushBool(b1 || b2); + } + break; + case psOpPop: + stack->pop(); + break; + case psOpRoll: + i2 = stack->popInt(); + i1 = stack->popInt(); + stack->roll(i1, i2); + break; + case psOpRound: + if (!stack->topIsInt()) { + r1 = stack->popNum(); + stack->pushReal((r1 >= 0) ? floor(r1 + 0.5) : ceil(r1 - 0.5)); + } + break; + case psOpSin: + stack->pushReal(sin(stack->popNum() * M_PI / 180.0)); + break; + case psOpSqrt: + stack->pushReal(sqrt(stack->popNum())); + break; + case psOpSub: + if (stack->topTwoAreInts()) { + i2 = stack->popInt(); + i1 = stack->popInt(); + stack->pushInt(i1 - i2); + } else { + r2 = stack->popNum(); + r1 = stack->popNum(); + stack->pushReal(r1 - r2); + } + break; + case psOpTrue: + stack->pushBool(true); + break; + case psOpTruncate: + if (!stack->topIsInt()) { + r1 = stack->popNum(); + stack->pushReal((r1 >= 0) ? floor(r1) : ceil(r1)); + } + break; + case psOpXor: + if (stack->topTwoAreInts()) { + i2 = stack->popInt(); + i1 = stack->popInt(); + stack->pushInt(i1 ^ i2); + } else { + b2 = stack->popBool(); + b1 = stack->popBool(); + stack->pushBool(b1 ^ b2); + } + break; + case psOpIf: + b1 = stack->popBool(); + if (b1) { + exec(stack, codePtr + 2); + } + codePtr = code[codePtr + 1].blk; + break; + case psOpIfelse: + b1 = stack->popBool(); + if (b1) { + exec(stack, codePtr + 2); + } else { + exec(stack, code[codePtr].blk); + } + codePtr = code[codePtr + 1].blk; + break; + case psOpReturn: + return; + } + break; + default: + error(errSyntaxError, -1, "Internal: bad object in PostScript function code"); + break; + } + } +} diff --git a/poppler-24.05.0/poppler/Function.h b/poppler-24.05.0/poppler/Function.h new file mode 100644 index 0000000000000000000000000000000000000000..965280257e6a3dd8af49d02d32b1253c99234548 --- /dev/null +++ b/poppler-24.05.0/poppler/Function.h @@ -0,0 +1,254 @@ +//======================================================================== +// +// Function.h +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2009, 2010, 2018, 2019, 2021, 2024 Albert Astals Cid +// Copyright (C) 2010 Christian Feuersänger +// Copyright (C) 2011 Andrea Canciani +// Copyright (C) 2012 Thomas Freitag +// Copyright (C) 2012 Adam Reichold +// +// 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 +// +//======================================================================== + +#ifndef FUNCTION_H +#define FUNCTION_H + +#include "Object.h" +#include + +class Dict; +class Stream; +struct PSObject; +class PSStack; + +//------------------------------------------------------------------------ +// Function +//------------------------------------------------------------------------ + +#define funcMaxInputs 32 +#define funcMaxOutputs 32 +#define sampledFuncMaxInputs 16 + +class POPPLER_PRIVATE_EXPORT Function +{ +public: + Function(); + + virtual ~Function(); + + Function(const Function &) = delete; + Function &operator=(const Function &other) = delete; + + // Construct a function. Returns NULL if unsuccessful. + static Function *parse(Object *funcObj); + + // Initialize the entries common to all function types. + bool init(Dict *dict); + + virtual Function *copy() const = 0; + + enum class Type + { + Identity, + Sampled, + Exponential, + Stitching, + PostScript + }; + + virtual Type getType() const = 0; + + // Return size of input and output tuples. + int getInputSize() const { return m; } + int getOutputSize() const { return n; } + + double getDomainMin(int i) const { return domain[i][0]; } + double getDomainMax(int i) const { return domain[i][1]; } + double getRangeMin(int i) const { return range[i][0]; } + double getRangeMax(int i) const { return range[i][1]; } + bool getHasRange() const { return hasRange; } + virtual bool hasDifferentResultSet(const Function *func) const { return false; } + + // Transform an input tuple into an output tuple. + virtual void transform(const double *in, double *out) const = 0; + + virtual bool isOk() const = 0; + +protected: + static Function *parse(Object *funcObj, std::set *usedParents); + + explicit Function(const Function *func); + + int m, n; // size of input and output tuples + double // min and max values for function domain + domain[funcMaxInputs][2]; + double // min and max values for function range + range[funcMaxOutputs][2]; + bool hasRange; // set if range is defined +}; + +//------------------------------------------------------------------------ +// IdentityFunction +//------------------------------------------------------------------------ + +class IdentityFunction : public Function +{ +public: + IdentityFunction(); + ~IdentityFunction() override; + Function *copy() const override { return new IdentityFunction(); } + Type getType() const override { return Type::Identity; } + void transform(const double *in, double *out) const override; + bool isOk() const override { return true; } + +private: +}; + +//------------------------------------------------------------------------ +// SampledFunction +//------------------------------------------------------------------------ + +class SampledFunction : public Function +{ +public: + SampledFunction(Object *funcObj, Dict *dict); + ~SampledFunction() override; + Function *copy() const override { return new SampledFunction(this); } + Type getType() const override { return Type::Sampled; } + void transform(const double *in, double *out) const override; + bool isOk() const override { return ok; } + bool hasDifferentResultSet(const Function *func) const override; + + int getSampleSize(int i) const { return sampleSize[i]; } + double getEncodeMin(int i) const { return encode[i][0]; } + double getEncodeMax(int i) const { return encode[i][1]; } + double getDecodeMin(int i) const { return decode[i][0]; } + double getDecodeMax(int i) const { return decode[i][1]; } + const double *getSamples() const { return samples; } + int getSampleNumber() const { return nSamples; } + +private: + explicit SampledFunction(const SampledFunction *func); + + int // number of samples for each domain element + sampleSize[funcMaxInputs]; + double // min and max values for domain encoder + encode[funcMaxInputs][2]; + double // min and max values for range decoder + decode[funcMaxOutputs][2]; + double // input multipliers + inputMul[funcMaxInputs]; + int *idxOffset; + double *samples; // the samples + int nSamples; // size of the samples array + double *sBuf; // buffer for the transform function + mutable double cacheIn[funcMaxInputs]; + mutable double cacheOut[funcMaxOutputs]; + bool ok; +}; + +//------------------------------------------------------------------------ +// ExponentialFunction +//------------------------------------------------------------------------ + +class ExponentialFunction : public Function +{ +public: + ExponentialFunction(Object *funcObj, Dict *dict); + ~ExponentialFunction() override; + Function *copy() const override { return new ExponentialFunction(this); } + Type getType() const override { return Type::Exponential; } + void transform(const double *in, double *out) const override; + bool isOk() const override { return ok; } + + const double *getC0() const { return c0; } + const double *getC1() const { return c1; } + double getE() const { return e; } + +private: + explicit ExponentialFunction(const ExponentialFunction *func); + + double c0[funcMaxOutputs]; + double c1[funcMaxOutputs]; + double e; + bool isLinear; + bool ok; +}; + +//------------------------------------------------------------------------ +// StitchingFunction +//------------------------------------------------------------------------ + +class StitchingFunction : public Function +{ +public: + StitchingFunction(Object *funcObj, Dict *dict, std::set *usedParents); + ~StitchingFunction() override; + Function *copy() const override { return new StitchingFunction(this); } + Type getType() const override { return Type::Stitching; } + void transform(const double *in, double *out) const override; + bool isOk() const override { return ok; } + + int getNumFuncs() const { return k; } + const Function *getFunc(int i) const { return funcs[i]; } + const double *getBounds() const { return bounds; } + const double *getEncode() const { return encode; } + const double *getScale() const { return scale; } + +private: + explicit StitchingFunction(const StitchingFunction *func); + + int k; + Function **funcs; + double *bounds; + double *encode; + double *scale; + bool ok; +}; + +//------------------------------------------------------------------------ +// PostScriptFunction +//------------------------------------------------------------------------ + +class PostScriptFunction : public Function +{ +public: + PostScriptFunction(Object *funcObj, Dict *dict); + ~PostScriptFunction() override; + Function *copy() const override { return new PostScriptFunction(this); } + Type getType() const override { return Type::PostScript; } + void transform(const double *in, double *out) const override; + bool isOk() const override { return ok; } + + const GooString *getCodeString() const { return codeString; } + +private: + explicit PostScriptFunction(const PostScriptFunction *func); + bool parseCode(Stream *str, int *codePtr); + std::unique_ptr getToken(Stream *str); + void resizeCode(int newSize); + void exec(PSStack *stack, int codePtr) const; + + GooString *codeString; + PSObject *code; + int codeSize; + mutable double cacheIn[funcMaxInputs]; + mutable double cacheOut[funcMaxOutputs]; + bool ok; +}; + +#endif diff --git a/poppler-24.05.0/poppler/GPGMECryptoSignBackend.cc b/poppler-24.05.0/poppler/GPGMECryptoSignBackend.cc new file mode 100644 index 0000000000000000000000000000000000000000..b862650ac0d337e5806f8d2c4353332ae7b293df --- /dev/null +++ b/poppler-24.05.0/poppler/GPGMECryptoSignBackend.cc @@ -0,0 +1,449 @@ +//======================================================================== +// +// GPGMECryptoSignBackend.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +//======================================================================== + +#include "config.h" +#include "GPGMECryptoSignBackend.h" +#include "DistinguishedNameParser.h" +#include +#include +#include +#include +#include + +bool GpgSignatureBackend::hasSufficientVersion() +{ + // gpg 2.4.0 does not support padded signatures. + // Most gpg signatures are padded. This is fixed for 2.4.1 + // gpg 2.4.0 does not support generating signatures + // with definite lengths. This is also fixed for 2.4.1. + // this has also been fixed in 2.2.42 in the 2.2 branch + auto version = GpgME::engineInfo(GpgME::GpgSMEngine).engineVersion(); + if (version > "2.4.0") { + return true; + } + if (version >= "2.3.0") { // development branch for 2.4 releases; no more releases here + return false; + } + return version >= "2.2.42"; +} + +/// GPGME helper methods + +// gpgme++'s string-like functions returns char pointers that can be nullptr +// Creating std::string from nullptr is, depending on c++ standards versions +// either undefined behavior or illegal, so we need a helper. + +static std::string fromCharPtr(const char *data) +{ + if (data) { + return std::string { data }; + } + return {}; +} + +static bool isSuccess(const GpgME::Error &err) +{ + if (err) { + return false; + } + if (err.isCanceled()) { + return false; + } + return true; +} + +template +static bool isValidResult(const Result &result) +{ + return isSuccess(result.error()); +} + +template +static bool hasValidResult(const std::optional &result) +{ + if (!result) { + return false; + } + return isValidResult(result.value()); +} + +static std::optional getSignature(const GpgME::VerificationResult &result, size_t signatureNumber) +{ + if (result.numSignatures() > signatureNumber) { + return result.signature(signatureNumber); + } + return std::nullopt; +} + +static X509CertificateInfo::Validity getValidityFromSubkey(const GpgME::Subkey &key) +{ + X509CertificateInfo::Validity validity; + validity.notBefore = key.creationTime(); + validity.notAfter = key.expirationTime(); + return validity; +} + +static X509CertificateInfo::EntityInfo getEntityInfoFromKey(std::string_view dnString) +{ + const auto dn = DN::parseString(dnString); + X509CertificateInfo::EntityInfo info; + info.commonName = DN::FindFirstValue(dn, "CN").value_or(std::string {}); + info.organization = DN::FindFirstValue(dn, "O").value_or(std::string {}); + info.email = DN::FindFirstValue(dn, "EMAIL").value_or(std::string {}); + info.distinguishedName = std::string { dnString }; + return info; +} + +static std::unique_ptr getCertificateInfoFromKey(const GpgME::Key &key) +{ + auto certificateInfo = std::make_unique(); + certificateInfo->setIssuerInfo(getEntityInfoFromKey(fromCharPtr(key.issuerName()))); + certificateInfo->setSerialNumber(GooString { DN::detail::parseHexString(fromCharPtr(key.issuerSerial())).value_or("") }); + auto subjectInfo = getEntityInfoFromKey(fromCharPtr(key.userID(0).id())); + if (subjectInfo.email.empty()) { + subjectInfo.email = fromCharPtr(key.userID(1).email()); + } + certificateInfo->setSubjectInfo(std::move(subjectInfo)); + certificateInfo->setValidity(getValidityFromSubkey(key.subkey(0))); + certificateInfo->setNickName(GooString(fromCharPtr(key.primaryFingerprint()))); + X509CertificateInfo::PublicKeyInfo pkInfo; + pkInfo.publicKeyStrength = key.subkey(0).length(); + switch (key.subkey(0).publicKeyAlgorithm()) { + case GpgME::Subkey::AlgoDSA: + pkInfo.publicKeyType = DSAKEY; + break; + case GpgME::Subkey::AlgoECC: + case GpgME::Subkey::AlgoECDH: + case GpgME::Subkey::AlgoECDSA: + case GpgME::Subkey::AlgoEDDSA: + pkInfo.publicKeyType = ECKEY; + break; + case GpgME::Subkey::AlgoRSA: + case GpgME::Subkey::AlgoRSA_E: + case GpgME::Subkey::AlgoRSA_S: + pkInfo.publicKeyType = RSAKEY; + break; + case GpgME::Subkey::AlgoELG: + case GpgME::Subkey::AlgoELG_E: + case GpgME::Subkey::AlgoMax: + case GpgME::Subkey::AlgoUnknown: + pkInfo.publicKeyType = OTHERKEY; + } + { + auto ctx = GpgME::Context::create(GpgME::CMS); + GpgME::Data pubkeydata; + const auto err = ctx->exportPublicKeys(key.primaryFingerprint(), pubkeydata); + if (isSuccess(err)) { + certificateInfo->setCertificateDER(GooString(pubkeydata.toString())); + } + } + + certificateInfo->setPublicKeyInfo(std::move(pkInfo)); + + int kue = 0; + // this block is kind of a hack. GPGSM collapses multiple + // into one bit, so trying to match it back can never be good + if (key.canSign()) { + kue |= KU_NON_REPUDIATION; + kue |= KU_DIGITAL_SIGNATURE; + } + if (key.canEncrypt()) { + kue |= KU_KEY_ENCIPHERMENT; + kue |= KU_DATA_ENCIPHERMENT; + } + if (key.canCertify()) { + kue |= KU_KEY_CERT_SIGN; + } + certificateInfo->setKeyUsageExtensions(kue); + + auto subkey = key.subkey(0); + if (subkey.isCardKey()) { + certificateInfo->setKeyLocation(KeyLocation::HardwareToken); + } else if (subkey.isSecret()) { + certificateInfo->setKeyLocation(KeyLocation::Computer); + } + + return certificateInfo; +} + +/// implementation of header file + +GpgSignatureBackend::GpgSignatureBackend() +{ + GpgME::initializeLibrary(); +} + +std::unique_ptr GpgSignatureBackend::createSigningHandler(const std::string &certID, HashAlgorithm /*digestAlgTag*/) +{ + return std::make_unique(certID); +} + +std::unique_ptr GpgSignatureBackend::createVerificationHandler(std::vector &&pkcs7) +{ + return std::make_unique(std::move(pkcs7)); +} + +std::vector> GpgSignatureBackend::getAvailableSigningCertificates() +{ + std::vector> certificates; + const auto context = GpgME::Context::create(GpgME::CMS); + auto err = context->startKeyListing(static_cast(nullptr), true /*secretOnly*/); + while (isSuccess(err)) { + const auto key = context->nextKey(err); + if (!key.isNull() && isSuccess(err)) { + if (key.isBad()) { + continue; + } + if (!key.canSign()) { + continue; + } + certificates.push_back(getCertificateInfoFromKey(key)); + } else { + break; + } + } + return certificates; +} + +GpgSignatureCreation::GpgSignatureCreation(const std::string &certId) : gpgContext { GpgME::Context::create(GpgME::CMS) } +{ + GpgME::Error error; + const auto signingKey = gpgContext->key(certId.c_str(), error, true); + if (isSuccess(error)) { + gpgContext->addSigningKey(signingKey); + key = signingKey; + } +} + +void GpgSignatureCreation::addData(unsigned char *dataBlock, int dataLen) +{ + gpgData.write(dataBlock, dataLen); +} +std::optional GpgSignatureCreation::signDetached(const std::string &password) +{ + if (!key) { + return {}; + } + gpgData.rewind(); + GpgME::Data signatureData; + const auto signingResult = gpgContext->sign(gpgData, signatureData, GpgME::SignatureMode::Detached); + if (!isValidResult(signingResult)) { + return {}; + } + + const auto signatureString = signatureData.toString(); + return GooString(std::move(signatureString)); +} + +std::unique_ptr GpgSignatureCreation::getCertificateInfo() const +{ + if (!key) { + return nullptr; + } + return getCertificateInfoFromKey(*key); +} + +GpgSignatureVerification::GpgSignatureVerification(const std::vector &p7data) : gpgContext { GpgME::Context::create(GpgME::CMS) }, signatureData(reinterpret_cast(p7data.data()), p7data.size()) +{ + gpgContext->setOffline(true); + signatureData.setEncoding(GpgME::Data::BinaryEncoding); +} + +void GpgSignatureVerification::addData(unsigned char *dataBlock, int dataLen) +{ + signedData.write(dataBlock, dataLen); +} + +std::unique_ptr GpgSignatureVerification::getCertificateInfo() const +{ + if (!hasValidResult(gpgResult)) { + return nullptr; + } + auto signature = getSignature(gpgResult.value(), 0); + if (!signature) { + return nullptr; + } + auto gpgInfo = getCertificateInfoFromKey(signature->key(true, false)); + return gpgInfo; +} + +HashAlgorithm GpgSignatureVerification::getHashAlgorithm() const +{ + if (gpgResult) { + const auto signature = getSignature(gpgResult.value(), 0); + if (!signature) { + return HashAlgorithm::Unknown; + } + switch (signature->hashAlgorithm()) { + case GPGME_MD_MD5: + return HashAlgorithm::Md5; + case GPGME_MD_SHA1: + return HashAlgorithm::Sha1; + case GPGME_MD_MD2: + return HashAlgorithm::Md2; + case GPGME_MD_SHA256: + return HashAlgorithm::Sha256; + case GPGME_MD_SHA384: + return HashAlgorithm::Sha384; + case GPGME_MD_SHA512: + return HashAlgorithm::Sha512; + case GPGME_MD_SHA224: + return HashAlgorithm::Sha224; + case GPGME_MD_NONE: + case GPGME_MD_RMD160: + case GPGME_MD_TIGER: + case GPGME_MD_HAVAL: + case GPGME_MD_MD4: + case GPGME_MD_CRC32: + case GPGME_MD_CRC32_RFC1510: + case GPGME_MD_CRC24_RFC2440: + default: + return HashAlgorithm::Unknown; + } + } + return HashAlgorithm::Unknown; +} + +std::string GpgSignatureVerification::getSignerName() const +{ + if (!hasValidResult(gpgResult)) { + return {}; + } + + const auto signature = getSignature(gpgResult.value(), 0); + if (!signature) { + return {}; + } + const auto dn = DN::parseString(fromCharPtr(signature->key(true, false).userID(0).id())); + return DN::FindFirstValue(dn, "CN").value_or(""); +} + +std::string GpgSignatureVerification::getSignerSubjectDN() const +{ + if (!hasValidResult(gpgResult)) { + return {}; + } + const auto signature = getSignature(gpgResult.value(), 0); + if (!signature) { + return {}; + } + return fromCharPtr(signature->key(true, false).userID(0).id()); +} + +std::chrono::system_clock::time_point GpgSignatureVerification::getSigningTime() const +{ + if (!hasValidResult(gpgResult)) { + return {}; + } + const auto signature = getSignature(gpgResult.value(), 0); + if (!signature) { + return {}; + } + return std::chrono::system_clock::from_time_t(signature->creationTime()); +} + +void GpgSignatureVerification::validateCertificateAsync(std::chrono::system_clock::time_point validation_time, bool ocspRevocationCheck, bool useAIACertFetch, const std::function &doneFunction) +{ + cachedValidationStatus.reset(); + if (!gpgResult) { + validationStatus = std::async([doneFunction]() { + if (doneFunction) { + doneFunction(); + } + return CERTIFICATE_NOT_VERIFIED; + }); + return; + } + if (gpgResult->error()) { + validationStatus = std::async([doneFunction]() { + if (doneFunction) { + doneFunction(); + } + return CERTIFICATE_GENERIC_ERROR; + }); + return; + } + const auto signature = getSignature(gpgResult.value(), 0); + if (!signature) { + validationStatus = std::async([doneFunction]() { + if (doneFunction) { + doneFunction(); + } + return CERTIFICATE_GENERIC_ERROR; + }); + return; + } + std::string keyFP = fromCharPtr(signature->key().primaryFingerprint()); + validationStatus = std::async([keyFP = std::move(keyFP), doneFunction, ocspRevocationCheck, useAIACertFetch]() { + auto context = GpgME::Context::create(GpgME::CMS); + context->setOffline((!ocspRevocationCheck) || useAIACertFetch); + context->setKeyListMode(GpgME::KeyListMode::Local | GpgME::KeyListMode::Validate); + GpgME::Error e; + const auto key = context->key(keyFP.c_str(), e, false); + if (doneFunction) { + doneFunction(); + } + if (e.isCanceled()) { + return CERTIFICATE_NOT_VERIFIED; + } + if (e) { + return CERTIFICATE_GENERIC_ERROR; + } + if (key.isExpired()) { + return CERTIFICATE_EXPIRED; + } + if (key.isRevoked()) { + return CERTIFICATE_REVOKED; + } + if (key.isBad()) { + return CERTIFICATE_NOT_VERIFIED; + } + return CERTIFICATE_TRUSTED; + }); +} + +CertificateValidationStatus GpgSignatureVerification::validateCertificateResult() +{ + if (cachedValidationStatus) { + return cachedValidationStatus.value(); + } + if (!validationStatus.valid()) { + return CERTIFICATE_NOT_VERIFIED; + } + validationStatus.wait(); + cachedValidationStatus = validationStatus.get(); + return cachedValidationStatus.value(); +} + +SignatureValidationStatus GpgSignatureVerification::validateSignature() +{ + signedData.rewind(); + const auto result = gpgContext->verifyDetachedSignature(signatureData, signedData); + gpgResult = result; + + if (!isValidResult(result)) { + return SIGNATURE_DECODING_ERROR; + } + const auto signature = getSignature(result, 0); + if (!signature) { + return SIGNATURE_DECODING_ERROR; + } + // Ensure key is actually available + signature->key(true, true); + const auto summary = signature->summary(); + + using Summary = GpgME::Signature::Summary; + if (summary & Summary::Red) { + return SIGNATURE_INVALID; + } + if (summary & Summary::Green || summary & Summary::Valid) { + return SIGNATURE_VALID; + } + return SIGNATURE_GENERIC_ERROR; +} diff --git a/poppler-24.05.0/poppler/GPGMECryptoSignBackend.h b/poppler-24.05.0/poppler/GPGMECryptoSignBackend.h new file mode 100644 index 0000000000000000000000000000000000000000..f7e81170dfadce10525f3d6cb87774664186c8f8 --- /dev/null +++ b/poppler-24.05.0/poppler/GPGMECryptoSignBackend.h @@ -0,0 +1,62 @@ +//======================================================================== +// +// GPGMECryptoSignBackend.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +//======================================================================== + +#include "CryptoSignBackend.h" + +#include +#include +#include +#include + +class GpgSignatureBackend : public CryptoSign::Backend +{ +public: + GpgSignatureBackend(); + std::unique_ptr createVerificationHandler(std::vector &&pkcs7) final; + std::unique_ptr createSigningHandler(const std::string &certID, HashAlgorithm digestAlgTag) final; + std::vector> getAvailableSigningCertificates() final; + static bool hasSufficientVersion(); +}; + +class GpgSignatureCreation : public CryptoSign::SigningInterface +{ +public: + GpgSignatureCreation(const std::string &certId); + void addData(unsigned char *dataBlock, int dataLen) final; + std::unique_ptr getCertificateInfo() const final; + std::optional signDetached(const std::string &password) final; + +private: + std::unique_ptr gpgContext; + GpgME::Data gpgData; + std::optional key; +}; + +class GpgSignatureVerification : public CryptoSign::VerificationInterface +{ +public: + explicit GpgSignatureVerification(const std::vector &pkcs7data); + SignatureValidationStatus validateSignature() final; + void addData(unsigned char *dataBlock, int dataLen) final; + std::chrono::system_clock::time_point getSigningTime() const final; + std::string getSignerName() const final; + std::string getSignerSubjectDN() const final; + HashAlgorithm getHashAlgorithm() const final; + CertificateValidationStatus validateCertificateResult() final; + void validateCertificateAsync(std::chrono::system_clock::time_point validation_time, bool ocspRevocationCheck, bool useAIACertFetch, const std::function &doneCallback) final; + std::unique_ptr getCertificateInfo() const final; + +private: + std::unique_ptr gpgContext; + GpgME::Data signatureData; + GpgME::Data signedData; + std::optional gpgResult; + std::future validationStatus; + std::optional cachedValidationStatus; +}; diff --git a/poppler-24.05.0/poppler/Gfx.cc b/poppler-24.05.0/poppler/Gfx.cc new file mode 100644 index 0000000000000000000000000000000000000000..2db12d8827d80046338a9f21eaeb36a2fb3189da --- /dev/null +++ b/poppler-24.05.0/poppler/Gfx.cc @@ -0,0 +1,5421 @@ +//======================================================================== +// +// Gfx.cc +// +// Copyright 1996-2013 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Jonathan Blandford +// Copyright (C) 2005-2013, 2015-2022 Albert Astals Cid +// Copyright (C) 2006 Thorkild Stray +// Copyright (C) 2006 Kristian Høgsberg +// Copyright (C) 2006-2011 Carlos Garcia Campos +// Copyright (C) 2006, 2007 Jeff Muizelaar +// Copyright (C) 2007, 2008 Brad Hards +// Copyright (C) 2007, 2011, 2017, 2021, 2023 Adrian Johnson +// Copyright (C) 2007, 2008 Iñigo Martínez +// Copyright (C) 2007 Koji Otani +// Copyright (C) 2007 Krzysztof Kowalczyk +// Copyright (C) 2008 Pino Toscano +// Copyright (C) 2008 Michael Vrable +// Copyright (C) 2008 Hib Eris +// Copyright (C) 2009 M Joonas Pihlaja +// Copyright (C) 2009-2016, 2020 Thomas Freitag +// Copyright (C) 2009 William Bader +// Copyright (C) 2009, 2010 David Benjamin +// Copyright (C) 2010 Nils Höglund +// Copyright (C) 2010 Christian Feuersänger +// Copyright (C) 2011 Axel Strübing +// Copyright (C) 2012, 2024 Even Rouault +// Copyright (C) 2012, 2013 Fabio D'Urso +// Copyright (C) 2012 Lu Wang +// Copyright (C) 2014 Jason Crain +// Copyright (C) 2017, 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018, 2019 Adam Reichold +// Copyright (C) 2018 Denis Onishchenko +// Copyright (C) 2019 LE GARREC Vincent +// Copyright (C) 2019-2022 Oliver Sander +// Copyright (C) 2019 Volker Krause +// Copyright (C) 2020 Philipp Knechtges +// Copyright (C) 2021 Steve Rosenhamer +// Copyright (C) 2023 Anton Thomasson +// Copyright (C) 2024 Nelson Benítez León +// +// 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 + +#include +#include +#include +#include +#include +#include +#include "goo/gmem.h" +#include "goo/GooTimer.h" +#include "GlobalParams.h" +#include "CharTypes.h" +#include "Object.h" +#include "PDFDoc.h" +#include "Array.h" +#include "Annot.h" +#include "Dict.h" +#include "Stream.h" +#include "Lexer.h" +#include "Parser.h" +#include "GfxFont.h" +#include "GfxState.h" +#include "OutputDev.h" +#include "Page.h" +#include "Annot.h" +#include "Error.h" +#include "Gfx.h" +#include "ProfileData.h" +#include "Catalog.h" +#include "OptionalContent.h" + +// the MSVC math.h doesn't define this +#ifndef M_PI +# define M_PI 3.14159265358979323846 +#endif + +//------------------------------------------------------------------------ +// constants +//------------------------------------------------------------------------ + +// Max recursive depth for a function shading fill. +#define functionMaxDepth 6 + +// Max delta allowed in any color component for a function shading fill. +#define functionColorDelta (dblToCol(1 / 256.0)) + +// Max number of splits along the t axis for an axial shading fill. +#define axialMaxSplits 256 + +// Max delta allowed in any color component for an axial shading fill. +#define axialColorDelta (dblToCol(1 / 256.0)) + +// Max number of splits along the t axis for a radial shading fill. +#define radialMaxSplits 256 + +// Max delta allowed in any color component for a radial shading fill. +#define radialColorDelta (dblToCol(1 / 256.0)) + +// Max recursive depth for a Gouraud triangle shading fill. +// +// Triangles will be split at most gouraudMaxDepth times (each time into 4 +// smaller ones). That makes pow(4,gouraudMaxDepth) many triangles for +// every triangle. +#define gouraudMaxDepth 6 + +// Max delta allowed in any color component for a Gouraud triangle +// shading fill. +#define gouraudColorDelta (dblToCol(3. / 256.0)) + +// Gouraud triangle: if the three color parameters differ by at more than this percend of +// the total color parameter range, the triangle will be refined +#define gouraudParameterizedColorDelta 5e-3 + +// Max recursive depth for a patch mesh shading fill. +#define patchMaxDepth 6 + +// Max delta allowed in any color component for a patch mesh shading +// fill. +#define patchColorDelta (dblToCol((3. / 256.0))) + +//------------------------------------------------------------------------ +// Operator table +//------------------------------------------------------------------------ + +const Operator Gfx::opTab[] = { + { "\"", 3, { tchkNum, tchkNum, tchkString }, &Gfx::opMoveSetShowText }, + { "'", 1, { tchkString }, &Gfx::opMoveShowText }, + { "B", 0, { tchkNone }, &Gfx::opFillStroke }, + { "B*", 0, { tchkNone }, &Gfx::opEOFillStroke }, + { "BDC", 2, { tchkName, tchkProps }, &Gfx::opBeginMarkedContent }, + { "BI", 0, { tchkNone }, &Gfx::opBeginImage }, + { "BMC", 1, { tchkName }, &Gfx::opBeginMarkedContent }, + { "BT", 0, { tchkNone }, &Gfx::opBeginText }, + { "BX", 0, { tchkNone }, &Gfx::opBeginIgnoreUndef }, + { "CS", 1, { tchkName }, &Gfx::opSetStrokeColorSpace }, + { "DP", 2, { tchkName, tchkProps }, &Gfx::opMarkPoint }, + { "Do", 1, { tchkName }, &Gfx::opXObject }, + { "EI", 0, { tchkNone }, &Gfx::opEndImage }, + { "EMC", 0, { tchkNone }, &Gfx::opEndMarkedContent }, + { "ET", 0, { tchkNone }, &Gfx::opEndText }, + { "EX", 0, { tchkNone }, &Gfx::opEndIgnoreUndef }, + { "F", 0, { tchkNone }, &Gfx::opFill }, + { "G", 1, { tchkNum }, &Gfx::opSetStrokeGray }, + { "ID", 0, { tchkNone }, &Gfx::opImageData }, + { "J", 1, { tchkInt }, &Gfx::opSetLineCap }, + { "K", 4, { tchkNum, tchkNum, tchkNum, tchkNum }, &Gfx::opSetStrokeCMYKColor }, + { "M", 1, { tchkNum }, &Gfx::opSetMiterLimit }, + { "MP", 1, { tchkName }, &Gfx::opMarkPoint }, + { "Q", 0, { tchkNone }, &Gfx::opRestore }, + { "RG", 3, { tchkNum, tchkNum, tchkNum }, &Gfx::opSetStrokeRGBColor }, + { "S", 0, { tchkNone }, &Gfx::opStroke }, + { "SC", -4, { tchkNum, tchkNum, tchkNum, tchkNum }, &Gfx::opSetStrokeColor }, + { "SCN", + -33, + { tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, + tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN }, + &Gfx::opSetStrokeColorN }, + { "T*", 0, { tchkNone }, &Gfx::opTextNextLine }, + { "TD", 2, { tchkNum, tchkNum }, &Gfx::opTextMoveSet }, + { "TJ", 1, { tchkArray }, &Gfx::opShowSpaceText }, + { "TL", 1, { tchkNum }, &Gfx::opSetTextLeading }, + { "Tc", 1, { tchkNum }, &Gfx::opSetCharSpacing }, + { "Td", 2, { tchkNum, tchkNum }, &Gfx::opTextMove }, + { "Tf", 2, { tchkName, tchkNum }, &Gfx::opSetFont }, + { "Tj", 1, { tchkString }, &Gfx::opShowText }, + { "Tm", 6, { tchkNum, tchkNum, tchkNum, tchkNum, tchkNum, tchkNum }, &Gfx::opSetTextMatrix }, + { "Tr", 1, { tchkInt }, &Gfx::opSetTextRender }, + { "Ts", 1, { tchkNum }, &Gfx::opSetTextRise }, + { "Tw", 1, { tchkNum }, &Gfx::opSetWordSpacing }, + { "Tz", 1, { tchkNum }, &Gfx::opSetHorizScaling }, + { "W", 0, { tchkNone }, &Gfx::opClip }, + { "W*", 0, { tchkNone }, &Gfx::opEOClip }, + { "b", 0, { tchkNone }, &Gfx::opCloseFillStroke }, + { "b*", 0, { tchkNone }, &Gfx::opCloseEOFillStroke }, + { "c", 6, { tchkNum, tchkNum, tchkNum, tchkNum, tchkNum, tchkNum }, &Gfx::opCurveTo }, + { "cm", 6, { tchkNum, tchkNum, tchkNum, tchkNum, tchkNum, tchkNum }, &Gfx::opConcat }, + { "cs", 1, { tchkName }, &Gfx::opSetFillColorSpace }, + { "d", 2, { tchkArray, tchkNum }, &Gfx::opSetDash }, + { "d0", 2, { tchkNum, tchkNum }, &Gfx::opSetCharWidth }, + { "d1", 6, { tchkNum, tchkNum, tchkNum, tchkNum, tchkNum, tchkNum }, &Gfx::opSetCacheDevice }, + { "f", 0, { tchkNone }, &Gfx::opFill }, + { "f*", 0, { tchkNone }, &Gfx::opEOFill }, + { "g", 1, { tchkNum }, &Gfx::opSetFillGray }, + { "gs", 1, { tchkName }, &Gfx::opSetExtGState }, + { "h", 0, { tchkNone }, &Gfx::opClosePath }, + { "i", 1, { tchkNum }, &Gfx::opSetFlat }, + { "j", 1, { tchkInt }, &Gfx::opSetLineJoin }, + { "k", 4, { tchkNum, tchkNum, tchkNum, tchkNum }, &Gfx::opSetFillCMYKColor }, + { "l", 2, { tchkNum, tchkNum }, &Gfx::opLineTo }, + { "m", 2, { tchkNum, tchkNum }, &Gfx::opMoveTo }, + { "n", 0, { tchkNone }, &Gfx::opEndPath }, + { "q", 0, { tchkNone }, &Gfx::opSave }, + { "re", 4, { tchkNum, tchkNum, tchkNum, tchkNum }, &Gfx::opRectangle }, + { "rg", 3, { tchkNum, tchkNum, tchkNum }, &Gfx::opSetFillRGBColor }, + { "ri", 1, { tchkName }, &Gfx::opSetRenderingIntent }, + { "s", 0, { tchkNone }, &Gfx::opCloseStroke }, + { "sc", -4, { tchkNum, tchkNum, tchkNum, tchkNum }, &Gfx::opSetFillColor }, + { "scn", + -33, + { tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, + tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN, tchkSCN }, + &Gfx::opSetFillColorN }, + { "sh", 1, { tchkName }, &Gfx::opShFill }, + { "v", 4, { tchkNum, tchkNum, tchkNum, tchkNum }, &Gfx::opCurveTo1 }, + { "w", 1, { tchkNum }, &Gfx::opSetLineWidth }, + { "y", 4, { tchkNum, tchkNum, tchkNum, tchkNum }, &Gfx::opCurveTo2 }, +}; + +#define numOps (sizeof(opTab) / sizeof(Operator)) + +static inline bool isSameGfxColor(const GfxColor &colorA, const GfxColor &colorB, unsigned int nComps, double delta) +{ + for (unsigned int k = 0; k < nComps; ++k) { + if (abs(colorA.c[k] - colorB.c[k]) > delta) { + return false; + } + } + return true; +} + +//------------------------------------------------------------------------ +// GfxResources +//------------------------------------------------------------------------ + +GfxResources::GfxResources(XRef *xrefA, Dict *resDictA, GfxResources *nextA) : gStateCache(2), xref(xrefA) +{ + Ref r; + + if (resDictA) { + + // build font dictionary + Dict *resDict = resDictA->copy(xref); + fonts = nullptr; + const Object &obj1 = resDict->lookupNF("Font"); + if (obj1.isRef()) { + Object obj2 = obj1.fetch(xref); + if (obj2.isDict()) { + r = obj1.getRef(); + fonts = new GfxFontDict(xref, &r, obj2.getDict()); + } + } else if (obj1.isDict()) { + fonts = new GfxFontDict(xref, nullptr, obj1.getDict()); + } + + // get XObject dictionary + xObjDict = resDict->lookup("XObject"); + + // get color space dictionary + colorSpaceDict = resDict->lookup("ColorSpace"); + + // get pattern dictionary + patternDict = resDict->lookup("Pattern"); + + // get shading dictionary + shadingDict = resDict->lookup("Shading"); + + // get graphics state parameter dictionary + gStateDict = resDict->lookup("ExtGState"); + + // get properties dictionary + propertiesDict = resDict->lookup("Properties"); + + delete resDict; + } else { + fonts = nullptr; + xObjDict.setToNull(); + colorSpaceDict.setToNull(); + patternDict.setToNull(); + shadingDict.setToNull(); + gStateDict.setToNull(); + propertiesDict.setToNull(); + } + + next = nextA; +} + +GfxResources::~GfxResources() +{ + delete fonts; +} + +std::shared_ptr GfxResources::doLookupFont(const char *name) const +{ + const GfxResources *resPtr; + + for (resPtr = this; resPtr; resPtr = resPtr->next) { + if (resPtr->fonts) { + if (std::shared_ptr font = resPtr->fonts->lookup(name)) { + return font; + } + } + } + error(errSyntaxError, -1, "Unknown font tag '{0:s}'", name); + return nullptr; +} + +std::shared_ptr GfxResources::lookupFont(const char *name) +{ + return doLookupFont(name); +} + +std::shared_ptr GfxResources::lookupFont(const char *name) const +{ + return doLookupFont(name); +} + +Object GfxResources::lookupXObject(const char *name) +{ + GfxResources *resPtr; + + for (resPtr = this; resPtr; resPtr = resPtr->next) { + if (resPtr->xObjDict.isDict()) { + Object obj = resPtr->xObjDict.dictLookup(name); + if (!obj.isNull()) { + return obj; + } + } + } + error(errSyntaxError, -1, "XObject '{0:s}' is unknown", name); + return Object(objNull); +} + +Object GfxResources::lookupXObjectNF(const char *name) +{ + GfxResources *resPtr; + + for (resPtr = this; resPtr; resPtr = resPtr->next) { + if (resPtr->xObjDict.isDict()) { + Object obj = resPtr->xObjDict.dictLookupNF(name).copy(); + if (!obj.isNull()) { + return obj; + } + } + } + error(errSyntaxError, -1, "XObject '{0:s}' is unknown", name); + return Object(objNull); +} + +Object GfxResources::lookupMarkedContentNF(const char *name) +{ + GfxResources *resPtr; + + for (resPtr = this; resPtr; resPtr = resPtr->next) { + if (resPtr->propertiesDict.isDict()) { + Object obj = resPtr->propertiesDict.dictLookupNF(name).copy(); + if (!obj.isNull()) { + return obj; + } + } + } + error(errSyntaxError, -1, "Marked Content '{0:s}' is unknown", name); + return Object(objNull); +} + +Object GfxResources::lookupColorSpace(const char *name) +{ + GfxResources *resPtr; + + for (resPtr = this; resPtr; resPtr = resPtr->next) { + if (resPtr->colorSpaceDict.isDict()) { + Object obj = resPtr->colorSpaceDict.dictLookup(name); + if (!obj.isNull()) { + return obj; + } + } + } + return Object(objNull); +} + +GfxPattern *GfxResources::lookupPattern(const char *name, OutputDev *out, GfxState *state) +{ + GfxResources *resPtr; + + for (resPtr = this; resPtr; resPtr = resPtr->next) { + if (resPtr->patternDict.isDict()) { + Ref patternRef = Ref::INVALID(); + Object obj = resPtr->patternDict.getDict()->lookup(name, &patternRef); + if (!obj.isNull()) { + return GfxPattern::parse(resPtr, &obj, out, state, patternRef.num); + } + } + } + error(errSyntaxError, -1, "Unknown pattern '{0:s}'", name); + return nullptr; +} + +GfxShading *GfxResources::lookupShading(const char *name, OutputDev *out, GfxState *state) +{ + GfxResources *resPtr; + GfxShading *shading; + + for (resPtr = this; resPtr; resPtr = resPtr->next) { + if (resPtr->shadingDict.isDict()) { + Object obj = resPtr->shadingDict.dictLookup(name); + if (!obj.isNull()) { + shading = GfxShading::parse(resPtr, &obj, out, state); + return shading; + } + } + } + error(errSyntaxError, -1, "ExtGState '{0:s}' is unknown", name); + return nullptr; +} + +Object GfxResources::lookupGState(const char *name) +{ + Object obj = lookupGStateNF(name); + if (obj.isNull()) { + return Object(objNull); + } + + if (!obj.isRef()) { + return obj; + } + + const Ref ref = obj.getRef(); + + if (auto *item = gStateCache.lookup(ref)) { + return item->copy(); + } + + auto *item = new Object { xref->fetch(ref) }; + gStateCache.put(ref, item); + return item->copy(); +} + +Object GfxResources::lookupGStateNF(const char *name) +{ + GfxResources *resPtr; + + for (resPtr = this; resPtr; resPtr = resPtr->next) { + if (resPtr->gStateDict.isDict()) { + Object obj = resPtr->gStateDict.dictLookupNF(name).copy(); + if (!obj.isNull()) { + return obj; + } + } + } + error(errSyntaxError, -1, "ExtGState '{0:s}' is unknown", name); + return Object(objNull); +} + +//------------------------------------------------------------------------ +// Gfx +//------------------------------------------------------------------------ + +Gfx::Gfx(PDFDoc *docA, OutputDev *outA, int pageNum, Dict *resDict, double hDPI, double vDPI, const PDFRectangle *box, const PDFRectangle *cropBox, int rotate, bool (*abortCheckCbkA)(void *data), void *abortCheckCbkDataA, XRef *xrefA) + : printCommands(globalParams->getPrintCommands()), profileCommands(globalParams->getProfileCommands()) +{ + int i; + + doc = docA; + xref = (xrefA == nullptr) ? doc->getXRef() : xrefA; + catalog = doc->getCatalog(); + subPage = false; + mcStack = nullptr; + parser = nullptr; + + // start the resource stack + res = new GfxResources(xref, resDict, nullptr); + + // initialize + out = outA; + state = new GfxState(hDPI, vDPI, box, rotate, out->upsideDown()); + out->initGfxState(state); + stackHeight = 1; + pushStateGuard(); + fontChanged = false; + clip = clipNone; + ignoreUndef = 0; + out->startPage(pageNum, state, xref); + out->setDefaultCTM(state->getCTM()); + out->updateAll(state); + for (i = 0; i < 6; ++i) { + baseMatrix[i] = state->getCTM()[i]; + } + displayDepth = 0; + ocState = true; + parser = nullptr; + abortCheckCbk = abortCheckCbkA; + abortCheckCbkData = abortCheckCbkDataA; + + // set crop box + if (cropBox) { + state->moveTo(cropBox->x1, cropBox->y1); + state->lineTo(cropBox->x2, cropBox->y1); + state->lineTo(cropBox->x2, cropBox->y2); + state->lineTo(cropBox->x1, cropBox->y2); + state->closePath(); + state->clip(); + out->clip(state); + state->clearPath(); + } +#ifdef USE_CMS + initDisplayProfile(); +#endif +} + +Gfx::Gfx(PDFDoc *docA, OutputDev *outA, Dict *resDict, const PDFRectangle *box, const PDFRectangle *cropBox, bool (*abortCheckCbkA)(void *data), void *abortCheckCbkDataA, Gfx *gfxA) + : printCommands(globalParams->getPrintCommands()), profileCommands(globalParams->getProfileCommands()) +{ + int i; + + doc = docA; + if (gfxA) { + xref = gfxA->getXRef(); + formsDrawing = gfxA->formsDrawing; + charProcDrawing = gfxA->charProcDrawing; + } else { + xref = doc->getXRef(); + } + catalog = doc->getCatalog(); + subPage = true; + mcStack = nullptr; + parser = nullptr; + + // start the resource stack + res = new GfxResources(xref, resDict, nullptr); + + // initialize + out = outA; + double hDPI = 72; + double vDPI = 72; + if (gfxA) { + hDPI = gfxA->getState()->getHDPI(); + vDPI = gfxA->getState()->getVDPI(); + } + state = new GfxState(hDPI, vDPI, box, 0, false); + stackHeight = 1; + pushStateGuard(); + fontChanged = false; + clip = clipNone; + ignoreUndef = 0; + for (i = 0; i < 6; ++i) { + baseMatrix[i] = state->getCTM()[i]; + } + displayDepth = 0; + ocState = true; + parser = nullptr; + abortCheckCbk = abortCheckCbkA; + abortCheckCbkData = abortCheckCbkDataA; + + // set crop box + if (cropBox) { + state->moveTo(cropBox->x1, cropBox->y1); + state->lineTo(cropBox->x2, cropBox->y1); + state->lineTo(cropBox->x2, cropBox->y2); + state->lineTo(cropBox->x1, cropBox->y2); + state->closePath(); + state->clip(); + out->clip(state); + state->clearPath(); + } +#ifdef USE_CMS + initDisplayProfile(); +#endif +} + +#ifdef USE_CMS + +# include + +void Gfx::initDisplayProfile() +{ + Object catDict = xref->getCatalog(); + if (catDict.isDict()) { + Object outputIntents = catDict.dictLookup("OutputIntents"); + if (outputIntents.isArray() && outputIntents.arrayGetLength() == 1) { + Object firstElement = outputIntents.arrayGet(0); + if (firstElement.isDict()) { + Object profile = firstElement.dictLookup("DestOutputProfile"); + if (profile.isStream()) { + Stream *iccStream = profile.getStream(); + const std::vector profBuf = iccStream->toUnsignedChars(65536, 65536); + auto hp = make_GfxLCMSProfilePtr(cmsOpenProfileFromMem(profBuf.data(), profBuf.size())); + if (!hp) { + error(errSyntaxWarning, -1, "read ICCBased color space profile error"); + } else { + state->setDisplayProfile(hp); + } + } + } + } + } +} + +#endif + +Gfx::~Gfx() +{ + while (stateGuards.size()) { + popStateGuard(); + } + if (!subPage) { + out->endPage(); + } + // There shouldn't be more saves, but pop them if there were any + while (state->hasSaves()) { + error(errSyntaxError, -1, "Found state under last state guard. Popping."); + restoreState(); + } + delete state; + while (res) { + popResources(); + } + while (mcStack) { + popMarkedContent(); + } +} + +void Gfx::display(Object *obj, bool topLevel) +{ + // check for excessive recursion + if (displayDepth > 100) { + return; + } + + if (obj->isArray()) { + for (int i = 0; i < obj->arrayGetLength(); ++i) { + Object obj2 = obj->arrayGet(i); + if (!obj2.isStream()) { + error(errSyntaxError, -1, "Weird page contents"); + return; + } + } + } else if (!obj->isStream()) { + error(errSyntaxError, -1, "Weird page contents"); + return; + } + parser = new Parser(xref, obj, false); + go(topLevel); + delete parser; + parser = nullptr; +} + +void Gfx::go(bool topLevel) +{ + Object obj; + Object args[maxArgs]; + int numArgs, i; + int lastAbortCheck; + + // scan a sequence of objects + pushStateGuard(); + updateLevel = 1; // make sure even empty pages trigger a call to dump() + lastAbortCheck = 0; + numArgs = 0; + obj = parser->getObj(); + while (!obj.isEOF()) { + commandAborted = false; + + // got a command - execute it + if (obj.isCmd()) { + if (printCommands) { + obj.print(stdout); + for (i = 0; i < numArgs; ++i) { + printf(" "); + args[i].print(stdout); + } + printf("\n"); + fflush(stdout); + } + GooTimer *timer = nullptr; + + if (unlikely(profileCommands)) { + timer = new GooTimer(); + } + + // Run the operation + execOp(&obj, args, numArgs); + + // Update the profile information + if (unlikely(profileCommands)) { + if (auto *const hash = out->getProfileHash()) { + auto &data = (*hash)[obj.getCmd()]; + data.addElement(timer->getElapsed()); + } + delete timer; + } + for (i = 0; i < numArgs; ++i) { + args[i].setToNull(); // Free memory early + } + numArgs = 0; + + // periodically update display + if (++updateLevel >= 20000) { + out->dump(); + updateLevel = 0; + lastAbortCheck = 0; + } + + // did the command throw an exception + if (commandAborted) { + // don't propogate; recursive drawing comes from Form XObjects which + // should probably be drawn in a separate context anyway for caching + commandAborted = false; + break; + } + + // check for an abort + if (abortCheckCbk) { + if (updateLevel - lastAbortCheck > 10) { + if ((*abortCheckCbk)(abortCheckCbkData)) { + break; + } + lastAbortCheck = updateLevel; + } + } + + // got an argument - save it + } else if (numArgs < maxArgs) { + args[numArgs++] = std::move(obj); + // too many arguments - something is wrong + } else { + error(errSyntaxError, getPos(), "Too many args in content stream"); + if (printCommands) { + printf("throwing away arg: "); + obj.print(stdout); + printf("\n"); + fflush(stdout); + } + } + + // grab the next object + obj = parser->getObj(); + } + + // args at end with no command + if (numArgs > 0) { + error(errSyntaxError, getPos(), "Leftover args in content stream"); + if (printCommands) { + printf("%d leftovers:", numArgs); + for (i = 0; i < numArgs; ++i) { + printf(" "); + args[i].print(stdout); + } + printf("\n"); + fflush(stdout); + } + } + + popStateGuard(); + + // update display + if (topLevel && updateLevel > 0) { + out->dump(); + } +} + +void Gfx::execOp(Object *cmd, Object args[], int numArgs) +{ + const Operator *op; + Object *argPtr; + int i; + + // find operator + const char *name = cmd->getCmd(); + if (!(op = findOp(name))) { + if (ignoreUndef == 0) { + error(errSyntaxError, getPos(), "Unknown operator '{0:s}'", name); + } + return; + } + + // type check args + argPtr = args; + if (op->numArgs >= 0) { + if (numArgs < op->numArgs) { + error(errSyntaxError, getPos(), "Too few ({0:d}) args to '{1:s}' operator", numArgs, name); + commandAborted = true; + return; + } + if (numArgs > op->numArgs) { +#if 0 + error(errSyntaxWarning, getPos(), + "Too many ({0:d}) args to '{1:s}' operator", numArgs, name); +#endif + argPtr += numArgs - op->numArgs; + numArgs = op->numArgs; + } + } else { + if (numArgs > -op->numArgs) { + error(errSyntaxError, getPos(), "Too many ({0:d}) args to '{1:s}' operator", numArgs, name); + return; + } + } + for (i = 0; i < numArgs; ++i) { + if (!checkArg(&argPtr[i], op->tchk[i])) { + error(errSyntaxError, getPos(), "Arg #{0:d} to '{1:s}' operator is wrong type ({2:s})", i, name, argPtr[i].getTypeName()); + return; + } + } + + // do it + (this->*op->func)(argPtr, numArgs); +} + +const Operator *Gfx::findOp(const char *name) +{ + int a, b, m, cmp; + + a = -1; + b = numOps; + cmp = 0; // make gcc happy + // invariant: opTab[a] < name < opTab[b] + while (b - a > 1) { + m = (a + b) / 2; + cmp = strcmp(opTab[m].name, name); + if (cmp < 0) { + a = m; + } else if (cmp > 0) { + b = m; + } else { + a = b = m; + } + } + if (cmp != 0) { + return nullptr; + } + return &opTab[a]; +} + +bool Gfx::checkArg(Object *arg, TchkType type) +{ + switch (type) { + case tchkBool: + return arg->isBool(); + case tchkInt: + return arg->isInt(); + case tchkNum: + return arg->isNum(); + case tchkString: + return arg->isString(); + case tchkName: + return arg->isName(); + case tchkArray: + return arg->isArray(); + case tchkProps: + return arg->isDict() || arg->isName(); + case tchkSCN: + return arg->isNum() || arg->isName(); + case tchkNone: + return false; + } + return false; +} + +Goffset Gfx::getPos() +{ + return parser ? parser->getPos() : -1; +} + +//------------------------------------------------------------------------ +// graphics state operators +//------------------------------------------------------------------------ + +void Gfx::opSave(Object args[], int numArgs) +{ + saveState(); +} + +void Gfx::opRestore(Object args[], int numArgs) +{ + restoreState(); +} + +void Gfx::opConcat(Object args[], int numArgs) +{ + state->concatCTM(args[0].getNum(), args[1].getNum(), args[2].getNum(), args[3].getNum(), args[4].getNum(), args[5].getNum()); + out->updateCTM(state, args[0].getNum(), args[1].getNum(), args[2].getNum(), args[3].getNum(), args[4].getNum(), args[5].getNum()); + fontChanged = true; +} + +void Gfx::opSetDash(Object args[], int numArgs) +{ + const Array *a = args[0].getArray(); + int length = a->getLength(); + std::vector dash(length); + for (int i = 0; i < length; ++i) { + dash[i] = a->get(i).getNumWithDefaultValue(0); + } + state->setLineDash(std::move(dash), args[1].getNum()); + out->updateLineDash(state); +} + +void Gfx::opSetFlat(Object args[], int numArgs) +{ + state->setFlatness((int)args[0].getNum()); + out->updateFlatness(state); +} + +void Gfx::opSetLineJoin(Object args[], int numArgs) +{ + state->setLineJoin(args[0].getInt()); + out->updateLineJoin(state); +} + +void Gfx::opSetLineCap(Object args[], int numArgs) +{ + state->setLineCap(args[0].getInt()); + out->updateLineCap(state); +} + +void Gfx::opSetMiterLimit(Object args[], int numArgs) +{ + state->setMiterLimit(args[0].getNum()); + out->updateMiterLimit(state); +} + +void Gfx::opSetLineWidth(Object args[], int numArgs) +{ + state->setLineWidth(args[0].getNum()); + out->updateLineWidth(state); +} + +void Gfx::opSetExtGState(Object args[], int numArgs) +{ + Object obj1, obj2; + GfxBlendMode mode; + bool haveFillOP; + GfxColor backdropColor; + bool haveBackdropColor; + bool alpha; + double opac; + + obj1 = res->lookupGState(args[0].getName()); + if (obj1.isNull()) { + return; + } + if (!obj1.isDict()) { + error(errSyntaxError, getPos(), "ExtGState '{0:s}' is wrong type", args[0].getName()); + return; + } + if (printCommands) { + printf(" gfx state dict: "); + obj1.print(); + printf("\n"); + } + + // parameters that are also set by individual PDF operators + obj2 = obj1.dictLookup("LW"); + if (obj2.isNum()) { + opSetLineWidth(&obj2, 1); + } + obj2 = obj1.dictLookup("LC"); + if (obj2.isInt()) { + opSetLineCap(&obj2, 1); + } + obj2 = obj1.dictLookup("LJ"); + if (obj2.isInt()) { + opSetLineJoin(&obj2, 1); + } + obj2 = obj1.dictLookup("ML"); + if (obj2.isNum()) { + opSetMiterLimit(&obj2, 1); + } + obj2 = obj1.dictLookup("D"); + if (obj2.isArray() && obj2.arrayGetLength() == 2) { + Object args2[2]; + args2[0] = obj2.arrayGet(0); + args2[1] = obj2.arrayGet(1); + if (args2[0].isArray() && args2[1].isNum()) { + opSetDash(args2, 2); + } + } +#if 0 //~ need to add a new version of GfxResources::lookupFont() that + //~ takes an indirect ref instead of a name + if (obj1.dictLookup("Font", &obj2)->isArray() && + obj2.arrayGetLength() == 2) { + obj2.arrayGet(0, &args2[0]); + obj2.arrayGet(1, &args2[1]); + if (args2[0].isDict() && args2[1].isNum()) { + opSetFont(args2, 2); + } + args2[0].free(); + args2[1].free(); + } + obj2.free(); +#endif + obj2 = obj1.dictLookup("FL"); + if (obj2.isNum()) { + opSetFlat(&obj2, 1); + } + + // transparency support: blend mode, fill/stroke opacity + obj2 = obj1.dictLookup("BM"); + if (!obj2.isNull()) { + if (state->parseBlendMode(&obj2, &mode)) { + state->setBlendMode(mode); + out->updateBlendMode(state); + } else { + error(errSyntaxError, getPos(), "Invalid blend mode in ExtGState"); + } + } + obj2 = obj1.dictLookup("ca"); + if (obj2.isNum()) { + opac = obj2.getNum(); + state->setFillOpacity(opac < 0 ? 0 : opac > 1 ? 1 : opac); + out->updateFillOpacity(state); + } + obj2 = obj1.dictLookup("CA"); + if (obj2.isNum()) { + opac = obj2.getNum(); + state->setStrokeOpacity(opac < 0 ? 0 : opac > 1 ? 1 : opac); + out->updateStrokeOpacity(state); + } + + // fill/stroke overprint, overprint mode + obj2 = obj1.dictLookup("op"); + if ((haveFillOP = obj2.isBool())) { + state->setFillOverprint(obj2.getBool()); + out->updateFillOverprint(state); + } + obj2 = obj1.dictLookup("OP"); + if (obj2.isBool()) { + state->setStrokeOverprint(obj2.getBool()); + out->updateStrokeOverprint(state); + if (!haveFillOP) { + state->setFillOverprint(obj2.getBool()); + out->updateFillOverprint(state); + } + } + obj2 = obj1.dictLookup("OPM"); + if (obj2.isInt()) { + state->setOverprintMode(obj2.getInt()); + out->updateOverprintMode(state); + } + + // stroke adjust + obj2 = obj1.dictLookup("SA"); + if (obj2.isBool()) { + state->setStrokeAdjust(obj2.getBool()); + out->updateStrokeAdjust(state); + } + + // transfer function + obj2 = obj1.dictLookup("TR2"); + if (obj2.isNull()) { + obj2 = obj1.dictLookup("TR"); + } + if (obj2.isName("Default") || obj2.isName("Identity")) { + Function *funcs[4] = { nullptr, nullptr, nullptr, nullptr }; + state->setTransfer(funcs); + out->updateTransfer(state); + } else if (obj2.isArray() && obj2.arrayGetLength() == 4) { + Function *funcs[4] = { nullptr, nullptr, nullptr, nullptr }; + for (int i = 0; i < 4; ++i) { + Object obj3 = obj2.arrayGet(i); + funcs[i] = Function::parse(&obj3); + if (!funcs[i]) { + break; + } + } + if (funcs[0] && funcs[1] && funcs[2] && funcs[3]) { + state->setTransfer(funcs); + out->updateTransfer(state); + } else { + for (Function *f : funcs) { + delete f; + } + } + } else if (obj2.isName() || obj2.isDict() || obj2.isStream()) { + Function *funcs[4]; + if ((funcs[0] = Function::parse(&obj2))) { + funcs[1] = funcs[2] = funcs[3] = nullptr; + state->setTransfer(funcs); + out->updateTransfer(state); + } + } else if (!obj2.isNull()) { + error(errSyntaxError, getPos(), "Invalid transfer function in ExtGState"); + } + + // alpha is shape + obj2 = obj1.dictLookup("AIS"); + if (obj2.isBool()) { + state->setAlphaIsShape(obj2.getBool()); + out->updateAlphaIsShape(state); + } + + // text knockout + obj2 = obj1.dictLookup("TK"); + if (obj2.isBool()) { + state->setTextKnockout(obj2.getBool()); + out->updateTextKnockout(state); + } + + // soft mask + obj2 = obj1.dictLookup("SMask"); + if (!obj2.isNull()) { + if (obj2.isName("None")) { + out->clearSoftMask(state); + } else if (obj2.isDict()) { + Object obj3 = obj2.dictLookup("S"); + if (obj3.isName("Alpha")) { + alpha = true; + } else { // "Luminosity" + alpha = false; + } + Function *softMaskTransferFunc = nullptr; + obj3 = obj2.dictLookup("TR"); + if (!obj3.isNull()) { + if (obj3.isName("Default") || obj3.isName("Identity")) { + // nothing + } else { + softMaskTransferFunc = Function::parse(&obj3); + if (softMaskTransferFunc == nullptr || softMaskTransferFunc->getInputSize() != 1 || softMaskTransferFunc->getOutputSize() != 1) { + error(errSyntaxError, getPos(), "Invalid transfer function in soft mask in ExtGState"); + delete softMaskTransferFunc; + softMaskTransferFunc = nullptr; + } + } + } + obj3 = obj2.dictLookup("BC"); + if ((haveBackdropColor = obj3.isArray())) { + for (int &c : backdropColor.c) { + c = 0; + } + for (int i = 0; i < obj3.arrayGetLength() && i < gfxColorMaxComps; ++i) { + Object obj4 = obj3.arrayGet(i); + if (obj4.isNum()) { + backdropColor.c[i] = dblToCol(obj4.getNum()); + } + } + } + obj3 = obj2.dictLookup("G"); + if (obj3.isStream()) { + Object obj4 = obj3.streamGetDict()->lookup("Group"); + if (obj4.isDict()) { + GfxColorSpace *blendingColorSpace = nullptr; + Object obj5 = obj4.dictLookup("CS"); + if (!obj5.isNull()) { + blendingColorSpace = GfxColorSpace::parse(res, &obj5, out, state); + } + const bool isolated = obj4.dictLookup("I").getBoolWithDefaultValue(false); + const bool knockout = obj4.dictLookup("K").getBoolWithDefaultValue(false); + if (!haveBackdropColor) { + if (blendingColorSpace) { + blendingColorSpace->getDefaultColor(&backdropColor); + } else { + //~ need to get the parent or default color space (?) + for (int &c : backdropColor.c) { + c = 0; + } + } + } + doSoftMask(&obj3, alpha, blendingColorSpace, isolated, knockout, softMaskTransferFunc, &backdropColor); + delete blendingColorSpace; + } else { + error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group"); + } + } else { + error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group"); + } + delete softMaskTransferFunc; + } else if (!obj2.isNull()) { + error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState"); + } + } + obj2 = obj1.dictLookup("Font"); + if (obj2.isArray()) { + if (obj2.arrayGetLength() == 2) { + const Object &fargs0 = obj2.arrayGetNF(0); + Object fargs1 = obj2.arrayGet(1); + if (fargs0.isRef() && fargs1.isNum()) { + Object fobj = fargs0.fetch(xref); + if (fobj.isDict()) { + Ref r = fargs0.getRef(); + std::shared_ptr font = GfxFont::makeFont(xref, args[0].getName(), r, fobj.getDict()); + state->setFont(font, fargs1.getNum()); + fontChanged = true; + } + } + } else { + error(errSyntaxError, getPos(), "Number of args mismatch for /Font in ExtGState"); + } + } + obj2 = obj1.dictLookup("LW"); + if (obj2.isNum()) { + opSetLineWidth(&obj2, 1); + } + obj2 = obj1.dictLookup("LC"); + if (obj2.isInt()) { + opSetLineCap(&obj2, 1); + } + obj2 = obj1.dictLookup("LJ"); + if (obj2.isInt()) { + opSetLineJoin(&obj2, 1); + } + obj2 = obj1.dictLookup("ML"); + if (obj2.isNum()) { + opSetMiterLimit(&obj2, 1); + } + obj2 = obj1.dictLookup("D"); + if (obj2.isArray()) { + if (obj2.arrayGetLength() == 2) { + Object dargs[2]; + + dargs[0] = obj2.arrayGetNF(0).copy(); + dargs[1] = obj2.arrayGet(1); + if (dargs[0].isArray() && dargs[1].isInt()) { + opSetDash(dargs, 2); + } + } else { + error(errSyntaxError, getPos(), "Number of args mismatch for /D in ExtGState"); + } + } + obj2 = obj1.dictLookup("RI"); + if (obj2.isName()) { + opSetRenderingIntent(&obj2, 1); + } + obj2 = obj1.dictLookup("FL"); + if (obj2.isNum()) { + opSetFlat(&obj2, 1); + } +} + +void Gfx::doSoftMask(Object *str, bool alpha, GfxColorSpace *blendingColorSpace, bool isolated, bool knockout, Function *transferFunc, GfxColor *backdropColor) +{ + Dict *dict, *resDict; + double m[6], bbox[4]; + Object obj1; + int i; + + // get stream dict + dict = str->streamGetDict(); + + // check form type + obj1 = dict->lookup("FormType"); + if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { + error(errSyntaxError, getPos(), "Unknown form type"); + } + + // get bounding box + obj1 = dict->lookup("BBox"); + if (!obj1.isArray()) { + error(errSyntaxError, getPos(), "Bad form bounding box"); + return; + } + for (i = 0; i < 4; ++i) { + Object obj2 = obj1.arrayGet(i); + if (likely(obj2.isNum())) { + bbox[i] = obj2.getNum(); + } else { + error(errSyntaxError, getPos(), "Bad form bounding box (non number)"); + return; + } + } + + // get matrix + obj1 = dict->lookup("Matrix"); + if (obj1.isArray()) { + for (i = 0; i < 6; ++i) { + Object obj2 = obj1.arrayGet(i); + if (likely(obj2.isNum())) { + m[i] = obj2.getNum(); + } else { + m[i] = 0; + } + } + } else { + m[0] = 1; + m[1] = 0; + m[2] = 0; + m[3] = 1; + m[4] = 0; + m[5] = 0; + } + + // get resources + obj1 = dict->lookup("Resources"); + resDict = obj1.isDict() ? obj1.getDict() : nullptr; + + // draw it + drawForm(str, resDict, m, bbox, true, true, blendingColorSpace, isolated, knockout, alpha, transferFunc, backdropColor); +} + +void Gfx::opSetRenderingIntent(Object args[], int numArgs) +{ + state->setRenderingIntent(args[0].getName()); +} + +//------------------------------------------------------------------------ +// color operators +//------------------------------------------------------------------------ + +void Gfx::opSetFillGray(Object args[], int numArgs) +{ + GfxColor color; + GfxColorSpace *colorSpace = nullptr; + + state->setFillPattern(nullptr); + Object obj = res->lookupColorSpace("DefaultGray"); + if (!obj.isNull()) { + colorSpace = GfxColorSpace::parse(res, &obj, out, state); + } + if (colorSpace == nullptr || colorSpace->getNComps() > 1) { + delete colorSpace; + colorSpace = state->copyDefaultGrayColorSpace(); + } + state->setFillColorSpace(colorSpace); + out->updateFillColorSpace(state); + color.c[0] = dblToCol(args[0].getNum()); + state->setFillColor(&color); + out->updateFillColor(state); +} + +void Gfx::opSetStrokeGray(Object args[], int numArgs) +{ + GfxColor color; + GfxColorSpace *colorSpace = nullptr; + + state->setStrokePattern(nullptr); + Object obj = res->lookupColorSpace("DefaultGray"); + if (!obj.isNull()) { + colorSpace = GfxColorSpace::parse(res, &obj, out, state); + } + if (colorSpace == nullptr) { + colorSpace = state->copyDefaultGrayColorSpace(); + } + state->setStrokeColorSpace(colorSpace); + out->updateStrokeColorSpace(state); + color.c[0] = dblToCol(args[0].getNum()); + state->setStrokeColor(&color); + out->updateStrokeColor(state); +} + +void Gfx::opSetFillCMYKColor(Object args[], int numArgs) +{ + GfxColor color; + GfxColorSpace *colorSpace = nullptr; + int i; + + Object obj = res->lookupColorSpace("DefaultCMYK"); + if (!obj.isNull()) { + colorSpace = GfxColorSpace::parse(res, &obj, out, state); + } + if (colorSpace == nullptr) { + colorSpace = state->copyDefaultCMYKColorSpace(); + } + state->setFillPattern(nullptr); + state->setFillColorSpace(colorSpace); + out->updateFillColorSpace(state); + for (i = 0; i < 4; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } + state->setFillColor(&color); + out->updateFillColor(state); +} + +void Gfx::opSetStrokeCMYKColor(Object args[], int numArgs) +{ + GfxColor color; + GfxColorSpace *colorSpace = nullptr; + int i; + + state->setStrokePattern(nullptr); + Object obj = res->lookupColorSpace("DefaultCMYK"); + if (!obj.isNull()) { + colorSpace = GfxColorSpace::parse(res, &obj, out, state); + } + if (colorSpace == nullptr) { + colorSpace = state->copyDefaultCMYKColorSpace(); + } + state->setStrokeColorSpace(colorSpace); + out->updateStrokeColorSpace(state); + for (i = 0; i < 4; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } + state->setStrokeColor(&color); + out->updateStrokeColor(state); +} + +void Gfx::opSetFillRGBColor(Object args[], int numArgs) +{ + GfxColorSpace *colorSpace = nullptr; + GfxColor color; + int i; + + state->setFillPattern(nullptr); + Object obj = res->lookupColorSpace("DefaultRGB"); + if (!obj.isNull()) { + colorSpace = GfxColorSpace::parse(res, &obj, out, state); + } + if (colorSpace == nullptr || colorSpace->getNComps() > 3) { + delete colorSpace; + colorSpace = state->copyDefaultRGBColorSpace(); + } + state->setFillColorSpace(colorSpace); + out->updateFillColorSpace(state); + for (i = 0; i < 3; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } + state->setFillColor(&color); + out->updateFillColor(state); +} + +void Gfx::opSetStrokeRGBColor(Object args[], int numArgs) +{ + GfxColorSpace *colorSpace = nullptr; + GfxColor color; + int i; + + state->setStrokePattern(nullptr); + Object obj = res->lookupColorSpace("DefaultRGB"); + if (!obj.isNull()) { + colorSpace = GfxColorSpace::parse(res, &obj, out, state); + } + if (colorSpace == nullptr) { + colorSpace = state->copyDefaultRGBColorSpace(); + } + state->setStrokeColorSpace(colorSpace); + out->updateStrokeColorSpace(state); + for (i = 0; i < 3; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } + state->setStrokeColor(&color); + out->updateStrokeColor(state); +} + +void Gfx::opSetFillColorSpace(Object args[], int numArgs) +{ + GfxColorSpace *colorSpace; + GfxColor color; + + Object obj = res->lookupColorSpace(args[0].getName()); + if (obj.isNull()) { + colorSpace = GfxColorSpace::parse(res, &args[0], out, state); + } else { + colorSpace = GfxColorSpace::parse(res, &obj, out, state); + } + if (colorSpace) { + state->setFillPattern(nullptr); + state->setFillColorSpace(colorSpace); + out->updateFillColorSpace(state); + colorSpace->getDefaultColor(&color); + state->setFillColor(&color); + out->updateFillColor(state); + } else { + error(errSyntaxError, getPos(), "Bad color space (fill)"); + } +} + +void Gfx::opSetStrokeColorSpace(Object args[], int numArgs) +{ + GfxColorSpace *colorSpace; + GfxColor color; + + state->setStrokePattern(nullptr); + Object obj = res->lookupColorSpace(args[0].getName()); + if (obj.isNull()) { + colorSpace = GfxColorSpace::parse(res, &args[0], out, state); + } else { + colorSpace = GfxColorSpace::parse(res, &obj, out, state); + } + if (colorSpace) { + state->setStrokeColorSpace(colorSpace); + out->updateStrokeColorSpace(state); + colorSpace->getDefaultColor(&color); + state->setStrokeColor(&color); + out->updateStrokeColor(state); + } else { + error(errSyntaxError, getPos(), "Bad color space (stroke)"); + } +} + +void Gfx::opSetFillColor(Object args[], int numArgs) +{ + GfxColor color; + int i; + + if (numArgs != state->getFillColorSpace()->getNComps()) { + error(errSyntaxError, getPos(), "Incorrect number of arguments in 'sc' command"); + return; + } + state->setFillPattern(nullptr); + for (i = 0; i < numArgs; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } + state->setFillColor(&color); + out->updateFillColor(state); +} + +void Gfx::opSetStrokeColor(Object args[], int numArgs) +{ + GfxColor color; + int i; + + if (numArgs != state->getStrokeColorSpace()->getNComps()) { + error(errSyntaxError, getPos(), "Incorrect number of arguments in 'SC' command"); + return; + } + state->setStrokePattern(nullptr); + for (i = 0; i < numArgs; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } + state->setStrokeColor(&color); + out->updateStrokeColor(state); +} + +void Gfx::opSetFillColorN(Object args[], int numArgs) +{ + GfxColor color; + GfxPattern *pattern; + int i; + + if (state->getFillColorSpace()->getMode() == csPattern) { + if (numArgs > 1) { + if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() || numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder()->getNComps()) { + error(errSyntaxError, getPos(), "Incorrect number of arguments in 'scn' command"); + return; + } + for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { + if (args[i].isNum()) { + color.c[i] = dblToCol(args[i].getNum()); + } else { + color.c[i] = 0; // TODO Investigate if this is what Adobe does + } + } + state->setFillColor(&color); + out->updateFillColor(state); + } + if (numArgs > 0) { + if (args[numArgs - 1].isName() && (pattern = res->lookupPattern(args[numArgs - 1].getName(), out, state))) { + state->setFillPattern(pattern); + } + } + + } else { + if (numArgs != state->getFillColorSpace()->getNComps()) { + error(errSyntaxError, getPos(), "Incorrect number of arguments in 'scn' command"); + return; + } + state->setFillPattern(nullptr); + for (i = 0; i < numArgs && i < gfxColorMaxComps; ++i) { + if (args[i].isNum()) { + color.c[i] = dblToCol(args[i].getNum()); + } else { + color.c[i] = 0; // TODO Investigate if this is what Adobe does + } + } + state->setFillColor(&color); + out->updateFillColor(state); + } +} + +void Gfx::opSetStrokeColorN(Object args[], int numArgs) +{ + GfxColor color; + GfxPattern *pattern; + int i; + + if (state->getStrokeColorSpace()->getMode() == csPattern) { + if (numArgs > 1) { + if (!((GfxPatternColorSpace *)state->getStrokeColorSpace())->getUnder() || numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace())->getUnder()->getNComps()) { + error(errSyntaxError, getPos(), "Incorrect number of arguments in 'SCN' command"); + return; + } + for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { + if (args[i].isNum()) { + color.c[i] = dblToCol(args[i].getNum()); + } else { + color.c[i] = 0; // TODO Investigate if this is what Adobe does + } + } + state->setStrokeColor(&color); + out->updateStrokeColor(state); + } + if (unlikely(numArgs <= 0)) { + error(errSyntaxError, getPos(), "Incorrect number of arguments in 'SCN' command"); + return; + } + if (args[numArgs - 1].isName() && (pattern = res->lookupPattern(args[numArgs - 1].getName(), out, state))) { + state->setStrokePattern(pattern); + } + + } else { + if (numArgs != state->getStrokeColorSpace()->getNComps()) { + error(errSyntaxError, getPos(), "Incorrect number of arguments in 'SCN' command"); + return; + } + state->setStrokePattern(nullptr); + for (i = 0; i < numArgs && i < gfxColorMaxComps; ++i) { + if (args[i].isNum()) { + color.c[i] = dblToCol(args[i].getNum()); + } else { + color.c[i] = 0; // TODO Investigate if this is what Adobe does + } + } + state->setStrokeColor(&color); + out->updateStrokeColor(state); + } +} + +//------------------------------------------------------------------------ +// path segment operators +//------------------------------------------------------------------------ + +void Gfx::opMoveTo(Object args[], int numArgs) +{ + state->moveTo(args[0].getNum(), args[1].getNum()); +} + +void Gfx::opLineTo(Object args[], int numArgs) +{ + if (!state->isCurPt()) { + error(errSyntaxError, getPos(), "No current point in lineto"); + return; + } + state->lineTo(args[0].getNum(), args[1].getNum()); +} + +void Gfx::opCurveTo(Object args[], int numArgs) +{ + double x1, y1, x2, y2, x3, y3; + + if (!state->isCurPt()) { + error(errSyntaxError, getPos(), "No current point in curveto"); + return; + } + x1 = args[0].getNum(); + y1 = args[1].getNum(); + x2 = args[2].getNum(); + y2 = args[3].getNum(); + x3 = args[4].getNum(); + y3 = args[5].getNum(); + state->curveTo(x1, y1, x2, y2, x3, y3); +} + +void Gfx::opCurveTo1(Object args[], int numArgs) +{ + double x1, y1, x2, y2, x3, y3; + + if (!state->isCurPt()) { + error(errSyntaxError, getPos(), "No current point in curveto1"); + return; + } + x1 = state->getCurX(); + y1 = state->getCurY(); + x2 = args[0].getNum(); + y2 = args[1].getNum(); + x3 = args[2].getNum(); + y3 = args[3].getNum(); + state->curveTo(x1, y1, x2, y2, x3, y3); +} + +void Gfx::opCurveTo2(Object args[], int numArgs) +{ + double x1, y1, x2, y2, x3, y3; + + if (!state->isCurPt()) { + error(errSyntaxError, getPos(), "No current point in curveto2"); + return; + } + x1 = args[0].getNum(); + y1 = args[1].getNum(); + x2 = args[2].getNum(); + y2 = args[3].getNum(); + x3 = x2; + y3 = y2; + state->curveTo(x1, y1, x2, y2, x3, y3); +} + +void Gfx::opRectangle(Object args[], int numArgs) +{ + double x, y, w, h; + + x = args[0].getNum(); + y = args[1].getNum(); + w = args[2].getNum(); + h = args[3].getNum(); + state->moveTo(x, y); + state->lineTo(x + w, y); + state->lineTo(x + w, y + h); + state->lineTo(x, y + h); + state->closePath(); +} + +void Gfx::opClosePath(Object args[], int numArgs) +{ + if (!state->isCurPt()) { + error(errSyntaxError, getPos(), "No current point in closepath"); + return; + } + state->closePath(); +} + +//------------------------------------------------------------------------ +// path painting operators +//------------------------------------------------------------------------ + +void Gfx::opEndPath(Object args[], int numArgs) +{ + doEndPath(); +} + +void Gfx::opStroke(Object args[], int numArgs) +{ + if (!state->isCurPt()) { + // error(errSyntaxError, getPos(), "No path in stroke"); + return; + } + if (state->isPath()) { + if (ocState) { + if (state->getStrokeColorSpace()->getMode() == csPattern) { + doPatternStroke(); + } else { + out->stroke(state); + } + } + } + doEndPath(); +} + +void Gfx::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) +{ + if (!state->isCurPt()) { + // error(errSyntaxError, getPos(), "No path in closepath/stroke"); + return; + } + if (state->isPath()) { + state->closePath(); + if (ocState) { + if (state->getStrokeColorSpace()->getMode() == csPattern) { + doPatternStroke(); + } else { + out->stroke(state); + } + } + } + doEndPath(); +} + +void Gfx::opFill(Object args[], int numArgs) +{ + if (!state->isCurPt()) { + // error(errSyntaxError, getPos(), "No path in fill"); + return; + } + if (state->isPath()) { + if (ocState) { + if (state->getFillColorSpace()->getMode() == csPattern) { + doPatternFill(false); + } else { + out->fill(state); + } + } + } + doEndPath(); +} + +void Gfx::opEOFill(Object args[], int numArgs) +{ + if (!state->isCurPt()) { + // error(errSyntaxError, getPos(), "No path in eofill"); + return; + } + if (state->isPath()) { + if (ocState) { + if (state->getFillColorSpace()->getMode() == csPattern) { + doPatternFill(true); + } else { + out->eoFill(state); + } + } + } + doEndPath(); +} + +void Gfx::opFillStroke(Object args[], int numArgs) +{ + if (!state->isCurPt()) { + // error(errSyntaxError, getPos(), "No path in fill/stroke"); + return; + } + if (state->isPath()) { + if (ocState) { + if (state->getFillColorSpace()->getMode() == csPattern) { + doPatternFill(false); + } else { + out->fill(state); + } + if (state->getStrokeColorSpace()->getMode() == csPattern) { + doPatternStroke(); + } else { + out->stroke(state); + } + } + } + doEndPath(); +} + +void Gfx::opCloseFillStroke(Object args[], int numArgs) +{ + if (!state->isCurPt()) { + // error(errSyntaxError, getPos(), "No path in closepath/fill/stroke"); + return; + } + if (state->isPath()) { + state->closePath(); + if (ocState) { + if (state->getFillColorSpace()->getMode() == csPattern) { + doPatternFill(false); + } else { + out->fill(state); + } + if (state->getStrokeColorSpace()->getMode() == csPattern) { + doPatternStroke(); + } else { + out->stroke(state); + } + } + } + doEndPath(); +} + +void Gfx::opEOFillStroke(Object args[], int numArgs) +{ + if (!state->isCurPt()) { + // error(errSyntaxError, getPos(), "No path in eofill/stroke"); + return; + } + if (state->isPath()) { + if (ocState) { + if (state->getFillColorSpace()->getMode() == csPattern) { + doPatternFill(true); + } else { + out->eoFill(state); + } + if (state->getStrokeColorSpace()->getMode() == csPattern) { + doPatternStroke(); + } else { + out->stroke(state); + } + } + } + doEndPath(); +} + +void Gfx::opCloseEOFillStroke(Object args[], int numArgs) +{ + if (!state->isCurPt()) { + // error(errSyntaxError, getPos(), "No path in closepath/eofill/stroke"); + return; + } + if (state->isPath()) { + state->closePath(); + if (ocState) { + if (state->getFillColorSpace()->getMode() == csPattern) { + doPatternFill(true); + } else { + out->eoFill(state); + } + if (state->getStrokeColorSpace()->getMode() == csPattern) { + doPatternStroke(); + } else { + out->stroke(state); + } + } + } + doEndPath(); +} + +void Gfx::doPatternFill(bool eoFill) +{ + GfxPattern *pattern; + + // this is a bit of a kludge -- patterns can be really slow, so we + // skip them if we're only doing text extraction, since they almost + // certainly don't contain any text + if (!out->needNonText()) { + return; + } + + if (!(pattern = state->getFillPattern())) { + return; + } + switch (pattern->getType()) { + case 1: + doTilingPatternFill((GfxTilingPattern *)pattern, false, eoFill, false); + break; + case 2: + doShadingPatternFill((GfxShadingPattern *)pattern, false, eoFill, false); + break; + default: + error(errSyntaxError, getPos(), "Unknown pattern type ({0:d}) in fill", pattern->getType()); + break; + } +} + +void Gfx::doPatternStroke() +{ + GfxPattern *pattern; + + // this is a bit of a kludge -- patterns can be really slow, so we + // skip them if we're only doing text extraction, since they almost + // certainly don't contain any text + if (!out->needNonText()) { + return; + } + + if (!(pattern = state->getStrokePattern())) { + return; + } + switch (pattern->getType()) { + case 1: + doTilingPatternFill((GfxTilingPattern *)pattern, true, false, false); + break; + case 2: + doShadingPatternFill((GfxShadingPattern *)pattern, true, false, false); + break; + default: + error(errSyntaxError, getPos(), "Unknown pattern type ({0:d}) in stroke", pattern->getType()); + break; + } +} + +void Gfx::doPatternText() +{ + GfxPattern *pattern; + + // this is a bit of a kludge -- patterns can be really slow, so we + // skip them if we're only doing text extraction, since they almost + // certainly don't contain any text + if (!out->needNonText()) { + return; + } + + if (!(pattern = state->getFillPattern())) { + return; + } + switch (pattern->getType()) { + case 1: + doTilingPatternFill((GfxTilingPattern *)pattern, false, false, true); + break; + case 2: + doShadingPatternFill((GfxShadingPattern *)pattern, false, false, true); + break; + default: + error(errSyntaxError, getPos(), "Unknown pattern type ({0:d}) in fill", pattern->getType()); + break; + } +} + +void Gfx::doPatternImageMask(Object *ref, Stream *str, int width, int height, bool invert, bool inlineImg) +{ + saveState(); + + out->setSoftMaskFromImageMask(state, ref, str, width, height, invert, inlineImg, baseMatrix); + + state->clearPath(); + state->moveTo(0, 0); + state->lineTo(1, 0); + state->lineTo(1, 1); + state->lineTo(0, 1); + state->closePath(); + doPatternText(); + + out->unsetSoftMaskFromImageMask(state, baseMatrix); + restoreState(); +} + +void Gfx::doTilingPatternFill(GfxTilingPattern *tPat, bool stroke, bool eoFill, bool text) +{ + GfxPatternColorSpace *patCS; + GfxColorSpace *cs; + GfxColor color; + GfxState *savedState; + double xMin, yMin, xMax, yMax, x, y, x1, y1; + double cxMin, cyMin, cxMax, cyMax; + int xi0, yi0, xi1, yi1, xi, yi; + const double *ctm, *btm, *ptm; + double m[6], ictm[6], m1[6], imb[6]; + double det; + double xstep, ystep; + int i; + + // get color space + patCS = (GfxPatternColorSpace *)(stroke ? state->getStrokeColorSpace() : state->getFillColorSpace()); + + // construct a (pattern space) -> (current space) transform matrix + ctm = state->getCTM(); + btm = baseMatrix; + ptm = tPat->getMatrix(); + // iCTM = invert CTM + det = ctm[0] * ctm[3] - ctm[1] * ctm[2]; + if (fabs(det) < 0.000001) { + error(errSyntaxError, getPos(), "Singular matrix in tiling pattern fill"); + return; + } + det = 1 / det; + ictm[0] = ctm[3] * det; + ictm[1] = -ctm[1] * det; + ictm[2] = -ctm[2] * det; + ictm[3] = ctm[0] * det; + ictm[4] = (ctm[2] * ctm[5] - ctm[3] * ctm[4]) * det; + ictm[5] = (ctm[1] * ctm[4] - ctm[0] * ctm[5]) * det; + // m1 = PTM * BTM = PTM * base transform matrix + m1[0] = ptm[0] * btm[0] + ptm[1] * btm[2]; + m1[1] = ptm[0] * btm[1] + ptm[1] * btm[3]; + m1[2] = ptm[2] * btm[0] + ptm[3] * btm[2]; + m1[3] = ptm[2] * btm[1] + ptm[3] * btm[3]; + m1[4] = ptm[4] * btm[0] + ptm[5] * btm[2] + btm[4]; + m1[5] = ptm[4] * btm[1] + ptm[5] * btm[3] + btm[5]; + // m = m1 * iCTM = (PTM * BTM) * (iCTM) + m[0] = m1[0] * ictm[0] + m1[1] * ictm[2]; + m[1] = m1[0] * ictm[1] + m1[1] * ictm[3]; + m[2] = m1[2] * ictm[0] + m1[3] * ictm[2]; + m[3] = m1[2] * ictm[1] + m1[3] * ictm[3]; + m[4] = m1[4] * ictm[0] + m1[5] * ictm[2] + ictm[4]; + m[5] = m1[4] * ictm[1] + m1[5] * ictm[3] + ictm[5]; + + // construct a (device space) -> (pattern space) transform matrix + det = m1[0] * m1[3] - m1[1] * m1[2]; + det = 1 / det; + if (!std::isfinite(det)) { + error(errSyntaxError, getPos(), "Singular matrix in tiling pattern fill"); + return; + } + imb[0] = m1[3] * det; + imb[1] = -m1[1] * det; + imb[2] = -m1[2] * det; + imb[3] = m1[0] * det; + imb[4] = (m1[2] * m1[5] - m1[3] * m1[4]) * det; + imb[5] = (m1[1] * m1[4] - m1[0] * m1[5]) * det; + + // save current graphics state + savedState = saveStateStack(); + + // set underlying color space (for uncolored tiling patterns); set + // various other parameters (stroke color, line width) to match + // Adobe's behavior + state->setFillPattern(nullptr); + state->setStrokePattern(nullptr); + if (tPat->getPaintType() == 2 && (cs = patCS->getUnder())) { + state->setFillColorSpace(cs->copy()); + out->updateFillColorSpace(state); + state->setStrokeColorSpace(cs->copy()); + out->updateStrokeColorSpace(state); + if (stroke) { + state->setFillColor(state->getStrokeColor()); + } else { + state->setStrokeColor(state->getFillColor()); + } + out->updateFillColor(state); + out->updateStrokeColor(state); + } else { + cs = new GfxDeviceGrayColorSpace(); + state->setFillColorSpace(cs); + cs->getDefaultColor(&color); + state->setFillColor(&color); + out->updateFillColorSpace(state); + state->setStrokeColorSpace(new GfxDeviceGrayColorSpace()); + state->setStrokeColor(&color); + out->updateStrokeColorSpace(state); + } + if (!stroke) { + state->setLineWidth(0); + out->updateLineWidth(state); + } + + // clip to current path + if (stroke) { + state->clipToStrokePath(); + out->clipToStrokePath(state); + } else if (!text) { + state->clip(); + if (eoFill) { + out->eoClip(state); + } else { + out->clip(state); + } + } + state->clearPath(); + + // get the clip region, check for empty + state->getClipBBox(&cxMin, &cyMin, &cxMax, &cyMax); + if (cxMin > cxMax || cyMin > cyMax) { + goto restore; + } + + // transform clip region bbox to pattern space + xMin = xMax = cxMin * imb[0] + cyMin * imb[2] + imb[4]; + yMin = yMax = cxMin * imb[1] + cyMin * imb[3] + imb[5]; + x1 = cxMin * imb[0] + cyMax * imb[2] + imb[4]; + y1 = cxMin * imb[1] + cyMax * imb[3] + imb[5]; + if (x1 < xMin) { + xMin = x1; + } else if (x1 > xMax) { + xMax = x1; + } + if (y1 < yMin) { + yMin = y1; + } else if (y1 > yMax) { + yMax = y1; + } + x1 = cxMax * imb[0] + cyMin * imb[2] + imb[4]; + y1 = cxMax * imb[1] + cyMin * imb[3] + imb[5]; + if (x1 < xMin) { + xMin = x1; + } else if (x1 > xMax) { + xMax = x1; + } + if (y1 < yMin) { + yMin = y1; + } else if (y1 > yMax) { + yMax = y1; + } + x1 = cxMax * imb[0] + cyMax * imb[2] + imb[4]; + y1 = cxMax * imb[1] + cyMax * imb[3] + imb[5]; + if (x1 < xMin) { + xMin = x1; + } else if (x1 > xMax) { + xMax = x1; + } + if (y1 < yMin) { + yMin = y1; + } else if (y1 > yMax) { + yMax = y1; + } + + // draw the pattern + //~ this should treat negative steps differently -- start at right/top + //~ edge instead of left/bottom (?) + xstep = fabs(tPat->getXStep()); + ystep = fabs(tPat->getYStep()); + if (unlikely(xstep == 0 || ystep == 0)) { + goto restore; + } + if (tPat->getBBox()[0] < tPat->getBBox()[2]) { + xi0 = (int)ceil((xMin - tPat->getBBox()[2]) / xstep); + xi1 = (int)floor((xMax - tPat->getBBox()[0]) / xstep) + 1; + } else { + xi0 = (int)ceil((xMin - tPat->getBBox()[0]) / xstep); + xi1 = (int)floor((xMax - tPat->getBBox()[2]) / xstep) + 1; + } + if (tPat->getBBox()[1] < tPat->getBBox()[3]) { + yi0 = (int)ceil((yMin - tPat->getBBox()[3]) / ystep); + yi1 = (int)floor((yMax - tPat->getBBox()[1]) / ystep) + 1; + } else { + yi0 = (int)ceil((yMin - tPat->getBBox()[1]) / ystep); + yi1 = (int)floor((yMax - tPat->getBBox()[3]) / ystep) + 1; + } + for (i = 0; i < 4; ++i) { + m1[i] = m[i]; + } + m1[4] = m[4]; + m1[5] = m[5]; + { + bool shouldDrawPattern = true; + std::set::iterator patternRefIt; + const int patternRefNum = tPat->getPatternRefNum(); + if (patternRefNum != -1) { + if (formsDrawing.find(patternRefNum) == formsDrawing.end()) { + patternRefIt = formsDrawing.insert(patternRefNum).first; + } else { + shouldDrawPattern = false; + } + } + if (shouldDrawPattern) { + if (out->useTilingPatternFill() && out->tilingPatternFill(state, this, catalog, tPat, m1, xi0, yi0, xi1, yi1, xstep, ystep)) { + // do nothing + } else { + out->updatePatternOpacity(state); + for (yi = yi0; yi < yi1; ++yi) { + for (xi = xi0; xi < xi1; ++xi) { + x = xi * xstep; + y = yi * ystep; + m1[4] = x * m[0] + y * m[2] + m[4]; + m1[5] = x * m[1] + y * m[3] + m[5]; + drawForm(tPat->getContentStream(), tPat->getResDict(), m1, tPat->getBBox()); + } + } + out->clearPatternOpacity(state); + } + if (patternRefNum != -1) { + formsDrawing.erase(patternRefIt); + } + } + } + + // restore graphics state +restore: + restoreStateStack(savedState); +} + +void Gfx::doShadingPatternFill(GfxShadingPattern *sPat, bool stroke, bool eoFill, bool text) +{ + GfxShading *shading; + GfxState *savedState; + const double *ctm, *btm, *ptm; + double m[6], ictm[6], m1[6]; + double xMin, yMin, xMax, yMax; + double det; + + shading = sPat->getShading(); + + // save current graphics state + savedState = saveStateStack(); + + // clip to current path + if (stroke) { + state->clipToStrokePath(); + out->clipToStrokePath(state); + } else if (!text) { + state->clip(); + if (eoFill) { + out->eoClip(state); + } else { + out->clip(state); + } + } + state->clearPath(); + + // construct a (pattern space) -> (current space) transform matrix + ctm = state->getCTM(); + btm = baseMatrix; + ptm = sPat->getMatrix(); + // iCTM = invert CTM + det = ctm[0] * ctm[3] - ctm[1] * ctm[2]; + if (fabs(det) < 0.000001) { + error(errSyntaxError, getPos(), "Singular matrix in shading pattern fill"); + restoreStateStack(savedState); + return; + } + det = 1 / det; + ictm[0] = ctm[3] * det; + ictm[1] = -ctm[1] * det; + ictm[2] = -ctm[2] * det; + ictm[3] = ctm[0] * det; + ictm[4] = (ctm[2] * ctm[5] - ctm[3] * ctm[4]) * det; + ictm[5] = (ctm[1] * ctm[4] - ctm[0] * ctm[5]) * det; + // m1 = PTM * BTM = PTM * base transform matrix + m1[0] = ptm[0] * btm[0] + ptm[1] * btm[2]; + m1[1] = ptm[0] * btm[1] + ptm[1] * btm[3]; + m1[2] = ptm[2] * btm[0] + ptm[3] * btm[2]; + m1[3] = ptm[2] * btm[1] + ptm[3] * btm[3]; + m1[4] = ptm[4] * btm[0] + ptm[5] * btm[2] + btm[4]; + m1[5] = ptm[4] * btm[1] + ptm[5] * btm[3] + btm[5]; + // m = m1 * iCTM = (PTM * BTM) * (iCTM) + m[0] = m1[0] * ictm[0] + m1[1] * ictm[2]; + m[1] = m1[0] * ictm[1] + m1[1] * ictm[3]; + m[2] = m1[2] * ictm[0] + m1[3] * ictm[2]; + m[3] = m1[2] * ictm[1] + m1[3] * ictm[3]; + m[4] = m1[4] * ictm[0] + m1[5] * ictm[2] + ictm[4]; + m[5] = m1[4] * ictm[1] + m1[5] * ictm[3] + ictm[5]; + + // set the new matrix + state->concatCTM(m[0], m[1], m[2], m[3], m[4], m[5]); + out->updateCTM(state, m[0], m[1], m[2], m[3], m[4], m[5]); + + // clip to bbox + if (shading->getHasBBox()) { + shading->getBBox(&xMin, &yMin, &xMax, &yMax); + state->moveTo(xMin, yMin); + state->lineTo(xMax, yMin); + state->lineTo(xMax, yMax); + state->lineTo(xMin, yMax); + state->closePath(); + state->clip(); + out->clip(state); + state->clearPath(); + } + + // set the color space + state->setFillColorSpace(shading->getColorSpace()->copy()); + out->updateFillColorSpace(state); + + // background color fill + if (shading->getHasBackground()) { + state->setFillColor(shading->getBackground()); + out->updateFillColor(state); + state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax); + state->moveTo(xMin, yMin); + state->lineTo(xMax, yMin); + state->lineTo(xMax, yMax); + state->lineTo(xMin, yMax); + state->closePath(); + out->fill(state); + state->clearPath(); + } + +#if 1 //~tmp: turn off anti-aliasing temporarily + bool vaa = out->getVectorAntialias(); + if (vaa) { + out->setVectorAntialias(false); + } +#endif + + // do shading type-specific operations + switch (shading->getType()) { + case 1: + doFunctionShFill((GfxFunctionShading *)shading); + break; + case 2: + doAxialShFill((GfxAxialShading *)shading); + break; + case 3: + doRadialShFill((GfxRadialShading *)shading); + break; + case 4: + case 5: + doGouraudTriangleShFill((GfxGouraudTriangleShading *)shading); + break; + case 6: + case 7: + doPatchMeshShFill((GfxPatchMeshShading *)shading); + break; + } + +#if 1 //~tmp: turn off anti-aliasing temporarily + if (vaa) { + out->setVectorAntialias(true); + } +#endif + + // restore graphics state + restoreStateStack(savedState); +} + +void Gfx::opShFill(Object args[], int numArgs) +{ + GfxShading *shading; + GfxState *savedState; + double xMin, yMin, xMax, yMax; + + if (!ocState) { + return; + } + + if (!(shading = res->lookupShading(args[0].getName(), out, state))) { + return; + } + + // save current graphics state + savedState = saveStateStack(); + + // clip to bbox + if (shading->getHasBBox()) { + shading->getBBox(&xMin, &yMin, &xMax, &yMax); + state->moveTo(xMin, yMin); + state->lineTo(xMax, yMin); + state->lineTo(xMax, yMax); + state->lineTo(xMin, yMax); + state->closePath(); + state->clip(); + out->clip(state); + state->clearPath(); + } + + // set the color space + state->setFillColorSpace(shading->getColorSpace()->copy()); + out->updateFillColorSpace(state); + +#if 1 //~tmp: turn off anti-aliasing temporarily + bool vaa = out->getVectorAntialias(); + if (vaa) { + out->setVectorAntialias(false); + } +#endif + + // do shading type-specific operations + switch (shading->getType()) { + case 1: + doFunctionShFill((GfxFunctionShading *)shading); + break; + case 2: + doAxialShFill((GfxAxialShading *)shading); + break; + case 3: + doRadialShFill((GfxRadialShading *)shading); + break; + case 4: + case 5: + doGouraudTriangleShFill((GfxGouraudTriangleShading *)shading); + break; + case 6: + case 7: + doPatchMeshShFill((GfxPatchMeshShading *)shading); + break; + } + +#if 1 //~tmp: turn off anti-aliasing temporarily + if (vaa) { + out->setVectorAntialias(true); + } +#endif + + // restore graphics state + restoreStateStack(savedState); + + delete shading; +} + +void Gfx::doFunctionShFill(GfxFunctionShading *shading) +{ + double x0, y0, x1, y1; + GfxColor colors[4]; + + if (out->useShadedFills(shading->getType()) && out->functionShadedFill(state, shading)) { + return; + } + + shading->getDomain(&x0, &y0, &x1, &y1); + shading->getColor(x0, y0, &colors[0]); + shading->getColor(x0, y1, &colors[1]); + shading->getColor(x1, y0, &colors[2]); + shading->getColor(x1, y1, &colors[3]); + doFunctionShFill1(shading, x0, y0, x1, y1, colors, 0); +} + +void Gfx::doFunctionShFill1(GfxFunctionShading *shading, double x0, double y0, double x1, double y1, GfxColor *colors, int depth) +{ + GfxColor fillColor; + GfxColor color0M, color1M, colorM0, colorM1, colorMM; + GfxColor colors2[4]; + double xM, yM; + int nComps, i, j; + + nComps = shading->getColorSpace()->getNComps(); + const double *matrix = shading->getMatrix(); + + // compare the four corner colors + for (i = 0; i < 4; ++i) { + for (j = 0; j < nComps; ++j) { + if (abs(colors[i].c[j] - colors[(i + 1) & 3].c[j]) > functionColorDelta) { + break; + } + } + if (j < nComps) { + break; + } + } + + // center of the rectangle + xM = 0.5 * (x0 + x1); + yM = 0.5 * (y0 + y1); + + // the four corner colors are close (or we hit the recursive limit) + // -- fill the rectangle; but require at least one subdivision + // (depth==0) to avoid problems when the four outer corners of the + // shaded region are the same color + if ((i == 4 && depth > 0) || depth == functionMaxDepth) { + + // use the center color + shading->getColor(xM, yM, &fillColor); + state->setFillColor(&fillColor); + out->updateFillColor(state); + + // fill the rectangle + state->moveTo(x0 * matrix[0] + y0 * matrix[2] + matrix[4], x0 * matrix[1] + y0 * matrix[3] + matrix[5]); + state->lineTo(x1 * matrix[0] + y0 * matrix[2] + matrix[4], x1 * matrix[1] + y0 * matrix[3] + matrix[5]); + state->lineTo(x1 * matrix[0] + y1 * matrix[2] + matrix[4], x1 * matrix[1] + y1 * matrix[3] + matrix[5]); + state->lineTo(x0 * matrix[0] + y1 * matrix[2] + matrix[4], x0 * matrix[1] + y1 * matrix[3] + matrix[5]); + state->closePath(); + out->fill(state); + state->clearPath(); + + // the four corner colors are not close enough -- subdivide the + // rectangle + } else { + + // colors[0] colorM0 colors[2] + // (x0,y0) (xM,y0) (x1,y0) + // +----------+----------+ + // | | | + // | UL | UR | + // color0M | colorMM | color1M + // (x0,yM) +----------+----------+ (x1,yM) + // | (xM,yM) | + // | LL | LR | + // | | | + // +----------+----------+ + // colors[1] colorM1 colors[3] + // (x0,y1) (xM,y1) (x1,y1) + + shading->getColor(x0, yM, &color0M); + shading->getColor(x1, yM, &color1M); + shading->getColor(xM, y0, &colorM0); + shading->getColor(xM, y1, &colorM1); + shading->getColor(xM, yM, &colorMM); + + // upper-left sub-rectangle + colors2[0] = colors[0]; + colors2[1] = color0M; + colors2[2] = colorM0; + colors2[3] = colorMM; + doFunctionShFill1(shading, x0, y0, xM, yM, colors2, depth + 1); + + // lower-left sub-rectangle + colors2[0] = color0M; + colors2[1] = colors[1]; + colors2[2] = colorMM; + colors2[3] = colorM1; + doFunctionShFill1(shading, x0, yM, xM, y1, colors2, depth + 1); + + // upper-right sub-rectangle + colors2[0] = colorM0; + colors2[1] = colorMM; + colors2[2] = colors[2]; + colors2[3] = color1M; + doFunctionShFill1(shading, xM, y0, x1, yM, colors2, depth + 1); + + // lower-right sub-rectangle + colors2[0] = colorMM; + colors2[1] = colorM1; + colors2[2] = color1M; + colors2[3] = colors[3]; + doFunctionShFill1(shading, xM, yM, x1, y1, colors2, depth + 1); + } +} + +void Gfx::doAxialShFill(GfxAxialShading *shading) +{ + double xMin, yMin, xMax, yMax; + double x0, y0, x1, y1; + double dx, dy, mul; + bool dxZero, dyZero; + double bboxIntersections[4]; + double tMin, tMax, tx, ty; + double s[4], sMin, sMax, tmp; + double ux0, uy0, ux1, uy1, vx0, vy0, vx1, vy1; + double t0, t1, tt; + double ta[axialMaxSplits + 1]; + int next[axialMaxSplits + 1]; + GfxColor color0 = {}, color1 = {}; + int nComps; + int i, j, k; + bool needExtend = true; + + // get the clip region bbox + state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax); + + // compute min and max t values, based on the four corners of the + // clip region bbox + shading->getCoords(&x0, &y0, &x1, &y1); + dx = x1 - x0; + dy = y1 - y0; + dxZero = fabs(dx) < 0.01; + dyZero = fabs(dy) < 0.01; + if (dxZero && dyZero) { + tMin = tMax = 0; + } else { + mul = 1 / (dx * dx + dy * dy); + bboxIntersections[0] = ((xMin - x0) * dx + (yMin - y0) * dy) * mul; + bboxIntersections[1] = ((xMin - x0) * dx + (yMax - y0) * dy) * mul; + bboxIntersections[2] = ((xMax - x0) * dx + (yMin - y0) * dy) * mul; + bboxIntersections[3] = ((xMax - x0) * dx + (yMax - y0) * dy) * mul; + std::sort(std::begin(bboxIntersections), std::end(bboxIntersections)); + tMin = bboxIntersections[0]; + tMax = bboxIntersections[3]; + if (tMin < 0 && !shading->getExtend0()) { + tMin = 0; + } + if (tMax > 1 && !shading->getExtend1()) { + tMax = 1; + } + } + + if (out->useShadedFills(shading->getType()) && out->axialShadedFill(state, shading, tMin, tMax)) { + return; + } + + // get the function domain + t0 = shading->getDomain0(); + t1 = shading->getDomain1(); + + // Traverse the t axis and do the shading. + // + // For each point (tx, ty) on the t axis, consider a line through + // that point perpendicular to the t axis: + // + // x(s) = tx + s * -dy --> s = (x - tx) / -dy + // y(s) = ty + s * dx --> s = (y - ty) / dx + // + // Then look at the intersection of this line with the bounding box + // (xMin, yMin, xMax, yMax). In the general case, there are four + // intersection points: + // + // s0 = (xMin - tx) / -dy + // s1 = (xMax - tx) / -dy + // s2 = (yMin - ty) / dx + // s3 = (yMax - ty) / dx + // + // and we want the middle two s values. + // + // In the case where dx = 0, take s0 and s1; in the case where dy = + // 0, take s2 and s3. + // + // Each filled polygon is bounded by two of these line segments + // perpdendicular to the t axis. + // + // The t axis is bisected into smaller regions until the color + // difference across a region is small enough, and then the region + // is painted with a single color. + + // set up: require at least one split to avoid problems when the two + // ends of the t axis have the same color + nComps = shading->getColorSpace()->getNComps(); + ta[0] = tMin; + next[0] = axialMaxSplits / 2; + ta[axialMaxSplits / 2] = 0.5 * (tMin + tMax); + next[axialMaxSplits / 2] = axialMaxSplits; + ta[axialMaxSplits] = tMax; + + // compute the color at t = tMin + if (tMin < 0) { + tt = t0; + } else if (tMin > 1) { + tt = t1; + } else { + tt = t0 + (t1 - t0) * tMin; + } + shading->getColor(tt, &color0); + + if (out->useFillColorStop()) { + // make sure we add stop color when t = tMin + state->setFillColor(&color0); + out->updateFillColorStop(state, 0); + } + + // compute the coordinates of the point on the t axis at t = tMin; + // then compute the intersection of the perpendicular line with the + // bounding box + tx = x0 + tMin * dx; + ty = y0 + tMin * dy; + if (dxZero && dyZero) { + sMin = sMax = 0; + } else if (dxZero) { + sMin = (xMin - tx) / -dy; + sMax = (xMax - tx) / -dy; + if (sMin > sMax) { + tmp = sMin; + sMin = sMax; + sMax = tmp; + } + } else if (dyZero) { + sMin = (yMin - ty) / dx; + sMax = (yMax - ty) / dx; + if (sMin > sMax) { + tmp = sMin; + sMin = sMax; + sMax = tmp; + } + } else { + s[0] = (yMin - ty) / dx; + s[1] = (yMax - ty) / dx; + s[2] = (xMin - tx) / -dy; + s[3] = (xMax - tx) / -dy; + std::sort(std::begin(s), std::end(s)); + sMin = s[1]; + sMax = s[2]; + } + ux0 = tx - sMin * dy; + uy0 = ty + sMin * dx; + vx0 = tx - sMax * dy; + vy0 = ty + sMax * dx; + + i = 0; + bool doneBBox1, doneBBox2; + if (dxZero && dyZero) { + doneBBox1 = doneBBox2 = true; + } else { + doneBBox1 = bboxIntersections[1] < tMin; + doneBBox2 = bboxIntersections[2] > tMax; + } + + // If output device doesn't support the extended mode required + // we have to do it here + needExtend = !out->axialShadedSupportExtend(state, shading); + + while (i < axialMaxSplits) { + + // bisect until color difference is small enough or we hit the + // bisection limit + const double previousStop = tt; + j = next[i]; + while (j > i + 1) { + if (ta[j] < 0) { + tt = t0; + } else if (ta[j] > 1) { + tt = t1; + } else { + tt = t0 + (t1 - t0) * ta[j]; + } + + // Try to determine whether the color map is constant between ta[i] and ta[j]. + // In the strict sense this question cannot be answered by sampling alone. + // We try an educated guess in form of 2 samples. + // See https://gitlab.freedesktop.org/poppler/poppler/issues/938 for a file where one sample was not enough. + + // The first test sample at 1.0 (i.e., ta[j]) is coded separately, because we may + // want to reuse the color later + shading->getColor(tt, &color1); + bool isPatchOfConstantColor = isSameGfxColor(color1, color0, nComps, axialColorDelta); + + if (isPatchOfConstantColor) { + + // Add more sample locations here if required + for (double l : { 0.5 }) { + GfxColor tmpColor; + double x = previousStop + l * (tt - previousStop); + shading->getColor(x, &tmpColor); + if (!isSameGfxColor(tmpColor, color0, nComps, axialColorDelta)) { + isPatchOfConstantColor = false; + break; + } + } + } + + if (isPatchOfConstantColor) { + // in these two if what we guarantee is that if we are skipping lots of + // positions because the colors are the same, we still create a region + // with vertexs passing by bboxIntersections[1] and bboxIntersections[2] + // otherwise we can have empty regions that should really be painted + // like happened in bug 19896 + // What we do to ensure that we pass a line through this points + // is making sure use the exact bboxIntersections[] value as one of the used ta[] values + if (!doneBBox1 && ta[i] < bboxIntersections[1] && ta[j] > bboxIntersections[1]) { + int teoricalj = (int)((bboxIntersections[1] - tMin) * axialMaxSplits / (tMax - tMin)); + if (teoricalj <= i) { + teoricalj = i + 1; + } + if (teoricalj < j) { + next[i] = teoricalj; + next[teoricalj] = j; + } else { + teoricalj = j; + } + ta[teoricalj] = bboxIntersections[1]; + j = teoricalj; + doneBBox1 = true; + } + if (!doneBBox2 && ta[i] < bboxIntersections[2] && ta[j] > bboxIntersections[2]) { + int teoricalj = (int)((bboxIntersections[2] - tMin) * axialMaxSplits / (tMax - tMin)); + if (teoricalj <= i) { + teoricalj = i + 1; + } + if (teoricalj < j) { + next[i] = teoricalj; + next[teoricalj] = j; + } else { + teoricalj = j; + } + ta[teoricalj] = bboxIntersections[2]; + j = teoricalj; + doneBBox2 = true; + } + break; + } + k = (i + j) / 2; + ta[k] = 0.5 * (ta[i] + ta[j]); + next[i] = k; + next[k] = j; + j = k; + } + + // use the average of the colors of the two sides of the region + for (k = 0; k < nComps; ++k) { + color0.c[k] = safeAverage(color0.c[k], color1.c[k]); + } + + // compute the coordinates of the point on the t axis; then + // compute the intersection of the perpendicular line with the + // bounding box + tx = x0 + ta[j] * dx; + ty = y0 + ta[j] * dy; + if (dxZero && dyZero) { + sMin = sMax = 0; + } else if (dxZero) { + sMin = (xMin - tx) / -dy; + sMax = (xMax - tx) / -dy; + if (sMin > sMax) { + tmp = sMin; + sMin = sMax; + sMax = tmp; + } + } else if (dyZero) { + sMin = (yMin - ty) / dx; + sMax = (yMax - ty) / dx; + if (sMin > sMax) { + tmp = sMin; + sMin = sMax; + sMax = tmp; + } + } else { + s[0] = (yMin - ty) / dx; + s[1] = (yMax - ty) / dx; + s[2] = (xMin - tx) / -dy; + s[3] = (xMax - tx) / -dy; + std::sort(std::begin(s), std::end(s)); + sMin = s[1]; + sMax = s[2]; + } + ux1 = tx - sMin * dy; + uy1 = ty + sMin * dx; + vx1 = tx - sMax * dy; + vy1 = ty + sMax * dx; + + // set the color + state->setFillColor(&color0); + if (out->useFillColorStop()) { + out->updateFillColorStop(state, (ta[j] - tMin) / (tMax - tMin)); + } else { + out->updateFillColor(state); + } + + if (needExtend) { + // fill the region + state->moveTo(ux0, uy0); + state->lineTo(vx0, vy0); + state->lineTo(vx1, vy1); + state->lineTo(ux1, uy1); + state->closePath(); + } + + if (!out->useFillColorStop()) { + out->fill(state); + state->clearPath(); + } + + // set up for next region + ux0 = ux1; + uy0 = uy1; + vx0 = vx1; + vy0 = vy1; + color0 = color1; + i = next[i]; + } + + if (out->useFillColorStop()) { + if (!needExtend) { + state->moveTo(xMin, yMin); + state->lineTo(xMin, yMax); + state->lineTo(xMax, yMax); + state->lineTo(xMax, yMin); + state->closePath(); + } + out->fill(state); + state->clearPath(); + } +} + +static inline void getShadingColorRadialHelper(double t0, double t1, double t, GfxRadialShading *shading, GfxColor *color) +{ + if (t0 < t1) { + if (t < t0) { + shading->getColor(t0, color); + } else if (t > t1) { + shading->getColor(t1, color); + } else { + shading->getColor(t, color); + } + } else { + if (t > t0) { + shading->getColor(t0, color); + } else if (t < t1) { + shading->getColor(t1, color); + } else { + shading->getColor(t, color); + } + } +} + +void Gfx::doRadialShFill(GfxRadialShading *shading) +{ + double xMin, yMin, xMax, yMax; + double x0, y0, r0, x1, y1, r1, t0, t1; + int nComps; + GfxColor colorA = {}, colorB = {}, colorC = {}; + double xa, ya, xb, yb, ra, rb; + double ta, tb, sa, sb; + double sz, xz, yz, sMin, sMax; + bool enclosed; + int ia, ib, k, n; + double theta, alpha, angle, t; + bool needExtend = true; + + // get the shading info + shading->getCoords(&x0, &y0, &r0, &x1, &y1, &r1); + t0 = shading->getDomain0(); + t1 = shading->getDomain1(); + nComps = shading->getColorSpace()->getNComps(); + + // Compute the point at which r(s) = 0; check for the enclosed + // circles case; and compute the angles for the tangent lines. + if (x0 == x1 && y0 == y1) { + enclosed = true; + theta = 0; // make gcc happy + sz = 0; // make gcc happy + } else if (r0 == r1) { + enclosed = false; + theta = 0; + sz = 0; // make gcc happy + } else { + sz = (r1 > r0) ? -r0 / (r1 - r0) : -r1 / (r0 - r1); + xz = x0 + sz * (x1 - x0); + yz = y0 + sz * (y1 - y0); + enclosed = (xz - x0) * (xz - x0) + (yz - y0) * (yz - y0) <= r0 * r0; + const double theta_aux = sqrt((x0 - xz) * (x0 - xz) + (y0 - yz) * (y0 - yz)); + if (likely(theta_aux != 0)) { + theta = asin(r0 / theta_aux); + } else { + theta = 0; + } + if (r0 > r1) { + theta = -theta; + } + } + if (enclosed) { + alpha = 0; + } else { + alpha = atan2(y1 - y0, x1 - x0); + } + + // compute the (possibly extended) s range + state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax); + if (enclosed) { + sMin = 0; + sMax = 1; + } else { + sMin = 1; + sMax = 0; + // solve for x(s) + r(s) = xMin + if ((x1 + r1) - (x0 + r0) != 0) { + sa = (xMin - (x0 + r0)) / ((x1 + r1) - (x0 + r0)); + if (sa < sMin) { + sMin = sa; + } else if (sa > sMax) { + sMax = sa; + } + } + // solve for x(s) - r(s) = xMax + if ((x1 - r1) - (x0 - r0) != 0) { + sa = (xMax - (x0 - r0)) / ((x1 - r1) - (x0 - r0)); + if (sa < sMin) { + sMin = sa; + } else if (sa > sMax) { + sMax = sa; + } + } + // solve for y(s) + r(s) = yMin + if ((y1 + r1) - (y0 + r0) != 0) { + sa = (yMin - (y0 + r0)) / ((y1 + r1) - (y0 + r0)); + if (sa < sMin) { + sMin = sa; + } else if (sa > sMax) { + sMax = sa; + } + } + // solve for y(s) - r(s) = yMax + if ((y1 - r1) - (y0 - r0) != 0) { + sa = (yMax - (y0 - r0)) / ((y1 - r1) - (y0 - r0)); + if (sa < sMin) { + sMin = sa; + } else if (sa > sMax) { + sMax = sa; + } + } + // check against sz + if (r0 < r1) { + if (sMin < sz) { + sMin = sz; + } + } else if (r0 > r1) { + if (sMax > sz) { + sMax = sz; + } + } + // check the 'extend' flags + if (!shading->getExtend0() && sMin < 0) { + sMin = 0; + } + if (!shading->getExtend1() && sMax > 1) { + sMax = 1; + } + } + + if (out->useShadedFills(shading->getType()) && out->radialShadedFill(state, shading, sMin, sMax)) { + return; + } + + // compute the number of steps into which circles must be divided to + // achieve a curve flatness of 0.1 pixel in device space for the + // largest circle (note that "device space" is 72 dpi when generating + // PostScript, hence the relatively small 0.1 pixel accuracy) + const double *ctm = state->getCTM(); + t = fabs(ctm[0]); + if (fabs(ctm[1]) > t) { + t = fabs(ctm[1]); + } + if (fabs(ctm[2]) > t) { + t = fabs(ctm[2]); + } + if (fabs(ctm[3]) > t) { + t = fabs(ctm[3]); + } + if (r0 > r1) { + t *= r0; + } else { + t *= r1; + } + if (t < 1) { + n = 3; + } else { + const double tmp = 1 - 0.1 / t; + if (unlikely(tmp == 1)) { + n = 200; + } else { + n = (int)(M_PI / acos(tmp)); + } + if (n < 3) { + n = 3; + } else if (n > 200) { + n = 200; + } + } + + // setup for the start circle + ia = 0; + sa = sMin; + ta = t0 + sa * (t1 - t0); + xa = x0 + sa * (x1 - x0); + ya = y0 + sa * (y1 - y0); + ra = r0 + sa * (r1 - r0); + getShadingColorRadialHelper(t0, t1, ta, shading, &colorA); + + needExtend = !out->radialShadedSupportExtend(state, shading); + + // fill the circles + while (ia < radialMaxSplits) { + + // go as far along the t axis (toward t1) as we can, such that the + // color difference is within the tolerance (radialColorDelta) -- + // this uses bisection (between the current value, t, and t1), + // limited to radialMaxSplits points along the t axis; require at + // least one split to avoid problems when the innermost and + // outermost colors are the same + ib = radialMaxSplits; + sb = sMax; + tb = t0 + sb * (t1 - t0); + getShadingColorRadialHelper(t0, t1, tb, shading, &colorB); + while (ib - ia > 1) { + if (isSameGfxColor(colorB, colorA, nComps, radialColorDelta)) { + // The shading is not necessarily lineal so having two points with the + // same color does not mean all the areas in between have the same color too + int ic = ia + 1; + for (; ic <= ib; ic++) { + const double sc = sMin + ((double)ic / (double)radialMaxSplits) * (sMax - sMin); + const double tc = t0 + sc * (t1 - t0); + getShadingColorRadialHelper(t0, t1, tc, shading, &colorC); + if (!isSameGfxColor(colorC, colorA, nComps, radialColorDelta)) { + break; + } + } + ib = (ic > ia + 1) ? ic - 1 : ia + 1; + sb = sMin + ((double)ib / (double)radialMaxSplits) * (sMax - sMin); + tb = t0 + sb * (t1 - t0); + getShadingColorRadialHelper(t0, t1, tb, shading, &colorB); + break; + } + ib = (ia + ib) / 2; + sb = sMin + ((double)ib / (double)radialMaxSplits) * (sMax - sMin); + tb = t0 + sb * (t1 - t0); + getShadingColorRadialHelper(t0, t1, tb, shading, &colorB); + } + + // compute center and radius of the circle + xb = x0 + sb * (x1 - x0); + yb = y0 + sb * (y1 - y0); + rb = r0 + sb * (r1 - r0); + + // use the average of the colors at the two circles + for (k = 0; k < nComps; ++k) { + colorA.c[k] = safeAverage(colorA.c[k], colorB.c[k]); + } + state->setFillColor(&colorA); + if (out->useFillColorStop()) { + out->updateFillColorStop(state, (sa - sMin) / (sMax - sMin)); + } else { + out->updateFillColor(state); + } + + if (needExtend) { + if (enclosed) { + // construct path for first circle (counterclockwise) + state->moveTo(xa + ra, ya); + for (k = 1; k < n; ++k) { + angle = ((double)k / (double)n) * 2 * M_PI; + state->lineTo(xa + ra * cos(angle), ya + ra * sin(angle)); + } + state->closePath(); + + // construct and append path for second circle (clockwise) + state->moveTo(xb + rb, yb); + for (k = 1; k < n; ++k) { + angle = -((double)k / (double)n) * 2 * M_PI; + state->lineTo(xb + rb * cos(angle), yb + rb * sin(angle)); + } + state->closePath(); + } else { + // construct the first subpath (clockwise) + state->moveTo(xa + ra * cos(alpha + theta + 0.5 * M_PI), ya + ra * sin(alpha + theta + 0.5 * M_PI)); + for (k = 0; k < n; ++k) { + angle = alpha + theta + 0.5 * M_PI - ((double)k / (double)n) * (2 * theta + M_PI); + state->lineTo(xb + rb * cos(angle), yb + rb * sin(angle)); + } + for (k = 0; k < n; ++k) { + angle = alpha - theta - 0.5 * M_PI + ((double)k / (double)n) * (2 * theta - M_PI); + state->lineTo(xa + ra * cos(angle), ya + ra * sin(angle)); + } + state->closePath(); + + // construct the second subpath (counterclockwise) + state->moveTo(xa + ra * cos(alpha + theta + 0.5 * M_PI), ya + ra * sin(alpha + theta + 0.5 * M_PI)); + for (k = 0; k < n; ++k) { + angle = alpha + theta + 0.5 * M_PI + ((double)k / (double)n) * (-2 * theta + M_PI); + state->lineTo(xb + rb * cos(angle), yb + rb * sin(angle)); + } + for (k = 0; k < n; ++k) { + angle = alpha - theta - 0.5 * M_PI + ((double)k / (double)n) * (2 * theta + M_PI); + state->lineTo(xa + ra * cos(angle), ya + ra * sin(angle)); + } + state->closePath(); + } + } + + if (!out->useFillColorStop()) { + // fill the path + out->fill(state); + state->clearPath(); + } + + // step to the next value of t + ia = ib; + sa = sb; + ta = tb; + xa = xb; + ya = yb; + ra = rb; + colorA = colorB; + } + + if (out->useFillColorStop()) { + // make sure we add stop color when sb = sMax + state->setFillColor(&colorA); + out->updateFillColorStop(state, (sb - sMin) / (sMax - sMin)); + + // fill the path + state->moveTo(xMin, yMin); + state->lineTo(xMin, yMax); + state->lineTo(xMax, yMax); + state->lineTo(xMax, yMin); + state->closePath(); + + out->fill(state); + state->clearPath(); + } + + if (!needExtend) { + return; + } + + if (enclosed) { + // extend the smaller circle + if ((shading->getExtend0() && r0 <= r1) || (shading->getExtend1() && r1 < r0)) { + if (r0 <= r1) { + ta = t0; + ra = r0; + xa = x0; + ya = y0; + } else { + ta = t1; + ra = r1; + xa = x1; + ya = y1; + } + shading->getColor(ta, &colorA); + state->setFillColor(&colorA); + out->updateFillColor(state); + state->moveTo(xa + ra, ya); + for (k = 1; k < n; ++k) { + angle = ((double)k / (double)n) * 2 * M_PI; + state->lineTo(xa + ra * cos(angle), ya + ra * sin(angle)); + } + state->closePath(); + out->fill(state); + state->clearPath(); + } + + // extend the larger circle + if ((shading->getExtend0() && r0 > r1) || (shading->getExtend1() && r1 >= r0)) { + if (r0 > r1) { + ta = t0; + ra = r0; + xa = x0; + ya = y0; + } else { + ta = t1; + ra = r1; + xa = x1; + ya = y1; + } + shading->getColor(ta, &colorA); + state->setFillColor(&colorA); + out->updateFillColor(state); + state->moveTo(xMin, yMin); + state->lineTo(xMin, yMax); + state->lineTo(xMax, yMax); + state->lineTo(xMax, yMin); + state->closePath(); + state->moveTo(xa + ra, ya); + for (k = 1; k < n; ++k) { + angle = ((double)k / (double)n) * 2 * M_PI; + state->lineTo(xa + ra * cos(angle), ya + ra * sin(angle)); + } + state->closePath(); + out->fill(state); + state->clearPath(); + } + } +} + +void Gfx::doGouraudTriangleShFill(GfxGouraudTriangleShading *shading) +{ + double x0, y0, x1, y1, x2, y2; + int i; + + if (out->useShadedFills(shading->getType())) { + if (out->gouraudTriangleShadedFill(state, shading)) { + return; + } + } + + // preallocate a path (speed improvements) + state->moveTo(0., 0.); + state->lineTo(1., 0.); + state->lineTo(0., 1.); + state->closePath(); + + GfxState::ReusablePathIterator *reusablePath = state->getReusablePath(); + + if (shading->isParameterized()) { + // work with parameterized values: + double color0, color1, color2; + // a relative threshold: + const double refineColorThreshold = gouraudParameterizedColorDelta * (shading->getParameterDomainMax() - shading->getParameterDomainMin()); + for (i = 0; i < shading->getNTriangles(); ++i) { + shading->getTriangle(i, &x0, &y0, &color0, &x1, &y1, &color1, &x2, &y2, &color2); + gouraudFillTriangle(x0, y0, color0, x1, y1, color1, x2, y2, color2, refineColorThreshold, 0, shading, reusablePath); + } + + } else { + // this always produces output -- even for parameterized ranges. + // But it ignores the parameterized color map (the function). + // + // Note that using this code in for parameterized shadings might be + // correct in circumstances (namely if the function is linear in the actual + // triangle), but in general, it will simply be wrong. + GfxColor color0, color1, color2; + for (i = 0; i < shading->getNTriangles(); ++i) { + shading->getTriangle(i, &x0, &y0, &color0, &x1, &y1, &color1, &x2, &y2, &color2); + gouraudFillTriangle(x0, y0, &color0, x1, y1, &color1, x2, y2, &color2, shading->getColorSpace()->getNComps(), 0, reusablePath); + } + } + + delete reusablePath; +} + +static inline void checkTrue(bool b, const char *message) +{ + if (unlikely(!b)) { + error(errSyntaxError, -1, message); + } +} + +void Gfx::gouraudFillTriangle(double x0, double y0, GfxColor *color0, double x1, double y1, GfxColor *color1, double x2, double y2, GfxColor *color2, int nComps, int depth, GfxState::ReusablePathIterator *path) +{ + double x01, y01, x12, y12, x20, y20; + GfxColor color01, color12, color20; + int i; + + for (i = 0; i < nComps; ++i) { + if (abs(color0->c[i] - color1->c[i]) > gouraudColorDelta || abs(color1->c[i] - color2->c[i]) > gouraudColorDelta) { + break; + } + } + if (i == nComps || depth == gouraudMaxDepth) { + state->setFillColor(color0); + out->updateFillColor(state); + + path->reset(); + checkTrue(!path->isEnd(), "Path should not be at end"); + path->setCoord(x0, y0); + path->next(); + checkTrue(!path->isEnd(), "Path should not be at end"); + path->setCoord(x1, y1); + path->next(); + checkTrue(!path->isEnd(), "Path should not be at end"); + path->setCoord(x2, y2); + path->next(); + checkTrue(!path->isEnd(), "Path should not be at end"); + path->setCoord(x0, y0); + path->next(); + checkTrue(path->isEnd(), "Path should be at end"); + out->fill(state); + + } else { + x01 = 0.5 * (x0 + x1); + y01 = 0.5 * (y0 + y1); + x12 = 0.5 * (x1 + x2); + y12 = 0.5 * (y1 + y2); + x20 = 0.5 * (x2 + x0); + y20 = 0.5 * (y2 + y0); + for (i = 0; i < nComps; ++i) { + color01.c[i] = safeAverage(color0->c[i], color1->c[i]); + color12.c[i] = safeAverage(color1->c[i], color2->c[i]); + color20.c[i] = safeAverage(color2->c[i], color0->c[i]); + } + gouraudFillTriangle(x0, y0, color0, x01, y01, &color01, x20, y20, &color20, nComps, depth + 1, path); + gouraudFillTriangle(x01, y01, &color01, x1, y1, color1, x12, y12, &color12, nComps, depth + 1, path); + gouraudFillTriangle(x01, y01, &color01, x12, y12, &color12, x20, y20, &color20, nComps, depth + 1, path); + gouraudFillTriangle(x20, y20, &color20, x12, y12, &color12, x2, y2, color2, nComps, depth + 1, path); + } +} +void Gfx::gouraudFillTriangle(double x0, double y0, double color0, double x1, double y1, double color1, double x2, double y2, double color2, double refineColorThreshold, int depth, GfxGouraudTriangleShading *shading, + GfxState::ReusablePathIterator *path) +{ + const double meanColor = (color0 + color1 + color2) / 3; + + const bool isFineEnough = fabs(color0 - meanColor) < refineColorThreshold && fabs(color1 - meanColor) < refineColorThreshold && fabs(color2 - meanColor) < refineColorThreshold; + + if (isFineEnough || depth == gouraudMaxDepth) { + GfxColor color; + + shading->getParameterizedColor(meanColor, &color); + state->setFillColor(&color); + out->updateFillColor(state); + + path->reset(); + checkTrue(!path->isEnd(), "Path should not be at end"); + path->setCoord(x0, y0); + path->next(); + checkTrue(!path->isEnd(), "Path should not be at end"); + path->setCoord(x1, y1); + path->next(); + checkTrue(!path->isEnd(), "Path should not be at end"); + path->setCoord(x2, y2); + path->next(); + checkTrue(!path->isEnd(), "Path should not be at end"); + path->setCoord(x0, y0); + path->next(); + checkTrue(path->isEnd(), "Path should be at end"); + out->fill(state); + + } else { + const double x01 = 0.5 * (x0 + x1); + const double y01 = 0.5 * (y0 + y1); + const double x12 = 0.5 * (x1 + x2); + const double y12 = 0.5 * (y1 + y2); + const double x20 = 0.5 * (x2 + x0); + const double y20 = 0.5 * (y2 + y0); + const double color01 = (color0 + color1) / 2.; + const double color12 = (color1 + color2) / 2.; + const double color20 = (color2 + color0) / 2.; + ++depth; + gouraudFillTriangle(x0, y0, color0, x01, y01, color01, x20, y20, color20, refineColorThreshold, depth, shading, path); + gouraudFillTriangle(x01, y01, color01, x1, y1, color1, x12, y12, color12, refineColorThreshold, depth, shading, path); + gouraudFillTriangle(x01, y01, color01, x12, y12, color12, x20, y20, color20, refineColorThreshold, depth, shading, path); + gouraudFillTriangle(x20, y20, color20, x12, y12, color12, x2, y2, color2, refineColorThreshold, depth, shading, path); + } +} + +void Gfx::doPatchMeshShFill(GfxPatchMeshShading *shading) +{ + int start, i; + + if (out->useShadedFills(shading->getType())) { + if (out->patchMeshShadedFill(state, shading)) { + return; + } + } + + if (shading->getNPatches() > 128) { + start = 3; + } else if (shading->getNPatches() > 64) { + start = 2; + } else if (shading->getNPatches() > 16) { + start = 1; + } else { + start = 0; + } + /* + * Parameterized shadings take one parameter [t_0,t_e] + * and map it into the color space. + * + * Consequently, all color values are stored as doubles. + * + * These color values are interpreted as parameters for parameterized + * shadings and as colorspace entities otherwise. + * + * The only difference is that color space entities are stored into + * DOUBLE arrays, not into arrays of type GfxColorComp. + */ + const int colorComps = shading->getColorSpace()->getNComps(); + double refineColorThreshold; + if (shading->isParameterized()) { + refineColorThreshold = gouraudParameterizedColorDelta * (shading->getParameterDomainMax() - shading->getParameterDomainMin()); + + } else { + refineColorThreshold = patchColorDelta; + } + + for (i = 0; i < shading->getNPatches(); ++i) { + fillPatch(shading->getPatch(i), colorComps, shading->isParameterized() ? 1 : colorComps, refineColorThreshold, start, shading); + } +} + +void Gfx::fillPatch(const GfxPatch *patch, int colorComps, int patchColorComps, double refineColorThreshold, int depth, const GfxPatchMeshShading *shading) +{ + GfxPatch patch00, patch01, patch10, patch11; + double xx[4][8], yy[4][8]; + double xxm, yym; + int i; + + for (i = 0; i < patchColorComps; ++i) { + // these comparisons are done in double arithmetics. + // + // For non-parameterized shadings, they are done in color space + // components. + if (fabs(patch->color[0][0].c[i] - patch->color[0][1].c[i]) > refineColorThreshold || fabs(patch->color[0][1].c[i] - patch->color[1][1].c[i]) > refineColorThreshold + || fabs(patch->color[1][1].c[i] - patch->color[1][0].c[i]) > refineColorThreshold || fabs(patch->color[1][0].c[i] - patch->color[0][0].c[i]) > refineColorThreshold) { + break; + } + } + if (i == patchColorComps || depth == patchMaxDepth) { + GfxColor flatColor; + if (shading->isParameterized()) { + shading->getParameterizedColor(patch->color[0][0].c[0], &flatColor); + } else { + for (i = 0; i < colorComps; ++i) { + // simply cast to the desired type; that's all what is needed. + flatColor.c[i] = GfxColorComp(patch->color[0][0].c[i]); + } + } + state->setFillColor(&flatColor); + out->updateFillColor(state); + state->moveTo(patch->x[0][0], patch->y[0][0]); + state->curveTo(patch->x[0][1], patch->y[0][1], patch->x[0][2], patch->y[0][2], patch->x[0][3], patch->y[0][3]); + state->curveTo(patch->x[1][3], patch->y[1][3], patch->x[2][3], patch->y[2][3], patch->x[3][3], patch->y[3][3]); + state->curveTo(patch->x[3][2], patch->y[3][2], patch->x[3][1], patch->y[3][1], patch->x[3][0], patch->y[3][0]); + state->curveTo(patch->x[2][0], patch->y[2][0], patch->x[1][0], patch->y[1][0], patch->x[0][0], patch->y[0][0]); + state->closePath(); + out->fill(state); + state->clearPath(); + } else { + for (i = 0; i < 4; ++i) { + xx[i][0] = patch->x[i][0]; + yy[i][0] = patch->y[i][0]; + xx[i][1] = 0.5 * (patch->x[i][0] + patch->x[i][1]); + yy[i][1] = 0.5 * (patch->y[i][0] + patch->y[i][1]); + xxm = 0.5 * (patch->x[i][1] + patch->x[i][2]); + yym = 0.5 * (patch->y[i][1] + patch->y[i][2]); + xx[i][6] = 0.5 * (patch->x[i][2] + patch->x[i][3]); + yy[i][6] = 0.5 * (patch->y[i][2] + patch->y[i][3]); + xx[i][2] = 0.5 * (xx[i][1] + xxm); + yy[i][2] = 0.5 * (yy[i][1] + yym); + xx[i][5] = 0.5 * (xxm + xx[i][6]); + yy[i][5] = 0.5 * (yym + yy[i][6]); + xx[i][3] = xx[i][4] = 0.5 * (xx[i][2] + xx[i][5]); + yy[i][3] = yy[i][4] = 0.5 * (yy[i][2] + yy[i][5]); + xx[i][7] = patch->x[i][3]; + yy[i][7] = patch->y[i][3]; + } + for (i = 0; i < 4; ++i) { + patch00.x[0][i] = xx[0][i]; + patch00.y[0][i] = yy[0][i]; + patch00.x[1][i] = 0.5 * (xx[0][i] + xx[1][i]); + patch00.y[1][i] = 0.5 * (yy[0][i] + yy[1][i]); + xxm = 0.5 * (xx[1][i] + xx[2][i]); + yym = 0.5 * (yy[1][i] + yy[2][i]); + patch10.x[2][i] = 0.5 * (xx[2][i] + xx[3][i]); + patch10.y[2][i] = 0.5 * (yy[2][i] + yy[3][i]); + patch00.x[2][i] = 0.5 * (patch00.x[1][i] + xxm); + patch00.y[2][i] = 0.5 * (patch00.y[1][i] + yym); + patch10.x[1][i] = 0.5 * (xxm + patch10.x[2][i]); + patch10.y[1][i] = 0.5 * (yym + patch10.y[2][i]); + patch00.x[3][i] = 0.5 * (patch00.x[2][i] + patch10.x[1][i]); + patch00.y[3][i] = 0.5 * (patch00.y[2][i] + patch10.y[1][i]); + patch10.x[0][i] = patch00.x[3][i]; + patch10.y[0][i] = patch00.y[3][i]; + patch10.x[3][i] = xx[3][i]; + patch10.y[3][i] = yy[3][i]; + } + for (i = 4; i < 8; ++i) { + patch01.x[0][i - 4] = xx[0][i]; + patch01.y[0][i - 4] = yy[0][i]; + patch01.x[1][i - 4] = 0.5 * (xx[0][i] + xx[1][i]); + patch01.y[1][i - 4] = 0.5 * (yy[0][i] + yy[1][i]); + xxm = 0.5 * (xx[1][i] + xx[2][i]); + yym = 0.5 * (yy[1][i] + yy[2][i]); + patch11.x[2][i - 4] = 0.5 * (xx[2][i] + xx[3][i]); + patch11.y[2][i - 4] = 0.5 * (yy[2][i] + yy[3][i]); + patch01.x[2][i - 4] = 0.5 * (patch01.x[1][i - 4] + xxm); + patch01.y[2][i - 4] = 0.5 * (patch01.y[1][i - 4] + yym); + patch11.x[1][i - 4] = 0.5 * (xxm + patch11.x[2][i - 4]); + patch11.y[1][i - 4] = 0.5 * (yym + patch11.y[2][i - 4]); + patch01.x[3][i - 4] = 0.5 * (patch01.x[2][i - 4] + patch11.x[1][i - 4]); + patch01.y[3][i - 4] = 0.5 * (patch01.y[2][i - 4] + patch11.y[1][i - 4]); + patch11.x[0][i - 4] = patch01.x[3][i - 4]; + patch11.y[0][i - 4] = patch01.y[3][i - 4]; + patch11.x[3][i - 4] = xx[3][i]; + patch11.y[3][i - 4] = yy[3][i]; + } + for (i = 0; i < patchColorComps; ++i) { + patch00.color[0][0].c[i] = patch->color[0][0].c[i]; + patch00.color[0][1].c[i] = (patch->color[0][0].c[i] + patch->color[0][1].c[i]) / 2.; + patch01.color[0][0].c[i] = patch00.color[0][1].c[i]; + patch01.color[0][1].c[i] = patch->color[0][1].c[i]; + patch01.color[1][1].c[i] = (patch->color[0][1].c[i] + patch->color[1][1].c[i]) / 2.; + patch11.color[0][1].c[i] = patch01.color[1][1].c[i]; + patch11.color[1][1].c[i] = patch->color[1][1].c[i]; + patch11.color[1][0].c[i] = (patch->color[1][1].c[i] + patch->color[1][0].c[i]) / 2.; + patch10.color[1][1].c[i] = patch11.color[1][0].c[i]; + patch10.color[1][0].c[i] = patch->color[1][0].c[i]; + patch10.color[0][0].c[i] = (patch->color[1][0].c[i] + patch->color[0][0].c[i]) / 2.; + patch00.color[1][0].c[i] = patch10.color[0][0].c[i]; + patch00.color[1][1].c[i] = (patch00.color[1][0].c[i] + patch01.color[1][1].c[i]) / 2.; + patch01.color[1][0].c[i] = patch00.color[1][1].c[i]; + patch11.color[0][0].c[i] = patch00.color[1][1].c[i]; + patch10.color[0][1].c[i] = patch00.color[1][1].c[i]; + } + fillPatch(&patch00, colorComps, patchColorComps, refineColorThreshold, depth + 1, shading); + fillPatch(&patch10, colorComps, patchColorComps, refineColorThreshold, depth + 1, shading); + fillPatch(&patch01, colorComps, patchColorComps, refineColorThreshold, depth + 1, shading); + fillPatch(&patch11, colorComps, patchColorComps, refineColorThreshold, depth + 1, shading); + } +} + +void Gfx::doEndPath() +{ + if (state->isCurPt() && clip != clipNone) { + state->clip(); + if (clip == clipNormal) { + out->clip(state); + } else { + out->eoClip(state); + } + } + clip = clipNone; + state->clearPath(); +} + +//------------------------------------------------------------------------ +// path clipping operators +//------------------------------------------------------------------------ + +void Gfx::opClip(Object args[], int numArgs) +{ + clip = clipNormal; +} + +void Gfx::opEOClip(Object args[], int numArgs) +{ + clip = clipEO; +} + +//------------------------------------------------------------------------ +// text object operators +//------------------------------------------------------------------------ + +void Gfx::opBeginText(Object args[], int numArgs) +{ + out->beginTextObject(state); + state->setTextMat(1, 0, 0, 1, 0, 0); + state->textMoveTo(0, 0); + out->updateTextMat(state); + out->updateTextPos(state); + fontChanged = true; +} + +void Gfx::opEndText(Object args[], int numArgs) +{ + out->endTextObject(state); +} + +//------------------------------------------------------------------------ +// text state operators +//------------------------------------------------------------------------ + +void Gfx::opSetCharSpacing(Object args[], int numArgs) +{ + state->setCharSpace(args[0].getNum()); + out->updateCharSpace(state); +} + +void Gfx::opSetFont(Object args[], int numArgs) +{ + std::shared_ptr font; + + if (!(font = res->lookupFont(args[0].getName()))) { + // unsetting the font (drawing no text) is better than using the + // previous one and drawing random glyphs from it + state->setFont(nullptr, args[1].getNum()); + fontChanged = true; + return; + } + if (printCommands) { + printf(" font: tag=%s name='%s' %g\n", font->getTag().c_str(), font->getName() ? font->getName()->c_str() : "???", args[1].getNum()); + fflush(stdout); + } + + state->setFont(font, args[1].getNum()); + fontChanged = true; +} + +void Gfx::opSetTextLeading(Object args[], int numArgs) +{ + state->setLeading(args[0].getNum()); +} + +void Gfx::opSetTextRender(Object args[], int numArgs) +{ + state->setRender(args[0].getInt()); + out->updateRender(state); +} + +void Gfx::opSetTextRise(Object args[], int numArgs) +{ + state->setRise(args[0].getNum()); + out->updateRise(state); +} + +void Gfx::opSetWordSpacing(Object args[], int numArgs) +{ + state->setWordSpace(args[0].getNum()); + out->updateWordSpace(state); +} + +void Gfx::opSetHorizScaling(Object args[], int numArgs) +{ + state->setHorizScaling(args[0].getNum()); + out->updateHorizScaling(state); + fontChanged = true; +} + +//------------------------------------------------------------------------ +// text positioning operators +//------------------------------------------------------------------------ + +void Gfx::opTextMove(Object args[], int numArgs) +{ + double tx, ty; + + tx = state->getLineX() + args[0].getNum(); + ty = state->getLineY() + args[1].getNum(); + state->textMoveTo(tx, ty); + out->updateTextPos(state); +} + +void Gfx::opTextMoveSet(Object args[], int numArgs) +{ + double tx, ty; + + tx = state->getLineX() + args[0].getNum(); + ty = args[1].getNum(); + state->setLeading(-ty); + ty += state->getLineY(); + state->textMoveTo(tx, ty); + out->updateTextPos(state); +} + +void Gfx::opSetTextMatrix(Object args[], int numArgs) +{ + state->setTextMat(args[0].getNum(), args[1].getNum(), args[2].getNum(), args[3].getNum(), args[4].getNum(), args[5].getNum()); + state->textMoveTo(0, 0); + out->updateTextMat(state); + out->updateTextPos(state); + fontChanged = true; +} + +void Gfx::opTextNextLine(Object args[], int numArgs) +{ + double tx, ty; + + tx = state->getLineX(); + ty = state->getLineY() - state->getLeading(); + state->textMoveTo(tx, ty); + out->updateTextPos(state); +} + +//------------------------------------------------------------------------ +// text string operators +//------------------------------------------------------------------------ + +void Gfx::opShowText(Object args[], int numArgs) +{ + if (!state->getFont()) { + error(errSyntaxError, getPos(), "No font in show"); + return; + } + if (fontChanged) { + out->updateFont(state); + fontChanged = false; + } + out->beginStringOp(state); + doShowText(args[0].getString()); + out->endStringOp(state); + if (!ocState) { + doIncCharCount(args[0].getString()); + } +} + +void Gfx::opMoveShowText(Object args[], int numArgs) +{ + double tx, ty; + + if (!state->getFont()) { + error(errSyntaxError, getPos(), "No font in move/show"); + return; + } + if (fontChanged) { + out->updateFont(state); + fontChanged = false; + } + tx = state->getLineX(); + ty = state->getLineY() - state->getLeading(); + state->textMoveTo(tx, ty); + out->updateTextPos(state); + out->beginStringOp(state); + doShowText(args[0].getString()); + out->endStringOp(state); + if (!ocState) { + doIncCharCount(args[0].getString()); + } +} + +void Gfx::opMoveSetShowText(Object args[], int numArgs) +{ + double tx, ty; + + if (!state->getFont()) { + error(errSyntaxError, getPos(), "No font in move/set/show"); + return; + } + if (fontChanged) { + out->updateFont(state); + fontChanged = false; + } + state->setWordSpace(args[0].getNum()); + state->setCharSpace(args[1].getNum()); + tx = state->getLineX(); + ty = state->getLineY() - state->getLeading(); + state->textMoveTo(tx, ty); + out->updateWordSpace(state); + out->updateCharSpace(state); + out->updateTextPos(state); + out->beginStringOp(state); + doShowText(args[2].getString()); + out->endStringOp(state); + if (ocState) { + doIncCharCount(args[2].getString()); + } +} + +void Gfx::opShowSpaceText(Object args[], int numArgs) +{ + Array *a; + int wMode; + int i; + + if (!state->getFont()) { + error(errSyntaxError, getPos(), "No font in show/space"); + return; + } + if (fontChanged) { + out->updateFont(state); + fontChanged = false; + } + out->beginStringOp(state); + wMode = state->getFont()->getWMode(); + a = args[0].getArray(); + for (i = 0; i < a->getLength(); ++i) { + Object obj = a->get(i); + if (obj.isNum()) { + // this uses the absolute value of the font size to match + // Acrobat's behavior + if (wMode) { + state->textShift(0, -obj.getNum() * 0.001 * state->getFontSize()); + } else { + state->textShift(-obj.getNum() * 0.001 * state->getFontSize() * state->getHorizScaling(), 0); + } + out->updateTextShift(state, obj.getNum()); + } else if (obj.isString()) { + doShowText(obj.getString()); + } else { + error(errSyntaxError, getPos(), "Element of show/space array must be number or string"); + } + } + out->endStringOp(state); + if (!ocState) { + a = args[0].getArray(); + for (i = 0; i < a->getLength(); ++i) { + Object obj = a->get(i); + if (obj.isString()) { + doIncCharCount(obj.getString()); + } + } + } +} + +void Gfx::doShowText(const GooString *s) +{ + int wMode; + double riseX, riseY; + CharCode code; + const Unicode *u = nullptr; + double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, ddx, ddy; + double originX, originY, tOriginX, tOriginY; + double x0, y0, x1, y1; + double tmp[4], newCTM[6]; + const double *oldCTM, *mat; + Dict *resDict; + Parser *oldParser; + GfxState *savedState; + const char *p; + int render; + bool patternFill; + int len, n, uLen, nChars, nSpaces; + + GfxFont *const font = state->getFont().get(); + wMode = font->getWMode(); + + if (out->useDrawChar()) { + out->beginString(state, s); + } + + // if we're doing a pattern fill, set up clipping + render = state->getRender(); + if (!(render & 1) && state->getFillColorSpace()->getMode() == csPattern) { + patternFill = true; + saveState(); + // disable fill, enable clipping, leave stroke unchanged + if ((render ^ (render >> 1)) & 1) { + render = 5; + } else { + render = 7; + } + state->setRender(render); + out->updateRender(state); + } else { + patternFill = false; + } + + state->textTransformDelta(0, state->getRise(), &riseX, &riseY); + x0 = state->getCurX() + riseX; + y0 = state->getCurY() + riseY; + + // handle a Type 3 char + if (font->getType() == fontType3 && out->interpretType3Chars()) { + oldCTM = state->getCTM(); + mat = state->getTextMat(); + tmp[0] = mat[0] * oldCTM[0] + mat[1] * oldCTM[2]; + tmp[1] = mat[0] * oldCTM[1] + mat[1] * oldCTM[3]; + tmp[2] = mat[2] * oldCTM[0] + mat[3] * oldCTM[2]; + tmp[3] = mat[2] * oldCTM[1] + mat[3] * oldCTM[3]; + mat = font->getFontMatrix(); + newCTM[0] = mat[0] * tmp[0] + mat[1] * tmp[2]; + newCTM[1] = mat[0] * tmp[1] + mat[1] * tmp[3]; + newCTM[2] = mat[2] * tmp[0] + mat[3] * tmp[2]; + newCTM[3] = mat[2] * tmp[1] + mat[3] * tmp[3]; + newCTM[0] *= state->getFontSize(); + newCTM[1] *= state->getFontSize(); + newCTM[2] *= state->getFontSize(); + newCTM[3] *= state->getFontSize(); + newCTM[0] *= state->getHorizScaling(); + newCTM[1] *= state->getHorizScaling(); + curX = state->getCurX(); + curY = state->getCurY(); + oldParser = parser; + p = s->c_str(); + len = s->getLength(); + while (len > 0) { + n = font->getNextChar(p, len, &code, &u, &uLen, &dx, &dy, &originX, &originY); + dx = dx * state->getFontSize() + state->getCharSpace(); + if (n == 1 && *p == ' ') { + dx += state->getWordSpace(); + } + dx *= state->getHorizScaling(); + dy *= state->getFontSize(); + state->textTransformDelta(dx, dy, &tdx, &tdy); + state->transform(curX + riseX, curY + riseY, &x, &y); + savedState = saveStateStack(); + state->setCTM(newCTM[0], newCTM[1], newCTM[2], newCTM[3], x, y); + //~ the CTM concat values here are wrong (but never used) + out->updateCTM(state, 1, 0, 0, 1, 0, 0); + state->transformDelta(dx, dy, &ddx, &ddy); + if (!out->beginType3Char(state, curX + riseX, curY + riseY, ddx, ddy, code, u, uLen)) { + Object charProc = ((Gfx8BitFont *)font)->getCharProcNF(code); + int refNum = -1; + if (charProc.isRef()) { + refNum = charProc.getRef().num; + charProc = charProc.fetch(((Gfx8BitFont *)font)->getCharProcs()->getXRef()); + } + if ((resDict = ((Gfx8BitFont *)font)->getResources())) { + pushResources(resDict); + } + if (charProc.isStream()) { + Object charProcResourcesObj = charProc.streamGetDict()->lookup("Resources"); + if (charProcResourcesObj.isDict()) { + pushResources(charProcResourcesObj.getDict()); + } + std::set::iterator charProcDrawingIt; + bool displayCharProc = true; + if (refNum != -1) { + if (charProcDrawing.find(refNum) == charProcDrawing.end()) { + charProcDrawingIt = charProcDrawing.insert(refNum).first; + } else { + displayCharProc = false; + error(errSyntaxError, -1, "CharProc wants to draw a CharProc that is already being drawn"); + } + } + if (displayCharProc) { + ++displayDepth; + display(&charProc, false); + --displayDepth; + + if (refNum != -1) { + charProcDrawing.erase(charProcDrawingIt); + } + } + if (charProcResourcesObj.isDict()) { + popResources(); + } + } else { + error(errSyntaxError, getPos(), "Missing or bad Type3 CharProc entry"); + } + out->endType3Char(state); + if (resDict) { + popResources(); + } + } + restoreStateStack(savedState); + // GfxState::restore() does *not* restore the current position, + // so we deal with it here using (curX, curY) and (lineX, lineY) + curX += tdx; + curY += tdy; + state->moveTo(curX, curY); + // Call updateCTM with the identity transformation. That way, the CTM is unchanged, + // but any side effect that the method may have is triggered. This is the case, + // in particular, for the Splash backend. + out->updateCTM(state, 1, 0, 0, 1, 0, 0); + p += n; + len -= n; + } + parser = oldParser; + + } else if (out->useDrawChar()) { + p = s->c_str(); + len = s->getLength(); + while (len > 0) { + n = font->getNextChar(p, len, &code, &u, &uLen, &dx, &dy, &originX, &originY); + if (wMode) { + dx *= state->getFontSize(); + dy = dy * state->getFontSize() + state->getCharSpace(); + if (n == 1 && *p == ' ') { + dy += state->getWordSpace(); + } + } else { + dx = dx * state->getFontSize() + state->getCharSpace(); + if (n == 1 && *p == ' ') { + dx += state->getWordSpace(); + } + dx *= state->getHorizScaling(); + dy *= state->getFontSize(); + } + state->textTransformDelta(dx, dy, &tdx, &tdy); + originX *= state->getFontSize(); + originY *= state->getFontSize(); + state->textTransformDelta(originX, originY, &tOriginX, &tOriginY); + if (ocState) { + out->drawChar(state, state->getCurX() + riseX, state->getCurY() + riseY, tdx, tdy, tOriginX, tOriginY, code, n, u, uLen); + } + state->shift(tdx, tdy); + p += n; + len -= n; + } + } else { + dx = dy = 0; + p = s->c_str(); + len = s->getLength(); + nChars = nSpaces = 0; + while (len > 0) { + n = font->getNextChar(p, len, &code, &u, &uLen, &dx2, &dy2, &originX, &originY); + dx += dx2; + dy += dy2; + if (n == 1 && *p == ' ') { + ++nSpaces; + } + ++nChars; + p += n; + len -= n; + } + if (wMode) { + dx *= state->getFontSize(); + dy = dy * state->getFontSize() + nChars * state->getCharSpace() + nSpaces * state->getWordSpace(); + } else { + dx = dx * state->getFontSize() + nChars * state->getCharSpace() + nSpaces * state->getWordSpace(); + dx *= state->getHorizScaling(); + dy *= state->getFontSize(); + } + state->textTransformDelta(dx, dy, &tdx, &tdy); + if (ocState) { + out->drawString(state, s); + } + state->shift(tdx, tdy); + } + + if (out->useDrawChar()) { + out->endString(state); + } + + if (patternFill && ocState) { + out->saveTextPos(state); + // tell the OutputDev to do the clipping + out->endTextObject(state); + // set up a clipping bbox so doPatternText will work -- assume + // that the text bounding box does not extend past the baseline in + // any direction by more than twice the font size + x1 = state->getCurX() + riseX; + y1 = state->getCurY() + riseY; + if (x0 > x1) { + x = x0; + x0 = x1; + x1 = x; + } + if (y0 > y1) { + y = y0; + y0 = y1; + y1 = y; + } + state->textTransformDelta(0, state->getFontSize(), &dx, &dy); + state->textTransformDelta(state->getFontSize(), 0, &dx2, &dy2); + dx = fabs(dx); + dx2 = fabs(dx2); + if (dx2 > dx) { + dx = dx2; + } + dy = fabs(dy); + dy2 = fabs(dy2); + if (dy2 > dy) { + dy = dy2; + } + state->clipToRect(x0 - 2 * dx, y0 - 2 * dy, x1 + 2 * dx, y1 + 2 * dy); + // set render mode to fill-only + state->setRender(0); + out->updateRender(state); + doPatternText(); + restoreState(); + out->restoreTextPos(state); + } + + updateLevel += 10 * s->getLength(); +} + +// NB: this is only called when ocState is false. +void Gfx::doIncCharCount(const GooString *s) +{ + if (out->needCharCount()) { + out->incCharCount(s->getLength()); + } +} + +//------------------------------------------------------------------------ +// XObject operators +//------------------------------------------------------------------------ + +void Gfx::opXObject(Object args[], int numArgs) +{ + const char *name; + + if (!ocState && !out->needCharCount()) { + return; + } + name = args[0].getName(); + Object obj1 = res->lookupXObject(name); + if (obj1.isNull()) { + return; + } + if (!obj1.isStream()) { + error(errSyntaxError, getPos(), "XObject '{0:s}' is wrong type", name); + return; + } + +#ifdef OPI_SUPPORT + Object opiDict = obj1.streamGetDict()->lookup("OPI"); + if (opiDict.isDict()) { + out->opiBegin(state, opiDict.getDict()); + } +#endif + Object obj2 = obj1.streamGetDict()->lookup("Subtype"); + if (obj2.isName("Image")) { + if (out->needNonText()) { + Object refObj = res->lookupXObjectNF(name); + doImage(&refObj, obj1.getStream(), false); + } + } else if (obj2.isName("Form")) { + Object refObj = res->lookupXObjectNF(name); + bool shouldDoForm = true; + std::set::iterator drawingFormIt; + if (refObj.isRef()) { + const int num = refObj.getRef().num; + if (formsDrawing.find(num) == formsDrawing.end()) { + drawingFormIt = formsDrawing.insert(num).first; + } else { + shouldDoForm = false; + } + } + if (shouldDoForm) { + if (out->useDrawForm() && refObj.isRef()) { + out->drawForm(refObj.getRef()); + } else { + Ref ref = refObj.isRef() ? refObj.getRef() : Ref::INVALID(); + out->beginForm(&obj1, ref); + doForm(&obj1); + out->endForm(&obj1, ref); + } + } + if (refObj.isRef() && shouldDoForm) { + formsDrawing.erase(drawingFormIt); + } + } else if (obj2.isName("PS")) { + Object obj3 = obj1.streamGetDict()->lookup("Level1"); + out->psXObject(obj1.getStream(), obj3.isStream() ? obj3.getStream() : nullptr); + } else if (obj2.isName()) { + error(errSyntaxError, getPos(), "Unknown XObject subtype '{0:s}'", obj2.getName()); + } else { + error(errSyntaxError, getPos(), "XObject subtype is missing or wrong type"); + } +#ifdef OPI_SUPPORT + if (opiDict.isDict()) { + out->opiEnd(state, opiDict.getDict()); + } +#endif +} + +void Gfx::doImage(Object *ref, Stream *str, bool inlineImg) +{ + Dict *dict, *maskDict; + int width, height; + int bits, maskBits; + bool interpolate; + StreamColorSpaceMode csMode; + bool mask; + bool invert; + GfxColorSpace *colorSpace, *maskColorSpace; + bool haveColorKeyMask, haveExplicitMask, haveSoftMask; + int maskColors[2 * gfxColorMaxComps] = {}; + int maskWidth, maskHeight; + bool maskInvert; + bool maskInterpolate; + Stream *maskStr; + int i, n; + + // get info from the stream + bits = 0; + csMode = streamCSNone; + str->getImageParams(&bits, &csMode); + + // get stream dict + dict = str->getDict(); + + // check for optional content key + if (ref) { + const Object &objOC = dict->lookupNF("OC"); + if (catalog->getOptContentConfig() && !catalog->getOptContentConfig()->optContentIsVisible(&objOC)) { + return; + } + } + + const double *ctm = state->getCTM(); + const double det = ctm[0] * ctm[3] - ctm[1] * ctm[2]; + // Detect singular matrix (non invertible) to avoid drawing Image in such case + const bool singular_matrix = fabs(det) < 0.000001; + + // get size + Object obj1 = dict->lookup("Width"); + if (obj1.isNull()) { + obj1 = dict->lookup("W"); + } + if (obj1.isInt()) { + width = obj1.getInt(); + } else if (obj1.isReal()) { + width = (int)obj1.getReal(); + } else { + goto err1; + } + obj1 = dict->lookup("Height"); + if (obj1.isNull()) { + obj1 = dict->lookup("H"); + } + if (obj1.isInt()) { + height = obj1.getInt(); + } else if (obj1.isReal()) { + height = (int)obj1.getReal(); + } else { + goto err1; + } + + if (width < 1 || height < 1 || width > INT_MAX / height) { + goto err1; + } + + // image interpolation + obj1 = dict->lookup("Interpolate"); + if (obj1.isNull()) { + obj1 = dict->lookup("I"); + } + if (obj1.isBool()) { + interpolate = obj1.getBool(); + } else { + interpolate = false; + } + maskInterpolate = false; + + // image or mask? + obj1 = dict->lookup("ImageMask"); + if (obj1.isNull()) { + obj1 = dict->lookup("IM"); + } + mask = false; + if (obj1.isBool()) { + mask = obj1.getBool(); + } else if (!obj1.isNull()) { + goto err1; + } + + // bit depth + if (bits == 0) { + obj1 = dict->lookup("BitsPerComponent"); + if (obj1.isNull()) { + obj1 = dict->lookup("BPC"); + } + if (obj1.isInt()) { + bits = obj1.getInt(); + } else if (mask) { + bits = 1; + } else { + goto err1; + } + } + + // display a mask + if (mask) { + + // check for inverted mask + if (bits != 1) { + goto err1; + } + invert = false; + obj1 = dict->lookup("Decode"); + if (obj1.isNull()) { + obj1 = dict->lookup("D"); + } + if (obj1.isArray()) { + Object obj2; + obj2 = obj1.arrayGet(0); + // Table 4.39 says /Decode must be [1 0] or [0 1]. Adobe + // accepts [1.0 0.0] as well. + if (obj2.isNum() && obj2.getNum() >= 0.9) { + invert = true; + } + } else if (!obj1.isNull()) { + goto err1; + } + + // if drawing is disabled, skip over inline image data + if (!ocState || !out->needNonText()) { + str->reset(); + n = height * ((width + 7) / 8); + for (i = 0; i < n; ++i) { + str->getChar(); + } + str->close(); + + // draw it + } else { + if (state->getFillColorSpace()->getMode() == csPattern) { + doPatternImageMask(ref, str, width, height, invert, inlineImg); + } else { + out->drawImageMask(state, ref, str, width, height, invert, interpolate, inlineImg); + } + } + } else { + if (bits == 0) { + goto err1; + } + + // get color space and color map + obj1 = dict->lookup("ColorSpace"); + if (obj1.isNull()) { + obj1 = dict->lookup("CS"); + } + if (obj1.isName() && inlineImg) { + Object obj2 = res->lookupColorSpace(obj1.getName()); + if (!obj2.isNull()) { + obj1 = std::move(obj2); + } + } + if (!obj1.isNull()) { + char *tempIntent = nullptr; + Object objIntent = dict->lookup("Intent"); + if (objIntent.isName()) { + const char *stateIntent = state->getRenderingIntent(); + if (stateIntent != nullptr) { + tempIntent = strdup(stateIntent); + } + state->setRenderingIntent(objIntent.getName()); + } + colorSpace = GfxColorSpace::parse(res, &obj1, out, state); + if (objIntent.isName()) { + state->setRenderingIntent(tempIntent); + free(tempIntent); + } + } else if (csMode == streamCSDeviceGray) { + Object objCS = res->lookupColorSpace("DefaultGray"); + if (objCS.isNull()) { + colorSpace = new GfxDeviceGrayColorSpace(); + } else { + colorSpace = GfxColorSpace::parse(res, &objCS, out, state); + } + } else if (csMode == streamCSDeviceRGB) { + Object objCS = res->lookupColorSpace("DefaultRGB"); + if (objCS.isNull()) { + colorSpace = new GfxDeviceRGBColorSpace(); + } else { + colorSpace = GfxColorSpace::parse(res, &objCS, out, state); + } + } else if (csMode == streamCSDeviceCMYK) { + Object objCS = res->lookupColorSpace("DefaultCMYK"); + if (objCS.isNull()) { + colorSpace = new GfxDeviceCMYKColorSpace(); + } else { + colorSpace = GfxColorSpace::parse(res, &objCS, out, state); + } + } else { + colorSpace = nullptr; + } + if (!colorSpace) { + goto err1; + } + obj1 = dict->lookup("Decode"); + if (obj1.isNull()) { + obj1 = dict->lookup("D"); + } + GfxImageColorMap colorMap(bits, &obj1, colorSpace); + if (!colorMap.isOk()) { + goto err1; + } + + // get the mask + bool haveMaskImage = false; + haveColorKeyMask = haveExplicitMask = haveSoftMask = false; + maskStr = nullptr; // make gcc happy + maskWidth = maskHeight = 0; // make gcc happy + maskInvert = false; // make gcc happy + std::unique_ptr maskColorMap; + Object maskObj = dict->lookup("Mask"); + Object smaskObj = dict->lookup("SMask"); + + if (maskObj.isStream()) { + maskStr = maskObj.getStream(); + maskDict = maskObj.streamGetDict(); + // if Type is XObject and Subtype is Image + // then the way the softmask is drawn will draw + // correctly, if it falls through to the explicit + // mask code then you get an error and no image + // drawn because it expects maskDict to have an entry + // of Mask or IM that is boolean... + Object tobj = maskDict->lookup("Type"); + if (!tobj.isNull() && tobj.isName() && tobj.isName("XObject")) { + Object sobj = maskDict->lookup("Subtype"); + if (!sobj.isNull() && sobj.isName() && sobj.isName("Image")) { + // ensure that this mask does not include an ImageMask entry + // which signifies the explicit mask + obj1 = maskDict->lookup("ImageMask"); + if (obj1.isNull()) { + obj1 = maskDict->lookup("IM"); + } + if (obj1.isNull() || !obj1.isBool()) { + haveMaskImage = true; + } + } + } + } + + if (smaskObj.isStream() || haveMaskImage) { + // soft mask + if (inlineImg) { + goto err1; + } + if (!haveMaskImage) { + maskStr = smaskObj.getStream(); + maskDict = smaskObj.streamGetDict(); + } + obj1 = maskDict->lookup("Width"); + if (obj1.isNull()) { + obj1 = maskDict->lookup("W"); + } + if (!obj1.isInt()) { + goto err1; + } + maskWidth = obj1.getInt(); + obj1 = maskDict->lookup("Height"); + if (obj1.isNull()) { + obj1 = maskDict->lookup("H"); + } + if (!obj1.isInt()) { + goto err1; + } + maskHeight = obj1.getInt(); + obj1 = maskDict->lookup("Interpolate"); + if (obj1.isNull()) { + obj1 = maskDict->lookup("I"); + } + if (obj1.isBool()) { + maskInterpolate = obj1.getBool(); + } else { + maskInterpolate = false; + } + obj1 = maskDict->lookup("BitsPerComponent"); + if (obj1.isNull()) { + obj1 = maskDict->lookup("BPC"); + } + if (!obj1.isInt()) { + goto err1; + } + maskBits = obj1.getInt(); + obj1 = maskDict->lookup("ColorSpace"); + if (obj1.isNull()) { + obj1 = maskDict->lookup("CS"); + } + if (obj1.isName()) { + Object obj2 = res->lookupColorSpace(obj1.getName()); + if (!obj2.isNull()) { + obj1 = std::move(obj2); + } + } + // Here, we parse manually instead of using GfxColorSpace::parse, + // since we explicitly need DeviceGray and not some DefaultGray color space + if (!obj1.isName("DeviceGray") && !obj1.isName("G")) { + goto err1; + } + maskColorSpace = new GfxDeviceGrayColorSpace(); + obj1 = maskDict->lookup("Decode"); + if (obj1.isNull()) { + obj1 = maskDict->lookup("D"); + } + maskColorMap = std::make_unique(maskBits, &obj1, maskColorSpace); + if (!maskColorMap->isOk()) { + goto err1; + } + // handle the Matte entry + obj1 = maskDict->lookup("Matte"); + if (obj1.isArray()) { + if (obj1.getArray()->getLength() != colorSpace->getNComps()) { + error(errSyntaxError, -1, "Matte entry should have {0:d} components but has {1:d}", colorSpace->getNComps(), obj1.getArray()->getLength()); + } else if (maskWidth != width || maskHeight != height) { + error(errSyntaxError, -1, "Softmask with matte entry {0:d} x {1:d} must have same geometry as the image {2:d} x {3:d}", maskWidth, maskHeight, width, height); + } else { + GfxColor matteColor; + for (i = 0; i < colorSpace->getNComps(); i++) { + Object obj2 = obj1.getArray()->get(i); + if (!obj2.isNum()) { + error(errSyntaxError, -1, "Matte entry {0:d} should be a number but it's of type {1:d}", i, obj2.getType()); + + break; + } + matteColor.c[i] = dblToCol(obj2.getNum()); + } + if (i == colorSpace->getNComps()) { + maskColorMap->setMatteColor(&matteColor); + } + } + } + haveSoftMask = true; + } else if (maskObj.isArray()) { + // color key mask + for (i = 0; i < maskObj.arrayGetLength() && i < 2 * gfxColorMaxComps; ++i) { + obj1 = maskObj.arrayGet(i); + if (obj1.isInt()) { + maskColors[i] = obj1.getInt(); + } else if (obj1.isReal()) { + error(errSyntaxError, -1, "Mask entry should be an integer but it's a real, trying to use it"); + maskColors[i] = (int)obj1.getReal(); + } else { + error(errSyntaxError, -1, "Mask entry should be an integer but it's of type {0:d}", obj1.getType()); + goto err1; + } + } + haveColorKeyMask = true; + } else if (maskObj.isStream()) { + // explicit mask + if (inlineImg) { + goto err1; + } + + if (maskStr == nullptr) { + maskStr = maskObj.getStream(); + maskDict = maskObj.streamGetDict(); + } + obj1 = maskDict->lookup("Width"); + if (obj1.isNull()) { + obj1 = maskDict->lookup("W"); + } + if (!obj1.isInt()) { + goto err1; + } + maskWidth = obj1.getInt(); + obj1 = maskDict->lookup("Height"); + if (obj1.isNull()) { + obj1 = maskDict->lookup("H"); + } + if (!obj1.isInt()) { + goto err1; + } + maskHeight = obj1.getInt(); + obj1 = maskDict->lookup("Interpolate"); + if (obj1.isNull()) { + obj1 = maskDict->lookup("I"); + } + if (obj1.isBool()) { + maskInterpolate = obj1.getBool(); + } else { + maskInterpolate = false; + } + + obj1 = maskDict->lookup("ImageMask"); + if (obj1.isNull()) { + obj1 = maskDict->lookup("IM"); + } + if (!haveMaskImage && (!obj1.isBool() || !obj1.getBool())) { + goto err1; + } + + maskInvert = false; + obj1 = maskDict->lookup("Decode"); + if (obj1.isNull()) { + obj1 = maskDict->lookup("D"); + } + if (obj1.isArray()) { + Object obj2 = obj1.arrayGet(0); + // Table 4.39 says /Decode must be [1 0] or [0 1]. Adobe + // accepts [1.0 0.0] as well. + if (obj2.isNum() && obj2.getNum() >= 0.9) { + maskInvert = true; + } + } else if (!obj1.isNull()) { + goto err1; + } + + haveExplicitMask = true; + } + + // if drawing is disabled, skip over inline image data + if (!ocState || !out->needNonText() || singular_matrix) { + str->reset(); + n = height * ((width * colorMap.getNumPixelComps() * colorMap.getBits() + 7) / 8); + for (i = 0; i < n; ++i) { + str->getChar(); + } + str->close(); + + // draw it + } else { + if (haveSoftMask) { + out->drawSoftMaskedImage(state, ref, str, width, height, &colorMap, interpolate, maskStr, maskWidth, maskHeight, maskColorMap.get(), maskInterpolate); + } else if (haveExplicitMask) { + out->drawMaskedImage(state, ref, str, width, height, &colorMap, interpolate, maskStr, maskWidth, maskHeight, maskInvert, maskInterpolate); + } else { + out->drawImage(state, ref, str, width, height, &colorMap, interpolate, haveColorKeyMask ? maskColors : nullptr, inlineImg); + } + } + } + + if ((i = width * height) > 1000) { + i = 1000; + } + updateLevel += i; + + return; + +err1: + error(errSyntaxError, getPos(), "Bad image parameters"); +} + +bool Gfx::checkTransparencyGroup(Dict *resDict) +{ + // check the effect of compositing objects as a group: + // look for ExtGState entries with ca != 1 or CA != 1 or BM != normal + bool transpGroup = false; + double opac; + + if (resDict == nullptr) { + return false; + } + pushResources(resDict); + Object extGStates = resDict->lookup("ExtGState"); + if (extGStates.isDict()) { + Dict *dict = extGStates.getDict(); + for (int i = 0; i < dict->getLength() && !transpGroup; i++) { + GfxBlendMode mode; + + Object obj1 = res->lookupGState(dict->getKey(i)); + if (obj1.isDict()) { + Object obj2 = obj1.dictLookup("BM"); + if (!obj2.isNull()) { + if (state->parseBlendMode(&obj2, &mode)) { + if (mode != gfxBlendNormal) { + transpGroup = true; + } + } else { + error(errSyntaxError, getPos(), "Invalid blend mode in ExtGState"); + } + } + obj2 = obj1.dictLookup("ca"); + if (obj2.isNum()) { + opac = obj2.getNum(); + opac = opac < 0 ? 0 : opac > 1 ? 1 : opac; + if (opac != 1) { + transpGroup = true; + } + } + obj2 = obj1.dictLookup("CA"); + if (obj2.isNum()) { + opac = obj2.getNum(); + opac = opac < 0 ? 0 : opac > 1 ? 1 : opac; + if (opac != 1) { + transpGroup = true; + } + } + // alpha is shape + obj2 = obj1.dictLookup("AIS"); + if (!transpGroup && obj2.isBool()) { + transpGroup = obj2.getBool(); + } + // soft mask + obj2 = obj1.dictLookup("SMask"); + if (!transpGroup && !obj2.isNull()) { + if (!obj2.isName("None")) { + transpGroup = true; + } + } + } + } + } + popResources(); + return transpGroup; +} + +void Gfx::doForm(Object *str) +{ + Dict *dict; + bool transpGroup, isolated, knockout; + GfxColorSpace *blendingColorSpace; + double m[6], bbox[4]; + Dict *resDict; + bool ocSaved; + Object obj1; + int i; + + // get stream dict + dict = str->streamGetDict(); + + // check form type + obj1 = dict->lookup("FormType"); + if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { + error(errSyntaxError, getPos(), "Unknown form type"); + } + + // check for optional content key + ocSaved = ocState; + const Object &objOC = dict->lookupNF("OC"); + if (catalog->getOptContentConfig() && !catalog->getOptContentConfig()->optContentIsVisible(&objOC)) { + if (out->needCharCount()) { + ocState = false; + } else { + return; + } + } + + // get bounding box + Object bboxObj = dict->lookup("BBox"); + if (!bboxObj.isArray()) { + error(errSyntaxError, getPos(), "Bad form bounding box"); + ocState = ocSaved; + return; + } + for (i = 0; i < 4; ++i) { + obj1 = bboxObj.arrayGet(i); + if (likely(obj1.isNum())) { + bbox[i] = obj1.getNum(); + } else { + error(errSyntaxError, getPos(), "Bad form bounding box value"); + return; + } + } + + // get matrix + Object matrixObj = dict->lookup("Matrix"); + if (matrixObj.isArray()) { + for (i = 0; i < 6; ++i) { + obj1 = matrixObj.arrayGet(i); + if (likely(obj1.isNum())) { + m[i] = obj1.getNum(); + } else { + m[i] = 0; + } + } + } else { + m[0] = 1; + m[1] = 0; + m[2] = 0; + m[3] = 1; + m[4] = 0; + m[5] = 0; + } + + // get resources + Object resObj = dict->lookup("Resources"); + resDict = resObj.isDict() ? resObj.getDict() : nullptr; + + // check for a transparency group + transpGroup = isolated = knockout = false; + blendingColorSpace = nullptr; + obj1 = dict->lookup("Group"); + if (obj1.isDict()) { + Object obj2 = obj1.dictLookup("S"); + if (obj2.isName("Transparency")) { + Object obj3 = obj1.dictLookup("CS"); + if (!obj3.isNull()) { + blendingColorSpace = GfxColorSpace::parse(res, &obj3, out, state); + } + obj3 = obj1.dictLookup("I"); + if (obj3.isBool()) { + isolated = obj3.getBool(); + } + obj3 = obj1.dictLookup("K"); + if (obj3.isBool()) { + knockout = obj3.getBool(); + } + transpGroup = isolated || out->checkTransparencyGroup(state, knockout) || checkTransparencyGroup(resDict); + } + } + + // draw it + drawForm(str, resDict, m, bbox, transpGroup, false, blendingColorSpace, isolated, knockout); + + if (blendingColorSpace) { + delete blendingColorSpace; + } + + ocState = ocSaved; +} + +void Gfx::drawForm(Object *str, Dict *resDict, const double *matrix, const double *bbox, bool transpGroup, bool softMask, GfxColorSpace *blendingColorSpace, bool isolated, bool knockout, bool alpha, Function *transferFunc, + GfxColor *backdropColor) +{ + Parser *oldParser; + GfxState *savedState; + double oldBaseMatrix[6]; + int i; + + // push new resources on stack + pushResources(resDict); + + // save current graphics state + savedState = saveStateStack(); + + // kill any pre-existing path + state->clearPath(); + + // save current parser + oldParser = parser; + + // set form transformation matrix + state->concatCTM(matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]); + out->updateCTM(state, matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5]); + + // set form bounding box + state->moveTo(bbox[0], bbox[1]); + state->lineTo(bbox[2], bbox[1]); + state->lineTo(bbox[2], bbox[3]); + state->lineTo(bbox[0], bbox[3]); + state->closePath(); + state->clip(); + out->clip(state); + state->clearPath(); + + if (softMask || transpGroup) { + if (state->getBlendMode() != gfxBlendNormal) { + state->setBlendMode(gfxBlendNormal); + out->updateBlendMode(state); + } + if (state->getFillOpacity() != 1) { + state->setFillOpacity(1); + out->updateFillOpacity(state); + } + if (state->getStrokeOpacity() != 1) { + state->setStrokeOpacity(1); + out->updateStrokeOpacity(state); + } + out->clearSoftMask(state); + out->beginTransparencyGroup(state, bbox, blendingColorSpace, isolated, knockout, softMask); + } + + // set new base matrix + for (i = 0; i < 6; ++i) { + oldBaseMatrix[i] = baseMatrix[i]; + baseMatrix[i] = state->getCTM()[i]; + } + + GfxState *stateBefore = state; + + // draw the form + ++displayDepth; + display(str, false); + --displayDepth; + + if (stateBefore != state) { + if (state->isParentState(stateBefore)) { + error(errSyntaxError, -1, "There's a form with more q than Q, trying to fix"); + while (stateBefore != state) { + restoreState(); + } + } else { + error(errSyntaxError, -1, "There's a form with more Q than q"); + } + } + + if (softMask || transpGroup) { + out->endTransparencyGroup(state); + } + + // restore base matrix + for (i = 0; i < 6; ++i) { + baseMatrix[i] = oldBaseMatrix[i]; + } + + // restore parser + parser = oldParser; + + // restore graphics state + restoreStateStack(savedState); + + // pop resource stack + popResources(); + + if (softMask) { + out->setSoftMask(state, bbox, alpha, transferFunc, backdropColor); + } else if (transpGroup) { + out->paintTransparencyGroup(state, bbox); + } + + return; +} + +//------------------------------------------------------------------------ +// in-line image operators +//------------------------------------------------------------------------ + +void Gfx::opBeginImage(Object args[], int numArgs) +{ + Stream *str; + int c1, c2; + + // NB: this function is run even if ocState is false -- doImage() is + // responsible for skipping over the inline image data + + // build dict/stream + str = buildImageStream(); + + // display the image + if (str) { + doImage(nullptr, str, true); + + // skip 'EI' tag + c1 = str->getUndecodedStream()->getChar(); + c2 = str->getUndecodedStream()->getChar(); + while (!(c1 == 'E' && c2 == 'I') && c2 != EOF) { + c1 = c2; + c2 = str->getUndecodedStream()->getChar(); + } + delete str; + } +} + +Stream *Gfx::buildImageStream() +{ + Stream *str; + + // build dictionary + Object dict(new Dict(xref)); + Object obj = parser->getObj(); + while (!obj.isCmd("ID") && !obj.isEOF()) { + if (!obj.isName()) { + error(errSyntaxError, getPos(), "Inline image dictionary key must be a name object"); + } else { + auto val = parser->getObj(); + if (val.isEOF() || val.isError()) { + break; + } + dict.dictAdd(obj.getName(), std::move(val)); + } + obj = parser->getObj(); + } + if (obj.isEOF()) { + error(errSyntaxError, getPos(), "End of file in inline image"); + return nullptr; + } + + // make stream + if (parser->getStream()) { + str = new EmbedStream(parser->getStream(), std::move(dict), false, 0, true); + str = str->addFilters(str->getDict()); + } else { + str = nullptr; + } + + return str; +} + +void Gfx::opImageData(Object args[], int numArgs) +{ + error(errInternal, getPos(), "Got 'ID' operator"); +} + +void Gfx::opEndImage(Object args[], int numArgs) +{ + error(errInternal, getPos(), "Got 'EI' operator"); +} + +//------------------------------------------------------------------------ +// type 3 font operators +//------------------------------------------------------------------------ + +void Gfx::opSetCharWidth(Object args[], int numArgs) +{ + out->type3D0(state, args[0].getNum(), args[1].getNum()); +} + +void Gfx::opSetCacheDevice(Object args[], int numArgs) +{ + out->type3D1(state, args[0].getNum(), args[1].getNum(), args[2].getNum(), args[3].getNum(), args[4].getNum(), args[5].getNum()); +} + +//------------------------------------------------------------------------ +// compatibility operators +//------------------------------------------------------------------------ + +void Gfx::opBeginIgnoreUndef(Object args[], int numArgs) +{ + ++ignoreUndef; +} + +void Gfx::opEndIgnoreUndef(Object args[], int numArgs) +{ + if (ignoreUndef > 0) { + --ignoreUndef; + } +} + +//------------------------------------------------------------------------ +// marked content operators +//------------------------------------------------------------------------ + +enum GfxMarkedContentKind +{ + gfxMCOptionalContent, + gfxMCActualText, + gfxMCOther +}; + +struct MarkedContentStack +{ + GfxMarkedContentKind kind; + bool ocSuppressed; // are we ignoring content based on OptionalContent? + MarkedContentStack *next; // next object on stack +}; + +void Gfx::popMarkedContent() +{ + MarkedContentStack *mc = mcStack; + mcStack = mc->next; + delete mc; +} + +void Gfx::pushMarkedContent() +{ + MarkedContentStack *mc = new MarkedContentStack(); + mc->ocSuppressed = false; + mc->kind = gfxMCOther; + mc->next = mcStack; + mcStack = mc; +} + +bool Gfx::contentIsHidden() +{ + MarkedContentStack *mc = mcStack; + bool hidden = mc && mc->ocSuppressed; + while (!hidden && mc && mc->next) { + mc = mc->next; + hidden = mc->ocSuppressed; + } + return hidden; +} + +void Gfx::opBeginMarkedContent(Object args[], int numArgs) +{ + // push a new stack entry + pushMarkedContent(); + + OCGs *contentConfig = catalog->getOptContentConfig(); + const char *name0 = args[0].getName(); + if (strncmp(name0, "OC", 2) == 0 && contentConfig) { + if (numArgs >= 2) { + if (args[1].isName()) { + const char *name1 = args[1].getName(); + MarkedContentStack *mc = mcStack; + mc->kind = gfxMCOptionalContent; + Object markedContent = res->lookupMarkedContentNF(name1); + if (!markedContent.isNull()) { + bool visible = contentConfig->optContentIsVisible(&markedContent); + mc->ocSuppressed = !(visible); + } else { + error(errSyntaxError, getPos(), "DID NOT find {0:s}", name1); + } + } else { + error(errSyntaxError, getPos(), "Unexpected MC Type: {0:d}", args[1].getType()); + } + } else { + error(errSyntaxError, getPos(), "insufficient arguments for Marked Content"); + } + } else if (args[0].isName("Span") && numArgs == 2) { + Object dictToUse; + if (args[1].isDict()) { + dictToUse = args[1].copy(); + } else if (args[1].isName()) { + dictToUse = res->lookupMarkedContentNF(args[1].getName()).fetch(xref); + } + + if (dictToUse.isDict()) { + Object obj = dictToUse.dictLookup("ActualText"); + if (obj.isString()) { + out->beginActualText(state, obj.getString()); + MarkedContentStack *mc = mcStack; + mc->kind = gfxMCActualText; + } + } + } + + if (printCommands) { + printf(" marked content: %s ", args[0].getName()); + if (numArgs == 2) { + args[1].print(stdout); + } + printf("\n"); + fflush(stdout); + } + ocState = !contentIsHidden(); + + if (numArgs == 2 && args[1].isDict()) { + out->beginMarkedContent(args[0].getName(), args[1].getDict()); + } else if (numArgs == 1) { + out->beginMarkedContent(args[0].getName(), nullptr); + } +} + +void Gfx::opEndMarkedContent(Object args[], int numArgs) +{ + if (!mcStack) { + error(errSyntaxWarning, getPos(), "Mismatched EMC operator"); + return; + } + + MarkedContentStack *mc = mcStack; + GfxMarkedContentKind mcKind = mc->kind; + + // pop the stack + popMarkedContent(); + + if (mcKind == gfxMCActualText) { + out->endActualText(state); + } + ocState = !contentIsHidden(); + + out->endMarkedContent(state); +} + +void Gfx::opMarkPoint(Object args[], int numArgs) +{ + if (printCommands) { + printf(" mark point: %s ", args[0].getName()); + if (numArgs == 2) { + args[1].print(stdout); + } + printf("\n"); + fflush(stdout); + } + + if (numArgs == 2 && args[1].isDict()) { + out->markPoint(args[0].getName(), args[1].getDict()); + } else { + out->markPoint(args[0].getName()); + } +} + +//------------------------------------------------------------------------ +// misc +//------------------------------------------------------------------------ + +struct GfxStackStateSaver +{ + explicit GfxStackStateSaver(Gfx *gfxA) : gfx(gfxA) { gfx->saveState(); } + + ~GfxStackStateSaver() { gfx->restoreState(); } + + GfxStackStateSaver(const GfxStackStateSaver &) = delete; + GfxStackStateSaver &operator=(const GfxStackStateSaver &) = delete; + + Gfx *const gfx; +}; + +void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor, double xMin, double yMin, double xMax, double yMax, int rotate) +{ + Dict *dict, *resDict; + double formXMin, formYMin, formXMax, formYMax; + double x, y, sx, sy, tx, ty; + double m[6], bbox[4]; + GfxColor color; + int i; + + // this function assumes that we are in the default user space, + // i.e., baseMatrix = ctm + + // if the bounding box has zero width or height, don't draw anything + // at all + if (xMin == xMax || yMin == yMax) { + return; + } + + // saves gfx state and automatically restores it on return + GfxStackStateSaver stackStateSaver(this); + + // Rotation around the topleft corner (for the NoRotate flag) + if (rotate != 0) { + const double angle_rad = rotate * M_PI / 180; + const double c = cos(angle_rad); + const double s = sin(angle_rad); + + // (xMin, yMax) is the pivot + const double unrotateMTX[6] = { +c, -s, +s, +c, -c * xMin - s * yMax + xMin, -c * yMax + s * xMin + yMax }; + + state->concatCTM(unrotateMTX[0], unrotateMTX[1], unrotateMTX[2], unrotateMTX[3], unrotateMTX[4], unrotateMTX[5]); + out->updateCTM(state, unrotateMTX[0], unrotateMTX[1], unrotateMTX[2], unrotateMTX[3], unrotateMTX[4], unrotateMTX[5]); + } + + // draw the appearance stream (if there is one) + if (str->isStream()) { + + // get stream dict + dict = str->streamGetDict(); + + // get the form bounding box + Object bboxObj = dict->lookup("BBox"); + if (!bboxObj.isArray()) { + error(errSyntaxError, getPos(), "Bad form bounding box"); + return; + } + for (i = 0; i < 4; ++i) { + Object obj1 = bboxObj.arrayGet(i); + if (likely(obj1.isNum())) { + bbox[i] = obj1.getNum(); + } else { + error(errSyntaxError, getPos(), "Bad form bounding box value"); + return; + } + } + + // get the form matrix + Object matrixObj = dict->lookup("Matrix"); + if (matrixObj.isArray() && matrixObj.arrayGetLength() >= 6) { + for (i = 0; i < 6; ++i) { + Object obj1 = matrixObj.arrayGet(i); + if (likely(obj1.isNum())) { + m[i] = obj1.getNum(); + } else { + error(errSyntaxError, getPos(), "Bad form matrix"); + return; + } + } + } else { + m[0] = 1; + m[1] = 0; + m[2] = 0; + m[3] = 1; + m[4] = 0; + m[5] = 0; + } + + // transform the four corners of the form bbox to default user + // space, and construct the transformed bbox + x = bbox[0] * m[0] + bbox[1] * m[2] + m[4]; + y = bbox[0] * m[1] + bbox[1] * m[3] + m[5]; + formXMin = formXMax = x; + formYMin = formYMax = y; + x = bbox[0] * m[0] + bbox[3] * m[2] + m[4]; + y = bbox[0] * m[1] + bbox[3] * m[3] + m[5]; + if (x < formXMin) { + formXMin = x; + } else if (x > formXMax) { + formXMax = x; + } + if (y < formYMin) { + formYMin = y; + } else if (y > formYMax) { + formYMax = y; + } + x = bbox[2] * m[0] + bbox[1] * m[2] + m[4]; + y = bbox[2] * m[1] + bbox[1] * m[3] + m[5]; + if (x < formXMin) { + formXMin = x; + } else if (x > formXMax) { + formXMax = x; + } + if (y < formYMin) { + formYMin = y; + } else if (y > formYMax) { + formYMax = y; + } + x = bbox[2] * m[0] + bbox[3] * m[2] + m[4]; + y = bbox[2] * m[1] + bbox[3] * m[3] + m[5]; + if (x < formXMin) { + formXMin = x; + } else if (x > formXMax) { + formXMax = x; + } + if (y < formYMin) { + formYMin = y; + } else if (y > formYMax) { + formYMax = y; + } + + // construct a mapping matrix, [sx 0 0], which maps the transformed + // [0 sy 0] + // [tx ty 1] + // bbox to the annotation rectangle + if (formXMin == formXMax) { + // this shouldn't happen + sx = 1; + } else { + sx = (xMax - xMin) / (formXMax - formXMin); + } + if (formYMin == formYMax) { + // this shouldn't happen + sy = 1; + } else { + sy = (yMax - yMin) / (formYMax - formYMin); + } + tx = -formXMin * sx + xMin; + ty = -formYMin * sy + yMin; + + // the final transform matrix is (form matrix) * (mapping matrix) + m[0] *= sx; + m[1] *= sy; + m[2] *= sx; + m[3] *= sy; + m[4] = m[4] * sx + tx; + m[5] = m[5] * sy + ty; + + // get the resources + Object resObj = dict->lookup("Resources"); + resDict = resObj.isDict() ? resObj.getDict() : nullptr; + + // draw it + drawForm(str, resDict, m, bbox); + } + + // draw the border + if (border && border->getWidth() > 0 && (!aColor || aColor->getSpace() != AnnotColor::colorTransparent)) { + if (state->getStrokeColorSpace()->getMode() != csDeviceRGB) { + state->setStrokePattern(nullptr); + state->setStrokeColorSpace(new GfxDeviceRGBColorSpace()); + out->updateStrokeColorSpace(state); + } + double r, g, b; + if (!aColor) { + r = g = b = 0; + } else if ((aColor->getSpace() == AnnotColor::colorRGB)) { + const double *values = aColor->getValues(); + r = values[0]; + g = values[1]; + b = values[2]; + } else { + error(errUnimplemented, -1, "AnnotColor different than RGB and Transparent not supported"); + r = g = b = 0; + }; + color.c[0] = dblToCol(r); + color.c[1] = dblToCol(g); + color.c[2] = dblToCol(b); + state->setStrokeColor(&color); + out->updateStrokeColor(state); + state->setLineWidth(border->getWidth()); + out->updateLineWidth(state); + const std::vector &dash = border->getDash(); + if (border->getStyle() == AnnotBorder::borderDashed && dash.size() > 0) { + std::vector dash2 = dash; + state->setLineDash(std::move(dash2), 0); + out->updateLineDash(state); + } + //~ this doesn't currently handle the beveled and engraved styles + state->clearPath(); + state->moveTo(xMin, yMin); + state->lineTo(xMax, yMin); + if (border->getStyle() != AnnotBorder::borderUnderlined) { + state->lineTo(xMax, yMax); + state->lineTo(xMin, yMax); + state->closePath(); + } + out->stroke(state); + } +} + +int Gfx::bottomGuard() +{ + return stateGuards[stateGuards.size() - 1]; +} + +void Gfx::pushStateGuard() +{ + stateGuards.push_back(stackHeight); +} + +void Gfx::popStateGuard() +{ + while (stackHeight > bottomGuard() && state->hasSaves()) { + restoreState(); + } + stateGuards.pop_back(); +} + +void Gfx::saveState() +{ + out->saveState(state); + state = state->save(); + stackHeight++; +} + +void Gfx::restoreState() +{ + if (stackHeight <= bottomGuard() || !state->hasSaves()) { + error(errSyntaxError, -1, "Restoring state when no valid states to pop"); + return; + } + state = state->restore(); + out->restoreState(state); + stackHeight--; + clip = clipNone; +} + +// Create a new state stack, and initialize it with a copy of the +// current state. +GfxState *Gfx::saveStateStack() +{ + GfxState *oldState; + + out->saveState(state); + oldState = state; + state = state->copy(true); + return oldState; +} + +// Switch back to the previous state stack. +void Gfx::restoreStateStack(GfxState *oldState) +{ + while (state->hasSaves()) { + restoreState(); + } + delete state; + state = oldState; + out->restoreState(state); +} + +void Gfx::pushResources(Dict *resDict) +{ + res = new GfxResources(xref, resDict, res); +} + +void Gfx::popResources() +{ + GfxResources *resPtr; + + resPtr = res->getNext(); + delete res; + res = resPtr; +} diff --git a/poppler-24.05.0/poppler/Gfx.h b/poppler-24.05.0/poppler/Gfx.h new file mode 100644 index 0000000000000000000000000000000000000000..fee97a7228e5b62d2f3e5a486fd04c7d204cd8f9 --- /dev/null +++ b/poppler-24.05.0/poppler/Gfx.h @@ -0,0 +1,373 @@ +//======================================================================== +// +// Gfx.h +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Jonathan Blandford +// Copyright (C) 2007 Iñigo Martínez +// Copyright (C) 2008 Brad Hards +// Copyright (C) 2008, 2010 Carlos Garcia Campos +// Copyright (C) 2009-2013, 2017, 2018, 2021 Albert Astals Cid +// Copyright (C) 2009, 2010, 2012, 2013 Thomas Freitag +// Copyright (C) 2010 David Benjamin +// Copyright (C) 2010 Christian Feuersänger +// Copyright (C) 2013 Fabio D'Urso +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019, 2022 Oliver Sander +// Copyright (C) 2019 Volker Krause +// +// 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 +// +//======================================================================== + +#ifndef GFX_H +#define GFX_H + +#include "poppler-config.h" +#include "poppler_private_export.h" +#include "GfxState.h" +#include "Object.h" +#include "PopplerCache.h" + +#include + +class GooString; +class PDFDoc; +class XRef; +class Array; +class Stream; +class Parser; +class Dict; +class Function; +class OutputDev; +class GfxFontDict; +class GfxFont; +class GfxPattern; +class GfxTilingPattern; +class GfxShadingPattern; +class GfxShading; +class GfxFunctionShading; +class GfxAxialShading; +class GfxRadialShading; +class GfxGouraudTriangleShading; +class GfxPatchMeshShading; +struct GfxPatch; +class GfxState; +struct GfxColor; +class GfxColorSpace; +class Gfx; +class PDFRectangle; +class AnnotBorder; +class AnnotColor; +class Catalog; +struct MarkedContentStack; + +//------------------------------------------------------------------------ + +enum GfxClipType +{ + clipNone, + clipNormal, + clipEO +}; + +enum TchkType +{ + tchkBool, // boolean + tchkInt, // integer + tchkNum, // number (integer or real) + tchkString, // string + tchkName, // name + tchkArray, // array + tchkProps, // properties (dictionary or name) + tchkSCN, // scn/SCN args (number of name) + tchkNone // used to avoid empty initializer lists +}; + +#define maxArgs 33 + +struct Operator +{ + char name[4]; + int numArgs; + TchkType tchk[maxArgs]; + void (Gfx::*func)(Object args[], int numArgs); +}; + +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GfxResources +{ +public: + GfxResources(XRef *xref, Dict *resDict, GfxResources *nextA); + ~GfxResources(); + + GfxResources(const GfxResources &) = delete; + GfxResources &operator=(const GfxResources &other) = delete; + + std::shared_ptr lookupFont(const char *name); + std::shared_ptr lookupFont(const char *name) const; + Object lookupXObject(const char *name); + Object lookupXObjectNF(const char *name); + Object lookupMarkedContentNF(const char *name); + Object lookupColorSpace(const char *name); + GfxPattern *lookupPattern(const char *name, OutputDev *out, GfxState *state); + GfxShading *lookupShading(const char *name, OutputDev *out, GfxState *state); + Object lookupGState(const char *name); + Object lookupGStateNF(const char *name); + + GfxResources *getNext() const { return next; } + +private: + std::shared_ptr doLookupFont(const char *name) const; + + GfxFontDict *fonts; + Object xObjDict; + Object colorSpaceDict; + Object patternDict; + Object shadingDict; + Object gStateDict; + PopplerCache gStateCache; + XRef *xref; + Object propertiesDict; + GfxResources *next; +}; + +//------------------------------------------------------------------------ +// Gfx +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT Gfx +{ +public: + // Constructor for regular output. + Gfx(PDFDoc *docA, OutputDev *outA, int pageNum, Dict *resDict, double hDPI, double vDPI, const PDFRectangle *box, const PDFRectangle *cropBox, int rotate, bool (*abortCheckCbkA)(void *data) = nullptr, void *abortCheckCbkDataA = nullptr, + XRef *xrefA = nullptr); + + // Constructor for a sub-page object. + Gfx(PDFDoc *docA, OutputDev *outA, Dict *resDict, const PDFRectangle *box, const PDFRectangle *cropBox, bool (*abortCheckCbkA)(void *data) = nullptr, void *abortCheckCbkDataA = nullptr, Gfx *gfxA = nullptr); +#ifdef USE_CMS + void initDisplayProfile(); +#endif + ~Gfx(); + + Gfx(const Gfx &) = delete; + Gfx &operator=(const Gfx &other) = delete; + + XRef *getXRef() { return xref; } + + // Interpret a stream or array of streams. + void display(Object *obj, bool topLevel = true); + + // Display an annotation, given its appearance (a Form XObject), + // border style, and bounding box (in default user space). + void drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor, double xMin, double yMin, double xMax, double yMax, int rotate); + + // Save graphics state. + void saveState(); + + // Push a new state guard + void pushStateGuard(); + + // Restore graphics state. + void restoreState(); + + // Pop to state guard and pop guard + void popStateGuard(); + + // Get the current graphics state object. + GfxState *getState() { return state; } + + bool checkTransparencyGroup(Dict *resDict); + + void drawForm(Object *str, Dict *resDict, const double *matrix, const double *bbox, bool transpGroup = false, bool softMask = false, GfxColorSpace *blendingColorSpace = nullptr, bool isolated = false, bool knockout = false, + bool alpha = false, Function *transferFunc = nullptr, GfxColor *backdropColor = nullptr); + + void pushResources(Dict *resDict); + void popResources(); + +private: + PDFDoc *doc; + XRef *xref; // the xref table for this PDF file + Catalog *catalog; // the Catalog for this PDF file + OutputDev *out; // output device + bool subPage; // is this a sub-page object? + const bool printCommands; // print the drawing commands (for debugging) + const bool profileCommands; // profile the drawing commands (for debugging) + bool commandAborted; // did the previous command abort the drawing? + GfxResources *res; // resource stack + int updateLevel; + + GfxState *state; // current graphics state + int stackHeight; // the height of the current graphics stack + std::vector stateGuards; // a stack of state limits; to guard against unmatched pops + bool fontChanged; // set if font or text matrix has changed + GfxClipType clip; // do a clip? + int ignoreUndef; // current BX/EX nesting level + double baseMatrix[6]; // default matrix for most recent + // page/form/pattern + int displayDepth; + bool ocState; // true if drawing is enabled, false if + // disabled + + MarkedContentStack *mcStack; // current BMC/EMC stack + + Parser *parser; // parser for page content stream(s) + + std::set formsDrawing; // the forms/patterns that are being drawn + std::set charProcDrawing; // the charProc that are being drawn + + bool // callback to check for an abort + (*abortCheckCbk)(void *data); + void *abortCheckCbkData; + + static const Operator opTab[]; // table of operators + + void go(bool topLevel); + void execOp(Object *cmd, Object args[], int numArgs); + const Operator *findOp(const char *name); + bool checkArg(Object *arg, TchkType type); + Goffset getPos(); + + int bottomGuard(); + + // graphics state operators + void opSave(Object args[], int numArgs); + void opRestore(Object args[], int numArgs); + void opConcat(Object args[], int numArgs); + void opSetDash(Object args[], int numArgs); + void opSetFlat(Object args[], int numArgs); + void opSetLineJoin(Object args[], int numArgs); + void opSetLineCap(Object args[], int numArgs); + void opSetMiterLimit(Object args[], int numArgs); + void opSetLineWidth(Object args[], int numArgs); + void opSetExtGState(Object args[], int numArgs); + void doSoftMask(Object *str, bool alpha, GfxColorSpace *blendingColorSpace, bool isolated, bool knockout, Function *transferFunc, GfxColor *backdropColor); + void opSetRenderingIntent(Object args[], int numArgs); + + // color operators + void opSetFillGray(Object args[], int numArgs); + void opSetStrokeGray(Object args[], int numArgs); + void opSetFillCMYKColor(Object args[], int numArgs); + void opSetStrokeCMYKColor(Object args[], int numArgs); + void opSetFillRGBColor(Object args[], int numArgs); + void opSetStrokeRGBColor(Object args[], int numArgs); + void opSetFillColorSpace(Object args[], int numArgs); + void opSetStrokeColorSpace(Object args[], int numArgs); + void opSetFillColor(Object args[], int numArgs); + void opSetStrokeColor(Object args[], int numArgs); + void opSetFillColorN(Object args[], int numArgs); + void opSetStrokeColorN(Object args[], int numArgs); + + // path segment operators + void opMoveTo(Object args[], int numArgs); + void opLineTo(Object args[], int numArgs); + void opCurveTo(Object args[], int numArgs); + void opCurveTo1(Object args[], int numArgs); + void opCurveTo2(Object args[], int numArgs); + void opRectangle(Object args[], int numArgs); + void opClosePath(Object args[], int numArgs); + + // path painting operators + void opEndPath(Object args[], int numArgs); + void opStroke(Object args[], int numArgs); + void opCloseStroke(Object args[], int numArgs); + void opFill(Object args[], int numArgs); + void opEOFill(Object args[], int numArgs); + void opFillStroke(Object args[], int numArgs); + void opCloseFillStroke(Object args[], int numArgs); + void opEOFillStroke(Object args[], int numArgs); + void opCloseEOFillStroke(Object args[], int numArgs); + void doPatternFill(bool eoFill); + void doPatternStroke(); + void doPatternText(); + void doPatternImageMask(Object *ref, Stream *str, int width, int height, bool invert, bool inlineImg); + void doTilingPatternFill(GfxTilingPattern *tPat, bool stroke, bool eoFill, bool text); + void doShadingPatternFill(GfxShadingPattern *sPat, bool stroke, bool eoFill, bool text); + void opShFill(Object args[], int numArgs); + void doFunctionShFill(GfxFunctionShading *shading); + void doFunctionShFill1(GfxFunctionShading *shading, double x0, double y0, double x1, double y1, GfxColor *colors, int depth); + void doAxialShFill(GfxAxialShading *shading); + void doRadialShFill(GfxRadialShading *shading); + void doGouraudTriangleShFill(GfxGouraudTriangleShading *shading); + void gouraudFillTriangle(double x0, double y0, GfxColor *color0, double x1, double y1, GfxColor *color1, double x2, double y2, GfxColor *color2, int nComps, int depth, GfxState::ReusablePathIterator *path); + void gouraudFillTriangle(double x0, double y0, double color0, double x1, double y1, double color1, double x2, double y2, double color2, double refineColorThreshold, int depth, GfxGouraudTriangleShading *shading, + GfxState::ReusablePathIterator *path); + void doPatchMeshShFill(GfxPatchMeshShading *shading); + void fillPatch(const GfxPatch *patch, int colorComps, int patchColorComps, double refineColorThreshold, int depth, const GfxPatchMeshShading *shading); + void doEndPath(); + + // path clipping operators + void opClip(Object args[], int numArgs); + void opEOClip(Object args[], int numArgs); + + // text object operators + void opBeginText(Object args[], int numArgs); + void opEndText(Object args[], int numArgs); + + // text state operators + void opSetCharSpacing(Object args[], int numArgs); + void opSetFont(Object args[], int numArgs); + void opSetTextLeading(Object args[], int numArgs); + void opSetTextRender(Object args[], int numArgs); + void opSetTextRise(Object args[], int numArgs); + void opSetWordSpacing(Object args[], int numArgs); + void opSetHorizScaling(Object args[], int numArgs); + + // text positioning operators + void opTextMove(Object args[], int numArgs); + void opTextMoveSet(Object args[], int numArgs); + void opSetTextMatrix(Object args[], int numArgs); + void opTextNextLine(Object args[], int numArgs); + + // text string operators + void opShowText(Object args[], int numArgs); + void opMoveShowText(Object args[], int numArgs); + void opMoveSetShowText(Object args[], int numArgs); + void opShowSpaceText(Object args[], int numArgs); + void doShowText(const GooString *s); + void doIncCharCount(const GooString *s); + + // XObject operators + void opXObject(Object args[], int numArgs); + void doImage(Object *ref, Stream *str, bool inlineImg); + void doForm(Object *str); + + // in-line image operators + void opBeginImage(Object args[], int numArgs); + Stream *buildImageStream(); + void opImageData(Object args[], int numArgs); + void opEndImage(Object args[], int numArgs); + + // type 3 font operators + void opSetCharWidth(Object args[], int numArgs); + void opSetCacheDevice(Object args[], int numArgs); + + // compatibility operators + void opBeginIgnoreUndef(Object args[], int numArgs); + void opEndIgnoreUndef(Object args[], int numArgs); + + // marked content operators + void opBeginMarkedContent(Object args[], int numArgs); + void opEndMarkedContent(Object args[], int numArgs); + void opMarkPoint(Object args[], int numArgs); + GfxState *saveStateStack(); + void restoreStateStack(GfxState *oldState); + bool contentIsHidden(); + void pushMarkedContent(); + void popMarkedContent(); +}; + +#endif diff --git a/poppler-24.05.0/poppler/GfxFont.cc b/poppler-24.05.0/poppler/GfxFont.cc new file mode 100644 index 0000000000000000000000000000000000000000..9d17f12ebfd76db8cab1ef36db9bd1900007b46e --- /dev/null +++ b/poppler-24.05.0/poppler/GfxFont.cc @@ -0,0 +1,2516 @@ +//======================================================================== +// +// GfxFont.cc +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005, 2006, 2008-2010, 2012, 2014, 2015, 2017-2023 Albert Astals Cid +// Copyright (C) 2005, 2006 Kristian Høgsberg +// Copyright (C) 2006 Takashi Iwai +// Copyright (C) 2007 Julien Rebetez +// Copyright (C) 2007 Jeff Muizelaar +// Copyright (C) 2007 Koji Otani +// Copyright (C) 2007 Ed Catmur +// Copyright (C) 2008 Jonathan Kew +// Copyright (C) 2008 Ed Avis +// Copyright (C) 2008, 2010 Hib Eris +// Copyright (C) 2009 Peter Kerzum +// Copyright (C) 2009, 2010 David Benjamin +// Copyright (C) 2011 Axel Strübing +// Copyright (C) 2011, 2012, 2014 Adrian Johnson +// Copyright (C) 2012 Yi Yang +// Copyright (C) 2012 Suzuki Toshiya +// Copyright (C) 2012, 2017 Thomas Freitag +// Copyright (C) 2013-2016, 2018 Jason Crain +// Copyright (C) 2014 Olly Betts +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019 LE GARREC Vincent +// Copyright (C) 2021, 2022, 2024 Oliver Sander +// Copyright (C) 2023 Khaled Hosny +// Copyright (C) 2024 Nelson Benítez León +// +// 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 + +#include +#include +#include +#include +#include +#include +#include +#include "goo/gmem.h" +#include "Error.h" +#include "Object.h" +#include "Dict.h" +#include "GlobalParams.h" +#include "CMap.h" +#include "CharCodeToUnicode.h" +#include "FontEncodingTables.h" +#include "BuiltinFont.h" +#include "UnicodeTypeTable.h" +#include +#include +#include +#include +#include "GfxFont.h" +#include "PSOutputDev.h" + +//------------------------------------------------------------------------ + +struct Base14FontMapEntry +{ + const char *altName; + const char *base14Name; +}; + +static const Base14FontMapEntry base14FontMap[] = { { "Arial", "Helvetica" }, + { "Arial,Bold", "Helvetica-Bold" }, + { "Arial,BoldItalic", "Helvetica-BoldOblique" }, + { "Arial,Italic", "Helvetica-Oblique" }, + { "Arial-Bold", "Helvetica-Bold" }, + { "Arial-BoldItalic", "Helvetica-BoldOblique" }, + { "Arial-BoldItalicMT", "Helvetica-BoldOblique" }, + { "Arial-BoldMT", "Helvetica-Bold" }, + { "Arial-Italic", "Helvetica-Oblique" }, + { "Arial-ItalicMT", "Helvetica-Oblique" }, + { "ArialMT", "Helvetica" }, + { "Courier", "Courier" }, + { "Courier,Bold", "Courier-Bold" }, + { "Courier,BoldItalic", "Courier-BoldOblique" }, + { "Courier,Italic", "Courier-Oblique" }, + { "Courier-Bold", "Courier-Bold" }, + { "Courier-BoldOblique", "Courier-BoldOblique" }, + { "Courier-Oblique", "Courier-Oblique" }, + { "CourierNew", "Courier" }, + { "CourierNew,Bold", "Courier-Bold" }, + { "CourierNew,BoldItalic", "Courier-BoldOblique" }, + { "CourierNew,Italic", "Courier-Oblique" }, + { "CourierNew-Bold", "Courier-Bold" }, + { "CourierNew-BoldItalic", "Courier-BoldOblique" }, + { "CourierNew-Italic", "Courier-Oblique" }, + { "CourierNewPS-BoldItalicMT", "Courier-BoldOblique" }, + { "CourierNewPS-BoldMT", "Courier-Bold" }, + { "CourierNewPS-ItalicMT", "Courier-Oblique" }, + { "CourierNewPSMT", "Courier" }, + { "Helvetica", "Helvetica" }, + { "Helvetica,Bold", "Helvetica-Bold" }, + { "Helvetica,BoldItalic", "Helvetica-BoldOblique" }, + { "Helvetica,Italic", "Helvetica-Oblique" }, + { "Helvetica-Bold", "Helvetica-Bold" }, + { "Helvetica-BoldItalic", "Helvetica-BoldOblique" }, + { "Helvetica-BoldOblique", "Helvetica-BoldOblique" }, + { "Helvetica-Italic", "Helvetica-Oblique" }, + { "Helvetica-Oblique", "Helvetica-Oblique" }, + { "Symbol", "Symbol" }, + { "Symbol,Bold", "Symbol" }, + { "Symbol,BoldItalic", "Symbol" }, + { "Symbol,Italic", "Symbol" }, + { "SymbolMT", "Symbol" }, + { "SymbolMT,Bold", "Symbol" }, + { "SymbolMT,BoldItalic", "Symbol" }, + { "SymbolMT,Italic", "Symbol" }, + { "Times-Bold", "Times-Bold" }, + { "Times-BoldItalic", "Times-BoldItalic" }, + { "Times-Italic", "Times-Italic" }, + { "Times-Roman", "Times-Roman" }, + { "TimesNewRoman", "Times-Roman" }, + { "TimesNewRoman,Bold", "Times-Bold" }, + { "TimesNewRoman,BoldItalic", "Times-BoldItalic" }, + { "TimesNewRoman,Italic", "Times-Italic" }, + { "TimesNewRoman-Bold", "Times-Bold" }, + { "TimesNewRoman-BoldItalic", "Times-BoldItalic" }, + { "TimesNewRoman-Italic", "Times-Italic" }, + { "TimesNewRomanPS", "Times-Roman" }, + { "TimesNewRomanPS-Bold", "Times-Bold" }, + { "TimesNewRomanPS-BoldItalic", "Times-BoldItalic" }, + { "TimesNewRomanPS-BoldItalicMT", "Times-BoldItalic" }, + { "TimesNewRomanPS-BoldMT", "Times-Bold" }, + { "TimesNewRomanPS-Italic", "Times-Italic" }, + { "TimesNewRomanPS-ItalicMT", "Times-Italic" }, + { "TimesNewRomanPSMT", "Times-Roman" }, + { "TimesNewRomanPSMT,Bold", "Times-Bold" }, + { "TimesNewRomanPSMT,BoldItalic", "Times-BoldItalic" }, + { "TimesNewRomanPSMT,Italic", "Times-Italic" }, + { "ZapfDingbats", "ZapfDingbats" } }; + +//------------------------------------------------------------------------ + +// index: {fixed:0, sans-serif:4, serif:8} + bold*2 + italic +// NB: must be in same order as psSubstFonts in PSOutputDev.cc +static const char *base14SubstFonts[14] = { "Courier", "Courier-Oblique", "Courier-Bold", "Courier-BoldOblique", "Helvetica", "Helvetica-Oblique", "Helvetica-Bold", "Helvetica-BoldOblique", "Times-Roman", "Times-Italic", "Times-Bold", + "Times-BoldItalic", + // the last two are never used for substitution + "Symbol", "ZapfDingbats" }; + +//------------------------------------------------------------------------ + +static int parseCharName(char *charName, Unicode *uBuf, int uLen, bool names, bool ligatures, bool numeric, bool hex, bool variants); + +//------------------------------------------------------------------------ + +static int readFromStream(void *data) +{ + return ((Stream *)data)->getChar(); +} + +//------------------------------------------------------------------------ +// GfxFontLoc +//------------------------------------------------------------------------ + +GfxFontLoc::GfxFontLoc() +{ + fontNum = 0; + substIdx = -1; +} + +GfxFontLoc::~GfxFontLoc() = default; + +GfxFontLoc::GfxFontLoc(GfxFontLoc &&other) noexcept = default; + +GfxFontLoc &GfxFontLoc::operator=(GfxFontLoc &&other) noexcept = default; + +void GfxFontLoc::setPath(GooString *pathA) +{ + path = pathA->toStr(); + delete pathA; +} + +const GooString *GfxFontLoc::pathAsGooString() const +{ + return (const GooString *)(&path); +} + +//------------------------------------------------------------------------ +// GfxFont +//------------------------------------------------------------------------ + +std::unique_ptr GfxFont::makeFont(XRef *xref, const char *tagA, Ref idA, Dict *fontDict) +{ + std::optional name; + Ref embFontIDA; + GfxFontType typeA; + + // get base font name + Object obj1 = fontDict->lookup("BaseFont"); + if (obj1.isName()) { + name = obj1.getName(); + } + + // There is no BaseFont in Type 3 fonts, try fontDescriptor.FontName + if (!name) { + Object fontDesc = fontDict->lookup("FontDescriptor"); + if (fontDesc.isDict()) { + Object obj2 = fontDesc.dictLookup("FontName"); + if (obj2.isName()) { + name = obj2.getName(); + } + } + } + + // As a last resort try the Name key + if (!name) { + Object obj2 = fontDict->lookup("Name"); + if (obj2.isName()) { + name = obj2.getName(); + } + } + + // get embedded font ID and font type + typeA = getFontType(xref, fontDict, &embFontIDA); + + // create the font object + GfxFont *font; + if (typeA < fontCIDType0) { + font = new Gfx8BitFont(xref, tagA, idA, std::move(name), typeA, embFontIDA, fontDict); + } else { + font = new GfxCIDFont(xref, tagA, idA, std::move(name), typeA, embFontIDA, fontDict); + } + + return std::unique_ptr(font); +} + +GfxFont::GfxFont(const char *tagA, Ref idA, std::optional &&nameA, GfxFontType typeA, Ref embFontIDA) : tag(tagA), id(idA), name(std::move(nameA)), type(typeA) +{ + ok = false; + embFontID = embFontIDA; + embFontName = nullptr; + family = nullptr; + stretch = StretchNotDefined; + weight = WeightNotDefined; + hasToUnicode = false; +} + +GfxFont::~GfxFont() +{ + delete family; + if (embFontName) { + delete embFontName; + } +} + +bool GfxFont::isSubset() const +{ + if (name) { + unsigned int i; + for (i = 0; i < name->size(); ++i) { + if ((*name)[i] < 'A' || (*name)[i] > 'Z') { + break; + } + } + return i == 6 && name->size() > 7 && (*name)[6] == '+'; + } + return false; +} + +std::string GfxFont::getNameWithoutSubsetTag() const +{ + if (!name) { + return {}; + } + + if (!isSubset()) { + return *name; + } + + return name->substr(7); +} + +// This function extracts three pieces of information: +// 1. the "expected" font type, i.e., the font type implied by +// Font.Subtype, DescendantFont.Subtype, and +// FontDescriptor.FontFile3.Subtype +// 2. the embedded font object ID +// 3. the actual font type - determined by examining the embedded font +// if there is one, otherwise equal to the expected font type +// If the expected and actual font types don't match, a warning +// message is printed. The expected font type is not used for +// anything else. +GfxFontType GfxFont::getFontType(XRef *xref, Dict *fontDict, Ref *embID) +{ + GfxFontType t, expectedType; + FoFiIdentifierType fft; + Dict *fontDict2; + bool isType0, err; + + t = fontUnknownType; + *embID = Ref::INVALID(); + err = false; + + Object subtype = fontDict->lookup("Subtype"); + expectedType = fontUnknownType; + isType0 = false; + if (subtype.isName("Type1") || subtype.isName("MMType1")) { + expectedType = fontType1; + } else if (subtype.isName("Type1C")) { + expectedType = fontType1C; + } else if (subtype.isName("Type3")) { + expectedType = fontType3; + } else if (subtype.isName("TrueType")) { + expectedType = fontTrueType; + } else if (subtype.isName("Type0")) { + isType0 = true; + } else { + error(errSyntaxWarning, -1, "Unknown font type: '{0:s}'", subtype.isName() ? subtype.getName() : "???"); + } + + fontDict2 = fontDict; + Object obj1 = fontDict->lookup("DescendantFonts"); + Object obj2; // Do not move to inside the if + // we need it around so that fontDict2 remains valid + if (obj1.isArray()) { + if (obj1.arrayGetLength() == 0) { + error(errSyntaxWarning, -1, "Empty DescendantFonts array in font"); + } else { + obj2 = obj1.arrayGet(0); + if (obj2.isDict()) { + if (!isType0) { + error(errSyntaxWarning, -1, "Non-CID font with DescendantFonts array"); + } + fontDict2 = obj2.getDict(); + subtype = fontDict2->lookup("Subtype"); + if (subtype.isName("CIDFontType0")) { + if (isType0) { + expectedType = fontCIDType0; + } + } else if (subtype.isName("CIDFontType2")) { + if (isType0) { + expectedType = fontCIDType2; + } + } + } + } + } + + Object fontDesc = fontDict2->lookup("FontDescriptor"); + if (fontDesc.isDict()) { + Object obj3 = fontDesc.dictLookupNF("FontFile").copy(); + if (obj3.isRef()) { + *embID = obj3.getRef(); + if (expectedType != fontType1) { + err = true; + } + } + if (*embID == Ref::INVALID() && (obj3 = fontDesc.dictLookupNF("FontFile2").copy(), obj3.isRef())) { + *embID = obj3.getRef(); + if (isType0) { + expectedType = fontCIDType2; + } else if (expectedType != fontTrueType) { + err = true; + } + } + if (*embID == Ref::INVALID() && (obj3 = fontDesc.dictLookupNF("FontFile3").copy(), obj3.isRef())) { + *embID = obj3.getRef(); + Object obj4 = obj3.fetch(xref); + if (obj4.isStream()) { + subtype = obj4.streamGetDict()->lookup("Subtype"); + if (subtype.isName("Type1")) { + if (expectedType != fontType1) { + err = true; + expectedType = isType0 ? fontCIDType0 : fontType1; + } + } else if (subtype.isName("Type1C")) { + if (expectedType == fontType1) { + expectedType = fontType1C; + } else if (expectedType != fontType1C) { + err = true; + expectedType = isType0 ? fontCIDType0C : fontType1C; + } + } else if (subtype.isName("TrueType")) { + if (expectedType != fontTrueType) { + err = true; + expectedType = isType0 ? fontCIDType2 : fontTrueType; + } + } else if (subtype.isName("CIDFontType0C")) { + if (expectedType == fontCIDType0) { + expectedType = fontCIDType0C; + } else { + err = true; + expectedType = isType0 ? fontCIDType0C : fontType1C; + } + } else if (subtype.isName("OpenType")) { + if (expectedType == fontTrueType) { + expectedType = fontTrueTypeOT; + } else if (expectedType == fontType1) { + expectedType = fontType1COT; + } else if (expectedType == fontCIDType0) { + expectedType = fontCIDType0COT; + } else if (expectedType == fontCIDType2) { + expectedType = fontCIDType2OT; + } else { + err = true; + } + } else { + error(errSyntaxError, -1, "Unknown font type '{0:s}'", subtype.isName() ? subtype.getName() : "???"); + } + } + } + } + + t = fontUnknownType; + if (*embID != Ref::INVALID()) { + Object obj3(*embID); + Object obj4 = obj3.fetch(xref); + if (obj4.isStream()) { + obj4.streamReset(); + fft = FoFiIdentifier::identifyStream(&readFromStream, obj4.getStream()); + obj4.streamClose(); + switch (fft) { + case fofiIdType1PFA: + case fofiIdType1PFB: + t = fontType1; + break; + case fofiIdCFF8Bit: + t = isType0 ? fontCIDType0C : fontType1C; + break; + case fofiIdCFFCID: + t = fontCIDType0C; + break; + case fofiIdTrueType: + case fofiIdTrueTypeCollection: + t = isType0 ? fontCIDType2 : fontTrueType; + break; + case fofiIdOpenTypeCFF8Bit: + t = isType0 ? fontCIDType0COT : fontType1COT; + break; + case fofiIdOpenTypeCFFCID: + t = fontCIDType0COT; + break; + default: + error(errSyntaxError, -1, "Embedded font file may be invalid"); + break; + } + } + } + + if (t == fontUnknownType) { + t = expectedType; + } + + if (t != expectedType) { + err = true; + } + + if (err) { + error(errSyntaxWarning, -1, "Mismatch between font type and embedded font file"); + } + + return t; +} + +void GfxFont::readFontDescriptor(XRef *xref, Dict *fontDict) +{ + double t; + + // assume Times-Roman by default (for substitution purposes) + flags = fontSerif; + + missingWidth = 0; + + Object obj1 = fontDict->lookup("FontDescriptor"); + if (obj1.isDict()) { + + // get flags + Object obj2 = obj1.dictLookup("Flags"); + if (obj2.isInt()) { + flags = obj2.getInt(); + } + + // get name + obj2 = obj1.dictLookup("FontName"); + if (obj2.isName()) { + embFontName = new GooString(obj2.getName()); + } + if (embFontName == nullptr) { + // get name with typo + obj2 = obj1.dictLookup("Fontname"); + if (obj2.isName()) { + embFontName = new GooString(obj2.getName()); + error(errSyntaxWarning, -1, "The file uses Fontname instead of FontName please notify the creator that the file is broken"); + } + } + + // get family + obj2 = obj1.dictLookup("FontFamily"); + if (obj2.isString()) { + family = new GooString(obj2.getString()); + } + + // get stretch + obj2 = obj1.dictLookup("FontStretch"); + if (obj2.isName()) { + if (strcmp(obj2.getName(), "UltraCondensed") == 0) { + stretch = UltraCondensed; + } else if (strcmp(obj2.getName(), "ExtraCondensed") == 0) { + stretch = ExtraCondensed; + } else if (strcmp(obj2.getName(), "Condensed") == 0) { + stretch = Condensed; + } else if (strcmp(obj2.getName(), "SemiCondensed") == 0) { + stretch = SemiCondensed; + } else if (strcmp(obj2.getName(), "Normal") == 0) { + stretch = Normal; + } else if (strcmp(obj2.getName(), "SemiExpanded") == 0) { + stretch = SemiExpanded; + } else if (strcmp(obj2.getName(), "Expanded") == 0) { + stretch = Expanded; + } else if (strcmp(obj2.getName(), "ExtraExpanded") == 0) { + stretch = ExtraExpanded; + } else if (strcmp(obj2.getName(), "UltraExpanded") == 0) { + stretch = UltraExpanded; + } else { + error(errSyntaxWarning, -1, "Invalid Font Stretch"); + } + } + + // get weight + obj2 = obj1.dictLookup("FontWeight"); + if (obj2.isNum()) { + if (obj2.getNum() == 100) { + weight = W100; + } else if (obj2.getNum() == 200) { + weight = W200; + } else if (obj2.getNum() == 300) { + weight = W300; + } else if (obj2.getNum() == 400) { + weight = W400; + } else if (obj2.getNum() == 500) { + weight = W500; + } else if (obj2.getNum() == 600) { + weight = W600; + } else if (obj2.getNum() == 700) { + weight = W700; + } else if (obj2.getNum() == 800) { + weight = W800; + } else if (obj2.getNum() == 900) { + weight = W900; + } else { + error(errSyntaxWarning, -1, "Invalid Font Weight"); + } + } + + // look for MissingWidth + obj2 = obj1.dictLookup("MissingWidth"); + if (obj2.isNum()) { + missingWidth = obj2.getNum(); + } + + // get Ascent and Descent + obj2 = obj1.dictLookup("Ascent"); + if (obj2.isNum()) { + t = 0.001 * obj2.getNum(); + // some broken font descriptors specify a negative ascent + if (t < 0) { + t = -t; + } + // some broken font descriptors set ascent and descent to 0; + // others set it to ridiculous values (e.g., 32768) + if (t != 0 && t < 3) { + ascent = t; + } + } + obj2 = obj1.dictLookup("Descent"); + if (obj2.isNum()) { + t = 0.001 * obj2.getNum(); + // some broken font descriptors specify a positive descent + if (t > 0) { + t = -t; + } + // some broken font descriptors set ascent and descent to 0 + if (t != 0 && t > -3) { + descent = t; + } + } + + // font FontBBox + obj2 = obj1.dictLookup("FontBBox"); + if (obj2.isArray()) { + for (int i = 0; i < 4 && i < obj2.arrayGetLength(); ++i) { + Object obj3 = obj2.arrayGet(i); + if (obj3.isNum()) { + fontBBox[i] = 0.001 * obj3.getNum(); + } + } + } + } +} + +CharCodeToUnicode *GfxFont::readToUnicodeCMap(Dict *fontDict, int nBits, CharCodeToUnicode *ctu) +{ + GooString *buf; + + Object obj1 = fontDict->lookup("ToUnicode"); + if (!obj1.isStream()) { + return nullptr; + } + buf = new GooString(); + obj1.getStream()->fillGooString(buf); + obj1.streamClose(); + if (ctu) { + ctu->mergeCMap(buf, nBits); + } else { + ctu = CharCodeToUnicode::parseCMap(buf, nBits); + } + hasToUnicode = true; + delete buf; + return ctu; +} + +std::optional GfxFont::locateFont(XRef *xref, PSOutputDev *ps, GooString *substituteFontName) +{ + SysFontType sysFontType; + GooString *path, *base14Name; + int substIdx, fontNum; + bool embed; + + if (type == fontType3) { + return std::nullopt; + } + + //----- embedded font + if (embFontID != Ref::INVALID()) { + embed = true; + Object refObj(embFontID); + Object embFontObj = refObj.fetch(xref); + if (!embFontObj.isStream()) { + error(errSyntaxError, -1, "Embedded font object is wrong type"); + embed = false; + } + if (embed) { + if (ps) { + switch (type) { + case fontType1: + case fontType1C: + case fontType1COT: + embed = ps->getEmbedType1(); + break; + case fontTrueType: + case fontTrueTypeOT: + embed = ps->getEmbedTrueType(); + break; + case fontCIDType0C: + case fontCIDType0COT: + embed = ps->getEmbedCIDPostScript(); + break; + case fontCIDType2: + case fontCIDType2OT: + embed = ps->getEmbedCIDTrueType(); + break; + default: + break; + } + } + if (embed) { + GfxFontLoc fontLoc; + fontLoc.locType = gfxFontLocEmbedded; + fontLoc.fontType = type; + fontLoc.embFontID = embFontID; + return fontLoc; + } + } + } + + //----- PS passthrough + if (ps && !isCIDFont() && ps->getFontPassthrough()) { + GfxFontLoc fontLoc; + fontLoc.locType = gfxFontLocResident; + fontLoc.fontType = fontType1; + fontLoc.path = *name; + return fontLoc; + } + + //----- PS resident Base-14 font + if (ps && !isCIDFont() && ((Gfx8BitFont *)this)->base14) { + GfxFontLoc fontLoc; + fontLoc.locType = gfxFontLocResident; + fontLoc.fontType = fontType1; + fontLoc.path = ((Gfx8BitFont *)this)->base14->base14Name; + return fontLoc; + } + + //----- external font file (fontFile, fontDir) + if (name && (path = globalParams->findFontFile(*name))) { + if (std::optional fontLoc = getExternalFont(path, isCIDFont())) { + return fontLoc; + } + } + + //----- external font file for Base-14 font + if (!ps && !isCIDFont() && ((Gfx8BitFont *)this)->base14) { + base14Name = new GooString(((Gfx8BitFont *)this)->base14->base14Name); + if ((path = globalParams->findBase14FontFile(base14Name, this, substituteFontName))) { + if (std::optional fontLoc = getExternalFont(path, false)) { + delete base14Name; + return fontLoc; + } + } + delete base14Name; + } + + //----- system font + if ((path = globalParams->findSystemFontFile(this, &sysFontType, &fontNum, substituteFontName))) { + if (isCIDFont()) { + if (sysFontType == sysFontTTF || sysFontType == sysFontTTC) { + GfxFontLoc fontLoc; + fontLoc.locType = gfxFontLocExternal; + fontLoc.fontType = fontCIDType2; + fontLoc.setPath(path); + fontLoc.fontNum = fontNum; + return fontLoc; + } + } else { + GfxFontLoc fontLoc; + fontLoc.setPath(path); + fontLoc.locType = gfxFontLocExternal; + if (sysFontType == sysFontTTF || sysFontType == sysFontTTC) { + fontLoc.fontType = fontTrueType; + } else if (sysFontType == sysFontPFA || sysFontType == sysFontPFB) { + fontLoc.fontType = fontType1; + fontLoc.fontNum = fontNum; + } + return fontLoc; + } + delete path; + } + + if (!isCIDFont()) { + + //----- 8-bit font substitution + if (flags & fontFixedWidth) { + substIdx = 0; + } else if (flags & fontSerif) { + substIdx = 8; + } else { + substIdx = 4; + } + if (isBold()) { + substIdx += 2; + } + if (isItalic()) { + substIdx += 1; + } + const std::string substName = base14SubstFonts[substIdx]; + if (ps) { + error(errSyntaxWarning, -1, "Substituting font '{0:s}' for '{1:s}'", base14SubstFonts[substIdx], name ? name->c_str() : "null"); + GfxFontLoc fontLoc; + fontLoc.locType = gfxFontLocResident; + fontLoc.fontType = fontType1; + fontLoc.path = substName; + fontLoc.substIdx = substIdx; + return fontLoc; + } else { + path = globalParams->findFontFile(substName); + if (path) { + if (std::optional fontLoc = getExternalFont(path, false)) { + error(errSyntaxWarning, -1, "Substituting font '{0:s}' for '{1:s}'", base14SubstFonts[substIdx], name ? name->c_str() : ""); + name = base14SubstFonts[substIdx]; + fontLoc->substIdx = substIdx; + return fontLoc; + } + } + } + + // failed to find a substitute font + return std::nullopt; + } + + // failed to find a substitute font + return std::nullopt; +} + +std::optional GfxFont::getExternalFont(GooString *path, bool cid) +{ + FoFiIdentifierType fft; + GfxFontType fontType; + + fft = FoFiIdentifier::identifyFile(path->c_str()); + switch (fft) { + case fofiIdType1PFA: + case fofiIdType1PFB: + fontType = fontType1; + break; + case fofiIdCFF8Bit: + fontType = fontType1C; + break; + case fofiIdCFFCID: + fontType = fontCIDType0C; + break; + case fofiIdTrueType: + case fofiIdTrueTypeCollection: + fontType = cid ? fontCIDType2 : fontTrueType; + break; + case fofiIdOpenTypeCFF8Bit: + fontType = fontType1COT; + break; + case fofiIdOpenTypeCFFCID: + fontType = fontCIDType0COT; + break; + case fofiIdUnknown: + case fofiIdError: + default: + fontType = fontUnknownType; + break; + } + if (fontType == fontUnknownType || (cid ? (fontType < fontCIDType0) : (fontType >= fontCIDType0))) { + delete path; + return std::nullopt; + } + GfxFontLoc fontLoc; + fontLoc.locType = gfxFontLocExternal; + fontLoc.fontType = fontType; + fontLoc.setPath(path); + return fontLoc; +} + +std::optional> GfxFont::readEmbFontFile(XRef *xref) +{ + Stream *str; + + Object obj1(embFontID); + Object obj2 = obj1.fetch(xref); + if (!obj2.isStream()) { + error(errSyntaxError, -1, "Embedded font file is not a stream"); + embFontID = Ref::INVALID(); + return {}; + } + str = obj2.getStream(); + + std::vector buf = str->toUnsignedChars(); + str->close(); + + return buf; +} + +struct AlternateNameMap +{ + const char *name; + const char *alt; +}; + +static const AlternateNameMap alternateNameMap[] = { { "fi", "f_i" }, { "fl", "f_l" }, { "ff", "f_f" }, { "ffi", "f_f_i" }, { "ffl", "f_f_l" }, { nullptr, nullptr } }; + +const char *GfxFont::getAlternateName(const char *name) +{ + const AlternateNameMap *map = alternateNameMap; + while (map->name) { + if (strcmp(name, map->name) == 0) { + return map->alt; + } + map++; + } + return nullptr; +} + +//------------------------------------------------------------------------ +// Gfx8BitFont +//------------------------------------------------------------------------ + +// Parse character names of the form 'Axx', 'xx', 'Ann', 'ABnn', or +// 'nn', where 'A' and 'B' are any letters, 'xx' is two hex digits, +// and 'nn' is decimal digits. +static bool parseNumericName(const char *s, bool hex, unsigned int *u) +{ + char *endptr; + + // Strip leading alpha characters. + if (hex) { + int n = 0; + + // Get string length while ignoring junk at end. + while (isalnum(s[n])) { + ++n; + } + + // Only 2 hex characters with optional leading alpha is allowed. + if (n == 3 && isalpha(*s)) { + ++s; + } else if (n != 2) { + return false; + } + } else { + // Strip up to two alpha characters. + for (int i = 0; i < 2 && isalpha(*s); ++i) { + ++s; + } + } + + int v = strtol(s, &endptr, hex ? 16 : 10); + + if (endptr == s) { + return false; + } + + // Skip trailing junk characters. + while (*endptr != '\0' && !isalnum(*endptr)) { + ++endptr; + } + + if (*endptr == '\0') { + if (u) { + *u = v; + } + return true; + } + return false; +} + +// Returns true if the font has character names like xx or Axx which +// should be parsed for hex or decimal values. +static bool testForNumericNames(Dict *fontDict, bool hex) +{ + bool numeric = true; + + Object enc = fontDict->lookup("Encoding"); + if (!enc.isDict()) { + return false; + } + + Object diff = enc.dictLookup("Differences"); + if (!diff.isArray()) { + return false; + } + + for (int i = 0; i < diff.arrayGetLength() && numeric; ++i) { + Object obj = diff.arrayGet(i); + if (obj.isInt()) { + // All sequences must start between character codes 0 and 5. + if (obj.getInt() > 5) { + numeric = false; + } + } else if (obj.isName()) { + // All character names must successfully parse. + if (!parseNumericName(obj.getName(), hex, nullptr)) { + numeric = false; + } + } else { + numeric = false; + } + } + + return numeric; +} + +Gfx8BitFont::Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, std::optional &&nameA, GfxFontType typeA, Ref embFontIDA, Dict *fontDict) : GfxFont(tagA, idA, std::move(nameA), typeA, embFontIDA) +{ + const BuiltinFont *builtinFont; + const char **baseEnc; + bool baseEncFromFontFile; + int len; + FoFiType1 *ffT1; + FoFiType1C *ffT1C; + char *charName; + bool missing, hex; + bool numeric; + Unicode toUnicode[256]; + Unicode uBuf[8]; + double mul; + int firstChar, lastChar; + unsigned short w; + Object obj1; + int n, a, b, m; + + ctu = nullptr; + + // do font name substitution for various aliases of the Base 14 font + // names + base14 = nullptr; + if (name) { + std::string name2 = *name; + size_t i = 0; + while (i < name2.size()) { + if (name2[i] == ' ') { + name2.erase(i, 1); + } else { + ++i; + } + } + a = 0; + b = sizeof(base14FontMap) / sizeof(Base14FontMapEntry); + // invariant: base14FontMap[a].altName <= name2 < base14FontMap[b].altName + while (b - a > 1) { + m = (a + b) / 2; + if (name2.compare(base14FontMap[m].altName) >= 0) { + a = m; + } else { + b = m; + } + } + if (name2 == base14FontMap[a].altName) { + base14 = &base14FontMap[a]; + } + } + + // is it a built-in font? + builtinFont = nullptr; + if (base14) { + for (const BuiltinFont &bf : builtinFonts) { + if (!strcmp(base14->base14Name, bf.name)) { + builtinFont = &bf; + break; + } + } + } + + // default ascent/descent values + if (builtinFont) { + ascent = 0.001 * builtinFont->ascent; + descent = 0.001 * builtinFont->descent; + fontBBox[0] = 0.001 * builtinFont->bbox[0]; + fontBBox[1] = 0.001 * builtinFont->bbox[1]; + fontBBox[2] = 0.001 * builtinFont->bbox[2]; + fontBBox[3] = 0.001 * builtinFont->bbox[3]; + } else { + ascent = 0.95; + descent = -0.35; + fontBBox[0] = fontBBox[1] = fontBBox[2] = fontBBox[3] = 0; + } + + // get info from font descriptor + readFontDescriptor(xref, fontDict); + + // for non-embedded fonts, don't trust the ascent/descent/bbox + // values from the font descriptor + if (builtinFont && embFontID == Ref::INVALID()) { + ascent = 0.001 * builtinFont->ascent; + descent = 0.001 * builtinFont->descent; + fontBBox[0] = 0.001 * builtinFont->bbox[0]; + fontBBox[1] = 0.001 * builtinFont->bbox[1]; + fontBBox[2] = 0.001 * builtinFont->bbox[2]; + fontBBox[3] = 0.001 * builtinFont->bbox[3]; + } + + // get font matrix + fontMat[0] = fontMat[3] = 1; + fontMat[1] = fontMat[2] = fontMat[4] = fontMat[5] = 0; + obj1 = fontDict->lookup("FontMatrix"); + if (obj1.isArray()) { + for (int i = 0; i < 6 && i < obj1.arrayGetLength(); ++i) { + Object obj2 = obj1.arrayGet(i); + if (obj2.isNum()) { + fontMat[i] = obj2.getNum(); + } + } + } + + // get Type 3 bounding box, font definition, and resources + if (type == fontType3) { + obj1 = fontDict->lookup("FontBBox"); + if (obj1.isArray()) { + for (int i = 0; i < 4 && i < obj1.arrayGetLength(); ++i) { + Object obj2 = obj1.arrayGet(i); + if (obj2.isNum()) { + fontBBox[i] = obj2.getNum(); + } + } + } + charProcs = fontDict->lookup("CharProcs"); + if (!charProcs.isDict()) { + error(errSyntaxError, -1, "Missing or invalid CharProcs dictionary in Type 3 font"); + charProcs.setToNull(); + } + resources = fontDict->lookup("Resources"); + if (!resources.isDict()) { + resources.setToNull(); + } + } + + //----- build the font encoding ----- + + // Encodings start with a base encoding, which can come from + // (in order of priority): + // 1. FontDict.Encoding or FontDict.Encoding.BaseEncoding + // - MacRoman / MacExpert / WinAnsi / Standard + // 2. embedded or external font file + // 3. default: + // - builtin --> builtin encoding + // - TrueType --> WinAnsiEncoding + // - others --> StandardEncoding + // and then add a list of differences (if any) from + // FontDict.Encoding.Differences. + + // check FontDict for base encoding + hasEncoding = false; + usesMacRomanEnc = false; + baseEnc = nullptr; + baseEncFromFontFile = false; + obj1 = fontDict->lookup("Encoding"); + if (obj1.isDict()) { + Object obj2 = obj1.dictLookup("BaseEncoding"); + if (obj2.isName("MacRomanEncoding")) { + hasEncoding = true; + usesMacRomanEnc = true; + baseEnc = macRomanEncoding; + } else if (obj2.isName("MacExpertEncoding")) { + hasEncoding = true; + baseEnc = macExpertEncoding; + } else if (obj2.isName("WinAnsiEncoding")) { + hasEncoding = true; + baseEnc = winAnsiEncoding; + } + } else if (obj1.isName("MacRomanEncoding")) { + hasEncoding = true; + usesMacRomanEnc = true; + baseEnc = macRomanEncoding; + } else if (obj1.isName("MacExpertEncoding")) { + hasEncoding = true; + baseEnc = macExpertEncoding; + } else if (obj1.isName("WinAnsiEncoding")) { + hasEncoding = true; + baseEnc = winAnsiEncoding; + } + + // check embedded font file for base encoding + // (only for Type 1 fonts - trying to get an encoding out of a + // TrueType font is a losing proposition) + ffT1 = nullptr; + ffT1C = nullptr; + if (type == fontType1 && embFontID != Ref::INVALID()) { + const std::optional> buf = readEmbFontFile(xref); + if (buf) { + if ((ffT1 = FoFiType1::make(buf->data(), buf->size()))) { + const std::string fontName = ffT1->getName(); + if (!fontName.empty()) { + delete embFontName; + embFontName = new GooString(fontName); + } + if (!baseEnc) { + baseEnc = (const char **)ffT1->getEncoding(); + baseEncFromFontFile = true; + } + } + } + } else if (type == fontType1C && embFontID != Ref::INVALID()) { + const std::optional> buf = readEmbFontFile(xref); + if (buf) { + if ((ffT1C = FoFiType1C::make(buf->data(), buf->size()))) { + if (ffT1C->getName()) { + if (embFontName) { + delete embFontName; + } + embFontName = new GooString(ffT1C->getName()); + } + if (!baseEnc) { + baseEnc = (const char **)ffT1C->getEncoding(); + baseEncFromFontFile = true; + } + } + } + } + + // get default base encoding + if (!baseEnc) { + if (builtinFont && embFontID == Ref::INVALID()) { + baseEnc = builtinFont->defaultBaseEnc; + hasEncoding = true; + } else if (type == fontTrueType) { + baseEnc = winAnsiEncoding; + } else { + baseEnc = standardEncoding; + } + } + + if (baseEncFromFontFile) { + encodingName = "Builtin"; + } else if (baseEnc == winAnsiEncoding) { + encodingName = "WinAnsi"; + } else if (baseEnc == macRomanEncoding) { + encodingName = "MacRoman"; + } else if (baseEnc == macExpertEncoding) { + encodingName = "MacExpert"; + } else if (baseEnc == symbolEncoding) { + encodingName = "Symbol"; + } else if (baseEnc == zapfDingbatsEncoding) { + encodingName = "ZapfDingbats"; + } else { + encodingName = "Standard"; + } + + // copy the base encoding + for (int i = 0; i < 256; ++i) { + enc[i] = (char *)baseEnc[i]; + if ((encFree[i] = baseEncFromFontFile) && enc[i]) { + enc[i] = copyString(baseEnc[i]); + } + } + + // some Type 1C font files have empty encodings, which can break the + // T1C->T1 conversion (since the 'seac' operator depends on having + // the accents in the encoding), so we fill in any gaps from + // StandardEncoding + if (type == fontType1C && embFontID != Ref::INVALID() && baseEncFromFontFile) { + for (int i = 0; i < 256; ++i) { + if (!enc[i] && standardEncoding[i]) { + enc[i] = (char *)standardEncoding[i]; + encFree[i] = false; + } + } + } + + // merge differences into encoding + if (obj1.isDict()) { + Object obj2 = obj1.dictLookup("Differences"); + if (obj2.isArray()) { + encodingName = "Custom"; + hasEncoding = true; + int code = 0; + for (int i = 0; i < obj2.arrayGetLength(); ++i) { + Object obj3 = obj2.arrayGet(i); + if (obj3.isInt()) { + code = obj3.getInt(); + } else if (obj3.isName()) { + if (code >= 0 && code < 256) { + if (encFree[code]) { + gfree(enc[code]); + } + enc[code] = copyString(obj3.getName()); + encFree[code] = true; + ++code; + } + } else { + error(errSyntaxError, -1, "Wrong type in font encoding resource differences ({0:s})", obj3.getTypeName()); + } + } + } + } + delete ffT1; + delete ffT1C; + + //----- build the mapping to Unicode ----- + + // pass 1: use the name-to-Unicode mapping table + missing = hex = false; + bool isZapfDingbats = name && name->ends_with("ZapfDingbats"); + for (int code = 0; code < 256; ++code) { + if ((charName = enc[code])) { + if (isZapfDingbats) { + // include ZapfDingbats names + toUnicode[code] = globalParams->mapNameToUnicodeAll(charName); + } else { + toUnicode[code] = globalParams->mapNameToUnicodeText(charName); + } + if (!toUnicode[code] && strcmp(charName, ".notdef")) { + // if it wasn't in the name-to-Unicode table, check for a + // name that looks like 'Axx' or 'xx', where 'A' is any letter + // and 'xx' is two hex digits + if ((strlen(charName) == 3 && isalpha(charName[0]) && isxdigit(charName[1]) && isxdigit(charName[2]) + && ((charName[1] >= 'a' && charName[1] <= 'f') || (charName[1] >= 'A' && charName[1] <= 'F') || (charName[2] >= 'a' && charName[2] <= 'f') || (charName[2] >= 'A' && charName[2] <= 'F'))) + || (strlen(charName) == 2 && isxdigit(charName[0]) && isxdigit(charName[1]) && + // Only check idx 1 to avoid misidentifying a decimal + // number like a0 + ((charName[1] >= 'a' && charName[1] <= 'f') || (charName[1] >= 'A' && charName[1] <= 'F')))) { + hex = true; + } + missing = true; + } + } else { + toUnicode[code] = 0; + } + } + + numeric = testForNumericNames(fontDict, hex); + + // construct the char code -> Unicode mapping object + ctu = CharCodeToUnicode::make8BitToUnicode(toUnicode); + + // pass 1a: Expand ligatures in the Alphabetic Presentation Form + // block (eg "fi", "ffi") to normal form + for (int code = 0; code < 256; ++code) { + if (unicodeIsAlphabeticPresentationForm(toUnicode[code])) { + Unicode *normalized = unicodeNormalizeNFKC(&toUnicode[code], 1, &len, nullptr); + if (len > 1) { + ctu->setMapping((CharCode)code, normalized, len); + } + gfree(normalized); + } + } + + // pass 2: try to fill in the missing chars, looking for ligatures, numeric + // references and variants + if (missing) { + for (int code = 0; code < 256; ++code) { + if (!toUnicode[code]) { + if ((charName = enc[code]) && strcmp(charName, ".notdef") + && (n = parseCharName(charName, uBuf, sizeof(uBuf) / sizeof(*uBuf), + false, // don't check simple names (pass 1) + true, // do check ligatures + numeric, hex, + true))) { // do check variants + ctu->setMapping((CharCode)code, uBuf, n); + continue; + } + + // do a simple pass-through + // mapping for unknown character names + uBuf[0] = code; + ctu->setMapping((CharCode)code, uBuf, 1); + } + } + } + + // merge in a ToUnicode CMap, if there is one -- this overwrites + // existing entries in ctu, i.e., the ToUnicode CMap takes + // precedence, but the other encoding info is allowed to fill in any + // holes + readToUnicodeCMap(fontDict, 16, ctu); + + //----- get the character widths ----- + + // initialize all widths + for (double &width : widths) { + width = missingWidth * 0.001; + } + + // use widths from font dict, if present + obj1 = fontDict->lookup("FirstChar"); + firstChar = obj1.isInt() ? obj1.getInt() : 0; + if (firstChar < 0 || firstChar > 255) { + firstChar = 0; + } + obj1 = fontDict->lookup("LastChar"); + lastChar = obj1.isInt() ? obj1.getInt() : 255; + if (lastChar < 0 || lastChar > 255) { + lastChar = 255; + } + mul = (type == fontType3) ? fontMat[0] : 0.001; + obj1 = fontDict->lookup("Widths"); + if (obj1.isArray()) { + flags |= fontFixedWidth; + if (obj1.arrayGetLength() < lastChar - firstChar + 1) { + lastChar = firstChar + obj1.arrayGetLength() - 1; + } + double firstNonZeroWidth = 0; + for (int code = firstChar; code <= lastChar; ++code) { + Object obj2 = obj1.arrayGet(code - firstChar); + if (obj2.isNum()) { + widths[code] = obj2.getNum() * mul; + + // Check if the font is fixed width + if (firstNonZeroWidth == 0) { + firstNonZeroWidth = widths[code]; + } + if (firstNonZeroWidth != 0 && widths[code] != 0 && fabs(widths[code] - firstNonZeroWidth) > 0.00001) { + flags &= ~fontFixedWidth; + } + } + } + + // use widths from built-in font + } else if (builtinFont) { + // this is a kludge for broken PDF files that encode char 32 + // as .notdef + if (builtinFont->getWidth("space", &w)) { + widths[32] = 0.001 * w; + } + for (int code = 0; code < 256; ++code) { + if (enc[code] && builtinFont->getWidth(enc[code], &w)) { + widths[code] = 0.001 * w; + } + } + + // couldn't find widths -- use defaults + } else { + // this is technically an error -- the Widths entry is required + // for all but the Base-14 fonts -- but certain PDF generators + // apparently don't include widths for Arial and TimesNewRoman + int i; + if (isFixedWidth()) { + i = 0; + } else if (isSerif()) { + i = 8; + } else { + i = 4; + } + if (isBold()) { + i += 2; + } + if (isItalic()) { + i += 1; + } + builtinFont = builtinFontSubst[i]; + // this is a kludge for broken PDF files that encode char 32 + // as .notdef + if (builtinFont->getWidth("space", &w)) { + widths[32] = 0.001 * w; + } + for (int code = 0; code < 256; ++code) { + if (enc[code] && builtinFont->getWidth(enc[code], &w)) { + widths[code] = 0.001 * w; + } + } + } + + ok = true; +} + +Gfx8BitFont::~Gfx8BitFont() +{ + int i; + + for (i = 0; i < 256; ++i) { + if (encFree[i] && enc[i]) { + gfree(enc[i]); + } + } + ctu->decRefCnt(); +} + +// This function is in part a derived work of the Adobe Glyph Mapping +// Convention: http://www.adobe.com/devnet/opentype/archives/glyph.html +// Algorithmic comments are excerpted from that document to aid +// maintainability. +static int parseCharName(char *charName, Unicode *uBuf, int uLen, bool names, bool ligatures, bool numeric, bool hex, bool variants) +{ + if (uLen <= 0) { + error(errInternal, -1, + "Zero-length output buffer (recursion overflow?) in " + "parseCharName, component \"{0:s}\"", + charName); + return 0; + } + // Step 1: drop all the characters from the glyph name starting with the + // first occurrence of a period (U+002E FULL STOP), if any. + if (variants) { + char *var_part = strchr(charName, '.'); + if (var_part == charName) { + return 0; // .notdef or similar + } else if (var_part != nullptr) { + // parse names of the form 7.oldstyle, P.swash, s.sc, etc. + char *main_part = copyString(charName, var_part - charName); + bool namesRecurse = true, variantsRecurse = false; + int n = parseCharName(main_part, uBuf, uLen, namesRecurse, ligatures, numeric, hex, variantsRecurse); + gfree(main_part); + return n; + } + } + // Step 2: split the remaining string into a sequence of components, using + // underscore (U+005F LOW LINE) as the delimiter. + if (ligatures && strchr(charName, '_')) { + // parse names of the form A_a (e.g. f_i, T_h, l_quotesingle) + char *lig_part, *lig_end, *lig_copy; + int n = 0, m; + lig_part = lig_copy = copyString(charName); + do { + if ((lig_end = strchr(lig_part, '_'))) { + *lig_end = '\0'; + } + if (lig_part[0] != '\0') { + bool namesRecurse = true, ligaturesRecurse = false; + if ((m = parseCharName(lig_part, uBuf + n, uLen - n, namesRecurse, ligaturesRecurse, numeric, hex, variants))) { + n += m; + } else { + error(errSyntaxWarning, -1, + "Could not parse ligature component \"{0:s}\" of \"{1:s}\" in " + "parseCharName", + lig_part, charName); + } + } + if (lig_end) { + lig_part = lig_end + 1; + } + } while (lig_end && n < uLen); + gfree(lig_copy); + return n; + } + // Step 3: map each component to a character string according to the + // procedure below, and concatenate those strings; the result is the + // character string to which the glyph name is mapped. + // 3.1. if the font is Zapf Dingbats (PostScript FontName ZapfDingbats), and + // the component is in the ZapfDingbats list, then map it to the + // corresponding character in that list. + // 3.2. otherwise, if the component is in the Adobe Glyph List, then map it + // to the corresponding character in that list. + if (names && (uBuf[0] = globalParams->mapNameToUnicodeText(charName))) { + return 1; + } + unsigned int n = strlen(charName); + // 3.3. otherwise, if the component is of the form "uni" (U+0075 U+006E + // U+0069) followed by a sequence of uppercase hexadecimal digits (0 .. 9, + // A .. F, i.e. U+0030 .. U+0039, U+0041 .. U+0046), the length of that + // sequence is a multiple of four, and each group of four digits represents + // a number in the set {0x0000 .. 0xD7FF, 0xE000 .. 0xFFFF}, then interpret + // each such number as a Unicode scalar value and map the component to the + // string made of those scalar values. Note that the range and digit length + // restrictions mean that the "uni" prefix can be used only with Unicode + // values from the Basic Multilingual Plane (BMP). + if (n >= 7 && (n % 4) == 3 && !strncmp(charName, "uni", 3)) { + int i; + unsigned int m; + for (i = 0, m = 3; i < uLen && m < n; m += 4) { + if (isxdigit(charName[m]) && isxdigit(charName[m + 1]) && isxdigit(charName[m + 2]) && isxdigit(charName[m + 3])) { + unsigned int u; + sscanf(charName + m, "%4x", &u); + if (u <= 0xD7FF || (0xE000 <= u && u <= 0xFFFF)) { + uBuf[i++] = u; + } + } + } + return i; + } + // 3.4. otherwise, if the component is of the form "u" (U+0075) followed by + // a sequence of four to six uppercase hexadecimal digits {0 .. 9, A .. F} + // (U+0030 .. U+0039, U+0041 .. U+0046), and those digits represent a + // number in {0x0000 .. 0xD7FF, 0xE000 .. 0x10FFFF}, then interpret this + // number as a Unicode scalar value and map the component to the string + // made of this scalar value. + if (n >= 5 && n <= 7 && charName[0] == 'u' && isxdigit(charName[1]) && isxdigit(charName[2]) && isxdigit(charName[3]) && isxdigit(charName[4]) && (n <= 5 || isxdigit(charName[5])) && (n <= 6 || isxdigit(charName[6]))) { + unsigned int u; + sscanf(charName + 1, "%x", &u); + if (u <= 0xD7FF || (0xE000 <= u && u <= 0x10FFFF)) { + uBuf[0] = u; + return 1; + } + } + // Not in Adobe Glyph Mapping convention: look for names like xx + // or Axx and parse for hex or decimal values. + if (numeric && parseNumericName(charName, hex, uBuf)) { + return 1; + } + // 3.5. otherwise, map the component to the empty string + return 0; +} + +int Gfx8BitFont::getNextChar(const char *s, int len, CharCode *code, Unicode const **u, int *uLen, double *dx, double *dy, double *ox, double *oy) const +{ + CharCode c; + + *code = c = (CharCode)(*s & 0xff); + *uLen = ctu->mapToUnicode(c, u); + *dx = widths[c]; + *dy = *ox = *oy = 0; + return 1; +} + +const CharCodeToUnicode *Gfx8BitFont::getToUnicode() const +{ + return ctu; +} + +int *Gfx8BitFont::getCodeToGIDMap(FoFiTrueType *ff) +{ + int *map; + int cmapPlatform, cmapEncoding; + int unicodeCmap, macRomanCmap, msSymbolCmap, cmap; + bool useMacRoman, useUnicode; + char *charName; + Unicode u; + int code, i, n; + + map = (int *)gmallocn(256, sizeof(int)); + for (i = 0; i < 256; ++i) { + map[i] = 0; + } + + // To match up with the Adobe-defined behaviour, we choose a cmap + // like this: + // 1. If the PDF font has an encoding: + // 1a. If the TrueType font has a Microsoft Unicode + // cmap or a non-Microsoft Unicode cmap, use it, and use the + // Unicode indexes, not the char codes. + // 1b. If the PDF font specified MacRomanEncoding and the + // TrueType font has a Macintosh Roman cmap, use it, and + // reverse map the char names through MacRomanEncoding to + // get char codes. + // 1c. If the PDF font is symbolic and the TrueType font has a + // Microsoft Symbol cmap, use it, and use char codes + // directly (possibly with an offset of 0xf000). + // 1d. If the TrueType font has a Macintosh Roman cmap, use it, + // as in case 1a. + // 2. If the PDF font does not have an encoding or the PDF font is + // symbolic: + // 2a. If the TrueType font has a Macintosh Roman cmap, use it, + // and use char codes directly (possibly with an offset of + // 0xf000). + // 2b. If the TrueType font has a Microsoft Symbol cmap, use it, + // and use char codes directly (possible with an offset of + // 0xf000). + // 3. If none of these rules apply, use the first cmap and hope for + // the best (this shouldn't happen). + unicodeCmap = macRomanCmap = msSymbolCmap = -1; + for (i = 0; i < ff->getNumCmaps(); ++i) { + cmapPlatform = ff->getCmapPlatform(i); + cmapEncoding = ff->getCmapEncoding(i); + if ((cmapPlatform == 3 && cmapEncoding == 1) || cmapPlatform == 0) { + unicodeCmap = i; + } else if (cmapPlatform == 1 && cmapEncoding == 0) { + macRomanCmap = i; + } else if (cmapPlatform == 3 && cmapEncoding == 0) { + msSymbolCmap = i; + } + } + cmap = 0; + useMacRoman = false; + useUnicode = false; + if (hasEncoding || type == fontType1) { + if (unicodeCmap >= 0) { + cmap = unicodeCmap; + useUnicode = true; + } else if (usesMacRomanEnc && macRomanCmap >= 0) { + cmap = macRomanCmap; + useMacRoman = true; + } else if ((flags & fontSymbolic) && msSymbolCmap >= 0) { + cmap = msSymbolCmap; + } else if ((flags & fontSymbolic) && macRomanCmap >= 0) { + cmap = macRomanCmap; + } else if (macRomanCmap >= 0) { + cmap = macRomanCmap; + useMacRoman = true; + } + } else { + if (msSymbolCmap >= 0) { + cmap = msSymbolCmap; + } else if (macRomanCmap >= 0) { + cmap = macRomanCmap; + } + } + + // reverse map the char names through MacRomanEncoding, then map the + // char codes through the cmap + if (useMacRoman) { + for (i = 0; i < 256; ++i) { + if ((charName = enc[i])) { + if ((code = globalParams->getMacRomanCharCode(charName))) { + map[i] = ff->mapCodeToGID(cmap, code); + } + } else { + map[i] = -1; + } + } + + // map Unicode through the cmap + } else if (useUnicode) { + const Unicode *uAux; + for (i = 0; i < 256; ++i) { + if (((charName = enc[i]) && (u = globalParams->mapNameToUnicodeAll(charName)))) { + map[i] = ff->mapCodeToGID(cmap, u); + } else { + n = ctu->mapToUnicode((CharCode)i, &uAux); + if (n > 0) { + map[i] = ff->mapCodeToGID(cmap, uAux[0]); + } else { + map[i] = -1; + } + } + } + + // map the char codes through the cmap, possibly with an offset of + // 0xf000 + } else { + for (i = 0; i < 256; ++i) { + if (!(map[i] = ff->mapCodeToGID(cmap, i))) { + map[i] = ff->mapCodeToGID(cmap, 0xf000 + i); + } + } + } + + // try the TrueType 'post' table to handle any unmapped characters + for (i = 0; i < 256; ++i) { + if (map[i] <= 0 && (charName = enc[i])) { + map[i] = ff->mapNameToGID(charName); + } + } + + return map; +} + +Dict *Gfx8BitFont::getCharProcs() +{ + return charProcs.isDict() ? charProcs.getDict() : nullptr; +} + +Object Gfx8BitFont::getCharProc(int code) +{ + if (enc[code] && charProcs.isDict()) { + return charProcs.dictLookup(enc[code]); + } else { + return Object(objNull); + } +} + +Object Gfx8BitFont::getCharProcNF(int code) +{ + if (enc[code] && charProcs.isDict()) { + return charProcs.dictLookupNF(enc[code]).copy(); + } else { + return Object(objNull); + } +} + +Dict *Gfx8BitFont::getResources() +{ + return resources.isDict() ? resources.getDict() : nullptr; +} + +//------------------------------------------------------------------------ +// GfxCIDFont +//------------------------------------------------------------------------ + +struct cmpWidthExcepFunctor +{ + bool operator()(const GfxFontCIDWidthExcep w1, const GfxFontCIDWidthExcep w2) { return w1.first < w2.first; } +}; + +struct cmpWidthExcepVFunctor +{ + bool operator()(const GfxFontCIDWidthExcepV &w1, const GfxFontCIDWidthExcepV &w2) { return w1.first < w2.first; } +}; + +GfxCIDFont::GfxCIDFont(XRef *xref, const char *tagA, Ref idA, std::optional &&nameA, GfxFontType typeA, Ref embFontIDA, Dict *fontDict) : GfxFont(tagA, idA, std::move(nameA), typeA, embFontIDA) +{ + Dict *desFontDict; + Object desFontDictObj; + Object obj1, obj2, obj3, obj4, obj5, obj6; + int c1, c2; + int excepsSize; + + ascent = 0.95; + descent = -0.35; + fontBBox[0] = fontBBox[1] = fontBBox[2] = fontBBox[3] = 0; + collection = nullptr; + ctu = nullptr; + ctuUsesCharCode = true; + widths.defWidth = 1.0; + widths.defHeight = -1.0; + widths.defVY = 0.880; + widths.exceps = nullptr; + widths.nExceps = 0; + widths.excepsV = nullptr; + widths.nExcepsV = 0; + cidToGID = nullptr; + cidToGIDLen = 0; + + // get the descendant font + obj1 = fontDict->lookup("DescendantFonts"); + if (!obj1.isArray() || obj1.arrayGetLength() == 0) { + error(errSyntaxError, -1, "Missing or empty DescendantFonts entry in Type 0 font"); + return; + } + desFontDictObj = obj1.arrayGet(0); + if (!desFontDictObj.isDict()) { + error(errSyntaxError, -1, "Bad descendant font in Type 0 font"); + return; + } + desFontDict = desFontDictObj.getDict(); + + // get info from font descriptor + readFontDescriptor(xref, desFontDict); + + //----- encoding info ----- + + // char collection + obj1 = desFontDict->lookup("CIDSystemInfo"); + if (obj1.isDict()) { + obj2 = obj1.dictLookup("Registry"); + obj3 = obj1.dictLookup("Ordering"); + if (!obj2.isString() || !obj3.isString()) { + error(errSyntaxError, -1, "Invalid CIDSystemInfo dictionary in Type 0 descendant font"); + error(errSyntaxError, -1, "Assuming Adobe-Identity for character collection"); + obj2 = Object(new GooString("Adobe")); + obj3 = Object(new GooString("Identity")); + } + collection = obj2.getString()->copy()->append('-')->append(obj3.getString()); + } else { + error(errSyntaxError, -1, "Missing CIDSystemInfo dictionary in Type 0 descendant font"); + error(errSyntaxError, -1, "Assuming Adobe-Identity for character collection"); + collection = new GooString("Adobe-Identity"); + } + + // look for a ToUnicode CMap + if (!(ctu = readToUnicodeCMap(fontDict, 16, nullptr))) { + ctuUsesCharCode = false; + + // use an identity mapping for the "Adobe-Identity" and + // "Adobe-UCS" collections + if (!collection->cmp("Adobe-Identity") || !collection->cmp("Adobe-UCS")) { + ctu = CharCodeToUnicode::makeIdentityMapping(); + } else { + // look for a user-supplied .cidToUnicode file + if (!(ctu = globalParams->getCIDToUnicode(collection))) { + // I'm not completely sure that this is the best thing to do + // but it seems to produce better results when the .cidToUnicode + // files from the poppler-data package are missing. At least + // we know that assuming the Identity mapping is definitely wrong. + // -- jrmuizel + static const char *knownCollections[] = { + "Adobe-CNS1", "Adobe-GB1", "Adobe-Japan1", "Adobe-Japan2", "Adobe-Korea1", + }; + for (const char *knownCollection : knownCollections) { + if (collection->cmp(knownCollection) == 0) { + error(errSyntaxError, -1, "Missing language pack for '{0:t}' mapping", collection); + return; + } + } + error(errSyntaxError, -1, "Unknown character collection '{0:t}'", collection); + // fall-through, assuming the Identity mapping -- this appears + // to match Adobe's behavior + } + } + } + + // encoding (i.e., CMap) + obj1 = fontDict->lookup("Encoding"); + if (obj1.isNull()) { + error(errSyntaxError, -1, "Missing Encoding entry in Type 0 font"); + return; + } + if (!(cMap = CMap::parse(nullptr, collection, &obj1))) { + return; + } + if (cMap->getCMapName()) { + encodingName = cMap->getCMapName()->toStr(); + } else { + encodingName = "Custom"; + } + + // CIDToGIDMap (for embedded TrueType fonts) + obj1 = desFontDict->lookup("CIDToGIDMap"); + if (obj1.isStream()) { + cidToGIDLen = 0; + unsigned int i = 64; + cidToGID = (int *)gmallocn(i, sizeof(int)); + obj1.streamReset(); + while ((c1 = obj1.streamGetChar()) != EOF && (c2 = obj1.streamGetChar()) != EOF) { + if (cidToGIDLen == i) { + i *= 2; + cidToGID = (int *)greallocn(cidToGID, i, sizeof(int)); + } + cidToGID[cidToGIDLen++] = (c1 << 8) + c2; + } + } else if (!obj1.isName("Identity") && !obj1.isNull()) { + error(errSyntaxError, -1, "Invalid CIDToGIDMap entry in CID font"); + } + + //----- character metrics ----- + + // default char width + obj1 = desFontDict->lookup("DW"); + if (obj1.isInt()) { + widths.defWidth = obj1.getInt() * 0.001; + } + + // char width exceptions + obj1 = desFontDict->lookup("W"); + if (obj1.isArray()) { + excepsSize = 0; + int i = 0; + while (i + 1 < obj1.arrayGetLength()) { + obj2 = obj1.arrayGet(i); + obj3 = obj1.arrayGet(i + 1); + if (obj2.isInt() && obj3.isInt() && i + 2 < obj1.arrayGetLength()) { + obj4 = obj1.arrayGet(i + 2); + if (obj4.isNum()) { + if (widths.nExceps == excepsSize) { + excepsSize += 16; + widths.exceps = (GfxFontCIDWidthExcep *)greallocn(widths.exceps, excepsSize, sizeof(GfxFontCIDWidthExcep)); + } + widths.exceps[widths.nExceps].first = obj2.getInt(); + widths.exceps[widths.nExceps].last = obj3.getInt(); + widths.exceps[widths.nExceps].width = obj4.getNum() * 0.001; + ++widths.nExceps; + } else { + error(errSyntaxError, -1, "Bad widths array in Type 0 font"); + } + i += 3; + } else if (obj2.isInt() && obj3.isArray()) { + if (widths.nExceps + obj3.arrayGetLength() > excepsSize) { + excepsSize = (widths.nExceps + obj3.arrayGetLength() + 15) & ~15; + widths.exceps = (GfxFontCIDWidthExcep *)greallocn(widths.exceps, excepsSize, sizeof(GfxFontCIDWidthExcep)); + } + int j = obj2.getInt(); + if (likely(j < INT_MAX - obj3.arrayGetLength())) { + for (int k = 0; k < obj3.arrayGetLength(); ++k) { + obj4 = obj3.arrayGet(k); + if (obj4.isNum()) { + widths.exceps[widths.nExceps].first = j; + widths.exceps[widths.nExceps].last = j; + widths.exceps[widths.nExceps].width = obj4.getNum() * 0.001; + ++j; + ++widths.nExceps; + } else { + error(errSyntaxError, -1, "Bad widths array in Type 0 font"); + } + } + } + i += 2; + } else { + error(errSyntaxError, -1, "Bad widths array in Type 0 font"); + ++i; + } + } + std::sort(widths.exceps, widths.exceps + widths.nExceps, cmpWidthExcepFunctor()); + } + + // default metrics for vertical font + obj1 = desFontDict->lookup("DW2"); + if (obj1.isArray() && obj1.arrayGetLength() == 2) { + obj2 = obj1.arrayGet(0); + if (obj2.isNum()) { + widths.defVY = obj2.getNum() * 0.001; + } + obj2 = obj1.arrayGet(1); + if (obj2.isNum()) { + widths.defHeight = obj2.getNum() * 0.001; + } + } + + // char metric exceptions for vertical font + obj1 = desFontDict->lookup("W2"); + if (obj1.isArray()) { + excepsSize = 0; + int i = 0; + while (i + 1 < obj1.arrayGetLength()) { + obj2 = obj1.arrayGet(i); + obj3 = obj1.arrayGet(i + 1); + if (obj2.isInt() && obj3.isInt() && i + 4 < obj1.arrayGetLength()) { + if ((obj4 = obj1.arrayGet(i + 2), obj4.isNum()) && (obj5 = obj1.arrayGet(i + 3), obj5.isNum()) && (obj6 = obj1.arrayGet(i + 4), obj6.isNum())) { + if (widths.nExcepsV == excepsSize) { + excepsSize += 16; + widths.excepsV = (GfxFontCIDWidthExcepV *)greallocn(widths.excepsV, excepsSize, sizeof(GfxFontCIDWidthExcepV)); + } + widths.excepsV[widths.nExcepsV].first = obj2.getInt(); + widths.excepsV[widths.nExcepsV].last = obj3.getInt(); + widths.excepsV[widths.nExcepsV].height = obj4.getNum() * 0.001; + widths.excepsV[widths.nExcepsV].vx = obj5.getNum() * 0.001; + widths.excepsV[widths.nExcepsV].vy = obj6.getNum() * 0.001; + ++widths.nExcepsV; + } else { + error(errSyntaxError, -1, "Bad widths (W2) array in Type 0 font"); + } + i += 5; + } else if (obj2.isInt() && obj3.isArray()) { + if (widths.nExcepsV + obj3.arrayGetLength() / 3 > excepsSize) { + excepsSize = (widths.nExcepsV + obj3.arrayGetLength() / 3 + 15) & ~15; + widths.excepsV = (GfxFontCIDWidthExcepV *)greallocn(widths.excepsV, excepsSize, sizeof(GfxFontCIDWidthExcepV)); + } + int j = obj2.getInt(); + for (int k = 0; k < obj3.arrayGetLength(); k += 3) { + if ((obj4 = obj3.arrayGet(k), obj4.isNum()) && (obj5 = obj3.arrayGet(k + 1), obj5.isNum()) && (obj6 = obj3.arrayGet(k + 2), obj6.isNum())) { + widths.excepsV[widths.nExcepsV].first = j; + widths.excepsV[widths.nExcepsV].last = j; + widths.excepsV[widths.nExcepsV].height = obj4.getNum() * 0.001; + widths.excepsV[widths.nExcepsV].vx = obj5.getNum() * 0.001; + widths.excepsV[widths.nExcepsV].vy = obj6.getNum() * 0.001; + ++j; + ++widths.nExcepsV; + } else { + error(errSyntaxError, -1, "Bad widths (W2) array in Type 0 font"); + } + } + i += 2; + } else { + error(errSyntaxError, -1, "Bad widths (W2) array in Type 0 font"); + ++i; + } + } + std::sort(widths.excepsV, widths.excepsV + widths.nExcepsV, cmpWidthExcepVFunctor()); + } + + ok = true; +} + +GfxCIDFont::~GfxCIDFont() +{ + if (collection) { + delete collection; + } + if (ctu) { + ctu->decRefCnt(); + } + gfree(widths.exceps); + gfree(widths.excepsV); + if (cidToGID) { + gfree(cidToGID); + } +} + +int GfxCIDFont::getNextChar(const char *s, int len, CharCode *code, Unicode const **u, int *uLen, double *dx, double *dy, double *ox, double *oy) const +{ + CID cid; + CharCode dummy; + double w, h, vx, vy; + int n, a, b, m; + + if (!cMap) { + *code = 0; + *uLen = 0; + *dx = *dy = *ox = *oy = 0; + return 1; + } + + *code = (CharCode)(cid = cMap->getCID(s, len, &dummy, &n)); + if (ctu) { + if (hasToUnicode) { + int i = 0, c = 0; + while (i < n) { + c = (c << 8) + (s[i] & 0xff); + ++i; + } + *uLen = ctu->mapToUnicode(c, u); + } else { + *uLen = ctu->mapToUnicode(cid, u); + } + } else { + *uLen = 0; + } + + // horizontal + if (cMap->getWMode() == 0) { + w = getWidth(cid); + h = vx = vy = 0; + + // vertical + } else { + w = 0; + h = widths.defHeight; + vx = getWidth(cid) / 2; + vy = widths.defVY; + if (widths.nExcepsV > 0 && cid >= widths.excepsV[0].first) { + a = 0; + b = widths.nExcepsV; + // invariant: widths.excepsV[a].first <= cid < widths.excepsV[b].first + while (b - a > 1) { + m = (a + b) / 2; + if (widths.excepsV[m].last <= cid) { + a = m; + } else { + b = m; + } + } + if (cid <= widths.excepsV[a].last) { + h = widths.excepsV[a].height; + vx = widths.excepsV[a].vx; + vy = widths.excepsV[a].vy; + } + } + } + + *dx = w; + *dy = h; + *ox = vx; + *oy = vy; + + return n; +} + +int GfxCIDFont::getWMode() const +{ + return cMap ? cMap->getWMode() : 0; +} + +const CharCodeToUnicode *GfxCIDFont::getToUnicode() const +{ + return ctu; +} + +const GooString *GfxCIDFont::getCollection() const +{ + return cMap ? cMap->getCollection() : nullptr; +} + +int GfxCIDFont::mapCodeToGID(FoFiTrueType *ff, int cmapi, Unicode unicode, bool wmode) +{ + unsigned short gid = ff->mapCodeToGID(cmapi, unicode); + if (wmode) { + unsigned short vgid = ff->mapToVertGID(gid); + if (vgid != 0) { + gid = vgid; + } + } + return gid; +} + +int *GfxCIDFont::getCodeToGIDMap(FoFiTrueType *ff, int *codeToGIDLen) +{ +#define N_UCS_CANDIDATES 2 + /* space characters */ + static const unsigned long spaces[] = { 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200A, 0x00A0, 0x200B, 0x2060, 0x3000, 0xFEFF, 0 }; + static const char *adobe_cns1_cmaps[] = { "UniCNS-UTF32-V", "UniCNS-UCS2-V", "UniCNS-UTF32-H", "UniCNS-UCS2-H", nullptr }; + static const char *adobe_gb1_cmaps[] = { "UniGB-UTF32-V", "UniGB-UCS2-V", "UniGB-UTF32-H", "UniGB-UCS2-H", nullptr }; + static const char *adobe_japan1_cmaps[] = { "UniJIS-UTF32-V", "UniJIS-UCS2-V", "UniJIS-UTF32-H", "UniJIS-UCS2-H", nullptr }; + static const char *adobe_japan2_cmaps[] = { "UniHojo-UTF32-V", "UniHojo-UCS2-V", "UniHojo-UTF32-H", "UniHojo-UCS2-H", nullptr }; + static const char *adobe_korea1_cmaps[] = { "UniKS-UTF32-V", "UniKS-UCS2-V", "UniKS-UTF32-H", "UniKS-UCS2-H", nullptr }; + static struct CMapListEntry + { + const char *collection; + const char *scriptTag; + const char *languageTag; + const char *toUnicodeMap; + const char **CMaps; + } CMapList[] = { { + "Adobe-CNS1", + "hani", + "CHN ", + "Adobe-CNS1-UCS2", + adobe_cns1_cmaps, + }, + { + "Adobe-GB1", + "hani", + "CHN ", + "Adobe-GB1-UCS2", + adobe_gb1_cmaps, + }, + { + "Adobe-Japan1", + "kana", + "JAN ", + "Adobe-Japan1-UCS2", + adobe_japan1_cmaps, + }, + { + "Adobe-Japan2", + "kana", + "JAN ", + "Adobe-Japan2-UCS2", + adobe_japan2_cmaps, + }, + { + "Adobe-Korea1", + "hang", + "KOR ", + "Adobe-Korea1-UCS2", + adobe_korea1_cmaps, + }, + { nullptr, nullptr, nullptr, nullptr, nullptr } }; + Unicode *humap = nullptr; + Unicode *vumap = nullptr; + Unicode *tumap = nullptr; + int *codeToGID = nullptr; + int i; + unsigned long code; + int wmode; + const char **cmapName; + CMapListEntry *lp; + int cmap; + int cmapPlatform, cmapEncoding; + Ref embID; + + *codeToGIDLen = 0; + if (!ctu || !getCollection()) { + return nullptr; + } + + if (getEmbeddedFontID(&embID)) { + if (getCollection()->cmp("Adobe-Identity") == 0) { + return nullptr; + } + + /* if this font is embedded font, + * CIDToGIDMap should be embedded in PDF file + * and already set. So return it. + */ + *codeToGIDLen = getCIDToGIDLen(); + return getCIDToGID(); + } + + /* we use only unicode cmap */ + cmap = -1; + for (i = 0; i < ff->getNumCmaps(); ++i) { + cmapPlatform = ff->getCmapPlatform(i); + cmapEncoding = ff->getCmapEncoding(i); + if (cmapPlatform == 3 && cmapEncoding == 10) { + /* UCS-4 */ + cmap = i; + /* use UCS-4 cmap */ + break; + } else if (cmapPlatform == 3 && cmapEncoding == 1) { + /* Unicode */ + cmap = i; + } else if (cmapPlatform == 0 && cmap < 0) { + cmap = i; + } + } + if (cmap < 0) { + return nullptr; + } + + wmode = getWMode(); + for (lp = CMapList; lp->collection != nullptr; lp++) { + if (strcmp(lp->collection, getCollection()->c_str()) == 0) { + break; + } + } + const unsigned int n = 65536; + humap = new Unicode[n * N_UCS_CANDIDATES]; + memset(humap, 0, sizeof(Unicode) * n * N_UCS_CANDIDATES); + if (lp->collection != nullptr) { + CharCodeToUnicode *tctu; + GooString tname(lp->toUnicodeMap); + + if ((tctu = CharCodeToUnicode::parseCMapFromFile(&tname, 16)) != nullptr) { + tumap = new Unicode[n]; + CharCode cid; + for (cid = 0; cid < n; cid++) { + int len; + const Unicode *ucodes; + + len = tctu->mapToUnicode(cid, &ucodes); + if (len == 1) { + tumap[cid] = ucodes[0]; + } else { + /* if not single character, ignore it */ + tumap[cid] = 0; + } + } + delete tctu; + } + vumap = new Unicode[n]; + memset(vumap, 0, sizeof(Unicode) * n); + for (cmapName = lp->CMaps; *cmapName != nullptr; cmapName++) { + GooString cname(*cmapName); + + std::shared_ptr cnameCMap; + if ((cnameCMap = globalParams->getCMap(getCollection(), &cname)) != nullptr) { + if (cnameCMap->getWMode()) { + cnameCMap->setReverseMap(vumap, n, 1); + } else { + cnameCMap->setReverseMap(humap, n, N_UCS_CANDIDATES); + } + } + } + ff->setupGSUB(lp->scriptTag, lp->languageTag); + } else { + if (getCollection()->cmp("Adobe-Identity") == 0) { + error(errSyntaxError, -1, "non-embedded font using identity encoding: {0:s}", name ? name->c_str() : "(null)"); + } else { + error(errSyntaxError, -1, "Unknown character collection {0:t}\n", getCollection()); + } + if (ctu) { + CharCode cid; + for (cid = 0; cid < n; cid++) { + const Unicode *ucode; + + if (ctu->mapToUnicode(cid, &ucode)) { + humap[cid * N_UCS_CANDIDATES] = ucode[0]; + } else { + humap[cid * N_UCS_CANDIDATES] = 0; + } + for (i = 1; i < N_UCS_CANDIDATES; i++) { + humap[cid * N_UCS_CANDIDATES + i] = 0; + } + } + } + } + // map CID -> Unicode -> GID + codeToGID = (int *)gmallocn(n, sizeof(int)); + for (code = 0; code < n; ++code) { + Unicode unicode; + unsigned long gid; + + unicode = 0; + gid = 0; + if (humap != nullptr) { + for (i = 0; i < N_UCS_CANDIDATES && gid == 0 && (unicode = humap[code * N_UCS_CANDIDATES + i]) != 0; i++) { + gid = mapCodeToGID(ff, cmap, unicode, false); + } + } + if (gid == 0 && vumap != nullptr) { + unicode = vumap[code]; + if (unicode != 0) { + gid = mapCodeToGID(ff, cmap, unicode, true); + if (gid == 0 && tumap != nullptr) { + if ((unicode = tumap[code]) != 0) { + gid = mapCodeToGID(ff, cmap, unicode, true); + } + } + } + } + if (gid == 0 && tumap != nullptr) { + if ((unicode = tumap[code]) != 0) { + gid = mapCodeToGID(ff, cmap, unicode, false); + } + } + if (gid == 0) { + /* special handling space characters */ + const unsigned long *p; + + if (humap != nullptr) { + unicode = humap[code]; + } + if (unicode != 0) { + /* check if code is space character , so map code to 0x0020 */ + for (p = spaces; *p != 0; p++) { + if (*p == unicode) { + unicode = 0x20; + gid = mapCodeToGID(ff, cmap, unicode, wmode); + break; + } + } + } + } + codeToGID[code] = gid; + } + *codeToGIDLen = n; + if (humap != nullptr) { + delete[] humap; + } + if (tumap != nullptr) { + delete[] tumap; + } + if (vumap != nullptr) { + delete[] vumap; + } + return codeToGID; +} + +double GfxCIDFont::getWidth(CID cid) const +{ + double w; + int a, b, m; + + w = widths.defWidth; + if (widths.nExceps > 0 && cid >= widths.exceps[0].first) { + a = 0; + b = widths.nExceps; + // invariant: widths.exceps[a].first <= cid < widths.exceps[b].first + while (b - a > 1) { + m = (a + b) / 2; + if (widths.exceps[m].first <= cid) { + a = m; + } else { + b = m; + } + } + if (cid <= widths.exceps[a].last) { + w = widths.exceps[a].width; + } + } + return w; +} + +double GfxCIDFont::getWidth(char *s, int len) const +{ + int nUsed; + CharCode c; + + CID cid = cMap->getCID(s, len, &c, &nUsed); + return getWidth(cid); +} + +//------------------------------------------------------------------------ +// GfxFontDict +//------------------------------------------------------------------------ + +GfxFontDict::GfxFontDict(XRef *xref, Ref *fontDictRef, Dict *fontDict) +{ + Ref r; + + fonts.resize(fontDict->getLength()); + for (std::size_t i = 0; i < fonts.size(); ++i) { + const Object &obj1 = fontDict->getValNF(i); + Object obj2 = obj1.fetch(xref); + if (obj2.isDict()) { + if (obj1.isRef()) { + r = obj1.getRef(); + } else if (fontDictRef) { + // legal generation numbers are five digits, so we use a + // 6-digit number here + r.gen = 100000 + fontDictRef->num; + r.num = i; + } else { + // no indirect reference for this font, or for the containing + // font dict, so hash the font and use that + r.gen = 100000; + r.num = hashFontObject(&obj2); + } + fonts[i] = GfxFont::makeFont(xref, fontDict->getKey(i), r, obj2.getDict()); + if (fonts[i] && !fonts[i]->isOk()) { + // XXX: it may be meaningful to distinguish between + // NULL and !isOk() so that when we do lookups + // we can tell the difference between a missing font + // and a font that is just !isOk() + fonts[i].reset(); + } + } else { + error(errSyntaxError, -1, "font resource is not a dictionary"); + fonts[i] = nullptr; + } + } +} + +std::shared_ptr GfxFontDict::lookup(const char *tag) const +{ + for (const auto &font : fonts) { + if (font && font->matches(tag)) { + return font; + } + } + return nullptr; +} + +// FNV-1a hash +class FNVHash +{ +public: + FNVHash() { h = 2166136261U; } + + void hash(char c) + { + h ^= c & 0xff; + h *= 16777619; + } + + void hash(const char *p, int n) + { + int i; + for (i = 0; i < n; ++i) { + hash(p[i]); + } + } + + int get31() { return (h ^ (h >> 31)) & 0x7fffffff; } + +private: + unsigned int h; +}; + +int GfxFontDict::hashFontObject(Object *obj) +{ + FNVHash h; + + hashFontObject1(obj, &h); + return h.get31(); +} + +void GfxFontDict::hashFontObject1(const Object *obj, FNVHash *h) +{ + const GooString *s; + const char *p; + double r; + int n, i; + + switch (obj->getType()) { + case objBool: + h->hash('b'); + h->hash(obj->getBool() ? 1 : 0); + break; + case objInt: + h->hash('i'); + n = obj->getInt(); + h->hash((char *)&n, sizeof(int)); + break; + case objReal: + h->hash('r'); + r = obj->getReal(); + h->hash((char *)&r, sizeof(double)); + break; + case objString: + h->hash('s'); + s = obj->getString(); + h->hash(s->c_str(), s->getLength()); + break; + case objName: + h->hash('n'); + p = obj->getName(); + h->hash(p, (int)strlen(p)); + break; + case objNull: + h->hash('z'); + break; + case objArray: + h->hash('a'); + n = obj->arrayGetLength(); + h->hash((char *)&n, sizeof(int)); + for (i = 0; i < n; ++i) { + const Object &obj2 = obj->arrayGetNF(i); + hashFontObject1(&obj2, h); + } + break; + case objDict: + h->hash('d'); + n = obj->dictGetLength(); + h->hash((char *)&n, sizeof(int)); + for (i = 0; i < n; ++i) { + p = obj->dictGetKey(i); + h->hash(p, (int)strlen(p)); + const Object &obj2 = obj->dictGetValNF(i); + hashFontObject1(&obj2, h); + } + break; + case objStream: + // this should never happen - streams must be indirect refs + break; + case objRef: + h->hash('f'); + n = obj->getRefNum(); + h->hash((char *)&n, sizeof(int)); + n = obj->getRefGen(); + h->hash((char *)&n, sizeof(int)); + break; + default: + h->hash('u'); + break; + } +} diff --git a/poppler-24.05.0/poppler/GfxFont.h b/poppler-24.05.0/poppler/GfxFont.h new file mode 100644 index 0000000000000000000000000000000000000000..fbc08de17c47c7e12c88f1046d15e54f9be03c7f --- /dev/null +++ b/poppler-24.05.0/poppler/GfxFont.h @@ -0,0 +1,467 @@ +//======================================================================== +// +// GfxFont.h +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005, 2008, 2015, 2017-2022 Albert Astals Cid +// Copyright (C) 2006 Takashi Iwai +// Copyright (C) 2006 Kristian Høgsberg +// Copyright (C) 2007 Julien Rebetez +// Copyright (C) 2007 Jeff Muizelaar +// Copyright (C) 2007 Koji Otani +// Copyright (C) 2011 Axel Strübing +// Copyright (C) 2011, 2012, 2014 Adrian Johnson +// Copyright (C) 2015, 2018 Jason Crain +// Copyright (C) 2015 Thomas Freitag +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2021, 2022 Oliver Sander +// +// 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 +// +//======================================================================== + +#ifndef GFXFONT_H +#define GFXFONT_H + +#include +#include + +#include "goo/GooString.h" +#include "Object.h" +#include "CharTypes.h" +#include "poppler_private_export.h" + +class Dict; +class CMap; +class CharCodeToUnicode; +class FoFiTrueType; +class PSOutputDev; +struct GfxFontCIDWidths; +struct Base14FontMapEntry; +class FNVHash; + +//------------------------------------------------------------------------ +// GfxFontType +//------------------------------------------------------------------------ + +enum GfxFontType +{ + //----- Gfx8BitFont + fontUnknownType, + fontType1, + fontType1C, + fontType1COT, + fontType3, + fontTrueType, + fontTrueTypeOT, + //----- GfxCIDFont + fontCIDType0, + fontCIDType0C, + fontCIDType0COT, + fontCIDType2, + fontCIDType2OT +}; + +//------------------------------------------------------------------------ +// GfxFontCIDWidths +//------------------------------------------------------------------------ + +struct GfxFontCIDWidthExcep +{ + CID first; // this record applies to + CID last; // CIDs .. + double width; // char width +}; + +struct GfxFontCIDWidthExcepV +{ + CID first; // this record applies to + CID last; // CIDs .. + double height; // char height + double vx, vy; // origin position +}; + +struct GfxFontCIDWidths +{ + double defWidth; // default char width + double defHeight; // default char height + double defVY; // default origin position + GfxFontCIDWidthExcep *exceps; // exceptions + int nExceps; // number of valid entries in exceps + GfxFontCIDWidthExcepV * // exceptions for vertical font + excepsV; + int nExcepsV; // number of valid entries in excepsV +}; + +//------------------------------------------------------------------------ +// GfxFontLoc +//------------------------------------------------------------------------ + +enum GfxFontLocType +{ + gfxFontLocEmbedded, // font embedded in PDF file + gfxFontLocExternal, // external font file + gfxFontLocResident // font resident in PS printer +}; + +class POPPLER_PRIVATE_EXPORT GfxFontLoc +{ +public: + GfxFontLoc(); + ~GfxFontLoc(); + + GfxFontLoc(const GfxFontLoc &) = delete; + GfxFontLoc(GfxFontLoc &&) noexcept; + GfxFontLoc &operator=(const GfxFontLoc &) = delete; + GfxFontLoc &operator=(GfxFontLoc &&other) noexcept; + + // Set the 'path' string from a GooString on the heap. + // Ownership of the object is taken. + void setPath(GooString *pathA); + const GooString *pathAsGooString() const; + + GfxFontLocType locType; + GfxFontType fontType; + Ref embFontID; // embedded stream obj ID + // (if locType == gfxFontLocEmbedded) + std::string path; // font file path + // (if locType == gfxFontLocExternal) + // PS font name + // (if locType == gfxFontLocResident) + int fontNum; // for TrueType collections + // (if locType == gfxFontLocExternal) + int substIdx; // substitute font index + // (if locType == gfxFontLocExternal, + // and a Base-14 substitution was made) +}; + +//------------------------------------------------------------------------ +// GfxFont +//------------------------------------------------------------------------ + +#define fontFixedWidth (1 << 0) +#define fontSerif (1 << 1) +#define fontSymbolic (1 << 2) +#define fontItalic (1 << 6) +#define fontBold (1 << 18) + +class POPPLER_PRIVATE_EXPORT GfxFont +{ +public: + enum Stretch + { + StretchNotDefined, + UltraCondensed, + ExtraCondensed, + Condensed, + SemiCondensed, + Normal, + SemiExpanded, + Expanded, + ExtraExpanded, + UltraExpanded + }; + + enum Weight + { + WeightNotDefined, + W100, + W200, + W300, + W400, // Normal + W500, + W600, + W700, // Bold + W800, + W900 + }; + + // Build a GfxFont object. + static std::unique_ptr makeFont(XRef *xref, const char *tagA, Ref idA, Dict *fontDict); + + GfxFont(const GfxFont &) = delete; + GfxFont &operator=(const GfxFont &other) = delete; + virtual ~GfxFont(); + + bool isOk() const { return ok; } + + // Get font tag. + const std::string &getTag() const { return tag; } + + // Get font dictionary ID. + const Ref *getID() const { return &id; } + + // Does this font match the tag? + bool matches(const char *tagA) const { return tag == tagA; } + + // Get font family name. + GooString *getFamily() const { return family; } + + // Get font stretch. + Stretch getStretch() const { return stretch; } + + // Get font weight. + Weight getWeight() const { return weight; } + + // Get the original font name (ignornig any munging that might have + // been done to map to a canonical Base-14 font name). + const std::optional &getName() const { return name; } + + bool isSubset() const; + + // Returns the original font name without the subset tag (if it has one) + std::string getNameWithoutSubsetTag() const; + + // Get font type. + GfxFontType getType() const { return type; } + virtual bool isCIDFont() const { return false; } + + // Get embedded font ID, i.e., a ref for the font file stream. + // Returns false if there is no embedded font. + bool getEmbeddedFontID(Ref *embID) const + { + *embID = embFontID; + return embFontID != Ref::INVALID(); + } + + // Invalidate an embedded font + // Returns false if there is no embedded font. + bool invalidateEmbeddedFont() + { + if (embFontID != Ref::INVALID()) { + embFontID = Ref::INVALID(); + return true; + } + return false; + } + + // Get the PostScript font name for the embedded font. Returns + // NULL if there is no embedded font. + const GooString *getEmbeddedFontName() const { return embFontName; } + + // Get font descriptor flags. + int getFlags() const { return flags; } + bool isFixedWidth() const { return flags & fontFixedWidth; } + bool isSerif() const { return flags & fontSerif; } + bool isSymbolic() const { return flags & fontSymbolic; } + bool isItalic() const { return flags & fontItalic; } + bool isBold() const { return flags & fontBold; } + + // Return the Unicode map. + virtual const CharCodeToUnicode *getToUnicode() const = 0; + + // Return the font matrix. + const double *getFontMatrix() const { return fontMat; } + + // Return the font bounding box. + const double *getFontBBox() const { return fontBBox; } + + // Return the ascent and descent values. + double getAscent() const { return ascent; } + double getDescent() const { return descent; } + + // Return the writing mode (0=horizontal, 1=vertical). + virtual int getWMode() const { return 0; } + + // Locate the font file for this font. If is not null, includes PS + // printer-resident fonts. Returns std::optional without a value on failure. + // substituteFontName is passed down to the GlobalParams::findSystemFontFile/findBase14FontFile call + std::optional locateFont(XRef *xref, PSOutputDev *ps, GooString *substituteFontName = nullptr); + + // Read an external or embedded font file into a buffer. + std::optional> readEmbFontFile(XRef *xref); + + // Get the next char from a string of bytes, returning the + // char , its Unicode mapping , its displacement vector + // (, ), and its origin offset vector (, ). + // is the number of entries available in , and is set to + // the number actually used. Returns the number of bytes used by + // the char code. + virtual int getNextChar(const char *s, int len, CharCode *code, Unicode const **u, int *uLen, double *dx, double *dy, double *ox, double *oy) const = 0; + + // Does this font have a toUnicode map? + bool hasToUnicodeCMap() const { return hasToUnicode; } + + // Return the name of the encoding + const std::string &getEncodingName() const { return encodingName; } + + // Return AGLFN names of ligatures in the Standard and Expert encodings + // for use with fonts that are not compatible with the Standard 14 fonts. + // http://sourceforge.net/adobe/aglfn/wiki/AGL%20Specification/ + static const char *getAlternateName(const char *name); + +protected: + GfxFont(const char *tagA, Ref idA, std::optional &&nameA, GfxFontType typeA, Ref embFontIDA); + + static GfxFontType getFontType(XRef *xref, Dict *fontDict, Ref *embID); + void readFontDescriptor(XRef *xref, Dict *fontDict); + CharCodeToUnicode *readToUnicodeCMap(Dict *fontDict, int nBits, CharCodeToUnicode *ctu); + static std::optional getExternalFont(GooString *path, bool cid); + + const std::string tag; // PDF font tag + const Ref id; // reference (used as unique ID) + std::optional name; // font name + GooString *family; // font family + Stretch stretch; // font stretch + Weight weight; // font weight + const GfxFontType type; // type of font + int flags; // font descriptor flags + GooString *embFontName; // name of embedded font + Ref embFontID; // ref to embedded font file stream + double fontMat[6]; // font matrix (Type 3 only) + double fontBBox[4]; // font bounding box (Type 3 only) + double missingWidth; // "default" width + double ascent; // max height above baseline + double descent; // max depth below baseline + bool ok; + bool hasToUnicode; + std::string encodingName; +}; + +//------------------------------------------------------------------------ +// Gfx8BitFont +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT Gfx8BitFont : public GfxFont +{ +public: + Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, std::optional &&nameA, GfxFontType typeA, Ref embFontIDA, Dict *fontDict); + + int getNextChar(const char *s, int len, CharCode *code, Unicode const **u, int *uLen, double *dx, double *dy, double *ox, double *oy) const override; + + // Return the encoding. + char **getEncoding() { return enc; } + + // Return the Unicode map. + const CharCodeToUnicode *getToUnicode() const override; + + // Return the character name associated with . + const char *getCharName(int code) const { return enc[code]; } + + // Returns true if the PDF font specified an encoding. + bool getHasEncoding() const { return hasEncoding; } + + // Returns true if the PDF font specified MacRomanEncoding. + bool getUsesMacRomanEnc() const { return usesMacRomanEnc; } + + // Get width of a character. + double getWidth(unsigned char c) const { return widths[c]; } + + // Return a char code-to-GID mapping for the provided font file. + // (This is only useful for TrueType fonts.) + int *getCodeToGIDMap(FoFiTrueType *ff); + + // Return the Type 3 CharProc dictionary, or NULL if none. + Dict *getCharProcs(); + + // Return the Type 3 CharProc for the character associated with . + Object getCharProc(int code); + Object getCharProcNF(int code); + + // Return the Type 3 Resources dictionary, or NULL if none. + Dict *getResources(); + +private: + ~Gfx8BitFont() override; + + const Base14FontMapEntry *base14; // for Base-14 fonts only; NULL otherwise + char *enc[256]; // char code --> char name + char encFree[256]; // boolean for each char name: if set, + // the string is malloc'ed + CharCodeToUnicode *ctu; // char code --> Unicode + bool hasEncoding; + bool usesMacRomanEnc; + double widths[256]; // character widths + Object charProcs; // Type 3 CharProcs dictionary + Object resources; // Type 3 Resources dictionary + + friend class GfxFont; +}; + +//------------------------------------------------------------------------ +// GfxCIDFont +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GfxCIDFont : public GfxFont +{ +public: + GfxCIDFont(XRef *xref, const char *tagA, Ref idA, std::optional &&nameA, GfxFontType typeA, Ref embFontIDA, Dict *fontDict); + + bool isCIDFont() const override { return true; } + + int getNextChar(const char *s, int len, CharCode *code, Unicode const **u, int *uLen, double *dx, double *dy, double *ox, double *oy) const override; + + // Return the writing mode (0=horizontal, 1=vertical). + int getWMode() const override; + + // Return the Unicode map. + const CharCodeToUnicode *getToUnicode() const override; + + // Get the collection name (-). + const GooString *getCollection() const; + + // Return the CID-to-GID mapping table. These should only be called + // if type is fontCIDType2. + int *getCIDToGID() const { return cidToGID; } + unsigned int getCIDToGIDLen() const { return cidToGIDLen; } + + int *getCodeToGIDMap(FoFiTrueType *ff, int *codeToGIDLen); + + double getWidth(char *s, int len) const; + +private: + ~GfxCIDFont() override; + + int mapCodeToGID(FoFiTrueType *ff, int cmapi, Unicode unicode, bool wmode); + double getWidth(CID cid) const; // Get width of a character. + + GooString *collection; // collection name + std::shared_ptr cMap; // char code --> CID + CharCodeToUnicode *ctu; // CID --> Unicode + bool ctuUsesCharCode; // true: ctu maps char code to Unicode; + // false: ctu maps CID to Unicode + GfxFontCIDWidths widths; // character widths + int *cidToGID; // CID --> GID mapping (for embedded + // TrueType fonts) + unsigned int cidToGIDLen; +}; + +//------------------------------------------------------------------------ +// GfxFontDict +//------------------------------------------------------------------------ + +class GfxFontDict +{ +public: + // Build the font dictionary, given the PDF font dictionary. + GfxFontDict(XRef *xref, Ref *fontDictRef, Dict *fontDict); + + GfxFontDict(const GfxFontDict &) = delete; + GfxFontDict &operator=(const GfxFontDict &) = delete; + + // Get the specified font. + std::shared_ptr lookup(const char *tag) const; + + // Iterative access. + int getNumFonts() const { return fonts.size(); } + const std::shared_ptr &getFont(int i) const { return fonts[i]; } + +private: + int hashFontObject(Object *obj); + void hashFontObject1(const Object *obj, FNVHash *h); + + std::vector> fonts; +}; + +#endif diff --git a/poppler-24.05.0/poppler/GfxState.cc b/poppler-24.05.0/poppler/GfxState.cc new file mode 100644 index 0000000000000000000000000000000000000000..0c770f1cad2367565ca3c9fecab09c827dd03495 --- /dev/null +++ b/poppler-24.05.0/poppler/GfxState.cc @@ -0,0 +1,7220 @@ +//======================================================================== +// +// GfxState.cc +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Kristian Høgsberg +// Copyright (C) 2006, 2007 Jeff Muizelaar +// Copyright (C) 2006, 2010 Carlos Garcia Campos +// Copyright (C) 2006-2022 Albert Astals Cid +// Copyright (C) 2009, 2012 Koji Otani +// Copyright (C) 2009, 2011-2016, 2020, 2023 Thomas Freitag +// Copyright (C) 2009, 2019 Christian Persch +// Copyright (C) 2010 Paweł Wiejacha +// Copyright (C) 2010 Christian Feuersänger +// Copyright (C) 2011 Andrea Canciani +// Copyright (C) 2012, 2020 William Bader +// Copyright (C) 2013 Lu Wang +// Copyright (C) 2013 Hib Eris +// Copyright (C) 2013 Fabio D'Urso +// Copyright (C) 2015, 2020 Adrian Johnson +// Copyright (C) 2016 Marek Kasik +// Copyright (C) 2017, 2019, 2022 Oliver Sander +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Volker Krause +// Copyright (C) 2018, 2019 Adam Reichold +// Copyright (C) 2019 LE GARREC Vincent +// Copyright (C) 2020, 2021 Philipp Knechtges +// Copyright (C) 2020 Lluís Batlle i Rossell +// +// 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 + +#include +#include +#include +#include +#include +#include "goo/gfile.h" +#include "goo/gmem.h" +#include "Error.h" +#include "Object.h" +#include "Array.h" +#include "Page.h" +#include "Gfx.h" +#include "GfxState.h" +#include "GfxState_helpers.h" +#include "GfxFont.h" +#include "GlobalParams.h" +#include "PopplerCache.h" +#include "OutputDev.h" +#include "splash/SplashTypes.h" + +//------------------------------------------------------------------------ + +// Max depth of nested color spaces. This is used to catch infinite +// loops in the color space object structure. +#define colorSpaceRecursionLimit 8 + +//------------------------------------------------------------------------ + +bool Matrix::invertTo(Matrix *other) const +{ + const double det_denominator = determinant(); + if (unlikely(det_denominator == 0)) { + *other = { 1, 0, 0, 1, 0, 0 }; + return false; + } + + const double det = 1 / det_denominator; + other->m[0] = m[3] * det; + other->m[1] = -m[1] * det; + other->m[2] = -m[2] * det; + other->m[3] = m[0] * det; + other->m[4] = (m[2] * m[5] - m[3] * m[4]) * det; + other->m[5] = (m[1] * m[4] - m[0] * m[5]) * det; + + return true; +} + +void Matrix::translate(double tx, double ty) +{ + double x0 = tx * m[0] + ty * m[2] + m[4]; + double y0 = tx * m[1] + ty * m[3] + m[5]; + m[4] = x0; + m[5] = y0; +} + +void Matrix::scale(double sx, double sy) +{ + m[0] *= sx; + m[1] *= sx; + m[2] *= sy; + m[3] *= sy; +} + +void Matrix::transform(double x, double y, double *tx, double *ty) const +{ + double temp_x, temp_y; + + temp_x = m[0] * x + m[2] * y + m[4]; + temp_y = m[1] * x + m[3] * y + m[5]; + + *tx = temp_x; + *ty = temp_y; +} + +// Matrix norm, taken from _cairo_matrix_transformed_circle_major_axis +double Matrix::norm() const +{ + double f, g, h, i, j; + + i = m[0] * m[0] + m[1] * m[1]; + j = m[2] * m[2] + m[3] * m[3]; + + f = 0.5 * (i + j); + g = 0.5 * (i - j); + h = m[0] * m[2] + m[1] * m[3]; + + return sqrt(f + hypot(g, h)); +} + +//------------------------------------------------------------------------ + +struct GfxBlendModeInfo +{ + const char *name; + GfxBlendMode mode; +}; + +static const GfxBlendModeInfo gfxBlendModeNames[] = { { "Normal", gfxBlendNormal }, { "Compatible", gfxBlendNormal }, + { "Multiply", gfxBlendMultiply }, { "Screen", gfxBlendScreen }, + { "Overlay", gfxBlendOverlay }, { "Darken", gfxBlendDarken }, + { "Lighten", gfxBlendLighten }, { "ColorDodge", gfxBlendColorDodge }, + { "ColorBurn", gfxBlendColorBurn }, { "HardLight", gfxBlendHardLight }, + { "SoftLight", gfxBlendSoftLight }, { "Difference", gfxBlendDifference }, + { "Exclusion", gfxBlendExclusion }, { "Hue", gfxBlendHue }, + { "Saturation", gfxBlendSaturation }, { "Color", gfxBlendColor }, + { "Luminosity", gfxBlendLuminosity } }; + +#define nGfxBlendModeNames ((int)((sizeof(gfxBlendModeNames) / sizeof(GfxBlendModeInfo)))) + +//------------------------------------------------------------------------ +// +// NB: This must match the GfxColorSpaceMode enum defined in +// GfxState.h +static const char *gfxColorSpaceModeNames[] = { "DeviceGray", "CalGray", "DeviceRGB", "CalRGB", "DeviceCMYK", "Lab", "ICCBased", "Indexed", "Separation", "DeviceN", "Pattern" }; + +#define nGfxColorSpaceModes ((sizeof(gfxColorSpaceModeNames) / sizeof(char *))) + +#ifdef USE_CMS + +static const std::map::size_type CMSCACHE_LIMIT = 2048; + +# include +# define LCMS_FLAGS cmsFLAGS_NOOPTIMIZE | cmsFLAGS_BLACKPOINTCOMPENSATION + +static void lcmsprofiledeleter(void *profile) +{ + cmsCloseProfile(profile); +} + +GfxLCMSProfilePtr make_GfxLCMSProfilePtr(void *profile) +{ + if (profile == nullptr) { + return GfxLCMSProfilePtr(); + } + return GfxLCMSProfilePtr(profile, lcmsprofiledeleter); +} + +void GfxColorTransform::doTransform(void *in, void *out, unsigned int size) +{ + cmsDoTransform(transform, in, out, size); +} + +// transformA should be a cmsHTRANSFORM +GfxColorTransform::GfxColorTransform(void *transformA, int cmsIntentA, unsigned int inputPixelTypeA, unsigned int transformPixelTypeA) +{ + transform = transformA; + cmsIntent = cmsIntentA; + inputPixelType = inputPixelTypeA; + transformPixelType = transformPixelTypeA; +} + +GfxColorTransform::~GfxColorTransform() +{ + cmsDeleteTransform(transform); +} + +// convert color space signature to cmsColor type +static unsigned int getCMSColorSpaceType(cmsColorSpaceSignature cs); +static unsigned int getCMSNChannels(cmsColorSpaceSignature cs); + +#endif + +//------------------------------------------------------------------------ +// GfxColorSpace +//------------------------------------------------------------------------ + +GfxColorSpace::GfxColorSpace() +{ + overprintMask = 0x0f; + mapping = nullptr; +} + +GfxColorSpace::~GfxColorSpace() { } + +GfxColorSpace *GfxColorSpace::parse(GfxResources *res, Object *csObj, OutputDev *out, GfxState *state, int recursion) +{ + GfxColorSpace *cs; + Object obj1; + + if (recursion > colorSpaceRecursionLimit) { + error(errSyntaxError, -1, "Loop detected in color space objects"); + return nullptr; + } + + cs = nullptr; + if (csObj->isName()) { + if (csObj->isName("DeviceGray") || csObj->isName("G")) { + if (res != nullptr) { + Object objCS = res->lookupColorSpace("DefaultGray"); + if (objCS.isNull()) { + cs = state->copyDefaultGrayColorSpace(); + } else { + cs = GfxColorSpace::parse(nullptr, &objCS, out, state); + } + } else { + cs = state->copyDefaultGrayColorSpace(); + } + } else if (csObj->isName("DeviceRGB") || csObj->isName("RGB")) { + if (res != nullptr) { + Object objCS = res->lookupColorSpace("DefaultRGB"); + if (objCS.isNull()) { + cs = state->copyDefaultRGBColorSpace(); + } else { + cs = GfxColorSpace::parse(nullptr, &objCS, out, state); + } + } else { + cs = state->copyDefaultRGBColorSpace(); + } + } else if (csObj->isName("DeviceCMYK") || csObj->isName("CMYK")) { + if (res != nullptr) { + Object objCS = res->lookupColorSpace("DefaultCMYK"); + if (objCS.isNull()) { + cs = state->copyDefaultCMYKColorSpace(); + } else { + cs = GfxColorSpace::parse(nullptr, &objCS, out, state); + } + } else { + cs = state->copyDefaultCMYKColorSpace(); + } + } else if (csObj->isName("Pattern")) { + cs = new GfxPatternColorSpace(nullptr); + } else { + error(errSyntaxWarning, -1, "Bad color space '{0:s}'", csObj->getName()); + } + } else if (csObj->isArray() && csObj->arrayGetLength() > 0) { + obj1 = csObj->arrayGet(0); + if (obj1.isName("DeviceGray") || obj1.isName("G")) { + if (res != nullptr) { + Object objCS = res->lookupColorSpace("DefaultGray"); + if (objCS.isNull()) { + cs = state->copyDefaultGrayColorSpace(); + } else { + cs = GfxColorSpace::parse(nullptr, &objCS, out, state); + } + } else { + cs = state->copyDefaultGrayColorSpace(); + } + } else if (obj1.isName("DeviceRGB") || obj1.isName("RGB")) { + if (res != nullptr) { + Object objCS = res->lookupColorSpace("DefaultRGB"); + if (objCS.isNull()) { + cs = state->copyDefaultRGBColorSpace(); + } else { + cs = GfxColorSpace::parse(nullptr, &objCS, out, state); + } + } else { + cs = state->copyDefaultRGBColorSpace(); + } + } else if (obj1.isName("DeviceCMYK") || obj1.isName("CMYK")) { + if (res != nullptr) { + Object objCS = res->lookupColorSpace("DefaultCMYK"); + if (objCS.isNull()) { + cs = state->copyDefaultCMYKColorSpace(); + } else { + cs = GfxColorSpace::parse(nullptr, &objCS, out, state); + } + } else { + cs = state->copyDefaultCMYKColorSpace(); + } + } else if (obj1.isName("CalGray")) { + cs = GfxCalGrayColorSpace::parse(csObj->getArray(), state); + } else if (obj1.isName("CalRGB")) { + cs = GfxCalRGBColorSpace::parse(csObj->getArray(), state); + } else if (obj1.isName("Lab")) { + cs = GfxLabColorSpace::parse(csObj->getArray(), state); + } else if (obj1.isName("ICCBased")) { + cs = GfxICCBasedColorSpace::parse(csObj->getArray(), out, state, recursion); + } else if (obj1.isName("Indexed") || obj1.isName("I")) { + cs = GfxIndexedColorSpace::parse(res, csObj->getArray(), out, state, recursion); + } else if (obj1.isName("Separation")) { + cs = GfxSeparationColorSpace::parse(res, csObj->getArray(), out, state, recursion); + } else if (obj1.isName("DeviceN")) { + cs = GfxDeviceNColorSpace::parse(res, csObj->getArray(), out, state, recursion); + } else if (obj1.isName("Pattern")) { + cs = GfxPatternColorSpace::parse(res, csObj->getArray(), out, state, recursion); + } else { + error(errSyntaxWarning, -1, "Bad color space"); + } + } else if (csObj->isDict()) { + obj1 = csObj->dictLookup("ColorSpace"); + if (obj1.isName("DeviceGray")) { + if (res != nullptr) { + Object objCS = res->lookupColorSpace("DefaultGray"); + if (objCS.isNull()) { + cs = state->copyDefaultGrayColorSpace(); + } else { + cs = GfxColorSpace::parse(nullptr, &objCS, out, state); + } + } else { + cs = state->copyDefaultGrayColorSpace(); + } + } else if (obj1.isName("DeviceRGB")) { + if (res != nullptr) { + Object objCS = res->lookupColorSpace("DefaultRGB"); + if (objCS.isNull()) { + cs = state->copyDefaultRGBColorSpace(); + } else { + cs = GfxColorSpace::parse(nullptr, &objCS, out, state); + } + } else { + cs = state->copyDefaultRGBColorSpace(); + } + } else if (obj1.isName("DeviceCMYK")) { + if (res != nullptr) { + Object objCS = res->lookupColorSpace("DefaultCMYK"); + if (objCS.isNull()) { + cs = state->copyDefaultCMYKColorSpace(); + } else { + cs = GfxColorSpace::parse(nullptr, &objCS, out, state); + } + } else { + cs = state->copyDefaultCMYKColorSpace(); + } + } else { + error(errSyntaxWarning, -1, "Bad color space dict'"); + } + } else { + error(errSyntaxWarning, -1, "Bad color space - expected name or array or dict"); + } + return cs; +} + +void GfxColorSpace::createMapping(std::vector *separationList, int maxSepComps) +{ + return; +} + +void GfxColorSpace::getDefaultRanges(double *decodeLow, double *decodeRange, int maxImgPixel) const +{ + int i; + + for (i = 0; i < getNComps(); ++i) { + decodeLow[i] = 0; + decodeRange[i] = 1; + } +} + +int GfxColorSpace::getNumColorSpaceModes() +{ + return nGfxColorSpaceModes; +} + +const char *GfxColorSpace::getColorSpaceModeName(int idx) +{ + return gfxColorSpaceModeNames[idx]; +} + +#ifdef USE_CMS + +static void CMSError(cmsContext /*contextId*/, cmsUInt32Number /*ecode*/, const char *text) +{ + error(errSyntaxWarning, -1, "{0:s}", text); +} + +unsigned int getCMSColorSpaceType(cmsColorSpaceSignature cs) +{ + switch (cs) { + case cmsSigXYZData: + return PT_XYZ; + break; + case cmsSigLabData: + return PT_Lab; + break; + case cmsSigLuvData: + return PT_YUV; + break; + case cmsSigYCbCrData: + return PT_YCbCr; + break; + case cmsSigYxyData: + return PT_Yxy; + break; + case cmsSigRgbData: + return PT_RGB; + break; + case cmsSigGrayData: + return PT_GRAY; + break; + case cmsSigHsvData: + return PT_HSV; + break; + case cmsSigHlsData: + return PT_HLS; + break; + case cmsSigCmykData: + return PT_CMYK; + break; + case cmsSigCmyData: + return PT_CMY; + break; + case cmsSig2colorData: + case cmsSig3colorData: + case cmsSig4colorData: + case cmsSig5colorData: + case cmsSig6colorData: + case cmsSig7colorData: + case cmsSig8colorData: + case cmsSig9colorData: + case cmsSig10colorData: + case cmsSig11colorData: + case cmsSig12colorData: + case cmsSig13colorData: + case cmsSig14colorData: + case cmsSig15colorData: + default: + break; + } + return PT_RGB; +} + +unsigned int getCMSNChannels(cmsColorSpaceSignature cs) +{ + switch (cs) { + case cmsSigXYZData: + case cmsSigLuvData: + case cmsSigLabData: + case cmsSigYCbCrData: + case cmsSigYxyData: + case cmsSigRgbData: + case cmsSigHsvData: + case cmsSigHlsData: + case cmsSigCmyData: + case cmsSig3colorData: + return 3; + break; + case cmsSigGrayData: + return 1; + break; + case cmsSigCmykData: + case cmsSig4colorData: + return 4; + break; + case cmsSig2colorData: + return 2; + break; + case cmsSig5colorData: + return 5; + break; + case cmsSig6colorData: + return 6; + break; + case cmsSig7colorData: + return 7; + break; + case cmsSig8colorData: + return 8; + break; + case cmsSig9colorData: + return 9; + break; + case cmsSig10colorData: + return 10; + break; + case cmsSig11colorData: + return 11; + break; + case cmsSig12colorData: + return 12; + break; + case cmsSig13colorData: + return 13; + break; + case cmsSig14colorData: + return 14; + break; + case cmsSig15colorData: + return 15; + default: + break; + } + return 3; +} +#endif + +//------------------------------------------------------------------------ +// GfxDeviceGrayColorSpace +//------------------------------------------------------------------------ + +GfxDeviceGrayColorSpace::GfxDeviceGrayColorSpace() { } + +GfxDeviceGrayColorSpace::~GfxDeviceGrayColorSpace() { } + +GfxColorSpace *GfxDeviceGrayColorSpace::copy() const +{ + return new GfxDeviceGrayColorSpace(); +} + +void GfxDeviceGrayColorSpace::getGray(const GfxColor *color, GfxGray *gray) const +{ + *gray = clip01(color->c[0]); +} + +void GfxDeviceGrayColorSpace::getGrayLine(unsigned char *in, unsigned char *out, int length) +{ + memcpy(out, in, length); +} + +void GfxDeviceGrayColorSpace::getRGB(const GfxColor *color, GfxRGB *rgb) const +{ + rgb->r = rgb->g = rgb->b = clip01(color->c[0]); +} + +void GfxDeviceGrayColorSpace::getRGBLine(unsigned char *in, unsigned int *out, int length) +{ + int i; + + for (i = 0; i < length; i++) { + out[i] = (in[i] << 16) | (in[i] << 8) | (in[i] << 0); + } +} + +void GfxDeviceGrayColorSpace::getRGBLine(unsigned char *in, unsigned char *out, int length) +{ + for (int i = 0; i < length; i++) { + *out++ = in[i]; + *out++ = in[i]; + *out++ = in[i]; + } +} + +void GfxDeviceGrayColorSpace::getRGBXLine(unsigned char *in, unsigned char *out, int length) +{ + for (int i = 0; i < length; i++) { + *out++ = in[i]; + *out++ = in[i]; + *out++ = in[i]; + *out++ = 255; + } +} + +void GfxDeviceGrayColorSpace::getCMYKLine(unsigned char *in, unsigned char *out, int length) +{ + for (int i = 0; i < length; i++) { + *out++ = 0; + *out++ = 0; + *out++ = 0; + *out++ = in[i]; + } +} + +void GfxDeviceGrayColorSpace::getDeviceNLine(unsigned char *in, unsigned char *out, int length) +{ + for (int i = 0; i < length; i++) { + for (int j = 0; j < SPOT_NCOMPS + 4; j++) { + out[j] = 0; + } + out[4] = in[i]; + out += (SPOT_NCOMPS + 4); + } +} + +void GfxDeviceGrayColorSpace::getCMYK(const GfxColor *color, GfxCMYK *cmyk) const +{ + cmyk->c = cmyk->m = cmyk->y = 0; + cmyk->k = clip01(gfxColorComp1 - color->c[0]); +} + +void GfxDeviceGrayColorSpace::getDeviceN(const GfxColor *color, GfxColor *deviceN) const +{ + clearGfxColor(deviceN); + deviceN->c[3] = clip01(gfxColorComp1 - color->c[0]); +} + +void GfxDeviceGrayColorSpace::getDefaultColor(GfxColor *color) const +{ + color->c[0] = 0; +} + +//------------------------------------------------------------------------ +// GfxCalGrayColorSpace +//------------------------------------------------------------------------ + +GfxCalGrayColorSpace::GfxCalGrayColorSpace() +{ + whiteX = whiteY = whiteZ = 1; + blackX = blackY = blackZ = 0; + gamma = 1; +} + +GfxCalGrayColorSpace::~GfxCalGrayColorSpace() { } + +GfxColorSpace *GfxCalGrayColorSpace::copy() const +{ + GfxCalGrayColorSpace *cs; + + cs = new GfxCalGrayColorSpace(); + cs->whiteX = whiteX; + cs->whiteY = whiteY; + cs->whiteZ = whiteZ; + cs->blackX = blackX; + cs->blackY = blackY; + cs->blackZ = blackZ; + cs->gamma = gamma; +#ifdef USE_CMS + cs->transform = transform; +#endif + return cs; +} + +// This is the inverse of MatrixLMN in Example 4.10 from the PostScript +// Language Reference, Third Edition. +static const double xyzrgb[3][3] = { { 3.240449, -1.537136, -0.498531 }, { -0.969265, 1.876011, 0.041556 }, { 0.055643, -0.204026, 1.057229 } }; + +// From the same reference as above, the inverse of the DecodeLMN function. +// This is essentially the gamma function of the sRGB profile. +static double srgb_gamma_function(double x) +{ + // 0.04045 is what lcms2 uses, but the PS Reference Example 4.10 specifies 0.03928??? + // if (x <= 0.04045 / 12.92321) { + if (x <= 0.03928 / 12.92321) { + return x * 12.92321; + } + return 1.055 * pow(x, 1.0 / 2.4) - 0.055; +} + +// D65 is the white point of the sRGB profile as it is specified above in the xyzrgb array +static const double white_d65_X = 0.9505; +static const double white_d65_Y = 1.0; +static const double white_d65_Z = 1.0890; + +#ifdef USE_CMS +// D50 is the default white point as used in ICC profiles and in the lcms2 library +static const double white_d50_X = 0.96422; +static const double white_d50_Y = 1.0; +static const double white_d50_Z = 0.82521; + +static void inline bradford_transform_to_d50(double &X, double &Y, double &Z, const double source_whiteX, const double source_whiteY, const double source_whiteZ) +{ + if (source_whiteX == white_d50_X && source_whiteY == white_d50_Y && source_whiteZ == white_d50_Z) { + // early exit if noop + return; + } + // at first apply Bradford matrix + double rho_in = 0.8951000 * X + 0.2664000 * Y - 0.1614000 * Z; + double gamma_in = -0.7502000 * X + 1.7135000 * Y + 0.0367000 * Z; + double beta_in = 0.0389000 * X - 0.0685000 * Y + 1.0296000 * Z; + + // apply a diagonal matrix with the diagonal entries being the inverse bradford-transformed white point + rho_in /= 0.8951000 * source_whiteX + 0.2664000 * source_whiteY - 0.1614000 * source_whiteZ; + gamma_in /= -0.7502000 * source_whiteX + 1.7135000 * source_whiteY + 0.0367000 * source_whiteZ; + beta_in /= 0.0389000 * source_whiteX - 0.0685000 * source_whiteY + 1.0296000 * source_whiteZ; + + // now revert the two steps above, but substituting the source white point by the device white point (D50) + // Since the white point is known a priori this has been combined into a single operation. + X = 0.98332566 * rho_in - 0.15005819 * gamma_in + 0.13095252 * beta_in; + Y = 0.43069901 * rho_in + 0.52894900 * gamma_in + 0.04035199 * beta_in; + Z = 0.00849698 * rho_in + 0.04086079 * gamma_in + 0.79284618 * beta_in; +} +#endif + +static void inline bradford_transform_to_d65(double &X, double &Y, double &Z, const double source_whiteX, const double source_whiteY, const double source_whiteZ) +{ + if (source_whiteX == white_d65_X && source_whiteY == white_d65_Y && source_whiteZ == white_d65_Z) { + // early exit if noop + return; + } + // at first apply Bradford matrix + double rho_in = 0.8951000 * X + 0.2664000 * Y - 0.1614000 * Z; + double gamma_in = -0.7502000 * X + 1.7135000 * Y + 0.0367000 * Z; + double beta_in = 0.0389000 * X - 0.0685000 * Y + 1.0296000 * Z; + + // apply a diagonal matrix with the diagonal entries being the inverse bradford-transformed white point + rho_in /= 0.8951000 * source_whiteX + 0.2664000 * source_whiteY - 0.1614000 * source_whiteZ; + gamma_in /= -0.7502000 * source_whiteX + 1.7135000 * source_whiteY + 0.0367000 * source_whiteZ; + beta_in /= 0.0389000 * source_whiteX - 0.0685000 * source_whiteY + 1.0296000 * source_whiteZ; + + // now revert the two steps above, but substituting the source white point by the device white point (D65) + // Since the white point is known a priori this has been combined into a single operation. + X = 0.92918329 * rho_in - 0.15299782 * gamma_in + 0.17428453 * beta_in; + Y = 0.40698452 * rho_in + 0.53931108 * gamma_in + 0.05370440 * beta_in; + Z = -0.00802913 * rho_in + 0.04166125 * gamma_in + 1.05519788 * beta_in; +} + +GfxColorSpace *GfxCalGrayColorSpace::parse(Array *arr, GfxState *state) +{ + GfxCalGrayColorSpace *cs; + Object obj1, obj2; + + obj1 = arr->get(1); + if (!obj1.isDict()) { + error(errSyntaxWarning, -1, "Bad CalGray color space"); + return nullptr; + } + cs = new GfxCalGrayColorSpace(); + obj2 = obj1.dictLookup("WhitePoint"); + if (obj2.isArray() && obj2.arrayGetLength() == 3) { + cs->whiteX = obj2.arrayGet(0).getNumWithDefaultValue(1); + cs->whiteY = obj2.arrayGet(1).getNumWithDefaultValue(1); + cs->whiteZ = obj2.arrayGet(2).getNumWithDefaultValue(1); + } + obj2 = obj1.dictLookup("BlackPoint"); + if (obj2.isArray() && obj2.arrayGetLength() == 3) { + cs->blackX = obj2.arrayGet(0).getNumWithDefaultValue(0); + cs->blackY = obj2.arrayGet(1).getNumWithDefaultValue(0); + cs->blackZ = obj2.arrayGet(2).getNumWithDefaultValue(0); + } + + cs->gamma = obj1.dictLookup("Gamma").getNumWithDefaultValue(1); + +#ifdef USE_CMS + cs->transform = (state != nullptr) ? state->getXYZ2DisplayTransform() : nullptr; +#endif + return cs; +} + +// convert CalGray to media XYZ color space +// (not multiply by the white point) +void GfxCalGrayColorSpace::getXYZ(const GfxColor *color, double *pX, double *pY, double *pZ) const +{ + const double A = colToDbl(color->c[0]); + const double xyzColor = pow(A, gamma); + *pX = xyzColor; + *pY = xyzColor; + *pZ = xyzColor; +} + +void GfxCalGrayColorSpace::getGray(const GfxColor *color, GfxGray *gray) const +{ + GfxRGB rgb; + +#ifdef USE_CMS + if (transform && transform->getTransformPixelType() == PT_GRAY) { + unsigned char out[gfxColorMaxComps]; + double in[gfxColorMaxComps]; + double X, Y, Z; + + getXYZ(color, &X, &Y, &Z); + bradford_transform_to_d50(X, Y, Z, whiteX, whiteY, whiteZ); + in[0] = X; + in[1] = Y; + in[2] = Z; + transform->doTransform(in, out, 1); + *gray = byteToCol(out[0]); + return; + } +#endif + getRGB(color, &rgb); + *gray = clip01((GfxColorComp)(0.299 * rgb.r + 0.587 * rgb.g + 0.114 * rgb.b + 0.5)); +} + +void GfxCalGrayColorSpace::getRGB(const GfxColor *color, GfxRGB *rgb) const +{ + double X, Y, Z; + double r, g, b; + + getXYZ(color, &X, &Y, &Z); +#ifdef USE_CMS + if (transform && transform->getTransformPixelType() == PT_RGB) { + unsigned char out[gfxColorMaxComps]; + double in[gfxColorMaxComps]; + + bradford_transform_to_d50(X, Y, Z, whiteX, whiteY, whiteZ); + in[0] = X; + in[1] = Y; + in[2] = Z; + transform->doTransform(in, out, 1); + rgb->r = byteToCol(out[0]); + rgb->g = byteToCol(out[1]); + rgb->b = byteToCol(out[2]); + return; + } +#endif + bradford_transform_to_d65(X, Y, Z, whiteX, whiteY, whiteZ); + // convert XYZ to RGB, including gamut mapping and gamma correction + r = xyzrgb[0][0] * X + xyzrgb[0][1] * Y + xyzrgb[0][2] * Z; + g = xyzrgb[1][0] * X + xyzrgb[1][1] * Y + xyzrgb[1][2] * Z; + b = xyzrgb[2][0] * X + xyzrgb[2][1] * Y + xyzrgb[2][2] * Z; + rgb->r = dblToCol(srgb_gamma_function(clip01(r))); + rgb->g = dblToCol(srgb_gamma_function(clip01(g))); + rgb->b = dblToCol(srgb_gamma_function(clip01(b))); +} + +void GfxCalGrayColorSpace::getCMYK(const GfxColor *color, GfxCMYK *cmyk) const +{ + GfxRGB rgb; + GfxColorComp c, m, y, k; + +#ifdef USE_CMS + if (transform && transform->getTransformPixelType() == PT_CMYK) { + double in[gfxColorMaxComps]; + unsigned char out[gfxColorMaxComps]; + double X, Y, Z; + + getXYZ(color, &X, &Y, &Z); + bradford_transform_to_d50(X, Y, Z, whiteX, whiteY, whiteZ); + in[0] = X; + in[1] = Y; + in[2] = Z; + transform->doTransform(in, out, 1); + cmyk->c = byteToCol(out[0]); + cmyk->m = byteToCol(out[1]); + cmyk->y = byteToCol(out[2]); + cmyk->k = byteToCol(out[3]); + return; + } +#endif + getRGB(color, &rgb); + c = clip01(gfxColorComp1 - rgb.r); + m = clip01(gfxColorComp1 - rgb.g); + y = clip01(gfxColorComp1 - rgb.b); + k = c; + if (m < k) { + k = m; + } + if (y < k) { + k = y; + } + cmyk->c = c - k; + cmyk->m = m - k; + cmyk->y = y - k; + cmyk->k = k; +} + +void GfxCalGrayColorSpace::getDeviceN(const GfxColor *color, GfxColor *deviceN) const +{ + GfxCMYK cmyk; + clearGfxColor(deviceN); + getCMYK(color, &cmyk); + deviceN->c[0] = cmyk.c; + deviceN->c[1] = cmyk.m; + deviceN->c[2] = cmyk.y; + deviceN->c[3] = cmyk.k; +} + +void GfxCalGrayColorSpace::getDefaultColor(GfxColor *color) const +{ + color->c[0] = 0; +} + +//------------------------------------------------------------------------ +// GfxDeviceRGBColorSpace +//------------------------------------------------------------------------ + +GfxDeviceRGBColorSpace::GfxDeviceRGBColorSpace() { } + +GfxDeviceRGBColorSpace::~GfxDeviceRGBColorSpace() { } + +GfxColorSpace *GfxDeviceRGBColorSpace::copy() const +{ + return new GfxDeviceRGBColorSpace(); +} + +void GfxDeviceRGBColorSpace::getGray(const GfxColor *color, GfxGray *gray) const +{ + *gray = clip01((GfxColorComp)(0.3 * color->c[0] + 0.59 * color->c[1] + 0.11 * color->c[2] + 0.5)); +} + +void GfxDeviceRGBColorSpace::getGrayLine(unsigned char *in, unsigned char *out, int length) +{ + int i; + + for (i = 0; i < length; i++) { + out[i] = (in[i * 3 + 0] * 19595 + in[i * 3 + 1] * 38469 + in[i * 3 + 2] * 7472) / 65536; + } +} + +void GfxDeviceRGBColorSpace::getRGB(const GfxColor *color, GfxRGB *rgb) const +{ + rgb->r = clip01(color->c[0]); + rgb->g = clip01(color->c[1]); + rgb->b = clip01(color->c[2]); +} + +void GfxDeviceRGBColorSpace::getRGBLine(unsigned char *in, unsigned int *out, int length) +{ + unsigned char *p; + int i; + + for (i = 0, p = in; i < length; i++, p += 3) { + out[i] = (p[0] << 16) | (p[1] << 8) | (p[2] << 0); + } +} + +void GfxDeviceRGBColorSpace::getRGBLine(unsigned char *in, unsigned char *out, int length) +{ + for (int i = 0; i < length; i++) { + *out++ = *in++; + *out++ = *in++; + *out++ = *in++; + } +} + +void GfxDeviceRGBColorSpace::getRGBXLine(unsigned char *in, unsigned char *out, int length) +{ + for (int i = 0; i < length; i++) { + *out++ = *in++; + *out++ = *in++; + *out++ = *in++; + *out++ = 255; + } +} + +void GfxDeviceRGBColorSpace::getCMYKLine(unsigned char *in, unsigned char *out, int length) +{ + GfxColorComp c, m, y, k; + + for (int i = 0; i < length; i++) { + c = byteToCol(255 - *in++); + m = byteToCol(255 - *in++); + y = byteToCol(255 - *in++); + k = c; + if (m < k) { + k = m; + } + if (y < k) { + k = y; + } + *out++ = colToByte(c - k); + *out++ = colToByte(m - k); + *out++ = colToByte(y - k); + *out++ = colToByte(k); + } +} + +void GfxDeviceRGBColorSpace::getDeviceNLine(unsigned char *in, unsigned char *out, int length) +{ + GfxColorComp c, m, y, k; + + for (int i = 0; i < length; i++) { + for (int j = 0; j < SPOT_NCOMPS + 4; j++) { + out[j] = 0; + } + c = byteToCol(255 - *in++); + m = byteToCol(255 - *in++); + y = byteToCol(255 - *in++); + k = c; + if (m < k) { + k = m; + } + if (y < k) { + k = y; + } + out[0] = colToByte(c - k); + out[1] = colToByte(m - k); + out[2] = colToByte(y - k); + out[3] = colToByte(k); + out += (SPOT_NCOMPS + 4); + } +} + +void GfxDeviceRGBColorSpace::getCMYK(const GfxColor *color, GfxCMYK *cmyk) const +{ + GfxColorComp c, m, y, k; + + c = clip01(gfxColorComp1 - color->c[0]); + m = clip01(gfxColorComp1 - color->c[1]); + y = clip01(gfxColorComp1 - color->c[2]); + k = c; + if (m < k) { + k = m; + } + if (y < k) { + k = y; + } + cmyk->c = c - k; + cmyk->m = m - k; + cmyk->y = y - k; + cmyk->k = k; +} + +void GfxDeviceRGBColorSpace::getDeviceN(const GfxColor *color, GfxColor *deviceN) const +{ + GfxCMYK cmyk; + clearGfxColor(deviceN); + getCMYK(color, &cmyk); + deviceN->c[0] = cmyk.c; + deviceN->c[1] = cmyk.m; + deviceN->c[2] = cmyk.y; + deviceN->c[3] = cmyk.k; +} + +void GfxDeviceRGBColorSpace::getDefaultColor(GfxColor *color) const +{ + color->c[0] = 0; + color->c[1] = 0; + color->c[2] = 0; +} + +//------------------------------------------------------------------------ +// GfxCalRGBColorSpace +//------------------------------------------------------------------------ + +GfxCalRGBColorSpace::GfxCalRGBColorSpace() +{ + whiteX = whiteY = whiteZ = 1; + blackX = blackY = blackZ = 0; + gammaR = gammaG = gammaB = 1; + mat[0] = 1; + mat[1] = 0; + mat[2] = 0; + mat[3] = 0; + mat[4] = 1; + mat[5] = 0; + mat[6] = 0; + mat[7] = 0; + mat[8] = 1; +} + +GfxCalRGBColorSpace::~GfxCalRGBColorSpace() { } + +GfxColorSpace *GfxCalRGBColorSpace::copy() const +{ + GfxCalRGBColorSpace *cs; + int i; + + cs = new GfxCalRGBColorSpace(); + cs->whiteX = whiteX; + cs->whiteY = whiteY; + cs->whiteZ = whiteZ; + cs->blackX = blackX; + cs->blackY = blackY; + cs->blackZ = blackZ; + cs->gammaR = gammaR; + cs->gammaG = gammaG; + cs->gammaB = gammaB; + for (i = 0; i < 9; ++i) { + cs->mat[i] = mat[i]; + } +#ifdef USE_CMS + cs->transform = transform; +#endif + return cs; +} + +GfxColorSpace *GfxCalRGBColorSpace::parse(Array *arr, GfxState *state) +{ + GfxCalRGBColorSpace *cs; + Object obj1, obj2; + int i; + + obj1 = arr->get(1); + if (!obj1.isDict()) { + error(errSyntaxWarning, -1, "Bad CalRGB color space"); + return nullptr; + } + cs = new GfxCalRGBColorSpace(); + obj2 = obj1.dictLookup("WhitePoint"); + if (obj2.isArray() && obj2.arrayGetLength() == 3) { + cs->whiteX = obj2.arrayGet(0).getNumWithDefaultValue(1); + cs->whiteY = obj2.arrayGet(1).getNumWithDefaultValue(1); + cs->whiteZ = obj2.arrayGet(2).getNumWithDefaultValue(1); + } + obj2 = obj1.dictLookup("BlackPoint"); + if (obj2.isArray() && obj2.arrayGetLength() == 3) { + cs->blackX = obj2.arrayGet(0).getNumWithDefaultValue(0); + cs->blackY = obj2.arrayGet(1).getNumWithDefaultValue(0); + cs->blackZ = obj2.arrayGet(2).getNumWithDefaultValue(0); + } + obj2 = obj1.dictLookup("Gamma"); + if (obj2.isArray() && obj2.arrayGetLength() == 3) { + cs->gammaR = obj2.arrayGet(0).getNumWithDefaultValue(1); + cs->gammaG = obj2.arrayGet(1).getNumWithDefaultValue(1); + cs->gammaB = obj2.arrayGet(2).getNumWithDefaultValue(1); + } + obj2 = obj1.dictLookup("Matrix"); + if (obj2.isArray() && obj2.arrayGetLength() == 9) { + for (i = 0; i < 9; ++i) { + Object obj3 = obj2.arrayGet(i); + if (likely(obj3.isNum())) { + cs->mat[i] = obj3.getNum(); + } + } + } + +#ifdef USE_CMS + cs->transform = (state != nullptr) ? state->getXYZ2DisplayTransform() : nullptr; +#endif + return cs; +} + +// convert CalRGB to XYZ color space +void GfxCalRGBColorSpace::getXYZ(const GfxColor *color, double *pX, double *pY, double *pZ) const +{ + double A, B, C; + + A = pow(colToDbl(color->c[0]), gammaR); + B = pow(colToDbl(color->c[1]), gammaG); + C = pow(colToDbl(color->c[2]), gammaB); + *pX = mat[0] * A + mat[3] * B + mat[6] * C; + *pY = mat[1] * A + mat[4] * B + mat[7] * C; + *pZ = mat[2] * A + mat[5] * B + mat[8] * C; +} + +void GfxCalRGBColorSpace::getGray(const GfxColor *color, GfxGray *gray) const +{ + GfxRGB rgb; + +#ifdef USE_CMS + if (transform != nullptr && transform->getTransformPixelType() == PT_GRAY) { + unsigned char out[gfxColorMaxComps]; + double in[gfxColorMaxComps]; + double X, Y, Z; + + getXYZ(color, &X, &Y, &Z); + bradford_transform_to_d50(X, Y, Z, whiteX, whiteY, whiteZ); + in[0] = X; + in[1] = Y; + in[2] = Z; + transform->doTransform(in, out, 1); + *gray = byteToCol(out[0]); + return; + } +#endif + getRGB(color, &rgb); + *gray = clip01((GfxColorComp)(0.299 * rgb.r + 0.587 * rgb.g + 0.114 * rgb.b + 0.5)); +} + +void GfxCalRGBColorSpace::getRGB(const GfxColor *color, GfxRGB *rgb) const +{ + double X, Y, Z; + double r, g, b; + + getXYZ(color, &X, &Y, &Z); +#ifdef USE_CMS + if (transform != nullptr && transform->getTransformPixelType() == PT_RGB) { + unsigned char out[gfxColorMaxComps]; + double in[gfxColorMaxComps]; + + bradford_transform_to_d50(X, Y, Z, whiteX, whiteY, whiteZ); + in[0] = X; + in[1] = Y; + in[2] = Z; + transform->doTransform(in, out, 1); + rgb->r = byteToCol(out[0]); + rgb->g = byteToCol(out[1]); + rgb->b = byteToCol(out[2]); + + return; + } +#endif + bradford_transform_to_d65(X, Y, Z, whiteX, whiteY, whiteZ); + // convert XYZ to RGB, including gamut mapping and gamma correction + r = xyzrgb[0][0] * X + xyzrgb[0][1] * Y + xyzrgb[0][2] * Z; + g = xyzrgb[1][0] * X + xyzrgb[1][1] * Y + xyzrgb[1][2] * Z; + b = xyzrgb[2][0] * X + xyzrgb[2][1] * Y + xyzrgb[2][2] * Z; + rgb->r = dblToCol(srgb_gamma_function(clip01(r))); + rgb->g = dblToCol(srgb_gamma_function(clip01(g))); + rgb->b = dblToCol(srgb_gamma_function(clip01(b))); +} + +void GfxCalRGBColorSpace::getCMYK(const GfxColor *color, GfxCMYK *cmyk) const +{ + GfxRGB rgb; + GfxColorComp c, m, y, k; + +#ifdef USE_CMS + if (transform != nullptr && transform->getTransformPixelType() == PT_CMYK) { + double in[gfxColorMaxComps]; + unsigned char out[gfxColorMaxComps]; + double X, Y, Z; + + getXYZ(color, &X, &Y, &Z); + bradford_transform_to_d50(X, Y, Z, whiteX, whiteY, whiteZ); + in[0] = X; + in[1] = Y; + in[2] = Z; + transform->doTransform(in, out, 1); + cmyk->c = byteToCol(out[0]); + cmyk->m = byteToCol(out[1]); + cmyk->y = byteToCol(out[2]); + cmyk->k = byteToCol(out[3]); + return; + } +#endif + getRGB(color, &rgb); + c = clip01(gfxColorComp1 - rgb.r); + m = clip01(gfxColorComp1 - rgb.g); + y = clip01(gfxColorComp1 - rgb.b); + k = c; + if (m < k) { + k = m; + } + if (y < k) { + k = y; + } + cmyk->c = c - k; + cmyk->m = m - k; + cmyk->y = y - k; + cmyk->k = k; +} + +void GfxCalRGBColorSpace::getDeviceN(const GfxColor *color, GfxColor *deviceN) const +{ + GfxCMYK cmyk; + clearGfxColor(deviceN); + getCMYK(color, &cmyk); + deviceN->c[0] = cmyk.c; + deviceN->c[1] = cmyk.m; + deviceN->c[2] = cmyk.y; + deviceN->c[3] = cmyk.k; +} + +void GfxCalRGBColorSpace::getDefaultColor(GfxColor *color) const +{ + color->c[0] = 0; + color->c[1] = 0; + color->c[2] = 0; +} + +//------------------------------------------------------------------------ +// GfxDeviceCMYKColorSpace +//------------------------------------------------------------------------ + +GfxDeviceCMYKColorSpace::GfxDeviceCMYKColorSpace() { } + +GfxDeviceCMYKColorSpace::~GfxDeviceCMYKColorSpace() { } + +GfxColorSpace *GfxDeviceCMYKColorSpace::copy() const +{ + return new GfxDeviceCMYKColorSpace(); +} + +void GfxDeviceCMYKColorSpace::getGray(const GfxColor *color, GfxGray *gray) const +{ + *gray = clip01((GfxColorComp)(gfxColorComp1 - color->c[3] - 0.3 * color->c[0] - 0.59 * color->c[1] - 0.11 * color->c[2] + 0.5)); +} + +void GfxDeviceCMYKColorSpace::getRGB(const GfxColor *color, GfxRGB *rgb) const +{ + double c, m, y, k, c1, m1, y1, k1, r, g, b; + + c = colToDbl(color->c[0]); + m = colToDbl(color->c[1]); + y = colToDbl(color->c[2]); + k = colToDbl(color->c[3]); + c1 = 1 - c; + m1 = 1 - m; + y1 = 1 - y; + k1 = 1 - k; + cmykToRGBMatrixMultiplication(c, m, y, k, c1, m1, y1, k1, r, g, b); + rgb->r = clip01(dblToCol(r)); + rgb->g = clip01(dblToCol(g)); + rgb->b = clip01(dblToCol(b)); +} + +static inline void GfxDeviceCMYKColorSpacegetRGBLineHelper(unsigned char *&in, double &r, double &g, double &b) +{ + double c, m, y, k, c1, m1, y1, k1; + + c = byteToDbl(*in++); + m = byteToDbl(*in++); + y = byteToDbl(*in++); + k = byteToDbl(*in++); + c1 = 1 - c; + m1 = 1 - m; + y1 = 1 - y; + k1 = 1 - k; + cmykToRGBMatrixMultiplication(c, m, y, k, c1, m1, y1, k1, r, g, b); +} + +void GfxDeviceCMYKColorSpace::getRGBLine(unsigned char *in, unsigned int *out, int length) +{ + double r, g, b; + for (int i = 0; i < length; i++) { + GfxDeviceCMYKColorSpacegetRGBLineHelper(in, r, g, b); + *out++ = (dblToByte(clip01(r)) << 16) | (dblToByte(clip01(g)) << 8) | dblToByte(clip01(b)); + } +} + +void GfxDeviceCMYKColorSpace::getRGBLine(unsigned char *in, unsigned char *out, int length) +{ + double r, g, b; + + for (int i = 0; i < length; i++) { + GfxDeviceCMYKColorSpacegetRGBLineHelper(in, r, g, b); + *out++ = dblToByte(clip01(r)); + *out++ = dblToByte(clip01(g)); + *out++ = dblToByte(clip01(b)); + } +} + +void GfxDeviceCMYKColorSpace::getRGBXLine(unsigned char *in, unsigned char *out, int length) +{ + double r, g, b; + + for (int i = 0; i < length; i++) { + GfxDeviceCMYKColorSpacegetRGBLineHelper(in, r, g, b); + *out++ = dblToByte(clip01(r)); + *out++ = dblToByte(clip01(g)); + *out++ = dblToByte(clip01(b)); + *out++ = 255; + } +} + +void GfxDeviceCMYKColorSpace::getCMYKLine(unsigned char *in, unsigned char *out, int length) +{ + for (int i = 0; i < length; i++) { + *out++ = *in++; + *out++ = *in++; + *out++ = *in++; + *out++ = *in++; + } +} + +void GfxDeviceCMYKColorSpace::getDeviceNLine(unsigned char *in, unsigned char *out, int length) +{ + for (int i = 0; i < length; i++) { + for (int j = 0; j < SPOT_NCOMPS + 4; j++) { + out[j] = 0; + } + out[0] = *in++; + out[1] = *in++; + out[2] = *in++; + out[3] = *in++; + out += (SPOT_NCOMPS + 4); + } +} + +void GfxDeviceCMYKColorSpace::getCMYK(const GfxColor *color, GfxCMYK *cmyk) const +{ + cmyk->c = clip01(color->c[0]); + cmyk->m = clip01(color->c[1]); + cmyk->y = clip01(color->c[2]); + cmyk->k = clip01(color->c[3]); +} + +void GfxDeviceCMYKColorSpace::getDeviceN(const GfxColor *color, GfxColor *deviceN) const +{ + clearGfxColor(deviceN); + deviceN->c[0] = clip01(color->c[0]); + deviceN->c[1] = clip01(color->c[1]); + deviceN->c[2] = clip01(color->c[2]); + deviceN->c[3] = clip01(color->c[3]); +} + +void GfxDeviceCMYKColorSpace::getDefaultColor(GfxColor *color) const +{ + color->c[0] = 0; + color->c[1] = 0; + color->c[2] = 0; + color->c[3] = gfxColorComp1; +} + +//------------------------------------------------------------------------ +// GfxLabColorSpace +//------------------------------------------------------------------------ + +GfxLabColorSpace::GfxLabColorSpace() +{ + whiteX = whiteY = whiteZ = 1; + blackX = blackY = blackZ = 0; + aMin = bMin = -100; + aMax = bMax = 100; +} + +GfxLabColorSpace::~GfxLabColorSpace() { } + +GfxColorSpace *GfxLabColorSpace::copy() const +{ + GfxLabColorSpace *cs; + + cs = new GfxLabColorSpace(); + cs->whiteX = whiteX; + cs->whiteY = whiteY; + cs->whiteZ = whiteZ; + cs->blackX = blackX; + cs->blackY = blackY; + cs->blackZ = blackZ; + cs->aMin = aMin; + cs->aMax = aMax; + cs->bMin = bMin; + cs->bMax = bMax; +#ifdef USE_CMS + cs->transform = transform; +#endif + return cs; +} + +GfxColorSpace *GfxLabColorSpace::parse(Array *arr, GfxState *state) +{ + GfxLabColorSpace *cs; + Object obj1, obj2; + + obj1 = arr->get(1); + if (!obj1.isDict()) { + error(errSyntaxWarning, -1, "Bad Lab color space"); + return nullptr; + } + cs = new GfxLabColorSpace(); + bool ok = true; + obj2 = obj1.dictLookup("WhitePoint"); + if (obj2.isArray() && obj2.arrayGetLength() == 3) { + cs->whiteX = obj2.arrayGet(0).getNum(&ok); + cs->whiteY = obj2.arrayGet(1).getNum(&ok); + cs->whiteZ = obj2.arrayGet(2).getNum(&ok); + } + obj2 = obj1.dictLookup("BlackPoint"); + if (obj2.isArray() && obj2.arrayGetLength() == 3) { + cs->blackX = obj2.arrayGet(0).getNum(&ok); + cs->blackY = obj2.arrayGet(1).getNum(&ok); + cs->blackZ = obj2.arrayGet(2).getNum(&ok); + } + obj2 = obj1.dictLookup("Range"); + if (obj2.isArray() && obj2.arrayGetLength() == 4) { + cs->aMin = obj2.arrayGet(0).getNum(&ok); + cs->aMax = obj2.arrayGet(1).getNum(&ok); + cs->bMin = obj2.arrayGet(2).getNum(&ok); + cs->bMax = obj2.arrayGet(3).getNum(&ok); + } + + if (!ok) { + error(errSyntaxWarning, -1, "Bad Lab color space"); +#ifdef USE_CMS + cs->transform = nullptr; +#endif + delete cs; + return nullptr; + } + +#ifdef USE_CMS + cs->transform = (state != nullptr) ? state->getXYZ2DisplayTransform() : nullptr; +#endif + return cs; +} + +void GfxLabColorSpace::getGray(const GfxColor *color, GfxGray *gray) const +{ + GfxRGB rgb; + +#ifdef USE_CMS + if (transform != nullptr && transform->getTransformPixelType() == PT_GRAY) { + unsigned char out[gfxColorMaxComps]; + double in[gfxColorMaxComps]; + + getXYZ(color, &in[0], &in[1], &in[2]); + bradford_transform_to_d50(in[0], in[1], in[2], whiteX, whiteY, whiteZ); + transform->doTransform(in, out, 1); + *gray = byteToCol(out[0]); + return; + } +#endif + getRGB(color, &rgb); + *gray = clip01((GfxColorComp)(0.299 * rgb.r + 0.587 * rgb.g + 0.114 * rgb.b + 0.5)); +} + +// convert L*a*b* to media XYZ color space +// (not multiply by the white point) +void GfxLabColorSpace::getXYZ(const GfxColor *color, double *pX, double *pY, double *pZ) const +{ + double X, Y, Z; + double t1, t2; + + t1 = (colToDbl(color->c[0]) + 16) / 116; + t2 = t1 + colToDbl(color->c[1]) / 500; + if (t2 >= (6.0 / 29.0)) { + X = t2 * t2 * t2; + } else { + X = (108.0 / 841.0) * (t2 - (4.0 / 29.0)); + } + if (t1 >= (6.0 / 29.0)) { + Y = t1 * t1 * t1; + } else { + Y = (108.0 / 841.0) * (t1 - (4.0 / 29.0)); + } + t2 = t1 - colToDbl(color->c[2]) / 200; + if (t2 >= (6.0 / 29.0)) { + Z = t2 * t2 * t2; + } else { + Z = (108.0 / 841.0) * (t2 - (4.0 / 29.0)); + } + *pX = X; + *pY = Y; + *pZ = Z; +} + +void GfxLabColorSpace::getRGB(const GfxColor *color, GfxRGB *rgb) const +{ + double X, Y, Z; + + getXYZ(color, &X, &Y, &Z); + X *= whiteX; + Y *= whiteY; + Z *= whiteZ; +#ifdef USE_CMS + if (transform != nullptr && transform->getTransformPixelType() == PT_RGB) { + unsigned char out[gfxColorMaxComps]; + double in[gfxColorMaxComps]; + + bradford_transform_to_d50(X, Y, Z, whiteX, whiteY, whiteZ); + in[0] = X; + in[1] = Y; + in[2] = Z; + transform->doTransform(in, out, 1); + rgb->r = byteToCol(out[0]); + rgb->g = byteToCol(out[1]); + rgb->b = byteToCol(out[2]); + return; + } else if (transform != nullptr && transform->getTransformPixelType() == PT_CMYK) { + unsigned char out[gfxColorMaxComps]; + double in[gfxColorMaxComps]; + double c, m, y, k, c1, m1, y1, k1, r, g, b; + + bradford_transform_to_d50(X, Y, Z, whiteX, whiteY, whiteZ); + in[0] = X; + in[1] = Y; + in[2] = Z; + transform->doTransform(in, out, 1); + c = byteToDbl(out[0]); + m = byteToDbl(out[1]); + y = byteToDbl(out[2]); + k = byteToDbl(out[3]); + c1 = 1 - c; + m1 = 1 - m; + y1 = 1 - y; + k1 = 1 - k; + cmykToRGBMatrixMultiplication(c, m, y, k, c1, m1, y1, k1, r, g, b); + rgb->r = clip01(dblToCol(r)); + rgb->g = clip01(dblToCol(g)); + rgb->b = clip01(dblToCol(b)); + return; + } +#endif + bradford_transform_to_d65(X, Y, Z, whiteX, whiteY, whiteZ); + // convert XYZ to RGB, including gamut mapping and gamma correction + const double r = xyzrgb[0][0] * X + xyzrgb[0][1] * Y + xyzrgb[0][2] * Z; + const double g = xyzrgb[1][0] * X + xyzrgb[1][1] * Y + xyzrgb[1][2] * Z; + const double b = xyzrgb[2][0] * X + xyzrgb[2][1] * Y + xyzrgb[2][2] * Z; + rgb->r = dblToCol(srgb_gamma_function(clip01(r))); + rgb->g = dblToCol(srgb_gamma_function(clip01(g))); + rgb->b = dblToCol(srgb_gamma_function(clip01(b))); +} + +void GfxLabColorSpace::getCMYK(const GfxColor *color, GfxCMYK *cmyk) const +{ + GfxRGB rgb; + GfxColorComp c, m, y, k; + +#ifdef USE_CMS + if (transform != nullptr && transform->getTransformPixelType() == PT_CMYK) { + double in[gfxColorMaxComps]; + unsigned char out[gfxColorMaxComps]; + + getXYZ(color, &in[0], &in[1], &in[2]); + bradford_transform_to_d50(in[0], in[1], in[2], whiteX, whiteY, whiteZ); + transform->doTransform(in, out, 1); + cmyk->c = byteToCol(out[0]); + cmyk->m = byteToCol(out[1]); + cmyk->y = byteToCol(out[2]); + cmyk->k = byteToCol(out[3]); + return; + } +#endif + getRGB(color, &rgb); + c = clip01(gfxColorComp1 - rgb.r); + m = clip01(gfxColorComp1 - rgb.g); + y = clip01(gfxColorComp1 - rgb.b); + k = c; + if (m < k) { + k = m; + } + if (y < k) { + k = y; + } + cmyk->c = c - k; + cmyk->m = m - k; + cmyk->y = y - k; + cmyk->k = k; +} + +void GfxLabColorSpace::getDeviceN(const GfxColor *color, GfxColor *deviceN) const +{ + GfxCMYK cmyk; + clearGfxColor(deviceN); + getCMYK(color, &cmyk); + deviceN->c[0] = cmyk.c; + deviceN->c[1] = cmyk.m; + deviceN->c[2] = cmyk.y; + deviceN->c[3] = cmyk.k; +} + +void GfxLabColorSpace::getDefaultColor(GfxColor *color) const +{ + color->c[0] = 0; + if (aMin > 0) { + color->c[1] = dblToCol(aMin); + } else if (aMax < 0) { + color->c[1] = dblToCol(aMax); + } else { + color->c[1] = 0; + } + if (bMin > 0) { + color->c[2] = dblToCol(bMin); + } else if (bMax < 0) { + color->c[2] = dblToCol(bMax); + } else { + color->c[2] = 0; + } +} + +void GfxLabColorSpace::getDefaultRanges(double *decodeLow, double *decodeRange, int maxImgPixel) const +{ + decodeLow[0] = 0; + decodeRange[0] = 100; + decodeLow[1] = aMin; + decodeRange[1] = aMax - aMin; + decodeLow[2] = bMin; + decodeRange[2] = bMax - bMin; +} + +//------------------------------------------------------------------------ +// GfxICCBasedColorSpace +//------------------------------------------------------------------------ + +GfxICCBasedColorSpace::GfxICCBasedColorSpace(int nCompsA, GfxColorSpace *altA, const Ref *iccProfileStreamA) +{ + nComps = nCompsA; + alt = altA; + iccProfileStream = *iccProfileStreamA; + rangeMin[0] = rangeMin[1] = rangeMin[2] = rangeMin[3] = 0; + rangeMax[0] = rangeMax[1] = rangeMax[2] = rangeMax[3] = 1; +#ifdef USE_CMS + transform = nullptr; + lineTransform = nullptr; + psCSA = nullptr; +#endif +} + +GfxICCBasedColorSpace::~GfxICCBasedColorSpace() +{ + delete alt; +#ifdef USE_CMS + if (psCSA) { + gfree(psCSA); + } +#endif +} + +GfxColorSpace *GfxICCBasedColorSpace::copy() const +{ + GfxICCBasedColorSpace *cs; + int i; + + cs = new GfxICCBasedColorSpace(nComps, alt->copy(), &iccProfileStream); + for (i = 0; i < 4; ++i) { + cs->rangeMin[i] = rangeMin[i]; + cs->rangeMax[i] = rangeMax[i]; + } +#ifdef USE_CMS + cs->profile = profile; + cs->transform = transform; + cs->lineTransform = lineTransform; +#endif + return cs; +} + +GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, GfxState *state, int recursion) +{ + GfxICCBasedColorSpace *cs; + int nCompsA; + GfxColorSpace *altA; + Dict *dict; + Object obj1, obj2; + int i; + + if (arr->getLength() < 2) { + error(errSyntaxError, -1, "Bad ICCBased color space"); + return nullptr; + } + const Object &obj1Ref = arr->getNF(1); + const Ref iccProfileStreamA = obj1Ref.isRef() ? obj1Ref.getRef() : Ref::INVALID(); +#ifdef USE_CMS + // check cache + if (out && iccProfileStreamA != Ref::INVALID()) { + if (auto *item = out->getIccColorSpaceCache()->lookup(iccProfileStreamA)) { + cs = static_cast(item->copy()); + int transformIntent = cs->getIntent(); + int cmsIntent = INTENT_RELATIVE_COLORIMETRIC; + if (state != nullptr) { + cmsIntent = state->getCmsRenderingIntent(); + } + if (transformIntent == cmsIntent) { + return cs; + } + delete cs; + } + } +#endif + obj1 = arr->get(1); + if (!obj1.isStream()) { + error(errSyntaxWarning, -1, "Bad ICCBased color space (stream)"); + return nullptr; + } + dict = obj1.streamGetDict(); + obj2 = dict->lookup("N"); + if (!obj2.isInt()) { + error(errSyntaxWarning, -1, "Bad ICCBased color space (N)"); + return nullptr; + } + nCompsA = obj2.getInt(); + if (nCompsA > 4) { + error(errSyntaxError, -1, "ICCBased color space with too many ({0:d} > 4) components", nCompsA); + nCompsA = 4; + } + obj2 = dict->lookup("Alternate"); + if (obj2.isNull() || !(altA = GfxColorSpace::parse(nullptr, &obj2, out, state, recursion + 1))) { + switch (nCompsA) { + case 1: + altA = new GfxDeviceGrayColorSpace(); + break; + case 3: + altA = new GfxDeviceRGBColorSpace(); + break; + case 4: + altA = new GfxDeviceCMYKColorSpace(); + break; + default: + error(errSyntaxWarning, -1, "Bad ICCBased color space - invalid N"); + return nullptr; + } + } + if (altA->getNComps() != nCompsA) { + error(errSyntaxWarning, -1, "Bad ICCBased color space - N doesn't match alt color space"); + delete altA; + return nullptr; + } + cs = new GfxICCBasedColorSpace(nCompsA, altA, &iccProfileStreamA); + obj2 = dict->lookup("Range"); + if (obj2.isArray() && obj2.arrayGetLength() == 2 * nCompsA) { + for (i = 0; i < nCompsA; ++i) { + cs->rangeMin[i] = obj2.arrayGet(2 * i).getNumWithDefaultValue(0); + cs->rangeMax[i] = obj2.arrayGet(2 * i + 1).getNumWithDefaultValue(1); + } + } + +#ifdef USE_CMS + obj1 = arr->get(1); + if (!obj1.isStream()) { + error(errSyntaxWarning, -1, "Bad ICCBased color space (stream)"); + delete cs; + return nullptr; + } + Stream *iccStream = obj1.getStream(); + + const std::vector profBuf = iccStream->toUnsignedChars(65536, 65536); + auto hp = make_GfxLCMSProfilePtr(cmsOpenProfileFromMem(profBuf.data(), profBuf.size())); + cs->profile = hp; + if (!hp) { + error(errSyntaxWarning, -1, "read ICCBased color space profile error"); + } else { + cs->buildTransforms(state); + } + // put this colorSpace into cache + if (out && iccProfileStreamA != Ref::INVALID()) { + out->getIccColorSpaceCache()->put(iccProfileStreamA, static_cast(cs->copy())); + } +#endif + return cs; +} + +#ifdef USE_CMS +void GfxICCBasedColorSpace::buildTransforms(GfxState *state) +{ + auto dhp = (state != nullptr && state->getDisplayProfile() != nullptr) ? state->getDisplayProfile() : nullptr; + if (!dhp) { + dhp = GfxState::sRGBProfile; + } + unsigned int cst = getCMSColorSpaceType(cmsGetColorSpace(profile.get())); + unsigned int dNChannels = getCMSNChannels(cmsGetColorSpace(dhp.get())); + unsigned int dcst = getCMSColorSpaceType(cmsGetColorSpace(dhp.get())); + cmsHTRANSFORM transformA; + + int cmsIntent = INTENT_RELATIVE_COLORIMETRIC; + if (state != nullptr) { + cmsIntent = state->getCmsRenderingIntent(); + } + if ((transformA = cmsCreateTransform(profile.get(), COLORSPACE_SH(cst) | CHANNELS_SH(nComps) | BYTES_SH(1), dhp.get(), COLORSPACE_SH(dcst) | CHANNELS_SH(dNChannels) | BYTES_SH(1), cmsIntent, LCMS_FLAGS)) == nullptr) { + error(errSyntaxWarning, -1, "Can't create transform"); + transform = nullptr; + } else { + transform = std::make_shared(transformA, cmsIntent, cst, dcst); + } + if (dcst == PT_RGB || dcst == PT_CMYK) { + // create line transform only when the display is RGB type color space + if ((transformA = cmsCreateTransform(profile.get(), CHANNELS_SH(nComps) | BYTES_SH(1), dhp.get(), (dcst == PT_RGB) ? TYPE_RGB_8 : TYPE_CMYK_8, cmsIntent, LCMS_FLAGS)) == nullptr) { + error(errSyntaxWarning, -1, "Can't create transform"); + lineTransform = nullptr; + } else { + lineTransform = std::make_shared(transformA, cmsIntent, cst, dcst); + } + } +} +#endif + +void GfxICCBasedColorSpace::getGray(const GfxColor *color, GfxGray *gray) const +{ +#ifdef USE_CMS + if (transform != nullptr && transform->getTransformPixelType() == PT_GRAY) { + unsigned char in[gfxColorMaxComps]; + unsigned char out[gfxColorMaxComps]; + + if (nComps == 3 && transform->getInputPixelType() == PT_Lab) { + in[0] = colToByte(dblToCol(colToDbl(color->c[0]) / 100.0)); + in[1] = colToByte(dblToCol((colToDbl(color->c[1]) + 128.0) / 255.0)); + in[2] = colToByte(dblToCol((colToDbl(color->c[2]) + 128.0) / 255.0)); + } else { + for (int i = 0; i < nComps; i++) { + in[i] = colToByte(color->c[i]); + } + } + if (nComps <= 4) { + unsigned int key = 0; + for (int j = 0; j < nComps; j++) { + key = (key << 8) + in[j]; + } + std::map::iterator it = cmsCache.find(key); + if (it != cmsCache.end()) { + unsigned int value = it->second; + *gray = byteToCol(value & 0xff); + return; + } + } + transform->doTransform(in, out, 1); + *gray = byteToCol(out[0]); + if (nComps <= 4 && cmsCache.size() <= CMSCACHE_LIMIT) { + unsigned int key = 0; + for (int j = 0; j < nComps; j++) { + key = (key << 8) + in[j]; + } + unsigned int value = out[0]; + cmsCache.insert(std::pair(key, value)); + } + } else { + GfxRGB rgb; + getRGB(color, &rgb); + *gray = clip01((GfxColorComp)(0.3 * rgb.r + 0.59 * rgb.g + 0.11 * rgb.b + 0.5)); + } +#else + alt->getGray(color, gray); +#endif +} + +void GfxICCBasedColorSpace::getRGB(const GfxColor *color, GfxRGB *rgb) const +{ +#ifdef USE_CMS + if (transform != nullptr && transform->getTransformPixelType() == PT_RGB) { + unsigned char in[gfxColorMaxComps]; + unsigned char out[gfxColorMaxComps]; + + if (nComps == 3 && transform->getInputPixelType() == PT_Lab) { + in[0] = colToByte(dblToCol(colToDbl(color->c[0]) / 100.0)); + in[1] = colToByte(dblToCol((colToDbl(color->c[1]) + 128.0) / 255.0)); + in[2] = colToByte(dblToCol((colToDbl(color->c[2]) + 128.0) / 255.0)); + } else { + for (int i = 0; i < nComps; i++) { + in[i] = colToByte(color->c[i]); + } + } + if (nComps <= 4) { + unsigned int key = 0; + for (int j = 0; j < nComps; j++) { + key = (key << 8) + in[j]; + } + std::map::iterator it = cmsCache.find(key); + if (it != cmsCache.end()) { + unsigned int value = it->second; + rgb->r = byteToCol(value >> 16); + rgb->g = byteToCol((value >> 8) & 0xff); + rgb->b = byteToCol(value & 0xff); + return; + } + } + transform->doTransform(in, out, 1); + rgb->r = byteToCol(out[0]); + rgb->g = byteToCol(out[1]); + rgb->b = byteToCol(out[2]); + if (nComps <= 4 && cmsCache.size() <= CMSCACHE_LIMIT) { + unsigned int key = 0; + for (int j = 0; j < nComps; j++) { + key = (key << 8) + in[j]; + } + unsigned int value = (out[0] << 16) + (out[1] << 8) + out[2]; + cmsCache.insert(std::pair(key, value)); + } + } else if (transform != nullptr && transform->getTransformPixelType() == PT_CMYK) { + unsigned char in[gfxColorMaxComps]; + unsigned char out[gfxColorMaxComps]; + double c, m, y, k, c1, m1, y1, k1, r, g, b; + + if (nComps == 3 && transform->getInputPixelType() == PT_Lab) { + in[0] = colToByte(dblToCol(colToDbl(color->c[0]) / 100.0)); + in[1] = colToByte(dblToCol((colToDbl(color->c[1]) + 128.0) / 255.0)); + in[2] = colToByte(dblToCol((colToDbl(color->c[2]) + 128.0) / 255.0)); + } else { + for (int i = 0; i < nComps; i++) { + in[i] = colToByte(color->c[i]); + } + } + if (nComps <= 4) { + unsigned int key = 0; + for (int j = 0; j < nComps; j++) { + key = (key << 8) + in[j]; + } + std::map::iterator it = cmsCache.find(key); + if (it != cmsCache.end()) { + unsigned int value = it->second; + rgb->r = byteToCol(value >> 16); + rgb->g = byteToCol((value >> 8) & 0xff); + rgb->b = byteToCol(value & 0xff); + return; + } + } + transform->doTransform(in, out, 1); + c = byteToDbl(out[0]); + m = byteToDbl(out[1]); + y = byteToDbl(out[2]); + k = byteToDbl(out[3]); + c1 = 1 - c; + m1 = 1 - m; + y1 = 1 - y; + k1 = 1 - k; + cmykToRGBMatrixMultiplication(c, m, y, k, c1, m1, y1, k1, r, g, b); + rgb->r = clip01(dblToCol(r)); + rgb->g = clip01(dblToCol(g)); + rgb->b = clip01(dblToCol(b)); + if (nComps <= 4 && cmsCache.size() <= CMSCACHE_LIMIT) { + unsigned int key = 0; + for (int j = 0; j < nComps; j++) { + key = (key << 8) + in[j]; + } + unsigned int value = (dblToByte(r) << 16) + (dblToByte(g) << 8) + dblToByte(b); + cmsCache.insert(std::pair(key, value)); + } + } else { + alt->getRGB(color, rgb); + } +#else + alt->getRGB(color, rgb); +#endif +} + +void GfxICCBasedColorSpace::getRGBLine(unsigned char *in, unsigned int *out, int length) +{ +#ifdef USE_CMS + if (lineTransform != nullptr && lineTransform->getTransformPixelType() == PT_RGB) { + unsigned char *tmp = (unsigned char *)gmallocn(3 * length, sizeof(unsigned char)); + lineTransform->doTransform(in, tmp, length); + for (int i = 0; i < length; ++i) { + unsigned char *current = tmp + (i * 3); + out[i] = (current[0] << 16) | (current[1] << 8) | current[2]; + } + gfree(tmp); + } else { + alt->getRGBLine(in, out, length); + } +#else + alt->getRGBLine(in, out, length); +#endif +} + +void GfxICCBasedColorSpace::getRGBLine(unsigned char *in, unsigned char *out, int length) +{ +#ifdef USE_CMS + if (lineTransform != nullptr && lineTransform->getTransformPixelType() == PT_RGB) { + unsigned char *tmp = (unsigned char *)gmallocn(3 * length, sizeof(unsigned char)); + lineTransform->doTransform(in, tmp, length); + unsigned char *current = tmp; + for (int i = 0; i < length; ++i) { + *out++ = *current++; + *out++ = *current++; + *out++ = *current++; + } + gfree(tmp); + } else if (lineTransform != nullptr && lineTransform->getTransformPixelType() == PT_CMYK) { + unsigned char *tmp = (unsigned char *)gmallocn(4 * length, sizeof(unsigned char)); + lineTransform->doTransform(in, tmp, length); + unsigned char *current = tmp; + double c, m, y, k, c1, m1, y1, k1, r, g, b; + for (int i = 0; i < length; ++i) { + c = byteToDbl(*current++); + m = byteToDbl(*current++); + y = byteToDbl(*current++); + k = byteToDbl(*current++); + c1 = 1 - c; + m1 = 1 - m; + y1 = 1 - y; + k1 = 1 - k; + cmykToRGBMatrixMultiplication(c, m, y, k, c1, m1, y1, k1, r, g, b); + *out++ = dblToByte(r); + *out++ = dblToByte(g); + *out++ = dblToByte(b); + } + gfree(tmp); + } else { + alt->getRGBLine(in, out, length); + } +#else + alt->getRGBLine(in, out, length); +#endif +} + +void GfxICCBasedColorSpace::getRGBXLine(unsigned char *in, unsigned char *out, int length) +{ +#ifdef USE_CMS + if (lineTransform != nullptr && lineTransform->getTransformPixelType() == PT_RGB) { + unsigned char *tmp = (unsigned char *)gmallocn(3 * length, sizeof(unsigned char)); + lineTransform->doTransform(in, tmp, length); + unsigned char *current = tmp; + for (int i = 0; i < length; ++i) { + *out++ = *current++; + *out++ = *current++; + *out++ = *current++; + *out++ = 255; + } + gfree(tmp); + } else { + alt->getRGBXLine(in, out, length); + } +#else + alt->getRGBXLine(in, out, length); +#endif +} + +void GfxICCBasedColorSpace::getCMYKLine(unsigned char *in, unsigned char *out, int length) +{ +#ifdef USE_CMS + if (lineTransform != nullptr && lineTransform->getTransformPixelType() == PT_CMYK) { + transform->doTransform(in, out, length); + } else if (lineTransform != nullptr && nComps != 4) { + GfxColorComp c, m, y, k; + unsigned char *tmp = (unsigned char *)gmallocn(3 * length, sizeof(unsigned char)); + getRGBLine(in, tmp, length); + unsigned char *p = tmp; + for (int i = 0; i < length; i++) { + c = byteToCol(255 - *p++); + m = byteToCol(255 - *p++); + y = byteToCol(255 - *p++); + k = c; + if (m < k) { + k = m; + } + if (y < k) { + k = y; + } + *out++ = colToByte(c - k); + *out++ = colToByte(m - k); + *out++ = colToByte(y - k); + *out++ = colToByte(k); + } + gfree(tmp); + } else { + alt->getCMYKLine(in, out, length); + } +#else + alt->getCMYKLine(in, out, length); +#endif +} + +void GfxICCBasedColorSpace::getDeviceNLine(unsigned char *in, unsigned char *out, int length) +{ +#ifdef USE_CMS + if (lineTransform != nullptr && lineTransform->getTransformPixelType() == PT_CMYK) { + unsigned char *tmp = (unsigned char *)gmallocn(4 * length, sizeof(unsigned char)); + transform->doTransform(in, tmp, length); + unsigned char *p = tmp; + for (int i = 0; i < length; i++) { + for (int j = 0; j < 4; j++) { + *out++ = *p++; + } + for (int j = 4; j < SPOT_NCOMPS + 4; j++) { + *out++ = 0; + } + } + gfree(tmp); + } else if (lineTransform != nullptr && nComps != 4) { + GfxColorComp c, m, y, k; + unsigned char *tmp = (unsigned char *)gmallocn(3 * length, sizeof(unsigned char)); + getRGBLine(in, tmp, length); + unsigned char *p = tmp; + for (int i = 0; i < length; i++) { + for (int j = 0; j < SPOT_NCOMPS + 4; j++) { + out[j] = 0; + } + c = byteToCol(255 - *p++); + m = byteToCol(255 - *p++); + y = byteToCol(255 - *p++); + k = c; + if (m < k) { + k = m; + } + if (y < k) { + k = y; + } + out[0] = colToByte(c - k); + out[1] = colToByte(m - k); + out[2] = colToByte(y - k); + out[3] = colToByte(k); + out += (SPOT_NCOMPS + 4); + } + gfree(tmp); + } else { + alt->getDeviceNLine(in, out, length); + } +#else + alt->getDeviceNLine(in, out, length); +#endif +} + +void GfxICCBasedColorSpace::getCMYK(const GfxColor *color, GfxCMYK *cmyk) const +{ +#ifdef USE_CMS + if (transform != nullptr && transform->getTransformPixelType() == PT_CMYK) { + unsigned char in[gfxColorMaxComps]; + unsigned char out[gfxColorMaxComps]; + + if (nComps == 3 && transform->getInputPixelType() == PT_Lab) { + in[0] = colToByte(dblToCol(colToDbl(color->c[0]) / 100.0)); + in[1] = colToByte(dblToCol((colToDbl(color->c[1]) + 128.0) / 255.0)); + in[2] = colToByte(dblToCol((colToDbl(color->c[2]) + 128.0) / 255.0)); + } else { + for (int i = 0; i < nComps; i++) { + in[i] = colToByte(color->c[i]); + } + } + if (nComps <= 4) { + unsigned int key = 0; + for (int j = 0; j < nComps; j++) { + key = (key << 8) + in[j]; + } + std::map::iterator it = cmsCache.find(key); + if (it != cmsCache.end()) { + unsigned int value = it->second; + cmyk->c = byteToCol(value >> 24); + cmyk->m = byteToCol((value >> 16) & 0xff); + cmyk->y = byteToCol((value >> 8) & 0xff); + cmyk->k = byteToCol(value & 0xff); + return; + } + } + transform->doTransform(in, out, 1); + cmyk->c = byteToCol(out[0]); + cmyk->m = byteToCol(out[1]); + cmyk->y = byteToCol(out[2]); + cmyk->k = byteToCol(out[3]); + if (nComps <= 4 && cmsCache.size() <= CMSCACHE_LIMIT) { + unsigned int key = 0; + for (int j = 0; j < nComps; j++) { + key = (key << 8) + in[j]; + } + unsigned int value = (out[0] << 24) + (out[1] << 16) + (out[2] << 8) + out[3]; + cmsCache.insert(std::pair(key, value)); + } + } else if (nComps != 4 && transform != nullptr && transform->getTransformPixelType() == PT_RGB) { + GfxRGB rgb; + GfxColorComp c, m, y, k; + + getRGB(color, &rgb); + c = clip01(gfxColorComp1 - rgb.r); + m = clip01(gfxColorComp1 - rgb.g); + y = clip01(gfxColorComp1 - rgb.b); + k = c; + if (m < k) { + k = m; + } + if (y < k) { + k = y; + } + cmyk->c = c - k; + cmyk->m = m - k; + cmyk->y = y - k; + cmyk->k = k; + } else { + alt->getCMYK(color, cmyk); + } +#else + alt->getCMYK(color, cmyk); +#endif +} + +bool GfxICCBasedColorSpace::useGetRGBLine() const +{ +#ifdef USE_CMS + return lineTransform != nullptr || alt->useGetRGBLine(); +#else + return alt->useGetRGBLine(); +#endif +} + +bool GfxICCBasedColorSpace::useGetCMYKLine() const +{ +#ifdef USE_CMS + return lineTransform != nullptr || alt->useGetCMYKLine(); +#else + return alt->useGetCMYKLine(); +#endif +} + +bool GfxICCBasedColorSpace::useGetDeviceNLine() const +{ +#ifdef USE_CMS + return lineTransform != nullptr || alt->useGetDeviceNLine(); +#else + return alt->useGetDeviceNLine(); +#endif +} + +void GfxICCBasedColorSpace::getDeviceN(const GfxColor *color, GfxColor *deviceN) const +{ + GfxCMYK cmyk; + clearGfxColor(deviceN); + getCMYK(color, &cmyk); + deviceN->c[0] = cmyk.c; + deviceN->c[1] = cmyk.m; + deviceN->c[2] = cmyk.y; + deviceN->c[3] = cmyk.k; +} + +void GfxICCBasedColorSpace::getDefaultColor(GfxColor *color) const +{ + int i; + + for (i = 0; i < nComps; ++i) { + if (rangeMin[i] > 0) { + color->c[i] = dblToCol(rangeMin[i]); + } else if (rangeMax[i] < 0) { + color->c[i] = dblToCol(rangeMax[i]); + } else { + color->c[i] = 0; + } + } +} + +void GfxICCBasedColorSpace::getDefaultRanges(double *decodeLow, double *decodeRange, int maxImgPixel) const +{ + alt->getDefaultRanges(decodeLow, decodeRange, maxImgPixel); + +#if 0 + // this is nominally correct, but some PDF files don't set the + // correct ranges in the ICCBased dict + int i; + + for (i = 0; i < nComps; ++i) { + decodeLow[i] = rangeMin[i]; + decodeRange[i] = rangeMax[i] - rangeMin[i]; + } +#endif +} + +#ifdef USE_CMS +char *GfxICCBasedColorSpace::getPostScriptCSA() +{ +# if LCMS_VERSION >= 2070 + // The runtime version check of lcms2 is only available from release 2.7 upwards. + // The generation of the CSA code only works reliably for version 2.10 and upwards. + // Cf. the explanation in the corresponding lcms2 merge request [1], and the original mail thread [2]. + // [1] https://github.com/mm2/Little-CMS/pull/214 + // [2] https://sourceforge.net/p/lcms/mailman/message/33182987/ + if (cmsGetEncodedCMMversion() < 2100) { + return nullptr; + } + + int size; + + if (psCSA) { + return psCSA; + } + + if (!profile) { + error(errSyntaxWarning, -1, "profile is nullptr"); + return nullptr; + } + + void *rawprofile = profile.get(); + size = cmsGetPostScriptCSA(cmsGetProfileContextID(rawprofile), rawprofile, getIntent(), 0, nullptr, 0); + if (size == 0) { + error(errSyntaxWarning, -1, "PostScript CSA is nullptr"); + return nullptr; + } + + psCSA = (char *)gmalloc(size + 1); + cmsGetPostScriptCSA(cmsGetProfileContextID(rawprofile), rawprofile, getIntent(), 0, psCSA, size); + psCSA[size] = 0; + + // TODO REMOVE-ME-IN-THE-FUTURE + // until we can depend on https://github.com/mm2/Little-CMS/issues/223 being fixed + // lcms returns ps code with , instead of . for some locales. The lcms author says + // that there's no room for any , in the rest of the ps code, so replacing all the , with . + // is an "acceptable" workaround + for (int i = 0; i < size; ++i) { + if (psCSA[i] == ',') { + psCSA[i] = '.'; + } + } + + return psCSA; +# else + return nullptr; +# endif +} +#endif + +//------------------------------------------------------------------------ +// GfxIndexedColorSpace +//------------------------------------------------------------------------ + +GfxIndexedColorSpace::GfxIndexedColorSpace(GfxColorSpace *baseA, int indexHighA) +{ + base = baseA; + indexHigh = indexHighA; + lookup = (unsigned char *)gmallocn((indexHigh + 1) * base->getNComps(), sizeof(unsigned char)); + overprintMask = base->getOverprintMask(); +} + +GfxIndexedColorSpace::~GfxIndexedColorSpace() +{ + delete base; + gfree(lookup); +} + +GfxColorSpace *GfxIndexedColorSpace::copy() const +{ + GfxIndexedColorSpace *cs; + + cs = new GfxIndexedColorSpace(base->copy(), indexHigh); + memcpy(cs->lookup, lookup, (indexHigh + 1) * base->getNComps() * sizeof(unsigned char)); + return cs; +} + +GfxColorSpace *GfxIndexedColorSpace::parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion) +{ + GfxColorSpace *baseA; + int indexHighA; + Object obj1; + const char *s; + int i, j; + + if (arr->getLength() != 4) { + error(errSyntaxWarning, -1, "Bad Indexed color space"); + return nullptr; + } + obj1 = arr->get(1); + if (!(baseA = GfxColorSpace::parse(res, &obj1, out, state, recursion + 1))) { + error(errSyntaxWarning, -1, "Bad Indexed color space (base color space)"); + return nullptr; + } + obj1 = arr->get(2); + if (!obj1.isInt()) { + error(errSyntaxWarning, -1, "Bad Indexed color space (hival)"); + delete baseA; + return nullptr; + } + indexHighA = obj1.getInt(); + if (indexHighA < 0 || indexHighA > 255) { + // the PDF spec requires indexHigh to be in [0,255] -- allowing + // values larger than 255 creates a security hole: if nComps * + // indexHigh is greater than 2^31, the loop below may overwrite + // past the end of the array + int previousValue = indexHighA; + if (indexHighA < 0) { + indexHighA = 0; + } else { + indexHighA = 255; + } + error(errSyntaxWarning, -1, "Bad Indexed color space (invalid indexHigh value, was {0:d} using {1:d} to try to recover)", previousValue, indexHighA); + } + GfxIndexedColorSpace *cs = new GfxIndexedColorSpace(baseA, indexHighA); + obj1 = arr->get(3); + const int n = baseA->getNComps(); + if (obj1.isStream()) { + obj1.streamReset(); + for (i = 0; i <= indexHighA; ++i) { + const int readChars = obj1.streamGetChars(n, &cs->lookup[i * n]); + for (j = readChars; j < n; ++j) { + error(errSyntaxWarning, -1, "Bad Indexed color space (lookup table stream too short) padding with zeroes"); + cs->lookup[i * n + j] = 0; + } + } + obj1.streamClose(); + } else if (obj1.isString()) { + if (obj1.getString()->getLength() < (indexHighA + 1) * n) { + error(errSyntaxWarning, -1, "Bad Indexed color space (lookup table string too short)"); + goto err3; + } + s = obj1.getString()->c_str(); + for (i = 0; i <= indexHighA; ++i) { + for (j = 0; j < n; ++j) { + cs->lookup[i * n + j] = (unsigned char)*s++; + } + } + } else { + error(errSyntaxWarning, -1, "Bad Indexed color space (lookup table)"); + goto err3; + } + return cs; + +err3: + delete cs; + return nullptr; +} + +GfxColor *GfxIndexedColorSpace::mapColorToBase(const GfxColor *color, GfxColor *baseColor) const +{ + unsigned char *p; + double low[gfxColorMaxComps], range[gfxColorMaxComps]; + int n, i; + + n = base->getNComps(); + base->getDefaultRanges(low, range, indexHigh); + const int idx = (int)(colToDbl(color->c[0]) + 0.5) * n; + if (likely((idx + n - 1 < (indexHigh + 1) * base->getNComps()) && idx >= 0)) { + p = &lookup[idx]; + for (i = 0; i < n; ++i) { + baseColor->c[i] = dblToCol(low[i] + (p[i] / 255.0) * range[i]); + } + } else { + for (i = 0; i < n; ++i) { + baseColor->c[i] = 0; + } + } + return baseColor; +} + +void GfxIndexedColorSpace::getGray(const GfxColor *color, GfxGray *gray) const +{ + GfxColor color2; + + base->getGray(mapColorToBase(color, &color2), gray); +} + +void GfxIndexedColorSpace::getRGB(const GfxColor *color, GfxRGB *rgb) const +{ + GfxColor color2; + + base->getRGB(mapColorToBase(color, &color2), rgb); +} + +void GfxIndexedColorSpace::getRGBLine(unsigned char *in, unsigned int *out, int length) +{ + unsigned char *line; + int i, j, n; + + n = base->getNComps(); + line = (unsigned char *)gmallocn(length, n); + for (i = 0; i < length; i++) { + for (j = 0; j < n; j++) { + line[i * n + j] = lookup[in[i] * n + j]; + } + } + + base->getRGBLine(line, out, length); + + gfree(line); +} + +void GfxIndexedColorSpace::getRGBLine(unsigned char *in, unsigned char *out, int length) +{ + unsigned char *line; + int i, j, n; + + n = base->getNComps(); + line = (unsigned char *)gmallocn(length, n); + for (i = 0; i < length; i++) { + for (j = 0; j < n; j++) { + line[i * n + j] = lookup[in[i] * n + j]; + } + } + + base->getRGBLine(line, out, length); + + gfree(line); +} + +void GfxIndexedColorSpace::getRGBXLine(unsigned char *in, unsigned char *out, int length) +{ + unsigned char *line; + int i, j, n; + + n = base->getNComps(); + line = (unsigned char *)gmallocn(length, n); + for (i = 0; i < length; i++) { + for (j = 0; j < n; j++) { + line[i * n + j] = lookup[in[i] * n + j]; + } + } + + base->getRGBXLine(line, out, length); + + gfree(line); +} + +void GfxIndexedColorSpace::getCMYKLine(unsigned char *in, unsigned char *out, int length) +{ + unsigned char *line; + int i, j, n; + + n = base->getNComps(); + line = (unsigned char *)gmallocn(length, n); + for (i = 0; i < length; i++) { + for (j = 0; j < n; j++) { + line[i * n + j] = lookup[in[i] * n + j]; + } + } + + base->getCMYKLine(line, out, length); + + gfree(line); +} + +void GfxIndexedColorSpace::getDeviceNLine(unsigned char *in, unsigned char *out, int length) +{ + unsigned char *line; + int i, j, n; + + n = base->getNComps(); + line = (unsigned char *)gmallocn(length, n); + for (i = 0; i < length; i++) { + for (j = 0; j < n; j++) { + line[i * n + j] = lookup[in[i] * n + j]; + } + } + + base->getDeviceNLine(line, out, length); + + gfree(line); +} + +void GfxIndexedColorSpace::getCMYK(const GfxColor *color, GfxCMYK *cmyk) const +{ + GfxColor color2; + + base->getCMYK(mapColorToBase(color, &color2), cmyk); +} + +void GfxIndexedColorSpace::getDeviceN(const GfxColor *color, GfxColor *deviceN) const +{ + GfxColor color2; + + base->getDeviceN(mapColorToBase(color, &color2), deviceN); +} + +void GfxIndexedColorSpace::getDefaultColor(GfxColor *color) const +{ + color->c[0] = 0; +} + +void GfxIndexedColorSpace::getDefaultRanges(double *decodeLow, double *decodeRange, int maxImgPixel) const +{ + decodeLow[0] = 0; + decodeRange[0] = maxImgPixel; +} + +//------------------------------------------------------------------------ +// GfxSeparationColorSpace +//------------------------------------------------------------------------ + +GfxSeparationColorSpace::GfxSeparationColorSpace(GooString *nameA, GfxColorSpace *altA, Function *funcA) +{ + name = nameA; + alt = altA; + func = funcA; + nonMarking = !name->cmp("None"); + if (!name->cmp("Cyan")) { + overprintMask = 0x01; + } else if (!name->cmp("Magenta")) { + overprintMask = 0x02; + } else if (!name->cmp("Yellow")) { + overprintMask = 0x04; + } else if (!name->cmp("Black")) { + overprintMask = 0x08; + } else if (!name->cmp("All")) { + overprintMask = 0xffffffff; + } +} + +GfxSeparationColorSpace::GfxSeparationColorSpace(GooString *nameA, GfxColorSpace *altA, Function *funcA, bool nonMarkingA, unsigned int overprintMaskA, int *mappingA) +{ + name = nameA; + alt = altA; + func = funcA; + nonMarking = nonMarkingA; + overprintMask = overprintMaskA; + mapping = mappingA; +} + +GfxSeparationColorSpace::~GfxSeparationColorSpace() +{ + delete name; + delete alt; + delete func; + if (mapping != nullptr) { + gfree(mapping); + } +} + +GfxColorSpace *GfxSeparationColorSpace::copy() const +{ + int *mappingA = nullptr; + if (mapping != nullptr) { + mappingA = (int *)gmalloc(sizeof(int)); + *mappingA = *mapping; + } + return new GfxSeparationColorSpace(name->copy(), alt->copy(), func->copy(), nonMarking, overprintMask, mappingA); +} + +//~ handle the 'All' and 'None' colorants +GfxColorSpace *GfxSeparationColorSpace::parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion) +{ + GooString *nameA; + GfxColorSpace *altA; + Function *funcA; + Object obj1; + + if (arr->getLength() != 4) { + error(errSyntaxWarning, -1, "Bad Separation color space"); + goto err1; + } + obj1 = arr->get(1); + if (!obj1.isName()) { + error(errSyntaxWarning, -1, "Bad Separation color space (name)"); + goto err1; + } + nameA = new GooString(obj1.getName()); + obj1 = arr->get(2); + if (!(altA = GfxColorSpace::parse(res, &obj1, out, state, recursion + 1))) { + error(errSyntaxWarning, -1, "Bad Separation color space (alternate color space)"); + goto err3; + } + obj1 = arr->get(3); + if (!(funcA = Function::parse(&obj1))) { + goto err4; + } + if (funcA->getInputSize() != 1) { + error(errSyntaxWarning, -1, "Bad SeparationColorSpace function"); + goto err5; + } + if (altA->getNComps() <= funcA->getOutputSize()) { + return new GfxSeparationColorSpace(nameA, altA, funcA); + } + +err5: + delete funcA; +err4: + delete altA; +err3: + delete nameA; +err1: + return nullptr; +} + +void GfxSeparationColorSpace::getGray(const GfxColor *color, GfxGray *gray) const +{ + double x; + double c[gfxColorMaxComps]; + GfxColor color2; + int i; + + if (alt->getMode() == csDeviceGray && name->cmp("Black") == 0) { + *gray = clip01(gfxColorComp1 - color->c[0]); + } else { + x = colToDbl(color->c[0]); + func->transform(&x, c); + for (i = 0; i < alt->getNComps(); ++i) { + color2.c[i] = dblToCol(c[i]); + } + alt->getGray(&color2, gray); + } +} + +void GfxSeparationColorSpace::getRGB(const GfxColor *color, GfxRGB *rgb) const +{ + double x; + double c[gfxColorMaxComps]; + GfxColor color2; + int i; + + if (alt->getMode() == csDeviceGray && name->cmp("Black") == 0) { + rgb->r = clip01(gfxColorComp1 - color->c[0]); + rgb->g = clip01(gfxColorComp1 - color->c[0]); + rgb->b = clip01(gfxColorComp1 - color->c[0]); + } else { + x = colToDbl(color->c[0]); + func->transform(&x, c); + const int altNComps = alt->getNComps(); + for (i = 0; i < altNComps; ++i) { + color2.c[i] = dblToCol(c[i]); + } + alt->getRGB(&color2, rgb); + } +} + +void GfxSeparationColorSpace::getCMYK(const GfxColor *color, GfxCMYK *cmyk) const +{ + double x; + double c[gfxColorMaxComps]; + GfxColor color2; + int i; + + if (name->cmp("Black") == 0) { + cmyk->c = 0; + cmyk->m = 0; + cmyk->y = 0; + cmyk->k = color->c[0]; + } else if (name->cmp("Cyan") == 0) { + cmyk->c = color->c[0]; + cmyk->m = 0; + cmyk->y = 0; + cmyk->k = 0; + } else if (name->cmp("Magenta") == 0) { + cmyk->c = 0; + cmyk->m = color->c[0]; + cmyk->y = 0; + cmyk->k = 0; + } else if (name->cmp("Yellow") == 0) { + cmyk->c = 0; + cmyk->m = 0; + cmyk->y = color->c[0]; + cmyk->k = 0; + } else { + x = colToDbl(color->c[0]); + func->transform(&x, c); + for (i = 0; i < alt->getNComps(); ++i) { + color2.c[i] = dblToCol(c[i]); + } + alt->getCMYK(&color2, cmyk); + } +} + +void GfxSeparationColorSpace::getDeviceN(const GfxColor *color, GfxColor *deviceN) const +{ + clearGfxColor(deviceN); + if (mapping == nullptr || mapping[0] == -1) { + GfxCMYK cmyk; + + getCMYK(color, &cmyk); + deviceN->c[0] = cmyk.c; + deviceN->c[1] = cmyk.m; + deviceN->c[2] = cmyk.y; + deviceN->c[3] = cmyk.k; + } else { + deviceN->c[mapping[0]] = color->c[0]; + } +} + +void GfxSeparationColorSpace::getDefaultColor(GfxColor *color) const +{ + color->c[0] = gfxColorComp1; +} + +void GfxSeparationColorSpace::createMapping(std::vector *separationList, int maxSepComps) +{ + if (nonMarking) { + return; + } + mapping = (int *)gmalloc(sizeof(int)); + switch (overprintMask) { + case 0x01: + *mapping = 0; + break; + case 0x02: + *mapping = 1; + break; + case 0x04: + *mapping = 2; + break; + case 0x08: + *mapping = 3; + break; + default: + unsigned int newOverprintMask = 0x10; + for (std::size_t i = 0; i < separationList->size(); i++) { + GfxSeparationColorSpace *sepCS = (*separationList)[i]; + if (!sepCS->getName()->cmp(name)) { + if (sepCS->getFunc()->hasDifferentResultSet(func)) { + error(errSyntaxWarning, -1, "Different functions found for '{0:t}', convert immediately", name); + gfree(mapping); + mapping = nullptr; + return; + } + *mapping = i + 4; + overprintMask = newOverprintMask; + return; + } + newOverprintMask <<= 1; + } + if ((int)separationList->size() == maxSepComps) { + error(errSyntaxWarning, -1, "Too many ({0:d}) spots, convert '{1:t}' immediately", maxSepComps, name); + gfree(mapping); + mapping = nullptr; + return; + } + *mapping = separationList->size() + 4; + separationList->push_back((GfxSeparationColorSpace *)copy()); + overprintMask = newOverprintMask; + break; + } +} + +//------------------------------------------------------------------------ +// GfxDeviceNColorSpace +//------------------------------------------------------------------------ + +GfxDeviceNColorSpace::GfxDeviceNColorSpace(int nCompsA, std::vector &&namesA, GfxColorSpace *altA, Function *funcA, std::vector *sepsCSA) : nComps(nCompsA), names(std::move(namesA)) +{ + alt = altA; + func = funcA; + sepsCS = sepsCSA; + nonMarking = true; + overprintMask = 0; + mapping = nullptr; + for (int i = 0; i < nComps; ++i) { + if (names[i] != "None") { + nonMarking = false; + } + if (names[i] == "Cyan") { + overprintMask |= 0x01; + } else if (names[i] == "Magenta") { + overprintMask |= 0x02; + } else if (names[i] == "Yellow") { + overprintMask |= 0x04; + } else if (names[i] == "Black") { + overprintMask |= 0x08; + } else if (names[i] == "All") { + overprintMask = 0xffffffff; + } else if (names[i] != "None") { + overprintMask = 0x0f; + } + } +} + +GfxDeviceNColorSpace::GfxDeviceNColorSpace(int nCompsA, const std::vector &namesA, GfxColorSpace *altA, Function *funcA, std::vector *sepsCSA, int *mappingA, bool nonMarkingA, + unsigned int overprintMaskA) + : nComps(nCompsA), names(namesA) +{ + alt = altA; + func = funcA; + sepsCS = sepsCSA; + mapping = mappingA; + nonMarking = nonMarkingA; + overprintMask = overprintMaskA; +} + +GfxDeviceNColorSpace::~GfxDeviceNColorSpace() +{ + delete alt; + delete func; + for (auto entry : *sepsCS) { + delete entry; + } + delete sepsCS; + if (mapping != nullptr) { + gfree(mapping); + } +} + +GfxColorSpace *GfxDeviceNColorSpace::copy() const +{ + int *mappingA = nullptr; + + auto sepsCSA = new std::vector(); + sepsCSA->reserve(sepsCS->size()); + for (const GfxSeparationColorSpace *scs : *sepsCS) { + if (likely(scs != nullptr)) { + sepsCSA->push_back((GfxSeparationColorSpace *)scs->copy()); + } + } + if (mapping != nullptr) { + mappingA = (int *)gmalloc(sizeof(int) * nComps); + for (int i = 0; i < nComps; i++) { + mappingA[i] = mapping[i]; + } + } + return new GfxDeviceNColorSpace(nComps, names, alt->copy(), func->copy(), sepsCSA, mappingA, nonMarking, overprintMask); +} + +//~ handle the 'None' colorant +GfxColorSpace *GfxDeviceNColorSpace::parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion) +{ + int nCompsA; + std::vector namesA; + GfxColorSpace *altA; + Function *funcA; + Object obj1; + auto separationList = new std::vector(); + + if (arr->getLength() != 4 && arr->getLength() != 5) { + error(errSyntaxWarning, -1, "Bad DeviceN color space"); + goto err1; + } + obj1 = arr->get(1); + if (!obj1.isArray()) { + error(errSyntaxWarning, -1, "Bad DeviceN color space (names)"); + goto err1; + } + nCompsA = obj1.arrayGetLength(); + if (nCompsA > gfxColorMaxComps) { + error(errSyntaxWarning, -1, "DeviceN color space with too many ({0:d} > {1:d}) components", nCompsA, gfxColorMaxComps); + nCompsA = gfxColorMaxComps; + } + for (int i = 0; i < nCompsA; ++i) { + Object obj2 = obj1.arrayGet(i); + if (!obj2.isName()) { + error(errSyntaxWarning, -1, "Bad DeviceN color space (names)"); + nCompsA = i; + goto err1; + } + namesA.emplace_back(obj2.getName()); + } + obj1 = arr->get(2); + if (!(altA = GfxColorSpace::parse(res, &obj1, out, state, recursion + 1))) { + error(errSyntaxWarning, -1, "Bad DeviceN color space (alternate color space)"); + goto err1; + } + obj1 = arr->get(3); + if (!(funcA = Function::parse(&obj1))) { + goto err4; + } + if (arr->getLength() == 5) { + obj1 = arr->get(4); + if (!obj1.isDict()) { + error(errSyntaxWarning, -1, "Bad DeviceN color space (attributes)"); + goto err5; + } + Dict *attribs = obj1.getDict(); + Object obj2 = attribs->lookup("Colorants"); + if (obj2.isDict()) { + Dict *colorants = obj2.getDict(); + for (int i = 0; i < colorants->getLength(); i++) { + Object obj3 = colorants->getVal(i); + if (obj3.isArray()) { + GfxSeparationColorSpace *cs = (GfxSeparationColorSpace *)GfxSeparationColorSpace::parse(res, obj3.getArray(), out, state, recursion); + if (cs) { + separationList->push_back(cs); + } + } else { + error(errSyntaxWarning, -1, "Bad DeviceN color space (colorant value entry is not an Array)"); + goto err5; + } + } + } + } + + if (likely(nCompsA >= funcA->getInputSize() && altA->getNComps() <= funcA->getOutputSize())) { + return new GfxDeviceNColorSpace(nCompsA, std::move(namesA), altA, funcA, separationList); + } + +err5: + delete funcA; +err4: + delete altA; +err1: + delete separationList; + return nullptr; +} + +void GfxDeviceNColorSpace::getGray(const GfxColor *color, GfxGray *gray) const +{ + double x[gfxColorMaxComps], c[gfxColorMaxComps]; + GfxColor color2; + int i; + + for (i = 0; i < nComps; ++i) { + x[i] = colToDbl(color->c[i]); + } + func->transform(x, c); + for (i = 0; i < alt->getNComps(); ++i) { + color2.c[i] = dblToCol(c[i]); + } + alt->getGray(&color2, gray); +} + +void GfxDeviceNColorSpace::getRGB(const GfxColor *color, GfxRGB *rgb) const +{ + double x[gfxColorMaxComps], c[gfxColorMaxComps]; + GfxColor color2; + int i; + + for (i = 0; i < nComps; ++i) { + x[i] = colToDbl(color->c[i]); + } + func->transform(x, c); + for (i = 0; i < alt->getNComps(); ++i) { + color2.c[i] = dblToCol(c[i]); + } + alt->getRGB(&color2, rgb); +} + +void GfxDeviceNColorSpace::getCMYK(const GfxColor *color, GfxCMYK *cmyk) const +{ + double x[gfxColorMaxComps], c[gfxColorMaxComps]; + GfxColor color2; + int i; + + for (i = 0; i < nComps; ++i) { + x[i] = colToDbl(color->c[i]); + } + func->transform(x, c); + for (i = 0; i < alt->getNComps(); ++i) { + color2.c[i] = dblToCol(c[i]); + } + alt->getCMYK(&color2, cmyk); +} + +void GfxDeviceNColorSpace::getDeviceN(const GfxColor *color, GfxColor *deviceN) const +{ + clearGfxColor(deviceN); + if (mapping == nullptr) { + GfxCMYK cmyk; + + getCMYK(color, &cmyk); + deviceN->c[0] = cmyk.c; + deviceN->c[1] = cmyk.m; + deviceN->c[2] = cmyk.y; + deviceN->c[3] = cmyk.k; + } else { + for (int j = 0; j < nComps; j++) { + if (mapping[j] != -1) { + deviceN->c[mapping[j]] = color->c[j]; + } + } + } +} + +void GfxDeviceNColorSpace::getDefaultColor(GfxColor *color) const +{ + int i; + + for (i = 0; i < nComps; ++i) { + color->c[i] = gfxColorComp1; + } +} + +void GfxDeviceNColorSpace::createMapping(std::vector *separationList, int maxSepComps) +{ + if (nonMarking) { // None + return; + } + mapping = (int *)gmalloc(sizeof(int) * nComps); + unsigned int newOverprintMask = 0; + for (int i = 0; i < nComps; i++) { + if (names[i] == "None") { + mapping[i] = -1; + } else if (names[i] == "Cyan") { + newOverprintMask |= 0x01; + mapping[i] = 0; + } else if (names[i] == "Magenta") { + newOverprintMask |= 0x02; + mapping[i] = 1; + } else if (names[i] == "Yellow") { + newOverprintMask |= 0x04; + mapping[i] = 2; + } else if (names[i] == "Black") { + newOverprintMask |= 0x08; + mapping[i] = 3; + } else { + unsigned int startOverprintMask = 0x10; + bool found = false; + const Function *sepFunc = nullptr; + if (nComps == 1) { + sepFunc = func; + } else { + for (const GfxSeparationColorSpace *sepCS : *sepsCS) { + if (!sepCS->getName()->cmp(names[i])) { + sepFunc = sepCS->getFunc(); + break; + } + } + } + for (std::size_t j = 0; j < separationList->size(); j++) { + GfxSeparationColorSpace *sepCS = (*separationList)[j]; + if (!sepCS->getName()->cmp(names[i])) { + if (sepFunc != nullptr && sepCS->getFunc()->hasDifferentResultSet(sepFunc)) { + error(errSyntaxWarning, -1, "Different functions found for '{0:s}', convert immediately", names[i].c_str()); + gfree(mapping); + mapping = nullptr; + overprintMask = 0xffffffff; + return; + } + mapping[i] = j + 4; + newOverprintMask |= startOverprintMask; + found = true; + break; + } + startOverprintMask <<= 1; + } + if (!found) { + if ((int)separationList->size() == maxSepComps) { + error(errSyntaxWarning, -1, "Too many ({0:d}) spots, convert '{1:s}' immediately", maxSepComps, names[i].c_str()); + gfree(mapping); + mapping = nullptr; + overprintMask = 0xffffffff; + return; + } + mapping[i] = separationList->size() + 4; + newOverprintMask |= startOverprintMask; + if (nComps == 1) { + separationList->push_back(new GfxSeparationColorSpace(new GooString(names[i]), alt->copy(), func->copy())); + } else { + for (const GfxSeparationColorSpace *sepCS : *sepsCS) { + if (!sepCS->getName()->cmp(names[i])) { + found = true; + separationList->push_back((GfxSeparationColorSpace *)sepCS->copy()); + break; + } + } + if (!found) { + error(errSyntaxWarning, -1, "DeviceN has no suitable colorant"); + gfree(mapping); + mapping = nullptr; + overprintMask = 0xffffffff; + return; + } + } + } + } + } + overprintMask = newOverprintMask; +} + +//------------------------------------------------------------------------ +// GfxPatternColorSpace +//------------------------------------------------------------------------ + +GfxPatternColorSpace::GfxPatternColorSpace(GfxColorSpace *underA) +{ + under = underA; +} + +GfxPatternColorSpace::~GfxPatternColorSpace() +{ + if (under) { + delete under; + } +} + +GfxColorSpace *GfxPatternColorSpace::copy() const +{ + return new GfxPatternColorSpace(under ? under->copy() : nullptr); +} + +GfxColorSpace *GfxPatternColorSpace::parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion) +{ + GfxPatternColorSpace *cs; + GfxColorSpace *underA; + Object obj1; + + if (arr->getLength() != 1 && arr->getLength() != 2) { + error(errSyntaxWarning, -1, "Bad Pattern color space"); + return nullptr; + } + underA = nullptr; + if (arr->getLength() == 2) { + obj1 = arr->get(1); + if (!(underA = GfxColorSpace::parse(res, &obj1, out, state, recursion + 1))) { + error(errSyntaxWarning, -1, "Bad Pattern color space (underlying color space)"); + return nullptr; + } + } + cs = new GfxPatternColorSpace(underA); + return cs; +} + +void GfxPatternColorSpace::getGray(const GfxColor *color, GfxGray *gray) const +{ + *gray = 0; +} + +void GfxPatternColorSpace::getRGB(const GfxColor *color, GfxRGB *rgb) const +{ + rgb->r = rgb->g = rgb->b = 0; +} + +void GfxPatternColorSpace::getCMYK(const GfxColor *color, GfxCMYK *cmyk) const +{ + cmyk->c = cmyk->m = cmyk->y = 0; + cmyk->k = 1; +} + +void GfxPatternColorSpace::getDeviceN(const GfxColor *color, GfxColor *deviceN) const +{ + clearGfxColor(deviceN); + deviceN->c[3] = 1; +} + +void GfxPatternColorSpace::getDefaultColor(GfxColor *color) const +{ + color->c[0] = 0; +} + +//------------------------------------------------------------------------ +// Pattern +//------------------------------------------------------------------------ + +GfxPattern::GfxPattern(int typeA, int patternRefNumA) : type(typeA), patternRefNum(patternRefNumA) { } + +GfxPattern::~GfxPattern() { } + +GfxPattern *GfxPattern::parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state, int patternRefNum) +{ + GfxPattern *pattern; + Object obj1; + + if (obj->isDict()) { + obj1 = obj->dictLookup("PatternType"); + } else if (obj->isStream()) { + obj1 = obj->streamGetDict()->lookup("PatternType"); + } else { + return nullptr; + } + pattern = nullptr; + if (obj1.isInt() && obj1.getInt() == 1) { + pattern = GfxTilingPattern::parse(obj, patternRefNum); + } else if (obj1.isInt() && obj1.getInt() == 2) { + pattern = GfxShadingPattern::parse(res, obj, out, state, patternRefNum); + } + return pattern; +} + +//------------------------------------------------------------------------ +// GfxTilingPattern +//------------------------------------------------------------------------ + +GfxTilingPattern *GfxTilingPattern::parse(Object *patObj, int patternRefNum) +{ + Dict *dict; + int paintTypeA, tilingTypeA; + double bboxA[4], matrixA[6]; + double xStepA, yStepA; + Object resDictA; + Object obj1; + int i; + + if (!patObj->isStream()) { + return nullptr; + } + dict = patObj->streamGetDict(); + + obj1 = dict->lookup("PaintType"); + if (obj1.isInt()) { + paintTypeA = obj1.getInt(); + } else { + paintTypeA = 1; + error(errSyntaxWarning, -1, "Invalid or missing PaintType in pattern"); + } + obj1 = dict->lookup("TilingType"); + if (obj1.isInt()) { + tilingTypeA = obj1.getInt(); + } else { + tilingTypeA = 1; + error(errSyntaxWarning, -1, "Invalid or missing TilingType in pattern"); + } + bboxA[0] = bboxA[1] = 0; + bboxA[2] = bboxA[3] = 1; + obj1 = dict->lookup("BBox"); + if (obj1.isArray() && obj1.arrayGetLength() == 4) { + for (i = 0; i < 4; ++i) { + Object obj2 = obj1.arrayGet(i); + if (obj2.isNum()) { + bboxA[i] = obj2.getNum(); + } + } + } else { + error(errSyntaxWarning, -1, "Invalid or missing BBox in pattern"); + } + obj1 = dict->lookup("XStep"); + if (obj1.isNum()) { + xStepA = obj1.getNum(); + } else { + xStepA = 1; + error(errSyntaxWarning, -1, "Invalid or missing XStep in pattern"); + } + obj1 = dict->lookup("YStep"); + if (obj1.isNum()) { + yStepA = obj1.getNum(); + } else { + yStepA = 1; + error(errSyntaxWarning, -1, "Invalid or missing YStep in pattern"); + } + resDictA = dict->lookup("Resources"); + if (!resDictA.isDict()) { + error(errSyntaxWarning, -1, "Invalid or missing Resources in pattern"); + } + matrixA[0] = 1; + matrixA[1] = 0; + matrixA[2] = 0; + matrixA[3] = 1; + matrixA[4] = 0; + matrixA[5] = 0; + obj1 = dict->lookup("Matrix"); + if (obj1.isArray() && obj1.arrayGetLength() == 6) { + for (i = 0; i < 6; ++i) { + Object obj2 = obj1.arrayGet(i); + if (obj2.isNum()) { + matrixA[i] = obj2.getNum(); + } + } + } + + return new GfxTilingPattern(paintTypeA, tilingTypeA, bboxA, xStepA, yStepA, &resDictA, matrixA, patObj, patternRefNum); +} + +GfxTilingPattern::GfxTilingPattern(int paintTypeA, int tilingTypeA, const double *bboxA, double xStepA, double yStepA, const Object *resDictA, const double *matrixA, const Object *contentStreamA, int patternRefNumA) + : GfxPattern(1, patternRefNumA) +{ + int i; + + paintType = paintTypeA; + tilingType = tilingTypeA; + for (i = 0; i < 4; ++i) { + bbox[i] = bboxA[i]; + } + xStep = xStepA; + yStep = yStepA; + resDict = resDictA->copy(); + for (i = 0; i < 6; ++i) { + matrix[i] = matrixA[i]; + } + contentStream = contentStreamA->copy(); +} + +GfxTilingPattern::~GfxTilingPattern() { } + +GfxPattern *GfxTilingPattern::copy() const +{ + return new GfxTilingPattern(paintType, tilingType, bbox, xStep, yStep, &resDict, matrix, &contentStream, getPatternRefNum()); +} + +//------------------------------------------------------------------------ +// GfxShadingPattern +//------------------------------------------------------------------------ + +GfxShadingPattern *GfxShadingPattern::parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state, int patternRefNum) +{ + Dict *dict; + GfxShading *shadingA; + double matrixA[6]; + Object obj1; + int i; + + if (!patObj->isDict()) { + return nullptr; + } + dict = patObj->getDict(); + + obj1 = dict->lookup("Shading"); + shadingA = GfxShading::parse(res, &obj1, out, state); + if (!shadingA) { + return nullptr; + } + + matrixA[0] = 1; + matrixA[1] = 0; + matrixA[2] = 0; + matrixA[3] = 1; + matrixA[4] = 0; + matrixA[5] = 0; + obj1 = dict->lookup("Matrix"); + if (obj1.isArray() && obj1.arrayGetLength() == 6) { + for (i = 0; i < 6; ++i) { + Object obj2 = obj1.arrayGet(i); + if (obj2.isNum()) { + matrixA[i] = obj2.getNum(); + } + } + } + + return new GfxShadingPattern(shadingA, matrixA, patternRefNum); +} + +GfxShadingPattern::GfxShadingPattern(GfxShading *shadingA, const double *matrixA, int patternRefNumA) : GfxPattern(2, patternRefNumA) +{ + int i; + + shading = shadingA; + for (i = 0; i < 6; ++i) { + matrix[i] = matrixA[i]; + } +} + +GfxShadingPattern::~GfxShadingPattern() +{ + delete shading; +} + +GfxPattern *GfxShadingPattern::copy() const +{ + return new GfxShadingPattern(shading->copy(), matrix, getPatternRefNum()); +} + +//------------------------------------------------------------------------ +// GfxShading +//------------------------------------------------------------------------ + +GfxShading::GfxShading(int typeA) +{ + type = typeA; + colorSpace = nullptr; +} + +GfxShading::GfxShading(const GfxShading *shading) +{ + int i; + + type = shading->type; + colorSpace = shading->colorSpace->copy(); + for (i = 0; i < gfxColorMaxComps; ++i) { + background.c[i] = shading->background.c[i]; + } + hasBackground = shading->hasBackground; + bbox_xMin = shading->bbox_xMin; + bbox_yMin = shading->bbox_yMin; + bbox_xMax = shading->bbox_xMax; + bbox_yMax = shading->bbox_yMax; + hasBBox = shading->hasBBox; +} + +GfxShading::~GfxShading() +{ + if (colorSpace) { + delete colorSpace; + } +} + +GfxShading *GfxShading::parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state) +{ + GfxShading *shading; + Dict *dict; + int typeA; + Object obj1; + + if (obj->isDict()) { + dict = obj->getDict(); + } else if (obj->isStream()) { + dict = obj->streamGetDict(); + } else { + return nullptr; + } + + obj1 = dict->lookup("ShadingType"); + if (!obj1.isInt()) { + error(errSyntaxWarning, -1, "Invalid ShadingType in shading dictionary"); + return nullptr; + } + typeA = obj1.getInt(); + + switch (typeA) { + case 1: + shading = GfxFunctionShading::parse(res, dict, out, state); + break; + case 2: + shading = GfxAxialShading::parse(res, dict, out, state); + break; + case 3: + shading = GfxRadialShading::parse(res, dict, out, state); + break; + case 4: + if (obj->isStream()) { + shading = GfxGouraudTriangleShading::parse(res, 4, dict, obj->getStream(), out, state); + } else { + error(errSyntaxWarning, -1, "Invalid Type 4 shading object"); + goto err1; + } + break; + case 5: + if (obj->isStream()) { + shading = GfxGouraudTriangleShading::parse(res, 5, dict, obj->getStream(), out, state); + } else { + error(errSyntaxWarning, -1, "Invalid Type 5 shading object"); + goto err1; + } + break; + case 6: + if (obj->isStream()) { + shading = GfxPatchMeshShading::parse(res, 6, dict, obj->getStream(), out, state); + } else { + error(errSyntaxWarning, -1, "Invalid Type 6 shading object"); + goto err1; + } + break; + case 7: + if (obj->isStream()) { + shading = GfxPatchMeshShading::parse(res, 7, dict, obj->getStream(), out, state); + } else { + error(errSyntaxWarning, -1, "Invalid Type 7 shading object"); + goto err1; + } + break; + default: + error(errSyntaxWarning, -1, "Unimplemented shading type {0:d}", typeA); + goto err1; + } + + return shading; + +err1: + return nullptr; +} + +bool GfxShading::init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) +{ + Object obj1; + int i; + + obj1 = dict->lookup("ColorSpace"); + if (!(colorSpace = GfxColorSpace::parse(res, &obj1, out, state))) { + error(errSyntaxWarning, -1, "Bad color space in shading dictionary"); + return false; + } + + for (i = 0; i < gfxColorMaxComps; ++i) { + background.c[i] = 0; + } + hasBackground = false; + obj1 = dict->lookup("Background"); + if (obj1.isArray()) { + if (obj1.arrayGetLength() == colorSpace->getNComps()) { + hasBackground = true; + for (i = 0; i < colorSpace->getNComps(); ++i) { + Object obj2 = obj1.arrayGet(i); + background.c[i] = dblToCol(obj2.getNum(&hasBackground)); + } + if (!hasBackground) { + error(errSyntaxWarning, -1, "Bad Background in shading dictionary"); + } + } else { + error(errSyntaxWarning, -1, "Bad Background in shading dictionary"); + } + } + + bbox_xMin = bbox_yMin = bbox_xMax = bbox_yMax = 0; + hasBBox = false; + obj1 = dict->lookup("BBox"); + if (obj1.isArray()) { + if (obj1.arrayGetLength() == 4) { + hasBBox = true; + bbox_xMin = obj1.arrayGet(0).getNum(&hasBBox); + bbox_yMin = obj1.arrayGet(1).getNum(&hasBBox); + bbox_xMax = obj1.arrayGet(2).getNum(&hasBBox); + bbox_yMax = obj1.arrayGet(3).getNum(&hasBBox); + if (!hasBBox) { + error(errSyntaxWarning, -1, "Bad BBox in shading dictionary (Values not numbers)"); + } + } else { + error(errSyntaxWarning, -1, "Bad BBox in shading dictionary"); + } + } + + return true; +} + +//------------------------------------------------------------------------ +// GfxFunctionShading +//------------------------------------------------------------------------ + +GfxFunctionShading::GfxFunctionShading(double x0A, double y0A, double x1A, double y1A, const double *matrixA, std::vector> &&funcsA) : GfxShading(1), funcs(std::move(funcsA)) +{ + x0 = x0A; + y0 = y0A; + x1 = x1A; + y1 = y1A; + for (int i = 0; i < 6; ++i) { + matrix[i] = matrixA[i]; + } +} + +GfxFunctionShading::GfxFunctionShading(const GfxFunctionShading *shading) : GfxShading(shading) +{ + x0 = shading->x0; + y0 = shading->y0; + x1 = shading->x1; + y1 = shading->y1; + for (int i = 0; i < 6; ++i) { + matrix[i] = shading->matrix[i]; + } + for (const auto &f : shading->funcs) { + funcs.emplace_back(f->copy()); + } +} + +GfxFunctionShading::~GfxFunctionShading() { } + +GfxFunctionShading *GfxFunctionShading::parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) +{ + GfxFunctionShading *shading; + double x0A, y0A, x1A, y1A; + double matrixA[6]; + std::vector> funcsA; + Object obj1; + int i; + + x0A = y0A = 0; + x1A = y1A = 1; + obj1 = dict->lookup("Domain"); + if (obj1.isArray() && obj1.arrayGetLength() == 4) { + bool decodeOk = true; + x0A = obj1.arrayGet(0).getNum(&decodeOk); + x1A = obj1.arrayGet(1).getNum(&decodeOk); + y0A = obj1.arrayGet(2).getNum(&decodeOk); + y1A = obj1.arrayGet(3).getNum(&decodeOk); + + if (!decodeOk) { + error(errSyntaxWarning, -1, "Invalid Domain array in function shading dictionary"); + return nullptr; + } + } + + matrixA[0] = 1; + matrixA[1] = 0; + matrixA[2] = 0; + matrixA[3] = 1; + matrixA[4] = 0; + matrixA[5] = 0; + obj1 = dict->lookup("Matrix"); + if (obj1.isArray() && obj1.arrayGetLength() == 6) { + bool decodeOk = true; + matrixA[0] = obj1.arrayGet(0).getNum(&decodeOk); + matrixA[1] = obj1.arrayGet(1).getNum(&decodeOk); + matrixA[2] = obj1.arrayGet(2).getNum(&decodeOk); + matrixA[3] = obj1.arrayGet(3).getNum(&decodeOk); + matrixA[4] = obj1.arrayGet(4).getNum(&decodeOk); + matrixA[5] = obj1.arrayGet(5).getNum(&decodeOk); + + if (!decodeOk) { + error(errSyntaxWarning, -1, "Invalid Matrix array in function shading dictionary"); + return nullptr; + } + } + + obj1 = dict->lookup("Function"); + if (obj1.isArray()) { + const int nFuncsA = obj1.arrayGetLength(); + if (nFuncsA > gfxColorMaxComps || nFuncsA <= 0) { + error(errSyntaxWarning, -1, "Invalid Function array in shading dictionary"); + return nullptr; + } + for (i = 0; i < nFuncsA; ++i) { + Object obj2 = obj1.arrayGet(i); + Function *f = Function::parse(&obj2); + if (!f) { + return nullptr; + } + funcsA.emplace_back(f); + } + } else { + Function *f = Function::parse(&obj1); + if (!f) { + return nullptr; + } + funcsA.emplace_back(f); + } + + shading = new GfxFunctionShading(x0A, y0A, x1A, y1A, matrixA, std::move(funcsA)); + if (!shading->init(res, dict, out, state)) { + delete shading; + return nullptr; + } + return shading; +} + +bool GfxFunctionShading::init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) +{ + const bool parentInit = GfxShading::init(res, dict, out, state); + if (!parentInit) { + return false; + } + + // funcs needs to be one of the two: + // * One function 2-in -> nComps-out + // * nComps functions 2-in -> 1-out + const int nComps = colorSpace->getNComps(); + const int nFuncs = funcs.size(); + if (nFuncs == 1) { + if (funcs[0]->getInputSize() != 2) { + error(errSyntaxWarning, -1, "GfxFunctionShading: function with input size != 2"); + return false; + } + if (funcs[0]->getOutputSize() != nComps) { + error(errSyntaxWarning, -1, "GfxFunctionShading: function with wrong output size"); + return false; + } + } else if (nFuncs == nComps) { + for (const std::unique_ptr &f : funcs) { + if (f->getInputSize() != 2) { + error(errSyntaxWarning, -1, "GfxFunctionShading: function with input size != 2"); + return false; + } + if (f->getOutputSize() != 1) { + error(errSyntaxWarning, -1, "GfxFunctionShading: function with wrong output size"); + return false; + } + } + } else { + return false; + } + + return true; +} + +GfxShading *GfxFunctionShading::copy() const +{ + return new GfxFunctionShading(this); +} + +void GfxFunctionShading::getColor(double x, double y, GfxColor *color) const +{ + double in[2], out[gfxColorMaxComps]; + + // NB: there can be one function with n outputs or n functions with + // one output each (where n = number of color components) + for (double &i : out) { + i = 0; + } + in[0] = x; + in[1] = y; + for (int i = 0; i < getNFuncs(); ++i) { + funcs[i]->transform(in, &out[i]); + } + for (int i = 0; i < gfxColorMaxComps; ++i) { + color->c[i] = dblToCol(out[i]); + } +} + +//------------------------------------------------------------------------ +// GfxUnivariateShading +//------------------------------------------------------------------------ + +GfxUnivariateShading::GfxUnivariateShading(int typeA, double t0A, double t1A, std::vector> &&funcsA, bool extend0A, bool extend1A) : GfxShading(typeA), funcs(std::move(funcsA)) +{ + t0 = t0A; + t1 = t1A; + extend0 = extend0A; + extend1 = extend1A; + + cacheSize = 0; + lastMatch = 0; + cacheBounds = nullptr; + cacheCoeff = nullptr; + cacheValues = nullptr; +} + +GfxUnivariateShading::GfxUnivariateShading(const GfxUnivariateShading *shading) : GfxShading(shading) +{ + t0 = shading->t0; + t1 = shading->t1; + for (const auto &f : shading->funcs) { + funcs.emplace_back(f->copy()); + } + extend0 = shading->extend0; + extend1 = shading->extend1; + + cacheSize = 0; + lastMatch = 0; + cacheBounds = nullptr; + cacheCoeff = nullptr; + cacheValues = nullptr; +} + +GfxUnivariateShading::~GfxUnivariateShading() +{ + gfree(cacheBounds); +} + +int GfxUnivariateShading::getColor(double t, GfxColor *color) +{ + double out[gfxColorMaxComps]; + + // NB: there can be one function with n outputs or n functions with + // one output each (where n = number of color components) + const int nComps = getNFuncs() * funcs[0]->getOutputSize(); + + if (cacheSize > 0) { + double x, ix, *l, *u, *upper; + + if (cacheBounds[lastMatch - 1] >= t) { + upper = std::lower_bound(cacheBounds, cacheBounds + lastMatch - 1, t); + lastMatch = static_cast(upper - cacheBounds); + lastMatch = std::min(std::max(1, lastMatch), cacheSize - 1); + } else if (cacheBounds[lastMatch] < t) { + upper = std::lower_bound(cacheBounds + lastMatch + 1, cacheBounds + cacheSize, t); + lastMatch = static_cast(upper - cacheBounds); + lastMatch = std::min(std::max(1, lastMatch), cacheSize - 1); + } + + x = (t - cacheBounds[lastMatch - 1]) * cacheCoeff[lastMatch]; + ix = 1.0 - x; + u = cacheValues + lastMatch * nComps; + l = u - nComps; + + for (int i = 0; i < nComps; ++i) { + out[i] = ix * l[i] + x * u[i]; + } + } else { + for (int i = 0; i < nComps; ++i) { + out[i] = 0; + } + for (int i = 0; i < getNFuncs(); ++i) { + funcs[i]->transform(&t, &out[i]); + } + } + + for (int i = 0; i < nComps; ++i) { + color->c[i] = dblToCol(out[i]); + } + return nComps; +} + +void GfxUnivariateShading::setupCache(const Matrix *ctm, double xMin, double yMin, double xMax, double yMax) +{ + double sMin, sMax, tMin, tMax, upperBound; + int i, j, nComps, maxSize; + + gfree(cacheBounds); + cacheBounds = nullptr; + cacheSize = 0; + + if (unlikely(getNFuncs() < 1)) { + return; + } + + // NB: there can be one function with n outputs or n functions with + // one output each (where n = number of color components) + nComps = getNFuncs() * funcs[0]->getOutputSize(); + + getParameterRange(&sMin, &sMax, xMin, yMin, xMax, yMax); + upperBound = ctm->norm() * getDistance(sMin, sMax); + maxSize = static_cast(ceil(upperBound)); + maxSize = std::max(maxSize, 2); + + { + double x[4], y[4]; + + ctm->transform(xMin, yMin, &x[0], &y[0]); + ctm->transform(xMax, yMin, &x[1], &y[1]); + ctm->transform(xMin, yMax, &x[2], &y[2]); + ctm->transform(xMax, yMax, &x[3], &y[3]); + + xMin = xMax = x[0]; + yMin = yMax = y[0]; + for (i = 1; i < 4; i++) { + xMin = std::min(xMin, x[i]); + yMin = std::min(yMin, y[i]); + xMax = std::max(xMax, x[i]); + yMax = std::max(yMax, y[i]); + } + } + + if (maxSize > (xMax - xMin) * (yMax - yMin)) { + return; + } + + if (t0 < t1) { + tMin = t0 + sMin * (t1 - t0); + tMax = t0 + sMax * (t1 - t0); + } else { + tMin = t0 + sMax * (t1 - t0); + tMax = t0 + sMin * (t1 - t0); + } + + cacheBounds = (double *)gmallocn_checkoverflow(maxSize, sizeof(double) * (nComps + 2)); + if (unlikely(!cacheBounds)) { + return; + } + cacheCoeff = cacheBounds + maxSize; + cacheValues = cacheCoeff + maxSize; + + if (cacheSize != 0) { + for (j = 0; j < cacheSize; ++j) { + cacheCoeff[j] = 1 / (cacheBounds[j + 1] - cacheBounds[j]); + } + } else if (tMax != tMin) { + double step = (tMax - tMin) / (maxSize - 1); + double coeff = (maxSize - 1) / (tMax - tMin); + + cacheSize = maxSize; + + for (j = 0; j < cacheSize; ++j) { + cacheBounds[j] = tMin + j * step; + cacheCoeff[j] = coeff; + + for (i = 0; i < nComps; ++i) { + cacheValues[j * nComps + i] = 0; + } + for (i = 0; i < getNFuncs(); ++i) { + funcs[i]->transform(&cacheBounds[j], &cacheValues[j * nComps + i]); + } + } + } + + lastMatch = 1; +} + +bool GfxUnivariateShading::init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) +{ + const bool parentInit = GfxShading::init(res, dict, out, state); + if (!parentInit) { + return false; + } + + // funcs needs to be one of the two: + // * One function 1-in -> nComps-out + // * nComps functions 1-in -> 1-out + const int nComps = colorSpace->getNComps(); + const int nFuncs = funcs.size(); + if (nFuncs == 1) { + if (funcs[0]->getInputSize() != 1) { + error(errSyntaxWarning, -1, "GfxUnivariateShading: function with input size != 2"); + return false; + } + if (funcs[0]->getOutputSize() != nComps) { + error(errSyntaxWarning, -1, "GfxUnivariateShading: function with wrong output size"); + return false; + } + } else if (nFuncs == nComps) { + for (const std::unique_ptr &f : funcs) { + if (f->getInputSize() != 1) { + error(errSyntaxWarning, -1, "GfxUnivariateShading: function with input size != 2"); + return false; + } + if (f->getOutputSize() != 1) { + error(errSyntaxWarning, -1, "GfxUnivariateShading: function with wrong output size"); + return false; + } + } + } else { + return false; + } + + return true; +} + +//------------------------------------------------------------------------ +// GfxAxialShading +//------------------------------------------------------------------------ + +GfxAxialShading::GfxAxialShading(double x0A, double y0A, double x1A, double y1A, double t0A, double t1A, std::vector> &&funcsA, bool extend0A, bool extend1A) + : GfxUnivariateShading(2, t0A, t1A, std::move(funcsA), extend0A, extend1A) +{ + x0 = x0A; + y0 = y0A; + x1 = x1A; + y1 = y1A; +} + +GfxAxialShading::GfxAxialShading(const GfxAxialShading *shading) : GfxUnivariateShading(shading) +{ + x0 = shading->x0; + y0 = shading->y0; + x1 = shading->x1; + y1 = shading->y1; +} + +GfxAxialShading::~GfxAxialShading() { } + +GfxAxialShading *GfxAxialShading::parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) +{ + GfxAxialShading *shading; + double x0A, y0A, x1A, y1A; + double t0A, t1A; + std::vector> funcsA; + bool extend0A, extend1A; + Object obj1; + + x0A = y0A = x1A = y1A = 0; + obj1 = dict->lookup("Coords"); + if (obj1.isArray() && obj1.arrayGetLength() == 4) { + x0A = obj1.arrayGet(0).getNumWithDefaultValue(0); + y0A = obj1.arrayGet(1).getNumWithDefaultValue(0); + x1A = obj1.arrayGet(2).getNumWithDefaultValue(0); + y1A = obj1.arrayGet(3).getNumWithDefaultValue(0); + } else { + error(errSyntaxWarning, -1, "Missing or invalid Coords in shading dictionary"); + return nullptr; + } + + t0A = 0; + t1A = 1; + obj1 = dict->lookup("Domain"); + if (obj1.isArray() && obj1.arrayGetLength() == 2) { + t0A = obj1.arrayGet(0).getNumWithDefaultValue(0); + t1A = obj1.arrayGet(1).getNumWithDefaultValue(1); + } + + obj1 = dict->lookup("Function"); + if (obj1.isArray()) { + const int nFuncsA = obj1.arrayGetLength(); + if (nFuncsA > gfxColorMaxComps || nFuncsA == 0) { + error(errSyntaxWarning, -1, "Invalid Function array in shading dictionary"); + return nullptr; + } + for (int i = 0; i < nFuncsA; ++i) { + Object obj2 = obj1.arrayGet(i); + Function *f = Function::parse(&obj2); + if (!f) { + return nullptr; + } + funcsA.emplace_back(f); + } + } else { + Function *f = Function::parse(&obj1); + if (!f) { + return nullptr; + } + funcsA.emplace_back(f); + } + + extend0A = extend1A = false; + obj1 = dict->lookup("Extend"); + if (obj1.isArray() && obj1.arrayGetLength() == 2) { + Object obj2 = obj1.arrayGet(0); + if (obj2.isBool()) { + extend0A = obj2.getBool(); + } else { + error(errSyntaxWarning, -1, "Invalid axial shading extend (0)"); + } + obj2 = obj1.arrayGet(1); + if (obj2.isBool()) { + extend1A = obj2.getBool(); + } else { + error(errSyntaxWarning, -1, "Invalid axial shading extend (1)"); + } + } + + shading = new GfxAxialShading(x0A, y0A, x1A, y1A, t0A, t1A, std::move(funcsA), extend0A, extend1A); + if (!shading->init(res, dict, out, state)) { + delete shading; + shading = nullptr; + } + return shading; +} + +GfxShading *GfxAxialShading::copy() const +{ + return new GfxAxialShading(this); +} + +double GfxAxialShading::getDistance(double sMin, double sMax) const +{ + double xMin, yMin, xMax, yMax; + + xMin = x0 + sMin * (x1 - x0); + yMin = y0 + sMin * (y1 - y0); + xMax = x0 + sMax * (x1 - x0); + yMax = y0 + sMax * (y1 - y0); + + return hypot(xMax - xMin, yMax - yMin); +} + +void GfxAxialShading::getParameterRange(double *lower, double *upper, double xMin, double yMin, double xMax, double yMax) +{ + double pdx, pdy, invsqnorm, tdx, tdy, t, range[2]; + + // Linear gradients are orthogonal to the line passing through their + // extremes. Because of convexity, the parameter range can be + // computed as the convex hull (one the real line) of the parameter + // values of the 4 corners of the box. + // + // The parameter value t for a point (x,y) can be computed as: + // + // t = (p2 - p1) . (x,y) / |p2 - p1|^2 + // + // t0 is the t value for the top left corner + // tdx is the difference between left and right corners + // tdy is the difference between top and bottom corners + + pdx = x1 - x0; + pdy = y1 - y0; + const double invsqnorm_denominator = (pdx * pdx + pdy * pdy); + if (unlikely(invsqnorm_denominator == 0)) { + *lower = 0; + *upper = 0; + return; + } + invsqnorm = 1.0 / invsqnorm_denominator; + pdx *= invsqnorm; + pdy *= invsqnorm; + + t = (xMin - x0) * pdx + (yMin - y0) * pdy; + tdx = (xMax - xMin) * pdx; + tdy = (yMax - yMin) * pdy; + + // Because of the linearity of the t value, tdx can simply be added + // the t0 to move along the top edge. After this, *lower and *upper + // represent the parameter range for the top edge, so extending it + // to include the whole box simply requires adding tdy to the + // correct extreme. + + range[0] = range[1] = t; + if (tdx < 0) { + range[0] += tdx; + } else { + range[1] += tdx; + } + + if (tdy < 0) { + range[0] += tdy; + } else { + range[1] += tdy; + } + + *lower = std::max(0., std::min(1., range[0])); + *upper = std::max(0., std::min(1., range[1])); +} + +//------------------------------------------------------------------------ +// GfxRadialShading +//------------------------------------------------------------------------ + +#ifndef RADIAL_EPSILON +# define RADIAL_EPSILON (1. / 1024 / 1024) +#endif + +GfxRadialShading::GfxRadialShading(double x0A, double y0A, double r0A, double x1A, double y1A, double r1A, double t0A, double t1A, std::vector> &&funcsA, bool extend0A, bool extend1A) + : GfxUnivariateShading(3, t0A, t1A, std::move(funcsA), extend0A, extend1A) +{ + x0 = x0A; + y0 = y0A; + r0 = r0A; + x1 = x1A; + y1 = y1A; + r1 = r1A; +} + +GfxRadialShading::GfxRadialShading(const GfxRadialShading *shading) : GfxUnivariateShading(shading) +{ + x0 = shading->x0; + y0 = shading->y0; + r0 = shading->r0; + x1 = shading->x1; + y1 = shading->y1; + r1 = shading->r1; +} + +GfxRadialShading::~GfxRadialShading() { } + +GfxRadialShading *GfxRadialShading::parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) +{ + GfxRadialShading *shading; + double x0A, y0A, r0A, x1A, y1A, r1A; + double t0A, t1A; + std::vector> funcsA; + bool extend0A, extend1A; + Object obj1; + int i; + + x0A = y0A = r0A = x1A = y1A = r1A = 0; + obj1 = dict->lookup("Coords"); + if (obj1.isArray() && obj1.arrayGetLength() == 6) { + x0A = obj1.arrayGet(0).getNumWithDefaultValue(0); + y0A = obj1.arrayGet(1).getNumWithDefaultValue(0); + r0A = obj1.arrayGet(2).getNumWithDefaultValue(0); + x1A = obj1.arrayGet(3).getNumWithDefaultValue(0); + y1A = obj1.arrayGet(4).getNumWithDefaultValue(0); + r1A = obj1.arrayGet(5).getNumWithDefaultValue(0); + } else { + error(errSyntaxWarning, -1, "Missing or invalid Coords in shading dictionary"); + return nullptr; + } + + t0A = 0; + t1A = 1; + obj1 = dict->lookup("Domain"); + if (obj1.isArray() && obj1.arrayGetLength() == 2) { + t0A = obj1.arrayGet(0).getNumWithDefaultValue(0); + t1A = obj1.arrayGet(1).getNumWithDefaultValue(1); + } + + obj1 = dict->lookup("Function"); + if (obj1.isArray()) { + const int nFuncsA = obj1.arrayGetLength(); + if (nFuncsA > gfxColorMaxComps) { + error(errSyntaxWarning, -1, "Invalid Function array in shading dictionary"); + return nullptr; + } + for (i = 0; i < nFuncsA; ++i) { + Object obj2 = obj1.arrayGet(i); + Function *f = Function::parse(&obj2); + if (!f) { + return nullptr; + } + funcsA.emplace_back(f); + } + } else { + Function *f = Function::parse(&obj1); + if (!f) { + return nullptr; + } + funcsA.emplace_back(f); + } + + extend0A = extend1A = false; + obj1 = dict->lookup("Extend"); + if (obj1.isArray() && obj1.arrayGetLength() == 2) { + extend0A = obj1.arrayGet(0).getBoolWithDefaultValue(false); + extend1A = obj1.arrayGet(1).getBoolWithDefaultValue(false); + } + + shading = new GfxRadialShading(x0A, y0A, r0A, x1A, y1A, r1A, t0A, t1A, std::move(funcsA), extend0A, extend1A); + if (!shading->init(res, dict, out, state)) { + delete shading; + return nullptr; + } + return shading; +} + +GfxShading *GfxRadialShading::copy() const +{ + return new GfxRadialShading(this); +} + +double GfxRadialShading::getDistance(double sMin, double sMax) const +{ + double xMin, yMin, rMin, xMax, yMax, rMax; + + xMin = x0 + sMin * (x1 - x0); + yMin = y0 + sMin * (y1 - y0); + rMin = r0 + sMin * (r1 - r0); + + xMax = x0 + sMax * (x1 - x0); + yMax = y0 + sMax * (y1 - y0); + rMax = r0 + sMax * (r1 - r0); + + return hypot(xMax - xMin, yMax - yMin) + fabs(rMax - rMin); +} + +// extend range, adapted from cairo, radialExtendRange +static bool radialExtendRange(double range[2], double value, bool valid) +{ + if (!valid) { + range[0] = range[1] = value; + } else if (value < range[0]) { + range[0] = value; + } else if (value > range[1]) { + range[1] = value; + } + + return true; +} + +inline void radialEdge(double num, double den, double delta, double lower, double upper, double dr, double mindr, bool &valid, double *range) +{ + if (fabs(den) >= RADIAL_EPSILON) { + double t_edge, v; + t_edge = (num) / (den); + v = t_edge * (delta); + if (t_edge * dr >= mindr && (lower) <= v && v <= (upper)) { + valid = radialExtendRange(range, t_edge, valid); + } + } +} + +inline void radialCorner1(double x, double y, double &b, double dx, double dy, double cr, double dr, double mindr, bool &valid, double *range) +{ + b = (x)*dx + (y)*dy + cr * dr; + if (fabs(b) >= RADIAL_EPSILON) { + double t_corner; + double x2 = (x) * (x); + double y2 = (y) * (y); + double cr2 = (cr) * (cr); + double c = x2 + y2 - cr2; + + t_corner = 0.5 * c / b; + if (t_corner * dr >= mindr) { + valid = radialExtendRange(range, t_corner, valid); + } + } +} + +inline void radialCorner2(double x, double y, double a, double &b, double &c, double &d, double dx, double dy, double cr, double inva, double dr, double mindr, bool &valid, double *range) +{ + b = (x)*dx + (y)*dy + cr * dr; + c = (x) * (x) + (y) * (y)-cr * cr; + d = b * b - a * c; + if (d >= 0) { + double t_corner; + + d = sqrt(d); + t_corner = (b + d) * inva; + if (t_corner * dr >= mindr) { + valid = radialExtendRange(range, t_corner, valid); + } + t_corner = (b - d) * inva; + if (t_corner * dr >= mindr) { + valid = radialExtendRange(range, t_corner, valid); + } + } +} +void GfxRadialShading::getParameterRange(double *lower, double *upper, double xMin, double yMin, double xMax, double yMax) +{ + double cx, cy, cr, dx, dy, dr; + double a, x_focus, y_focus; + double mindr, minx, miny, maxx, maxy; + double range[2]; + bool valid; + + // A radial pattern is considered degenerate if it can be + // represented as a solid or clear pattern. This corresponds to one + // of the two cases: + // + // 1) The radii are both very small: + // |dr| < FLT_EPSILON && min (r0, r1) < FLT_EPSILON + // + // 2) The two circles have about the same radius and are very + // close to each other (approximately a cylinder gradient that + // doesn't move with the parameter): + // |dr| < FLT_EPSILON && max (|dx|, |dy|) < 2 * FLT_EPSILON + + if (xMin >= xMax || yMin >= yMax || (fabs(r0 - r1) < RADIAL_EPSILON && (std::min(r0, r1) < RADIAL_EPSILON || std::max(fabs(x0 - x1), fabs(y0 - y1)) < 2 * RADIAL_EPSILON))) { + *lower = *upper = 0; + return; + } + + range[0] = range[1] = 0; + valid = false; + + x_focus = y_focus = 0; // silence gcc + + cx = x0; + cy = y0; + cr = r0; + dx = x1 - cx; + dy = y1 - cy; + dr = r1 - cr; + + // translate by -(cx, cy) to simplify computations + xMin -= cx; + yMin -= cy; + xMax -= cx; + yMax -= cy; + + // enlarge boundaries slightly to avoid rounding problems in the + // parameter range computation + xMin -= RADIAL_EPSILON; + yMin -= RADIAL_EPSILON; + xMax += RADIAL_EPSILON; + yMax += RADIAL_EPSILON; + + // enlarge boundaries even more to avoid rounding problems when + // testing if a point belongs to the box + minx = xMin - RADIAL_EPSILON; + miny = yMin - RADIAL_EPSILON; + maxx = xMax + RADIAL_EPSILON; + maxy = yMax + RADIAL_EPSILON; + + // we dont' allow negative radiuses, so we will be checking that + // t*dr >= mindr to consider t valid + mindr = -(cr + RADIAL_EPSILON); + + // After the previous transformations, the start circle is centered + // in the origin and has radius cr. A 1-unit change in the t + // parameter corresponds to dx,dy,dr changes in the x,y,r of the + // circle (center coordinates, radius). + // + // To compute the minimum range needed to correctly draw the + // pattern, we start with an empty range and extend it to include + // the circles touching the bounding box or within it. + + // Focus, the point where the circle has radius == 0. + // + // r = cr + t * dr = 0 + // t = -cr / dr + // + // If the radius is constant (dr == 0) there is no focus (the + // gradient represents a cylinder instead of a cone). + if (fabs(dr) >= RADIAL_EPSILON) { + double t_focus; + + t_focus = -cr / dr; + x_focus = t_focus * dx; + y_focus = t_focus * dy; + if (minx <= x_focus && x_focus <= maxx && miny <= y_focus && y_focus <= maxy) { + valid = radialExtendRange(range, t_focus, valid); + } + } + + // Circles externally tangent to box edges. + // + // All circles have center in (dx, dy) * t + // + // If the circle is tangent to the line defined by the edge of the + // box, then at least one of the following holds true: + // + // (dx*t) + (cr + dr*t) == x0 (left edge) + // (dx*t) - (cr + dr*t) == x1 (right edge) + // (dy*t) + (cr + dr*t) == y0 (top edge) + // (dy*t) - (cr + dr*t) == y1 (bottom edge) + // + // The solution is only valid if the tangent point is actually on + // the edge, i.e. if its y coordinate is in [y0,y1] for left/right + // edges and if its x coordinate is in [x0,x1] for top/bottom edges. + // + // For the first equation: + // + // (dx + dr) * t = x0 - cr + // t = (x0 - cr) / (dx + dr) + // y = dy * t + // + // in the code this becomes: + // + // t_edge = (num) / (den) + // v = (delta) * t_edge + // + // If the denominator in t is 0, the pattern is tangent to a line + // parallel to the edge under examination. The corner-case where the + // boundary line is the same as the edge is handled by the focus + // point case and/or by the a==0 case. + + // circles tangent (externally) to left/right/top/bottom edge + radialEdge(xMin - cr, dx + dr, dy, miny, maxy, dr, mindr, valid, range); + radialEdge(xMax + cr, dx - dr, dy, miny, maxy, dr, mindr, valid, range); + radialEdge(yMin - cr, dy + dr, dx, minx, maxx, dr, mindr, valid, range); + radialEdge(yMax + cr, dy - dr, dx, minx, maxx, dr, mindr, valid, range); + + // Circles passing through a corner. + // + // A circle passing through the point (x,y) satisfies: + // + // (x-t*dx)^2 + (y-t*dy)^2 == (cr + t*dr)^2 + // + // If we set: + // a = dx^2 + dy^2 - dr^2 + // b = x*dx + y*dy + cr*dr + // c = x^2 + y^2 - cr^2 + // we have: + // a*t^2 - 2*b*t + c == 0 + + a = dx * dx + dy * dy - dr * dr; + if (fabs(a) < RADIAL_EPSILON * RADIAL_EPSILON) { + double b; + + // Ensure that gradients with both a and dr small are + // considered degenerate. + // The floating point version of the degeneracy test implemented + // in _radial_pattern_is_degenerate() is: + // + // 1) The circles are practically the same size: + // |dr| < RADIAL_EPSILON + // AND + // 2a) The circles are both very small: + // min (r0, r1) < RADIAL_EPSILON + // OR + // 2b) The circles are very close to each other: + // max (|dx|, |dy|) < 2 * RADIAL_EPSILON + // + // Assuming that the gradient is not degenerate, we want to + // show that |a| < RADIAL_EPSILON^2 implies |dr| >= RADIAL_EPSILON. + // + // If the gradient is not degenerate yet it has |dr| < + // RADIAL_EPSILON, (2b) is false, thus: + // + // max (|dx|, |dy|) >= 2*RADIAL_EPSILON + // which implies: + // 4*RADIAL_EPSILON^2 <= max (|dx|, |dy|)^2 <= dx^2 + dy^2 + // + // From the definition of a, we get: + // a = dx^2 + dy^2 - dr^2 < RADIAL_EPSILON^2 + // dx^2 + dy^2 - RADIAL_EPSILON^2 < dr^2 + // 3*RADIAL_EPSILON^2 < dr^2 + // + // which is inconsistent with the hypotheses, thus |dr| < + // RADIAL_EPSILON is false or the gradient is degenerate. + + assert(fabs(dr) >= RADIAL_EPSILON); + + // If a == 0, all the circles are tangent to a line in the + // focus point. If this line is within the box extents, we + // should add the circle with infinite radius, but this would + // make the range unbounded. We will be limiting the range to + // [0,1] anyway, so we simply add the biggest legitimate + // circle (it happens for 0 or for 1). + if (dr < 0) { + valid = radialExtendRange(range, 0, valid); + } else { + valid = radialExtendRange(range, 1, valid); + } + + // Nondegenerate, nonlimit circles passing through the corners. + // + // a == 0 && a*t^2 - 2*b*t + c == 0 + // + // t = c / (2*b) + // + // The b == 0 case has just been handled, so we only have to + // compute this if b != 0. + + // circles touching each corner + radialCorner1(xMin, yMin, b, dx, dy, cr, dr, mindr, valid, range); + radialCorner1(xMin, yMax, b, dx, dy, cr, dr, mindr, valid, range); + radialCorner1(xMax, yMin, b, dx, dy, cr, dr, mindr, valid, range); + radialCorner1(xMax, yMax, b, dx, dy, cr, dr, mindr, valid, range); + } else { + double inva, b, c, d; + + inva = 1 / a; + + // Nondegenerate, nonlimit circles passing through the corners. + // + // a != 0 && a*t^2 - 2*b*t + c == 0 + // + // t = (b +- sqrt (b*b - a*c)) / a + // + // If the argument of sqrt() is negative, then no circle + // passes through the corner. + + // circles touching each corner + radialCorner2(xMin, yMin, a, b, c, d, dx, dy, cr, inva, dr, mindr, valid, range); + radialCorner2(xMin, yMax, a, b, c, d, dx, dy, cr, inva, dr, mindr, valid, range); + radialCorner2(xMax, yMin, a, b, c, d, dx, dy, cr, inva, dr, mindr, valid, range); + radialCorner2(xMax, yMax, a, b, c, d, dx, dy, cr, inva, dr, mindr, valid, range); + } + + *lower = std::max(0., std::min(1., range[0])); + *upper = std::max(0., std::min(1., range[1])); +} + +//------------------------------------------------------------------------ +// GfxShadingBitBuf +//------------------------------------------------------------------------ + +class GfxShadingBitBuf +{ +public: + explicit GfxShadingBitBuf(Stream *strA); + ~GfxShadingBitBuf(); + GfxShadingBitBuf(const GfxShadingBitBuf &) = delete; + GfxShadingBitBuf &operator=(const GfxShadingBitBuf &) = delete; + bool getBits(int n, unsigned int *val); + void flushBits(); + +private: + Stream *str; + int bitBuf; + int nBits; +}; + +GfxShadingBitBuf::GfxShadingBitBuf(Stream *strA) +{ + str = strA; + str->reset(); + bitBuf = 0; + nBits = 0; +} + +GfxShadingBitBuf::~GfxShadingBitBuf() +{ + str->close(); +} + +bool GfxShadingBitBuf::getBits(int n, unsigned int *val) +{ + unsigned int x; + + if (nBits >= n) { + x = (bitBuf >> (nBits - n)) & ((1 << n) - 1); + nBits -= n; + } else { + x = 0; + if (nBits > 0) { + x = bitBuf & ((1 << nBits) - 1); + n -= nBits; + nBits = 0; + } + while (n > 0) { + if ((bitBuf = str->getChar()) == EOF) { + nBits = 0; + return false; + } + if (n >= 8) { + x = (x << 8) | bitBuf; + n -= 8; + } else { + x = (x << n) | (bitBuf >> (8 - n)); + nBits = 8 - n; + n = 0; + } + } + } + *val = x; + return true; +} + +void GfxShadingBitBuf::flushBits() +{ + bitBuf = 0; + nBits = 0; +} + +//------------------------------------------------------------------------ +// GfxGouraudTriangleShading +//------------------------------------------------------------------------ + +GfxGouraudTriangleShading::GfxGouraudTriangleShading(int typeA, GfxGouraudVertex *verticesA, int nVerticesA, int (*trianglesA)[3], int nTrianglesA, std::vector> &&funcsA) + : GfxShading(typeA), funcs(std::move(funcsA)) +{ + vertices = verticesA; + nVertices = nVerticesA; + triangles = trianglesA; + nTriangles = nTrianglesA; +} + +GfxGouraudTriangleShading::GfxGouraudTriangleShading(const GfxGouraudTriangleShading *shading) : GfxShading(shading) +{ + nVertices = shading->nVertices; + vertices = (GfxGouraudVertex *)gmallocn(nVertices, sizeof(GfxGouraudVertex)); + memcpy(vertices, shading->vertices, nVertices * sizeof(GfxGouraudVertex)); + nTriangles = shading->nTriangles; + triangles = (int(*)[3])gmallocn(nTriangles * 3, sizeof(int)); + memcpy(triangles, shading->triangles, nTriangles * 3 * sizeof(int)); + for (const auto &f : shading->funcs) { + funcs.emplace_back(f->copy()); + } +} + +GfxGouraudTriangleShading::~GfxGouraudTriangleShading() +{ + gfree(vertices); + gfree(triangles); +} + +GfxGouraudTriangleShading *GfxGouraudTriangleShading::parse(GfxResources *res, int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *gfxState) +{ + GfxGouraudTriangleShading *shading; + std::vector> funcsA; + int coordBits, compBits, flagBits, vertsPerRow, nRows; + double xMin, xMax, yMin, yMax; + double cMin[gfxColorMaxComps], cMax[gfxColorMaxComps]; + double xMul, yMul; + double cMul[gfxColorMaxComps]; + GfxGouraudVertex *verticesA; + int(*trianglesA)[3]; + int nComps, nVerticesA, nTrianglesA, vertSize, triSize; + unsigned int x, y, flag; + unsigned int c[gfxColorMaxComps]; + GfxShadingBitBuf *bitBuf; + Object obj1; + int i, j, k, state; + + obj1 = dict->lookup("BitsPerCoordinate"); + if (obj1.isInt()) { + coordBits = obj1.getInt(); + } else { + error(errSyntaxWarning, -1, "Missing or invalid BitsPerCoordinate in shading dictionary"); + return nullptr; + } + if (unlikely(coordBits <= 0)) { + error(errSyntaxWarning, -1, "Invalid BitsPerCoordinate in shading dictionary"); + return nullptr; + } + obj1 = dict->lookup("BitsPerComponent"); + if (obj1.isInt()) { + compBits = obj1.getInt(); + } else { + error(errSyntaxWarning, -1, "Missing or invalid BitsPerComponent in shading dictionary"); + return nullptr; + } + if (unlikely(compBits <= 0 || compBits > 31)) { + error(errSyntaxWarning, -1, "Invalid BitsPerComponent in shading dictionary"); + return nullptr; + } + flagBits = vertsPerRow = 0; // make gcc happy + if (typeA == 4) { + obj1 = dict->lookup("BitsPerFlag"); + if (obj1.isInt()) { + flagBits = obj1.getInt(); + } else { + error(errSyntaxWarning, -1, "Missing or invalid BitsPerFlag in shading dictionary"); + return nullptr; + } + } else { + obj1 = dict->lookup("VerticesPerRow"); + if (obj1.isInt()) { + vertsPerRow = obj1.getInt(); + } else { + error(errSyntaxWarning, -1, "Missing or invalid VerticesPerRow in shading dictionary"); + return nullptr; + } + } + obj1 = dict->lookup("Decode"); + if (obj1.isArray() && obj1.arrayGetLength() >= 6) { + bool decodeOk = true; + xMin = obj1.arrayGet(0).getNum(&decodeOk); + xMax = obj1.arrayGet(1).getNum(&decodeOk); + xMul = (xMax - xMin) / (pow(2.0, coordBits) - 1); + yMin = obj1.arrayGet(2).getNum(&decodeOk); + yMax = obj1.arrayGet(3).getNum(&decodeOk); + yMul = (yMax - yMin) / (pow(2.0, coordBits) - 1); + for (i = 0; 5 + 2 * i < obj1.arrayGetLength() && i < gfxColorMaxComps; ++i) { + cMin[i] = obj1.arrayGet(4 + 2 * i).getNum(&decodeOk); + cMax[i] = obj1.arrayGet(5 + 2 * i).getNum(&decodeOk); + cMul[i] = (cMax[i] - cMin[i]) / (double)((1u << compBits) - 1); + } + nComps = i; + + if (!decodeOk) { + error(errSyntaxWarning, -1, "Missing or invalid Decode array in shading dictionary"); + return nullptr; + } + } else { + error(errSyntaxWarning, -1, "Missing or invalid Decode array in shading dictionary"); + return nullptr; + } + + obj1 = dict->lookup("Function"); + if (!obj1.isNull()) { + if (obj1.isArray()) { + const int nFuncsA = obj1.arrayGetLength(); + if (nFuncsA > gfxColorMaxComps) { + error(errSyntaxWarning, -1, "Invalid Function array in shading dictionary"); + return nullptr; + } + for (i = 0; i < nFuncsA; ++i) { + Object obj2 = obj1.arrayGet(i); + Function *f = Function::parse(&obj2); + if (!f) { + return nullptr; + } + funcsA.emplace_back(f); + } + } else { + Function *f = Function::parse(&obj1); + if (!f) { + return nullptr; + } + funcsA.emplace_back(f); + } + } + + nVerticesA = nTrianglesA = 0; + verticesA = nullptr; + trianglesA = nullptr; + vertSize = triSize = 0; + state = 0; + flag = 0; // make gcc happy + bitBuf = new GfxShadingBitBuf(str); + while (true) { + if (typeA == 4) { + if (!bitBuf->getBits(flagBits, &flag)) { + break; + } + } + if (!bitBuf->getBits(coordBits, &x) || !bitBuf->getBits(coordBits, &y)) { + break; + } + for (i = 0; i < nComps; ++i) { + if (!bitBuf->getBits(compBits, &c[i])) { + break; + } + } + if (i < nComps) { + break; + } + if (nVerticesA == vertSize) { + int oldVertSize = vertSize; + vertSize = (vertSize == 0) ? 16 : 2 * vertSize; + verticesA = (GfxGouraudVertex *)greallocn_checkoverflow(verticesA, vertSize, sizeof(GfxGouraudVertex)); + if (unlikely(!verticesA)) { + error(errSyntaxWarning, -1, "GfxGouraudTriangleShading::parse: vertices size overflow"); + gfree(trianglesA); + delete bitBuf; + return nullptr; + } + memset(verticesA + oldVertSize, 0, (vertSize - oldVertSize) * sizeof(GfxGouraudVertex)); + } + verticesA[nVerticesA].x = xMin + xMul * (double)x; + verticesA[nVerticesA].y = yMin + yMul * (double)y; + for (i = 0; i < nComps; ++i) { + verticesA[nVerticesA].color.c[i] = dblToCol(cMin[i] + cMul[i] * (double)c[i]); + } + ++nVerticesA; + bitBuf->flushBits(); + if (typeA == 4) { + if (state == 0 || state == 1) { + ++state; + } else if (state == 2 || flag > 0) { + if (nTrianglesA == triSize) { + triSize = (triSize == 0) ? 16 : 2 * triSize; + trianglesA = (int(*)[3])greallocn(trianglesA, triSize * 3, sizeof(int)); + } + if (state == 2) { + trianglesA[nTrianglesA][0] = nVerticesA - 3; + trianglesA[nTrianglesA][1] = nVerticesA - 2; + trianglesA[nTrianglesA][2] = nVerticesA - 1; + ++state; + } else if (flag == 1) { + trianglesA[nTrianglesA][0] = trianglesA[nTrianglesA - 1][1]; + trianglesA[nTrianglesA][1] = trianglesA[nTrianglesA - 1][2]; + trianglesA[nTrianglesA][2] = nVerticesA - 1; + } else { // flag == 2 + trianglesA[nTrianglesA][0] = trianglesA[nTrianglesA - 1][0]; + trianglesA[nTrianglesA][1] = trianglesA[nTrianglesA - 1][2]; + trianglesA[nTrianglesA][2] = nVerticesA - 1; + } + ++nTrianglesA; + } else { // state == 3 && flag == 0 + state = 1; + } + } + } + delete bitBuf; + if (typeA == 5 && nVerticesA > 0 && vertsPerRow > 0) { + nRows = nVerticesA / vertsPerRow; + nTrianglesA = (nRows - 1) * 2 * (vertsPerRow - 1); + trianglesA = (int(*)[3])gmallocn_checkoverflow(nTrianglesA * 3, sizeof(int)); + if (unlikely(!trianglesA)) { + gfree(verticesA); + return nullptr; + } + k = 0; + for (i = 0; i < nRows - 1; ++i) { + for (j = 0; j < vertsPerRow - 1; ++j) { + trianglesA[k][0] = i * vertsPerRow + j; + trianglesA[k][1] = i * vertsPerRow + j + 1; + trianglesA[k][2] = (i + 1) * vertsPerRow + j; + ++k; + trianglesA[k][0] = i * vertsPerRow + j + 1; + trianglesA[k][1] = (i + 1) * vertsPerRow + j; + trianglesA[k][2] = (i + 1) * vertsPerRow + j + 1; + ++k; + } + } + } + + shading = new GfxGouraudTriangleShading(typeA, verticesA, nVerticesA, trianglesA, nTrianglesA, std::move(funcsA)); + if (!shading->init(res, dict, out, gfxState)) { + delete shading; + return nullptr; + } + return shading; +} + +bool GfxGouraudTriangleShading::init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) +{ + const bool parentInit = GfxShading::init(res, dict, out, state); + if (!parentInit) { + return false; + } + + // funcs needs to be one of the three: + // * One function 1-in -> nComps-out + // * nComps functions 1-in -> 1-out + // * empty + const int nComps = colorSpace->getNComps(); + const int nFuncs = funcs.size(); + if (nFuncs == 1) { + if (funcs[0]->getInputSize() != 1) { + error(errSyntaxWarning, -1, "GfxGouraudTriangleShading: function with input size != 2"); + return false; + } + if (funcs[0]->getOutputSize() != nComps) { + error(errSyntaxWarning, -1, "GfxGouraudTriangleShading: function with wrong output size"); + return false; + } + } else if (nFuncs == nComps) { + for (const std::unique_ptr &f : funcs) { + if (f->getInputSize() != 1) { + error(errSyntaxWarning, -1, "GfxGouraudTriangleShading: function with input size != 2"); + return false; + } + if (f->getOutputSize() != 1) { + error(errSyntaxWarning, -1, "GfxGouraudTriangleShading: function with wrong output size"); + return false; + } + } + } else if (nFuncs != 0) { + return false; + } + + return true; +} + +GfxShading *GfxGouraudTriangleShading::copy() const +{ + return new GfxGouraudTriangleShading(this); +} + +void GfxGouraudTriangleShading::getTriangle(int i, double *x0, double *y0, GfxColor *color0, double *x1, double *y1, GfxColor *color1, double *x2, double *y2, GfxColor *color2) +{ + int v; + + assert(!isParameterized()); + + v = triangles[i][0]; + *x0 = vertices[v].x; + *y0 = vertices[v].y; + *color0 = vertices[v].color; + v = triangles[i][1]; + *x1 = vertices[v].x; + *y1 = vertices[v].y; + *color1 = vertices[v].color; + v = triangles[i][2]; + *x2 = vertices[v].x; + *y2 = vertices[v].y; + *color2 = vertices[v].color; +} + +void GfxGouraudTriangleShading::getParameterizedColor(double t, GfxColor *color) const +{ + double out[gfxColorMaxComps]; + + for (unsigned int j = 0; j < funcs.size(); ++j) { + funcs[j]->transform(&t, &out[j]); + } + for (int j = 0; j < gfxColorMaxComps; ++j) { + color->c[j] = dblToCol(out[j]); + } +} + +void GfxGouraudTriangleShading::getTriangle(int i, double *x0, double *y0, double *color0, double *x1, double *y1, double *color1, double *x2, double *y2, double *color2) +{ + int v; + + assert(isParameterized()); + + v = triangles[i][0]; + if (likely(v >= 0 && v < nVertices)) { + *x0 = vertices[v].x; + *y0 = vertices[v].y; + *color0 = colToDbl(vertices[v].color.c[0]); + } + v = triangles[i][1]; + if (likely(v >= 0 && v < nVertices)) { + *x1 = vertices[v].x; + *y1 = vertices[v].y; + *color1 = colToDbl(vertices[v].color.c[0]); + } + v = triangles[i][2]; + if (likely(v >= 0 && v < nVertices)) { + *x2 = vertices[v].x; + *y2 = vertices[v].y; + *color2 = colToDbl(vertices[v].color.c[0]); + } +} + +//------------------------------------------------------------------------ +// GfxPatchMeshShading +//------------------------------------------------------------------------ + +GfxPatchMeshShading::GfxPatchMeshShading(int typeA, GfxPatch *patchesA, int nPatchesA, std::vector> &&funcsA) : GfxShading(typeA), funcs(std::move(funcsA)) +{ + patches = patchesA; + nPatches = nPatchesA; +} + +GfxPatchMeshShading::GfxPatchMeshShading(const GfxPatchMeshShading *shading) : GfxShading(shading) +{ + nPatches = shading->nPatches; + patches = (GfxPatch *)gmallocn(nPatches, sizeof(GfxPatch)); + memcpy(patches, shading->patches, nPatches * sizeof(GfxPatch)); + for (const auto &f : shading->funcs) { + funcs.emplace_back(f->copy()); + } +} + +GfxPatchMeshShading::~GfxPatchMeshShading() +{ + gfree(patches); +} + +GfxPatchMeshShading *GfxPatchMeshShading::parse(GfxResources *res, int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state) +{ + GfxPatchMeshShading *shading; + std::vector> funcsA; + int coordBits, compBits, flagBits; + double xMin, xMax, yMin, yMax; + double cMin[gfxColorMaxComps], cMax[gfxColorMaxComps]; + double xMul, yMul; + double cMul[gfxColorMaxComps]; + GfxPatch *patchesA, *p; + int nComps, nPatchesA, patchesSize, nPts, nColors; + unsigned int flag; + double x[16], y[16]; + unsigned int xi, yi; + double c[4][gfxColorMaxComps]; + unsigned int ci; + Object obj1; + int i, j; + + obj1 = dict->lookup("BitsPerCoordinate"); + if (obj1.isInt()) { + coordBits = obj1.getInt(); + } else { + error(errSyntaxWarning, -1, "Missing or invalid BitsPerCoordinate in shading dictionary"); + return nullptr; + } + if (unlikely(coordBits <= 0)) { + error(errSyntaxWarning, -1, "Invalid BitsPerCoordinate in shading dictionary"); + return nullptr; + } + obj1 = dict->lookup("BitsPerComponent"); + if (obj1.isInt()) { + compBits = obj1.getInt(); + } else { + error(errSyntaxWarning, -1, "Missing or invalid BitsPerComponent in shading dictionary"); + return nullptr; + } + if (unlikely(compBits <= 0 || compBits > 31)) { + error(errSyntaxWarning, -1, "Invalid BitsPerComponent in shading dictionary"); + return nullptr; + } + obj1 = dict->lookup("BitsPerFlag"); + if (obj1.isInt()) { + flagBits = obj1.getInt(); + } else { + error(errSyntaxWarning, -1, "Missing or invalid BitsPerFlag in shading dictionary"); + return nullptr; + } + obj1 = dict->lookup("Decode"); + if (obj1.isArray() && obj1.arrayGetLength() >= 6) { + bool decodeOk = true; + xMin = obj1.arrayGet(0).getNum(&decodeOk); + xMax = obj1.arrayGet(1).getNum(&decodeOk); + xMul = (xMax - xMin) / (pow(2.0, coordBits) - 1); + yMin = obj1.arrayGet(2).getNum(&decodeOk); + yMax = obj1.arrayGet(3).getNum(&decodeOk); + yMul = (yMax - yMin) / (pow(2.0, coordBits) - 1); + for (i = 0; 5 + 2 * i < obj1.arrayGetLength() && i < gfxColorMaxComps; ++i) { + cMin[i] = obj1.arrayGet(4 + 2 * i).getNum(&decodeOk); + cMax[i] = obj1.arrayGet(5 + 2 * i).getNum(&decodeOk); + cMul[i] = (cMax[i] - cMin[i]) / (double)((1u << compBits) - 1); + } + nComps = i; + + if (!decodeOk) { + error(errSyntaxWarning, -1, "Missing or invalid Decode array in shading dictionary"); + return nullptr; + } + } else { + error(errSyntaxWarning, -1, "Missing or invalid Decode array in shading dictionary"); + return nullptr; + } + + obj1 = dict->lookup("Function"); + if (!obj1.isNull()) { + if (obj1.isArray()) { + const int nFuncsA = obj1.arrayGetLength(); + if (nFuncsA > gfxColorMaxComps) { + error(errSyntaxWarning, -1, "Invalid Function array in shading dictionary"); + return nullptr; + } + for (i = 0; i < nFuncsA; ++i) { + Object obj2 = obj1.arrayGet(i); + Function *f = Function::parse(&obj2); + if (!f) { + return nullptr; + } + funcsA.emplace_back(f); + } + } else { + Function *f = Function::parse(&obj1); + if (!f) { + return nullptr; + } + funcsA.emplace_back(f); + } + } + + nPatchesA = 0; + patchesA = nullptr; + patchesSize = 0; + auto bitBuf = std::make_unique(str); + while (true) { + if (!bitBuf->getBits(flagBits, &flag)) { + break; + } + if (typeA == 6) { + switch (flag) { + case 0: + nPts = 12; + nColors = 4; + break; + case 1: + case 2: + case 3: + default: + nPts = 8; + nColors = 2; + break; + } + } else { + switch (flag) { + case 0: + nPts = 16; + nColors = 4; + break; + case 1: + case 2: + case 3: + default: + nPts = 12; + nColors = 2; + break; + } + } + for (i = 0; i < nPts; ++i) { + if (!bitBuf->getBits(coordBits, &xi) || !bitBuf->getBits(coordBits, &yi)) { + break; + } + x[i] = xMin + xMul * (double)xi; + y[i] = yMin + yMul * (double)yi; + } + if (i < nPts) { + break; + } + for (i = 0; i < nColors; ++i) { + for (j = 0; j < nComps; ++j) { + if (!bitBuf->getBits(compBits, &ci)) { + break; + } + c[i][j] = cMin[j] + cMul[j] * (double)ci; + if (funcsA.empty()) { + // ... and colorspace values can also be stored into doubles. + // They will be casted later. + c[i][j] = dblToCol(c[i][j]); + } + } + if (j < nComps) { + break; + } + } + if (i < nColors) { + break; + } + if (nPatchesA == patchesSize) { + int oldPatchesSize = patchesSize; + patchesSize = (patchesSize == 0) ? 16 : 2 * patchesSize; + patchesA = (GfxPatch *)greallocn_checkoverflow(patchesA, patchesSize, sizeof(GfxPatch)); + if (unlikely(!patchesA)) { + return nullptr; + } + memset(patchesA + oldPatchesSize, 0, (patchesSize - oldPatchesSize) * sizeof(GfxPatch)); + } + p = &patchesA[nPatchesA]; + if (typeA == 6) { + switch (flag) { + case 0: + p->x[0][0] = x[0]; + p->y[0][0] = y[0]; + p->x[0][1] = x[1]; + p->y[0][1] = y[1]; + p->x[0][2] = x[2]; + p->y[0][2] = y[2]; + p->x[0][3] = x[3]; + p->y[0][3] = y[3]; + p->x[1][3] = x[4]; + p->y[1][3] = y[4]; + p->x[2][3] = x[5]; + p->y[2][3] = y[5]; + p->x[3][3] = x[6]; + p->y[3][3] = y[6]; + p->x[3][2] = x[7]; + p->y[3][2] = y[7]; + p->x[3][1] = x[8]; + p->y[3][1] = y[8]; + p->x[3][0] = x[9]; + p->y[3][0] = y[9]; + p->x[2][0] = x[10]; + p->y[2][0] = y[10]; + p->x[1][0] = x[11]; + p->y[1][0] = y[11]; + for (j = 0; j < nComps; ++j) { + p->color[0][0].c[j] = c[0][j]; + p->color[0][1].c[j] = c[1][j]; + p->color[1][1].c[j] = c[2][j]; + p->color[1][0].c[j] = c[3][j]; + } + break; + case 1: + if (nPatchesA == 0) { + gfree(patchesA); + return nullptr; + } + p->x[0][0] = patchesA[nPatchesA - 1].x[0][3]; + p->y[0][0] = patchesA[nPatchesA - 1].y[0][3]; + p->x[0][1] = patchesA[nPatchesA - 1].x[1][3]; + p->y[0][1] = patchesA[nPatchesA - 1].y[1][3]; + p->x[0][2] = patchesA[nPatchesA - 1].x[2][3]; + p->y[0][2] = patchesA[nPatchesA - 1].y[2][3]; + p->x[0][3] = patchesA[nPatchesA - 1].x[3][3]; + p->y[0][3] = patchesA[nPatchesA - 1].y[3][3]; + p->x[1][3] = x[0]; + p->y[1][3] = y[0]; + p->x[2][3] = x[1]; + p->y[2][3] = y[1]; + p->x[3][3] = x[2]; + p->y[3][3] = y[2]; + p->x[3][2] = x[3]; + p->y[3][2] = y[3]; + p->x[3][1] = x[4]; + p->y[3][1] = y[4]; + p->x[3][0] = x[5]; + p->y[3][0] = y[5]; + p->x[2][0] = x[6]; + p->y[2][0] = y[6]; + p->x[1][0] = x[7]; + p->y[1][0] = y[7]; + for (j = 0; j < nComps; ++j) { + p->color[0][0].c[j] = patchesA[nPatchesA - 1].color[0][1].c[j]; + p->color[0][1].c[j] = patchesA[nPatchesA - 1].color[1][1].c[j]; + p->color[1][1].c[j] = c[0][j]; + p->color[1][0].c[j] = c[1][j]; + } + break; + case 2: + if (nPatchesA == 0) { + gfree(patchesA); + return nullptr; + } + p->x[0][0] = patchesA[nPatchesA - 1].x[3][3]; + p->y[0][0] = patchesA[nPatchesA - 1].y[3][3]; + p->x[0][1] = patchesA[nPatchesA - 1].x[3][2]; + p->y[0][1] = patchesA[nPatchesA - 1].y[3][2]; + p->x[0][2] = patchesA[nPatchesA - 1].x[3][1]; + p->y[0][2] = patchesA[nPatchesA - 1].y[3][1]; + p->x[0][3] = patchesA[nPatchesA - 1].x[3][0]; + p->y[0][3] = patchesA[nPatchesA - 1].y[3][0]; + p->x[1][3] = x[0]; + p->y[1][3] = y[0]; + p->x[2][3] = x[1]; + p->y[2][3] = y[1]; + p->x[3][3] = x[2]; + p->y[3][3] = y[2]; + p->x[3][2] = x[3]; + p->y[3][2] = y[3]; + p->x[3][1] = x[4]; + p->y[3][1] = y[4]; + p->x[3][0] = x[5]; + p->y[3][0] = y[5]; + p->x[2][0] = x[6]; + p->y[2][0] = y[6]; + p->x[1][0] = x[7]; + p->y[1][0] = y[7]; + for (j = 0; j < nComps; ++j) { + p->color[0][0].c[j] = patchesA[nPatchesA - 1].color[1][1].c[j]; + p->color[0][1].c[j] = patchesA[nPatchesA - 1].color[1][0].c[j]; + p->color[1][1].c[j] = c[0][j]; + p->color[1][0].c[j] = c[1][j]; + } + break; + case 3: + if (nPatchesA == 0) { + gfree(patchesA); + return nullptr; + } + p->x[0][0] = patchesA[nPatchesA - 1].x[3][0]; + p->y[0][0] = patchesA[nPatchesA - 1].y[3][0]; + p->x[0][1] = patchesA[nPatchesA - 1].x[2][0]; + p->y[0][1] = patchesA[nPatchesA - 1].y[2][0]; + p->x[0][2] = patchesA[nPatchesA - 1].x[1][0]; + p->y[0][2] = patchesA[nPatchesA - 1].y[1][0]; + p->x[0][3] = patchesA[nPatchesA - 1].x[0][0]; + p->y[0][3] = patchesA[nPatchesA - 1].y[0][0]; + p->x[1][3] = x[0]; + p->y[1][3] = y[0]; + p->x[2][3] = x[1]; + p->y[2][3] = y[1]; + p->x[3][3] = x[2]; + p->y[3][3] = y[2]; + p->x[3][2] = x[3]; + p->y[3][2] = y[3]; + p->x[3][1] = x[4]; + p->y[3][1] = y[4]; + p->x[3][0] = x[5]; + p->y[3][0] = y[5]; + p->x[2][0] = x[6]; + p->y[2][0] = y[6]; + p->x[1][0] = x[7]; + p->y[1][0] = y[7]; + for (j = 0; j < nComps; ++j) { + p->color[0][0].c[j] = patchesA[nPatchesA - 1].color[1][0].c[j]; + p->color[0][1].c[j] = patchesA[nPatchesA - 1].color[0][0].c[j]; + p->color[1][1].c[j] = c[0][j]; + p->color[1][0].c[j] = c[1][j]; + } + break; + } + } else { + switch (flag) { + case 0: + p->x[0][0] = x[0]; + p->y[0][0] = y[0]; + p->x[0][1] = x[1]; + p->y[0][1] = y[1]; + p->x[0][2] = x[2]; + p->y[0][2] = y[2]; + p->x[0][3] = x[3]; + p->y[0][3] = y[3]; + p->x[1][3] = x[4]; + p->y[1][3] = y[4]; + p->x[2][3] = x[5]; + p->y[2][3] = y[5]; + p->x[3][3] = x[6]; + p->y[3][3] = y[6]; + p->x[3][2] = x[7]; + p->y[3][2] = y[7]; + p->x[3][1] = x[8]; + p->y[3][1] = y[8]; + p->x[3][0] = x[9]; + p->y[3][0] = y[9]; + p->x[2][0] = x[10]; + p->y[2][0] = y[10]; + p->x[1][0] = x[11]; + p->y[1][0] = y[11]; + p->x[1][1] = x[12]; + p->y[1][1] = y[12]; + p->x[1][2] = x[13]; + p->y[1][2] = y[13]; + p->x[2][2] = x[14]; + p->y[2][2] = y[14]; + p->x[2][1] = x[15]; + p->y[2][1] = y[15]; + for (j = 0; j < nComps; ++j) { + p->color[0][0].c[j] = c[0][j]; + p->color[0][1].c[j] = c[1][j]; + p->color[1][1].c[j] = c[2][j]; + p->color[1][0].c[j] = c[3][j]; + } + break; + case 1: + if (nPatchesA == 0) { + gfree(patchesA); + return nullptr; + } + p->x[0][0] = patchesA[nPatchesA - 1].x[0][3]; + p->y[0][0] = patchesA[nPatchesA - 1].y[0][3]; + p->x[0][1] = patchesA[nPatchesA - 1].x[1][3]; + p->y[0][1] = patchesA[nPatchesA - 1].y[1][3]; + p->x[0][2] = patchesA[nPatchesA - 1].x[2][3]; + p->y[0][2] = patchesA[nPatchesA - 1].y[2][3]; + p->x[0][3] = patchesA[nPatchesA - 1].x[3][3]; + p->y[0][3] = patchesA[nPatchesA - 1].y[3][3]; + p->x[1][3] = x[0]; + p->y[1][3] = y[0]; + p->x[2][3] = x[1]; + p->y[2][3] = y[1]; + p->x[3][3] = x[2]; + p->y[3][3] = y[2]; + p->x[3][2] = x[3]; + p->y[3][2] = y[3]; + p->x[3][1] = x[4]; + p->y[3][1] = y[4]; + p->x[3][0] = x[5]; + p->y[3][0] = y[5]; + p->x[2][0] = x[6]; + p->y[2][0] = y[6]; + p->x[1][0] = x[7]; + p->y[1][0] = y[7]; + p->x[1][1] = x[8]; + p->y[1][1] = y[8]; + p->x[1][2] = x[9]; + p->y[1][2] = y[9]; + p->x[2][2] = x[10]; + p->y[2][2] = y[10]; + p->x[2][1] = x[11]; + p->y[2][1] = y[11]; + for (j = 0; j < nComps; ++j) { + p->color[0][0].c[j] = patchesA[nPatchesA - 1].color[0][1].c[j]; + p->color[0][1].c[j] = patchesA[nPatchesA - 1].color[1][1].c[j]; + p->color[1][1].c[j] = c[0][j]; + p->color[1][0].c[j] = c[1][j]; + } + break; + case 2: + if (nPatchesA == 0) { + gfree(patchesA); + return nullptr; + } + p->x[0][0] = patchesA[nPatchesA - 1].x[3][3]; + p->y[0][0] = patchesA[nPatchesA - 1].y[3][3]; + p->x[0][1] = patchesA[nPatchesA - 1].x[3][2]; + p->y[0][1] = patchesA[nPatchesA - 1].y[3][2]; + p->x[0][2] = patchesA[nPatchesA - 1].x[3][1]; + p->y[0][2] = patchesA[nPatchesA - 1].y[3][1]; + p->x[0][3] = patchesA[nPatchesA - 1].x[3][0]; + p->y[0][3] = patchesA[nPatchesA - 1].y[3][0]; + p->x[1][3] = x[0]; + p->y[1][3] = y[0]; + p->x[2][3] = x[1]; + p->y[2][3] = y[1]; + p->x[3][3] = x[2]; + p->y[3][3] = y[2]; + p->x[3][2] = x[3]; + p->y[3][2] = y[3]; + p->x[3][1] = x[4]; + p->y[3][1] = y[4]; + p->x[3][0] = x[5]; + p->y[3][0] = y[5]; + p->x[2][0] = x[6]; + p->y[2][0] = y[6]; + p->x[1][0] = x[7]; + p->y[1][0] = y[7]; + p->x[1][1] = x[8]; + p->y[1][1] = y[8]; + p->x[1][2] = x[9]; + p->y[1][2] = y[9]; + p->x[2][2] = x[10]; + p->y[2][2] = y[10]; + p->x[2][1] = x[11]; + p->y[2][1] = y[11]; + for (j = 0; j < nComps; ++j) { + p->color[0][0].c[j] = patchesA[nPatchesA - 1].color[1][1].c[j]; + p->color[0][1].c[j] = patchesA[nPatchesA - 1].color[1][0].c[j]; + p->color[1][1].c[j] = c[0][j]; + p->color[1][0].c[j] = c[1][j]; + } + break; + case 3: + if (nPatchesA == 0) { + gfree(patchesA); + return nullptr; + } + p->x[0][0] = patchesA[nPatchesA - 1].x[3][0]; + p->y[0][0] = patchesA[nPatchesA - 1].y[3][0]; + p->x[0][1] = patchesA[nPatchesA - 1].x[2][0]; + p->y[0][1] = patchesA[nPatchesA - 1].y[2][0]; + p->x[0][2] = patchesA[nPatchesA - 1].x[1][0]; + p->y[0][2] = patchesA[nPatchesA - 1].y[1][0]; + p->x[0][3] = patchesA[nPatchesA - 1].x[0][0]; + p->y[0][3] = patchesA[nPatchesA - 1].y[0][0]; + p->x[1][3] = x[0]; + p->y[1][3] = y[0]; + p->x[2][3] = x[1]; + p->y[2][3] = y[1]; + p->x[3][3] = x[2]; + p->y[3][3] = y[2]; + p->x[3][2] = x[3]; + p->y[3][2] = y[3]; + p->x[3][1] = x[4]; + p->y[3][1] = y[4]; + p->x[3][0] = x[5]; + p->y[3][0] = y[5]; + p->x[2][0] = x[6]; + p->y[2][0] = y[6]; + p->x[1][0] = x[7]; + p->y[1][0] = y[7]; + p->x[1][1] = x[8]; + p->y[1][1] = y[8]; + p->x[1][2] = x[9]; + p->y[1][2] = y[9]; + p->x[2][2] = x[10]; + p->y[2][2] = y[10]; + p->x[2][1] = x[11]; + p->y[2][1] = y[11]; + for (j = 0; j < nComps; ++j) { + p->color[0][0].c[j] = patchesA[nPatchesA - 1].color[1][0].c[j]; + p->color[0][1].c[j] = patchesA[nPatchesA - 1].color[0][0].c[j]; + p->color[1][1].c[j] = c[0][j]; + p->color[1][0].c[j] = c[1][j]; + } + break; + } + } + ++nPatchesA; + bitBuf->flushBits(); + } + + if (typeA == 6) { + for (i = 0; i < nPatchesA; ++i) { + p = &patchesA[i]; + p->x[1][1] = (-4 * p->x[0][0] + 6 * (p->x[0][1] + p->x[1][0]) - 2 * (p->x[0][3] + p->x[3][0]) + 3 * (p->x[3][1] + p->x[1][3]) - p->x[3][3]) / 9; + p->y[1][1] = (-4 * p->y[0][0] + 6 * (p->y[0][1] + p->y[1][0]) - 2 * (p->y[0][3] + p->y[3][0]) + 3 * (p->y[3][1] + p->y[1][3]) - p->y[3][3]) / 9; + p->x[1][2] = (-4 * p->x[0][3] + 6 * (p->x[0][2] + p->x[1][3]) - 2 * (p->x[0][0] + p->x[3][3]) + 3 * (p->x[3][2] + p->x[1][0]) - p->x[3][0]) / 9; + p->y[1][2] = (-4 * p->y[0][3] + 6 * (p->y[0][2] + p->y[1][3]) - 2 * (p->y[0][0] + p->y[3][3]) + 3 * (p->y[3][2] + p->y[1][0]) - p->y[3][0]) / 9; + p->x[2][1] = (-4 * p->x[3][0] + 6 * (p->x[3][1] + p->x[2][0]) - 2 * (p->x[3][3] + p->x[0][0]) + 3 * (p->x[0][1] + p->x[2][3]) - p->x[0][3]) / 9; + p->y[2][1] = (-4 * p->y[3][0] + 6 * (p->y[3][1] + p->y[2][0]) - 2 * (p->y[3][3] + p->y[0][0]) + 3 * (p->y[0][1] + p->y[2][3]) - p->y[0][3]) / 9; + p->x[2][2] = (-4 * p->x[3][3] + 6 * (p->x[3][2] + p->x[2][3]) - 2 * (p->x[3][0] + p->x[0][3]) + 3 * (p->x[0][2] + p->x[2][0]) - p->x[0][0]) / 9; + p->y[2][2] = (-4 * p->y[3][3] + 6 * (p->y[3][2] + p->y[2][3]) - 2 * (p->y[3][0] + p->y[0][3]) + 3 * (p->y[0][2] + p->y[2][0]) - p->y[0][0]) / 9; + } + } + + shading = new GfxPatchMeshShading(typeA, patchesA, nPatchesA, std::move(funcsA)); + if (!shading->init(res, dict, out, state)) { + delete shading; + return nullptr; + } + return shading; +} + +bool GfxPatchMeshShading::init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) +{ + const bool parentInit = GfxShading::init(res, dict, out, state); + if (!parentInit) { + return false; + } + + // funcs needs to be one of the three: + // * One function 1-in -> nComps-out + // * nComps functions 1-in -> 1-out + // * empty + const int nComps = colorSpace->getNComps(); + const int nFuncs = funcs.size(); + if (nFuncs == 1) { + if (funcs[0]->getInputSize() != 1) { + error(errSyntaxWarning, -1, "GfxPatchMeshShading: function with input size != 2"); + return false; + } + if (funcs[0]->getOutputSize() != nComps) { + error(errSyntaxWarning, -1, "GfxPatchMeshShading: function with wrong output size"); + return false; + } + } else if (nFuncs == nComps) { + for (const std::unique_ptr &f : funcs) { + if (f->getInputSize() != 1) { + error(errSyntaxWarning, -1, "GfxPatchMeshShading: function with input size != 2"); + return false; + } + if (f->getOutputSize() != 1) { + error(errSyntaxWarning, -1, "GfxPatchMeshShading: function with wrong output size"); + return false; + } + } + } else if (nFuncs != 0) { + return false; + } + + return true; +} + +void GfxPatchMeshShading::getParameterizedColor(double t, GfxColor *color) const +{ + double out[gfxColorMaxComps] = {}; + + for (unsigned int j = 0; j < funcs.size(); ++j) { + funcs[j]->transform(&t, &out[j]); + } + for (int j = 0; j < gfxColorMaxComps; ++j) { + color->c[j] = dblToCol(out[j]); + } +} + +GfxShading *GfxPatchMeshShading::copy() const +{ + return new GfxPatchMeshShading(this); +} + +//------------------------------------------------------------------------ +// GfxImageColorMap +//------------------------------------------------------------------------ + +GfxImageColorMap::GfxImageColorMap(int bitsA, Object *decode, GfxColorSpace *colorSpaceA) +{ + GfxIndexedColorSpace *indexedCS; + GfxSeparationColorSpace *sepCS; + int maxPixel, indexHigh; + unsigned char *indexedLookup; + const Function *sepFunc; + double x[gfxColorMaxComps]; + double y[gfxColorMaxComps] = {}; + int i, j, k; + double mapped; + bool useByteLookup; + + ok = true; + useMatte = false; + + colorSpace = colorSpaceA; + + // initialize + for (k = 0; k < gfxColorMaxComps; ++k) { + lookup[k] = nullptr; + lookup2[k] = nullptr; + } + byte_lookup = nullptr; + + // bits per component and color space + if (unlikely(bitsA <= 0 || bitsA > 30)) { + goto err1; + } + + bits = bitsA; + maxPixel = (1 << bits) - 1; + + // this is a hack to support 16 bits images, everywhere + // we assume a component fits in 8 bits, with this hack + // we treat 16 bit images as 8 bit ones until it's fixed correctly. + // The hack has another part on ImageStream::getLine + if (maxPixel > 255) { + maxPixel = 255; + } + + // get decode map + if (decode->isNull()) { + nComps = colorSpace->getNComps(); + colorSpace->getDefaultRanges(decodeLow, decodeRange, maxPixel); + } else if (decode->isArray()) { + nComps = decode->arrayGetLength() / 2; + if (nComps < colorSpace->getNComps()) { + goto err1; + } + if (nComps > colorSpace->getNComps()) { + error(errSyntaxWarning, -1, "Too many elements in Decode array"); + nComps = colorSpace->getNComps(); + } + for (i = 0; i < nComps; ++i) { + Object obj = decode->arrayGet(2 * i); + if (!obj.isNum()) { + goto err1; + } + decodeLow[i] = obj.getNum(); + obj = decode->arrayGet(2 * i + 1); + if (!obj.isNum()) { + goto err1; + } + decodeRange[i] = obj.getNum() - decodeLow[i]; + } + } else { + goto err1; + } + + // Construct a lookup table -- this stores pre-computed decoded + // values for each component, i.e., the result of applying the + // decode mapping to each possible image pixel component value. + for (k = 0; k < nComps; ++k) { + lookup[k] = (GfxColorComp *)gmallocn(maxPixel + 1, sizeof(GfxColorComp)); + for (i = 0; i <= maxPixel; ++i) { + lookup[k][i] = dblToCol(decodeLow[k] + (i * decodeRange[k]) / maxPixel); + } + } + + // Optimization: for Indexed and Separation color spaces (which have + // only one component), we pre-compute a second lookup table with + // color values + colorSpace2 = nullptr; + nComps2 = 0; + useByteLookup = false; + switch (colorSpace->getMode()) { + case csIndexed: + // Note that indexHigh may not be the same as maxPixel -- + // Distiller will remove unused palette entries, resulting in + // indexHigh < maxPixel. + indexedCS = (GfxIndexedColorSpace *)colorSpace; + colorSpace2 = indexedCS->getBase(); + indexHigh = indexedCS->getIndexHigh(); + nComps2 = colorSpace2->getNComps(); + indexedLookup = indexedCS->getLookup(); + colorSpace2->getDefaultRanges(x, y, indexHigh); + if (colorSpace2->useGetGrayLine() || colorSpace2->useGetRGBLine() || colorSpace2->useGetCMYKLine() || colorSpace2->useGetDeviceNLine()) { + byte_lookup = (unsigned char *)gmallocn((maxPixel + 1), nComps2); + useByteLookup = true; + } + for (k = 0; k < nComps2; ++k) { + lookup2[k] = (GfxColorComp *)gmallocn(maxPixel + 1, sizeof(GfxColorComp)); + for (i = 0; i <= maxPixel; ++i) { + j = (int)(decodeLow[0] + (i * decodeRange[0]) / maxPixel + 0.5); + if (j < 0) { + j = 0; + } else if (j > indexHigh) { + j = indexHigh; + } + + mapped = x[k] + (indexedLookup[j * nComps2 + k] / 255.0) * y[k]; + lookup2[k][i] = dblToCol(mapped); + if (useByteLookup) { + byte_lookup[i * nComps2 + k] = (unsigned char)(mapped * 255); + } + } + } + break; + case csSeparation: + sepCS = (GfxSeparationColorSpace *)colorSpace; + colorSpace2 = sepCS->getAlt(); + nComps2 = colorSpace2->getNComps(); + sepFunc = sepCS->getFunc(); + if (colorSpace2->useGetGrayLine() || colorSpace2->useGetRGBLine() || colorSpace2->useGetCMYKLine() || colorSpace2->useGetDeviceNLine()) { + byte_lookup = (unsigned char *)gmallocn((maxPixel + 1), nComps2); + useByteLookup = true; + } + for (k = 0; k < nComps2; ++k) { + lookup2[k] = (GfxColorComp *)gmallocn(maxPixel + 1, sizeof(GfxColorComp)); + for (i = 0; i <= maxPixel; ++i) { + x[0] = decodeLow[0] + (i * decodeRange[0]) / maxPixel; + sepFunc->transform(x, y); + lookup2[k][i] = dblToCol(y[k]); + if (useByteLookup) { + byte_lookup[i * nComps2 + k] = (unsigned char)(y[k] * 255); + } + } + } + break; + default: + if ((!decode->isNull() || maxPixel != 255) && (colorSpace->useGetGrayLine() || (colorSpace->useGetRGBLine() && !decode->isNull()) || colorSpace->useGetCMYKLine() || colorSpace->useGetDeviceNLine())) { + byte_lookup = (unsigned char *)gmallocn((maxPixel + 1), nComps); + useByteLookup = true; + } + for (k = 0; k < nComps; ++k) { + lookup2[k] = (GfxColorComp *)gmallocn(maxPixel + 1, sizeof(GfxColorComp)); + for (i = 0; i <= maxPixel; ++i) { + mapped = decodeLow[k] + (i * decodeRange[k]) / maxPixel; + lookup2[k][i] = dblToCol(mapped); + if (useByteLookup) { + int byte; + + byte = (int)(mapped * 255.0 + 0.5); + if (byte < 0) { + byte = 0; + } else if (byte > 255) { + byte = 255; + } + byte_lookup[i * nComps + k] = byte; + } + } + } + } + + return; + +err1: + ok = false; +} + +GfxImageColorMap::GfxImageColorMap(const GfxImageColorMap *colorMap) +{ + int n, i, k; + + colorSpace = colorMap->colorSpace->copy(); + bits = colorMap->bits; + nComps = colorMap->nComps; + nComps2 = colorMap->nComps2; + useMatte = colorMap->useMatte; + matteColor = colorMap->matteColor; + colorSpace2 = nullptr; + for (k = 0; k < gfxColorMaxComps; ++k) { + lookup[k] = nullptr; + lookup2[k] = nullptr; + } + byte_lookup = nullptr; + n = 1 << bits; + for (k = 0; k < nComps; ++k) { + lookup[k] = (GfxColorComp *)gmallocn(n, sizeof(GfxColorComp)); + memcpy(lookup[k], colorMap->lookup[k], n * sizeof(GfxColorComp)); + } + if (colorSpace->getMode() == csIndexed) { + colorSpace2 = ((GfxIndexedColorSpace *)colorSpace)->getBase(); + for (k = 0; k < nComps2; ++k) { + lookup2[k] = (GfxColorComp *)gmallocn(n, sizeof(GfxColorComp)); + memcpy(lookup2[k], colorMap->lookup2[k], n * sizeof(GfxColorComp)); + } + } else if (colorSpace->getMode() == csSeparation) { + colorSpace2 = ((GfxSeparationColorSpace *)colorSpace)->getAlt(); + for (k = 0; k < nComps2; ++k) { + lookup2[k] = (GfxColorComp *)gmallocn(n, sizeof(GfxColorComp)); + memcpy(lookup2[k], colorMap->lookup2[k], n * sizeof(GfxColorComp)); + } + } else { + for (k = 0; k < nComps; ++k) { + lookup2[k] = (GfxColorComp *)gmallocn(n, sizeof(GfxColorComp)); + memcpy(lookup2[k], colorMap->lookup2[k], n * sizeof(GfxColorComp)); + } + } + if (colorMap->byte_lookup) { + int nc = colorSpace2 ? nComps2 : nComps; + + byte_lookup = (unsigned char *)gmallocn(n, nc); + memcpy(byte_lookup, colorMap->byte_lookup, n * nc); + } + for (i = 0; i < nComps; ++i) { + decodeLow[i] = colorMap->decodeLow[i]; + decodeRange[i] = colorMap->decodeRange[i]; + } + ok = true; +} + +GfxImageColorMap::~GfxImageColorMap() +{ + int i; + + delete colorSpace; + for (i = 0; i < gfxColorMaxComps; ++i) { + gfree(lookup[i]); + gfree(lookup2[i]); + } + gfree(byte_lookup); +} + +void GfxImageColorMap::getGray(const unsigned char *x, GfxGray *gray) +{ + GfxColor color; + int i; + + if (colorSpace2) { + for (i = 0; i < nComps2; ++i) { + color.c[i] = lookup2[i][x[0]]; + } + colorSpace2->getGray(&color, gray); + } else { + for (i = 0; i < nComps; ++i) { + color.c[i] = lookup2[i][x[i]]; + } + colorSpace->getGray(&color, gray); + } +} + +void GfxImageColorMap::getRGB(const unsigned char *x, GfxRGB *rgb) +{ + GfxColor color; + int i; + + if (colorSpace2) { + for (i = 0; i < nComps2; ++i) { + color.c[i] = lookup2[i][x[0]]; + } + colorSpace2->getRGB(&color, rgb); + } else { + for (i = 0; i < nComps; ++i) { + color.c[i] = lookup2[i][x[i]]; + } + colorSpace->getRGB(&color, rgb); + } +} + +void GfxImageColorMap::getGrayLine(unsigned char *in, unsigned char *out, int length) +{ + int i, j; + unsigned char *inp, *tmp_line; + + if ((colorSpace2 && !colorSpace2->useGetGrayLine()) || (!colorSpace2 && !colorSpace->useGetGrayLine())) { + GfxGray gray; + + inp = in; + for (i = 0; i < length; i++) { + getGray(inp, &gray); + out[i] = colToByte(gray); + inp += nComps; + } + return; + } + + switch (colorSpace->getMode()) { + case csIndexed: + case csSeparation: + tmp_line = (unsigned char *)gmallocn(length, nComps2); + for (i = 0; i < length; i++) { + for (j = 0; j < nComps2; j++) { + unsigned char c = in[i]; + if (byte_lookup) { + c = byte_lookup[c * nComps2 + j]; + } + tmp_line[i * nComps2 + j] = c; + } + } + colorSpace2->getGrayLine(tmp_line, out, length); + gfree(tmp_line); + break; + + default: + if (byte_lookup) { + inp = in; + for (j = 0; j < length; j++) { + for (i = 0; i < nComps; i++) { + *inp = byte_lookup[*inp * nComps + i]; + inp++; + } + } + } + colorSpace->getGrayLine(in, out, length); + break; + } +} + +void GfxImageColorMap::getRGBLine(unsigned char *in, unsigned int *out, int length) +{ + int i, j; + unsigned char *inp, *tmp_line; + + if (!useRGBLine()) { + GfxRGB rgb; + + inp = in; + for (i = 0; i < length; i++) { + getRGB(inp, &rgb); + out[i] = ((int)colToByte(rgb.r) << 16) | ((int)colToByte(rgb.g) << 8) | ((int)colToByte(rgb.b) << 0); + inp += nComps; + } + return; + } + + switch (colorSpace->getMode()) { + case csIndexed: + case csSeparation: + tmp_line = (unsigned char *)gmallocn(length, nComps2); + for (i = 0; i < length; i++) { + for (j = 0; j < nComps2; j++) { + unsigned char c = in[i]; + if (byte_lookup) { + c = byte_lookup[c * nComps2 + j]; + } + tmp_line[i * nComps2 + j] = c; + } + } + colorSpace2->getRGBLine(tmp_line, out, length); + gfree(tmp_line); + break; + + default: + if (byte_lookup) { + inp = in; + for (j = 0; j < length; j++) { + for (i = 0; i < nComps; i++) { + *inp = byte_lookup[*inp * nComps + i]; + inp++; + } + } + } + colorSpace->getRGBLine(in, out, length); + break; + } +} + +void GfxImageColorMap::getRGBLine(unsigned char *in, unsigned char *out, int length) +{ + int i, j; + unsigned char *inp, *tmp_line; + + if (!useRGBLine()) { + GfxRGB rgb; + + inp = in; + for (i = 0; i < length; i++) { + getRGB(inp, &rgb); + *out++ = colToByte(rgb.r); + *out++ = colToByte(rgb.g); + *out++ = colToByte(rgb.b); + inp += nComps; + } + return; + } + + switch (colorSpace->getMode()) { + case csIndexed: + case csSeparation: + tmp_line = (unsigned char *)gmallocn(length, nComps2); + for (i = 0; i < length; i++) { + for (j = 0; j < nComps2; j++) { + unsigned char c = in[i]; + if (byte_lookup) { + c = byte_lookup[c * nComps2 + j]; + } + tmp_line[i * nComps2 + j] = c; + } + } + colorSpace2->getRGBLine(tmp_line, out, length); + gfree(tmp_line); + break; + + default: + if (byte_lookup) { + inp = in; + for (j = 0; j < length; j++) { + for (i = 0; i < nComps; i++) { + *inp = byte_lookup[*inp * nComps + i]; + inp++; + } + } + } + colorSpace->getRGBLine(in, out, length); + break; + } +} + +void GfxImageColorMap::getRGBXLine(unsigned char *in, unsigned char *out, int length) +{ + int i, j; + unsigned char *inp, *tmp_line; + + if (!useRGBLine()) { + GfxRGB rgb; + + inp = in; + for (i = 0; i < length; i++) { + getRGB(inp, &rgb); + *out++ = colToByte(rgb.r); + *out++ = colToByte(rgb.g); + *out++ = colToByte(rgb.b); + *out++ = 255; + inp += nComps; + } + return; + } + + switch (colorSpace->getMode()) { + case csIndexed: + case csSeparation: + tmp_line = (unsigned char *)gmallocn(length, nComps2); + for (i = 0; i < length; i++) { + for (j = 0; j < nComps2; j++) { + unsigned char c = in[i]; + if (byte_lookup) { + c = byte_lookup[c * nComps2 + j]; + } + tmp_line[i * nComps2 + j] = c; + } + } + colorSpace2->getRGBXLine(tmp_line, out, length); + gfree(tmp_line); + break; + + default: + if (byte_lookup) { + inp = in; + for (j = 0; j < length; j++) { + for (i = 0; i < nComps; i++) { + *inp = byte_lookup[*inp * nComps + i]; + inp++; + } + } + } + colorSpace->getRGBXLine(in, out, length); + break; + } +} + +void GfxImageColorMap::getCMYKLine(unsigned char *in, unsigned char *out, int length) +{ + int i, j; + unsigned char *inp, *tmp_line; + + if (!useCMYKLine()) { + GfxCMYK cmyk; + + inp = in; + for (i = 0; i < length; i++) { + getCMYK(inp, &cmyk); + *out++ = colToByte(cmyk.c); + *out++ = colToByte(cmyk.m); + *out++ = colToByte(cmyk.y); + *out++ = colToByte(cmyk.k); + inp += nComps; + } + return; + } + + switch (colorSpace->getMode()) { + case csIndexed: + case csSeparation: + tmp_line = (unsigned char *)gmallocn(length, nComps2); + for (i = 0; i < length; i++) { + for (j = 0; j < nComps2; j++) { + unsigned char c = in[i]; + if (byte_lookup) { + c = byte_lookup[c * nComps2 + j]; + } + tmp_line[i * nComps2 + j] = c; + } + } + colorSpace2->getCMYKLine(tmp_line, out, length); + gfree(tmp_line); + break; + + default: + if (byte_lookup) { + inp = in; + for (j = 0; j < length; j++) { + for (i = 0; i < nComps; i++) { + *inp = byte_lookup[*inp * nComps + i]; + inp++; + } + } + } + colorSpace->getCMYKLine(in, out, length); + break; + } +} + +void GfxImageColorMap::getDeviceNLine(unsigned char *in, unsigned char *out, int length) +{ + unsigned char *inp, *tmp_line; + + if (!useDeviceNLine()) { + GfxColor deviceN; + + inp = in; + for (int i = 0; i < length; i++) { + getDeviceN(inp, &deviceN); + for (int j = 0; j < SPOT_NCOMPS + 4; j++) { + *out++ = deviceN.c[j]; + } + inp += nComps; + } + return; + } + + switch (colorSpace->getMode()) { + case csIndexed: + case csSeparation: + tmp_line = (unsigned char *)gmallocn(length, nComps2); + for (int i = 0; i < length; i++) { + for (int j = 0; j < nComps2; j++) { + unsigned char c = in[i]; + if (byte_lookup) { + c = byte_lookup[c * nComps2 + j]; + } + tmp_line[i * nComps2 + j] = c; + } + } + colorSpace2->getDeviceNLine(tmp_line, out, length); + gfree(tmp_line); + break; + + default: + if (byte_lookup) { + inp = in; + for (int j = 0; j < length; j++) { + for (int i = 0; i < nComps; i++) { + *inp = byte_lookup[*inp * nComps + i]; + inp++; + } + } + } + colorSpace->getDeviceNLine(in, out, length); + break; + } +} + +void GfxImageColorMap::getCMYK(const unsigned char *x, GfxCMYK *cmyk) +{ + GfxColor color; + int i; + + if (colorSpace2) { + for (i = 0; i < nComps2; ++i) { + color.c[i] = lookup2[i][x[0]]; + } + colorSpace2->getCMYK(&color, cmyk); + } else { + for (i = 0; i < nComps; ++i) { + color.c[i] = lookup[i][x[i]]; + } + colorSpace->getCMYK(&color, cmyk); + } +} + +void GfxImageColorMap::getDeviceN(const unsigned char *x, GfxColor *deviceN) +{ + GfxColor color; + int i; + + if (colorSpace2 && (colorSpace->getMapping() == nullptr || colorSpace->getMapping()[0] == -1)) { + for (i = 0; i < nComps2; ++i) { + color.c[i] = lookup2[i][x[0]]; + } + colorSpace2->getDeviceN(&color, deviceN); + } else { + for (i = 0; i < nComps; ++i) { + color.c[i] = lookup[i][x[i]]; + } + colorSpace->getDeviceN(&color, deviceN); + } +} + +void GfxImageColorMap::getColor(const unsigned char *x, GfxColor *color) +{ + int maxPixel, i; + + maxPixel = (1 << bits) - 1; + for (i = 0; i < nComps; ++i) { + color->c[i] = dblToCol(decodeLow[i] + (x[i] * decodeRange[i]) / maxPixel); + } +} + +//------------------------------------------------------------------------ +// GfxSubpath and GfxPath +//------------------------------------------------------------------------ + +GfxSubpath::GfxSubpath(double x1, double y1) +{ + size = 16; + x = (double *)gmallocn(size, sizeof(double)); + y = (double *)gmallocn(size, sizeof(double)); + curve = (bool *)gmallocn(size, sizeof(bool)); + n = 1; + x[0] = x1; + y[0] = y1; + curve[0] = false; + closed = false; +} + +GfxSubpath::~GfxSubpath() +{ + gfree(x); + gfree(y); + gfree(curve); +} + +// Used for copy(). +GfxSubpath::GfxSubpath(const GfxSubpath *subpath) +{ + size = subpath->size; + n = subpath->n; + x = (double *)gmallocn(size, sizeof(double)); + y = (double *)gmallocn(size, sizeof(double)); + curve = (bool *)gmallocn(size, sizeof(bool)); + memcpy(x, subpath->x, n * sizeof(double)); + memcpy(y, subpath->y, n * sizeof(double)); + memcpy(curve, subpath->curve, n * sizeof(bool)); + closed = subpath->closed; +} + +void GfxSubpath::lineTo(double x1, double y1) +{ + if (n >= size) { + size *= 2; + x = (double *)greallocn(x, size, sizeof(double)); + y = (double *)greallocn(y, size, sizeof(double)); + curve = (bool *)greallocn(curve, size, sizeof(bool)); + } + x[n] = x1; + y[n] = y1; + curve[n] = false; + ++n; +} + +void GfxSubpath::curveTo(double x1, double y1, double x2, double y2, double x3, double y3) +{ + if (n + 3 > size) { + size *= 2; + x = (double *)greallocn(x, size, sizeof(double)); + y = (double *)greallocn(y, size, sizeof(double)); + curve = (bool *)greallocn(curve, size, sizeof(bool)); + } + x[n] = x1; + y[n] = y1; + x[n + 1] = x2; + y[n + 1] = y2; + x[n + 2] = x3; + y[n + 2] = y3; + curve[n] = curve[n + 1] = true; + curve[n + 2] = false; + n += 3; +} + +void GfxSubpath::close() +{ + if (x[n - 1] != x[0] || y[n - 1] != y[0]) { + lineTo(x[0], y[0]); + } + closed = true; +} + +void GfxSubpath::offset(double dx, double dy) +{ + int i; + + for (i = 0; i < n; ++i) { + x[i] += dx; + y[i] += dy; + } +} + +GfxPath::GfxPath() +{ + justMoved = false; + size = 16; + n = 0; + firstX = firstY = 0; + subpaths = (GfxSubpath **)gmallocn(size, sizeof(GfxSubpath *)); +} + +GfxPath::~GfxPath() +{ + int i; + + for (i = 0; i < n; ++i) { + delete subpaths[i]; + } + gfree(subpaths); +} + +// Used for copy(). +GfxPath::GfxPath(bool justMoved1, double firstX1, double firstY1, GfxSubpath **subpaths1, int n1, int size1) +{ + int i; + + justMoved = justMoved1; + firstX = firstX1; + firstY = firstY1; + size = size1; + n = n1; + subpaths = (GfxSubpath **)gmallocn(size, sizeof(GfxSubpath *)); + for (i = 0; i < n; ++i) { + subpaths[i] = subpaths1[i]->copy(); + } +} + +void GfxPath::moveTo(double x, double y) +{ + justMoved = true; + firstX = x; + firstY = y; +} + +void GfxPath::lineTo(double x, double y) +{ + if (justMoved || (n > 0 && subpaths[n - 1]->isClosed())) { + if (n >= size) { + size *= 2; + subpaths = (GfxSubpath **)greallocn(subpaths, size, sizeof(GfxSubpath *)); + } + if (justMoved) { + subpaths[n] = new GfxSubpath(firstX, firstY); + } else { + subpaths[n] = new GfxSubpath(subpaths[n - 1]->getLastX(), subpaths[n - 1]->getLastY()); + } + ++n; + justMoved = false; + } + subpaths[n - 1]->lineTo(x, y); +} + +void GfxPath::curveTo(double x1, double y1, double x2, double y2, double x3, double y3) +{ + if (justMoved || (n > 0 && subpaths[n - 1]->isClosed())) { + if (n >= size) { + size *= 2; + subpaths = (GfxSubpath **)greallocn(subpaths, size, sizeof(GfxSubpath *)); + } + if (justMoved) { + subpaths[n] = new GfxSubpath(firstX, firstY); + } else { + subpaths[n] = new GfxSubpath(subpaths[n - 1]->getLastX(), subpaths[n - 1]->getLastY()); + } + ++n; + justMoved = false; + } + subpaths[n - 1]->curveTo(x1, y1, x2, y2, x3, y3); +} + +void GfxPath::close() +{ + // this is necessary to handle the pathological case of + // moveto/closepath/clip, which defines an empty clipping region + if (justMoved) { + if (n >= size) { + size *= 2; + subpaths = (GfxSubpath **)greallocn(subpaths, size, sizeof(GfxSubpath *)); + } + subpaths[n] = new GfxSubpath(firstX, firstY); + ++n; + justMoved = false; + } + subpaths[n - 1]->close(); +} + +void GfxPath::append(GfxPath *path) +{ + int i; + + if (n + path->n > size) { + size = n + path->n; + subpaths = (GfxSubpath **)greallocn(subpaths, size, sizeof(GfxSubpath *)); + } + for (i = 0; i < path->n; ++i) { + subpaths[n++] = path->subpaths[i]->copy(); + } + justMoved = false; +} + +void GfxPath::offset(double dx, double dy) +{ + int i; + + for (i = 0; i < n; ++i) { + subpaths[i]->offset(dx, dy); + } +} + +//------------------------------------------------------------------------ +// +//------------------------------------------------------------------------ +GfxState::ReusablePathIterator::ReusablePathIterator(GfxPath *pathA) : path(pathA), subPathOff(0), coordOff(0), numCoords(0), curSubPath(nullptr) +{ + if (path->getNumSubpaths()) { + curSubPath = path->getSubpath(subPathOff); + numCoords = curSubPath->getNumPoints(); + } +} + +bool GfxState::ReusablePathIterator::isEnd() const +{ + return coordOff >= numCoords; +} + +void GfxState::ReusablePathIterator::next() +{ + ++coordOff; + if (coordOff == numCoords) { + ++subPathOff; + if (subPathOff < path->getNumSubpaths()) { + coordOff = 0; + curSubPath = path->getSubpath(subPathOff); + numCoords = curSubPath->getNumPoints(); + } + } +} + +void GfxState::ReusablePathIterator::setCoord(double x, double y) +{ + curSubPath->setX(coordOff, x); + curSubPath->setY(coordOff, y); +} + +void GfxState::ReusablePathIterator::reset() +{ + coordOff = 0; + subPathOff = 0; + curSubPath = path->getSubpath(0); + numCoords = curSubPath->getNumPoints(); +} + +GfxState::GfxState(double hDPIA, double vDPIA, const PDFRectangle *pageBox, int rotateA, bool upsideDown) +{ + double kx, ky; + + hDPI = hDPIA; + vDPI = vDPIA; + rotate = rotateA; + px1 = pageBox->x1; + py1 = pageBox->y1; + px2 = pageBox->x2; + py2 = pageBox->y2; + kx = hDPI / 72.0; + ky = vDPI / 72.0; + if (rotate == 90) { + ctm[0] = 0; + ctm[1] = upsideDown ? ky : -ky; + ctm[2] = kx; + ctm[3] = 0; + ctm[4] = -kx * py1; + ctm[5] = ky * (upsideDown ? -px1 : px2); + pageWidth = kx * (py2 - py1); + pageHeight = ky * (px2 - px1); + } else if (rotate == 180) { + ctm[0] = -kx; + ctm[1] = 0; + ctm[2] = 0; + ctm[3] = upsideDown ? ky : -ky; + ctm[4] = kx * px2; + ctm[5] = ky * (upsideDown ? -py1 : py2); + pageWidth = kx * (px2 - px1); + pageHeight = ky * (py2 - py1); + } else if (rotate == 270) { + ctm[0] = 0; + ctm[1] = upsideDown ? -ky : ky; + ctm[2] = -kx; + ctm[3] = 0; + ctm[4] = kx * py2; + ctm[5] = ky * (upsideDown ? px2 : -px1); + pageWidth = kx * (py2 - py1); + pageHeight = ky * (px2 - px1); + } else { + ctm[0] = kx; + ctm[1] = 0; + ctm[2] = 0; + ctm[3] = upsideDown ? -ky : ky; + ctm[4] = -kx * px1; + ctm[5] = ky * (upsideDown ? py2 : -py1); + pageWidth = kx * (px2 - px1); + pageHeight = ky * (py2 - py1); + } + + fillColorSpace = new GfxDeviceGrayColorSpace(); + strokeColorSpace = new GfxDeviceGrayColorSpace(); + fillColor.c[0] = 0; + strokeColor.c[0] = 0; + fillPattern = nullptr; + strokePattern = nullptr; + blendMode = gfxBlendNormal; + fillOpacity = 1; + strokeOpacity = 1; + fillOverprint = false; + strokeOverprint = false; + overprintMode = 0; + transfer[0] = transfer[1] = transfer[2] = transfer[3] = nullptr; + + lineWidth = 1; + lineDashStart = 0; + flatness = 1; + lineJoin = 0; + lineCap = 0; + miterLimit = 10; + strokeAdjust = false; + alphaIsShape = false; + textKnockout = false; + + font = nullptr; + fontSize = 0; + textMat[0] = 1; + textMat[1] = 0; + textMat[2] = 0; + textMat[3] = 1; + textMat[4] = 0; + textMat[5] = 0; + charSpace = 0; + wordSpace = 0; + horizScaling = 1; + leading = 0; + rise = 0; + render = 0; + + path = new GfxPath(); + curX = curY = 0; + lineX = lineY = 0; + + clipXMin = 0; + clipYMin = 0; + clipXMax = pageWidth; + clipYMax = pageHeight; + + renderingIntent[0] = 0; + + saved = nullptr; + + defaultGrayColorSpace = nullptr; + defaultRGBColorSpace = nullptr; + defaultCMYKColorSpace = nullptr; +#ifdef USE_CMS + XYZ2DisplayTransformRelCol = nullptr; + XYZ2DisplayTransformAbsCol = nullptr; + XYZ2DisplayTransformSat = nullptr; + XYZ2DisplayTransformPerc = nullptr; + localDisplayProfile = nullptr; + + if (!sRGBProfile) { + // This is probably the one of the first invocations of lcms2, so we set the error handler + cmsSetLogErrorHandler(CMSError); + + sRGBProfile = make_GfxLCMSProfilePtr(cmsCreate_sRGBProfile()); + } + + if (!XYZProfile) { + XYZProfile = make_GfxLCMSProfilePtr(cmsCreateXYZProfile()); + } +#endif +} + +GfxState::~GfxState() +{ + int i; + + if (fillColorSpace) { + delete fillColorSpace; + } + if (strokeColorSpace) { + delete strokeColorSpace; + } + if (fillPattern) { + delete fillPattern; + } + if (strokePattern) { + delete strokePattern; + } + for (i = 0; i < 4; ++i) { + if (transfer[i]) { + delete transfer[i]; + } + } + if (path) { + // this gets set to NULL by restore() + delete path; + } + + delete defaultGrayColorSpace; + delete defaultRGBColorSpace; + delete defaultCMYKColorSpace; +} + +// Used for copy(); +GfxState::GfxState(const GfxState *state, bool copyPath) +{ + int i; + + hDPI = state->hDPI; + vDPI = state->vDPI; + memcpy(ctm, state->ctm, sizeof(ctm)); + px1 = state->px1; + py1 = state->py1; + px2 = state->px2; + py2 = state->py2; + pageWidth = state->pageWidth; + pageHeight = state->pageHeight; + rotate = state->rotate; + + fillColorSpace = state->fillColorSpace; + if (fillColorSpace) { + fillColorSpace = state->fillColorSpace->copy(); + } + strokeColorSpace = state->strokeColorSpace; + if (strokeColorSpace) { + strokeColorSpace = state->strokeColorSpace->copy(); + } + fillColor = state->fillColor; + strokeColor = state->strokeColor; + + fillPattern = state->fillPattern; + if (fillPattern) { + fillPattern = state->fillPattern->copy(); + } + strokePattern = state->strokePattern; + if (strokePattern) { + strokePattern = state->strokePattern->copy(); + } + blendMode = state->blendMode; + fillOpacity = state->fillOpacity; + strokeOpacity = state->strokeOpacity; + fillOverprint = state->fillOverprint; + strokeOverprint = state->strokeOverprint; + overprintMode = state->overprintMode; + for (i = 0; i < 4; ++i) { + transfer[i] = state->transfer[i]; + if (transfer[i]) { + transfer[i] = state->transfer[i]->copy(); + } + } + lineWidth = state->lineWidth; + lineDash = state->lineDash; + lineDashStart = state->lineDashStart; + flatness = state->flatness; + lineJoin = state->lineJoin; + lineCap = state->lineCap; + miterLimit = state->miterLimit; + strokeAdjust = state->strokeAdjust; + alphaIsShape = state->alphaIsShape; + textKnockout = state->textKnockout; + + font = state->font; + fontSize = state->fontSize; + memcpy(textMat, state->textMat, sizeof(textMat)); + charSpace = state->charSpace; + wordSpace = state->wordSpace; + horizScaling = state->horizScaling; + leading = state->leading; + rise = state->rise; + render = state->render; + + path = state->path; + if (copyPath) { + path = state->path->copy(); + } + curX = state->curX; + curY = state->curY; + lineX = state->lineX; + lineY = state->lineY; + + clipXMin = state->clipXMin; + clipYMin = state->clipYMin; + clipXMax = state->clipXMax; + clipYMax = state->clipYMax; + memcpy(renderingIntent, state->renderingIntent, sizeof(renderingIntent)); + + saved = nullptr; +#ifdef USE_CMS + localDisplayProfile = state->localDisplayProfile; + XYZ2DisplayTransformRelCol = state->XYZ2DisplayTransformRelCol; + XYZ2DisplayTransformAbsCol = state->XYZ2DisplayTransformAbsCol; + XYZ2DisplayTransformSat = state->XYZ2DisplayTransformSat; + XYZ2DisplayTransformPerc = state->XYZ2DisplayTransformPerc; +#endif + + if (state->defaultGrayColorSpace) { + defaultGrayColorSpace = state->defaultGrayColorSpace->copy(); + } else { + defaultGrayColorSpace = nullptr; + } + if (state->defaultRGBColorSpace) { + defaultRGBColorSpace = state->defaultRGBColorSpace->copy(); + } else { + defaultRGBColorSpace = nullptr; + } + if (state->defaultCMYKColorSpace) { + defaultCMYKColorSpace = state->defaultCMYKColorSpace->copy(); + } else { + defaultCMYKColorSpace = nullptr; + } +} + +#ifdef USE_CMS + +GfxLCMSProfilePtr GfxState::sRGBProfile = nullptr; +GfxLCMSProfilePtr GfxState::XYZProfile = nullptr; + +void GfxState::setDisplayProfile(const GfxLCMSProfilePtr &localDisplayProfileA) +{ + localDisplayProfile = localDisplayProfileA; + if (localDisplayProfile) { + cmsHTRANSFORM transform; + unsigned int nChannels; + unsigned int localDisplayPixelType; + + localDisplayPixelType = getCMSColorSpaceType(cmsGetColorSpace(localDisplayProfile.get())); + nChannels = getCMSNChannels(cmsGetColorSpace(localDisplayProfile.get())); + // create transform from XYZ + if ((transform = cmsCreateTransform(XYZProfile.get(), TYPE_XYZ_DBL, localDisplayProfile.get(), COLORSPACE_SH(localDisplayPixelType) | CHANNELS_SH(nChannels) | BYTES_SH(1), INTENT_RELATIVE_COLORIMETRIC, LCMS_FLAGS)) == nullptr) { + error(errSyntaxWarning, -1, "Can't create Lab transform"); + } else { + XYZ2DisplayTransformRelCol = std::make_shared(transform, INTENT_RELATIVE_COLORIMETRIC, PT_XYZ, localDisplayPixelType); + } + + if ((transform = cmsCreateTransform(XYZProfile.get(), TYPE_XYZ_DBL, localDisplayProfile.get(), COLORSPACE_SH(localDisplayPixelType) | CHANNELS_SH(nChannels) | BYTES_SH(1), INTENT_ABSOLUTE_COLORIMETRIC, LCMS_FLAGS)) == nullptr) { + error(errSyntaxWarning, -1, "Can't create Lab transform"); + } else { + XYZ2DisplayTransformAbsCol = std::make_shared(transform, INTENT_ABSOLUTE_COLORIMETRIC, PT_XYZ, localDisplayPixelType); + } + + if ((transform = cmsCreateTransform(XYZProfile.get(), TYPE_XYZ_DBL, localDisplayProfile.get(), COLORSPACE_SH(localDisplayPixelType) | CHANNELS_SH(nChannels) | BYTES_SH(1), INTENT_SATURATION, LCMS_FLAGS)) == nullptr) { + error(errSyntaxWarning, -1, "Can't create Lab transform"); + } else { + XYZ2DisplayTransformSat = std::make_shared(transform, INTENT_SATURATION, PT_XYZ, localDisplayPixelType); + } + + if ((transform = cmsCreateTransform(XYZProfile.get(), TYPE_XYZ_DBL, localDisplayProfile.get(), COLORSPACE_SH(localDisplayPixelType) | CHANNELS_SH(nChannels) | BYTES_SH(1), INTENT_PERCEPTUAL, LCMS_FLAGS)) == nullptr) { + error(errSyntaxWarning, -1, "Can't create Lab transform"); + } else { + XYZ2DisplayTransformPerc = std::make_shared(transform, INTENT_PERCEPTUAL, PT_XYZ, localDisplayPixelType); + } + } +} + +std::shared_ptr GfxState::getXYZ2DisplayTransform() +{ + auto transform = XYZ2DisplayTransformRelCol; + if (strcmp(renderingIntent, "AbsoluteColorimetric") == 0) { + transform = XYZ2DisplayTransformAbsCol; + } else if (strcmp(renderingIntent, "Saturation") == 0) { + transform = XYZ2DisplayTransformSat; + } else if (strcmp(renderingIntent, "Perceptual") == 0) { + transform = XYZ2DisplayTransformPerc; + } + return transform; +} + +int GfxState::getCmsRenderingIntent() +{ + const char *intent = getRenderingIntent(); + int cmsIntent = INTENT_RELATIVE_COLORIMETRIC; + if (intent) { + if (strcmp(intent, "AbsoluteColorimetric") == 0) { + cmsIntent = INTENT_ABSOLUTE_COLORIMETRIC; + } else if (strcmp(intent, "Saturation") == 0) { + cmsIntent = INTENT_SATURATION; + } else if (strcmp(intent, "Perceptual") == 0) { + cmsIntent = INTENT_PERCEPTUAL; + } + } + return cmsIntent; +} + +#endif + +void GfxState::setPath(GfxPath *pathA) +{ + delete path; + path = pathA; +} + +void GfxState::getUserClipBBox(double *xMin, double *yMin, double *xMax, double *yMax) const +{ + double ictm[6]; + double xMin1, yMin1, xMax1, yMax1, tx, ty; + + // invert the CTM + const double det_denominator = (ctm[0] * ctm[3] - ctm[1] * ctm[2]); + if (unlikely(det_denominator == 0)) { + *xMin = 0; + *yMin = 0; + *xMax = 0; + *yMax = 0; + return; + } + const double det = 1 / det_denominator; + ictm[0] = ctm[3] * det; + ictm[1] = -ctm[1] * det; + ictm[2] = -ctm[2] * det; + ictm[3] = ctm[0] * det; + ictm[4] = (ctm[2] * ctm[5] - ctm[3] * ctm[4]) * det; + ictm[5] = (ctm[1] * ctm[4] - ctm[0] * ctm[5]) * det; + + // transform all four corners of the clip bbox; find the min and max + // x and y values + xMin1 = xMax1 = clipXMin * ictm[0] + clipYMin * ictm[2] + ictm[4]; + yMin1 = yMax1 = clipXMin * ictm[1] + clipYMin * ictm[3] + ictm[5]; + tx = clipXMin * ictm[0] + clipYMax * ictm[2] + ictm[4]; + ty = clipXMin * ictm[1] + clipYMax * ictm[3] + ictm[5]; + if (tx < xMin1) { + xMin1 = tx; + } else if (tx > xMax1) { + xMax1 = tx; + } + if (ty < yMin1) { + yMin1 = ty; + } else if (ty > yMax1) { + yMax1 = ty; + } + tx = clipXMax * ictm[0] + clipYMin * ictm[2] + ictm[4]; + ty = clipXMax * ictm[1] + clipYMin * ictm[3] + ictm[5]; + if (tx < xMin1) { + xMin1 = tx; + } else if (tx > xMax1) { + xMax1 = tx; + } + if (ty < yMin1) { + yMin1 = ty; + } else if (ty > yMax1) { + yMax1 = ty; + } + tx = clipXMax * ictm[0] + clipYMax * ictm[2] + ictm[4]; + ty = clipXMax * ictm[1] + clipYMax * ictm[3] + ictm[5]; + if (tx < xMin1) { + xMin1 = tx; + } else if (tx > xMax1) { + xMax1 = tx; + } + if (ty < yMin1) { + yMin1 = ty; + } else if (ty > yMax1) { + yMax1 = ty; + } + + *xMin = xMin1; + *yMin = yMin1; + *xMax = xMax1; + *yMax = yMax1; +} + +double GfxState::transformWidth(double w) const +{ + double x, y; + + x = ctm[0] + ctm[2]; + y = ctm[1] + ctm[3]; + return w * sqrt(0.5 * (x * x + y * y)); +} + +double GfxState::getTransformedFontSize() const +{ + double x1, y1, x2, y2; + + x1 = textMat[2] * fontSize; + y1 = textMat[3] * fontSize; + x2 = ctm[0] * x1 + ctm[2] * y1; + y2 = ctm[1] * x1 + ctm[3] * y1; + return sqrt(x2 * x2 + y2 * y2); +} + +void GfxState::getFontTransMat(double *m11, double *m12, double *m21, double *m22) const +{ + *m11 = (textMat[0] * ctm[0] + textMat[1] * ctm[2]) * fontSize; + *m12 = (textMat[0] * ctm[1] + textMat[1] * ctm[3]) * fontSize; + *m21 = (textMat[2] * ctm[0] + textMat[3] * ctm[2]) * fontSize; + *m22 = (textMat[2] * ctm[1] + textMat[3] * ctm[3]) * fontSize; +} + +void GfxState::setCTM(double a, double b, double c, double d, double e, double f) +{ + ctm[0] = a; + ctm[1] = b; + ctm[2] = c; + ctm[3] = d; + ctm[4] = e; + ctm[5] = f; +} + +void GfxState::concatCTM(double a, double b, double c, double d, double e, double f) +{ + double a1 = ctm[0]; + double b1 = ctm[1]; + double c1 = ctm[2]; + double d1 = ctm[3]; + + ctm[0] = a * a1 + b * c1; + ctm[1] = a * b1 + b * d1; + ctm[2] = c * a1 + d * c1; + ctm[3] = c * b1 + d * d1; + ctm[4] = e * a1 + f * c1 + ctm[4]; + ctm[5] = e * b1 + f * d1 + ctm[5]; +} + +void GfxState::shiftCTMAndClip(double tx, double ty) +{ + ctm[4] += tx; + ctm[5] += ty; + clipXMin += tx; + clipYMin += ty; + clipXMax += tx; + clipYMax += ty; +} + +void GfxState::setFillColorSpace(GfxColorSpace *colorSpace) +{ + if (fillColorSpace) { + delete fillColorSpace; + } + fillColorSpace = colorSpace; +} + +void GfxState::setStrokeColorSpace(GfxColorSpace *colorSpace) +{ + if (strokeColorSpace) { + delete strokeColorSpace; + } + strokeColorSpace = colorSpace; +} + +void GfxState::setFillPattern(GfxPattern *pattern) +{ + if (fillPattern) { + delete fillPattern; + } + fillPattern = pattern; +} + +void GfxState::setStrokePattern(GfxPattern *pattern) +{ + if (strokePattern) { + delete strokePattern; + } + strokePattern = pattern; +} + +void GfxState::setFont(std::shared_ptr fontA, double fontSizeA) +{ + font = std::move(fontA); + fontSize = fontSizeA; +} + +void GfxState::setTransfer(Function **funcs) +{ + int i; + + for (i = 0; i < 4; ++i) { + if (transfer[i]) { + delete transfer[i]; + } + transfer[i] = funcs[i]; + } +} + +void GfxState::setLineDash(std::vector &&dash, double start) +{ + lineDash = dash; + lineDashStart = start; +} + +void GfxState::clearPath() +{ + delete path; + path = new GfxPath(); +} + +void GfxState::clip() +{ + double xMin, yMin, xMax, yMax, x, y; + GfxSubpath *subpath; + int i, j; + + xMin = xMax = yMin = yMax = 0; // make gcc happy + for (i = 0; i < path->getNumSubpaths(); ++i) { + subpath = path->getSubpath(i); + for (j = 0; j < subpath->getNumPoints(); ++j) { + transform(subpath->getX(j), subpath->getY(j), &x, &y); + if (i == 0 && j == 0) { + xMin = xMax = x; + yMin = yMax = y; + } else { + if (x < xMin) { + xMin = x; + } else if (x > xMax) { + xMax = x; + } + if (y < yMin) { + yMin = y; + } else if (y > yMax) { + yMax = y; + } + } + } + } + if (xMin > clipXMin) { + clipXMin = xMin; + } + if (yMin > clipYMin) { + clipYMin = yMin; + } + if (xMax < clipXMax) { + clipXMax = xMax; + } + if (yMax < clipYMax) { + clipYMax = yMax; + } +} + +void GfxState::clipToStrokePath() +{ + double xMin, yMin, xMax, yMax, x, y, t0, t1; + GfxSubpath *subpath; + int i, j; + + xMin = xMax = yMin = yMax = 0; // make gcc happy + for (i = 0; i < path->getNumSubpaths(); ++i) { + subpath = path->getSubpath(i); + for (j = 0; j < subpath->getNumPoints(); ++j) { + transform(subpath->getX(j), subpath->getY(j), &x, &y); + if (i == 0 && j == 0) { + xMin = xMax = x; + yMin = yMax = y; + } else { + if (x < xMin) { + xMin = x; + } else if (x > xMax) { + xMax = x; + } + if (y < yMin) { + yMin = y; + } else if (y > yMax) { + yMax = y; + } + } + } + } + + // allow for the line width + //~ miter joins can extend farther than this + t0 = fabs(ctm[0]); + t1 = fabs(ctm[2]); + if (t0 > t1) { + xMin -= 0.5 * lineWidth * t0; + xMax += 0.5 * lineWidth * t0; + } else { + xMin -= 0.5 * lineWidth * t1; + xMax += 0.5 * lineWidth * t1; + } + t0 = fabs(ctm[0]); + t1 = fabs(ctm[3]); + if (t0 > t1) { + yMin -= 0.5 * lineWidth * t0; + yMax += 0.5 * lineWidth * t0; + } else { + yMin -= 0.5 * lineWidth * t1; + yMax += 0.5 * lineWidth * t1; + } + + if (xMin > clipXMin) { + clipXMin = xMin; + } + if (yMin > clipYMin) { + clipYMin = yMin; + } + if (xMax < clipXMax) { + clipXMax = xMax; + } + if (yMax < clipYMax) { + clipYMax = yMax; + } +} + +void GfxState::clipToRect(double xMin, double yMin, double xMax, double yMax) +{ + double x, y, xMin1, yMin1, xMax1, yMax1; + + transform(xMin, yMin, &x, &y); + xMin1 = xMax1 = x; + yMin1 = yMax1 = y; + transform(xMax, yMin, &x, &y); + if (x < xMin1) { + xMin1 = x; + } else if (x > xMax1) { + xMax1 = x; + } + if (y < yMin1) { + yMin1 = y; + } else if (y > yMax1) { + yMax1 = y; + } + transform(xMax, yMax, &x, &y); + if (x < xMin1) { + xMin1 = x; + } else if (x > xMax1) { + xMax1 = x; + } + if (y < yMin1) { + yMin1 = y; + } else if (y > yMax1) { + yMax1 = y; + } + transform(xMin, yMax, &x, &y); + if (x < xMin1) { + xMin1 = x; + } else if (x > xMax1) { + xMax1 = x; + } + if (y < yMin1) { + yMin1 = y; + } else if (y > yMax1) { + yMax1 = y; + } + + if (xMin1 > clipXMin) { + clipXMin = xMin1; + } + if (yMin1 > clipYMin) { + clipYMin = yMin1; + } + if (xMax1 < clipXMax) { + clipXMax = xMax1; + } + if (yMax1 < clipYMax) { + clipYMax = yMax1; + } +} + +void GfxState::textShift(double tx, double ty) +{ + double dx, dy; + + textTransformDelta(tx, ty, &dx, &dy); + curX += dx; + curY += dy; +} + +void GfxState::shift(double dx, double dy) +{ + curX += dx; + curY += dy; +} + +GfxState *GfxState::save() +{ + GfxState *newState; + + newState = copy(); + newState->saved = this; + return newState; +} + +GfxState *GfxState::restore() +{ + GfxState *oldState; + + if (saved) { + oldState = saved; + + // these attributes aren't saved/restored by the q/Q operators + oldState->path = path; + oldState->curX = curX; + oldState->curY = curY; + oldState->lineX = lineX; + oldState->lineY = lineY; + + path = nullptr; + saved = nullptr; + delete this; + + } else { + oldState = this; + } + + return oldState; +} + +bool GfxState::parseBlendMode(Object *obj, GfxBlendMode *mode) +{ + int i, j; + + if (obj->isName()) { + for (i = 0; i < nGfxBlendModeNames; ++i) { + if (!strcmp(obj->getName(), gfxBlendModeNames[i].name)) { + *mode = gfxBlendModeNames[i].mode; + return true; + } + } + return false; + } else if (obj->isArray()) { + for (i = 0; i < obj->arrayGetLength(); ++i) { + Object obj2 = obj->arrayGet(i); + if (!obj2.isName()) { + return false; + } + for (j = 0; j < nGfxBlendModeNames; ++j) { + if (!strcmp(obj2.getName(), gfxBlendModeNames[j].name)) { + *mode = gfxBlendModeNames[j].mode; + return true; + } + } + } + *mode = gfxBlendNormal; + return true; + } else { + return false; + } +} diff --git a/poppler-24.05.0/poppler/GfxState.h b/poppler-24.05.0/poppler/GfxState.h new file mode 100644 index 0000000000000000000000000000000000000000..9cf1afc193da5cc14fcc2aaf0f074a4a63f1cd17 --- /dev/null +++ b/poppler-24.05.0/poppler/GfxState.h @@ -0,0 +1,1760 @@ +//======================================================================== +// +// GfxState.h +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Kristian Høgsberg +// Copyright (C) 2006, 2007 Jeff Muizelaar +// Copyright (C) 2006 Carlos Garcia Campos +// Copyright (C) 2009 Koji Otani +// Copyright (C) 2009-2011, 2013, 2016-2022 Albert Astals Cid +// Copyright (C) 2010 Christian Feuersänger +// Copyright (C) 2011 Andrea Canciani +// Copyright (C) 2011-2014, 2016, 2020 Thomas Freitag +// Copyright (C) 2013 Lu Wang +// Copyright (C) 2015, 2017, 2020, 2022 Adrian Johnson +// Copyright (C) 2017, 2019, 2022 Oliver Sander +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2020, 2021 Philipp Knechtges +// +// 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 +// +//======================================================================== + +#ifndef GFXSTATE_H +#define GFXSTATE_H + +#include "poppler-config.h" +#include "poppler_private_export.h" + +#include "Object.h" +#include "Function.h" + +#include +#include +#include +#include + +class Array; +class Gfx; +class GfxFont; +class PDFRectangle; +class GfxShading; +class OutputDev; +class GfxState; +class GfxResources; +class GfxSeparationColorSpace; + +class Matrix +{ +public: + double m[6]; + + void init(double xx, double yx, double xy, double yy, double x0, double y0) + { + m[0] = xx; + m[1] = yx; + m[2] = xy; + m[3] = yy; + m[4] = x0; + m[5] = y0; + } + bool invertTo(Matrix *other) const; + void translate(double tx, double ty); + void scale(double sx, double sy); + void transform(double x, double y, double *tx, double *ty) const; + double determinant() const { return m[0] * m[3] - m[1] * m[2]; } + double norm() const; +}; + +//------------------------------------------------------------------------ +// GfxBlendMode +//------------------------------------------------------------------------ + +enum GfxBlendMode +{ + gfxBlendNormal, + gfxBlendMultiply, + gfxBlendScreen, + gfxBlendOverlay, + gfxBlendDarken, + gfxBlendLighten, + gfxBlendColorDodge, + gfxBlendColorBurn, + gfxBlendHardLight, + gfxBlendSoftLight, + gfxBlendDifference, + gfxBlendExclusion, + gfxBlendHue, + gfxBlendSaturation, + gfxBlendColor, + gfxBlendLuminosity +}; + +//------------------------------------------------------------------------ +// GfxColorComp +//------------------------------------------------------------------------ + +// 16.16 fixed point color component +typedef int GfxColorComp; + +#define gfxColorComp1 0x10000 + +static inline GfxColorComp dblToCol(double x) +{ + return (GfxColorComp)(x * gfxColorComp1); +} + +static inline double colToDbl(GfxColorComp x) +{ + return (double)x / (double)gfxColorComp1; +} + +static inline unsigned char dblToByte(double x) +{ + return static_cast(x * 255.0); +} + +static inline double byteToDbl(unsigned char x) +{ + return (double)x / (double)255.0; +} + +static inline GfxColorComp byteToCol(unsigned char x) +{ + // (x / 255) << 16 = (0.0000000100000001... * x) << 16 + // = ((x << 8) + (x) + (x >> 8) + ...) << 16 + // = (x << 8) + (x) + (x >> 7) + // [for rounding] + return (GfxColorComp)((x << 8) + x + (x >> 7)); +} + +static inline unsigned char colToByte(GfxColorComp x) +{ + // 255 * x + 0.5 = 256 * x - x + 0x8000 + return (unsigned char)(((x << 8) - x + 0x8000) >> 16); +} + +static inline unsigned short colToShort(GfxColorComp x) +{ + return (unsigned short)(x); +} + +//------------------------------------------------------------------------ +// GfxColor +//------------------------------------------------------------------------ + +#define gfxColorMaxComps funcMaxOutputs + +struct GfxColor +{ + GfxColorComp c[gfxColorMaxComps]; +}; + +static inline void clearGfxColor(GfxColor *gfxColor) +{ + memset(gfxColor->c, 0, sizeof(GfxColorComp) * gfxColorMaxComps); +} + +//------------------------------------------------------------------------ +// GfxGray +//------------------------------------------------------------------------ + +typedef GfxColorComp GfxGray; + +//------------------------------------------------------------------------ +// GfxRGB +//------------------------------------------------------------------------ + +struct GfxRGB +{ + GfxColorComp r, g, b; + + bool operator==(GfxRGB other) const { return r == other.r && g == other.g && b == other.b; } +}; + +//------------------------------------------------------------------------ +// GfxCMYK +//------------------------------------------------------------------------ + +struct GfxCMYK +{ + GfxColorComp c, m, y, k; +}; + +//------------------------------------------------------------------------ +// GfxColorSpace +//------------------------------------------------------------------------ + +// NB: The nGfxColorSpaceModes constant and the gfxColorSpaceModeNames +// array defined in GfxState.cc must match this enum. +enum GfxColorSpaceMode +{ + csDeviceGray, + csCalGray, + csDeviceRGB, + csCalRGB, + csDeviceCMYK, + csLab, + csICCBased, + csIndexed, + csSeparation, + csDeviceN, + csPattern +}; + +// This shall hold a cmsHPROFILE handle. +// Only use the make_GfxLCMSProfilePtr function to construct this pointer, +// to ensure that the resources are properly released after usage. +typedef std::shared_ptr GfxLCMSProfilePtr; + +#ifdef USE_CMS +GfxLCMSProfilePtr POPPLER_PRIVATE_EXPORT make_GfxLCMSProfilePtr(void *profile); +#endif + +// wrapper of cmsHTRANSFORM to copy +class GfxColorTransform +{ +public: + void doTransform(void *in, void *out, unsigned int size); + // transformA should be a cmsHTRANSFORM + GfxColorTransform(void *transformA, int cmsIntent, unsigned int inputPixelType, unsigned int transformPixelType); + ~GfxColorTransform(); + GfxColorTransform(const GfxColorTransform &) = delete; + GfxColorTransform &operator=(const GfxColorTransform &) = delete; + int getIntent() const { return cmsIntent; } + int getInputPixelType() const { return inputPixelType; } + int getTransformPixelType() const { return transformPixelType; } + +private: + GfxColorTransform() { } + void *transform; + int cmsIntent; + unsigned int inputPixelType; + unsigned int transformPixelType; +}; + +class POPPLER_PRIVATE_EXPORT GfxColorSpace +{ +public: + GfxColorSpace(); + virtual ~GfxColorSpace(); + + GfxColorSpace(const GfxColorSpace &) = delete; + GfxColorSpace &operator=(const GfxColorSpace &other) = delete; + + virtual GfxColorSpace *copy() const = 0; + virtual GfxColorSpaceMode getMode() const = 0; + + // Construct a color space. Returns nullptr if unsuccessful. + static GfxColorSpace *parse(GfxResources *res, Object *csObj, OutputDev *out, GfxState *state, int recursion = 0); + + // Convert to gray, RGB, or CMYK. + virtual void getGray(const GfxColor *color, GfxGray *gray) const = 0; + virtual void getRGB(const GfxColor *color, GfxRGB *rgb) const = 0; + virtual void getCMYK(const GfxColor *color, GfxCMYK *cmyk) const = 0; + virtual void getDeviceN(const GfxColor *color, GfxColor *deviceN) const = 0; + virtual void getGrayLine(unsigned char * /*in*/, unsigned char * /*out*/, int /*length*/) { error(errInternal, -1, "GfxColorSpace::getGrayLine this should not happen"); } + virtual void getRGBLine(unsigned char * /*in*/, unsigned int * /*out*/, int /*length*/) { error(errInternal, -1, "GfxColorSpace::getRGBLine (first variant) this should not happen"); } + virtual void getRGBLine(unsigned char * /*in*/, unsigned char * /*out*/, int /*length*/) { error(errInternal, -1, "GfxColorSpace::getRGBLine (second variant) this should not happen"); } + virtual void getRGBXLine(unsigned char * /*in*/, unsigned char * /*out*/, int /*length*/) { error(errInternal, -1, "GfxColorSpace::getRGBXLine this should not happen"); } + virtual void getCMYKLine(unsigned char * /*in*/, unsigned char * /*out*/, int /*length*/) { error(errInternal, -1, "GfxColorSpace::getCMYKLine this should not happen"); } + virtual void getDeviceNLine(unsigned char * /*in*/, unsigned char * /*out*/, int /*length*/) { error(errInternal, -1, "GfxColorSpace::getDeviceNLine this should not happen"); } + + // create mapping for spot colorants + virtual void createMapping(std::vector *separationList, int maxSepComps); + int *getMapping() const { return mapping; } + + // Does this ColorSpace support getRGBLine? + virtual bool useGetRGBLine() const { return false; } + // Does this ColorSpace support getGrayLine? + virtual bool useGetGrayLine() const { return false; } + // Does this ColorSpace support getCMYKLine? + virtual bool useGetCMYKLine() const { return false; } + // Does this ColorSpace support getDeviceNLine? + virtual bool useGetDeviceNLine() const { return false; } + + // Return the number of color components. + virtual int getNComps() const = 0; + + // Get this color space's default color. + virtual void getDefaultColor(GfxColor *color) const = 0; + + // Return the default ranges for each component, assuming an image + // with a max pixel value of . + virtual void getDefaultRanges(double *decodeLow, double *decodeRange, int maxImgPixel) const; + + // Returns true if painting operations in this color space never + // mark the page (e.g., the "None" colorant). + virtual bool isNonMarking() const { return false; } + + // Return the color space's overprint mask. + unsigned int getOverprintMask() const { return overprintMask; } + + // Return the number of color space modes + static int getNumColorSpaceModes(); + + // Return the name of the th color space mode. + static const char *getColorSpaceModeName(int idx); + +protected: + unsigned int overprintMask; + int *mapping; +}; + +//------------------------------------------------------------------------ +// GfxDeviceGrayColorSpace +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GfxDeviceGrayColorSpace : public GfxColorSpace +{ +public: + GfxDeviceGrayColorSpace(); + ~GfxDeviceGrayColorSpace() override; + GfxColorSpace *copy() const override; + GfxColorSpaceMode getMode() const override { return csDeviceGray; } + + void getGray(const GfxColor *color, GfxGray *gray) const override; + void getRGB(const GfxColor *color, GfxRGB *rgb) const override; + void getCMYK(const GfxColor *color, GfxCMYK *cmyk) const override; + void getDeviceN(const GfxColor *color, GfxColor *deviceN) const override; + void getGrayLine(unsigned char *in, unsigned char *out, int length) override; + void getRGBLine(unsigned char *in, unsigned int *out, int length) override; + void getRGBLine(unsigned char *in, unsigned char *out, int length) override; + void getRGBXLine(unsigned char *in, unsigned char *out, int length) override; + void getCMYKLine(unsigned char *in, unsigned char *out, int length) override; + void getDeviceNLine(unsigned char *in, unsigned char *out, int length) override; + + bool useGetRGBLine() const override { return true; } + bool useGetGrayLine() const override { return true; } + bool useGetCMYKLine() const override { return true; } + bool useGetDeviceNLine() const override { return true; } + + int getNComps() const override { return 1; } + void getDefaultColor(GfxColor *color) const override; + +private: +}; + +//------------------------------------------------------------------------ +// GfxCalGrayColorSpace +//------------------------------------------------------------------------ + +class GfxCalGrayColorSpace : public GfxColorSpace +{ +public: + GfxCalGrayColorSpace(); + ~GfxCalGrayColorSpace() override; + GfxColorSpace *copy() const override; + GfxColorSpaceMode getMode() const override { return csCalGray; } + + // Construct a CalGray color space. Returns nullptr if unsuccessful. + static GfxColorSpace *parse(Array *arr, GfxState *state); + + void getGray(const GfxColor *color, GfxGray *gray) const override; + void getRGB(const GfxColor *color, GfxRGB *rgb) const override; + void getCMYK(const GfxColor *color, GfxCMYK *cmyk) const override; + void getDeviceN(const GfxColor *color, GfxColor *deviceN) const override; + + int getNComps() const override { return 1; } + void getDefaultColor(GfxColor *color) const override; + + // CalGray-specific access. + double getWhiteX() const { return whiteX; } + double getWhiteY() const { return whiteY; } + double getWhiteZ() const { return whiteZ; } + double getBlackX() const { return blackX; } + double getBlackY() const { return blackY; } + double getBlackZ() const { return blackZ; } + double getGamma() const { return gamma; } + +private: + double whiteX, whiteY, whiteZ; // white point + double blackX, blackY, blackZ; // black point + double gamma; // gamma value + void getXYZ(const GfxColor *color, double *pX, double *pY, double *pZ) const; +#ifdef USE_CMS + std::shared_ptr transform; +#endif +}; + +//------------------------------------------------------------------------ +// GfxDeviceRGBColorSpace +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GfxDeviceRGBColorSpace : public GfxColorSpace +{ +public: + GfxDeviceRGBColorSpace(); + ~GfxDeviceRGBColorSpace() override; + GfxColorSpace *copy() const override; + GfxColorSpaceMode getMode() const override { return csDeviceRGB; } + + void getGray(const GfxColor *color, GfxGray *gray) const override; + void getRGB(const GfxColor *color, GfxRGB *rgb) const override; + void getCMYK(const GfxColor *color, GfxCMYK *cmyk) const override; + void getDeviceN(const GfxColor *color, GfxColor *deviceN) const override; + void getGrayLine(unsigned char *in, unsigned char *out, int length) override; + void getRGBLine(unsigned char *in, unsigned int *out, int length) override; + void getRGBLine(unsigned char *in, unsigned char *out, int length) override; + void getRGBXLine(unsigned char *in, unsigned char *out, int length) override; + void getCMYKLine(unsigned char *in, unsigned char *out, int length) override; + void getDeviceNLine(unsigned char *in, unsigned char *out, int length) override; + + bool useGetRGBLine() const override { return true; } + bool useGetGrayLine() const override { return true; } + bool useGetCMYKLine() const override { return true; } + bool useGetDeviceNLine() const override { return true; } + + int getNComps() const override { return 3; } + void getDefaultColor(GfxColor *color) const override; + +private: +}; + +//------------------------------------------------------------------------ +// GfxCalRGBColorSpace +//------------------------------------------------------------------------ + +class GfxCalRGBColorSpace : public GfxColorSpace +{ +public: + GfxCalRGBColorSpace(); + ~GfxCalRGBColorSpace() override; + GfxColorSpace *copy() const override; + GfxColorSpaceMode getMode() const override { return csCalRGB; } + + // Construct a CalRGB color space. Returns nullptr if unsuccessful. + static GfxColorSpace *parse(Array *arr, GfxState *state); + + void getGray(const GfxColor *color, GfxGray *gray) const override; + void getRGB(const GfxColor *color, GfxRGB *rgb) const override; + void getCMYK(const GfxColor *color, GfxCMYK *cmyk) const override; + void getDeviceN(const GfxColor *color, GfxColor *deviceN) const override; + + int getNComps() const override { return 3; } + void getDefaultColor(GfxColor *color) const override; + + // CalRGB-specific access. + double getWhiteX() const { return whiteX; } + double getWhiteY() const { return whiteY; } + double getWhiteZ() const { return whiteZ; } + double getBlackX() const { return blackX; } + double getBlackY() const { return blackY; } + double getBlackZ() const { return blackZ; } + double getGammaR() const { return gammaR; } + double getGammaG() const { return gammaG; } + double getGammaB() const { return gammaB; } + const double *getMatrix() const { return mat; } + +private: + double whiteX, whiteY, whiteZ; // white point + double blackX, blackY, blackZ; // black point + double gammaR, gammaG, gammaB; // gamma values + double mat[9]; // ABC -> XYZ transform matrix + void getXYZ(const GfxColor *color, double *pX, double *pY, double *pZ) const; +#ifdef USE_CMS + std::shared_ptr transform; +#endif +}; + +//------------------------------------------------------------------------ +// GfxDeviceCMYKColorSpace +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GfxDeviceCMYKColorSpace : public GfxColorSpace +{ +public: + GfxDeviceCMYKColorSpace(); + ~GfxDeviceCMYKColorSpace() override; + GfxColorSpace *copy() const override; + GfxColorSpaceMode getMode() const override { return csDeviceCMYK; } + + void getGray(const GfxColor *color, GfxGray *gray) const override; + void getRGB(const GfxColor *color, GfxRGB *rgb) const override; + void getCMYK(const GfxColor *color, GfxCMYK *cmyk) const override; + void getDeviceN(const GfxColor *color, GfxColor *deviceN) const override; + void getRGBLine(unsigned char *in, unsigned int *out, int length) override; + void getRGBLine(unsigned char *, unsigned char *out, int length) override; + void getRGBXLine(unsigned char *in, unsigned char *out, int length) override; + void getCMYKLine(unsigned char *in, unsigned char *out, int length) override; + void getDeviceNLine(unsigned char *in, unsigned char *out, int length) override; + bool useGetRGBLine() const override { return true; } + bool useGetCMYKLine() const override { return true; } + bool useGetDeviceNLine() const override { return true; } + + int getNComps() const override { return 4; } + void getDefaultColor(GfxColor *color) const override; + +private: +}; + +//------------------------------------------------------------------------ +// GfxLabColorSpace +//------------------------------------------------------------------------ + +class GfxLabColorSpace : public GfxColorSpace +{ +public: + GfxLabColorSpace(); + ~GfxLabColorSpace() override; + GfxColorSpace *copy() const override; + GfxColorSpaceMode getMode() const override { return csLab; } + + // Construct a Lab color space. Returns nullptr if unsuccessful. + static GfxColorSpace *parse(Array *arr, GfxState *state); + + void getGray(const GfxColor *color, GfxGray *gray) const override; + void getRGB(const GfxColor *color, GfxRGB *rgb) const override; + void getCMYK(const GfxColor *color, GfxCMYK *cmyk) const override; + void getDeviceN(const GfxColor *color, GfxColor *deviceN) const override; + + int getNComps() const override { return 3; } + void getDefaultColor(GfxColor *color) const override; + + void getDefaultRanges(double *decodeLow, double *decodeRange, int maxImgPixel) const override; + + // Lab-specific access. + double getWhiteX() const { return whiteX; } + double getWhiteY() const { return whiteY; } + double getWhiteZ() const { return whiteZ; } + double getBlackX() const { return blackX; } + double getBlackY() const { return blackY; } + double getBlackZ() const { return blackZ; } + double getAMin() const { return aMin; } + double getAMax() const { return aMax; } + double getBMin() const { return bMin; } + double getBMax() const { return bMax; } + +private: + double whiteX, whiteY, whiteZ; // white point + double blackX, blackY, blackZ; // black point + double aMin, aMax, bMin, bMax; // range for the a and b components + void getXYZ(const GfxColor *color, double *pX, double *pY, double *pZ) const; +#ifdef USE_CMS + std::shared_ptr transform; +#endif +}; + +//------------------------------------------------------------------------ +// GfxICCBasedColorSpace +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GfxICCBasedColorSpace : public GfxColorSpace +{ +public: + GfxICCBasedColorSpace(int nCompsA, GfxColorSpace *altA, const Ref *iccProfileStreamA); + ~GfxICCBasedColorSpace() override; + GfxColorSpace *copy() const override; + GfxColorSpaceMode getMode() const override { return csICCBased; } + + // Construct an ICCBased color space. Returns nullptr if unsuccessful. + static GfxColorSpace *parse(Array *arr, OutputDev *out, GfxState *state, int recursion); + + void getGray(const GfxColor *color, GfxGray *gray) const override; + void getRGB(const GfxColor *color, GfxRGB *rgb) const override; + void getCMYK(const GfxColor *color, GfxCMYK *cmyk) const override; + void getDeviceN(const GfxColor *color, GfxColor *deviceN) const override; + void getRGBLine(unsigned char *in, unsigned int *out, int length) override; + void getRGBLine(unsigned char *in, unsigned char *out, int length) override; + void getRGBXLine(unsigned char *in, unsigned char *out, int length) override; + void getCMYKLine(unsigned char *in, unsigned char *out, int length) override; + void getDeviceNLine(unsigned char *in, unsigned char *out, int length) override; + + bool useGetRGBLine() const override; + bool useGetCMYKLine() const override; + bool useGetDeviceNLine() const override; + + int getNComps() const override { return nComps; } + void getDefaultColor(GfxColor *color) const override; + + void getDefaultRanges(double *decodeLow, double *decodeRange, int maxImgPixel) const override; + + // ICCBased-specific access. + GfxColorSpace *getAlt() { return alt; } + Ref getRef() { return iccProfileStream; } +#ifdef USE_CMS + char *getPostScriptCSA(); + void buildTransforms(GfxState *state); + void setProfile(GfxLCMSProfilePtr &profileA) { profile = profileA; } + GfxLCMSProfilePtr getProfile() { return profile; } +#endif + +private: + int nComps; // number of color components (1, 3, or 4) + GfxColorSpace *alt; // alternate color space + double rangeMin[4]; // min values for each component + double rangeMax[4]; // max values for each component + Ref iccProfileStream; // the ICC profile +#ifdef USE_CMS + GfxLCMSProfilePtr profile; + char *psCSA; + int getIntent() { return (transform != nullptr) ? transform->getIntent() : 0; } + std::shared_ptr transform; + std::shared_ptr lineTransform; // color transform for line + mutable std::map cmsCache; +#endif +}; +//------------------------------------------------------------------------ +// GfxIndexedColorSpace +//------------------------------------------------------------------------ + +class GfxIndexedColorSpace : public GfxColorSpace +{ +public: + GfxIndexedColorSpace(GfxColorSpace *baseA, int indexHighA); + ~GfxIndexedColorSpace() override; + GfxColorSpace *copy() const override; + GfxColorSpaceMode getMode() const override { return csIndexed; } + + // Construct an Indexed color space. Returns nullptr if unsuccessful. + static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion); + + void getGray(const GfxColor *color, GfxGray *gray) const override; + void getRGB(const GfxColor *color, GfxRGB *rgb) const override; + void getCMYK(const GfxColor *color, GfxCMYK *cmyk) const override; + void getDeviceN(const GfxColor *color, GfxColor *deviceN) const override; + void getRGBLine(unsigned char *in, unsigned int *out, int length) override; + void getRGBLine(unsigned char *in, unsigned char *out, int length) override; + void getRGBXLine(unsigned char *in, unsigned char *out, int length) override; + void getCMYKLine(unsigned char *in, unsigned char *out, int length) override; + void getDeviceNLine(unsigned char *in, unsigned char *out, int length) override; + + bool useGetRGBLine() const override { return true; } + bool useGetCMYKLine() const override { return true; } + bool useGetDeviceNLine() const override { return true; } + + int getNComps() const override { return 1; } + void getDefaultColor(GfxColor *color) const override; + + void getDefaultRanges(double *decodeLow, double *decodeRange, int maxImgPixel) const override; + + // Indexed-specific access. + GfxColorSpace *getBase() { return base; } + int getIndexHigh() const { return indexHigh; } + unsigned char *getLookup() { return lookup; } + GfxColor *mapColorToBase(const GfxColor *color, GfxColor *baseColor) const; + unsigned int getOverprintMask() const { return base->getOverprintMask(); } + void createMapping(std::vector *separationList, int maxSepComps) override { base->createMapping(separationList, maxSepComps); } + +private: + GfxColorSpace *base; // base color space + int indexHigh; // max pixel value + unsigned char *lookup; // lookup table +}; + +//------------------------------------------------------------------------ +// GfxSeparationColorSpace +//------------------------------------------------------------------------ + +class GfxSeparationColorSpace : public GfxColorSpace +{ +public: + GfxSeparationColorSpace(GooString *nameA, GfxColorSpace *altA, Function *funcA); + ~GfxSeparationColorSpace() override; + GfxColorSpace *copy() const override; + GfxColorSpaceMode getMode() const override { return csSeparation; } + + // Construct a Separation color space. Returns nullptr if unsuccessful. + static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion); + + void getGray(const GfxColor *color, GfxGray *gray) const override; + void getRGB(const GfxColor *color, GfxRGB *rgb) const override; + void getCMYK(const GfxColor *color, GfxCMYK *cmyk) const override; + void getDeviceN(const GfxColor *color, GfxColor *deviceN) const override; + + void createMapping(std::vector *separationList, int maxSepComps) override; + + int getNComps() const override { return 1; } + void getDefaultColor(GfxColor *color) const override; + + bool isNonMarking() const override { return nonMarking; } + + // Separation-specific access. + const GooString *getName() const { return name; } + GfxColorSpace *getAlt() { return alt; } + const Function *getFunc() const { return func; } + +private: + GfxSeparationColorSpace(GooString *nameA, GfxColorSpace *altA, Function *funcA, bool nonMarkingA, unsigned int overprintMaskA, int *mappingA); + + GooString *name; // colorant name + GfxColorSpace *alt; // alternate color space + Function *func; // tint transform (into alternate color space) + bool nonMarking; +}; + +//------------------------------------------------------------------------ +// GfxDeviceNColorSpace +//------------------------------------------------------------------------ + +class GfxDeviceNColorSpace : public GfxColorSpace +{ +public: + GfxDeviceNColorSpace(int nCompsA, std::vector &&namesA, GfxColorSpace *alt, Function *func, std::vector *sepsCS); + ~GfxDeviceNColorSpace() override; + GfxColorSpace *copy() const override; + GfxColorSpaceMode getMode() const override { return csDeviceN; } + + // Construct a DeviceN color space. Returns nullptr if unsuccessful. + static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion); + + void getGray(const GfxColor *color, GfxGray *gray) const override; + void getRGB(const GfxColor *color, GfxRGB *rgb) const override; + void getCMYK(const GfxColor *color, GfxCMYK *cmyk) const override; + void getDeviceN(const GfxColor *color, GfxColor *deviceN) const override; + + void createMapping(std::vector *separationList, int maxSepComps) override; + + int getNComps() const override { return nComps; } + void getDefaultColor(GfxColor *color) const override; + + bool isNonMarking() const override { return nonMarking; } + + // DeviceN-specific access. + const std::string &getColorantName(int i) const { return names[i]; } + GfxColorSpace *getAlt() { return alt; } + const Function *getTintTransformFunc() const { return func; } + +private: + GfxDeviceNColorSpace(int nCompsA, const std::vector &namesA, GfxColorSpace *alt, Function *func, std::vector *sepsCSA, int *mappingA, bool nonMarkingA, unsigned int overprintMaskA); + + const int nComps; // number of components + const std::vector names; // colorant names + GfxColorSpace *alt; // alternate color space + Function *func; // tint transform (into alternate color space) + bool nonMarking; + std::vector *sepsCS; // list of separation cs for spot colorants; +}; + +//------------------------------------------------------------------------ +// GfxPatternColorSpace +//------------------------------------------------------------------------ + +class GfxPatternColorSpace : public GfxColorSpace +{ +public: + explicit GfxPatternColorSpace(GfxColorSpace *underA); + ~GfxPatternColorSpace() override; + GfxColorSpace *copy() const override; + GfxColorSpaceMode getMode() const override { return csPattern; } + + // Construct a Pattern color space. Returns nullptr if unsuccessful. + static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion); + + void getGray(const GfxColor *color, GfxGray *gray) const override; + void getRGB(const GfxColor *color, GfxRGB *rgb) const override; + void getCMYK(const GfxColor *color, GfxCMYK *cmyk) const override; + void getDeviceN(const GfxColor *color, GfxColor *deviceN) const override; + + int getNComps() const override { return 0; } + void getDefaultColor(GfxColor *color) const override; + + // Pattern-specific access. + GfxColorSpace *getUnder() { return under; } + +private: + GfxColorSpace *under; // underlying color space (for uncolored + // patterns) +}; + +//------------------------------------------------------------------------ +// GfxPattern +//------------------------------------------------------------------------ + +class GfxPattern +{ +public: + GfxPattern(int typeA, int patternRefNumA); + virtual ~GfxPattern(); + + GfxPattern(const GfxPattern &) = delete; + GfxPattern &operator=(const GfxPattern &other) = delete; + + static GfxPattern *parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state, int patternRefNum); + + virtual GfxPattern *copy() const = 0; + + int getType() const { return type; } + + int getPatternRefNum() const { return patternRefNum; } + +private: + int type; + int patternRefNum; +}; + +//------------------------------------------------------------------------ +// GfxTilingPattern +//------------------------------------------------------------------------ + +class GfxTilingPattern : public GfxPattern +{ +public: + static GfxTilingPattern *parse(Object *patObj, int patternRefNum); + ~GfxTilingPattern() override; + + GfxPattern *copy() const override; + + int getPaintType() const { return paintType; } + int getTilingType() const { return tilingType; } + const double *getBBox() const { return bbox; } + double getXStep() const { return xStep; } + double getYStep() const { return yStep; } + Dict *getResDict() { return resDict.isDict() ? resDict.getDict() : (Dict *)nullptr; } + const double *getMatrix() const { return matrix; } + Object *getContentStream() { return &contentStream; } + +private: + GfxTilingPattern(int paintTypeA, int tilingTypeA, const double *bboxA, double xStepA, double yStepA, const Object *resDictA, const double *matrixA, const Object *contentStreamA, int patternRefNumA); + + int paintType; + int tilingType; + double bbox[4]; + double xStep, yStep; + Object resDict; + double matrix[6]; + Object contentStream; +}; + +//------------------------------------------------------------------------ +// GfxShadingPattern +//------------------------------------------------------------------------ + +class GfxShadingPattern : public GfxPattern +{ +public: + static GfxShadingPattern *parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state, int patternRefNum); + ~GfxShadingPattern() override; + + GfxPattern *copy() const override; + + GfxShading *getShading() { return shading; } + const double *getMatrix() const { return matrix; } + +private: + GfxShadingPattern(GfxShading *shadingA, const double *matrixA, int patternRefNumA); + + GfxShading *shading; + double matrix[6]; +}; + +//------------------------------------------------------------------------ +// GfxShading +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GfxShading +{ +public: + explicit GfxShading(int typeA); + explicit GfxShading(const GfxShading *shading); + virtual ~GfxShading(); + + GfxShading(const GfxShading &) = delete; + GfxShading &operator=(const GfxShading &other) = delete; + + static GfxShading *parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state); + + virtual GfxShading *copy() const = 0; + + int getType() const { return type; } + GfxColorSpace *getColorSpace() { return colorSpace; } + const GfxColor *getBackground() const { return &background; } + bool getHasBackground() const { return hasBackground; } + void getBBox(double *xMinA, double *yMinA, double *xMaxA, double *yMaxA) const + { + *xMinA = bbox_xMin; + *yMinA = bbox_yMin; + *xMaxA = bbox_xMax; + *yMaxA = bbox_yMax; + } + bool getHasBBox() const { return hasBBox; } + +protected: + virtual bool init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state); + + // 1: Function-based shading + // 2: Axial shading + // 3: Radial shading + // 4: Free-form Gouraud-shaded triangle mesh + // 5: Lattice-form Gouraud-shaded triangle mesh + // 6: Coons patch mesh + // 7: Tensor-product patch mesh + int type; + bool hasBackground; + bool hasBBox; + GfxColorSpace *colorSpace; + GfxColor background; + double bbox_xMin, bbox_yMin, bbox_xMax, bbox_yMax; +}; + +//------------------------------------------------------------------------ +// GfxUnivariateShading +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GfxUnivariateShading : public GfxShading +{ +public: + GfxUnivariateShading(int typeA, double t0A, double t1A, std::vector> &&funcsA, bool extend0A, bool extend1A); + explicit GfxUnivariateShading(const GfxUnivariateShading *shading); + ~GfxUnivariateShading() override; + + double getDomain0() const { return t0; } + double getDomain1() const { return t1; } + bool getExtend0() const { return extend0; } + bool getExtend1() const { return extend1; } + int getNFuncs() const { return funcs.size(); } + const Function *getFunc(int i) const { return funcs[i].get(); } + // returns the nComps of the shading + // i.e. how many positions of color have been set + int getColor(double t, GfxColor *color); + + void setupCache(const Matrix *ctm, double xMin, double yMin, double xMax, double yMax); + + virtual void getParameterRange(double *lower, double *upper, double xMin, double yMin, double xMax, double yMax) = 0; + + virtual double getDistance(double sMin, double sMax) const = 0; + +protected: + bool init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) override; + +private: + double t0, t1; + std::vector> funcs; + bool extend0, extend1; + + int cacheSize, lastMatch; + double *cacheBounds; + double *cacheCoeff; + double *cacheValues; +}; + +//------------------------------------------------------------------------ +// GfxFunctionShading +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GfxFunctionShading : public GfxShading +{ +public: + GfxFunctionShading(double x0A, double y0A, double x1A, double y1A, const double *matrixA, std::vector> &&funcsA); + explicit GfxFunctionShading(const GfxFunctionShading *shading); + ~GfxFunctionShading() override; + + static GfxFunctionShading *parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state); + + GfxShading *copy() const override; + + void getDomain(double *x0A, double *y0A, double *x1A, double *y1A) const + { + *x0A = x0; + *y0A = y0; + *x1A = x1; + *y1A = y1; + } + const double *getMatrix() const { return matrix; } + int getNFuncs() const { return funcs.size(); } + const Function *getFunc(int i) const { return funcs[i].get(); } + void getColor(double x, double y, GfxColor *color) const; + +protected: + bool init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) override; + +private: + double x0, y0, x1, y1; + double matrix[6]; + std::vector> funcs; +}; + +//------------------------------------------------------------------------ +// GfxAxialShading +//------------------------------------------------------------------------ + +class GfxAxialShading : public GfxUnivariateShading +{ +public: + GfxAxialShading(double x0A, double y0A, double x1A, double y1A, double t0A, double t1A, std::vector> &&funcsA, bool extend0A, bool extend1A); + explicit GfxAxialShading(const GfxAxialShading *shading); + ~GfxAxialShading() override; + + static GfxAxialShading *parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state); + + GfxShading *copy() const override; + + void getCoords(double *x0A, double *y0A, double *x1A, double *y1A) const + { + *x0A = x0; + *y0A = y0; + *x1A = x1; + *y1A = y1; + } + + void getParameterRange(double *lower, double *upper, double xMin, double yMin, double xMax, double yMax) override; + + double getDistance(double sMin, double sMax) const override; + +private: + double x0, y0, x1, y1; +}; + +//------------------------------------------------------------------------ +// GfxRadialShading +//------------------------------------------------------------------------ + +class GfxRadialShading : public GfxUnivariateShading +{ +public: + GfxRadialShading(double x0A, double y0A, double r0A, double x1A, double y1A, double r1A, double t0A, double t1A, std::vector> &&funcsA, bool extend0A, bool extend1A); + explicit GfxRadialShading(const GfxRadialShading *shading); + ~GfxRadialShading() override; + + static GfxRadialShading *parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state); + + GfxShading *copy() const override; + + void getCoords(double *x0A, double *y0A, double *r0A, double *x1A, double *y1A, double *r1A) const + { + *x0A = x0; + *y0A = y0; + *r0A = r0; + *x1A = x1; + *y1A = y1; + *r1A = r1; + } + + void getParameterRange(double *lower, double *upper, double xMin, double yMin, double xMax, double yMax) override; + + double getDistance(double sMin, double sMax) const override; + +private: + double x0, y0, r0, x1, y1, r1; +}; + +//------------------------------------------------------------------------ +// GfxGouraudTriangleShading +//------------------------------------------------------------------------ + +struct GfxGouraudVertex +{ + double x, y; + GfxColor color; +}; + +class POPPLER_PRIVATE_EXPORT GfxGouraudTriangleShading : public GfxShading +{ +public: + GfxGouraudTriangleShading(int typeA, GfxGouraudVertex *verticesA, int nVerticesA, int (*trianglesA)[3], int nTrianglesA, std::vector> &&funcsA); + explicit GfxGouraudTriangleShading(const GfxGouraudTriangleShading *shading); + ~GfxGouraudTriangleShading() override; + + static GfxGouraudTriangleShading *parse(GfxResources *res, int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state); + + GfxShading *copy() const override; + + int getNTriangles() const { return nTriangles; } + + bool isParameterized() const { return !funcs.empty(); } + + /** + * @precondition isParameterized() == true + */ + double getParameterDomainMin() const + { + assert(isParameterized()); + return funcs[0]->getDomainMin(0); + } + + /** + * @precondition isParameterized() == true + */ + double getParameterDomainMax() const + { + assert(isParameterized()); + return funcs[0]->getDomainMax(0); + } + + /** + * @precondition isParameterized() == false + */ + void getTriangle(int i, double *x0, double *y0, GfxColor *color0, double *x1, double *y1, GfxColor *color1, double *x2, double *y2, GfxColor *color2); + + /** + * Variant for functions. + * + * @precondition isParameterized() == true + */ + void getTriangle(int i, double *x0, double *y0, double *color0, double *x1, double *y1, double *color1, double *x2, double *y2, double *color2); + + void getParameterizedColor(double t, GfxColor *color) const; + +protected: + bool init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) override; + +private: + GfxGouraudVertex *vertices; + int nVertices; + int (*triangles)[3]; + int nTriangles; + std::vector> funcs; +}; + +//------------------------------------------------------------------------ +// GfxPatchMeshShading +//------------------------------------------------------------------------ + +/** + * A tensor product cubic bezier patch consisting of 4x4 points and 4 color + * values. + * + * See the Shading Type 7 specifications. Note that Shading Type 6 is also + * represented using GfxPatch. + */ +struct GfxPatch +{ + /** + * Represents a single color value for the patch. + */ + struct ColorValue + { + /** + * For parameterized patches, only element 0 is valid; it contains + * the single parameter. + * + * For non-parameterized patches, c contains all color components + * as decoded from the input stream. In this case, you will need to + * use dblToCol() before assigning them to GfxColor. + */ + double c[gfxColorMaxComps]; + }; + + double x[4][4]; + double y[4][4]; + ColorValue color[2][2]; +}; + +class POPPLER_PRIVATE_EXPORT GfxPatchMeshShading : public GfxShading +{ +public: + GfxPatchMeshShading(int typeA, GfxPatch *patchesA, int nPatchesA, std::vector> &&funcsA); + explicit GfxPatchMeshShading(const GfxPatchMeshShading *shading); + ~GfxPatchMeshShading() override; + + static GfxPatchMeshShading *parse(GfxResources *res, int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state); + + GfxShading *copy() const override; + + int getNPatches() const { return nPatches; } + const GfxPatch *getPatch(int i) const { return &patches[i]; } + + bool isParameterized() const { return !funcs.empty(); } + + /** + * @precondition isParameterized() == true + */ + double getParameterDomainMin() const + { + assert(isParameterized()); + return funcs[0]->getDomainMin(0); + } + + /** + * @precondition isParameterized() == true + */ + double getParameterDomainMax() const + { + assert(isParameterized()); + return funcs[0]->getDomainMax(0); + } + + void getParameterizedColor(double t, GfxColor *color) const; + +protected: + bool init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) override; + +private: + GfxPatch *patches; + int nPatches; + std::vector> funcs; +}; + +//------------------------------------------------------------------------ +// GfxImageColorMap +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GfxImageColorMap +{ +public: + // Constructor. + GfxImageColorMap(int bitsA, Object *decode, GfxColorSpace *colorSpaceA); + + // Destructor. + ~GfxImageColorMap(); + + GfxImageColorMap(const GfxImageColorMap &) = delete; + GfxImageColorMap &operator=(const GfxImageColorMap &) = delete; + + // Return a copy of this color map. + GfxImageColorMap *copy() const { return new GfxImageColorMap(this); } + + // Is color map valid? + bool isOk() const { return ok; } + + // Get the color space. + GfxColorSpace *getColorSpace() { return colorSpace; } + + // Get stream decoding info. + int getNumPixelComps() const { return nComps; } + int getBits() const { return bits; } + + // Get decode table. + double getDecodeLow(int i) const { return decodeLow[i]; } + double getDecodeHigh(int i) const { return decodeLow[i] + decodeRange[i]; } + + bool useRGBLine() const { return (colorSpace2 && colorSpace2->useGetRGBLine()) || (!colorSpace2 && colorSpace->useGetRGBLine()); } + bool useCMYKLine() const { return (colorSpace2 && colorSpace2->useGetCMYKLine()) || (!colorSpace2 && colorSpace->useGetCMYKLine()); } + bool useDeviceNLine() const { return (colorSpace2 && colorSpace2->useGetDeviceNLine()) || (!colorSpace2 && colorSpace->useGetDeviceNLine()); } + + // Convert an image pixel to a color. + void getGray(const unsigned char *x, GfxGray *gray); + void getRGB(const unsigned char *x, GfxRGB *rgb); + void getRGBLine(unsigned char *in, unsigned int *out, int length); + void getRGBLine(unsigned char *in, unsigned char *out, int length); + void getRGBXLine(unsigned char *in, unsigned char *out, int length); + void getGrayLine(unsigned char *in, unsigned char *out, int length); + void getCMYKLine(unsigned char *in, unsigned char *out, int length); + void getDeviceNLine(unsigned char *in, unsigned char *out, int length); + void getCMYK(const unsigned char *x, GfxCMYK *cmyk); + void getDeviceN(const unsigned char *x, GfxColor *deviceN); + void getColor(const unsigned char *x, GfxColor *color); + + // Matte color ops + void setMatteColor(const GfxColor *color) + { + useMatte = true; + matteColor = *color; + } + const GfxColor *getMatteColor() const { return (useMatte) ? &matteColor : nullptr; } + +private: + explicit GfxImageColorMap(const GfxImageColorMap *colorMap); + + GfxColorSpace *colorSpace; // the image color space + int bits; // bits per component + int nComps; // number of components in a pixel + GfxColorSpace *colorSpace2; // secondary color space + int nComps2; // number of components in colorSpace2 + GfxColorComp * // lookup table + lookup[gfxColorMaxComps]; + GfxColorComp * // optimized case lookup table + lookup2[gfxColorMaxComps]; + unsigned char *byte_lookup; + double // minimum values for each component + decodeLow[gfxColorMaxComps]; + double // max - min value for each component + decodeRange[gfxColorMaxComps]; + bool useMatte; + GfxColor matteColor; + bool ok; +}; + +//------------------------------------------------------------------------ +// GfxSubpath and GfxPath +//------------------------------------------------------------------------ + +class GfxSubpath +{ +public: + // Constructor. + GfxSubpath(double x1, double y1); + + // Destructor. + ~GfxSubpath(); + + GfxSubpath(const GfxSubpath &) = delete; + GfxSubpath &operator=(const GfxSubpath &) = delete; + + // Copy. + GfxSubpath *copy() const { return new GfxSubpath(this); } + + // Get points. + int getNumPoints() const { return n; } + double getX(int i) const { return x[i]; } + double getY(int i) const { return y[i]; } + bool getCurve(int i) const { return curve[i]; } + + void setX(int i, double a) { x[i] = a; } + void setY(int i, double a) { y[i] = a; } + + // Get last point. + double getLastX() const { return x[n - 1]; } + double getLastY() const { return y[n - 1]; } + + // Add a line segment. + void lineTo(double x1, double y1); + + // Add a Bezier curve. + void curveTo(double x1, double y1, double x2, double y2, double x3, double y3); + + // Close the subpath. + void close(); + bool isClosed() const { return closed; } + + // Add (, ) to each point in the subpath. + void offset(double dx, double dy); + +private: + double *x, *y; // points + bool *curve; // curve[i] => point i is a control point + // for a Bezier curve + int n; // number of points + int size; // size of x/y arrays + bool closed; // set if path is closed + + explicit GfxSubpath(const GfxSubpath *subpath); +}; + +class POPPLER_PRIVATE_EXPORT GfxPath +{ +public: + // Constructor. + GfxPath(); + + // Destructor. + ~GfxPath(); + + GfxPath(const GfxPath &) = delete; + GfxPath &operator=(const GfxPath &) = delete; + + // Copy. + GfxPath *copy() const { return new GfxPath(justMoved, firstX, firstY, subpaths, n, size); } + + // Is there a current point? + bool isCurPt() const { return n > 0 || justMoved; } + + // Is the path non-empty, i.e., is there at least one segment? + bool isPath() const { return n > 0; } + + // Get subpaths. + int getNumSubpaths() const { return n; } + GfxSubpath *getSubpath(int i) { return subpaths[i]; } + const GfxSubpath *getSubpath(int i) const { return subpaths[i]; } + + // Get last point on last subpath. + double getLastX() const { return subpaths[n - 1]->getLastX(); } + double getLastY() const { return subpaths[n - 1]->getLastY(); } + + // Move the current point. + void moveTo(double x, double y); + + // Add a segment to the last subpath. + void lineTo(double x, double y); + + // Add a Bezier curve to the last subpath + void curveTo(double x1, double y1, double x2, double y2, double x3, double y3); + + // Close the last subpath. + void close(); + + // Append to . + void append(GfxPath *path); + + // Add (, ) to each point in the path. + void offset(double dx, double dy); + +private: + bool justMoved; // set if a new subpath was just started + double firstX, firstY; // first point in new subpath + GfxSubpath **subpaths; // subpaths + int n; // number of subpaths + int size; // size of subpaths array + + GfxPath(bool justMoved1, double firstX1, double firstY1, GfxSubpath **subpaths1, int n1, int size1); +}; + +//------------------------------------------------------------------------ +// GfxState +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GfxState +{ +public: + /** + * When GfxState::getReusablePath() is invoked, the currently active + * path is taken per reference and its coordinates can be re-edited. + * + * A ReusablePathIterator is intended to reduce overhead when the same + * path type is used a lot of times, only with different coordinates. It + * allows just to update the coordinates (occurring in the same order as + * in the original path). + */ + class ReusablePathIterator + { + public: + /** + * Creates the ReusablePathIterator. This should only be done from + * GfxState::getReusablePath(). + * + * @param path the path as it is used so far. Changing this path, + * deleting it or starting a new path from scratch will most likely + * invalidate the iterator (and may cause serious problems). Make + * sure the path's memory structure is not changed during the + * lifetime of the ReusablePathIterator. + */ + explicit ReusablePathIterator(GfxPath *path); + + /** + * Returns true if and only if the current iterator position is + * beyond the last valid point. + * + * A call to setCoord() will be undefined. + */ + bool isEnd() const; + + /** + * Advances the iterator. + */ + void next(); + + /** + * Updates the coordinates associated to the current iterator + * position. + */ + void setCoord(double x, double y); + + /** + * Resets the iterator. + */ + void reset(); + + private: + GfxPath *path; + int subPathOff; + + int coordOff; + int numCoords; + + GfxSubpath *curSubPath; + }; + + // Construct a default GfxState, for a device with resolution + // x , page box , page rotation , and + // coordinate system specified by . + GfxState(double hDPIA, double vDPIA, const PDFRectangle *pageBox, int rotateA, bool upsideDown); + + // Destructor. + ~GfxState(); + + GfxState(const GfxState &) = delete; + GfxState &operator=(const GfxState &) = delete; + + // Copy. + GfxState *copy(bool copyPath = false) const { return new GfxState(this, copyPath); } + + // Accessors. + double getHDPI() const { return hDPI; } + double getVDPI() const { return vDPI; } + const double *getCTM() const { return ctm; } + void getCTM(Matrix *m) const { memcpy(m->m, ctm, sizeof m->m); } + double getX1() const { return px1; } + double getY1() const { return py1; } + double getX2() const { return px2; } + double getY2() const { return py2; } + double getPageWidth() const { return pageWidth; } + double getPageHeight() const { return pageHeight; } + int getRotate() const { return rotate; } + const GfxColor *getFillColor() const { return &fillColor; } + const GfxColor *getStrokeColor() const { return &strokeColor; } + void getFillGray(GfxGray *gray) { fillColorSpace->getGray(&fillColor, gray); } + void getStrokeGray(GfxGray *gray) { strokeColorSpace->getGray(&strokeColor, gray); } + void getFillRGB(GfxRGB *rgb) const { fillColorSpace->getRGB(&fillColor, rgb); } + void getStrokeRGB(GfxRGB *rgb) const { strokeColorSpace->getRGB(&strokeColor, rgb); } + void getFillCMYK(GfxCMYK *cmyk) { fillColorSpace->getCMYK(&fillColor, cmyk); } + void getFillDeviceN(GfxColor *deviceN) { fillColorSpace->getDeviceN(&fillColor, deviceN); } + void getStrokeCMYK(GfxCMYK *cmyk) { strokeColorSpace->getCMYK(&strokeColor, cmyk); } + void getStrokeDeviceN(GfxColor *deviceN) { strokeColorSpace->getDeviceN(&strokeColor, deviceN); } + GfxColorSpace *getFillColorSpace() { return fillColorSpace; } + GfxColorSpace *getStrokeColorSpace() { return strokeColorSpace; } + GfxPattern *getFillPattern() { return fillPattern; } + GfxPattern *getStrokePattern() { return strokePattern; } + GfxBlendMode getBlendMode() const { return blendMode; } + double getFillOpacity() const { return fillOpacity; } + double getStrokeOpacity() const { return strokeOpacity; } + bool getFillOverprint() const { return fillOverprint; } + bool getStrokeOverprint() const { return strokeOverprint; } + int getOverprintMode() const { return overprintMode; } + Function **getTransfer() { return transfer; } + double getLineWidth() const { return lineWidth; } + const std::vector &getLineDash(double *start) + { + *start = lineDashStart; + return lineDash; + } + int getFlatness() const { return flatness; } + int getLineJoin() const { return lineJoin; } + int getLineCap() const { return lineCap; } + double getMiterLimit() const { return miterLimit; } + bool getStrokeAdjust() const { return strokeAdjust; } + bool getAlphaIsShape() const { return alphaIsShape; } + bool getTextKnockout() const { return textKnockout; } + const std::shared_ptr &getFont() const { return font; } + double getFontSize() const { return fontSize; } + const double *getTextMat() const { return textMat; } + double getCharSpace() const { return charSpace; } + double getWordSpace() const { return wordSpace; } + double getHorizScaling() const { return horizScaling; } + double getLeading() const { return leading; } + double getRise() const { return rise; } + int getRender() const { return render; } + const char *getRenderingIntent() const { return renderingIntent; } + const GfxPath *getPath() const { return path; } + void setPath(GfxPath *pathA); + double getCurX() const { return curX; } + double getCurY() const { return curY; } + void getClipBBox(double *xMin, double *yMin, double *xMax, double *yMax) const + { + *xMin = clipXMin; + *yMin = clipYMin; + *xMax = clipXMax; + *yMax = clipYMax; + } + void getUserClipBBox(double *xMin, double *yMin, double *xMax, double *yMax) const; + double getLineX() const { return lineX; } + double getLineY() const { return lineY; } + + // Is there a current point/path? + bool isCurPt() const { return path->isCurPt(); } + bool isPath() const { return path->isPath(); } + + // Transforms. + void transform(double x1, double y1, double *x2, double *y2) const + { + *x2 = ctm[0] * x1 + ctm[2] * y1 + ctm[4]; + *y2 = ctm[1] * x1 + ctm[3] * y1 + ctm[5]; + } + void transformDelta(double x1, double y1, double *x2, double *y2) const + { + *x2 = ctm[0] * x1 + ctm[2] * y1; + *y2 = ctm[1] * x1 + ctm[3] * y1; + } + void textTransform(double x1, double y1, double *x2, double *y2) const + { + *x2 = textMat[0] * x1 + textMat[2] * y1 + textMat[4]; + *y2 = textMat[1] * x1 + textMat[3] * y1 + textMat[5]; + } + void textTransformDelta(double x1, double y1, double *x2, double *y2) const + { + *x2 = textMat[0] * x1 + textMat[2] * y1; + *y2 = textMat[1] * x1 + textMat[3] * y1; + } + double transformWidth(double w) const; + double getTransformedLineWidth() const { return transformWidth(lineWidth); } + double getTransformedFontSize() const; + void getFontTransMat(double *m11, double *m12, double *m21, double *m22) const; + + // Change state parameters. + void setCTM(double a, double b, double c, double d, double e, double f); + void concatCTM(double a, double b, double c, double d, double e, double f); + void shiftCTMAndClip(double tx, double ty); + void setFillColorSpace(GfxColorSpace *colorSpace); + void setStrokeColorSpace(GfxColorSpace *colorSpace); + void setFillColor(const GfxColor *color) { fillColor = *color; } + void setStrokeColor(const GfxColor *color) { strokeColor = *color; } + void setFillPattern(GfxPattern *pattern); + void setStrokePattern(GfxPattern *pattern); + void setBlendMode(GfxBlendMode mode) { blendMode = mode; } + void setFillOpacity(double opac) { fillOpacity = opac; } + void setStrokeOpacity(double opac) { strokeOpacity = opac; } + void setFillOverprint(bool op) { fillOverprint = op; } + void setStrokeOverprint(bool op) { strokeOverprint = op; } + void setOverprintMode(int op) { overprintMode = op; } + void setTransfer(Function **funcs); + void setLineWidth(double width) { lineWidth = width; } + void setLineDash(std::vector &&dash, double start); + void setFlatness(int flatness1) { flatness = flatness1; } + void setLineJoin(int lineJoin1) { lineJoin = lineJoin1; } + void setLineCap(int lineCap1) { lineCap = lineCap1; } + void setMiterLimit(double limit) { miterLimit = limit; } + void setStrokeAdjust(bool sa) { strokeAdjust = sa; } + void setAlphaIsShape(bool ais) { alphaIsShape = ais; } + void setTextKnockout(bool tk) { textKnockout = tk; } + void setFont(std::shared_ptr fontA, double fontSizeA); + void setTextMat(double a, double b, double c, double d, double e, double f) + { + textMat[0] = a; + textMat[1] = b; + textMat[2] = c; + textMat[3] = d; + textMat[4] = e; + textMat[5] = f; + } + void setCharSpace(double space) { charSpace = space; } + void setWordSpace(double space) { wordSpace = space; } + void setHorizScaling(double scale) { horizScaling = 0.01 * scale; } + void setLeading(double leadingA) { leading = leadingA; } + void setRise(double riseA) { rise = riseA; } + void setRender(int renderA) { render = renderA; } + void setRenderingIntent(const char *intent) { strncpy(renderingIntent, intent, 31); } + +#ifdef USE_CMS + void setDisplayProfile(const GfxLCMSProfilePtr &localDisplayProfileA); + GfxLCMSProfilePtr getDisplayProfile() { return localDisplayProfile; } + std::shared_ptr getXYZ2DisplayTransform(); + int getCmsRenderingIntent(); + static GfxLCMSProfilePtr sRGBProfile; +#endif + + void setDefaultGrayColorSpace(GfxColorSpace *cs) { defaultGrayColorSpace = cs; } + + void setDefaultRGBColorSpace(GfxColorSpace *cs) { defaultRGBColorSpace = cs; } + + void setDefaultCMYKColorSpace(GfxColorSpace *cs) { defaultCMYKColorSpace = cs; } + + GfxColorSpace *copyDefaultGrayColorSpace() + { + if (defaultGrayColorSpace) { + return defaultGrayColorSpace->copy(); + } + return new GfxDeviceGrayColorSpace(); + } + + GfxColorSpace *copyDefaultRGBColorSpace() + { + if (defaultRGBColorSpace) { + return defaultRGBColorSpace->copy(); + } + return new GfxDeviceRGBColorSpace(); + } + + GfxColorSpace *copyDefaultCMYKColorSpace() + { + if (defaultCMYKColorSpace) { + return defaultCMYKColorSpace->copy(); + } + return new GfxDeviceCMYKColorSpace(); + } + + // Add to path. + void moveTo(double x, double y) { path->moveTo(curX = x, curY = y); } + void lineTo(double x, double y) { path->lineTo(curX = x, curY = y); } + void curveTo(double x1, double y1, double x2, double y2, double x3, double y3) { path->curveTo(x1, y1, x2, y2, curX = x3, curY = y3); } + void closePath() + { + path->close(); + curX = path->getLastX(); + curY = path->getLastY(); + } + void clearPath(); + + // Update clip region. + void clip(); + void clipToStrokePath(); + void clipToRect(double xMin, double yMin, double xMax, double yMax); + + // Text position. + void textSetPos(double tx, double ty) + { + lineX = tx; + lineY = ty; + } + void textMoveTo(double tx, double ty) + { + lineX = tx; + lineY = ty; + textTransform(tx, ty, &curX, &curY); + } + void textShift(double tx, double ty); + void shift(double dx, double dy); + + // Push/pop GfxState on/off stack. + GfxState *save(); + GfxState *restore(); + bool hasSaves() const { return saved != nullptr; } + bool isParentState(GfxState *state) { return saved == state || (saved && saved->isParentState(state)); } + + // Misc + bool parseBlendMode(Object *obj, GfxBlendMode *mode); + + ReusablePathIterator *getReusablePath() { return new ReusablePathIterator(path); } + +private: + double hDPI, vDPI; // resolution + double ctm[6]; // coord transform matrix + double px1, py1, px2, py2; // page corners (user coords) + double pageWidth, pageHeight; // page size (pixels) + int rotate; // page rotation angle + + GfxColorSpace *fillColorSpace; // fill color space + GfxColorSpace *strokeColorSpace; // stroke color space + GfxColor fillColor; // fill color + GfxColor strokeColor; // stroke color + GfxPattern *fillPattern; // fill pattern + GfxPattern *strokePattern; // stroke pattern + GfxBlendMode blendMode; // transparency blend mode + double fillOpacity; // fill opacity + double strokeOpacity; // stroke opacity + bool fillOverprint; // fill overprint + bool strokeOverprint; // stroke overprint + int overprintMode; // overprint mode + Function *transfer[4]; // transfer function (entries may be: all + // nullptr = identity; last three nullptr = + // single function; all four non-nullptr = + // R,G,B,gray functions) + + double lineWidth; // line width + std::vector lineDash; // line dash + double lineDashStart; + int flatness; // curve flatness + int lineJoin; // line join style + int lineCap; // line cap style + double miterLimit; // line miter limit + bool strokeAdjust; // stroke adjustment + bool alphaIsShape; // alpha is shape + bool textKnockout; // text knockout + + std::shared_ptr font; // font + double fontSize; // font size + double textMat[6]; // text matrix + double charSpace; // character spacing + double wordSpace; // word spacing + double horizScaling; // horizontal scaling + double leading; // text leading + double rise; // text rise + int render; // text rendering mode + + GfxPath *path; // array of path elements + double curX, curY; // current point (user coords) + double lineX, lineY; // start of current text line (text coords) + + double clipXMin, clipYMin, // bounding box for clip region + clipXMax, clipYMax; + char renderingIntent[32]; + + GfxState *saved; // next GfxState on stack + + GfxState(const GfxState *state, bool copyPath); + +#ifdef USE_CMS + GfxLCMSProfilePtr localDisplayProfile; + std::shared_ptr XYZ2DisplayTransformRelCol; + std::shared_ptr XYZ2DisplayTransformAbsCol; + std::shared_ptr XYZ2DisplayTransformSat; + std::shared_ptr XYZ2DisplayTransformPerc; + static GfxLCMSProfilePtr XYZProfile; +#endif + + GfxColorSpace *defaultGrayColorSpace; + GfxColorSpace *defaultRGBColorSpace; + GfxColorSpace *defaultCMYKColorSpace; +}; + +#endif diff --git a/poppler-24.05.0/poppler/GfxState_helpers.h b/poppler-24.05.0/poppler/GfxState_helpers.h new file mode 100644 index 0000000000000000000000000000000000000000..9572f035b3282b80843f44196527e4f36abc5740 --- /dev/null +++ b/poppler-24.05.0/poppler/GfxState_helpers.h @@ -0,0 +1,90 @@ +//======================================================================== +// +// GfxState.cc +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2009, 2011, 2018, 2019 Albert Astals Cid +// Copyright (C) 2019 Oliver Sander +// +// 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 +// +//======================================================================== + +#ifndef GFXSTATE_HELPERS_H +#define GFXSTATE_HELPERS_H + +#include "GfxState.h" + +static inline GfxColorComp clip01(GfxColorComp x) +{ + return (x < 0) ? 0 : (x > gfxColorComp1) ? gfxColorComp1 : x; +} + +static inline double clip01(double x) +{ + return (x < 0) ? 0 : (x > 1) ? 1 : x; +} + +static inline void cmykToRGBMatrixMultiplication(const double c, const double m, const double y, const double k, const double c1, const double m1, const double y1, const double k1, double &r, double &g, double &b) +{ + double x; + // this is a matrix multiplication, unrolled for performance + // C M Y K + x = c1 * m1 * y1 * k1; // 0 0 0 0 + r = g = b = x; + x = c1 * m1 * y1 * k; // 0 0 0 1 + r += 0.1373 * x; + g += 0.1216 * x; + b += 0.1255 * x; + x = c1 * m1 * y * k1; // 0 0 1 0 + r += x; + g += 0.9490 * x; + x = c1 * m1 * y * k; // 0 0 1 1 + r += 0.1098 * x; + g += 0.1020 * x; + x = c1 * m * y1 * k1; // 0 1 0 0 + r += 0.9255 * x; + b += 0.5490 * x; + x = c1 * m * y1 * k; // 0 1 0 1 + r += 0.1412 * x; + x = c1 * m * y * k1; // 0 1 1 0 + r += 0.9294 * x; + g += 0.1098 * x; + b += 0.1412 * x; + x = c1 * m * y * k; // 0 1 1 1 + r += 0.1333 * x; + x = c * m1 * y1 * k1; // 1 0 0 0 + g += 0.6784 * x; + b += 0.9373 * x; + x = c * m1 * y1 * k; // 1 0 0 1 + g += 0.0588 * x; + b += 0.1412 * x; + x = c * m1 * y * k1; // 1 0 1 0 + g += 0.6510 * x; + b += 0.3137 * x; + x = c * m1 * y * k; // 1 0 1 1 + g += 0.0745 * x; + x = c * m * y1 * k1; // 1 1 0 0 + r += 0.1804 * x; + g += 0.1922 * x; + b += 0.5725 * x; + x = c * m * y1 * k; // 1 1 0 1 + b += 0.0078 * x; + x = c * m * y * k1; // 1 1 1 0 + r += 0.2118 * x; + g += 0.2119 * x; + b += 0.2235 * x; +} + +#endif diff --git a/poppler-24.05.0/poppler/GlobalParams.cc b/poppler-24.05.0/poppler/GlobalParams.cc new file mode 100644 index 0000000000000000000000000000000000000000..c4c7db3fa99805a0ebc72a3f3ac01099eb70f203 --- /dev/null +++ b/poppler-24.05.0/poppler/GlobalParams.cc @@ -0,0 +1,1613 @@ +//======================================================================== +// +// GlobalParams.cc +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Martin Kretzschmar +// Copyright (C) 2005, 2006 Kristian Høgsberg +// Copyright (C) 2005, 2007-2010, 2012, 2015, 2017-2023 Albert Astals Cid +// Copyright (C) 2005 Jonathan Blandford +// Copyright (C) 2006, 2007 Jeff Muizelaar +// Copyright (C) 2006 Takashi Iwai +// Copyright (C) 2006 Ed Catmur +// Copyright (C) 2007 Krzysztof Kowalczyk +// Copyright (C) 2007, 2009 Jonathan Kew +// Copyright (C) 2009 Petr Gajdos +// Copyright (C) 2009, 2011, 2012, 2015 William Bader +// Copyright (C) 2009 Kovid Goyal +// Copyright (C) 2010, 2012 Hib Eris +// Copyright (C) 2010 Patrick Spendrin +// Copyright (C) 2010 Jakub Wilk +// Copyright (C) 2011 Pino Toscano +// Copyright (C) 2011 Koji Otani +// Copyright (C) 2012 Yi Yang +// Copyright (C) 2012, 2017 Adrian Johnson +// Copyright (C) 2012 Thomas Freitag +// Copyright (C) 2012 Peter Breitenlohner +// Copyright (C) 2013, 2014 Jason Crain +// Copyright (C) 2017 Christoph Cullmann +// Copyright (C) 2017 Jean Ghali +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018, 2020 Adam Reichold +// Copyright (C) 2019 Christian Persch +// Copyright (C) 2019, 2024 Oliver Sander +// Copyright (C) 2020 Kai Pastor +// Copyright (C) 2021, 2022 Stefan Löffler +// Copyright (C) 2021 sunderme +// Copyright (C) 2022 Even Rouault +// Copyright (C) 2022 Claes Nästén +// Copyright (C) 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela +// Copyright (C) 2023 Shivodit Gill +// Copyright (C) 2024 Keyu Tao +// +// 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 + +#include +#include +#include +#include +#ifdef _WIN32 +# include +# include +#endif +#ifdef ANDROID +# include +# include +# include +#endif +#include "goo/glibc.h" +#include "goo/gmem.h" +#include "goo/GooString.h" +#include "goo/gfile.h" +#include "goo/gdir.h" +#include "Error.h" +#include "NameToCharCode.h" +#include "CharCodeToUnicode.h" +#include "UnicodeMap.h" +#include "CMap.h" +#include "FontEncodingTables.h" +#include "GlobalParams.h" +#include "GfxFont.h" + +#ifdef WITH_FONTCONFIGURATION_FONTCONFIG +# include +#endif + +#ifndef _MSC_VER +# include +#endif + +#ifndef FC_WEIGHT_BOOK +# define FC_WEIGHT_BOOK 75 +#endif + +#include "NameToUnicodeTable.h" +#include "UnicodeMapTables.h" +#include "UnicodeMapFuncs.h" + +#include "fofi/FoFiTrueType.h" +#include "fofi/FoFiIdentifier.h" + +//------------------------------------------------------------------------ + +#define cidToUnicodeCacheSize 4 +#define unicodeToUnicodeCacheSize 4 + +//------------------------------------------------------------------------ + +std::unique_ptr globalParams; + +#if defined(ENABLE_RELOCATABLE) && defined(_WIN32) + +/* search for data relative to where we are installed */ + +static HMODULE hmodule; + +extern "C" { +/* Provide declaration to squelch -Wmissing-declarations warning */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) { + case DLL_PROCESS_ATTACH: + hmodule = hinstDLL; + break; + } + + return TRUE; +} +} + +static std::string get_poppler_localdir(const std::string &suffix) +{ + const std::string binSuffix("\\bin"); + std::string retval(MAX_PATH, '\0'); + + if (!GetModuleFileNameA(hmodule, retval.data(), retval.size())) { + return POPPLER_DATADIR; + } + + const std::string::size_type p = retval.rfind('\\'); + if (p != std::string::npos) { + retval.erase(p); + if (retval.size() > binSuffix.size() && stricmp(retval.substr(p - binSuffix.size()).c_str(), binSuffix.c_str()) == 0) { + retval.erase(p - binSuffix.size()); + } + } + retval += suffix; + retval.shrink_to_fit(); + return retval; +} + +static const char *get_poppler_datadir(void) +{ + static std::string retval; + static bool beenhere = false; + + if (!beenhere) { + retval = get_poppler_localdir("\\share\\poppler"); + beenhere = true; + } + + return retval.c_str(); +} + +# undef POPPLER_DATADIR +# define POPPLER_DATADIR get_poppler_datadir() + +static const char *get_poppler_fontsdir(void) +{ + static std::string retval; + static bool beenhere = false; + + if (!beenhere) { + retval = get_poppler_localdir("\\share\\fonts"); + beenhere = true; + } + + return retval.c_str(); +} +# undef POPPLER_FONTSDIR +# define POPPLER_FONTSDIR get_poppler_fontsdir() + +#else +# define POPPLER_FONTSDIR nullptr +#endif + +//------------------------------------------------------------------------ +// SysFontInfo +//------------------------------------------------------------------------ + +class SysFontInfo +{ +public: + GooString *name; + bool bold; + bool italic; + bool oblique; + bool fixedWidth; + GooString *path; + SysFontType type; + int fontNum; // for TrueType collections + GooString *substituteName; + + SysFontInfo(GooString *nameA, bool boldA, bool italicA, bool obliqueA, bool fixedWidthA, GooString *pathA, SysFontType typeA, int fontNumA, GooString *substituteNameA); + ~SysFontInfo(); + SysFontInfo(const SysFontInfo &) = delete; + SysFontInfo &operator=(const SysFontInfo &) = delete; + bool match(const SysFontInfo *fi) const; + bool match(const GooString *nameA, bool boldA, bool italicA, bool obliqueA, bool fixedWidthA) const; + bool match(const GooString *nameA, bool boldA, bool italicA) const; +}; + +SysFontInfo::SysFontInfo(GooString *nameA, bool boldA, bool italicA, bool obliqueA, bool fixedWidthA, GooString *pathA, SysFontType typeA, int fontNumA, GooString *substituteNameA) +{ + name = nameA; + bold = boldA; + italic = italicA; + oblique = obliqueA; + fixedWidth = fixedWidthA; + path = pathA; + type = typeA; + fontNum = fontNumA; + substituteName = substituteNameA; +} + +SysFontInfo::~SysFontInfo() +{ + delete name; + delete path; + delete substituteName; +} + +bool SysFontInfo::match(const SysFontInfo *fi) const +{ + return !strcasecmp(name->c_str(), fi->name->c_str()) && bold == fi->bold && italic == fi->italic && oblique == fi->oblique && fixedWidth == fi->fixedWidth; +} + +bool SysFontInfo::match(const GooString *nameA, bool boldA, bool italicA, bool obliqueA, bool fixedWidthA) const +{ + return !strcasecmp(name->c_str(), nameA->c_str()) && bold == boldA && italic == italicA && oblique == obliqueA && fixedWidth == fixedWidthA; +} + +bool SysFontInfo::match(const GooString *nameA, bool boldA, bool italicA) const +{ + return !strcasecmp(name->c_str(), nameA->c_str()) && bold == boldA && italic == italicA; +} + +//------------------------------------------------------------------------ +// SysFontList +//------------------------------------------------------------------------ + +class SysFontList +{ +public: + SysFontList(); + ~SysFontList(); + SysFontList(const SysFontList &) = delete; + SysFontList &operator=(const SysFontList &) = delete; + const SysFontInfo *find(const std::string &name, bool isFixedWidth, bool exact, const std::vector &filesToIgnore = {}); + + const std::vector &getFonts() const { return fonts; } + +#ifdef _WIN32 + void scanWindowsFonts(const std::string &winFontDir); +#endif +#ifdef WITH_FONTCONFIGURATION_FONTCONFIG + void addFcFont(SysFontInfo *si) { fonts.push_back(si); } +#endif +private: +#ifdef _WIN32 + SysFontInfo *makeWindowsFont(const char *name, int fontNum, const char *path); +#endif + + std::vector fonts; +}; + +SysFontList::SysFontList() { } + +SysFontList::~SysFontList() +{ + for (auto entry : fonts) { + delete entry; + } +} + +const SysFontInfo *SysFontList::find(const std::string &name, bool fixedWidth, bool exact, const std::vector &filesToIgnore) +{ + GooString *name2; + bool bold, italic, oblique; + int n; + + name2 = new GooString(name); + + // remove space, comma, dash chars + { + int i = 0; + while (i < name2->getLength()) { + const char c = name2->getChar(i); + if (c == ' ' || c == ',' || c == '-') { + name2->del(i); + } else { + ++i; + } + } + n = name2->getLength(); + } + + // remove trailing "MT" (Foo-MT, Foo-BoldMT, etc.) + if (n > 2 && !strcmp(name2->c_str() + n - 2, "MT")) { + name2->del(n - 2, 2); + n -= 2; + } + + // look for "Regular" + if (n > 7 && !strcmp(name2->c_str() + n - 7, "Regular")) { + name2->del(n - 7, 7); + n -= 7; + } + + // look for "Italic" + if (n > 6 && !strcmp(name2->c_str() + n - 6, "Italic")) { + name2->del(n - 6, 6); + italic = true; + n -= 6; + } else { + italic = false; + } + + // look for "Oblique" + if (n > 6 && !strcmp(name2->c_str() + n - 7, "Oblique")) { + name2->del(n - 7, 7); + oblique = true; + n -= 6; + } else { + oblique = false; + } + + // look for "Bold" + if (n > 4 && !strcmp(name2->c_str() + n - 4, "Bold")) { + name2->del(n - 4, 4); + bold = true; + n -= 4; + } else { + bold = false; + } + + // remove trailing "MT" (FooMT-Bold, etc.) + if (n > 2 && !strcmp(name2->c_str() + n - 2, "MT")) { + name2->del(n - 2, 2); + n -= 2; + } + + // remove trailing "PS" + if (n > 2 && !strcmp(name2->c_str() + n - 2, "PS")) { + name2->del(n - 2, 2); + n -= 2; + } + + // remove trailing "IdentityH" + if (n > 9 && !strcmp(name2->c_str() + n - 9, "IdentityH")) { + name2->del(n - 9, 9); + n -= 9; + } + + // search for the font + const SysFontInfo *fi = nullptr; + for (const SysFontInfo *f : fonts) { + fi = f; + if (fi->match(name2, bold, italic, oblique, fixedWidth)) { + if (std::find(filesToIgnore.begin(), filesToIgnore.end(), fi->path->toStr()) == filesToIgnore.end()) { + break; + } + } + fi = nullptr; + } + if (!fi && !exact && bold) { + // try ignoring the bold flag + for (const SysFontInfo *f : fonts) { + fi = f; + if (fi->match(name2, false, italic)) { + if (std::find(filesToIgnore.begin(), filesToIgnore.end(), fi->path->toStr()) == filesToIgnore.end()) { + break; + } + } + fi = nullptr; + } + } + if (!fi && !exact && (bold || italic)) { + // try ignoring the bold and italic flags + for (const SysFontInfo *f : fonts) { + fi = f; + if (fi->match(name2, false, false)) { + if (std::find(filesToIgnore.begin(), filesToIgnore.end(), fi->path->toStr()) == filesToIgnore.end()) { + break; + } + } + fi = nullptr; + } + } + + delete name2; + return fi; +} + +#define globalParamsLocker() const std::scoped_lock locker(mutex) +#define unicodeMapCacheLocker() const std::scoped_lock locker(unicodeMapCacheMutex) +#define cMapCacheLocker() const std::scoped_lock locker(cMapCacheMutex) + +//------------------------------------------------------------------------ +// parsing +//------------------------------------------------------------------------ + +GlobalParams::GlobalParams(const char *customPopplerDataDir) : popplerDataDir(customPopplerDataDir) +{ + // scan the encoding in reverse because we want the lowest-numbered + // index for each char name ('space' is encoded twice) + macRomanReverseMap = new NameToCharCode(); + for (int i = 255; i >= 0; --i) { + if (macRomanEncoding[i]) { + macRomanReverseMap->add(macRomanEncoding[i], (CharCode)i); + } + } + + nameToUnicodeZapfDingbats = new NameToCharCode(); + nameToUnicodeText = new NameToCharCode(); + sysFonts = new SysFontList(); + textEncoding = new GooString("UTF-8"); + printCommands = false; + profileCommands = false; + errQuiet = false; + + cidToUnicodeCache = new CharCodeToUnicodeCache(cidToUnicodeCacheSize); + unicodeToUnicodeCache = new CharCodeToUnicodeCache(unicodeToUnicodeCacheSize); + unicodeMapCache = new UnicodeMapCache(); + cMapCache = new CMapCache(); + + utf8Map = nullptr; + + baseFontsInitialized = false; + + // set up the initial nameToUnicode tables + for (int i = 0; nameToUnicodeZapfDingbatsTab[i].name; ++i) { + nameToUnicodeZapfDingbats->add(nameToUnicodeZapfDingbatsTab[i].name, nameToUnicodeZapfDingbatsTab[i].u); + } + + for (int i = 0; nameToUnicodeTextTab[i].name; ++i) { + nameToUnicodeText->add(nameToUnicodeTextTab[i].name, nameToUnicodeTextTab[i].u); + } + + // set up the residentUnicodeMaps table + residentUnicodeMaps.reserve(6); + UnicodeMap map = { "Latin1", false, latin1UnicodeMapRanges, latin1UnicodeMapLen }; + residentUnicodeMaps.emplace(map.getEncodingName(), std::move(map)); + map = { "ASCII7", false, ascii7UnicodeMapRanges, ascii7UnicodeMapLen }; + residentUnicodeMaps.emplace(map.getEncodingName(), std::move(map)); + map = { "Symbol", false, symbolUnicodeMapRanges, symbolUnicodeMapLen }; + residentUnicodeMaps.emplace(map.getEncodingName(), std::move(map)); + map = { "ZapfDingbats", false, zapfDingbatsUnicodeMapRanges, zapfDingbatsUnicodeMapLen }; + residentUnicodeMaps.emplace(map.getEncodingName(), std::move(map)); + map = { "UTF-8", true, &mapUTF8 }; + residentUnicodeMaps.emplace(map.getEncodingName(), std::move(map)); + map = { "UTF-16", true, &mapUTF16 }; + residentUnicodeMaps.emplace(map.getEncodingName(), std::move(map)); + + scanEncodingDirs(); +} + +void GlobalParams::scanEncodingDirs() +{ + GDir *dir; + std::unique_ptr entry; + const char *dataRoot = popplerDataDir ? popplerDataDir : POPPLER_DATADIR; + + // allocate buffer large enough to append "/nameToUnicode" + size_t bufSize = strlen(dataRoot) + strlen("/nameToUnicode") + 1; + char *dataPathBuffer = new char[bufSize]; + + snprintf(dataPathBuffer, bufSize, "%s/nameToUnicode", dataRoot); + dir = new GDir(dataPathBuffer, true); + while (entry = dir->getNextEntry(), entry != nullptr) { + if (!entry->isDir()) { + parseNameToUnicode(entry->getFullPath()); + } + } + delete dir; + + snprintf(dataPathBuffer, bufSize, "%s/cidToUnicode", dataRoot); + dir = new GDir(dataPathBuffer, false); + while (entry = dir->getNextEntry(), entry != nullptr) { + addCIDToUnicode(entry->getName(), entry->getFullPath()); + } + delete dir; + + snprintf(dataPathBuffer, bufSize, "%s/unicodeMap", dataRoot); + dir = new GDir(dataPathBuffer, false); + while (entry = dir->getNextEntry(), entry != nullptr) { + addUnicodeMap(entry->getName(), entry->getFullPath()); + } + delete dir; + + snprintf(dataPathBuffer, bufSize, "%s/cMap", dataRoot); + dir = new GDir(dataPathBuffer, false); + while (entry = dir->getNextEntry(), entry != nullptr) { + addCMapDir(entry->getName(), entry->getFullPath()); + toUnicodeDirs.push_back(entry->getFullPath()->copy()); + } + delete dir; + + delete[] dataPathBuffer; +} + +void GlobalParams::parseNameToUnicode(const GooString *name) +{ + char *tok1, *tok2; + FILE *f; + char buf[256]; + int line; + Unicode u; + char *tokptr; + + if (!(f = openFile(name->c_str(), "r"))) { + error(errIO, -1, "Couldn't open 'nameToUnicode' file '{0:t}'", name); + return; + } + line = 1; + while (getLine(buf, sizeof(buf), f)) { + tok1 = strtok_r(buf, " \t\r\n", &tokptr); + tok2 = strtok_r(nullptr, " \t\r\n", &tokptr); + if (tok1 && tok2) { + sscanf(tok1, "%x", &u); + nameToUnicodeText->add(tok2, u); + } else { + error(errConfig, -1, "Bad line in 'nameToUnicode' file ({0:t}:{1:d})", name, line); + } + ++line; + } + fclose(f); +} + +void GlobalParams::addCIDToUnicode(const GooString *collection, const GooString *fileName) +{ + cidToUnicodes[collection->toStr()] = fileName->toStr(); +} + +void GlobalParams::addUnicodeMap(const GooString *encodingName, const GooString *fileName) +{ + unicodeMaps[encodingName->toStr()] = fileName->toStr(); +} + +void GlobalParams::addCMapDir(const GooString *collection, const GooString *dir) +{ + cMapDirs.emplace(collection->toStr(), dir->toStr()); +} + +bool GlobalParams::parseYesNo2(const char *token, bool *flag) +{ + if (!strcmp(token, "yes")) { + *flag = true; + } else if (!strcmp(token, "no")) { + *flag = false; + } else { + return false; + } + return true; +} + +GlobalParams::~GlobalParams() +{ + delete macRomanReverseMap; + + delete nameToUnicodeZapfDingbats; + delete nameToUnicodeText; + for (auto entry : toUnicodeDirs) { + delete entry; + } + delete sysFonts; + delete textEncoding; + + delete cidToUnicodeCache; + delete unicodeToUnicodeCache; + delete unicodeMapCache; + delete cMapCache; +} + +//------------------------------------------------------------------------ +// accessors +//------------------------------------------------------------------------ + +CharCode GlobalParams::getMacRomanCharCode(const char *charName) +{ + // no need to lock - macRomanReverseMap is constant + return macRomanReverseMap->lookup(charName); +} + +Unicode GlobalParams::mapNameToUnicodeAll(const char *charName) +{ + // no need to lock - nameToUnicodeZapfDingbats and nameToUnicodeText are constant + Unicode u = nameToUnicodeZapfDingbats->lookup(charName); + if (!u) { + u = nameToUnicodeText->lookup(charName); + } + return u; +} + +Unicode GlobalParams::mapNameToUnicodeText(const char *charName) +{ + // no need to lock - nameToUnicodeText is constant + return nameToUnicodeText->lookup(charName); +} + +UnicodeMap *GlobalParams::getResidentUnicodeMap(const std::string &encodingName) +{ + UnicodeMap *map = nullptr; + + globalParamsLocker(); + const auto unicodeMap = residentUnicodeMaps.find(encodingName); + if (unicodeMap != residentUnicodeMaps.end()) { + map = &unicodeMap->second; + } + + return map; +} + +FILE *GlobalParams::getUnicodeMapFile(const std::string &encodingName) +{ + FILE *file = nullptr; + + globalParamsLocker(); + const auto unicodeMap = unicodeMaps.find(encodingName); + if (unicodeMap != unicodeMaps.end()) { + file = openFile(unicodeMap->second.c_str(), "r"); + } + + return file; +} + +FILE *GlobalParams::findCMapFile(const GooString *collection, const GooString *cMapName) +{ + FILE *file = nullptr; + + globalParamsLocker(); + const auto collectionCMapDirs = cMapDirs.equal_range(collection->toStr()); + for (auto cMapDir = collectionCMapDirs.first; cMapDir != collectionCMapDirs.second; ++cMapDir) { + auto *const path = new GooString(cMapDir->second); + appendToPath(path, cMapName->c_str()); + file = openFile(path->c_str(), "r"); + delete path; + if (file) { + break; + } + } + + return file; +} + +FILE *GlobalParams::findToUnicodeFile(const GooString *name) +{ + GooString *fileName; + FILE *f; + + globalParamsLocker(); + for (const GooString *dir : toUnicodeDirs) { + fileName = appendToPath(dir->copy(), name->c_str()); + f = openFile(fileName->c_str(), "r"); + delete fileName; + if (f) { + return f; + } + } + return nullptr; +} + +#ifdef WITH_FONTCONFIGURATION_FONTCONFIG +static bool findModifier(const std::string &name, const size_t modStart, const char *modifier, size_t &start) +{ + if (modStart == std::string::npos) { + return false; + } + + size_t match = name.find(modifier, modStart); + if (match == std::string::npos) { + return false; + } else { + if (start == std::string::npos || match < start) { + start = match; + } + return true; + } +} + +static const char *getFontLang(const GfxFont *font) +{ + const char *lang; + + // find the language we want the font to support + if (font->isCIDFont()) { + const GooString *collection = ((GfxCIDFont *)font)->getCollection(); + if (collection) { + if (strcmp(collection->c_str(), "Adobe-GB1") == 0) { + lang = "zh-cn"; // Simplified Chinese + } else if (strcmp(collection->c_str(), "Adobe-CNS1") == 0) { + lang = "zh-tw"; // Traditional Chinese + } else if (strcmp(collection->c_str(), "Adobe-Japan1") == 0) { + lang = "ja"; // Japanese + } else if (strcmp(collection->c_str(), "Adobe-Japan2") == 0) { + lang = "ja"; // Japanese + } else if (strcmp(collection->c_str(), "Adobe-Korea1") == 0) { + lang = "ko"; // Korean + } else if (strcmp(collection->c_str(), "Adobe-UCS") == 0) { + lang = "xx"; + } else if (strcmp(collection->c_str(), "Adobe-Identity") == 0) { + lang = "xx"; + } else { + error(errUnimplemented, -1, "Unknown CID font collection: {0:t}. If this is expected to be a valid PDF document, please report to poppler bugtracker.", collection); + lang = "xx"; + } + } else { + lang = "xx"; + } + } else { + lang = "xx"; + } + return lang; +} + +static FcPattern *buildFcPattern(const GfxFont *font, const GooString *base14Name) +{ + int weight = -1, slant = -1, width = -1, spacing = -1; + FcPattern *p; + + // this is all heuristics will be overwritten if font had proper info + std::string fontName; + if (base14Name == nullptr) { + fontName = font->getNameWithoutSubsetTag(); + } else { + fontName = base14Name->toStr(); + } + + size_t modStart = fontName.find(','); + if (modStart == std::string::npos) { + modStart = fontName.find('-'); + } + + // remove the - from the names, for some reason, Fontconfig does not + // understand "MS-Mincho" but does with "MS Mincho" + std::replace(fontName.begin(), fontName.end(), '-', ' '); + + size_t start = std::string::npos; + findModifier(fontName, modStart, "Regular", start); + findModifier(fontName, modStart, "Roman", start); + + if (findModifier(fontName, modStart, "Oblique", start)) { + slant = FC_SLANT_OBLIQUE; + } + if (findModifier(fontName, modStart, "Italic", start)) { + slant = FC_SLANT_ITALIC; + } + if (findModifier(fontName, modStart, "Bold", start)) { + weight = FC_WEIGHT_BOLD; + } + if (findModifier(fontName, modStart, "Light", start)) { + weight = FC_WEIGHT_LIGHT; + } + if (findModifier(fontName, modStart, "Medium", start)) { + weight = FC_WEIGHT_MEDIUM; + } + if (findModifier(fontName, modStart, "Condensed", start)) { + width = FC_WIDTH_CONDENSED; + } + + std::string family; + if (start == std::string::npos) { + family = fontName; + } else { + // There have been "modifiers" in the name, crop them to obtain + // the family name + family = fontName.substr(0, modStart); + } + + // use font flags + if (font->isFixedWidth()) { + spacing = FC_MONO; + } + if (font->isBold()) { + weight = FC_WEIGHT_BOLD; + } + if (font->isItalic()) { + slant = FC_SLANT_ITALIC; + } + + // if the FontDescriptor specified a family name use it + if (font->getFamily()) { + family = font->getFamily()->toStr(); + } + + // if the FontDescriptor specified a weight use it + switch (font->getWeight()) { + case GfxFont::W100: + weight = FC_WEIGHT_EXTRALIGHT; + break; + case GfxFont::W200: + weight = FC_WEIGHT_LIGHT; + break; + case GfxFont::W300: + weight = FC_WEIGHT_BOOK; + break; + case GfxFont::W400: + weight = FC_WEIGHT_NORMAL; + break; + case GfxFont::W500: + weight = FC_WEIGHT_MEDIUM; + break; + case GfxFont::W600: + weight = FC_WEIGHT_DEMIBOLD; + break; + case GfxFont::W700: + weight = FC_WEIGHT_BOLD; + break; + case GfxFont::W800: + weight = FC_WEIGHT_EXTRABOLD; + break; + case GfxFont::W900: + weight = FC_WEIGHT_BLACK; + break; + default: + break; + } + + // if the FontDescriptor specified a width use it + switch (font->getStretch()) { + case GfxFont::UltraCondensed: + width = FC_WIDTH_ULTRACONDENSED; + break; + case GfxFont::ExtraCondensed: + width = FC_WIDTH_EXTRACONDENSED; + break; + case GfxFont::Condensed: + width = FC_WIDTH_CONDENSED; + break; + case GfxFont::SemiCondensed: + width = FC_WIDTH_SEMICONDENSED; + break; + case GfxFont::Normal: + width = FC_WIDTH_NORMAL; + break; + case GfxFont::SemiExpanded: + width = FC_WIDTH_SEMIEXPANDED; + break; + case GfxFont::Expanded: + width = FC_WIDTH_EXPANDED; + break; + case GfxFont::ExtraExpanded: + width = FC_WIDTH_EXTRAEXPANDED; + break; + case GfxFont::UltraExpanded: + width = FC_WIDTH_ULTRAEXPANDED; + break; + default: + break; + } + + const char *lang = getFontLang(font); + + p = FcPatternBuild(nullptr, FC_FAMILY, FcTypeString, family.c_str(), FC_LANG, FcTypeString, lang, NULL); + if (slant != -1) { + FcPatternAddInteger(p, FC_SLANT, slant); + } + if (weight != -1) { + FcPatternAddInteger(p, FC_WEIGHT, weight); + } + if (width != -1) { + FcPatternAddInteger(p, FC_WIDTH, width); + } + if (spacing != -1) { + FcPatternAddInteger(p, FC_SPACING, spacing); + } + + return p; +} +#endif + +GooString *GlobalParams::findFontFile(const std::string &fontName) +{ + GooString *path = nullptr; + + setupBaseFonts(POPPLER_FONTSDIR); + globalParamsLocker(); + const auto fontFile = fontFiles.find(fontName); + if (fontFile != fontFiles.end()) { + path = new GooString(fontFile->second); + } + + return path; +} + +#if defined(WITH_FONTCONFIGURATION_FONTCONFIG) || defined(WITH_FONTCONFIGURATION_WIN32) + +static bool supportedFontForEmbedding(Unicode uChar, const char *filepath, int faceIndex) +{ + if (!std::string_view(filepath).ends_with(".ttf") && !std::string_view(filepath).ends_with(".ttc") && !std::string_view(filepath).ends_with(".otf")) { + // for now we only support ttf, ttc, otf fonts + return false; + } + + const FoFiIdentifierType fontFoFiType = FoFiIdentifier::identifyFile(filepath); + if (fontFoFiType != fofiIdTrueType && fontFoFiType != fofiIdTrueTypeCollection && fontFoFiType != fofiIdOpenTypeCFF8Bit && fontFoFiType != fofiIdOpenTypeCFFCID) { + // for now we only support ttf, ttc, otf fonts + return false; + } + + const std::unique_ptr fft = FoFiTrueType::load(filepath, faceIndex); + if (!fft) { + error(errIO, -1, "Form::addFontToDefaultResources. Failed to FoFiTrueType::load {0:s}", filepath); + return false; + } + + // Look for the Unicode BMP cmaps, which are 0/3 or 3/1 + int unicodeBMPCMap = fft->findCmap(0, 3); + if (unicodeBMPCMap < 0) { + unicodeBMPCMap = fft->findCmap(3, 1); + } + if (unicodeBMPCMap < 0) { + // for now we only support files with unicode bmp cmaps + return false; + } + + const int glyph = fft->mapCodeToGID(unicodeBMPCMap, uChar); + return glyph > 0; +} + +#endif + +/* if you can't or don't want to use Fontconfig, you need to implement + this function for your platform. For Windows, it's in GlobalParamsWin.cc +*/ +#ifdef WITH_FONTCONFIGURATION_FONTCONFIG +// not needed for fontconfig +void GlobalParams::setupBaseFonts(const char *) { } + +GooString *GlobalParams::findBase14FontFile(const GooString *base14Name, const GfxFont *font, GooString *substituteFontName) +{ + SysFontType type; + int fontNum; + + return findSystemFontFile(font, &type, &fontNum, substituteFontName, base14Name); +} + +GooString *GlobalParams::findSystemFontFile(const GfxFont *font, SysFontType *type, int *fontNum, GooString *substituteFontName, const GooString *base14Name) +{ + const SysFontInfo *fi = nullptr; + FcPattern *p = nullptr; + GooString *path = nullptr; + const std::optional &fontName = font->getName(); + GooString substituteName; + if (!fontName) { + return nullptr; + } + + globalParamsLocker(); + + if ((fi = sysFonts->find(*fontName, font->isFixedWidth(), true))) { + path = fi->path->copy(); + *type = fi->type; + *fontNum = fi->fontNum; + substituteName.Set(fi->substituteName->c_str()); + } else { + FcChar8 *s; + char *ext; + FcResult res; + FcFontSet *set; + int i; + FcLangSet *lb = nullptr; + p = buildFcPattern(font, base14Name); + + if (!p) { + goto fin; + } + FcConfigSubstitute(nullptr, p, FcMatchPattern); + FcDefaultSubstitute(p); + set = FcFontSort(nullptr, p, FcFalse, nullptr, &res); + if (!set) { + goto fin; + } + + // find the language we want the font to support + const char *lang = getFontLang(font); + if (strcmp(lang, "xx") != 0) { + lb = FcLangSetCreate(); + FcLangSetAdd(lb, (FcChar8 *)lang); + } + + /* + scan twice. + first: fonts support the language + second: all fonts (fall back) + */ + while (fi == nullptr) { + for (i = 0; i < set->nfont; ++i) { + res = FcPatternGetString(set->fonts[i], FC_FILE, 0, &s); + if (res != FcResultMatch || !s) { + continue; + } + if (lb != nullptr) { + FcLangSet *l; + res = FcPatternGetLangSet(set->fonts[i], FC_LANG, 0, &l); + if (res != FcResultMatch || !FcLangSetContains(l, lb)) { + continue; + } + } + FcChar8 *s2; + res = FcPatternGetString(set->fonts[i], FC_FULLNAME, 0, &s2); + if (res == FcResultMatch && s2) { + substituteName.Set((char *)s2); + } else { + // fontconfig does not extract fullname for some fonts + // create the fullname from family and style + res = FcPatternGetString(set->fonts[i], FC_FAMILY, 0, &s2); + if (res == FcResultMatch && s2) { + substituteName.Set((char *)s2); + res = FcPatternGetString(set->fonts[i], FC_STYLE, 0, &s2); + if (res == FcResultMatch && s2) { + GooString *style = new GooString((char *)s2); + if (style->cmp("Regular") != 0) { + substituteName.append(" "); + substituteName.append(style); + } + delete style; + } + } + } + ext = strrchr((char *)s, '.'); + if (!ext) { + continue; + } + if (!strncasecmp(ext, ".ttf", 4) || !strncasecmp(ext, ".ttc", 4) || !strncasecmp(ext, ".otf", 4)) { + int weight, slant; + bool bold = font->isBold(); + bool italic = font->isItalic(); + bool oblique = false; + FcPatternGetInteger(set->fonts[i], FC_WEIGHT, 0, &weight); + FcPatternGetInteger(set->fonts[i], FC_SLANT, 0, &slant); + if (weight == FC_WEIGHT_DEMIBOLD || weight == FC_WEIGHT_BOLD || weight == FC_WEIGHT_EXTRABOLD || weight == FC_WEIGHT_BLACK) { + bold = true; + } + if (slant == FC_SLANT_ITALIC) { + italic = true; + } + if (slant == FC_SLANT_OBLIQUE) { + oblique = true; + } + *fontNum = 0; + *type = (!strncasecmp(ext, ".ttc", 4)) ? sysFontTTC : sysFontTTF; + FcPatternGetInteger(set->fonts[i], FC_INDEX, 0, fontNum); + SysFontInfo *sfi = new SysFontInfo(new GooString(*fontName), bold, italic, oblique, font->isFixedWidth(), new GooString((char *)s), *type, *fontNum, substituteName.copy()); + sysFonts->addFcFont(sfi); + fi = sfi; + path = new GooString((char *)s); + } else if (!strncasecmp(ext, ".pfa", 4) || !strncasecmp(ext, ".pfb", 4)) { + int weight, slant; + bool bold = font->isBold(); + bool italic = font->isItalic(); + bool oblique = false; + FcPatternGetInteger(set->fonts[i], FC_WEIGHT, 0, &weight); + FcPatternGetInteger(set->fonts[i], FC_SLANT, 0, &slant); + if (weight == FC_WEIGHT_DEMIBOLD || weight == FC_WEIGHT_BOLD || weight == FC_WEIGHT_EXTRABOLD || weight == FC_WEIGHT_BLACK) { + bold = true; + } + if (slant == FC_SLANT_ITALIC) { + italic = true; + } + if (slant == FC_SLANT_OBLIQUE) { + oblique = true; + } + *fontNum = 0; + *type = (!strncasecmp(ext, ".pfa", 4)) ? sysFontPFA : sysFontPFB; + FcPatternGetInteger(set->fonts[i], FC_INDEX, 0, fontNum); + SysFontInfo *sfi = new SysFontInfo(new GooString(*fontName), bold, italic, oblique, font->isFixedWidth(), new GooString((char *)s), *type, *fontNum, substituteName.copy()); + sysFonts->addFcFont(sfi); + fi = sfi; + path = new GooString((char *)s); + } else { + continue; + } + break; + } + if (lb != nullptr) { + FcLangSetDestroy(lb); + lb = nullptr; + } else { + /* scan all fonts of the list */ + break; + } + } + FcFontSetDestroy(set); + } + if (path == nullptr && (fi = sysFonts->find(*fontName, font->isFixedWidth(), false))) { + path = fi->path->copy(); + *type = fi->type; + *fontNum = fi->fontNum; + } + if (substituteFontName) { + substituteFontName->Set(substituteName.c_str()); + } +fin: + if (p) { + FcPatternDestroy(p); + } + + return path; +} + +FamilyStyleFontSearchResult GlobalParams::findSystemFontFileForFamilyAndStyle(const std::string &fontFamily, const std::string &fontStyle, const std::vector &filesToIgnore) +{ + FcPattern *p = FcPatternBuild(nullptr, FC_FAMILY, FcTypeString, fontFamily.c_str(), FC_STYLE, FcTypeString, fontStyle.c_str(), nullptr); + FcConfigSubstitute(nullptr, p, FcMatchPattern); + FcDefaultSubstitute(p); + if (p) { + const std::unique_ptr pDeleter(p, [](FcPattern *pattern) { FcPatternDestroy(pattern); }); + FcResult res; + FcFontSet *fontSet = FcFontSort(nullptr, p, FcFalse, nullptr, &res); + if (fontSet) { + const std::unique_ptr fontSetDeleter(fontSet, [](FcFontSet *fSet) { FcFontSetDestroy(fSet); }); + if (res == FcResultMatch) { + for (int i = 0; i < fontSet->nfont; i++) { + FcChar8 *fcFilePath = nullptr; + int faceIndex = 0; + FcPatternGetString(fontSet->fonts[i], FC_FILE, 0, &fcFilePath); + FcPatternGetInteger(fontSet->fonts[i], FC_INDEX, 0, &faceIndex); + + const std::string sFilePath = reinterpret_cast(fcFilePath); + if (std::find(filesToIgnore.begin(), filesToIgnore.end(), sFilePath) == filesToIgnore.end()) { + return FamilyStyleFontSearchResult(sFilePath, faceIndex); + } + } + } + } + } + + error(errIO, -1, "Couldn't find font file for {0:s} {1:s}", fontFamily.c_str(), fontStyle.c_str()); + return {}; +} + +UCharFontSearchResult GlobalParams::findSystemFontFileForUChar(Unicode uChar, const GfxFont &fontToEmulate) +{ + FcPattern *pattern = buildFcPattern(&fontToEmulate, nullptr); + + FcConfigSubstitute(nullptr, pattern, FcMatchPattern); + FcDefaultSubstitute(pattern); + + FcResult result = FcResultMatch; + FcFontSet *fontSet = FcFontSort(nullptr, pattern, FcFalse, nullptr, &result); + FcPatternDestroy(pattern); + + if (fontSet) { + const std::unique_ptr fontSetDeleter(fontSet, [](FcFontSet *fSet) { FcFontSetDestroy(fSet); }); + for (int i = 0; i < fontSet->nfont; i++) { + FcChar8 *fcFilePath = nullptr; + int faceIndex = 0; + FcChar8 *fcFamily = nullptr; + FcChar8 *fcStyle = nullptr; + FcCharSet *fcCharSet = nullptr; + FcPatternGetString(fontSet->fonts[i], FC_FILE, 0, &fcFilePath); + FcPatternGetInteger(fontSet->fonts[i], FC_INDEX, 0, &faceIndex); + FcPatternGetString(fontSet->fonts[i], FC_FAMILY, 0, &fcFamily); + FcPatternGetString(fontSet->fonts[i], FC_STYLE, 0, &fcStyle); + FcPatternGetCharSet(fontSet->fonts[i], FC_CHARSET, 0, &fcCharSet); + if (!fcFilePath || !fcFamily || !fcStyle || !fcCharSet) { + continue; + } + if (!FcCharSetHasChar(fcCharSet, uChar)) { + continue; + } + + const char *filepath = reinterpret_cast(fcFilePath); + + if (supportedFontForEmbedding(uChar, filepath, faceIndex)) { + return UCharFontSearchResult(filepath, faceIndex, reinterpret_cast(fcFamily), reinterpret_cast(fcStyle)); + } + } + } + + return {}; +} +#elif defined(WITH_FONTCONFIGURATION_ANDROID) +// Uses the font file mapping created by GlobalParams::setupBaseFonts +// to return the path to a base-14 font file +GooString *GlobalParams::findBase14FontFile(const GooString *base14Name, const GfxFont *font, GooString *substituteFontName) +{ + return findFontFile(base14Name->toStr()); +} + +# if __ANDROID_API__ >= 29 + +// This struct is used by the AFontMatcher unique_ptr for destroying the +// AFontMatcher object +struct AFontMatcherDestroyer +{ + void operator()(AFontMatcher *fontmatcher) { AFontMatcher_destroy(fontmatcher); } +}; + +// This struct is used by the AFontMatcher unique_ptr for destroying the +// AFont object +struct AFontDestroyer +{ + void operator()(AFont *afont) { AFont_close(afont); } +}; + +# endif + +GooString *GlobalParams::findSystemFontFile(const GfxFont *font, SysFontType *type, int *fontNum, GooString *substituteFontName, const GooString *base14Name) +{ + GooString *path = nullptr; + const std::optional &fontName = font->getName(); + + if (!fontName) { + return nullptr; + } + + globalParamsLocker(); + +# if __ANDROID_API__ >= 29 + // If font is not found in the default base-14 fonts, + // use Android-NDK's AFontMatcher API instead. + // Documentation for AFontMatcher API can be found at: + // https://developer.android.com/ndk/reference/group/font + std::string genericFontFamily = "serif"; + + if (!font->isSerif()) { + genericFontFamily = "sans-serif"; + } else if (font->isFixedWidth()) { + genericFontFamily = "monospace"; + } + + std::unique_ptr fontmatcher { AFontMatcher_create() }; + + // Set font weight and italics for the font. + AFontMatcher_setStyle(fontmatcher.get(), font->getWeight() * 100, font->isItalic()); + + // Get font match and the font file's path + std::unique_ptr afont { AFontMatcher_match(fontmatcher.get(), genericFontFamily.c_str(), (uint16_t *)u"A", 1, nullptr) }; + path = new GooString(AFont_getFontFilePath(afont.get())); + + // Set the type of font. Fonts returned by AFontMatcher are of + // four possible types - ttf, otf, ttc, otc. + if (path->ends_with(".ttf") || path->ends_with(".otf")) { + *type = sysFontTTF; + } else if (path->ends_with(".ttc") || path->ends_with(".otc")) { + *type = sysFontTTC; + } +# else +# pragma message("Compiling without AFontMatcher API due to Android API version being lower than 29.") +# endif + + return path; +} + +static struct +{ + const char *name; + const char *otFileName; +} displayFontTab[] = { { "Courier", "NimbusMonoPS-Regular.otf" }, + { "Courier-Bold", "NimbusMonoPS-Bold.otf" }, + { "Courier-BoldOblique", "NimbusMonoPS-BoldItalic.otf" }, + { "Courier-Oblique", "NimbusMonoPS-Italic.otf" }, + { "Helvetica", "NimbusSans-Regular.otf" }, + { "Helvetica-Bold", "NimbusSans-Bold.otf" }, + { "Helvetica-BoldOblique", "NimbusSans-BoldItalic.otf" }, + { "Helvetica-Oblique", "NimbusSans-Italic.otf" }, + { "Symbol", "StandardSymbolsPS.otf" }, + { "Times-Bold", "NimbusRoman-Bold.otf" }, + { "Times-BoldItalic", "NimbusRoman-BoldItalic.otf" }, + { "Times-Italic", "NimbusRoman-Italic.otf" }, + { "Times-Roman", "NimbusRoman-Regular.otf" }, + { "ZapfDingbats", "D050000L.otf" }, + { nullptr, nullptr } }; + +// The path to the font directory. Set by GlobalParams::setFontDir() +static std::string displayFontDir; + +// This method creates a mapping from base-14 font names to their +// paths on the file system. On Android, it searches within the +// directory set by GlobalParams::setFontDir(). +void GlobalParams::setupBaseFonts(const char *dir) +{ + FILE *f; + int i; + + for (i = 0; displayFontTab[i].name; ++i) { + if (fontFiles.count(displayFontTab[i].name) > 0) { + continue; + } + + std::unique_ptr fontName = std::make_unique(displayFontTab[i].name); + std::unique_ptr fileName; + if (dir) { + fileName.reset(appendToPath(new GooString(dir), displayFontTab[i].otFileName)); + if ((f = openFile(fileName->c_str(), "rb"))) { + fclose(f); + } else { + fileName.reset(); + } + } + if (!displayFontDir.empty()) { + fileName.reset(appendToPath(new GooString(displayFontDir), displayFontTab[i].otFileName)); + if ((f = openFile(fileName->c_str(), "rb"))) { + fclose(f); + } else { + fileName.reset(); + } + } + if (!fileName) { + error(errConfig, -1, "No display font for '{0:s}'", displayFontTab[i].name); + continue; + } + addFontFile(fontName->toStr(), fileName->toStr()); + } +} + +FamilyStyleFontSearchResult GlobalParams::findSystemFontFileForFamilyAndStyle(const std::string &fontFamily, const std::string &fontStyle, const std::vector &filesToIgnore) +{ + error(errUnimplemented, -1, "GlobalParams::findSystemFontFileForFamilyAndStyle not implemented for this platform"); + return {}; +} + +UCharFontSearchResult GlobalParams::findSystemFontFileForUChar(Unicode uChar, const GfxFont &fontToEmulate) +{ + error(errUnimplemented, -1, "GlobalParams::findSystemFontFileForUChar not implemented for this platform"); + return {}; +} + +#elif defined(WITH_FONTCONFIGURATION_WIN32) +# include "GlobalParamsWin.cc" + +GooString *GlobalParams::findBase14FontFile(const GooString *base14Name, const GfxFont *font, GooString * /*substituteFontName*/) +{ + return findFontFile(base14Name->toStr()); +} + +#else + +FamilyStyleFontSearchResult GlobalParams::findSystemFontFileForFamilyAndStyle(const std::string &fontFamily, const std::string &fontStyle, const std::vector &filesToIgnore) +{ + error(errUnimplemented, -1, "GlobalParams::findSystemFontFileForFamilyAndStyle not implemented for this platform"); + return {}; +} + +UCharFontSearchResult GlobalParams::findSystemFontFileForUChar(Unicode uChar, const GfxFont &fontToEmulate) +{ + error(errUnimplemented, -1, "GlobalParams::findSystemFontFileForUChar not implemented for this platform"); + return {}; +} + +GooString *GlobalParams::findBase14FontFile(const GooString *base14Name, const GfxFont *font, GooString * /*substituteFontName*/) +{ + return findFontFile(base14Name->toStr()); +} + +static struct +{ + const char *name; + const char *t1FileName; + const char *ttFileName; +} displayFontTab[] = { { "Courier", "n022003l.pfb", "cour.ttf" }, + { "Courier-Bold", "n022004l.pfb", "courbd.ttf" }, + { "Courier-BoldOblique", "n022024l.pfb", "courbi.ttf" }, + { "Courier-Oblique", "n022023l.pfb", "couri.ttf" }, + { "Helvetica", "n019003l.pfb", "arial.ttf" }, + { "Helvetica-Bold", "n019004l.pfb", "arialbd.ttf" }, + { "Helvetica-BoldOblique", "n019024l.pfb", "arialbi.ttf" }, + { "Helvetica-Oblique", "n019023l.pfb", "ariali.ttf" }, + { "Symbol", "s050000l.pfb", nullptr }, + { "Times-Bold", "n021004l.pfb", "timesbd.ttf" }, + { "Times-BoldItalic", "n021024l.pfb", "timesbi.ttf" }, + { "Times-Italic", "n021023l.pfb", "timesi.ttf" }, + { "Times-Roman", "n021003l.pfb", "times.ttf" }, + { "ZapfDingbats", "d050000l.pfb", nullptr }, + { nullptr, nullptr, nullptr } }; + +static const char *displayFontDirs[] = { "/usr/share/ghostscript/fonts", "/usr/local/share/ghostscript/fonts", "/usr/share/fonts/default/Type1", "/usr/share/fonts/default/ghostscript", "/usr/share/fonts/type1/gsfonts", nullptr }; + +void GlobalParams::setupBaseFonts(const char *dir) +{ + FILE *f; + int i, j; + + for (i = 0; displayFontTab[i].name; ++i) { + if (fontFiles.count(displayFontTab[i].name) > 0) { + continue; + } + std::unique_ptr fontName = std::make_unique(displayFontTab[i].name); + std::unique_ptr fileName; + if (dir) { + fileName.reset(appendToPath(new GooString(dir), displayFontTab[i].t1FileName)); + if ((f = openFile(fileName->c_str(), "rb"))) { + fclose(f); + } else { + fileName.reset(); + } + } + for (j = 0; !fileName && displayFontDirs[j]; ++j) { + fileName.reset(appendToPath(new GooString(displayFontDirs[j]), displayFontTab[i].t1FileName)); + if ((f = openFile(fileName->c_str(), "rb"))) { + fclose(f); + } else { + fileName.reset(); + } + } + if (!fileName) { + error(errConfig, -1, "No display font for '{0:s}'", displayFontTab[i].name); + continue; + } + addFontFile(fontName->toStr(), fileName->toStr()); + } +} + +GooString *GlobalParams::findSystemFontFile(const GfxFont *font, SysFontType *type, int *fontNum, GooString * /*substituteFontName*/, const GooString * /*base14Name*/) +{ + const SysFontInfo *fi; + GooString *path; + + const std::optional &fontName = font->getName(); + if (!fontName) { + return nullptr; + } + + path = nullptr; + globalParamsLocker(); + if ((fi = sysFonts->find(*fontName, font->isFixedWidth(), false))) { + path = fi->path->copy(); + *type = fi->type; + *fontNum = fi->fontNum; + } + + return path; +} +#endif + +std::string GlobalParams::getTextEncodingName() const +{ + globalParamsLocker(); + return textEncoding->toStr(); +} + +const UnicodeMap *GlobalParams::getUtf8Map() +{ + if (!utf8Map) { + utf8Map = globalParams->getUnicodeMap("UTF-8"); + } + + return utf8Map; +} + +bool GlobalParams::getPrintCommands() +{ + globalParamsLocker(); + return printCommands; +} + +bool GlobalParams::getProfileCommands() +{ + globalParamsLocker(); + return profileCommands; +} + +bool GlobalParams::getErrQuiet() +{ + // no locking -- this function may get called from inside a locked + // section + return errQuiet; +} + +CharCodeToUnicode *GlobalParams::getCIDToUnicode(const GooString *collection) +{ + CharCodeToUnicode *ctu; + + globalParamsLocker(); + if (!(ctu = cidToUnicodeCache->getCharCodeToUnicode(collection))) { + const auto cidToUnicode = cidToUnicodes.find(collection->toStr()); + if (cidToUnicode != cidToUnicodes.end()) { + if ((ctu = CharCodeToUnicode::parseCIDToUnicode(cidToUnicode->second.c_str(), collection))) { + cidToUnicodeCache->add(ctu); + } + } + } + + return ctu; +} + +const UnicodeMap *GlobalParams::getUnicodeMap(const std::string &encodingName) +{ + const UnicodeMap *map; + + if (!(map = getResidentUnicodeMap(encodingName))) { + unicodeMapCacheLocker(); + map = unicodeMapCache->getUnicodeMap(encodingName); + } + + return map; +} + +std::shared_ptr GlobalParams::getCMap(const GooString *collection, const GooString *cMapName) +{ + cMapCacheLocker(); + return cMapCache->getCMap(collection, cMapName); +} + +const UnicodeMap *GlobalParams::getTextEncoding() +{ + return getUnicodeMap(textEncoding->toStr()); +} + +std::vector GlobalParams::getEncodingNames() +{ + std::vector result; + result.reserve(residentUnicodeMaps.size() + unicodeMaps.size()); + for (const auto &unicodeMap : residentUnicodeMaps) { + result.push_back(unicodeMap.first); + } + for (const auto &unicodeMap : unicodeMaps) { + result.push_back(unicodeMap.first); + } + return result; +} + +//------------------------------------------------------------------------ +// functions to set parameters +//------------------------------------------------------------------------ + +void GlobalParams::addFontFile(const std::string &fontName, const std::string &path) +{ + globalParamsLocker(); + fontFiles[fontName] = path; +} + +void GlobalParams::setTextEncoding(const char *encodingName) +{ + globalParamsLocker(); + delete textEncoding; + textEncoding = new GooString(encodingName); +} + +void GlobalParams::setPrintCommands(bool printCommandsA) +{ + globalParamsLocker(); + printCommands = printCommandsA; +} + +void GlobalParams::setProfileCommands(bool profileCommandsA) +{ + globalParamsLocker(); + profileCommands = profileCommandsA; +} + +void GlobalParams::setErrQuiet(bool errQuietA) +{ + globalParamsLocker(); + errQuiet = errQuietA; +} + +#ifdef ANDROID +void GlobalParams::setFontDir(const std::string &fontDir) +{ +# if defined(WITH_FONTCONFIGURATION_ANDROID) + displayFontDir = fontDir; +# endif +} +#endif + +GlobalParamsIniter::GlobalParamsIniter(ErrorCallback errorCallback) +{ + const std::scoped_lock lock { mutex }; + + if (count == 0) { + globalParams = std::make_unique(!customDataDir.empty() ? customDataDir.c_str() : nullptr); + + setErrorCallback(errorCallback); + } + + count++; +} + +GlobalParamsIniter::~GlobalParamsIniter() +{ + const std::scoped_lock lock { mutex }; + + --count; + + if (count == 0) { + globalParams.reset(); + } +} + +bool GlobalParamsIniter::setCustomDataDir(const std::string &dir) +{ + const std::scoped_lock lock { mutex }; + + if (count == 0) { + customDataDir = dir; + return true; + } + + return false; +} + +std::mutex GlobalParamsIniter::mutex; +int GlobalParamsIniter::count = 0; +std::string GlobalParamsIniter::customDataDir; diff --git a/poppler-24.05.0/poppler/GlobalParams.h b/poppler-24.05.0/poppler/GlobalParams.h new file mode 100644 index 0000000000000000000000000000000000000000..e845c248fc4d5649b48032f5ba2a8f32165f8c5b --- /dev/null +++ b/poppler-24.05.0/poppler/GlobalParams.h @@ -0,0 +1,245 @@ +//======================================================================== +// +// GlobalParams.h +// +// Copyright 2001-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005, 2007-2010, 2012, 2015, 2017-2023 Albert Astals Cid +// Copyright (C) 2005 Jonathan Blandford +// Copyright (C) 2006 Takashi Iwai +// Copyright (C) 2006 Kristian Høgsberg +// Copyright (C) 2007 Krzysztof Kowalczyk +// Copyright (C) 2009 Jonathan Kew +// Copyright (C) 2009 Petr Gajdos +// Copyright (C) 2009, 2011, 2012, 2014, 2015 William Bader +// Copyright (C) 2010 Hib Eris +// Copyright (C) 2011 Pino Toscano +// Copyright (C) 2012, 2017 Adrian Johnson +// Copyright (C) 2012 Thomas Freitag +// Copyright (C) 2013 Jason Crain +// Copyright (C) 2018, 2020 Adam Reichold +// Copyright (C) 2019 Oliver Sander +// Copyright (C) 2023 Shivodit Gill +// +// 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 +// +//======================================================================== + +#ifndef GLOBALPARAMS_H +#define GLOBALPARAMS_H + +#include +#include "poppler-config.h" +#include "poppler_private_export.h" +#include +#include "CharTypes.h" +#include "UnicodeMap.h" +#include "Error.h" +#include +#include +#include +#include +#include + +class GooString; +class NameToCharCode; +class CharCodeToUnicode; +class CharCodeToUnicodeCache; +class UnicodeMapCache; +class CMap; +class CMapCache; +class GlobalParams; +class GfxFont; +class Stream; +class SysFontList; + +//------------------------------------------------------------------------ + +// The global parameters object. +extern std::unique_ptr POPPLER_PRIVATE_EXPORT globalParams; + +//------------------------------------------------------------------------ + +enum SysFontType +{ + sysFontPFA, + sysFontPFB, + sysFontTTF, + sysFontTTC +}; + +//------------------------------------------------------------------------ + +struct FamilyStyleFontSearchResult +{ + FamilyStyleFontSearchResult() = default; + + FamilyStyleFontSearchResult(const std::string &filepathA, int faceIndexA) : filepath(filepathA), faceIndex(faceIndexA) { } + + std::string filepath; + int faceIndex = 0; +}; + +//------------------------------------------------------------------------ + +struct UCharFontSearchResult +{ + UCharFontSearchResult() = default; + + UCharFontSearchResult(const std::string &filepathA, int faceIndexA, const std::string &familyA, const std::string &styleA) : filepath(filepathA), faceIndex(faceIndexA), family(familyA), style(styleA) { } + + const std::string filepath; + const int faceIndex = 0; + const std::string family; + const std::string style; +}; + +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT GlobalParams +{ +public: + // Initialize the global parameters + explicit GlobalParams(const char *customPopplerDataDir = nullptr); + + ~GlobalParams(); + + GlobalParams(const GlobalParams &) = delete; + GlobalParams &operator=(const GlobalParams &) = delete; + + void setupBaseFonts(const char *dir); + + //----- accessors + + CharCode getMacRomanCharCode(const char *charName); + + // Return Unicode values for character names. Used for general text + // extraction. + Unicode mapNameToUnicodeText(const char *charName); + + // Return Unicode values for character names. Used for glyph + // lookups or text extraction with ZapfDingbats fonts. + Unicode mapNameToUnicodeAll(const char *charName); + + UnicodeMap *getResidentUnicodeMap(const std::string &encodingName); + FILE *getUnicodeMapFile(const std::string &encodingName); + FILE *findCMapFile(const GooString *collection, const GooString *cMapName); + FILE *findToUnicodeFile(const GooString *name); + GooString *findFontFile(const std::string &fontName); + GooString *findBase14FontFile(const GooString *base14Name, const GfxFont *font, GooString *substituteFontName = nullptr); + GooString *findSystemFontFile(const GfxFont *font, SysFontType *type, int *fontNum, GooString *substituteFontName = nullptr, const GooString *base14Name = nullptr); + FamilyStyleFontSearchResult findSystemFontFileForFamilyAndStyle(const std::string &fontFamily, const std::string &fontStyle, const std::vector &filesToIgnore = {}); + UCharFontSearchResult findSystemFontFileForUChar(Unicode uChar, const GfxFont &fontToEmulate); + std::string getTextEncodingName() const; + bool getPrintCommands(); + bool getProfileCommands(); + bool getErrQuiet(); + + CharCodeToUnicode *getCIDToUnicode(const GooString *collection); + const UnicodeMap *getUnicodeMap(const std::string &encodingName); + std::shared_ptr getCMap(const GooString *collection, const GooString *cMapName); + const UnicodeMap *getTextEncoding(); + + const UnicodeMap *getUtf8Map(); + + std::vector getEncodingNames(); + + //----- functions to set parameters + void addFontFile(const std::string &fontName, const std::string &path); + void setTextEncoding(const char *encodingName); + void setPrintCommands(bool printCommandsA); + void setProfileCommands(bool profileCommandsA); + void setErrQuiet(bool errQuietA); +#ifdef ANDROID + static void setFontDir(const std::string &fontDir); +#endif + static bool parseYesNo2(const char *token, bool *flag); + +private: + void parseNameToUnicode(const GooString *name); + + void scanEncodingDirs(); + void addCIDToUnicode(const GooString *collection, const GooString *fileName); + void addUnicodeMap(const GooString *encodingName, const GooString *fileName); + void addCMapDir(const GooString *collection, const GooString *dir); + + //----- static tables + + NameToCharCode * // mapping from char name to + macRomanReverseMap; // MacRomanEncoding index + + //----- user-modifiable settings + + NameToCharCode * // mapping from char name to Unicode for ZapfDingbats + nameToUnicodeZapfDingbats; + NameToCharCode * // mapping from char name to Unicode for text + nameToUnicodeText; // extraction + // files for mappings from char collections + // to Unicode, indexed by collection name + std::unordered_map cidToUnicodes; + // mappings from Unicode to char codes, + // indexed by encoding name + std::unordered_map residentUnicodeMaps; + // files for mappings from Unicode to char + // codes, indexed by encoding name + std::unordered_map unicodeMaps; + // list of CMap dirs, indexed by collection + std::unordered_multimap cMapDirs; + std::vector toUnicodeDirs; // list of ToUnicode CMap dirs + bool baseFontsInitialized; +#ifdef _WIN32 + // windows font substitutes (for CID fonts) + std::unordered_map substFiles; +#endif + // font files: font name mapped to path + std::unordered_map fontFiles; + SysFontList *sysFonts; // system fonts + GooString *textEncoding; // encoding (unicodeMap) to use for text + // output + bool printCommands; // print the drawing commands + bool profileCommands; // profile the drawing commands + bool errQuiet; // suppress error messages? + + CharCodeToUnicodeCache *cidToUnicodeCache; + CharCodeToUnicodeCache *unicodeToUnicodeCache; + UnicodeMapCache *unicodeMapCache; + CMapCache *cMapCache; + + const UnicodeMap *utf8Map; + + mutable std::recursive_mutex mutex; + mutable std::recursive_mutex unicodeMapCacheMutex; + mutable std::recursive_mutex cMapCacheMutex; + + const char *popplerDataDir; +}; + +class POPPLER_PRIVATE_EXPORT GlobalParamsIniter +{ +public: + explicit GlobalParamsIniter(ErrorCallback errorCallback); + ~GlobalParamsIniter(); + + GlobalParamsIniter(const GlobalParamsIniter &) = delete; + GlobalParamsIniter &operator=(const GlobalParamsIniter &) = delete; + + static bool setCustomDataDir(const std::string &dir); + +private: + static std::mutex mutex; + static int count; + + static std::string customDataDir; +}; + +#endif diff --git a/poppler-24.05.0/poppler/GlobalParamsWin.cc b/poppler-24.05.0/poppler/GlobalParamsWin.cc new file mode 100644 index 0000000000000000000000000000000000000000..1e8981fec566f3a0a4ff7e9e7f05f386adc1bd1e --- /dev/null +++ b/poppler-24.05.0/poppler/GlobalParamsWin.cc @@ -0,0 +1,549 @@ +/* Written by Krzysztof Kowalczyk (http://blog.kowalczyk.info) + but mostly based on xpdf code. + + // Copyright (C) 2010, 2012 Hib Eris + // Copyright (C) 2012, 2013 Thomas Freitag + // Copyright (C) 2012 Suzuki Toshiya + // Copyright (C) 2012, 2017 Adrian Johnson + // Copyright (C) 2012 Mark Brand + // Copyright (C) 2013, 2018, 2019 Adam Reichold + // Copyright (C) 2013 Dmytro Morgun + // Copyright (C) 2017 Christoph Cullmann + // Copyright (C) 2017, 2018, 2020-2023 Albert Astals Cid + // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + // Copyright (C) 2019 Christian Persch + // Copyright (C) 2019 Oliver Sander + // Copyright (C) 2021 Stefan Löffler + // Copyright (C) 2021 sunderme + +TODO: instead of a fixed mapping defined in displayFontTab, it could +scan the whole fonts directory, parse TTF files and build font +description for all fonts available in Windows. That's how MuPDF works. +*/ + +#ifndef PACKAGE_NAME +# include +#endif + +#include + +#include +#include +#include +#include +#include + +#include "goo/gmem.h" +#include "goo/GooString.h" +#include "goo/gfile.h" +#include "Error.h" +#include "NameToCharCode.h" +#include "CharCodeToUnicode.h" +#include "UnicodeMap.h" +#include "CMap.h" +#include "FontEncodingTables.h" +#include "GlobalParams.h" +#include "GfxFont.h" +#include +#include "Object.h" +#include "Stream.h" +#include "Lexer.h" +#include "Parser.h" + +#define DEFAULT_SUBSTITUTE_FONT "Helvetica" +#define DEFAULT_CID_FONT_AC1_MSWIN "MingLiU" /* Adobe-CNS1 for Taiwan, HongKong */ +#define DEFAULT_CID_FONT_AG1_MSWIN "SimSun" /* Adobe-GB1 for PRC, Singapore */ +#define DEFAULT_CID_FONT_AJ1_MSWIN "MS-Mincho" /* Adobe-Japan1 */ +#define DEFAULT_CID_FONT_AJ2_MSWIN "MS-Mincho" /* Adobe-Japan2 (legacy) */ +#define DEFAULT_CID_FONT_AK1_MSWIN "Batang" /* Adobe-Korea1 */ +#define DEFAULT_CID_FONT_MSWIN "ArialUnicode" /* Unknown */ + +static const struct +{ + const char *name; + const std::vector fileNames; + bool warnIfMissing; +} displayFontTab[] = { { "Courier", { "n022003l.pfb", "cour.ttf" }, true }, + { "Courier-Bold", { "n022004l.pfb", "courbd.ttf" }, true }, + { "Courier-BoldOblique", { "n022024l.pfb", "courbi.ttf" }, true }, + { "Courier-Oblique", { "n022023l.pfb", "couri.ttf" }, true }, + { "Helvetica", { "n019003l.pfb", "arial.ttf" }, true }, + { "Helvetica-Bold", { "n019004l.pfb", "arialbd.ttf" }, true }, + { "Helvetica-BoldOblique", { "n019024l.pfb", "arialbi.ttf" }, true }, + { "Helvetica-Oblique", { "n019023l.pfb", "ariali.ttf" }, true }, + { "Symbol", { "s050000l.pfb", "StandardSymbolsPS.otf", "StandardSymbolsPS.ttf" }, true }, + { "Times-Bold", { "n021004l.pfb", "timesbd.ttf" }, true }, + { "Times-BoldItalic", { "n021024l.pfb", "timesbi.ttf" }, true }, + { "Times-Italic", { "n021023l.pfb", "timesi.ttf" }, true }, + { "Times-Roman", { "n021003l.pfb", "times.ttf" }, true }, + // TODO: not sure if "wingding.ttf" is right + { "ZapfDingbats", { "d050000l.pfb", "wingding.ttf" }, true }, + + // those seem to be frequently accessed by PDF files and I kind of guess + // which font file do the refer to + { "Palatino", { "pala.ttf" }, true }, + { "Palatino-Roman", { "pala.ttf" }, true }, + { "Palatino-Bold", { "palab.ttf" }, true }, + { "Palatino-Italic", { "palai.ttf" }, true }, + { "Palatino,Italic", { "palai.ttf" }, true }, + { "Palatino-BoldItalic", { "palabi.ttf" }, true }, + + { "ArialBlack", { "arialbd.ttf" }, true }, + + { "ArialNarrow", { "arialn.ttf" }, true }, + { "ArialNarrow,Bold", { "arialnb.ttf" }, true }, + { "ArialNarrow,Italic", { "arialni.ttf" }, true }, + { "ArialNarrow,BoldItalic", { "arialnbi.ttf" }, true }, + { "ArialNarrow-Bold", { "arialnb.ttf" }, true }, + { "ArialNarrow-Italic", { "arialni.ttf" }, true }, + { "ArialNarrow-BoldItalic", { "arialnbi.ttf" }, true }, + + { "HelveticaNarrow", { "arialn.ttf" }, true }, + { "HelveticaNarrow,Bold", { "arialnb.ttf" }, true }, + { "HelveticaNarrow,Italic", { "arialni.ttf" }, true }, + { "HelveticaNarrow,BoldItalic", { "arialnbi.ttf" }, true }, + { "HelveticaNarrow-Bold", { "arialnb.ttf" }, true }, + { "HelveticaNarrow-Italic", { "arialni.ttf" }, true }, + { "HelveticaNarrow-BoldItalic", { "arialnbi.ttf" }, true }, + + { "BookAntiqua", { "bkant.ttf" }, true }, + { "BookAntiqua,Bold", { "bkant.ttf" }, true }, + { "BookAntiqua,Italic", { "bkant.ttf" }, true }, + { "BookAntiqua,BoldItalic", { "bkant.ttf" }, true }, + { "BookAntiqua-Bold", { "bkant.ttf" }, true }, + { "BookAntiqua-Italic", { "bkant.ttf" }, true }, + { "BookAntiqua-BoldItalic", { "bkant.ttf" }, true }, + + { "Verdana", { "verdana.ttf" }, true }, + { "Verdana,Bold", { "verdanab.ttf" }, true }, + { "Verdana,Italic", { "verdanai.ttf" }, true }, + { "Verdana,BoldItalic", { "verdanaz.ttf" }, true }, + { "Verdana-Bold", { "verdanab.ttf" }, true }, + { "Verdana-Italic", { "verdanai.ttf" }, true }, + { "Verdana-BoldItalic", { "verdanaz.ttf" }, true }, + + { "Tahoma", { "tahoma.ttf" }, true }, + { "Tahoma,Bold", { "tahomabd.ttf" }, true }, + { "Tahoma,Italic", { "tahoma.ttf" }, true }, + { "Tahoma,BoldItalic", { "tahomabd.ttf" }, true }, + { "Tahoma-Bold", { "tahomabd.ttf" }, true }, + { "Tahoma-Italic", { "tahoma.ttf" }, true }, + { "Tahoma-BoldItalic", { "tahomabd.ttf" }, true }, + + { "CCRIKH+Verdana", { "verdana.ttf" }, true }, + { "CCRIKH+Verdana,Bold", { "verdanab.ttf" }, true }, + { "CCRIKH+Verdana,Italic", { "verdanai.ttf" }, true }, + { "CCRIKH+Verdana,BoldItalic", { "verdanaz.ttf" }, true }, + { "CCRIKH+Verdana-Bold", { "verdanab.ttf" }, true }, + { "CCRIKH+Verdana-Italic", { "verdanai.ttf" }, true }, + { "CCRIKH+Verdana-BoldItalic", { "verdanaz.ttf" }, true }, + + { "Georgia", { "georgia.ttf" }, true }, + { "Georgia,Bold", { "georgiab.ttf" }, true }, + { "Georgia,Italic", { "georgiai.ttf" }, true }, + { "Georgia,BoldItalic", { "georgiaz.ttf" }, true }, + { "Georgia-Bold", { "georgiab.ttf" }, true }, + { "Georgia-Italic", { "georgiai.ttf" }, true }, + { "Georgia-BoldItalic", { "georgiaz.ttf" }, true }, + + // fallback for Adobe CID fonts: + { "MingLiU", { "mingliu.ttf" }, false }, + { "SimSun", { "simsun.ttf" }, false }, + { "MS-Mincho", { "msmincho.ttf" }, false }, + { "Batang", { "batang.ttf" }, false }, + { "ArialUnicode", { "arialuni.ttf" }, true }, + {} }; + +static std::string GetWindowsFontDir() +{ + char winFontDir[MAX_PATH]; + winFontDir[0] = '\0'; + + if (SHGetFolderPathA(nullptr, CSIDL_FONTS, nullptr, SHGFP_TYPE_CURRENT, winFontDir) == S_OK) { + return winFontDir; + } + + // return the windows directory + fonts + GetWindowsDirectoryA(winFontDir, MAX_PATH); + if (winFontDir[0]) { + return std::string(winFontDir) + "\\fonts"; + } + + return {}; +} + +static bool FileExists(const char *path) +{ + FILE *f = openFile(path, "rb"); + if (f) { + fclose(f); + return true; + } + return false; +} + +void SysFontList::scanWindowsFonts(const std::string &winFontDir) +{ + OSVERSIONINFO version; + const char *path; + DWORD idx, valNameLen, dataLen, type; + HKEY regKey; + char valName[1024], data[1024]; + int n, fontNum; + char *p0, *p1; + GooString *fontPath; + + version.dwOSVersionInfoSize = sizeof(version); + GetVersionEx(&version); + if (version.dwPlatformId == VER_PLATFORM_WIN32_NT) { + path = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts\\"; + } else { + path = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Fonts\\"; + } + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, path, 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, ®Key) == ERROR_SUCCESS) { + idx = 0; + while (1) { + valNameLen = sizeof(valName) - 1; + dataLen = sizeof(data) - 1; + if (RegEnumValueA(regKey, idx, valName, &valNameLen, nullptr, &type, (LPBYTE)data, &dataLen) != ERROR_SUCCESS) { + break; + } + if (type == REG_SZ && valNameLen > 0 && valNameLen < sizeof(valName) && dataLen > 0 && dataLen < sizeof(data)) { + valName[valNameLen] = '\0'; + data[dataLen] = '\0'; + n = strlen(data); + if (!strcasecmp(data + n - 4, ".ttf") || !strcasecmp(data + n - 4, ".ttc") || !strcasecmp(data + n - 4, ".otf")) { + fontPath = new GooString(data); + if (!(dataLen >= 3 && data[1] == ':' && data[2] == '\\')) { + fontPath->insert(0, '\\'); + fontPath->insert(0, winFontDir); + fontPath->append('\0'); + } + p0 = valName; + fontNum = 0; + while (*p0) { + p1 = strstr(p0, " & "); + if (p1) { + *p1 = '\0'; + p1 = p1 + 3; + } else { + p1 = p0 + strlen(p0); + } + fonts.push_back(makeWindowsFont(p0, fontNum, fontPath->c_str())); + p0 = p1; + ++fontNum; + } + delete fontPath; + } + } + ++idx; + } + RegCloseKey(regKey); + } +} + +SysFontInfo *SysFontList::makeWindowsFont(const char *name, int fontNum, const char *path) +{ + int n; + bool bold, italic, oblique, fixedWidth; + GooString *s; + char c; + int i; + SysFontType type; + GooString substituteName; + + n = strlen(name); + bold = italic = oblique = fixedWidth = false; + + // remove trailing ' (TrueType)' + if (n > 11 && !strncmp(name + n - 11, " (TrueType)", 11)) { + n -= 11; + } + + // remove trailing ' (OpenType)' + if (n > 11 && !strncmp(name + n - 11, " (OpenType)", 11)) { + n -= 11; + } + + // remove trailing ' Italic' + if (n > 7 && !strncmp(name + n - 7, " Italic", 7)) { + n -= 7; + italic = true; + } + + // remove trailing ' Oblique' + if (n > 7 && !strncmp(name + n - 8, " Oblique", 8)) { + n -= 8; + oblique = true; + } + + // remove trailing ' Bold' + if (n > 5 && !strncmp(name + n - 5, " Bold", 5)) { + n -= 5; + bold = true; + } + + // remove trailing ' Regular' + if (n > 5 && !strncmp(name + n - 8, " Regular", 8)) { + n -= 8; + } + + // the familyname cannot indicate whether a font is fixedWidth or not. + // some well-known fixedWidth typeface family names or keyword are checked. + if (strstr(name, "Courier") || strstr(name, "Fixed") || (strstr(name, "Mono") && !strstr(name, "Monotype")) || strstr(name, "Typewriter")) + fixedWidth = true; + else + fixedWidth = false; + + //----- normalize the font name + s = new GooString(name, n); + i = 0; + while (i < s->getLength()) { + c = s->getChar(i); + if (c == ' ' || c == ',' || c == '-') { + s->del(i); + } else { + ++i; + } + } + + if (!strcasecmp(path + strlen(path) - 4, ".ttc")) { + type = sysFontTTC; + } else { + type = sysFontTTF; + } + + return new SysFontInfo(s, bold, italic, oblique, fixedWidth, new GooString(path), type, fontNum, substituteName.copy()); +} + +static GooString *replaceSuffix(GooString *path, const char *suffixA, const char *suffixB) +{ + int suffLenA = strlen(suffixA); + int suffLenB = strlen(suffixB); + int baseLenA = path->getLength() - suffLenA; + int baseLenB = path->getLength() - suffLenB; + + if (!strcasecmp(path->c_str() + baseLenA, suffixA)) { + path->del(baseLenA, suffLenA)->append(suffixB); + } else if (!strcasecmp(path->c_str() + baseLenB, suffixB)) { + path->del(baseLenB, suffLenB)->append(suffixA); + } + + return path; +} + +void GlobalParams::setupBaseFonts(const char *dir) +{ + if (baseFontsInitialized) + return; + baseFontsInitialized = true; + + const std::string winFontDir = GetWindowsFontDir(); + + std::vector fontDirs; + if (dir) { + fontDirs.emplace_back(dir); + } + if (!winFontDir.empty()) { + fontDirs.emplace_back(winFontDir); + } + + for (int i = 0; displayFontTab[i].name; ++i) { + if (fontFiles.count(displayFontTab[i].name) > 0) + continue; + + const GooString fontName = GooString(displayFontTab[i].name); + + bool fontFound = false; + for (const std::string &fontDir : fontDirs) { + for (const std::string &fileName : displayFontTab[i].fileNames) { + const std::unique_ptr fontPath(appendToPath(new GooString(fontDir), fileName.c_str())); + if (FileExists(fontPath->c_str()) || FileExists(replaceSuffix(fontPath.get(), ".pfb", ".pfa")->c_str()) || FileExists(replaceSuffix(fontPath.get(), ".ttc", ".ttf")->c_str())) { + addFontFile(fontName.toStr(), fontPath->toStr()); + fontFound = true; + break; + } + } + + if (fontFound) { + break; + } + } + + if (!fontFound && displayFontTab[i].warnIfMissing) { + error(errSyntaxError, -1, "No display font for '{0:s}'", displayFontTab[i].name); + } + } + if (!winFontDir.empty()) { + sysFonts->scanWindowsFonts(winFontDir); + } + + const char *dataRoot = popplerDataDir ? popplerDataDir : POPPLER_DATADIR; + const std::string fileName = std::string(dataRoot).append("/cidfmap"); + + // try to open file + const std::unique_ptr file = GooFile::open(fileName); + + if (file) { + Parser *parser; + parser = new Parser(nullptr, new FileStream(file.get(), 0, false, file->size(), Object(objNull)), true); + Object obj1 = parser->getObj(); + while (!obj1.isEOF()) { + Object obj2 = parser->getObj(); + if (obj1.isName()) { + // Substitutions + if (obj2.isDict()) { + Object obj3 = obj2.getDict()->lookup("Path"); + if (obj3.isString()) + addFontFile(GooString(obj1.getName()).toStr(), obj3.getString()->toStr()); + // Aliases + } else if (obj2.isName()) { + substFiles.emplace(obj1.getName(), obj2.getName()); + } + } + obj1 = parser->getObj(); + // skip trailing ';' + while (obj1.isCmd(";")) { + obj1 = parser->getObj(); + } + } + delete parser; + } +} + +static const char *findSubstituteName(const GfxFont *font, const std::unordered_map &fontFiles, const std::unordered_map &substFiles, const char *origName) +{ + assert(origName); + if (!origName) + return nullptr; + GooString *name2 = new GooString(origName); + int n = strlen(origName); + // remove trailing "-Identity-H" + if (n > 11 && !strcmp(name2->c_str() + n - 11, "-Identity-H")) { + name2->del(n - 11, 11); + n -= 11; + } + // remove trailing "-Identity-V" + if (n > 11 && !strcmp(name2->c_str() + n - 11, "-Identity-V")) { + name2->del(n - 11, 11); + n -= 11; + } + const auto substFile = substFiles.find(name2->c_str()); + if (substFile != substFiles.end()) { + delete name2; + return substFile->second.c_str(); + } + + /* TODO: try to at least guess bold/italic/bolditalic from the name */ + delete name2; + if (font->isCIDFont()) { + const GooString *collection = ((GfxCIDFont *)font)->getCollection(); + + const char *name3 = nullptr; + if (!collection->cmp("Adobe-CNS1")) + name3 = DEFAULT_CID_FONT_AC1_MSWIN; + else if (!collection->cmp("Adobe-GB1")) + name3 = DEFAULT_CID_FONT_AG1_MSWIN; + else if (!collection->cmp("Adobe-Japan1")) + name3 = DEFAULT_CID_FONT_AJ1_MSWIN; + else if (!collection->cmp("Adobe-Japan2")) + name3 = DEFAULT_CID_FONT_AJ2_MSWIN; + else if (!collection->cmp("Adobe-Korea1")) + name3 = DEFAULT_CID_FONT_AK1_MSWIN; + + if (name3 && fontFiles.count(name3) != 0) + return name3; + + if (fontFiles.count(DEFAULT_CID_FONT_MSWIN) != 0) + return DEFAULT_CID_FONT_MSWIN; + } + return DEFAULT_SUBSTITUTE_FONT; +} + +/* Windows implementation of external font matching code */ +GooString *GlobalParams::findSystemFontFile(const GfxFont *font, SysFontType *type, int *fontNum, GooString *substituteFontName, const GooString *base14Name) +{ + const SysFontInfo *fi; + GooString *path = nullptr; + const std::optional &fontName = font->getName(); + if (!fontName) + return nullptr; + const std::scoped_lock locker(mutex); + setupBaseFonts(POPPLER_FONTSDIR); + + // TODO: base14Name should be changed? + // In the system using FontConfig, findSystemFontFile() uses + // base14Name only for the creation of query pattern. + + if ((fi = sysFonts->find(*fontName, false, false))) { + path = fi->path->copy(); + *type = fi->type; + *fontNum = fi->fontNum; + if (substituteFontName) + substituteFontName->Set(fi->substituteName->c_str()); + } else { + GooString *substFontName = new GooString(findSubstituteName(font, fontFiles, substFiles, fontName->c_str())); + error(errSyntaxError, -1, "Couldn't find a font for '{0:s}', subst is '{1:t}'", fontName->c_str(), substFontName); + const auto fontFile = fontFiles.find(substFontName->toStr()); + if (fontFile != fontFiles.end()) { + path = new GooString(fontFile->second.c_str()); + if (substituteFontName) + substituteFontName->Set(path->c_str()); + if (!strcasecmp(path->c_str() + path->getLength() - 4, ".ttc")) { + *type = sysFontTTC; + } else { + *type = sysFontTTF; + } + *fontNum = 0; + } + } + + return path; +} + +FamilyStyleFontSearchResult GlobalParams::findSystemFontFileForFamilyAndStyle(const std::string &fontFamily, const std::string &fontStyle, const std::vector &filesToIgnore) +{ + const std::scoped_lock locker(mutex); + setupBaseFonts(POPPLER_FONTSDIR); + + const std::string familyAndStyle = fontFamily + " " + fontStyle; + + const SysFontInfo *fi = sysFonts->find(familyAndStyle, false, false, filesToIgnore); + if (fi) { + return FamilyStyleFontSearchResult(fi->path->toStr(), fi->fontNum); + } + + return {}; +} + +UCharFontSearchResult GlobalParams::findSystemFontFileForUChar(Unicode uChar, const GfxFont &fontToEmulate) +{ + const std::scoped_lock locker(mutex); + setupBaseFonts(POPPLER_FONTSDIR); + + const std::vector &fonts = sysFonts->getFonts(); + for (SysFontInfo *f : fonts) { + // This is not super great given that it ignores fontToEmulate, but will do for now + if (supportedFontForEmbedding(uChar, f->path->c_str(), f->fontNum)) { + std::string style; + if (f->italic) { + style = "Italic"; + } + if (f->oblique) { + if (!style.empty()) { + style += " "; + } + style += "Oblique"; + } + if (f->bold) { + if (!style.empty()) { + style += " "; + } + style += "Bold"; + } + return UCharFontSearchResult(f->path->toStr(), f->fontNum, f->name->toStr(), style); + } + } + + return {}; +} diff --git a/poppler-24.05.0/poppler/HashAlgorithm.h b/poppler-24.05.0/poppler/HashAlgorithm.h new file mode 100644 index 0000000000000000000000000000000000000000..5253a76a8dc95d3bdfec3cb43dccf4b4add33d43 --- /dev/null +++ b/poppler-24.05.0/poppler/HashAlgorithm.h @@ -0,0 +1,25 @@ +//======================================================================== +// +// HashAlgorithm.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela +//======================================================================== + +#ifndef HASH_ALGORITHM_H +#define HASH_ALGORITHM_H + +enum class HashAlgorithm +{ + Unknown, + Md2, + Md5, + Sha1, + Sha256, + Sha384, + Sha512, + Sha224, +}; + +#endif // HASH_ALGORITHM_H diff --git a/poppler-24.05.0/poppler/annot_stamp_approved.h b/poppler-24.05.0/poppler/annot_stamp_approved.h new file mode 100644 index 0000000000000000000000000000000000000000..673e1cb464c0c62b089463122c91a0d0ed520307 --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_approved.h @@ -0,0 +1,343 @@ +//======================================================================== +// +// annot_stamp_approved.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_APPROVED_H +#define ANNOT_STAMP_APPROVED_H + +#include "Dict.h" +#include "Object.h" +#include "PDFDoc.h" + +static const double ANNOT_STAMP_APPROVED_WIDTH = 127.008179; +static const double ANNOT_STAMP_APPROVED_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_APPROVED = "1 0 0 -1 0 26.484744 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 123.617 2.129 l 124.316 2.129 124.887 2.828 124.887 3.398\n" + " c 124.887 23.09 l 124.887 23.789 124.32 24.359 123.617 24.359 c 3.406 24.359\n" + " l 2.707 24.359 2.137 23.66 2.137 23.09 c 2.137 3.398 l 2.137 2.699 2.703\n" + " 2.129 3.406 2.129 c h\n" + "3.406 2.129 m f\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "23.453 20.828 m 22.086 16.895 l 16.219 16.895 l 14.852 20.828 l 11.629 \n" + "20.828 l 17.246 5.434 l 21.047 5.434 l 26.641 20.828 l 23.449 20.828 l 19.844\n" + " 10.043 m 19.758 9.789 19.668 9.531 19.582 9.277 c 19.5 9.016 19.43 8.777\n" + " 19.363 8.566 c 19.305 8.348 19.254 8.168 19.211 8.031 c 19.176 7.895 19.152\n" + " 7.816 19.145 7.801 c 19.137 7.824 19.117 7.902 19.078 8.043 c 19.043 8.18\n" + " 18.992 8.355 18.926 8.566 c 18.867 8.777 18.793 9.016 18.707 9.277 c 18.625\n" + " 9.531 18.543 9.789 18.457 10.043 c 16.938 14.469 l 21.363 14.469 l 19.844\n" + " 10.043 l 39.992 14.863 m 39.992 15.758 39.902 16.586 39.719 17.344 c 39.543\n" + " 18.102 39.27 18.754 38.898 19.301 c 38.527 19.848 38.055 20.277 37.477 \n" + "20.59 c 36.91 20.895 36.234 21.047 35.457 21.047 c 35.105 21.047 34.758 \n" + "21.012 34.406 20.938 c 34.062 20.863 33.734 20.75 33.422 20.586 c 33.109\n" + " 20.418 32.816 20.203 32.547 19.941 c 32.285 19.672 32.059 19.34 31.871 \n" + "18.945 c 31.805 18.945 l 31.812 18.98 31.82 19.074 31.828 19.219 c 31.836\n" + " 19.363 31.844 19.535 31.852 19.73 c 31.859 19.918 31.863 20.125 31.863 \n" + "20.344 c 31.871 20.555 31.875 20.75 31.875 20.934 c 31.875 25.469 l 28.805\n" + " 25.469 l 28.805 11.723 l 28.805 11.117 28.793 10.578 28.773 10.105 c 28.758\n" + " 9.633 28.742 9.266 28.719 9 c 31.703 9 l 31.719 9.051 31.73 9.148 31.746\n" + " 9.297 c 31.77 9.441 31.781 9.609 31.789 9.801 c 31.805 9.988 31.816 10.188\n" + " 31.82 10.391 c 31.828 10.594 31.832 10.773 31.832 10.926 c 31.875 10.926\n" + " l 32.246 10.145 32.758 9.59 33.406 9.254 c 34.055 8.918 34.805 8.75 35.656\n" + " 8.75 c 36.406 8.75 37.055 8.902 37.602 9.207 c 38.148 9.512 38.598 9.934\n" + " 38.945 10.473 c 39.301 11.012 39.566 11.656 39.73 12.406 c 39.906 13.148\n" + " 39.992 13.965 39.992 14.855 c 36.789 14.855 m 36.789 13.508 36.586 12.512\n" + " 36.176 11.863 c 35.77 11.207 35.16 10.879 34.352 10.879 c 34.047 10.879\n" + " 33.738 10.945 33.434 11.074 c 33.137 11.199 32.867 11.418 32.625 11.73 \n" + "c 32.391 12.035 32.199 12.453 32.047 12.977 c 31.902 13.492 31.828 14.148\n" + " 31.828 14.945 c 31.828 15.719 31.902 16.363 32.047 16.879 c 32.191 17.391\n" + " 32.383 17.797 32.613 18.102 c 32.855 18.406 33.125 18.625 33.422 18.758\n" + " c 33.719 18.883 34.023 18.945 34.328 18.945 c 34.723 18.945 35.07 18.867\n" + " 35.379 18.715 c 35.684 18.555 35.941 18.312 36.145 17.984 c 36.355 17.648\n" + " 36.516 17.223 36.625 16.707 c 36.734 16.191 36.789 15.574 36.789 14.859\n" + " c 53.672 14.859 m 53.672 15.754 53.582 16.582 53.398 17.34 c 53.223 18.098\n" + " 52.949 18.75 52.578 19.297 c 52.207 19.844 51.734 20.273 51.156 20.586 \n" + "c 50.59 20.891 49.914 21.043 49.137 21.043 c 48.785 21.043 48.438 21.008\n" + " 48.086 20.934 c 47.742 20.859 47.414 20.746 47.102 20.582 c 46.789 20.414\n" + " 46.496 20.199 46.227 19.938 c 45.965 19.668 45.738 19.336 45.551 18.941\n" + " c 45.484 18.941 l 45.492 18.977 45.5 19.07 45.508 19.215 c 45.516 19.359\n" + " 45.523 19.531 45.531 19.727 c 45.539 19.914 45.543 20.121 45.543 20.34 \n" + "c 45.551 20.551 45.555 20.746 45.555 20.93 c 45.555 25.465 l 42.484 25.465\n" + " l 42.484 11.719 l 42.484 11.113 42.473 10.574 42.453 10.102 c 42.438 9.629\n" + " 42.422 9.262 42.398 8.996 c 45.383 8.996 l 45.398 9.047 45.41 9.145 45.426\n" + " 9.293 c 45.449 9.438 45.461 9.605 45.469 9.797 c 45.484 9.984 45.496 10.184\n" + " 45.5 10.387 c 45.508 10.59 45.512 10.77 45.512 10.922 c 45.555 10.922 l\n" + " 45.926 10.141 46.438 9.586 47.086 9.25 c 47.734 8.914 48.484 8.746 49.336\n" + " 8.746 c 50.086 8.746 50.734 8.898 51.281 9.203 c 51.828 9.508 52.277 9.93\n" + " 52.625 10.469 c 52.98 11.008 53.246 11.652 53.41 12.402 c 53.586 13.145\n" + " 53.672 13.961 53.672 14.852 c 50.469 14.852 m 50.469 13.504 50.266 12.508\n" + " 49.855 11.859 c 49.449 11.203 48.84 10.875 48.031 10.875 c 47.727 10.875\n" + " 47.418 10.941 47.113 11.07 c 46.816 11.195 46.547 11.414 46.305 11.727 \n" + "c 46.07 12.031 45.879 12.449 45.727 12.973 c 45.582 13.488 45.508 14.145\n" + " 45.508 14.941 c 45.508 15.715 45.582 16.359 45.727 16.875 c 45.871 17.387\n" + " 46.062 17.793 46.293 18.098 c 46.535 18.402 46.805 18.621 47.102 18.754\n" + " c 47.398 18.879 47.703 18.941 48.008 18.941 c 48.402 18.941 48.75 18.863\n" + " 49.059 18.711 c 49.363 18.551 49.621 18.309 49.824 17.98 c 50.035 17.645\n" + " 50.195 17.219 50.305 16.703 c 50.414 16.188 50.469 15.57 50.469 14.855 \n" + "c 56.16 20.82 m 56.16 11.773 l 56.16 11.52 56.156 11.25 56.148 10.965 c \n" + "56.148 10.68 56.141 10.41 56.125 10.156 c 56.117 9.895 56.109 9.66 56.102\n" + " 9.457 c 56.094 9.246 56.082 9.094 56.07 9 c 59 9 l 59.016 9.086 59.027 \n" + "9.242 59.043 9.457 c 59.059 9.668 59.07 9.902 59.086 10.156 c 59.102 10.41\n" + " 59.113 10.668 59.117 10.922 c 59.133 11.168 59.141 11.371 59.141 11.523\n" + " c 59.184 11.523 l 59.336 11.094 59.488 10.711 59.641 10.375 c 59.793 10.031\n" + " 59.973 9.746 60.176 9.512 c 60.387 9.27 60.637 9.09 60.93 8.965 c 61.223\n" + " 8.832 61.582 8.77 62.012 8.77 c 62.195 8.77 62.371 8.789 62.547 8.824 c\n" + " 62.73 8.852 62.867 8.891 62.961 8.934 c 62.961 11.5 l 62.766 11.457 62.562\n" + " 11.418 62.359 11.391 c 62.164 11.355 61.926 11.336 61.648 11.336 c 60.883\n" + " 11.336 60.285 11.645 59.855 12.266 c 59.434 12.887 59.223 13.801 59.223\n" + " 15.02 c 59.223 20.82 l 56.152 20.82 l 76.082 14.898 m 76.082 15.801 75.953\n" + " 16.629 75.699 17.379 c 75.453 18.129 75.078 18.777 74.574 19.324 c 74.07\n" + " 19.863 73.445 20.285 72.695 20.59 c 71.945 20.887 71.07 21.039 70.074 21.039\n" + " c 69.113 21.039 68.266 20.891 67.527 20.59 c 66.793 20.293 66.172 19.871\n" + " 65.668 19.332 c 65.172 18.793 64.797 18.148 64.543 17.398 c 64.289 16.641\n" + " 64.16 15.809 64.16 14.895 c 64.16 14.012 64.281 13.199 64.52 12.457 c 64.766\n" + " 11.707 65.141 11.059 65.633 10.512 c 66.129 9.965 66.75 9.539 67.5 9.234\n" + " c 68.25 8.93 69.129 8.777 70.133 8.777 c 71.195 8.777 72.102 8.93 72.855\n" + " 9.234 c 73.605 9.539 74.219 9.965 74.691 10.512 c 75.172 11.051 75.523 \n" + "11.695 75.742 12.445 c 75.969 13.188 76.082 14.004 76.082 14.895 c 72.871\n" + " 14.895 m 72.871 13.488 72.641 12.469 72.184 11.836 c 71.727 11.203 71.059\n" + " 10.887 70.184 10.887 c 69.281 10.887 68.59 11.207 68.109 11.848 c 67.629\n" + " 12.488 67.387 13.504 67.387 14.895 c 67.387 15.602 67.449 16.211 67.574\n" + " 16.719 c 67.707 17.23 67.887 17.648 68.121 17.977 c 68.355 18.305 68.633\n" + " 18.547 68.961 18.707 c 69.289 18.859 69.648 18.938 70.043 18.938 c 70.496\n" + " 18.938 70.895 18.859 71.246 18.707 c 71.602 18.547 71.902 18.305 72.141\n" + " 17.977 c 72.383 17.648 72.562 17.23 72.688 16.719 c 72.812 16.207 72.875\n" + " 15.602 72.875 14.895 c 84.961 20.816 m 81.289 20.816 l 77.059 8.992 l 80.305\n" + " 8.992 l 82.371 15.602 l 82.438 15.82 82.504 16.055 82.578 16.301 c 82.652\n" + " 16.543 82.719 16.781 82.785 17.023 c 82.852 17.266 82.914 17.496 82.973\n" + " 17.723 c 83.039 17.949 83.098 18.152 83.148 18.336 c 83.191 18.16 83.246\n" + " 17.965 83.312 17.746 c 83.379 17.52 83.445 17.289 83.508 17.047 c 83.582\n" + " 16.805 83.652 16.566 83.727 16.324 c 83.809 16.082 83.883 15.855 83.957\n" + " 15.637 c 86.109 8.992 l 89.32 8.992 l 84.961 20.816 l 95.832 21.035 m 94.98\n" + " 21.035 94.211 20.91 93.527 20.664 c 92.852 20.41 92.27 20.027 91.789 19.516\n" + " c 91.309 19 90.941 18.355 90.684 17.582 c 90.43 16.801 90.301 15.891 90.301\n" + " 14.852 c 90.301 13.723 90.449 12.773 90.75 12 c 91.055 11.227 91.465 10.605\n" + " 91.973 10.133 c 92.488 9.652 93.082 9.305 93.754 9.094 c 94.426 8.883 95.129\n" + " 8.777 95.875 8.777 c 96.809 8.777 97.602 8.941 98.258 9.27 c 98.922 9.59\n" + " 99.465 10.043 99.887 10.625 c 100.309 11.207 100.617 11.906 100.816 12.723\n" + " c 101.012 13.531 101.113 14.426 101.113 15.41 c 101.113 15.496 l 93.539\n" + " 15.508 l 93.539 16.004 93.582 16.465 93.672 16.895 c 93.758 17.316 93.902\n" + " 17.684 94.098 18 c 94.293 18.305 94.551 18.551 94.863 18.73 c 95.176 18.906\n" + " 95.555 18.992 96 18.992 c 96.539 18.992 96.98 18.879 97.32 18.652 c 97.664\n" + " 18.418 97.906 18.062 98.051 17.582 c 100.945 17.832 l 100.812 18.168 100.629\n" + " 18.523 100.387 18.902 c 100.152 19.281 99.84 19.629 99.445 19.953 c 99.051\n" + " 20.266 98.559 20.527 97.969 20.738 c 97.387 20.941 96.676 21.043 95.84 \n" + "21.043 c 95.84 10.719 m 95.527 10.719 95.23 10.773 94.953 10.883 c 94.684\n" + " 10.984 94.445 11.152 94.242 11.387 c 94.047 11.613 93.887 11.906 93.762\n" + " 12.273 c 93.637 12.637 93.57 13.074 93.555 13.586 c 98.145 13.586 l 98.086\n" + " 12.633 97.855 11.918 97.457 11.445 c 97.055 10.965 96.516 10.723 95.84 \n" + "10.723 c 111.117 20.828 m 111.102 20.77 111.086 20.668 111.062 20.523 c \n" + "111.047 20.371 111.031 20.199 111.008 20.012 c 110.992 19.824 110.98 19.629\n" + " 110.965 19.434 c 110.957 19.238 110.953 19.062 110.953 18.91 c 110.91 18.91\n" + " l 110.555 19.676 110.055 20.227 109.414 20.559 c 108.781 20.887 108.02 \n" + "21.051 107.129 21.051 c 106.387 21.051 105.742 20.898 105.195 20.594 c 104.656\n" + " 20.289 104.207 19.863 103.852 19.316 c 103.5 18.77 103.238 18.125 103.066\n" + " 17.383 c 102.898 16.633 102.816 15.816 102.816 14.934 c 102.816 14.039 \n" + "102.902 13.215 103.078 12.465 c 103.262 11.715 103.535 11.07 103.91 10.531\n" + " c 104.281 9.984 104.75 9.559 105.32 9.254 c 105.895 8.949 106.578 8.797\n" + " 107.363 8.797 c 107.75 8.797 108.121 8.836 108.477 8.918 c 108.832 9 109.164\n" + " 9.121 109.473 9.289 c 109.777 9.457 110.055 9.672 110.305 9.934 c 110.551\n" + " 10.195 110.762 10.512 110.938 10.883 c 110.961 10.883 l 110.961 10.809 \n" + "110.957 10.703 110.949 10.566 c 110.949 10.422 110.949 10.258 110.949 10.074\n" + " c 110.949 9.891 110.945 9.703 110.938 9.508 c 110.938 9.312 110.938 9.121\n" + " 110.938 8.941 c 110.938 4.625 l 114.008 4.625 l 114.008 18.262 l 114.008\n" + " 18.836 114.02 19.352 114.039 19.801 c 114.062 20.246 114.078 20.59 114.094\n" + " 20.84 c 111.121 20.84 l 110.98 14.863 m 110.98 14.082 110.906 13.438 110.762\n" + " 12.93 c 110.617 12.414 110.422 12.004 110.184 11.707 c 109.949 11.402 109.68\n" + " 11.191 109.375 11.074 c 109.078 10.949 108.77 10.887 108.457 10.887 c 108.062\n" + " 10.887 107.715 10.965 107.406 11.117 c 107.109 11.27 106.852 11.512 106.641\n" + " 11.84 c 106.438 12.168 106.281 12.586 106.172 13.098 c 106.07 13.609 106.02\n" + " 14.223 106.02 14.945 c 106.02 17.625 106.824 18.965 108.434 18.965 c 108.738\n" + " 18.965 109.047 18.898 109.352 18.77 c 109.656 18.637 109.93 18.418 110.172\n" + " 18.102 c 110.414 17.789 110.605 17.371 110.75 16.844 c 110.902 16.312 110.98\n" + " 15.652 110.98 14.867 c f\n" + "1 1 1 RG 0.531496 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "23.453 20.828 m 22.086 16.895 l 16.219 16.895 l 14.852 20.828 l 11.629 \n" + "20.828 l 17.246 5.434 l 21.047 5.434 l 26.641 20.828 l 23.449 20.828 l 19.844\n" + " 10.043 m 19.758 9.789 19.668 9.531 19.582 9.277 c 19.5 9.016 19.43 8.777\n" + " 19.363 8.566 c 19.305 8.348 19.254 8.168 19.211 8.031 c 19.176 7.895 19.152\n" + " 7.816 19.145 7.801 c 19.137 7.824 19.117 7.902 19.078 8.043 c 19.043 8.18\n" + " 18.992 8.355 18.926 8.566 c 18.867 8.777 18.793 9.016 18.707 9.277 c 18.625\n" + " 9.531 18.543 9.789 18.457 10.043 c 16.938 14.469 l 21.363 14.469 l 19.844\n" + " 10.043 l 39.992 14.863 m 39.992 15.758 39.902 16.586 39.719 17.344 c 39.543\n" + " 18.102 39.27 18.754 38.898 19.301 c 38.527 19.848 38.055 20.277 37.477 \n" + "20.59 c 36.91 20.895 36.234 21.047 35.457 21.047 c 35.105 21.047 34.758 \n" + "21.012 34.406 20.938 c 34.062 20.863 33.734 20.75 33.422 20.586 c 33.109\n" + " 20.418 32.816 20.203 32.547 19.941 c 32.285 19.672 32.059 19.34 31.871 \n" + "18.945 c 31.805 18.945 l 31.812 18.98 31.82 19.074 31.828 19.219 c 31.836\n" + " 19.363 31.844 19.535 31.852 19.73 c 31.859 19.918 31.863 20.125 31.863 \n" + "20.344 c 31.871 20.555 31.875 20.75 31.875 20.934 c 31.875 25.469 l 28.805\n" + " 25.469 l 28.805 11.723 l 28.805 11.117 28.793 10.578 28.773 10.105 c 28.758\n" + " 9.633 28.742 9.266 28.719 9 c 31.703 9 l 31.719 9.051 31.73 9.148 31.746\n" + " 9.297 c 31.77 9.441 31.781 9.609 31.789 9.801 c 31.805 9.988 31.816 10.188\n" + " 31.82 10.391 c 31.828 10.594 31.832 10.773 31.832 10.926 c 31.875 10.926\n" + " l 32.246 10.145 32.758 9.59 33.406 9.254 c 34.055 8.918 34.805 8.75 35.656\n" + " 8.75 c 36.406 8.75 37.055 8.902 37.602 9.207 c 38.148 9.512 38.598 9.934\n" + " 38.945 10.473 c 39.301 11.012 39.566 11.656 39.73 12.406 c 39.906 13.148\n" + " 39.992 13.965 39.992 14.855 c 36.789 14.855 m 36.789 13.508 36.586 12.512\n" + " 36.176 11.863 c 35.77 11.207 35.16 10.879 34.352 10.879 c 34.047 10.879\n" + " 33.738 10.945 33.434 11.074 c 33.137 11.199 32.867 11.418 32.625 11.73 \n" + "c 32.391 12.035 32.199 12.453 32.047 12.977 c 31.902 13.492 31.828 14.148\n" + " 31.828 14.945 c 31.828 15.719 31.902 16.363 32.047 16.879 c 32.191 17.391\n" + " 32.383 17.797 32.613 18.102 c 32.855 18.406 33.125 18.625 33.422 18.758\n" + " c 33.719 18.883 34.023 18.945 34.328 18.945 c 34.723 18.945 35.07 18.867\n" + " 35.379 18.715 c 35.684 18.555 35.941 18.312 36.145 17.984 c 36.355 17.648\n" + " 36.516 17.223 36.625 16.707 c 36.734 16.191 36.789 15.574 36.789 14.859\n" + " c 53.672 14.859 m 53.672 15.754 53.582 16.582 53.398 17.34 c 53.223 18.098\n" + " 52.949 18.75 52.578 19.297 c 52.207 19.844 51.734 20.273 51.156 20.586 \n" + "c 50.59 20.891 49.914 21.043 49.137 21.043 c 48.785 21.043 48.438 21.008\n" + " 48.086 20.934 c 47.742 20.859 47.414 20.746 47.102 20.582 c 46.789 20.414\n" + " 46.496 20.199 46.227 19.938 c 45.965 19.668 45.738 19.336 45.551 18.941\n" + " c 45.484 18.941 l 45.492 18.977 45.5 19.07 45.508 19.215 c 45.516 19.359\n" + " 45.523 19.531 45.531 19.727 c 45.539 19.914 45.543 20.121 45.543 20.34 \n" + "c 45.551 20.551 45.555 20.746 45.555 20.93 c 45.555 25.465 l 42.484 25.465\n" + " l 42.484 11.719 l 42.484 11.113 42.473 10.574 42.453 10.102 c 42.438 9.629\n" + " 42.422 9.262 42.398 8.996 c 45.383 8.996 l 45.398 9.047 45.41 9.145 45.426\n" + " 9.293 c 45.449 9.438 45.461 9.605 45.469 9.797 c 45.484 9.984 45.496 10.184\n" + " 45.5 10.387 c 45.508 10.59 45.512 10.77 45.512 10.922 c 45.555 10.922 l\n" + " 45.926 10.141 46.438 9.586 47.086 9.25 c 47.734 8.914 48.484 8.746 49.336\n" + " 8.746 c 50.086 8.746 50.734 8.898 51.281 9.203 c 51.828 9.508 52.277 9.93\n" + " 52.625 10.469 c 52.98 11.008 53.246 11.652 53.41 12.402 c 53.586 13.145\n" + " 53.672 13.961 53.672 14.852 c 50.469 14.852 m 50.469 13.504 50.266 12.508\n" + " 49.855 11.859 c 49.449 11.203 48.84 10.875 48.031 10.875 c 47.727 10.875\n" + " 47.418 10.941 47.113 11.07 c 46.816 11.195 46.547 11.414 46.305 11.727 \n" + "c 46.07 12.031 45.879 12.449 45.727 12.973 c 45.582 13.488 45.508 14.145\n" + " 45.508 14.941 c 45.508 15.715 45.582 16.359 45.727 16.875 c 45.871 17.387\n" + " 46.062 17.793 46.293 18.098 c 46.535 18.402 46.805 18.621 47.102 18.754\n" + " c 47.398 18.879 47.703 18.941 48.008 18.941 c 48.402 18.941 48.75 18.863\n" + " 49.059 18.711 c 49.363 18.551 49.621 18.309 49.824 17.98 c 50.035 17.645\n" + " 50.195 17.219 50.305 16.703 c 50.414 16.188 50.469 15.57 50.469 14.855 \n" + "c 56.16 20.82 m 56.16 11.773 l 56.16 11.52 56.156 11.25 56.148 10.965 c \n" + "56.148 10.68 56.141 10.41 56.125 10.156 c 56.117 9.895 56.109 9.66 56.102\n" + " 9.457 c 56.094 9.246 56.082 9.094 56.07 9 c 59 9 l 59.016 9.086 59.027 \n" + "9.242 59.043 9.457 c 59.059 9.668 59.07 9.902 59.086 10.156 c 59.102 10.41\n" + " 59.113 10.668 59.117 10.922 c 59.133 11.168 59.141 11.371 59.141 11.523\n" + " c 59.184 11.523 l 59.336 11.094 59.488 10.711 59.641 10.375 c 59.793 10.031\n" + " 59.973 9.746 60.176 9.512 c 60.387 9.27 60.637 9.09 60.93 8.965 c 61.223\n" + " 8.832 61.582 8.77 62.012 8.77 c 62.195 8.77 62.371 8.789 62.547 8.824 c\n" + " 62.73 8.852 62.867 8.891 62.961 8.934 c 62.961 11.5 l 62.766 11.457 62.562\n" + " 11.418 62.359 11.391 c 62.164 11.355 61.926 11.336 61.648 11.336 c 60.883\n" + " 11.336 60.285 11.645 59.855 12.266 c 59.434 12.887 59.223 13.801 59.223\n" + " 15.02 c 59.223 20.82 l 56.152 20.82 l 76.082 14.898 m 76.082 15.801 75.953\n" + " 16.629 75.699 17.379 c 75.453 18.129 75.078 18.777 74.574 19.324 c 74.07\n" + " 19.863 73.445 20.285 72.695 20.59 c 71.945 20.887 71.07 21.039 70.074 21.039\n" + " c 69.113 21.039 68.266 20.891 67.527 20.59 c 66.793 20.293 66.172 19.871\n" + " 65.668 19.332 c 65.172 18.793 64.797 18.148 64.543 17.398 c 64.289 16.641\n" + " 64.16 15.809 64.16 14.895 c 64.16 14.012 64.281 13.199 64.52 12.457 c 64.766\n" + " 11.707 65.141 11.059 65.633 10.512 c 66.129 9.965 66.75 9.539 67.5 9.234\n" + " c 68.25 8.93 69.129 8.777 70.133 8.777 c 71.195 8.777 72.102 8.93 72.855\n" + " 9.234 c 73.605 9.539 74.219 9.965 74.691 10.512 c 75.172 11.051 75.523 \n" + "11.695 75.742 12.445 c 75.969 13.188 76.082 14.004 76.082 14.895 c 72.871\n" + " 14.895 m 72.871 13.488 72.641 12.469 72.184 11.836 c 71.727 11.203 71.059\n" + " 10.887 70.184 10.887 c 69.281 10.887 68.59 11.207 68.109 11.848 c 67.629\n" + " 12.488 67.387 13.504 67.387 14.895 c 67.387 15.602 67.449 16.211 67.574\n" + " 16.719 c 67.707 17.23 67.887 17.648 68.121 17.977 c 68.355 18.305 68.633\n" + " 18.547 68.961 18.707 c 69.289 18.859 69.648 18.938 70.043 18.938 c 70.496\n" + " 18.938 70.895 18.859 71.246 18.707 c 71.602 18.547 71.902 18.305 72.141\n" + " 17.977 c 72.383 17.648 72.562 17.23 72.688 16.719 c 72.812 16.207 72.875\n" + " 15.602 72.875 14.895 c 84.961 20.816 m 81.289 20.816 l 77.059 8.992 l 80.305\n" + " 8.992 l 82.371 15.602 l 82.438 15.82 82.504 16.055 82.578 16.301 c 82.652\n" + " 16.543 82.719 16.781 82.785 17.023 c 82.852 17.266 82.914 17.496 82.973\n" + " 17.723 c 83.039 17.949 83.098 18.152 83.148 18.336 c 83.191 18.16 83.246\n" + " 17.965 83.312 17.746 c 83.379 17.52 83.445 17.289 83.508 17.047 c 83.582\n" + " 16.805 83.652 16.566 83.727 16.324 c 83.809 16.082 83.883 15.855 83.957\n" + " 15.637 c 86.109 8.992 l 89.32 8.992 l 84.961 20.816 l 95.832 21.035 m 94.98\n" + " 21.035 94.211 20.91 93.527 20.664 c 92.852 20.41 92.27 20.027 91.789 19.516\n" + " c 91.309 19 90.941 18.355 90.684 17.582 c 90.43 16.801 90.301 15.891 90.301\n" + " 14.852 c 90.301 13.723 90.449 12.773 90.75 12 c 91.055 11.227 91.465 10.605\n" + " 91.973 10.133 c 92.488 9.652 93.082 9.305 93.754 9.094 c 94.426 8.883 95.129\n" + " 8.777 95.875 8.777 c 96.809 8.777 97.602 8.941 98.258 9.27 c 98.922 9.59\n" + " 99.465 10.043 99.887 10.625 c 100.309 11.207 100.617 11.906 100.816 12.723\n" + " c 101.012 13.531 101.113 14.426 101.113 15.41 c 101.113 15.496 l 93.539\n" + " 15.508 l 93.539 16.004 93.582 16.465 93.672 16.895 c 93.758 17.316 93.902\n" + " 17.684 94.098 18 c 94.293 18.305 94.551 18.551 94.863 18.73 c 95.176 18.906\n" + " 95.555 18.992 96 18.992 c 96.539 18.992 96.98 18.879 97.32 18.652 c 97.664\n" + " 18.418 97.906 18.062 98.051 17.582 c 100.945 17.832 l 100.812 18.168 100.629\n" + " 18.523 100.387 18.902 c 100.152 19.281 99.84 19.629 99.445 19.953 c 99.051\n" + " 20.266 98.559 20.527 97.969 20.738 c 97.387 20.941 96.676 21.043 95.84 \n" + "21.043 c 95.84 10.719 m 95.527 10.719 95.23 10.773 94.953 10.883 c 94.684\n" + " 10.984 94.445 11.152 94.242 11.387 c 94.047 11.613 93.887 11.906 93.762\n" + " 12.273 c 93.637 12.637 93.57 13.074 93.555 13.586 c 98.145 13.586 l 98.086\n" + " 12.633 97.855 11.918 97.457 11.445 c 97.055 10.965 96.516 10.723 95.84 \n" + "10.723 c 111.117 20.828 m 111.102 20.77 111.086 20.668 111.062 20.523 c \n" + "111.047 20.371 111.031 20.199 111.008 20.012 c 110.992 19.824 110.98 19.629\n" + " 110.965 19.434 c 110.957 19.238 110.953 19.062 110.953 18.91 c 110.91 18.91\n" + " l 110.555 19.676 110.055 20.227 109.414 20.559 c 108.781 20.887 108.02 \n" + "21.051 107.129 21.051 c 106.387 21.051 105.742 20.898 105.195 20.594 c 104.656\n" + " 20.289 104.207 19.863 103.852 19.316 c 103.5 18.77 103.238 18.125 103.066\n" + " 17.383 c 102.898 16.633 102.816 15.816 102.816 14.934 c 102.816 14.039 \n" + "102.902 13.215 103.078 12.465 c 103.262 11.715 103.535 11.07 103.91 10.531\n" + " c 104.281 9.984 104.75 9.559 105.32 9.254 c 105.895 8.949 106.578 8.797\n" + " 107.363 8.797 c 107.75 8.797 108.121 8.836 108.477 8.918 c 108.832 9 109.164\n" + " 9.121 109.473 9.289 c 109.777 9.457 110.055 9.672 110.305 9.934 c 110.551\n" + " 10.195 110.762 10.512 110.938 10.883 c 110.961 10.883 l 110.961 10.809 \n" + "110.957 10.703 110.949 10.566 c 110.949 10.422 110.949 10.258 110.949 10.074\n" + " c 110.949 9.891 110.945 9.703 110.938 9.508 c 110.938 9.312 110.938 9.121\n" + " 110.938 8.941 c 110.938 4.625 l 114.008 4.625 l 114.008 18.262 l 114.008\n" + " 18.836 114.02 19.352 114.039 19.801 c 114.062 20.246 114.078 20.59 114.094\n" + " 20.84 c 111.121 20.84 l 110.98 14.863 m 110.98 14.082 110.906 13.438 110.762\n" + " 12.93 c 110.617 12.414 110.422 12.004 110.184 11.707 c 109.949 11.402 109.68\n" + " 11.191 109.375 11.074 c 109.078 10.949 108.77 10.887 108.457 10.887 c 108.062\n" + " 10.887 107.715 10.965 107.406 11.117 c 107.109 11.27 106.852 11.512 106.641\n" + " 11.84 c 106.438 12.168 106.281 12.586 106.172 13.098 c 106.07 13.609 106.02\n" + " 14.223 106.02 14.945 c 106.02 17.625 106.824 18.965 108.434 18.965 c 108.738\n" + " 18.965 109.047 18.898 109.352 18.77 c 109.656 18.637 109.93 18.418 110.172\n" + " 18.102 c 110.414 17.789 110.605 17.371 110.75 16.844 c 110.902 16.312 110.98\n" + " 15.652 110.98 14.867 c S Q\n" + "Q q\n" + "0 0 127 26.484 re W n\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 123.609 26.086 l 125.238 26.086 126.609\n" + " 24.715 126.609 23.086 c 126.609 3.398 l 126.609 1.77 125.238 0.398 123.609\n" + " 0.398 c h\n" + "3.867 3.844 m 123.164 3.844 l 123.164 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m f\n" + "Q q\n" + "1 1 1 RG /a1 gs\n" + "0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 123.609 26.086 l 125.238 26.086 126.609\n" + " 24.715 126.609 23.086 c 126.609 3.398 l 126.609 1.77 125.238 0.398 123.609\n" + " 0.398 c h\n" + "3.867 3.844 m 123.164 3.844 l 123.164 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m S Q\n" + "Q\n"; + +static Dict *getApprovedStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_as_is.h b/poppler-24.05.0/poppler/annot_stamp_as_is.h new file mode 100644 index 0000000000000000000000000000000000000000..4fe29d5ed4e8614fc625ee138f84c00f796c9b38 --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_as_is.h @@ -0,0 +1,134 @@ +//======================================================================== +// +// annot_stamp_as_is.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_AS_IS_H +#define ANNOT_STAMP_AS_IS_H + +#include "Dict.h" +#include "Object.h" +#include "PDFDoc.h" + +static const double ANNOT_STAMP_AS_IS_WIDTH = 79.758179; +static const double ANNOT_STAMP_AS_IS_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_AS_IS = "1 0 0 -1 0 26.484744 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 76.367 2.129 l 77.066 2.129 77.637 2.828 77.637 3.398 c 77.637\n" + " 23.09 l 77.637 23.789 77.07 24.359 76.367 24.359 c 3.406 24.359 l 2.707\n" + " 24.359 2.137 23.66 2.137 23.09 c 2.137 3.398 l 2.137 2.699 2.703 2.129 \n" + "3.406 2.129 c h\n" + "3.406 2.129 m f\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "1 1 1 RG 0.265748 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "25.703 20.828 m 24.336 16.895 l 18.469 16.895 l 17.102 20.828 l 13.879 \n" + "20.828 l 19.496 5.434 l 23.297 5.434 l 28.891 20.828 l 25.699 20.828 l 22.098\n" + " 10.043 m 22.012 9.789 21.922 9.531 21.836 9.277 c 21.754 9.016 21.684 8.777\n" + " 21.617 8.566 c 21.559 8.348 21.508 8.168 21.465 8.031 c 21.43 7.895 21.406\n" + " 7.816 21.398 7.801 c 21.391 7.824 21.371 7.902 21.332 8.043 c 21.297 8.18\n" + " 21.246 8.355 21.18 8.566 c 21.121 8.777 21.047 9.016 20.961 9.277 c 20.879\n" + " 9.531 20.797 9.789 20.711 10.043 c 19.191 14.469 l 23.617 14.469 l 22.098\n" + " 10.043 l 41.023 17.375 m 41.023 17.941 40.902 18.453 40.664 18.906 c 40.43\n" + " 19.359 40.09 19.742 39.637 20.066 c 39.184 20.379 38.633 20.625 37.977 \n" + "20.797 c 37.32 20.965 36.574 21.047 35.738 21.047 c 34.988 21.047 34.309\n" + " 20.992 33.707 20.883 c 33.102 20.773 32.57 20.594 32.113 20.348 c 31.66\n" + " 20.094 31.281 19.766 30.977 19.363 c 30.672 18.961 30.441 18.469 30.289\n" + " 17.879 c 32.988 17.477 l 33.074 17.805 33.195 18.07 33.348 18.273 c 33.5\n" + " 18.477 33.691 18.633 33.914 18.742 c 34.141 18.852 34.402 18.926 34.699\n" + " 18.961 c 35.004 18.996 35.352 19.016 35.738 19.016 c 36.09 19.016 36.41\n" + " 18.996 36.711 18.961 c 37.016 18.918 37.277 18.848 37.496 18.754 c 37.723\n" + " 18.652 37.898 18.512 38.02 18.34 c 38.145 18.156 38.207 17.934 38.207 17.664\n" + " c 38.207 17.359 38.117 17.117 37.934 16.941 c 37.758 16.758 37.516 16.613\n" + " 37.203 16.504 c 36.898 16.387 36.531 16.289 36.109 16.207 c 35.695 16.121\n" + " 35.25 16.02 34.777 15.91 c 34.281 15.801 33.793 15.668 33.312 15.516 c \n" + "32.832 15.363 32.402 15.156 32.023 14.895 c 31.645 14.633 31.34 14.301 31.105\n" + " 13.898 c 30.871 13.492 30.754 12.977 30.754 12.359 c 30.754 11.797 30.863\n" + " 11.301 31.082 10.863 c 31.301 10.418 31.621 10.043 32.043 9.738 c 32.465\n" + " 9.426 32.984 9.188 33.605 9.027 c 34.23 8.859 34.949 8.777 35.758 8.777\n" + " c 36.398 8.777 36.996 8.84 37.551 8.965 c 38.105 9.082 38.602 9.27 39.035\n" + " 9.531 c 39.473 9.785 39.836 10.113 40.129 10.516 c 40.426 10.918 40.637\n" + " 11.402 40.75 11.969 c 38.027 12.254 l 37.977 11.969 37.887 11.738 37.754\n" + " 11.555 c 37.621 11.367 37.457 11.215 37.262 11.105 c 37.074 10.996 36.852\n" + " 10.922 36.594 10.887 c 36.34 10.844 36.059 10.82 35.754 10.82 c 35.027 \n" + "10.82 34.48 10.914 34.113 11.105 c 33.75 11.289 33.566 11.598 33.566 12.035\n" + " c 33.566 12.305 33.641 12.52 33.785 12.68 c 33.938 12.84 34.148 12.977 \n" + "34.418 13.082 c 34.695 13.184 35.02 13.273 35.391 13.355 c 35.77 13.43 36.18\n" + " 13.52 36.625 13.629 c 37.172 13.746 37.707 13.883 38.23 14.043 c 38.762\n" + " 14.195 39.23 14.41 39.641 14.688 c 40.055 14.957 40.387 15.309 40.637 15.738\n" + " c 40.891 16.168 41.02 16.715 41.02 17.379 c 49.656 20.828 m 49.656 5.434\n" + " l 52.879 5.434 l 52.879 20.828 l 49.656 20.828 l 65.891 17.375 m 65.891\n" + " 17.941 65.77 18.453 65.531 18.906 c 65.297 19.359 64.957 19.742 64.504 \n" + "20.066 c 64.051 20.379 63.5 20.625 62.844 20.797 c 62.188 20.965 61.441 \n" + "21.047 60.605 21.047 c 59.855 21.047 59.176 20.992 58.574 20.883 c 57.969\n" + " 20.773 57.438 20.594 56.98 20.348 c 56.527 20.094 56.148 19.766 55.844 \n" + "19.363 c 55.539 18.961 55.309 18.469 55.156 17.879 c 57.855 17.477 l 57.941\n" + " 17.805 58.062 18.07 58.215 18.273 c 58.367 18.477 58.559 18.633 58.781 \n" + "18.742 c 59.008 18.852 59.27 18.926 59.566 18.961 c 59.871 18.996 60.219\n" + " 19.016 60.605 19.016 c 60.957 19.016 61.277 18.996 61.578 18.961 c 61.883\n" + " 18.918 62.145 18.848 62.363 18.754 c 62.59 18.652 62.766 18.512 62.887 \n" + "18.34 c 63.012 18.156 63.074 17.934 63.074 17.664 c 63.074 17.359 62.984\n" + " 17.117 62.801 16.941 c 62.625 16.758 62.383 16.613 62.07 16.504 c 61.766\n" + " 16.387 61.398 16.289 60.977 16.207 c 60.562 16.121 60.117 16.02 59.645 \n" + "15.91 c 59.148 15.801 58.66 15.668 58.18 15.516 c 57.699 15.363 57.27 15.156\n" + " 56.891 14.895 c 56.512 14.633 56.207 14.301 55.973 13.898 c 55.738 13.492\n" + " 55.621 12.977 55.621 12.359 c 55.621 11.797 55.73 11.301 55.949 10.863 \n" + "c 56.168 10.418 56.488 10.043 56.91 9.738 c 57.332 9.426 57.852 9.188 58.473\n" + " 9.027 c 59.098 8.859 59.816 8.777 60.625 8.777 c 61.266 8.777 61.863 8.84\n" + " 62.418 8.965 c 62.973 9.082 63.469 9.27 63.902 9.531 c 64.34 9.785 64.703\n" + " 10.113 64.996 10.516 c 65.293 10.918 65.504 11.402 65.617 11.969 c 62.895\n" + " 12.254 l 62.844 11.969 62.754 11.738 62.621 11.555 c 62.488 11.367 62.324\n" + " 11.215 62.129 11.105 c 61.941 10.996 61.719 10.922 61.461 10.887 c 61.207\n" + " 10.844 60.926 10.82 60.621 10.82 c 59.895 10.82 59.348 10.914 58.98 11.105\n" + " c 58.617 11.289 58.434 11.598 58.434 12.035 c 58.434 12.305 58.508 12.52\n" + " 58.652 12.68 c 58.805 12.84 59.016 12.977 59.285 13.082 c 59.562 13.184\n" + " 59.887 13.273 60.258 13.355 c 60.637 13.43 61.047 13.52 61.492 13.629 c\n" + " 62.039 13.746 62.574 13.883 63.098 14.043 c 63.629 14.195 64.098 14.41 \n" + "64.508 14.688 c 64.922 14.957 65.254 15.309 65.504 15.738 c 65.758 16.168\n" + " 65.887 16.715 65.887 17.379 c B Q\n" + "Q q\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "1 1 1 RG 0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 76.359 26.086 l 77.988 26.086 79.359 24.715\n" + " 79.359 23.086 c 79.359 3.398 l 79.359 1.77 77.988 0.398 76.359 0.398 c \n" + "h\n" + "3.867 3.844 m 75.914 3.844 l 75.914 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m B Q\n" + "Q\n"; + +static Dict *getAsIsStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_confidential.h b/poppler-24.05.0/poppler/annot_stamp_confidential.h new file mode 100644 index 0000000000000000000000000000000000000000..0af713570079d9846a33b6fb0edf1c89a9df6cf5 --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_confidential.h @@ -0,0 +1,192 @@ +//======================================================================== +// +// annot_stamp_confidential.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_CONFIDENTIAL_H +#define ANNOT_STAMP_CONFIDENTIAL_H + +#include "PDFDoc.h" +#include "Dict.h" +#include "Object.h" + +static const double ANNOT_STAMP_CONFIDENTIAL_WIDTH = 155.508179; +static const double ANNOT_STAMP_CONFIDENTIAL_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_CONFIDENTIAL = "1 0 0 -1 0 26.484741 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 152.117 2.129 l 152.82 2.129 153.387 2.695 153.387 3.398 \n" + "c 153.387 23.09 l 153.387 23.793 152.82 24.359 152.117 24.359 c 3.406 24.355\n" + " l 2.703 24.355 2.137 23.789 2.137 23.086 c 2.137 3.395 l 2.137 2.691 2.703\n" + " 2.125 3.406 2.125 c h\n" + "3.406 2.129 m f\n" + "0.74902 0 0 rg /a1 gs\n" + "1 1 1 RG 0.531496 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "22.008 18.512 m 23.953 18.512 25.305 17.535 26.062 15.582 c 28.871 16.641\n" + " l 28.266 18.125 27.379 19.234 26.203 19.961 c 25.039 20.684 23.641 21.043\n" + " 22.008 21.043 c 19.531 21.043 17.613 20.344 16.262 18.945 c 14.914 17.539\n" + " 14.242 15.578 14.242 13.055 c 14.242 10.527 14.895 8.586 16.199 7.23 c \n" + "17.504 5.875 19.395 5.199 21.871 5.199 c 23.676 5.199 25.148 5.562 26.285\n" + " 6.293 c 27.422 7.016 28.219 8.078 28.68 9.484 c 25.84 10.262 l 25.598 9.488\n" + " 25.125 8.879 24.418 8.426 c 23.719 7.969 22.891 7.738 21.938 7.738 c 20.48\n" + " 7.738 19.375 8.191 18.617 9.094 c 17.867 9.996 17.492 11.32 17.492 13.059\n" + " c 17.492 14.828 17.879 16.18 18.652 17.113 c 19.434 18.047 20.555 18.512\n" + " 22.02 18.512 c h\n" + "22.008 18.512 m B Q\n" + "0.74902 0 0 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "42.277 14.906 m 42.277 16.82 41.746 18.328 40.684 19.418 c 39.621 20.504\n" + " 38.148 21.047 36.27 21.047 c 34.426 21.047 32.98 20.5 31.93 19.406 c 30.879\n" + " 18.312 30.355 16.812 30.355 14.906 c 30.355 13.004 30.879 11.512 31.93 \n" + "10.426 c 32.98 9.332 34.445 8.785 36.332 8.785 c 38.262 8.785 39.734 9.312\n" + " 40.746 10.371 c 41.766 11.422 42.277 12.93 42.277 14.906 c h\n" + "39.066 14.906 m 39.066 13.5 38.836 12.48 38.379 11.848 c 37.922 11.215 \n" + "37.254 10.898 36.379 10.898 c 34.516 10.898 33.582 12.234 33.582 14.91 c\n" + " 33.582 16.23 33.809 17.234 34.258 17.926 c 34.715 18.609 35.375 18.953 \n" + "36.234 18.953 c 38.121 18.953 39.062 17.605 39.062 14.91 c h\n" + "39.066 14.906 m B Q\n" + "0.74902 0 0 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "52.375 20.828 m 52.375 14.195 l 52.375 12.121 51.672 11.082 50.266 11.082\n" + " c 49.523 11.082 48.922 11.402 48.461 12.043 c 48.008 12.676 47.785 13.492\n" + " 47.785 14.492 c 47.785 20.828 l 44.715 20.828 l 44.715 11.652 l 44.715 \n" + "11.02 44.703 10.5 44.684 10.102 c 44.668 9.695 44.652 9.328 44.629 9.008\n" + " c 47.559 9.008 l 47.582 9.145 47.609 9.52 47.645 10.121 c 47.68 10.719 \n" + "47.699 11.129 47.699 11.355 c 47.742 11.355 l 48.156 10.453 48.68 9.797 \n" + "49.305 9.387 c 49.93 8.98 50.68 8.773 51.543 8.773 c 52.797 8.773 53.758\n" + " 9.16 54.426 9.934 c 55.098 10.707 55.43 11.836 55.43 13.32 c 55.43 20.828\n" + " l h\n" + "52.375 20.828 m B Q\n" + "0.74902 0 0 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "61.992 11.082 m 61.992 20.828 l 58.93 20.828 l 58.93 11.082 l 57.203 11.082\n" + " l 57.203 9.008 l 58.93 9.008 l 58.93 7.773 l 58.93 6.703 59.215 5.91 59.781\n" + " 5.391 c 60.348 4.875 61.211 4.613 62.371 4.613 c 62.945 4.613 63.594 4.672\n" + " 64.316 4.789 c 64.316 6.766 l 64.02 6.699 63.719 6.668 63.422 6.668 c 62.898\n" + " 6.668 62.527 6.773 62.309 6.984 c 62.098 7.188 61.992 7.551 61.992 8.078\n" + " c 61.992 9.008 l 64.32 9.008 l 64.32 11.082 l h\n" + "61.992 11.082 m B Q\n" + "0.74902 0 0 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "65.836 6.875 m 65.836 4.613 l 68.906 4.613 l 68.906 6.875 l h\n" + "65.836 20.828 m 65.836 9.008 l 68.906 9.008 l 68.906 20.832 l h\n" + "65.836 20.828 m B Q\n" + "0.74902 0 0 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "79.715 20.828 m 79.688 20.719 79.648 20.445 79.605 20.008 c 79.57 19.562\n" + " 79.551 19.195 79.551 18.902 c 79.508 18.902 l 78.844 20.332 77.586 21.043\n" + " 75.727 21.043 c 74.352 21.043 73.285 20.508 72.535 19.438 c 71.785 18.359\n" + " 71.41 16.855 71.41 14.926 c 71.41 12.965 71.805 11.453 72.59 10.391 c 73.383\n" + " 9.32 74.504 8.785 75.957 8.785 c 76.793 8.785 77.516 8.961 78.121 9.309\n" + " c 78.734 9.66 79.203 10.18 79.531 10.871 c 79.555 10.871 l 79.531 8.926\n" + " l 79.531 4.609 l 82.602 4.609 l 82.602 18.246 l 82.602 18.973 82.629 19.836\n" + " 82.688 20.824 c h\n" + "79.574 14.852 m 79.574 13.578 79.359 12.598 78.93 11.914 c 78.508 11.223\n" + " 77.879 10.875 77.051 10.875 c 76.227 10.875 75.617 11.211 75.215 11.879\n" + " c 74.812 12.543 74.613 13.559 74.613 14.926 c 74.613 17.605 75.418 18.945\n" + " 77.027 18.945 c 77.836 18.945 78.461 18.594 78.906 17.887 c 79.352 17.172\n" + " 79.574 16.16 79.574 14.848 c h\n" + "79.574 14.852 m B Q\n" + "0.74902 0 0 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "90.566 21.047 m 88.789 21.047 87.422 20.523 86.469 19.473 c 85.516 18.418\n" + " 85.039 16.879 85.039 14.863 c 85.039 12.91 85.523 11.41 86.492 10.363 c\n" + " 87.461 9.312 88.836 8.789 90.613 8.789 c 92.312 8.789 93.605 9.355 94.504\n" + " 10.484 c 95.398 11.605 95.848 13.254 95.848 15.422 c 95.848 15.508 l 88.266\n" + " 15.508 l 88.266 16.66 88.477 17.527 88.898 18.121 c 89.328 18.703 89.938\n" + " 18.996 90.723 18.996 c 91.809 18.996 92.492 18.527 92.777 17.586 c 95.672\n" + " 17.836 l 94.836 19.977 93.133 21.047 90.57 21.047 c h\n" + "90.566 10.723 m 89.844 10.723 89.289 10.973 88.895 11.477 c 88.508 11.98\n" + " 88.305 12.684 88.281 13.586 c 92.871 13.586 l 92.812 12.633 92.582 11.918\n" + " 92.184 11.445 c 91.781 10.965 91.242 10.723 90.566 10.723 c h\n" + "90.566 10.723 m B Q\n" + "0.74902 0 0 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "105.828 20.828 m 105.828 14.195 l 105.828 12.121 105.125 11.082 103.719\n" + " 11.082 c 102.977 11.082 102.375 11.402 101.914 12.043 c 101.461 12.676 \n" + "101.238 13.492 101.238 14.492 c 101.238 20.828 l 98.168 20.828 l 98.168 \n" + "11.652 l 98.168 11.02 98.156 10.5 98.137 10.102 c 98.121 9.695 98.105 9.328\n" + " 98.082 9.008 c 101.012 9.008 l 101.035 9.145 101.062 9.52 101.098 10.121\n" + " c 101.133 10.719 101.152 11.129 101.152 11.355 c 101.195 11.355 l 101.609\n" + " 10.453 102.133 9.797 102.758 9.387 c 103.383 8.98 104.133 8.773 104.996\n" + " 8.773 c 106.25 8.773 107.211 9.16 107.879 9.934 c 108.551 10.707 108.883\n" + " 11.836 108.883 13.32 c 108.883 20.828 l h\n" + "105.828 20.828 m B Q\n" + "0.74902 0 0 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "114.867 21.027 m 113.965 21.027 113.27 20.785 112.781 20.297 c 112.293 \n" + "19.801 112.051 19.055 112.051 18.059 c 112.051 11.086 l 110.555 11.086 l\n" + " 110.555 9.012 l 112.203 9.012 l 113.164 6.234 l 115.086 6.234 l 115.086\n" + " 9.012 l 117.324 9.012 l 117.324 11.086 l 115.086 11.086 l 115.086 17.227\n" + " l 115.086 17.801 115.195 18.227 115.414 18.504 c 115.633 18.773 115.973\n" + " 18.906 116.43 18.906 c 116.672 18.906 117.012 18.855 117.457 18.754 c 117.457\n" + " 20.656 l 116.699 20.902 115.836 21.027 114.867 21.027 c h\n" + "114.867 21.027 m B Q\n" + "0.74902 0 0 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "119.293 6.875 m 119.293 4.613 l 122.363 4.613 l 122.363 6.875 l h\n" + "119.293 20.828 m 119.293 9.008 l 122.363 9.008 l 122.363 20.832 l h\n" + "119.293 20.828 m B Q\n" + "0.74902 0 0 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "128.242 21.047 m 127.098 21.047 126.207 20.738 125.566 20.117 c 124.926\n" + " 19.492 124.605 18.613 124.605 17.484 c 124.605 16.262 125.004 15.328 125.797\n" + " 14.688 c 126.598 14.047 127.758 13.719 129.273 13.703 c 131.82 13.66 l \n" + "131.82 13.059 l 131.82 12.285 131.688 11.715 131.418 11.344 c 131.148 10.965\n" + " 130.707 10.777 130.098 10.777 c 129.531 10.777 129.109 10.91 128.84 11.172\n" + " c 128.578 11.426 128.414 11.852 128.348 12.449 c 125.145 12.297 l 125.34\n" + " 11.145 125.867 10.277 126.719 9.684 c 127.578 9.086 128.746 8.789 130.227\n" + " 8.789 c 131.719 8.789 132.871 9.156 133.68 9.895 c 134.488 10.629 134.891\n" + " 11.676 134.891 13.031 c 134.891 17.336 l 134.891 18 134.965 18.457 135.109\n" + " 18.711 c 135.262 18.957 135.512 19.082 135.863 19.082 c 136.098 19.082 \n" + "136.32 19.059 136.539 19.016 c 136.539 20.676 l 136.355 20.719 136.191 20.758\n" + " 136.047 20.797 c 135.902 20.832 135.754 20.863 135.609 20.883 c 135.465\n" + " 20.906 135.309 20.922 135.141 20.938 c 134.98 20.953 134.789 20.961 134.574\n" + " 20.961 c 133.801 20.961 133.23 20.773 132.859 20.395 c 132.496 20.016 132.277\n" + " 19.457 132.203 18.723 c 132.137 18.723 l 131.277 20.273 129.98 21.051 128.246\n" + " 21.051 c h\n" + "131.816 15.355 m 130.242 15.379 l 129.527 15.406 129.023 15.488 128.723\n" + " 15.621 c 128.426 15.746 128.195 15.938 128.035 16.199 c 127.883 16.461 \n" + "127.805 16.812 127.805 17.25 c 127.805 17.812 127.934 18.23 128.188 18.508\n" + " c 128.449 18.777 128.797 18.91 129.227 18.91 c 129.707 18.91 130.145 18.777\n" + " 130.539 18.516 c 130.941 18.254 131.254 17.895 131.48 17.434 c 131.707 \n" + "16.969 131.82 16.477 131.82 15.957 c h\n" + "131.816 15.355 m B Q\n" + "0.74902 0 0 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "137.953 4.613 3.07 16.215 re B Q\n" + "Q q\n" + "0.74902 0.0117647 0.0117647 rg /a1 gs\n" + "1 1 1 RG 0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 152.109 26.086 l 153.738 26.086 155.109\n" + " 24.715 155.109 23.086 c 155.109 3.398 l 155.109 1.77 153.738 0.398 152.109\n" + " 0.398 c h\n" + "3.867 3.844 m 151.664 3.844 l 151.664 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m B Q\n" + "Q\n"; + +static Dict *getConfidentialStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_departmental.h b/poppler-24.05.0/poppler/annot_stamp_departmental.h new file mode 100644 index 0000000000000000000000000000000000000000..cabe800f44a235d50a863453ba9d5b19c698f0e8 --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_departmental.h @@ -0,0 +1,470 @@ +//======================================================================== +// +// annot_stamp_departmental.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_DEPARTMENTAL_H +#define ANNOT_STAMP_DEPARTMENTAL_H + +#include "Dict.h" +#include "Object.h" +#include "PDFDoc.h" + +static const double ANNOT_STAMP_DEPARTMENTAL_WIDTH = 170.508179; +static const double ANNOT_STAMP_DEPARTMENTAL_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_DEPARTMENTAL = "1 0 0 -1 0 26.484741 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 167.117 2.129 l 167.816 2.129 168.387 2.828 168.387 3.398\n" + " c 168.387 23.09 l 168.387 23.789 167.82 24.359 167.117 24.359 c 3.406 24.359\n" + " l 2.707 24.359 2.137 23.66 2.137 23.09 c 2.137 3.398 l 2.137 2.699 2.703\n" + " 2.129 3.406 2.129 c h\n" + "3.406 2.129 m f\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "28.543 13.016 m 28.543 14.297 28.352 15.426 27.965 16.402 c 27.578 17.371\n" + " 27.051 18.184 26.379 18.84 c 25.707 19.496 24.914 19.992 23.996 20.324 \n" + "c 23.086 20.66 22.102 20.828 21.047 20.828 c 14.82 20.828 l 14.82 5.434 \n" + "l 20.395 5.434 l 21.59 5.434 22.684 5.582 23.684 5.883 c 24.68 6.18 25.543\n" + " 6.641 26.262 7.258 c 26.984 7.879 27.543 8.664 27.945 9.617 c 28.348 10.57\n" + " 28.547 11.703 28.547 13.016 c 25.301 13.016 m 25.301 12.121 25.176 11.352\n" + " 24.93 10.711 c 24.688 10.07 24.352 9.547 23.914 9.137 c 23.477 8.723 22.953\n" + " 8.414 22.34 8.219 c 21.734 8.023 21.066 7.922 20.328 7.922 c 18.043 7.926\n" + " l 18.043 18.34 l 20.773 18.34 l 21.422 18.34 22.02 18.227 22.566 18 c 23.121\n" + " 17.773 23.598 17.438 23.996 16.996 c 24.402 16.543 24.723 15.988 24.945\n" + " 15.324 c 25.18 14.66 25.297 13.895 25.297 13.02 c 35.895 21.051 m 35.043\n" + " 21.051 34.273 20.926 33.59 20.68 c 32.914 20.426 32.332 20.043 31.852 19.531\n" + " c 31.371 19.016 31.004 18.371 30.746 17.598 c 30.492 16.816 30.363 15.906\n" + " 30.363 14.867 c 30.363 13.738 30.512 12.789 30.812 12.016 c 31.117 11.242\n" + " 31.527 10.621 32.035 10.148 c 32.551 9.668 33.145 9.32 33.816 9.109 c 34.488\n" + " 8.898 35.191 8.793 35.938 8.793 c 36.871 8.793 37.664 8.957 38.32 9.285\n" + " c 38.984 9.605 39.527 10.059 39.949 10.641 c 40.371 11.223 40.68 11.922\n" + " 40.879 12.738 c 41.074 13.547 41.176 14.441 41.176 15.426 c 41.176 15.512\n" + " l 33.594 15.508 l 33.594 16.004 33.637 16.465 33.727 16.895 c 33.812 17.316\n" + " 33.957 17.684 34.152 18 c 34.348 18.305 34.605 18.551 34.918 18.73 c 35.23\n" + " 18.906 35.609 18.992 36.055 18.992 c 36.594 18.992 37.035 18.879 37.375\n" + " 18.652 c 37.719 18.418 37.961 18.062 38.105 17.582 c 41 17.832 l 40.867\n" + " 18.168 40.684 18.523 40.441 18.902 c 40.207 19.281 39.895 19.629 39.5 19.953\n" + " c 39.105 20.266 38.613 20.527 38.023 20.738 c 37.441 20.941 36.73 21.043\n" + " 35.895 21.043 c 35.895 10.719 m 35.582 10.719 35.285 10.773 35.008 10.883\n" + " c 34.738 10.984 34.5 11.152 34.297 11.387 c 34.102 11.613 33.941 11.906\n" + " 33.816 12.273 c 33.691 12.637 33.625 13.074 33.609 13.586 c 38.199 13.586\n" + " l 38.141 12.633 37.91 11.918 37.512 11.445 c 37.109 10.965 36.57 10.723\n" + " 35.895 10.723 c 54.699 14.863 m 54.699 15.758 54.609 16.586 54.426 17.344\n" + " c 54.25 18.102 53.977 18.754 53.605 19.301 c 53.234 19.848 52.762 20.277\n" + " 52.184 20.59 c 51.617 20.895 50.941 21.047 50.164 21.047 c 49.812 21.047\n" + " 49.465 21.012 49.113 20.938 c 48.77 20.863 48.441 20.75 48.129 20.586 c\n" + " 47.816 20.418 47.523 20.203 47.254 19.941 c 46.992 19.672 46.766 19.34 \n" + "46.578 18.945 c 46.512 18.945 l 46.52 18.98 46.527 19.074 46.535 19.219 \n" + "c 46.543 19.363 46.551 19.535 46.559 19.73 c 46.566 19.918 46.57 20.125 \n" + "46.57 20.344 c 46.578 20.555 46.582 20.75 46.582 20.934 c 46.582 25.469 \n" + "l 43.512 25.473 l 43.512 11.727 l 43.512 11.121 43.5 10.582 43.48 10.109\n" + " c 43.465 9.637 43.449 9.27 43.426 9.004 c 46.41 9.004 l 46.426 9.055 46.438\n" + " 9.152 46.453 9.301 c 46.477 9.445 46.488 9.613 46.496 9.805 c 46.512 9.992\n" + " 46.523 10.191 46.527 10.395 c 46.535 10.598 46.539 10.777 46.539 10.93 \n" + "c 46.582 10.93 l 46.953 10.148 47.465 9.594 48.113 9.258 c 48.762 8.922 \n" + "49.512 8.754 50.363 8.754 c 51.113 8.754 51.762 8.906 52.309 9.211 c 52.855\n" + " 9.516 53.305 9.938 53.652 10.477 c 54.008 11.016 54.273 11.66 54.438 12.41\n" + " c 54.613 13.152 54.699 13.969 54.699 14.859 c 51.496 14.859 m 51.496 13.512\n" + " 51.293 12.516 50.883 11.867 c 50.477 11.211 49.867 10.883 49.059 10.883\n" + " c 48.754 10.883 48.445 10.949 48.141 11.078 c 47.844 11.203 47.574 11.422\n" + " 47.332 11.734 c 47.098 12.039 46.906 12.457 46.754 12.98 c 46.609 13.496\n" + " 46.535 14.152 46.535 14.949 c 46.535 15.723 46.609 16.367 46.754 16.883\n" + " c 46.898 17.395 47.09 17.801 47.32 18.105 c 47.562 18.41 47.832 18.629 \n" + "48.129 18.762 c 48.426 18.887 48.73 18.949 49.035 18.949 c 49.43 18.949 \n" + "49.777 18.871 50.086 18.719 c 50.391 18.559 50.648 18.316 50.852 17.988 \n" + "c 51.062 17.652 51.223 17.227 51.332 16.711 c 51.441 16.195 51.496 15.578\n" + " 51.496 14.863 c 59.922 21.047 m 59.355 21.047 58.844 20.969 58.391 20.816\n" + " c 57.945 20.656 57.566 20.426 57.254 20.129 c 56.941 19.824 56.699 19.449\n" + " 56.531 19.004 c 56.363 18.559 56.281 18.055 56.281 17.484 c 56.281 16.785\n" + " 56.402 16.199 56.641 15.727 c 56.887 15.246 57.223 14.859 57.645 14.566\n" + " c 58.066 14.27 58.562 14.055 59.129 13.922 c 59.695 13.785 60.301 13.711\n" + " 60.941 13.703 c 63.488 13.66 l 63.488 13.059 l 63.488 12.629 63.449 12.273\n" + " 63.367 11.988 c 63.293 11.695 63.184 11.461 63.039 11.277 c 62.895 11.094\n" + " 62.711 10.969 62.492 10.895 c 62.281 10.812 62.035 10.773 61.762 10.773\n" + " c 61.508 10.773 61.277 10.801 61.074 10.852 c 60.879 10.902 60.707 10.992\n" + " 60.562 11.125 c 60.418 11.25 60.297 11.422 60.203 11.637 c 60.117 11.848\n" + " 60.055 12.117 60.016 12.445 c 56.824 12.297 l 56.91 11.781 57.07 11.309\n" + " 57.305 10.887 c 57.539 10.457 57.859 10.086 58.266 9.773 c 58.68 9.461 \n" + "59.188 9.219 59.785 9.051 c 60.391 8.875 61.098 8.789 61.906 8.789 c 62.641\n" + " 8.789 63.297 8.879 63.875 9.062 c 64.449 9.246 64.938 9.52 65.34 9.883 \n" + "c 65.742 10.238 66.047 10.68 66.258 11.203 c 66.469 11.727 66.574 12.336\n" + " 66.574 13.027 c 66.574 17.332 l 66.574 17.609 66.586 17.855 66.605 18.074\n" + " c 66.633 18.293 66.684 18.477 66.746 18.633 c 66.82 18.777 66.918 18.891\n" + " 67.043 18.973 c 67.176 19.047 67.34 19.082 67.547 19.082 c 67.781 19.082\n" + " 68.004 19.059 68.223 19.016 c 68.223 20.676 l 68.039 20.719 67.875 20.758\n" + " 67.73 20.797 c 67.586 20.832 67.438 20.863 67.293 20.883 c 67.148 20.906\n" + " 66.992 20.922 66.824 20.938 c 66.664 20.953 66.473 20.961 66.258 20.961\n" + " c 65.484 20.961 64.914 20.773 64.543 20.395 c 64.18 20.016 63.961 19.457\n" + " 63.887 18.723 c 63.82 18.723 l 63.414 19.457 62.887 20.031 62.246 20.438\n" + " c 61.613 20.844 60.84 21.051 59.93 21.051 c 63.504 15.359 m 61.93 15.383\n" + " l 61.602 15.398 61.289 15.426 60.988 15.469 c 60.695 15.504 60.438 15.59\n" + " 60.211 15.719 c 59.992 15.844 59.816 16.023 59.688 16.266 c 59.555 16.508\n" + " 59.492 16.832 59.492 17.25 c 59.492 17.812 59.621 18.23 59.875 18.508 c\n" + " 60.137 18.777 60.484 18.91 60.914 18.91 c 61.309 18.91 61.664 18.828 61.984\n" + " 18.66 c 62.305 18.492 62.574 18.273 62.793 18.004 c 63.02 17.727 63.195\n" + " 17.41 63.316 17.055 c 63.441 16.699 63.504 16.332 63.504 15.961 c 63.504\n" + " 15.359 l 69.656 20.832 m 69.652 11.781 l 69.652 11.527 69.648 11.258 69.641\n" + " 10.973 c 69.641 10.688 69.633 10.418 69.617 10.164 c 69.609 9.902 69.602\n" + " 9.668 69.594 9.465 c 69.586 9.254 69.574 9.102 69.562 9.008 c 72.492 9.008\n" + " l 72.508 9.094 72.52 9.25 72.535 9.465 c 72.551 9.676 72.562 9.91 72.578\n" + " 10.164 c 72.594 10.418 72.605 10.676 72.609 10.93 c 72.625 11.176 72.633\n" + " 11.379 72.633 11.531 c 72.676 11.531 l 72.828 11.102 72.98 10.719 73.133\n" + " 10.383 c 73.285 10.039 73.465 9.754 73.668 9.52 c 73.879 9.277 74.129 9.098\n" + " 74.422 8.973 c 74.715 8.84 75.074 8.777 75.504 8.777 c 75.688 8.777 75.863\n" + " 8.797 76.039 8.832 c 76.223 8.859 76.359 8.898 76.453 8.941 c 76.453 11.508\n" + " l 76.258 11.465 76.055 11.426 75.852 11.398 c 75.656 11.363 75.418 11.344\n" + " 75.141 11.344 c 74.375 11.344 73.777 11.652 73.348 12.273 c 72.926 12.895\n" + " 72.715 13.809 72.715 15.027 c 72.715 20.828 l 69.645 20.828 l 81.367 21.023\n" + " m 80.465 21.023 79.77 20.781 79.281 20.293 c 78.793 19.797 78.551 19.051\n" + " 78.551 18.055 c 78.551 11.082 l 77.055 11.082 l 77.055 9.008 l 78.703 9.008\n" + " l 79.664 6.23 l 81.586 6.23 l 81.586 9.008 l 83.824 9.008 l 83.824 11.082\n" + " l 81.586 11.082 l 81.594 17.223 l 81.594 17.797 81.703 18.223 81.922 18.5\n" + " c 82.141 18.77 82.48 18.902 82.938 18.902 c 83.125 18.902 83.297 18.887\n" + " 83.449 18.859 c 83.602 18.832 83.773 18.793 83.961 18.75 c 83.961 20.652\n" + " l 83.582 20.777 83.18 20.867 82.758 20.926 c 82.336 20.992 81.871 21.023\n" + " 81.371 21.023 c 92.777 20.828 m 92.777 14.195 l 92.777 13.738 92.746 13.316\n" + " 92.68 12.938 c 92.621 12.551 92.52 12.223 92.375 11.953 c 92.238 11.676\n" + " 92.051 11.461 91.816 11.309 c 91.59 11.156 91.312 11.078 90.984 11.078 \n" + "c 90.672 11.078 90.387 11.16 90.133 11.328 c 89.879 11.488 89.656 11.723\n" + " 89.465 12.027 c 89.281 12.324 89.141 12.688 89.039 13.109 c 88.938 13.523\n" + " 88.887 13.984 88.887 14.484 c 88.887 20.82 l 85.816 20.82 l 85.824 11.652\n" + " l 85.824 11.398 85.82 11.137 85.812 10.867 c 85.812 10.598 85.805 10.344\n" + " 85.789 10.102 c 85.781 9.855 85.773 9.637 85.766 9.445 c 85.758 9.25 85.746\n" + " 9.102 85.734 9.008 c 88.664 9.008 l 88.68 9.094 88.691 9.238 88.707 9.434\n" + " c 88.723 9.621 88.734 9.836 88.75 10.066 c 88.766 10.301 88.777 10.531 \n" + "88.781 10.766 c 88.797 11 88.805 11.195 88.805 11.355 c 88.848 11.355 l \n" + "89.227 10.453 89.695 9.797 90.258 9.387 c 90.824 8.98 91.504 8.773 92.289\n" + " 8.773 c 93.191 8.773 93.918 8.996 94.465 9.441 c 95.02 9.879 95.391 10.516\n" + " 95.578 11.355 c 95.645 11.355 l 95.855 10.867 96.082 10.461 96.32 10.133\n" + " c 96.566 9.805 96.836 9.543 97.129 9.348 c 97.426 9.145 97.75 8.996 98.09\n" + " 8.91 c 98.441 8.824 98.816 8.777 99.227 8.777 c 99.875 8.777 100.422 8.895\n" + " 100.867 9.129 c 101.32 9.363 101.684 9.684 101.961 10.09 c 102.246 10.496\n" + " 102.449 10.98 102.574 11.531 c 102.707 12.086 102.77 12.684 102.77 13.324\n" + " c 102.77 20.832 l 99.723 20.832 l 99.723 14.199 l 99.723 13.742 99.691 \n" + "13.32 99.625 12.941 c 99.566 12.555 99.465 12.227 99.32 11.957 c 99.184 \n" + "11.68 98.996 11.465 98.762 11.312 c 98.535 11.16 98.258 11.082 97.93 11.082\n" + " c 97.625 11.082 97.344 11.164 97.09 11.324 c 96.844 11.477 96.625 11.699\n" + " 96.434 11.992 c 96.25 12.277 96.109 12.617 96.008 13.02 c 95.906 13.422\n" + " 95.848 13.863 95.832 14.352 c 95.832 20.832 l 92.785 20.832 l 110.551 21.051\n" + " m 109.699 21.051 108.93 20.926 108.246 20.68 c 107.57 20.426 106.988 20.043\n" + " 106.508 19.531 c 106.027 19.016 105.66 18.371 105.402 17.598 c 105.148 \n" + "16.816 105.02 15.906 105.02 14.867 c 105.02 13.738 105.168 12.789 105.469\n" + " 12.016 c 105.773 11.242 106.184 10.621 106.691 10.148 c 107.207 9.668 107.801\n" + " 9.32 108.473 9.109 c 109.145 8.898 109.848 8.793 110.594 8.793 c 111.527\n" + " 8.793 112.32 8.957 112.977 9.285 c 113.641 9.605 114.184 10.059 114.605\n" + " 10.641 c 115.027 11.223 115.336 11.922 115.535 12.738 c 115.73 13.547 115.832\n" + " 14.441 115.832 15.426 c 115.832 15.512 l 108.25 15.512 l 108.25 16.008 \n" + "108.293 16.469 108.383 16.898 c 108.469 17.32 108.613 17.688 108.809 18.004\n" + " c 109.004 18.309 109.262 18.555 109.574 18.734 c 109.887 18.91 110.266 \n" + "18.996 110.711 18.996 c 111.25 18.996 111.691 18.883 112.031 18.656 c 112.375\n" + " 18.422 112.617 18.066 112.762 17.586 c 115.656 17.836 l 115.523 18.172 \n" + "115.34 18.527 115.098 18.906 c 114.863 19.285 114.551 19.633 114.156 19.957\n" + " c 113.762 20.27 113.27 20.531 112.68 20.742 c 112.098 20.945 111.387 21.047\n" + " 110.551 21.047 c 110.551 10.723 m 110.238 10.723 109.941 10.777 109.664\n" + " 10.887 c 109.395 10.988 109.156 11.156 108.953 11.391 c 108.758 11.617 \n" + "108.598 11.91 108.473 12.277 c 108.348 12.641 108.281 13.078 108.266 13.59\n" + " c 112.855 13.59 l 112.797 12.637 112.566 11.922 112.168 11.449 c 111.766\n" + " 10.969 111.227 10.727 110.551 10.727 c 125.828 20.832 m 125.828 14.199 \n" + "l 125.828 13.742 125.793 13.32 125.719 12.941 c 125.645 12.555 125.527 12.227\n" + " 125.359 11.957 c 125.191 11.68 124.973 11.465 124.703 11.312 c 124.434 \n" + "11.16 124.105 11.082 123.719 11.082 c 123.348 11.082 123.008 11.164 122.703\n" + " 11.332 c 122.406 11.492 122.145 11.727 121.926 12.031 c 121.707 12.328 \n" + "121.535 12.691 121.414 13.113 c 121.297 13.527 121.238 13.988 121.238 14.488\n" + " c 121.238 20.824 l 118.168 20.824 l 118.168 11.652 l 118.168 11.398 118.164\n" + " 11.137 118.156 10.867 c 118.156 10.598 118.148 10.344 118.133 10.102 c \n" + "118.125 9.855 118.117 9.637 118.109 9.445 c 118.102 9.25 118.09 9.102 118.078\n" + " 9.008 c 121.008 9.008 l 121.023 9.094 121.035 9.238 121.051 9.434 c 121.066\n" + " 9.621 121.078 9.836 121.094 10.066 c 121.109 10.301 121.121 10.531 121.125\n" + " 10.766 c 121.141 11 121.148 11.195 121.148 11.355 c 121.191 11.355 l 121.605\n" + " 10.453 122.129 9.797 122.754 9.387 c 123.379 8.98 124.129 8.773 124.992\n" + " 8.773 c 125.707 8.773 126.309 8.891 126.797 9.125 c 127.293 9.359 127.691\n" + " 9.68 128 10.086 c 128.312 10.492 128.539 10.977 128.676 11.527 c 128.812\n" + " 12.082 128.883 12.68 128.883 13.32 c 128.883 20.828 l 125.824 20.828 l \n" + "134.871 21.023 m 133.969 21.023 133.273 20.781 132.785 20.293 c 132.297 \n" + "19.797 132.055 19.051 132.055 18.055 c 132.055 11.082 l 130.559 11.082 l\n" + " 130.559 9.008 l 132.207 9.008 l 133.168 6.23 l 135.09 6.23 l 135.09 9.008\n" + " l 137.328 9.008 l 137.328 11.082 l 135.094 11.082 l 135.094 17.223 l 135.094\n" + " 17.797 135.203 18.223 135.422 18.5 c 135.641 18.77 135.98 18.902 136.438\n" + " 18.902 c 136.625 18.902 136.797 18.887 136.949 18.859 c 137.102 18.832 \n" + "137.273 18.793 137.461 18.75 c 137.461 20.652 l 137.082 20.777 136.68 20.867\n" + " 136.258 20.926 c 135.836 20.992 135.371 21.023 134.871 21.023 c 142.051\n" + " 21.047 m 141.484 21.047 140.973 20.969 140.52 20.816 c 140.074 20.656 139.695\n" + " 20.426 139.383 20.129 c 139.07 19.824 138.828 19.449 138.66 19.004 c 138.492\n" + " 18.559 138.41 18.055 138.41 17.484 c 138.41 16.785 138.531 16.199 138.77\n" + " 15.727 c 139.016 15.246 139.352 14.859 139.773 14.566 c 140.195 14.27 140.691\n" + " 14.055 141.258 13.922 c 141.824 13.785 142.43 13.711 143.07 13.703 c 145.617\n" + " 13.66 l 145.617 13.059 l 145.617 12.629 145.578 12.273 145.496 11.988 c\n" + " 145.422 11.695 145.312 11.461 145.168 11.277 c 145.023 11.094 144.84 10.969\n" + " 144.621 10.895 c 144.41 10.812 144.164 10.773 143.891 10.773 c 143.637 \n" + "10.773 143.406 10.801 143.203 10.852 c 143.008 10.902 142.836 10.992 142.691\n" + " 11.125 c 142.547 11.25 142.426 11.422 142.332 11.637 c 142.246 11.848 142.184\n" + " 12.117 142.145 12.445 c 138.941 12.293 l 139.027 11.777 139.188 11.305 \n" + "139.422 10.883 c 139.656 10.453 139.977 10.082 140.383 9.77 c 140.797 9.457\n" + " 141.305 9.215 141.902 9.047 c 142.508 8.871 143.215 8.785 144.023 8.785\n" + " c 144.758 8.785 145.414 8.875 145.992 9.059 c 146.566 9.242 147.055 9.516\n" + " 147.457 9.879 c 147.859 10.234 148.164 10.676 148.375 11.199 c 148.586 \n" + "11.723 148.691 12.332 148.691 13.023 c 148.691 17.328 l 148.691 17.605 148.703\n" + " 17.852 148.723 18.07 c 148.75 18.289 148.801 18.473 148.863 18.629 c 148.938\n" + " 18.773 149.035 18.887 149.16 18.969 c 149.293 19.043 149.457 19.078 149.664\n" + " 19.078 c 149.898 19.078 150.121 19.055 150.34 19.012 c 150.34 20.672 l \n" + "150.156 20.715 149.992 20.754 149.848 20.793 c 149.703 20.828 149.555 20.859\n" + " 149.41 20.879 c 149.266 20.902 149.109 20.918 148.941 20.934 c 148.781 \n" + "20.949 148.59 20.957 148.375 20.957 c 147.602 20.957 147.031 20.77 146.66\n" + " 20.391 c 146.297 20.012 146.078 19.453 146.004 18.719 c 145.938 18.719 \n" + "l 145.531 19.453 145.004 20.027 144.363 20.434 c 143.73 20.84 142.957 21.047\n" + " 142.047 21.047 c 145.621 15.355 m 144.047 15.379 l 143.719 15.395 143.406\n" + " 15.422 143.105 15.465 c 142.812 15.5 142.555 15.586 142.328 15.715 c 142.109\n" + " 15.84 141.934 16.02 141.805 16.262 c 141.672 16.504 141.609 16.828 141.609\n" + " 17.246 c 141.609 17.809 141.738 18.227 141.992 18.504 c 142.254 18.773 \n" + "142.602 18.906 143.031 18.906 c 143.426 18.906 143.781 18.824 144.102 18.656\n" + " c 144.422 18.488 144.691 18.27 144.91 18 c 145.137 17.723 145.312 17.406\n" + " 145.434 17.051 c 145.559 16.695 145.621 16.328 145.621 15.957 c 145.621\n" + " 15.355 l 151.773 20.828 m 151.777 4.613 l 154.848 4.613 l 154.848 20.828\n" + " l 151.777 20.828 l f\n" + "1 1 1 RG 0.531496 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "28.543 13.016 m 28.543 14.297 28.352 15.426 27.965 16.402 c 27.578 17.371\n" + " 27.051 18.184 26.379 18.84 c 25.707 19.496 24.914 19.992 23.996 20.324 \n" + "c 23.086 20.66 22.102 20.828 21.047 20.828 c 14.82 20.828 l 14.82 5.434 \n" + "l 20.395 5.434 l 21.59 5.434 22.684 5.582 23.684 5.883 c 24.68 6.18 25.543\n" + " 6.641 26.262 7.258 c 26.984 7.879 27.543 8.664 27.945 9.617 c 28.348 10.57\n" + " 28.547 11.703 28.547 13.016 c 25.301 13.016 m 25.301 12.121 25.176 11.352\n" + " 24.93 10.711 c 24.688 10.07 24.352 9.547 23.914 9.137 c 23.477 8.723 22.953\n" + " 8.414 22.34 8.219 c 21.734 8.023 21.066 7.922 20.328 7.922 c 18.043 7.926\n" + " l 18.043 18.34 l 20.773 18.34 l 21.422 18.34 22.02 18.227 22.566 18 c 23.121\n" + " 17.773 23.598 17.438 23.996 16.996 c 24.402 16.543 24.723 15.988 24.945\n" + " 15.324 c 25.18 14.66 25.297 13.895 25.297 13.02 c 35.895 21.051 m 35.043\n" + " 21.051 34.273 20.926 33.59 20.68 c 32.914 20.426 32.332 20.043 31.852 19.531\n" + " c 31.371 19.016 31.004 18.371 30.746 17.598 c 30.492 16.816 30.363 15.906\n" + " 30.363 14.867 c 30.363 13.738 30.512 12.789 30.812 12.016 c 31.117 11.242\n" + " 31.527 10.621 32.035 10.148 c 32.551 9.668 33.145 9.32 33.816 9.109 c 34.488\n" + " 8.898 35.191 8.793 35.938 8.793 c 36.871 8.793 37.664 8.957 38.32 9.285\n" + " c 38.984 9.605 39.527 10.059 39.949 10.641 c 40.371 11.223 40.68 11.922\n" + " 40.879 12.738 c 41.074 13.547 41.176 14.441 41.176 15.426 c 41.176 15.512\n" + " l 33.594 15.508 l 33.594 16.004 33.637 16.465 33.727 16.895 c 33.812 17.316\n" + " 33.957 17.684 34.152 18 c 34.348 18.305 34.605 18.551 34.918 18.73 c 35.23\n" + " 18.906 35.609 18.992 36.055 18.992 c 36.594 18.992 37.035 18.879 37.375\n" + " 18.652 c 37.719 18.418 37.961 18.062 38.105 17.582 c 41 17.832 l 40.867\n" + " 18.168 40.684 18.523 40.441 18.902 c 40.207 19.281 39.895 19.629 39.5 19.953\n" + " c 39.105 20.266 38.613 20.527 38.023 20.738 c 37.441 20.941 36.73 21.043\n" + " 35.895 21.043 c 35.895 10.719 m 35.582 10.719 35.285 10.773 35.008 10.883\n" + " c 34.738 10.984 34.5 11.152 34.297 11.387 c 34.102 11.613 33.941 11.906\n" + " 33.816 12.273 c 33.691 12.637 33.625 13.074 33.609 13.586 c 38.199 13.586\n" + " l 38.141 12.633 37.91 11.918 37.512 11.445 c 37.109 10.965 36.57 10.723\n" + " 35.895 10.723 c 54.699 14.863 m 54.699 15.758 54.609 16.586 54.426 17.344\n" + " c 54.25 18.102 53.977 18.754 53.605 19.301 c 53.234 19.848 52.762 20.277\n" + " 52.184 20.59 c 51.617 20.895 50.941 21.047 50.164 21.047 c 49.812 21.047\n" + " 49.465 21.012 49.113 20.938 c 48.77 20.863 48.441 20.75 48.129 20.586 c\n" + " 47.816 20.418 47.523 20.203 47.254 19.941 c 46.992 19.672 46.766 19.34 \n" + "46.578 18.945 c 46.512 18.945 l 46.52 18.98 46.527 19.074 46.535 19.219 \n" + "c 46.543 19.363 46.551 19.535 46.559 19.73 c 46.566 19.918 46.57 20.125 \n" + "46.57 20.344 c 46.578 20.555 46.582 20.75 46.582 20.934 c 46.582 25.469 \n" + "l 43.512 25.473 l 43.512 11.727 l 43.512 11.121 43.5 10.582 43.48 10.109\n" + " c 43.465 9.637 43.449 9.27 43.426 9.004 c 46.41 9.004 l 46.426 9.055 46.438\n" + " 9.152 46.453 9.301 c 46.477 9.445 46.488 9.613 46.496 9.805 c 46.512 9.992\n" + " 46.523 10.191 46.527 10.395 c 46.535 10.598 46.539 10.777 46.539 10.93 \n" + "c 46.582 10.93 l 46.953 10.148 47.465 9.594 48.113 9.258 c 48.762 8.922 \n" + "49.512 8.754 50.363 8.754 c 51.113 8.754 51.762 8.906 52.309 9.211 c 52.855\n" + " 9.516 53.305 9.938 53.652 10.477 c 54.008 11.016 54.273 11.66 54.438 12.41\n" + " c 54.613 13.152 54.699 13.969 54.699 14.859 c 51.496 14.859 m 51.496 13.512\n" + " 51.293 12.516 50.883 11.867 c 50.477 11.211 49.867 10.883 49.059 10.883\n" + " c 48.754 10.883 48.445 10.949 48.141 11.078 c 47.844 11.203 47.574 11.422\n" + " 47.332 11.734 c 47.098 12.039 46.906 12.457 46.754 12.98 c 46.609 13.496\n" + " 46.535 14.152 46.535 14.949 c 46.535 15.723 46.609 16.367 46.754 16.883\n" + " c 46.898 17.395 47.09 17.801 47.32 18.105 c 47.562 18.41 47.832 18.629 \n" + "48.129 18.762 c 48.426 18.887 48.73 18.949 49.035 18.949 c 49.43 18.949 \n" + "49.777 18.871 50.086 18.719 c 50.391 18.559 50.648 18.316 50.852 17.988 \n" + "c 51.062 17.652 51.223 17.227 51.332 16.711 c 51.441 16.195 51.496 15.578\n" + " 51.496 14.863 c 59.922 21.047 m 59.355 21.047 58.844 20.969 58.391 20.816\n" + " c 57.945 20.656 57.566 20.426 57.254 20.129 c 56.941 19.824 56.699 19.449\n" + " 56.531 19.004 c 56.363 18.559 56.281 18.055 56.281 17.484 c 56.281 16.785\n" + " 56.402 16.199 56.641 15.727 c 56.887 15.246 57.223 14.859 57.645 14.566\n" + " c 58.066 14.27 58.562 14.055 59.129 13.922 c 59.695 13.785 60.301 13.711\n" + " 60.941 13.703 c 63.488 13.66 l 63.488 13.059 l 63.488 12.629 63.449 12.273\n" + " 63.367 11.988 c 63.293 11.695 63.184 11.461 63.039 11.277 c 62.895 11.094\n" + " 62.711 10.969 62.492 10.895 c 62.281 10.812 62.035 10.773 61.762 10.773\n" + " c 61.508 10.773 61.277 10.801 61.074 10.852 c 60.879 10.902 60.707 10.992\n" + " 60.562 11.125 c 60.418 11.25 60.297 11.422 60.203 11.637 c 60.117 11.848\n" + " 60.055 12.117 60.016 12.445 c 56.824 12.297 l 56.91 11.781 57.07 11.309\n" + " 57.305 10.887 c 57.539 10.457 57.859 10.086 58.266 9.773 c 58.68 9.461 \n" + "59.188 9.219 59.785 9.051 c 60.391 8.875 61.098 8.789 61.906 8.789 c 62.641\n" + " 8.789 63.297 8.879 63.875 9.062 c 64.449 9.246 64.938 9.52 65.34 9.883 \n" + "c 65.742 10.238 66.047 10.68 66.258 11.203 c 66.469 11.727 66.574 12.336\n" + " 66.574 13.027 c 66.574 17.332 l 66.574 17.609 66.586 17.855 66.605 18.074\n" + " c 66.633 18.293 66.684 18.477 66.746 18.633 c 66.82 18.777 66.918 18.891\n" + " 67.043 18.973 c 67.176 19.047 67.34 19.082 67.547 19.082 c 67.781 19.082\n" + " 68.004 19.059 68.223 19.016 c 68.223 20.676 l 68.039 20.719 67.875 20.758\n" + " 67.73 20.797 c 67.586 20.832 67.438 20.863 67.293 20.883 c 67.148 20.906\n" + " 66.992 20.922 66.824 20.938 c 66.664 20.953 66.473 20.961 66.258 20.961\n" + " c 65.484 20.961 64.914 20.773 64.543 20.395 c 64.18 20.016 63.961 19.457\n" + " 63.887 18.723 c 63.82 18.723 l 63.414 19.457 62.887 20.031 62.246 20.438\n" + " c 61.613 20.844 60.84 21.051 59.93 21.051 c 63.504 15.359 m 61.93 15.383\n" + " l 61.602 15.398 61.289 15.426 60.988 15.469 c 60.695 15.504 60.438 15.59\n" + " 60.211 15.719 c 59.992 15.844 59.816 16.023 59.688 16.266 c 59.555 16.508\n" + " 59.492 16.832 59.492 17.25 c 59.492 17.812 59.621 18.23 59.875 18.508 c\n" + " 60.137 18.777 60.484 18.91 60.914 18.91 c 61.309 18.91 61.664 18.828 61.984\n" + " 18.66 c 62.305 18.492 62.574 18.273 62.793 18.004 c 63.02 17.727 63.195\n" + " 17.41 63.316 17.055 c 63.441 16.699 63.504 16.332 63.504 15.961 c 63.504\n" + " 15.359 l 69.656 20.832 m 69.652 11.781 l 69.652 11.527 69.648 11.258 69.641\n" + " 10.973 c 69.641 10.688 69.633 10.418 69.617 10.164 c 69.609 9.902 69.602\n" + " 9.668 69.594 9.465 c 69.586 9.254 69.574 9.102 69.562 9.008 c 72.492 9.008\n" + " l 72.508 9.094 72.52 9.25 72.535 9.465 c 72.551 9.676 72.562 9.91 72.578\n" + " 10.164 c 72.594 10.418 72.605 10.676 72.609 10.93 c 72.625 11.176 72.633\n" + " 11.379 72.633 11.531 c 72.676 11.531 l 72.828 11.102 72.98 10.719 73.133\n" + " 10.383 c 73.285 10.039 73.465 9.754 73.668 9.52 c 73.879 9.277 74.129 9.098\n" + " 74.422 8.973 c 74.715 8.84 75.074 8.777 75.504 8.777 c 75.688 8.777 75.863\n" + " 8.797 76.039 8.832 c 76.223 8.859 76.359 8.898 76.453 8.941 c 76.453 11.508\n" + " l 76.258 11.465 76.055 11.426 75.852 11.398 c 75.656 11.363 75.418 11.344\n" + " 75.141 11.344 c 74.375 11.344 73.777 11.652 73.348 12.273 c 72.926 12.895\n" + " 72.715 13.809 72.715 15.027 c 72.715 20.828 l 69.645 20.828 l 81.367 21.023\n" + " m 80.465 21.023 79.77 20.781 79.281 20.293 c 78.793 19.797 78.551 19.051\n" + " 78.551 18.055 c 78.551 11.082 l 77.055 11.082 l 77.055 9.008 l 78.703 9.008\n" + " l 79.664 6.23 l 81.586 6.23 l 81.586 9.008 l 83.824 9.008 l 83.824 11.082\n" + " l 81.586 11.082 l 81.594 17.223 l 81.594 17.797 81.703 18.223 81.922 18.5\n" + " c 82.141 18.77 82.48 18.902 82.938 18.902 c 83.125 18.902 83.297 18.887\n" + " 83.449 18.859 c 83.602 18.832 83.773 18.793 83.961 18.75 c 83.961 20.652\n" + " l 83.582 20.777 83.18 20.867 82.758 20.926 c 82.336 20.992 81.871 21.023\n" + " 81.371 21.023 c 92.777 20.828 m 92.777 14.195 l 92.777 13.738 92.746 13.316\n" + " 92.68 12.938 c 92.621 12.551 92.52 12.223 92.375 11.953 c 92.238 11.676\n" + " 92.051 11.461 91.816 11.309 c 91.59 11.156 91.312 11.078 90.984 11.078 \n" + "c 90.672 11.078 90.387 11.16 90.133 11.328 c 89.879 11.488 89.656 11.723\n" + " 89.465 12.027 c 89.281 12.324 89.141 12.688 89.039 13.109 c 88.938 13.523\n" + " 88.887 13.984 88.887 14.484 c 88.887 20.82 l 85.816 20.82 l 85.824 11.652\n" + " l 85.824 11.398 85.82 11.137 85.812 10.867 c 85.812 10.598 85.805 10.344\n" + " 85.789 10.102 c 85.781 9.855 85.773 9.637 85.766 9.445 c 85.758 9.25 85.746\n" + " 9.102 85.734 9.008 c 88.664 9.008 l 88.68 9.094 88.691 9.238 88.707 9.434\n" + " c 88.723 9.621 88.734 9.836 88.75 10.066 c 88.766 10.301 88.777 10.531 \n" + "88.781 10.766 c 88.797 11 88.805 11.195 88.805 11.355 c 88.848 11.355 l \n" + "89.227 10.453 89.695 9.797 90.258 9.387 c 90.824 8.98 91.504 8.773 92.289\n" + " 8.773 c 93.191 8.773 93.918 8.996 94.465 9.441 c 95.02 9.879 95.391 10.516\n" + " 95.578 11.355 c 95.645 11.355 l 95.855 10.867 96.082 10.461 96.32 10.133\n" + " c 96.566 9.805 96.836 9.543 97.129 9.348 c 97.426 9.145 97.75 8.996 98.09\n" + " 8.91 c 98.441 8.824 98.816 8.777 99.227 8.777 c 99.875 8.777 100.422 8.895\n" + " 100.867 9.129 c 101.32 9.363 101.684 9.684 101.961 10.09 c 102.246 10.496\n" + " 102.449 10.98 102.574 11.531 c 102.707 12.086 102.77 12.684 102.77 13.324\n" + " c 102.77 20.832 l 99.723 20.832 l 99.723 14.199 l 99.723 13.742 99.691 \n" + "13.32 99.625 12.941 c 99.566 12.555 99.465 12.227 99.32 11.957 c 99.184 \n" + "11.68 98.996 11.465 98.762 11.312 c 98.535 11.16 98.258 11.082 97.93 11.082\n" + " c 97.625 11.082 97.344 11.164 97.09 11.324 c 96.844 11.477 96.625 11.699\n" + " 96.434 11.992 c 96.25 12.277 96.109 12.617 96.008 13.02 c 95.906 13.422\n" + " 95.848 13.863 95.832 14.352 c 95.832 20.832 l 92.785 20.832 l 110.551 21.051\n" + " m 109.699 21.051 108.93 20.926 108.246 20.68 c 107.57 20.426 106.988 20.043\n" + " 106.508 19.531 c 106.027 19.016 105.66 18.371 105.402 17.598 c 105.148 \n" + "16.816 105.02 15.906 105.02 14.867 c 105.02 13.738 105.168 12.789 105.469\n" + " 12.016 c 105.773 11.242 106.184 10.621 106.691 10.148 c 107.207 9.668 107.801\n" + " 9.32 108.473 9.109 c 109.145 8.898 109.848 8.793 110.594 8.793 c 111.527\n" + " 8.793 112.32 8.957 112.977 9.285 c 113.641 9.605 114.184 10.059 114.605\n" + " 10.641 c 115.027 11.223 115.336 11.922 115.535 12.738 c 115.73 13.547 115.832\n" + " 14.441 115.832 15.426 c 115.832 15.512 l 108.25 15.512 l 108.25 16.008 \n" + "108.293 16.469 108.383 16.898 c 108.469 17.32 108.613 17.688 108.809 18.004\n" + " c 109.004 18.309 109.262 18.555 109.574 18.734 c 109.887 18.91 110.266 \n" + "18.996 110.711 18.996 c 111.25 18.996 111.691 18.883 112.031 18.656 c 112.375\n" + " 18.422 112.617 18.066 112.762 17.586 c 115.656 17.836 l 115.523 18.172 \n" + "115.34 18.527 115.098 18.906 c 114.863 19.285 114.551 19.633 114.156 19.957\n" + " c 113.762 20.27 113.27 20.531 112.68 20.742 c 112.098 20.945 111.387 21.047\n" + " 110.551 21.047 c 110.551 10.723 m 110.238 10.723 109.941 10.777 109.664\n" + " 10.887 c 109.395 10.988 109.156 11.156 108.953 11.391 c 108.758 11.617 \n" + "108.598 11.91 108.473 12.277 c 108.348 12.641 108.281 13.078 108.266 13.59\n" + " c 112.855 13.59 l 112.797 12.637 112.566 11.922 112.168 11.449 c 111.766\n" + " 10.969 111.227 10.727 110.551 10.727 c 125.828 20.832 m 125.828 14.199 \n" + "l 125.828 13.742 125.793 13.32 125.719 12.941 c 125.645 12.555 125.527 12.227\n" + " 125.359 11.957 c 125.191 11.68 124.973 11.465 124.703 11.312 c 124.434 \n" + "11.16 124.105 11.082 123.719 11.082 c 123.348 11.082 123.008 11.164 122.703\n" + " 11.332 c 122.406 11.492 122.145 11.727 121.926 12.031 c 121.707 12.328 \n" + "121.535 12.691 121.414 13.113 c 121.297 13.527 121.238 13.988 121.238 14.488\n" + " c 121.238 20.824 l 118.168 20.824 l 118.168 11.652 l 118.168 11.398 118.164\n" + " 11.137 118.156 10.867 c 118.156 10.598 118.148 10.344 118.133 10.102 c \n" + "118.125 9.855 118.117 9.637 118.109 9.445 c 118.102 9.25 118.09 9.102 118.078\n" + " 9.008 c 121.008 9.008 l 121.023 9.094 121.035 9.238 121.051 9.434 c 121.066\n" + " 9.621 121.078 9.836 121.094 10.066 c 121.109 10.301 121.121 10.531 121.125\n" + " 10.766 c 121.141 11 121.148 11.195 121.148 11.355 c 121.191 11.355 l 121.605\n" + " 10.453 122.129 9.797 122.754 9.387 c 123.379 8.98 124.129 8.773 124.992\n" + " 8.773 c 125.707 8.773 126.309 8.891 126.797 9.125 c 127.293 9.359 127.691\n" + " 9.68 128 10.086 c 128.312 10.492 128.539 10.977 128.676 11.527 c 128.812\n" + " 12.082 128.883 12.68 128.883 13.32 c 128.883 20.828 l 125.824 20.828 l \n" + "134.871 21.023 m 133.969 21.023 133.273 20.781 132.785 20.293 c 132.297 \n" + "19.797 132.055 19.051 132.055 18.055 c 132.055 11.082 l 130.559 11.082 l\n" + " 130.559 9.008 l 132.207 9.008 l 133.168 6.23 l 135.09 6.23 l 135.09 9.008\n" + " l 137.328 9.008 l 137.328 11.082 l 135.094 11.082 l 135.094 17.223 l 135.094\n" + " 17.797 135.203 18.223 135.422 18.5 c 135.641 18.77 135.98 18.902 136.438\n" + " 18.902 c 136.625 18.902 136.797 18.887 136.949 18.859 c 137.102 18.832 \n" + "137.273 18.793 137.461 18.75 c 137.461 20.652 l 137.082 20.777 136.68 20.867\n" + " 136.258 20.926 c 135.836 20.992 135.371 21.023 134.871 21.023 c 142.051\n" + " 21.047 m 141.484 21.047 140.973 20.969 140.52 20.816 c 140.074 20.656 139.695\n" + " 20.426 139.383 20.129 c 139.07 19.824 138.828 19.449 138.66 19.004 c 138.492\n" + " 18.559 138.41 18.055 138.41 17.484 c 138.41 16.785 138.531 16.199 138.77\n" + " 15.727 c 139.016 15.246 139.352 14.859 139.773 14.566 c 140.195 14.27 140.691\n" + " 14.055 141.258 13.922 c 141.824 13.785 142.43 13.711 143.07 13.703 c 145.617\n" + " 13.66 l 145.617 13.059 l 145.617 12.629 145.578 12.273 145.496 11.988 c\n" + " 145.422 11.695 145.312 11.461 145.168 11.277 c 145.023 11.094 144.84 10.969\n" + " 144.621 10.895 c 144.41 10.812 144.164 10.773 143.891 10.773 c 143.637 \n" + "10.773 143.406 10.801 143.203 10.852 c 143.008 10.902 142.836 10.992 142.691\n" + " 11.125 c 142.547 11.25 142.426 11.422 142.332 11.637 c 142.246 11.848 142.184\n" + " 12.117 142.145 12.445 c 138.941 12.293 l 139.027 11.777 139.188 11.305 \n" + "139.422 10.883 c 139.656 10.453 139.977 10.082 140.383 9.77 c 140.797 9.457\n" + " 141.305 9.215 141.902 9.047 c 142.508 8.871 143.215 8.785 144.023 8.785\n" + " c 144.758 8.785 145.414 8.875 145.992 9.059 c 146.566 9.242 147.055 9.516\n" + " 147.457 9.879 c 147.859 10.234 148.164 10.676 148.375 11.199 c 148.586 \n" + "11.723 148.691 12.332 148.691 13.023 c 148.691 17.328 l 148.691 17.605 148.703\n" + " 17.852 148.723 18.07 c 148.75 18.289 148.801 18.473 148.863 18.629 c 148.938\n" + " 18.773 149.035 18.887 149.16 18.969 c 149.293 19.043 149.457 19.078 149.664\n" + " 19.078 c 149.898 19.078 150.121 19.055 150.34 19.012 c 150.34 20.672 l \n" + "150.156 20.715 149.992 20.754 149.848 20.793 c 149.703 20.828 149.555 20.859\n" + " 149.41 20.879 c 149.266 20.902 149.109 20.918 148.941 20.934 c 148.781 \n" + "20.949 148.59 20.957 148.375 20.957 c 147.602 20.957 147.031 20.77 146.66\n" + " 20.391 c 146.297 20.012 146.078 19.453 146.004 18.719 c 145.938 18.719 \n" + "l 145.531 19.453 145.004 20.027 144.363 20.434 c 143.73 20.84 142.957 21.047\n" + " 142.047 21.047 c 145.621 15.355 m 144.047 15.379 l 143.719 15.395 143.406\n" + " 15.422 143.105 15.465 c 142.812 15.5 142.555 15.586 142.328 15.715 c 142.109\n" + " 15.84 141.934 16.02 141.805 16.262 c 141.672 16.504 141.609 16.828 141.609\n" + " 17.246 c 141.609 17.809 141.738 18.227 141.992 18.504 c 142.254 18.773 \n" + "142.602 18.906 143.031 18.906 c 143.426 18.906 143.781 18.824 144.102 18.656\n" + " c 144.422 18.488 144.691 18.27 144.91 18 c 145.137 17.723 145.312 17.406\n" + " 145.434 17.051 c 145.559 16.695 145.621 16.328 145.621 15.957 c 145.621\n" + " 15.355 l 151.773 20.828 m 151.777 4.613 l 154.848 4.613 l 154.848 20.828\n" + " l 151.777 20.828 l S Q\n" + "Q q\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "1 1 1 RG 0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 167.109 26.086 l 168.738 26.086 170.109\n" + " 24.715 170.109 23.086 c 170.109 3.398 l 170.109 1.77 168.738 0.398 167.109\n" + " 0.398 c h\n" + "3.867 3.844 m 166.664 3.844 l 166.664 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m B Q\n" + "Q\n"; + +static Dict *getDepartmentalStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_draft.h b/poppler-24.05.0/poppler/annot_stamp_draft.h new file mode 100644 index 0000000000000000000000000000000000000000..0a2b61f4b2d23cb946ed90326bc1df75cf362617 --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_draft.h @@ -0,0 +1,139 @@ +//======================================================================== +// +// annot_stamp_draft.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_DRAFT_H +#define ANNOT_STAMP_DRAFT_H + +#include "Dict.h" +#include "Object.h" +#include "PDFDoc.h" + +static const double ANNOT_STAMP_DRAFT_WIDTH = 79.758179; +static const double ANNOT_STAMP_DRAFT_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_DRAFT = "1 0 0 -1 0 26.484741 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 76.367 2.129 l 77.066 2.129 77.637 2.828 77.637 3.398 c 77.637\n" + " 23.09 l 77.637 23.789 77.07 24.359 76.367 24.359 c 3.406 24.359 l 2.707\n" + " 24.359 2.137 23.66 2.137 23.09 c 2.137 3.398 l 2.137 2.699 2.703 2.129 \n" + "3.406 2.129 c h\n" + "3.406 2.129 m f\n" + "0.215686 0.215686 0.215686 rg /a1 gs\n" + "1 1 1 RG 0.531496 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "28.543 13.016 m 28.543 14.297 28.352 15.426 27.965 16.402 c 27.578 17.371\n" + " 27.051 18.184 26.379 18.84 c 25.707 19.496 24.914 19.992 23.996 20.324 \n" + "c 23.086 20.66 22.102 20.828 21.047 20.828 c 14.82 20.828 l 14.82 5.434 \n" + "l 20.395 5.434 l 21.59 5.434 22.684 5.582 23.684 5.883 c 24.68 6.18 25.543\n" + " 6.641 26.262 7.258 c 26.984 7.879 27.543 8.664 27.945 9.617 c 28.348 10.57\n" + " 28.547 11.703 28.547 13.016 c 25.301 13.016 m 25.301 12.121 25.176 11.352\n" + " 24.93 10.711 c 24.688 10.07 24.352 9.547 23.914 9.137 c 23.477 8.723 22.953\n" + " 8.414 22.34 8.219 c 21.734 8.023 21.066 7.922 20.328 7.922 c 18.043 7.926\n" + " l 18.043 18.34 l 20.773 18.34 l 21.422 18.34 22.02 18.227 22.566 18 c 23.121\n" + " 17.773 23.598 17.438 23.996 16.996 c 24.402 16.543 24.723 15.988 24.945\n" + " 15.324 c 25.18 14.66 25.297 13.895 25.297 13.02 c 31.055 20.832 m 31.055\n" + " 11.785 l 31.055 11.531 31.051 11.262 31.043 10.977 c 31.043 10.691 31.035\n" + " 10.422 31.02 10.168 c 31.012 9.906 31.004 9.672 30.996 9.469 c 30.988 9.258\n" + " 30.977 9.105 30.965 9.012 c 33.895 9.012 l 33.91 9.098 33.922 9.254 33.938\n" + " 9.469 c 33.953 9.68 33.965 9.914 33.98 10.168 c 33.996 10.422 34.008 10.68\n" + " 34.012 10.934 c 34.027 11.18 34.035 11.383 34.035 11.535 c 34.078 11.535\n" + " l 34.23 11.105 34.383 10.723 34.535 10.387 c 34.688 10.043 34.867 9.758\n" + " 35.07 9.523 c 35.281 9.281 35.531 9.102 35.824 8.977 c 36.117 8.844 36.477\n" + " 8.781 36.906 8.781 c 37.09 8.781 37.266 8.801 37.441 8.836 c 37.625 8.863\n" + " 37.762 8.902 37.855 8.945 c 37.855 11.512 l 37.66 11.469 37.457 11.43 37.254\n" + " 11.402 c 37.059 11.367 36.82 11.348 36.543 11.348 c 35.777 11.348 35.18\n" + " 11.656 34.75 12.277 c 34.328 12.898 34.117 13.812 34.117 15.031 c 34.117\n" + " 20.832 l 31.047 20.832 l 42.477 21.051 m 41.91 21.051 41.398 20.973 40.945\n" + " 20.82 c 40.5 20.66 40.121 20.43 39.809 20.133 c 39.496 19.828 39.254 19.453\n" + " 39.086 19.008 c 38.918 18.562 38.836 18.059 38.836 17.488 c 38.836 16.789\n" + " 38.957 16.203 39.195 15.73 c 39.441 15.25 39.777 14.863 40.199 14.57 c \n" + "40.621 14.273 41.117 14.059 41.684 13.926 c 42.25 13.789 42.855 13.715 43.496\n" + " 13.707 c 46.043 13.664 l 46.043 13.062 l 46.043 12.633 46.004 12.277 45.922\n" + " 11.992 c 45.848 11.699 45.738 11.465 45.594 11.281 c 45.449 11.098 45.266\n" + " 10.973 45.047 10.898 c 44.836 10.816 44.59 10.777 44.316 10.777 c 44.062\n" + " 10.777 43.832 10.805 43.629 10.855 c 43.434 10.906 43.262 10.996 43.117\n" + " 11.129 c 42.973 11.254 42.852 11.426 42.758 11.641 c 42.672 11.852 42.609\n" + " 12.121 42.57 12.449 c 39.367 12.297 l 39.453 11.781 39.613 11.309 39.848\n" + " 10.887 c 40.082 10.457 40.402 10.086 40.809 9.773 c 41.223 9.461 41.73 \n" + "9.219 42.328 9.051 c 42.934 8.875 43.641 8.789 44.449 8.789 c 45.184 8.789\n" + " 45.84 8.879 46.418 9.062 c 46.992 9.246 47.48 9.52 47.883 9.883 c 48.285\n" + " 10.238 48.59 10.68 48.801 11.203 c 49.012 11.727 49.117 12.336 49.117 13.027\n" + " c 49.117 17.332 l 49.117 17.609 49.129 17.855 49.148 18.074 c 49.176 18.293\n" + " 49.227 18.477 49.289 18.633 c 49.363 18.777 49.461 18.891 49.586 18.973\n" + " c 49.719 19.047 49.883 19.082 50.09 19.082 c 50.324 19.082 50.547 19.059\n" + " 50.766 19.016 c 50.766 20.676 l 50.582 20.719 50.418 20.758 50.273 20.797\n" + " c 50.129 20.832 49.98 20.863 49.836 20.883 c 49.691 20.906 49.535 20.922\n" + " 49.367 20.938 c 49.207 20.953 49.016 20.961 48.801 20.961 c 48.027 20.961\n" + " 47.457 20.773 47.086 20.395 c 46.723 20.016 46.504 19.457 46.43 18.723 \n" + "c 46.375 18.719 l 45.969 19.453 45.441 20.027 44.801 20.434 c 44.168 20.84\n" + " 43.395 21.047 42.484 21.047 c 46.059 15.355 m 44.484 15.379 l 44.156 15.395\n" + " 43.844 15.422 43.543 15.465 c 43.25 15.5 42.992 15.586 42.766 15.715 c \n" + "42.547 15.84 42.371 16.02 42.242 16.262 c 42.109 16.504 42.047 16.828 42.047\n" + " 17.246 c 42.047 17.809 42.176 18.227 42.43 18.504 c 42.691 18.773 43.039\n" + " 18.91 43.469 18.906 c 43.863 18.906 44.219 18.824 44.539 18.656 c 44.859\n" + " 18.488 45.129 18.27 45.348 18 c 45.574 17.723 45.75 17.406 45.871 17.051\n" + " c 45.996 16.695 46.059 16.328 46.059 15.957 c 46.059 15.355 l 55.816 11.082\n" + " m 55.816 20.828 l 52.758 20.828 l 52.758 11.082 l 51.031 11.082 l 51.031\n" + " 9.008 l 52.758 9.008 l 52.758 7.773 l 52.758 7.32 52.812 6.906 52.922 6.527\n" + " c 53.031 6.141 53.219 5.805 53.48 5.523 c 53.742 5.238 54.098 5.016 54.539\n" + " 4.855 c 54.984 4.695 55.535 4.613 56.199 4.613 c 56.551 4.613 56.891 4.633\n" + " 57.227 4.668 c 57.57 4.703 57.875 4.746 58.145 4.789 c 58.145 6.766 l 58.012\n" + " 6.738 57.863 6.715 57.695 6.699 c 57.535 6.676 57.387 6.668 57.246 6.668\n" + " c 56.961 6.668 56.727 6.695 56.535 6.754 c 56.352 6.812 56.207 6.898 56.098\n" + " 7.016 c 55.996 7.133 55.922 7.281 55.879 7.465 c 55.836 7.641 55.812 7.844\n" + " 55.812 8.078 c 55.812 9.008 l 58.141 9.008 l 58.141 11.082 l 55.812 11.082\n" + " l 62.707 21.027 m 61.805 21.027 61.109 20.785 60.621 20.297 c 60.133 19.801\n" + " 59.891 19.055 59.891 18.059 c 59.891 11.086 l 58.395 11.086 l 58.395 9.012\n" + " l 60.043 9.012 l 61.004 6.234 l 62.926 6.234 l 62.926 9.012 l 65.164 9.012\n" + " l 65.164 11.086 l 62.926 11.086 l 62.926 17.227 l 62.926 17.801 63.035 \n" + "18.227 63.254 18.504 c 63.473 18.773 63.812 18.91 64.27 18.906 c 64.457 \n" + "18.906 64.629 18.891 64.781 18.863 c 64.934 18.836 65.105 18.797 65.293 \n" + "18.754 c 65.293 20.656 l 64.914 20.781 64.512 20.871 64.09 20.93 c 63.668\n" + " 20.996 63.203 21.027 62.703 21.027 c B Q\n" + "Q q\n" + "0.211765 0.211765 0.211765 rg /a1 gs\n" + "1 1 1 RG 0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 76.359 26.086 l 77.988 26.086 79.359 24.715\n" + " 79.359 23.086 c 79.359 3.398 l 79.359 1.77 77.988 0.398 76.359 0.398 c \n" + "h\n" + "3.867 3.844 m 75.914 3.844 l 75.914 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m B Q\n" + "Q\n"; + +static Dict *getDraftStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_experimental.h b/poppler-24.05.0/poppler/annot_stamp_experimental.h new file mode 100644 index 0000000000000000000000000000000000000000..875951566d67e92d2ba08d3a27695583308ef533 --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_experimental.h @@ -0,0 +1,388 @@ +//======================================================================== +// +// annot_stamp_experimental.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_EXPERIMENTAL_H +#define ANNOT_STAMP_EXPERIMENTAL_H + +#include "Dict.h" +#include "Object.h" +#include "PDFDoc.h" + +static const double ANNOT_STAMP_EXPERIMENTAL_WIDTH = 170.508179; +static const double ANNOT_STAMP_EXPERIMENTAL_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_EXPERIMENTAL = "1 0 0 -1 0 26.484741 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 167.117 2.129 l 167.816 2.129 168.387 2.828 168.387 3.398\n" + " c 168.387 23.09 l 168.387 23.789 167.82 24.359 167.117 24.359 c 3.406 24.359\n" + " l 2.707 24.359 2.137 23.66 2.137 23.09 c 2.137 3.398 l 2.137 2.699 2.703\n" + " 2.129 3.406 2.129 c h\n" + "3.406 2.129 m f\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "14.82 20.828 m 14.82 5.434 l 26.926 5.434 l 26.926 7.926 l 18.043 7.926\n" + " l 18.043 11.793 l 26.262 11.793 l 26.262 14.285 l 18.043 14.285 l 18.043\n" + " 18.34 l 27.375 18.34 l 27.375 20.832 l 14.82 20.828 l 37.219 20.828 m 34.465\n" + " 16.543 l 31.688 20.828 l 28.422 20.828 l 32.75 14.719 l 28.629 9.004 l \n" + "31.941 9.004 l 34.465 12.871 l 36.977 9.004 l 40.309 9.004 l 36.188 14.688\n" + " l 40.547 20.828 l 37.215 20.828 l 53.473 14.863 m 53.473 15.758 53.383 \n" + "16.586 53.199 17.344 c 53.023 18.102 52.75 18.754 52.379 19.301 c 52.008\n" + " 19.848 51.535 20.277 50.957 20.59 c 50.391 20.895 49.715 21.047 48.938 \n" + "21.047 c 48.586 21.047 48.238 21.012 47.887 20.938 c 47.543 20.863 47.215\n" + " 20.75 46.902 20.586 c 46.59 20.418 46.297 20.203 46.027 19.941 c 45.766\n" + " 19.672 45.539 19.34 45.352 18.945 c 45.285 18.945 l 45.293 18.98 45.301\n" + " 19.074 45.309 19.219 c 45.316 19.363 45.324 19.535 45.332 19.73 c 45.34\n" + " 19.918 45.344 20.125 45.344 20.344 c 45.352 20.555 45.355 20.75 45.355 \n" + "20.934 c 45.355 25.469 l 42.285 25.469 l 42.285 11.723 l 42.285 11.117 42.273\n" + " 10.578 42.254 10.105 c 42.238 9.633 42.223 9.266 42.199 9 c 45.184 9 l \n" + "45.199 9.051 45.211 9.148 45.227 9.297 c 45.25 9.441 45.262 9.609 45.27 \n" + "9.801 c 45.285 9.988 45.297 10.188 45.301 10.391 c 45.309 10.594 45.312 \n" + "10.773 45.312 10.926 c 45.355 10.926 l 45.727 10.145 46.238 9.59 46.887 \n" + "9.254 c 47.535 8.918 48.285 8.75 49.137 8.75 c 49.887 8.75 50.535 8.902 \n" + "51.082 9.207 c 51.629 9.512 52.078 9.934 52.426 10.473 c 52.781 11.012 53.047\n" + " 11.656 53.211 12.406 c 53.387 13.148 53.473 13.965 53.473 14.855 c 50.27\n" + " 14.855 m 50.27 13.508 50.066 12.512 49.656 11.863 c 49.25 11.207 48.641\n" + " 10.879 47.832 10.879 c 47.527 10.879 47.219 10.945 46.914 11.074 c 46.617\n" + " 11.199 46.348 11.418 46.105 11.73 c 45.871 12.035 45.68 12.453 45.527 12.977\n" + " c 45.383 13.492 45.309 14.148 45.309 14.945 c 45.309 15.719 45.383 16.363\n" + " 45.527 16.879 c 45.672 17.391 45.863 17.797 46.094 18.102 c 46.336 18.406\n" + " 46.605 18.625 46.902 18.758 c 47.199 18.883 47.504 18.945 47.809 18.945\n" + " c 48.203 18.945 48.551 18.867 48.859 18.715 c 49.164 18.555 49.422 18.312\n" + " 49.625 17.984 c 49.836 17.648 49.996 17.223 50.105 16.707 c 50.215 16.191\n" + " 50.27 15.574 50.27 14.859 c 60.805 21.043 m 59.953 21.043 59.184 20.918\n" + " 58.5 20.672 c 57.824 20.418 57.242 20.035 56.762 19.523 c 56.281 19.008\n" + " 55.914 18.363 55.656 17.59 c 55.402 16.809 55.273 15.898 55.273 14.859 \n" + "c 55.273 13.73 55.422 12.781 55.723 12.008 c 56.027 11.234 56.438 10.613\n" + " 56.945 10.141 c 57.461 9.66 58.055 9.312 58.727 9.102 c 59.398 8.891 60.102\n" + " 8.785 60.848 8.785 c 61.781 8.785 62.574 8.949 63.23 9.277 c 63.895 9.598\n" + " 64.438 10.051 64.859 10.633 c 65.281 11.215 65.59 11.914 65.789 12.73 c\n" + " 65.984 13.539 66.086 14.434 66.086 15.418 c 66.086 15.504 l 58.504 15.508\n" + " l 58.504 16.004 58.547 16.465 58.637 16.895 c 58.723 17.316 58.867 17.684\n" + " 59.062 18 c 59.258 18.305 59.516 18.551 59.828 18.73 c 60.141 18.906 60.52\n" + " 18.992 60.965 18.992 c 61.504 18.992 61.945 18.879 62.285 18.652 c 62.629\n" + " 18.418 62.871 18.062 63.016 17.582 c 65.91 17.832 l 65.777 18.168 65.594\n" + " 18.523 65.352 18.902 c 65.117 19.281 64.805 19.629 64.41 19.953 c 64.016\n" + " 20.266 63.523 20.527 62.934 20.738 c 62.352 20.941 61.641 21.043 60.805\n" + " 21.043 c 60.805 10.719 m 60.492 10.719 60.195 10.773 59.918 10.883 c 59.648\n" + " 10.984 59.41 11.152 59.207 11.387 c 59.012 11.613 58.852 11.906 58.727 \n" + "12.273 c 58.602 12.637 58.535 13.074 58.52 13.586 c 63.109 13.586 l 63.051\n" + " 12.633 62.82 11.918 62.422 11.445 c 62.02 10.965 61.48 10.723 60.805 10.723\n" + " c 68.422 20.828 m 68.422 11.781 l 68.422 11.527 68.418 11.258 68.41 10.973\n" + " c 68.41 10.688 68.402 10.418 68.387 10.164 c 68.379 9.902 68.371 9.668 \n" + "68.363 9.465 c 68.355 9.254 68.344 9.102 68.332 9.008 c 71.262 9.008 l 71.277\n" + " 9.094 71.289 9.25 71.305 9.465 c 71.32 9.676 71.332 9.91 71.348 10.164 \n" + "c 71.363 10.418 71.375 10.676 71.379 10.93 c 71.395 11.176 71.402 11.379\n" + " 71.402 11.531 c 71.445 11.531 l 71.598 11.102 71.75 10.719 71.902 10.383\n" + " c 72.055 10.039 72.234 9.754 72.438 9.52 c 72.648 9.277 72.898 9.098 73.191\n" + " 8.973 c 73.484 8.84 73.844 8.777 74.273 8.777 c 74.457 8.777 74.633 8.797\n" + " 74.809 8.832 c 74.992 8.859 75.129 8.898 75.223 8.941 c 75.223 11.508 l\n" + " 75.027 11.465 74.824 11.426 74.621 11.398 c 74.426 11.363 74.188 11.344\n" + " 73.91 11.344 c 73.145 11.344 72.547 11.652 72.117 12.273 c 71.695 12.895\n" + " 71.484 13.809 71.484 15.027 c 71.484 20.828 l 68.426 20.828 l 77.125 6.875\n" + " m 77.125 4.613 l 80.195 4.613 l 80.195 6.875 l 77.125 6.875 l 77.125 20.828\n" + " m 77.125 9.004 l 80.195 9.004 l 80.195 20.828 l 77.125 20.828 l 90.293 \n" + "20.828 m 90.293 14.195 l 90.293 13.738 90.262 13.316 90.195 12.938 c 90.137\n" + " 12.551 90.035 12.223 89.891 11.953 c 89.754 11.676 89.566 11.461 89.332\n" + " 11.309 c 89.105 11.156 88.828 11.078 88.5 11.078 c 88.188 11.078 87.902\n" + " 11.16 87.648 11.328 c 87.395 11.488 87.172 11.723 86.98 12.027 c 86.797\n" + " 12.324 86.656 12.688 86.555 13.109 c 86.453 13.523 86.402 13.984 86.402\n" + " 14.484 c 86.402 20.82 l 83.332 20.82 l 83.332 11.641 l 83.332 11.387 83.328\n" + " 11.125 83.32 10.855 c 83.32 10.586 83.312 10.332 83.297 10.09 c 83.289 \n" + "9.844 83.281 9.625 83.273 9.434 c 83.266 9.238 83.254 9.09 83.242 8.996 \n" + "c 86.172 8.996 l 86.188 9.082 86.199 9.227 86.215 9.422 c 86.23 9.609 86.242\n" + " 9.824 86.258 10.055 c 86.273 10.289 86.285 10.52 86.289 10.754 c 86.305\n" + " 10.988 86.312 11.184 86.312 11.344 c 86.355 11.344 l 86.734 10.441 87.203\n" + " 9.785 87.766 9.375 c 88.332 8.969 89.012 8.762 89.797 8.762 c 90.699 8.762\n" + " 91.426 8.984 91.973 9.43 c 92.527 9.867 92.898 10.504 93.086 11.344 c 93.152\n" + " 11.344 l 93.363 10.855 93.59 10.449 93.828 10.121 c 94.074 9.793 94.344\n" + " 9.531 94.637 9.336 c 94.934 9.133 95.258 8.984 95.598 8.898 c 95.949 8.812\n" + " 96.324 8.766 96.734 8.766 c 97.383 8.766 97.93 8.883 98.375 9.117 c 98.828\n" + " 9.352 99.191 9.672 99.469 10.078 c 99.754 10.484 99.957 10.969 100.082 \n" + "11.52 c 100.215 12.074 100.277 12.672 100.277 13.312 c 100.277 20.82 l 97.23\n" + " 20.82 l 97.23 14.188 l 97.23 13.73 97.199 13.309 97.133 12.93 c 97.074 \n" + "12.543 96.973 12.215 96.828 11.945 c 96.691 11.668 96.504 11.453 96.27 11.301\n" + " c 96.043 11.148 95.766 11.07 95.438 11.07 c 95.133 11.07 94.852 11.152 \n" + "94.598 11.312 c 94.352 11.465 94.133 11.688 93.941 11.98 c 93.758 12.266\n" + " 93.617 12.605 93.516 13.008 c 93.414 13.41 93.355 13.852 93.34 14.34 c \n" + "93.34 20.82 l 90.293 20.82 l 108.059 21.039 m 107.207 21.039 106.438 20.914\n" + " 105.754 20.668 c 105.078 20.414 104.496 20.031 104.016 19.52 c 103.535 \n" + "19.004 103.168 18.359 102.91 17.586 c 102.656 16.805 102.527 15.895 102.527\n" + " 14.855 c 102.527 13.727 102.676 12.777 102.977 12.004 c 103.281 11.23 103.691\n" + " 10.609 104.199 10.137 c 104.715 9.656 105.309 9.309 105.98 9.098 c 106.652\n" + " 8.887 107.355 8.781 108.102 8.781 c 109.035 8.781 109.828 8.945 110.484\n" + " 9.273 c 111.148 9.594 111.691 10.047 112.113 10.629 c 112.535 11.211 112.844\n" + " 11.91 113.043 12.727 c 113.238 13.535 113.34 14.43 113.34 15.414 c 113.34\n" + " 15.5 l 105.754 15.508 l 105.754 16.004 105.797 16.465 105.887 16.895 c \n" + "105.973 17.316 106.117 17.684 106.312 18 c 106.508 18.305 106.766 18.551\n" + " 107.078 18.73 c 107.391 18.906 107.77 18.992 108.215 18.992 c 108.754 18.992\n" + " 109.195 18.879 109.535 18.652 c 109.879 18.418 110.121 18.062 110.266 17.582\n" + " c 113.16 17.832 l 113.027 18.168 112.844 18.523 112.602 18.902 c 112.367\n" + " 19.281 112.055 19.629 111.66 19.953 c 111.266 20.266 110.773 20.527 110.184\n" + " 20.738 c 109.602 20.941 108.891 21.043 108.055 21.043 c 108.055 10.719 \n" + "m 107.742 10.719 107.445 10.773 107.168 10.883 c 106.898 10.984 106.66 11.152\n" + " 106.457 11.387 c 106.262 11.613 106.102 11.906 105.977 12.273 c 105.852\n" + " 12.637 105.785 13.074 105.77 13.586 c 110.359 13.586 l 110.301 12.633 110.07\n" + " 11.918 109.672 11.445 c 109.27 10.965 108.73 10.723 108.055 10.723 c 123.332\n" + " 20.828 m 123.332 14.195 l 123.332 13.738 123.297 13.316 123.223 12.938 \n" + "c 123.148 12.551 123.031 12.223 122.863 11.953 c 122.695 11.676 122.477 \n" + "11.461 122.207 11.309 c 121.938 11.156 121.609 11.078 121.223 11.078 c 120.852\n" + " 11.078 120.512 11.16 120.207 11.328 c 119.91 11.488 119.648 11.723 119.43\n" + " 12.027 c 119.211 12.324 119.039 12.688 118.918 13.109 c 118.801 13.523 \n" + "118.742 13.984 118.742 14.484 c 118.742 20.82 l 115.672 20.82 l 115.672 \n" + "11.641 l 115.672 11.387 115.668 11.125 115.66 10.855 c 115.66 10.586 115.652\n" + " 10.332 115.637 10.09 c 115.629 9.844 115.621 9.625 115.613 9.434 c 115.605\n" + " 9.238 115.594 9.09 115.582 8.996 c 118.512 8.996 l 118.527 9.082 118.539\n" + " 9.227 118.555 9.422 c 118.57 9.609 118.582 9.824 118.598 10.055 c 118.613\n" + " 10.289 118.625 10.52 118.629 10.754 c 118.645 10.988 118.652 11.184 118.652\n" + " 11.344 c 118.695 11.344 l 119.109 10.441 119.633 9.785 120.258 9.375 c \n" + "120.883 8.969 121.633 8.762 122.496 8.762 c 123.211 8.762 123.812 8.879 \n" + "124.301 9.113 c 124.797 9.348 125.195 9.668 125.504 10.074 c 125.816 10.48\n" + " 126.043 10.965 126.18 11.516 c 126.316 12.07 126.387 12.668 126.387 13.309\n" + " c 126.387 20.816 l 123.328 20.816 l 132.375 21.012 m 131.473 21.012 130.777\n" + " 20.77 130.289 20.281 c 129.801 19.785 129.559 19.039 129.559 18.043 c 129.559\n" + " 11.07 l 128.062 11.07 l 128.062 8.996 l 129.711 8.996 l 130.672 6.219 l\n" + " 132.594 6.219 l 132.594 8.996 l 134.832 8.996 l 134.832 11.07 l 132.594\n" + " 11.07 l 132.594 17.211 l 132.594 17.785 132.703 18.211 132.922 18.488 c\n" + " 133.141 18.758 133.48 18.895 133.938 18.891 c 134.125 18.891 134.297 18.875\n" + " 134.449 18.848 c 134.602 18.82 134.773 18.781 134.961 18.738 c 134.961 \n" + "20.641 l 134.582 20.766 134.18 20.855 133.758 20.914 c 133.336 20.98 132.871\n" + " 21.012 132.371 21.012 c 139.551 21.035 m 138.984 21.035 138.473 20.957 \n" + "138.02 20.805 c 137.574 20.645 137.195 20.414 136.883 20.117 c 136.57 19.812\n" + " 136.328 19.438 136.16 18.992 c 135.992 18.547 135.91 18.043 135.91 17.473\n" + " c 135.91 16.773 136.031 16.188 136.27 15.715 c 136.516 15.234 136.852 14.848\n" + " 137.273 14.555 c 137.695 14.258 138.191 14.043 138.758 13.91 c 139.324 \n" + "13.773 139.93 13.699 140.57 13.691 c 143.117 13.648 l 143.117 13.047 l 143.117\n" + " 12.617 143.078 12.262 142.996 11.977 c 142.922 11.684 142.812 11.449 142.668\n" + " 11.266 c 142.523 11.082 142.34 10.957 142.121 10.883 c 141.91 10.801 141.664\n" + " 10.762 141.391 10.762 c 141.137 10.762 140.906 10.789 140.703 10.84 c 140.508\n" + " 10.891 140.336 10.98 140.191 11.113 c 140.047 11.238 139.926 11.41 139.832\n" + " 11.625 c 139.746 11.836 139.684 12.105 139.645 12.434 c 136.441 12.281 \n" + "l 136.527 11.766 136.688 11.293 136.922 10.871 c 137.156 10.441 137.477 \n" + "10.07 137.883 9.758 c 138.297 9.445 138.805 9.203 139.402 9.035 c 140.008\n" + " 8.859 140.715 8.773 141.523 8.773 c 142.258 8.773 142.914 8.863 143.492\n" + " 9.047 c 144.066 9.23 144.555 9.504 144.957 9.867 c 145.359 10.223 145.664\n" + " 10.664 145.875 11.188 c 146.086 11.711 146.191 12.32 146.191 13.012 c 146.191\n" + " 17.316 l 146.191 17.594 146.203 17.84 146.223 18.059 c 146.25 18.277 146.301\n" + " 18.461 146.363 18.617 c 146.438 18.762 146.535 18.875 146.66 18.957 c 146.793\n" + " 19.031 146.957 19.066 147.164 19.066 c 147.398 19.066 147.621 19.043 147.84\n" + " 19 c 147.84 20.66 l 147.656 20.703 147.492 20.742 147.348 20.781 c 147.203\n" + " 20.816 147.055 20.848 146.91 20.867 c 146.766 20.891 146.609 20.906 146.441\n" + " 20.922 c 146.281 20.938 146.09 20.945 145.875 20.945 c 145.102 20.945 144.531\n" + " 20.758 144.16 20.379 c 143.797 20 143.578 19.441 143.504 18.707 c 143.438\n" + " 18.707 l 143.031 19.441 142.504 20.016 141.863 20.422 c 141.23 20.828 140.457\n" + " 21.035 139.547 21.035 c 143.121 15.344 m 141.547 15.367 l 141.219 15.383\n" + " 140.906 15.41 140.605 15.453 c 140.312 15.488 140.055 15.574 139.828 15.703\n" + " c 139.609 15.828 139.434 16.008 139.305 16.25 c 139.172 16.492 139.109 \n" + "16.816 139.109 17.234 c 139.109 17.797 139.238 18.215 139.492 18.492 c 139.754\n" + " 18.762 140.102 18.898 140.531 18.895 c 140.926 18.895 141.281 18.812 141.602\n" + " 18.645 c 141.922 18.477 142.191 18.258 142.41 17.988 c 142.637 17.711 142.812\n" + " 17.395 142.934 17.039 c 143.059 16.684 143.121 16.316 143.121 15.945 c \n" + "143.121 15.344 l 149.273 20.816 m 149.273 4.602 l 152.344 4.602 l 152.344\n" + " 20.816 l 149.273 20.816 l f\n" + "1 1 1 RG 0.531496 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "14.82 20.828 m 14.82 5.434 l 26.926 5.434 l 26.926 7.926 l 18.043 7.926\n" + " l 18.043 11.793 l 26.262 11.793 l 26.262 14.285 l 18.043 14.285 l 18.043\n" + " 18.34 l 27.375 18.34 l 27.375 20.832 l 14.82 20.828 l 37.219 20.828 m 34.465\n" + " 16.543 l 31.688 20.828 l 28.422 20.828 l 32.75 14.719 l 28.629 9.004 l \n" + "31.941 9.004 l 34.465 12.871 l 36.977 9.004 l 40.309 9.004 l 36.188 14.688\n" + " l 40.547 20.828 l 37.215 20.828 l 53.473 14.863 m 53.473 15.758 53.383 \n" + "16.586 53.199 17.344 c 53.023 18.102 52.75 18.754 52.379 19.301 c 52.008\n" + " 19.848 51.535 20.277 50.957 20.59 c 50.391 20.895 49.715 21.047 48.938 \n" + "21.047 c 48.586 21.047 48.238 21.012 47.887 20.938 c 47.543 20.863 47.215\n" + " 20.75 46.902 20.586 c 46.59 20.418 46.297 20.203 46.027 19.941 c 45.766\n" + " 19.672 45.539 19.34 45.352 18.945 c 45.285 18.945 l 45.293 18.98 45.301\n" + " 19.074 45.309 19.219 c 45.316 19.363 45.324 19.535 45.332 19.73 c 45.34\n" + " 19.918 45.344 20.125 45.344 20.344 c 45.352 20.555 45.355 20.75 45.355 \n" + "20.934 c 45.355 25.469 l 42.285 25.469 l 42.285 11.723 l 42.285 11.117 42.273\n" + " 10.578 42.254 10.105 c 42.238 9.633 42.223 9.266 42.199 9 c 45.184 9 l \n" + "45.199 9.051 45.211 9.148 45.227 9.297 c 45.25 9.441 45.262 9.609 45.27 \n" + "9.801 c 45.285 9.988 45.297 10.188 45.301 10.391 c 45.309 10.594 45.312 \n" + "10.773 45.312 10.926 c 45.355 10.926 l 45.727 10.145 46.238 9.59 46.887 \n" + "9.254 c 47.535 8.918 48.285 8.75 49.137 8.75 c 49.887 8.75 50.535 8.902 \n" + "51.082 9.207 c 51.629 9.512 52.078 9.934 52.426 10.473 c 52.781 11.012 53.047\n" + " 11.656 53.211 12.406 c 53.387 13.148 53.473 13.965 53.473 14.855 c 50.27\n" + " 14.855 m 50.27 13.508 50.066 12.512 49.656 11.863 c 49.25 11.207 48.641\n" + " 10.879 47.832 10.879 c 47.527 10.879 47.219 10.945 46.914 11.074 c 46.617\n" + " 11.199 46.348 11.418 46.105 11.73 c 45.871 12.035 45.68 12.453 45.527 12.977\n" + " c 45.383 13.492 45.309 14.148 45.309 14.945 c 45.309 15.719 45.383 16.363\n" + " 45.527 16.879 c 45.672 17.391 45.863 17.797 46.094 18.102 c 46.336 18.406\n" + " 46.605 18.625 46.902 18.758 c 47.199 18.883 47.504 18.945 47.809 18.945\n" + " c 48.203 18.945 48.551 18.867 48.859 18.715 c 49.164 18.555 49.422 18.312\n" + " 49.625 17.984 c 49.836 17.648 49.996 17.223 50.105 16.707 c 50.215 16.191\n" + " 50.27 15.574 50.27 14.859 c 60.805 21.043 m 59.953 21.043 59.184 20.918\n" + " 58.5 20.672 c 57.824 20.418 57.242 20.035 56.762 19.523 c 56.281 19.008\n" + " 55.914 18.363 55.656 17.59 c 55.402 16.809 55.273 15.898 55.273 14.859 \n" + "c 55.273 13.73 55.422 12.781 55.723 12.008 c 56.027 11.234 56.438 10.613\n" + " 56.945 10.141 c 57.461 9.66 58.055 9.312 58.727 9.102 c 59.398 8.891 60.102\n" + " 8.785 60.848 8.785 c 61.781 8.785 62.574 8.949 63.23 9.277 c 63.895 9.598\n" + " 64.438 10.051 64.859 10.633 c 65.281 11.215 65.59 11.914 65.789 12.73 c\n" + " 65.984 13.539 66.086 14.434 66.086 15.418 c 66.086 15.504 l 58.504 15.508\n" + " l 58.504 16.004 58.547 16.465 58.637 16.895 c 58.723 17.316 58.867 17.684\n" + " 59.062 18 c 59.258 18.305 59.516 18.551 59.828 18.73 c 60.141 18.906 60.52\n" + " 18.992 60.965 18.992 c 61.504 18.992 61.945 18.879 62.285 18.652 c 62.629\n" + " 18.418 62.871 18.062 63.016 17.582 c 65.91 17.832 l 65.777 18.168 65.594\n" + " 18.523 65.352 18.902 c 65.117 19.281 64.805 19.629 64.41 19.953 c 64.016\n" + " 20.266 63.523 20.527 62.934 20.738 c 62.352 20.941 61.641 21.043 60.805\n" + " 21.043 c 60.805 10.719 m 60.492 10.719 60.195 10.773 59.918 10.883 c 59.648\n" + " 10.984 59.41 11.152 59.207 11.387 c 59.012 11.613 58.852 11.906 58.727 \n" + "12.273 c 58.602 12.637 58.535 13.074 58.52 13.586 c 63.109 13.586 l 63.051\n" + " 12.633 62.82 11.918 62.422 11.445 c 62.02 10.965 61.48 10.723 60.805 10.723\n" + " c 68.422 20.828 m 68.422 11.781 l 68.422 11.527 68.418 11.258 68.41 10.973\n" + " c 68.41 10.688 68.402 10.418 68.387 10.164 c 68.379 9.902 68.371 9.668 \n" + "68.363 9.465 c 68.355 9.254 68.344 9.102 68.332 9.008 c 71.262 9.008 l 71.277\n" + " 9.094 71.289 9.25 71.305 9.465 c 71.32 9.676 71.332 9.91 71.348 10.164 \n" + "c 71.363 10.418 71.375 10.676 71.379 10.93 c 71.395 11.176 71.402 11.379\n" + " 71.402 11.531 c 71.445 11.531 l 71.598 11.102 71.75 10.719 71.902 10.383\n" + " c 72.055 10.039 72.234 9.754 72.438 9.52 c 72.648 9.277 72.898 9.098 73.191\n" + " 8.973 c 73.484 8.84 73.844 8.777 74.273 8.777 c 74.457 8.777 74.633 8.797\n" + " 74.809 8.832 c 74.992 8.859 75.129 8.898 75.223 8.941 c 75.223 11.508 l\n" + " 75.027 11.465 74.824 11.426 74.621 11.398 c 74.426 11.363 74.188 11.344\n" + " 73.91 11.344 c 73.145 11.344 72.547 11.652 72.117 12.273 c 71.695 12.895\n" + " 71.484 13.809 71.484 15.027 c 71.484 20.828 l 68.426 20.828 l 77.125 6.875\n" + " m 77.125 4.613 l 80.195 4.613 l 80.195 6.875 l 77.125 6.875 l 77.125 20.828\n" + " m 77.125 9.004 l 80.195 9.004 l 80.195 20.828 l 77.125 20.828 l 90.293 \n" + "20.828 m 90.293 14.195 l 90.293 13.738 90.262 13.316 90.195 12.938 c 90.137\n" + " 12.551 90.035 12.223 89.891 11.953 c 89.754 11.676 89.566 11.461 89.332\n" + " 11.309 c 89.105 11.156 88.828 11.078 88.5 11.078 c 88.188 11.078 87.902\n" + " 11.16 87.648 11.328 c 87.395 11.488 87.172 11.723 86.98 12.027 c 86.797\n" + " 12.324 86.656 12.688 86.555 13.109 c 86.453 13.523 86.402 13.984 86.402\n" + " 14.484 c 86.402 20.82 l 83.332 20.82 l 83.332 11.641 l 83.332 11.387 83.328\n" + " 11.125 83.32 10.855 c 83.32 10.586 83.312 10.332 83.297 10.09 c 83.289 \n" + "9.844 83.281 9.625 83.273 9.434 c 83.266 9.238 83.254 9.09 83.242 8.996 \n" + "c 86.172 8.996 l 86.188 9.082 86.199 9.227 86.215 9.422 c 86.23 9.609 86.242\n" + " 9.824 86.258 10.055 c 86.273 10.289 86.285 10.52 86.289 10.754 c 86.305\n" + " 10.988 86.312 11.184 86.312 11.344 c 86.355 11.344 l 86.734 10.441 87.203\n" + " 9.785 87.766 9.375 c 88.332 8.969 89.012 8.762 89.797 8.762 c 90.699 8.762\n" + " 91.426 8.984 91.973 9.43 c 92.527 9.867 92.898 10.504 93.086 11.344 c 93.152\n" + " 11.344 l 93.363 10.855 93.59 10.449 93.828 10.121 c 94.074 9.793 94.344\n" + " 9.531 94.637 9.336 c 94.934 9.133 95.258 8.984 95.598 8.898 c 95.949 8.812\n" + " 96.324 8.766 96.734 8.766 c 97.383 8.766 97.93 8.883 98.375 9.117 c 98.828\n" + " 9.352 99.191 9.672 99.469 10.078 c 99.754 10.484 99.957 10.969 100.082 \n" + "11.52 c 100.215 12.074 100.277 12.672 100.277 13.312 c 100.277 20.82 l 97.23\n" + " 20.82 l 97.23 14.188 l 97.23 13.73 97.199 13.309 97.133 12.93 c 97.074 \n" + "12.543 96.973 12.215 96.828 11.945 c 96.691 11.668 96.504 11.453 96.27 11.301\n" + " c 96.043 11.148 95.766 11.07 95.438 11.07 c 95.133 11.07 94.852 11.152 \n" + "94.598 11.312 c 94.352 11.465 94.133 11.688 93.941 11.98 c 93.758 12.266\n" + " 93.617 12.605 93.516 13.008 c 93.414 13.41 93.355 13.852 93.34 14.34 c \n" + "93.34 20.82 l 90.293 20.82 l 108.059 21.039 m 107.207 21.039 106.438 20.914\n" + " 105.754 20.668 c 105.078 20.414 104.496 20.031 104.016 19.52 c 103.535 \n" + "19.004 103.168 18.359 102.91 17.586 c 102.656 16.805 102.527 15.895 102.527\n" + " 14.855 c 102.527 13.727 102.676 12.777 102.977 12.004 c 103.281 11.23 103.691\n" + " 10.609 104.199 10.137 c 104.715 9.656 105.309 9.309 105.98 9.098 c 106.652\n" + " 8.887 107.355 8.781 108.102 8.781 c 109.035 8.781 109.828 8.945 110.484\n" + " 9.273 c 111.148 9.594 111.691 10.047 112.113 10.629 c 112.535 11.211 112.844\n" + " 11.91 113.043 12.727 c 113.238 13.535 113.34 14.43 113.34 15.414 c 113.34\n" + " 15.5 l 105.754 15.508 l 105.754 16.004 105.797 16.465 105.887 16.895 c \n" + "105.973 17.316 106.117 17.684 106.312 18 c 106.508 18.305 106.766 18.551\n" + " 107.078 18.73 c 107.391 18.906 107.77 18.992 108.215 18.992 c 108.754 18.992\n" + " 109.195 18.879 109.535 18.652 c 109.879 18.418 110.121 18.062 110.266 17.582\n" + " c 113.16 17.832 l 113.027 18.168 112.844 18.523 112.602 18.902 c 112.367\n" + " 19.281 112.055 19.629 111.66 19.953 c 111.266 20.266 110.773 20.527 110.184\n" + " 20.738 c 109.602 20.941 108.891 21.043 108.055 21.043 c 108.055 10.719 \n" + "m 107.742 10.719 107.445 10.773 107.168 10.883 c 106.898 10.984 106.66 11.152\n" + " 106.457 11.387 c 106.262 11.613 106.102 11.906 105.977 12.273 c 105.852\n" + " 12.637 105.785 13.074 105.77 13.586 c 110.359 13.586 l 110.301 12.633 110.07\n" + " 11.918 109.672 11.445 c 109.27 10.965 108.73 10.723 108.055 10.723 c 123.332\n" + " 20.828 m 123.332 14.195 l 123.332 13.738 123.297 13.316 123.223 12.938 \n" + "c 123.148 12.551 123.031 12.223 122.863 11.953 c 122.695 11.676 122.477 \n" + "11.461 122.207 11.309 c 121.938 11.156 121.609 11.078 121.223 11.078 c 120.852\n" + " 11.078 120.512 11.16 120.207 11.328 c 119.91 11.488 119.648 11.723 119.43\n" + " 12.027 c 119.211 12.324 119.039 12.688 118.918 13.109 c 118.801 13.523 \n" + "118.742 13.984 118.742 14.484 c 118.742 20.82 l 115.672 20.82 l 115.672 \n" + "11.641 l 115.672 11.387 115.668 11.125 115.66 10.855 c 115.66 10.586 115.652\n" + " 10.332 115.637 10.09 c 115.629 9.844 115.621 9.625 115.613 9.434 c 115.605\n" + " 9.238 115.594 9.09 115.582 8.996 c 118.512 8.996 l 118.527 9.082 118.539\n" + " 9.227 118.555 9.422 c 118.57 9.609 118.582 9.824 118.598 10.055 c 118.613\n" + " 10.289 118.625 10.52 118.629 10.754 c 118.645 10.988 118.652 11.184 118.652\n" + " 11.344 c 118.695 11.344 l 119.109 10.441 119.633 9.785 120.258 9.375 c \n" + "120.883 8.969 121.633 8.762 122.496 8.762 c 123.211 8.762 123.812 8.879 \n" + "124.301 9.113 c 124.797 9.348 125.195 9.668 125.504 10.074 c 125.816 10.48\n" + " 126.043 10.965 126.18 11.516 c 126.316 12.07 126.387 12.668 126.387 13.309\n" + " c 126.387 20.816 l 123.328 20.816 l 132.375 21.012 m 131.473 21.012 130.777\n" + " 20.77 130.289 20.281 c 129.801 19.785 129.559 19.039 129.559 18.043 c 129.559\n" + " 11.07 l 128.062 11.07 l 128.062 8.996 l 129.711 8.996 l 130.672 6.219 l\n" + " 132.594 6.219 l 132.594 8.996 l 134.832 8.996 l 134.832 11.07 l 132.594\n" + " 11.07 l 132.594 17.211 l 132.594 17.785 132.703 18.211 132.922 18.488 c\n" + " 133.141 18.758 133.48 18.895 133.938 18.891 c 134.125 18.891 134.297 18.875\n" + " 134.449 18.848 c 134.602 18.82 134.773 18.781 134.961 18.738 c 134.961 \n" + "20.641 l 134.582 20.766 134.18 20.855 133.758 20.914 c 133.336 20.98 132.871\n" + " 21.012 132.371 21.012 c 139.551 21.035 m 138.984 21.035 138.473 20.957 \n" + "138.02 20.805 c 137.574 20.645 137.195 20.414 136.883 20.117 c 136.57 19.812\n" + " 136.328 19.438 136.16 18.992 c 135.992 18.547 135.91 18.043 135.91 17.473\n" + " c 135.91 16.773 136.031 16.188 136.27 15.715 c 136.516 15.234 136.852 14.848\n" + " 137.273 14.555 c 137.695 14.258 138.191 14.043 138.758 13.91 c 139.324 \n" + "13.773 139.93 13.699 140.57 13.691 c 143.117 13.648 l 143.117 13.047 l 143.117\n" + " 12.617 143.078 12.262 142.996 11.977 c 142.922 11.684 142.812 11.449 142.668\n" + " 11.266 c 142.523 11.082 142.34 10.957 142.121 10.883 c 141.91 10.801 141.664\n" + " 10.762 141.391 10.762 c 141.137 10.762 140.906 10.789 140.703 10.84 c 140.508\n" + " 10.891 140.336 10.98 140.191 11.113 c 140.047 11.238 139.926 11.41 139.832\n" + " 11.625 c 139.746 11.836 139.684 12.105 139.645 12.434 c 136.441 12.281 \n" + "l 136.527 11.766 136.688 11.293 136.922 10.871 c 137.156 10.441 137.477 \n" + "10.07 137.883 9.758 c 138.297 9.445 138.805 9.203 139.402 9.035 c 140.008\n" + " 8.859 140.715 8.773 141.523 8.773 c 142.258 8.773 142.914 8.863 143.492\n" + " 9.047 c 144.066 9.23 144.555 9.504 144.957 9.867 c 145.359 10.223 145.664\n" + " 10.664 145.875 11.188 c 146.086 11.711 146.191 12.32 146.191 13.012 c 146.191\n" + " 17.316 l 146.191 17.594 146.203 17.84 146.223 18.059 c 146.25 18.277 146.301\n" + " 18.461 146.363 18.617 c 146.438 18.762 146.535 18.875 146.66 18.957 c 146.793\n" + " 19.031 146.957 19.066 147.164 19.066 c 147.398 19.066 147.621 19.043 147.84\n" + " 19 c 147.84 20.66 l 147.656 20.703 147.492 20.742 147.348 20.781 c 147.203\n" + " 20.816 147.055 20.848 146.91 20.867 c 146.766 20.891 146.609 20.906 146.441\n" + " 20.922 c 146.281 20.938 146.09 20.945 145.875 20.945 c 145.102 20.945 144.531\n" + " 20.758 144.16 20.379 c 143.797 20 143.578 19.441 143.504 18.707 c 143.438\n" + " 18.707 l 143.031 19.441 142.504 20.016 141.863 20.422 c 141.23 20.828 140.457\n" + " 21.035 139.547 21.035 c 143.121 15.344 m 141.547 15.367 l 141.219 15.383\n" + " 140.906 15.41 140.605 15.453 c 140.312 15.488 140.055 15.574 139.828 15.703\n" + " c 139.609 15.828 139.434 16.008 139.305 16.25 c 139.172 16.492 139.109 \n" + "16.816 139.109 17.234 c 139.109 17.797 139.238 18.215 139.492 18.492 c 139.754\n" + " 18.762 140.102 18.898 140.531 18.895 c 140.926 18.895 141.281 18.812 141.602\n" + " 18.645 c 141.922 18.477 142.191 18.258 142.41 17.988 c 142.637 17.711 142.812\n" + " 17.395 142.934 17.039 c 143.059 16.684 143.121 16.316 143.121 15.945 c \n" + "143.121 15.344 l 149.273 20.816 m 149.273 4.602 l 152.344 4.602 l 152.344\n" + " 20.816 l 149.273 20.816 l S Q\n" + "Q q\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "1 1 1 RG 0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 167.109 26.086 l 168.738 26.086 170.109\n" + " 24.715 170.109 23.086 c 170.109 3.398 l 170.109 1.77 168.738 0.398 167.109\n" + " 0.398 c h\n" + "3.867 3.844 m 166.664 3.844 l 166.664 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m B Q\n" + "Q\n"; + +static Dict *getExperimentalStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_expired.h b/poppler-24.05.0/poppler/annot_stamp_expired.h new file mode 100644 index 0000000000000000000000000000000000000000..1589d7a6a5392ad12f7d5f21057965c941a7d60f --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_expired.h @@ -0,0 +1,247 @@ +//======================================================================== +// +// annot_stamp_expired.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_EXPIRED_H +#define ANNOT_STAMP_EXPIRED_H + +#include "PDFDoc.h" +#include "Dict.h" +#include "Object.h" + +static const double ANNOT_STAMP_EXPIRED_WIDTH = 106.758179; +static const double ANNOT_STAMP_EXPIRED_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_EXPIRED = "1 0 0 -1 0 26.484741 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 103.367 2.129 l 104.07 2.129 104.637 2.695 104.637 3.398 \n" + "c 104.637 23.09 l 104.637 23.793 104.07 24.359 103.367 24.359 c 3.406 24.355\n" + " l 2.703 24.355 2.137 23.789 2.137 23.086 c 2.137 3.395 l 2.137 2.691 2.703\n" + " 2.125 3.406 2.125 c h\n" + "3.406 2.129 m f\n" + "Q q\n" + "0.74902 0 0 RG /a1 gs\n" + "3.454725 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.406 2.129 m 103.367 2.129 l 104.07 2.129 104.637 2.695 104.637 3.398 \n" + "c 104.637 23.09 l 104.637 23.793 104.07 24.359 103.367 24.359 c 3.406 24.355\n" + " l 2.703 24.355 2.137 23.789 2.137 23.086 c 2.137 3.395 l 2.137 2.691 2.703\n" + " 2.125 3.406 2.125 c h\n" + "3.406 2.129 m S Q\n" + "0.74902 0 0 rg 14.82 20.828 m 14.82 5.434 l 26.926 5.434 l 26.926 7.926 l 18.043 7.926\n" + " l 18.043 11.793 l 26.262 11.793 l 26.262 14.285 l 18.043 14.285 l 18.043\n" + " 18.34 l 27.375 18.34 l 27.375 20.832 l 14.82 20.828 l 37.219 20.828 m 34.465\n" + " 16.543 l 31.688 20.828 l 28.422 20.828 l 32.75 14.719 l 28.629 9.004 l \n" + "31.941 9.004 l 34.465 12.871 l 36.977 9.004 l 40.309 9.004 l 36.188 14.688\n" + " l 40.547 20.828 l 37.215 20.828 l 53.473 14.863 m 53.473 15.758 53.383 \n" + "16.586 53.199 17.344 c 53.023 18.102 52.75 18.754 52.379 19.301 c 52.008\n" + " 19.848 51.535 20.277 50.957 20.59 c 50.391 20.895 49.715 21.047 48.938 \n" + "21.047 c 48.586 21.047 48.238 21.012 47.887 20.938 c 47.543 20.863 47.215\n" + " 20.75 46.902 20.586 c 46.59 20.418 46.297 20.203 46.027 19.941 c 45.766\n" + " 19.672 45.539 19.34 45.352 18.945 c 45.285 18.945 l 45.293 18.98 45.301\n" + " 19.074 45.309 19.219 c 45.316 19.363 45.324 19.535 45.332 19.73 c 45.34\n" + " 19.918 45.344 20.125 45.344 20.344 c 45.352 20.555 45.355 20.75 45.355 \n" + "20.934 c 45.355 25.469 l 42.285 25.469 l 42.285 11.723 l 42.285 11.117 42.273\n" + " 10.578 42.254 10.105 c 42.238 9.633 42.223 9.266 42.199 9 c 45.184 9 l \n" + "45.199 9.051 45.211 9.148 45.227 9.297 c 45.25 9.441 45.262 9.609 45.27 \n" + "9.801 c 45.285 9.988 45.297 10.188 45.301 10.391 c 45.309 10.594 45.312 \n" + "10.773 45.312 10.926 c 45.355 10.926 l 45.727 10.145 46.238 9.59 46.887 \n" + "9.254 c 47.535 8.918 48.285 8.75 49.137 8.75 c 49.887 8.75 50.535 8.902 \n" + "51.082 9.207 c 51.629 9.512 52.078 9.934 52.426 10.473 c 52.781 11.012 53.047\n" + " 11.656 53.211 12.406 c 53.387 13.148 53.473 13.965 53.473 14.855 c 50.27\n" + " 14.855 m 50.27 13.508 50.066 12.512 49.656 11.863 c 49.25 11.207 48.641\n" + " 10.879 47.832 10.879 c 47.527 10.879 47.219 10.945 46.914 11.074 c 46.617\n" + " 11.199 46.348 11.418 46.105 11.73 c 45.871 12.035 45.68 12.453 45.527 12.977\n" + " c 45.383 13.492 45.309 14.148 45.309 14.945 c 45.309 15.719 45.383 16.363\n" + " 45.527 16.879 c 45.672 17.391 45.863 17.797 46.094 18.102 c 46.336 18.406\n" + " 46.605 18.625 46.902 18.758 c 47.199 18.883 47.504 18.945 47.809 18.945\n" + " c 48.203 18.945 48.551 18.867 48.859 18.715 c 49.164 18.555 49.422 18.312\n" + " 49.625 17.984 c 49.836 17.648 49.996 17.223 50.105 16.707 c 50.215 16.191\n" + " 50.27 15.574 50.27 14.859 c 55.969 6.875 m 55.969 4.613 l 59.039 4.613 \n" + "l 59.039 6.875 l 55.969 6.875 l 55.969 20.828 m 55.969 9.004 l 59.039 9.004\n" + " l 59.039 20.828 l 55.969 20.828 l 62.176 20.828 m 62.176 11.781 l 62.176\n" + " 11.527 62.172 11.258 62.164 10.973 c 62.164 10.688 62.156 10.418 62.141\n" + " 10.164 c 62.133 9.902 62.125 9.668 62.117 9.465 c 62.109 9.254 62.098 9.102\n" + " 62.086 9.008 c 65.016 9.008 l 65.031 9.094 65.043 9.25 65.059 9.465 c 65.074\n" + " 9.676 65.086 9.91 65.102 10.164 c 65.117 10.418 65.129 10.676 65.133 10.93\n" + " c 65.148 11.176 65.156 11.379 65.156 11.531 c 65.199 11.531 l 65.352 11.102\n" + " 65.504 10.719 65.656 10.383 c 65.809 10.039 65.988 9.754 66.191 9.52 c \n" + "66.402 9.277 66.652 9.098 66.945 8.973 c 67.238 8.84 67.598 8.777 68.027\n" + " 8.777 c 68.211 8.777 68.387 8.797 68.562 8.832 c 68.746 8.859 68.883 8.898\n" + " 68.977 8.941 c 68.977 11.508 l 68.781 11.465 68.578 11.426 68.375 11.398\n" + " c 68.18 11.363 67.941 11.344 67.664 11.344 c 66.898 11.344 66.301 11.652\n" + " 65.871 12.273 c 65.449 12.895 65.238 13.809 65.238 15.027 c 65.238 20.828\n" + " l 62.168 20.828 l 75.707 21.047 m 74.855 21.047 74.086 20.922 73.402 20.676\n" + " c 72.727 20.422 72.145 20.039 71.664 19.527 c 71.184 19.012 70.816 18.367\n" + " 70.559 17.594 c 70.305 16.812 70.176 15.902 70.176 14.863 c 70.176 13.734\n" + " 70.324 12.785 70.625 12.012 c 70.93 11.238 71.34 10.617 71.848 10.145 c\n" + " 72.363 9.664 72.957 9.316 73.629 9.105 c 74.301 8.895 75.004 8.789 75.75\n" + " 8.789 c 76.684 8.789 77.477 8.953 78.133 9.281 c 78.797 9.602 79.34 10.055\n" + " 79.762 10.637 c 80.184 11.219 80.492 11.918 80.691 12.734 c 80.887 13.543\n" + " 80.988 14.438 80.988 15.422 c 80.988 15.508 l 73.41 15.508 l 73.41 16.004\n" + " 73.453 16.465 73.543 16.895 c 73.629 17.316 73.773 17.684 73.969 18 c 74.164\n" + " 18.305 74.422 18.551 74.734 18.73 c 75.047 18.906 75.426 18.992 75.871 \n" + "18.992 c 76.41 18.992 76.852 18.879 77.191 18.652 c 77.535 18.418 77.777\n" + " 18.062 77.922 17.582 c 80.816 17.832 l 80.684 18.168 80.5 18.523 80.258\n" + " 18.902 c 80.023 19.281 79.711 19.629 79.316 19.953 c 78.922 20.266 78.43\n" + " 20.527 77.84 20.738 c 77.258 20.941 76.547 21.043 75.711 21.043 c 75.711\n" + " 10.719 m 75.398 10.719 75.102 10.773 74.824 10.883 c 74.555 10.984 74.316\n" + " 11.152 74.113 11.387 c 73.918 11.613 73.758 11.906 73.633 12.273 c 73.508\n" + " 12.637 73.441 13.074 73.426 13.586 c 78.016 13.586 l 77.957 12.633 77.727\n" + " 11.918 77.328 11.445 c 76.926 10.965 76.387 10.723 75.711 10.723 c 90.988\n" + " 20.828 m 90.973 20.77 90.957 20.668 90.934 20.523 c 90.918 20.371 90.902\n" + " 20.199 90.879 20.012 c 90.863 19.824 90.852 19.629 90.836 19.434 c 90.828\n" + " 19.238 90.824 19.062 90.824 18.91 c 90.781 18.91 l 90.426 19.676 89.926\n" + " 20.227 89.285 20.559 c 88.652 20.887 87.891 21.051 87 21.051 c 86.258 21.051\n" + " 85.613 20.898 85.066 20.594 c 84.527 20.289 84.078 19.863 83.723 19.316\n" + " c 83.371 18.77 83.109 18.125 82.938 17.383 c 82.77 16.633 82.688 15.816\n" + " 82.688 14.934 c 82.688 14.039 82.773 13.215 82.949 12.465 c 83.133 11.715\n" + " 83.406 11.07 83.781 10.531 c 84.152 9.984 84.621 9.559 85.191 9.254 c 85.766\n" + " 8.949 86.449 8.797 87.234 8.797 c 87.621 8.797 87.992 8.836 88.348 8.918\n" + " c 88.703 9 89.035 9.121 89.344 9.289 c 89.648 9.457 89.926 9.672 90.176\n" + " 9.934 c 90.422 10.195 90.633 10.512 90.809 10.883 c 90.832 10.883 l 90.832\n" + " 10.809 90.828 10.703 90.82 10.566 c 90.82 10.422 90.82 10.258 90.82 10.074\n" + " c 90.82 9.891 90.816 9.703 90.809 9.508 c 90.809 9.312 90.809 9.121 90.809\n" + " 8.941 c 90.809 4.625 l 93.879 4.625 l 93.879 18.262 l 93.879 18.836 93.891\n" + " 19.352 93.91 19.801 c 93.934 20.246 93.949 20.59 93.965 20.84 c 90.992 \n" + "20.84 l 90.852 14.863 m 90.852 14.082 90.777 13.438 90.633 12.93 c 90.488\n" + " 12.414 90.293 12.004 90.055 11.707 c 89.82 11.402 89.551 11.191 89.246 \n" + "11.074 c 88.949 10.949 88.641 10.887 88.328 10.887 c 87.934 10.887 87.586\n" + " 10.965 87.277 11.117 c 86.98 11.27 86.723 11.512 86.512 11.84 c 86.309 \n" + "12.168 86.152 12.586 86.043 13.098 c 85.941 13.609 85.891 14.223 85.891 \n" + "14.945 c 85.891 17.625 86.695 18.965 88.305 18.965 c 88.609 18.965 88.918\n" + " 18.898 89.223 18.77 c 89.527 18.637 89.801 18.418 90.043 18.102 c 90.285\n" + " 17.789 90.477 17.371 90.621 16.844 c 90.773 16.312 90.852 15.652 90.852\n" + " 14.867 c f\n" + "1 1 1 RG 0.531496 w\n" + "0 J\n" + "0 j\n" + "q 1 0 0 1 0 0 cm\n" + "14.82 20.828 m 14.82 5.434 l 26.926 5.434 l 26.926 7.926 l 18.043 7.926\n" + " l 18.043 11.793 l 26.262 11.793 l 26.262 14.285 l 18.043 14.285 l 18.043\n" + " 18.34 l 27.375 18.34 l 27.375 20.832 l 14.82 20.828 l 37.219 20.828 m 34.465\n" + " 16.543 l 31.688 20.828 l 28.422 20.828 l 32.75 14.719 l 28.629 9.004 l \n" + "31.941 9.004 l 34.465 12.871 l 36.977 9.004 l 40.309 9.004 l 36.188 14.688\n" + " l 40.547 20.828 l 37.215 20.828 l 53.473 14.863 m 53.473 15.758 53.383 \n" + "16.586 53.199 17.344 c 53.023 18.102 52.75 18.754 52.379 19.301 c 52.008\n" + " 19.848 51.535 20.277 50.957 20.59 c 50.391 20.895 49.715 21.047 48.938 \n" + "21.047 c 48.586 21.047 48.238 21.012 47.887 20.938 c 47.543 20.863 47.215\n" + " 20.75 46.902 20.586 c 46.59 20.418 46.297 20.203 46.027 19.941 c 45.766\n" + " 19.672 45.539 19.34 45.352 18.945 c 45.285 18.945 l 45.293 18.98 45.301\n" + " 19.074 45.309 19.219 c 45.316 19.363 45.324 19.535 45.332 19.73 c 45.34\n" + " 19.918 45.344 20.125 45.344 20.344 c 45.352 20.555 45.355 20.75 45.355 \n" + "20.934 c 45.355 25.469 l 42.285 25.469 l 42.285 11.723 l 42.285 11.117 42.273\n" + " 10.578 42.254 10.105 c 42.238 9.633 42.223 9.266 42.199 9 c 45.184 9 l \n" + "45.199 9.051 45.211 9.148 45.227 9.297 c 45.25 9.441 45.262 9.609 45.27 \n" + "9.801 c 45.285 9.988 45.297 10.188 45.301 10.391 c 45.309 10.594 45.312 \n" + "10.773 45.312 10.926 c 45.355 10.926 l 45.727 10.145 46.238 9.59 46.887 \n" + "9.254 c 47.535 8.918 48.285 8.75 49.137 8.75 c 49.887 8.75 50.535 8.902 \n" + "51.082 9.207 c 51.629 9.512 52.078 9.934 52.426 10.473 c 52.781 11.012 53.047\n" + " 11.656 53.211 12.406 c 53.387 13.148 53.473 13.965 53.473 14.855 c 50.27\n" + " 14.855 m 50.27 13.508 50.066 12.512 49.656 11.863 c 49.25 11.207 48.641\n" + " 10.879 47.832 10.879 c 47.527 10.879 47.219 10.945 46.914 11.074 c 46.617\n" + " 11.199 46.348 11.418 46.105 11.73 c 45.871 12.035 45.68 12.453 45.527 12.977\n" + " c 45.383 13.492 45.309 14.148 45.309 14.945 c 45.309 15.719 45.383 16.363\n" + " 45.527 16.879 c 45.672 17.391 45.863 17.797 46.094 18.102 c 46.336 18.406\n" + " 46.605 18.625 46.902 18.758 c 47.199 18.883 47.504 18.945 47.809 18.945\n" + " c 48.203 18.945 48.551 18.867 48.859 18.715 c 49.164 18.555 49.422 18.312\n" + " 49.625 17.984 c 49.836 17.648 49.996 17.223 50.105 16.707 c 50.215 16.191\n" + " 50.27 15.574 50.27 14.859 c 55.969 6.875 m 55.969 4.613 l 59.039 4.613 \n" + "l 59.039 6.875 l 55.969 6.875 l 55.969 20.828 m 55.969 9.004 l 59.039 9.004\n" + " l 59.039 20.828 l 55.969 20.828 l 62.176 20.828 m 62.176 11.781 l 62.176\n" + " 11.527 62.172 11.258 62.164 10.973 c 62.164 10.688 62.156 10.418 62.141\n" + " 10.164 c 62.133 9.902 62.125 9.668 62.117 9.465 c 62.109 9.254 62.098 9.102\n" + " 62.086 9.008 c 65.016 9.008 l 65.031 9.094 65.043 9.25 65.059 9.465 c 65.074\n" + " 9.676 65.086 9.91 65.102 10.164 c 65.117 10.418 65.129 10.676 65.133 10.93\n" + " c 65.148 11.176 65.156 11.379 65.156 11.531 c 65.199 11.531 l 65.352 11.102\n" + " 65.504 10.719 65.656 10.383 c 65.809 10.039 65.988 9.754 66.191 9.52 c \n" + "66.402 9.277 66.652 9.098 66.945 8.973 c 67.238 8.84 67.598 8.777 68.027\n" + " 8.777 c 68.211 8.777 68.387 8.797 68.562 8.832 c 68.746 8.859 68.883 8.898\n" + " 68.977 8.941 c 68.977 11.508 l 68.781 11.465 68.578 11.426 68.375 11.398\n" + " c 68.18 11.363 67.941 11.344 67.664 11.344 c 66.898 11.344 66.301 11.652\n" + " 65.871 12.273 c 65.449 12.895 65.238 13.809 65.238 15.027 c 65.238 20.828\n" + " l 62.168 20.828 l 75.707 21.047 m 74.855 21.047 74.086 20.922 73.402 20.676\n" + " c 72.727 20.422 72.145 20.039 71.664 19.527 c 71.184 19.012 70.816 18.367\n" + " 70.559 17.594 c 70.305 16.812 70.176 15.902 70.176 14.863 c 70.176 13.734\n" + " 70.324 12.785 70.625 12.012 c 70.93 11.238 71.34 10.617 71.848 10.145 c\n" + " 72.363 9.664 72.957 9.316 73.629 9.105 c 74.301 8.895 75.004 8.789 75.75\n" + " 8.789 c 76.684 8.789 77.477 8.953 78.133 9.281 c 78.797 9.602 79.34 10.055\n" + " 79.762 10.637 c 80.184 11.219 80.492 11.918 80.691 12.734 c 80.887 13.543\n" + " 80.988 14.438 80.988 15.422 c 80.988 15.508 l 73.41 15.508 l 73.41 16.004\n" + " 73.453 16.465 73.543 16.895 c 73.629 17.316 73.773 17.684 73.969 18 c 74.164\n" + " 18.305 74.422 18.551 74.734 18.73 c 75.047 18.906 75.426 18.992 75.871 \n" + "18.992 c 76.41 18.992 76.852 18.879 77.191 18.652 c 77.535 18.418 77.777\n" + " 18.062 77.922 17.582 c 80.816 17.832 l 80.684 18.168 80.5 18.523 80.258\n" + " 18.902 c 80.023 19.281 79.711 19.629 79.316 19.953 c 78.922 20.266 78.43\n" + " 20.527 77.84 20.738 c 77.258 20.941 76.547 21.043 75.711 21.043 c 75.711\n" + " 10.719 m 75.398 10.719 75.102 10.773 74.824 10.883 c 74.555 10.984 74.316\n" + " 11.152 74.113 11.387 c 73.918 11.613 73.758 11.906 73.633 12.273 c 73.508\n" + " 12.637 73.441 13.074 73.426 13.586 c 78.016 13.586 l 77.957 12.633 77.727\n" + " 11.918 77.328 11.445 c 76.926 10.965 76.387 10.723 75.711 10.723 c 90.988\n" + " 20.828 m 90.973 20.77 90.957 20.668 90.934 20.523 c 90.918 20.371 90.902\n" + " 20.199 90.879 20.012 c 90.863 19.824 90.852 19.629 90.836 19.434 c 90.828\n" + " 19.238 90.824 19.062 90.824 18.91 c 90.781 18.91 l 90.426 19.676 89.926\n" + " 20.227 89.285 20.559 c 88.652 20.887 87.891 21.051 87 21.051 c 86.258 21.051\n" + " 85.613 20.898 85.066 20.594 c 84.527 20.289 84.078 19.863 83.723 19.316\n" + " c 83.371 18.77 83.109 18.125 82.938 17.383 c 82.77 16.633 82.688 15.816\n" + " 82.688 14.934 c 82.688 14.039 82.773 13.215 82.949 12.465 c 83.133 11.715\n" + " 83.406 11.07 83.781 10.531 c 84.152 9.984 84.621 9.559 85.191 9.254 c 85.766\n" + " 8.949 86.449 8.797 87.234 8.797 c 87.621 8.797 87.992 8.836 88.348 8.918\n" + " c 88.703 9 89.035 9.121 89.344 9.289 c 89.648 9.457 89.926 9.672 90.176\n" + " 9.934 c 90.422 10.195 90.633 10.512 90.809 10.883 c 90.832 10.883 l 90.832\n" + " 10.809 90.828 10.703 90.82 10.566 c 90.82 10.422 90.82 10.258 90.82 10.074\n" + " c 90.82 9.891 90.816 9.703 90.809 9.508 c 90.809 9.312 90.809 9.121 90.809\n" + " 8.941 c 90.809 4.625 l 93.879 4.625 l 93.879 18.262 l 93.879 18.836 93.891\n" + " 19.352 93.91 19.801 c 93.934 20.246 93.949 20.59 93.965 20.84 c 90.992 \n" + "20.84 l 90.852 14.863 m 90.852 14.082 90.777 13.438 90.633 12.93 c 90.488\n" + " 12.414 90.293 12.004 90.055 11.707 c 89.82 11.402 89.551 11.191 89.246 \n" + "11.074 c 88.949 10.949 88.641 10.887 88.328 10.887 c 87.934 10.887 87.586\n" + " 10.965 87.277 11.117 c 86.98 11.27 86.723 11.512 86.512 11.84 c 86.309 \n" + "12.168 86.152 12.586 86.043 13.098 c 85.941 13.609 85.891 14.223 85.891 \n" + "14.945 c 85.891 17.625 86.695 18.965 88.305 18.965 c 88.609 18.965 88.918\n" + " 18.898 89.223 18.77 c 89.527 18.637 89.801 18.418 90.043 18.102 c 90.285\n" + " 17.789 90.477 17.371 90.621 16.844 c 90.773 16.312 90.852 15.652 90.852\n" + " 14.867 c S Q\n" + "0.74902 0 0 rg 1 1 1 RG 0.797243 w\n" + "1 J\n" + "1 j\n" + "q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 103.359 26.086 l 104.988 26.086 106.359\n" + " 24.715 106.359 23.086 c 106.359 3.398 l 106.359 1.77 104.988 0.398 103.359\n" + " 0.398 c h\n" + "3.867 3.844 m 102.914 3.844 l 102.914 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m B Q\n" + "Q\n"; + +static Dict *getExpiredStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_final.h b/poppler-24.05.0/poppler/annot_stamp_final.h new file mode 100644 index 0000000000000000000000000000000000000000..377325d3b063feb960b948b1aff83ceb4d163d33 --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_final.h @@ -0,0 +1,120 @@ +//======================================================================== +// +// annot_stamp_final.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_FINAL_H +#define ANNOT_STAMP_FINAL_H + +#include "Dict.h" +#include "Object.h" +#include "PDFDoc.h" + +static const double ANNOT_STAMP_FINAL_WIDTH = 79.758179; +static const double ANNOT_STAMP_FINAL_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_FINAL = "1 0 0 -1 0 26.484741 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 76.367 2.129 l 77.066 2.129 77.637 2.828 77.637 3.398 c 77.637\n" + " 23.09 l 77.637 23.789 77.07 24.359 76.367 24.359 c 3.406 24.359 l 2.707\n" + " 24.359 2.137 23.66 2.137 23.09 c 2.137 3.398 l 2.137 2.699 2.703 2.129 \n" + "3.406 2.129 c h\n" + "3.406 2.129 m f\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "1 1 1 RG 0.531496 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "18.043 7.926 m 18.043 12.691 l 25.922 12.691 l 25.922 15.184 l 18.043 15.18\n" + " l 18.043 20.828 l 14.82 20.828 l 14.82 5.434 l 26.172 5.434 l 26.172 7.926\n" + " l 18.043 7.926 l 28.566 6.875 m 28.566 4.613 l 31.637 4.613 l 31.637 6.875\n" + " l 28.566 6.875 l 28.566 20.828 m 28.566 9.004 l 31.637 9.004 l 31.637 20.828\n" + " l 28.566 20.828 l 42.434 20.828 m 42.434 14.195 l 42.434 13.738 42.398 \n" + "13.316 42.324 12.938 c 42.25 12.551 42.133 12.223 41.965 11.953 c 41.797\n" + " 11.676 41.578 11.461 41.309 11.309 c 41.039 11.156 40.711 11.078 40.324\n" + " 11.078 c 39.953 11.078 39.613 11.16 39.309 11.328 c 39.012 11.488 38.75\n" + " 11.723 38.531 12.027 c 38.312 12.324 38.141 12.688 38.02 13.109 c 37.902\n" + " 13.523 37.844 13.984 37.844 14.484 c 37.844 20.82 l 34.773 20.82 l 34.773\n" + " 11.641 l 34.773 11.387 34.77 11.125 34.762 10.855 c 34.762 10.586 34.754\n" + " 10.332 34.738 10.09 c 34.73 9.844 34.723 9.625 34.715 9.434 c 34.707 9.238\n" + " 34.695 9.09 34.684 8.996 c 37.613 8.996 l 37.629 9.082 37.641 9.227 37.656\n" + " 9.422 c 37.672 9.609 37.684 9.824 37.699 10.055 c 37.715 10.289 37.727 \n" + "10.52 37.73 10.754 c 37.746 10.988 37.754 11.184 37.754 11.344 c 37.797 \n" + "11.344 l 38.211 10.441 38.734 9.785 39.359 9.375 c 39.984 8.969 40.734 8.762\n" + " 41.598 8.762 c 42.312 8.762 42.914 8.879 43.402 9.113 c 43.898 9.348 44.297\n" + " 9.668 44.605 10.074 c 44.918 10.48 45.145 10.965 45.281 11.516 c 45.418\n" + " 12.07 45.488 12.668 45.488 13.309 c 45.488 20.816 l 42.434 20.828 l 51.188\n" + " 21.047 m 50.621 21.047 50.109 20.969 49.656 20.816 c 49.211 20.656 48.832\n" + " 20.426 48.52 20.129 c 48.207 19.824 47.965 19.449 47.797 19.004 c 47.629\n" + " 18.559 47.547 18.055 47.547 17.484 c 47.547 16.785 47.668 16.199 47.906\n" + " 15.727 c 48.152 15.246 48.488 14.859 48.91 14.566 c 49.332 14.27 49.828\n" + " 14.055 50.395 13.922 c 50.961 13.785 51.566 13.711 52.207 13.703 c 54.754\n" + " 13.66 l 54.754 13.059 l 54.754 12.629 54.715 12.273 54.633 11.988 c 54.559\n" + " 11.695 54.449 11.461 54.305 11.277 c 54.16 11.094 53.977 10.969 53.758 \n" + "10.895 c 53.547 10.812 53.301 10.773 53.027 10.773 c 52.773 10.773 52.543\n" + " 10.801 52.34 10.852 c 52.145 10.902 51.973 10.992 51.828 11.125 c 51.684\n" + " 11.25 51.562 11.422 51.469 11.637 c 51.383 11.848 51.32 12.117 51.281 12.445\n" + " c 48.078 12.293 l 48.164 11.777 48.324 11.305 48.559 10.883 c 48.793 10.453\n" + " 49.113 10.082 49.52 9.77 c 49.934 9.457 50.441 9.215 51.039 9.047 c 51.645\n" + " 8.871 52.352 8.785 53.16 8.785 c 53.895 8.785 54.551 8.875 55.129 9.059\n" + " c 55.703 9.242 56.191 9.516 56.594 9.879 c 56.996 10.234 57.301 10.676 \n" + "57.512 11.199 c 57.723 11.723 57.828 12.332 57.828 13.023 c 57.828 17.328\n" + " l 57.828 17.605 57.84 17.852 57.859 18.07 c 57.887 18.289 57.938 18.477\n" + " 58 18.629 c 58.074 18.773 58.172 18.887 58.297 18.969 c 58.43 19.043 58.594\n" + " 19.078 58.801 19.078 c 59.035 19.078 59.258 19.055 59.477 19.012 c 59.477\n" + " 20.672 l 59.293 20.715 59.129 20.754 58.984 20.793 c 58.84 20.828 58.691\n" + " 20.859 58.547 20.879 c 58.402 20.902 58.246 20.918 58.078 20.934 c 57.918\n" + " 20.949 57.727 20.957 57.512 20.957 c 56.738 20.957 56.168 20.77 55.797 \n" + "20.391 c 55.434 20.012 55.215 19.453 55.141 18.719 c 55.074 18.719 l 54.668\n" + " 19.453 54.141 20.027 53.5 20.434 c 52.867 20.84 52.094 21.047 51.184 21.047\n" + " c 54.758 15.355 m 53.184 15.379 l 52.855 15.395 52.543 15.422 52.242 15.465\n" + " c 51.949 15.5 51.691 15.586 51.465 15.715 c 51.246 15.84 51.07 16.02 50.941\n" + " 16.262 c 50.809 16.504 50.746 16.828 50.746 17.246 c 50.746 17.809 50.875\n" + " 18.227 51.129 18.504 c 51.391 18.773 51.738 18.906 52.168 18.906 c 52.562\n" + " 18.906 52.918 18.824 53.238 18.656 c 53.559 18.488 53.828 18.27 54.047 \n" + "18 c 54.273 17.723 54.449 17.406 54.57 17.051 c 54.695 16.695 54.758 16.328\n" + " 54.758 15.957 c 54.758 15.355 l 60.91 20.828 m 60.91 4.613 l 63.98 4.613\n" + " l 63.98 20.828 l 60.91 20.828 l B Q\n" + "Q q\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "1 1 1 RG 0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 76.359 26.086 l 77.988 26.086 79.359 24.715\n" + " 79.359 23.086 c 79.359 3.398 l 79.359 1.77 77.988 0.398 76.359 0.398 c \n" + "h\n" + "3.867 3.844 m 75.914 3.844 l 75.914 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m B Q\n" + "Q\n"; + +static Dict *getFinalStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_for_comment.h b/poppler-24.05.0/poppler/annot_stamp_for_comment.h new file mode 100644 index 0000000000000000000000000000000000000000..429b4876c66f6cb119161d146025cc37c0c56d85 --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_for_comment.h @@ -0,0 +1,227 @@ +//======================================================================== +// +// annot_stamp_for_comment.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_FOR_COMMENT_H +#define ANNOT_STAMP_FOR_COMMENT_H + +#include "Dict.h" +#include "Object.h" +#include "PDFDoc.h" + +static const double ANNOT_STAMP_FOR_COMMENT_WIDTH = 170.508179; +static const double ANNOT_STAMP_FOR_COMMENT_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_FOR_COMMENT = "1 0 0 -1 0 26.484741 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 167.117 2.129 l 167.816 2.129 168.387 2.828 168.387 3.398\n" + " c 168.387 23.09 l 168.387 23.789 167.82 24.359 167.117 24.359 c 3.406 24.359\n" + " l 2.707 24.359 2.137 23.66 2.137 23.09 c 2.137 3.398 l 2.137 2.699 2.703\n" + " 2.129 3.406 2.129 c h\n" + "3.406 2.129 m f\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "1 1 1 RG 0.265748 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "18.043 7.926 m 18.043 12.691 l 25.922 12.691 l 25.922 15.184 l 18.043 15.18\n" + " l 18.043 20.828 l 14.82 20.828 l 14.82 5.434 l 26.172 5.434 l 26.172 7.926\n" + " l 18.043 7.926 l 39.797 14.906 m 39.797 15.809 39.668 16.637 39.414 17.387\n" + " c 39.168 18.137 38.793 18.785 38.289 19.332 c 37.785 19.871 37.16 20.293\n" + " 36.41 20.598 c 35.66 20.895 34.785 21.047 33.789 21.047 c 32.828 21.047\n" + " 31.98 20.898 31.242 20.598 c 30.508 20.301 29.887 19.879 29.383 19.34 c\n" + " 28.887 18.801 28.512 18.156 28.258 17.406 c 28.004 16.648 27.875 15.816\n" + " 27.875 14.902 c 27.875 14.02 27.996 13.207 28.234 12.465 c 28.48 11.715\n" + " 28.855 11.066 29.348 10.52 c 29.844 9.973 30.465 9.547 31.215 9.242 c 31.965\n" + " 8.938 32.844 8.785 33.848 8.785 c 34.91 8.785 35.816 8.938 36.57 9.242 \n" + "c 37.32 9.547 37.934 9.973 38.406 10.52 c 38.887 11.059 39.238 11.703 39.457\n" + " 12.453 c 39.684 13.195 39.797 14.012 39.797 14.902 c 36.586 14.902 m 36.586\n" + " 13.496 36.355 12.477 35.898 11.844 c 35.441 11.211 34.773 10.895 33.898\n" + " 10.895 c 32.996 10.895 32.305 11.215 31.824 11.855 c 31.344 12.496 31.102\n" + " 13.512 31.102 14.902 c 31.102 15.609 31.164 16.219 31.289 16.727 c 31.422\n" + " 17.238 31.602 17.656 31.836 17.984 c 32.07 18.312 32.348 18.555 32.676 \n" + "18.715 c 33.004 18.867 33.363 18.945 33.758 18.945 c 34.211 18.945 34.609\n" + " 18.867 34.961 18.715 c 35.316 18.555 35.617 18.312 35.855 17.984 c 36.098\n" + " 17.656 36.277 17.238 36.402 16.727 c 36.527 16.215 36.59 15.609 36.59 14.902\n" + " c 42.25 20.824 m 42.25 11.777 l 42.25 11.523 42.246 11.254 42.238 10.969\n" + " c 42.238 10.684 42.23 10.414 42.215 10.16 c 42.207 9.898 42.199 9.664 42.191\n" + " 9.461 c 42.184 9.25 42.172 9.098 42.16 9.004 c 45.09 9.004 l 45.105 9.09\n" + " 45.117 9.246 45.133 9.461 c 45.148 9.672 45.16 9.906 45.176 10.16 c 45.191\n" + " 10.414 45.203 10.672 45.207 10.926 c 45.223 11.172 45.23 11.375 45.23 11.527\n" + " c 45.273 11.527 l 45.426 11.098 45.578 10.715 45.73 10.379 c 45.883 10.035\n" + " 46.062 9.75 46.266 9.516 c 46.477 9.273 46.727 9.094 47.02 8.969 c 47.312\n" + " 8.836 47.672 8.773 48.102 8.773 c 48.285 8.773 48.461 8.793 48.637 8.828\n" + " c 48.82 8.855 48.957 8.895 49.051 8.938 c 49.051 11.504 l 48.855 11.461\n" + " 48.652 11.422 48.449 11.395 c 48.254 11.359 48.016 11.34 47.738 11.34 c\n" + " 46.973 11.34 46.375 11.648 45.945 12.27 c 45.523 12.891 45.312 13.805 45.312\n" + " 15.023 c 45.312 20.824 l 42.242 20.824 l 64.27 18.508 m 64.875 18.508 65.395\n" + " 18.426 65.832 18.258 c 66.277 18.082 66.66 17.855 66.98 17.582 c 67.309\n" + " 17.305 67.578 16.992 67.789 16.641 c 68.008 16.289 68.188 15.938 68.324\n" + " 15.582 c 71.133 16.641 l 70.906 17.195 70.613 17.738 70.246 18.27 c 69.883\n" + " 18.801 69.426 19.27 68.879 19.68 c 68.332 20.086 67.68 20.418 66.922 20.676\n" + " c 66.172 20.922 65.285 21.047 64.266 21.047 c 62.934 21.047 61.777 20.852\n" + " 60.801 20.457 c 59.824 20.055 59.016 19.504 58.375 18.797 c 57.742 18.082\n" + " 57.27 17.238 56.953 16.262 c 56.648 15.285 56.496 14.219 56.496 13.059 \n" + "c 56.496 11.855 56.648 10.77 56.953 9.801 c 57.266 8.832 57.734 8.008 58.363\n" + " 7.332 c 58.988 6.648 59.781 6.121 60.734 5.758 c 61.695 5.387 62.824 5.199\n" + " 64.121 5.199 c 65.125 5.199 66.004 5.305 66.754 5.516 c 67.512 5.727 68.164\n" + " 6.027 68.711 6.41 c 69.266 6.789 69.719 7.242 70.078 7.766 c 70.441 8.281\n" + " 70.727 8.855 70.93 9.48 c 68.09 10.258 l 67.988 9.93 67.832 9.617 67.621\n" + " 9.316 c 67.41 9.012 67.141 8.742 66.812 8.508 c 66.492 8.273 66.113 8.09\n" + " 65.676 7.949 c 65.238 7.805 64.742 7.73 64.191 7.73 c 63.41 7.73 62.742\n" + " 7.859 62.18 8.113 c 61.617 8.359 61.156 8.719 60.793 9.184 c 60.438 9.648\n" + " 60.172 10.211 59.996 10.867 c 59.828 11.516 59.746 12.242 59.746 13.051\n" + " c 59.746 13.852 59.828 14.586 59.996 15.258 c 60.172 15.922 60.441 16.492\n" + " 60.805 16.973 c 61.168 17.453 61.637 17.828 62.203 18.098 c 62.777 18.367\n" + " 63.469 18.504 64.27 18.5 c 84.551 14.895 m 84.551 15.797 84.422 16.625 \n" + "84.168 17.375 c 83.922 18.125 83.547 18.773 83.043 19.32 c 82.539 19.859\n" + " 81.914 20.281 81.164 20.586 c 80.414 20.883 79.539 21.035 78.543 21.035\n" + " c 77.582 21.035 76.734 20.887 75.996 20.586 c 75.262 20.289 74.641 19.867\n" + " 74.137 19.328 c 73.641 18.789 73.266 18.145 73.012 17.395 c 72.758 16.637\n" + " 72.629 15.805 72.629 14.891 c 72.629 14.008 72.75 13.195 72.988 12.453 \n" + "c 73.234 11.703 73.609 11.055 74.102 10.508 c 74.598 9.961 75.219 9.535 \n" + "75.969 9.23 c 76.719 8.926 77.598 8.773 78.602 8.773 c 79.664 8.773 80.57\n" + " 8.926 81.324 9.23 c 82.074 9.535 82.688 9.961 83.16 10.508 c 83.641 11.047\n" + " 83.992 11.691 84.211 12.441 c 84.438 13.184 84.551 14 84.551 14.891 c 81.34\n" + " 14.891 m 81.34 13.484 81.109 12.465 80.652 11.832 c 80.195 11.199 79.527\n" + " 10.883 78.652 10.883 c 77.75 10.883 77.059 11.203 76.578 11.844 c 76.098\n" + " 12.484 75.855 13.5 75.855 14.891 c 75.855 15.598 75.918 16.207 76.043 16.715\n" + " c 76.176 17.227 76.355 17.645 76.59 17.973 c 76.824 18.301 77.102 18.543\n" + " 77.43 18.703 c 77.758 18.855 78.117 18.934 78.512 18.934 c 78.965 18.934\n" + " 79.363 18.855 79.715 18.703 c 80.07 18.543 80.371 18.301 80.609 17.973 \n" + "c 80.852 17.645 81.031 17.227 81.156 16.715 c 81.281 16.203 81.344 15.598\n" + " 81.344 14.891 c 93.965 20.812 m 93.965 14.18 l 93.965 13.723 93.934 13.301\n" + " 93.867 12.922 c 93.809 12.535 93.707 12.207 93.562 11.938 c 93.426 11.66\n" + " 93.238 11.445 93.004 11.293 c 92.777 11.141 92.5 11.062 92.172 11.062 c\n" + " 91.859 11.062 91.574 11.145 91.32 11.312 c 91.066 11.473 90.844 11.707 \n" + "90.652 12.012 c 90.469 12.309 90.328 12.672 90.227 13.094 c 90.125 13.508\n" + " 90.074 13.969 90.074 14.469 c 90.074 20.805 l 87.004 20.805 l 87.004 11.625\n" + " l 87.004 11.371 87 11.109 86.992 10.84 c 86.992 10.57 86.984 10.316 86.969\n" + " 10.074 c 86.961 9.828 86.953 9.609 86.945 9.418 c 86.938 9.223 86.926 9.074\n" + " 86.914 8.98 c 89.844 8.98 l 89.859 9.066 89.871 9.211 89.887 9.406 c 89.902\n" + " 9.594 89.914 9.809 89.93 10.039 c 89.945 10.273 89.957 10.504 89.961 10.738\n" + " c 89.977 10.973 89.984 11.168 89.984 11.328 c 90.027 11.328 l 90.406 10.426\n" + " 90.875 9.77 91.438 9.359 c 92.004 8.953 92.684 8.746 93.469 8.746 c 94.371\n" + " 8.746 95.098 8.969 95.645 9.414 c 96.199 9.852 96.57 10.488 96.758 11.328\n" + " c 96.824 11.328 l 97.035 10.84 97.262 10.434 97.5 10.105 c 97.746 9.777\n" + " 98.016 9.516 98.309 9.32 c 98.605 9.117 98.93 8.969 99.27 8.883 c 99.621\n" + " 8.797 99.996 8.75 100.406 8.75 c 101.055 8.75 101.602 8.867 102.047 9.102\n" + " c 102.5 9.336 102.863 9.656 103.141 10.062 c 103.426 10.469 103.629 10.953\n" + " 103.754 11.504 c 103.887 12.059 103.949 12.656 103.949 13.297 c 103.949\n" + " 20.805 l 100.902 20.805 l 100.902 14.172 l 100.902 13.715 100.871 13.293\n" + " 100.805 12.914 c 100.746 12.527 100.645 12.199 100.5 11.93 c 100.363 11.652\n" + " 100.176 11.438 99.941 11.285 c 99.715 11.133 99.438 11.055 99.109 11.055\n" + " c 98.805 11.055 98.523 11.137 98.27 11.297 c 98.023 11.449 97.805 11.672\n" + " 97.613 11.965 c 97.43 12.25 97.289 12.59 97.188 12.992 c 97.086 13.395 \n" + "97.027 13.836 97.012 14.324 c 97.012 20.805 l 93.965 20.805 l 113.852 20.805\n" + " m 113.852 14.172 l 113.852 13.715 113.82 13.293 113.754 12.914 c 113.695\n" + " 12.527 113.594 12.199 113.449 11.93 c 113.312 11.652 113.125 11.438 112.891\n" + " 11.285 c 112.664 11.133 112.387 11.055 112.059 11.055 c 111.746 11.055 \n" + "111.461 11.137 111.207 11.305 c 110.953 11.465 110.73 11.699 110.539 12.004\n" + " c 110.355 12.301 110.215 12.664 110.113 13.086 c 110.012 13.5 109.961 13.961\n" + " 109.961 14.461 c 109.961 20.797 l 106.891 20.797 l 106.891 11.617 l 106.891\n" + " 11.363 106.887 11.102 106.879 10.832 c 106.879 10.562 106.871 10.309 106.855\n" + " 10.066 c 106.848 9.82 106.84 9.602 106.832 9.41 c 106.824 9.215 106.812\n" + " 9.066 106.801 8.973 c 109.73 8.973 l 109.746 9.059 109.758 9.203 109.773\n" + " 9.398 c 109.789 9.586 109.801 9.801 109.816 10.031 c 109.832 10.266 109.844\n" + " 10.496 109.848 10.73 c 109.863 10.965 109.871 11.16 109.871 11.32 c 109.914\n" + " 11.32 l 110.293 10.418 110.762 9.762 111.324 9.352 c 111.891 8.945 112.57\n" + " 8.738 113.355 8.738 c 114.258 8.738 114.984 8.961 115.531 9.406 c 116.086\n" + " 9.844 116.457 10.48 116.645 11.32 c 116.711 11.32 l 116.922 10.832 117.148\n" + " 10.426 117.387 10.098 c 117.633 9.77 117.902 9.508 118.195 9.312 c 118.492\n" + " 9.109 118.816 8.961 119.156 8.875 c 119.508 8.789 119.883 8.742 120.293\n" + " 8.742 c 120.941 8.742 121.488 8.859 121.934 9.094 c 122.387 9.328 122.75\n" + " 9.648 123.027 10.055 c 123.312 10.461 123.516 10.945 123.641 11.496 c 123.773\n" + " 12.051 123.836 12.648 123.836 13.289 c 123.836 20.797 l 120.789 20.797 \n" + "l 120.789 14.164 l 120.789 13.707 120.758 13.285 120.691 12.906 c 120.633\n" + " 12.52 120.531 12.191 120.387 11.922 c 120.25 11.645 120.062 11.43 119.828\n" + " 11.277 c 119.602 11.125 119.324 11.047 118.996 11.047 c 118.691 11.047 \n" + "118.41 11.129 118.156 11.289 c 117.91 11.441 117.691 11.664 117.5 11.957\n" + " c 117.316 12.242 117.176 12.582 117.074 12.984 c 116.973 13.387 116.914\n" + " 13.828 116.898 14.316 c 116.898 20.797 l 113.852 20.797 l 131.617 21.016\n" + " m 130.766 21.016 129.996 20.891 129.312 20.645 c 128.637 20.391 128.055\n" + " 20.008 127.574 19.496 c 127.094 18.98 126.727 18.336 126.469 17.562 c 126.215\n" + " 16.781 126.086 15.871 126.086 14.832 c 126.086 13.703 126.234 12.754 126.535\n" + " 11.98 c 126.84 11.207 127.25 10.586 127.758 10.113 c 128.273 9.633 128.867\n" + " 9.285 129.539 9.074 c 130.211 8.863 130.914 8.758 131.66 8.758 c 132.594\n" + " 8.758 133.387 8.922 134.043 9.25 c 134.707 9.57 135.25 10.023 135.672 10.605\n" + " c 136.094 11.188 136.402 11.887 136.602 12.703 c 136.797 13.512 136.898\n" + " 14.406 136.898 15.391 c 136.898 15.477 l 129.316 15.477 l 129.316 15.973\n" + " 129.359 16.434 129.449 16.863 c 129.535 17.285 129.68 17.652 129.875 17.969\n" + " c 130.07 18.273 130.328 18.52 130.641 18.699 c 130.953 18.875 131.332 18.961\n" + " 131.777 18.961 c 132.316 18.961 132.758 18.848 133.098 18.621 c 133.441\n" + " 18.387 133.684 18.031 133.828 17.551 c 136.723 17.801 l 136.59 18.137 136.406\n" + " 18.492 136.164 18.871 c 135.93 19.25 135.617 19.598 135.223 19.922 c 134.828\n" + " 20.234 134.336 20.496 133.746 20.707 c 133.164 20.91 132.453 21.012 131.617\n" + " 21.012 c 131.617 10.688 m 131.305 10.688 131.008 10.742 130.73 10.852 c\n" + " 130.461 10.953 130.223 11.121 130.02 11.355 c 129.824 11.582 129.664 11.875\n" + " 129.539 12.242 c 129.414 12.605 129.348 13.043 129.332 13.555 c 133.922\n" + " 13.555 l 133.863 12.602 133.633 11.887 133.234 11.414 c 132.832 10.934 \n" + "132.293 10.691 131.617 10.691 c 146.895 20.797 m 146.895 14.164 l 146.895\n" + " 13.707 146.859 13.285 146.785 12.906 c 146.711 12.52 146.594 12.191 146.426\n" + " 11.922 c 146.258 11.645 146.039 11.43 145.77 11.277 c 145.5 11.125 145.172\n" + " 11.047 144.785 11.047 c 144.414 11.047 144.074 11.129 143.77 11.297 c 143.473\n" + " 11.457 143.211 11.691 142.992 11.996 c 142.773 12.293 142.602 12.656 142.48\n" + " 13.078 c 142.363 13.492 142.305 13.953 142.305 14.453 c 142.305 20.789 \n" + "l 139.234 20.789 l 139.234 11.609 l 139.234 11.355 139.23 11.094 139.223\n" + " 10.824 c 139.223 10.555 139.215 10.301 139.199 10.059 c 139.191 9.812 139.184\n" + " 9.594 139.176 9.402 c 139.168 9.207 139.156 9.059 139.145 8.965 c 142.074\n" + " 8.965 l 142.09 9.051 142.102 9.195 142.117 9.391 c 142.133 9.578 142.145\n" + " 9.793 142.16 10.023 c 142.176 10.258 142.188 10.488 142.191 10.723 c 142.207\n" + " 10.957 142.215 11.152 142.215 11.312 c 142.258 11.312 l 142.672 10.41 143.195\n" + " 9.754 143.82 9.344 c 144.445 8.938 145.195 8.73 146.059 8.73 c 146.773 \n" + "8.73 147.375 8.848 147.863 9.082 c 148.359 9.316 148.758 9.637 149.066 10.043\n" + " c 149.379 10.449 149.605 10.934 149.742 11.484 c 149.879 12.039 149.949\n" + " 12.637 149.949 13.277 c 149.949 20.785 l 146.891 20.785 l 155.938 20.98\n" + " m 155.035 20.98 154.34 20.738 153.852 20.25 c 153.363 19.754 153.121 19.008\n" + " 153.121 18.012 c 153.121 11.039 l 151.625 11.039 l 151.625 8.965 l 153.273\n" + " 8.965 l 154.234 6.188 l 156.156 6.188 l 156.156 8.965 l 158.395 8.965 l\n" + " 158.395 11.039 l 156.156 11.039 l 156.156 17.18 l 156.156 17.754 156.266\n" + " 18.18 156.484 18.457 c 156.703 18.727 157.043 18.859 157.5 18.859 c 157.688\n" + " 18.859 157.859 18.844 158.012 18.816 c 158.164 18.789 158.336 18.75 158.523\n" + " 18.707 c 158.523 20.609 l 158.145 20.734 157.742 20.824 157.32 20.883 c\n" + " 156.898 20.949 156.434 20.98 155.934 20.98 c B Q\n" + "Q q\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "1 1 1 RG 0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 167.109 26.086 l 168.738 26.086 170.109\n" + " 24.715 170.109 23.086 c 170.109 3.398 l 170.109 1.77 168.738 0.398 167.109\n" + " 0.398 c h\n" + "3.867 3.844 m 166.664 3.844 l 166.664 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m B Q\n" + "Q\n"; + +static Dict *getForCommentStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_for_public_release.h b/poppler-24.05.0/poppler/annot_stamp_for_public_release.h new file mode 100644 index 0000000000000000000000000000000000000000..ad0e3377cf25af49f579a3f9916381c15a0e76c5 --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_for_public_release.h @@ -0,0 +1,303 @@ +//======================================================================== +// +// annot_stamp_for_public_release.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_FOR_PUBLIC_RELEASE_H +#define ANNOT_STAMP_FOR_PUBLIC_RELEASE_H + +#include "Dict.h" +#include "Object.h" +#include "PDFDoc.h" + +static const double ANNOT_STAMP_FOR_PUBLIC_RELEASE_WIDTH = 222.258179; +static const double ANNOT_STAMP_FOR_PUBLIC_RELEASE_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_FOR_PUBLIC_RELEASE = "1 0 0 -1 0 26.484741 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 218.867 2.129 l 219.566 2.129 220.137 2.828 220.137 3.398\n" + " c 220.137 23.09 l 220.137 23.789 219.57 24.359 218.867 24.359 c 3.406 24.359\n" + " l 2.707 24.359 2.137 23.66 2.137 23.09 c 2.137 3.398 l 2.137 2.699 2.703\n" + " 2.129 3.406 2.129 c h\n" + "3.406 2.129 m f\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "1 1 1 RG 0.265748 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "18.043 7.926 m 18.043 12.691 l 25.922 12.691 l 25.922 15.184 l 18.043 15.18\n" + " l 18.043 20.828 l 14.82 20.828 l 14.82 5.434 l 26.172 5.434 l 26.172 7.926\n" + " l 18.043 7.926 l 39.797 14.906 m 39.797 15.809 39.668 16.637 39.414 17.387\n" + " c 39.168 18.137 38.793 18.785 38.289 19.332 c 37.785 19.871 37.16 20.293\n" + " 36.41 20.598 c 35.66 20.895 34.785 21.047 33.789 21.047 c 32.828 21.047\n" + " 31.98 20.898 31.242 20.598 c 30.508 20.301 29.887 19.879 29.383 19.34 c\n" + " 28.887 18.801 28.512 18.156 28.258 17.406 c 28.004 16.648 27.875 15.816\n" + " 27.875 14.902 c 27.875 14.02 27.996 13.207 28.234 12.465 c 28.48 11.715\n" + " 28.855 11.066 29.348 10.52 c 29.844 9.973 30.465 9.547 31.215 9.242 c 31.965\n" + " 8.938 32.844 8.785 33.848 8.785 c 34.91 8.785 35.816 8.938 36.57 9.242 \n" + "c 37.32 9.547 37.934 9.973 38.406 10.52 c 38.887 11.059 39.238 11.703 39.457\n" + " 12.453 c 39.684 13.195 39.797 14.012 39.797 14.902 c 36.586 14.902 m 36.586\n" + " 13.496 36.355 12.477 35.898 11.844 c 35.441 11.211 34.773 10.895 33.898\n" + " 10.895 c 32.996 10.895 32.305 11.215 31.824 11.855 c 31.344 12.496 31.102\n" + " 13.512 31.102 14.902 c 31.102 15.609 31.164 16.219 31.289 16.727 c 31.422\n" + " 17.238 31.602 17.656 31.836 17.984 c 32.07 18.312 32.348 18.555 32.676 \n" + "18.715 c 33.004 18.867 33.363 18.945 33.758 18.945 c 34.211 18.945 34.609\n" + " 18.867 34.961 18.715 c 35.316 18.555 35.617 18.312 35.855 17.984 c 36.098\n" + " 17.656 36.277 17.238 36.402 16.727 c 36.527 16.215 36.59 15.609 36.59 14.902\n" + " c 42.25 20.824 m 42.25 11.777 l 42.25 11.523 42.246 11.254 42.238 10.969\n" + " c 42.238 10.684 42.23 10.414 42.215 10.16 c 42.207 9.898 42.199 9.664 42.191\n" + " 9.461 c 42.184 9.25 42.172 9.098 42.16 9.004 c 45.09 9.004 l 45.105 9.09\n" + " 45.117 9.246 45.133 9.461 c 45.148 9.672 45.16 9.906 45.176 10.16 c 45.191\n" + " 10.414 45.203 10.672 45.207 10.926 c 45.223 11.172 45.23 11.375 45.23 11.527\n" + " c 45.273 11.527 l 45.426 11.098 45.578 10.715 45.73 10.379 c 45.883 10.035\n" + " 46.062 9.75 46.266 9.516 c 46.477 9.273 46.727 9.094 47.02 8.969 c 47.312\n" + " 8.836 47.672 8.773 48.102 8.773 c 48.285 8.773 48.461 8.793 48.637 8.828\n" + " c 48.82 8.855 48.957 8.895 49.051 8.938 c 49.051 11.504 l 48.855 11.461\n" + " 48.652 11.422 48.449 11.395 c 48.254 11.359 48.016 11.34 47.738 11.34 c\n" + " 46.973 11.34 46.375 11.648 45.945 12.27 c 45.523 12.891 45.312 13.805 45.312\n" + " 15.023 c 45.312 20.824 l 42.246 20.828 l 69.75 10.309 m 69.75 10.973 69.637\n" + " 11.613 69.41 12.23 c 69.191 12.844 68.852 13.387 68.395 13.859 c 67.938\n" + " 14.332 67.352 14.711 66.645 14.996 c 65.938 15.273 65.102 15.41 64.133 \n" + "15.41 c 60.309 15.41 l 60.309 20.828 l 57.086 20.828 l 57.086 5.434 l 64.004\n" + " 5.434 l 64.988 5.434 65.84 5.555 66.562 5.793 c 67.285 6.027 67.883 6.359\n" + " 68.355 6.789 c 68.828 7.219 69.18 7.734 69.406 8.328 c 69.641 8.926 69.758\n" + " 9.586 69.758 10.305 c 66.512 10.359 m 66.512 9.566 66.27 8.965 65.789 8.555\n" + " c 65.316 8.141 64.602 7.934 63.648 7.934 c 60.309 7.938 l 60.309 12.93 \n" + "l 63.73 12.93 l 64.211 12.93 64.621 12.867 64.965 12.742 c 65.316 12.617\n" + " 65.602 12.445 65.828 12.219 c 66.062 11.992 66.23 11.723 66.34 11.41 c \n" + "66.449 11.09 66.504 10.738 66.504 10.359 c 74.992 9.004 m 74.992 15.637 \n" + "l 74.992 16.094 75.027 16.52 75.102 16.902 c 75.176 17.281 75.293 17.609\n" + " 75.461 17.887 c 75.629 18.156 75.844 18.367 76.105 18.52 c 76.375 18.672\n" + " 76.703 18.75 77.09 18.75 c 77.461 18.75 77.797 18.668 78.094 18.508 c 78.398\n" + " 18.34 78.66 18.105 78.879 17.809 c 79.098 17.504 79.266 17.141 79.383 16.727\n" + " c 79.508 16.305 79.57 15.84 79.57 15.34 c 79.57 9.004 l 82.641 9.004 l \n" + "82.641 18.184 l 82.641 18.43 82.641 18.695 82.641 18.969 c 82.648 19.238\n" + " 82.656 19.496 82.664 19.746 c 82.68 19.988 82.691 20.203 82.695 20.402 \n" + "c 82.711 20.59 82.723 20.734 82.727 20.828 c 79.797 20.828 l 79.789 20.742\n" + " 79.773 20.602 79.754 20.414 c 79.738 20.219 79.727 20.004 79.711 19.77 \n" + "c 79.703 19.535 79.691 19.305 79.68 19.07 c 79.672 18.836 79.668 18.641 \n" + "79.668 18.48 c 79.613 18.48 l 79.207 19.375 78.684 20.027 78.051 20.438 \n" + "c 77.426 20.844 76.676 21.051 75.812 21.051 c 75.105 21.051 74.504 20.934\n" + " 74.008 20.699 c 73.512 20.465 73.109 20.148 72.797 19.75 c 72.492 19.344\n" + " 72.27 18.859 72.129 18.309 c 71.992 17.754 71.922 17.156 71.922 16.516 \n" + "c 71.922 9.008 l 74.992 9.008 l 96.965 14.875 m 96.965 15.77 96.875 16.598\n" + " 96.691 17.355 c 96.516 18.105 96.242 18.758 95.871 19.312 c 95.5 19.859\n" + " 95.027 20.285 94.449 20.59 c 93.883 20.895 93.207 21.047 92.43 21.047 c\n" + " 92.078 21.047 91.73 21.012 91.379 20.938 c 91.027 20.863 90.699 20.746 \n" + "90.383 20.578 c 90.07 20.41 89.781 20.191 89.52 19.922 c 89.258 19.652 89.031\n" + " 19.32 88.844 18.926 c 88.82 18.926 l 88.82 19.078 88.812 19.254 88.797 \n" + "19.449 c 88.789 19.645 88.777 19.84 88.766 20.027 c 88.75 20.211 88.734 \n" + "20.375 88.711 20.52 c 88.695 20.664 88.684 20.766 88.668 20.824 c 85.684\n" + " 20.824 l 85.707 20.57 85.723 20.207 85.738 19.742 c 85.762 19.27 85.77 \n" + "18.73 85.77 18.125 c 85.77 4.609 l 88.84 4.609 l 88.84 9.133 l 88.84 9.367\n" + " 88.836 9.594 88.828 9.82 c 88.828 10.039 88.824 10.242 88.816 10.434 c \n" + "88.809 10.652 88.801 10.859 88.793 11.055 c 88.836 11.055 l 89.207 10.238\n" + " 89.719 9.656 90.367 9.305 c 91.016 8.953 91.766 8.781 92.617 8.781 c 93.375\n" + " 8.781 94.027 8.934 94.574 9.238 c 95.121 9.535 95.57 9.961 95.918 10.504\n" + " c 96.273 11.043 96.539 11.684 96.703 12.426 c 96.871 13.168 96.953 13.98\n" + " 96.953 14.863 c 93.75 14.863 m 93.75 13.523 93.555 12.527 93.16 11.879 \n" + "c 92.766 11.23 92.16 10.906 91.336 10.906 c 91.023 10.906 90.715 10.969 \n" + "90.406 11.094 c 90.102 11.219 89.828 11.438 89.586 11.75 c 89.344 12.055\n" + " 89.152 12.473 89.008 12.996 c 88.863 13.512 88.789 14.168 88.789 14.965\n" + " c 88.789 15.738 88.863 16.379 89.008 16.887 c 89.152 17.398 89.344 17.805\n" + " 89.574 18.109 c 89.809 18.414 90.078 18.629 90.383 18.754 c 90.688 18.879\n" + " 91 18.941 91.312 18.941 c 92.094 18.941 92.691 18.621 93.117 17.98 c 93.539\n" + " 17.332 93.75 16.293 93.75 14.867 c 99.441 20.824 m 99.441 4.609 l 102.512\n" + " 4.609 l 102.512 20.824 l 99.441 20.824 l 105.648 6.871 m 105.648 4.609 \n" + "l 108.719 4.609 l 108.719 6.871 l 105.648 6.871 l 105.648 20.824 m 105.648\n" + " 9 l 108.719 9 l 108.719 20.824 l 105.648 20.824 l 116.781 21.043 m 115.84\n" + " 21.043 115.02 20.898 114.312 20.605 c 113.613 20.312 113.031 19.902 112.562\n" + " 19.371 c 112.098 18.84 111.746 18.203 111.512 17.457 c 111.277 16.707 111.16\n" + " 15.879 111.16 14.977 c 111.16 13.992 111.289 13.117 111.543 12.355 c 111.797\n" + " 11.582 112.164 10.934 112.648 10.41 c 113.129 9.879 113.719 9.473 114.418\n" + " 9.199 c 115.125 8.922 115.926 8.785 116.82 8.785 c 117.586 8.785 118.262\n" + " 8.887 118.852 9.09 c 119.449 9.293 119.961 9.574 120.391 9.93 c 120.82 \n" + "10.281 121.168 10.695 121.43 11.176 c 121.699 11.656 121.887 12.172 121.988\n" + " 12.727 c 118.895 12.879 l 118.809 12.273 118.59 11.793 118.238 11.438 c\n" + " 117.887 11.074 117.395 10.891 116.754 10.891 c 115.93 10.891 115.328 11.23\n" + " 114.949 11.906 c 114.57 12.582 114.383 13.566 114.383 14.855 c 114.383 \n" + "17.578 115.188 18.941 116.797 18.941 c 117.379 18.941 117.867 18.758 118.262\n" + " 18.395 c 118.656 18.023 118.898 17.473 118.992 16.746 c 122.074 16.887 \n" + "l 122 17.434 121.832 17.957 121.57 18.461 c 121.316 18.957 120.965 19.398\n" + " 120.52 19.781 c 120.082 20.16 119.551 20.465 118.926 20.699 c 118.301 20.926\n" + " 117.582 21.039 116.773 21.039 c 141.02 20.82 m 137.445 14.973 l 133.664\n" + " 14.973 l 133.664 20.82 l 130.441 20.82 l 130.469 5.434 l 138.16 5.434 l\n" + " 139.121 5.434 139.961 5.543 140.672 5.762 c 141.395 5.973 141.992 6.277\n" + " 142.477 6.68 c 142.957 7.074 143.312 7.555 143.547 8.121 c 143.789 8.684\n" + " 143.906 9.316 143.906 10.023 c 143.906 10.598 143.82 11.129 143.645 11.609\n" + " c 143.477 12.082 143.238 12.504 142.934 12.875 c 142.637 13.246 142.277\n" + " 13.559 141.863 13.816 c 141.449 14.062 140.996 14.246 140.508 14.363 c \n" + "144.672 20.832 l 141.043 20.832 l 140.66 10.156 m 140.66 9.406 140.414 8.848\n" + " 139.918 8.484 c 139.43 8.121 138.73 7.938 137.82 7.938 c 133.691 7.938 \n" + "l 133.691 12.484 l 137.91 12.484 l 138.391 12.484 138.801 12.43 139.145 \n" + "12.32 c 139.496 12.203 139.777 12.043 139.996 11.84 c 140.223 11.629 140.391\n" + " 11.383 140.5 11.098 c 140.609 10.812 140.664 10.5 140.664 10.156 c 151.547\n" + " 21.051 m 150.695 21.051 149.926 20.926 149.242 20.68 c 148.566 20.426 147.984\n" + " 20.043 147.504 19.531 c 147.023 19.016 146.656 18.371 146.398 17.598 c \n" + "146.145 16.816 146.016 15.906 146.016 14.867 c 146.016 13.738 146.164 12.789\n" + " 146.465 12.016 c 146.77 11.242 147.18 10.621 147.688 10.148 c 148.203 9.668\n" + " 148.797 9.32 149.469 9.109 c 150.141 8.898 150.844 8.793 151.59 8.793 c\n" + " 152.523 8.793 153.316 8.957 153.973 9.285 c 154.637 9.605 155.18 10.059\n" + " 155.602 10.641 c 156.023 11.223 156.332 11.922 156.531 12.738 c 156.727\n" + " 13.547 156.828 14.441 156.828 15.426 c 156.828 15.512 l 149.246 15.512 \n" + "l 149.246 16.008 149.289 16.469 149.379 16.898 c 149.465 17.32 149.609 17.688\n" + " 149.805 18.004 c 150 18.309 150.258 18.555 150.57 18.734 c 150.883 18.91\n" + " 151.262 18.996 151.707 18.996 c 152.246 18.996 152.688 18.883 153.027 18.656\n" + " c 153.371 18.422 153.613 18.066 153.758 17.586 c 156.652 17.836 l 156.52\n" + " 18.172 156.336 18.527 156.094 18.906 c 155.859 19.285 155.547 19.633 155.152\n" + " 19.957 c 154.758 20.27 154.266 20.531 153.676 20.742 c 153.094 20.945 152.383\n" + " 21.047 151.547 21.047 c 151.547 10.723 m 151.234 10.723 150.938 10.777 \n" + "150.66 10.887 c 150.391 10.988 150.152 11.156 149.949 11.391 c 149.754 11.617\n" + " 149.594 11.91 149.469 12.277 c 149.344 12.641 149.277 13.078 149.262 13.59\n" + " c 153.852 13.59 l 153.793 12.637 153.562 11.922 153.164 11.449 c 152.762\n" + " 10.969 152.223 10.727 151.547 10.727 c 159.164 20.832 m 159.164 4.617 l\n" + " 162.234 4.617 l 162.234 20.832 l 159.164 20.832 l 170.211 21.051 m 169.359\n" + " 21.051 168.59 20.926 167.906 20.68 c 167.23 20.426 166.648 20.043 166.168\n" + " 19.531 c 165.688 19.016 165.32 18.371 165.062 17.598 c 164.809 16.816 164.68\n" + " 15.906 164.68 14.867 c 164.68 13.738 164.828 12.789 165.129 12.016 c 165.434\n" + " 11.242 165.844 10.621 166.352 10.148 c 166.867 9.668 167.461 9.32 168.133\n" + " 9.109 c 168.805 8.898 169.508 8.793 170.254 8.793 c 171.188 8.793 171.98\n" + " 8.957 172.637 9.285 c 173.301 9.605 173.844 10.059 174.266 10.641 c 174.688\n" + " 11.223 174.996 11.922 175.195 12.738 c 175.391 13.547 175.492 14.441 175.492\n" + " 15.426 c 175.492 15.512 l 167.91 15.512 l 167.91 16.008 167.953 16.469 \n" + "168.043 16.898 c 168.129 17.32 168.273 17.688 168.469 18.004 c 168.664 18.309\n" + " 168.922 18.555 169.234 18.734 c 169.547 18.91 169.926 18.996 170.371 18.996\n" + " c 170.91 18.996 171.352 18.883 171.691 18.656 c 172.035 18.422 172.277 \n" + "18.066 172.422 17.586 c 175.316 17.836 l 175.184 18.172 175 18.527 174.758\n" + " 18.906 c 174.523 19.285 174.211 19.633 173.816 19.957 c 173.422 20.27 172.93\n" + " 20.531 172.34 20.742 c 171.758 20.945 171.047 21.047 170.211 21.047 c 170.211\n" + " 10.723 m 169.898 10.723 169.602 10.777 169.324 10.887 c 169.055 10.988 \n" + "168.816 11.156 168.613 11.391 c 168.418 11.617 168.258 11.91 168.133 12.277\n" + " c 168.008 12.641 167.941 13.078 167.926 13.59 c 172.516 13.59 l 172.457\n" + " 12.637 172.227 11.922 171.828 11.449 c 171.426 10.969 170.887 10.727 170.211\n" + " 10.727 c 180.559 21.051 m 179.992 21.051 179.48 20.973 179.027 20.82 c \n" + "178.582 20.66 178.203 20.43 177.891 20.133 c 177.578 19.828 177.336 19.453\n" + " 177.168 19.008 c 177 18.562 176.918 18.059 176.918 17.488 c 176.918 16.789\n" + " 177.039 16.203 177.277 15.73 c 177.523 15.25 177.859 14.863 178.281 14.57\n" + " c 178.703 14.273 179.199 14.059 179.766 13.926 c 180.332 13.789 180.938\n" + " 13.715 181.578 13.707 c 184.125 13.664 l 184.125 13.062 l 184.125 12.633\n" + " 184.086 12.277 184.004 11.992 c 183.93 11.699 183.82 11.465 183.676 11.281\n" + " c 183.531 11.098 183.348 10.973 183.129 10.898 c 182.918 10.816 182.672\n" + " 10.777 182.398 10.777 c 182.145 10.777 181.914 10.805 181.711 10.855 c \n" + "181.516 10.906 181.344 10.996 181.199 11.129 c 181.055 11.254 180.934 11.426\n" + " 180.84 11.641 c 180.754 11.852 180.691 12.121 180.652 12.449 c 177.449 \n" + "12.297 l 177.535 11.781 177.695 11.309 177.93 10.887 c 178.164 10.457 178.484\n" + " 10.086 178.891 9.773 c 179.305 9.461 179.812 9.219 180.41 9.051 c 181.016\n" + " 8.875 181.723 8.789 182.531 8.789 c 183.266 8.789 183.922 8.879 184.5 9.062\n" + " c 185.074 9.246 185.562 9.52 185.965 9.883 c 186.367 10.238 186.672 10.68\n" + " 186.883 11.203 c 187.094 11.727 187.199 12.336 187.199 13.027 c 187.199\n" + " 17.332 l 187.199 17.609 187.211 17.855 187.23 18.074 c 187.258 18.293 187.309\n" + " 18.477 187.371 18.633 c 187.445 18.777 187.543 18.891 187.668 18.973 c \n" + "187.801 19.047 187.965 19.082 188.172 19.082 c 188.406 19.082 188.629 19.059\n" + " 188.848 19.016 c 188.848 20.676 l 188.664 20.719 188.5 20.758 188.355 20.797\n" + " c 188.211 20.832 188.062 20.863 187.918 20.883 c 187.773 20.906 187.617\n" + " 20.922 187.449 20.938 c 187.289 20.953 187.098 20.961 186.883 20.961 c \n" + "186.109 20.961 185.539 20.773 185.168 20.395 c 184.805 20.016 184.586 19.457\n" + " 184.512 18.723 c 184.445 18.723 l 184.039 19.457 183.512 20.031 182.871\n" + " 20.438 c 182.238 20.844 181.465 21.051 180.555 21.051 c 184.129 15.359 \n" + "m 182.555 15.383 l 182.227 15.398 181.914 15.426 181.613 15.469 c 181.32\n" + " 15.504 181.062 15.59 180.836 15.719 c 180.617 15.844 180.441 16.023 180.312\n" + " 16.266 c 180.18 16.508 180.117 16.832 180.117 17.25 c 180.117 17.812 180.246\n" + " 18.23 180.5 18.508 c 180.762 18.777 181.109 18.91 181.539 18.91 c 181.934\n" + " 18.91 182.289 18.828 182.609 18.66 c 182.93 18.492 183.199 18.273 183.418\n" + " 18.004 c 183.645 17.727 183.82 17.41 183.941 17.055 c 184.066 16.699 184.129\n" + " 16.332 184.129 15.961 c 184.129 15.359 l 200.246 17.379 m 200.246 17.945\n" + " 200.125 18.457 199.887 18.91 c 199.652 19.363 199.312 19.746 198.859 20.07\n" + " c 198.406 20.383 197.855 20.629 197.199 20.801 c 196.543 20.969 195.797\n" + " 21.051 194.961 21.051 c 194.211 21.051 193.531 20.996 192.93 20.887 c 192.324\n" + " 20.777 191.793 20.598 191.336 20.352 c 190.883 20.098 190.504 19.77 190.199\n" + " 19.367 c 189.895 18.965 189.664 18.473 189.512 17.883 c 192.211 17.48 l\n" + " 192.297 17.809 192.418 18.074 192.57 18.277 c 192.723 18.48 192.914 18.637\n" + " 193.137 18.746 c 193.363 18.855 193.625 18.93 193.922 18.965 c 194.227 \n" + "19 194.574 19.02 194.961 19.02 c 195.312 19.02 195.633 19 195.934 18.965\n" + " c 196.238 18.922 196.5 18.852 196.719 18.758 c 196.945 18.656 197.121 18.516\n" + " 197.242 18.344 c 197.367 18.16 197.43 17.938 197.43 17.668 c 197.43 17.363\n" + " 197.34 17.121 197.156 16.945 c 196.98 16.762 196.738 16.617 196.426 16.508\n" + " c 196.121 16.391 195.754 16.293 195.332 16.211 c 194.918 16.125 194.473\n" + " 16.023 194 15.914 c 193.504 15.805 193.016 15.672 192.535 15.52 c 192.055\n" + " 15.367 191.625 15.16 191.246 14.898 c 190.867 14.637 190.562 14.305 190.328\n" + " 13.902 c 190.094 13.496 189.977 12.98 189.977 12.363 c 189.977 11.801 190.086\n" + " 11.305 190.305 10.867 c 190.523 10.422 190.844 10.047 191.266 9.742 c 191.688\n" + " 9.43 192.207 9.191 192.828 9.031 c 193.453 8.863 194.172 8.781 194.98 8.781\n" + " c 195.621 8.781 196.219 8.844 196.773 8.969 c 197.328 9.086 197.824 9.273\n" + " 198.258 9.535 c 198.695 9.789 199.059 10.117 199.352 10.52 c 199.648 10.922\n" + " 199.859 11.406 199.973 11.973 c 197.25 12.258 l 197.199 11.973 197.109 \n" + "11.742 196.977 11.559 c 196.844 11.371 196.68 11.219 196.484 11.109 c 196.297\n" + " 11 196.074 10.926 195.816 10.891 c 195.562 10.848 195.281 10.824 194.977\n" + " 10.824 c 194.25 10.824 193.703 10.918 193.336 11.109 c 192.973 11.293 192.789\n" + " 11.602 192.789 12.039 c 192.789 12.309 192.863 12.523 193.008 12.684 c \n" + "193.16 12.844 193.371 12.98 193.641 13.086 c 193.918 13.188 194.242 13.277\n" + " 194.613 13.359 c 194.992 13.434 195.402 13.523 195.848 13.633 c 196.395\n" + " 13.75 196.93 13.887 197.453 14.047 c 197.984 14.199 198.453 14.414 198.863\n" + " 14.691 c 199.277 14.961 199.609 15.312 199.859 15.742 c 200.113 16.172 \n" + "200.242 16.719 200.242 17.383 c 207.574 21.055 m 206.723 21.055 205.953 \n" + "20.93 205.27 20.684 c 204.594 20.43 204.012 20.047 203.531 19.535 c 203.051\n" + " 19.02 202.684 18.375 202.426 17.602 c 202.172 16.82 202.043 15.91 202.043\n" + " 14.871 c 202.043 13.742 202.191 12.793 202.492 12.02 c 202.797 11.246 203.207\n" + " 10.625 203.715 10.152 c 204.23 9.672 204.824 9.324 205.496 9.113 c 206.168\n" + " 8.902 206.871 8.797 207.617 8.797 c 208.551 8.797 209.344 8.961 210 9.289\n" + " c 210.664 9.609 211.207 10.062 211.629 10.645 c 212.051 11.227 212.359 \n" + "11.926 212.559 12.742 c 212.754 13.551 212.855 14.445 212.855 15.43 c 212.855\n" + " 15.516 l 205.273 15.516 l 205.273 16.012 205.316 16.473 205.406 16.902 \n" + "c 205.492 17.324 205.637 17.691 205.832 18.008 c 206.027 18.312 206.285 \n" + "18.559 206.598 18.738 c 206.91 18.914 207.289 19 207.734 19 c 208.273 19\n" + " 208.715 18.887 209.055 18.66 c 209.398 18.426 209.641 18.07 209.785 17.59\n" + " c 212.68 17.84 l 212.547 18.176 212.363 18.531 212.121 18.91 c 211.887 \n" + "19.289 211.574 19.637 211.18 19.961 c 210.785 20.273 210.293 20.535 209.703\n" + " 20.746 c 209.121 20.949 208.41 21.051 207.574 21.051 c 207.574 10.727 m\n" + " 207.262 10.727 206.965 10.781 206.688 10.891 c 206.418 10.992 206.18 11.16\n" + " 205.977 11.395 c 205.781 11.621 205.621 11.914 205.496 12.281 c 205.371\n" + " 12.645 205.305 13.082 205.289 13.594 c 209.879 13.594 l 209.82 12.641 209.59\n" + " 11.926 209.191 11.453 c 208.789 10.973 208.25 10.73 207.574 10.73 c B Q\n" + "Q q\n" + "0 0 222 26.484 re W n\n" + "0 0.298039 0.431373 rg /a1 gs\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 218.859 26.086 l 220.488 26.086 221.859\n" + " 24.715 221.859 23.086 c 221.859 3.398 l 221.859 1.77 220.488 0.398 218.859\n" + " 0.398 c h\n" + "3.867 3.844 m 218.414 3.844 l 218.414 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m f\n" + "Q q\n" + "1 1 1 RG /a1 gs\n" + "0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 218.859 26.086 l 220.488 26.086 221.859\n" + " 24.715 221.859 23.086 c 221.859 3.398 l 221.859 1.77 220.488 0.398 218.859\n" + " 0.398 c h\n" + "3.867 3.844 m 218.414 3.844 l 218.414 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m S Q\n" + "Q\n"; + +static Dict *getForPublicReleaseStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_not_approved.h b/poppler-24.05.0/poppler/annot_stamp_not_approved.h new file mode 100644 index 0000000000000000000000000000000000000000..ab9fd9b4c17187211ca46544a135afcc273431c3 --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_not_approved.h @@ -0,0 +1,398 @@ +//======================================================================== +// +// annot_stamp_not_approved.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_NOT_APPROVED_H +#define ANNOT_STAMP_NOT_APPROVED_H + +#include "Dict.h" +#include "Object.h" +#include "PDFDoc.h" + +static const double ANNOT_STAMP_NOT_APPROVED_WIDTH = 170.508179; +static const double ANNOT_STAMP_NOT_APPROVED_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_NOT_APPROVED = "1 0 0 -1 0 26.484741 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 167.117 2.129 l 167.816 2.129 168.387 2.828 168.387 3.398\n" + " c 168.387 23.09 l 168.387 23.789 167.82 24.359 167.117 24.359 c 3.406 24.359\n" + " l 2.707 24.359 2.137 23.66 2.137 23.09 c 2.137 3.398 l 2.137 2.699 2.703\n" + " 2.129 3.406 2.129 c h\n" + "3.406 2.129 m f\n" + "0.74902 0 0 rg /a1 gs\n" + "24.195 20.828 m 17.484 8.973 l 17.52 9.293 17.555 9.613 17.582 9.934 c \n" + "17.609 10.211 17.633 10.508 17.648 10.828 c 17.672 11.148 17.68 11.453 17.68\n" + " 11.746 c 17.68 20.828 l 14.82 20.828 l 14.82 5.434 l 18.504 5.434 l 25.312\n" + " 17.387 l 25.277 17.082 25.242 16.762 25.215 16.426 c 25.188 16.141 25.16\n" + " 15.82 25.137 15.465 c 25.121 15.109 25.113 14.746 25.113 14.383 c 25.113\n" + " 5.434 l 27.977 5.434 l 27.977 20.828 l 24.195 20.828 l 42.289 14.906 m \n" + "42.289 15.809 42.16 16.637 41.906 17.387 c 41.66 18.137 41.285 18.785 40.781\n" + " 19.332 c 40.277 19.871 39.652 20.293 38.902 20.598 c 38.152 20.895 37.277\n" + " 21.047 36.281 21.047 c 35.32 21.047 34.473 20.898 33.734 20.598 c 33 20.301\n" + " 32.379 19.879 31.875 19.34 c 31.379 18.801 31.004 18.156 30.75 17.406 c\n" + " 30.496 16.648 30.367 15.816 30.367 14.902 c 30.367 14.02 30.488 13.207 \n" + "30.727 12.465 c 30.973 11.715 31.348 11.066 31.84 10.52 c 32.336 9.973 32.957\n" + " 9.547 33.707 9.242 c 34.457 8.938 35.336 8.785 36.34 8.785 c 37.402 8.785\n" + " 38.309 8.938 39.062 9.242 c 39.812 9.547 40.426 9.973 40.898 10.52 c 41.379\n" + " 11.059 41.73 11.703 41.949 12.453 c 42.176 13.195 42.289 14.012 42.289 \n" + "14.902 c 39.078 14.902 m 39.078 13.496 38.848 12.477 38.391 11.844 c 37.934\n" + " 11.211 37.266 10.895 36.391 10.895 c 35.488 10.895 34.797 11.215 34.316\n" + " 11.855 c 33.836 12.496 33.594 13.512 33.594 14.902 c 33.594 15.609 33.656\n" + " 16.219 33.781 16.727 c 33.914 17.238 34.094 17.656 34.328 17.984 c 34.562\n" + " 18.312 34.84 18.555 35.168 18.715 c 35.496 18.867 35.855 18.945 36.25 18.945\n" + " c 36.703 18.945 37.102 18.867 37.453 18.715 c 37.809 18.555 38.109 18.312\n" + " 38.348 17.984 c 38.59 17.656 38.77 17.238 38.895 16.727 c 39.02 16.215 \n" + "39.082 15.609 39.082 14.902 c 47.77 21.02 m 46.867 21.02 46.172 20.777 45.684\n" + " 20.289 c 45.195 19.793 44.953 19.047 44.953 18.051 c 44.953 11.078 l 43.449\n" + " 11.082 l 43.449 9.008 l 45.098 9.008 l 46.059 6.23 l 47.98 6.23 l 47.98\n" + " 9.008 l 50.219 9.008 l 50.219 11.082 l 47.98 11.082 l 47.98 17.223 l 47.98\n" + " 17.797 48.09 18.223 48.309 18.5 c 48.527 18.77 48.867 18.906 49.324 18.902\n" + " c 49.512 18.902 49.684 18.887 49.836 18.859 c 49.988 18.832 50.16 18.793\n" + " 50.348 18.75 c 50.348 20.652 l 49.969 20.777 49.566 20.867 49.145 20.926\n" + " c 48.723 20.992 48.258 21.023 47.758 21.023 c 68.398 20.828 m 67.031 16.895\n" + " l 61.164 16.895 l 59.797 20.828 l 56.574 20.828 l 62.191 5.434 l 65.992\n" + " 5.434 l 71.586 20.828 l 68.395 20.828 l 64.789 10.043 m 64.703 9.789 64.613\n" + " 9.531 64.527 9.277 c 64.445 9.016 64.375 8.777 64.309 8.566 c 64.25 8.348\n" + " 64.199 8.168 64.156 8.031 c 64.121 7.895 64.098 7.816 64.09 7.801 c 64.082\n" + " 7.824 64.062 7.902 64.023 8.043 c 63.988 8.18 63.938 8.355 63.871 8.566\n" + " c 63.812 8.777 63.738 9.016 63.652 9.277 c 63.57 9.531 63.488 9.789 63.402\n" + " 10.043 c 61.883 14.469 l 66.309 14.469 l 64.789 10.043 l 84.938 14.863 \n" + "m 84.938 15.758 84.848 16.586 84.664 17.344 c 84.488 18.102 84.215 18.754\n" + " 83.844 19.301 c 83.473 19.848 83 20.277 82.422 20.59 c 81.855 20.895 81.18\n" + " 21.047 80.402 21.047 c 80.051 21.047 79.703 21.012 79.352 20.938 c 79.008\n" + " 20.863 78.68 20.75 78.367 20.586 c 78.055 20.418 77.762 20.203 77.492 19.941\n" + " c 77.23 19.672 77.004 19.34 76.816 18.945 c 76.75 18.945 l 76.758 18.98\n" + " 76.766 19.074 76.773 19.219 c 76.781 19.363 76.789 19.535 76.797 19.73 \n" + "c 76.805 19.918 76.809 20.125 76.809 20.344 c 76.816 20.555 76.82 20.75 \n" + "76.82 20.934 c 76.82 25.469 l 73.75 25.469 l 73.75 11.723 l 73.75 11.117\n" + " 73.738 10.578 73.719 10.105 c 73.703 9.633 73.688 9.266 73.664 9 c 76.648\n" + " 9 l 76.664 9.051 76.676 9.148 76.691 9.297 c 76.715 9.441 76.727 9.609 \n" + "76.734 9.801 c 76.75 9.988 76.762 10.188 76.766 10.391 c 76.773 10.594 76.777\n" + " 10.773 76.777 10.926 c 76.82 10.926 l 77.191 10.145 77.703 9.59 78.352 \n" + "9.254 c 79 8.918 79.75 8.75 80.602 8.75 c 81.352 8.75 82 8.902 82.547 9.207\n" + " c 83.094 9.512 83.543 9.934 83.891 10.473 c 84.246 11.012 84.512 11.656\n" + " 84.676 12.406 c 84.852 13.148 84.938 13.965 84.938 14.855 c 81.734 14.855\n" + " m 81.734 13.508 81.531 12.512 81.121 11.863 c 80.715 11.207 80.105 10.879\n" + " 79.297 10.879 c 78.992 10.879 78.684 10.945 78.379 11.074 c 78.082 11.199\n" + " 77.812 11.418 77.57 11.73 c 77.336 12.035 77.145 12.453 76.992 12.977 c\n" + " 76.848 13.492 76.773 14.148 76.773 14.945 c 76.773 15.719 76.848 16.363\n" + " 76.992 16.879 c 77.137 17.391 77.328 17.797 77.559 18.102 c 77.801 18.406\n" + " 78.07 18.625 78.367 18.758 c 78.664 18.883 78.969 18.945 79.273 18.945 \n" + "c 79.668 18.945 80.016 18.867 80.324 18.715 c 80.629 18.555 80.887 18.312\n" + " 81.09 17.984 c 81.301 17.648 81.461 17.223 81.57 16.707 c 81.68 16.191 \n" + "81.734 15.574 81.734 14.859 c 98.617 14.859 m 98.617 15.754 98.527 16.582\n" + " 98.344 17.34 c 98.168 18.098 97.895 18.75 97.523 19.297 c 97.152 19.844\n" + " 96.68 20.273 96.102 20.586 c 95.535 20.891 94.859 21.043 94.082 21.043 \n" + "c 93.73 21.043 93.383 21.008 93.031 20.934 c 92.688 20.859 92.359 20.746\n" + " 92.047 20.582 c 91.734 20.414 91.441 20.199 91.172 19.938 c 90.91 19.668\n" + " 90.684 19.336 90.496 18.941 c 90.43 18.941 l 90.438 18.977 90.445 19.07\n" + " 90.453 19.215 c 90.461 19.359 90.469 19.531 90.477 19.727 c 90.484 19.914\n" + " 90.488 20.121 90.488 20.34 c 90.496 20.551 90.5 20.746 90.5 20.93 c 90.5\n" + " 25.465 l 87.43 25.465 l 87.43 11.719 l 87.43 11.113 87.418 10.574 87.398\n" + " 10.102 c 87.383 9.629 87.367 9.262 87.344 8.996 c 90.328 8.996 l 90.344\n" + " 9.047 90.355 9.145 90.371 9.293 c 90.395 9.438 90.406 9.605 90.414 9.797\n" + " c 90.43 9.984 90.441 10.184 90.445 10.387 c 90.453 10.59 90.457 10.77 90.457\n" + " 10.922 c 90.5 10.922 l 90.871 10.141 91.383 9.586 92.031 9.25 c 92.68 8.914\n" + " 93.43 8.746 94.281 8.746 c 95.031 8.746 95.68 8.898 96.227 9.203 c 96.773\n" + " 9.508 97.223 9.93 97.57 10.469 c 97.926 11.008 98.191 11.652 98.355 12.402\n" + " c 98.531 13.145 98.617 13.961 98.617 14.852 c 95.414 14.852 m 95.414 13.504\n" + " 95.211 12.508 94.801 11.859 c 94.395 11.203 93.785 10.875 92.977 10.875\n" + " c 92.672 10.875 92.363 10.941 92.059 11.07 c 91.762 11.195 91.492 11.414\n" + " 91.25 11.727 c 91.016 12.031 90.824 12.449 90.672 12.973 c 90.527 13.488\n" + " 90.453 14.145 90.453 14.941 c 90.453 15.715 90.527 16.359 90.672 16.875\n" + " c 90.816 17.387 91.008 17.793 91.238 18.098 c 91.48 18.402 91.75 18.621\n" + " 92.047 18.754 c 92.344 18.879 92.648 18.941 92.953 18.941 c 93.348 18.941\n" + " 93.695 18.863 94.004 18.711 c 94.309 18.551 94.566 18.309 94.77 17.98 c\n" + " 94.98 17.645 95.141 17.219 95.25 16.703 c 95.359 16.188 95.414 15.57 95.414\n" + " 14.855 c 101.105 20.82 m 101.105 11.773 l 101.105 11.52 101.102 11.25 101.094\n" + " 10.965 c 101.094 10.68 101.086 10.41 101.07 10.156 c 101.062 9.895 101.055\n" + " 9.66 101.047 9.457 c 101.039 9.246 101.027 9.094 101.016 9 c 103.945 9 \n" + "l 103.961 9.086 103.973 9.242 103.988 9.457 c 104.004 9.668 104.016 9.902\n" + " 104.031 10.156 c 104.047 10.41 104.059 10.668 104.062 10.922 c 104.078 \n" + "11.168 104.086 11.371 104.086 11.523 c 104.129 11.523 l 104.281 11.094 104.434\n" + " 10.711 104.586 10.375 c 104.738 10.031 104.918 9.746 105.121 9.512 c 105.332\n" + " 9.27 105.582 9.09 105.875 8.965 c 106.168 8.832 106.527 8.77 106.957 8.77\n" + " c 107.141 8.77 107.316 8.789 107.492 8.824 c 107.676 8.852 107.812 8.891\n" + " 107.906 8.934 c 107.906 11.5 l 107.711 11.457 107.508 11.418 107.305 11.391\n" + " c 107.109 11.355 106.871 11.336 106.594 11.336 c 105.828 11.336 105.23 \n" + "11.645 104.801 12.266 c 104.379 12.887 104.168 13.801 104.168 15.02 c 104.168\n" + " 20.82 l 101.098 20.82 l 121.027 14.898 m 121.027 15.801 120.898 16.629 \n" + "120.645 17.379 c 120.398 18.129 120.023 18.777 119.52 19.324 c 119.016 19.863\n" + " 118.391 20.285 117.641 20.59 c 116.891 20.887 116.016 21.039 115.02 21.039\n" + " c 114.059 21.039 113.211 20.891 112.473 20.59 c 111.738 20.293 111.117 \n" + "19.871 110.613 19.332 c 110.117 18.793 109.742 18.148 109.488 17.398 c 109.234\n" + " 16.641 109.105 15.809 109.105 14.895 c 109.105 14.012 109.227 13.199 109.465\n" + " 12.457 c 109.711 11.707 110.086 11.059 110.578 10.512 c 111.074 9.965 111.695\n" + " 9.539 112.445 9.234 c 113.195 8.93 114.074 8.777 115.078 8.777 c 116.141\n" + " 8.777 117.047 8.93 117.801 9.234 c 118.551 9.539 119.164 9.965 119.637 \n" + "10.512 c 120.117 11.051 120.469 11.695 120.688 12.445 c 120.914 13.188 121.027\n" + " 14.004 121.027 14.895 c 117.816 14.895 m 117.816 13.488 117.586 12.469 \n" + "117.129 11.836 c 116.672 11.203 116.004 10.887 115.129 10.887 c 114.227 \n" + "10.887 113.535 11.207 113.055 11.848 c 112.574 12.488 112.332 13.504 112.332\n" + " 14.895 c 112.332 15.602 112.395 16.211 112.52 16.719 c 112.652 17.23 112.832\n" + " 17.648 113.066 17.977 c 113.301 18.305 113.578 18.547 113.906 18.707 c \n" + "114.234 18.859 114.594 18.938 114.988 18.938 c 115.441 18.938 115.84 18.859\n" + " 116.191 18.707 c 116.547 18.547 116.848 18.305 117.086 17.977 c 117.328\n" + " 17.648 117.508 17.23 117.633 16.719 c 117.758 16.207 117.82 15.602 117.82\n" + " 14.895 c 129.906 20.816 m 126.234 20.816 l 122.004 8.992 l 125.25 8.992\n" + " l 127.316 15.602 l 127.383 15.82 127.449 16.055 127.523 16.301 c 127.598\n" + " 16.543 127.664 16.781 127.73 17.023 c 127.797 17.266 127.859 17.496 127.918\n" + " 17.723 c 127.984 17.949 128.043 18.152 128.094 18.336 c 128.137 18.16 128.191\n" + " 17.965 128.258 17.746 c 128.324 17.52 128.391 17.289 128.453 17.047 c 128.527\n" + " 16.805 128.598 16.566 128.672 16.324 c 128.754 16.082 128.828 15.855 128.902\n" + " 15.637 c 131.055 8.992 l 134.266 8.992 l 129.906 20.816 l 140.777 21.035\n" + " m 139.926 21.035 139.156 20.91 138.473 20.664 c 137.797 20.41 137.215 20.027\n" + " 136.734 19.516 c 136.254 19 135.887 18.355 135.629 17.582 c 135.375 16.801\n" + " 135.246 15.891 135.246 14.852 c 135.246 13.723 135.395 12.773 135.695 12\n" + " c 136 11.227 136.41 10.605 136.918 10.133 c 137.434 9.652 138.027 9.305\n" + " 138.699 9.094 c 139.371 8.883 140.074 8.777 140.82 8.777 c 141.754 8.777\n" + " 142.547 8.941 143.203 9.27 c 143.867 9.59 144.41 10.043 144.832 10.625 \n" + "c 145.254 11.207 145.562 11.906 145.762 12.723 c 145.957 13.531 146.059 \n" + "14.426 146.059 15.41 c 146.059 15.496 l 138.477 15.496 l 138.477 15.992 \n" + "138.52 16.453 138.609 16.883 c 138.695 17.305 138.84 17.672 139.035 17.988\n" + " c 139.23 18.293 139.488 18.539 139.801 18.719 c 140.113 18.895 140.492 \n" + "18.98 140.938 18.98 c 141.477 18.98 141.918 18.867 142.258 18.641 c 142.602\n" + " 18.406 142.844 18.051 142.988 17.57 c 145.883 17.82 l 145.75 18.156 145.566\n" + " 18.512 145.324 18.891 c 145.09 19.27 144.777 19.617 144.383 19.941 c 143.988\n" + " 20.254 143.496 20.516 142.906 20.727 c 142.324 20.93 141.613 21.031 140.777\n" + " 21.031 c 140.777 10.707 m 140.465 10.707 140.168 10.762 139.891 10.871 \n" + "c 139.621 10.973 139.383 11.141 139.18 11.375 c 138.984 11.602 138.824 11.895\n" + " 138.699 12.262 c 138.574 12.625 138.508 13.062 138.492 13.574 c 143.082\n" + " 13.574 l 143.023 12.621 142.793 11.906 142.395 11.434 c 141.992 10.953 \n" + "141.453 10.711 140.777 10.711 c 156.055 20.816 m 156.039 20.758 156.023 \n" + "20.656 156 20.512 c 155.984 20.359 155.969 20.188 155.945 20 c 155.93 19.812\n" + " 155.918 19.617 155.902 19.422 c 155.895 19.227 155.891 19.051 155.891 18.898\n" + " c 155.848 18.898 l 155.492 19.664 154.992 20.215 154.352 20.547 c 153.719\n" + " 20.875 152.957 21.039 152.066 21.039 c 151.324 21.039 150.68 20.887 150.133\n" + " 20.582 c 149.594 20.277 149.145 19.852 148.789 19.305 c 148.438 18.758 \n" + "148.176 18.113 148.004 17.371 c 147.836 16.621 147.754 15.805 147.754 14.922\n" + " c 147.754 14.027 147.84 13.203 148.016 12.453 c 148.199 11.703 148.473 \n" + "11.059 148.848 10.52 c 149.219 9.973 149.688 9.547 150.258 9.242 c 150.832\n" + " 8.938 151.516 8.785 152.301 8.785 c 152.688 8.785 153.059 8.824 153.414\n" + " 8.906 c 153.77 8.988 154.102 9.109 154.41 9.277 c 154.715 9.445 154.992\n" + " 9.66 155.242 9.922 c 155.488 10.184 155.699 10.5 155.875 10.871 c 155.898\n" + " 10.871 l 155.898 10.797 155.895 10.691 155.887 10.555 c 155.887 10.41 155.887\n" + " 10.246 155.887 10.062 c 155.887 9.879 155.883 9.691 155.875 9.496 c 155.875\n" + " 9.301 155.875 9.109 155.875 8.93 c 155.875 4.613 l 158.945 4.613 l 158.945\n" + " 18.25 l 158.945 18.824 158.957 19.34 158.977 19.789 c 159 20.234 159.016\n" + " 20.578 159.031 20.828 c 156.059 20.828 l 155.918 14.852 m 155.918 14.07\n" + " 155.844 13.426 155.699 12.918 c 155.555 12.402 155.359 11.992 155.121 11.695\n" + " c 154.887 11.391 154.617 11.18 154.312 11.062 c 154.016 10.938 153.707 \n" + "10.875 153.395 10.875 c 153 10.875 152.652 10.953 152.344 11.105 c 152.047\n" + " 11.258 151.789 11.5 151.578 11.828 c 151.375 12.156 151.219 12.574 151.109\n" + " 13.086 c 151.008 13.598 150.957 14.211 150.957 14.934 c 150.957 17.613 \n" + "151.762 18.953 153.371 18.953 c 153.676 18.953 153.984 18.887 154.289 18.758\n" + " c 154.594 18.625 154.867 18.406 155.109 18.09 c 155.352 17.777 155.543 \n" + "17.359 155.688 16.832 c 155.84 16.301 155.918 15.641 155.918 14.855 c f\n" + "1 1 1 RG 0.531496 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "24.195 20.828 m 17.484 8.973 l 17.52 9.293 17.555 9.613 17.582 9.934 c \n" + "17.609 10.211 17.633 10.508 17.648 10.828 c 17.672 11.148 17.68 11.453 17.68\n" + " 11.746 c 17.68 20.828 l 14.82 20.828 l 14.82 5.434 l 18.504 5.434 l 25.312\n" + " 17.387 l 25.277 17.082 25.242 16.762 25.215 16.426 c 25.188 16.141 25.16\n" + " 15.82 25.137 15.465 c 25.121 15.109 25.113 14.746 25.113 14.383 c 25.113\n" + " 5.434 l 27.977 5.434 l 27.977 20.828 l 24.195 20.828 l 42.289 14.906 m \n" + "42.289 15.809 42.16 16.637 41.906 17.387 c 41.66 18.137 41.285 18.785 40.781\n" + " 19.332 c 40.277 19.871 39.652 20.293 38.902 20.598 c 38.152 20.895 37.277\n" + " 21.047 36.281 21.047 c 35.32 21.047 34.473 20.898 33.734 20.598 c 33 20.301\n" + " 32.379 19.879 31.875 19.34 c 31.379 18.801 31.004 18.156 30.75 17.406 c\n" + " 30.496 16.648 30.367 15.816 30.367 14.902 c 30.367 14.02 30.488 13.207 \n" + "30.727 12.465 c 30.973 11.715 31.348 11.066 31.84 10.52 c 32.336 9.973 32.957\n" + " 9.547 33.707 9.242 c 34.457 8.938 35.336 8.785 36.34 8.785 c 37.402 8.785\n" + " 38.309 8.938 39.062 9.242 c 39.812 9.547 40.426 9.973 40.898 10.52 c 41.379\n" + " 11.059 41.73 11.703 41.949 12.453 c 42.176 13.195 42.289 14.012 42.289 \n" + "14.902 c 39.078 14.902 m 39.078 13.496 38.848 12.477 38.391 11.844 c 37.934\n" + " 11.211 37.266 10.895 36.391 10.895 c 35.488 10.895 34.797 11.215 34.316\n" + " 11.855 c 33.836 12.496 33.594 13.512 33.594 14.902 c 33.594 15.609 33.656\n" + " 16.219 33.781 16.727 c 33.914 17.238 34.094 17.656 34.328 17.984 c 34.562\n" + " 18.312 34.84 18.555 35.168 18.715 c 35.496 18.867 35.855 18.945 36.25 18.945\n" + " c 36.703 18.945 37.102 18.867 37.453 18.715 c 37.809 18.555 38.109 18.312\n" + " 38.348 17.984 c 38.59 17.656 38.77 17.238 38.895 16.727 c 39.02 16.215 \n" + "39.082 15.609 39.082 14.902 c 47.77 21.02 m 46.867 21.02 46.172 20.777 45.684\n" + " 20.289 c 45.195 19.793 44.953 19.047 44.953 18.051 c 44.953 11.078 l 43.449\n" + " 11.082 l 43.449 9.008 l 45.098 9.008 l 46.059 6.23 l 47.98 6.23 l 47.98\n" + " 9.008 l 50.219 9.008 l 50.219 11.082 l 47.98 11.082 l 47.98 17.223 l 47.98\n" + " 17.797 48.09 18.223 48.309 18.5 c 48.527 18.77 48.867 18.906 49.324 18.902\n" + " c 49.512 18.902 49.684 18.887 49.836 18.859 c 49.988 18.832 50.16 18.793\n" + " 50.348 18.75 c 50.348 20.652 l 49.969 20.777 49.566 20.867 49.145 20.926\n" + " c 48.723 20.992 48.258 21.023 47.758 21.023 c 68.398 20.828 m 67.031 16.895\n" + " l 61.164 16.895 l 59.797 20.828 l 56.574 20.828 l 62.191 5.434 l 65.992\n" + " 5.434 l 71.586 20.828 l 68.395 20.828 l 64.789 10.043 m 64.703 9.789 64.613\n" + " 9.531 64.527 9.277 c 64.445 9.016 64.375 8.777 64.309 8.566 c 64.25 8.348\n" + " 64.199 8.168 64.156 8.031 c 64.121 7.895 64.098 7.816 64.09 7.801 c 64.082\n" + " 7.824 64.062 7.902 64.023 8.043 c 63.988 8.18 63.938 8.355 63.871 8.566\n" + " c 63.812 8.777 63.738 9.016 63.652 9.277 c 63.57 9.531 63.488 9.789 63.402\n" + " 10.043 c 61.883 14.469 l 66.309 14.469 l 64.789 10.043 l 84.938 14.863 \n" + "m 84.938 15.758 84.848 16.586 84.664 17.344 c 84.488 18.102 84.215 18.754\n" + " 83.844 19.301 c 83.473 19.848 83 20.277 82.422 20.59 c 81.855 20.895 81.18\n" + " 21.047 80.402 21.047 c 80.051 21.047 79.703 21.012 79.352 20.938 c 79.008\n" + " 20.863 78.68 20.75 78.367 20.586 c 78.055 20.418 77.762 20.203 77.492 19.941\n" + " c 77.23 19.672 77.004 19.34 76.816 18.945 c 76.75 18.945 l 76.758 18.98\n" + " 76.766 19.074 76.773 19.219 c 76.781 19.363 76.789 19.535 76.797 19.73 \n" + "c 76.805 19.918 76.809 20.125 76.809 20.344 c 76.816 20.555 76.82 20.75 \n" + "76.82 20.934 c 76.82 25.469 l 73.75 25.469 l 73.75 11.723 l 73.75 11.117\n" + " 73.738 10.578 73.719 10.105 c 73.703 9.633 73.688 9.266 73.664 9 c 76.648\n" + " 9 l 76.664 9.051 76.676 9.148 76.691 9.297 c 76.715 9.441 76.727 9.609 \n" + "76.734 9.801 c 76.75 9.988 76.762 10.188 76.766 10.391 c 76.773 10.594 76.777\n" + " 10.773 76.777 10.926 c 76.82 10.926 l 77.191 10.145 77.703 9.59 78.352 \n" + "9.254 c 79 8.918 79.75 8.75 80.602 8.75 c 81.352 8.75 82 8.902 82.547 9.207\n" + " c 83.094 9.512 83.543 9.934 83.891 10.473 c 84.246 11.012 84.512 11.656\n" + " 84.676 12.406 c 84.852 13.148 84.938 13.965 84.938 14.855 c 81.734 14.855\n" + " m 81.734 13.508 81.531 12.512 81.121 11.863 c 80.715 11.207 80.105 10.879\n" + " 79.297 10.879 c 78.992 10.879 78.684 10.945 78.379 11.074 c 78.082 11.199\n" + " 77.812 11.418 77.57 11.73 c 77.336 12.035 77.145 12.453 76.992 12.977 c\n" + " 76.848 13.492 76.773 14.148 76.773 14.945 c 76.773 15.719 76.848 16.363\n" + " 76.992 16.879 c 77.137 17.391 77.328 17.797 77.559 18.102 c 77.801 18.406\n" + " 78.07 18.625 78.367 18.758 c 78.664 18.883 78.969 18.945 79.273 18.945 \n" + "c 79.668 18.945 80.016 18.867 80.324 18.715 c 80.629 18.555 80.887 18.312\n" + " 81.09 17.984 c 81.301 17.648 81.461 17.223 81.57 16.707 c 81.68 16.191 \n" + "81.734 15.574 81.734 14.859 c 98.617 14.859 m 98.617 15.754 98.527 16.582\n" + " 98.344 17.34 c 98.168 18.098 97.895 18.75 97.523 19.297 c 97.152 19.844\n" + " 96.68 20.273 96.102 20.586 c 95.535 20.891 94.859 21.043 94.082 21.043 \n" + "c 93.73 21.043 93.383 21.008 93.031 20.934 c 92.688 20.859 92.359 20.746\n" + " 92.047 20.582 c 91.734 20.414 91.441 20.199 91.172 19.938 c 90.91 19.668\n" + " 90.684 19.336 90.496 18.941 c 90.43 18.941 l 90.438 18.977 90.445 19.07\n" + " 90.453 19.215 c 90.461 19.359 90.469 19.531 90.477 19.727 c 90.484 19.914\n" + " 90.488 20.121 90.488 20.34 c 90.496 20.551 90.5 20.746 90.5 20.93 c 90.5\n" + " 25.465 l 87.43 25.465 l 87.43 11.719 l 87.43 11.113 87.418 10.574 87.398\n" + " 10.102 c 87.383 9.629 87.367 9.262 87.344 8.996 c 90.328 8.996 l 90.344\n" + " 9.047 90.355 9.145 90.371 9.293 c 90.395 9.438 90.406 9.605 90.414 9.797\n" + " c 90.43 9.984 90.441 10.184 90.445 10.387 c 90.453 10.59 90.457 10.77 90.457\n" + " 10.922 c 90.5 10.922 l 90.871 10.141 91.383 9.586 92.031 9.25 c 92.68 8.914\n" + " 93.43 8.746 94.281 8.746 c 95.031 8.746 95.68 8.898 96.227 9.203 c 96.773\n" + " 9.508 97.223 9.93 97.57 10.469 c 97.926 11.008 98.191 11.652 98.355 12.402\n" + " c 98.531 13.145 98.617 13.961 98.617 14.852 c 95.414 14.852 m 95.414 13.504\n" + " 95.211 12.508 94.801 11.859 c 94.395 11.203 93.785 10.875 92.977 10.875\n" + " c 92.672 10.875 92.363 10.941 92.059 11.07 c 91.762 11.195 91.492 11.414\n" + " 91.25 11.727 c 91.016 12.031 90.824 12.449 90.672 12.973 c 90.527 13.488\n" + " 90.453 14.145 90.453 14.941 c 90.453 15.715 90.527 16.359 90.672 16.875\n" + " c 90.816 17.387 91.008 17.793 91.238 18.098 c 91.48 18.402 91.75 18.621\n" + " 92.047 18.754 c 92.344 18.879 92.648 18.941 92.953 18.941 c 93.348 18.941\n" + " 93.695 18.863 94.004 18.711 c 94.309 18.551 94.566 18.309 94.77 17.98 c\n" + " 94.98 17.645 95.141 17.219 95.25 16.703 c 95.359 16.188 95.414 15.57 95.414\n" + " 14.855 c 101.105 20.82 m 101.105 11.773 l 101.105 11.52 101.102 11.25 101.094\n" + " 10.965 c 101.094 10.68 101.086 10.41 101.07 10.156 c 101.062 9.895 101.055\n" + " 9.66 101.047 9.457 c 101.039 9.246 101.027 9.094 101.016 9 c 103.945 9 \n" + "l 103.961 9.086 103.973 9.242 103.988 9.457 c 104.004 9.668 104.016 9.902\n" + " 104.031 10.156 c 104.047 10.41 104.059 10.668 104.062 10.922 c 104.078 \n" + "11.168 104.086 11.371 104.086 11.523 c 104.129 11.523 l 104.281 11.094 104.434\n" + " 10.711 104.586 10.375 c 104.738 10.031 104.918 9.746 105.121 9.512 c 105.332\n" + " 9.27 105.582 9.09 105.875 8.965 c 106.168 8.832 106.527 8.77 106.957 8.77\n" + " c 107.141 8.77 107.316 8.789 107.492 8.824 c 107.676 8.852 107.812 8.891\n" + " 107.906 8.934 c 107.906 11.5 l 107.711 11.457 107.508 11.418 107.305 11.391\n" + " c 107.109 11.355 106.871 11.336 106.594 11.336 c 105.828 11.336 105.23 \n" + "11.645 104.801 12.266 c 104.379 12.887 104.168 13.801 104.168 15.02 c 104.168\n" + " 20.82 l 101.098 20.82 l 121.027 14.898 m 121.027 15.801 120.898 16.629 \n" + "120.645 17.379 c 120.398 18.129 120.023 18.777 119.52 19.324 c 119.016 19.863\n" + " 118.391 20.285 117.641 20.59 c 116.891 20.887 116.016 21.039 115.02 21.039\n" + " c 114.059 21.039 113.211 20.891 112.473 20.59 c 111.738 20.293 111.117 \n" + "19.871 110.613 19.332 c 110.117 18.793 109.742 18.148 109.488 17.398 c 109.234\n" + " 16.641 109.105 15.809 109.105 14.895 c 109.105 14.012 109.227 13.199 109.465\n" + " 12.457 c 109.711 11.707 110.086 11.059 110.578 10.512 c 111.074 9.965 111.695\n" + " 9.539 112.445 9.234 c 113.195 8.93 114.074 8.777 115.078 8.777 c 116.141\n" + " 8.777 117.047 8.93 117.801 9.234 c 118.551 9.539 119.164 9.965 119.637 \n" + "10.512 c 120.117 11.051 120.469 11.695 120.688 12.445 c 120.914 13.188 121.027\n" + " 14.004 121.027 14.895 c 117.816 14.895 m 117.816 13.488 117.586 12.469 \n" + "117.129 11.836 c 116.672 11.203 116.004 10.887 115.129 10.887 c 114.227 \n" + "10.887 113.535 11.207 113.055 11.848 c 112.574 12.488 112.332 13.504 112.332\n" + " 14.895 c 112.332 15.602 112.395 16.211 112.52 16.719 c 112.652 17.23 112.832\n" + " 17.648 113.066 17.977 c 113.301 18.305 113.578 18.547 113.906 18.707 c \n" + "114.234 18.859 114.594 18.938 114.988 18.938 c 115.441 18.938 115.84 18.859\n" + " 116.191 18.707 c 116.547 18.547 116.848 18.305 117.086 17.977 c 117.328\n" + " 17.648 117.508 17.23 117.633 16.719 c 117.758 16.207 117.82 15.602 117.82\n" + " 14.895 c 129.906 20.816 m 126.234 20.816 l 122.004 8.992 l 125.25 8.992\n" + " l 127.316 15.602 l 127.383 15.82 127.449 16.055 127.523 16.301 c 127.598\n" + " 16.543 127.664 16.781 127.73 17.023 c 127.797 17.266 127.859 17.496 127.918\n" + " 17.723 c 127.984 17.949 128.043 18.152 128.094 18.336 c 128.137 18.16 128.191\n" + " 17.965 128.258 17.746 c 128.324 17.52 128.391 17.289 128.453 17.047 c 128.527\n" + " 16.805 128.598 16.566 128.672 16.324 c 128.754 16.082 128.828 15.855 128.902\n" + " 15.637 c 131.055 8.992 l 134.266 8.992 l 129.906 20.816 l 140.777 21.035\n" + " m 139.926 21.035 139.156 20.91 138.473 20.664 c 137.797 20.41 137.215 20.027\n" + " 136.734 19.516 c 136.254 19 135.887 18.355 135.629 17.582 c 135.375 16.801\n" + " 135.246 15.891 135.246 14.852 c 135.246 13.723 135.395 12.773 135.695 12\n" + " c 136 11.227 136.41 10.605 136.918 10.133 c 137.434 9.652 138.027 9.305\n" + " 138.699 9.094 c 139.371 8.883 140.074 8.777 140.82 8.777 c 141.754 8.777\n" + " 142.547 8.941 143.203 9.27 c 143.867 9.59 144.41 10.043 144.832 10.625 \n" + "c 145.254 11.207 145.562 11.906 145.762 12.723 c 145.957 13.531 146.059 \n" + "14.426 146.059 15.41 c 146.059 15.496 l 138.477 15.496 l 138.477 15.992 \n" + "138.52 16.453 138.609 16.883 c 138.695 17.305 138.84 17.672 139.035 17.988\n" + " c 139.23 18.293 139.488 18.539 139.801 18.719 c 140.113 18.895 140.492 \n" + "18.98 140.938 18.98 c 141.477 18.98 141.918 18.867 142.258 18.641 c 142.602\n" + " 18.406 142.844 18.051 142.988 17.57 c 145.883 17.82 l 145.75 18.156 145.566\n" + " 18.512 145.324 18.891 c 145.09 19.27 144.777 19.617 144.383 19.941 c 143.988\n" + " 20.254 143.496 20.516 142.906 20.727 c 142.324 20.93 141.613 21.031 140.777\n" + " 21.031 c 140.777 10.707 m 140.465 10.707 140.168 10.762 139.891 10.871 \n" + "c 139.621 10.973 139.383 11.141 139.18 11.375 c 138.984 11.602 138.824 11.895\n" + " 138.699 12.262 c 138.574 12.625 138.508 13.062 138.492 13.574 c 143.082\n" + " 13.574 l 143.023 12.621 142.793 11.906 142.395 11.434 c 141.992 10.953 \n" + "141.453 10.711 140.777 10.711 c 156.055 20.816 m 156.039 20.758 156.023 \n" + "20.656 156 20.512 c 155.984 20.359 155.969 20.188 155.945 20 c 155.93 19.812\n" + " 155.918 19.617 155.902 19.422 c 155.895 19.227 155.891 19.051 155.891 18.898\n" + " c 155.848 18.898 l 155.492 19.664 154.992 20.215 154.352 20.547 c 153.719\n" + " 20.875 152.957 21.039 152.066 21.039 c 151.324 21.039 150.68 20.887 150.133\n" + " 20.582 c 149.594 20.277 149.145 19.852 148.789 19.305 c 148.438 18.758 \n" + "148.176 18.113 148.004 17.371 c 147.836 16.621 147.754 15.805 147.754 14.922\n" + " c 147.754 14.027 147.84 13.203 148.016 12.453 c 148.199 11.703 148.473 \n" + "11.059 148.848 10.52 c 149.219 9.973 149.688 9.547 150.258 9.242 c 150.832\n" + " 8.938 151.516 8.785 152.301 8.785 c 152.688 8.785 153.059 8.824 153.414\n" + " 8.906 c 153.77 8.988 154.102 9.109 154.41 9.277 c 154.715 9.445 154.992\n" + " 9.66 155.242 9.922 c 155.488 10.184 155.699 10.5 155.875 10.871 c 155.898\n" + " 10.871 l 155.898 10.797 155.895 10.691 155.887 10.555 c 155.887 10.41 155.887\n" + " 10.246 155.887 10.062 c 155.887 9.879 155.883 9.691 155.875 9.496 c 155.875\n" + " 9.301 155.875 9.109 155.875 8.93 c 155.875 4.613 l 158.945 4.613 l 158.945\n" + " 18.25 l 158.945 18.824 158.957 19.34 158.977 19.789 c 159 20.234 159.016\n" + " 20.578 159.031 20.828 c 156.059 20.828 l 155.918 14.852 m 155.918 14.07\n" + " 155.844 13.426 155.699 12.918 c 155.555 12.402 155.359 11.992 155.121 11.695\n" + " c 154.887 11.391 154.617 11.18 154.312 11.062 c 154.016 10.938 153.707 \n" + "10.875 153.395 10.875 c 153 10.875 152.652 10.953 152.344 11.105 c 152.047\n" + " 11.258 151.789 11.5 151.578 11.828 c 151.375 12.156 151.219 12.574 151.109\n" + " 13.086 c 151.008 13.598 150.957 14.211 150.957 14.934 c 150.957 17.613 \n" + "151.762 18.953 153.371 18.953 c 153.676 18.953 153.984 18.887 154.289 18.758\n" + " c 154.594 18.625 154.867 18.406 155.109 18.09 c 155.352 17.777 155.543 \n" + "17.359 155.688 16.832 c 155.84 16.301 155.918 15.641 155.918 14.855 c S Q\n" + "Q q\n" + "0.74902 0 0 rg /a1 gs\n" + "1 1 1 RG 0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 167.109 26.086 l 168.738 26.086 170.109\n" + " 24.715 170.109 23.086 c 170.109 3.398 l 170.109 1.77 168.738 0.398 167.109\n" + " 0.398 c h\n" + "3.867 3.844 m 166.664 3.844 l 166.664 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m B Q\n" + "Q\n"; + +static Dict *getNotApprovedStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_not_for_public_release.h b/poppler-24.05.0/poppler/annot_stamp_not_for_public_release.h new file mode 100644 index 0000000000000000000000000000000000000000..fbf7b4d0b6cfd8374f47ea65fd72eb4c18aade38 --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_not_for_public_release.h @@ -0,0 +1,337 @@ +//======================================================================== +// +// annot_stamp_not_for_public_release.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_NOT_FOR_PUBLIC_RELEASE_H +#define ANNOT_STAMP_NOT_FOR_PUBLIC_RELEASE_H + +#include "PDFDoc.h" +#include "Dict.h" +#include "Object.h" + +static const double ANNOT_STAMP_NOT_FOR_PUBLIC_RELEASE_WIDTH = 268.008179; +static const double ANNOT_STAMP_NOT_FOR_PUBLIC_RELEASE_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_NOT_FOR_PUBLIC_RELEASE = "1 0 0 -1 0 26.484741 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 264.617 2.129 l 265.316 2.129 265.887 2.828 265.887 3.398\n" + " c 265.887 23.09 l 265.887 23.789 265.32 24.359 264.617 24.359 c 3.406 24.359\n" + " l 2.707 24.359 2.137 23.66 2.137 23.09 c 2.137 3.398 l 2.137 2.699 2.703\n" + " 2.129 3.406 2.129 c h\n" + "3.406 2.129 m f\n" + "0.74902 0 0 rg /a1 gs\n" + "1 1 1 RG 0.531496 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "24.195 20.828 m 17.484 8.973 l 17.52 9.293 17.555 9.613 17.582 9.934 c \n" + "17.609 10.211 17.633 10.508 17.648 10.828 c 17.672 11.148 17.68 11.453 17.68\n" + " 11.746 c 17.68 20.828 l 14.82 20.828 l 14.82 5.434 l 18.504 5.434 l 25.312\n" + " 17.387 l 25.277 17.082 25.242 16.762 25.215 16.426 c 25.188 16.141 25.16\n" + " 15.82 25.137 15.465 c 25.121 15.109 25.113 14.746 25.113 14.383 c 25.113\n" + " 5.434 l 27.977 5.434 l 27.977 20.828 l 24.195 20.828 l 42.289 14.906 m \n" + "42.289 15.809 42.16 16.637 41.906 17.387 c 41.66 18.137 41.285 18.785 40.781\n" + " 19.332 c 40.277 19.871 39.652 20.293 38.902 20.598 c 38.152 20.895 37.277\n" + " 21.047 36.281 21.047 c 35.32 21.047 34.473 20.898 33.734 20.598 c 33 20.301\n" + " 32.379 19.879 31.875 19.34 c 31.379 18.801 31.004 18.156 30.75 17.406 c\n" + " 30.496 16.648 30.367 15.816 30.367 14.902 c 30.367 14.02 30.488 13.207 \n" + "30.727 12.465 c 30.973 11.715 31.348 11.066 31.84 10.52 c 32.336 9.973 32.957\n" + " 9.547 33.707 9.242 c 34.457 8.938 35.336 8.785 36.34 8.785 c 37.402 8.785\n" + " 38.309 8.938 39.062 9.242 c 39.812 9.547 40.426 9.973 40.898 10.52 c 41.379\n" + " 11.059 41.73 11.703 41.949 12.453 c 42.176 13.195 42.289 14.012 42.289 \n" + "14.902 c 39.078 14.902 m 39.078 13.496 38.848 12.477 38.391 11.844 c 37.934\n" + " 11.211 37.266 10.895 36.391 10.895 c 35.488 10.895 34.797 11.215 34.316\n" + " 11.855 c 33.836 12.496 33.594 13.512 33.594 14.902 c 33.594 15.609 33.656\n" + " 16.219 33.781 16.727 c 33.914 17.238 34.094 17.656 34.328 17.984 c 34.562\n" + " 18.312 34.84 18.555 35.168 18.715 c 35.496 18.867 35.855 18.945 36.25 18.945\n" + " c 36.703 18.945 37.102 18.867 37.453 18.715 c 37.809 18.555 38.109 18.312\n" + " 38.348 17.984 c 38.59 17.656 38.77 17.238 38.895 16.727 c 39.02 16.215 \n" + "39.082 15.609 39.082 14.902 c 47.77 21.02 m 46.867 21.02 46.172 20.777 45.684\n" + " 20.289 c 45.195 19.793 44.953 19.047 44.953 18.051 c 44.953 11.078 l 43.449\n" + " 11.082 l 43.449 9.008 l 45.098 9.008 l 46.059 6.23 l 47.98 6.23 l 47.98\n" + " 9.008 l 50.219 9.008 l 50.219 11.082 l 47.98 11.082 l 47.98 17.223 l 47.98\n" + " 17.797 48.09 18.223 48.309 18.5 c 48.527 18.77 48.867 18.906 49.324 18.902\n" + " c 49.512 18.902 49.684 18.887 49.836 18.859 c 49.988 18.832 50.16 18.793\n" + " 50.348 18.75 c 50.348 20.652 l 49.969 20.777 49.566 20.867 49.145 20.926\n" + " c 48.723 20.992 48.258 21.023 47.758 21.023 c 61.57 7.922 m 61.57 12.688\n" + " l 69.449 12.688 l 69.449 15.18 l 61.574 15.18 l 61.574 20.828 l 58.352 \n" + "20.828 l 58.352 5.434 l 69.703 5.434 l 69.703 7.926 l 61.574 7.926 l 83.328\n" + " 14.906 m 83.328 15.809 83.199 16.637 82.945 17.387 c 82.699 18.137 82.324\n" + " 18.785 81.82 19.332 c 81.316 19.871 80.691 20.293 79.941 20.598 c 79.191\n" + " 20.895 78.316 21.047 77.32 21.047 c 76.359 21.047 75.512 20.898 74.773 \n" + "20.598 c 74.039 20.301 73.418 19.879 72.914 19.34 c 72.418 18.801 72.043\n" + " 18.156 71.789 17.406 c 71.535 16.648 71.406 15.816 71.406 14.902 c 71.406\n" + " 14.02 71.527 13.207 71.766 12.465 c 72.012 11.715 72.387 11.066 72.879 \n" + "10.52 c 73.375 9.973 73.996 9.547 74.746 9.242 c 75.496 8.938 76.375 8.785\n" + " 77.379 8.785 c 78.441 8.785 79.348 8.938 80.102 9.242 c 80.852 9.547 81.465\n" + " 9.973 81.938 10.52 c 82.418 11.059 82.77 11.703 82.988 12.453 c 83.215 \n" + "13.195 83.328 14.012 83.328 14.902 c 80.117 14.902 m 80.117 13.496 79.887\n" + " 12.477 79.43 11.844 c 78.973 11.211 78.305 10.895 77.43 10.895 c 76.527\n" + " 10.895 75.836 11.215 75.355 11.855 c 74.875 12.496 74.633 13.512 74.633\n" + " 14.902 c 74.633 15.609 74.695 16.219 74.82 16.727 c 74.953 17.238 75.133\n" + " 17.656 75.367 17.984 c 75.602 18.312 75.879 18.555 76.207 18.715 c 76.535\n" + " 18.867 76.895 18.945 77.289 18.945 c 77.742 18.945 78.141 18.867 78.492\n" + " 18.715 c 78.848 18.555 79.148 18.312 79.387 17.984 c 79.629 17.656 79.809\n" + " 17.238 79.934 16.727 c 80.059 16.215 80.121 15.609 80.121 14.902 c 85.781\n" + " 20.824 m 85.781 11.777 l 85.781 11.523 85.777 11.254 85.77 10.969 c 85.77\n" + " 10.684 85.762 10.414 85.746 10.16 c 85.738 9.898 85.73 9.664 85.723 9.461\n" + " c 85.715 9.25 85.703 9.098 85.691 9.004 c 88.621 9.004 l 88.637 9.09 88.648\n" + " 9.246 88.664 9.461 c 88.68 9.672 88.691 9.906 88.707 10.16 c 88.723 10.414\n" + " 88.734 10.672 88.738 10.926 c 88.754 11.172 88.762 11.375 88.762 11.527\n" + " c 88.805 11.527 l 88.957 11.098 89.109 10.715 89.262 10.379 c 89.414 10.035\n" + " 89.594 9.75 89.797 9.516 c 90.008 9.273 90.258 9.094 90.551 8.969 c 90.844\n" + " 8.836 91.203 8.773 91.633 8.773 c 91.816 8.773 91.992 8.793 92.168 8.828\n" + " c 92.352 8.855 92.488 8.895 92.582 8.938 c 92.582 11.504 l 92.387 11.461\n" + " 92.184 11.422 91.98 11.395 c 91.785 11.359 91.547 11.34 91.27 11.34 c 90.504\n" + " 11.34 89.906 11.648 89.477 12.27 c 89.055 12.891 88.844 13.805 88.844 15.023\n" + " c 88.844 20.824 l 85.773 20.824 l 113.277 10.301 m 113.277 10.965 113.164\n" + " 11.605 112.938 12.223 c 112.719 12.836 112.379 13.379 111.922 13.852 c \n" + "111.465 14.324 110.879 14.703 110.172 14.988 c 109.465 15.266 108.629 15.402\n" + " 107.66 15.402 c 103.836 15.402 l 103.836 20.82 l 100.613 20.82 l 100.613\n" + " 5.426 l 107.531 5.426 l 108.516 5.426 109.367 5.547 110.09 5.785 c 110.812\n" + " 6.02 111.41 6.352 111.883 6.781 c 112.355 7.211 112.707 7.727 112.934 8.32\n" + " c 113.168 8.918 113.285 9.578 113.285 10.297 c 110.039 10.352 m 110.039\n" + " 9.559 109.797 8.957 109.316 8.547 c 108.844 8.133 108.129 7.926 107.176\n" + " 7.926 c 103.844 7.926 l 103.844 12.918 l 107.266 12.918 l 107.746 12.918\n" + " 108.156 12.855 108.5 12.73 c 108.852 12.605 109.137 12.434 109.363 12.207\n" + " c 109.598 11.98 109.766 11.711 109.875 11.398 c 109.984 11.078 110.039 \n" + "10.727 110.039 10.348 c 118.527 8.992 m 118.527 15.625 l 118.527 16.082 \n" + "118.562 16.508 118.637 16.891 c 118.711 17.27 118.828 17.598 118.996 17.875\n" + " c 119.164 18.145 119.379 18.355 119.641 18.508 c 119.91 18.66 120.238 18.738\n" + " 120.625 18.738 c 120.996 18.738 121.332 18.656 121.629 18.496 c 121.934\n" + " 18.328 122.195 18.094 122.414 17.797 c 122.633 17.492 122.801 17.129 122.918\n" + " 16.715 c 123.043 16.293 123.105 15.828 123.105 15.328 c 123.105 8.992 l\n" + " 126.176 8.992 l 126.176 18.172 l 126.176 18.418 126.176 18.684 126.176 \n" + "18.957 c 126.184 19.227 126.191 19.484 126.199 19.734 c 126.215 19.977 126.227\n" + " 20.191 126.23 20.391 c 126.246 20.578 126.258 20.723 126.262 20.816 c 123.332\n" + " 20.816 l 123.324 20.73 123.309 20.59 123.289 20.402 c 123.273 20.207 123.262\n" + " 19.992 123.246 19.758 c 123.238 19.523 123.227 19.293 123.215 19.059 c \n" + "123.207 18.824 123.203 18.629 123.203 18.469 c 123.148 18.469 l 122.742 \n" + "19.363 122.219 20.016 121.586 20.426 c 120.961 20.832 120.211 21.039 119.348\n" + " 21.039 c 118.641 21.039 118.039 20.922 117.543 20.688 c 117.047 20.453 \n" + "116.645 20.137 116.332 19.738 c 116.027 19.332 115.805 18.848 115.664 18.297\n" + " c 115.527 17.742 115.457 17.145 115.457 16.504 c 115.457 8.996 l 118.527\n" + " 8.996 l 140.5 14.863 m 140.5 15.758 140.41 16.586 140.227 17.344 c 140.051\n" + " 18.094 139.777 18.746 139.406 19.301 c 139.035 19.848 138.562 20.273 137.984\n" + " 20.578 c 137.418 20.883 136.742 21.035 135.965 21.035 c 135.613 21.035 \n" + "135.266 21 134.914 20.926 c 134.562 20.852 134.234 20.734 133.918 20.566\n" + " c 133.605 20.398 133.316 20.18 133.055 19.91 c 132.793 19.641 132.566 19.309\n" + " 132.379 18.914 c 132.355 18.914 l 132.355 19.066 132.348 19.242 132.332\n" + " 19.438 c 132.324 19.633 132.312 19.828 132.301 20.016 c 132.285 20.199 \n" + "132.27 20.363 132.246 20.508 c 132.23 20.652 132.219 20.754 132.203 20.812\n" + " c 129.219 20.812 l 129.242 20.559 129.258 20.195 129.273 19.73 c 129.297\n" + " 19.258 129.305 18.719 129.305 18.113 c 129.305 4.598 l 132.375 4.598 l \n" + "132.375 9.121 l 132.375 9.355 132.371 9.582 132.363 9.809 c 132.363 10.027\n" + " 132.359 10.23 132.352 10.422 c 132.344 10.641 132.336 10.848 132.328 11.043\n" + " c 132.371 11.043 l 132.742 10.227 133.254 9.645 133.902 9.293 c 134.551\n" + " 8.941 135.301 8.77 136.152 8.77 c 136.91 8.77 137.562 8.922 138.109 9.227\n" + " c 138.656 9.523 139.105 9.949 139.453 10.492 c 139.809 11.031 140.074 11.672\n" + " 140.238 12.414 c 140.406 13.156 140.488 13.969 140.488 14.852 c 137.285\n" + " 14.852 m 137.285 13.512 137.09 12.516 136.695 11.867 c 136.301 11.219 135.695\n" + " 10.895 134.871 10.895 c 134.559 10.895 134.25 10.957 133.941 11.082 c 133.637\n" + " 11.207 133.363 11.426 133.121 11.738 c 132.879 12.043 132.688 12.461 132.543\n" + " 12.984 c 132.398 13.5 132.324 14.156 132.324 14.953 c 132.324 15.727 132.398\n" + " 16.367 132.543 16.875 c 132.688 17.387 132.879 17.793 133.109 18.098 c \n" + "133.344 18.402 133.613 18.617 133.918 18.742 c 134.223 18.867 134.535 18.93\n" + " 134.848 18.93 c 135.629 18.93 136.227 18.609 136.652 17.969 c 137.074 17.32\n" + " 137.285 16.281 137.285 14.855 c 142.977 20.812 m 142.977 4.598 l 146.047\n" + " 4.598 l 146.047 20.812 l 142.977 20.812 l 149.184 6.859 m 149.184 4.598\n" + " l 152.254 4.598 l 152.254 6.859 l 149.184 6.859 l 149.184 20.812 m 149.184\n" + " 8.988 l 152.254 8.988 l 152.254 20.812 l 149.184 20.812 l 160.316 21.031\n" + " m 159.375 21.031 158.555 20.887 157.848 20.594 c 157.148 20.301 156.566\n" + " 19.891 156.098 19.359 c 155.633 18.828 155.281 18.191 155.047 17.445 c \n" + "154.812 16.695 154.695 15.867 154.695 14.965 c 154.695 13.98 154.824 13.105\n" + " 155.078 12.344 c 155.332 11.57 155.699 10.922 156.184 10.398 c 156.664 \n" + "9.867 157.254 9.461 157.953 9.188 c 158.66 8.91 159.461 8.773 160.355 8.773\n" + " c 161.121 8.773 161.797 8.875 162.387 9.078 c 162.984 9.281 163.496 9.562\n" + " 163.926 9.918 c 164.355 10.27 164.703 10.684 164.965 11.164 c 165.234 11.645\n" + " 165.422 12.16 165.523 12.715 c 162.43 12.867 l 162.344 12.262 162.125 11.781\n" + " 161.773 11.426 c 161.422 11.062 160.93 10.879 160.289 10.879 c 159.465 \n" + "10.879 158.863 11.219 158.484 11.895 c 158.105 12.57 157.918 13.555 157.918\n" + " 14.844 c 157.918 17.566 158.723 18.93 160.332 18.93 c 160.914 18.93 161.402\n" + " 18.746 161.797 18.383 c 162.191 18.012 162.434 17.461 162.527 16.734 c \n" + "165.609 16.875 l 165.535 17.422 165.367 17.945 165.105 18.449 c 164.852 \n" + "18.945 164.5 19.387 164.055 19.77 c 163.617 20.148 163.086 20.453 162.461\n" + " 20.688 c 161.836 20.914 161.117 21.027 160.309 21.027 c 184.555 20.809 \n" + "m 180.98 14.961 l 177.199 14.961 l 177.199 20.809 l 173.977 20.809 l 173.977\n" + " 5.414 l 181.668 5.414 l 182.629 5.414 183.469 5.523 184.18 5.742 c 184.902\n" + " 5.953 185.5 6.258 185.984 6.66 c 186.465 7.055 186.82 7.535 187.055 8.102\n" + " c 187.297 8.664 187.414 9.297 187.414 10.004 c 187.414 10.578 187.328 11.109\n" + " 187.152 11.59 c 186.984 12.062 186.746 12.484 186.441 12.855 c 186.145 \n" + "13.227 185.785 13.539 185.371 13.797 c 184.957 14.043 184.504 14.227 184.016\n" + " 14.344 c 188.18 20.812 l 184.551 20.812 l 184.168 10.137 m 184.168 9.387\n" + " 183.922 8.828 183.426 8.465 c 182.938 8.102 182.238 7.918 181.328 7.918\n" + " c 177.199 7.918 l 177.199 12.465 l 181.418 12.465 l 181.898 12.465 182.309\n" + " 12.41 182.652 12.301 c 183.004 12.184 183.285 12.023 183.504 11.82 c 183.73\n" + " 11.609 183.898 11.363 184.008 11.078 c 184.117 10.793 184.172 10.48 184.172\n" + " 10.137 c 195.055 21.031 m 194.203 21.031 193.434 20.906 192.75 20.66 c \n" + "192.074 20.406 191.492 20.023 191.012 19.512 c 190.531 18.996 190.164 18.352\n" + " 189.906 17.578 c 189.652 16.797 189.523 15.887 189.523 14.848 c 189.523\n" + " 13.719 189.672 12.77 189.973 11.996 c 190.277 11.223 190.688 10.602 191.195\n" + " 10.129 c 191.711 9.648 192.305 9.301 192.977 9.09 c 193.648 8.879 194.352\n" + " 8.773 195.098 8.773 c 196.031 8.773 196.824 8.938 197.48 9.266 c 198.145\n" + " 9.586 198.688 10.039 199.109 10.621 c 199.531 11.203 199.84 11.902 200.039\n" + " 12.719 c 200.234 13.527 200.336 14.422 200.336 15.406 c 200.336 15.492 \n" + "l 192.754 15.492 l 192.754 15.988 192.797 16.449 192.887 16.879 c 192.973\n" + " 17.301 193.117 17.668 193.312 17.984 c 193.508 18.289 193.766 18.535 194.078\n" + " 18.715 c 194.391 18.891 194.77 18.977 195.215 18.977 c 195.754 18.977 196.195\n" + " 18.863 196.535 18.637 c 196.879 18.402 197.121 18.047 197.266 17.566 c \n" + "200.16 17.816 l 200.027 18.152 199.844 18.508 199.602 18.887 c 199.367 19.266\n" + " 199.055 19.613 198.66 19.938 c 198.266 20.25 197.773 20.512 197.184 20.723\n" + " c 196.602 20.926 195.891 21.027 195.055 21.027 c 195.055 10.703 m 194.742\n" + " 10.703 194.445 10.758 194.168 10.867 c 193.898 10.969 193.66 11.137 193.457\n" + " 11.371 c 193.262 11.598 193.102 11.891 192.977 12.258 c 192.852 12.621 \n" + "192.785 13.059 192.77 13.57 c 197.359 13.57 l 197.301 12.617 197.07 11.902\n" + " 196.672 11.43 c 196.27 10.949 195.73 10.707 195.055 10.707 c 202.672 20.812\n" + " m 202.672 4.598 l 205.742 4.598 l 205.742 20.812 l 202.672 20.812 l 213.719\n" + " 21.031 m 212.867 21.031 212.098 20.906 211.414 20.66 c 210.738 20.406 210.156\n" + " 20.023 209.676 19.512 c 209.195 18.996 208.828 18.352 208.57 17.578 c 208.316\n" + " 16.797 208.188 15.887 208.188 14.848 c 208.188 13.719 208.336 12.77 208.637\n" + " 11.996 c 208.941 11.223 209.352 10.602 209.859 10.129 c 210.375 9.648 210.969\n" + " 9.301 211.641 9.09 c 212.312 8.879 213.016 8.773 213.762 8.773 c 214.695\n" + " 8.773 215.488 8.938 216.145 9.266 c 216.809 9.586 217.352 10.039 217.773\n" + " 10.621 c 218.195 11.203 218.504 11.902 218.703 12.719 c 218.898 13.527 \n" + "219 14.422 219 15.406 c 219 15.492 l 211.418 15.492 l 211.418 15.988 211.461\n" + " 16.449 211.551 16.879 c 211.637 17.301 211.781 17.668 211.977 17.984 c \n" + "212.172 18.289 212.43 18.535 212.742 18.715 c 213.055 18.891 213.434 18.977\n" + " 213.879 18.977 c 214.418 18.977 214.859 18.863 215.199 18.637 c 215.543\n" + " 18.402 215.785 18.047 215.93 17.566 c 218.824 17.816 l 218.691 18.152 218.508\n" + " 18.508 218.266 18.887 c 218.031 19.266 217.719 19.613 217.324 19.938 c \n" + "216.93 20.25 216.438 20.512 215.848 20.723 c 215.266 20.926 214.555 21.027\n" + " 213.719 21.027 c 213.719 10.703 m 213.406 10.703 213.109 10.758 212.832\n" + " 10.867 c 212.562 10.969 212.324 11.137 212.121 11.371 c 211.926 11.598 \n" + "211.766 11.891 211.641 12.258 c 211.516 12.621 211.449 13.059 211.434 13.57\n" + " c 216.023 13.57 l 215.965 12.617 215.734 11.902 215.336 11.43 c 214.934\n" + " 10.949 214.395 10.707 213.719 10.707 c 224.066 21.031 m 223.5 21.031 222.988\n" + " 20.953 222.535 20.801 c 222.09 20.641 221.711 20.41 221.398 20.113 c 221.086\n" + " 19.809 220.844 19.434 220.676 18.988 c 220.508 18.543 220.426 18.039 220.426\n" + " 17.469 c 220.426 16.77 220.547 16.184 220.785 15.711 c 221.031 15.23 221.367\n" + " 14.844 221.789 14.551 c 222.211 14.254 222.707 14.039 223.273 13.906 c \n" + "223.84 13.77 224.445 13.695 225.086 13.688 c 227.633 13.645 l 227.633 13.043\n" + " l 227.633 12.613 227.594 12.258 227.512 11.973 c 227.438 11.68 227.328 \n" + "11.445 227.184 11.262 c 227.039 11.078 226.855 10.953 226.637 10.879 c 226.426\n" + " 10.797 226.18 10.758 225.906 10.758 c 225.652 10.758 225.422 10.785 225.219\n" + " 10.836 c 225.023 10.887 224.852 10.977 224.707 11.109 c 224.562 11.234 \n" + "224.441 11.406 224.348 11.621 c 224.262 11.832 224.199 12.102 224.16 12.43\n" + " c 220.957 12.277 l 221.043 11.762 221.203 11.289 221.438 10.867 c 221.672\n" + " 10.438 221.992 10.066 222.398 9.754 c 222.812 9.441 223.32 9.199 223.918\n" + " 9.031 c 224.523 8.855 225.23 8.77 226.039 8.77 c 226.773 8.77 227.43 8.859\n" + " 228.008 9.043 c 228.582 9.227 229.07 9.5 229.473 9.863 c 229.875 10.219\n" + " 230.18 10.66 230.391 11.184 c 230.602 11.707 230.707 12.316 230.707 13.008\n" + " c 230.707 17.312 l 230.707 17.59 230.719 17.836 230.738 18.055 c 230.766\n" + " 18.273 230.816 18.457 230.879 18.613 c 230.953 18.758 231.051 18.871 231.176\n" + " 18.953 c 231.309 19.027 231.473 19.062 231.68 19.062 c 231.914 19.062 232.137\n" + " 19.039 232.355 18.996 c 232.355 20.656 l 232.172 20.699 232.008 20.738 \n" + "231.863 20.777 c 231.719 20.812 231.57 20.844 231.426 20.863 c 231.281 20.887\n" + " 231.125 20.902 230.957 20.918 c 230.797 20.934 230.605 20.941 230.391 20.941\n" + " c 229.617 20.941 229.047 20.754 228.676 20.375 c 228.312 19.996 228.094\n" + " 19.438 228.02 18.703 c 227.953 18.703 l 227.547 19.438 227.02 20.012 226.379\n" + " 20.418 c 225.746 20.824 224.973 21.031 224.062 21.031 c 227.637 15.34 m\n" + " 226.062 15.363 l 225.734 15.379 225.422 15.406 225.121 15.449 c 224.828\n" + " 15.484 224.57 15.57 224.344 15.699 c 224.125 15.824 223.949 16.004 223.82\n" + " 16.246 c 223.688 16.488 223.625 16.812 223.625 17.23 c 223.625 17.793 223.754\n" + " 18.211 224.008 18.488 c 224.27 18.758 224.617 18.895 225.047 18.891 c 225.441\n" + " 18.891 225.797 18.809 226.117 18.641 c 226.438 18.473 226.707 18.254 226.926\n" + " 17.984 c 227.152 17.707 227.328 17.391 227.449 17.035 c 227.574 16.68 227.637\n" + " 16.312 227.637 15.941 c 227.637 15.34 l 243.754 17.359 m 243.754 17.926\n" + " 243.633 18.438 243.395 18.891 c 243.16 19.344 242.82 19.727 242.367 20.051\n" + " c 241.914 20.363 241.363 20.609 240.707 20.781 c 240.051 20.949 239.305\n" + " 21.031 238.469 21.031 c 237.719 21.031 237.039 20.977 236.438 20.867 c \n" + "235.832 20.758 235.301 20.578 234.844 20.332 c 234.391 20.078 234.012 19.75\n" + " 233.707 19.348 c 233.402 18.945 233.172 18.453 233.02 17.863 c 235.719 \n" + "17.461 l 235.805 17.789 235.926 18.055 236.078 18.258 c 236.23 18.461 236.422\n" + " 18.617 236.645 18.727 c 236.871 18.836 237.133 18.91 237.43 18.945 c 237.734\n" + " 18.98 238.082 19 238.469 19 c 238.82 19 239.141 18.98 239.441 18.945 c \n" + "239.746 18.902 240.008 18.832 240.227 18.738 c 240.453 18.637 240.629 18.496\n" + " 240.75 18.324 c 240.875 18.141 240.938 17.918 240.938 17.648 c 240.938 \n" + "17.344 240.848 17.102 240.664 16.926 c 240.488 16.742 240.246 16.598 239.934\n" + " 16.488 c 239.629 16.371 239.262 16.273 238.84 16.191 c 238.426 16.105 237.98\n" + " 16.004 237.508 15.895 c 237.012 15.785 236.523 15.652 236.043 15.5 c 235.562\n" + " 15.348 235.133 15.141 234.754 14.879 c 234.375 14.617 234.07 14.285 233.836\n" + " 13.883 c 233.602 13.477 233.484 12.961 233.484 12.344 c 233.484 11.781 \n" + "233.594 11.285 233.812 10.848 c 234.031 10.402 234.352 10.027 234.773 9.723\n" + " c 235.195 9.41 235.715 9.172 236.336 9.012 c 236.961 8.844 237.68 8.762\n" + " 238.488 8.762 c 239.129 8.762 239.727 8.824 240.281 8.949 c 240.836 9.066\n" + " 241.332 9.254 241.766 9.516 c 242.203 9.77 242.566 10.098 242.859 10.5 \n" + "c 243.156 10.902 243.367 11.387 243.48 11.953 c 240.758 12.238 l 240.707\n" + " 11.953 240.617 11.723 240.484 11.539 c 240.352 11.352 240.188 11.199 239.992\n" + " 11.09 c 239.805 10.98 239.582 10.906 239.324 10.871 c 239.07 10.828 238.789\n" + " 10.805 238.484 10.805 c 237.758 10.805 237.211 10.898 236.844 11.09 c 236.48\n" + " 11.273 236.297 11.582 236.297 12.02 c 236.297 12.289 236.371 12.504 236.516\n" + " 12.664 c 236.668 12.824 236.879 12.961 237.148 13.066 c 237.426 13.168 \n" + "237.75 13.258 238.121 13.34 c 238.5 13.414 238.91 13.504 239.355 13.613 \n" + "c 239.902 13.73 240.438 13.867 240.961 14.027 c 241.492 14.18 241.961 14.395\n" + " 242.371 14.672 c 242.785 14.941 243.117 15.293 243.367 15.723 c 243.621\n" + " 16.152 243.75 16.699 243.75 17.363 c 251.082 21.035 m 250.23 21.035 249.461\n" + " 20.91 248.777 20.664 c 248.102 20.41 247.52 20.027 247.039 19.516 c 246.559\n" + " 19 246.191 18.355 245.934 17.582 c 245.68 16.801 245.551 15.891 245.551\n" + " 14.852 c 245.551 13.723 245.699 12.773 246 12 c 246.305 11.227 246.715 \n" + "10.605 247.223 10.133 c 247.738 9.652 248.332 9.305 249.004 9.094 c 249.676\n" + " 8.883 250.379 8.777 251.125 8.777 c 252.059 8.777 252.852 8.941 253.508\n" + " 9.27 c 254.172 9.59 254.715 10.043 255.137 10.625 c 255.559 11.207 255.867\n" + " 11.906 256.066 12.723 c 256.262 13.531 256.363 14.426 256.363 15.41 c 256.363\n" + " 15.496 l 248.781 15.496 l 248.781 15.992 248.824 16.453 248.914 16.883 \n" + "c 249 17.305 249.145 17.672 249.34 17.988 c 249.535 18.293 249.793 18.539\n" + " 250.105 18.719 c 250.418 18.895 250.797 18.98 251.242 18.98 c 251.781 18.98\n" + " 252.223 18.867 252.562 18.641 c 252.906 18.406 253.148 18.051 253.293 17.57\n" + " c 256.188 17.82 l 256.055 18.156 255.871 18.512 255.629 18.891 c 255.395\n" + " 19.27 255.082 19.617 254.688 19.941 c 254.293 20.254 253.801 20.516 253.211\n" + " 20.727 c 252.629 20.93 251.918 21.031 251.082 21.031 c 251.082 10.707 m\n" + " 250.77 10.707 250.473 10.762 250.195 10.871 c 249.926 10.973 249.688 11.141\n" + " 249.484 11.375 c 249.289 11.602 249.129 11.895 249.004 12.262 c 248.879\n" + " 12.625 248.812 13.062 248.797 13.574 c 253.387 13.574 l 253.328 12.621 \n" + "253.098 11.906 252.699 11.434 c 252.297 10.953 251.758 10.711 251.082 10.711\n" + " c B Q\n" + "Q q\n" + "0 0 268 26.484 re W n\n" + "0.74902 0 0 rg /a1 gs\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 264.609 26.086 l 266.238 26.086 267.609\n" + " 24.715 267.609 23.086 c 267.609 3.398 l 267.609 1.77 266.238 0.398 264.609\n" + " 0.398 c h\n" + "3.867 3.844 m 264.164 3.844 l 264.164 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m f\n" + "Q q\n" + "1 1 1 RG /a1 gs\n" + "0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 264.609 26.086 l 266.238 26.086 267.609\n" + " 24.715 267.609 23.086 c 267.609 3.398 l 267.609 1.77 266.238 0.398 264.609\n" + " 0.398 c h\n" + "3.867 3.844 m 264.164 3.844 l 264.164 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m S Q\n" + "Q\n"; + +static Dict *getNotForPublicReleaseStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_sold.h b/poppler-24.05.0/poppler/annot_stamp_sold.h new file mode 100644 index 0000000000000000000000000000000000000000..87229cc67ab899763c9ba4b09b181895806e80cb --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_sold.h @@ -0,0 +1,117 @@ +//======================================================================== +// +// annot_stamp_sold.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_SOLD_H +#define ANNOT_STAMP_SOLD_H + +#include "Dict.h" +#include "Object.h" +#include "PDFDoc.h" + +static const double ANNOT_STAMP_SOLD_WIDTH = 74.508179; +static const double ANNOT_STAMP_SOLD_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_SOLD = "1 0 0 -1 0 26.484744 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 71.117 2.129 l 71.82 2.129 72.387 2.695 72.387 3.398 c 72.387\n" + " 23.09 l 72.387 23.793 71.82 24.359 71.117 24.359 c 3.406 24.355 l 2.703\n" + " 24.355 2.137 23.789 2.137 23.086 c 2.137 3.395 l 2.137 2.691 2.703 2.125\n" + " 3.406 2.125 c h\n" + "3.406 2.129 m f\n" + "0.74902 0.0117647 0.0117647 rg /a1 gs\n" + "1 1 1 RG 0.531496 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "27.375 16.395 m 27.375 17.902 26.812 19.059 25.691 19.859 c 24.578 20.652\n" + " 22.938 21.051 20.773 21.051 c 18.801 21.051 17.25 20.699 16.129 20 c 15.008\n" + " 19.301 14.285 18.242 13.965 16.82 c 17.078 16.309 l 17.289 17.125 17.699\n" + " 17.719 18.312 18.09 c 18.926 18.453 19.773 18.637 20.859 18.637 c 23.109\n" + " 18.637 24.234 17.953 24.234 16.582 c 24.234 16.145 24.102 15.785 23.84 \n" + "15.5 c 23.586 15.215 23.219 14.98 22.746 14.789 c 22.281 14.602 21.379 14.371\n" + " 20.047 14.102 c 18.895 13.832 18.094 13.617 17.645 13.457 c 17.191 13.289\n" + " 16.785 13.098 16.422 12.879 c 16.059 12.652 15.75 12.383 15.492 12.07 c\n" + " 15.238 11.758 15.035 11.391 14.891 10.965 c 14.754 10.543 14.684 10.059\n" + " 14.684 9.512 c 14.684 8.121 15.203 7.059 16.246 6.32 c 17.297 5.578 18.816\n" + " 5.207 20.812 5.207 c 22.723 5.207 24.152 5.504 25.105 6.102 c 26.066 6.699\n" + " 26.688 7.688 26.965 9.062 c 23.84 9.488 l 23.68 8.824 23.352 8.328 22.855\n" + " 7.992 c 22.367 7.656 21.664 7.488 20.746 7.488 c 18.793 7.488 17.816 8.102\n" + " 17.816 9.324 c 17.816 9.727 17.918 10.051 18.121 10.309 c 18.332 10.562\n" + " 18.641 10.781 19.051 10.965 c 19.457 11.141 20.285 11.363 21.531 11.633\n" + " c 23.012 11.945 24.066 12.238 24.699 12.508 c 25.34 12.77 25.848 13.078\n" + " 26.219 13.438 c 26.59 13.789 26.875 14.211 27.07 14.703 c 27.266 15.191\n" + " 27.367 15.754 27.367 16.398 c h\n" + "27.375 16.395 m B Q\n" + "0.74902 0.0117647 0.0117647 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "41.043 14.906 m 41.043 16.82 40.512 18.328 39.449 19.418 c 38.387 20.504\n" + " 36.914 21.047 35.035 21.047 c 33.191 21.047 31.746 20.5 30.695 19.406 c\n" + " 29.645 18.312 29.121 16.812 29.121 14.906 c 29.121 13.004 29.645 11.512\n" + " 30.695 10.426 c 31.746 9.332 33.211 8.785 35.098 8.785 c 37.027 8.785 38.5\n" + " 9.312 39.512 10.371 c 40.531 11.422 41.043 12.93 41.043 14.906 c h\n" + "37.832 14.906 m 37.832 13.5 37.602 12.48 37.145 11.848 c 36.688 11.215 \n" + "36.02 10.898 35.145 10.898 c 33.281 10.898 32.348 12.234 32.348 14.91 c \n" + "32.348 16.23 32.574 17.234 33.023 17.926 c 33.48 18.609 34.141 18.953 35\n" + " 18.953 c 36.887 18.953 37.828 17.605 37.828 14.91 c h\n" + "37.832 14.906 m B Q\n" + "0.74902 0.0117647 0.0117647 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "43.48 4.613 3.07 16.215 re B Q\n" + "0.74902 0.0117647 0.0117647 rg 1 1 1 RG q 1 0 0 1 0 0 cm\n" + "57.359 20.828 m 57.332 20.719 57.293 20.445 57.25 20.008 c 57.215 19.562\n" + " 57.195 19.195 57.195 18.902 c 57.152 18.902 l 56.488 20.332 55.23 21.043\n" + " 53.371 21.043 c 51.996 21.043 50.93 20.508 50.18 19.438 c 49.43 18.359 \n" + "49.055 16.855 49.055 14.926 c 49.055 12.965 49.449 11.453 50.234 10.391 \n" + "c 51.027 9.32 52.148 8.785 53.602 8.785 c 54.438 8.785 55.16 8.961 55.766\n" + " 9.309 c 56.379 9.66 56.848 10.18 57.176 10.871 c 57.199 10.871 l 57.176\n" + " 8.926 l 57.176 4.609 l 60.246 4.609 l 60.246 18.246 l 60.246 18.973 60.273\n" + " 19.836 60.332 20.824 c h\n" + "57.219 14.852 m 57.219 13.578 57.004 12.598 56.574 11.914 c 56.152 11.223\n" + " 55.523 10.875 54.695 10.875 c 53.871 10.875 53.262 11.211 52.859 11.879\n" + " c 52.457 12.543 52.258 13.559 52.258 14.926 c 52.258 17.605 53.062 18.945\n" + " 54.672 18.945 c 55.48 18.945 56.105 18.594 56.551 17.887 c 56.996 17.172\n" + " 57.219 16.16 57.219 14.848 c h\n" + "57.219 14.852 m B Q\n" + "Q q\n" + "0.74902 0.0117647 0.0117647 rg /a1 gs\n" + "1 1 1 RG 0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 71.109 26.086 l 72.738 26.086 74.109 24.715\n" + " 74.109 23.086 c 74.109 3.398 l 74.109 1.77 72.738 0.398 71.109 0.398 c \n" + "h\n" + "3.867 3.844 m 70.664 3.844 l 70.664 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m B Q\n" + "Q\n"; + +static Dict *getSoldStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/annot_stamp_top_secret.h b/poppler-24.05.0/poppler/annot_stamp_top_secret.h new file mode 100644 index 0000000000000000000000000000000000000000..ac815b3e9822708f44aad8d32144f2035bfbfa33 --- /dev/null +++ b/poppler-24.05.0/poppler/annot_stamp_top_secret.h @@ -0,0 +1,363 @@ +//======================================================================== +// +// annot_stamp_top_secret.h +// +// Copyright (C) 2021 Mahmoud Ahmed Khalil +// Copyright (C) 2021 Albert Astals Cid +// +// Mechanically extracted from an SVG created for Okular by Eugene Trounev eugene.trounev@gmail.com +// +// Licensed under GPLv2 or later +// +//======================================================================== + +#ifndef ANNOT_STAMP_TOP_SECRET_H +#define ANNOT_STAMP_TOP_SECRET_H + +#include "Dict.h" +#include "Object.h" +#include "PDFDoc.h" + +static const double ANNOT_STAMP_TOP_SECRET_WIDTH = 141.258179; +static const double ANNOT_STAMP_TOP_SECRET_HEIGHT = 26.484743; + +static const char *ANNOT_STAMP_TOP_SECRET = "1 0 0 -1 0 26.484741 cm\n" + "q\n" + "1 1 1 rg /a0 gs\n" + "3.406 2.129 m 137.867 2.129 l 138.566 2.129 139.137 2.828 139.137 3.398\n" + " c 139.137 23.09 l 139.137 23.789 138.57 24.359 137.867 24.359 c 3.406 24.359\n" + " l 2.707 24.359 2.137 23.66 2.137 23.09 c 2.137 3.398 l 2.137 2.699 2.703\n" + " 2.129 3.406 2.129 c h\n" + "3.406 2.129 m f\n" + "0.74902 0 0 rg /a1 gs\n" + "21.77 7.926 m 21.77 20.832 l 18.547 20.832 l 18.547 7.926 l 13.574 7.926\n" + " l 13.574 5.434 l 26.754 5.434 l 26.754 7.926 l 21.77 7.926 l 38.137 14.906\n" + " m 38.137 15.809 38.008 16.637 37.754 17.387 c 37.508 18.137 37.133 18.785\n" + " 36.629 19.332 c 36.125 19.871 35.5 20.293 34.75 20.598 c 34 20.895 33.125\n" + " 21.047 32.129 21.047 c 31.168 21.047 30.32 20.898 29.582 20.598 c 28.848\n" + " 20.301 28.227 19.879 27.723 19.34 c 27.227 18.801 26.852 18.156 26.598 \n" + "17.406 c 26.344 16.648 26.215 15.816 26.215 14.902 c 26.215 14.02 26.336\n" + " 13.207 26.574 12.465 c 26.82 11.715 27.195 11.066 27.688 10.52 c 28.184\n" + " 9.973 28.805 9.547 29.555 9.242 c 30.305 8.938 31.184 8.785 32.188 8.785\n" + " c 33.25 8.785 34.156 8.938 34.91 9.242 c 35.66 9.547 36.273 9.973 36.746\n" + " 10.52 c 37.227 11.059 37.578 11.703 37.797 12.453 c 38.023 13.195 38.137\n" + " 14.012 38.137 14.902 c 34.926 14.902 m 34.926 13.496 34.695 12.477 34.238\n" + " 11.844 c 33.781 11.211 33.113 10.895 32.238 10.895 c 31.336 10.895 30.645\n" + " 11.215 30.164 11.855 c 29.684 12.496 29.441 13.512 29.441 14.902 c 29.441\n" + " 15.609 29.504 16.219 29.629 16.727 c 29.762 17.238 29.941 17.656 30.176\n" + " 17.984 c 30.41 18.312 30.688 18.555 31.016 18.715 c 31.344 18.867 31.703\n" + " 18.945 32.098 18.945 c 32.551 18.945 32.949 18.867 33.301 18.715 c 33.656\n" + " 18.555 33.957 18.312 34.195 17.984 c 34.438 17.656 34.617 17.238 34.742\n" + " 16.727 c 34.867 16.215 34.93 15.609 34.93 14.902 c 51.777 14.859 m 51.777\n" + " 15.754 51.688 16.582 51.504 17.34 c 51.328 18.098 51.055 18.75 50.684 19.297\n" + " c 50.312 19.844 49.84 20.273 49.262 20.586 c 48.695 20.891 48.02 21.043\n" + " 47.242 21.043 c 46.891 21.043 46.543 21.008 46.191 20.934 c 45.848 20.859\n" + " 45.52 20.746 45.207 20.582 c 44.895 20.414 44.602 20.199 44.332 19.938 \n" + "c 44.07 19.668 43.844 19.336 43.656 18.941 c 43.59 18.941 l 43.598 18.977\n" + " 43.605 19.07 43.613 19.215 c 43.621 19.359 43.629 19.531 43.637 19.727 \n" + "c 43.645 19.914 43.648 20.121 43.648 20.34 c 43.656 20.551 43.66 20.746 \n" + "43.66 20.93 c 43.66 25.465 l 40.59 25.465 l 40.59 11.719 l 40.59 11.113 \n" + "40.578 10.574 40.559 10.102 c 40.543 9.629 40.527 9.262 40.504 8.996 c 43.488\n" + " 8.996 l 43.504 9.047 43.516 9.145 43.531 9.293 c 43.555 9.438 43.566 9.605\n" + " 43.574 9.797 c 43.59 9.984 43.602 10.184 43.605 10.387 c 43.613 10.59 43.617\n" + " 10.77 43.617 10.922 c 43.66 10.922 l 44.031 10.141 44.543 9.586 45.191 \n" + "9.25 c 45.84 8.914 46.59 8.746 47.441 8.746 c 48.191 8.746 48.84 8.898 49.387\n" + " 9.203 c 49.934 9.508 50.383 9.93 50.73 10.469 c 51.086 11.008 51.352 11.652\n" + " 51.516 12.402 c 51.691 13.145 51.777 13.961 51.777 14.852 c 48.574 14.852\n" + " m 48.574 13.504 48.371 12.508 47.961 11.859 c 47.555 11.203 46.945 10.875\n" + " 46.137 10.875 c 45.832 10.875 45.523 10.941 45.219 11.07 c 44.922 11.195\n" + " 44.652 11.414 44.41 11.727 c 44.176 12.031 43.984 12.449 43.832 12.973 \n" + "c 43.688 13.488 43.613 14.145 43.613 14.941 c 43.613 15.715 43.688 16.359\n" + " 43.832 16.875 c 43.977 17.387 44.168 17.793 44.398 18.098 c 44.641 18.402\n" + " 44.91 18.621 45.207 18.754 c 45.504 18.879 45.809 18.941 46.113 18.941 \n" + "c 46.508 18.941 46.855 18.863 47.164 18.711 c 47.469 18.551 47.727 18.309\n" + " 47.93 17.98 c 48.141 17.645 48.301 17.219 48.41 16.703 c 48.52 16.188 48.574\n" + " 15.57 48.574 14.855 c 72.965 16.387 m 72.965 17.086 72.836 17.723 72.582\n" + " 18.301 c 72.328 18.867 71.93 19.355 71.391 19.766 c 70.859 20.172 70.176\n" + " 20.492 69.336 20.715 c 68.504 20.934 67.516 21.043 66.363 21.043 c 65.344\n" + " 21.043 64.445 20.953 63.664 20.77 c 62.883 20.586 62.215 20.316 61.652 \n" + "19.961 c 61.098 19.605 60.648 19.164 60.297 18.641 c 59.953 18.109 59.707\n" + " 17.5 59.555 16.816 c 62.668 16.305 l 62.754 16.648 62.883 16.961 63.051\n" + " 17.246 c 63.219 17.531 63.449 17.777 63.738 17.988 c 64.035 18.191 64.406\n" + " 18.352 64.844 18.469 c 65.289 18.578 65.824 18.633 66.449 18.633 c 67.543\n" + " 18.633 68.375 18.469 68.953 18.141 c 69.535 17.805 69.828 17.285 69.828\n" + " 16.578 c 69.828 16.156 69.711 15.809 69.477 15.539 c 69.242 15.27 68.934\n" + " 15.047 68.547 14.871 c 68.16 14.695 67.715 14.551 67.215 14.434 c 66.711\n" + " 14.316 66.188 14.203 65.641 14.094 c 65.203 13.992 64.766 13.887 64.328\n" + " 13.777 c 63.891 13.668 63.473 13.535 63.07 13.383 c 62.676 13.23 62.309\n" + " 13.047 61.965 12.836 c 61.621 12.625 61.324 12.367 61.07 12.059 c 60.824\n" + " 11.746 60.625 11.383 60.48 10.965 c 60.344 10.551 60.273 10.062 60.273 \n" + "9.5 c 60.273 8.734 60.426 8.078 60.73 7.531 c 61.035 6.984 61.457 6.539 \n" + "61.996 6.199 c 62.543 5.848 63.191 5.594 63.941 5.434 c 64.691 5.273 65.512\n" + " 5.191 66.398 5.191 c 67.402 5.191 68.262 5.273 68.977 5.434 c 69.699 5.586\n" + " 70.297 5.824 70.781 6.145 c 71.27 6.465 71.652 6.871 71.93 7.355 c 72.215\n" + " 7.836 72.422 8.402 72.551 9.051 c 69.426 9.477 l 69.266 8.812 68.938 8.316\n" + " 68.441 7.98 c 67.953 7.645 67.25 7.477 66.332 7.477 c 65.766 7.477 65.289\n" + " 7.527 64.91 7.629 c 64.539 7.723 64.238 7.855 64.016 8.023 c 63.797 8.191\n" + " 63.641 8.387 63.547 8.613 c 63.453 8.832 63.406 9.066 63.406 9.312 c 63.406\n" + " 9.691 63.496 10.004 63.68 10.254 c 63.863 10.496 64.117 10.699 64.445 10.867\n" + " c 64.773 11.027 65.164 11.164 65.613 11.281 c 66.07 11.391 66.574 11.504\n" + " 67.121 11.621 c 67.602 11.723 68.078 11.832 68.551 11.949 c 69.023 12.059\n" + " 69.477 12.191 69.906 12.344 c 70.336 12.496 70.738 12.684 71.109 12.902\n" + " c 71.48 13.121 71.801 13.391 72.07 13.711 c 72.348 14.023 72.562 14.398\n" + " 72.715 14.836 c 72.875 15.273 72.957 15.789 72.957 16.387 c 80.258 21.043\n" + " m 79.406 21.043 78.637 20.918 77.953 20.672 c 77.277 20.418 76.695 20.035\n" + " 76.215 19.523 c 75.734 19.008 75.367 18.363 75.109 17.59 c 74.855 16.809\n" + " 74.727 15.898 74.727 14.859 c 74.727 13.73 74.875 12.781 75.176 12.008 \n" + "c 75.48 11.234 75.891 10.613 76.398 10.141 c 76.914 9.66 77.508 9.312 78.18\n" + " 9.102 c 78.852 8.891 79.555 8.785 80.301 8.785 c 81.234 8.785 82.027 8.949\n" + " 82.684 9.277 c 83.348 9.598 83.891 10.051 84.312 10.633 c 84.734 11.215\n" + " 85.043 11.914 85.242 12.73 c 85.438 13.539 85.539 14.434 85.539 15.418 \n" + "c 85.539 15.504 l 77.957 15.504 l 77.957 16 78 16.461 78.09 16.891 c 78.176\n" + " 17.312 78.32 17.68 78.516 17.996 c 78.711 18.301 78.969 18.547 79.281 18.727\n" + " c 79.594 18.902 79.973 18.988 80.418 18.988 c 80.957 18.988 81.398 18.875\n" + " 81.738 18.648 c 82.082 18.414 82.324 18.059 82.469 17.578 c 85.363 17.828\n" + " l 85.23 18.164 85.047 18.52 84.805 18.898 c 84.57 19.277 84.258 19.625 \n" + "83.863 19.949 c 83.469 20.262 82.977 20.523 82.387 20.734 c 81.805 20.938\n" + " 81.094 21.039 80.258 21.039 c 80.258 10.715 m 79.945 10.715 79.648 10.77\n" + " 79.371 10.879 c 79.102 10.98 78.863 11.148 78.66 11.383 c 78.465 11.609\n" + " 78.305 11.902 78.18 12.27 c 78.055 12.633 77.988 13.07 77.973 13.582 c \n" + "82.562 13.582 l 82.504 12.629 82.273 11.914 81.875 11.441 c 81.473 10.961\n" + " 80.934 10.719 80.258 10.719 c 92.801 21.043 m 91.859 21.043 91.039 20.898\n" + " 90.332 20.605 c 89.633 20.312 89.051 19.902 88.582 19.371 c 88.117 18.84\n" + " 87.766 18.203 87.531 17.457 c 87.297 16.707 87.18 15.879 87.18 14.977 c\n" + " 87.18 13.992 87.309 13.117 87.562 12.355 c 87.816 11.582 88.184 10.934 \n" + "88.668 10.41 c 89.148 9.879 89.738 9.473 90.438 9.199 c 91.145 8.922 91.945\n" + " 8.785 92.84 8.785 c 93.605 8.785 94.281 8.887 94.871 9.09 c 95.469 9.293\n" + " 95.98 9.574 96.41 9.93 c 96.84 10.281 97.188 10.695 97.449 11.176 c 97.719\n" + " 11.656 97.906 12.172 98.008 12.727 c 94.914 12.879 l 94.828 12.273 94.609\n" + " 11.793 94.258 11.438 c 93.906 11.074 93.414 10.891 92.773 10.891 c 91.949\n" + " 10.891 91.348 11.23 90.969 11.906 c 90.59 12.582 90.402 13.566 90.402 14.855\n" + " c 90.402 17.578 91.207 18.941 92.816 18.941 c 93.398 18.941 93.887 18.758\n" + " 94.281 18.395 c 94.676 18.023 94.918 17.473 95.012 16.746 c 98.094 16.887\n" + " l 98.02 17.434 97.852 17.957 97.59 18.461 c 97.336 18.957 96.984 19.398\n" + " 96.539 19.781 c 96.102 20.16 95.57 20.465 94.945 20.699 c 94.32 20.926 \n" + "93.602 21.039 92.793 21.039 c 100.32 20.82 m 100.32 11.773 l 100.32 11.52\n" + " 100.316 11.25 100.309 10.965 c 100.309 10.68 100.301 10.41 100.285 10.156\n" + " c 100.277 9.895 100.27 9.66 100.262 9.457 c 100.254 9.246 100.242 9.094\n" + " 100.23 9 c 103.16 9 l 103.176 9.086 103.188 9.242 103.203 9.457 c 103.219\n" + " 9.668 103.23 9.902 103.246 10.156 c 103.262 10.41 103.273 10.668 103.277\n" + " 10.922 c 103.293 11.168 103.301 11.371 103.301 11.523 c 103.344 11.523 \n" + "l 103.496 11.094 103.648 10.711 103.801 10.375 c 103.953 10.031 104.133 \n" + "9.746 104.336 9.512 c 104.547 9.27 104.797 9.09 105.09 8.965 c 105.383 8.832\n" + " 105.742 8.77 106.172 8.77 c 106.355 8.77 106.531 8.789 106.707 8.824 c \n" + "106.891 8.852 107.027 8.891 107.121 8.934 c 107.121 11.5 l 106.926 11.457\n" + " 106.723 11.418 106.52 11.391 c 106.324 11.355 106.086 11.336 105.809 11.336\n" + " c 105.043 11.336 104.445 11.645 104.016 12.266 c 103.594 12.887 103.383\n" + " 13.801 103.383 15.02 c 103.383 20.82 l 100.312 20.82 l 113.852 21.039 m\n" + " 113 21.039 112.23 20.914 111.547 20.668 c 110.871 20.414 110.289 20.031\n" + " 109.809 19.52 c 109.328 19.004 108.961 18.359 108.703 17.586 c 108.449 \n" + "16.805 108.32 15.895 108.32 14.855 c 108.32 13.727 108.469 12.777 108.77\n" + " 12.004 c 109.074 11.23 109.484 10.609 109.992 10.137 c 110.508 9.656 111.102\n" + " 9.309 111.773 9.098 c 112.445 8.887 113.148 8.781 113.895 8.781 c 114.828\n" + " 8.781 115.621 8.945 116.277 9.273 c 116.941 9.594 117.484 10.047 117.906\n" + " 10.629 c 118.328 11.211 118.637 11.91 118.836 12.727 c 119.031 13.535 119.133\n" + " 14.43 119.133 15.414 c 119.133 15.5 l 111.551 15.5 l 111.551 15.996 111.594\n" + " 16.457 111.684 16.887 c 111.77 17.309 111.914 17.676 112.109 17.992 c 112.305\n" + " 18.297 112.562 18.543 112.875 18.723 c 113.188 18.898 113.566 18.984 114.012\n" + " 18.984 c 114.551 18.984 114.992 18.871 115.332 18.645 c 115.676 18.41 115.918\n" + " 18.055 116.062 17.574 c 118.957 17.824 l 118.824 18.16 118.641 18.516 118.398\n" + " 18.895 c 118.164 19.273 117.852 19.621 117.457 19.945 c 117.062 20.258 \n" + "116.57 20.52 115.98 20.73 c 115.398 20.934 114.688 21.035 113.852 21.035\n" + " c 113.852 10.711 m 113.539 10.711 113.242 10.766 112.965 10.875 c 112.695\n" + " 10.977 112.457 11.145 112.254 11.379 c 112.059 11.605 111.898 11.898 111.773\n" + " 12.266 c 111.648 12.629 111.582 13.066 111.566 13.578 c 116.156 13.578 \n" + "l 116.098 12.625 115.867 11.91 115.469 11.438 c 115.066 10.957 114.527 10.715\n" + " 113.852 10.715 c 124.496 21.02 m 123.594 21.02 122.898 20.777 122.41 20.289\n" + " c 121.922 19.793 121.68 19.047 121.68 18.051 c 121.68 11.078 l 120.184 \n" + "11.078 l 120.184 9.004 l 121.832 9.004 l 122.793 6.227 l 124.715 6.227 l\n" + " 124.715 9.004 l 126.953 9.004 l 126.953 11.078 l 124.715 11.078 l 124.715\n" + " 17.219 l 124.715 17.793 124.824 18.219 125.043 18.496 c 125.262 18.766 \n" + "125.602 18.902 126.059 18.898 c 126.246 18.898 126.418 18.883 126.57 18.855\n" + " c 126.723 18.828 126.895 18.789 127.082 18.746 c 127.082 20.648 l 126.703\n" + " 20.773 126.301 20.863 125.879 20.922 c 125.457 20.988 124.992 21.02 124.492\n" + " 21.02 c f\n" + "1 1 1 RG 0.531496 w\n" + "0 J\n" + "0 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "21.77 7.926 m 21.77 20.832 l 18.547 20.832 l 18.547 7.926 l 13.574 7.926\n" + " l 13.574 5.434 l 26.754 5.434 l 26.754 7.926 l 21.77 7.926 l 38.137 14.906\n" + " m 38.137 15.809 38.008 16.637 37.754 17.387 c 37.508 18.137 37.133 18.785\n" + " 36.629 19.332 c 36.125 19.871 35.5 20.293 34.75 20.598 c 34 20.895 33.125\n" + " 21.047 32.129 21.047 c 31.168 21.047 30.32 20.898 29.582 20.598 c 28.848\n" + " 20.301 28.227 19.879 27.723 19.34 c 27.227 18.801 26.852 18.156 26.598 \n" + "17.406 c 26.344 16.648 26.215 15.816 26.215 14.902 c 26.215 14.02 26.336\n" + " 13.207 26.574 12.465 c 26.82 11.715 27.195 11.066 27.688 10.52 c 28.184\n" + " 9.973 28.805 9.547 29.555 9.242 c 30.305 8.938 31.184 8.785 32.188 8.785\n" + " c 33.25 8.785 34.156 8.938 34.91 9.242 c 35.66 9.547 36.273 9.973 36.746\n" + " 10.52 c 37.227 11.059 37.578 11.703 37.797 12.453 c 38.023 13.195 38.137\n" + " 14.012 38.137 14.902 c 34.926 14.902 m 34.926 13.496 34.695 12.477 34.238\n" + " 11.844 c 33.781 11.211 33.113 10.895 32.238 10.895 c 31.336 10.895 30.645\n" + " 11.215 30.164 11.855 c 29.684 12.496 29.441 13.512 29.441 14.902 c 29.441\n" + " 15.609 29.504 16.219 29.629 16.727 c 29.762 17.238 29.941 17.656 30.176\n" + " 17.984 c 30.41 18.312 30.688 18.555 31.016 18.715 c 31.344 18.867 31.703\n" + " 18.945 32.098 18.945 c 32.551 18.945 32.949 18.867 33.301 18.715 c 33.656\n" + " 18.555 33.957 18.312 34.195 17.984 c 34.438 17.656 34.617 17.238 34.742\n" + " 16.727 c 34.867 16.215 34.93 15.609 34.93 14.902 c 51.777 14.859 m 51.777\n" + " 15.754 51.688 16.582 51.504 17.34 c 51.328 18.098 51.055 18.75 50.684 19.297\n" + " c 50.312 19.844 49.84 20.273 49.262 20.586 c 48.695 20.891 48.02 21.043\n" + " 47.242 21.043 c 46.891 21.043 46.543 21.008 46.191 20.934 c 45.848 20.859\n" + " 45.52 20.746 45.207 20.582 c 44.895 20.414 44.602 20.199 44.332 19.938 \n" + "c 44.07 19.668 43.844 19.336 43.656 18.941 c 43.59 18.941 l 43.598 18.977\n" + " 43.605 19.07 43.613 19.215 c 43.621 19.359 43.629 19.531 43.637 19.727 \n" + "c 43.645 19.914 43.648 20.121 43.648 20.34 c 43.656 20.551 43.66 20.746 \n" + "43.66 20.93 c 43.66 25.465 l 40.59 25.465 l 40.59 11.719 l 40.59 11.113 \n" + "40.578 10.574 40.559 10.102 c 40.543 9.629 40.527 9.262 40.504 8.996 c 43.488\n" + " 8.996 l 43.504 9.047 43.516 9.145 43.531 9.293 c 43.555 9.438 43.566 9.605\n" + " 43.574 9.797 c 43.59 9.984 43.602 10.184 43.605 10.387 c 43.613 10.59 43.617\n" + " 10.77 43.617 10.922 c 43.66 10.922 l 44.031 10.141 44.543 9.586 45.191 \n" + "9.25 c 45.84 8.914 46.59 8.746 47.441 8.746 c 48.191 8.746 48.84 8.898 49.387\n" + " 9.203 c 49.934 9.508 50.383 9.93 50.73 10.469 c 51.086 11.008 51.352 11.652\n" + " 51.516 12.402 c 51.691 13.145 51.777 13.961 51.777 14.852 c 48.574 14.852\n" + " m 48.574 13.504 48.371 12.508 47.961 11.859 c 47.555 11.203 46.945 10.875\n" + " 46.137 10.875 c 45.832 10.875 45.523 10.941 45.219 11.07 c 44.922 11.195\n" + " 44.652 11.414 44.41 11.727 c 44.176 12.031 43.984 12.449 43.832 12.973 \n" + "c 43.688 13.488 43.613 14.145 43.613 14.941 c 43.613 15.715 43.688 16.359\n" + " 43.832 16.875 c 43.977 17.387 44.168 17.793 44.398 18.098 c 44.641 18.402\n" + " 44.91 18.621 45.207 18.754 c 45.504 18.879 45.809 18.941 46.113 18.941 \n" + "c 46.508 18.941 46.855 18.863 47.164 18.711 c 47.469 18.551 47.727 18.309\n" + " 47.93 17.98 c 48.141 17.645 48.301 17.219 48.41 16.703 c 48.52 16.188 48.574\n" + " 15.57 48.574 14.855 c 72.965 16.387 m 72.965 17.086 72.836 17.723 72.582\n" + " 18.301 c 72.328 18.867 71.93 19.355 71.391 19.766 c 70.859 20.172 70.176\n" + " 20.492 69.336 20.715 c 68.504 20.934 67.516 21.043 66.363 21.043 c 65.344\n" + " 21.043 64.445 20.953 63.664 20.77 c 62.883 20.586 62.215 20.316 61.652 \n" + "19.961 c 61.098 19.605 60.648 19.164 60.297 18.641 c 59.953 18.109 59.707\n" + " 17.5 59.555 16.816 c 62.668 16.305 l 62.754 16.648 62.883 16.961 63.051\n" + " 17.246 c 63.219 17.531 63.449 17.777 63.738 17.988 c 64.035 18.191 64.406\n" + " 18.352 64.844 18.469 c 65.289 18.578 65.824 18.633 66.449 18.633 c 67.543\n" + " 18.633 68.375 18.469 68.953 18.141 c 69.535 17.805 69.828 17.285 69.828\n" + " 16.578 c 69.828 16.156 69.711 15.809 69.477 15.539 c 69.242 15.27 68.934\n" + " 15.047 68.547 14.871 c 68.16 14.695 67.715 14.551 67.215 14.434 c 66.711\n" + " 14.316 66.188 14.203 65.641 14.094 c 65.203 13.992 64.766 13.887 64.328\n" + " 13.777 c 63.891 13.668 63.473 13.535 63.07 13.383 c 62.676 13.23 62.309\n" + " 13.047 61.965 12.836 c 61.621 12.625 61.324 12.367 61.07 12.059 c 60.824\n" + " 11.746 60.625 11.383 60.48 10.965 c 60.344 10.551 60.273 10.062 60.273 \n" + "9.5 c 60.273 8.734 60.426 8.078 60.73 7.531 c 61.035 6.984 61.457 6.539 \n" + "61.996 6.199 c 62.543 5.848 63.191 5.594 63.941 5.434 c 64.691 5.273 65.512\n" + " 5.191 66.398 5.191 c 67.402 5.191 68.262 5.273 68.977 5.434 c 69.699 5.586\n" + " 70.297 5.824 70.781 6.145 c 71.27 6.465 71.652 6.871 71.93 7.355 c 72.215\n" + " 7.836 72.422 8.402 72.551 9.051 c 69.426 9.477 l 69.266 8.812 68.938 8.316\n" + " 68.441 7.98 c 67.953 7.645 67.25 7.477 66.332 7.477 c 65.766 7.477 65.289\n" + " 7.527 64.91 7.629 c 64.539 7.723 64.238 7.855 64.016 8.023 c 63.797 8.191\n" + " 63.641 8.387 63.547 8.613 c 63.453 8.832 63.406 9.066 63.406 9.312 c 63.406\n" + " 9.691 63.496 10.004 63.68 10.254 c 63.863 10.496 64.117 10.699 64.445 10.867\n" + " c 64.773 11.027 65.164 11.164 65.613 11.281 c 66.07 11.391 66.574 11.504\n" + " 67.121 11.621 c 67.602 11.723 68.078 11.832 68.551 11.949 c 69.023 12.059\n" + " 69.477 12.191 69.906 12.344 c 70.336 12.496 70.738 12.684 71.109 12.902\n" + " c 71.48 13.121 71.801 13.391 72.07 13.711 c 72.348 14.023 72.562 14.398\n" + " 72.715 14.836 c 72.875 15.273 72.957 15.789 72.957 16.387 c 80.258 21.043\n" + " m 79.406 21.043 78.637 20.918 77.953 20.672 c 77.277 20.418 76.695 20.035\n" + " 76.215 19.523 c 75.734 19.008 75.367 18.363 75.109 17.59 c 74.855 16.809\n" + " 74.727 15.898 74.727 14.859 c 74.727 13.73 74.875 12.781 75.176 12.008 \n" + "c 75.48 11.234 75.891 10.613 76.398 10.141 c 76.914 9.66 77.508 9.312 78.18\n" + " 9.102 c 78.852 8.891 79.555 8.785 80.301 8.785 c 81.234 8.785 82.027 8.949\n" + " 82.684 9.277 c 83.348 9.598 83.891 10.051 84.312 10.633 c 84.734 11.215\n" + " 85.043 11.914 85.242 12.73 c 85.438 13.539 85.539 14.434 85.539 15.418 \n" + "c 85.539 15.504 l 77.957 15.504 l 77.957 16 78 16.461 78.09 16.891 c 78.176\n" + " 17.312 78.32 17.68 78.516 17.996 c 78.711 18.301 78.969 18.547 79.281 18.727\n" + " c 79.594 18.902 79.973 18.988 80.418 18.988 c 80.957 18.988 81.398 18.875\n" + " 81.738 18.648 c 82.082 18.414 82.324 18.059 82.469 17.578 c 85.363 17.828\n" + " l 85.23 18.164 85.047 18.52 84.805 18.898 c 84.57 19.277 84.258 19.625 \n" + "83.863 19.949 c 83.469 20.262 82.977 20.523 82.387 20.734 c 81.805 20.938\n" + " 81.094 21.039 80.258 21.039 c 80.258 10.715 m 79.945 10.715 79.648 10.77\n" + " 79.371 10.879 c 79.102 10.98 78.863 11.148 78.66 11.383 c 78.465 11.609\n" + " 78.305 11.902 78.18 12.27 c 78.055 12.633 77.988 13.07 77.973 13.582 c \n" + "82.562 13.582 l 82.504 12.629 82.273 11.914 81.875 11.441 c 81.473 10.961\n" + " 80.934 10.719 80.258 10.719 c 92.801 21.043 m 91.859 21.043 91.039 20.898\n" + " 90.332 20.605 c 89.633 20.312 89.051 19.902 88.582 19.371 c 88.117 18.84\n" + " 87.766 18.203 87.531 17.457 c 87.297 16.707 87.18 15.879 87.18 14.977 c\n" + " 87.18 13.992 87.309 13.117 87.562 12.355 c 87.816 11.582 88.184 10.934 \n" + "88.668 10.41 c 89.148 9.879 89.738 9.473 90.438 9.199 c 91.145 8.922 91.945\n" + " 8.785 92.84 8.785 c 93.605 8.785 94.281 8.887 94.871 9.09 c 95.469 9.293\n" + " 95.98 9.574 96.41 9.93 c 96.84 10.281 97.188 10.695 97.449 11.176 c 97.719\n" + " 11.656 97.906 12.172 98.008 12.727 c 94.914 12.879 l 94.828 12.273 94.609\n" + " 11.793 94.258 11.438 c 93.906 11.074 93.414 10.891 92.773 10.891 c 91.949\n" + " 10.891 91.348 11.23 90.969 11.906 c 90.59 12.582 90.402 13.566 90.402 14.855\n" + " c 90.402 17.578 91.207 18.941 92.816 18.941 c 93.398 18.941 93.887 18.758\n" + " 94.281 18.395 c 94.676 18.023 94.918 17.473 95.012 16.746 c 98.094 16.887\n" + " l 98.02 17.434 97.852 17.957 97.59 18.461 c 97.336 18.957 96.984 19.398\n" + " 96.539 19.781 c 96.102 20.16 95.57 20.465 94.945 20.699 c 94.32 20.926 \n" + "93.602 21.039 92.793 21.039 c 100.32 20.82 m 100.32 11.773 l 100.32 11.52\n" + " 100.316 11.25 100.309 10.965 c 100.309 10.68 100.301 10.41 100.285 10.156\n" + " c 100.277 9.895 100.27 9.66 100.262 9.457 c 100.254 9.246 100.242 9.094\n" + " 100.23 9 c 103.16 9 l 103.176 9.086 103.188 9.242 103.203 9.457 c 103.219\n" + " 9.668 103.23 9.902 103.246 10.156 c 103.262 10.41 103.273 10.668 103.277\n" + " 10.922 c 103.293 11.168 103.301 11.371 103.301 11.523 c 103.344 11.523 \n" + "l 103.496 11.094 103.648 10.711 103.801 10.375 c 103.953 10.031 104.133 \n" + "9.746 104.336 9.512 c 104.547 9.27 104.797 9.09 105.09 8.965 c 105.383 8.832\n" + " 105.742 8.77 106.172 8.77 c 106.355 8.77 106.531 8.789 106.707 8.824 c \n" + "106.891 8.852 107.027 8.891 107.121 8.934 c 107.121 11.5 l 106.926 11.457\n" + " 106.723 11.418 106.52 11.391 c 106.324 11.355 106.086 11.336 105.809 11.336\n" + " c 105.043 11.336 104.445 11.645 104.016 12.266 c 103.594 12.887 103.383\n" + " 13.801 103.383 15.02 c 103.383 20.82 l 100.312 20.82 l 113.852 21.039 m\n" + " 113 21.039 112.23 20.914 111.547 20.668 c 110.871 20.414 110.289 20.031\n" + " 109.809 19.52 c 109.328 19.004 108.961 18.359 108.703 17.586 c 108.449 \n" + "16.805 108.32 15.895 108.32 14.855 c 108.32 13.727 108.469 12.777 108.77\n" + " 12.004 c 109.074 11.23 109.484 10.609 109.992 10.137 c 110.508 9.656 111.102\n" + " 9.309 111.773 9.098 c 112.445 8.887 113.148 8.781 113.895 8.781 c 114.828\n" + " 8.781 115.621 8.945 116.277 9.273 c 116.941 9.594 117.484 10.047 117.906\n" + " 10.629 c 118.328 11.211 118.637 11.91 118.836 12.727 c 119.031 13.535 119.133\n" + " 14.43 119.133 15.414 c 119.133 15.5 l 111.551 15.5 l 111.551 15.996 111.594\n" + " 16.457 111.684 16.887 c 111.77 17.309 111.914 17.676 112.109 17.992 c 112.305\n" + " 18.297 112.562 18.543 112.875 18.723 c 113.188 18.898 113.566 18.984 114.012\n" + " 18.984 c 114.551 18.984 114.992 18.871 115.332 18.645 c 115.676 18.41 115.918\n" + " 18.055 116.062 17.574 c 118.957 17.824 l 118.824 18.16 118.641 18.516 118.398\n" + " 18.895 c 118.164 19.273 117.852 19.621 117.457 19.945 c 117.062 20.258 \n" + "116.57 20.52 115.98 20.73 c 115.398 20.934 114.688 21.035 113.852 21.035\n" + " c 113.852 10.711 m 113.539 10.711 113.242 10.766 112.965 10.875 c 112.695\n" + " 10.977 112.457 11.145 112.254 11.379 c 112.059 11.605 111.898 11.898 111.773\n" + " 12.266 c 111.648 12.629 111.582 13.066 111.566 13.578 c 116.156 13.578 \n" + "l 116.098 12.625 115.867 11.91 115.469 11.438 c 115.066 10.957 114.527 10.715\n" + " 113.852 10.715 c 124.496 21.02 m 123.594 21.02 122.898 20.777 122.41 20.289\n" + " c 121.922 19.793 121.68 19.047 121.68 18.051 c 121.68 11.078 l 120.184 \n" + "11.078 l 120.184 9.004 l 121.832 9.004 l 122.793 6.227 l 124.715 6.227 l\n" + " 124.715 9.004 l 126.953 9.004 l 126.953 11.078 l 124.715 11.078 l 124.715\n" + " 17.219 l 124.715 17.793 124.824 18.219 125.043 18.496 c 125.262 18.766 \n" + "125.602 18.902 126.059 18.898 c 126.246 18.898 126.418 18.883 126.57 18.855\n" + " c 126.723 18.828 126.895 18.789 127.082 18.746 c 127.082 20.648 l 126.703\n" + " 20.773 126.301 20.863 125.879 20.922 c 125.457 20.988 124.992 21.02 124.492\n" + " 21.02 c S Q\n" + "Q q\n" + "0 0 141 26.484 re W n\n" + "0.74902 0 0 rg /a1 gs\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 137.859 26.086 l 139.488 26.086 140.859\n" + " 24.715 140.859 23.086 c 140.859 3.398 l 140.859 1.77 139.488 0.398 137.859\n" + " 0.398 c h\n" + "3.867 3.844 m 137.414 3.844 l 137.414 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m f\n" + "Q q\n" + "1 1 1 RG /a1 gs\n" + "0.797243 w\n" + "1 J\n" + "1 j\n" + "[] 0.0 d\n" + "4 M q 1 0 0 1 0 0 cm\n" + "3.398 0.398 m 1.77 0.398 0.398 1.77 0.398 3.398 c 0.398 23.086 l 0.398 \n" + "24.715 1.77 26.086 3.398 26.086 c 137.859 26.086 l 139.488 26.086 140.859\n" + " 24.715 140.859 23.086 c 140.859 3.398 l 140.859 1.77 139.488 0.398 137.859\n" + " 0.398 c h\n" + "3.867 3.844 m 137.414 3.844 l 137.414 22.617 l 3.867 22.617 l h\n" + "3.867 3.844 m S Q\n" + "Q\n"; + +static Dict *getTopSecretStampExtGStateDict(PDFDoc *doc) +{ + Dict *a0Dict = new Dict(doc->getXRef()); + a0Dict->add("CA", Object(0.588235)); + a0Dict->add("ca", Object(0.588235)); + + Dict *a1Dict = new Dict(doc->getXRef()); + a1Dict->add("CA", Object(1)); + a1Dict->add("ca", Object(1)); + + Dict *extGStateDict = new Dict(doc->getXRef()); + extGStateDict->add("a0", Object(a0Dict)); + extGStateDict->add("a1", Object(a1Dict)); + + return extGStateDict; +} + +#endif diff --git a/poppler-24.05.0/poppler/gen-unicode-tables.py b/poppler-24.05.0/poppler/gen-unicode-tables.py new file mode 100644 index 0000000000000000000000000000000000000000..d15beb7db49ef664affd8c154203d30297de6b40 --- /dev/null +++ b/poppler-24.05.0/poppler/gen-unicode-tables.py @@ -0,0 +1,53 @@ +from __future__ import absolute_import, division, print_function + +import sys +import unicodedata + + +if sys.version_info[0] == 2: + chr = unichr + +UNICODE_LAST_CHAR_PART1 = 0x2FAFF +HANGUL_S_BASE = 0xAC00 +HANGUL_S_COUNT = 19 * 21 * 28 + + +print("""// Generated by gen-unicode-tables.py + +typedef struct { + Unicode character; + int length; + int offset; +} decomposition; +""") + +decomp_table = [] +max_index = 0 +decomp_expansion_index = {} +decomp_expansion = [] +for u in range(0, UNICODE_LAST_CHAR_PART1): + if HANGUL_S_BASE <= u < HANGUL_S_BASE + HANGUL_S_COUNT: + continue + norm = tuple(map(ord, unicodedata.normalize("NFKD", chr(u)))) + if norm != (u, ): + try: + i = decomp_expansion_index[norm] + decomp_table.append((u, len(norm), i)) + except KeyError: + decomp_table.append((u, len(norm), max_index)) + decomp_expansion_index[norm] = max_index + decomp_expansion.append((norm, max_index)) + max_index += len(norm) +print("#define DECOMP_TABLE_LENGTH %d" % (len(decomp_table), )) +print() +print("static const decomposition decomp_table[] = {") +print(*(" { 0x%x, %d, %d }" % (character, length, offset) + for character, length, offset in decomp_table), + sep=",\n") +print("};") +print() +print("static const Unicode decomp_expansion[] = {") +print(*(" %s /* offset %d */" % (", ".join("0x%x" % u for u in norm), index) + for norm, index in decomp_expansion), + sep=" ,\n") +print("};") diff --git a/poppler-24.05.0/qt5/CMakeLists.txt b/poppler-24.05.0/qt5/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..431d2d357100d9f7d056704e55164df1148d5749 --- /dev/null +++ b/poppler-24.05.0/qt5/CMakeLists.txt @@ -0,0 +1,13 @@ +set(CMAKE_AUTOMOC ON) + +set(ENABLE_QT_STRICT_ITERATORS ON CACHE BOOL "Select whether to compile with QT_STRICT_ITERATORS. Leave it ON, unless your Qt lacks support, or your compiler can't do SRA optimization.") +if(ENABLE_QT_STRICT_ITERATORS) + add_definitions(-DQT_STRICT_ITERATORS) +endif() + +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050E00) +add_definitions(-DQT_NO_DEPRECATED_WARNINGS) + +add_subdirectory(src) +add_subdirectory(tests) +add_subdirectory(demos) diff --git a/poppler-24.05.0/qt5/demos/CMakeLists.txt b/poppler-24.05.0/qt5/demos/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..37374bbaa7c9adbc10bc739401c02baeef3ab2bf --- /dev/null +++ b/poppler-24.05.0/qt5/demos/CMakeLists.txt @@ -0,0 +1,26 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../src + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/../src +) + +set(poppler_qt5viewer_SRCS + abstractinfodock.cpp + documentobserver.cpp + embeddedfiles.cpp + fonts.cpp + info.cpp + main_viewer.cpp + metadata.cpp + navigationtoolbar.cpp + optcontent.cpp + pageview.cpp + permissions.cpp + thumbnails.cpp + toc.cpp + viewer.cpp +) + +poppler_add_test(poppler_qt5viewer BUILD_QT5_TESTS ${poppler_qt5viewer_SRCS}) +target_link_libraries(poppler_qt5viewer poppler-qt5 Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml) diff --git a/poppler-24.05.0/qt5/demos/abstractinfodock.cpp b/poppler-24.05.0/qt5/demos/abstractinfodock.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8a2e216406413afff3ad969a8a48705cd570de24 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/abstractinfodock.cpp @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "fonts.h" + +AbstractInfoDock::AbstractInfoDock(QWidget *parent) : QDockWidget(parent), m_filled(false) +{ + connect(this, &AbstractInfoDock::visibilityChanged, this, &AbstractInfoDock::slotVisibilityChanged); +} + +AbstractInfoDock::~AbstractInfoDock() { } + +void AbstractInfoDock::documentLoaded() +{ + if (!isHidden()) { + fillInfo(); + m_filled = true; + } +} + +void AbstractInfoDock::documentClosed() +{ + m_filled = false; +} + +void AbstractInfoDock::pageChanged(int page) +{ + Q_UNUSED(page) +} + +void AbstractInfoDock::slotVisibilityChanged(bool visible) +{ + if (visible && document() && !m_filled) { + fillInfo(); + m_filled = true; + } +} diff --git a/poppler-24.05.0/qt5/demos/abstractinfodock.h b/poppler-24.05.0/qt5/demos/abstractinfodock.h new file mode 100644 index 0000000000000000000000000000000000000000..9dd2576f81c5a07f2a4a8d8c551aeab21ef58122 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/abstractinfodock.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef ABSTRACTINFODOCK_H +#define ABSTRACTINFODOCK_H + +#include + +#include "documentobserver.h" + +class AbstractInfoDock : public QDockWidget, public DocumentObserver +{ + Q_OBJECT + +public: + explicit AbstractInfoDock(QWidget *parent = nullptr); + ~AbstractInfoDock() override; + + void documentLoaded() override; + void documentClosed() override; + void pageChanged(int page) override; + +protected: + virtual void fillInfo() = 0; + +private Q_SLOTS: + void slotVisibilityChanged(bool visible); + +private: + bool m_filled; +}; + +#endif diff --git a/poppler-24.05.0/qt5/demos/documentobserver.cpp b/poppler-24.05.0/qt5/demos/documentobserver.cpp new file mode 100644 index 0000000000000000000000000000000000000000..5bf41ac87a5a11f3b17808823d264d0abd26223b --- /dev/null +++ b/poppler-24.05.0/qt5/demos/documentobserver.cpp @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "documentobserver.h" + +#include "viewer.h" + +DocumentObserver::DocumentObserver() : m_viewer(nullptr) { } + +DocumentObserver::~DocumentObserver() { } + +Poppler::Document *DocumentObserver::document() const +{ + return m_viewer->m_doc; +} + +void DocumentObserver::setPage(int page) +{ + m_viewer->setPage(page); +} + +int DocumentObserver::page() const +{ + return m_viewer->page(); +} + +void DocumentObserver::reloadPage() +{ + m_viewer->setPage(m_viewer->page()); +} diff --git a/poppler-24.05.0/qt5/demos/documentobserver.h b/poppler-24.05.0/qt5/demos/documentobserver.h new file mode 100644 index 0000000000000000000000000000000000000000..83ac12ee8f516013ea354542bd45a7d145c77354 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/documentobserver.h @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2018, Albert Astals Cid + * + * 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. + */ + +#ifndef DOCUMENTOBSERVER_H +#define DOCUMENTOBSERVER_H + +class PdfViewer; +namespace Poppler { +class Document; +} + +class DocumentObserver +{ + friend class PdfViewer; + +public: + virtual ~DocumentObserver(); + DocumentObserver(const DocumentObserver &) = delete; + DocumentObserver &operator=(const DocumentObserver &) = delete; + + virtual void documentLoaded() = 0; + virtual void documentClosed() = 0; + virtual void pageChanged(int page) = 0; + +protected: + DocumentObserver(); + + Poppler::Document *document() const; + void setPage(int page); + int page() const; + void reloadPage(); + +private: + PdfViewer *m_viewer; +}; + +#endif diff --git a/poppler-24.05.0/qt5/demos/embeddedfiles.cpp b/poppler-24.05.0/qt5/demos/embeddedfiles.cpp new file mode 100644 index 0000000000000000000000000000000000000000..aa7da467753224d26a978f142dc7648c3390fa04 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/embeddedfiles.cpp @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "embeddedfiles.h" + +#include + +#include + +EmbeddedFilesDock::EmbeddedFilesDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_table = new QTableWidget(this); + setWidget(m_table); + setWindowTitle(tr("Embedded files")); + m_table->setColumnCount(6); + m_table->setHorizontalHeaderLabels(QStringList() << tr("Name") << tr("Description") << tr("Size") << tr("Creation date") << tr("Modification date") << tr("Checksum")); + m_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); +} + +EmbeddedFilesDock::~EmbeddedFilesDock() { } + +void EmbeddedFilesDock::fillInfo() +{ + m_table->setHorizontalHeaderLabels(QStringList() << tr("Name") << tr("Description") << tr("Size") << tr("Creation date") << tr("Modification date") << tr("Checksum")); + if (!document()->hasEmbeddedFiles()) { + m_table->setItem(0, 0, new QTableWidgetItem(tr("No files"))); + return; + } + + const QList files = document()->embeddedFiles(); + m_table->setRowCount(files.count()); + int i = 0; + Q_FOREACH (Poppler::EmbeddedFile *file, files) { + m_table->setItem(i, 0, new QTableWidgetItem(file->name())); + m_table->setItem(i, 1, new QTableWidgetItem(file->description())); + m_table->setItem(i, 2, new QTableWidgetItem(QString::number(file->size()))); + m_table->setItem(i, 3, new QTableWidgetItem(file->createDate().toString(Qt::SystemLocaleDate))); + m_table->setItem(i, 4, new QTableWidgetItem(file->modDate().toString(Qt::SystemLocaleDate))); + const QByteArray checksum = file->checksum(); + const QString checksumString = !checksum.isEmpty() ? QString::fromLatin1(checksum.toHex()) : QStringLiteral("n/a"); + m_table->setItem(i, 5, new QTableWidgetItem(checksumString)); + ++i; + } +} + +void EmbeddedFilesDock::documentLoaded() +{ + if (document()->pageMode() == Poppler::Document::UseAttach) { + show(); + } +} + +void EmbeddedFilesDock::documentClosed() +{ + m_table->clear(); + m_table->setRowCount(0); + AbstractInfoDock::documentClosed(); +} diff --git a/poppler-24.05.0/qt5/demos/embeddedfiles.h b/poppler-24.05.0/qt5/demos/embeddedfiles.h new file mode 100644 index 0000000000000000000000000000000000000000..e4a40403562f8b7566d6ec107d1429ad7a555f2d --- /dev/null +++ b/poppler-24.05.0/qt5/demos/embeddedfiles.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef ATTACHMENTS_H +#define ATTACHMENTS_H + +#include "abstractinfodock.h" + +class QTableWidget; + +class EmbeddedFilesDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit EmbeddedFilesDock(QWidget *parent = nullptr); + ~EmbeddedFilesDock() override; + + void documentLoaded() override; + void documentClosed() override; + +protected: + void fillInfo() override; + +private: + QTableWidget *m_table; +}; + +#endif diff --git a/poppler-24.05.0/qt5/demos/fonts.cpp b/poppler-24.05.0/qt5/demos/fonts.cpp new file mode 100644 index 0000000000000000000000000000000000000000..6982bbf54e1d1596cf63812dff3d0afe748cf9e5 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/fonts.cpp @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "fonts.h" + +#include + +#include + +static QString yesNoStatement(bool value) +{ + return value ? QStringLiteral("yes") : QStringLiteral("no"); +} + +FontsDock::FontsDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_table = new QTableWidget(this); + setWidget(m_table); + setWindowTitle(tr("Fonts")); + m_table->setColumnCount(5); + m_table->setHorizontalHeaderLabels(QStringList() << tr("Name") << tr("Type") << tr("Embedded") << tr("Subset") << tr("File")); + m_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); +} + +FontsDock::~FontsDock() { } + +void FontsDock::fillInfo() +{ + const QList fonts = document()->fonts(); + m_table->setHorizontalHeaderLabels(QStringList() << tr("Name") << tr("Type") << tr("Embedded") << tr("Subset") << tr("File")); + m_table->setRowCount(fonts.count()); + int i = 0; + Q_FOREACH (const Poppler::FontInfo &font, fonts) { + if (font.name().isNull()) { + m_table->setItem(i, 0, new QTableWidgetItem(QStringLiteral("[none]"))); + } else { + m_table->setItem(i, 0, new QTableWidgetItem(font.name())); + } + m_table->setItem(i, 1, new QTableWidgetItem(font.typeName())); + m_table->setItem(i, 2, new QTableWidgetItem(yesNoStatement(font.isEmbedded()))); + m_table->setItem(i, 3, new QTableWidgetItem(yesNoStatement(font.isSubset()))); + m_table->setItem(i, 4, new QTableWidgetItem(font.file())); + ++i; + } +} + +void FontsDock::documentClosed() +{ + m_table->clear(); + m_table->setRowCount(0); + AbstractInfoDock::documentClosed(); +} diff --git a/poppler-24.05.0/qt5/demos/fonts.h b/poppler-24.05.0/qt5/demos/fonts.h new file mode 100644 index 0000000000000000000000000000000000000000..e8fed63f28b5096fe55efb5bee4ca48ea4e4faa1 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/fonts.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef FONTS_H +#define FONTS_H + +#include "abstractinfodock.h" + +class QTableWidget; + +class FontsDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit FontsDock(QWidget *parent = nullptr); + ~FontsDock() override; + + void documentClosed() override; + +protected: + void fillInfo() override; + +private: + QTableWidget *m_table; +}; + +#endif diff --git a/poppler-24.05.0/qt5/demos/info.cpp b/poppler-24.05.0/qt5/demos/info.cpp new file mode 100644 index 0000000000000000000000000000000000000000..a3d35338db4c6cdeba419634cc3bd81ead79f947 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/info.cpp @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "info.h" + +#include + +#include + +InfoDock::InfoDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_table = new QTableWidget(this); + setWidget(m_table); + setWindowTitle(tr("Information")); + m_table->setColumnCount(2); + m_table->setHorizontalHeaderLabels(QStringList() << tr("Key") << tr("Value")); + m_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); +} + +InfoDock::~InfoDock() { } + +void InfoDock::fillInfo() +{ + QStringList keys = document()->infoKeys(); + m_table->setHorizontalHeaderLabels(QStringList() << tr("Key") << tr("Value")); + m_table->setRowCount(keys.count()); + QStringList dateKeys; + dateKeys << QStringLiteral("CreationDate"); + dateKeys << QStringLiteral("ModDate"); + int i = 0; + Q_FOREACH (const QString &date, dateKeys) { + const int id = keys.indexOf(date); + if (id != -1) { + m_table->setItem(i, 0, new QTableWidgetItem(date)); + m_table->setItem(i, 1, new QTableWidgetItem(document()->date(date).toString(Qt::SystemLocaleDate))); + ++i; + keys.removeAt(id); + } + } + Q_FOREACH (const QString &key, keys) { + m_table->setItem(i, 0, new QTableWidgetItem(key)); + m_table->setItem(i, 1, new QTableWidgetItem(document()->info(key))); + ++i; + } +} + +void InfoDock::documentClosed() +{ + m_table->clear(); + m_table->setRowCount(0); + AbstractInfoDock::documentClosed(); +} diff --git a/poppler-24.05.0/qt5/demos/info.h b/poppler-24.05.0/qt5/demos/info.h new file mode 100644 index 0000000000000000000000000000000000000000..0bbcf75d2089a4edc3c0f30d71794682099fd82a --- /dev/null +++ b/poppler-24.05.0/qt5/demos/info.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef INFO_H +#define INFO_H + +#include "abstractinfodock.h" + +class QTableWidget; + +class InfoDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit InfoDock(QWidget *parent = nullptr); + ~InfoDock() override; + + void documentClosed() override; + +protected: + void fillInfo() override; + +private: + QTableWidget *m_table; +}; + +#endif diff --git a/poppler-24.05.0/qt5/demos/main_viewer.cpp b/poppler-24.05.0/qt5/demos/main_viewer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ad2f3885a68579bde3be0bc0f5a451a600c9496a --- /dev/null +++ b/poppler-24.05.0/qt5/demos/main_viewer.cpp @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "viewer.h" + +#include + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + const QStringList args = QCoreApplication::arguments(); + PdfViewer *viewer = new PdfViewer(); + viewer->show(); + if (args.count() > 1) { + viewer->loadDocument(args.at(1)); + } + return app.exec(); +} diff --git a/poppler-24.05.0/qt5/demos/metadata.cpp b/poppler-24.05.0/qt5/demos/metadata.cpp new file mode 100644 index 0000000000000000000000000000000000000000..5630db240b76f6163f851416e6fe1a2e36c72aae --- /dev/null +++ b/poppler-24.05.0/qt5/demos/metadata.cpp @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "metadata.h" + +#include + +#include + +MetadataDock::MetadataDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_edit = new QTextEdit(this); + setWidget(m_edit); + setWindowTitle(tr("Metadata")); + m_edit->setAcceptRichText(false); + m_edit->setReadOnly(true); +} + +MetadataDock::~MetadataDock() { } + +void MetadataDock::fillInfo() +{ + m_edit->setPlainText(document()->metadata()); +} + +void MetadataDock::documentClosed() +{ + m_edit->clear(); + AbstractInfoDock::documentClosed(); +} diff --git a/poppler-24.05.0/qt5/demos/metadata.h b/poppler-24.05.0/qt5/demos/metadata.h new file mode 100644 index 0000000000000000000000000000000000000000..0d58e840dbe781c924e9b1dadfc51fbfbb4f2947 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/metadata.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef METADATA_H +#define METADATA_H + +#include "abstractinfodock.h" + +class QTextEdit; + +class MetadataDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit MetadataDock(QWidget *parent = nullptr); + ~MetadataDock() override; + + void documentClosed() override; + +protected: + void fillInfo() override; + +private: + QTextEdit *m_edit; +}; + +#endif diff --git a/poppler-24.05.0/qt5/demos/navigationtoolbar.cpp b/poppler-24.05.0/qt5/demos/navigationtoolbar.cpp new file mode 100644 index 0000000000000000000000000000000000000000..74b32400df272e0f7b0248875cabaadb336a9ce0 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/navigationtoolbar.cpp @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * Copyright (C) 2013, Fabio D'Urso + * Copyright (C) 2019, 2022, Albert Astals Cid + * + * 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 "navigationtoolbar.h" + +#include + +#include +#include + +NavigationToolBar::NavigationToolBar(QWidget *parent) : QToolBar(parent) +{ + m_firstAct = addAction(tr("First"), this, SLOT(slotGoFirst())); + m_prevAct = addAction(tr("Previous"), this, SLOT(slotGoPrev())); + m_pageCombo = new QComboBox(this); + connect(m_pageCombo, qOverload(&QComboBox::activated), this, &NavigationToolBar::slotComboActivated); + addWidget(m_pageCombo); + m_nextAct = addAction(tr("Next"), this, SLOT(slotGoNext())); + m_lastAct = addAction(tr("Last"), this, SLOT(slotGoLast())); + + addSeparator(); + + m_zoomCombo = new QComboBox(this); + m_zoomCombo->setEditable(true); + m_zoomCombo->addItem(tr("10%")); + m_zoomCombo->addItem(tr("25%")); + m_zoomCombo->addItem(tr("33%")); + m_zoomCombo->addItem(tr("50%")); + m_zoomCombo->addItem(tr("66%")); + m_zoomCombo->addItem(tr("75%")); + m_zoomCombo->addItem(tr("100%")); + m_zoomCombo->addItem(tr("125%")); + m_zoomCombo->addItem(tr("150%")); + m_zoomCombo->addItem(tr("200%")); + m_zoomCombo->addItem(tr("300%")); + m_zoomCombo->addItem(tr("400%")); + m_zoomCombo->setCurrentIndex(6); // "100%" + connect(m_zoomCombo, qOverload(&QComboBox::currentIndexChanged), this, &NavigationToolBar::slotZoomComboChanged); + addWidget(m_zoomCombo); + + m_rotationCombo = new QComboBox(this); + // NOTE: \302\260 = degree symbol + m_rotationCombo->addItem(tr("0\302\260")); + m_rotationCombo->addItem(tr("90\302\260")); + m_rotationCombo->addItem(tr("180\302\260")); + m_rotationCombo->addItem(tr("270\302\260")); + connect(m_rotationCombo, qOverload(&QComboBox::currentIndexChanged), this, &NavigationToolBar::slotRotationComboChanged); + addWidget(m_rotationCombo); + + documentClosed(); +} + +NavigationToolBar::~NavigationToolBar() { } + +void NavigationToolBar::documentLoaded() +{ + const int pageCount = document()->numPages(); + for (int i = 0; i < pageCount; ++i) { + m_pageCombo->addItem(QString::number(i + 1)); + } + m_pageCombo->setEnabled(true); +} + +void NavigationToolBar::documentClosed() +{ + m_firstAct->setEnabled(false); + m_prevAct->setEnabled(false); + m_nextAct->setEnabled(false); + m_lastAct->setEnabled(false); + m_pageCombo->clear(); + m_pageCombo->setEnabled(false); +} + +void NavigationToolBar::pageChanged(int page) +{ + const int pageCount = document()->numPages(); + m_firstAct->setEnabled(page > 0); + m_prevAct->setEnabled(page > 0); + m_nextAct->setEnabled(page < (pageCount - 1)); + m_lastAct->setEnabled(page < (pageCount - 1)); + m_pageCombo->setCurrentIndex(page); +} + +void NavigationToolBar::slotGoFirst() +{ + setPage(0); +} + +void NavigationToolBar::slotGoPrev() +{ + setPage(page() - 1); +} + +void NavigationToolBar::slotGoNext() +{ + setPage(page() + 1); +} + +void NavigationToolBar::slotGoLast() +{ + setPage(document()->numPages() - 1); +} + +void NavigationToolBar::slotComboActivated(int index) +{ + setPage(index); +} + +void NavigationToolBar::slotZoomComboChanged(const QString &_text) +{ + QString text = _text; + text.remove(QLatin1Char('%')); + bool ok = false; + int value = text.toInt(&ok); + if (ok && value >= 10) { + emit zoomChanged(qreal(value) / 100); + } +} + +void NavigationToolBar::slotRotationComboChanged(int idx) +{ + emit rotationChanged(idx * 90); +} diff --git a/poppler-24.05.0/qt5/demos/navigationtoolbar.h b/poppler-24.05.0/qt5/demos/navigationtoolbar.h new file mode 100644 index 0000000000000000000000000000000000000000..f312d28f8b79e44597b017ad206235fa3901d547 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/navigationtoolbar.h @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * Copyright (C) 2013, Fabio D'Urso + * Copyright (C) 2019, 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef NAVIGATIONTOOLBAR_H +#define NAVIGATIONTOOLBAR_H + +#include + +#include "documentobserver.h" + +class QAction; +class QComboBox; + +class NavigationToolBar : public QToolBar, public DocumentObserver +{ + Q_OBJECT + +public: + explicit NavigationToolBar(QWidget *parent = nullptr); + ~NavigationToolBar() override; + + void documentLoaded() override; + void documentClosed() override; + void pageChanged(int page) override; + +Q_SIGNALS: + void zoomChanged(qreal value); // NOLINT(readability-inconsistent-declaration-parameter-name) + void rotationChanged(int rotation); // NOLINT(readability-inconsistent-declaration-parameter-name) + +private Q_SLOTS: + void slotGoFirst(); + void slotGoPrev(); + void slotGoNext(); + void slotGoLast(); + void slotComboActivated(int index); + void slotZoomComboChanged(const QString &text); + void slotRotationComboChanged(int idx); + +private: + QAction *m_firstAct; + QAction *m_prevAct; + QComboBox *m_pageCombo; + QAction *m_nextAct; + QAction *m_lastAct; + QComboBox *m_zoomCombo; + QComboBox *m_rotationCombo; +}; + +#endif diff --git a/poppler-24.05.0/qt5/demos/optcontent.cpp b/poppler-24.05.0/qt5/demos/optcontent.cpp new file mode 100644 index 0000000000000000000000000000000000000000..2febed84291e3c5b79e28931ebd5be8e929b7c8d --- /dev/null +++ b/poppler-24.05.0/qt5/demos/optcontent.cpp @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "optcontent.h" + +#include + +#include + +OptContentDock::OptContentDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_view = new QTreeView(this); + setWidget(m_view); + setWindowTitle(tr("Optional content")); + m_view->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); +} + +OptContentDock::~OptContentDock() { } + +void OptContentDock::documentLoaded() +{ + AbstractInfoDock::documentLoaded(); + if (document()->pageMode() == Poppler::Document::UseOC) { + show(); + } +} + +void OptContentDock::fillInfo() +{ + if (!document()->hasOptionalContent()) { + return; + } + + m_view->setModel(document()->optionalContentModel()); + connect(m_view->model(), &QAbstractItemModel::dataChanged, this, &OptContentDock::reloadImage); + m_view->expandToDepth(1); +} + +void OptContentDock::documentClosed() +{ + m_view->setModel(nullptr); + AbstractInfoDock::documentClosed(); +} + +void OptContentDock::reloadImage() +{ + reloadPage(); +} diff --git a/poppler-24.05.0/qt5/demos/optcontent.h b/poppler-24.05.0/qt5/demos/optcontent.h new file mode 100644 index 0000000000000000000000000000000000000000..9da451bef674ac086ed6f9fd123a3892638bd050 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/optcontent.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef OPTCONTENT_H +#define OPTCONTENT_H + +#include "abstractinfodock.h" + +class QTreeView; + +class OptContentDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit OptContentDock(QWidget *parent = nullptr); + ~OptContentDock() override; + + void documentLoaded() override; + void documentClosed() override; + +protected: + void fillInfo() override; + +private Q_SLOTS: + void reloadImage(); + +private: + QTreeView *m_view; +}; + +#endif diff --git a/poppler-24.05.0/qt5/demos/pageview.cpp b/poppler-24.05.0/qt5/demos/pageview.cpp new file mode 100644 index 0000000000000000000000000000000000000000..3acfdb34ad6a9d8d4a15d2932bff85b8de1a65a3 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/pageview.cpp @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * Copyright (C) 2013, Fabio D'Urso + * Copyright (C) 2017, Albert Astals Cid + * + * 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 "pageview.h" + +#include + +#include +#include +#include +#include +#include +#include + +PageView::PageView(QWidget *parent) : QScrollArea(parent), m_zoom(1.0), m_rotation(0), m_dpiX(QApplication::desktop()->physicalDpiX()), m_dpiY(QApplication::desktop()->physicalDpiY()) +{ + m_imageLabel = new QLabel(this); + m_imageLabel->resize(0, 0); + setWidget(m_imageLabel); +} + +PageView::~PageView() { } + +void PageView::documentLoaded() { } + +void PageView::documentClosed() +{ + m_imageLabel->clear(); + m_imageLabel->resize(0, 0); +} + +void PageView::pageChanged(int page) +{ + Poppler::Page *popplerPage = document()->page(page); + + if (!popplerPage) { + qDebug() << "Page" << page << "is malformed"; + return; + } + const double resX = m_dpiX * m_zoom; + const double resY = m_dpiY * m_zoom; + + Poppler::Page::Rotation rot; + if (m_rotation == 0) { + rot = Poppler::Page::Rotate0; + } else if (m_rotation == 90) { + rot = Poppler::Page::Rotate90; + } else if (m_rotation == 180) { + rot = Poppler::Page::Rotate180; + } else { // m_rotation == 270 + rot = Poppler::Page::Rotate270; + } + + QImage image = popplerPage->renderToImage(resX, resY, -1, -1, -1, -1, rot); + if (!image.isNull()) { + m_imageLabel->resize(image.size()); + m_imageLabel->setPixmap(QPixmap::fromImage(image)); + } else { + m_imageLabel->resize(0, 0); + m_imageLabel->setPixmap(QPixmap()); + } + delete popplerPage; +} + +void PageView::slotZoomChanged(qreal value) +{ + m_zoom = value; + if (!document()) { + return; + } + reloadPage(); +} + +void PageView::slotRotationChanged(int value) +{ + m_rotation = value; + if (!document()) { + return; + } + reloadPage(); +} diff --git a/poppler-24.05.0/qt5/demos/pageview.h b/poppler-24.05.0/qt5/demos/pageview.h new file mode 100644 index 0000000000000000000000000000000000000000..c7446d4321dad35431997646c4b43bc9e1e23614 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/pageview.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * Copyright (C) 2013, Fabio D'Urso + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef PAGEVIEW_H +#define PAGEVIEW_H + +#include + +#include "documentobserver.h" + +class QLabel; + +class PageView : public QScrollArea, public DocumentObserver +{ + Q_OBJECT + +public: + explicit PageView(QWidget *parent = nullptr); + ~PageView() override; + + void documentLoaded() override; + void documentClosed() override; + void pageChanged(int page) override; + +public Q_SLOTS: + void slotZoomChanged(qreal value); + void slotRotationChanged(int value); + +private: + QLabel *m_imageLabel; + qreal m_zoom; + int m_rotation; + int m_dpiX; + int m_dpiY; +}; + +#endif diff --git a/poppler-24.05.0/qt5/demos/permissions.cpp b/poppler-24.05.0/qt5/demos/permissions.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f7d99cb15c795fdb62689bed1b9612888e5a6d69 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/permissions.cpp @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * + * 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 "permissions.h" + +#include + +#include + +PermissionsDock::PermissionsDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_table = new QListWidget(this); + setWidget(m_table); + setWindowTitle(tr("Permissions")); + m_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); +} + +PermissionsDock::~PermissionsDock() { } + +void PermissionsDock::fillInfo() +{ +#define ADD_ROW(title, function) \ + do { \ + QListWidgetItem *item = new QListWidgetItem(); \ + item->setFlags(item->flags() & ~Qt::ItemIsEnabled); \ + item->setText(QStringLiteral(title)); \ + item->setCheckState(document()->function() ? Qt::Checked : Qt::Unchecked); \ + m_table->addItem(item); \ + } while (0) + ADD_ROW("Print", okToPrint); + ADD_ROW("PrintHiRes", okToPrintHighRes); + ADD_ROW("Change", okToChange); + ADD_ROW("Copy", okToCopy); + ADD_ROW("Add Notes", okToAddNotes); + ADD_ROW("Fill Forms", okToFillForm); + ADD_ROW("Create Forms", okToCreateFormFields); + ADD_ROW("Extract for accessibility", okToExtractForAccessibility); + ADD_ROW("Assemble", okToAssemble); +#undef ADD_ROW +} + +void PermissionsDock::documentClosed() +{ + m_table->clear(); + AbstractInfoDock::documentClosed(); +} diff --git a/poppler-24.05.0/qt5/demos/permissions.h b/poppler-24.05.0/qt5/demos/permissions.h new file mode 100644 index 0000000000000000000000000000000000000000..06293ccc0e1b3c2fa32ff1325ca1158937f1466b --- /dev/null +++ b/poppler-24.05.0/qt5/demos/permissions.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef PERMISSIONS_H +#define PERMISSIONS_H + +#include "abstractinfodock.h" + +class QListWidget; + +class PermissionsDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit PermissionsDock(QWidget *parent = nullptr); + ~PermissionsDock() override; + + void documentClosed() override; + +protected: + void fillInfo() override; + +private: + QListWidget *m_table; +}; + +#endif diff --git a/poppler-24.05.0/qt5/demos/thumbnails.cpp b/poppler-24.05.0/qt5/demos/thumbnails.cpp new file mode 100644 index 0000000000000000000000000000000000000000..08fbdba503cd14522990bd3ff23897dde8284daa --- /dev/null +++ b/poppler-24.05.0/qt5/demos/thumbnails.cpp @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2009, Shawn Rutledge + * Copyright (C) 2009, Pino Toscano + * Copyright (C) 2020, Albert Astals Cid + * + * 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 "thumbnails.h" + +#include + +#include + +static const int PageRole = Qt::UserRole + 1; + +ThumbnailsDock::ThumbnailsDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_list = new QListWidget(this); + setWidget(m_list); + setWindowTitle(tr("Thumbnails")); + m_list->setViewMode(QListView::ListMode); + m_list->setMovement(QListView::Static); + m_list->setVerticalScrollMode(QListView::ScrollPerPixel); + connect(m_list, &QListWidget::itemActivated, this, &ThumbnailsDock::slotItemActivated); +} + +ThumbnailsDock::~ThumbnailsDock() { } + +void ThumbnailsDock::fillInfo() +{ + const int num = document()->numPages(); + QSize maxSize; + for (int i = 0; i < num; ++i) { + const Poppler::Page *page = document()->page(i); + const QImage image = page ? page->thumbnail() : QImage(); + if (!image.isNull()) { + QListWidgetItem *item = new QListWidgetItem(); + item->setText(QString::number(i + 1)); + item->setData(Qt::DecorationRole, QPixmap::fromImage(image)); + item->setData(PageRole, i); + m_list->addItem(item); + maxSize.setWidth(qMax(maxSize.width(), image.width())); + maxSize.setHeight(qMax(maxSize.height(), image.height())); + } + delete page; + } + if (num > 0) { + m_list->setGridSize(maxSize); + m_list->setIconSize(maxSize); + } +} + +void ThumbnailsDock::documentClosed() +{ + m_list->clear(); + AbstractInfoDock::documentClosed(); +} + +void ThumbnailsDock::slotItemActivated(QListWidgetItem *item) +{ + if (!item) { + return; + } + + setPage(item->data(PageRole).toInt()); +} diff --git a/poppler-24.05.0/qt5/demos/thumbnails.h b/poppler-24.05.0/qt5/demos/thumbnails.h new file mode 100644 index 0000000000000000000000000000000000000000..a568df655c926b4bd8fb5b23f26298330868f179 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/thumbnails.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2009, Shawn Rutledge + * Copyright (C) 2009, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef THUMBNAILS_H +#define THUMBNAILS_H + +#include "abstractinfodock.h" + +class QListWidget; +class QListWidgetItem; + +class ThumbnailsDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit ThumbnailsDock(QWidget *parent = nullptr); + ~ThumbnailsDock() override; + + void documentClosed() override; + +protected: + void fillInfo() override; + +private Q_SLOTS: + void slotItemActivated(QListWidgetItem *item); + +private: + QListWidget *m_list; +}; + +#endif diff --git a/poppler-24.05.0/qt5/demos/toc.cpp b/poppler-24.05.0/qt5/demos/toc.cpp new file mode 100644 index 0000000000000000000000000000000000000000..4173e149e3d879e37662dd53012ed7aeb59abeac --- /dev/null +++ b/poppler-24.05.0/qt5/demos/toc.cpp @@ -0,0 +1,168 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2018, Adam Reichold + * Copyright (C) 2019, Albert Astals Cid + * + * 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 "toc.h" + +#include + +#include +#include +#include + +#include + +struct Node +{ + Node(Poppler::OutlineItem &&item, int row, Node *parent) : m_row(row), m_parent(parent), m_item(std::move(item)) { } + + ~Node() { qDeleteAll(m_children); } + + Node(const Node &) = delete; + Node &operator=(const Node &) = delete; + + int m_row; + Node *m_parent; + Poppler::OutlineItem m_item; + QVector m_children; +}; + +class TocModel : public QAbstractItemModel +{ + Q_OBJECT +public: + TocModel(QVector &&items, QObject *parent) : QAbstractItemModel(parent) + { + for (int i = 0; i < items.count(); ++i) { + m_topItems << new Node(std::move(items[i]), i, nullptr); + } + } + + ~TocModel() override { qDeleteAll(m_topItems); } + + QVariant data(const QModelIndex &index, int role) const override + { + if (role != Qt::DisplayRole) { + return {}; + } + + Node *n = static_cast(index.internalPointer()); + return n->m_item.name(); + } + + QModelIndex index(int row, int column, const QModelIndex &parent) const override + { + Node *p = static_cast(parent.internalPointer()); + const QVector &children = p ? p->m_children : m_topItems; + + return createIndex(row, column, children[row]); + } + + QModelIndex parent(const QModelIndex &child) const override + { + Node *n = static_cast(child.internalPointer()); + if (n->m_parent == nullptr) { + return QModelIndex(); + } else { + return createIndex(n->m_parent->m_row, 0, n->m_parent); + } + } + + int rowCount(const QModelIndex &parent) const override + { + Node *n = static_cast(parent.internalPointer()); + if (!n) { + return m_topItems.count(); + } + + if (n->m_children.isEmpty() && !n->m_item.isNull()) { + QVector items = n->m_item.children(); + for (int i = 0; i < items.count(); ++i) { + n->m_children << new Node(std::move(items[i]), i, n); + } + } + + return n->m_children.count(); + } + + bool hasChildren(const QModelIndex &parent) const override + { + Node *n = static_cast(parent.internalPointer()); + if (!n) { + return true; + } + + return n->m_item.hasChildren(); + } + + int columnCount(const QModelIndex &parent) const override { return 1; } + +private: + QVector m_topItems; +}; + +TocDock::TocDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_tree = new QTreeView(this); + setWidget(m_tree); + m_tree->setAlternatingRowColors(true); + m_tree->header()->hide(); + setWindowTitle(tr("TOC")); + m_tree->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); +} + +TocDock::~TocDock() { } + +void TocDock::expandItemModels(const QModelIndex &parent) +{ + TocModel *model = static_cast(m_tree->model()); + for (int i = 0; i < model->rowCount(parent); ++i) { + QModelIndex index = model->index(i, 0, parent); + Node *n = static_cast(index.internalPointer()); + if (n->m_item.isOpen()) { + m_tree->setExpanded(index, true); + expandItemModels(index); + } + } +} + +void TocDock::fillInfo() +{ + auto outline = document()->outline(); + if (!outline.isEmpty()) { + TocModel *model = new TocModel(std::move(outline), this); + m_tree->setModel(model); + + expandItemModels(QModelIndex()); + } else { + QStandardItemModel *model = new QStandardItemModel(this); + QStandardItem *item = new QStandardItem(tr("No TOC")); + item->setFlags(item->flags() & ~Qt::ItemIsEnabled); + model->appendRow(item); + m_tree->setModel(model); + } +} + +void TocDock::documentClosed() +{ + m_tree->setModel(nullptr); + AbstractInfoDock::documentClosed(); +} + +#include "toc.moc" diff --git a/poppler-24.05.0/qt5/demos/toc.h b/poppler-24.05.0/qt5/demos/toc.h new file mode 100644 index 0000000000000000000000000000000000000000..fa5ec591f58f1758b8a379986762db0e6f8dc782 --- /dev/null +++ b/poppler-24.05.0/qt5/demos/toc.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2019, 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef TOC_H +#define TOC_H + +#include "abstractinfodock.h" + +class QTreeView; + +class TocDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit TocDock(QWidget *parent = nullptr); + ~TocDock() override; + + void documentClosed() override; + +protected: + void fillInfo() override; + void expandItemModels(const QModelIndex &parent); + +private: + QTreeView *m_tree; +}; + +#endif diff --git a/poppler-24.05.0/qt5/demos/viewer.cpp b/poppler-24.05.0/qt5/demos/viewer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..d21fc3c54f25592c14eaa5e762c25015f208503b --- /dev/null +++ b/poppler-24.05.0/qt5/demos/viewer.cpp @@ -0,0 +1,333 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * Copyright (C) 2008, 2019, 2022, Albert Astals Cid + * Copyright (C) 2009, Shawn Rutledge + * Copyright (C) 2013, Fabio D'Urso + * Copyright (C) 2020, Oliver Sander + * Copyright (C) 2021, Mahmoud Khalil + * + * 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 "viewer.h" + +#include "embeddedfiles.h" +#include "fonts.h" +#include "info.h" +#include "metadata.h" +#include "navigationtoolbar.h" +#include "optcontent.h" +#include "pageview.h" +#include "permissions.h" +#include "thumbnails.h" +#include "toc.h" + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +PdfViewer::PdfViewer(QWidget *parent) : QMainWindow(parent), m_currentPage(0), m_doc(nullptr) +{ + setWindowTitle(tr("Poppler-Qt5 Demo")); + + // setup the menus + QMenu *fileMenu = menuBar()->addMenu(tr("&File")); + m_fileOpenAct = fileMenu->addAction(tr("&Open"), this, &PdfViewer::slotOpenFile); + m_fileOpenAct->setShortcut(static_cast(Qt::CTRL) + Qt::Key_O); + fileMenu->addSeparator(); + m_fileSaveCopyAct = fileMenu->addAction(tr("&Save a Copy..."), this, &PdfViewer::slotSaveCopy); + m_fileSaveCopyAct->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_S); + m_fileSaveCopyAct->setEnabled(false); + fileMenu->addSeparator(); + QAction *act = fileMenu->addAction(tr("&Quit"), qApp, &QApplication::closeAllWindows); + act->setShortcut(static_cast(Qt::CTRL) + Qt::Key_Q); + + QMenu *viewMenu = menuBar()->addMenu(tr("&View")); + + QMenu *settingsMenu = menuBar()->addMenu(tr("&Settings")); + m_settingsTextAAAct = settingsMenu->addAction(tr("Text Antialias")); + m_settingsTextAAAct->setCheckable(true); + connect(m_settingsTextAAAct, &QAction::toggled, this, &PdfViewer::slotToggleTextAA); + m_settingsGfxAAAct = settingsMenu->addAction(tr("Graphics Antialias")); + m_settingsGfxAAAct->setCheckable(true); + connect(m_settingsGfxAAAct, &QAction::toggled, this, &PdfViewer::slotToggleGfxAA); + QMenu *settingsRenderMenu = settingsMenu->addMenu(tr("Render Backend")); + m_settingsRenderBackendGrp = new QActionGroup(settingsRenderMenu); + m_settingsRenderBackendGrp->setExclusive(true); + act = settingsRenderMenu->addAction(tr("Splash")); + act->setCheckable(true); + act->setChecked(true); + act->setData(QVariant::fromValue(0)); + m_settingsRenderBackendGrp->addAction(act); + act = settingsRenderMenu->addAction(tr("QPainter")); + act->setCheckable(true); + act->setData(QVariant::fromValue(1)); + m_settingsRenderBackendGrp->addAction(act); + connect(m_settingsRenderBackendGrp, &QActionGroup::triggered, this, &PdfViewer::slotRenderBackend); + + QMenu *helpMenu = menuBar()->addMenu(tr("&Help")); + act = helpMenu->addAction(tr("&About"), this, &PdfViewer::slotAbout); + act = helpMenu->addAction(tr("About &Qt"), this, &PdfViewer::slotAboutQt); + + NavigationToolBar *navbar = new NavigationToolBar(this); + addToolBar(navbar); + m_observers.append(navbar); + + PageView *view = new PageView(this); + setCentralWidget(view); + m_observers.append(view); + + InfoDock *infoDock = new InfoDock(this); + addDockWidget(Qt::LeftDockWidgetArea, infoDock); + infoDock->hide(); + viewMenu->addAction(infoDock->toggleViewAction()); + m_observers.append(infoDock); + + TocDock *tocDock = new TocDock(this); + addDockWidget(Qt::LeftDockWidgetArea, tocDock); + tocDock->hide(); + viewMenu->addAction(tocDock->toggleViewAction()); + m_observers.append(tocDock); + + FontsDock *fontsDock = new FontsDock(this); + addDockWidget(Qt::LeftDockWidgetArea, fontsDock); + fontsDock->hide(); + viewMenu->addAction(fontsDock->toggleViewAction()); + m_observers.append(fontsDock); + + PermissionsDock *permissionsDock = new PermissionsDock(this); + addDockWidget(Qt::LeftDockWidgetArea, permissionsDock); + permissionsDock->hide(); + viewMenu->addAction(permissionsDock->toggleViewAction()); + m_observers.append(permissionsDock); + + ThumbnailsDock *thumbnailsDock = new ThumbnailsDock(this); + addDockWidget(Qt::LeftDockWidgetArea, thumbnailsDock); + thumbnailsDock->hide(); + viewMenu->addAction(thumbnailsDock->toggleViewAction()); + m_observers.append(thumbnailsDock); + + EmbeddedFilesDock *embfilesDock = new EmbeddedFilesDock(this); + addDockWidget(Qt::BottomDockWidgetArea, embfilesDock); + embfilesDock->hide(); + viewMenu->addAction(embfilesDock->toggleViewAction()); + m_observers.append(embfilesDock); + + MetadataDock *metadataDock = new MetadataDock(this); + addDockWidget(Qt::BottomDockWidgetArea, metadataDock); + metadataDock->hide(); + viewMenu->addAction(metadataDock->toggleViewAction()); + m_observers.append(metadataDock); + + OptContentDock *optContentDock = new OptContentDock(this); + addDockWidget(Qt::LeftDockWidgetArea, optContentDock); + optContentDock->hide(); + viewMenu->addAction(optContentDock->toggleViewAction()); + m_observers.append(optContentDock); + + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->m_viewer = this; + } + + connect(navbar, &NavigationToolBar::zoomChanged, view, &PageView::slotZoomChanged); + connect(navbar, &NavigationToolBar::rotationChanged, view, &PageView::slotRotationChanged); + + // activate AA by default + m_settingsTextAAAct->setChecked(true); + m_settingsGfxAAAct->setChecked(true); +} + +PdfViewer::~PdfViewer() +{ + closeDocument(); +} + +QSize PdfViewer::sizeHint() const +{ + return QSize(500, 600); +} + +void PdfViewer::loadDocument(const QString &file) +{ + // resetting xrefReconstructed each time we load new document + xrefReconstructed = false; + Poppler::Document *newdoc = Poppler::Document::load(file); + if (!newdoc) { + QMessageBox msgbox(QMessageBox::Critical, tr("Open Error"), tr("Cannot open:\n") + file, QMessageBox::Ok, this); + msgbox.exec(); + return; + } + + while (newdoc->isLocked()) { + bool ok = true; + QString password = QInputDialog::getText(this, tr("Document Password"), tr("Please insert the password of the document:"), QLineEdit::Password, QString(), &ok); + if (!ok) { + delete newdoc; + return; + } + newdoc->unlock(password.toLatin1(), password.toLatin1()); + } + + closeDocument(); + + m_doc = newdoc; + + m_doc->setRenderHint(Poppler::Document::TextAntialiasing, m_settingsTextAAAct->isChecked()); + m_doc->setRenderHint(Poppler::Document::Antialiasing, m_settingsGfxAAAct->isChecked()); + m_doc->setRenderBackend((Poppler::Document::RenderBackend)m_settingsRenderBackendGrp->checkedAction()->data().toInt()); + if (m_doc->xrefWasReconstructed()) { + xrefReconstructedHandler(m_doc); + } else { + std::function cb = [this]() { xrefReconstructedHandler(m_doc); }; + + m_doc->setXRefReconstructedCallback(cb); + } + + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->documentLoaded(); + obs->pageChanged(0); + } + + m_fileSaveCopyAct->setEnabled(true); +} + +void PdfViewer::closeDocument() +{ + if (!m_doc) { + return; + } + + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->documentClosed(); + } + + m_currentPage = 0; + delete m_doc; + m_doc = nullptr; + + m_fileSaveCopyAct->setEnabled(false); +} + +void PdfViewer::xrefReconstructedHandler(Poppler::Document *doc) +{ + if (!xrefReconstructed) { + QMessageBox msgbox(QMessageBox::Critical, tr("File may be corrupted"), tr("The PDF may be broken but we're still showing something, contents may not be correct"), QMessageBox::Ok, this); + msgbox.exec(); + + xrefReconstructed = true; + } +} + +void PdfViewer::slotOpenFile() +{ + QString fileName = QFileDialog::getOpenFileName(this, tr("Open PDF Document"), QDir::homePath(), tr("PDF Documents (*.pdf)")); + if (fileName.isEmpty()) { + return; + } + + loadDocument(fileName); +} + +void PdfViewer::slotSaveCopy() +{ + if (!m_doc) { + return; + } + + QString fileName = QFileDialog::getSaveFileName(this, tr("Save Copy"), QDir::homePath(), tr("PDF Documents (*.pdf)")); + if (fileName.isEmpty()) { + return; + } + + Poppler::PDFConverter *converter = m_doc->pdfConverter(); + converter->setOutputFileName(fileName); + converter->setPDFOptions(converter->pdfOptions() & ~Poppler::PDFConverter::WithChanges); + if (!converter->convert()) { + QMessageBox msgbox(QMessageBox::Critical, tr("Save Error"), tr("Cannot export to:\n%1").arg(fileName), QMessageBox::Ok, this); + } + delete converter; +} + +void PdfViewer::slotAbout() +{ + QMessageBox::about(this, tr("About Poppler-Qt5 Demo"), tr("This is a demo of the Poppler-Qt5 library.")); +} + +void PdfViewer::slotAboutQt() +{ + QMessageBox::aboutQt(this); +} + +void PdfViewer::slotToggleTextAA(bool value) +{ + if (!m_doc) { + return; + } + + m_doc->setRenderHint(Poppler::Document::TextAntialiasing, value); + + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->pageChanged(m_currentPage); + } +} + +void PdfViewer::slotToggleGfxAA(bool value) +{ + if (!m_doc) { + return; + } + + m_doc->setRenderHint(Poppler::Document::Antialiasing, value); + + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->pageChanged(m_currentPage); + } +} + +void PdfViewer::slotRenderBackend(QAction *act) +{ + if (!m_doc || !act) { + return; + } + + m_doc->setRenderBackend((Poppler::Document::RenderBackend)act->data().toInt()); + + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->pageChanged(m_currentPage); + } +} + +void PdfViewer::setPage(int page) +{ + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->pageChanged(page); + } + + m_currentPage = page; +} + +int PdfViewer::page() const +{ + return m_currentPage; +} diff --git a/poppler-24.05.0/qt5/demos/viewer.h b/poppler-24.05.0/qt5/demos/viewer.h new file mode 100644 index 0000000000000000000000000000000000000000..752a00ef68ee006120aaeb0fef43f1f98563953c --- /dev/null +++ b/poppler-24.05.0/qt5/demos/viewer.h @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Mahmoud Khalil + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef PDFVIEWER_H +#define PDFVIEWER_H + +#include + +class QAction; +class QActionGroup; +class QLabel; +class DocumentObserver; +namespace Poppler { +class Document; +} + +class PdfViewer : public QMainWindow +{ + Q_OBJECT + + friend class DocumentObserver; + +public: + explicit PdfViewer(QWidget *parent = nullptr); + ~PdfViewer() override; + + QSize sizeHint() const override; + + void loadDocument(const QString &file); + void closeDocument(); + +private Q_SLOTS: + void slotOpenFile(); + void slotSaveCopy(); + void slotAbout(); + void slotAboutQt(); + void slotToggleTextAA(bool value); + void slotToggleGfxAA(bool value); + void slotRenderBackend(QAction *act); + +private: + void setPage(int page); + int page() const; + void xrefReconstructedHandler(Poppler::Document *doc); + + int m_currentPage; + bool xrefReconstructed; + + QAction *m_fileOpenAct; + QAction *m_fileSaveCopyAct; + QAction *m_settingsTextAAAct; + QAction *m_settingsGfxAAAct; + QActionGroup *m_settingsRenderBackendGrp; + + QList m_observers; + + Poppler::Document *m_doc; +}; + +#endif diff --git a/poppler-24.05.0/qt5/src/CMakeLists.txt b/poppler-24.05.0/qt5/src/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..e9e1c2c99f6d764eec273ee888fee65443257cb8 --- /dev/null +++ b/poppler-24.05.0/qt5/src/CMakeLists.txt @@ -0,0 +1,67 @@ +add_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) + +set(CMAKE_C_VISIBILITY_PRESET hidden) +set(CMAKE_CXX_VISIBILITY_PRESET hidden) +set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) + +configure_file(poppler-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/poppler-version.h @ONLY) + +set(poppler_qt5_SRCS + poppler-annotation.cc + poppler-document.cc + poppler-embeddedfile.cc + poppler-fontinfo.cc + poppler-form.cc + poppler-link.cc + poppler-link-extractor.cc + poppler-movie.cc + poppler-optcontent.cc + poppler-page.cc + poppler-base-converter.cc + poppler-pdf-converter.cc + poppler-private.cc + poppler-ps-converter.cc + poppler-qiodeviceinstream.cc + poppler-qiodeviceoutstream.cc + poppler-sound.cc + poppler-textbox.cc + poppler-page-transition.cc + poppler-media.cc + poppler-outline.cc + QPainterOutputDev.cc + poppler-version.cpp +) +add_library(poppler-qt5 ${poppler_qt5_SRCS}) +generate_export_header(poppler-qt5 BASE_NAME poppler-qt5 EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h") +set_target_properties(poppler-qt5 PROPERTIES VERSION 1.34.0 SOVERSION 1) +if(MINGW AND BUILD_SHARED_LIBS) + get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION) + set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") +endif() +target_link_libraries(poppler-qt5 poppler Qt5::Core Qt5::Gui Qt5::Xml Freetype::Freetype) +if (ENABLE_NSS3) + target_include_directories(poppler-qt5 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) +endif() +if(USE_CMS) + target_link_libraries(poppler-qt5 poppler ${LCMS2_LIBRARIES}) + target_include_directories(poppler-qt5 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) +endif() +install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +install(FILES + poppler-qt5.h + poppler-link.h + poppler-annotation.h + poppler-form.h + poppler-optcontent.h + poppler-page-transition.h + poppler-media.h + ${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h + ${CMAKE_CURRENT_BINARY_DIR}/poppler-version.h + DESTINATION include/poppler/qt5) + diff --git a/poppler-24.05.0/qt5/src/Doxyfile b/poppler-24.05.0/qt5/src/Doxyfile new file mode 100644 index 0000000000000000000000000000000000000000..b196bfd6ace82909f619b6913f7d616baac3c1f7 --- /dev/null +++ b/poppler-24.05.0/qt5/src/Doxyfile @@ -0,0 +1,1637 @@ +# Doxyfile 1.7.1 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = "Poppler Qt5" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = 24.05.0 + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = NO + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = YES + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this +# tag. The format is ext=language, where ext is a file extension, and language +# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, +# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions +# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = NO + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = YES + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = NO + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = YES + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = YES + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. The create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text " + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = Mainpage.dox \ + poppler-annotation.h \ + poppler-form.h \ + poppler-link.h \ + poppler-qt5.h \ + poppler-optcontent.h \ + poppler-page-transition.h + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = APIDOCS-html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the stylesheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. + +GENERATE_QHP = YES + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = poppler-qt5.qch + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.freedesktop.poppler.qt5 + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = "Poppler 0.15.0" + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = poppler + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = poppler + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = qhelpgenerator + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = NO + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvances is that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = YES + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = APIDOCS-latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = NO + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = YES + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = YES + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = "Q_DECL_DEPRECATED=" \ + "POPPLER_QT5_EXPORT=" + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is +# allowed to run in parallel. When set to 0 (the default) doxygen will +# base this on the number of processors available in the system. You can set it +# explicitly to a value larger than 0 to get control over the balance +# between CPU load and processing speed. + +DOT_NUM_THREADS = 0 + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans.ttf + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff --git a/poppler-24.05.0/qt5/src/Mainpage.dox b/poppler-24.05.0/qt5/src/Mainpage.dox new file mode 100644 index 0000000000000000000000000000000000000000..bc3becba3b2f4017cebe5cddb9217c3882433843 --- /dev/null +++ b/poppler-24.05.0/qt5/src/Mainpage.dox @@ -0,0 +1,104 @@ +/** +@mainpage The Poppler Qt5 interface library + +The %Poppler Qt5 interface library, libpoppler-qt5, is a library that +allows Qt5 programmers to easily load and render PDF files. The +%Poppler Qt5 interface library uses poppler internally to do its job, +but the Qt5 programmer will never have to worry about poppler +internals. + + +@section help Current Status + +The %Poppler Qt5 interface library is quite stable and working. + +@section refimpl Example Programs + +Examples programs can be found in the qt5/test directory. The %Poppler +Qt5 interface library is also used in the KDE's +document viewer Okular. The source files +for Okular's PDF plugin (%Poppler-based) can be found on the git server +of the KDE project, under +this +URL. + + +@section req How to use the Poppler Qt5 interface library in three easy steps + +Programmer who would like to use the %Poppler Qt5 interface library +simply need to add the following line to their C++ source files: + +@code +#include +@endcode + +To use the Qt5 interface on Android, there is an additional step - you must place the following font files in the assets/share/fonts directory of the Android APK: + + - NimbusMonoPS-Regular.otf + - NimbusMonoPS-Bold.otf + - NimbusMonoPS-BoldItalic.otf + - NimbusMonoPS-Italic.otf + - NimbusSans-Regular.otf + - NimbusSans-Bold.otf + - NimbusSans-BoldItalic.otf + - NimbusSans-Italic.otf + - StandardSymbolsPS.otf + - NimbusRoman-Bold.otf + - imbusRoman-BoldItalic.otf + - NimbusRoman-Italic.otf + - NimbusRoman-Regular.otf + - D050000L.otf + +These are used as substitute fonts for the base-14 fonts, and this step is required in order to reliably display documents with unembedded fonts. You can easily find these font files included within GhostScript. + +A PDF document can then be loaded as follows: +@code +QString filename; + +Poppler::Document* document = Poppler::Document::load(filename); +if (!document || document->isLocked()) { + + // ... error message .... + + delete document; + return; +} +@endcode + +Pages can be rendered to QImages with the following commands: + +@code +// Paranoid safety check +if (document == 0) { + // ... error message ... + return; +} + +// Access page of the PDF file +Poppler::Page* pdfPage = document->page(pageNumber); // Document starts at page 0 +if (pdfPage == 0) { + // ... error message ... + return; +} + +// Generate a QImage of the rendered page +QImage image = pdfPage->renderToImage(xres, yres, x, y, width, height); +if (image.isNull()) { + // ... error message ... + return; +} + +// ... use image ... + +// after the usage, the page must be deleted +delete pdfPage; +@endcode + +Finally, don't forget to destroy the document: + +@code +delete document; +@endcode + */ + diff --git a/poppler-24.05.0/qt5/src/QPainterOutputDev.cc b/poppler-24.05.0/qt5/src/QPainterOutputDev.cc new file mode 100644 index 0000000000000000000000000000000000000000..b017bab3a654297283076cfbcf203fe42d47aec8 --- /dev/null +++ b/poppler-24.05.0/qt5/src/QPainterOutputDev.cc @@ -0,0 +1,1154 @@ +//======================================================================== +// +// QPainterOutputDev.cc +// +// Copyright 2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Brad Hards +// Copyright (C) 2005-2009, 2011, 2012, 2014, 2015, 2018, 2019, 2021, 2022 Albert Astals Cid +// Copyright (C) 2008, 2010 Pino Toscano +// Copyright (C) 2009, 2011 Carlos Garcia Campos +// Copyright (C) 2009 Petr Gajdos +// Copyright (C) 2010 Matthias Fauconneau +// Copyright (C) 2011 Andreas Hartmetz +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2013 Dominik Haumann +// Copyright (C) 2013 Mihai Niculescu +// Copyright (C) 2017, 2018, 2020-2022 Oliver Sander +// Copyright (C) 2017, 2022 Adrian Johnson +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// +// 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 + +#include +#include + +#include + +#include "goo/ft_utils.h" +#include "goo/gfile.h" +#include "GlobalParams.h" +#include "Error.h" +#include "Object.h" +#include "GfxState.h" +#include "GfxFont.h" +#include "Link.h" +#include "FontEncodingTables.h" +#include +#include +#include "QPainterOutputDev.h" +#include "Page.h" +#include "Gfx.h" +#include "PDFDoc.h" + +#include +#include +#include +#include +#include + +class QPainterOutputDevType3Font +{ +public: + QPainterOutputDevType3Font(PDFDoc *doc, const std::shared_ptr &font); + + const QPicture &getGlyph(int gid) const; + +private: + PDFDoc *m_doc; + std::shared_ptr m_font; + + mutable std::vector> glyphs; + +public: + std::vector codeToGID; +}; + +QPainterOutputDevType3Font::QPainterOutputDevType3Font(PDFDoc *doc, const std::shared_ptr &font) : m_doc(doc), m_font(font) +{ + char *name; + const Dict *charProcs = font->getCharProcs(); + + // Storage for the rendered glyphs + glyphs.resize(charProcs->getLength()); + + // Compute the code-to-GID map + char **enc = font->getEncoding(); + + codeToGID.resize(256); + + for (int i = 0; i < 256; ++i) { + codeToGID[i] = 0; + if (charProcs && (name = enc[i])) { + for (int j = 0; j < charProcs->getLength(); j++) { + if (strcmp(name, charProcs->getKey(j)) == 0) { + codeToGID[i] = j; + } + } + } + } +} + +const QPicture &QPainterOutputDevType3Font::getGlyph(int gid) const +{ + if (!glyphs[gid]) { + + // Glyph has not been rendered before: render it now + + // Smallest box that contains all the glyphs from this font + const double *fontBBox = m_font->getFontBBox(); + PDFRectangle box(fontBBox[0], fontBBox[1], fontBBox[2], fontBBox[3]); + + Dict *resDict = m_font->getResources(); + + QPainter glyphPainter; + glyphs[gid] = std::make_unique(); + glyphPainter.begin(glyphs[gid].get()); + auto output_dev = std::make_unique(&glyphPainter); + + auto gfx = std::make_unique(m_doc, output_dev.get(), resDict, + &box, // pagebox + nullptr // cropBox + ); + + output_dev->startDoc(m_doc); + + output_dev->startPage(1, gfx->getState(), gfx->getXRef()); + + const Dict *charProcs = m_font->getCharProcs(); + Object charProc = charProcs->getVal(gid); + gfx->display(&charProc); + + glyphPainter.end(); + } + + return *glyphs[gid]; +} + +//------------------------------------------------------------------------ +// QPainterOutputDev +//------------------------------------------------------------------------ + +QPainterOutputDev::QPainterOutputDev(QPainter *painter) : m_lastTransparencyGroupPicture(nullptr), m_hintingPreference(QFont::PreferDefaultHinting) +{ + m_painter.push(painter); + m_currentBrush = QBrush(Qt::SolidPattern); + + auto error = FT_Init_FreeType(&m_ftLibrary); + if (error) { + qCritical() << "An error occurred will initializing the FreeType library"; + } + + // as of FT 2.1.8, CID fonts are indexed by CID instead of GID + FT_Int major, minor, patch; + FT_Library_Version(m_ftLibrary, &major, &minor, &patch); + m_useCIDs = major > 2 || (major == 2 && (minor > 1 || (minor == 1 && patch > 7))); +} + +QPainterOutputDev::~QPainterOutputDev() +{ + for (auto &codeToGID : m_codeToGIDCache) { + gfree(const_cast(codeToGID.second)); + } + + FT_Done_FreeType(m_ftLibrary); +} + +void QPainterOutputDev::startDoc(PDFDoc *doc) +{ + xref = doc->getXRef(); + m_doc = doc; + + for (auto &codeToGID : m_codeToGIDCache) { + gfree(const_cast(codeToGID.second)); + } + m_codeToGIDCache.clear(); +} + +void QPainterOutputDev::startPage(int pageNum, GfxState *state, XRef *) { } + +void QPainterOutputDev::endPage() { } + +void QPainterOutputDev::saveState(GfxState *state) +{ + m_currentPenStack.push(m_currentPen); + m_currentBrushStack.push(m_currentBrush); + m_rawFontStack.push(m_rawFont); + m_type3FontStack.push(m_currentType3Font); + m_codeToGIDStack.push(m_codeToGID); + + m_painter.top()->save(); +} + +void QPainterOutputDev::restoreState(GfxState *state) +{ + m_painter.top()->restore(); + + m_codeToGID = m_codeToGIDStack.top(); + m_codeToGIDStack.pop(); + m_rawFont = m_rawFontStack.top(); + m_rawFontStack.pop(); + m_currentType3Font = m_type3FontStack.top(); + m_type3FontStack.pop(); + m_currentBrush = m_currentBrushStack.top(); + m_currentBrushStack.pop(); + m_currentPen = m_currentPenStack.top(); + m_currentPenStack.pop(); +} + +void QPainterOutputDev::updateAll(GfxState *state) +{ + OutputDev::updateAll(state); + m_needFontUpdate = true; +} + +// Set CTM (Current Transformation Matrix) to a fixed matrix +void QPainterOutputDev::setDefaultCTM(const double *ctm) +{ + m_painter.top()->setTransform(QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5])); +} + +// Update the CTM (Current Transformation Matrix), i.e., compose the old +// CTM with a new matrix. +void QPainterOutputDev::updateCTM(GfxState *state, double m11, double m12, double m21, double m22, double m31, double m32) +{ + updateLineDash(state); + updateLineJoin(state); + updateLineCap(state); + updateLineWidth(state); + + QTransform update(m11, m12, m21, m22, m31, m32); + + // We could also set (rather than update) the painter transformation to state->getCMT(); + m_painter.top()->setTransform(update, true); +} + +void QPainterOutputDev::updateLineDash(GfxState *state) +{ + double dashStart; + const std::vector &dashPattern = state->getLineDash(&dashStart); + + // Special handling for zero-length patterns, i.e., solid lines. + // Simply calling QPen::setDashPattern with an empty pattern does *not* + // result in a solid line. Rather, the current pattern is unchanged. + // See the implementation of the setDashPattern method in the file qpen.cpp. + if (dashPattern.empty()) { + m_currentPen.setStyle(Qt::SolidLine); + m_painter.top()->setPen(m_currentPen); + return; + } + + QVector pattern(dashPattern.size()); + double scaling = state->getLineWidth(); + + // Negative line widths are not allowed, width 0 counts as 'one pixel width'. + if (scaling <= 0) { + scaling = 1.0; + } + + for (std::vector::size_type i = 0; i < dashPattern.size(); ++i) { + // pdf measures the dash pattern in dots, but Qt uses the + // line width as the unit. + pattern[i] = dashPattern[i] / scaling; + } + m_currentPen.setDashPattern(pattern); + m_currentPen.setDashOffset(dashStart); + m_painter.top()->setPen(m_currentPen); +} + +void QPainterOutputDev::updateFlatness(GfxState *state) +{ + // qDebug() << "updateFlatness"; +} + +void QPainterOutputDev::updateLineJoin(GfxState *state) +{ + switch (state->getLineJoin()) { + case 0: + // The correct style here is Qt::SvgMiterJoin, *not* Qt::MiterJoin. + // The two differ in what to do if the miter limit is exceeded. + // See https://bugs.freedesktop.org/show_bug.cgi?id=102356 + m_currentPen.setJoinStyle(Qt::SvgMiterJoin); + break; + case 1: + m_currentPen.setJoinStyle(Qt::RoundJoin); + break; + case 2: + m_currentPen.setJoinStyle(Qt::BevelJoin); + break; + } + m_painter.top()->setPen(m_currentPen); +} + +void QPainterOutputDev::updateLineCap(GfxState *state) +{ + switch (state->getLineCap()) { + case 0: + m_currentPen.setCapStyle(Qt::FlatCap); + break; + case 1: + m_currentPen.setCapStyle(Qt::RoundCap); + break; + case 2: + m_currentPen.setCapStyle(Qt::SquareCap); + break; + } + m_painter.top()->setPen(m_currentPen); +} + +void QPainterOutputDev::updateMiterLimit(GfxState *state) +{ + m_currentPen.setMiterLimit(state->getMiterLimit()); + m_painter.top()->setPen(m_currentPen); +} + +void QPainterOutputDev::updateLineWidth(GfxState *state) +{ + m_currentPen.setWidthF(state->getLineWidth()); + m_painter.top()->setPen(m_currentPen); + // The updateLineDash method needs to know the line width, but it is sometimes + // called before the updateLineWidth method. To make sure that the last call + // to updateLineDash before a drawing operation is always with the correct line + // width, we call it here, right after a change to the line width. + updateLineDash(state); +} + +void QPainterOutputDev::updateFillColor(GfxState *state) +{ + GfxRGB rgb; + QColor brushColour = m_currentBrush.color(); + state->getFillRGB(&rgb); + brushColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), brushColour.alphaF()); + m_currentBrush.setColor(brushColour); +} + +void QPainterOutputDev::updateStrokeColor(GfxState *state) +{ + GfxRGB rgb; + QColor penColour = m_currentPen.color(); + state->getStrokeRGB(&rgb); + penColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), penColour.alphaF()); + m_currentPen.setColor(penColour); + m_painter.top()->setPen(m_currentPen); +} + +void QPainterOutputDev::updateBlendMode(GfxState *state) +{ + GfxBlendMode blendMode = state->getBlendMode(); + + // missing composition modes in QPainter: + // - CompositionMode_Hue + // - CompositionMode_Color + // - CompositionMode_Luminosity + // - CompositionMode_Saturation + + switch (blendMode) { + case gfxBlendMultiply: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Multiply); + break; + case gfxBlendScreen: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Screen); + break; + case gfxBlendDarken: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Darken); + break; + case gfxBlendLighten: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Lighten); + break; + case gfxBlendColorDodge: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_ColorDodge); + break; + case gfxBlendColorBurn: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_ColorBurn); + break; + case gfxBlendHardLight: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_HardLight); + break; + case gfxBlendSoftLight: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_SoftLight); + break; + case gfxBlendDifference: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Difference); + break; + case gfxBlendExclusion: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Exclusion); + break; + case gfxBlendColor: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Plus); + break; + default: + qDebug() << "Unsupported blend mode, falling back to CompositionMode_SourceOver"; + [[fallthrough]]; + case gfxBlendNormal: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_SourceOver); + break; + } +} + +void QPainterOutputDev::updateFillOpacity(GfxState *state) +{ + QColor brushColour = m_currentBrush.color(); + brushColour.setAlphaF(state->getFillOpacity()); + m_currentBrush.setColor(brushColour); +} + +void QPainterOutputDev::updateStrokeOpacity(GfxState *state) +{ + QColor penColour = m_currentPen.color(); + penColour.setAlphaF(state->getStrokeOpacity()); + m_currentPen.setColor(penColour); + m_painter.top()->setPen(m_currentPen); +} + +void QPainterOutputDev::updateFont(GfxState *state) +{ + const std::shared_ptr &gfxFont = state->getFont(); + if (!gfxFont) { + return; + } + + // The key to look in the font caches + QPainterFontID fontID = { *gfxFont->getID(), state->getFontSize() }; + + // Current font is a type3 font + if (gfxFont->getType() == fontType3) { + auto cacheEntry = m_type3FontCache.find(fontID); + + if (cacheEntry != m_type3FontCache.end()) { + + // Take the font from the cache + m_currentType3Font = cacheEntry->second.get(); + + } else { + + m_currentType3Font = new QPainterOutputDevType3Font(m_doc, std::static_pointer_cast(gfxFont)); + m_type3FontCache.insert(std::make_pair(fontID, std::unique_ptr(m_currentType3Font))); + } + + return; + } + + // Non-type3: is the font in the cache? + auto cacheEntry = m_rawFontCache.find(fontID); + + if (cacheEntry != m_rawFontCache.end()) { + + // Take the font from the cache + m_rawFont = cacheEntry->second.get(); + + } else { + + // New font: load it into the cache + float fontSize = state->getFontSize(); + + std::optional fontLoc = gfxFont->locateFont(xref, nullptr); + + if (fontLoc) { + // load the font from respective location + switch (fontLoc->locType) { + case gfxFontLocEmbedded: { // if there is an embedded font, read it to memory + const std::optional> fontData = gfxFont->readEmbFontFile(xref); + + // fontData gets copied in the QByteArray constructor + m_rawFont = new QRawFont(QByteArray(fontData ? (const char *)fontData->data() : nullptr, fontData ? fontData->size() : 0), fontSize, m_hintingPreference); + m_rawFontCache.insert(std::make_pair(fontID, std::unique_ptr(m_rawFont))); + + break; + } + case gfxFontLocExternal: { // font is in an external font file + QString fontFile(fontLoc->path.c_str()); + m_rawFont = new QRawFont(fontFile, fontSize, m_hintingPreference); + m_rawFontCache.insert(std::make_pair(fontID, std::unique_ptr(m_rawFont))); + break; + } + case gfxFontLocResident: { // font resides in a PS printer + qDebug() << "Resident Font Resident not implemented yet!"; + + break; + } + } // end switch + + } else { + qDebug() << "Font location not found!"; + return; + } + } + + if (!m_rawFont->isValid()) { + qDebug() << "RawFont is not valid"; + } + + // ***************************************************************************** + // We have now successfully loaded the font into a QRawFont object. This + // allows us to draw all the glyphs in the font. However, what is missing is + // the charcode-to-glyph-index mapping. Apparently, Qt does not provide this + // information at all. Therefore, we need to figure it ourselves, using + // FoFi and FreeType. + // ***************************************************************************** + + m_needFontUpdate = false; + + GfxFontType fontType = gfxFont->getType(); + + // Default: no codeToGID table + m_codeToGID = nullptr; + + // check the font file cache + Ref id = *gfxFont->getID(); + + auto codeToGIDIt = m_codeToGIDCache.find(id); + + if (codeToGIDIt != m_codeToGIDCache.end()) { + + m_codeToGID = codeToGIDIt->second; + + } else { + + std::optional> fontBuffer; + + std::optional fontLoc = gfxFont->locateFont(xref, nullptr); + if (!fontLoc) { + error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + return; + } + + // embedded font + if (fontLoc->locType == gfxFontLocEmbedded) { + // if there is an embedded font, read it to memory + fontBuffer = gfxFont->readEmbFontFile(xref); + if (!fontBuffer) { + return; + } + + // external font + } else { // gfxFontLocExternal + // Hmm, fontType has already been set to gfxFont->getType() above. + // Can it really assume a different value here? + fontType = fontLoc->fontType; + } + + switch (fontType) { + case fontType1: + case fontType1C: + case fontType1COT: { + // Load the font face using FreeType + const int faceIndex = 0; // We always load the zero-th face from a font + FT_Face freeTypeFace; + + if (fontLoc->locType != gfxFontLocEmbedded) { + if (ft_new_face_from_file(m_ftLibrary, fontLoc->path.c_str(), faceIndex, &freeTypeFace)) { + error(errSyntaxError, -1, "Couldn't create a FreeType face for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + return; + } + } else { + if (FT_New_Memory_Face(m_ftLibrary, (const FT_Byte *)fontBuffer->data(), fontBuffer->size(), faceIndex, &freeTypeFace)) { + error(errSyntaxError, -1, "Couldn't create a FreeType face for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + return; + } + } + + const char *name; + + int *codeToGID = (int *)gmallocn(256, sizeof(int)); + for (int i = 0; i < 256; ++i) { + codeToGID[i] = 0; + if ((name = ((const char **)((Gfx8BitFont *)gfxFont.get())->getEncoding())[i])) { + codeToGID[i] = (int)FT_Get_Name_Index(freeTypeFace, (char *)name); + if (codeToGID[i] == 0) { + name = GfxFont::getAlternateName(name); + if (name) { + codeToGID[i] = FT_Get_Name_Index(freeTypeFace, (char *)name); + } + } + } + } + + FT_Done_Face(freeTypeFace); + + m_codeToGIDCache[id] = codeToGID; + + break; + } + case fontTrueType: + case fontTrueTypeOT: { + auto ff = (fontLoc->locType != gfxFontLocEmbedded) ? FoFiTrueType::load(fontLoc->path.c_str()) : FoFiTrueType::make(fontBuffer->data(), fontBuffer->size()); + + m_codeToGIDCache[id] = (ff) ? ((Gfx8BitFont *)gfxFont.get())->getCodeToGIDMap(ff.get()) : nullptr; + + break; + } + case fontCIDType0: + case fontCIDType0C: { + int *cidToGIDMap = nullptr; + int nCIDs = 0; + + // check for a CFF font + if (!m_useCIDs) { + auto ff = (fontLoc->locType != gfxFontLocEmbedded) ? std::unique_ptr(FoFiType1C::load(fontLoc->path.c_str())) : std::unique_ptr(FoFiType1C::make(fontBuffer->data(), fontBuffer->size())); + + cidToGIDMap = (ff) ? ff->getCIDToGIDMap(&nCIDs) : nullptr; + } + + m_codeToGIDCache[id] = cidToGIDMap; + + break; + } + case fontCIDType0COT: { + int *codeToGID = nullptr; + + if (((GfxCIDFont *)gfxFont.get())->getCIDToGID()) { + int codeToGIDLen = ((GfxCIDFont *)gfxFont.get())->getCIDToGIDLen(); + codeToGID = (int *)gmallocn(codeToGIDLen, sizeof(int)); + memcpy(codeToGID, ((GfxCIDFont *)gfxFont.get())->getCIDToGID(), codeToGIDLen * sizeof(int)); + } + + int *cidToGIDMap = nullptr; + int nCIDs = 0; + + if (!codeToGID && !m_useCIDs) { + auto ff = (fontLoc->locType != gfxFontLocEmbedded) ? FoFiTrueType::load(fontLoc->path.c_str()) : FoFiTrueType::make(fontBuffer->data(), fontBuffer->size()); + + if (ff && ff->isOpenTypeCFF()) { + cidToGIDMap = ff->getCIDToGIDMap(&nCIDs); + } + } + + m_codeToGIDCache[id] = codeToGID ? codeToGID : cidToGIDMap; + + break; + } + case fontCIDType2: + case fontCIDType2OT: { + int *codeToGID = nullptr; + int codeToGIDLen = 0; + if (((GfxCIDFont *)gfxFont.get())->getCIDToGID()) { + codeToGIDLen = ((GfxCIDFont *)gfxFont.get())->getCIDToGIDLen(); + if (codeToGIDLen) { + codeToGID = (int *)gmallocn(codeToGIDLen, sizeof(int)); + memcpy(codeToGID, ((GfxCIDFont *)gfxFont.get())->getCIDToGID(), codeToGIDLen * sizeof(int)); + } + } else { + auto ff = (fontLoc->locType != gfxFontLocEmbedded) ? FoFiTrueType::load(fontLoc->path.c_str()) : FoFiTrueType::make(fontBuffer->data(), fontBuffer->size()); + if (!ff) { + return; + } + codeToGID = ((GfxCIDFont *)gfxFont.get())->getCodeToGIDMap(ff.get(), &codeToGIDLen); + } + + m_codeToGIDCache[id] = codeToGID; + + break; + } + default: + // this shouldn't happen + return; + } + + m_codeToGID = m_codeToGIDCache[id]; + } +} + +static QPainterPath convertPath(GfxState *state, const GfxPath *path, Qt::FillRule fillRule) +{ + int i, j; + + QPainterPath qPath; + qPath.setFillRule(fillRule); + for (i = 0; i < path->getNumSubpaths(); ++i) { + const GfxSubpath *subpath = path->getSubpath(i); + if (subpath->getNumPoints() > 0) { + qPath.moveTo(subpath->getX(0), subpath->getY(0)); + j = 1; + while (j < subpath->getNumPoints()) { + if (subpath->getCurve(j)) { + qPath.cubicTo(subpath->getX(j), subpath->getY(j), subpath->getX(j + 1), subpath->getY(j + 1), subpath->getX(j + 2), subpath->getY(j + 2)); + j += 3; + } else { + qPath.lineTo(subpath->getX(j), subpath->getY(j)); + ++j; + } + } + if (subpath->isClosed()) { + qPath.closeSubpath(); + } + } + } + return qPath; +} + +void QPainterOutputDev::stroke(GfxState *state) +{ + m_painter.top()->strokePath(convertPath(state, state->getPath(), Qt::OddEvenFill), m_currentPen); +} + +void QPainterOutputDev::fill(GfxState *state) +{ + m_painter.top()->fillPath(convertPath(state, state->getPath(), Qt::WindingFill), m_currentBrush); +} + +void QPainterOutputDev::eoFill(GfxState *state) +{ + m_painter.top()->fillPath(convertPath(state, state->getPath(), Qt::OddEvenFill), m_currentBrush); +} + +bool QPainterOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) +{ + double x0, y0, x1, y1; + shading->getCoords(&x0, &y0, &x1, &y1); + + // get the clip region bbox + double xMin, yMin, xMax, yMax; + state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax); + + // get the function domain + double t0 = shading->getDomain0(); + double t1 = shading->getDomain1(); + + // Max number of splits along the t axis + constexpr int maxSplits = 256; + + // Max delta allowed in any color component + const double colorDelta = (dblToCol(1 / 256.0)); + + // Number of color space components + auto nComps = shading->getColorSpace()->getNComps(); + // If the clipping region is a stroke, then the current operation counts as a stroke + // rather than as a fill, and the opacity has to be set accordingly. + // See https://gitlab.freedesktop.org/poppler/poppler/-/issues/178 + auto opacity = (state->getStrokePattern()) ? state->getStrokeOpacity() : state->getFillOpacity(); + + // Helper function to test two color objects for 'almost-equality' + auto isSameGfxColor = [&nComps, &colorDelta](const GfxColor &colorA, const GfxColor &colorB) { + for (int k = 0; k < nComps; ++k) { + if (abs(colorA.c[k] - colorB.c[k]) > colorDelta) { + return false; + } + } + return true; + }; + + // Helper function: project a number into an interval + // With C++17 this is part of the standard library + auto clamp = [](double v, double lo, double hi) { return std::min(std::max(v, lo), hi); }; + + // ta stores all parameter values where we evaluate the input shading function. + // In between, QLinearGradient will interpolate linearly. + // We set up the array with three values. + std::array ta; + ta[0] = tMin; + std::array next; + next[0] = maxSplits / 2; + ta[maxSplits / 2] = 0.5 * (tMin + tMax); + next[maxSplits / 2] = maxSplits; + ta[maxSplits] = tMax; + + // compute the color at t = tMin + double tt = clamp(t0 + (t1 - t0) * tMin, t0, t1); + + GfxColor color0, color1; + shading->getColor(tt, &color0); + + // Construct a gradient object and set its color at one parameter end + QLinearGradient gradient(QPointF(x0 + tMin * (x1 - x0), y0 + tMin * (y1 - y0)), QPointF(x0 + tMax * (x1 - x0), y0 + tMax * (y1 - y0))); + + GfxRGB rgb; + shading->getColorSpace()->getRGB(&color0, &rgb); + QColor qColor(colToByte(rgb.r), colToByte(rgb.g), colToByte(rgb.b), dblToByte(opacity)); + gradient.setColorAt(0, qColor); + + // Look for more relevant parameter values by bisection + int i = 0; + while (i < maxSplits) { + + int j = next[i]; + while (j > i + 1) { + + // Next parameter value to try + tt = clamp(t0 + (t1 - t0) * ta[j], t0, t1); + shading->getColor(tt, &color1); + + // j is a good next color stop if the input shading can be approximated well + // on the interval (ta[i], ta[j]) by a linear interpolation. + // We test this by comparing the real color in the middle between ta[i] and ta[j] + // with the linear interpolant there. + auto midPoint = 0.5 * (ta[i] + ta[j]); + GfxColor colorAtMidPoint; + shading->getColor(midPoint, &colorAtMidPoint); + + GfxColor linearlyInterpolatedColor; + for (int ii = 0; ii < nComps; ii++) { + linearlyInterpolatedColor.c[ii] = 0.5 * (color0.c[ii] + color1.c[ii]); + } + + // If the two colors are equal, ta[j] is a good place for the next color stop; take it! + if (isSameGfxColor(colorAtMidPoint, linearlyInterpolatedColor)) { + break; + } + + // Otherwise: bisect further + int k = (i + j) / 2; + ta[k] = midPoint; + next[i] = k; + next[k] = j; + j = k; + } + + // set the color + shading->getColorSpace()->getRGB(&color1, &rgb); + qColor.setRgb(colToByte(rgb.r), colToByte(rgb.g), colToByte(rgb.b), dblToByte(opacity)); + gradient.setColorAt((ta[j] - tMin) / (tMax - tMin), qColor); + + // Move to the next parameter region + color0 = color1; + i = next[i]; + } + + state->moveTo(xMin, yMin); + state->lineTo(xMin, yMax); + state->lineTo(xMax, yMax); + state->lineTo(xMax, yMin); + state->closePath(); + + // Actually paint the shaded region + QBrush newBrush(gradient); + m_painter.top()->fillPath(convertPath(state, state->getPath(), Qt::WindingFill), newBrush); + + state->clearPath(); + + // True means: The shaded region has been painted + return true; +} + +void QPainterOutputDev::clip(GfxState *state) +{ + m_painter.top()->setClipPath(convertPath(state, state->getPath(), Qt::WindingFill), Qt::IntersectClip); +} + +void QPainterOutputDev::eoClip(GfxState *state) +{ + m_painter.top()->setClipPath(convertPath(state, state->getPath(), Qt::OddEvenFill), Qt::IntersectClip); +} + +void QPainterOutputDev::clipToStrokePath(GfxState *state) +{ + QPainterPath clipPath = convertPath(state, state->getPath(), Qt::WindingFill); + + // Get the outline of 'clipPath' as a separate path + QPainterPathStroker stroker; + stroker.setWidth(state->getLineWidth()); + stroker.setCapStyle(m_currentPen.capStyle()); + stroker.setJoinStyle(m_currentPen.joinStyle()); + stroker.setMiterLimit(state->getMiterLimit()); + stroker.setDashPattern(m_currentPen.dashPattern()); + stroker.setDashOffset(m_currentPen.dashOffset()); + QPainterPath clipPathOutline = stroker.createStroke(clipPath); + + // The interior of the outline is the desired clipping region + m_painter.top()->setClipPath(clipPathOutline, Qt::IntersectClip); +} + +void QPainterOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) +{ + + // First handle type3 fonts + const std::shared_ptr &gfxFont = state->getFont(); + + GfxFontType fontType = gfxFont->getType(); + if (fontType == fontType3) { + + ///////////////////////////////////////////////////////////////////// + // Draw the QPicture that contains the glyph onto the page + ///////////////////////////////////////////////////////////////////// + + // Store the QPainter state; we need to modify it temporarily + m_painter.top()->save(); + + // Make the glyph position the coordinate origin -- that's our center of scaling + m_painter.top()->translate(QPointF(x - originX, y - originY)); + + const double *mat = gfxFont->getFontMatrix(); + QTransform fontMatrix(mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]); + + // Scale with the font size + fontMatrix.scale(state->getFontSize(), state->getFontSize()); + m_painter.top()->setTransform(fontMatrix, true); + + // Apply the text matrix on top + const double *textMat = state->getTextMat(); + + QTransform textTransform(textMat[0] * state->getHorizScaling(), textMat[1] * state->getHorizScaling(), textMat[2], textMat[3], 0, 0); + + m_painter.top()->setTransform(textTransform, true); + + // Actually draw the glyph + int gid = m_currentType3Font->codeToGID[code]; + m_painter.top()->drawPicture(QPointF(0, 0), m_currentType3Font->getGlyph(gid)); + + // Restore transformation + m_painter.top()->restore(); + + return; + } + + // check for invisible text -- this is used by Acrobat Capture + int render = state->getRender(); + if (render == 3 || !m_rawFont) { + qDebug() << "Invisible text found!"; + return; + } + + if (!(render & 1)) { + quint32 glyphIndex = (m_codeToGID) ? m_codeToGID[code] : code; + QPointF glyphPosition = QPointF(x - originX, y - originY); + + // QGlyphRun objects can hold an entire sequence of glyphs, and it would possibly + // be more efficient to simply note the glyph and glyph position here and then + // draw several glyphs at once in the endString method. What keeps us from doing + // that is the transformation below: each glyph needs to be drawn upside down, + // i.e., reflected at its own baseline. Since we have no guarantee that this + // baseline is the same for all glyphs in a string we have to do it one by one. + QGlyphRun glyphRun; + glyphRun.setRawData(&glyphIndex, &glyphPosition, 1); + glyphRun.setRawFont(*m_rawFont); + + // Store the QPainter state; we need to modify it temporarily + m_painter.top()->save(); + + // Apply the text matrix to the glyph. The glyph is not scaled by the font size, + // because the font in m_rawFont already has the correct size. + // Additionally, the CTM is upside down, i.e., it contains a negative Y-scaling + // entry. Therefore, Qt will paint the glyphs upside down. We need to temporarily + // reflect the page at glyphPosition.y(). + + // Make the glyph position the coordinate origin -- that's our center of scaling + const double *textMat = state->getTextMat(); + + m_painter.top()->translate(QPointF(glyphPosition.x(), glyphPosition.y())); + + QTransform textTransform(textMat[0] * state->getHorizScaling(), textMat[1] * state->getHorizScaling(), + -textMat[2], // reflect at the horizontal axis, + -textMat[3], // because CTM is upside-down. + 0, 0); + + m_painter.top()->setTransform(textTransform, true); + + // We are painting a filled glyph here. But QPainter uses the pen to draw even filled text, + // not the brush. (see, e.g., http://doc.qt.io/qt-5/qpainter.html#setPen ) + // Therefore we have to temporarily overwrite the pen color. + + // Since we are drawing a filled glyph, one would really expect to have m_currentBrush + // have the correct color. However, somehow state->getFillRGB can change without + // updateFillColor getting called. Then m_currentBrush may not contain the correct color. + GfxRGB rgb; + state->getFillRGB(&rgb); + QColor fontColor; + fontColor.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), state->getFillOpacity()); + m_painter.top()->setPen(fontColor); + + // Actually draw the glyph + m_painter.top()->drawGlyphRun(QPointF(-glyphPosition.x(), -glyphPosition.y()), glyphRun); + + // Restore transformation and pen color + m_painter.top()->restore(); + } +} + +void QPainterOutputDev::type3D0(GfxState *state, double wx, double wy) { } + +void QPainterOutputDev::type3D1(GfxState *state, double wx, double wy, double llx, double lly, double urx, double ury) { } + +void QPainterOutputDev::endTextObject(GfxState *state) { } + +void QPainterOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) +{ + auto imgStr = std::make_unique(str, width, + 1, // numPixelComps + 1 // getBits + ); + imgStr->reset(); + + // TODO: Would using QImage::Format_Mono be more efficient here? + QImage image(width, height, QImage::Format_ARGB32); + unsigned int *data = reinterpret_cast(image.bits()); + int stride = image.bytesPerLine() / 4; + + QRgb fillColor = m_currentBrush.color().rgb(); + + for (int y = 0; y < height; y++) { + + unsigned char *pix = imgStr->getLine(); + + // Invert the vertical coordinate: y is increasing from top to bottom + // on the page, but y is increasing bottom to top in the picture. + unsigned int *dest = data + (height - 1 - y) * stride; + + for (int x = 0; x < width; x++) { + + bool opaque = ((bool)pix[x]) == invert; + dest[x] = (opaque) ? fillColor : 0; + } + } + + // At this point, the QPainter coordinate transformation (CTM) is such + // that QRect(0,0,1,1) is exactly the area of the image. + m_painter.top()->drawImage(QRect(0, 0, 1, 1), image); + imgStr->close(); +} + +// TODO: lots more work here. +void QPainterOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) +{ + unsigned int *data; + unsigned int *line; + int x, y; + unsigned char *pix; + int i; + QImage image; + int stride; + + /* TODO: Do we want to cache these? */ + auto imgStr = std::make_unique(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); + + image = QImage(width, height, QImage::Format_ARGB32); + data = reinterpret_cast(image.bits()); + stride = image.bytesPerLine() / 4; + for (y = 0; y < height; y++) { + pix = imgStr->getLine(); + // Invert the vertical coordinate: y is increasing from top to bottom + // on the page, but y is increasing bottom to top in the picture. + line = data + (height - 1 - y) * stride; + colorMap->getRGBLine(pix, line, width); + + if (maskColors) { + for (x = 0; x < width; x++) { + for (i = 0; i < colorMap->getNumPixelComps(); ++i) { + if (pix[i] < maskColors[2 * i] * 255 || pix[i] > maskColors[2 * i + 1] * 255) { + *line = *line | 0xff000000; + break; + } + } + pix += colorMap->getNumPixelComps(); + line++; + } + } else { + for (x = 0; x < width; x++) { + *line = *line | 0xff000000; + line++; + } + } + } + + // At this point, the QPainter coordinate transformation (CTM) is such + // that QRect(0,0,1,1) is exactly the area of the image. + m_painter.top()->drawImage(QRect(0, 0, 1, 1), image); +} + +void QPainterOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap, + bool maskInterpolate) +{ + // Bail out if the image size doesn't match the mask size. I don't know + // what to do in this case. + if (width != maskWidth || height != maskHeight) { + qDebug() << "Soft mask size does not match image size!"; + drawImage(state, ref, str, width, height, colorMap, interpolate, nullptr, false); + return; + } + + // Bail out if the mask isn't a single channel. I don't know + // what to do in this case. + if (maskColorMap->getColorSpace()->getNComps() != 1) { + qDebug() << "Soft mask is not a single 8-bit channel!"; + drawImage(state, ref, str, width, height, colorMap, interpolate, nullptr, false); + return; + } + + /* TODO: Do we want to cache these? */ + auto imgStr = std::make_unique(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); + + auto maskImageStr = std::make_unique(maskStr, maskWidth, maskColorMap->getNumPixelComps(), maskColorMap->getBits()); + maskImageStr->reset(); + + QImage image(width, height, QImage::Format_ARGB32); + unsigned int *data = reinterpret_cast(image.bits()); + int stride = image.bytesPerLine() / 4; + + std::vector maskLine(maskWidth); + + for (int y = 0; y < height; y++) { + + unsigned char *pix = imgStr->getLine(); + unsigned char *maskPix = maskImageStr->getLine(); + + // Invert the vertical coordinate: y is increasing from top to bottom + // on the page, but y is increasing bottom to top in the picture. + unsigned int *line = data + (height - 1 - y) * stride; + colorMap->getRGBLine(pix, line, width); + + // Apply the mask values to the image alpha channel + maskColorMap->getGrayLine(maskPix, maskLine.data(), width); + for (int x = 0; x < width; x++) { + *line = *line | (maskLine[x] << 24); + line++; + } + } + + // At this point, the QPainter coordinate transformation (CTM) is such + // that QRect(0,0,1,1) is exactly the area of the image. + m_painter.top()->drawImage(QRect(0, 0, 1, 1), image); +} + +void QPainterOutputDev::beginTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/, GfxColorSpace * /*blendingColorSpace*/, bool /*isolated*/, bool /*knockout*/, bool /*forSoftMask*/) +{ + // The entire transparency group will be painted into a + // freshly created QPicture object. Since an existing painter + // cannot change its paint device, we need to construct a + // new QPainter object as well. + m_qpictures.push(new QPicture); + m_painter.push(new QPainter(m_qpictures.top())); +} + +void QPainterOutputDev::endTransparencyGroup(GfxState * /*state*/) +{ + // Stop painting into the group + m_painter.top()->end(); + + // Kill the painter that has been used for the transparency group + delete (m_painter.top()); + m_painter.pop(); + + // Store the QPicture object that holds the result of the transparency group + // painting. It will be painted and deleted in the method paintTransparencyGroup. + if (m_lastTransparencyGroupPicture) { + qDebug() << "Found a transparency group that has not been painted"; + delete (m_lastTransparencyGroupPicture); + } + m_lastTransparencyGroupPicture = m_qpictures.top(); + m_qpictures.pop(); +} + +void QPainterOutputDev::paintTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/) +{ + // Actually draw the transparency group + m_painter.top()->drawPicture(0, 0, *m_lastTransparencyGroupPicture); + + // And delete it + delete (m_lastTransparencyGroupPicture); + m_lastTransparencyGroupPicture = nullptr; +} diff --git a/poppler-24.05.0/qt5/src/QPainterOutputDev.h b/poppler-24.05.0/qt5/src/QPainterOutputDev.h new file mode 100644 index 0000000000000000000000000000000000000000..c8dc1c0cc19210584cc181ab6439764a7256bcba --- /dev/null +++ b/poppler-24.05.0/qt5/src/QPainterOutputDev.h @@ -0,0 +1,206 @@ +//======================================================================== +// +// QPainterOutputDev.h +// +// Copyright 2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Brad Hards +// Copyright (C) 2005, 2018, 2019, 2021 Albert Astals Cid +// Copyright (C) 2009, 2011 Carlos Garcia Campos +// Copyright (C) 2010 Pino Toscano +// Copyright (C) 2011 Andreas Hartmetz +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2013 Mihai Niculescu +// Copyright (C) 2017, 2018, 2020 Oliver Sander +// +// 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 +// +//======================================================================== + +#ifndef QPAINTEROUTPUTDEV_H +#define QPAINTEROUTPUTDEV_H + +#include +#include +#include + +#include "OutputDev.h" +#include "GfxState.h" + +#include +#include FT_FREETYPE_H + +#include + +class GfxState; +class PDFDoc; + +class QRawFont; + +class QPainterOutputDevType3Font; + +//------------------------------------------------------------------------ +// QPainterOutputDev - Qt 5 QPainter renderer +//------------------------------------------------------------------------ + +class QPainterOutputDev : public OutputDev +{ +public: + // Constructor. + explicit QPainterOutputDev(QPainter *painter); + + // Destructor. + ~QPainterOutputDev() override; + + void setHintingPreference(QFont::HintingPreference hintingPreference) { m_hintingPreference = hintingPreference; } + + //----- get info about output device + + // Does this device use upside-down coordinates? + // (Upside-down means (0,0) is the top left corner of the page.) + bool upsideDown() override { return true; } + + // Does this device use drawChar() or drawString()? + bool useDrawChar() override { return true; } + + // Does this device implement shaded fills (aka gradients) natively? + // If this returns false, these shaded fills + // will be reduced to a series of other drawing operations. + // type==2 is 'axial shading' + bool useShadedFills(int type) override { return type == 2; } + + // Does this device use beginType3Char/endType3Char? Otherwise, + // text in Type 3 fonts will be drawn with drawChar/drawString. + bool interpretType3Chars() override { return false; } + + //----- initialization and control + + // Set Current Transformation Matrix to a fixed matrix given in ctm[0],...,ctm[5] + void setDefaultCTM(const double *ctm) override; + + // Start a page. + void startPage(int pageNum, GfxState *state, XRef *xref) override; + + // End a page. + void endPage() override; + + //----- save/restore graphics state + void saveState(GfxState *state) override; + void restoreState(GfxState *state) override; + + //----- update graphics state + void updateAll(GfxState *state) override; + void updateCTM(GfxState *state, double m11, double m12, double m21, double m22, double m31, double m32) override; + void updateLineDash(GfxState *state) override; + void updateFlatness(GfxState *state) override; + void updateLineJoin(GfxState *state) override; + void updateLineCap(GfxState *state) override; + void updateMiterLimit(GfxState *state) override; + void updateLineWidth(GfxState *state) override; + void updateFillColor(GfxState *state) override; + void updateStrokeColor(GfxState *state) override; + void updateBlendMode(GfxState *state) override; + void updateFillOpacity(GfxState *state) override; + void updateStrokeOpacity(GfxState *state) override; + + //----- update text state + void updateFont(GfxState *state) override; + + //----- path painting + void stroke(GfxState *state) override; + void fill(GfxState *state) override; + void eoFill(GfxState *state) override; + bool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override; + + //----- path clipping + void clip(GfxState *state) override; + void eoClip(GfxState *state) override; + void clipToStrokePath(GfxState *state) override; + + //----- text drawing + // virtual void drawString(GfxState *state, GooString *s); + void drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) override; + void endTextObject(GfxState *state) override; + + //----- image drawing + void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) override; + void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) override; + + void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap, + bool maskInterpolate) override; + + //----- Type 3 font operators + void type3D0(GfxState *state, double wx, double wy) override; + void type3D1(GfxState *state, double wx, double wy, double llx, double lly, double urx, double ury) override; + + //----- transparency groups and soft masks + void beginTransparencyGroup(GfxState *state, const double *bbox, GfxColorSpace *blendingColorSpace, bool isolated, bool knockout, bool forSoftMask) override; + void endTransparencyGroup(GfxState *state) override; + void paintTransparencyGroup(GfxState *state, const double *bbox) override; + + //----- special access + + // Called to indicate that a new PDF document has been loaded. + void startDoc(PDFDoc *doc); + + bool isReverseVideo() { return false; } + +private: + // The stack of QPainters is used to implement transparency groups. When such a group + // is opened, annew Painter that paints onto a QPicture is pushed onto the stack. + // It is popped again when the transparency group ends. + std::stack m_painter; + + // This is the corresponding stack of QPicture objects + std::stack m_qpictures; + + // endTransparencyGroup removes a QPicture from the stack, but stores + // it here for later use in paintTransparencyGroup. + QPicture *m_lastTransparencyGroupPicture; + + QFont::HintingPreference m_hintingPreference; + + QPen m_currentPen; + // The various stacks are used to implement the 'saveState' and 'restoreState' methods + std::stack m_currentPenStack; + + QBrush m_currentBrush; + std::stack m_currentBrushStack; + + bool m_needFontUpdate; // set when the font needs to be updated + PDFDoc *m_doc; + XRef *xref; // xref table for current document + + // The current font in use + QRawFont *m_rawFont; + std::stack m_rawFontStack; + + QPainterOutputDevType3Font *m_currentType3Font; + std::stack m_type3FontStack; + + // Cache all fonts by their Ref and font size + using QPainterFontID = std::pair; + std::map> m_rawFontCache; + std::map> m_type3FontCache; + std::map m_codeToGIDCache; + + // The table that maps character codes to glyph indexes + const int *m_codeToGID; + std::stack m_codeToGIDStack; + + FT_Library m_ftLibrary; + // as of FT 2.1.8, CID fonts are indexed by CID instead of GID + bool m_useCIDs; +}; + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-annotation-helper.h b/poppler-24.05.0/qt5/src/poppler-annotation-helper.h new file mode 100644 index 0000000000000000000000000000000000000000..b294a08471afa3f50121e2c4fb40066cd9fdb36c --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-annotation-helper.h @@ -0,0 +1,78 @@ +/* poppler-annotation-helper.h: qt interface to poppler + * Copyright (C) 2006, 2008, 2017-2019, 2021, Albert Astals Cid + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2012, Fabio D'Urso + * Copyright (C) 2018, Dileep Sankhla + * Copyright (C) 2018, Carlos Garcia Campos + * Copyright (C) 2018, 2019, Oliver Sander + * Adapting code from + * Copyright (C) 2004 by Enrico Ros + * + * 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. + */ + +#ifndef _POPPLER_ANNOTATION_HELPER_H_ +#define _POPPLER_ANNOTATION_HELPER_H_ + +#include + +#include + +#include + +class QColor; + +class AnnotColor; + +namespace Poppler { + +class XPDFReader +{ +public: + // transform from user coords to normalized ones using the matrix M + static inline void transform(double *M, double x, double y, QPointF &res); + static inline void invTransform(const double *M, const QPointF p, double &x, double &y); +}; + +void XPDFReader::transform(double *M, double x, double y, QPointF &res) +{ + res.setX(M[0] * x + M[2] * y + M[4]); + res.setY(M[1] * x + M[3] * y + M[5]); +} + +void XPDFReader::invTransform(const double *M, const QPointF p, double &x, double &y) +{ + const double det = M[0] * M[3] - M[1] * M[2]; + if (det == 0) { + qWarning("Tried to invert singular matrix, something won't work"); + x = 0; + y = 0; + return; + } + + const double invM[4] = { M[3] / det, -M[1] / det, -M[2] / det, M[0] / det }; + const double xt = p.x() - M[4]; + const double yt = p.y() - M[5]; + + x = invM[0] * xt + invM[2] * yt; + y = invM[1] * xt + invM[3] * yt; +} + +QColor convertAnnotColor(const AnnotColor *color); +std::unique_ptr convertQColor(const QColor &color); + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-annotation-private.h b/poppler-24.05.0/qt5/src/poppler-annotation-private.h new file mode 100644 index 0000000000000000000000000000000000000000..1f8d756ef75a20f01a96f8fda6aa29aa969eac61 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-annotation-private.h @@ -0,0 +1,128 @@ +/* poppler-annotation-private.h: qt interface to poppler + * Copyright (C) 2007, Pino Toscano + * Copyright (C) 2012, Tobias Koenig + * Copyright (C) 2012, 2013 Fabio D'Urso + * Copyright (C) 2012, 2014, 2018, 2019, Albert Astals Cid + * Copyright (C) 2020, Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021, Mahmoud Ahmed Khalil + * + * 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. + */ + +#ifndef _POPPLER_ANNOTATION_PRIVATE_H_ +#define _POPPLER_ANNOTATION_PRIVATE_H_ + +#include +#include +#include + +#include "poppler-annotation.h" + +#include +#include + +class Annot; +class AnnotPath; +class Page; +class PDFRectangle; + +namespace Poppler { +class DocumentData; + +PDFRectangle boundaryToPdfRectangle(::Page *pdfPage, const QRectF &r, int flags); +void getRawDataFromQImage(const QImage &qimg, int bitsPerPixel, QByteArray *data, QByteArray *sMaskData); + +class AnnotationPrivate : public QSharedData +{ +public: + AnnotationPrivate(); + virtual ~AnnotationPrivate(); + + AnnotationPrivate(const AnnotationPrivate &) = delete; + AnnotationPrivate &operator=(const AnnotationPrivate &) = delete; + + void addRevision(Annotation *ann, Annotation::RevScope scope, Annotation::RevType type); + + /* Returns an Annotation of the right subclass whose d_ptr points to + * this AnnotationPrivate */ + virtual Annotation *makeAlias() = 0; + + /* properties: contents related */ + QString author; + QString contents; + QString uniqueName; + QDateTime modDate; // before or equal to currentDateTime() + QDateTime creationDate; // before or equal to modifyDate + + /* properties: look/interaction related */ + int flags; + QRectF boundary; + + /* style and popup */ + Annotation::Style style; + Annotation::Popup popup; + + /* revisions */ + Annotation::RevScope revisionScope; + Annotation::RevType revisionType; + QList revisions; + + /* After this call, the Annotation object will behave like a wrapper for + * the specified Annot object. All cached values are discarded */ + void tieToNativeAnnot(Annot *ann, ::Page *page, DocumentData *doc); + + /* Creates a new Annot object on the specified page, flushes current + * values to that object and ties this Annotation to that object */ + virtual Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) = 0; + + /* Inited to 0 (i.e. untied annotation) */ + Annot *pdfAnnot; + ::Page *pdfPage; + DocumentData *parentDoc; + + /* The following helpers only work if pdfPage is set */ + void flushBaseAnnotationProperties(); + void fillTransformationMTX(double MTX[6]) const; + QRectF fromPdfRectangle(const PDFRectangle &r) const; + PDFRectangle boundaryToPdfRectangle(const QRectF &r, int flags) const; + AnnotPath *toAnnotPath(const QLinkedList &l) const; + + /* Scan page for annotations, parentId=0 searches for root annotations, subtypes empty means all subtypes */ + static QList findAnnotations(::Page *pdfPage, DocumentData *doc, const QSet &subtypes, int parentId = -1); + + /* Add given annotation to given page */ + static void addAnnotationToPage(::Page *pdfPage, DocumentData *doc, const Annotation *ann); + + /* Remove annotation from page and destroy ann */ + static void removeAnnotationFromPage(::Page *pdfPage, const Annotation *ann); + + Ref pdfObjectReference() const; + + Link *additionalAction(Annotation::AdditionalActionType type) const; + + Object annotationAppearance; +}; + +class AnnotationAppearancePrivate +{ +public: + explicit AnnotationAppearancePrivate(Annot *annot); + + Object appearance; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-annotation.cc b/poppler-24.05.0/qt5/src/poppler-annotation.cc new file mode 100644 index 0000000000000000000000000000000000000000..e15523cfa3efa36d734046d59a383b7d969a0354 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-annotation.cc @@ -0,0 +1,5103 @@ +/* poppler-annotation.cc: qt interface to poppler + * Copyright (C) 2006, 2009, 2012-2015, 2018-2022 Albert Astals Cid + * Copyright (C) 2006, 2008, 2010 Pino Toscano + * Copyright (C) 2012, Guillermo A. Amaral B. + * Copyright (C) 2012-2014 Fabio D'Urso + * Copyright (C) 2012, 2015, Tobias Koenig + * Copyright (C) 2018 Adam Reichold + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018 Intevation GmbH + * Copyright (C) 2018 Dileep Sankhla + * Copyright (C) 2018, 2019 Tobias Deiminger + * Copyright (C) 2018 Carlos Garcia Campos + * Copyright (C) 2020, 2022 Oliver Sander + * Copyright (C) 2020 Katarina Behrens + * Copyright (C) 2020 Thorsten Behrens + * Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021 Mahmoud Ahmed Khalil + * Adapting code from + * Copyright (C) 2004 by Enrico Ros + * + * 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. + */ + +// qt/kde includes +#include +#include +#include +#include +#include +#include + +// local includes +#include "poppler-annotation.h" +#include "poppler-link.h" +#include "poppler-qt5.h" +#include "poppler-annotation-helper.h" +#include "poppler-annotation-private.h" +#include "poppler-page-private.h" +#include "poppler-private.h" + +// poppler includes +#include +#include +#include +#include +#include +#include +#include + +/* Almost all getters directly query the underlying poppler annotation, with + * the exceptions of link, file attachment, sound, movie and screen annotations, + * Whose data retrieval logic has not been moved yet. Their getters return + * static data set at creation time by findAnnotations + */ + +namespace Poppler { + +// BEGIN AnnotationUtils implementation +Annotation *AnnotationUtils::createAnnotation(const QDomElement &annElement) +{ + // safety check on annotation element + if (!annElement.hasAttribute(QStringLiteral("type"))) { + return nullptr; + } + + // build annotation of given type + Annotation *annotation = nullptr; + int typeNumber = annElement.attribute(QStringLiteral("type")).toInt(); + switch (typeNumber) { + case Annotation::AText: + annotation = new TextAnnotation(annElement); + break; + case Annotation::ALine: + annotation = new LineAnnotation(annElement); + break; + case Annotation::AGeom: + annotation = new GeomAnnotation(annElement); + break; + case Annotation::AHighlight: + annotation = new HighlightAnnotation(annElement); + break; + case Annotation::AStamp: + annotation = new StampAnnotation(annElement); + break; + case Annotation::AInk: + annotation = new InkAnnotation(annElement); + break; + case Annotation::ACaret: + annotation = new CaretAnnotation(annElement); + break; + } + + // return created annotation + return annotation; +} + +void AnnotationUtils::storeAnnotation(const Annotation *ann, QDomElement &annElement, QDomDocument &document) +{ + // save annotation's type as element's attribute + annElement.setAttribute(QStringLiteral("type"), (uint)ann->subType()); + + // append all annotation data as children of this node + ann->store(annElement, document); +} + +QDomElement AnnotationUtils::findChildElement(const QDomNode &parentNode, const QString &name) +{ + // loop through the whole children and return a 'name' named element + QDomNode subNode = parentNode.firstChild(); + while (subNode.isElement()) { + QDomElement element = subNode.toElement(); + if (element.tagName() == name) { + return element; + } + subNode = subNode.nextSibling(); + } + // if the name can't be found, return a dummy null element + return QDomElement(); +} +// END AnnotationUtils implementation + +// BEGIN AnnotationAppearancePrivate implementation +AnnotationAppearancePrivate::AnnotationAppearancePrivate(Annot *annot) +{ + if (annot) { + appearance = annot->getAppearance(); + } else { + appearance.setToNull(); + } +} +// END AnnotationAppearancePrivate implementation + +// BEGIN AnnotationAppearance implementation +AnnotationAppearance::AnnotationAppearance(AnnotationAppearancePrivate *annotationAppearancePrivate) : d(annotationAppearancePrivate) { } + +AnnotationAppearance::~AnnotationAppearance() +{ + delete d; +} +// END AnnotationAppearance implementation + +// BEGIN Annotation implementation +AnnotationPrivate::AnnotationPrivate() : flags(0), revisionScope(Annotation::Root), revisionType(Annotation::None), pdfAnnot(nullptr), pdfPage(nullptr), parentDoc(nullptr) { } + +void getRawDataFromQImage(const QImage &qimg, int bitsPerPixel, QByteArray *data, QByteArray *sMaskData) +{ + const int height = qimg.height(); + const int width = qimg.width(); + + switch (bitsPerPixel) { + case 1: + for (int line = 0; line < height; line++) { + const char *lineData = reinterpret_cast(qimg.scanLine(line)); + for (int offset = 0; offset < (width + 7) / 8; offset++) { + data->append(lineData[offset]); + } + } + break; + case 8: + case 24: +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + data->append((const char *)qimg.bits(), static_cast(qimg.sizeInBytes())); +#else + data->append((const char *)qimg.bits(), qimg.byteCount()); +#endif + break; + case 32: + for (int line = 0; line < height; line++) { + const QRgb *lineData = reinterpret_cast(qimg.scanLine(line)); + for (int offset = 0; offset < width; offset++) { + char a = (char)qAlpha(lineData[offset]); + char r = (char)qRed(lineData[offset]); + char g = (char)qGreen(lineData[offset]); + char b = (char)qBlue(lineData[offset]); + + data->append(r); + data->append(g); + data->append(b); + + sMaskData->append(a); + } + } + break; + } +} + +void AnnotationPrivate::addRevision(Annotation *ann, Annotation::RevScope scope, Annotation::RevType type) +{ + /* Since ownership stays with the caller, create an alias of ann */ + revisions.append(ann->d_ptr->makeAlias()); + + /* Set revision properties */ + revisionScope = scope; + revisionType = type; +} + +AnnotationPrivate::~AnnotationPrivate() +{ + // Delete all children revisions + qDeleteAll(revisions); + + // Release Annot object + if (pdfAnnot) { + pdfAnnot->decRefCnt(); + } +} + +void AnnotationPrivate::tieToNativeAnnot(Annot *ann, ::Page *page, Poppler::DocumentData *doc) +{ + if (pdfAnnot) { + error(errIO, -1, "Annotation is already tied"); + return; + } + + pdfAnnot = ann; + pdfPage = page; + parentDoc = doc; + + pdfAnnot->incRefCnt(); +} + +/* This method is called when a new annotation is created, after pdfAnnot and + * pdfPage have been set */ +void AnnotationPrivate::flushBaseAnnotationProperties() +{ + Q_ASSERT(pdfPage); + + Annotation *q = makeAlias(); // Setters are defined in the public class + + // Since pdfAnnot has been set, this calls will write in the Annot object + q->setAuthor(author); + q->setContents(contents); + q->setUniqueName(uniqueName); + q->setModificationDate(modDate); + q->setCreationDate(creationDate); + q->setFlags(flags); + // q->setBoundary(boundary); -- already set by subclass-specific code + q->setStyle(style); + q->setPopup(popup); + + // Flush revisions + foreach (Annotation *r, revisions) { + // TODO: Flush revision + delete r; // Object is no longer needed + } + + delete q; + + // Clear some members to save memory + author.clear(); + contents.clear(); + uniqueName.clear(); + revisions.clear(); +} + +// Returns matrix to convert from user space coords (oriented according to the +// specified rotation) to normalized coords +static void fillNormalizationMTX(::Page *pdfPage, double MTX[6], int pageRotation) +{ + Q_ASSERT(pdfPage); + + // build a normalized transform matrix for this page at 100% scale + GfxState *gfxState = new GfxState(72.0, 72.0, pdfPage->getCropBox(), pageRotation, true); + const double *gfxCTM = gfxState->getCTM(); + + double w = pdfPage->getCropWidth(); + double h = pdfPage->getCropHeight(); + + // Swap width and height if the page is rotated landscape or seascape + if (pageRotation == 90 || pageRotation == 270) { + double t = w; + w = h; + h = t; + } + + for (int i = 0; i < 6; i += 2) { + MTX[i] = gfxCTM[i] / w; + MTX[i + 1] = gfxCTM[i + 1] / h; + } + delete gfxState; +} + +// Returns matrix to convert from user space coords (i.e. those that are stored +// in the PDF file) to normalized coords (i.e. those that we expose to clients). +// This method also applies a rotation around the top-left corner if the +// FixedRotation flag is set. +void AnnotationPrivate::fillTransformationMTX(double MTX[6]) const +{ + Q_ASSERT(pdfPage); + Q_ASSERT(pdfAnnot); + + const int pageRotate = pdfPage->getRotate(); + + if (pageRotate == 0 || (pdfAnnot->getFlags() & Annot::flagNoRotate) == 0) { + // Use the normalization matrix for this page's rotation + fillNormalizationMTX(pdfPage, MTX, pageRotate); + } else { + // Clients expect coordinates relative to this page's rotation, but + // FixedRotation annotations internally use unrotated coordinates: + // construct matrix to both normalize and rotate coordinates using the + // top-left corner as rotation pivot + + double MTXnorm[6]; + fillNormalizationMTX(pdfPage, MTXnorm, pageRotate); + + QTransform transform(MTXnorm[0], MTXnorm[1], MTXnorm[2], MTXnorm[3], MTXnorm[4], MTXnorm[5]); + transform.translate(+pdfAnnot->getXMin(), +pdfAnnot->getYMax()); + transform.rotate(pageRotate); + transform.translate(-pdfAnnot->getXMin(), -pdfAnnot->getYMax()); + + MTX[0] = transform.m11(); + MTX[1] = transform.m12(); + MTX[2] = transform.m21(); + MTX[3] = transform.m22(); + MTX[4] = transform.dx(); + MTX[5] = transform.dy(); + } +} + +QRectF AnnotationPrivate::fromPdfRectangle(const PDFRectangle &r) const +{ + double swp, MTX[6]; + fillTransformationMTX(MTX); + + QPointF p1, p2; + XPDFReader::transform(MTX, r.x1, r.y1, p1); + XPDFReader::transform(MTX, r.x2, r.y2, p2); + + double tl_x = p1.x(); + double tl_y = p1.y(); + double br_x = p2.x(); + double br_y = p2.y(); + + if (tl_x > br_x) { + swp = tl_x; + tl_x = br_x; + br_x = swp; + } + + if (tl_y > br_y) { + swp = tl_y; + tl_y = br_y; + br_y = swp; + } + + return QRectF(QPointF(tl_x, tl_y), QPointF(br_x, br_y)); +} + +// This function converts a boundary QRectF in normalized coords to a +// PDFRectangle in user coords. If the FixedRotation flag is set, this function +// also applies a rotation around the top-left corner: it's the inverse of +// the transformation produced by fillTransformationMTX, but we can't use +// fillTransformationMTX here because it relies on the native annotation +// object's boundary rect to be already set up. +PDFRectangle boundaryToPdfRectangle(::Page *pdfPage, const QRectF &r, int rFlags) +{ + Q_ASSERT(pdfPage); + + const double w = pdfPage->getCropWidth(); + const double h = pdfPage->getCropHeight(); + + if (w == 0 || h == 0) { + // page is broken, there's nothing to transform + return {}; + } + + const int pageRotate = pdfPage->getRotate(); + + double MTX[6]; + fillNormalizationMTX(pdfPage, MTX, pageRotate); + + double tl_x, tl_y, br_x, br_y, swp; + XPDFReader::invTransform(MTX, r.topLeft(), tl_x, tl_y); + XPDFReader::invTransform(MTX, r.bottomRight(), br_x, br_y); + + if (tl_x > br_x) { + swp = tl_x; + tl_x = br_x; + br_x = swp; + } + + if (tl_y > br_y) { + swp = tl_y; + tl_y = br_y; + br_y = swp; + } + + const int rotationFixUp = (rFlags & Annotation::FixedRotation) ? pageRotate : 0; + const double width = br_x - tl_x; + const double height = br_y - tl_y; + + if (rotationFixUp == 0) { + return PDFRectangle(tl_x, tl_y, br_x, br_y); + } else if (rotationFixUp == 90) { + return PDFRectangle(tl_x, tl_y - width, tl_x + height, tl_y); + } else if (rotationFixUp == 180) { + return PDFRectangle(br_x, tl_y - height, br_x + width, tl_y); + } else { // rotationFixUp == 270 + return PDFRectangle(br_x, br_y - width, br_x + height, br_y); + } +} + +PDFRectangle AnnotationPrivate::boundaryToPdfRectangle(const QRectF &r, int rFlags) const +{ + return Poppler::boundaryToPdfRectangle(pdfPage, r, rFlags); +} + +AnnotPath *AnnotationPrivate::toAnnotPath(const QLinkedList &list) const +{ + const int count = list.size(); + std::vector ac; + ac.reserve(count); + + double MTX[6]; + fillTransformationMTX(MTX); + + foreach (const QPointF &p, list) { + double x, y; + XPDFReader::invTransform(MTX, p, x, y); + ac.emplace_back(x, y); + } + + return new AnnotPath(std::move(ac)); +} + +QList AnnotationPrivate::findAnnotations(::Page *pdfPage, DocumentData *doc, const QSet &subtypes, int parentID) +{ + Annots *annots = pdfPage->getAnnots(); + + const bool wantTextAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AText); + const bool wantLineAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::ALine); + const bool wantGeomAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AGeom); + const bool wantHighlightAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AHighlight); + const bool wantStampAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AStamp); + const bool wantInkAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AInk); + const bool wantLinkAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::ALink); + const bool wantCaretAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::ACaret); + const bool wantFileAttachmentAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AFileAttachment); + const bool wantSoundAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::ASound); + const bool wantMovieAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AMovie); + const bool wantScreenAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AScreen); + const bool wantWidgetAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AWidget); + + // Create Annotation objects and tie to their native Annot + QList res; + for (Annot *ann : annots->getAnnots()) { + if (!ann) { + error(errInternal, -1, "Annot is null"); + continue; + } + + // Check parent annotation + AnnotMarkup *markupann = dynamic_cast(ann); + if (!markupann) { + // Assume it's a root annotation, and skip if user didn't request it + if (parentID != -1) { + continue; + } + } else if (markupann->getInReplyToID() != parentID) { + continue; + } + + /* Create Annotation of the right subclass */ + Annotation *annotation = nullptr; + Annot::AnnotSubtype subType = ann->getType(); + + switch (subType) { + case Annot::typeText: + if (!wantTextAnnotations) { + continue; + } + annotation = new TextAnnotation(TextAnnotation::Linked); + break; + case Annot::typeFreeText: + if (!wantTextAnnotations) { + continue; + } + annotation = new TextAnnotation(TextAnnotation::InPlace); + break; + case Annot::typeLine: + if (!wantLineAnnotations) { + continue; + } + annotation = new LineAnnotation(LineAnnotation::StraightLine); + break; + case Annot::typePolygon: + case Annot::typePolyLine: + if (!wantLineAnnotations) { + continue; + } + annotation = new LineAnnotation(LineAnnotation::Polyline); + break; + case Annot::typeSquare: + case Annot::typeCircle: + if (!wantGeomAnnotations) { + continue; + } + annotation = new GeomAnnotation(); + break; + case Annot::typeHighlight: + case Annot::typeUnderline: + case Annot::typeSquiggly: + case Annot::typeStrikeOut: + if (!wantHighlightAnnotations) { + continue; + } + annotation = new HighlightAnnotation(); + break; + case Annot::typeStamp: + if (!wantStampAnnotations) { + continue; + } + annotation = new StampAnnotation(); + break; + case Annot::typeInk: + if (!wantInkAnnotations) { + continue; + } + annotation = new InkAnnotation(); + break; + case Annot::typeLink: /* TODO: Move logic to getters */ + { + if (!wantLinkAnnotations) { + continue; + } + // parse Link params + AnnotLink *linkann = static_cast(ann); + LinkAnnotation *l = new LinkAnnotation(); + annotation = l; + + // -> hlMode + l->setLinkHighlightMode((LinkAnnotation::HighlightMode)linkann->getLinkEffect()); + + // -> link region + // TODO + + // reading link action + if (linkann->getAction()) { + Link *popplerLink = PageData::convertLinkActionToLink(linkann->getAction(), doc, QRectF()); + if (popplerLink) { + l->setLinkDestination(popplerLink); + } + } + break; + } + case Annot::typeCaret: + if (!wantCaretAnnotations) { + continue; + } + annotation = new CaretAnnotation(); + break; + case Annot::typeFileAttachment: /* TODO: Move logic to getters */ + { + if (!wantFileAttachmentAnnotations) { + continue; + } + AnnotFileAttachment *attachann = static_cast(ann); + FileAttachmentAnnotation *f = new FileAttachmentAnnotation(); + annotation = f; + // -> fileIcon + f->setFileIconName(QString::fromLatin1(attachann->getName()->c_str())); + // -> embeddedFile + auto filespec = std::make_unique(attachann->getFile()); + f->setEmbeddedFile(new EmbeddedFile(*new EmbeddedFileData(std::move(filespec)))); + break; + } + case Annot::typeSound: /* TODO: Move logic to getters */ + { + if (!wantSoundAnnotations) { + continue; + } + AnnotSound *soundann = static_cast(ann); + SoundAnnotation *s = new SoundAnnotation(); + annotation = s; + + // -> soundIcon + s->setSoundIconName(QString::fromLatin1(soundann->getName()->c_str())); + // -> sound + s->setSound(new SoundObject(soundann->getSound())); + break; + } + case Annot::typeMovie: /* TODO: Move logic to getters */ + { + if (!wantMovieAnnotations) { + continue; + } + AnnotMovie *movieann = static_cast(ann); + MovieAnnotation *m = new MovieAnnotation(); + annotation = m; + + // -> movie + MovieObject *movie = new MovieObject(movieann); + m->setMovie(movie); + // -> movieTitle + const GooString *movietitle = movieann->getTitle(); + if (movietitle) { + m->setMovieTitle(QString::fromLatin1(movietitle->c_str())); + } + break; + } + case Annot::typeScreen: { + if (!wantScreenAnnotations) { + continue; + } + AnnotScreen *screenann = static_cast(ann); + // TODO Support other link types than Link::Rendition in ScreenAnnotation + if (!screenann->getAction() || screenann->getAction()->getKind() != actionRendition) { + continue; + } + ScreenAnnotation *s = new ScreenAnnotation(); + annotation = s; + + // -> screen + Link *popplerLink = PageData::convertLinkActionToLink(screenann->getAction(), doc, QRectF()); + s->setAction(static_cast(popplerLink)); + + // -> screenTitle + const GooString *screentitle = screenann->getTitle(); + if (screentitle) { + s->setScreenTitle(UnicodeParsedString(screentitle)); + } + break; + } + case Annot::typePopup: + continue; // popups are parsed by Annotation's window() getter + case Annot::typeUnknown: + continue; // special case for ignoring unknown annotations + case Annot::typeWidget: + if (!wantWidgetAnnotations) { + continue; + } + annotation = new WidgetAnnotation(); + break; + case Annot::typeRichMedia: { + const AnnotRichMedia *annotRichMedia = static_cast(ann); + + RichMediaAnnotation *richMediaAnnotation = new RichMediaAnnotation; + + const AnnotRichMedia::Settings *annotSettings = annotRichMedia->getSettings(); + if (annotSettings) { + RichMediaAnnotation::Settings *settings = new RichMediaAnnotation::Settings; + + if (annotSettings->getActivation()) { + RichMediaAnnotation::Activation *activation = new RichMediaAnnotation::Activation; + + switch (annotSettings->getActivation()->getCondition()) { + case AnnotRichMedia::Activation::conditionPageOpened: + activation->setCondition(RichMediaAnnotation::Activation::PageOpened); + break; + case AnnotRichMedia::Activation::conditionPageVisible: + activation->setCondition(RichMediaAnnotation::Activation::PageVisible); + break; + case AnnotRichMedia::Activation::conditionUserAction: + activation->setCondition(RichMediaAnnotation::Activation::UserAction); + break; + } + + settings->setActivation(activation); + } + + if (annotSettings->getDeactivation()) { + RichMediaAnnotation::Deactivation *deactivation = new RichMediaAnnotation::Deactivation; + + switch (annotSettings->getDeactivation()->getCondition()) { + case AnnotRichMedia::Deactivation::conditionPageClosed: + deactivation->setCondition(RichMediaAnnotation::Deactivation::PageClosed); + break; + case AnnotRichMedia::Deactivation::conditionPageInvisible: + deactivation->setCondition(RichMediaAnnotation::Deactivation::PageInvisible); + break; + case AnnotRichMedia::Deactivation::conditionUserAction: + deactivation->setCondition(RichMediaAnnotation::Deactivation::UserAction); + break; + } + + settings->setDeactivation(deactivation); + } + + richMediaAnnotation->setSettings(settings); + } + + const AnnotRichMedia::Content *annotContent = annotRichMedia->getContent(); + if (annotContent) { + RichMediaAnnotation::Content *content = new RichMediaAnnotation::Content; + + const int configurationsCount = annotContent->getConfigurationsCount(); + if (configurationsCount > 0) { + QList configurations; + + for (int i = 0; i < configurationsCount; ++i) { + const AnnotRichMedia::Configuration *annotConfiguration = annotContent->getConfiguration(i); + if (!annotConfiguration) { + continue; + } + + RichMediaAnnotation::Configuration *configuration = new RichMediaAnnotation::Configuration; + + if (annotConfiguration->getName()) { + configuration->setName(UnicodeParsedString(annotConfiguration->getName())); + } + + switch (annotConfiguration->getType()) { + case AnnotRichMedia::Configuration::type3D: + configuration->setType(RichMediaAnnotation::Configuration::Type3D); + break; + case AnnotRichMedia::Configuration::typeFlash: + configuration->setType(RichMediaAnnotation::Configuration::TypeFlash); + break; + case AnnotRichMedia::Configuration::typeSound: + configuration->setType(RichMediaAnnotation::Configuration::TypeSound); + break; + case AnnotRichMedia::Configuration::typeVideo: + configuration->setType(RichMediaAnnotation::Configuration::TypeVideo); + break; + } + + const int instancesCount = annotConfiguration->getInstancesCount(); + if (instancesCount > 0) { + QList instances; + + for (int j = 0; j < instancesCount; ++j) { + const AnnotRichMedia::Instance *annotInstance = annotConfiguration->getInstance(j); + if (!annotInstance) { + continue; + } + + RichMediaAnnotation::Instance *instance = new RichMediaAnnotation::Instance; + + switch (annotInstance->getType()) { + case AnnotRichMedia::Instance::type3D: + instance->setType(RichMediaAnnotation::Instance::Type3D); + break; + case AnnotRichMedia::Instance::typeFlash: + instance->setType(RichMediaAnnotation::Instance::TypeFlash); + break; + case AnnotRichMedia::Instance::typeSound: + instance->setType(RichMediaAnnotation::Instance::TypeSound); + break; + case AnnotRichMedia::Instance::typeVideo: + instance->setType(RichMediaAnnotation::Instance::TypeVideo); + break; + } + + const AnnotRichMedia::Params *annotParams = annotInstance->getParams(); + if (annotParams) { + RichMediaAnnotation::Params *params = new RichMediaAnnotation::Params; + + if (annotParams->getFlashVars()) { + params->setFlashVars(UnicodeParsedString(annotParams->getFlashVars())); + } + + instance->setParams(params); + } + + instances.append(instance); + } + + configuration->setInstances(instances); + } + + configurations.append(configuration); + } + + content->setConfigurations(configurations); + } + + const int assetsCount = annotContent->getAssetsCount(); + if (assetsCount > 0) { + QList assets; + + for (int i = 0; i < assetsCount; ++i) { + const AnnotRichMedia::Asset *annotAsset = annotContent->getAsset(i); + if (!annotAsset) { + continue; + } + + RichMediaAnnotation::Asset *asset = new RichMediaAnnotation::Asset; + + if (annotAsset->getName()) { + asset->setName(UnicodeParsedString(annotAsset->getName())); + } + + auto fileSpec = std::make_unique(annotAsset->getFileSpec()); + asset->setEmbeddedFile(new EmbeddedFile(*new EmbeddedFileData(std::move(fileSpec)))); + + assets.append(asset); + } + + content->setAssets(assets); + } + + richMediaAnnotation->setContent(content); + } + + annotation = richMediaAnnotation; + + break; + } + default: { +#define CASE_FOR_TYPE(thetype) \ + case Annot::type##thetype: \ + error(errUnimplemented, -1, "Annotation " #thetype " not supported"); \ + break; + switch (subType) { + CASE_FOR_TYPE(PrinterMark) + CASE_FOR_TYPE(TrapNet) + CASE_FOR_TYPE(Watermark) + CASE_FOR_TYPE(3D) + default: + error(errUnimplemented, -1, "Annotation {0:d} not supported", subType); + } + continue; +#undef CASE_FOR_TYPE + } + } + + annotation->d_ptr->tieToNativeAnnot(ann, pdfPage, doc); + res.append(annotation); + } + + return res; +} + +Ref AnnotationPrivate::pdfObjectReference() const +{ + if (pdfAnnot == nullptr) { + return Ref::INVALID(); + } + + return pdfAnnot->getRef(); +} + +Link *AnnotationPrivate::additionalAction(Annotation::AdditionalActionType type) const +{ + if (pdfAnnot->getType() != Annot::typeScreen && pdfAnnot->getType() != Annot::typeWidget) { + return nullptr; + } + + const Annot::AdditionalActionsType actionType = toPopplerAdditionalActionType(type); + + std::unique_ptr<::LinkAction> linkAction = nullptr; + if (pdfAnnot->getType() == Annot::typeScreen) { + linkAction = static_cast(pdfAnnot)->getAdditionalAction(actionType); + } else { + linkAction = static_cast(pdfAnnot)->getAdditionalAction(actionType); + } + + Link *link = nullptr; + + if (linkAction) { + link = PageData::convertLinkActionToLink(linkAction.get(), parentDoc, QRectF()); + } + + return link; +} + +void AnnotationPrivate::addAnnotationToPage(::Page *pdfPage, DocumentData *doc, const Annotation *ann) +{ + if (ann->d_ptr->pdfAnnot != nullptr) { + error(errIO, -1, "Annotation is already tied"); + return; + } + + // Unimplemented annotations can't be created by the user because their ctor + // is private. Therefore, createNativeAnnot will never return 0 + Annot *nativeAnnot = ann->d_ptr->createNativeAnnot(pdfPage, doc); + Q_ASSERT(nativeAnnot); + + if (ann->d_ptr->annotationAppearance.isStream()) { + nativeAnnot->setNewAppearance(ann->d_ptr->annotationAppearance.copy()); + } + + pdfPage->addAnnot(nativeAnnot); +} + +void AnnotationPrivate::removeAnnotationFromPage(::Page *pdfPage, const Annotation *ann) +{ + if (ann->d_ptr->pdfAnnot == nullptr) { + error(errIO, -1, "Annotation is not tied"); + return; + } + + if (ann->d_ptr->pdfPage != pdfPage) { + error(errIO, -1, "Annotation doesn't belong to the specified page"); + return; + } + + // Remove annotation + pdfPage->removeAnnot(ann->d_ptr->pdfAnnot); + + // Destroy object + delete ann; +} + +class TextAnnotationPrivate : public AnnotationPrivate +{ +public: + TextAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + void setDefaultAppearanceToNative(); + std::unique_ptr getDefaultAppearanceFromNative() const; + + // data fields + TextAnnotation::TextType textType; + QString textIcon; + std::optional textFont; + QColor textColor = Qt::black; + int inplaceAlign; // 0:left, 1:center, 2:right + QVector inplaceCallout; + TextAnnotation::InplaceIntent inplaceIntent; +}; + +class Annotation::Style::Private : public QSharedData +{ +public: + Private() : opacity(1.0), width(1.0), lineStyle(Solid), xCorners(0.0), yCorners(0.0), lineEffect(NoEffect), effectIntensity(1.0) + { + dashArray.resize(1); + dashArray[0] = 3; + } + + QColor color; + double opacity; + double width; + Annotation::LineStyle lineStyle; + double xCorners; + double yCorners; + QVector dashArray; + Annotation::LineEffect lineEffect; + double effectIntensity; +}; + +Annotation::Style::Style() : d(new Private) { } + +Annotation::Style::Style(const Style &other) : d(other.d) { } + +Annotation::Style &Annotation::Style::operator=(const Style &other) +{ + if (this != &other) { + d = other.d; + } + + return *this; +} + +Annotation::Style::~Style() { } + +QColor Annotation::Style::color() const +{ + return d->color; +} + +void Annotation::Style::setColor(const QColor &color) +{ + d->color = color; +} + +double Annotation::Style::opacity() const +{ + return d->opacity; +} + +void Annotation::Style::setOpacity(double opacity) +{ + d->opacity = opacity; +} + +double Annotation::Style::width() const +{ + return d->width; +} + +void Annotation::Style::setWidth(double width) +{ + d->width = width; +} + +Annotation::LineStyle Annotation::Style::lineStyle() const +{ + return d->lineStyle; +} + +void Annotation::Style::setLineStyle(Annotation::LineStyle style) +{ + d->lineStyle = style; +} + +double Annotation::Style::xCorners() const +{ + return d->xCorners; +} + +void Annotation::Style::setXCorners(double radius) +{ + d->xCorners = radius; +} + +double Annotation::Style::yCorners() const +{ + return d->yCorners; +} + +void Annotation::Style::setYCorners(double radius) +{ + d->yCorners = radius; +} + +const QVector &Annotation::Style::dashArray() const +{ + return d->dashArray; +} + +void Annotation::Style::setDashArray(const QVector &array) +{ + d->dashArray = array; +} + +Annotation::LineEffect Annotation::Style::lineEffect() const +{ + return d->lineEffect; +} + +void Annotation::Style::setLineEffect(Annotation::LineEffect effect) +{ + d->lineEffect = effect; +} + +double Annotation::Style::effectIntensity() const +{ + return d->effectIntensity; +} + +void Annotation::Style::setEffectIntensity(double intens) +{ + d->effectIntensity = intens; +} + +class Annotation::Popup::Private : public QSharedData +{ +public: + Private() : flags(-1) { } + + int flags; + QRectF geometry; + QString title; + QString summary; + QString text; +}; + +Annotation::Popup::Popup() : d(new Private) { } + +Annotation::Popup::Popup(const Popup &other) : d(other.d) { } + +Annotation::Popup &Annotation::Popup::operator=(const Popup &other) +{ + if (this != &other) { + d = other.d; + } + + return *this; +} + +Annotation::Popup::~Popup() { } + +int Annotation::Popup::flags() const +{ + return d->flags; +} + +void Annotation::Popup::setFlags(int flags) +{ + d->flags = flags; +} + +QRectF Annotation::Popup::geometry() const +{ + return d->geometry; +} + +void Annotation::Popup::setGeometry(const QRectF &geom) +{ + d->geometry = geom; +} + +QString Annotation::Popup::title() const +{ + return d->title; +} + +void Annotation::Popup::setTitle(const QString &title) +{ + d->title = title; +} + +QString Annotation::Popup::summary() const +{ + return d->summary; +} + +void Annotation::Popup::setSummary(const QString &summary) +{ + d->summary = summary; +} + +QString Annotation::Popup::text() const +{ + return d->text; +} + +void Annotation::Popup::setText(const QString &text) +{ + d->text = text; +} + +Annotation::Annotation(AnnotationPrivate &dd) : d_ptr(&dd) { } + +Annotation::~Annotation() { } + +Annotation::Annotation(AnnotationPrivate &dd, const QDomNode &annNode) : d_ptr(&dd) +{ + Q_D(Annotation); + + // get the [base] element of the annotation node + QDomElement e = AnnotationUtils::findChildElement(annNode, QStringLiteral("base")); + if (e.isNull()) { + return; + } + + Style s; + Popup w; + + // parse -contents- attributes + if (e.hasAttribute(QStringLiteral("author"))) { + setAuthor(e.attribute(QStringLiteral("author"))); + } + if (e.hasAttribute(QStringLiteral("contents"))) { + setContents(e.attribute(QStringLiteral("contents"))); + } + if (e.hasAttribute(QStringLiteral("uniqueName"))) { + setUniqueName(e.attribute(QStringLiteral("uniqueName"))); + } + if (e.hasAttribute(QStringLiteral("modifyDate"))) { + QDateTime dt = QDateTime::fromString(e.attribute(QStringLiteral("modifyDate"))); + if (!dt.isValid()) { + dt = QDateTime::fromString(e.attribute(QStringLiteral("modifyDate")), Qt::ISODate); + } + setModificationDate(dt); + } + if (e.hasAttribute(QStringLiteral("creationDate"))) { + QDateTime dt = QDateTime::fromString(e.attribute(QStringLiteral("creationDate"))); + if (!dt.isValid()) { + dt = QDateTime::fromString(e.attribute(QStringLiteral("creationDate")), Qt::ISODate); + } + setCreationDate(dt); + } + + // parse -other- attributes + if (e.hasAttribute(QStringLiteral("flags"))) { + setFlags(e.attribute(QStringLiteral("flags")).toInt()); + } + if (e.hasAttribute(QStringLiteral("color"))) { + s.setColor(QColor(e.attribute(QStringLiteral("color")))); + } + if (e.hasAttribute(QStringLiteral("opacity"))) { + s.setOpacity(e.attribute(QStringLiteral("opacity")).toDouble()); + } + + // parse -the-subnodes- (describing Style, Window, Revision(s) structures) + // Note: all subnodes if present must be 'attributes complete' + QDomNode eSubNode = e.firstChild(); + while (eSubNode.isElement()) { + QDomElement ee = eSubNode.toElement(); + eSubNode = eSubNode.nextSibling(); + + // parse boundary + if (ee.tagName() == QLatin1String("boundary")) { + QRectF brect; + brect.setLeft(ee.attribute(QStringLiteral("l")).toDouble()); + brect.setTop(ee.attribute(QStringLiteral("t")).toDouble()); + brect.setRight(ee.attribute(QStringLiteral("r")).toDouble()); + brect.setBottom(ee.attribute(QStringLiteral("b")).toDouble()); + setBoundary(brect); + } + // parse penStyle if not default + else if (ee.tagName() == QLatin1String("penStyle")) { + s.setWidth(ee.attribute(QStringLiteral("width")).toDouble()); + s.setLineStyle((LineStyle)ee.attribute(QStringLiteral("style")).toInt()); + s.setXCorners(ee.attribute(QStringLiteral("xcr")).toDouble()); + s.setYCorners(ee.attribute(QStringLiteral("ycr")).toDouble()); + + // Try to parse dash array (new format) + QVector dashArray; + + QDomNode eeSubNode = ee.firstChild(); + while (eeSubNode.isElement()) { + QDomElement eee = eeSubNode.toElement(); + eeSubNode = eeSubNode.nextSibling(); + + if (eee.tagName() != QLatin1String("dashsegm")) { + continue; + } + + dashArray.append(eee.attribute(QStringLiteral("len")).toDouble()); + } + + // If no segments were found use marks/spaces (old format) + if (dashArray.size() == 0) { + dashArray.append(ee.attribute(QStringLiteral("marks")).toDouble()); + dashArray.append(ee.attribute(QStringLiteral("spaces")).toDouble()); + } + + s.setDashArray(dashArray); + } + // parse effectStyle if not default + else if (ee.tagName() == QLatin1String("penEffect")) { + s.setLineEffect((LineEffect)ee.attribute(QStringLiteral("effect")).toInt()); + s.setEffectIntensity(ee.attribute(QStringLiteral("intensity")).toDouble()); + } + // parse window if present + else if (ee.tagName() == QLatin1String("window")) { + QRectF geom; + geom.setX(ee.attribute(QStringLiteral("top")).toDouble()); + geom.setY(ee.attribute(QStringLiteral("left")).toDouble()); + + if (ee.hasAttribute(QStringLiteral("widthDouble"))) { + geom.setWidth(ee.attribute(QStringLiteral("widthDouble")).toDouble()); + } else { + geom.setWidth(ee.attribute(QStringLiteral("width")).toDouble()); + } + + if (ee.hasAttribute(QStringLiteral("widthDouble"))) { + geom.setHeight(ee.attribute(QStringLiteral("heightDouble")).toDouble()); + } else { + geom.setHeight(ee.attribute(QStringLiteral("height")).toDouble()); + } + + w.setGeometry(geom); + + w.setFlags(ee.attribute(QStringLiteral("flags")).toInt()); + w.setTitle(ee.attribute(QStringLiteral("title"))); + w.setSummary(ee.attribute(QStringLiteral("summary"))); + // parse window subnodes + QDomNode winNode = ee.firstChild(); + for (; winNode.isElement(); winNode = winNode.nextSibling()) { + QDomElement winElement = winNode.toElement(); + if (winElement.tagName() == QLatin1String("text")) { + w.setText(winElement.firstChild().toCDATASection().data()); + } + } + } + } + + setStyle(s); // assign parsed style + setPopup(w); // assign parsed window + + // get the [revisions] element of the annotation node + QDomNode revNode = annNode.firstChild(); + for (; revNode.isElement(); revNode = revNode.nextSibling()) { + QDomElement revElement = revNode.toElement(); + if (revElement.tagName() != QLatin1String("revision")) { + continue; + } + + Annotation *reply = AnnotationUtils::createAnnotation(revElement); + + if (reply) // if annotation is valid, add as a revision of this annotation + { + RevScope scope = (RevScope)revElement.attribute(QStringLiteral("revScope")).toInt(); + RevType type = (RevType)revElement.attribute(QStringLiteral("revType")).toInt(); + d->addRevision(reply, scope, type); + delete reply; + } + } +} + +void Annotation::storeBaseAnnotationProperties(QDomNode &annNode, QDomDocument &document) const +{ + // create [base] element of the annotation node + QDomElement e = document.createElement(QStringLiteral("base")); + annNode.appendChild(e); + + const Style s = style(); + const Popup w = popup(); + + // store -contents- attributes + if (!author().isEmpty()) { + e.setAttribute(QStringLiteral("author"), author()); + } + if (!contents().isEmpty()) { + e.setAttribute(QStringLiteral("contents"), contents()); + } + if (!uniqueName().isEmpty()) { + e.setAttribute(QStringLiteral("uniqueName"), uniqueName()); + } + if (modificationDate().isValid()) { + e.setAttribute(QStringLiteral("modifyDate"), modificationDate().toString()); + } + if (creationDate().isValid()) { + e.setAttribute(QStringLiteral("creationDate"), creationDate().toString()); + } + + // store -other- attributes + if (flags()) { + e.setAttribute(QStringLiteral("flags"), flags()); + } + if (s.color().isValid()) { + e.setAttribute(QStringLiteral("color"), s.color().name()); + } + if (s.opacity() != 1.0) { + e.setAttribute(QStringLiteral("opacity"), QString::number(s.opacity())); + } + + // Sub-Node-1 - boundary + const QRectF brect = boundary(); + QDomElement bE = document.createElement(QStringLiteral("boundary")); + e.appendChild(bE); + bE.setAttribute(QStringLiteral("l"), QString::number((double)brect.left())); + bE.setAttribute(QStringLiteral("t"), QString::number((double)brect.top())); + bE.setAttribute(QStringLiteral("r"), QString::number((double)brect.right())); + bE.setAttribute(QStringLiteral("b"), QString::number((double)brect.bottom())); + + // Sub-Node-2 - penStyle + const QVector &dashArray = s.dashArray(); + if (s.width() != 1 || s.lineStyle() != Solid || s.xCorners() != 0 || s.yCorners() != 0.0 || dashArray.size() != 1 || dashArray[0] != 3) { + QDomElement psE = document.createElement(QStringLiteral("penStyle")); + e.appendChild(psE); + psE.setAttribute(QStringLiteral("width"), QString::number(s.width())); + psE.setAttribute(QStringLiteral("style"), (int)s.lineStyle()); + psE.setAttribute(QStringLiteral("xcr"), QString::number(s.xCorners())); + psE.setAttribute(QStringLiteral("ycr"), QString::number(s.yCorners())); + + int marks = 3, spaces = 0; // Do not break code relying on marks/spaces + if (dashArray.size() != 0) { + marks = (int)dashArray[0]; + } + if (dashArray.size() > 1) { + spaces = (int)dashArray[1]; + } + + psE.setAttribute(QStringLiteral("marks"), marks); + psE.setAttribute(QStringLiteral("spaces"), spaces); + + foreach (double segm, dashArray) { + QDomElement pattE = document.createElement(QStringLiteral("dashsegm")); + pattE.setAttribute(QStringLiteral("len"), QString::number(segm)); + psE.appendChild(pattE); + } + } + + // Sub-Node-3 - penEffect + if (s.lineEffect() != NoEffect || s.effectIntensity() != 1.0) { + QDomElement peE = document.createElement(QStringLiteral("penEffect")); + e.appendChild(peE); + peE.setAttribute(QStringLiteral("effect"), (int)s.lineEffect()); + peE.setAttribute(QStringLiteral("intensity"), QString::number(s.effectIntensity())); + } + + // Sub-Node-4 - window + if (w.flags() != -1 || !w.title().isEmpty() || !w.summary().isEmpty() || !w.text().isEmpty()) { + QDomElement wE = document.createElement(QStringLiteral("window")); + const QRectF geom = w.geometry(); + e.appendChild(wE); + wE.setAttribute(QStringLiteral("flags"), w.flags()); + wE.setAttribute(QStringLiteral("top"), QString::number(geom.x())); + wE.setAttribute(QStringLiteral("left"), QString::number(geom.y())); + wE.setAttribute(QStringLiteral("width"), (int)geom.width()); + wE.setAttribute(QStringLiteral("height"), (int)geom.height()); + wE.setAttribute(QStringLiteral("widthDouble"), QString::number(geom.width())); + wE.setAttribute(QStringLiteral("heightDouble"), QString::number(geom.height())); + wE.setAttribute(QStringLiteral("title"), w.title()); + wE.setAttribute(QStringLiteral("summary"), w.summary()); + // store window.text as a subnode, because we need escaped data + if (!w.text().isEmpty()) { + QDomElement escapedText = document.createElement(QStringLiteral("text")); + wE.appendChild(escapedText); + QDomCDATASection textCData = document.createCDATASection(w.text()); + escapedText.appendChild(textCData); + } + } + + const QList revs = revisions(); + + // create [revision] element of the annotation node (if any) + if (revs.isEmpty()) { + return; + } + + // add all revisions as children of revisions element + foreach (const Annotation *rev, revs) { + QDomElement r = document.createElement(QStringLiteral("revision")); + annNode.appendChild(r); + // set element attributes + r.setAttribute(QStringLiteral("revScope"), (int)rev->revisionScope()); + r.setAttribute(QStringLiteral("revType"), (int)rev->revisionType()); + // use revision as the annotation element, so fill it up + AnnotationUtils::storeAnnotation(rev, r, document); + delete rev; + } +} + +QString Annotation::author() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->author; + } + + const AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + return markupann ? UnicodeParsedString(markupann->getLabel()) : QString(); +} + +void Annotation::setAuthor(const QString &author) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->author = author; + return; + } + + AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + if (markupann) { + markupann->setLabel(std::unique_ptr(QStringToUnicodeGooString(author))); + } +} + +QString Annotation::contents() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->contents; + } + + return UnicodeParsedString(d->pdfAnnot->getContents()); +} + +void Annotation::setContents(const QString &contents) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->contents = contents; + return; + } + + d->pdfAnnot->setContents(std::unique_ptr(QStringToUnicodeGooString(contents))); + + TextAnnotationPrivate *textAnnotD = dynamic_cast(d); + if (textAnnotD) { + textAnnotD->setDefaultAppearanceToNative(); + } +} + +QString Annotation::uniqueName() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->uniqueName; + } + + return UnicodeParsedString(d->pdfAnnot->getName()); +} + +void Annotation::setUniqueName(const QString &uniqueName) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->uniqueName = uniqueName; + return; + } + + QByteArray ascii = uniqueName.toLatin1(); + GooString s(ascii.constData()); + d->pdfAnnot->setName(&s); +} + +QDateTime Annotation::modificationDate() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->modDate; + } + + if (d->pdfAnnot->getModified()) { + return convertDate(d->pdfAnnot->getModified()->c_str()); + } else { + return QDateTime(); + } +} + +void Annotation::setModificationDate(const QDateTime &date) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->modDate = date; + return; + } + + if (d->pdfAnnot) { + if (date.isValid()) { + const time_t t = date.toSecsSinceEpoch(); + GooString *s = timeToDateString(&t); + d->pdfAnnot->setModified(s); + delete s; + } else { + d->pdfAnnot->setModified(nullptr); + } + } +} + +QDateTime Annotation::creationDate() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->creationDate; + } + + const AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + + if (markupann && markupann->getDate()) { + return convertDate(markupann->getDate()->c_str()); + } + + return modificationDate(); +} + +void Annotation::setCreationDate(const QDateTime &date) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->creationDate = date; + return; + } + + AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + if (markupann) { + if (date.isValid()) { + const time_t t = date.toSecsSinceEpoch(); + GooString *s = timeToDateString(&t); + markupann->setDate(s); + delete s; + } else { + markupann->setDate(nullptr); + } + } +} + +static int fromPdfFlags(int flags) +{ + int qtflags = 0; + + if (flags & Annot::flagHidden) { + qtflags |= Annotation::Hidden; + } + if (flags & Annot::flagNoZoom) { + qtflags |= Annotation::FixedSize; + } + if (flags & Annot::flagNoRotate) { + qtflags |= Annotation::FixedRotation; + } + if (!(flags & Annot::flagPrint)) { + qtflags |= Annotation::DenyPrint; + } + if (flags & Annot::flagReadOnly) { + qtflags |= (Annotation::DenyWrite | Annotation::DenyDelete); + } + if (flags & Annot::flagLocked) { + qtflags |= Annotation::DenyDelete; + } + if (flags & Annot::flagToggleNoView) { + qtflags |= Annotation::ToggleHidingOnMouse; + } + + return qtflags; +} + +static int toPdfFlags(int qtflags) +{ + int flags = 0; + + if (qtflags & Annotation::Hidden) { + flags |= Annot::flagHidden; + } + if (qtflags & Annotation::FixedSize) { + flags |= Annot::flagNoZoom; + } + if (qtflags & Annotation::FixedRotation) { + flags |= Annot::flagNoRotate; + } + if (!(qtflags & Annotation::DenyPrint)) { + flags |= Annot::flagPrint; + } + if (qtflags & Annotation::DenyWrite) { + flags |= Annot::flagReadOnly; + } + if (qtflags & Annotation::DenyDelete) { + flags |= Annot::flagLocked; + } + if (qtflags & Annotation::ToggleHidingOnMouse) { + flags |= Annot::flagToggleNoView; + } + + return flags; +} + +int Annotation::flags() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->flags; + } + + return fromPdfFlags(d->pdfAnnot->getFlags()); +} + +void Annotation::setFlags(int flags) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->flags = flags; + return; + } + + d->pdfAnnot->setFlags(toPdfFlags(flags)); +} + +QRectF Annotation::boundary() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->boundary; + } + + const PDFRectangle &rect = d->pdfAnnot->getRect(); + return d->fromPdfRectangle(rect); +} + +void Annotation::setBoundary(const QRectF &boundary) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->boundary = boundary; + return; + } + + const PDFRectangle rect = d->boundaryToPdfRectangle(boundary, flags()); + if (rect == d->pdfAnnot->getRect()) { + return; + } + d->pdfAnnot->setRect(&rect); +} + +Annotation::Style Annotation::style() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->style; + } + + Style s; + s.setColor(convertAnnotColor(d->pdfAnnot->getColor())); + + const AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + if (markupann) { + s.setOpacity(markupann->getOpacity()); + } + + const AnnotBorder *border = d->pdfAnnot->getBorder(); + if (border) { + if (border->getType() == AnnotBorder::typeArray) { + const AnnotBorderArray *border_array = static_cast(border); + s.setXCorners(border_array->getHorizontalCorner()); + s.setYCorners(border_array->getVerticalCorner()); + } + + s.setWidth(border->getWidth()); + s.setLineStyle((Annotation::LineStyle)(1 << border->getStyle())); + + const std::vector &dashArray = border->getDash(); +#if QT_VERSION <= QT_VERSION_CHECK(5, 14, 0) + s.setDashArray(QVector::fromStdVector(dashArray)); +#else + s.setDashArray(QVector(dashArray.begin(), dashArray.end())); +#endif + } + + AnnotBorderEffect *border_effect; + switch (d->pdfAnnot->getType()) { + case Annot::typeFreeText: + border_effect = static_cast(d->pdfAnnot)->getBorderEffect(); + break; + case Annot::typeSquare: + case Annot::typeCircle: + border_effect = static_cast(d->pdfAnnot)->getBorderEffect(); + break; + default: + border_effect = nullptr; + } + if (border_effect) { + s.setLineEffect((Annotation::LineEffect)border_effect->getEffectType()); + s.setEffectIntensity(border_effect->getIntensity()); + } + + return s; +} + +void Annotation::setStyle(const Annotation::Style &style) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->style = style; + return; + } + + d->pdfAnnot->setColor(convertQColor(style.color())); + + AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + if (markupann) { + markupann->setOpacity(style.opacity()); + } + + auto border = std::make_unique(); + border->setWidth(style.width()); + border->setHorizontalCorner(style.xCorners()); + border->setVerticalCorner(style.yCorners()); + d->pdfAnnot->setBorder(std::move(border)); +} + +Annotation::Popup Annotation::popup() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->popup; + } + + Popup w; + AnnotPopup *popup = nullptr; + int flags = -1; // Not initialized + + const AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + if (markupann) { + popup = markupann->getPopup(); + w.setSummary(UnicodeParsedString(markupann->getSubject())); + } + + if (popup) { + flags = fromPdfFlags(popup->getFlags()) & (Annotation::Hidden | Annotation::FixedSize | Annotation::FixedRotation); + + if (!popup->getOpen()) { + flags |= Annotation::Hidden; + } + + const PDFRectangle &rect = popup->getRect(); + w.setGeometry(d->fromPdfRectangle(rect)); + } + + if (d->pdfAnnot->getType() == Annot::typeText) { + const AnnotText *textann = static_cast(d->pdfAnnot); + + // Text annotations default to same rect as annotation + if (flags == -1) { + flags = 0; + w.setGeometry(boundary()); + } + + // If text is not 'opened', force window hiding. if the window + // was parsed from popup, the flag should already be set + if (!textann->getOpen() && flags != -1) { + flags |= Annotation::Hidden; + } + } + + w.setFlags(flags); + + return w; +} + +void Annotation::setPopup(const Annotation::Popup &popup) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->popup = popup; + return; + } + +#if 0 /* TODO: Remove old popup and add AnnotPopup to page */ + AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + if (!markupann) + return; + + // Create a new AnnotPopup and assign it to pdfAnnot + PDFRectangle rect = d->toPdfRectangle( popup.geometry() ); + AnnotPopup * p = new AnnotPopup( d->pdfPage->getDoc(), &rect ); + p->setOpen( !(popup.flags() & Annotation::Hidden) ); + if (!popup.summary().isEmpty()) + { + GooString *s = QStringToUnicodeGooString(popup.summary()); + markupann->setLabel(s); + delete s; + } + markupann->setPopup(p); +#endif +} + +Annotation::RevScope Annotation::revisionScope() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->revisionScope; + } + + const AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + + if (markupann && markupann->isInReplyTo()) { + switch (markupann->getReplyTo()) { + case AnnotMarkup::replyTypeR: + return Annotation::Reply; + case AnnotMarkup::replyTypeGroup: + return Annotation::Group; + } + } + + return Annotation::Root; // It's not a revision +} + +Annotation::RevType Annotation::revisionType() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->revisionType; + } + + const AnnotText *textann = dynamic_cast(d->pdfAnnot); + + if (textann && textann->isInReplyTo()) { + switch (textann->getState()) { + case AnnotText::stateMarked: + return Annotation::Marked; + case AnnotText::stateUnmarked: + return Annotation::Unmarked; + case AnnotText::stateAccepted: + return Annotation::Accepted; + case AnnotText::stateRejected: + return Annotation::Rejected; + case AnnotText::stateCancelled: + return Annotation::Cancelled; + case AnnotText::stateCompleted: + return Annotation::Completed; + default: + break; + } + } + + return Annotation::None; +} + +QList Annotation::revisions() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + /* Return aliases, whose ownership goes to the caller */ + QList res; + foreach (Annotation *rev, d->revisions) + res.append(rev->d_ptr->makeAlias()); + return res; + } + + /* If the annotation doesn't live in a object on its own (eg bug51361), it + * has no ref, therefore it can't have revisions */ + if (!d->pdfAnnot->getHasRef()) { + return QList(); + } + + return AnnotationPrivate::findAnnotations(d->pdfPage, d->parentDoc, QSet(), d->pdfAnnot->getId()); +} + +std::unique_ptr Annotation::annotationAppearance() const +{ + Q_D(const Annotation); + + return std::make_unique(new AnnotationAppearancePrivate(d->pdfAnnot)); +} + +void Annotation::setAnnotationAppearance(const AnnotationAppearance &annotationAppearance) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->annotationAppearance = annotationAppearance.d->appearance.copy(); + return; + } + + // Moving the appearance object using std::move would result + // in the object being completed moved from the AnnotationAppearancePrivate + // class. So, we'll not be able to retrieve the stamp's original AP stream + d->pdfAnnot->setNewAppearance(annotationAppearance.d->appearance.copy()); +} + +// END Annotation implementation + +/** TextAnnotation [Annotation] */ + +TextAnnotationPrivate::TextAnnotationPrivate() : AnnotationPrivate(), textType(TextAnnotation::Linked), textIcon(QStringLiteral("Note")), inplaceAlign(0), inplaceIntent(TextAnnotation::Unknown) { } + +Annotation *TextAnnotationPrivate::makeAlias() +{ + return new TextAnnotation(*this); +} + +Annot *TextAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + // Setters are defined in the public class + TextAnnotation *q = static_cast(makeAlias()); + + // Set page and contents + pdfPage = destPage; + parentDoc = doc; + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + if (textType == TextAnnotation::Linked) { + pdfAnnot = new AnnotText { destPage->getDoc(), &rect }; + } else { + const double pointSize = textFont ? textFont->pointSizeF() : AnnotFreeText::undefinedFontPtSize; + if (pointSize < 0) { + qWarning() << "TextAnnotationPrivate::createNativeAnnot: font pointSize < 0"; + } + pdfAnnot = new AnnotFreeText { destPage->getDoc(), &rect }; + } + + // Set properties + flushBaseAnnotationProperties(); + q->setTextIcon(textIcon); + q->setInplaceAlign(inplaceAlign); + q->setCalloutPoints(inplaceCallout); + q->setInplaceIntent(inplaceIntent); + + delete q; + + inplaceCallout.clear(); // Free up memory + + setDefaultAppearanceToNative(); + + return pdfAnnot; +} + +void TextAnnotationPrivate::setDefaultAppearanceToNative() +{ + if (pdfAnnot && pdfAnnot->getType() == Annot::typeFreeText) { + AnnotFreeText *ftextann = static_cast(pdfAnnot); + const double pointSize = textFont ? textFont->pointSizeF() : AnnotFreeText::undefinedFontPtSize; + if (pointSize < 0) { + qWarning() << "TextAnnotationPrivate::createNativeAnnot: font pointSize < 0"; + } + std::string fontName = "Invalid_font"; + if (textFont) { + Form *form = pdfPage->getDoc()->getCatalog()->getCreateForm(); + if (form) { + fontName = form->findFontInDefaultResources(textFont->family().toStdString(), textFont->styleName().toStdString()); + if (fontName.empty()) { + fontName = form->addFontToDefaultResources(textFont->family().toStdString(), textFont->styleName().toStdString()).fontName; + } + + if (!fontName.empty()) { + form->ensureFontsForAllCharacters(pdfAnnot->getContents(), fontName); + } else { + fontName = "Invalid_font"; + } + } + } + DefaultAppearance da { { objName, fontName.c_str() }, pointSize, convertQColor(textColor) }; + ftextann->setDefaultAppearance(da); + } +} + +std::unique_ptr TextAnnotationPrivate::getDefaultAppearanceFromNative() const +{ + if (pdfAnnot && pdfAnnot->getType() == Annot::typeFreeText) { + AnnotFreeText *ftextann = static_cast(pdfAnnot); + return ftextann->getDefaultAppearance(); + } else { + return {}; + } +} + +TextAnnotation::TextAnnotation(TextAnnotation::TextType type) : Annotation(*new TextAnnotationPrivate()) +{ + setTextType(type); +} + +TextAnnotation::TextAnnotation(TextAnnotationPrivate &dd) : Annotation(dd) { } + +TextAnnotation::TextAnnotation(const QDomNode &node) : Annotation(*new TextAnnotationPrivate, node) +{ + // loop through the whole children looking for a 'text' element + QDomNode subNode = node.firstChild(); + while (subNode.isElement()) { + QDomElement e = subNode.toElement(); + subNode = subNode.nextSibling(); + if (e.tagName() != QLatin1String("text")) { + continue; + } + + // parse the attributes + if (e.hasAttribute(QStringLiteral("type"))) { + setTextType((TextAnnotation::TextType)e.attribute(QStringLiteral("type")).toInt()); + } + if (e.hasAttribute(QStringLiteral("icon"))) { + setTextIcon(e.attribute(QStringLiteral("icon"))); + } + if (e.hasAttribute(QStringLiteral("font"))) { + QFont font; + font.fromString(e.attribute(QStringLiteral("font"))); + setTextFont(font); + if (e.hasAttribute(QStringLiteral("fontColor"))) { + const QColor color = QColor(e.attribute(QStringLiteral("fontColor"))); + setTextColor(color); + } + } + if (e.hasAttribute(QStringLiteral("align"))) { + setInplaceAlign(e.attribute(QStringLiteral("align")).toInt()); + } + if (e.hasAttribute(QStringLiteral("intent"))) { + setInplaceIntent((TextAnnotation::InplaceIntent)e.attribute(QStringLiteral("intent")).toInt()); + } + + // parse the subnodes + QDomNode eSubNode = e.firstChild(); + while (eSubNode.isElement()) { + QDomElement ee = eSubNode.toElement(); + eSubNode = eSubNode.nextSibling(); + + if (ee.tagName() == QLatin1String("escapedText")) { + setContents(ee.firstChild().toCDATASection().data()); + } else if (ee.tagName() == QLatin1String("callout")) { + QVector points(3); + points[0] = QPointF(ee.attribute(QStringLiteral("ax")).toDouble(), ee.attribute(QStringLiteral("ay")).toDouble()); + points[1] = QPointF(ee.attribute(QStringLiteral("bx")).toDouble(), ee.attribute(QStringLiteral("by")).toDouble()); + points[2] = QPointF(ee.attribute(QStringLiteral("cx")).toDouble(), ee.attribute(QStringLiteral("cy")).toDouble()); + setCalloutPoints(points); + } + } + + // loading complete + break; + } +} + +TextAnnotation::~TextAnnotation() { } + +void TextAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [text] element + QDomElement textElement = document.createElement(QStringLiteral("text")); + node.appendChild(textElement); + + // store the optional attributes + if (textType() != Linked) { + textElement.setAttribute(QStringLiteral("type"), (int)textType()); + } + if (textIcon() != QLatin1String("Note")) { + textElement.setAttribute(QStringLiteral("icon"), textIcon()); + } + if (inplaceAlign()) { + textElement.setAttribute(QStringLiteral("align"), inplaceAlign()); + } + if (inplaceIntent() != Unknown) { + textElement.setAttribute(QStringLiteral("intent"), (int)inplaceIntent()); + } + + textElement.setAttribute(QStringLiteral("font"), textFont().toString()); + textElement.setAttribute(QStringLiteral("fontColor"), textColor().name()); + + // Sub-Node-1 - escapedText + if (!contents().isEmpty()) { + QDomElement escapedText = document.createElement(QStringLiteral("escapedText")); + textElement.appendChild(escapedText); + QDomCDATASection textCData = document.createCDATASection(contents()); + escapedText.appendChild(textCData); + } + + // Sub-Node-2 - callout + if (calloutPoint(0).x() != 0.0) { + QDomElement calloutElement = document.createElement(QStringLiteral("callout")); + textElement.appendChild(calloutElement); + calloutElement.setAttribute(QStringLiteral("ax"), QString::number(calloutPoint(0).x())); + calloutElement.setAttribute(QStringLiteral("ay"), QString::number(calloutPoint(0).y())); + calloutElement.setAttribute(QStringLiteral("bx"), QString::number(calloutPoint(1).x())); + calloutElement.setAttribute(QStringLiteral("by"), QString::number(calloutPoint(1).y())); + calloutElement.setAttribute(QStringLiteral("cx"), QString::number(calloutPoint(2).x())); + calloutElement.setAttribute(QStringLiteral("cy"), QString::number(calloutPoint(2).y())); + } +} + +Annotation::SubType TextAnnotation::subType() const +{ + return AText; +} + +TextAnnotation::TextType TextAnnotation::textType() const +{ + Q_D(const TextAnnotation); + + if (!d->pdfAnnot) { + return d->textType; + } + + return d->pdfAnnot->getType() == Annot::typeText ? TextAnnotation::Linked : TextAnnotation::InPlace; +} + +void TextAnnotation::setTextType(TextAnnotation::TextType type) +{ + Q_D(TextAnnotation); + + if (!d->pdfAnnot) { + d->textType = type; + return; + } + + // Type cannot be changed if annotation is already tied + qWarning() << "You can't change the type of a TextAnnotation that is already in a page"; +} + +QString TextAnnotation::textIcon() const +{ + Q_D(const TextAnnotation); + + if (!d->pdfAnnot) { + return d->textIcon; + } + + if (d->pdfAnnot->getType() == Annot::typeText) { + const AnnotText *textann = static_cast(d->pdfAnnot); + return QString::fromLatin1(textann->getIcon()->c_str()); + } + + return QString(); +} + +void TextAnnotation::setTextIcon(const QString &icon) +{ + Q_D(TextAnnotation); + + if (!d->pdfAnnot) { + d->textIcon = icon; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeText) { + AnnotText *textann = static_cast(d->pdfAnnot); + QByteArray encoded = icon.toLatin1(); + GooString s(encoded.constData()); + textann->setIcon(&s); + } +} + +QFont TextAnnotation::textFont() const +{ + Q_D(const TextAnnotation); + + if (d->textFont) { + return *d->textFont; + } + + double fontSize { AnnotFreeText::undefinedFontPtSize }; + if (d->pdfAnnot->getType() == Annot::typeFreeText) { + std::unique_ptr da { d->getDefaultAppearanceFromNative() }; + if (da && da->getFontPtSize() > 0) { + fontSize = da->getFontPtSize(); + } + } + + QFont font; + font.setPointSizeF(fontSize); + return font; +} + +void TextAnnotation::setTextFont(const QFont &font) +{ + Q_D(TextAnnotation); + if (font == d->textFont) { + return; + } + d->textFont = font; + + d->setDefaultAppearanceToNative(); +} + +QColor TextAnnotation::textColor() const +{ + Q_D(const TextAnnotation); + + if (!d->pdfAnnot) { + return d->textColor; + } + + if (std::unique_ptr da { d->getDefaultAppearanceFromNative() }) { + return convertAnnotColor(da->getFontColor()); + } + + return {}; +} + +void TextAnnotation::setTextColor(const QColor &color) +{ + Q_D(TextAnnotation); + if (color == d->textColor) { + return; + } + d->textColor = color; + + d->setDefaultAppearanceToNative(); +} + +int TextAnnotation::inplaceAlign() const +{ + Q_D(const TextAnnotation); + + if (!d->pdfAnnot) { + return d->inplaceAlign; + } + + if (d->pdfAnnot->getType() == Annot::typeFreeText) { + const AnnotFreeText *ftextann = static_cast(d->pdfAnnot); + return static_cast(ftextann->getQuadding()); + } + + return 0; +} + +void TextAnnotation::setInplaceAlign(int align) +{ + Q_D(TextAnnotation); + + if (!d->pdfAnnot) { + d->inplaceAlign = align; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeFreeText) { + AnnotFreeText *ftextann = static_cast(d->pdfAnnot); + ftextann->setQuadding((VariableTextQuadding)align); + } +} + +QPointF TextAnnotation::calloutPoint(int id) const +{ + const QVector points = calloutPoints(); + if (id < 0 || id >= points.size()) { + return QPointF(); + } else { + return points[id]; + } +} + +QVector TextAnnotation::calloutPoints() const +{ + Q_D(const TextAnnotation); + + if (!d->pdfAnnot) { + return d->inplaceCallout; + } + + if (d->pdfAnnot->getType() == Annot::typeText) { + return QVector(); + } + + const AnnotFreeText *ftextann = static_cast(d->pdfAnnot); + const AnnotCalloutLine *callout = ftextann->getCalloutLine(); + + if (!callout) { + return QVector(); + } + + double MTX[6]; + d->fillTransformationMTX(MTX); + + const AnnotCalloutMultiLine *callout_v6 = dynamic_cast(callout); + QVector res(callout_v6 ? 3 : 2); + XPDFReader::transform(MTX, callout->getX1(), callout->getY1(), res[0]); + XPDFReader::transform(MTX, callout->getX2(), callout->getY2(), res[1]); + if (callout_v6) { + XPDFReader::transform(MTX, callout_v6->getX3(), callout_v6->getY3(), res[2]); + } + return res; +} + +void TextAnnotation::setCalloutPoints(const QVector &points) +{ + Q_D(TextAnnotation); + if (!d->pdfAnnot) { + d->inplaceCallout = points; + return; + } + + if (d->pdfAnnot->getType() != Annot::typeFreeText) { + return; + } + + AnnotFreeText *ftextann = static_cast(d->pdfAnnot); + const int count = points.size(); + + if (count == 0) { + ftextann->setCalloutLine(nullptr); + return; + } + + if (count != 2 && count != 3) { + error(errSyntaxError, -1, "Expected zero, two or three points for callout"); + return; + } + + AnnotCalloutLine *callout; + double x1, y1, x2, y2; + double MTX[6]; + d->fillTransformationMTX(MTX); + + XPDFReader::invTransform(MTX, points[0], x1, y1); + XPDFReader::invTransform(MTX, points[1], x2, y2); + if (count == 3) { + double x3, y3; + XPDFReader::invTransform(MTX, points[2], x3, y3); + callout = new AnnotCalloutMultiLine(x1, y1, x2, y2, x3, y3); + } else { + callout = new AnnotCalloutLine(x1, y1, x2, y2); + } + + ftextann->setCalloutLine(callout); + delete callout; +} + +TextAnnotation::InplaceIntent TextAnnotation::inplaceIntent() const +{ + Q_D(const TextAnnotation); + + if (!d->pdfAnnot) { + return d->inplaceIntent; + } + + if (d->pdfAnnot->getType() == Annot::typeFreeText) { + const AnnotFreeText *ftextann = static_cast(d->pdfAnnot); + return (TextAnnotation::InplaceIntent)ftextann->getIntent(); + } + + return TextAnnotation::Unknown; +} + +void TextAnnotation::setInplaceIntent(TextAnnotation::InplaceIntent intent) +{ + Q_D(TextAnnotation); + + if (!d->pdfAnnot) { + d->inplaceIntent = intent; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeFreeText) { + AnnotFreeText *ftextann = static_cast(d->pdfAnnot); + ftextann->setIntent((AnnotFreeText::AnnotFreeTextIntent)intent); + } +} + +/** LineAnnotation [Annotation] */ +class LineAnnotationPrivate : public AnnotationPrivate +{ +public: + LineAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields (note uses border for rendering style) + QLinkedList linePoints; + LineAnnotation::TermStyle lineStartStyle; + LineAnnotation::TermStyle lineEndStyle; + bool lineClosed : 1; // (if true draw close shape) + bool lineShowCaption : 1; + LineAnnotation::LineType lineType; + QColor lineInnerColor; + double lineLeadingFwdPt; + double lineLeadingBackPt; + LineAnnotation::LineIntent lineIntent; +}; + +LineAnnotationPrivate::LineAnnotationPrivate() + : AnnotationPrivate(), lineStartStyle(LineAnnotation::None), lineEndStyle(LineAnnotation::None), lineClosed(false), lineShowCaption(false), lineLeadingFwdPt(0), lineLeadingBackPt(0), lineIntent(LineAnnotation::Unknown) +{ +} + +Annotation *LineAnnotationPrivate::makeAlias() +{ + return new LineAnnotation(*this); +} + +Annot *LineAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + // Setters are defined in the public class + LineAnnotation *q = static_cast(makeAlias()); + + // Set page and document + pdfPage = destPage; + parentDoc = doc; + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + if (lineType == LineAnnotation::StraightLine) { + pdfAnnot = new AnnotLine(doc->doc, &rect); + } else { + pdfAnnot = new AnnotPolygon(doc->doc, &rect, lineClosed ? Annot::typePolygon : Annot::typePolyLine); + } + + // Set properties + flushBaseAnnotationProperties(); + q->setLinePoints(linePoints); + q->setLineStartStyle(lineStartStyle); + q->setLineEndStyle(lineEndStyle); + q->setLineInnerColor(lineInnerColor); + q->setLineLeadingForwardPoint(lineLeadingFwdPt); + q->setLineLeadingBackPoint(lineLeadingBackPt); + q->setLineShowCaption(lineShowCaption); + q->setLineIntent(lineIntent); + + delete q; + + linePoints.clear(); // Free up memory + + return pdfAnnot; +} + +LineAnnotation::LineAnnotation(LineAnnotation::LineType type) : Annotation(*new LineAnnotationPrivate()) +{ + setLineType(type); +} + +LineAnnotation::LineAnnotation(LineAnnotationPrivate &dd) : Annotation(dd) { } + +LineAnnotation::LineAnnotation(const QDomNode &node) : Annotation(*new LineAnnotationPrivate(), node) +{ + // loop through the whole children looking for a 'line' element + QDomNode subNode = node.firstChild(); + while (subNode.isElement()) { + QDomElement e = subNode.toElement(); + subNode = subNode.nextSibling(); + if (e.tagName() != QLatin1String("line")) { + continue; + } + + // parse the attributes + if (e.hasAttribute(QStringLiteral("startStyle"))) { + setLineStartStyle((LineAnnotation::TermStyle)e.attribute(QStringLiteral("startStyle")).toInt()); + } + if (e.hasAttribute(QStringLiteral("endStyle"))) { + setLineEndStyle((LineAnnotation::TermStyle)e.attribute(QStringLiteral("endStyle")).toInt()); + } + if (e.hasAttribute(QStringLiteral("closed"))) { + setLineClosed(e.attribute(QStringLiteral("closed")).toInt()); + } + if (e.hasAttribute(QStringLiteral("innerColor"))) { + setLineInnerColor(QColor(e.attribute(QStringLiteral("innerColor")))); + } + if (e.hasAttribute(QStringLiteral("leadFwd"))) { + setLineLeadingForwardPoint(e.attribute(QStringLiteral("leadFwd")).toDouble()); + } + if (e.hasAttribute(QStringLiteral("leadBack"))) { + setLineLeadingBackPoint(e.attribute(QStringLiteral("leadBack")).toDouble()); + } + if (e.hasAttribute(QStringLiteral("showCaption"))) { + setLineShowCaption(e.attribute(QStringLiteral("showCaption")).toInt()); + } + if (e.hasAttribute(QStringLiteral("intent"))) { + setLineIntent((LineAnnotation::LineIntent)e.attribute(QStringLiteral("intent")).toInt()); + } + + // parse all 'point' subnodes + QLinkedList points; + QDomNode pointNode = e.firstChild(); + while (pointNode.isElement()) { + QDomElement pe = pointNode.toElement(); + pointNode = pointNode.nextSibling(); + + if (pe.tagName() != QLatin1String("point")) { + continue; + } + + QPointF p(pe.attribute(QStringLiteral("x"), QStringLiteral("0.0")).toDouble(), pe.attribute(QStringLiteral("y"), QStringLiteral("0.0")).toDouble()); + points.append(p); + } + setLinePoints(points); + setLineType(points.size() == 2 ? StraightLine : Polyline); + + // loading complete + break; + } +} + +LineAnnotation::~LineAnnotation() { } + +void LineAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [line] element + QDomElement lineElement = document.createElement(QStringLiteral("line")); + node.appendChild(lineElement); + + // store the attributes + if (lineStartStyle() != None) { + lineElement.setAttribute(QStringLiteral("startStyle"), (int)lineStartStyle()); + } + if (lineEndStyle() != None) { + lineElement.setAttribute(QStringLiteral("endStyle"), (int)lineEndStyle()); + } + if (isLineClosed()) { + lineElement.setAttribute(QStringLiteral("closed"), isLineClosed()); + } + if (lineInnerColor().isValid()) { + lineElement.setAttribute(QStringLiteral("innerColor"), lineInnerColor().name()); + } + if (lineLeadingForwardPoint() != 0.0) { + lineElement.setAttribute(QStringLiteral("leadFwd"), QString::number(lineLeadingForwardPoint())); + } + if (lineLeadingBackPoint() != 0.0) { + lineElement.setAttribute(QStringLiteral("leadBack"), QString::number(lineLeadingBackPoint())); + } + if (lineShowCaption()) { + lineElement.setAttribute(QStringLiteral("showCaption"), lineShowCaption()); + } + if (lineIntent() != Unknown) { + lineElement.setAttribute(QStringLiteral("intent"), lineIntent()); + } + + // append the list of points + const QLinkedList points = linePoints(); + if (points.count() > 1) { + QLinkedList::const_iterator it = points.begin(), end = points.end(); + while (it != end) { + const QPointF &p = *it; + QDomElement pElement = document.createElement(QStringLiteral("point")); + lineElement.appendChild(pElement); + pElement.setAttribute(QStringLiteral("x"), QString::number(p.x())); + pElement.setAttribute(QStringLiteral("y"), QString::number(p.y())); + ++it; + } + } +} + +Annotation::SubType LineAnnotation::subType() const +{ + return ALine; +} + +LineAnnotation::LineType LineAnnotation::lineType() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineType; + } + + return (d->pdfAnnot->getType() == Annot::typeLine) ? LineAnnotation::StraightLine : LineAnnotation::Polyline; +} + +void LineAnnotation::setLineType(LineAnnotation::LineType type) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineType = type; + return; + } + + // Type cannot be changed if annotation is already tied + qWarning() << "You can't change the type of a LineAnnotation that is already in a page"; +} + +QLinkedList LineAnnotation::linePoints() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->linePoints; + } + + double MTX[6]; + d->fillTransformationMTX(MTX); + + QLinkedList res; + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + QPointF p; + XPDFReader::transform(MTX, lineann->getX1(), lineann->getY1(), p); + res.append(p); + XPDFReader::transform(MTX, lineann->getX2(), lineann->getY2(), p); + res.append(p); + } else { + const AnnotPolygon *polyann = static_cast(d->pdfAnnot); + const AnnotPath *vertices = polyann->getVertices(); + + for (int i = 0; i < vertices->getCoordsLength(); ++i) { + QPointF p; + XPDFReader::transform(MTX, vertices->getX(i), vertices->getY(i), p); + res.append(p); + } + } + + return res; +} + +void LineAnnotation::setLinePoints(const QLinkedList &points) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->linePoints = points; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + if (points.size() != 2) { + error(errSyntaxError, -1, "Expected two points for a straight line"); + return; + } + double x1, y1, x2, y2; + double MTX[6]; + d->fillTransformationMTX(MTX); + XPDFReader::invTransform(MTX, points.first(), x1, y1); + XPDFReader::invTransform(MTX, points.last(), x2, y2); + lineann->setVertices(x1, y1, x2, y2); + } else { + AnnotPolygon *polyann = static_cast(d->pdfAnnot); + AnnotPath *p = d->toAnnotPath(points); + polyann->setVertices(p); + delete p; + } +} + +LineAnnotation::TermStyle LineAnnotation::lineStartStyle() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineStartStyle; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + return (LineAnnotation::TermStyle)lineann->getStartStyle(); + } else { + const AnnotPolygon *polyann = static_cast(d->pdfAnnot); + return (LineAnnotation::TermStyle)polyann->getStartStyle(); + } +} + +void LineAnnotation::setLineStartStyle(LineAnnotation::TermStyle style) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineStartStyle = style; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setStartEndStyle((AnnotLineEndingStyle)style, lineann->getEndStyle()); + } else { + AnnotPolygon *polyann = static_cast(d->pdfAnnot); + polyann->setStartEndStyle((AnnotLineEndingStyle)style, polyann->getEndStyle()); + } +} + +LineAnnotation::TermStyle LineAnnotation::lineEndStyle() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineEndStyle; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + return (LineAnnotation::TermStyle)lineann->getEndStyle(); + } else { + const AnnotPolygon *polyann = static_cast(d->pdfAnnot); + return (LineAnnotation::TermStyle)polyann->getEndStyle(); + } +} + +void LineAnnotation::setLineEndStyle(LineAnnotation::TermStyle style) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineEndStyle = style; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setStartEndStyle(lineann->getStartStyle(), (AnnotLineEndingStyle)style); + } else { + AnnotPolygon *polyann = static_cast(d->pdfAnnot); + polyann->setStartEndStyle(polyann->getStartStyle(), (AnnotLineEndingStyle)style); + } +} + +bool LineAnnotation::isLineClosed() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineClosed; + } + + return d->pdfAnnot->getType() == Annot::typePolygon; +} + +void LineAnnotation::setLineClosed(bool closed) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineClosed = closed; + return; + } + + if (d->pdfAnnot->getType() != Annot::typeLine) { + AnnotPolygon *polyann = static_cast(d->pdfAnnot); + + // Set new subtype and switch intent if necessary + if (closed) { + polyann->setType(Annot::typePolygon); + if (polyann->getIntent() == AnnotPolygon::polylineDimension) { + polyann->setIntent(AnnotPolygon::polygonDimension); + } + } else { + polyann->setType(Annot::typePolyLine); + if (polyann->getIntent() == AnnotPolygon::polygonDimension) { + polyann->setIntent(AnnotPolygon::polylineDimension); + } + } + } +} + +QColor LineAnnotation::lineInnerColor() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineInnerColor; + } + + AnnotColor *c; + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + c = lineann->getInteriorColor(); + } else { + const AnnotPolygon *polyann = static_cast(d->pdfAnnot); + c = polyann->getInteriorColor(); + } + + return convertAnnotColor(c); +} + +void LineAnnotation::setLineInnerColor(const QColor &color) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineInnerColor = color; + return; + } + + auto c = convertQColor(color); + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setInteriorColor(std::move(c)); + } else { + AnnotPolygon *polyann = static_cast(d->pdfAnnot); + polyann->setInteriorColor(std::move(c)); + } +} + +double LineAnnotation::lineLeadingForwardPoint() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineLeadingFwdPt; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + return lineann->getLeaderLineLength(); + } + + return 0; +} + +void LineAnnotation::setLineLeadingForwardPoint(double point) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineLeadingFwdPt = point; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setLeaderLineLength(point); + } +} + +double LineAnnotation::lineLeadingBackPoint() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineLeadingBackPt; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + return lineann->getLeaderLineExtension(); + } + + return 0; +} + +void LineAnnotation::setLineLeadingBackPoint(double point) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineLeadingBackPt = point; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setLeaderLineExtension(point); + } +} + +bool LineAnnotation::lineShowCaption() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineShowCaption; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + return lineann->getCaption(); + } + + return false; +} + +void LineAnnotation::setLineShowCaption(bool show) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineShowCaption = show; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setCaption(show); + } +} + +LineAnnotation::LineIntent LineAnnotation::lineIntent() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineIntent; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + return (LineAnnotation::LineIntent)(lineann->getIntent() + 1); + } else { + const AnnotPolygon *polyann = static_cast(d->pdfAnnot); + if (polyann->getIntent() == AnnotPolygon::polygonCloud) { + return LineAnnotation::PolygonCloud; + } else { // AnnotPolygon::polylineDimension, AnnotPolygon::polygonDimension + return LineAnnotation::Dimension; + } + } +} + +void LineAnnotation::setLineIntent(LineAnnotation::LineIntent intent) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineIntent = intent; + return; + } + + if (intent == LineAnnotation::Unknown) { + return; // Do not set (actually, it should clear the property) + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setIntent((AnnotLine::AnnotLineIntent)(intent - 1)); + } else { + AnnotPolygon *polyann = static_cast(d->pdfAnnot); + if (intent == LineAnnotation::PolygonCloud) { + polyann->setIntent(AnnotPolygon::polygonCloud); + } else // LineAnnotation::Dimension + { + if (d->pdfAnnot->getType() == Annot::typePolygon) { + polyann->setIntent(AnnotPolygon::polygonDimension); + } else { // Annot::typePolyLine + polyann->setIntent(AnnotPolygon::polylineDimension); + } + } + } +} + +/** GeomAnnotation [Annotation] */ +class GeomAnnotationPrivate : public AnnotationPrivate +{ +public: + GeomAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields (note uses border for rendering style) + GeomAnnotation::GeomType geomType; + QColor geomInnerColor; +}; + +GeomAnnotationPrivate::GeomAnnotationPrivate() : AnnotationPrivate(), geomType(GeomAnnotation::InscribedSquare) { } + +Annotation *GeomAnnotationPrivate::makeAlias() +{ + return new GeomAnnotation(*this); +} + +Annot *GeomAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + // Setters are defined in the public class + GeomAnnotation *q = static_cast(makeAlias()); + + // Set page and document + pdfPage = destPage; + parentDoc = doc; + + Annot::AnnotSubtype type; + if (geomType == GeomAnnotation::InscribedSquare) { + type = Annot::typeSquare; + } else { // GeomAnnotation::InscribedCircle + type = Annot::typeCircle; + } + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + pdfAnnot = new AnnotGeometry(destPage->getDoc(), &rect, type); + + // Set properties + flushBaseAnnotationProperties(); + q->setGeomInnerColor(geomInnerColor); + + delete q; + return pdfAnnot; +} + +GeomAnnotation::GeomAnnotation() : Annotation(*new GeomAnnotationPrivate()) { } + +GeomAnnotation::GeomAnnotation(GeomAnnotationPrivate &dd) : Annotation(dd) { } + +GeomAnnotation::GeomAnnotation(const QDomNode &node) : Annotation(*new GeomAnnotationPrivate(), node) +{ + // loop through the whole children looking for a 'geom' element + QDomNode subNode = node.firstChild(); + while (subNode.isElement()) { + QDomElement e = subNode.toElement(); + subNode = subNode.nextSibling(); + if (e.tagName() != QLatin1String("geom")) { + continue; + } + + // parse the attributes + if (e.hasAttribute(QStringLiteral("type"))) { + setGeomType((GeomAnnotation::GeomType)e.attribute(QStringLiteral("type")).toInt()); + } + if (e.hasAttribute(QStringLiteral("color"))) { + setGeomInnerColor(QColor(e.attribute(QStringLiteral("color")))); + } + + // loading complete + break; + } +} + +GeomAnnotation::~GeomAnnotation() { } + +void GeomAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [geom] element + QDomElement geomElement = document.createElement(QStringLiteral("geom")); + node.appendChild(geomElement); + + // append the optional attributes + if (geomType() != InscribedSquare) { + geomElement.setAttribute(QStringLiteral("type"), (int)geomType()); + } + if (geomInnerColor().isValid()) { + geomElement.setAttribute(QStringLiteral("color"), geomInnerColor().name()); + } +} + +Annotation::SubType GeomAnnotation::subType() const +{ + return AGeom; +} + +GeomAnnotation::GeomType GeomAnnotation::geomType() const +{ + Q_D(const GeomAnnotation); + + if (!d->pdfAnnot) { + return d->geomType; + } + + if (d->pdfAnnot->getType() == Annot::typeSquare) { + return GeomAnnotation::InscribedSquare; + } else { // Annot::typeCircle + return GeomAnnotation::InscribedCircle; + } +} + +void GeomAnnotation::setGeomType(GeomAnnotation::GeomType type) +{ + Q_D(GeomAnnotation); + + if (!d->pdfAnnot) { + d->geomType = type; + return; + } + + AnnotGeometry *geomann = static_cast(d->pdfAnnot); + if (type == GeomAnnotation::InscribedSquare) { + geomann->setType(Annot::typeSquare); + } else { // GeomAnnotation::InscribedCircle + geomann->setType(Annot::typeCircle); + } +} + +QColor GeomAnnotation::geomInnerColor() const +{ + Q_D(const GeomAnnotation); + + if (!d->pdfAnnot) { + return d->geomInnerColor; + } + + const AnnotGeometry *geomann = static_cast(d->pdfAnnot); + return convertAnnotColor(geomann->getInteriorColor()); +} + +void GeomAnnotation::setGeomInnerColor(const QColor &color) +{ + Q_D(GeomAnnotation); + + if (!d->pdfAnnot) { + d->geomInnerColor = color; + return; + } + + AnnotGeometry *geomann = static_cast(d->pdfAnnot); + geomann->setInteriorColor(convertQColor(color)); +} + +/** HighlightAnnotation [Annotation] */ +class HighlightAnnotationPrivate : public AnnotationPrivate +{ +public: + HighlightAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + HighlightAnnotation::HighlightType highlightType; + QList highlightQuads; // not empty + + // helpers + static Annot::AnnotSubtype toAnnotSubType(HighlightAnnotation::HighlightType type); + QList fromQuadrilaterals(AnnotQuadrilaterals *quads) const; + AnnotQuadrilaterals *toQuadrilaterals(const QList &quads) const; +}; + +HighlightAnnotationPrivate::HighlightAnnotationPrivate() : AnnotationPrivate(), highlightType(HighlightAnnotation::Highlight) { } + +Annotation *HighlightAnnotationPrivate::makeAlias() +{ + return new HighlightAnnotation(*this); +} + +Annot::AnnotSubtype HighlightAnnotationPrivate::toAnnotSubType(HighlightAnnotation::HighlightType type) +{ + switch (type) { + default: // HighlightAnnotation::Highlight: + return Annot::typeHighlight; + case HighlightAnnotation::Underline: + return Annot::typeUnderline; + case HighlightAnnotation::Squiggly: + return Annot::typeSquiggly; + case HighlightAnnotation::StrikeOut: + return Annot::typeStrikeOut; + } +} + +QList HighlightAnnotationPrivate::fromQuadrilaterals(AnnotQuadrilaterals *hlquads) const +{ + QList quads; + + if (!hlquads || !hlquads->getQuadrilateralsLength()) { + return quads; + } + const int quadsCount = hlquads->getQuadrilateralsLength(); + + double MTX[6]; + fillTransformationMTX(MTX); + + quads.reserve(quadsCount); + for (int q = 0; q < quadsCount; ++q) { + HighlightAnnotation::Quad quad; + XPDFReader::transform(MTX, hlquads->getX1(q), hlquads->getY1(q), quad.points[0]); + XPDFReader::transform(MTX, hlquads->getX2(q), hlquads->getY2(q), quad.points[1]); + XPDFReader::transform(MTX, hlquads->getX3(q), hlquads->getY3(q), quad.points[2]); + XPDFReader::transform(MTX, hlquads->getX4(q), hlquads->getY4(q), quad.points[3]); + // ### PDF1.6 specs says that point are in ccw order, but in fact + // points 3 and 4 are swapped in every PDF around! + QPointF tmpPoint = quad.points[2]; + quad.points[2] = quad.points[3]; + quad.points[3] = tmpPoint; + // initialize other properties and append quad + quad.capStart = true; // unlinked quads are always capped + quad.capEnd = true; // unlinked quads are always capped + quad.feather = 0.1; // default feather + quads.append(quad); + } + + return quads; +} + +AnnotQuadrilaterals *HighlightAnnotationPrivate::toQuadrilaterals(const QList &quads) const +{ + const int count = quads.size(); + auto ac = std::make_unique(count); + + double MTX[6]; + fillTransformationMTX(MTX); + + int pos = 0; + foreach (const HighlightAnnotation::Quad &q, quads) { + double x1, y1, x2, y2, x3, y3, x4, y4; + XPDFReader::invTransform(MTX, q.points[0], x1, y1); + XPDFReader::invTransform(MTX, q.points[1], x2, y2); + // Swap points 3 and 4 (see HighlightAnnotationPrivate::fromQuadrilaterals) + XPDFReader::invTransform(MTX, q.points[3], x3, y3); + XPDFReader::invTransform(MTX, q.points[2], x4, y4); + ac[pos++] = AnnotQuadrilaterals::AnnotQuadrilateral(x1, y1, x2, y2, x3, y3, x4, y4); + } + + return new AnnotQuadrilaterals(std::move(ac), count); +} + +Annot *HighlightAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + // Setters are defined in the public class + HighlightAnnotation *q = static_cast(makeAlias()); + + // Set page and document + pdfPage = destPage; + parentDoc = doc; + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + pdfAnnot = new AnnotTextMarkup(destPage->getDoc(), &rect, toAnnotSubType(highlightType)); + + // Set properties + flushBaseAnnotationProperties(); + q->setHighlightQuads(highlightQuads); + + highlightQuads.clear(); // Free up memory + + delete q; + + return pdfAnnot; +} + +HighlightAnnotation::HighlightAnnotation() : Annotation(*new HighlightAnnotationPrivate()) { } + +HighlightAnnotation::HighlightAnnotation(HighlightAnnotationPrivate &dd) : Annotation(dd) { } + +HighlightAnnotation::HighlightAnnotation(const QDomNode &node) : Annotation(*new HighlightAnnotationPrivate(), node) +{ + // loop through the whole children looking for a 'hl' element + QDomNode subNode = node.firstChild(); + while (subNode.isElement()) { + QDomElement e = subNode.toElement(); + subNode = subNode.nextSibling(); + if (e.tagName() != QLatin1String("hl")) { + continue; + } + + // parse the attributes + if (e.hasAttribute(QStringLiteral("type"))) { + setHighlightType((HighlightAnnotation::HighlightType)e.attribute(QStringLiteral("type")).toInt()); + } + + // parse all 'quad' subnodes + QList quads; + QDomNode quadNode = e.firstChild(); + for (; quadNode.isElement(); quadNode = quadNode.nextSibling()) { + QDomElement qe = quadNode.toElement(); + if (qe.tagName() != QLatin1String("quad")) { + continue; + } + + Quad q; + q.points[0].setX(qe.attribute(QStringLiteral("ax"), QStringLiteral("0.0")).toDouble()); + q.points[0].setY(qe.attribute(QStringLiteral("ay"), QStringLiteral("0.0")).toDouble()); + q.points[1].setX(qe.attribute(QStringLiteral("bx"), QStringLiteral("0.0")).toDouble()); + q.points[1].setY(qe.attribute(QStringLiteral("by"), QStringLiteral("0.0")).toDouble()); + q.points[2].setX(qe.attribute(QStringLiteral("cx"), QStringLiteral("0.0")).toDouble()); + q.points[2].setY(qe.attribute(QStringLiteral("cy"), QStringLiteral("0.0")).toDouble()); + q.points[3].setX(qe.attribute(QStringLiteral("dx"), QStringLiteral("0.0")).toDouble()); + q.points[3].setY(qe.attribute(QStringLiteral("dy"), QStringLiteral("0.0")).toDouble()); + q.capStart = qe.hasAttribute(QStringLiteral("start")); + q.capEnd = qe.hasAttribute(QStringLiteral("end")); + q.feather = qe.attribute(QStringLiteral("feather"), QStringLiteral("0.1")).toDouble(); + quads.append(q); + } + setHighlightQuads(quads); + + // loading complete + break; + } +} + +HighlightAnnotation::~HighlightAnnotation() { } + +void HighlightAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [hl] element + QDomElement hlElement = document.createElement(QStringLiteral("hl")); + node.appendChild(hlElement); + + // append the optional attributes + if (highlightType() != Highlight) { + hlElement.setAttribute(QStringLiteral("type"), (int)highlightType()); + } + + const QList quads = highlightQuads(); + if (quads.count() < 1) { + return; + } + // append highlight quads, all children describe quads + QList::const_iterator it = quads.begin(), end = quads.end(); + for (; it != end; ++it) { + QDomElement quadElement = document.createElement(QStringLiteral("quad")); + hlElement.appendChild(quadElement); + const Quad &q = *it; + quadElement.setAttribute(QStringLiteral("ax"), QString::number(q.points[0].x())); + quadElement.setAttribute(QStringLiteral("ay"), QString::number(q.points[0].y())); + quadElement.setAttribute(QStringLiteral("bx"), QString::number(q.points[1].x())); + quadElement.setAttribute(QStringLiteral("by"), QString::number(q.points[1].y())); + quadElement.setAttribute(QStringLiteral("cx"), QString::number(q.points[2].x())); + quadElement.setAttribute(QStringLiteral("cy"), QString::number(q.points[2].y())); + quadElement.setAttribute(QStringLiteral("dx"), QString::number(q.points[3].x())); + quadElement.setAttribute(QStringLiteral("dy"), QString::number(q.points[3].y())); + if (q.capStart) { + quadElement.setAttribute(QStringLiteral("start"), 1); + } + if (q.capEnd) { + quadElement.setAttribute(QStringLiteral("end"), 1); + } + quadElement.setAttribute(QStringLiteral("feather"), QString::number(q.feather)); + } +} + +Annotation::SubType HighlightAnnotation::subType() const +{ + return AHighlight; +} + +HighlightAnnotation::HighlightType HighlightAnnotation::highlightType() const +{ + Q_D(const HighlightAnnotation); + + if (!d->pdfAnnot) { + return d->highlightType; + } + + Annot::AnnotSubtype subType = d->pdfAnnot->getType(); + + if (subType == Annot::typeHighlight) { + return HighlightAnnotation::Highlight; + } else if (subType == Annot::typeUnderline) { + return HighlightAnnotation::Underline; + } else if (subType == Annot::typeSquiggly) { + return HighlightAnnotation::Squiggly; + } else { // Annot::typeStrikeOut + return HighlightAnnotation::StrikeOut; + } +} + +void HighlightAnnotation::setHighlightType(HighlightAnnotation::HighlightType type) +{ + Q_D(HighlightAnnotation); + + if (!d->pdfAnnot) { + d->highlightType = type; + return; + } + + AnnotTextMarkup *hlann = static_cast(d->pdfAnnot); + hlann->setType(HighlightAnnotationPrivate::toAnnotSubType(type)); +} + +QList HighlightAnnotation::highlightQuads() const +{ + Q_D(const HighlightAnnotation); + + if (!d->pdfAnnot) { + return d->highlightQuads; + } + + const AnnotTextMarkup *hlann = static_cast(d->pdfAnnot); + return d->fromQuadrilaterals(hlann->getQuadrilaterals()); +} + +void HighlightAnnotation::setHighlightQuads(const QList &quads) +{ + Q_D(HighlightAnnotation); + + if (!d->pdfAnnot) { + d->highlightQuads = quads; + return; + } + + AnnotTextMarkup *hlann = static_cast(d->pdfAnnot); + AnnotQuadrilaterals *quadrilaterals = d->toQuadrilaterals(quads); + hlann->setQuadrilaterals(quadrilaterals); + delete quadrilaterals; +} + +/** StampAnnotation [Annotation] */ +class StampAnnotationPrivate : public AnnotationPrivate +{ +public: + StampAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + AnnotStampImageHelper *convertQImageToAnnotStampImageHelper(const QImage &qimg); + + // data fields + QString stampIconName; + QImage stampCustomImage; +}; + +StampAnnotationPrivate::StampAnnotationPrivate() : AnnotationPrivate(), stampIconName(QStringLiteral("Draft")) { } + +Annotation *StampAnnotationPrivate::makeAlias() +{ + return new StampAnnotation(*this); +} + +Annot *StampAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + StampAnnotation *q = static_cast(makeAlias()); + + // Set page and document + pdfPage = destPage; + parentDoc = doc; + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + pdfAnnot = new AnnotStamp(destPage->getDoc(), &rect); + + // Set properties + flushBaseAnnotationProperties(); + q->setStampIconName(stampIconName); + q->setStampCustomImage(stampCustomImage); + + delete q; + + stampIconName.clear(); // Free up memory + + return pdfAnnot; +} + +AnnotStampImageHelper *StampAnnotationPrivate::convertQImageToAnnotStampImageHelper(const QImage &qimg) +{ + QImage convertedQImage = qimg; + + QByteArray data; + QByteArray sMaskData; + const int width = convertedQImage.width(); + const int height = convertedQImage.height(); + int bitsPerComponent = 1; + ColorSpace colorSpace = ColorSpace::DeviceGray; + + switch (convertedQImage.format()) { + case QImage::Format_MonoLSB: + if (!convertedQImage.allGray()) { + convertedQImage = convertedQImage.convertToFormat(QImage::Format_RGB888); + + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + } else { + convertedQImage = convertedQImage.convertToFormat(QImage::Format_Mono); + } + break; + case QImage::Format_Mono: + if (!convertedQImage.allGray()) { + convertedQImage = convertedQImage.convertToFormat(QImage::Format_RGB888); + + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + } + break; + case QImage::Format_RGB32: + case QImage::Format_ARGB32_Premultiplied: + case QImage::Format_ARGB8565_Premultiplied: + case QImage::Format_ARGB6666_Premultiplied: + case QImage::Format_ARGB8555_Premultiplied: + case QImage::Format_ARGB4444_Premultiplied: + case QImage::Format_Alpha8: + convertedQImage = convertedQImage.convertToFormat(QImage::Format_ARGB32); + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + break; + case QImage::Format_RGBA8888: + case QImage::Format_RGBA8888_Premultiplied: + case QImage::Format_RGBX8888: + case QImage::Format_ARGB32: + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + break; + case QImage::Format_Grayscale8: + bitsPerComponent = 8; + break; +#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0) + case QImage::Format_Grayscale16: + convertedQImage = convertedQImage.convertToFormat(QImage::Format_Grayscale8); + + colorSpace = ColorSpace::DeviceGray; + bitsPerComponent = 8; + break; +#endif + case QImage::Format_RGB16: + case QImage::Format_RGB666: + case QImage::Format_RGB555: + case QImage::Format_RGB444: + convertedQImage = convertedQImage.convertToFormat(QImage::Format_RGB888); + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + break; + case QImage::Format_RGB888: + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + break; + default: + convertedQImage = convertedQImage.convertToFormat(QImage::Format_ARGB32); + + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + break; + } + + getRawDataFromQImage(convertedQImage, convertedQImage.depth(), &data, &sMaskData); + + AnnotStampImageHelper *annotImg; + + if (sMaskData.count() > 0) { + AnnotStampImageHelper sMask(parentDoc->doc, width, height, ColorSpace::DeviceGray, 8, sMaskData.data(), sMaskData.count()); + annotImg = new AnnotStampImageHelper(parentDoc->doc, width, height, colorSpace, bitsPerComponent, data.data(), data.count(), sMask.getRef()); + } else { + annotImg = new AnnotStampImageHelper(parentDoc->doc, width, height, colorSpace, bitsPerComponent, data.data(), data.count()); + } + + return annotImg; +} + +StampAnnotation::StampAnnotation() : Annotation(*new StampAnnotationPrivate()) { } + +StampAnnotation::StampAnnotation(StampAnnotationPrivate &dd) : Annotation(dd) { } + +StampAnnotation::StampAnnotation(const QDomNode &node) : Annotation(*new StampAnnotationPrivate(), node) +{ + // loop through the whole children looking for a 'stamp' element + QDomNode subNode = node.firstChild(); + while (subNode.isElement()) { + QDomElement e = subNode.toElement(); + subNode = subNode.nextSibling(); + if (e.tagName() != QLatin1String("stamp")) { + continue; + } + + // parse the attributes + if (e.hasAttribute(QStringLiteral("icon"))) { + setStampIconName(e.attribute(QStringLiteral("icon"))); + } + + // loading complete + break; + } +} + +StampAnnotation::~StampAnnotation() { } + +void StampAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [stamp] element + QDomElement stampElement = document.createElement(QStringLiteral("stamp")); + node.appendChild(stampElement); + + // append the optional attributes + if (stampIconName() != QLatin1String("Draft")) { + stampElement.setAttribute(QStringLiteral("icon"), stampIconName()); + } +} + +Annotation::SubType StampAnnotation::subType() const +{ + return AStamp; +} + +QString StampAnnotation::stampIconName() const +{ + Q_D(const StampAnnotation); + + if (!d->pdfAnnot) { + return d->stampIconName; + } + + const AnnotStamp *stampann = static_cast(d->pdfAnnot); + return QString::fromLatin1(stampann->getIcon()->c_str()); +} + +void StampAnnotation::setStampIconName(const QString &name) +{ + Q_D(StampAnnotation); + + if (!d->pdfAnnot) { + d->stampIconName = name; + return; + } + + AnnotStamp *stampann = static_cast(d->pdfAnnot); + QByteArray encoded = name.toLatin1(); + GooString s(encoded.constData()); + stampann->setIcon(&s); +} + +void StampAnnotation::setStampCustomImage(const QImage &image) +{ + if (image.isNull()) { + return; + } + + Q_D(StampAnnotation); + + if (!d->pdfAnnot) { + d->stampCustomImage = QImage(image); + return; + } + + AnnotStamp *stampann = static_cast(d->pdfAnnot); + AnnotStampImageHelper *annotCustomImage = d->convertQImageToAnnotStampImageHelper(image); + stampann->setCustomImage(annotCustomImage); +} + +/** InkAnnotation [Annotation] */ +class InkAnnotationPrivate : public AnnotationPrivate +{ +public: + InkAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + QList> inkPaths; + + // helper + AnnotPath **toAnnotPaths(const QList> &paths); +}; + +InkAnnotationPrivate::InkAnnotationPrivate() : AnnotationPrivate() { } + +Annotation *InkAnnotationPrivate::makeAlias() +{ + return new InkAnnotation(*this); +} + +// Note: Caller is required to delete array elements and the array itself after use +AnnotPath **InkAnnotationPrivate::toAnnotPaths(const QList> &paths) +{ + const int pathsNumber = paths.size(); + AnnotPath **res = new AnnotPath *[pathsNumber]; + for (int i = 0; i < pathsNumber; ++i) { + res[i] = toAnnotPath(paths[i]); + } + return res; +} + +Annot *InkAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + // Setters are defined in the public class + InkAnnotation *q = static_cast(makeAlias()); + + // Set page and document + pdfPage = destPage; + parentDoc = doc; + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + pdfAnnot = new AnnotInk(destPage->getDoc(), &rect); + + // Set properties + flushBaseAnnotationProperties(); + q->setInkPaths(inkPaths); + + inkPaths.clear(); // Free up memory + + delete q; + + return pdfAnnot; +} + +InkAnnotation::InkAnnotation() : Annotation(*new InkAnnotationPrivate()) { } + +InkAnnotation::InkAnnotation(InkAnnotationPrivate &dd) : Annotation(dd) { } + +InkAnnotation::InkAnnotation(const QDomNode &node) : Annotation(*new InkAnnotationPrivate(), node) +{ + // loop through the whole children looking for a 'ink' element + QDomNode subNode = node.firstChild(); + while (subNode.isElement()) { + QDomElement e = subNode.toElement(); + subNode = subNode.nextSibling(); + if (e.tagName() != QLatin1String("ink")) { + continue; + } + + // parse the 'path' subnodes + QList> paths; + QDomNode pathNode = e.firstChild(); + while (pathNode.isElement()) { + QDomElement pathElement = pathNode.toElement(); + pathNode = pathNode.nextSibling(); + + if (pathElement.tagName() != QLatin1String("path")) { + continue; + } + + // build each path parsing 'point' subnodes + QLinkedList path; + QDomNode pointNode = pathElement.firstChild(); + while (pointNode.isElement()) { + QDomElement pointElement = pointNode.toElement(); + pointNode = pointNode.nextSibling(); + + if (pointElement.tagName() != QLatin1String("point")) { + continue; + } + + QPointF p(pointElement.attribute(QStringLiteral("x"), QStringLiteral("0.0")).toDouble(), pointElement.attribute(QStringLiteral("y"), QStringLiteral("0.0")).toDouble()); + path.append(p); + } + + // add the path to the path list if it contains at least 2 nodes + if (path.count() >= 2) { + paths.append(path); + } + } + setInkPaths(paths); + + // loading complete + break; + } +} + +InkAnnotation::~InkAnnotation() { } + +void InkAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [ink] element + QDomElement inkElement = document.createElement(QStringLiteral("ink")); + node.appendChild(inkElement); + + // append the optional attributes + const QList> paths = inkPaths(); + if (paths.count() < 1) { + return; + } + QList>::const_iterator pIt = paths.begin(), pEnd = paths.end(); + for (; pIt != pEnd; ++pIt) { + QDomElement pathElement = document.createElement(QStringLiteral("path")); + inkElement.appendChild(pathElement); + const QLinkedList &path = *pIt; + QLinkedList::const_iterator iIt = path.begin(), iEnd = path.end(); + for (; iIt != iEnd; ++iIt) { + const QPointF &point = *iIt; + QDomElement pointElement = document.createElement(QStringLiteral("point")); + pathElement.appendChild(pointElement); + pointElement.setAttribute(QStringLiteral("x"), QString::number(point.x())); + pointElement.setAttribute(QStringLiteral("y"), QString::number(point.y())); + } + } +} + +Annotation::SubType InkAnnotation::subType() const +{ + return AInk; +} + +QList> InkAnnotation::inkPaths() const +{ + Q_D(const InkAnnotation); + + if (!d->pdfAnnot) { + return d->inkPaths; + } + + const AnnotInk *inkann = static_cast(d->pdfAnnot); + + const AnnotPath *const *paths = inkann->getInkList(); + if (!paths || !inkann->getInkListLength()) { + return QList>(); + } + + double MTX[6]; + d->fillTransformationMTX(MTX); + + const int pathsNumber = inkann->getInkListLength(); + QList> inkPaths; + inkPaths.reserve(pathsNumber); + for (int m = 0; m < pathsNumber; ++m) { + // transform each path in a list of normalized points .. + QLinkedList localList; + const AnnotPath *path = paths[m]; + const int pointsNumber = path ? path->getCoordsLength() : 0; + for (int n = 0; n < pointsNumber; ++n) { + QPointF point; + XPDFReader::transform(MTX, path->getX(n), path->getY(n), point); + localList.append(point); + } + // ..and add it to the annotation + inkPaths.append(localList); + } + return inkPaths; +} + +void InkAnnotation::setInkPaths(const QList> &paths) +{ + Q_D(InkAnnotation); + + if (!d->pdfAnnot) { + d->inkPaths = paths; + return; + } + + AnnotInk *inkann = static_cast(d->pdfAnnot); + AnnotPath **annotpaths = d->toAnnotPaths(paths); + const int pathsNumber = paths.size(); + inkann->setInkList(annotpaths, pathsNumber); + + for (int i = 0; i < pathsNumber; ++i) { + delete annotpaths[i]; + } + delete[] annotpaths; +} + +/** LinkAnnotation [Annotation] */ +class LinkAnnotationPrivate : public AnnotationPrivate +{ +public: + LinkAnnotationPrivate(); + ~LinkAnnotationPrivate() override; + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + Link *linkDestination; + LinkAnnotation::HighlightMode linkHLMode; + QPointF linkRegion[4]; +}; + +LinkAnnotationPrivate::LinkAnnotationPrivate() : AnnotationPrivate(), linkDestination(nullptr), linkHLMode(LinkAnnotation::Invert) { } + +LinkAnnotationPrivate::~LinkAnnotationPrivate() +{ + delete linkDestination; +} + +Annotation *LinkAnnotationPrivate::makeAlias() +{ + return new LinkAnnotation(*this); +} + +Annot *LinkAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + return nullptr; // Not implemented +} + +LinkAnnotation::LinkAnnotation() : Annotation(*new LinkAnnotationPrivate()) { } + +LinkAnnotation::LinkAnnotation(LinkAnnotationPrivate &dd) : Annotation(dd) { } + +LinkAnnotation::LinkAnnotation(const QDomNode &node) : Annotation(*new LinkAnnotationPrivate(), node) +{ + // loop through the whole children looking for a 'link' element + QDomNode subNode = node.firstChild(); + while (subNode.isElement()) { + QDomElement e = subNode.toElement(); + subNode = subNode.nextSibling(); + if (e.tagName() != QLatin1String("link")) { + continue; + } + + // parse the attributes + if (e.hasAttribute(QStringLiteral("hlmode"))) { + setLinkHighlightMode((LinkAnnotation::HighlightMode)e.attribute(QStringLiteral("hlmode")).toInt()); + } + + // parse all 'quad' subnodes + QDomNode quadNode = e.firstChild(); + for (; quadNode.isElement(); quadNode = quadNode.nextSibling()) { + QDomElement qe = quadNode.toElement(); + if (qe.tagName() == QLatin1String("quad")) { + setLinkRegionPoint(0, QPointF(qe.attribute(QStringLiteral("ax"), QStringLiteral("0.0")).toDouble(), qe.attribute(QStringLiteral("ay"), QStringLiteral("0.0")).toDouble())); + setLinkRegionPoint(1, QPointF(qe.attribute(QStringLiteral("bx"), QStringLiteral("0.0")).toDouble(), qe.attribute(QStringLiteral("by"), QStringLiteral("0.0")).toDouble())); + setLinkRegionPoint(2, QPointF(qe.attribute(QStringLiteral("cx"), QStringLiteral("0.0")).toDouble(), qe.attribute(QStringLiteral("cy"), QStringLiteral("0.0")).toDouble())); + setLinkRegionPoint(3, QPointF(qe.attribute(QStringLiteral("dx"), QStringLiteral("0.0")).toDouble(), qe.attribute(QStringLiteral("dy"), QStringLiteral("0.0")).toDouble())); + } else if (qe.tagName() == QLatin1String("link")) { + QString type = qe.attribute(QStringLiteral("type")); + if (type == QLatin1String("GoTo")) { + Poppler::LinkGoto *go = new Poppler::LinkGoto(QRect(), qe.attribute(QStringLiteral("filename")), LinkDestination(qe.attribute(QStringLiteral("destination")))); + setLinkDestination(go); + } else if (type == QLatin1String("Exec")) { + Poppler::LinkExecute *exec = new Poppler::LinkExecute(QRect(), qe.attribute(QStringLiteral("filename")), qe.attribute(QStringLiteral("parameters"))); + setLinkDestination(exec); + } else if (type == QLatin1String("Browse")) { + Poppler::LinkBrowse *browse = new Poppler::LinkBrowse(QRect(), qe.attribute(QStringLiteral("url"))); + setLinkDestination(browse); + } else if (type == QLatin1String("Action")) { + Poppler::LinkAction::ActionType act; + QString actString = qe.attribute(QStringLiteral("action")); + bool found = true; + if (actString == QLatin1String("PageFirst")) { + act = Poppler::LinkAction::PageFirst; + } else if (actString == QLatin1String("PagePrev")) { + act = Poppler::LinkAction::PagePrev; + } else if (actString == QLatin1String("PageNext")) { + act = Poppler::LinkAction::PageNext; + } else if (actString == QLatin1String("PageLast")) { + act = Poppler::LinkAction::PageLast; + } else if (actString == QLatin1String("HistoryBack")) { + act = Poppler::LinkAction::HistoryBack; + } else if (actString == QLatin1String("HistoryForward")) { + act = Poppler::LinkAction::HistoryForward; + } else if (actString == QLatin1String("Quit")) { + act = Poppler::LinkAction::Quit; + } else if (actString == QLatin1String("Presentation")) { + act = Poppler::LinkAction::Presentation; + } else if (actString == QLatin1String("EndPresentation")) { + act = Poppler::LinkAction::EndPresentation; + } else if (actString == QLatin1String("Find")) { + act = Poppler::LinkAction::Find; + } else if (actString == QLatin1String("GoToPage")) { + act = Poppler::LinkAction::GoToPage; + } else if (actString == QLatin1String("Close")) { + act = Poppler::LinkAction::Close; + } else if (actString == QLatin1String("Print")) { + act = Poppler::LinkAction::Print; + } else { + found = false; + } + if (found) { + Poppler::LinkAction *action = new Poppler::LinkAction(QRect(), act); + setLinkDestination(action); + } + } else { + qWarning("Loading annotations of type %s from DOM nodes is not yet implemented.", type.toLocal8Bit().constData()); + } + } + } + + // loading complete + break; + } +} + +LinkAnnotation::~LinkAnnotation() { } + +void LinkAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [hl] element + QDomElement linkElement = document.createElement(QStringLiteral("link")); + node.appendChild(linkElement); + + // append the optional attributes + if (linkHighlightMode() != Invert) { + linkElement.setAttribute(QStringLiteral("hlmode"), (int)linkHighlightMode()); + } + + // saving region + QDomElement quadElement = document.createElement(QStringLiteral("quad")); + linkElement.appendChild(quadElement); + quadElement.setAttribute(QStringLiteral("ax"), QString::number(linkRegionPoint(0).x())); + quadElement.setAttribute(QStringLiteral("ay"), QString::number(linkRegionPoint(0).y())); + quadElement.setAttribute(QStringLiteral("bx"), QString::number(linkRegionPoint(1).x())); + quadElement.setAttribute(QStringLiteral("by"), QString::number(linkRegionPoint(1).y())); + quadElement.setAttribute(QStringLiteral("cx"), QString::number(linkRegionPoint(2).x())); + quadElement.setAttribute(QStringLiteral("cy"), QString::number(linkRegionPoint(2).y())); + quadElement.setAttribute(QStringLiteral("dx"), QString::number(linkRegionPoint(3).x())); + quadElement.setAttribute(QStringLiteral("dy"), QString::number(linkRegionPoint(3).y())); + + // saving link + QDomElement hyperlinkElement = document.createElement(QStringLiteral("link")); + linkElement.appendChild(hyperlinkElement); + if (linkDestination()) { + switch (linkDestination()->linkType()) { + case Poppler::Link::Goto: { + Poppler::LinkGoto *go = static_cast(linkDestination()); + hyperlinkElement.setAttribute(QStringLiteral("type"), QStringLiteral("GoTo")); + hyperlinkElement.setAttribute(QStringLiteral("filename"), go->fileName()); + hyperlinkElement.setAttribute(QStringLiteral("destionation"), go->destination().toString()); // TODO remove for poppler 0.28 + hyperlinkElement.setAttribute(QStringLiteral("destination"), go->destination().toString()); + break; + } + case Poppler::Link::Execute: { + Poppler::LinkExecute *exec = static_cast(linkDestination()); + hyperlinkElement.setAttribute(QStringLiteral("type"), QStringLiteral("Exec")); + hyperlinkElement.setAttribute(QStringLiteral("filename"), exec->fileName()); + hyperlinkElement.setAttribute(QStringLiteral("parameters"), exec->parameters()); + break; + } + case Poppler::Link::Browse: { + Poppler::LinkBrowse *browse = static_cast(linkDestination()); + hyperlinkElement.setAttribute(QStringLiteral("type"), QStringLiteral("Browse")); + hyperlinkElement.setAttribute(QStringLiteral("url"), browse->url()); + break; + } + case Poppler::Link::Action: { + Poppler::LinkAction *action = static_cast(linkDestination()); + hyperlinkElement.setAttribute(QStringLiteral("type"), QStringLiteral("Action")); + switch (action->actionType()) { + case Poppler::LinkAction::PageFirst: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("PageFirst")); + break; + case Poppler::LinkAction::PagePrev: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("PagePrev")); + break; + case Poppler::LinkAction::PageNext: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("PageNext")); + break; + case Poppler::LinkAction::PageLast: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("PageLast")); + break; + case Poppler::LinkAction::HistoryBack: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("HistoryBack")); + break; + case Poppler::LinkAction::HistoryForward: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("HistoryForward")); + break; + case Poppler::LinkAction::Quit: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("Quit")); + break; + case Poppler::LinkAction::Presentation: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("Presentation")); + break; + case Poppler::LinkAction::EndPresentation: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("EndPresentation")); + break; + case Poppler::LinkAction::Find: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("Find")); + break; + case Poppler::LinkAction::GoToPage: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("GoToPage")); + break; + case Poppler::LinkAction::Close: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("Close")); + break; + case Poppler::LinkAction::Print: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("Print")); + break; + case Poppler::LinkAction::SaveAs: + hyperlinkElement.setAttribute(QStringLiteral("action"), QStringLiteral("SaveAs")); + break; + } + break; + } + case Poppler::Link::Movie: { + hyperlinkElement.setAttribute(QStringLiteral("type"), QStringLiteral("Movie")); + break; + } + case Poppler::Link::Rendition: { + hyperlinkElement.setAttribute(QStringLiteral("type"), QStringLiteral("Rendition")); + break; + } + case Poppler::Link::Sound: { + hyperlinkElement.setAttribute(QStringLiteral("type"), QStringLiteral("Sound")); + break; + } + case Poppler::Link::JavaScript: { + hyperlinkElement.setAttribute(QStringLiteral("type"), QStringLiteral("JavaScript")); + break; + } + case Poppler::Link::OCGState: { + hyperlinkElement.setAttribute(QStringLiteral("type"), QStringLiteral("OCGState")); + break; + } + case Poppler::Link::Hide: { + hyperlinkElement.setAttribute(QStringLiteral("type"), QStringLiteral("Hide")); + break; + } + case Poppler::Link::None: + break; + } + } +} + +Annotation::SubType LinkAnnotation::subType() const +{ + return ALink; +} + +Link *LinkAnnotation::linkDestination() const +{ + Q_D(const LinkAnnotation); + return d->linkDestination; +} + +void LinkAnnotation::setLinkDestination(Link *link) +{ + Q_D(LinkAnnotation); + delete d->linkDestination; + d->linkDestination = link; +} + +LinkAnnotation::HighlightMode LinkAnnotation::linkHighlightMode() const +{ + Q_D(const LinkAnnotation); + return d->linkHLMode; +} + +void LinkAnnotation::setLinkHighlightMode(LinkAnnotation::HighlightMode mode) +{ + Q_D(LinkAnnotation); + d->linkHLMode = mode; +} + +QPointF LinkAnnotation::linkRegionPoint(int id) const +{ + if (id < 0 || id >= 4) { + return QPointF(); + } + + Q_D(const LinkAnnotation); + return d->linkRegion[id]; +} + +void LinkAnnotation::setLinkRegionPoint(int id, const QPointF &point) // clazy:exclude=function-args-by-value +{ + if (id < 0 || id >= 4) { + return; + } + + Q_D(LinkAnnotation); + d->linkRegion[id] = point; +} + +/** CaretAnnotation [Annotation] */ +class CaretAnnotationPrivate : public AnnotationPrivate +{ +public: + CaretAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + CaretAnnotation::CaretSymbol symbol; +}; + +static QString caretSymbolToString(CaretAnnotation::CaretSymbol symbol) +{ + switch (symbol) { + case CaretAnnotation::None: + return QStringLiteral("None"); + case CaretAnnotation::P: + return QStringLiteral("P"); + } + return QString(); +} + +static CaretAnnotation::CaretSymbol caretSymbolFromString(const QString &symbol) +{ + if (symbol == QLatin1String("None")) { + return CaretAnnotation::None; + } else if (symbol == QLatin1String("P")) { + return CaretAnnotation::P; + } + return CaretAnnotation::None; +} + +CaretAnnotationPrivate::CaretAnnotationPrivate() : AnnotationPrivate(), symbol(CaretAnnotation::None) { } + +Annotation *CaretAnnotationPrivate::makeAlias() +{ + return new CaretAnnotation(*this); +} + +Annot *CaretAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + // Setters are defined in the public class + CaretAnnotation *q = static_cast(makeAlias()); + + // Set page and document + pdfPage = destPage; + parentDoc = doc; + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + pdfAnnot = new AnnotCaret(destPage->getDoc(), &rect); + + // Set properties + flushBaseAnnotationProperties(); + q->setCaretSymbol(symbol); + + delete q; + return pdfAnnot; +} + +CaretAnnotation::CaretAnnotation() : Annotation(*new CaretAnnotationPrivate()) { } + +CaretAnnotation::CaretAnnotation(CaretAnnotationPrivate &dd) : Annotation(dd) { } + +CaretAnnotation::CaretAnnotation(const QDomNode &node) : Annotation(*new CaretAnnotationPrivate(), node) +{ + // loop through the whole children looking for a 'caret' element + QDomNode subNode = node.firstChild(); + while (subNode.isElement()) { + QDomElement e = subNode.toElement(); + subNode = subNode.nextSibling(); + if (e.tagName() != QLatin1String("caret")) { + continue; + } + + // parse the attributes + if (e.hasAttribute(QStringLiteral("symbol"))) { + setCaretSymbol(caretSymbolFromString(e.attribute(QStringLiteral("symbol")))); + } + + // loading complete + break; + } +} + +CaretAnnotation::~CaretAnnotation() { } + +void CaretAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [caret] element + QDomElement caretElement = document.createElement(QStringLiteral("caret")); + node.appendChild(caretElement); + + // append the optional attributes + if (caretSymbol() != CaretAnnotation::None) { + caretElement.setAttribute(QStringLiteral("symbol"), caretSymbolToString(caretSymbol())); + } +} + +Annotation::SubType CaretAnnotation::subType() const +{ + return ACaret; +} + +CaretAnnotation::CaretSymbol CaretAnnotation::caretSymbol() const +{ + Q_D(const CaretAnnotation); + + if (!d->pdfAnnot) { + return d->symbol; + } + + const AnnotCaret *caretann = static_cast(d->pdfAnnot); + return (CaretAnnotation::CaretSymbol)caretann->getSymbol(); +} + +void CaretAnnotation::setCaretSymbol(CaretAnnotation::CaretSymbol symbol) +{ + Q_D(CaretAnnotation); + + if (!d->pdfAnnot) { + d->symbol = symbol; + return; + } + + AnnotCaret *caretann = static_cast(d->pdfAnnot); + caretann->setSymbol((AnnotCaret::AnnotCaretSymbol)symbol); +} + +/** FileAttachmentAnnotation [Annotation] */ +class FileAttachmentAnnotationPrivate : public AnnotationPrivate +{ +public: + FileAttachmentAnnotationPrivate(); + ~FileAttachmentAnnotationPrivate() override; + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + QString icon; + EmbeddedFile *embfile; +}; + +FileAttachmentAnnotationPrivate::FileAttachmentAnnotationPrivate() : AnnotationPrivate(), icon(QStringLiteral("PushPin")), embfile(nullptr) { } + +FileAttachmentAnnotationPrivate::~FileAttachmentAnnotationPrivate() +{ + delete embfile; +} + +Annotation *FileAttachmentAnnotationPrivate::makeAlias() +{ + return new FileAttachmentAnnotation(*this); +} + +Annot *FileAttachmentAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + return nullptr; // Not implemented +} + +FileAttachmentAnnotation::FileAttachmentAnnotation() : Annotation(*new FileAttachmentAnnotationPrivate()) { } + +FileAttachmentAnnotation::FileAttachmentAnnotation(FileAttachmentAnnotationPrivate &dd) : Annotation(dd) { } + +FileAttachmentAnnotation::FileAttachmentAnnotation(const QDomNode &node) : Annotation(*new FileAttachmentAnnotationPrivate(), node) +{ + // loop through the whole children looking for a 'fileattachment' element + QDomNode subNode = node.firstChild(); + while (subNode.isElement()) { + QDomElement e = subNode.toElement(); + subNode = subNode.nextSibling(); + if (e.tagName() != QLatin1String("fileattachment")) { + continue; + } + + // loading complete + break; + } +} + +FileAttachmentAnnotation::~FileAttachmentAnnotation() { } + +void FileAttachmentAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [fileattachment] element + QDomElement fileAttachmentElement = document.createElement(QStringLiteral("fileattachment")); + node.appendChild(fileAttachmentElement); +} + +Annotation::SubType FileAttachmentAnnotation::subType() const +{ + return AFileAttachment; +} + +QString FileAttachmentAnnotation::fileIconName() const +{ + Q_D(const FileAttachmentAnnotation); + return d->icon; +} + +void FileAttachmentAnnotation::setFileIconName(const QString &icon) +{ + Q_D(FileAttachmentAnnotation); + d->icon = icon; +} + +EmbeddedFile *FileAttachmentAnnotation::embeddedFile() const +{ + Q_D(const FileAttachmentAnnotation); + return d->embfile; +} + +void FileAttachmentAnnotation::setEmbeddedFile(EmbeddedFile *ef) +{ + Q_D(FileAttachmentAnnotation); + d->embfile = ef; +} + +/** SoundAnnotation [Annotation] */ +class SoundAnnotationPrivate : public AnnotationPrivate +{ +public: + SoundAnnotationPrivate(); + ~SoundAnnotationPrivate() override; + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + QString icon; + SoundObject *sound; +}; + +SoundAnnotationPrivate::SoundAnnotationPrivate() : AnnotationPrivate(), icon(QStringLiteral("Speaker")), sound(nullptr) { } + +SoundAnnotationPrivate::~SoundAnnotationPrivate() +{ + delete sound; +} + +Annotation *SoundAnnotationPrivate::makeAlias() +{ + return new SoundAnnotation(*this); +} + +Annot *SoundAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + return nullptr; // Not implemented +} + +SoundAnnotation::SoundAnnotation() : Annotation(*new SoundAnnotationPrivate()) { } + +SoundAnnotation::SoundAnnotation(SoundAnnotationPrivate &dd) : Annotation(dd) { } + +SoundAnnotation::SoundAnnotation(const QDomNode &node) : Annotation(*new SoundAnnotationPrivate(), node) +{ + // loop through the whole children looking for a 'sound' element + QDomNode subNode = node.firstChild(); + while (subNode.isElement()) { + QDomElement e = subNode.toElement(); + subNode = subNode.nextSibling(); + if (e.tagName() != QLatin1String("sound")) { + continue; + } + + // loading complete + break; + } +} + +SoundAnnotation::~SoundAnnotation() { } + +void SoundAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [sound] element + QDomElement soundElement = document.createElement(QStringLiteral("sound")); + node.appendChild(soundElement); +} + +Annotation::SubType SoundAnnotation::subType() const +{ + return ASound; +} + +QString SoundAnnotation::soundIconName() const +{ + Q_D(const SoundAnnotation); + return d->icon; +} + +void SoundAnnotation::setSoundIconName(const QString &icon) +{ + Q_D(SoundAnnotation); + d->icon = icon; +} + +SoundObject *SoundAnnotation::sound() const +{ + Q_D(const SoundAnnotation); + return d->sound; +} + +void SoundAnnotation::setSound(SoundObject *s) +{ + Q_D(SoundAnnotation); + d->sound = s; +} + +/** MovieAnnotation [Annotation] */ +class MovieAnnotationPrivate : public AnnotationPrivate +{ +public: + MovieAnnotationPrivate(); + ~MovieAnnotationPrivate() override; + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + MovieObject *movie; + QString title; +}; + +MovieAnnotationPrivate::MovieAnnotationPrivate() : AnnotationPrivate(), movie(nullptr) { } + +MovieAnnotationPrivate::~MovieAnnotationPrivate() +{ + delete movie; +} + +Annotation *MovieAnnotationPrivate::makeAlias() +{ + return new MovieAnnotation(*this); +} + +Annot *MovieAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + return nullptr; // Not implemented +} + +MovieAnnotation::MovieAnnotation() : Annotation(*new MovieAnnotationPrivate()) { } + +MovieAnnotation::MovieAnnotation(MovieAnnotationPrivate &dd) : Annotation(dd) { } + +MovieAnnotation::MovieAnnotation(const QDomNode &node) : Annotation(*new MovieAnnotationPrivate(), node) +{ + // loop through the whole children looking for a 'movie' element + QDomNode subNode = node.firstChild(); + while (subNode.isElement()) { + QDomElement e = subNode.toElement(); + subNode = subNode.nextSibling(); + if (e.tagName() != QLatin1String("movie")) { + continue; + } + + // loading complete + break; + } +} + +MovieAnnotation::~MovieAnnotation() { } + +void MovieAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [movie] element + QDomElement movieElement = document.createElement(QStringLiteral("movie")); + node.appendChild(movieElement); +} + +Annotation::SubType MovieAnnotation::subType() const +{ + return AMovie; +} + +MovieObject *MovieAnnotation::movie() const +{ + Q_D(const MovieAnnotation); + return d->movie; +} + +void MovieAnnotation::setMovie(MovieObject *movie) +{ + Q_D(MovieAnnotation); + d->movie = movie; +} + +QString MovieAnnotation::movieTitle() const +{ + Q_D(const MovieAnnotation); + return d->title; +} + +void MovieAnnotation::setMovieTitle(const QString &title) +{ + Q_D(MovieAnnotation); + d->title = title; +} + +/** ScreenAnnotation [Annotation] */ +class ScreenAnnotationPrivate : public AnnotationPrivate +{ +public: + ScreenAnnotationPrivate(); + ~ScreenAnnotationPrivate() override; + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + LinkRendition *action; + QString title; +}; + +ScreenAnnotationPrivate::ScreenAnnotationPrivate() : AnnotationPrivate(), action(nullptr) { } + +ScreenAnnotationPrivate::~ScreenAnnotationPrivate() +{ + delete action; +} + +ScreenAnnotation::ScreenAnnotation(ScreenAnnotationPrivate &dd) : Annotation(dd) { } + +Annotation *ScreenAnnotationPrivate::makeAlias() +{ + return new ScreenAnnotation(*this); +} + +Annot *ScreenAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + return nullptr; // Not implemented +} + +ScreenAnnotation::ScreenAnnotation() : Annotation(*new ScreenAnnotationPrivate()) { } + +ScreenAnnotation::~ScreenAnnotation() { } + +void ScreenAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [screen] element + QDomElement screenElement = document.createElement(QStringLiteral("screen")); + node.appendChild(screenElement); +} + +Annotation::SubType ScreenAnnotation::subType() const +{ + return AScreen; +} + +LinkRendition *ScreenAnnotation::action() const +{ + Q_D(const ScreenAnnotation); + return d->action; +} + +void ScreenAnnotation::setAction(LinkRendition *action) +{ + Q_D(ScreenAnnotation); + d->action = action; +} + +QString ScreenAnnotation::screenTitle() const +{ + Q_D(const ScreenAnnotation); + return d->title; +} + +void ScreenAnnotation::setScreenTitle(const QString &title) +{ + Q_D(ScreenAnnotation); + d->title = title; +} + +Link *ScreenAnnotation::additionalAction(AdditionalActionType type) const +{ + Q_D(const ScreenAnnotation); + return d->additionalAction(type); +} + +/** WidgetAnnotation [Annotation] */ +class WidgetAnnotationPrivate : public AnnotationPrivate +{ +public: + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; +}; + +Annotation *WidgetAnnotationPrivate::makeAlias() +{ + return new WidgetAnnotation(*this); +} + +Annot *WidgetAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + return nullptr; // Not implemented +} + +WidgetAnnotation::WidgetAnnotation(WidgetAnnotationPrivate &dd) : Annotation(dd) { } + +WidgetAnnotation::WidgetAnnotation() : Annotation(*new WidgetAnnotationPrivate()) { } + +WidgetAnnotation::~WidgetAnnotation() { } + +void WidgetAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [widget] element + QDomElement widgetElement = document.createElement(QStringLiteral("widget")); + node.appendChild(widgetElement); +} + +Annotation::SubType WidgetAnnotation::subType() const +{ + return AWidget; +} + +Link *WidgetAnnotation::additionalAction(AdditionalActionType type) const +{ + Q_D(const WidgetAnnotation); + return d->additionalAction(type); +} + +/** RichMediaAnnotation [Annotation] */ +class RichMediaAnnotation::Params::Private +{ +public: + Private() { } + + QString flashVars; +}; + +RichMediaAnnotation::Params::Params() : d(new Private) { } + +RichMediaAnnotation::Params::~Params() { } + +void RichMediaAnnotation::Params::setFlashVars(const QString &flashVars) +{ + d->flashVars = flashVars; +} + +QString RichMediaAnnotation::Params::flashVars() const +{ + return d->flashVars; +} + +class RichMediaAnnotation::Instance::Private +{ +public: + Private() : params(nullptr) { } + + ~Private() { delete params; } + + Private(const Private &) = delete; + Private &operator=(const Private &) = delete; + + RichMediaAnnotation::Instance::Type type; + RichMediaAnnotation::Params *params; +}; + +RichMediaAnnotation::Instance::Instance() : d(new Private) { } + +RichMediaAnnotation::Instance::~Instance() { } + +void RichMediaAnnotation::Instance::setType(Type type) +{ + d->type = type; +} + +RichMediaAnnotation::Instance::Type RichMediaAnnotation::Instance::type() const +{ + return d->type; +} + +void RichMediaAnnotation::Instance::setParams(RichMediaAnnotation::Params *params) +{ + delete d->params; + d->params = params; +} + +RichMediaAnnotation::Params *RichMediaAnnotation::Instance::params() const +{ + return d->params; +} + +class RichMediaAnnotation::Configuration::Private +{ +public: + Private() { } + ~Private() + { + qDeleteAll(instances); + instances.clear(); + } + + Private(const Private &) = delete; + Private &operator=(const Private &) = delete; + + RichMediaAnnotation::Configuration::Type type; + QString name; + QList instances; +}; + +RichMediaAnnotation::Configuration::Configuration() : d(new Private) { } + +RichMediaAnnotation::Configuration::~Configuration() { } + +void RichMediaAnnotation::Configuration::setType(Type type) +{ + d->type = type; +} + +RichMediaAnnotation::Configuration::Type RichMediaAnnotation::Configuration::type() const +{ + return d->type; +} + +void RichMediaAnnotation::Configuration::setName(const QString &name) +{ + d->name = name; +} + +QString RichMediaAnnotation::Configuration::name() const +{ + return d->name; +} + +void RichMediaAnnotation::Configuration::setInstances(const QList &instances) +{ + qDeleteAll(d->instances); + d->instances.clear(); + + d->instances = instances; +} + +QList RichMediaAnnotation::Configuration::instances() const +{ + return d->instances; +} + +class RichMediaAnnotation::Asset::Private +{ +public: + Private() : embeddedFile(nullptr) { } + + ~Private() { delete embeddedFile; } + + Private(const Private &) = delete; + Private &operator=(const Private &) = delete; + + QString name; + EmbeddedFile *embeddedFile; +}; + +RichMediaAnnotation::Asset::Asset() : d(new Private) { } + +RichMediaAnnotation::Asset::~Asset() { } + +void RichMediaAnnotation::Asset::setName(const QString &name) +{ + d->name = name; +} + +QString RichMediaAnnotation::Asset::name() const +{ + return d->name; +} + +void RichMediaAnnotation::Asset::setEmbeddedFile(EmbeddedFile *embeddedFile) +{ + delete d->embeddedFile; + d->embeddedFile = embeddedFile; +} + +EmbeddedFile *RichMediaAnnotation::Asset::embeddedFile() const +{ + return d->embeddedFile; +} + +class RichMediaAnnotation::Content::Private +{ +public: + Private() { } + ~Private() + { + qDeleteAll(configurations); + configurations.clear(); + + qDeleteAll(assets); + assets.clear(); + } + + Private(const Private &) = delete; + Private &operator=(const Private &) = delete; + + QList configurations; + QList assets; +}; + +RichMediaAnnotation::Content::Content() : d(new Private) { } + +RichMediaAnnotation::Content::~Content() { } + +void RichMediaAnnotation::Content::setConfigurations(const QList &configurations) +{ + qDeleteAll(d->configurations); + d->configurations.clear(); + + d->configurations = configurations; +} + +QList RichMediaAnnotation::Content::configurations() const +{ + return d->configurations; +} + +void RichMediaAnnotation::Content::setAssets(const QList &assets) +{ + qDeleteAll(d->assets); + d->assets.clear(); + + d->assets = assets; +} + +QList RichMediaAnnotation::Content::assets() const +{ + return d->assets; +} + +class RichMediaAnnotation::Activation::Private +{ +public: + Private() : condition(RichMediaAnnotation::Activation::UserAction) { } + + RichMediaAnnotation::Activation::Condition condition; +}; + +RichMediaAnnotation::Activation::Activation() : d(new Private) { } + +RichMediaAnnotation::Activation::~Activation() { } + +void RichMediaAnnotation::Activation::setCondition(Condition condition) +{ + d->condition = condition; +} + +RichMediaAnnotation::Activation::Condition RichMediaAnnotation::Activation::condition() const +{ + return d->condition; +} + +class RichMediaAnnotation::Deactivation::Private : public QSharedData +{ +public: + Private() : condition(RichMediaAnnotation::Deactivation::UserAction) { } + + RichMediaAnnotation::Deactivation::Condition condition; +}; + +RichMediaAnnotation::Deactivation::Deactivation() : d(new Private) { } + +RichMediaAnnotation::Deactivation::~Deactivation() { } + +void RichMediaAnnotation::Deactivation::setCondition(Condition condition) +{ + d->condition = condition; +} + +RichMediaAnnotation::Deactivation::Condition RichMediaAnnotation::Deactivation::condition() const +{ + return d->condition; +} + +class RichMediaAnnotation::Settings::Private : public QSharedData +{ +public: + Private() : activation(nullptr), deactivation(nullptr) { } + + RichMediaAnnotation::Activation *activation; + RichMediaAnnotation::Deactivation *deactivation; +}; + +RichMediaAnnotation::Settings::Settings() : d(new Private) { } + +RichMediaAnnotation::Settings::~Settings() { } + +void RichMediaAnnotation::Settings::setActivation(RichMediaAnnotation::Activation *activation) +{ + delete d->activation; + d->activation = activation; +} + +RichMediaAnnotation::Activation *RichMediaAnnotation::Settings::activation() const +{ + return d->activation; +} + +void RichMediaAnnotation::Settings::setDeactivation(RichMediaAnnotation::Deactivation *deactivation) +{ + delete d->deactivation; + d->deactivation = deactivation; +} + +RichMediaAnnotation::Deactivation *RichMediaAnnotation::Settings::deactivation() const +{ + return d->deactivation; +} + +class RichMediaAnnotationPrivate : public AnnotationPrivate +{ +public: + RichMediaAnnotationPrivate() : settings(nullptr), content(nullptr) { } + + ~RichMediaAnnotationPrivate() override; + + Annotation *makeAlias() override { return new RichMediaAnnotation(*this); } + + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override + { + Q_UNUSED(destPage); + Q_UNUSED(doc); + + return nullptr; + } + + RichMediaAnnotation::Settings *settings; + RichMediaAnnotation::Content *content; +}; + +RichMediaAnnotationPrivate::~RichMediaAnnotationPrivate() +{ + delete settings; + delete content; +} + +RichMediaAnnotation::RichMediaAnnotation() : Annotation(*new RichMediaAnnotationPrivate()) { } + +RichMediaAnnotation::RichMediaAnnotation(RichMediaAnnotationPrivate &dd) : Annotation(dd) { } + +RichMediaAnnotation::RichMediaAnnotation(const QDomNode &node) : Annotation(*new RichMediaAnnotationPrivate(), node) +{ + // loop through the whole children looking for a 'richMedia' element + QDomNode subNode = node.firstChild(); + while (subNode.isElement()) { + QDomElement e = subNode.toElement(); + subNode = subNode.nextSibling(); + if (e.tagName() != QLatin1String("richMedia")) { + continue; + } + + // loading complete + break; + } +} + +RichMediaAnnotation::~RichMediaAnnotation() { } + +void RichMediaAnnotation::store(QDomNode &node, QDomDocument &document) const +{ + // store base annotation properties + storeBaseAnnotationProperties(node, document); + + // create [richMedia] element + QDomElement richMediaElement = document.createElement(QStringLiteral("richMedia")); + node.appendChild(richMediaElement); +} + +Annotation::SubType RichMediaAnnotation::subType() const +{ + return ARichMedia; +} + +void RichMediaAnnotation::setSettings(RichMediaAnnotation::Settings *settings) +{ + Q_D(RichMediaAnnotation); + + delete d->settings; + d->settings = settings; +} + +RichMediaAnnotation::Settings *RichMediaAnnotation::settings() const +{ + Q_D(const RichMediaAnnotation); + + return d->settings; +} + +void RichMediaAnnotation::setContent(RichMediaAnnotation::Content *content) +{ + Q_D(RichMediaAnnotation); + + delete d->content; + d->content = content; +} + +RichMediaAnnotation::Content *RichMediaAnnotation::content() const +{ + Q_D(const RichMediaAnnotation); + + return d->content; +} + +// BEGIN utility annotation functions +QColor convertAnnotColor(const AnnotColor *color) +{ + if (!color) { + return QColor(); + } + + QColor newcolor; + const double *color_data = color->getValues(); + switch (color->getSpace()) { + case AnnotColor::colorTransparent: // = 0, + newcolor = Qt::transparent; + break; + case AnnotColor::colorGray: // = 1, + newcolor.setRgbF(color_data[0], color_data[0], color_data[0]); + break; + case AnnotColor::colorRGB: // = 3, + newcolor.setRgbF(color_data[0], color_data[1], color_data[2]); + break; + case AnnotColor::colorCMYK: // = 4 + newcolor.setCmykF(color_data[0], color_data[1], color_data[2], color_data[3]); + break; + } + return newcolor; +} + +std::unique_ptr convertQColor(const QColor &c) +{ + if (c.alpha() == 0) { + return {}; // Transparent + } + + switch (c.spec()) { + case QColor::Rgb: + case QColor::Hsl: + case QColor::Hsv: + return std::make_unique(c.redF(), c.greenF(), c.blueF()); + case QColor::Cmyk: + return std::make_unique(c.cyanF(), c.magentaF(), c.yellowF(), c.blackF()); + case QColor::Invalid: + default: + return {}; + } +} +// END utility annotation functions + +} diff --git a/poppler-24.05.0/qt5/src/poppler-annotation.h b/poppler-24.05.0/qt5/src/poppler-annotation.h new file mode 100644 index 0000000000000000000000000000000000000000..00460f74db10b59841fa8b790284f96a419d14c4 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-annotation.h @@ -0,0 +1,1489 @@ +/* poppler-annotation.h: qt interface to poppler + * Copyright (C) 2006-2008, 2012, 2013, 2018-2022 Albert Astals Cid + * Copyright (C) 2006, 2008 Pino Toscano + * Copyright (C) 2007, Brad Hards + * Copyright (C) 2010, Philip Lorenz + * Copyright (C) 2012, 2015, Tobias Koenig + * Copyright (C) 2012, Guillermo A. Amaral B. + * Copyright (C) 2012, 2013 Fabio D'Urso + * Copyright (C) 2013, Anthony Granger + * Copyright (C) 2018, Dileep Sankhla + * Copyright (C) 2020, Katarina Behrens + * Copyright (C) 2020, Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021, Mahmoud Ahmed Khalil + * Adapting code from + * Copyright (C) 2004 by Enrico Ros + * + * 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. + */ + +#ifndef _POPPLER_ANNOTATION_H_ +#define _POPPLER_ANNOTATION_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "poppler-export.h" + +#include + +namespace Poppler { + +class Annotation; +class AnnotationPrivate; +class AnnotationAppearancePrivate; +class TextAnnotationPrivate; +class LineAnnotationPrivate; +class GeomAnnotationPrivate; +class HighlightAnnotationPrivate; +class StampAnnotationPrivate; +class InkAnnotationPrivate; +class LinkAnnotationPrivate; +class CaretAnnotationPrivate; +class FileAttachmentAnnotationPrivate; +class SoundAnnotationPrivate; +class MovieAnnotationPrivate; +class ScreenAnnotationPrivate; +class WidgetAnnotationPrivate; +class RichMediaAnnotationPrivate; +class EmbeddedFile; +class Link; +class SoundObject; +class MovieObject; +class LinkRendition; +class Page; + +/** + * \short Helper class for (recursive) Annotation retrieval/storage. + * + */ +class POPPLER_QT5_EXPORT AnnotationUtils +{ +public: + /** + * Restore an Annotation (with revisions if needed) from the DOM + * element \p annElement. + * \returns a pointer to the complete Annotation or 0 if element is + * invalid. + */ + Q_DECL_DEPRECATED static Annotation *createAnnotation(const QDomElement &annElement); + + /** + * Save the Annotation \p ann as a child of \p annElement taking + * care of saving all revisions if \p ann has any. + */ + Q_DECL_DEPRECATED static void storeAnnotation(const Annotation *ann, QDomElement &annElement, QDomDocument &document); + + /** + * Returns an element called \p name from the direct children of + * \p parentNode or a null element if not found. + */ + Q_DECL_DEPRECATED static QDomElement findChildElement(const QDomNode &parentNode, const QString &name); +}; + +/** + * \short AnnotationAppearance class wrapping Poppler's AP stream object + * + * The Annotation's Appearance Stream is a Form XObject containing + * information required to properly render the Annotation on the document. + * + * This class wraps Poppler's Object implementing the appearance stream + * for the calling annotation. It can be used to preserve the current + * Appearance Stream for the calling annotation. + * + * \since 21.10.0 + */ +class POPPLER_QT5_EXPORT AnnotationAppearance +{ + friend class Annotation; + +public: + explicit AnnotationAppearance(AnnotationAppearancePrivate *annotationAppearancePrivate); + ~AnnotationAppearance(); + +private: + AnnotationAppearancePrivate *d; + Q_DISABLE_COPY(AnnotationAppearance) +}; + +/** + * \short Annotation class holding properties shared by all annotations. + * + * An Annotation is an object (text note, highlight, sound, popup window, ..) + * contained by a Page in the document. + * + * \warning Different Annotation objects might point to the same annotation. + * + * \section annotCreation How to add annotations + * + * Create an Annotation object of the desired subclass (for example + * TextAnnotation) and set its properties: + * @code + * Poppler::TextAnnotation* myann = new Poppler::TextAnnotation(Poppler::TextAnnotation::InPlace); + * myann->setBoundary(QRectF(0.1, 0.1, 0.2, 0.2)); // normalized coordinates: (0,0) is top-left, (1,1) is bottom-right + * myann->setContents("Hello, world!"); + * @endcode + * \note Always set a boundary rectangle, or nothing will be shown! + * + * Obtain a pointer to the Page where you want to add the annotation (refer to + * \ref req for instructions) and add the annotation: + * @code + * Poppler::Page* mypage = ...; + * mypage->addAnnotation(myann); + * @endcode + * + * You can keep on editing the annotation after it has been added to the page: + * @code + * myann->setContents("World, hello!"); // Let's change text... + * myann->setAuthor("Your name here"); // ...and set an author too + * @endcode + * + * When you're done with editing the annotation, you must destroy the Annotation + * object: + * @code + * delete myann; + * @endcode + * + * Use the PDFConverter class to save the modified document. + * + * \section annotFixedRotation FixedRotation flag specifics + * + * According to the PDF specification, annotations whose + * Annotation::FixedRotation flag is set must always be shown in their original + * orientation, no matter what the current rendering rotation or the page's + * Page::orientation() values are. In comparison with regular annotations, such + * annotations should therefore be transformed by an extra rotation at rendering + * time to "undo" such context-related rotations, which is equal to + * -(rendering_rotation + page_orientation). The rotation pivot + * is the top-left corner of the boundary rectangle. + * + * In practice, %Poppler's \ref Page::renderToImage only "unrotates" the + * page orientation, and does not unrotate the rendering rotation. + * This ensures consistent renderings at different Page::Rotation values: + * annotations are always positioned as if they were being positioned at the + * default page orientation. + * + * Just like regular annotations, %Poppler Qt5 exposes normalized coordinates + * relative to the page's default orientation. However, behind the scenes, the + * coordinate system is different and %Poppler transparently transforms each + * shape. If you never call either Annotation::setFlags or + * Annotation::setBoundary, you don't need to worry about this; but if you do + * call them, then you need to adhere to the following rules: + * - Whenever you toggle the Annotation::FixedRotation flag, you must + * set again the boundary rectangle first, and then you must set + * again any other geometry-related property. + * - Whenever you modify the boundary rectangle of an annotation whose + * Annotation::FixedRotation flag is set, you must set again any other + * geometry-related property. + * + * These two rules are necessary to make %Poppler's transparent coordinate + * conversion work properly. + */ +class POPPLER_QT5_EXPORT Annotation +{ + friend class AnnotationUtils; + friend class LinkMovie; + friend class LinkRendition; + +public: + // enum definitions + /** + * Annotation subclasses + * + * \sa subType() + */ + // WARNING!!! oKular uses that very same values so if you change them notify the author! + enum SubType + { + AText = 1, ///< TextAnnotation + ALine = 2, ///< LineAnnotation + AGeom = 3, ///< GeomAnnotation + AHighlight = 4, ///< HighlightAnnotation + AStamp = 5, ///< StampAnnotation + AInk = 6, ///< InkAnnotation + ALink = 7, ///< LinkAnnotation + ACaret = 8, ///< CaretAnnotation + AFileAttachment = 9, ///< FileAttachmentAnnotation + ASound = 10, ///< SoundAnnotation + AMovie = 11, ///< MovieAnnotation + AScreen = 12, ///< ScreenAnnotation \since 0.20 + AWidget = 13, ///< WidgetAnnotation \since 0.22 + ARichMedia = 14, ///< RichMediaAnnotation \since 0.36 + A_BASE = 0 + }; + + /** + * Annotation flags + * + * They can be OR'd together (e.g. Annotation::FixedRotation | Annotation::DenyPrint). + * + * \sa flags(), setFlags(int) + */ + // NOTE: Only flags that are known to work are documented + enum Flag + { + Hidden = 1, ///< Do not display or print the annotation + FixedSize = 2, + FixedRotation = 4, ///< Do not rotate the annotation according to page orientation and rendering rotation \warning Extra care is needed with this flag: see \ref annotFixedRotation + DenyPrint = 8, ///< Do not print the annotation + DenyWrite = 16, + DenyDelete = 32, + ToggleHidingOnMouse = 64, + External = 128 + }; + + enum LineStyle + { + Solid = 1, + Dashed = 2, + Beveled = 4, + Inset = 8, + Underline = 16 + }; + enum LineEffect + { + NoEffect = 1, + Cloudy = 2 + }; + enum RevScope + { + Root = 0 /** \since 0.20 */, + Reply = 1, + Group = 2, + Delete = 4 + }; + enum RevType + { + None = 1, + Marked = 2, + Unmarked = 4, + Accepted = 8, + Rejected = 16, + Cancelled = 32, + Completed = 64 + }; + + /** + * Returns the author of the annotation. + */ + QString author() const; + /** + * Sets a new author for the annotation. + */ + void setAuthor(const QString &author); + + QString contents() const; + void setContents(const QString &contents); + + /** + * Returns the unique name (ID) of the annotation. + */ + QString uniqueName() const; + /** + * Sets a new unique name for the annotation. + * + * \note no check of the new uniqueName is done + */ + void setUniqueName(const QString &uniqueName); + + QDateTime modificationDate() const; + void setModificationDate(const QDateTime &date); + + QDateTime creationDate() const; + void setCreationDate(const QDateTime &date); + + /** + * Returns this annotation's flags + * + * \sa Flag, setFlags(int) + */ + int flags() const; + /** + * Sets this annotation's flags + * + * \sa Flag, flags(), \ref annotFixedRotation + */ + void setFlags(int flags); + + /** + * Returns this annotation's boundary rectangle in normalized coordinates + * + * \sa setBoundary(const QRectF&) + */ + QRectF boundary() const; + /** + * Sets this annotation's boundary rectangle + * + * The boundary rectangle is the smallest rectangle that contains the + * annotation. + * + * \warning This property is mandatory: you must always set this. + * + * \sa boundary(), \ref annotFixedRotation + */ + void setBoundary(const QRectF &boundary); + + /** + * \short Container class for Annotation style information + * + * \since 0.20 + */ + class POPPLER_QT5_EXPORT Style + { + public: + Style(); + Style(const Style &other); + Style &operator=(const Style &other); + ~Style(); + + // appearance properties + QColor color() const; // black + void setColor(const QColor &color); + double opacity() const; // 1.0 + void setOpacity(double opacity); + + // pen properties + double width() const; // 1.0 + void setWidth(double width); + LineStyle lineStyle() const; // LineStyle::Solid + void setLineStyle(LineStyle style); + double xCorners() const; // 0.0 + void setXCorners(double radius); + double yCorners() const; // 0.0 + void setYCorners(double radius); + const QVector &dashArray() const; // [ 3 ] + void setDashArray(const QVector &array); + + // pen effects + LineEffect lineEffect() const; // LineEffect::NoEffect + void setLineEffect(LineEffect effect); + double effectIntensity() const; // 1.0 + void setEffectIntensity(double intens); + + private: + class Private; + QSharedDataPointer d; + }; + + /// \since 0.20 + Style style() const; + /// \since 0.20 + void setStyle(const Style &style); + + /** + * \short Container class for Annotation pop-up window information + * + * \since 0.20 + */ + class POPPLER_QT5_EXPORT Popup + { + public: + Popup(); + Popup(const Popup &other); + Popup &operator=(const Popup &other); + ~Popup(); + + // window state (Hidden, FixedRotation, Deny* flags allowed) + int flags() const; // -1 (never initialized) -> 0 (if inited and shown) + void setFlags(int flags); + + // geometric properties + QRectF geometry() const; // no default + void setGeometry(const QRectF &geom); + + // window contents/override properties + QString title() const; // '' text in the titlebar (overrides author) + void setTitle(const QString &title); + QString summary() const; // '' short description (displayed if not empty) + void setSummary(const QString &summary); + QString text() const; // '' text for the window (overrides annot->contents) + void setText(const QString &text); + + private: + class Private; + QSharedDataPointer d; + }; + + /// \since 0.20 + Popup popup() const; + /// \warning Currently does nothing \since 0.20 + void setPopup(const Popup &popup); + + /// \since 0.20 + RevScope revisionScope() const; // Root + + /// \since 0.20 + RevType revisionType() const; // None + + /** + * Returns the revisions of this annotation + * + * \note The caller owns the returned annotations and they should + * be deleted when no longer required. + * + * \since 0.20 + */ + QList revisions() const; + + /** + * The type of the annotation. + */ + virtual SubType subType() const = 0; + + /** + * Returns the current appearance stream of this annotation. + * + * \since 21.10.0 + */ + std::unique_ptr annotationAppearance() const; + + /** + * Sets the annotation's appearance stream with the @p annotationAppearance. + * + * \since 21.10.0 + */ + void setAnnotationAppearance(const AnnotationAppearance &annotationAppearance); + + /** + * Destructor. + */ + virtual ~Annotation(); + + /** + * Describes the flags from an annotations 'AA' dictionary. + * + * This flag is used by the additionalAction() method for ScreenAnnotation + * and WidgetAnnotation. + * + * \since 0.22 + */ + enum AdditionalActionType + { + CursorEnteringAction, ///< Performed when the cursor enters the annotation's active area + CursorLeavingAction, ///< Performed when the cursor exists the annotation's active area + MousePressedAction, ///< Performed when the mouse button is pressed inside the annotation's active area + MouseReleasedAction, ///< Performed when the mouse button is released inside the annotation's active area + FocusInAction, ///< Performed when the annotation receives the input focus + FocusOutAction, ///< Performed when the annotation loses the input focus + PageOpeningAction, ///< Performed when the page containing the annotation is opened + PageClosingAction, ///< Performed when the page containing the annotation is closed + PageVisibleAction, ///< Performed when the page containing the annotation becomes visible + PageInvisibleAction ///< Performed when the page containing the annotation becomes invisible + }; + +protected: + /// \cond PRIVATE + explicit Annotation(AnnotationPrivate &dd); + Annotation(AnnotationPrivate &dd, const QDomNode &annNode); + void storeBaseAnnotationProperties(QDomNode &annNode, QDomDocument &document) const; + Q_DECLARE_PRIVATE(Annotation) + QExplicitlySharedDataPointer d_ptr; + /// \endcond + +private: + virtual void store(QDomNode &parentNode, QDomDocument &document) const = 0; + Q_DISABLE_COPY(Annotation) +}; + +/** + * \short Annotation containing text. + * + * A text annotation is an object showing some text directly on the page, or + * linked to the contents using an icon shown on a page. + */ +class POPPLER_QT5_EXPORT TextAnnotation : public Annotation +{ + friend class AnnotationUtils; + friend class AnnotationPrivate; + +public: + // local enums + enum TextType + { + Linked, + InPlace + }; + enum InplaceIntent + { + Unknown, + Callout, + TypeWriter + }; + + explicit TextAnnotation(TextType type); + ~TextAnnotation() override; + SubType subType() const override; + + /** + The type of text annotation represented by this object + */ + TextType textType() const; + + /** + The name of the icon for this text annotation. + + Standard names for text annotation icons are: + - Comment + - Help + - Insert + - Key + - NewParagraph + - Note (this is the default icon to use) + - Paragraph + */ + QString textIcon() const; + + /** + Set the name of the icon to use for this text annotation. + + \sa textIcon for the list of standard names + */ + void setTextIcon(const QString &icon); + + QFont textFont() const; + void setTextFont(const QFont &font); + /// Default text color is black \since 0.69 + QColor textColor() const; + /// \since 0.69 + void setTextColor(const QColor &color); + + // 0:left, 1:center, 2:right + int inplaceAlign() const; + void setInplaceAlign(int align); + + QPointF calloutPoint(int id) const; + /// \since 0.20 + QVector calloutPoints() const; + /// \since 0.20 + void setCalloutPoints(const QVector &points); + + InplaceIntent inplaceIntent() const; + void setInplaceIntent(InplaceIntent intent); + +private: + explicit TextAnnotation(const QDomNode &node); + explicit TextAnnotation(TextAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; + void setTextType(TextType type); + Q_DECLARE_PRIVATE(TextAnnotation) + Q_DISABLE_COPY(TextAnnotation) +}; + +/** + * \short Polygon/polyline annotation. + * + * This annotation represents a polygon (or polyline) to be drawn on a page. + */ +class POPPLER_QT5_EXPORT LineAnnotation : public Annotation +{ + friend class AnnotationUtils; + friend class AnnotationPrivate; + +public: + // local enums + /// \since 0.20 + enum LineType + { + StraightLine, + Polyline + }; + enum TermStyle + { + Square, + Circle, + Diamond, + OpenArrow, + ClosedArrow, + None, + Butt, + ROpenArrow, + RClosedArrow, + Slash + }; + enum LineIntent + { + Unknown, + Arrow, + Dimension, + PolygonCloud + }; + + /// \since 0.20 + explicit LineAnnotation(LineType type); + ~LineAnnotation() override; + SubType subType() const override; + + /// \since 0.20 + LineType lineType() const; + + QLinkedList linePoints() const; + void setLinePoints(const QLinkedList &points); + + TermStyle lineStartStyle() const; + void setLineStartStyle(TermStyle style); + + TermStyle lineEndStyle() const; + void setLineEndStyle(TermStyle style); + + bool isLineClosed() const; + void setLineClosed(bool closed); + + QColor lineInnerColor() const; + void setLineInnerColor(const QColor &color); + + double lineLeadingForwardPoint() const; + void setLineLeadingForwardPoint(double point); + + double lineLeadingBackPoint() const; + void setLineLeadingBackPoint(double point); + + bool lineShowCaption() const; + void setLineShowCaption(bool show); + + LineIntent lineIntent() const; + void setLineIntent(LineIntent intent); + +private: + explicit LineAnnotation(const QDomNode &node); + explicit LineAnnotation(LineAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; + void setLineType(LineType type); + Q_DECLARE_PRIVATE(LineAnnotation) + Q_DISABLE_COPY(LineAnnotation) +}; + +/** + * \short Geometric annotation. + * + * The geometric annotation represents a geometric figure, like a rectangle or + * an ellipse. + */ +class POPPLER_QT5_EXPORT GeomAnnotation : public Annotation +{ + friend class AnnotationUtils; + friend class AnnotationPrivate; + +public: + GeomAnnotation(); + ~GeomAnnotation() override; + SubType subType() const override; + + // common enums + enum GeomType + { + InscribedSquare, + InscribedCircle + }; + + GeomType geomType() const; + void setGeomType(GeomType type); + + QColor geomInnerColor() const; + void setGeomInnerColor(const QColor &color); + +private: + explicit GeomAnnotation(const QDomNode &node); + explicit GeomAnnotation(GeomAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; + Q_DECLARE_PRIVATE(GeomAnnotation) + Q_DISABLE_COPY(GeomAnnotation) +}; + +/** + * \short Text highlight annotation. + * + * The highlight annotation represents some areas of text being "highlighted". + */ +class POPPLER_QT5_EXPORT HighlightAnnotation : public Annotation +{ + friend class AnnotationUtils; + friend class AnnotationPrivate; + +public: + HighlightAnnotation(); + ~HighlightAnnotation() override; + SubType subType() const override; + + /** + The type of highlight + */ + enum HighlightType + { + Highlight, ///< highlighter pen style annotation + Squiggly, ///< jagged or squiggly underline + Underline, ///< straight line underline + StrikeOut ///< straight line through-line + }; + + /** + Structure corresponding to a QuadPoints array. This matches a + quadrilateral that describes the area around a word (or set of + words) that are to be highlighted. + */ + struct Quad + { + QPointF points[4]; // 8 valid coords + bool capStart; // false (vtx 1-4) [K] + bool capEnd; // false (vtx 2-3) [K] + double feather; // 0.1 (in range 0..1) [K] + }; + + /** + The type (style) of highlighting to use for this area + or these areas. + */ + HighlightType highlightType() const; + + /** + Set the type of highlighting to use for the given area + or areas. + */ + void setHighlightType(HighlightType type); + + /** + The list of areas to highlight. + */ + QList highlightQuads() const; + + /** + Set the areas to highlight. + */ + void setHighlightQuads(const QList &quads); + +private: + explicit HighlightAnnotation(const QDomNode &node); + explicit HighlightAnnotation(HighlightAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; + Q_DECLARE_PRIVATE(HighlightAnnotation) + Q_DISABLE_COPY(HighlightAnnotation) +}; + +/** + * \short Stamp annotation. + * + * A simple annotation drawing a stamp on a page. + */ +class POPPLER_QT5_EXPORT StampAnnotation : public Annotation +{ + friend class AnnotationUtils; + friend class AnnotationPrivate; + +public: + StampAnnotation(); + ~StampAnnotation() override; + SubType subType() const override; + + /** + The name of the icon for this stamp annotation. + + Standard names for stamp annotation icons are: + - Approved + - AsIs + - Confidential + - Departmental + - Draft (this is the default icon type) + - Experimental + - Expired + - Final + - ForComment + - ForPublicRelease + - NotApproved + - NotForPublicRelease + - Sold + - TopSecret + */ + QString stampIconName() const; + + /** + Set the icon type for this stamp annotation. + + \sa stampIconName for the list of standard icon names + */ + void setStampIconName(const QString &name); + + /** + Set a custom icon for this stamp annotation. + + \since 21.10.0 + */ + void setStampCustomImage(const QImage &image); + +private: + explicit StampAnnotation(const QDomNode &node); + explicit StampAnnotation(StampAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; + Q_DECLARE_PRIVATE(StampAnnotation) + Q_DISABLE_COPY(StampAnnotation) +}; + +/** + * \short Ink Annotation. + * + * Annotation representing an ink path on a page. + */ +class POPPLER_QT5_EXPORT InkAnnotation : public Annotation +{ + friend class AnnotationUtils; + friend class AnnotationPrivate; + +public: + InkAnnotation(); + ~InkAnnotation() override; + SubType subType() const override; + + QList> inkPaths() const; + void setInkPaths(const QList> &paths); + +private: + explicit InkAnnotation(const QDomNode &node); + void store(QDomNode &parentNode, QDomDocument &document) const override; + explicit InkAnnotation(InkAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(InkAnnotation) + Q_DISABLE_COPY(InkAnnotation) +}; + +class POPPLER_QT5_EXPORT LinkAnnotation : public Annotation +{ + friend class AnnotationUtils; + friend class AnnotationPrivate; + +public: + ~LinkAnnotation() override; + SubType subType() const override; + + // local enums + enum HighlightMode + { + None, + Invert, + Outline, + Push + }; + + /** \since 0.20 */ + Link *linkDestination() const; + void setLinkDestination(Link *link); + + HighlightMode linkHighlightMode() const; + void setLinkHighlightMode(HighlightMode mode); + + QPointF linkRegionPoint(int id) const; + // TODO Next ABI break, remove ref from point + void setLinkRegionPoint(int id, const QPointF &point); + +private: + LinkAnnotation(); + explicit LinkAnnotation(const QDomNode &node); + explicit LinkAnnotation(LinkAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; + Q_DECLARE_PRIVATE(LinkAnnotation) + Q_DISABLE_COPY(LinkAnnotation) +}; + +/** + * \short Caret annotation. + * + * The caret annotation represents a symbol to indicate the presence of text. + */ +class POPPLER_QT5_EXPORT CaretAnnotation : public Annotation +{ + friend class AnnotationUtils; + friend class AnnotationPrivate; + +public: + CaretAnnotation(); + ~CaretAnnotation() override; + SubType subType() const override; + + /** + * The symbols for the caret annotation. + */ + enum CaretSymbol + { + None, + P + }; + + CaretSymbol caretSymbol() const; + void setCaretSymbol(CaretSymbol symbol); + +private: + explicit CaretAnnotation(const QDomNode &node); + explicit CaretAnnotation(CaretAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; + Q_DECLARE_PRIVATE(CaretAnnotation) + Q_DISABLE_COPY(CaretAnnotation) +}; + +/** + * \short File attachment annotation. + * + * The file attachment annotation represents a file embedded in the document. + * + * \since 0.10 + */ +class POPPLER_QT5_EXPORT FileAttachmentAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~FileAttachmentAnnotation() override; + SubType subType() const override; + + /** + * Returns the name of the icon of this annotation. + */ + QString fileIconName() const; + /** + * Sets a new name for the icon of this annotation. + */ + void setFileIconName(const QString &icon); + + /** + * Returns the EmbeddedFile of this annotation. + */ + EmbeddedFile *embeddedFile() const; + /** + * Sets a new EmbeddedFile for this annotation. + * + * \note FileAttachmentAnnotation takes ownership of the object + */ + void setEmbeddedFile(EmbeddedFile *ef); + +private: + FileAttachmentAnnotation(); + explicit FileAttachmentAnnotation(const QDomNode &node); + explicit FileAttachmentAnnotation(FileAttachmentAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; + Q_DECLARE_PRIVATE(FileAttachmentAnnotation) + Q_DISABLE_COPY(FileAttachmentAnnotation) +}; + +/** + * \short Sound annotation. + * + * The sound annotation represents a sound to be played when activated. + * + * \since 0.10 + */ +class POPPLER_QT5_EXPORT SoundAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~SoundAnnotation() override; + SubType subType() const override; + + /** + * Returns the name of the icon of this annotation. + */ + QString soundIconName() const; + /** + * Sets a new name for the icon of this annotation. + */ + void setSoundIconName(const QString &icon); + + /** + * Returns the SoundObject of this annotation. + */ + SoundObject *sound() const; + /** + * Sets a new SoundObject for this annotation. + * + * \note SoundAnnotation takes ownership of the object + */ + void setSound(SoundObject *s); + +private: + SoundAnnotation(); + explicit SoundAnnotation(const QDomNode &node); + explicit SoundAnnotation(SoundAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; + Q_DECLARE_PRIVATE(SoundAnnotation) + Q_DISABLE_COPY(SoundAnnotation) +}; + +/** + * \short Movie annotation. + * + * The movie annotation represents a movie to be played when activated. + * + * \since 0.10 + */ +class POPPLER_QT5_EXPORT MovieAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~MovieAnnotation() override; + SubType subType() const override; + + /** + * Returns the MovieObject of this annotation. + */ + MovieObject *movie() const; + /** + * Sets a new MovieObject for this annotation. + * + * \note MovieAnnotation takes ownership of the object + */ + void setMovie(MovieObject *movie); + + /** + * Returns the title of the movie of this annotation. + */ + QString movieTitle() const; + /** + * Sets a new title for the movie of this annotation. + */ + void setMovieTitle(const QString &title); + +private: + MovieAnnotation(); + explicit MovieAnnotation(const QDomNode &node); + explicit MovieAnnotation(MovieAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; + Q_DECLARE_PRIVATE(MovieAnnotation) + Q_DISABLE_COPY(MovieAnnotation) +}; + +/** + * \short Screen annotation. + * + * The screen annotation represents a screen to be played when activated. + * + * \since 0.20 + */ +class POPPLER_QT5_EXPORT ScreenAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~ScreenAnnotation() override; + + SubType subType() const override; + + /** + * Returns the LinkRendition of this annotation. + */ + LinkRendition *action() const; + + /** + * Sets a new LinkRendition for this annotation. + * + * \note ScreenAnnotation takes ownership of the object + */ + void setAction(LinkRendition *action); + + /** + * Returns the title of the screen of this annotation. + */ + QString screenTitle() const; + + /** + * Sets a new title for the screen of this annotation. + */ + void setScreenTitle(const QString &title); + + /** + * Returns the additional action of the given @p type fo the annotation or + * @c 0 if no action has been defined. + * + * \since 0.22 + */ + Link *additionalAction(AdditionalActionType type) const; + +private: + ScreenAnnotation(); + explicit ScreenAnnotation(ScreenAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; // stub + Q_DECLARE_PRIVATE(ScreenAnnotation) + Q_DISABLE_COPY(ScreenAnnotation) +}; + +/** + * \short Widget annotation. + * + * The widget annotation represents a widget (form field) on a page. + * + * \note This class is just provided for consistency of the annotation API, + * use the FormField classes to get all the form-related information. + * + * \since 0.22 + */ +class POPPLER_QT5_EXPORT WidgetAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~WidgetAnnotation() override; + + SubType subType() const override; + + /** + * Returns the additional action of the given @p type fo the annotation or + * @c 0 if no action has been defined. + * + * \since 0.22 + */ + Link *additionalAction(AdditionalActionType type) const; + +private: + WidgetAnnotation(); + explicit WidgetAnnotation(WidgetAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; // stub + Q_DECLARE_PRIVATE(WidgetAnnotation) + Q_DISABLE_COPY(WidgetAnnotation) +}; + +/** + * \short RichMedia annotation. + * + * The RichMedia annotation represents a video or sound on a page. + * + * \since 0.36 + */ +class POPPLER_QT5_EXPORT RichMediaAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~RichMediaAnnotation() override; + + SubType subType() const override; + + /** + * The params object of a RichMediaAnnotation::Instance object. + * + * The params object provides media specific parameters, to play + * back the media inside the PDF viewer. + * + * At the moment only parameters for flash player are supported. + */ + class POPPLER_QT5_EXPORT Params + { + friend class AnnotationPrivate; + + public: + Params(); + ~Params(); + + /** + * Returns the parameters for the flash player. + */ + QString flashVars() const; + + private: + void setFlashVars(const QString &flashVars); + + class Private; + QScopedPointer d; + }; + + /** + * The instance object of a RichMediaAnnotation::Configuration object. + * + * The instance object represents one media object, that should be shown + * on the page. It has a media type and a Params object, to define the + * media specific parameters. + */ + class POPPLER_QT5_EXPORT Instance + { + friend class AnnotationPrivate; + + public: + /** + * Describes the media type of the instance. + */ + enum Type + { + Type3D, ///< A 3D media file. + TypeFlash, ///< A Flash media file. + TypeSound, ///< A sound media file. + TypeVideo ///< A video media file. + }; + + Instance(); + ~Instance(); + + /** + * Returns the media type of the instance. + */ + Type type() const; + + /** + * Returns the params object of the instance or @c 0 if it doesn't exist. + */ + RichMediaAnnotation::Params *params() const; + + private: + void setType(Type type); + void setParams(RichMediaAnnotation::Params *params); + + class Private; + QScopedPointer d; + }; + + /** + * The configuration object of a RichMediaAnnotation::Content object. + * + * The configuration object provides access to the various Instance objects + * of the rich media annotation. + */ + class POPPLER_QT5_EXPORT Configuration + { + friend class AnnotationPrivate; + + public: + /** + * Describes the media type of the configuration. + */ + enum Type + { + Type3D, ///< A 3D media file. + TypeFlash, ///< A Flash media file. + TypeSound, ///< A sound media file. + TypeVideo ///< A video media file. + }; + + Configuration(); + ~Configuration(); + + /** + * Returns the media type of the configuration. + */ + Type type() const; + + /** + * Returns the name of the configuration. + */ + QString name() const; + + /** + * Returns the list of Instance objects of the configuration. + */ + QList instances() const; + + private: + void setType(Type type); + void setName(const QString &name); + void setInstances(const QList &instances); + + class Private; + QScopedPointer d; + }; + + /** + * The asset object of a RichMediaAnnotation::Content object. + * + * The asset object provides a mapping between identifier name, as + * used in the flash vars string of RichMediaAnnotation::Params, and the + * associated file spec object. + */ + class POPPLER_QT5_EXPORT Asset + { + friend class AnnotationPrivate; + + public: + Asset(); + ~Asset(); + + /** + * Returns the identifier name of the asset. + */ + QString name() const; + + /** + * Returns the embedded file the asset points to. + */ + EmbeddedFile *embeddedFile() const; + + private: + void setName(const QString &name); + void setEmbeddedFile(EmbeddedFile *embeddedFile); + + class Private; + QScopedPointer d; + }; + + /** + * The content object of a RichMediaAnnotation. + * + * The content object provides access to the list of configurations + * and assets of the rich media annotation. + */ + class POPPLER_QT5_EXPORT Content + { + friend class AnnotationPrivate; + + public: + Content(); + ~Content(); + + /** + * Returns the list of configuration objects of the content object. + */ + QList configurations() const; + + /** + * Returns the list of asset objects of the content object. + */ + QList assets() const; + + private: + void setConfigurations(const QList &configurations); + void setAssets(const QList &assets); + + class Private; + QScopedPointer d; + }; + + /** + * The activation object of the RichMediaAnnotation::Settings object. + * + * The activation object is a wrapper around the settings for the activation + * state. At the moment it provides only the activation condition. + */ + class POPPLER_QT5_EXPORT Activation + { + friend class AnnotationPrivate; + + public: + /** + * Describes the condition for activating the rich media. + */ + enum Condition + { + PageOpened, ///< Activate when page is opened. + PageVisible, ///< Activate when page becomes visible. + UserAction ///< Activate when user interacts with the annotation. + }; + + Activation(); + ~Activation(); + + /** + * Returns the activation condition. + */ + Condition condition() const; + + private: + void setCondition(Condition condition); + + class Private; + QScopedPointer d; + }; + + /** + * The deactivation object of the RichMediaAnnotation::Settings object. + * + * The deactivation object is a wrapper around the settings for the deactivation + * state. At the moment it provides only the deactivation condition. + */ + class POPPLER_QT5_EXPORT Deactivation + { + friend class AnnotationPrivate; + + public: + /** + * Describes the condition for deactivating the rich media. + */ + enum Condition + { + PageClosed, ///< Deactivate when page is closed. + PageInvisible, ///< Deactivate when page becomes invisible. + UserAction ///< Deactivate when user interacts with the annotation. + }; + + Deactivation(); + ~Deactivation(); + + /** + * Returns the deactivation condition. + */ + Condition condition() const; + + private: + void setCondition(Condition condition); + + class Private; + QScopedPointer d; + }; + + /** + * The settings object of a RichMediaAnnotation. + * + * The settings object provides access to the configuration objects + * for annotation activation and deactivation. + */ + class POPPLER_QT5_EXPORT Settings + { + friend class AnnotationPrivate; + + public: + Settings(); + ~Settings(); + + /** + * Returns the Activation object of the settings object or @c 0 if it doesn't exist. + */ + RichMediaAnnotation::Activation *activation() const; + + /** + * Returns the Deactivation object of the settings object or @c 0 if it doesn't exist. + */ + RichMediaAnnotation::Deactivation *deactivation() const; + + private: + void setActivation(RichMediaAnnotation::Activation *activation); + void setDeactivation(RichMediaAnnotation::Deactivation *deactivation); + + class Private; + QScopedPointer d; + }; + + /** + * Returns the Settings object of the rich media annotation or @c 0 if it doesn't exist. + */ + RichMediaAnnotation::Settings *settings() const; + + /** + * Returns the Content object of the rich media annotation or @c 0 if it doesn't exist. + */ + RichMediaAnnotation::Content *content() const; + +private: + void setSettings(RichMediaAnnotation::Settings *settings); + void setContent(RichMediaAnnotation::Content *content); + + RichMediaAnnotation(); + explicit RichMediaAnnotation(const QDomNode &node); + explicit RichMediaAnnotation(RichMediaAnnotationPrivate &dd); + void store(QDomNode &parentNode, QDomDocument &document) const override; + Q_DECLARE_PRIVATE(RichMediaAnnotation) + Q_DISABLE_COPY(RichMediaAnnotation) +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-base-converter.cc b/poppler-24.05.0/qt5/src/poppler-base-converter.cc new file mode 100644 index 0000000000000000000000000000000000000000..95331031b8be3a05e32ad70a30f6e03e5c0d2c50 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-base-converter.cc @@ -0,0 +1,89 @@ +/* poppler-base-converter.cc: qt interface to poppler + * Copyright (C) 2007, 2009, Albert Astals Cid + * Copyright (C) 2008, Pino Toscano + * + * 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-converter-private.h" + +#include + +namespace Poppler { + +BaseConverterPrivate::BaseConverterPrivate() : document(nullptr), iodev(nullptr), ownIodev(true) { } + +BaseConverterPrivate::~BaseConverterPrivate() { } + +QIODevice *BaseConverterPrivate::openDevice() +{ + if (!iodev) { + Q_ASSERT(!outputFileName.isEmpty()); + QFile *f = new QFile(outputFileName); + iodev = f; + ownIodev = true; + } + Q_ASSERT(iodev); + if (!iodev->isOpen()) { + if (!iodev->open(QIODevice::WriteOnly)) { + if (ownIodev) { + delete iodev; + iodev = nullptr; + } else { + return nullptr; + } + } + } + return iodev; +} + +void BaseConverterPrivate::closeDevice() +{ + if (ownIodev) { + iodev->close(); + delete iodev; + iodev = nullptr; + } +} + +BaseConverter::BaseConverter(BaseConverterPrivate &dd) : d_ptr(&dd) { } + +BaseConverter::~BaseConverter() +{ + delete d_ptr; +} + +void BaseConverter::setOutputFileName(const QString &outputFileName) +{ + Q_D(BaseConverter); + d->outputFileName = outputFileName; +} + +void BaseConverter::setOutputDevice(QIODevice *device) +{ + Q_D(BaseConverter); + d->iodev = device; + d->ownIodev = false; +} + +BaseConverter::Error BaseConverter::lastError() const +{ + Q_D(const BaseConverter); + return d->lastError; +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-converter-private.h b/poppler-24.05.0/qt5/src/poppler-converter-private.h new file mode 100644 index 0000000000000000000000000000000000000000..2df172cac28a2eb87c385f330537516885b5fa0f --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-converter-private.h @@ -0,0 +1,52 @@ +/* poppler-converter-private.h: Qt interface to poppler + * Copyright (C) 2007, 2009, 2018, Albert Astals Cid + * Copyright (C) 2008, Pino Toscano + * + * 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. + */ + +#ifndef POPPLER_QT5_CONVERTER_PRIVATE_H +#define POPPLER_QT5_CONVERTER_PRIVATE_H + +#include + +class QIODevice; + +namespace Poppler { + +class DocumentData; + +class BaseConverterPrivate +{ +public: + BaseConverterPrivate(); + virtual ~BaseConverterPrivate(); + + BaseConverterPrivate(const BaseConverterPrivate &) = delete; + BaseConverterPrivate &operator=(const BaseConverterPrivate &) = delete; + + QIODevice *openDevice(); + void closeDevice(); + + DocumentData *document; + QString outputFileName; + QIODevice *iodev; + bool ownIodev : 1; + BaseConverter::Error lastError; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-document.cc b/poppler-24.05.0/qt5/src/poppler-document.cc new file mode 100644 index 0000000000000000000000000000000000000000..6daed69834dcafe5c4d3dd179dcdd24b3964a771 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-document.cc @@ -0,0 +1,915 @@ +/* poppler-document.cc: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2005, 2008, Brad Hards + * Copyright (C) 2005-2010, 2012, 2013, 2015, 2017-2022, Albert Astals Cid + * Copyright (C) 2006-2010, Pino Toscano + * Copyright (C) 2010, 2011 Hib Eris + * Copyright (C) 2012 Koji Otani + * Copyright (C) 2012, 2013 Thomas Freitag + * Copyright (C) 2012 Fabio D'Urso + * Copyright (C) 2014, 2018, 2020 Adam Reichold + * Copyright (C) 2015 William Bader + * Copyright (C) 2016 Jakub Alba + * Copyright (C) 2017, 2021 Adrian Johnson + * Copyright (C) 2017 Suzuki Toshiya + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2019-2021 Oliver Sander + * Copyright (C) 2019 Alexander Volkov + * Copyright (C) 2020 Philipp Knechtges + * Copyright (C) 2020 Katarina Behrens + * Copyright (C) 2020 Thorsten Behrens + * Copyright (C) 2021 Mahmoud Khalil + * Copyright (C) 2021 Hubert Figuiere + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "poppler-form.h" +#include "poppler-private.h" +#include "poppler-page-private.h" +#include "poppler-outline-private.h" + +#if defined(USE_CMS) +# include +#endif + +namespace Poppler { + +Document *Document::load(const QString &filePath, const QByteArray &ownerPassword, const QByteArray &userPassword) +{ + DocumentData *doc = new DocumentData(filePath, GooString(ownerPassword.data()), GooString(userPassword.data())); + return DocumentData::checkDocument(doc); +} + +Document *Document::load(QIODevice *device, const QByteArray &ownerPassword, const QByteArray &userPassword) +{ + DocumentData *doc = new DocumentData(device, GooString(ownerPassword.data()), GooString(userPassword.data())); + return DocumentData::checkDocument(doc); +} + +Document *Document::loadFromData(const QByteArray &fileContents, const QByteArray &ownerPassword, const QByteArray &userPassword) +{ + // create stream + DocumentData *doc = new DocumentData(fileContents, GooString(ownerPassword.data()), GooString(userPassword.data())); + return DocumentData::checkDocument(doc); +} + +Document *DocumentData::checkDocument(DocumentData *doc) +{ + Document *pdoc; + if (doc->doc->isOk() || doc->doc->getErrorCode() == errEncrypted) { + pdoc = new Document(doc); + if (doc->doc->getErrorCode() == errEncrypted) { + pdoc->m_doc->locked = true; + } else { + pdoc->m_doc->locked = false; + pdoc->m_doc->fillMembers(); + } + return pdoc; + } else { + delete doc; + } + return nullptr; +} + +Document::Document(DocumentData *dataA) +{ + m_doc = dataA; +} + +Document::~Document() +{ + delete m_doc; +} + +Page *Document::page(int index) const +{ + Page *page = new Page(m_doc, index); + if (page->m_page->page == nullptr) { + delete page; + return nullptr; + } + + return page; +} + +bool Document::isLocked() const +{ + return m_doc->locked; +} + +bool Document::unlock(const QByteArray &ownerPassword, const QByteArray &userPassword) +{ + if (m_doc->locked) { + /* racier then it needs to be */ + DocumentData *doc2; + if (!m_doc->fileContents.isEmpty()) { + doc2 = new DocumentData(m_doc->fileContents, GooString(ownerPassword.data()), GooString(userPassword.data())); + } else if (m_doc->m_device) { + doc2 = new DocumentData(m_doc->m_device, GooString(ownerPassword.data()), GooString(userPassword.data())); + } else { + doc2 = new DocumentData(m_doc->m_filePath, GooString(ownerPassword.data()), GooString(userPassword.data())); + } + if (!doc2->doc->isOk()) { + delete doc2; + } else { + delete m_doc; + m_doc = doc2; + m_doc->locked = false; + m_doc->fillMembers(); + } + } + return m_doc->locked; +} + +Document::PageMode Document::pageMode() const +{ + switch (m_doc->doc->getCatalog()->getPageMode()) { + case Catalog::pageModeNone: + return UseNone; + case Catalog::pageModeOutlines: + return UseOutlines; + case Catalog::pageModeThumbs: + return UseThumbs; + case Catalog::pageModeFullScreen: + return FullScreen; + case Catalog::pageModeOC: + return UseOC; + case Catalog::pageModeAttach: + return UseAttach; + default: + return UseNone; + } +} + +Document::PageLayout Document::pageLayout() const +{ + switch (m_doc->doc->getCatalog()->getPageLayout()) { + case Catalog::pageLayoutNone: + return NoLayout; + case Catalog::pageLayoutSinglePage: + return SinglePage; + case Catalog::pageLayoutOneColumn: + return OneColumn; + case Catalog::pageLayoutTwoColumnLeft: + return TwoColumnLeft; + case Catalog::pageLayoutTwoColumnRight: + return TwoColumnRight; + case Catalog::pageLayoutTwoPageLeft: + return TwoPageLeft; + case Catalog::pageLayoutTwoPageRight: + return TwoPageRight; + default: + return NoLayout; + } +} + +Qt::LayoutDirection Document::textDirection() const +{ + if (!m_doc->doc->getCatalog()->getViewerPreferences()) { + return Qt::LayoutDirectionAuto; + } + + switch (m_doc->doc->getCatalog()->getViewerPreferences()->getDirection()) { + case ViewerPreferences::directionL2R: + return Qt::LeftToRight; + case ViewerPreferences::directionR2L: + return Qt::RightToLeft; + default: + return Qt::LayoutDirectionAuto; + } +} + +int Document::numPages() const +{ + return m_doc->doc->getNumPages(); +} + +QList Document::fonts() const +{ + QList ourList; + FontIterator it(0, m_doc); + while (it.hasNext()) { + ourList += it.next(); + } + return ourList; +} + +QList Document::embeddedFiles() const +{ + return m_doc->m_embeddedFiles; +} + +FontIterator *Document::newFontIterator(int startPage) const +{ + return new FontIterator(startPage, m_doc); +} + +QByteArray Document::fontData(const FontInfo &fi) const +{ + QByteArray result; + if (fi.isEmbedded()) { + XRef *xref = m_doc->doc->getXRef()->copy(); + + Object refObj(fi.m_data->embRef); + Object strObj = refObj.fetch(xref); + if (strObj.isStream()) { + int c; + strObj.streamReset(); + while ((c = strObj.streamGetChar()) != EOF) { + result.append((char)c); + } + strObj.streamClose(); + } + delete xref; + } + return result; +} + +QString Document::info(const QString &type) const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoStringEntry(type.toLatin1().constData())); + return UnicodeParsedString(goo.get()); +} + +bool Document::setInfo(const QString &key, const QString &val) +{ + if (m_doc->locked) { + return false; + } + + GooString *goo = QStringToUnicodeGooString(val); + m_doc->doc->setDocInfoStringEntry(key.toLatin1().constData(), goo); + return true; +} + +QString Document::title() const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoTitle()); + return UnicodeParsedString(goo.get()); +} + +bool Document::setTitle(const QString &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoTitle(QStringToUnicodeGooString(val)); + return true; +} + +QString Document::author() const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoAuthor()); + return UnicodeParsedString(goo.get()); +} + +bool Document::setAuthor(const QString &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoAuthor(QStringToUnicodeGooString(val)); + return true; +} + +QString Document::subject() const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoSubject()); + return UnicodeParsedString(goo.get()); +} + +bool Document::setSubject(const QString &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoSubject(QStringToUnicodeGooString(val)); + return true; +} + +QString Document::keywords() const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoKeywords()); + return UnicodeParsedString(goo.get()); +} + +bool Document::setKeywords(const QString &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoKeywords(QStringToUnicodeGooString(val)); + return true; +} + +QString Document::creator() const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoCreator()); + return UnicodeParsedString(goo.get()); +} + +bool Document::setCreator(const QString &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoCreator(QStringToUnicodeGooString(val)); + return true; +} + +QString Document::producer() const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoProducer()); + return UnicodeParsedString(goo.get()); +} + +bool Document::setProducer(const QString &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoProducer(QStringToUnicodeGooString(val)); + return true; +} + +bool Document::removeInfo() +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->removeDocInfo(); + return true; +} + +QStringList Document::infoKeys() const +{ + QStringList keys; + + if (m_doc->locked) { + return QStringList(); + } + + QScopedPointer xref(m_doc->doc->getXRef()->copy()); + if (!xref) { + return QStringList(); + } + Object info = xref->getDocInfo(); + if (!info.isDict()) { + return QStringList(); + } + + Dict *infoDict = info.getDict(); + // somehow iterate over keys in infoDict + keys.reserve(infoDict->getLength()); + for (int i = 0; i < infoDict->getLength(); ++i) { + keys.append(QString::fromLatin1(infoDict->getKey(i))); + } + + return keys; +} + +QDateTime Document::date(const QString &type) const +{ + if (m_doc->locked) { + return QDateTime(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoStringEntry(type.toLatin1().constData())); + QString str = UnicodeParsedString(goo.get()); + return Poppler::convertDate(str.toLatin1().constData()); +} + +bool Document::setDate(const QString &key, const QDateTime &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoStringEntry(key.toLatin1().constData(), QDateTimeToUnicodeGooString(val)); + return true; +} + +QDateTime Document::creationDate() const +{ + if (m_doc->locked) { + return QDateTime(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoCreatDate()); + QString str = UnicodeParsedString(goo.get()); + return Poppler::convertDate(str.toLatin1().constData()); +} + +bool Document::setCreationDate(const QDateTime &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoCreatDate(QDateTimeToUnicodeGooString(val)); + return true; +} + +QDateTime Document::modificationDate() const +{ + if (m_doc->locked) { + return QDateTime(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoModDate()); + QString str = UnicodeParsedString(goo.get()); + return Poppler::convertDate(str.toLatin1().constData()); +} + +bool Document::setModificationDate(const QDateTime &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoModDate(QDateTimeToUnicodeGooString(val)); + return true; +} + +bool Document::isEncrypted() const +{ + return m_doc->doc->isEncrypted(); +} + +bool Document::isLinearized() const +{ + return m_doc->doc->isLinearized(); +} + +bool Document::okToPrint() const +{ + return m_doc->doc->okToPrint(); +} + +bool Document::okToPrintHighRes() const +{ + return m_doc->doc->okToPrintHighRes(); +} + +bool Document::okToChange() const +{ + return m_doc->doc->okToChange(); +} + +bool Document::okToCopy() const +{ + return m_doc->doc->okToCopy(); +} + +bool Document::okToAddNotes() const +{ + return m_doc->doc->okToAddNotes(); +} + +bool Document::okToFillForm() const +{ + return m_doc->doc->okToFillForm(); +} + +bool Document::okToCreateFormFields() const +{ + return (okToFillForm() && okToChange()); +} + +bool Document::okToExtractForAccessibility() const +{ + return m_doc->doc->okToAccessibility(); +} + +bool Document::okToAssemble() const +{ + return m_doc->doc->okToAssemble(); +} + +void Document::getPdfVersion(int *major, int *minor) const +{ + if (major) { + *major = m_doc->doc->getPDFMajorVersion(); + } + if (minor) { + *minor = m_doc->doc->getPDFMinorVersion(); + } +} + +Document::PdfVersion Document::getPdfVersion() const +{ + return PdfVersion { m_doc->doc->getPDFMajorVersion(), m_doc->doc->getPDFMinorVersion() }; +} + +Page *Document::page(const QString &label) const +{ + GooString label_g(label.toLatin1().data()); + int index; + + if (!m_doc->doc->getCatalog()->labelToIndex(&label_g, &index)) { + std::unique_ptr label_ug(QStringToUnicodeGooString(label)); + if (!m_doc->doc->getCatalog()->labelToIndex(label_ug.get(), &index)) { + return nullptr; + } + } + + return page(index); +} + +bool Document::hasEmbeddedFiles() const +{ + return (!(0 == m_doc->doc->getCatalog()->numEmbeddedFiles())); +} + +QDomDocument *Document::toc() const +{ + Outline *outline = m_doc->doc->getOutline(); + if (!outline) { + return nullptr; + } + + const std::vector<::OutlineItem *> *items = outline->getItems(); + if (!items || items->size() < 1) { + return nullptr; + } + + QDomDocument *toc = new QDomDocument(); + if (items->size() > 0) { + m_doc->addTocChildren(toc, toc, items); + } + + return toc; +} + +QVector Document::outline() const +{ + QVector result; + + if (::Outline *outline = m_doc->doc->getOutline()) { + if (const std::vector<::OutlineItem *> *items = outline->getItems()) { + for (void *item : *items) { + result.push_back(OutlineItem { new OutlineItemData { static_cast<::OutlineItem *>(item), m_doc } }); + } + } + } + + return result; +} + +LinkDestination *Document::linkDestination(const QString &name) +{ + GooString *namedDest = QStringToGooString(name); + LinkDestinationData ldd(nullptr, namedDest, m_doc, false); + LinkDestination *ld = new LinkDestination(ldd); + delete namedDest; + return ld; +} + +void Document::setPaperColor(const QColor &color) +{ + m_doc->setPaperColor(color); +} + +void Document::setColorDisplayProfile(void *outputProfileA) +{ +#if defined(USE_CMS) + if (m_doc->m_sRGBProfile && m_doc->m_sRGBProfile.get() == outputProfileA) { + // Catch the special case that the user passes the sRGB profile + m_doc->m_displayProfile = m_doc->m_sRGBProfile; + return; + } + if (m_doc->m_displayProfile && m_doc->m_displayProfile.get() == outputProfileA) { + // Catch the special case that the user passes the display profile + return; + } + m_doc->m_displayProfile = make_GfxLCMSProfilePtr(outputProfileA); +#else + Q_UNUSED(outputProfileA); +#endif +} + +void Document::setColorDisplayProfileName(const QString &name) +{ +#if defined(USE_CMS) + void *rawprofile = cmsOpenProfileFromFile(name.toLocal8Bit().constData(), "r"); + m_doc->m_displayProfile = make_GfxLCMSProfilePtr(rawprofile); +#else + Q_UNUSED(name); +#endif +} + +void *Document::colorRgbProfile() const +{ +#if defined(USE_CMS) + if (!m_doc->m_sRGBProfile) { + m_doc->m_sRGBProfile = make_GfxLCMSProfilePtr(cmsCreate_sRGBProfile()); + } + return m_doc->m_sRGBProfile.get(); +#else + return nullptr; +#endif +} + +void *Document::colorDisplayProfile() const +{ +#if defined(USE_CMS) + return m_doc->m_displayProfile.get(); +#else + return nullptr; +#endif +} + +QColor Document::paperColor() const +{ + return m_doc->paperColor; +} + +void Document::setRenderBackend(Document::RenderBackend backend) +{ + // no need to delete the outputdev as for the moment we always create a splash one + // as the QPainter one does not allow "precaching" due to it's signature + // delete m_doc->m_outputDev; + // m_doc->m_outputDev = NULL; + m_doc->m_backend = backend; +} + +Document::RenderBackend Document::renderBackend() const +{ + return m_doc->m_backend; +} + +QSet Document::availableRenderBackends() +{ + QSet ret; + ret << Document::SplashBackend; + ret << Document::QPainterBackend; + ret << Document::ArthurBackend; // For backward compatibility + return ret; +} + +void Document::setRenderHint(Document::RenderHint hint, bool on) +{ + const bool touchesOverprinting = hint & Document::OverprintPreview; + + int hintForOperation = hint; + if (touchesOverprinting && !isOverprintPreviewAvailable()) { + hintForOperation = hintForOperation & ~(int)Document::OverprintPreview; + } + + if (on) { + m_doc->m_hints |= hintForOperation; + } else { + m_doc->m_hints &= ~hintForOperation; + } +} + +Document::RenderHints Document::renderHints() const +{ + return Document::RenderHints(m_doc->m_hints); +} + +PSConverter *Document::psConverter() const +{ + return new PSConverter(m_doc); +} + +PDFConverter *Document::pdfConverter() const +{ + return new PDFConverter(m_doc); +} + +QString Document::metadata() const +{ + QString result; + Catalog *catalog = m_doc->doc->getCatalog(); + if (catalog && catalog->isOk()) { + std::unique_ptr s = catalog->readMetadata(); + if (s) { + result = UnicodeParsedString(s.get()); + } + } + return result; +} + +bool Document::hasOptionalContent() const +{ + return (m_doc->doc->getOptContentConfig() && m_doc->doc->getOptContentConfig()->hasOCGs()); +} + +OptContentModel *Document::optionalContentModel() +{ + if (m_doc->m_optContentModel.isNull()) { + m_doc->m_optContentModel = new OptContentModel(m_doc->doc->getOptContentConfig(), nullptr); + } + return (OptContentModel *)m_doc->m_optContentModel; +} + +QStringList Document::scripts() const +{ + Catalog *catalog = m_doc->doc->getCatalog(); + const int numScripts = catalog->numJS(); + QStringList scripts; + for (int i = 0; i < numScripts; ++i) { + GooString *s = catalog->getJS(i); + if (s) { + scripts.append(UnicodeParsedString(s)); + delete s; + } + } + return scripts; +} + +bool Document::getPdfId(QByteArray *permanentId, QByteArray *updateId) const +{ + GooString gooPermanentId; + GooString gooUpdateId; + + if (!m_doc->doc->getID(permanentId ? &gooPermanentId : nullptr, updateId ? &gooUpdateId : nullptr)) { + return false; + } + + if (permanentId) { + *permanentId = gooPermanentId.c_str(); + } + if (updateId) { + *updateId = gooUpdateId.c_str(); + } + + return true; +} + +Document::FormType Document::formType() const +{ + switch (m_doc->doc->getCatalog()->getFormType()) { + case Catalog::NoForm: + return Document::NoForm; + case Catalog::AcroForm: + return Document::AcroForm; + case Catalog::XfaForm: + return Document::XfaForm; + } + + return Document::NoForm; // make gcc happy +} + +QVector Document::formCalculateOrder() const +{ + Form *form = m_doc->doc->getCatalog()->getForm(); + if (!form) { + return {}; + } + + QVector result; + const std::vector &calculateOrder = form->getCalculateOrder(); + for (Ref r : calculateOrder) { + FormWidget *w = form->findWidgetByRef(r); + if (w) { + result << w->getID(); + } + } + + return result; +} + +QVector Document::signatures() const +{ + QVector result; + + const std::vector<::FormFieldSignature *> pSignatures = m_doc->doc->getSignatureFields(); + + for (::FormFieldSignature *pSignature : pSignatures) { + ::FormWidget *fw = pSignature->getCreateWidget(); + ::Page *p = m_doc->doc->getPage(fw->getWidgetAnnotation()->getPageNum()); + result.append(new FormFieldSignature(m_doc, p, static_cast(fw))); + } + + return result; +} + +bool Document::xrefWasReconstructed() const +{ + return m_doc->xrefReconstructed; +} + +void Document::setXRefReconstructedCallback(const std::function &callback) +{ + m_doc->xrefReconstructedCallback = callback; +} + +QDateTime convertDate(const char *dateString) +{ + int year, mon, day, hour, min, sec, tzHours, tzMins; + char tz; + + GooString date(dateString); + if (parseDateString(&date, &year, &mon, &day, &hour, &min, &sec, &tz, &tzHours, &tzMins)) { + QDate d(year, mon, day); + QTime t(hour, min, sec); + if (d.isValid() && t.isValid()) { + QDateTime dt(d, t, Qt::UTC); + if (tz) { + // then we have some form of timezone + if ('Z' == tz) { + // We are already at UTC + } else if ('+' == tz) { + // local time is ahead of UTC + dt = dt.addSecs(-1 * ((tzHours * 60) + tzMins) * 60); + } else if ('-' == tz) { + // local time is behind UTC + dt = dt.addSecs(((tzHours * 60) + tzMins) * 60); + } else { + qWarning("unexpected tz val"); + } + } + return dt; + } + } + return QDateTime(); +} + +QDateTime convertDate(char *dateString) +{ + return convertDate((const char *)dateString); +} + +bool isCmsAvailable() +{ +#if defined(USE_CMS) + return true; +#else + return false; +#endif +} + +bool isOverprintPreviewAvailable() +{ + return true; +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-embeddedfile-private.h b/poppler-24.05.0/qt5/src/poppler-embeddedfile-private.h new file mode 100644 index 0000000000000000000000000000000000000000..fe53f410c908b461647e96059410feb7fddf4dd0 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-embeddedfile-private.h @@ -0,0 +1,40 @@ +/* poppler-embeddedfile-private.h: Qt interface to poppler + * Copyright (C) 2005, 2008, 2009, 2012, 2018, 2021, 2022, Albert Astals Cid + * Copyright (C) 2005, Brad Hards + * Copyright (C) 2008, 2011, Pino Toscano + * + * 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. + */ + +#ifndef POPPLER_EMBEDDEDFILE_PRIVATE_H +#define POPPLER_EMBEDDEDFILE_PRIVATE_H + +class FileSpec; + +namespace Poppler { + +class EmbeddedFileData +{ +public: + explicit EmbeddedFileData(std::unique_ptr &&fs); + + EmbFile *embFile() const; + + std::unique_ptr filespec; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-embeddedfile.cc b/poppler-24.05.0/qt5/src/poppler-embeddedfile.cc new file mode 100644 index 0000000000000000000000000000000000000000..ed105f75883964847a413228bcb561f0437f2942 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-embeddedfile.cc @@ -0,0 +1,117 @@ +/* poppler-document.cc: qt interface to poppler + * Copyright (C) 2005, 2008, 2009, 2012, 2013, 2018, 2022, Albert Astals Cid + * Copyright (C) 2005, Brad Hards + * Copyright (C) 2008, 2011, Pino Toscano + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela + * + * 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 +#include + +#include "Object.h" +#include "Stream.h" +#include "Catalog.h" + +#include "poppler-private.h" +#include "poppler-embeddedfile-private.h" + +namespace Poppler { + +EmbeddedFileData::EmbeddedFileData(std::unique_ptr &&fs) : filespec(std::move(fs)) { } + +EmbFile *EmbeddedFileData::embFile() const +{ + return filespec->isOk() ? filespec->getEmbeddedFile() : nullptr; +} + +EmbeddedFile::EmbeddedFile(EmbFile *embfile) : m_embeddedFile(nullptr) +{ + assert(!"You must not use this private constructor!"); +} + +EmbeddedFile::EmbeddedFile(EmbeddedFileData &dd) : m_embeddedFile(&dd) { } + +EmbeddedFile::~EmbeddedFile() +{ + delete m_embeddedFile; +} + +QString EmbeddedFile::name() const +{ + const GooString *goo = m_embeddedFile->filespec->getFileName(); + return goo ? UnicodeParsedString(goo) : QString(); +} + +QString EmbeddedFile::description() const +{ + const GooString *goo = m_embeddedFile->filespec->getDescription(); + return goo ? UnicodeParsedString(goo) : QString(); +} + +int EmbeddedFile::size() const +{ + return m_embeddedFile->embFile() ? m_embeddedFile->embFile()->size() : -1; +} + +QDateTime EmbeddedFile::modDate() const +{ + const GooString *goo = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->modDate() : nullptr; + return goo ? convertDate(goo->c_str()) : QDateTime(); +} + +QDateTime EmbeddedFile::createDate() const +{ + const GooString *goo = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->createDate() : nullptr; + return goo ? convertDate(goo->c_str()) : QDateTime(); +} + +QByteArray EmbeddedFile::checksum() const +{ + const GooString *goo = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->checksum() : nullptr; + return goo ? QByteArray::fromRawData(goo->c_str(), goo->getLength()) : QByteArray(); +} + +QString EmbeddedFile::mimeType() const +{ + const GooString *goo = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->mimeType() : nullptr; + return goo ? QString(goo->c_str()) : QString(); +} + +QByteArray EmbeddedFile::data() +{ + if (!isValid()) { + return QByteArray(); + } + Stream *stream = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->stream() : nullptr; + if (!stream) { + return QByteArray(); + } + + stream->reset(); + auto data = stream->toUnsignedChars(); + return QByteArray(reinterpret_cast(data.data()), data.size()); +} + +bool EmbeddedFile::isValid() const +{ + return m_embeddedFile->filespec->isOk(); +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-fontinfo.cc b/poppler-24.05.0/qt5/src/poppler-fontinfo.cc new file mode 100644 index 0000000000000000000000000000000000000000..6b167e0c04a0690f77e85f4dfff4709116490719 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-fontinfo.cc @@ -0,0 +1,154 @@ +/* poppler-qt.h: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2005, Tobias Koening + * Copyright (C) 2005, Brad Hards + * Copyright (C) 2005-2008, 2015, Albert Astals Cid + * Copyright (C) 2008, 2009, Pino Toscano + * Copyright (C) 2018, Adam Reichold + * Copyright (C) 2019, Oliver Sander + * Copyright (C) 2019, Jan Grulich + * + * 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-private.h" + +namespace Poppler { + +FontInfo::FontInfo() +{ + m_data = new FontInfoData(); +} + +FontInfo::FontInfo(const FontInfoData &fid) +{ + m_data = new FontInfoData(fid); +} + +FontInfo::FontInfo(const FontInfo &fi) +{ + m_data = new FontInfoData(*fi.m_data); +} + +FontInfo::~FontInfo() +{ + delete m_data; +} + +QString FontInfo::name() const +{ + return m_data->fontName; +} + +QString FontInfo::substituteName() const +{ + return m_data->fontSubstituteName; +} + +QString FontInfo::file() const +{ + return m_data->fontFile; +} + +bool FontInfo::isEmbedded() const +{ + return m_data->isEmbedded; +} + +bool FontInfo::isSubset() const +{ + return m_data->isSubset; +} + +FontInfo::Type FontInfo::type() const +{ + return m_data->type; +} + +QString FontInfo::typeName() const +{ + switch (type()) { + case unknown: + return QObject::tr("unknown"); + case Type1: + return QObject::tr("Type 1"); + case Type1C: + return QObject::tr("Type 1C"); + case Type3: + return QObject::tr("Type 3"); + case TrueType: + return QObject::tr("TrueType"); + case CIDType0: + return QObject::tr("CID Type 0"); + case CIDType0C: + return QObject::tr("CID Type 0C"); + case CIDTrueType: + return QObject::tr("CID TrueType"); + case Type1COT: + return QObject::tr("Type 1C (OpenType)"); + case TrueTypeOT: + return QObject::tr("TrueType (OpenType)"); + case CIDType0COT: + return QObject::tr("CID Type 0C (OpenType)"); + case CIDTrueTypeOT: + return QObject::tr("CID TrueType (OpenType)"); + } + return QObject::tr("Bug: unexpected font type. Notify poppler mailing list!"); +} + +FontInfo &FontInfo::operator=(const FontInfo &fi) +{ + if (this == &fi) { + return *this; + } + + *m_data = *fi.m_data; + return *this; +} + +FontIterator::FontIterator(int startPage, DocumentData *dd) : d(new FontIteratorData(startPage, dd)) { } + +FontIterator::~FontIterator() +{ + delete d; +} + +QList FontIterator::next() +{ + ++d->currentPage; + + QList fonts; + const std::vector<::FontInfo *> items = d->fontInfoScanner.scan(1); + fonts.reserve(items.size()); + for (::FontInfo *entry : items) { + fonts.append(FontInfo(FontInfoData(entry))); + delete entry; + } + + return fonts; +} + +bool FontIterator::hasNext() const +{ + return (d->currentPage + 1) < d->totalPages; +} + +int FontIterator::currentPage() const +{ + return d->currentPage; +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-form.cc b/poppler-24.05.0/qt5/src/poppler-form.cc new file mode 100644 index 0000000000000000000000000000000000000000..b15b4d4ae52557d0372fbc559f02c1259d368945 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-form.cc @@ -0,0 +1,1339 @@ +/* poppler-form.h: qt interface to poppler + * Copyright (C) 2007-2008, 2011, Pino Toscano + * Copyright (C) 2008, 2011, 2012, 2015-2023 Albert Astals Cid + * Copyright (C) 2011 Carlos Garcia Campos + * Copyright (C) 2012, Adam Reichold + * Copyright (C) 2016, Hanno Meyer-Thurow + * Copyright (C) 2017, Hans-Ulrich Jüttner + * Copyright (C) 2018, Andre Heinecke + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018 Chinmoy Ranjan Pradhan + * Copyright (C) 2018, 2020 Oliver Sander + * Copyright (C) 2019 João Netto + * Copyright (C) 2020 David García Garzón + * Copyright (C) 2020 Thorsten Behrens + * Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021 Georgiy Sgibnev . Work sponsored by lab50.net. + * Copyright (C) 2021 Theofilos Intzoglou + * Copyright (C) 2022 Alexander Sulfrian + * Copyright (C) 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela + * + * 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-form.h" + +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#ifdef ENABLE_NSS3 +# include +#endif + +#include "poppler-page-private.h" +#include "poppler-private.h" +#include "poppler-annotation-helper.h" + +#include +#include + +namespace { + +Qt::Alignment formTextAlignment(::FormWidget *fm) +{ + Qt::Alignment qtalign = Qt::AlignLeft; + switch (fm->getField()->getTextQuadding()) { + case VariableTextQuadding::centered: + qtalign = Qt::AlignHCenter; + break; + case VariableTextQuadding::rightJustified: + qtalign = Qt::AlignRight; + break; + case VariableTextQuadding::leftJustified: + qtalign = Qt::AlignLeft; + } + return qtalign; +} + +} + +namespace Poppler { + +FormFieldIcon::FormFieldIcon(FormFieldIconData *data) : d_ptr(data) { } + +FormFieldIcon::FormFieldIcon(const FormFieldIcon &ffIcon) +{ + d_ptr = new FormFieldIconData; + d_ptr->icon = ffIcon.d_ptr->icon; +} + +FormFieldIcon &FormFieldIcon::operator=(const FormFieldIcon &ffIcon) +{ + if (this != &ffIcon) { + delete d_ptr; + d_ptr = nullptr; + + d_ptr = new FormFieldIconData; + *d_ptr = *ffIcon.d_ptr; + } + + return *this; +} + +FormFieldIcon::~FormFieldIcon() +{ + delete d_ptr; +} + +FormField::FormField(std::unique_ptr dd) : m_formData(std::move(dd)) +{ + if (m_formData->page) { + const int rotation = m_formData->page->getRotate(); + // reading the coords + double left, top, right, bottom; + m_formData->fm->getRect(&left, &bottom, &right, &top); + // build a normalized transform matrix for this page at 100% scale + GfxState gfxState(72.0, 72.0, m_formData->page->getCropBox(), rotation, true); + const double *gfxCTM = gfxState.getCTM(); + double MTX[6]; + double pageWidth = m_formData->page->getCropWidth(); + double pageHeight = m_formData->page->getCropHeight(); + // landscape and seascape page rotation: be sure to use the correct (== rotated) page size + if (((rotation / 90) % 2) == 1) { + qSwap(pageWidth, pageHeight); + } + for (int i = 0; i < 6; i += 2) { + MTX[i] = gfxCTM[i] / pageWidth; + MTX[i + 1] = gfxCTM[i + 1] / pageHeight; + } + QPointF topLeft; + XPDFReader::transform(MTX, qMin(left, right), qMax(top, bottom), topLeft); + QPointF bottomRight; + XPDFReader::transform(MTX, qMax(left, right), qMin(top, bottom), bottomRight); + m_formData->box = QRectF(topLeft, QSizeF(bottomRight.x() - topLeft.x(), bottomRight.y() - topLeft.y())); + } +} + +FormField::~FormField() = default; + +QRectF FormField::rect() const +{ + return m_formData->box; +} + +int FormField::id() const +{ + return m_formData->fm->getID(); +} + +QString FormField::name() const +{ + QString name; + if (const GooString *goo = m_formData->fm->getPartialName()) { + name = UnicodeParsedString(goo); + } + return name; +} + +void FormField::setName(const QString &name) const +{ + GooString *goo = QStringToGooString(name); + m_formData->fm->setPartialName(*goo); + delete goo; +} + +QString FormField::fullyQualifiedName() const +{ + QString name; + if (GooString *goo = m_formData->fm->getFullyQualifiedName()) { + name = UnicodeParsedString(goo); + } + return name; +} + +QString FormField::uiName() const +{ + QString name; + if (const GooString *goo = m_formData->fm->getAlternateUiName()) { + name = UnicodeParsedString(goo); + } + return name; +} + +bool FormField::isReadOnly() const +{ + return m_formData->fm->isReadOnly(); +} + +void FormField::setReadOnly(bool value) +{ + m_formData->fm->setReadOnly(value); +} + +bool FormField::isVisible() const +{ + const unsigned int flags = m_formData->fm->getWidgetAnnotation()->getFlags(); + if (flags & Annot::flagHidden) { + return false; + } + if (flags & Annot::flagNoView) { + return false; + } + return true; +} + +void FormField::setVisible(bool value) +{ + unsigned int flags = m_formData->fm->getWidgetAnnotation()->getFlags(); + if (value) { + flags &= ~Annot::flagHidden; + flags &= ~Annot::flagNoView; + } else { + flags |= Annot::flagHidden; + } + m_formData->fm->getWidgetAnnotation()->setFlags(flags); +} + +bool FormField::isPrintable() const +{ + return (m_formData->fm->getWidgetAnnotation()->getFlags() & Annot::flagPrint); +} + +void FormField::setPrintable(bool value) +{ + unsigned int flags = m_formData->fm->getWidgetAnnotation()->getFlags(); + if (value) { + flags |= Annot::flagPrint; + } else { + flags &= ~Annot::flagPrint; + } + m_formData->fm->getWidgetAnnotation()->setFlags(flags); +} + +Link *FormField::activationAction() const +{ + Link *action = nullptr; + if (::LinkAction *act = m_formData->fm->getActivationAction()) { + action = PageData::convertLinkActionToLink(act, m_formData->doc, QRectF()); + } + return action; +} + +Link *FormField::additionalAction(AdditionalActionType type) const +{ + Annot::FormAdditionalActionsType actionType = Annot::actionFieldModified; + switch (type) { + case FieldModified: + actionType = Annot::actionFieldModified; + break; + case FormatField: + actionType = Annot::actionFormatField; + break; + case ValidateField: + actionType = Annot::actionValidateField; + break; + case CalculateField: + actionType = Annot::actionCalculateField; + break; + } + + Link *action = nullptr; + if (std::unique_ptr<::LinkAction> act = m_formData->fm->getAdditionalAction(actionType)) { + action = PageData::convertLinkActionToLink(act.get(), m_formData->doc, QRectF()); + } + return action; +} + +Link *FormField::additionalAction(Annotation::AdditionalActionType type) const +{ + ::AnnotWidget *w = m_formData->fm->getWidgetAnnotation(); + if (!w) { + return nullptr; + } + + const Annot::AdditionalActionsType actionType = toPopplerAdditionalActionType(type); + + Link *action = nullptr; + if (std::unique_ptr<::LinkAction> act = w->getAdditionalAction(actionType)) { + action = PageData::convertLinkActionToLink(act.get(), m_formData->doc, QRectF()); + } + return action; +} + +FormFieldButton::FormFieldButton(DocumentData *doc, ::Page *p, ::FormWidgetButton *w) : FormField(std::make_unique(doc, p, w)) { } + +FormFieldButton::~FormFieldButton() { } + +FormFieldButton::FormType FormFieldButton::type() const +{ + return FormField::FormButton; +} + +FormFieldButton::ButtonType FormFieldButton::buttonType() const +{ + FormWidgetButton *fwb = static_cast(m_formData->fm); + switch (fwb->getButtonType()) { + case formButtonCheck: + return FormFieldButton::CheckBox; + break; + case formButtonPush: + return FormFieldButton::Push; + break; + case formButtonRadio: + return FormFieldButton::Radio; + break; + } + return FormFieldButton::CheckBox; +} + +QString FormFieldButton::caption() const +{ + FormWidgetButton *fwb = static_cast(m_formData->fm); + QString ret; + if (fwb->getButtonType() == formButtonPush) { + Dict *dict = m_formData->fm->getObj()->getDict(); + Object obj1 = dict->lookup("MK"); + if (obj1.isDict()) { + AnnotAppearanceCharacs appearCharacs(obj1.getDict()); + if (appearCharacs.getNormalCaption()) { + ret = UnicodeParsedString(appearCharacs.getNormalCaption()); + } + } + } else { + if (const char *goo = fwb->getOnStr()) { + ret = QString::fromUtf8(goo); + } + } + return ret; +} + +FormFieldIcon FormFieldButton::icon() const +{ + FormWidgetButton *fwb = static_cast(m_formData->fm); + if (fwb->getButtonType() == formButtonPush) { + Dict *dict = m_formData->fm->getObj()->getDict(); + FormFieldIconData *data = new FormFieldIconData; + data->icon = dict; + return FormFieldIcon(data); + } + return FormFieldIcon(nullptr); +} + +void FormFieldButton::setIcon(const FormFieldIcon &icon) +{ + if (FormFieldIconData::getData(icon) == nullptr) { + return; + } + + FormWidgetButton *fwb = static_cast(m_formData->fm); + if (fwb->getButtonType() == formButtonPush) { + ::AnnotWidget *w = m_formData->fm->getWidgetAnnotation(); + FormFieldIconData *data = FormFieldIconData::getData(icon); + if (data->icon != nullptr) { + w->setNewAppearance(data->icon->lookup("AP")); + } + } +} + +bool FormFieldButton::state() const +{ + FormWidgetButton *fwb = static_cast(m_formData->fm); + return fwb->getState(); +} + +void FormFieldButton::setState(bool state) +{ + FormWidgetButton *fwb = static_cast(m_formData->fm); + fwb->setState((bool)state); +} + +QList FormFieldButton::siblings() const +{ + FormWidgetButton *fwb = static_cast(m_formData->fm); + ::FormFieldButton *ffb = static_cast<::FormFieldButton *>(fwb->getField()); + if (fwb->getButtonType() == formButtonPush) { + return QList(); + } + + QList ret; + for (int i = 0; i < ffb->getNumSiblings(); ++i) { + ::FormFieldButton *sibling = static_cast<::FormFieldButton *>(ffb->getSibling(i)); + for (int j = 0; j < sibling->getNumWidgets(); ++j) { + FormWidget *w = sibling->getWidget(j); + if (w) { + ret.append(w->getID()); + } + } + } + + return ret; +} + +FormFieldText::FormFieldText(DocumentData *doc, ::Page *p, ::FormWidgetText *w) : FormField(std::make_unique(doc, p, w)) { } + +FormFieldText::~FormFieldText() { } + +FormField::FormType FormFieldText::type() const +{ + return FormField::FormText; +} + +FormFieldText::TextType FormFieldText::textType() const +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + if (fwt->isFileSelect()) { + return FormFieldText::FileSelect; + } else if (fwt->isMultiline()) { + return FormFieldText::Multiline; + } + return FormFieldText::Normal; +} + +QString FormFieldText::text() const +{ + const GooString *goo = static_cast(m_formData->fm)->getContent(); + return UnicodeParsedString(goo); +} + +void FormFieldText::setText(const QString &text) +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + GooString *goo = QStringToUnicodeGooString(text); + fwt->setContent(goo); + delete goo; +} + +void FormFieldText::setAppearanceText(const QString &text) +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + GooString *goo = QStringToUnicodeGooString(text); + fwt->setAppearanceContent(goo); + delete goo; +} + +bool FormFieldText::isPassword() const +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + return fwt->isPassword(); +} + +bool FormFieldText::isRichText() const +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + return fwt->isRichText(); +} + +int FormFieldText::maximumLength() const +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + const int maxlen = fwt->getMaxLen(); + return maxlen > 0 ? maxlen : -1; +} + +Qt::Alignment FormFieldText::textAlignment() const +{ + return formTextAlignment(m_formData->fm); +} + +bool FormFieldText::canBeSpellChecked() const +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + return !fwt->noSpellCheck(); +} + +double FormFieldText::getFontSize() const +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + return fwt->getTextFontSize(); +} + +void FormFieldText::setFontSize(int fontSize) +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + fwt->setTextFontSize(fontSize); +} + +FormFieldChoice::FormFieldChoice(DocumentData *doc, ::Page *p, ::FormWidgetChoice *w) : FormField(std::make_unique(doc, p, w)) { } + +FormFieldChoice::~FormFieldChoice() { } + +FormFieldChoice::FormType FormFieldChoice::type() const +{ + return FormField::FormChoice; +} + +FormFieldChoice::ChoiceType FormFieldChoice::choiceType() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + if (fwc->isCombo()) { + return FormFieldChoice::ComboBox; + } + return FormFieldChoice::ListBox; +} + +QStringList FormFieldChoice::choices() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + QStringList ret; + int num = fwc->getNumChoices(); + ret.reserve(num); + for (int i = 0; i < num; ++i) { + ret.append(UnicodeParsedString(fwc->getChoice(i))); + } + return ret; +} + +QVector> FormFieldChoice::choicesWithExportValues() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + QVector> ret; + const int num = fwc->getNumChoices(); + ret.reserve(num); + for (int i = 0; i < num; ++i) { + const QString display = UnicodeParsedString(fwc->getChoice(i)); + const GooString *exportValueG = fwc->getExportVal(i); + const QString exportValue = exportValueG ? UnicodeParsedString(exportValueG) : display; + ret.append({ display, exportValue }); + } + return ret; +} + +bool FormFieldChoice::isEditable() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + return fwc->isCombo() ? fwc->hasEdit() : false; +} + +bool FormFieldChoice::multiSelect() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + return !fwc->isCombo() ? fwc->isMultiSelect() : false; +} + +QList FormFieldChoice::currentChoices() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + int num = fwc->getNumChoices(); + QList choices; + for (int i = 0; i < num; ++i) { + if (fwc->isSelected(i)) { + choices.append(i); + } + } + return choices; +} + +void FormFieldChoice::setCurrentChoices(const QList &choice) +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + fwc->deselectAll(); + for (int i = 0; i < choice.count(); ++i) { + fwc->select(choice.at(i)); + } +} + +QString FormFieldChoice::editChoice() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + + if (fwc->isCombo() && fwc->hasEdit()) { + return UnicodeParsedString(fwc->getEditChoice()); + } else { + return QString(); + } +} + +void FormFieldChoice::setEditChoice(const QString &text) +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + + if (fwc->isCombo() && fwc->hasEdit()) { + GooString *goo = QStringToUnicodeGooString(text); + fwc->setEditChoice(goo); + delete goo; + } +} + +Qt::Alignment FormFieldChoice::textAlignment() const +{ + return formTextAlignment(m_formData->fm); +} + +bool FormFieldChoice::canBeSpellChecked() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + return !fwc->noSpellCheck(); +} + +class CertificateInfoPrivate +{ +public: + struct EntityInfo + { + QString common_name; + QString email_address; + QString org_name; + QString distinguished_name; + }; + + EntityInfo issuer_info; + EntityInfo subject_info; + QString nick_name; + QByteArray certificate_der; + QByteArray serial_number; + QByteArray public_key; + QDateTime validity_start; + QDateTime validity_end; + int public_key_type; + int public_key_strength; + int ku_extensions; + int version; + bool is_self_signed; + bool is_null; + CertificateInfo::KeyLocation keyLocation; +}; + +CertificateInfo::CertificateInfo() : d_ptr(new CertificateInfoPrivate()) +{ + d_ptr->is_null = true; +} + +CertificateInfo::CertificateInfo(CertificateInfoPrivate *priv) : d_ptr(priv) { } + +CertificateInfo::CertificateInfo(const CertificateInfo &other) : d_ptr(other.d_ptr) { } + +CertificateInfo::~CertificateInfo() = default; + +CertificateInfo &CertificateInfo::operator=(const CertificateInfo &other) +{ + if (this != &other) { + d_ptr = other.d_ptr; + } + + return *this; +} + +bool CertificateInfo::isNull() const +{ + Q_D(const CertificateInfo); + return d->is_null; +} + +int CertificateInfo::version() const +{ + Q_D(const CertificateInfo); + return d->version; +} + +QByteArray CertificateInfo::serialNumber() const +{ + Q_D(const CertificateInfo); + return d->serial_number; +} + +QString CertificateInfo::issuerInfo(EntityInfoKey key) const +{ + Q_D(const CertificateInfo); + switch (key) { + case CommonName: + return d->issuer_info.common_name; + case DistinguishedName: + return d->issuer_info.distinguished_name; + case EmailAddress: + return d->issuer_info.email_address; + case Organization: + return d->issuer_info.org_name; + default: + return QString(); + } +} + +QString CertificateInfo::subjectInfo(EntityInfoKey key) const +{ + Q_D(const CertificateInfo); + switch (key) { + case CommonName: + return d->subject_info.common_name; + case DistinguishedName: + return d->subject_info.distinguished_name; + case EmailAddress: + return d->subject_info.email_address; + case Organization: + return d->subject_info.org_name; + default: + return QString(); + } +} + +QString CertificateInfo::nickName() const +{ + Q_D(const CertificateInfo); + return d->nick_name; +} + +QDateTime CertificateInfo::validityStart() const +{ + Q_D(const CertificateInfo); + return d->validity_start; +} + +QDateTime CertificateInfo::validityEnd() const +{ + Q_D(const CertificateInfo); + return d->validity_end; +} + +CertificateInfo::KeyUsageExtensions CertificateInfo::keyUsageExtensions() const +{ + Q_D(const CertificateInfo); + + KeyUsageExtensions kuExtensions = KuNone; + if (d->ku_extensions & KU_DIGITAL_SIGNATURE) { + kuExtensions |= KuDigitalSignature; + } + if (d->ku_extensions & KU_NON_REPUDIATION) { + kuExtensions |= KuNonRepudiation; + } + if (d->ku_extensions & KU_KEY_ENCIPHERMENT) { + kuExtensions |= KuKeyEncipherment; + } + if (d->ku_extensions & KU_DATA_ENCIPHERMENT) { + kuExtensions |= KuDataEncipherment; + } + if (d->ku_extensions & KU_KEY_AGREEMENT) { + kuExtensions |= KuKeyAgreement; + } + if (d->ku_extensions & KU_KEY_CERT_SIGN) { + kuExtensions |= KuKeyCertSign; + } + if (d->ku_extensions & KU_CRL_SIGN) { + kuExtensions |= KuClrSign; + } + if (d->ku_extensions & KU_ENCIPHER_ONLY) { + kuExtensions |= KuEncipherOnly; + } + + return kuExtensions; +} + +CertificateInfo::KeyLocation CertificateInfo::keyLocation() const +{ + Q_D(const CertificateInfo); + return d->keyLocation; +} + +QByteArray CertificateInfo::publicKey() const +{ + Q_D(const CertificateInfo); + return d->public_key; +} + +CertificateInfo::PublicKeyType CertificateInfo::publicKeyType() const +{ + Q_D(const CertificateInfo); + switch (d->public_key_type) { + case RSAKEY: + return RsaKey; + case DSAKEY: + return DsaKey; + case ECKEY: + return EcKey; + default: + return OtherKey; + } +} + +int CertificateInfo::publicKeyStrength() const +{ + Q_D(const CertificateInfo); + return d->public_key_strength; +} + +bool CertificateInfo::isSelfSigned() const +{ + Q_D(const CertificateInfo); + return d->is_self_signed; +} + +QByteArray CertificateInfo::certificateData() const +{ + Q_D(const CertificateInfo); + return d->certificate_der; +} + +bool CertificateInfo::checkPassword(const QString &password) const +{ +#ifdef ENABLE_SIGNATURES + auto backend = CryptoSign::Factory::createActive(); + if (!backend) { + return false; + } + Q_D(const CertificateInfo); + auto sigHandler = backend->createSigningHandler(d->nick_name.toStdString(), HashAlgorithm::Sha256); + unsigned char buffer[5]; + memcpy(buffer, "test", 5); + sigHandler->addData(buffer, 5); + std::optional tmpSignature = sigHandler->signDetached(password.toStdString()); + return tmpSignature.has_value(); +#else + return false; +#endif +} + +class SignatureValidationInfoPrivate +{ +public: + explicit SignatureValidationInfoPrivate(CertificateInfo &&ci) : cert_info(ci) { } + + SignatureValidationInfo::SignatureStatus signature_status; + SignatureValidationInfo::CertificateStatus certificate_status; + CertificateInfo cert_info; + + QByteArray signature; + QString signer_name; + QString signer_subject_dn; + QString location; + QString reason; + HashAlgorithm hash_algorithm; + time_t signing_time; + QList range_bounds; + qint64 docLength; +}; + +SignatureValidationInfo::SignatureValidationInfo(SignatureValidationInfoPrivate *priv) : d_ptr(priv) { } + +SignatureValidationInfo::SignatureValidationInfo(const SignatureValidationInfo &other) : d_ptr(other.d_ptr) { } + +SignatureValidationInfo::~SignatureValidationInfo() { } + +SignatureValidationInfo::SignatureStatus SignatureValidationInfo::signatureStatus() const +{ + Q_D(const SignatureValidationInfo); + return d->signature_status; +} + +SignatureValidationInfo::CertificateStatus SignatureValidationInfo::certificateStatus() const +{ + Q_D(const SignatureValidationInfo); + return d->certificate_status; +} + +QString SignatureValidationInfo::signerName() const +{ + Q_D(const SignatureValidationInfo); + return d->signer_name; +} + +QString SignatureValidationInfo::signerSubjectDN() const +{ + Q_D(const SignatureValidationInfo); + return d->signer_subject_dn; +} + +QString SignatureValidationInfo::location() const +{ + Q_D(const SignatureValidationInfo); + return d->location; +} + +QString SignatureValidationInfo::reason() const +{ + Q_D(const SignatureValidationInfo); + return d->reason; +} + +SignatureValidationInfo::HashAlgorithm SignatureValidationInfo::hashAlgorithm() const +{ +#ifdef ENABLE_SIGNATURES + Q_D(const SignatureValidationInfo); + + switch (d->hash_algorithm) { + case ::HashAlgorithm::Md2: + return HashAlgorithmMd2; + case ::HashAlgorithm::Md5: + return HashAlgorithmMd5; + case ::HashAlgorithm::Sha1: + return HashAlgorithmSha1; + case ::HashAlgorithm::Sha256: + return HashAlgorithmSha256; + case ::HashAlgorithm::Sha384: + return HashAlgorithmSha384; + case ::HashAlgorithm::Sha512: + return HashAlgorithmSha512; + case ::HashAlgorithm::Sha224: + return HashAlgorithmSha224; + case ::HashAlgorithm::Unknown: + return HashAlgorithmUnknown; + } +#endif + return HashAlgorithmUnknown; +} + +time_t SignatureValidationInfo::signingTime() const +{ + Q_D(const SignatureValidationInfo); + return d->signing_time; +} + +QByteArray SignatureValidationInfo::signature() const +{ + Q_D(const SignatureValidationInfo); + return d->signature; +} + +QList SignatureValidationInfo::signedRangeBounds() const +{ + Q_D(const SignatureValidationInfo); + return d->range_bounds; +} + +bool SignatureValidationInfo::signsTotalDocument() const +{ + Q_D(const SignatureValidationInfo); + if (d->range_bounds.size() == 4 && d->range_bounds.value(0) == 0 && d->range_bounds.value(1) >= 0 && d->range_bounds.value(2) > d->range_bounds.value(1) && d->range_bounds.value(3) >= d->range_bounds.value(2)) { + // The range from d->range_bounds.value(1) to d->range_bounds.value(2) is + // not authenticated by the signature and should only contain the signature + // itself padded with 0 bytes. This has been checked in readSignature(). + // If it failed, d->signature is empty. + // A potential range after d->range_bounds.value(3) would be also not + // authenticated. Therefore d->range_bounds.value(3) should coincide with + // the end of the document. + if (d->docLength == d->range_bounds.value(3) && !d->signature.isEmpty()) { + return true; + } + } + return false; +} + +CertificateInfo SignatureValidationInfo::certificateInfo() const +{ + Q_D(const SignatureValidationInfo); + return d->cert_info; +} + +SignatureValidationInfo &SignatureValidationInfo::operator=(const SignatureValidationInfo &other) +{ + if (this != &other) { + d_ptr = other.d_ptr; + } + + return *this; +} + +FormFieldSignature::FormFieldSignature(DocumentData *doc, ::Page *p, ::FormWidgetSignature *w) : FormField(std::make_unique(doc, p, w)) { } + +FormFieldSignature::~FormFieldSignature() { } + +FormField::FormType FormFieldSignature::type() const +{ + return FormField::FormSignature; +} + +FormFieldSignature::SignatureType FormFieldSignature::signatureType() const +{ + SignatureType sigType = AdbePkcs7detached; + FormWidgetSignature *fws = static_cast(m_formData->fm); + switch (fws->signatureType()) { + case adbe_pkcs7_sha1: + sigType = AdbePkcs7sha1; + break; + case adbe_pkcs7_detached: + sigType = AdbePkcs7detached; + break; + case ETSI_CAdES_detached: + sigType = EtsiCAdESdetached; + break; + case unknown_signature_type: + sigType = UnknownSignatureType; + break; + case unsigned_signature_field: + sigType = UnsignedSignature; + break; + } + return sigType; +} + +SignatureValidationInfo FormFieldSignature::validate(ValidateOptions opt) const +{ + auto tempResult = validateAsync(opt); + tempResult.first.d_ptr->certificate_status = validateResult(); + return tempResult.first; +} + +static CertificateInfo::KeyLocation fromPopplerCore(KeyLocation location) +{ + switch (location) { + case KeyLocation::Computer: + return CertificateInfo::KeyLocation::Computer; + case KeyLocation::Other: + return CertificateInfo::KeyLocation::Other; + case KeyLocation::Unknown: + return CertificateInfo::KeyLocation::Unknown; + case KeyLocation::HardwareToken: + return CertificateInfo::KeyLocation::HardwareToken; + } + return CertificateInfo::KeyLocation::Unknown; +} + +static CertificateInfoPrivate *createCertificateInfoPrivate(const X509CertificateInfo *ci) +{ + CertificateInfoPrivate *certPriv = new CertificateInfoPrivate; + certPriv->is_null = true; + if (ci) { + certPriv->version = ci->getVersion(); + certPriv->ku_extensions = ci->getKeyUsageExtensions(); + certPriv->keyLocation = fromPopplerCore(ci->getKeyLocation()); + + const GooString &certSerial = ci->getSerialNumber(); + certPriv->serial_number = QByteArray(certSerial.c_str(), certSerial.getLength()); + + const X509CertificateInfo::EntityInfo &issuerInfo = ci->getIssuerInfo(); + certPriv->issuer_info.common_name = issuerInfo.commonName.c_str(); + certPriv->issuer_info.distinguished_name = issuerInfo.distinguishedName.c_str(); + certPriv->issuer_info.email_address = issuerInfo.email.c_str(); + certPriv->issuer_info.org_name = issuerInfo.organization.c_str(); + + const X509CertificateInfo::EntityInfo &subjectInfo = ci->getSubjectInfo(); + certPriv->subject_info.common_name = subjectInfo.commonName.c_str(); + certPriv->subject_info.distinguished_name = subjectInfo.distinguishedName.c_str(); + certPriv->subject_info.email_address = subjectInfo.email.c_str(); + certPriv->subject_info.org_name = subjectInfo.organization.c_str(); + + certPriv->nick_name = ci->getNickName().c_str(); + + X509CertificateInfo::Validity certValidity = ci->getValidity(); + certPriv->validity_start = QDateTime::fromSecsSinceEpoch(certValidity.notBefore, Qt::UTC); + certPriv->validity_end = QDateTime::fromSecsSinceEpoch(certValidity.notAfter, Qt::UTC); + + const X509CertificateInfo::PublicKeyInfo &pkInfo = ci->getPublicKeyInfo(); + certPriv->public_key = QByteArray(pkInfo.publicKey.c_str(), pkInfo.publicKey.getLength()); + certPriv->public_key_type = static_cast(pkInfo.publicKeyType); + certPriv->public_key_strength = pkInfo.publicKeyStrength; + + const GooString &certDer = ci->getCertificateDER(); + certPriv->certificate_der = QByteArray(certDer.c_str(), certDer.getLength()); + + certPriv->is_null = false; + } + + return certPriv; +} + +static SignatureValidationInfo::CertificateStatus fromInternal(CertificateValidationStatus status) +{ + switch (status) { + case CERTIFICATE_TRUSTED: + return SignatureValidationInfo::CertificateTrusted; + case CERTIFICATE_UNTRUSTED_ISSUER: + return SignatureValidationInfo::CertificateUntrustedIssuer; + case CERTIFICATE_UNKNOWN_ISSUER: + return SignatureValidationInfo::CertificateUnknownIssuer; + case CERTIFICATE_REVOKED: + return SignatureValidationInfo::CertificateRevoked; + case CERTIFICATE_EXPIRED: + return SignatureValidationInfo::CertificateExpired; + default: + case CERTIFICATE_GENERIC_ERROR: + return SignatureValidationInfo::CertificateGenericError; + case CERTIFICATE_NOT_VERIFIED: + return SignatureValidationInfo::CertificateNotVerified; + } +} + +static SignatureValidationInfo fromInternal(SignatureInfo *si, FormWidgetSignature *fws) +{ + // get certificate info + const X509CertificateInfo *ci = si->getCertificateInfo(); + CertificateInfoPrivate *certPriv = createCertificateInfoPrivate(ci); + + SignatureValidationInfoPrivate *priv = new SignatureValidationInfoPrivate(CertificateInfo(certPriv)); + switch (si->getSignatureValStatus()) { + case SIGNATURE_VALID: + priv->signature_status = SignatureValidationInfo::SignatureValid; + break; + case SIGNATURE_INVALID: + priv->signature_status = SignatureValidationInfo::SignatureInvalid; + break; + case SIGNATURE_DIGEST_MISMATCH: + priv->signature_status = SignatureValidationInfo::SignatureDigestMismatch; + break; + case SIGNATURE_DECODING_ERROR: + priv->signature_status = SignatureValidationInfo::SignatureDecodingError; + break; + default: + case SIGNATURE_GENERIC_ERROR: + priv->signature_status = SignatureValidationInfo::SignatureGenericError; + break; + case SIGNATURE_NOT_FOUND: + priv->signature_status = SignatureValidationInfo::SignatureNotFound; + break; + case SIGNATURE_NOT_VERIFIED: + priv->signature_status = SignatureValidationInfo::SignatureNotVerified; + break; + } + priv->certificate_status = SignatureValidationInfo::CertificateVerificationInProgress; + priv->signer_name = QString::fromStdString(si->getSignerName()); + priv->signer_subject_dn = QString::fromStdString(si->getSubjectDN()); + priv->hash_algorithm = si->getHashAlgorithm(); + priv->location = UnicodeParsedString(si->getLocation().toStr()); + priv->reason = UnicodeParsedString(si->getReason().toStr()); + + priv->signing_time = si->getSigningTime(); + const std::vector ranges = fws->getSignedRangeBounds(); + if (!ranges.empty()) { + for (Goffset bound : ranges) { + priv->range_bounds.append(bound); + } + } + const std::optional checkedSignature = fws->getCheckedSignature(&priv->docLength); + if (priv->range_bounds.size() == 4 && checkedSignature) { + priv->signature = QByteArray::fromHex(checkedSignature->c_str()); + } + + return SignatureValidationInfo(priv); +} + +SignatureValidationInfo FormFieldSignature::validate(int opt, const QDateTime &validationTime) const +{ + auto tempResult = validateAsync(static_cast(opt), validationTime); + tempResult.first.d_ptr->certificate_status = validateResult(); + return tempResult.first; +} + +class AsyncObjectPrivate +{ /*Currently unused. Created for abi future proofing*/ +}; + +AsyncObject::AsyncObject() : QObject(nullptr), d {} { } + +AsyncObject::~AsyncObject() = default; + +std::pair> FormFieldSignature::validateAsync(ValidateOptions opt, const QDateTime &validationTime) const +{ + auto object = std::make_shared(); + FormWidgetSignature *fws = static_cast(m_formData->fm); + const time_t validationTimeT = validationTime.isValid() ? validationTime.toSecsSinceEpoch() : -1; + SignatureInfo *si = fws->validateSignatureAsync(opt & ValidateVerifyCertificate, opt & ValidateForceRevalidation, validationTimeT, !(opt & ValidateWithoutOCSPRevocationCheck), opt & ValidateUseAIACertFetch, + [obj = std::weak_ptr(object)]() { + if (auto l = obj.lock()) { + // We need to roundtrip over the eventloop + // to ensure callers have a chance of connecting to AsyncObject::done + QMetaObject::invokeMethod( + l.get(), + [innerObj = std::weak_ptr(l)]() { + if (auto innerLocked = innerObj.lock()) { + emit innerLocked->done(); + } + }, + Qt::QueuedConnection); + } + }); + + return { fromInternal(si, fws), object }; +} + +SignatureValidationInfo::CertificateStatus FormFieldSignature::validateResult() const +{ + return fromInternal(static_cast(m_formData->fm)->validateSignatureResult()); +} + +FormFieldSignature::SigningResult FormFieldSignature::sign(const QString &outputFileName, const PDFConverter::NewSignatureData &data) const +{ + FormWidgetSignature *fws = static_cast(m_formData->fm); + if (fws->signatureType() != unsigned_signature_field) { + return FieldAlreadySigned; + } + + Goffset file_size = 0; + const std::optional sig = fws->getCheckedSignature(&file_size); + if (sig) { + // the above unsigned_signature_field check + // should already catch this, but double check + return FieldAlreadySigned; + } + const auto reason = std::unique_ptr(data.reason().isEmpty() ? nullptr : QStringToUnicodeGooString(data.reason())); + const auto location = std::unique_ptr(data.location().isEmpty() ? nullptr : QStringToUnicodeGooString(data.location())); + const auto ownerPwd = std::optional(data.documentOwnerPassword().constData()); + const auto userPwd = std::optional(data.documentUserPassword().constData()); + const auto gSignatureText = std::unique_ptr(QStringToUnicodeGooString(data.signatureText())); + const auto gSignatureLeftText = std::unique_ptr(QStringToUnicodeGooString(data.signatureLeftText())); + + const bool success = fws->signDocumentWithAppearance(outputFileName.toStdString(), data.certNickname().toStdString(), data.password().toStdString(), reason.get(), location.get(), ownerPwd, userPwd, *gSignatureText, *gSignatureLeftText, + data.fontSize(), data.leftFontSize(), convertQColor(data.fontColor()), data.borderWidth(), convertQColor(data.borderColor()), convertQColor(data.backgroundColor())); + + return success ? SigningSuccess : GenericSigningError; +} + +bool hasNSSSupport() +{ +#ifdef ENABLE_NSS3 + return true; +#else + return false; +#endif +} + +QVector getAvailableSigningCertificates() +{ + auto backend = CryptoSign::Factory::createActive(); + if (!backend) { + return {}; + } + QVector vReturnCerts; + std::vector> vCerts = backend->getAvailableSigningCertificates(); + + for (auto &cert : vCerts) { + CertificateInfoPrivate *certPriv = createCertificateInfoPrivate(cert.get()); + vReturnCerts.append(CertificateInfo(certPriv)); + } + + return vReturnCerts; +} + +static std::optional convertToFrontend(std::optional type) +{ + if (!type) { + return std::nullopt; + } + switch (type.value()) { + case CryptoSign::Backend::Type::NSS3: + return CryptoSignBackend::NSS; + case CryptoSign::Backend::Type::GPGME: + return CryptoSignBackend::GPG; + } + return std::nullopt; +} + +static std::optional convertToBackend(std::optional backend) +{ + if (!backend) { + return std::nullopt; + } + switch (backend.value()) { + case CryptoSignBackend::NSS: + return CryptoSign::Backend::Type::NSS3; + case CryptoSignBackend::GPG: + return CryptoSign::Backend::Type::GPGME; + } + return std::nullopt; +} + +QVector availableCryptoSignBackends() +{ + QVector backends; + for (auto &backend : CryptoSign::Factory::getAvailable()) { + auto converted = convertToFrontend(backend); + if (converted) { + backends.push_back(converted.value()); + } + } + return backends; +} + +std::optional activeCryptoSignBackend() +{ + return convertToFrontend(CryptoSign::Factory::getActive()); +} + +bool setActiveCryptoSignBackend(CryptoSignBackend backend) +{ + auto available = availableCryptoSignBackends(); + if (!available.contains(backend)) { + return false; + } + auto converted = convertToBackend(backend); + if (!converted) { + return false; + } + CryptoSign::Factory::setPreferredBackend(converted.value()); + return activeCryptoSignBackend() == backend; +} + +static bool hasNSSBackendFeature(CryptoSignBackendFeature feature) +{ + switch (feature) { + case CryptoSignBackendFeature::BackendAsksPassphrase: + return false; + } + return false; +} + +static bool hasGPGBackendFeature(CryptoSignBackendFeature feature) +{ + switch (feature) { + case CryptoSignBackendFeature::BackendAsksPassphrase: + return true; + } + return false; +} + +bool hasCryptoSignBackendFeature(CryptoSignBackend backend, CryptoSignBackendFeature feature) +{ + switch (backend) { + case CryptoSignBackend::NSS: + return hasNSSBackendFeature(feature); + case CryptoSignBackend::GPG: + return hasGPGBackendFeature(feature); + } + return false; +} + +QString POPPLER_QT5_EXPORT getNSSDir() +{ +#ifdef ENABLE_NSS3 + return QString::fromLocal8Bit(NSSSignatureConfiguration::getNSSDir().c_str()); +#else + return QString(); +#endif +} + +void setNSSDir(const QString &path) +{ +#ifdef ENABLE_NSS3 + if (path.isEmpty()) { + return; + } + + GooString *goo = QStringToGooString(path); + NSSSignatureConfiguration::setNSSDir(*goo); + delete goo; +#else + (void)path; +#endif +} + +namespace { +std::function nssPasswordCall; +} + +void setNSSPasswordCallback(const std::function &f) +{ +#ifdef ENABLE_NSS3 + NSSSignatureConfiguration::setNSSPasswordCallback(f); +#else + qWarning() << "setNSSPasswordCallback called but this poppler is built without NSS support"; + (void)f; +#endif +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-form.h b/poppler-24.05.0/qt5/src/poppler-form.h new file mode 100644 index 0000000000000000000000000000000000000000..3f2a1e9ea63207018e6899b63e0cd04dfc173de6 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-form.h @@ -0,0 +1,1031 @@ +/* poppler-form.h: qt interface to poppler + * Copyright (C) 2007-2008, Pino Toscano + * Copyright (C) 2008, 2011, 2016, 2017, 2019-2022, Albert Astals Cid + * Copyright (C) 2012, Adam Reichold + * Copyright (C) 2016, Hanno Meyer-Thurow + * Copyright (C) 2017, Hans-Ulrich Jüttner + * Copyright (C) 2017, Tobias C. Berner + * Copyright (C) 2018, Andre Heinecke + * Copyright (C) 2018, Chinmoy Ranjan Pradhan + * Copyright (C) 2018, Oliver Sander + * Copyright (C) 2019 João Netto + * Copyright (C) 2019, Adrian Johnson + * Copyright (C) 2020, Thorsten Behrens + * Copyright (C) 2020, Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021, Theofilos Intzoglou + * Copyright (C) 2023, 2024, g10 Code GmbH, Author: Sune Stolborg Vuorela + * + * 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. + */ + +#ifndef _POPPLER_QT5_FORM_H_ +#define _POPPLER_QT5_FORM_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "poppler-export.h" +#include "poppler-annotation.h" +#include "poppler-qt5.h" + +class Object; +class Page; +class FormWidget; +class FormWidgetButton; +class FormWidgetText; +class FormWidgetChoice; +class FormWidgetSignature; + +namespace Poppler { + +class DocumentData; +class Link; + +class FormFieldData; +class FormFieldIconData; + +/** + The class containing the appearance information + + \since 0.79 + */ + +class POPPLER_QT5_EXPORT FormFieldIcon +{ + + friend class FormFieldIconData; + +public: + explicit FormFieldIcon(FormFieldIconData *data); + FormFieldIcon(const FormFieldIcon &ffIcon); + ~FormFieldIcon(); + + FormFieldIcon &operator=(const FormFieldIcon &ffIcon); + +private: + FormFieldIconData *d_ptr; +}; +/** + The base class representing a form field. + + \since 0.6 + */ +class POPPLER_QT5_EXPORT FormField +{ + + friend class FormFieldData; + +public: + /** + The different types of form field. + */ + enum FormType + { + FormButton, ///< A button field. See \ref Poppler::FormFieldButton::ButtonType "ButtonType" + FormText, ///< A text field. See \ref Poppler::FormFieldText::TextType "TextType" + FormChoice, ///< A single choice field. See \ref Poppler::FormFieldChoice::ChoiceType "ChoiceType" + FormSignature ///< A signature field. + }; + + virtual ~FormField(); + + /** + The type of the field. + */ + virtual FormType type() const = 0; + + /** + \return The size of the field, in normalized coordinates, i.e. + [0..1] with regard to the dimensions (cropbox) of the page + */ + QRectF rect() const; + + /** + The ID of the field. + */ + int id() const; + + /** + The internal name (T) of the field. + */ + QString name() const; + + /** + Sets the internal name (T) of the field. + \since 0.51 + */ + void setName(const QString &name) const; + + /** + The internal fully qualified name of the field. + \since 0.18 + */ + QString fullyQualifiedName() const; + + /** + The name of the field to be used in user interface (eg messages to + the user). + */ + QString uiName() const; + + /** + Whether this form field is read-only. + */ + bool isReadOnly() const; + + /** + Set whether this form field is read-only. + \since 0.64 + */ + void setReadOnly(bool value); + + /** + Whether this form field is visible. + */ + bool isVisible() const; + + /** + Set whether this form field is visible. + \since 0.64 + */ + void setVisible(bool value); + + /** + Whether this field is printable. + \since 0.79 + */ + bool isPrintable() const; + + /** + Set whether this field is printable. + \since 0.79 + */ + void setPrintable(bool value); + + /** + The activation action of this form field. + + \note It may be null. + */ + Link *activationAction() const; + + /** + * Describes the flags from the form 'AA' dictionary. + * + * \since 0.53 + */ + enum AdditionalActionType + { + FieldModified, ///< A JavaScript action to be performed when the user modifies the field + FormatField, ///< A JavaScript action to be performed before the field is formatted to display its value + ValidateField, ///< A JavaScript action to be performed when the field value changes + CalculateField, ///< A JavaScript action to be performed when the field needs to be recalculated + }; + /** + * Returns a given form additional action + * + * \since 0.53 + */ + Link *additionalAction(AdditionalActionType type) const; + + /** + * Returns a given widget annotation additional action + * + * \since 0.65 + */ + Link *additionalAction(Annotation::AdditionalActionType type) const; + +protected: + /// \cond PRIVATE + explicit FormField(std::unique_ptr dd); + + std::unique_ptr m_formData; + /// \endcond + +private: + Q_DISABLE_COPY(FormField) +}; + +/** + A form field that represents a "button". + + \since 0.8 + */ +class POPPLER_QT5_EXPORT FormFieldButton : public FormField +{ +public: + /** + * The types of button field. + */ + enum ButtonType + { + Push, ///< A simple push button. + CheckBox, ///< A check box. + Radio ///< A radio button. + }; + + /// \cond PRIVATE + FormFieldButton(DocumentData *doc, ::Page *p, ::FormWidgetButton *w); + /// \endcond + ~FormFieldButton() override; + + FormType type() const override; + + /** + The particular type of the button field. + */ + ButtonType buttonType() const; + + /** + * The caption to be used for the button. + */ + QString caption() const; + + /** + * Gets the icon used by the button + * + * \since 0.79 + */ + FormFieldIcon icon() const; + + /** + * Sets a new icon for the button, it has to be a icon + * returned by FormFieldButton::icon. + * + * \since 0.79 + */ + void setIcon(const FormFieldIcon &icon); + + /** + The state of the button. + */ + bool state() const; + + /** + Sets the state of the button to the new \p state . + */ + void setState(bool state); + + /** + The list with the IDs of siblings (ie, buttons belonging to the same + group as the current one. + + Valid only for \ref Radio buttons, an empty list otherwise. + */ + QList siblings() const; + +private: + Q_DISABLE_COPY(FormFieldButton) +}; + +/** + A form field that represents a text input. + + \since 0.6 + */ +class POPPLER_QT5_EXPORT FormFieldText : public FormField +{ +public: + /** + The particular type of this text field. + */ + enum TextType + { + Normal, ///< A simple singleline text field. + Multiline, ///< A multiline text field. + FileSelect ///< An input field to select the path of a file on disk. + }; + + /// \cond PRIVATE + FormFieldText(DocumentData *doc, ::Page *p, ::FormWidgetText *w); + /// \endcond + ~FormFieldText() override; + + FormType type() const override; + + /** + The text type of the text field. + */ + TextType textType() const; + + /** + The text associated with the text field. + */ + QString text() const; + + /** + Sets the text associated with the text field to the specified + \p text. + */ + void setText(const QString &text); + + /** + Sets the text inside the Appearance Stream to the specified + \p text + \since 0.80 + */ + void setAppearanceText(const QString &text); + + /** + Whether this text field is a password input, eg its text \b must be + replaced with asterisks. + + Always false for \ref FileSelect text fields. + */ + bool isPassword() const; + + /** + Whether this text field should allow rich text. + */ + bool isRichText() const; + + /** + The maximum length for the text of this field, or -1 if not set. + */ + int maximumLength() const; + + /** + The horizontal alignment for the text of this text field. + */ + Qt::Alignment textAlignment() const; + + /** + Whether the text inserted manually in the field (where possible) + can be spell-checked. + */ + bool canBeSpellChecked() const; + + /** + The font size of the text in the form field + */ + double getFontSize() const; + + /** + Set the font size of the text in the form field (currently only as integer) + */ + void setFontSize(int fontSize); + +private: + Q_DISABLE_COPY(FormFieldText) +}; + +/** + A form field that represents a choice field. + + \since 0.6 + */ +class POPPLER_QT5_EXPORT FormFieldChoice : public FormField +{ +public: + /** + The particular type of this choice field. + */ + enum ChoiceType + { + ComboBox, ///< A simple singleline text field. + ListBox ///< A multiline text field. + }; + + /// \cond PRIVATE + FormFieldChoice(DocumentData *doc, ::Page *p, ::FormWidgetChoice *w); + /// \endcond + ~FormFieldChoice() override; + + FormType type() const override; + + /** + The choice type of the choice field. + */ + ChoiceType choiceType() const; + + /** + The possible choices of the choice field. + */ + QStringList choices() const; + + /** + The possible choices of the choice field. + The first value of the pair is the display name of the choice, + The second value is the export value (i.e. for use in javascript, etc) of the choice + @since 0.87 + */ + QVector> choicesWithExportValues() const; + + /** + Whether this FormFieldChoice::ComboBox is editable, i.e. the user + can type in a custom value. + + Always false for the other types of choices. + */ + bool isEditable() const; + + /** + Whether more than one choice of this FormFieldChoice::ListBox + can be selected at the same time. + + Always false for the other types of choices. + */ + bool multiSelect() const; + + /** + The currently selected choices. + */ + QList currentChoices() const; + + /** + Sets the selected choices to \p choice. + */ + void setCurrentChoices(const QList &choice); + + /** + The text entered into an editable combo box choice field. Otherwise a null string. + + \since 0.22 + */ + QString editChoice() const; + + /** + Sets the text entered into an editable combo box choice field. Otherwise does nothing. + + \since 0.22 + */ + void setEditChoice(const QString &text); + + /** + The horizontal alignment for the text of this text field. + */ + Qt::Alignment textAlignment() const; + + /** + Whether the text inserted manually in the field (where possible) + can be spell-checked. + + Returns false if the field is not an editable text field. + */ + bool canBeSpellChecked() const; + +private: + Q_DISABLE_COPY(FormFieldChoice) +}; + +/** + A helper class to store x509 certificate information. + + \since 0.73 + */ +class CertificateInfoPrivate; +class POPPLER_QT5_EXPORT CertificateInfo +{ +public: + /** + The algorithm of public key. + */ + enum PublicKeyType + { + RsaKey, + DsaKey, + EcKey, + OtherKey + }; + + /** + Certificate key usage extensions. + */ + enum KeyUsageExtension + { + KuDigitalSignature = 0x80, + KuNonRepudiation = 0x40, + KuKeyEncipherment = 0x20, + KuDataEncipherment = 0x10, + KuKeyAgreement = 0x08, + KuKeyCertSign = 0x04, + KuClrSign = 0x02, + KuEncipherOnly = 0x01, + KuNone = 0x00 + }; + Q_DECLARE_FLAGS(KeyUsageExtensions, KeyUsageExtension) + + /** + Predefined keys for elements in an entity's distinguished name. + */ + enum EntityInfoKey + { + CommonName, + DistinguishedName, + EmailAddress, + Organization, + }; + + /** A signing key can be located in different places + sometimes. For the user, it might be easier to pick + the key located on a card if it has some visual + indicator that it is somehow removable. + + \note a keylocation for a certificate without a private + key (cannot be used for signing) will likely be "Unknown" + + \since 23.09 + */ + enum class KeyLocation + { + Unknown, /** We don't know the location */ + Other, /** We know the location, but it is somehow not covered by this enum */ + Computer, /** The key is on this computer */ + HardwareToken /** The key is on a dedicated hardware token, either a smartcard or a dedicated usb token (e.g. gnuk, nitrokey or yubikey) */ + }; + + CertificateInfo(); + explicit CertificateInfo(CertificateInfoPrivate *priv); + ~CertificateInfo(); + + /** + Returns true if certificate has no contents; otherwise returns false + */ + bool isNull() const; + + /** + The certificate version string. + */ + int version() const; + + /** + The certificate serial number. + */ + QByteArray serialNumber() const; + + /** + Information about the issuer. + */ + QString issuerInfo(EntityInfoKey key) const; + + /** + Information about the subject + */ + QString subjectInfo(EntityInfoKey key) const; + + /** + The certificate internal database nickname + + \since 21.01 + */ + QString nickName() const; + + /** + The date-time when certificate becomes valid. + */ + QDateTime validityStart() const; + + /** + The date-time when certificate expires. + */ + QDateTime validityEnd() const; + + /** + The uses allowed for the certificate. + */ + KeyUsageExtensions keyUsageExtensions() const; + + /** + The public key value. + */ + QByteArray publicKey() const; + + /** + The public key type. + */ + PublicKeyType publicKeyType() const; + + /** + The strength of public key in bits. + */ + int publicKeyStrength() const; + + /** + Returns true if certificate is self-signed otherwise returns false. + */ + bool isSelfSigned() const; + + /** + The DER encoded certificate. + */ + QByteArray certificateData() const; + + /** + Checks if the given password is the correct one for this certificate + + \since 21.01 + */ + bool checkPassword(const QString &password) const; + + /** + The storage location for this key + + \since 23.09 + */ + KeyLocation keyLocation() const; + + CertificateInfo(const CertificateInfo &other); + CertificateInfo &operator=(const CertificateInfo &other); + +private: + Q_DECLARE_PRIVATE(CertificateInfo) + + QSharedPointer d_ptr; +}; +Q_DECLARE_OPERATORS_FOR_FLAGS(CertificateInfo::KeyUsageExtensions) + +/** + A signature validation info helper class. + + \since 0.51 + */ +class SignatureValidationInfoPrivate; +class POPPLER_QT5_EXPORT SignatureValidationInfo +{ +public: + /** + The verification result of the signature. + */ + enum SignatureStatus + { + SignatureValid, ///< The signature is cryptographically valid. + SignatureInvalid, ///< The signature is cryptographically invalid. + SignatureDigestMismatch, ///< The document content was changed after the signature was applied. + SignatureDecodingError, ///< The signature CMS/PKCS7 structure is malformed. + SignatureGenericError, ///< The signature could not be verified. + SignatureNotFound, ///< The requested signature is not present in the document. + SignatureNotVerified ///< The signature is not yet verified. + }; + + /** + The verification result of the certificate. + */ + enum CertificateStatus + { + CertificateTrusted, ///< The certificate is considered trusted. + CertificateUntrustedIssuer, ///< The issuer of this certificate has been marked as untrusted by the user. + CertificateUnknownIssuer, ///< The certificate trust chain has not finished in a trusted root certificate. + CertificateRevoked, ///< The certificate was revoked by the issuing certificate authority. + CertificateExpired, ///< The signing time is outside the validity bounds of this certificate. + CertificateGenericError, ///< The certificate could not be verified. + CertificateNotVerified, ///< The certificate is not yet verified. + CertificateVerificationInProgress ///< The certificate is not yet verified but is in progress in the background. See \ref validateAsync \since 24.05 + }; + + /** + The hash algorithm of the signature + \since 0.58 + */ + enum HashAlgorithm + { + HashAlgorithmUnknown, + HashAlgorithmMd2, + HashAlgorithmMd5, + HashAlgorithmSha1, + HashAlgorithmSha256, + HashAlgorithmSha384, + HashAlgorithmSha512, + HashAlgorithmSha224 + }; + + /// \cond PRIVATE + explicit SignatureValidationInfo(SignatureValidationInfoPrivate *priv); + /// \endcond + ~SignatureValidationInfo(); + + /** + The signature status of the signature. + */ + SignatureStatus signatureStatus() const; + + /** + The certificate status of the signature. + */ + CertificateStatus certificateStatus() const; + + /** + The signer name associated with the signature. + */ + QString signerName() const; + + /** + The signer subject distinguished name associated with the signature. + \since 0.58 + */ + QString signerSubjectDN() const; + + /** + Get signing location. + \since 0.68 + */ + QString location() const; + + /** + Get signing reason. + \since 0.68 + */ + QString reason() const; + + /** + The hash algorithm used for the signature. + \since 0.58 + */ + HashAlgorithm hashAlgorithm() const; + + /** + The signing time associated with the signature. + */ + time_t signingTime() const; + + /** + Get the signature binary data. + \since 0.58 + */ + QByteArray signature() const; + + /** + Get the bounds of the ranges of the document which are signed. + \since 0.58 + */ + QList signedRangeBounds() const; + + /** + Checks whether the signature authenticates the total document + except for the signature itself. + \since 0.58 + */ + bool signsTotalDocument() const; + + /** + The signer certificate info. + \since 0.73 + */ + CertificateInfo certificateInfo() const; + + SignatureValidationInfo(const SignatureValidationInfo &other); + SignatureValidationInfo &operator=(const SignatureValidationInfo &other); + +private: + Q_DECLARE_PRIVATE(SignatureValidationInfo) + friend class FormFieldSignature; + QSharedPointer d_ptr; +}; + +/** + * Object help waiting for some async event + * + * \since 24.05 + */ +class AsyncObjectPrivate; +class POPPLER_QT5_EXPORT AsyncObject : public QObject // clazy:exclude=ctor-missing-parent-argument +{ + Q_OBJECT +public: + /* Constructor. On purpose not having a QObject parameter + It will be returned by shared_ptr or unique_ptr + */ + AsyncObject(); + ~AsyncObject() override; +Q_SIGNALS: + void done(); +public Q_SLOTS: +private: + std::unique_ptr d; +}; + +/** + A form field that represents a signature. + + \since 0.51 + */ +class POPPLER_QT5_EXPORT FormFieldSignature : public FormField +{ +public: + /** + The types of signature fields. + \since 0.58 + */ + enum SignatureType + { + AdbePkcs7sha1, + AdbePkcs7detached, + EtsiCAdESdetached, + UnknownSignatureType, ///< \since 0.90 + UnsignedSignature ///< \since 22.02 + }; + + /** + The validation options of this signature. + */ + enum ValidateOptions + { + ValidateVerifyCertificate = 1, ///< Validate the certificate. + ValidateForceRevalidation = 2, ///< Force revalidation of the certificate. + ValidateWithoutOCSPRevocationCheck = 4, ///< Do not contact OCSP servers to check for certificate revocation status \since 21.10 + ValidateUseAIACertFetch = 8 ///< Use the AIA extension for certificate fetching \since 21.10 + }; + + /// \cond PRIVATE + FormFieldSignature(DocumentData *doc, ::Page *p, ::FormWidgetSignature *w); + /// \endcond + ~FormFieldSignature() override; + + FormType type() const override; + + /** + The signature type + \since 0.58 + */ + SignatureType signatureType() const; + + /** + Validate the signature with now as validation time. + + Reset signature validatation info of scoped instance. + + \note depending on the backend, some options are only + partially respected. In case of the NSS backend, the two options + requiring network access, AIAFetch and OCSP, + can be toggled individually. In case of the GPG backend, if either + OCSP is used or AIAFetch is used, the other one is also used. + + \deprecated Please rewrite to the async version, that allows the network traffic part of fetching to happen in the background + */ + POPPLER_QT5_DEPRECATED SignatureValidationInfo validate(ValidateOptions opt) const; + + /** + Validate the signature with @p validationTime as validation time. + + Reset signature validatation info of scoped instance. + + \since 0.58 + + \note depending on the backend, some options are only + partially respected. In case of the NSS backend, the two options + requiring network access, AIAFetch and OCSP, + can be toggled individually. In case of the GPG backend, if either + OCSP is used or AIAFetch is used, the other one is also used. + + \deprecated Please rewrite to the async version, that allows the network traffic part of fetching to happen in the background + */ + POPPLER_QT5_DEPRECATED SignatureValidationInfo validate(int opt, const QDateTime &validationTime) const; + + /** + Validate the signature with @p validationTime as validation time. + + Reset signature validatation info of scoped instance. + + \since 24.05 + + \note depending on the backend, some options are only + partially respected. In case of the NSS backend, the two options + requiring network access, AIAFetch and OCSP, + can be toggled individually. In case of the GPG backend, if either + OCSP is used or AIAFetch is used, the other one is also used. + + \note certificate validation will have started when this function return. See \ref validateResult on how to get certifcate validation + \note connections to \ref AsyncObject must happen by the caller + before returning control to the event loop, else signals is not guaranteed to be delivered + */ + std::pair> validateAsync(ValidateOptions opt, const QDateTime &validationTime = {}) const; + + /** + * \return the updated signature validation info from validateAsync + * \note that this function will block if the result is not yet ready. + * Wait for the \ref AsyncObject::done signal to avoid this function blocking on an inconvenient time + * + * \since 24.05 + */ + SignatureValidationInfo::CertificateStatus validateResult() const; + + /** + * \since 22.02 + */ + enum SigningResult + { + FieldAlreadySigned, ///< Trying to sign a field that is already signed + GenericSigningError, + SigningSuccess + }; + + /** + Signs a field of UnsignedSignature type. + + Ignores data.page(), data.fieldPartialName() and data.boundingRectangle() + + \since 22.02 + */ + SigningResult sign(const QString &outputFileName, const PDFConverter::NewSignatureData &data) const; + +private: + Q_DISABLE_COPY(FormFieldSignature) +}; + +/** + * Possible compiled in backends for signature handling + * + * \since 23.06 + */ +enum class CryptoSignBackend +{ + NSS, + GPG +}; + +/** + * The available compiled-in backends + * + * \since 23.06 + */ +QVector POPPLER_QT5_EXPORT availableCryptoSignBackends(); + +/** + * Returns current active backend or nullopt if none is active + * + * \note there will always be an active backend if there is available backends + * + * \since 23.06 + */ +std::optional POPPLER_QT5_EXPORT activeCryptoSignBackend(); + +/** + * Sets active backend + * + * \return true on success + * + * \since 23.06 + */ +bool POPPLER_QT5_EXPORT setActiveCryptoSignBackend(CryptoSignBackend backend); + +enum class CryptoSignBackendFeature +{ + /// If the backend itself out of band requests passwords + /// or if the host applicaion somehow must do it + BackendAsksPassphrase +}; + +/** + * Queries if a backend supports or not supports a given feature. + * + * \since 23.06 + */ +bool POPPLER_QT5_EXPORT hasCryptoSignBackendFeature(CryptoSignBackend, CryptoSignBackendFeature); + +/** + Returns is poppler was compiled with NSS support + + \deprecated Use availableBackends instead + + \since 21.01 +*/ +bool POPPLER_QT5_DEPRECATED POPPLER_QT5_EXPORT hasNSSSupport(); + +/** + Return vector of suitable signing certificates + + \since 21.01 +*/ +QVector POPPLER_QT5_EXPORT getAvailableSigningCertificates(); + +/** + Gets the current NSS CertDB directory + + \since 21.01 +*/ +QString POPPLER_QT5_EXPORT getNSSDir(); + +/** + Set a custom NSS CertDB directory. Needs to be called before doing any other signature operation + + \since 21.01 +*/ +void POPPLER_QT5_EXPORT setNSSDir(const QString &pathURL); + +/** + Sets the callback for NSS password requests + + \since 21.01 +*/ +void POPPLER_QT5_EXPORT setNSSPasswordCallback(const std::function &f); +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-link-extractor-private.h b/poppler-24.05.0/qt5/src/poppler-link-extractor-private.h new file mode 100644 index 0000000000000000000000000000000000000000..7cad6f85d698d691bbf04e09358a22cea8fb65ed --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-link-extractor-private.h @@ -0,0 +1,57 @@ +/* poppler-link-extractor_p.h: qt interface to poppler + * Copyright (C) 2007, 2008, 2011, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef _POPPLER_LINK_EXTRACTOR_H_ +#define _POPPLER_LINK_EXTRACTOR_H_ + +#include +#include + +#include + +namespace Poppler { + +class Link; +class PageData; + +class LinkExtractorOutputDev : public OutputDev +{ +public: + explicit LinkExtractorOutputDev(PageData *data); + ~LinkExtractorOutputDev() override; + + // inherited from OutputDev + bool upsideDown() override { return false; } + bool useDrawChar() override { return false; } + bool interpretType3Chars() override { return false; } + void processLink(::AnnotLink *link) override; + + // our stuff + QList links(); + +private: + PageData *m_data; + double m_pageCropWidth; + double m_pageCropHeight; + QList m_links; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-link-extractor.cc b/poppler-24.05.0/qt5/src/poppler-link-extractor.cc new file mode 100644 index 0000000000000000000000000000000000000000..3fb46bbf8ad4551ae8cba5402a951445b6f34f69 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-link-extractor.cc @@ -0,0 +1,83 @@ +/* poppler-link-extractor_p.h: qt interface to poppler + * Copyright (C) 2007, 2008, 2011, Pino Toscano + * Copyright (C) 2008, Albert Astals Cid + * + * 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-link-extractor-private.h" + +#include +#include +#include +#include +#include + +#include "poppler-qt5.h" +#include "poppler-page-private.h" + +namespace Poppler { + +LinkExtractorOutputDev::LinkExtractorOutputDev(PageData *data) : m_data(data) +{ + Q_ASSERT(m_data); + ::Page *popplerPage = m_data->page; + m_pageCropWidth = popplerPage->getCropWidth(); + m_pageCropHeight = popplerPage->getCropHeight(); + if (popplerPage->getRotate() == 90 || popplerPage->getRotate() == 270) { + qSwap(m_pageCropWidth, m_pageCropHeight); + } + GfxState gfxState(72.0, 72.0, popplerPage->getCropBox(), popplerPage->getRotate(), true); + setDefaultCTM(gfxState.getCTM()); +} + +LinkExtractorOutputDev::~LinkExtractorOutputDev() +{ + qDeleteAll(m_links); +} + +void LinkExtractorOutputDev::processLink(::AnnotLink *link) +{ + if (!link->isOk()) { + return; + } + + double left, top, right, bottom; + int leftAux, topAux, rightAux, bottomAux; + link->getRect(&left, &top, &right, &bottom); + QRectF linkArea; + + cvtUserToDev(left, top, &leftAux, &topAux); + cvtUserToDev(right, bottom, &rightAux, &bottomAux); + linkArea.setLeft((double)leftAux / m_pageCropWidth); + linkArea.setTop((double)topAux / m_pageCropHeight); + linkArea.setRight((double)rightAux / m_pageCropWidth); + linkArea.setBottom((double)bottomAux / m_pageCropHeight); + + Link *popplerLink = m_data->convertLinkActionToLink(link->getAction(), linkArea); + if (popplerLink) { + m_links.append(popplerLink); + } + OutputDev::processLink(link); +} + +QList LinkExtractorOutputDev::links() +{ + QList ret = m_links; + m_links.clear(); + return ret; +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-link-private.h b/poppler-24.05.0/qt5/src/poppler-link-private.h new file mode 100644 index 0000000000000000000000000000000000000000..7e6f6b071e213af694dac73cbee3f22bea0a7f83 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-link-private.h @@ -0,0 +1,72 @@ +/* poppler-link-private.h: qt interface to poppler + * Copyright (C) 2016, 2018, 2020, 2021 Albert Astals Cid + * Copyright (C) 2018 Intevation GmbH + * Copyright (C) 2020 Oliver Sander + * + * 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. + */ + +#ifndef _POPPLER_LINK_PRIVATE_H_ +#define _POPPLER_LINK_PRIVATE_H_ + +#include + +#include "Link.h" + +class LinkOCGState; + +namespace Poppler { + +class Link; + +class LinkPrivate +{ +public: + explicit LinkPrivate(const QRectF &area) : linkArea(area) { } + + virtual ~LinkPrivate(); + + static LinkPrivate *get(Link *link) { return link->d_ptr; } + + LinkPrivate(const LinkPrivate &) = delete; + LinkPrivate &operator=(const LinkPrivate &) = delete; + + QRectF linkArea; + QVector nextLinks; +}; + +class LinkOCGStatePrivate : public LinkPrivate +{ +public: + LinkOCGStatePrivate(const QRectF &area, const std::vector<::LinkOCGState::StateList> &sList, bool pRB) : LinkPrivate(area), stateList(sList), preserveRB(pRB) { } + ~LinkOCGStatePrivate() override; + + std::vector<::LinkOCGState::StateList> stateList; + bool preserveRB; +}; + +class LinkHidePrivate : public LinkPrivate +{ +public: + LinkHidePrivate(const QRectF &area, const QString &tName, bool show) : LinkPrivate(area), targetName(tName), isShow(show) { } + ~LinkHidePrivate() override; + + QString targetName; + bool isShow; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-link.cc b/poppler-24.05.0/qt5/src/poppler-link.cc new file mode 100644 index 0000000000000000000000000000000000000000..cb114eaecb14e2d27e156b4ffc68604c4cd9877e --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-link.cc @@ -0,0 +1,695 @@ +/* poppler-link.cc: qt interface to poppler + * Copyright (C) 2006-2007, 2013, 2016-2021, Albert Astals Cid + * Copyright (C) 2007-2008, Pino Toscano + * Copyright (C) 2010 Hib Eris + * Copyright (C) 2012, Tobias Koenig + * Copyright (C) 2012, Guillermo A. Amaral B. + * Copyright (C) 2018 Intevation GmbH + * Copyright (C) 2018 Adam Reichold + * Copyright (C) 2020 Oliver Sander + * Adapting code from + * Copyright (C) 2004 by Enrico Ros + * + * 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 +#include +#include +#include + +#include + +#include "poppler-annotation-private.h" + +#include "Link.h" +#include "Rendition.h" + +namespace Poppler { + +class LinkDestinationPrivate : public QSharedData +{ +public: + LinkDestinationPrivate(); + + LinkDestination::Kind kind; // destination type + QString name; + int pageNum; // page number + double left, bottom; // position + double right, top; + double zoom; // zoom factor + bool changeLeft : 1, changeTop : 1; // for destXYZ links, which position + bool changeZoom : 1; // components to change +}; + +LinkDestinationPrivate::LinkDestinationPrivate() +{ + // sane defaults + kind = LinkDestination::destXYZ; + pageNum = 0; + left = 0; + bottom = 0; + right = 0; + top = 0; + zoom = 1; + changeLeft = true; + changeTop = true; + changeZoom = false; +} + +LinkPrivate::~LinkPrivate() +{ + qDeleteAll(nextLinks); +} + +LinkOCGStatePrivate::~LinkOCGStatePrivate() = default; + +LinkHidePrivate::~LinkHidePrivate() = default; + +class LinkGotoPrivate : public LinkPrivate +{ +public: + LinkGotoPrivate(const QRectF &area, const LinkDestination &dest); + ~LinkGotoPrivate() override; + + QString extFileName; + LinkDestination destination; +}; + +LinkGotoPrivate::LinkGotoPrivate(const QRectF &area, const LinkDestination &dest) : LinkPrivate(area), destination(dest) { } +LinkGotoPrivate::~LinkGotoPrivate() = default; + +class LinkExecutePrivate : public LinkPrivate +{ +public: + explicit LinkExecutePrivate(const QRectF &area); + ~LinkExecutePrivate() override; + + QString fileName; + QString parameters; +}; + +LinkExecutePrivate::LinkExecutePrivate(const QRectF &area) : LinkPrivate(area) { } +LinkExecutePrivate::~LinkExecutePrivate() = default; + +class LinkBrowsePrivate : public LinkPrivate +{ +public: + explicit LinkBrowsePrivate(const QRectF &area); + ~LinkBrowsePrivate() override; + + QString url; +}; + +LinkBrowsePrivate::LinkBrowsePrivate(const QRectF &area) : LinkPrivate(area) { } +LinkBrowsePrivate::~LinkBrowsePrivate() = default; + +class LinkActionPrivate : public LinkPrivate +{ +public: + explicit LinkActionPrivate(const QRectF &area); + ~LinkActionPrivate() override; + + LinkAction::ActionType type; +}; + +LinkActionPrivate::LinkActionPrivate(const QRectF &area) : LinkPrivate(area) { } +LinkActionPrivate::~LinkActionPrivate() = default; + +class LinkSoundPrivate : public LinkPrivate +{ +public: + explicit LinkSoundPrivate(const QRectF &area); + ~LinkSoundPrivate() override; + + double volume; + bool sync : 1; + bool repeat : 1; + bool mix : 1; + SoundObject *sound; +}; + +LinkSoundPrivate::LinkSoundPrivate(const QRectF &area) : LinkPrivate(area), sound(nullptr) { } + +LinkSoundPrivate::~LinkSoundPrivate() +{ + delete sound; +} + +class LinkRenditionPrivate : public LinkPrivate +{ +public: + explicit LinkRenditionPrivate(const QRectF &area, ::MediaRendition *rendition, ::LinkRendition::RenditionOperation operation, const QString &script, const Ref ref); + ~LinkRenditionPrivate() override; + + MediaRendition *rendition; + LinkRendition::RenditionAction action; + QString script; + Ref annotationReference; +}; + +LinkRenditionPrivate::LinkRenditionPrivate(const QRectF &area, ::MediaRendition *r, ::LinkRendition::RenditionOperation operation, const QString &javaScript, const Ref ref) + : LinkPrivate(area), rendition(r ? new MediaRendition(r) : nullptr), action(LinkRendition::PlayRendition), script(javaScript), annotationReference(ref) +{ + switch (operation) { + case ::LinkRendition::NoRendition: + action = LinkRendition::NoRendition; + break; + case ::LinkRendition::PlayRendition: + action = LinkRendition::PlayRendition; + break; + case ::LinkRendition::StopRendition: + action = LinkRendition::StopRendition; + break; + case ::LinkRendition::PauseRendition: + action = LinkRendition::PauseRendition; + break; + case ::LinkRendition::ResumeRendition: + action = LinkRendition::ResumeRendition; + break; + } +} + +LinkRenditionPrivate::~LinkRenditionPrivate() +{ + delete rendition; +} + +class LinkJavaScriptPrivate : public LinkPrivate +{ +public: + explicit LinkJavaScriptPrivate(const QRectF &area); + ~LinkJavaScriptPrivate() override; + + QString js; +}; + +LinkJavaScriptPrivate::LinkJavaScriptPrivate(const QRectF &area) : LinkPrivate(area) { } +LinkJavaScriptPrivate::~LinkJavaScriptPrivate() = default; + +class LinkMoviePrivate : public LinkPrivate +{ +public: + LinkMoviePrivate(const QRectF &area, LinkMovie::Operation operation, const QString &title, const Ref reference); + ~LinkMoviePrivate() override; + + LinkMovie::Operation operation; + QString annotationTitle; + Ref annotationReference; +}; + +LinkMoviePrivate::LinkMoviePrivate(const QRectF &area, LinkMovie::Operation _operation, const QString &title, const Ref reference) : LinkPrivate(area), operation(_operation), annotationTitle(title), annotationReference(reference) { } + +LinkMoviePrivate::~LinkMoviePrivate() = default; + +static void cvtUserToDev(::Page *page, double xu, double yu, int *xd, int *yd) +{ + double ctm[6]; + + page->getDefaultCTM(ctm, 72.0, 72.0, 0, false, true); + *xd = (int)(ctm[0] * xu + ctm[2] * yu + ctm[4] + 0.5); + *yd = (int)(ctm[1] * xu + ctm[3] * yu + ctm[5] + 0.5); +} + +LinkDestination::LinkDestination(const LinkDestinationData &data) : d(new LinkDestinationPrivate) +{ + bool deleteDest = false; + const LinkDest *ld = data.ld; + + if (data.namedDest && !ld && !data.externalDest) { + deleteDest = true; + ld = data.doc->doc->findDest(data.namedDest).release(); + } + // in case this destination was named one, and it was not resolved + if (data.namedDest && !ld) { + d->name = QString::fromLatin1(data.namedDest->c_str()); + } + + if (!ld) { + return; + } + + if (ld->getKind() == ::destXYZ) { + d->kind = destXYZ; + } else if (ld->getKind() == ::destFit) { + d->kind = destFit; + } else if (ld->getKind() == ::destFitH) { + d->kind = destFitH; + } else if (ld->getKind() == ::destFitV) { + d->kind = destFitV; + } else if (ld->getKind() == ::destFitR) { + d->kind = destFitR; + } else if (ld->getKind() == ::destFitB) { + d->kind = destFitB; + } else if (ld->getKind() == ::destFitBH) { + d->kind = destFitBH; + } else if (ld->getKind() == ::destFitBV) { + d->kind = destFitBV; + } + + if (!ld->isPageRef()) { + d->pageNum = ld->getPageNum(); + } else { + const Ref ref = ld->getPageRef(); + d->pageNum = data.doc->doc->findPage(ref); + } + double left = ld->getLeft(); + double bottom = ld->getBottom(); + double right = ld->getRight(); + double top = ld->getTop(); + d->zoom = ld->getZoom(); + d->changeLeft = ld->getChangeLeft(); + d->changeTop = ld->getChangeTop(); + d->changeZoom = ld->getChangeZoom(); + + int leftAux = 0, topAux = 0, rightAux = 0, bottomAux = 0; + + if (!data.externalDest) { + ::Page *page; + if (d->pageNum > 0 && d->pageNum <= data.doc->doc->getNumPages() && (page = data.doc->doc->getPage(d->pageNum))) { + cvtUserToDev(page, left, top, &leftAux, &topAux); + cvtUserToDev(page, right, bottom, &rightAux, &bottomAux); + + d->left = leftAux / (double)page->getCropWidth(); + d->top = topAux / (double)page->getCropHeight(); + d->right = rightAux / (double)page->getCropWidth(); + d->bottom = bottomAux / (double)page->getCropHeight(); + } else { + d->pageNum = 0; + } + } + + if (deleteDest) { + delete ld; + } +} + +LinkDestination::LinkDestination(const QString &description) : d(new LinkDestinationPrivate) +{ + const QStringList tokens = description.split(';'); + if (tokens.size() >= 10) { + d->kind = static_cast(tokens.at(0).toInt()); + d->pageNum = tokens.at(1).toInt(); + d->left = tokens.at(2).toDouble(); + d->bottom = tokens.at(3).toDouble(); + d->right = tokens.at(4).toDouble(); + d->top = tokens.at(5).toDouble(); + d->zoom = tokens.at(6).toDouble(); + d->changeLeft = static_cast(tokens.at(7).toInt()); + d->changeTop = static_cast(tokens.at(8).toInt()); + d->changeZoom = static_cast(tokens.at(9).toInt()); + } +} + +LinkDestination::LinkDestination(const LinkDestination &other) : d(other.d) { } + +LinkDestination::~LinkDestination() { } + +LinkDestination::Kind LinkDestination::kind() const +{ + return d->kind; +} + +int LinkDestination::pageNumber() const +{ + return d->pageNum; +} + +double LinkDestination::left() const +{ + return d->left; +} + +double LinkDestination::bottom() const +{ + return d->bottom; +} + +double LinkDestination::right() const +{ + return d->right; +} + +double LinkDestination::top() const +{ + return d->top; +} + +double LinkDestination::zoom() const +{ + return d->zoom; +} + +bool LinkDestination::isChangeLeft() const +{ + return d->changeLeft; +} + +bool LinkDestination::isChangeTop() const +{ + return d->changeTop; +} + +bool LinkDestination::isChangeZoom() const +{ + return d->changeZoom; +} + +QString LinkDestination::toString() const +{ + QString s = QString::number((qint8)d->kind); + s += ";" + QString::number(d->pageNum); + s += ";" + QString::number(d->left); + s += ";" + QString::number(d->bottom); + s += ";" + QString::number(d->right); + s += ";" + QString::number(d->top); + s += ";" + QString::number(d->zoom); + s += ";" + QString::number((qint8)d->changeLeft); + s += ";" + QString::number((qint8)d->changeTop); + s += ";" + QString::number((qint8)d->changeZoom); + return s; +} + +QString LinkDestination::destinationName() const +{ + return d->name; +} + +LinkDestination &LinkDestination::operator=(const LinkDestination &other) +{ + if (this == &other) { + return *this; + } + + d = other.d; + return *this; +} + +// Link +Link::~Link() +{ + delete d_ptr; +} + +Link::Link(const QRectF &linkArea) : d_ptr(new LinkPrivate(linkArea)) { } + +Link::Link(LinkPrivate &dd) : d_ptr(&dd) { } + +Link::LinkType Link::linkType() const +{ + return None; +} + +QRectF Link::linkArea() const +{ + Q_D(const Link); + return d->linkArea; +} + +QVector Link::nextLinks() const +{ + return d_ptr->nextLinks; +} + +// LinkGoto +LinkGoto::LinkGoto(const QRectF &linkArea, QString extFileName, const LinkDestination &destination) // clazy:exclude=function-args-by-ref + : Link(*new LinkGotoPrivate(linkArea, destination)) +{ + Q_D(LinkGoto); + d->extFileName = std::move(extFileName); // TODO remove when extFileName moves to be a const & +} + +LinkGoto::~LinkGoto() { } + +bool LinkGoto::isExternal() const +{ + Q_D(const LinkGoto); + return !d->extFileName.isEmpty(); +} + +QString LinkGoto::fileName() const +{ + Q_D(const LinkGoto); + return d->extFileName; +} + +LinkDestination LinkGoto::destination() const +{ + Q_D(const LinkGoto); + return d->destination; +} + +Link::LinkType LinkGoto::linkType() const +{ + return Goto; +} + +// LinkExecute +LinkExecute::LinkExecute(const QRectF &linkArea, const QString &file, const QString ¶ms) : Link(*new LinkExecutePrivate(linkArea)) +{ + Q_D(LinkExecute); + d->fileName = file; + d->parameters = params; +} + +LinkExecute::~LinkExecute() { } + +QString LinkExecute::fileName() const +{ + Q_D(const LinkExecute); + return d->fileName; +} +QString LinkExecute::parameters() const +{ + Q_D(const LinkExecute); + return d->parameters; +} + +Link::LinkType LinkExecute::linkType() const +{ + return Execute; +} + +// LinkBrowse +LinkBrowse::LinkBrowse(const QRectF &linkArea, const QString &url) : Link(*new LinkBrowsePrivate(linkArea)) +{ + Q_D(LinkBrowse); + d->url = url; +} + +LinkBrowse::~LinkBrowse() { } + +QString LinkBrowse::url() const +{ + Q_D(const LinkBrowse); + return d->url; +} + +Link::LinkType LinkBrowse::linkType() const +{ + return Browse; +} + +// LinkAction +LinkAction::LinkAction(const QRectF &linkArea, ActionType actionType) : Link(*new LinkActionPrivate(linkArea)) +{ + Q_D(LinkAction); + d->type = actionType; +} + +LinkAction::~LinkAction() { } + +LinkAction::ActionType LinkAction::actionType() const +{ + Q_D(const LinkAction); + return d->type; +} + +Link::LinkType LinkAction::linkType() const +{ + return Action; +} + +// LinkSound +LinkSound::LinkSound(const QRectF &linkArea, double volume, bool sync, bool repeat, bool mix, SoundObject *sound) : Link(*new LinkSoundPrivate(linkArea)) +{ + Q_D(LinkSound); + d->volume = volume; + d->sync = sync; + d->repeat = repeat; + d->mix = mix; + d->sound = sound; +} + +LinkSound::~LinkSound() { } + +Link::LinkType LinkSound::linkType() const +{ + return Sound; +} + +double LinkSound::volume() const +{ + Q_D(const LinkSound); + return d->volume; +} + +bool LinkSound::synchronous() const +{ + Q_D(const LinkSound); + return d->sync; +} + +bool LinkSound::repeat() const +{ + Q_D(const LinkSound); + return d->repeat; +} + +bool LinkSound::mix() const +{ + Q_D(const LinkSound); + return d->mix; +} + +SoundObject *LinkSound::sound() const +{ + Q_D(const LinkSound); + return d->sound; +} + +// LinkRendition +LinkRendition::LinkRendition(const QRectF &linkArea, ::MediaRendition *rendition, int operation, const QString &script, const Ref &annotationReference) // clazy:exclude=function-args-by-value + : Link(*new LinkRenditionPrivate(linkArea, rendition, static_cast(operation), script, annotationReference)) +{ +} + +LinkRendition::~LinkRendition() { } + +Link::LinkType LinkRendition::linkType() const +{ + return Rendition; +} + +MediaRendition *LinkRendition::rendition() const +{ + Q_D(const LinkRendition); + return d->rendition; +} + +LinkRendition::RenditionAction LinkRendition::action() const +{ + Q_D(const LinkRendition); + return d->action; +} + +QString LinkRendition::script() const +{ + Q_D(const LinkRendition); + return d->script; +} + +bool LinkRendition::isReferencedAnnotation(const ScreenAnnotation *annotation) const +{ + Q_D(const LinkRendition); + if (d->annotationReference != Ref::INVALID() && d->annotationReference == annotation->d_ptr->pdfObjectReference()) { + return true; + } + + return false; +} + +// LinkJavaScript +LinkJavaScript::LinkJavaScript(const QRectF &linkArea, const QString &js) : Link(*new LinkJavaScriptPrivate(linkArea)) +{ + Q_D(LinkJavaScript); + d->js = js; +} + +LinkJavaScript::~LinkJavaScript() { } + +Link::LinkType LinkJavaScript::linkType() const +{ + return JavaScript; +} + +QString LinkJavaScript::script() const +{ + Q_D(const LinkJavaScript); + return d->js; +} + +// LinkMovie +LinkMovie::LinkMovie(const QRectF &linkArea, Operation operation, const QString &annotationTitle, const Ref &annotationReference) // clazy:exclude=function-args-by-value + : Link(*new LinkMoviePrivate(linkArea, operation, annotationTitle, annotationReference)) +{ +} + +LinkMovie::~LinkMovie() { } + +Link::LinkType LinkMovie::linkType() const +{ + return Movie; +} + +LinkMovie::Operation LinkMovie::operation() const +{ + Q_D(const LinkMovie); + return d->operation; +} + +bool LinkMovie::isReferencedAnnotation(const MovieAnnotation *annotation) const +{ + Q_D(const LinkMovie); + if (d->annotationReference != Ref::INVALID() && d->annotationReference == annotation->d_ptr->pdfObjectReference()) { + return true; + } else if (!d->annotationTitle.isNull()) { + return (annotation->movieTitle() == d->annotationTitle); + } + + return false; +} + +LinkOCGState::LinkOCGState(LinkOCGStatePrivate *ocgp) : Link(*ocgp) { } + +LinkOCGState::~LinkOCGState() { } + +Link::LinkType LinkOCGState::linkType() const +{ + return OCGState; +} + +// LinkHide +LinkHide::LinkHide(LinkHidePrivate *lhidep) : Link(*lhidep) { } + +LinkHide::~LinkHide() { } + +Link::LinkType LinkHide::linkType() const +{ + return Hide; +} + +QVector LinkHide::targets() const +{ + Q_D(const LinkHide); + return QVector() << d->targetName; +} + +bool LinkHide::isShowAction() const +{ + Q_D(const LinkHide); + return d->isShow; +} +} diff --git a/poppler-24.05.0/qt5/src/poppler-link.h b/poppler-24.05.0/qt5/src/poppler-link.h new file mode 100644 index 0000000000000000000000000000000000000000..5de3542924aa2be6e932f76d9091cee7a3ca8a45 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-link.h @@ -0,0 +1,686 @@ +/* poppler-link.h: qt interface to poppler + * Copyright (C) 2006, 2013, 2016, 2018, 2019, 2021, 2022, Albert Astals Cid + * Copyright (C) 2007-2008, 2010, Pino Toscano + * Copyright (C) 2010, 2012, Guillermo Amaral + * Copyright (C) 2012, Tobias Koenig + * Copyright (C) 2013, Anthony Granger + * Copyright (C) 2018 Intevation GmbH + * Copyright (C) 2020 Oliver Sander + * Adapting code from + * Copyright (C) 2004 by Enrico Ros + * + * 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. + */ + +#ifndef _POPPLER_LINK_H_ +#define _POPPLER_LINK_H_ + +#include +#include +#include +#include +#include "poppler-export.h" + +struct Ref; +class MediaRendition; + +namespace Poppler { + +class LinkPrivate; +class LinkGotoPrivate; +class LinkExecutePrivate; +class LinkBrowsePrivate; +class LinkActionPrivate; +class LinkSoundPrivate; +class LinkJavaScriptPrivate; +class LinkMoviePrivate; +class LinkDestinationData; +class LinkDestinationPrivate; +class LinkRenditionPrivate; +class LinkOCGStatePrivate; +class LinkHidePrivate; +class MediaRendition; +class MovieAnnotation; +class ScreenAnnotation; +class SoundObject; + +/** + * \short A destination. + * + * The LinkDestination class represent a "destination" (in terms of visual + * viewport to be displayed) for \link Poppler::LinkGoto GoTo\endlink links, + * and items in the table of contents (TOC) of a document. + * + * Coordinates are in 0..1 range + */ +class POPPLER_QT5_EXPORT LinkDestination +{ +public: + /** + * The possible kind of "viewport destination". + */ + enum Kind + { + /** + * The new viewport is specified in terms of: + * - possible new left coordinate (see isChangeLeft() ) + * - possible new top coordinate (see isChangeTop() ) + * - possible new zoom level (see isChangeZoom() ) + */ + destXYZ = 1, + destFit = 2, + destFitH = 3, + destFitV = 4, + destFitR = 5, + destFitB = 6, + destFitBH = 7, + destFitBV = 8 + }; + + /// \cond PRIVATE + explicit LinkDestination(const LinkDestinationData &data); + explicit LinkDestination(const QString &description); + /// \endcond + /** + * Copy constructor. + */ + LinkDestination(const LinkDestination &other); + /** + * Destructor. + */ + ~LinkDestination(); + + // Accessors. + /** + * The kind of destination. + */ + Kind kind() const; + /** + * Which page is the target of this destination. + * + * \note this number is 1-based, so for a 5 pages document the + * valid page numbers go from 1 to 5 (both included). + */ + int pageNumber() const; + /** + * The new left for the viewport of the target page, in case + * it is specified to be changed (see isChangeLeft() ) + */ + double left() const; + double bottom() const; + double right() const; + /** + * The new top for the viewport of the target page, in case + * it is specified to be changed (see isChangeTop() ) + */ + double top() const; + double zoom() const; + /** + * Whether the left of the viewport on the target page should + * be changed. + * + * \see left() + */ + bool isChangeLeft() const; + /** + * Whether the top of the viewport on the target page should + * be changed. + * + * \see top() + */ + bool isChangeTop() const; + /** + * Whether the zoom level should be changed. + * + * \see zoom() + */ + bool isChangeZoom() const; + + /** + * Return a string repesentation of this destination. + */ + QString toString() const; + + /** + * Return the name of this destination. + * + * \since 0.12 + */ + QString destinationName() const; + + /** + * Assignment operator. + */ + LinkDestination &operator=(const LinkDestination &other); + +private: + QSharedDataPointer d; +}; + +/** + * \short Encapsulates data that describes a link. + * + * This is the base class for links. It makes mandatory for inherited + * kind of links to reimplement the linkType() method and return the type of + * the link described by the reimplemented class. + */ +class POPPLER_QT5_EXPORT Link +{ +public: + /// \cond PRIVATE + explicit Link(const QRectF &linkArea); + /// \endcond + + /** + * The possible kinds of link. + * + * Inherited classes must return an unique identifier + */ + enum LinkType + { + None, ///< Unknown link + Goto, ///< A "Go To" link + Execute, ///< A command to be executed + Browse, ///< An URL to be browsed (eg "http://poppler.freedesktop.org") + Action, ///< A "standard" action to be executed in the viewer + Sound, ///< A link representing a sound to be played + Movie, ///< An action to be executed on a movie + Rendition, ///< A rendition link \since 0.20 + JavaScript, ///< A JavaScript code to be interpreted \since 0.10 + OCGState, ///< An Optional Content Group state change \since 0.50 + Hide, ///< An action to hide a field \since 0.64 + }; + + /** + * The type of this link. + */ + virtual LinkType linkType() const; + + /** + * Destructor. + */ + virtual ~Link(); + + /** + * The area of a Page where the link should be active. + * + * \note this can be a null rect, in this case the link represents + * a general action. The area is given in 0..1 range + */ + QRectF linkArea() const; + + /** + * Get the next links to be activated / executed after this link. + * + * \since 0.64 + */ + QVector nextLinks() const; + +protected: + /// \cond PRIVATE + explicit Link(LinkPrivate &dd); + Q_DECLARE_PRIVATE(Link) + LinkPrivate *d_ptr; + /// \endcond + +private: + Q_DISABLE_COPY(Link) +}; + +/** + * \brief Viewport reaching request. + * + * With a LinkGoto link, the document requests the specified viewport to be + * reached (aka, displayed in a viewer). Furthermore, if a file name is specified, + * then the destination refers to that document (and not to the document the + * current LinkGoto belongs to). + */ +class POPPLER_QT5_EXPORT LinkGoto : public Link +{ +public: + /** + * Create a new Goto link. + * + * \param linkArea the active area of the link + * \param extFileName if not empty, the file name to be open + * \param destination the destination to be reached + */ + // TODO Next ABI break, make extFileName const & + LinkGoto(const QRectF &linkArea, QString extFileName, const LinkDestination &destination); + /** + * Destructor. + */ + ~LinkGoto() override; + + /** + * Whether the destination is in an external document + * (i.e. not the current document) + */ + bool isExternal() const; + // query for goto parameters + /** + * The file name of the document the destination() refers to, + * or an empty string in case it refers to the current document. + */ + QString fileName() const; + /** + * The destination to reach. + */ + LinkDestination destination() const; + LinkType linkType() const override; + +private: + Q_DECLARE_PRIVATE(LinkGoto) + Q_DISABLE_COPY(LinkGoto) +}; + +/** + * \brief Generic execution request. + * + * The LinkExecute link represent a "file name" execution request. The result + * depends on the \link fileName() file name\endlink: + * - if it is a document, then it is requested to be open + * - otherwise, it represents an executable to be run with the specified parameters + */ +class POPPLER_QT5_EXPORT LinkExecute : public Link +{ +public: + /** + * The file name to be executed + */ + QString fileName() const; + /** + * The parameters for the command. + */ + QString parameters() const; + + /** + * Create a new Execute link. + * + * \param linkArea the active area of the link + * \param file the file name to be open, or the program to be execute + * \param params the parameters for the program to execute + */ + LinkExecute(const QRectF &linkArea, const QString &file, const QString ¶ms); + /** + * Destructor. + */ + ~LinkExecute() override; + LinkType linkType() const override; + +private: + Q_DECLARE_PRIVATE(LinkExecute) + Q_DISABLE_COPY(LinkExecute) +}; + +/** + * \brief An URL to browse. + * + * The LinkBrowse link holds a URL (eg 'http://poppler.freedesktop.org', + * 'mailto:john@some.org', etc) to be open. + * + * The format of the URL is specified by RFC 2396 (http://www.ietf.org/rfc/rfc2396.txt) + */ +class POPPLER_QT5_EXPORT LinkBrowse : public Link +{ +public: + /** + * The URL to open + */ + QString url() const; + + /** + * Create a new browse link. + * + * \param linkArea the active area of the link + * \param url the URL to be open + */ + LinkBrowse(const QRectF &linkArea, const QString &url); + /** + * Destructor. + */ + ~LinkBrowse() override; + LinkType linkType() const override; + +private: + Q_DECLARE_PRIVATE(LinkBrowse) + Q_DISABLE_COPY(LinkBrowse) +}; + +/** + * \brief "Standard" action request. + * + * The LinkAction class represents a link that request a "standard" action + * to be performed by the viewer on the displayed document. + */ +class POPPLER_QT5_EXPORT LinkAction : public Link +{ +public: + /** + * The possible types of actions + */ + enum ActionType + { + PageFirst = 1, + PagePrev = 2, + PageNext = 3, + PageLast = 4, + HistoryBack = 5, + HistoryForward = 6, + Quit = 7, + Presentation = 8, + EndPresentation = 9, + Find = 10, + GoToPage = 11, + Close = 12, + Print = 13, ///< \since 0.16 + SaveAs = 14 ///< \since 22.04 + }; + + /** + * The action of the current LinkAction + */ + ActionType actionType() const; + + /** + * Create a new Action link, that executes a specified action + * on the document. + * + * \param linkArea the active area of the link + * \param actionType which action should be executed + */ + LinkAction(const QRectF &linkArea, ActionType actionType); + /** + * Destructor. + */ + ~LinkAction() override; + LinkType linkType() const override; + +private: + Q_DECLARE_PRIVATE(LinkAction) + Q_DISABLE_COPY(LinkAction) +}; + +/** + * Sound: a sound to be played. + * + * \since 0.6 + */ +class POPPLER_QT5_EXPORT LinkSound : public Link +{ +public: + // create a Link_Sound + LinkSound(const QRectF &linkArea, double volume, bool sync, bool repeat, bool mix, SoundObject *sound); + /** + * Destructor. + */ + ~LinkSound() override; + + LinkType linkType() const override; + + /** + * The volume to be used when playing the sound. + * + * The volume is in the range [ -1, 1 ], where: + * - a negative number: no volume (mute) + * - 1: full volume + */ + double volume() const; + /** + * Whether the playback of the sound should be synchronous + * (thus blocking, waiting for the end of the sound playback). + */ + bool synchronous() const; + /** + * Whether the sound should be played continuously (that is, + * started again when it ends) + */ + bool repeat() const; + /** + * Whether the playback of this sound can be mixed with + * playbacks with other sounds of the same document. + * + * \note When false, any other playback must be stopped before + * playing the sound. + */ + bool mix() const; + /** + * The sound object to be played + */ + SoundObject *sound() const; + +private: + Q_DECLARE_PRIVATE(LinkSound) + Q_DISABLE_COPY(LinkSound) +}; + +/** + * Rendition: Rendition link. + * + * \since 0.20 + */ +class POPPLER_QT5_EXPORT LinkRendition : public Link +{ +public: + /** + * Describes the possible rendition actions. + * + * \since 0.22 + */ + enum RenditionAction + { + NoRendition, + PlayRendition, + StopRendition, + PauseRendition, + ResumeRendition + }; + + /** + * Create a new rendition link. + * + * \param linkArea the active area of the link + * \param rendition the media rendition object. Ownership is taken + * \param operation the numeric operation (action) (@see ::LinkRendition::RenditionOperation) + * \param script the java script code + * \param annotationReference the object reference of the screen annotation associated with this rendition action + * \since 0.22 + */ + // TODO Next ABI break, remove & from annotationReference + LinkRendition(const QRectF &linkArea, ::MediaRendition *rendition, int operation, const QString &script, const Ref &annotationReference); + + /** + * Destructor. + */ + ~LinkRendition() override; + + LinkType linkType() const override; + + /** + * Returns the media rendition object if the redition provides one, @c 0 otherwise + */ + MediaRendition *rendition() const; + + /** + * Returns the action that should be executed if a rendition object is provided. + * + * \since 0.22 + */ + RenditionAction action() const; + + /** + * The JS code that shall be executed or an empty string. + * + * \since 0.22 + */ + QString script() const; + + /** + * Returns whether the given @p annotation is the referenced screen annotation for this rendition @p link. + * + * \since 0.22 + */ + bool isReferencedAnnotation(const ScreenAnnotation *annotation) const; + +private: + Q_DECLARE_PRIVATE(LinkRendition) + Q_DISABLE_COPY(LinkRendition) +}; + +/** + * JavaScript: a JavaScript code to be interpreted. + * + * \since 0.10 + */ +class POPPLER_QT5_EXPORT LinkJavaScript : public Link +{ +public: + /** + * Create a new JavaScript link. + * + * \param linkArea the active area of the link + * \param js the JS code to be interpreted + */ + LinkJavaScript(const QRectF &linkArea, const QString &js); + /** + * Destructor. + */ + ~LinkJavaScript() override; + + LinkType linkType() const override; + + /** + * The JS code + */ + QString script() const; + +private: + Q_DECLARE_PRIVATE(LinkJavaScript) + Q_DISABLE_COPY(LinkJavaScript) +}; + +/** + * Movie: a movie to be played. + * + * \since 0.20 + */ +class POPPLER_QT5_EXPORT LinkMovie : public Link +{ +public: + /** + * Describes the operation to be performed on the movie. + */ + enum Operation + { + Play, + Stop, + Pause, + Resume + }; + + /** + * Create a new Movie link. + * + * \param linkArea the active area of the link + * \param operation the operation to be performed on the movie + * \param annotationTitle the title of the movie annotation identifying the movie to be played + * \param annotationReference the object reference of the movie annotation identifying the movie to be played + * + * Note: This constructor is supposed to be used by Poppler::Page only. + */ + // TODO Next ABI break, remove & from annotationReference + LinkMovie(const QRectF &linkArea, Operation operation, const QString &annotationTitle, const Ref &annotationReference); + /** + * Destructor. + */ + ~LinkMovie() override; + LinkType linkType() const override; + /** + * Returns the operation to be performed on the movie. + */ + Operation operation() const; + /** + * Returns whether the given @p annotation is the referenced movie annotation for this movie @p link. + */ + bool isReferencedAnnotation(const MovieAnnotation *annotation) const; + +private: + Q_DECLARE_PRIVATE(LinkMovie) + Q_DISABLE_COPY(LinkMovie) +}; + +/** + * OCGState: an optional content group state change. + * + * \since 0.50 + */ +class POPPLER_QT5_EXPORT LinkOCGState : public Link +{ + friend class OptContentModel; + +public: + /** + * Create a new OCGState link. This is only used by Poppler::Page. + */ + explicit LinkOCGState(LinkOCGStatePrivate *ocgp); + /** + * Destructor. + */ + ~LinkOCGState() override; + + LinkType linkType() const override; + +private: + Q_DECLARE_PRIVATE(LinkOCGState) + Q_DISABLE_COPY(LinkOCGState) +}; + +/** + * Hide: an action to show / hide a field. + * + * \since 0.64 + */ +class POPPLER_QT5_EXPORT LinkHide : public Link +{ +public: + /** + * Create a new Hide link. This is only used by Poppler::Page. + */ + explicit LinkHide(LinkHidePrivate *lhidep); + /** + * Destructor. + */ + ~LinkHide() override; + + LinkType linkType() const override; + + /** + * The fully qualified target names of the action. + */ + QVector targets() const; + + /** + * Should this action change the visibility of the target to true. + */ + bool isShowAction() const; + +private: + Q_DECLARE_PRIVATE(LinkHide) + Q_DISABLE_COPY(LinkHide) +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-media.cc b/poppler-24.05.0/qt5/src/poppler-media.cc new file mode 100644 index 0000000000000000000000000000000000000000..cf634ca290b4f4673546ff7f2e5cf46cc01928a7 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-media.cc @@ -0,0 +1,161 @@ +/* poppler-media.cc: qt interface to poppler + * Copyright (C) 2012 Guillermo A. Amaral B. + * Copyright (C) 2013, 2018, 2021 Albert Astals Cid + * + * 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-media.h" + +#include "Rendition.h" + +#include "poppler-private.h" + +#include + +#define BUFFER_MAX 4096 + +namespace Poppler { + +class MediaRenditionPrivate +{ +public: + explicit MediaRenditionPrivate(::MediaRendition *renditionA) : rendition(renditionA) { } + + ~MediaRenditionPrivate() { delete rendition; } + + MediaRenditionPrivate(const MediaRenditionPrivate &) = delete; + MediaRenditionPrivate &operator=(const MediaRenditionPrivate &) = delete; + + ::MediaRendition *rendition; +}; + +MediaRendition::MediaRendition(::MediaRendition *rendition) : d_ptr(new MediaRenditionPrivate(rendition)) { } + +MediaRendition::~MediaRendition() +{ + delete d_ptr; +} + +bool MediaRendition::isValid() const +{ + Q_D(const MediaRendition); + return d->rendition && d->rendition->isOk(); +} + +QString MediaRendition::contentType() const +{ + Q_ASSERT(isValid() && "Invalid media rendition."); + Q_D(const MediaRendition); + return UnicodeParsedString(d->rendition->getContentType()); +} + +QString MediaRendition::fileName() const +{ + Q_ASSERT(isValid() && "Invalid media rendition."); + Q_D(const MediaRendition); + return UnicodeParsedString(d->rendition->getFileName()); +} + +bool MediaRendition::isEmbedded() const +{ + Q_ASSERT(isValid() && "Invalid media rendition."); + Q_D(const MediaRendition); + return d->rendition->getIsEmbedded(); +} + +QByteArray MediaRendition::data() const +{ + Q_ASSERT(isValid() && "Invalid media rendition."); + Q_D(const MediaRendition); + + Stream *s = d->rendition->getEmbbededStream(); + if (!s) { + return QByteArray(); + } + + QBuffer buffer; + unsigned char data[BUFFER_MAX]; + int bread; + + buffer.open(QIODevice::WriteOnly); + s->reset(); + while ((bread = s->doGetChars(BUFFER_MAX, data)) != 0) { + buffer.write(reinterpret_cast(data), bread); + } + buffer.close(); + + return buffer.data(); +} + +bool MediaRendition::autoPlay() const +{ + Q_D(const MediaRendition); + if (d->rendition->getBEParameters()) { + return d->rendition->getBEParameters()->autoPlay; + } else if (d->rendition->getMHParameters()) { + return d->rendition->getMHParameters()->autoPlay; + } else { + qDebug("No BE or MH parameters to reference!"); + } + return false; +} + +bool MediaRendition::showControls() const +{ + Q_D(const MediaRendition); + if (d->rendition->getBEParameters()) { + return d->rendition->getBEParameters()->showControls; + } else if (d->rendition->getMHParameters()) { + return d->rendition->getMHParameters()->showControls; + } else { + qDebug("No BE or MH parameters to reference!"); + } + return false; +} + +float MediaRendition::repeatCount() const +{ + Q_D(const MediaRendition); + if (d->rendition->getBEParameters()) { + return d->rendition->getBEParameters()->repeatCount; + } else if (d->rendition->getMHParameters()) { + return d->rendition->getMHParameters()->repeatCount; + } else { + qDebug("No BE or MH parameters to reference!"); + } + return 1.f; +} + +QSize MediaRendition::size() const +{ + Q_D(const MediaRendition); + const MediaParameters *mp = nullptr; + + if (d->rendition->getBEParameters()) { + mp = d->rendition->getBEParameters(); + } else if (d->rendition->getMHParameters()) { + mp = d->rendition->getMHParameters(); + } else { + qDebug("No BE or MH parameters to reference!"); + } + + if (mp) { + return QSize(mp->windowParams.width, mp->windowParams.height); + } + return QSize(); +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-media.h b/poppler-24.05.0/qt5/src/poppler-media.h new file mode 100644 index 0000000000000000000000000000000000000000..7d5fe93d5efaec3758e3cfe3f9ac6a07ef5f769c --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-media.h @@ -0,0 +1,100 @@ +/* poppler-media.h: qt interface to poppler + * Copyright (C) 2012 Guillermo A. Amaral B. + * Copyright (C) 2012, 2013, 2021 Albert Astals Cid + * + * 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. + */ + +#ifndef __POPPLER_MEDIARENDITION_H__ +#define __POPPLER_MEDIARENDITION_H__ + +#include "poppler-export.h" + +#include +#include + +class MediaRendition; +class QIODevice; + +namespace Poppler { +class MediaRenditionPrivate; + +/** + Qt wrapper for MediaRendition. + + \since 0.20 + */ +class POPPLER_QT5_EXPORT MediaRendition +{ +public: + /** + Constructs a MediaRendition. Takes ownership of the passed rendition + */ + explicit MediaRendition(::MediaRendition *rendition); + ~MediaRendition(); + + /** + Check if wrapper is holding a valid rendition object. + */ + bool isValid() const; + + /** + Returns content type. + */ + QString contentType() const; + + /** + Returns file name. + */ + QString fileName() const; + + /** + Returns true if media is embedded. + */ + bool isEmbedded() const; + + /** + Returns data buffer. + */ + QByteArray data() const; + + /** + Convenience accessor for auto-play parameter. + */ + bool autoPlay() const; + + /** + Convenience accessor for show controls parameter. + */ + bool showControls() const; + + /** + Convenience accessor for repeat count parameter. + */ + float repeatCount() const; + + /** + Convenience accessor for size parameter. + */ + QSize size() const; + +private: + Q_DECLARE_PRIVATE(MediaRendition) + MediaRenditionPrivate *d_ptr; + Q_DISABLE_COPY(MediaRendition) +}; +} + +#endif /* __POPPLER_MEDIARENDITION_H__ */ diff --git a/poppler-24.05.0/qt5/src/poppler-movie.cc b/poppler-24.05.0/qt5/src/poppler-movie.cc new file mode 100644 index 0000000000000000000000000000000000000000..2e477c587c5777cf9ec09bfd953675af3bb34853 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-movie.cc @@ -0,0 +1,106 @@ +/* poppler-sound.cc: qt interface to poppler + * Copyright (C) 2008, 2010, Pino Toscano + * Copyright (C) 2008, 2018, 2022, Albert Astals Cid + * Copyright (C) 2010, Carlos Garcia Campos + * Copyright (C) 2012, Tobias Koenig + * + * 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 "Object.h" +#include "Annot.h" +#include "Movie.h" + +#include + +namespace Poppler { + +class MovieData +{ +public: + MovieData() : m_movieObj(nullptr) { } + + ~MovieData() = default; + + MovieData(const MovieData &) = delete; + MovieData &operator=(const MovieData &) = delete; + + std::unique_ptr m_movieObj; + QSize m_size; + int m_rotation; + QImage m_posterImage; + MovieObject::PlayMode m_playMode : 3; + bool m_showControls : 1; +}; + +MovieObject::MovieObject(AnnotMovie *ann) +{ + m_movieData = new MovieData(); + m_movieData->m_movieObj = ann->getMovie()->copy(); + // TODO: copy poster image + + const MovieActivationParameters *mp = m_movieData->m_movieObj->getActivationParameters(); + int width, height; + m_movieData->m_movieObj->getFloatingWindowSize(&width, &height); + m_movieData->m_size = QSize(width, height); + m_movieData->m_rotation = m_movieData->m_movieObj->getRotationAngle(); + m_movieData->m_showControls = mp->showControls; + m_movieData->m_playMode = (MovieObject::PlayMode)mp->repeatMode; +} + +MovieObject::~MovieObject() +{ + delete m_movieData; +} + +QString MovieObject::url() const +{ + const GooString *goo = m_movieData->m_movieObj->getFileName(); + return goo ? QString(goo->c_str()) : QString(); +} + +QSize MovieObject::size() const +{ + return m_movieData->m_size; +} + +int MovieObject::rotation() const +{ + return m_movieData->m_rotation; +} + +bool MovieObject::showControls() const +{ + return m_movieData->m_showControls; +} + +MovieObject::PlayMode MovieObject::playMode() const +{ + return m_movieData->m_playMode; +} + +bool MovieObject::showPosterImage() const +{ + return (m_movieData->m_movieObj->getShowPoster() == true); +} + +QImage MovieObject::posterImage() const +{ + return m_movieData->m_posterImage; +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-optcontent-private.h b/poppler-24.05.0/qt5/src/poppler-optcontent-private.h new file mode 100644 index 0000000000000000000000000000000000000000..589fb0bc3358b77087b62643ee9e903362e1d955 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-optcontent-private.h @@ -0,0 +1,133 @@ +/* poppler-optcontent-private.h: qt interface to poppler + * + * Copyright (C) 2007, Brad Hards + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2016, 2018, 2019, 2021, Albert Astals Cid + * Copyright (C) 2017, Hubert Figuière + * + * 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. + */ + +#ifndef POPPLER_OPTCONTENT_PRIVATE_H +#define POPPLER_OPTCONTENT_PRIVATE_H + +#include +#include +#include + +class Array; +class OCGs; +class OptionalContentGroup; + +class QModelIndex; + +namespace Poppler { +class OptContentItem; +class OptContentModel; +class OptContentModelPrivate; + +class RadioButtonGroup +{ +public: + RadioButtonGroup(OptContentModelPrivate *ocModel, Array *rbarray); + ~RadioButtonGroup(); + QSet setItemOn(OptContentItem *itemToSetOn); + +private: + QList itemsInGroup; +}; + +class OptContentItem +{ +public: + enum ItemState + { + On, + Off, + HeadingOnly + }; + + explicit OptContentItem(OptionalContentGroup *group); + explicit OptContentItem(const QString &label); + OptContentItem(); + ~OptContentItem(); + + QString name() const { return m_name; } + ItemState state() const { return m_stateBackup; } + void setState(ItemState state, bool obeyRadioGroups, QSet &changedItems); + + QList childList() { return m_children; } + + void setParent(OptContentItem *parent) { m_parent = parent; } + OptContentItem *parent() { return m_parent; } + + void addChild(OptContentItem *child); + + void appendRBGroup(RadioButtonGroup *rbgroup); + + bool isEnabled() const { return m_enabled; } + + QSet recurseListChildren(bool includeMe = false) const; + + OptionalContentGroup *group() const { return m_group; } + +private: + OptionalContentGroup *m_group; + QString m_name; + ItemState m_state; // true for ON, false for OFF + ItemState m_stateBackup; + QList m_children; + OptContentItem *m_parent; + QList m_rbGroups; + bool m_enabled; +}; + +class OptContentModelPrivate +{ +public: + OptContentModelPrivate(OptContentModel *qq, OCGs *optContent); + ~OptContentModelPrivate(); + + OptContentModelPrivate(const OptContentModelPrivate &) = delete; + OptContentModelPrivate &operator=(const OptContentModelPrivate &) = delete; + + void parseRBGroupsArray(Array *rBGroupArray); + OptContentItem *nodeFromIndex(const QModelIndex &index, bool canBeNull = false) const; + QModelIndex indexFromItem(OptContentItem *node, int column) const; + + /** + Get the OptContentItem corresponding to a given reference value. + + \param ref the reference number (e.g. from Object.getRefNum()) to look up + + \return the matching optional content item, or null if the reference wasn't found + */ + OptContentItem *itemFromRef(const QString &ref) const; + void setRootNode(OptContentItem *node); + + OptContentModel *q; + + QMap m_optContentItems; + QList m_headerOptContentItems; + QList m_rbgroups; + OptContentItem *m_rootNode; + +private: + void addChild(OptContentItem *parent, OptContentItem *child); + void parseOrderArray(OptContentItem *parentNode, Array *orderArray); +}; +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-optcontent.cc b/poppler-24.05.0/qt5/src/poppler-optcontent.cc new file mode 100644 index 0000000000000000000000000000000000000000..e2864bcb1c9c8e399548c68c22781b5465e080e3 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-optcontent.cc @@ -0,0 +1,439 @@ +/* poppler-optcontent.cc: qt interface to poppler + * + * Copyright (C) 2007, Brad Hards + * Copyright (C) 2008, 2014, Pino Toscano + * Copyright (C) 2008, Carlos Garcia Campos + * Copyright (C) 2015-2019, 2022, Albert Astals Cid + * Copyright (C) 2017, Hubert Figuière + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018 Adam Reichold + * Copyright (C) 2019, 2020 Oliver Sander + * + * 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 +#include + +#include "poppler/OptionalContent.h" +#include "poppler/Link.h" + +namespace Poppler { + +RadioButtonGroup::RadioButtonGroup(OptContentModelPrivate *ocModel, Array *rbarray) +{ + itemsInGroup.reserve(rbarray->getLength()); + for (int i = 0; i < rbarray->getLength(); ++i) { + const Object &ref = rbarray->getNF(i); + if (!ref.isRef()) { + qDebug() << "expected ref, but got:" << ref.getType(); + } + OptContentItem *item = ocModel->itemFromRef(QString::number(ref.getRefNum())); + itemsInGroup.append(item); + } + for (OptContentItem *item : std::as_const(itemsInGroup)) { + item->appendRBGroup(this); + } +} + +RadioButtonGroup::~RadioButtonGroup() { } + +QSet RadioButtonGroup::setItemOn(OptContentItem *itemToSetOn) +{ + QSet changedItems; + for (OptContentItem *thisItem : std::as_const(itemsInGroup)) { + if (thisItem != itemToSetOn) { + QSet newChangedItems; + thisItem->setState(OptContentItem::Off, false /*obeyRadioGroups*/, newChangedItems); + changedItems += newChangedItems; + } + } + return changedItems; +} + +OptContentItem::OptContentItem(OptionalContentGroup *group) +{ + m_group = group; + m_parent = nullptr; + m_name = UnicodeParsedString(group->getName()); + if (group->getState() == OptionalContentGroup::On) { + m_state = OptContentItem::On; + } else { + m_state = OptContentItem::Off; + } + m_stateBackup = m_state; + m_enabled = true; +} + +OptContentItem::OptContentItem(const QString &label) +{ + m_parent = nullptr; + m_name = label; + m_group = nullptr; + m_state = OptContentItem::HeadingOnly; + m_stateBackup = m_state; + m_enabled = true; +} + +OptContentItem::OptContentItem() : m_parent(nullptr), m_enabled(true) { } + +OptContentItem::~OptContentItem() { } + +void OptContentItem::appendRBGroup(RadioButtonGroup *rbgroup) +{ + m_rbGroups.append(rbgroup); +} + +void OptContentItem::setState(ItemState state, bool obeyRadioGroups, QSet &changedItems) +{ + if (state == m_state) { + return; + } + + m_state = state; + m_stateBackup = m_state; + changedItems.insert(this); + QSet empty; + Q_FOREACH (OptContentItem *child, m_children) { + ItemState oldState = child->m_stateBackup; + child->setState(state == OptContentItem::On ? child->m_stateBackup : OptContentItem::Off, true /*obeyRadioGroups*/, empty); + child->m_enabled = state == OptContentItem::On; + child->m_stateBackup = oldState; + } + if (!m_group) { + return; + } + if (state == OptContentItem::On) { + m_group->setState(OptionalContentGroup::On); + if (obeyRadioGroups) { + for (RadioButtonGroup *rbgroup : std::as_const(m_rbGroups)) { + changedItems += rbgroup->setItemOn(this); + } + } + } else if (state == OptContentItem::Off) { + m_group->setState(OptionalContentGroup::Off); + } +} + +void OptContentItem::addChild(OptContentItem *child) +{ + m_children += child; + child->setParent(this); +} + +QSet OptContentItem::recurseListChildren(bool includeMe) const +{ + QSet ret; + if (includeMe) { + ret.insert(const_cast(this)); + } + Q_FOREACH (OptContentItem *child, m_children) { + ret += child->recurseListChildren(true); + } + return ret; +} + +OptContentModelPrivate::OptContentModelPrivate(OptContentModel *qq, OCGs *optContent) : q(qq) +{ + m_rootNode = new OptContentItem(); + const auto &ocgs = optContent->getOCGs(); + + for (const auto &ocg : ocgs) { + OptContentItem *node = new OptContentItem(ocg.second.get()); + m_optContentItems.insert(QString::number(ocg.first.num), node); + } + + if (optContent->getOrderArray() == nullptr) { + // no Order array, so drop them all at the top level + QMapIterator i(m_optContentItems); + while (i.hasNext()) { + i.next(); + addChild(m_rootNode, i.value()); + } + } else { + parseOrderArray(m_rootNode, optContent->getOrderArray()); + } + + parseRBGroupsArray(optContent->getRBGroupsArray()); +} + +OptContentModelPrivate::~OptContentModelPrivate() +{ + qDeleteAll(m_optContentItems); + qDeleteAll(m_rbgroups); + qDeleteAll(m_headerOptContentItems); + delete m_rootNode; +} + +void OptContentModelPrivate::parseOrderArray(OptContentItem *parentNode, Array *orderArray) +{ + OptContentItem *lastItem = parentNode; + for (int i = 0; i < orderArray->getLength(); ++i) { + Object orderItem = orderArray->get(i); + if (orderItem.isDict()) { + const Object &item = orderArray->getNF(i); + if (item.isRef()) { + OptContentItem *ocItem = m_optContentItems.value(QString::number(item.getRefNum())); + if (ocItem) { + addChild(parentNode, ocItem); + lastItem = ocItem; + } else { + qDebug() << "could not find group for object" << item.getRefNum(); + } + } + } else if ((orderItem.isArray()) && (orderItem.arrayGetLength() > 0)) { + parseOrderArray(lastItem, orderItem.getArray()); + } else if (orderItem.isString()) { + const GooString *label = orderItem.getString(); + OptContentItem *header = new OptContentItem(UnicodeParsedString(label)); + m_headerOptContentItems.append(header); + addChild(parentNode, header); + parentNode = header; + lastItem = header; + } else { + qDebug() << "something unexpected"; + } + } +} + +void OptContentModelPrivate::parseRBGroupsArray(Array *rBGroupArray) +{ + if (!rBGroupArray) { + return; + } + // This is an array of array(s) + for (int i = 0; i < rBGroupArray->getLength(); ++i) { + Object rbObj = rBGroupArray->get(i); + if (!rbObj.isArray()) { + qDebug() << "expected inner array, got:" << rbObj.getType(); + return; + } + Array *rbarray = rbObj.getArray(); + RadioButtonGroup *rbg = new RadioButtonGroup(this, rbarray); + m_rbgroups.append(rbg); + } +} + +OptContentModel::OptContentModel(OCGs *optContent, QObject *parent) : QAbstractItemModel(parent) +{ + d = new OptContentModelPrivate(this, optContent); +} + +OptContentModel::~OptContentModel() +{ + delete d; +} + +void OptContentModelPrivate::setRootNode(OptContentItem *node) +{ + q->beginResetModel(); + delete m_rootNode; + m_rootNode = node; + q->endResetModel(); +} + +QModelIndex OptContentModel::index(int row, int column, const QModelIndex &parent) const +{ + if (row < 0 || column != 0) { + return QModelIndex(); + } + + OptContentItem *parentNode = d->nodeFromIndex(parent); + if (row < parentNode->childList().count()) { + return createIndex(row, column, parentNode->childList().at(row)); + } + return QModelIndex(); +} + +QModelIndex OptContentModel::parent(const QModelIndex &child) const +{ + OptContentItem *childNode = d->nodeFromIndex(child); + if (!childNode) { + return QModelIndex(); + } + return d->indexFromItem(childNode->parent(), child.column()); +} + +QModelIndex OptContentModelPrivate::indexFromItem(OptContentItem *node, int column) const +{ + if (!node) { + return QModelIndex(); + } + OptContentItem *parentNode = node->parent(); + if (!parentNode) { + return QModelIndex(); + } + const int row = parentNode->childList().indexOf(node); + return q->createIndex(row, column, node); +} + +int OptContentModel::rowCount(const QModelIndex &parent) const +{ + OptContentItem *parentNode = d->nodeFromIndex(parent); + if (!parentNode) { + return 0; + } else { + return parentNode->childList().count(); + } +} + +int OptContentModel::columnCount(const QModelIndex &parent) const +{ + return 1; +} + +QVariant OptContentModel::data(const QModelIndex &index, int role) const +{ + OptContentItem *node = d->nodeFromIndex(index, true); + if (!node) { + return QVariant(); + } + + switch (role) { + case Qt::DisplayRole: + return node->name(); + break; + case Qt::EditRole: + if (node->state() == OptContentItem::On) { + return true; + } else if (node->state() == OptContentItem::Off) { + return false; + } + break; + case Qt::CheckStateRole: + if (node->state() == OptContentItem::On) { + return Qt::Checked; + } else if (node->state() == OptContentItem::Off) { + return Qt::Unchecked; + } + break; + } + + return QVariant(); +} + +bool OptContentModel::setData(const QModelIndex &index, const QVariant &value, int role) +{ + OptContentItem *node = d->nodeFromIndex(index, true); + if (!node) { + return false; + } + + switch (role) { + case Qt::CheckStateRole: { + const bool newvalue = value.toBool(); + QSet changedItems; + node->setState(newvalue ? OptContentItem::On : OptContentItem::Off, true /*obeyRadioGroups*/, changedItems); + + if (!changedItems.isEmpty()) { + changedItems += node->recurseListChildren(false); + QModelIndexList indexes; + Q_FOREACH (OptContentItem *item, changedItems) { + indexes.append(d->indexFromItem(item, 0)); + } + std::stable_sort(indexes.begin(), indexes.end()); + Q_FOREACH (const QModelIndex &changedIndex, indexes) { + emit dataChanged(changedIndex, changedIndex); + } + return true; + } + break; + } + } + + return false; +} + +Qt::ItemFlags OptContentModel::flags(const QModelIndex &index) const +{ + OptContentItem *node = d->nodeFromIndex(index); + Qt::ItemFlags itemFlags = Qt::ItemIsSelectable | Qt::ItemIsUserCheckable; + if (node->isEnabled()) { + itemFlags |= Qt::ItemIsEnabled; + } + return itemFlags; +} + +QVariant OptContentModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + return QAbstractItemModel::headerData(section, orientation, role); +} + +void OptContentModel::applyLink(LinkOCGState *link) +{ + LinkOCGStatePrivate *linkPrivate = link->d_func(); + + QSet changedItems; + + const std::vector<::LinkOCGState::StateList> &statesList = linkPrivate->stateList; + for (const ::LinkOCGState::StateList &stateList : statesList) { + const std::vector &refsList = stateList.list; + for (const Ref &ref : refsList) { + OptContentItem *item = d->itemFromRef(QString::number(ref.num)); + + if (stateList.st == ::LinkOCGState::On) { + item->setState(OptContentItem::On, linkPrivate->preserveRB, changedItems); + } else if (stateList.st == ::LinkOCGState::Off) { + item->setState(OptContentItem::Off, linkPrivate->preserveRB, changedItems); + } else { + OptContentItem::ItemState newState = item->state() == OptContentItem::On ? OptContentItem::Off : OptContentItem::On; + item->setState(newState, linkPrivate->preserveRB, changedItems); + } + } + } + + if (!changedItems.isEmpty()) { + QSet aux; + Q_FOREACH (OptContentItem *item, aux) { + changedItems += item->recurseListChildren(false); + } + + QModelIndexList indexes; + Q_FOREACH (OptContentItem *item, changedItems) { + indexes.append(d->indexFromItem(item, 0)); + } + std::stable_sort(indexes.begin(), indexes.end()); + Q_FOREACH (const QModelIndex &changedIndex, indexes) { + emit dataChanged(changedIndex, changedIndex); + } + } +} + +void OptContentModelPrivate::addChild(OptContentItem *parent, OptContentItem *child) +{ + parent->addChild(child); +} + +OptContentItem *OptContentModelPrivate::itemFromRef(const QString &ref) const +{ + return m_optContentItems.value(ref); +} + +OptContentItem *OptContentModelPrivate::nodeFromIndex(const QModelIndex &index, bool canBeNull) const +{ + if (index.isValid()) { + return static_cast(index.internalPointer()); + } else { + return canBeNull ? nullptr : m_rootNode; + } +} +} diff --git a/poppler-24.05.0/qt5/src/poppler-optcontent.h b/poppler-24.05.0/qt5/src/poppler-optcontent.h new file mode 100644 index 0000000000000000000000000000000000000000..a126140e23ef22842f980fe999f6538a741e6633 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-optcontent.h @@ -0,0 +1,84 @@ +/* poppler-optcontent.h: qt interface to poppler + * + * Copyright (C) 2007, Brad Hards + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2013, Anthony Granger + * Copyright (C) 2016, 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef POPPLER_OPTCONTENT_H +#define POPPLER_OPTCONTENT_H + +#include + +#include "poppler-export.h" +#include "poppler-link.h" + +class OCGs; + +namespace Poppler { +class Document; +class OptContentModelPrivate; + +/** + * \brief Model for optional content + * + * OptContentModel is an item model representing the optional content items + * that can be found in PDF documents. + * + * The model offers a mostly read-only display of the data, allowing to + * enable/disable some contents setting the Qt::CheckStateRole data role. + * + * \since 0.8 + */ +class POPPLER_QT5_EXPORT OptContentModel : public QAbstractItemModel +{ + friend class Document; + + Q_OBJECT + +public: + ~OptContentModel() override; + + QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &child) const override; + + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent) const override; + + QVariant data(const QModelIndex &index, int role) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + + Qt::ItemFlags flags(const QModelIndex &index) const override; + + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + + /** + * Applies the Optional Content Changes specified by that link. + * \since 0.50 + */ + void applyLink(LinkOCGState *link); + +private: + explicit OptContentModel(OCGs *optContent, QObject *parent = nullptr); + + friend class OptContentModelPrivate; + OptContentModelPrivate *d; +}; +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-outline-private.h b/poppler-24.05.0/qt5/src/poppler-outline-private.h new file mode 100644 index 0000000000000000000000000000000000000000..e7b9080da0008daf1a6efbd740da4904fbedc3e3 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-outline-private.h @@ -0,0 +1,48 @@ +/* poppler-outline-private.h: qt interface to poppler + * + * Copyright (C) 2018 Adam Reichold + * Copyright (C) 2019 Albert Astals Cid + * + * 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. + */ + +#ifndef _POPPLER_OUTLINE_PRIVATE_H_ +#define _POPPLER_OUTLINE_PRIVATE_H_ + +#include +#include + +class OutlineItem; + +namespace Poppler { + +class DocumentData; +class LinkDestination; + +struct OutlineItemData +{ + OutlineItemData(::OutlineItem *oi, DocumentData *dd) : data { oi }, documentData { dd } { } + ::OutlineItem *data; + DocumentData *documentData; + + mutable QString name; + mutable QSharedPointer destination; + mutable QString externalFileName; + mutable QString uri; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-outline.cc b/poppler-24.05.0/qt5/src/poppler-outline.cc new file mode 100644 index 0000000000000000000000000000000000000000..5cc20d6b228a63294ce0398b5a3e994eb0022ac3 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-outline.cc @@ -0,0 +1,185 @@ +/* poppler-outline.cc: qt interface to poppler + * + * Copyright (C) 2018 Adam Reichold + * Copyright (C) 2019 Oliver Sander + * Copyright (C) 2019 Albert Astals Cid + * Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela + * + * 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 +#include + +#include "poppler-private.h" +#include "poppler-outline-private.h" + +#include "Link.h" +#include "Outline.h" + +namespace Poppler { + +OutlineItem::OutlineItem() : m_data { new OutlineItemData { nullptr, nullptr } } { } + +OutlineItem::OutlineItem(OutlineItemData *data) : m_data { data } { } + +OutlineItem::~OutlineItem() +{ + delete m_data; + m_data = nullptr; +} + +OutlineItem::OutlineItem(const OutlineItem &other) : m_data { new OutlineItemData { *other.m_data } } { } + +OutlineItem &OutlineItem::operator=(const OutlineItem &other) +{ + if (this == &other) { + return *this; + } + + auto *data = new OutlineItemData { *other.m_data }; + qSwap(m_data, data); + delete data; + + return *this; +} + +OutlineItem::OutlineItem(OutlineItem &&other) noexcept : m_data { other.m_data } +{ + other.m_data = nullptr; +} + +OutlineItem &OutlineItem::operator=(OutlineItem &&other) noexcept +{ + qSwap(m_data, other.m_data); + + return *this; +} + +bool OutlineItem::isNull() const +{ + return !m_data->data; +} + +QString OutlineItem::name() const +{ + QString &name = m_data->name; + + if (name.isEmpty()) { + if (const ::OutlineItem *data = m_data->data) { + name = unicodeToQString(data->getTitle()); + } + } + + return name; +} + +bool OutlineItem::isOpen() const +{ + bool isOpen = false; + + if (const ::OutlineItem *data = m_data->data) { + isOpen = data->isOpen(); + } + + return isOpen; +} + +QSharedPointer OutlineItem::destination() const +{ + QSharedPointer &destination = m_data->destination; + + if (!destination) { + if (const ::OutlineItem *data = m_data->data) { + if (const ::LinkAction *action = data->getAction()) { + if (action->getKind() == actionGoTo) { + const auto *linkGoTo = static_cast(action); + destination.reset(new LinkDestination(LinkDestinationData(linkGoTo->getDest(), linkGoTo->getNamedDest(), m_data->documentData, false))); + } else if (action->getKind() == actionGoToR) { + const auto *linkGoToR = static_cast(action); + const bool external = linkGoToR->getFileName() != nullptr; + destination.reset(new LinkDestination(LinkDestinationData(linkGoToR->getDest(), linkGoToR->getNamedDest(), m_data->documentData, external))); + } + } + } + } + + return destination; +} + +QString OutlineItem::externalFileName() const +{ + QString &externalFileName = m_data->externalFileName; + + if (externalFileName.isEmpty()) { + if (const ::OutlineItem *data = m_data->data) { + if (const ::LinkAction *action = data->getAction()) { + if (action->getKind() == actionGoToR) { + if (const GooString *fileName = static_cast(action)->getFileName()) { + externalFileName = UnicodeParsedString(fileName); + } + } + } + } + } + + return externalFileName; +} + +QString OutlineItem::uri() const +{ + QString &uri = m_data->uri; + + if (uri.isEmpty()) { + if (const ::OutlineItem *data = m_data->data) { + if (const ::LinkAction *action = data->getAction()) { + if (action->getKind() == actionURI) { + uri = UnicodeParsedString(static_cast(action)->getURI()); + } + } + } + } + + return uri; +} + +bool OutlineItem::hasChildren() const +{ + bool result = false; + + if (::OutlineItem *data = m_data->data) { + result = data->hasKids(); + } + + return result; +} + +QVector OutlineItem::children() const +{ + QVector result; + + if (::OutlineItem *data = m_data->data) { + data->open(); + if (const std::vector<::OutlineItem *> *kids = data->getKids()) { + for (void *kid : *kids) { + result.push_back(OutlineItem { new OutlineItemData { static_cast<::OutlineItem *>(kid), m_data->documentData } }); + } + } + } + + return result; +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-page-private.h b/poppler-24.05.0/qt5/src/poppler-page-private.h new file mode 100644 index 0000000000000000000000000000000000000000..855efbfff28755e525f4453a7356e63142529c12 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-page-private.h @@ -0,0 +1,58 @@ +/* poppler-page.cc: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2007, 2012, Albert Astals Cid + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2015 Adam Reichold + * Copyright (C) 2018, 2021 Nelson Benítez León + * + * 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. + */ + +#ifndef _POPPLER_PAGE_PRIVATE_H_ +#define _POPPLER_PAGE_PRIVATE_H_ + +#include "CharTypes.h" + +class QRectF; + +class LinkAction; +class Page; +class TextPage; + +namespace Poppler { + +class DocumentData; +class PageTransition; + +class PageData +{ +public: + Link *convertLinkActionToLink(::LinkAction *a, const QRectF &linkArea); + + DocumentData *parentDoc; + ::Page *page; + int index; + PageTransition *transition; + + static Link *convertLinkActionToLink(::LinkAction *a, DocumentData *parentDoc, const QRectF &linkArea); + + TextPage *prepareTextSearch(const QString &text, Page::Rotation rotate, QVector *u); + bool performSingleTextSearch(TextPage *textPage, QVector &u, double &sLeft, double &sTop, double &sRight, double &sBottom, Page::SearchDirection direction, bool sCase, bool sWords, bool sDiacritics, bool sAcrossLines); + QList performMultipleTextSearch(TextPage *textPage, QVector &u, bool sCase, bool sWords, bool sDiacritics, bool sAcrossLines); +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-page-transition-private.h b/poppler-24.05.0/qt5/src/poppler-page-transition-private.h new file mode 100644 index 0000000000000000000000000000000000000000..4dabd14350d059bc2da18e25f9f59c88c4318a1f --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-page-transition-private.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2005, 2019, Albert Astals Cid + * Copyright (C) 2019 Oliver Sander + * + * 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. + */ + +#ifndef _POPPLER_PAGE_TRANSITION_PRIVATE_H_ +#define _POPPLER_PAGE_TRANSITION_PRIVATE_H_ + +class Object; + +namespace Poppler { + +class PageTransitionParams +{ +public: + Object *dictObj; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-page-transition.cc b/poppler-24.05.0/qt5/src/poppler-page-transition.cc new file mode 100644 index 0000000000000000000000000000000000000000..3b8d6dab61ad461af66a2992d9b815b12db88e43 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-page-transition.cc @@ -0,0 +1,105 @@ +/* PageTransition.cc + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2015, Arseniy Lartsev + * Copyright (C) 2018, 2021, Albert Astals Cid + * + * 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 "PageTransition.h" +#include "poppler-page-transition.h" +#include "poppler-page-transition-private.h" + +namespace Poppler { + +class PageTransitionData +{ +public: + explicit PageTransitionData(Object *trans) { pt = new ::PageTransition(trans); } + + PageTransitionData(const PageTransitionData &ptd) { pt = new ::PageTransition(*ptd.pt); } + + ~PageTransitionData() { delete pt; } + + PageTransitionData &operator=(const PageTransitionData &) = delete; + + ::PageTransition *pt; +}; + +PageTransition::PageTransition(const PageTransitionParams ¶ms) // clazy:exclude=function-args-by-value +{ + data = new PageTransitionData(params.dictObj); +} + +PageTransition::PageTransition(const PageTransition &pt) +{ + data = new PageTransitionData(*pt.data); +} + +PageTransition::~PageTransition() +{ + delete data; +} + +PageTransition &PageTransition::operator=(const PageTransition &other) +{ + if (this != &other) { + delete data; + data = new PageTransitionData(*other.data); + } + + return *this; +} + +PageTransition::Type PageTransition::type() const +{ + return (Poppler::PageTransition::Type)data->pt->getType(); +} + +int PageTransition::duration() const +{ + return data->pt->getDuration(); +} + +double PageTransition::durationReal() const +{ + return data->pt->getDuration(); +} + +PageTransition::Alignment PageTransition::alignment() const +{ + return (Poppler::PageTransition::Alignment)data->pt->getAlignment(); +} + +PageTransition::Direction PageTransition::direction() const +{ + return (Poppler::PageTransition::Direction)data->pt->getDirection(); +} + +int PageTransition::angle() const +{ + return data->pt->getAngle(); +} + +double PageTransition::scale() const +{ + return data->pt->getScale(); +} +bool PageTransition::isRectangular() const +{ + return data->pt->isRectangular(); +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-page-transition.h b/poppler-24.05.0/qt5/src/poppler-page-transition.h new file mode 100644 index 0000000000000000000000000000000000000000..15db5e83a299aed211bf555c3848808061fc22c3 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-page-transition.h @@ -0,0 +1,165 @@ +/* PageTransition.h + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2005, Brad Hards + * Copyright (C) 2015, Arseniy Lartsev + * Copyright (C) 2018, 2021 Albert Astals Cid + * + * 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. + */ + +#ifndef __PAGETRANSITION_X_H__ +#define __PAGETRANSITION_X_H__ + +#include "poppler-export.h" + +#include + +namespace Poppler { + +class PageTransitionParams; +class PageTransitionData; + +/** + \brief Describes how a PDF file viewer shall perform the transition + from one page to another + + In PDF files there is a way to specify if the viewer shall use + certain effects to perform the transition from one page to + another. This feature can be used, e.g., in a PDF-based beamer + presentation. + + This utility class represents the transition effect, and can be + used to extract the information from a PDF object. +*/ + +class POPPLER_QT5_EXPORT PageTransition +{ +public: + /** \brief transition effect that shall be used + */ + // if changed remember to keep in sync with PageTransition.h enum + enum Type + { + Replace = 0, + Split, + Blinds, + Box, + Wipe, + Dissolve, + Glitter, + Fly, + Push, + Cover, + Uncover, + Fade + }; + + /** \brief alignment of the transition effect that shall be used + */ + // if changed remember to keep in sync with PageTransition.h enum + enum Alignment + { + Horizontal = 0, + Vertical + }; + + /** \brief direction of the transition effect that shall be used + */ + // if changed remember to keep in sync with PageTransition.h enum + enum Direction + { + Inward = 0, + Outward + }; + + /** \brief Construct a new PageTransition object from a page dictionary. + + Users of the library will rarely need to construct a + PageTransition object themselves. Instead, the method + Poppler::Page::transition() can be used to find out if a certain + transition effect is specified. + + @warning In case or error, this method will print an error message to stderr, + and construct a default object. + + @param params an object whose dictionary will be read and + parsed. This must be a valid object, whose dictionaries are + accessed by the constructor. The object is only accessed by this + constructor, and may be deleted after the constructor returns. + */ + // TODO Next ABI break, make this private and remove reference + explicit PageTransition(const PageTransitionParams ¶ms); + + /** \brief copy constructor */ + PageTransition(const PageTransition &pt); + + /** \brief assignment operator \since 0.63 */ + PageTransition &operator=(const PageTransition &other); + + /** + Destructor + */ + ~PageTransition(); + + /** + \brief Get type of the transition. + */ + Type type() const; + + /** + \brief Get duration of the transition in seconds as integer + + \deprecated This function is left for backward compatibility, use durationReal() instead. + */ + Q_DECL_DEPRECATED int duration() const; + + /** + \brief Get duration of the transition in seconds + */ + double durationReal() const; + + /** + \brief Get dimension in which the transition effect occurs. + */ + Alignment alignment() const; + + /** + \brief Get direction of motion of the transition effect. + */ + Direction direction() const; + + /** + \brief Get direction in which the transition effect moves. + */ + int angle() const; + + /** + \brief Get starting or ending scale. + */ + double scale() const; + + /** + \brief Returns true if the area to be flown is rectangular and + opaque. + */ + bool isRectangular() const; + +private: + PageTransitionData *data; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-page.cc b/poppler-24.05.0/qt5/src/poppler-page.cc new file mode 100644 index 0000000000000000000000000000000000000000..cb9d17efcc7a5459f506f2ea8e4cded7c1bd8449 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-page.cc @@ -0,0 +1,954 @@ +/* poppler-page.cc: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2005, Brad Hards + * Copyright (C) 2005-2022, Albert Astals Cid + * Copyright (C) 2005, Stefan Kebekus + * Copyright (C) 2006-2011, Pino Toscano + * Copyright (C) 2008 Carlos Garcia Campos + * Copyright (C) 2009 Shawn Rutledge + * Copyright (C) 2010, 2012, Guillermo Amaral + * Copyright (C) 2010 Suzuki Toshiya + * Copyright (C) 2010 Matthias Fauconneau + * Copyright (C) 2010 Hib Eris + * Copyright (C) 2012 Tobias Koenig + * Copyright (C) 2012 Fabio D'Urso + * Copyright (C) 2012, 2015 Adam Reichold + * Copyright (C) 2012, 2013 Thomas Freitag + * Copyright (C) 2015 William Bader + * Copyright (C) 2016 Arseniy Lartsev + * Copyright (C) 2016, Hanno Meyer-Thurow + * Copyright (C) 2017-2020, Oliver Sander + * Copyright (C) 2017 Adrian Johnson + * Copyright (C) 2017, 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018 Intevation GmbH + * Copyright (C) 2018, Tobias Deiminger + * Copyright (C) 2018, 2021 Nelson Benítez León + * Copyright (C) 2020 Oliver Sander + * Copyright (C) 2020 Philipp Knechtges + * Copyright (C) 2021 Hubert Figuiere + * Copyright (C) 2021 Thomas Huxhorn + * Copyright (C) 2023 Kevin Ottens . Work sponsored by De Bortoli Wines + * Copyright (C) 2024 Stefan Brüns + * + * 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 + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "poppler-private.h" +#include "poppler-page-transition-private.h" +#include "poppler-page-private.h" +#include "poppler-link-extractor-private.h" +#include "poppler-link-private.h" +#include "poppler-annotation-private.h" +#include "poppler-form.h" +#include "poppler-media.h" + +namespace Poppler { + +class TextExtractionAbortHelper +{ +public: + TextExtractionAbortHelper(Page::ShouldAbortQueryFunc shouldAbortCallback, const QVariant &payloadA) + { + shouldAbortExtractionCallback = shouldAbortCallback; + payload = payloadA; + } + + Page::ShouldAbortQueryFunc shouldAbortExtractionCallback = nullptr; + QVariant payload; +}; + +class OutputDevCallbackHelper +{ +public: + void setCallbacks(Page::RenderToImagePartialUpdateFunc callback, Page::ShouldRenderToImagePartialQueryFunc shouldDoCallback, Page::ShouldAbortQueryFunc shouldAbortCallback, const QVariant &payloadA) + { + partialUpdateCallback = callback; + shouldDoPartialUpdateCallback = shouldDoCallback; + shouldAbortRenderCallback = shouldAbortCallback; + payload = payloadA; + } + + Page::RenderToImagePartialUpdateFunc partialUpdateCallback = nullptr; + Page::ShouldRenderToImagePartialQueryFunc shouldDoPartialUpdateCallback = nullptr; + Page::ShouldAbortQueryFunc shouldAbortRenderCallback = nullptr; + QVariant payload; +}; + +class Qt5SplashOutputDev : public SplashOutputDev, public OutputDevCallbackHelper +{ +public: + Qt5SplashOutputDev(SplashColorMode colorModeA, int bitmapRowPadA, bool reverseVideoA, bool ignorePaperColorA, SplashColorPtr paperColorA, bool bitmapTopDownA, SplashThinLineMode thinLineMode, bool overprintPreviewA) + : SplashOutputDev(colorModeA, bitmapRowPadA, reverseVideoA, paperColorA, bitmapTopDownA, thinLineMode, overprintPreviewA), ignorePaperColor(ignorePaperColorA) + { + } + + ~Qt5SplashOutputDev() override; + + void dump() override + { + if (partialUpdateCallback && shouldDoPartialUpdateCallback && shouldDoPartialUpdateCallback(payload)) { + partialUpdateCallback(getXBGRImage(false /* takeImageData */), payload); + } + } + + QImage getXBGRImage(bool takeImageData) + { + SplashBitmap *b = getBitmap(); + + // If we use DeviceN8, convert to XBGR8. + // If requested, also transfer Splash's internal alpha channel. + const SplashBitmap::ConversionMode mode = ignorePaperColor ? SplashBitmap::conversionAlphaPremultiplied : SplashBitmap::conversionOpaque; + + const QImage::Format format = ignorePaperColor ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32; + + if (b->convertToXBGR(mode)) { + const int bw = b->getWidth(); + const int bh = b->getHeight(); + const int brs = b->getRowSize(); + + SplashColorPtr data = takeImageData ? b->takeData() : b->getDataPtr(); + + if (QSysInfo::ByteOrder == QSysInfo::BigEndian) { + // Convert byte order from RGBX to XBGR. + for (int i = 0; i < bh; ++i) { + for (int j = 0; j < bw; ++j) { + SplashColorPtr pixel = &data[i * brs + j]; + + qSwap(pixel[0], pixel[3]); + qSwap(pixel[1], pixel[2]); + } + } + } + + if (takeImageData) { + // Construct a Qt image holding (and also owning) the raw bitmap data. + QImage i(data, bw, bh, brs, format, gfree, data); + if (i.isNull()) { + gfree(data); + } + return i; + } else { + return QImage(data, bw, bh, brs, format).copy(); + } + } + + return QImage(); + } + +private: + bool ignorePaperColor; +}; + +Qt5SplashOutputDev::~Qt5SplashOutputDev() = default; + +class QImageDumpingQPainterOutputDev : public QPainterOutputDev, public OutputDevCallbackHelper +{ +public: + QImageDumpingQPainterOutputDev(QPainter *painter, QImage *i) : QPainterOutputDev(painter), image(i) { } + ~QImageDumpingQPainterOutputDev() override; + + void dump() override + { + if (partialUpdateCallback && shouldDoPartialUpdateCallback && shouldDoPartialUpdateCallback(payload)) { + partialUpdateCallback(*image, payload); + } + } + +private: + QImage *image; +}; + +QImageDumpingQPainterOutputDev::~QImageDumpingQPainterOutputDev() = default; + +Link *PageData::convertLinkActionToLink(::LinkAction *a, const QRectF &linkArea) +{ + return convertLinkActionToLink(a, parentDoc, linkArea); +} + +Link *PageData::convertLinkActionToLink(::LinkAction *a, DocumentData *parentDoc, const QRectF &linkArea) +{ + if (!a) { + return nullptr; + } + + Link *popplerLink = nullptr; + switch (a->getKind()) { + case actionGoTo: { + LinkGoTo *g = (LinkGoTo *)a; + const LinkDestinationData ldd(g->getDest(), g->getNamedDest(), parentDoc, false); + // create link: no ext file, namedDest, object pointer + popplerLink = new LinkGoto(linkArea, QString(), LinkDestination(ldd)); + } break; + + case actionGoToR: { + LinkGoToR *g = (LinkGoToR *)a; + // copy link file + const QString fileName = UnicodeParsedString(g->getFileName()); + const LinkDestinationData ldd(g->getDest(), g->getNamedDest(), parentDoc, !fileName.isEmpty()); + // create link: fileName, namedDest, object pointer + popplerLink = new LinkGoto(linkArea, fileName, LinkDestination(ldd)); + } break; + + case actionLaunch: { + LinkLaunch *e = (LinkLaunch *)a; + const GooString *p = e->getParams(); + popplerLink = new LinkExecute(linkArea, e->getFileName()->c_str(), p ? p->c_str() : nullptr); + } break; + + case actionNamed: { + const std::string &name = ((LinkNamed *)a)->getName(); + if (name == "NextPage") { + popplerLink = new LinkAction(linkArea, LinkAction::PageNext); + } else if (name == "PrevPage") { + popplerLink = new LinkAction(linkArea, LinkAction::PagePrev); + } else if (name == "FirstPage") { + popplerLink = new LinkAction(linkArea, LinkAction::PageFirst); + } else if (name == "LastPage") { + popplerLink = new LinkAction(linkArea, LinkAction::PageLast); + } else if (name == "GoBack") { + popplerLink = new LinkAction(linkArea, LinkAction::HistoryBack); + } else if (name == "GoForward") { + popplerLink = new LinkAction(linkArea, LinkAction::HistoryForward); + } else if (name == "Quit") { + popplerLink = new LinkAction(linkArea, LinkAction::Quit); + } else if (name == "GoToPage") { + popplerLink = new LinkAction(linkArea, LinkAction::GoToPage); + } else if (name == "Find") { + popplerLink = new LinkAction(linkArea, LinkAction::Find); + } else if (name == "FullScreen") { + popplerLink = new LinkAction(linkArea, LinkAction::Presentation); + } else if (name == "Print") { + popplerLink = new LinkAction(linkArea, LinkAction::Print); + } else if (name == "Close") { + // acroread closes the document always, doesnt care whether + // its presentation mode or not + // popplerLink = new LinkAction( linkArea, LinkAction::EndPresentation ); + popplerLink = new LinkAction(linkArea, LinkAction::Close); + } else if (name == "SaveAs") { + popplerLink = new LinkAction(linkArea, LinkAction::SaveAs); + } else { + qWarning() << "Unhandled action name" << name.c_str(); + } + } break; + + case actionURI: { + popplerLink = new LinkBrowse(linkArea, ((LinkURI *)a)->getURI().c_str()); + } break; + + case actionSound: { + ::LinkSound *ls = (::LinkSound *)a; + popplerLink = new LinkSound(linkArea, ls->getVolume(), ls->getSynchronous(), ls->getRepeat(), ls->getMix(), new SoundObject(ls->getSound())); + } break; + + case actionJavaScript: { + ::LinkJavaScript *ljs = (::LinkJavaScript *)a; + popplerLink = new LinkJavaScript(linkArea, UnicodeParsedString(ljs->getScript())); + } break; + + case actionMovie: { + ::LinkMovie *lm = (::LinkMovie *)a; + + const QString title = (lm->hasAnnotTitle() ? UnicodeParsedString(lm->getAnnotTitle()) : QString()); + + Ref reference = Ref::INVALID(); + if (lm->hasAnnotRef()) { + reference = *lm->getAnnotRef(); + } + + LinkMovie::Operation operation = LinkMovie::Play; + switch (lm->getOperation()) { + case ::LinkMovie::operationTypePlay: + operation = LinkMovie::Play; + break; + case ::LinkMovie::operationTypePause: + operation = LinkMovie::Pause; + break; + case ::LinkMovie::operationTypeResume: + operation = LinkMovie::Resume; + break; + case ::LinkMovie::operationTypeStop: + operation = LinkMovie::Stop; + break; + }; + + popplerLink = new LinkMovie(linkArea, operation, title, reference); + } break; + + case actionRendition: { + ::LinkRendition *lrn = (::LinkRendition *)a; + + Ref reference = Ref::INVALID(); + if (lrn->hasScreenAnnot()) { + reference = lrn->getScreenAnnot(); + } + + popplerLink = new LinkRendition(linkArea, lrn->getMedia() ? lrn->getMedia()->copy() : nullptr, lrn->getOperation(), UnicodeParsedString(lrn->getScript()), reference); + } break; + + case actionOCGState: { + ::LinkOCGState *plocg = (::LinkOCGState *)a; + + LinkOCGStatePrivate *locgp = new LinkOCGStatePrivate(linkArea, plocg->getStateList(), plocg->getPreserveRB()); + popplerLink = new LinkOCGState(locgp); + } break; + + case actionHide: { + ::LinkHide *lh = (::LinkHide *)a; + + LinkHidePrivate *lhp = new LinkHidePrivate(linkArea, lh->hasTargetName() ? UnicodeParsedString(lh->getTargetName()) : QString(), lh->isShowAction()); + popplerLink = new LinkHide(lhp); + } break; + + case actionResetForm: + // Not handled in Qt5 front-end yet + break; + + case actionUnknown: + break; + } + + if (popplerLink) { + QVector links; + for (const std::unique_ptr<::LinkAction> &nextAction : a->nextActions()) { + links << convertLinkActionToLink(nextAction.get(), parentDoc, linkArea); + } + LinkPrivate::get(popplerLink)->nextLinks = links; + } + + return popplerLink; +} + +inline TextPage *PageData::prepareTextSearch(const QString &text, Page::Rotation rotate, QVector *u) +{ + *u = text.toUcs4(); + + const int rotation = (int)rotate * 90; + + // fetch ourselves a textpage + TextOutputDev td(nullptr, true, 0, false, false); + parentDoc->doc->displayPage(&td, index + 1, 72, 72, rotation, false, true, false, nullptr, nullptr, nullptr, nullptr, true); + TextPage *textPage = td.takeText(); + + return textPage; +} + +inline bool PageData::performSingleTextSearch(TextPage *textPage, QVector &u, double &sLeft, double &sTop, double &sRight, double &sBottom, Page::SearchDirection direction, bool sCase, bool sWords, bool sDiacritics, + bool sAcrossLines) +{ + if (direction == Page::FromTop) { + return textPage->findText(u.data(), u.size(), true, true, false, false, sCase, sDiacritics, sAcrossLines, false, sWords, &sLeft, &sTop, &sRight, &sBottom, nullptr, nullptr); + } else if (direction == Page::NextResult) { + return textPage->findText(u.data(), u.size(), false, true, true, false, sCase, sDiacritics, sAcrossLines, false, sWords, &sLeft, &sTop, &sRight, &sBottom, nullptr, nullptr); + } else if (direction == Page::PreviousResult) { + return textPage->findText(u.data(), u.size(), false, true, true, false, sCase, sDiacritics, sAcrossLines, true, sWords, &sLeft, &sTop, &sRight, &sBottom, nullptr, nullptr); + } + + return false; +} + +inline QList PageData::performMultipleTextSearch(TextPage *textPage, QVector &u, bool sCase, bool sWords, bool sDiacritics, bool sAcrossLines) +{ + QList results; + double sLeft = 0.0, sTop = 0.0, sRight = 0.0, sBottom = 0.0; + bool sIgnoredHyphen = false; + PDFRectangle continueMatch; + continueMatch.x1 = DBL_MAX; // we use this to detect valid return values + + while (textPage->findText(u.data(), u.size(), false, true, true, false, sCase, sDiacritics, sAcrossLines, false, sWords, &sLeft, &sTop, &sRight, &sBottom, &continueMatch, &sIgnoredHyphen)) { + QRectF result; + + result.setLeft(sLeft); + result.setTop(sTop); + result.setRight(sRight); + result.setBottom(sBottom); + + results.append(result); + + if (sAcrossLines && continueMatch.x1 != DBL_MAX) { + QRectF resultN; + + resultN.setLeft(continueMatch.x1); + resultN.setTop(continueMatch.y1); + resultN.setRight(continueMatch.x2); + resultN.setBottom(continueMatch.y1); + + results.append(resultN); + continueMatch.x1 = DBL_MAX; + } + } + + return results; +} + +Page::Page(DocumentData *doc, int index) +{ + m_page = new PageData(); + m_page->index = index; + m_page->parentDoc = doc; + m_page->page = doc->doc->getPage(m_page->index + 1); + m_page->transition = nullptr; +} + +Page::~Page() +{ + delete m_page->transition; + delete m_page; +} + +// Callback that filters out everything but form fields +static auto annotDisplayDecideCbk = [](Annot *annot, void *user_data) { + // Hide everything but forms + return (annot->getType() == Annot::typeWidget); +}; + +// A nullptr, but with the type of a function pointer +// Needed to make the ternary operator happy. +static bool (*nullAnnotCallBack)(Annot *annot, void *user_data) = nullptr; + +static auto shouldAbortRenderInternalCallback = [](void *user_data) { + OutputDevCallbackHelper *helper = reinterpret_cast(user_data); + return helper->shouldAbortRenderCallback(helper->payload); +}; + +static auto shouldAbortExtractionInternalCallback = [](void *user_data) { + TextExtractionAbortHelper *helper = reinterpret_cast(user_data); + return helper->shouldAbortExtractionCallback(helper->payload); +}; + +// A nullptr, but with the type of a function pointer +// Needed to make the ternary operator happy. +static bool (*nullAbortCallBack)(void *user_data) = nullptr; + +static bool renderToQPainter(QImageDumpingQPainterOutputDev *qpainter_output, QPainter *painter, PageData *page, double xres, double yres, int x, int y, int w, int h, Page::Rotation rotate, Page::PainterFlags flags) +{ + const bool savePainter = !(flags & Page::DontSaveAndRestore); + if (savePainter) { + painter->save(); + } + if (page->parentDoc->m_hints & Document::Antialiasing) { + painter->setRenderHint(QPainter::Antialiasing); + } + if (page->parentDoc->m_hints & Document::TextAntialiasing) { + painter->setRenderHint(QPainter::TextAntialiasing); + } + painter->translate(x == -1 ? 0 : -x, y == -1 ? 0 : -y); + + qpainter_output->startDoc(page->parentDoc->doc); + + const bool hideAnnotations = page->parentDoc->m_hints & Document::HideAnnotations; + + OutputDevCallbackHelper *abortHelper = qpainter_output; + page->parentDoc->doc->displayPageSlice(qpainter_output, page->index + 1, xres, yres, (int)rotate * 90, false, true, false, x, y, w, h, abortHelper->shouldAbortRenderCallback ? shouldAbortRenderInternalCallback : nullAbortCallBack, + abortHelper, (hideAnnotations) ? annotDisplayDecideCbk : nullAnnotCallBack, nullptr, true); + if (savePainter) { + painter->restore(); + } + return true; +} + +QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h, Rotation rotate) const +{ + return renderToImage(xres, yres, x, y, w, h, rotate, nullptr, nullptr, QVariant()); +} + +QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h, Rotation rotate, RenderToImagePartialUpdateFunc partialUpdateCallback, ShouldRenderToImagePartialQueryFunc shouldDoPartialUpdateCallback, + const QVariant &payload) const +{ + return renderToImage(xres, yres, x, y, w, h, rotate, partialUpdateCallback, shouldDoPartialUpdateCallback, nullptr, payload); +} + +// Translate the text hinting settings from poppler-speak to Qt-speak +static QFont::HintingPreference QFontHintingFromPopplerHinting(int renderHints) +{ + QFont::HintingPreference result = QFont::PreferNoHinting; + + if (renderHints & Document::TextHinting) { + result = (renderHints & Document::TextSlightHinting) ? QFont::PreferVerticalHinting : QFont::PreferFullHinting; + } + + return result; +} + +QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w, int h, Rotation rotate, RenderToImagePartialUpdateFunc partialUpdateCallback, ShouldRenderToImagePartialQueryFunc shouldDoPartialUpdateCallback, + ShouldAbortQueryFunc shouldAbortRenderCallback, const QVariant &payload) const +{ + int rotation = (int)rotate * 90; + QImage img; + switch (m_page->parentDoc->m_backend) { + case Poppler::Document::SplashBackend: { + SplashColor bgColor; + const bool overprintPreview = m_page->parentDoc->m_hints & Document::OverprintPreview ? true : false; + if (overprintPreview) { + unsigned char c, m, y, k; + + c = 255 - m_page->parentDoc->paperColor.blue(); + m = 255 - m_page->parentDoc->paperColor.red(); + y = 255 - m_page->parentDoc->paperColor.green(); + k = c; + if (m < k) { + k = m; + } + if (y < k) { + k = y; + } + bgColor[0] = c - k; + bgColor[1] = m - k; + bgColor[2] = y - k; + bgColor[3] = k; + for (int i = 4; i < SPOT_NCOMPS + 4; i++) { + bgColor[i] = 0; + } + } else { + bgColor[0] = m_page->parentDoc->paperColor.blue(); + bgColor[1] = m_page->parentDoc->paperColor.green(); + bgColor[2] = m_page->parentDoc->paperColor.red(); + } + + const SplashColorMode colorMode = overprintPreview ? splashModeDeviceN8 : splashModeXBGR8; + + SplashThinLineMode thinLineMode = splashThinLineDefault; + if (m_page->parentDoc->m_hints & Document::ThinLineShape) { + thinLineMode = splashThinLineShape; + } + if (m_page->parentDoc->m_hints & Document::ThinLineSolid) { + thinLineMode = splashThinLineSolid; + } + + const bool ignorePaperColor = m_page->parentDoc->m_hints & Document::IgnorePaperColor; + + Qt5SplashOutputDev splash_output(colorMode, 4, false, ignorePaperColor, ignorePaperColor ? nullptr : bgColor, true, thinLineMode, overprintPreview); + + splash_output.setCallbacks(partialUpdateCallback, shouldDoPartialUpdateCallback, shouldAbortRenderCallback, payload); + + splash_output.setFontAntialias(m_page->parentDoc->m_hints & Document::TextAntialiasing ? true : false); + splash_output.setVectorAntialias(m_page->parentDoc->m_hints & Document::Antialiasing ? true : false); + splash_output.setFreeTypeHinting(m_page->parentDoc->m_hints & Document::TextHinting ? true : false, m_page->parentDoc->m_hints & Document::TextSlightHinting ? true : false); + +#ifdef USE_CMS + splash_output.setDisplayProfile(m_page->parentDoc->m_displayProfile); +#endif + + splash_output.startDoc(m_page->parentDoc->doc); + + const bool hideAnnotations = m_page->parentDoc->m_hints & Document::HideAnnotations; + + OutputDevCallbackHelper *abortHelper = &splash_output; + m_page->parentDoc->doc->displayPageSlice(&splash_output, m_page->index + 1, xres, yres, rotation, false, true, false, xPos, yPos, w, h, shouldAbortRenderCallback ? shouldAbortRenderInternalCallback : nullAbortCallBack, abortHelper, + (hideAnnotations) ? annotDisplayDecideCbk : nullAnnotCallBack, nullptr, true); + + img = splash_output.getXBGRImage(true /* takeImageData */); + break; + } + case Poppler::Document::QPainterBackend: { + QSize size = pageSize(); + QImage tmpimg(w == -1 ? qRound(size.width() * xres / 72.0) : w, h == -1 ? qRound(size.height() * yres / 72.0) : h, QImage::Format_ARGB32); + + QColor bgColor(m_page->parentDoc->paperColor.red(), m_page->parentDoc->paperColor.green(), m_page->parentDoc->paperColor.blue(), m_page->parentDoc->paperColor.alpha()); + + tmpimg.fill(bgColor); + + QPainter painter(&tmpimg); + QImageDumpingQPainterOutputDev qpainter_output(&painter, &tmpimg); + + qpainter_output.setHintingPreference(QFontHintingFromPopplerHinting(m_page->parentDoc->m_hints)); + +#ifdef USE_CMS + qpainter_output.setDisplayProfile(m_page->parentDoc->m_displayProfile); +#endif + + qpainter_output.setCallbacks(partialUpdateCallback, shouldDoPartialUpdateCallback, shouldAbortRenderCallback, payload); + renderToQPainter(&qpainter_output, &painter, m_page, xres, yres, xPos, yPos, w, h, rotate, DontSaveAndRestore); + painter.end(); + img = tmpimg; + break; + } + } + + if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload)) { + return QImage(); + } + + return img; +} + +bool Page::renderToPainter(QPainter *painter, double xres, double yres, int x, int y, int w, int h, Rotation rotate, PainterFlags flags) const +{ + if (!painter) { + return false; + } + + switch (m_page->parentDoc->m_backend) { + case Poppler::Document::SplashBackend: + return false; + case Poppler::Document::QPainterBackend: { + QImageDumpingQPainterOutputDev qpainter_output(painter, nullptr); + + qpainter_output.setHintingPreference(QFontHintingFromPopplerHinting(m_page->parentDoc->m_hints)); + + return renderToQPainter(&qpainter_output, painter, m_page, xres, yres, x, y, w, h, rotate, flags); + } + } + return false; +} + +QImage Page::thumbnail() const +{ + unsigned char *data = nullptr; + int w = 0; + int h = 0; + int rowstride = 0; + bool r = m_page->page->loadThumb(&data, &w, &h, &rowstride); + QImage ret; + if (r) { + // first construct a temporary image with the data got, + // then force a copy of it so we can free the raw thumbnail data + ret = QImage(data, w, h, rowstride, QImage::Format_RGB888).copy(); + gfree(data); + } + return ret; +} + +QString Page::text(const QRectF &r, TextLayout textLayout) const +{ + TextOutputDev *output_dev; + GooString *s; + QString result; + + const bool rawOrder = textLayout == RawOrderLayout; + output_dev = new TextOutputDev(nullptr, false, 0, rawOrder, false); + m_page->parentDoc->doc->displayPageSlice(output_dev, m_page->index + 1, 72, 72, 0, false, true, false, -1, -1, -1, -1, nullptr, nullptr, nullptr, nullptr, true); + if (r.isNull()) { + const PDFRectangle *rect = m_page->page->getCropBox(); + if (orientation() == Orientation::Portrait || orientation() == Orientation::UpsideDown) { + s = output_dev->getText(rect->x1, rect->y1, rect->x2, rect->y2); + } else { + s = output_dev->getText(rect->y1, rect->x1, rect->y2, rect->x2); + } + } else { + s = output_dev->getText(r.left(), r.top(), r.right(), r.bottom()); + } + + result = QString::fromUtf8(s->c_str()); + + delete output_dev; + delete s; + return result; +} + +QString Page::text(const QRectF &r) const +{ + return text(r, PhysicalLayout); +} + +bool Page::search(const QString &text, double &sLeft, double &sTop, double &sRight, double &sBottom, SearchDirection direction, SearchMode caseSensitive, Rotation rotate) const +{ + const bool sCase = caseSensitive == Page::CaseSensitive ? true : false; + + QVector u; + TextPage *textPage = m_page->prepareTextSearch(text, rotate, &u); + + const bool found = m_page->performSingleTextSearch(textPage, u, sLeft, sTop, sRight, sBottom, direction, sCase, false, false, false); + + textPage->decRefCnt(); + + return found; +} + +bool Page::search(const QString &text, double &sLeft, double &sTop, double &sRight, double &sBottom, SearchDirection direction, SearchFlags flags, Rotation rotate) const +{ + const bool sCase = flags.testFlag(IgnoreCase) ? false : true; + const bool sWords = flags.testFlag(WholeWords) ? true : false; + const bool sDiacritics = flags.testFlag(IgnoreDiacritics) ? true : false; + const bool sAcrossLines = flags.testFlag(AcrossLines) ? true : false; + + QVector u; + TextPage *textPage = m_page->prepareTextSearch(text, rotate, &u); + + const bool found = m_page->performSingleTextSearch(textPage, u, sLeft, sTop, sRight, sBottom, direction, sCase, sWords, sDiacritics, sAcrossLines); + + textPage->decRefCnt(); + + return found; +} + +QList Page::search(const QString &text, SearchMode caseSensitive, Rotation rotate) const +{ + const bool sCase = caseSensitive == Page::CaseSensitive ? true : false; + + QVector u; + TextPage *textPage = m_page->prepareTextSearch(text, rotate, &u); + + const QList results = m_page->performMultipleTextSearch(textPage, u, sCase, false, false, false); + + textPage->decRefCnt(); + + return results; +} + +QList Page::search(const QString &text, SearchFlags flags, Rotation rotate) const +{ + const bool sCase = flags.testFlag(IgnoreCase) ? false : true; + const bool sWords = flags.testFlag(WholeWords) ? true : false; + const bool sDiacritics = flags.testFlag(IgnoreDiacritics) ? true : false; + const bool sAcrossLines = flags.testFlag(AcrossLines) ? true : false; + + QVector u; + TextPage *textPage = m_page->prepareTextSearch(text, rotate, &u); + + const QList results = m_page->performMultipleTextSearch(textPage, u, sCase, sWords, sDiacritics, sAcrossLines); + + textPage->decRefCnt(); + + return results; +} + +QList Page::textList(Rotation rotate) const +{ + return textList(rotate, nullptr, QVariant()); +} + +QList Page::textList(Rotation rotate, ShouldAbortQueryFunc shouldAbortExtractionCallback, const QVariant &closure) const +{ + QList output_list; + + TextOutputDev output_dev(nullptr, false, 0, false, false); + + int rotation = (int)rotate * 90; + + TextExtractionAbortHelper abortHelper(shouldAbortExtractionCallback, closure); + m_page->parentDoc->doc->displayPageSlice(&output_dev, m_page->index + 1, 72, 72, rotation, false, false, false, -1, -1, -1, -1, shouldAbortExtractionCallback ? shouldAbortExtractionInternalCallback : nullAbortCallBack, &abortHelper, + nullptr, nullptr, true); + + std::unique_ptr word_list = output_dev.makeWordList(); + + if (shouldAbortExtractionCallback && shouldAbortExtractionCallback(closure)) { + return output_list; + } + + QHash wordBoxMap; + + output_list.reserve(word_list->getLength()); + for (int i = 0; i < word_list->getLength(); i++) { + TextWord *word = word_list->get(i); + GooString *gooWord = word->getText(); + QString string = QString::fromUtf8(gooWord->c_str()); + delete gooWord; + double xMin, yMin, xMax, yMax; + word->getBBox(&xMin, &yMin, &xMax, &yMax); + + TextBox *text_box = new TextBox(string, QRectF(xMin, yMin, xMax - xMin, yMax - yMin)); + text_box->m_data->hasSpaceAfter = word->hasSpaceAfter() == true; + text_box->m_data->charBBoxes.reserve(word->getLength()); + for (int j = 0; j < word->getLength(); ++j) { + word->getCharBBox(j, &xMin, &yMin, &xMax, &yMax); + text_box->m_data->charBBoxes.append(QRectF(xMin, yMin, xMax - xMin, yMax - yMin)); + } + + wordBoxMap.insert(word, text_box); + + output_list.append(text_box); + } + + for (int i = 0; i < word_list->getLength(); i++) { + TextWord *word = word_list->get(i); + TextBox *text_box = wordBoxMap.value(word); + text_box->m_data->nextWord = wordBoxMap.value(word->nextWord()); + } + + return output_list; +} + +PageTransition *Page::transition() const +{ + if (!m_page->transition) { + Object o = m_page->page->getTrans(); + PageTransitionParams params; + params.dictObj = &o; + if (params.dictObj->isDict()) { + m_page->transition = new PageTransition(params); + } + } + return m_page->transition; +} + +Link *Page::action(PageAction act) const +{ + if (act == Page::Opening || act == Page::Closing) { + Object o = m_page->page->getActions(); + if (!o.isDict()) { + return nullptr; + } + Dict *dict = o.getDict(); + const char *key = act == Page::Opening ? "O" : "C"; + Object o2 = dict->lookup((char *)key); + std::unique_ptr<::LinkAction> lact = ::LinkAction::parseAction(&o2, m_page->parentDoc->doc->getCatalog()->getBaseURI()); + Link *popplerLink = nullptr; + if (lact != nullptr) { + popplerLink = m_page->convertLinkActionToLink(lact.get(), QRectF()); + } + return popplerLink; + } + return nullptr; +} + +QSizeF Page::pageSizeF() const +{ + Page::Orientation orient = orientation(); + if ((Page::Landscape == orient) || (Page::Seascape == orient)) { + return QSizeF(m_page->page->getCropHeight(), m_page->page->getCropWidth()); + } else { + return QSizeF(m_page->page->getCropWidth(), m_page->page->getCropHeight()); + } +} + +QSize Page::pageSize() const +{ + return pageSizeF().toSize(); +} + +Page::Orientation Page::orientation() const +{ + const int rotation = m_page->page->getRotate(); + switch (rotation) { + case 90: + return Page::Landscape; + break; + case 180: + return Page::UpsideDown; + break; + case 270: + return Page::Seascape; + break; + default: + return Page::Portrait; + } +} + +void Page::defaultCTM(double *CTM, double dpiX, double dpiY, int rotate, bool upsideDown) +{ + m_page->page->getDefaultCTM(CTM, dpiX, dpiY, rotate, false, upsideDown); +} + +QList Page::links() const +{ + LinkExtractorOutputDev link_dev(m_page); + m_page->parentDoc->doc->processLinks(&link_dev, m_page->index + 1); + QList popplerLinks = link_dev.links(); + + return popplerLinks; +} + +QList Page::annotations() const +{ + return AnnotationPrivate::findAnnotations(m_page->page, m_page->parentDoc, QSet()); +} + +QList Page::annotations(const QSet &subtypes) const +{ + return AnnotationPrivate::findAnnotations(m_page->page, m_page->parentDoc, subtypes); +} + +void Page::addAnnotation(const Annotation *ann) +{ + AnnotationPrivate::addAnnotationToPage(m_page->page, m_page->parentDoc, ann); +} + +void Page::removeAnnotation(const Annotation *ann) +{ + AnnotationPrivate::removeAnnotationFromPage(m_page->page, ann); +} + +QList Page::formFields() const +{ + QList fields; + ::Page *p = m_page->page; + const std::unique_ptr form = p->getFormWidgets(); + int formcount = form->getNumWidgets(); + for (int i = 0; i < formcount; ++i) { + ::FormWidget *fm = form->getWidget(i); + FormField *ff = nullptr; + switch (fm->getType()) { + case formButton: { + ff = new FormFieldButton(m_page->parentDoc, p, static_cast(fm)); + } break; + + case formText: { + ff = new FormFieldText(m_page->parentDoc, p, static_cast(fm)); + } break; + + case formChoice: { + ff = new FormFieldChoice(m_page->parentDoc, p, static_cast(fm)); + } break; + + case formSignature: { + ff = new FormFieldSignature(m_page->parentDoc, p, static_cast(fm)); + } break; + + default:; + } + + if (ff) { + fields.append(ff); + } + } + + return fields; +} + +double Page::duration() const +{ + return m_page->page->getDuration(); +} + +QString Page::label() const +{ + GooString goo; + if (!m_page->parentDoc->doc->getCatalog()->indexToLabel(m_page->index, &goo)) { + return QString(); + } + + return UnicodeParsedString(&goo); +} + +int Page::index() const +{ + return m_page->index; +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-pdf-converter.cc b/poppler-24.05.0/qt5/src/poppler-pdf-converter.cc new file mode 100644 index 0000000000000000000000000000000000000000..fa833a32209c2bf800d130045f302d82b34861af --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-pdf-converter.cc @@ -0,0 +1,361 @@ +/* poppler-pdf-converter.cc: qt interface to poppler + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2008, 2009, 2020-2022, Albert Astals Cid + * Copyright (C) 2020, Thorsten Behrens + * Copyright (C) 2020, Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021, Klarälvdalens Datakonsult AB, a KDAB Group company, . + * Copyright (C) 2021, Zachary Travis + * Copyright (C) 2021, Georgiy Sgibnev . Work sponsored by lab50.net. + * Copyright (C) 2022, Martin + * Copyright (C) 2022, Felix Jung + * + * 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-annotation-helper.h" +#include "poppler-annotation-private.h" +#include "poppler-private.h" +#include "poppler-converter-private.h" +#include "poppler-qiodeviceoutstream-private.h" + +#include +#include + +#include "Array.h" +#include "Form.h" +#include + +namespace Poppler { + +class PDFConverterPrivate : public BaseConverterPrivate +{ +public: + PDFConverterPrivate(); + ~PDFConverterPrivate() override; + + PDFConverter::PDFOptions opts; +}; + +PDFConverterPrivate::PDFConverterPrivate() : BaseConverterPrivate(), opts(nullptr) { } + +PDFConverterPrivate::~PDFConverterPrivate() = default; + +PDFConverter::PDFConverter(DocumentData *document) : BaseConverter(*new PDFConverterPrivate()) +{ + Q_D(PDFConverter); + d->document = document; +} + +PDFConverter::~PDFConverter() { } + +void PDFConverter::setPDFOptions(PDFConverter::PDFOptions options) +{ + Q_D(PDFConverter); + d->opts = options; +} + +PDFConverter::PDFOptions PDFConverter::pdfOptions() const +{ + Q_D(const PDFConverter); + return d->opts; +} + +bool PDFConverter::convert() +{ + Q_D(PDFConverter); + d->lastError = NoError; + + if (d->document->locked) { + d->lastError = FileLockedError; + return false; + } + + QIODevice *dev = d->openDevice(); + if (!dev) { + d->lastError = OpenOutputError; + return false; + } + + bool deleteFile = false; + if (QFile *file = qobject_cast(dev)) { + deleteFile = !file->exists(); + } + + int errorCode = errNone; + QIODeviceOutStream stream(dev); + if (d->opts & WithChanges) { + errorCode = d->document->doc->saveAs(&stream); + } else { + errorCode = d->document->doc->saveWithoutChangesAs(&stream); + } + d->closeDevice(); + if (errorCode != errNone) { + if (deleteFile) { + qobject_cast(dev)->remove(); + } + if (errorCode == errOpenFile) { + d->lastError = OpenOutputError; + } else { + d->lastError = NotSupportedInputFileError; + } + } + + return (errorCode == errNone); +} + +bool PDFConverter::sign(const NewSignatureData &data) +{ + Q_D(PDFConverter); + d->lastError = NoError; + + if (d->document->locked) { + d->lastError = FileLockedError; + return false; + } + + if (data.signatureText().isEmpty()) { + qWarning() << "No signature text given"; + return false; + } + + ::PDFDoc *doc = d->document->doc; + ::Page *destPage = doc->getPage(data.page() + 1); + std::unique_ptr gSignatureText = std::unique_ptr(QStringToUnicodeGooString(data.signatureText())); + std::unique_ptr gSignatureLeftText = std::unique_ptr(QStringToUnicodeGooString(data.signatureLeftText())); + const auto reason = std::unique_ptr(data.reason().isEmpty() ? nullptr : QStringToUnicodeGooString(data.reason())); + const auto location = std::unique_ptr(data.location().isEmpty() ? nullptr : QStringToUnicodeGooString(data.location())); + const auto ownerPwd = std::optional(data.documentOwnerPassword().constData()); + const auto userPwd = std::optional(data.documentUserPassword().constData()); + return doc->sign(d->outputFileName.toUtf8().constData(), data.certNickname().toUtf8().constData(), data.password().toUtf8().constData(), QStringToGooString(data.fieldPartialName()), data.page() + 1, + boundaryToPdfRectangle(destPage, data.boundingRectangle(), Annotation::FixedRotation), *gSignatureText, *gSignatureLeftText, data.fontSize(), data.leftFontSize(), convertQColor(data.fontColor()), data.borderWidth(), + convertQColor(data.borderColor()), convertQColor(data.backgroundColor()), reason.get(), location.get(), data.imagePath().toStdString(), ownerPwd, userPwd); +} + +struct PDFConverter::NewSignatureData::NewSignatureDataPrivate +{ + NewSignatureDataPrivate() = default; + + QString certNickname; + QString password; + int page; + QRectF boundingRectangle; + QString signatureText; + QString signatureLeftText; + QString reason; + QString location; + double fontSize = 10.0; + double leftFontSize = 20.0; + QColor fontColor = Qt::red; + QColor borderColor = Qt::red; + double borderWidth = 1.5; + QColor backgroundColor = QColor(240, 240, 240); + + QString partialName = QUuid::createUuid().toString(); + + QByteArray documentOwnerPassword; + QByteArray documentUserPassword; + + QString imagePath; +}; + +PDFConverter::NewSignatureData::NewSignatureData() : d(new NewSignatureDataPrivate()) { } + +PDFConverter::NewSignatureData::~NewSignatureData() +{ + delete d; +} + +QString PDFConverter::NewSignatureData::certNickname() const +{ + return d->certNickname; +} + +void PDFConverter::NewSignatureData::setCertNickname(const QString &certNickname) +{ + d->certNickname = certNickname; +} + +QString PDFConverter::NewSignatureData::password() const +{ + return d->password; +} + +void PDFConverter::NewSignatureData::setPassword(const QString &password) +{ + d->password = password; +} + +int PDFConverter::NewSignatureData::page() const +{ + return d->page; +} + +void PDFConverter::NewSignatureData::setPage(int page) +{ + d->page = page; +} + +QRectF PDFConverter::NewSignatureData::boundingRectangle() const +{ + return d->boundingRectangle; +} + +void PDFConverter::NewSignatureData::setBoundingRectangle(const QRectF &rect) +{ + d->boundingRectangle = rect; +} + +QString PDFConverter::NewSignatureData::signatureText() const +{ + return d->signatureText; +} + +void PDFConverter::NewSignatureData::setSignatureText(const QString &text) +{ + d->signatureText = text; +} + +QString PDFConverter::NewSignatureData::signatureLeftText() const +{ + return d->signatureLeftText; +} + +void PDFConverter::NewSignatureData::setSignatureLeftText(const QString &text) +{ + d->signatureLeftText = text; +} + +QString PDFConverter::NewSignatureData::reason() const +{ + return d->reason; +} + +void PDFConverter::NewSignatureData::setReason(const QString &reason) +{ + d->reason = reason; +} + +QString PDFConverter::NewSignatureData::location() const +{ + return d->location; +} + +void PDFConverter::NewSignatureData::setLocation(const QString &location) +{ + d->location = location; +} + +double PDFConverter::NewSignatureData::fontSize() const +{ + return d->fontSize; +} + +void PDFConverter::NewSignatureData::setFontSize(double fontSize) +{ + d->fontSize = fontSize; +} + +double PDFConverter::NewSignatureData::leftFontSize() const +{ + return d->leftFontSize; +} + +void PDFConverter::NewSignatureData::setLeftFontSize(double fontSize) +{ + d->leftFontSize = fontSize; +} + +QColor PDFConverter::NewSignatureData::fontColor() const +{ + return d->fontColor; +} + +void PDFConverter::NewSignatureData::setFontColor(const QColor &color) +{ + d->fontColor = color; +} + +QColor PDFConverter::NewSignatureData::borderColor() const +{ + return d->borderColor; +} + +void PDFConverter::NewSignatureData::setBorderColor(const QColor &color) +{ + d->borderColor = color; +} + +QColor PDFConverter::NewSignatureData::backgroundColor() const +{ + return d->backgroundColor; +} + +double PDFConverter::NewSignatureData::borderWidth() const +{ + return d->borderWidth; +} + +void PDFConverter::NewSignatureData::setBorderWidth(double width) +{ + d->borderWidth = width; +} + +void PDFConverter::NewSignatureData::setBackgroundColor(const QColor &color) +{ + d->backgroundColor = color; +} + +QString PDFConverter::NewSignatureData::fieldPartialName() const +{ + return d->partialName; +} + +void PDFConverter::NewSignatureData::setFieldPartialName(const QString &name) +{ + d->partialName = name; +} + +QByteArray PDFConverter::NewSignatureData::documentOwnerPassword() const +{ + return d->documentOwnerPassword; +} + +void PDFConverter::NewSignatureData::setDocumentOwnerPassword(const QByteArray &password) +{ + d->documentOwnerPassword = password; +} + +QByteArray PDFConverter::NewSignatureData::documentUserPassword() const +{ + return d->documentUserPassword; +} + +void PDFConverter::NewSignatureData::setDocumentUserPassword(const QByteArray &password) +{ + d->documentUserPassword = password; +} + +QString PDFConverter::NewSignatureData::imagePath() const +{ + return d->imagePath; +} + +void PDFConverter::NewSignatureData::setImagePath(const QString &path) +{ + d->imagePath = path; +} +} diff --git a/poppler-24.05.0/qt5/src/poppler-private.cc b/poppler-24.05.0/qt5/src/poppler-private.cc new file mode 100644 index 0000000000000000000000000000000000000000..3e0f0f57569f0eddc005b98a04cf04efa9f0de9e --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-private.cc @@ -0,0 +1,349 @@ +/* poppler-private.cc: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2006, 2011, 2015, 2017-2020 by Albert Astals Cid + * Copyright (C) 2008, 2010, 2011, 2014 by Pino Toscano + * Copyright (C) 2013 by Thomas Freitag + * Copyright (C) 2013 Adrian Johnson + * Copyright (C) 2016 Jakub Alba + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018-2020 Adam Reichold + * Copyright (C) 2019, 2020, 2024 Oliver Sander + * Copyright (C) 2019 João Netto + * Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, + * Copyright (C) 2021 Mahmoud Khalil + * Copyright (C) 2023 Shivodit Gill + * Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela + * Inspired on code by + * Copyright (C) 2004 by Albert Astals Cid + * Copyright (C) 2004 by Enrico Ros + * + * 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-private.h" +#include "poppler-form.h" + +#include +#include +#include + +#include +#include +#include +#include +#include + +#ifdef ANDROID +# include +# include +# include +# include +# include +# include +#endif + +namespace Poppler { + +namespace Debug { + +static void qDebugDebugFunction(const QString &message, const QVariant & /*closure*/) +{ + qDebug() << message; +} + +PopplerDebugFunc debugFunction = qDebugDebugFunction; +QVariant debugClosure; + +} + +void setDebugErrorFunction(PopplerDebugFunc function, const QVariant &closure) +{ + Debug::debugFunction = function ? function : Debug::qDebugDebugFunction; + Debug::debugClosure = closure; +} + +void qt5ErrorFunction(ErrorCategory /*category*/, Goffset pos, const char *msg) +{ + QString emsg; + + if (pos >= 0) { + emsg = QStringLiteral("Error (%1): ").arg(pos); + } else { + emsg = QStringLiteral("Error: "); + } + emsg += QString::fromLatin1(msg); + (*Debug::debugFunction)(emsg, Debug::debugClosure); +} + +QString unicodeToQString(const Unicode *u, int len) +{ + const UnicodeMap *utf8Map = globalParams->getUtf8Map(); + + // ignore the last characters if they are 0x0 + while ((len > 0) && (u[len - 1] == 0)) { + --len; + } + + GooString convertedStr; + for (int i = 0; i < len; ++i) { + char buf[8]; + const int n = utf8Map->mapUnicode(u[i], buf, sizeof(buf)); + convertedStr.append(buf, n); + } + + return QString::fromUtf8(convertedStr.c_str(), convertedStr.getLength()); +} + +QString unicodeToQString(const std::vector &u) +{ + return unicodeToQString(u.data(), u.size()); +} + +QString UnicodeParsedString(const GooString *s1) +{ + return (s1) ? UnicodeParsedString(s1->toStr()) : QString(); +} + +QString UnicodeParsedString(const std::string &s1) +{ + if (s1.empty()) { + return QString(); + } + + if (hasUnicodeByteOrderMark(s1) || hasUnicodeByteOrderMarkLE(s1)) { + return QString::fromUtf16(reinterpret_cast(s1.c_str()), s1.size() / 2); + } else { + int stringLength; + const char *cString = pdfDocEncodingToUTF16(s1, &stringLength); + auto result = QString::fromUtf16(reinterpret_cast(cString), stringLength / 2); + delete[] cString; + return result; + } +} + +GooString *QStringToUnicodeGooString(const QString &s) +{ + if (s.isEmpty()) { + return new GooString(); + } + int len = s.length() * 2 + 2; + char *cstring = (char *)gmallocn(len, sizeof(char)); + cstring[0] = (char)0xfe; + cstring[1] = (char)0xff; + for (int i = 0; i < s.length(); ++i) { + cstring[2 + i * 2] = s.at(i).row(); + cstring[3 + i * 2] = s.at(i).cell(); + } + GooString *ret = new GooString(cstring, len); + gfree(cstring); + return ret; +} + +GooString *QStringToGooString(const QString &s) +{ + int len = s.length(); + char *cstring = (char *)gmallocn(s.length(), sizeof(char)); + for (int i = 0; i < len; ++i) { + cstring[i] = s.at(i).unicode(); + } + GooString *ret = new GooString(cstring, len); + gfree(cstring); + return ret; +} + +GooString *QDateTimeToUnicodeGooString(const QDateTime &dt) +{ + if (!dt.isValid()) { + return nullptr; + } + + return QStringToUnicodeGooString(dt.toUTC().toString(QStringLiteral("yyyyMMddhhmmss+00'00'"))); +} + +Annot::AdditionalActionsType toPopplerAdditionalActionType(Annotation::AdditionalActionType type) +{ + switch (type) { + case Annotation::CursorEnteringAction: + return Annot::actionCursorEntering; + case Annotation::CursorLeavingAction: + return Annot::actionCursorLeaving; + case Annotation::MousePressedAction: + return Annot::actionMousePressed; + case Annotation::MouseReleasedAction: + return Annot::actionMouseReleased; + case Annotation::FocusInAction: + return Annot::actionFocusIn; + case Annotation::FocusOutAction: + return Annot::actionFocusOut; + case Annotation::PageOpeningAction: + return Annot::actionPageOpening; + case Annotation::PageClosingAction: + return Annot::actionPageClosing; + case Annotation::PageVisibleAction: + return Annot::actionPageVisible; + case Annotation::PageInvisibleAction: + return Annot::actionPageInvisible; + } + + return Annot::actionCursorEntering; +} + +static void linkActionToTocItem(const ::LinkAction *a, DocumentData *doc, QDomElement *e) +{ + if (!a || !e) { + return; + } + + switch (a->getKind()) { + case actionGoTo: { + // page number is contained/referenced in a LinkGoTo + const LinkGoTo *g = static_cast(a); + const LinkDest *destination = g->getDest(); + if (!destination && g->getNamedDest()) { + // no 'destination' but an internal 'named reference'. we could + // get the destination for the page now, but it's VERY time consuming, + // so better storing the reference and provide the viewport on demand + const GooString *s = g->getNamedDest(); + QChar *charArray = new QChar[s->getLength()]; + for (int i = 0; i < s->getLength(); ++i) { + charArray[i] = QChar(s->c_str()[i]); + } + QString aux(charArray, s->getLength()); + e->setAttribute(QStringLiteral("DestinationName"), aux); + delete[] charArray; + } else if (destination && destination->isOk()) { + LinkDestinationData ldd(destination, nullptr, doc, false); + e->setAttribute(QStringLiteral("Destination"), LinkDestination(ldd).toString()); + } + break; + } + case actionGoToR: { + // page number is contained/referenced in a LinkGoToR + const LinkGoToR *g = static_cast(a); + const LinkDest *destination = g->getDest(); + if (!destination && g->getNamedDest()) { + // no 'destination' but an internal 'named reference'. we could + // get the destination for the page now, but it's VERY time consuming, + // so better storing the reference and provide the viewport on demand + const GooString *s = g->getNamedDest(); + QChar *charArray = new QChar[s->getLength()]; + for (int i = 0; i < s->getLength(); ++i) { + charArray[i] = QChar(s->c_str()[i]); + } + QString aux(charArray, s->getLength()); + e->setAttribute(QStringLiteral("DestinationName"), aux); + delete[] charArray; + } else if (destination && destination->isOk()) { + LinkDestinationData ldd(destination, nullptr, doc, g->getFileName() != nullptr); + e->setAttribute(QStringLiteral("Destination"), LinkDestination(ldd).toString()); + } + e->setAttribute(QStringLiteral("ExternalFileName"), g->getFileName()->c_str()); + break; + } + case actionURI: { + const LinkURI *u = static_cast(a); + e->setAttribute(QStringLiteral("DestinationURI"), u->getURI().c_str()); + } + default:; + } +} + +DocumentData::~DocumentData() +{ + qDeleteAll(m_embeddedFiles); + delete (OptContentModel *)m_optContentModel; + delete doc; +} + +void DocumentData::init() +{ + m_backend = Document::SplashBackend; + paperColor = Qt::white; + m_hints = 0; + m_optContentModel = nullptr; + xrefReconstructed = false; + xrefReconstructedCallback = {}; + +#ifdef ANDROID + // Copy fonts from android apk to the app's storage dir, and + // set the font directory path + QString assetsFontDir = QStringLiteral("assets:/share/fonts"); + QString fontsdir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QStringLiteral("/fonts"); + QDir fontPath = QDir(fontsdir); + + if (fontPath.mkpath(fontPath.absolutePath())) { + GlobalParams::setFontDir(fontPath.absolutePath().toStdString()); + QDirIterator iterator(assetsFontDir, QDir::NoFilter, QDirIterator::Subdirectories); + + while (iterator.hasNext()) { + iterator.next(); + QFileInfo fontFileInfo = iterator.fileInfo(); + QString fontFilePath = assetsFontDir + QStringLiteral("/") + fontFileInfo.fileName(); + QString destPath = fontPath.absolutePath() + QStringLiteral("/") + fontFileInfo.fileName(); + QFile::copy(fontFilePath, destPath); + } + } else { + GlobalParams::setFontDir(""); + } +#endif +} + +void DocumentData::addTocChildren(QDomDocument *docSyn, QDomNode *parent, const std::vector<::OutlineItem *> *items) +{ + for (::OutlineItem *outlineItem : *items) { + // iterate over every object in 'items' + + // 1. create element using outlineItem's title as tagName + QString name = unicodeToQString(outlineItem->getTitle()); + + QDomElement item = docSyn->createElement(name); + parent->appendChild(item); + + // 2. find the page the link refers to + const ::LinkAction *a = outlineItem->getAction(); + linkActionToTocItem(a, this, &item); + + item.setAttribute(QStringLiteral("Open"), QVariant((bool)outlineItem->isOpen()).toString()); + + // 3. recursively descend over children + outlineItem->open(); + const std::vector<::OutlineItem *> *children = outlineItem->getKids(); + if (children) { + addTocChildren(docSyn, &item, children); + } + } +} + +void DocumentData::noitfyXRefReconstructed() +{ + if (!xrefReconstructed) { + xrefReconstructed = true; + } + + if (xrefReconstructedCallback) { + xrefReconstructedCallback(); + } +} + +FormWidget *FormFieldData::getFormWidget(const FormField *f) +{ + return f->m_formData->fm; +} + +FormFieldIconData *FormFieldIconData::getData(const FormFieldIcon &f) +{ + return f.d_ptr; +} +} diff --git a/poppler-24.05.0/qt5/src/poppler-private.h b/poppler-24.05.0/qt5/src/poppler-private.h new file mode 100644 index 0000000000000000000000000000000000000000..ccfea6b6f1a6fff4ded14747e142dcdb9fd9de65 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-private.h @@ -0,0 +1,275 @@ +/* poppler-private.h: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2005, 2008, Brad Hards + * Copyright (C) 2006-2009, 2011, 2012, 2017-2022 by Albert Astals Cid + * Copyright (C) 2007-2009, 2011, 2014 by Pino Toscano + * Copyright (C) 2011 Andreas Hartmetz + * Copyright (C) 2011 Hib Eris + * Copyright (C) 2012, 2013 Thomas Freitag + * Copyright (C) 2013 Anthony Granger + * Copyright (C) 2014 Bogdan Cristea + * Copyright (C) 2014 Aki Koskinen + * Copyright (C) 2016 Jakub Alba + * Copyright (C) 2017 Christoph Cullmann + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018, 2020 Adam Reichold + * Copyright (C) 2019, 2020 Oliver Sander + * Copyright (C) 2019 João Netto + * Copyright (C) 2019 Jan Grulich + * Copyright (C) 2019 Alexander Volkov + * Copyright (C) 2020 Philipp Knechtges + * Copyright (C) 2021 Mahmoud Khalil + * Copyright (C) 2021 Hubert Figuiere + * Copyright (C) 2021 Georgiy Sgibnev . Work sponsored by lab50.net. + * Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela + * Inspired on code by + * Copyright (C) 2004 by Albert Astals Cid + * Copyright (C) 2004 by Enrico Ros + * + * 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. + */ + +#ifndef _POPPLER_PRIVATE_H_ +#define _POPPLER_PRIVATE_H_ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "poppler-qt5.h" +#include "poppler-embeddedfile-private.h" +#include "poppler-qiodeviceinstream-private.h" + +class LinkDest; +class FormWidget; +class OutlineItem; + +namespace Poppler { + +/* borrowed from kpdf */ +POPPLER_QT5_EXPORT QString unicodeToQString(const Unicode *u, int len); +POPPLER_QT5_EXPORT QString unicodeToQString(const std::vector &u); + +POPPLER_QT5_EXPORT QString UnicodeParsedString(const GooString *s1); + +POPPLER_QT5_EXPORT QString UnicodeParsedString(const std::string &s1); + +// Returns a big endian UTF-16 string with BOM or an empty string without BOM. +// The caller owns the returned pointer. +POPPLER_QT5_EXPORT GooString *QStringToUnicodeGooString(const QString &s); + +POPPLER_QT5_EXPORT GooString *QStringToGooString(const QString &s); + +GooString *QDateTimeToUnicodeGooString(const QDateTime &dt); + +void qt5ErrorFunction(ErrorCategory /*category*/, Goffset pos, const char *msg); + +Annot::AdditionalActionsType toPopplerAdditionalActionType(Annotation::AdditionalActionType type); + +class LinkDestinationData +{ +public: + LinkDestinationData(const LinkDest *l, const GooString *nd, Poppler::DocumentData *pdfdoc, bool external) : ld(l), namedDest(nd), doc(pdfdoc), externalDest(external) { } + + const LinkDest *ld; + const GooString *namedDest; + Poppler::DocumentData *doc; + bool externalDest; +}; + +class DocumentData : private GlobalParamsIniter +{ +public: + DocumentData(const QString &filePath, const std::optional &ownerPassword, const std::optional &userPassword) : GlobalParamsIniter(qt5ErrorFunction) + { + init(); + m_device = nullptr; + m_filePath = filePath; + +#ifdef _WIN32 + doc = new PDFDoc((wchar_t *)filePath.utf16(), filePath.length(), ownerPassword, userPassword, nullptr, std::bind(&DocumentData::noitfyXRefReconstructed, this)); +#else + doc = new PDFDoc(std::make_unique(QFile::encodeName(filePath).constData()), ownerPassword, userPassword, nullptr, std::bind(&DocumentData::noitfyXRefReconstructed, this)); +#endif + } + + DocumentData(QIODevice *device, const std::optional &ownerPassword, const std::optional &userPassword) : GlobalParamsIniter(qt5ErrorFunction) + { + m_device = device; + QIODeviceInStream *str = new QIODeviceInStream(device, 0, false, device->size(), Object(objNull)); + init(); + doc = new PDFDoc(str, ownerPassword, userPassword, nullptr, std::bind(&DocumentData::noitfyXRefReconstructed, this)); + } + + DocumentData(const QByteArray &data, const std::optional &ownerPassword, const std::optional &userPassword) : GlobalParamsIniter(qt5ErrorFunction) + { + m_device = nullptr; + fileContents = data; + MemStream *str = new MemStream((char *)fileContents.data(), 0, fileContents.length(), Object(objNull)); + init(); + doc = new PDFDoc(str, ownerPassword, userPassword, nullptr, std::bind(&DocumentData::noitfyXRefReconstructed, this)); + } + + void init(); + + ~DocumentData(); + + DocumentData(const DocumentData &) = delete; + DocumentData &operator=(const DocumentData &) = delete; + + void addTocChildren(QDomDocument *docSyn, QDomNode *parent, const std::vector<::OutlineItem *> *items); + + void setPaperColor(const QColor &color) { paperColor = color; } + + void fillMembers() + { + int numEmb = doc->getCatalog()->numEmbeddedFiles(); + if (!(0 == numEmb)) { + // we have some embedded documents, build the list + for (int yalv = 0; yalv < numEmb; ++yalv) { + std::unique_ptr fs = doc->getCatalog()->embeddedFile(yalv); + m_embeddedFiles.append(new EmbeddedFile(*new EmbeddedFileData(std::move(fs)))); + } + } + } + + /** + * a method that is being called whenever PDFDoc's XRef is reconstructed + * where we'll set xrefReconstructed flag and notify users of the + * reconstruction event + */ + void noitfyXRefReconstructed(); + + static Document *checkDocument(DocumentData *doc); + + PDFDoc *doc; + QString m_filePath; + QIODevice *m_device; + QByteArray fileContents; + bool locked; + Document::RenderBackend m_backend; + QList m_embeddedFiles; + QPointer m_optContentModel; + QColor paperColor; + int m_hints; +#ifdef USE_CMS + GfxLCMSProfilePtr m_sRGBProfile; + GfxLCMSProfilePtr m_displayProfile; +#endif + bool xrefReconstructed; + // notifies the user whenever the backend's PDFDoc XRef is reconstructed + std::function xrefReconstructedCallback; +}; + +class FontInfoData +{ +public: + FontInfoData() + { + isEmbedded = false; + isSubset = false; + type = FontInfo::unknown; + } + + explicit FontInfoData(::FontInfo *fi) + { + if (fi->getName()) { + fontName = fi->getName()->c_str(); + } + if (fi->getFile()) { + fontFile = fi->getFile()->c_str(); + } + if (fi->getSubstituteName()) { + fontSubstituteName = fi->getSubstituteName()->c_str(); + } + isEmbedded = fi->getEmbedded(); + isSubset = fi->getSubset(); + type = (Poppler::FontInfo::Type)fi->getType(); + embRef = fi->getEmbRef(); + } + + FontInfoData(const FontInfoData &fid) = default; + FontInfoData &operator=(const FontInfoData &) = default; + + QString fontName; + QString fontSubstituteName; + QString fontFile; + bool isEmbedded : 1; + bool isSubset : 1; + FontInfo::Type type; + Ref embRef; +}; + +class FontIteratorData +{ +public: + FontIteratorData(int startPage, DocumentData *dd) : fontInfoScanner(dd->doc, startPage), totalPages(dd->doc->getNumPages()), currentPage(qMax(startPage, 0) - 1) { } + + ~FontIteratorData() { } + + FontInfoScanner fontInfoScanner; + int totalPages; + int currentPage; +}; + +class TextBoxData +{ +public: + TextBoxData() : nextWord(nullptr), hasSpaceAfter(false) { } + + QString text; + QRectF bBox; + TextBox *nextWord; + QVector charBBoxes; // the boundingRect of each character + bool hasSpaceAfter; +}; + +class FormFieldData +{ +public: + FormFieldData(DocumentData *_doc, ::Page *p, ::FormWidget *w) : doc(_doc), page(p), fm(w) { } + + DocumentData *doc; + ::Page *page; // Note for some signatures it can be null since there's signatures that don't belong to a given page + ::FormWidget *fm; + QRectF box; + static POPPLER_QT5_EXPORT ::FormWidget *getFormWidget(const FormField *f); +}; + +class FormFieldIcon; +class FormFieldIconData +{ +public: + static POPPLER_QT5_EXPORT FormFieldIconData *getData(const FormFieldIcon &f); + Dict *icon; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-ps-converter.cc b/poppler-24.05.0/qt5/src/poppler-ps-converter.cc new file mode 100644 index 0000000000000000000000000000000000000000..a85068b6369e3e18a82cd258914e2f261ab73051 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-ps-converter.cc @@ -0,0 +1,279 @@ +/* poppler-ps-converter.cc: qt interface to poppler + * Copyright (C) 2007, 2009, 2010, 2015, 2020, 2022, Albert Astals Cid + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2010 Hib Eris + * Copyright (C) 2011 Glad Deschrijver + * Copyright (C) 2012 Fabio D'Urso + * Copyright (C) 2013 Thomas Freitag + * Copyright (C) 2014 Adrian Johnson + * Copyright (C) 2020 William Bader + * Copyright (C) 2023 Kevin Ottens . Work sponsored by De Bortoli Wines + * + * 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-private.h" +#include "poppler-converter-private.h" + +#include "PSOutputDev.h" + +static void outputToQIODevice(void *stream, const char *data, size_t len) +{ + static_cast(stream)->write(data, len); +} + +namespace Poppler { + +class PSConverterPrivate : public BaseConverterPrivate +{ +public: + PSConverterPrivate(); + ~PSConverterPrivate() override; + + QList pageList; + QString title; + double hDPI; + double vDPI; + int rotate; + int paperWidth; + int paperHeight; + int marginRight; + int marginBottom; + int marginLeft; + int marginTop; + PSConverter::PSOptions opts; + void (*pageConvertedCallback)(int page, void *payload); + void *pageConvertedPayload; +}; + +PSConverterPrivate::PSConverterPrivate() + : BaseConverterPrivate(), + hDPI(72), + vDPI(72), + rotate(0), + paperWidth(-1), + paperHeight(-1), + marginRight(0), + marginBottom(0), + marginLeft(0), + marginTop(0), + opts(PSConverter::Printing), + pageConvertedCallback(nullptr), + pageConvertedPayload(nullptr) +{ +} + +PSConverterPrivate::~PSConverterPrivate() = default; + +PSConverter::PSConverter(DocumentData *document) : BaseConverter(*new PSConverterPrivate()) +{ + Q_D(PSConverter); + d->document = document; +} + +PSConverter::~PSConverter() { } + +void PSConverter::setPageList(const QList &pageList) +{ + Q_D(PSConverter); + d->pageList = pageList; +} + +void PSConverter::setTitle(const QString &title) +{ + Q_D(PSConverter); + d->title = title; +} + +void PSConverter::setHDPI(double hDPI) +{ + Q_D(PSConverter); + d->hDPI = hDPI; +} + +void PSConverter::setVDPI(double vDPI) +{ + Q_D(PSConverter); + d->vDPI = vDPI; +} + +void PSConverter::setRotate(int rotate) +{ + Q_D(PSConverter); + d->rotate = rotate; +} + +void PSConverter::setPaperWidth(int paperWidth) +{ + Q_D(PSConverter); + d->paperWidth = paperWidth; +} + +void PSConverter::setPaperHeight(int paperHeight) +{ + Q_D(PSConverter); + d->paperHeight = paperHeight; +} + +void PSConverter::setRightMargin(int marginRight) +{ + Q_D(PSConverter); + d->marginRight = marginRight; +} + +void PSConverter::setBottomMargin(int marginBottom) +{ + Q_D(PSConverter); + d->marginBottom = marginBottom; +} + +void PSConverter::setLeftMargin(int marginLeft) +{ + Q_D(PSConverter); + d->marginLeft = marginLeft; +} + +void PSConverter::setTopMargin(int marginTop) +{ + Q_D(PSConverter); + d->marginTop = marginTop; +} + +void PSConverter::setStrictMargins(bool strictMargins) +{ + Q_D(PSConverter); + if (strictMargins) { + d->opts |= StrictMargins; + } else { + d->opts &= ~StrictMargins; + } +} + +void PSConverter::setForceOverprintPreview(bool forceOverprintPreview) +{ + Q_D(PSConverter); + if (forceOverprintPreview) { + d->opts |= ForceOverprintPreview; + } else { + d->opts &= ~ForceOverprintPreview; + } +} + +void PSConverter::setForceRasterize(bool forceRasterize) +{ + Q_D(PSConverter); + if (forceRasterize) { + d->opts |= ForceRasterization; + } else { + d->opts &= ~ForceRasterization; + } +} + +void PSConverter::setPSOptions(PSConverter::PSOptions options) +{ + Q_D(PSConverter); + d->opts = options; +} + +PSConverter::PSOptions PSConverter::psOptions() const +{ + Q_D(const PSConverter); + return d->opts; +} + +void PSConverter::setPageConvertedCallback(void (*callback)(int page, void *payload), void *payload) +{ + Q_D(PSConverter); + d->pageConvertedCallback = callback; + d->pageConvertedPayload = payload; +} + +static bool annotDisplayDecideCbk(Annot *annot, void *user_data) +{ + if (annot->getType() == Annot::typeWidget) { + return true; // Never hide forms + } else { + return *(bool *)user_data; + } +} + +bool PSConverter::convert() +{ + Q_D(PSConverter); + d->lastError = NoError; + + Q_ASSERT(!d->pageList.isEmpty()); + Q_ASSERT(d->paperWidth != -1); + Q_ASSERT(d->paperHeight != -1); + + if (d->document->locked) { + d->lastError = FileLockedError; + return false; + } + + QIODevice *dev = d->openDevice(); + if (!dev) { + d->lastError = OpenOutputError; + return false; + } + + QByteArray pstitle8Bit = d->title.toLocal8Bit(); + char *pstitlechar; + if (!d->title.isEmpty()) { + pstitlechar = pstitle8Bit.data(); + } else { + pstitlechar = nullptr; + } + + std::vector pages; + foreach (int page, d->pageList) { + pages.push_back(page); + } + + PSOutputDev *psOut = new PSOutputDev(outputToQIODevice, dev, pstitlechar, d->document->doc, pages, (d->opts & PrintToEPS) ? psModeEPS : psModePS, d->paperWidth, d->paperHeight, false, false, d->marginLeft, d->marginBottom, + d->paperWidth - d->marginRight, d->paperHeight - d->marginTop, (d->opts & ForceRasterization) ? psAlwaysRasterize : psRasterizeWhenNeeded); + if (d->opts & ForceOverprintPreview) { + psOut->setForceRasterize(psAlwaysRasterize); + psOut->setOverprintPreview(true); + } + + if (d->opts & StrictMargins) { + double xScale = ((double)d->paperWidth - (double)d->marginLeft - (double)d->marginRight) / (double)d->paperWidth; + double yScale = ((double)d->paperHeight - (double)d->marginBottom - (double)d->marginTop) / (double)d->paperHeight; + psOut->setScale(xScale, yScale); + } + + if (psOut->isOk()) { + bool isPrinting = (d->opts & Printing) ? true : false; + bool showAnnotations = (d->opts & HideAnnotations) ? false : true; + foreach (int page, d->pageList) { + d->document->doc->displayPage(psOut, page, d->hDPI, d->vDPI, d->rotate, false, true, isPrinting, nullptr, nullptr, annotDisplayDecideCbk, &showAnnotations, true); + if (d->pageConvertedCallback) { + (*d->pageConvertedCallback)(page, d->pageConvertedPayload); + } + } + delete psOut; + d->closeDevice(); + return true; + } else { + delete psOut; + d->closeDevice(); + return false; + } +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-qiodeviceinstream-private.h b/poppler-24.05.0/qt5/src/poppler-qiodeviceinstream-private.h new file mode 100644 index 0000000000000000000000000000000000000000..3ca0f674efa8068af59a819bfb063ea8e496eecf --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-qiodeviceinstream-private.h @@ -0,0 +1,48 @@ +/* poppler-qiodeviceinstream-private.h: Qt5 interface to poppler + * Copyright (C) 2019 Alexander Volkov + * + * 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. + */ + +#ifndef POPPLER_QIODEVICEINSTREAM_PRIVATE_H +#define POPPLER_QIODEVICEINSTREAM_PRIVATE_H + +#include "Object.h" +#include "Stream.h" + +class QIODevice; + +namespace Poppler { + +class QIODeviceInStream : public BaseSeekInputStream +{ +public: + QIODeviceInStream(QIODevice *device, Goffset startA, bool limitedA, Goffset lengthA, Object &&dictA); + ~QIODeviceInStream() override; + + BaseStream *copy() override; + Stream *makeSubStream(Goffset startA, bool limitedA, Goffset lengthA, Object &&dictA) override; + +private: + Goffset currentPos() const override; + void setCurrentPos(Goffset offset) override; + Goffset read(char *buffer, Goffset count) override; + + QIODevice *m_device; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-qiodeviceinstream.cc b/poppler-24.05.0/qt5/src/poppler-qiodeviceinstream.cc new file mode 100644 index 0000000000000000000000000000000000000000..5ad805b76ada33731ddae41a3f66de4a8b652923 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-qiodeviceinstream.cc @@ -0,0 +1,59 @@ +/* poppler-qiodeviceinstream.cc: Qt5 interface to poppler + * Copyright (C) 2019 Alexander Volkov + * + * 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-qiodeviceinstream-private.h" + +#include + +#include + +namespace Poppler { + +QIODeviceInStream::QIODeviceInStream(QIODevice *device, Goffset startA, bool limitedA, Goffset lengthA, Object &&dictA) : BaseSeekInputStream(startA, limitedA, lengthA, std::move(dictA)), m_device(device) { } + +QIODeviceInStream::~QIODeviceInStream() +{ + close(); +} + +BaseStream *QIODeviceInStream::copy() +{ + return new QIODeviceInStream(m_device, start, limited, length, dict.copy()); +} + +Stream *QIODeviceInStream::makeSubStream(Goffset startA, bool limitedA, Goffset lengthA, Object &&dictA) +{ + return new QIODeviceInStream(m_device, startA, limitedA, lengthA, std::move(dictA)); +} + +Goffset QIODeviceInStream::currentPos() const +{ + return m_device->pos(); +} + +void QIODeviceInStream::setCurrentPos(Goffset offset) +{ + m_device->seek(offset); +} + +Goffset QIODeviceInStream::read(char *buffer, Goffset count) +{ + return m_device->read(buffer, count); +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-qiodeviceoutstream-private.h b/poppler-24.05.0/qt5/src/poppler-qiodeviceoutstream-private.h new file mode 100644 index 0000000000000000000000000000000000000000..78172cd7e9b426c47c6af1f5cc705d79f8cdbee0 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-qiodeviceoutstream-private.h @@ -0,0 +1,49 @@ +/* poppler-qiodevicestream-private.h: Qt5 interface to poppler + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2013 Adrian Johnson + * Copyright (C) 2021, Albert Astals Cid + * Copyright (C) 2021, Even Rouault + * + * 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. + */ + +#ifndef POPPLER_QIODEVICESTREAM_PRIVATE_H +#define POPPLER_QIODEVICESTREAM_PRIVATE_H + +#include "Object.h" +#include "Stream.h" + +class QIODevice; + +namespace Poppler { + +class QIODeviceOutStream : public OutStream +{ +public: + explicit QIODeviceOutStream(QIODevice *device); + ~QIODeviceOutStream() override; + + void close() override; + Goffset getPos() override; + void put(char c) override; + void printf(const char *format, ...) override GCC_PRINTF_FORMAT(2, 3); + +private: + QIODevice *m_device; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-qiodeviceoutstream.cc b/poppler-24.05.0/qt5/src/poppler-qiodeviceoutstream.cc new file mode 100644 index 0000000000000000000000000000000000000000..38ac76951ed2e1d5f13fa2c2741469a81b28cf8e --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-qiodeviceoutstream.cc @@ -0,0 +1,70 @@ +/* poppler-qiodevicestream.cc: Qt5 interface to poppler + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2013 Adrian Johnson + * Copyright (C) 2020, 2021 Albert Astals Cid + * Copyright (C) 2021, Even Rouault + * + * 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-qiodeviceoutstream-private.h" + +#include + +#include + +namespace Poppler { + +QIODeviceOutStream::QIODeviceOutStream(QIODevice *device) : m_device(device) { } + +QIODeviceOutStream::~QIODeviceOutStream() { } + +void QIODeviceOutStream::close() { } + +Goffset QIODeviceOutStream::getPos() +{ + return m_device->pos(); +} + +void QIODeviceOutStream::put(char c) +{ + m_device->putChar(c); +} + +static int poppler_vasprintf(char **buf_ptr, const char *format, va_list ap) GCC_PRINTF_FORMAT(2, 0); + +static int poppler_vasprintf(char **buf_ptr, const char *format, va_list ap) +{ + va_list ap_copy; + va_copy(ap_copy, ap); + const size_t size = vsnprintf(nullptr, 0, format, ap_copy) + 1; + va_end(ap_copy); + *buf_ptr = new char[size]; + + return qvsnprintf(*buf_ptr, size, format, ap); +} + +void QIODeviceOutStream::printf(const char *format, ...) +{ + va_list ap; + va_start(ap, format); + char *buf; + const size_t bufsize = poppler_vasprintf(&buf, format, ap); + va_end(ap); + m_device->write(buf, bufsize); + delete[] buf; +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-qt5.h b/poppler-24.05.0/qt5/src/poppler-qt5.h new file mode 100644 index 0000000000000000000000000000000000000000..4236de06eff98c59563a5c1b5a2c121dc64965f7 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-qt5.h @@ -0,0 +1,2550 @@ +/* poppler-qt.h: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2005, 2007, Brad Hards + * Copyright (C) 2005-2015, 2017-2022, Albert Astals Cid + * Copyright (C) 2005, Stefan Kebekus + * Copyright (C) 2006-2011, Pino Toscano + * Copyright (C) 2009 Shawn Rutledge + * Copyright (C) 2010 Suzuki Toshiya + * Copyright (C) 2010 Matthias Fauconneau + * Copyright (C) 2011 Andreas Hartmetz + * Copyright (C) 2011 Glad Deschrijver + * Copyright (C) 2012, Guillermo A. Amaral B. + * Copyright (C) 2012, Fabio D'Urso + * Copyright (C) 2012, Tobias Koenig + * Copyright (C) 2012, 2014, 2015, 2018, 2019 Adam Reichold + * Copyright (C) 2012, 2013 Thomas Freitag + * Copyright (C) 2013 Anthony Granger + * Copyright (C) 2016 Jakub Alba + * Copyright (C) 2017, 2020, 2021 Oliver Sander + * Copyright (C) 2017, 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018, 2021 Nelson Benítez León + * Copyright (C) 2019 Jan Grulich + * Copyright (C) 2019 Alexander Volkov + * Copyright (C) 2020 Philipp Knechtges + * Copyright (C) 2020 Katarina Behrens + * Copyright (C) 2020 Thorsten Behrens + * Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, . + * Copyright (C) 2021 Mahmoud Khalil + * Copyright (C) 2021 Georgiy Sgibnev . Work sponsored by lab50.net. + * Copyright (C) 2022 Martin + * Copyright (C) 2023 Kevin Ottens . Work sponsored by De Bortoli Wines + * + * 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. + */ + +#ifndef __POPPLER_QT_H__ +#define __POPPLER_QT_H__ + +#include + +#include "poppler-annotation.h" +#include "poppler-link.h" +#include "poppler-optcontent.h" +#include "poppler-page-transition.h" + +#include +#include +#include +#include +#include "poppler-export.h" + +class EmbFile; +class Sound; +class AnnotMovie; + +/** + The %Poppler Qt5 binding. +*/ +namespace Poppler { + +class Document; +class DocumentData; + +class PageData; + +class FormField; +class FormFieldSignature; + +class TextBoxData; + +class PDFConverter; +class PSConverter; + +struct OutlineItemData; + +/** + Debug/error function. + + This function type is used for debugging & error output; + the first parameter is the actual message, the second is the unaltered + closure argument which was passed to the setDebugErrorFunction call. + + \since 0.16 +*/ +using PopplerDebugFunc = void (*)(const QString & /*message*/, const QVariant & /*closure*/); + +/** + Set a new debug/error output function. + + If not set, by default error and debug messages will be sent to the + Qt \p qDebug() function. + + \param debugFunction the new debug function + \param closure user data which will be passes as-is to the debug function + + \since 0.16 +*/ +POPPLER_QT5_EXPORT void setDebugErrorFunction(PopplerDebugFunc debugFunction, const QVariant &closure); + +/** + Describes the physical location of text on a document page + + This very simple class describes the physical location of text + on the page. It consists of + - a QString that contains the text + - a QRectF that gives a box that describes where on the page + the text is found. +*/ +class POPPLER_QT5_EXPORT TextBox +{ + friend class Page; + +public: + /** + The default constructor sets the \p text and the rectangle that + contains the text. Coordinates for the \p bBox are in points = + 1/72 of an inch. + */ + TextBox(const QString &text, const QRectF &bBox); + /** + Destructor. + */ + ~TextBox(); + + /** + Returns the text of this text box + */ + QString text() const; + + /** + Returns the position of the text, in point, i.e., 1/72 of + an inch + + \since 0.8 + */ + QRectF boundingBox() const; + + /** + Returns the pointer to the next text box, if there is one. + + Otherwise, it returns a null pointer. + */ + TextBox *nextWord() const; + + /** + Returns the bounding box of the \p i -th characted of the word. + */ + QRectF charBoundingBox(int i) const; + + /** + Returns whether there is a space character after this text box + */ + bool hasSpaceAfter() const; + +private: + Q_DISABLE_COPY(TextBox) + + TextBoxData *m_data; +}; + +class FontInfoData; +/** + Container class for information about a font within a PDF + document +*/ +class POPPLER_QT5_EXPORT FontInfo +{ + friend class Document; + +public: + /** + The type of font. + */ + enum Type + { + unknown, + Type1, + Type1C, + Type1COT, + Type3, + TrueType, + TrueTypeOT, + CIDType0, + CIDType0C, + CIDType0COT, + CIDTrueType, + CIDTrueTypeOT + }; + + /// \cond PRIVATE + /** + Create a new font information container. + */ + FontInfo(); + + /** + Create a new font information container. + */ + explicit FontInfo(const FontInfoData &fid); + /// \endcond + + /** + Copy constructor. + */ + FontInfo(const FontInfo &fi); + + /** + Destructor. + */ + ~FontInfo(); + + /** + The name of the font. Can be a null QString if the font has no name + */ + QString name() const; + + /** + The name of the substitute font. Can be a null QString if the font has no substitute font + @since 0.80 + */ + QString substituteName() const; + + /** + The path of the font file used to represent this font on this system, + or a null string is the font is embedded + */ + QString file() const; + + /** + Whether the font is embedded in the file, or not + + \return true if the font is embedded + */ + bool isEmbedded() const; + + /** + Whether the font provided is only a subset of the full + font or not. This only has meaning if the font is embedded. + + \return true if the font is only a subset + */ + bool isSubset() const; + + /** + The type of font encoding + + \return a enumerated value corresponding to the font encoding used + + \sa typeName for a string equivalent + */ + Type type() const; + + /** + The name of the font encoding used + + \note if you are looking for the name of the font (as opposed to the + encoding format used), you probably want name(). + + \sa type for a enumeration version + */ + QString typeName() const; + + /** + Standard assignment operator + */ + FontInfo &operator=(const FontInfo &fi); + +private: + FontInfoData *m_data; +}; + +class FontIteratorData; +/** + Iterator for reading the fonts in a document. + + FontIterator provides a Java-style iterator for reading the fonts in a + document. + + You can use it in the following way: + \code +Poppler::FontIterator* it = doc->newFontIterator(); +while (it->hasNext()) { +QList fonts = it->next(); +// do something with the fonts +} +// after doing the job, the iterator must be freed +delete it; + \endcode + + \since 0.12 +*/ +class POPPLER_QT5_EXPORT FontIterator +{ + friend class Document; + friend class DocumentData; + +public: + /** + Destructor. + */ + ~FontIterator(); + + /** + Returns the fonts of the current page and then advances the iterator + to the next page. + */ + QList next(); + + /** + Checks whether there is at least one more page to iterate, ie returns + false when the iterator is beyond the last page. + */ + bool hasNext() const; + + /** + Returns the current page where the iterator is. + */ + int currentPage() const; + +private: + Q_DISABLE_COPY(FontIterator) + FontIterator(int, DocumentData *dd); + + FontIteratorData *d; +}; + +class EmbeddedFileData; +/** + Container class for an embedded file with a PDF document +*/ +class POPPLER_QT5_EXPORT EmbeddedFile +{ + friend class DocumentData; + friend class AnnotationPrivate; + +public: + /// \cond PRIVATE + explicit EmbeddedFile(EmbFile *embfile); + /// \endcond + + /** + Destructor. + */ + ~EmbeddedFile(); + + /** + The name associated with the file + */ + QString name() const; + + /** + The description associated with the file, if any. + + This will return an empty QString if there is no description element + */ + QString description() const; + + /** + The size of the file. + + This will return < 0 if there is no size element + */ + int size() const; + + /** + The modification date for the embedded file, if known. + */ + QDateTime modDate() const; + + /** + The creation date for the embedded file, if known. + */ + QDateTime createDate() const; + + /** + The MD5 checksum of the file. + + This will return an empty QByteArray if there is no checksum element. + */ + QByteArray checksum() const; + + /** + The MIME type of the file, if known. + + \since 0.8 + */ + QString mimeType() const; + + /** + The data as a byte array + */ + QByteArray data(); + + /** + Is the embedded file valid? + + \since 0.12 + */ + bool isValid() const; + + /** + A QDataStream for the actual data? + */ + // QDataStream dataStream() const; + +private: + Q_DISABLE_COPY(EmbeddedFile) + explicit EmbeddedFile(EmbeddedFileData &dd); + + EmbeddedFileData *m_embeddedFile; +}; + +/** + \brief A page in a document. + + The Page class represents a single page within a PDF document. + + You cannot construct a Page directly, but you have to use the Document + functions that return a new Page out of an index or a label. +*/ +class POPPLER_QT5_EXPORT Page +{ + friend class Document; + +public: + /** + Destructor. + */ + ~Page(); + + /** + The type of rotation to apply for an operation + */ + enum Rotation + { + Rotate0 = 0, ///< Do not rotate + Rotate90 = 1, ///< Rotate 90 degrees clockwise + Rotate180 = 2, ///< Rotate 180 degrees + Rotate270 = 3 ///< Rotate 270 degrees clockwise (90 degrees counterclockwise) + }; + + /** + The kinds of page actions + */ + enum PageAction + { + Opening, ///< The action when a page is "opened" + Closing ///< The action when a page is "closed" + }; + + /** + How the text is going to be returned + \since 0.16 + */ + enum TextLayout + { + PhysicalLayout, ///< The text is layouted to resemble the real page layout + RawOrderLayout ///< The text is returned without any type of processing + }; + + /** + Additional flags for the renderToPainter method + \since 0.16 + */ + enum PainterFlag + { + NoPainterFlags = 0x00000000, ///< \since 0.63 + /** + Do not save/restore the caller-owned painter. + + renderToPainter() by default preserves, using save() + restore(), + the state of the painter specified; if this is not needed, this + flag can avoid this job + */ + DontSaveAndRestore = 0x00000001 + }; + Q_DECLARE_FLAGS(PainterFlags, PainterFlag) + + /** + Render the page to a QImage using the current + \link Document::renderBackend() Document renderer\endlink. + + If \p x = \p y = \p w = \p h = -1, the method will automatically + compute the size of the image from the horizontal and vertical + resolutions specified in \p xres and \p yres. Otherwise, the + method renders only a part of the page, specified by the + parameters (\p x, \p y, \p w, \p h) in pixel coordinates. The returned + QImage then has size (\p w, \p h), independent of the page + size. + + \param x specifies the left x-coordinate of the box, in + pixels. + + \param y specifies the top y-coordinate of the box, in + pixels. + + \param w specifies the width of the box, in pixels. + + \param h specifies the height of the box, in pixels. + + \param xres horizontal resolution of the graphics device, + in dots per inch + + \param yres vertical resolution of the graphics device, in + dots per inch + + \param rotate how to rotate the page + + \warning The parameter (\p x, \p y, \p w, \p h) are not + well-tested. Unusual or meaningless parameters may lead to + rather unexpected results. + + \returns a QImage of the page, or a null image on failure. + + \since 0.6 + */ + QImage renderToImage(double xres = 72.0, double yres = 72.0, int x = -1, int y = -1, int w = -1, int h = -1, Rotation rotate = Rotate0) const; + + /** + Partial Update renderToImage callback. + + This function type is used for doing partial rendering updates; + the first parameter is the image as rendered up to now, the second is the unaltered + closure argument which was passed to the renderToImage call. + + \since 0.62 + */ + using RenderToImagePartialUpdateFunc = void (*)(const QImage & /*image*/, const QVariant & /*closure*/); + + /** + Partial Update query renderToImage callback. + + This function type is used for query if the partial rendering update should happen; + the parameter is the unaltered closure argument which was passed to the renderToImage call. + + \since 0.62 + */ + using ShouldRenderToImagePartialQueryFunc = bool (*)(const QVariant & /*closure*/); + + /** + Render the page to a QImage using the current + \link Document::renderBackend() Document renderer\endlink. + + If \p x = \p y = \p w = \p h = -1, the method will automatically + compute the size of the image from the horizontal and vertical + resolutions specified in \p xres and \p yres. Otherwise, the + method renders only a part of the page, specified by the + parameters (\p x, \p y, \p w, \p h) in pixel coordinates. The returned + QImage then has size (\p w, \p h), independent of the page + size. + + \param x specifies the left x-coordinate of the box, in + pixels. + + \param y specifies the top y-coordinate of the box, in + pixels. + + \param w specifies the width of the box, in pixels. + + \param h specifies the height of the box, in pixels. + + \param xres horizontal resolution of the graphics device, + in dots per inch + + \param yres vertical resolution of the graphics device, in + dots per inch + + \param rotate how to rotate the page + + \param partialUpdateCallback callback that will be called to + report a partial rendering update + + \param shouldDoPartialUpdateCallback callback that will be called + to ask if a partial rendering update is wanted. This exists + because doing a partial rendering update needs to copy the image + buffer so if it is not wanted it is better skipped early. + + \param payload opaque structure that will be passed + back to partialUpdateCallback and shouldDoPartialUpdateCallback. + + \warning The parameter (\p x, \p y, \p w, \p h) are not + well-tested. Unusual or meaningless parameters may lead to + rather unexpected results. + + \returns a QImage of the page, or a null image on failure. + + \since 0.62 + */ + QImage renderToImage(double xres, double yres, int x, int y, int w, int h, Rotation rotate, RenderToImagePartialUpdateFunc partialUpdateCallback, ShouldRenderToImagePartialQueryFunc shouldDoPartialUpdateCallback, + const QVariant &payload) const; + + /** + Abort query function callback. + + This function type is used for query if the current rendering/text extraction should be cancelled. + + \since 0.63 + */ + using ShouldAbortQueryFunc = bool (*)(const QVariant & /*closure*/); + + /** +Render the page to a QImage using the current +\link Document::renderBackend() Document renderer\endlink. + +If \p x = \p y = \p w = \p h = -1, the method will automatically +compute the size of the image from the horizontal and vertical +resolutions specified in \p xres and \p yres. Otherwise, the +method renders only a part of the page, specified by the +parameters (\p x, \p y, \p w, \p h) in pixel coordinates. The returned +QImage then has size (\p w, \p h), independent of the page +size. + +\param x specifies the left x-coordinate of the box, in +pixels. + +\param y specifies the top y-coordinate of the box, in +pixels. + +\param w specifies the width of the box, in pixels. + +\param h specifies the height of the box, in pixels. + +\param xres horizontal resolution of the graphics device, +in dots per inch + +\param yres vertical resolution of the graphics device, in +dots per inch + +\param rotate how to rotate the page + +\param partialUpdateCallback callback that will be called to +report a partial rendering update + +\param shouldDoPartialUpdateCallback callback that will be called +to ask if a partial rendering update is wanted. This exists +because doing a partial rendering update needs to copy the image +buffer so if it is not wanted it is better skipped early. + +\param shouldAbortRenderCallback callback that will be called +to ask if the rendering should be cancelled. + +\param payload opaque structure that will be passed +back to partialUpdateCallback, shouldDoPartialUpdateCallback +and shouldAbortRenderCallback. + +\warning The parameter (\p x, \p y, \p w, \p h) are not +well-tested. Unusual or meaningless parameters may lead to +rather unexpected results. + +\returns a QImage of the page, or a null image on failure. + +\since 0.63 +*/ + QImage renderToImage(double xres, double yres, int x, int y, int w, int h, Rotation rotate, RenderToImagePartialUpdateFunc partialUpdateCallback, ShouldRenderToImagePartialQueryFunc shouldDoPartialUpdateCallback, + ShouldAbortQueryFunc shouldAbortRenderCallback, const QVariant &payload) const; + + /** + Render the page to the specified QPainter using the current + \link Document::renderBackend() Document renderer\endlink. + + If \p x = \p y = \p w = \p h = -1, the method will automatically + compute the size of the page area from the horizontal and vertical + resolutions specified in \p xres and \p yres. Otherwise, the + method renders only a part of the page, specified by the + parameters (\p x, \p y, \p w, \p h) in pixel coordinates. + + \param painter the painter to paint on + + \param x specifies the left x-coordinate of the box, in + pixels. + + \param y specifies the top y-coordinate of the box, in + pixels. + + \param w specifies the width of the box, in pixels. + + \param h specifies the height of the box, in pixels. + + \param xres horizontal resolution of the graphics device, + in dots per inch + + \param yres vertical resolution of the graphics device, in + dots per inch + + \param rotate how to rotate the page + + \param flags additional painter flags + + \warning The parameter (\p x, \p y, \p w, \p h) are not + well-tested. Unusual or meaningless parameters may lead to + rather unexpected results. + + \returns whether the painting succeeded + + \note This method is only supported for the QPainterOutputDev + + \since 0.16 + */ + bool renderToPainter(QPainter *painter, double xres = 72.0, double yres = 72.0, int x = -1, int y = -1, int w = -1, int h = -1, Rotation rotate = Rotate0, PainterFlags flags = NoPainterFlags) const; + + /** + Get the page thumbnail if it exists. + + \return a QImage of the thumbnail, or a null image + if the PDF does not contain one for this page + + \since 0.12 + */ + QImage thumbnail() const; + + /** + Returns the text that is inside a specified rectangle + + \param rect the rectangle specifying the area of interest, + with coordinates given in points, i.e., 1/72th of an inch. + If rect is null, all text on the page is given + + \since 0.16 + **/ + QString text(const QRectF &rect, TextLayout textLayout) const; + + /** + Returns the text that is inside a specified rectangle. + The text is returned using the physical layout of the page + + \param rect the rectangle specifying the area of interest, + with coordinates given in points, i.e., 1/72th of an inch. + If rect is null, all text on the page is given + **/ + QString text(const QRectF &rect) const; + + /** + The starting point for a search + */ + enum SearchDirection + { + FromTop, ///< Start sorting at the top of the document + NextResult, ///< Find the next result, moving "down the page" + PreviousResult ///< Find the previous result, moving "up the page" + }; + + /** + The type of search to perform + */ + enum SearchMode + { + CaseSensitive, ///< Case differences cause no match in searching + CaseInsensitive ///< Case differences are ignored in matching + }; + + /** + Flags to modify the search behaviour \since 0.31 + */ + enum SearchFlag + { + NoSearchFlags = 0x00000000, ///< since 0.63 + IgnoreCase = 0x00000001, ///< Case differences are ignored + WholeWords = 0x00000002, ///< Only whole words are matched + IgnoreDiacritics = 0x00000004, ///< Diacritic differences (eg. accents, umlauts, diaeresis) are ignored. \since 0.73 + ///< This option will have no effect if the search term contains characters which + ///< are not pure ascii. + AcrossLines = 0x00000008 ///< Allows to match on text spanning from end of a line to the next line. + ///< It won't match on text spanning more than two lines. Automatically ignores hyphen + ///< at end of line, and allows whitespace in search term to match on newline. \since 21.05.0 + }; + Q_DECLARE_FLAGS(SearchFlags, SearchFlag) + + /** + Returns true if the specified text was found. + + \param text the text the search + \param rectXXX in all directions is used to return where the text was found, for NextResult and PreviousResult + indicates where to continue searching for + \param direction in which direction do the search + \param caseSensitive be case sensitive? + \param rotate the rotation to apply for the search order + \since 0.14 + **/ + Q_DECL_DEPRECATED bool search(const QString &text, double &rectLeft, double &rectTop, double &rectRight, double &rectBottom, SearchDirection direction, SearchMode caseSensitive, Rotation rotate = Rotate0) const; + + /** + Returns true if the specified text was found. + + \param text the text the search + \param rectXXX in all directions is used to return where the text was found, for NextResult and PreviousResult + indicates where to continue searching for + \param direction in which direction do the search + \param flags the flags to consider during matching + \param rotate the rotation to apply for the search order + + \since 0.31 + **/ + bool search(const QString &text, double &sLeft, double &sTop, double &sRight, double &sBottom, SearchDirection direction, SearchFlags flags = NoSearchFlags, Rotation rotate = Rotate0) const; + + /** + Returns a list of all occurrences of the specified text on the page. + + \param text the text to search + \param caseSensitive whether to be case sensitive + \param rotate the rotation to apply for the search order + + \warning Do not use the returned QRectF as arguments of another search call because of truncation issues if qreal is defined as float. + + \since 0.22 + **/ + Q_DECL_DEPRECATED QList search(const QString &text, SearchMode caseSensitive, Rotation rotate = Rotate0) const; + + /** + Returns a list of all occurrences of the specified text on the page. + + if SearchFlags::AcrossLines is given in \param flags, then rects may just + be parts of the text itself if it's split between multiple lines. + + \param text the text to search + \param flags the flags to consider during matching + \param rotate the rotation to apply for the search order + + \warning Do not use the returned QRectF as arguments of another search call because of truncation issues if qreal is defined as float. + + \since 0.31 + **/ + QList search(const QString &text, SearchFlags flags = NoSearchFlags, Rotation rotate = Rotate0) const; + + /** + Returns a list of text of the page + + This method returns a QList of TextBoxes that contain all + the text of the page, with roughly one text word of text + per TextBox item. + + For text written in western languages (left-to-right and + up-to-down), the QList contains the text in the proper + order. + + \note The caller owns the text boxes and they should + be deleted when no longer required. + + \warning This method is not tested with Asian scripts + */ + QList textList(Rotation rotate = Rotate0) const; + + /** + Returns a list of text of the page + + This method returns a QList of TextBoxes that contain all + the text of the page, with roughly one text word of text + per TextBox item. + + For text written in western languages (left-to-right and + up-to-down), the QList contains the text in the proper + order. + + \param shouldAbortExtractionCallback callback that will be called + to ask if the text extraction should be cancelled. + + \param closure opaque structure that will be passed + back to shouldAbortExtractionCallback. + + \note The caller owns the text boxes and they should + be deleted when no longer required. + + \warning This method is not tested with Asian scripts + + // \since 0.63 + */ + QList textList(Rotation rotate, ShouldAbortQueryFunc shouldAbortExtractionCallback, const QVariant &closure) const; + + /** + \return The dimensions (cropbox) of the page, in points (i.e. 1/72th of an inch) + */ + QSizeF pageSizeF() const; + + /** + \return The dimensions (cropbox) of the page, in points (i.e. 1/72th of an inch) + */ + QSize pageSize() const; + + /** + Returns the transition of this page + + \returns a pointer to a PageTransition structure that + defines how transition to this page shall be performed. + + \note The PageTransition structure is owned by this page, and will + automatically be destroyed when this page class is + destroyed. + **/ + PageTransition *transition() const; + + /** + Gets the page action specified, or NULL if there is no action. + + \since 0.6 + **/ + Link *action(PageAction act) const; + + /** + Types of orientations that are possible + */ + enum Orientation + { + Landscape, ///< Landscape orientation (portrait, with 90 degrees clockwise rotation ) + Portrait, ///< Normal portrait orientation + Seascape, ///< Seascape orientation (portrait, with 270 degrees clockwise rotation) + UpsideDown ///< Upside down orientation (portrait, with 180 degrees rotation) + }; + + /** + The orientation of the page + */ + Orientation orientation() const; + + /** + The default CTM + */ + void defaultCTM(double *CTM, double dpiX, double dpiY, int rotate, bool upsideDown); + + /** + Gets the links of the page + */ + QList links() const; + + /** + Returns the annotations of the page + + \note If you call this method twice, you get different objects + pointing to the same annotations (see Annotation). + The caller owns the returned objects and they should be deleted + when no longer required. + */ + QList annotations() const; + + /** + Returns the annotations of the page + + \param subtypes the subtypes of annotations you are interested in + + \note If you call this method twice, you get different objects + pointing to the same annotations (see Annotation). + The caller owns the returned objects and they should be deleted + when no longer required. + + \since 0.28 + */ + QList annotations(const QSet &subtypes) const; + + /** + Adds an annotation to the page + + \note Ownership of the annotation object stays with the caller, who can + delete it at any time. + \since 0.20 + */ + void addAnnotation(const Annotation *ann); + + /** + Removes an annotation from the page and destroys the annotation object + + \note There mustn't be other Annotation objects pointing this annotation + \since 0.20 + */ + void removeAnnotation(const Annotation *ann); + + /** + Returns the form fields on the page + The caller gets the ownership of the returned objects. + + \since 0.6 + */ + QList formFields() const; + + /** + Returns the page duration. That is the time, in seconds, that the page + should be displayed before the presentation automatically advances to the next page. + Returns < 0 if duration is not set. + + \since 0.6 + */ + double duration() const; + + /** + Returns the label of the page, or a null string is the page has no label. + + \since 0.6 + **/ + QString label() const; + + /** + Returns the index of the page. + + \since 0.70 + **/ + int index() const; + +private: + Q_DISABLE_COPY(Page) + + Page(DocumentData *doc, int index); + PageData *m_page; +}; + +/** + \brief Item in the outline of a PDF document + + Represents an item in the outline of PDF document, i.e. a name, an internal or external link and a set of child items. + + \since 0.74 +**/ +class POPPLER_QT5_EXPORT OutlineItem +{ + friend class Document; + +public: + /** + Constructs a null item, i.e. one that does not represent a valid item in the outline of some PDF document. + **/ + OutlineItem(); + ~OutlineItem(); + + OutlineItem(const OutlineItem &other); + OutlineItem &operator=(const OutlineItem &other); + + OutlineItem(OutlineItem &&other) noexcept; + OutlineItem &operator=(OutlineItem &&other) noexcept; + + /** + Indicates whether an item is null, i.e. whether it does not represent a valid item in the outline of some PDF document. + **/ + bool isNull() const; + + /** + The name of the item which should be displayed to the user. + **/ + QString name() const; + + /** + Indicates whether the item should initially be display in an expanded or collapsed state. + **/ + bool isOpen() const; + + /** + The destination referred to by this item. + + \returns a shared pointer to an immutable link destination + **/ + QSharedPointer destination() const; + + /** + The external file name of the document to which the \see destination refers + + \returns a string with the external file name or an empty string if there is none + */ + QString externalFileName() const; + + /** + The URI to which the item links + + \returns a string with the URI which this item links or an empty string if there is none + **/ + QString uri() const; + + /** + Determines if this item has any child items + + \returns true if there are any child items + **/ + bool hasChildren() const; + + /** + Gets the child items of this item + + \returns a vector outline items, empty if there are none + **/ + QVector children() const; + +private: + explicit OutlineItem(OutlineItemData *data); + OutlineItemData *m_data; +}; + +/** + \brief PDF document. + + The Document class represents a PDF document: its pages, and all the global + properties, metadata, etc. + + \section ownership Ownership of the returned objects + + All the functions that returns class pointers create new object, and the + responsibility of those is given to the callee. + + The only exception is \link Poppler::Page::transition() Page::transition()\endlink. + + \section document-loading Loading + + To get a Document, you have to load it via the load() & loadFromData() + functions. + + In all the functions that have passwords as arguments, they \b must be Latin1 + encoded. If you have a password that is a UTF-8 string, you need to use + QString::toLatin1() (or similar) to convert the password first. + If you have a UTF-8 character array, consider converting it to a QString first + (QString::fromUtf8(), or similar) before converting to Latin1 encoding. + + \section document-rendering Rendering + + To render pages of a document, you have different Document functions to set + various options. + + \subsection document-rendering-backend Backends + + %Poppler offers a different backends for rendering the pages. Currently + there are two backends (see #RenderBackend), but only the Splash engine works + well and has been tested. + + The available rendering backends can be discovered via availableRenderBackends(). + The current rendering backend can be changed using setRenderBackend(). + Please note that setting a backend not listed in the available ones + will always result in null QImage's. + + \section document-cms Color management support + + %Poppler, if compiled with this support, provides functions to handle color + profiles. + + To know whether the %Poppler version you are using has support for color + management, you can query Poppler::isCmsAvailable(). In case it is not + available, all the color management-related functions will either do nothing + or return null. +*/ +class POPPLER_QT5_EXPORT Document +{ + friend class Page; + friend class DocumentData; + +public: + /** + The page mode + */ + enum PageMode + { + UseNone, ///< No mode - neither document outline nor thumbnail images are visible + UseOutlines, ///< Document outline visible + UseThumbs, ///< Thumbnail images visible + FullScreen, ///< Fullscreen mode (no menubar, windows controls etc) + UseOC, ///< Optional content group panel visible + UseAttach ///< Attachments panel visible + }; + + /** + The page layout + */ + enum PageLayout + { + NoLayout, ///< Layout not specified + SinglePage, ///< Display a single page + OneColumn, ///< Display a single column of pages + TwoColumnLeft, ///< Display the pages in two columns, with odd-numbered pages on the left + TwoColumnRight, ///< Display the pages in two columns, with odd-numbered pages on the right + TwoPageLeft, ///< Display the pages two at a time, with odd-numbered pages on the left + TwoPageRight ///< Display the pages two at a time, with odd-numbered pages on the right + }; + + /** + The render backends available + + \since 0.6 + */ + enum RenderBackend + { + SplashBackend, ///< Splash backend + ArthurBackend, ///< \deprecated The old name of the QPainter backend + QPainterBackend = ArthurBackend ///< @since 20.11 + }; + + /** + The render hints available + + \since 0.6 + */ + enum RenderHint + { + Antialiasing = 0x00000001, ///< Antialiasing for graphics + TextAntialiasing = 0x00000002, ///< Antialiasing for text + TextHinting = 0x00000004, ///< Hinting for text \since 0.12.1 + TextSlightHinting = 0x00000008, ///< Lighter hinting for text when combined with TextHinting \since 0.18 + OverprintPreview = 0x00000010, ///< Overprint preview \since 0.22 + ThinLineSolid = 0x00000020, ///< Enhance thin lines solid \since 0.24 + ThinLineShape = 0x00000040, ///< Enhance thin lines shape. Wins over ThinLineSolid \since 0.24 + IgnorePaperColor = 0x00000080, ///< Do not compose with the paper color \since 0.35 + HideAnnotations = 0x00000100 ///< Do not render annotations \since 0.60 + }; + Q_DECLARE_FLAGS(RenderHints, RenderHint) + + /** + Form types + + \since 0.22 + */ + enum FormType + { + NoForm, ///< Document doesn't contain forms + AcroForm, ///< AcroForm + XfaForm ///< Adobe XML Forms Architecture (XFA), currently unsupported + }; + + /** + Set a color display profile for the current document. + + \param outputProfileA is a \c cmsHPROFILE of the LCMS library. + + \note This should be called before any rendering happens. + + \note It is assumed that poppler takes over the owernship of the corresponding cmsHPROFILE. In particular, + it is no longer the caller's responsibility to close the profile after use. + + \since 0.12 + */ + void setColorDisplayProfile(void *outputProfileA); + /** + Set a color display profile for the current document. + + \param name is the name of the display profile to set. + + \note This should be called before any rendering happens. + + \since 0.12 + */ + void setColorDisplayProfileName(const QString &name); + /** + Return the current RGB profile. + + \return a \c cmsHPROFILE of the LCMS library. + + \note The returned profile stays a property of poppler and shall NOT be closed by the user. It's + existence is guaranteed for as long as this instance of the Document class is not deleted. + + \since 0.12 + */ + void *colorRgbProfile() const; + /** + Return the current display profile. + + \return a \c cmsHPROFILE of the LCMS library. + + \note The returned profile stays a property of poppler and shall NOT be closed by the user. It's + existence is guaranteed for as long as this instance of the Document class is not deleted. + + \since 0.12 + */ + void *colorDisplayProfile() const; + + /** + Load the document from a file on disk + + \param filePath the name (and path, if required) of the file to load + \param ownerPassword the Latin1-encoded owner password to use in + loading the file + \param userPassword the Latin1-encoded user ("open") password + to use in loading the file + + \return the loaded document, or NULL on error + + \note The caller owns the pointer to Document, and this should + be deleted when no longer required. + + \warning The returning document may be locked if a password is required + to open the file, and one is not provided (as the userPassword). + */ + static Document *load(const QString &filePath, const QByteArray &ownerPassword = QByteArray(), const QByteArray &userPassword = QByteArray()); + + /** + Load the document from a device + + \param device the device of the data to load + \param ownerPassword the Latin1-encoded owner password to use in + loading the file + \param userPassword the Latin1-encoded user ("open") password + to use in loading the file + + \return the loaded document, or NULL on error + + \note The caller owns the pointer to Document, and this should + be deleted when no longer required. + + \note The ownership of the device stays with the caller. + + \note if the file is on disk it is recommended to use the other load overload + since it is less resource intensive + + \warning The returning document may be locked if a password is required + to open the file, and one is not provided (as the userPassword). + + \since 0.85 + */ + static Document *load(QIODevice *device, const QByteArray &ownerPassword = QByteArray(), const QByteArray &userPassword = QByteArray()); + + /** + Load the document from memory + + \param fileContents the file contents. They are copied so there is no need + to keep the byte array around for the full life time of + the document. + \param ownerPassword the Latin1-encoded owner password to use in + loading the file + \param userPassword the Latin1-encoded user ("open") password + to use in loading the file + + \return the loaded document, or NULL on error + + \note The caller owns the pointer to Document, and this should + be deleted when no longer required. + + \warning The returning document may be locked if a password is required + to open the file, and one is not provided (as the userPassword). + + \since 0.6 + */ + static Document *loadFromData(const QByteArray &fileContents, const QByteArray &ownerPassword = QByteArray(), const QByteArray &userPassword = QByteArray()); + + /** + Get a specified Page + + Note that this follows the PDF standard of being zero based - if you + want the first page, then you need an index of zero. + + The caller gets the ownership of the returned object. + + This function can return nullptr if for some reason the page can't be properly parsed. + + \param index the page number index + + \warning The Page object returned by this method internally stores a pointer + to the document that it was created from. This pointer will go stale if you + delete the Document object. Therefore the Document object needs to be kept alive + as long as you want to use the Page object. + */ + Page *page(int index) const; + + /** + \overload + + + The intent is that you can pass in a label like \c "ix" and + get the page with that label (which might be in the table of + contents), or pass in \c "1" and get the page that the user + expects (which might not be the first page, if there is a + title page and a table of contents). + + \param label the page label + */ + Page *page(const QString &label) const; + + /** + The number of pages in the document + */ + int numPages() const; + + /** + The type of mode that should be used by the application + when the document is opened. Note that while this is + called page mode, it is really viewer application mode. + */ + PageMode pageMode() const; + + /** + The layout that pages should be shown in when the document + is first opened. This basically describes how pages are + shown relative to each other. + */ + PageLayout pageLayout() const; + + /** + The predominant reading order for text as supplied by + the document's viewer preferences. + + \since 0.26 + */ + Qt::LayoutDirection textDirection() const; + + /** + Provide the passwords required to unlock the document + + \param ownerPassword the Latin1-encoded owner password to use in + loading the file + \param userPassword the Latin1-encoded user ("open") password + to use in loading the file + */ + bool unlock(const QByteArray &ownerPassword, const QByteArray &userPassword); + + /** + Determine if the document is locked + */ + bool isLocked() const; + + /** + The date associated with the document + + You would use this method with something like: + \code +QDateTime created = m_doc->date("CreationDate"); +QDateTime modified = m_doc->date("ModDate"); + \endcode + + The available dates are: + - CreationDate: the date of creation of the document + - ModDate: the date of the last change in the document + + \param type the type of date that is required + */ + QDateTime date(const QString &type) const; + + /** + Set the Info dict date entry specified by \param key to \param val + + \returns true on success, false on failure + */ + bool setDate(const QString &key, const QDateTime &val); + + /** + The date of the creation of the document + */ + QDateTime creationDate() const; + + /** + Set the creation date of the document to \param val + + \returns true on success, false on failure + */ + bool setCreationDate(const QDateTime &val); + + /** + The date of the last change in the document + */ + QDateTime modificationDate() const; + + /** + Set the modification date of the document to \param val + + \returns true on success, false on failure + */ + bool setModificationDate(const QDateTime &val); + + /** + Get specified information associated with the document + + You would use this method with something like: + \code +QString title = m_doc->info("Title"); +QString subject = m_doc->info("Subject"); + \endcode + + In addition to \c Title and \c Subject, other information that may + be available include \c Author, \c Keywords, \c Creator and \c Producer. + + \param type the information that is required + + \sa infoKeys() to get a list of the available keys + */ + QString info(const QString &type) const; + + /** + Set the value of the document's Info dictionary entry specified by \param key to \param val + + \returns true on success, false on failure + */ + bool setInfo(const QString &key, const QString &val); + + /** + The title of the document + */ + QString title() const; + + /** + Set the title of the document to \param val + + \returns true on success, false on failure + */ + bool setTitle(const QString &val); + + /** + The author of the document + */ + QString author() const; + + /** + Set the author of the document to \param val + + \returns true on success, false on failure + */ + bool setAuthor(const QString &val); + + /** + The subject of the document + */ + QString subject() const; + + /** + Set the subject of the document to \param val + + \returns true on success, false on failure + */ + bool setSubject(const QString &val); + + /** + The keywords of the document + */ + QString keywords() const; + + /** + Set the keywords of the document to \param val + + \returns true on success, false on failure + */ + bool setKeywords(const QString &val); + + /** + The creator of the document + */ + QString creator() const; + + /** + Set the creator of the document to \param val + + \returns true on success, false on failure + */ + bool setCreator(const QString &val); + + /** + The producer of the document + */ + QString producer() const; + + /** + Set the producer of the document to \param val + + \returns true on success, false on failure + */ + bool setProducer(const QString &val); + + /** + Remove the document's Info dictionary + + \returns true on success, false on failure + */ + bool removeInfo(); + + /** + Obtain a list of the available string information keys. + */ + QStringList infoKeys() const; + + /** + Test if the document is encrypted + */ + bool isEncrypted() const; + + /** + Test if the document is linearised + + In some cases, this is called "fast web view", since it + is mostly an optimisation for viewing over the Web. + */ + bool isLinearized() const; + + /** + Test if the permissions on the document allow it to be + printed + */ + bool okToPrint() const; + + /** + Test if the permissions on the document allow it to be + printed at high resolution + */ + bool okToPrintHighRes() const; + + /** + Test if the permissions on the document allow it to be + changed. + + \note depending on the type of change, it may be more + appropriate to check other properties as well. + */ + bool okToChange() const; + + /** + Test if the permissions on the document allow the + contents to be copied / extracted + */ + bool okToCopy() const; + + /** + Test if the permissions on the document allow annotations + to be added or modified, and interactive form fields (including + signature fields) to be completed. + */ + bool okToAddNotes() const; + + /** + Test if the permissions on the document allow interactive + form fields (including signature fields) to be completed. + + \note this can be true even if okToAddNotes() is false - this + means that only form completion is permitted. + */ + bool okToFillForm() const; + + /** + Test if the permissions on the document allow interactive + form fields (including signature fields) to be set, created and + modified + */ + bool okToCreateFormFields() const; + + /** + Test if the permissions on the document allow content extraction + (text and perhaps other content) for accessibility usage (eg for + a screen reader) + */ + bool okToExtractForAccessibility() const; + + /** + Test if the permissions on the document allow it to be + "assembled" - insertion, rotation and deletion of pages; + or creation of bookmarks and thumbnail images. + + \note this can be true even if okToChange() is false + */ + bool okToAssemble() const; + + /** + The version of the PDF specification that the document + conforms to + + \param major an optional pointer to a variable where store the + "major" number of the version + \param minor an optional pointer to a variable where store the + "minor" number of the version + + \deprecated Will be removed in the Qt6 interface. Use the method + returning a PdfVersion object instead! + + \since 0.12 + */ + Q_DECL_DEPRECATED void getPdfVersion(int *major, int *minor) const; + + /** \brief The version specification of a pdf file */ + struct PdfVersion + { + int major; + int minor; + }; + + /** + The version of the PDF specification that the document + conforms to + + \since 21.08 + */ + PdfVersion getPdfVersion() const; + + /** + The fonts within the PDF document. + + This is a shorthand for getting all the fonts at once. + + \note this can take a very long time to run with a large + document. You may wish to use a FontIterator if you have more + than say 20 pages + + \see newFontIterator() + */ + QList fonts() const; + + /** + Creates a new FontIterator object for font scanning. + + The new iterator can be used for reading the font information of the + document, reading page by page. + + The caller is responsible for the returned object, ie it should freed + it when no more useful. + + \param startPage the initial page from which start reading fonts + + \see fonts() + + \since 0.12 + */ + FontIterator *newFontIterator(int startPage = 0) const; + + /** + The font data if the font is an embedded one. + + \since 0.10 + */ + QByteArray fontData(const FontInfo &fi) const; + + /** + The documents embedded within the PDF document. + + \note there are two types of embedded document - this call + only accesses documents that are embedded at the document level. + */ + QList embeddedFiles() const; + + /** + Whether there are any documents embedded in this PDF document. + */ + bool hasEmbeddedFiles() const; + + /** + Gets the table of contents (TOC) of the Document. + + The caller is responsible for the returned object. + + In the tree the tag name is the 'screen' name of the entry. A tag can have + attributes. Here follows the list of tag attributes with meaning: + - Destination: A string description of the referred destination + - DestinationName: A 'named reference' to the viewport + - ExternalFileName: A link to a external filename + - Open: A bool value that tells whether the subbranch of the item is open or not + + Resolving the final destination for each item can be done in the following way: + - first, checking for 'Destination': if not empty, then a LinkDestination + can be constructed straight with it + - as second step, if the 'DestinationName' is not empty, then the destination + can be resolved using linkDestination() + + Note also that if 'ExternalFileName' is not emtpy, then the destination refers + to that document (and not to the current one). + + \returns the TOC, or NULL if the Document does not have one + */ + Q_DECL_DEPRECATED QDomDocument *toc() const; + + /** + Gets the outline of the document + + \returns a vector of outline items, empty if there are none + + \since 0.74 + **/ + QVector outline() const; + + /** + Tries to resolve the named destination \p name. + + \note this operation starts a search through the whole document + + \returns a new LinkDestination object if the named destination was + actually found, or NULL otherwise + */ + LinkDestination *linkDestination(const QString &name); + + /** + Sets the paper color + + \param color the new paper color + */ + void setPaperColor(const QColor &color); + /** + The paper color + + The default color is white. + */ + QColor paperColor() const; + + /** + Sets the backend used to render the pages. + + \param backend the new rendering backend + + \since 0.6 + */ + void setRenderBackend(RenderBackend backend); + /** + The currently set render backend + + The default backend is \ref SplashBackend + + \since 0.6 + */ + RenderBackend renderBackend() const; + + /** + The available rendering backends. + + \since 0.6 + */ + static QSet availableRenderBackends(); + + /** + Sets the render \p hint . + + \note some hints may not be supported by some rendering backends. + + \param on whether the flag should be added or removed. + + \since 0.6 + */ + void setRenderHint(RenderHint hint, bool on = true); + /** + The currently set render hints. + + \since 0.6 + */ + RenderHints renderHints() const; + + /** + Gets a new PS converter for this document. + + The caller gets the ownership of the returned converter. + + \since 0.6 + */ + PSConverter *psConverter() const; + + /** + Gets a new PDF converter for this document. + + The caller gets the ownership of the returned converter. + + \since 0.8 + */ + PDFConverter *pdfConverter() const; + + /** + Gets the metadata stream contents + + \since 0.6 + */ + QString metadata() const; + + /** + Test whether this document has "optional content". + + Optional content is used to optionally turn on (display) + and turn off (not display) some elements of the document. + The most common use of this is for layers in design + applications, but it can be used for a range of things, + such as not including some content in printing, and + displaying content in the appropriate language. + + \since 0.8 + */ + bool hasOptionalContent() const; + + /** + Itemviews model for optional content. + + The model is owned by the document. + + \since 0.8 + */ + OptContentModel *optionalContentModel(); + + /** + Document-level JavaScript scripts. + + Returns the list of document level JavaScript scripts to be always + executed before any other script. + + \since 0.10 + */ + QStringList scripts() const; + + /** + The PDF identifiers. + + \param permanentId an optional pointer to a variable where store the + permanent ID of the document + \param updateId an optional pointer to a variable where store the + update ID of the document + + \return whether the document has the IDs + + \since 0.16 + */ + bool getPdfId(QByteArray *permanentId, QByteArray *updateId) const; + + /** + Returns the type of forms contained in the document + + \since 0.22 + */ + FormType formType() const; + + /** + Returns the calculate order for forms (using their id) + + \since 0.53 + */ + QVector formCalculateOrder() const; + + /** + Returns the signatures of this document. + + Prefer to use this over getting the signatures for all the pages of the document + since there are documents with signatures that don't belong to a given page + + \since 0.88 + */ + QVector signatures() const; + + /** + Returns whether the document's XRef table has been reconstructed or not + + \since 21.06 + */ + bool xrefWasReconstructed() const; + + /** + Sets the document's XRef reconstruction callback, so whenever a XRef table + reconstruction happens the callback will get triggered. + + \since 21.06 + */ + void setXRefReconstructedCallback(const std::function &callback); + + /** + Destructor. + */ + ~Document(); + +private: + Q_DISABLE_COPY(Document) + + DocumentData *m_doc; + + explicit Document(DocumentData *dataA); +}; + +class BaseConverterPrivate; +class PSConverterPrivate; +class PDFConverterPrivate; +/** + \brief Base converter. + + This is the base class for the converters. + + \since 0.8 +*/ +class POPPLER_QT5_EXPORT BaseConverter +{ + friend class Document; + +public: + /** + Destructor. + */ + virtual ~BaseConverter(); + + /** Sets the output file name. You must set this or the output device. */ + void setOutputFileName(const QString &outputFileName); + + /** + * Sets the output device. You must set this or the output file name. + * + * \since 0.8 + */ + void setOutputDevice(QIODevice *device); + + /** + Does the conversion. + + \return whether the conversion succeeded + */ + virtual bool convert() = 0; + + enum Error + { + NoError, + FileLockedError, + OpenOutputError, + NotSupportedInputFileError + }; + + /** + Returns the last error + \since 0.12.1 + */ + Error lastError() const; + +protected: + /// \cond PRIVATE + explicit BaseConverter(BaseConverterPrivate &dd); + Q_DECLARE_PRIVATE(BaseConverter) + BaseConverterPrivate *d_ptr; + /// \endcond + +private: + Q_DISABLE_COPY(BaseConverter) +}; + +/** + Converts a PDF to PS + + Sizes have to be in Points (1/72 inch) + + If you are using QPrinter you can get paper size by doing: + \code +QPrinter dummy(QPrinter::PrinterResolution); +dummy.setFullPage(true); +dummy.setPageSize(myPageSize); +width = dummy.width(); +height = dummy.height(); + \endcode + + \since 0.6 +*/ +class POPPLER_QT5_EXPORT PSConverter : public BaseConverter +{ + friend class Document; + +public: + /** + Options for the PS export. + + \since 0.10 + */ + enum PSOption + { + Printing = 0x00000001, ///< The PS is generated for printing purposes + StrictMargins = 0x00000002, + ForceRasterization = 0x00000004, + PrintToEPS = 0x00000008, ///< Output EPS instead of PS \since 0.20 + HideAnnotations = 0x00000010, ///< Don't print annotations \since 0.20 + ForceOverprintPreview = 0x00000020 ///< Force rasterized overprint preview during conversion \since 23.09 + }; + Q_DECLARE_FLAGS(PSOptions, PSOption) + + /** + Destructor. + */ + ~PSConverter() override; + + /** Sets the list of pages to print. Mandatory. */ + void setPageList(const QList &pageList); + + /** + Sets the title of the PS Document. Optional + */ + void setTitle(const QString &title); + + /** + Sets the horizontal DPI. Defaults to 72.0 + */ + void setHDPI(double hDPI); + + /** + Sets the vertical DPI. Defaults to 72.0 + */ + void setVDPI(double vDPI); + + /** + Sets the rotate. Defaults to not rotated + */ + void setRotate(int rotate); + + /** + Sets the output paper width. Has to be set. + */ + void setPaperWidth(int paperWidth); + + /** + Sets the output paper height. Has to be set. + */ + void setPaperHeight(int paperHeight); + + /** + Sets the output right margin. Defaults to 0 + */ + void setRightMargin(int marginRight); + + /** + Sets the output bottom margin. Defaults to 0 + */ + void setBottomMargin(int marginBottom); + + /** + Sets the output left margin. Defaults to 0 + */ + void setLeftMargin(int marginLeft); + + /** + Sets the output top margin. Defaults to 0 + */ + void setTopMargin(int marginTop); + + /** + Defines if margins have to be strictly followed (even if that + means changing aspect ratio), or if the margins can be adapted + to keep aspect ratio. + + Defaults to false. + */ + void setStrictMargins(bool strictMargins); + + /** + Defines if the page will be rasterized to an image with overprint + preview enabled before printing. + + Defaults to false + + \since 23.09 + */ + void setForceOverprintPreview(bool forceOverprintPreview); + + /** Defines if the page will be rasterized to an image before printing. Defaults to false */ + void setForceRasterize(bool forceRasterize); + + /** + Sets the options for the PS export. + + \since 0.10 + */ + void setPSOptions(PSOptions options); + + /** + The currently set options for the PS export. + + The default flags are: Printing. + + \since 0.10 + */ + PSOptions psOptions() const; + + /** + Sets a function that will be called each time a page is converted. + + The payload belongs to the caller. + + \since 0.16 + */ + void setPageConvertedCallback(void (*callback)(int page, void *payload), void *payload); + + bool convert() override; + +private: + Q_DECLARE_PRIVATE(PSConverter) + Q_DISABLE_COPY(PSConverter) + + explicit PSConverter(DocumentData *document); +}; + +/** + Converts a PDF to PDF (thus saves a copy of the document). + + \since 0.8 +*/ +class POPPLER_QT5_EXPORT PDFConverter : public BaseConverter +{ + friend class Document; + +public: + /** + Options for the PDF export. + */ + enum PDFOption + { + WithChanges = 0x00000001 ///< The changes done to the document are saved as well + }; + Q_DECLARE_FLAGS(PDFOptions, PDFOption) + + /** + Destructor. + */ + ~PDFConverter() override; + + /** + Sets the options for the PDF export. + */ + void setPDFOptions(PDFOptions options); + /** + The currently set options for the PDF export. + */ + PDFOptions pdfOptions() const; + + /** + * Holds data for a new signature + * - Common Name of cert to sign (aka nickname) + * - password for the cert + * - page where to add the signature + * - rect for the signature annotation + * - text that will be shown inside the rect + * - font size and color + * - border width and color + * - background color + * \since 21.01 + */ + class POPPLER_QT5_EXPORT NewSignatureData + { + public: + NewSignatureData(); + ~NewSignatureData(); + NewSignatureData(const NewSignatureData &) = delete; + NewSignatureData &operator=(const NewSignatureData &) = delete; + + QString certNickname() const; + void setCertNickname(const QString &certNickname); + + QString password() const; + void setPassword(const QString &password); + + int page() const; + void setPage(int page); + + QRectF boundingRectangle() const; + void setBoundingRectangle(const QRectF &rect); + + QString signatureText() const; + void setSignatureText(const QString &text); + + /** + * If this text is not empty, the signature representation + * will split in two, with this text on the left and signatureText + * on the right + * + * \since 21.06 + */ + QString signatureLeftText() const; + void setSignatureLeftText(const QString &text); + + /** + * Signature's property Reason. + * + * Default: an empty string. + * + * \since 21.10 + */ + QString reason() const; + void setReason(const QString &reason); + + /** + * Signature's property Location. + * + * Default: an empty string. + * + * \since 21.10 + */ + QString location() const; + void setLocation(const QString &location); + + /** + * Default: 10 + */ + double fontSize() const; + void setFontSize(double fontSize); + + /** + * Default: 20 + * + * \since 21.06 + */ + double leftFontSize() const; + void setLeftFontSize(double fontSize); + + /** + * Default: red + */ + QColor fontColor() const; + void setFontColor(const QColor &color); + + /** + * Default: red + */ + QColor borderColor() const; + void setBorderColor(const QColor &color); + + /** + * border width in points + * + * Default: 1.5 + * + * \since 21.05 + */ + double borderWidth() const; + void setBorderWidth(double width); + + /** + * Default: QColor(240, 240, 240) + */ + QColor backgroundColor() const; + void setBackgroundColor(const QColor &color); + + /** + * Default: QUuid::createUuid().toString() + */ + QString fieldPartialName() const; + void setFieldPartialName(const QString &name); + + /** + * Document owner password (needed if the document that is being signed is password protected) + * + * Default: no password + * + * \since 22.02 + */ + QByteArray documentOwnerPassword() const; + void setDocumentOwnerPassword(const QByteArray &password); + + /** + * Document user password (needed if the document that is being signed is password protected) + * + * Default: no password + * + * \since 22.02 + */ + QByteArray documentUserPassword() const; + void setDocumentUserPassword(const QByteArray &password); + + /** + * Filesystem path to an image file to be used as background + * image for the signature annotation widget. + * + * Default: empty + * + * \since 22.02 + */ + QString imagePath() const; + void setImagePath(const QString &path); + + private: + struct NewSignatureDataPrivate; + NewSignatureDataPrivate *const d; + }; + + /** + Sign PDF at given Annotation / signature form + + \param data new signature data + + \return whether the signing succeeded + + \since 21.01 + */ + bool sign(const NewSignatureData &data); + + bool convert() override; + +private: + Q_DECLARE_PRIVATE(PDFConverter) + Q_DISABLE_COPY(PDFConverter) + + explicit PDFConverter(DocumentData *document); +}; + +/** + Conversion from PDF date string format to QDateTime +*/ +POPPLER_QT5_EXPORT Q_DECL_DEPRECATED QDateTime convertDate(char *dateString); + +/** + Conversion from PDF date string format to QDateTime + + \since 0.64 +*/ +POPPLER_QT5_EXPORT QDateTime convertDate(const char *dateString); + +/** + Whether the color management functions are available. + + \since 0.12 +*/ +POPPLER_QT5_EXPORT bool isCmsAvailable(); + +/** + Whether the overprint preview functionality is available. + + \since 0.22 +*/ +POPPLER_QT5_EXPORT bool isOverprintPreviewAvailable(); + +class SoundData; +/** + Container class for a sound file in a PDF document. + + A sound can be either External (in that case should be loaded the file + whose url is represented by url() ), or Embedded, and the player has to + play the data contained in data(). + + \since 0.6 +*/ +class POPPLER_QT5_EXPORT SoundObject +{ +public: + /** + The type of sound + */ + enum SoundType + { + External, ///< The real sound file is external + Embedded ///< The sound is contained in the data + }; + + /** + The encoding format used for the sound + */ + enum SoundEncoding + { + Raw, ///< Raw encoding, with unspecified or unsigned values in the range [ 0, 2^B - 1 ] + Signed, ///< Twos-complement values + muLaw, ///< mu-law-encoded samples + ALaw ///< A-law-encoded samples + }; + + /// \cond PRIVATE + explicit SoundObject(Sound *popplersound); + /// \endcond + + ~SoundObject(); + + /** + Is the sound embedded (SoundObject::Embedded) or external (SoundObject::External)? + */ + SoundType soundType() const; + + /** + The URL of the sound file to be played, in case of SoundObject::External + */ + QString url() const; + + /** + The data of the sound, in case of SoundObject::Embedded + */ + QByteArray data() const; + + /** + The sampling rate of the sound + */ + double samplingRate() const; + + /** + The number of sound channels to use to play the sound + */ + int channels() const; + + /** + The number of bits per sample value per channel + */ + int bitsPerSample() const; + + /** + The encoding used for the sound + */ + SoundEncoding soundEncoding() const; + +private: + Q_DISABLE_COPY(SoundObject) + + SoundData *m_soundData; +}; + +class MovieData; +/** + Container class for a movie object in a PDF document. + + \since 0.10 +*/ +class POPPLER_QT5_EXPORT MovieObject +{ + friend class AnnotationPrivate; + +public: + /** + The play mode for playing the movie + */ + enum PlayMode + { + PlayOnce, ///< Play the movie once, closing the movie controls at the end + PlayOpen, ///< Like PlayOnce, but leaving the controls open + PlayRepeat, ///< Play continuously until stopped + PlayPalindrome ///< Play forward, then backward, then again foward and so on until stopped + }; + + ~MovieObject(); + + /** + The URL of the movie to be played + */ + QString url() const; + + /** + The size of the movie + */ + QSize size() const; + + /** + The rotation (either 0, 90, 180, or 270 degrees clockwise) for the movie, + */ + int rotation() const; + + /** + Whether show a bar with movie controls + */ + bool showControls() const; + + /** + How to play the movie + */ + PlayMode playMode() const; + + /** + Returns whether a poster image should be shown if the movie is not playing. + \since 0.22 + */ + bool showPosterImage() const; + + /** + Returns the poster image that should be shown if the movie is not playing. + If the image is null but showImagePoster() returns @c true, the first frame of the movie + should be used as poster image. + \since 0.22 + */ + QImage posterImage() const; + +private: + /// \cond PRIVATE + explicit MovieObject(AnnotMovie *ann); + /// \endcond + + Q_DISABLE_COPY(MovieObject) + + MovieData *m_movieData; +}; + +} + +Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::Page::PainterFlags) +Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::Page::SearchFlags) +Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::Document::RenderHints) +Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::PDFConverter::PDFOptions) +Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::PSConverter::PSOptions) + +#endif diff --git a/poppler-24.05.0/qt5/src/poppler-sound.cc b/poppler-24.05.0/qt5/src/poppler-sound.cc new file mode 100644 index 0000000000000000000000000000000000000000..296b5120db24c02b74b00cc2a8d62afb6d764fff --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-sound.cc @@ -0,0 +1,127 @@ +/* poppler-sound.cc: qt interface to poppler + * Copyright (C) 2006-2007, Pino Toscano + * Copyright (C) 2008, 2018, 2020, 2024, Albert Astals Cid + * + * 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 "Object.h" +#include "Stream.h" +#include "Sound.h" + +namespace Poppler { + +class SoundData +{ +public: + SoundData() : m_soundObj(nullptr) { } + + ~SoundData() { delete m_soundObj; } + + SoundData(const SoundData &) = delete; + SoundData &operator=(const SoundData &) = delete; + + SoundObject::SoundType m_type; + Sound *m_soundObj; +}; + +SoundObject::SoundObject(Sound *popplersound) +{ + m_soundData = new SoundData(); + switch (popplersound->getSoundKind()) { + case soundEmbedded: + m_soundData->m_type = SoundObject::Embedded; + break; + case soundExternal: + default: + m_soundData->m_type = SoundObject::External; + break; + } + + m_soundData->m_soundObj = popplersound->copy(); +} + +SoundObject::~SoundObject() +{ + delete m_soundData; +} + +SoundObject::SoundType SoundObject::soundType() const +{ + return m_soundData->m_type; +} + +QString SoundObject::url() const +{ + if (m_soundData->m_type != SoundObject::External) { + return QString(); + } + + return QString(m_soundData->m_soundObj->getFileName().c_str()); +} + +QByteArray SoundObject::data() const +{ + if (m_soundData->m_type != SoundObject::Embedded) { + return QByteArray(); + } + + Stream *stream = m_soundData->m_soundObj->getStream(); + stream->reset(); + int dataLen = 0; + QByteArray fileArray; + int i; + while ((i = stream->getChar()) != EOF) { + fileArray[dataLen] = (char)i; + ++dataLen; + } + fileArray.resize(dataLen); + + return fileArray; +} + +double SoundObject::samplingRate() const +{ + return m_soundData->m_soundObj->getSamplingRate(); +} + +int SoundObject::channels() const +{ + return m_soundData->m_soundObj->getChannels(); +} + +int SoundObject::bitsPerSample() const +{ + return m_soundData->m_soundObj->getBitsPerSample(); +} + +SoundObject::SoundEncoding SoundObject::soundEncoding() const +{ + switch (m_soundData->m_soundObj->getEncoding()) { + case soundRaw: + return SoundObject::Raw; + case soundSigned: + return SoundObject::Signed; + case soundMuLaw: + return SoundObject::muLaw; + case soundALaw: + return SoundObject::ALaw; + } + return SoundObject::Raw; +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-textbox.cc b/poppler-24.05.0/qt5/src/poppler-textbox.cc new file mode 100644 index 0000000000000000000000000000000000000000..a0bd7b445df3e0c78f85f536b72e21eef68e65bf --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-textbox.cc @@ -0,0 +1,63 @@ +/* poppler-qt.h: qt interface to poppler + * Copyright (C) 2005, Brad Hards + * Copyright (C) 2006-2008, Albert Astals Cid + * Copyright (C) 2008, Pino Toscano + * + * 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-private.h" + +namespace Poppler { + +TextBox::TextBox(const QString &text, const QRectF &bBox) +{ + m_data = new TextBoxData(); + m_data->text = text; + m_data->bBox = bBox; +} + +TextBox::~TextBox() +{ + delete m_data; +} + +QString TextBox::text() const +{ + return m_data->text; +} + +QRectF TextBox::boundingBox() const +{ + return m_data->bBox; +} + +TextBox *TextBox::nextWord() const +{ + return m_data->nextWord; +} + +QRectF TextBox::charBoundingBox(int i) const +{ + return m_data->charBBoxes.value(i); +} + +bool TextBox::hasSpaceAfter() const +{ + return m_data->hasSpaceAfter; +} + +} diff --git a/poppler-24.05.0/qt5/src/poppler-version.cpp b/poppler-24.05.0/qt5/src/poppler-version.cpp new file mode 100644 index 0000000000000000000000000000000000000000..015267c113138335235d440e3aac830e21acc9c2 --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-version.cpp @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano + * Copyright (C) 2018, Albert Astals Cid + * + * 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-version.h" + +QString Poppler::Version::string() +{ + return QStringLiteral(POPPLER_VERSION); +} + +unsigned int Poppler::Version::major() +{ + return POPPLER_VERSION_MAJOR; +} + +unsigned int Poppler::Version::minor() +{ + return POPPLER_VERSION_MINOR; +} + +unsigned int Poppler::Version::micro() +{ + return POPPLER_VERSION_MICRO; +} diff --git a/poppler-24.05.0/qt5/src/poppler-version.h.in b/poppler-24.05.0/qt5/src/poppler-version.h.in new file mode 100644 index 0000000000000000000000000000000000000000..35645fe8e7d27f763f605f6145ed1d0072bdf59e --- /dev/null +++ b/poppler-24.05.0/qt5/src/poppler-version.h.in @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2009, Pino Toscano + * Copyright (C) 2018, 2019, Albert Astals Cid + * + * 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. + */ + +#ifndef POPPLER_VERSION_H +#define POPPLER_VERSION_H + +#include "poppler-export.h" + +#include + +// glibc < 2.28 used to include sys/sysmacros.h +// from sys/types.h and sysmacros.h defines minor and major so +// undefine them. You may need to undefine them in your code too. +#undef minor +#undef major + +#define POPPLER_VERSION "@POPPLER_VERSION@" +#define POPPLER_VERSION_MAJOR @POPPLER_MAJOR_VERSION@ +#define POPPLER_VERSION_MINOR @POPPLER_MINOR_VERSION@ +#define POPPLER_VERSION_MICRO @POPPLER_MICRO_VERSION@ + +namespace Poppler +{ + +namespace Version +{ + +/** + \since 0.73 + \returns the version string of the current poppler-qt5 library + */ +POPPLER_QT5_EXPORT QString string(); + +/** + \since 0.73 + \returns the "major" number of the version of the current poppler-qt5 library + */ +POPPLER_QT5_EXPORT unsigned int major(); + +/** + \since 0.73 + \returns the "minor" number of the version of the current poppler-qt5 library + */ +POPPLER_QT5_EXPORT unsigned int minor(); + +/** + \since 0.73 + \returns the "micro" number of the version of the current poppler-qt5 library + */ +POPPLER_QT5_EXPORT unsigned int micro(); + +} + +} + +#endif diff --git a/poppler-24.05.0/qt5/tests/CMakeLists.txt b/poppler-24.05.0/qt5/tests/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..e610413a6cbc4e019a2fa948159bcc9d22402535 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/CMakeLists.txt @@ -0,0 +1,89 @@ +add_definitions(-DTESTDATADIR=\"${TESTDATADIR}\") + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../src + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/../src +) + +macro(QT5_ADD_SIMPLETEST exe source) + string(REPLACE "-" "" test_name ${exe}) + set(${test_name}_SOURCES + ${source} + ) + poppler_add_test(${exe} BUILD_QT5_TESTS ${${test_name}_SOURCES}) + target_link_libraries(${exe} poppler-qt5 Qt5::Widgets) +endmacro(QT5_ADD_SIMPLETEST) + +macro(QT5_ADD_QTEST exe source) + if (Qt5Test_FOUND) + string(REPLACE "-" "" test_name ${exe}) + set(${test_name}_SOURCES + ${source} + ) + poppler_add_test(${exe} BUILD_QT5_TESTS ${${test_name}_SOURCES}) + add_test(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe}) + target_link_libraries(${exe} poppler-qt5 Qt5::Widgets Qt5::Test Qt5::Core Qt5::Gui) + endif () +endmacro(QT5_ADD_QTEST) + +macro(QT_ADD_FUZZER exe) + string(REPLACE "-" "" test_name ${exe}) + set(${test_name}_SOURCES + ${ARGN} + ) + poppler_add_test(${exe} BUILD_QT5_TESTS ${${test_name}_SOURCES}) + target_link_libraries(${exe} poppler-qt5 Qt5::Widgets Qt5::Test Qt5::Core Qt5::Gui) +endmacro(QT_ADD_FUZZER) + +qt5_add_simpletest(test-poppler-qt5 test-poppler-qt5.cpp) +qt5_add_simpletest(test-password-qt5 test-password-qt5.cpp) +qt5_add_simpletest(test-render-to-file-qt5 test-render-to-file.cpp) +qt5_add_simpletest(poppler-qt5-forms poppler-forms.cpp) +qt5_add_simpletest(poppler-qt5-fonts poppler-fonts.cpp) +qt5_add_simpletest(poppler-qt5-attachments poppler-attachments.cpp) +qt5_add_simpletest(stress-poppler-qt5 stress-poppler-qt5.cpp) +qt5_add_simpletest(stress-poppler-dir-qt5 stress-poppler-dir.cpp) +qt5_add_simpletest(stress-threads-qt5 stress-threads-qt5.cpp) +qt5_add_simpletest(poppler-qt5-texts poppler-texts.cpp) +qt5_add_simpletest(poppler-qt5-page-labels poppler-page-labels.cpp) + +qt5_add_qtest(check_qt5_attachments check_attachments.cpp) +qt5_add_qtest(check_qt5_dateConversion check_dateConversion.cpp) +qt5_add_qtest(check_qt5_fonts check_fonts.cpp) +qt5_add_qtest(check_qt5_links check_links.cpp) +qt5_add_qtest(check_qt5_annotations check_annotations.cpp) +qt5_add_qtest(check_qt5_metadata check_metadata.cpp) +qt5_add_qtest(check_qt5_optcontent check_optcontent.cpp) +qt5_add_qtest(check_qt5_forms check_forms.cpp) +qt5_add_qtest(check_qt5_pagelayout check_pagelayout.cpp) +qt5_add_qtest(check_qt5_pagemode check_pagemode.cpp) +qt5_add_qtest(check_qt5_password check_password.cpp) +qt5_add_qtest(check_qt5_permissions check_permissions.cpp) +qt5_add_qtest(check_qt5_search check_search.cpp) +qt5_add_qtest(check_qt5_actualtext check_actualtext.cpp) +qt5_add_qtest(check_qt5_lexer check_lexer.cpp) +qt5_add_qtest(check_qt5_internal_outline check_internal_outline.cpp) +qt5_add_qtest(check_qt5_goostring check_goostring.cpp) +qt5_add_qtest(check_qt5_object check_object.cpp) +qt5_add_qtest(check_qt5_stroke_opacity check_stroke_opacity.cpp) +qt5_add_qtest(check_qt5_utf_conversion check_utf_conversion.cpp) +qt5_add_qtest(check_qt5_outline check_outline.cpp) +qt5_add_qtest(check_qt5_signature_basics check_signature_basics.cpp) +qt5_add_qtest(check_qt5_utf8document check_utf8document.cpp) +qt5_add_qtest(check_qt5_distinguished_name_parser check_distinguished_name_parser.cpp) +qt5_add_qtest(check_qt5_cidfontswidthsbuilder check_cidfontswidthsbuilder.cpp) +qt5_add_qtest(check_qt5_overprint check_overprint.cpp) +if (NOT WIN32) + qt5_add_qtest(check_qt5_pagelabelinfo check_pagelabelinfo.cpp) + qt5_add_qtest(check_qt5_strings check_strings.cpp) +endif () + +if(ENABLE_FUZZER) + qt_add_fuzzer(qt_annot_fuzzer ./fuzzing/qt_annot_fuzzer.cc) + qt_add_fuzzer(qt_pdf_fuzzer ./fuzzing/qt_pdf_fuzzer.cc) + qt_add_fuzzer(qt_label_fuzzer ./fuzzing/qt_label_fuzzer.cc) + qt_add_fuzzer(qt_search_fuzzer ./fuzzing/qt_search_fuzzer.cc) + qt_add_fuzzer(qt_textbox_fuzzer ./fuzzing/qt_textbox_fuzzer.cc) +endif() diff --git a/poppler-24.05.0/qt5/tests/README.unittest b/poppler-24.05.0/qt5/tests/README.unittest new file mode 100644 index 0000000000000000000000000000000000000000..01bfbdfbc9887bc34a1d5d82ecb92a53f3ddd200 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/README.unittest @@ -0,0 +1,23 @@ +The unittests for the Qt5 bindings rely on the QtTestLib package, and +will not be built until this is installed. If you do not have it, then +you can download it from the Trolltech website. + +Note that there are a range of ways in which you can run the tests: +1. "make check" will run all the tests. +2. You can run a single test by executing the applicable +executable. For example, you can run the PageMode tests by +"./check_pagemode" +3. You can run a single function within a single test by appending the +name of the function to the executable. For example, if you just want +to run the FullScreen test within the PageMode tests, you can +"./check_pagemode checkFullScreen". Run the executable with -functions +to get a list of all the functions. +4. You can run a single function with specific data by appending the +name of the function, followed by a colon, then the data label to the +executable. For example, to just do the Author check within the +metadata checks, you can "./check_metadata checkStrings:Author". + +For a full list of options, run a executable with "-help". + +Brad Hards +bradh@frogmouth.net diff --git a/poppler-24.05.0/qt5/tests/check_actualtext.cpp b/poppler-24.05.0/qt5/tests/check_actualtext.cpp new file mode 100644 index 0000000000000000000000000000000000000000..a11c6307c784ab8fa1a66b9bba1ee4edac6a84a7 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_actualtext.cpp @@ -0,0 +1,192 @@ +#include + +#include + +#include + +class TestActualText : public QObject +{ + Q_OBJECT +public: + explicit TestActualText(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkActualText1(); + void checkActualText2(); + void checkActualText2_data(); + void checkAllOrientations(); + void checkAllOrientations_data(); + void checkFakeboldText(); + void checkFakeboldText_data(); + +private: + void checkActualText(Poppler::Document *doc, const QRectF &area, const QString &text); +}; + +void TestActualText::checkActualText(Poppler::Document *doc, const QRectF &area, const QString &text) +{ + Poppler::Page *page = doc->page(0); + QVERIFY(page); + + QCOMPARE(page->text(area), text); + + delete page; +} + +void TestActualText::checkActualText1() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/WithActualText.pdf"); + QVERIFY(doc); + + checkActualText(doc, QRectF {}, QStringLiteral("The slow brown fox jumps over the black dog.")); + + delete doc; +} + +void TestActualText::checkActualText2() +{ + QFETCH(QRectF, area); + QFETCH(QString, text); + + QFile file(TESTDATADIR "/unittestcases/WithActualText.pdf"); + QVERIFY(file.open(QIODevice::ReadOnly)); + + Poppler::Document *doc; + doc = Poppler::Document::load(&file); + QVERIFY(doc); + + checkActualText(doc, area, text); + + delete doc; +} + +void TestActualText::checkActualText2_data() +{ + QTest::addColumn("area"); + QTest::addColumn("text"); + + // Line bounding box is [100.000 90.720 331.012110 102.350] + + QTest::newRow("full page") << QRectF {} << QStringLiteral("The slow brown fox jumps over the black dog."); + QTest::newRow("full line") << QRectF { 50.0, 90.0, 290.0, 20.0 } << QStringLiteral("The slow brown fox jumps over the black dog."); + QTest::newRow("full line [narrow]") << QRectF { 50.0, 95.0, 290.0, 5.0 } << QStringLiteral("The slow brown fox jumps over the black dog."); + QTest::newRow("above line") << QRectF { 50.0, 85.0, 290.0, 10.0 } << QString {}; + QTest::newRow("above line mid") << QRectF { 50.0, 90.0, 290.0, 5.0 } << QString {}; + QTest::newRow("first two words") << QRectF { 50.0, 90.0, 100.0, 20.0 } << QStringLiteral("The slow"); + QTest::newRow("first two words [narrow]") << QRectF { 50.0, 95.0, 100.0, 5.0 } << QStringLiteral("The slow"); + QTest::newRow("first character") << QRectF { 103.0, 95.0, 1.0, 5.0 } << QStringLiteral("T"); + QTest::newRow("last two words") << QRectF { 285.0, 90.0, 100.0, 20.0 } << QStringLiteral("black dog."); + QTest::newRow("last character") << QRectF { 320.0, 90.0, 8.0, 20.0 } << QStringLiteral("g"); + QTest::newRow("middle 'fox'") << QRectF { 190.0, 90.0, 15.0, 20.0 } << QStringLiteral("fox"); + QTest::newRow("middle 'x'") << QRectF { 200.0, 90.0, 5.0, 20.0 } << QStringLiteral("x"); +} + +void TestActualText::checkAllOrientations() +{ + QFETCH(int, pageNr); + QFETCH(QRectF, area); + QFETCH(QString, text); + + QString path { TESTDATADIR "/unittestcases/orientation.pdf" }; + std::unique_ptr doc { Poppler::Document::load(path) }; + QVERIFY(doc); + + std::unique_ptr page { doc->page(pageNr) }; + QVERIFY(page); + + QCOMPARE(page->text(area), text); +} + +void TestActualText::checkAllOrientations_data() +{ + QTest::addColumn("pageNr"); + QTest::addColumn("area"); + QTest::addColumn("text"); + + QTest::newRow("Portrait") << 0 << QRectF {} << QStringLiteral("Portrait"); + QTest::newRow("Landscape") << 1 << QRectF {} << QStringLiteral("Landscape"); + QTest::newRow("Upside down") << 2 << QRectF {} << QStringLiteral("Upside down"); + QTest::newRow("Seacape") << 3 << QRectF {} << QStringLiteral("Seascape"); + + QTest::newRow("Portrait A4 rect") << 0 << QRectF { 0, 0, 595, 842 } << QStringLiteral("Portrait"); + QTest::newRow("Landscape A4 rect") << 1 << QRectF { 0, 0, 842, 595 } << QStringLiteral("Landscape"); + QTest::newRow("Upside down A4 rect") << 2 << QRectF { 0, 0, 595, 842 } << QStringLiteral("Upside down"); + QTest::newRow("Seacape A4 rect") << 3 << QRectF { 0, 0, 842, 595 } << QStringLiteral("Seascape"); + + QTest::newRow("Portrait line rect") << 0 << QRectF { 30, 30, 60, 20 } << QStringLiteral("Portrait"); + QTest::newRow("Landscape line rect") << 1 << QRectF { 790, 30, 20, 80 } << QStringLiteral("Landscape"); + QTest::newRow("Upside down line rect") << 2 << QRectF { 485, 790, 75, 20 } << QStringLiteral("Upside down"); + QTest::newRow("Seacape line rect") << 3 << QRectF { 30, 500, 20, 70 } << QStringLiteral("Seascape"); + + QTest::newRow("Portrait small rect B") << 0 << QRectF { 30, 35, 10, 10 } << QStringLiteral("P"); + QTest::newRow("Portrait small rect E") << 0 << QRectF { 80, 35, 10, 10 } << QStringLiteral("t"); + QTest::newRow("Landscape small rect B") << 1 << QRectF { 800, 30, 10, 10 } << QStringLiteral("L"); + QTest::newRow("Landscape small rect E") << 1 << QRectF { 800, 90, 10, 10 } << QStringLiteral("e"); + QTest::newRow("Upside down small rect B") << 2 << QRectF { 550, 800, 10, 10 } << QStringLiteral("U"); + QTest::newRow("Upside down small rect E") << 2 << QRectF { 485, 800, 10, 10 } << QStringLiteral("n"); + QTest::newRow("Seacape small rect B") << 3 << QRectF { 40, 550, 10, 10 } << QStringLiteral("S"); + QTest::newRow("Seacape small rect E") << 3 << QRectF { 40, 510, 10, 10 } << QStringLiteral("p"); +} + +void TestActualText::checkFakeboldText() +{ + QFETCH(int, pageNr); + QFETCH(QRectF, area); + QFETCH(QString, text); + + QString path { TESTDATADIR "/unittestcases/fakebold.pdf" }; + std::unique_ptr doc { Poppler::Document::load(path) }; + QVERIFY(doc); + + std::unique_ptr page { doc->page(pageNr) }; + QVERIFY(page); + + QEXPECT_FAIL("Upright line 3", "Fakebold not matched when bold word is followed with non-bold glyph", Continue); + QEXPECT_FAIL("Upright line 4", "Fakebold not matched when bold word follows non-bold glyph", Continue); + QEXPECT_FAIL("Upright line 5", "Fakebold not matched when bold word is enclosed by non-bold glyphs", Continue); + QEXPECT_FAIL("Rotated 90' line 3", "Fakebold not matched when bold word is followed with non-bold glyph", Continue); + QEXPECT_FAIL("Rotated 90' line 4", "Fakebold not matched when bold word follows non-bold glyph", Continue); + QEXPECT_FAIL("Rotated 90' line 5", "Fakebold not matched when bold word is enclosed by non-bold glyphs", Continue); + QEXPECT_FAIL("Rotated 180' line 3", "Fakebold not matched when bold word is followed with non-bold glyph", Continue); + QEXPECT_FAIL("Rotated 180' line 4", "Fakebold not matched when bold word follows non-bold glyph", Continue); + QEXPECT_FAIL("Rotated 180' line 5", "Fakebold not matched when bold word is enclosed by non-bold glyphs", Continue); + QEXPECT_FAIL("Rotated 270' line 3", "Fakebold not matched when bold word is followed with non-bold glyph", Continue); + QEXPECT_FAIL("Rotated 270' line 4", "Fakebold not matched when bold word follows non-bold glyph", Continue); + QEXPECT_FAIL("Rotated 270' line 5", "Fakebold not matched when bold word is enclosed by non-bold glyphs", Continue); + QCOMPARE(page->text(area), text); +} + +void TestActualText::checkFakeboldText_data() +{ + QTest::addColumn("pageNr"); + QTest::addColumn("area"); + QTest::addColumn("text"); + + QTest::newRow("Upright line 1") << 0 << QRectF { 0, 0, 595, 80 } << QStringLiteral("1 This is fakebold text."); + QTest::newRow("Upright line 2") << 0 << QRectF { 0, 80, 595, 80 } << QStringLiteral("2 This is a fakebold word."); + QTest::newRow("Upright line 3") << 0 << QRectF { 0, 140, 595, 80 } << QStringLiteral("3 The last word is in fakebold."); + QTest::newRow("Upright line 4") << 0 << QRectF { 0, 220, 595, 80 } << QStringLiteral("4 Hyphenated-fakebold word."); + QTest::newRow("Upright line 5") << 0 << QRectF { 0, 300, 595, 80 } << QStringLiteral("5 Quoted \"fakebold\" word."); + + QTest::newRow("Rotated 90' line 1") << 1 << QRectF { 510, 0, 80, 842 } << QStringLiteral("1 This is fakebold text."); + QTest::newRow("Rotated 90' line 2") << 1 << QRectF { 430, 0, 80, 842 } << QStringLiteral("2 This is a fakebold word."); + QTest::newRow("Rotated 90' line 3") << 1 << QRectF { 350, 0, 80, 842 } << QStringLiteral("3 The last word is in fakebold."); + QTest::newRow("Rotated 90' line 4") << 1 << QRectF { 270, 0, 80, 842 } << QStringLiteral("4 Hyphenated-fakebold word."); + QTest::newRow("Rotated 90' line 5") << 1 << QRectF { 190, 0, 80, 842 } << QStringLiteral("5 Quoted \"fakebold\" word."); + + QTest::newRow("Rotated 180' line 1") << 2 << QRectF { 0, 760, 595, 80 } << QStringLiteral("1 This is fakebold text."); + QTest::newRow("Rotated 180' line 2") << 2 << QRectF { 0, 680, 595, 80 } << QStringLiteral("2 This is a fakebold word."); + QTest::newRow("Rotated 180' line 3") << 2 << QRectF { 0, 600, 595, 80 } << QStringLiteral("3 The last word is in fakebold."); + QTest::newRow("Rotated 180' line 4") << 2 << QRectF { 0, 520, 595, 80 } << QStringLiteral("4 Hyphenated-fakebold word."); + QTest::newRow("Rotated 180' line 5") << 2 << QRectF { 0, 440, 595, 80 } << QStringLiteral("5 Quoted \"fakebold\" word."); + + QTest::newRow("Rotated 270' line 1") << 3 << QRectF { 20, 0, 80, 842 } << QStringLiteral("1 This is fakebold text."); + QTest::newRow("Rotated 270' line 2") << 3 << QRectF { 100, 0, 80, 842 } << QStringLiteral("2 This is a fakebold word."); + QTest::newRow("Rotated 270' line 3") << 3 << QRectF { 160, 0, 80, 842 } << QStringLiteral("3 The last word is in fakebold."); + QTest::newRow("Rotated 270' line 4") << 3 << QRectF { 240, 0, 80, 842 } << QStringLiteral("4 Hyphenated-fakebold word."); + QTest::newRow("Rotated 270' line 5") << 3 << QRectF { 320, 0, 80, 842 } << QStringLiteral("5 Quoted \"fakebold\" word."); +} + +QTEST_GUILESS_MAIN(TestActualText) + +#include "check_actualtext.moc" diff --git a/poppler-24.05.0/qt5/tests/check_annotations.cpp b/poppler-24.05.0/qt5/tests/check_annotations.cpp new file mode 100644 index 0000000000000000000000000000000000000000..6c3f1b61da75c3670fc5a233a22175d44d8c5009 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_annotations.cpp @@ -0,0 +1,269 @@ +#include +#include +#include + +#include +#include + +#include + +#include "poppler/Annot.h" +#include "goo/GooString.h" +#include "goo/gstrtod.h" + +class TestAnnotations : public QObject +{ + Q_OBJECT +public: + explicit TestAnnotations(QObject *parent = nullptr) : QObject(parent) { } + + void saveAndCheck(const std::unique_ptr &doc, const std::function &checkFunction); + +private slots: + void checkQColorPrecision(); + void checkFontSizeAndColor(); + void checkHighlightFromAndToQuads(); + void checkUTF16LEAnnot(); + void checkModificationCreationDate(); + void checkNonMarkupAnnotations(); + void checkDefaultAppearance(); +}; + +/* Is .5f sufficient for 16 bit color channel roundtrip trough save and load on all architectures? */ +void TestAnnotations::checkQColorPrecision() +{ + bool precisionOk = true; + for (int i = std::numeric_limits::min(); i <= std::numeric_limits::max(); i++) { + double normalized = static_cast(i) / static_cast(std::numeric_limits::max()); + const std::unique_ptr serialized = GooString::format("{0:.5f}", normalized); + double deserialized = gatof(serialized->c_str()); + uint16_t denormalized = std::round(deserialized * std::numeric_limits::max()); + if (static_cast(i) != denormalized) { + precisionOk = false; + break; + } + } + QVERIFY(precisionOk); +} + +void TestAnnotations::checkFontSizeAndColor() +{ + const QString contents = QStringLiteral("foobar"); + const std::vector testColors { QColor::fromRgb(0xAB, 0xCD, 0xEF), QColor::fromCmyk(0xAB, 0xBC, 0xCD, 0xDE) }; + const QFont testFont(QStringLiteral("Helvetica"), 20); + + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + + { + std::unique_ptr doc { Poppler::Document::load(TESTDATADIR "/unittestcases/UseNone.pdf") }; + QVERIFY(doc.get()); + + std::unique_ptr page { doc->page(0) }; + QVERIFY(page.get()); + + for (const auto &color : testColors) { + auto annot = std::make_unique(Poppler::TextAnnotation::InPlace); + annot->setBoundary(QRectF(0.0, 0.0, 1.0, 1.0)); + annot->setContents(contents); + annot->setTextFont(testFont); + annot->setTextColor(color); + page->addAnnotation(annot.get()); + } + + std::unique_ptr conv(doc->pdfConverter()); + QVERIFY(conv.get()); + conv->setOutputFileName(tempFile.fileName()); + conv->setPDFOptions(Poppler::PDFConverter::WithChanges); + QVERIFY(conv->convert()); + } + + { + std::unique_ptr doc { Poppler::Document::load(tempFile.fileName()) }; + QVERIFY(doc.get()); + + std::unique_ptr page { doc->page(0) }; + QVERIFY(page.get()); + + auto annots = page->annotations(); + QCOMPARE(annots.size(), static_cast(testColors.size())); + + auto &&annot = annots.constBegin(); + for (const auto &color : testColors) { + QCOMPARE((*annot)->subType(), Poppler::Annotation::AText); + auto textAnnot = static_cast(*annot); + QCOMPARE(textAnnot->contents(), contents); + QCOMPARE(textAnnot->textFont().pointSize(), testFont.pointSize()); + QCOMPARE(static_cast(textAnnot->textColor().spec()), static_cast(color.spec())); + QCOMPARE(textAnnot->textColor(), color); + if (annot != annots.constEnd()) { + ++annot; + } + } + qDeleteAll(annots); + } +} + +namespace Poppler { +static bool operator==(const Poppler::HighlightAnnotation::Quad &a, const Poppler::HighlightAnnotation::Quad &b) +{ + // FIXME We do not compare capStart, capEnd and feather since AnnotQuadrilaterals doesn't contain that info and thus + // HighlightAnnotationPrivate::fromQuadrilaterals uses default values + return a.points[0] == b.points[0] && a.points[1] == b.points[1] && a.points[2] == b.points[2] && a.points[3] == b.points[3]; +} +} + +void TestAnnotations::checkHighlightFromAndToQuads() +{ + std::unique_ptr doc { Poppler::Document::load(TESTDATADIR "/unittestcases/UseNone.pdf") }; + + std::unique_ptr page { doc->page(0) }; + + auto ha = std::make_unique(); + page->addAnnotation(ha.get()); + + const QList quads = { { { { 0, 0.1 }, { 0.2, 0.3 }, { 0.4, 0.5 }, { 0.6, 0.7 } }, false, false, 0 }, { { { 0.8, 0.9 }, { 0.1, 0.2 }, { 0.3, 0.4 }, { 0.5, 0.6 } }, true, false, 0.4 } }; + ha->setHighlightQuads(quads); + QCOMPARE(ha->highlightQuads(), quads); +} + +void TestAnnotations::checkUTF16LEAnnot() +{ + std::unique_ptr doc { Poppler::Document::load(TESTDATADIR "/unittestcases/utf16le-annot.pdf") }; + QVERIFY(doc.get()); + + std::unique_ptr page { doc->page(0) }; + QVERIFY(page.get()); + + auto annots = page->annotations(); + QCOMPARE(annots.size(), 2); + + auto annot = annots[1]; + QCOMPARE(annot->contents(), QString::fromUtf8("Únîcödé豰")); // clazy:exclude=qstring-allocations + + qDeleteAll(annots); +} + +void TestAnnotations::saveAndCheck(const std::unique_ptr &doc, const std::function &checkFunction) +{ + // also check that saving yields the same output + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + + std::unique_ptr conv(doc->pdfConverter()); + conv->setOutputFileName(tempFile.fileName()); + conv->setPDFOptions(Poppler::PDFConverter::WithChanges); + conv->convert(); + + std::unique_ptr savedDoc { Poppler::Document::load(tempFile.fileName()) }; + std::unique_ptr page { doc->page(0) }; + auto annots = page->annotations(); + checkFunction(annots.at(1)); + qDeleteAll(annots); +} + +void TestAnnotations::checkModificationCreationDate() +{ + std::unique_ptr doc { Poppler::Document::load(TESTDATADIR "/unittestcases/utf16le-annot.pdf") }; + QVERIFY(doc.get()); + + std::unique_ptr page { doc->page(0) }; + + auto annots = page->annotations(); + auto annot = annots.at(1); + QCOMPARE(annot->creationDate(), QDateTime()); + QCOMPARE(annot->modificationDate(), QDateTime()); + + const QDateTime dt1(QDate(2020, 8, 7), QTime(18, 34, 56)); + annot->setCreationDate(dt1); + auto checkFunction1 = [dt1](Poppler::Annotation *a) { + QCOMPARE(a->creationDate(), dt1); + // setting the creation date updates the modification date + QVERIFY(std::abs(a->modificationDate().secsTo(QDateTime::currentDateTime())) < 2); + }; + checkFunction1(annot); + saveAndCheck(doc, checkFunction1); + + const QDateTime dt2(QDate(2020, 8, 30), QTime(8, 14, 52)); + annot->setModificationDate(dt2); + auto checkFunction2 = [dt2](Poppler::Annotation *a) { QCOMPARE(a->modificationDate(), dt2); }; + checkFunction2(annot); + saveAndCheck(doc, checkFunction2); + + // setting the creation date to empty means "use the modification date" and also updates the modification date + // so both creation date and modification date are the same and are now + annot->setCreationDate(QDateTime()); + auto checkFunction3 = [](Poppler::Annotation *a) { + QVERIFY(std::abs(a->creationDate().secsTo(QDateTime::currentDateTime())) < 2); + QCOMPARE(a->creationDate(), a->modificationDate()); + }; + checkFunction3(annot); + saveAndCheck(doc, checkFunction3); + + annot->setModificationDate(QDateTime()); + auto checkFunction4 = [](Poppler::Annotation *a) { + QCOMPARE(a->creationDate(), QDateTime()); + QCOMPARE(a->modificationDate(), QDateTime()); + }; + checkFunction4(annot); + saveAndCheck(doc, checkFunction4); + + qDeleteAll(annots); +} + +void TestAnnotations::checkNonMarkupAnnotations() +{ + std::unique_ptr doc { Poppler::Document::load(TESTDATADIR "/unittestcases/checkbox_issue_159.pdf") }; + QVERIFY(doc.get()); + + std::unique_ptr page { doc->page(0) }; + QVERIFY(page.get()); + + auto annots = page->annotations(); + QCOMPARE(annots.size(), 17); + qDeleteAll(annots); +} + +void TestAnnotations::checkDefaultAppearance() +{ + std::unique_ptr roundtripString; + { + GooString daString { "/Helv 10 Tf 0.1 0.2 0.3 rg" }; + const DefaultAppearance da { &daString }; + QCOMPARE(da.getFontPtSize(), 10.); + QVERIFY(da.getFontName().isName()); + QCOMPARE(da.getFontName().getName(), "Helv"); + const AnnotColor *color = da.getFontColor(); + QVERIFY(color); + QCOMPARE(color->getSpace(), AnnotColor::colorRGB); + QCOMPARE(color->getValues()[0], 0.1); + QCOMPARE(color->getValues()[1], 0.2); + QCOMPARE(color->getValues()[2], 0.3); + roundtripString = std::make_unique(da.toAppearanceString()); + } + { + /* roundtrip through parse/generate/parse shall preserve values */ + const DefaultAppearance da { roundtripString.get() }; + QCOMPARE(da.getFontPtSize(), 10.); + QVERIFY(da.getFontName().isName()); + QCOMPARE(da.getFontName().getName(), "Helv"); + const AnnotColor *color = da.getFontColor(); + QVERIFY(color); + QCOMPARE(color->getSpace(), AnnotColor::colorRGB); + QCOMPARE(color->getValues()[0], 0.1); + QCOMPARE(color->getValues()[1], 0.2); + QCOMPARE(color->getValues()[2], 0.3); + } + { + /* parsing bad DA strings must not cause crash */ + GooString daString { "/ % Tf 1 2 rg" }; + const DefaultAppearance da { &daString }; + QVERIFY(!da.getFontName().isName()); + } +} + +QTEST_GUILESS_MAIN(TestAnnotations) + +#include "check_annotations.moc" diff --git a/poppler-24.05.0/qt5/tests/check_attachments.cpp b/poppler-24.05.0/qt5/tests/check_attachments.cpp new file mode 100644 index 0000000000000000000000000000000000000000..4a7359c4f060710e2e52903aa1196691ef1e8d1d --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_attachments.cpp @@ -0,0 +1,154 @@ +#include + +#include + +#include + +class TestAttachments : public QObject +{ + Q_OBJECT +public: + explicit TestAttachments(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkNoAttachments(); + void checkAttach1(); + void checkAttach2(); + void checkAttach3(); + void checkAttach4(); +}; + +void TestAttachments::checkNoAttachments() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->hasEmbeddedFiles(), false); + + delete doc; +} + +void TestAttachments::checkAttach1() +{ + + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/WithAttachments.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasEmbeddedFiles()); + + QList fileList = doc->embeddedFiles(); + QCOMPARE(fileList.size(), 2); + + Poppler::EmbeddedFile *embfile = fileList.at(0); + QCOMPARE(embfile->name(), QLatin1String("kroller.png")); + QCOMPARE(embfile->description(), QString()); + QCOMPARE(embfile->createDate(), QDateTime(QDate(), QTime())); + QCOMPARE(embfile->modDate(), QDateTime(QDate(), QTime())); + QCOMPARE(embfile->mimeType(), QString()); + + QFile file(TESTDATADIR "/unittestcases/kroller.png"); + QVERIFY(file.open(QIODevice::ReadOnly)); + QByteArray krollerData = file.readAll(); + QByteArray embdata = embfile->data(); + QCOMPARE(krollerData, embdata); + + Poppler::EmbeddedFile *embfile2 = fileList.at(1); + QCOMPARE(embfile2->name(), QLatin1String("gnome-64.gif")); + QCOMPARE(embfile2->description(), QString()); + QCOMPARE(embfile2->modDate(), QDateTime(QDate(), QTime())); + QCOMPARE(embfile2->createDate(), QDateTime(QDate(), QTime())); + QCOMPARE(embfile2->mimeType(), QString()); + + QFile file2(TESTDATADIR "/unittestcases/gnome-64.gif"); + QVERIFY(file2.open(QIODevice::ReadOnly)); + QByteArray g64Data = file2.readAll(); + QByteArray emb2data = embfile2->data(); + QCOMPARE(g64Data, emb2data); + + delete doc; +} + +void TestAttachments::checkAttach2() +{ + + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/A6EmbeddedFiles.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasEmbeddedFiles()); + + QList fileList; + fileList = doc->embeddedFiles(); + QCOMPARE(fileList.size(), 3); + + Poppler::EmbeddedFile *embfile1 = fileList.at(0); + QCOMPARE(embfile1->name(), QLatin1String("Acro7 thoughts")); + QCOMPARE(embfile1->description(), QString()); + QCOMPARE(embfile1->createDate(), QDateTime(QDate(2003, 8, 4), QTime(13, 54, 54), Qt::UTC)); + QCOMPARE(embfile1->modDate(), QDateTime(QDate(2003, 8, 4), QTime(14, 15, 27), Qt::UTC)); + QCOMPARE(embfile1->mimeType(), QLatin1String("text/xml")); + + Poppler::EmbeddedFile *embfile2 = fileList.at(1); + QCOMPARE(embfile2->name(), QLatin1String("acro transitions 1.xls")); + QCOMPARE(embfile2->description(), QString()); + QCOMPARE(embfile2->createDate(), QDateTime(QDate(2003, 7, 18), QTime(21, 7, 16), Qt::UTC)); + QCOMPARE(embfile2->modDate(), QDateTime(QDate(2003, 7, 22), QTime(13, 4, 40), Qt::UTC)); + QCOMPARE(embfile2->mimeType(), QLatin1String("application/excel")); + + Poppler::EmbeddedFile *embfile3 = fileList.at(2); + QCOMPARE(embfile3->name(), QLatin1String("apago_pdfe_wide.gif")); + QCOMPARE(embfile3->description(), QString()); + QCOMPARE(embfile3->createDate(), QDateTime(QDate(2003, 1, 31), QTime(15, 54, 29), Qt::UTC)); + QCOMPARE(embfile3->modDate(), QDateTime(QDate(2003, 1, 31), QTime(15, 52, 58), Qt::UTC)); + QCOMPARE(embfile3->mimeType(), QString()); + + delete doc; +} + +void TestAttachments::checkAttach3() +{ + + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/shapes+attachments.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasEmbeddedFiles()); + + QList fileList; + fileList = doc->embeddedFiles(); + QCOMPARE(fileList.size(), 1); + + Poppler::EmbeddedFile *embfile = fileList.at(0); + QCOMPARE(embfile->name(), QLatin1String("ADEX1.xpdf.pgp")); + QCOMPARE(embfile->description(), QString()); + QCOMPARE(embfile->createDate(), QDateTime(QDate(2004, 3, 29), QTime(19, 37, 16), Qt::UTC)); + QCOMPARE(embfile->modDate(), QDateTime(QDate(2004, 3, 29), QTime(19, 37, 16), Qt::UTC)); + QCOMPARE(embfile->mimeType(), QString()); + delete doc; +} + +void TestAttachments::checkAttach4() +{ + + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/imageretrieve+attachment.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasEmbeddedFiles()); + + QList fileList; + fileList = doc->embeddedFiles(); + QCOMPARE(fileList.size(), 1); + + Poppler::EmbeddedFile *embfile = fileList.at(0); + QCOMPARE(embfile->name(), QLatin1String("export-altona.csv")); + QCOMPARE(embfile->description(), QLatin1String("Altona Export")); + QCOMPARE(embfile->createDate(), QDateTime(QDate(2005, 8, 30), QTime(20, 49, 35), Qt::UTC)); + QCOMPARE(embfile->modDate(), QDateTime(QDate(2005, 8, 30), QTime(20, 49, 52), Qt::UTC)); + QCOMPARE(embfile->mimeType(), QLatin1String("application/vnd.ms-excel")); + delete doc; +} + +QTEST_GUILESS_MAIN(TestAttachments) +#include "check_attachments.moc" diff --git a/poppler-24.05.0/qt5/tests/check_cidfontswidthsbuilder.cpp b/poppler-24.05.0/qt5/tests/check_cidfontswidthsbuilder.cpp new file mode 100644 index 0000000000000000000000000000000000000000..19869341f87c5e3945693f99892afa4f112528e3 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_cidfontswidthsbuilder.cpp @@ -0,0 +1,100 @@ +//======================================================================== +// +// check_cidfontswidthsbuilder.cpp +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela +//======================================================================== + +#include "CIDFontsWidthsBuilder.h" + +#include + +class TestCIDFontsWidthsBuilder : public QObject +{ + Q_OBJECT +public: + using QObject::QObject; +private Q_SLOTS: + void testEmpty(); + void testSingle(); + void testSimpleSequence(); +}; + +void TestCIDFontsWidthsBuilder::testEmpty() +{ + CIDFontsWidthsBuilder b; + auto segments = b.takeSegments(); + QCOMPARE(segments.size(), 0); +} + +static bool compare(const CIDFontsWidthsBuilder::Segment &segment1, const CIDFontsWidthsBuilder::Segment &segment2) +{ + return std::visit( + [](const auto &s1, const auto &s2) { + using T1 = std::decay_t; + using T2 = std::decay_t; + if constexpr (!std::is_same_v) { + return false; + } else if constexpr (std::is_same_v) { + return s1.first == s2.first && s1.widths == s2.widths; + } else if constexpr (std::is_same_v) { + return s1.first == s2.first && s1.last == s2.last && s1.width == s2.width; + } else { + return false; + } + }, + segment1, segment2); +} + +void TestCIDFontsWidthsBuilder::testSingle() +{ + CIDFontsWidthsBuilder b; + b.addWidth(0, 10); + auto segments = b.takeSegments(); + QCOMPARE(segments.size(), 1); + auto segment0 = CIDFontsWidthsBuilder::ListSegment { 0, { 10 } }; + QVERIFY(compare(segments[0], segment0)); +} + +void TestCIDFontsWidthsBuilder::testSimpleSequence() +{ + CIDFontsWidthsBuilder b; + for (int i = 0; i < 2; i++) { // repeat to verify that takeSegments resets + b.addWidth(0, 10); + b.addWidth(1, 10); + b.addWidth(2, 10); + b.addWidth(3, 10); + b.addWidth(4, 10); + b.addWidth(5, 20); + b.addWidth(6, 21); + b.addWidth(7, 21); + b.addWidth(8, 20); + b.addWidth(9, 10); + b.addWidth(10, 10); + b.addWidth(11, 10); + b.addWidth(12, 10); + b.addWidth(13, 10); + b.addWidth(14, 20); + b.addWidth(15, 21); + b.addWidth(16, 21); + b.addWidth(17, 20); + b.addWidth(19, 20); + auto segments = b.takeSegments(); + QCOMPARE(segments.size(), 5); + auto segment0 = CIDFontsWidthsBuilder::RangeSegment { 0, 4, 10 }; + QVERIFY(compare(segments[0], segment0)); + auto segment1 = CIDFontsWidthsBuilder::ListSegment { 5, { 20, 21, 21, 20 } }; + QVERIFY(compare(segments[1], segment1)); + auto segment2 = CIDFontsWidthsBuilder::RangeSegment { 9, 13, 10 }; + QVERIFY(compare(segments[2], segment2)); + auto segment3 = CIDFontsWidthsBuilder::ListSegment { 14, { 20, 21, 21, 20 } }; + QVERIFY(compare(segments[3], segment3)); + auto segment4 = CIDFontsWidthsBuilder::ListSegment { 19, { 20 } }; + QVERIFY(compare(segments[4], segment4)); + } +} + +QTEST_GUILESS_MAIN(TestCIDFontsWidthsBuilder); +#include "check_cidfontswidthsbuilder.moc" diff --git a/poppler-24.05.0/qt5/tests/check_dateConversion.cpp b/poppler-24.05.0/qt5/tests/check_dateConversion.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e6abc84eee1ac3eb8c46d656ced6e4457fcfeda6 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_dateConversion.cpp @@ -0,0 +1,104 @@ +#include + +Q_DECLARE_METATYPE(QDate) +Q_DECLARE_METATYPE(QTime) + +#include + +class TestDateConv : public QObject +{ + Q_OBJECT +public: + explicit TestDateConv(QObject *parent = nullptr) : QObject(parent) { } + +private slots: + void initTestCase(); + void checkDates_data(); + void checkDates(); + void checkInvalidDates_data(); + void checkInvalidDates(); +}; + +void TestDateConv::initTestCase() +{ + qRegisterMetaType("QDate"); + qRegisterMetaType("QTime"); +} + +void TestDateConv::checkDates_data() +{ + QTest::addColumn("input"); + QTest::addColumn("day"); + QTest::addColumn("time"); + + // This is a typical case - all data provided + QTest::newRow("D:20040101121110") << QByteArray("D:20040101121110Z") << QDate(2004, 1, 1) << QTime(12, 11, 10); + + // The D: is strongly recommended, but optional + QTest::newRow("20040101121110") << QByteArray("20040101121110Z") << QDate(2004, 1, 1) << QTime(12, 11, 10); + + // Only the year is actually required + QTest::newRow("D:2006") << QByteArray("D:2006") << QDate(2006, 1, 1) << QTime(0, 0, 0); + + QTest::newRow("D:200602") << QByteArray("D:200602") << QDate(2006, 2, 1) << QTime(0, 0, 0); + + QTest::newRow("D:20060304") << QByteArray("D:20060304") << QDate(2006, 3, 4) << QTime(0, 0, 0); + + QTest::newRow("D:2006030405") << QByteArray("D:2006030405") << QDate(2006, 3, 4) << QTime(5, 0, 0); + + QTest::newRow("D:200603040512") << QByteArray("D:200603040512") << QDate(2006, 3, 4) << QTime(5, 12, 0); + + // If the timezone isn't specified, I assume UTC + QTest::newRow("D:20060304051226") << QByteArray("D:20060304051226") << QDate(2006, 3, 4) << QTime(5, 12, 26); + + // Check for real timezone conversions + QTest::newRow("D:20030131115258-04'00'") << QByteArray("D:20030131115258-04'00'") << QDate(2003, 1, 31) << QTime(15, 52, 58); + + QTest::newRow("D:20030131115258+05'00'") << QByteArray("D:20030131115258+05'00'") << QDate(2003, 1, 31) << QTime(6, 52, 58); + + // There are places that have non-hour offsets + // Yep, that means you Adelaide. + QTest::newRow("D:20030131115258+08'30'") << QByteArray("D:20030131115258+08'30'") << QDate(2003, 1, 31) << QTime(3, 22, 58); + + QTest::newRow("D:20030131115258-08'30'") << QByteArray("D:20030131115258-08'30'") << QDate(2003, 1, 31) << QTime(20, 22, 58); +} + +void TestDateConv::checkDates() +{ + QFETCH(QByteArray, input); + QFETCH(QDate, day); + QFETCH(QTime, time); + + QCOMPARE(Poppler::convertDate(input.constData()), QDateTime(day, time, Qt::UTC)); +} + +void TestDateConv::checkInvalidDates_data() +{ + QTest::addColumn("input"); + + // Null data + QTest::newRow("Null data") << QByteArray(); + + // Empty data + QTest::newRow("Empty data") << QByteArray(""); + + // Empty data + QTest::newRow("One character") << QByteArray("D"); + + // Empty data + QTest::newRow("'D:'") << QByteArray("D:"); + + // Empty data + QTest::newRow("Not a date") << QByteArray("D:IAmNotAValidDate"); +} + +void TestDateConv::checkInvalidDates() +{ + QFETCH(QByteArray, input); + + QCOMPARE(Poppler::convertDate(input.constData()), QDateTime()); +} + +QTEST_GUILESS_MAIN(TestDateConv) + +#include "check_dateConversion.moc" diff --git a/poppler-24.05.0/qt5/tests/check_distinguished_name_parser.cpp b/poppler-24.05.0/qt5/tests/check_distinguished_name_parser.cpp new file mode 100644 index 0000000000000000000000000000000000000000..2628cbe6ba8e64436d7fd82ba36a8eeddfcfc62a --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_distinguished_name_parser.cpp @@ -0,0 +1,165 @@ +//======================================================================== +// +// check_distinguished_name_parser.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela +//======================================================================== +#include "DistinguishedNameParser.h" + +#include +#include + +class TestDistinguishedNameParser : public QObject +{ + Q_OBJECT +public: + explicit TestDistinguishedNameParser(QObject *parent = nullptr) : QObject(parent) { } +private slots: + // The big set of input/output. Several of the helper functions can be tested independently + void testParser(); + void testParser_data(); + + void testRemoveLeadingSpaces(); + void testRemoveLeadingSpaces_data(); + + void testRemoveTrailingSpaces(); + void testRemoveTrailingSpaces_data(); + + void testParseHexString(); + void testParseHexString_data(); +}; + +Q_DECLARE_METATYPE(DN::Result); +Q_DECLARE_METATYPE(std::string); +Q_DECLARE_METATYPE(std::optional); + +void TestDistinguishedNameParser::testParser() +{ + QFETCH(std::string, inputData); + QFETCH(DN::Result, expectedResult); + + auto result = DN::parseString(inputData); + QCOMPARE(result, expectedResult); +} + +void TestDistinguishedNameParser::testParser_data() +{ + QTest::addColumn("inputData"); + QTest::addColumn("expectedResult"); + + QTest::newRow("empty") << std::string {} << DN::Result {}; + QTest::newRow("CN=Simple") << std::string { "CN=Simple" } << DN::Result { { "CN", "Simple" } }; + QTest::newRow("CN=Name with spaces") << std::string { "CN=Name with spaces" } << DN::Result { { "CN", "Name with spaces" } }; + QTest::newRow("CN=Simple,O=Silly") << std::string { "CN=Simple,O=Silly" } << DN::Result { { "CN", "Simple" }, { "O", "Silly" } }; + QTest::newRow("CN=Steve Kille,O=Isode Limited,C=GB") << std::string { "CN=Steve Kille,O=Isode Limited,C=GB" } << DN::Result { { "CN", "Steve Kille" }, { "O", "Isode Limited" }, { "C", "GB" } }; + QTest::newRow("CN=some.user@example.com, O=MyCompany, L=San Diego,ST=California, C=US") + << std::string { "CN=some.user@example.com, O=MyCompany, L=San Diego,ST=California, C=US" } << DN::Result { { "CN", "some.user@example.com" }, { "O", "MyCompany" }, { "L", "San Diego" }, { "ST", "California" }, { "C", "US" } }; + QTest::newRow("Multi valued") << std::string { "OU=Sales+CN=J. Smith,O=Widget Inc.,C=US" } + << DN::Result { { "OU", "Sales" }, { "CN", "J. Smith" }, { "O", "Widget Inc." }, { "C", "US" } }; // This is technically wrong, but probably good enough for now + QTest::newRow("Escaping comma") << std::string { "CN=L. Eagle,O=Sue\\, Grabbit and Runn,C=GB" } << DN::Result { { "CN", "L. Eagle" }, { "O", "Sue, Grabbit and Runn" }, { "C", "GB" } }; + QTest::newRow("Escaped trailing space") << std::string { "CN=Trailing space\\ " } << DN::Result { { "CN", "Trailing space " } }; + QTest::newRow("Escaped quote") << std::string { "CN=Quotation \\\" Mark" } << DN::Result { { "CN", "Quotation \" Mark" } }; + + QTest::newRow("CN=Simple with escaping") << std::string { "CN=S\\69mpl\\65\\7A" } << DN::Result { { "CN", "Simplez" } }; + QTest::newRow("SN=Lu\\C4\\8Di\\C4\\87") << std::string { "SN=Lu\\C4\\8Di\\C4\\87" } << DN::Result { { "SN", "Lučić" } }; + QTest::newRow("CN=\"Quoted name\"") << std::string { "CN=\"Quoted name\"" } << DN::Result { { "CN", "Quoted name" } }; + QTest::newRow("CN=\" Leading and trailing spacees \"") << std::string { "CN=\" Leading and trailing spaces \"" } << DN::Result { { "CN", " Leading and trailing spaces " } }; + QTest::newRow("Comma in quotes") << std::string { "CN=\"Comma, inside\"" } << DN::Result { { "CN", "Comma, inside" } }; + QTest::newRow("forbidden chars in quotes") << std::string { "CN=\"Forbidden !@#$%&*()<>[]{},.?/\\| chars\"" } << DN::Result { { "CN", "Forbidden !@#$%&*()<>[]{},.?/\\| chars" } }; + QTest::newRow("Quoted quotation") << std::string { "CN=\"Quotation \\\" Mark\"" } << DN::Result { { "CN", "Quotation \" Mark" } }; + QTest::newRow("Quoted quotation") << std::string { "CN=\"Quotation \\\" Mark\\\" Multiples\"" } << DN::Result { { "CN", "Quotation \" Mark\" Multiples" } }; + + QTest::newRow("frompdf1") << std::string { "2.5.4.97=#5553742D49644E722E20444520313233343735323233,CN=TeleSec PKS eIDAS QES CA 5,O=Deutsche Telekom AG,C=DE" } + << DN::Result { { "2.5.4.97", "USt-IdNr. DE 123475223" }, { "CN", "TeleSec PKS eIDAS QES CA 5" }, { "O", "Deutsche Telekom AG" }, { "C", "DE" } }; + QTest::newRow("frompdf2") << std::string { "2.5.4.5=#34,CN=Koch\\, Werner,2.5.4.42=#5765726E6572,2.5.4.4=#4B6F6368,C=DE" } + << DN::Result { { "SerialNumber", "4" }, { "CN", "Koch, Werner" }, { "GN", "Werner" }, { "SN", "Koch" }, { "C", "DE" } }; + QTest::newRow("frompdf2a") << std::string { "2.5.4.5=#34,CN=Koch\\, Werner,oid.2.5.4.42=#5765726E6572,OID.2.5.4.4=#4B6F6368,C=DE" } + << DN::Result { { "SerialNumber", "4" }, { "CN", "Koch, Werner" }, { "GN", "Werner" }, { "SN", "Koch" }, { "C", "DE" } }; + + // weird spacing + QTest::newRow("CN =Simple") << std::string { "CN =Simple" } << DN::Result { { "CN", "Simple" } }; + QTest::newRow("CN= Simple") << std::string { "CN= Simple" } << DN::Result { { "CN", "Simple" } }; + QTest::newRow("CN=Simple ") << std::string { "CN=Simple " } << DN::Result { { "CN", "Simple" } }; + QTest::newRow("CN=Simple,") << std::string { "CN=Simple," } << DN::Result { { "CN", "Simple" } }; + QTest::newRow("CN=Simple, O=Silly") << std::string { "CN=Simple, O=Silly" } << DN::Result { { "CN", "Simple" }, { "O", "Silly" } }; + + // various malformed + QTest::newRow("CN=Simple\\") << std::string { "CN=Simple\\" } << DN::Result {}; + QTest::newRow("CN=") << std::string { "CN=" } << DN::Result {}; + QTest::newRow("CN=Simple\\X") << std::string { "CN=Simple\\X" } << DN::Result {}; + QTest::newRow("CN=Simple, O") << std::string { "CN=Simple, O" } << DN::Result {}; + QTest::newRow("CN=Sim\"ple") << std::string { "CN=Sim\"ple, O" } << DN::Result {}; + QTest::newRow("CN=Simple\\a") << std::string { "CN=Simple\\a" } << DN::Result {}; + QTest::newRow("=Simple") << std::string { "=Simple" } << DN::Result {}; + QTest::newRow("CN=\"Simple") << std::string { "CN=\"Simple" } << DN::Result {}; + QTest::newRow("CN=\"Simple") << std::string { "CN=\"Simple\\" } << DN::Result {}; + QTest::newRow("unquoted quotation in quotation") << std::string { "CN=\"Quotation \" Mark\"" } << DN::Result {}; +} + +void TestDistinguishedNameParser::testRemoveLeadingSpaces() +{ + QFETCH(std::string, input); + QFETCH(std::string, expectedOutput); + + auto result = DN::detail::removeLeadingSpaces(input); + QCOMPARE(result, expectedOutput); +} +void TestDistinguishedNameParser::testRemoveLeadingSpaces_data() +{ + QTest::addColumn("input"); + QTest::addColumn("expectedOutput"); + + QTest::newRow("Empty") << std::string {} << std::string {}; + QTest::newRow("No leading spaces") << std::string { "horse" } << std::string { "horse" }; + QTest::newRow("Some spaces") << std::string { " horse" } << std::string { "horse" }; + QTest::newRow("Some leading and trailing") << std::string { " horse " } << std::string { "horse " }; +} + +void TestDistinguishedNameParser::testRemoveTrailingSpaces() +{ + QFETCH(std::string, input); + QFETCH(std::string, expectedOutput); + + auto result = DN::detail::removeTrailingSpaces(input); + QCOMPARE(result, expectedOutput); +} +void TestDistinguishedNameParser::testRemoveTrailingSpaces_data() +{ + QTest::addColumn("input"); + QTest::addColumn("expectedOutput"); + + QTest::newRow("Empty") << std::string {} << std::string {}; + QTest::newRow("No leading spaces") << std::string { "horse" } << std::string { "horse" }; + QTest::newRow("Some spaces") << std::string { "horse " } << std::string { "horse" }; + QTest::newRow("Some leading and trailing") << std::string { " horse " } << std::string { " horse" }; +} + +void TestDistinguishedNameParser::testParseHexString() +{ + QFETCH(std::string, input); + QFETCH(std::optional, expectedOutput); + + auto result = DN::detail::parseHexString(input); + QCOMPARE(result, expectedOutput); +} + +void TestDistinguishedNameParser::testParseHexString_data() +{ + QTest::addColumn("input"); + QTest::addColumn>("expectedOutput"); + + QTest::newRow("4") << std::string { "34" } << std::optional("4"); + QTest::newRow("Koch") << std::string { "4B6F6368" } << std::optional("Koch"); + QTest::newRow("USt-IdNr. DE 123475223") << std::string { "5553742D49644E722E20444520313233343735323233" } << std::optional("USt-IdNr. DE 123475223"); + + // various baddies + QTest::newRow("empty") << std::string {} << std::optional {}; + QTest::newRow("FFF") << std::string { "FFF" } << std::optional {}; + QTest::newRow("F") << std::string { "F" } << std::optional {}; + QTest::newRow("XX") << std::string { "XX" } << std::optional {}; +} + +QTEST_GUILESS_MAIN(TestDistinguishedNameParser); +#include "check_distinguished_name_parser.moc" diff --git a/poppler-24.05.0/qt5/tests/check_fonts.cpp b/poppler-24.05.0/qt5/tests/check_fonts.cpp new file mode 100644 index 0000000000000000000000000000000000000000..bb7983d28a307792952796bae749ee8198a3e7d8 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_fonts.cpp @@ -0,0 +1,241 @@ +#include + +#include + +#include + +class TestFontsData : public QObject +{ + Q_OBJECT +public: + explicit TestFontsData(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkNoFonts(); + void checkType1(); + void checkType3(); + void checkTrueType(); + void checkFontIterator(); + void checkSecondDocumentQuery(); + void checkMultipleIterations(); + void checkIteratorFonts(); +}; + +static QList loadFontsViaIterator(Poppler::Document *doc, int from = 0, int count = -1) +{ + int num = count == -1 ? doc->numPages() - from : count; + QList list; + std::unique_ptr it(doc->newFontIterator(from)); + while (it->hasNext() && num) { + list += it->next(); + --num; + } + return list; +} + +namespace Poppler { +static bool operator==(const FontInfo &f1, const FontInfo &f2) +{ + if (f1.name() != f2.name()) { + return false; + } + if (f1.file() != f2.file()) { + return false; + } + if (f1.isEmbedded() != f2.isEmbedded()) { + return false; + } + if (f1.isSubset() != f2.isSubset()) { + return false; + } + if (f1.type() != f2.type()) { + return false; + } + if (f1.typeName() != f2.typeName()) { + return false; + } + return true; +} +} + +void TestFontsData::checkNoFonts() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/tests/image.pdf"); + QVERIFY(doc); + + QList listOfFonts = doc->fonts(); + QCOMPARE(listOfFonts.size(), 0); + + delete doc; +} + +void TestFontsData::checkType1() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/tests/text.pdf"); + QVERIFY(doc); + + QList listOfFonts = doc->fonts(); + QCOMPARE(listOfFonts.size(), 1); + QCOMPARE(listOfFonts.at(0).name(), QLatin1String("Helvetica")); + QCOMPARE(listOfFonts.at(0).type(), Poppler::FontInfo::Type1); + QCOMPARE(listOfFonts.at(0).typeName(), QLatin1String("Type 1")); + + QCOMPARE(listOfFonts.at(0).isEmbedded(), false); + QCOMPARE(listOfFonts.at(0).isSubset(), false); + + delete doc; +} + +void TestFontsData::checkType3() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/tests/type3.pdf"); + QVERIFY(doc); + + QList listOfFonts = doc->fonts(); + QCOMPARE(listOfFonts.size(), 2); + QCOMPARE(listOfFonts.at(0).name(), QLatin1String("Helvetica")); + QCOMPARE(listOfFonts.at(0).type(), Poppler::FontInfo::Type1); + QCOMPARE(listOfFonts.at(0).typeName(), QLatin1String("Type 1")); + + QCOMPARE(listOfFonts.at(0).isEmbedded(), false); + QCOMPARE(listOfFonts.at(0).isSubset(), false); + + QCOMPARE(listOfFonts.at(1).name(), QString()); + QCOMPARE(listOfFonts.at(1).type(), Poppler::FontInfo::Type3); + QCOMPARE(listOfFonts.at(1).typeName(), QLatin1String("Type 3")); + + QCOMPARE(listOfFonts.at(1).isEmbedded(), true); + QCOMPARE(listOfFonts.at(1).isSubset(), false); + + delete doc; +} + +void TestFontsData::checkTrueType() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + + QList listOfFonts = doc->fonts(); + QCOMPARE(listOfFonts.size(), 2); + QCOMPARE(listOfFonts.at(0).name(), QLatin1String("Arial-BoldMT")); + QCOMPARE(listOfFonts.at(0).type(), Poppler::FontInfo::TrueType); + QCOMPARE(listOfFonts.at(0).typeName(), QLatin1String("TrueType")); + + QCOMPARE(listOfFonts.at(0).isEmbedded(), false); + QCOMPARE(listOfFonts.at(0).isSubset(), false); + + QCOMPARE(listOfFonts.at(1).name(), QLatin1String("ArialMT")); + QCOMPARE(listOfFonts.at(1).type(), Poppler::FontInfo::TrueType); + QCOMPARE(listOfFonts.at(1).typeName(), QLatin1String("TrueType")); + + QCOMPARE(listOfFonts.at(1).isEmbedded(), false); + QCOMPARE(listOfFonts.at(1).isSubset(), false); + + delete doc; +} + +void TestFontsData::checkFontIterator() +{ + // loading a 1-page document + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/tests/type3.pdf"); + QVERIFY(doc); + // loading a 6-pages document + Poppler::Document *doc6 = Poppler::Document::load(TESTDATADIR "/tests/cropbox.pdf"); + QVERIFY(doc6); + + std::unique_ptr it; + + // some tests with the 1-page document: + // - check a default iterator + it.reset(doc->newFontIterator()); + QVERIFY(it->hasNext()); + // - check an iterator for negative pages to behave as 0 + it.reset(doc->newFontIterator(-1)); + QVERIFY(it->hasNext()); + // - check an iterator for pages out of the page limit + it.reset(doc->newFontIterator(1)); + QVERIFY(!it->hasNext()); + // - check that it reaches the end after 1 iteration + it.reset(doc->newFontIterator()); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(!it->hasNext()); + + // some tests with the 6-page document: + // - check a default iterator + it.reset(doc6->newFontIterator()); + QVERIFY(it->hasNext()); + // - check an iterator for pages out of the page limit + it.reset(doc6->newFontIterator(6)); + QVERIFY(!it->hasNext()); + // - check that it reaches the end after 6 iterations + it.reset(doc6->newFontIterator()); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(!it->hasNext()); + + delete doc; + delete doc6; +} + +void TestFontsData::checkSecondDocumentQuery() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/tests/type3.pdf"); + QVERIFY(doc); + + QList listOfFonts = doc->fonts(); + QCOMPARE(listOfFonts.size(), 2); + // check we get the very same result when calling fonts() again (#19405) + QList listOfFonts2 = doc->fonts(); + QCOMPARE(listOfFonts, listOfFonts2); + + delete doc; +} + +void TestFontsData::checkMultipleIterations() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/tests/type3.pdf"); + QVERIFY(doc); + + QList listOfFonts = loadFontsViaIterator(doc); + QCOMPARE(listOfFonts.size(), 2); + QList listOfFonts2 = loadFontsViaIterator(doc); + QCOMPARE(listOfFonts, listOfFonts2); + + delete doc; +} + +void TestFontsData::checkIteratorFonts() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/tests/fonts.pdf"); + QVERIFY(doc); + + QList listOfFonts = doc->fonts(); + QCOMPARE(listOfFonts.size(), 3); + + // check we get the very same result when gatering fonts using the iterator + QList listOfFonts2 = loadFontsViaIterator(doc); + QCOMPARE(listOfFonts, listOfFonts2); + + delete doc; +} + +QTEST_GUILESS_MAIN(TestFontsData) +#include "check_fonts.moc" diff --git a/poppler-24.05.0/qt5/tests/check_forms.cpp b/poppler-24.05.0/qt5/tests/check_forms.cpp new file mode 100644 index 0000000000000000000000000000000000000000..68530bb301752b219ac18f86b087245709fd1ace --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_forms.cpp @@ -0,0 +1,264 @@ +#include + +#include +#include +#include +#include + +class TestForms : public QObject +{ + Q_OBJECT +public: + explicit TestForms(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testCheckbox(); // Test for issue #655 + void testCheckboxIssue159(); // Test for issue #159 + void testSetIcon(); // Test that setIcon will always be valid. + void testSetPrintable(); + void testSetAppearanceText(); + void testStandAloneWidgets(); // check for 'de facto' tooltips. Issue #34 + void testUnicodeFieldAttributes(); +}; + +void TestForms::testCheckbox() +{ + // Test for checkbox issue #655 + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/latex-hyperref-checkbox-issue-655.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + QList forms = page->formFields(); + QCOMPARE(forms.size(), 1); + + Poppler::FormField *form = forms.at(0); + QCOMPARE(form->type(), Poppler::FormField::FormButton); + + Poppler::FormFieldButton *chkFormFieldButton = static_cast(form); + + // Test this is actually a Checkbox + QCOMPARE(chkFormFieldButton->buttonType(), Poppler::FormFieldButton::CheckBox); + + // checkbox comes initially 'unchecked' + QCOMPARE(chkFormFieldButton->state(), false); + // let's mark it as 'checked' + chkFormFieldButton->setState(true); + // now test if it was succesfully 'checked' + QCOMPARE(chkFormFieldButton->state(), true); +} + +void TestForms::testStandAloneWidgets() +{ + // Check for 'de facto' tooltips. Issue #34 + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/tooltip.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + QList forms = page->formFields(); + + QCOMPARE(forms.size(), 3); + + Q_FOREACH (Poppler::FormField *field, forms) { + QCOMPARE(field->type(), Poppler::FormField::FormButton); + + Poppler::FormFieldButton *fieldButton = static_cast(field); + QCOMPARE(fieldButton->buttonType(), Poppler::FormFieldButton::Push); + + FormField *ff = Poppler::FormFieldData::getFormWidget(fieldButton)->getField(); + QVERIFY(ff); + QCOMPARE(ff->isStandAlone(), true); + + // tooltip.pdf has only these 3 standalone widgets + QVERIFY(field->uiName() == QStringLiteral("This is a tooltip!") || // clazy:exclude=qstring-allocations + field->uiName() == QStringLiteral("Sulfuric acid") || field->uiName() == QString::fromUtf8("little Gauß")); + } +} + +void TestForms::testCheckboxIssue159() +{ + // Test for checkbox issue #159 + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/checkbox_issue_159.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + Poppler::FormFieldButton *beerFieldButton = nullptr; + Poppler::FormFieldButton *wineFieldButton = nullptr; + + QList forms = page->formFields(); + + // Let's find and assign the "Wine" and "Beer" radio buttons + Q_FOREACH (Poppler::FormField *field, forms) { + if (field->type() != Poppler::FormField::FormButton) { + continue; + } + + Poppler::FormFieldButton *fieldButton = static_cast(field); + if (fieldButton->buttonType() != Poppler::FormFieldButton::Radio) { + continue; + } + + // printf("%s \n", fieldButton->caption().toLatin1().data()); + if (fieldButton->caption() == QStringLiteral("Wine")) { + wineFieldButton = fieldButton; + } else if (fieldButton->caption() == QStringLiteral("Beer")) { + beerFieldButton = fieldButton; + } + } + + // "Beer" and "Wine" radiobuttons belong to the same RadioButton group. + // So selecting one should unselect the other. + QVERIFY(beerFieldButton); + QVERIFY(wineFieldButton); + + // Test that the RadioButton group comes with "Beer" initially selected + QCOMPARE(beerFieldButton->state(), true); + + // Now select "Wine". As a result "Beer" should no longer be selected. + wineFieldButton->setState(true); + + // Test that "Beer" is indeed not reporting as being selected + QCOMPARE(beerFieldButton->state(), false); +} + +void TestForms::testSetIcon() +{ + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/form_set_icon.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + QList forms = page->formFields(); + + Poppler::FormFieldButton *anmButton = nullptr; + + // First we are finding the field which will have its icon changed + Q_FOREACH (Poppler::FormField *field, forms) { + + if (field->type() != Poppler::FormField::FormButton) { + continue; + } + + Poppler::FormFieldButton *fieldButton = static_cast(field); + if (field->name() == QStringLiteral("anm0")) { + anmButton = fieldButton; + } + } + + QVERIFY(anmButton); + + // Then we set the Icon on this field, for every other field + // And verify if it has a valid icon + Q_FOREACH (Poppler::FormField *field, forms) { + + if (field->type() != Poppler::FormField::FormButton) { + continue; + } + + Poppler::FormFieldButton *fieldButton = static_cast(field); + if (field->name() == QStringLiteral("anm0")) { + continue; + } + + Poppler::FormFieldIcon newIcon = fieldButton->icon(); + + anmButton->setIcon(newIcon); + + Poppler::FormFieldIcon anmIcon = anmButton->icon(); + + QVERIFY(Poppler::FormFieldIconData::getData(anmIcon)); + QVERIFY(Poppler::FormFieldIconData::getData(anmIcon)->icon); + + QCOMPARE(Poppler::FormFieldIconData::getData(anmIcon)->icon->lookupNF("AP").dictLookupNF("N").getRef().num, Poppler::FormFieldIconData::getData(newIcon)->icon->lookupNF("AP").dictLookupNF("N").getRef().num); + } + + // Just making sure that setting a invalid icon will still produce a valid icon. + anmButton->setIcon(Poppler::FormFieldIcon(nullptr)); + Poppler::FormFieldIcon anmIcon = anmButton->icon(); + + QVERIFY(Poppler::FormFieldIconData::getData(anmIcon)); + QVERIFY(Poppler::FormFieldIconData::getData(anmIcon)->icon); +} + +void TestForms::testSetPrintable() +{ + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/form_set_icon.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + QList forms = page->formFields(); + + Q_FOREACH (Poppler::FormField *field, forms) { + field->setPrintable(true); + QCOMPARE(field->isPrintable(), true); + + field->setPrintable(false); + QCOMPARE(field->isPrintable(), false); + } +} + +void TestForms::testSetAppearanceText() +{ + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/checkbox_issue_159.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + QList forms = page->formFields(); + + int nTextForms = 0; + + Q_FOREACH (Poppler::FormField *field, forms) { + + if (field->type() != Poppler::FormField::FormText) { + continue; + } + + nTextForms++; + + Poppler::FormFieldText *fft = static_cast(field); + + const QString textToSet = "HOLA" + fft->name(); + fft->setAppearanceText(textToSet); + + Dict *dict = Poppler::FormFieldData::getFormWidget(fft)->getObj()->getDict(); + Object strObject = dict->lookup("AP").dictLookup("N"); + + QVERIFY(strObject.isStream()); + + GooString s; + strObject.getStream()->fillGooString(&s); + + const QString textToFind = QStringLiteral("\n(%1) Tj\n").arg(textToSet); + QVERIFY(s.toStr().find(textToFind.toStdString()) != std::string::npos); + } + + QCOMPARE(nTextForms, 5); +} + +void TestForms::testUnicodeFieldAttributes() +{ + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/fieldWithUtf16Names.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + QList forms = page->formFields(); + + Poppler::FormField *field = forms.first(); + + QCOMPARE(field->name(), QStringLiteral("Tex")); + QCOMPARE(field->uiName(), QStringLiteral("Texto de ayuda")); +} + +QTEST_GUILESS_MAIN(TestForms) +#include "check_forms.moc" diff --git a/poppler-24.05.0/qt5/tests/check_goostring.cpp b/poppler-24.05.0/qt5/tests/check_goostring.cpp new file mode 100644 index 0000000000000000000000000000000000000000..a82b5b1668e274cc638b8a94e56f91aaf7151672 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_goostring.cpp @@ -0,0 +1,161 @@ +#include +#include + +#include "goo/GooString.h" + +class TestGooString : public QObject +{ + Q_OBJECT +public: + explicit TestGooString(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testInsertData_data(); + void testInsertData(); + void testInsert(); + void testFormat(); + void testFromNullptr(); +}; + +void TestGooString::testInsertData_data() +{ + QTest::addColumn("string"); + QTest::addColumn("addition"); + QTest::addColumn("position"); + QTest::addColumn("result"); + + QTest::newRow("foo") << QByteArray("foo") << QByteArray("bar") << 0 << QByteArray("barfoo"); + QTest::newRow("") << QByteArray() << QByteArray("bar") << 0 << QByteArray("bar"); + QTest::newRow("foo+bar #1") << QByteArray("f+bar") << QByteArray("oo") << 1 << QByteArray("foo+bar"); + QTest::newRow("foo+bar #2") << QByteArray("fobar") << QByteArray("o+") << 2 << QByteArray("foo+bar"); + QTest::newRow("foo+bar #last") << QByteArray("foo+r") << QByteArray("ba") << 4 << QByteArray("foo+bar"); + QTest::newRow("foo+bar #end") << QByteArray("foo+") << QByteArray("bar") << 4 << QByteArray("foo+bar"); + QTest::newRow("long #start") << QByteArray("very string") << QByteArray("long long long long long ") << 5 << QByteArray("very long long long long long string"); +} + +void TestGooString::testInsertData() +{ + QFETCH(QByteArray, string); + QFETCH(QByteArray, addition); + QFETCH(int, position); + QFETCH(QByteArray, result); + + GooString goo(string.constData()); + QCOMPARE(goo.c_str(), string.constData()); + goo.insert(position, addition.constData()); + QCOMPARE(goo.c_str(), result.constData()); +} + +void TestGooString::testInsert() +{ + { + GooString goo; + goo.insert(0, "."); + goo.insert(0, "This is a very long long test string"); + QCOMPARE(goo.c_str(), "This is a very long long test string."); + } + { + GooString goo; + goo.insert(0, "second-part-third-part"); + goo.insert(0, "first-part-"); + QCOMPARE(goo.c_str(), "first-part-second-part-third-part"); + } +} + +void TestGooString::testFormat() +{ + { + const std::unique_ptr goo(GooString::format("{0:d},{1:x}", 1, 0xF)); + QCOMPARE(goo->c_str(), "1,f"); + } + { + const std::unique_ptr goo(GooString::format("{0:d},{0:x},{0:X},{0:o},{0:b},{0:w}", 0xA)); + QCOMPARE(goo->c_str(), "10,a,A,12,1010, "); + } + { + const std::unique_ptr goo(GooString::format("{0:d},{0:x},{0:X},{0:o},{0:b}", -0xA)); + QCOMPARE(goo->c_str(), "-10,-a,-A,-12,-1010"); + } + { + const std::unique_ptr goo(GooString::format("{0:c}{1:c}{2:c}{3:c}", 'T', (char)'E', (short)'S', (int)'T')); + QCOMPARE(goo->c_str(), "TEST"); + + const std::unique_ptr goo2(GooString::format("{0:s} {1:t}", "TEST", goo.get())); + QCOMPARE(goo2->c_str(), "TEST TEST"); + } + { + const std::unique_ptr goo(GooString::format("{0:ud} {1:d} {2:d}", UINT_MAX, INT_MAX, INT_MIN)); + const QByteArray expected = QStringLiteral("%1 %2 %3").arg(UINT_MAX).arg(INT_MAX).arg(INT_MIN).toLatin1(); + QCOMPARE(goo->c_str(), expected.constData()); + } + { + const std::unique_ptr goo(GooString::format("{0:uld} {1:ld} {2:ld}", ULONG_MAX, LONG_MAX, LONG_MIN)); + const QByteArray expected = QStringLiteral("%1 %2 %3").arg(ULONG_MAX).arg(LONG_MAX).arg(LONG_MIN).toLatin1(); + QCOMPARE(goo->c_str(), expected.constData()); + } + { + const std::unique_ptr goo(GooString::format("{0:ulld} {1:lld} {2:lld}", ULLONG_MAX, LLONG_MAX, LLONG_MIN)); + const QByteArray expected = QStringLiteral("%1 %2 %3").arg(ULLONG_MAX).arg(LLONG_MAX).arg(LLONG_MIN).toLatin1(); + QCOMPARE(goo->c_str(), expected.constData()); + } + { + const std::unique_ptr gooD(GooString::format("{0:.1f} {0:.1g} {0:.1gs} | {1:.1f} {1:.1g} {1:.1gs}", 1., .012)); + const std::unique_ptr gooF(GooString::format("{0:.1f} {0:.1g} {0:.1gs} | {1:.1f} {1:.1g} {1:.1gs}", 1.f, .012f)); + QCOMPARE(gooD->c_str(), "1.0 1 1 | 0.0 0 0.01"); + QCOMPARE(gooF->c_str(), "1.0 1 1 | 0.0 0 0.01"); + } + { + const std::unique_ptr goo(GooString::format("{0:.4f} {0:.4g} {0:.4gs}", .012)); + QCOMPARE(goo->c_str(), "0.0120 0.012 0.012"); + } + { + const std::unique_ptr goo(GooString::format("{{ SomeText {0:d} }}", 1)); + QCOMPARE(goo->c_str(), "{ SomeText 1 }"); + } + { + const std::unique_ptr goo(GooString::format("{{{{ {{ SomeText {0:d}", 2)); + QCOMPARE(goo->c_str(), "{{ { SomeText 2"); + } + { + const std::unique_ptr goo(GooString::format("SomeText {0:d} }} }}}}", 3)); + QCOMPARE(goo->c_str(), "SomeText 3 } }}"); + } +} + +void TestGooString::testFromNullptr() +{ + { + GooString str { static_cast(nullptr) }; + QCOMPARE(str.getLength(), 0); + } + + { + GooString str; + str.Set(static_cast(nullptr)); + QCOMPARE(str.getLength(), 0); + } + + { + GooString str { static_cast(nullptr) }; + QCOMPARE(str.getLength(), 0); + } + + { + GooString str { static_cast(nullptr), 0 }; + QCOMPARE(str.getLength(), 0); + } + + { + GooString str; + str.Set(static_cast(nullptr)); + QCOMPARE(str.getLength(), 0); + } + + { + GooString str; + str.Set(static_cast(nullptr), 0); + QCOMPARE(str.getLength(), 0); + } +} + +QTEST_GUILESS_MAIN(TestGooString) +#include "check_goostring.moc" diff --git a/poppler-24.05.0/qt5/tests/check_internal_outline.cpp b/poppler-24.05.0/qt5/tests/check_internal_outline.cpp new file mode 100644 index 0000000000000000000000000000000000000000..5be368aae95e698d56600663e2d1b3b0bd1d5de7 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_internal_outline.cpp @@ -0,0 +1,437 @@ +#include +#include + +#include "Outline.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" + +class TestInternalOutline : public QObject +{ + Q_OBJECT +public: + explicit TestInternalOutline(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testCreateOutline(); + void testSetOutline(); + void testInsertChild(); + void testRemoveChild(); + void testSetTitleAndSetPageDest(); +}; + +void TestInternalOutline::testCreateOutline() +{ + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + + const std::string tempFileName = tempFile.fileName().toStdString(); + const GooString gooTempFileName { tempFileName }; + + std::unique_ptr doc = PDFDocFactory().createPDFDoc(GooString(TESTDATADIR "/unittestcases/truetype.pdf")); + QVERIFY(doc.get()); + + // ensure the file has no existing outline + Outline *outline = doc->getOutline(); + QVERIFY(outline != nullptr); + auto *outlineItems = outline->getItems(); + QVERIFY(outlineItems == nullptr); + + // create an empty outline and save the file + outline->setOutline({}); + outlineItems = outline->getItems(); + // no items will result in a nullptr rather than a 0 length list + QVERIFY(outlineItems == nullptr); + doc->saveAs(gooTempFileName); + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName); + QVERIFY(doc.get()); + + // ensure the re-opened file has an outline with no items + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + outlineItems = outline->getItems(); + QVERIFY(outlineItems == nullptr); +} + +static std::string getTitle(const OutlineItem *item) +{ + std::vector u = item->getTitle(); + std::string s; + for (auto &c : u) { + s.append(1, (char)(c)); + } + return s; +} + +void TestInternalOutline::testSetOutline() +{ + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + + const std::string tempFileName = tempFile.fileName().toStdString(); + const GooString gooTempFileName { tempFileName }; + + std::unique_ptr doc = PDFDocFactory().createPDFDoc(GooString(TESTDATADIR "/unittestcases/truetype.pdf")); + QVERIFY(doc.get()); + + // ensure the file has no existing outline + Outline *outline = doc->getOutline(); + QVERIFY(outline != nullptr); + auto *outlineItems = outline->getItems(); + QVERIFY(outlineItems == nullptr); + + // create an outline and save the file + outline->setOutline( + { { "1", 1, { { "1.1", 1, {} }, { "1.2", 2, {} }, { "1.3", 3, { { "1.3.1", 1, {} }, { "1.3.2", 2, {} }, { "1.3.3", 3, {} }, { "1.3.4", 4, {} } } }, { "1.4", 4, {} } } }, { "2", 2, {} }, { "3", 3, {} }, { "4", 4, {} } }); + outlineItems = outline->getItems(); + QVERIFY(outlineItems != nullptr); + doc->saveAs(gooTempFileName); + outline = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName); + QVERIFY(doc.get()); + + // ensure the re-opened file has an outline + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + outlineItems = outline->getItems(); + + QVERIFY(outlineItems != nullptr); + QVERIFY(outlineItems->size() == 4); + + OutlineItem *item = outlineItems->at(0); + QVERIFY(item != nullptr); + + // c_str() is used so QCOMPARE prints string correctly on disagree + QCOMPARE(getTitle(item).c_str(), "1"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2"); + item = outlineItems->at(2); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "3"); + item = outlineItems->at(3); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "4"); + + outlineItems = outlineItems->at(0)->getKids(); + QVERIFY(outlineItems != nullptr); + item = outlineItems->at(0); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.1"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.2"); + item = outlineItems->at(2); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3"); + item = outlineItems->at(3); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.4"); + + outlineItems = outlineItems->at(2)->getKids(); + QVERIFY(outlineItems != nullptr); + + item = outlineItems->at(0); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3.1"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3.2"); + item = outlineItems->at(2); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3.3"); + item = outlineItems->at(3); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3.4"); +} + +void TestInternalOutline::testInsertChild() +{ + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + QTemporaryFile tempFile2; + QVERIFY(tempFile2.open()); + tempFile2.close(); + + const std::string tempFileName = tempFile.fileName().toStdString(); + const GooString gooTempFileName { tempFileName }; + const std::string tempFileName2 = tempFile2.fileName().toStdString(); + const GooString gooTempFileName2 { tempFileName2 }; + + std::unique_ptr doc = PDFDocFactory().createPDFDoc(GooString(TESTDATADIR "/unittestcases/truetype.pdf")); + QVERIFY(doc.get()); + + // ensure the file has no existing outline + Outline *outline = doc->getOutline(); + QVERIFY(outline != nullptr); + auto *outlineItems = outline->getItems(); + QVERIFY(outlineItems == nullptr); + + // create an outline and save the file + outline->setOutline({}); + doc->saveAs(gooTempFileName); + outline = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName); + QVERIFY(doc.get()); + + // ensure the re-opened file has an outline with no items + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + // nullptr for 0-length + QVERIFY(outline->getItems() == nullptr); + + // insert first one to empty + outline->insertChild("2", 1, 0); + // insert at the end + outline->insertChild("3", 1, 1); + // insert at the start + outline->insertChild("1", 1, 0); + + // add an item to "2" + outlineItems = outline->getItems(); + QVERIFY(outlineItems != nullptr); + QVERIFY(outlineItems->at(1)); + outlineItems->at(1)->insertChild("2.1", 2, 0); + outlineItems->at(1)->insertChild("2.2", 2, 1); + outlineItems->at(1)->insertChild("2.4", 2, 2); + + outlineItems->at(1)->insertChild("2.3", 2, 2); + + // save the file + doc->saveAs(gooTempFileName2); + outline = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName2); + QVERIFY(doc.get()); + + // ensure the re-opened file has an outline + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + + outlineItems = outline->getItems(); + + QVERIFY(outlineItems != nullptr); + QVERIFY(outlineItems->size() == 3); + + OutlineItem *item = outlineItems->at(0); + QVERIFY(item != nullptr); + + // c_str() is used so QCOMPARE prints string correctly on disagree + QCOMPARE(getTitle(item).c_str(), "1"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2"); + item = outlineItems->at(2); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "3"); + + outlineItems = outlineItems->at(1)->getKids(); + item = outlineItems->at(0); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2.1"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2.2"); + item = outlineItems->at(2); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2.3"); + item = outlineItems->at(3); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2.4"); +} + +void TestInternalOutline::testRemoveChild() +{ + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + + QTemporaryFile tempFile2; + QVERIFY(tempFile2.open()); + tempFile2.close(); + + const std::string tempFileName = tempFile.fileName().toStdString(); + const GooString gooTempFileName { tempFileName }; + const std::string tempFileName2 = tempFile2.fileName().toStdString(); + const GooString gooTempFileName2 { tempFileName2 }; + + std::unique_ptr doc = PDFDocFactory().createPDFDoc(GooString(TESTDATADIR "/unittestcases/truetype.pdf")); + QVERIFY(doc.get()); + + // ensure the file has no existing outline + Outline *outline = doc->getOutline(); + QVERIFY(outline != nullptr); + auto *outlineItems = outline->getItems(); + QVERIFY(outlineItems == nullptr); + + // create an outline and save the file + outline->setOutline({ { "1", 1, { { "1.1", 1, {} }, { "1.2", 2, {} }, { "1.3", 3, { { "1.3.1", 1, {} }, { "1.3.2", 2, {} }, { "1.3.3", 3, {} }, { "1.3.4", 4, {} } } }, { "1.4", 4, {} } } }, + { "2", 2, { { "2.1", 1, {} } } }, + { "3", 3, { { "3.1", 1, {} }, { "3.2", 2, { { "3.2.1", 1, {} } } } } }, + { "4", 4, {} } }); + outlineItems = outline->getItems(); + QVERIFY(outlineItems != nullptr); + doc->saveAs(gooTempFileName); + outline = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName); + QVERIFY(doc.get()); + + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + + // remove "3" + outline->removeChild(2); + // remove "1.3.1" + outline->getItems()->at(0)->getKids()->at(2)->removeChild(0); + // remove "1.3.4" + outline->getItems()->at(0)->getKids()->at(2)->removeChild(2); + // remove "2.1" + outline->getItems()->at(1)->removeChild(0); + + // save the file + doc->saveAs(gooTempFileName2); + outline = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName2); + QVERIFY(doc.get()); + + // ensure the re-opened file has an outline + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + + outlineItems = outline->getItems(); + + QVERIFY(outlineItems != nullptr); + QVERIFY(outlineItems->size() == 3); + + OutlineItem *item = outlineItems->at(0); + QVERIFY(item != nullptr); + + // c_str() is used so QCOMPARE prints string correctly on disagree + QCOMPARE(getTitle(item).c_str(), "1"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2"); + item = outlineItems->at(2); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "4"); + + outlineItems = outlineItems->at(0)->getKids(); + outlineItems = outlineItems->at(2)->getKids(); + item = outlineItems->at(0); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3.2"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3.3"); + + // verify "2.1" is removed, lst length 0 is returned as a nullptr + QVERIFY(outline->getItems()->at(1)->getKids() == nullptr); +} + +void TestInternalOutline::testSetTitleAndSetPageDest() +{ + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + + QTemporaryFile tempFile2; + QVERIFY(tempFile2.open()); + tempFile2.close(); + + const std::string tempFileName = tempFile.fileName().toStdString(); + const GooString gooTempFileName { tempFileName }; + const std::string tempFileName2 = tempFile2.fileName().toStdString(); + const GooString gooTempFileName2 { tempFileName2 }; + + std::unique_ptr doc = PDFDocFactory().createPDFDoc(GooString(TESTDATADIR "/unittestcases/truetype.pdf")); + QVERIFY(doc.get()); + + // ensure the file has no existing outline + Outline *outline = doc->getOutline(); + QVERIFY(outline != nullptr); + auto *outlineItems = outline->getItems(); + QVERIFY(outlineItems == nullptr); + + // create an outline and save the file + outline->setOutline({ { "1", 1, { { "1.1", 1, {} }, { "1.2", 2, {} }, { "1.3", 3, { { "1.3.1", 1, {} }, { "1.3.2", 2, {} }, { "1.3.3", 3, {} }, { "1.3.4", 4, {} } } }, { "1.4", 4, {} } } }, + { "2", 2, { { "2.1", 1, {} } } }, + { "3", 3, { { "3.1", 1, {} }, { "3.2", 2, { { "3.2.1", 1, {} } } } } }, + { "4", 4, {} } }); + outlineItems = outline->getItems(); + QVERIFY(outlineItems != nullptr); + doc->saveAs(gooTempFileName); + + outline = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName); + QVERIFY(doc.get()); + + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + + // change "1.3.1" + OutlineItem *item = outline->getItems()->at(0)->getKids()->at(2)->getKids()->at(0); + QCOMPARE(getTitle(item).c_str(), "1.3.1"); + + item->setTitle("Changed to a different title"); + + item = outline->getItems()->at(2); + { + const LinkAction *action = item->getAction(); + QVERIFY(action->getKind() == actionGoTo); + const LinkGoTo *gotoAction = dynamic_cast(action); + const LinkDest *dest = gotoAction->getDest(); + QVERIFY(dest->isPageRef() == false); + QCOMPARE(dest->getPageNum(), 3); + + item->setPageDest(1); + } + + // save the file + doc->saveAs(gooTempFileName2); + outline = nullptr; + item = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName2); + QVERIFY(doc.get()); + + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + + item = outline->getItems()->at(0)->getKids()->at(2)->getKids()->at(0); + QCOMPARE(getTitle(item).c_str(), "Changed to a different title"); + { + item = outline->getItems()->at(2); + const LinkAction *action = item->getAction(); + QVERIFY(action->getKind() == actionGoTo); + const LinkGoTo *gotoAction = dynamic_cast(action); + const LinkDest *dest = gotoAction->getDest(); + QVERIFY(dest->isPageRef() == false); + QCOMPARE(dest->getPageNum(), 1); + } +} + +QTEST_GUILESS_MAIN(TestInternalOutline) +#include "check_internal_outline.moc" diff --git a/poppler-24.05.0/qt5/tests/check_lexer.cpp b/poppler-24.05.0/qt5/tests/check_lexer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8b7a46f245b89150777de583f1924ff781728976 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_lexer.cpp @@ -0,0 +1,108 @@ +#include + +#include "Object.h" +#include "Lexer.h" + +class TestLexer : public QObject +{ + Q_OBJECT +public: + explicit TestLexer(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testNumbers(); +}; + +void TestLexer::testNumbers() +{ + char data[] = "0 1 -1 2147483647 -2147483647 2147483648 -2147483648 4294967297 -2147483649 0.1 1.1 -1.1 2147483647.1 -2147483647.1 2147483648.1 -2147483648.1 4294967297.1 -2147483649.1 9223372036854775807 18446744073709551615"; + MemStream *stream = new MemStream(data, 0, strlen(data), Object(objNull)); + Lexer *lexer = new Lexer(nullptr, stream); + QVERIFY(lexer); + + Object obj; + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt); + QCOMPARE(obj.getInt(), 0); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt); + QCOMPARE(obj.getInt(), 1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt); + QCOMPARE(obj.getInt(), -1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt); + QCOMPARE(obj.getInt(), 2147483647); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt); + QCOMPARE(obj.getInt(), -2147483647); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt64); + QCOMPARE(obj.getInt64(), 2147483648ll); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt); + QCOMPARE(obj.getInt(), -2147483647 - 1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt64); + QCOMPARE(obj.getInt64(), 4294967297ll); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt64); + QCOMPARE(obj.getInt64(), -2147483649ll); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), 0.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), 1.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), -1.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), 2147483647.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), -2147483647.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), 2147483648.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), -2147483648.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), 4294967297.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), -2147483649.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt64); + QCOMPARE(obj.getInt64(), 9223372036854775807ll); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), 18446744073709551616.); + + delete lexer; +} + +QTEST_GUILESS_MAIN(TestLexer) +#include "check_lexer.moc" diff --git a/poppler-24.05.0/qt5/tests/check_links.cpp b/poppler-24.05.0/qt5/tests/check_links.cpp new file mode 100644 index 0000000000000000000000000000000000000000..04eeb9b66ebb393a321f62f95a23fd52446bc903 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_links.cpp @@ -0,0 +1,121 @@ +#include + +#include + +#include + +class TestLinks : public QObject +{ + Q_OBJECT +public: + explicit TestLinks(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkDocumentWithNoDests(); + void checkDests_xr01(); + void checkDests_xr02(); + void checkDocumentURILink(); +}; + +static bool isDestinationValid_pageNumber(const Poppler::LinkDestination *dest, const Poppler::Document *doc) +{ + return dest->pageNumber() > 0 && dest->pageNumber() <= doc->numPages(); +} + +static bool isDestinationValid_name(const Poppler::LinkDestination *dest) +{ + return !dest->destinationName().isEmpty(); +} + +void TestLinks::checkDocumentWithNoDests() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/WithAttachments.pdf"); + QVERIFY(doc); + + std::unique_ptr dest; + dest.reset(doc->linkDestination(QStringLiteral("no.dests.in.this.document"))); + QVERIFY(!isDestinationValid_pageNumber(dest.get(), doc)); + QVERIFY(isDestinationValid_name(dest.get())); + + delete doc; +} + +void TestLinks::checkDests_xr01() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/xr01.pdf"); + QVERIFY(doc); + + Poppler::Page *page = doc->page(0); + QVERIFY(page); + + QList links = page->links(); + QCOMPARE(links.count(), 2); + + { + QCOMPARE(links.at(0)->linkType(), Poppler::Link::Goto); + Poppler::LinkGoto *link = static_cast(links.at(0)); + const Poppler::LinkDestination dest = link->destination(); + QVERIFY(!isDestinationValid_pageNumber(&dest, doc)); + QVERIFY(isDestinationValid_name(&dest)); + QCOMPARE(dest.destinationName(), QLatin1String("section.1")); + } + + { + QCOMPARE(links.at(1)->linkType(), Poppler::Link::Goto); + Poppler::LinkGoto *link = static_cast(links.at(1)); + const Poppler::LinkDestination dest = link->destination(); + QVERIFY(!isDestinationValid_pageNumber(&dest, doc)); + QVERIFY(isDestinationValid_name(&dest)); + QCOMPARE(dest.destinationName(), QLatin1String("section.2")); + } + + qDeleteAll(links); + delete page; + delete doc; +} + +void TestLinks::checkDests_xr02() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/xr02.pdf"); + QVERIFY(doc); + + std::unique_ptr dest; + dest.reset(doc->linkDestination(QStringLiteral("section.1"))); + QVERIFY(isDestinationValid_pageNumber(dest.get(), doc)); + QVERIFY(!isDestinationValid_name(dest.get())); + dest.reset(doc->linkDestination(QStringLiteral("section.2"))); + QVERIFY(isDestinationValid_pageNumber(dest.get(), doc)); + QVERIFY(!isDestinationValid_name(dest.get())); + dest.reset(doc->linkDestination(QStringLiteral("section.3"))); + QVERIFY(!isDestinationValid_pageNumber(dest.get(), doc)); + QVERIFY(isDestinationValid_name(dest.get())); + + delete doc; +} + +void TestLinks::checkDocumentURILink() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/checkbox_issue_159.pdf"); + QVERIFY(doc); + + Poppler::Page *page = doc->page(0); + QVERIFY(page); + + QList links = page->links(); + QCOMPARE(links.count(), 1); + + QCOMPARE(links.at(0)->linkType(), Poppler::Link::Browse); + Poppler::LinkBrowse *link = static_cast(links.at(0)); + QCOMPARE(link->url(), QLatin1String("http://www.tcpdf.org")); + + qDeleteAll(links); + delete page; + delete doc; +} + +QTEST_GUILESS_MAIN(TestLinks) + +#include "check_links.moc" diff --git a/poppler-24.05.0/qt5/tests/check_metadata.cpp b/poppler-24.05.0/qt5/tests/check_metadata.cpp new file mode 100644 index 0000000000000000000000000000000000000000..235a4ea2f72e63e3082ff7f119389b36aa55d078 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_metadata.cpp @@ -0,0 +1,285 @@ +#include + +#include + +class TestMetaData : public QObject +{ + Q_OBJECT +public: + explicit TestMetaData(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkStrings_data(); + void checkStrings(); + void checkStrings2_data(); + void checkStrings2(); + void checkStringKeys(); + void checkLinearised(); + void checkNumPages(); + void checkDate(); + void checkPageSize(); + void checkPortraitOrientation(); + void checkLandscapeOrientation(); + void checkUpsideDownOrientation(); + void checkSeascapeOrientation(); + void checkVersion(); + void checkPdfId(); + void checkNoPdfId(); +}; + +void TestMetaData::checkStrings_data() +{ + QTest::addColumn("key"); + QTest::addColumn("value"); + + QTest::newRow("Author") << "Author" + << "Brad Hards"; + QTest::newRow("Title") << "Title" + << "Two pages"; + QTest::newRow("Subject") << "Subject" + << "A two page layout for poppler testing"; + QTest::newRow("Keywords") << "Keywords" + << "Qt4 bindings"; + QTest::newRow("Creator") << "Creator" + << "iText: cgpdftops CUPS filter"; + QTest::newRow("Producer") << "Producer" + << "Acrobat Distiller 7.0 for Macintosh"; +} + +void TestMetaData::checkStrings() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/doublepage.pdf"); + QVERIFY(doc); + + QFETCH(QString, key); + QFETCH(QString, value); + QCOMPARE(doc->info(key), value); + + delete doc; +} + +void TestMetaData::checkStrings2_data() +{ + QTest::addColumn("key"); + QTest::addColumn("value"); + + QTest::newRow("Title") << "Title" + << "Malaga hotels"; + QTest::newRow("Author") << "Author" + << "Brad Hards"; + QTest::newRow("Creator") << "Creator" + << "Safari: cgpdftops CUPS filter"; + QTest::newRow("Producer") << "Producer" + << "Acrobat Distiller 7.0 for Macintosh"; + QTest::newRow("Keywords") << "Keywords" + << "First\rSecond\rthird"; + QTest::newRow("Custom1") << "Custom1" + << "CustomValue1"; + QTest::newRow("Custom2") << "Custom2" + << "CustomValue2"; +} + +void TestMetaData::checkStrings2() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + + QFETCH(QString, key); + QFETCH(QString, value); + QCOMPARE(doc->info(key), value); + + delete doc; +} + +void TestMetaData::checkStringKeys() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + + QStringList keyList; + keyList << QStringLiteral("Title") << QStringLiteral("Author") << QStringLiteral("Creator") << QStringLiteral("Keywords") << QStringLiteral("CreationDate"); + keyList << QStringLiteral("Producer") << QStringLiteral("ModDate") << QStringLiteral("Custom1") << QStringLiteral("Custom2"); + keyList.sort(); + QStringList keysInDoc = doc->infoKeys(); + keysInDoc.sort(); + QCOMPARE(keysInDoc, keyList); + + delete doc; +} + +void TestMetaData::checkLinearised() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + QVERIFY(doc->isLinearized()); + + delete doc; + + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + QCOMPARE(doc->isLinearized(), false); + + delete doc; +} + +void TestMetaData::checkPortraitOrientation() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + Poppler::Page *page = doc->page(0); + QCOMPARE(page->orientation(), Poppler::Page::Portrait); + + delete page; + delete doc; +} + +void TestMetaData::checkNumPages() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/doublepage.pdf"); + QVERIFY(doc); + QCOMPARE(doc->numPages(), 2); + + delete doc; + + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + QCOMPARE(doc->numPages(), 1); + + delete doc; +} + +void TestMetaData::checkDate() +{ + Poppler::Document *doc; + + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + QCOMPARE(doc->date(QStringLiteral("ModDate")), QDateTime(QDate(2005, 12, 5), QTime(9, 44, 46), Qt::UTC)); + QCOMPARE(doc->date(QStringLiteral("CreationDate")), QDateTime(QDate(2005, 8, 13), QTime(1, 12, 11), Qt::UTC)); + + delete doc; +} + +void TestMetaData::checkPageSize() +{ + Poppler::Document *doc; + + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + Poppler::Page *page = doc->page(0); + QCOMPARE(page->pageSize(), QSize(595, 842)); + QCOMPARE(page->pageSizeF(), QSizeF(595.22, 842)); + + delete page; + delete doc; +} + +void TestMetaData::checkLandscapeOrientation() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + Poppler::Page *page = doc->page(1); + QCOMPARE(page->orientation(), Poppler::Page::Landscape); + + delete page; + delete doc; +} + +void TestMetaData::checkUpsideDownOrientation() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + Poppler::Page *page = doc->page(2); + QCOMPARE(page->orientation(), Poppler::Page::UpsideDown); + + delete page; + delete doc; +} + +void TestMetaData::checkSeascapeOrientation() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + Poppler::Page *page = doc->page(3); + QCOMPARE(page->orientation(), Poppler::Page::Seascape); + + delete page; + delete doc; +} + +void TestMetaData::checkVersion() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/doublepage.pdf"); + QVERIFY(doc); + + auto pdfVersion = doc->getPdfVersion(); + QCOMPARE(pdfVersion.major, 1); + QCOMPARE(pdfVersion.minor, 6); + + delete doc; +} + +void TestMetaData::checkPdfId() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/A6EmbeddedFiles.pdf"); + QVERIFY(doc); + + const QByteArray referencePermanentId("00C9D5B6D8FB11D7A902003065D630AA"); + const QByteArray referenceUpdateId("39AECAE6D8FB11D7A902003065D630AA"); + + { + // no IDs wanted, just existance check + QVERIFY(doc->getPdfId(nullptr, nullptr)); + } + { + // only permanent ID + QByteArray permanentId; + QVERIFY(doc->getPdfId(&permanentId, nullptr)); + QCOMPARE(permanentId.toUpper(), referencePermanentId); + } + { + // only update ID + QByteArray updateId; + QVERIFY(doc->getPdfId(nullptr, &updateId)); + QCOMPARE(updateId.toUpper(), referenceUpdateId); + } + { + // both IDs + QByteArray permanentId; + QByteArray updateId; + QVERIFY(doc->getPdfId(&permanentId, &updateId)); + QCOMPARE(permanentId.toUpper(), referencePermanentId); + QCOMPARE(updateId.toUpper(), referenceUpdateId); + } + + delete doc; +} + +void TestMetaData::checkNoPdfId() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/WithActualText.pdf"); + QVERIFY(doc); + + QVERIFY(!doc->getPdfId(nullptr, nullptr)); + + delete doc; +} + +QTEST_GUILESS_MAIN(TestMetaData) +#include "check_metadata.moc" diff --git a/poppler-24.05.0/qt5/tests/check_object.cpp b/poppler-24.05.0/qt5/tests/check_object.cpp new file mode 100644 index 0000000000000000000000000000000000000000..cadc006e9464363505b50471ae8eabc9497793d6 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_object.cpp @@ -0,0 +1,41 @@ +#include +#include + +#include "poppler/Object.h" + +class TestObject : public QObject +{ + Q_OBJECT +public: + explicit TestObject(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void benchDefaultConstructor(); + void benchMoveConstructor(); + void benchSetToNull(); +}; + +void TestObject::benchDefaultConstructor() +{ + QBENCHMARK { + Object obj; + } +} + +void TestObject::benchMoveConstructor() +{ + QBENCHMARK { + Object src; + Object dst { std::move(src) }; + } +} + +void TestObject::benchSetToNull() +{ + Object obj; + QBENCHMARK { + obj.setToNull(); + } +} + +QTEST_GUILESS_MAIN(TestObject) +#include "check_object.moc" diff --git a/poppler-24.05.0/qt5/tests/check_optcontent.cpp b/poppler-24.05.0/qt5/tests/check_optcontent.cpp new file mode 100644 index 0000000000000000000000000000000000000000..9f3c68175c579d84ca278411500d2d72b3ff80cf --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_optcontent.cpp @@ -0,0 +1,451 @@ +#include + +#include "PDFDoc.h" +#include "GlobalParams.h" + +#include +#include + +class TestOptionalContent : public QObject +{ + Q_OBJECT +public: + explicit TestOptionalContent(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkVisPolicy(); + void checkNestedLayers(); + void checkNoOptionalContent(); + void checkIsVisible(); + void checkVisibilitySetting(); + void checkRadioButtons(); +}; + +void TestOptionalContent::checkVisPolicy() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/vis_policy_test.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasOptionalContent()); + + Poppler::OptContentModel *optContent = doc->optionalContentModel(); + QModelIndex index; + index = optContent->index(0, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("A")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Checked); + index = optContent->index(1, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("B")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Checked); + + delete doc; +} + +void TestOptionalContent::checkNestedLayers() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/NestedLayers.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasOptionalContent()); + + Poppler::OptContentModel *optContent = doc->optionalContentModel(); + QModelIndex index; + + index = optContent->index(0, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("Black Text and Green Snow")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Unchecked); + + index = optContent->index(1, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("Mountains and Image")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Checked); + + // This is a sub-item of "Mountains and Image" + QModelIndex subindex = optContent->index(0, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("Image")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Checked); + + index = optContent->index(2, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("Starburst")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Checked); + + index = optContent->index(3, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("Watermark")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Unchecked); + + delete doc; +} + +void TestOptionalContent::checkNoOptionalContent() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->hasOptionalContent(), false); + + delete doc; +} + +void TestOptionalContent::checkIsVisible() +{ + globalParams = std::make_unique(); + PDFDoc *doc = new PDFDoc(std::make_unique(TESTDATADIR "/unittestcases/vis_policy_test.pdf")); + QVERIFY(doc); + + OCGs *ocgs = doc->getOptContentConfig(); + QVERIFY(ocgs); + + XRef *xref = doc->getXRef(); + + Object obj; + + // In this test, both Ref(21,0) and Ref(2,0) are set to On + + // AnyOn, one element array: + // 22 0 obj<>endobj + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QVERIFY(ocgs->optContentIsVisible(&obj)); + + // Same again, looking for any leaks or dubious free()'s + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QVERIFY(ocgs->optContentIsVisible(&obj)); + + // AnyOff, one element array: + // 29 0 obj<>endobj + obj = xref->fetch(29, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOn, one element array: + // 36 0 obj<>endobj + obj = xref->fetch(36, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOff, one element array: + // 43 0 obj<>endobj + obj = xref->fetch(43, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AnyOn, multi-element array: + // 50 0 obj<>endobj + obj = xref->fetch(50, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AnyOff, multi-element array: + // 57 0 obj<>endobj + obj = xref->fetch(57, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOn, multi-element array: + // 64 0 obj<>endobj + obj = xref->fetch(64, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOff, multi-element array: + // 71 0 obj<>endobj + obj = xref->fetch(71, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + delete doc; + globalParams.reset(); +} + +void TestOptionalContent::checkVisibilitySetting() +{ + globalParams = std::make_unique(); + PDFDoc *doc = new PDFDoc(std::make_unique(TESTDATADIR "/unittestcases/vis_policy_test.pdf")); + QVERIFY(doc); + + OCGs *ocgs = doc->getOptContentConfig(); + QVERIFY(ocgs); + + XRef *xref = doc->getXRef(); + + Object obj; + + // In this test, both Ref(21,0) and Ref(28,0) start On, + // based on the file settings + Object ref21obj(Ref { 21, 0 }); + Ref ref21 = ref21obj.getRef(); + OptionalContentGroup *ocgA = ocgs->findOcgByRef(ref21); + QVERIFY(ocgA); + + QVERIFY((ocgA->getName()->cmp("A")) == 0); + QCOMPARE(ocgA->getState(), OptionalContentGroup::On); + + Object ref28obj(Ref { 28, 0 }); + Ref ref28 = ref28obj.getRef(); + OptionalContentGroup *ocgB = ocgs->findOcgByRef(ref28); + QVERIFY(ocgB); + + QVERIFY((ocgB->getName()->cmp("B")) == 0); + QCOMPARE(ocgB->getState(), OptionalContentGroup::On); + + // turn one Off + ocgA->setState(OptionalContentGroup::Off); + + // AnyOn, one element array: + // 22 0 obj<>endobj + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // Same again, looking for any leaks or dubious free()'s + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AnyOff, one element array: + // 29 0 obj<>endobj + obj = xref->fetch(29, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOn, one element array: + // 36 0 obj<>endobj + obj = xref->fetch(36, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOff, one element array: + // 43 0 obj<>endobj + obj = xref->fetch(43, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AnyOn, multi-element array: + // 50 0 obj<>endobj + obj = xref->fetch(50, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AnyOff, multi-element array: + // 57 0 obj<>endobj + obj = xref->fetch(57, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOn, multi-element array: + // 64 0 obj<>endobj + obj = xref->fetch(64, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOff, multi-element array: + // 71 0 obj<>endobj + obj = xref->fetch(71, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // Turn the other one off as well (i.e. both are Off) + ocgB->setState(OptionalContentGroup::Off); + + // AnyOn, one element array: + // 22 0 obj<>endobj + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // Same again, looking for any leaks or dubious free()'s + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AnyOff, one element array: + // 29 0 obj<>endobj + obj = xref->fetch(29, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOn, one element array: + // 36 0 obj<>endobj + obj = xref->fetch(36, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOff, one element array: + // 43 0 obj<>endobj + obj = xref->fetch(43, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AnyOn, multi-element array: + // 50 0 obj<>endobj + obj = xref->fetch(50, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AnyOff, multi-element array: + // 57 0 obj<>endobj + obj = xref->fetch(57, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOn, multi-element array: + // 64 0 obj<>endobj + obj = xref->fetch(64, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOff, multi-element array: + // 71 0 obj<>endobj + obj = xref->fetch(71, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // Turn the first one on again (21 is On, 28 is Off) + ocgA->setState(OptionalContentGroup::On); + + // AnyOn, one element array: + // 22 0 obj<>endobj + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // Same again, looking for any leaks or dubious free()'s + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AnyOff, one element array: + // 29 0 obj<>endobj + obj = xref->fetch(29, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOn, one element array: + // 36 0 obj<>endobj + obj = xref->fetch(36, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOff, one element array: + // 43 0 obj<>endobj + obj = xref->fetch(43, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AnyOn, multi-element array: + // 50 0 obj<>endobj + obj = xref->fetch(50, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AnyOff, multi-element array: + // 57 0 obj<>endobj + obj = xref->fetch(57, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOn, multi-element array: + // 64 0 obj<>endobj + obj = xref->fetch(64, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOff, multi-element array: + // 71 0 obj<>endobj + obj = xref->fetch(71, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + delete doc; + globalParams.reset(); +} + +void TestOptionalContent::checkRadioButtons() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/ClarityOCGs.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasOptionalContent()); + + Poppler::OptContentModel *optContent = doc->optionalContentModel(); + QModelIndex index; + + index = optContent->index(0, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("Languages")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Unchecked); + + // These are sub-items of the "Languages" label + QModelIndex subindex = optContent->index(0, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("English")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Checked); + + subindex = optContent->index(1, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("French")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + + subindex = optContent->index(2, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("Japanese")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + + // RBGroup of languages, so turning on Japanese should turn off English + QVERIFY(optContent->setData(subindex, QVariant(true), Qt::CheckStateRole)); + + subindex = optContent->index(0, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("English")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + subindex = optContent->index(2, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("Japanese")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Checked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::On); + + subindex = optContent->index(1, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("French")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + // and turning on French should turn off Japanese + QVERIFY(optContent->setData(subindex, QVariant(true), Qt::CheckStateRole)); + + subindex = optContent->index(0, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("English")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + subindex = optContent->index(2, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("Japanese")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + subindex = optContent->index(1, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("French")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Checked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::On); + + // and turning off French should leave them all off + QVERIFY(optContent->setData(subindex, QVariant(false), Qt::CheckStateRole)); + + subindex = optContent->index(0, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("English")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + subindex = optContent->index(2, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("Japanese")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + subindex = optContent->index(1, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("French")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + delete doc; +} + +QTEST_GUILESS_MAIN(TestOptionalContent) + +#include "check_optcontent.moc" diff --git a/poppler-24.05.0/qt5/tests/check_outline.cpp b/poppler-24.05.0/qt5/tests/check_outline.cpp new file mode 100644 index 0000000000000000000000000000000000000000..92eb52967244c27db0c00dddcde1eca9f483c406 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_outline.cpp @@ -0,0 +1,50 @@ +#include + +#include + +#include + +class TestOutline : public QObject +{ + Q_OBJECT +public: + explicit TestOutline(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkOutline_xr02(); +}; + +void TestOutline::checkOutline_xr02() +{ + std::unique_ptr document { Poppler::Document::load(TESTDATADIR "/unittestcases/xr02.pdf") }; + QVERIFY(document.get()); + + const auto outline = document->outline(); + QCOMPARE(outline.size(), 2); + + const auto &foo = outline[0]; + QVERIFY(!foo.isNull()); + QCOMPARE(foo.name(), QStringLiteral("foo")); + QCOMPARE(foo.isOpen(), false); + const auto fooDest = foo.destination(); + QVERIFY(!fooDest.isNull()); + QCOMPARE(fooDest->pageNumber(), 1); + QVERIFY(foo.externalFileName().isEmpty()); + QVERIFY(foo.uri().isEmpty()); + QVERIFY(!foo.hasChildren()); + QVERIFY(foo.children().isEmpty()); + + const auto &bar = outline[1]; + QVERIFY(!bar.isNull()); + QCOMPARE(bar.name(), QStringLiteral("bar")); + QCOMPARE(bar.isOpen(), false); + const auto barDest = bar.destination(); + QVERIFY(!barDest.isNull()); + QCOMPARE(barDest->pageNumber(), 2); + QVERIFY(bar.externalFileName().isEmpty()); + QVERIFY(bar.uri().isEmpty()); + QVERIFY(!bar.hasChildren()); + QVERIFY(bar.children().isEmpty()); +} + +QTEST_GUILESS_MAIN(TestOutline) +#include "check_outline.moc" diff --git a/poppler-24.05.0/qt5/tests/check_overprint.cpp b/poppler-24.05.0/qt5/tests/check_overprint.cpp new file mode 100644 index 0000000000000000000000000000000000000000..c0d965a4ecf858cdd1f86fda32565f3f5a668c47 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_overprint.cpp @@ -0,0 +1,41 @@ +#include + +#include + +#include + +class TestOverprint : public QObject +{ + Q_OBJECT +public: + explicit TestOverprint(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkOverprintImageRendering(); +}; + +void TestOverprint::checkOverprintImageRendering() +{ + Poppler::Document *doc = Poppler::Document::load(TESTDATADIR "/tests/mask-seams.pdf"); + QVERIFY(doc); + + doc->setRenderHint(Poppler::Document::OverprintPreview, true); + + Poppler::Page *page = doc->page(0); + QVERIFY(page); + + constexpr int width = 600; + constexpr int height = 400; + + QImage img = page->renderToImage(300.0, 300.0, 0, 0, width, height); + QCOMPARE(img.format(), QImage::Format_RGB32); + QCOMPARE(img.width(), width); + QCOMPARE(img.height(), height); + QCOMPARE(img.bytesPerLine(), width * 4); + QCOMPARE(img.sizeInBytes(), width * height * 4); + + delete page; + delete doc; +} + +QTEST_GUILESS_MAIN(TestOverprint) +#include "check_overprint.moc" diff --git a/poppler-24.05.0/qt5/tests/check_pagelabelinfo.cpp b/poppler-24.05.0/qt5/tests/check_pagelabelinfo.cpp new file mode 100644 index 0000000000000000000000000000000000000000..3098bbf41f8288b38088e09129108f0cefd26152 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_pagelabelinfo.cpp @@ -0,0 +1,66 @@ +#include + +#include + +#include "PageLabelInfo_p.h" + +#include "config.h" + +class TestPageLabelInfo : public QObject +{ + Q_OBJECT +public: + explicit TestPageLabelInfo(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testFromDecimal(); + void testFromDecimalUnicode(); + void testToRoman(); + void testFromRoman(); + void testToLatin(); + void testFromLatin(); +}; + +void TestPageLabelInfo::testFromDecimal() +{ + std::string str { "2342" }; + const auto res = fromDecimal(str, false); + QCOMPARE(res.first, 2342); + QCOMPARE(res.second, true); +} + +void TestPageLabelInfo::testFromDecimalUnicode() +{ + std::unique_ptr str(Poppler::QStringToUnicodeGooString(QString::fromLocal8Bit("2342"))); + const auto res = fromDecimal(str->toStr(), hasUnicodeByteOrderMark(str->toStr())); + QCOMPARE(res.first, 2342); + QCOMPARE(res.second, true); +} + +void TestPageLabelInfo::testToRoman() +{ + GooString str; + toRoman(177, &str, false); + QCOMPARE(str.c_str(), "clxxvii"); +} + +void TestPageLabelInfo::testFromRoman() +{ + GooString roman("clxxvii"); + QCOMPARE(fromRoman(roman.c_str()), 177); +} + +void TestPageLabelInfo::testToLatin() +{ + GooString str; + toLatin(54, &str, false); + QCOMPARE(str.c_str(), "bbb"); +} + +void TestPageLabelInfo::testFromLatin() +{ + GooString latin("ddd"); + QCOMPARE(fromLatin(latin.c_str()), 56); +} + +QTEST_GUILESS_MAIN(TestPageLabelInfo) +#include "check_pagelabelinfo.moc" diff --git a/poppler-24.05.0/qt5/tests/check_pagelayout.cpp b/poppler-24.05.0/qt5/tests/check_pagelayout.cpp new file mode 100644 index 0000000000000000000000000000000000000000..3c134d6ad0c3cd343dc2ccb54a7cf0a20b2c8846 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_pagelayout.cpp @@ -0,0 +1,50 @@ +#include + +#include + +class TestPageLayout : public QObject +{ + Q_OBJECT +public: + explicit TestPageLayout(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkNone(); + void checkSingle(); + void checkFacing(); +}; + +void TestPageLayout::checkNone() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseNone.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageLayout(), Poppler::Document::NoLayout); + + delete doc; +} + +void TestPageLayout::checkSingle() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/FullScreen.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageLayout(), Poppler::Document::SinglePage); + + delete doc; +} + +void TestPageLayout::checkFacing() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/doublepage.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageLayout(), Poppler::Document::TwoPageRight); + + delete doc; +} + +QTEST_GUILESS_MAIN(TestPageLayout) +#include "check_pagelayout.moc" diff --git a/poppler-24.05.0/qt5/tests/check_pagemode.cpp b/poppler-24.05.0/qt5/tests/check_pagemode.cpp new file mode 100644 index 0000000000000000000000000000000000000000..78cbc0cd387a346f081c7dd8f21ff045d863e6b1 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_pagemode.cpp @@ -0,0 +1,74 @@ +#include + +#include + +class TestPageMode : public QObject +{ + Q_OBJECT +public: + explicit TestPageMode(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkNone(); + void checkFullScreen(); + void checkAttachments(); + void checkThumbs(); + void checkOC(); +}; + +void TestPageMode::checkNone() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseNone.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageMode(), Poppler::Document::UseNone); + + delete doc; +} + +void TestPageMode::checkFullScreen() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/FullScreen.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageMode(), Poppler::Document::FullScreen); + + delete doc; +} + +void TestPageMode::checkAttachments() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseAttachments.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageMode(), Poppler::Document::UseAttach); + + delete doc; +} + +void TestPageMode::checkThumbs() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseThumbs.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageMode(), Poppler::Document::UseThumbs); + + delete doc; +} + +void TestPageMode::checkOC() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseOC.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageMode(), Poppler::Document::UseOC); + + delete doc; +} + +QTEST_GUILESS_MAIN(TestPageMode) +#include "check_pagemode.moc" diff --git a/poppler-24.05.0/qt5/tests/check_password.cpp b/poppler-24.05.0/qt5/tests/check_password.cpp new file mode 100644 index 0000000000000000000000000000000000000000..b58fe1cf8254e778addbb3ca0ec11e9387651ba5 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_password.cpp @@ -0,0 +1,128 @@ +#include + +#include + +class TestPassword : public QObject +{ + Q_OBJECT +public: + explicit TestPassword(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void password1(); + void password1a(); + void password2(); + void password2a(); + void password2b(); + void password3(); + void password4(); + void password4b(); + void password5(); +}; + +// BUG:4557 +void TestPassword::password1() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - open.pdf"), "", QString::fromUtf8("garçon").toLatin1()); // clazy:exclude=qstring-allocations + QVERIFY(doc); + QVERIFY(!doc->isLocked()); + + delete doc; +} + +void TestPassword::password1a() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - open.pdf")); // clazy:exclude=qstring-allocations + QVERIFY(doc); + QVERIFY(doc->isLocked()); + QVERIFY(!doc->unlock("", QString::fromUtf8("garçon").toLatin1())); // clazy:exclude=qstring-allocations + QVERIFY(!doc->isLocked()); + + delete doc; +} + +void TestPassword::password2() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - owner.pdf"), QString::fromUtf8("garçon").toLatin1(), ""); // clazy:exclude=qstring-allocations + QVERIFY(doc); + QVERIFY(!doc->isLocked()); + + delete doc; +} + +void TestPassword::password2a() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - owner.pdf"), QString::fromUtf8("garçon").toLatin1()); // clazy:exclude=qstring-allocations + QVERIFY(doc); + QVERIFY(!doc->isLocked()); + + delete doc; +} + +void TestPassword::password2b() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - owner.pdf")); + QVERIFY(doc); + QVERIFY(!doc->isLocked()); + QVERIFY(!doc->unlock(QString::fromUtf8("garçon").toLatin1(), "")); // clazy:exclude=qstring-allocations + QVERIFY(!doc->isLocked()); + + delete doc; +} + +void TestPassword::password3() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/PasswordEncrypted.pdf")); + QVERIFY(doc); + QVERIFY(doc->isLocked()); + QVERIFY(!doc->unlock("", "password")); + QVERIFY(!doc->isLocked()); + + delete doc; +} + +// issue 690 +void TestPassword::password4() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/encrypted-256.pdf")); + QVERIFY(doc); + QVERIFY(doc->isLocked()); + QVERIFY(!doc->unlock("owner-secret", "")); + QVERIFY(!doc->isLocked()); + + delete doc; +} + +// issue 690 +void TestPassword::password4b() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/encrypted-256.pdf")); + QVERIFY(doc); + QVERIFY(doc->isLocked()); + QVERIFY(!doc->unlock("", "user-secret")); + QVERIFY(!doc->isLocked()); + + delete doc; +} + +void TestPassword::password5() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/PasswordEncryptedReconstructed.pdf")); + QVERIFY(doc); + QVERIFY(doc->isLocked()); + QVERIFY(!doc->unlock("", "test")); + QVERIFY(!doc->isLocked()); + + delete doc; +} + +QTEST_GUILESS_MAIN(TestPassword) +#include "check_password.moc" diff --git a/poppler-24.05.0/qt5/tests/check_permissions.cpp b/poppler-24.05.0/qt5/tests/check_permissions.cpp new file mode 100644 index 0000000000000000000000000000000000000000..d6ea7b4f701f3b787fbfde1e01cff34a96069855 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_permissions.cpp @@ -0,0 +1,45 @@ +#include + +#include + +class TestPermissions : public QObject +{ + Q_OBJECT +public: + explicit TestPermissions(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void permissions1(); +}; + +void TestPermissions::permissions1() +{ + Poppler::Document *doc; + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + // we are allowed to print + QVERIFY(doc->okToPrint()); + + // we are not allowed to change + QVERIFY(!(doc->okToChange())); + + // we are not allowed to copy or extract content + QVERIFY(!(doc->okToCopy())); + + // we are not allowed to print at high resolution + QVERIFY(!(doc->okToPrintHighRes())); + + // we are not allowed to fill forms + QVERIFY(!(doc->okToFillForm())); + + // we are allowed to extract content for accessibility + QVERIFY(doc->okToExtractForAccessibility()); + + // we are allowed to assemble this document + QVERIFY(doc->okToAssemble()); + + delete doc; +} + +QTEST_GUILESS_MAIN(TestPermissions) +#include "check_permissions.moc" diff --git a/poppler-24.05.0/qt5/tests/check_search.cpp b/poppler-24.05.0/qt5/tests/check_search.cpp new file mode 100644 index 0000000000000000000000000000000000000000..d93e851e485b75dcf37686282f7e726fb80e235f --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_search.cpp @@ -0,0 +1,403 @@ +#include + +#include + +// clazy:excludeall=qstring-allocations + +class TestSearch : public QObject +{ + Q_OBJECT +public: + explicit TestSearch(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testAcrossLinesSearch(); // leave it first + void testAcrossLinesSearchDoubleColumn(); + void bug7063(); + void testNextAndPrevious(); + void testWholeWordsOnly(); + void testIgnoreDiacritics(); + void testRussianSearch(); // Issue #743 + void testDeseretSearch(); // Issue #853 +}; + +void TestSearch::bug7063() +{ + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/bug7063.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + double rectLeft = 0.0, rectTop = 0.0, rectRight = page->pageSizeF().width(), rectBottom = page->pageSizeF().height(); + + QCOMPARE(page->search(QStringLiteral(u"non-ascii:"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + + QCOMPARE(page->search(QStringLiteral(u"Ascii"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), false); + QCOMPARE(page->search(QStringLiteral(u"Ascii"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::IgnoreCase), true); + + QCOMPARE(page->search(QStringLiteral(u"latin1:"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), false); + + QCOMPARE(page->search(QString::fromUtf8("é"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QCOMPARE(page->search(QString::fromUtf8("à"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QCOMPARE(page->search(QString::fromUtf8("ç"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QCOMPARE(page->search(QString::fromUtf8("search \"é\", \"à\" or \"ç\""), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QCOMPARE(page->search(QString::fromUtf8("¥µ©"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QCOMPARE(page->search(QString::fromUtf8("¥©"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), false); + + QCOMPARE(page->search(QStringLiteral(u"non-ascii:"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + + QCOMPARE(page->search(QStringLiteral(u"Ascii"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), false); + QCOMPARE(page->search(QStringLiteral(u"Ascii"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::IgnoreCase), true); + + QCOMPARE(page->search(QStringLiteral(u"latin1:"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), false); + + QCOMPARE(page->search(QString::fromUtf8("é"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QCOMPARE(page->search(QString::fromUtf8("à"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QCOMPARE(page->search(QString::fromUtf8("ç"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QCOMPARE(page->search(QString::fromUtf8("search \"é\", \"à\" or \"ç\""), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QCOMPARE(page->search(QString::fromUtf8("¥µ©"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QCOMPARE(page->search(QString::fromUtf8("¥©"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), false); +} + +void TestSearch::testNextAndPrevious() +{ + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/xr01.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + double rectLeft = 0.0, rectTop = 0.0, rectRight = page->pageSizeF().width(), rectBottom = page->pageSizeF().height(); + + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), true); + QVERIFY(qAbs(rectLeft - 171.46) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 139.81) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), true); + QVERIFY(qAbs(rectLeft - 171.46) < 0.01); + QVERIFY(qAbs(rectTop - 139.81) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), false); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 139.81) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), true); + QVERIFY(qAbs(rectLeft - 171.46) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), false); + + rectLeft = 0.0, rectTop = 0.0, rectRight = page->pageSizeF().width(), rectBottom = page->pageSizeF().height(); + + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), true); + QVERIFY(qAbs(rectLeft - 171.46) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 139.81) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), true); + QVERIFY(qAbs(rectLeft - 171.46) < 0.01); + QVERIFY(qAbs(rectTop - 139.81) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), false); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 139.81) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), true); + QVERIFY(qAbs(rectLeft - 171.46) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral(u"is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), false); +} + +void TestSearch::testWholeWordsOnly() +{ + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/WithActualText.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + const Poppler::Page::SearchDirection direction = Poppler::Page::FromTop; + + const Poppler::Page::SearchFlags mode0 = nullptr; + const Poppler::Page::SearchFlags mode1 = Poppler::Page::IgnoreCase; + const Poppler::Page::SearchFlags mode2 = Poppler::Page::WholeWords; + const Poppler::Page::SearchFlags mode3 = Poppler::Page::IgnoreCase | Poppler::Page::WholeWords; + + double left, top, right, bottom; + + QCOMPARE(page->search(QStringLiteral(u"brown"), left, top, right, bottom, direction, mode0), true); + QCOMPARE(page->search(QStringLiteral(u"brOwn"), left, top, right, bottom, direction, mode0), false); + + QCOMPARE(page->search(QStringLiteral(u"brOwn"), left, top, right, bottom, direction, mode1), true); + QCOMPARE(page->search(QStringLiteral(u"brawn"), left, top, right, bottom, direction, mode1), false); + + QCOMPARE(page->search(QStringLiteral(u"brown"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral(u"own"), left, top, right, bottom, direction, mode2), false); + + QCOMPARE(page->search(QStringLiteral(u"brOwn"), left, top, right, bottom, direction, mode3), true); + QCOMPARE(page->search(QStringLiteral(u"Own"), left, top, right, bottom, direction, mode3), false); +} + +void TestSearch::testIgnoreDiacritics() +{ + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/Issue637.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + const Poppler::Page::SearchDirection direction = Poppler::Page::FromTop; + + const Poppler::Page::SearchFlags mode0 = nullptr; + const Poppler::Page::SearchFlags mode1 = Poppler::Page::IgnoreDiacritics; + const Poppler::Page::SearchFlags mode2 = Poppler::Page::IgnoreDiacritics | Poppler::Page::IgnoreCase; + const Poppler::Page::SearchFlags mode3 = Poppler::Page::IgnoreDiacritics | Poppler::Page::IgnoreCase | Poppler::Page::WholeWords; + const Poppler::Page::SearchFlags mode4 = Poppler::Page::IgnoreCase | Poppler::Page::WholeWords; + + double left, top, right, bottom; + + // Test pdf (Issue637.pdf) just contains the following three lines: + // La cigüeña voló sobre nuestras cabezas. + // La cigogne a survolé nos têtes. + // Der Storch flog über unsere Köpfe hinweg. + + QCOMPARE(page->search(QString(), left, top, right, bottom, direction, mode0), false); + QCOMPARE(page->search(QStringLiteral("ciguena"), left, top, right, bottom, direction, mode0), false); + QCOMPARE(page->search(QStringLiteral("Ciguena"), left, top, right, bottom, direction, mode1), false); + QCOMPARE(page->search(QStringLiteral("ciguena"), left, top, right, bottom, direction, mode1), true); + QCOMPARE(page->search(QString::fromUtf8("cigüeña"), left, top, right, bottom, direction, mode1), true); + QCOMPARE(page->search(QString::fromUtf8("cigüena"), left, top, right, bottom, direction, mode1), false); + QCOMPARE(page->search(QString::fromUtf8("Cigüeña"), left, top, right, bottom, direction, mode1), false); + QCOMPARE(page->search(QStringLiteral("Ciguena"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("ciguena"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("Ciguena"), left, top, right, bottom, direction, mode3), true); + QCOMPARE(page->search(QStringLiteral("ciguena"), left, top, right, bottom, direction, mode3), true); + + QCOMPARE(page->search(QString::fromUtf8("cigüeña"), left, top, right, bottom, direction, mode4), true); + QCOMPARE(page->search(QString::fromUtf8("Cigüeña"), left, top, right, bottom, direction, mode4), true); + QCOMPARE(page->search(QString::fromUtf8("cigüena"), left, top, right, bottom, direction, mode4), false); + QCOMPARE(page->search(QStringLiteral("Ciguena"), left, top, right, bottom, direction, mode4), false); + + QCOMPARE(page->search(QStringLiteral("kopfe"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("kopfe"), left, top, right, bottom, direction, mode3), true); + QCOMPARE(page->search(QStringLiteral("uber"), left, top, right, bottom, direction, mode0), false); + QCOMPARE(page->search(QStringLiteral("uber"), left, top, right, bottom, direction, mode1), true); + QCOMPARE(page->search(QStringLiteral("uber"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("uber"), left, top, right, bottom, direction, mode3), true); + + QCOMPARE(page->search(QStringLiteral("vole"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("vole"), left, top, right, bottom, direction, mode3), false); + QCOMPARE(page->search(QStringLiteral("survole"), left, top, right, bottom, direction, mode3), true); + QCOMPARE(page->search(QStringLiteral("tete"), left, top, right, bottom, direction, mode3), false); + QCOMPARE(page->search(QStringLiteral("tete"), left, top, right, bottom, direction, mode2), true); + + QCOMPARE(page->search(QStringLiteral("La Ciguena Volo"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("Survole Nos Tetes"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("Uber Unsere Kopfe"), left, top, right, bottom, direction, mode2), true); +} + +void TestSearch::testRussianSearch() +{ + // Test for issue #743 + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/russian.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + const Poppler::Page::SearchDirection direction = Poppler::Page::FromTop; + + const Poppler::Page::SearchFlags mode0 = Poppler::Page::NoSearchFlags; + const Poppler::Page::SearchFlags mode1 = Poppler::Page::IgnoreDiacritics; + const Poppler::Page::SearchFlags mode2 = Poppler::Page::IgnoreDiacritics | Poppler::Page::IgnoreCase; + const Poppler::Page::SearchFlags mode0W = mode0 | Poppler::Page::WholeWords; + const Poppler::Page::SearchFlags mode1W = mode1 | Poppler::Page::WholeWords; + const Poppler::Page::SearchFlags mode2W = mode2 | Poppler::Page::WholeWords; + + double l, t, r, b; // left, top, right, bottom + + // In the searched page 5, these two words do exist: простой and Простой + const QString str = QString::fromUtf8("простой"); + QCOMPARE(page->search(str, l, t, r, b, direction, mode0), true); + QCOMPARE(page->search(str, l, t, r, b, direction, mode1), true); + QCOMPARE(page->search(str, l, t, r, b, direction, mode2), true); + QCOMPARE(page->search(str, l, t, r, b, direction, mode0W), true); + QCOMPARE(page->search(str, l, t, r, b, direction, mode1W), true); + QCOMPARE(page->search(str, l, t, r, b, direction, mode2W), true); +} + +void TestSearch::testDeseretSearch() +{ + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/deseret.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + double l, t, r, b; // left, top, right, bottom + + const QString str = QString::fromUtf8("𐐐𐐯𐑊𐐬"); + QCOMPARE(page->search(str, l, t, r, b, Poppler::Page::FromTop, Poppler::Page::NoSearchFlags), true); + + const QString str2 = QString::fromUtf8("𐐸𐐯𐑊𐐬"); + QCOMPARE(page->search(str2, l, t, r, b, Poppler::Page::FromTop, Poppler::Page::IgnoreCase), true); +} + +void TestSearch::testAcrossLinesSearch() +{ + // Test for searching across lines with new flag Poppler::Page::AcrossLines + // and its automatic features like ignoring hyphen at end of line or allowing + // whitespace in the search term to match on newline character. + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/searchAcrossLines.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(1)); + QVERIFY(page); + + const Poppler::Page::SearchDirection direction = Poppler::Page::FromTop; + + const Poppler::Page::SearchFlags empty = Poppler::Page::NoSearchFlags; + const Poppler::Page::SearchFlags mode0 = Poppler::Page::AcrossLines; + const Poppler::Page::SearchFlags mode1 = Poppler::Page::AcrossLines | Poppler::Page::IgnoreDiacritics; + const Poppler::Page::SearchFlags mode2 = Poppler::Page::AcrossLines | Poppler::Page::IgnoreDiacritics | Poppler::Page::IgnoreCase; + const Poppler::Page::SearchFlags mode2W = mode2 | Poppler::Page::WholeWords; + + double l, t, r, b; // left, top, right, bottom + + // In the searched page, each of "re-conocimiento" "PRUE-BA" "imáge-nes" happen split across lines + const QString str1 = QString::fromUtf8("reconocimiento"); + const QString str2 = QString::fromUtf8("IMagenes"); + // Test it cannot be found with empty search flags + QCOMPARE(page->search(str1, l, t, r, b, direction, empty), false); + // Test it is found with AcrossLines option + QCOMPARE(page->search(str1, l, t, r, b, direction, mode0), true); + // Test AcrossLines with IgnoreDiacritics and IgnoreCase options + QCOMPARE(page->search(str2, l, t, r, b, direction, mode0), false); + QCOMPARE(page->search(str2, l, t, r, b, direction, mode1), false); + QCOMPARE(page->search(str2, l, t, r, b, direction, mode2), true); + // Test with WholeWords too + QCOMPARE(page->search(str2, l, t, r, b, direction, mode2W), true); + + // Now test that AcrossLines also allows whitespace in the search term to match on newline char. + // In the searched page, "podrá" ends a line and "acordar" starts the next line, so we + // now test we match it with "podrá acordar" + const QString str3 = QString::fromUtf8("podrá acordar,"); + QCOMPARE(page->search(str3, l, t, r, b, direction, mode0), true); + QCOMPARE(page->search(str3, l, t, r, b, direction, mode1), true); + QCOMPARE(page->search(str3, l, t, r, b, direction, mode2), true); + QCOMPARE(page->search(str3, l, t, r, b, direction, mode2W), true); + // now test it also works with IgnoreDiacritics and IgnoreCase + const QString str4 = QString::fromUtf8("PODRA acordar"); + QCOMPARE(page->search(str4, l, t, r, b, direction, mode0), false); + QCOMPARE(page->search(str4, l, t, r, b, direction, mode1), false); + QCOMPARE(page->search(str4, l, t, r, b, direction, mode2), true); + QCOMPARE(page->search(str4, l, t, r, b, direction, mode2W), false); // false as it lacks ending comma + + // Now test that when a hyphen char in the search term matches a hyphen at end of line, + // then we don't automatically ignore it, but treat it as a normal char. + // In the searched page, "CC BY-NC-SA 4.0" is split across two lines on the second hyphen + const QString str5 = QString::fromUtf8("CC BY-NC-SA 4.0"); + QScopedPointer page0(document->page(0)); + QVERIFY(page0); + QCOMPARE(page0->search(str5, l, t, r, b, direction, mode0), true); + QCOMPARE(page0->search(str5, l, t, r, b, direction, mode1), true); + QCOMPARE(page0->search(str5, l, t, r, b, direction, mode2), true); + QCOMPARE(page0->search(str5, l, t, r, b, direction, mode2W), true); + QCOMPARE(page0->search(QString::fromUtf8("NC-SA"), l, t, r, b, direction, mode2W), false); + // Searching for "CC BY-NCSA 4.0" should also match, because hyphen is now ignored at end of line + const QString str6 = QString::fromUtf8("CC BY-NCSA 4.0"); + QCOMPARE(page0->search(str6, l, t, r, b, direction, mode0), true); + QCOMPARE(page0->search(str6, l, t, r, b, direction, mode1), true); + QCOMPARE(page0->search(str6, l, t, r, b, direction, mode2), true); + QCOMPARE(page0->search(str6, l, t, r, b, direction, mode2W), true); + // Check for the case when next line falls in next paragraph. Issue #1475 + const QString across_block = QString::fromUtf8("emacs jose"); // clazy:exclude=qstring-allocations + QCOMPARE(page0->search(across_block, l, t, r, b, direction, empty), false); + QCOMPARE(page0->search(across_block, l, t, r, b, direction, mode0), false); + QCOMPARE(page0->search(across_block, l, t, r, b, direction, mode1), false); + QCOMPARE(page0->search(across_block, l, t, r, b, direction, mode2), true); + QCOMPARE(page0->search(across_block, l, t, r, b, direction, mode2W), true); + + // Now for completeness, we will match the full text of two lines + const QString full2lines = QString::fromUtf8("Las pruebas se practicarán en vista pública, si bien, excepcionalmente, el Tribunal podrá acordar, mediante providencia, que determinadas pruebas se celebren fuera del acto de juicio"); + QCOMPARE(page->search(full2lines, l, t, r, b, direction, mode0), true); + QCOMPARE(page->search(full2lines, l, t, r, b, direction, mode1), true); + QCOMPARE(page->search(full2lines, l, t, r, b, direction, mode2), true); + QCOMPARE(page->search(full2lines, l, t, r, b, direction, mode2W), true); + // And now the full text of two lines split by a hyphenated word + const QString full2linesHyphenated = QString::fromUtf8("Consiste básicamente en información digitalizada, codificados y alojados en un elemento contenedor digital (equipos, dispositivos periféricos, unidades de memoria, unidades " + "virtualizadas, tramas"); + QCOMPARE(page->search(full2linesHyphenated, l, t, r, b, direction, mode0), true); + QCOMPARE(page->search(full2linesHyphenated, l, t, r, b, direction, mode1), true); + QCOMPARE(page->search(full2linesHyphenated, l, t, r, b, direction, mode2), true); + QCOMPARE(page->search(full2linesHyphenated, l, t, r, b, direction, mode2W), true); + + // BUG about false positives at start of a line. + const QString bug_str = QString::fromUtf8("nes y"); // clazy:exclude=qstring-allocations + // there's only 1 match, check for that + QCOMPARE(page->search(bug_str, mode2).size(), 1); +} + +void TestSearch::testAcrossLinesSearchDoubleColumn() +{ + // Test for searching across lines with new flag Poppler::Page::AcrossLines + // in a document with two columns of text. + QScopedPointer document(Poppler::Document::load(TESTDATADIR "/unittestcases/searchAcrossLinesDoubleColumn.pdf")); + QVERIFY(document); + + QScopedPointer page(document->page(0)); + QVERIFY(page); + + const Poppler::Page::SearchFlags mode = Poppler::Page::AcrossLines | Poppler::Page::IgnoreDiacritics | Poppler::Page::IgnoreCase; + + // Test for a bug in double column documents where single line matches are + // wrongly returned as being multiline matches. + const QString bug_str = QString::fromUtf8("betw"); // clazy:exclude=qstring-allocations + + // there's only 3 matches for 'betw' in document, where only the last + // one is a multiline match, so that's a total of 4 rects returned + QCOMPARE(page->search(bug_str, mode).size(), 4); +} + +QTEST_GUILESS_MAIN(TestSearch) +#include "check_search.moc" diff --git a/poppler-24.05.0/qt5/tests/check_signature_basics.cpp b/poppler-24.05.0/qt5/tests/check_signature_basics.cpp new file mode 100644 index 0000000000000000000000000000000000000000..2612c0bd50e757472d0efd9cef172f394bb3d9a5 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_signature_basics.cpp @@ -0,0 +1,181 @@ +//======================================================================== +// +// check_signature_basics.cpp +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +//======================================================================== + +// Simple tests of reading signatures +// +// Note that this does not check the actual validity because +// that will have an expiry date, and adding time bombs to unit tests is +// probably not a good idea. +#include +#include "PDFDoc.h" +#include "GlobalParams.h" +#include "SignatureInfo.h" +#include "CryptoSignBackend.h" +#include "config.h" + +class TestSignatureBasics : public QObject +{ + Q_OBJECT +public: + explicit TestSignatureBasics(QObject *parent = nullptr) : QObject(parent) { } + +private: + std::unique_ptr doc; +private Q_SLOTS: + void init(); + void initTestCase_data(); + void initTestCase() { } + void cleanupTestCase(); + void testSignatureCount(); + void testSignatureSizes(); + void testSignerInfo(); // names and stuff + void testSignedRanges(); +}; + +Q_DECLARE_METATYPE(CryptoSign::Backend::Type); + +void TestSignatureBasics::init() +{ +#ifdef ENABLE_SIGNATURES + QFETCH_GLOBAL(CryptoSign::Backend::Type, backend); + CryptoSign::Factory::setPreferredBackend(backend); + QCOMPARE(CryptoSign::Factory::getActive(), backend); +#endif + + globalParams = std::make_unique(); + doc = std::make_unique(std::make_unique(TESTDATADIR "/unittestcases/pdf-signature-sample-2sigs.pdf")); + QVERIFY(doc); + QVERIFY(doc->isOk()); +} + +void TestSignatureBasics::initTestCase_data() +{ + QTest::addColumn("backend"); + +#ifdef ENABLE_SIGNATURES + const auto availableBackends = CryptoSign::Factory::getAvailable(); + +# ifdef ENABLE_NSS3 + if (std::find(availableBackends.begin(), availableBackends.end(), CryptoSign::Backend::Type::NSS3) != availableBackends.end()) { + QTest::newRow("nss") << CryptoSign::Backend::Type::NSS3; + } else { + QWARN("Compiled with NSS3, but NSS not functional"); + } +# endif +# ifdef ENABLE_GPGME + if (std::find(availableBackends.begin(), availableBackends.end(), CryptoSign::Backend::Type::GPGME) != availableBackends.end()) { + QTest::newRow("gpg") << CryptoSign::Backend::Type::GPGME; + } else { + QWARN("Compiled with GPGME, but GPGME not functional"); + } +# endif +#endif +} + +void TestSignatureBasics::cleanupTestCase() +{ + globalParams.reset(); +} + +void TestSignatureBasics::testSignatureCount() +{ + QVERIFY(doc); + auto signatureFields = doc->getSignatureFields(); + QCOMPARE(signatureFields.size(), 4); + // count active signatures + QVERIFY(signatureFields[0]->getSignature()); + QVERIFY(signatureFields[1]->getSignature()); + QVERIFY(!signatureFields[2]->getSignature()); + QVERIFY(!signatureFields[3]->getSignature()); +} + +void TestSignatureBasics::testSignatureSizes() +{ + auto signatureFields = doc->getSignatureFields(); + // These are not the actual signature lengths, but rather + // the length of the signature field, which is likely + // a padded field. At least the pdf specification suggest to pad + // the field. + // Poppler before 23.04 did not have a padded field, later versions do. + QCOMPARE(signatureFields[0]->getSignature()->getLength(), 10230); // Signature data size is 2340 + QCOMPARE(signatureFields[1]->getSignature()->getLength(), 10196); // Signature data size is 2340 +} + +void TestSignatureBasics::testSignerInfo() +{ + auto signatureFields = doc->getSignatureFields(); + QCOMPARE(signatureFields[0]->getCreateWidget()->getField()->getFullyQualifiedName()->toStr(), std::string { "P2.AnA_Signature0_B_" }); + QCOMPARE(signatureFields[0]->getSignatureType(), ETSI_CAdES_detached); + auto siginfo0 = signatureFields[0]->validateSignatureAsync(false, false, -1 /* now */, false, false, {}); + signatureFields[0]->validateSignatureResult(); +#ifdef ENABLE_SIGNATURES + QCOMPARE(siginfo0->getSignerName(), std::string { "Koch, Werner" }); + QCOMPARE(siginfo0->getHashAlgorithm(), HashAlgorithm::Sha256); + QCOMPARE(siginfo0->getCertificateInfo()->getPublicKeyInfo().publicKeyStrength, 2048 / 8); +#else + QCOMPARE(siginfo0->getSignerName(), std::string {}); + QCOMPARE(siginfo0->getHashAlgorithm(), HashAlgorithm::Unknown); +#endif + QCOMPARE(siginfo0->getSigningTime(), time_t(1677570911)); + + QCOMPARE(signatureFields[1]->getCreateWidget()->getField()->getFullyQualifiedName()->toStr(), std::string { "P2.AnA_Signature1_B_" }); + QCOMPARE(signatureFields[1]->getSignatureType(), ETSI_CAdES_detached); + auto siginfo1 = signatureFields[1]->validateSignatureAsync(false, false, -1 /* now */, false, false, {}); + signatureFields[1]->validateSignatureResult(); +#ifdef ENABLE_SIGNATURES + QCOMPARE(siginfo1->getSignerName(), std::string { "Koch, Werner" }); + QCOMPARE(siginfo1->getHashAlgorithm(), HashAlgorithm::Sha256); + QFETCH_GLOBAL(CryptoSign::Backend::Type, backend); + if (backend == CryptoSign::Backend::Type::GPGME) { + QCOMPARE(siginfo1->getCertificateInfo()->getPublicKeyInfo().publicKeyStrength, 2048 / 8); + } else if (backend == CryptoSign::Backend::Type::NSS3) { + // Not fully sure why it is zero here, but it seems to be. + QCOMPARE(siginfo1->getCertificateInfo()->getPublicKeyInfo().publicKeyStrength, 0); + } +#else + QCOMPARE(siginfo1->getSignerName(), std::string {}); + QCOMPARE(siginfo1->getHashAlgorithm(), HashAlgorithm::Unknown); +#endif + QCOMPARE(siginfo1->getSigningTime(), time_t(1677840601)); + + QCOMPARE(signatureFields[2]->getCreateWidget()->getField()->getFullyQualifiedName()->toStr(), std::string { "P2.AnA_Signature2_B_" }); + QCOMPARE(signatureFields[2]->getSignatureType(), unsigned_signature_field); + QCOMPARE(signatureFields[3]->getCreateWidget()->getField()->getFullyQualifiedName()->toStr(), std::string { "P2.AnA_Signature3_B_" }); + QCOMPARE(signatureFields[3]->getSignatureType(), unsigned_signature_field); +} + +void TestSignatureBasics::testSignedRanges() +{ + auto signatureFields = doc->getSignatureFields(); + + Goffset size0; + auto sig0 = signatureFields[0]->getCheckedSignature(&size0); + QVERIFY(sig0); + auto ranges0 = signatureFields[0]->getSignedRangeBounds(); + QCOMPARE(ranges0.size(), 4); + QCOMPARE(ranges0[0], 0); + QCOMPARE(ranges0[1], 24890); + QCOMPARE(ranges0[2], 45352); + QCOMPARE(ranges0[3], 58529); + QVERIFY(ranges0[3] != size0); // signature does not cover all of it + + Goffset size1; + auto sig1 = signatureFields[1]->getCheckedSignature(&size1); + QVERIFY(sig1); + auto ranges1 = signatureFields[1]->getSignedRangeBounds(); + QCOMPARE(ranges1.size(), 4); + QCOMPARE(ranges1[0], 0); + QCOMPARE(ranges1[1], 59257); + QCOMPARE(ranges1[2], 79651); + QCOMPARE(ranges1[3], 92773); + QCOMPARE(ranges1[3], size1); // signature does cover all of it +} + +QTEST_GUILESS_MAIN(TestSignatureBasics) +#include "check_signature_basics.moc" diff --git a/poppler-24.05.0/qt5/tests/check_strings.cpp b/poppler-24.05.0/qt5/tests/check_strings.cpp new file mode 100644 index 0000000000000000000000000000000000000000..a9044db825f03417e10e717d8fee76496b506bb3 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_strings.cpp @@ -0,0 +1,245 @@ +/* + * Copyright (C) 2010, 2011, Pino Toscano + * Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, + * Copyright (C) 2024 Oliver Sander + * + * 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 + +#include +#include + +#include +#include + +Q_DECLARE_METATYPE(GooString *) +Q_DECLARE_METATYPE(Unicode *) + +class TestStrings : public QObject +{ + Q_OBJECT + +public: + explicit TestStrings(QObject *parent = nullptr) : QObject(parent) { } + +private slots: + void initTestCase(); + void cleanupTestCase(); + void check_unicodeToQString_data(); + void check_unicodeToQString(); + void check_UnicodeParsedString_data(); + void check_UnicodeParsedString(); + void check_QStringToUnicodeGooString_data(); + void check_QStringToUnicodeGooString(); + void check_QStringToGooString_data(); + void check_QStringToGooString(); + +private: + GooString *newGooString(const char *s); + GooString *newGooString(const char *s, int l); + + QVector m_gooStrings; +}; + +void TestStrings::initTestCase() +{ + qRegisterMetaType("GooString*"); + qRegisterMetaType("Unicode*"); + + globalParams = std::make_unique(); +} + +void TestStrings::cleanupTestCase() +{ + qDeleteAll(m_gooStrings); + + globalParams.reset(); +} + +void TestStrings::check_unicodeToQString_data() +{ + QTest::addColumn("data"); + QTest::addColumn("length"); + QTest::addColumn("result"); + + { + const int l = 1; + Unicode *u = new Unicode[l]; + u[0] = int('a'); + QTest::newRow("a") << u << l << QStringLiteral("a"); + } + { + const int l = 1; + Unicode *u = new Unicode[l]; + u[0] = 0x0161; + QTest::newRow("\u0161") << u << l << QStringLiteral("\u0161"); + } + { + const int l = 2; + Unicode *u = new Unicode[l]; + u[0] = int('a'); + u[1] = int('b'); + QTest::newRow("ab") << u << l << QStringLiteral("ab"); + } + { + const int l = 2; + Unicode *u = new Unicode[l]; + u[0] = int('a'); + u[1] = 0x0161; + QTest::newRow("a\u0161") << u << l << QStringLiteral("a\u0161"); + } + { + const int l = 2; + Unicode *u = new Unicode[l]; + u[0] = 0x5c01; + u[1] = 0x9762; + QTest::newRow("\xe5\xb0\x81\xe9\x9d\xa2") << u << l << QStringLiteral("封面"); + } + { + const int l = 3; + Unicode *u = new Unicode[l]; + u[0] = 0x5c01; + u[1] = 0x9762; + u[2] = 0x0; + QTest::newRow("\xe5\xb0\x81\xe9\x9d\xa2 + 0") << u << l << QStringLiteral("封面"); + } + { + const int l = 4; + Unicode *u = new Unicode[l]; + u[0] = 0x5c01; + u[1] = 0x9762; + u[2] = 0x0; + u[3] = 0x0; + QTest::newRow("\xe5\xb0\x81\xe9\x9d\xa2 + two 0") << u << l << QStringLiteral("封面"); + } +} + +void TestStrings::check_unicodeToQString() +{ + QFETCH(Unicode *, data); + QFETCH(int, length); + QFETCH(QString, result); + + QCOMPARE(Poppler::unicodeToQString(data, length), result); + + delete[] data; +} + +void TestStrings::check_UnicodeParsedString_data() +{ + QTest::addColumn("string"); + QTest::addColumn("result"); + + // non-unicode strings + QTest::newRow("") << newGooString("") << QString(); + QTest::newRow("a") << newGooString("a") << QStringLiteral("a"); + QTest::newRow("ab") << newGooString("ab") << QStringLiteral("ab"); + QTest::newRow("~") << newGooString("~") << QStringLiteral("~"); + QTest::newRow("test string") << newGooString("test string") << QStringLiteral("test string"); + + // unicode strings + QTest::newRow("") << newGooString("\xFE\xFF") << QString(); + QTest::newRow("U a") << newGooString("\xFE\xFF\0a", 4) << QStringLiteral("a"); + QTest::newRow("U ~") << newGooString("\xFE\xFF\0~", 4) << QStringLiteral("~"); + QTest::newRow("U aa") << newGooString("\xFE\xFF\0a\0a", 6) << QStringLiteral("aa"); + QTest::newRow("U \xC3\x9F") << newGooString("\xFE\xFF\0\xDF", 4) << QStringLiteral("ß"); + QTest::newRow("U \xC3\x9F\x61") << newGooString("\xFE\xFF\0\xDF\0\x61", 6) << QStringLiteral("ßa"); + QTest::newRow("U \xC5\xA1") << newGooString("\xFE\xFF\x01\x61", 4) << QStringLiteral("š"); + QTest::newRow("U \xC5\xA1\x61") << newGooString("\xFE\xFF\x01\x61\0\x61", 6) << QStringLiteral("ša"); + QTest::newRow("test string") << newGooString("\xFE\xFF\0t\0e\0s\0t\0 \0s\0t\0r\0i\0n\0g", 24) << QStringLiteral("test string"); + QTest::newRow("UTF16-LE") << newGooString("\xFF\xFE\xDA\x00\x6E\x00\xEE\x00\x63\x00\xF6\x00\x64\x00\xE9\x00\x51\x75", 18) << QStringLiteral("Únîcödé畑"); +} + +void TestStrings::check_UnicodeParsedString() +{ + QFETCH(GooString *, string); + QFETCH(QString, result); + + QCOMPARE(Poppler::UnicodeParsedString(string), result); +} + +void TestStrings::check_QStringToUnicodeGooString_data() +{ + QTest::addColumn("string"); + QTest::addColumn("result"); + + QTest::newRow("") << QString() << QByteArray(""); + QTest::newRow("") << QString(QLatin1String("")) << QByteArray(""); + QTest::newRow("a") << QStringLiteral("a") << QByteArray("\0a", 2); + QTest::newRow("ab") << QStringLiteral("ab") << QByteArray("\0a\0b", 4); + QTest::newRow("test string") << QStringLiteral("test string") << QByteArray("\0t\0e\0s\0t\0 \0s\0t\0r\0i\0n\0g", 22); + QTest::newRow("\xC3\x9F") << QStringLiteral("ß") << QByteArray("\0\xDF", 2); + QTest::newRow("\xC3\x9F\x61") << QStringLiteral("ßa") << QByteArray("\0\xDF\0\x61", 4); +} + +void TestStrings::check_QStringToUnicodeGooString() +{ + QFETCH(QString, string); + QFETCH(QByteArray, result); + + GooString *goo = Poppler::QStringToUnicodeGooString(string); + if (string.isEmpty()) { + QVERIFY(goo->toStr().empty()); + QCOMPARE(goo->getLength(), 0); + } else { + QVERIFY(hasUnicodeByteOrderMark(goo->toStr())); + QCOMPARE(goo->getLength(), string.length() * 2 + 2); + QCOMPARE(result, QByteArray::fromRawData(goo->c_str() + 2, goo->getLength() - 2)); + } + + delete goo; +} + +void TestStrings::check_QStringToGooString_data() +{ + QTest::addColumn("string"); + QTest::addColumn("result"); + + QTest::newRow("") << QString() << newGooString(""); + QTest::newRow("") << QString(QLatin1String("")) << newGooString(""); + QTest::newRow("a") << QStringLiteral("a") << newGooString("a"); + QTest::newRow("ab") << QStringLiteral("ab") << newGooString("ab"); +} + +void TestStrings::check_QStringToGooString() +{ + QFETCH(QString, string); + QFETCH(GooString *, result); + + GooString *goo = Poppler::QStringToGooString(string); + QCOMPARE(goo->c_str(), result->c_str()); + + delete goo; +} + +GooString *TestStrings::newGooString(const char *s) +{ + GooString *goo = new GooString(s); + m_gooStrings.append(goo); + return goo; +} + +GooString *TestStrings::newGooString(const char *s, int l) +{ + GooString *goo = new GooString(s, l); + m_gooStrings.append(goo); + return goo; +} + +QTEST_GUILESS_MAIN(TestStrings) + +#include "check_strings.moc" diff --git a/poppler-24.05.0/qt5/tests/check_stroke_opacity.cpp b/poppler-24.05.0/qt5/tests/check_stroke_opacity.cpp new file mode 100644 index 0000000000000000000000000000000000000000..50b4b7d79eef427f5c5cc3bee9fef517c8cd6668 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_stroke_opacity.cpp @@ -0,0 +1,96 @@ +#include + +#include +#include +#include + +#include + +// Unit tests for rendering axial shadings without full opacity +class TestStrokeOpacity : public QObject +{ + Q_OBJECT +public: + explicit TestStrokeOpacity(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkStrokeOpacity_data(); + void checkStrokeOpacity(); +}; + +void TestStrokeOpacity::checkStrokeOpacity_data() +{ + QTest::addColumn("backendType"); + + QTest::newRow("splash") << (int)Poppler::Document::SplashBackend; + QTest::newRow("qpainter") << (int)Poppler::Document::QPainterBackend; +} + +void TestStrokeOpacity::checkStrokeOpacity() +{ + QFETCH(int, backendType); + + auto doc = std::unique_ptr(Poppler::Document::load(TESTDATADIR "/unittestcases/stroke-alpha-pattern.pdf")); + QVERIFY(doc != nullptr); + + doc->setRenderBackend((Poppler::Document::RenderBackend)backendType); + + // BUG: For some reason splash gets the opacity wrong when antialiasing is switched off + if (backendType == (int)Poppler::Document::SplashBackend) { + doc->setRenderHint(Poppler::Document::Antialiasing, true); + } + + const auto page = std::unique_ptr(doc->page(0)); + QVERIFY(page != nullptr); + + // Render (at low resolution and with cropped marging) + QImage image = page->renderToImage(36, 36, 40, 50, 200, 230); + + // The actual tests start here + + // Allow a tolerance. + int tolerance; + auto approximatelyEqual = [&tolerance](QRgb c0, const QColor &c1) { + return std::abs(qAlpha(c0) - c1.alpha()) <= tolerance && std::abs(qRed(c0) - c1.red()) <= tolerance && std::abs(qGreen(c0) - c1.green()) <= tolerance && std::abs(qBlue(c0) - c1.blue()) <= tolerance; + }; + + // At the lower left of the test document is a square with an axial shading, + // which should be rendered with opacity 0.25. + // Check that with a sample pixel + auto pixel = image.pixel(70, 160); + + // Splash and QPainter backends implement shadings slightly differently, + // hence we cannot expect to get precisely the same colors. + tolerance = 2; + QVERIFY(approximatelyEqual(pixel, QColor(253, 233, 196, 255))); + + // At the upper left of the test document is a stroked square with an axial shading. + // This is implemented by filling a clip region defined by a stroke outline. + // Check whether the backend really only renders the stroke, not the region + // surrounded by the stroke. + auto pixelUpperLeftInterior = image.pixel(70, 70); + + tolerance = 0; + QVERIFY(approximatelyEqual(pixelUpperLeftInterior, Qt::white)); + + // Now check whether that stroke is semi-transparent. + // Bug https://gitlab.freedesktop.org/poppler/poppler/-/issues/178 + auto pixelUpperLeftOnStroke = image.pixel(70, 20); + + tolerance = 2; + QVERIFY(approximatelyEqual(pixelUpperLeftOnStroke, QColor(253, 233, 196, 255))); + + // At the upper right there is a semi-transparent stroked red square + // a) Make sure that the color is correct. + auto pixelUpperRightOnStroke = image.pixel(130, 20); + + tolerance = 0; + QVERIFY(approximatelyEqual(pixelUpperRightOnStroke, QColor(246, 196, 206, 255))); + + // b) Make sure that it is really stroked, not filled + auto pixelUpperRightInterior = image.pixel(130, 50); + QVERIFY(approximatelyEqual(pixelUpperRightInterior, Qt::white)); +} + +QTEST_GUILESS_MAIN(TestStrokeOpacity) + +#include "check_stroke_opacity.moc" diff --git a/poppler-24.05.0/qt5/tests/check_utf8document.cpp b/poppler-24.05.0/qt5/tests/check_utf8document.cpp new file mode 100644 index 0000000000000000000000000000000000000000..32c95f64477df80d4381b5f78838274e70ba1163 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_utf8document.cpp @@ -0,0 +1,58 @@ +#include + +#include "PDFDoc.h" +#include "GlobalParams.h" + +#include "Outline.h" +#include "poppler-private.h" + +class TestUtf8Document : public QObject +{ + Q_OBJECT +public: + explicit TestUtf8Document(QObject *parent = nullptr) : QObject(parent) { } +private Q_SLOTS: + void checkStrings(); +}; + +inline QString outlineItemTitle(OutlineItem *item) +{ + if (!item) { + return {}; + } + const std::vector &title = item->getTitle(); + return QString::fromUcs4(title.data(), title.size()); +} + +void TestUtf8Document::checkStrings() +{ + + globalParams = std::make_unique(); + auto doc = std::make_unique(std::make_unique(TESTDATADIR "/unittestcases/pdf20-utf8-test.pdf")); + QVERIFY(doc); + QVERIFY(doc->isOk()); + + QVERIFY(doc->getOptContentConfig() && doc->getOptContentConfig()->hasOCGs()); + + QCOMPARE(Poppler::UnicodeParsedString(doc->getDocInfoTitle().get()), QString::fromUtf8("表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀")); // clazy:exclude=qstring-allocations + + QSet expectedNames { QString::fromUtf8("گچپژ"), QString::fromUtf8("Layer 1") }; // clazy:exclude=qstring-allocations + QSet foundNames; + + for (auto &[ref, group] : doc->getOptContentConfig()->getOCGs()) { + foundNames.insert(Poppler::UnicodeParsedString(group->getName())); + } + QCOMPARE(expectedNames, foundNames); + + auto outlineItems = doc->getOutline()->getItems(); + QVERIFY(outlineItems); + QCOMPARE(outlineItems->size(), 3); + + QCOMPARE(outlineItemTitle(outlineItems->at(0)), QString::fromUtf8("PDF 2.0 with UTF-8 test file")); // clazy:exclude=qstring-allocations + QCOMPARE(outlineItemTitle(outlineItems->at(1)), QStringLiteral(u"\u202A\u202Atest\u202A")); + QCOMPARE(outlineItemTitle(outlineItems->at(2)), QString::fromUtf8("🌈️\n" /*emoji rainbow flag*/)); // clazy:exclude=qstring-allocations +} + +QTEST_GUILESS_MAIN(TestUtf8Document) + +#include "check_utf8document.moc" diff --git a/poppler-24.05.0/qt5/tests/check_utf_conversion.cpp b/poppler-24.05.0/qt5/tests/check_utf_conversion.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ab1698831757a7b15536aa288ef5727bb84d241e --- /dev/null +++ b/poppler-24.05.0/qt5/tests/check_utf_conversion.cpp @@ -0,0 +1,195 @@ +#include +#include + +#include + +#include +#include // for uint16_t + +#include "GlobalParams.h" +#include "UnicodeTypeTable.h" +#include "UTF.h" + +class TestUTFConversion : public QObject +{ + Q_OBJECT +public: + explicit TestUTFConversion(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testUTF_data(); + void testUTF(); + void testUnicodeToAscii7(); + void testUnicodeLittleEndian(); +}; + +static bool compare(const char *a, const char *b) +{ + return strcmp(a, b) == 0; +} + +static bool compare(const uint16_t *a, const uint16_t *b) +{ + while (*a && *b) { + if (*a++ != *b++) { + return false; + } + } + return *a == *b; +} + +static bool compare(const Unicode *a, const char *b, int len) +{ + for (int i = 0; i < len; i++) { + if (a[i] != (Unicode)b[i]) { + return false; + } + } + + return true; +} + +static bool compare(const Unicode *a, const uint16_t *b, int len) +{ + for (int i = 0; i < len; i++) { + if (a[i] != b[i]) { + return false; + } + } + + return true; +} + +void TestUTFConversion::testUTF_data() +{ + QTest::addColumn("s"); + + QTest::newRow("") << QString(QLatin1String("")); + QTest::newRow("a") << QStringLiteral("a"); + QTest::newRow("abc") << QStringLiteral("abc"); + QTest::newRow("Latin") << QStringLiteral("Vitrum edere possum; mihi non nocet"); + QTest::newRow("Greek") << QStringLiteral("Μπορώ να φάω σπασμένα γυαλιά χωρίς να πάθω τίποτα"); + QTest::newRow("Icelandic") << QStringLiteral("Ég get etið gler án þess að meiða mig"); + QTest::newRow("Russian") << QStringLiteral("Я могу есть стекло, оно мне не вредит."); + QTest::newRow("Sanskrit") << QStringLiteral("काचं शक्नोम्यत्तुम् । नोपहिनस्ति माम् ॥"); + QTest::newRow("Arabic") << QStringLiteral("أنا قادر على أكل الزجاج و هذا لا يؤلمني"); + QTest::newRow("Chinese") << QStringLiteral("我能吞下玻璃而不伤身体。"); + QTest::newRow("Thai") << QStringLiteral("ฉันกินกระจกได้ แต่มันไม่ทำให้ฉันเจ็บ"); + QTest::newRow("non BMP") << QStringLiteral("𝓹𝓸𝓹𝓹𝓵𝓮𝓻"); +} + +void TestUTFConversion::testUTF() +{ + char utf8Buf[1000]; + char *utf8String; + uint16_t utf16Buf[1000]; + uint16_t *utf16String; + int len; + + QFETCH(QString, s); + char *str = strdup(s.toUtf8().constData()); + + // UTF-8 to UTF-16 + + len = utf8CountUtf16CodeUnits(str); + QCOMPARE(len, s.size()); // QString size() returns number of code units, not code points + Q_ASSERT(len < (int)sizeof(utf16Buf)); // if this fails, make utf16Buf larger + + len = utf8ToUtf16(str, utf16Buf, sizeof(utf16Buf), INT_MAX); + QVERIFY(compare(utf16Buf, s.utf16())); + QCOMPARE(len, s.size()); + + utf16String = utf8ToUtf16(str); + QVERIFY(compare(utf16String, s.utf16())); + free(utf16String); + + std::string sUtf8(str); + std::string gsUtf16_a(utf8ToUtf16WithBom(sUtf8)); + std::unique_ptr gsUtf16_b(Poppler::QStringToUnicodeGooString(s)); + QCOMPARE(gsUtf16_b->cmp(gsUtf16_a), 0); + + // UTF-16 to UTF-8 + + len = utf16CountUtf8Bytes(s.utf16()); + QCOMPARE(len, (int)strlen(str)); + Q_ASSERT(len < (int)sizeof(utf8Buf)); // if this fails, make utf8Buf larger + + len = utf16ToUtf8(s.utf16(), utf8Buf); + QVERIFY(compare(utf8Buf, str)); + QCOMPARE(len, (int)strlen(str)); + + utf8String = utf16ToUtf8(s.utf16()); + QVERIFY(compare(utf8String, str)); + free(utf8String); + + free(str); +} + +void TestUTFConversion::testUnicodeToAscii7() +{ + globalParams = std::make_unique(); + + // Test string is one 'Registered' and twenty 'Copyright' chars + // so it's long enough to reproduce the bug given that glibc + // malloc() always returns 8-byte aligned memory addresses. + GooString *goo = Poppler::QStringToUnicodeGooString(QString::fromUtf8("®©©©©©©©©©©©©©©©©©©©©")); // clazy:exclude=qstring-allocations + + const std::vector in = TextStringToUCS4(goo->toStr()); + + delete goo; + + int in_norm_len; + int *in_norm_idx; + Unicode *in_norm = unicodeNormalizeNFKC(in.data(), in.size(), &in_norm_len, &in_norm_idx, true); + + Unicode *out; + int out_len; + int *out_ascii_idx; + + unicodeToAscii7(in_norm, in_norm_len, &out, &out_len, in_norm_idx, &out_ascii_idx); + + free(in_norm); + free(in_norm_idx); + + // ascii7 conversion: ® -> (R) © -> (c) + const char *expected_ascii = (char *)"(R)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)"; + + QCOMPARE(out_len, (int)strlen(expected_ascii)); + QVERIFY(compare(out, expected_ascii, out_len)); + + free(out); + free(out_ascii_idx); +} + +void TestUTFConversion::testUnicodeLittleEndian() +{ + uint16_t UTF16LE_hi[5] { 0xFFFE, 0x4800, 0x4900, 0x2100, 0x1126 }; // UTF16-LE "HI!☑" + std::string GooUTF16LE(reinterpret_cast(UTF16LE_hi), sizeof(UTF16LE_hi)); + + uint16_t UTF16BE_hi[5] { 0xFEFF, 0x0048, 0x0049, 0x0021, 0x2611 }; // UTF16-BE "HI!☑" + std::string GooUTF16BE(reinterpret_cast(UTF16BE_hi), sizeof(UTF16BE_hi)); + + // Let's assert both GooString's are different + QVERIFY(GooUTF16LE != GooUTF16BE); + + const std::vector UCS4fromLE = TextStringToUCS4(GooUTF16LE); + const std::vector UCS4fromBE = TextStringToUCS4(GooUTF16BE); + + // len is 4 because TextStringToUCS4() removes the two leading Byte Order Mark (BOM) code points + QCOMPARE(UCS4fromLE.size(), UCS4fromBE.size()); + QCOMPARE(UCS4fromLE.size(), 4); + + // Check that now after conversion, UCS4fromLE and UCS4fromBE are now the same + for (size_t i = 0; i < UCS4fromLE.size(); i++) { + QCOMPARE(UCS4fromLE[i], UCS4fromBE[i]); + } + + const QString expected = QString::fromUtf8("HI!☑"); // clazy:exclude=qstring-allocations + + // Do some final verifications, checking the strings to be "HI!" + QVERIFY(UCS4fromLE == UCS4fromBE); + QVERIFY(compare(UCS4fromLE.data(), expected.utf16(), UCS4fromLE.size())); + QVERIFY(compare(UCS4fromBE.data(), expected.utf16(), UCS4fromLE.size())); +} + +QTEST_GUILESS_MAIN(TestUTFConversion) +#include "check_utf_conversion.moc" diff --git a/poppler-24.05.0/qt5/tests/fuzzing/qt_annot_fuzzer.cc b/poppler-24.05.0/qt5/tests/fuzzing/qt_annot_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..f34af3424335bd299c8c100ca4ea646e16586a7a --- /dev/null +++ b/poppler-24.05.0/qt5/tests/fuzzing/qt_annot_fuzzer.cc @@ -0,0 +1,46 @@ +#include +#include +#include + +static void dummy_error_function(const QString &, const QVariant &) { } + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + Poppler::setDebugErrorFunction(dummy_error_function, QVariant()); + const QFont font(QStringLiteral("Helvetica"), 20); + const QColor color = QColor::fromRgb(0xAB, 0xCD, 0xEF); + + QByteArray in_data = QByteArray::fromRawData((const char *)data, size); + Poppler::Document *doc = Poppler::Document::loadFromData(in_data); + + if (!doc || doc->isLocked()) { + delete doc; + return 0; + } + + for (int i = 0; i < doc->numPages(); i++) { + Poppler::Page *p = doc->page(i); + if (!p) { + continue; + } + Poppler::TextAnnotation *ann = new Poppler::TextAnnotation(Poppler::TextAnnotation::InPlace); + ann->setTextFont(font); + ann->setTextColor(color); + ann->setBoundary(QRectF(0.1, 0.1, 0.2, 0.2)); + ann->setContents(QString(in_data)); + p->addAnnotation(ann); + + QBuffer buffer; + buffer.open(QIODevice::WriteOnly); + std::unique_ptr conv(doc->pdfConverter()); + conv->setOutputDevice(&buffer); + conv->setPDFOptions(Poppler::PDFConverter::WithChanges); + conv->convert(); + buffer.close(); + delete ann; + delete p; + } + + delete doc; + return 0; +} diff --git a/poppler-24.05.0/qt5/tests/fuzzing/qt_label_fuzzer.cc b/poppler-24.05.0/qt5/tests/fuzzing/qt_label_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..65a8162942344db432dc4ed20479ef06b51b571c --- /dev/null +++ b/poppler-24.05.0/qt5/tests/fuzzing/qt_label_fuzzer.cc @@ -0,0 +1,29 @@ +#include +#include +#include + +static void dummy_error_function(const QString &, const QVariant &) { } + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + Poppler::setDebugErrorFunction(dummy_error_function, QVariant()); + QByteArray in_data = QByteArray::fromRawData((const char *)data, size); + Poppler::Document *doc = Poppler::Document::loadFromData(in_data); + if (!doc || doc->isLocked()) { + delete doc; + return 0; + } + + for (int i = 0; i < doc->numPages(); i++) { + QString label = QString(in_data); + Poppler::Page *p = doc->page(label); + if (!p) { + continue; + } + QImage image = p->renderToImage(72.0, 72.0, -1, -1, -1, -1, Poppler::Page::Rotate0); + delete p; + } + + delete doc; + return 0; +} diff --git a/poppler-24.05.0/qt5/tests/fuzzing/qt_pdf_fuzzer.cc b/poppler-24.05.0/qt5/tests/fuzzing/qt_pdf_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..af081886846fb02989823d9f90401f58e106d57d --- /dev/null +++ b/poppler-24.05.0/qt5/tests/fuzzing/qt_pdf_fuzzer.cc @@ -0,0 +1,49 @@ +#include +#include +#include +#include + +static void dummy_error_function(const QString &, const QVariant &) { } + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + Poppler::setDebugErrorFunction(dummy_error_function, QVariant()); + QByteArray in_data = QByteArray::fromRawData((const char *)data, size); + Poppler::Document *doc = Poppler::Document::loadFromData(in_data); + if (!doc || doc->isLocked()) { + delete doc; + return 0; + } + + for (int i = 0; i < doc->numPages(); i++) { + Poppler::Page *p = doc->page(i); + if (!p) { + continue; + } + QImage image = p->renderToImage(72.0, 72.0, -1, -1, -1, -1, Poppler::Page::Rotate0); + delete p; + } + + if (doc->numPages() > 0) { + QList pageList; + for (int i = 0; i < doc->numPages(); i++) { + pageList << (i + 1); + } + + Poppler::PSConverter *psConverter = doc->psConverter(); + + QBuffer buffer; + buffer.open(QIODevice::WriteOnly); + psConverter->setOutputDevice(&buffer); + + psConverter->setPageList(pageList); + psConverter->setPaperWidth(595); + psConverter->setPaperHeight(842); + psConverter->setTitle(doc->info("Title")); + psConverter->convert(); + delete psConverter; + } + + delete doc; + return 0; +} diff --git a/poppler-24.05.0/qt5/tests/fuzzing/qt_search_fuzzer.cc b/poppler-24.05.0/qt5/tests/fuzzing/qt_search_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..989589fdde5765abf1f4725ee3ffc72f17c31063 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/fuzzing/qt_search_fuzzer.cc @@ -0,0 +1,28 @@ +#include +#include + +static void dummy_error_function(const QString &, const QVariant &) { } + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + Poppler::setDebugErrorFunction(dummy_error_function, QVariant()); + QByteArray in_data = QByteArray::fromRawData((const char *)data, size); + Poppler::Document *doc = Poppler::Document::loadFromData(in_data); + if (!doc || doc->isLocked()) { + delete doc; + return 0; + } + + for (int i = 0; i < doc->numPages(); i++) { + Poppler::Page *p = doc->page(i); + if (!p) { + continue; + } + QString text = QString(in_data); + p->search(text, Poppler::Page::IgnoreCase, Poppler::Page::Rotate0); + delete p; + } + + delete doc; + return 0; +} diff --git a/poppler-24.05.0/qt5/tests/fuzzing/qt_textbox_fuzzer.cc b/poppler-24.05.0/qt5/tests/fuzzing/qt_textbox_fuzzer.cc new file mode 100644 index 0000000000000000000000000000000000000000..c0ecef745b97bf8eed90f63513f5293a374afd1e --- /dev/null +++ b/poppler-24.05.0/qt5/tests/fuzzing/qt_textbox_fuzzer.cc @@ -0,0 +1,32 @@ +#include +#include +#include +#include + +static void dummy_error_function(const QString &, const QVariant &) { } + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) +{ + Poppler::setDebugErrorFunction(dummy_error_function, QVariant()); + QByteArray in_data = QByteArray::fromRawData((const char *)data, size); + Poppler::Document *doc = Poppler::Document::loadFromData(in_data); + if (!doc || doc->isLocked()) { + delete doc; + return 0; + } + + for (int i = 0; i < doc->numPages(); i++) { + Poppler::Page *p = doc->page(i); + if (!p) { + continue; + } + QRectF rf = QRectF(0.0, 0.0, 1.0, 1.0); + Poppler::TextBox tb(QString(in_data), rf); + QImage image = p->renderToImage(72.0, 72.0, -1, -1, -1, -1, Poppler::Page::Rotate0); + QPainter painter(&image); + painter.drawRect(tb.boundingBox()); + delete p; + } + delete doc; + return 0; +} diff --git a/poppler-24.05.0/qt5/tests/poppler-attachments.cpp b/poppler-24.05.0/qt5/tests/poppler-attachments.cpp new file mode 100644 index 0000000000000000000000000000000000000000..d707e7627de5764ff9f77c669e9a4c030c4695ef --- /dev/null +++ b/poppler-24.05.0/qt5/tests/poppler-attachments.cpp @@ -0,0 +1,36 @@ +#include +#include + +#include + +#include + +int main(int argc, char **argv) +{ + QCoreApplication a(argc, argv); // QApplication required! + + if (!(argc == 2)) { + qWarning() << "usage: poppler-attachments filename"; + exit(1); + } + + Poppler::Document *doc = Poppler::Document::load(argv[1]); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + if (doc->hasEmbeddedFiles()) { + std::cout << "Embedded files: " << std::endl; + foreach (Poppler::EmbeddedFile *file, doc->embeddedFiles()) { + std::cout << " " << qPrintable(file->name()) << std::endl; + std::cout << " desc:" << qPrintable(file->description()) << std::endl; + QByteArray data = file->data(); + std::cout << " data: " << data.constData() << std::endl; + } + + } else { + std::cout << "There are no embedded document at the top level" << std::endl; + } + delete doc; +} diff --git a/poppler-24.05.0/qt5/tests/poppler-fonts.cpp b/poppler-24.05.0/qt5/tests/poppler-fonts.cpp new file mode 100644 index 0000000000000000000000000000000000000000..2a672feffa22ccae3aa26d063cd2a9280f67946a --- /dev/null +++ b/poppler-24.05.0/qt5/tests/poppler-fonts.cpp @@ -0,0 +1,87 @@ +#include +#include + +#include + +#include + +int main(int argc, char **argv) +{ + QCoreApplication a(argc, argv); // QApplication required! + + if (!(argc == 2)) { + qWarning() << "usage: poppler-fonts filename"; + exit(1); + } + + Poppler::Document *doc = Poppler::Document::load(argv[1]); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + std::cout << "name type emb sub font file"; + std::cout << std::endl; + std::cout << "------------------------------------ ------------ --- --- ---------"; + std::cout << std::endl; + + foreach (const Poppler::FontInfo &font, doc->fonts()) { + if (font.name().isNull()) { + std::cout << qPrintable(QStringLiteral("%1").arg(QStringLiteral("[none]"), -37)); + } else { + std::cout << qPrintable(QStringLiteral("%1").arg(font.name(), -37)); + } + switch (font.type()) { + case Poppler::FontInfo::unknown: + std::cout << "unknown "; + break; + case Poppler::FontInfo::Type1: + std::cout << "Type 1 "; + break; + case Poppler::FontInfo::Type1C: + std::cout << "Type 1C "; + break; + case Poppler::FontInfo::Type3: + std::cout << "Type 3 "; + break; + case Poppler::FontInfo::TrueType: + std::cout << "TrueType "; + break; + case Poppler::FontInfo::CIDType0: + std::cout << "CID Type 0 "; + break; + case Poppler::FontInfo::CIDType0C: + std::cout << "CID Type 0C "; + break; + case Poppler::FontInfo::CIDTrueType: + std::cout << "CID TrueType "; + break; + case Poppler::FontInfo::Type1COT: + std::cout << "Type 1C (OT) "; + break; + case Poppler::FontInfo::TrueTypeOT: + std::cout << "TrueType (OT) "; + break; + case Poppler::FontInfo::CIDType0COT: + std::cout << "CID Type 0C (OT) "; + break; + case Poppler::FontInfo::CIDTrueTypeOT: + std::cout << "CID TrueType (OT) "; + break; + } + + if (font.isEmbedded()) { + std::cout << "yes "; + } else { + std::cout << "no "; + } + if (font.isSubset()) { + std::cout << "yes "; + } else { + std::cout << "no "; + } + std::cout << qPrintable(font.file()); + std::cout << std::endl; + } + delete doc; +} diff --git a/poppler-24.05.0/qt5/tests/poppler-forms.cpp b/poppler-24.05.0/qt5/tests/poppler-forms.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8d927e84f47c0114066cad02dfaba5045719f934 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/poppler-forms.cpp @@ -0,0 +1,277 @@ +#include +#include +#include + +#include + +#include +#include + +static std::ostream &operator<<(std::ostream &out, Poppler::FormField::FormType type) +{ + switch (type) { + case Poppler::FormField::FormButton: + out << "Button"; + break; + case Poppler::FormField::FormText: + out << "Text"; + break; + case Poppler::FormField::FormChoice: + out << "Choice"; + break; + case Poppler::FormField::FormSignature: + out << "Signature"; + break; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, Poppler::FormFieldButton::ButtonType type) +{ + switch (type) { + case Poppler::FormFieldButton::Push: + out << "Push"; + break; + case Poppler::FormFieldButton::CheckBox: + out << "CheckBox"; + break; + case Poppler::FormFieldButton::Radio: + out << "Radio"; + break; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, Poppler::FormFieldText::TextType type) +{ + switch (type) { + case Poppler::FormFieldText::Normal: + out << "Normal"; + break; + case Poppler::FormFieldText::Multiline: + out << "Multiline"; + break; + case Poppler::FormFieldText::FileSelect: + out << "FileSelect"; + break; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, Poppler::FormFieldChoice::ChoiceType type) +{ + switch (type) { + case Poppler::FormFieldChoice::ComboBox: + out << "ComboBox"; + break; + case Poppler::FormFieldChoice::ListBox: + out << "ListBox"; + break; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, Poppler::SignatureValidationInfo::SignatureStatus status) +{ + switch (status) { + case Poppler::SignatureValidationInfo::SignatureValid: + out << "Valid"; + break; + case Poppler::SignatureValidationInfo::SignatureInvalid: + out << "Invalid"; + break; + case Poppler::SignatureValidationInfo::SignatureDigestMismatch: + out << "DigestMismatch"; + break; + case Poppler::SignatureValidationInfo::SignatureDecodingError: + out << "DecodingError"; + break; + case Poppler::SignatureValidationInfo::SignatureGenericError: + out << "GenericError"; + break; + case Poppler::SignatureValidationInfo::SignatureNotFound: + out << "NotFound"; + break; + case Poppler::SignatureValidationInfo::SignatureNotVerified: + out << "NotVerifiedYet"; + break; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, Poppler::SignatureValidationInfo::CertificateStatus status) +{ + switch (status) { + case Poppler::SignatureValidationInfo::CertificateTrusted: + out << "Trusted"; + break; + case Poppler::SignatureValidationInfo::CertificateUntrustedIssuer: + out << "UntrustedIssuer"; + break; + case Poppler::SignatureValidationInfo::CertificateUnknownIssuer: + out << "UnknownIssuer"; + break; + case Poppler::SignatureValidationInfo::CertificateRevoked: + out << "Revoked"; + break; + case Poppler::SignatureValidationInfo::CertificateExpired: + out << "Expired"; + break; + case Poppler::SignatureValidationInfo::CertificateGenericError: + out << "GenericError"; + break; + case Poppler::SignatureValidationInfo::CertificateNotVerified: + out << "NotVerifiedYet"; + break; + case Poppler::SignatureValidationInfo::CertificateVerificationInProgress: + out << "InProgress"; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, Qt::Alignment alignment) +{ + switch (alignment) { + case Qt::AlignLeft: + out << "Left"; + break; + case Qt::AlignRight: + out << "Right"; + break; + case Qt::AlignHCenter: + out << "HCenter"; + break; + case Qt::AlignJustify: + out << "Justify"; + break; + case Qt::AlignTop: + out << "Top"; + break; + case Qt::AlignBottom: + out << "Bottom"; + break; + case Qt::AlignVCenter: + out << "VCenter"; + break; + case Qt::AlignCenter: + out << "Center"; + break; + case Qt::AlignAbsolute: + out << "Absolute"; + break; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, const QString &string) +{ + out << string.toUtf8().constData(); + return out; +} + +static std::ostream &operator<<(std::ostream &out, const QRectF &rect) +{ + out << QStringLiteral("top: %1 left: %2 width: %3 height: %4").arg(rect.x()).arg(rect.y()).arg(rect.width()).arg(rect.height()); + return out; +} + +template +std::ostream &operator<<(std::ostream &out, const QList &elems) +{ + bool isFirst = true; + for (int i = 0; i < elems.count(); ++i) { + if (!isFirst) { + out << " "; + } + out << elems[i]; + isFirst = false; + } + return out; +} + +int main(int argc, char **argv) +{ + QCoreApplication a(argc, argv); + + if (!(argc == 2)) { + qWarning() << "usage: poppler-forms filename"; + exit(1); + } + + Poppler::Document *doc = Poppler::Document::load(argv[1]); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + std::cout << "Forms for file " << argv[1] << std::endl; + for (int i = 0; i < doc->numPages(); ++i) { + Poppler::Page *page = doc->page(i); + if (page) { + QList forms = page->formFields(); + std::cout << "\tPage " << i + 1 << std::endl; + foreach (const Poppler::FormField *form, forms) { + std::cout << "\t\tForm" << std::endl; + std::cout << "\t\t\tType: " << form->type() << std::endl; + std::cout << "\t\t\tRect: " << form->rect() << std::endl; + std::cout << "\t\t\tID: " << form->id() << std::endl; + std::cout << "\t\t\tName: " << form->name() << std::endl; + std::cout << "\t\t\tFullyQualifiedName: " << form->fullyQualifiedName() << std::endl; + std::cout << "\t\t\tUIName: " << form->uiName() << std::endl; + std::cout << "\t\t\tReadOnly: " << form->isReadOnly() << std::endl; + std::cout << "\t\t\tVisible: " << form->isVisible() << std::endl; + switch (form->type()) { + case Poppler::FormField::FormButton: { + const Poppler::FormFieldButton *buttonForm = static_cast(form); + std::cout << "\t\t\tButtonType: " << buttonForm->buttonType() << std::endl; + std::cout << "\t\t\tCaption: " << buttonForm->caption() << std::endl; + std::cout << "\t\t\tState: " << buttonForm->state() << std::endl; + std::cout << "\t\t\tSiblings: " << buttonForm->siblings() << std::endl; + } break; + + case Poppler::FormField::FormText: { + const Poppler::FormFieldText *textForm = static_cast(form); + std::cout << "\t\t\tTextType: " << textForm->textType() << std::endl; + std::cout << "\t\t\tText: " << textForm->text() << std::endl; + std::cout << "\t\t\tIsPassword: " << textForm->isPassword() << std::endl; + std::cout << "\t\t\tIsRichText: " << textForm->isRichText() << std::endl; + std::cout << "\t\t\tMaximumLength: " << textForm->maximumLength() << std::endl; + std::cout << "\t\t\tTextAlignment: " << textForm->textAlignment() << std::endl; + std::cout << "\t\t\tCanBeSpellChecked: " << textForm->canBeSpellChecked() << std::endl; + } break; + + case Poppler::FormField::FormChoice: { + const Poppler::FormFieldChoice *choiceForm = static_cast(form); + std::cout << "\t\t\tChoiceType: " << choiceForm->choiceType() << std::endl; + std::cout << "\t\t\tChoices: " << choiceForm->choices() << std::endl; + std::cout << "\t\t\tIsEditable: " << choiceForm->isEditable() << std::endl; + std::cout << "\t\t\tIsMultiSelect: " << choiceForm->multiSelect() << std::endl; + std::cout << "\t\t\tCurrentChoices: " << choiceForm->currentChoices() << std::endl; + std::cout << "\t\t\tEditChoice: " << choiceForm->editChoice() << std::endl; + std::cout << "\t\t\tTextAlignment: " << choiceForm->textAlignment() << std::endl; + std::cout << "\t\t\tCanBeSpellChecked: " << choiceForm->canBeSpellChecked() << std::endl; + } break; + + case Poppler::FormField::FormSignature: { + const Poppler::FormFieldSignature *signatureForm = static_cast(form); + const Poppler::SignatureValidationInfo svi = signatureForm->validateAsync(Poppler::FormFieldSignature::ValidateVerifyCertificate).first; + const Poppler::SignatureValidationInfo::CertificateStatus certStatus = signatureForm->validateResult(); + std::cout << "\t\t\tSignatureStatus: " << svi.signatureStatus() << std::endl; + std::cout << "\t\t\tCertificateStatus: " << certStatus << std::endl; + if (svi.signerName().isEmpty() == false) { + std::cout << "\t\t\tSignerName: " << svi.signerName() << std::endl; + } else { + std::cout << "\t\t\tSignerName: " + << "(null)" << std::endl; + } + const QDateTime sviTime = QDateTime::fromSecsSinceEpoch(svi.signingTime(), Qt::UTC); + std::cout << "\t\t\tSigningTime: " << sviTime.toString() << std::endl; + } break; + } + } + qDeleteAll(forms); + delete page; + } + } + delete doc; +} diff --git a/poppler-24.05.0/qt5/tests/poppler-page-labels.cpp b/poppler-24.05.0/qt5/tests/poppler-page-labels.cpp new file mode 100644 index 0000000000000000000000000000000000000000..b109f5c3e20a67ece2dd76ce2baf32924dad8b7f --- /dev/null +++ b/poppler-24.05.0/qt5/tests/poppler-page-labels.cpp @@ -0,0 +1,48 @@ +#include +#include + +#include +#include + +#include + +int main(int argc, char **argv) +{ + QCoreApplication a(argc, argv); // QApplication required! + + if (!(argc == 2)) { + qWarning() << "usage: poppler-page-labels filename"; + exit(1); + } + + Poppler::Document *doc = Poppler::Document::load(argv[1]); + if (!doc || doc->isLocked()) { + qWarning() << "doc not loaded"; + exit(1); + } + + for (int i = 0; i < doc->numPages(); i++) { + int j = 0; + std::cout << "*** Label of Page " << i << std::endl; + std::cout << std::flush; + + std::unique_ptr page(doc->page(i)); + + if (!page) { + continue; + } + + const QByteArray utf8str = page->label().toUtf8(); + for (j = 0; j < utf8str.size(); j++) { + std::cout << utf8str[j]; + } + std::cout << std::endl; + + std::unique_ptr pageFromPageLabel(doc->page(page->label())); + const int indexFromPageLabel = pageFromPageLabel ? pageFromPageLabel->index() : -1; + if (indexFromPageLabel != i) { + std::cout << "WARNING: Page label didn't link back to the same page index " << indexFromPageLabel << " " << i << std::endl; + } + } + delete doc; +} diff --git a/poppler-24.05.0/qt5/tests/poppler-texts.cpp b/poppler-24.05.0/qt5/tests/poppler-texts.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8f95b8c1ed72c8377d5e97410ed2a7f8e9d080a4 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/poppler-texts.cpp @@ -0,0 +1,38 @@ +#include +#include + +#include + +#include + +int main(int argc, char **argv) +{ + QCoreApplication a(argc, argv); // QApplication required! + + if (!(argc == 2)) { + qWarning() << "usage: poppler-texts filename"; + exit(1); + } + + Poppler::Document *doc = Poppler::Document::load(argv[1]); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + for (int i = 0; i < doc->numPages(); i++) { + int j = 0; + std::cout << "*** Page " << i << std::endl; + std::cout << std::flush; + + Poppler::Page *page = doc->page(i); + const QByteArray utf8str = page->text(QRectF(), Poppler::Page::RawOrderLayout).toUtf8(); + std::cout << std::flush; + for (j = 0; j < utf8str.size(); j++) { + std::cout << utf8str[j]; + } + std::cout << std::endl; + delete page; + } + delete doc; +} diff --git a/poppler-24.05.0/qt5/tests/stress-poppler-dir.cpp b/poppler-24.05.0/qt5/tests/stress-poppler-dir.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8cac185b56147021b4ee177a2b58261d11731f85 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/stress-poppler-dir.cpp @@ -0,0 +1,69 @@ +#include +#include +#include +#include +#include + +#include + +#include + +int main(int argc, char **argv) +{ + QApplication a(argc, argv); // QApplication required! + + QElapsedTimer t; + t.start(); + + QDir directory(argv[1]); + foreach (const QString &fileName, directory.entryList()) { + if (fileName.endsWith(QStringLiteral("pdf"))) { + qDebug() << "Doing" << fileName.toLatin1().data() << ":"; + Poppler::Document *doc = Poppler::Document::load(directory.canonicalPath() + "/" + fileName); + if (!doc) { + qWarning() << "doc not loaded"; + } else if (doc->isLocked()) { + if (!doc->unlock("", "password")) { + qWarning() << "couldn't unlock document"; + delete doc; + } + } else { + auto pdfVersion = doc->getPdfVersion(); + if (pdfVersion.major != 1) { + qWarning() << "pdf major version is not '1'"; + } + + doc->info(QStringLiteral("Title")); + doc->info(QStringLiteral("Subject")); + doc->info(QStringLiteral("Author")); + doc->info(QStringLiteral("Keywords")); + doc->info(QStringLiteral("Creator")); + doc->info(QStringLiteral("Producer")); + doc->date(QStringLiteral("CreationDate")).toString(); + doc->date(QStringLiteral("ModDate")).toString(); + doc->numPages(); + doc->isLinearized(); + doc->isEncrypted(); + doc->okToPrint(); + doc->okToCopy(); + doc->okToChange(); + doc->okToAddNotes(); + doc->pageMode(); + + for (int index = 0; index < doc->numPages(); ++index) { + Poppler::Page *page = doc->page(index); + page->renderToImage(); + page->pageSize(); + page->orientation(); + delete page; + std::cout << "."; + std::cout.flush(); + } + std::cout << std::endl; + delete doc; + } + } + } + + std::cout << "Elapsed time: " << (t.elapsed() / 1000) << "seconds" << std::endl; +} diff --git a/poppler-24.05.0/qt5/tests/stress-poppler-qt5.cpp b/poppler-24.05.0/qt5/tests/stress-poppler-qt5.cpp new file mode 100644 index 0000000000000000000000000000000000000000..31795f9654d41412926646cd8ee5ffefe70aeae3 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/stress-poppler-qt5.cpp @@ -0,0 +1,74 @@ +#include +#include +#include +#include +#include + +#include + +#include + +int main(int argc, char **argv) +{ + QApplication a(argc, argv); // QApplication required! + + Q_UNUSED(argc); + Q_UNUSED(argv); + + QElapsedTimer t; + t.start(); + QDir dbDir(QStringLiteral("./pdfdb")); + if (!dbDir.exists()) { + qWarning() << "Database directory does not exist"; + } + + QStringList excludeSubDirs; + excludeSubDirs << QStringLiteral("000048") << QStringLiteral("000607"); + + const QStringList dirs = dbDir.entryList(QStringList() << QStringLiteral("0000*"), QDir::Dirs); + foreach (const QString &subdir, dirs) { + if (excludeSubDirs.contains(subdir)) { + // then skip it + } else { + QString path = "./pdfdb/" + subdir + "/data.pdf"; + std::cout << "Doing " << path.toLatin1().data() << " :"; + Poppler::Document *doc = Poppler::Document::load(path); + if (!doc) { + qWarning() << "doc not loaded"; + } else { + auto pdfVersion = doc->getPdfVersion(); + Q_UNUSED(pdfVersion); + doc->info(QStringLiteral("Title")); + doc->info(QStringLiteral("Subject")); + doc->info(QStringLiteral("Author")); + doc->info(QStringLiteral("Keywords")); + doc->info(QStringLiteral("Creator")); + doc->info(QStringLiteral("Producer")); + doc->date(QStringLiteral("CreationDate")).toString(); + doc->date(QStringLiteral("ModDate")).toString(); + doc->numPages(); + doc->isLinearized(); + doc->isEncrypted(); + doc->okToPrint(); + doc->okToCopy(); + doc->okToChange(); + doc->okToAddNotes(); + doc->pageMode(); + + for (int index = 0; index < doc->numPages(); ++index) { + Poppler::Page *page = doc->page(index); + page->renderToImage(); + page->pageSize(); + page->orientation(); + delete page; + std::cout << "."; + std::cout.flush(); + } + std::cout << std::endl; + delete doc; + } + } + } + + std::cout << "Elapsed time: " << (t.elapsed() / 1000) << std::endl; +} diff --git a/poppler-24.05.0/qt5/tests/stress-threads-qt5.cpp b/poppler-24.05.0/qt5/tests/stress-threads-qt5.cpp new file mode 100644 index 0000000000000000000000000000000000000000..164127bc120a20423c5262b2e4469a16db7788b3 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/stress-threads-qt5.cpp @@ -0,0 +1,275 @@ + +#ifndef _WIN32 +# include +#else +# include +# define sleep Sleep +#endif +#include + +#include +#include + +#include +#include +#include +#include +#include + +class SillyThread : public QThread +{ + Q_OBJECT +public: + explicit SillyThread(Poppler::Document *document, QObject *parent = nullptr); + + void run() override; + +private: + Poppler::Document *m_document; + QVector m_pages; +}; + +class CrazyThread : public QThread +{ + Q_OBJECT +public: + CrazyThread(uint seed, Poppler::Document *document, QMutex *annotationMutex, QObject *parent = nullptr); + + void run() override; + +private: + uint m_seed; + Poppler::Document *m_document; + QMutex *m_annotationMutex; +}; + +static Poppler::Page *loadPage(Poppler::Document *document, int index) +{ + Poppler::Page *page = document->page(index); + + if (page == nullptr) { + qDebug() << "!Document::page"; + + exit(EXIT_FAILURE); + } + + return page; +} + +static Poppler::Page *loadRandomPage(Poppler::Document *document) +{ + return loadPage(document, qrand() % document->numPages()); +} + +SillyThread::SillyThread(Poppler::Document *document, QObject *parent) : QThread(parent), m_document(document), m_pages() +{ + m_pages.reserve(m_document->numPages()); + + for (int index = 0; index < m_document->numPages(); ++index) { + m_pages.append(loadPage(m_document, index)); + } +} + +void SillyThread::run() +{ + forever { + foreach (Poppler::Page *page, m_pages) { + QImage image = page->renderToImage(); + + if (image.isNull()) { + qDebug() << "!Page::renderToImage"; + + ::exit(EXIT_FAILURE); + } + } + } +} + +CrazyThread::CrazyThread(uint seed, Poppler::Document *document, QMutex *annotationMutex, QObject *parent) : QThread(parent), m_seed(seed), m_document(document), m_annotationMutex(annotationMutex) { } + +void CrazyThread::run() +{ + typedef QScopedPointer PagePointer; + + qsrand(m_seed); + + forever { + if (qrand() % 2 == 0) { + qDebug() << "search..."; + + PagePointer page(loadRandomPage(m_document)); + + page->search(QStringLiteral("c"), Poppler::Page::IgnoreCase); + page->search(QStringLiteral("r")); + page->search(QStringLiteral("a"), Poppler::Page::IgnoreCase); + page->search(QStringLiteral("z")); + page->search(QStringLiteral("y"), Poppler::Page::IgnoreCase); + } + + if (qrand() % 2 == 0) { + qDebug() << "links..."; + + PagePointer page(loadRandomPage(m_document)); + + QList links = page->links(); + + qDeleteAll(links); + } + + if (qrand() % 2 == 0) { + qDebug() << "form fields..."; + + PagePointer page(loadRandomPage(m_document)); + + QList formFields = page->formFields(); + + qDeleteAll(formFields); + } + + if (qrand() % 2 == 0) { + qDebug() << "thumbnail..."; + + PagePointer page(loadRandomPage(m_document)); + + page->thumbnail(); + } + + if (qrand() % 2 == 0) { + qDebug() << "text..."; + + PagePointer page(loadRandomPage(m_document)); + + page->text(QRectF(QPointF(), page->pageSizeF())); + } + + if (qrand() % 2 == 0) { + QMutexLocker mutexLocker(m_annotationMutex); + + qDebug() << "add annotation..."; + + PagePointer page(loadRandomPage(m_document)); + + Poppler::Annotation *annotation = nullptr; + + switch (qrand() % 3) { + default: + case 0: + annotation = new Poppler::TextAnnotation(qrand() % 2 == 0 ? Poppler::TextAnnotation::Linked : Poppler::TextAnnotation::InPlace); + break; + case 1: + annotation = new Poppler::HighlightAnnotation(); + break; + case 2: + annotation = new Poppler::InkAnnotation(); + break; + } + + annotation->setBoundary(QRectF(0.0, 0.0, 0.5, 0.5)); + annotation->setContents(QStringLiteral("crazy")); + + page->addAnnotation(annotation); + + delete annotation; + } + + if (qrand() % 2 == 0) { + QMutexLocker mutexLocker(m_annotationMutex); + + for (int index = 0; index < m_document->numPages(); ++index) { + PagePointer page(loadPage(m_document, index)); + + QList annotations = page->annotations(); + + if (!annotations.isEmpty()) { + qDebug() << "modify annotation..."; + + annotations.at(qrand() % annotations.size())->setBoundary(QRectF(0.5, 0.5, 0.25, 0.25)); + annotations.at(qrand() % annotations.size())->setAuthor(QStringLiteral("foo")); + annotations.at(qrand() % annotations.size())->setContents(QStringLiteral("bar")); + annotations.at(qrand() % annotations.size())->setCreationDate(QDateTime::currentDateTime()); + annotations.at(qrand() % annotations.size())->setModificationDate(QDateTime::currentDateTime()); + } + + qDeleteAll(annotations); + + if (!annotations.isEmpty()) { + break; + } + } + } + + if (qrand() % 2 == 0) { + QMutexLocker mutexLocker(m_annotationMutex); + + for (int index = 0; index < m_document->numPages(); ++index) { + PagePointer page(loadPage(m_document, index)); + + QList annotations = page->annotations(); + + if (!annotations.isEmpty()) { + qDebug() << "remove annotation..."; + + page->removeAnnotation(annotations.takeAt(qrand() % annotations.size())); + } + + qDeleteAll(annotations); + + if (!annotations.isEmpty()) { + break; + } + } + } + + if (qrand() % 2 == 0) { + qDebug() << "fonts..."; + + m_document->fonts(); + } + } +} + +int main(int argc, char **argv) +{ + if (argc < 5) { + qDebug() << "usage: stress-threads-qt duration sillyCount crazyCount file(s)"; + + return EXIT_FAILURE; + } + + const int duration = atoi(argv[1]); + const int sillyCount = atoi(argv[2]); + const int crazyCount = atoi(argv[3]); + + qsrand(time(nullptr)); + + for (int argi = 4; argi < argc; ++argi) { + const QString file = QFile::decodeName(argv[argi]); + Poppler::Document *document = Poppler::Document::load(file); + + if (document == nullptr) { + qDebug() << "Could not load" << file; + continue; + } + + if (document->isLocked()) { + qDebug() << file << "is locked"; + continue; + } + + for (int i = 0; i < sillyCount; ++i) { + (new SillyThread(document))->start(); + } + + QMutex *annotationMutex = new QMutex(); + + for (int i = 0; i < crazyCount; ++i) { + (new CrazyThread(qrand(), document, annotationMutex))->start(); + } + } + + sleep(duration); + + return EXIT_SUCCESS; +} + +#include "stress-threads-qt5.moc" diff --git a/poppler-24.05.0/qt5/tests/test-password-qt5.cpp b/poppler-24.05.0/qt5/tests/test-password-qt5.cpp new file mode 100644 index 0000000000000000000000000000000000000000..05b697d22fc26b1eee32de95c2cb2cbe79c21d25 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/test-password-qt5.cpp @@ -0,0 +1,131 @@ +#include +#include +#include +#include +#include +#include + +#include + +class PDFDisplay : public QWidget // picture display widget +{ + Q_OBJECT +public: + explicit PDFDisplay(Poppler::Document *d, QWidget *parent = nullptr); + ~PDFDisplay() override; + +protected: + void paintEvent(QPaintEvent *) override; + void keyPressEvent(QKeyEvent *) override; + +private: + void display(); + int m_currentPage; + QImage image; + Poppler::Document *doc; +}; + +PDFDisplay::PDFDisplay(Poppler::Document *d, QWidget *parent) : QWidget(parent) +{ + doc = d; + m_currentPage = 0; + display(); +} + +void PDFDisplay::display() +{ + if (doc) { + Poppler::Page *page = doc->page(m_currentPage); + if (page) { + qDebug() << "Displaying page: " << m_currentPage; + image = page->renderToImage(); + update(); + delete page; + } + } else { + qWarning() << "doc not loaded"; + } +} + +PDFDisplay::~PDFDisplay() +{ + delete doc; +} + +void PDFDisplay::paintEvent(QPaintEvent *e) +{ + QPainter paint(this); // paint widget + if (!image.isNull()) { + paint.drawImage(0, 0, image); + } else { + qWarning() << "null image"; + } +} + +void PDFDisplay::keyPressEvent(QKeyEvent *e) +{ + if (e->key() == Qt::Key_Down) { + if (m_currentPage + 1 < doc->numPages()) { + m_currentPage++; + display(); + } + } else if (e->key() == Qt::Key_Up) { + if (m_currentPage > 0) { + m_currentPage--; + display(); + } + } else if (e->key() == Qt::Key_Q) { + exit(0); + } +} + +int main(int argc, char **argv) +{ + QApplication a(argc, argv); // QApplication required! + + if (argc != 3) { + qWarning() << "usage: test-password-qt5 owner-password filename"; + exit(1); + } + + Poppler::Document *doc = Poppler::Document::load(argv[2], argv[1]); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + // output some meta-data + auto pdfVersion = doc->getPdfVersion(); + qDebug() << " PDF Version: " << qPrintable(QStringLiteral("%1.%2").arg(pdfVersion.major).arg(pdfVersion.minor)); + qDebug() << " Title: " << doc->info(QStringLiteral("Title")); + qDebug() << " Subject: " << doc->info(QStringLiteral("Subject")); + qDebug() << " Author: " << doc->info(QStringLiteral("Author")); + qDebug() << " Key words: " << doc->info(QStringLiteral("Keywords")); + qDebug() << " Creator: " << doc->info(QStringLiteral("Creator")); + qDebug() << " Producer: " << doc->info(QStringLiteral("Producer")); + qDebug() << " Date created: " << doc->date(QStringLiteral("CreationDate")).toString(); + qDebug() << " Date modified: " << doc->date(QStringLiteral("ModDate")).toString(); + qDebug() << "Number of pages: " << doc->numPages(); + qDebug() << " Linearised: " << doc->isLinearized(); + qDebug() << " Encrypted: " << doc->isEncrypted(); + qDebug() << " OK to print: " << doc->okToPrint(); + qDebug() << " OK to copy: " << doc->okToCopy(); + qDebug() << " OK to change: " << doc->okToChange(); + qDebug() << "OK to add notes: " << doc->okToAddNotes(); + qDebug() << " Page mode: " << doc->pageMode(); + QStringList fontNameList; + foreach (const Poppler::FontInfo &font, doc->fonts()) + fontNameList += font.name(); + qDebug() << " Fonts: " << fontNameList.join(QStringLiteral(", ")); + + Poppler::Page *page = doc->page(0); + qDebug() << " Page 1 size: " << page->pageSize().width() / 72 << "inches x " << page->pageSize().height() / 72 << "inches"; + + PDFDisplay test(doc); // create picture display + test.setWindowTitle(QStringLiteral("Poppler-Qt5 Test")); + test.show(); // show it + + return a.exec(); // start event loop +} + +#include "test-password-qt5.moc" diff --git a/poppler-24.05.0/qt5/tests/test-poppler-qt5.cpp b/poppler-24.05.0/qt5/tests/test-poppler-qt5.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ed54281338c00471e4a4b23f9b0bfeca4ea2e415 --- /dev/null +++ b/poppler-24.05.0/qt5/tests/test-poppler-qt5.cpp @@ -0,0 +1,218 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +class PDFDisplay : public QWidget // picture display widget +{ + Q_OBJECT +public: + PDFDisplay(Poppler::Document *d, bool qpainter, QWidget *parent = nullptr); + ~PDFDisplay() override; + void setShowTextRects(bool show); + void display(); + +protected: + void paintEvent(QPaintEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void mousePressEvent(QMouseEvent *) override; + +private: + int m_currentPage; + QImage image; + Poppler::Document *doc; + QString backendString; + bool showTextRects; + QList textRects; +}; + +PDFDisplay::PDFDisplay(Poppler::Document *d, bool qpainter, QWidget *parent) : QWidget(parent) +{ + showTextRects = false; + doc = d; + m_currentPage = 0; + if (qpainter) { + backendString = QStringLiteral("QPainter"); + doc->setRenderBackend(Poppler::Document::QPainterBackend); + } else { + backendString = QStringLiteral("Splash"); + doc->setRenderBackend(Poppler::Document::SplashBackend); + } + doc->setRenderHint(Poppler::Document::Antialiasing, true); + doc->setRenderHint(Poppler::Document::TextAntialiasing, true); +} + +void PDFDisplay::setShowTextRects(bool show) +{ + showTextRects = show; +} + +void PDFDisplay::display() +{ + if (doc) { + Poppler::Page *page = doc->page(m_currentPage); + if (page) { + qDebug() << "Displaying page using" << backendString << "backend: " << m_currentPage; + QTime t = QTime::currentTime(); + image = page->renderToImage(); + qDebug() << "Rendering took" << t.msecsTo(QTime::currentTime()) << "msecs"; + qDeleteAll(textRects); + if (showTextRects) { + QPainter painter(&image); + painter.setPen(Qt::red); + textRects = page->textList(); + foreach (Poppler::TextBox *tb, textRects) { + painter.drawRect(tb->boundingBox()); + } + } else { + textRects.clear(); + } + update(); + delete page; + } + } else { + qWarning() << "doc not loaded"; + } +} + +PDFDisplay::~PDFDisplay() +{ + qDeleteAll(textRects); + delete doc; +} + +void PDFDisplay::paintEvent(QPaintEvent *e) +{ + QPainter paint(this); // paint widget + if (!image.isNull()) { + paint.drawImage(0, 0, image); + } else { + qWarning() << "null image"; + } +} + +void PDFDisplay::keyPressEvent(QKeyEvent *e) +{ + if (e->key() == Qt::Key_Down) { + if (m_currentPage + 1 < doc->numPages()) { + m_currentPage++; + display(); + } + } else if (e->key() == Qt::Key_Up) { + if (m_currentPage > 0) { + m_currentPage--; + display(); + } + } else if (e->key() == Qt::Key_Q) { + exit(0); + } +} + +void PDFDisplay::mousePressEvent(QMouseEvent *e) +{ + int i = 0; + foreach (Poppler::TextBox *tb, textRects) { + if (tb->boundingBox().contains(e->pos())) { + const QString tt = QStringLiteral("Text: \"%1\"\nIndex in text list: %2").arg(tb->text()).arg(i); + QToolTip::showText(e->globalPos(), tt, this); + break; + } + ++i; + } +} + +int main(int argc, char **argv) +{ + QApplication a(argc, argv); // QApplication required! + + if (argc < 2 || (argc == 3 && strcmp(argv[2], "-extract") != 0 && strcmp(argv[2], "-qpainter") != 0 && strcmp(argv[2], "-textRects") != 0) || argc > 3) { + // use argument as file name + qWarning() << "usage: test-poppler-qt5 filename [-extract|-qpainter|-textRects]"; + exit(1); + } + + Poppler::Document *doc = Poppler::Document::load(QFile::decodeName(argv[1])); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + if (doc->isLocked()) { + qWarning() << "document locked (needs password)"; + exit(0); + } + + // output some meta-data + Poppler::Document::PdfVersion pdfVersion = doc->getPdfVersion(); + qDebug() << " PDF Version: " << qPrintable(QStringLiteral("%1.%2").arg(pdfVersion.major).arg(pdfVersion.minor)); + qDebug() << " Title: " << doc->info(QStringLiteral("Title")); + qDebug() << " Subject: " << doc->info(QStringLiteral("Subject")); + qDebug() << " Author: " << doc->info(QStringLiteral("Author")); + qDebug() << " Key words: " << doc->info(QStringLiteral("Keywords")); + qDebug() << " Creator: " << doc->info(QStringLiteral("Creator")); + qDebug() << " Producer: " << doc->info(QStringLiteral("Producer")); + qDebug() << " Date created: " << doc->date(QStringLiteral("CreationDate")).toString(); + qDebug() << " Date modified: " << doc->date(QStringLiteral("ModDate")).toString(); + qDebug() << "Number of pages: " << doc->numPages(); + qDebug() << " Linearised: " << doc->isLinearized(); + qDebug() << " Encrypted: " << doc->isEncrypted(); + qDebug() << " OK to print: " << doc->okToPrint(); + qDebug() << " OK to copy: " << doc->okToCopy(); + qDebug() << " OK to change: " << doc->okToChange(); + qDebug() << "OK to add notes: " << doc->okToAddNotes(); + qDebug() << " Page mode: " << doc->pageMode(); + qDebug() << " Metadata: " << doc->metadata(); + + if (doc->hasEmbeddedFiles()) { + qDebug() << "Embedded files:"; + foreach (Poppler::EmbeddedFile *file, doc->embeddedFiles()) { + qDebug() << " " << file->name(); + } + qDebug(); + } else { + qDebug() << "No embedded files"; + } + + if (doc->numPages() <= 0) { + delete doc; + qDebug() << "Doc has no pages"; + return 0; + } + + { + Poppler::Page *page = doc->page(0); + if (page) { + qDebug() << "Page 1 size: " << page->pageSize().width() / 72 << "inches x " << page->pageSize().height() / 72 << "inches"; + delete page; + } + } + + if (argc == 2 || (argc == 3 && strcmp(argv[2], "-qpainter") == 0) || (argc == 3 && strcmp(argv[2], "-textRects") == 0)) { + bool useQPainter = (argc == 3 && strcmp(argv[2], "-qpainter") == 0); + PDFDisplay test(doc, useQPainter); // create picture display + test.setWindowTitle(QStringLiteral("Poppler-Qt5 Test")); + test.setShowTextRects(argc == 3 && strcmp(argv[2], "-textRects") == 0); + test.display(); + test.show(); // show it + + return a.exec(); // start event loop + } else { + Poppler::Page *page = doc->page(0); + + QLabel *l = new QLabel(page->text(QRectF()), nullptr); + l->show(); + delete page; + delete doc; + return a.exec(); + } +} + +#include "test-poppler-qt5.moc" diff --git a/poppler-24.05.0/qt5/tests/test-render-to-file.cpp b/poppler-24.05.0/qt5/tests/test-render-to-file.cpp new file mode 100644 index 0000000000000000000000000000000000000000..0cba21269e000499c18a928d21a0b37f08480c8d --- /dev/null +++ b/poppler-24.05.0/qt5/tests/test-render-to-file.cpp @@ -0,0 +1,59 @@ +#include +#include +#include +#include + +#include + +int main(int argc, char **argv) +{ + QGuiApplication a(argc, argv); // QApplication required! + + if (argc < 2 || (argc == 3 && strcmp(argv[2], "-qpainter") != 0) || argc > 3) { + // use argument as file name + qWarning() << "usage: test-render-to-file-qt5 filename [-qpainter]"; + exit(1); + } + + Poppler::Document *doc = Poppler::Document::load(QFile::decodeName(argv[1])); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + if (doc->isLocked()) { + qWarning() << "document locked (needs password)"; + exit(0); + } + + if (doc->numPages() <= 0) { + delete doc; + qDebug() << "Doc has no pages"; + return 0; + } + + QString backendString; + if (argc == 3 && strcmp(argv[2], "-qpainter") == 0) { + backendString = QStringLiteral("QPainter"); + doc->setRenderBackend(Poppler::Document::QPainterBackend); + } else { + backendString = QStringLiteral("Splash"); + doc->setRenderBackend(Poppler::Document::SplashBackend); + } + doc->setRenderHint(Poppler::Document::Antialiasing, true); + doc->setRenderHint(Poppler::Document::TextAntialiasing, true); + + for (int i = 0; i < doc->numPages(); ++i) { + Poppler::Page *page = doc->page(i); + if (page) { + qDebug() << "Rendering page using" << backendString << "backend: " << i; + QTime t = QTime::currentTime(); + QImage image = page->renderToImage(); + qDebug() << "Rendering took" << t.msecsTo(QTime::currentTime()) << "msecs"; + image.save(QStringLiteral("test-render-to-file%1.png").arg(i)); + delete page; + } + } + + return 0; +} diff --git a/poppler-24.05.0/qt6/CMakeLists.txt b/poppler-24.05.0/qt6/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..89e612d1013696494be35f906e56a7db4874b9f8 --- /dev/null +++ b/poppler-24.05.0/qt6/CMakeLists.txt @@ -0,0 +1,11 @@ +set(CMAKE_AUTOMOC ON) + +set(ENABLE_QT_STRICT_ITERATORS ON CACHE BOOL "Select whether to compile with QT_STRICT_ITERATORS. Leave it ON, unless your Qt lacks support, or your compiler can't do SRA optimization.") +if(ENABLE_QT_STRICT_ITERATORS) + add_definitions(-DQT_STRICT_ITERATORS) +endif() + +add_subdirectory(src) + +add_subdirectory(tests) +add_subdirectory(demos) diff --git a/poppler-24.05.0/qt6/demos/CMakeLists.txt b/poppler-24.05.0/qt6/demos/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..f7c770aa25d7834743015ea071d0b1cab4dfb5de --- /dev/null +++ b/poppler-24.05.0/qt6/demos/CMakeLists.txt @@ -0,0 +1,26 @@ +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../src + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/../src +) + +set(poppler_qt6viewer_SRCS + abstractinfodock.cpp + documentobserver.cpp + embeddedfiles.cpp + fonts.cpp + info.cpp + main_viewer.cpp + metadata.cpp + navigationtoolbar.cpp + optcontent.cpp + pageview.cpp + permissions.cpp + thumbnails.cpp + toc.cpp + viewer.cpp +) + +poppler_add_test(poppler_qt6viewer BUILD_QT6_TESTS ${poppler_qt6viewer_SRCS}) +target_link_libraries(poppler_qt6viewer poppler-qt6 Qt6::Widgets) diff --git a/poppler-24.05.0/qt6/demos/abstractinfodock.cpp b/poppler-24.05.0/qt6/demos/abstractinfodock.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8a2e216406413afff3ad969a8a48705cd570de24 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/abstractinfodock.cpp @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "fonts.h" + +AbstractInfoDock::AbstractInfoDock(QWidget *parent) : QDockWidget(parent), m_filled(false) +{ + connect(this, &AbstractInfoDock::visibilityChanged, this, &AbstractInfoDock::slotVisibilityChanged); +} + +AbstractInfoDock::~AbstractInfoDock() { } + +void AbstractInfoDock::documentLoaded() +{ + if (!isHidden()) { + fillInfo(); + m_filled = true; + } +} + +void AbstractInfoDock::documentClosed() +{ + m_filled = false; +} + +void AbstractInfoDock::pageChanged(int page) +{ + Q_UNUSED(page) +} + +void AbstractInfoDock::slotVisibilityChanged(bool visible) +{ + if (visible && document() && !m_filled) { + fillInfo(); + m_filled = true; + } +} diff --git a/poppler-24.05.0/qt6/demos/abstractinfodock.h b/poppler-24.05.0/qt6/demos/abstractinfodock.h new file mode 100644 index 0000000000000000000000000000000000000000..9dd2576f81c5a07f2a4a8d8c551aeab21ef58122 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/abstractinfodock.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef ABSTRACTINFODOCK_H +#define ABSTRACTINFODOCK_H + +#include + +#include "documentobserver.h" + +class AbstractInfoDock : public QDockWidget, public DocumentObserver +{ + Q_OBJECT + +public: + explicit AbstractInfoDock(QWidget *parent = nullptr); + ~AbstractInfoDock() override; + + void documentLoaded() override; + void documentClosed() override; + void pageChanged(int page) override; + +protected: + virtual void fillInfo() = 0; + +private Q_SLOTS: + void slotVisibilityChanged(bool visible); + +private: + bool m_filled; +}; + +#endif diff --git a/poppler-24.05.0/qt6/demos/documentobserver.cpp b/poppler-24.05.0/qt6/demos/documentobserver.cpp new file mode 100644 index 0000000000000000000000000000000000000000..9cf6b0483d9970bdc56951816527ce05729ca2d5 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/documentobserver.cpp @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Oliver Sander + * + * 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 "documentobserver.h" + +#include "viewer.h" + +DocumentObserver::DocumentObserver() : m_viewer(nullptr) { } + +DocumentObserver::~DocumentObserver() { } + +Poppler::Document *DocumentObserver::document() const +{ + return m_viewer->m_doc.get(); +} + +void DocumentObserver::setPage(int page) +{ + m_viewer->setPage(page); +} + +int DocumentObserver::page() const +{ + return m_viewer->page(); +} + +void DocumentObserver::reloadPage() +{ + m_viewer->setPage(m_viewer->page()); +} diff --git a/poppler-24.05.0/qt6/demos/documentobserver.h b/poppler-24.05.0/qt6/demos/documentobserver.h new file mode 100644 index 0000000000000000000000000000000000000000..83ac12ee8f516013ea354542bd45a7d145c77354 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/documentobserver.h @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2018, Albert Astals Cid + * + * 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. + */ + +#ifndef DOCUMENTOBSERVER_H +#define DOCUMENTOBSERVER_H + +class PdfViewer; +namespace Poppler { +class Document; +} + +class DocumentObserver +{ + friend class PdfViewer; + +public: + virtual ~DocumentObserver(); + DocumentObserver(const DocumentObserver &) = delete; + DocumentObserver &operator=(const DocumentObserver &) = delete; + + virtual void documentLoaded() = 0; + virtual void documentClosed() = 0; + virtual void pageChanged(int page) = 0; + +protected: + DocumentObserver(); + + Poppler::Document *document() const; + void setPage(int page); + int page() const; + void reloadPage(); + +private: + PdfViewer *m_viewer; +}; + +#endif diff --git a/poppler-24.05.0/qt6/demos/embeddedfiles.cpp b/poppler-24.05.0/qt6/demos/embeddedfiles.cpp new file mode 100644 index 0000000000000000000000000000000000000000..22df1f6991770a646a790265fae545456f74f3d0 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/embeddedfiles.cpp @@ -0,0 +1,73 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "embeddedfiles.h" + +#include + +#include + +EmbeddedFilesDock::EmbeddedFilesDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_table = new QTableWidget(this); + setWidget(m_table); + setWindowTitle(tr("Embedded files")); + m_table->setColumnCount(6); + m_table->setHorizontalHeaderLabels(QStringList() << tr("Name") << tr("Description") << tr("Size") << tr("Creation date") << tr("Modification date") << tr("Checksum")); + m_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); +} + +EmbeddedFilesDock::~EmbeddedFilesDock() { } + +void EmbeddedFilesDock::fillInfo() +{ + m_table->setHorizontalHeaderLabels(QStringList() << tr("Name") << tr("Description") << tr("Size") << tr("Creation date") << tr("Modification date") << tr("Checksum")); + if (!document()->hasEmbeddedFiles()) { + m_table->setItem(0, 0, new QTableWidgetItem(tr("No files"))); + return; + } + + const QList files = document()->embeddedFiles(); + m_table->setRowCount(files.count()); + int i = 0; + Q_FOREACH (Poppler::EmbeddedFile *file, files) { + m_table->setItem(i, 0, new QTableWidgetItem(file->name())); + m_table->setItem(i, 1, new QTableWidgetItem(file->description())); + m_table->setItem(i, 2, new QTableWidgetItem(QString::number(file->size()))); + m_table->setItem(i, 3, new QTableWidgetItem(QLocale().toString(file->createDate(), QLocale::ShortFormat))); + m_table->setItem(i, 4, new QTableWidgetItem(QLocale().toString(file->modDate(), QLocale::ShortFormat))); + const QByteArray checksum = file->checksum(); + const QString checksumString = !checksum.isEmpty() ? QString::fromLatin1(checksum.toHex()) : QStringLiteral("n/a"); + m_table->setItem(i, 5, new QTableWidgetItem(checksumString)); + ++i; + } +} + +void EmbeddedFilesDock::documentLoaded() +{ + if (document()->pageMode() == Poppler::Document::UseAttach) { + show(); + } +} + +void EmbeddedFilesDock::documentClosed() +{ + m_table->clear(); + m_table->setRowCount(0); + AbstractInfoDock::documentClosed(); +} diff --git a/poppler-24.05.0/qt6/demos/embeddedfiles.h b/poppler-24.05.0/qt6/demos/embeddedfiles.h new file mode 100644 index 0000000000000000000000000000000000000000..e4a40403562f8b7566d6ec107d1429ad7a555f2d --- /dev/null +++ b/poppler-24.05.0/qt6/demos/embeddedfiles.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef ATTACHMENTS_H +#define ATTACHMENTS_H + +#include "abstractinfodock.h" + +class QTableWidget; + +class EmbeddedFilesDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit EmbeddedFilesDock(QWidget *parent = nullptr); + ~EmbeddedFilesDock() override; + + void documentLoaded() override; + void documentClosed() override; + +protected: + void fillInfo() override; + +private: + QTableWidget *m_table; +}; + +#endif diff --git a/poppler-24.05.0/qt6/demos/fonts.cpp b/poppler-24.05.0/qt6/demos/fonts.cpp new file mode 100644 index 0000000000000000000000000000000000000000..9c282cf3276557d89361ea2dcbe9fcb8f3b30369 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/fonts.cpp @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "fonts.h" + +#include + +#include + +static QString yesNoStatement(bool value) +{ + return value ? QStringLiteral("yes") : QStringLiteral("no"); +} + +FontsDock::FontsDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_table = new QTableWidget(this); + setWidget(m_table); + setWindowTitle(tr("Fonts")); + m_table->setColumnCount(5); + m_table->setHorizontalHeaderLabels(QStringList() << tr("Name") << tr("Type") << tr("Embedded") << tr("Subset") << tr("File")); + m_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); +} + +FontsDock::~FontsDock() { } + +void FontsDock::fillInfo() +{ + const QList fonts = document()->fonts(); + m_table->setHorizontalHeaderLabels(QStringList() << tr("Name") << tr("Type") << tr("Embedded") << tr("Subset") << tr("File")); + m_table->setRowCount(fonts.count()); + int i = 0; + Q_FOREACH (const Poppler::FontInfo &font, fonts) { + if (font.name().isNull()) { + m_table->setItem(i, 0, new QTableWidgetItem(QStringLiteral("[none]"))); + } else { + m_table->setItem(i, 0, new QTableWidgetItem(font.name())); + } + m_table->setItem(i, 1, new QTableWidgetItem(font.typeName())); + m_table->setItem(i, 2, new QTableWidgetItem(yesNoStatement(font.isEmbedded()))); + m_table->setItem(i, 3, new QTableWidgetItem(yesNoStatement(font.isSubset()))); + m_table->setItem(i, 4, new QTableWidgetItem(font.file())); + ++i; + } +} + +void FontsDock::documentClosed() +{ + m_table->clear(); + m_table->setRowCount(0); + AbstractInfoDock::documentClosed(); +} diff --git a/poppler-24.05.0/qt6/demos/fonts.h b/poppler-24.05.0/qt6/demos/fonts.h new file mode 100644 index 0000000000000000000000000000000000000000..e8fed63f28b5096fe55efb5bee4ca48ea4e4faa1 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/fonts.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef FONTS_H +#define FONTS_H + +#include "abstractinfodock.h" + +class QTableWidget; + +class FontsDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit FontsDock(QWidget *parent = nullptr); + ~FontsDock() override; + + void documentClosed() override; + +protected: + void fillInfo() override; + +private: + QTableWidget *m_table; +}; + +#endif diff --git a/poppler-24.05.0/qt6/demos/info.cpp b/poppler-24.05.0/qt6/demos/info.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e00f5d85631bfb7580e5c5c054851363e6fe4d26 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/info.cpp @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "info.h" + +#include + +#include + +InfoDock::InfoDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_table = new QTableWidget(this); + setWidget(m_table); + setWindowTitle(tr("Information")); + m_table->setColumnCount(2); + m_table->setHorizontalHeaderLabels(QStringList() << tr("Key") << tr("Value")); + m_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); +} + +InfoDock::~InfoDock() { } + +void InfoDock::fillInfo() +{ + QStringList keys = document()->infoKeys(); + m_table->setHorizontalHeaderLabels(QStringList() << tr("Key") << tr("Value")); + m_table->setRowCount(keys.count()); + QStringList dateKeys; + dateKeys << QStringLiteral("CreationDate"); + dateKeys << QStringLiteral("ModDate"); + int i = 0; + Q_FOREACH (const QString &date, dateKeys) { + const int id = keys.indexOf(date); + if (id != -1) { + m_table->setItem(i, 0, new QTableWidgetItem(date)); + m_table->setItem(i, 1, new QTableWidgetItem(QLocale().toString(document()->date(date), QLocale::ShortFormat))); + ++i; + keys.removeAt(id); + } + } + Q_FOREACH (const QString &key, keys) { + m_table->setItem(i, 0, new QTableWidgetItem(key)); + m_table->setItem(i, 1, new QTableWidgetItem(document()->info(key))); + ++i; + } +} + +void InfoDock::documentClosed() +{ + m_table->clear(); + m_table->setRowCount(0); + AbstractInfoDock::documentClosed(); +} diff --git a/poppler-24.05.0/qt6/demos/info.h b/poppler-24.05.0/qt6/demos/info.h new file mode 100644 index 0000000000000000000000000000000000000000..0bbcf75d2089a4edc3c0f30d71794682099fd82a --- /dev/null +++ b/poppler-24.05.0/qt6/demos/info.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef INFO_H +#define INFO_H + +#include "abstractinfodock.h" + +class QTableWidget; + +class InfoDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit InfoDock(QWidget *parent = nullptr); + ~InfoDock() override; + + void documentClosed() override; + +protected: + void fillInfo() override; + +private: + QTableWidget *m_table; +}; + +#endif diff --git a/poppler-24.05.0/qt6/demos/main_viewer.cpp b/poppler-24.05.0/qt6/demos/main_viewer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ad2f3885a68579bde3be0bc0f5a451a600c9496a --- /dev/null +++ b/poppler-24.05.0/qt6/demos/main_viewer.cpp @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "viewer.h" + +#include + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + const QStringList args = QCoreApplication::arguments(); + PdfViewer *viewer = new PdfViewer(); + viewer->show(); + if (args.count() > 1) { + viewer->loadDocument(args.at(1)); + } + return app.exec(); +} diff --git a/poppler-24.05.0/qt6/demos/metadata.cpp b/poppler-24.05.0/qt6/demos/metadata.cpp new file mode 100644 index 0000000000000000000000000000000000000000..57460bf51f11ad0a18f6231bc9fa9114a33bcc01 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/metadata.cpp @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "metadata.h" + +#include + +#include + +MetadataDock::MetadataDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_edit = new QTextEdit(this); + setWidget(m_edit); + setWindowTitle(tr("Metadata")); + m_edit->setAcceptRichText(false); + m_edit->setReadOnly(true); +} + +MetadataDock::~MetadataDock() { } + +void MetadataDock::fillInfo() +{ + m_edit->setPlainText(document()->metadata()); +} + +void MetadataDock::documentClosed() +{ + m_edit->clear(); + AbstractInfoDock::documentClosed(); +} diff --git a/poppler-24.05.0/qt6/demos/metadata.h b/poppler-24.05.0/qt6/demos/metadata.h new file mode 100644 index 0000000000000000000000000000000000000000..0d58e840dbe781c924e9b1dadfc51fbfbb4f2947 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/metadata.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef METADATA_H +#define METADATA_H + +#include "abstractinfodock.h" + +class QTextEdit; + +class MetadataDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit MetadataDock(QWidget *parent = nullptr); + ~MetadataDock() override; + + void documentClosed() override; + +protected: + void fillInfo() override; + +private: + QTextEdit *m_edit; +}; + +#endif diff --git a/poppler-24.05.0/qt6/demos/navigationtoolbar.cpp b/poppler-24.05.0/qt6/demos/navigationtoolbar.cpp new file mode 100644 index 0000000000000000000000000000000000000000..00250a2bee800c53bf7aa1d76f7da897dbad57f5 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/navigationtoolbar.cpp @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * Copyright (C) 2013, Fabio D'Urso + * Copyright (C) 2019, Albert Astals Cid + * + * 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 "navigationtoolbar.h" + +#include + +#include +#include +#include + +NavigationToolBar::NavigationToolBar(QWidget *parent) : QToolBar(parent) +{ + m_firstAct = addAction(tr("First"), this, SLOT(slotGoFirst())); + m_prevAct = addAction(tr("Previous"), this, SLOT(slotGoPrev())); + m_pageCombo = new QComboBox(this); + connect(m_pageCombo, &QComboBox::activated, this, &NavigationToolBar::slotComboActivated); + addWidget(m_pageCombo); + m_nextAct = addAction(tr("Next"), this, SLOT(slotGoNext())); + m_lastAct = addAction(tr("Last"), this, SLOT(slotGoLast())); + + addSeparator(); + + m_zoomCombo = new QComboBox(this); + m_zoomCombo->setEditable(true); + m_zoomCombo->addItem(tr("10%")); + m_zoomCombo->addItem(tr("25%")); + m_zoomCombo->addItem(tr("33%")); + m_zoomCombo->addItem(tr("50%")); + m_zoomCombo->addItem(tr("66%")); + m_zoomCombo->addItem(tr("75%")); + m_zoomCombo->addItem(tr("100%")); + m_zoomCombo->addItem(tr("125%")); + m_zoomCombo->addItem(tr("150%")); + m_zoomCombo->addItem(tr("200%")); + m_zoomCombo->addItem(tr("300%")); + m_zoomCombo->addItem(tr("400%")); + m_zoomCombo->setCurrentIndex(6); // "100%" + connect(m_zoomCombo, &QComboBox::activated, this, &NavigationToolBar::slotZoomComboActivated); + addWidget(m_zoomCombo); + + m_rotationCombo = new QComboBox(this); + // NOTE: \302\260 = degree symbol + m_rotationCombo->addItem(tr("0\302\260")); + m_rotationCombo->addItem(tr("90\302\260")); + m_rotationCombo->addItem(tr("180\302\260")); + m_rotationCombo->addItem(tr("270\302\260")); + connect(m_rotationCombo, &QComboBox::currentIndexChanged, this, &NavigationToolBar::slotRotationComboChanged); + addWidget(m_rotationCombo); + + documentClosed(); +} + +NavigationToolBar::~NavigationToolBar() { } + +void NavigationToolBar::documentLoaded() +{ + const int pageCount = document()->numPages(); + for (int i = 0; i < pageCount; ++i) { + m_pageCombo->addItem(QString::number(i + 1)); + } + m_pageCombo->setEnabled(true); +} + +void NavigationToolBar::documentClosed() +{ + m_firstAct->setEnabled(false); + m_prevAct->setEnabled(false); + m_nextAct->setEnabled(false); + m_lastAct->setEnabled(false); + m_pageCombo->clear(); + m_pageCombo->setEnabled(false); +} + +void NavigationToolBar::pageChanged(int page) +{ + const int pageCount = document()->numPages(); + m_firstAct->setEnabled(page > 0); + m_prevAct->setEnabled(page > 0); + m_nextAct->setEnabled(page < (pageCount - 1)); + m_lastAct->setEnabled(page < (pageCount - 1)); + m_pageCombo->setCurrentIndex(page); +} + +void NavigationToolBar::slotGoFirst() +{ + setPage(0); +} + +void NavigationToolBar::slotGoPrev() +{ + setPage(page() - 1); +} + +void NavigationToolBar::slotGoNext() +{ + setPage(page() + 1); +} + +void NavigationToolBar::slotGoLast() +{ + setPage(document()->numPages() - 1); +} + +void NavigationToolBar::slotComboActivated(int index) +{ + setPage(index); +} + +void NavigationToolBar::slotZoomComboActivated(int index) +{ + QString text = m_zoomCombo->currentText(); + text.remove(QLatin1Char('%')); + bool ok = false; + int value = text.toInt(&ok); + if (ok && value >= 10) { + emit zoomChanged(qreal(value) / 100); + } +} + +void NavigationToolBar::slotRotationComboChanged(int idx) +{ + emit rotationChanged(idx * 90); +} diff --git a/poppler-24.05.0/qt6/demos/navigationtoolbar.h b/poppler-24.05.0/qt6/demos/navigationtoolbar.h new file mode 100644 index 0000000000000000000000000000000000000000..ffec8f4de86987003fc783fa48f3104071f69ab7 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/navigationtoolbar.h @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * Copyright (C) 2013, Fabio D'Urso + * Copyright (C) 2019, 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef NAVIGATIONTOOLBAR_H +#define NAVIGATIONTOOLBAR_H + +#include + +#include "documentobserver.h" + +class QAction; +class QComboBox; + +class NavigationToolBar : public QToolBar, public DocumentObserver +{ + Q_OBJECT + +public: + explicit NavigationToolBar(QWidget *parent = nullptr); + ~NavigationToolBar() override; + + void documentLoaded() override; + void documentClosed() override; + void pageChanged(int page) override; + +Q_SIGNALS: + void zoomChanged(qreal value); // NOLINT(readability-inconsistent-declaration-parameter-name) + void rotationChanged(int rotation); // NOLINT(readability-inconsistent-declaration-parameter-name) + +private Q_SLOTS: + void slotGoFirst(); + void slotGoPrev(); + void slotGoNext(); + void slotGoLast(); + void slotComboActivated(int index); + void slotZoomComboActivated(int index); + void slotRotationComboChanged(int idx); + +private: + QAction *m_firstAct; + QAction *m_prevAct; + QComboBox *m_pageCombo; + QAction *m_nextAct; + QAction *m_lastAct; + QComboBox *m_zoomCombo; + QComboBox *m_rotationCombo; +}; + +#endif diff --git a/poppler-24.05.0/qt6/demos/optcontent.cpp b/poppler-24.05.0/qt6/demos/optcontent.cpp new file mode 100644 index 0000000000000000000000000000000000000000..39fc3e676e53bc8b2094a4c70857716b2430f316 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/optcontent.cpp @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2008, Pino Toscano + * + * 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 "optcontent.h" + +#include + +#include + +OptContentDock::OptContentDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_view = new QTreeView(this); + setWidget(m_view); + setWindowTitle(tr("Optional content")); + m_view->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); +} + +OptContentDock::~OptContentDock() { } + +void OptContentDock::documentLoaded() +{ + AbstractInfoDock::documentLoaded(); + if (document()->pageMode() == Poppler::Document::UseOC) { + show(); + } +} + +void OptContentDock::fillInfo() +{ + if (!document()->hasOptionalContent()) { + return; + } + + m_view->setModel(document()->optionalContentModel()); + connect(m_view->model(), &QAbstractItemModel::dataChanged, this, &OptContentDock::reloadImage); + m_view->expandToDepth(1); +} + +void OptContentDock::documentClosed() +{ + m_view->setModel(nullptr); + AbstractInfoDock::documentClosed(); +} + +void OptContentDock::reloadImage() +{ + reloadPage(); +} diff --git a/poppler-24.05.0/qt6/demos/optcontent.h b/poppler-24.05.0/qt6/demos/optcontent.h new file mode 100644 index 0000000000000000000000000000000000000000..9da451bef674ac086ed6f9fd123a3892638bd050 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/optcontent.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef OPTCONTENT_H +#define OPTCONTENT_H + +#include "abstractinfodock.h" + +class QTreeView; + +class OptContentDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit OptContentDock(QWidget *parent = nullptr); + ~OptContentDock() override; + + void documentLoaded() override; + void documentClosed() override; + +protected: + void fillInfo() override; + +private Q_SLOTS: + void reloadImage(); + +private: + QTreeView *m_view; +}; + +#endif diff --git a/poppler-24.05.0/qt6/demos/pageview.cpp b/poppler-24.05.0/qt6/demos/pageview.cpp new file mode 100644 index 0000000000000000000000000000000000000000..43f02d32e769fee4ccc60efb5c5da4ba57f35532 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/pageview.cpp @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * Copyright (C) 2013, Fabio D'Urso + * Copyright (C) 2017, 2020, Albert Astals Cid + * Copyright (C) 2021, Oliver Sander + * + * 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 "pageview.h" + +#include + +#include +#include +#include +#include +#include + +PageView::PageView(QWidget *parent) : QScrollArea(parent), m_zoom(1.0), m_rotation(0), m_dpiX(physicalDpiX()), m_dpiY(physicalDpiY()) +{ + m_imageLabel = new QLabel(this); + m_imageLabel->resize(0, 0); + setWidget(m_imageLabel); +} + +PageView::~PageView() { } + +void PageView::documentLoaded() { } + +void PageView::documentClosed() +{ + m_imageLabel->clear(); + m_imageLabel->resize(0, 0); +} + +void PageView::pageChanged(int page) +{ + std::unique_ptr popplerPage = document()->page(page); + + if (!popplerPage) { + qDebug() << "Page" << page << "is malformed"; + return; + } + const double resX = m_dpiX * m_zoom; + const double resY = m_dpiY * m_zoom; + + Poppler::Page::Rotation rot; + if (m_rotation == 0) { + rot = Poppler::Page::Rotate0; + } else if (m_rotation == 90) { + rot = Poppler::Page::Rotate90; + } else if (m_rotation == 180) { + rot = Poppler::Page::Rotate180; + } else { // m_rotation == 270 + rot = Poppler::Page::Rotate270; + } + + QImage image = popplerPage->renderToImage(resX, resY, -1, -1, -1, -1, rot); + if (!image.isNull()) { + m_imageLabel->resize(image.size()); + m_imageLabel->setPixmap(QPixmap::fromImage(image)); + } else { + m_imageLabel->resize(0, 0); + m_imageLabel->setPixmap(QPixmap()); + } +} + +void PageView::slotZoomChanged(qreal value) +{ + m_zoom = value; + if (!document()) { + return; + } + reloadPage(); +} + +void PageView::slotRotationChanged(int value) +{ + m_rotation = value; + if (!document()) { + return; + } + reloadPage(); +} diff --git a/poppler-24.05.0/qt6/demos/pageview.h b/poppler-24.05.0/qt6/demos/pageview.h new file mode 100644 index 0000000000000000000000000000000000000000..c7446d4321dad35431997646c4b43bc9e1e23614 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/pageview.h @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * Copyright (C) 2013, Fabio D'Urso + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef PAGEVIEW_H +#define PAGEVIEW_H + +#include + +#include "documentobserver.h" + +class QLabel; + +class PageView : public QScrollArea, public DocumentObserver +{ + Q_OBJECT + +public: + explicit PageView(QWidget *parent = nullptr); + ~PageView() override; + + void documentLoaded() override; + void documentClosed() override; + void pageChanged(int page) override; + +public Q_SLOTS: + void slotZoomChanged(qreal value); + void slotRotationChanged(int value); + +private: + QLabel *m_imageLabel; + qreal m_zoom; + int m_rotation; + int m_dpiX; + int m_dpiY; +}; + +#endif diff --git a/poppler-24.05.0/qt6/demos/permissions.cpp b/poppler-24.05.0/qt6/demos/permissions.cpp new file mode 100644 index 0000000000000000000000000000000000000000..9c0ed93013f3ae8ce3c008e36f713bec6ea087f7 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/permissions.cpp @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * + * 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 "permissions.h" + +#include + +#include + +PermissionsDock::PermissionsDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_table = new QListWidget(this); + setWidget(m_table); + setWindowTitle(tr("Permissions")); + m_table->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); +} + +PermissionsDock::~PermissionsDock() { } + +void PermissionsDock::fillInfo() +{ +#define ADD_ROW(title, function) \ + do { \ + QListWidgetItem *item = new QListWidgetItem(); \ + item->setFlags(item->flags() & ~Qt::ItemIsEnabled); \ + item->setText(QStringLiteral(title)); \ + item->setCheckState(document()->function() ? Qt::Checked : Qt::Unchecked); \ + m_table->addItem(item); \ + } while (0) + ADD_ROW("Print", okToPrint); + ADD_ROW("PrintHiRes", okToPrintHighRes); + ADD_ROW("Change", okToChange); + ADD_ROW("Copy", okToCopy); + ADD_ROW("Add Notes", okToAddNotes); + ADD_ROW("Fill Forms", okToFillForm); + ADD_ROW("Create Forms", okToCreateFormFields); + ADD_ROW("Extract for accessibility", okToExtractForAccessibility); + ADD_ROW("Assemble", okToAssemble); +#undef ADD_ROW +} + +void PermissionsDock::documentClosed() +{ + m_table->clear(); + AbstractInfoDock::documentClosed(); +} diff --git a/poppler-24.05.0/qt6/demos/permissions.h b/poppler-24.05.0/qt6/demos/permissions.h new file mode 100644 index 0000000000000000000000000000000000000000..06293ccc0e1b3c2fa32ff1325ca1158937f1466b --- /dev/null +++ b/poppler-24.05.0/qt6/demos/permissions.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef PERMISSIONS_H +#define PERMISSIONS_H + +#include "abstractinfodock.h" + +class QListWidget; + +class PermissionsDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit PermissionsDock(QWidget *parent = nullptr); + ~PermissionsDock() override; + + void documentClosed() override; + +protected: + void fillInfo() override; + +private: + QListWidget *m_table; +}; + +#endif diff --git a/poppler-24.05.0/qt6/demos/thumbnails.cpp b/poppler-24.05.0/qt6/demos/thumbnails.cpp new file mode 100644 index 0000000000000000000000000000000000000000..065fd711acca816e91966f92d3933be9cfbeb2c5 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/thumbnails.cpp @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2009, Shawn Rutledge + * Copyright (C) 2009, Pino Toscano + * Copyright (C) 2020, Albert Astals Cid + * Copyright (C) 2021, Oliver Sander + * + * 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 "thumbnails.h" + +#include + +#include + +static const int PageRole = Qt::UserRole + 1; + +ThumbnailsDock::ThumbnailsDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_list = new QListWidget(this); + setWidget(m_list); + setWindowTitle(tr("Thumbnails")); + m_list->setViewMode(QListView::ListMode); + m_list->setMovement(QListView::Static); + m_list->setVerticalScrollMode(QListView::ScrollPerPixel); + connect(m_list, &QListWidget::itemActivated, this, &ThumbnailsDock::slotItemActivated); +} + +ThumbnailsDock::~ThumbnailsDock() { } + +void ThumbnailsDock::fillInfo() +{ + const int num = document()->numPages(); + QSize maxSize; + for (int i = 0; i < num; ++i) { + const std::unique_ptr page = document()->page(i); + const QImage image = page ? page->thumbnail() : QImage(); + if (!image.isNull()) { + QListWidgetItem *item = new QListWidgetItem(); + item->setText(QString::number(i + 1)); + item->setData(Qt::DecorationRole, QPixmap::fromImage(image)); + item->setData(PageRole, i); + m_list->addItem(item); + maxSize.setWidth(qMax(maxSize.width(), image.width())); + maxSize.setHeight(qMax(maxSize.height(), image.height())); + } + } + if (num > 0) { + m_list->setGridSize(maxSize); + m_list->setIconSize(maxSize); + } +} + +void ThumbnailsDock::documentClosed() +{ + m_list->clear(); + AbstractInfoDock::documentClosed(); +} + +void ThumbnailsDock::slotItemActivated(QListWidgetItem *item) +{ + if (!item) { + return; + } + + setPage(item->data(PageRole).toInt()); +} diff --git a/poppler-24.05.0/qt6/demos/thumbnails.h b/poppler-24.05.0/qt6/demos/thumbnails.h new file mode 100644 index 0000000000000000000000000000000000000000..a568df655c926b4bd8fb5b23f26298330868f179 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/thumbnails.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2009, Shawn Rutledge + * Copyright (C) 2009, Pino Toscano + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef THUMBNAILS_H +#define THUMBNAILS_H + +#include "abstractinfodock.h" + +class QListWidget; +class QListWidgetItem; + +class ThumbnailsDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit ThumbnailsDock(QWidget *parent = nullptr); + ~ThumbnailsDock() override; + + void documentClosed() override; + +protected: + void fillInfo() override; + +private Q_SLOTS: + void slotItemActivated(QListWidgetItem *item); + +private: + QListWidget *m_list; +}; + +#endif diff --git a/poppler-24.05.0/qt6/demos/toc.cpp b/poppler-24.05.0/qt6/demos/toc.cpp new file mode 100644 index 0000000000000000000000000000000000000000..491f26babdee3978b7452ffde53e4e560f2b25c8 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/toc.cpp @@ -0,0 +1,168 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2018, Adam Reichold + * Copyright (C) 2019, Albert Astals Cid + * + * 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 "toc.h" + +#include + +#include +#include +#include + +#include + +struct Node +{ + Node(Poppler::OutlineItem &&item, int row, Node *parent) : m_row(row), m_parent(parent), m_item(std::move(item)) { } + + ~Node() { qDeleteAll(m_children); } + + Node(const Node &) = delete; + Node &operator=(const Node &) = delete; + + int m_row; + Node *m_parent; + Poppler::OutlineItem m_item; + QVector m_children; +}; + +class TocModel : public QAbstractItemModel +{ + Q_OBJECT +public: + TocModel(QVector &&items, QObject *parent) : QAbstractItemModel(parent) + { + for (int i = 0; i < items.count(); ++i) { + m_topItems << new Node(std::move(items[i]), i, nullptr); + } + } + + ~TocModel() override { qDeleteAll(m_topItems); } + + QVariant data(const QModelIndex &index, int role) const override + { + if (role != Qt::DisplayRole) { + return {}; + } + + Node *n = static_cast(index.internalPointer()); + return n->m_item.name(); + } + + QModelIndex index(int row, int column, const QModelIndex &parent) const override + { + Node *p = static_cast(parent.internalPointer()); + const QVector &children = p ? p->m_children : m_topItems; + + return createIndex(row, column, children[row]); + } + + QModelIndex parent(const QModelIndex &child) const override + { + Node *n = static_cast(child.internalPointer()); + if (n->m_parent == nullptr) { + return QModelIndex(); + } else { + return createIndex(n->m_parent->m_row, 0, n->m_parent); + } + } + + int rowCount(const QModelIndex &parent) const override + { + Node *n = static_cast(parent.internalPointer()); + if (!n) { + return m_topItems.count(); + } + + if (n->m_children.isEmpty() && !n->m_item.isNull()) { + QVector items = n->m_item.children(); + for (int i = 0; i < items.count(); ++i) { + n->m_children << new Node(std::move(items[i]), i, n); + } + } + + return n->m_children.count(); + } + + bool hasChildren(const QModelIndex &parent) const override + { + Node *n = static_cast(parent.internalPointer()); + if (!n) { + return true; + } + + return n->m_item.hasChildren(); + } + + int columnCount(const QModelIndex &parent) const override { return 1; } + +private: + QVector m_topItems; +}; + +TocDock::TocDock(QWidget *parent) : AbstractInfoDock(parent) +{ + m_tree = new QTreeView(this); + setWidget(m_tree); + m_tree->setAlternatingRowColors(true); + m_tree->header()->hide(); + setWindowTitle(tr("TOC")); + m_tree->setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); +} + +TocDock::~TocDock() { } + +void TocDock::expandItemModels(const QModelIndex &parent) +{ + TocModel *model = static_cast(m_tree->model()); + for (int i = 0; i < model->rowCount(parent); ++i) { + QModelIndex index = model->index(i, 0, parent); + Node *n = static_cast(index.internalPointer()); + if (n->m_item.isOpen()) { + m_tree->setExpanded(index, true); + expandItemModels(index); + } + } +} + +void TocDock::fillInfo() +{ + auto outline = document()->outline(); + if (!outline.isEmpty()) { + TocModel *model = new TocModel(std::move(outline), this); + m_tree->setModel(model); + + expandItemModels(QModelIndex()); + } else { + QStandardItemModel *model = new QStandardItemModel(this); + QStandardItem *item = new QStandardItem(tr("No TOC")); + item->setFlags(item->flags() & ~Qt::ItemIsEnabled); + model->appendRow(item); + m_tree->setModel(model); + } +} + +void TocDock::documentClosed() +{ + m_tree->setModel(nullptr); + AbstractInfoDock::documentClosed(); +} + +#include "toc.moc" diff --git a/poppler-24.05.0/qt6/demos/toc.h b/poppler-24.05.0/qt6/demos/toc.h new file mode 100644 index 0000000000000000000000000000000000000000..fa5ec591f58f1758b8a379986762db0e6f8dc782 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/toc.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2019, 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef TOC_H +#define TOC_H + +#include "abstractinfodock.h" + +class QTreeView; + +class TocDock : public AbstractInfoDock +{ + Q_OBJECT + +public: + explicit TocDock(QWidget *parent = nullptr); + ~TocDock() override; + + void documentClosed() override; + +protected: + void fillInfo() override; + void expandItemModels(const QModelIndex &parent); + +private: + QTreeView *m_tree; +}; + +#endif diff --git a/poppler-24.05.0/qt6/demos/viewer.cpp b/poppler-24.05.0/qt6/demos/viewer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..da88df1c8f309936dadf89522190c5334af9d4d5 --- /dev/null +++ b/poppler-24.05.0/qt6/demos/viewer.cpp @@ -0,0 +1,331 @@ +/* + * Copyright (C) 2008-2009, Pino Toscano + * Copyright (C) 2008, 2019, 2020, Albert Astals Cid + * Copyright (C) 2009, Shawn Rutledge + * Copyright (C) 2013, Fabio D'Urso + * Copyright (C) 2020, 2021, Oliver Sander + * Copyright (C) 2021, Mahmoud Khalil + * + * 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 "viewer.h" + +#include "embeddedfiles.h" +#include "fonts.h" +#include "info.h" +#include "metadata.h" +#include "navigationtoolbar.h" +#include "optcontent.h" +#include "pageview.h" +#include "permissions.h" +#include "thumbnails.h" +#include "toc.h" + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +PdfViewer::PdfViewer(QWidget *parent) : QMainWindow(parent), m_currentPage(0), m_doc(nullptr) +{ + setWindowTitle(tr("Poppler-Qt6 Demo")); + + // setup the menus + QMenu *fileMenu = menuBar()->addMenu(tr("&File")); + m_fileOpenAct = fileMenu->addAction(tr("&Open"), this, &PdfViewer::slotOpenFile); + m_fileOpenAct->setShortcut(Qt::CTRL | Qt::Key_O); + fileMenu->addSeparator(); + m_fileSaveCopyAct = fileMenu->addAction(tr("&Save a Copy..."), this, &PdfViewer::slotSaveCopy); + m_fileSaveCopyAct->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_S); + m_fileSaveCopyAct->setEnabled(false); + fileMenu->addSeparator(); + QAction *act = fileMenu->addAction(tr("&Quit"), qApp, &QApplication::closeAllWindows); + act->setShortcut(Qt::CTRL | Qt::Key_Q); + + QMenu *viewMenu = menuBar()->addMenu(tr("&View")); + + QMenu *settingsMenu = menuBar()->addMenu(tr("&Settings")); + m_settingsTextAAAct = settingsMenu->addAction(tr("Text Antialias")); + m_settingsTextAAAct->setCheckable(true); + connect(m_settingsTextAAAct, &QAction::toggled, this, &PdfViewer::slotToggleTextAA); + m_settingsGfxAAAct = settingsMenu->addAction(tr("Graphics Antialias")); + m_settingsGfxAAAct->setCheckable(true); + connect(m_settingsGfxAAAct, &QAction::toggled, this, &PdfViewer::slotToggleGfxAA); + QMenu *settingsRenderMenu = settingsMenu->addMenu(tr("Render Backend")); + m_settingsRenderBackendGrp = new QActionGroup(settingsRenderMenu); + m_settingsRenderBackendGrp->setExclusive(true); + act = settingsRenderMenu->addAction(tr("Splash")); + act->setCheckable(true); + act->setChecked(true); + act->setData(QVariant::fromValue(0)); + m_settingsRenderBackendGrp->addAction(act); + act = settingsRenderMenu->addAction(tr("QPainter")); + act->setCheckable(true); + act->setData(QVariant::fromValue(1)); + m_settingsRenderBackendGrp->addAction(act); + connect(m_settingsRenderBackendGrp, &QActionGroup::triggered, this, &PdfViewer::slotRenderBackend); + + QMenu *helpMenu = menuBar()->addMenu(tr("&Help")); + act = helpMenu->addAction(tr("&About"), this, &PdfViewer::slotAbout); + act = helpMenu->addAction(tr("About &Qt"), this, &PdfViewer::slotAboutQt); + + NavigationToolBar *navbar = new NavigationToolBar(this); + addToolBar(navbar); + m_observers.append(navbar); + + PageView *view = new PageView(this); + setCentralWidget(view); + m_observers.append(view); + + InfoDock *infoDock = new InfoDock(this); + addDockWidget(Qt::LeftDockWidgetArea, infoDock); + infoDock->hide(); + viewMenu->addAction(infoDock->toggleViewAction()); + m_observers.append(infoDock); + + TocDock *tocDock = new TocDock(this); + addDockWidget(Qt::LeftDockWidgetArea, tocDock); + tocDock->hide(); + viewMenu->addAction(tocDock->toggleViewAction()); + m_observers.append(tocDock); + + FontsDock *fontsDock = new FontsDock(this); + addDockWidget(Qt::LeftDockWidgetArea, fontsDock); + fontsDock->hide(); + viewMenu->addAction(fontsDock->toggleViewAction()); + m_observers.append(fontsDock); + + PermissionsDock *permissionsDock = new PermissionsDock(this); + addDockWidget(Qt::LeftDockWidgetArea, permissionsDock); + permissionsDock->hide(); + viewMenu->addAction(permissionsDock->toggleViewAction()); + m_observers.append(permissionsDock); + + ThumbnailsDock *thumbnailsDock = new ThumbnailsDock(this); + addDockWidget(Qt::LeftDockWidgetArea, thumbnailsDock); + thumbnailsDock->hide(); + viewMenu->addAction(thumbnailsDock->toggleViewAction()); + m_observers.append(thumbnailsDock); + + EmbeddedFilesDock *embfilesDock = new EmbeddedFilesDock(this); + addDockWidget(Qt::BottomDockWidgetArea, embfilesDock); + embfilesDock->hide(); + viewMenu->addAction(embfilesDock->toggleViewAction()); + m_observers.append(embfilesDock); + + MetadataDock *metadataDock = new MetadataDock(this); + addDockWidget(Qt::BottomDockWidgetArea, metadataDock); + metadataDock->hide(); + viewMenu->addAction(metadataDock->toggleViewAction()); + m_observers.append(metadataDock); + + OptContentDock *optContentDock = new OptContentDock(this); + addDockWidget(Qt::LeftDockWidgetArea, optContentDock); + optContentDock->hide(); + viewMenu->addAction(optContentDock->toggleViewAction()); + m_observers.append(optContentDock); + + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->m_viewer = this; + } + + connect(navbar, &NavigationToolBar::zoomChanged, view, &PageView::slotZoomChanged); + connect(navbar, &NavigationToolBar::rotationChanged, view, &PageView::slotRotationChanged); + + // activate AA by default + m_settingsTextAAAct->setChecked(true); + m_settingsGfxAAAct->setChecked(true); +} + +PdfViewer::~PdfViewer() +{ + closeDocument(); +} + +QSize PdfViewer::sizeHint() const +{ + return QSize(500, 600); +} + +void PdfViewer::loadDocument(const QString &file) +{ + // resetting xrefReconstructed each time we load new document + xrefReconstructed = false; + std::unique_ptr newdoc = Poppler::Document::load(file); + if (!newdoc) { + QMessageBox msgbox(QMessageBox::Critical, tr("Open Error"), tr("Cannot open:\n") + file, QMessageBox::Ok, this); + msgbox.exec(); + return; + } + + while (newdoc->isLocked()) { + bool ok = true; + QString password = QInputDialog::getText(this, tr("Document Password"), tr("Please insert the password of the document:"), QLineEdit::Password, QString(), &ok); + if (!ok) { + return; + } + newdoc->unlock(password.toLatin1(), password.toLatin1()); + } + + closeDocument(); + + m_doc = std::move(newdoc); + + m_doc->setRenderHint(Poppler::Document::TextAntialiasing, m_settingsTextAAAct->isChecked()); + m_doc->setRenderHint(Poppler::Document::Antialiasing, m_settingsGfxAAAct->isChecked()); + m_doc->setRenderBackend((Poppler::Document::RenderBackend)m_settingsRenderBackendGrp->checkedAction()->data().toInt()); + if (m_doc->xrefWasReconstructed()) { + xrefReconstructedHandler(); + } else { + std::function cb = [this]() { xrefReconstructedHandler(); }; + + m_doc->setXRefReconstructedCallback(cb); + } + + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->documentLoaded(); + obs->pageChanged(0); + } + + m_fileSaveCopyAct->setEnabled(true); +} + +void PdfViewer::closeDocument() +{ + if (!m_doc) { + return; + } + + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->documentClosed(); + } + + m_currentPage = 0; + m_doc = nullptr; + + m_fileSaveCopyAct->setEnabled(false); +} + +void PdfViewer::xrefReconstructedHandler() +{ + if (!xrefReconstructed) { + QMessageBox msgbox(QMessageBox::Critical, tr("File may be corrupted"), tr("The PDF may be broken but we're still showing something, contents may not be correct"), QMessageBox::Ok, this); + msgbox.exec(); + + xrefReconstructed = true; + } +} + +void PdfViewer::slotOpenFile() +{ + QString fileName = QFileDialog::getOpenFileName(this, tr("Open PDF Document"), QDir::homePath(), tr("PDF Documents (*.pdf)")); + if (fileName.isEmpty()) { + return; + } + + loadDocument(fileName); +} + +void PdfViewer::slotSaveCopy() +{ + if (!m_doc) { + return; + } + + QString fileName = QFileDialog::getSaveFileName(this, tr("Save Copy"), QDir::homePath(), tr("PDF Documents (*.pdf)")); + if (fileName.isEmpty()) { + return; + } + + std::unique_ptr converter = m_doc->pdfConverter(); + converter->setOutputFileName(fileName); + converter->setPDFOptions(converter->pdfOptions() & ~Poppler::PDFConverter::WithChanges); + if (!converter->convert()) { + QMessageBox msgbox(QMessageBox::Critical, tr("Save Error"), tr("Cannot export to:\n%1").arg(fileName), QMessageBox::Ok, this); + } +} + +void PdfViewer::slotAbout() +{ + QMessageBox::about(this, tr("About Poppler-Qt6 Demo"), tr("This is a demo of the Poppler-Qt6 library.")); +} + +void PdfViewer::slotAboutQt() +{ + QMessageBox::aboutQt(this); +} + +void PdfViewer::slotToggleTextAA(bool value) +{ + if (!m_doc) { + return; + } + + m_doc->setRenderHint(Poppler::Document::TextAntialiasing, value); + + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->pageChanged(m_currentPage); + } +} + +void PdfViewer::slotToggleGfxAA(bool value) +{ + if (!m_doc) { + return; + } + + m_doc->setRenderHint(Poppler::Document::Antialiasing, value); + + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->pageChanged(m_currentPage); + } +} + +void PdfViewer::slotRenderBackend(QAction *act) +{ + if (!m_doc || !act) { + return; + } + + m_doc->setRenderBackend((Poppler::Document::RenderBackend)act->data().toInt()); + + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->pageChanged(m_currentPage); + } +} + +void PdfViewer::setPage(int page) +{ + Q_FOREACH (DocumentObserver *obs, m_observers) { + obs->pageChanged(page); + } + + m_currentPage = page; +} + +int PdfViewer::page() const +{ + return m_currentPage; +} diff --git a/poppler-24.05.0/qt6/demos/viewer.h b/poppler-24.05.0/qt6/demos/viewer.h new file mode 100644 index 0000000000000000000000000000000000000000..bb1a990ea37b77675224e7f2dd3be596b7642f0f --- /dev/null +++ b/poppler-24.05.0/qt6/demos/viewer.h @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2021, Mahmoud Khalil + * Copyright (C) 2021, Oliver Sander + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef PDFVIEWER_H +#define PDFVIEWER_H + +#include + +class QAction; +class QActionGroup; +class QLabel; +class DocumentObserver; +namespace Poppler { +class Document; +} + +class PdfViewer : public QMainWindow +{ + Q_OBJECT + + friend class DocumentObserver; + +public: + explicit PdfViewer(QWidget *parent = nullptr); + ~PdfViewer() override; + + QSize sizeHint() const override; + + void loadDocument(const QString &file); + void closeDocument(); + +private Q_SLOTS: + void slotOpenFile(); + void slotSaveCopy(); + void slotAbout(); + void slotAboutQt(); + void slotToggleTextAA(bool value); + void slotToggleGfxAA(bool value); + void slotRenderBackend(QAction *act); + +private: + void setPage(int page); + int page() const; + void xrefReconstructedHandler(); + + int m_currentPage; + bool xrefReconstructed; + + QAction *m_fileOpenAct; + QAction *m_fileSaveCopyAct; + QAction *m_settingsTextAAAct; + QAction *m_settingsGfxAAAct; + QActionGroup *m_settingsRenderBackendGrp; + + QList m_observers; + + std::unique_ptr m_doc; +}; + +#endif diff --git a/poppler-24.05.0/qt6/src/CMakeLists.txt b/poppler-24.05.0/qt6/src/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..58782b92a161ae44034ddc9729cd190632e2d727 --- /dev/null +++ b/poppler-24.05.0/qt6/src/CMakeLists.txt @@ -0,0 +1,67 @@ +add_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +) + +set(CMAKE_C_VISIBILITY_PRESET hidden) +set(CMAKE_CXX_VISIBILITY_PRESET hidden) +set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) + +configure_file(poppler-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/poppler-version.h @ONLY) + +set(poppler_qt6_SRCS + poppler-annotation.cc + poppler-document.cc + poppler-embeddedfile.cc + poppler-fontinfo.cc + poppler-form.cc + poppler-link.cc + poppler-link-extractor.cc + poppler-movie.cc + poppler-optcontent.cc + poppler-page.cc + poppler-base-converter.cc + poppler-pdf-converter.cc + poppler-private.cc + poppler-ps-converter.cc + poppler-qiodeviceinstream.cc + poppler-qiodeviceoutstream.cc + poppler-sound.cc + poppler-textbox.cc + poppler-page-transition.cc + poppler-media.cc + poppler-outline.cc + QPainterOutputDev.cc + poppler-version.cpp +) +add_library(poppler-qt6 ${poppler_qt6_SRCS}) +generate_export_header(poppler-qt6 BASE_NAME poppler-qt6 EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h") +set_target_properties(poppler-qt6 PROPERTIES VERSION 3.5.0 SOVERSION 3) +if(MINGW AND BUILD_SHARED_LIBS) + get_target_property(POPPLER_QT6_SOVERSION poppler-qt6 SOVERSION) + set_target_properties(poppler-qt6 PROPERTIES SUFFIX "-${POPPLER_QT6_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") +endif() +target_link_libraries(poppler-qt6 poppler Qt6::Core Qt6::Gui Freetype::Freetype) +if (ENABLE_NSS3) + target_include_directories(poppler-qt6 SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) +endif() +if(USE_CMS) + target_link_libraries(poppler-qt6 poppler ${LCMS2_LIBRARIES}) + target_include_directories(poppler-qt6 SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) +endif() +install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +install(FILES + poppler-qt6.h + poppler-link.h + poppler-annotation.h + poppler-form.h + poppler-optcontent.h + poppler-page-transition.h + poppler-media.h + ${CMAKE_CURRENT_BINARY_DIR}/poppler-export.h + ${CMAKE_CURRENT_BINARY_DIR}/poppler-version.h + DESTINATION include/poppler/qt6) + diff --git a/poppler-24.05.0/qt6/src/Doxyfile b/poppler-24.05.0/qt6/src/Doxyfile new file mode 100644 index 0000000000000000000000000000000000000000..d3911df8ac6984fb595c51a0e703d468b04b9718 --- /dev/null +++ b/poppler-24.05.0/qt6/src/Doxyfile @@ -0,0 +1,1637 @@ +# Doxyfile 1.7.1 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = "Poppler Qt6" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = 24.05.0 + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = NO + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = YES + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this +# tag. The format is ext=language, where ext is a file extension, and language +# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, +# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions +# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = NO + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = YES + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = NO + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = YES + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = YES + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. The create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text " + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = Mainpage.dox \ + poppler-annotation.h \ + poppler-form.h \ + poppler-link.h \ + poppler-qt6.h \ + poppler-optcontent.h \ + poppler-page-transition.h + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = YES + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = YES + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = APIDOCS-html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the stylesheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. + +GENERATE_QHP = YES + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = poppler-qt6.qch + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.freedesktop.poppler.qt6 + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = "Poppler 0.15.0" + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = poppler + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = poppler + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = qhelpgenerator + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = NO + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvances is that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = YES + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = APIDOCS-latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = NO + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = YES + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = YES + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = "Q_DECL_DEPRECATED=" \ + "POPPLER_QT6_EXPORT=" + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is +# allowed to run in parallel. When set to 0 (the default) doxygen will +# base this on the number of processors available in the system. You can set it +# explicitly to a value larger than 0 to get control over the balance +# between CPU load and processing speed. + +DOT_NUM_THREADS = 0 + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans.ttf + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff --git a/poppler-24.05.0/qt6/src/Mainpage.dox b/poppler-24.05.0/qt6/src/Mainpage.dox new file mode 100644 index 0000000000000000000000000000000000000000..da7970d521f3af08ff02b10eef6dd04bb230b0dc --- /dev/null +++ b/poppler-24.05.0/qt6/src/Mainpage.dox @@ -0,0 +1,105 @@ +/** +@mainpage The Poppler Qt6 interface library + +The %Poppler Qt6 interface library, libpoppler-qt6, is a library that +allows Qt6 programmers to easily load and render PDF files. The +%Poppler Qt6 interface library uses poppler internally to do its job, +but the Qt6 programmer will never have to worry about poppler +internals. + + +@section help Current Status + +The %Poppler Qt6 interface library is quite stable and working. + +@section refimpl Example Programs + +Examples programs can be found in the qt6/test directory. The %Poppler +Qt6 interface library is also used in the KDE's +document viewer Okular. The source files +for Okular's PDF plugin (%Poppler-based) can be found on the git server +of the KDE project, under +this +URL. + + +@section req How to use the Poppler Qt6 interface library in three easy steps + +Programmer who would like to use the %Poppler Qt6 interface library +simply need to add the following line to their C++ source files: + +@code +#include +@endcode + + +For using the Qt6 interface on Android, there is an additional step - you must place the following font files in the assets/share/fonts directory of the Android APK: + + - NimbusMonoPS-Regular.otf + - NimbusMonoPS-Bold.otf + - NimbusMonoPS-BoldItalic.otf + - NimbusMonoPS-Italic.otf + - NimbusSans-Regular.otf + - NimbusSans-Bold.otf + - NimbusSans-BoldItalic.otf + - NimbusSans-Italic.otf + - StandardSymbolsPS.otf + - NimbusRoman-Bold.otf + - imbusRoman-BoldItalic.otf + - NimbusRoman-Italic.otf + - NimbusRoman-Regular.otf + - D050000L.otf + +These are used as substitute fonts for the base-14 fonts, and this step is required in order to reliably display documents with unembedded fonts. You can easily find these font files included within GhostScript. + +A PDF document can then be loaded as follows: +@code +QString filename; + +Poppler::Document* document = Poppler::Document::load(filename); +if (!document || document->isLocked()) { + + // ... error message .... + + delete document; + return; +} +@endcode + +Pages can be rendered to QImages with the following commands: + +@code +// Paranoid safety check +if (document == 0) { + // ... error message ... + return; +} + +// Access page of the PDF file +Poppler::Page* pdfPage = document->page(pageNumber); // Document starts at page 0 +if (pdfPage == 0) { + // ... error message ... + return; +} + +// Generate a QImage of the rendered page +QImage image = pdfPage->renderToImage(xres, yres, x, y, width, height); +if (image.isNull()) { + // ... error message ... + return; +} + +// ... use image ... + +// after the usage, the page must be deleted +delete pdfPage; +@endcode + +Finally, don't forget to destroy the document: + +@code +delete document; +@endcode + */ + diff --git a/poppler-24.05.0/qt6/src/QPainterOutputDev.cc b/poppler-24.05.0/qt6/src/QPainterOutputDev.cc new file mode 100644 index 0000000000000000000000000000000000000000..b017bab3a654297283076cfbcf203fe42d47aec8 --- /dev/null +++ b/poppler-24.05.0/qt6/src/QPainterOutputDev.cc @@ -0,0 +1,1154 @@ +//======================================================================== +// +// QPainterOutputDev.cc +// +// Copyright 2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Brad Hards +// Copyright (C) 2005-2009, 2011, 2012, 2014, 2015, 2018, 2019, 2021, 2022 Albert Astals Cid +// Copyright (C) 2008, 2010 Pino Toscano +// Copyright (C) 2009, 2011 Carlos Garcia Campos +// Copyright (C) 2009 Petr Gajdos +// Copyright (C) 2010 Matthias Fauconneau +// Copyright (C) 2011 Andreas Hartmetz +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2013 Dominik Haumann +// Copyright (C) 2013 Mihai Niculescu +// Copyright (C) 2017, 2018, 2020-2022 Oliver Sander +// Copyright (C) 2017, 2022 Adrian Johnson +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// +// 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 + +#include +#include + +#include + +#include "goo/ft_utils.h" +#include "goo/gfile.h" +#include "GlobalParams.h" +#include "Error.h" +#include "Object.h" +#include "GfxState.h" +#include "GfxFont.h" +#include "Link.h" +#include "FontEncodingTables.h" +#include +#include +#include "QPainterOutputDev.h" +#include "Page.h" +#include "Gfx.h" +#include "PDFDoc.h" + +#include +#include +#include +#include +#include + +class QPainterOutputDevType3Font +{ +public: + QPainterOutputDevType3Font(PDFDoc *doc, const std::shared_ptr &font); + + const QPicture &getGlyph(int gid) const; + +private: + PDFDoc *m_doc; + std::shared_ptr m_font; + + mutable std::vector> glyphs; + +public: + std::vector codeToGID; +}; + +QPainterOutputDevType3Font::QPainterOutputDevType3Font(PDFDoc *doc, const std::shared_ptr &font) : m_doc(doc), m_font(font) +{ + char *name; + const Dict *charProcs = font->getCharProcs(); + + // Storage for the rendered glyphs + glyphs.resize(charProcs->getLength()); + + // Compute the code-to-GID map + char **enc = font->getEncoding(); + + codeToGID.resize(256); + + for (int i = 0; i < 256; ++i) { + codeToGID[i] = 0; + if (charProcs && (name = enc[i])) { + for (int j = 0; j < charProcs->getLength(); j++) { + if (strcmp(name, charProcs->getKey(j)) == 0) { + codeToGID[i] = j; + } + } + } + } +} + +const QPicture &QPainterOutputDevType3Font::getGlyph(int gid) const +{ + if (!glyphs[gid]) { + + // Glyph has not been rendered before: render it now + + // Smallest box that contains all the glyphs from this font + const double *fontBBox = m_font->getFontBBox(); + PDFRectangle box(fontBBox[0], fontBBox[1], fontBBox[2], fontBBox[3]); + + Dict *resDict = m_font->getResources(); + + QPainter glyphPainter; + glyphs[gid] = std::make_unique(); + glyphPainter.begin(glyphs[gid].get()); + auto output_dev = std::make_unique(&glyphPainter); + + auto gfx = std::make_unique(m_doc, output_dev.get(), resDict, + &box, // pagebox + nullptr // cropBox + ); + + output_dev->startDoc(m_doc); + + output_dev->startPage(1, gfx->getState(), gfx->getXRef()); + + const Dict *charProcs = m_font->getCharProcs(); + Object charProc = charProcs->getVal(gid); + gfx->display(&charProc); + + glyphPainter.end(); + } + + return *glyphs[gid]; +} + +//------------------------------------------------------------------------ +// QPainterOutputDev +//------------------------------------------------------------------------ + +QPainterOutputDev::QPainterOutputDev(QPainter *painter) : m_lastTransparencyGroupPicture(nullptr), m_hintingPreference(QFont::PreferDefaultHinting) +{ + m_painter.push(painter); + m_currentBrush = QBrush(Qt::SolidPattern); + + auto error = FT_Init_FreeType(&m_ftLibrary); + if (error) { + qCritical() << "An error occurred will initializing the FreeType library"; + } + + // as of FT 2.1.8, CID fonts are indexed by CID instead of GID + FT_Int major, minor, patch; + FT_Library_Version(m_ftLibrary, &major, &minor, &patch); + m_useCIDs = major > 2 || (major == 2 && (minor > 1 || (minor == 1 && patch > 7))); +} + +QPainterOutputDev::~QPainterOutputDev() +{ + for (auto &codeToGID : m_codeToGIDCache) { + gfree(const_cast(codeToGID.second)); + } + + FT_Done_FreeType(m_ftLibrary); +} + +void QPainterOutputDev::startDoc(PDFDoc *doc) +{ + xref = doc->getXRef(); + m_doc = doc; + + for (auto &codeToGID : m_codeToGIDCache) { + gfree(const_cast(codeToGID.second)); + } + m_codeToGIDCache.clear(); +} + +void QPainterOutputDev::startPage(int pageNum, GfxState *state, XRef *) { } + +void QPainterOutputDev::endPage() { } + +void QPainterOutputDev::saveState(GfxState *state) +{ + m_currentPenStack.push(m_currentPen); + m_currentBrushStack.push(m_currentBrush); + m_rawFontStack.push(m_rawFont); + m_type3FontStack.push(m_currentType3Font); + m_codeToGIDStack.push(m_codeToGID); + + m_painter.top()->save(); +} + +void QPainterOutputDev::restoreState(GfxState *state) +{ + m_painter.top()->restore(); + + m_codeToGID = m_codeToGIDStack.top(); + m_codeToGIDStack.pop(); + m_rawFont = m_rawFontStack.top(); + m_rawFontStack.pop(); + m_currentType3Font = m_type3FontStack.top(); + m_type3FontStack.pop(); + m_currentBrush = m_currentBrushStack.top(); + m_currentBrushStack.pop(); + m_currentPen = m_currentPenStack.top(); + m_currentPenStack.pop(); +} + +void QPainterOutputDev::updateAll(GfxState *state) +{ + OutputDev::updateAll(state); + m_needFontUpdate = true; +} + +// Set CTM (Current Transformation Matrix) to a fixed matrix +void QPainterOutputDev::setDefaultCTM(const double *ctm) +{ + m_painter.top()->setTransform(QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5])); +} + +// Update the CTM (Current Transformation Matrix), i.e., compose the old +// CTM with a new matrix. +void QPainterOutputDev::updateCTM(GfxState *state, double m11, double m12, double m21, double m22, double m31, double m32) +{ + updateLineDash(state); + updateLineJoin(state); + updateLineCap(state); + updateLineWidth(state); + + QTransform update(m11, m12, m21, m22, m31, m32); + + // We could also set (rather than update) the painter transformation to state->getCMT(); + m_painter.top()->setTransform(update, true); +} + +void QPainterOutputDev::updateLineDash(GfxState *state) +{ + double dashStart; + const std::vector &dashPattern = state->getLineDash(&dashStart); + + // Special handling for zero-length patterns, i.e., solid lines. + // Simply calling QPen::setDashPattern with an empty pattern does *not* + // result in a solid line. Rather, the current pattern is unchanged. + // See the implementation of the setDashPattern method in the file qpen.cpp. + if (dashPattern.empty()) { + m_currentPen.setStyle(Qt::SolidLine); + m_painter.top()->setPen(m_currentPen); + return; + } + + QVector pattern(dashPattern.size()); + double scaling = state->getLineWidth(); + + // Negative line widths are not allowed, width 0 counts as 'one pixel width'. + if (scaling <= 0) { + scaling = 1.0; + } + + for (std::vector::size_type i = 0; i < dashPattern.size(); ++i) { + // pdf measures the dash pattern in dots, but Qt uses the + // line width as the unit. + pattern[i] = dashPattern[i] / scaling; + } + m_currentPen.setDashPattern(pattern); + m_currentPen.setDashOffset(dashStart); + m_painter.top()->setPen(m_currentPen); +} + +void QPainterOutputDev::updateFlatness(GfxState *state) +{ + // qDebug() << "updateFlatness"; +} + +void QPainterOutputDev::updateLineJoin(GfxState *state) +{ + switch (state->getLineJoin()) { + case 0: + // The correct style here is Qt::SvgMiterJoin, *not* Qt::MiterJoin. + // The two differ in what to do if the miter limit is exceeded. + // See https://bugs.freedesktop.org/show_bug.cgi?id=102356 + m_currentPen.setJoinStyle(Qt::SvgMiterJoin); + break; + case 1: + m_currentPen.setJoinStyle(Qt::RoundJoin); + break; + case 2: + m_currentPen.setJoinStyle(Qt::BevelJoin); + break; + } + m_painter.top()->setPen(m_currentPen); +} + +void QPainterOutputDev::updateLineCap(GfxState *state) +{ + switch (state->getLineCap()) { + case 0: + m_currentPen.setCapStyle(Qt::FlatCap); + break; + case 1: + m_currentPen.setCapStyle(Qt::RoundCap); + break; + case 2: + m_currentPen.setCapStyle(Qt::SquareCap); + break; + } + m_painter.top()->setPen(m_currentPen); +} + +void QPainterOutputDev::updateMiterLimit(GfxState *state) +{ + m_currentPen.setMiterLimit(state->getMiterLimit()); + m_painter.top()->setPen(m_currentPen); +} + +void QPainterOutputDev::updateLineWidth(GfxState *state) +{ + m_currentPen.setWidthF(state->getLineWidth()); + m_painter.top()->setPen(m_currentPen); + // The updateLineDash method needs to know the line width, but it is sometimes + // called before the updateLineWidth method. To make sure that the last call + // to updateLineDash before a drawing operation is always with the correct line + // width, we call it here, right after a change to the line width. + updateLineDash(state); +} + +void QPainterOutputDev::updateFillColor(GfxState *state) +{ + GfxRGB rgb; + QColor brushColour = m_currentBrush.color(); + state->getFillRGB(&rgb); + brushColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), brushColour.alphaF()); + m_currentBrush.setColor(brushColour); +} + +void QPainterOutputDev::updateStrokeColor(GfxState *state) +{ + GfxRGB rgb; + QColor penColour = m_currentPen.color(); + state->getStrokeRGB(&rgb); + penColour.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), penColour.alphaF()); + m_currentPen.setColor(penColour); + m_painter.top()->setPen(m_currentPen); +} + +void QPainterOutputDev::updateBlendMode(GfxState *state) +{ + GfxBlendMode blendMode = state->getBlendMode(); + + // missing composition modes in QPainter: + // - CompositionMode_Hue + // - CompositionMode_Color + // - CompositionMode_Luminosity + // - CompositionMode_Saturation + + switch (blendMode) { + case gfxBlendMultiply: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Multiply); + break; + case gfxBlendScreen: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Screen); + break; + case gfxBlendDarken: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Darken); + break; + case gfxBlendLighten: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Lighten); + break; + case gfxBlendColorDodge: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_ColorDodge); + break; + case gfxBlendColorBurn: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_ColorBurn); + break; + case gfxBlendHardLight: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_HardLight); + break; + case gfxBlendSoftLight: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_SoftLight); + break; + case gfxBlendDifference: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Difference); + break; + case gfxBlendExclusion: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Exclusion); + break; + case gfxBlendColor: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_Plus); + break; + default: + qDebug() << "Unsupported blend mode, falling back to CompositionMode_SourceOver"; + [[fallthrough]]; + case gfxBlendNormal: + m_painter.top()->setCompositionMode(QPainter::CompositionMode_SourceOver); + break; + } +} + +void QPainterOutputDev::updateFillOpacity(GfxState *state) +{ + QColor brushColour = m_currentBrush.color(); + brushColour.setAlphaF(state->getFillOpacity()); + m_currentBrush.setColor(brushColour); +} + +void QPainterOutputDev::updateStrokeOpacity(GfxState *state) +{ + QColor penColour = m_currentPen.color(); + penColour.setAlphaF(state->getStrokeOpacity()); + m_currentPen.setColor(penColour); + m_painter.top()->setPen(m_currentPen); +} + +void QPainterOutputDev::updateFont(GfxState *state) +{ + const std::shared_ptr &gfxFont = state->getFont(); + if (!gfxFont) { + return; + } + + // The key to look in the font caches + QPainterFontID fontID = { *gfxFont->getID(), state->getFontSize() }; + + // Current font is a type3 font + if (gfxFont->getType() == fontType3) { + auto cacheEntry = m_type3FontCache.find(fontID); + + if (cacheEntry != m_type3FontCache.end()) { + + // Take the font from the cache + m_currentType3Font = cacheEntry->second.get(); + + } else { + + m_currentType3Font = new QPainterOutputDevType3Font(m_doc, std::static_pointer_cast(gfxFont)); + m_type3FontCache.insert(std::make_pair(fontID, std::unique_ptr(m_currentType3Font))); + } + + return; + } + + // Non-type3: is the font in the cache? + auto cacheEntry = m_rawFontCache.find(fontID); + + if (cacheEntry != m_rawFontCache.end()) { + + // Take the font from the cache + m_rawFont = cacheEntry->second.get(); + + } else { + + // New font: load it into the cache + float fontSize = state->getFontSize(); + + std::optional fontLoc = gfxFont->locateFont(xref, nullptr); + + if (fontLoc) { + // load the font from respective location + switch (fontLoc->locType) { + case gfxFontLocEmbedded: { // if there is an embedded font, read it to memory + const std::optional> fontData = gfxFont->readEmbFontFile(xref); + + // fontData gets copied in the QByteArray constructor + m_rawFont = new QRawFont(QByteArray(fontData ? (const char *)fontData->data() : nullptr, fontData ? fontData->size() : 0), fontSize, m_hintingPreference); + m_rawFontCache.insert(std::make_pair(fontID, std::unique_ptr(m_rawFont))); + + break; + } + case gfxFontLocExternal: { // font is in an external font file + QString fontFile(fontLoc->path.c_str()); + m_rawFont = new QRawFont(fontFile, fontSize, m_hintingPreference); + m_rawFontCache.insert(std::make_pair(fontID, std::unique_ptr(m_rawFont))); + break; + } + case gfxFontLocResident: { // font resides in a PS printer + qDebug() << "Resident Font Resident not implemented yet!"; + + break; + } + } // end switch + + } else { + qDebug() << "Font location not found!"; + return; + } + } + + if (!m_rawFont->isValid()) { + qDebug() << "RawFont is not valid"; + } + + // ***************************************************************************** + // We have now successfully loaded the font into a QRawFont object. This + // allows us to draw all the glyphs in the font. However, what is missing is + // the charcode-to-glyph-index mapping. Apparently, Qt does not provide this + // information at all. Therefore, we need to figure it ourselves, using + // FoFi and FreeType. + // ***************************************************************************** + + m_needFontUpdate = false; + + GfxFontType fontType = gfxFont->getType(); + + // Default: no codeToGID table + m_codeToGID = nullptr; + + // check the font file cache + Ref id = *gfxFont->getID(); + + auto codeToGIDIt = m_codeToGIDCache.find(id); + + if (codeToGIDIt != m_codeToGIDCache.end()) { + + m_codeToGID = codeToGIDIt->second; + + } else { + + std::optional> fontBuffer; + + std::optional fontLoc = gfxFont->locateFont(xref, nullptr); + if (!fontLoc) { + error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + return; + } + + // embedded font + if (fontLoc->locType == gfxFontLocEmbedded) { + // if there is an embedded font, read it to memory + fontBuffer = gfxFont->readEmbFontFile(xref); + if (!fontBuffer) { + return; + } + + // external font + } else { // gfxFontLocExternal + // Hmm, fontType has already been set to gfxFont->getType() above. + // Can it really assume a different value here? + fontType = fontLoc->fontType; + } + + switch (fontType) { + case fontType1: + case fontType1C: + case fontType1COT: { + // Load the font face using FreeType + const int faceIndex = 0; // We always load the zero-th face from a font + FT_Face freeTypeFace; + + if (fontLoc->locType != gfxFontLocEmbedded) { + if (ft_new_face_from_file(m_ftLibrary, fontLoc->path.c_str(), faceIndex, &freeTypeFace)) { + error(errSyntaxError, -1, "Couldn't create a FreeType face for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + return; + } + } else { + if (FT_New_Memory_Face(m_ftLibrary, (const FT_Byte *)fontBuffer->data(), fontBuffer->size(), faceIndex, &freeTypeFace)) { + error(errSyntaxError, -1, "Couldn't create a FreeType face for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + return; + } + } + + const char *name; + + int *codeToGID = (int *)gmallocn(256, sizeof(int)); + for (int i = 0; i < 256; ++i) { + codeToGID[i] = 0; + if ((name = ((const char **)((Gfx8BitFont *)gfxFont.get())->getEncoding())[i])) { + codeToGID[i] = (int)FT_Get_Name_Index(freeTypeFace, (char *)name); + if (codeToGID[i] == 0) { + name = GfxFont::getAlternateName(name); + if (name) { + codeToGID[i] = FT_Get_Name_Index(freeTypeFace, (char *)name); + } + } + } + } + + FT_Done_Face(freeTypeFace); + + m_codeToGIDCache[id] = codeToGID; + + break; + } + case fontTrueType: + case fontTrueTypeOT: { + auto ff = (fontLoc->locType != gfxFontLocEmbedded) ? FoFiTrueType::load(fontLoc->path.c_str()) : FoFiTrueType::make(fontBuffer->data(), fontBuffer->size()); + + m_codeToGIDCache[id] = (ff) ? ((Gfx8BitFont *)gfxFont.get())->getCodeToGIDMap(ff.get()) : nullptr; + + break; + } + case fontCIDType0: + case fontCIDType0C: { + int *cidToGIDMap = nullptr; + int nCIDs = 0; + + // check for a CFF font + if (!m_useCIDs) { + auto ff = (fontLoc->locType != gfxFontLocEmbedded) ? std::unique_ptr(FoFiType1C::load(fontLoc->path.c_str())) : std::unique_ptr(FoFiType1C::make(fontBuffer->data(), fontBuffer->size())); + + cidToGIDMap = (ff) ? ff->getCIDToGIDMap(&nCIDs) : nullptr; + } + + m_codeToGIDCache[id] = cidToGIDMap; + + break; + } + case fontCIDType0COT: { + int *codeToGID = nullptr; + + if (((GfxCIDFont *)gfxFont.get())->getCIDToGID()) { + int codeToGIDLen = ((GfxCIDFont *)gfxFont.get())->getCIDToGIDLen(); + codeToGID = (int *)gmallocn(codeToGIDLen, sizeof(int)); + memcpy(codeToGID, ((GfxCIDFont *)gfxFont.get())->getCIDToGID(), codeToGIDLen * sizeof(int)); + } + + int *cidToGIDMap = nullptr; + int nCIDs = 0; + + if (!codeToGID && !m_useCIDs) { + auto ff = (fontLoc->locType != gfxFontLocEmbedded) ? FoFiTrueType::load(fontLoc->path.c_str()) : FoFiTrueType::make(fontBuffer->data(), fontBuffer->size()); + + if (ff && ff->isOpenTypeCFF()) { + cidToGIDMap = ff->getCIDToGIDMap(&nCIDs); + } + } + + m_codeToGIDCache[id] = codeToGID ? codeToGID : cidToGIDMap; + + break; + } + case fontCIDType2: + case fontCIDType2OT: { + int *codeToGID = nullptr; + int codeToGIDLen = 0; + if (((GfxCIDFont *)gfxFont.get())->getCIDToGID()) { + codeToGIDLen = ((GfxCIDFont *)gfxFont.get())->getCIDToGIDLen(); + if (codeToGIDLen) { + codeToGID = (int *)gmallocn(codeToGIDLen, sizeof(int)); + memcpy(codeToGID, ((GfxCIDFont *)gfxFont.get())->getCIDToGID(), codeToGIDLen * sizeof(int)); + } + } else { + auto ff = (fontLoc->locType != gfxFontLocEmbedded) ? FoFiTrueType::load(fontLoc->path.c_str()) : FoFiTrueType::make(fontBuffer->data(), fontBuffer->size()); + if (!ff) { + return; + } + codeToGID = ((GfxCIDFont *)gfxFont.get())->getCodeToGIDMap(ff.get(), &codeToGIDLen); + } + + m_codeToGIDCache[id] = codeToGID; + + break; + } + default: + // this shouldn't happen + return; + } + + m_codeToGID = m_codeToGIDCache[id]; + } +} + +static QPainterPath convertPath(GfxState *state, const GfxPath *path, Qt::FillRule fillRule) +{ + int i, j; + + QPainterPath qPath; + qPath.setFillRule(fillRule); + for (i = 0; i < path->getNumSubpaths(); ++i) { + const GfxSubpath *subpath = path->getSubpath(i); + if (subpath->getNumPoints() > 0) { + qPath.moveTo(subpath->getX(0), subpath->getY(0)); + j = 1; + while (j < subpath->getNumPoints()) { + if (subpath->getCurve(j)) { + qPath.cubicTo(subpath->getX(j), subpath->getY(j), subpath->getX(j + 1), subpath->getY(j + 1), subpath->getX(j + 2), subpath->getY(j + 2)); + j += 3; + } else { + qPath.lineTo(subpath->getX(j), subpath->getY(j)); + ++j; + } + } + if (subpath->isClosed()) { + qPath.closeSubpath(); + } + } + } + return qPath; +} + +void QPainterOutputDev::stroke(GfxState *state) +{ + m_painter.top()->strokePath(convertPath(state, state->getPath(), Qt::OddEvenFill), m_currentPen); +} + +void QPainterOutputDev::fill(GfxState *state) +{ + m_painter.top()->fillPath(convertPath(state, state->getPath(), Qt::WindingFill), m_currentBrush); +} + +void QPainterOutputDev::eoFill(GfxState *state) +{ + m_painter.top()->fillPath(convertPath(state, state->getPath(), Qt::OddEvenFill), m_currentBrush); +} + +bool QPainterOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) +{ + double x0, y0, x1, y1; + shading->getCoords(&x0, &y0, &x1, &y1); + + // get the clip region bbox + double xMin, yMin, xMax, yMax; + state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax); + + // get the function domain + double t0 = shading->getDomain0(); + double t1 = shading->getDomain1(); + + // Max number of splits along the t axis + constexpr int maxSplits = 256; + + // Max delta allowed in any color component + const double colorDelta = (dblToCol(1 / 256.0)); + + // Number of color space components + auto nComps = shading->getColorSpace()->getNComps(); + // If the clipping region is a stroke, then the current operation counts as a stroke + // rather than as a fill, and the opacity has to be set accordingly. + // See https://gitlab.freedesktop.org/poppler/poppler/-/issues/178 + auto opacity = (state->getStrokePattern()) ? state->getStrokeOpacity() : state->getFillOpacity(); + + // Helper function to test two color objects for 'almost-equality' + auto isSameGfxColor = [&nComps, &colorDelta](const GfxColor &colorA, const GfxColor &colorB) { + for (int k = 0; k < nComps; ++k) { + if (abs(colorA.c[k] - colorB.c[k]) > colorDelta) { + return false; + } + } + return true; + }; + + // Helper function: project a number into an interval + // With C++17 this is part of the standard library + auto clamp = [](double v, double lo, double hi) { return std::min(std::max(v, lo), hi); }; + + // ta stores all parameter values where we evaluate the input shading function. + // In between, QLinearGradient will interpolate linearly. + // We set up the array with three values. + std::array ta; + ta[0] = tMin; + std::array next; + next[0] = maxSplits / 2; + ta[maxSplits / 2] = 0.5 * (tMin + tMax); + next[maxSplits / 2] = maxSplits; + ta[maxSplits] = tMax; + + // compute the color at t = tMin + double tt = clamp(t0 + (t1 - t0) * tMin, t0, t1); + + GfxColor color0, color1; + shading->getColor(tt, &color0); + + // Construct a gradient object and set its color at one parameter end + QLinearGradient gradient(QPointF(x0 + tMin * (x1 - x0), y0 + tMin * (y1 - y0)), QPointF(x0 + tMax * (x1 - x0), y0 + tMax * (y1 - y0))); + + GfxRGB rgb; + shading->getColorSpace()->getRGB(&color0, &rgb); + QColor qColor(colToByte(rgb.r), colToByte(rgb.g), colToByte(rgb.b), dblToByte(opacity)); + gradient.setColorAt(0, qColor); + + // Look for more relevant parameter values by bisection + int i = 0; + while (i < maxSplits) { + + int j = next[i]; + while (j > i + 1) { + + // Next parameter value to try + tt = clamp(t0 + (t1 - t0) * ta[j], t0, t1); + shading->getColor(tt, &color1); + + // j is a good next color stop if the input shading can be approximated well + // on the interval (ta[i], ta[j]) by a linear interpolation. + // We test this by comparing the real color in the middle between ta[i] and ta[j] + // with the linear interpolant there. + auto midPoint = 0.5 * (ta[i] + ta[j]); + GfxColor colorAtMidPoint; + shading->getColor(midPoint, &colorAtMidPoint); + + GfxColor linearlyInterpolatedColor; + for (int ii = 0; ii < nComps; ii++) { + linearlyInterpolatedColor.c[ii] = 0.5 * (color0.c[ii] + color1.c[ii]); + } + + // If the two colors are equal, ta[j] is a good place for the next color stop; take it! + if (isSameGfxColor(colorAtMidPoint, linearlyInterpolatedColor)) { + break; + } + + // Otherwise: bisect further + int k = (i + j) / 2; + ta[k] = midPoint; + next[i] = k; + next[k] = j; + j = k; + } + + // set the color + shading->getColorSpace()->getRGB(&color1, &rgb); + qColor.setRgb(colToByte(rgb.r), colToByte(rgb.g), colToByte(rgb.b), dblToByte(opacity)); + gradient.setColorAt((ta[j] - tMin) / (tMax - tMin), qColor); + + // Move to the next parameter region + color0 = color1; + i = next[i]; + } + + state->moveTo(xMin, yMin); + state->lineTo(xMin, yMax); + state->lineTo(xMax, yMax); + state->lineTo(xMax, yMin); + state->closePath(); + + // Actually paint the shaded region + QBrush newBrush(gradient); + m_painter.top()->fillPath(convertPath(state, state->getPath(), Qt::WindingFill), newBrush); + + state->clearPath(); + + // True means: The shaded region has been painted + return true; +} + +void QPainterOutputDev::clip(GfxState *state) +{ + m_painter.top()->setClipPath(convertPath(state, state->getPath(), Qt::WindingFill), Qt::IntersectClip); +} + +void QPainterOutputDev::eoClip(GfxState *state) +{ + m_painter.top()->setClipPath(convertPath(state, state->getPath(), Qt::OddEvenFill), Qt::IntersectClip); +} + +void QPainterOutputDev::clipToStrokePath(GfxState *state) +{ + QPainterPath clipPath = convertPath(state, state->getPath(), Qt::WindingFill); + + // Get the outline of 'clipPath' as a separate path + QPainterPathStroker stroker; + stroker.setWidth(state->getLineWidth()); + stroker.setCapStyle(m_currentPen.capStyle()); + stroker.setJoinStyle(m_currentPen.joinStyle()); + stroker.setMiterLimit(state->getMiterLimit()); + stroker.setDashPattern(m_currentPen.dashPattern()); + stroker.setDashOffset(m_currentPen.dashOffset()); + QPainterPath clipPathOutline = stroker.createStroke(clipPath); + + // The interior of the outline is the desired clipping region + m_painter.top()->setClipPath(clipPathOutline, Qt::IntersectClip); +} + +void QPainterOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) +{ + + // First handle type3 fonts + const std::shared_ptr &gfxFont = state->getFont(); + + GfxFontType fontType = gfxFont->getType(); + if (fontType == fontType3) { + + ///////////////////////////////////////////////////////////////////// + // Draw the QPicture that contains the glyph onto the page + ///////////////////////////////////////////////////////////////////// + + // Store the QPainter state; we need to modify it temporarily + m_painter.top()->save(); + + // Make the glyph position the coordinate origin -- that's our center of scaling + m_painter.top()->translate(QPointF(x - originX, y - originY)); + + const double *mat = gfxFont->getFontMatrix(); + QTransform fontMatrix(mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]); + + // Scale with the font size + fontMatrix.scale(state->getFontSize(), state->getFontSize()); + m_painter.top()->setTransform(fontMatrix, true); + + // Apply the text matrix on top + const double *textMat = state->getTextMat(); + + QTransform textTransform(textMat[0] * state->getHorizScaling(), textMat[1] * state->getHorizScaling(), textMat[2], textMat[3], 0, 0); + + m_painter.top()->setTransform(textTransform, true); + + // Actually draw the glyph + int gid = m_currentType3Font->codeToGID[code]; + m_painter.top()->drawPicture(QPointF(0, 0), m_currentType3Font->getGlyph(gid)); + + // Restore transformation + m_painter.top()->restore(); + + return; + } + + // check for invisible text -- this is used by Acrobat Capture + int render = state->getRender(); + if (render == 3 || !m_rawFont) { + qDebug() << "Invisible text found!"; + return; + } + + if (!(render & 1)) { + quint32 glyphIndex = (m_codeToGID) ? m_codeToGID[code] : code; + QPointF glyphPosition = QPointF(x - originX, y - originY); + + // QGlyphRun objects can hold an entire sequence of glyphs, and it would possibly + // be more efficient to simply note the glyph and glyph position here and then + // draw several glyphs at once in the endString method. What keeps us from doing + // that is the transformation below: each glyph needs to be drawn upside down, + // i.e., reflected at its own baseline. Since we have no guarantee that this + // baseline is the same for all glyphs in a string we have to do it one by one. + QGlyphRun glyphRun; + glyphRun.setRawData(&glyphIndex, &glyphPosition, 1); + glyphRun.setRawFont(*m_rawFont); + + // Store the QPainter state; we need to modify it temporarily + m_painter.top()->save(); + + // Apply the text matrix to the glyph. The glyph is not scaled by the font size, + // because the font in m_rawFont already has the correct size. + // Additionally, the CTM is upside down, i.e., it contains a negative Y-scaling + // entry. Therefore, Qt will paint the glyphs upside down. We need to temporarily + // reflect the page at glyphPosition.y(). + + // Make the glyph position the coordinate origin -- that's our center of scaling + const double *textMat = state->getTextMat(); + + m_painter.top()->translate(QPointF(glyphPosition.x(), glyphPosition.y())); + + QTransform textTransform(textMat[0] * state->getHorizScaling(), textMat[1] * state->getHorizScaling(), + -textMat[2], // reflect at the horizontal axis, + -textMat[3], // because CTM is upside-down. + 0, 0); + + m_painter.top()->setTransform(textTransform, true); + + // We are painting a filled glyph here. But QPainter uses the pen to draw even filled text, + // not the brush. (see, e.g., http://doc.qt.io/qt-5/qpainter.html#setPen ) + // Therefore we have to temporarily overwrite the pen color. + + // Since we are drawing a filled glyph, one would really expect to have m_currentBrush + // have the correct color. However, somehow state->getFillRGB can change without + // updateFillColor getting called. Then m_currentBrush may not contain the correct color. + GfxRGB rgb; + state->getFillRGB(&rgb); + QColor fontColor; + fontColor.setRgbF(colToDbl(rgb.r), colToDbl(rgb.g), colToDbl(rgb.b), state->getFillOpacity()); + m_painter.top()->setPen(fontColor); + + // Actually draw the glyph + m_painter.top()->drawGlyphRun(QPointF(-glyphPosition.x(), -glyphPosition.y()), glyphRun); + + // Restore transformation and pen color + m_painter.top()->restore(); + } +} + +void QPainterOutputDev::type3D0(GfxState *state, double wx, double wy) { } + +void QPainterOutputDev::type3D1(GfxState *state, double wx, double wy, double llx, double lly, double urx, double ury) { } + +void QPainterOutputDev::endTextObject(GfxState *state) { } + +void QPainterOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) +{ + auto imgStr = std::make_unique(str, width, + 1, // numPixelComps + 1 // getBits + ); + imgStr->reset(); + + // TODO: Would using QImage::Format_Mono be more efficient here? + QImage image(width, height, QImage::Format_ARGB32); + unsigned int *data = reinterpret_cast(image.bits()); + int stride = image.bytesPerLine() / 4; + + QRgb fillColor = m_currentBrush.color().rgb(); + + for (int y = 0; y < height; y++) { + + unsigned char *pix = imgStr->getLine(); + + // Invert the vertical coordinate: y is increasing from top to bottom + // on the page, but y is increasing bottom to top in the picture. + unsigned int *dest = data + (height - 1 - y) * stride; + + for (int x = 0; x < width; x++) { + + bool opaque = ((bool)pix[x]) == invert; + dest[x] = (opaque) ? fillColor : 0; + } + } + + // At this point, the QPainter coordinate transformation (CTM) is such + // that QRect(0,0,1,1) is exactly the area of the image. + m_painter.top()->drawImage(QRect(0, 0, 1, 1), image); + imgStr->close(); +} + +// TODO: lots more work here. +void QPainterOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) +{ + unsigned int *data; + unsigned int *line; + int x, y; + unsigned char *pix; + int i; + QImage image; + int stride; + + /* TODO: Do we want to cache these? */ + auto imgStr = std::make_unique(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); + + image = QImage(width, height, QImage::Format_ARGB32); + data = reinterpret_cast(image.bits()); + stride = image.bytesPerLine() / 4; + for (y = 0; y < height; y++) { + pix = imgStr->getLine(); + // Invert the vertical coordinate: y is increasing from top to bottom + // on the page, but y is increasing bottom to top in the picture. + line = data + (height - 1 - y) * stride; + colorMap->getRGBLine(pix, line, width); + + if (maskColors) { + for (x = 0; x < width; x++) { + for (i = 0; i < colorMap->getNumPixelComps(); ++i) { + if (pix[i] < maskColors[2 * i] * 255 || pix[i] > maskColors[2 * i + 1] * 255) { + *line = *line | 0xff000000; + break; + } + } + pix += colorMap->getNumPixelComps(); + line++; + } + } else { + for (x = 0; x < width; x++) { + *line = *line | 0xff000000; + line++; + } + } + } + + // At this point, the QPainter coordinate transformation (CTM) is such + // that QRect(0,0,1,1) is exactly the area of the image. + m_painter.top()->drawImage(QRect(0, 0, 1, 1), image); +} + +void QPainterOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap, + bool maskInterpolate) +{ + // Bail out if the image size doesn't match the mask size. I don't know + // what to do in this case. + if (width != maskWidth || height != maskHeight) { + qDebug() << "Soft mask size does not match image size!"; + drawImage(state, ref, str, width, height, colorMap, interpolate, nullptr, false); + return; + } + + // Bail out if the mask isn't a single channel. I don't know + // what to do in this case. + if (maskColorMap->getColorSpace()->getNComps() != 1) { + qDebug() << "Soft mask is not a single 8-bit channel!"; + drawImage(state, ref, str, width, height, colorMap, interpolate, nullptr, false); + return; + } + + /* TODO: Do we want to cache these? */ + auto imgStr = std::make_unique(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); + + auto maskImageStr = std::make_unique(maskStr, maskWidth, maskColorMap->getNumPixelComps(), maskColorMap->getBits()); + maskImageStr->reset(); + + QImage image(width, height, QImage::Format_ARGB32); + unsigned int *data = reinterpret_cast(image.bits()); + int stride = image.bytesPerLine() / 4; + + std::vector maskLine(maskWidth); + + for (int y = 0; y < height; y++) { + + unsigned char *pix = imgStr->getLine(); + unsigned char *maskPix = maskImageStr->getLine(); + + // Invert the vertical coordinate: y is increasing from top to bottom + // on the page, but y is increasing bottom to top in the picture. + unsigned int *line = data + (height - 1 - y) * stride; + colorMap->getRGBLine(pix, line, width); + + // Apply the mask values to the image alpha channel + maskColorMap->getGrayLine(maskPix, maskLine.data(), width); + for (int x = 0; x < width; x++) { + *line = *line | (maskLine[x] << 24); + line++; + } + } + + // At this point, the QPainter coordinate transformation (CTM) is such + // that QRect(0,0,1,1) is exactly the area of the image. + m_painter.top()->drawImage(QRect(0, 0, 1, 1), image); +} + +void QPainterOutputDev::beginTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/, GfxColorSpace * /*blendingColorSpace*/, bool /*isolated*/, bool /*knockout*/, bool /*forSoftMask*/) +{ + // The entire transparency group will be painted into a + // freshly created QPicture object. Since an existing painter + // cannot change its paint device, we need to construct a + // new QPainter object as well. + m_qpictures.push(new QPicture); + m_painter.push(new QPainter(m_qpictures.top())); +} + +void QPainterOutputDev::endTransparencyGroup(GfxState * /*state*/) +{ + // Stop painting into the group + m_painter.top()->end(); + + // Kill the painter that has been used for the transparency group + delete (m_painter.top()); + m_painter.pop(); + + // Store the QPicture object that holds the result of the transparency group + // painting. It will be painted and deleted in the method paintTransparencyGroup. + if (m_lastTransparencyGroupPicture) { + qDebug() << "Found a transparency group that has not been painted"; + delete (m_lastTransparencyGroupPicture); + } + m_lastTransparencyGroupPicture = m_qpictures.top(); + m_qpictures.pop(); +} + +void QPainterOutputDev::paintTransparencyGroup(GfxState * /*state*/, const double * /*bbox*/) +{ + // Actually draw the transparency group + m_painter.top()->drawPicture(0, 0, *m_lastTransparencyGroupPicture); + + // And delete it + delete (m_lastTransparencyGroupPicture); + m_lastTransparencyGroupPicture = nullptr; +} diff --git a/poppler-24.05.0/qt6/src/QPainterOutputDev.h b/poppler-24.05.0/qt6/src/QPainterOutputDev.h new file mode 100644 index 0000000000000000000000000000000000000000..3c133d64d0e77c1f91770a0b742c17daf4723d58 --- /dev/null +++ b/poppler-24.05.0/qt6/src/QPainterOutputDev.h @@ -0,0 +1,206 @@ +//======================================================================== +// +// QPainterOutputDev.h +// +// Copyright 2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Brad Hards +// Copyright (C) 2005, 2018, 2019, 2021 Albert Astals Cid +// Copyright (C) 2009, 2011 Carlos Garcia Campos +// Copyright (C) 2010 Pino Toscano +// Copyright (C) 2011 Andreas Hartmetz +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2013 Mihai Niculescu +// Copyright (C) 2017, 2018, 2020 Oliver Sander +// +// 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 +// +//======================================================================== + +#ifndef QPAINTEROUTPUTDEV_H +#define QPAINTEROUTPUTDEV_H + +#include +#include +#include + +#include "OutputDev.h" +#include "GfxState.h" + +#include +#include FT_FREETYPE_H + +#include + +class GfxState; +class PDFDoc; + +class QRawFont; + +class QPainterOutputDevType3Font; + +//------------------------------------------------------------------------ +// QPainterOutputDev - QPainter renderer +//------------------------------------------------------------------------ + +class QPainterOutputDev : public OutputDev +{ +public: + // Constructor. + explicit QPainterOutputDev(QPainter *painter); + + // Destructor. + ~QPainterOutputDev() override; + + void setHintingPreference(QFont::HintingPreference hintingPreference) { m_hintingPreference = hintingPreference; } + + //----- get info about output device + + // Does this device use upside-down coordinates? + // (Upside-down means (0,0) is the top left corner of the page.) + bool upsideDown() override { return true; } + + // Does this device use drawChar() or drawString()? + bool useDrawChar() override { return true; } + + // Does this device implement shaded fills (aka gradients) natively? + // If this returns false, these shaded fills + // will be reduced to a series of other drawing operations. + // type==2 is 'axial shading' + bool useShadedFills(int type) override { return type == 2; } + + // Does this device use beginType3Char/endType3Char? Otherwise, + // text in Type 3 fonts will be drawn with drawChar/drawString. + bool interpretType3Chars() override { return false; } + + //----- initialization and control + + // Set Current Transformation Matrix to a fixed matrix given in ctm[0],...,ctm[5] + void setDefaultCTM(const double *ctm) override; + + // Start a page. + void startPage(int pageNum, GfxState *state, XRef *xref) override; + + // End a page. + void endPage() override; + + //----- save/restore graphics state + void saveState(GfxState *state) override; + void restoreState(GfxState *state) override; + + //----- update graphics state + void updateAll(GfxState *state) override; + void updateCTM(GfxState *state, double m11, double m12, double m21, double m22, double m31, double m32) override; + void updateLineDash(GfxState *state) override; + void updateFlatness(GfxState *state) override; + void updateLineJoin(GfxState *state) override; + void updateLineCap(GfxState *state) override; + void updateMiterLimit(GfxState *state) override; + void updateLineWidth(GfxState *state) override; + void updateFillColor(GfxState *state) override; + void updateStrokeColor(GfxState *state) override; + void updateBlendMode(GfxState *state) override; + void updateFillOpacity(GfxState *state) override; + void updateStrokeOpacity(GfxState *state) override; + + //----- update text state + void updateFont(GfxState *state) override; + + //----- path painting + void stroke(GfxState *state) override; + void fill(GfxState *state) override; + void eoFill(GfxState *state) override; + bool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override; + + //----- path clipping + void clip(GfxState *state) override; + void eoClip(GfxState *state) override; + void clipToStrokePath(GfxState *state) override; + + //----- text drawing + // virtual void drawString(GfxState *state, GooString *s); + void drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) override; + void endTextObject(GfxState *state) override; + + //----- image drawing + void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) override; + void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) override; + + void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap, + bool maskInterpolate) override; + + //----- Type 3 font operators + void type3D0(GfxState *state, double wx, double wy) override; + void type3D1(GfxState *state, double wx, double wy, double llx, double lly, double urx, double ury) override; + + //----- transparency groups and soft masks + void beginTransparencyGroup(GfxState *state, const double *bbox, GfxColorSpace *blendingColorSpace, bool isolated, bool knockout, bool forSoftMask) override; + void endTransparencyGroup(GfxState *state) override; + void paintTransparencyGroup(GfxState *state, const double *bbox) override; + + //----- special access + + // Called to indicate that a new PDF document has been loaded. + void startDoc(PDFDoc *doc); + + bool isReverseVideo() { return false; } + +private: + // The stack of QPainters is used to implement transparency groups. When such a group + // is opened, annew Painter that paints onto a QPicture is pushed onto the stack. + // It is popped again when the transparency group ends. + std::stack m_painter; + + // This is the corresponding stack of QPicture objects + std::stack m_qpictures; + + // endTransparencyGroup removes a QPicture from the stack, but stores + // it here for later use in paintTransparencyGroup. + QPicture *m_lastTransparencyGroupPicture; + + QFont::HintingPreference m_hintingPreference; + + QPen m_currentPen; + // The various stacks are used to implement the 'saveState' and 'restoreState' methods + std::stack m_currentPenStack; + + QBrush m_currentBrush; + std::stack m_currentBrushStack; + + bool m_needFontUpdate; // set when the font needs to be updated + PDFDoc *m_doc; + XRef *xref; // xref table for current document + + // The current font in use + QRawFont *m_rawFont; + std::stack m_rawFontStack; + + QPainterOutputDevType3Font *m_currentType3Font; + std::stack m_type3FontStack; + + // Cache all fonts by their Ref and font size + using QPainterFontID = std::pair; + std::map> m_rawFontCache; + std::map> m_type3FontCache; + std::map m_codeToGIDCache; + + // The table that maps character codes to glyph indexes + const int *m_codeToGID; + std::stack m_codeToGIDStack; + + FT_Library m_ftLibrary; + // as of FT 2.1.8, CID fonts are indexed by CID instead of GID + bool m_useCIDs; +}; + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-annotation-helper.h b/poppler-24.05.0/qt6/src/poppler-annotation-helper.h new file mode 100644 index 0000000000000000000000000000000000000000..b294a08471afa3f50121e2c4fb40066cd9fdb36c --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-annotation-helper.h @@ -0,0 +1,78 @@ +/* poppler-annotation-helper.h: qt interface to poppler + * Copyright (C) 2006, 2008, 2017-2019, 2021, Albert Astals Cid + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2012, Fabio D'Urso + * Copyright (C) 2018, Dileep Sankhla + * Copyright (C) 2018, Carlos Garcia Campos + * Copyright (C) 2018, 2019, Oliver Sander + * Adapting code from + * Copyright (C) 2004 by Enrico Ros + * + * 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. + */ + +#ifndef _POPPLER_ANNOTATION_HELPER_H_ +#define _POPPLER_ANNOTATION_HELPER_H_ + +#include + +#include + +#include + +class QColor; + +class AnnotColor; + +namespace Poppler { + +class XPDFReader +{ +public: + // transform from user coords to normalized ones using the matrix M + static inline void transform(double *M, double x, double y, QPointF &res); + static inline void invTransform(const double *M, const QPointF p, double &x, double &y); +}; + +void XPDFReader::transform(double *M, double x, double y, QPointF &res) +{ + res.setX(M[0] * x + M[2] * y + M[4]); + res.setY(M[1] * x + M[3] * y + M[5]); +} + +void XPDFReader::invTransform(const double *M, const QPointF p, double &x, double &y) +{ + const double det = M[0] * M[3] - M[1] * M[2]; + if (det == 0) { + qWarning("Tried to invert singular matrix, something won't work"); + x = 0; + y = 0; + return; + } + + const double invM[4] = { M[3] / det, -M[1] / det, -M[2] / det, M[0] / det }; + const double xt = p.x() - M[4]; + const double yt = p.y() - M[5]; + + x = invM[0] * xt + invM[2] * yt; + y = invM[1] * xt + invM[3] * yt; +} + +QColor convertAnnotColor(const AnnotColor *color); +std::unique_ptr convertQColor(const QColor &color); + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-annotation-private.h b/poppler-24.05.0/qt6/src/poppler-annotation-private.h new file mode 100644 index 0000000000000000000000000000000000000000..35e26769c6aab6c7ffb9ebceaf63f6e0bf14e96c --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-annotation-private.h @@ -0,0 +1,130 @@ +/* poppler-annotation-private.h: qt interface to poppler + * Copyright (C) 2007, Pino Toscano + * Copyright (C) 2012, Tobias Koenig + * Copyright (C) 2012, 2013 Fabio D'Urso + * Copyright (C) 2012, 2014, 2018-2020, Albert Astals Cid + * Copyright (C) 2020, Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021, Oliver Sander + * Copyright (C) 2021, Mahmoud Ahmed Khalil + * + * 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. + */ + +#ifndef _POPPLER_ANNOTATION_PRIVATE_H_ +#define _POPPLER_ANNOTATION_PRIVATE_H_ + +#include + +#include +#include + +#include "poppler-annotation.h" + +#include +#include + +class Annot; +class AnnotPath; +class Page; +class PDFRectangle; + +namespace Poppler { +class DocumentData; + +PDFRectangle boundaryToPdfRectangle(::Page *pdfPage, const QRectF &r, int flags); +void getRawDataFromQImage(const QImage &qimg, int bitsPerPixel, QByteArray *data, QByteArray *sMaskData); + +class AnnotationPrivate : public QSharedData +{ +public: + AnnotationPrivate(); + virtual ~AnnotationPrivate(); + + AnnotationPrivate(const AnnotationPrivate &) = delete; + AnnotationPrivate &operator=(const AnnotationPrivate &) = delete; + + void addRevision(Annotation *ann, Annotation::RevScope scope, Annotation::RevType type); + + /* Returns an Annotation of the right subclass whose d_ptr points to + * this AnnotationPrivate */ + virtual Annotation *makeAlias() = 0; + + /* properties: contents related */ + QString author; + QString contents; + QString uniqueName; + QDateTime modDate; // before or equal to currentDateTime() + QDateTime creationDate; // before or equal to modifyDate + + /* properties: look/interaction related */ + Annotation::Flags flags; + QRectF boundary; + + /* style and popup */ + Annotation::Style style; + Annotation::Popup popup; + + /* revisions */ + Annotation::RevScope revisionScope; + Annotation::RevType revisionType; + QList revisions; + + /* After this call, the Annotation object will behave like a wrapper for + * the specified Annot object. All cached values are discarded */ + void tieToNativeAnnot(Annot *ann, ::Page *page, DocumentData *doc); + + /* Creates a new Annot object on the specified page, flushes current + * values to that object and ties this Annotation to that object */ + virtual Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) = 0; + + /* Inited to 0 (i.e. untied annotation) */ + Annot *pdfAnnot; + ::Page *pdfPage; + DocumentData *parentDoc; + + /* The following helpers only work if pdfPage is set */ + void flushBaseAnnotationProperties(); + void fillTransformationMTX(double MTX[6]) const; + QRectF fromPdfRectangle(const PDFRectangle &r) const; + PDFRectangle boundaryToPdfRectangle(const QRectF &r, int flags) const; + AnnotPath *toAnnotPath(const QVector &l) const; + + /* Scan page for annotations, parentId=0 searches for root annotations, subtypes empty means all subtypes */ + static std::vector> findAnnotations(::Page *pdfPage, DocumentData *doc, const QSet &subtypes, int parentId = -1); + + /* Add given annotation to given page */ + static void addAnnotationToPage(::Page *pdfPage, DocumentData *doc, const Annotation *ann); + + /* Remove annotation from page and destroy ann */ + static void removeAnnotationFromPage(::Page *pdfPage, const Annotation *ann); + + Ref pdfObjectReference() const; + + std::unique_ptr additionalAction(Annotation::AdditionalActionType type) const; + + Object annotationAppearance; +}; + +class AnnotationAppearancePrivate +{ +public: + explicit AnnotationAppearancePrivate(Annot *annot); + + Object appearance; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-annotation.cc b/poppler-24.05.0/qt6/src/poppler-annotation.cc new file mode 100644 index 0000000000000000000000000000000000000000..1a3c8130cea7fc97d5b6e541db46e2cff87e9966 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-annotation.cc @@ -0,0 +1,3898 @@ +/* poppler-annotation.cc: qt interface to poppler + * Copyright (C) 2006, 2009, 2012-2015, 2018-2022 Albert Astals Cid + * Copyright (C) 2006, 2008, 2010 Pino Toscano + * Copyright (C) 2012, Guillermo A. Amaral B. + * Copyright (C) 2012-2014 Fabio D'Urso + * Copyright (C) 2012, 2015, Tobias Koenig + * Copyright (C) 2018 Adam Reichold + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018 Intevation GmbH + * Copyright (C) 2018 Dileep Sankhla + * Copyright (C) 2018, 2019 Tobias Deiminger + * Copyright (C) 2018 Carlos Garcia Campos + * Copyright (C) 2020-2022 Oliver Sander + * Copyright (C) 2020 Katarina Behrens + * Copyright (C) 2020 Thorsten Behrens + * Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021 Mahmoud Ahmed Khalil + * Adapting code from + * Copyright (C) 2004 by Enrico Ros + * + * 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. + */ + +// qt/kde includes +#include +#include +#include +#include + +// local includes +#include "poppler-annotation.h" +#include "poppler-link.h" +#include "poppler-qt6.h" +#include "poppler-annotation-helper.h" +#include "poppler-annotation-private.h" +#include "poppler-page-private.h" +#include "poppler-private.h" + +// poppler includes +#include +#include +#include +#include +#include +#include +#include + +/* Almost all getters directly query the underlying poppler annotation, with + * the exceptions of link, file attachment, sound, movie and screen annotations, + * Whose data retrieval logic has not been moved yet. Their getters return + * static data set at creation time by findAnnotations + */ + +namespace Poppler { + +// BEGIN AnnotationAppearancePrivate implementation +AnnotationAppearancePrivate::AnnotationAppearancePrivate(Annot *annot) +{ + if (annot) { + appearance = annot->getAppearance(); + } else { + appearance.setToNull(); + } +} +// END AnnotationAppearancePrivate implementation + +// BEGIN AnnotationAppearance implementation +AnnotationAppearance::AnnotationAppearance(AnnotationAppearancePrivate *annotationAppearancePrivate) : d(annotationAppearancePrivate) { } + +AnnotationAppearance::~AnnotationAppearance() +{ + delete d; +} +// END AnnotationAppearance implementation + +// BEGIN Annotation implementation +AnnotationPrivate::AnnotationPrivate() : revisionScope(Annotation::Root), revisionType(Annotation::None), pdfAnnot(nullptr), pdfPage(nullptr), parentDoc(nullptr) { } + +void getRawDataFromQImage(const QImage &qimg, int bitsPerPixel, QByteArray *data, QByteArray *sMaskData) +{ + const int height = qimg.height(); + const int width = qimg.width(); + + switch (bitsPerPixel) { + case 1: + for (int line = 0; line < height; line++) { + const char *lineData = reinterpret_cast(qimg.scanLine(line)); + for (int offset = 0; offset < (width + 7) / 8; offset++) { + data->append(lineData[offset]); + } + } + break; + case 8: + case 24: + data->append((const char *)qimg.bits(), static_cast(qimg.sizeInBytes())); + break; + case 32: + for (int line = 0; line < height; line++) { + const QRgb *lineData = reinterpret_cast(qimg.scanLine(line)); + for (int offset = 0; offset < width; offset++) { + char a = (char)qAlpha(lineData[offset]); + char r = (char)qRed(lineData[offset]); + char g = (char)qGreen(lineData[offset]); + char b = (char)qBlue(lineData[offset]); + + data->append(r); + data->append(g); + data->append(b); + + sMaskData->append(a); + } + } + break; + } +} + +void AnnotationPrivate::addRevision(Annotation *ann, Annotation::RevScope scope, Annotation::RevType type) +{ + /* Since ownership stays with the caller, create an alias of ann */ + revisions.append(ann->d_ptr->makeAlias()); + + /* Set revision properties */ + revisionScope = scope; + revisionType = type; +} + +AnnotationPrivate::~AnnotationPrivate() +{ + // Delete all children revisions + qDeleteAll(revisions); + + // Release Annot object + if (pdfAnnot) { + pdfAnnot->decRefCnt(); + } +} + +void AnnotationPrivate::tieToNativeAnnot(Annot *ann, ::Page *page, Poppler::DocumentData *doc) +{ + if (pdfAnnot) { + error(errIO, -1, "Annotation is already tied"); + return; + } + + pdfAnnot = ann; + pdfPage = page; + parentDoc = doc; + + pdfAnnot->incRefCnt(); +} + +/* This method is called when a new annotation is created, after pdfAnnot and + * pdfPage have been set */ +void AnnotationPrivate::flushBaseAnnotationProperties() +{ + Q_ASSERT(pdfPage); + + Annotation *q = makeAlias(); // Setters are defined in the public class + + // Since pdfAnnot has been set, this calls will write in the Annot object + q->setAuthor(author); + q->setContents(contents); + q->setUniqueName(uniqueName); + q->setModificationDate(modDate); + q->setCreationDate(creationDate); + q->setFlags(flags); + // q->setBoundary(boundary); -- already set by subclass-specific code + q->setStyle(style); + q->setPopup(popup); + + // Flush revisions + foreach (Annotation *r, revisions) { + // TODO: Flush revision + delete r; // Object is no longer needed + } + + delete q; + + // Clear some members to save memory + author.clear(); + contents.clear(); + uniqueName.clear(); + revisions.clear(); +} + +// Returns matrix to convert from user space coords (oriented according to the +// specified rotation) to normalized coords +static void fillNormalizationMTX(::Page *pdfPage, double MTX[6], int pageRotation) +{ + Q_ASSERT(pdfPage); + + // build a normalized transform matrix for this page at 100% scale + GfxState *gfxState = new GfxState(72.0, 72.0, pdfPage->getCropBox(), pageRotation, true); + const double *gfxCTM = gfxState->getCTM(); + + double w = pdfPage->getCropWidth(); + double h = pdfPage->getCropHeight(); + + // Swap width and height if the page is rotated landscape or seascape + if (pageRotation == 90 || pageRotation == 270) { + double t = w; + w = h; + h = t; + } + + for (int i = 0; i < 6; i += 2) { + MTX[i] = gfxCTM[i] / w; + MTX[i + 1] = gfxCTM[i + 1] / h; + } + delete gfxState; +} + +// Returns matrix to convert from user space coords (i.e. those that are stored +// in the PDF file) to normalized coords (i.e. those that we expose to clients). +// This method also applies a rotation around the top-left corner if the +// FixedRotation flag is set. +void AnnotationPrivate::fillTransformationMTX(double MTX[6]) const +{ + Q_ASSERT(pdfPage); + Q_ASSERT(pdfAnnot); + + const int pageRotate = pdfPage->getRotate(); + + if (pageRotate == 0 || (pdfAnnot->getFlags() & Annot::flagNoRotate) == 0) { + // Use the normalization matrix for this page's rotation + fillNormalizationMTX(pdfPage, MTX, pageRotate); + } else { + // Clients expect coordinates relative to this page's rotation, but + // FixedRotation annotations internally use unrotated coordinates: + // construct matrix to both normalize and rotate coordinates using the + // top-left corner as rotation pivot + + double MTXnorm[6]; + fillNormalizationMTX(pdfPage, MTXnorm, pageRotate); + + QTransform transform(MTXnorm[0], MTXnorm[1], MTXnorm[2], MTXnorm[3], MTXnorm[4], MTXnorm[5]); + transform.translate(+pdfAnnot->getXMin(), +pdfAnnot->getYMax()); + transform.rotate(pageRotate); + transform.translate(-pdfAnnot->getXMin(), -pdfAnnot->getYMax()); + + MTX[0] = transform.m11(); + MTX[1] = transform.m12(); + MTX[2] = transform.m21(); + MTX[3] = transform.m22(); + MTX[4] = transform.dx(); + MTX[5] = transform.dy(); + } +} + +QRectF AnnotationPrivate::fromPdfRectangle(const PDFRectangle &r) const +{ + double swp, MTX[6]; + fillTransformationMTX(MTX); + + QPointF p1, p2; + XPDFReader::transform(MTX, r.x1, r.y1, p1); + XPDFReader::transform(MTX, r.x2, r.y2, p2); + + double tl_x = p1.x(); + double tl_y = p1.y(); + double br_x = p2.x(); + double br_y = p2.y(); + + if (tl_x > br_x) { + swp = tl_x; + tl_x = br_x; + br_x = swp; + } + + if (tl_y > br_y) { + swp = tl_y; + tl_y = br_y; + br_y = swp; + } + + return QRectF(QPointF(tl_x, tl_y), QPointF(br_x, br_y)); +} + +// This function converts a boundary QRectF in normalized coords to a +// PDFRectangle in user coords. If the FixedRotation flag is set, this function +// also applies a rotation around the top-left corner: it's the inverse of +// the transformation produced by fillTransformationMTX, but we can't use +// fillTransformationMTX here because it relies on the native annotation +// object's boundary rect to be already set up. +PDFRectangle boundaryToPdfRectangle(::Page *pdfPage, const QRectF &r, int rFlags) +{ + Q_ASSERT(pdfPage); + + const int pageRotate = pdfPage->getRotate(); + + double MTX[6]; + fillNormalizationMTX(pdfPage, MTX, pageRotate); + + double tl_x, tl_y, br_x, br_y, swp; + XPDFReader::invTransform(MTX, r.topLeft(), tl_x, tl_y); + XPDFReader::invTransform(MTX, r.bottomRight(), br_x, br_y); + + if (tl_x > br_x) { + swp = tl_x; + tl_x = br_x; + br_x = swp; + } + + if (tl_y > br_y) { + swp = tl_y; + tl_y = br_y; + br_y = swp; + } + + const int rotationFixUp = (rFlags & Annotation::FixedRotation) ? pageRotate : 0; + const double width = br_x - tl_x; + const double height = br_y - tl_y; + + if (rotationFixUp == 0) { + return PDFRectangle(tl_x, tl_y, br_x, br_y); + } else if (rotationFixUp == 90) { + return PDFRectangle(tl_x, tl_y - width, tl_x + height, tl_y); + } else if (rotationFixUp == 180) { + return PDFRectangle(br_x, tl_y - height, br_x + width, tl_y); + } else { // rotationFixUp == 270 + return PDFRectangle(br_x, br_y - width, br_x + height, br_y); + } +} + +PDFRectangle AnnotationPrivate::boundaryToPdfRectangle(const QRectF &r, int rFlags) const +{ + return Poppler::boundaryToPdfRectangle(pdfPage, r, rFlags); +} + +AnnotPath *AnnotationPrivate::toAnnotPath(const QVector &list) const +{ + const int count = list.size(); + std::vector ac; + ac.reserve(count); + + double MTX[6]; + fillTransformationMTX(MTX); + + foreach (const QPointF &p, list) { + double x, y; + XPDFReader::invTransform(MTX, p, x, y); + ac.emplace_back(x, y); + } + + return new AnnotPath(std::move(ac)); +} + +std::vector> AnnotationPrivate::findAnnotations(::Page *pdfPage, DocumentData *doc, const QSet &subtypes, int parentID) +{ + Annots *annots = pdfPage->getAnnots(); + + const bool wantTextAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AText); + const bool wantLineAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::ALine); + const bool wantGeomAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AGeom); + const bool wantHighlightAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AHighlight); + const bool wantStampAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AStamp); + const bool wantInkAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AInk); + const bool wantLinkAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::ALink); + const bool wantCaretAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::ACaret); + const bool wantFileAttachmentAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AFileAttachment); + const bool wantSoundAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::ASound); + const bool wantMovieAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AMovie); + const bool wantScreenAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AScreen); + const bool wantWidgetAnnotations = subtypes.isEmpty() || subtypes.contains(Annotation::AWidget); + + // Create Annotation objects and tie to their native Annot + std::vector> res; + for (Annot *ann : annots->getAnnots()) { + if (!ann) { + error(errInternal, -1, "Annot is null"); + continue; + } + + // Check parent annotation + AnnotMarkup *markupann = dynamic_cast(ann); + if (!markupann) { + // Assume it's a root annotation, and skip if user didn't request it + if (parentID != -1) { + continue; + } + } else if (markupann->getInReplyToID() != parentID) { + continue; + } + + /* Create Annotation of the right subclass */ + std::unique_ptr annotation; + Annot::AnnotSubtype subType = ann->getType(); + + switch (subType) { + case Annot::typeText: + if (!wantTextAnnotations) { + continue; + } + annotation = std::make_unique(TextAnnotation::Linked); + break; + case Annot::typeFreeText: + if (!wantTextAnnotations) { + continue; + } + annotation = std::make_unique(TextAnnotation::InPlace); + break; + case Annot::typeLine: + if (!wantLineAnnotations) { + continue; + } + annotation = std::make_unique(LineAnnotation::StraightLine); + break; + case Annot::typePolygon: + case Annot::typePolyLine: + if (!wantLineAnnotations) { + continue; + } + annotation = std::make_unique(LineAnnotation::Polyline); + break; + case Annot::typeSquare: + case Annot::typeCircle: + if (!wantGeomAnnotations) { + continue; + } + annotation = std::make_unique(); + break; + case Annot::typeHighlight: + case Annot::typeUnderline: + case Annot::typeSquiggly: + case Annot::typeStrikeOut: + if (!wantHighlightAnnotations) { + continue; + } + annotation = std::make_unique(); + break; + case Annot::typeStamp: + if (!wantStampAnnotations) { + continue; + } + annotation = std::make_unique(); + break; + case Annot::typeInk: + if (!wantInkAnnotations) { + continue; + } + annotation = std::make_unique(); + break; + case Annot::typeLink: /* TODO: Move logic to getters */ + { + if (!wantLinkAnnotations) { + continue; + } + // parse Link params + AnnotLink *linkann = static_cast(ann); + LinkAnnotation *l = new LinkAnnotation(); + + // -> hlMode + l->setLinkHighlightMode((LinkAnnotation::HighlightMode)linkann->getLinkEffect()); + + // -> link region + // TODO + + // reading link action + if (linkann->getAction()) { + std::unique_ptr popplerLink = PageData::convertLinkActionToLink(linkann->getAction(), doc, QRectF()); + if (popplerLink) { + l->setLinkDestination(std::move(popplerLink)); + } + } + annotation.reset(l); + break; + } + case Annot::typeCaret: + if (!wantCaretAnnotations) { + continue; + } + annotation = std::make_unique(); + break; + case Annot::typeFileAttachment: /* TODO: Move logic to getters */ + { + if (!wantFileAttachmentAnnotations) { + continue; + } + AnnotFileAttachment *attachann = static_cast(ann); + FileAttachmentAnnotation *f = new FileAttachmentAnnotation(); + // -> fileIcon + f->setFileIconName(QString::fromLatin1(attachann->getName()->c_str())); + // -> embeddedFile + auto filespec = std::make_unique(attachann->getFile()); + f->setEmbeddedFile(new EmbeddedFile(*new EmbeddedFileData(std::move(filespec)))); + annotation.reset(f); + break; + } + case Annot::typeSound: /* TODO: Move logic to getters */ + { + if (!wantSoundAnnotations) { + continue; + } + AnnotSound *soundann = static_cast(ann); + SoundAnnotation *s = new SoundAnnotation(); + + // -> soundIcon + s->setSoundIconName(QString::fromLatin1(soundann->getName()->c_str())); + // -> sound + s->setSound(new SoundObject(soundann->getSound())); + annotation.reset(s); + break; + } + case Annot::typeMovie: /* TODO: Move logic to getters */ + { + if (!wantMovieAnnotations) { + continue; + } + AnnotMovie *movieann = static_cast(ann); + MovieAnnotation *m = new MovieAnnotation(); + + // -> movie + MovieObject *movie = new MovieObject(movieann); + m->setMovie(movie); + // -> movieTitle + const GooString *movietitle = movieann->getTitle(); + if (movietitle) { + m->setMovieTitle(QString::fromLatin1(movietitle->c_str())); + } + annotation.reset(m); + break; + } + case Annot::typeScreen: { + if (!wantScreenAnnotations) { + continue; + } + AnnotScreen *screenann = static_cast(ann); + // TODO Support other link types than Link::Rendition in ScreenAnnotation + if (!screenann->getAction() || screenann->getAction()->getKind() != actionRendition) { + continue; + } + ScreenAnnotation *s = new ScreenAnnotation(); + + // -> screen + std::unique_ptr popplerLink = PageData::convertLinkActionToLink(screenann->getAction(), doc, QRectF()); + s->setAction(static_cast(popplerLink.release())); + + // -> screenTitle + const GooString *screentitle = screenann->getTitle(); + if (screentitle) { + s->setScreenTitle(UnicodeParsedString(screentitle)); + } + annotation.reset(s); + break; + } + case Annot::typePopup: + continue; // popups are parsed by Annotation's window() getter + case Annot::typeUnknown: + continue; // special case for ignoring unknown annotations + case Annot::typeWidget: + if (!wantWidgetAnnotations) { + continue; + } + annotation.reset(new WidgetAnnotation()); + break; + case Annot::typeRichMedia: { + const AnnotRichMedia *annotRichMedia = static_cast(ann); + + RichMediaAnnotation *richMediaAnnotation = new RichMediaAnnotation; + + const AnnotRichMedia::Settings *annotSettings = annotRichMedia->getSettings(); + if (annotSettings) { + RichMediaAnnotation::Settings *settings = new RichMediaAnnotation::Settings; + + if (annotSettings->getActivation()) { + RichMediaAnnotation::Activation *activation = new RichMediaAnnotation::Activation; + + switch (annotSettings->getActivation()->getCondition()) { + case AnnotRichMedia::Activation::conditionPageOpened: + activation->setCondition(RichMediaAnnotation::Activation::PageOpened); + break; + case AnnotRichMedia::Activation::conditionPageVisible: + activation->setCondition(RichMediaAnnotation::Activation::PageVisible); + break; + case AnnotRichMedia::Activation::conditionUserAction: + activation->setCondition(RichMediaAnnotation::Activation::UserAction); + break; + } + + settings->setActivation(activation); + } + + if (annotSettings->getDeactivation()) { + RichMediaAnnotation::Deactivation *deactivation = new RichMediaAnnotation::Deactivation; + + switch (annotSettings->getDeactivation()->getCondition()) { + case AnnotRichMedia::Deactivation::conditionPageClosed: + deactivation->setCondition(RichMediaAnnotation::Deactivation::PageClosed); + break; + case AnnotRichMedia::Deactivation::conditionPageInvisible: + deactivation->setCondition(RichMediaAnnotation::Deactivation::PageInvisible); + break; + case AnnotRichMedia::Deactivation::conditionUserAction: + deactivation->setCondition(RichMediaAnnotation::Deactivation::UserAction); + break; + } + + settings->setDeactivation(deactivation); + } + + richMediaAnnotation->setSettings(settings); + } + + const AnnotRichMedia::Content *annotContent = annotRichMedia->getContent(); + if (annotContent) { + RichMediaAnnotation::Content *content = new RichMediaAnnotation::Content; + + const int configurationsCount = annotContent->getConfigurationsCount(); + if (configurationsCount > 0) { + QList configurations; + + for (int i = 0; i < configurationsCount; ++i) { + const AnnotRichMedia::Configuration *annotConfiguration = annotContent->getConfiguration(i); + if (!annotConfiguration) { + continue; + } + + RichMediaAnnotation::Configuration *configuration = new RichMediaAnnotation::Configuration; + + if (annotConfiguration->getName()) { + configuration->setName(UnicodeParsedString(annotConfiguration->getName())); + } + + switch (annotConfiguration->getType()) { + case AnnotRichMedia::Configuration::type3D: + configuration->setType(RichMediaAnnotation::Configuration::Type3D); + break; + case AnnotRichMedia::Configuration::typeFlash: + configuration->setType(RichMediaAnnotation::Configuration::TypeFlash); + break; + case AnnotRichMedia::Configuration::typeSound: + configuration->setType(RichMediaAnnotation::Configuration::TypeSound); + break; + case AnnotRichMedia::Configuration::typeVideo: + configuration->setType(RichMediaAnnotation::Configuration::TypeVideo); + break; + } + + const int instancesCount = annotConfiguration->getInstancesCount(); + if (instancesCount > 0) { + QList instances; + + for (int j = 0; j < instancesCount; ++j) { + const AnnotRichMedia::Instance *annotInstance = annotConfiguration->getInstance(j); + if (!annotInstance) { + continue; + } + + RichMediaAnnotation::Instance *instance = new RichMediaAnnotation::Instance; + + switch (annotInstance->getType()) { + case AnnotRichMedia::Instance::type3D: + instance->setType(RichMediaAnnotation::Instance::Type3D); + break; + case AnnotRichMedia::Instance::typeFlash: + instance->setType(RichMediaAnnotation::Instance::TypeFlash); + break; + case AnnotRichMedia::Instance::typeSound: + instance->setType(RichMediaAnnotation::Instance::TypeSound); + break; + case AnnotRichMedia::Instance::typeVideo: + instance->setType(RichMediaAnnotation::Instance::TypeVideo); + break; + } + + const AnnotRichMedia::Params *annotParams = annotInstance->getParams(); + if (annotParams) { + RichMediaAnnotation::Params *params = new RichMediaAnnotation::Params; + + if (annotParams->getFlashVars()) { + params->setFlashVars(UnicodeParsedString(annotParams->getFlashVars())); + } + + instance->setParams(params); + } + + instances.append(instance); + } + + configuration->setInstances(instances); + } + + configurations.append(configuration); + } + + content->setConfigurations(configurations); + } + + const int assetsCount = annotContent->getAssetsCount(); + if (assetsCount > 0) { + QList assets; + + for (int i = 0; i < assetsCount; ++i) { + const AnnotRichMedia::Asset *annotAsset = annotContent->getAsset(i); + if (!annotAsset) { + continue; + } + + RichMediaAnnotation::Asset *asset = new RichMediaAnnotation::Asset; + + if (annotAsset->getName()) { + asset->setName(UnicodeParsedString(annotAsset->getName())); + } + + auto fileSpec = std::make_unique(annotAsset->getFileSpec()); + asset->setEmbeddedFile(new EmbeddedFile(*new EmbeddedFileData(std::move(fileSpec)))); + + assets.append(asset); + } + + content->setAssets(assets); + } + + richMediaAnnotation->setContent(content); + } + + annotation.reset(richMediaAnnotation); + + break; + } + default: { +#define CASE_FOR_TYPE(thetype) \ + case Annot::type##thetype: \ + error(errUnimplemented, -1, "Annotation " #thetype " not supported"); \ + break; + switch (subType) { + CASE_FOR_TYPE(PrinterMark) + CASE_FOR_TYPE(TrapNet) + CASE_FOR_TYPE(Watermark) + CASE_FOR_TYPE(3D) + default: + error(errUnimplemented, -1, "Annotation {0:d} not supported", subType); + } + continue; +#undef CASE_FOR_TYPE + } + } + + annotation->d_ptr->tieToNativeAnnot(ann, pdfPage, doc); + res.push_back(std::move(annotation)); + } + + return res; +} + +Ref AnnotationPrivate::pdfObjectReference() const +{ + if (pdfAnnot == nullptr) { + return Ref::INVALID(); + } + + return pdfAnnot->getRef(); +} + +std::unique_ptr AnnotationPrivate::additionalAction(Annotation::AdditionalActionType type) const +{ + if (pdfAnnot->getType() != Annot::typeScreen && pdfAnnot->getType() != Annot::typeWidget) { + return {}; + } + + const Annot::AdditionalActionsType actionType = toPopplerAdditionalActionType(type); + + std::unique_ptr<::LinkAction> linkAction; + if (pdfAnnot->getType() == Annot::typeScreen) { + linkAction = static_cast(pdfAnnot)->getAdditionalAction(actionType); + } else { + linkAction = static_cast(pdfAnnot)->getAdditionalAction(actionType); + } + + if (linkAction) { + return PageData::convertLinkActionToLink(linkAction.get(), parentDoc, QRectF()); + } + + return {}; +} + +void AnnotationPrivate::addAnnotationToPage(::Page *pdfPage, DocumentData *doc, const Annotation *ann) +{ + if (ann->d_ptr->pdfAnnot != nullptr) { + error(errIO, -1, "Annotation is already tied"); + return; + } + + // Unimplemented annotations can't be created by the user because their ctor + // is private. Therefore, createNativeAnnot will never return 0 + Annot *nativeAnnot = ann->d_ptr->createNativeAnnot(pdfPage, doc); + Q_ASSERT(nativeAnnot); + + if (ann->d_ptr->annotationAppearance.isStream()) { + nativeAnnot->setNewAppearance(ann->d_ptr->annotationAppearance.copy()); + } + + pdfPage->addAnnot(nativeAnnot); +} + +void AnnotationPrivate::removeAnnotationFromPage(::Page *pdfPage, const Annotation *ann) +{ + if (ann->d_ptr->pdfAnnot == nullptr) { + error(errIO, -1, "Annotation is not tied"); + return; + } + + if (ann->d_ptr->pdfPage != pdfPage) { + error(errIO, -1, "Annotation doesn't belong to the specified page"); + return; + } + + // Remove annotation + pdfPage->removeAnnot(ann->d_ptr->pdfAnnot); + + // Destroy object + delete ann; +} + +class TextAnnotationPrivate : public AnnotationPrivate +{ +public: + TextAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + void setDefaultAppearanceToNative(); + std::unique_ptr getDefaultAppearanceFromNative() const; + + // data fields + TextAnnotation::TextType textType; + QString textIcon; + std::optional textFont; + QColor textColor = Qt::black; + TextAnnotation::InplaceAlignPosition inplaceAlign; + QVector inplaceCallout; + TextAnnotation::InplaceIntent inplaceIntent; +}; + +class Annotation::Style::Private : public QSharedData +{ +public: + Private() : opacity(1.0), width(1.0), lineStyle(Solid), xCorners(0.0), yCorners(0.0), lineEffect(NoEffect), effectIntensity(1.0) + { + dashArray.resize(1); + dashArray[0] = 3; + } + + QColor color; + double opacity; + double width; + Annotation::LineStyle lineStyle; + double xCorners; + double yCorners; + QVector dashArray; + Annotation::LineEffect lineEffect; + double effectIntensity; +}; + +Annotation::Style::Style() : d(new Private) { } + +Annotation::Style::Style(const Style &other) : d(other.d) { } + +Annotation::Style &Annotation::Style::operator=(const Style &other) +{ + if (this != &other) { + d = other.d; + } + + return *this; +} + +Annotation::Style::~Style() { } + +QColor Annotation::Style::color() const +{ + return d->color; +} + +void Annotation::Style::setColor(const QColor &color) +{ + d->color = color; +} + +double Annotation::Style::opacity() const +{ + return d->opacity; +} + +void Annotation::Style::setOpacity(double opacity) +{ + d->opacity = opacity; +} + +double Annotation::Style::width() const +{ + return d->width; +} + +void Annotation::Style::setWidth(double width) +{ + d->width = width; +} + +Annotation::LineStyle Annotation::Style::lineStyle() const +{ + return d->lineStyle; +} + +void Annotation::Style::setLineStyle(Annotation::LineStyle style) +{ + d->lineStyle = style; +} + +double Annotation::Style::xCorners() const +{ + return d->xCorners; +} + +void Annotation::Style::setXCorners(double radius) +{ + d->xCorners = radius; +} + +double Annotation::Style::yCorners() const +{ + return d->yCorners; +} + +void Annotation::Style::setYCorners(double radius) +{ + d->yCorners = radius; +} + +const QVector &Annotation::Style::dashArray() const +{ + return d->dashArray; +} + +void Annotation::Style::setDashArray(const QVector &array) +{ + d->dashArray = array; +} + +Annotation::LineEffect Annotation::Style::lineEffect() const +{ + return d->lineEffect; +} + +void Annotation::Style::setLineEffect(Annotation::LineEffect effect) +{ + d->lineEffect = effect; +} + +double Annotation::Style::effectIntensity() const +{ + return d->effectIntensity; +} + +void Annotation::Style::setEffectIntensity(double intens) +{ + d->effectIntensity = intens; +} + +class Annotation::Popup::Private : public QSharedData +{ +public: + Private() : flags(-1) { } + + int flags; + QRectF geometry; + QString title; + QString summary; + QString text; +}; + +Annotation::Popup::Popup() : d(new Private) { } + +Annotation::Popup::Popup(const Popup &other) : d(other.d) { } + +Annotation::Popup &Annotation::Popup::operator=(const Popup &other) +{ + if (this != &other) { + d = other.d; + } + + return *this; +} + +Annotation::Popup::~Popup() { } + +int Annotation::Popup::flags() const +{ + return d->flags; +} + +void Annotation::Popup::setFlags(int flags) +{ + d->flags = flags; +} + +QRectF Annotation::Popup::geometry() const +{ + return d->geometry; +} + +void Annotation::Popup::setGeometry(const QRectF &geom) +{ + d->geometry = geom; +} + +QString Annotation::Popup::title() const +{ + return d->title; +} + +void Annotation::Popup::setTitle(const QString &title) +{ + d->title = title; +} + +QString Annotation::Popup::summary() const +{ + return d->summary; +} + +void Annotation::Popup::setSummary(const QString &summary) +{ + d->summary = summary; +} + +QString Annotation::Popup::text() const +{ + return d->text; +} + +void Annotation::Popup::setText(const QString &text) +{ + d->text = text; +} + +Annotation::Annotation(AnnotationPrivate &dd) : d_ptr(&dd) { } + +Annotation::~Annotation() { } + +QString Annotation::author() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->author; + } + + const AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + return markupann ? UnicodeParsedString(markupann->getLabel()) : QString(); +} + +void Annotation::setAuthor(const QString &author) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->author = author; + return; + } + + AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + if (markupann) { + markupann->setLabel(std::unique_ptr(QStringToUnicodeGooString(author))); + } +} + +QString Annotation::contents() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->contents; + } + + return UnicodeParsedString(d->pdfAnnot->getContents()); +} + +void Annotation::setContents(const QString &contents) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->contents = contents; + return; + } + + d->pdfAnnot->setContents(std::unique_ptr(QStringToUnicodeGooString(contents))); + + TextAnnotationPrivate *textAnnotD = dynamic_cast(d); + if (textAnnotD) { + textAnnotD->setDefaultAppearanceToNative(); + } +} + +QString Annotation::uniqueName() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->uniqueName; + } + + return UnicodeParsedString(d->pdfAnnot->getName()); +} + +void Annotation::setUniqueName(const QString &uniqueName) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->uniqueName = uniqueName; + return; + } + + QByteArray ascii = uniqueName.toLatin1(); + GooString s(ascii.constData()); + d->pdfAnnot->setName(&s); +} + +QDateTime Annotation::modificationDate() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->modDate; + } + + if (d->pdfAnnot->getModified()) { + return convertDate(d->pdfAnnot->getModified()->c_str()); + } else { + return QDateTime(); + } +} + +void Annotation::setModificationDate(const QDateTime &date) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->modDate = date; + return; + } + + if (d->pdfAnnot) { + if (date.isValid()) { + const time_t t = date.toSecsSinceEpoch(); + GooString *s = timeToDateString(&t); + d->pdfAnnot->setModified(s); + delete s; + } else { + d->pdfAnnot->setModified(nullptr); + } + } +} + +QDateTime Annotation::creationDate() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->creationDate; + } + + const AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + + if (markupann && markupann->getDate()) { + return convertDate(markupann->getDate()->c_str()); + } + + return modificationDate(); +} + +void Annotation::setCreationDate(const QDateTime &date) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->creationDate = date; + return; + } + + AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + if (markupann) { + if (date.isValid()) { + const time_t t = date.toSecsSinceEpoch(); + GooString *s = timeToDateString(&t); + markupann->setDate(s); + delete s; + } else { + markupann->setDate(nullptr); + } + } +} + +static Annotation::Flags fromPdfFlags(int flags) +{ + Annotation::Flags qtflags; + + if (flags & Annot::flagHidden) { + qtflags |= Annotation::Hidden; + } + if (flags & Annot::flagNoZoom) { + qtflags |= Annotation::FixedSize; + } + if (flags & Annot::flagNoRotate) { + qtflags |= Annotation::FixedRotation; + } + if (!(flags & Annot::flagPrint)) { + qtflags |= Annotation::DenyPrint; + } + if (flags & Annot::flagReadOnly) { + qtflags |= Annotation::DenyWrite; + qtflags |= Annotation::DenyDelete; + } + if (flags & Annot::flagLocked) { + qtflags |= Annotation::DenyDelete; + } + if (flags & Annot::flagToggleNoView) { + qtflags |= Annotation::ToggleHidingOnMouse; + } + + return qtflags; +} + +static int toPdfFlags(Annotation::Flags qtflags) +{ + int flags = 0; + + if (qtflags & Annotation::Hidden) { + flags |= Annot::flagHidden; + } + if (qtflags & Annotation::FixedSize) { + flags |= Annot::flagNoZoom; + } + if (qtflags & Annotation::FixedRotation) { + flags |= Annot::flagNoRotate; + } + if (!(qtflags & Annotation::DenyPrint)) { + flags |= Annot::flagPrint; + } + if (qtflags & Annotation::DenyWrite) { + flags |= Annot::flagReadOnly; + } + if (qtflags & Annotation::DenyDelete) { + flags |= Annot::flagLocked; + } + if (qtflags & Annotation::ToggleHidingOnMouse) { + flags |= Annot::flagToggleNoView; + } + + return flags; +} + +Annotation::Flags Annotation::flags() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->flags; + } + + return fromPdfFlags(d->pdfAnnot->getFlags()); +} + +void Annotation::setFlags(Annotation::Flags flags) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->flags = flags; + return; + } + + d->pdfAnnot->setFlags(toPdfFlags(flags)); +} + +QRectF Annotation::boundary() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->boundary; + } + + const PDFRectangle &rect = d->pdfAnnot->getRect(); + return d->fromPdfRectangle(rect); +} + +void Annotation::setBoundary(const QRectF &boundary) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->boundary = boundary; + return; + } + + const PDFRectangle rect = d->boundaryToPdfRectangle(boundary, flags()); + if (rect == d->pdfAnnot->getRect()) { + return; + } + d->pdfAnnot->setRect(&rect); +} + +Annotation::Style Annotation::style() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->style; + } + + Style s; + s.setColor(convertAnnotColor(d->pdfAnnot->getColor())); + + const AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + if (markupann) { + s.setOpacity(markupann->getOpacity()); + } + + const AnnotBorder *border = d->pdfAnnot->getBorder(); + if (border) { + if (border->getType() == AnnotBorder::typeArray) { + const AnnotBorderArray *border_array = static_cast(border); + s.setXCorners(border_array->getHorizontalCorner()); + s.setYCorners(border_array->getVerticalCorner()); + } + + s.setWidth(border->getWidth()); + s.setLineStyle((Annotation::LineStyle)(1 << border->getStyle())); + + const std::vector &dashArray = border->getDash(); + s.setDashArray(QVector(dashArray.begin(), dashArray.end())); + } + + AnnotBorderEffect *border_effect; + switch (d->pdfAnnot->getType()) { + case Annot::typeFreeText: + border_effect = static_cast(d->pdfAnnot)->getBorderEffect(); + break; + case Annot::typeSquare: + case Annot::typeCircle: + border_effect = static_cast(d->pdfAnnot)->getBorderEffect(); + break; + default: + border_effect = nullptr; + } + if (border_effect) { + s.setLineEffect((Annotation::LineEffect)border_effect->getEffectType()); + s.setEffectIntensity(border_effect->getIntensity()); + } + + return s; +} + +void Annotation::setStyle(const Annotation::Style &style) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->style = style; + return; + } + + d->pdfAnnot->setColor(convertQColor(style.color())); + + AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + if (markupann) { + markupann->setOpacity(style.opacity()); + } + + auto border = std::make_unique(); + border->setWidth(style.width()); + border->setHorizontalCorner(style.xCorners()); + border->setVerticalCorner(style.yCorners()); + d->pdfAnnot->setBorder(std::move(border)); +} + +Annotation::Popup Annotation::popup() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->popup; + } + + Popup w; + AnnotPopup *popup = nullptr; + int flags = -1; // Not initialized + + const AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + if (markupann) { + popup = markupann->getPopup(); + w.setSummary(UnicodeParsedString(markupann->getSubject())); + } + + if (popup) { + flags = fromPdfFlags(popup->getFlags()) & (Annotation::Hidden | Annotation::FixedSize | Annotation::FixedRotation); + + if (!popup->getOpen()) { + flags |= Annotation::Hidden; + } + + const PDFRectangle &rect = popup->getRect(); + w.setGeometry(d->fromPdfRectangle(rect)); + } + + if (d->pdfAnnot->getType() == Annot::typeText) { + const AnnotText *textann = static_cast(d->pdfAnnot); + + // Text annotations default to same rect as annotation + if (flags == -1) { + flags = 0; + w.setGeometry(boundary()); + } + + // If text is not 'opened', force window hiding. if the window + // was parsed from popup, the flag should already be set + if (!textann->getOpen() && flags != -1) { + flags |= Annotation::Hidden; + } + } + + w.setFlags(flags); + + return w; +} + +void Annotation::setPopup(const Annotation::Popup &popup) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->popup = popup; + return; + } + +#if 0 /* TODO: Remove old popup and add AnnotPopup to page */ + AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + if (!markupann) + return; + + // Create a new AnnotPopup and assign it to pdfAnnot + PDFRectangle rect = d->toPdfRectangle( popup.geometry() ); + AnnotPopup * p = new AnnotPopup( d->pdfPage->getDoc(), &rect ); + p->setOpen( !(popup.flags() & Annotation::Hidden) ); + if (!popup.summary().isEmpty()) + { + GooString *s = QStringToUnicodeGooString(popup.summary()); + markupann->setLabel(s); + delete s; + } + markupann->setPopup(p); +#endif +} + +Annotation::RevScope Annotation::revisionScope() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->revisionScope; + } + + const AnnotMarkup *markupann = dynamic_cast(d->pdfAnnot); + + if (markupann && markupann->isInReplyTo()) { + switch (markupann->getReplyTo()) { + case AnnotMarkup::replyTypeR: + return Annotation::Reply; + case AnnotMarkup::replyTypeGroup: + return Annotation::Group; + } + } + + return Annotation::Root; // It's not a revision +} + +Annotation::RevType Annotation::revisionType() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + return d->revisionType; + } + + const AnnotText *textann = dynamic_cast(d->pdfAnnot); + + if (textann && textann->isInReplyTo()) { + switch (textann->getState()) { + case AnnotText::stateMarked: + return Annotation::Marked; + case AnnotText::stateUnmarked: + return Annotation::Unmarked; + case AnnotText::stateAccepted: + return Annotation::Accepted; + case AnnotText::stateRejected: + return Annotation::Rejected; + case AnnotText::stateCancelled: + return Annotation::Cancelled; + case AnnotText::stateCompleted: + return Annotation::Completed; + default: + break; + } + } + + return Annotation::None; +} + +std::vector> Annotation::revisions() const +{ + Q_D(const Annotation); + + if (!d->pdfAnnot) { + /* Return aliases, whose ownership goes to the caller */ + std::vector> res; + foreach (Annotation *rev, d->revisions) + res.push_back(std::unique_ptr(rev->d_ptr->makeAlias())); + return res; + } + + /* If the annotation doesn't live in a object on its own (eg bug51361), it + * has no ref, therefore it can't have revisions */ + if (!d->pdfAnnot->getHasRef()) { + return std::vector>(); + } + + return AnnotationPrivate::findAnnotations(d->pdfPage, d->parentDoc, QSet(), d->pdfAnnot->getId()); +} + +std::unique_ptr Annotation::annotationAppearance() const +{ + Q_D(const Annotation); + + return std::make_unique(new AnnotationAppearancePrivate(d->pdfAnnot)); +} + +void Annotation::setAnnotationAppearance(const AnnotationAppearance &annotationAppearance) +{ + Q_D(Annotation); + + if (!d->pdfAnnot) { + d->annotationAppearance = annotationAppearance.d->appearance.copy(); + return; + } + + // Moving the appearance object using std::move would result + // in the object being completed moved from the AnnotationAppearancePrivate + // class. So, we'll not be able to retrieve the stamp's original AP stream + d->pdfAnnot->setNewAppearance(annotationAppearance.d->appearance.copy()); +} + +// END Annotation implementation + +/** TextAnnotation [Annotation] */ +TextAnnotationPrivate::TextAnnotationPrivate() : AnnotationPrivate(), textType(TextAnnotation::Linked), textIcon(QStringLiteral("Note")), inplaceAlign(TextAnnotation::InplaceAlignLeft), inplaceIntent(TextAnnotation::Unknown) { } + +Annotation *TextAnnotationPrivate::makeAlias() +{ + return new TextAnnotation(*this); +} + +Annot *TextAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + // Setters are defined in the public class + TextAnnotation *q = static_cast(makeAlias()); + + // Set page and contents + pdfPage = destPage; + parentDoc = doc; + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + if (textType == TextAnnotation::Linked) { + pdfAnnot = new AnnotText { destPage->getDoc(), &rect }; + } else { + const double pointSize = textFont ? textFont->pointSizeF() : AnnotFreeText::undefinedFontPtSize; + if (pointSize < 0) { + qWarning() << "TextAnnotationPrivate::createNativeAnnot: font pointSize < 0"; + } + pdfAnnot = new AnnotFreeText { destPage->getDoc(), &rect }; + } + + // Set properties + flushBaseAnnotationProperties(); + q->setTextIcon(textIcon); + q->setInplaceAlign(inplaceAlign); + q->setCalloutPoints(inplaceCallout); + q->setInplaceIntent(inplaceIntent); + + delete q; + + inplaceCallout.clear(); // Free up memory + + setDefaultAppearanceToNative(); + + return pdfAnnot; +} + +void TextAnnotationPrivate::setDefaultAppearanceToNative() +{ + if (pdfAnnot && pdfAnnot->getType() == Annot::typeFreeText) { + AnnotFreeText *ftextann = static_cast(pdfAnnot); + const double pointSize = textFont ? textFont->pointSizeF() : AnnotFreeText::undefinedFontPtSize; + if (pointSize < 0) { + qWarning() << "TextAnnotationPrivate::createNativeAnnot: font pointSize < 0"; + } + std::string fontName = "Invalid_font"; + if (textFont) { + Form *form = pdfPage->getDoc()->getCatalog()->getCreateForm(); + if (form) { + fontName = form->findFontInDefaultResources(textFont->family().toStdString(), textFont->styleName().toStdString()); + if (fontName.empty()) { + fontName = form->addFontToDefaultResources(textFont->family().toStdString(), textFont->styleName().toStdString()).fontName; + } + + if (!fontName.empty()) { + form->ensureFontsForAllCharacters(pdfAnnot->getContents(), fontName); + } else { + fontName = "Invalid_font"; + } + } + } + DefaultAppearance da { { objName, fontName.c_str() }, pointSize, convertQColor(textColor) }; + ftextann->setDefaultAppearance(da); + } +} + +std::unique_ptr TextAnnotationPrivate::getDefaultAppearanceFromNative() const +{ + if (pdfAnnot && pdfAnnot->getType() == Annot::typeFreeText) { + AnnotFreeText *ftextann = static_cast(pdfAnnot); + return ftextann->getDefaultAppearance(); + } else { + return {}; + } +} + +TextAnnotation::TextAnnotation(TextAnnotation::TextType type) : Annotation(*new TextAnnotationPrivate()) +{ + setTextType(type); +} + +TextAnnotation::TextAnnotation(TextAnnotationPrivate &dd) : Annotation(dd) { } + +TextAnnotation::~TextAnnotation() { } + +Annotation::SubType TextAnnotation::subType() const +{ + return AText; +} + +TextAnnotation::TextType TextAnnotation::textType() const +{ + Q_D(const TextAnnotation); + + if (!d->pdfAnnot) { + return d->textType; + } + + return d->pdfAnnot->getType() == Annot::typeText ? TextAnnotation::Linked : TextAnnotation::InPlace; +} + +void TextAnnotation::setTextType(TextAnnotation::TextType type) +{ + Q_D(TextAnnotation); + + if (!d->pdfAnnot) { + d->textType = type; + return; + } + + // Type cannot be changed if annotation is already tied + qWarning() << "You can't change the type of a TextAnnotation that is already in a page"; +} + +QString TextAnnotation::textIcon() const +{ + Q_D(const TextAnnotation); + + if (!d->pdfAnnot) { + return d->textIcon; + } + + if (d->pdfAnnot->getType() == Annot::typeText) { + const AnnotText *textann = static_cast(d->pdfAnnot); + return QString::fromLatin1(textann->getIcon()->c_str()); + } + + return QString(); +} + +void TextAnnotation::setTextIcon(const QString &icon) +{ + Q_D(TextAnnotation); + + if (!d->pdfAnnot) { + d->textIcon = icon; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeText) { + AnnotText *textann = static_cast(d->pdfAnnot); + QByteArray encoded = icon.toLatin1(); + GooString s(encoded.constData()); + textann->setIcon(&s); + } +} + +QFont TextAnnotation::textFont() const +{ + Q_D(const TextAnnotation); + + if (d->textFont) { + return *d->textFont; + } + + double fontSize { AnnotFreeText::undefinedFontPtSize }; + if (d->pdfAnnot->getType() == Annot::typeFreeText) { + std::unique_ptr da { d->getDefaultAppearanceFromNative() }; + if (da && da->getFontPtSize() > 0) { + fontSize = da->getFontPtSize(); + } + } + + QFont font; + font.setPointSizeF(fontSize); + return font; +} + +void TextAnnotation::setTextFont(const QFont &font) +{ + Q_D(TextAnnotation); + if (font == d->textFont) { + return; + } + d->textFont = font; + + d->setDefaultAppearanceToNative(); +} + +QColor TextAnnotation::textColor() const +{ + Q_D(const TextAnnotation); + + if (!d->pdfAnnot) { + return d->textColor; + } + + if (std::unique_ptr da { d->getDefaultAppearanceFromNative() }) { + return convertAnnotColor(da->getFontColor()); + } + + return {}; +} + +void TextAnnotation::setTextColor(const QColor &color) +{ + Q_D(TextAnnotation); + if (color == d->textColor) { + return; + } + d->textColor = color; + + d->setDefaultAppearanceToNative(); +} + +TextAnnotation::InplaceAlignPosition TextAnnotation::inplaceAlign() const +{ + Q_D(const TextAnnotation); + + if (!d->pdfAnnot) { + return d->inplaceAlign; + } + + if (d->pdfAnnot->getType() == Annot::typeFreeText) { + const AnnotFreeText *ftextann = static_cast(d->pdfAnnot); + switch (ftextann->getQuadding()) { + case VariableTextQuadding::leftJustified: + return InplaceAlignLeft; + case VariableTextQuadding::centered: + return InplaceAlignCenter; + case VariableTextQuadding::rightJustified: + return InplaceAlignRight; + } + } + + return InplaceAlignLeft; +} + +static VariableTextQuadding alignToQuadding(TextAnnotation::InplaceAlignPosition align) +{ + switch (align) { + case TextAnnotation::InplaceAlignLeft: + return VariableTextQuadding::leftJustified; + case TextAnnotation::InplaceAlignCenter: + return VariableTextQuadding::centered; + case TextAnnotation::InplaceAlignRight: + return VariableTextQuadding::rightJustified; + } + return VariableTextQuadding::leftJustified; +} + +void TextAnnotation::setInplaceAlign(InplaceAlignPosition align) +{ + Q_D(TextAnnotation); + + if (!d->pdfAnnot) { + d->inplaceAlign = align; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeFreeText) { + AnnotFreeText *ftextann = static_cast(d->pdfAnnot); + ftextann->setQuadding(alignToQuadding(align)); + } +} + +QPointF TextAnnotation::calloutPoint(int id) const +{ + const QVector points = calloutPoints(); + if (id < 0 || id >= points.size()) { + return QPointF(); + } else { + return points[id]; + } +} + +QVector TextAnnotation::calloutPoints() const +{ + Q_D(const TextAnnotation); + + if (!d->pdfAnnot) { + return d->inplaceCallout; + } + + if (d->pdfAnnot->getType() == Annot::typeText) { + return QVector(); + } + + const AnnotFreeText *ftextann = static_cast(d->pdfAnnot); + const AnnotCalloutLine *callout = ftextann->getCalloutLine(); + + if (!callout) { + return QVector(); + } + + double MTX[6]; + d->fillTransformationMTX(MTX); + + const AnnotCalloutMultiLine *callout_v6 = dynamic_cast(callout); + QVector res(callout_v6 ? 3 : 2); + XPDFReader::transform(MTX, callout->getX1(), callout->getY1(), res[0]); + XPDFReader::transform(MTX, callout->getX2(), callout->getY2(), res[1]); + if (callout_v6) { + XPDFReader::transform(MTX, callout_v6->getX3(), callout_v6->getY3(), res[2]); + } + return res; +} + +void TextAnnotation::setCalloutPoints(const QVector &points) +{ + Q_D(TextAnnotation); + if (!d->pdfAnnot) { + d->inplaceCallout = points; + return; + } + + if (d->pdfAnnot->getType() != Annot::typeFreeText) { + return; + } + + AnnotFreeText *ftextann = static_cast(d->pdfAnnot); + const int count = points.size(); + + if (count == 0) { + ftextann->setCalloutLine(nullptr); + return; + } + + if (count != 2 && count != 3) { + error(errSyntaxError, -1, "Expected zero, two or three points for callout"); + return; + } + + AnnotCalloutLine *callout; + double x1, y1, x2, y2; + double MTX[6]; + d->fillTransformationMTX(MTX); + + XPDFReader::invTransform(MTX, points[0], x1, y1); + XPDFReader::invTransform(MTX, points[1], x2, y2); + if (count == 3) { + double x3, y3; + XPDFReader::invTransform(MTX, points[2], x3, y3); + callout = new AnnotCalloutMultiLine(x1, y1, x2, y2, x3, y3); + } else { + callout = new AnnotCalloutLine(x1, y1, x2, y2); + } + + ftextann->setCalloutLine(callout); + delete callout; +} + +TextAnnotation::InplaceIntent TextAnnotation::inplaceIntent() const +{ + Q_D(const TextAnnotation); + + if (!d->pdfAnnot) { + return d->inplaceIntent; + } + + if (d->pdfAnnot->getType() == Annot::typeFreeText) { + const AnnotFreeText *ftextann = static_cast(d->pdfAnnot); + return (TextAnnotation::InplaceIntent)ftextann->getIntent(); + } + + return TextAnnotation::Unknown; +} + +void TextAnnotation::setInplaceIntent(TextAnnotation::InplaceIntent intent) +{ + Q_D(TextAnnotation); + + if (!d->pdfAnnot) { + d->inplaceIntent = intent; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeFreeText) { + AnnotFreeText *ftextann = static_cast(d->pdfAnnot); + ftextann->setIntent((AnnotFreeText::AnnotFreeTextIntent)intent); + } +} + +/** LineAnnotation [Annotation] */ +class LineAnnotationPrivate : public AnnotationPrivate +{ +public: + LineAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields (note uses border for rendering style) + QVector linePoints; + LineAnnotation::TermStyle lineStartStyle; + LineAnnotation::TermStyle lineEndStyle; + bool lineClosed : 1; // (if true draw close shape) + bool lineShowCaption : 1; + LineAnnotation::LineType lineType; + QColor lineInnerColor; + double lineLeadingFwdPt; + double lineLeadingBackPt; + LineAnnotation::LineIntent lineIntent; +}; + +LineAnnotationPrivate::LineAnnotationPrivate() + : AnnotationPrivate(), lineStartStyle(LineAnnotation::None), lineEndStyle(LineAnnotation::None), lineClosed(false), lineShowCaption(false), lineLeadingFwdPt(0), lineLeadingBackPt(0), lineIntent(LineAnnotation::Unknown) +{ +} + +Annotation *LineAnnotationPrivate::makeAlias() +{ + return new LineAnnotation(*this); +} + +Annot *LineAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + // Setters are defined in the public class + LineAnnotation *q = static_cast(makeAlias()); + + // Set page and document + pdfPage = destPage; + parentDoc = doc; + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + if (lineType == LineAnnotation::StraightLine) { + pdfAnnot = new AnnotLine(doc->doc, &rect); + } else { + pdfAnnot = new AnnotPolygon(doc->doc, &rect, lineClosed ? Annot::typePolygon : Annot::typePolyLine); + } + + // Set properties + flushBaseAnnotationProperties(); + q->setLinePoints(linePoints); + q->setLineStartStyle(lineStartStyle); + q->setLineEndStyle(lineEndStyle); + q->setLineInnerColor(lineInnerColor); + q->setLineLeadingForwardPoint(lineLeadingFwdPt); + q->setLineLeadingBackPoint(lineLeadingBackPt); + q->setLineShowCaption(lineShowCaption); + q->setLineIntent(lineIntent); + + delete q; + + linePoints.clear(); // Free up memory + + return pdfAnnot; +} + +LineAnnotation::LineAnnotation(LineAnnotation::LineType type) : Annotation(*new LineAnnotationPrivate()) +{ + setLineType(type); +} + +LineAnnotation::LineAnnotation(LineAnnotationPrivate &dd) : Annotation(dd) { } + +LineAnnotation::~LineAnnotation() { } + +Annotation::SubType LineAnnotation::subType() const +{ + return ALine; +} + +LineAnnotation::LineType LineAnnotation::lineType() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineType; + } + + return (d->pdfAnnot->getType() == Annot::typeLine) ? LineAnnotation::StraightLine : LineAnnotation::Polyline; +} + +void LineAnnotation::setLineType(LineAnnotation::LineType type) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineType = type; + return; + } + + // Type cannot be changed if annotation is already tied + qWarning() << "You can't change the type of a LineAnnotation that is already in a page"; +} + +QVector LineAnnotation::linePoints() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->linePoints; + } + + double MTX[6]; + d->fillTransformationMTX(MTX); + + QVector res; + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + QPointF p; + XPDFReader::transform(MTX, lineann->getX1(), lineann->getY1(), p); + res.append(p); + XPDFReader::transform(MTX, lineann->getX2(), lineann->getY2(), p); + res.append(p); + } else { + const AnnotPolygon *polyann = static_cast(d->pdfAnnot); + const AnnotPath *vertices = polyann->getVertices(); + + for (int i = 0; i < vertices->getCoordsLength(); ++i) { + QPointF p; + XPDFReader::transform(MTX, vertices->getX(i), vertices->getY(i), p); + res.append(p); + } + } + + return res; +} + +void LineAnnotation::setLinePoints(const QVector &points) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->linePoints = points; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + if (points.size() != 2) { + error(errSyntaxError, -1, "Expected two points for a straight line"); + return; + } + double x1, y1, x2, y2; + double MTX[6]; + d->fillTransformationMTX(MTX); + XPDFReader::invTransform(MTX, points.first(), x1, y1); + XPDFReader::invTransform(MTX, points.last(), x2, y2); + lineann->setVertices(x1, y1, x2, y2); + } else { + AnnotPolygon *polyann = static_cast(d->pdfAnnot); + AnnotPath *p = d->toAnnotPath(points); + polyann->setVertices(p); + delete p; + } +} + +LineAnnotation::TermStyle LineAnnotation::lineStartStyle() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineStartStyle; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + return (LineAnnotation::TermStyle)lineann->getStartStyle(); + } else { + const AnnotPolygon *polyann = static_cast(d->pdfAnnot); + return (LineAnnotation::TermStyle)polyann->getStartStyle(); + } +} + +void LineAnnotation::setLineStartStyle(LineAnnotation::TermStyle style) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineStartStyle = style; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setStartEndStyle((AnnotLineEndingStyle)style, lineann->getEndStyle()); + } else { + AnnotPolygon *polyann = static_cast(d->pdfAnnot); + polyann->setStartEndStyle((AnnotLineEndingStyle)style, polyann->getEndStyle()); + } +} + +LineAnnotation::TermStyle LineAnnotation::lineEndStyle() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineEndStyle; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + return (LineAnnotation::TermStyle)lineann->getEndStyle(); + } else { + const AnnotPolygon *polyann = static_cast(d->pdfAnnot); + return (LineAnnotation::TermStyle)polyann->getEndStyle(); + } +} + +void LineAnnotation::setLineEndStyle(LineAnnotation::TermStyle style) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineEndStyle = style; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setStartEndStyle(lineann->getStartStyle(), (AnnotLineEndingStyle)style); + } else { + AnnotPolygon *polyann = static_cast(d->pdfAnnot); + polyann->setStartEndStyle(polyann->getStartStyle(), (AnnotLineEndingStyle)style); + } +} + +bool LineAnnotation::isLineClosed() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineClosed; + } + + return d->pdfAnnot->getType() == Annot::typePolygon; +} + +void LineAnnotation::setLineClosed(bool closed) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineClosed = closed; + return; + } + + if (d->pdfAnnot->getType() != Annot::typeLine) { + AnnotPolygon *polyann = static_cast(d->pdfAnnot); + + // Set new subtype and switch intent if necessary + if (closed) { + polyann->setType(Annot::typePolygon); + if (polyann->getIntent() == AnnotPolygon::polylineDimension) { + polyann->setIntent(AnnotPolygon::polygonDimension); + } + } else { + polyann->setType(Annot::typePolyLine); + if (polyann->getIntent() == AnnotPolygon::polygonDimension) { + polyann->setIntent(AnnotPolygon::polylineDimension); + } + } + } +} + +QColor LineAnnotation::lineInnerColor() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineInnerColor; + } + + AnnotColor *c; + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + c = lineann->getInteriorColor(); + } else { + const AnnotPolygon *polyann = static_cast(d->pdfAnnot); + c = polyann->getInteriorColor(); + } + + return convertAnnotColor(c); +} + +void LineAnnotation::setLineInnerColor(const QColor &color) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineInnerColor = color; + return; + } + + auto c = convertQColor(color); + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setInteriorColor(std::move(c)); + } else { + AnnotPolygon *polyann = static_cast(d->pdfAnnot); + polyann->setInteriorColor(std::move(c)); + } +} + +double LineAnnotation::lineLeadingForwardPoint() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineLeadingFwdPt; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + return lineann->getLeaderLineLength(); + } + + return 0; +} + +void LineAnnotation::setLineLeadingForwardPoint(double point) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineLeadingFwdPt = point; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setLeaderLineLength(point); + } +} + +double LineAnnotation::lineLeadingBackPoint() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineLeadingBackPt; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + return lineann->getLeaderLineExtension(); + } + + return 0; +} + +void LineAnnotation::setLineLeadingBackPoint(double point) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineLeadingBackPt = point; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setLeaderLineExtension(point); + } +} + +bool LineAnnotation::lineShowCaption() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineShowCaption; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + return lineann->getCaption(); + } + + return false; +} + +void LineAnnotation::setLineShowCaption(bool show) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineShowCaption = show; + return; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setCaption(show); + } +} + +LineAnnotation::LineIntent LineAnnotation::lineIntent() const +{ + Q_D(const LineAnnotation); + + if (!d->pdfAnnot) { + return d->lineIntent; + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + const AnnotLine *lineann = static_cast(d->pdfAnnot); + return (LineAnnotation::LineIntent)(lineann->getIntent() + 1); + } else { + const AnnotPolygon *polyann = static_cast(d->pdfAnnot); + if (polyann->getIntent() == AnnotPolygon::polygonCloud) { + return LineAnnotation::PolygonCloud; + } else { // AnnotPolygon::polylineDimension, AnnotPolygon::polygonDimension + return LineAnnotation::Dimension; + } + } +} + +void LineAnnotation::setLineIntent(LineAnnotation::LineIntent intent) +{ + Q_D(LineAnnotation); + + if (!d->pdfAnnot) { + d->lineIntent = intent; + return; + } + + if (intent == LineAnnotation::Unknown) { + return; // Do not set (actually, it should clear the property) + } + + if (d->pdfAnnot->getType() == Annot::typeLine) { + AnnotLine *lineann = static_cast(d->pdfAnnot); + lineann->setIntent((AnnotLine::AnnotLineIntent)(intent - 1)); + } else { + AnnotPolygon *polyann = static_cast(d->pdfAnnot); + if (intent == LineAnnotation::PolygonCloud) { + polyann->setIntent(AnnotPolygon::polygonCloud); + } else // LineAnnotation::Dimension + { + if (d->pdfAnnot->getType() == Annot::typePolygon) { + polyann->setIntent(AnnotPolygon::polygonDimension); + } else { // Annot::typePolyLine + polyann->setIntent(AnnotPolygon::polylineDimension); + } + } + } +} + +/** GeomAnnotation [Annotation] */ +class GeomAnnotationPrivate : public AnnotationPrivate +{ +public: + GeomAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields (note uses border for rendering style) + GeomAnnotation::GeomType geomType; + QColor geomInnerColor; +}; + +GeomAnnotationPrivate::GeomAnnotationPrivate() : AnnotationPrivate(), geomType(GeomAnnotation::InscribedSquare) { } + +Annotation *GeomAnnotationPrivate::makeAlias() +{ + return new GeomAnnotation(*this); +} + +Annot *GeomAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + // Setters are defined in the public class + GeomAnnotation *q = static_cast(makeAlias()); + + // Set page and document + pdfPage = destPage; + parentDoc = doc; + + Annot::AnnotSubtype type; + if (geomType == GeomAnnotation::InscribedSquare) { + type = Annot::typeSquare; + } else { // GeomAnnotation::InscribedCircle + type = Annot::typeCircle; + } + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + pdfAnnot = new AnnotGeometry(destPage->getDoc(), &rect, type); + + // Set properties + flushBaseAnnotationProperties(); + q->setGeomInnerColor(geomInnerColor); + + delete q; + return pdfAnnot; +} + +GeomAnnotation::GeomAnnotation() : Annotation(*new GeomAnnotationPrivate()) { } + +GeomAnnotation::GeomAnnotation(GeomAnnotationPrivate &dd) : Annotation(dd) { } + +GeomAnnotation::~GeomAnnotation() { } + +Annotation::SubType GeomAnnotation::subType() const +{ + return AGeom; +} + +GeomAnnotation::GeomType GeomAnnotation::geomType() const +{ + Q_D(const GeomAnnotation); + + if (!d->pdfAnnot) { + return d->geomType; + } + + if (d->pdfAnnot->getType() == Annot::typeSquare) { + return GeomAnnotation::InscribedSquare; + } else { // Annot::typeCircle + return GeomAnnotation::InscribedCircle; + } +} + +void GeomAnnotation::setGeomType(GeomAnnotation::GeomType type) +{ + Q_D(GeomAnnotation); + + if (!d->pdfAnnot) { + d->geomType = type; + return; + } + + AnnotGeometry *geomann = static_cast(d->pdfAnnot); + if (type == GeomAnnotation::InscribedSquare) { + geomann->setType(Annot::typeSquare); + } else { // GeomAnnotation::InscribedCircle + geomann->setType(Annot::typeCircle); + } +} + +QColor GeomAnnotation::geomInnerColor() const +{ + Q_D(const GeomAnnotation); + + if (!d->pdfAnnot) { + return d->geomInnerColor; + } + + const AnnotGeometry *geomann = static_cast(d->pdfAnnot); + return convertAnnotColor(geomann->getInteriorColor()); +} + +void GeomAnnotation::setGeomInnerColor(const QColor &color) +{ + Q_D(GeomAnnotation); + + if (!d->pdfAnnot) { + d->geomInnerColor = color; + return; + } + + AnnotGeometry *geomann = static_cast(d->pdfAnnot); + geomann->setInteriorColor(convertQColor(color)); +} + +/** HighlightAnnotation [Annotation] */ +class HighlightAnnotationPrivate : public AnnotationPrivate +{ +public: + HighlightAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + HighlightAnnotation::HighlightType highlightType; + QList highlightQuads; // not empty + + // helpers + static Annot::AnnotSubtype toAnnotSubType(HighlightAnnotation::HighlightType type); + QList fromQuadrilaterals(AnnotQuadrilaterals *quads) const; + AnnotQuadrilaterals *toQuadrilaterals(const QList &quads) const; +}; + +HighlightAnnotationPrivate::HighlightAnnotationPrivate() : AnnotationPrivate(), highlightType(HighlightAnnotation::Highlight) { } + +Annotation *HighlightAnnotationPrivate::makeAlias() +{ + return new HighlightAnnotation(*this); +} + +Annot::AnnotSubtype HighlightAnnotationPrivate::toAnnotSubType(HighlightAnnotation::HighlightType type) +{ + switch (type) { + default: // HighlightAnnotation::Highlight: + return Annot::typeHighlight; + case HighlightAnnotation::Underline: + return Annot::typeUnderline; + case HighlightAnnotation::Squiggly: + return Annot::typeSquiggly; + case HighlightAnnotation::StrikeOut: + return Annot::typeStrikeOut; + } +} + +QList HighlightAnnotationPrivate::fromQuadrilaterals(AnnotQuadrilaterals *hlquads) const +{ + QList quads; + + if (!hlquads || !hlquads->getQuadrilateralsLength()) { + return quads; + } + const int quadsCount = hlquads->getQuadrilateralsLength(); + + double MTX[6]; + fillTransformationMTX(MTX); + + quads.reserve(quadsCount); + for (int q = 0; q < quadsCount; ++q) { + HighlightAnnotation::Quad quad; + XPDFReader::transform(MTX, hlquads->getX1(q), hlquads->getY1(q), quad.points[0]); + XPDFReader::transform(MTX, hlquads->getX2(q), hlquads->getY2(q), quad.points[1]); + XPDFReader::transform(MTX, hlquads->getX3(q), hlquads->getY3(q), quad.points[2]); + XPDFReader::transform(MTX, hlquads->getX4(q), hlquads->getY4(q), quad.points[3]); + // ### PDF1.6 specs says that point are in ccw order, but in fact + // points 3 and 4 are swapped in every PDF around! + QPointF tmpPoint = quad.points[2]; + quad.points[2] = quad.points[3]; + quad.points[3] = tmpPoint; + // initialize other properties and append quad + quad.capStart = true; // unlinked quads are always capped + quad.capEnd = true; // unlinked quads are always capped + quad.feather = 0.1; // default feather + quads.append(quad); + } + + return quads; +} + +AnnotQuadrilaterals *HighlightAnnotationPrivate::toQuadrilaterals(const QList &quads) const +{ + const int count = quads.size(); + auto ac = std::make_unique(count); + + double MTX[6]; + fillTransformationMTX(MTX); + + int pos = 0; + foreach (const HighlightAnnotation::Quad &q, quads) { + double x1, y1, x2, y2, x3, y3, x4, y4; + XPDFReader::invTransform(MTX, q.points[0], x1, y1); + XPDFReader::invTransform(MTX, q.points[1], x2, y2); + // Swap points 3 and 4 (see HighlightAnnotationPrivate::fromQuadrilaterals) + XPDFReader::invTransform(MTX, q.points[3], x3, y3); + XPDFReader::invTransform(MTX, q.points[2], x4, y4); + ac[pos++] = AnnotQuadrilaterals::AnnotQuadrilateral(x1, y1, x2, y2, x3, y3, x4, y4); + } + + return new AnnotQuadrilaterals(std::move(ac), count); +} + +Annot *HighlightAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + // Setters are defined in the public class + HighlightAnnotation *q = static_cast(makeAlias()); + + // Set page and document + pdfPage = destPage; + parentDoc = doc; + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + pdfAnnot = new AnnotTextMarkup(destPage->getDoc(), &rect, toAnnotSubType(highlightType)); + + // Set properties + flushBaseAnnotationProperties(); + q->setHighlightQuads(highlightQuads); + + highlightQuads.clear(); // Free up memory + + delete q; + + return pdfAnnot; +} + +HighlightAnnotation::HighlightAnnotation() : Annotation(*new HighlightAnnotationPrivate()) { } + +HighlightAnnotation::HighlightAnnotation(HighlightAnnotationPrivate &dd) : Annotation(dd) { } + +HighlightAnnotation::~HighlightAnnotation() { } + +Annotation::SubType HighlightAnnotation::subType() const +{ + return AHighlight; +} + +HighlightAnnotation::HighlightType HighlightAnnotation::highlightType() const +{ + Q_D(const HighlightAnnotation); + + if (!d->pdfAnnot) { + return d->highlightType; + } + + Annot::AnnotSubtype subType = d->pdfAnnot->getType(); + + if (subType == Annot::typeHighlight) { + return HighlightAnnotation::Highlight; + } else if (subType == Annot::typeUnderline) { + return HighlightAnnotation::Underline; + } else if (subType == Annot::typeSquiggly) { + return HighlightAnnotation::Squiggly; + } else { // Annot::typeStrikeOut + return HighlightAnnotation::StrikeOut; + } +} + +void HighlightAnnotation::setHighlightType(HighlightAnnotation::HighlightType type) +{ + Q_D(HighlightAnnotation); + + if (!d->pdfAnnot) { + d->highlightType = type; + return; + } + + AnnotTextMarkup *hlann = static_cast(d->pdfAnnot); + hlann->setType(HighlightAnnotationPrivate::toAnnotSubType(type)); +} + +QList HighlightAnnotation::highlightQuads() const +{ + Q_D(const HighlightAnnotation); + + if (!d->pdfAnnot) { + return d->highlightQuads; + } + + const AnnotTextMarkup *hlann = static_cast(d->pdfAnnot); + return d->fromQuadrilaterals(hlann->getQuadrilaterals()); +} + +void HighlightAnnotation::setHighlightQuads(const QList &quads) +{ + Q_D(HighlightAnnotation); + + if (!d->pdfAnnot) { + d->highlightQuads = quads; + return; + } + + AnnotTextMarkup *hlann = static_cast(d->pdfAnnot); + AnnotQuadrilaterals *quadrilaterals = d->toQuadrilaterals(quads); + hlann->setQuadrilaterals(quadrilaterals); + delete quadrilaterals; +} + +/** StampAnnotation [Annotation] */ +class StampAnnotationPrivate : public AnnotationPrivate +{ +public: + StampAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + AnnotStampImageHelper *convertQImageToAnnotStampImageHelper(const QImage &qimg); + + // data fields + QString stampIconName; + QImage stampCustomImage; +}; + +StampAnnotationPrivate::StampAnnotationPrivate() : AnnotationPrivate(), stampIconName(QStringLiteral("Draft")) { } + +Annotation *StampAnnotationPrivate::makeAlias() +{ + return new StampAnnotation(*this); +} + +Annot *StampAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + StampAnnotation *q = static_cast(makeAlias()); + + // Set page and document + pdfPage = destPage; + parentDoc = doc; + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + pdfAnnot = new AnnotStamp(destPage->getDoc(), &rect); + + // Set properties + flushBaseAnnotationProperties(); + q->setStampIconName(stampIconName); + q->setStampCustomImage(stampCustomImage); + + delete q; + + stampIconName.clear(); // Free up memory + + return pdfAnnot; +} + +AnnotStampImageHelper *StampAnnotationPrivate::convertQImageToAnnotStampImageHelper(const QImage &qimg) +{ + QImage convertedQImage = qimg; + + QByteArray data; + QByteArray sMaskData; + const int width = convertedQImage.width(); + const int height = convertedQImage.height(); + int bitsPerComponent = 1; + ColorSpace colorSpace = ColorSpace::DeviceGray; + + switch (convertedQImage.format()) { + case QImage::Format_MonoLSB: + if (!convertedQImage.allGray()) { + convertedQImage = convertedQImage.convertToFormat(QImage::Format_RGB888); + + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + } else { + convertedQImage = convertedQImage.convertToFormat(QImage::Format_Mono); + } + break; + case QImage::Format_Mono: + if (!convertedQImage.allGray()) { + convertedQImage = convertedQImage.convertToFormat(QImage::Format_RGB888); + + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + } + break; + case QImage::Format_RGB32: + case QImage::Format_ARGB32_Premultiplied: + case QImage::Format_ARGB8565_Premultiplied: + case QImage::Format_ARGB6666_Premultiplied: + case QImage::Format_ARGB8555_Premultiplied: + case QImage::Format_ARGB4444_Premultiplied: + case QImage::Format_Alpha8: + convertedQImage = convertedQImage.convertToFormat(QImage::Format_ARGB32); + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + break; + case QImage::Format_RGBA8888: + case QImage::Format_RGBA8888_Premultiplied: + case QImage::Format_RGBX8888: + case QImage::Format_ARGB32: + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + break; + case QImage::Format_Grayscale8: + bitsPerComponent = 8; + break; + case QImage::Format_Grayscale16: + convertedQImage = convertedQImage.convertToFormat(QImage::Format_Grayscale8); + + colorSpace = ColorSpace::DeviceGray; + bitsPerComponent = 8; + break; + case QImage::Format_RGB16: + case QImage::Format_RGB666: + case QImage::Format_RGB555: + case QImage::Format_RGB444: + convertedQImage = convertedQImage.convertToFormat(QImage::Format_RGB888); + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + break; + case QImage::Format_RGB888: + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + break; + default: + convertedQImage = convertedQImage.convertToFormat(QImage::Format_ARGB32); + + colorSpace = ColorSpace::DeviceRGB; + bitsPerComponent = 8; + break; + } + + getRawDataFromQImage(convertedQImage, convertedQImage.depth(), &data, &sMaskData); + + AnnotStampImageHelper *annotImg; + + if (sMaskData.size() > 0) { + AnnotStampImageHelper sMask(parentDoc->doc, width, height, ColorSpace::DeviceGray, 8, sMaskData.data(), sMaskData.size()); + annotImg = new AnnotStampImageHelper(parentDoc->doc, width, height, colorSpace, bitsPerComponent, data.data(), data.size(), sMask.getRef()); + } else { + annotImg = new AnnotStampImageHelper(parentDoc->doc, width, height, colorSpace, bitsPerComponent, data.data(), data.size()); + } + + return annotImg; +} + +StampAnnotation::StampAnnotation() : Annotation(*new StampAnnotationPrivate()) { } + +StampAnnotation::StampAnnotation(StampAnnotationPrivate &dd) : Annotation(dd) { } + +StampAnnotation::~StampAnnotation() { } + +Annotation::SubType StampAnnotation::subType() const +{ + return AStamp; +} + +QString StampAnnotation::stampIconName() const +{ + Q_D(const StampAnnotation); + + if (!d->pdfAnnot) { + return d->stampIconName; + } + + const AnnotStamp *stampann = static_cast(d->pdfAnnot); + return QString::fromLatin1(stampann->getIcon()->c_str()); +} + +void StampAnnotation::setStampIconName(const QString &name) +{ + Q_D(StampAnnotation); + + if (!d->pdfAnnot) { + d->stampIconName = name; + return; + } + + AnnotStamp *stampann = static_cast(d->pdfAnnot); + QByteArray encoded = name.toLatin1(); + GooString s(encoded.constData()); + stampann->setIcon(&s); +} + +void StampAnnotation::setStampCustomImage(const QImage &image) +{ + if (image.isNull()) { + return; + } + + Q_D(StampAnnotation); + + if (!d->pdfAnnot) { + d->stampCustomImage = QImage(image); + return; + } + + AnnotStamp *stampann = static_cast(d->pdfAnnot); + AnnotStampImageHelper *annotCustomImage = d->convertQImageToAnnotStampImageHelper(image); + stampann->setCustomImage(annotCustomImage); +} + +/** InkAnnotation [Annotation] */ +class InkAnnotationPrivate : public AnnotationPrivate +{ +public: + InkAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + QList> inkPaths; + + // helper + AnnotPath **toAnnotPaths(const QList> &paths); +}; + +InkAnnotationPrivate::InkAnnotationPrivate() : AnnotationPrivate() { } + +Annotation *InkAnnotationPrivate::makeAlias() +{ + return new InkAnnotation(*this); +} + +// Note: Caller is required to delete array elements and the array itself after use +AnnotPath **InkAnnotationPrivate::toAnnotPaths(const QList> &paths) +{ + const int pathsNumber = paths.size(); + AnnotPath **res = new AnnotPath *[pathsNumber]; + for (int i = 0; i < pathsNumber; ++i) { + res[i] = toAnnotPath(paths[i]); + } + return res; +} + +Annot *InkAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + // Setters are defined in the public class + InkAnnotation *q = static_cast(makeAlias()); + + // Set page and document + pdfPage = destPage; + parentDoc = doc; + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + pdfAnnot = new AnnotInk(destPage->getDoc(), &rect); + + // Set properties + flushBaseAnnotationProperties(); + q->setInkPaths(inkPaths); + + inkPaths.clear(); // Free up memory + + delete q; + + return pdfAnnot; +} + +InkAnnotation::InkAnnotation() : Annotation(*new InkAnnotationPrivate()) { } + +InkAnnotation::InkAnnotation(InkAnnotationPrivate &dd) : Annotation(dd) { } + +InkAnnotation::~InkAnnotation() { } + +Annotation::SubType InkAnnotation::subType() const +{ + return AInk; +} + +QList> InkAnnotation::inkPaths() const +{ + Q_D(const InkAnnotation); + + if (!d->pdfAnnot) { + return d->inkPaths; + } + + const AnnotInk *inkann = static_cast(d->pdfAnnot); + + const AnnotPath *const *paths = inkann->getInkList(); + if (!paths || !inkann->getInkListLength()) { + return {}; + } + + double MTX[6]; + d->fillTransformationMTX(MTX); + + const int pathsNumber = inkann->getInkListLength(); + QList> inkPaths; + inkPaths.reserve(pathsNumber); + for (int m = 0; m < pathsNumber; ++m) { + // transform each path in a list of normalized points .. + QVector localList; + const AnnotPath *path = paths[m]; + const int pointsNumber = path ? path->getCoordsLength() : 0; + for (int n = 0; n < pointsNumber; ++n) { + QPointF point; + XPDFReader::transform(MTX, path->getX(n), path->getY(n), point); + localList.append(point); + } + // ..and add it to the annotation + inkPaths.append(localList); + } + return inkPaths; +} + +void InkAnnotation::setInkPaths(const QList> &paths) +{ + Q_D(InkAnnotation); + + if (!d->pdfAnnot) { + d->inkPaths = paths; + return; + } + + AnnotInk *inkann = static_cast(d->pdfAnnot); + AnnotPath **annotpaths = d->toAnnotPaths(paths); + const int pathsNumber = paths.size(); + inkann->setInkList(annotpaths, pathsNumber); + + for (int i = 0; i < pathsNumber; ++i) { + delete annotpaths[i]; + } + delete[] annotpaths; +} + +/** LinkAnnotation [Annotation] */ +class LinkAnnotationPrivate : public AnnotationPrivate +{ +public: + LinkAnnotationPrivate(); + ~LinkAnnotationPrivate() override; + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + std::unique_ptr linkDestination; + LinkAnnotation::HighlightMode linkHLMode; + QPointF linkRegion[4]; +}; + +LinkAnnotationPrivate::LinkAnnotationPrivate() : AnnotationPrivate(), linkHLMode(LinkAnnotation::Invert) { } + +LinkAnnotationPrivate::~LinkAnnotationPrivate() { } + +Annotation *LinkAnnotationPrivate::makeAlias() +{ + return new LinkAnnotation(*this); +} + +Annot *LinkAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + return nullptr; // Not implemented +} + +LinkAnnotation::LinkAnnotation() : Annotation(*new LinkAnnotationPrivate()) { } + +LinkAnnotation::LinkAnnotation(LinkAnnotationPrivate &dd) : Annotation(dd) { } + +LinkAnnotation::~LinkAnnotation() { } + +Annotation::SubType LinkAnnotation::subType() const +{ + return ALink; +} + +Link *LinkAnnotation::linkDestination() const +{ + Q_D(const LinkAnnotation); + return d->linkDestination.get(); +} + +void LinkAnnotation::setLinkDestination(std::unique_ptr &&link) +{ + Q_D(LinkAnnotation); + d->linkDestination = std::move(link); +} + +LinkAnnotation::HighlightMode LinkAnnotation::linkHighlightMode() const +{ + Q_D(const LinkAnnotation); + return d->linkHLMode; +} + +void LinkAnnotation::setLinkHighlightMode(LinkAnnotation::HighlightMode mode) +{ + Q_D(LinkAnnotation); + d->linkHLMode = mode; +} + +QPointF LinkAnnotation::linkRegionPoint(int id) const +{ + if (id < 0 || id >= 4) { + return QPointF(); + } + + Q_D(const LinkAnnotation); + return d->linkRegion[id]; +} + +void LinkAnnotation::setLinkRegionPoint(int id, const QPointF point) +{ + if (id < 0 || id >= 4) { + return; + } + + Q_D(LinkAnnotation); + d->linkRegion[id] = point; +} + +/** CaretAnnotation [Annotation] */ +class CaretAnnotationPrivate : public AnnotationPrivate +{ +public: + CaretAnnotationPrivate(); + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + CaretAnnotation::CaretSymbol symbol; +}; + +CaretAnnotationPrivate::CaretAnnotationPrivate() : AnnotationPrivate(), symbol(CaretAnnotation::None) { } + +Annotation *CaretAnnotationPrivate::makeAlias() +{ + return new CaretAnnotation(*this); +} + +Annot *CaretAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + // Setters are defined in the public class + CaretAnnotation *q = static_cast(makeAlias()); + + // Set page and document + pdfPage = destPage; + parentDoc = doc; + + // Set pdfAnnot + PDFRectangle rect = boundaryToPdfRectangle(boundary, flags); + pdfAnnot = new AnnotCaret(destPage->getDoc(), &rect); + + // Set properties + flushBaseAnnotationProperties(); + q->setCaretSymbol(symbol); + + delete q; + return pdfAnnot; +} + +CaretAnnotation::CaretAnnotation() : Annotation(*new CaretAnnotationPrivate()) { } + +CaretAnnotation::CaretAnnotation(CaretAnnotationPrivate &dd) : Annotation(dd) { } + +CaretAnnotation::~CaretAnnotation() { } + +Annotation::SubType CaretAnnotation::subType() const +{ + return ACaret; +} + +CaretAnnotation::CaretSymbol CaretAnnotation::caretSymbol() const +{ + Q_D(const CaretAnnotation); + + if (!d->pdfAnnot) { + return d->symbol; + } + + const AnnotCaret *caretann = static_cast(d->pdfAnnot); + return (CaretAnnotation::CaretSymbol)caretann->getSymbol(); +} + +void CaretAnnotation::setCaretSymbol(CaretAnnotation::CaretSymbol symbol) +{ + Q_D(CaretAnnotation); + + if (!d->pdfAnnot) { + d->symbol = symbol; + return; + } + + AnnotCaret *caretann = static_cast(d->pdfAnnot); + caretann->setSymbol((AnnotCaret::AnnotCaretSymbol)symbol); +} + +/** FileAttachmentAnnotation [Annotation] */ +class FileAttachmentAnnotationPrivate : public AnnotationPrivate +{ +public: + FileAttachmentAnnotationPrivate(); + ~FileAttachmentAnnotationPrivate() override; + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + QString icon; + EmbeddedFile *embfile; +}; + +FileAttachmentAnnotationPrivate::FileAttachmentAnnotationPrivate() : AnnotationPrivate(), icon(QStringLiteral("PushPin")), embfile(nullptr) { } + +FileAttachmentAnnotationPrivate::~FileAttachmentAnnotationPrivate() +{ + delete embfile; +} + +Annotation *FileAttachmentAnnotationPrivate::makeAlias() +{ + return new FileAttachmentAnnotation(*this); +} + +Annot *FileAttachmentAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + return nullptr; // Not implemented +} + +FileAttachmentAnnotation::FileAttachmentAnnotation() : Annotation(*new FileAttachmentAnnotationPrivate()) { } + +FileAttachmentAnnotation::FileAttachmentAnnotation(FileAttachmentAnnotationPrivate &dd) : Annotation(dd) { } + +FileAttachmentAnnotation::~FileAttachmentAnnotation() { } + +Annotation::SubType FileAttachmentAnnotation::subType() const +{ + return AFileAttachment; +} + +QString FileAttachmentAnnotation::fileIconName() const +{ + Q_D(const FileAttachmentAnnotation); + return d->icon; +} + +void FileAttachmentAnnotation::setFileIconName(const QString &icon) +{ + Q_D(FileAttachmentAnnotation); + d->icon = icon; +} + +EmbeddedFile *FileAttachmentAnnotation::embeddedFile() const +{ + Q_D(const FileAttachmentAnnotation); + return d->embfile; +} + +void FileAttachmentAnnotation::setEmbeddedFile(EmbeddedFile *ef) +{ + Q_D(FileAttachmentAnnotation); + d->embfile = ef; +} + +/** SoundAnnotation [Annotation] */ +class SoundAnnotationPrivate : public AnnotationPrivate +{ +public: + SoundAnnotationPrivate(); + ~SoundAnnotationPrivate() override; + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + QString icon; + SoundObject *sound; +}; + +SoundAnnotationPrivate::SoundAnnotationPrivate() : AnnotationPrivate(), icon(QStringLiteral("Speaker")), sound(nullptr) { } + +SoundAnnotationPrivate::~SoundAnnotationPrivate() +{ + delete sound; +} + +Annotation *SoundAnnotationPrivate::makeAlias() +{ + return new SoundAnnotation(*this); +} + +Annot *SoundAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + return nullptr; // Not implemented +} + +SoundAnnotation::SoundAnnotation() : Annotation(*new SoundAnnotationPrivate()) { } + +SoundAnnotation::SoundAnnotation(SoundAnnotationPrivate &dd) : Annotation(dd) { } + +SoundAnnotation::~SoundAnnotation() { } + +Annotation::SubType SoundAnnotation::subType() const +{ + return ASound; +} + +QString SoundAnnotation::soundIconName() const +{ + Q_D(const SoundAnnotation); + return d->icon; +} + +void SoundAnnotation::setSoundIconName(const QString &icon) +{ + Q_D(SoundAnnotation); + d->icon = icon; +} + +SoundObject *SoundAnnotation::sound() const +{ + Q_D(const SoundAnnotation); + return d->sound; +} + +void SoundAnnotation::setSound(SoundObject *s) +{ + Q_D(SoundAnnotation); + d->sound = s; +} + +/** MovieAnnotation [Annotation] */ +class MovieAnnotationPrivate : public AnnotationPrivate +{ +public: + MovieAnnotationPrivate(); + ~MovieAnnotationPrivate() override; + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + MovieObject *movie; + QString title; +}; + +MovieAnnotationPrivate::MovieAnnotationPrivate() : AnnotationPrivate(), movie(nullptr) { } + +MovieAnnotationPrivate::~MovieAnnotationPrivate() +{ + delete movie; +} + +Annotation *MovieAnnotationPrivate::makeAlias() +{ + return new MovieAnnotation(*this); +} + +Annot *MovieAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + return nullptr; // Not implemented +} + +MovieAnnotation::MovieAnnotation() : Annotation(*new MovieAnnotationPrivate()) { } + +MovieAnnotation::MovieAnnotation(MovieAnnotationPrivate &dd) : Annotation(dd) { } + +MovieAnnotation::~MovieAnnotation() { } + +Annotation::SubType MovieAnnotation::subType() const +{ + return AMovie; +} + +MovieObject *MovieAnnotation::movie() const +{ + Q_D(const MovieAnnotation); + return d->movie; +} + +void MovieAnnotation::setMovie(MovieObject *movie) +{ + Q_D(MovieAnnotation); + d->movie = movie; +} + +QString MovieAnnotation::movieTitle() const +{ + Q_D(const MovieAnnotation); + return d->title; +} + +void MovieAnnotation::setMovieTitle(const QString &title) +{ + Q_D(MovieAnnotation); + d->title = title; +} + +/** ScreenAnnotation [Annotation] */ +class ScreenAnnotationPrivate : public AnnotationPrivate +{ +public: + ScreenAnnotationPrivate(); + ~ScreenAnnotationPrivate() override; + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; + + // data fields + LinkRendition *action; + QString title; +}; + +ScreenAnnotationPrivate::ScreenAnnotationPrivate() : AnnotationPrivate(), action(nullptr) { } + +ScreenAnnotationPrivate::~ScreenAnnotationPrivate() +{ + delete action; +} + +ScreenAnnotation::ScreenAnnotation(ScreenAnnotationPrivate &dd) : Annotation(dd) { } + +Annotation *ScreenAnnotationPrivate::makeAlias() +{ + return new ScreenAnnotation(*this); +} + +Annot *ScreenAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + return nullptr; // Not implemented +} + +ScreenAnnotation::ScreenAnnotation() : Annotation(*new ScreenAnnotationPrivate()) { } + +ScreenAnnotation::~ScreenAnnotation() { } + +Annotation::SubType ScreenAnnotation::subType() const +{ + return AScreen; +} + +LinkRendition *ScreenAnnotation::action() const +{ + Q_D(const ScreenAnnotation); + return d->action; +} + +void ScreenAnnotation::setAction(LinkRendition *action) +{ + Q_D(ScreenAnnotation); + d->action = action; +} + +QString ScreenAnnotation::screenTitle() const +{ + Q_D(const ScreenAnnotation); + return d->title; +} + +void ScreenAnnotation::setScreenTitle(const QString &title) +{ + Q_D(ScreenAnnotation); + d->title = title; +} + +std::unique_ptr ScreenAnnotation::additionalAction(AdditionalActionType type) const +{ + Q_D(const ScreenAnnotation); + return d->additionalAction(type); +} + +/** WidgetAnnotation [Annotation] */ +class WidgetAnnotationPrivate : public AnnotationPrivate +{ +public: + Annotation *makeAlias() override; + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override; +}; + +Annotation *WidgetAnnotationPrivate::makeAlias() +{ + return new WidgetAnnotation(*this); +} + +Annot *WidgetAnnotationPrivate::createNativeAnnot(::Page *destPage, DocumentData *doc) +{ + return nullptr; // Not implemented +} + +WidgetAnnotation::WidgetAnnotation(WidgetAnnotationPrivate &dd) : Annotation(dd) { } + +WidgetAnnotation::WidgetAnnotation() : Annotation(*new WidgetAnnotationPrivate()) { } + +WidgetAnnotation::~WidgetAnnotation() { } + +Annotation::SubType WidgetAnnotation::subType() const +{ + return AWidget; +} + +std::unique_ptr WidgetAnnotation::additionalAction(AdditionalActionType type) const +{ + Q_D(const WidgetAnnotation); + return d->additionalAction(type); +} + +/** RichMediaAnnotation [Annotation] */ +class RichMediaAnnotation::Params::Private +{ +public: + Private() { } + + QString flashVars; +}; + +RichMediaAnnotation::Params::Params() : d(new Private) { } + +RichMediaAnnotation::Params::~Params() { } + +void RichMediaAnnotation::Params::setFlashVars(const QString &flashVars) +{ + d->flashVars = flashVars; +} + +QString RichMediaAnnotation::Params::flashVars() const +{ + return d->flashVars; +} + +class RichMediaAnnotation::Instance::Private +{ +public: + Private() : params(nullptr) { } + + ~Private() { delete params; } + + Private(const Private &) = delete; + Private &operator=(const Private &) = delete; + + RichMediaAnnotation::Instance::Type type; + RichMediaAnnotation::Params *params; +}; + +RichMediaAnnotation::Instance::Instance() : d(new Private) { } + +RichMediaAnnotation::Instance::~Instance() { } + +void RichMediaAnnotation::Instance::setType(Type type) +{ + d->type = type; +} + +RichMediaAnnotation::Instance::Type RichMediaAnnotation::Instance::type() const +{ + return d->type; +} + +void RichMediaAnnotation::Instance::setParams(RichMediaAnnotation::Params *params) +{ + delete d->params; + d->params = params; +} + +RichMediaAnnotation::Params *RichMediaAnnotation::Instance::params() const +{ + return d->params; +} + +class RichMediaAnnotation::Configuration::Private +{ +public: + Private() { } + ~Private() + { + qDeleteAll(instances); + instances.clear(); + } + + Private(const Private &) = delete; + Private &operator=(const Private &) = delete; + + RichMediaAnnotation::Configuration::Type type; + QString name; + QList instances; +}; + +RichMediaAnnotation::Configuration::Configuration() : d(new Private) { } + +RichMediaAnnotation::Configuration::~Configuration() { } + +void RichMediaAnnotation::Configuration::setType(Type type) +{ + d->type = type; +} + +RichMediaAnnotation::Configuration::Type RichMediaAnnotation::Configuration::type() const +{ + return d->type; +} + +void RichMediaAnnotation::Configuration::setName(const QString &name) +{ + d->name = name; +} + +QString RichMediaAnnotation::Configuration::name() const +{ + return d->name; +} + +void RichMediaAnnotation::Configuration::setInstances(const QList &instances) +{ + qDeleteAll(d->instances); + d->instances.clear(); + + d->instances = instances; +} + +QList RichMediaAnnotation::Configuration::instances() const +{ + return d->instances; +} + +class RichMediaAnnotation::Asset::Private +{ +public: + Private() : embeddedFile(nullptr) { } + + ~Private() { delete embeddedFile; } + + Private(const Private &) = delete; + Private &operator=(const Private &) = delete; + + QString name; + EmbeddedFile *embeddedFile; +}; + +RichMediaAnnotation::Asset::Asset() : d(new Private) { } + +RichMediaAnnotation::Asset::~Asset() { } + +void RichMediaAnnotation::Asset::setName(const QString &name) +{ + d->name = name; +} + +QString RichMediaAnnotation::Asset::name() const +{ + return d->name; +} + +void RichMediaAnnotation::Asset::setEmbeddedFile(EmbeddedFile *embeddedFile) +{ + delete d->embeddedFile; + d->embeddedFile = embeddedFile; +} + +EmbeddedFile *RichMediaAnnotation::Asset::embeddedFile() const +{ + return d->embeddedFile; +} + +class RichMediaAnnotation::Content::Private +{ +public: + Private() { } + ~Private() + { + qDeleteAll(configurations); + configurations.clear(); + + qDeleteAll(assets); + assets.clear(); + } + + Private(const Private &) = delete; + Private &operator=(const Private &) = delete; + + QList configurations; + QList assets; +}; + +RichMediaAnnotation::Content::Content() : d(new Private) { } + +RichMediaAnnotation::Content::~Content() { } + +void RichMediaAnnotation::Content::setConfigurations(const QList &configurations) +{ + qDeleteAll(d->configurations); + d->configurations.clear(); + + d->configurations = configurations; +} + +QList RichMediaAnnotation::Content::configurations() const +{ + return d->configurations; +} + +void RichMediaAnnotation::Content::setAssets(const QList &assets) +{ + qDeleteAll(d->assets); + d->assets.clear(); + + d->assets = assets; +} + +QList RichMediaAnnotation::Content::assets() const +{ + return d->assets; +} + +class RichMediaAnnotation::Activation::Private +{ +public: + Private() : condition(RichMediaAnnotation::Activation::UserAction) { } + + RichMediaAnnotation::Activation::Condition condition; +}; + +RichMediaAnnotation::Activation::Activation() : d(new Private) { } + +RichMediaAnnotation::Activation::~Activation() { } + +void RichMediaAnnotation::Activation::setCondition(Condition condition) +{ + d->condition = condition; +} + +RichMediaAnnotation::Activation::Condition RichMediaAnnotation::Activation::condition() const +{ + return d->condition; +} + +class RichMediaAnnotation::Deactivation::Private : public QSharedData +{ +public: + Private() : condition(RichMediaAnnotation::Deactivation::UserAction) { } + + RichMediaAnnotation::Deactivation::Condition condition; +}; + +RichMediaAnnotation::Deactivation::Deactivation() : d(new Private) { } + +RichMediaAnnotation::Deactivation::~Deactivation() { } + +void RichMediaAnnotation::Deactivation::setCondition(Condition condition) +{ + d->condition = condition; +} + +RichMediaAnnotation::Deactivation::Condition RichMediaAnnotation::Deactivation::condition() const +{ + return d->condition; +} + +class RichMediaAnnotation::Settings::Private : public QSharedData +{ +public: + Private() : activation(nullptr), deactivation(nullptr) { } + + RichMediaAnnotation::Activation *activation; + RichMediaAnnotation::Deactivation *deactivation; +}; + +RichMediaAnnotation::Settings::Settings() : d(new Private) { } + +RichMediaAnnotation::Settings::~Settings() { } + +void RichMediaAnnotation::Settings::setActivation(RichMediaAnnotation::Activation *activation) +{ + delete d->activation; + d->activation = activation; +} + +RichMediaAnnotation::Activation *RichMediaAnnotation::Settings::activation() const +{ + return d->activation; +} + +void RichMediaAnnotation::Settings::setDeactivation(RichMediaAnnotation::Deactivation *deactivation) +{ + delete d->deactivation; + d->deactivation = deactivation; +} + +RichMediaAnnotation::Deactivation *RichMediaAnnotation::Settings::deactivation() const +{ + return d->deactivation; +} + +class RichMediaAnnotationPrivate : public AnnotationPrivate +{ +public: + RichMediaAnnotationPrivate() : settings(nullptr), content(nullptr) { } + + ~RichMediaAnnotationPrivate() override; + + Annotation *makeAlias() override { return new RichMediaAnnotation(*this); } + + Annot *createNativeAnnot(::Page *destPage, DocumentData *doc) override + { + Q_UNUSED(destPage); + Q_UNUSED(doc); + + return nullptr; + } + + RichMediaAnnotation::Settings *settings; + RichMediaAnnotation::Content *content; +}; + +RichMediaAnnotationPrivate::~RichMediaAnnotationPrivate() +{ + delete settings; + delete content; +} + +RichMediaAnnotation::RichMediaAnnotation() : Annotation(*new RichMediaAnnotationPrivate()) { } + +RichMediaAnnotation::RichMediaAnnotation(RichMediaAnnotationPrivate &dd) : Annotation(dd) { } + +RichMediaAnnotation::~RichMediaAnnotation() { } + +Annotation::SubType RichMediaAnnotation::subType() const +{ + return ARichMedia; +} + +void RichMediaAnnotation::setSettings(RichMediaAnnotation::Settings *settings) +{ + Q_D(RichMediaAnnotation); + + delete d->settings; + d->settings = settings; +} + +RichMediaAnnotation::Settings *RichMediaAnnotation::settings() const +{ + Q_D(const RichMediaAnnotation); + + return d->settings; +} + +void RichMediaAnnotation::setContent(RichMediaAnnotation::Content *content) +{ + Q_D(RichMediaAnnotation); + + delete d->content; + d->content = content; +} + +RichMediaAnnotation::Content *RichMediaAnnotation::content() const +{ + Q_D(const RichMediaAnnotation); + + return d->content; +} + +// BEGIN utility annotation functions +QColor convertAnnotColor(const AnnotColor *color) +{ + if (!color) { + return QColor(); + } + + QColor newcolor; + const double *color_data = color->getValues(); + switch (color->getSpace()) { + case AnnotColor::colorTransparent: // = 0, + newcolor = Qt::transparent; + break; + case AnnotColor::colorGray: // = 1, + newcolor.setRgbF(color_data[0], color_data[0], color_data[0]); + break; + case AnnotColor::colorRGB: // = 3, + newcolor.setRgbF(color_data[0], color_data[1], color_data[2]); + break; + case AnnotColor::colorCMYK: // = 4 + newcolor.setCmykF(color_data[0], color_data[1], color_data[2], color_data[3]); + break; + } + return newcolor; +} + +std::unique_ptr convertQColor(const QColor &c) +{ + if (c.alpha() == 0) { + return {}; // Transparent + } + + switch (c.spec()) { + case QColor::Rgb: + case QColor::Hsl: + case QColor::Hsv: + return std::make_unique(c.redF(), c.greenF(), c.blueF()); + case QColor::Cmyk: + return std::make_unique(c.cyanF(), c.magentaF(), c.yellowF(), c.blackF()); + case QColor::Invalid: + default: + return {}; + } +} +// END utility annotation functions + +} diff --git a/poppler-24.05.0/qt6/src/poppler-annotation.h b/poppler-24.05.0/qt6/src/poppler-annotation.h new file mode 100644 index 0000000000000000000000000000000000000000..16f2eda500a9a864c2883636f94fb780bc5d66cc --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-annotation.h @@ -0,0 +1,1387 @@ +/* poppler-annotation.h: qt interface to poppler + * Copyright (C) 2006-2008, 2012, 2013, 2018-2022 Albert Astals Cid + * Copyright (C) 2006, 2008 Pino Toscano + * Copyright (C) 2007, Brad Hards + * Copyright (C) 2010, Philip Lorenz + * Copyright (C) 2012, 2015, Tobias Koenig + * Copyright (C) 2012, Guillermo A. Amaral B. + * Copyright (C) 2012, 2013 Fabio D'Urso + * Copyright (C) 2013, Anthony Granger + * Copyright (C) 2018, Dileep Sankhla + * Copyright (C) 2020, Katarina Behrens + * Copyright (C) 2020, Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021, Oliver Sander + * Copyright (C) 2021, Mahmoud Ahmed Khalil + * Adapting code from + * Copyright (C) 2004 by Enrico Ros + * + * 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. + */ + +#ifndef _POPPLER_ANNOTATION_H_ +#define _POPPLER_ANNOTATION_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "poppler-export.h" + +#include + +namespace Poppler { + +class Annotation; +class AnnotationPrivate; +class AnnotationAppearancePrivate; +class TextAnnotationPrivate; +class LineAnnotationPrivate; +class GeomAnnotationPrivate; +class HighlightAnnotationPrivate; +class StampAnnotationPrivate; +class InkAnnotationPrivate; +class LinkAnnotationPrivate; +class CaretAnnotationPrivate; +class FileAttachmentAnnotationPrivate; +class SoundAnnotationPrivate; +class MovieAnnotationPrivate; +class ScreenAnnotationPrivate; +class WidgetAnnotationPrivate; +class RichMediaAnnotationPrivate; +class EmbeddedFile; +class Link; +class SoundObject; +class MovieObject; +class LinkRendition; +class Page; + +/** + * \short AnnotationAppearance class wrapping Poppler's AP stream object + * + * The Annotation's Appearance Stream is a Form XObject containing + * information required to properly render the Annotation on the document. + * + * This class wraps Poppler's Object implementing the appearance stream + * for the calling annotation. It can be used to preserve the current + * Appearance Stream for the calling annotation. + * + * \since 21.10.0 + */ +class POPPLER_QT6_EXPORT AnnotationAppearance +{ + friend class Annotation; + +public: + explicit AnnotationAppearance(AnnotationAppearancePrivate *annotationAppearancePrivate); + ~AnnotationAppearance(); + +private: + AnnotationAppearancePrivate *d; + Q_DISABLE_COPY(AnnotationAppearance) +}; + +/** + * \short Annotation class holding properties shared by all annotations. + * + * An Annotation is an object (text note, highlight, sound, popup window, ..) + * contained by a Page in the document. + * + * \warning Different Annotation objects might point to the same annotation. + * + * \section annotCreation How to add annotations + * + * Create an Annotation object of the desired subclass (for example + * TextAnnotation) and set its properties: + * @code + * Poppler::TextAnnotation* myann = new Poppler::TextAnnotation(Poppler::TextAnnotation::InPlace); + * myann->setBoundary(QRectF(0.1, 0.1, 0.2, 0.2)); // normalized coordinates: (0,0) is top-left, (1,1) is bottom-right + * myann->setContents("Hello, world!"); + * @endcode + * \note Always set a boundary rectangle, or nothing will be shown! + * + * Obtain a pointer to the Page where you want to add the annotation (refer to + * \ref req for instructions) and add the annotation: + * @code + * Poppler::Page* mypage = ...; + * mypage->addAnnotation(myann); + * @endcode + * + * You can keep on editing the annotation after it has been added to the page: + * @code + * myann->setContents("World, hello!"); // Let's change text... + * myann->setAuthor("Your name here"); // ...and set an author too + * @endcode + * + * When you're done with editing the annotation, you must destroy the Annotation + * object: + * @code + * delete myann; + * @endcode + * + * Use the PDFConverter class to save the modified document. + * + * \section annotFixedRotation FixedRotation flag specifics + * + * According to the PDF specification, annotations whose + * Annotation::FixedRotation flag is set must always be shown in their original + * orientation, no matter what the current rendering rotation or the page's + * Page::orientation() values are. In comparison with regular annotations, such + * annotations should therefore be transformed by an extra rotation at rendering + * time to "undo" such context-related rotations, which is equal to + * -(rendering_rotation + page_orientation). The rotation pivot + * is the top-left corner of the boundary rectangle. + * + * In practice, %Poppler's \ref Page::renderToImage only "unrotates" the + * page orientation, and does not unrotate the rendering rotation. + * This ensures consistent renderings at different Page::Rotation values: + * annotations are always positioned as if they were being positioned at the + * default page orientation. + * + * Just like regular annotations, %Poppler Qt6 exposes normalized coordinates + * relative to the page's default orientation. However, behind the scenes, the + * coordinate system is different and %Poppler transparently transforms each + * shape. If you never call either Annotation::setFlags or + * Annotation::setBoundary, you don't need to worry about this; but if you do + * call them, then you need to adhere to the following rules: + * - Whenever you toggle the Annotation::FixedRotation flag, you must + * set again the boundary rectangle first, and then you must set + * again any other geometry-related property. + * - Whenever you modify the boundary rectangle of an annotation whose + * Annotation::FixedRotation flag is set, you must set again any other + * geometry-related property. + * + * These two rules are necessary to make %Poppler's transparent coordinate + * conversion work properly. + */ +class POPPLER_QT6_EXPORT Annotation +{ + friend class LinkMovie; + friend class LinkRendition; + +public: + // enum definitions + /** + * Annotation subclasses + * + * \sa subType() + */ + // WARNING!!! oKular uses that very same values so if you change them notify the author! + enum SubType + { + AText = 1, ///< TextAnnotation + ALine = 2, ///< LineAnnotation + AGeom = 3, ///< GeomAnnotation + AHighlight = 4, ///< HighlightAnnotation + AStamp = 5, ///< StampAnnotation + AInk = 6, ///< InkAnnotation + ALink = 7, ///< LinkAnnotation + ACaret = 8, ///< CaretAnnotation + AFileAttachment = 9, ///< FileAttachmentAnnotation + ASound = 10, ///< SoundAnnotation + AMovie = 11, ///< MovieAnnotation + AScreen = 12, ///< ScreenAnnotation + AWidget = 13, ///< WidgetAnnotation + ARichMedia = 14 ///< RichMediaAnnotation + }; + + /** + * Annotation flags + * + * They can be OR'd together (e.g. Annotation::FixedRotation | Annotation::DenyPrint). + * + * \sa flags(), setFlags() + */ + // NOTE: Only flags that are known to work are documented + enum Flag + { + Hidden = 1, ///< Do not display or print the annotation + FixedSize = 2, + FixedRotation = 4, ///< Do not rotate the annotation according to page orientation and rendering rotation \warning Extra care is needed with this flag: see \ref annotFixedRotation + DenyPrint = 8, ///< Do not print the annotation + DenyWrite = 16, + DenyDelete = 32, + ToggleHidingOnMouse = 64, + External = 128 + }; + Q_DECLARE_FLAGS(Flags, Flag) + + enum LineStyle + { + Solid = 1, + Dashed = 2, + Beveled = 4, + Inset = 8, + Underline = 16 + }; + enum LineEffect + { + NoEffect = 1, + Cloudy = 2 + }; + enum RevScope + { + Root = 0, + Reply = 1, + Group = 2, + Delete = 4 + }; + enum RevType + { + None = 1, + Marked = 2, + Unmarked = 4, + Accepted = 8, + Rejected = 16, + Cancelled = 32, + Completed = 64 + }; + + /** + * Returns the author of the annotation. + */ + QString author() const; + /** + * Sets a new author for the annotation. + */ + void setAuthor(const QString &author); + + QString contents() const; + void setContents(const QString &contents); + + /** + * Returns the unique name (ID) of the annotation. + */ + QString uniqueName() const; + /** + * Sets a new unique name for the annotation. + * + * \note no check of the new uniqueName is done + */ + void setUniqueName(const QString &uniqueName); + + QDateTime modificationDate() const; + void setModificationDate(const QDateTime &date); + + QDateTime creationDate() const; + void setCreationDate(const QDateTime &date); + + /** + * Returns this annotation's flags + * + * \sa Flag, setFlags() + */ + Flags flags() const; + /** + * Sets this annotation's flags + * + * \sa Flag, flags(), \ref annotFixedRotation + */ + void setFlags(Flags flags); + + /** + * Returns this annotation's boundary rectangle in normalized coordinates + * + * \sa setBoundary(const QRectF&) + */ + QRectF boundary() const; + /** + * Sets this annotation's boundary rectangle + * + * The boundary rectangle is the smallest rectangle that contains the + * annotation. + * + * \warning This property is mandatory: you must always set this. + * + * \sa boundary(), \ref annotFixedRotation + */ + void setBoundary(const QRectF &boundary); + + /** + * \short Container class for Annotation style information + */ + class POPPLER_QT6_EXPORT Style + { + public: + Style(); + Style(const Style &other); + Style &operator=(const Style &other); + ~Style(); + + // appearance properties + QColor color() const; // black + void setColor(const QColor &color); + double opacity() const; // 1.0 + void setOpacity(double opacity); + + // pen properties + double width() const; // 1.0 + void setWidth(double width); + LineStyle lineStyle() const; // LineStyle::Solid + void setLineStyle(LineStyle style); + double xCorners() const; // 0.0 + void setXCorners(double radius); + double yCorners() const; // 0.0 + void setYCorners(double radius); + const QVector &dashArray() const; // [ 3 ] + void setDashArray(const QVector &array); + + // pen effects + LineEffect lineEffect() const; // LineEffect::NoEffect + void setLineEffect(LineEffect effect); + double effectIntensity() const; // 1.0 + void setEffectIntensity(double intens); + + private: + class Private; + QSharedDataPointer d; + }; + + Style style() const; + void setStyle(const Style &style); + + /** + * \short Container class for Annotation pop-up window information + */ + class POPPLER_QT6_EXPORT Popup + { + public: + Popup(); + Popup(const Popup &other); + Popup &operator=(const Popup &other); + ~Popup(); + + // window state (Hidden, FixedRotation, Deny* flags allowed) + int flags() const; // -1 (never initialized) -> 0 (if inited and shown) + void setFlags(int flags); + + // geometric properties + QRectF geometry() const; // no default + void setGeometry(const QRectF &geom); + + // window contents/override properties + QString title() const; // '' text in the titlebar (overrides author) + void setTitle(const QString &title); + QString summary() const; // '' short description (displayed if not empty) + void setSummary(const QString &summary); + QString text() const; // '' text for the window (overrides annot->contents) + void setText(const QString &text); + + private: + class Private; + QSharedDataPointer d; + }; + + Popup popup() const; + /// \warning Currently does nothing \since 0.20 + void setPopup(const Popup &popup); + + RevScope revisionScope() const; // Root + + RevType revisionType() const; // None + + /** + * Returns the revisions of this annotation + */ + std::vector> revisions() const; + + /** + * The type of the annotation. + */ + virtual SubType subType() const = 0; + + /** + * Returns the current appearance stream of this annotation. + * + * \since 21.10.0 + */ + std::unique_ptr annotationAppearance() const; + + /** + * Sets the annotation's appearance stream with the @p annotationAppearance. + * + * \since 21.10.0 + */ + void setAnnotationAppearance(const AnnotationAppearance &annotationAppearance); + + /** + * Destructor. + */ + virtual ~Annotation(); + + /** + * Describes the flags from an annotations 'AA' dictionary. + * + * This flag is used by the additionalAction() method for ScreenAnnotation + * and WidgetAnnotation. + */ + enum AdditionalActionType + { + CursorEnteringAction, ///< Performed when the cursor enters the annotation's active area + CursorLeavingAction, ///< Performed when the cursor exists the annotation's active area + MousePressedAction, ///< Performed when the mouse button is pressed inside the annotation's active area + MouseReleasedAction, ///< Performed when the mouse button is released inside the annotation's active area + FocusInAction, ///< Performed when the annotation receives the input focus + FocusOutAction, ///< Performed when the annotation loses the input focus + PageOpeningAction, ///< Performed when the page containing the annotation is opened + PageClosingAction, ///< Performed when the page containing the annotation is closed + PageVisibleAction, ///< Performed when the page containing the annotation becomes visible + PageInvisibleAction ///< Performed when the page containing the annotation becomes invisible + }; + +protected: + /// \cond PRIVATE + explicit Annotation(AnnotationPrivate &dd); + Q_DECLARE_PRIVATE(Annotation) + QExplicitlySharedDataPointer d_ptr; + /// \endcond + +private: + Q_DISABLE_COPY(Annotation) +}; + +/** + * \short Annotation containing text. + * + * A text annotation is an object showing some text directly on the page, or + * linked to the contents using an icon shown on a page. + */ +class POPPLER_QT6_EXPORT TextAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + // local enums + enum TextType + { + Linked, + InPlace + }; + enum InplaceIntent + { + Unknown, + Callout, + TypeWriter + }; + enum InplaceAlignPosition + { + InplaceAlignLeft, + InplaceAlignCenter, + InplaceAlignRight + }; + + explicit TextAnnotation(TextType type); + ~TextAnnotation() override; + SubType subType() const override; + + /** + The type of text annotation represented by this object + */ + TextType textType() const; + + /** + The name of the icon for this text annotation. + + Standard names for text annotation icons are: + - Comment + - Help + - Insert + - Key + - NewParagraph + - Note (this is the default icon to use) + - Paragraph + */ + QString textIcon() const; + + /** + Set the name of the icon to use for this text annotation. + + \sa textIcon for the list of standard names + */ + void setTextIcon(const QString &icon); + + QFont textFont() const; + void setTextFont(const QFont &font); + /// Default text color is black + QColor textColor() const; + void setTextColor(const QColor &color); + + InplaceAlignPosition inplaceAlign() const; + void setInplaceAlign(InplaceAlignPosition align); + + QPointF calloutPoint(int id) const; + QVector calloutPoints() const; + void setCalloutPoints(const QVector &points); + + InplaceIntent inplaceIntent() const; + void setInplaceIntent(InplaceIntent intent); + +private: + explicit TextAnnotation(TextAnnotationPrivate &dd); + void setTextType(TextType type); + Q_DECLARE_PRIVATE(TextAnnotation) + Q_DISABLE_COPY(TextAnnotation) +}; + +/** + * \short Polygon/polyline annotation. + * + * This annotation represents a polygon (or polyline) to be drawn on a page. + */ +class POPPLER_QT6_EXPORT LineAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + // local enums + enum LineType + { + StraightLine, + Polyline + }; + enum TermStyle + { + Square, + Circle, + Diamond, + OpenArrow, + ClosedArrow, + None, + Butt, + ROpenArrow, + RClosedArrow, + Slash + }; + enum LineIntent + { + Unknown, + Arrow, + Dimension, + PolygonCloud + }; + + explicit LineAnnotation(LineType type); + ~LineAnnotation() override; + SubType subType() const override; + + LineType lineType() const; + + QVector linePoints() const; + void setLinePoints(const QVector &points); + + TermStyle lineStartStyle() const; + void setLineStartStyle(TermStyle style); + + TermStyle lineEndStyle() const; + void setLineEndStyle(TermStyle style); + + bool isLineClosed() const; + void setLineClosed(bool closed); + + QColor lineInnerColor() const; + void setLineInnerColor(const QColor &color); + + double lineLeadingForwardPoint() const; + void setLineLeadingForwardPoint(double point); + + double lineLeadingBackPoint() const; + void setLineLeadingBackPoint(double point); + + bool lineShowCaption() const; + void setLineShowCaption(bool show); + + LineIntent lineIntent() const; + void setLineIntent(LineIntent intent); + +private: + explicit LineAnnotation(LineAnnotationPrivate &dd); + void setLineType(LineType type); + Q_DECLARE_PRIVATE(LineAnnotation) + Q_DISABLE_COPY(LineAnnotation) +}; + +/** + * \short Geometric annotation. + * + * The geometric annotation represents a geometric figure, like a rectangle or + * an ellipse. + */ +class POPPLER_QT6_EXPORT GeomAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + GeomAnnotation(); + ~GeomAnnotation() override; + SubType subType() const override; + + // common enums + enum GeomType + { + InscribedSquare, + InscribedCircle + }; + + GeomType geomType() const; + void setGeomType(GeomType type); + + QColor geomInnerColor() const; + void setGeomInnerColor(const QColor &color); + +private: + explicit GeomAnnotation(GeomAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(GeomAnnotation) + Q_DISABLE_COPY(GeomAnnotation) +}; + +/** + * \short Text highlight annotation. + * + * The highlight annotation represents some areas of text being "highlighted". + */ +class POPPLER_QT6_EXPORT HighlightAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + HighlightAnnotation(); + ~HighlightAnnotation() override; + SubType subType() const override; + + /** + The type of highlight + */ + enum HighlightType + { + Highlight, ///< highlighter pen style annotation + Squiggly, ///< jagged or squiggly underline + Underline, ///< straight line underline + StrikeOut ///< straight line through-line + }; + + /** + Structure corresponding to a QuadPoints array. This matches a + quadrilateral that describes the area around a word (or set of + words) that are to be highlighted. + */ + struct Quad + { + QPointF points[4]; // 8 valid coords + bool capStart; // false (vtx 1-4) [K] + bool capEnd; // false (vtx 2-3) [K] + double feather; // 0.1 (in range 0..1) [K] + }; + + /** + The type (style) of highlighting to use for this area + or these areas. + */ + HighlightType highlightType() const; + + /** + Set the type of highlighting to use for the given area + or areas. + */ + void setHighlightType(HighlightType type); + + /** + The list of areas to highlight. + */ + QList highlightQuads() const; + + /** + Set the areas to highlight. + */ + void setHighlightQuads(const QList &quads); + +private: + explicit HighlightAnnotation(HighlightAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(HighlightAnnotation) + Q_DISABLE_COPY(HighlightAnnotation) +}; + +/** + * \short Stamp annotation. + * + * A simple annotation drawing a stamp on a page. + */ +class POPPLER_QT6_EXPORT StampAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + StampAnnotation(); + ~StampAnnotation() override; + SubType subType() const override; + + /** + The name of the icon for this stamp annotation. + + Standard names for stamp annotation icons are: + - Approved + - AsIs + - Confidential + - Departmental + - Draft (this is the default icon type) + - Experimental + - Expired + - Final + - ForComment + - ForPublicRelease + - NotApproved + - NotForPublicRelease + - Sold + - TopSecret + */ + QString stampIconName() const; + + /** + Set the icon type for this stamp annotation. + + \sa stampIconName for the list of standard icon names + */ + void setStampIconName(const QString &name); + + /** + Set a custom icon for this stamp annotation. + + \since 21.10.0 + */ + void setStampCustomImage(const QImage &image); + +private: + explicit StampAnnotation(StampAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(StampAnnotation) + Q_DISABLE_COPY(StampAnnotation) +}; + +/** + * \short Ink Annotation. + * + * Annotation representing an ink path on a page. + */ +class POPPLER_QT6_EXPORT InkAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + InkAnnotation(); + ~InkAnnotation() override; + SubType subType() const override; + + QList> inkPaths() const; + void setInkPaths(const QList> &paths); + +private: + explicit InkAnnotation(InkAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(InkAnnotation) + Q_DISABLE_COPY(InkAnnotation) +}; + +class POPPLER_QT6_EXPORT LinkAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~LinkAnnotation() override; + SubType subType() const override; + + // local enums + enum HighlightMode + { + None, + Invert, + Outline, + Push + }; + + Link *linkDestination() const; + void setLinkDestination(std::unique_ptr &&link); + + HighlightMode linkHighlightMode() const; + void setLinkHighlightMode(HighlightMode mode); + + QPointF linkRegionPoint(int id) const; + void setLinkRegionPoint(int id, const QPointF point); + +private: + LinkAnnotation(); + explicit LinkAnnotation(LinkAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(LinkAnnotation) + Q_DISABLE_COPY(LinkAnnotation) +}; + +/** + * \short Caret annotation. + * + * The caret annotation represents a symbol to indicate the presence of text. + */ +class POPPLER_QT6_EXPORT CaretAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + CaretAnnotation(); + ~CaretAnnotation() override; + SubType subType() const override; + + /** + * The symbols for the caret annotation. + */ + enum CaretSymbol + { + None, + P + }; + + CaretSymbol caretSymbol() const; + void setCaretSymbol(CaretSymbol symbol); + +private: + explicit CaretAnnotation(CaretAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(CaretAnnotation) + Q_DISABLE_COPY(CaretAnnotation) +}; + +/** + * \short File attachment annotation. + * + * The file attachment annotation represents a file embedded in the document. + */ +class POPPLER_QT6_EXPORT FileAttachmentAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~FileAttachmentAnnotation() override; + SubType subType() const override; + + /** + * Returns the name of the icon of this annotation. + */ + QString fileIconName() const; + /** + * Sets a new name for the icon of this annotation. + */ + void setFileIconName(const QString &icon); + + /** + * Returns the EmbeddedFile of this annotation. + */ + EmbeddedFile *embeddedFile() const; + /** + * Sets a new EmbeddedFile for this annotation. + * + * \note FileAttachmentAnnotation takes ownership of the object + */ + void setEmbeddedFile(EmbeddedFile *ef); + +private: + FileAttachmentAnnotation(); + explicit FileAttachmentAnnotation(FileAttachmentAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(FileAttachmentAnnotation) + Q_DISABLE_COPY(FileAttachmentAnnotation) +}; + +/** + * \short Sound annotation. + * + * The sound annotation represents a sound to be played when activated. + */ +class POPPLER_QT6_EXPORT SoundAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~SoundAnnotation() override; + SubType subType() const override; + + /** + * Returns the name of the icon of this annotation. + */ + QString soundIconName() const; + /** + * Sets a new name for the icon of this annotation. + */ + void setSoundIconName(const QString &icon); + + /** + * Returns the SoundObject of this annotation. + */ + SoundObject *sound() const; + /** + * Sets a new SoundObject for this annotation. + * + * \note SoundAnnotation takes ownership of the object + */ + void setSound(SoundObject *s); + +private: + SoundAnnotation(); + explicit SoundAnnotation(SoundAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(SoundAnnotation) + Q_DISABLE_COPY(SoundAnnotation) +}; + +/** + * \short Movie annotation. + * + * The movie annotation represents a movie to be played when activated. + */ +class POPPLER_QT6_EXPORT MovieAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~MovieAnnotation() override; + SubType subType() const override; + + /** + * Returns the MovieObject of this annotation. + */ + MovieObject *movie() const; + /** + * Sets a new MovieObject for this annotation. + * + * \note MovieAnnotation takes ownership of the object + */ + void setMovie(MovieObject *movie); + + /** + * Returns the title of the movie of this annotation. + */ + QString movieTitle() const; + /** + * Sets a new title for the movie of this annotation. + */ + void setMovieTitle(const QString &title); + +private: + MovieAnnotation(); + explicit MovieAnnotation(MovieAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(MovieAnnotation) + Q_DISABLE_COPY(MovieAnnotation) +}; + +/** + * \short Screen annotation. + * + * The screen annotation represents a screen to be played when activated. + */ +class POPPLER_QT6_EXPORT ScreenAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~ScreenAnnotation() override; + + SubType subType() const override; + + /** + * Returns the LinkRendition of this annotation. + */ + LinkRendition *action() const; + + /** + * Sets a new LinkRendition for this annotation. + * + * \note ScreenAnnotation takes ownership of the object + */ + void setAction(LinkRendition *action); + + /** + * Returns the title of the screen of this annotation. + */ + QString screenTitle() const; + + /** + * Sets a new title for the screen of this annotation. + */ + void setScreenTitle(const QString &title); + + /** + * Returns the additional action of the given @p type for the annotation or + * @c 0 if no action has been defined. + */ + std::unique_ptr additionalAction(AdditionalActionType type) const; + +private: + ScreenAnnotation(); + explicit ScreenAnnotation(ScreenAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(ScreenAnnotation) + Q_DISABLE_COPY(ScreenAnnotation) +}; + +/** + * \short Widget annotation. + * + * The widget annotation represents a widget (form field) on a page. + * + * \note This class is just provided for consistency of the annotation API, + * use the FormField classes to get all the form-related information. + */ +class POPPLER_QT6_EXPORT WidgetAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~WidgetAnnotation() override; + + SubType subType() const override; + + /** + * Returns the additional action of the given @p type for the annotation or + * @c 0 if no action has been defined. + */ + std::unique_ptr additionalAction(AdditionalActionType type) const; + +private: + WidgetAnnotation(); + explicit WidgetAnnotation(WidgetAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(WidgetAnnotation) + Q_DISABLE_COPY(WidgetAnnotation) +}; + +/** + * \short RichMedia annotation. + * + * The RichMedia annotation represents a video or sound on a page. + */ +class POPPLER_QT6_EXPORT RichMediaAnnotation : public Annotation +{ + friend class AnnotationPrivate; + +public: + ~RichMediaAnnotation() override; + + SubType subType() const override; + + /** + * The params object of a RichMediaAnnotation::Instance object. + * + * The params object provides media specific parameters, to play + * back the media inside the PDF viewer. + * + * At the moment only parameters for flash player are supported. + */ + class POPPLER_QT6_EXPORT Params + { + friend class AnnotationPrivate; + + public: + Params(); + ~Params(); + + /** + * Returns the parameters for the flash player. + */ + QString flashVars() const; + + private: + void setFlashVars(const QString &flashVars); + + class Private; + QScopedPointer d; + }; + + /** + * The instance object of a RichMediaAnnotation::Configuration object. + * + * The instance object represents one media object, that should be shown + * on the page. It has a media type and a Params object, to define the + * media specific parameters. + */ + class POPPLER_QT6_EXPORT Instance + { + friend class AnnotationPrivate; + + public: + /** + * Describes the media type of the instance. + */ + enum Type + { + Type3D, ///< A 3D media file. + TypeFlash, ///< A Flash media file. + TypeSound, ///< A sound media file. + TypeVideo ///< A video media file. + }; + + Instance(); + ~Instance(); + + /** + * Returns the media type of the instance. + */ + Type type() const; + + /** + * Returns the params object of the instance or @c 0 if it doesn't exist. + */ + RichMediaAnnotation::Params *params() const; + + private: + void setType(Type type); + void setParams(RichMediaAnnotation::Params *params); + + class Private; + QScopedPointer d; + }; + + /** + * The configuration object of a RichMediaAnnotation::Content object. + * + * The configuration object provides access to the various Instance objects + * of the rich media annotation. + */ + class POPPLER_QT6_EXPORT Configuration + { + friend class AnnotationPrivate; + + public: + /** + * Describes the media type of the configuration. + */ + enum Type + { + Type3D, ///< A 3D media file. + TypeFlash, ///< A Flash media file. + TypeSound, ///< A sound media file. + TypeVideo ///< A video media file. + }; + + Configuration(); + ~Configuration(); + + /** + * Returns the media type of the configuration. + */ + Type type() const; + + /** + * Returns the name of the configuration. + */ + QString name() const; + + /** + * Returns the list of Instance objects of the configuration. + */ + QList instances() const; + + private: + void setType(Type type); + void setName(const QString &name); + void setInstances(const QList &instances); + + class Private; + QScopedPointer d; + }; + + /** + * The asset object of a RichMediaAnnotation::Content object. + * + * The asset object provides a mapping between identifier name, as + * used in the flash vars string of RichMediaAnnotation::Params, and the + * associated file spec object. + */ + class POPPLER_QT6_EXPORT Asset + { + friend class AnnotationPrivate; + + public: + Asset(); + ~Asset(); + + /** + * Returns the identifier name of the asset. + */ + QString name() const; + + /** + * Returns the embedded file the asset points to. + */ + EmbeddedFile *embeddedFile() const; + + private: + void setName(const QString &name); + void setEmbeddedFile(EmbeddedFile *embeddedFile); + + class Private; + QScopedPointer d; + }; + + /** + * The content object of a RichMediaAnnotation. + * + * The content object provides access to the list of configurations + * and assets of the rich media annotation. + */ + class POPPLER_QT6_EXPORT Content + { + friend class AnnotationPrivate; + + public: + Content(); + ~Content(); + + /** + * Returns the list of configuration objects of the content object. + */ + QList configurations() const; + + /** + * Returns the list of asset objects of the content object. + */ + QList assets() const; + + private: + void setConfigurations(const QList &configurations); + void setAssets(const QList &assets); + + class Private; + QScopedPointer d; + }; + + /** + * The activation object of the RichMediaAnnotation::Settings object. + * + * The activation object is a wrapper around the settings for the activation + * state. At the moment it provides only the activation condition. + */ + class POPPLER_QT6_EXPORT Activation + { + friend class AnnotationPrivate; + + public: + /** + * Describes the condition for activating the rich media. + */ + enum Condition + { + PageOpened, ///< Activate when page is opened. + PageVisible, ///< Activate when page becomes visible. + UserAction ///< Activate when user interacts with the annotation. + }; + + Activation(); + ~Activation(); + + /** + * Returns the activation condition. + */ + Condition condition() const; + + private: + void setCondition(Condition condition); + + class Private; + QScopedPointer d; + }; + + /** + * The deactivation object of the RichMediaAnnotation::Settings object. + * + * The deactivation object is a wrapper around the settings for the deactivation + * state. At the moment it provides only the deactivation condition. + */ + class POPPLER_QT6_EXPORT Deactivation + { + friend class AnnotationPrivate; + + public: + /** + * Describes the condition for deactivating the rich media. + */ + enum Condition + { + PageClosed, ///< Deactivate when page is closed. + PageInvisible, ///< Deactivate when page becomes invisible. + UserAction ///< Deactivate when user interacts with the annotation. + }; + + Deactivation(); + ~Deactivation(); + + /** + * Returns the deactivation condition. + */ + Condition condition() const; + + private: + void setCondition(Condition condition); + + class Private; + QScopedPointer d; + }; + + /** + * The settings object of a RichMediaAnnotation. + * + * The settings object provides access to the configuration objects + * for annotation activation and deactivation. + */ + class POPPLER_QT6_EXPORT Settings + { + friend class AnnotationPrivate; + + public: + Settings(); + ~Settings(); + + /** + * Returns the Activation object of the settings object or @c 0 if it doesn't exist. + */ + RichMediaAnnotation::Activation *activation() const; + + /** + * Returns the Deactivation object of the settings object or @c 0 if it doesn't exist. + */ + RichMediaAnnotation::Deactivation *deactivation() const; + + private: + void setActivation(RichMediaAnnotation::Activation *activation); + void setDeactivation(RichMediaAnnotation::Deactivation *deactivation); + + class Private; + QScopedPointer d; + }; + + /** + * Returns the Settings object of the rich media annotation or @c 0 if it doesn't exist. + */ + RichMediaAnnotation::Settings *settings() const; + + /** + * Returns the Content object of the rich media annotation or @c 0 if it doesn't exist. + */ + RichMediaAnnotation::Content *content() const; + +private: + void setSettings(RichMediaAnnotation::Settings *settings); + void setContent(RichMediaAnnotation::Content *content); + + RichMediaAnnotation(); + explicit RichMediaAnnotation(RichMediaAnnotationPrivate &dd); + Q_DECLARE_PRIVATE(RichMediaAnnotation) + Q_DISABLE_COPY(RichMediaAnnotation) +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-base-converter.cc b/poppler-24.05.0/qt6/src/poppler-base-converter.cc new file mode 100644 index 0000000000000000000000000000000000000000..2324c50416a97af74ee22fb592eeb4f94af38144 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-base-converter.cc @@ -0,0 +1,89 @@ +/* poppler-base-converter.cc: qt interface to poppler + * Copyright (C) 2007, 2009, Albert Astals Cid + * Copyright (C) 2008, Pino Toscano + * + * 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-qt6.h" + +#include "poppler-converter-private.h" + +#include + +namespace Poppler { + +BaseConverterPrivate::BaseConverterPrivate() : document(nullptr), iodev(nullptr), ownIodev(true) { } + +BaseConverterPrivate::~BaseConverterPrivate() { } + +QIODevice *BaseConverterPrivate::openDevice() +{ + if (!iodev) { + Q_ASSERT(!outputFileName.isEmpty()); + QFile *f = new QFile(outputFileName); + iodev = f; + ownIodev = true; + } + Q_ASSERT(iodev); + if (!iodev->isOpen()) { + if (!iodev->open(QIODevice::WriteOnly)) { + if (ownIodev) { + delete iodev; + iodev = nullptr; + } else { + return nullptr; + } + } + } + return iodev; +} + +void BaseConverterPrivate::closeDevice() +{ + if (ownIodev) { + iodev->close(); + delete iodev; + iodev = nullptr; + } +} + +BaseConverter::BaseConverter(BaseConverterPrivate &dd) : d_ptr(&dd) { } + +BaseConverter::~BaseConverter() +{ + delete d_ptr; +} + +void BaseConverter::setOutputFileName(const QString &outputFileName) +{ + Q_D(BaseConverter); + d->outputFileName = outputFileName; +} + +void BaseConverter::setOutputDevice(QIODevice *device) +{ + Q_D(BaseConverter); + d->iodev = device; + d->ownIodev = false; +} + +BaseConverter::Error BaseConverter::lastError() const +{ + Q_D(const BaseConverter); + return d->lastError; +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-converter-private.h b/poppler-24.05.0/qt6/src/poppler-converter-private.h new file mode 100644 index 0000000000000000000000000000000000000000..ed51906792ad2be7889a7f507b6c40c02b9f4dbb --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-converter-private.h @@ -0,0 +1,52 @@ +/* poppler-converter-private.h: Qt interface to poppler + * Copyright (C) 2007, 2009, 2018, Albert Astals Cid + * Copyright (C) 2008, Pino Toscano + * + * 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. + */ + +#ifndef POPPLER_QT6_CONVERTER_PRIVATE_H +#define POPPLER_QT6_CONVERTER_PRIVATE_H + +#include + +class QIODevice; + +namespace Poppler { + +class DocumentData; + +class BaseConverterPrivate +{ +public: + BaseConverterPrivate(); + virtual ~BaseConverterPrivate(); + + BaseConverterPrivate(const BaseConverterPrivate &) = delete; + BaseConverterPrivate &operator=(const BaseConverterPrivate &) = delete; + + QIODevice *openDevice(); + void closeDevice(); + + DocumentData *document; + QString outputFileName; + QIODevice *iodev; + bool ownIodev : 1; + BaseConverter::Error lastError; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-document.cc b/poppler-24.05.0/qt6/src/poppler-document.cc new file mode 100644 index 0000000000000000000000000000000000000000..57c70e597bcd0d29ff327eadaa8f99b48218d991 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-document.cc @@ -0,0 +1,881 @@ +/* poppler-document.cc: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2005, 2008, Brad Hards + * Copyright (C) 2005-2010, 2012, 2013, 2015, 2017-2022, Albert Astals Cid + * Copyright (C) 2006-2010, Pino Toscano + * Copyright (C) 2010, 2011 Hib Eris + * Copyright (C) 2012 Koji Otani + * Copyright (C) 2012, 2013 Thomas Freitag + * Copyright (C) 2012 Fabio D'Urso + * Copyright (C) 2014, 2018, 2020 Adam Reichold + * Copyright (C) 2015 William Bader + * Copyright (C) 2016 Jakub Alba + * Copyright (C) 2017, 2021 Adrian Johnson + * Copyright (C) 2017 Suzuki Toshiya + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2019-2021 Oliver Sander + * Copyright (C) 2019 Alexander Volkov + * Copyright (C) 2020 Philipp Knechtges + * Copyright (C) 2020 Katarina Behrens + * Copyright (C) 2020 Thorsten Behrens + * Copyright (C) 2021 Mahmoud Khalil + * Copyright (C) 2021 Hubert Figuiere + * + * 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-qt6.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "poppler-form.h" +#include "poppler-private.h" +#include "poppler-page-private.h" +#include "poppler-outline-private.h" + +#if defined(USE_CMS) +# include +#endif + +namespace Poppler { + +std::unique_ptr Document::load(const QString &filePath, const QByteArray &ownerPassword, const QByteArray &userPassword) +{ + DocumentData *doc = new DocumentData(filePath, GooString(ownerPassword.data()), GooString(userPassword.data())); + return DocumentData::checkDocument(doc); +} + +std::unique_ptr Document::load(QIODevice *device, const QByteArray &ownerPassword, const QByteArray &userPassword) +{ + DocumentData *doc = new DocumentData(device, GooString(ownerPassword.data()), GooString(userPassword.data())); + return DocumentData::checkDocument(doc); +} + +std::unique_ptr Document::loadFromData(const QByteArray &fileContents, const QByteArray &ownerPassword, const QByteArray &userPassword) +{ + // create stream + DocumentData *doc = new DocumentData(fileContents, GooString(ownerPassword.data()), GooString(userPassword.data())); + return DocumentData::checkDocument(doc); +} + +std::unique_ptr DocumentData::checkDocument(DocumentData *doc) +{ + if (doc->doc->isOk() || doc->doc->getErrorCode() == errEncrypted) { + auto pdoc = std::unique_ptr(new Document(doc)); + if (doc->doc->getErrorCode() == errEncrypted) { + pdoc->m_doc->locked = true; + } else { + pdoc->m_doc->locked = false; + pdoc->m_doc->fillMembers(); + } + return pdoc; + } else { + delete doc; + } + return nullptr; +} + +Document::Document(DocumentData *dataA) +{ + m_doc = dataA; +} + +Document::~Document() +{ + delete m_doc; +} + +std::unique_ptr Document::page(int index) const +{ + // Cannot call std::make_unique, because the constructor of Page is private + auto page = std::unique_ptr(new Page(m_doc, index)); + if (page->m_page->page == nullptr) { + page.reset(); + } + + return page; +} + +bool Document::isLocked() const +{ + return m_doc->locked; +} + +bool Document::unlock(const QByteArray &ownerPassword, const QByteArray &userPassword) +{ + if (m_doc->locked) { + /* racier then it needs to be */ + DocumentData *doc2; + if (!m_doc->fileContents.isEmpty()) { + doc2 = new DocumentData(m_doc->fileContents, GooString(ownerPassword.data()), GooString(userPassword.data())); + } else if (m_doc->m_device) { + doc2 = new DocumentData(m_doc->m_device, GooString(ownerPassword.data()), GooString(userPassword.data())); + } else { + doc2 = new DocumentData(m_doc->m_filePath, GooString(ownerPassword.data()), GooString(userPassword.data())); + } + if (!doc2->doc->isOk()) { + delete doc2; + } else { + delete m_doc; + m_doc = doc2; + m_doc->locked = false; + m_doc->fillMembers(); + } + } + return m_doc->locked; +} + +Document::PageMode Document::pageMode() const +{ + switch (m_doc->doc->getCatalog()->getPageMode()) { + case Catalog::pageModeNone: + return UseNone; + case Catalog::pageModeOutlines: + return UseOutlines; + case Catalog::pageModeThumbs: + return UseThumbs; + case Catalog::pageModeFullScreen: + return FullScreen; + case Catalog::pageModeOC: + return UseOC; + case Catalog::pageModeAttach: + return UseAttach; + default: + return UseNone; + } +} + +Document::PageLayout Document::pageLayout() const +{ + switch (m_doc->doc->getCatalog()->getPageLayout()) { + case Catalog::pageLayoutNone: + return NoLayout; + case Catalog::pageLayoutSinglePage: + return SinglePage; + case Catalog::pageLayoutOneColumn: + return OneColumn; + case Catalog::pageLayoutTwoColumnLeft: + return TwoColumnLeft; + case Catalog::pageLayoutTwoColumnRight: + return TwoColumnRight; + case Catalog::pageLayoutTwoPageLeft: + return TwoPageLeft; + case Catalog::pageLayoutTwoPageRight: + return TwoPageRight; + default: + return NoLayout; + } +} + +Qt::LayoutDirection Document::textDirection() const +{ + if (!m_doc->doc->getCatalog()->getViewerPreferences()) { + return Qt::LayoutDirectionAuto; + } + + switch (m_doc->doc->getCatalog()->getViewerPreferences()->getDirection()) { + case ViewerPreferences::directionL2R: + return Qt::LeftToRight; + case ViewerPreferences::directionR2L: + return Qt::RightToLeft; + default: + return Qt::LayoutDirectionAuto; + } +} + +int Document::numPages() const +{ + return m_doc->doc->getNumPages(); +} + +QList Document::fonts() const +{ + QList ourList; + FontIterator it(0, m_doc); + while (it.hasNext()) { + ourList += it.next(); + } + return ourList; +} + +QList Document::embeddedFiles() const +{ + return m_doc->m_embeddedFiles; +} + +std::unique_ptr Document::newFontIterator(int startPage) const +{ + // Cannot use std::make_unique, because the FontIterator constructor is private + return std::unique_ptr(new FontIterator(startPage, m_doc)); +} + +QByteArray Document::fontData(const FontInfo &fi) const +{ + QByteArray result; + if (fi.isEmbedded()) { + XRef *xref = m_doc->doc->getXRef()->copy(); + + Object refObj(fi.m_data->embRef); + Object strObj = refObj.fetch(xref); + if (strObj.isStream()) { + int c; + strObj.streamReset(); + while ((c = strObj.streamGetChar()) != EOF) { + result.append((char)c); + } + strObj.streamClose(); + } + delete xref; + } + return result; +} + +QString Document::info(const QString &type) const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoStringEntry(type.toLatin1().constData())); + return UnicodeParsedString(goo.get()); +} + +bool Document::setInfo(const QString &key, const QString &val) +{ + if (m_doc->locked) { + return false; + } + + GooString *goo = QStringToUnicodeGooString(val); + m_doc->doc->setDocInfoStringEntry(key.toLatin1().constData(), goo); + return true; +} + +QString Document::title() const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoTitle()); + return UnicodeParsedString(goo.get()); +} + +bool Document::setTitle(const QString &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoTitle(QStringToUnicodeGooString(val)); + return true; +} + +QString Document::author() const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoAuthor()); + return UnicodeParsedString(goo.get()); +} + +bool Document::setAuthor(const QString &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoAuthor(QStringToUnicodeGooString(val)); + return true; +} + +QString Document::subject() const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoSubject()); + return UnicodeParsedString(goo.get()); +} + +bool Document::setSubject(const QString &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoSubject(QStringToUnicodeGooString(val)); + return true; +} + +QString Document::keywords() const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoKeywords()); + return UnicodeParsedString(goo.get()); +} + +bool Document::setKeywords(const QString &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoKeywords(QStringToUnicodeGooString(val)); + return true; +} + +QString Document::creator() const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoCreator()); + return UnicodeParsedString(goo.get()); +} + +bool Document::setCreator(const QString &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoCreator(QStringToUnicodeGooString(val)); + return true; +} + +QString Document::producer() const +{ + if (m_doc->locked) { + return QString(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoProducer()); + return UnicodeParsedString(goo.get()); +} + +bool Document::setProducer(const QString &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoProducer(QStringToUnicodeGooString(val)); + return true; +} + +bool Document::removeInfo() +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->removeDocInfo(); + return true; +} + +QStringList Document::infoKeys() const +{ + QStringList keys; + + if (m_doc->locked) { + return QStringList(); + } + + QScopedPointer xref(m_doc->doc->getXRef()->copy()); + if (!xref) { + return QStringList(); + } + Object info = xref->getDocInfo(); + if (!info.isDict()) { + return QStringList(); + } + + Dict *infoDict = info.getDict(); + // somehow iterate over keys in infoDict + keys.reserve(infoDict->getLength()); + for (int i = 0; i < infoDict->getLength(); ++i) { + keys.append(QString::fromLatin1(infoDict->getKey(i))); + } + + return keys; +} + +QDateTime Document::date(const QString &type) const +{ + if (m_doc->locked) { + return QDateTime(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoStringEntry(type.toLatin1().constData())); + QString str = UnicodeParsedString(goo.get()); + return Poppler::convertDate(str.toLatin1().constData()); +} + +bool Document::setDate(const QString &key, const QDateTime &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoStringEntry(key.toLatin1().constData(), QDateTimeToUnicodeGooString(val)); + return true; +} + +QDateTime Document::creationDate() const +{ + if (m_doc->locked) { + return QDateTime(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoCreatDate()); + QString str = UnicodeParsedString(goo.get()); + return Poppler::convertDate(str.toLatin1().constData()); +} + +bool Document::setCreationDate(const QDateTime &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoCreatDate(QDateTimeToUnicodeGooString(val)); + return true; +} + +QDateTime Document::modificationDate() const +{ + if (m_doc->locked) { + return QDateTime(); + } + + std::unique_ptr goo(m_doc->doc->getDocInfoModDate()); + QString str = UnicodeParsedString(goo.get()); + return Poppler::convertDate(str.toLatin1().constData()); +} + +bool Document::setModificationDate(const QDateTime &val) +{ + if (m_doc->locked) { + return false; + } + + m_doc->doc->setDocInfoModDate(QDateTimeToUnicodeGooString(val)); + return true; +} + +bool Document::isEncrypted() const +{ + return m_doc->doc->isEncrypted(); +} + +bool Document::isLinearized() const +{ + return m_doc->doc->isLinearized(); +} + +bool Document::okToPrint() const +{ + return m_doc->doc->okToPrint(); +} + +bool Document::okToPrintHighRes() const +{ + return m_doc->doc->okToPrintHighRes(); +} + +bool Document::okToChange() const +{ + return m_doc->doc->okToChange(); +} + +bool Document::okToCopy() const +{ + return m_doc->doc->okToCopy(); +} + +bool Document::okToAddNotes() const +{ + return m_doc->doc->okToAddNotes(); +} + +bool Document::okToFillForm() const +{ + return m_doc->doc->okToFillForm(); +} + +bool Document::okToCreateFormFields() const +{ + return (okToFillForm() && okToChange()); +} + +bool Document::okToExtractForAccessibility() const +{ + return m_doc->doc->okToAccessibility(); +} + +bool Document::okToAssemble() const +{ + return m_doc->doc->okToAssemble(); +} + +Document::PdfVersion Document::getPdfVersion() const +{ + return PdfVersion { m_doc->doc->getPDFMajorVersion(), m_doc->doc->getPDFMinorVersion() }; +} + +std::unique_ptr Document::page(const QString &label) const +{ + GooString label_g(label.toLatin1().data()); + int index; + + if (!m_doc->doc->getCatalog()->labelToIndex(&label_g, &index)) { + std::unique_ptr label_ug(QStringToUnicodeGooString(label)); + if (!m_doc->doc->getCatalog()->labelToIndex(label_ug.get(), &index)) { + return nullptr; + } + } + + return page(index); +} + +bool Document::hasEmbeddedFiles() const +{ + return (!(0 == m_doc->doc->getCatalog()->numEmbeddedFiles())); +} + +QVector Document::outline() const +{ + QVector result; + + if (::Outline *outline = m_doc->doc->getOutline()) { + if (const std::vector<::OutlineItem *> *items = outline->getItems()) { + for (void *item : *items) { + result.push_back(OutlineItem { new OutlineItemData { static_cast<::OutlineItem *>(item), m_doc } }); + } + } + } + + return result; +} + +std::unique_ptr Document::linkDestination(const QString &name) +{ + GooString *namedDest = QStringToGooString(name); + LinkDestinationData ldd(nullptr, namedDest, m_doc, false); + auto ld = std::make_unique(ldd); + delete namedDest; + return ld; +} + +void Document::setPaperColor(const QColor &color) +{ + m_doc->setPaperColor(color); +} + +void Document::setColorDisplayProfile(void *outputProfileA) +{ +#if defined(USE_CMS) + if (m_doc->m_sRGBProfile && m_doc->m_sRGBProfile.get() == outputProfileA) { + // Catch the special case that the user passes the sRGB profile + m_doc->m_displayProfile = m_doc->m_sRGBProfile; + return; + } + if (m_doc->m_displayProfile && m_doc->m_displayProfile.get() == outputProfileA) { + // Catch the special case that the user passes the display profile + return; + } + m_doc->m_displayProfile = make_GfxLCMSProfilePtr(outputProfileA); +#else + Q_UNUSED(outputProfileA); +#endif +} + +void Document::setColorDisplayProfileName(const QString &name) +{ +#if defined(USE_CMS) + void *rawprofile = cmsOpenProfileFromFile(name.toLocal8Bit().constData(), "r"); + m_doc->m_displayProfile = make_GfxLCMSProfilePtr(rawprofile); +#else + Q_UNUSED(name); +#endif +} + +void *Document::colorRgbProfile() const +{ +#if defined(USE_CMS) + if (!m_doc->m_sRGBProfile) { + m_doc->m_sRGBProfile = make_GfxLCMSProfilePtr(cmsCreate_sRGBProfile()); + } + return m_doc->m_sRGBProfile.get(); +#else + return nullptr; +#endif +} + +void *Document::colorDisplayProfile() const +{ +#if defined(USE_CMS) + return m_doc->m_displayProfile.get(); +#else + return nullptr; +#endif +} + +QColor Document::paperColor() const +{ + return m_doc->paperColor; +} + +void Document::setRenderBackend(Document::RenderBackend backend) +{ + // no need to delete the outputdev as for the moment we always create a splash one + // as the QPainter one does not allow "precaching" due to its signature + // delete m_doc->m_outputDev; + // m_doc->m_outputDev = NULL; + m_doc->m_backend = backend; +} + +Document::RenderBackend Document::renderBackend() const +{ + return m_doc->m_backend; +} + +QSet Document::availableRenderBackends() +{ + QSet ret; + ret << Document::SplashBackend; + ret << Document::QPainterBackend; + return ret; +} + +void Document::setRenderHint(Document::RenderHint hint, bool on) +{ + const bool touchesOverprinting = hint & Document::OverprintPreview; + + int hintForOperation = hint; + if (touchesOverprinting && !isOverprintPreviewAvailable()) { + hintForOperation = hintForOperation & ~(int)Document::OverprintPreview; + } + + if (on) { + m_doc->m_hints |= hintForOperation; + } else { + m_doc->m_hints &= ~hintForOperation; + } +} + +Document::RenderHints Document::renderHints() const +{ + return Document::RenderHints(m_doc->m_hints); +} + +std::unique_ptr Document::psConverter() const +{ + // Cannot use std::make_unique, because the PSConverter constructor is private + return std::unique_ptr(new PSConverter(m_doc)); +} + +std::unique_ptr Document::pdfConverter() const +{ + // Cannot use std::make_unique, because the PDFConverter constructor is private + return std::unique_ptr(new PDFConverter(m_doc)); +} + +QString Document::metadata() const +{ + QString result; + Catalog *catalog = m_doc->doc->getCatalog(); + if (catalog && catalog->isOk()) { + std::unique_ptr s = catalog->readMetadata(); + if (s) { + result = UnicodeParsedString(s.get()); + } + } + return result; +} + +bool Document::hasOptionalContent() const +{ + return (m_doc->doc->getOptContentConfig() && m_doc->doc->getOptContentConfig()->hasOCGs()); +} + +OptContentModel *Document::optionalContentModel() +{ + if (m_doc->m_optContentModel.isNull()) { + m_doc->m_optContentModel = new OptContentModel(m_doc->doc->getOptContentConfig(), nullptr); + } + return (OptContentModel *)m_doc->m_optContentModel; +} + +QStringList Document::scripts() const +{ + Catalog *catalog = m_doc->doc->getCatalog(); + const int numScripts = catalog->numJS(); + QStringList scripts; + for (int i = 0; i < numScripts; ++i) { + GooString *s = catalog->getJS(i); + if (s) { + scripts.append(UnicodeParsedString(s)); + delete s; + } + } + return scripts; +} + +bool Document::getPdfId(QByteArray *permanentId, QByteArray *updateId) const +{ + GooString gooPermanentId; + GooString gooUpdateId; + + if (!m_doc->doc->getID(permanentId ? &gooPermanentId : nullptr, updateId ? &gooUpdateId : nullptr)) { + return false; + } + + if (permanentId) { + *permanentId = gooPermanentId.c_str(); + } + if (updateId) { + *updateId = gooUpdateId.c_str(); + } + + return true; +} + +Document::FormType Document::formType() const +{ + switch (m_doc->doc->getCatalog()->getFormType()) { + case Catalog::NoForm: + return Document::NoForm; + case Catalog::AcroForm: + return Document::AcroForm; + case Catalog::XfaForm: + return Document::XfaForm; + } + + return Document::NoForm; // make gcc happy +} + +QVector Document::formCalculateOrder() const +{ + Form *form = m_doc->doc->getCatalog()->getForm(); + if (!form) { + return {}; + } + + QVector result; + const std::vector &calculateOrder = form->getCalculateOrder(); + for (Ref r : calculateOrder) { + FormWidget *w = form->findWidgetByRef(r); + if (w) { + result << w->getID(); + } + } + + return result; +} + +std::vector> Document::signatures() const +{ + std::vector> result; + + const std::vector<::FormFieldSignature *> pSignatures = m_doc->doc->getSignatureFields(); + + for (::FormFieldSignature *pSignature : pSignatures) { + ::FormWidget *fw = pSignature->getCreateWidget(); + ::Page *p = m_doc->doc->getPage(fw->getWidgetAnnotation()->getPageNum()); + result.push_back(std::make_unique(m_doc, p, static_cast(fw))); + } + + return result; +} + +bool Document::xrefWasReconstructed() const +{ + return m_doc->xrefReconstructed; +} + +void Document::setXRefReconstructedCallback(const std::function &callback) +{ + m_doc->xrefReconstructedCallback = callback; +} + +QDateTime convertDate(const char *dateString) +{ + int year, mon, day, hour, min, sec, tzHours, tzMins; + char tz; + + GooString date(dateString); + if (parseDateString(&date, &year, &mon, &day, &hour, &min, &sec, &tz, &tzHours, &tzMins)) { + QDate d(year, mon, day); + QTime t(hour, min, sec); + if (d.isValid() && t.isValid()) { + QDateTime dt(d, t, Qt::UTC); + if (tz) { + // then we have some form of timezone + if ('Z' == tz) { + // We are already at UTC + } else if ('+' == tz) { + // local time is ahead of UTC + dt = dt.addSecs(-1 * ((tzHours * 60) + tzMins) * 60); + } else if ('-' == tz) { + // local time is behind UTC + dt = dt.addSecs(((tzHours * 60) + tzMins) * 60); + } else { + qWarning("unexpected tz val"); + } + } + return dt; + } + } + return QDateTime(); +} + +bool isCmsAvailable() +{ +#if defined(USE_CMS) + return true; +#else + return false; +#endif +} + +bool isOverprintPreviewAvailable() +{ + return true; +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-embeddedfile-private.h b/poppler-24.05.0/qt6/src/poppler-embeddedfile-private.h new file mode 100644 index 0000000000000000000000000000000000000000..fe53f410c908b461647e96059410feb7fddf4dd0 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-embeddedfile-private.h @@ -0,0 +1,40 @@ +/* poppler-embeddedfile-private.h: Qt interface to poppler + * Copyright (C) 2005, 2008, 2009, 2012, 2018, 2021, 2022, Albert Astals Cid + * Copyright (C) 2005, Brad Hards + * Copyright (C) 2008, 2011, Pino Toscano + * + * 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. + */ + +#ifndef POPPLER_EMBEDDEDFILE_PRIVATE_H +#define POPPLER_EMBEDDEDFILE_PRIVATE_H + +class FileSpec; + +namespace Poppler { + +class EmbeddedFileData +{ +public: + explicit EmbeddedFileData(std::unique_ptr &&fs); + + EmbFile *embFile() const; + + std::unique_ptr filespec; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-embeddedfile.cc b/poppler-24.05.0/qt6/src/poppler-embeddedfile.cc new file mode 100644 index 0000000000000000000000000000000000000000..2fa3dc3918cecaf7c7cd3f37f8a77ae109b73a9a --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-embeddedfile.cc @@ -0,0 +1,117 @@ +/* poppler-document.cc: qt interface to poppler + * Copyright (C) 2005, 2008, 2009, 2012, 2013, 2018, 2022, Albert Astals Cid + * Copyright (C) 2005, Brad Hards + * Copyright (C) 2008, 2011, Pino Toscano + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela + * + * 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-qt6.h" + +#include +#include + +#include "Object.h" +#include "Stream.h" +#include "Catalog.h" + +#include "poppler-private.h" +#include "poppler-embeddedfile-private.h" + +namespace Poppler { + +EmbeddedFileData::EmbeddedFileData(std::unique_ptr &&fs) : filespec(std::move(fs)) { } + +EmbFile *EmbeddedFileData::embFile() const +{ + return filespec->isOk() ? filespec->getEmbeddedFile() : nullptr; +} + +EmbeddedFile::EmbeddedFile(EmbFile *embfile) : m_embeddedFile(nullptr) +{ + assert(!"You must not use this private constructor!"); +} + +EmbeddedFile::EmbeddedFile(EmbeddedFileData &dd) : m_embeddedFile(&dd) { } + +EmbeddedFile::~EmbeddedFile() +{ + delete m_embeddedFile; +} + +QString EmbeddedFile::name() const +{ + const GooString *goo = m_embeddedFile->filespec->getFileName(); + return goo ? UnicodeParsedString(goo) : QString(); +} + +QString EmbeddedFile::description() const +{ + const GooString *goo = m_embeddedFile->filespec->getDescription(); + return goo ? UnicodeParsedString(goo) : QString(); +} + +int EmbeddedFile::size() const +{ + return m_embeddedFile->embFile() ? m_embeddedFile->embFile()->size() : -1; +} + +QDateTime EmbeddedFile::modDate() const +{ + const GooString *goo = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->modDate() : nullptr; + return goo ? convertDate(goo->c_str()) : QDateTime(); +} + +QDateTime EmbeddedFile::createDate() const +{ + const GooString *goo = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->createDate() : nullptr; + return goo ? convertDate(goo->c_str()) : QDateTime(); +} + +QByteArray EmbeddedFile::checksum() const +{ + const GooString *goo = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->checksum() : nullptr; + return goo ? QByteArray::fromRawData(goo->c_str(), goo->getLength()) : QByteArray(); +} + +QString EmbeddedFile::mimeType() const +{ + const GooString *goo = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->mimeType() : nullptr; + return goo ? QString(goo->c_str()) : QString(); +} + +QByteArray EmbeddedFile::data() +{ + if (!isValid()) { + return QByteArray(); + } + Stream *stream = m_embeddedFile->embFile() ? m_embeddedFile->embFile()->stream() : nullptr; + if (!stream) { + return QByteArray(); + } + + stream->reset(); + auto data = stream->toUnsignedChars(); + return QByteArray(reinterpret_cast(data.data()), data.size()); +} + +bool EmbeddedFile::isValid() const +{ + return m_embeddedFile->filespec->isOk(); +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-fontinfo.cc b/poppler-24.05.0/qt6/src/poppler-fontinfo.cc new file mode 100644 index 0000000000000000000000000000000000000000..d9dedbb044b2ead7fc789d6dbf3a4863c658624d --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-fontinfo.cc @@ -0,0 +1,154 @@ +/* poppler-qt.h: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2005, Tobias Koening + * Copyright (C) 2005, Brad Hards + * Copyright (C) 2005-2008, 2015, Albert Astals Cid + * Copyright (C) 2008, 2009, Pino Toscano + * Copyright (C) 2018, Adam Reichold + * Copyright (C) 2019, Oliver Sander + * Copyright (C) 2019, Jan Grulich + * + * 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-qt6.h" +#include "poppler-private.h" + +namespace Poppler { + +FontInfo::FontInfo() +{ + m_data = new FontInfoData(); +} + +FontInfo::FontInfo(const FontInfoData &fid) +{ + m_data = new FontInfoData(fid); +} + +FontInfo::FontInfo(const FontInfo &fi) +{ + m_data = new FontInfoData(*fi.m_data); +} + +FontInfo::~FontInfo() +{ + delete m_data; +} + +QString FontInfo::name() const +{ + return m_data->fontName; +} + +QString FontInfo::substituteName() const +{ + return m_data->fontSubstituteName; +} + +QString FontInfo::file() const +{ + return m_data->fontFile; +} + +bool FontInfo::isEmbedded() const +{ + return m_data->isEmbedded; +} + +bool FontInfo::isSubset() const +{ + return m_data->isSubset; +} + +FontInfo::Type FontInfo::type() const +{ + return m_data->type; +} + +QString FontInfo::typeName() const +{ + switch (type()) { + case unknown: + return QObject::tr("unknown"); + case Type1: + return QObject::tr("Type 1"); + case Type1C: + return QObject::tr("Type 1C"); + case Type3: + return QObject::tr("Type 3"); + case TrueType: + return QObject::tr("TrueType"); + case CIDType0: + return QObject::tr("CID Type 0"); + case CIDType0C: + return QObject::tr("CID Type 0C"); + case CIDTrueType: + return QObject::tr("CID TrueType"); + case Type1COT: + return QObject::tr("Type 1C (OpenType)"); + case TrueTypeOT: + return QObject::tr("TrueType (OpenType)"); + case CIDType0COT: + return QObject::tr("CID Type 0C (OpenType)"); + case CIDTrueTypeOT: + return QObject::tr("CID TrueType (OpenType)"); + } + return QObject::tr("Bug: unexpected font type. Notify poppler mailing list!"); +} + +FontInfo &FontInfo::operator=(const FontInfo &fi) +{ + if (this == &fi) { + return *this; + } + + *m_data = *fi.m_data; + return *this; +} + +FontIterator::FontIterator(int startPage, DocumentData *dd) : d(new FontIteratorData(startPage, dd)) { } + +FontIterator::~FontIterator() +{ + delete d; +} + +QList FontIterator::next() +{ + ++d->currentPage; + + QList fonts; + const std::vector<::FontInfo *> items = d->fontInfoScanner.scan(1); + fonts.reserve(items.size()); + for (::FontInfo *entry : items) { + fonts.append(FontInfo(FontInfoData(entry))); + delete entry; + } + + return fonts; +} + +bool FontIterator::hasNext() const +{ + return (d->currentPage + 1) < d->totalPages; +} + +int FontIterator::currentPage() const +{ + return d->currentPage; +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-form.cc b/poppler-24.05.0/qt6/src/poppler-form.cc new file mode 100644 index 0000000000000000000000000000000000000000..9db314a99a2bdd29e03e7ea3384ad1296574c28a --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-form.cc @@ -0,0 +1,1339 @@ +/* poppler-form.h: qt interface to poppler + * Copyright (C) 2007-2008, 2011, Pino Toscano + * Copyright (C) 2008, 2011, 2012, 2015-2023 Albert Astals Cid + * Copyright (C) 2011 Carlos Garcia Campos + * Copyright (C) 2012, Adam Reichold + * Copyright (C) 2016, Hanno Meyer-Thurow + * Copyright (C) 2017, Hans-Ulrich Jüttner + * Copyright (C) 2018, Andre Heinecke + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018 Chinmoy Ranjan Pradhan + * Copyright (C) 2018, 2020, 2021 Oliver Sander + * Copyright (C) 2019 João Netto + * Copyright (C) 2020 David García Garzón + * Copyright (C) 2020 Thorsten Behrens + * Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021 Georgiy Sgibnev . Work sponsored by lab50.net. + * Copyright (C) 2021 Theofilos Intzoglou + * Copyright (C) 2022 Alexander Sulfrian + * Copyright (C) 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela + * + * 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-form.h" + +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#ifdef ENABLE_NSS3 +# include +#endif + +#include "poppler-page-private.h" +#include "poppler-private.h" +#include "poppler-annotation-helper.h" + +#include +#include + +namespace { + +Qt::Alignment formTextAlignment(::FormWidget *fm) +{ + Qt::Alignment qtalign = Qt::AlignLeft; + switch (fm->getField()->getTextQuadding()) { + case VariableTextQuadding::centered: + qtalign = Qt::AlignHCenter; + break; + case VariableTextQuadding::rightJustified: + qtalign = Qt::AlignRight; + break; + case VariableTextQuadding::leftJustified: + qtalign = Qt::AlignLeft; + } + return qtalign; +} + +} + +namespace Poppler { + +FormFieldIcon::FormFieldIcon(FormFieldIconData *data) : d_ptr(data) { } + +FormFieldIcon::FormFieldIcon(const FormFieldIcon &ffIcon) +{ + d_ptr = new FormFieldIconData; + d_ptr->icon = ffIcon.d_ptr->icon; +} + +FormFieldIcon &FormFieldIcon::operator=(const FormFieldIcon &ffIcon) +{ + if (this != &ffIcon) { + delete d_ptr; + d_ptr = nullptr; + + d_ptr = new FormFieldIconData; + *d_ptr = *ffIcon.d_ptr; + } + + return *this; +} + +FormFieldIcon::~FormFieldIcon() +{ + delete d_ptr; +} + +FormField::FormField(std::unique_ptr dd) : m_formData(std::move(dd)) +{ + if (m_formData->page) { + const int rotation = m_formData->page->getRotate(); + // reading the coords + double left, top, right, bottom; + m_formData->fm->getRect(&left, &bottom, &right, &top); + // build a normalized transform matrix for this page at 100% scale + GfxState gfxState(72.0, 72.0, m_formData->page->getCropBox(), rotation, true); + const double *gfxCTM = gfxState.getCTM(); + double MTX[6]; + double pageWidth = m_formData->page->getCropWidth(); + double pageHeight = m_formData->page->getCropHeight(); + // landscape and seascape page rotation: be sure to use the correct (== rotated) page size + if (((rotation / 90) % 2) == 1) { + qSwap(pageWidth, pageHeight); + } + for (int i = 0; i < 6; i += 2) { + MTX[i] = gfxCTM[i] / pageWidth; + MTX[i + 1] = gfxCTM[i + 1] / pageHeight; + } + QPointF topLeft; + XPDFReader::transform(MTX, qMin(left, right), qMax(top, bottom), topLeft); + QPointF bottomRight; + XPDFReader::transform(MTX, qMax(left, right), qMin(top, bottom), bottomRight); + m_formData->box = QRectF(topLeft, QSizeF(bottomRight.x() - topLeft.x(), bottomRight.y() - topLeft.y())); + } +} + +FormField::~FormField() = default; + +QRectF FormField::rect() const +{ + return m_formData->box; +} + +int FormField::id() const +{ + return m_formData->fm->getID(); +} + +QString FormField::name() const +{ + QString name; + if (const GooString *goo = m_formData->fm->getPartialName()) { + name = UnicodeParsedString(goo); + } + return name; +} + +void FormField::setName(const QString &name) const +{ + GooString *goo = QStringToGooString(name); + m_formData->fm->setPartialName(*goo); + delete goo; +} + +QString FormField::fullyQualifiedName() const +{ + QString name; + if (GooString *goo = m_formData->fm->getFullyQualifiedName()) { + name = UnicodeParsedString(goo); + } + return name; +} + +QString FormField::uiName() const +{ + QString name; + if (const GooString *goo = m_formData->fm->getAlternateUiName()) { + name = UnicodeParsedString(goo); + } + return name; +} + +bool FormField::isReadOnly() const +{ + return m_formData->fm->isReadOnly(); +} + +void FormField::setReadOnly(bool value) +{ + m_formData->fm->setReadOnly(value); +} + +bool FormField::isVisible() const +{ + const unsigned int flags = m_formData->fm->getWidgetAnnotation()->getFlags(); + if (flags & Annot::flagHidden) { + return false; + } + if (flags & Annot::flagNoView) { + return false; + } + return true; +} + +void FormField::setVisible(bool value) +{ + unsigned int flags = m_formData->fm->getWidgetAnnotation()->getFlags(); + if (value) { + flags &= ~Annot::flagHidden; + flags &= ~Annot::flagNoView; + } else { + flags |= Annot::flagHidden; + } + m_formData->fm->getWidgetAnnotation()->setFlags(flags); +} + +bool FormField::isPrintable() const +{ + return (m_formData->fm->getWidgetAnnotation()->getFlags() & Annot::flagPrint); +} + +void FormField::setPrintable(bool value) +{ + unsigned int flags = m_formData->fm->getWidgetAnnotation()->getFlags(); + if (value) { + flags |= Annot::flagPrint; + } else { + flags &= ~Annot::flagPrint; + } + m_formData->fm->getWidgetAnnotation()->setFlags(flags); +} + +std::unique_ptr FormField::activationAction() const +{ + if (::LinkAction *act = m_formData->fm->getActivationAction()) { + return PageData::convertLinkActionToLink(act, m_formData->doc, QRectF()); + } + + return {}; +} + +std::unique_ptr FormField::additionalAction(AdditionalActionType type) const +{ + Annot::FormAdditionalActionsType actionType = Annot::actionFieldModified; + switch (type) { + case FieldModified: + actionType = Annot::actionFieldModified; + break; + case FormatField: + actionType = Annot::actionFormatField; + break; + case ValidateField: + actionType = Annot::actionValidateField; + break; + case CalculateField: + actionType = Annot::actionCalculateField; + break; + } + + if (std::unique_ptr<::LinkAction> act = m_formData->fm->getAdditionalAction(actionType)) { + return PageData::convertLinkActionToLink(act.get(), m_formData->doc, QRectF()); + } + + return {}; +} + +std::unique_ptr FormField::additionalAction(Annotation::AdditionalActionType type) const +{ + ::AnnotWidget *w = m_formData->fm->getWidgetAnnotation(); + if (!w) { + return {}; + } + + const Annot::AdditionalActionsType actionType = toPopplerAdditionalActionType(type); + + if (std::unique_ptr<::LinkAction> act = w->getAdditionalAction(actionType)) { + return PageData::convertLinkActionToLink(act.get(), m_formData->doc, QRectF()); + } + + return {}; +} + +FormFieldButton::FormFieldButton(DocumentData *doc, ::Page *p, ::FormWidgetButton *w) : FormField(std::make_unique(doc, p, w)) { } + +FormFieldButton::~FormFieldButton() { } + +FormFieldButton::FormType FormFieldButton::type() const +{ + return FormField::FormButton; +} + +FormFieldButton::ButtonType FormFieldButton::buttonType() const +{ + FormWidgetButton *fwb = static_cast(m_formData->fm); + switch (fwb->getButtonType()) { + case formButtonCheck: + return FormFieldButton::CheckBox; + break; + case formButtonPush: + return FormFieldButton::Push; + break; + case formButtonRadio: + return FormFieldButton::Radio; + break; + } + return FormFieldButton::CheckBox; +} + +QString FormFieldButton::caption() const +{ + FormWidgetButton *fwb = static_cast(m_formData->fm); + QString ret; + if (fwb->getButtonType() == formButtonPush) { + Dict *dict = m_formData->fm->getObj()->getDict(); + Object obj1 = dict->lookup("MK"); + if (obj1.isDict()) { + AnnotAppearanceCharacs appearCharacs(obj1.getDict()); + if (appearCharacs.getNormalCaption()) { + ret = UnicodeParsedString(appearCharacs.getNormalCaption()); + } + } + } else { + if (const char *goo = fwb->getOnStr()) { + ret = QString::fromUtf8(goo); + } + } + return ret; +} + +FormFieldIcon FormFieldButton::icon() const +{ + FormWidgetButton *fwb = static_cast(m_formData->fm); + if (fwb->getButtonType() == formButtonPush) { + Dict *dict = m_formData->fm->getObj()->getDict(); + FormFieldIconData *data = new FormFieldIconData; + data->icon = dict; + return FormFieldIcon(data); + } + return FormFieldIcon(nullptr); +} + +void FormFieldButton::setIcon(const FormFieldIcon &icon) +{ + if (FormFieldIconData::getData(icon) == nullptr) { + return; + } + + FormWidgetButton *fwb = static_cast(m_formData->fm); + if (fwb->getButtonType() == formButtonPush) { + ::AnnotWidget *w = m_formData->fm->getWidgetAnnotation(); + FormFieldIconData *data = FormFieldIconData::getData(icon); + if (data->icon != nullptr) { + w->setNewAppearance(data->icon->lookup("AP")); + } + } +} + +bool FormFieldButton::state() const +{ + FormWidgetButton *fwb = static_cast(m_formData->fm); + return fwb->getState(); +} + +void FormFieldButton::setState(bool state) +{ + FormWidgetButton *fwb = static_cast(m_formData->fm); + fwb->setState((bool)state); +} + +QList FormFieldButton::siblings() const +{ + FormWidgetButton *fwb = static_cast(m_formData->fm); + ::FormFieldButton *ffb = static_cast<::FormFieldButton *>(fwb->getField()); + if (fwb->getButtonType() == formButtonPush) { + return QList(); + } + + QList ret; + for (int i = 0; i < ffb->getNumSiblings(); ++i) { + ::FormFieldButton *sibling = static_cast<::FormFieldButton *>(ffb->getSibling(i)); + for (int j = 0; j < sibling->getNumWidgets(); ++j) { + FormWidget *w = sibling->getWidget(j); + if (w) { + ret.append(w->getID()); + } + } + } + + return ret; +} + +FormFieldText::FormFieldText(DocumentData *doc, ::Page *p, ::FormWidgetText *w) : FormField(std::make_unique(doc, p, w)) { } + +FormFieldText::~FormFieldText() { } + +FormField::FormType FormFieldText::type() const +{ + return FormField::FormText; +} + +FormFieldText::TextType FormFieldText::textType() const +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + if (fwt->isFileSelect()) { + return FormFieldText::FileSelect; + } else if (fwt->isMultiline()) { + return FormFieldText::Multiline; + } + return FormFieldText::Normal; +} + +QString FormFieldText::text() const +{ + const GooString *goo = static_cast(m_formData->fm)->getContent(); + return UnicodeParsedString(goo); +} + +void FormFieldText::setText(const QString &text) +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + GooString *goo = QStringToUnicodeGooString(text); + fwt->setContent(goo); + delete goo; +} + +void FormFieldText::setAppearanceText(const QString &text) +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + GooString *goo = QStringToUnicodeGooString(text); + fwt->setAppearanceContent(goo); + delete goo; +} + +bool FormFieldText::isPassword() const +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + return fwt->isPassword(); +} + +bool FormFieldText::isRichText() const +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + return fwt->isRichText(); +} + +int FormFieldText::maximumLength() const +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + const int maxlen = fwt->getMaxLen(); + return maxlen > 0 ? maxlen : -1; +} + +Qt::Alignment FormFieldText::textAlignment() const +{ + return formTextAlignment(m_formData->fm); +} + +bool FormFieldText::canBeSpellChecked() const +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + return !fwt->noSpellCheck(); +} + +double FormFieldText::getFontSize() const +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + return fwt->getTextFontSize(); +} + +void FormFieldText::setFontSize(int fontSize) +{ + FormWidgetText *fwt = static_cast(m_formData->fm); + fwt->setTextFontSize(fontSize); +} + +FormFieldChoice::FormFieldChoice(DocumentData *doc, ::Page *p, ::FormWidgetChoice *w) : FormField(std::make_unique(doc, p, w)) { } + +FormFieldChoice::~FormFieldChoice() { } + +FormFieldChoice::FormType FormFieldChoice::type() const +{ + return FormField::FormChoice; +} + +FormFieldChoice::ChoiceType FormFieldChoice::choiceType() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + if (fwc->isCombo()) { + return FormFieldChoice::ComboBox; + } + return FormFieldChoice::ListBox; +} + +QStringList FormFieldChoice::choices() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + QStringList ret; + int num = fwc->getNumChoices(); + ret.reserve(num); + for (int i = 0; i < num; ++i) { + ret.append(UnicodeParsedString(fwc->getChoice(i))); + } + return ret; +} + +QVector> FormFieldChoice::choicesWithExportValues() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + QVector> ret; + const int num = fwc->getNumChoices(); + ret.reserve(num); + for (int i = 0; i < num; ++i) { + const QString display = UnicodeParsedString(fwc->getChoice(i)); + const GooString *exportValueG = fwc->getExportVal(i); + const QString exportValue = exportValueG ? UnicodeParsedString(exportValueG) : display; + ret.append({ display, exportValue }); + } + return ret; +} + +bool FormFieldChoice::isEditable() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + return fwc->isCombo() ? fwc->hasEdit() : false; +} + +bool FormFieldChoice::multiSelect() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + return !fwc->isCombo() ? fwc->isMultiSelect() : false; +} + +QList FormFieldChoice::currentChoices() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + int num = fwc->getNumChoices(); + QList choices; + for (int i = 0; i < num; ++i) { + if (fwc->isSelected(i)) { + choices.append(i); + } + } + return choices; +} + +void FormFieldChoice::setCurrentChoices(const QList &choice) +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + fwc->deselectAll(); + for (int i = 0; i < choice.count(); ++i) { + fwc->select(choice.at(i)); + } +} + +QString FormFieldChoice::editChoice() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + + if (fwc->isCombo() && fwc->hasEdit()) { + return UnicodeParsedString(fwc->getEditChoice()); + } else { + return QString(); + } +} + +void FormFieldChoice::setEditChoice(const QString &text) +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + + if (fwc->isCombo() && fwc->hasEdit()) { + GooString *goo = QStringToUnicodeGooString(text); + fwc->setEditChoice(goo); + delete goo; + } +} + +Qt::Alignment FormFieldChoice::textAlignment() const +{ + return formTextAlignment(m_formData->fm); +} + +bool FormFieldChoice::canBeSpellChecked() const +{ + FormWidgetChoice *fwc = static_cast(m_formData->fm); + return !fwc->noSpellCheck(); +} + +class CertificateInfoPrivate +{ +public: + struct EntityInfo + { + QString common_name; + QString email_address; + QString org_name; + QString distinguished_name; + }; + + EntityInfo issuer_info; + EntityInfo subject_info; + QString nick_name; + QByteArray certificate_der; + QByteArray serial_number; + QByteArray public_key; + QDateTime validity_start; + QDateTime validity_end; + int public_key_type; + int public_key_strength; + int ku_extensions; + int version; + bool is_self_signed; + bool is_null; + CertificateInfo::KeyLocation keyLocation; +}; + +CertificateInfo::CertificateInfo() : d_ptr(new CertificateInfoPrivate()) +{ + d_ptr->is_null = true; +} + +CertificateInfo::CertificateInfo(CertificateInfoPrivate *priv) : d_ptr(priv) { } + +CertificateInfo::CertificateInfo(const CertificateInfo &other) : d_ptr(other.d_ptr) { } + +CertificateInfo::~CertificateInfo() = default; + +CertificateInfo &CertificateInfo::operator=(const CertificateInfo &other) +{ + if (this != &other) { + d_ptr = other.d_ptr; + } + + return *this; +} + +bool CertificateInfo::isNull() const +{ + Q_D(const CertificateInfo); + return d->is_null; +} + +int CertificateInfo::version() const +{ + Q_D(const CertificateInfo); + return d->version; +} + +QByteArray CertificateInfo::serialNumber() const +{ + Q_D(const CertificateInfo); + return d->serial_number; +} + +QString CertificateInfo::issuerInfo(EntityInfoKey key) const +{ + Q_D(const CertificateInfo); + switch (key) { + case CommonName: + return d->issuer_info.common_name; + case DistinguishedName: + return d->issuer_info.distinguished_name; + case EmailAddress: + return d->issuer_info.email_address; + case Organization: + return d->issuer_info.org_name; + default: + return QString(); + } +} + +QString CertificateInfo::subjectInfo(EntityInfoKey key) const +{ + Q_D(const CertificateInfo); + switch (key) { + case CommonName: + return d->subject_info.common_name; + case DistinguishedName: + return d->subject_info.distinguished_name; + case EmailAddress: + return d->subject_info.email_address; + case Organization: + return d->subject_info.org_name; + default: + return QString(); + } +} + +QString CertificateInfo::nickName() const +{ + Q_D(const CertificateInfo); + return d->nick_name; +} + +QDateTime CertificateInfo::validityStart() const +{ + Q_D(const CertificateInfo); + return d->validity_start; +} + +QDateTime CertificateInfo::validityEnd() const +{ + Q_D(const CertificateInfo); + return d->validity_end; +} + +CertificateInfo::KeyUsageExtensions CertificateInfo::keyUsageExtensions() const +{ + Q_D(const CertificateInfo); + + KeyUsageExtensions kuExtensions = KuNone; + if (d->ku_extensions & KU_DIGITAL_SIGNATURE) { + kuExtensions |= KuDigitalSignature; + } + if (d->ku_extensions & KU_NON_REPUDIATION) { + kuExtensions |= KuNonRepudiation; + } + if (d->ku_extensions & KU_KEY_ENCIPHERMENT) { + kuExtensions |= KuKeyEncipherment; + } + if (d->ku_extensions & KU_DATA_ENCIPHERMENT) { + kuExtensions |= KuDataEncipherment; + } + if (d->ku_extensions & KU_KEY_AGREEMENT) { + kuExtensions |= KuKeyAgreement; + } + if (d->ku_extensions & KU_KEY_CERT_SIGN) { + kuExtensions |= KuKeyCertSign; + } + if (d->ku_extensions & KU_CRL_SIGN) { + kuExtensions |= KuClrSign; + } + if (d->ku_extensions & KU_ENCIPHER_ONLY) { + kuExtensions |= KuEncipherOnly; + } + + return kuExtensions; +} + +CertificateInfo::KeyLocation CertificateInfo::keyLocation() const +{ + Q_D(const CertificateInfo); + return d->keyLocation; +} + +QByteArray CertificateInfo::publicKey() const +{ + Q_D(const CertificateInfo); + return d->public_key; +} + +CertificateInfo::PublicKeyType CertificateInfo::publicKeyType() const +{ + Q_D(const CertificateInfo); + switch (d->public_key_type) { + case RSAKEY: + return RsaKey; + case DSAKEY: + return DsaKey; + case ECKEY: + return EcKey; + default: + return OtherKey; + } +} + +int CertificateInfo::publicKeyStrength() const +{ + Q_D(const CertificateInfo); + return d->public_key_strength; +} + +bool CertificateInfo::isSelfSigned() const +{ + Q_D(const CertificateInfo); + return d->is_self_signed; +} + +QByteArray CertificateInfo::certificateData() const +{ + Q_D(const CertificateInfo); + return d->certificate_der; +} + +bool CertificateInfo::checkPassword(const QString &password) const +{ +#ifdef ENABLE_SIGNATURES + auto backend = CryptoSign::Factory::createActive(); + if (!backend) { + return false; + } + Q_D(const CertificateInfo); + auto sigHandler = backend->createSigningHandler(d->nick_name.toStdString(), HashAlgorithm::Sha256); + unsigned char buffer[5]; + memcpy(buffer, "test", 5); + sigHandler->addData(buffer, 5); + std::optional tmpSignature = sigHandler->signDetached(password.toStdString()); + return tmpSignature.has_value(); +#else + return false; +#endif +} + +class SignatureValidationInfoPrivate +{ +public: + explicit SignatureValidationInfoPrivate(CertificateInfo &&ci) : cert_info(ci) { } + + SignatureValidationInfo::SignatureStatus signature_status; + SignatureValidationInfo::CertificateStatus certificate_status; + CertificateInfo cert_info; + + QByteArray signature; + QString signer_name; + QString signer_subject_dn; + QString location; + QString reason; + HashAlgorithm hash_algorithm; + time_t signing_time; + QList range_bounds; + qint64 docLength; +}; + +SignatureValidationInfo::SignatureValidationInfo(SignatureValidationInfoPrivate *priv) : d_ptr(priv) { } + +SignatureValidationInfo::SignatureValidationInfo(const SignatureValidationInfo &other) : d_ptr(other.d_ptr) { } + +SignatureValidationInfo::~SignatureValidationInfo() { } + +SignatureValidationInfo::SignatureStatus SignatureValidationInfo::signatureStatus() const +{ + Q_D(const SignatureValidationInfo); + return d->signature_status; +} + +SignatureValidationInfo::CertificateStatus SignatureValidationInfo::certificateStatus() const +{ + Q_D(const SignatureValidationInfo); + return d->certificate_status; +} + +QString SignatureValidationInfo::signerName() const +{ + Q_D(const SignatureValidationInfo); + return d->signer_name; +} + +QString SignatureValidationInfo::signerSubjectDN() const +{ + Q_D(const SignatureValidationInfo); + return d->signer_subject_dn; +} + +QString SignatureValidationInfo::location() const +{ + Q_D(const SignatureValidationInfo); + return d->location; +} + +QString SignatureValidationInfo::reason() const +{ + Q_D(const SignatureValidationInfo); + return d->reason; +} + +SignatureValidationInfo::HashAlgorithm SignatureValidationInfo::hashAlgorithm() const +{ +#ifdef ENABLE_SIGNATURES + Q_D(const SignatureValidationInfo); + + switch (d->hash_algorithm) { + case ::HashAlgorithm::Md2: + return HashAlgorithmMd2; + case ::HashAlgorithm::Md5: + return HashAlgorithmMd5; + case ::HashAlgorithm::Sha1: + return HashAlgorithmSha1; + case ::HashAlgorithm::Sha256: + return HashAlgorithmSha256; + case ::HashAlgorithm::Sha384: + return HashAlgorithmSha384; + case ::HashAlgorithm::Sha512: + return HashAlgorithmSha512; + case ::HashAlgorithm::Sha224: + return HashAlgorithmSha224; + case ::HashAlgorithm::Unknown: + return HashAlgorithmUnknown; + } +#endif + return HashAlgorithmUnknown; +} + +time_t SignatureValidationInfo::signingTime() const +{ + Q_D(const SignatureValidationInfo); + return d->signing_time; +} + +QByteArray SignatureValidationInfo::signature() const +{ + Q_D(const SignatureValidationInfo); + return d->signature; +} + +QList SignatureValidationInfo::signedRangeBounds() const +{ + Q_D(const SignatureValidationInfo); + return d->range_bounds; +} + +bool SignatureValidationInfo::signsTotalDocument() const +{ + Q_D(const SignatureValidationInfo); + if (d->range_bounds.size() == 4 && d->range_bounds.value(0) == 0 && d->range_bounds.value(1) >= 0 && d->range_bounds.value(2) > d->range_bounds.value(1) && d->range_bounds.value(3) >= d->range_bounds.value(2)) { + // The range from d->range_bounds.value(1) to d->range_bounds.value(2) is + // not authenticated by the signature and should only contain the signature + // itself padded with 0 bytes. This has been checked in readSignature(). + // If it failed, d->signature is empty. + // A potential range after d->range_bounds.value(3) would be also not + // authenticated. Therefore d->range_bounds.value(3) should coincide with + // the end of the document. + if (d->docLength == d->range_bounds.value(3) && !d->signature.isEmpty()) { + return true; + } + } + return false; +} + +CertificateInfo SignatureValidationInfo::certificateInfo() const +{ + Q_D(const SignatureValidationInfo); + return d->cert_info; +} + +SignatureValidationInfo &SignatureValidationInfo::operator=(const SignatureValidationInfo &other) +{ + if (this != &other) { + d_ptr = other.d_ptr; + } + + return *this; +} + +FormFieldSignature::FormFieldSignature(DocumentData *doc, ::Page *p, ::FormWidgetSignature *w) : FormField(std::make_unique(doc, p, w)) { } + +FormFieldSignature::~FormFieldSignature() { } + +FormField::FormType FormFieldSignature::type() const +{ + return FormField::FormSignature; +} + +FormFieldSignature::SignatureType FormFieldSignature::signatureType() const +{ + SignatureType sigType = AdbePkcs7detached; + FormWidgetSignature *fws = static_cast(m_formData->fm); + switch (fws->signatureType()) { + case adbe_pkcs7_sha1: + sigType = AdbePkcs7sha1; + break; + case adbe_pkcs7_detached: + sigType = AdbePkcs7detached; + break; + case ETSI_CAdES_detached: + sigType = EtsiCAdESdetached; + break; + case unknown_signature_type: + sigType = UnknownSignatureType; + break; + case unsigned_signature_field: + sigType = UnsignedSignature; + break; + } + return sigType; +} + +SignatureValidationInfo FormFieldSignature::validate(ValidateOptions opt) const +{ + auto tempResult = validateAsync(opt); + tempResult.first.d_ptr->certificate_status = validateResult(); + return tempResult.first; +} + +static CertificateInfo::KeyLocation fromPopplerCore(KeyLocation location) +{ + switch (location) { + case KeyLocation::Computer: + return CertificateInfo::KeyLocation::Computer; + case KeyLocation::Other: + return CertificateInfo::KeyLocation::Other; + case KeyLocation::Unknown: + return CertificateInfo::KeyLocation::Unknown; + case KeyLocation::HardwareToken: + return CertificateInfo::KeyLocation::HardwareToken; + } + return CertificateInfo::KeyLocation::Unknown; +} + +static CertificateInfoPrivate *createCertificateInfoPrivate(const X509CertificateInfo *ci) +{ + CertificateInfoPrivate *certPriv = new CertificateInfoPrivate; + certPriv->is_null = true; + if (ci) { + certPriv->version = ci->getVersion(); + certPriv->ku_extensions = ci->getKeyUsageExtensions(); + certPriv->keyLocation = fromPopplerCore(ci->getKeyLocation()); + + const GooString &certSerial = ci->getSerialNumber(); + certPriv->serial_number = QByteArray(certSerial.c_str(), certSerial.getLength()); + + const X509CertificateInfo::EntityInfo &issuerInfo = ci->getIssuerInfo(); + certPriv->issuer_info.common_name = issuerInfo.commonName.c_str(); + certPriv->issuer_info.distinguished_name = issuerInfo.distinguishedName.c_str(); + certPriv->issuer_info.email_address = issuerInfo.email.c_str(); + certPriv->issuer_info.org_name = issuerInfo.organization.c_str(); + + const X509CertificateInfo::EntityInfo &subjectInfo = ci->getSubjectInfo(); + certPriv->subject_info.common_name = subjectInfo.commonName.c_str(); + certPriv->subject_info.distinguished_name = subjectInfo.distinguishedName.c_str(); + certPriv->subject_info.email_address = subjectInfo.email.c_str(); + certPriv->subject_info.org_name = subjectInfo.organization.c_str(); + + certPriv->nick_name = ci->getNickName().c_str(); + + X509CertificateInfo::Validity certValidity = ci->getValidity(); + certPriv->validity_start = QDateTime::fromSecsSinceEpoch(certValidity.notBefore, Qt::UTC); + certPriv->validity_end = QDateTime::fromSecsSinceEpoch(certValidity.notAfter, Qt::UTC); + + const X509CertificateInfo::PublicKeyInfo &pkInfo = ci->getPublicKeyInfo(); + certPriv->public_key = QByteArray(pkInfo.publicKey.c_str(), pkInfo.publicKey.getLength()); + certPriv->public_key_type = static_cast(pkInfo.publicKeyType); + certPriv->public_key_strength = pkInfo.publicKeyStrength; + + const GooString &certDer = ci->getCertificateDER(); + certPriv->certificate_der = QByteArray(certDer.c_str(), certDer.getLength()); + + certPriv->is_null = false; + } + + return certPriv; +} + +static SignatureValidationInfo::CertificateStatus fromInternal(CertificateValidationStatus status) +{ + switch (status) { + case CERTIFICATE_TRUSTED: + return SignatureValidationInfo::CertificateTrusted; + case CERTIFICATE_UNTRUSTED_ISSUER: + return SignatureValidationInfo::CertificateUntrustedIssuer; + case CERTIFICATE_UNKNOWN_ISSUER: + return SignatureValidationInfo::CertificateUnknownIssuer; + case CERTIFICATE_REVOKED: + return SignatureValidationInfo::CertificateRevoked; + case CERTIFICATE_EXPIRED: + return SignatureValidationInfo::CertificateExpired; + default: + case CERTIFICATE_GENERIC_ERROR: + return SignatureValidationInfo::CertificateGenericError; + case CERTIFICATE_NOT_VERIFIED: + return SignatureValidationInfo::CertificateNotVerified; + } +} + +static SignatureValidationInfo fromInternal(SignatureInfo *si, FormWidgetSignature *fws) +{ + // get certificate info + const X509CertificateInfo *ci = si->getCertificateInfo(); + CertificateInfoPrivate *certPriv = createCertificateInfoPrivate(ci); + + SignatureValidationInfoPrivate *priv = new SignatureValidationInfoPrivate(CertificateInfo(certPriv)); + switch (si->getSignatureValStatus()) { + case SIGNATURE_VALID: + priv->signature_status = SignatureValidationInfo::SignatureValid; + break; + case SIGNATURE_INVALID: + priv->signature_status = SignatureValidationInfo::SignatureInvalid; + break; + case SIGNATURE_DIGEST_MISMATCH: + priv->signature_status = SignatureValidationInfo::SignatureDigestMismatch; + break; + case SIGNATURE_DECODING_ERROR: + priv->signature_status = SignatureValidationInfo::SignatureDecodingError; + break; + default: + case SIGNATURE_GENERIC_ERROR: + priv->signature_status = SignatureValidationInfo::SignatureGenericError; + break; + case SIGNATURE_NOT_FOUND: + priv->signature_status = SignatureValidationInfo::SignatureNotFound; + break; + case SIGNATURE_NOT_VERIFIED: + priv->signature_status = SignatureValidationInfo::SignatureNotVerified; + break; + } + priv->certificate_status = SignatureValidationInfo::CertificateVerificationInProgress; + priv->signer_name = QString::fromStdString(si->getSignerName()); + priv->signer_subject_dn = QString::fromStdString(si->getSubjectDN()); + priv->hash_algorithm = si->getHashAlgorithm(); + priv->location = UnicodeParsedString(si->getLocation().toStr()); + priv->reason = UnicodeParsedString(si->getReason().toStr()); + + priv->signing_time = si->getSigningTime(); + const std::vector ranges = fws->getSignedRangeBounds(); + if (!ranges.empty()) { + for (Goffset bound : ranges) { + priv->range_bounds.append(bound); + } + } + const std::optional checkedSignature = fws->getCheckedSignature(&priv->docLength); + if (priv->range_bounds.size() == 4 && checkedSignature) { + priv->signature = QByteArray::fromHex(checkedSignature->c_str()); + } + + return SignatureValidationInfo(priv); +} + +SignatureValidationInfo FormFieldSignature::validate(int opt, const QDateTime &validationTime) const +{ + auto tempResult = validateAsync(static_cast(opt), validationTime); + tempResult.first.d_ptr->certificate_status = validateResult(); + return tempResult.first; +} + +class AsyncObjectPrivate +{ /*Currently unused. Created for abi future proofing*/ +}; + +AsyncObject::AsyncObject() : QObject(nullptr), d {} { } + +AsyncObject::~AsyncObject() = default; + +std::pair> FormFieldSignature::validateAsync(ValidateOptions opt, const QDateTime &validationTime) const +{ + auto object = std::make_shared(); + FormWidgetSignature *fws = static_cast(m_formData->fm); + const time_t validationTimeT = validationTime.isValid() ? validationTime.toSecsSinceEpoch() : -1; + SignatureInfo *si = fws->validateSignatureAsync(opt & ValidateVerifyCertificate, opt & ValidateForceRevalidation, validationTimeT, !(opt & ValidateWithoutOCSPRevocationCheck), opt & ValidateUseAIACertFetch, + [obj = std::weak_ptr(object)]() { + if (auto l = obj.lock()) { + // We need to roundtrip over the eventloop + // to ensure callers have a chance of connecting to AsyncObject::done + QMetaObject::invokeMethod( + l.get(), + [innerObj = std::weak_ptr(l)]() { + if (auto innerLocked = innerObj.lock()) { + emit innerLocked->done(); + } + }, + Qt::QueuedConnection); + } + }); + + return { fromInternal(si, fws), object }; +} + +SignatureValidationInfo::CertificateStatus FormFieldSignature::validateResult() const +{ + return fromInternal(static_cast(m_formData->fm)->validateSignatureResult()); +} + +FormFieldSignature::SigningResult FormFieldSignature::sign(const QString &outputFileName, const PDFConverter::NewSignatureData &data) const +{ + FormWidgetSignature *fws = static_cast(m_formData->fm); + if (fws->signatureType() != unsigned_signature_field) { + return FieldAlreadySigned; + } + + Goffset file_size = 0; + const std::optional sig = fws->getCheckedSignature(&file_size); + if (sig) { + // the above unsigned_signature_field check + // should already catch this, but double check + return FieldAlreadySigned; + } + const auto reason = std::unique_ptr(data.reason().isEmpty() ? nullptr : QStringToUnicodeGooString(data.reason())); + const auto location = std::unique_ptr(data.location().isEmpty() ? nullptr : QStringToUnicodeGooString(data.location())); + const auto ownerPwd = std::optional(data.documentOwnerPassword().constData()); + const auto userPwd = std::optional(data.documentUserPassword().constData()); + const auto gSignatureText = std::unique_ptr(QStringToUnicodeGooString(data.signatureText())); + const auto gSignatureLeftText = std::unique_ptr(QStringToUnicodeGooString(data.signatureLeftText())); + + const bool success = fws->signDocumentWithAppearance(outputFileName.toStdString(), data.certNickname().toStdString(), data.password().toStdString(), reason.get(), location.get(), ownerPwd, userPwd, *gSignatureText, *gSignatureLeftText, + data.fontSize(), data.leftFontSize(), convertQColor(data.fontColor()), data.borderWidth(), convertQColor(data.borderColor()), convertQColor(data.backgroundColor())); + + return success ? SigningSuccess : GenericSigningError; +} + +bool hasNSSSupport() +{ +#ifdef ENABLE_NSS3 + return true; +#else + return false; +#endif +} + +QVector getAvailableSigningCertificates() +{ + auto backend = CryptoSign::Factory::createActive(); + if (!backend) { + return {}; + } + QVector vReturnCerts; + std::vector> vCerts = backend->getAvailableSigningCertificates(); + + for (auto &cert : vCerts) { + CertificateInfoPrivate *certPriv = createCertificateInfoPrivate(cert.get()); + vReturnCerts.append(CertificateInfo(certPriv)); + } + + return vReturnCerts; +} + +static std::optional convertToFrontend(std::optional type) +{ + if (!type) { + return std::nullopt; + } + switch (type.value()) { + case CryptoSign::Backend::Type::NSS3: + return CryptoSignBackend::NSS; + case CryptoSign::Backend::Type::GPGME: + return CryptoSignBackend::GPG; + } + return std::nullopt; +} + +static std::optional convertToBackend(std::optional backend) +{ + if (!backend) { + return std::nullopt; + } + + switch (backend.value()) { + case CryptoSignBackend::NSS: + return CryptoSign::Backend::Type::NSS3; + case CryptoSignBackend::GPG: + return CryptoSign::Backend::Type::GPGME; + } + return std::nullopt; +} + +QVector availableCryptoSignBackends() +{ + QVector backends; + for (auto &backend : CryptoSign::Factory::getAvailable()) { + auto converted = convertToFrontend(backend); + if (converted) { + backends.push_back(converted.value()); + } + } + return backends; +} + +std::optional activeCryptoSignBackend() +{ + return convertToFrontend(CryptoSign::Factory::getActive()); +} + +bool setActiveCryptoSignBackend(CryptoSignBackend backend) +{ + auto available = availableCryptoSignBackends(); + if (!available.contains(backend)) { + return false; + } + auto converted = convertToBackend(backend); + if (!converted) { + return false; + } + CryptoSign::Factory::setPreferredBackend(converted.value()); + return activeCryptoSignBackend() == backend; +} + +static bool hasNSSBackendFeature(CryptoSignBackendFeature feature) +{ + switch (feature) { + case CryptoSignBackendFeature::BackendAsksPassphrase: + return false; + } + return false; +} + +static bool hasGPGBackendFeature(CryptoSignBackendFeature feature) +{ + switch (feature) { + case CryptoSignBackendFeature::BackendAsksPassphrase: + return true; + } + return false; +} + +bool hasCryptoSignBackendFeature(CryptoSignBackend backend, CryptoSignBackendFeature feature) +{ + switch (backend) { + case CryptoSignBackend::NSS: + return hasNSSBackendFeature(feature); + case CryptoSignBackend::GPG: + return hasGPGBackendFeature(feature); + } + return false; +} + +QString POPPLER_QT6_EXPORT getNSSDir() +{ +#ifdef ENABLE_NSS3 + return QString::fromLocal8Bit(NSSSignatureConfiguration::getNSSDir().c_str()); +#else + return QString(); +#endif +} + +void setNSSDir(const QString &path) +{ +#ifdef ENABLE_NSS3 + if (path.isEmpty()) { + return; + } + + GooString *goo = QStringToGooString(path); + NSSSignatureConfiguration::setNSSDir(*goo); + delete goo; +#else + (void)path; +#endif +} + +namespace { +std::function nssPasswordCall; +} + +void setNSSPasswordCallback(const std::function &f) +{ +#ifdef ENABLE_NSS3 + NSSSignatureConfiguration::setNSSPasswordCallback(f); +#else + qWarning() << "setNSSPasswordCallback called but this poppler is built without NSS support"; + (void)f; +#endif +} +} diff --git a/poppler-24.05.0/qt6/src/poppler-form.h b/poppler-24.05.0/qt6/src/poppler-form.h new file mode 100644 index 0000000000000000000000000000000000000000..6c6fa754f6e7cc4f4905db4c028f2ae7ab3b9a6c --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-form.h @@ -0,0 +1,979 @@ +/* poppler-form.h: qt interface to poppler + * Copyright (C) 2007-2008, Pino Toscano + * Copyright (C) 2008, 2011, 2016, 2017, 2019-2022, Albert Astals Cid + * Copyright (C) 2012, Adam Reichold + * Copyright (C) 2016, Hanno Meyer-Thurow + * Copyright (C) 2017, Hans-Ulrich Jüttner + * Copyright (C) 2017, Tobias C. Berner + * Copyright (C) 2018, Andre Heinecke + * Copyright (C) 2018, Chinmoy Ranjan Pradhan + * Copyright (C) 2018, 2021 Oliver Sander + * Copyright (C) 2019 João Netto + * Copyright (C) 2019, Adrian Johnson + * Copyright (C) 2020, Thorsten Behrens + * Copyright (C) 2020, Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021, Theofilos Intzoglou + * Copyright (C) 2023, 2024, g10 Code GmbH, Author: Sune Stolborg Vuorela + * + * 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. + */ + +#ifndef _POPPLER_QT6_FORM_H_ +#define _POPPLER_QT6_FORM_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "poppler-export.h" +#include "poppler-annotation.h" +#include "poppler-qt6.h" + +class Object; +class Page; +class FormWidget; +class FormWidgetButton; +class FormWidgetText; +class FormWidgetChoice; +class FormWidgetSignature; + +namespace Poppler { + +class DocumentData; +class Link; + +class FormFieldData; +class FormFieldIconData; + +/** + The class containing the appearance information + */ + +class POPPLER_QT6_EXPORT FormFieldIcon +{ + + friend class FormFieldIconData; + +public: + explicit FormFieldIcon(FormFieldIconData *data); + FormFieldIcon(const FormFieldIcon &ffIcon); + ~FormFieldIcon(); + + FormFieldIcon &operator=(const FormFieldIcon &ffIcon); + +private: + FormFieldIconData *d_ptr; +}; +/** + The base class representing a form field. + */ +class POPPLER_QT6_EXPORT FormField +{ + + friend class FormFieldData; + +public: + /** + The different types of form field. + */ + enum FormType + { + FormButton, ///< A button field. See \ref Poppler::FormFieldButton::ButtonType "ButtonType" + FormText, ///< A text field. See \ref Poppler::FormFieldText::TextType "TextType" + FormChoice, ///< A single choice field. See \ref Poppler::FormFieldChoice::ChoiceType "ChoiceType" + FormSignature ///< A signature field. + }; + + virtual ~FormField(); + + /** + The type of the field. + */ + virtual FormType type() const = 0; + + /** + \return The size of the field, in normalized coordinates, i.e. + [0..1] with regard to the dimensions (cropbox) of the page + */ + QRectF rect() const; + + /** + The ID of the field. + */ + int id() const; + + /** + The internal name (T) of the field. + */ + QString name() const; + + /** + Sets the internal name (T) of the field. + */ + void setName(const QString &name) const; + + /** + The internal fully qualified name of the field. + */ + QString fullyQualifiedName() const; + + /** + The name of the field to be used in user interface (eg messages to + the user). + */ + QString uiName() const; + + /** + Whether this form field is read-only. + */ + bool isReadOnly() const; + + /** + Set whether this form field is read-only. + */ + void setReadOnly(bool value); + + /** + Whether this form field is visible. + */ + bool isVisible() const; + + /** + Set whether this form field is visible. + */ + void setVisible(bool value); + + /** + Whether this field is printable. + */ + bool isPrintable() const; + + /** + Set whether this field is printable. + */ + void setPrintable(bool value); + + /** + The activation action of this form field. + + \note It may be null. + */ + std::unique_ptr activationAction() const; + + /** + * Describes the flags from the form 'AA' dictionary. + */ + enum AdditionalActionType + { + FieldModified, ///< A JavaScript action to be performed when the user modifies the field + FormatField, ///< A JavaScript action to be performed before the field is formatted to display its value + ValidateField, ///< A JavaScript action to be performed when the field value changes + CalculateField, ///< A JavaScript action to be performed when the field needs to be recalculated + }; + /** + * Returns a given form additional action + */ + std::unique_ptr additionalAction(AdditionalActionType type) const; + + /** + * Returns a given widget annotation additional action + */ + std::unique_ptr additionalAction(Annotation::AdditionalActionType type) const; + +protected: + /// \cond PRIVATE + explicit FormField(std::unique_ptr dd); + + std::unique_ptr m_formData; + /// \endcond + +private: + Q_DISABLE_COPY(FormField) +}; + +/** + A form field that represents a "button". + */ +class POPPLER_QT6_EXPORT FormFieldButton : public FormField +{ +public: + /** + * The types of button field. + */ + enum ButtonType + { + Push, ///< A simple push button. + CheckBox, ///< A check box. + Radio ///< A radio button. + }; + + /// \cond PRIVATE + FormFieldButton(DocumentData *doc, ::Page *p, ::FormWidgetButton *w); + /// \endcond + ~FormFieldButton() override; + + FormType type() const override; + + /** + The particular type of the button field. + */ + ButtonType buttonType() const; + + /** + * The caption to be used for the button. + */ + QString caption() const; + + /** + * Gets the icon used by the button + */ + FormFieldIcon icon() const; + + /** + * Sets a new icon for the button, it has to be a icon + * returned by FormFieldButton::icon. + */ + void setIcon(const FormFieldIcon &icon); + + /** + The state of the button. + */ + bool state() const; + + /** + Sets the state of the button to the new \p state . + */ + void setState(bool state); + + /** + The list with the IDs of siblings (ie, buttons belonging to the same + group as the current one. + + Valid only for \ref Radio buttons, an empty list otherwise. + */ + QList siblings() const; + +private: + Q_DISABLE_COPY(FormFieldButton) +}; + +/** + A form field that represents a text input. + */ +class POPPLER_QT6_EXPORT FormFieldText : public FormField +{ +public: + /** + The particular type of this text field. + */ + enum TextType + { + Normal, ///< A simple singleline text field. + Multiline, ///< A multiline text field. + FileSelect ///< An input field to select the path of a file on disk. + }; + + /// \cond PRIVATE + FormFieldText(DocumentData *doc, ::Page *p, ::FormWidgetText *w); + /// \endcond + ~FormFieldText() override; + + FormType type() const override; + + /** + The text type of the text field. + */ + TextType textType() const; + + /** + The text associated with the text field. + */ + QString text() const; + + /** + Sets the text associated with the text field to the specified + \p text. + */ + void setText(const QString &text); + + /** + Sets the text inside the Appearance Stream to the specified + \p text + */ + void setAppearanceText(const QString &text); + + /** + Whether this text field is a password input, eg its text \b must be + replaced with asterisks. + + Always false for \ref FileSelect text fields. + */ + bool isPassword() const; + + /** + Whether this text field should allow rich text. + */ + bool isRichText() const; + + /** + The maximum length for the text of this field, or -1 if not set. + */ + int maximumLength() const; + + /** + The horizontal alignment for the text of this text field. + */ + Qt::Alignment textAlignment() const; + + /** + Whether the text inserted manually in the field (where possible) + can be spell-checked. + */ + bool canBeSpellChecked() const; + + /** + The font size of the text in the form field + */ + double getFontSize() const; + + /** + Set the font size of the text in the form field (currently only as integer) + */ + void setFontSize(int fontSize); + +private: + Q_DISABLE_COPY(FormFieldText) +}; + +/** + A form field that represents a choice field. + */ +class POPPLER_QT6_EXPORT FormFieldChoice : public FormField +{ +public: + /** + The particular type of this choice field. + */ + enum ChoiceType + { + ComboBox, ///< A simple singleline text field. + ListBox ///< A multiline text field. + }; + + /// \cond PRIVATE + FormFieldChoice(DocumentData *doc, ::Page *p, ::FormWidgetChoice *w); + /// \endcond + ~FormFieldChoice() override; + + FormType type() const override; + + /** + The choice type of the choice field. + */ + ChoiceType choiceType() const; + + /** + The possible choices of the choice field. + */ + QStringList choices() const; + + /** + The possible choices of the choice field. + The first value of the pair is the display name of the choice, + The second value is the export value (i.e. for use in javascript, etc) of the choice + */ + QVector> choicesWithExportValues() const; + + /** + Whether this FormFieldChoice::ComboBox is editable, i.e. the user + can type in a custom value. + + Always false for the other types of choices. + */ + bool isEditable() const; + + /** + Whether more than one choice of this FormFieldChoice::ListBox + can be selected at the same time. + + Always false for the other types of choices. + */ + bool multiSelect() const; + + /** + The currently selected choices. + */ + QList currentChoices() const; + + /** + Sets the selected choices to \p choice. + */ + void setCurrentChoices(const QList &choice); + + /** + The text entered into an editable combo box choice field. Otherwise a null string. + */ + QString editChoice() const; + + /** + Sets the text entered into an editable combo box choice field. Otherwise does nothing. + */ + void setEditChoice(const QString &text); + + /** + The horizontal alignment for the text of this text field. + */ + Qt::Alignment textAlignment() const; + + /** + Whether the text inserted manually in the field (where possible) + can be spell-checked. + + Returns false if the field is not an editable text field. + */ + bool canBeSpellChecked() const; + +private: + Q_DISABLE_COPY(FormFieldChoice) +}; + +/** + A helper class to store x509 certificate information. + */ +class CertificateInfoPrivate; +class POPPLER_QT6_EXPORT CertificateInfo +{ +public: + /** + The algorithm of public key. + */ + enum PublicKeyType + { + RsaKey, + DsaKey, + EcKey, + OtherKey + }; + + /** + Certificate key usage extensions. + */ + enum KeyUsageExtension + { + KuDigitalSignature = 0x80, + KuNonRepudiation = 0x40, + KuKeyEncipherment = 0x20, + KuDataEncipherment = 0x10, + KuKeyAgreement = 0x08, + KuKeyCertSign = 0x04, + KuClrSign = 0x02, + KuEncipherOnly = 0x01, + KuNone = 0x00 + }; + Q_DECLARE_FLAGS(KeyUsageExtensions, KeyUsageExtension) + + /** + Predefined keys for elements in an entity's distinguished name. + */ + enum EntityInfoKey + { + CommonName, + DistinguishedName, + EmailAddress, + Organization, + }; + + /** A signing key can be located in different places + sometimes. For the user, it might be easier to pick + the key located on a card if it has some visual + indicator that it is somehow removable. + + \note a keylocation for a certificate without a private + key (cannot be used for signing) will likely be "Unknown" + + \since 23.09 + */ + enum class KeyLocation + { + Unknown, /** We don't know the location */ + Other, /** We know the location, but it is somehow not covered by this enum */ + Computer, /** The key is on this computer */ + HardwareToken /** The key is on a dedicated hardware token, either a smartcard or a dedicated usb token (e.g. gnuk, nitrokey or yubikey) */ + }; + + CertificateInfo(); + explicit CertificateInfo(CertificateInfoPrivate *priv); + ~CertificateInfo(); + + /** + Returns true if certificate has no contents; otherwise returns false + */ + bool isNull() const; + + /** + The certificate version string. + */ + int version() const; + + /** + The certificate serial number. + */ + QByteArray serialNumber() const; + + /** + Information about the issuer. + */ + QString issuerInfo(EntityInfoKey key) const; + + /** + Information about the subject + */ + QString subjectInfo(EntityInfoKey key) const; + + /** + The certificate internal database nickname + + \since 21.01 + */ + QString nickName() const; + + /** + The date-time when certificate becomes valid. + */ + QDateTime validityStart() const; + + /** + The date-time when certificate expires. + */ + QDateTime validityEnd() const; + + /** + The uses allowed for the certificate. + */ + KeyUsageExtensions keyUsageExtensions() const; + + /** + The public key value. + */ + QByteArray publicKey() const; + + /** + The public key type. + */ + PublicKeyType publicKeyType() const; + + /** + The strength of public key in bits. + */ + int publicKeyStrength() const; + + /** + Returns true if certificate is self-signed otherwise returns false. + */ + bool isSelfSigned() const; + + /** + The DER encoded certificate. + */ + QByteArray certificateData() const; + + /** + Checks if the given password is the correct one for this certificate + + \since 21.01 + */ + bool checkPassword(const QString &password) const; + + /** + The storage location for this key + + \since 23.09 + */ + KeyLocation keyLocation() const; + + CertificateInfo(const CertificateInfo &other); + CertificateInfo &operator=(const CertificateInfo &other); + +private: + Q_DECLARE_PRIVATE(CertificateInfo) + + QSharedPointer d_ptr; +}; +Q_DECLARE_OPERATORS_FOR_FLAGS(CertificateInfo::KeyUsageExtensions) + +/** + A signature validation info helper class. + */ +class SignatureValidationInfoPrivate; +class POPPLER_QT6_EXPORT SignatureValidationInfo +{ +public: + /** + The verification result of the signature. + */ + enum SignatureStatus + { + SignatureValid, ///< The signature is cryptographically valid. + SignatureInvalid, ///< The signature is cryptographically invalid. + SignatureDigestMismatch, ///< The document content was changed after the signature was applied. + SignatureDecodingError, ///< The signature CMS/PKCS7 structure is malformed. + SignatureGenericError, ///< The signature could not be verified. + SignatureNotFound, ///< The requested signature is not present in the document. + SignatureNotVerified ///< The signature is not yet verified. + }; + + /** + The verification result of the certificate. + */ + enum CertificateStatus + { + CertificateTrusted, ///< The certificate is considered trusted. + CertificateUntrustedIssuer, ///< The issuer of this certificate has been marked as untrusted by the user. + CertificateUnknownIssuer, ///< The certificate trust chain has not finished in a trusted root certificate. + CertificateRevoked, ///< The certificate was revoked by the issuing certificate authority. + CertificateExpired, ///< The signing time is outside the validity bounds of this certificate. + CertificateGenericError, ///< The certificate could not be verified. + CertificateNotVerified, ///< The certificate is not yet verified. + CertificateVerificationInProgress ///< The certificate is not yet verified but is in progress in the background. See \ref validateAsync \since 24.05 + }; + + /** + The hash algorithm of the signature + */ + enum HashAlgorithm + { + HashAlgorithmUnknown, + HashAlgorithmMd2, + HashAlgorithmMd5, + HashAlgorithmSha1, + HashAlgorithmSha256, + HashAlgorithmSha384, + HashAlgorithmSha512, + HashAlgorithmSha224 + }; + + /// \cond PRIVATE + explicit SignatureValidationInfo(SignatureValidationInfoPrivate *priv); + /// \endcond + ~SignatureValidationInfo(); + + /** + The signature status of the signature. + */ + SignatureStatus signatureStatus() const; + + /** + The certificate status of the signature. + */ + CertificateStatus certificateStatus() const; + + /** + The signer name associated with the signature. + */ + QString signerName() const; + + /** + The signer subject distinguished name associated with the signature. + */ + QString signerSubjectDN() const; + + /** + Get signing location. + */ + QString location() const; + + /** + Get signing reason. + */ + QString reason() const; + + /** + The hash algorithm used for the signature. + */ + HashAlgorithm hashAlgorithm() const; + + /** + The signing time associated with the signature. + */ + time_t signingTime() const; + + /** + Get the signature binary data. + */ + QByteArray signature() const; + + /** + Get the bounds of the ranges of the document which are signed. + */ + QList signedRangeBounds() const; + + /** + Checks whether the signature authenticates the total document + except for the signature itself. + */ + bool signsTotalDocument() const; + + /** + The signer certificate info. + */ + CertificateInfo certificateInfo() const; + + SignatureValidationInfo(const SignatureValidationInfo &other); + SignatureValidationInfo &operator=(const SignatureValidationInfo &other); + +private: + Q_DECLARE_PRIVATE(SignatureValidationInfo) + friend class FormFieldSignature; + QSharedPointer d_ptr; +}; + +/** + * Object help waiting for some async event + * + * \since 24.05 + */ +class AsyncObjectPrivate; +class POPPLER_QT6_EXPORT AsyncObject : public QObject // clazy:exclude=ctor-missing-parent-argument +{ + Q_OBJECT +public: + /* Constructor. On purpose not having a QObject parameter + It will be returned by shared_ptr or unique_ptr + */ + AsyncObject(); + ~AsyncObject() override; +Q_SIGNALS: + void done(); +public Q_SLOTS: +private: + std::unique_ptr d; +}; + +/** + A form field that represents a signature. + */ +class POPPLER_QT6_EXPORT FormFieldSignature : public FormField +{ +public: + /** + The types of signature fields. + */ + enum SignatureType + { + UnknownSignatureType, + AdbePkcs7sha1, + AdbePkcs7detached, + EtsiCAdESdetached, + UnsignedSignature ///< \since 22.02 + }; + + /** + The validation options of this signature. + */ + enum ValidateOptions + { + ValidateVerifyCertificate = 1, ///< Validate the certificate. + ValidateForceRevalidation = 2, ///< Force revalidation of the certificate. + ValidateWithoutOCSPRevocationCheck = 4, ///< Do not contact OCSP servers to check for certificate revocation status \since 21.10 + ValidateUseAIACertFetch = 8 ///< Use the AIA extension for certificate fetching \since 21.10 + }; + + /// \cond PRIVATE + FormFieldSignature(DocumentData *doc, ::Page *p, ::FormWidgetSignature *w); + /// \endcond + ~FormFieldSignature() override; + + FormType type() const override; + + /** + The signature type + */ + SignatureType signatureType() const; + + /** + Validate the signature with now as validation time. + + Reset signature validatation info of scoped instance. + + \note depending on the backend, some options are only + partially respected. In case of the NSS backend, the two options + requiring network access, AIAFetch and OCSP, + can be toggled individually. In case of the GPG backend, if either + OCSP is used or AIAFetch is used, the other one is also used. + + \deprecated Please rewrite to the async version, that allows the network traffic part of fetching to happen in the background + */ + POPPLER_QT6_DEPRECATED SignatureValidationInfo validate(ValidateOptions opt) const; + + /** + Validate the signature with @p validationTime as validation time. + + Reset signature validatation info of scoped instance. + + \note depending on the backend, some options are only + partially respected. In case of the NSS backend, the two options + requiring network access, AIAFetch and OCSP, + can be toggled individually. In case of the GPG backend, if either + OCSP is used or AIAFetch is used, the other one is also used. + + \deprecated Please rewrite to the async version, that allows the network traffic part of fetching to happen in the background + */ + POPPLER_QT6_DEPRECATED SignatureValidationInfo validate(int opt, const QDateTime &validationTime) const; + + /** + Validate the signature with @p validationTime as validation time. + + Reset signature validatation info of scoped instance. + + \since 24.05 + + \note depending on the backend, some options are only + partially respected. In case of the NSS backend, the two options + requiring network access, AIAFetch and OCSP, + can be toggled individually. In case of the GPG backend, if either + OCSP is used or AIAFetch is used, the other one is also used. + + \note certificate validation will have started when this function return. See \ref validateResult on how to get certifcate validation + \note connections to \ref AsyncObject must happen by the caller + before returning control to the event loop, else signals is not guaranteed to be delivered + */ + std::pair> validateAsync(ValidateOptions opt, const QDateTime &validationTime = {}) const; + + /** + * \return the updated signature validation info from validateAsync + * \note that this function will block if the result is not yet ready. + * Wait for the \ref AsyncObject::done signal to avoid this function blocking on an inconvenient time + * + * \since 24.05 + */ + SignatureValidationInfo::CertificateStatus validateResult() const; + + /** + * \since 22.02 + */ + enum SigningResult + { + FieldAlreadySigned, ///< Trying to sign a field that is already signed + GenericSigningError, + SigningSuccess + }; + + /** + Signs a field of UnsignedSignature type. + + Ignores data.page(), data.fieldPartialName() and data.boundingRectangle() + + \since 22.02 + */ + SigningResult sign(const QString &outputFileName, const PDFConverter::NewSignatureData &data) const; + +private: + Q_DISABLE_COPY(FormFieldSignature) +}; +/** + * Possible compiled in backends for signature handling + * + * \since 23.06 + */ +enum class CryptoSignBackend +{ + NSS, + GPG +}; + +/** + * The available compiled-in backends + * + * \since 23.06 + */ +QVector POPPLER_QT6_EXPORT availableCryptoSignBackends(); + +/** + * Returns current active backend or nullopt if none is active + * + * \note there will always be an active backend if there is available backends + * + * \since 23.06 + */ +std::optional POPPLER_QT6_EXPORT activeCryptoSignBackend(); + +/** + * Sets active backend + * + * \return true on success + * + * \since 23.06 + */ +bool POPPLER_QT6_EXPORT setActiveCryptoSignBackend(CryptoSignBackend backend); + +enum class CryptoSignBackendFeature +{ + /// If the backend itself out of band requests passwords + /// or if the host applicaion somehow must do it + BackendAsksPassphrase +}; + +/** + * Queries if a backend supports or not supports a given feature. + * + * \since 23.06 + */ +bool POPPLER_QT6_EXPORT hasCryptoSignBackendFeature(CryptoSignBackend, CryptoSignBackendFeature); + +/** + Returns is poppler was compiled with NSS support + + \deprecated Use availableBackends instead + + \since 21.01 +*/ +bool POPPLER_QT6_DEPRECATED POPPLER_QT6_EXPORT hasNSSSupport(); + +/** + Return vector of suitable signing certificates + + \since 21.01 +*/ +QVector POPPLER_QT6_EXPORT getAvailableSigningCertificates(); + +/** + Gets the current NSS CertDB directory + + \since 21.01 +*/ +QString POPPLER_QT6_EXPORT getNSSDir(); + +/** + Set a custom NSS CertDB directory. Needs to be called before doing any other signature operation + + \since 21.01 +*/ +void POPPLER_QT6_EXPORT setNSSDir(const QString &pathURL); + +/** + Sets the callback for NSS password requests + + \since 21.01 +*/ +void POPPLER_QT6_EXPORT setNSSPasswordCallback(const std::function &f); +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-link-extractor-private.h b/poppler-24.05.0/qt6/src/poppler-link-extractor-private.h new file mode 100644 index 0000000000000000000000000000000000000000..b36a3cc077a37016d331f357fd810240d8c37848 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-link-extractor-private.h @@ -0,0 +1,61 @@ +/* poppler-link-extractor_p.h: qt interface to poppler + * Copyright (C) 2007, 2008, 2011, Pino Toscano + * Copyright (C) 2021, Oliver Sander + * Copyright (C) 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef _POPPLER_LINK_EXTRACTOR_H_ +#define _POPPLER_LINK_EXTRACTOR_H_ + +#include +#include + +#include +#include + +#include + +namespace Poppler { + +class Link; +class PageData; + +class LinkExtractorOutputDev : public OutputDev +{ +public: + explicit LinkExtractorOutputDev(PageData *data); + ~LinkExtractorOutputDev() override; + + // inherited from OutputDev + bool upsideDown() override { return false; } + bool useDrawChar() override { return false; } + bool interpretType3Chars() override { return false; } + void processLink(::AnnotLink *link) override; + + // our stuff + std::vector> links(); + +private: + PageData *m_data; + double m_pageCropWidth; + double m_pageCropHeight; + std::vector> m_links; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-link-extractor.cc b/poppler-24.05.0/qt6/src/poppler-link-extractor.cc new file mode 100644 index 0000000000000000000000000000000000000000..32bd6b3f4e8a9737355cb5cfb0ada0c665f11743 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-link-extractor.cc @@ -0,0 +1,79 @@ +/* poppler-link-extractor_p.h: qt interface to poppler + * Copyright (C) 2007, 2008, 2011, Pino Toscano + * Copyright (C) 2008, Albert Astals Cid + * Copyright (C) 2021, Oliver Sander + * + * 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-link-extractor-private.h" + +#include +#include +#include +#include +#include + +#include "poppler-qt6.h" +#include "poppler-page-private.h" + +namespace Poppler { + +LinkExtractorOutputDev::LinkExtractorOutputDev(PageData *data) : m_data(data) +{ + Q_ASSERT(m_data); + ::Page *popplerPage = m_data->page; + m_pageCropWidth = popplerPage->getCropWidth(); + m_pageCropHeight = popplerPage->getCropHeight(); + if (popplerPage->getRotate() == 90 || popplerPage->getRotate() == 270) { + qSwap(m_pageCropWidth, m_pageCropHeight); + } + GfxState gfxState(72.0, 72.0, popplerPage->getCropBox(), popplerPage->getRotate(), true); + setDefaultCTM(gfxState.getCTM()); +} + +LinkExtractorOutputDev::~LinkExtractorOutputDev() { } + +void LinkExtractorOutputDev::processLink(::AnnotLink *link) +{ + if (!link->isOk()) { + return; + } + + double left, top, right, bottom; + int leftAux, topAux, rightAux, bottomAux; + link->getRect(&left, &top, &right, &bottom); + QRectF linkArea; + + cvtUserToDev(left, top, &leftAux, &topAux); + cvtUserToDev(right, bottom, &rightAux, &bottomAux); + linkArea.setLeft((double)leftAux / m_pageCropWidth); + linkArea.setTop((double)topAux / m_pageCropHeight); + linkArea.setRight((double)rightAux / m_pageCropWidth); + linkArea.setBottom((double)bottomAux / m_pageCropHeight); + + std::unique_ptr popplerLink = m_data->convertLinkActionToLink(link->getAction(), linkArea); + if (popplerLink) { + m_links.push_back(std::move(popplerLink)); + } + OutputDev::processLink(link); +} + +std::vector> LinkExtractorOutputDev::links() +{ + return std::move(m_links); +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-link-private.h b/poppler-24.05.0/qt6/src/poppler-link-private.h new file mode 100644 index 0000000000000000000000000000000000000000..edf334b3ea00e9a53b466bf3e2ec29be33b0712d --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-link-private.h @@ -0,0 +1,72 @@ +/* poppler-link-private.h: qt interface to poppler + * Copyright (C) 2016, 2018, 2020, 2021 Albert Astals Cid + * Copyright (C) 2018 Intevation GmbH + * Copyright (C) 2020, 2021 Oliver Sander + * + * 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. + */ + +#ifndef _POPPLER_LINK_PRIVATE_H_ +#define _POPPLER_LINK_PRIVATE_H_ + +#include + +#include "Link.h" + +class LinkOCGState; + +namespace Poppler { + +class Link; + +class LinkPrivate +{ +public: + explicit LinkPrivate(const QRectF &area) : linkArea(area) { } + + virtual ~LinkPrivate(); + + static LinkPrivate *get(Link *link) { return link->d_ptr; } + + LinkPrivate(const LinkPrivate &) = delete; + LinkPrivate &operator=(const LinkPrivate &) = delete; + + QRectF linkArea; + std::vector> nextLinks; +}; + +class LinkOCGStatePrivate : public LinkPrivate +{ +public: + LinkOCGStatePrivate(const QRectF &area, const std::vector<::LinkOCGState::StateList> &sList, bool pRB) : LinkPrivate(area), stateList(sList), preserveRB(pRB) { } + ~LinkOCGStatePrivate() override; + + std::vector<::LinkOCGState::StateList> stateList; + bool preserveRB; +}; + +class LinkHidePrivate : public LinkPrivate +{ +public: + LinkHidePrivate(const QRectF &area, const QString &tName, bool show) : LinkPrivate(area), targetName(tName), isShow(show) { } + ~LinkHidePrivate() override; + + QString targetName; + bool isShow; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-link.cc b/poppler-24.05.0/qt6/src/poppler-link.cc new file mode 100644 index 0000000000000000000000000000000000000000..deb5a79ace418c496f48b63a393f8f89e4364612 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-link.cc @@ -0,0 +1,698 @@ +/* poppler-link.cc: qt interface to poppler + * Copyright (C) 2006-2007, 2013, 2016-2021, Albert Astals Cid + * Copyright (C) 2007-2008, Pino Toscano + * Copyright (C) 2010 Hib Eris + * Copyright (C) 2012, Tobias Koenig + * Copyright (C) 2012, Guillermo A. Amaral B. + * Copyright (C) 2018 Intevation GmbH + * Copyright (C) 2018 Adam Reichold + * Copyright (C) 2020, 2021 Oliver Sander + * Adapting code from + * Copyright (C) 2004 by Enrico Ros + * + * 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 +#include +#include +#include + +#include + +#include "poppler-annotation-private.h" + +#include "Link.h" +#include "Rendition.h" + +namespace Poppler { + +class LinkDestinationPrivate : public QSharedData +{ +public: + LinkDestinationPrivate(); + + LinkDestination::Kind kind; // destination type + QString name; + int pageNum; // page number + double left, bottom; // position + double right, top; + double zoom; // zoom factor + bool changeLeft : 1, changeTop : 1; // for destXYZ links, which position + bool changeZoom : 1; // components to change +}; + +LinkDestinationPrivate::LinkDestinationPrivate() +{ + // sane defaults + kind = LinkDestination::destXYZ; + pageNum = 0; + left = 0; + bottom = 0; + right = 0; + top = 0; + zoom = 1; + changeLeft = true; + changeTop = true; + changeZoom = false; +} + +LinkPrivate::~LinkPrivate() = default; + +LinkOCGStatePrivate::~LinkOCGStatePrivate() = default; + +LinkHidePrivate::~LinkHidePrivate() = default; + +class LinkGotoPrivate : public LinkPrivate +{ +public: + LinkGotoPrivate(const QRectF &area, const LinkDestination &dest); + ~LinkGotoPrivate() override; + + QString extFileName; + LinkDestination destination; +}; + +LinkGotoPrivate::LinkGotoPrivate(const QRectF &area, const LinkDestination &dest) : LinkPrivate(area), destination(dest) { } + +LinkGotoPrivate::~LinkGotoPrivate() = default; + +class LinkExecutePrivate : public LinkPrivate +{ +public: + explicit LinkExecutePrivate(const QRectF &area); + ~LinkExecutePrivate() override; + + QString fileName; + QString parameters; +}; + +LinkExecutePrivate::LinkExecutePrivate(const QRectF &area) : LinkPrivate(area) { } + +LinkExecutePrivate::~LinkExecutePrivate() = default; + +class LinkBrowsePrivate : public LinkPrivate +{ +public: + explicit LinkBrowsePrivate(const QRectF &area); + ~LinkBrowsePrivate() override; + + QString url; +}; + +LinkBrowsePrivate::LinkBrowsePrivate(const QRectF &area) : LinkPrivate(area) { } + +LinkBrowsePrivate::~LinkBrowsePrivate() = default; + +class LinkActionPrivate : public LinkPrivate +{ +public: + explicit LinkActionPrivate(const QRectF &area); + ~LinkActionPrivate() override; + + LinkAction::ActionType type; +}; + +LinkActionPrivate::LinkActionPrivate(const QRectF &area) : LinkPrivate(area) { } + +LinkActionPrivate::~LinkActionPrivate() = default; + +class LinkSoundPrivate : public LinkPrivate +{ +public: + explicit LinkSoundPrivate(const QRectF &area); + ~LinkSoundPrivate() override; + + double volume; + bool sync : 1; + bool repeat : 1; + bool mix : 1; + SoundObject *sound; +}; + +LinkSoundPrivate::LinkSoundPrivate(const QRectF &area) : LinkPrivate(area), sound(nullptr) { } + +LinkSoundPrivate::~LinkSoundPrivate() +{ + delete sound; +} + +class LinkRenditionPrivate : public LinkPrivate +{ +public: + LinkRenditionPrivate(const QRectF &area, ::MediaRendition *rendition, ::LinkRendition::RenditionOperation operation, const QString &script, const Ref ref); + ~LinkRenditionPrivate() override; + + MediaRendition *rendition; + LinkRendition::RenditionAction action; + QString script; + Ref annotationReference; +}; + +LinkRenditionPrivate::LinkRenditionPrivate(const QRectF &area, ::MediaRendition *r, ::LinkRendition::RenditionOperation operation, const QString &javaScript, const Ref ref) + : LinkPrivate(area), rendition(r ? new MediaRendition(r) : nullptr), action(LinkRendition::PlayRendition), script(javaScript), annotationReference(ref) +{ + switch (operation) { + case ::LinkRendition::NoRendition: + action = LinkRendition::NoRendition; + break; + case ::LinkRendition::PlayRendition: + action = LinkRendition::PlayRendition; + break; + case ::LinkRendition::StopRendition: + action = LinkRendition::StopRendition; + break; + case ::LinkRendition::PauseRendition: + action = LinkRendition::PauseRendition; + break; + case ::LinkRendition::ResumeRendition: + action = LinkRendition::ResumeRendition; + break; + } +} + +LinkRenditionPrivate::~LinkRenditionPrivate() +{ + delete rendition; +} + +class LinkJavaScriptPrivate : public LinkPrivate +{ +public: + explicit LinkJavaScriptPrivate(const QRectF &area); + ~LinkJavaScriptPrivate() override; + + QString js; +}; + +LinkJavaScriptPrivate::LinkJavaScriptPrivate(const QRectF &area) : LinkPrivate(area) { } + +LinkJavaScriptPrivate::~LinkJavaScriptPrivate() = default; + +class LinkMoviePrivate : public LinkPrivate +{ +public: + LinkMoviePrivate(const QRectF &area, LinkMovie::Operation operation, const QString &title, const Ref reference); + ~LinkMoviePrivate() override; + + LinkMovie::Operation operation; + QString annotationTitle; + Ref annotationReference; +}; + +LinkMoviePrivate::LinkMoviePrivate(const QRectF &area, LinkMovie::Operation _operation, const QString &title, const Ref reference) : LinkPrivate(area), operation(_operation), annotationTitle(title), annotationReference(reference) { } + +LinkMoviePrivate::~LinkMoviePrivate() = default; + +static void cvtUserToDev(::Page *page, double xu, double yu, int *xd, int *yd) +{ + double ctm[6]; + + page->getDefaultCTM(ctm, 72.0, 72.0, 0, false, true); + *xd = (int)(ctm[0] * xu + ctm[2] * yu + ctm[4] + 0.5); + *yd = (int)(ctm[1] * xu + ctm[3] * yu + ctm[5] + 0.5); +} + +LinkDestination::LinkDestination(const LinkDestinationData &data) : d(new LinkDestinationPrivate) +{ + bool deleteDest = false; + const LinkDest *ld = data.ld; + + if (data.namedDest && !ld && !data.externalDest) { + deleteDest = true; + ld = data.doc->doc->findDest(data.namedDest).release(); + } + // in case this destination was named one, and it was not resolved + if (data.namedDest && !ld) { + d->name = QString::fromLatin1(data.namedDest->c_str()); + } + + if (!ld) { + return; + } + + if (ld->getKind() == ::destXYZ) { + d->kind = destXYZ; + } else if (ld->getKind() == ::destFit) { + d->kind = destFit; + } else if (ld->getKind() == ::destFitH) { + d->kind = destFitH; + } else if (ld->getKind() == ::destFitV) { + d->kind = destFitV; + } else if (ld->getKind() == ::destFitR) { + d->kind = destFitR; + } else if (ld->getKind() == ::destFitB) { + d->kind = destFitB; + } else if (ld->getKind() == ::destFitBH) { + d->kind = destFitBH; + } else if (ld->getKind() == ::destFitBV) { + d->kind = destFitBV; + } + + if (!ld->isPageRef()) { + d->pageNum = ld->getPageNum(); + } else { + const Ref ref = ld->getPageRef(); + d->pageNum = data.doc->doc->findPage(ref); + } + double left = ld->getLeft(); + double bottom = ld->getBottom(); + double right = ld->getRight(); + double top = ld->getTop(); + d->zoom = ld->getZoom(); + d->changeLeft = ld->getChangeLeft(); + d->changeTop = ld->getChangeTop(); + d->changeZoom = ld->getChangeZoom(); + + int leftAux = 0, topAux = 0, rightAux = 0, bottomAux = 0; + + if (!data.externalDest) { + ::Page *page; + if (d->pageNum > 0 && d->pageNum <= data.doc->doc->getNumPages() && (page = data.doc->doc->getPage(d->pageNum))) { + cvtUserToDev(page, left, top, &leftAux, &topAux); + cvtUserToDev(page, right, bottom, &rightAux, &bottomAux); + + d->left = leftAux / (double)page->getCropWidth(); + d->top = topAux / (double)page->getCropHeight(); + d->right = rightAux / (double)page->getCropWidth(); + d->bottom = bottomAux / (double)page->getCropHeight(); + } else { + d->pageNum = 0; + } + } + + if (deleteDest) { + delete ld; + } +} + +LinkDestination::LinkDestination(const QString &description) : d(new LinkDestinationPrivate) +{ + const QStringList tokens = description.split(';'); + if (tokens.size() >= 10) { + d->kind = static_cast(tokens.at(0).toInt()); + d->pageNum = tokens.at(1).toInt(); + d->left = tokens.at(2).toDouble(); + d->bottom = tokens.at(3).toDouble(); + d->right = tokens.at(4).toDouble(); + d->top = tokens.at(5).toDouble(); + d->zoom = tokens.at(6).toDouble(); + d->changeLeft = static_cast(tokens.at(7).toInt()); + d->changeTop = static_cast(tokens.at(8).toInt()); + d->changeZoom = static_cast(tokens.at(9).toInt()); + } +} + +LinkDestination::LinkDestination(const LinkDestination &other) : d(other.d) { } + +LinkDestination::~LinkDestination() { } + +LinkDestination::Kind LinkDestination::kind() const +{ + return d->kind; +} + +int LinkDestination::pageNumber() const +{ + return d->pageNum; +} + +double LinkDestination::left() const +{ + return d->left; +} + +double LinkDestination::bottom() const +{ + return d->bottom; +} + +double LinkDestination::right() const +{ + return d->right; +} + +double LinkDestination::top() const +{ + return d->top; +} + +double LinkDestination::zoom() const +{ + return d->zoom; +} + +bool LinkDestination::isChangeLeft() const +{ + return d->changeLeft; +} + +bool LinkDestination::isChangeTop() const +{ + return d->changeTop; +} + +bool LinkDestination::isChangeZoom() const +{ + return d->changeZoom; +} + +QString LinkDestination::toString() const +{ + QString s = QString::number((qint8)d->kind); + s += ";" + QString::number(d->pageNum); + s += ";" + QString::number(d->left); + s += ";" + QString::number(d->bottom); + s += ";" + QString::number(d->right); + s += ";" + QString::number(d->top); + s += ";" + QString::number(d->zoom); + s += ";" + QString::number((qint8)d->changeLeft); + s += ";" + QString::number((qint8)d->changeTop); + s += ";" + QString::number((qint8)d->changeZoom); + return s; +} + +QString LinkDestination::destinationName() const +{ + return d->name; +} + +LinkDestination &LinkDestination::operator=(const LinkDestination &other) +{ + if (this == &other) { + return *this; + } + + d = other.d; + return *this; +} + +// Link +Link::~Link() +{ + delete d_ptr; +} + +Link::Link(const QRectF &linkArea) : d_ptr(new LinkPrivate(linkArea)) { } + +Link::Link(LinkPrivate &dd) : d_ptr(&dd) { } + +Link::LinkType Link::linkType() const +{ + return None; +} + +QRectF Link::linkArea() const +{ + Q_D(const Link); + return d->linkArea; +} + +QVector Link::nextLinks() const +{ + QVector links(d_ptr->nextLinks.size()); + for (qsizetype i = 0; i < links.size(); i++) { + links[i] = d_ptr->nextLinks[i].get(); + } + + return links; +} + +// LinkGoto +LinkGoto::LinkGoto(const QRectF &linkArea, const QString &extFileName, const LinkDestination &destination) : Link(*new LinkGotoPrivate(linkArea, destination)) +{ + Q_D(LinkGoto); + d->extFileName = extFileName; +} + +LinkGoto::~LinkGoto() { } + +bool LinkGoto::isExternal() const +{ + Q_D(const LinkGoto); + return !d->extFileName.isEmpty(); +} + +QString LinkGoto::fileName() const +{ + Q_D(const LinkGoto); + return d->extFileName; +} + +LinkDestination LinkGoto::destination() const +{ + Q_D(const LinkGoto); + return d->destination; +} + +Link::LinkType LinkGoto::linkType() const +{ + return Goto; +} + +// LinkExecute +LinkExecute::LinkExecute(const QRectF &linkArea, const QString &file, const QString ¶ms) : Link(*new LinkExecutePrivate(linkArea)) +{ + Q_D(LinkExecute); + d->fileName = file; + d->parameters = params; +} + +LinkExecute::~LinkExecute() { } + +QString LinkExecute::fileName() const +{ + Q_D(const LinkExecute); + return d->fileName; +} +QString LinkExecute::parameters() const +{ + Q_D(const LinkExecute); + return d->parameters; +} + +Link::LinkType LinkExecute::linkType() const +{ + return Execute; +} + +// LinkBrowse +LinkBrowse::LinkBrowse(const QRectF &linkArea, const QString &url) : Link(*new LinkBrowsePrivate(linkArea)) +{ + Q_D(LinkBrowse); + d->url = url; +} + +LinkBrowse::~LinkBrowse() { } + +QString LinkBrowse::url() const +{ + Q_D(const LinkBrowse); + return d->url; +} + +Link::LinkType LinkBrowse::linkType() const +{ + return Browse; +} + +// LinkAction +LinkAction::LinkAction(const QRectF &linkArea, ActionType actionType) : Link(*new LinkActionPrivate(linkArea)) +{ + Q_D(LinkAction); + d->type = actionType; +} + +LinkAction::~LinkAction() { } + +LinkAction::ActionType LinkAction::actionType() const +{ + Q_D(const LinkAction); + return d->type; +} + +Link::LinkType LinkAction::linkType() const +{ + return Action; +} + +// LinkSound +LinkSound::LinkSound(const QRectF &linkArea, double volume, bool sync, bool repeat, bool mix, SoundObject *sound) : Link(*new LinkSoundPrivate(linkArea)) +{ + Q_D(LinkSound); + d->volume = volume; + d->sync = sync; + d->repeat = repeat; + d->mix = mix; + d->sound = sound; +} + +LinkSound::~LinkSound() { } + +Link::LinkType LinkSound::linkType() const +{ + return Sound; +} + +double LinkSound::volume() const +{ + Q_D(const LinkSound); + return d->volume; +} + +bool LinkSound::synchronous() const +{ + Q_D(const LinkSound); + return d->sync; +} + +bool LinkSound::repeat() const +{ + Q_D(const LinkSound); + return d->repeat; +} + +bool LinkSound::mix() const +{ + Q_D(const LinkSound); + return d->mix; +} + +SoundObject *LinkSound::sound() const +{ + Q_D(const LinkSound); + return d->sound; +} + +// LinkRendition +LinkRendition::LinkRendition(const QRectF &linkArea, ::MediaRendition *rendition, int operation, const QString &script, const Ref annotationReference) + : Link(*new LinkRenditionPrivate(linkArea, rendition, static_cast(operation), script, annotationReference)) +{ +} + +LinkRendition::~LinkRendition() { } + +Link::LinkType LinkRendition::linkType() const +{ + return Rendition; +} + +MediaRendition *LinkRendition::rendition() const +{ + Q_D(const LinkRendition); + return d->rendition; +} + +LinkRendition::RenditionAction LinkRendition::action() const +{ + Q_D(const LinkRendition); + return d->action; +} + +QString LinkRendition::script() const +{ + Q_D(const LinkRendition); + return d->script; +} + +bool LinkRendition::isReferencedAnnotation(const ScreenAnnotation *annotation) const +{ + Q_D(const LinkRendition); + if (d->annotationReference != Ref::INVALID() && d->annotationReference == annotation->d_ptr->pdfObjectReference()) { + return true; + } + + return false; +} + +// LinkJavaScript +LinkJavaScript::LinkJavaScript(const QRectF &linkArea, const QString &js) : Link(*new LinkJavaScriptPrivate(linkArea)) +{ + Q_D(LinkJavaScript); + d->js = js; +} + +LinkJavaScript::~LinkJavaScript() { } + +Link::LinkType LinkJavaScript::linkType() const +{ + return JavaScript; +} + +QString LinkJavaScript::script() const +{ + Q_D(const LinkJavaScript); + return d->js; +} + +// LinkMovie +LinkMovie::LinkMovie(const QRectF &linkArea, Operation operation, const QString &annotationTitle, const Ref annotationReference) : Link(*new LinkMoviePrivate(linkArea, operation, annotationTitle, annotationReference)) { } + +LinkMovie::~LinkMovie() { } + +Link::LinkType LinkMovie::linkType() const +{ + return Movie; +} + +LinkMovie::Operation LinkMovie::operation() const +{ + Q_D(const LinkMovie); + return d->operation; +} + +bool LinkMovie::isReferencedAnnotation(const MovieAnnotation *annotation) const +{ + Q_D(const LinkMovie); + if (d->annotationReference != Ref::INVALID() && d->annotationReference == annotation->d_ptr->pdfObjectReference()) { + return true; + } else if (!d->annotationTitle.isNull()) { + return (annotation->movieTitle() == d->annotationTitle); + } + + return false; +} + +LinkOCGState::LinkOCGState(LinkOCGStatePrivate *ocgp) : Link(*ocgp) { } + +LinkOCGState::~LinkOCGState() { } + +Link::LinkType LinkOCGState::linkType() const +{ + return OCGState; +} + +// LinkHide +LinkHide::LinkHide(LinkHidePrivate *lhidep) : Link(*lhidep) { } + +LinkHide::~LinkHide() { } + +Link::LinkType LinkHide::linkType() const +{ + return Hide; +} + +QVector LinkHide::targets() const +{ + Q_D(const LinkHide); + return QVector() << d->targetName; +} + +bool LinkHide::isShowAction() const +{ + Q_D(const LinkHide); + return d->isShow; +} +} diff --git a/poppler-24.05.0/qt6/src/poppler-link.h b/poppler-24.05.0/qt6/src/poppler-link.h new file mode 100644 index 0000000000000000000000000000000000000000..52065a2e6a2a44d55967a1ee74d83855ce202fad --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-link.h @@ -0,0 +1,660 @@ +/* poppler-link.h: qt interface to poppler + * Copyright (C) 2006, 2013, 2016, 2018, 2019, 2021, 2022, Albert Astals Cid + * Copyright (C) 2007-2008, 2010, Pino Toscano + * Copyright (C) 2010, 2012, Guillermo Amaral + * Copyright (C) 2012, Tobias Koenig + * Copyright (C) 2013, Anthony Granger + * Copyright (C) 2018 Intevation GmbH + * Copyright (C) 2020, 2021 Oliver Sander + * Adapting code from + * Copyright (C) 2004 by Enrico Ros + * + * 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. + */ + +#ifndef _POPPLER_LINK_H_ +#define _POPPLER_LINK_H_ + +#include +#include +#include +#include +#include "poppler-export.h" + +struct Ref; +class MediaRendition; + +namespace Poppler { + +class LinkPrivate; +class LinkGotoPrivate; +class LinkExecutePrivate; +class LinkBrowsePrivate; +class LinkActionPrivate; +class LinkSoundPrivate; +class LinkJavaScriptPrivate; +class LinkMoviePrivate; +class LinkDestinationData; +class LinkDestinationPrivate; +class LinkRenditionPrivate; +class LinkOCGStatePrivate; +class LinkHidePrivate; +class MediaRendition; +class MovieAnnotation; +class ScreenAnnotation; +class SoundObject; + +/** + * \short A destination. + * + * The LinkDestination class represent a "destination" (in terms of visual + * viewport to be displayed) for \link Poppler::LinkGoto GoTo\endlink links, + * and items in the table of contents (TOC) of a document. + * + * Coordinates are in 0..1 range + */ +class POPPLER_QT6_EXPORT LinkDestination +{ +public: + /** + * The possible kind of "viewport destination". + */ + enum Kind + { + /** + * The new viewport is specified in terms of: + * - possible new left coordinate (see isChangeLeft() ) + * - possible new top coordinate (see isChangeTop() ) + * - possible new zoom level (see isChangeZoom() ) + */ + destXYZ = 1, + destFit = 2, + destFitH = 3, + destFitV = 4, + destFitR = 5, + destFitB = 6, + destFitBH = 7, + destFitBV = 8 + }; + + /// \cond PRIVATE + explicit LinkDestination(const LinkDestinationData &data); + explicit LinkDestination(const QString &description); + /// \endcond + /** + * Copy constructor. + */ + LinkDestination(const LinkDestination &other); + /** + * Destructor. + */ + ~LinkDestination(); + + // Accessors. + /** + * The kind of destination. + */ + Kind kind() const; + /** + * Which page is the target of this destination. + * + * \note this number is 1-based, so for a 5 pages document the + * valid page numbers go from 1 to 5 (both included). + */ + int pageNumber() const; + /** + * The new left for the viewport of the target page, in case + * it is specified to be changed (see isChangeLeft() ) + */ + double left() const; + double bottom() const; + double right() const; + /** + * The new top for the viewport of the target page, in case + * it is specified to be changed (see isChangeTop() ) + */ + double top() const; + double zoom() const; + /** + * Whether the left of the viewport on the target page should + * be changed. + * + * \see left() + */ + bool isChangeLeft() const; + /** + * Whether the top of the viewport on the target page should + * be changed. + * + * \see top() + */ + bool isChangeTop() const; + /** + * Whether the zoom level should be changed. + * + * \see zoom() + */ + bool isChangeZoom() const; + + /** + * Return a string repesentation of this destination. + */ + QString toString() const; + + /** + * Return the name of this destination. + */ + QString destinationName() const; + + /** + * Assignment operator. + */ + LinkDestination &operator=(const LinkDestination &other); + +private: + QSharedDataPointer d; +}; + +/** + * \short Encapsulates data that describes a link. + * + * This is the base class for links. It makes mandatory for inherited + * kind of links to reimplement the linkType() method and return the type of + * the link described by the reimplemented class. + */ +class POPPLER_QT6_EXPORT Link +{ +public: + /// \cond PRIVATE + explicit Link(const QRectF &linkArea); + /// \endcond + + /** + * The possible kinds of link. + * + * Inherited classes must return an unique identifier + */ + enum LinkType + { + None, ///< Unknown link + Goto, ///< A "Go To" link + Execute, ///< A command to be executed + Browse, ///< An URL to be browsed (eg "http://poppler.freedesktop.org") + Action, ///< A "standard" action to be executed in the viewer + Sound, ///< A link representing a sound to be played + Movie, ///< An action to be executed on a movie + Rendition, ///< A rendition link + JavaScript, ///< A JavaScript code to be interpreted + OCGState, ///< An Optional Content Group state change + Hide, ///< An action to hide a field + }; + + /** + * The type of this link. + */ + virtual LinkType linkType() const; + + /** + * Destructor. + */ + virtual ~Link(); + + /** + * The area of a Page where the link should be active. + * + * \note this can be a null rect, in this case the link represents + * a general action. The area is given in 0..1 range + */ + QRectF linkArea() const; + + /** + * Get the next links to be activated / executed after this link. + * + * \note The caller does not get ownership of the returned objects. + */ + QVector nextLinks() const; + +protected: + /// \cond PRIVATE + explicit Link(LinkPrivate &dd); + Q_DECLARE_PRIVATE(Link) + LinkPrivate *d_ptr; + /// \endcond + +private: + Q_DISABLE_COPY(Link) +}; + +/** + * \brief Viewport reaching request. + * + * With a LinkGoto link, the document requests the specified viewport to be + * reached (aka, displayed in a viewer). Furthermore, if a file name is specified, + * then the destination refers to that document (and not to the document the + * current LinkGoto belongs to). + */ +class POPPLER_QT6_EXPORT LinkGoto : public Link +{ +public: + /** + * Create a new Goto link. + * + * \param linkArea the active area of the link + * \param extFileName if not empty, the file name to be open + * \param destination the destination to be reached + */ + LinkGoto(const QRectF &linkArea, const QString &extFileName, const LinkDestination &destination); + /** + * Destructor. + */ + ~LinkGoto() override; + + /** + * Whether the destination is in an external document + * (i.e. not the current document) + */ + bool isExternal() const; + // query for goto parameters + /** + * The file name of the document the destination() refers to, + * or an empty string in case it refers to the current document. + */ + QString fileName() const; + /** + * The destination to reach. + */ + LinkDestination destination() const; + LinkType linkType() const override; + +private: + Q_DECLARE_PRIVATE(LinkGoto) + Q_DISABLE_COPY(LinkGoto) +}; + +/** + * \brief Generic execution request. + * + * The LinkExecute link represent a "file name" execution request. The result + * depends on the \link fileName() file name\endlink: + * - if it is a document, then it is requested to be open + * - otherwise, it represents an executable to be run with the specified parameters + */ +class POPPLER_QT6_EXPORT LinkExecute : public Link +{ +public: + /** + * The file name to be executed + */ + QString fileName() const; + /** + * The parameters for the command. + */ + QString parameters() const; + + /** + * Create a new Execute link. + * + * \param linkArea the active area of the link + * \param file the file name to be open, or the program to be execute + * \param params the parameters for the program to execute + */ + LinkExecute(const QRectF &linkArea, const QString &file, const QString ¶ms); + /** + * Destructor. + */ + ~LinkExecute() override; + LinkType linkType() const override; + +private: + Q_DECLARE_PRIVATE(LinkExecute) + Q_DISABLE_COPY(LinkExecute) +}; + +/** + * \brief An URL to browse. + * + * The LinkBrowse link holds a URL (eg 'http://poppler.freedesktop.org', + * 'mailto:john@some.org', etc) to be open. + * + * The format of the URL is specified by RFC 2396 (http://www.ietf.org/rfc/rfc2396.txt) + */ +class POPPLER_QT6_EXPORT LinkBrowse : public Link +{ +public: + /** + * The URL to open + */ + QString url() const; + + /** + * Create a new browse link. + * + * \param linkArea the active area of the link + * \param url the URL to be open + */ + LinkBrowse(const QRectF &linkArea, const QString &url); + /** + * Destructor. + */ + ~LinkBrowse() override; + LinkType linkType() const override; + +private: + Q_DECLARE_PRIVATE(LinkBrowse) + Q_DISABLE_COPY(LinkBrowse) +}; + +/** + * \brief "Standard" action request. + * + * The LinkAction class represents a link that request a "standard" action + * to be performed by the viewer on the displayed document. + */ +class POPPLER_QT6_EXPORT LinkAction : public Link +{ +public: + /** + * The possible types of actions + */ + enum ActionType + { + PageFirst = 1, + PagePrev = 2, + PageNext = 3, + PageLast = 4, + HistoryBack = 5, + HistoryForward = 6, + Quit = 7, + Presentation = 8, + EndPresentation = 9, + Find = 10, + GoToPage = 11, + Close = 12, + Print = 13, + SaveAs = 14 ///< \since 22.04 + }; + + /** + * The action of the current LinkAction + */ + ActionType actionType() const; + + /** + * Create a new Action link, that executes a specified action + * on the document. + * + * \param linkArea the active area of the link + * \param actionType which action should be executed + */ + LinkAction(const QRectF &linkArea, ActionType actionType); + /** + * Destructor. + */ + ~LinkAction() override; + LinkType linkType() const override; + +private: + Q_DECLARE_PRIVATE(LinkAction) + Q_DISABLE_COPY(LinkAction) +}; + +/** + * Sound: a sound to be played. + */ +class POPPLER_QT6_EXPORT LinkSound : public Link +{ +public: + // create a Link_Sound + LinkSound(const QRectF &linkArea, double volume, bool sync, bool repeat, bool mix, SoundObject *sound); + /** + * Destructor. + */ + ~LinkSound() override; + + LinkType linkType() const override; + + /** + * The volume to be used when playing the sound. + * + * The volume is in the range [ -1, 1 ], where: + * - a negative number: no volume (mute) + * - 1: full volume + */ + double volume() const; + /** + * Whether the playback of the sound should be synchronous + * (thus blocking, waiting for the end of the sound playback). + */ + bool synchronous() const; + /** + * Whether the sound should be played continuously (that is, + * started again when it ends) + */ + bool repeat() const; + /** + * Whether the playback of this sound can be mixed with + * playbacks with other sounds of the same document. + * + * \note When false, any other playback must be stopped before + * playing the sound. + */ + bool mix() const; + /** + * The sound object to be played + */ + SoundObject *sound() const; + +private: + Q_DECLARE_PRIVATE(LinkSound) + Q_DISABLE_COPY(LinkSound) +}; + +/** + * Rendition: Rendition link. + */ +class POPPLER_QT6_EXPORT LinkRendition : public Link +{ +public: + /** + * Describes the possible rendition actions. + */ + enum RenditionAction + { + NoRendition, + PlayRendition, + StopRendition, + PauseRendition, + ResumeRendition + }; + + /** + * Create a new rendition link. + * + * \param linkArea the active area of the link + * \param rendition the media rendition object. Ownership is taken + * \param operation the numeric operation (action) (@see ::LinkRendition::RenditionOperation) + * \param script the java script code + * \param annotationReference the object reference of the screen annotation associated with this rendition action + */ + LinkRendition(const QRectF &linkArea, ::MediaRendition *rendition, int operation, const QString &script, const Ref annotationReference); + + /** + * Destructor. + */ + ~LinkRendition() override; + + LinkType linkType() const override; + + /** + * Returns the media rendition object if the redition provides one, @c 0 otherwise + */ + MediaRendition *rendition() const; + + /** + * Returns the action that should be executed if a rendition object is provided. + */ + RenditionAction action() const; + + /** + * The JS code that shall be executed or an empty string. + */ + QString script() const; + + /** + * Returns whether the given @p annotation is the referenced screen annotation for this rendition @p link. + */ + bool isReferencedAnnotation(const ScreenAnnotation *annotation) const; + +private: + Q_DECLARE_PRIVATE(LinkRendition) + Q_DISABLE_COPY(LinkRendition) +}; + +/** + * JavaScript: a JavaScript code to be interpreted. + */ +class POPPLER_QT6_EXPORT LinkJavaScript : public Link +{ +public: + /** + * Create a new JavaScript link. + * + * \param linkArea the active area of the link + * \param js the JS code to be interpreted + */ + LinkJavaScript(const QRectF &linkArea, const QString &js); + /** + * Destructor. + */ + ~LinkJavaScript() override; + + LinkType linkType() const override; + + /** + * The JS code + */ + QString script() const; + +private: + Q_DECLARE_PRIVATE(LinkJavaScript) + Q_DISABLE_COPY(LinkJavaScript) +}; + +/** + * Movie: a movie to be played. + */ +class POPPLER_QT6_EXPORT LinkMovie : public Link +{ +public: + /** + * Describes the operation to be performed on the movie. + */ + enum Operation + { + Play, + Stop, + Pause, + Resume + }; + + /** + * Create a new Movie link. + * + * \param linkArea the active area of the link + * \param operation the operation to be performed on the movie + * \param annotationTitle the title of the movie annotation identifying the movie to be played + * \param annotationReference the object reference of the movie annotation identifying the movie to be played + * + * Note: This constructor is supposed to be used by Poppler::Page only. + */ + LinkMovie(const QRectF &linkArea, Operation operation, const QString &annotationTitle, const Ref annotationReference); + /** + * Destructor. + */ + ~LinkMovie() override; + LinkType linkType() const override; + /** + * Returns the operation to be performed on the movie. + */ + Operation operation() const; + /** + * Returns whether the given @p annotation is the referenced movie annotation for this movie @p link. + */ + bool isReferencedAnnotation(const MovieAnnotation *annotation) const; + +private: + Q_DECLARE_PRIVATE(LinkMovie) + Q_DISABLE_COPY(LinkMovie) +}; + +/** + * OCGState: an optional content group state change. + */ +class POPPLER_QT6_EXPORT LinkOCGState : public Link +{ + friend class OptContentModel; + +public: + /** + * Create a new OCGState link. This is only used by Poppler::Page. + */ + explicit LinkOCGState(LinkOCGStatePrivate *ocgp); + /** + * Destructor. + */ + ~LinkOCGState() override; + + LinkType linkType() const override; + +private: + Q_DECLARE_PRIVATE(LinkOCGState) + Q_DISABLE_COPY(LinkOCGState) +}; + +/** + * Hide: an action to show / hide a field. + */ +class POPPLER_QT6_EXPORT LinkHide : public Link +{ +public: + /** + * Create a new Hide link. This is only used by Poppler::Page. + */ + explicit LinkHide(LinkHidePrivate *lhidep); + /** + * Destructor. + */ + ~LinkHide() override; + + LinkType linkType() const override; + + /** + * The fully qualified target names of the action. + */ + QVector targets() const; + + /** + * Should this action change the visibility of the target to true. + */ + bool isShowAction() const; + +private: + Q_DECLARE_PRIVATE(LinkHide) + Q_DISABLE_COPY(LinkHide) +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-media.cc b/poppler-24.05.0/qt6/src/poppler-media.cc new file mode 100644 index 0000000000000000000000000000000000000000..cf634ca290b4f4673546ff7f2e5cf46cc01928a7 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-media.cc @@ -0,0 +1,161 @@ +/* poppler-media.cc: qt interface to poppler + * Copyright (C) 2012 Guillermo A. Amaral B. + * Copyright (C) 2013, 2018, 2021 Albert Astals Cid + * + * 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-media.h" + +#include "Rendition.h" + +#include "poppler-private.h" + +#include + +#define BUFFER_MAX 4096 + +namespace Poppler { + +class MediaRenditionPrivate +{ +public: + explicit MediaRenditionPrivate(::MediaRendition *renditionA) : rendition(renditionA) { } + + ~MediaRenditionPrivate() { delete rendition; } + + MediaRenditionPrivate(const MediaRenditionPrivate &) = delete; + MediaRenditionPrivate &operator=(const MediaRenditionPrivate &) = delete; + + ::MediaRendition *rendition; +}; + +MediaRendition::MediaRendition(::MediaRendition *rendition) : d_ptr(new MediaRenditionPrivate(rendition)) { } + +MediaRendition::~MediaRendition() +{ + delete d_ptr; +} + +bool MediaRendition::isValid() const +{ + Q_D(const MediaRendition); + return d->rendition && d->rendition->isOk(); +} + +QString MediaRendition::contentType() const +{ + Q_ASSERT(isValid() && "Invalid media rendition."); + Q_D(const MediaRendition); + return UnicodeParsedString(d->rendition->getContentType()); +} + +QString MediaRendition::fileName() const +{ + Q_ASSERT(isValid() && "Invalid media rendition."); + Q_D(const MediaRendition); + return UnicodeParsedString(d->rendition->getFileName()); +} + +bool MediaRendition::isEmbedded() const +{ + Q_ASSERT(isValid() && "Invalid media rendition."); + Q_D(const MediaRendition); + return d->rendition->getIsEmbedded(); +} + +QByteArray MediaRendition::data() const +{ + Q_ASSERT(isValid() && "Invalid media rendition."); + Q_D(const MediaRendition); + + Stream *s = d->rendition->getEmbbededStream(); + if (!s) { + return QByteArray(); + } + + QBuffer buffer; + unsigned char data[BUFFER_MAX]; + int bread; + + buffer.open(QIODevice::WriteOnly); + s->reset(); + while ((bread = s->doGetChars(BUFFER_MAX, data)) != 0) { + buffer.write(reinterpret_cast(data), bread); + } + buffer.close(); + + return buffer.data(); +} + +bool MediaRendition::autoPlay() const +{ + Q_D(const MediaRendition); + if (d->rendition->getBEParameters()) { + return d->rendition->getBEParameters()->autoPlay; + } else if (d->rendition->getMHParameters()) { + return d->rendition->getMHParameters()->autoPlay; + } else { + qDebug("No BE or MH parameters to reference!"); + } + return false; +} + +bool MediaRendition::showControls() const +{ + Q_D(const MediaRendition); + if (d->rendition->getBEParameters()) { + return d->rendition->getBEParameters()->showControls; + } else if (d->rendition->getMHParameters()) { + return d->rendition->getMHParameters()->showControls; + } else { + qDebug("No BE or MH parameters to reference!"); + } + return false; +} + +float MediaRendition::repeatCount() const +{ + Q_D(const MediaRendition); + if (d->rendition->getBEParameters()) { + return d->rendition->getBEParameters()->repeatCount; + } else if (d->rendition->getMHParameters()) { + return d->rendition->getMHParameters()->repeatCount; + } else { + qDebug("No BE or MH parameters to reference!"); + } + return 1.f; +} + +QSize MediaRendition::size() const +{ + Q_D(const MediaRendition); + const MediaParameters *mp = nullptr; + + if (d->rendition->getBEParameters()) { + mp = d->rendition->getBEParameters(); + } else if (d->rendition->getMHParameters()) { + mp = d->rendition->getMHParameters(); + } else { + qDebug("No BE or MH parameters to reference!"); + } + + if (mp) { + return QSize(mp->windowParams.width, mp->windowParams.height); + } + return QSize(); +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-media.h b/poppler-24.05.0/qt6/src/poppler-media.h new file mode 100644 index 0000000000000000000000000000000000000000..83bd329425e21b7a0b947c693989c0cd73d2b016 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-media.h @@ -0,0 +1,98 @@ +/* poppler-media.h: qt interface to poppler + * Copyright (C) 2012 Guillermo A. Amaral B. + * Copyright (C) 2012, 2013, 2021 Albert Astals Cid + * + * 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. + */ + +#ifndef __POPPLER_MEDIARENDITION_H__ +#define __POPPLER_MEDIARENDITION_H__ + +#include "poppler-export.h" + +#include +#include + +class MediaRendition; +class QIODevice; + +namespace Poppler { +class MediaRenditionPrivate; + +/** + Qt wrapper for MediaRendition. + */ +class POPPLER_QT6_EXPORT MediaRendition +{ +public: + /** + Constructs a MediaRendition. Takes ownership of the passed rendition + */ + explicit MediaRendition(::MediaRendition *rendition); + ~MediaRendition(); + + /** + Check if wrapper is holding a valid rendition object. + */ + bool isValid() const; + + /** + Returns content type. + */ + QString contentType() const; + + /** + Returns file name. + */ + QString fileName() const; + + /** + Returns true if media is embedded. + */ + bool isEmbedded() const; + + /** + Returns data buffer. + */ + QByteArray data() const; + + /** + Convenience accessor for auto-play parameter. + */ + bool autoPlay() const; + + /** + Convenience accessor for show controls parameter. + */ + bool showControls() const; + + /** + Convenience accessor for repeat count parameter. + */ + float repeatCount() const; + + /** + Convenience accessor for size parameter. + */ + QSize size() const; + +private: + Q_DECLARE_PRIVATE(MediaRendition) + MediaRenditionPrivate *d_ptr; + Q_DISABLE_COPY(MediaRendition) +}; +} + +#endif /* __POPPLER_MEDIARENDITION_H__ */ diff --git a/poppler-24.05.0/qt6/src/poppler-movie.cc b/poppler-24.05.0/qt6/src/poppler-movie.cc new file mode 100644 index 0000000000000000000000000000000000000000..96822c6decb7d8cc275b4b208a0a82a2cdd4b969 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-movie.cc @@ -0,0 +1,106 @@ +/* poppler-sound.cc: qt interface to poppler + * Copyright (C) 2008, 2010, Pino Toscano + * Copyright (C) 2008, 2018, 2022, Albert Astals Cid + * Copyright (C) 2010, Carlos Garcia Campos + * Copyright (C) 2012, Tobias Koenig + * + * 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-qt6.h" + +#include "Object.h" +#include "Annot.h" +#include "Movie.h" + +#include + +namespace Poppler { + +class MovieData +{ +public: + MovieData() : m_movieObj(nullptr) { } + + ~MovieData() = default; + + MovieData(const MovieData &) = delete; + MovieData &operator=(const MovieData &) = delete; + + std::unique_ptr m_movieObj; + QSize m_size; + int m_rotation; + QImage m_posterImage; + MovieObject::PlayMode m_playMode : 3; + bool m_showControls : 1; +}; + +MovieObject::MovieObject(AnnotMovie *ann) +{ + m_movieData = new MovieData(); + m_movieData->m_movieObj = ann->getMovie()->copy(); + // TODO: copy poster image + + const MovieActivationParameters *mp = m_movieData->m_movieObj->getActivationParameters(); + int width, height; + m_movieData->m_movieObj->getFloatingWindowSize(&width, &height); + m_movieData->m_size = QSize(width, height); + m_movieData->m_rotation = m_movieData->m_movieObj->getRotationAngle(); + m_movieData->m_showControls = mp->showControls; + m_movieData->m_playMode = (MovieObject::PlayMode)mp->repeatMode; +} + +MovieObject::~MovieObject() +{ + delete m_movieData; +} + +QString MovieObject::url() const +{ + const GooString *goo = m_movieData->m_movieObj->getFileName(); + return goo ? QString(goo->c_str()) : QString(); +} + +QSize MovieObject::size() const +{ + return m_movieData->m_size; +} + +int MovieObject::rotation() const +{ + return m_movieData->m_rotation; +} + +bool MovieObject::showControls() const +{ + return m_movieData->m_showControls; +} + +MovieObject::PlayMode MovieObject::playMode() const +{ + return m_movieData->m_playMode; +} + +bool MovieObject::showPosterImage() const +{ + return (m_movieData->m_movieObj->getShowPoster() == true); +} + +QImage MovieObject::posterImage() const +{ + return m_movieData->m_posterImage; +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-optcontent-private.h b/poppler-24.05.0/qt6/src/poppler-optcontent-private.h new file mode 100644 index 0000000000000000000000000000000000000000..589fb0bc3358b77087b62643ee9e903362e1d955 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-optcontent-private.h @@ -0,0 +1,133 @@ +/* poppler-optcontent-private.h: qt interface to poppler + * + * Copyright (C) 2007, Brad Hards + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2016, 2018, 2019, 2021, Albert Astals Cid + * Copyright (C) 2017, Hubert Figuière + * + * 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. + */ + +#ifndef POPPLER_OPTCONTENT_PRIVATE_H +#define POPPLER_OPTCONTENT_PRIVATE_H + +#include +#include +#include + +class Array; +class OCGs; +class OptionalContentGroup; + +class QModelIndex; + +namespace Poppler { +class OptContentItem; +class OptContentModel; +class OptContentModelPrivate; + +class RadioButtonGroup +{ +public: + RadioButtonGroup(OptContentModelPrivate *ocModel, Array *rbarray); + ~RadioButtonGroup(); + QSet setItemOn(OptContentItem *itemToSetOn); + +private: + QList itemsInGroup; +}; + +class OptContentItem +{ +public: + enum ItemState + { + On, + Off, + HeadingOnly + }; + + explicit OptContentItem(OptionalContentGroup *group); + explicit OptContentItem(const QString &label); + OptContentItem(); + ~OptContentItem(); + + QString name() const { return m_name; } + ItemState state() const { return m_stateBackup; } + void setState(ItemState state, bool obeyRadioGroups, QSet &changedItems); + + QList childList() { return m_children; } + + void setParent(OptContentItem *parent) { m_parent = parent; } + OptContentItem *parent() { return m_parent; } + + void addChild(OptContentItem *child); + + void appendRBGroup(RadioButtonGroup *rbgroup); + + bool isEnabled() const { return m_enabled; } + + QSet recurseListChildren(bool includeMe = false) const; + + OptionalContentGroup *group() const { return m_group; } + +private: + OptionalContentGroup *m_group; + QString m_name; + ItemState m_state; // true for ON, false for OFF + ItemState m_stateBackup; + QList m_children; + OptContentItem *m_parent; + QList m_rbGroups; + bool m_enabled; +}; + +class OptContentModelPrivate +{ +public: + OptContentModelPrivate(OptContentModel *qq, OCGs *optContent); + ~OptContentModelPrivate(); + + OptContentModelPrivate(const OptContentModelPrivate &) = delete; + OptContentModelPrivate &operator=(const OptContentModelPrivate &) = delete; + + void parseRBGroupsArray(Array *rBGroupArray); + OptContentItem *nodeFromIndex(const QModelIndex &index, bool canBeNull = false) const; + QModelIndex indexFromItem(OptContentItem *node, int column) const; + + /** + Get the OptContentItem corresponding to a given reference value. + + \param ref the reference number (e.g. from Object.getRefNum()) to look up + + \return the matching optional content item, or null if the reference wasn't found + */ + OptContentItem *itemFromRef(const QString &ref) const; + void setRootNode(OptContentItem *node); + + OptContentModel *q; + + QMap m_optContentItems; + QList m_headerOptContentItems; + QList m_rbgroups; + OptContentItem *m_rootNode; + +private: + void addChild(OptContentItem *parent, OptContentItem *child); + void parseOrderArray(OptContentItem *parentNode, Array *orderArray); +}; +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-optcontent.cc b/poppler-24.05.0/qt6/src/poppler-optcontent.cc new file mode 100644 index 0000000000000000000000000000000000000000..74899662e7de6b6789082e23a85758ac0a5252e6 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-optcontent.cc @@ -0,0 +1,438 @@ +/* poppler-optcontent.cc: qt interface to poppler + * + * Copyright (C) 2007, Brad Hards + * Copyright (C) 2008, 2014, Pino Toscano + * Copyright (C) 2008, Carlos Garcia Campos + * Copyright (C) 2015-2019, Albert Astals Cid + * Copyright (C) 2017, Hubert Figuière + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018 Adam Reichold + * Copyright (C) 2019, 2020 Oliver Sander + * + * 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 +#include + +#include "poppler/OptionalContent.h" +#include "poppler/Link.h" + +namespace Poppler { +RadioButtonGroup::RadioButtonGroup(OptContentModelPrivate *ocModel, Array *rbarray) +{ + itemsInGroup.reserve(rbarray->getLength()); + for (int i = 0; i < rbarray->getLength(); ++i) { + const Object &ref = rbarray->getNF(i); + if (!ref.isRef()) { + qDebug() << "expected ref, but got:" << ref.getType(); + } + OptContentItem *item = ocModel->itemFromRef(QString::number(ref.getRefNum())); + itemsInGroup.append(item); + } + for (OptContentItem *item : std::as_const(itemsInGroup)) { + item->appendRBGroup(this); + } +} + +RadioButtonGroup::~RadioButtonGroup() { } + +QSet RadioButtonGroup::setItemOn(OptContentItem *itemToSetOn) +{ + QSet changedItems; + for (OptContentItem *thisItem : std::as_const(itemsInGroup)) { + if (thisItem != itemToSetOn) { + QSet newChangedItems; + thisItem->setState(OptContentItem::Off, false /*obeyRadioGroups*/, newChangedItems); + changedItems += newChangedItems; + } + } + return changedItems; +} + +OptContentItem::OptContentItem(OptionalContentGroup *group) +{ + m_group = group; + m_parent = nullptr; + m_name = UnicodeParsedString(group->getName()); + if (group->getState() == OptionalContentGroup::On) { + m_state = OptContentItem::On; + } else { + m_state = OptContentItem::Off; + } + m_stateBackup = m_state; + m_enabled = true; +} + +OptContentItem::OptContentItem(const QString &label) +{ + m_parent = nullptr; + m_name = label; + m_group = nullptr; + m_state = OptContentItem::HeadingOnly; + m_stateBackup = m_state; + m_enabled = true; +} + +OptContentItem::OptContentItem() : m_parent(nullptr), m_enabled(true) { } + +OptContentItem::~OptContentItem() { } + +void OptContentItem::appendRBGroup(RadioButtonGroup *rbgroup) +{ + m_rbGroups.append(rbgroup); +} + +void OptContentItem::setState(ItemState state, bool obeyRadioGroups, QSet &changedItems) +{ + if (state == m_state) { + return; + } + + m_state = state; + m_stateBackup = m_state; + changedItems.insert(this); + QSet empty; + Q_FOREACH (OptContentItem *child, m_children) { + ItemState oldState = child->m_stateBackup; + child->setState(state == OptContentItem::On ? child->m_stateBackup : OptContentItem::Off, true /*obeyRadioGroups*/, empty); + child->m_enabled = state == OptContentItem::On; + child->m_stateBackup = oldState; + } + if (!m_group) { + return; + } + if (state == OptContentItem::On) { + m_group->setState(OptionalContentGroup::On); + if (obeyRadioGroups) { + for (RadioButtonGroup *rbgroup : std::as_const(m_rbGroups)) { + changedItems += rbgroup->setItemOn(this); + } + } + } else if (state == OptContentItem::Off) { + m_group->setState(OptionalContentGroup::Off); + } +} + +void OptContentItem::addChild(OptContentItem *child) +{ + m_children += child; + child->setParent(this); +} + +QSet OptContentItem::recurseListChildren(bool includeMe) const +{ + QSet ret; + if (includeMe) { + ret.insert(const_cast(this)); + } + Q_FOREACH (OptContentItem *child, m_children) { + ret += child->recurseListChildren(true); + } + return ret; +} + +OptContentModelPrivate::OptContentModelPrivate(OptContentModel *qq, OCGs *optContent) : q(qq) +{ + m_rootNode = new OptContentItem(); + const auto &ocgs = optContent->getOCGs(); + + for (const auto &ocg : ocgs) { + OptContentItem *node = new OptContentItem(ocg.second.get()); + m_optContentItems.insert(QString::number(ocg.first.num), node); + } + + if (optContent->getOrderArray() == nullptr) { + // no Order array, so drop them all at the top level + QMapIterator i(m_optContentItems); + while (i.hasNext()) { + i.next(); + addChild(m_rootNode, i.value()); + } + } else { + parseOrderArray(m_rootNode, optContent->getOrderArray()); + } + + parseRBGroupsArray(optContent->getRBGroupsArray()); +} + +OptContentModelPrivate::~OptContentModelPrivate() +{ + qDeleteAll(m_optContentItems); + qDeleteAll(m_rbgroups); + qDeleteAll(m_headerOptContentItems); + delete m_rootNode; +} + +void OptContentModelPrivate::parseOrderArray(OptContentItem *parentNode, Array *orderArray) +{ + OptContentItem *lastItem = parentNode; + for (int i = 0; i < orderArray->getLength(); ++i) { + Object orderItem = orderArray->get(i); + if (orderItem.isDict()) { + const Object &item = orderArray->getNF(i); + if (item.isRef()) { + OptContentItem *ocItem = m_optContentItems.value(QString::number(item.getRefNum())); + if (ocItem) { + addChild(parentNode, ocItem); + lastItem = ocItem; + } else { + qDebug() << "could not find group for object" << item.getRefNum(); + } + } + } else if ((orderItem.isArray()) && (orderItem.arrayGetLength() > 0)) { + parseOrderArray(lastItem, orderItem.getArray()); + } else if (orderItem.isString()) { + const GooString *label = orderItem.getString(); + OptContentItem *header = new OptContentItem(UnicodeParsedString(label)); + m_headerOptContentItems.append(header); + addChild(parentNode, header); + parentNode = header; + lastItem = header; + } else { + qDebug() << "something unexpected"; + } + } +} + +void OptContentModelPrivate::parseRBGroupsArray(Array *rBGroupArray) +{ + if (!rBGroupArray) { + return; + } + // This is an array of array(s) + for (int i = 0; i < rBGroupArray->getLength(); ++i) { + Object rbObj = rBGroupArray->get(i); + if (!rbObj.isArray()) { + qDebug() << "expected inner array, got:" << rbObj.getType(); + return; + } + Array *rbarray = rbObj.getArray(); + RadioButtonGroup *rbg = new RadioButtonGroup(this, rbarray); + m_rbgroups.append(rbg); + } +} + +OptContentModel::OptContentModel(OCGs *optContent, QObject *parent) : QAbstractItemModel(parent) +{ + d = new OptContentModelPrivate(this, optContent); +} + +OptContentModel::~OptContentModel() +{ + delete d; +} + +void OptContentModelPrivate::setRootNode(OptContentItem *node) +{ + q->beginResetModel(); + delete m_rootNode; + m_rootNode = node; + q->endResetModel(); +} + +QModelIndex OptContentModel::index(int row, int column, const QModelIndex &parent) const +{ + if (row < 0 || column != 0) { + return QModelIndex(); + } + + OptContentItem *parentNode = d->nodeFromIndex(parent); + if (row < parentNode->childList().count()) { + return createIndex(row, column, parentNode->childList().at(row)); + } + return QModelIndex(); +} + +QModelIndex OptContentModel::parent(const QModelIndex &child) const +{ + OptContentItem *childNode = d->nodeFromIndex(child); + if (!childNode) { + return QModelIndex(); + } + return d->indexFromItem(childNode->parent(), child.column()); +} + +QModelIndex OptContentModelPrivate::indexFromItem(OptContentItem *node, int column) const +{ + if (!node) { + return QModelIndex(); + } + OptContentItem *parentNode = node->parent(); + if (!parentNode) { + return QModelIndex(); + } + const int row = parentNode->childList().indexOf(node); + return q->createIndex(row, column, node); +} + +int OptContentModel::rowCount(const QModelIndex &parent) const +{ + OptContentItem *parentNode = d->nodeFromIndex(parent); + if (!parentNode) { + return 0; + } else { + return parentNode->childList().count(); + } +} + +int OptContentModel::columnCount(const QModelIndex &parent) const +{ + return 1; +} + +QVariant OptContentModel::data(const QModelIndex &index, int role) const +{ + OptContentItem *node = d->nodeFromIndex(index, true); + if (!node) { + return QVariant(); + } + + switch (role) { + case Qt::DisplayRole: + return node->name(); + break; + case Qt::EditRole: + if (node->state() == OptContentItem::On) { + return true; + } else if (node->state() == OptContentItem::Off) { + return false; + } + break; + case Qt::CheckStateRole: + if (node->state() == OptContentItem::On) { + return Qt::Checked; + } else if (node->state() == OptContentItem::Off) { + return Qt::Unchecked; + } + break; + } + + return QVariant(); +} + +bool OptContentModel::setData(const QModelIndex &index, const QVariant &value, int role) +{ + OptContentItem *node = d->nodeFromIndex(index, true); + if (!node) { + return false; + } + + switch (role) { + case Qt::CheckStateRole: { + const bool newvalue = value.toBool(); + QSet changedItems; + node->setState(newvalue ? OptContentItem::On : OptContentItem::Off, true /*obeyRadioGroups*/, changedItems); + + if (!changedItems.isEmpty()) { + changedItems += node->recurseListChildren(false); + QModelIndexList indexes; + Q_FOREACH (OptContentItem *item, changedItems) { + indexes.append(d->indexFromItem(item, 0)); + } + std::stable_sort(indexes.begin(), indexes.end()); + Q_FOREACH (const QModelIndex &changedIndex, indexes) { + emit dataChanged(changedIndex, changedIndex); + } + return true; + } + break; + } + } + + return false; +} + +Qt::ItemFlags OptContentModel::flags(const QModelIndex &index) const +{ + OptContentItem *node = d->nodeFromIndex(index); + Qt::ItemFlags itemFlags = Qt::ItemIsSelectable | Qt::ItemIsUserCheckable; + if (node->isEnabled()) { + itemFlags |= Qt::ItemIsEnabled; + } + return itemFlags; +} + +QVariant OptContentModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + return QAbstractItemModel::headerData(section, orientation, role); +} + +void OptContentModel::applyLink(LinkOCGState *link) +{ + LinkOCGStatePrivate *linkPrivate = link->d_func(); + + QSet changedItems; + + const std::vector<::LinkOCGState::StateList> &statesList = linkPrivate->stateList; + for (const ::LinkOCGState::StateList &stateList : statesList) { + const std::vector &refsList = stateList.list; + for (const Ref &ref : refsList) { + OptContentItem *item = d->itemFromRef(QString::number(ref.num)); + + if (stateList.st == ::LinkOCGState::On) { + item->setState(OptContentItem::On, linkPrivate->preserveRB, changedItems); + } else if (stateList.st == ::LinkOCGState::Off) { + item->setState(OptContentItem::Off, linkPrivate->preserveRB, changedItems); + } else { + OptContentItem::ItemState newState = item->state() == OptContentItem::On ? OptContentItem::Off : OptContentItem::On; + item->setState(newState, linkPrivate->preserveRB, changedItems); + } + } + } + + if (!changedItems.isEmpty()) { + QSet aux; + Q_FOREACH (OptContentItem *item, aux) { + changedItems += item->recurseListChildren(false); + } + + QModelIndexList indexes; + Q_FOREACH (OptContentItem *item, changedItems) { + indexes.append(d->indexFromItem(item, 0)); + } + std::stable_sort(indexes.begin(), indexes.end()); + Q_FOREACH (const QModelIndex &changedIndex, indexes) { + emit dataChanged(changedIndex, changedIndex); + } + } +} + +void OptContentModelPrivate::addChild(OptContentItem *parent, OptContentItem *child) +{ + parent->addChild(child); +} + +OptContentItem *OptContentModelPrivate::itemFromRef(const QString &ref) const +{ + return m_optContentItems.value(ref); +} + +OptContentItem *OptContentModelPrivate::nodeFromIndex(const QModelIndex &index, bool canBeNull) const +{ + if (index.isValid()) { + return static_cast(index.internalPointer()); + } else { + return canBeNull ? nullptr : m_rootNode; + } +} +} diff --git a/poppler-24.05.0/qt6/src/poppler-optcontent.h b/poppler-24.05.0/qt6/src/poppler-optcontent.h new file mode 100644 index 0000000000000000000000000000000000000000..6b9467a34299a38258e49467be8302ec7bee7bb4 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-optcontent.h @@ -0,0 +1,81 @@ +/* poppler-optcontent.h: qt interface to poppler + * + * Copyright (C) 2007, Brad Hards + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2013, Anthony Granger + * Copyright (C) 2016, 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef POPPLER_OPTCONTENT_H +#define POPPLER_OPTCONTENT_H + +#include + +#include "poppler-export.h" +#include "poppler-link.h" + +class OCGs; + +namespace Poppler { +class Document; +class OptContentModelPrivate; + +/** + * \brief Model for optional content + * + * OptContentModel is an item model representing the optional content items + * that can be found in PDF documents. + * + * The model offers a mostly read-only display of the data, allowing to + * enable/disable some contents setting the Qt::CheckStateRole data role. + */ +class POPPLER_QT6_EXPORT OptContentModel : public QAbstractItemModel +{ + friend class Document; + + Q_OBJECT + +public: + ~OptContentModel() override; + + QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &child) const override; + + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent) const override; + + QVariant data(const QModelIndex &index, int role) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + + Qt::ItemFlags flags(const QModelIndex &index) const override; + + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + + /** + * Applies the Optional Content Changes specified by that link. + */ + void applyLink(LinkOCGState *link); + +private: + explicit OptContentModel(OCGs *optContent, QObject *parent = nullptr); + + friend class OptContentModelPrivate; + OptContentModelPrivate *d; +}; +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-outline-private.h b/poppler-24.05.0/qt6/src/poppler-outline-private.h new file mode 100644 index 0000000000000000000000000000000000000000..e7b9080da0008daf1a6efbd740da4904fbedc3e3 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-outline-private.h @@ -0,0 +1,48 @@ +/* poppler-outline-private.h: qt interface to poppler + * + * Copyright (C) 2018 Adam Reichold + * Copyright (C) 2019 Albert Astals Cid + * + * 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. + */ + +#ifndef _POPPLER_OUTLINE_PRIVATE_H_ +#define _POPPLER_OUTLINE_PRIVATE_H_ + +#include +#include + +class OutlineItem; + +namespace Poppler { + +class DocumentData; +class LinkDestination; + +struct OutlineItemData +{ + OutlineItemData(::OutlineItem *oi, DocumentData *dd) : data { oi }, documentData { dd } { } + ::OutlineItem *data; + DocumentData *documentData; + + mutable QString name; + mutable QSharedPointer destination; + mutable QString externalFileName; + mutable QString uri; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-outline.cc b/poppler-24.05.0/qt6/src/poppler-outline.cc new file mode 100644 index 0000000000000000000000000000000000000000..7b0c9f13cc29634761825d97a8fa3c8a6fcf18b5 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-outline.cc @@ -0,0 +1,185 @@ +/* poppler-outline.cc: qt interface to poppler + * + * Copyright (C) 2018 Adam Reichold + * Copyright (C) 2019 Oliver Sander + * Copyright (C) 2019 Albert Astals Cid + * Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela + * + * 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 +#include + +#include "poppler-private.h" +#include "poppler-outline-private.h" + +#include "Link.h" +#include "Outline.h" + +namespace Poppler { + +OutlineItem::OutlineItem() : m_data { new OutlineItemData { nullptr, nullptr } } { } + +OutlineItem::OutlineItem(OutlineItemData *data) : m_data { data } { } + +OutlineItem::~OutlineItem() +{ + delete m_data; + m_data = nullptr; +} + +OutlineItem::OutlineItem(const OutlineItem &other) : m_data { new OutlineItemData { *other.m_data } } { } + +OutlineItem &OutlineItem::operator=(const OutlineItem &other) +{ + if (this == &other) { + return *this; + } + + auto *data = new OutlineItemData { *other.m_data }; + qSwap(m_data, data); + delete data; + + return *this; +} + +OutlineItem::OutlineItem(OutlineItem &&other) noexcept : m_data { other.m_data } +{ + other.m_data = nullptr; +} + +OutlineItem &OutlineItem::operator=(OutlineItem &&other) noexcept +{ + qSwap(m_data, other.m_data); + + return *this; +} + +bool OutlineItem::isNull() const +{ + return !m_data->data; +} + +QString OutlineItem::name() const +{ + QString &name = m_data->name; + + if (name.isEmpty()) { + if (const ::OutlineItem *data = m_data->data) { + name = unicodeToQString(data->getTitle()); + } + } + + return name; +} + +bool OutlineItem::isOpen() const +{ + bool isOpen = false; + + if (const ::OutlineItem *data = m_data->data) { + isOpen = data->isOpen(); + } + + return isOpen; +} + +QSharedPointer OutlineItem::destination() const +{ + QSharedPointer &destination = m_data->destination; + + if (!destination) { + if (const ::OutlineItem *data = m_data->data) { + if (const ::LinkAction *action = data->getAction()) { + if (action->getKind() == actionGoTo) { + const auto *linkGoTo = static_cast(action); + destination.reset(new LinkDestination(LinkDestinationData(linkGoTo->getDest(), linkGoTo->getNamedDest(), m_data->documentData, false))); + } else if (action->getKind() == actionGoToR) { + const auto *linkGoToR = static_cast(action); + const bool external = linkGoToR->getFileName() != nullptr; + destination.reset(new LinkDestination(LinkDestinationData(linkGoToR->getDest(), linkGoToR->getNamedDest(), m_data->documentData, external))); + } + } + } + } + + return destination; +} + +QString OutlineItem::externalFileName() const +{ + QString &externalFileName = m_data->externalFileName; + + if (externalFileName.isEmpty()) { + if (const ::OutlineItem *data = m_data->data) { + if (const ::LinkAction *action = data->getAction()) { + if (action->getKind() == actionGoToR) { + if (const GooString *fileName = static_cast(action)->getFileName()) { + externalFileName = UnicodeParsedString(fileName); + } + } + } + } + } + + return externalFileName; +} + +QString OutlineItem::uri() const +{ + QString &uri = m_data->uri; + + if (uri.isEmpty()) { + if (const ::OutlineItem *data = m_data->data) { + if (const ::LinkAction *action = data->getAction()) { + if (action->getKind() == actionURI) { + uri = UnicodeParsedString(static_cast(action)->getURI()); + } + } + } + } + + return uri; +} + +bool OutlineItem::hasChildren() const +{ + bool result = false; + + if (::OutlineItem *data = m_data->data) { + result = data->hasKids(); + } + + return result; +} + +QVector OutlineItem::children() const +{ + QVector result; + + if (::OutlineItem *data = m_data->data) { + data->open(); + if (const std::vector<::OutlineItem *> *kids = data->getKids()) { + for (void *kid : *kids) { + result.push_back(OutlineItem { new OutlineItemData { static_cast<::OutlineItem *>(kid), m_data->documentData } }); + } + } + } + + return result; +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-page-private.h b/poppler-24.05.0/qt6/src/poppler-page-private.h new file mode 100644 index 0000000000000000000000000000000000000000..34ba27bdf884a009c817a43935edd8eb559e5cb0 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-page-private.h @@ -0,0 +1,59 @@ +/* poppler-page.cc: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2007, 2012, Albert Astals Cid + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2015 Adam Reichold + * Copyright (C) 2018, 2021 Nelson Benítez León + * Copyright (C) 2021, Oliver Sander + * + * 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. + */ + +#ifndef _POPPLER_PAGE_PRIVATE_H_ +#define _POPPLER_PAGE_PRIVATE_H_ + +#include "CharTypes.h" + +class QRectF; + +class LinkAction; +class Page; +class TextPage; + +namespace Poppler { + +class DocumentData; +class PageTransition; + +class PageData +{ +public: + std::unique_ptr convertLinkActionToLink(::LinkAction *a, const QRectF &linkArea); + + DocumentData *parentDoc; + ::Page *page; + int index; + PageTransition *transition; + + static std::unique_ptr convertLinkActionToLink(::LinkAction *a, DocumentData *parentDoc, const QRectF &linkArea); + + TextPage *prepareTextSearch(const QString &text, Page::Rotation rotate, QVector *u); + bool performSingleTextSearch(TextPage *textPage, QVector &u, double &sLeft, double &sTop, double &sRight, double &sBottom, Page::SearchDirection direction, bool sCase, bool sWords, bool sDiacritics, bool sAcrossLines); + QList performMultipleTextSearch(TextPage *textPage, QVector &u, bool sCase, bool sWords, bool sDiacritics, bool sAcrossLines); +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-page-transition-private.h b/poppler-24.05.0/qt6/src/poppler-page-transition-private.h new file mode 100644 index 0000000000000000000000000000000000000000..4dabd14350d059bc2da18e25f9f59c88c4318a1f --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-page-transition-private.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2005, 2019, Albert Astals Cid + * Copyright (C) 2019 Oliver Sander + * + * 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. + */ + +#ifndef _POPPLER_PAGE_TRANSITION_PRIVATE_H_ +#define _POPPLER_PAGE_TRANSITION_PRIVATE_H_ + +class Object; + +namespace Poppler { + +class PageTransitionParams +{ +public: + Object *dictObj; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-page-transition.cc b/poppler-24.05.0/qt6/src/poppler-page-transition.cc new file mode 100644 index 0000000000000000000000000000000000000000..2e1687ccf38bf8cdd419257022b23def8a1bcf2a --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-page-transition.cc @@ -0,0 +1,100 @@ +/* PageTransition.cc + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2015, Arseniy Lartsev + * Copyright (C) 2018, 2021 Albert Astals Cid + * + * 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 "PageTransition.h" +#include "poppler-page-transition.h" +#include "poppler-page-transition-private.h" + +namespace Poppler { + +class PageTransitionData +{ +public: + explicit PageTransitionData(Object *trans) { pt = new ::PageTransition(trans); } + + PageTransitionData(const PageTransitionData &ptd) { pt = new ::PageTransition(*ptd.pt); } + + ~PageTransitionData() { delete pt; } + + PageTransitionData &operator=(const PageTransitionData &) = delete; + + ::PageTransition *pt; +}; + +PageTransition::PageTransition(const PageTransitionParams params) +{ + data = new PageTransitionData(params.dictObj); +} + +PageTransition::PageTransition(const PageTransition &pt) +{ + data = new PageTransitionData(*pt.data); +} + +PageTransition::~PageTransition() +{ + delete data; +} + +PageTransition &PageTransition::operator=(const PageTransition &other) +{ + if (this != &other) { + delete data; + data = new PageTransitionData(*other.data); + } + + return *this; +} + +PageTransition::Type PageTransition::type() const +{ + return (Poppler::PageTransition::Type)data->pt->getType(); +} + +double PageTransition::durationReal() const +{ + return data->pt->getDuration(); +} + +PageTransition::Alignment PageTransition::alignment() const +{ + return (Poppler::PageTransition::Alignment)data->pt->getAlignment(); +} + +PageTransition::Direction PageTransition::direction() const +{ + return (Poppler::PageTransition::Direction)data->pt->getDirection(); +} + +int PageTransition::angle() const +{ + return data->pt->getAngle(); +} + +double PageTransition::scale() const +{ + return data->pt->getScale(); +} +bool PageTransition::isRectangular() const +{ + return data->pt->isRectangular(); +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-page-transition.h b/poppler-24.05.0/qt6/src/poppler-page-transition.h new file mode 100644 index 0000000000000000000000000000000000000000..6c09623db9dc199e8f25cf1084889e1631b26ad7 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-page-transition.h @@ -0,0 +1,142 @@ +/* PageTransition.h + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2005, Brad Hards + * Copyright (C) 2015, Arseniy Lartsev + * Copyright (C) 2018, 2021, Albert Astals Cid + * + * 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. + */ + +#ifndef __PAGETRANSITION_X_H__ +#define __PAGETRANSITION_X_H__ + +#include "poppler-export.h" + +#include + +namespace Poppler { + +class PageTransitionParams; +class PageTransitionData; + +/** + \brief Describes how a PDF file viewer shall perform the transition + from one page to another + + In PDF files there is a way to specify if the viewer shall use + certain effects to perform the transition from one page to + another. This feature can be used, e.g., in a PDF-based beamer + presentation. + + This utility class represents the transition effect, and can be + used to extract the information from a PDF object. +*/ + +class POPPLER_QT6_EXPORT PageTransition +{ +public: + /** \brief transition effect that shall be used + */ + // if changed remember to keep in sync with PageTransition.h enum + enum Type + { + Replace = 0, + Split, + Blinds, + Box, + Wipe, + Dissolve, + Glitter, + Fly, + Push, + Cover, + Uncover, + Fade + }; + + /** \brief alignment of the transition effect that shall be used + */ + // if changed remember to keep in sync with PageTransition.h enum + enum Alignment + { + Horizontal = 0, + Vertical + }; + + /** \brief direction of the transition effect that shall be used + */ + // if changed remember to keep in sync with PageTransition.h enum + enum Direction + { + Inward = 0, + Outward + }; + + explicit PageTransition(const PageTransitionParams params); + + /** \brief copy constructor */ + PageTransition(const PageTransition &pt); + + /** \brief assignment operator */ + PageTransition &operator=(const PageTransition &other); + + /** + Destructor + */ + ~PageTransition(); + + /** + \brief Get type of the transition. + */ + Type type() const; + + /** + \brief Get duration of the transition in seconds + */ + double durationReal() const; + + /** + \brief Get dimension in which the transition effect occurs. + */ + Alignment alignment() const; + + /** + \brief Get direction of motion of the transition effect. + */ + Direction direction() const; + + /** + \brief Get direction in which the transition effect moves. + */ + int angle() const; + + /** + \brief Get starting or ending scale. + */ + double scale() const; + + /** + \brief Returns true if the area to be flown is rectangular and + opaque. + */ + bool isRectangular() const; + +private: + PageTransitionData *data; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-page.cc b/poppler-24.05.0/qt6/src/poppler-page.cc new file mode 100644 index 0000000000000000000000000000000000000000..9a0b2c7ea0b20e64b5953f20521e5189198d75d9 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-page.cc @@ -0,0 +1,921 @@ +/* poppler-page.cc: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2005, Brad Hards + * Copyright (C) 2005-2022, Albert Astals Cid + * Copyright (C) 2005, Stefan Kebekus + * Copyright (C) 2006-2011, Pino Toscano + * Copyright (C) 2008 Carlos Garcia Campos + * Copyright (C) 2009 Shawn Rutledge + * Copyright (C) 2010, 2012, Guillermo Amaral + * Copyright (C) 2010 Suzuki Toshiya + * Copyright (C) 2010 Matthias Fauconneau + * Copyright (C) 2010 Hib Eris + * Copyright (C) 2012 Tobias Koenig + * Copyright (C) 2012 Fabio D'Urso + * Copyright (C) 2012, 2015 Adam Reichold + * Copyright (C) 2012, 2013 Thomas Freitag + * Copyright (C) 2015 William Bader + * Copyright (C) 2016 Arseniy Lartsev + * Copyright (C) 2016, Hanno Meyer-Thurow + * Copyright (C) 2017-2021, Oliver Sander + * Copyright (C) 2017 Adrian Johnson + * Copyright (C) 2017, 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018 Intevation GmbH + * Copyright (C) 2018, Tobias Deiminger + * Copyright (C) 2018, 2021 Nelson Benítez León + * Copyright (C) 2020 Philipp Knechtges + * Copyright (C) 2021 Hubert Figuiere + * Copyright (C) 2021 Thomas Huxhorn + * Copyright (C) 2023 Kevin Ottens . Work sponsored by De Bortoli Wines + * Copyright (C) 2024 Stefan Brüns + * + * 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 + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "poppler-private.h" +#include "poppler-page-transition-private.h" +#include "poppler-page-private.h" +#include "poppler-link-extractor-private.h" +#include "poppler-link-private.h" +#include "poppler-annotation-private.h" +#include "poppler-form.h" +#include "poppler-media.h" + +namespace Poppler { + +class TextExtractionAbortHelper +{ +public: + TextExtractionAbortHelper(Page::ShouldAbortQueryFunc shouldAbortCallback, const QVariant &payloadA) + { + shouldAbortExtractionCallback = shouldAbortCallback; + payload = payloadA; + } + + Page::ShouldAbortQueryFunc shouldAbortExtractionCallback = nullptr; + QVariant payload; +}; + +class OutputDevCallbackHelper +{ +public: + void setCallbacks(Page::RenderToImagePartialUpdateFunc callback, Page::ShouldRenderToImagePartialQueryFunc shouldDoCallback, Page::ShouldAbortQueryFunc shouldAbortCallback, const QVariant &payloadA) + { + partialUpdateCallback = callback; + shouldDoPartialUpdateCallback = shouldDoCallback; + shouldAbortRenderCallback = shouldAbortCallback; + payload = payloadA; + } + + Page::RenderToImagePartialUpdateFunc partialUpdateCallback = nullptr; + Page::ShouldRenderToImagePartialQueryFunc shouldDoPartialUpdateCallback = nullptr; + Page::ShouldAbortQueryFunc shouldAbortRenderCallback = nullptr; + QVariant payload; +}; + +class Qt6SplashOutputDev : public SplashOutputDev, public OutputDevCallbackHelper +{ +public: + Qt6SplashOutputDev(SplashColorMode colorModeA, int bitmapRowPadA, bool reverseVideoA, bool ignorePaperColorA, SplashColorPtr paperColorA, bool bitmapTopDownA, SplashThinLineMode thinLineMode, bool overprintPreviewA) + : SplashOutputDev(colorModeA, bitmapRowPadA, reverseVideoA, paperColorA, bitmapTopDownA, thinLineMode, overprintPreviewA), ignorePaperColor(ignorePaperColorA) + { + } + + ~Qt6SplashOutputDev() override; + + void dump() override + { + if (partialUpdateCallback && shouldDoPartialUpdateCallback && shouldDoPartialUpdateCallback(payload)) { + partialUpdateCallback(getXBGRImage(false /* takeImageData */), payload); + } + } + + QImage getXBGRImage(bool takeImageData) + { + SplashBitmap *b = getBitmap(); + + // If we use DeviceN8, convert to XBGR8. + // If requested, also transfer Splash's internal alpha channel. + const SplashBitmap::ConversionMode mode = ignorePaperColor ? SplashBitmap::conversionAlphaPremultiplied : SplashBitmap::conversionOpaque; + + const QImage::Format format = ignorePaperColor ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32; + + if (b->convertToXBGR(mode)) { + const int bw = b->getWidth(); + const int bh = b->getHeight(); + const int brs = b->getRowSize(); + + SplashColorPtr data = takeImageData ? b->takeData() : b->getDataPtr(); + + if (QSysInfo::ByteOrder == QSysInfo::BigEndian) { + // Convert byte order from RGBX to XBGR. + for (int i = 0; i < bh; ++i) { + for (int j = 0; j < bw; ++j) { + SplashColorPtr pixel = &data[i * brs + j]; + + qSwap(pixel[0], pixel[3]); + qSwap(pixel[1], pixel[2]); + } + } + } + + if (takeImageData) { + // Construct a Qt image holding (and also owning) the raw bitmap data. + QImage i(data, bw, bh, brs, format, gfree, data); + if (i.isNull()) { + gfree(data); + } + return i; + } else { + return QImage(data, bw, bh, brs, format).copy(); + } + } + + return QImage(); + } + +private: + bool ignorePaperColor; +}; + +Qt6SplashOutputDev::~Qt6SplashOutputDev() = default; + +class QImageDumpingQPainterOutputDev : public QPainterOutputDev, public OutputDevCallbackHelper +{ +public: + QImageDumpingQPainterOutputDev(QPainter *painter, QImage *i) : QPainterOutputDev(painter), image(i) { } + ~QImageDumpingQPainterOutputDev() override; + + void dump() override + { + if (partialUpdateCallback && shouldDoPartialUpdateCallback && shouldDoPartialUpdateCallback(payload)) { + partialUpdateCallback(*image, payload); + } + } + +private: + QImage *image; +}; + +QImageDumpingQPainterOutputDev::~QImageDumpingQPainterOutputDev() = default; + +std::unique_ptr PageData::convertLinkActionToLink(::LinkAction *a, const QRectF &linkArea) +{ + return convertLinkActionToLink(a, parentDoc, linkArea); +} + +std::unique_ptr PageData::convertLinkActionToLink(::LinkAction *a, DocumentData *parentDoc, const QRectF &linkArea) +{ + if (!a) { + return nullptr; + } + + std::unique_ptr popplerLink; + switch (a->getKind()) { + case actionGoTo: { + LinkGoTo *g = (LinkGoTo *)a; + const LinkDestinationData ldd(g->getDest(), g->getNamedDest(), parentDoc, false); + // create link: no ext file, namedDest, object pointer + popplerLink = std::make_unique(linkArea, QString(), LinkDestination(ldd)); + } break; + + case actionGoToR: { + LinkGoToR *g = (LinkGoToR *)a; + // copy link file + const QString fileName = UnicodeParsedString(g->getFileName()); + const LinkDestinationData ldd(g->getDest(), g->getNamedDest(), parentDoc, !fileName.isEmpty()); + // create link: fileName, namedDest, object pointer + popplerLink = std::make_unique(linkArea, fileName, LinkDestination(ldd)); + } break; + + case actionLaunch: { + LinkLaunch *e = (LinkLaunch *)a; + const GooString *p = e->getParams(); + popplerLink = std::make_unique(linkArea, e->getFileName()->c_str(), p ? p->c_str() : nullptr); + } break; + + case actionNamed: { + const std::string &name = ((LinkNamed *)a)->getName(); + if (name == "NextPage") { + popplerLink = std::make_unique(linkArea, LinkAction::PageNext); + } else if (name == "PrevPage") { + popplerLink = std::make_unique(linkArea, LinkAction::PagePrev); + } else if (name == "FirstPage") { + popplerLink = std::make_unique(linkArea, LinkAction::PageFirst); + } else if (name == "LastPage") { + popplerLink = std::make_unique(linkArea, LinkAction::PageLast); + } else if (name == "GoBack") { + popplerLink = std::make_unique(linkArea, LinkAction::HistoryBack); + } else if (name == "GoForward") { + popplerLink = std::make_unique(linkArea, LinkAction::HistoryForward); + } else if (name == "Quit") { + popplerLink = std::make_unique(linkArea, LinkAction::Quit); + } else if (name == "GoToPage") { + popplerLink = std::make_unique(linkArea, LinkAction::GoToPage); + } else if (name == "Find") { + popplerLink = std::make_unique(linkArea, LinkAction::Find); + } else if (name == "FullScreen") { + popplerLink = std::make_unique(linkArea, LinkAction::Presentation); + } else if (name == "Print") { + popplerLink = std::make_unique(linkArea, LinkAction::Print); + } else if (name == "Close") { + // acroread closes the document always, doesn't care whether + // its presentation mode or not + // popplerLink = std::make_unique(linkArea, LinkAction::EndPresentation); + popplerLink = std::make_unique(linkArea, LinkAction::Close); + } else if (name == "SaveAs") { + popplerLink = std::make_unique(linkArea, LinkAction::SaveAs); + } else { + qWarning() << "Unhandled action name" << name.c_str(); + } + } break; + + case actionURI: { + popplerLink = std::make_unique(linkArea, ((LinkURI *)a)->getURI().c_str()); + } break; + + case actionSound: { + ::LinkSound *ls = (::LinkSound *)a; + popplerLink = std::make_unique(linkArea, ls->getVolume(), ls->getSynchronous(), ls->getRepeat(), ls->getMix(), new SoundObject(ls->getSound())); + } break; + + case actionJavaScript: { + ::LinkJavaScript *ljs = (::LinkJavaScript *)a; + popplerLink = std::make_unique(linkArea, UnicodeParsedString(ljs->getScript())); + } break; + + case actionMovie: { + ::LinkMovie *lm = (::LinkMovie *)a; + + const QString title = (lm->hasAnnotTitle() ? UnicodeParsedString(lm->getAnnotTitle()) : QString()); + + Ref reference = Ref::INVALID(); + if (lm->hasAnnotRef()) { + reference = *lm->getAnnotRef(); + } + + LinkMovie::Operation operation = LinkMovie::Play; + switch (lm->getOperation()) { + case ::LinkMovie::operationTypePlay: + operation = LinkMovie::Play; + break; + case ::LinkMovie::operationTypePause: + operation = LinkMovie::Pause; + break; + case ::LinkMovie::operationTypeResume: + operation = LinkMovie::Resume; + break; + case ::LinkMovie::operationTypeStop: + operation = LinkMovie::Stop; + break; + }; + + popplerLink = std::make_unique(linkArea, operation, title, reference); + } break; + + case actionRendition: { + ::LinkRendition *lrn = (::LinkRendition *)a; + + Ref reference = Ref::INVALID(); + if (lrn->hasScreenAnnot()) { + reference = lrn->getScreenAnnot(); + } + + popplerLink = std::make_unique(linkArea, lrn->getMedia() ? lrn->getMedia()->copy() : nullptr, lrn->getOperation(), UnicodeParsedString(lrn->getScript()), reference); + } break; + + case actionOCGState: { + ::LinkOCGState *plocg = (::LinkOCGState *)a; + + LinkOCGStatePrivate *locgp = new LinkOCGStatePrivate(linkArea, plocg->getStateList(), plocg->getPreserveRB()); + popplerLink = std::make_unique(locgp); + } break; + + case actionHide: { + ::LinkHide *lh = (::LinkHide *)a; + + LinkHidePrivate *lhp = new LinkHidePrivate(linkArea, lh->hasTargetName() ? UnicodeParsedString(lh->getTargetName()) : QString(), lh->isShowAction()); + popplerLink = std::make_unique(lhp); + } break; + + case actionResetForm: + // Not handled in Qt6 front-end yet + break; + + case actionUnknown: + break; + } + + if (popplerLink) { + std::vector> links; + for (const std::unique_ptr<::LinkAction> &nextAction : a->nextActions()) { + links.push_back(convertLinkActionToLink(nextAction.get(), parentDoc, linkArea)); + } + LinkPrivate::get(popplerLink.get())->nextLinks = std::move(links); + } + + return popplerLink; +} + +inline TextPage *PageData::prepareTextSearch(const QString &text, Page::Rotation rotate, QVector *u) +{ + *u = text.toUcs4(); + + const int rotation = (int)rotate * 90; + + // fetch ourselves a textpage + TextOutputDev td(nullptr, true, 0, false, false); + parentDoc->doc->displayPage(&td, index + 1, 72, 72, rotation, false, true, false, nullptr, nullptr, nullptr, nullptr, true); + TextPage *textPage = td.takeText(); + + return textPage; +} + +inline bool PageData::performSingleTextSearch(TextPage *textPage, QVector &u, double &sLeft, double &sTop, double &sRight, double &sBottom, Page::SearchDirection direction, bool sCase, bool sWords, bool sDiacritics, + bool sAcrossLines) +{ + if (direction == Page::FromTop) { + return textPage->findText(u.data(), u.size(), true, true, false, false, sCase, sDiacritics, sAcrossLines, false, sWords, &sLeft, &sTop, &sRight, &sBottom, nullptr, nullptr); + } else if (direction == Page::NextResult) { + return textPage->findText(u.data(), u.size(), false, true, true, false, sCase, sDiacritics, sAcrossLines, false, sWords, &sLeft, &sTop, &sRight, &sBottom, nullptr, nullptr); + } else if (direction == Page::PreviousResult) { + return textPage->findText(u.data(), u.size(), false, true, true, false, sCase, sDiacritics, sAcrossLines, true, sWords, &sLeft, &sTop, &sRight, &sBottom, nullptr, nullptr); + } + + return false; +} + +inline QList PageData::performMultipleTextSearch(TextPage *textPage, QVector &u, bool sCase, bool sWords, bool sDiacritics, bool sAcrossLines) +{ + QList results; + double sLeft = 0.0, sTop = 0.0, sRight = 0.0, sBottom = 0.0; + bool sIgnoredHyphen = false; + PDFRectangle continueMatch; + continueMatch.x1 = DBL_MAX; // we use this to detect valid return values + + while (textPage->findText(u.data(), u.size(), false, true, true, false, sCase, sDiacritics, sAcrossLines, false, sWords, &sLeft, &sTop, &sRight, &sBottom, &continueMatch, &sIgnoredHyphen)) { + QRectF result; + + result.setLeft(sLeft); + result.setTop(sTop); + result.setRight(sRight); + result.setBottom(sBottom); + + results.append(result); + + if (sAcrossLines && continueMatch.x1 != DBL_MAX) { + QRectF resultN; + + resultN.setLeft(continueMatch.x1); + resultN.setTop(continueMatch.y1); + resultN.setRight(continueMatch.x2); + resultN.setBottom(continueMatch.y1); + + results.append(resultN); + continueMatch.x1 = DBL_MAX; + } + } + + return results; +} + +Page::Page(DocumentData *doc, int index) +{ + m_page = new PageData(); + m_page->index = index; + m_page->parentDoc = doc; + m_page->page = doc->doc->getPage(m_page->index + 1); + m_page->transition = nullptr; +} + +Page::~Page() +{ + delete m_page->transition; + delete m_page; +} + +// Callback that filters out everything but form fields +static auto annotDisplayDecideCbk = [](Annot *annot, void *user_data) { + // Hide everything but forms + return (annot->getType() == Annot::typeWidget); +}; + +// A nullptr, but with the type of a function pointer +// Needed to make the ternary operator happy. +static bool (*nullAnnotCallBack)(Annot *annot, void *user_data) = nullptr; + +static auto shouldAbortRenderInternalCallback = [](void *user_data) { + OutputDevCallbackHelper *helper = reinterpret_cast(user_data); + return helper->shouldAbortRenderCallback(helper->payload); +}; + +static auto shouldAbortExtractionInternalCallback = [](void *user_data) { + TextExtractionAbortHelper *helper = reinterpret_cast(user_data); + return helper->shouldAbortExtractionCallback(helper->payload); +}; + +// A nullptr, but with the type of a function pointer +// Needed to make the ternary operator happy. +static bool (*nullAbortCallBack)(void *user_data) = nullptr; + +static bool renderToQPainter(QImageDumpingQPainterOutputDev *qpainter_output, QPainter *painter, PageData *page, double xres, double yres, int x, int y, int w, int h, Page::Rotation rotate, Page::PainterFlags flags) +{ + const bool savePainter = !(flags & Page::DontSaveAndRestore); + if (savePainter) { + painter->save(); + } + if (page->parentDoc->m_hints & Document::Antialiasing) { + painter->setRenderHint(QPainter::Antialiasing); + } + if (page->parentDoc->m_hints & Document::TextAntialiasing) { + painter->setRenderHint(QPainter::TextAntialiasing); + } + painter->translate(x == -1 ? 0 : -x, y == -1 ? 0 : -y); + + qpainter_output->startDoc(page->parentDoc->doc); + + const bool hideAnnotations = page->parentDoc->m_hints & Document::HideAnnotations; + + OutputDevCallbackHelper *abortHelper = qpainter_output; + page->parentDoc->doc->displayPageSlice(qpainter_output, page->index + 1, xres, yres, (int)rotate * 90, false, true, false, x, y, w, h, abortHelper->shouldAbortRenderCallback ? shouldAbortRenderInternalCallback : nullAbortCallBack, + abortHelper, (hideAnnotations) ? annotDisplayDecideCbk : nullAnnotCallBack, nullptr, true); + if (savePainter) { + painter->restore(); + } + return true; +} + +QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h, Rotation rotate) const +{ + return renderToImage(xres, yres, x, y, w, h, rotate, nullptr, nullptr, QVariant()); +} + +QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h, Rotation rotate, RenderToImagePartialUpdateFunc partialUpdateCallback, ShouldRenderToImagePartialQueryFunc shouldDoPartialUpdateCallback, + const QVariant &payload) const +{ + return renderToImage(xres, yres, x, y, w, h, rotate, partialUpdateCallback, shouldDoPartialUpdateCallback, nullptr, payload); +} + +// Translate the text hinting settings from poppler-speak to Qt-speak +static QFont::HintingPreference QFontHintingFromPopplerHinting(int renderHints) +{ + QFont::HintingPreference result = QFont::PreferNoHinting; + + if (renderHints & Document::TextHinting) { + result = (renderHints & Document::TextSlightHinting) ? QFont::PreferVerticalHinting : QFont::PreferFullHinting; + } + + return result; +} + +QImage Page::renderToImage(double xres, double yres, int xPos, int yPos, int w, int h, Rotation rotate, RenderToImagePartialUpdateFunc partialUpdateCallback, ShouldRenderToImagePartialQueryFunc shouldDoPartialUpdateCallback, + ShouldAbortQueryFunc shouldAbortRenderCallback, const QVariant &payload) const +{ + int rotation = (int)rotate * 90; + QImage img; + switch (m_page->parentDoc->m_backend) { + case Poppler::Document::SplashBackend: { + SplashColor bgColor; + const bool overprintPreview = m_page->parentDoc->m_hints & Document::OverprintPreview ? true : false; + if (overprintPreview) { + unsigned char c, m, y, k; + + c = 255 - m_page->parentDoc->paperColor.blue(); + m = 255 - m_page->parentDoc->paperColor.red(); + y = 255 - m_page->parentDoc->paperColor.green(); + k = c; + if (m < k) { + k = m; + } + if (y < k) { + k = y; + } + bgColor[0] = c - k; + bgColor[1] = m - k; + bgColor[2] = y - k; + bgColor[3] = k; + for (int i = 4; i < SPOT_NCOMPS + 4; i++) { + bgColor[i] = 0; + } + } else { + bgColor[0] = m_page->parentDoc->paperColor.blue(); + bgColor[1] = m_page->parentDoc->paperColor.green(); + bgColor[2] = m_page->parentDoc->paperColor.red(); + } + + const SplashColorMode colorMode = overprintPreview ? splashModeDeviceN8 : splashModeXBGR8; + + SplashThinLineMode thinLineMode = splashThinLineDefault; + if (m_page->parentDoc->m_hints & Document::ThinLineShape) { + thinLineMode = splashThinLineShape; + } + if (m_page->parentDoc->m_hints & Document::ThinLineSolid) { + thinLineMode = splashThinLineSolid; + } + + const bool ignorePaperColor = m_page->parentDoc->m_hints & Document::IgnorePaperColor; + + Qt6SplashOutputDev splash_output(colorMode, 4, false, ignorePaperColor, ignorePaperColor ? nullptr : bgColor, true, thinLineMode, overprintPreview); + + splash_output.setCallbacks(partialUpdateCallback, shouldDoPartialUpdateCallback, shouldAbortRenderCallback, payload); + + splash_output.setFontAntialias(m_page->parentDoc->m_hints & Document::TextAntialiasing ? true : false); + splash_output.setVectorAntialias(m_page->parentDoc->m_hints & Document::Antialiasing ? true : false); + splash_output.setFreeTypeHinting(m_page->parentDoc->m_hints & Document::TextHinting ? true : false, m_page->parentDoc->m_hints & Document::TextSlightHinting ? true : false); + +#ifdef USE_CMS + splash_output.setDisplayProfile(m_page->parentDoc->m_displayProfile); +#endif + + splash_output.startDoc(m_page->parentDoc->doc); + + const bool hideAnnotations = m_page->parentDoc->m_hints & Document::HideAnnotations; + + OutputDevCallbackHelper *abortHelper = &splash_output; + m_page->parentDoc->doc->displayPageSlice(&splash_output, m_page->index + 1, xres, yres, rotation, false, true, false, xPos, yPos, w, h, shouldAbortRenderCallback ? shouldAbortRenderInternalCallback : nullAbortCallBack, abortHelper, + (hideAnnotations) ? annotDisplayDecideCbk : nullAnnotCallBack, nullptr, true); + + img = splash_output.getXBGRImage(true /* takeImageData */); + break; + } + case Poppler::Document::QPainterBackend: { + QSize size = pageSize(); + QImage tmpimg(w == -1 ? qRound(size.width() * xres / 72.0) : w, h == -1 ? qRound(size.height() * yres / 72.0) : h, QImage::Format_ARGB32); + + QColor bgColor(m_page->parentDoc->paperColor.red(), m_page->parentDoc->paperColor.green(), m_page->parentDoc->paperColor.blue(), m_page->parentDoc->paperColor.alpha()); + + tmpimg.fill(bgColor); + + QPainter painter(&tmpimg); + QImageDumpingQPainterOutputDev qpainter_output(&painter, &tmpimg); + + qpainter_output.setHintingPreference(QFontHintingFromPopplerHinting(m_page->parentDoc->m_hints)); + +#ifdef USE_CMS + qpainter_output.setDisplayProfile(m_page->parentDoc->m_displayProfile); +#endif + + qpainter_output.setCallbacks(partialUpdateCallback, shouldDoPartialUpdateCallback, shouldAbortRenderCallback, payload); + renderToQPainter(&qpainter_output, &painter, m_page, xres, yres, xPos, yPos, w, h, rotate, DontSaveAndRestore); + painter.end(); + img = tmpimg; + break; + } + } + + if (shouldAbortRenderCallback && shouldAbortRenderCallback(payload)) { + return QImage(); + } + + return img; +} + +bool Page::renderToPainter(QPainter *painter, double xres, double yres, int x, int y, int w, int h, Rotation rotate, PainterFlags flags) const +{ + if (!painter) { + return false; + } + + switch (m_page->parentDoc->m_backend) { + case Poppler::Document::SplashBackend: + return false; + case Poppler::Document::QPainterBackend: { + QImageDumpingQPainterOutputDev qpainter_output(painter, nullptr); + + qpainter_output.setHintingPreference(QFontHintingFromPopplerHinting(m_page->parentDoc->m_hints)); + + return renderToQPainter(&qpainter_output, painter, m_page, xres, yres, x, y, w, h, rotate, flags); + } + } + return false; +} + +QImage Page::thumbnail() const +{ + unsigned char *data = nullptr; + int w = 0; + int h = 0; + int rowstride = 0; + bool r = m_page->page->loadThumb(&data, &w, &h, &rowstride); + QImage ret; + if (r) { + // first construct a temporary image with the data got, + // then force a copy of it so we can free the raw thumbnail data + ret = QImage(data, w, h, rowstride, QImage::Format_RGB888).copy(); + gfree(data); + } + return ret; +} + +QString Page::text(const QRectF &r, TextLayout textLayout) const +{ + TextOutputDev *output_dev; + GooString *s; + QString result; + + const bool rawOrder = textLayout == RawOrderLayout; + output_dev = new TextOutputDev(nullptr, false, 0, rawOrder, false); + m_page->parentDoc->doc->displayPageSlice(output_dev, m_page->index + 1, 72, 72, 0, false, true, false, -1, -1, -1, -1, nullptr, nullptr, nullptr, nullptr, true); + if (r.isNull()) { + const PDFRectangle *rect = m_page->page->getCropBox(); + if (orientation() == Orientation::Portrait || orientation() == Orientation::UpsideDown) { + s = output_dev->getText(rect->x1, rect->y1, rect->x2, rect->y2); + } else { + s = output_dev->getText(rect->y1, rect->x1, rect->y2, rect->x2); + } + } else { + s = output_dev->getText(r.left(), r.top(), r.right(), r.bottom()); + } + + result = QString::fromUtf8(s->c_str()); + + delete output_dev; + delete s; + return result; +} + +QString Page::text(const QRectF &r) const +{ + return text(r, PhysicalLayout); +} + +bool Page::search(const QString &text, double &sLeft, double &sTop, double &sRight, double &sBottom, SearchDirection direction, SearchFlags flags, Rotation rotate) const +{ + const bool sCase = flags.testFlag(IgnoreCase) ? false : true; + const bool sWords = flags.testFlag(WholeWords) ? true : false; + const bool sDiacritics = flags.testFlag(IgnoreDiacritics) ? true : false; + const bool sAcrossLines = flags.testFlag(AcrossLines) ? true : false; + + QVector u; + TextPage *textPage = m_page->prepareTextSearch(text, rotate, &u); + + const bool found = m_page->performSingleTextSearch(textPage, u, sLeft, sTop, sRight, sBottom, direction, sCase, sWords, sDiacritics, sAcrossLines); + + textPage->decRefCnt(); + + return found; +} + +QList Page::search(const QString &text, SearchFlags flags, Rotation rotate) const +{ + const bool sCase = flags.testFlag(IgnoreCase) ? false : true; + const bool sWords = flags.testFlag(WholeWords) ? true : false; + const bool sDiacritics = flags.testFlag(IgnoreDiacritics) ? true : false; + const bool sAcrossLines = flags.testFlag(AcrossLines) ? true : false; + + QVector u; + TextPage *textPage = m_page->prepareTextSearch(text, rotate, &u); + + QList results = m_page->performMultipleTextSearch(textPage, u, sCase, sWords, sDiacritics, sAcrossLines); + + textPage->decRefCnt(); + + return results; +} + +std::vector> Page::textList(Rotation rotate) const +{ + return textList(rotate, nullptr, QVariant()); +} + +std::vector> Page::textList(Rotation rotate, ShouldAbortQueryFunc shouldAbortExtractionCallback, const QVariant &closure) const +{ + std::vector> output_list; + + TextOutputDev output_dev(nullptr, false, 0, false, false); + + int rotation = (int)rotate * 90; + + TextExtractionAbortHelper abortHelper(shouldAbortExtractionCallback, closure); + m_page->parentDoc->doc->displayPageSlice(&output_dev, m_page->index + 1, 72, 72, rotation, false, false, false, -1, -1, -1, -1, shouldAbortExtractionCallback ? shouldAbortExtractionInternalCallback : nullAbortCallBack, &abortHelper, + nullptr, nullptr, true); + + std::unique_ptr word_list = output_dev.makeWordList(); + + if (shouldAbortExtractionCallback && shouldAbortExtractionCallback(closure)) { + return output_list; + } + + QHash wordBoxMap; + + output_list.reserve(word_list->getLength()); + for (int i = 0; i < word_list->getLength(); i++) { + TextWord *word = word_list->get(i); + GooString *gooWord = word->getText(); + QString string = QString::fromUtf8(gooWord->c_str()); + delete gooWord; + double xMin, yMin, xMax, yMax; + word->getBBox(&xMin, &yMin, &xMax, &yMax); + + auto text_box = std::make_unique(string, QRectF(xMin, yMin, xMax - xMin, yMax - yMin)); + text_box->m_data->hasSpaceAfter = word->hasSpaceAfter() == true; + text_box->m_data->charBBoxes.reserve(word->getLength()); + for (int j = 0; j < word->getLength(); ++j) { + word->getCharBBox(j, &xMin, &yMin, &xMax, &yMax); + text_box->m_data->charBBoxes.append(QRectF(xMin, yMin, xMax - xMin, yMax - yMin)); + } + + wordBoxMap.insert(word, text_box.get()); + + output_list.push_back(std::move(text_box)); + } + + for (int i = 0; i < word_list->getLength(); i++) { + TextWord *word = word_list->get(i); + TextBox *text_box = wordBoxMap.value(word); + text_box->m_data->nextWord = wordBoxMap.value(word->nextWord()); + } + + return output_list; +} + +PageTransition *Page::transition() const +{ + if (!m_page->transition) { + Object o = m_page->page->getTrans(); + PageTransitionParams params; + params.dictObj = &o; + if (params.dictObj->isDict()) { + m_page->transition = new PageTransition(params); + } + } + return m_page->transition; +} + +std::unique_ptr Page::action(PageAction act) const +{ + if (act == Page::Opening || act == Page::Closing) { + Object o = m_page->page->getActions(); + if (!o.isDict()) { + return nullptr; + } + Dict *dict = o.getDict(); + const char *key = act == Page::Opening ? "O" : "C"; + Object o2 = dict->lookup((char *)key); + std::unique_ptr<::LinkAction> lact = ::LinkAction::parseAction(&o2, m_page->parentDoc->doc->getCatalog()->getBaseURI()); + if (lact != nullptr) { + return m_page->convertLinkActionToLink(lact.get(), QRectF()); + } + } + return nullptr; +} + +QSizeF Page::pageSizeF() const +{ + Page::Orientation orient = orientation(); + if ((Page::Landscape == orient) || (Page::Seascape == orient)) { + return QSizeF(m_page->page->getCropHeight(), m_page->page->getCropWidth()); + } else { + return QSizeF(m_page->page->getCropWidth(), m_page->page->getCropHeight()); + } +} + +QSize Page::pageSize() const +{ + return pageSizeF().toSize(); +} + +Page::Orientation Page::orientation() const +{ + const int rotation = m_page->page->getRotate(); + switch (rotation) { + case 90: + return Page::Landscape; + break; + case 180: + return Page::UpsideDown; + break; + case 270: + return Page::Seascape; + break; + default: + return Page::Portrait; + } +} + +void Page::defaultCTM(double *CTM, double dpiX, double dpiY, int rotate, bool upsideDown) +{ + m_page->page->getDefaultCTM(CTM, dpiX, dpiY, rotate, false, upsideDown); +} + +std::vector> Page::links() const +{ + LinkExtractorOutputDev link_dev(m_page); + m_page->parentDoc->doc->processLinks(&link_dev, m_page->index + 1); + return link_dev.links(); +} + +std::vector> Page::annotations() const +{ + return AnnotationPrivate::findAnnotations(m_page->page, m_page->parentDoc, QSet()); +} + +std::vector> Page::annotations(const QSet &subtypes) const +{ + return AnnotationPrivate::findAnnotations(m_page->page, m_page->parentDoc, subtypes); +} + +void Page::addAnnotation(const Annotation *ann) +{ + AnnotationPrivate::addAnnotationToPage(m_page->page, m_page->parentDoc, ann); +} + +void Page::removeAnnotation(const Annotation *ann) +{ + AnnotationPrivate::removeAnnotationFromPage(m_page->page, ann); +} + +std::vector> Page::formFields() const +{ + std::vector> fields; + ::Page *p = m_page->page; + const std::unique_ptr form = p->getFormWidgets(); + int formcount = form->getNumWidgets(); + for (int i = 0; i < formcount; ++i) { + ::FormWidget *fm = form->getWidget(i); + std::unique_ptr ff; + switch (fm->getType()) { + case formButton: { + ff = std::make_unique(m_page->parentDoc, p, static_cast(fm)); + } break; + + case formText: { + ff = std::make_unique(m_page->parentDoc, p, static_cast(fm)); + } break; + + case formChoice: { + ff = std::make_unique(m_page->parentDoc, p, static_cast(fm)); + } break; + + case formSignature: { + ff = std::make_unique(m_page->parentDoc, p, static_cast(fm)); + } break; + + default:; + } + + if (ff) { + fields.push_back(std::move(ff)); + } + } + + return fields; +} + +double Page::duration() const +{ + return m_page->page->getDuration(); +} + +QString Page::label() const +{ + GooString goo; + if (!m_page->parentDoc->doc->getCatalog()->indexToLabel(m_page->index, &goo)) { + return QString(); + } + + return UnicodeParsedString(&goo); +} + +int Page::index() const +{ + return m_page->index; +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-pdf-converter.cc b/poppler-24.05.0/qt6/src/poppler-pdf-converter.cc new file mode 100644 index 0000000000000000000000000000000000000000..4d3cad1bcc6fc6fb9378bc97b2b11ecfa545b145 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-pdf-converter.cc @@ -0,0 +1,361 @@ +/* poppler-pdf-converter.cc: qt interface to poppler + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2008, 2009, 2020-2022, Albert Astals Cid + * Copyright (C) 2020, Thorsten Behrens + * Copyright (C) 2020, Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021, Klarälvdalens Datakonsult AB, a KDAB Group company, . + * Copyright (C) 2021, Zachary Travis + * Copyright (C) 2021, Georgiy Sgibnev . Work sponsored by lab50.net. + * Copyright (C) 2022, Martin + * Copyright (C) 2022, Felix Jung + * + * 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-qt6.h" + +#include "poppler-annotation-helper.h" +#include "poppler-annotation-private.h" +#include "poppler-private.h" +#include "poppler-converter-private.h" +#include "poppler-qiodeviceoutstream-private.h" + +#include +#include + +#include "Array.h" +#include "Form.h" +#include + +namespace Poppler { + +class PDFConverterPrivate : public BaseConverterPrivate +{ +public: + PDFConverterPrivate(); + ~PDFConverterPrivate() override; + + PDFConverter::PDFOptions opts; +}; + +PDFConverterPrivate::PDFConverterPrivate() : BaseConverterPrivate() { } + +PDFConverterPrivate::~PDFConverterPrivate() = default; + +PDFConverter::PDFConverter(DocumentData *document) : BaseConverter(*new PDFConverterPrivate()) +{ + Q_D(PDFConverter); + d->document = document; +} + +PDFConverter::~PDFConverter() { } + +void PDFConverter::setPDFOptions(PDFConverter::PDFOptions options) +{ + Q_D(PDFConverter); + d->opts = options; +} + +PDFConverter::PDFOptions PDFConverter::pdfOptions() const +{ + Q_D(const PDFConverter); + return d->opts; +} + +bool PDFConverter::convert() +{ + Q_D(PDFConverter); + d->lastError = NoError; + + if (d->document->locked) { + d->lastError = FileLockedError; + return false; + } + + QIODevice *dev = d->openDevice(); + if (!dev) { + d->lastError = OpenOutputError; + return false; + } + + bool deleteFile = false; + if (QFile *file = qobject_cast(dev)) { + deleteFile = !file->exists(); + } + + int errorCode = errNone; + QIODeviceOutStream stream(dev); + if (d->opts & WithChanges) { + errorCode = d->document->doc->saveAs(&stream); + } else { + errorCode = d->document->doc->saveWithoutChangesAs(&stream); + } + d->closeDevice(); + if (errorCode != errNone) { + if (deleteFile) { + qobject_cast(dev)->remove(); + } + if (errorCode == errOpenFile) { + d->lastError = OpenOutputError; + } else { + d->lastError = NotSupportedInputFileError; + } + } + + return (errorCode == errNone); +} + +bool PDFConverter::sign(const NewSignatureData &data) +{ + Q_D(PDFConverter); + d->lastError = NoError; + + if (d->document->locked) { + d->lastError = FileLockedError; + return false; + } + + if (data.signatureText().isEmpty()) { + qWarning() << "No signature text given"; + return false; + } + + ::PDFDoc *doc = d->document->doc; + ::Page *destPage = doc->getPage(data.page() + 1); + std::unique_ptr gSignatureText = std::unique_ptr(QStringToUnicodeGooString(data.signatureText())); + std::unique_ptr gSignatureLeftText = std::unique_ptr(QStringToUnicodeGooString(data.signatureLeftText())); + const auto reason = std::unique_ptr(data.reason().isEmpty() ? nullptr : QStringToUnicodeGooString(data.reason())); + const auto location = std::unique_ptr(data.location().isEmpty() ? nullptr : QStringToUnicodeGooString(data.location())); + const auto ownerPwd = std::optional(data.documentOwnerPassword().constData()); + const auto userPwd = std::optional(data.documentUserPassword().constData()); + return doc->sign(d->outputFileName.toUtf8().constData(), data.certNickname().toUtf8().constData(), data.password().toUtf8().constData(), QStringToGooString(data.fieldPartialName()), data.page() + 1, + boundaryToPdfRectangle(destPage, data.boundingRectangle(), Annotation::FixedRotation), *gSignatureText, *gSignatureLeftText, data.fontSize(), data.leftFontSize(), convertQColor(data.fontColor()), data.borderWidth(), + convertQColor(data.borderColor()), convertQColor(data.backgroundColor()), reason.get(), location.get(), data.imagePath().toStdString(), ownerPwd, userPwd); +} + +struct PDFConverter::NewSignatureData::NewSignatureDataPrivate +{ + NewSignatureDataPrivate() = default; + + QString certNickname; + QString password; + int page; + QRectF boundingRectangle; + QString signatureText; + QString signatureLeftText; + QString reason; + QString location; + double fontSize = 10.0; + double leftFontSize = 20.0; + QColor fontColor = Qt::red; + QColor borderColor = Qt::red; + double borderWidth = 1.5; + QColor backgroundColor = QColor(240, 240, 240); + + QString partialName = QUuid::createUuid().toString(); + + QByteArray documentOwnerPassword; + QByteArray documentUserPassword; + + QString imagePath; +}; + +PDFConverter::NewSignatureData::NewSignatureData() : d(new NewSignatureDataPrivate()) { } + +PDFConverter::NewSignatureData::~NewSignatureData() +{ + delete d; +} + +QString PDFConverter::NewSignatureData::certNickname() const +{ + return d->certNickname; +} + +void PDFConverter::NewSignatureData::setCertNickname(const QString &certNickname) +{ + d->certNickname = certNickname; +} + +QString PDFConverter::NewSignatureData::password() const +{ + return d->password; +} + +void PDFConverter::NewSignatureData::setPassword(const QString &password) +{ + d->password = password; +} + +int PDFConverter::NewSignatureData::page() const +{ + return d->page; +} + +void PDFConverter::NewSignatureData::setPage(int page) +{ + d->page = page; +} + +QRectF PDFConverter::NewSignatureData::boundingRectangle() const +{ + return d->boundingRectangle; +} + +void PDFConverter::NewSignatureData::setBoundingRectangle(const QRectF &rect) +{ + d->boundingRectangle = rect; +} + +QString PDFConverter::NewSignatureData::signatureText() const +{ + return d->signatureText; +} + +void PDFConverter::NewSignatureData::setSignatureText(const QString &text) +{ + d->signatureText = text; +} + +QString PDFConverter::NewSignatureData::signatureLeftText() const +{ + return d->signatureLeftText; +} + +void PDFConverter::NewSignatureData::setSignatureLeftText(const QString &text) +{ + d->signatureLeftText = text; +} + +QString PDFConverter::NewSignatureData::reason() const +{ + return d->reason; +} + +void PDFConverter::NewSignatureData::setReason(const QString &reason) +{ + d->reason = reason; +} + +QString PDFConverter::NewSignatureData::location() const +{ + return d->location; +} + +void PDFConverter::NewSignatureData::setLocation(const QString &location) +{ + d->location = location; +} + +double PDFConverter::NewSignatureData::fontSize() const +{ + return d->fontSize; +} + +void PDFConverter::NewSignatureData::setFontSize(double fontSize) +{ + d->fontSize = fontSize; +} + +double PDFConverter::NewSignatureData::leftFontSize() const +{ + return d->leftFontSize; +} + +void PDFConverter::NewSignatureData::setLeftFontSize(double fontSize) +{ + d->leftFontSize = fontSize; +} + +QColor PDFConverter::NewSignatureData::fontColor() const +{ + return d->fontColor; +} + +void PDFConverter::NewSignatureData::setFontColor(const QColor &color) +{ + d->fontColor = color; +} + +QColor PDFConverter::NewSignatureData::borderColor() const +{ + return d->borderColor; +} + +void PDFConverter::NewSignatureData::setBorderColor(const QColor &color) +{ + d->borderColor = color; +} + +QColor PDFConverter::NewSignatureData::backgroundColor() const +{ + return d->backgroundColor; +} + +double PDFConverter::NewSignatureData::borderWidth() const +{ + return d->borderWidth; +} + +void PDFConverter::NewSignatureData::setBorderWidth(double width) +{ + d->borderWidth = width; +} + +void PDFConverter::NewSignatureData::setBackgroundColor(const QColor &color) +{ + d->backgroundColor = color; +} + +QString PDFConverter::NewSignatureData::fieldPartialName() const +{ + return d->partialName; +} + +void PDFConverter::NewSignatureData::setFieldPartialName(const QString &name) +{ + d->partialName = name; +} + +QByteArray PDFConverter::NewSignatureData::documentOwnerPassword() const +{ + return d->documentOwnerPassword; +} + +void PDFConverter::NewSignatureData::setDocumentOwnerPassword(const QByteArray &password) +{ + d->documentOwnerPassword = password; +} + +QByteArray PDFConverter::NewSignatureData::documentUserPassword() const +{ + return d->documentUserPassword; +} + +void PDFConverter::NewSignatureData::setDocumentUserPassword(const QByteArray &password) +{ + d->documentUserPassword = password; +} + +QString PDFConverter::NewSignatureData::imagePath() const +{ + return d->imagePath; +} + +void PDFConverter::NewSignatureData::setImagePath(const QString &path) +{ + d->imagePath = path; +} +} diff --git a/poppler-24.05.0/qt6/src/poppler-private.cc b/poppler-24.05.0/qt6/src/poppler-private.cc new file mode 100644 index 0000000000000000000000000000000000000000..480bb5ec099ecfdc6c6e86f20cbbdfe8af74a37e --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-private.cc @@ -0,0 +1,264 @@ +/* poppler-private.cc: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2006, 2011, 2015, 2017-2020 by Albert Astals Cid + * Copyright (C) 2008, 2010, 2011, 2014 by Pino Toscano + * Copyright (C) 2013 by Thomas Freitag + * Copyright (C) 2013 Adrian Johnson + * Copyright (C) 2016 Jakub Alba + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018-2020 Adam Reichold + * Copyright (C) 2019, 2020, 2024 Oliver Sander + * Copyright (C) 2019 João Netto + * Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, + * Copyright (C) 2021 Mahmoud Khalil + * Copyright (C) 2023 Shivodit Gill + * Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela + * Inspired on code by + * Copyright (C) 2004 by Albert Astals Cid + * Copyright (C) 2004 by Enrico Ros + * + * 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-private.h" +#include "poppler-form.h" + +#include +#include +#include + +#include +#include +#include +#include +#include + +#ifdef ANDROID +# include +# include +# include +# include +# include +# include +#endif + +namespace Poppler { + +namespace Debug { + +static void qDebugDebugFunction(const QString &message, const QVariant & /*closure*/) +{ + qDebug() << message; +} + +PopplerDebugFunc debugFunction = qDebugDebugFunction; +QVariant debugClosure; + +} + +void setDebugErrorFunction(PopplerDebugFunc function, const QVariant &closure) +{ + Debug::debugFunction = function ? function : Debug::qDebugDebugFunction; + Debug::debugClosure = closure; +} + +void qt6ErrorFunction(ErrorCategory /*category*/, Goffset pos, const char *msg) +{ + QString emsg; + + if (pos >= 0) { + emsg = QStringLiteral("Error (%1): ").arg(pos); + } else { + emsg = QStringLiteral("Error: "); + } + emsg += QString::fromLatin1(msg); + (*Debug::debugFunction)(emsg, Debug::debugClosure); +} + +QString unicodeToQString(const Unicode *u, int len) +{ + const UnicodeMap *utf8Map = globalParams->getUtf8Map(); + + // ignore the last characters if they are 0x0 + while ((len > 0) && (u[len - 1] == 0)) { + --len; + } + + GooString convertedStr; + for (int i = 0; i < len; ++i) { + char buf[8]; + const int n = utf8Map->mapUnicode(u[i], buf, sizeof(buf)); + convertedStr.append(buf, n); + } + + return QString::fromUtf8(convertedStr.c_str(), convertedStr.getLength()); +} + +QString unicodeToQString(const std::vector &u) +{ + return unicodeToQString(u.data(), u.size()); +} + +QString UnicodeParsedString(const GooString *s1) +{ + return (s1) ? UnicodeParsedString(s1->toStr()) : QString(); +} + +QString UnicodeParsedString(const std::string &s1) +{ + if (s1.empty()) { + return QString(); + } + + if (hasUnicodeByteOrderMark(s1) || hasUnicodeByteOrderMarkLE(s1)) { + return QString::fromUtf16(reinterpret_cast(s1.c_str()), s1.size() / 2); + } else { + int stringLength; + const char *cString = pdfDocEncodingToUTF16(s1, &stringLength); + auto result = QString::fromUtf16(reinterpret_cast(cString), stringLength / 2); + delete[] cString; + return result; + } +} + +GooString *QStringToUnicodeGooString(const QString &s) +{ + if (s.isEmpty()) { + return new GooString(); + } + int len = s.length() * 2 + 2; + char *cstring = (char *)gmallocn(len, sizeof(char)); + cstring[0] = (char)0xfe; + cstring[1] = (char)0xff; + for (int i = 0; i < s.length(); ++i) { + cstring[2 + i * 2] = s.at(i).row(); + cstring[3 + i * 2] = s.at(i).cell(); + } + GooString *ret = new GooString(cstring, len); + gfree(cstring); + return ret; +} + +GooString *QStringToGooString(const QString &s) +{ + int len = s.length(); + char *cstring = (char *)gmallocn(s.length(), sizeof(char)); + for (int i = 0; i < len; ++i) { + cstring[i] = s.at(i).unicode(); + } + GooString *ret = new GooString(cstring, len); + gfree(cstring); + return ret; +} + +GooString *QDateTimeToUnicodeGooString(const QDateTime &dt) +{ + if (!dt.isValid()) { + return nullptr; + } + + return QStringToUnicodeGooString(dt.toUTC().toString(QStringLiteral("yyyyMMddhhmmss+00'00'"))); +} + +Annot::AdditionalActionsType toPopplerAdditionalActionType(Annotation::AdditionalActionType type) +{ + switch (type) { + case Annotation::CursorEnteringAction: + return Annot::actionCursorEntering; + case Annotation::CursorLeavingAction: + return Annot::actionCursorLeaving; + case Annotation::MousePressedAction: + return Annot::actionMousePressed; + case Annotation::MouseReleasedAction: + return Annot::actionMouseReleased; + case Annotation::FocusInAction: + return Annot::actionFocusIn; + case Annotation::FocusOutAction: + return Annot::actionFocusOut; + case Annotation::PageOpeningAction: + return Annot::actionPageOpening; + case Annotation::PageClosingAction: + return Annot::actionPageClosing; + case Annotation::PageVisibleAction: + return Annot::actionPageVisible; + case Annotation::PageInvisibleAction: + return Annot::actionPageInvisible; + } + + return Annot::actionCursorEntering; +} + +DocumentData::~DocumentData() +{ + qDeleteAll(m_embeddedFiles); + delete (OptContentModel *)m_optContentModel; + delete doc; +} + +void DocumentData::init() +{ + m_backend = Document::SplashBackend; + paperColor = Qt::white; + m_hints = 0; + m_optContentModel = nullptr; + xrefReconstructed = false; + xrefReconstructedCallback = {}; + +#ifdef ANDROID + // Copy fonts from android apk to the app's storage dir, and + // set the font directory path + QString assetsFontDir = QStringLiteral("assets:/share/fonts"); + QString fontsdir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QStringLiteral("/fonts"); + QDir fontPath = QDir(fontsdir); + + if (fontPath.mkpath(fontPath.absolutePath())) { + GlobalParams::setFontDir(fontPath.absolutePath().toStdString()); + QDirIterator iterator(assetsFontDir, QDir::NoFilter, QDirIterator::Subdirectories); + + while (iterator.hasNext()) { + iterator.next(); + QFileInfo fontFileInfo = iterator.fileInfo(); + QString fontFilePath = assetsFontDir + QStringLiteral("/") + fontFileInfo.fileName(); + QString destPath = fontPath.absolutePath() + QStringLiteral("/") + fontFileInfo.fileName(); + QFile::copy(fontFilePath, destPath); + } + } else { + GlobalParams::setFontDir(""); + } +#endif +} + +void DocumentData::noitfyXRefReconstructed() +{ + if (!xrefReconstructed) { + xrefReconstructed = true; + } + + if (xrefReconstructedCallback) { + xrefReconstructedCallback(); + } +} + +FormWidget *FormFieldData::getFormWidget(const FormField *f) +{ + return f->m_formData->fm; +} + +FormFieldIconData *FormFieldIconData::getData(const FormFieldIcon &f) +{ + return f.d_ptr; +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-private.h b/poppler-24.05.0/qt6/src/poppler-private.h new file mode 100644 index 0000000000000000000000000000000000000000..3f6130b5e2b31e8b458b0f10291faec9dfd80bdc --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-private.h @@ -0,0 +1,272 @@ +/* poppler-private.h: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2005, 2008, Brad Hards + * Copyright (C) 2006-2009, 2011, 2012, 2017-2022 by Albert Astals Cid + * Copyright (C) 2007-2009, 2011, 2014 by Pino Toscano + * Copyright (C) 2011 Andreas Hartmetz + * Copyright (C) 2011 Hib Eris + * Copyright (C) 2012, 2013 Thomas Freitag + * Copyright (C) 2013 Anthony Granger + * Copyright (C) 2014 Bogdan Cristea + * Copyright (C) 2014 Aki Koskinen + * Copyright (C) 2016 Jakub Alba + * Copyright (C) 2017 Christoph Cullmann + * Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018, 2020 Adam Reichold + * Copyright (C) 2019-2021 Oliver Sander + * Copyright (C) 2019 João Netto + * Copyright (C) 2019 Jan Grulich + * Copyright (C) 2019 Alexander Volkov + * Copyright (C) 2020 Philipp Knechtges + * Copyright (C) 2021 Mahmoud Khalil + * Copyright (C) 2021 Hubert Figuiere + * Copyright (C) 2021 Georgiy Sgibnev . Work sponsored by lab50.net. + * Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela + * Inspired on code by + * Copyright (C) 2004 by Albert Astals Cid + * Copyright (C) 2004 by Enrico Ros + * + * 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. + */ + +#ifndef _POPPLER_PRIVATE_H_ +#define _POPPLER_PRIVATE_H_ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "poppler-qt6.h" +#include "poppler-embeddedfile-private.h" +#include "poppler-qiodeviceinstream-private.h" + +class LinkDest; +class FormWidget; + +namespace Poppler { + +/* borrowed from kpdf */ +POPPLER_QT6_EXPORT QString unicodeToQString(const Unicode *u, int len); +POPPLER_QT6_EXPORT QString unicodeToQString(const std::vector &u); + +POPPLER_QT6_EXPORT QString UnicodeParsedString(const GooString *s1); + +POPPLER_QT6_EXPORT QString UnicodeParsedString(const std::string &s1); + +POPPLER_QT6_EXPORT GooString *QStringToUnicodeGooString(const QString &s); + +// Returns a big endian UTF-16 string with BOM or an empty string without BOM. +// The caller owns the returned pointer. +POPPLER_QT6_EXPORT GooString *QStringToGooString(const QString &s); + +GooString *QDateTimeToUnicodeGooString(const QDateTime &dt); + +void qt6ErrorFunction(ErrorCategory /*category*/, Goffset pos, const char *msg); + +Annot::AdditionalActionsType toPopplerAdditionalActionType(Annotation::AdditionalActionType type); + +class LinkDestinationData +{ +public: + LinkDestinationData(const LinkDest *l, const GooString *nd, Poppler::DocumentData *pdfdoc, bool external) : ld(l), namedDest(nd), doc(pdfdoc), externalDest(external) { } + + const LinkDest *ld; + const GooString *namedDest; + Poppler::DocumentData *doc; + bool externalDest; +}; + +class DocumentData : private GlobalParamsIniter +{ +public: + DocumentData(const QString &filePath, const std::optional &ownerPassword, const std::optional &userPassword) : GlobalParamsIniter(qt6ErrorFunction) + { + init(); + m_device = nullptr; + m_filePath = filePath; + +#ifdef _WIN32 + doc = new PDFDoc((wchar_t *)filePath.utf16(), filePath.length(), ownerPassword, userPassword, nullptr, std::bind(&DocumentData::noitfyXRefReconstructed, this)); +#else + doc = new PDFDoc(std::make_unique(QFile::encodeName(filePath).constData()), ownerPassword, userPassword, nullptr, std::bind(&DocumentData::noitfyXRefReconstructed, this)); +#endif + } + + DocumentData(QIODevice *device, const std::optional &ownerPassword, const std::optional &userPassword) : GlobalParamsIniter(qt6ErrorFunction) + { + m_device = device; + QIODeviceInStream *str = new QIODeviceInStream(device, 0, false, device->size(), Object(objNull)); + init(); + doc = new PDFDoc(str, ownerPassword, userPassword, nullptr, std::bind(&DocumentData::noitfyXRefReconstructed, this)); + } + + DocumentData(const QByteArray &data, const std::optional &ownerPassword, const std::optional &userPassword) : GlobalParamsIniter(qt6ErrorFunction) + { + m_device = nullptr; + fileContents = data; + MemStream *str = new MemStream((char *)fileContents.data(), 0, fileContents.length(), Object(objNull)); + init(); + doc = new PDFDoc(str, ownerPassword, userPassword, nullptr, std::bind(&DocumentData::noitfyXRefReconstructed, this)); + } + + void init(); + + ~DocumentData(); + + DocumentData(const DocumentData &) = delete; + DocumentData &operator=(const DocumentData &) = delete; + + void setPaperColor(const QColor &color) { paperColor = color; } + + void fillMembers() + { + int numEmb = doc->getCatalog()->numEmbeddedFiles(); + if (!(0 == numEmb)) { + // we have some embedded documents, build the list + for (int yalv = 0; yalv < numEmb; ++yalv) { + std::unique_ptr fs = doc->getCatalog()->embeddedFile(yalv); + m_embeddedFiles.append(new EmbeddedFile(*new EmbeddedFileData(std::move(fs)))); + } + } + } + + /** + * a method that is being called whenever PDFDoc's XRef is reconstructed + * where we'll set xrefReconstructed flag and notify users of the + * reconstruction event + */ + void noitfyXRefReconstructed(); + + static std::unique_ptr checkDocument(DocumentData *doc); + + PDFDoc *doc; + QString m_filePath; + QIODevice *m_device; + QByteArray fileContents; + bool locked; + Document::RenderBackend m_backend; + QList m_embeddedFiles; + QPointer m_optContentModel; + QColor paperColor; + int m_hints; +#ifdef USE_CMS + GfxLCMSProfilePtr m_sRGBProfile; + GfxLCMSProfilePtr m_displayProfile; +#endif + bool xrefReconstructed; + // notifies the user whenever the backend's PDFDoc XRef is reconstructed + std::function xrefReconstructedCallback; +}; + +class FontInfoData +{ +public: + FontInfoData() + { + isEmbedded = false; + isSubset = false; + type = FontInfo::unknown; + } + + explicit FontInfoData(::FontInfo *fi) + { + if (fi->getName()) { + fontName = fi->getName()->c_str(); + } + if (fi->getFile()) { + fontFile = fi->getFile()->c_str(); + } + if (fi->getSubstituteName()) { + fontSubstituteName = fi->getSubstituteName()->c_str(); + } + isEmbedded = fi->getEmbedded(); + isSubset = fi->getSubset(); + type = (Poppler::FontInfo::Type)fi->getType(); + embRef = fi->getEmbRef(); + } + + FontInfoData(const FontInfoData &fid) = default; + FontInfoData &operator=(const FontInfoData &) = default; + + QString fontName; + QString fontSubstituteName; + QString fontFile; + bool isEmbedded : 1; + bool isSubset : 1; + FontInfo::Type type; + Ref embRef; +}; + +class FontIteratorData +{ +public: + FontIteratorData(int startPage, DocumentData *dd) : fontInfoScanner(dd->doc, startPage), totalPages(dd->doc->getNumPages()), currentPage(qMax(startPage, 0) - 1) { } + + ~FontIteratorData() { } + + FontInfoScanner fontInfoScanner; + int totalPages; + int currentPage; +}; + +class TextBoxData +{ +public: + TextBoxData() : nextWord(nullptr), hasSpaceAfter(false) { } + + QString text; + QRectF bBox; + TextBox *nextWord; + QVector charBBoxes; // the boundingRect of each character + bool hasSpaceAfter; +}; + +class FormFieldData +{ +public: + FormFieldData(DocumentData *_doc, ::Page *p, ::FormWidget *w) : doc(_doc), page(p), fm(w) { } + + DocumentData *doc; + ::Page *page; // Note for some signatures it can be null since there's signatures that don't belong to a given page + ::FormWidget *fm; + QRectF box; + static POPPLER_QT6_EXPORT ::FormWidget *getFormWidget(const FormField *f); +}; + +class FormFieldIcon; +class FormFieldIconData +{ +public: + static POPPLER_QT6_EXPORT FormFieldIconData *getData(const FormFieldIcon &f); + Dict *icon; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-ps-converter.cc b/poppler-24.05.0/qt6/src/poppler-ps-converter.cc new file mode 100644 index 0000000000000000000000000000000000000000..4beabcbd3f3439aed58cf2f65259521bcb83b887 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-ps-converter.cc @@ -0,0 +1,279 @@ +/* poppler-ps-converter.cc: qt interface to poppler + * Copyright (C) 2007, 2009, 2010, 2015, 2020, 2022, Albert Astals Cid + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2010 Hib Eris + * Copyright (C) 2011 Glad Deschrijver + * Copyright (C) 2012 Fabio D'Urso + * Copyright (C) 2013 Thomas Freitag + * Copyright (C) 2014 Adrian Johnson + * Copyright (C) 2020 William Bader + * Copyright (C) 2023 Kevin Ottens . Work sponsored by De Bortoli Wines + * + * 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-qt6.h" + +#include "poppler-private.h" +#include "poppler-converter-private.h" + +#include "PSOutputDev.h" + +static void outputToQIODevice(void *stream, const char *data, size_t len) +{ + static_cast(stream)->write(data, len); +} + +namespace Poppler { + +class PSConverterPrivate : public BaseConverterPrivate +{ +public: + PSConverterPrivate(); + ~PSConverterPrivate() override; + + QList pageList; + QString title; + double hDPI; + double vDPI; + int rotate; + int paperWidth; + int paperHeight; + int marginRight; + int marginBottom; + int marginLeft; + int marginTop; + PSConverter::PSOptions opts; + void (*pageConvertedCallback)(int page, void *payload); + void *pageConvertedPayload; +}; + +PSConverterPrivate::PSConverterPrivate() + : BaseConverterPrivate(), + hDPI(72), + vDPI(72), + rotate(0), + paperWidth(-1), + paperHeight(-1), + marginRight(0), + marginBottom(0), + marginLeft(0), + marginTop(0), + opts(PSConverter::Printing), + pageConvertedCallback(nullptr), + pageConvertedPayload(nullptr) +{ +} + +PSConverterPrivate::~PSConverterPrivate() = default; + +PSConverter::PSConverter(DocumentData *document) : BaseConverter(*new PSConverterPrivate()) +{ + Q_D(PSConverter); + d->document = document; +} + +PSConverter::~PSConverter() { } + +void PSConverter::setPageList(const QList &pageList) +{ + Q_D(PSConverter); + d->pageList = pageList; +} + +void PSConverter::setTitle(const QString &title) +{ + Q_D(PSConverter); + d->title = title; +} + +void PSConverter::setHDPI(double hDPI) +{ + Q_D(PSConverter); + d->hDPI = hDPI; +} + +void PSConverter::setVDPI(double vDPI) +{ + Q_D(PSConverter); + d->vDPI = vDPI; +} + +void PSConverter::setRotate(int rotate) +{ + Q_D(PSConverter); + d->rotate = rotate; +} + +void PSConverter::setPaperWidth(int paperWidth) +{ + Q_D(PSConverter); + d->paperWidth = paperWidth; +} + +void PSConverter::setPaperHeight(int paperHeight) +{ + Q_D(PSConverter); + d->paperHeight = paperHeight; +} + +void PSConverter::setRightMargin(int marginRight) +{ + Q_D(PSConverter); + d->marginRight = marginRight; +} + +void PSConverter::setBottomMargin(int marginBottom) +{ + Q_D(PSConverter); + d->marginBottom = marginBottom; +} + +void PSConverter::setLeftMargin(int marginLeft) +{ + Q_D(PSConverter); + d->marginLeft = marginLeft; +} + +void PSConverter::setTopMargin(int marginTop) +{ + Q_D(PSConverter); + d->marginTop = marginTop; +} + +void PSConverter::setStrictMargins(bool strictMargins) +{ + Q_D(PSConverter); + if (strictMargins) { + d->opts |= StrictMargins; + } else { + d->opts &= ~StrictMargins; + } +} + +void PSConverter::setForceOverprintPreview(bool forceOverprintPreview) +{ + Q_D(PSConverter); + if (forceOverprintPreview) { + d->opts |= ForceOverprintPreview; + } else { + d->opts &= ~ForceOverprintPreview; + } +} + +void PSConverter::setForceRasterize(bool forceRasterize) +{ + Q_D(PSConverter); + if (forceRasterize) { + d->opts |= ForceRasterization; + } else { + d->opts &= ~ForceRasterization; + } +} + +void PSConverter::setPSOptions(PSConverter::PSOptions options) +{ + Q_D(PSConverter); + d->opts = options; +} + +PSConverter::PSOptions PSConverter::psOptions() const +{ + Q_D(const PSConverter); + return d->opts; +} + +void PSConverter::setPageConvertedCallback(void (*callback)(int page, void *payload), void *payload) +{ + Q_D(PSConverter); + d->pageConvertedCallback = callback; + d->pageConvertedPayload = payload; +} + +static bool annotDisplayDecideCbk(Annot *annot, void *user_data) +{ + if (annot->getType() == Annot::typeWidget) { + return true; // Never hide forms + } else { + return *(bool *)user_data; + } +} + +bool PSConverter::convert() +{ + Q_D(PSConverter); + d->lastError = NoError; + + Q_ASSERT(!d->pageList.isEmpty()); + Q_ASSERT(d->paperWidth != -1); + Q_ASSERT(d->paperHeight != -1); + + if (d->document->locked) { + d->lastError = FileLockedError; + return false; + } + + QIODevice *dev = d->openDevice(); + if (!dev) { + d->lastError = OpenOutputError; + return false; + } + + QByteArray pstitle8Bit = d->title.toLocal8Bit(); + char *pstitlechar; + if (!d->title.isEmpty()) { + pstitlechar = pstitle8Bit.data(); + } else { + pstitlechar = nullptr; + } + + std::vector pages; + foreach (int page, d->pageList) { + pages.push_back(page); + } + + PSOutputDev *psOut = new PSOutputDev(outputToQIODevice, dev, pstitlechar, d->document->doc, pages, (d->opts & PrintToEPS) ? psModeEPS : psModePS, d->paperWidth, d->paperHeight, false, false, d->marginLeft, d->marginBottom, + d->paperWidth - d->marginRight, d->paperHeight - d->marginTop, (d->opts & ForceRasterization) ? psAlwaysRasterize : psRasterizeWhenNeeded); + if (d->opts & ForceOverprintPreview) { + psOut->setForceRasterize(psAlwaysRasterize); + psOut->setOverprintPreview(true); + } + + if (d->opts & StrictMargins) { + double xScale = ((double)d->paperWidth - (double)d->marginLeft - (double)d->marginRight) / (double)d->paperWidth; + double yScale = ((double)d->paperHeight - (double)d->marginBottom - (double)d->marginTop) / (double)d->paperHeight; + psOut->setScale(xScale, yScale); + } + + if (psOut->isOk()) { + bool isPrinting = (d->opts & Printing) ? true : false; + bool showAnnotations = (d->opts & HideAnnotations) ? false : true; + foreach (int page, d->pageList) { + d->document->doc->displayPage(psOut, page, d->hDPI, d->vDPI, d->rotate, false, true, isPrinting, nullptr, nullptr, annotDisplayDecideCbk, &showAnnotations, true); + if (d->pageConvertedCallback) { + (*d->pageConvertedCallback)(page, d->pageConvertedPayload); + } + } + delete psOut; + d->closeDevice(); + return true; + } else { + delete psOut; + d->closeDevice(); + return false; + } +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-qiodeviceinstream-private.h b/poppler-24.05.0/qt6/src/poppler-qiodeviceinstream-private.h new file mode 100644 index 0000000000000000000000000000000000000000..1f5a450c79f3013422f3feafef9c42d4b4d76ac7 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-qiodeviceinstream-private.h @@ -0,0 +1,48 @@ +/* poppler-qiodeviceinstream-private.h: Qt6 interface to poppler + * Copyright (C) 2019 Alexander Volkov + * + * 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. + */ + +#ifndef POPPLER_QIODEVICEINSTREAM_PRIVATE_H +#define POPPLER_QIODEVICEINSTREAM_PRIVATE_H + +#include "Object.h" +#include "Stream.h" + +class QIODevice; + +namespace Poppler { + +class QIODeviceInStream : public BaseSeekInputStream +{ +public: + QIODeviceInStream(QIODevice *device, Goffset startA, bool limitedA, Goffset lengthA, Object &&dictA); + ~QIODeviceInStream() override; + + BaseStream *copy() override; + Stream *makeSubStream(Goffset startA, bool limitedA, Goffset lengthA, Object &&dictA) override; + +private: + Goffset currentPos() const override; + void setCurrentPos(Goffset offset) override; + Goffset read(char *buffer, Goffset count) override; + + QIODevice *m_device; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-qiodeviceinstream.cc b/poppler-24.05.0/qt6/src/poppler-qiodeviceinstream.cc new file mode 100644 index 0000000000000000000000000000000000000000..dea2f9dfc04870bb16060b6ac436aed633472923 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-qiodeviceinstream.cc @@ -0,0 +1,59 @@ +/* poppler-qiodeviceinstream.cc: Qt6 interface to poppler + * Copyright (C) 2019 Alexander Volkov + * + * 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-qiodeviceinstream-private.h" + +#include + +#include + +namespace Poppler { + +QIODeviceInStream::QIODeviceInStream(QIODevice *device, Goffset startA, bool limitedA, Goffset lengthA, Object &&dictA) : BaseSeekInputStream(startA, limitedA, lengthA, std::move(dictA)), m_device(device) { } + +QIODeviceInStream::~QIODeviceInStream() +{ + close(); +} + +BaseStream *QIODeviceInStream::copy() +{ + return new QIODeviceInStream(m_device, start, limited, length, dict.copy()); +} + +Stream *QIODeviceInStream::makeSubStream(Goffset startA, bool limitedA, Goffset lengthA, Object &&dictA) +{ + return new QIODeviceInStream(m_device, startA, limitedA, lengthA, std::move(dictA)); +} + +Goffset QIODeviceInStream::currentPos() const +{ + return m_device->pos(); +} + +void QIODeviceInStream::setCurrentPos(Goffset offset) +{ + m_device->seek(offset); +} + +Goffset QIODeviceInStream::read(char *buffer, Goffset count) +{ + return m_device->read(buffer, count); +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-qiodeviceoutstream-private.h b/poppler-24.05.0/qt6/src/poppler-qiodeviceoutstream-private.h new file mode 100644 index 0000000000000000000000000000000000000000..77ca7d3ba21a6a66188e39f9c7ebd6a932adf258 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-qiodeviceoutstream-private.h @@ -0,0 +1,49 @@ +/* poppler-qiodevicestream-private.h: Qt6 interface to poppler + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2013 Adrian Johnson + * Copyright (C) 2021 Albert Astals Cid + * Copyright (C) 2021, Even Rouault + * + * 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. + */ + +#ifndef POPPLER_QIODEVICESTREAM_PRIVATE_H +#define POPPLER_QIODEVICESTREAM_PRIVATE_H + +#include "Object.h" +#include "Stream.h" + +class QIODevice; + +namespace Poppler { + +class QIODeviceOutStream : public OutStream +{ +public: + explicit QIODeviceOutStream(QIODevice *device); + ~QIODeviceOutStream() override; + + void close() override; + Goffset getPos() override; + void put(char c) override; + void printf(const char *format, ...) override GCC_PRINTF_FORMAT(2, 3); + +private: + QIODevice *m_device; +}; + +} + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-qiodeviceoutstream.cc b/poppler-24.05.0/qt6/src/poppler-qiodeviceoutstream.cc new file mode 100644 index 0000000000000000000000000000000000000000..0a96716567730bbb8e49fdbdc8d0f74b8b4d24f0 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-qiodeviceoutstream.cc @@ -0,0 +1,70 @@ +/* poppler-qiodevicestream.cc: Qt6 interface to poppler + * Copyright (C) 2008, Pino Toscano + * Copyright (C) 2013 Adrian Johnson + * Copyright (C) 2020, 2021 Albert Astals Cid + * Copyright (C) 2021, Even Rouault + * + * 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-qiodeviceoutstream-private.h" + +#include + +#include + +namespace Poppler { + +QIODeviceOutStream::QIODeviceOutStream(QIODevice *device) : m_device(device) { } + +QIODeviceOutStream::~QIODeviceOutStream() { } + +void QIODeviceOutStream::close() { } + +Goffset QIODeviceOutStream::getPos() +{ + return m_device->pos(); +} + +void QIODeviceOutStream::put(char c) +{ + m_device->putChar(c); +} + +static int poppler_vasprintf(char **buf_ptr, const char *format, va_list ap) GCC_PRINTF_FORMAT(2, 0); + +static int poppler_vasprintf(char **buf_ptr, const char *format, va_list ap) +{ + va_list ap_copy; + va_copy(ap_copy, ap); + const size_t size = vsnprintf(nullptr, 0, format, ap_copy) + 1; + va_end(ap_copy); + *buf_ptr = new char[size]; + + return qvsnprintf(*buf_ptr, size, format, ap); +} + +void QIODeviceOutStream::printf(const char *format, ...) +{ + va_list ap; + va_start(ap, format); + char *buf; + const size_t bufsize = poppler_vasprintf(&buf, format, ap); + va_end(ap); + m_device->write(buf, bufsize); + delete[] buf; +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-qt6.h b/poppler-24.05.0/qt6/src/poppler-qt6.h new file mode 100644 index 0000000000000000000000000000000000000000..f12bc030cfaced805ea642d56486824e3ec7dd5f --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-qt6.h @@ -0,0 +1,2311 @@ +/* poppler-qt.h: qt interface to poppler + * Copyright (C) 2005, Net Integration Technologies, Inc. + * Copyright (C) 2005, 2007, Brad Hards + * Copyright (C) 2005-2015, 2017-2022, Albert Astals Cid + * Copyright (C) 2005, Stefan Kebekus + * Copyright (C) 2006-2011, Pino Toscano + * Copyright (C) 2009 Shawn Rutledge + * Copyright (C) 2010 Suzuki Toshiya + * Copyright (C) 2010 Matthias Fauconneau + * Copyright (C) 2011 Andreas Hartmetz + * Copyright (C) 2011 Glad Deschrijver + * Copyright (C) 2012, Guillermo A. Amaral B. + * Copyright (C) 2012, Fabio D'Urso + * Copyright (C) 2012, Tobias Koenig + * Copyright (C) 2012, 2014, 2015, 2018, 2019 Adam Reichold + * Copyright (C) 2012, 2013 Thomas Freitag + * Copyright (C) 2013 Anthony Granger + * Copyright (C) 2016 Jakub Alba + * Copyright (C) 2017, 2020, 2021 Oliver Sander + * Copyright (C) 2017, 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich + * Copyright (C) 2018, 2021 Nelson Benítez León + * Copyright (C) 2019 Jan Grulich + * Copyright (C) 2019 Alexander Volkov + * Copyright (C) 2020 Philipp Knechtges + * Copyright (C) 2020 Katarina Behrens + * Copyright (C) 2020 Thorsten Behrens + * Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by Technische Universität Dresden + * Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, . + * Copyright (C) 2021 Mahmoud Khalil + * Copyright (C) 2021 Georgiy Sgibnev . Work sponsored by lab50.net. + * Copyright (C) 2022 Martin + * Copyright (C) 2023 Kevin Ottens . Work sponsored by De Bortoli Wines + * + * 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. + */ + +#ifndef __POPPLER_QT_H__ +#define __POPPLER_QT_H__ + +#include +#include +#include + +#include "poppler-annotation.h" +#include "poppler-link.h" +#include "poppler-optcontent.h" +#include "poppler-page-transition.h" + +#include +#include +#include +#include +#include "poppler-export.h" + +class EmbFile; +class Sound; +class AnnotMovie; + +/** + The %Poppler Qt6 binding. +*/ +namespace Poppler { + +class Document; +class DocumentData; + +class PageData; + +class FormField; +class FormFieldSignature; + +class TextBoxData; + +class PDFConverter; +class PSConverter; + +struct OutlineItemData; + +/** + Debug/error function. + + This function type is used for debugging & error output; + the first parameter is the actual message, the second is the unaltered + closure argument which was passed to the setDebugErrorFunction call. +*/ +using PopplerDebugFunc = void (*)(const QString & /*message*/, const QVariant & /*closure*/); + +/** + Set a new debug/error output function. + + If not set, by default error and debug messages will be sent to the + Qt \p qDebug() function. + + \param debugFunction the new debug function + \param closure user data which will be passes as-is to the debug function +*/ +POPPLER_QT6_EXPORT void setDebugErrorFunction(PopplerDebugFunc debugFunction, const QVariant &closure); + +/** + Describes the physical location of text on a document page + + This very simple class describes the physical location of text + on the page. It consists of + - a QString that contains the text + - a QRectF that gives a box that describes where on the page + the text is found. +*/ +class POPPLER_QT6_EXPORT TextBox +{ + friend class Page; + +public: + /** + The default constructor sets the \p text and the rectangle that + contains the text. Coordinates for the \p bBox are in points = + 1/72 of an inch. + */ + TextBox(const QString &text, const QRectF &bBox); + /** + Destructor. + */ + ~TextBox(); + + /** + Returns the text of this text box + */ + QString text() const; + + /** + Returns the position of the text, in point, i.e., 1/72 of + an inch + */ + QRectF boundingBox() const; + + /** + Returns the pointer to the next text box, if there is one. + + Otherwise, it returns a null pointer. + */ + TextBox *nextWord() const; + + /** + Returns the bounding box of the \p i -th characted of the word. + */ + QRectF charBoundingBox(int i) const; + + /** + Returns whether there is a space character after this text box + */ + bool hasSpaceAfter() const; + +private: + Q_DISABLE_COPY(TextBox) + + TextBoxData *m_data; +}; + +class FontInfoData; +/** + Container class for information about a font within a PDF + document +*/ +class POPPLER_QT6_EXPORT FontInfo +{ + friend class Document; + +public: + /** + The type of font. + */ + enum Type + { + unknown, + Type1, + Type1C, + Type1COT, + Type3, + TrueType, + TrueTypeOT, + CIDType0, + CIDType0C, + CIDType0COT, + CIDTrueType, + CIDTrueTypeOT + }; + + /// \cond PRIVATE + /** + Create a new font information container. + */ + FontInfo(); + + /** + Create a new font information container. + */ + explicit FontInfo(const FontInfoData &fid); + /// \endcond + + /** + Copy constructor. + */ + FontInfo(const FontInfo &fi); + + /** + Destructor. + */ + ~FontInfo(); + + /** + The name of the font. Can be a null QString if the font has no name + */ + QString name() const; + + /** + The name of the substitute font. Can be a null QString if the font has no substitute font + */ + QString substituteName() const; + + /** + The path of the font file used to represent this font on this system, + or a null string is the font is embedded + */ + QString file() const; + + /** + Whether the font is embedded in the file, or not + + \return true if the font is embedded + */ + bool isEmbedded() const; + + /** + Whether the font provided is only a subset of the full + font or not. This only has meaning if the font is embedded. + + \return true if the font is only a subset + */ + bool isSubset() const; + + /** + The type of font encoding + + \return a enumerated value corresponding to the font encoding used + + \sa typeName for a string equivalent + */ + Type type() const; + + /** + The name of the font encoding used + + \note if you are looking for the name of the font (as opposed to the + encoding format used), you probably want name(). + + \sa type for a enumeration version + */ + QString typeName() const; + + /** + Standard assignment operator + */ + FontInfo &operator=(const FontInfo &fi); + +private: + FontInfoData *m_data; +}; + +class FontIteratorData; +/** + Iterator for reading the fonts in a document. + + FontIterator provides a Java-style iterator for reading the fonts in a + document. + + You can use it in the following way: + \code +std::unique_ptr it = doc->newFontIterator(); +while (it->hasNext()) { +QList fonts = it->next(); +// do something with the fonts +} +// no need to free the iterator after doing the job + \endcode +*/ +class POPPLER_QT6_EXPORT FontIterator +{ + friend class Document; + friend class DocumentData; + +public: + /** + Destructor. + */ + ~FontIterator(); + + /** + Returns the fonts of the current page and then advances the iterator + to the next page. + */ + QList next(); + + /** + Checks whether there is at least one more page to iterate, ie returns + false when the iterator is beyond the last page. + */ + bool hasNext() const; + + /** + Returns the current page where the iterator is. + */ + int currentPage() const; + +private: + Q_DISABLE_COPY(FontIterator) + FontIterator(int, DocumentData *dd); + + FontIteratorData *d; +}; + +class EmbeddedFileData; +/** + Container class for an embedded file with a PDF document +*/ +class POPPLER_QT6_EXPORT EmbeddedFile +{ + friend class DocumentData; + friend class AnnotationPrivate; + +public: + /// \cond PRIVATE + explicit EmbeddedFile(EmbFile *embfile); + /// \endcond + + /** + Destructor. + */ + ~EmbeddedFile(); + + /** + The name associated with the file + */ + QString name() const; + + /** + The description associated with the file, if any. + + This will return an empty QString if there is no description element + */ + QString description() const; + + /** + The size of the file. + + This will return < 0 if there is no size element + */ + int size() const; + + /** + The modification date for the embedded file, if known. + */ + QDateTime modDate() const; + + /** + The creation date for the embedded file, if known. + */ + QDateTime createDate() const; + + /** + The MD5 checksum of the file. + + This will return an empty QByteArray if there is no checksum element. + */ + QByteArray checksum() const; + + /** + The MIME type of the file, if known. + */ + QString mimeType() const; + + /** + The data as a byte array + */ + QByteArray data(); + + /** + Is the embedded file valid? + */ + bool isValid() const; + + /** + A QDataStream for the actual data? + */ + // QDataStream dataStream() const; + +private: + Q_DISABLE_COPY(EmbeddedFile) + explicit EmbeddedFile(EmbeddedFileData &dd); + + EmbeddedFileData *m_embeddedFile; +}; + +/** + \brief A page in a document. + + The Page class represents a single page within a PDF document. + + You cannot construct a Page directly, but you have to use the Document + functions that return a new Page out of an index or a label. +*/ +class POPPLER_QT6_EXPORT Page +{ + friend class Document; + +public: + /** + Destructor. + */ + ~Page(); + + /** + The type of rotation to apply for an operation + */ + enum Rotation + { + Rotate0 = 0, ///< Do not rotate + Rotate90 = 1, ///< Rotate 90 degrees clockwise + Rotate180 = 2, ///< Rotate 180 degrees + Rotate270 = 3 ///< Rotate 270 degrees clockwise (90 degrees counterclockwise) + }; + + /** + The kinds of page actions + */ + enum PageAction + { + Opening, ///< The action when a page is "opened" + Closing ///< The action when a page is "closed" + }; + + /** + How the text is going to be returned + */ + enum TextLayout + { + PhysicalLayout, ///< The text is layouted to resemble the real page layout + RawOrderLayout ///< The text is returned without any type of processing + }; + + /** + Additional flags for the renderToPainter method + */ + enum PainterFlag + { + NoPainterFlags = 0x00000000, + /** + Do not save/restore the caller-owned painter. + + renderToPainter() by default preserves, using save() + restore(), + the state of the painter specified; if this is not needed, this + flag can avoid this job + */ + DontSaveAndRestore = 0x00000001 + }; + Q_DECLARE_FLAGS(PainterFlags, PainterFlag) + + /** + Render the page to a QImage using the current + \link Document::renderBackend() Document renderer\endlink. + + If \p x = \p y = \p w = \p h = -1, the method will automatically + compute the size of the image from the horizontal and vertical + resolutions specified in \p xres and \p yres. Otherwise, the + method renders only a part of the page, specified by the + parameters (\p x, \p y, \p w, \p h) in pixel coordinates. The returned + QImage then has size (\p w, \p h), independent of the page + size. + + \param x specifies the left x-coordinate of the box, in + pixels. + + \param y specifies the top y-coordinate of the box, in + pixels. + + \param w specifies the width of the box, in pixels. + + \param h specifies the height of the box, in pixels. + + \param xres horizontal resolution of the graphics device, + in dots per inch + + \param yres vertical resolution of the graphics device, in + dots per inch + + \param rotate how to rotate the page + + \warning The parameter (\p x, \p y, \p w, \p h) are not + well-tested. Unusual or meaningless parameters may lead to + rather unexpected results. + + \returns a QImage of the page, or a null image on failure. + */ + QImage renderToImage(double xres = 72.0, double yres = 72.0, int x = -1, int y = -1, int w = -1, int h = -1, Rotation rotate = Rotate0) const; + + /** + Partial Update renderToImage callback. + + This function type is used for doing partial rendering updates; + the first parameter is the image as rendered up to now, the second is the unaltered + closure argument which was passed to the renderToImage call. + */ + using RenderToImagePartialUpdateFunc = void (*)(const QImage & /*image*/, const QVariant & /*closure*/); + + /** + Partial Update query renderToImage callback. + + This function type is used for query if the partial rendering update should happen; + the parameter is the unaltered closure argument which was passed to the renderToImage call. + */ + using ShouldRenderToImagePartialQueryFunc = bool (*)(const QVariant & /*closure*/); + + /** + Render the page to a QImage using the current + \link Document::renderBackend() Document renderer\endlink. + + If \p x = \p y = \p w = \p h = -1, the method will automatically + compute the size of the image from the horizontal and vertical + resolutions specified in \p xres and \p yres. Otherwise, the + method renders only a part of the page, specified by the + parameters (\p x, \p y, \p w, \p h) in pixel coordinates. The returned + QImage then has size (\p w, \p h), independent of the page + size. + + \param x specifies the left x-coordinate of the box, in + pixels. + + \param y specifies the top y-coordinate of the box, in + pixels. + + \param w specifies the width of the box, in pixels. + + \param h specifies the height of the box, in pixels. + + \param xres horizontal resolution of the graphics device, + in dots per inch + + \param yres vertical resolution of the graphics device, in + dots per inch + + \param rotate how to rotate the page + + \param partialUpdateCallback callback that will be called to + report a partial rendering update + + \param shouldDoPartialUpdateCallback callback that will be called + to ask if a partial rendering update is wanted. This exists + because doing a partial rendering update needs to copy the image + buffer so if it is not wanted it is better skipped early. + + \param payload opaque structure that will be passed + back to partialUpdateCallback and shouldDoPartialUpdateCallback. + + \warning The parameter (\p x, \p y, \p w, \p h) are not + well-tested. Unusual or meaningless parameters may lead to + rather unexpected results. + + \returns a QImage of the page, or a null image on failure. + */ + QImage renderToImage(double xres, double yres, int x, int y, int w, int h, Rotation rotate, RenderToImagePartialUpdateFunc partialUpdateCallback, ShouldRenderToImagePartialQueryFunc shouldDoPartialUpdateCallback, + const QVariant &payload) const; + + /** + Abort query function callback. + + This function type is used for query if the current rendering/text extraction should be cancelled. + */ + using ShouldAbortQueryFunc = bool (*)(const QVariant & /*closure*/); + + /** +Render the page to a QImage using the current +\link Document::renderBackend() Document renderer\endlink. + +If \p x = \p y = \p w = \p h = -1, the method will automatically +compute the size of the image from the horizontal and vertical +resolutions specified in \p xres and \p yres. Otherwise, the +method renders only a part of the page, specified by the +parameters (\p x, \p y, \p w, \p h) in pixel coordinates. The returned +QImage then has size (\p w, \p h), independent of the page +size. + +\param x specifies the left x-coordinate of the box, in +pixels. + +\param y specifies the top y-coordinate of the box, in +pixels. + +\param w specifies the width of the box, in pixels. + +\param h specifies the height of the box, in pixels. + +\param xres horizontal resolution of the graphics device, +in dots per inch + +\param yres vertical resolution of the graphics device, in +dots per inch + +\param rotate how to rotate the page + +\param partialUpdateCallback callback that will be called to +report a partial rendering update + +\param shouldDoPartialUpdateCallback callback that will be called +to ask if a partial rendering update is wanted. This exists +because doing a partial rendering update needs to copy the image +buffer so if it is not wanted it is better skipped early. + +\param shouldAbortRenderCallback callback that will be called +to ask if the rendering should be cancelled. + +\param payload opaque structure that will be passed +back to partialUpdateCallback, shouldDoPartialUpdateCallback +and shouldAbortRenderCallback. + +\warning The parameter (\p x, \p y, \p w, \p h) are not +well-tested. Unusual or meaningless parameters may lead to +rather unexpected results. + +\returns a QImage of the page, or a null image on failure. +*/ + QImage renderToImage(double xres, double yres, int x, int y, int w, int h, Rotation rotate, RenderToImagePartialUpdateFunc partialUpdateCallback, ShouldRenderToImagePartialQueryFunc shouldDoPartialUpdateCallback, + ShouldAbortQueryFunc shouldAbortRenderCallback, const QVariant &payload) const; + + /** + Render the page to the specified QPainter using the current + \link Document::renderBackend() Document renderer\endlink. + + If \p x = \p y = \p w = \p h = -1, the method will automatically + compute the size of the page area from the horizontal and vertical + resolutions specified in \p xres and \p yres. Otherwise, the + method renders only a part of the page, specified by the + parameters (\p x, \p y, \p w, \p h) in pixel coordinates. + + \param painter the painter to paint on + + \param x specifies the left x-coordinate of the box, in + pixels. + + \param y specifies the top y-coordinate of the box, in + pixels. + + \param w specifies the width of the box, in pixels. + + \param h specifies the height of the box, in pixels. + + \param xres horizontal resolution of the graphics device, + in dots per inch + + \param yres vertical resolution of the graphics device, in + dots per inch + + \param rotate how to rotate the page + + \param flags additional painter flags + + \warning The parameter (\p x, \p y, \p w, \p h) are not + well-tested. Unusual or meaningless parameters may lead to + rather unexpected results. + + \returns whether the painting succeeded + + \note This method is only supported for the QPainterOutputDev + */ + bool renderToPainter(QPainter *painter, double xres = 72.0, double yres = 72.0, int x = -1, int y = -1, int w = -1, int h = -1, Rotation rotate = Rotate0, PainterFlags flags = NoPainterFlags) const; + + /** + Get the page thumbnail if it exists. + + \return a QImage of the thumbnail, or a null image + if the PDF does not contain one for this page + */ + QImage thumbnail() const; + + /** + Returns the text that is inside a specified rectangle + + \param rect the rectangle specifying the area of interest, + with coordinates given in points, i.e., 1/72th of an inch. + If rect is null, all text on the page is given + **/ + QString text(const QRectF &rect, TextLayout textLayout) const; + + /** + Returns the text that is inside a specified rectangle. + The text is returned using the physical layout of the page + + \param rect the rectangle specifying the area of interest, + with coordinates given in points, i.e., 1/72th of an inch. + If rect is null, all text on the page is given + **/ + QString text(const QRectF &rect) const; + + /** + The starting point for a search + */ + enum SearchDirection + { + FromTop, ///< Start sorting at the top of the document + NextResult, ///< Find the next result, moving "down the page" + PreviousResult ///< Find the previous result, moving "up the page" + }; + + /** + The type of search to perform + */ + enum SearchMode + { + CaseSensitive, ///< Case differences cause no match in searching + CaseInsensitive ///< Case differences are ignored in matching + }; + + /** + Flags to modify the search behaviour + */ + enum SearchFlag + { + NoSearchFlags = 0x00000000, + IgnoreCase = 0x00000001, ///< Case differences are ignored + WholeWords = 0x00000002, ///< Only whole words are matched + IgnoreDiacritics = 0x00000004, ///< Diacritic differences (eg. accents, umlauts, diaeresis) are ignored. + ///< This option will have no effect if the search term contains characters which + ///< are not pure ascii. + AcrossLines = 0x00000008 ///< Allows to match on text spanning from end of a line to the next line. + ///< It won't match on text spanning more than two lines. Automatically ignores hyphen + ///< at end of line, and allows whitespace in search term to match on newline. \since 21.05.0 + }; + Q_DECLARE_FLAGS(SearchFlags, SearchFlag) + + /** + Returns true if the specified text was found. + + \param text the text the search + \param rectXXX in all directions is used to return where the text was found, for NextResult and PreviousResult + indicates where to continue searching for + \param direction in which direction do the search + \param flags the flags to consider during matching + \param rotate the rotation to apply for the search order + **/ + bool search(const QString &text, double &sLeft, double &sTop, double &sRight, double &sBottom, SearchDirection direction, SearchFlags flags = NoSearchFlags, Rotation rotate = Rotate0) const; + + /** + Returns a list of all occurrences of the specified text on the page. + + if SearchFlags::AcrossLines is given in \param flags, then rects may just + be parts of the text itself if it's split between multiple lines. + + \param text the text to search + \param flags the flags to consider during matching + \param rotate the rotation to apply for the search order + + \warning Do not use the returned QRectF as arguments of another search call because of truncation issues if qreal is defined as float. + **/ + QList search(const QString &text, SearchFlags flags = NoSearchFlags, Rotation rotate = Rotate0) const; + + /** + Returns a list of text of the page + + This method returns a QList of TextBoxes that contain all + the text of the page, with roughly one text word of text + per TextBox item. + + For text written in western languages (left-to-right and + up-to-down), the QList contains the text in the proper + order. + + \warning This method is not tested with Asian scripts + */ + std::vector> textList(Rotation rotate = Rotate0) const; + + /** + Returns a list of text of the page + + This method returns a QList of TextBoxes that contain all + the text of the page, with roughly one text word of text + per TextBox item. + + For text written in western languages (left-to-right and + up-to-down), the QList contains the text in the proper + order. + + \param shouldAbortExtractionCallback callback that will be called + to ask if the text extraction should be cancelled. + + \param closure opaque structure that will be passed + back to shouldAbortExtractionCallback. + + \warning This method is not tested with Asian scripts + */ + std::vector> textList(Rotation rotate, ShouldAbortQueryFunc shouldAbortExtractionCallback, const QVariant &closure) const; + + /** + \return The dimensions (cropbox) of the page, in points (i.e. 1/72th of an inch) + */ + QSizeF pageSizeF() const; + + /** + \return The dimensions (cropbox) of the page, in points (i.e. 1/72th of an inch) + */ + QSize pageSize() const; + + /** + Returns the transition of this page + + \returns a pointer to a PageTransition structure that + defines how transition to this page shall be performed. + + \note The PageTransition structure is owned by this page, and will + automatically be destroyed when this page class is + destroyed. + **/ + PageTransition *transition() const; + + /** + Gets the page action specified, or empty unique pointer if there is no action. + **/ + std::unique_ptr action(PageAction act) const; + + /** + Types of orientations that are possible + */ + enum Orientation + { + Landscape, ///< Landscape orientation (portrait, with 90 degrees clockwise rotation ) + Portrait, ///< Normal portrait orientation + Seascape, ///< Seascape orientation (portrait, with 270 degrees clockwise rotation) + UpsideDown ///< Upside down orientation (portrait, with 180 degrees rotation) + }; + + /** + The orientation of the page + */ + Orientation orientation() const; + + /** + The default CTM + */ + void defaultCTM(double *CTM, double dpiX, double dpiY, int rotate, bool upsideDown); + + /** + Gets the links of the page + */ + std::vector> links() const; + + /** + Returns the annotations of the page + + \note If you call this method twice, you get different objects + pointing to the same annotations (see Annotation). + */ + std::vector> annotations() const; + + /** + Returns the annotations of the page + + \param subtypes the subtypes of annotations you are interested in + + \note If you call this method twice, you get different objects + pointing to the same annotations (see Annotation). + */ + std::vector> annotations(const QSet &subtypes) const; + + /** + Adds an annotation to the page + + \note Ownership of the annotation object stays with the caller, who can + delete it at any time. + */ + void addAnnotation(const Annotation *ann); + + /** + Removes an annotation from the page and destroys the annotation object + + \note There mustn't be other Annotation objects pointing this annotation + */ + void removeAnnotation(const Annotation *ann); + + /** + Returns the form fields on the page + */ + std::vector> formFields() const; + + /** + Returns the page duration. That is the time, in seconds, that the page + should be displayed before the presentation automatically advances to the next page. + Returns < 0 if duration is not set. + */ + double duration() const; + + /** + Returns the label of the page, or a null string is the page has no label. + **/ + QString label() const; + + /** + Returns the index of the page. + **/ + int index() const; + +private: + Q_DISABLE_COPY(Page) + + Page(DocumentData *doc, int index); + PageData *m_page; +}; + +/** + \brief Item in the outline of a PDF document + + Represents an item in the outline of PDF document, i.e. a name, an internal or external link and a set of child items. +**/ +class POPPLER_QT6_EXPORT OutlineItem +{ + friend class Document; + +public: + /** + Constructs a null item, i.e. one that does not represent a valid item in the outline of some PDF document. + **/ + OutlineItem(); + ~OutlineItem(); + + OutlineItem(const OutlineItem &other); + OutlineItem &operator=(const OutlineItem &other); + + OutlineItem(OutlineItem &&other) noexcept; + OutlineItem &operator=(OutlineItem &&other) noexcept; + + /** + Indicates whether an item is null, i.e. whether it does not represent a valid item in the outline of some PDF document. + **/ + bool isNull() const; + + /** + The name of the item which should be displayed to the user. + **/ + QString name() const; + + /** + Indicates whether the item should initially be display in an expanded or collapsed state. + **/ + bool isOpen() const; + + /** + The destination referred to by this item. + + \returns a shared pointer to an immutable link destination + **/ + QSharedPointer destination() const; + + /** + The external file name of the document to which the \see destination refers + + \returns a string with the external file name or an empty string if there is none + */ + QString externalFileName() const; + + /** + The URI to which the item links + + \returns a string with the URI which this item links or an empty string if there is none + **/ + QString uri() const; + + /** + Determines if this item has any child items + + \returns true if there are any child items + **/ + bool hasChildren() const; + + /** + Gets the child items of this item + + \returns a vector outline items, empty if there are none + **/ + QVector children() const; + +private: + explicit OutlineItem(OutlineItemData *data); + OutlineItemData *m_data; +}; + +/** + \brief PDF document. + + The Document class represents a PDF document: its pages, and all the global + properties, metadata, etc. + + \section ownership Ownership of the returned objects + + All the functions that returns class pointers create new object, and the + responsibility of those is given to the caller. + + The only exception is \link Poppler::Page::transition() Page::transition()\endlink. + + \section document-loading Loading + + To get a Document, you have to load it via the load() & loadFromData() + functions. + + In all the functions that have passwords as arguments, they \b must be Latin1 + encoded. If you have a password that is a UTF-8 string, you need to use + QString::toLatin1() (or similar) to convert the password first. + If you have a UTF-8 character array, consider converting it to a QString first + (QString::fromUtf8(), or similar) before converting to Latin1 encoding. + + \section document-rendering Rendering + + To render pages of a document, you have different Document functions to set + various options. + + \subsection document-rendering-backend Backends + + %Poppler offers a different backends for rendering the pages. Currently + there are two backends (see #RenderBackend), but only the Splash engine works + well and has been tested. + + The available rendering backends can be discovered via availableRenderBackends(). + The current rendering backend can be changed using setRenderBackend(). + Please note that setting a backend not listed in the available ones + will always result in null QImage's. + + \section document-cms Color management support + + %Poppler, if compiled with this support, provides functions to handle color + profiles. + + To know whether the %Poppler version you are using has support for color + management, you can query Poppler::isCmsAvailable(). In case it is not + available, all the color management-related functions will either do nothing + or return null. +*/ +class POPPLER_QT6_EXPORT Document +{ + friend class Page; + friend class DocumentData; + +public: + /** + The page mode + */ + enum PageMode + { + UseNone, ///< No mode - neither document outline nor thumbnail images are visible + UseOutlines, ///< Document outline visible + UseThumbs, ///< Thumbnail images visible + FullScreen, ///< Fullscreen mode (no menubar, windows controls etc) + UseOC, ///< Optional content group panel visible + UseAttach ///< Attachments panel visible + }; + + /** + The page layout + */ + enum PageLayout + { + NoLayout, ///< Layout not specified + SinglePage, ///< Display a single page + OneColumn, ///< Display a single column of pages + TwoColumnLeft, ///< Display the pages in two columns, with odd-numbered pages on the left + TwoColumnRight, ///< Display the pages in two columns, with odd-numbered pages on the right + TwoPageLeft, ///< Display the pages two at a time, with odd-numbered pages on the left + TwoPageRight ///< Display the pages two at a time, with odd-numbered pages on the right + }; + + /** + The render backends available + */ + enum RenderBackend + { + SplashBackend, ///< Splash backend + QPainterBackend ///< Qt backend + }; + + /** + The render hints available + */ + enum RenderHint + { + Antialiasing = 0x00000001, ///< Antialiasing for graphics + TextAntialiasing = 0x00000002, ///< Antialiasing for text + TextHinting = 0x00000004, ///< Hinting for text + TextSlightHinting = 0x00000008, ///< Lighter hinting for text when combined with TextHinting + OverprintPreview = 0x00000010, ///< Overprint preview + ThinLineSolid = 0x00000020, ///< Enhance thin lines solid + ThinLineShape = 0x00000040, ///< Enhance thin lines shape. Wins over ThinLineSolid + IgnorePaperColor = 0x00000080, ///< Do not compose with the paper color + HideAnnotations = 0x00000100 ///< Do not render annotations + }; + Q_DECLARE_FLAGS(RenderHints, RenderHint) + + /** + Form types + */ + enum FormType + { + NoForm, ///< Document doesn't contain forms + AcroForm, ///< AcroForm + XfaForm ///< Adobe XML Forms Architecture (XFA), currently unsupported + }; + + /** + Set a color display profile for the current document. + + \param outputProfileA is a \c cmsHPROFILE of the LCMS library. + + \note This should be called before any rendering happens. + + \note It is assumed that poppler takes over the owernship of the corresponding cmsHPROFILE. In particular, + it is no longer the caller's responsibility to close the profile after use. + */ + void setColorDisplayProfile(void *outputProfileA); + /** + Set a color display profile for the current document. + + \param name is the name of the display profile to set. + + \note This should be called before any rendering happens. + */ + void setColorDisplayProfileName(const QString &name); + /** + Return the current RGB profile. + + \return a \c cmsHPROFILE of the LCMS library. + + \note The returned profile stays a property of poppler and shall NOT be closed by the user. It's + existence is guaranteed for as long as this instance of the Document class is not deleted. + */ + void *colorRgbProfile() const; + /** + Return the current display profile. + + \return a \c cmsHPROFILE of the LCMS library. + + \note The returned profile stays a property of poppler and shall NOT be closed by the user. It's + existence is guaranteed for as long as this instance of the Document class is not deleted. + */ + void *colorDisplayProfile() const; + + /** + Load the document from a file on disk + + \param filePath the name (and path, if required) of the file to load + \param ownerPassword the Latin1-encoded owner password to use in + loading the file + \param userPassword the Latin1-encoded user ("open") password + to use in loading the file + + \return the loaded document, or empty unique pointer on error + + \warning The returning document may be locked if a password is required + to open the file, and one is not provided (as the userPassword). + */ + static std::unique_ptr load(const QString &filePath, const QByteArray &ownerPassword = QByteArray(), const QByteArray &userPassword = QByteArray()); + + /** + Load the document from a device + + \param device the device of the data to load + \param ownerPassword the Latin1-encoded owner password to use in + loading the file + \param userPassword the Latin1-encoded user ("open") password + to use in loading the file + + \return the loaded document, or empty unique pointer on error + + \note if the file is on disk it is recommended to use the other load overload + since it is less resource intensive + + \warning The returning document may be locked if a password is required + to open the file, and one is not provided (as the userPassword). + */ + static std::unique_ptr load(QIODevice *device, const QByteArray &ownerPassword = QByteArray(), const QByteArray &userPassword = QByteArray()); + + /** + Load the document from memory + + \param fileContents the file contents. They are copied so there is no need + to keep the byte array around for the full life time of + the document. + \param ownerPassword the Latin1-encoded owner password to use in + loading the file + \param userPassword the Latin1-encoded user ("open") password + to use in loading the file + + \return the loaded document, or empty unique pointer on error + + \warning The returning document may be locked if a password is required + to open the file, and one is not provided (as the userPassword). + */ + static std::unique_ptr loadFromData(const QByteArray &fileContents, const QByteArray &ownerPassword = QByteArray(), const QByteArray &userPassword = QByteArray()); + + /** + Get a specified Page + + Note that this follows the PDF standard of being zero based - if you + want the first page, then you need an index of zero. + + This function can return empty unique pointer if for some reason the page can't be properly parsed. + + \param index the page number index + + \warning The Page object returned by this method internally stores a pointer + to the document that it was created from. This pointer will go stale if you + delete the Document object. Therefore the Document object needs to be kept alive + as long as you want to use the Page object. + */ + std::unique_ptr page(int index) const; + + /** + \overload + + + The intent is that you can pass in a label like \c "ix" and + get the page with that label (which might be in the table of + contents), or pass in \c "1" and get the page that the user + expects (which might not be the first page, if there is a + title page and a table of contents). + + \param label the page label + */ + std::unique_ptr page(const QString &label) const; + + /** + The number of pages in the document + */ + int numPages() const; + + /** + The type of mode that should be used by the application + when the document is opened. Note that while this is + called page mode, it is really viewer application mode. + */ + PageMode pageMode() const; + + /** + The layout that pages should be shown in when the document + is first opened. This basically describes how pages are + shown relative to each other. + */ + PageLayout pageLayout() const; + + /** + The predominant reading order for text as supplied by + the document's viewer preferences. + */ + Qt::LayoutDirection textDirection() const; + + /** + Provide the passwords required to unlock the document + + \param ownerPassword the Latin1-encoded owner password to use in + loading the file + \param userPassword the Latin1-encoded user ("open") password + to use in loading the file + */ + bool unlock(const QByteArray &ownerPassword, const QByteArray &userPassword); + + /** + Determine if the document is locked + */ + bool isLocked() const; + + /** + The date associated with the document + + You would use this method with something like: + \code +QDateTime created = m_doc->date("CreationDate"); +QDateTime modified = m_doc->date("ModDate"); + \endcode + + The available dates are: + - CreationDate: the date of creation of the document + - ModDate: the date of the last change in the document + + \param type the type of date that is required + */ + QDateTime date(const QString &type) const; + + /** + Set the Info dict date entry specified by \param key to \param val + + \returns true on success, false on failure + */ + bool setDate(const QString &key, const QDateTime &val); + + /** + The date of the creation of the document + */ + QDateTime creationDate() const; + + /** + Set the creation date of the document to \param val + + \returns true on success, false on failure + */ + bool setCreationDate(const QDateTime &val); + + /** + The date of the last change in the document + */ + QDateTime modificationDate() const; + + /** + Set the modification date of the document to \param val + + \returns true on success, false on failure + */ + bool setModificationDate(const QDateTime &val); + + /** + Get specified information associated with the document + + You would use this method with something like: + \code +QString title = m_doc->info("Title"); +QString subject = m_doc->info("Subject"); + \endcode + + In addition to \c Title and \c Subject, other information that may + be available include \c Author, \c Keywords, \c Creator and \c Producer. + + \param type the information that is required + + \sa infoKeys() to get a list of the available keys + */ + QString info(const QString &type) const; + + /** + Set the value of the document's Info dictionary entry specified by \param key to \param val + + \returns true on success, false on failure + */ + bool setInfo(const QString &key, const QString &val); + + /** + The title of the document + */ + QString title() const; + + /** + Set the title of the document to \param val + + \returns true on success, false on failure + */ + bool setTitle(const QString &val); + + /** + The author of the document + */ + QString author() const; + + /** + Set the author of the document to \param val + + \returns true on success, false on failure + */ + bool setAuthor(const QString &val); + + /** + The subject of the document + */ + QString subject() const; + + /** + Set the subject of the document to \param val + + \returns true on success, false on failure + */ + bool setSubject(const QString &val); + + /** + The keywords of the document + */ + QString keywords() const; + + /** + Set the keywords of the document to \param val + + \returns true on success, false on failure + */ + bool setKeywords(const QString &val); + + /** + The creator of the document + */ + QString creator() const; + + /** + Set the creator of the document to \param val + + \returns true on success, false on failure + */ + bool setCreator(const QString &val); + + /** + The producer of the document + */ + QString producer() const; + + /** + Set the producer of the document to \param val + + \returns true on success, false on failure + */ + bool setProducer(const QString &val); + + /** + Remove the document's Info dictionary + + \returns true on success, false on failure + */ + bool removeInfo(); + + /** + Obtain a list of the available string information keys. + */ + QStringList infoKeys() const; + + /** + Test if the document is encrypted + */ + bool isEncrypted() const; + + /** + Test if the document is linearised + + In some cases, this is called "fast web view", since it + is mostly an optimisation for viewing over the Web. + */ + bool isLinearized() const; + + /** + Test if the permissions on the document allow it to be + printed + */ + bool okToPrint() const; + + /** + Test if the permissions on the document allow it to be + printed at high resolution + */ + bool okToPrintHighRes() const; + + /** + Test if the permissions on the document allow it to be + changed. + + \note depending on the type of change, it may be more + appropriate to check other properties as well. + */ + bool okToChange() const; + + /** + Test if the permissions on the document allow the + contents to be copied / extracted + */ + bool okToCopy() const; + + /** + Test if the permissions on the document allow annotations + to be added or modified, and interactive form fields (including + signature fields) to be completed. + */ + bool okToAddNotes() const; + + /** + Test if the permissions on the document allow interactive + form fields (including signature fields) to be completed. + + \note this can be true even if okToAddNotes() is false - this + means that only form completion is permitted. + */ + bool okToFillForm() const; + + /** + Test if the permissions on the document allow interactive + form fields (including signature fields) to be set, created and + modified + */ + bool okToCreateFormFields() const; + + /** + Test if the permissions on the document allow content extraction + (text and perhaps other content) for accessibility usage (eg for + a screen reader) + */ + bool okToExtractForAccessibility() const; + + /** + Test if the permissions on the document allow it to be + "assembled" - insertion, rotation and deletion of pages; + or creation of bookmarks and thumbnail images. + + \note this can be true even if okToChange() is false + */ + bool okToAssemble() const; + + /** \brief The version specification of a pdf file */ + struct PdfVersion + { + int major; + int minor; + }; + + /** + The version of the PDF specification that the document + conforms to + + \since 21.08 + */ + PdfVersion getPdfVersion() const; + + /** + The fonts within the PDF document. + + This is a shorthand for getting all the fonts at once. + + \note this can take a very long time to run with a large + document. You may wish to use a FontIterator if you have more + than say 20 pages + + \see newFontIterator() + */ + QList fonts() const; + + /** + Creates a new FontIterator object for font scanning. + + The new iterator can be used for reading the font information of the + document, reading page by page. + + \param startPage the initial page from which start reading fonts + + \see fonts() + */ + std::unique_ptr newFontIterator(int startPage = 0) const; + + /** + The font data if the font is an embedded one. + */ + QByteArray fontData(const FontInfo &fi) const; + + /** + The documents embedded within the PDF document. + + \note there are two types of embedded document - this call + only accesses documents that are embedded at the document level. + + \note The ownership of the EmbeddedFile objects remain with the callee. + */ + QList embeddedFiles() const; + + /** + Whether there are any documents embedded in this PDF document. + */ + bool hasEmbeddedFiles() const; + + /** + Gets the outline of the document + + \returns a vector of outline items, empty if there are none + **/ + QVector outline() const; + + /** + Tries to resolve the named destination \p name. + + \note this operation starts a search through the whole document + + \returns a new LinkDestination object if the named destination was + actually found, or empty unique pointer otherwise + */ + std::unique_ptr linkDestination(const QString &name); + + /** + Sets the paper color + + \param color the new paper color + */ + void setPaperColor(const QColor &color); + /** + The paper color + + The default color is white. + */ + QColor paperColor() const; + + /** + Sets the backend used to render the pages. + + \param backend the new rendering backend + */ + void setRenderBackend(RenderBackend backend); + /** + The currently set render backend + + The default backend is \ref SplashBackend + */ + RenderBackend renderBackend() const; + + /** + The available rendering backends. + */ + static QSet availableRenderBackends(); + + /** + Sets the render \p hint . + + \note some hints may not be supported by some rendering backends. + + \param on whether the flag should be added or removed. + */ + void setRenderHint(RenderHint hint, bool on = true); + /** + The currently set render hints. + */ + RenderHints renderHints() const; + + /** + Gets a new PS converter for this document. + */ + std::unique_ptr psConverter() const; + + /** + Gets a new PDF converter for this document. + */ + std::unique_ptr pdfConverter() const; + + /** + Gets the metadata stream contents + */ + QString metadata() const; + + /** + Test whether this document has "optional content". + + Optional content is used to optionally turn on (display) + and turn off (not display) some elements of the document. + The most common use of this is for layers in design + applications, but it can be used for a range of things, + such as not including some content in printing, and + displaying content in the appropriate language. + */ + bool hasOptionalContent() const; + + /** + Itemviews model for optional content. + + The model is owned by the document. + */ + OptContentModel *optionalContentModel(); + + /** + Document-level JavaScript scripts. + + Returns the list of document level JavaScript scripts to be always + executed before any other script. + */ + QStringList scripts() const; + + /** + The PDF identifiers. + + \param permanentId an optional pointer to a variable where store the + permanent ID of the document + \param updateId an optional pointer to a variable where store the + update ID of the document + + \return whether the document has the IDs + */ + bool getPdfId(QByteArray *permanentId, QByteArray *updateId) const; + + /** + Returns the type of forms contained in the document + */ + FormType formType() const; + + /** + Returns the calculate order for forms (using their id) + */ + QVector formCalculateOrder() const; + + /** + Returns the signatures of this document. + + Prefer to use this over getting the signatures for all the pages of the document + since there are documents with signatures that don't belong to a given page + */ + std::vector> signatures() const; + + /** + Returns whether the document's XRef table has been reconstructed or not + + \since 21.06 + */ + bool xrefWasReconstructed() const; + + /** + Sets the document's XRef reconstruction callback, so whenever a XRef table + reconstruction happens the callback will get triggered. + + \since 21.06 + */ + void setXRefReconstructedCallback(const std::function &callback); + + /** + Destructor. + */ + ~Document(); + +private: + Q_DISABLE_COPY(Document) + + DocumentData *m_doc; + + explicit Document(DocumentData *dataA); +}; + +class BaseConverterPrivate; +class PSConverterPrivate; +class PDFConverterPrivate; +/** + \brief Base converter. + + This is the base class for the converters. +*/ +class POPPLER_QT6_EXPORT BaseConverter +{ + friend class Document; + +public: + /** + Destructor. + */ + virtual ~BaseConverter(); + + /** Sets the output file name. You must set this or the output device. */ + void setOutputFileName(const QString &outputFileName); + + /** + * Sets the output device. You must set this or the output file name. + */ + void setOutputDevice(QIODevice *device); + + /** + Does the conversion. + + \return whether the conversion succeeded + */ + virtual bool convert() = 0; + + enum Error + { + NoError, + FileLockedError, + OpenOutputError, + NotSupportedInputFileError + }; + + /** + Returns the last error + */ + Error lastError() const; + +protected: + /// \cond PRIVATE + explicit BaseConverter(BaseConverterPrivate &dd); + Q_DECLARE_PRIVATE(BaseConverter) + BaseConverterPrivate *d_ptr; + /// \endcond + +private: + Q_DISABLE_COPY(BaseConverter) +}; + +/** + Converts a PDF to PS + + Sizes have to be in Points (1/72 inch) + + If you are using QPrinter you can get paper size by doing: + \code +QPrinter dummy(QPrinter::PrinterResolution); +dummy.setFullPage(true); +dummy.setPageSize(myPageSize); +width = dummy.width(); +height = dummy.height(); + \endcode +*/ +class POPPLER_QT6_EXPORT PSConverter : public BaseConverter +{ + friend class Document; + +public: + /** + Options for the PS export. + */ + enum PSOption + { + Printing = 0x00000001, ///< The PS is generated for printing purposes + StrictMargins = 0x00000002, + ForceRasterization = 0x00000004, + PrintToEPS = 0x00000008, ///< Output EPS instead of PS + HideAnnotations = 0x00000010, ///< Don't print annotations + ForceOverprintPreview = 0x00000020 ///< Force rasterized overprint preview during conversion \since 23.09 + }; + Q_DECLARE_FLAGS(PSOptions, PSOption) + + /** + Destructor. + */ + ~PSConverter() override; + + /** Sets the list of pages to print. Mandatory. */ + void setPageList(const QList &pageList); + + /** + Sets the title of the PS Document. Optional + */ + void setTitle(const QString &title); + + /** + Sets the horizontal DPI. Defaults to 72.0 + */ + void setHDPI(double hDPI); + + /** + Sets the vertical DPI. Defaults to 72.0 + */ + void setVDPI(double vDPI); + + /** + Sets the rotate. Defaults to not rotated + */ + void setRotate(int rotate); + + /** + Sets the output paper width. Has to be set. + */ + void setPaperWidth(int paperWidth); + + /** + Sets the output paper height. Has to be set. + */ + void setPaperHeight(int paperHeight); + + /** + Sets the output right margin. Defaults to 0 + */ + void setRightMargin(int marginRight); + + /** + Sets the output bottom margin. Defaults to 0 + */ + void setBottomMargin(int marginBottom); + + /** + Sets the output left margin. Defaults to 0 + */ + void setLeftMargin(int marginLeft); + + /** + Sets the output top margin. Defaults to 0 + */ + void setTopMargin(int marginTop); + + /** + Defines if margins have to be strictly followed (even if that + means changing aspect ratio), or if the margins can be adapted + to keep aspect ratio. + + Defaults to false. + */ + void setStrictMargins(bool strictMargins); + + /** + Defines if the page will be rasterized to an image with overprint + preview enabled before printing. + + Defaults to false + + \since 23.09 + */ + void setForceOverprintPreview(bool forceOverprintPreview); + + /** Defines if the page will be rasterized to an image before printing. Defaults to false */ + void setForceRasterize(bool forceRasterize); + + /** + Sets the options for the PS export. + */ + void setPSOptions(PSOptions options); + + /** + The currently set options for the PS export. + + The default flags are: Printing. + */ + PSOptions psOptions() const; + + /** + Sets a function that will be called each time a page is converted. + + The payload belongs to the caller. + */ + void setPageConvertedCallback(void (*callback)(int page, void *payload), void *payload); + + bool convert() override; + +private: + Q_DECLARE_PRIVATE(PSConverter) + Q_DISABLE_COPY(PSConverter) + + explicit PSConverter(DocumentData *document); +}; + +/** + Converts a PDF to PDF (thus saves a copy of the document). +*/ +class POPPLER_QT6_EXPORT PDFConverter : public BaseConverter +{ + friend class Document; + +public: + /** + Options for the PDF export. + */ + enum PDFOption + { + WithChanges = 0x00000001 ///< The changes done to the document are saved as well + }; + Q_DECLARE_FLAGS(PDFOptions, PDFOption) + + /** + Destructor. + */ + ~PDFConverter() override; + + /** + Sets the options for the PDF export. + */ + void setPDFOptions(PDFOptions options); + /** + The currently set options for the PDF export. + */ + PDFOptions pdfOptions() const; + + /** + * Holds data for a new signature + * - Common Name of cert to sign (aka nickname) + * - password for the cert + * - page where to add the signature + * - rect for the signature annotation + * - text that will be shown inside the rect + * - font size and color + * - border width and color + * - background color + * \since 21.01 + */ + class POPPLER_QT6_EXPORT NewSignatureData + { + public: + NewSignatureData(); + ~NewSignatureData(); + NewSignatureData(const NewSignatureData &) = delete; + NewSignatureData &operator=(const NewSignatureData &) = delete; + + QString certNickname() const; + void setCertNickname(const QString &certNickname); + + QString password() const; + void setPassword(const QString &password); + + int page() const; + void setPage(int page); + + QRectF boundingRectangle() const; + void setBoundingRectangle(const QRectF &rect); + + QString signatureText() const; + void setSignatureText(const QString &text); + + /** + * If this text is not empty, the signature representation + * will split in two, with this text on the left and signatureText + * on the right + * + * \since 21.06 + */ + QString signatureLeftText() const; + void setSignatureLeftText(const QString &text); + + /** + * Signature's property Reason. + * + * Default: an empty string. + * + * \since 21.10 + */ + QString reason() const; + void setReason(const QString &reason); + + /** + * Signature's property Location. + * + * Default: an empty string. + * + * \since 21.10 + */ + QString location() const; + void setLocation(const QString &location); + + /** + * Default: 10 + */ + double fontSize() const; + void setFontSize(double fontSize); + + /** + * Default: 20 + * + * \since 21.06 + */ + double leftFontSize() const; + void setLeftFontSize(double fontSize); + + /** + * Default: red + */ + QColor fontColor() const; + void setFontColor(const QColor &color); + + /** + * Default: red + */ + QColor borderColor() const; + void setBorderColor(const QColor &color); + + /** + * border width in points + * + * Default: 1.5 + * + * \since 21.05 + */ + double borderWidth() const; + void setBorderWidth(double width); + + /** + * Default: QColor(240, 240, 240) + */ + QColor backgroundColor() const; + void setBackgroundColor(const QColor &color); + + /** + * Default: QUuid::createUuid().toString() + */ + QString fieldPartialName() const; + void setFieldPartialName(const QString &name); + + /** + * Document owner password (needed if the document that is being signed is password protected) + * + * Default: no password + * + * \since 22.02 + */ + QByteArray documentOwnerPassword() const; + void setDocumentOwnerPassword(const QByteArray &password); + + /** + * Document user password (needed if the document that is being signed is password protected) + * + * Default: no password + * + * \since 22.02 + */ + QByteArray documentUserPassword() const; + void setDocumentUserPassword(const QByteArray &password); + + /** + * Filesystem path to an image file to be used as background + * image for the signature annotation widget. + * + * Default: empty + * + * \since 22.02 + */ + QString imagePath() const; + void setImagePath(const QString &path); + + private: + struct NewSignatureDataPrivate; + NewSignatureDataPrivate *const d; + }; + + /** + Sign PDF at given Annotation / signature form + + \param data new signature data + + \return whether the signing succeeded + + \since 21.01 + */ + bool sign(const NewSignatureData &data); + + bool convert() override; + +private: + Q_DECLARE_PRIVATE(PDFConverter) + Q_DISABLE_COPY(PDFConverter) + + explicit PDFConverter(DocumentData *document); +}; + +/** + Conversion from PDF date string format to QDateTime +*/ +POPPLER_QT6_EXPORT QDateTime convertDate(const char *dateString); + +/** + Whether the color management functions are available. +*/ +POPPLER_QT6_EXPORT bool isCmsAvailable(); + +/** + Whether the overprint preview functionality is available. +*/ +POPPLER_QT6_EXPORT bool isOverprintPreviewAvailable(); + +class SoundData; +/** + Container class for a sound file in a PDF document. + + A sound can be either External (in that case should be loaded the file + whose url is represented by url() ), or Embedded, and the player has to + play the data contained in data(). +*/ +class POPPLER_QT6_EXPORT SoundObject +{ +public: + /** + The type of sound + */ + enum SoundType + { + External, ///< The real sound file is external + Embedded ///< The sound is contained in the data + }; + + /** + The encoding format used for the sound + */ + enum SoundEncoding + { + Raw, ///< Raw encoding, with unspecified or unsigned values in the range [ 0, 2^B - 1 ] + Signed, ///< Twos-complement values + muLaw, ///< mu-law-encoded samples + ALaw ///< A-law-encoded samples + }; + + /** \cond PRIVATE + The caller keeps the ownership of the popplersound argument + */ + explicit SoundObject(Sound *popplersound); + /// \endcond + + ~SoundObject(); + + /** + Is the sound embedded (SoundObject::Embedded) or external (SoundObject::External)? + */ + SoundType soundType() const; + + /** + The URL of the sound file to be played, in case of SoundObject::External + */ + QString url() const; + + /** + The data of the sound, in case of SoundObject::Embedded + */ + QByteArray data() const; + + /** + The sampling rate of the sound + */ + double samplingRate() const; + + /** + The number of sound channels to use to play the sound + */ + int channels() const; + + /** + The number of bits per sample value per channel + */ + int bitsPerSample() const; + + /** + The encoding used for the sound + */ + SoundEncoding soundEncoding() const; + +private: + Q_DISABLE_COPY(SoundObject) + + SoundData *m_soundData; +}; + +class MovieData; +/** + Container class for a movie object in a PDF document. +*/ +class POPPLER_QT6_EXPORT MovieObject +{ + friend class AnnotationPrivate; + +public: + /** + The play mode for playing the movie + */ + enum PlayMode + { + PlayOnce, ///< Play the movie once, closing the movie controls at the end + PlayOpen, ///< Like PlayOnce, but leaving the controls open + PlayRepeat, ///< Play continuously until stopped + PlayPalindrome ///< Play forward, then backward, then again foward and so on until stopped + }; + + ~MovieObject(); + + /** + The URL of the movie to be played + */ + QString url() const; + + /** + The size of the movie + */ + QSize size() const; + + /** + The rotation (either 0, 90, 180, or 270 degrees clockwise) for the movie, + */ + int rotation() const; + + /** + Whether show a bar with movie controls + */ + bool showControls() const; + + /** + How to play the movie + */ + PlayMode playMode() const; + + /** + Returns whether a poster image should be shown if the movie is not playing. + */ + bool showPosterImage() const; + + /** + Returns the poster image that should be shown if the movie is not playing. + If the image is null but showImagePoster() returns @c true, the first frame of the movie + should be used as poster image. + */ + QImage posterImage() const; + +private: + /// \cond PRIVATE + explicit MovieObject(AnnotMovie *ann); + /// \endcond + + Q_DISABLE_COPY(MovieObject) + + MovieData *m_movieData; +}; + +} + +Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::Page::PainterFlags) +Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::Page::SearchFlags) +Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::Document::RenderHints) +Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::PDFConverter::PDFOptions) +Q_DECLARE_OPERATORS_FOR_FLAGS(Poppler::PSConverter::PSOptions) + +#endif diff --git a/poppler-24.05.0/qt6/src/poppler-sound.cc b/poppler-24.05.0/qt6/src/poppler-sound.cc new file mode 100644 index 0000000000000000000000000000000000000000..94248db99a0d54970b837ad71d7c09e046746447 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-sound.cc @@ -0,0 +1,127 @@ +/* poppler-sound.cc: qt interface to poppler + * Copyright (C) 2006-2007, Pino Toscano + * Copyright (C) 2008, 2018, 2020, Albert Astals Cid + * + * 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-qt6.h" + +#include "Object.h" +#include "Stream.h" +#include "Sound.h" + +namespace Poppler { + +class SoundData +{ +public: + SoundData() : m_soundObj(nullptr) { } + + ~SoundData() { delete m_soundObj; } + + SoundData(const SoundData &) = delete; + SoundData &operator=(const SoundData &) = delete; + + SoundObject::SoundType m_type; + Sound *m_soundObj; +}; + +SoundObject::SoundObject(Sound *popplersound) +{ + m_soundData = new SoundData(); + switch (popplersound->getSoundKind()) { + case soundEmbedded: + m_soundData->m_type = SoundObject::Embedded; + break; + case soundExternal: + default: + m_soundData->m_type = SoundObject::External; + break; + } + + m_soundData->m_soundObj = popplersound->copy(); +} + +SoundObject::~SoundObject() +{ + delete m_soundData; +} + +SoundObject::SoundType SoundObject::soundType() const +{ + return m_soundData->m_type; +} + +QString SoundObject::url() const +{ + if (m_soundData->m_type != SoundObject::External) { + return QString(); + } + + return QString(m_soundData->m_soundObj->getFileName().c_str()); +} + +QByteArray SoundObject::data() const +{ + if (m_soundData->m_type != SoundObject::Embedded) { + return QByteArray(); + } + + Stream *stream = m_soundData->m_soundObj->getStream(); + stream->reset(); + int dataLen = 0; + QByteArray fileArray; + int i; + while ((i = stream->getChar()) != EOF) { + fileArray.append((char)i); + ++dataLen; + } + fileArray.resize(dataLen); + + return fileArray; +} + +double SoundObject::samplingRate() const +{ + return m_soundData->m_soundObj->getSamplingRate(); +} + +int SoundObject::channels() const +{ + return m_soundData->m_soundObj->getChannels(); +} + +int SoundObject::bitsPerSample() const +{ + return m_soundData->m_soundObj->getBitsPerSample(); +} + +SoundObject::SoundEncoding SoundObject::soundEncoding() const +{ + switch (m_soundData->m_soundObj->getEncoding()) { + case soundRaw: + return SoundObject::Raw; + case soundSigned: + return SoundObject::Signed; + case soundMuLaw: + return SoundObject::muLaw; + case soundALaw: + return SoundObject::ALaw; + } + return SoundObject::Raw; +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-textbox.cc b/poppler-24.05.0/qt6/src/poppler-textbox.cc new file mode 100644 index 0000000000000000000000000000000000000000..98ec004c4b9258f5fcea5042533436e8cf58a38c --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-textbox.cc @@ -0,0 +1,63 @@ +/* poppler-qt.h: qt interface to poppler + * Copyright (C) 2005, Brad Hards + * Copyright (C) 2006-2008, Albert Astals Cid + * Copyright (C) 2008, Pino Toscano + * + * 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-qt6.h" +#include "poppler-private.h" + +namespace Poppler { + +TextBox::TextBox(const QString &text, const QRectF &bBox) +{ + m_data = new TextBoxData(); + m_data->text = text; + m_data->bBox = bBox; +} + +TextBox::~TextBox() +{ + delete m_data; +} + +QString TextBox::text() const +{ + return m_data->text; +} + +QRectF TextBox::boundingBox() const +{ + return m_data->bBox; +} + +TextBox *TextBox::nextWord() const +{ + return m_data->nextWord; +} + +QRectF TextBox::charBoundingBox(int i) const +{ + return m_data->charBBoxes.value(i); +} + +bool TextBox::hasSpaceAfter() const +{ + return m_data->hasSpaceAfter; +} + +} diff --git a/poppler-24.05.0/qt6/src/poppler-version.cpp b/poppler-24.05.0/qt6/src/poppler-version.cpp new file mode 100644 index 0000000000000000000000000000000000000000..015267c113138335235d440e3aac830e21acc9c2 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-version.cpp @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2009-2010, Pino Toscano + * Copyright (C) 2018, Albert Astals Cid + * + * 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-version.h" + +QString Poppler::Version::string() +{ + return QStringLiteral(POPPLER_VERSION); +} + +unsigned int Poppler::Version::major() +{ + return POPPLER_VERSION_MAJOR; +} + +unsigned int Poppler::Version::minor() +{ + return POPPLER_VERSION_MINOR; +} + +unsigned int Poppler::Version::micro() +{ + return POPPLER_VERSION_MICRO; +} diff --git a/poppler-24.05.0/qt6/src/poppler-version.h.in b/poppler-24.05.0/qt6/src/poppler-version.h.in new file mode 100644 index 0000000000000000000000000000000000000000..a60a62e0a1010cd21d72d35fe25abc2da18360b3 --- /dev/null +++ b/poppler-24.05.0/qt6/src/poppler-version.h.in @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2009, Pino Toscano + * Copyright (C) 2018, 2019, Albert Astals Cid + * + * 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. + */ + +#ifndef POPPLER_VERSION_H +#define POPPLER_VERSION_H + +#include "poppler-export.h" + +#include + +// glibc < 2.28 used to include sys/sysmacros.h +// from sys/types.h and sysmacros.h defines minor and major so +// undefine them. You may need to undefine them in your code too. +#undef minor +#undef major + +#define POPPLER_VERSION "@POPPLER_VERSION@" +#define POPPLER_VERSION_MAJOR @POPPLER_MAJOR_VERSION@ +#define POPPLER_VERSION_MINOR @POPPLER_MINOR_VERSION@ +#define POPPLER_VERSION_MICRO @POPPLER_MICRO_VERSION@ + +namespace Poppler +{ + +namespace Version +{ + +/** + \returns the version string of the current poppler-qt6 library + */ +POPPLER_QT6_EXPORT QString string(); + +/** + \returns the "major" number of the version of the current poppler-qt6 library + */ +POPPLER_QT6_EXPORT unsigned int major(); + +/** + \returns the "minor" number of the version of the current poppler-qt6 library + */ +POPPLER_QT6_EXPORT unsigned int minor(); + +/** + \returns the "micro" number of the version of the current poppler-qt6 library + */ +POPPLER_QT6_EXPORT unsigned int micro(); + +} + +} + +#endif diff --git a/poppler-24.05.0/qt6/tests/CMakeLists.txt b/poppler-24.05.0/qt6/tests/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..95fa89ddefd6dc40f5c020084877e9be8629a7ca --- /dev/null +++ b/poppler-24.05.0/qt6/tests/CMakeLists.txt @@ -0,0 +1,73 @@ +add_definitions(-DTESTDATADIR=\"${TESTDATADIR}\") + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../src + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/../src +) + +macro(QT6_ADD_SIMPLETEST exe source) + string(REPLACE "-" "" test_name ${exe}) + set(${test_name}_SOURCES + ${source} + ) + poppler_add_test(${exe} BUILD_QT6_TESTS ${${test_name}_SOURCES}) + target_link_libraries(${exe} poppler-qt6 Qt6::Widgets) +endmacro() + +macro(QT6_ADD_QTEST exe source) + string(REPLACE "-" "" test_name ${exe}) + set(${test_name}_SOURCES + ${source} + ) + poppler_add_test(${exe} BUILD_QT6_TESTS ${${test_name}_SOURCES}) + if(BUILD_QT6_TESTS) + add_test(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe}) + endif() + target_link_libraries(${exe} poppler-qt6 Qt6::Widgets Qt6::Test Qt6::Gui) +endmacro() + + +qt6_add_simpletest(test-poppler-qt6 test-poppler-qt6.cpp) +qt6_add_simpletest(test-password-qt6 test-password-qt6.cpp) +qt6_add_simpletest(test-render-to-file-qt6 test-render-to-file.cpp) +qt6_add_simpletest(poppler-qt6-forms poppler-forms.cpp) +qt6_add_simpletest(poppler-qt6-fonts poppler-fonts.cpp) +qt6_add_simpletest(poppler-qt6-attachments poppler-attachments.cpp) +qt6_add_simpletest(stress-poppler-qt6 stress-poppler-qt6.cpp) +qt6_add_simpletest(stress-poppler-dir-qt6 stress-poppler-dir.cpp) +qt6_add_simpletest(stress-threads-qt6 stress-threads-qt6.cpp) +qt6_add_simpletest(poppler-qt6-texts poppler-texts.cpp) +qt6_add_simpletest(poppler-qt6-page-labels poppler-page-labels.cpp) + +qt6_add_qtest(check_qt6_attachments check_attachments.cpp) +qt6_add_qtest(check_qt6_dateConversion check_dateConversion.cpp) +qt6_add_qtest(check_qt6_fonts check_fonts.cpp) +qt6_add_qtest(check_qt6_links check_links.cpp) +qt6_add_qtest(check_qt6_annotations check_annotations.cpp) +qt6_add_qtest(check_qt6_metadata check_metadata.cpp) +qt6_add_qtest(check_qt6_optcontent check_optcontent.cpp) +qt6_add_qtest(check_qt6_forms check_forms.cpp) +qt6_add_qtest(check_qt6_pagelayout check_pagelayout.cpp) +qt6_add_qtest(check_qt6_pagemode check_pagemode.cpp) +qt6_add_qtest(check_qt6_password check_password.cpp) +qt6_add_qtest(check_qt6_permissions check_permissions.cpp) +qt6_add_qtest(check_qt6_search check_search.cpp) +qt6_add_qtest(check_qt6_actualtext check_actualtext.cpp) +qt6_add_qtest(check_qt6_lexer check_lexer.cpp) +qt6_add_qtest(check_qt6_internal_outline check_internal_outline.cpp) +qt6_add_qtest(check_qt6_goostring check_goostring.cpp) +qt6_add_qtest(check_qt6_object check_object.cpp) +qt6_add_qtest(check_qt6_stroke_opacity check_stroke_opacity.cpp) +qt6_add_qtest(check_qt6_utf_conversion check_utf_conversion.cpp) +qt6_add_qtest(check_qt6_outline check_outline.cpp) +qt6_add_qtest(check_qt6_signature_basics check_signature_basics.cpp) +qt6_add_qtest(check_qt6_utf8document check_utf8document.cpp) +qt6_add_qtest(check_qt6_distinguished_name_parser check_distinguished_name_parser.cpp) +qt6_add_qtest(check_qt6_cidfontswidthsbuilder check_cidfontswidthsbuilder.cpp) +qt6_add_qtest(check_qt6_overprint check_overprint.cpp) +if (NOT WIN32) + qt6_add_qtest(check_qt6_pagelabelinfo check_pagelabelinfo.cpp) + qt6_add_qtest(check_qt6_strings check_strings.cpp) +endif () diff --git a/poppler-24.05.0/qt6/tests/README.unittest b/poppler-24.05.0/qt6/tests/README.unittest new file mode 100644 index 0000000000000000000000000000000000000000..4647c7d16634a180f73a6d3aa2b5db0d2eccbc18 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/README.unittest @@ -0,0 +1,23 @@ +The unittests for the Qt6 bindings rely on the QtTestLib package, and +will not be built until this is installed. If you do not have it, then +you can download it from the Trolltech website. + +Note that there are a range of ways in which you can run the tests: +1. "make check" will run all the tests. +2. You can run a single test by executing the applicable +executable. For example, you can run the PageMode tests by +"./check_pagemode" +3. You can run a single function within a single test by appending the +name of the function to the executable. For example, if you just want +to run the FullScreen test within the PageMode tests, you can +"./check_pagemode checkFullScreen". Run the executable with -functions +to get a list of all the functions. +4. You can run a single function with specific data by appending the +name of the function, followed by a colon, then the data label to the +executable. For example, to just do the Author check within the +metadata checks, you can "./check_metadata checkStrings:Author". + +For a full list of options, run a executable with "-help". + +Brad Hards +bradh@frogmouth.net diff --git a/poppler-24.05.0/qt6/tests/check_actualtext.cpp b/poppler-24.05.0/qt6/tests/check_actualtext.cpp new file mode 100644 index 0000000000000000000000000000000000000000..830e7208ad1468e087521426dd9eeee40a91c267 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_actualtext.cpp @@ -0,0 +1,184 @@ +#include + +#include + +#include + +class TestActualText : public QObject +{ + Q_OBJECT +public: + explicit TestActualText(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkActualText1(); + void checkActualText2(); + void checkActualText2_data(); + void checkAllOrientations(); + void checkAllOrientations_data(); + void checkFakeboldText(); + void checkFakeboldText_data(); + +private: + void checkActualText(Poppler::Document &doc, const QRectF &area, const QString &text); +}; + +void TestActualText::checkActualText(Poppler::Document &doc, const QRectF &area, const QString &text) +{ + std::unique_ptr page = doc.page(0); + QVERIFY(page); + + QCOMPARE(page->text(area), text); +} + +void TestActualText::checkActualText1() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/WithActualText.pdf"); + QVERIFY(doc); + + checkActualText(*doc, QRectF {}, QStringLiteral("The slow brown fox jumps over the black dog.")); +} + +void TestActualText::checkActualText2() +{ + QFETCH(QRectF, area); + QFETCH(QString, text); + + QFile file(TESTDATADIR "/unittestcases/WithActualText.pdf"); + QVERIFY(file.open(QIODevice::ReadOnly)); + + std::unique_ptr doc = Poppler::Document::load(&file); + QVERIFY(doc); + + checkActualText(*doc, area, text); +} + +void TestActualText::checkActualText2_data() +{ + QTest::addColumn("area"); + QTest::addColumn("text"); + + // Line bounding box is [100.000 90.720 331.012110 102.350] + + QTest::newRow("full page") << QRectF {} << QStringLiteral("The slow brown fox jumps over the black dog."); + QTest::newRow("full line") << QRectF { 50.0, 90.0, 290.0, 20.0 } << QStringLiteral("The slow brown fox jumps over the black dog."); + QTest::newRow("full line [narrow]") << QRectF { 50.0, 95.0, 290.0, 5.0 } << QStringLiteral("The slow brown fox jumps over the black dog."); + QTest::newRow("above line") << QRectF { 50.0, 85.0, 290.0, 10.0 } << QString {}; + QTest::newRow("above line mid") << QRectF { 50.0, 90.0, 290.0, 5.0 } << QString {}; + QTest::newRow("first two words") << QRectF { 50.0, 90.0, 100.0, 20.0 } << QStringLiteral("The slow"); + QTest::newRow("first two words [narrow]") << QRectF { 50.0, 95.0, 100.0, 5.0 } << QStringLiteral("The slow"); + QTest::newRow("first character") << QRectF { 103.0, 95.0, 1.0, 5.0 } << QStringLiteral("T"); + QTest::newRow("last two words") << QRectF { 285.0, 90.0, 100.0, 20.0 } << QStringLiteral("black dog."); + QTest::newRow("last character") << QRectF { 320.0, 90.0, 8.0, 20.0 } << QStringLiteral("g"); + QTest::newRow("middle 'fox'") << QRectF { 190.0, 90.0, 15.0, 20.0 } << QStringLiteral("fox"); + QTest::newRow("middle 'x'") << QRectF { 200.0, 90.0, 5.0, 20.0 } << QStringLiteral("x"); +} + +void TestActualText::checkAllOrientations() +{ + QFETCH(int, pageNr); + QFETCH(QRectF, area); + QFETCH(QString, text); + + QString path { TESTDATADIR "/unittestcases/orientation.pdf" }; + std::unique_ptr doc { Poppler::Document::load(path) }; + QVERIFY(doc); + + std::unique_ptr page { doc->page(pageNr) }; + QVERIFY(page); + + QCOMPARE(page->text(area), text); +} + +void TestActualText::checkAllOrientations_data() +{ + QTest::addColumn("pageNr"); + QTest::addColumn("area"); + QTest::addColumn("text"); + + QTest::newRow("Portrait") << 0 << QRectF {} << QStringLiteral("Portrait"); + QTest::newRow("Landscape") << 1 << QRectF {} << QStringLiteral("Landscape"); + QTest::newRow("Upside down") << 2 << QRectF {} << QStringLiteral("Upside down"); + QTest::newRow("Seacape") << 3 << QRectF {} << QStringLiteral("Seascape"); + + QTest::newRow("Portrait A4 rect") << 0 << QRectF { 0, 0, 595, 842 } << QStringLiteral("Portrait"); + QTest::newRow("Landscape A4 rect") << 1 << QRectF { 0, 0, 842, 595 } << QStringLiteral("Landscape"); + QTest::newRow("Upside down A4 rect") << 2 << QRectF { 0, 0, 595, 842 } << QStringLiteral("Upside down"); + QTest::newRow("Seacape A4 rect") << 3 << QRectF { 0, 0, 842, 595 } << QStringLiteral("Seascape"); + + QTest::newRow("Portrait line rect") << 0 << QRectF { 30, 30, 60, 20 } << QStringLiteral("Portrait"); + QTest::newRow("Landscape line rect") << 1 << QRectF { 790, 30, 20, 80 } << QStringLiteral("Landscape"); + QTest::newRow("Upside down line rect") << 2 << QRectF { 485, 790, 75, 20 } << QStringLiteral("Upside down"); + QTest::newRow("Seacape line rect") << 3 << QRectF { 30, 500, 20, 70 } << QStringLiteral("Seascape"); + + QTest::newRow("Portrait small rect B") << 0 << QRectF { 30, 35, 10, 10 } << QStringLiteral("P"); + QTest::newRow("Portrait small rect E") << 0 << QRectF { 80, 35, 10, 10 } << QStringLiteral("t"); + QTest::newRow("Landscape small rect B") << 1 << QRectF { 800, 30, 10, 10 } << QStringLiteral("L"); + QTest::newRow("Landscape small rect E") << 1 << QRectF { 800, 90, 10, 10 } << QStringLiteral("e"); + QTest::newRow("Upside down small rect B") << 2 << QRectF { 550, 800, 10, 10 } << QStringLiteral("U"); + QTest::newRow("Upside down small rect E") << 2 << QRectF { 485, 800, 10, 10 } << QStringLiteral("n"); + QTest::newRow("Seacape small rect B") << 3 << QRectF { 40, 550, 10, 10 } << QStringLiteral("S"); + QTest::newRow("Seacape small rect E") << 3 << QRectF { 40, 510, 10, 10 } << QStringLiteral("p"); +} + +void TestActualText::checkFakeboldText() +{ + QFETCH(int, pageNr); + QFETCH(QRectF, area); + QFETCH(QString, text); + + QString path { TESTDATADIR "/unittestcases/fakebold.pdf" }; + std::unique_ptr doc { Poppler::Document::load(path) }; + QVERIFY(doc); + + std::unique_ptr page { doc->page(pageNr) }; + QVERIFY(page); + + QEXPECT_FAIL("Upright line 3", "Fakebold not matched when bold word is followed with non-bold glyph", Continue); + QEXPECT_FAIL("Upright line 4", "Fakebold not matched when bold word follows non-bold glyph", Continue); + QEXPECT_FAIL("Upright line 5", "Fakebold not matched when bold word is enclosed by non-bold glyphs", Continue); + QEXPECT_FAIL("Rotated 90' line 3", "Fakebold not matched when bold word is followed with non-bold glyph", Continue); + QEXPECT_FAIL("Rotated 90' line 4", "Fakebold not matched when bold word follows non-bold glyph", Continue); + QEXPECT_FAIL("Rotated 90' line 5", "Fakebold not matched when bold word is enclosed by non-bold glyphs", Continue); + QEXPECT_FAIL("Rotated 180' line 3", "Fakebold not matched when bold word is followed with non-bold glyph", Continue); + QEXPECT_FAIL("Rotated 180' line 4", "Fakebold not matched when bold word follows non-bold glyph", Continue); + QEXPECT_FAIL("Rotated 180' line 5", "Fakebold not matched when bold word is enclosed by non-bold glyphs", Continue); + QEXPECT_FAIL("Rotated 270' line 3", "Fakebold not matched when bold word is followed with non-bold glyph", Continue); + QEXPECT_FAIL("Rotated 270' line 4", "Fakebold not matched when bold word follows non-bold glyph", Continue); + QEXPECT_FAIL("Rotated 270' line 5", "Fakebold not matched when bold word is enclosed by non-bold glyphs", Continue); + QCOMPARE(page->text(area), text); +} + +void TestActualText::checkFakeboldText_data() +{ + QTest::addColumn("pageNr"); + QTest::addColumn("area"); + QTest::addColumn("text"); + + QTest::newRow("Upright line 1") << 0 << QRectF { 0, 0, 595, 80 } << QStringLiteral("1 This is fakebold text."); + QTest::newRow("Upright line 2") << 0 << QRectF { 0, 80, 595, 80 } << QStringLiteral("2 This is a fakebold word."); + QTest::newRow("Upright line 3") << 0 << QRectF { 0, 140, 595, 80 } << QStringLiteral("3 The last word is in fakebold."); + QTest::newRow("Upright line 4") << 0 << QRectF { 0, 220, 595, 80 } << QStringLiteral("4 Hyphenated-fakebold word."); + QTest::newRow("Upright line 5") << 0 << QRectF { 0, 300, 595, 80 } << QStringLiteral("5 Quoted \"fakebold\" word."); + + QTest::newRow("Rotated 90' line 1") << 1 << QRectF { 510, 0, 80, 842 } << QStringLiteral("1 This is fakebold text."); + QTest::newRow("Rotated 90' line 2") << 1 << QRectF { 430, 0, 80, 842 } << QStringLiteral("2 This is a fakebold word."); + QTest::newRow("Rotated 90' line 3") << 1 << QRectF { 350, 0, 80, 842 } << QStringLiteral("3 The last word is in fakebold."); + QTest::newRow("Rotated 90' line 4") << 1 << QRectF { 270, 0, 80, 842 } << QStringLiteral("4 Hyphenated-fakebold word."); + QTest::newRow("Rotated 90' line 5") << 1 << QRectF { 190, 0, 80, 842 } << QStringLiteral("5 Quoted \"fakebold\" word."); + + QTest::newRow("Rotated 180' line 1") << 2 << QRectF { 0, 760, 595, 80 } << QStringLiteral("1 This is fakebold text."); + QTest::newRow("Rotated 180' line 2") << 2 << QRectF { 0, 680, 595, 80 } << QStringLiteral("2 This is a fakebold word."); + QTest::newRow("Rotated 180' line 3") << 2 << QRectF { 0, 600, 595, 80 } << QStringLiteral("3 The last word is in fakebold."); + QTest::newRow("Rotated 180' line 4") << 2 << QRectF { 0, 520, 595, 80 } << QStringLiteral("4 Hyphenated-fakebold word."); + QTest::newRow("Rotated 180' line 5") << 2 << QRectF { 0, 440, 595, 80 } << QStringLiteral("5 Quoted \"fakebold\" word."); + + QTest::newRow("Rotated 270' line 1") << 3 << QRectF { 20, 0, 80, 842 } << QStringLiteral("1 This is fakebold text."); + QTest::newRow("Rotated 270' line 2") << 3 << QRectF { 100, 0, 80, 842 } << QStringLiteral("2 This is a fakebold word."); + QTest::newRow("Rotated 270' line 3") << 3 << QRectF { 160, 0, 80, 842 } << QStringLiteral("3 The last word is in fakebold."); + QTest::newRow("Rotated 270' line 4") << 3 << QRectF { 240, 0, 80, 842 } << QStringLiteral("4 Hyphenated-fakebold word."); + QTest::newRow("Rotated 270' line 5") << 3 << QRectF { 320, 0, 80, 842 } << QStringLiteral("5 Quoted \"fakebold\" word."); +} + +QTEST_GUILESS_MAIN(TestActualText) + +#include "check_actualtext.moc" diff --git a/poppler-24.05.0/qt6/tests/check_annotations.cpp b/poppler-24.05.0/qt6/tests/check_annotations.cpp new file mode 100644 index 0000000000000000000000000000000000000000..bf9d24444aa10b170daea94f25638bbcd6337bf5 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_annotations.cpp @@ -0,0 +1,262 @@ +#include +#include +#include + +#include +#include + +#include + +#include "poppler/Annot.h" +#include "goo/GooString.h" +#include "goo/gstrtod.h" + +class TestAnnotations : public QObject +{ + Q_OBJECT +public: + explicit TestAnnotations(QObject *parent = nullptr) : QObject(parent) { } + + void saveAndCheck(const std::unique_ptr &doc, const std::function &checkFunction); + +private slots: + void checkQColorPrecision(); + void checkFontSizeAndColor(); + void checkHighlightFromAndToQuads(); + void checkUTF16LEAnnot(); + void checkModificationCreationDate(); + void checkNonMarkupAnnotations(); + void checkDefaultAppearance(); +}; + +/* Is .5f sufficient for 16 bit color channel roundtrip trough save and load on all architectures? */ +void TestAnnotations::checkQColorPrecision() +{ + bool precisionOk = true; + for (int i = std::numeric_limits::min(); i <= std::numeric_limits::max(); i++) { + double normalized = static_cast(i) / static_cast(std::numeric_limits::max()); + const std::unique_ptr serialized = GooString::format("{0:.5f}", normalized); + double deserialized = gatof(serialized->c_str()); + uint16_t denormalized = std::round(deserialized * std::numeric_limits::max()); + if (static_cast(i) != denormalized) { + precisionOk = false; + break; + } + } + QVERIFY(precisionOk); +} + +void TestAnnotations::checkFontSizeAndColor() +{ + const QString contents = QStringLiteral("foobar"); + const std::vector testColors { QColor::fromRgb(0xAB, 0xCD, 0xEF), QColor::fromCmyk(0xAB, 0xBC, 0xCD, 0xDE) }; + const QFont testFont(QStringLiteral("Helvetica"), 20); + + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + + { + std::unique_ptr doc { Poppler::Document::load(TESTDATADIR "/unittestcases/UseNone.pdf") }; + QVERIFY(doc.get()); + + std::unique_ptr page { doc->page(0) }; + QVERIFY(page.get()); + + for (const auto &color : testColors) { + auto annot = std::make_unique(Poppler::TextAnnotation::InPlace); + annot->setBoundary(QRectF(0.0, 0.0, 1.0, 1.0)); + annot->setContents(contents); + annot->setTextFont(testFont); + annot->setTextColor(color); + page->addAnnotation(annot.get()); + } + + std::unique_ptr conv(doc->pdfConverter()); + QVERIFY(conv.get()); + conv->setOutputFileName(tempFile.fileName()); + conv->setPDFOptions(Poppler::PDFConverter::WithChanges); + QVERIFY(conv->convert()); + } + + { + std::unique_ptr doc { Poppler::Document::load(tempFile.fileName()) }; + QVERIFY(doc.get()); + + std::unique_ptr page { doc->page(0) }; + QVERIFY(page.get()); + + auto annots = page->annotations(); + QCOMPARE(annots.size(), static_cast(testColors.size())); + + auto &&annot = annots.cbegin(); + for (const auto &color : testColors) { + QCOMPARE((*annot)->subType(), Poppler::Annotation::AText); + auto textAnnot = static_cast(annot->get()); + QCOMPARE(textAnnot->contents(), contents); + QCOMPARE(textAnnot->textFont().pointSize(), testFont.pointSize()); + QCOMPARE(static_cast(textAnnot->textColor().spec()), static_cast(color.spec())); + QCOMPARE(textAnnot->textColor(), color); + if (annot != annots.cend()) { + ++annot; + } + } + } +} + +namespace Poppler { +static bool operator==(const Poppler::HighlightAnnotation::Quad &a, const Poppler::HighlightAnnotation::Quad &b) +{ + // FIXME We do not compare capStart, capEnd and feather since AnnotQuadrilaterals doesn't contain that info and thus + // HighlightAnnotationPrivate::fromQuadrilaterals uses default values + return a.points[0] == b.points[0] && a.points[1] == b.points[1] && a.points[2] == b.points[2] && a.points[3] == b.points[3]; +} +} + +void TestAnnotations::checkHighlightFromAndToQuads() +{ + std::unique_ptr doc { Poppler::Document::load(TESTDATADIR "/unittestcases/UseNone.pdf") }; + + std::unique_ptr page { doc->page(0) }; + + auto ha = std::make_unique(); + page->addAnnotation(ha.get()); + + const QList quads = { { { { 0, 0.1 }, { 0.2, 0.3 }, { 0.4, 0.5 }, { 0.6, 0.7 } }, false, false, 0 }, { { { 0.8, 0.9 }, { 0.1, 0.2 }, { 0.3, 0.4 }, { 0.5, 0.6 } }, true, false, 0.4 } }; + ha->setHighlightQuads(quads); + QCOMPARE(ha->highlightQuads(), quads); +} + +void TestAnnotations::checkUTF16LEAnnot() +{ + std::unique_ptr doc { Poppler::Document::load(TESTDATADIR "/unittestcases/utf16le-annot.pdf") }; + QVERIFY(doc.get()); + + std::unique_ptr page { doc->page(0) }; + QVERIFY(page.get()); + + auto annots = page->annotations(); + QCOMPARE(annots.size(), 2); + + const auto &annot = annots[1]; + QCOMPARE(annot->contents(), QString::fromUtf8("Únîcödé豰")); // clazy:exclude=qstring-allocations +} + +void TestAnnotations::saveAndCheck(const std::unique_ptr &doc, const std::function &checkFunction) +{ + // also check that saving yields the same output + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + + std::unique_ptr conv(doc->pdfConverter()); + conv->setOutputFileName(tempFile.fileName()); + conv->setPDFOptions(Poppler::PDFConverter::WithChanges); + conv->convert(); + + std::unique_ptr savedDoc { Poppler::Document::load(tempFile.fileName()) }; + std::unique_ptr page { doc->page(0) }; + auto annots = page->annotations(); + checkFunction(annots.at(1).get()); +} + +void TestAnnotations::checkModificationCreationDate() +{ + std::unique_ptr doc { Poppler::Document::load(TESTDATADIR "/unittestcases/utf16le-annot.pdf") }; + QVERIFY(doc.get()); + + std::unique_ptr page { doc->page(0) }; + + auto annots = page->annotations(); + const auto &annot = annots.at(1); + QCOMPARE(annot->creationDate(), QDateTime()); + QCOMPARE(annot->modificationDate(), QDateTime()); + + const QDateTime dt1(QDate(2020, 8, 7), QTime(18, 34, 56)); + annot->setCreationDate(dt1); + auto checkFunction1 = [dt1](Poppler::Annotation *a) { + QCOMPARE(a->creationDate(), dt1); + // setting the creation date updates the modification date + QVERIFY(std::abs(a->modificationDate().secsTo(QDateTime::currentDateTime())) < 2); + }; + checkFunction1(annot.get()); + saveAndCheck(doc, checkFunction1); + + const QDateTime dt2(QDate(2020, 8, 30), QTime(8, 14, 52)); + annot->setModificationDate(dt2); + auto checkFunction2 = [dt2](Poppler::Annotation *a) { QCOMPARE(a->modificationDate(), dt2); }; + checkFunction2(annot.get()); + saveAndCheck(doc, checkFunction2); + + // setting the creation date to empty means "use the modification date" and also updates the modification date + // so both creation date and modification date are the same and are now + annot->setCreationDate(QDateTime()); + auto checkFunction3 = [](Poppler::Annotation *a) { + QVERIFY(std::abs(a->creationDate().secsTo(QDateTime::currentDateTime())) < 2); + QCOMPARE(a->creationDate(), a->modificationDate()); + }; + checkFunction3(annot.get()); + saveAndCheck(doc, checkFunction3); + + annot->setModificationDate(QDateTime()); + auto checkFunction4 = [](Poppler::Annotation *a) { + QCOMPARE(a->creationDate(), QDateTime()); + QCOMPARE(a->modificationDate(), QDateTime()); + }; + checkFunction4(annot.get()); + saveAndCheck(doc, checkFunction4); +} + +void TestAnnotations::checkNonMarkupAnnotations() +{ + std::unique_ptr doc { Poppler::Document::load(TESTDATADIR "/unittestcases/checkbox_issue_159.pdf") }; + QVERIFY(doc.get()); + + std::unique_ptr page { doc->page(0) }; + QVERIFY(page.get()); + + auto annots = page->annotations(); + QCOMPARE(annots.size(), 17); +} + +void TestAnnotations::checkDefaultAppearance() +{ + std::unique_ptr roundtripString; + { + GooString daString { "/Helv 10 Tf 0.1 0.2 0.3 rg" }; + const DefaultAppearance da { &daString }; + QCOMPARE(da.getFontPtSize(), 10.); + QVERIFY(da.getFontName().isName()); + QCOMPARE(da.getFontName().getName(), "Helv"); + const AnnotColor *color = da.getFontColor(); + QVERIFY(color); + QCOMPARE(color->getSpace(), AnnotColor::colorRGB); + QCOMPARE(color->getValues()[0], 0.1); + QCOMPARE(color->getValues()[1], 0.2); + QCOMPARE(color->getValues()[2], 0.3); + roundtripString = std::make_unique(da.toAppearanceString()); + } + { + /* roundtrip through parse/generate/parse shall preserve values */ + const DefaultAppearance da { roundtripString.get() }; + QCOMPARE(da.getFontPtSize(), 10.); + QVERIFY(da.getFontName().isName()); + QCOMPARE(da.getFontName().getName(), "Helv"); + const AnnotColor *color = da.getFontColor(); + QVERIFY(color); + QCOMPARE(color->getSpace(), AnnotColor::colorRGB); + QCOMPARE(color->getValues()[0], 0.1); + QCOMPARE(color->getValues()[1], 0.2); + QCOMPARE(color->getValues()[2], 0.3); + } + { + /* parsing bad DA strings must not cause crash */ + GooString daString { "/ % Tf 1 2 rg" }; + const DefaultAppearance da { &daString }; + QVERIFY(!da.getFontName().isName()); + } +} + +QTEST_GUILESS_MAIN(TestAnnotations) + +#include "check_annotations.moc" diff --git a/poppler-24.05.0/qt6/tests/check_attachments.cpp b/poppler-24.05.0/qt6/tests/check_attachments.cpp new file mode 100644 index 0000000000000000000000000000000000000000..74b55117ddc51bc50be39bc26c253fe41fe938b2 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_attachments.cpp @@ -0,0 +1,137 @@ +#include + +#include + +#include + +class TestAttachments : public QObject +{ + Q_OBJECT +public: + explicit TestAttachments(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkNoAttachments(); + void checkAttach1(); + void checkAttach2(); + void checkAttach3(); + void checkAttach4(); +}; + +void TestAttachments::checkNoAttachments() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->hasEmbeddedFiles(), false); +} + +void TestAttachments::checkAttach1() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/WithAttachments.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasEmbeddedFiles()); + + QList fileList = doc->embeddedFiles(); + QCOMPARE(fileList.size(), 2); + + Poppler::EmbeddedFile *embfile = fileList.at(0); + QCOMPARE(embfile->name(), QLatin1String("kroller.png")); + QCOMPARE(embfile->description(), QString()); + QCOMPARE(embfile->createDate(), QDateTime(QDate(), QTime())); + QCOMPARE(embfile->modDate(), QDateTime(QDate(), QTime())); + QCOMPARE(embfile->mimeType(), QString()); + + QFile file(TESTDATADIR "/unittestcases/kroller.png"); + QVERIFY(file.open(QIODevice::ReadOnly)); + QByteArray krollerData = file.readAll(); + QByteArray embdata = embfile->data(); + QCOMPARE(krollerData, embdata); + + Poppler::EmbeddedFile *embfile2 = fileList.at(1); + QCOMPARE(embfile2->name(), QLatin1String("gnome-64.gif")); + QCOMPARE(embfile2->description(), QString()); + QCOMPARE(embfile2->modDate(), QDateTime(QDate(), QTime())); + QCOMPARE(embfile2->createDate(), QDateTime(QDate(), QTime())); + QCOMPARE(embfile2->mimeType(), QString()); + + QFile file2(TESTDATADIR "/unittestcases/gnome-64.gif"); + QVERIFY(file2.open(QIODevice::ReadOnly)); + QByteArray g64Data = file2.readAll(); + QByteArray emb2data = embfile2->data(); + QCOMPARE(g64Data, emb2data); +} + +void TestAttachments::checkAttach2() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/A6EmbeddedFiles.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasEmbeddedFiles()); + + QList fileList; + fileList = doc->embeddedFiles(); + QCOMPARE(fileList.size(), 3); + + Poppler::EmbeddedFile *embfile1 = fileList.at(0); + QCOMPARE(embfile1->name(), QLatin1String("Acro7 thoughts")); + QCOMPARE(embfile1->description(), QString()); + QCOMPARE(embfile1->createDate(), QDateTime(QDate(2003, 8, 4), QTime(13, 54, 54), Qt::UTC)); + QCOMPARE(embfile1->modDate(), QDateTime(QDate(2003, 8, 4), QTime(14, 15, 27), Qt::UTC)); + QCOMPARE(embfile1->mimeType(), QLatin1String("text/xml")); + + Poppler::EmbeddedFile *embfile2 = fileList.at(1); + QCOMPARE(embfile2->name(), QLatin1String("acro transitions 1.xls")); + QCOMPARE(embfile2->description(), QString()); + QCOMPARE(embfile2->createDate(), QDateTime(QDate(2003, 7, 18), QTime(21, 7, 16), Qt::UTC)); + QCOMPARE(embfile2->modDate(), QDateTime(QDate(2003, 7, 22), QTime(13, 4, 40), Qt::UTC)); + QCOMPARE(embfile2->mimeType(), QLatin1String("application/excel")); + + Poppler::EmbeddedFile *embfile3 = fileList.at(2); + QCOMPARE(embfile3->name(), QLatin1String("apago_pdfe_wide.gif")); + QCOMPARE(embfile3->description(), QString()); + QCOMPARE(embfile3->createDate(), QDateTime(QDate(2003, 1, 31), QTime(15, 54, 29), Qt::UTC)); + QCOMPARE(embfile3->modDate(), QDateTime(QDate(2003, 1, 31), QTime(15, 52, 58), Qt::UTC)); + QCOMPARE(embfile3->mimeType(), QString()); +} + +void TestAttachments::checkAttach3() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/shapes+attachments.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasEmbeddedFiles()); + + QList fileList; + fileList = doc->embeddedFiles(); + QCOMPARE(fileList.size(), 1); + + Poppler::EmbeddedFile *embfile = fileList.at(0); + QCOMPARE(embfile->name(), QLatin1String("ADEX1.xpdf.pgp")); + QCOMPARE(embfile->description(), QString()); + QCOMPARE(embfile->createDate(), QDateTime(QDate(2004, 3, 29), QTime(19, 37, 16), Qt::UTC)); + QCOMPARE(embfile->modDate(), QDateTime(QDate(2004, 3, 29), QTime(19, 37, 16), Qt::UTC)); + QCOMPARE(embfile->mimeType(), QString()); +} + +void TestAttachments::checkAttach4() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/imageretrieve+attachment.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasEmbeddedFiles()); + + QList fileList; + fileList = doc->embeddedFiles(); + QCOMPARE(fileList.size(), 1); + + Poppler::EmbeddedFile *embfile = fileList.at(0); + QCOMPARE(embfile->name(), QLatin1String("export-altona.csv")); + QCOMPARE(embfile->description(), QLatin1String("Altona Export")); + QCOMPARE(embfile->createDate(), QDateTime(QDate(2005, 8, 30), QTime(20, 49, 35), Qt::UTC)); + QCOMPARE(embfile->modDate(), QDateTime(QDate(2005, 8, 30), QTime(20, 49, 52), Qt::UTC)); + QCOMPARE(embfile->mimeType(), QLatin1String("application/vnd.ms-excel")); +} + +QTEST_GUILESS_MAIN(TestAttachments) +#include "check_attachments.moc" diff --git a/poppler-24.05.0/qt6/tests/check_cidfontswidthsbuilder.cpp b/poppler-24.05.0/qt6/tests/check_cidfontswidthsbuilder.cpp new file mode 100644 index 0000000000000000000000000000000000000000..19869341f87c5e3945693f99892afa4f112528e3 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_cidfontswidthsbuilder.cpp @@ -0,0 +1,100 @@ +//======================================================================== +// +// check_cidfontswidthsbuilder.cpp +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela +//======================================================================== + +#include "CIDFontsWidthsBuilder.h" + +#include + +class TestCIDFontsWidthsBuilder : public QObject +{ + Q_OBJECT +public: + using QObject::QObject; +private Q_SLOTS: + void testEmpty(); + void testSingle(); + void testSimpleSequence(); +}; + +void TestCIDFontsWidthsBuilder::testEmpty() +{ + CIDFontsWidthsBuilder b; + auto segments = b.takeSegments(); + QCOMPARE(segments.size(), 0); +} + +static bool compare(const CIDFontsWidthsBuilder::Segment &segment1, const CIDFontsWidthsBuilder::Segment &segment2) +{ + return std::visit( + [](const auto &s1, const auto &s2) { + using T1 = std::decay_t; + using T2 = std::decay_t; + if constexpr (!std::is_same_v) { + return false; + } else if constexpr (std::is_same_v) { + return s1.first == s2.first && s1.widths == s2.widths; + } else if constexpr (std::is_same_v) { + return s1.first == s2.first && s1.last == s2.last && s1.width == s2.width; + } else { + return false; + } + }, + segment1, segment2); +} + +void TestCIDFontsWidthsBuilder::testSingle() +{ + CIDFontsWidthsBuilder b; + b.addWidth(0, 10); + auto segments = b.takeSegments(); + QCOMPARE(segments.size(), 1); + auto segment0 = CIDFontsWidthsBuilder::ListSegment { 0, { 10 } }; + QVERIFY(compare(segments[0], segment0)); +} + +void TestCIDFontsWidthsBuilder::testSimpleSequence() +{ + CIDFontsWidthsBuilder b; + for (int i = 0; i < 2; i++) { // repeat to verify that takeSegments resets + b.addWidth(0, 10); + b.addWidth(1, 10); + b.addWidth(2, 10); + b.addWidth(3, 10); + b.addWidth(4, 10); + b.addWidth(5, 20); + b.addWidth(6, 21); + b.addWidth(7, 21); + b.addWidth(8, 20); + b.addWidth(9, 10); + b.addWidth(10, 10); + b.addWidth(11, 10); + b.addWidth(12, 10); + b.addWidth(13, 10); + b.addWidth(14, 20); + b.addWidth(15, 21); + b.addWidth(16, 21); + b.addWidth(17, 20); + b.addWidth(19, 20); + auto segments = b.takeSegments(); + QCOMPARE(segments.size(), 5); + auto segment0 = CIDFontsWidthsBuilder::RangeSegment { 0, 4, 10 }; + QVERIFY(compare(segments[0], segment0)); + auto segment1 = CIDFontsWidthsBuilder::ListSegment { 5, { 20, 21, 21, 20 } }; + QVERIFY(compare(segments[1], segment1)); + auto segment2 = CIDFontsWidthsBuilder::RangeSegment { 9, 13, 10 }; + QVERIFY(compare(segments[2], segment2)); + auto segment3 = CIDFontsWidthsBuilder::ListSegment { 14, { 20, 21, 21, 20 } }; + QVERIFY(compare(segments[3], segment3)); + auto segment4 = CIDFontsWidthsBuilder::ListSegment { 19, { 20 } }; + QVERIFY(compare(segments[4], segment4)); + } +} + +QTEST_GUILESS_MAIN(TestCIDFontsWidthsBuilder); +#include "check_cidfontswidthsbuilder.moc" diff --git a/poppler-24.05.0/qt6/tests/check_dateConversion.cpp b/poppler-24.05.0/qt6/tests/check_dateConversion.cpp new file mode 100644 index 0000000000000000000000000000000000000000..331dcf3689f72cd473a8388d6e5d3c62144119bd --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_dateConversion.cpp @@ -0,0 +1,104 @@ +#include + +Q_DECLARE_METATYPE(QDate) +Q_DECLARE_METATYPE(QTime) + +#include + +class TestDateConv : public QObject +{ + Q_OBJECT +public: + explicit TestDateConv(QObject *parent = nullptr) : QObject(parent) { } + +private slots: + void initTestCase(); + void checkDates_data(); + void checkDates(); + void checkInvalidDates_data(); + void checkInvalidDates(); +}; + +void TestDateConv::initTestCase() +{ + qRegisterMetaType("QDate"); + qRegisterMetaType("QTime"); +} + +void TestDateConv::checkDates_data() +{ + QTest::addColumn("input"); + QTest::addColumn("day"); + QTest::addColumn("time"); + + // This is a typical case - all data provided + QTest::newRow("D:20040101121110") << QByteArray("D:20040101121110Z") << QDate(2004, 1, 1) << QTime(12, 11, 10); + + // The D: is strongly recommended, but optional + QTest::newRow("20040101121110") << QByteArray("20040101121110Z") << QDate(2004, 1, 1) << QTime(12, 11, 10); + + // Only the year is actually required + QTest::newRow("D:2006") << QByteArray("D:2006") << QDate(2006, 1, 1) << QTime(0, 0, 0); + + QTest::newRow("D:200602") << QByteArray("D:200602") << QDate(2006, 2, 1) << QTime(0, 0, 0); + + QTest::newRow("D:20060304") << QByteArray("D:20060304") << QDate(2006, 3, 4) << QTime(0, 0, 0); + + QTest::newRow("D:2006030405") << QByteArray("D:2006030405") << QDate(2006, 3, 4) << QTime(5, 0, 0); + + QTest::newRow("D:200603040512") << QByteArray("D:200603040512") << QDate(2006, 3, 4) << QTime(5, 12, 0); + + // If the timezone isn't specified, I assume UTC + QTest::newRow("D:20060304051226") << QByteArray("D:20060304051226") << QDate(2006, 3, 4) << QTime(5, 12, 26); + + // Check for real timezone conversions + QTest::newRow("D:20030131115258-04'00'") << QByteArray("D:20030131115258-04'00'") << QDate(2003, 1, 31) << QTime(15, 52, 58); + + QTest::newRow("D:20030131115258+05'00'") << QByteArray("D:20030131115258+05'00'") << QDate(2003, 1, 31) << QTime(6, 52, 58); + + // There are places that have non-hour offsets + // Yep, that means you Adelaide. + QTest::newRow("D:20030131115258+08'30'") << QByteArray("D:20030131115258+08'30'") << QDate(2003, 1, 31) << QTime(3, 22, 58); + + QTest::newRow("D:20030131115258-08'30'") << QByteArray("D:20030131115258-08'30'") << QDate(2003, 1, 31) << QTime(20, 22, 58); +} + +void TestDateConv::checkDates() +{ + QFETCH(QByteArray, input); + QFETCH(QDate, day); + QFETCH(QTime, time); + + QCOMPARE(Poppler::convertDate(input.constData()), QDateTime(day, time, Qt::UTC)); +} + +void TestDateConv::checkInvalidDates_data() +{ + QTest::addColumn("input"); + + // Null data + QTest::newRow("Null data") << QByteArray(); + + // Empty data + QTest::newRow("Empty data") << QByteArray(""); + + // Empty data + QTest::newRow("One character") << QByteArray("D"); + + // Empty data + QTest::newRow("'D:'") << QByteArray("D:"); + + // Empty data + QTest::newRow("Not a date") << QByteArray("D:IAmNotAValidDate"); +} + +void TestDateConv::checkInvalidDates() +{ + QFETCH(QByteArray, input); + + QCOMPARE(Poppler::convertDate(input.constData()), QDateTime()); +} + +QTEST_GUILESS_MAIN(TestDateConv) + +#include "check_dateConversion.moc" diff --git a/poppler-24.05.0/qt6/tests/check_distinguished_name_parser.cpp b/poppler-24.05.0/qt6/tests/check_distinguished_name_parser.cpp new file mode 100644 index 0000000000000000000000000000000000000000..d79b4d6a91af4b993af96b4be3bff82574d2483b --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_distinguished_name_parser.cpp @@ -0,0 +1,161 @@ +//======================================================================== +// +// check_distinguished_name_parser.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2023 g10 Code GmbH, Author: Sune Stolborg Vuorela +//======================================================================== +#include "DistinguishedNameParser.h" + +#include +#include + +class TestDistinguishedNameParser : public QObject +{ + Q_OBJECT +public: + explicit TestDistinguishedNameParser(QObject *parent = nullptr) : QObject(parent) { } +private slots: + // The big set of input/output. Several of the helper functions can be tested independently + void testParser(); + void testParser_data(); + + void testRemoveLeadingSpaces(); + void testRemoveLeadingSpaces_data(); + + void testRemoveTrailingSpaces(); + void testRemoveTrailingSpaces_data(); + + void testParseHexString(); + void testParseHexString_data(); +}; + +void TestDistinguishedNameParser::testParser() +{ + QFETCH(std::string, inputData); + QFETCH(DN::Result, expectedResult); + + auto result = DN::parseString(inputData); + QCOMPARE(result, expectedResult); +} + +void TestDistinguishedNameParser::testParser_data() +{ + QTest::addColumn("inputData"); + QTest::addColumn("expectedResult"); + + QTest::newRow("empty") << std::string {} << DN::Result {}; + QTest::newRow("CN=Simple") << std::string { "CN=Simple" } << DN::Result { { "CN", "Simple" } }; + QTest::newRow("CN=Name with spaces") << std::string { "CN=Name with spaces" } << DN::Result { { "CN", "Name with spaces" } }; + QTest::newRow("CN=Simple,O=Silly") << std::string { "CN=Simple,O=Silly" } << DN::Result { { "CN", "Simple" }, { "O", "Silly" } }; + QTest::newRow("CN=Steve Kille,O=Isode Limited,C=GB") << std::string { "CN=Steve Kille,O=Isode Limited,C=GB" } << DN::Result { { "CN", "Steve Kille" }, { "O", "Isode Limited" }, { "C", "GB" } }; + QTest::newRow("CN=some.user@example.com, O=MyCompany, L=San Diego,ST=California, C=US") + << std::string { "CN=some.user@example.com, O=MyCompany, L=San Diego,ST=California, C=US" } << DN::Result { { "CN", "some.user@example.com" }, { "O", "MyCompany" }, { "L", "San Diego" }, { "ST", "California" }, { "C", "US" } }; + QTest::newRow("Multi valued") << std::string { "OU=Sales+CN=J. Smith,O=Widget Inc.,C=US" } + << DN::Result { { "OU", "Sales" }, { "CN", "J. Smith" }, { "O", "Widget Inc." }, { "C", "US" } }; // This is technically wrong, but probably good enough for now + QTest::newRow("Escaping comma") << std::string { "CN=L. Eagle,O=Sue\\, Grabbit and Runn,C=GB" } << DN::Result { { "CN", "L. Eagle" }, { "O", "Sue, Grabbit and Runn" }, { "C", "GB" } }; + QTest::newRow("Escaped trailing space") << std::string { "CN=Trailing space\\ " } << DN::Result { { "CN", "Trailing space " } }; + QTest::newRow("Escaped quote") << std::string { "CN=Quotation \\\" Mark" } << DN::Result { { "CN", "Quotation \" Mark" } }; + + QTest::newRow("CN=Simple with escaping") << std::string { "CN=S\\69mpl\\65\\7A" } << DN::Result { { "CN", "Simplez" } }; + QTest::newRow("SN=Lu\\C4\\8Di\\C4\\87") << std::string { "SN=Lu\\C4\\8Di\\C4\\87" } << DN::Result { { "SN", "Lučić" } }; + QTest::newRow("CN=\"Quoted name\"") << std::string { "CN=\"Quoted name\"" } << DN::Result { { "CN", "Quoted name" } }; + QTest::newRow("CN=\" Leading and trailing spacees \"") << std::string { "CN=\" Leading and trailing spaces \"" } << DN::Result { { "CN", " Leading and trailing spaces " } }; + QTest::newRow("Comma in quotes") << std::string { "CN=\"Comma, inside\"" } << DN::Result { { "CN", "Comma, inside" } }; + QTest::newRow("forbidden chars in quotes") << std::string { "CN=\"Forbidden !@#$%&*()<>[]{},.?/\\| chars\"" } << DN::Result { { "CN", "Forbidden !@#$%&*()<>[]{},.?/\\| chars" } }; + QTest::newRow("Quoted quotation") << std::string { "CN=\"Quotation \\\" Mark\"" } << DN::Result { { "CN", "Quotation \" Mark" } }; + QTest::newRow("Quoted quotation") << std::string { "CN=\"Quotation \\\" Mark\\\" Multiples\"" } << DN::Result { { "CN", "Quotation \" Mark\" Multiples" } }; + + QTest::newRow("frompdf1") << std::string { "2.5.4.97=#5553742D49644E722E20444520313233343735323233,CN=TeleSec PKS eIDAS QES CA 5,O=Deutsche Telekom AG,C=DE" } + << DN::Result { { "2.5.4.97", "USt-IdNr. DE 123475223" }, { "CN", "TeleSec PKS eIDAS QES CA 5" }, { "O", "Deutsche Telekom AG" }, { "C", "DE" } }; + QTest::newRow("frompdf2") << std::string { "2.5.4.5=#34,CN=Koch\\, Werner,2.5.4.42=#5765726E6572,2.5.4.4=#4B6F6368,C=DE" } + << DN::Result { { "SerialNumber", "4" }, { "CN", "Koch, Werner" }, { "GN", "Werner" }, { "SN", "Koch" }, { "C", "DE" } }; + QTest::newRow("frompdf2a") << std::string { "2.5.4.5=#34,CN=Koch\\, Werner,oid.2.5.4.42=#5765726E6572,OID.2.5.4.4=#4B6F6368,C=DE" } + << DN::Result { { "SerialNumber", "4" }, { "CN", "Koch, Werner" }, { "GN", "Werner" }, { "SN", "Koch" }, { "C", "DE" } }; + + // weird spacing + QTest::newRow("CN =Simple") << std::string { "CN =Simple" } << DN::Result { { "CN", "Simple" } }; + QTest::newRow("CN= Simple") << std::string { "CN= Simple" } << DN::Result { { "CN", "Simple" } }; + QTest::newRow("CN=Simple ") << std::string { "CN=Simple " } << DN::Result { { "CN", "Simple" } }; + QTest::newRow("CN=Simple,") << std::string { "CN=Simple," } << DN::Result { { "CN", "Simple" } }; + QTest::newRow("CN=Simple, O=Silly") << std::string { "CN=Simple, O=Silly" } << DN::Result { { "CN", "Simple" }, { "O", "Silly" } }; + + // various malformed + QTest::newRow("CN=Simple\\") << std::string { "CN=Simple\\" } << DN::Result {}; + QTest::newRow("CN=") << std::string { "CN=" } << DN::Result {}; + QTest::newRow("CN=Simple\\X") << std::string { "CN=Simple\\X" } << DN::Result {}; + QTest::newRow("CN=Simple, O") << std::string { "CN=Simple, O" } << DN::Result {}; + QTest::newRow("CN=Sim\"ple") << std::string { "CN=Sim\"ple, O" } << DN::Result {}; + QTest::newRow("CN=Simple\\a") << std::string { "CN=Simple\\a" } << DN::Result {}; + QTest::newRow("=Simple") << std::string { "=Simple" } << DN::Result {}; + QTest::newRow("CN=\"Simple") << std::string { "CN=\"Simple" } << DN::Result {}; + QTest::newRow("CN=\"Simple") << std::string { "CN=\"Simple\\" } << DN::Result {}; + QTest::newRow("unquoted quotation in quotation") << std::string { "CN=\"Quotation \" Mark\"" } << DN::Result {}; +} + +void TestDistinguishedNameParser::testRemoveLeadingSpaces() +{ + QFETCH(std::string, input); + QFETCH(std::string, expectedOutput); + + auto result = DN::detail::removeLeadingSpaces(input); + QCOMPARE(result, expectedOutput); +} +void TestDistinguishedNameParser::testRemoveLeadingSpaces_data() +{ + QTest::addColumn("input"); + QTest::addColumn("expectedOutput"); + + QTest::newRow("Empty") << std::string {} << std::string {}; + QTest::newRow("No leading spaces") << std::string { "horse" } << std::string { "horse" }; + QTest::newRow("Some spaces") << std::string { " horse" } << std::string { "horse" }; + QTest::newRow("Some leading and trailing") << std::string { " horse " } << std::string { "horse " }; +} + +void TestDistinguishedNameParser::testRemoveTrailingSpaces() +{ + QFETCH(std::string, input); + QFETCH(std::string, expectedOutput); + + auto result = DN::detail::removeTrailingSpaces(input); + QCOMPARE(result, expectedOutput); +} +void TestDistinguishedNameParser::testRemoveTrailingSpaces_data() +{ + QTest::addColumn("input"); + QTest::addColumn("expectedOutput"); + + QTest::newRow("Empty") << std::string {} << std::string {}; + QTest::newRow("No leading spaces") << std::string { "horse" } << std::string { "horse" }; + QTest::newRow("Some spaces") << std::string { "horse " } << std::string { "horse" }; + QTest::newRow("Some leading and trailing") << std::string { " horse " } << std::string { " horse" }; +} + +void TestDistinguishedNameParser::testParseHexString() +{ + QFETCH(std::string, input); + QFETCH(std::optional, expectedOutput); + + auto result = DN::detail::parseHexString(input); + QCOMPARE(result, expectedOutput); +} + +void TestDistinguishedNameParser::testParseHexString_data() +{ + QTest::addColumn("input"); + QTest::addColumn>("expectedOutput"); + + QTest::newRow("4") << std::string { "34" } << std::optional("4"); + QTest::newRow("Koch") << std::string { "4B6F6368" } << std::optional("Koch"); + QTest::newRow("USt-IdNr. DE 123475223") << std::string { "5553742D49644E722E20444520313233343735323233" } << std::optional("USt-IdNr. DE 123475223"); + + // various baddies + QTest::newRow("empty") << std::string {} << std::optional {}; + QTest::newRow("FFF") << std::string { "FFF" } << std::optional {}; + QTest::newRow("F") << std::string { "F" } << std::optional {}; + QTest::newRow("XX") << std::string { "XX" } << std::optional {}; +} + +QTEST_GUILESS_MAIN(TestDistinguishedNameParser); +#include "check_distinguished_name_parser.moc" diff --git a/poppler-24.05.0/qt6/tests/check_fonts.cpp b/poppler-24.05.0/qt6/tests/check_fonts.cpp new file mode 100644 index 0000000000000000000000000000000000000000..77b8f7e57f6c2b9b050fabed218531ec0a36afcd --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_fonts.cpp @@ -0,0 +1,216 @@ +#include + +#include + +#include + +class TestFontsData : public QObject +{ + Q_OBJECT +public: + explicit TestFontsData(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkNoFonts(); + void checkType1(); + void checkType3(); + void checkTrueType(); + void checkFontIterator(); + void checkSecondDocumentQuery(); + void checkMultipleIterations(); + void checkIteratorFonts(); +}; + +static QList loadFontsViaIterator(Poppler::Document *doc, int from = 0, int count = -1) +{ + int num = count == -1 ? doc->numPages() - from : count; + QList list; + std::unique_ptr it(doc->newFontIterator(from)); + while (it->hasNext() && num) { + list += it->next(); + --num; + } + return list; +} + +namespace Poppler { +static bool operator==(const FontInfo &f1, const FontInfo &f2) +{ + if (f1.name() != f2.name()) { + return false; + } + if (f1.file() != f2.file()) { + return false; + } + if (f1.isEmbedded() != f2.isEmbedded()) { + return false; + } + if (f1.isSubset() != f2.isSubset()) { + return false; + } + if (f1.type() != f2.type()) { + return false; + } + if (f1.typeName() != f2.typeName()) { + return false; + } + return true; +} +} + +void TestFontsData::checkNoFonts() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/tests/image.pdf"); + QVERIFY(doc); + + QList listOfFonts = doc->fonts(); + QCOMPARE(listOfFonts.size(), 0); +} + +void TestFontsData::checkType1() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/tests/text.pdf"); + QVERIFY(doc); + + QList listOfFonts = doc->fonts(); + QCOMPARE(listOfFonts.size(), 1); + QCOMPARE(listOfFonts.at(0).name(), QLatin1String("Helvetica")); + QCOMPARE(listOfFonts.at(0).type(), Poppler::FontInfo::Type1); + QCOMPARE(listOfFonts.at(0).typeName(), QLatin1String("Type 1")); + + QCOMPARE(listOfFonts.at(0).isEmbedded(), false); + QCOMPARE(listOfFonts.at(0).isSubset(), false); +} + +void TestFontsData::checkType3() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/tests/type3.pdf"); + QVERIFY(doc); + + QList listOfFonts = doc->fonts(); + QCOMPARE(listOfFonts.size(), 2); + QCOMPARE(listOfFonts.at(0).name(), QLatin1String("Helvetica")); + QCOMPARE(listOfFonts.at(0).type(), Poppler::FontInfo::Type1); + QCOMPARE(listOfFonts.at(0).typeName(), QLatin1String("Type 1")); + + QCOMPARE(listOfFonts.at(0).isEmbedded(), false); + QCOMPARE(listOfFonts.at(0).isSubset(), false); + + QCOMPARE(listOfFonts.at(1).name(), QString()); + QCOMPARE(listOfFonts.at(1).type(), Poppler::FontInfo::Type3); + QCOMPARE(listOfFonts.at(1).typeName(), QLatin1String("Type 3")); + + QCOMPARE(listOfFonts.at(1).isEmbedded(), true); + QCOMPARE(listOfFonts.at(1).isSubset(), false); +} + +void TestFontsData::checkTrueType() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + + QList listOfFonts = doc->fonts(); + QCOMPARE(listOfFonts.size(), 2); + QCOMPARE(listOfFonts.at(0).name(), QLatin1String("Arial-BoldMT")); + QCOMPARE(listOfFonts.at(0).type(), Poppler::FontInfo::TrueType); + QCOMPARE(listOfFonts.at(0).typeName(), QLatin1String("TrueType")); + + QCOMPARE(listOfFonts.at(0).isEmbedded(), false); + QCOMPARE(listOfFonts.at(0).isSubset(), false); + + QCOMPARE(listOfFonts.at(1).name(), QLatin1String("ArialMT")); + QCOMPARE(listOfFonts.at(1).type(), Poppler::FontInfo::TrueType); + QCOMPARE(listOfFonts.at(1).typeName(), QLatin1String("TrueType")); + + QCOMPARE(listOfFonts.at(1).isEmbedded(), false); + QCOMPARE(listOfFonts.at(1).isSubset(), false); +} + +void TestFontsData::checkFontIterator() +{ + // loading a 1-page document + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/tests/type3.pdf"); + QVERIFY(doc); + // loading a 6-pages document + std::unique_ptr doc6 = Poppler::Document::load(TESTDATADIR "/tests/cropbox.pdf"); + QVERIFY(doc6); + + std::unique_ptr it; + + // some tests with the 1-page document: + // - check a default iterator + it = doc->newFontIterator(); + QVERIFY(it->hasNext()); + // - check an iterator for negative pages to behave as 0 + it = doc->newFontIterator(-1); + QVERIFY(it->hasNext()); + // - check an iterator for pages out of the page limit + it = doc->newFontIterator(1); + QVERIFY(!it->hasNext()); + // - check that it reaches the end after 1 iteration + it = doc->newFontIterator(); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(!it->hasNext()); + + // some tests with the 6-page document: + // - check a default iterator + it = doc6->newFontIterator(); + QVERIFY(it->hasNext()); + // - check an iterator for pages out of the page limit + it = doc6->newFontIterator(6); + QVERIFY(!it->hasNext()); + // - check that it reaches the end after 6 iterations + it = doc6->newFontIterator(); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(it->hasNext()); + it->next(); + QVERIFY(!it->hasNext()); +} + +void TestFontsData::checkSecondDocumentQuery() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/tests/type3.pdf"); + QVERIFY(doc); + + QList listOfFonts = doc->fonts(); + QCOMPARE(listOfFonts.size(), 2); + // check we get the very same result when calling fonts() again (#19405) + QList listOfFonts2 = doc->fonts(); + QCOMPARE(listOfFonts, listOfFonts2); +} + +void TestFontsData::checkMultipleIterations() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/tests/type3.pdf"); + QVERIFY(doc); + + QList listOfFonts = loadFontsViaIterator(doc.get()); + QCOMPARE(listOfFonts.size(), 2); + QList listOfFonts2 = loadFontsViaIterator(doc.get()); + QCOMPARE(listOfFonts, listOfFonts2); +} + +void TestFontsData::checkIteratorFonts() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/tests/fonts.pdf"); + QVERIFY(doc); + + QList listOfFonts = doc->fonts(); + QCOMPARE(listOfFonts.size(), 3); + + // check we get the very same result when gatering fonts using the iterator + QList listOfFonts2 = loadFontsViaIterator(doc.get()); + QCOMPARE(listOfFonts, listOfFonts2); +} + +QTEST_GUILESS_MAIN(TestFontsData) +#include "check_fonts.moc" diff --git a/poppler-24.05.0/qt6/tests/check_forms.cpp b/poppler-24.05.0/qt6/tests/check_forms.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ba6e08034ff2450a9fad474eaa4f4a5e9e4f4fb0 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_forms.cpp @@ -0,0 +1,264 @@ +#include + +#include +#include +#include +#include + +class TestForms : public QObject +{ + Q_OBJECT +public: + explicit TestForms(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testCheckbox(); // Test for issue #655 + void testCheckboxIssue159(); // Test for issue #159 + void testSetIcon(); // Test that setIcon will always be valid. + void testSetPrintable(); + void testSetAppearanceText(); + void testStandAloneWidgets(); // check for 'de facto' tooltips. Issue #34 + void testUnicodeFieldAttributes(); +}; + +void TestForms::testCheckbox() +{ + // Test for checkbox issue #655 + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/latex-hyperref-checkbox-issue-655.pdf"); + QVERIFY(document); + + std::unique_ptr page(document->page(0)); + QVERIFY(page); + + std::vector> forms = page->formFields(); + QCOMPARE(forms.size(), 1); + + Poppler::FormField *form = forms.at(0).get(); + QCOMPARE(form->type(), Poppler::FormField::FormButton); + + Poppler::FormFieldButton *chkFormFieldButton = static_cast(form); + + // Test this is actually a Checkbox + QCOMPARE(chkFormFieldButton->buttonType(), Poppler::FormFieldButton::CheckBox); + + // checkbox comes initially 'unchecked' + QCOMPARE(chkFormFieldButton->state(), false); + // let's mark it as 'checked' + chkFormFieldButton->setState(true); + // now test if it was succesfully 'checked' + QCOMPARE(chkFormFieldButton->state(), true); +} + +void TestForms::testStandAloneWidgets() +{ + // Check for 'de facto' tooltips. Issue #34 + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/tooltip.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + std::vector> forms = page->formFields(); + + QCOMPARE(forms.size(), 3); + + for (const std::unique_ptr &field : forms) { + QCOMPARE(field->type(), Poppler::FormField::FormButton); + + Poppler::FormFieldButton *fieldButton = static_cast(field.get()); + QCOMPARE(fieldButton->buttonType(), Poppler::FormFieldButton::Push); + + FormField *ff = Poppler::FormFieldData::getFormWidget(fieldButton)->getField(); + QVERIFY(ff); + QCOMPARE(ff->isStandAlone(), true); + + // tooltip.pdf has only these 3 standalone widgets + QVERIFY(field->uiName() == QStringLiteral("This is a tooltip!") || // clazy:exclude=qstring-allocations + field->uiName() == QStringLiteral("Sulfuric acid") || field->uiName() == QString::fromUtf8("little Gauß")); + } +} + +void TestForms::testCheckboxIssue159() +{ + // Test for checkbox issue #159 + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/checkbox_issue_159.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + Poppler::FormFieldButton *beerFieldButton = nullptr; + Poppler::FormFieldButton *wineFieldButton = nullptr; + + std::vector> forms = page->formFields(); + + // Let's find and assign the "Wine" and "Beer" radio buttons + for (const std::unique_ptr &field : forms) { + if (field->type() != Poppler::FormField::FormButton) { + continue; + } + + Poppler::FormFieldButton *fieldButton = static_cast(field.get()); + if (fieldButton->buttonType() != Poppler::FormFieldButton::Radio) { + continue; + } + + // printf("%s \n", fieldButton->caption().toLatin1().data()); + if (fieldButton->caption() == QStringLiteral("Wine")) { + wineFieldButton = fieldButton; + } else if (fieldButton->caption() == QStringLiteral("Beer")) { + beerFieldButton = fieldButton; + } + } + + // "Beer" and "Wine" radiobuttons belong to the same RadioButton group. + // So selecting one should unselect the other. + QVERIFY(beerFieldButton); + QVERIFY(wineFieldButton); + + // Test that the RadioButton group comes with "Beer" initially selected + QCOMPARE(beerFieldButton->state(), true); + + // Now select "Wine". As a result "Beer" should no longer be selected. + wineFieldButton->setState(true); + + // Test that "Beer" is indeed not reporting as being selected + QCOMPARE(beerFieldButton->state(), false); +} + +void TestForms::testSetIcon() +{ + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/form_set_icon.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + std::vector> forms = page->formFields(); + + Poppler::FormFieldButton *anmButton = nullptr; + + // First we are finding the field which will have its icon changed + for (const std::unique_ptr &field : forms) { + + if (field->type() != Poppler::FormField::FormButton) { + continue; + } + + Poppler::FormFieldButton *fieldButton = static_cast(field.get()); + if (field->name() == QStringLiteral("anm0")) { + anmButton = fieldButton; + } + } + + QVERIFY(anmButton); + + // Then we set the Icon on this field, for every other field + // And verify if it has a valid icon + for (const std::unique_ptr &field : forms) { + + if (field->type() != Poppler::FormField::FormButton) { + continue; + } + + Poppler::FormFieldButton *fieldButton = static_cast(field.get()); + if (field->name() == QStringLiteral("anm0")) { + continue; + } + + Poppler::FormFieldIcon newIcon = fieldButton->icon(); + + anmButton->setIcon(newIcon); + + Poppler::FormFieldIcon anmIcon = anmButton->icon(); + + QVERIFY(Poppler::FormFieldIconData::getData(anmIcon)); + QVERIFY(Poppler::FormFieldIconData::getData(anmIcon)->icon); + + QCOMPARE(Poppler::FormFieldIconData::getData(anmIcon)->icon->lookupNF("AP").dictLookupNF("N").getRef().num, Poppler::FormFieldIconData::getData(newIcon)->icon->lookupNF("AP").dictLookupNF("N").getRef().num); + } + + // Just making sure that setting a invalid icon will still produce a valid icon. + anmButton->setIcon(Poppler::FormFieldIcon(nullptr)); + Poppler::FormFieldIcon anmIcon = anmButton->icon(); + + QVERIFY(Poppler::FormFieldIconData::getData(anmIcon)); + QVERIFY(Poppler::FormFieldIconData::getData(anmIcon)->icon); +} + +void TestForms::testSetPrintable() +{ + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/form_set_icon.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + std::vector> forms = page->formFields(); + + for (std::unique_ptr &field : forms) { + field->setPrintable(true); + QCOMPARE(field->isPrintable(), true); + + field->setPrintable(false); + QCOMPARE(field->isPrintable(), false); + } +} + +void TestForms::testSetAppearanceText() +{ + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/checkbox_issue_159.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + std::vector> forms = page->formFields(); + + int nTextForms = 0; + + for (std::unique_ptr &field : forms) { + + if (field->type() != Poppler::FormField::FormText) { + continue; + } + + nTextForms++; + + Poppler::FormFieldText *fft = static_cast(field.get()); + + const QString textToSet = "HOLA" + fft->name(); + fft->setAppearanceText(textToSet); + + Dict *dict = Poppler::FormFieldData::getFormWidget(fft)->getObj()->getDict(); + Object strObject = dict->lookup("AP").dictLookup("N"); + + QVERIFY(strObject.isStream()); + + GooString s; + strObject.getStream()->fillGooString(&s); + + const QString textToFind = QStringLiteral("\n(%1) Tj\n").arg(textToSet); + QVERIFY(s.toStr().find(textToFind.toStdString()) != std::string::npos); + } + + QCOMPARE(nTextForms, 5); +} + +void TestForms::testUnicodeFieldAttributes() +{ + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/fieldWithUtf16Names.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + std::vector> forms = page->formFields(); + + Poppler::FormField *field = forms.front().get(); + + QCOMPARE(field->name(), QStringLiteral("Tex")); + QCOMPARE(field->uiName(), QStringLiteral("Texto de ayuda")); +} + +QTEST_GUILESS_MAIN(TestForms) +#include "check_forms.moc" diff --git a/poppler-24.05.0/qt6/tests/check_goostring.cpp b/poppler-24.05.0/qt6/tests/check_goostring.cpp new file mode 100644 index 0000000000000000000000000000000000000000..a82b5b1668e274cc638b8a94e56f91aaf7151672 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_goostring.cpp @@ -0,0 +1,161 @@ +#include +#include + +#include "goo/GooString.h" + +class TestGooString : public QObject +{ + Q_OBJECT +public: + explicit TestGooString(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testInsertData_data(); + void testInsertData(); + void testInsert(); + void testFormat(); + void testFromNullptr(); +}; + +void TestGooString::testInsertData_data() +{ + QTest::addColumn("string"); + QTest::addColumn("addition"); + QTest::addColumn("position"); + QTest::addColumn("result"); + + QTest::newRow("foo") << QByteArray("foo") << QByteArray("bar") << 0 << QByteArray("barfoo"); + QTest::newRow("") << QByteArray() << QByteArray("bar") << 0 << QByteArray("bar"); + QTest::newRow("foo+bar #1") << QByteArray("f+bar") << QByteArray("oo") << 1 << QByteArray("foo+bar"); + QTest::newRow("foo+bar #2") << QByteArray("fobar") << QByteArray("o+") << 2 << QByteArray("foo+bar"); + QTest::newRow("foo+bar #last") << QByteArray("foo+r") << QByteArray("ba") << 4 << QByteArray("foo+bar"); + QTest::newRow("foo+bar #end") << QByteArray("foo+") << QByteArray("bar") << 4 << QByteArray("foo+bar"); + QTest::newRow("long #start") << QByteArray("very string") << QByteArray("long long long long long ") << 5 << QByteArray("very long long long long long string"); +} + +void TestGooString::testInsertData() +{ + QFETCH(QByteArray, string); + QFETCH(QByteArray, addition); + QFETCH(int, position); + QFETCH(QByteArray, result); + + GooString goo(string.constData()); + QCOMPARE(goo.c_str(), string.constData()); + goo.insert(position, addition.constData()); + QCOMPARE(goo.c_str(), result.constData()); +} + +void TestGooString::testInsert() +{ + { + GooString goo; + goo.insert(0, "."); + goo.insert(0, "This is a very long long test string"); + QCOMPARE(goo.c_str(), "This is a very long long test string."); + } + { + GooString goo; + goo.insert(0, "second-part-third-part"); + goo.insert(0, "first-part-"); + QCOMPARE(goo.c_str(), "first-part-second-part-third-part"); + } +} + +void TestGooString::testFormat() +{ + { + const std::unique_ptr goo(GooString::format("{0:d},{1:x}", 1, 0xF)); + QCOMPARE(goo->c_str(), "1,f"); + } + { + const std::unique_ptr goo(GooString::format("{0:d},{0:x},{0:X},{0:o},{0:b},{0:w}", 0xA)); + QCOMPARE(goo->c_str(), "10,a,A,12,1010, "); + } + { + const std::unique_ptr goo(GooString::format("{0:d},{0:x},{0:X},{0:o},{0:b}", -0xA)); + QCOMPARE(goo->c_str(), "-10,-a,-A,-12,-1010"); + } + { + const std::unique_ptr goo(GooString::format("{0:c}{1:c}{2:c}{3:c}", 'T', (char)'E', (short)'S', (int)'T')); + QCOMPARE(goo->c_str(), "TEST"); + + const std::unique_ptr goo2(GooString::format("{0:s} {1:t}", "TEST", goo.get())); + QCOMPARE(goo2->c_str(), "TEST TEST"); + } + { + const std::unique_ptr goo(GooString::format("{0:ud} {1:d} {2:d}", UINT_MAX, INT_MAX, INT_MIN)); + const QByteArray expected = QStringLiteral("%1 %2 %3").arg(UINT_MAX).arg(INT_MAX).arg(INT_MIN).toLatin1(); + QCOMPARE(goo->c_str(), expected.constData()); + } + { + const std::unique_ptr goo(GooString::format("{0:uld} {1:ld} {2:ld}", ULONG_MAX, LONG_MAX, LONG_MIN)); + const QByteArray expected = QStringLiteral("%1 %2 %3").arg(ULONG_MAX).arg(LONG_MAX).arg(LONG_MIN).toLatin1(); + QCOMPARE(goo->c_str(), expected.constData()); + } + { + const std::unique_ptr goo(GooString::format("{0:ulld} {1:lld} {2:lld}", ULLONG_MAX, LLONG_MAX, LLONG_MIN)); + const QByteArray expected = QStringLiteral("%1 %2 %3").arg(ULLONG_MAX).arg(LLONG_MAX).arg(LLONG_MIN).toLatin1(); + QCOMPARE(goo->c_str(), expected.constData()); + } + { + const std::unique_ptr gooD(GooString::format("{0:.1f} {0:.1g} {0:.1gs} | {1:.1f} {1:.1g} {1:.1gs}", 1., .012)); + const std::unique_ptr gooF(GooString::format("{0:.1f} {0:.1g} {0:.1gs} | {1:.1f} {1:.1g} {1:.1gs}", 1.f, .012f)); + QCOMPARE(gooD->c_str(), "1.0 1 1 | 0.0 0 0.01"); + QCOMPARE(gooF->c_str(), "1.0 1 1 | 0.0 0 0.01"); + } + { + const std::unique_ptr goo(GooString::format("{0:.4f} {0:.4g} {0:.4gs}", .012)); + QCOMPARE(goo->c_str(), "0.0120 0.012 0.012"); + } + { + const std::unique_ptr goo(GooString::format("{{ SomeText {0:d} }}", 1)); + QCOMPARE(goo->c_str(), "{ SomeText 1 }"); + } + { + const std::unique_ptr goo(GooString::format("{{{{ {{ SomeText {0:d}", 2)); + QCOMPARE(goo->c_str(), "{{ { SomeText 2"); + } + { + const std::unique_ptr goo(GooString::format("SomeText {0:d} }} }}}}", 3)); + QCOMPARE(goo->c_str(), "SomeText 3 } }}"); + } +} + +void TestGooString::testFromNullptr() +{ + { + GooString str { static_cast(nullptr) }; + QCOMPARE(str.getLength(), 0); + } + + { + GooString str; + str.Set(static_cast(nullptr)); + QCOMPARE(str.getLength(), 0); + } + + { + GooString str { static_cast(nullptr) }; + QCOMPARE(str.getLength(), 0); + } + + { + GooString str { static_cast(nullptr), 0 }; + QCOMPARE(str.getLength(), 0); + } + + { + GooString str; + str.Set(static_cast(nullptr)); + QCOMPARE(str.getLength(), 0); + } + + { + GooString str; + str.Set(static_cast(nullptr), 0); + QCOMPARE(str.getLength(), 0); + } +} + +QTEST_GUILESS_MAIN(TestGooString) +#include "check_goostring.moc" diff --git a/poppler-24.05.0/qt6/tests/check_internal_outline.cpp b/poppler-24.05.0/qt6/tests/check_internal_outline.cpp new file mode 100644 index 0000000000000000000000000000000000000000..05db72f2ec43fdb025f74be2f21e87a702998950 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_internal_outline.cpp @@ -0,0 +1,437 @@ +#include +#include + +#include "Outline.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" + +class TestInternalOutline : public QObject +{ + Q_OBJECT +public: + explicit TestInternalOutline(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testCreateOutline(); + void testSetOutline(); + void testInsertChild(); + void testRemoveChild(); + void testSetTitleAndSetPageDest(); +}; + +void TestInternalOutline::testCreateOutline() +{ + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + + const std::string tempFileName = tempFile.fileName().toStdString(); + const GooString gooTempFileName { tempFileName }; + + std::unique_ptr doc = PDFDocFactory().createPDFDoc(GooString(TESTDATADIR "/unittestcases/truetype.pdf")); + QVERIFY(doc.get()); + + // ensure the file has no existing outline + Outline *outline = doc->getOutline(); + QVERIFY(outline != nullptr); + auto *outlineItems = outline->getItems(); + QVERIFY(outlineItems == nullptr); + + // create an empty outline and save the file + outline->setOutline({}); + outlineItems = outline->getItems(); + // no items will result in a nullptr rather than a 0 length list + QVERIFY(outlineItems == nullptr); + doc->saveAs(gooTempFileName); + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName); + QVERIFY(doc.get()); + + // ensure the re-opened file has an outline with no items + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + outlineItems = outline->getItems(); + QVERIFY(outlineItems == nullptr); +} + +static std::string getTitle(const OutlineItem *item) +{ + const std::vector &u = item->getTitle(); + std::string s; + for (const auto &c : u) { + s.append(1, (char)(c)); + } + return s; +} + +void TestInternalOutline::testSetOutline() +{ + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + + const std::string tempFileName = tempFile.fileName().toStdString(); + const GooString gooTempFileName { tempFileName }; + + std::unique_ptr doc = PDFDocFactory().createPDFDoc(GooString(TESTDATADIR "/unittestcases/truetype.pdf")); + QVERIFY(doc.get()); + + // ensure the file has no existing outline + Outline *outline = doc->getOutline(); + QVERIFY(outline != nullptr); + auto *outlineItems = outline->getItems(); + QVERIFY(outlineItems == nullptr); + + // create an outline and save the file + outline->setOutline( + { { "1", 1, { { "1.1", 1, {} }, { "1.2", 2, {} }, { "1.3", 3, { { "1.3.1", 1, {} }, { "1.3.2", 2, {} }, { "1.3.3", 3, {} }, { "1.3.4", 4, {} } } }, { "1.4", 4, {} } } }, { "2", 2, {} }, { "3", 3, {} }, { "4", 4, {} } }); + outlineItems = outline->getItems(); + QVERIFY(outlineItems != nullptr); + doc->saveAs(gooTempFileName); + outline = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName); + QVERIFY(doc.get()); + + // ensure the re-opened file has an outline + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + outlineItems = outline->getItems(); + + QVERIFY(outlineItems != nullptr); + QVERIFY(outlineItems->size() == 4); + + OutlineItem *item = outlineItems->at(0); + QVERIFY(item != nullptr); + + // c_str() is used so QCOMPARE prints string correctly on disagree + QCOMPARE(getTitle(item).c_str(), "1"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2"); + item = outlineItems->at(2); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "3"); + item = outlineItems->at(3); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "4"); + + outlineItems = outlineItems->at(0)->getKids(); + QVERIFY(outlineItems != nullptr); + item = outlineItems->at(0); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.1"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.2"); + item = outlineItems->at(2); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3"); + item = outlineItems->at(3); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.4"); + + outlineItems = outlineItems->at(2)->getKids(); + QVERIFY(outlineItems != nullptr); + + item = outlineItems->at(0); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3.1"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3.2"); + item = outlineItems->at(2); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3.3"); + item = outlineItems->at(3); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3.4"); +} + +void TestInternalOutline::testInsertChild() +{ + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + QTemporaryFile tempFile2; + QVERIFY(tempFile2.open()); + tempFile2.close(); + + const std::string tempFileName = tempFile.fileName().toStdString(); + const GooString gooTempFileName { tempFileName }; + const std::string tempFileName2 = tempFile2.fileName().toStdString(); + const GooString gooTempFileName2 { tempFileName2 }; + + std::unique_ptr doc = PDFDocFactory().createPDFDoc(GooString(TESTDATADIR "/unittestcases/truetype.pdf")); + QVERIFY(doc.get()); + + // ensure the file has no existing outline + Outline *outline = doc->getOutline(); + QVERIFY(outline != nullptr); + auto *outlineItems = outline->getItems(); + QVERIFY(outlineItems == nullptr); + + // create an outline and save the file + outline->setOutline({}); + doc->saveAs(gooTempFileName); + outline = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName); + QVERIFY(doc.get()); + + // ensure the re-opened file has an outline with no items + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + // nullptr for 0-length + QVERIFY(outline->getItems() == nullptr); + + // insert first one to empty + outline->insertChild("2", 1, 0); + // insert at the end + outline->insertChild("3", 1, 1); + // insert at the start + outline->insertChild("1", 1, 0); + + // add an item to "2" + outlineItems = outline->getItems(); + QVERIFY(outlineItems != nullptr); + QVERIFY(outlineItems->at(1)); + outlineItems->at(1)->insertChild("2.1", 2, 0); + outlineItems->at(1)->insertChild("2.2", 2, 1); + outlineItems->at(1)->insertChild("2.4", 2, 2); + + outlineItems->at(1)->insertChild("2.3", 2, 2); + + // save the file + doc->saveAs(gooTempFileName2); + outline = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName2); + QVERIFY(doc.get()); + + // ensure the re-opened file has an outline + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + + outlineItems = outline->getItems(); + + QVERIFY(outlineItems != nullptr); + QVERIFY(outlineItems->size() == 3); + + OutlineItem *item = outlineItems->at(0); + QVERIFY(item != nullptr); + + // c_str() is used so QCOMPARE prints string correctly on disagree + QCOMPARE(getTitle(item).c_str(), "1"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2"); + item = outlineItems->at(2); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "3"); + + outlineItems = outlineItems->at(1)->getKids(); + item = outlineItems->at(0); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2.1"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2.2"); + item = outlineItems->at(2); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2.3"); + item = outlineItems->at(3); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2.4"); +} + +void TestInternalOutline::testRemoveChild() +{ + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + + QTemporaryFile tempFile2; + QVERIFY(tempFile2.open()); + tempFile2.close(); + + const std::string tempFileName = tempFile.fileName().toStdString(); + const GooString gooTempFileName { tempFileName }; + const std::string tempFileName2 = tempFile2.fileName().toStdString(); + const GooString gooTempFileName2 { tempFileName2 }; + + std::unique_ptr doc = PDFDocFactory().createPDFDoc(GooString(TESTDATADIR "/unittestcases/truetype.pdf")); + QVERIFY(doc.get()); + + // ensure the file has no existing outline + Outline *outline = doc->getOutline(); + QVERIFY(outline != nullptr); + auto *outlineItems = outline->getItems(); + QVERIFY(outlineItems == nullptr); + + // create an outline and save the file + outline->setOutline({ { "1", 1, { { "1.1", 1, {} }, { "1.2", 2, {} }, { "1.3", 3, { { "1.3.1", 1, {} }, { "1.3.2", 2, {} }, { "1.3.3", 3, {} }, { "1.3.4", 4, {} } } }, { "1.4", 4, {} } } }, + { "2", 2, { { "2.1", 1, {} } } }, + { "3", 3, { { "3.1", 1, {} }, { "3.2", 2, { { "3.2.1", 1, {} } } } } }, + { "4", 4, {} } }); + outlineItems = outline->getItems(); + QVERIFY(outlineItems != nullptr); + doc->saveAs(gooTempFileName); + outline = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName); + QVERIFY(doc.get()); + + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + + // remove "3" + outline->removeChild(2); + // remove "1.3.1" + outline->getItems()->at(0)->getKids()->at(2)->removeChild(0); + // remove "1.3.4" + outline->getItems()->at(0)->getKids()->at(2)->removeChild(2); + // remove "2.1" + outline->getItems()->at(1)->removeChild(0); + + // save the file + doc->saveAs(gooTempFileName2); + outline = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName2); + QVERIFY(doc.get()); + + // ensure the re-opened file has an outline + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + + outlineItems = outline->getItems(); + + QVERIFY(outlineItems != nullptr); + QVERIFY(outlineItems->size() == 3); + + OutlineItem *item = outlineItems->at(0); + QVERIFY(item != nullptr); + + // c_str() is used so QCOMPARE prints string correctly on disagree + QCOMPARE(getTitle(item).c_str(), "1"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "2"); + item = outlineItems->at(2); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "4"); + + outlineItems = outlineItems->at(0)->getKids(); + outlineItems = outlineItems->at(2)->getKids(); + item = outlineItems->at(0); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3.2"); + item = outlineItems->at(1); + QVERIFY(item != nullptr); + QCOMPARE(getTitle(item).c_str(), "1.3.3"); + + // verify "2.1" is removed, lst length 0 is returned as a nullptr + QVERIFY(outline->getItems()->at(1)->getKids() == nullptr); +} + +void TestInternalOutline::testSetTitleAndSetPageDest() +{ + QTemporaryFile tempFile; + QVERIFY(tempFile.open()); + tempFile.close(); + + QTemporaryFile tempFile2; + QVERIFY(tempFile2.open()); + tempFile2.close(); + + const std::string tempFileName = tempFile.fileName().toStdString(); + const GooString gooTempFileName { tempFileName }; + const std::string tempFileName2 = tempFile2.fileName().toStdString(); + const GooString gooTempFileName2 { tempFileName2 }; + + std::unique_ptr doc = PDFDocFactory().createPDFDoc(GooString(TESTDATADIR "/unittestcases/truetype.pdf")); + QVERIFY(doc.get()); + + // ensure the file has no existing outline + Outline *outline = doc->getOutline(); + QVERIFY(outline != nullptr); + auto *outlineItems = outline->getItems(); + QVERIFY(outlineItems == nullptr); + + // create an outline and save the file + outline->setOutline({ { "1", 1, { { "1.1", 1, {} }, { "1.2", 2, {} }, { "1.3", 3, { { "1.3.1", 1, {} }, { "1.3.2", 2, {} }, { "1.3.3", 3, {} }, { "1.3.4", 4, {} } } }, { "1.4", 4, {} } } }, + { "2", 2, { { "2.1", 1, {} } } }, + { "3", 3, { { "3.1", 1, {} }, { "3.2", 2, { { "3.2.1", 1, {} } } } } }, + { "4", 4, {} } }); + outlineItems = outline->getItems(); + QVERIFY(outlineItems != nullptr); + doc->saveAs(gooTempFileName); + + outline = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName); + QVERIFY(doc.get()); + + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + + // change "1.3.1" + OutlineItem *item = outline->getItems()->at(0)->getKids()->at(2)->getKids()->at(0); + QCOMPARE(getTitle(item).c_str(), "1.3.1"); + + item->setTitle("Changed to a different title"); + + item = outline->getItems()->at(2); + { + const LinkAction *action = item->getAction(); + QVERIFY(action->getKind() == actionGoTo); + const LinkGoTo *gotoAction = dynamic_cast(action); + const LinkDest *dest = gotoAction->getDest(); + QVERIFY(dest->isPageRef() == false); + QCOMPARE(dest->getPageNum(), 3); + + item->setPageDest(1); + } + + // save the file + doc->saveAs(gooTempFileName2); + outline = nullptr; + item = nullptr; + + /******************************************************/ + + doc = PDFDocFactory().createPDFDoc(gooTempFileName2); + QVERIFY(doc.get()); + + outline = doc->getOutline(); + QVERIFY(outline != nullptr); + + item = outline->getItems()->at(0)->getKids()->at(2)->getKids()->at(0); + QCOMPARE(getTitle(item).c_str(), "Changed to a different title"); + { + item = outline->getItems()->at(2); + const LinkAction *action = item->getAction(); + QVERIFY(action->getKind() == actionGoTo); + const LinkGoTo *gotoAction = dynamic_cast(action); + const LinkDest *dest = gotoAction->getDest(); + QVERIFY(dest->isPageRef() == false); + QCOMPARE(dest->getPageNum(), 1); + } +} + +QTEST_GUILESS_MAIN(TestInternalOutline) +#include "check_internal_outline.moc" diff --git a/poppler-24.05.0/qt6/tests/check_lexer.cpp b/poppler-24.05.0/qt6/tests/check_lexer.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8b7a46f245b89150777de583f1924ff781728976 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_lexer.cpp @@ -0,0 +1,108 @@ +#include + +#include "Object.h" +#include "Lexer.h" + +class TestLexer : public QObject +{ + Q_OBJECT +public: + explicit TestLexer(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testNumbers(); +}; + +void TestLexer::testNumbers() +{ + char data[] = "0 1 -1 2147483647 -2147483647 2147483648 -2147483648 4294967297 -2147483649 0.1 1.1 -1.1 2147483647.1 -2147483647.1 2147483648.1 -2147483648.1 4294967297.1 -2147483649.1 9223372036854775807 18446744073709551615"; + MemStream *stream = new MemStream(data, 0, strlen(data), Object(objNull)); + Lexer *lexer = new Lexer(nullptr, stream); + QVERIFY(lexer); + + Object obj; + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt); + QCOMPARE(obj.getInt(), 0); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt); + QCOMPARE(obj.getInt(), 1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt); + QCOMPARE(obj.getInt(), -1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt); + QCOMPARE(obj.getInt(), 2147483647); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt); + QCOMPARE(obj.getInt(), -2147483647); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt64); + QCOMPARE(obj.getInt64(), 2147483648ll); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt); + QCOMPARE(obj.getInt(), -2147483647 - 1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt64); + QCOMPARE(obj.getInt64(), 4294967297ll); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt64); + QCOMPARE(obj.getInt64(), -2147483649ll); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), 0.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), 1.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), -1.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), 2147483647.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), -2147483647.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), 2147483648.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), -2147483648.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), 4294967297.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), -2147483649.1); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objInt64); + QCOMPARE(obj.getInt64(), 9223372036854775807ll); + + obj = lexer->getObj(); + QCOMPARE(obj.getType(), objReal); + QCOMPARE(obj.getReal(), 18446744073709551616.); + + delete lexer; +} + +QTEST_GUILESS_MAIN(TestLexer) +#include "check_lexer.moc" diff --git a/poppler-24.05.0/qt6/tests/check_links.cpp b/poppler-24.05.0/qt6/tests/check_links.cpp new file mode 100644 index 0000000000000000000000000000000000000000..cb9981b82cb93f4b8db007925f7215fb2e3dca1c --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_links.cpp @@ -0,0 +1,103 @@ +#include + +#include + +#include + +class TestLinks : public QObject +{ + Q_OBJECT +public: + explicit TestLinks(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkDocumentWithNoDests(); + void checkDests_xr01(); + void checkDests_xr02(); + void checkDocumentURILink(); +}; + +static bool isDestinationValid_pageNumber(const Poppler::LinkDestination *dest, const Poppler::Document *doc) +{ + return dest->pageNumber() > 0 && dest->pageNumber() <= doc->numPages(); +} + +static bool isDestinationValid_name(const Poppler::LinkDestination *dest) +{ + return !dest->destinationName().isEmpty(); +} + +void TestLinks::checkDocumentWithNoDests() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/WithAttachments.pdf"); + QVERIFY(doc); + + std::unique_ptr dest = doc->linkDestination(QStringLiteral("no.dests.in.this.document")); + QVERIFY(!isDestinationValid_pageNumber(dest.get(), doc.get())); + QVERIFY(isDestinationValid_name(dest.get())); +} + +void TestLinks::checkDests_xr01() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/xr01.pdf"); + QVERIFY(doc); + + std::unique_ptr page = doc->page(0); + QVERIFY(page); + + std::vector> links = page->links(); + QCOMPARE(links.size(), 2); + + { + QCOMPARE(links.at(0)->linkType(), Poppler::Link::Goto); + Poppler::LinkGoto *link = static_cast(links.at(0).get()); + const Poppler::LinkDestination dest = link->destination(); + QVERIFY(!isDestinationValid_pageNumber(&dest, doc.get())); + QVERIFY(isDestinationValid_name(&dest)); + QCOMPARE(dest.destinationName(), QLatin1String("section.1")); + } + + { + QCOMPARE(links.at(1)->linkType(), Poppler::Link::Goto); + Poppler::LinkGoto *link = static_cast(links.at(1).get()); + const Poppler::LinkDestination dest = link->destination(); + QVERIFY(!isDestinationValid_pageNumber(&dest, doc.get())); + QVERIFY(isDestinationValid_name(&dest)); + QCOMPARE(dest.destinationName(), QLatin1String("section.2")); + } +} + +void TestLinks::checkDests_xr02() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/xr02.pdf"); + QVERIFY(doc); + + std::unique_ptr dest = doc->linkDestination(QStringLiteral("section.1")); + QVERIFY(isDestinationValid_pageNumber(dest.get(), doc.get())); + QVERIFY(!isDestinationValid_name(dest.get())); + dest = doc->linkDestination(QStringLiteral("section.2")); + QVERIFY(isDestinationValid_pageNumber(dest.get(), doc.get())); + QVERIFY(!isDestinationValid_name(dest.get())); + dest = doc->linkDestination(QStringLiteral("section.3")); + QVERIFY(!isDestinationValid_pageNumber(dest.get(), doc.get())); + QVERIFY(isDestinationValid_name(dest.get())); +} + +void TestLinks::checkDocumentURILink() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/checkbox_issue_159.pdf"); + QVERIFY(doc); + + std::unique_ptr page = doc->page(0); + QVERIFY(page); + + std::vector> links = page->links(); + QCOMPARE(links.size(), 1); + + QCOMPARE(links.at(0)->linkType(), Poppler::Link::Browse); + Poppler::LinkBrowse *link = static_cast(links.at(0).get()); + QCOMPARE(link->url(), QLatin1String("http://www.tcpdf.org")); +} + +QTEST_GUILESS_MAIN(TestLinks) + +#include "check_links.moc" diff --git a/poppler-24.05.0/qt6/tests/check_metadata.cpp b/poppler-24.05.0/qt6/tests/check_metadata.cpp new file mode 100644 index 0000000000000000000000000000000000000000..53098cf90856b67f629cb445ca068e916e7848ec --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_metadata.cpp @@ -0,0 +1,232 @@ +#include + +#include + +class TestMetaData : public QObject +{ + Q_OBJECT +public: + explicit TestMetaData(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkStrings_data(); + void checkStrings(); + void checkStrings2_data(); + void checkStrings2(); + void checkStringKeys(); + void checkLinearised(); + void checkNumPages(); + void checkDate(); + void checkPageSize(); + void checkPortraitOrientation(); + void checkLandscapeOrientation(); + void checkUpsideDownOrientation(); + void checkSeascapeOrientation(); + void checkVersion(); + void checkPdfId(); + void checkNoPdfId(); +}; + +void TestMetaData::checkStrings_data() +{ + QTest::addColumn("key"); + QTest::addColumn("value"); + + QTest::newRow("Author") << "Author" + << "Brad Hards"; + QTest::newRow("Title") << "Title" + << "Two pages"; + QTest::newRow("Subject") << "Subject" + << "A two page layout for poppler testing"; + QTest::newRow("Keywords") << "Keywords" + << "Qt4 bindings"; + QTest::newRow("Creator") << "Creator" + << "iText: cgpdftops CUPS filter"; + QTest::newRow("Producer") << "Producer" + << "Acrobat Distiller 7.0 for Macintosh"; +} + +void TestMetaData::checkStrings() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/doublepage.pdf"); + QVERIFY(doc); + + QFETCH(QString, key); + QFETCH(QString, value); + QCOMPARE(doc->info(key), value); +} + +void TestMetaData::checkStrings2_data() +{ + QTest::addColumn("key"); + QTest::addColumn("value"); + + QTest::newRow("Title") << "Title" + << "Malaga hotels"; + QTest::newRow("Author") << "Author" + << "Brad Hards"; + QTest::newRow("Creator") << "Creator" + << "Safari: cgpdftops CUPS filter"; + QTest::newRow("Producer") << "Producer" + << "Acrobat Distiller 7.0 for Macintosh"; + QTest::newRow("Keywords") << "Keywords" + << "First\rSecond\rthird"; + QTest::newRow("Custom1") << "Custom1" + << "CustomValue1"; + QTest::newRow("Custom2") << "Custom2" + << "CustomValue2"; +} + +void TestMetaData::checkStrings2() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + + QFETCH(QString, key); + QFETCH(QString, value); + QCOMPARE(doc->info(key), value); +} + +void TestMetaData::checkStringKeys() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + + QStringList keyList; + keyList << QStringLiteral("Title") << QStringLiteral("Author") << QStringLiteral("Creator") << QStringLiteral("Keywords") << QStringLiteral("CreationDate"); + keyList << QStringLiteral("Producer") << QStringLiteral("ModDate") << QStringLiteral("Custom1") << QStringLiteral("Custom2"); + keyList.sort(); + QStringList keysInDoc = doc->infoKeys(); + keysInDoc.sort(); + QCOMPARE(keysInDoc, keyList); +} + +void TestMetaData::checkLinearised() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + QVERIFY(doc->isLinearized()); + + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + QCOMPARE(doc->isLinearized(), false); +} + +void TestMetaData::checkPortraitOrientation() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + std::unique_ptr page = doc->page(0); + QCOMPARE(page->orientation(), Poppler::Page::Portrait); +} + +void TestMetaData::checkNumPages() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/doublepage.pdf"); + QVERIFY(doc); + QCOMPARE(doc->numPages(), 2); + + doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + QCOMPARE(doc->numPages(), 1); +} + +void TestMetaData::checkDate() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + QCOMPARE(doc->date(QStringLiteral("ModDate")), QDateTime(QDate(2005, 12, 5), QTime(9, 44, 46), Qt::UTC)); + QCOMPARE(doc->date(QStringLiteral("CreationDate")), QDateTime(QDate(2005, 8, 13), QTime(1, 12, 11), Qt::UTC)); +} + +void TestMetaData::checkPageSize() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/truetype.pdf"); + QVERIFY(doc); + std::unique_ptr page = doc->page(0); + QCOMPARE(page->pageSize(), QSize(595, 842)); + QCOMPARE(page->pageSizeF(), QSizeF(595.22, 842)); +} + +void TestMetaData::checkLandscapeOrientation() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + std::unique_ptr page = doc->page(1); + QCOMPARE(page->orientation(), Poppler::Page::Landscape); +} + +void TestMetaData::checkUpsideDownOrientation() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + std::unique_ptr page = doc->page(2); + QCOMPARE(page->orientation(), Poppler::Page::UpsideDown); +} + +void TestMetaData::checkSeascapeOrientation() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + std::unique_ptr page = doc->page(3); + QCOMPARE(page->orientation(), Poppler::Page::Seascape); +} + +void TestMetaData::checkVersion() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/doublepage.pdf"); + QVERIFY(doc); + + auto pdfVersion = doc->getPdfVersion(); + QCOMPARE(pdfVersion.major, 1); + QCOMPARE(pdfVersion.minor, 6); +} + +void TestMetaData::checkPdfId() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/A6EmbeddedFiles.pdf"); + QVERIFY(doc); + + const QByteArray referencePermanentId("00C9D5B6D8FB11D7A902003065D630AA"); + const QByteArray referenceUpdateId("39AECAE6D8FB11D7A902003065D630AA"); + + { + // no IDs wanted, just existance check + QVERIFY(doc->getPdfId(nullptr, nullptr)); + } + { + // only permanent ID + QByteArray permanentId; + QVERIFY(doc->getPdfId(&permanentId, nullptr)); + QCOMPARE(permanentId.toUpper(), referencePermanentId); + } + { + // only update ID + QByteArray updateId; + QVERIFY(doc->getPdfId(nullptr, &updateId)); + QCOMPARE(updateId.toUpper(), referenceUpdateId); + } + { + // both IDs + QByteArray permanentId; + QByteArray updateId; + QVERIFY(doc->getPdfId(&permanentId, &updateId)); + QCOMPARE(permanentId.toUpper(), referencePermanentId); + QCOMPARE(updateId.toUpper(), referenceUpdateId); + } +} + +void TestMetaData::checkNoPdfId() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/WithActualText.pdf"); + QVERIFY(doc); + + QVERIFY(!doc->getPdfId(nullptr, nullptr)); +} + +QTEST_GUILESS_MAIN(TestMetaData) +#include "check_metadata.moc" diff --git a/poppler-24.05.0/qt6/tests/check_object.cpp b/poppler-24.05.0/qt6/tests/check_object.cpp new file mode 100644 index 0000000000000000000000000000000000000000..cadc006e9464363505b50471ae8eabc9497793d6 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_object.cpp @@ -0,0 +1,41 @@ +#include +#include + +#include "poppler/Object.h" + +class TestObject : public QObject +{ + Q_OBJECT +public: + explicit TestObject(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void benchDefaultConstructor(); + void benchMoveConstructor(); + void benchSetToNull(); +}; + +void TestObject::benchDefaultConstructor() +{ + QBENCHMARK { + Object obj; + } +} + +void TestObject::benchMoveConstructor() +{ + QBENCHMARK { + Object src; + Object dst { std::move(src) }; + } +} + +void TestObject::benchSetToNull() +{ + Object obj; + QBENCHMARK { + obj.setToNull(); + } +} + +QTEST_GUILESS_MAIN(TestObject) +#include "check_object.moc" diff --git a/poppler-24.05.0/qt6/tests/check_optcontent.cpp b/poppler-24.05.0/qt6/tests/check_optcontent.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f36290afe4fb7646bb833c53cd85ae08c5e4d61b --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_optcontent.cpp @@ -0,0 +1,439 @@ +#include + +#include "PDFDoc.h" +#include "GlobalParams.h" + +#include +#include + +class TestOptionalContent : public QObject +{ + Q_OBJECT +public: + explicit TestOptionalContent(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkVisPolicy(); + void checkNestedLayers(); + void checkNoOptionalContent(); + void checkIsVisible(); + void checkVisibilitySetting(); + void checkRadioButtons(); +}; + +void TestOptionalContent::checkVisPolicy() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/vis_policy_test.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasOptionalContent()); + + Poppler::OptContentModel *optContent = doc->optionalContentModel(); + QModelIndex index; + index = optContent->index(0, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("A")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Checked); + index = optContent->index(1, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("B")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Checked); +} + +void TestOptionalContent::checkNestedLayers() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/NestedLayers.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasOptionalContent()); + + Poppler::OptContentModel *optContent = doc->optionalContentModel(); + QModelIndex index; + + index = optContent->index(0, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("Black Text and Green Snow")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Unchecked); + + index = optContent->index(1, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("Mountains and Image")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Checked); + + // This is a sub-item of "Mountains and Image" + QModelIndex subindex = optContent->index(0, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("Image")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Checked); + + index = optContent->index(2, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("Starburst")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Checked); + + index = optContent->index(3, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("Watermark")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Unchecked); +} + +void TestOptionalContent::checkNoOptionalContent() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->hasOptionalContent(), false); +} + +void TestOptionalContent::checkIsVisible() +{ + globalParams = std::make_unique(); + PDFDoc *doc = new PDFDoc(std::make_unique(TESTDATADIR "/unittestcases/vis_policy_test.pdf")); + QVERIFY(doc); + + OCGs *ocgs = doc->getOptContentConfig(); + QVERIFY(ocgs); + + XRef *xref = doc->getXRef(); + + Object obj; + + // In this test, both Ref(21,0) and Ref(2,0) are set to On + + // AnyOn, one element array: + // 22 0 obj<>endobj + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QVERIFY(ocgs->optContentIsVisible(&obj)); + + // Same again, looking for any leaks or dubious free()'s + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QVERIFY(ocgs->optContentIsVisible(&obj)); + + // AnyOff, one element array: + // 29 0 obj<>endobj + obj = xref->fetch(29, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOn, one element array: + // 36 0 obj<>endobj + obj = xref->fetch(36, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOff, one element array: + // 43 0 obj<>endobj + obj = xref->fetch(43, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AnyOn, multi-element array: + // 50 0 obj<>endobj + obj = xref->fetch(50, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AnyOff, multi-element array: + // 57 0 obj<>endobj + obj = xref->fetch(57, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOn, multi-element array: + // 64 0 obj<>endobj + obj = xref->fetch(64, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOff, multi-element array: + // 71 0 obj<>endobj + obj = xref->fetch(71, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + delete doc; + globalParams.reset(); +} + +void TestOptionalContent::checkVisibilitySetting() +{ + globalParams = std::make_unique(); + PDFDoc *doc = new PDFDoc(std::make_unique(TESTDATADIR "/unittestcases/vis_policy_test.pdf")); + QVERIFY(doc); + + OCGs *ocgs = doc->getOptContentConfig(); + QVERIFY(ocgs); + + XRef *xref = doc->getXRef(); + + Object obj; + + // In this test, both Ref(21,0) and Ref(28,0) start On, + // based on the file settings + Object ref21obj(Ref { 21, 0 }); + Ref ref21 = ref21obj.getRef(); + OptionalContentGroup *ocgA = ocgs->findOcgByRef(ref21); + QVERIFY(ocgA); + + QVERIFY((ocgA->getName()->cmp("A")) == 0); + QCOMPARE(ocgA->getState(), OptionalContentGroup::On); + + Object ref28obj(Ref { 28, 0 }); + Ref ref28 = ref28obj.getRef(); + OptionalContentGroup *ocgB = ocgs->findOcgByRef(ref28); + QVERIFY(ocgB); + + QVERIFY((ocgB->getName()->cmp("B")) == 0); + QCOMPARE(ocgB->getState(), OptionalContentGroup::On); + + // turn one Off + ocgA->setState(OptionalContentGroup::Off); + + // AnyOn, one element array: + // 22 0 obj<>endobj + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // Same again, looking for any leaks or dubious free()'s + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AnyOff, one element array: + // 29 0 obj<>endobj + obj = xref->fetch(29, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOn, one element array: + // 36 0 obj<>endobj + obj = xref->fetch(36, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOff, one element array: + // 43 0 obj<>endobj + obj = xref->fetch(43, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AnyOn, multi-element array: + // 50 0 obj<>endobj + obj = xref->fetch(50, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AnyOff, multi-element array: + // 57 0 obj<>endobj + obj = xref->fetch(57, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOn, multi-element array: + // 64 0 obj<>endobj + obj = xref->fetch(64, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOff, multi-element array: + // 71 0 obj<>endobj + obj = xref->fetch(71, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // Turn the other one off as well (i.e. both are Off) + ocgB->setState(OptionalContentGroup::Off); + + // AnyOn, one element array: + // 22 0 obj<>endobj + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // Same again, looking for any leaks or dubious free()'s + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AnyOff, one element array: + // 29 0 obj<>endobj + obj = xref->fetch(29, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOn, one element array: + // 36 0 obj<>endobj + obj = xref->fetch(36, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOff, one element array: + // 43 0 obj<>endobj + obj = xref->fetch(43, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AnyOn, multi-element array: + // 50 0 obj<>endobj + obj = xref->fetch(50, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AnyOff, multi-element array: + // 57 0 obj<>endobj + obj = xref->fetch(57, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOn, multi-element array: + // 64 0 obj<>endobj + obj = xref->fetch(64, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOff, multi-element array: + // 71 0 obj<>endobj + obj = xref->fetch(71, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // Turn the first one on again (21 is On, 28 is Off) + ocgA->setState(OptionalContentGroup::On); + + // AnyOn, one element array: + // 22 0 obj<>endobj + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // Same again, looking for any leaks or dubious free()'s + obj = xref->fetch(22, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AnyOff, one element array: + // 29 0 obj<>endobj + obj = xref->fetch(29, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOn, one element array: + // 36 0 obj<>endobj + obj = xref->fetch(36, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOff, one element array: + // 43 0 obj<>endobj + obj = xref->fetch(43, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AnyOn, multi-element array: + // 50 0 obj<>endobj + obj = xref->fetch(50, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AnyOff, multi-element array: + // 57 0 obj<>endobj + obj = xref->fetch(57, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), true); + + // AllOn, multi-element array: + // 64 0 obj<>endobj + obj = xref->fetch(64, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + // AllOff, multi-element array: + // 71 0 obj<>endobj + obj = xref->fetch(71, 0); + QVERIFY(obj.isDict()); + QCOMPARE(ocgs->optContentIsVisible(&obj), false); + + delete doc; + globalParams.reset(); +} + +void TestOptionalContent::checkRadioButtons() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/ClarityOCGs.pdf"); + QVERIFY(doc); + + QVERIFY(doc->hasOptionalContent()); + + Poppler::OptContentModel *optContent = doc->optionalContentModel(); + QModelIndex index; + + index = optContent->index(0, 0, QModelIndex()); + QCOMPARE(optContent->data(index, Qt::DisplayRole).toString(), QLatin1String("Languages")); + QCOMPARE(static_cast(optContent->data(index, Qt::CheckStateRole).toInt()), Qt::Unchecked); + + // These are sub-items of the "Languages" label + QModelIndex subindex = optContent->index(0, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("English")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Checked); + + subindex = optContent->index(1, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("French")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + + subindex = optContent->index(2, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("Japanese")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + + // RBGroup of languages, so turning on Japanese should turn off English + QVERIFY(optContent->setData(subindex, QVariant(true), Qt::CheckStateRole)); + + subindex = optContent->index(0, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("English")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + subindex = optContent->index(2, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("Japanese")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Checked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::On); + + subindex = optContent->index(1, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("French")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + // and turning on French should turn off Japanese + QVERIFY(optContent->setData(subindex, QVariant(true), Qt::CheckStateRole)); + + subindex = optContent->index(0, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("English")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + subindex = optContent->index(2, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("Japanese")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + subindex = optContent->index(1, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("French")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Checked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::On); + + // and turning off French should leave them all off + QVERIFY(optContent->setData(subindex, QVariant(false), Qt::CheckStateRole)); + + subindex = optContent->index(0, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("English")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + subindex = optContent->index(2, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("Japanese")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); + + subindex = optContent->index(1, 0, index); + QCOMPARE(optContent->data(subindex, Qt::DisplayRole).toString(), QLatin1String("French")); + QCOMPARE(static_cast(optContent->data(subindex, Qt::CheckStateRole).toInt()), Qt::Unchecked); + QCOMPARE(static_cast(subindex.internalPointer())->group()->getState(), OptionalContentGroup::Off); +} + +QTEST_GUILESS_MAIN(TestOptionalContent) + +#include "check_optcontent.moc" diff --git a/poppler-24.05.0/qt6/tests/check_outline.cpp b/poppler-24.05.0/qt6/tests/check_outline.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f497968c7a8d9a64db68aa422a5ace584b6f7b2c --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_outline.cpp @@ -0,0 +1,50 @@ +#include + +#include + +#include + +class TestOutline : public QObject +{ + Q_OBJECT +public: + explicit TestOutline(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkOutline_xr02(); +}; + +void TestOutline::checkOutline_xr02() +{ + std::unique_ptr document { Poppler::Document::load(TESTDATADIR "/unittestcases/xr02.pdf") }; + QVERIFY(document.get()); + + const auto outline = document->outline(); + QCOMPARE(outline.size(), 2); + + const auto &foo = outline[0]; + QVERIFY(!foo.isNull()); + QCOMPARE(foo.name(), QStringLiteral("foo")); + QCOMPARE(foo.isOpen(), false); + const auto fooDest = foo.destination(); + QVERIFY(!fooDest.isNull()); + QCOMPARE(fooDest->pageNumber(), 1); + QVERIFY(foo.externalFileName().isEmpty()); + QVERIFY(foo.uri().isEmpty()); + QVERIFY(!foo.hasChildren()); + QVERIFY(foo.children().isEmpty()); + + const auto &bar = outline[1]; + QVERIFY(!bar.isNull()); + QCOMPARE(bar.name(), QStringLiteral("bar")); + QCOMPARE(bar.isOpen(), false); + const auto barDest = bar.destination(); + QVERIFY(!barDest.isNull()); + QCOMPARE(barDest->pageNumber(), 2); + QVERIFY(bar.externalFileName().isEmpty()); + QVERIFY(bar.uri().isEmpty()); + QVERIFY(!bar.hasChildren()); + QVERIFY(bar.children().isEmpty()); +} + +QTEST_GUILESS_MAIN(TestOutline) +#include "check_outline.moc" diff --git a/poppler-24.05.0/qt6/tests/check_overprint.cpp b/poppler-24.05.0/qt6/tests/check_overprint.cpp new file mode 100644 index 0000000000000000000000000000000000000000..c70310da58590322d476af451dc5158e08916944 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_overprint.cpp @@ -0,0 +1,38 @@ +#include + +#include + +#include + +class TestOverprint : public QObject +{ + Q_OBJECT +public: + explicit TestOverprint(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkOverprintImageRendering(); +}; + +void TestOverprint::checkOverprintImageRendering() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/tests/mask-seams.pdf"); + QVERIFY(doc); + + doc->setRenderHint(Poppler::Document::OverprintPreview, true); + + std::unique_ptr page = doc->page(0); + QVERIFY(page); + + constexpr int width = 600; + constexpr int height = 400; + + QImage img = page->renderToImage(300.0, 300.0, 0, 0, width, height); + QCOMPARE(img.format(), QImage::Format_RGB32); + QCOMPARE(img.width(), width); + QCOMPARE(img.height(), height); + QCOMPARE(img.bytesPerLine(), width * 4); + QCOMPARE(img.sizeInBytes(), width * height * 4); +} + +QTEST_GUILESS_MAIN(TestOverprint) +#include "check_overprint.moc" diff --git a/poppler-24.05.0/qt6/tests/check_pagelabelinfo.cpp b/poppler-24.05.0/qt6/tests/check_pagelabelinfo.cpp new file mode 100644 index 0000000000000000000000000000000000000000..3098bbf41f8288b38088e09129108f0cefd26152 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_pagelabelinfo.cpp @@ -0,0 +1,66 @@ +#include + +#include + +#include "PageLabelInfo_p.h" + +#include "config.h" + +class TestPageLabelInfo : public QObject +{ + Q_OBJECT +public: + explicit TestPageLabelInfo(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testFromDecimal(); + void testFromDecimalUnicode(); + void testToRoman(); + void testFromRoman(); + void testToLatin(); + void testFromLatin(); +}; + +void TestPageLabelInfo::testFromDecimal() +{ + std::string str { "2342" }; + const auto res = fromDecimal(str, false); + QCOMPARE(res.first, 2342); + QCOMPARE(res.second, true); +} + +void TestPageLabelInfo::testFromDecimalUnicode() +{ + std::unique_ptr str(Poppler::QStringToUnicodeGooString(QString::fromLocal8Bit("2342"))); + const auto res = fromDecimal(str->toStr(), hasUnicodeByteOrderMark(str->toStr())); + QCOMPARE(res.first, 2342); + QCOMPARE(res.second, true); +} + +void TestPageLabelInfo::testToRoman() +{ + GooString str; + toRoman(177, &str, false); + QCOMPARE(str.c_str(), "clxxvii"); +} + +void TestPageLabelInfo::testFromRoman() +{ + GooString roman("clxxvii"); + QCOMPARE(fromRoman(roman.c_str()), 177); +} + +void TestPageLabelInfo::testToLatin() +{ + GooString str; + toLatin(54, &str, false); + QCOMPARE(str.c_str(), "bbb"); +} + +void TestPageLabelInfo::testFromLatin() +{ + GooString latin("ddd"); + QCOMPARE(fromLatin(latin.c_str()), 56); +} + +QTEST_GUILESS_MAIN(TestPageLabelInfo) +#include "check_pagelabelinfo.moc" diff --git a/poppler-24.05.0/qt6/tests/check_pagelayout.cpp b/poppler-24.05.0/qt6/tests/check_pagelayout.cpp new file mode 100644 index 0000000000000000000000000000000000000000..a4d9513144ad0adec0a7848552d4676fceaeaaae --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_pagelayout.cpp @@ -0,0 +1,41 @@ +#include + +#include + +class TestPageLayout : public QObject +{ + Q_OBJECT +public: + explicit TestPageLayout(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkNone(); + void checkSingle(); + void checkFacing(); +}; + +void TestPageLayout::checkNone() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseNone.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageLayout(), Poppler::Document::NoLayout); +} + +void TestPageLayout::checkSingle() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/FullScreen.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageLayout(), Poppler::Document::SinglePage); +} + +void TestPageLayout::checkFacing() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/doublepage.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageLayout(), Poppler::Document::TwoPageRight); +} + +QTEST_GUILESS_MAIN(TestPageLayout) +#include "check_pagelayout.moc" diff --git a/poppler-24.05.0/qt6/tests/check_pagemode.cpp b/poppler-24.05.0/qt6/tests/check_pagemode.cpp new file mode 100644 index 0000000000000000000000000000000000000000..0c4551bdcdfc9106d70e1ad6caccca725683b06d --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_pagemode.cpp @@ -0,0 +1,59 @@ +#include + +#include + +class TestPageMode : public QObject +{ + Q_OBJECT +public: + explicit TestPageMode(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkNone(); + void checkFullScreen(); + void checkAttachments(); + void checkThumbs(); + void checkOC(); +}; + +void TestPageMode::checkNone() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseNone.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageMode(), Poppler::Document::UseNone); +} + +void TestPageMode::checkFullScreen() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/FullScreen.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageMode(), Poppler::Document::FullScreen); +} + +void TestPageMode::checkAttachments() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseAttachments.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageMode(), Poppler::Document::UseAttach); +} + +void TestPageMode::checkThumbs() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseThumbs.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageMode(), Poppler::Document::UseThumbs); +} + +void TestPageMode::checkOC() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/UseOC.pdf"); + QVERIFY(doc); + + QCOMPARE(doc->pageMode(), Poppler::Document::UseOC); +} + +QTEST_GUILESS_MAIN(TestPageMode) +#include "check_pagemode.moc" diff --git a/poppler-24.05.0/qt6/tests/check_password.cpp b/poppler-24.05.0/qt6/tests/check_password.cpp new file mode 100644 index 0000000000000000000000000000000000000000..b788fd0a2ede6110ed037b92c0faa963cd5f35fb --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_password.cpp @@ -0,0 +1,101 @@ +#include + +#include + +class TestPassword : public QObject +{ + Q_OBJECT +public: + explicit TestPassword(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void password1(); + void password1a(); + void password2(); + void password2a(); + void password2b(); + void password3(); + void password4(); + void password4b(); + void password5(); +}; + +// BUG:4557 +void TestPassword::password1() +{ + std::unique_ptr doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - open.pdf"), "", QString::fromUtf8("garçon").toLatin1()); // clazy:exclude=qstring-allocations + QVERIFY(doc); + QVERIFY(!doc->isLocked()); +} + +void TestPassword::password1a() +{ + std::unique_ptr doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - open.pdf")); // clazy:exclude=qstring-allocations + QVERIFY(doc); + QVERIFY(doc->isLocked()); + QVERIFY(!doc->unlock("", QString::fromUtf8("garçon").toLatin1())); // clazy:exclude=qstring-allocations + QVERIFY(!doc->isLocked()); +} + +void TestPassword::password2() +{ + std::unique_ptr doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - owner.pdf"), QString::fromUtf8("garçon").toLatin1(), ""); // clazy:exclude=qstring-allocations + QVERIFY(doc); + QVERIFY(!doc->isLocked()); +} + +void TestPassword::password2a() +{ + std::unique_ptr doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - owner.pdf"), QString::fromUtf8("garçon").toLatin1()); // clazy:exclude=qstring-allocations + QVERIFY(doc); + QVERIFY(!doc->isLocked()); +} + +void TestPassword::password2b() +{ + std::unique_ptr doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/Gday garçon - owner.pdf")); + QVERIFY(doc); + QVERIFY(!doc->isLocked()); + QVERIFY(!doc->unlock(QString::fromUtf8("garçon").toLatin1(), "")); // clazy:exclude=qstring-allocations + QVERIFY(!doc->isLocked()); +} + +void TestPassword::password3() +{ + std::unique_ptr doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/PasswordEncrypted.pdf")); + QVERIFY(doc); + QVERIFY(doc->isLocked()); + QVERIFY(!doc->unlock("", "password")); + QVERIFY(!doc->isLocked()); +} + +// issue 690 +void TestPassword::password4() +{ + std::unique_ptr doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/encrypted-256.pdf")); + QVERIFY(doc); + QVERIFY(doc->isLocked()); + QVERIFY(!doc->unlock("owner-secret", "")); + QVERIFY(!doc->isLocked()); +} + +// issue 690 +void TestPassword::password4b() +{ + std::unique_ptr doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/encrypted-256.pdf")); + QVERIFY(doc); + QVERIFY(doc->isLocked()); + QVERIFY(!doc->unlock("", "user-secret")); + QVERIFY(!doc->isLocked()); +} + +void TestPassword::password5() +{ + std::unique_ptr doc = Poppler::Document::load(QString::fromUtf8(TESTDATADIR "/unittestcases/PasswordEncryptedReconstructed.pdf")); + QVERIFY(doc); + QVERIFY(doc->isLocked()); + QVERIFY(!doc->unlock("", "test")); + QVERIFY(!doc->isLocked()); +} + +QTEST_GUILESS_MAIN(TestPassword) +#include "check_password.moc" diff --git a/poppler-24.05.0/qt6/tests/check_permissions.cpp b/poppler-24.05.0/qt6/tests/check_permissions.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ecbb9f90f21452f5c3d87d52907d94d9772eabf9 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_permissions.cpp @@ -0,0 +1,42 @@ +#include + +#include + +class TestPermissions : public QObject +{ + Q_OBJECT +public: + explicit TestPermissions(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void permissions1(); +}; + +void TestPermissions::permissions1() +{ + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/orientation.pdf"); + QVERIFY(doc); + + // we are allowed to print + QVERIFY(doc->okToPrint()); + + // we are not allowed to change + QVERIFY(!(doc->okToChange())); + + // we are not allowed to copy or extract content + QVERIFY(!(doc->okToCopy())); + + // we are not allowed to print at high resolution + QVERIFY(!(doc->okToPrintHighRes())); + + // we are not allowed to fill forms + QVERIFY(!(doc->okToFillForm())); + + // we are allowed to extract content for accessibility + QVERIFY(doc->okToExtractForAccessibility()); + + // we are allowed to assemble this document + QVERIFY(doc->okToAssemble()); +} + +QTEST_GUILESS_MAIN(TestPermissions) +#include "check_permissions.moc" diff --git a/poppler-24.05.0/qt6/tests/check_search.cpp b/poppler-24.05.0/qt6/tests/check_search.cpp new file mode 100644 index 0000000000000000000000000000000000000000..384088f85393901287209f2e09f3a11c86f3fef7 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_search.cpp @@ -0,0 +1,402 @@ +#include + +#include + +class TestSearch : public QObject +{ + Q_OBJECT +public: + explicit TestSearch(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testAcrossLinesSearch(); // leave it first + void testAcrossLinesSearchDoubleColumn(); + void bug7063(); + void testNextAndPrevious(); + void testWholeWordsOnly(); + void testIgnoreDiacritics(); + void testRussianSearch(); // Issue #743 + void testDeseretSearch(); // Issue #853 +}; + +void TestSearch::bug7063() +{ + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/bug7063.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + double rectLeft = 0.0, rectTop = 0.0, rectRight = page->pageSizeF().width(), rectBottom = page->pageSizeF().height(); + + QCOMPARE(page->search(QStringLiteral("non-ascii:"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + + QCOMPARE(page->search(QStringLiteral("Ascii"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), false); + QCOMPARE(page->search(QStringLiteral("Ascii"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::IgnoreCase), true); + + QCOMPARE(page->search(QStringLiteral("latin1:"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), false); + + QCOMPARE(page->search(QString::fromUtf8("é"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("à"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("ç"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("search \"é\", \"à\" or \"ç\""), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("¥µ©"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("¥©"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), false); // clazy:exclude=qstring-allocations + + QCOMPARE(page->search(QStringLiteral("non-ascii:"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + + QCOMPARE(page->search(QStringLiteral("Ascii"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), false); + QCOMPARE(page->search(QStringLiteral("Ascii"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop, Poppler::Page::IgnoreCase), true); + + QCOMPARE(page->search(QStringLiteral("latin1:"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), false); + + QCOMPARE(page->search(QString::fromUtf8("é"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("à"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("ç"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("search \"é\", \"à\" or \"ç\""), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("¥µ©"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("¥©"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), false); // clazy:exclude=qstring-allocations +} + +void TestSearch::testNextAndPrevious() +{ + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/xr01.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + double rectLeft = 0.0, rectTop = 0.0, rectRight = page->pageSizeF().width(), rectBottom = page->pageSizeF().height(); + + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), true); + QVERIFY(qAbs(rectLeft - 171.46) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 139.81) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), true); + QVERIFY(qAbs(rectLeft - 171.46) < 0.01); + QVERIFY(qAbs(rectTop - 139.81) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), false); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 139.81) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), true); + QVERIFY(qAbs(rectLeft - 171.46) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), false); + + rectLeft = 0.0, rectTop = 0.0, rectRight = page->pageSizeF().width(), rectBottom = page->pageSizeF().height(); + + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::FromTop), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), true); + QVERIFY(qAbs(rectLeft - 171.46) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 139.81) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), true); + QVERIFY(qAbs(rectLeft - 171.46) < 0.01); + QVERIFY(qAbs(rectTop - 139.81) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::NextResult), false); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 139.81) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), true); + QVERIFY(qAbs(rectLeft - 171.46) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), true); + QVERIFY(qAbs(rectLeft - 161.44) < 0.01); + QVERIFY(qAbs(rectTop - 127.85) < 0.01); + QVERIFY(qAbs(rectRight - rectLeft - 6.70) < 0.01); + QVERIFY(qAbs(rectBottom - rectTop - 8.85) < 0.01); + QCOMPARE(page->search(QStringLiteral("is"), rectLeft, rectTop, rectRight, rectBottom, Poppler::Page::PreviousResult), false); +} + +void TestSearch::testWholeWordsOnly() +{ + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/WithActualText.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + const Poppler::Page::SearchDirection direction = Poppler::Page::FromTop; + + const Poppler::Page::SearchFlags mode0; + const Poppler::Page::SearchFlags mode1 = Poppler::Page::IgnoreCase; + const Poppler::Page::SearchFlags mode2 = Poppler::Page::WholeWords; + const Poppler::Page::SearchFlags mode3 = Poppler::Page::IgnoreCase | Poppler::Page::WholeWords; + + double left, top, right, bottom; + + QCOMPARE(page->search(QStringLiteral("brown"), left, top, right, bottom, direction, mode0), true); + QCOMPARE(page->search(QStringLiteral("brOwn"), left, top, right, bottom, direction, mode0), false); + + QCOMPARE(page->search(QStringLiteral("brOwn"), left, top, right, bottom, direction, mode1), true); + QCOMPARE(page->search(QStringLiteral("brawn"), left, top, right, bottom, direction, mode1), false); + + QCOMPARE(page->search(QStringLiteral("brown"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("own"), left, top, right, bottom, direction, mode2), false); + + QCOMPARE(page->search(QStringLiteral("brOwn"), left, top, right, bottom, direction, mode3), true); + QCOMPARE(page->search(QStringLiteral("Own"), left, top, right, bottom, direction, mode3), false); +} + +void TestSearch::testIgnoreDiacritics() +{ + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/Issue637.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + const Poppler::Page::SearchDirection direction = Poppler::Page::FromTop; + + const Poppler::Page::SearchFlags mode0; + const Poppler::Page::SearchFlags mode1 = Poppler::Page::IgnoreDiacritics; + const Poppler::Page::SearchFlags mode2 = Poppler::Page::IgnoreDiacritics | Poppler::Page::IgnoreCase; + const Poppler::Page::SearchFlags mode3 = Poppler::Page::IgnoreDiacritics | Poppler::Page::IgnoreCase | Poppler::Page::WholeWords; + const Poppler::Page::SearchFlags mode4 = Poppler::Page::IgnoreCase | Poppler::Page::WholeWords; + + double left, top, right, bottom; + + // Test pdf (Issue637.pdf) just contains the following three lines: + // La cigüeña voló sobre nuestras cabezas. + // La cigogne a survolé nos têtes. + // Der Storch flog über unsere Köpfe hinweg. + + QCOMPARE(page->search(QString(), left, top, right, bottom, direction, mode0), false); + QCOMPARE(page->search(QStringLiteral("ciguena"), left, top, right, bottom, direction, mode0), false); + QCOMPARE(page->search(QStringLiteral("Ciguena"), left, top, right, bottom, direction, mode1), false); + QCOMPARE(page->search(QStringLiteral("ciguena"), left, top, right, bottom, direction, mode1), true); + QCOMPARE(page->search(QString::fromUtf8("cigüeña"), left, top, right, bottom, direction, mode1), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("cigüena"), left, top, right, bottom, direction, mode1), false); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("Cigüeña"), left, top, right, bottom, direction, mode1), false); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QStringLiteral("Ciguena"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("ciguena"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("Ciguena"), left, top, right, bottom, direction, mode3), true); + QCOMPARE(page->search(QStringLiteral("ciguena"), left, top, right, bottom, direction, mode3), true); + + QCOMPARE(page->search(QString::fromUtf8("cigüeña"), left, top, right, bottom, direction, mode4), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("Cigüeña"), left, top, right, bottom, direction, mode4), true); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QString::fromUtf8("cigüena"), left, top, right, bottom, direction, mode4), false); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(QStringLiteral("Ciguena"), left, top, right, bottom, direction, mode4), false); + + QCOMPARE(page->search(QStringLiteral("kopfe"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("kopfe"), left, top, right, bottom, direction, mode3), true); + QCOMPARE(page->search(QStringLiteral("uber"), left, top, right, bottom, direction, mode0), false); + QCOMPARE(page->search(QStringLiteral("uber"), left, top, right, bottom, direction, mode1), true); + QCOMPARE(page->search(QStringLiteral("uber"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("uber"), left, top, right, bottom, direction, mode3), true); + + QCOMPARE(page->search(QStringLiteral("vole"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("vole"), left, top, right, bottom, direction, mode3), false); + QCOMPARE(page->search(QStringLiteral("survole"), left, top, right, bottom, direction, mode3), true); + QCOMPARE(page->search(QStringLiteral("tete"), left, top, right, bottom, direction, mode3), false); + QCOMPARE(page->search(QStringLiteral("tete"), left, top, right, bottom, direction, mode2), true); + + QCOMPARE(page->search(QStringLiteral("La Ciguena Volo"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("Survole Nos Tetes"), left, top, right, bottom, direction, mode2), true); + QCOMPARE(page->search(QStringLiteral("Uber Unsere Kopfe"), left, top, right, bottom, direction, mode2), true); +} + +void TestSearch::testRussianSearch() +{ + // Test for issue #743 + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/russian.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + const Poppler::Page::SearchDirection direction = Poppler::Page::FromTop; + + const Poppler::Page::SearchFlags mode0 = Poppler::Page::NoSearchFlags; + const Poppler::Page::SearchFlags mode1 = Poppler::Page::IgnoreDiacritics; + const Poppler::Page::SearchFlags mode2 = Poppler::Page::IgnoreDiacritics | Poppler::Page::IgnoreCase; + const Poppler::Page::SearchFlags mode0W = mode0 | Poppler::Page::WholeWords; + const Poppler::Page::SearchFlags mode1W = mode1 | Poppler::Page::WholeWords; + const Poppler::Page::SearchFlags mode2W = mode2 | Poppler::Page::WholeWords; + + double l, t, r, b; // left, top, right, bottom + + // In the searched page 5, these two words do exist: простой and Простой + const QString str = QString::fromUtf8("простой"); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(str, l, t, r, b, direction, mode0), true); + QCOMPARE(page->search(str, l, t, r, b, direction, mode1), true); + QCOMPARE(page->search(str, l, t, r, b, direction, mode2), true); + QCOMPARE(page->search(str, l, t, r, b, direction, mode0W), true); + QCOMPARE(page->search(str, l, t, r, b, direction, mode1W), true); + QCOMPARE(page->search(str, l, t, r, b, direction, mode2W), true); +} + +void TestSearch::testDeseretSearch() +{ + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/deseret.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + double l, t, r, b; // left, top, right, bottom + + const QString str = QString::fromUtf8("𐐐𐐯𐑊𐐬"); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(str, l, t, r, b, Poppler::Page::FromTop, Poppler::Page::NoSearchFlags), true); + + const QString str2 = QString::fromUtf8("𐐸𐐯𐑊𐐬"); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(str2, l, t, r, b, Poppler::Page::FromTop, Poppler::Page::IgnoreCase), true); +} + +void TestSearch::testAcrossLinesSearch() +{ + // Test for searching across lines with new flag Poppler::Page::AcrossLines + // and its automatic features like ignoring hyphen at end of line or allowing + // whitespace in the search term to match on newline character. + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/searchAcrossLines.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(1); + QVERIFY(page); + + const Poppler::Page::SearchDirection direction = Poppler::Page::FromTop; + + const Poppler::Page::SearchFlags empty = Poppler::Page::NoSearchFlags; + const Poppler::Page::SearchFlags mode0 = Poppler::Page::AcrossLines; + const Poppler::Page::SearchFlags mode1 = Poppler::Page::AcrossLines | Poppler::Page::IgnoreDiacritics; + const Poppler::Page::SearchFlags mode2 = Poppler::Page::AcrossLines | Poppler::Page::IgnoreDiacritics | Poppler::Page::IgnoreCase; + const Poppler::Page::SearchFlags mode2W = mode2 | Poppler::Page::WholeWords; + + double l, t, r, b; // left, top, right, bottom + + // In the searched page, each of "re-conocimiento" "PRUE-BA" "imáge-nes" happen split across lines + const QString str1 = QString::fromUtf8("reconocimiento"); // clazy:exclude=qstring-allocations + const QString str2 = QString::fromUtf8("IMagenes"); // clazy:exclude=qstring-allocations + // Test it cannot be found with empty search flags + QCOMPARE(page->search(str1, l, t, r, b, direction, empty), false); + // Test it is found with AcrossLines option + QCOMPARE(page->search(str1, l, t, r, b, direction, mode0), true); + // Test AcrossLines with IgnoreDiacritics and IgnoreCase options + QCOMPARE(page->search(str2, l, t, r, b, direction, mode0), false); + QCOMPARE(page->search(str2, l, t, r, b, direction, mode1), false); + QCOMPARE(page->search(str2, l, t, r, b, direction, mode2), true); + // Test with WholeWords too + QCOMPARE(page->search(str2, l, t, r, b, direction, mode2W), true); + + // Now test that AcrossLines also allows whitespace in the search term to match on newline char. + // In the searched page, "podrá" ends a line and "acordar" starts the next line, so we + // now test we match it with "podrá acordar" + const QString str3 = QString::fromUtf8("podrá acordar,"); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(str3, l, t, r, b, direction, mode0), true); + QCOMPARE(page->search(str3, l, t, r, b, direction, mode1), true); + QCOMPARE(page->search(str3, l, t, r, b, direction, mode2), true); + QCOMPARE(page->search(str3, l, t, r, b, direction, mode2W), true); + // now test it also works with IgnoreDiacritics and IgnoreCase + const QString str4 = QString::fromUtf8("PODRA acordar"); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(str4, l, t, r, b, direction, mode0), false); + QCOMPARE(page->search(str4, l, t, r, b, direction, mode1), false); + QCOMPARE(page->search(str4, l, t, r, b, direction, mode2), true); + QCOMPARE(page->search(str4, l, t, r, b, direction, mode2W), false); // false as it lacks ending comma + + // Now test that when a hyphen char in the search term matches a hyphen at end of line, + // then we don't automatically ignore it, but treat it as a normal char. + // In the searched page, "CC BY-NC-SA 4.0" is split across two lines on the second hyphen + const QString str5 = QString::fromUtf8("CC BY-NC-SA 4.0"); // clazy:exclude=qstring-allocations + std::unique_ptr page0 = document->page(0); + QVERIFY(page0); + QCOMPARE(page0->search(str5, l, t, r, b, direction, mode0), true); + QCOMPARE(page0->search(str5, l, t, r, b, direction, mode1), true); + QCOMPARE(page0->search(str5, l, t, r, b, direction, mode2), true); + QCOMPARE(page0->search(str5, l, t, r, b, direction, mode2W), true); + QCOMPARE(page0->search(QString::fromUtf8("NC-SA"), l, t, r, b, direction, mode2W), false); // clazy:exclude=qstring-allocations + // Searching for "CC BY-NCSA 4.0" should also match, because hyphen is now ignored at end of line + const QString str6 = QString::fromUtf8("CC BY-NCSA 4.0"); // clazy:exclude=qstring-allocations + QCOMPARE(page0->search(str6, l, t, r, b, direction, mode0), true); + QCOMPARE(page0->search(str6, l, t, r, b, direction, mode1), true); + QCOMPARE(page0->search(str6, l, t, r, b, direction, mode2), true); + QCOMPARE(page0->search(str6, l, t, r, b, direction, mode2W), true); + // Check for the case when next line falls in next paragraph. Issue #1475 + const QString across_block = QString::fromUtf8("emacs jose"); // clazy:exclude=qstring-allocations + QCOMPARE(page0->search(across_block, l, t, r, b, direction, empty), false); + QCOMPARE(page0->search(across_block, l, t, r, b, direction, mode0), false); + QCOMPARE(page0->search(across_block, l, t, r, b, direction, mode1), false); + QCOMPARE(page0->search(across_block, l, t, r, b, direction, mode2), true); + QCOMPARE(page0->search(across_block, l, t, r, b, direction, mode2W), true); + + // Now for completeness, we will match the full text of two lines + const QString full2lines = QString::fromUtf8( // clazy:exclude=qstring-allocations + "Las pruebas se practicarán en vista pública, si bien, excepcionalmente, el Tribunal podrá acordar, mediante providencia, que determinadas pruebas se celebren fuera del acto de juicio"); + QCOMPARE(page->search(full2lines, l, t, r, b, direction, mode0), true); + QCOMPARE(page->search(full2lines, l, t, r, b, direction, mode1), true); + QCOMPARE(page->search(full2lines, l, t, r, b, direction, mode2), true); + QCOMPARE(page->search(full2lines, l, t, r, b, direction, mode2W), true); + // And now the full text of two lines split by a hyphenated word + const QString full2linesHyphenated = QString::fromUtf8("Consiste básicamente en información digitalizada, codificados y alojados en un elemento contenedor digital (equipos, dispositivos periféricos, unidades de memoria, unidades " + "virtualizadas, tramas"); // clazy:exclude=qstring-allocations + QCOMPARE(page->search(full2linesHyphenated, l, t, r, b, direction, mode0), true); + QCOMPARE(page->search(full2linesHyphenated, l, t, r, b, direction, mode1), true); + QCOMPARE(page->search(full2linesHyphenated, l, t, r, b, direction, mode2), true); + QCOMPARE(page->search(full2linesHyphenated, l, t, r, b, direction, mode2W), true); + + // BUG about false positives at start of a line. + const QString bug_str = QString::fromUtf8("nes y"); // clazy:exclude=qstring-allocations + // there's only 1 match, check for that + QCOMPARE(page->search(bug_str, mode2).size(), 1); +} + +void TestSearch::testAcrossLinesSearchDoubleColumn() +{ + // Test for searching across lines with new flag Poppler::Page::AcrossLines + // in a document with two columns of text. + std::unique_ptr document = Poppler::Document::load(TESTDATADIR "/unittestcases/searchAcrossLinesDoubleColumn.pdf"); + QVERIFY(document); + + std::unique_ptr page = document->page(0); + QVERIFY(page); + + const Poppler::Page::SearchFlags mode = Poppler::Page::AcrossLines | Poppler::Page::IgnoreDiacritics | Poppler::Page::IgnoreCase; + + // Test for a bug in double column documents where single line matches are + // wrongly returned as being multiline matches. + const QString bug_str = QString::fromUtf8("betw"); // clazy:exclude=qstring-allocations + + // there's only 3 matches for 'betw' in document, where only the last + // one is a multiline match, so that's a total of 4 rects returned + QCOMPARE(page->search(bug_str, mode).size(), 4); +} + +QTEST_GUILESS_MAIN(TestSearch) +#include "check_search.moc" diff --git a/poppler-24.05.0/qt6/tests/check_signature_basics.cpp b/poppler-24.05.0/qt6/tests/check_signature_basics.cpp new file mode 100644 index 0000000000000000000000000000000000000000..9135908adf7a243300bf18fc05d149b668d88e22 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_signature_basics.cpp @@ -0,0 +1,179 @@ +//======================================================================== +// +// check_signature_basics.cpp +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +//======================================================================== + +// Simple tests of reading signatures +// +// Note that this does not check the actual validity because +// that will have an expiry date, and adding time bombs to unit tests is +// probably not a good idea. +#include +#include "PDFDoc.h" +#include "GlobalParams.h" +#include "SignatureInfo.h" +#include "CryptoSignBackend.h" +#include "config.h" + +class TestSignatureBasics : public QObject +{ + Q_OBJECT +public: + explicit TestSignatureBasics(QObject *parent = nullptr) : QObject(parent) { } + +private: + std::unique_ptr doc; +private Q_SLOTS: + void init(); + void initTestCase_data(); + void initTestCase() { } + void cleanupTestCase(); + void testSignatureCount(); + void testSignatureSizes(); + void testSignerInfo(); // names and stuff + void testSignedRanges(); +}; + +void TestSignatureBasics::init() +{ +#ifdef ENABLE_SIGNATURES + QFETCH_GLOBAL(CryptoSign::Backend::Type, backend); + CryptoSign::Factory::setPreferredBackend(backend); + QCOMPARE(CryptoSign::Factory::getActive(), backend); +#endif + + globalParams = std::make_unique(); + doc = std::make_unique(std::make_unique(TESTDATADIR "/unittestcases/pdf-signature-sample-2sigs.pdf")); + QVERIFY(doc); + QVERIFY(doc->isOk()); +} + +void TestSignatureBasics::initTestCase_data() +{ + QTest::addColumn("backend"); + +#ifdef ENABLE_SIGNATURES + const auto availableBackends = CryptoSign::Factory::getAvailable(); + +# ifdef ENABLE_NSS3 + if (std::find(availableBackends.begin(), availableBackends.end(), CryptoSign::Backend::Type::NSS3) != availableBackends.end()) { + QTest::newRow("nss") << CryptoSign::Backend::Type::NSS3; + } else { + QWARN("Compiled with NSS3, but NSS not functional"); + } +# endif +# ifdef ENABLE_GPGME + if (std::find(availableBackends.begin(), availableBackends.end(), CryptoSign::Backend::Type::GPGME) != availableBackends.end()) { + QTest::newRow("gpg") << CryptoSign::Backend::Type::GPGME; + } else { + QWARN("Compiled with GPGME, but GPGME not functional"); + } +# endif +#endif +} + +void TestSignatureBasics::cleanupTestCase() +{ + globalParams.reset(); +} + +void TestSignatureBasics::testSignatureCount() +{ + QVERIFY(doc); + auto signatureFields = doc->getSignatureFields(); + QCOMPARE(signatureFields.size(), 4); + // count active signatures + QVERIFY(signatureFields[0]->getSignature()); + QVERIFY(signatureFields[1]->getSignature()); + QVERIFY(!signatureFields[2]->getSignature()); + QVERIFY(!signatureFields[3]->getSignature()); +} + +void TestSignatureBasics::testSignatureSizes() +{ + auto signatureFields = doc->getSignatureFields(); + // These are not the actual signature lengths, but rather + // the length of the signature field, which is likely + // a padded field. At least the pdf specification suggest to pad + // the field. + // Poppler before 23.04 did not have a padded field, later versions do. + QCOMPARE(signatureFields[0]->getSignature()->getLength(), 10230); // Signature data size is 2340 + QCOMPARE(signatureFields[1]->getSignature()->getLength(), 10196); // Signature data size is 2340 +} + +void TestSignatureBasics::testSignerInfo() +{ + auto signatureFields = doc->getSignatureFields(); + QCOMPARE(signatureFields[0]->getCreateWidget()->getField()->getFullyQualifiedName()->toStr(), std::string { "P2.AnA_Signature0_B_" }); + QCOMPARE(signatureFields[0]->getSignatureType(), ETSI_CAdES_detached); + auto siginfo0 = signatureFields[0]->validateSignatureAsync(false, false, -1 /* now */, false, false, {}); + signatureFields[0]->validateSignatureResult(); +#ifdef ENABLE_SIGNATURES + QCOMPARE(siginfo0->getSignerName(), std::string { "Koch, Werner" }); + QCOMPARE(siginfo0->getHashAlgorithm(), HashAlgorithm::Sha256); + QCOMPARE(siginfo0->getCertificateInfo()->getPublicKeyInfo().publicKeyStrength, 2048 / 8); +#else + QCOMPARE(siginfo0->getSignerName(), std::string {}); + QCOMPARE(siginfo0->getHashAlgorithm(), HashAlgorithm::Unknown); +#endif + QCOMPARE(siginfo0->getSigningTime(), time_t(1677570911)); + + QCOMPARE(signatureFields[1]->getCreateWidget()->getField()->getFullyQualifiedName()->toStr(), std::string { "P2.AnA_Signature1_B_" }); + QCOMPARE(signatureFields[1]->getSignatureType(), ETSI_CAdES_detached); + auto siginfo1 = signatureFields[1]->validateSignatureAsync(false, false, -1 /* now */, false, false, {}); + signatureFields[1]->validateSignatureResult(); +#ifdef ENABLE_SIGNATURES + QCOMPARE(siginfo1->getSignerName(), std::string { "Koch, Werner" }); + QCOMPARE(siginfo1->getHashAlgorithm(), HashAlgorithm::Sha256); + QFETCH_GLOBAL(CryptoSign::Backend::Type, backend); + if (backend == CryptoSign::Backend::Type::GPGME) { + QCOMPARE(siginfo1->getCertificateInfo()->getPublicKeyInfo().publicKeyStrength, 2048 / 8); + } else if (backend == CryptoSign::Backend::Type::NSS3) { + // Not fully sure why it is zero here, but it seems to be. + QCOMPARE(siginfo1->getCertificateInfo()->getPublicKeyInfo().publicKeyStrength, 0); + } +#else + QCOMPARE(siginfo1->getSignerName(), std::string {}); + QCOMPARE(siginfo1->getHashAlgorithm(), HashAlgorithm::Unknown); +#endif + QCOMPARE(siginfo1->getSigningTime(), time_t(1677840601)); + + QCOMPARE(signatureFields[2]->getCreateWidget()->getField()->getFullyQualifiedName()->toStr(), std::string { "P2.AnA_Signature2_B_" }); + QCOMPARE(signatureFields[2]->getSignatureType(), unsigned_signature_field); + QCOMPARE(signatureFields[3]->getCreateWidget()->getField()->getFullyQualifiedName()->toStr(), std::string { "P2.AnA_Signature3_B_" }); + QCOMPARE(signatureFields[3]->getSignatureType(), unsigned_signature_field); +} + +void TestSignatureBasics::testSignedRanges() +{ + auto signatureFields = doc->getSignatureFields(); + + Goffset size0; + auto sig0 = signatureFields[0]->getCheckedSignature(&size0); + QVERIFY(sig0); + auto ranges0 = signatureFields[0]->getSignedRangeBounds(); + QCOMPARE(ranges0.size(), 4); + QCOMPARE(ranges0[0], 0); + QCOMPARE(ranges0[1], 24890); + QCOMPARE(ranges0[2], 45352); + QCOMPARE(ranges0[3], 58529); + QVERIFY(ranges0[3] != size0); // signature does not cover all of it + + Goffset size1; + auto sig1 = signatureFields[1]->getCheckedSignature(&size1); + QVERIFY(sig1); + auto ranges1 = signatureFields[1]->getSignedRangeBounds(); + QCOMPARE(ranges1.size(), 4); + QCOMPARE(ranges1[0], 0); + QCOMPARE(ranges1[1], 59257); + QCOMPARE(ranges1[2], 79651); + QCOMPARE(ranges1[3], 92773); + QCOMPARE(ranges1[3], size1); // signature does cover all of it +} + +QTEST_GUILESS_MAIN(TestSignatureBasics) +#include "check_signature_basics.moc" diff --git a/poppler-24.05.0/qt6/tests/check_strings.cpp b/poppler-24.05.0/qt6/tests/check_strings.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e1a4c1724ff93612e83e78bb356f3fee5469bbc8 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_strings.cpp @@ -0,0 +1,244 @@ +/* + * Copyright (C) 2010, 2011, Pino Toscano + * Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, + * + * 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 + +#include +#include + +#include +#include "UTF.h" + +Q_DECLARE_METATYPE(GooString *) +Q_DECLARE_METATYPE(Unicode *) + +class TestStrings : public QObject +{ + Q_OBJECT + +public: + explicit TestStrings(QObject *parent = nullptr) : QObject(parent) { } + +private slots: + void initTestCase(); + void cleanupTestCase(); + void check_unicodeToQString_data(); + void check_unicodeToQString(); + void check_UnicodeParsedString_data(); + void check_UnicodeParsedString(); + void check_QStringToUnicodeGooString_data(); + void check_QStringToUnicodeGooString(); + void check_QStringToGooString_data(); + void check_QStringToGooString(); + +private: + GooString *newGooString(const char *s); + GooString *newGooString(const char *s, int l); + + QVector m_gooStrings; +}; + +void TestStrings::initTestCase() +{ + qRegisterMetaType("GooString*"); + qRegisterMetaType("Unicode*"); + + globalParams = std::make_unique(); +} + +void TestStrings::cleanupTestCase() +{ + qDeleteAll(m_gooStrings); + + globalParams.reset(); +} + +void TestStrings::check_unicodeToQString_data() +{ + QTest::addColumn("data"); + QTest::addColumn("length"); + QTest::addColumn("result"); + + { + const int l = 1; + Unicode *u = new Unicode[l]; + u[0] = int('a'); + QTest::newRow("a") << u << l << QStringLiteral("a"); + } + { + const int l = 1; + Unicode *u = new Unicode[l]; + u[0] = 0x0161; + QTest::newRow("\u0161") << u << l << QStringLiteral("\u0161"); + } + { + const int l = 2; + Unicode *u = new Unicode[l]; + u[0] = int('a'); + u[1] = int('b'); + QTest::newRow("ab") << u << l << QStringLiteral("ab"); + } + { + const int l = 2; + Unicode *u = new Unicode[l]; + u[0] = int('a'); + u[1] = 0x0161; + QTest::newRow("a\u0161") << u << l << QStringLiteral("a\u0161"); + } + { + const int l = 2; + Unicode *u = new Unicode[l]; + u[0] = 0x5c01; + u[1] = 0x9762; + QTest::newRow("\xe5\xb0\x81\xe9\x9d\xa2") << u << l << QStringLiteral("封面"); + } + { + const int l = 3; + Unicode *u = new Unicode[l]; + u[0] = 0x5c01; + u[1] = 0x9762; + u[2] = 0x0; + QTest::newRow("\xe5\xb0\x81\xe9\x9d\xa2 + 0") << u << l << QStringLiteral("封面"); + } + { + const int l = 4; + Unicode *u = new Unicode[l]; + u[0] = 0x5c01; + u[1] = 0x9762; + u[2] = 0x0; + u[3] = 0x0; + QTest::newRow("\xe5\xb0\x81\xe9\x9d\xa2 + two 0") << u << l << QStringLiteral("封面"); + } +} + +void TestStrings::check_unicodeToQString() +{ + QFETCH(Unicode *, data); + QFETCH(int, length); + QFETCH(QString, result); + + QCOMPARE(Poppler::unicodeToQString(data, length), result); + + delete[] data; +} + +void TestStrings::check_UnicodeParsedString_data() +{ + QTest::addColumn("string"); + QTest::addColumn("result"); + + // non-unicode strings + QTest::newRow("") << newGooString("") << QString(); + QTest::newRow("a") << newGooString("a") << QStringLiteral("a"); + QTest::newRow("ab") << newGooString("ab") << QStringLiteral("ab"); + QTest::newRow("~") << newGooString("~") << QStringLiteral("~"); + QTest::newRow("test string") << newGooString("test string") << QStringLiteral("test string"); + + // unicode strings + QTest::newRow("") << newGooString("\xFE\xFF") << QString(); + QTest::newRow("U a") << newGooString("\xFE\xFF\0a", 4) << QStringLiteral("a"); + QTest::newRow("U ~") << newGooString("\xFE\xFF\0~", 4) << QStringLiteral("~"); + QTest::newRow("U aa") << newGooString("\xFE\xFF\0a\0a", 6) << QStringLiteral("aa"); + QTest::newRow("U \xC3\x9F") << newGooString("\xFE\xFF\0\xDF", 4) << QStringLiteral("ß"); + QTest::newRow("U \xC3\x9F\x61") << newGooString("\xFE\xFF\0\xDF\0\x61", 6) << QStringLiteral("ßa"); + QTest::newRow("U \xC5\xA1") << newGooString("\xFE\xFF\x01\x61", 4) << QStringLiteral("š"); + QTest::newRow("U \xC5\xA1\x61") << newGooString("\xFE\xFF\x01\x61\0\x61", 6) << QStringLiteral("ša"); + QTest::newRow("test string") << newGooString("\xFE\xFF\0t\0e\0s\0t\0 \0s\0t\0r\0i\0n\0g", 24) << QStringLiteral("test string"); + QTest::newRow("UTF16-LE") << newGooString("\xFF\xFE\xDA\x00\x6E\x00\xEE\x00\x63\x00\xF6\x00\x64\x00\xE9\x00\x51\x75", 18) << QStringLiteral("Únîcödé畑"); +} + +void TestStrings::check_UnicodeParsedString() +{ + QFETCH(GooString *, string); + QFETCH(QString, result); + + QCOMPARE(Poppler::UnicodeParsedString(string), result); +} + +void TestStrings::check_QStringToUnicodeGooString_data() +{ + QTest::addColumn("string"); + QTest::addColumn("result"); + + QTest::newRow("") << QString() << QByteArray(""); + QTest::newRow("") << QString(QLatin1String("")) << QByteArray(""); + QTest::newRow("a") << QStringLiteral("a") << QByteArray("\0a", 2); + QTest::newRow("ab") << QStringLiteral("ab") << QByteArray("\0a\0b", 4); + QTest::newRow("test string") << QStringLiteral("test string") << QByteArray("\0t\0e\0s\0t\0 \0s\0t\0r\0i\0n\0g", 22); + QTest::newRow("\xC3\x9F") << QStringLiteral("ß") << QByteArray("\0\xDF", 2); + QTest::newRow("\xC3\x9F\x61") << QStringLiteral("ßa") << QByteArray("\0\xDF\0\x61", 4); +} + +void TestStrings::check_QStringToUnicodeGooString() +{ + QFETCH(QString, string); + QFETCH(QByteArray, result); + + GooString *goo = Poppler::QStringToUnicodeGooString(string); + if (string.isEmpty()) { + QVERIFY(goo->toStr().empty()); + QCOMPARE(goo->getLength(), 0); + } else { + QVERIFY(hasUnicodeByteOrderMark(goo->toStr())); + QCOMPARE(goo->getLength(), string.length() * 2 + 2); + QCOMPARE(result, QByteArray::fromRawData(goo->c_str() + 2, goo->getLength() - 2)); + } + + delete goo; +} + +void TestStrings::check_QStringToGooString_data() +{ + QTest::addColumn("string"); + QTest::addColumn("result"); + + QTest::newRow("") << QString() << newGooString(""); + QTest::newRow("") << QString(QLatin1String("")) << newGooString(""); + QTest::newRow("a") << QStringLiteral("a") << newGooString("a"); + QTest::newRow("ab") << QStringLiteral("ab") << newGooString("ab"); +} + +void TestStrings::check_QStringToGooString() +{ + QFETCH(QString, string); + QFETCH(GooString *, result); + + GooString *goo = Poppler::QStringToGooString(string); + QCOMPARE(goo->c_str(), result->c_str()); + + delete goo; +} + +GooString *TestStrings::newGooString(const char *s) +{ + GooString *goo = new GooString(s); + m_gooStrings.append(goo); + return goo; +} + +GooString *TestStrings::newGooString(const char *s, int l) +{ + GooString *goo = new GooString(s, l); + m_gooStrings.append(goo); + return goo; +} + +QTEST_GUILESS_MAIN(TestStrings) + +#include "check_strings.moc" diff --git a/poppler-24.05.0/qt6/tests/check_stroke_opacity.cpp b/poppler-24.05.0/qt6/tests/check_stroke_opacity.cpp new file mode 100644 index 0000000000000000000000000000000000000000..fa69ad1cfb42b3e2fafbd94dfa9fc6d74907d57a --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_stroke_opacity.cpp @@ -0,0 +1,96 @@ +#include + +#include +#include +#include + +#include + +// Unit tests for rendering axial shadings without full opacity +class TestStrokeOpacity : public QObject +{ + Q_OBJECT +public: + explicit TestStrokeOpacity(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void checkStrokeOpacity_data(); + void checkStrokeOpacity(); +}; + +void TestStrokeOpacity::checkStrokeOpacity_data() +{ + QTest::addColumn("backendType"); + + QTest::newRow("splash") << (int)Poppler::Document::SplashBackend; + QTest::newRow("qpainter") << (int)Poppler::Document::QPainterBackend; +} + +void TestStrokeOpacity::checkStrokeOpacity() +{ + QFETCH(int, backendType); + + std::unique_ptr doc = Poppler::Document::load(TESTDATADIR "/unittestcases/stroke-alpha-pattern.pdf"); + QVERIFY(doc != nullptr); + + doc->setRenderBackend((Poppler::Document::RenderBackend)backendType); + + // BUG: For some reason splash gets the opacity wrong when antialiasing is switched off + if (backendType == (int)Poppler::Document::SplashBackend) { + doc->setRenderHint(Poppler::Document::Antialiasing, true); + } + + const auto page = std::unique_ptr(doc->page(0)); + QVERIFY(page != nullptr); + + // Render (at low resolution and with cropped marging) + QImage image = page->renderToImage(36, 36, 40, 50, 200, 230); + + // The actual tests start here + + // Allow a tolerance. + int tolerance; + auto approximatelyEqual = [&tolerance](QRgb c0, const QColor &c1) { + return std::abs(qAlpha(c0) - c1.alpha()) <= tolerance && std::abs(qRed(c0) - c1.red()) <= tolerance && std::abs(qGreen(c0) - c1.green()) <= tolerance && std::abs(qBlue(c0) - c1.blue()) <= tolerance; + }; + + // At the lower left of the test document is a square with an axial shading, + // which should be rendered with opacity 0.25. + // Check that with a sample pixel + auto pixel = image.pixel(70, 160); + + // Splash and QPainter backends implement shadings slightly differently, + // hence we cannot expect to get precisely the same colors. + tolerance = 2; + QVERIFY(approximatelyEqual(pixel, QColor(253, 233, 196, 255))); + + // At the upper left of the test document is a stroked square with an axial shading. + // This is implemented by filling a clip region defined by a stroke outline. + // Check whether the backend really only renders the stroke, not the region + // surrounded by the stroke. + auto pixelUpperLeftInterior = image.pixel(70, 70); + + tolerance = 0; + QVERIFY(approximatelyEqual(pixelUpperLeftInterior, Qt::white)); + + // Now check whether that stroke is semi-transparent. + // Bug https://gitlab.freedesktop.org/poppler/poppler/-/issues/178 + auto pixelUpperLeftOnStroke = image.pixel(70, 20); + + tolerance = 2; + QVERIFY(approximatelyEqual(pixelUpperLeftOnStroke, QColor(253, 233, 196, 255))); + + // At the upper right there is a semi-transparent stroked red square + // a) Make sure that the color is correct. + auto pixelUpperRightOnStroke = image.pixel(130, 20); + + tolerance = 0; + QVERIFY(approximatelyEqual(pixelUpperRightOnStroke, QColor(246, 196, 206, 255))); + + // b) Make sure that it is really stroked, not filled + auto pixelUpperRightInterior = image.pixel(130, 50); + QVERIFY(approximatelyEqual(pixelUpperRightInterior, Qt::white)); +} + +QTEST_GUILESS_MAIN(TestStrokeOpacity) + +#include "check_stroke_opacity.moc" diff --git a/poppler-24.05.0/qt6/tests/check_utf8document.cpp b/poppler-24.05.0/qt6/tests/check_utf8document.cpp new file mode 100644 index 0000000000000000000000000000000000000000..c58ec0be94da72f4327b143411efd8beb8adf557 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_utf8document.cpp @@ -0,0 +1,58 @@ +#include + +#include "PDFDoc.h" +#include "GlobalParams.h" + +#include "Outline.h" +#include "poppler-private.h" + +class TestUtf8Document : public QObject +{ + Q_OBJECT +public: + explicit TestUtf8Document(QObject *parent = nullptr) : QObject(parent) { } +private Q_SLOTS: + void checkStrings(); +}; + +inline QString outlineItemTitle(OutlineItem *item) +{ + if (!item) { + return {}; + } + const std::vector &title = item->getTitle(); + return QString::fromUcs4(title.data(), title.size()); +} + +void TestUtf8Document::checkStrings() +{ + + globalParams = std::make_unique(); + auto doc = std::make_unique(std::make_unique(TESTDATADIR "/unittestcases/pdf20-utf8-test.pdf")); + QVERIFY(doc); + QVERIFY(doc->isOk()); + + QVERIFY(doc->getOptContentConfig() && doc->getOptContentConfig()->hasOCGs()); + + QCOMPARE(Poppler::UnicodeParsedString(doc->getDocInfoTitle().get()), QString::fromUtf8("表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀")); // clazy:exclude=qstring-allocations + + QSet expectedNames { QString::fromUtf8("گچپژ"), QString::fromUtf8("Layer 1") }; // clazy:exclude=qstring-allocations + QSet foundNames; + + for (auto &[ref, group] : doc->getOptContentConfig()->getOCGs()) { + foundNames.insert(Poppler::UnicodeParsedString(group->getName())); + } + QCOMPARE(expectedNames, foundNames); + + auto outlineItems = doc->getOutline()->getItems(); + QVERIFY(outlineItems); + QCOMPARE(outlineItems->size(), 3); + + QCOMPARE(outlineItemTitle(outlineItems->at(0)), QString::fromUtf8("PDF 2.0 with UTF-8 test file")); // clazy:exclude=qstring-allocations + QCOMPARE(outlineItemTitle(outlineItems->at(1)), QString::fromUtf8("\u202A\u202Atest\u202A")); // clazy:exclude=qstring-allocations + QCOMPARE(outlineItemTitle(outlineItems->at(2)), QString::fromUtf8("🌈️\n" /*emoji rainbow flag*/)); // clazy:exclude=qstring-allocations +} + +QTEST_GUILESS_MAIN(TestUtf8Document) + +#include "check_utf8document.moc" diff --git a/poppler-24.05.0/qt6/tests/check_utf_conversion.cpp b/poppler-24.05.0/qt6/tests/check_utf_conversion.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f4b3cb835ae312f8eed9e0b786cbaa2e0d43a7ab --- /dev/null +++ b/poppler-24.05.0/qt6/tests/check_utf_conversion.cpp @@ -0,0 +1,193 @@ +#include +#include + +#include + +#include + +#include "GlobalParams.h" +#include "UnicodeTypeTable.h" +#include "UTF.h" + +class TestUTFConversion : public QObject +{ + Q_OBJECT +public: + explicit TestUTFConversion(QObject *parent = nullptr) : QObject(parent) { } +private slots: + void testUTF_data(); + void testUTF(); + void testUnicodeToAscii7(); + void testUnicodeLittleEndian(); +}; + +static bool compare(const char *a, const char *b) +{ + return strcmp(a, b) == 0; +} + +static bool compare(const uint16_t *a, const uint16_t *b) +{ + while (*a && *b) { + if (*a++ != *b++) { + return false; + } + } + return *a == *b; +} + +static bool compare(const Unicode *a, const char *b, int len) +{ + for (int i = 0; i < len; i++) { + if (a[i] != (Unicode)b[i]) { + return false; + } + } + + return true; +} + +static bool compare(const Unicode *a, const uint16_t *b, int len) +{ + for (int i = 0; i < len; i++) { + if (a[i] != b[i]) { + return false; + } + } + + return true; +} +void TestUTFConversion::testUTF_data() +{ + QTest::addColumn("s"); + + QTest::newRow("") << QString(QLatin1String("")); + QTest::newRow("a") << QStringLiteral("a"); + QTest::newRow("abc") << QStringLiteral("abc"); + QTest::newRow("Latin") << QStringLiteral("Vitrum edere possum; mihi non nocet"); + QTest::newRow("Greek") << QStringLiteral("Μπορώ να φάω σπασμένα γυαλιά χωρίς να πάθω τίποτα"); + QTest::newRow("Icelandic") << QStringLiteral("Ég get etið gler án þess að meiða mig"); + QTest::newRow("Russian") << QStringLiteral("Я могу есть стекло, оно мне не вредит."); + QTest::newRow("Sanskrit") << QStringLiteral("काचं शक्नोम्यत्तुम् । नोपहिनस्ति माम् ॥"); + QTest::newRow("Arabic") << QStringLiteral("أنا قادر على أكل الزجاج و هذا لا يؤلمني"); + QTest::newRow("Chinese") << QStringLiteral("我能吞下玻璃而不伤身体。"); + QTest::newRow("Thai") << QStringLiteral("ฉันกินกระจกได้ แต่มันไม่ทำให้ฉันเจ็บ"); + QTest::newRow("non BMP") << QStringLiteral("𝓹𝓸𝓹𝓹𝓵𝓮𝓻"); +} + +void TestUTFConversion::testUTF() +{ + char utf8Buf[1000]; + char *utf8String; + uint16_t utf16Buf[1000]; + uint16_t *utf16String; + int len; + + QFETCH(QString, s); + char *str = strdup(s.toUtf8().constData()); + + // UTF-8 to UTF-16 + + len = utf8CountUtf16CodeUnits(str); + QCOMPARE(len, s.size()); // QString size() returns number of code units, not code points + Q_ASSERT(len < (int)sizeof(utf16Buf)); // if this fails, make utf16Buf larger + + len = utf8ToUtf16(str, utf16Buf, sizeof(utf16Buf), INT_MAX); + QVERIFY(compare(utf16Buf, s.utf16())); + QCOMPARE(len, s.size()); + + utf16String = utf8ToUtf16(str); + QVERIFY(compare(utf16String, s.utf16())); + free(utf16String); + + std::string sUtf8(str); + std::string gsUtf16_a(utf8ToUtf16WithBom(sUtf8)); + std::unique_ptr gsUtf16_b(Poppler::QStringToUnicodeGooString(s)); + QCOMPARE(gsUtf16_b->cmp(gsUtf16_a), 0); + + // UTF-16 to UTF-8 + + len = utf16CountUtf8Bytes(s.utf16()); + QCOMPARE(len, (int)strlen(str)); + Q_ASSERT(len < (int)sizeof(utf8Buf)); // if this fails, make utf8Buf larger + + len = utf16ToUtf8(s.utf16(), utf8Buf); + QVERIFY(compare(utf8Buf, str)); + QCOMPARE(len, (int)strlen(str)); + + utf8String = utf16ToUtf8(s.utf16()); + QVERIFY(compare(utf8String, str)); + free(utf8String); + + free(str); +} + +void TestUTFConversion::testUnicodeToAscii7() +{ + globalParams = std::make_unique(); + + // Test string is one 'Registered' and twenty 'Copyright' chars + // so it's long enough to reproduce the bug given that glibc + // malloc() always returns 8-byte aligned memory addresses. + GooString *goo = Poppler::QStringToUnicodeGooString(QString::fromUtf8("®©©©©©©©©©©©©©©©©©©©©")); // clazy:exclude=qstring-allocations + + const std::vector in = TextStringToUCS4(goo->toStr()); + + delete goo; + + int in_norm_len; + int *in_norm_idx; + Unicode *in_norm = unicodeNormalizeNFKC(in.data(), in.size(), &in_norm_len, &in_norm_idx, true); + + Unicode *out; + int out_len; + int *out_ascii_idx; + + unicodeToAscii7(in_norm, in_norm_len, &out, &out_len, in_norm_idx, &out_ascii_idx); + + free(in_norm); + free(in_norm_idx); + + // ascii7 conversion: ® -> (R) © -> (c) + const char *expected_ascii = (char *)"(R)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)(c)"; + + QCOMPARE(out_len, (int)strlen(expected_ascii)); + QVERIFY(compare(out, expected_ascii, out_len)); + + free(out); + free(out_ascii_idx); +} + +void TestUTFConversion::testUnicodeLittleEndian() +{ + uint16_t UTF16LE_hi[5] { 0xFFFE, 0x4800, 0x4900, 0x2100, 0x1126 }; // UTF16-LE "HI!☑" + std::string GooUTF16LE(reinterpret_cast(UTF16LE_hi), sizeof(UTF16LE_hi)); + + uint16_t UTF16BE_hi[5] { 0xFEFF, 0x0048, 0x0049, 0x0021, 0x2611 }; // UTF16-BE "HI!☑" + std::string GooUTF16BE(reinterpret_cast(UTF16BE_hi), sizeof(UTF16BE_hi)); + + // Let's assert both GooString's are different + QVERIFY(GooUTF16LE != GooUTF16BE); + + const std::vector UCS4fromLE = TextStringToUCS4(GooUTF16LE); + const std::vector UCS4fromBE = TextStringToUCS4(GooUTF16BE); + + // len is 4 because TextStringToUCS4() removes the two leading Byte Order Mark (BOM) code points + QCOMPARE(UCS4fromLE.size(), UCS4fromBE.size()); + QCOMPARE(UCS4fromLE.size(), 4); + + // Check that now after conversion, UCS4fromLE and UCS4fromBE are now the same + for (size_t i = 0; i < UCS4fromLE.size(); i++) { + QCOMPARE(UCS4fromLE[i], UCS4fromBE[i]); + } + + const QString expected = QStringLiteral("HI!☑"); + + // Do some final verifications, checking the strings to be "HI!" + QVERIFY(UCS4fromLE == UCS4fromBE); + QVERIFY(compare(UCS4fromLE.data(), expected.utf16(), UCS4fromLE.size())); + QVERIFY(compare(UCS4fromBE.data(), expected.utf16(), UCS4fromBE.size())); +} + +QTEST_GUILESS_MAIN(TestUTFConversion) +#include "check_utf_conversion.moc" diff --git a/poppler-24.05.0/qt6/tests/poppler-attachments.cpp b/poppler-24.05.0/qt6/tests/poppler-attachments.cpp new file mode 100644 index 0000000000000000000000000000000000000000..b45b249d8ff9db667b08ecd568b997ca2d72ef1b --- /dev/null +++ b/poppler-24.05.0/qt6/tests/poppler-attachments.cpp @@ -0,0 +1,35 @@ +#include +#include + +#include + +#include + +int main(int argc, char **argv) +{ + QCoreApplication a(argc, argv); // QApplication required! + + if (!(argc == 2)) { + qWarning() << "usage: poppler-attachments filename"; + exit(1); + } + + std::unique_ptr doc = Poppler::Document::load(argv[1]); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + if (doc->hasEmbeddedFiles()) { + std::cout << "Embedded files: " << std::endl; + foreach (Poppler::EmbeddedFile *file, doc->embeddedFiles()) { + std::cout << " " << qPrintable(file->name()) << std::endl; + std::cout << " desc:" << qPrintable(file->description()) << std::endl; + QByteArray data = file->data(); + std::cout << " data: " << data.constData() << std::endl; + } + + } else { + std::cout << "There are no embedded document at the top level" << std::endl; + } +} diff --git a/poppler-24.05.0/qt6/tests/poppler-fonts.cpp b/poppler-24.05.0/qt6/tests/poppler-fonts.cpp new file mode 100644 index 0000000000000000000000000000000000000000..92f60b5d4ca722269c2a3a72f28c6ac896572122 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/poppler-fonts.cpp @@ -0,0 +1,86 @@ +#include +#include + +#include + +#include + +int main(int argc, char **argv) +{ + QCoreApplication a(argc, argv); // QApplication required! + + if (!(argc == 2)) { + qWarning() << "usage: poppler-fonts filename"; + exit(1); + } + + std::unique_ptr doc = Poppler::Document::load(argv[1]); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + std::cout << "name type emb sub font file"; + std::cout << std::endl; + std::cout << "------------------------------------ ------------ --- --- ---------"; + std::cout << std::endl; + + foreach (const Poppler::FontInfo &font, doc->fonts()) { + if (font.name().isNull()) { + std::cout << qPrintable(QStringLiteral("%1").arg(QStringLiteral("[none]"), -37)); + } else { + std::cout << qPrintable(QStringLiteral("%1").arg(font.name(), -37)); + } + switch (font.type()) { + case Poppler::FontInfo::unknown: + std::cout << "unknown "; + break; + case Poppler::FontInfo::Type1: + std::cout << "Type 1 "; + break; + case Poppler::FontInfo::Type1C: + std::cout << "Type 1C "; + break; + case Poppler::FontInfo::Type3: + std::cout << "Type 3 "; + break; + case Poppler::FontInfo::TrueType: + std::cout << "TrueType "; + break; + case Poppler::FontInfo::CIDType0: + std::cout << "CID Type 0 "; + break; + case Poppler::FontInfo::CIDType0C: + std::cout << "CID Type 0C "; + break; + case Poppler::FontInfo::CIDTrueType: + std::cout << "CID TrueType "; + break; + case Poppler::FontInfo::Type1COT: + std::cout << "Type 1C (OT) "; + break; + case Poppler::FontInfo::TrueTypeOT: + std::cout << "TrueType (OT) "; + break; + case Poppler::FontInfo::CIDType0COT: + std::cout << "CID Type 0C (OT) "; + break; + case Poppler::FontInfo::CIDTrueTypeOT: + std::cout << "CID TrueType (OT) "; + break; + } + + if (font.isEmbedded()) { + std::cout << "yes "; + } else { + std::cout << "no "; + } + if (font.isSubset()) { + std::cout << "yes "; + } else { + std::cout << "no "; + } + std::cout << qPrintable(font.file()); + std::cout << std::endl; + } +} diff --git a/poppler-24.05.0/qt6/tests/poppler-forms.cpp b/poppler-24.05.0/qt6/tests/poppler-forms.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f1b2d05c273b71ad0240cabc2679be58198ab79a --- /dev/null +++ b/poppler-24.05.0/qt6/tests/poppler-forms.cpp @@ -0,0 +1,273 @@ +#include +#include +#include + +#include + +#include +#include + +static std::ostream &operator<<(std::ostream &out, Poppler::FormField::FormType type) +{ + switch (type) { + case Poppler::FormField::FormButton: + out << "Button"; + break; + case Poppler::FormField::FormText: + out << "Text"; + break; + case Poppler::FormField::FormChoice: + out << "Choice"; + break; + case Poppler::FormField::FormSignature: + out << "Signature"; + break; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, Poppler::FormFieldButton::ButtonType type) +{ + switch (type) { + case Poppler::FormFieldButton::Push: + out << "Push"; + break; + case Poppler::FormFieldButton::CheckBox: + out << "CheckBox"; + break; + case Poppler::FormFieldButton::Radio: + out << "Radio"; + break; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, Poppler::FormFieldText::TextType type) +{ + switch (type) { + case Poppler::FormFieldText::Normal: + out << "Normal"; + break; + case Poppler::FormFieldText::Multiline: + out << "Multiline"; + break; + case Poppler::FormFieldText::FileSelect: + out << "FileSelect"; + break; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, Poppler::FormFieldChoice::ChoiceType type) +{ + switch (type) { + case Poppler::FormFieldChoice::ComboBox: + out << "ComboBox"; + break; + case Poppler::FormFieldChoice::ListBox: + out << "ListBox"; + break; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, Poppler::SignatureValidationInfo::SignatureStatus status) +{ + switch (status) { + case Poppler::SignatureValidationInfo::SignatureValid: + out << "Valid"; + break; + case Poppler::SignatureValidationInfo::SignatureInvalid: + out << "Invalid"; + break; + case Poppler::SignatureValidationInfo::SignatureDigestMismatch: + out << "DigestMismatch"; + break; + case Poppler::SignatureValidationInfo::SignatureDecodingError: + out << "DecodingError"; + break; + case Poppler::SignatureValidationInfo::SignatureGenericError: + out << "GenericError"; + break; + case Poppler::SignatureValidationInfo::SignatureNotFound: + out << "NotFound"; + break; + case Poppler::SignatureValidationInfo::SignatureNotVerified: + out << "NotVerifiedYet"; + break; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, Poppler::SignatureValidationInfo::CertificateStatus status) +{ + switch (status) { + case Poppler::SignatureValidationInfo::CertificateTrusted: + out << "Trusted"; + break; + case Poppler::SignatureValidationInfo::CertificateUntrustedIssuer: + out << "UntrustedIssuer"; + break; + case Poppler::SignatureValidationInfo::CertificateUnknownIssuer: + out << "UnknownIssuer"; + break; + case Poppler::SignatureValidationInfo::CertificateRevoked: + out << "Revoked"; + break; + case Poppler::SignatureValidationInfo::CertificateExpired: + out << "Expired"; + break; + case Poppler::SignatureValidationInfo::CertificateGenericError: + out << "GenericError"; + break; + case Poppler::SignatureValidationInfo::CertificateNotVerified: + out << "NotVerifiedYet"; + break; + case Poppler::SignatureValidationInfo::CertificateVerificationInProgress: + out << "InProgress"; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, Qt::Alignment alignment) +{ + switch (alignment) { + case Qt::AlignLeft: + out << "Left"; + break; + case Qt::AlignRight: + out << "Right"; + break; + case Qt::AlignHCenter: + out << "HCenter"; + break; + case Qt::AlignJustify: + out << "Justify"; + break; + case Qt::AlignTop: + out << "Top"; + break; + case Qt::AlignBottom: + out << "Bottom"; + break; + case Qt::AlignVCenter: + out << "VCenter"; + break; + case Qt::AlignCenter: + out << "Center"; + break; + case Qt::AlignAbsolute: + out << "Absolute"; + break; + } + return out; +} + +static std::ostream &operator<<(std::ostream &out, const QString &string) +{ + out << string.toUtf8().constData(); + return out; +} + +static std::ostream &operator<<(std::ostream &out, const QRectF &rect) +{ + out << QStringLiteral("top: %1 left: %2 width: %3 height: %4").arg(rect.x()).arg(rect.y()).arg(rect.width()).arg(rect.height()); + return out; +} + +template +std::ostream &operator<<(std::ostream &out, const QList &elems) +{ + bool isFirst = true; + for (int i = 0; i < elems.count(); ++i) { + if (!isFirst) { + out << " "; + } + out << elems[i]; + isFirst = false; + } + return out; +} + +int main(int argc, char **argv) +{ + QCoreApplication a(argc, argv); + + if (!(argc == 2)) { + qWarning() << "usage: poppler-forms filename"; + exit(1); + } + + std::unique_ptr doc = Poppler::Document::load(argv[1]); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + std::cout << "Forms for file " << argv[1] << std::endl; + for (int i = 0; i < doc->numPages(); ++i) { + std::unique_ptr page = doc->page(i); + if (page) { + std::vector> forms = page->formFields(); + std::cout << "\tPage " << i + 1 << std::endl; + for (const std::unique_ptr &form : forms) { + std::cout << "\t\tForm" << std::endl; + std::cout << "\t\t\tType: " << form->type() << std::endl; + std::cout << "\t\t\tRect: " << form->rect() << std::endl; + std::cout << "\t\t\tID: " << form->id() << std::endl; + std::cout << "\t\t\tName: " << form->name() << std::endl; + std::cout << "\t\t\tFullyQualifiedName: " << form->fullyQualifiedName() << std::endl; + std::cout << "\t\t\tUIName: " << form->uiName() << std::endl; + std::cout << "\t\t\tReadOnly: " << form->isReadOnly() << std::endl; + std::cout << "\t\t\tVisible: " << form->isVisible() << std::endl; + switch (form->type()) { + case Poppler::FormField::FormButton: { + const Poppler::FormFieldButton *buttonForm = static_cast(form.get()); + std::cout << "\t\t\tButtonType: " << buttonForm->buttonType() << std::endl; + std::cout << "\t\t\tCaption: " << buttonForm->caption() << std::endl; + std::cout << "\t\t\tState: " << buttonForm->state() << std::endl; + std::cout << "\t\t\tSiblings: " << buttonForm->siblings() << std::endl; + } break; + + case Poppler::FormField::FormText: { + const Poppler::FormFieldText *textForm = static_cast(form.get()); + std::cout << "\t\t\tTextType: " << textForm->textType() << std::endl; + std::cout << "\t\t\tText: " << textForm->text() << std::endl; + std::cout << "\t\t\tIsPassword: " << textForm->isPassword() << std::endl; + std::cout << "\t\t\tIsRichText: " << textForm->isRichText() << std::endl; + std::cout << "\t\t\tMaximumLength: " << textForm->maximumLength() << std::endl; + std::cout << "\t\t\tTextAlignment: " << textForm->textAlignment() << std::endl; + std::cout << "\t\t\tCanBeSpellChecked: " << textForm->canBeSpellChecked() << std::endl; + } break; + + case Poppler::FormField::FormChoice: { + const Poppler::FormFieldChoice *choiceForm = static_cast(form.get()); + std::cout << "\t\t\tChoiceType: " << choiceForm->choiceType() << std::endl; + std::cout << "\t\t\tChoices: " << choiceForm->choices() << std::endl; + std::cout << "\t\t\tIsEditable: " << choiceForm->isEditable() << std::endl; + std::cout << "\t\t\tIsMultiSelect: " << choiceForm->multiSelect() << std::endl; + std::cout << "\t\t\tCurrentChoices: " << choiceForm->currentChoices() << std::endl; + std::cout << "\t\t\tEditChoice: " << choiceForm->editChoice() << std::endl; + std::cout << "\t\t\tTextAlignment: " << choiceForm->textAlignment() << std::endl; + std::cout << "\t\t\tCanBeSpellChecked: " << choiceForm->canBeSpellChecked() << std::endl; + } break; + + case Poppler::FormField::FormSignature: { + const Poppler::FormFieldSignature *signatureForm = static_cast(form.get()); + const Poppler::SignatureValidationInfo svi = signatureForm->validate(Poppler::FormFieldSignature::ValidateVerifyCertificate); + std::cout << "\t\t\tSignatureStatus: " << svi.signatureStatus() << std::endl; + std::cout << "\t\t\tCertificateStatus: " << svi.certificateStatus() << std::endl; + if (svi.signerName().isEmpty() == false) { + std::cout << "\t\t\tSignerName: " << svi.signerName() << std::endl; + } else { + std::cout << "\t\t\tSignerName: " + << "(null)" << std::endl; + } + const QDateTime sviTime = QDateTime::fromSecsSinceEpoch(svi.signingTime(), Qt::UTC); + std::cout << "\t\t\tSigningTime: " << sviTime.toString() << std::endl; + } break; + } + } + } + } +} diff --git a/poppler-24.05.0/qt6/tests/poppler-page-labels.cpp b/poppler-24.05.0/qt6/tests/poppler-page-labels.cpp new file mode 100644 index 0000000000000000000000000000000000000000..98b2641955861fdada4da5a4f72c416cb256631f --- /dev/null +++ b/poppler-24.05.0/qt6/tests/poppler-page-labels.cpp @@ -0,0 +1,47 @@ +#include +#include + +#include +#include + +#include + +int main(int argc, char **argv) +{ + QCoreApplication a(argc, argv); // QApplication required! + + if (!(argc == 2)) { + qWarning() << "usage: poppler-page-labels filename"; + exit(1); + } + + std::unique_ptr doc = Poppler::Document::load(argv[1]); + if (!doc || doc->isLocked()) { + qWarning() << "doc not loaded"; + exit(1); + } + + for (int i = 0; i < doc->numPages(); i++) { + int j = 0; + std::cout << "*** Label of Page " << i << std::endl; + std::cout << std::flush; + + std::unique_ptr page(doc->page(i)); + + if (!page) { + continue; + } + + const QByteArray utf8str = page->label().toUtf8(); + for (j = 0; j < utf8str.size(); j++) { + std::cout << utf8str[j]; + } + std::cout << std::endl; + + std::unique_ptr pageFromPageLabel(doc->page(page->label())); + const int indexFromPageLabel = pageFromPageLabel ? pageFromPageLabel->index() : -1; + if (indexFromPageLabel != i) { + std::cout << "WARNING: Page label didn't link back to the same page index " << indexFromPageLabel << " " << i << std::endl; + } + } +} diff --git a/poppler-24.05.0/qt6/tests/poppler-texts.cpp b/poppler-24.05.0/qt6/tests/poppler-texts.cpp new file mode 100644 index 0000000000000000000000000000000000000000..faebb095502db64b6ed8f1cc12d870c31161bf28 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/poppler-texts.cpp @@ -0,0 +1,36 @@ +#include +#include + +#include + +#include + +int main(int argc, char **argv) +{ + QCoreApplication a(argc, argv); // QApplication required! + + if (!(argc == 2)) { + qWarning() << "usage: poppler-texts filename"; + exit(1); + } + + std::unique_ptr doc = Poppler::Document::load(argv[1]); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + for (int i = 0; i < doc->numPages(); i++) { + int j = 0; + std::cout << "*** Page " << i << std::endl; + std::cout << std::flush; + + std::unique_ptr page = doc->page(i); + const QByteArray utf8str = page->text(QRectF(), Poppler::Page::RawOrderLayout).toUtf8(); + std::cout << std::flush; + for (j = 0; j < utf8str.size(); j++) { + std::cout << utf8str[j]; + } + std::cout << std::endl; + } +} diff --git a/poppler-24.05.0/qt6/tests/stress-poppler-dir.cpp b/poppler-24.05.0/qt6/tests/stress-poppler-dir.cpp new file mode 100644 index 0000000000000000000000000000000000000000..3f05444af2477083797977378baa8983f1cdeda5 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/stress-poppler-dir.cpp @@ -0,0 +1,63 @@ +#include +#include +#include +#include +#include + +#include + +#include + +int main(int argc, char **argv) +{ + QApplication a(argc, argv); // QApplication required! + + QElapsedTimer t; + t.start(); + + QDir directory(argv[1]); + foreach (const QString &fileName, directory.entryList()) { + if (fileName.endsWith(QStringLiteral("pdf"))) { + qDebug() << "Doing" << fileName.toLatin1().data() << ":"; + std::unique_ptr doc = Poppler::Document::load(directory.canonicalPath() + "/" + fileName); + if (!doc) { + qWarning() << "doc not loaded"; + } else if (doc->isLocked()) { + if (!doc->unlock("", "password")) { + qWarning() << "couldn't unlock document"; + } + } else { + auto pdfVersion = doc->getPdfVersion(); + Q_UNUSED(pdfVersion); + doc->info(QStringLiteral("Title")); + doc->info(QStringLiteral("Subject")); + doc->info(QStringLiteral("Author")); + doc->info(QStringLiteral("Keywords")); + doc->info(QStringLiteral("Creator")); + doc->info(QStringLiteral("Producer")); + doc->date(QStringLiteral("CreationDate")).toString(); + doc->date(QStringLiteral("ModDate")).toString(); + doc->numPages(); + doc->isLinearized(); + doc->isEncrypted(); + doc->okToPrint(); + doc->okToCopy(); + doc->okToChange(); + doc->okToAddNotes(); + doc->pageMode(); + + for (int index = 0; index < doc->numPages(); ++index) { + std::unique_ptr page = doc->page(index); + page->renderToImage(); + page->pageSize(); + page->orientation(); + std::cout << "."; + std::cout.flush(); + } + std::cout << std::endl; + } + } + } + + std::cout << "Elapsed time: " << (t.elapsed() / 1000) << "seconds" << std::endl; +} diff --git a/poppler-24.05.0/qt6/tests/stress-poppler-qt6.cpp b/poppler-24.05.0/qt6/tests/stress-poppler-qt6.cpp new file mode 100644 index 0000000000000000000000000000000000000000..f613b8277800f13d0dacb68cfbcf10bd02d5d14f --- /dev/null +++ b/poppler-24.05.0/qt6/tests/stress-poppler-qt6.cpp @@ -0,0 +1,72 @@ +#include +#include +#include +#include +#include + +#include + +#include + +int main(int argc, char **argv) +{ + QApplication a(argc, argv); // QApplication required! + + Q_UNUSED(argc); + Q_UNUSED(argv); + + QElapsedTimer t; + t.start(); + QDir dbDir(QStringLiteral("./pdfdb")); + if (!dbDir.exists()) { + qWarning() << "Database directory does not exist"; + } + + QStringList excludeSubDirs; + excludeSubDirs << QStringLiteral("000048") << QStringLiteral("000607"); + + const QStringList dirs = dbDir.entryList(QStringList() << QStringLiteral("0000*"), QDir::Dirs); + foreach (const QString &subdir, dirs) { + if (excludeSubDirs.contains(subdir)) { + // then skip it + } else { + QString path = "./pdfdb/" + subdir + "/data.pdf"; + std::cout << "Doing " << path.toLatin1().data() << " :"; + std::unique_ptr doc = Poppler::Document::load(path); + if (!doc) { + qWarning() << "doc not loaded"; + } else { + auto pdfVersion = doc->getPdfVersion(); + Q_UNUSED(pdfVersion); + doc->info(QStringLiteral("Title")); + doc->info(QStringLiteral("Subject")); + doc->info(QStringLiteral("Author")); + doc->info(QStringLiteral("Keywords")); + doc->info(QStringLiteral("Creator")); + doc->info(QStringLiteral("Producer")); + doc->date(QStringLiteral("CreationDate")).toString(); + doc->date(QStringLiteral("ModDate")).toString(); + doc->numPages(); + doc->isLinearized(); + doc->isEncrypted(); + doc->okToPrint(); + doc->okToCopy(); + doc->okToChange(); + doc->okToAddNotes(); + doc->pageMode(); + + for (int index = 0; index < doc->numPages(); ++index) { + std::unique_ptr page = doc->page(index); + page->renderToImage(); + page->pageSize(); + page->orientation(); + std::cout << "."; + std::cout.flush(); + } + std::cout << std::endl; + } + } + } + + std::cout << "Elapsed time: " << (t.elapsed() / 1000) << std::endl; +} diff --git a/poppler-24.05.0/qt6/tests/stress-threads-qt6.cpp b/poppler-24.05.0/qt6/tests/stress-threads-qt6.cpp new file mode 100644 index 0000000000000000000000000000000000000000..11887652fc36feb5ed3d5bb66ea0f7dc3e9378fc --- /dev/null +++ b/poppler-24.05.0/qt6/tests/stress-threads-qt6.cpp @@ -0,0 +1,268 @@ + +#ifndef _WIN32 +# include +#else +# include +# define sleep Sleep +#endif +#include + +#include +#include + +#include +#include +#include +#include +#include +#include + +class SillyThread : public QThread +{ + Q_OBJECT +public: + explicit SillyThread(Poppler::Document *document, QObject *parent = nullptr); + + void run() override; + +private: + Poppler::Document *m_document; + std::vector> m_pages; +}; + +class CrazyThread : public QThread +{ + Q_OBJECT +public: + CrazyThread(Poppler::Document *document, QMutex *annotationMutex, QObject *parent = nullptr); + + void run() override; + +private: + Poppler::Document *m_document; + QMutex *m_annotationMutex; +}; + +static std::unique_ptr loadPage(Poppler::Document *document, int index) +{ + std::unique_ptr page = document->page(index); + + if (page == nullptr) { + qDebug() << "!Document::page"; + + exit(EXIT_FAILURE); + } + + return page; +} + +static std::unique_ptr loadRandomPage(Poppler::Document *document) +{ + return loadPage(document, QRandomGenerator::global()->bounded(document->numPages())); +} + +SillyThread::SillyThread(Poppler::Document *document, QObject *parent) : QThread(parent), m_document(document), m_pages() +{ + m_pages.reserve(m_document->numPages()); + + for (int index = 0; index < m_document->numPages(); ++index) { + m_pages.push_back(loadPage(m_document, index)); + } +} + +void SillyThread::run() +{ + forever { + for (std::unique_ptr &page : m_pages) { + QImage image = page->renderToImage(); + + if (image.isNull()) { + qDebug() << "!Page::renderToImage"; + + ::exit(EXIT_FAILURE); + } + } + } +} + +CrazyThread::CrazyThread(Poppler::Document *document, QMutex *annotationMutex, QObject *parent) : QThread(parent), m_document(document), m_annotationMutex(annotationMutex) { } + +void CrazyThread::run() +{ + typedef std::unique_ptr PagePointer; + + forever { + if (QRandomGenerator::global()->bounded(2) == 0) { + qDebug() << "search..."; + + PagePointer page(loadRandomPage(m_document)); + + page->search(QStringLiteral("c"), Poppler::Page::IgnoreCase); + page->search(QStringLiteral("r")); + page->search(QStringLiteral("a"), Poppler::Page::IgnoreCase); + page->search(QStringLiteral("z")); + page->search(QStringLiteral("y"), Poppler::Page::IgnoreCase); + } + + if (QRandomGenerator::global()->bounded(2) == 0) { + qDebug() << "links..."; + + PagePointer page(loadRandomPage(m_document)); + + std::vector> links = page->links(); + } + + if (QRandomGenerator::global()->bounded(2) == 0) { + qDebug() << "form fields..."; + + PagePointer page(loadRandomPage(m_document)); + + std::vector> formFields = page->formFields(); + } + + if (QRandomGenerator::global()->bounded(2) == 0) { + qDebug() << "thumbnail..."; + + PagePointer page(loadRandomPage(m_document)); + + page->thumbnail(); + } + + if (QRandomGenerator::global()->bounded(2) == 0) { + qDebug() << "text..."; + + PagePointer page(loadRandomPage(m_document)); + + page->text(QRectF(QPointF(), page->pageSizeF())); + } + + if (QRandomGenerator::global()->bounded(2) == 0) { + QMutexLocker mutexLocker(m_annotationMutex); + + qDebug() << "add annotation..."; + + PagePointer page(loadRandomPage(m_document)); + + Poppler::Annotation *annotation = nullptr; + + switch (QRandomGenerator::global()->bounded(3)) { + default: + case 0: + annotation = new Poppler::TextAnnotation(QRandomGenerator::global()->bounded(2) == 0 ? Poppler::TextAnnotation::Linked : Poppler::TextAnnotation::InPlace); + break; + case 1: + annotation = new Poppler::HighlightAnnotation(); + break; + case 2: + annotation = new Poppler::InkAnnotation(); + break; + } + + annotation->setBoundary(QRectF(0.0, 0.0, 0.5, 0.5)); + annotation->setContents(QStringLiteral("crazy")); + + page->addAnnotation(annotation); + + delete annotation; + } + + if (QRandomGenerator::global()->bounded(2) == 0) { + QMutexLocker mutexLocker(m_annotationMutex); + + for (int index = 0; index < m_document->numPages(); ++index) { + PagePointer page(loadPage(m_document, index)); + + std::vector> annotations = page->annotations(); + + if (!annotations.empty()) { + qDebug() << "modify annotation..."; + + // size is now a qsizetype which confuses bounded(), pretend we will never have that many annotations anyway + const quint32 annotationsSize = annotations.size(); + annotations.at(QRandomGenerator::global()->bounded(annotationsSize))->setBoundary(QRectF(0.5, 0.5, 0.25, 0.25)); + annotations.at(QRandomGenerator::global()->bounded(annotationsSize))->setAuthor(QStringLiteral("foo")); + annotations.at(QRandomGenerator::global()->bounded(annotationsSize))->setContents(QStringLiteral("bar")); + annotations.at(QRandomGenerator::global()->bounded(annotationsSize))->setCreationDate(QDateTime::currentDateTime()); + annotations.at(QRandomGenerator::global()->bounded(annotationsSize))->setModificationDate(QDateTime::currentDateTime()); + } + + if (!annotations.empty()) { + break; + } + } + } + + if (QRandomGenerator::global()->bounded(2) == 0) { + QMutexLocker mutexLocker(m_annotationMutex); + + for (int index = 0; index < m_document->numPages(); ++index) { + PagePointer page(loadPage(m_document, index)); + + std::vector> annotations = page->annotations(); + + if (!annotations.empty()) { + qDebug() << "remove annotation..."; + + // size is now a qsizetype which confuses bounded(), pretend we will never have that many annotations anyway + const quint32 annotationsSize = annotations.size(); + page->removeAnnotation(annotations[QRandomGenerator::global()->bounded(annotationsSize)].get()); + annotations.erase(annotations.begin() + QRandomGenerator::global()->bounded(annotationsSize)); + } + + if (!annotations.empty()) { + break; + } + } + } + + if (QRandomGenerator::global()->bounded(2) == 0) { + qDebug() << "fonts..."; + + m_document->fonts(); + } + } +} + +int main(int argc, char **argv) +{ + if (argc < 5) { + qDebug() << "usage: stress-threads-qt duration sillyCount crazyCount file(s)"; + + return EXIT_FAILURE; + } + + const int duration = atoi(argv[1]); + const int sillyCount = atoi(argv[2]); + const int crazyCount = atoi(argv[3]); + + for (int argi = 4; argi < argc; ++argi) { + const QString file = QFile::decodeName(argv[argi]); + std::unique_ptr document = Poppler::Document::load(file); + + if (document == nullptr) { + qDebug() << "Could not load" << file; + continue; + } + + if (document->isLocked()) { + qDebug() << file << "is locked"; + continue; + } + + for (int i = 0; i < sillyCount; ++i) { + (new SillyThread(document.get()))->start(); + } + + QMutex *annotationMutex = new QMutex(); + + for (int i = 0; i < crazyCount; ++i) { + (new CrazyThread(document.get(), annotationMutex))->start(); + } + } + + sleep(duration); + + return EXIT_SUCCESS; +} + +#include "stress-threads-qt6.moc" diff --git a/poppler-24.05.0/qt6/tests/test-password-qt6.cpp b/poppler-24.05.0/qt6/tests/test-password-qt6.cpp new file mode 100644 index 0000000000000000000000000000000000000000..339e75f2d3279b4a9d64a7b8dd789f40220e06dc --- /dev/null +++ b/poppler-24.05.0/qt6/tests/test-password-qt6.cpp @@ -0,0 +1,127 @@ +#include +#include +#include +#include +#include +#include + +#include + +class PDFDisplay : public QWidget // picture display widget +{ + Q_OBJECT +public: + explicit PDFDisplay(std::unique_ptr &&d, QWidget *parent = nullptr); + ~PDFDisplay() override; + +protected: + void paintEvent(QPaintEvent *) override; + void keyPressEvent(QKeyEvent *) override; + +private: + void display(); + int m_currentPage; + QImage image; + std::unique_ptr doc; +}; + +PDFDisplay::PDFDisplay(std::unique_ptr &&d, QWidget *parent) : QWidget(parent) +{ + doc = std::move(d); + m_currentPage = 0; + display(); +} + +void PDFDisplay::display() +{ + if (doc) { + std::unique_ptr page = doc->page(m_currentPage); + if (page) { + qDebug() << "Displaying page: " << m_currentPage; + image = page->renderToImage(); + update(); + } + } else { + qWarning() << "doc not loaded"; + } +} + +PDFDisplay::~PDFDisplay() { } + +void PDFDisplay::paintEvent(QPaintEvent *e) +{ + QPainter paint(this); // paint widget + if (!image.isNull()) { + paint.drawImage(0, 0, image); + } else { + qWarning() << "null image"; + } +} + +void PDFDisplay::keyPressEvent(QKeyEvent *e) +{ + if (e->key() == Qt::Key_Down) { + if (m_currentPage + 1 < doc->numPages()) { + m_currentPage++; + display(); + } + } else if (e->key() == Qt::Key_Up) { + if (m_currentPage > 0) { + m_currentPage--; + display(); + } + } else if (e->key() == Qt::Key_Q) { + exit(0); + } +} + +int main(int argc, char **argv) +{ + QApplication a(argc, argv); // QApplication required! + + if (argc != 3) { + qWarning() << "usage: test-password-qt6 owner-password filename"; + exit(1); + } + + std::unique_ptr doc = Poppler::Document::load(argv[2], argv[1]); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + // output some meta-data + auto pdfVersion = doc->getPdfVersion(); + qDebug() << " PDF Version: " << qPrintable(QStringLiteral("%1.%2").arg(pdfVersion.major).arg(pdfVersion.minor)); + qDebug() << " Title: " << doc->info(QStringLiteral("Title")); + qDebug() << " Subject: " << doc->info(QStringLiteral("Subject")); + qDebug() << " Author: " << doc->info(QStringLiteral("Author")); + qDebug() << " Key words: " << doc->info(QStringLiteral("Keywords")); + qDebug() << " Creator: " << doc->info(QStringLiteral("Creator")); + qDebug() << " Producer: " << doc->info(QStringLiteral("Producer")); + qDebug() << " Date created: " << doc->date(QStringLiteral("CreationDate")).toString(); + qDebug() << " Date modified: " << doc->date(QStringLiteral("ModDate")).toString(); + qDebug() << "Number of pages: " << doc->numPages(); + qDebug() << " Linearised: " << doc->isLinearized(); + qDebug() << " Encrypted: " << doc->isEncrypted(); + qDebug() << " OK to print: " << doc->okToPrint(); + qDebug() << " OK to copy: " << doc->okToCopy(); + qDebug() << " OK to change: " << doc->okToChange(); + qDebug() << "OK to add notes: " << doc->okToAddNotes(); + qDebug() << " Page mode: " << doc->pageMode(); + QStringList fontNameList; + foreach (const Poppler::FontInfo &font, doc->fonts()) + fontNameList += font.name(); + qDebug() << " Fonts: " << fontNameList.join(QStringLiteral(", ")); + + std::unique_ptr page = doc->page(0); + qDebug() << " Page 1 size: " << page->pageSize().width() / 72 << "inches x " << page->pageSize().height() / 72 << "inches"; + + PDFDisplay test(std::move(doc)); // create picture display + test.setWindowTitle(QStringLiteral("Poppler-Qt6 Test")); + test.show(); // show it + + return a.exec(); // start event loop +} + +#include "test-password-qt6.moc" diff --git a/poppler-24.05.0/qt6/tests/test-poppler-qt6.cpp b/poppler-24.05.0/qt6/tests/test-poppler-qt6.cpp new file mode 100644 index 0000000000000000000000000000000000000000..c69a987c5df8e0459264e264d96bc2a3e94b9951 --- /dev/null +++ b/poppler-24.05.0/qt6/tests/test-poppler-qt6.cpp @@ -0,0 +1,208 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +class PDFDisplay : public QWidget // picture display widget +{ + Q_OBJECT +public: + PDFDisplay(std::unique_ptr &&d, bool qpainter, QWidget *parent = nullptr); + ~PDFDisplay() override; + void setShowTextRects(bool show); + void display(); + +protected: + void paintEvent(QPaintEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void mousePressEvent(QMouseEvent *) override; + +private: + int m_currentPage; + QImage image; + std::unique_ptr doc; + QString backendString; + bool showTextRects; + std::vector> textRects; +}; + +PDFDisplay::PDFDisplay(std::unique_ptr &&d, bool qpainter, QWidget *parent) : QWidget(parent) +{ + showTextRects = false; + doc = std::move(d); + m_currentPage = 0; + if (qpainter) { + backendString = QStringLiteral("QPainter"); + doc->setRenderBackend(Poppler::Document::QPainterBackend); + } else { + backendString = QStringLiteral("Splash"); + doc->setRenderBackend(Poppler::Document::SplashBackend); + } + doc->setRenderHint(Poppler::Document::Antialiasing, true); + doc->setRenderHint(Poppler::Document::TextAntialiasing, true); +} + +void PDFDisplay::setShowTextRects(bool show) +{ + showTextRects = show; +} + +void PDFDisplay::display() +{ + if (doc) { + std::unique_ptr page = doc->page(m_currentPage); + if (page) { + qDebug() << "Displaying page using" << backendString << "backend: " << m_currentPage; + QTime t = QTime::currentTime(); + image = page->renderToImage(); + qDebug() << "Rendering took" << t.msecsTo(QTime::currentTime()) << "msecs"; + if (showTextRects) { + QPainter painter(&image); + painter.setPen(Qt::red); + textRects = page->textList(); + for (const std::unique_ptr &tb : textRects) { + painter.drawRect(tb->boundingBox()); + } + } else { + textRects.clear(); + } + update(); + } + } else { + qWarning() << "doc not loaded"; + } +} + +PDFDisplay::~PDFDisplay() { } + +void PDFDisplay::paintEvent(QPaintEvent *e) +{ + QPainter paint(this); // paint widget + if (!image.isNull()) { + paint.drawImage(0, 0, image); + } else { + qWarning() << "null image"; + } +} + +void PDFDisplay::keyPressEvent(QKeyEvent *e) +{ + if (e->key() == Qt::Key_Down) { + if (m_currentPage + 1 < doc->numPages()) { + m_currentPage++; + display(); + } + } else if (e->key() == Qt::Key_Up) { + if (m_currentPage > 0) { + m_currentPage--; + display(); + } + } else if (e->key() == Qt::Key_Q) { + exit(0); + } +} + +void PDFDisplay::mousePressEvent(QMouseEvent *e) +{ + int i = 0; + for (const std::unique_ptr &tb : textRects) { + if (tb->boundingBox().contains(e->pos())) { + const QString tt = QStringLiteral("Text: \"%1\"\nIndex in text list: %2").arg(tb->text()).arg(i); + QToolTip::showText(e->globalPosition().toPoint(), tt, this); + break; + } + ++i; + } +} + +int main(int argc, char **argv) +{ + QApplication a(argc, argv); // QApplication required! + + if (argc < 2 || (argc == 3 && strcmp(argv[2], "-extract") != 0 && strcmp(argv[2], "-qpainter") != 0 && strcmp(argv[2], "-textRects") != 0) || argc > 3) { + // use argument as file name + qWarning() << "usage: test-poppler-qt6 filename [-extract|-qpainter|-textRects]"; + exit(1); + } + + std::unique_ptr doc = Poppler::Document::load(QFile::decodeName(argv[1])); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + if (doc->isLocked()) { + qWarning() << "document locked (needs password)"; + exit(0); + } + + // output some meta-data + auto pdfVersion = doc->getPdfVersion(); + qDebug() << " PDF Version: " << qPrintable(QStringLiteral("%1.%2").arg(pdfVersion.major).arg(pdfVersion.minor)); + qDebug() << " Title: " << doc->info(QStringLiteral("Title")); + qDebug() << " Subject: " << doc->info(QStringLiteral("Subject")); + qDebug() << " Author: " << doc->info(QStringLiteral("Author")); + qDebug() << " Key words: " << doc->info(QStringLiteral("Keywords")); + qDebug() << " Creator: " << doc->info(QStringLiteral("Creator")); + qDebug() << " Producer: " << doc->info(QStringLiteral("Producer")); + qDebug() << " Date created: " << doc->date(QStringLiteral("CreationDate")).toString(); + qDebug() << " Date modified: " << doc->date(QStringLiteral("ModDate")).toString(); + qDebug() << "Number of pages: " << doc->numPages(); + qDebug() << " Linearised: " << doc->isLinearized(); + qDebug() << " Encrypted: " << doc->isEncrypted(); + qDebug() << " OK to print: " << doc->okToPrint(); + qDebug() << " OK to copy: " << doc->okToCopy(); + qDebug() << " OK to change: " << doc->okToChange(); + qDebug() << "OK to add notes: " << doc->okToAddNotes(); + qDebug() << " Page mode: " << doc->pageMode(); + qDebug() << " Metadata: " << doc->metadata(); + + if (doc->hasEmbeddedFiles()) { + qDebug() << "Embedded files:"; + foreach (Poppler::EmbeddedFile *file, doc->embeddedFiles()) { + qDebug() << " " << file->name(); + } + qDebug(); + } else { + qDebug() << "No embedded files"; + } + + if (doc->numPages() <= 0) { + qDebug() << "Doc has no pages"; + return 0; + } + + { + std::unique_ptr page = doc->page(0); + if (page) { + qDebug() << "Page 1 size: " << page->pageSize().width() / 72 << "inches x " << page->pageSize().height() / 72 << "inches"; + } + } + + if (argc == 2 || (argc == 3 && strcmp(argv[2], "-qpainter") == 0) || (argc == 3 && strcmp(argv[2], "-textRects") == 0)) { + bool useQPainter = (argc == 3 && strcmp(argv[2], "-qpainter") == 0); + PDFDisplay test(std::move(doc), useQPainter); // create picture display + test.setWindowTitle(QStringLiteral("Poppler-Qt6 Test")); + test.setShowTextRects(argc == 3 && strcmp(argv[2], "-textRects") == 0); + test.display(); + test.show(); // show it + + return a.exec(); // start event loop + } else { + std::unique_ptr page = doc->page(0); + + QLabel *l = new QLabel(page->text(QRectF()), nullptr); + l->show(); + return a.exec(); + } +} + +#include "test-poppler-qt6.moc" diff --git a/poppler-24.05.0/qt6/tests/test-render-to-file.cpp b/poppler-24.05.0/qt6/tests/test-render-to-file.cpp new file mode 100644 index 0000000000000000000000000000000000000000..a60e6c5e6e4e3109c0fc9c6565be9bfb438857be --- /dev/null +++ b/poppler-24.05.0/qt6/tests/test-render-to-file.cpp @@ -0,0 +1,57 @@ +#include +#include +#include +#include + +#include + +int main(int argc, char **argv) +{ + QGuiApplication a(argc, argv); // QApplication required! + + if (argc < 2 || (argc == 3 && strcmp(argv[2], "-qpainter") != 0) || argc > 3) { + // use argument as file name + qWarning() << "usage: test-render-to-file-qt6 filename [-qpainter]"; + exit(1); + } + + std::unique_ptr doc = Poppler::Document::load(QFile::decodeName(argv[1])); + if (!doc) { + qWarning() << "doc not loaded"; + exit(1); + } + + if (doc->isLocked()) { + qWarning() << "document locked (needs password)"; + exit(0); + } + + if (doc->numPages() <= 0) { + qDebug() << "Doc has no pages"; + return 0; + } + + QString backendString; + if (argc == 3 && strcmp(argv[2], "-qpainter") == 0) { + backendString = QStringLiteral("QPainter"); + doc->setRenderBackend(Poppler::Document::QPainterBackend); + } else { + backendString = QStringLiteral("Splash"); + doc->setRenderBackend(Poppler::Document::SplashBackend); + } + doc->setRenderHint(Poppler::Document::Antialiasing, true); + doc->setRenderHint(Poppler::Document::TextAntialiasing, true); + + for (int i = 0; i < doc->numPages(); ++i) { + std::unique_ptr page = doc->page(i); + if (page) { + qDebug() << "Rendering page using" << backendString << "backend: " << i; + QTime t = QTime::currentTime(); + QImage image = page->renderToImage(); + qDebug() << "Rendering took" << t.msecsTo(QTime::currentTime()) << "msecs"; + image.save(QStringLiteral("test-render-to-file%1.png").arg(i)); + } + } + + return 0; +} diff --git a/poppler-24.05.0/splash/Splash.cc b/poppler-24.05.0/splash/Splash.cc new file mode 100644 index 0000000000000000000000000000000000000000..5b247ece34e10bf93133eb4e82078feb21dc8e97 --- /dev/null +++ b/poppler-24.05.0/splash/Splash.cc @@ -0,0 +1,6487 @@ +//======================================================================== +// +// Splash.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2005-2023 Albert Astals Cid +// Copyright (C) 2005 Marco Pesenti Gritti +// Copyright (C) 2010-2016 Thomas Freitag +// Copyright (C) 2010 Christian Feuersänger +// Copyright (C) 2011-2013, 2015 William Bader +// Copyright (C) 2012 Markus Trippelsdorf +// Copyright (C) 2012, 2017 Adrian Johnson +// Copyright (C) 2012 Matthias Kramm +// Copyright (C) 2018, 2019 Stefan Brüns +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019, 2020 Oliver Sander +// Copyright (C) 2019 Marek Kasik +// Copyright (C) 2020 Tobias Deiminger +// Copyright (C) 2021, 2024 Even Rouault +// +// 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 + +#include +#include +#include +#include +#include +#include "goo/gmem.h" +#include "goo/GooLikely.h" +#include "poppler/GfxState.h" +#include "poppler/Error.h" +#include "SplashErrorCodes.h" +#include "SplashMath.h" +#include "SplashBitmap.h" +#include "SplashState.h" +#include "SplashPath.h" +#include "SplashXPath.h" +#include "SplashXPathScanner.h" +#include "SplashPattern.h" +#include "SplashScreen.h" +#include "SplashFont.h" +#include "SplashGlyphBitmap.h" +#include "Splash.h" +#include + +// the MSVC math.h doesn't define this +#ifndef M_PI +# define M_PI 3.14159265358979323846 +#endif + +//------------------------------------------------------------------------ + +#define splashAAGamma 1.5 + +// distance of Bezier control point from center for circle approximation +// = (4 * (sqrt(2) - 1) / 3) * r +#define bezierCircle ((SplashCoord)0.55228475) +#define bezierCircle2 ((SplashCoord)(0.5 * 0.55228475)) + +// Divide a 16-bit value (in [0, 255*255]) by 255, returning an 8-bit result. +static inline unsigned char div255(int x) +{ + return (unsigned char)((x + (x >> 8) + 0x80) >> 8); +} + +// Clip x to lie in [0, 255]. +static inline unsigned char clip255(int x) +{ + return x < 0 ? 0 : x > 255 ? 255 : x; +} + +template +inline void Guswap(T &a, T &b) +{ + T tmp = a; + a = b; + b = tmp; +} + +// The PDF spec says that all pixels whose *centers* lie within the +// image target region get painted, so we want to round n+0.5 down to +// n. But this causes problems, e.g., with PDF files that fill a +// rectangle with black and then draw an image to the exact same +// rectangle, so we instead use the fill scan conversion rule. +// However, the correct rule works better for glyphs, so we also +// provide that option in fillImageMask. +#if 0 +static inline int imgCoordMungeLower(SplashCoord x) { + return splashCeil(x + 0.5) - 1; +} +static inline int imgCoordMungeUpper(SplashCoord x) { + return splashCeil(x + 0.5) - 1; +} +#else +static inline int imgCoordMungeLower(SplashCoord x) +{ + return splashFloor(x); +} +static inline int imgCoordMungeUpper(SplashCoord x) +{ + return splashFloor(x) + 1; +} +static inline int imgCoordMungeLowerC(SplashCoord x, bool glyphMode) +{ + return glyphMode ? (splashCeil(x + 0.5) - 1) : splashFloor(x); +} +static inline int imgCoordMungeUpperC(SplashCoord x, bool glyphMode) +{ + return glyphMode ? (splashCeil(x + 0.5) - 1) : (splashFloor(x) + 1); +} +#endif + +// Used by drawImage and fillImageMask to divide the target +// quadrilateral into sections. +struct ImageSection +{ + int y0, y1; // actual y range + int ia0, ia1; // vertex indices for edge A + int ib0, ib1; // vertex indices for edge A + SplashCoord xa0, ya0, xa1, ya1; // edge A + SplashCoord dxdya; // slope of edge A + SplashCoord xb0, yb0, xb1, yb1; // edge B + SplashCoord dxdyb; // slope of edge B +}; + +//------------------------------------------------------------------------ +// SplashPipe +//------------------------------------------------------------------------ + +#define splashPipeMaxStages 9 + +struct SplashPipe +{ + // pixel coordinates + int x, y; + + // source pattern + SplashPattern *pattern; + + // source alpha and color + unsigned char aInput; + bool usesShape; + SplashColorPtr cSrc; + SplashColor cSrcVal = {}; + + // non-isolated group alpha0 + unsigned char *alpha0Ptr; + + // knockout groups + bool knockout; + unsigned char knockoutOpacity; + + // soft mask + SplashColorPtr softMaskPtr; + + // destination alpha and color + SplashColorPtr destColorPtr; + int destColorMask; + unsigned char *destAlphaPtr; + + // shape + unsigned char shape; + + // result alpha and color + bool noTransparency; + SplashPipeResultColorCtrl resultColorCtrl; + + // non-isolated group correction + bool nonIsolatedGroup; + + // the "run" function + void (Splash::*run)(SplashPipe *pipe); +}; + +SplashPipeResultColorCtrl Splash::pipeResultColorNoAlphaBlend[] = { splashPipeResultColorNoAlphaBlendMono, splashPipeResultColorNoAlphaBlendMono, splashPipeResultColorNoAlphaBlendRGB, splashPipeResultColorNoAlphaBlendRGB, + splashPipeResultColorNoAlphaBlendRGB, splashPipeResultColorNoAlphaBlendCMYK, splashPipeResultColorNoAlphaBlendDeviceN }; + +SplashPipeResultColorCtrl Splash::pipeResultColorAlphaNoBlend[] = { splashPipeResultColorAlphaNoBlendMono, splashPipeResultColorAlphaNoBlendMono, splashPipeResultColorAlphaNoBlendRGB, splashPipeResultColorAlphaNoBlendRGB, + splashPipeResultColorAlphaNoBlendRGB, splashPipeResultColorAlphaNoBlendCMYK, splashPipeResultColorAlphaNoBlendDeviceN }; + +SplashPipeResultColorCtrl Splash::pipeResultColorAlphaBlend[] = { splashPipeResultColorAlphaBlendMono, splashPipeResultColorAlphaBlendMono, splashPipeResultColorAlphaBlendRGB, splashPipeResultColorAlphaBlendRGB, + splashPipeResultColorAlphaBlendRGB, splashPipeResultColorAlphaBlendCMYK, splashPipeResultColorAlphaBlendDeviceN }; + +//------------------------------------------------------------------------ + +static void blendXor(SplashColorPtr src, SplashColorPtr dest, SplashColorPtr blend, SplashColorMode cm) +{ + int i; + + for (i = 0; i < splashColorModeNComps[cm]; ++i) { + blend[i] = src[i] ^ dest[i]; + } +} + +//------------------------------------------------------------------------ +// pipeline +//------------------------------------------------------------------------ + +inline void Splash::pipeInit(SplashPipe *pipe, int x, int y, SplashPattern *pattern, SplashColorPtr cSrc, unsigned char aInput, bool usesShape, bool nonIsolatedGroup, bool knockout, unsigned char knockoutOpacity) +{ + pipeSetXY(pipe, x, y); + pipe->pattern = nullptr; + + // source color + if (pattern) { + if (pattern->isStatic()) { + pattern->getColor(x, y, pipe->cSrcVal); + } else { + pipe->pattern = pattern; + } + pipe->cSrc = pipe->cSrcVal; + } else { + pipe->cSrc = cSrc; + } + + // source alpha + pipe->aInput = aInput; + pipe->usesShape = usesShape; + pipe->shape = 0; + + // knockout + pipe->knockout = knockout; + pipe->knockoutOpacity = knockoutOpacity; + + // result alpha + if (aInput == 255 && !state->softMask && !usesShape && !state->inNonIsolatedGroup && !nonIsolatedGroup) { + pipe->noTransparency = true; + } else { + pipe->noTransparency = false; + } + + // result color + if (pipe->noTransparency) { + // the !state->blendFunc case is handled separately in pipeRun + pipe->resultColorCtrl = pipeResultColorNoAlphaBlend[bitmap->mode]; + } else if (!state->blendFunc) { + pipe->resultColorCtrl = pipeResultColorAlphaNoBlend[bitmap->mode]; + } else { + pipe->resultColorCtrl = pipeResultColorAlphaBlend[bitmap->mode]; + } + + // non-isolated group correction + pipe->nonIsolatedGroup = nonIsolatedGroup; + + // select the 'run' function + pipe->run = &Splash::pipeRun; + if (!pipe->pattern && pipe->noTransparency && !state->blendFunc) { + if (bitmap->mode == splashModeMono1 && !pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunSimpleMono1; + } else if (bitmap->mode == splashModeMono8 && pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunSimpleMono8; + } else if (bitmap->mode == splashModeRGB8 && pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunSimpleRGB8; + } else if (bitmap->mode == splashModeXBGR8 && pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunSimpleXBGR8; + } else if (bitmap->mode == splashModeBGR8 && pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunSimpleBGR8; + } else if (bitmap->mode == splashModeCMYK8 && pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunSimpleCMYK8; + } else if (bitmap->mode == splashModeDeviceN8 && pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunSimpleDeviceN8; + } + } else if (!pipe->pattern && !pipe->noTransparency && !state->softMask && pipe->usesShape && !(state->inNonIsolatedGroup && alpha0Bitmap->alpha) && !state->blendFunc && !pipe->nonIsolatedGroup) { + if (bitmap->mode == splashModeMono1 && !pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunAAMono1; + } else if (bitmap->mode == splashModeMono8 && pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunAAMono8; + } else if (bitmap->mode == splashModeRGB8 && pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunAARGB8; + } else if (bitmap->mode == splashModeXBGR8 && pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunAAXBGR8; + } else if (bitmap->mode == splashModeBGR8 && pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunAABGR8; + } else if (bitmap->mode == splashModeCMYK8 && pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunAACMYK8; + } else if (bitmap->mode == splashModeDeviceN8 && pipe->destAlphaPtr) { + pipe->run = &Splash::pipeRunAADeviceN8; + } + } +} + +// general case +void Splash::pipeRun(SplashPipe *pipe) +{ + unsigned char aSrc, aDest, alphaI, alphaIm1, alpha0, aResult; + SplashColor cSrcNonIso, cDest, cBlend; + SplashColorPtr cSrc; + unsigned char cResult0, cResult1, cResult2, cResult3; + int t; + int cp, mask; + unsigned char cResult[SPOT_NCOMPS + 4]; + + //----- source color + + // static pattern: handled in pipeInit + // fixed color: handled in pipeInit + + // dynamic pattern + if (pipe->pattern) { + if (!pipe->pattern->getColor(pipe->x, pipe->y, pipe->cSrcVal)) { + pipeIncX(pipe); + return; + } + if (bitmap->mode == splashModeCMYK8 || bitmap->mode == splashModeDeviceN8) { + if (state->fillOverprint && state->overprintMode && pipe->pattern->isCMYK()) { + unsigned int overprintMask = 15; + if (pipe->cSrcVal[0] == 0) { + overprintMask &= ~1; + } + if (pipe->cSrcVal[1] == 0) { + overprintMask &= ~2; + } + if (pipe->cSrcVal[2] == 0) { + overprintMask &= ~4; + } + if (pipe->cSrcVal[3] == 0) { + overprintMask &= ~8; + } + state->overprintMask = overprintMask; + } + } + } + + if (pipe->noTransparency && !state->blendFunc) { + + //----- write destination pixel + + switch (bitmap->mode) { + case splashModeMono1: + cResult0 = state->grayTransfer[pipe->cSrc[0]]; + if (state->screen->test(pipe->x, pipe->y, cResult0)) { + *pipe->destColorPtr |= pipe->destColorMask; + } else { + *pipe->destColorPtr &= ~pipe->destColorMask; + } + if (!(pipe->destColorMask >>= 1)) { + pipe->destColorMask = 0x80; + ++pipe->destColorPtr; + } + break; + case splashModeMono8: + *pipe->destColorPtr++ = state->grayTransfer[pipe->cSrc[0]]; + break; + case splashModeRGB8: + *pipe->destColorPtr++ = state->rgbTransferR[pipe->cSrc[0]]; + *pipe->destColorPtr++ = state->rgbTransferG[pipe->cSrc[1]]; + *pipe->destColorPtr++ = state->rgbTransferB[pipe->cSrc[2]]; + break; + case splashModeXBGR8: + *pipe->destColorPtr++ = state->rgbTransferB[pipe->cSrc[2]]; + *pipe->destColorPtr++ = state->rgbTransferG[pipe->cSrc[1]]; + *pipe->destColorPtr++ = state->rgbTransferR[pipe->cSrc[0]]; + *pipe->destColorPtr++ = 255; + break; + case splashModeBGR8: + *pipe->destColorPtr++ = state->rgbTransferB[pipe->cSrc[2]]; + *pipe->destColorPtr++ = state->rgbTransferG[pipe->cSrc[1]]; + *pipe->destColorPtr++ = state->rgbTransferR[pipe->cSrc[0]]; + break; + case splashModeCMYK8: + if (state->overprintMask & 1) { + pipe->destColorPtr[0] = (state->overprintAdditive) ? std::min(pipe->destColorPtr[0] + state->cmykTransferC[pipe->cSrc[0]], 255) : state->cmykTransferC[pipe->cSrc[0]]; + } + if (state->overprintMask & 2) { + pipe->destColorPtr[1] = (state->overprintAdditive) ? std::min(pipe->destColorPtr[1] + state->cmykTransferM[pipe->cSrc[1]], 255) : state->cmykTransferM[pipe->cSrc[1]]; + } + if (state->overprintMask & 4) { + pipe->destColorPtr[2] = (state->overprintAdditive) ? std::min(pipe->destColorPtr[2] + state->cmykTransferY[pipe->cSrc[2]], 255) : state->cmykTransferY[pipe->cSrc[2]]; + } + if (state->overprintMask & 8) { + pipe->destColorPtr[3] = (state->overprintAdditive) ? std::min(pipe->destColorPtr[3] + state->cmykTransferK[pipe->cSrc[3]], 255) : state->cmykTransferK[pipe->cSrc[3]]; + } + pipe->destColorPtr += 4; + break; + case splashModeDeviceN8: + mask = 1; + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + if (state->overprintMask & mask) { + pipe->destColorPtr[cp] = state->deviceNTransfer[cp][pipe->cSrc[cp]]; + } + mask <<= 1; + } + pipe->destColorPtr += (SPOT_NCOMPS + 4); + break; + } + if (pipe->destAlphaPtr) { + *pipe->destAlphaPtr++ = 255; + } + + } else { + + //----- read destination pixel + + unsigned char *destColorPtr; + if (pipe->shape && state->blendFunc && pipe->knockout && alpha0Bitmap != nullptr) { + destColorPtr = alpha0Bitmap->data + (alpha0Y + pipe->y) * alpha0Bitmap->rowSize; + switch (bitmap->mode) { + case splashModeMono1: + destColorPtr += (alpha0X + pipe->x) / 8; + break; + case splashModeMono8: + destColorPtr += (alpha0X + pipe->x); + break; + case splashModeRGB8: + case splashModeBGR8: + destColorPtr += (alpha0X + pipe->x) * 3; + break; + case splashModeXBGR8: + case splashModeCMYK8: + destColorPtr += (alpha0X + pipe->x) * 4; + break; + case splashModeDeviceN8: + destColorPtr += (alpha0X + pipe->x) * (SPOT_NCOMPS + 4); + break; + } + } else { + destColorPtr = pipe->destColorPtr; + } + switch (bitmap->mode) { + case splashModeMono1: + cDest[0] = (*destColorPtr & pipe->destColorMask) ? 0xff : 0x00; + break; + case splashModeMono8: + cDest[0] = *destColorPtr; + break; + case splashModeRGB8: + cDest[0] = destColorPtr[0]; + cDest[1] = destColorPtr[1]; + cDest[2] = destColorPtr[2]; + break; + case splashModeXBGR8: + cDest[0] = destColorPtr[2]; + cDest[1] = destColorPtr[1]; + cDest[2] = destColorPtr[0]; + cDest[3] = 255; + break; + case splashModeBGR8: + cDest[0] = destColorPtr[2]; + cDest[1] = destColorPtr[1]; + cDest[2] = destColorPtr[0]; + break; + case splashModeCMYK8: + cDest[0] = destColorPtr[0]; + cDest[1] = destColorPtr[1]; + cDest[2] = destColorPtr[2]; + cDest[3] = destColorPtr[3]; + break; + case splashModeDeviceN8: + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + cDest[cp] = destColorPtr[cp]; + } + break; + } + if (pipe->destAlphaPtr) { + aDest = *pipe->destAlphaPtr; + } else { + aDest = 0xff; + } + + //----- source alpha + + if (state->softMask) { + if (pipe->usesShape) { + aSrc = div255(div255(pipe->aInput * *pipe->softMaskPtr++) * pipe->shape); + } else { + aSrc = div255(pipe->aInput * *pipe->softMaskPtr++); + } + } else if (pipe->usesShape) { + aSrc = div255(pipe->aInput * pipe->shape); + } else { + aSrc = pipe->aInput; + } + + //----- non-isolated group correction + + if (pipe->nonIsolatedGroup) { + // This path is only used when Splash::composite() is called to + // composite a non-isolated group onto the backdrop. In this + // case, pipe->shape is the source (group) alpha. + if (pipe->shape == 0) { + // this value will be multiplied by zero later, so it doesn't + // matter what we use + cSrc = pipe->cSrc; + } else { + t = (aDest * 255) / pipe->shape - aDest; + switch (bitmap->mode) { + case splashModeDeviceN8: + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + cSrcNonIso[cp] = clip255(pipe->cSrc[cp] + ((pipe->cSrc[cp] - cDest[cp]) * t) / 255); + } + break; + case splashModeCMYK8: + for (cp = 0; cp < 4; cp++) { + cSrcNonIso[cp] = clip255(pipe->cSrc[cp] + ((pipe->cSrc[cp] - cDest[cp]) * t) / 255); + } + break; + case splashModeXBGR8: + cSrcNonIso[3] = 255; + // fallthrough + case splashModeRGB8: + case splashModeBGR8: + cSrcNonIso[2] = clip255(pipe->cSrc[2] + ((pipe->cSrc[2] - cDest[2]) * t) / 255); + cSrcNonIso[1] = clip255(pipe->cSrc[1] + ((pipe->cSrc[1] - cDest[1]) * t) / 255); + // fallthrough + case splashModeMono1: + case splashModeMono8: + cSrcNonIso[0] = clip255(pipe->cSrc[0] + ((pipe->cSrc[0] - cDest[0]) * t) / 255); + break; + } + cSrc = cSrcNonIso; + // knockout: remove backdrop color + if (pipe->knockout && pipe->shape >= pipe->knockoutOpacity) { + aDest = 0; + } + } + } else { + cSrc = pipe->cSrc; + } + + //----- blend function + + if (state->blendFunc) { + if (bitmap->mode == splashModeDeviceN8) { + for (int k = 4; k < 4 + SPOT_NCOMPS; k++) { + cBlend[k] = 0; + } + } + (*state->blendFunc)(cSrc, cDest, cBlend, bitmap->mode); + } + + //----- result alpha and non-isolated group element correction + + if (pipe->noTransparency) { + alphaI = alphaIm1 = aResult = 255; + } else { + aResult = aSrc + aDest - div255(aSrc * aDest); + + // alphaI = alpha_i + // alphaIm1 = alpha_(i-1) + if (pipe->alpha0Ptr) { + alpha0 = *pipe->alpha0Ptr++; + alphaI = aResult + alpha0 - div255(aResult * alpha0); + alphaIm1 = alpha0 + aDest - div255(alpha0 * aDest); + } else { + alphaI = aResult; + alphaIm1 = aDest; + } + } + + //----- result color + + cResult0 = cResult1 = cResult2 = cResult3 = 0; // make gcc happy + + switch (pipe->resultColorCtrl) { + + case splashPipeResultColorNoAlphaBlendMono: + cResult0 = state->grayTransfer[div255((255 - aDest) * cSrc[0] + aDest * cBlend[0])]; + break; + case splashPipeResultColorNoAlphaBlendRGB: + cResult0 = state->rgbTransferR[div255((255 - aDest) * cSrc[0] + aDest * cBlend[0])]; + cResult1 = state->rgbTransferG[div255((255 - aDest) * cSrc[1] + aDest * cBlend[1])]; + cResult2 = state->rgbTransferB[div255((255 - aDest) * cSrc[2] + aDest * cBlend[2])]; + break; + case splashPipeResultColorNoAlphaBlendCMYK: + cResult0 = state->cmykTransferC[div255((255 - aDest) * cSrc[0] + aDest * cBlend[0])]; + cResult1 = state->cmykTransferM[div255((255 - aDest) * cSrc[1] + aDest * cBlend[1])]; + cResult2 = state->cmykTransferY[div255((255 - aDest) * cSrc[2] + aDest * cBlend[2])]; + cResult3 = state->cmykTransferK[div255((255 - aDest) * cSrc[3] + aDest * cBlend[3])]; + break; + case splashPipeResultColorNoAlphaBlendDeviceN: + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + cResult[cp] = state->deviceNTransfer[cp][div255((255 - aDest) * cSrc[cp] + aDest * cBlend[cp])]; + } + break; + + case splashPipeResultColorAlphaNoBlendMono: + if (alphaI == 0) { + cResult0 = 0; + } else { + cResult0 = state->grayTransfer[((alphaI - aSrc) * cDest[0] + aSrc * cSrc[0]) / alphaI]; + } + break; + case splashPipeResultColorAlphaNoBlendRGB: + if (alphaI == 0) { + cResult0 = 0; + cResult1 = 0; + cResult2 = 0; + } else { + cResult0 = state->rgbTransferR[((alphaI - aSrc) * cDest[0] + aSrc * cSrc[0]) / alphaI]; + cResult1 = state->rgbTransferG[((alphaI - aSrc) * cDest[1] + aSrc * cSrc[1]) / alphaI]; + cResult2 = state->rgbTransferB[((alphaI - aSrc) * cDest[2] + aSrc * cSrc[2]) / alphaI]; + } + break; + case splashPipeResultColorAlphaNoBlendCMYK: + if (alphaI == 0) { + cResult0 = 0; + cResult1 = 0; + cResult2 = 0; + cResult3 = 0; + } else { + cResult0 = state->cmykTransferC[((alphaI - aSrc) * cDest[0] + aSrc * cSrc[0]) / alphaI]; + cResult1 = state->cmykTransferM[((alphaI - aSrc) * cDest[1] + aSrc * cSrc[1]) / alphaI]; + cResult2 = state->cmykTransferY[((alphaI - aSrc) * cDest[2] + aSrc * cSrc[2]) / alphaI]; + cResult3 = state->cmykTransferK[((alphaI - aSrc) * cDest[3] + aSrc * cSrc[3]) / alphaI]; + } + break; + case splashPipeResultColorAlphaNoBlendDeviceN: + if (alphaI == 0) { + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + cResult[cp] = 0; + } + } else { + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + cResult[cp] = state->deviceNTransfer[cp][((alphaI - aSrc) * cDest[cp] + aSrc * cSrc[cp]) / alphaI]; + } + } + break; + + case splashPipeResultColorAlphaBlendMono: + if (alphaI == 0) { + cResult0 = 0; + } else { + cResult0 = state->grayTransfer[((alphaI - aSrc) * cDest[0] + aSrc * ((255 - alphaIm1) * cSrc[0] + alphaIm1 * cBlend[0]) / 255) / alphaI]; + } + break; + case splashPipeResultColorAlphaBlendRGB: + if (alphaI == 0) { + cResult0 = 0; + cResult1 = 0; + cResult2 = 0; + } else { + cResult0 = state->rgbTransferR[((alphaI - aSrc) * cDest[0] + aSrc * ((255 - alphaIm1) * cSrc[0] + alphaIm1 * cBlend[0]) / 255) / alphaI]; + cResult1 = state->rgbTransferG[((alphaI - aSrc) * cDest[1] + aSrc * ((255 - alphaIm1) * cSrc[1] + alphaIm1 * cBlend[1]) / 255) / alphaI]; + cResult2 = state->rgbTransferB[((alphaI - aSrc) * cDest[2] + aSrc * ((255 - alphaIm1) * cSrc[2] + alphaIm1 * cBlend[2]) / 255) / alphaI]; + } + break; + case splashPipeResultColorAlphaBlendCMYK: + if (alphaI == 0) { + cResult0 = 0; + cResult1 = 0; + cResult2 = 0; + cResult3 = 0; + } else { + cResult0 = state->cmykTransferC[((alphaI - aSrc) * cDest[0] + aSrc * ((255 - alphaIm1) * cSrc[0] + alphaIm1 * cBlend[0]) / 255) / alphaI]; + cResult1 = state->cmykTransferM[((alphaI - aSrc) * cDest[1] + aSrc * ((255 - alphaIm1) * cSrc[1] + alphaIm1 * cBlend[1]) / 255) / alphaI]; + cResult2 = state->cmykTransferY[((alphaI - aSrc) * cDest[2] + aSrc * ((255 - alphaIm1) * cSrc[2] + alphaIm1 * cBlend[2]) / 255) / alphaI]; + cResult3 = state->cmykTransferK[((alphaI - aSrc) * cDest[3] + aSrc * ((255 - alphaIm1) * cSrc[3] + alphaIm1 * cBlend[3]) / 255) / alphaI]; + } + break; + case splashPipeResultColorAlphaBlendDeviceN: + if (alphaI == 0) { + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + cResult[cp] = 0; + } + } else { + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + cResult[cp] = state->deviceNTransfer[cp][((alphaI - aSrc) * cDest[cp] + aSrc * ((255 - alphaIm1) * cSrc[cp] + alphaIm1 * cBlend[cp]) / 255) / alphaI]; + } + } + break; + } + + //----- write destination pixel + + switch (bitmap->mode) { + case splashModeMono1: + if (state->screen->test(pipe->x, pipe->y, cResult0)) { + *pipe->destColorPtr |= pipe->destColorMask; + } else { + *pipe->destColorPtr &= ~pipe->destColorMask; + } + if (!(pipe->destColorMask >>= 1)) { + pipe->destColorMask = 0x80; + ++pipe->destColorPtr; + } + break; + case splashModeMono8: + *pipe->destColorPtr++ = cResult0; + break; + case splashModeRGB8: + *pipe->destColorPtr++ = cResult0; + *pipe->destColorPtr++ = cResult1; + *pipe->destColorPtr++ = cResult2; + break; + case splashModeXBGR8: + *pipe->destColorPtr++ = cResult2; + *pipe->destColorPtr++ = cResult1; + *pipe->destColorPtr++ = cResult0; + *pipe->destColorPtr++ = 255; + break; + case splashModeBGR8: + *pipe->destColorPtr++ = cResult2; + *pipe->destColorPtr++ = cResult1; + *pipe->destColorPtr++ = cResult0; + break; + case splashModeCMYK8: + if (state->overprintMask & 1) { + pipe->destColorPtr[0] = (state->overprintAdditive) ? std::min(pipe->destColorPtr[0] + cResult0, 255) : cResult0; + } + if (state->overprintMask & 2) { + pipe->destColorPtr[1] = (state->overprintAdditive) ? std::min(pipe->destColorPtr[1] + cResult1, 255) : cResult1; + } + if (state->overprintMask & 4) { + pipe->destColorPtr[2] = (state->overprintAdditive) ? std::min(pipe->destColorPtr[2] + cResult2, 255) : cResult2; + } + if (state->overprintMask & 8) { + pipe->destColorPtr[3] = (state->overprintAdditive) ? std::min(pipe->destColorPtr[3] + cResult3, 255) : cResult3; + } + pipe->destColorPtr += 4; + break; + case splashModeDeviceN8: + mask = 1; + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + if (state->overprintMask & mask) { + pipe->destColorPtr[cp] = cResult[cp]; + } + mask <<= 1; + } + pipe->destColorPtr += (SPOT_NCOMPS + 4); + break; + } + if (pipe->destAlphaPtr) { + *pipe->destAlphaPtr++ = aResult; + } + } + + ++pipe->x; +} + +// special case: +// !pipe->pattern && pipe->noTransparency && !state->blendFunc && +// bitmap->mode == splashModeMono1 && !pipe->destAlphaPtr) { +void Splash::pipeRunSimpleMono1(SplashPipe *pipe) +{ + unsigned char cResult0; + + //----- write destination pixel + cResult0 = state->grayTransfer[pipe->cSrc[0]]; + if (state->screen->test(pipe->x, pipe->y, cResult0)) { + *pipe->destColorPtr |= pipe->destColorMask; + } else { + *pipe->destColorPtr &= ~pipe->destColorMask; + } + if (!(pipe->destColorMask >>= 1)) { + pipe->destColorMask = 0x80; + ++pipe->destColorPtr; + } + + ++pipe->x; +} + +// special case: +// !pipe->pattern && pipe->noTransparency && !state->blendFunc && +// bitmap->mode == splashModeMono8 && pipe->destAlphaPtr) { +void Splash::pipeRunSimpleMono8(SplashPipe *pipe) +{ + //----- write destination pixel + *pipe->destColorPtr++ = state->grayTransfer[pipe->cSrc[0]]; + *pipe->destAlphaPtr++ = 255; + + ++pipe->x; +} + +// special case: +// !pipe->pattern && pipe->noTransparency && !state->blendFunc && +// bitmap->mode == splashModeRGB8 && pipe->destAlphaPtr) { +void Splash::pipeRunSimpleRGB8(SplashPipe *pipe) +{ + //----- write destination pixel + *pipe->destColorPtr++ = state->rgbTransferR[pipe->cSrc[0]]; + *pipe->destColorPtr++ = state->rgbTransferG[pipe->cSrc[1]]; + *pipe->destColorPtr++ = state->rgbTransferB[pipe->cSrc[2]]; + *pipe->destAlphaPtr++ = 255; + + ++pipe->x; +} + +// special case: +// !pipe->pattern && pipe->noTransparency && !state->blendFunc && +// bitmap->mode == splashModeXBGR8 && pipe->destAlphaPtr) { +void Splash::pipeRunSimpleXBGR8(SplashPipe *pipe) +{ + //----- write destination pixel + *pipe->destColorPtr++ = state->rgbTransferB[pipe->cSrc[2]]; + *pipe->destColorPtr++ = state->rgbTransferG[pipe->cSrc[1]]; + *pipe->destColorPtr++ = state->rgbTransferR[pipe->cSrc[0]]; + *pipe->destColorPtr++ = 255; + *pipe->destAlphaPtr++ = 255; + + ++pipe->x; +} + +// special case: +// !pipe->pattern && pipe->noTransparency && !state->blendFunc && +// bitmap->mode == splashModeBGR8 && pipe->destAlphaPtr) { +void Splash::pipeRunSimpleBGR8(SplashPipe *pipe) +{ + //----- write destination pixel + *pipe->destColorPtr++ = state->rgbTransferB[pipe->cSrc[2]]; + *pipe->destColorPtr++ = state->rgbTransferG[pipe->cSrc[1]]; + *pipe->destColorPtr++ = state->rgbTransferR[pipe->cSrc[0]]; + *pipe->destAlphaPtr++ = 255; + + ++pipe->x; +} + +// special case: +// !pipe->pattern && pipe->noTransparency && !state->blendFunc && +// bitmap->mode == splashModeCMYK8 && pipe->destAlphaPtr) { +void Splash::pipeRunSimpleCMYK8(SplashPipe *pipe) +{ + //----- write destination pixel + if (state->overprintMask & 1) { + pipe->destColorPtr[0] = (state->overprintAdditive) ? std::min(pipe->destColorPtr[0] + state->cmykTransferC[pipe->cSrc[0]], 255) : state->cmykTransferC[pipe->cSrc[0]]; + } + if (state->overprintMask & 2) { + pipe->destColorPtr[1] = (state->overprintAdditive) ? std::min(pipe->destColorPtr[1] + state->cmykTransferM[pipe->cSrc[1]], 255) : state->cmykTransferM[pipe->cSrc[1]]; + } + if (state->overprintMask & 4) { + pipe->destColorPtr[2] = (state->overprintAdditive) ? std::min(pipe->destColorPtr[2] + state->cmykTransferY[pipe->cSrc[2]], 255) : state->cmykTransferY[pipe->cSrc[2]]; + } + if (state->overprintMask & 8) { + pipe->destColorPtr[3] = (state->overprintAdditive) ? std::min(pipe->destColorPtr[3] + state->cmykTransferK[pipe->cSrc[3]], 255) : state->cmykTransferK[pipe->cSrc[3]]; + } + pipe->destColorPtr += 4; + *pipe->destAlphaPtr++ = 255; + + ++pipe->x; +} + +// special case: +// !pipe->pattern && pipe->noTransparency && !state->blendFunc && +// bitmap->mode == splashModeDeviceN8 && pipe->destAlphaPtr) { +void Splash::pipeRunSimpleDeviceN8(SplashPipe *pipe) +{ + //----- write destination pixel + int mask = 1; + for (int cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + if (state->overprintMask & mask) { + pipe->destColorPtr[cp] = state->deviceNTransfer[cp][pipe->cSrc[cp]]; + } + mask <<= 1; + } + pipe->destColorPtr += (SPOT_NCOMPS + 4); + *pipe->destAlphaPtr++ = 255; + + ++pipe->x; +} + +// special case: +// !pipe->pattern && !pipe->noTransparency && !state->softMask && +// pipe->usesShape && !pipe->alpha0Ptr && !state->blendFunc && +// !pipe->nonIsolatedGroup && +// bitmap->mode == splashModeMono1 && !pipe->destAlphaPtr +void Splash::pipeRunAAMono1(SplashPipe *pipe) +{ + unsigned char aSrc; + SplashColor cDest; + unsigned char cResult0; + + //----- read destination pixel + cDest[0] = (*pipe->destColorPtr & pipe->destColorMask) ? 0xff : 0x00; + + //----- source alpha + aSrc = div255(pipe->aInput * pipe->shape); + + //----- result color + // note: aDest = alpha2 = aResult = 0xff + cResult0 = state->grayTransfer[(unsigned char)div255((0xff - aSrc) * cDest[0] + aSrc * pipe->cSrc[0])]; + + //----- write destination pixel + if (state->screen->test(pipe->x, pipe->y, cResult0)) { + *pipe->destColorPtr |= pipe->destColorMask; + } else { + *pipe->destColorPtr &= ~pipe->destColorMask; + } + if (!(pipe->destColorMask >>= 1)) { + pipe->destColorMask = 0x80; + ++pipe->destColorPtr; + } + + ++pipe->x; +} + +// special case: +// !pipe->pattern && !pipe->noTransparency && !state->softMask && +// pipe->usesShape && !pipe->alpha0Ptr && !state->blendFunc && +// !pipe->nonIsolatedGroup && +// bitmap->mode == splashModeMono8 && pipe->destAlphaPtr +void Splash::pipeRunAAMono8(SplashPipe *pipe) +{ + unsigned char aSrc, aDest, alpha2, aResult; + SplashColor cDest; + unsigned char cResult0; + + //----- read destination pixel + cDest[0] = *pipe->destColorPtr; + aDest = *pipe->destAlphaPtr; + + //----- source alpha + aSrc = div255(pipe->aInput * pipe->shape); + + //----- result alpha and non-isolated group element correction + aResult = aSrc + aDest - div255(aSrc * aDest); + alpha2 = aResult; + + //----- result color + if (alpha2 == 0) { + cResult0 = 0; + } else { + cResult0 = state->grayTransfer[(unsigned char)(((alpha2 - aSrc) * cDest[0] + aSrc * pipe->cSrc[0]) / alpha2)]; + } + + //----- write destination pixel + *pipe->destColorPtr++ = cResult0; + *pipe->destAlphaPtr++ = aResult; + + ++pipe->x; +} + +// special case: +// !pipe->pattern && !pipe->noTransparency && !state->softMask && +// pipe->usesShape && !pipe->alpha0Ptr && !state->blendFunc && +// !pipe->nonIsolatedGroup && +// bitmap->mode == splashModeRGB8 && pipe->destAlphaPtr +void Splash::pipeRunAARGB8(SplashPipe *pipe) +{ + unsigned char aSrc, aDest, alpha2, aResult; + SplashColor cDest; + unsigned char cResult0, cResult1, cResult2; + + //----- read destination alpha + aDest = *pipe->destAlphaPtr; + + //----- source alpha + aSrc = div255(pipe->aInput * pipe->shape); + + //----- result color + if (aSrc == 255) { + cResult0 = state->rgbTransferR[pipe->cSrc[0]]; + cResult1 = state->rgbTransferG[pipe->cSrc[1]]; + cResult2 = state->rgbTransferB[pipe->cSrc[2]]; + aResult = 255; + + } else if (aSrc == 0 && aDest == 0) { + cResult0 = 0; + cResult1 = 0; + cResult2 = 0; + aResult = 0; + + } else { + //----- read destination pixel + cDest[0] = pipe->destColorPtr[0]; + cDest[1] = pipe->destColorPtr[1]; + cDest[2] = pipe->destColorPtr[2]; + + //----- result alpha and non-isolated group element correction + aResult = aSrc + aDest - div255(aSrc * aDest); + alpha2 = aResult; + + cResult0 = state->rgbTransferR[(unsigned char)(((alpha2 - aSrc) * cDest[0] + aSrc * pipe->cSrc[0]) / alpha2)]; + cResult1 = state->rgbTransferG[(unsigned char)(((alpha2 - aSrc) * cDest[1] + aSrc * pipe->cSrc[1]) / alpha2)]; + cResult2 = state->rgbTransferB[(unsigned char)(((alpha2 - aSrc) * cDest[2] + aSrc * pipe->cSrc[2]) / alpha2)]; + } + + //----- write destination pixel + *pipe->destColorPtr++ = cResult0; + *pipe->destColorPtr++ = cResult1; + *pipe->destColorPtr++ = cResult2; + *pipe->destAlphaPtr++ = aResult; + + ++pipe->x; +} + +// special case: +// !pipe->pattern && !pipe->noTransparency && !state->softMask && +// pipe->usesShape && !pipe->alpha0Ptr && !state->blendFunc && +// !pipe->nonIsolatedGroup && +// bitmap->mode == splashModeXBGR8 && pipe->destAlphaPtr +void Splash::pipeRunAAXBGR8(SplashPipe *pipe) +{ + unsigned char aSrc, aDest, alpha2, aResult; + SplashColor cDest; + unsigned char cResult0, cResult1, cResult2; + + //----- read destination alpha + aDest = *pipe->destAlphaPtr; + + //----- source alpha + aSrc = div255(pipe->aInput * pipe->shape); + + //----- result color + if (aSrc == 255) { + cResult0 = state->rgbTransferR[pipe->cSrc[0]]; + cResult1 = state->rgbTransferG[pipe->cSrc[1]]; + cResult2 = state->rgbTransferB[pipe->cSrc[2]]; + aResult = 255; + + } else if (aSrc == 0 && aDest == 0) { + cResult0 = 0; + cResult1 = 0; + cResult2 = 0; + aResult = 0; + + } else { + //----- read destination color + cDest[0] = pipe->destColorPtr[2]; + cDest[1] = pipe->destColorPtr[1]; + cDest[2] = pipe->destColorPtr[0]; + + //----- result alpha and non-isolated group element correction + aResult = aSrc + aDest - div255(aSrc * aDest); + alpha2 = aResult; + + cResult0 = state->rgbTransferR[(unsigned char)(((alpha2 - aSrc) * cDest[0] + aSrc * pipe->cSrc[0]) / alpha2)]; + cResult1 = state->rgbTransferG[(unsigned char)(((alpha2 - aSrc) * cDest[1] + aSrc * pipe->cSrc[1]) / alpha2)]; + cResult2 = state->rgbTransferB[(unsigned char)(((alpha2 - aSrc) * cDest[2] + aSrc * pipe->cSrc[2]) / alpha2)]; + } + + //----- write destination pixel + *pipe->destColorPtr++ = cResult2; + *pipe->destColorPtr++ = cResult1; + *pipe->destColorPtr++ = cResult0; + *pipe->destColorPtr++ = 255; + *pipe->destAlphaPtr++ = aResult; + + ++pipe->x; +} + +// special case: +// !pipe->pattern && !pipe->noTransparency && !state->softMask && +// pipe->usesShape && !pipe->alpha0Ptr && !state->blendFunc && +// !pipe->nonIsolatedGroup && +// bitmap->mode == splashModeBGR8 && pipe->destAlphaPtr +void Splash::pipeRunAABGR8(SplashPipe *pipe) +{ + unsigned char aSrc, aDest, alpha2, aResult; + SplashColor cDest; + unsigned char cResult0, cResult1, cResult2; + + //----- read destination alpha + aDest = *pipe->destAlphaPtr; + + //----- source alpha + aSrc = div255(pipe->aInput * pipe->shape); + + //----- result color + if (aSrc == 255) { + cResult0 = state->rgbTransferR[pipe->cSrc[0]]; + cResult1 = state->rgbTransferG[pipe->cSrc[1]]; + cResult2 = state->rgbTransferB[pipe->cSrc[2]]; + aResult = 255; + + } else if (aSrc == 0 && aDest == 0) { + cResult0 = 0; + cResult1 = 0; + cResult2 = 0; + aResult = 0; + + } else { + //----- read destination color + cDest[0] = pipe->destColorPtr[2]; + cDest[1] = pipe->destColorPtr[1]; + cDest[2] = pipe->destColorPtr[0]; + + //----- result alpha and non-isolated group element correction + aResult = aSrc + aDest - div255(aSrc * aDest); + alpha2 = aResult; + + cResult0 = state->rgbTransferR[(unsigned char)(((alpha2 - aSrc) * cDest[0] + aSrc * pipe->cSrc[0]) / alpha2)]; + cResult1 = state->rgbTransferG[(unsigned char)(((alpha2 - aSrc) * cDest[1] + aSrc * pipe->cSrc[1]) / alpha2)]; + cResult2 = state->rgbTransferB[(unsigned char)(((alpha2 - aSrc) * cDest[2] + aSrc * pipe->cSrc[2]) / alpha2)]; + } + + //----- write destination pixel + *pipe->destColorPtr++ = cResult2; + *pipe->destColorPtr++ = cResult1; + *pipe->destColorPtr++ = cResult0; + *pipe->destAlphaPtr++ = aResult; + + ++pipe->x; +} + +// special case: +// !pipe->pattern && !pipe->noTransparency && !state->softMask && +// pipe->usesShape && !pipe->alpha0Ptr && !state->blendFunc && +// !pipe->nonIsolatedGroup && +// bitmap->mode == splashModeCMYK8 && pipe->destAlphaPtr +void Splash::pipeRunAACMYK8(SplashPipe *pipe) +{ + unsigned char aSrc, aDest, alpha2, aResult; + SplashColor cDest; + unsigned char cResult0, cResult1, cResult2, cResult3; + + //----- read destination pixel + cDest[0] = pipe->destColorPtr[0]; + cDest[1] = pipe->destColorPtr[1]; + cDest[2] = pipe->destColorPtr[2]; + cDest[3] = pipe->destColorPtr[3]; + aDest = *pipe->destAlphaPtr; + + //----- source alpha + aSrc = div255(pipe->aInput * pipe->shape); + + //----- result alpha and non-isolated group element correction + aResult = aSrc + aDest - div255(aSrc * aDest); + alpha2 = aResult; + + //----- result color + if (alpha2 == 0) { + cResult0 = 0; + cResult1 = 0; + cResult2 = 0; + cResult3 = 0; + } else { + cResult0 = state->cmykTransferC[(unsigned char)(((alpha2 - aSrc) * cDest[0] + aSrc * pipe->cSrc[0]) / alpha2)]; + cResult1 = state->cmykTransferM[(unsigned char)(((alpha2 - aSrc) * cDest[1] + aSrc * pipe->cSrc[1]) / alpha2)]; + cResult2 = state->cmykTransferY[(unsigned char)(((alpha2 - aSrc) * cDest[2] + aSrc * pipe->cSrc[2]) / alpha2)]; + cResult3 = state->cmykTransferK[(unsigned char)(((alpha2 - aSrc) * cDest[3] + aSrc * pipe->cSrc[3]) / alpha2)]; + } + + //----- write destination pixel + if (state->overprintMask & 1) { + pipe->destColorPtr[0] = (state->overprintAdditive && pipe->shape != 0) ? std::min(pipe->destColorPtr[0] + cResult0, 255) : cResult0; + } + if (state->overprintMask & 2) { + pipe->destColorPtr[1] = (state->overprintAdditive && pipe->shape != 0) ? std::min(pipe->destColorPtr[1] + cResult1, 255) : cResult1; + } + if (state->overprintMask & 4) { + pipe->destColorPtr[2] = (state->overprintAdditive && pipe->shape != 0) ? std::min(pipe->destColorPtr[2] + cResult2, 255) : cResult2; + } + if (state->overprintMask & 8) { + pipe->destColorPtr[3] = (state->overprintAdditive && pipe->shape != 0) ? std::min(pipe->destColorPtr[3] + cResult3, 255) : cResult3; + } + pipe->destColorPtr += 4; + *pipe->destAlphaPtr++ = aResult; + + ++pipe->x; +} + +// special case: +// !pipe->pattern && !pipe->noTransparency && !state->softMask && +// pipe->usesShape && !pipe->alpha0Ptr && !state->blendFunc && +// !pipe->nonIsolatedGroup && +// bitmap->mode == splashModeDeviceN8 && pipe->destAlphaPtr +void Splash::pipeRunAADeviceN8(SplashPipe *pipe) +{ + unsigned char aSrc, aDest, alpha2, aResult; + SplashColor cDest; + unsigned char cResult[SPOT_NCOMPS + 4]; + int cp, mask; + + //----- read destination pixel + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + cDest[cp] = pipe->destColorPtr[cp]; + } + aDest = *pipe->destAlphaPtr; + + //----- source alpha + aSrc = div255(pipe->aInput * pipe->shape); + + //----- result alpha and non-isolated group element correction + aResult = aSrc + aDest - div255(aSrc * aDest); + alpha2 = aResult; + + //----- result color + if (alpha2 == 0) { + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + cResult[cp] = 0; + } + } else { + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + cResult[cp] = state->deviceNTransfer[cp][(unsigned char)(((alpha2 - aSrc) * cDest[cp] + aSrc * pipe->cSrc[cp]) / alpha2)]; + } + } + + //----- write destination pixel + mask = 1; + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + if (state->overprintMask & mask) { + pipe->destColorPtr[cp] = cResult[cp]; + } + mask <<= 1; + } + pipe->destColorPtr += (SPOT_NCOMPS + 4); + *pipe->destAlphaPtr++ = aResult; + + ++pipe->x; +} + +inline void Splash::pipeSetXY(SplashPipe *pipe, int x, int y) +{ + pipe->x = x; + pipe->y = y; + if (state->softMask) { + pipe->softMaskPtr = &state->softMask->data[y * state->softMask->rowSize + x]; + } + switch (bitmap->mode) { + case splashModeMono1: + pipe->destColorPtr = &bitmap->data[y * bitmap->rowSize + (x >> 3)]; + pipe->destColorMask = 0x80 >> (x & 7); + break; + case splashModeMono8: + pipe->destColorPtr = &bitmap->data[y * bitmap->rowSize + x]; + break; + case splashModeRGB8: + case splashModeBGR8: + pipe->destColorPtr = &bitmap->data[y * bitmap->rowSize + 3 * x]; + break; + case splashModeXBGR8: + pipe->destColorPtr = &bitmap->data[y * bitmap->rowSize + 4 * x]; + break; + case splashModeCMYK8: + pipe->destColorPtr = &bitmap->data[y * bitmap->rowSize + 4 * x]; + break; + case splashModeDeviceN8: + pipe->destColorPtr = &bitmap->data[y * bitmap->rowSize + (SPOT_NCOMPS + 4) * x]; + break; + } + if (bitmap->alpha) { + pipe->destAlphaPtr = &bitmap->alpha[y * bitmap->width + x]; + } else { + pipe->destAlphaPtr = nullptr; + } + if (state->inNonIsolatedGroup && alpha0Bitmap->alpha) { + pipe->alpha0Ptr = &alpha0Bitmap->alpha[(alpha0Y + y) * alpha0Bitmap->width + (alpha0X + x)]; + } else { + pipe->alpha0Ptr = nullptr; + } +} + +inline void Splash::pipeIncX(SplashPipe *pipe) +{ + ++pipe->x; + if (state->softMask) { + ++pipe->softMaskPtr; + } + switch (bitmap->mode) { + case splashModeMono1: + if (!(pipe->destColorMask >>= 1)) { + pipe->destColorMask = 0x80; + ++pipe->destColorPtr; + } + break; + case splashModeMono8: + ++pipe->destColorPtr; + break; + case splashModeRGB8: + case splashModeBGR8: + pipe->destColorPtr += 3; + break; + case splashModeXBGR8: + pipe->destColorPtr += 4; + break; + case splashModeCMYK8: + pipe->destColorPtr += 4; + break; + case splashModeDeviceN8: + pipe->destColorPtr += (SPOT_NCOMPS + 4); + break; + } + if (pipe->destAlphaPtr) { + ++pipe->destAlphaPtr; + } + if (pipe->alpha0Ptr) { + ++pipe->alpha0Ptr; + } +} + +inline void Splash::drawPixel(SplashPipe *pipe, int x, int y, bool noClip) +{ + if (unlikely(y < 0)) { + return; + } + + if (noClip || state->clip->test(x, y)) { + pipeSetXY(pipe, x, y); + (this->*pipe->run)(pipe); + } +} + +inline void Splash::drawAAPixelInit() +{ + aaBufY = -1; +} + +inline void Splash::drawAAPixel(SplashPipe *pipe, int x, int y) +{ +#if splashAASize == 4 + static const int bitCount4[16] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 }; + int w; +#else + int xx, yy; +#endif + SplashColorPtr p; + int x0, x1, t; + + if (x < 0 || x >= bitmap->width || y < state->clip->getYMinI() || y > state->clip->getYMaxI()) { + return; + } + + // update aaBuf + if (y != aaBufY) { + memset(aaBuf->getDataPtr(), 0xff, aaBuf->getRowSize() * aaBuf->getHeight()); + x0 = 0; + x1 = bitmap->width - 1; + state->clip->clipAALine(aaBuf, &x0, &x1, y); + aaBufY = y; + } + + // compute the shape value +#if splashAASize == 4 + p = aaBuf->getDataPtr() + (x >> 1); + w = aaBuf->getRowSize(); + if (x & 1) { + t = bitCount4[*p & 0x0f] + bitCount4[p[w] & 0x0f] + bitCount4[p[2 * w] & 0x0f] + bitCount4[p[3 * w] & 0x0f]; + } else { + t = bitCount4[*p >> 4] + bitCount4[p[w] >> 4] + bitCount4[p[2 * w] >> 4] + bitCount4[p[3 * w] >> 4]; + } +#else + t = 0; + for (yy = 0; yy < splashAASize; ++yy) { + for (xx = 0; xx < splashAASize; ++xx) { + p = aaBuf->getDataPtr() + yy * aaBuf->getRowSize() + ((x * splashAASize + xx) >> 3); + t += (*p >> (7 - ((x * splashAASize + xx) & 7))) & 1; + } + } +#endif + + // draw the pixel + if (t != 0) { + pipeSetXY(pipe, x, y); + pipe->shape = div255(static_cast(aaGamma[t] * pipe->shape)); + (this->*pipe->run)(pipe); + } +} + +inline void Splash::drawSpan(SplashPipe *pipe, int x0, int x1, int y, bool noClip) +{ + int x; + + if (noClip) { + pipeSetXY(pipe, x0, y); + for (x = x0; x <= x1; ++x) { + (this->*pipe->run)(pipe); + } + } else { + if (x0 < state->clip->getXMinI()) { + x0 = state->clip->getXMinI(); + } + if (x1 > state->clip->getXMaxI()) { + x1 = state->clip->getXMaxI(); + } + pipeSetXY(pipe, x0, y); + for (x = x0; x <= x1; ++x) { + if (state->clip->test(x, y)) { + (this->*pipe->run)(pipe); + } else { + pipeIncX(pipe); + } + } + } +} + +inline void Splash::drawAALine(SplashPipe *pipe, int x0, int x1, int y, bool adjustLine, unsigned char lineOpacity) +{ +#if splashAASize == 4 + static const int bitCount4[16] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 }; + SplashColorPtr p0, p1, p2, p3; + int t; +#else + SplashColorPtr p; + int xx, yy, t; +#endif + int x; + +#if splashAASize == 4 + p0 = aaBuf->getDataPtr() + (x0 >> 1); + p1 = p0 + aaBuf->getRowSize(); + p2 = p1 + aaBuf->getRowSize(); + p3 = p2 + aaBuf->getRowSize(); +#endif + pipeSetXY(pipe, x0, y); + for (x = x0; x <= x1; ++x) { + + // compute the shape value +#if splashAASize == 4 + if (x & 1) { + t = bitCount4[*p0 & 0x0f] + bitCount4[*p1 & 0x0f] + bitCount4[*p2 & 0x0f] + bitCount4[*p3 & 0x0f]; + ++p0; + ++p1; + ++p2; + ++p3; + } else { + t = bitCount4[*p0 >> 4] + bitCount4[*p1 >> 4] + bitCount4[*p2 >> 4] + bitCount4[*p3 >> 4]; + } +#else + t = 0; + for (yy = 0; yy < splashAASize; ++yy) { + for (xx = 0; xx < splashAASize; ++xx) { + p = aaBuf->getDataPtr() + yy * aaBuf->getRowSize() + ((x * splashAASize + xx) >> 3); + t += (*p >> (7 - ((x * splashAASize + xx) & 7))) & 1; + } + } +#endif + + if (t != 0) { + pipe->shape = (adjustLine) ? div255(static_cast((int)lineOpacity * (double)aaGamma[t])) : (int)aaGamma[t]; + (this->*pipe->run)(pipe); + } else { + pipeIncX(pipe); + } + } +} + +//------------------------------------------------------------------------ + +// Transform a point from user space to device space. +inline void Splash::transform(const SplashCoord *matrix, SplashCoord xi, SplashCoord yi, SplashCoord *xo, SplashCoord *yo) +{ + // [ m[0] m[1] 0 ] + // [xo yo 1] = [xi yi 1] * [ m[2] m[3] 0 ] + // [ m[4] m[5] 1 ] + *xo = xi * matrix[0] + yi * matrix[2] + matrix[4]; + *yo = xi * matrix[1] + yi * matrix[3] + matrix[5]; +} + +//------------------------------------------------------------------------ +// Splash +//------------------------------------------------------------------------ + +Splash::Splash(SplashBitmap *bitmapA, bool vectorAntialiasA, SplashScreenParams *screenParams) +{ + int i; + + bitmap = bitmapA; + vectorAntialias = vectorAntialiasA; + inShading = false; + state = new SplashState(bitmap->width, bitmap->height, vectorAntialias, screenParams); + if (vectorAntialias) { + aaBuf = new SplashBitmap(splashAASize * bitmap->width, splashAASize, 1, splashModeMono1, false); + for (i = 0; i <= splashAASize * splashAASize; ++i) { + aaGamma[i] = (unsigned char)splashRound(splashPow((SplashCoord)i / (SplashCoord)(splashAASize * splashAASize), splashAAGamma) * 255); + } + } else { + aaBuf = nullptr; + } + minLineWidth = 0; + thinLineMode = splashThinLineDefault; + debugMode = false; + alpha0Bitmap = nullptr; +} + +Splash::Splash(SplashBitmap *bitmapA, bool vectorAntialiasA, SplashScreen *screenA) +{ + int i; + + bitmap = bitmapA; + inShading = false; + vectorAntialias = vectorAntialiasA; + state = new SplashState(bitmap->width, bitmap->height, vectorAntialias, screenA); + if (vectorAntialias) { + aaBuf = new SplashBitmap(splashAASize * bitmap->width, splashAASize, 1, splashModeMono1, false); + for (i = 0; i <= splashAASize * splashAASize; ++i) { + aaGamma[i] = (unsigned char)splashRound(splashPow((SplashCoord)i / (SplashCoord)(splashAASize * splashAASize), splashAAGamma) * 255); + } + } else { + aaBuf = nullptr; + } + minLineWidth = 0; + thinLineMode = splashThinLineDefault; + debugMode = false; + alpha0Bitmap = nullptr; +} + +Splash::~Splash() +{ + while (state->next) { + restoreState(); + } + delete state; + delete aaBuf; +} + +//------------------------------------------------------------------------ +// state read +//------------------------------------------------------------------------ + +SplashCoord *Splash::getMatrix() +{ + return state->matrix; +} + +SplashPattern *Splash::getStrokePattern() +{ + return state->strokePattern; +} + +SplashPattern *Splash::getFillPattern() +{ + return state->fillPattern; +} + +SplashScreen *Splash::getScreen() +{ + return state->screen; +} + +SplashBlendFunc Splash::getBlendFunc() +{ + return state->blendFunc; +} + +SplashCoord Splash::getStrokeAlpha() +{ + return state->strokeAlpha; +} + +SplashCoord Splash::getFillAlpha() +{ + return state->fillAlpha; +} + +SplashCoord Splash::getLineWidth() +{ + return state->lineWidth; +} + +int Splash::getLineCap() +{ + return state->lineCap; +} + +int Splash::getLineJoin() +{ + return state->lineJoin; +} + +SplashCoord Splash::getMiterLimit() +{ + return state->miterLimit; +} + +SplashCoord Splash::getFlatness() +{ + return state->flatness; +} + +SplashCoord Splash::getLineDashPhase() +{ + return state->lineDashPhase; +} + +bool Splash::getStrokeAdjust() +{ + return state->strokeAdjust; +} + +SplashClip *Splash::getClip() +{ + return state->clip; +} + +SplashBitmap *Splash::getSoftMask() +{ + return state->softMask; +} + +bool Splash::getInNonIsolatedGroup() +{ + return state->inNonIsolatedGroup; +} + +//------------------------------------------------------------------------ +// state write +//------------------------------------------------------------------------ + +void Splash::setMatrix(SplashCoord *matrix) +{ + memcpy(state->matrix, matrix, 6 * sizeof(SplashCoord)); +} + +void Splash::setStrokePattern(SplashPattern *strokePattern) +{ + state->setStrokePattern(strokePattern); +} + +void Splash::setFillPattern(SplashPattern *fillPattern) +{ + state->setFillPattern(fillPattern); +} + +void Splash::setScreen(SplashScreen *screen) +{ + state->setScreen(screen); +} + +void Splash::setBlendFunc(SplashBlendFunc func) +{ + state->blendFunc = func; +} + +void Splash::setStrokeAlpha(SplashCoord alpha) +{ + state->strokeAlpha = (state->multiplyPatternAlpha) ? alpha * state->patternStrokeAlpha : alpha; +} + +void Splash::setFillAlpha(SplashCoord alpha) +{ + state->fillAlpha = (state->multiplyPatternAlpha) ? alpha * state->patternFillAlpha : alpha; +} + +void Splash::setPatternAlpha(SplashCoord strokeAlpha, SplashCoord fillAlpha) +{ + state->patternStrokeAlpha = strokeAlpha; + state->patternFillAlpha = fillAlpha; + state->multiplyPatternAlpha = true; +} + +void Splash::clearPatternAlpha() +{ + state->patternStrokeAlpha = 1; + state->patternFillAlpha = 1; + state->multiplyPatternAlpha = false; +} + +void Splash::setFillOverprint(bool fop) +{ + state->fillOverprint = fop; +} + +void Splash::setStrokeOverprint(bool sop) +{ + state->strokeOverprint = sop; +} + +void Splash::setOverprintMode(int opm) +{ + state->overprintMode = opm; +} + +void Splash::setLineWidth(SplashCoord lineWidth) +{ + state->lineWidth = lineWidth; +} + +void Splash::setLineCap(int lineCap) +{ + state->lineCap = lineCap; +} + +void Splash::setLineJoin(int lineJoin) +{ + state->lineJoin = lineJoin; +} + +void Splash::setMiterLimit(SplashCoord miterLimit) +{ + state->miterLimit = miterLimit; +} + +void Splash::setFlatness(SplashCoord flatness) +{ + if (flatness < 1) { + state->flatness = 1; + } else { + state->flatness = flatness; + } +} + +void Splash::setLineDash(std::vector &&lineDash, SplashCoord lineDashPhase) +{ + state->setLineDash(std::move(lineDash), lineDashPhase); +} + +void Splash::setStrokeAdjust(bool strokeAdjust) +{ + state->strokeAdjust = strokeAdjust; +} + +void Splash::clipResetToRect(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1) +{ + state->clip->resetToRect(x0, y0, x1, y1); +} + +SplashError Splash::clipToRect(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1) +{ + return state->clip->clipToRect(x0, y0, x1, y1); +} + +SplashError Splash::clipToPath(SplashPath *path, bool eo) +{ + return state->clip->clipToPath(path, state->matrix, state->flatness, eo); +} + +void Splash::setSoftMask(SplashBitmap *softMask) +{ + state->setSoftMask(softMask); +} + +void Splash::setInNonIsolatedGroup(SplashBitmap *alpha0BitmapA, int alpha0XA, int alpha0YA) +{ + alpha0Bitmap = alpha0BitmapA; + alpha0X = alpha0XA; + alpha0Y = alpha0YA; + state->inNonIsolatedGroup = true; +} + +void Splash::setTransfer(unsigned char *red, unsigned char *green, unsigned char *blue, unsigned char *gray) +{ + state->setTransfer(red, green, blue, gray); +} + +void Splash::setOverprintMask(unsigned int overprintMask, bool additive) +{ + state->overprintMask = overprintMask; + state->overprintAdditive = additive; +} + +//------------------------------------------------------------------------ +// state save/restore +//------------------------------------------------------------------------ + +void Splash::saveState() +{ + SplashState *newState; + + newState = state->copy(); + newState->next = state; + state = newState; +} + +SplashError Splash::restoreState() +{ + SplashState *oldState; + + if (!state->next) { + return splashErrNoSave; + } + oldState = state; + state = state->next; + delete oldState; + return splashOk; +} + +//------------------------------------------------------------------------ +// drawing operations +//------------------------------------------------------------------------ + +void Splash::clear(SplashColorPtr color, unsigned char alpha) +{ + SplashColorPtr row, p; + unsigned char mono; + int x, y; + + switch (bitmap->mode) { + case splashModeMono1: + mono = (color[0] & 0x80) ? 0xff : 0x00; + if (bitmap->rowSize < 0) { + memset(bitmap->data + bitmap->rowSize * (bitmap->height - 1), mono, -bitmap->rowSize * bitmap->height); + } else { + memset(bitmap->data, mono, bitmap->rowSize * bitmap->height); + } + break; + case splashModeMono8: + if (bitmap->rowSize < 0) { + memset(bitmap->data + bitmap->rowSize * (bitmap->height - 1), color[0], -bitmap->rowSize * bitmap->height); + } else { + memset(bitmap->data, color[0], bitmap->rowSize * bitmap->height); + } + break; + case splashModeRGB8: + if (color[0] == color[1] && color[1] == color[2]) { + if (bitmap->rowSize < 0) { + memset(bitmap->data + bitmap->rowSize * (bitmap->height - 1), color[0], -bitmap->rowSize * bitmap->height); + } else { + memset(bitmap->data, color[0], bitmap->rowSize * bitmap->height); + } + } else { + row = bitmap->data; + for (y = 0; y < bitmap->height; ++y) { + p = row; + for (x = 0; x < bitmap->width; ++x) { + *p++ = color[2]; + *p++ = color[1]; + *p++ = color[0]; + } + row += bitmap->rowSize; + } + } + break; + case splashModeXBGR8: + if (color[0] == color[1] && color[1] == color[2]) { + if (bitmap->rowSize < 0) { + memset(bitmap->data + bitmap->rowSize * (bitmap->height - 1), color[0], -bitmap->rowSize * bitmap->height); + } else { + memset(bitmap->data, color[0], bitmap->rowSize * bitmap->height); + } + } else { + row = bitmap->data; + for (y = 0; y < bitmap->height; ++y) { + p = row; + for (x = 0; x < bitmap->width; ++x) { + *p++ = color[0]; + *p++ = color[1]; + *p++ = color[2]; + *p++ = 255; + } + row += bitmap->rowSize; + } + } + break; + case splashModeBGR8: + if (color[0] == color[1] && color[1] == color[2]) { + if (bitmap->rowSize < 0) { + memset(bitmap->data + bitmap->rowSize * (bitmap->height - 1), color[0], -bitmap->rowSize * bitmap->height); + } else { + memset(bitmap->data, color[0], bitmap->rowSize * bitmap->height); + } + } else { + row = bitmap->data; + for (y = 0; y < bitmap->height; ++y) { + p = row; + for (x = 0; x < bitmap->width; ++x) { + *p++ = color[0]; + *p++ = color[1]; + *p++ = color[2]; + } + row += bitmap->rowSize; + } + } + break; + case splashModeCMYK8: + if (color[0] == color[1] && color[1] == color[2] && color[2] == color[3]) { + if (bitmap->rowSize < 0) { + memset(bitmap->data + bitmap->rowSize * (bitmap->height - 1), color[0], -bitmap->rowSize * bitmap->height); + } else { + memset(bitmap->data, color[0], bitmap->rowSize * bitmap->height); + } + } else { + row = bitmap->data; + for (y = 0; y < bitmap->height; ++y) { + p = row; + for (x = 0; x < bitmap->width; ++x) { + *p++ = color[0]; + *p++ = color[1]; + *p++ = color[2]; + *p++ = color[3]; + } + row += bitmap->rowSize; + } + } + break; + case splashModeDeviceN8: + row = bitmap->data; + for (y = 0; y < bitmap->height; ++y) { + p = row; + for (x = 0; x < bitmap->width; ++x) { + for (int cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + *p++ = color[cp]; + } + } + row += bitmap->rowSize; + } + break; + } + + if (bitmap->alpha) { + memset(bitmap->alpha, alpha, bitmap->width * bitmap->height); + } +} + +SplashError Splash::stroke(SplashPath *path) +{ + SplashPath *path2, *dPath; + SplashCoord d1, d2, t1, t2, w; + + if (debugMode) { + printf("stroke [dash:%zu] [width:%.2f]:\n", state->lineDash.size(), (double)state->lineWidth); + dumpPath(path); + } + opClipRes = splashClipAllOutside; + if (path->length == 0) { + return splashErrEmptyPath; + } + path2 = flattenPath(path, state->matrix, state->flatness); + if (!state->lineDash.empty()) { + dPath = makeDashedPath(path2); + delete path2; + path2 = dPath; + if (path2->length == 0) { + delete path2; + return splashErrEmptyPath; + } + } + + // transform a unit square, and take the half the max of the two + // diagonals; the product of this number and the line width is the + // (approximate) transformed line width + t1 = state->matrix[0] + state->matrix[2]; + t2 = state->matrix[1] + state->matrix[3]; + d1 = t1 * t1 + t2 * t2; + t1 = state->matrix[0] - state->matrix[2]; + t2 = state->matrix[1] - state->matrix[3]; + d2 = t1 * t1 + t2 * t2; + if (d2 > d1) { + d1 = d2; + } + d1 *= 0.5; + if (d1 > 0 && d1 * state->lineWidth * state->lineWidth < minLineWidth * minLineWidth) { + w = minLineWidth / splashSqrt(d1); + strokeWide(path2, w); + } else if (bitmap->mode == splashModeMono1) { + // this gets close to Adobe's behavior in mono mode + if (d1 * state->lineWidth <= 2) { + strokeNarrow(path2); + } else { + strokeWide(path2, state->lineWidth); + } + } else { + if (state->lineWidth == 0) { + strokeNarrow(path2); + } else { + strokeWide(path2, state->lineWidth); + } + } + + delete path2; + return splashOk; +} + +void Splash::strokeNarrow(SplashPath *path) +{ + SplashPipe pipe; + SplashXPathSeg *seg; + int x0, x1, y0, y1, xa, xb, y; + SplashCoord dxdy; + SplashClipResult clipRes; + int nClipRes[3]; + int i; + + nClipRes[0] = nClipRes[1] = nClipRes[2] = 0; + + SplashXPath xPath(path, state->matrix, state->flatness, false); + + pipeInit(&pipe, 0, 0, state->strokePattern, nullptr, (unsigned char)splashRound(state->strokeAlpha * 255), false, false); + + for (i = 0, seg = xPath.segs; i < xPath.length; ++i, ++seg) { + if (seg->y0 <= seg->y1) { + y0 = splashFloor(seg->y0); + y1 = splashFloor(seg->y1); + x0 = splashFloor(seg->x0); + x1 = splashFloor(seg->x1); + } else { + y0 = splashFloor(seg->y1); + y1 = splashFloor(seg->y0); + x0 = splashFloor(seg->x1); + x1 = splashFloor(seg->x0); + } + if ((clipRes = state->clip->testRect(x0 <= x1 ? x0 : x1, y0, x0 <= x1 ? x1 : x0, y1)) != splashClipAllOutside) { + if (y0 == y1) { + if (x0 <= x1) { + drawSpan(&pipe, x0, x1, y0, clipRes == splashClipAllInside); + } else { + drawSpan(&pipe, x1, x0, y0, clipRes == splashClipAllInside); + } + } else { + dxdy = seg->dxdy; + if (y0 < state->clip->getYMinI()) { + y0 = state->clip->getYMinI(); + x0 = splashFloor(seg->x0 + (state->clip->getYMin() - seg->y0) * dxdy); + } + if (y1 > state->clip->getYMaxI()) { + y1 = state->clip->getYMaxI(); + x1 = splashFloor(seg->x0 + (state->clip->getYMax() - seg->y0) * dxdy); + } + if (x0 <= x1) { + xa = x0; + for (y = y0; y <= y1; ++y) { + if (y < y1) { + xb = splashFloor(seg->x0 + ((SplashCoord)y + 1 - seg->y0) * dxdy); + } else { + xb = x1 + 1; + } + if (xa == xb) { + drawPixel(&pipe, xa, y, clipRes == splashClipAllInside); + } else { + drawSpan(&pipe, xa, xb - 1, y, clipRes == splashClipAllInside); + } + xa = xb; + } + } else { + xa = x0; + for (y = y0; y <= y1; ++y) { + if (y < y1) { + xb = splashFloor(seg->x0 + ((SplashCoord)y + 1 - seg->y0) * dxdy); + } else { + xb = x1 - 1; + } + if (xa == xb) { + drawPixel(&pipe, xa, y, clipRes == splashClipAllInside); + } else { + drawSpan(&pipe, xb + 1, xa, y, clipRes == splashClipAllInside); + } + xa = xb; + } + } + } + } + ++nClipRes[clipRes]; + } + if (nClipRes[splashClipPartial] || (nClipRes[splashClipAllInside] && nClipRes[splashClipAllOutside])) { + opClipRes = splashClipPartial; + } else if (nClipRes[splashClipAllInside]) { + opClipRes = splashClipAllInside; + } else { + opClipRes = splashClipAllOutside; + } +} + +void Splash::strokeWide(SplashPath *path, SplashCoord w) +{ + SplashPath *path2; + + path2 = makeStrokePath(path, w, false); + fillWithPattern(path2, false, state->strokePattern, state->strokeAlpha); + delete path2; +} + +SplashPath *Splash::flattenPath(SplashPath *path, SplashCoord *matrix, SplashCoord flatness) +{ + SplashPath *fPath; + SplashCoord flatness2; + unsigned char flag; + int i; + + fPath = new SplashPath(); + flatness2 = flatness * flatness; + i = 0; + while (i < path->length) { + flag = path->flags[i]; + if (flag & splashPathFirst) { + fPath->moveTo(path->pts[i].x, path->pts[i].y); + ++i; + } else { + if (flag & splashPathCurve) { + flattenCurve(path->pts[i - 1].x, path->pts[i - 1].y, path->pts[i].x, path->pts[i].y, path->pts[i + 1].x, path->pts[i + 1].y, path->pts[i + 2].x, path->pts[i + 2].y, matrix, flatness2, fPath); + i += 3; + } else { + fPath->lineTo(path->pts[i].x, path->pts[i].y); + ++i; + } + if (path->flags[i - 1] & splashPathClosed) { + fPath->close(); + } + } + } + return fPath; +} + +void Splash::flattenCurve(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1, SplashCoord x2, SplashCoord y2, SplashCoord x3, SplashCoord y3, SplashCoord *matrix, SplashCoord flatness2, SplashPath *fPath) +{ + SplashCoord cx[splashMaxCurveSplits + 1][3]; + SplashCoord cy[splashMaxCurveSplits + 1][3]; + int cNext[splashMaxCurveSplits + 1]; + SplashCoord xl0, xl1, xl2, xr0, xr1, xr2, xr3, xx1, xx2, xh; + SplashCoord yl0, yl1, yl2, yr0, yr1, yr2, yr3, yy1, yy2, yh; + SplashCoord dx, dy, mx, my, tx, ty, d1, d2; + int p1, p2, p3; + + // initial segment + p1 = 0; + p2 = splashMaxCurveSplits; + cx[p1][0] = x0; + cy[p1][0] = y0; + cx[p1][1] = x1; + cy[p1][1] = y1; + cx[p1][2] = x2; + cy[p1][2] = y2; + cx[p2][0] = x3; + cy[p2][0] = y3; + cNext[p1] = p2; + + while (p1 < splashMaxCurveSplits) { + + // get the next segment + xl0 = cx[p1][0]; + yl0 = cy[p1][0]; + xx1 = cx[p1][1]; + yy1 = cy[p1][1]; + xx2 = cx[p1][2]; + yy2 = cy[p1][2]; + p2 = cNext[p1]; + xr3 = cx[p2][0]; + yr3 = cy[p2][0]; + + // compute the distances (in device space) from the control points + // to the midpoint of the straight line (this is a bit of a hack, + // but it's much faster than computing the actual distances to the + // line) + transform(matrix, (xl0 + xr3) * 0.5, (yl0 + yr3) * 0.5, &mx, &my); + transform(matrix, xx1, yy1, &tx, &ty); + dx = tx - mx; + dy = ty - my; + d1 = dx * dx + dy * dy; + transform(matrix, xx2, yy2, &tx, &ty); + dx = tx - mx; + dy = ty - my; + d2 = dx * dx + dy * dy; + + // if the curve is flat enough, or no more subdivisions are + // allowed, add the straight line segment + if (p2 - p1 == 1 || (d1 <= flatness2 && d2 <= flatness2)) { + fPath->lineTo(xr3, yr3); + p1 = p2; + + // otherwise, subdivide the curve + } else { + xl1 = splashAvg(xl0, xx1); + yl1 = splashAvg(yl0, yy1); + xh = splashAvg(xx1, xx2); + yh = splashAvg(yy1, yy2); + xl2 = splashAvg(xl1, xh); + yl2 = splashAvg(yl1, yh); + xr2 = splashAvg(xx2, xr3); + yr2 = splashAvg(yy2, yr3); + xr1 = splashAvg(xh, xr2); + yr1 = splashAvg(yh, yr2); + xr0 = splashAvg(xl2, xr1); + yr0 = splashAvg(yl2, yr1); + // add the new subdivision points + p3 = (p1 + p2) / 2; + cx[p1][1] = xl1; + cy[p1][1] = yl1; + cx[p1][2] = xl2; + cy[p1][2] = yl2; + cNext[p1] = p3; + cx[p3][0] = xr0; + cy[p3][0] = yr0; + cx[p3][1] = xr1; + cy[p3][1] = yr1; + cx[p3][2] = xr2; + cy[p3][2] = yr2; + cNext[p3] = p2; + } + } +} + +SplashPath *Splash::makeDashedPath(SplashPath *path) +{ + SplashPath *dPath; + SplashCoord lineDashTotal; + SplashCoord lineDashStartPhase, lineDashDist, segLen; + SplashCoord x0, y0, x1, y1, xa, ya; + bool lineDashStartOn, lineDashOn, newPath; + int i, j, k; + + lineDashTotal = 0; + for (SplashCoord dash : state->lineDash) { + lineDashTotal += dash; + } + // Acrobat simply draws nothing if the dash array is [0] + if (lineDashTotal == 0) { + return new SplashPath(); + } + lineDashStartPhase = state->lineDashPhase; + i = splashFloor(lineDashStartPhase / lineDashTotal); + lineDashStartPhase -= (SplashCoord)i * lineDashTotal; + lineDashStartOn = true; + size_t lineDashStartIdx = 0; + if (lineDashStartPhase > 0) { + while (lineDashStartIdx < state->lineDash.size() && lineDashStartPhase >= state->lineDash[lineDashStartIdx]) { + lineDashStartOn = !lineDashStartOn; + lineDashStartPhase -= state->lineDash[lineDashStartIdx]; + ++lineDashStartIdx; + } + if (unlikely(lineDashStartIdx == state->lineDash.size())) { + return new SplashPath(); + } + } + + dPath = new SplashPath(); + + // process each subpath + i = 0; + while (i < path->length) { + + // find the end of the subpath + for (j = i; j < path->length - 1 && !(path->flags[j] & splashPathLast); ++j) { + ; + } + + // initialize the dash parameters + lineDashOn = lineDashStartOn; + size_t lineDashIdx = lineDashStartIdx; + lineDashDist = state->lineDash[lineDashIdx] - lineDashStartPhase; + + // process each segment of the subpath + newPath = true; + for (k = i; k < j; ++k) { + + // grab the segment + x0 = path->pts[k].x; + y0 = path->pts[k].y; + x1 = path->pts[k + 1].x; + y1 = path->pts[k + 1].y; + segLen = splashDist(x0, y0, x1, y1); + + // process the segment + while (segLen > 0) { + + if (lineDashDist >= segLen) { + if (lineDashOn) { + if (newPath) { + dPath->moveTo(x0, y0); + newPath = false; + } + dPath->lineTo(x1, y1); + } + lineDashDist -= segLen; + segLen = 0; + + } else { + xa = x0 + (lineDashDist / segLen) * (x1 - x0); + ya = y0 + (lineDashDist / segLen) * (y1 - y0); + if (lineDashOn) { + if (newPath) { + dPath->moveTo(x0, y0); + newPath = false; + } + dPath->lineTo(xa, ya); + } + x0 = xa; + y0 = ya; + segLen -= lineDashDist; + lineDashDist = 0; + } + + // get the next entry in the dash array + if (lineDashDist <= 0) { + lineDashOn = !lineDashOn; + if (++lineDashIdx == state->lineDash.size()) { + lineDashIdx = 0; + } + lineDashDist = state->lineDash[lineDashIdx]; + newPath = true; + } + } + } + i = j + 1; + } + + if (dPath->length == 0) { + bool allSame = true; + for (i = 0; allSame && i < path->length - 1; ++i) { + allSame = path->pts[i].x == path->pts[i + 1].x && path->pts[i].y == path->pts[i + 1].y; + } + if (allSame) { + x0 = path->pts[0].x; + y0 = path->pts[0].y; + dPath->moveTo(x0, y0); + dPath->lineTo(x0, y0); + } + } + + return dPath; +} + +SplashError Splash::fill(SplashPath *path, bool eo) +{ + if (debugMode) { + printf("fill [eo:%d]:\n", eo); + dumpPath(path); + } + return fillWithPattern(path, eo, state->fillPattern, state->fillAlpha); +} + +inline void Splash::getBBoxFP(SplashPath *path, SplashCoord *xMinA, SplashCoord *yMinA, SplashCoord *xMaxA, SplashCoord *yMaxA) +{ + SplashCoord xMinFP, yMinFP, xMaxFP, yMaxFP, tx, ty; + + // make compiler happy: + xMinFP = xMaxFP = yMinFP = yMaxFP = 0; + for (int i = 0; i < path->length; ++i) { + transform(state->matrix, path->pts[i].x, path->pts[i].y, &tx, &ty); + if (i == 0) { + xMinFP = xMaxFP = tx; + yMinFP = yMaxFP = ty; + } else { + if (tx < xMinFP) { + xMinFP = tx; + } + if (tx > xMaxFP) { + xMaxFP = tx; + } + if (ty < yMinFP) { + yMinFP = ty; + } + if (ty > yMaxFP) { + yMaxFP = ty; + } + } + } + + *xMinA = xMinFP; + *yMinA = yMinFP; + *xMaxA = xMaxFP; + *yMaxA = yMaxFP; +} + +SplashError Splash::fillWithPattern(SplashPath *path, bool eo, SplashPattern *pattern, SplashCoord alpha) +{ + SplashPipe pipe = {}; + int xMinI, yMinI, xMaxI, yMaxI, x0, x1, y; + SplashClipResult clipRes, clipRes2; + bool adjustLine = false; + int linePosI = 0; + + if (path->length == 0) { + return splashErrEmptyPath; + } + if (pathAllOutside(path)) { + opClipRes = splashClipAllOutside; + return splashOk; + } + + // add stroke adjustment hints for filled rectangles -- this only + // applies to paths that consist of a single subpath + // (this appears to match Acrobat's behavior) + if (state->strokeAdjust && !path->hints) { + int n; + n = path->getLength(); + if (n == 4 && !(path->flags[0] & splashPathClosed) && !(path->flags[1] & splashPathLast) && !(path->flags[2] & splashPathLast)) { + path->close(true); + path->addStrokeAdjustHint(0, 2, 0, 4); + path->addStrokeAdjustHint(1, 3, 0, 4); + } else if (n == 5 && (path->flags[0] & splashPathClosed) && !(path->flags[1] & splashPathLast) && !(path->flags[2] & splashPathLast) && !(path->flags[3] & splashPathLast)) { + path->addStrokeAdjustHint(0, 2, 0, 4); + path->addStrokeAdjustHint(1, 3, 0, 4); + } + } + + if (thinLineMode != splashThinLineDefault) { + if (state->clip->getXMinI() == state->clip->getXMaxI()) { + linePosI = state->clip->getXMinI(); + adjustLine = true; + } else if (state->clip->getXMinI() == state->clip->getXMaxI() - 1) { + adjustLine = true; + linePosI = splashFloor(state->clip->getXMin() + state->lineWidth); + } else if (state->clip->getYMinI() == state->clip->getYMaxI()) { + linePosI = state->clip->getYMinI(); + adjustLine = true; + } else if (state->clip->getYMinI() == state->clip->getYMaxI() - 1) { + adjustLine = true; + linePosI = splashFloor(state->clip->getYMin() + state->lineWidth); + } + } + + SplashXPath xPath(path, state->matrix, state->flatness, true, adjustLine, linePosI); + if (vectorAntialias && !inShading) { + xPath.aaScale(); + } + xPath.sort(); + yMinI = state->clip->getYMinI(); + yMaxI = state->clip->getYMaxI(); + if (vectorAntialias && !inShading) { + yMinI = yMinI * splashAASize; + yMaxI = (yMaxI + 1) * splashAASize - 1; + } + SplashXPathScanner scanner(xPath, eo, yMinI, yMaxI); + + // get the min and max x and y values + if (vectorAntialias && !inShading) { + scanner.getBBoxAA(&xMinI, &yMinI, &xMaxI, &yMaxI); + } else { + scanner.getBBox(&xMinI, &yMinI, &xMaxI, &yMaxI); + } + + if (eo && (yMinI == yMaxI || xMinI == xMaxI) && thinLineMode != splashThinLineDefault) { + SplashCoord delta, xMinFP, yMinFP, xMaxFP, yMaxFP; + getBBoxFP(path, &xMinFP, &yMinFP, &xMaxFP, &yMaxFP); + delta = (yMinI == yMaxI) ? yMaxFP - yMinFP : xMaxFP - xMinFP; + if (delta < 0.2) { + opClipRes = splashClipAllOutside; + return splashOk; + } + } + + // check clipping + if ((clipRes = state->clip->testRect(xMinI, yMinI, xMaxI, yMaxI)) != splashClipAllOutside) { + if (scanner.hasPartialClip()) { + clipRes = splashClipPartial; + } + + pipeInit(&pipe, 0, yMinI, pattern, nullptr, (unsigned char)splashRound(alpha * 255), vectorAntialias && !inShading, false); + + // draw the spans + if (vectorAntialias && !inShading) { + for (y = yMinI; y <= yMaxI; ++y) { + scanner.renderAALine(aaBuf, &x0, &x1, y, thinLineMode != splashThinLineDefault && xMinI == xMaxI); + if (clipRes != splashClipAllInside) { + state->clip->clipAALine(aaBuf, &x0, &x1, y, thinLineMode != splashThinLineDefault && xMinI == xMaxI); + } + unsigned char lineShape = 255; + bool doAdjustLine = false; + if (thinLineMode == splashThinLineShape && (xMinI == xMaxI || yMinI == yMaxI)) { + // compute line shape for thin lines: + SplashCoord mx, my, delta; + transform(state->matrix, 0, 0, &mx, &my); + transform(state->matrix, state->lineWidth, 0, &delta, &my); + doAdjustLine = true; + lineShape = clip255(static_cast((delta - mx) * 255)); + } + drawAALine(&pipe, x0, x1, y, doAdjustLine, lineShape); + } + } else { + for (y = yMinI; y <= yMaxI; ++y) { + SplashXPathScanIterator iterator(scanner, y); + while (iterator.getNextSpan(&x0, &x1)) { + if (clipRes == splashClipAllInside) { + drawSpan(&pipe, x0, x1, y, true); + } else { + // limit the x range + if (x0 < state->clip->getXMinI()) { + x0 = state->clip->getXMinI(); + } + if (x1 > state->clip->getXMaxI()) { + x1 = state->clip->getXMaxI(); + } + clipRes2 = state->clip->testSpan(x0, x1, y); + drawSpan(&pipe, x0, x1, y, clipRes2 == splashClipAllInside); + } + } + } + } + } + opClipRes = clipRes; + + return splashOk; +} + +bool Splash::pathAllOutside(SplashPath *path) +{ + SplashCoord xMin1, yMin1, xMax1, yMax1; + SplashCoord xMin2, yMin2, xMax2, yMax2; + SplashCoord x, y; + int xMinI, yMinI, xMaxI, yMaxI; + int i; + + xMin1 = xMax1 = path->pts[0].x; + yMin1 = yMax1 = path->pts[0].y; + for (i = 1; i < path->length; ++i) { + if (path->pts[i].x < xMin1) { + xMin1 = path->pts[i].x; + } else if (path->pts[i].x > xMax1) { + xMax1 = path->pts[i].x; + } + if (path->pts[i].y < yMin1) { + yMin1 = path->pts[i].y; + } else if (path->pts[i].y > yMax1) { + yMax1 = path->pts[i].y; + } + } + + transform(state->matrix, xMin1, yMin1, &x, &y); + xMin2 = xMax2 = x; + yMin2 = yMax2 = y; + transform(state->matrix, xMin1, yMax1, &x, &y); + if (x < xMin2) { + xMin2 = x; + } else if (x > xMax2) { + xMax2 = x; + } + if (y < yMin2) { + yMin2 = y; + } else if (y > yMax2) { + yMax2 = y; + } + transform(state->matrix, xMax1, yMin1, &x, &y); + if (x < xMin2) { + xMin2 = x; + } else if (x > xMax2) { + xMax2 = x; + } + if (y < yMin2) { + yMin2 = y; + } else if (y > yMax2) { + yMax2 = y; + } + transform(state->matrix, xMax1, yMax1, &x, &y); + if (x < xMin2) { + xMin2 = x; + } else if (x > xMax2) { + xMax2 = x; + } + if (y < yMin2) { + yMin2 = y; + } else if (y > yMax2) { + yMax2 = y; + } + xMinI = splashFloor(xMin2); + yMinI = splashFloor(yMin2); + xMaxI = splashFloor(xMax2); + yMaxI = splashFloor(yMax2); + + return state->clip->testRect(xMinI, yMinI, xMaxI, yMaxI) == splashClipAllOutside; +} + +SplashError Splash::xorFill(SplashPath *path, bool eo) +{ + SplashPipe pipe; + int xMinI, yMinI, xMaxI, yMaxI, x0, x1, y; + SplashClipResult clipRes, clipRes2; + SplashBlendFunc origBlendFunc; + + if (path->length == 0) { + return splashErrEmptyPath; + } + SplashXPath xPath(path, state->matrix, state->flatness, true); + xPath.sort(); + SplashXPathScanner scanner(xPath, eo, state->clip->getYMinI(), state->clip->getYMaxI()); + + // get the min and max x and y values + scanner.getBBox(&xMinI, &yMinI, &xMaxI, &yMaxI); + + // check clipping + if ((clipRes = state->clip->testRect(xMinI, yMinI, xMaxI, yMaxI)) != splashClipAllOutside) { + if (scanner.hasPartialClip()) { + clipRes = splashClipPartial; + } + + origBlendFunc = state->blendFunc; + state->blendFunc = &blendXor; + pipeInit(&pipe, 0, yMinI, state->fillPattern, nullptr, 255, false, false); + + // draw the spans + for (y = yMinI; y <= yMaxI; ++y) { + SplashXPathScanIterator iterator(scanner, y); + while (iterator.getNextSpan(&x0, &x1)) { + if (clipRes == splashClipAllInside) { + drawSpan(&pipe, x0, x1, y, true); + } else { + // limit the x range + if (x0 < state->clip->getXMinI()) { + x0 = state->clip->getXMinI(); + } + if (x1 > state->clip->getXMaxI()) { + x1 = state->clip->getXMaxI(); + } + clipRes2 = state->clip->testSpan(x0, x1, y); + drawSpan(&pipe, x0, x1, y, clipRes2 == splashClipAllInside); + } + } + } + state->blendFunc = origBlendFunc; + } + opClipRes = clipRes; + + return splashOk; +} + +SplashError Splash::fillChar(SplashCoord x, SplashCoord y, int c, SplashFont *font) +{ + SplashGlyphBitmap glyph; + SplashCoord xt, yt; + int x0, y0, xFrac, yFrac; + SplashClipResult clipRes; + + if (debugMode) { + printf("fillChar: x=%.2f y=%.2f c=%3d=0x%02x='%c'\n", (double)x, (double)y, c, c, c); + } + transform(state->matrix, x, y, &xt, &yt); + x0 = splashFloor(xt); + xFrac = splashFloor((xt - x0) * splashFontFraction); + y0 = splashFloor(yt); + yFrac = splashFloor((yt - y0) * splashFontFraction); + if (!font->getGlyph(c, xFrac, yFrac, &glyph, x0, y0, state->clip, &clipRes)) { + return splashErrNoGlyph; + } + if (clipRes != splashClipAllOutside) { + fillGlyph2(x0, y0, &glyph, clipRes == splashClipAllInside); + } + opClipRes = clipRes; + if (glyph.freeData) { + gfree(glyph.data); + } + return splashOk; +} + +void Splash::fillGlyph(SplashCoord x, SplashCoord y, SplashGlyphBitmap *glyph) +{ + SplashCoord xt, yt; + int x0, y0; + + transform(state->matrix, x, y, &xt, &yt); + x0 = splashFloor(xt); + y0 = splashFloor(yt); + SplashClipResult clipRes = state->clip->testRect(x0 - glyph->x, y0 - glyph->y, x0 - glyph->x + glyph->w - 1, y0 - glyph->y + glyph->h - 1); + if (clipRes != splashClipAllOutside) { + fillGlyph2(x0, y0, glyph, clipRes == splashClipAllInside); + } + opClipRes = clipRes; +} + +void Splash::fillGlyph2(int x0, int y0, SplashGlyphBitmap *glyph, bool noClip) +{ + SplashPipe pipe; + int alpha0; + unsigned char alpha; + unsigned char *p; + int x1, y1, xx, xx1, yy; + + p = glyph->data; + int xStart = x0 - glyph->x; + int yStart = y0 - glyph->y; + int xxLimit = glyph->w; + int yyLimit = glyph->h; + int xShift = 0; + + if (yStart < 0) { + p += (glyph->aa ? glyph->w : splashCeil(glyph->w / 8.0)) * -yStart; // move p to the beginning of the first painted row + yyLimit += yStart; + yStart = 0; + } + + if (xStart < 0) { + if (glyph->aa) { + p += -xStart; + } else { + p += (-xStart) / 8; + xShift = (-xStart) % 8; + } + xxLimit += xStart; + xStart = 0; + } + + if (xxLimit + xStart >= bitmap->width) { + xxLimit = bitmap->width - xStart; + } + if (yyLimit + yStart >= bitmap->height) { + yyLimit = bitmap->height - yStart; + } + + if (noClip) { + if (glyph->aa) { + pipeInit(&pipe, xStart, yStart, state->fillPattern, nullptr, (unsigned char)splashRound(state->fillAlpha * 255), true, false); + for (yy = 0, y1 = yStart; yy < yyLimit; ++yy, ++y1) { + pipeSetXY(&pipe, xStart, y1); + for (xx = 0, x1 = xStart; xx < xxLimit; ++xx, ++x1) { + alpha = p[xx]; + if (alpha != 0) { + pipe.shape = alpha; + (this->*pipe.run)(&pipe); + } else { + pipeIncX(&pipe); + } + } + p += glyph->w; + } + } else { + const int widthEight = splashCeil(glyph->w / 8.0); + + pipeInit(&pipe, xStart, yStart, state->fillPattern, nullptr, (unsigned char)splashRound(state->fillAlpha * 255), false, false); + for (yy = 0, y1 = yStart; yy < yyLimit; ++yy, ++y1) { + pipeSetXY(&pipe, xStart, y1); + for (xx = 0, x1 = xStart; xx < xxLimit; xx += 8) { + alpha0 = (xShift > 0 && xx < xxLimit - 8 ? (p[xx / 8] << xShift) | (p[xx / 8 + 1] >> (8 - xShift)) : p[xx / 8]); + for (xx1 = 0; xx1 < 8 && xx + xx1 < xxLimit; ++xx1, ++x1) { + if (alpha0 & 0x80) { + (this->*pipe.run)(&pipe); + } else { + pipeIncX(&pipe); + } + alpha0 <<= 1; + } + } + p += widthEight; + } + } + } else { + if (glyph->aa) { + pipeInit(&pipe, xStart, yStart, state->fillPattern, nullptr, (unsigned char)splashRound(state->fillAlpha * 255), true, false); + for (yy = 0, y1 = yStart; yy < yyLimit; ++yy, ++y1) { + pipeSetXY(&pipe, xStart, y1); + for (xx = 0, x1 = xStart; xx < xxLimit; ++xx, ++x1) { + if (state->clip->test(x1, y1)) { + alpha = p[xx]; + if (alpha != 0) { + pipe.shape = alpha; + (this->*pipe.run)(&pipe); + } else { + pipeIncX(&pipe); + } + } else { + pipeIncX(&pipe); + } + } + p += glyph->w; + } + } else { + const int widthEight = splashCeil(glyph->w / 8.0); + + pipeInit(&pipe, xStart, yStart, state->fillPattern, nullptr, (unsigned char)splashRound(state->fillAlpha * 255), false, false); + for (yy = 0, y1 = yStart; yy < yyLimit; ++yy, ++y1) { + pipeSetXY(&pipe, xStart, y1); + for (xx = 0, x1 = xStart; xx < xxLimit; xx += 8) { + alpha0 = (xShift > 0 && xx < xxLimit - 8 ? (p[xx / 8] << xShift) | (p[xx / 8 + 1] >> (8 - xShift)) : p[xx / 8]); + for (xx1 = 0; xx1 < 8 && xx + xx1 < xxLimit; ++xx1, ++x1) { + if (state->clip->test(x1, y1)) { + if (alpha0 & 0x80) { + (this->*pipe.run)(&pipe); + } else { + pipeIncX(&pipe); + } + } else { + pipeIncX(&pipe); + } + alpha0 <<= 1; + } + } + p += widthEight; + } + } + } +} + +SplashError Splash::fillImageMask(SplashImageMaskSource src, void *srcData, int w, int h, SplashCoord *mat, bool glyphMode) +{ + SplashBitmap *scaledMask; + SplashClipResult clipRes; + bool minorAxisZero; + int x0, y0, x1, y1, scaledWidth, scaledHeight; + int yp; + + if (debugMode) { + printf("fillImageMask: w=%d h=%d mat=[%.2f %.2f %.2f %.2f %.2f %.2f]\n", w, h, (double)mat[0], (double)mat[1], (double)mat[2], (double)mat[3], (double)mat[4], (double)mat[5]); + } + + if (w == 0 && h == 0) { + return splashErrZeroImage; + } + + // check for singular matrix + if (!splashCheckDet(mat[0], mat[1], mat[2], mat[3], 0.000001)) { + return splashErrSingularMatrix; + } + + minorAxisZero = mat[1] == 0 && mat[2] == 0; + + // scaling only + if (mat[0] > 0 && minorAxisZero && mat[3] > 0) { + x0 = imgCoordMungeLowerC(mat[4], glyphMode); + y0 = imgCoordMungeLowerC(mat[5], glyphMode); + x1 = imgCoordMungeUpperC(mat[0] + mat[4], glyphMode); + y1 = imgCoordMungeUpperC(mat[3] + mat[5], glyphMode); + // make sure narrow images cover at least one pixel + if (x0 == x1) { + ++x1; + } + if (y0 == y1) { + ++y1; + } + clipRes = state->clip->testRect(x0, y0, x1 - 1, y1 - 1); + opClipRes = clipRes; + if (clipRes != splashClipAllOutside) { + scaledWidth = x1 - x0; + scaledHeight = y1 - y0; + yp = h / scaledHeight; + if (yp < 0 || yp > INT_MAX - 1) { + return splashErrBadArg; + } + scaledMask = scaleMask(src, srcData, w, h, scaledWidth, scaledHeight); + blitMask(scaledMask, x0, y0, clipRes); + delete scaledMask; + } + + // scaling plus vertical flip + } else if (mat[0] > 0 && minorAxisZero && mat[3] < 0) { + x0 = imgCoordMungeLowerC(mat[4], glyphMode); + y0 = imgCoordMungeLowerC(mat[3] + mat[5], glyphMode); + x1 = imgCoordMungeUpperC(mat[0] + mat[4], glyphMode); + y1 = imgCoordMungeUpperC(mat[5], glyphMode); + // make sure narrow images cover at least one pixel + if (x0 == x1) { + ++x1; + } + if (y0 == y1) { + ++y1; + } + clipRes = state->clip->testRect(x0, y0, x1 - 1, y1 - 1); + opClipRes = clipRes; + if (clipRes != splashClipAllOutside) { + scaledWidth = x1 - x0; + scaledHeight = y1 - y0; + yp = h / scaledHeight; + if (yp < 0 || yp > INT_MAX - 1) { + return splashErrBadArg; + } + scaledMask = scaleMask(src, srcData, w, h, scaledWidth, scaledHeight); + vertFlipImage(scaledMask, scaledWidth, scaledHeight, 1); + blitMask(scaledMask, x0, y0, clipRes); + delete scaledMask; + } + + // all other cases + } else { + arbitraryTransformMask(src, srcData, w, h, mat, glyphMode); + } + + return splashOk; +} + +void Splash::arbitraryTransformMask(SplashImageMaskSource src, void *srcData, int srcWidth, int srcHeight, SplashCoord *mat, bool glyphMode) +{ + SplashBitmap *scaledMask; + SplashClipResult clipRes, clipRes2; + SplashPipe pipe; + int scaledWidth, scaledHeight, t0, t1; + SplashCoord r00, r01, r10, r11, det, ir00, ir01, ir10, ir11; + SplashCoord vx[4], vy[4]; + int xMin, yMin, xMax, yMax; + ImageSection section[3]; + int nSections; + int y, xa, xb, x, i, xx, yy; + + // compute the four vertices of the target quadrilateral + vx[0] = mat[4]; + vy[0] = mat[5]; + vx[1] = mat[2] + mat[4]; + vy[1] = mat[3] + mat[5]; + vx[2] = mat[0] + mat[2] + mat[4]; + vy[2] = mat[1] + mat[3] + mat[5]; + vx[3] = mat[0] + mat[4]; + vy[3] = mat[1] + mat[5]; + + // make sure vx/vy fit in integers since we're transforming them to in the next lines + for (i = 0; i < 4; ++i) { + if (unlikely(vx[i] < INT_MIN || vx[i] > INT_MAX || vy[i] < INT_MIN || vy[i] > INT_MAX)) { + error(errInternal, -1, "arbitraryTransformMask vertices values don't fit in an integer"); + return; + } + } + + // clipping + xMin = imgCoordMungeLowerC(vx[0], glyphMode); + xMax = imgCoordMungeUpperC(vx[0], glyphMode); + yMin = imgCoordMungeLowerC(vy[0], glyphMode); + yMax = imgCoordMungeUpperC(vy[0], glyphMode); + for (i = 1; i < 4; ++i) { + t0 = imgCoordMungeLowerC(vx[i], glyphMode); + if (t0 < xMin) { + xMin = t0; + } + t0 = imgCoordMungeUpperC(vx[i], glyphMode); + if (t0 > xMax) { + xMax = t0; + } + t1 = imgCoordMungeLowerC(vy[i], glyphMode); + if (t1 < yMin) { + yMin = t1; + } + t1 = imgCoordMungeUpperC(vy[i], glyphMode); + if (t1 > yMax) { + yMax = t1; + } + } + clipRes = state->clip->testRect(xMin, yMin, xMax - 1, yMax - 1); + opClipRes = clipRes; + if (clipRes == splashClipAllOutside) { + return; + } + + // compute the scale factors + if (mat[0] >= 0) { + t0 = imgCoordMungeUpperC(mat[0] + mat[4], glyphMode) - imgCoordMungeLowerC(mat[4], glyphMode); + } else { + t0 = imgCoordMungeUpperC(mat[4], glyphMode) - imgCoordMungeLowerC(mat[0] + mat[4], glyphMode); + } + if (mat[1] >= 0) { + t1 = imgCoordMungeUpperC(mat[1] + mat[5], glyphMode) - imgCoordMungeLowerC(mat[5], glyphMode); + } else { + t1 = imgCoordMungeUpperC(mat[5], glyphMode) - imgCoordMungeLowerC(mat[1] + mat[5], glyphMode); + } + scaledWidth = t0 > t1 ? t0 : t1; + if (mat[2] >= 0) { + t0 = imgCoordMungeUpperC(mat[2] + mat[4], glyphMode) - imgCoordMungeLowerC(mat[4], glyphMode); + } else { + t0 = imgCoordMungeUpperC(mat[4], glyphMode) - imgCoordMungeLowerC(mat[2] + mat[4], glyphMode); + } + if (mat[3] >= 0) { + t1 = imgCoordMungeUpperC(mat[3] + mat[5], glyphMode) - imgCoordMungeLowerC(mat[5], glyphMode); + } else { + t1 = imgCoordMungeUpperC(mat[5], glyphMode) - imgCoordMungeLowerC(mat[3] + mat[5], glyphMode); + } + scaledHeight = t0 > t1 ? t0 : t1; + if (scaledWidth == 0) { + scaledWidth = 1; + } + if (scaledHeight == 0) { + scaledHeight = 1; + } + + // compute the inverse transform (after scaling) matrix + r00 = mat[0] / scaledWidth; + r01 = mat[1] / scaledWidth; + r10 = mat[2] / scaledHeight; + r11 = mat[3] / scaledHeight; + det = r00 * r11 - r01 * r10; + if (splashAbs(det) < 1e-6) { + // this should be caught by the singular matrix check in fillImageMask + return; + } + ir00 = r11 / det; + ir01 = -r01 / det; + ir10 = -r10 / det; + ir11 = r00 / det; + + // scale the input image + scaledMask = scaleMask(src, srcData, srcWidth, srcHeight, scaledWidth, scaledHeight); + if (scaledMask->data == nullptr) { + error(errInternal, -1, "scaledMask->data is NULL in Splash::arbitraryTransformMask"); + delete scaledMask; + return; + } + + // construct the three sections + i = (vy[2] <= vy[3]) ? 2 : 3; + if (vy[1] <= vy[i]) { + i = 1; + } + if (vy[0] < vy[i] || (i != 3 && vy[0] == vy[i])) { + i = 0; + } + if (vy[i] == vy[(i + 1) & 3]) { + section[0].y0 = imgCoordMungeLowerC(vy[i], glyphMode); + section[0].y1 = imgCoordMungeUpperC(vy[(i + 2) & 3], glyphMode) - 1; + if (vx[i] < vx[(i + 1) & 3]) { + section[0].ia0 = i; + section[0].ia1 = (i + 3) & 3; + section[0].ib0 = (i + 1) & 3; + section[0].ib1 = (i + 2) & 3; + } else { + section[0].ia0 = (i + 1) & 3; + section[0].ia1 = (i + 2) & 3; + section[0].ib0 = i; + section[0].ib1 = (i + 3) & 3; + } + nSections = 1; + } else { + section[0].y0 = imgCoordMungeLowerC(vy[i], glyphMode); + section[2].y1 = imgCoordMungeUpperC(vy[(i + 2) & 3], glyphMode) - 1; + section[0].ia0 = section[0].ib0 = i; + section[2].ia1 = section[2].ib1 = (i + 2) & 3; + if (vx[(i + 1) & 3] < vx[(i + 3) & 3]) { + section[0].ia1 = section[2].ia0 = (i + 1) & 3; + section[0].ib1 = section[2].ib0 = (i + 3) & 3; + } else { + section[0].ia1 = section[2].ia0 = (i + 3) & 3; + section[0].ib1 = section[2].ib0 = (i + 1) & 3; + } + if (vy[(i + 1) & 3] < vy[(i + 3) & 3]) { + section[1].y0 = imgCoordMungeLowerC(vy[(i + 1) & 3], glyphMode); + section[2].y0 = imgCoordMungeUpperC(vy[(i + 3) & 3], glyphMode); + if (vx[(i + 1) & 3] < vx[(i + 3) & 3]) { + section[1].ia0 = (i + 1) & 3; + section[1].ia1 = (i + 2) & 3; + section[1].ib0 = i; + section[1].ib1 = (i + 3) & 3; + } else { + section[1].ia0 = i; + section[1].ia1 = (i + 3) & 3; + section[1].ib0 = (i + 1) & 3; + section[1].ib1 = (i + 2) & 3; + } + } else { + section[1].y0 = imgCoordMungeLowerC(vy[(i + 3) & 3], glyphMode); + section[2].y0 = imgCoordMungeUpperC(vy[(i + 1) & 3], glyphMode); + if (vx[(i + 1) & 3] < vx[(i + 3) & 3]) { + section[1].ia0 = i; + section[1].ia1 = (i + 1) & 3; + section[1].ib0 = (i + 3) & 3; + section[1].ib1 = (i + 2) & 3; + } else { + section[1].ia0 = (i + 3) & 3; + section[1].ia1 = (i + 2) & 3; + section[1].ib0 = i; + section[1].ib1 = (i + 1) & 3; + } + } + section[0].y1 = section[1].y0 - 1; + section[1].y1 = section[2].y0 - 1; + nSections = 3; + } + for (i = 0; i < nSections; ++i) { + section[i].xa0 = vx[section[i].ia0]; + section[i].ya0 = vy[section[i].ia0]; + section[i].xa1 = vx[section[i].ia1]; + section[i].ya1 = vy[section[i].ia1]; + section[i].xb0 = vx[section[i].ib0]; + section[i].yb0 = vy[section[i].ib0]; + section[i].xb1 = vx[section[i].ib1]; + section[i].yb1 = vy[section[i].ib1]; + section[i].dxdya = (section[i].xa1 - section[i].xa0) / (section[i].ya1 - section[i].ya0); + section[i].dxdyb = (section[i].xb1 - section[i].xb0) / (section[i].yb1 - section[i].yb0); + } + + // initialize the pixel pipe + pipeInit(&pipe, 0, 0, state->fillPattern, nullptr, (unsigned char)splashRound(state->fillAlpha * 255), true, false); + if (vectorAntialias) { + drawAAPixelInit(); + } + + // make sure narrow images cover at least one pixel + if (nSections == 1) { + if (section[0].y0 == section[0].y1) { + ++section[0].y1; + clipRes = opClipRes = splashClipPartial; + } + } else { + if (section[0].y0 == section[2].y1) { + ++section[1].y1; + clipRes = opClipRes = splashClipPartial; + } + } + + // scan all pixels inside the target region + for (i = 0; i < nSections; ++i) { + for (y = section[i].y0; y <= section[i].y1; ++y) { + xa = imgCoordMungeLowerC(section[i].xa0 + ((SplashCoord)y + 0.5 - section[i].ya0) * section[i].dxdya, glyphMode); + xb = imgCoordMungeUpperC(section[i].xb0 + ((SplashCoord)y + 0.5 - section[i].yb0) * section[i].dxdyb, glyphMode); + if (unlikely(xa < 0)) { + xa = 0; + } + // make sure narrow images cover at least one pixel + if (xa == xb) { + ++xb; + } + if (clipRes != splashClipAllInside) { + clipRes2 = state->clip->testSpan(xa, xb - 1, y); + } else { + clipRes2 = clipRes; + } + for (x = xa; x < xb; ++x) { + // map (x+0.5, y+0.5) back to the scaled image + xx = splashFloor(((SplashCoord)x + 0.5 - mat[4]) * ir00 + ((SplashCoord)y + 0.5 - mat[5]) * ir10); + yy = splashFloor(((SplashCoord)x + 0.5 - mat[4]) * ir01 + ((SplashCoord)y + 0.5 - mat[5]) * ir11); + // xx should always be within bounds, but floating point + // inaccuracy can cause problems + if (unlikely(xx < 0)) { + xx = 0; + clipRes2 = splashClipPartial; + } else if (unlikely(xx >= scaledWidth)) { + xx = scaledWidth - 1; + clipRes2 = splashClipPartial; + } + if (unlikely(yy < 0)) { + yy = 0; + clipRes2 = splashClipPartial; + } else if (unlikely(yy >= scaledHeight)) { + yy = scaledHeight - 1; + clipRes2 = splashClipPartial; + } + pipe.shape = scaledMask->data[yy * scaledWidth + xx]; + if (vectorAntialias && clipRes2 != splashClipAllInside) { + drawAAPixel(&pipe, x, y); + } else { + drawPixel(&pipe, x, y, clipRes2 == splashClipAllInside); + } + } + } + } + + delete scaledMask; +} + +// Scale an image mask into a SplashBitmap. +SplashBitmap *Splash::scaleMask(SplashImageMaskSource src, void *srcData, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight) +{ + SplashBitmap *dest; + + dest = new SplashBitmap(scaledWidth, scaledHeight, 1, splashModeMono8, false); + if (scaledHeight < srcHeight) { + if (scaledWidth < srcWidth) { + scaleMaskYdownXdown(src, srcData, srcWidth, srcHeight, scaledWidth, scaledHeight, dest); + } else { + scaleMaskYdownXup(src, srcData, srcWidth, srcHeight, scaledWidth, scaledHeight, dest); + } + } else { + if (scaledWidth < srcWidth) { + scaleMaskYupXdown(src, srcData, srcWidth, srcHeight, scaledWidth, scaledHeight, dest); + } else { + scaleMaskYupXup(src, srcData, srcWidth, srcHeight, scaledWidth, scaledHeight, dest); + } + } + return dest; +} + +void Splash::scaleMaskYdownXdown(SplashImageMaskSource src, void *srcData, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest) +{ + unsigned char *lineBuf; + unsigned int *pixBuf; + unsigned int pix; + unsigned char *destPtr; + int yp, yq, xp, xq, yt, y, yStep, xt, x, xStep, xx, d, d0, d1; + int i, j; + + // Bresenham parameters for y scale + yp = srcHeight / scaledHeight; + yq = srcHeight % scaledHeight; + + // Bresenham parameters for x scale + xp = srcWidth / scaledWidth; + xq = srcWidth % scaledWidth; + + // allocate buffers + lineBuf = (unsigned char *)gmalloc_checkoverflow(srcWidth); + if (unlikely(!lineBuf)) { + error(errInternal, -1, "Couldn't allocate memory for lineBuf in Splash::scaleMaskYdownXdown"); + return; + } + + pixBuf = (unsigned int *)gmallocn_checkoverflow(srcWidth, sizeof(int)); + if (unlikely(!pixBuf)) { + error(errInternal, -1, "Couldn't allocate memory for pixBuf in Splash::scaleMaskYdownXdown"); + gfree(lineBuf); + return; + } + + // init y scale Bresenham + yt = 0; + + destPtr = dest->data; + for (y = 0; y < scaledHeight; ++y) { + + // y scale Bresenham + if ((yt += yq) >= scaledHeight) { + yt -= scaledHeight; + yStep = yp + 1; + } else { + yStep = yp; + } + + // read rows from image + memset(pixBuf, 0, srcWidth * sizeof(int)); + for (i = 0; i < yStep; ++i) { + (*src)(srcData, lineBuf); + for (j = 0; j < srcWidth; ++j) { + pixBuf[j] += lineBuf[j]; + } + } + + // init x scale Bresenham + xt = 0; + d0 = (255 << 23) / (yStep * xp); + d1 = (255 << 23) / (yStep * (xp + 1)); + + xx = 0; + for (x = 0; x < scaledWidth; ++x) { + + // x scale Bresenham + if ((xt += xq) >= scaledWidth) { + xt -= scaledWidth; + xStep = xp + 1; + d = d1; + } else { + xStep = xp; + d = d0; + } + + // compute the final pixel + pix = 0; + for (i = 0; i < xStep; ++i) { + pix += pixBuf[xx++]; + } + // (255 * pix) / xStep * yStep + pix = (pix * d) >> 23; + + // store the pixel + *destPtr++ = (unsigned char)pix; + } + } + + gfree(pixBuf); + gfree(lineBuf); +} + +void Splash::scaleMaskYdownXup(SplashImageMaskSource src, void *srcData, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest) +{ + unsigned char *lineBuf; + unsigned int *pixBuf; + unsigned int pix; + unsigned char *destPtr; + int yp, yq, xp, xq, yt, y, yStep, xt, x, xStep, d; + int i, j; + + destPtr = dest->data; + if (destPtr == nullptr) { + error(errInternal, -1, "dest->data is NULL in Splash::scaleMaskYdownXup"); + return; + } + + // Bresenham parameters for y scale + yp = srcHeight / scaledHeight; + yq = srcHeight % scaledHeight; + + // Bresenham parameters for x scale + xp = scaledWidth / srcWidth; + xq = scaledWidth % srcWidth; + + // allocate buffers + lineBuf = (unsigned char *)gmalloc_checkoverflow(srcWidth); + if (unlikely(!lineBuf)) { + error(errInternal, -1, "Couldn't allocate memory for lineBuf in Splash::scaleMaskYdownXup"); + return; + } + + pixBuf = (unsigned int *)gmallocn_checkoverflow(srcWidth, sizeof(int)); + if (unlikely(!pixBuf)) { + error(errInternal, -1, "Couldn't allocate memory for pixBuf in Splash::scaleMaskYdownXup"); + gfree(lineBuf); + return; + } + + // init y scale Bresenham + yt = 0; + + for (y = 0; y < scaledHeight; ++y) { + + // y scale Bresenham + if ((yt += yq) >= scaledHeight) { + yt -= scaledHeight; + yStep = yp + 1; + } else { + yStep = yp; + } + + // read rows from image + memset(pixBuf, 0, srcWidth * sizeof(int)); + for (i = 0; i < yStep; ++i) { + (*src)(srcData, lineBuf); + for (j = 0; j < srcWidth; ++j) { + pixBuf[j] += lineBuf[j]; + } + } + + // init x scale Bresenham + xt = 0; + d = (255 << 23) / yStep; + + for (x = 0; x < srcWidth; ++x) { + + // x scale Bresenham + if ((xt += xq) >= srcWidth) { + xt -= srcWidth; + xStep = xp + 1; + } else { + xStep = xp; + } + + // compute the final pixel + pix = pixBuf[x]; + // (255 * pix) / yStep + pix = (pix * d) >> 23; + + // store the pixel + for (i = 0; i < xStep; ++i) { + *destPtr++ = (unsigned char)pix; + } + } + } + + gfree(pixBuf); + gfree(lineBuf); +} + +void Splash::scaleMaskYupXdown(SplashImageMaskSource src, void *srcData, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest) +{ + unsigned char *lineBuf; + unsigned int pix; + unsigned char *destPtr0, *destPtr; + int yp, yq, xp, xq, yt, y, yStep, xt, x, xStep, xx, d, d0, d1; + int i; + + destPtr0 = dest->data; + if (destPtr0 == nullptr) { + error(errInternal, -1, "dest->data is NULL in Splash::scaleMaskYupXdown"); + return; + } + + // Bresenham parameters for y scale + yp = scaledHeight / srcHeight; + yq = scaledHeight % srcHeight; + + // Bresenham parameters for x scale + xp = srcWidth / scaledWidth; + xq = srcWidth % scaledWidth; + + // allocate buffers + lineBuf = (unsigned char *)gmalloc_checkoverflow(srcWidth); + if (unlikely(!lineBuf)) { + error(errInternal, -1, "Couldn't allocate memory for lineBuf in Splash::scaleMaskYupXdown"); + return; + } + + // init y scale Bresenham + yt = 0; + + for (y = 0; y < srcHeight; ++y) { + + // y scale Bresenham + if ((yt += yq) >= srcHeight) { + yt -= srcHeight; + yStep = yp + 1; + } else { + yStep = yp; + } + + // read row from image + (*src)(srcData, lineBuf); + + // init x scale Bresenham + xt = 0; + d0 = (255 << 23) / xp; + d1 = (255 << 23) / (xp + 1); + + xx = 0; + for (x = 0; x < scaledWidth; ++x) { + + // x scale Bresenham + if ((xt += xq) >= scaledWidth) { + xt -= scaledWidth; + xStep = xp + 1; + d = d1; + } else { + xStep = xp; + d = d0; + } + + // compute the final pixel + pix = 0; + for (i = 0; i < xStep; ++i) { + pix += lineBuf[xx++]; + } + // (255 * pix) / xStep + pix = (pix * d) >> 23; + + // store the pixel + for (i = 0; i < yStep; ++i) { + destPtr = destPtr0 + i * scaledWidth + x; + *destPtr = (unsigned char)pix; + } + } + + destPtr0 += yStep * scaledWidth; + } + + gfree(lineBuf); +} + +void Splash::scaleMaskYupXup(SplashImageMaskSource src, void *srcData, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest) +{ + unsigned char *lineBuf; + unsigned int pix; + unsigned char *destPtr0, *destPtr; + int yp, yq, xp, xq, yt, y, yStep, xt, x, xStep, xx; + int i, j; + + destPtr0 = dest->data; + if (destPtr0 == nullptr) { + error(errInternal, -1, "dest->data is NULL in Splash::scaleMaskYupXup"); + return; + } + + if (unlikely(srcWidth <= 0 || srcHeight <= 0)) { + error(errSyntaxError, -1, "srcWidth <= 0 || srcHeight <= 0 in Splash::scaleMaskYupXup"); + gfree(dest->takeData()); + return; + } + + // Bresenham parameters for y scale + yp = scaledHeight / srcHeight; + yq = scaledHeight % srcHeight; + + // Bresenham parameters for x scale + xp = scaledWidth / srcWidth; + xq = scaledWidth % srcWidth; + + // allocate buffers + lineBuf = (unsigned char *)gmalloc_checkoverflow(srcWidth); + if (unlikely(!lineBuf)) { + error(errInternal, -1, "Couldn't allocate memory for lineBuf in Splash::scaleMaskYupXup"); + return; + } + + // init y scale Bresenham + yt = 0; + + for (y = 0; y < srcHeight; ++y) { + + // y scale Bresenham + if ((yt += yq) >= srcHeight) { + yt -= srcHeight; + yStep = yp + 1; + } else { + yStep = yp; + } + + // read row from image + (*src)(srcData, lineBuf); + + // init x scale Bresenham + xt = 0; + + xx = 0; + for (x = 0; x < srcWidth; ++x) { + + // x scale Bresenham + if ((xt += xq) >= srcWidth) { + xt -= srcWidth; + xStep = xp + 1; + } else { + xStep = xp; + } + + // compute the final pixel + pix = lineBuf[x] ? 255 : 0; + + // store the pixel + for (i = 0; i < yStep; ++i) { + for (j = 0; j < xStep; ++j) { + destPtr = destPtr0 + i * scaledWidth + xx + j; + *destPtr++ = (unsigned char)pix; + } + } + + xx += xStep; + } + + destPtr0 += yStep * scaledWidth; + } + + gfree(lineBuf); +} + +void Splash::blitMask(SplashBitmap *src, int xDest, int yDest, SplashClipResult clipRes) +{ + SplashPipe pipe; + unsigned char *p; + int w, h, x, y; + + w = src->getWidth(); + h = src->getHeight(); + p = src->getDataPtr(); + if (p == nullptr) { + error(errInternal, -1, "src->getDataPtr() is NULL in Splash::blitMask"); + return; + } + if (vectorAntialias && clipRes != splashClipAllInside) { + pipeInit(&pipe, xDest, yDest, state->fillPattern, nullptr, (unsigned char)splashRound(state->fillAlpha * 255), true, false); + drawAAPixelInit(); + for (y = 0; y < h; ++y) { + for (x = 0; x < w; ++x) { + pipe.shape = *p++; + drawAAPixel(&pipe, xDest + x, yDest + y); + } + } + } else { + pipeInit(&pipe, xDest, yDest, state->fillPattern, nullptr, (unsigned char)splashRound(state->fillAlpha * 255), true, false); + if (clipRes == splashClipAllInside) { + for (y = 0; y < h; ++y) { + pipeSetXY(&pipe, xDest, yDest + y); + for (x = 0; x < w; ++x) { + if (*p) { + pipe.shape = *p; + (this->*pipe.run)(&pipe); + } else { + pipeIncX(&pipe); + } + ++p; + } + } + } else { + for (y = 0; y < h; ++y) { + pipeSetXY(&pipe, xDest, yDest + y); + for (x = 0; x < w; ++x) { + if (*p && state->clip->test(xDest + x, yDest + y)) { + pipe.shape = *p; + (this->*pipe.run)(&pipe); + } else { + pipeIncX(&pipe); + } + ++p; + } + } + } + } +} + +SplashError Splash::drawImage(SplashImageSource src, SplashICCTransform tf, void *srcData, SplashColorMode srcMode, bool srcAlpha, int w, int h, SplashCoord *mat, bool interpolate, bool tilingPattern) +{ + bool ok; + SplashBitmap *scaledImg; + SplashClipResult clipRes; + bool minorAxisZero; + int x0, y0, x1, y1, scaledWidth, scaledHeight; + int nComps; + int yp; + + if (debugMode) { + printf("drawImage: srcMode=%d srcAlpha=%d w=%d h=%d mat=[%.2f %.2f %.2f %.2f %.2f %.2f]\n", srcMode, srcAlpha, w, h, (double)mat[0], (double)mat[1], (double)mat[2], (double)mat[3], (double)mat[4], (double)mat[5]); + } + + // check color modes + ok = false; // make gcc happy + nComps = 0; // make gcc happy + switch (bitmap->mode) { + case splashModeMono1: + case splashModeMono8: + ok = srcMode == splashModeMono8; + nComps = 1; + break; + case splashModeRGB8: + ok = srcMode == splashModeRGB8; + nComps = 3; + break; + case splashModeXBGR8: + ok = srcMode == splashModeXBGR8; + nComps = 4; + break; + case splashModeBGR8: + ok = srcMode == splashModeBGR8; + nComps = 3; + break; + case splashModeCMYK8: + ok = srcMode == splashModeCMYK8; + nComps = 4; + break; + case splashModeDeviceN8: + ok = srcMode == splashModeDeviceN8; + nComps = SPOT_NCOMPS + 4; + break; + default: + ok = false; + break; + } + if (!ok) { + return splashErrModeMismatch; + } + + // check for singular matrix + if (!splashCheckDet(mat[0], mat[1], mat[2], mat[3], 0.000001)) { + return splashErrSingularMatrix; + } + + minorAxisZero = mat[1] == 0 && mat[2] == 0; + + // scaling only + if (mat[0] > 0 && minorAxisZero && mat[3] > 0) { + x0 = imgCoordMungeLower(mat[4]); + y0 = imgCoordMungeLower(mat[5]); + x1 = imgCoordMungeUpper(mat[0] + mat[4]); + y1 = imgCoordMungeUpper(mat[3] + mat[5]); + // make sure narrow images cover at least one pixel + if (x0 == x1) { + ++x1; + } + if (y0 == y1) { + ++y1; + } + clipRes = state->clip->testRect(x0, y0, x1 - 1, y1 - 1); + opClipRes = clipRes; + if (clipRes != splashClipAllOutside) { + scaledWidth = x1 - x0; + scaledHeight = y1 - y0; + yp = h / scaledHeight; + if (yp < 0 || yp > INT_MAX - 1) { + return splashErrBadArg; + } + scaledImg = scaleImage(src, srcData, srcMode, nComps, srcAlpha, w, h, scaledWidth, scaledHeight, interpolate, tilingPattern); + if (scaledImg == nullptr) { + return splashErrBadArg; + } + if (tf != nullptr) { + (*tf)(srcData, scaledImg); + } + blitImage(scaledImg, srcAlpha, x0, y0, clipRes); + delete scaledImg; + } + + // scaling plus vertical flip + } else if (mat[0] > 0 && minorAxisZero && mat[3] < 0) { + x0 = imgCoordMungeLower(mat[4]); + y0 = imgCoordMungeLower(mat[3] + mat[5]); + x1 = imgCoordMungeUpper(mat[0] + mat[4]); + y1 = imgCoordMungeUpper(mat[5]); + if (x0 == x1) { + if (mat[4] + mat[0] * 0.5 < x0) { + --x0; + } else { + ++x1; + } + } + if (y0 == y1) { + if (mat[5] + mat[1] * 0.5 < y0) { + --y0; + } else { + ++y1; + } + } + clipRes = state->clip->testRect(x0, y0, x1 - 1, y1 - 1); + opClipRes = clipRes; + if (clipRes != splashClipAllOutside) { + scaledWidth = x1 - x0; + scaledHeight = y1 - y0; + yp = h / scaledHeight; + if (yp < 0 || yp > INT_MAX - 1) { + return splashErrBadArg; + } + scaledImg = scaleImage(src, srcData, srcMode, nComps, srcAlpha, w, h, scaledWidth, scaledHeight, interpolate, tilingPattern); + if (scaledImg == nullptr) { + return splashErrBadArg; + } + if (tf != nullptr) { + (*tf)(srcData, scaledImg); + } + vertFlipImage(scaledImg, scaledWidth, scaledHeight, nComps); + blitImage(scaledImg, srcAlpha, x0, y0, clipRes); + delete scaledImg; + } + + // all other cases + } else { + return arbitraryTransformImage(src, tf, srcData, srcMode, nComps, srcAlpha, w, h, mat, interpolate, tilingPattern); + } + + return splashOk; +} + +SplashError Splash::arbitraryTransformImage(SplashImageSource src, SplashICCTransform tf, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, SplashCoord *mat, bool interpolate, + bool tilingPattern) +{ + SplashBitmap *scaledImg; + SplashClipResult clipRes, clipRes2; + SplashPipe pipe; + SplashColor pixel = {}; + int scaledWidth, scaledHeight, t0, t1, th; + SplashCoord r00, r01, r10, r11, det, ir00, ir01, ir10, ir11; + SplashCoord vx[4], vy[4]; + int xMin, yMin, xMax, yMax; + ImageSection section[3]; + int nSections; + int y, xa, xb, x, i, xx, yy, yp; + + // compute the four vertices of the target quadrilateral + vx[0] = mat[4]; + vy[0] = mat[5]; + vx[1] = mat[2] + mat[4]; + vy[1] = mat[3] + mat[5]; + vx[2] = mat[0] + mat[2] + mat[4]; + vy[2] = mat[1] + mat[3] + mat[5]; + vx[3] = mat[0] + mat[4]; + vy[3] = mat[1] + mat[5]; + + // clipping + xMin = imgCoordMungeLower(vx[0]); + xMax = imgCoordMungeUpper(vx[0]); + yMin = imgCoordMungeLower(vy[0]); + yMax = imgCoordMungeUpper(vy[0]); + for (i = 1; i < 4; ++i) { + t0 = imgCoordMungeLower(vx[i]); + if (t0 < xMin) { + xMin = t0; + } + t0 = imgCoordMungeUpper(vx[i]); + if (t0 > xMax) { + xMax = t0; + } + t1 = imgCoordMungeLower(vy[i]); + if (t1 < yMin) { + yMin = t1; + } + t1 = imgCoordMungeUpper(vy[i]); + if (t1 > yMax) { + yMax = t1; + } + } + clipRes = state->clip->testRect(xMin, yMin, xMax, yMax); + opClipRes = clipRes; + if (clipRes == splashClipAllOutside) { + return splashOk; + } + + // compute the scale factors + if (splashAbs(mat[0]) >= splashAbs(mat[1])) { + scaledWidth = xMax - xMin; + scaledHeight = yMax - yMin; + } else { + scaledWidth = yMax - yMin; + scaledHeight = xMax - xMin; + } + if (scaledHeight <= 1 || scaledWidth <= 1 || tilingPattern) { + if (mat[0] >= 0) { + t0 = imgCoordMungeUpper(mat[0] + mat[4]) - imgCoordMungeLower(mat[4]); + } else { + t0 = imgCoordMungeUpper(mat[4]) - imgCoordMungeLower(mat[0] + mat[4]); + } + if (mat[1] >= 0) { + t1 = imgCoordMungeUpper(mat[1] + mat[5]) - imgCoordMungeLower(mat[5]); + } else { + t1 = imgCoordMungeUpper(mat[5]) - imgCoordMungeLower(mat[1] + mat[5]); + } + scaledWidth = t0 > t1 ? t0 : t1; + if (mat[2] >= 0) { + t0 = imgCoordMungeUpper(mat[2] + mat[4]) - imgCoordMungeLower(mat[4]); + if (splashAbs(mat[1]) >= 1) { + th = imgCoordMungeUpper(mat[2]) - imgCoordMungeLower(mat[0] * mat[3] / mat[1]); + if (th > t0) { + t0 = th; + } + } + } else { + t0 = imgCoordMungeUpper(mat[4]) - imgCoordMungeLower(mat[2] + mat[4]); + if (splashAbs(mat[1]) >= 1) { + th = imgCoordMungeUpper(mat[0] * mat[3] / mat[1]) - imgCoordMungeLower(mat[2]); + if (th > t0) { + t0 = th; + } + } + } + if (mat[3] >= 0) { + t1 = imgCoordMungeUpper(mat[3] + mat[5]) - imgCoordMungeLower(mat[5]); + if (splashAbs(mat[0]) >= 1) { + th = imgCoordMungeUpper(mat[3]) - imgCoordMungeLower(mat[1] * mat[2] / mat[0]); + if (th > t1) { + t1 = th; + } + } + } else { + t1 = imgCoordMungeUpper(mat[5]) - imgCoordMungeLower(mat[3] + mat[5]); + if (splashAbs(mat[0]) >= 1) { + th = imgCoordMungeUpper(mat[1] * mat[2] / mat[0]) - imgCoordMungeLower(mat[3]); + if (th > t1) { + t1 = th; + } + } + } + scaledHeight = t0 > t1 ? t0 : t1; + } + if (scaledWidth == 0) { + scaledWidth = 1; + } + if (scaledHeight == 0) { + scaledHeight = 1; + } + + // compute the inverse transform (after scaling) matrix + r00 = mat[0] / scaledWidth; + r01 = mat[1] / scaledWidth; + r10 = mat[2] / scaledHeight; + r11 = mat[3] / scaledHeight; + det = r00 * r11 - r01 * r10; + if (splashAbs(det) < 1e-6) { + // this should be caught by the singular matrix check in drawImage + return splashErrBadArg; + } + ir00 = r11 / det; + ir01 = -r01 / det; + ir10 = -r10 / det; + ir11 = r00 / det; + + // scale the input image + yp = srcHeight / scaledHeight; + if (yp < 0 || yp > INT_MAX - 1) { + return splashErrBadArg; + } + scaledImg = scaleImage(src, srcData, srcMode, nComps, srcAlpha, srcWidth, srcHeight, scaledWidth, scaledHeight, interpolate); + + if (scaledImg == nullptr) { + return splashErrBadArg; + } + + if (tf != nullptr) { + (*tf)(srcData, scaledImg); + } + // construct the three sections + i = 0; + if (vy[1] < vy[i]) { + i = 1; + } + if (vy[2] < vy[i]) { + i = 2; + } + if (vy[3] < vy[i]) { + i = 3; + } + // NB: if using fixed point, 0.000001 will be truncated to zero, + // so these two comparisons must be <=, not < + if (splashAbs(vy[i] - vy[(i - 1) & 3]) <= 0.000001 && vy[(i - 1) & 3] < vy[(i + 1) & 3]) { + i = (i - 1) & 3; + } + if (splashAbs(vy[i] - vy[(i + 1) & 3]) <= 0.000001) { + section[0].y0 = imgCoordMungeLower(vy[i]); + section[0].y1 = imgCoordMungeUpper(vy[(i + 2) & 3]) - 1; + if (vx[i] < vx[(i + 1) & 3]) { + section[0].ia0 = i; + section[0].ia1 = (i + 3) & 3; + section[0].ib0 = (i + 1) & 3; + section[0].ib1 = (i + 2) & 3; + } else { + section[0].ia0 = (i + 1) & 3; + section[0].ia1 = (i + 2) & 3; + section[0].ib0 = i; + section[0].ib1 = (i + 3) & 3; + } + nSections = 1; + } else { + section[0].y0 = imgCoordMungeLower(vy[i]); + section[2].y1 = imgCoordMungeUpper(vy[(i + 2) & 3]) - 1; + section[0].ia0 = section[0].ib0 = i; + section[2].ia1 = section[2].ib1 = (i + 2) & 3; + if (vx[(i + 1) & 3] < vx[(i + 3) & 3]) { + section[0].ia1 = section[2].ia0 = (i + 1) & 3; + section[0].ib1 = section[2].ib0 = (i + 3) & 3; + } else { + section[0].ia1 = section[2].ia0 = (i + 3) & 3; + section[0].ib1 = section[2].ib0 = (i + 1) & 3; + } + if (vy[(i + 1) & 3] < vy[(i + 3) & 3]) { + section[1].y0 = imgCoordMungeLower(vy[(i + 1) & 3]); + section[2].y0 = imgCoordMungeUpper(vy[(i + 3) & 3]); + if (vx[(i + 1) & 3] < vx[(i + 3) & 3]) { + section[1].ia0 = (i + 1) & 3; + section[1].ia1 = (i + 2) & 3; + section[1].ib0 = i; + section[1].ib1 = (i + 3) & 3; + } else { + section[1].ia0 = i; + section[1].ia1 = (i + 3) & 3; + section[1].ib0 = (i + 1) & 3; + section[1].ib1 = (i + 2) & 3; + } + } else { + section[1].y0 = imgCoordMungeLower(vy[(i + 3) & 3]); + section[2].y0 = imgCoordMungeUpper(vy[(i + 1) & 3]); + if (vx[(i + 1) & 3] < vx[(i + 3) & 3]) { + section[1].ia0 = i; + section[1].ia1 = (i + 1) & 3; + section[1].ib0 = (i + 3) & 3; + section[1].ib1 = (i + 2) & 3; + } else { + section[1].ia0 = (i + 3) & 3; + section[1].ia1 = (i + 2) & 3; + section[1].ib0 = i; + section[1].ib1 = (i + 1) & 3; + } + } + section[0].y1 = section[1].y0 - 1; + section[1].y1 = section[2].y0 - 1; + nSections = 3; + } + for (i = 0; i < nSections; ++i) { + section[i].xa0 = vx[section[i].ia0]; + section[i].ya0 = vy[section[i].ia0]; + section[i].xa1 = vx[section[i].ia1]; + section[i].ya1 = vy[section[i].ia1]; + section[i].xb0 = vx[section[i].ib0]; + section[i].yb0 = vy[section[i].ib0]; + section[i].xb1 = vx[section[i].ib1]; + section[i].yb1 = vy[section[i].ib1]; + section[i].dxdya = (section[i].xa1 - section[i].xa0) / (section[i].ya1 - section[i].ya0); + section[i].dxdyb = (section[i].xb1 - section[i].xb0) / (section[i].yb1 - section[i].yb0); + } + + // initialize the pixel pipe + pipeInit(&pipe, 0, 0, nullptr, pixel, (unsigned char)splashRound(state->fillAlpha * 255), srcAlpha || (vectorAntialias && clipRes != splashClipAllInside), false); + if (vectorAntialias) { + drawAAPixelInit(); + } + + // make sure narrow images cover at least one pixel + if (nSections == 1) { + if (section[0].y0 == section[0].y1) { + ++section[0].y1; + clipRes = opClipRes = splashClipPartial; + } + } else { + if (section[0].y0 == section[2].y1) { + ++section[1].y1; + clipRes = opClipRes = splashClipPartial; + } + } + + // scan all pixels inside the target region + for (i = 0; i < nSections; ++i) { + for (y = section[i].y0; y <= section[i].y1; ++y) { + xa = imgCoordMungeLower(section[i].xa0 + ((SplashCoord)y + 0.5 - section[i].ya0) * section[i].dxdya); + if (unlikely(xa < 0)) { + xa = 0; + } + xb = imgCoordMungeUpper(section[i].xb0 + ((SplashCoord)y + 0.5 - section[i].yb0) * section[i].dxdyb); + // make sure narrow images cover at least one pixel + if (xa == xb) { + ++xb; + } + if (unlikely(clipRes == splashClipAllInside && xb > bitmap->getWidth())) { + xb = bitmap->getWidth(); + } + if (clipRes != splashClipAllInside) { + clipRes2 = state->clip->testSpan(xa, xb - 1, y); + } else { + clipRes2 = clipRes; + } + for (x = xa; x < xb; ++x) { + // map (x+0.5, y+0.5) back to the scaled image + xx = splashFloor(((SplashCoord)x + 0.5 - mat[4]) * ir00 + ((SplashCoord)y + 0.5 - mat[5]) * ir10); + yy = splashFloor(((SplashCoord)x + 0.5 - mat[4]) * ir01 + ((SplashCoord)y + 0.5 - mat[5]) * ir11); + // xx should always be within bounds, but floating point + // inaccuracy can cause problems + if (xx < 0) { + xx = 0; + } else if (xx >= scaledWidth) { + xx = scaledWidth - 1; + } + if (yy < 0) { + yy = 0; + } else if (yy >= scaledHeight) { + yy = scaledHeight - 1; + } + scaledImg->getPixel(xx, yy, pixel); + if (srcAlpha) { + pipe.shape = scaledImg->alpha[yy * scaledWidth + xx]; + } else { + pipe.shape = 255; + } + if (vectorAntialias && clipRes2 != splashClipAllInside) { + drawAAPixel(&pipe, x, y); + } else { + drawPixel(&pipe, x, y, clipRes2 == splashClipAllInside); + } + } + } + } + + delete scaledImg; + return splashOk; +} + +// determine if a scaled image requires interpolation based on the scale and +// the interpolate flag from the image dictionary +static bool isImageInterpolationRequired(int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, bool interpolate) +{ + if (interpolate || srcWidth == 0 || srcHeight == 0) { + return true; + } + + /* When scale factor is >= 400% we don't interpolate. See bugs #25268, #9860 */ + if (scaledWidth / srcWidth >= 4 || scaledHeight / srcHeight >= 4) { + return false; + } + + return true; +} + +// Scale an image into a SplashBitmap. +SplashBitmap *Splash::scaleImage(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, bool interpolate, bool tilingPattern) +{ + SplashBitmap *dest; + + dest = new SplashBitmap(scaledWidth, scaledHeight, 1, srcMode, srcAlpha, true, bitmap->getSeparationList()); + if (dest->getDataPtr() != nullptr && srcHeight > 0 && srcWidth > 0) { + bool success = true; + if (scaledHeight < srcHeight) { + if (scaledWidth < srcWidth) { + success = scaleImageYdownXdown(src, srcData, srcMode, nComps, srcAlpha, srcWidth, srcHeight, scaledWidth, scaledHeight, dest); + } else { + success = scaleImageYdownXup(src, srcData, srcMode, nComps, srcAlpha, srcWidth, srcHeight, scaledWidth, scaledHeight, dest); + } + } else { + if (scaledWidth < srcWidth) { + success = scaleImageYupXdown(src, srcData, srcMode, nComps, srcAlpha, srcWidth, srcHeight, scaledWidth, scaledHeight, dest); + } else { + if (!tilingPattern && isImageInterpolationRequired(srcWidth, srcHeight, scaledWidth, scaledHeight, interpolate)) { + success = scaleImageYupXupBilinear(src, srcData, srcMode, nComps, srcAlpha, srcWidth, srcHeight, scaledWidth, scaledHeight, dest); + } else { + success = scaleImageYupXup(src, srcData, srcMode, nComps, srcAlpha, srcWidth, srcHeight, scaledWidth, scaledHeight, dest); + } + } + } + if (unlikely(!success)) { + delete dest; + dest = nullptr; + } + } else { + delete dest; + dest = nullptr; + } + return dest; +} + +bool Splash::scaleImageYdownXdown(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest) +{ + unsigned char *lineBuf, *alphaLineBuf; + unsigned int *pixBuf, *alphaPixBuf; + unsigned int pix0, pix1, pix2; + unsigned int pix3; + unsigned int pix[SPOT_NCOMPS + 4], cp; + unsigned int alpha; + unsigned char *destPtr, *destAlphaPtr; + int yp, yq, xp, xq, yt, y, yStep, xt, x, xStep, xx, xxa, d, d0, d1; + int i, j; + + // Bresenham parameters for y scale + yp = srcHeight / scaledHeight; + yq = srcHeight % scaledHeight; + + // Bresenham parameters for x scale + xp = srcWidth / scaledWidth; + xq = srcWidth % scaledWidth; + + // allocate buffers + lineBuf = (unsigned char *)gmallocn_checkoverflow(srcWidth, nComps); + if (unlikely(!lineBuf)) { + return false; + } + pixBuf = (unsigned int *)gmallocn_checkoverflow(srcWidth, nComps * sizeof(int)); + if (unlikely(!pixBuf)) { + gfree(lineBuf); + return false; + } + if (srcAlpha) { + alphaLineBuf = (unsigned char *)gmalloc_checkoverflow(srcWidth); + if (unlikely(!alphaLineBuf)) { + error(errInternal, -1, "Couldn't allocate memory for alphaLineBuf in Splash::scaleImageYdownXdown"); + gfree(lineBuf); + gfree(pixBuf); + return false; + } + alphaPixBuf = (unsigned int *)gmallocn_checkoverflow(srcWidth, sizeof(int)); + if (unlikely(!alphaPixBuf)) { + error(errInternal, -1, "Couldn't allocate memory for alphaPixBuf in Splash::scaleImageYdownXdown"); + gfree(lineBuf); + gfree(pixBuf); + gfree(alphaLineBuf); + return false; + } + } else { + alphaLineBuf = nullptr; + alphaPixBuf = nullptr; + } + + // init y scale Bresenham + yt = 0; + + destPtr = dest->data; + destAlphaPtr = dest->alpha; + for (y = 0; y < scaledHeight; ++y) { + + // y scale Bresenham + if ((yt += yq) >= scaledHeight) { + yt -= scaledHeight; + yStep = yp + 1; + } else { + yStep = yp; + } + + // read rows from image + memset(pixBuf, 0, srcWidth * nComps * sizeof(int)); + if (srcAlpha) { + memset(alphaPixBuf, 0, srcWidth * sizeof(int)); + } + for (i = 0; i < yStep; ++i) { + (*src)(srcData, lineBuf, alphaLineBuf); + for (j = 0; j < srcWidth * nComps; ++j) { + pixBuf[j] += lineBuf[j]; + } + if (srcAlpha) { + for (j = 0; j < srcWidth; ++j) { + alphaPixBuf[j] += alphaLineBuf[j]; + } + } + } + + // init x scale Bresenham + xt = 0; + d0 = (1 << 23) / (yStep * xp); + d1 = (1 << 23) / (yStep * (xp + 1)); + + xx = xxa = 0; + for (x = 0; x < scaledWidth; ++x) { + + // x scale Bresenham + if ((xt += xq) >= scaledWidth) { + xt -= scaledWidth; + xStep = xp + 1; + d = d1; + } else { + xStep = xp; + d = d0; + } + + switch (srcMode) { + + case splashModeMono8: + + // compute the final pixel + pix0 = 0; + for (i = 0; i < xStep; ++i) { + pix0 += pixBuf[xx++]; + } + // pix / xStep * yStep + pix0 = (pix0 * d) >> 23; + + // store the pixel + *destPtr++ = (unsigned char)pix0; + break; + + case splashModeRGB8: + + // compute the final pixel + pix0 = pix1 = pix2 = 0; + for (i = 0; i < xStep; ++i) { + pix0 += pixBuf[xx]; + pix1 += pixBuf[xx + 1]; + pix2 += pixBuf[xx + 2]; + xx += 3; + } + // pix / xStep * yStep + pix0 = (pix0 * d) >> 23; + pix1 = (pix1 * d) >> 23; + pix2 = (pix2 * d) >> 23; + + // store the pixel + *destPtr++ = (unsigned char)pix0; + *destPtr++ = (unsigned char)pix1; + *destPtr++ = (unsigned char)pix2; + break; + + case splashModeXBGR8: + + // compute the final pixel + pix0 = pix1 = pix2 = 0; + for (i = 0; i < xStep; ++i) { + pix0 += pixBuf[xx]; + pix1 += pixBuf[xx + 1]; + pix2 += pixBuf[xx + 2]; + xx += 4; + } + // pix / xStep * yStep + pix0 = (pix0 * d) >> 23; + pix1 = (pix1 * d) >> 23; + pix2 = (pix2 * d) >> 23; + + // store the pixel + *destPtr++ = (unsigned char)pix2; + *destPtr++ = (unsigned char)pix1; + *destPtr++ = (unsigned char)pix0; + *destPtr++ = (unsigned char)255; + break; + + case splashModeBGR8: + + // compute the final pixel + pix0 = pix1 = pix2 = 0; + for (i = 0; i < xStep; ++i) { + pix0 += pixBuf[xx]; + pix1 += pixBuf[xx + 1]; + pix2 += pixBuf[xx + 2]; + xx += 3; + } + // pix / xStep * yStep + pix0 = (pix0 * d) >> 23; + pix1 = (pix1 * d) >> 23; + pix2 = (pix2 * d) >> 23; + + // store the pixel + *destPtr++ = (unsigned char)pix2; + *destPtr++ = (unsigned char)pix1; + *destPtr++ = (unsigned char)pix0; + break; + + case splashModeCMYK8: + + // compute the final pixel + pix0 = pix1 = pix2 = pix3 = 0; + for (i = 0; i < xStep; ++i) { + pix0 += pixBuf[xx]; + pix1 += pixBuf[xx + 1]; + pix2 += pixBuf[xx + 2]; + pix3 += pixBuf[xx + 3]; + xx += 4; + } + // pix / xStep * yStep + pix0 = (pix0 * d) >> 23; + pix1 = (pix1 * d) >> 23; + pix2 = (pix2 * d) >> 23; + pix3 = (pix3 * d) >> 23; + + // store the pixel + *destPtr++ = (unsigned char)pix0; + *destPtr++ = (unsigned char)pix1; + *destPtr++ = (unsigned char)pix2; + *destPtr++ = (unsigned char)pix3; + break; + case splashModeDeviceN8: + + // compute the final pixel + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + pix[cp] = 0; + } + for (i = 0; i < xStep; ++i) { + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + pix[cp] += pixBuf[xx + cp]; + } + xx += (SPOT_NCOMPS + 4); + } + // pix / xStep * yStep + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + pix[cp] = (pix[cp] * d) >> 23; + } + + // store the pixel + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + *destPtr++ = (unsigned char)pix[cp]; + } + break; + + case splashModeMono1: // mono1 is not allowed + default: + break; + } + + // process alpha + if (srcAlpha) { + alpha = 0; + for (i = 0; i < xStep; ++i, ++xxa) { + alpha += alphaPixBuf[xxa]; + } + // alpha / xStep * yStep + alpha = (alpha * d) >> 23; + *destAlphaPtr++ = (unsigned char)alpha; + } + } + } + + gfree(alphaPixBuf); + gfree(alphaLineBuf); + gfree(pixBuf); + gfree(lineBuf); + + return true; +} + +bool Splash::scaleImageYdownXup(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest) +{ + unsigned char *lineBuf, *alphaLineBuf; + unsigned int *pixBuf, *alphaPixBuf; + unsigned int pix[splashMaxColorComps]; + unsigned int alpha; + unsigned char *destPtr, *destAlphaPtr; + int yp, yq, xp, xq, yt, y, yStep, xt, x, xStep, d; + int i, j; + + // Bresenham parameters for y scale + yp = srcHeight / scaledHeight; + yq = srcHeight % scaledHeight; + + // Bresenham parameters for x scale + xp = scaledWidth / srcWidth; + xq = scaledWidth % srcWidth; + + // allocate buffers + pixBuf = (unsigned int *)gmallocn_checkoverflow(srcWidth, nComps * sizeof(int)); + if (unlikely(!pixBuf)) { + error(errInternal, -1, "Splash::scaleImageYdownXup. Couldn't allocate pixBuf memory"); + return false; + } + lineBuf = (unsigned char *)gmallocn_checkoverflow(srcWidth, nComps); + if (unlikely(!lineBuf)) { + error(errInternal, -1, "Splash::scaleImageYdownXup. Couldn't allocate lineBuf memory"); + gfree(pixBuf); + return false; + } + if (srcAlpha) { + alphaLineBuf = (unsigned char *)gmalloc_checkoverflow(srcWidth); + if (unlikely(!alphaLineBuf)) { + error(errInternal, -1, "Couldn't allocate memory for alphaLineBuf in Splash::scaleImageYdownXup"); + gfree(lineBuf); + gfree(pixBuf); + return false; + } + alphaPixBuf = (unsigned int *)gmallocn_checkoverflow(srcWidth, sizeof(int)); + if (unlikely(!alphaPixBuf)) { + error(errInternal, -1, "Couldn't allocate memory for alphaPixBuf in Splash::scaleImageYdownXup"); + gfree(lineBuf); + gfree(pixBuf); + gfree(alphaLineBuf); + return false; + } + } else { + alphaLineBuf = nullptr; + alphaPixBuf = nullptr; + } + + // init y scale Bresenham + yt = 0; + + destPtr = dest->data; + destAlphaPtr = dest->alpha; + for (y = 0; y < scaledHeight; ++y) { + + // y scale Bresenham + if ((yt += yq) >= scaledHeight) { + yt -= scaledHeight; + yStep = yp + 1; + } else { + yStep = yp; + } + + // read rows from image + memset(pixBuf, 0, srcWidth * nComps * sizeof(int)); + if (srcAlpha) { + memset(alphaPixBuf, 0, srcWidth * sizeof(int)); + } + for (i = 0; i < yStep; ++i) { + (*src)(srcData, lineBuf, alphaLineBuf); + for (j = 0; j < srcWidth * nComps; ++j) { + pixBuf[j] += lineBuf[j]; + } + if (srcAlpha) { + for (j = 0; j < srcWidth; ++j) { + alphaPixBuf[j] += alphaLineBuf[j]; + } + } + } + + // init x scale Bresenham + xt = 0; + d = (1 << 23) / yStep; + + for (x = 0; x < srcWidth; ++x) { + + // x scale Bresenham + if ((xt += xq) >= srcWidth) { + xt -= srcWidth; + xStep = xp + 1; + } else { + xStep = xp; + } + + // compute the final pixel + for (i = 0; i < nComps; ++i) { + // pixBuf[] / yStep + pix[i] = (pixBuf[x * nComps + i] * d) >> 23; + } + + // store the pixel + switch (srcMode) { + case splashModeMono1: // mono1 is not allowed + break; + case splashModeMono8: + for (i = 0; i < xStep; ++i) { + *destPtr++ = (unsigned char)pix[0]; + } + break; + case splashModeRGB8: + for (i = 0; i < xStep; ++i) { + *destPtr++ = (unsigned char)pix[0]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[2]; + } + break; + case splashModeXBGR8: + for (i = 0; i < xStep; ++i) { + *destPtr++ = (unsigned char)pix[2]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[0]; + *destPtr++ = (unsigned char)255; + } + break; + case splashModeBGR8: + for (i = 0; i < xStep; ++i) { + *destPtr++ = (unsigned char)pix[2]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[0]; + } + break; + case splashModeCMYK8: + for (i = 0; i < xStep; ++i) { + *destPtr++ = (unsigned char)pix[0]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[2]; + *destPtr++ = (unsigned char)pix[3]; + } + break; + case splashModeDeviceN8: + for (i = 0; i < xStep; ++i) { + for (unsigned int cp : pix) { + *destPtr++ = (unsigned char)cp; + } + } + break; + } + + // process alpha + if (srcAlpha) { + // alphaPixBuf[] / yStep + alpha = (alphaPixBuf[x] * d) >> 23; + for (i = 0; i < xStep; ++i) { + *destAlphaPtr++ = (unsigned char)alpha; + } + } + } + } + + gfree(alphaPixBuf); + gfree(alphaLineBuf); + gfree(pixBuf); + gfree(lineBuf); + + return true; +} + +bool Splash::scaleImageYupXdown(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest) +{ + unsigned char *lineBuf, *alphaLineBuf; + unsigned int pix[splashMaxColorComps]; + unsigned int alpha; + unsigned char *destPtr0, *destPtr, *destAlphaPtr0, *destAlphaPtr; + int yp, yq, xp, xq, yt, y, yStep, xt, x, xStep, xx, xxa, d, d0, d1; + int i, j; + + // Bresenham parameters for y scale + yp = scaledHeight / srcHeight; + yq = scaledHeight % srcHeight; + + // Bresenham parameters for x scale + xp = srcWidth / scaledWidth; + xq = srcWidth % scaledWidth; + + // allocate buffers + lineBuf = (unsigned char *)gmallocn_checkoverflow(srcWidth, nComps); + if (unlikely(!lineBuf)) { + gfree(dest->takeData()); + return false; + } + if (srcAlpha) { + alphaLineBuf = (unsigned char *)gmalloc_checkoverflow(srcWidth); + if (unlikely(!alphaLineBuf)) { + error(errInternal, -1, "Couldn't allocate memory for alphaLineBuf in Splash::scaleImageYupXdown"); + gfree(lineBuf); + return false; + } + } else { + alphaLineBuf = nullptr; + } + + // init y scale Bresenham + yt = 0; + + destPtr0 = dest->data; + destAlphaPtr0 = dest->alpha; + for (y = 0; y < srcHeight; ++y) { + + // y scale Bresenham + if ((yt += yq) >= srcHeight) { + yt -= srcHeight; + yStep = yp + 1; + } else { + yStep = yp; + } + + // read row from image + (*src)(srcData, lineBuf, alphaLineBuf); + + // init x scale Bresenham + xt = 0; + d0 = (1 << 23) / xp; + d1 = (1 << 23) / (xp + 1); + + xx = xxa = 0; + for (x = 0; x < scaledWidth; ++x) { + + // x scale Bresenham + if ((xt += xq) >= scaledWidth) { + xt -= scaledWidth; + xStep = xp + 1; + d = d1; + } else { + xStep = xp; + d = d0; + } + + // compute the final pixel + for (i = 0; i < nComps; ++i) { + pix[i] = 0; + } + for (i = 0; i < xStep; ++i) { + for (j = 0; j < nComps; ++j, ++xx) { + pix[j] += lineBuf[xx]; + } + } + for (i = 0; i < nComps; ++i) { + // pix[] / xStep + pix[i] = (pix[i] * d) >> 23; + } + + // store the pixel + switch (srcMode) { + case splashModeMono1: // mono1 is not allowed + break; + case splashModeMono8: + for (i = 0; i < yStep; ++i) { + destPtr = destPtr0 + (i * scaledWidth + x) * nComps; + *destPtr++ = (unsigned char)pix[0]; + } + break; + case splashModeRGB8: + for (i = 0; i < yStep; ++i) { + destPtr = destPtr0 + (i * scaledWidth + x) * nComps; + *destPtr++ = (unsigned char)pix[0]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[2]; + } + break; + case splashModeXBGR8: + for (i = 0; i < yStep; ++i) { + destPtr = destPtr0 + (i * scaledWidth + x) * nComps; + *destPtr++ = (unsigned char)pix[2]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[0]; + *destPtr++ = (unsigned char)255; + } + break; + case splashModeBGR8: + for (i = 0; i < yStep; ++i) { + destPtr = destPtr0 + (i * scaledWidth + x) * nComps; + *destPtr++ = (unsigned char)pix[2]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[0]; + } + break; + case splashModeCMYK8: + for (i = 0; i < yStep; ++i) { + destPtr = destPtr0 + (i * scaledWidth + x) * nComps; + *destPtr++ = (unsigned char)pix[0]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[2]; + *destPtr++ = (unsigned char)pix[3]; + } + break; + case splashModeDeviceN8: + for (i = 0; i < yStep; ++i) { + destPtr = destPtr0 + (i * scaledWidth + x) * nComps; + for (unsigned int cp : pix) { + *destPtr++ = (unsigned char)cp; + } + } + break; + } + + // process alpha + if (srcAlpha) { + alpha = 0; + for (i = 0; i < xStep; ++i, ++xxa) { + alpha += alphaLineBuf[xxa]; + } + // alpha / xStep + alpha = (alpha * d) >> 23; + for (i = 0; i < yStep; ++i) { + destAlphaPtr = destAlphaPtr0 + i * scaledWidth + x; + *destAlphaPtr = (unsigned char)alpha; + } + } + } + + destPtr0 += yStep * scaledWidth * nComps; + if (srcAlpha) { + destAlphaPtr0 += yStep * scaledWidth; + } + } + + gfree(alphaLineBuf); + gfree(lineBuf); + + return true; +} + +bool Splash::scaleImageYupXup(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest) +{ + unsigned char *lineBuf, *alphaLineBuf; + unsigned int pix[splashMaxColorComps]; + unsigned int alpha; + unsigned char *destPtr0, *destPtr, *destAlphaPtr0, *destAlphaPtr; + int yp, yq, xp, xq, yt, y, yStep, xt, x, xStep, xx; + int i, j; + + // Bresenham parameters for y scale + yp = scaledHeight / srcHeight; + yq = scaledHeight % srcHeight; + + // Bresenham parameters for x scale + xp = scaledWidth / srcWidth; + xq = scaledWidth % srcWidth; + + // allocate buffers + lineBuf = (unsigned char *)gmallocn(srcWidth, nComps); + if (unlikely(!lineBuf)) { + error(errInternal, -1, "Couldn't allocate memory for lineBuf in Splash::scaleImageYupXup"); + return false; + } + + if (srcAlpha) { + alphaLineBuf = (unsigned char *)gmalloc_checkoverflow(srcWidth); + if (unlikely(!alphaLineBuf)) { + error(errInternal, -1, "Couldn't allocate memory for alphaLineBuf in Splash::scaleImageYupXup"); + gfree(lineBuf); + return false; + } + } else { + alphaLineBuf = nullptr; + } + + // init y scale Bresenham + yt = 0; + + destPtr0 = dest->data; + destAlphaPtr0 = dest->alpha; + for (y = 0; y < srcHeight; ++y) { + + // y scale Bresenham + if ((yt += yq) >= srcHeight) { + yt -= srcHeight; + yStep = yp + 1; + } else { + yStep = yp; + } + + // read row from image + (*src)(srcData, lineBuf, alphaLineBuf); + + // init x scale Bresenham + xt = 0; + + xx = 0; + for (x = 0; x < srcWidth; ++x) { + + // x scale Bresenham + if ((xt += xq) >= srcWidth) { + xt -= srcWidth; + xStep = xp + 1; + } else { + xStep = xp; + } + + // compute the final pixel + for (i = 0; i < nComps; ++i) { + pix[i] = lineBuf[x * nComps + i]; + } + + // store the pixel + switch (srcMode) { + case splashModeMono1: // mono1 is not allowed + break; + case splashModeMono8: + for (i = 0; i < yStep; ++i) { + for (j = 0; j < xStep; ++j) { + destPtr = destPtr0 + (i * scaledWidth + xx + j) * nComps; + *destPtr++ = (unsigned char)pix[0]; + } + } + break; + case splashModeRGB8: + for (i = 0; i < yStep; ++i) { + for (j = 0; j < xStep; ++j) { + destPtr = destPtr0 + (i * scaledWidth + xx + j) * nComps; + *destPtr++ = (unsigned char)pix[0]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[2]; + } + } + break; + case splashModeXBGR8: + for (i = 0; i < yStep; ++i) { + for (j = 0; j < xStep; ++j) { + destPtr = destPtr0 + (i * scaledWidth + xx + j) * nComps; + *destPtr++ = (unsigned char)pix[2]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[0]; + *destPtr++ = (unsigned char)255; + } + } + break; + case splashModeBGR8: + for (i = 0; i < yStep; ++i) { + for (j = 0; j < xStep; ++j) { + destPtr = destPtr0 + (i * scaledWidth + xx + j) * nComps; + *destPtr++ = (unsigned char)pix[2]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[0]; + } + } + break; + case splashModeCMYK8: + for (i = 0; i < yStep; ++i) { + for (j = 0; j < xStep; ++j) { + destPtr = destPtr0 + (i * scaledWidth + xx + j) * nComps; + *destPtr++ = (unsigned char)pix[0]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[2]; + *destPtr++ = (unsigned char)pix[3]; + } + } + break; + case splashModeDeviceN8: + for (i = 0; i < yStep; ++i) { + for (j = 0; j < xStep; ++j) { + destPtr = destPtr0 + (i * scaledWidth + xx + j) * nComps; + for (unsigned int cp : pix) { + *destPtr++ = (unsigned char)cp; + } + } + } + break; + } + + // process alpha + if (srcAlpha) { + alpha = alphaLineBuf[x]; + for (i = 0; i < yStep; ++i) { + for (j = 0; j < xStep; ++j) { + destAlphaPtr = destAlphaPtr0 + i * scaledWidth + xx + j; + *destAlphaPtr = (unsigned char)alpha; + } + } + } + + xx += xStep; + } + + destPtr0 += yStep * scaledWidth * nComps; + if (srcAlpha) { + destAlphaPtr0 += yStep * scaledWidth; + } + } + + gfree(alphaLineBuf); + gfree(lineBuf); + + return true; +} + +// expand source row to scaledWidth using linear interpolation +static void expandRow(unsigned char *srcBuf, unsigned char *dstBuf, int srcWidth, int scaledWidth, int nComps) +{ + double xStep = (double)srcWidth / scaledWidth; + double xSrc = 0.0; + double xFrac, xInt; + int p; + + // pad the source with an extra pixel equal to the last pixel + // so that when xStep is inside the last pixel we still have two + // pixels to interpolate between. + for (int i = 0; i < nComps; i++) { + srcBuf[srcWidth * nComps + i] = srcBuf[(srcWidth - 1) * nComps + i]; + } + + for (int x = 0; x < scaledWidth; x++) { + xFrac = modf(xSrc, &xInt); + p = (int)xInt; + for (int c = 0; c < nComps; c++) { + dstBuf[nComps * x + c] = static_cast(srcBuf[nComps * p + c] * (1.0 - xFrac) + srcBuf[nComps * (p + 1) + c] * xFrac); + } + xSrc += xStep; + } +} + +// Scale up image using bilinear interpolation +bool Splash::scaleImageYupXupBilinear(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest) +{ + unsigned char *srcBuf, *lineBuf1, *lineBuf2, *alphaSrcBuf, *alphaLineBuf1, *alphaLineBuf2; + unsigned int pix[splashMaxColorComps]; + unsigned char *destPtr0, *destPtr, *destAlphaPtr0, *destAlphaPtr; + int i; + + if (srcWidth < 1 || srcHeight < 1) { + return false; + } + + // allocate buffers + srcBuf = (unsigned char *)gmallocn_checkoverflow(srcWidth + 1, nComps); // + 1 pixel of padding + if (unlikely(!srcBuf)) { + error(errInternal, -1, "Couldn't allocate memory for srcBuf in Splash::scaleImageYupXupBilinear"); + return false; + } + + lineBuf1 = (unsigned char *)gmallocn_checkoverflow(scaledWidth, nComps); + if (unlikely(!lineBuf1)) { + error(errInternal, -1, "Couldn't allocate memory for lineBuf1 in Splash::scaleImageYupXupBilinear"); + gfree(srcBuf); + return false; + } + + lineBuf2 = (unsigned char *)gmallocn_checkoverflow(scaledWidth, nComps); + if (unlikely(!lineBuf2)) { + error(errInternal, -1, "Couldn't allocate memory for lineBuf2 in Splash::scaleImageYupXupBilinear"); + gfree(srcBuf); + gfree(lineBuf1); + return false; + } + + if (srcAlpha) { + alphaSrcBuf = (unsigned char *)gmalloc_checkoverflow(srcWidth + 1); // + 1 pixel of padding + if (unlikely(!alphaSrcBuf)) { + error(errInternal, -1, "Couldn't allocate memory for alphaSrcBuf in Splash::scaleImageYupXupBilinear"); + gfree(srcBuf); + gfree(lineBuf1); + gfree(lineBuf2); + return false; + } + + alphaLineBuf1 = (unsigned char *)gmalloc_checkoverflow(scaledWidth); + if (unlikely(!alphaLineBuf1)) { + error(errInternal, -1, "Couldn't allocate memory for alphaLineBuf1 in Splash::scaleImageYupXupBilinear"); + gfree(srcBuf); + gfree(lineBuf1); + gfree(lineBuf2); + gfree(alphaSrcBuf); + return false; + } + + alphaLineBuf2 = (unsigned char *)gmalloc_checkoverflow(scaledWidth); + if (unlikely(!alphaLineBuf2)) { + error(errInternal, -1, "Couldn't allocate memory for alphaLineBuf2 in Splash::scaleImageYupXupBilinear"); + gfree(srcBuf); + gfree(lineBuf1); + gfree(lineBuf2); + gfree(alphaSrcBuf); + gfree(alphaLineBuf1); + return false; + } + } else { + alphaSrcBuf = nullptr; + alphaLineBuf1 = nullptr; + alphaLineBuf2 = nullptr; + } + + double ySrc = 0.0; + double yStep = (double)srcHeight / scaledHeight; + double yFrac, yInt; + int currentSrcRow = -1; + (*src)(srcData, srcBuf, alphaSrcBuf); + expandRow(srcBuf, lineBuf2, srcWidth, scaledWidth, nComps); + if (srcAlpha) { + expandRow(alphaSrcBuf, alphaLineBuf2, srcWidth, scaledWidth, 1); + } + + destPtr0 = dest->data; + destAlphaPtr0 = dest->alpha; + for (int y = 0; y < scaledHeight; y++) { + yFrac = modf(ySrc, &yInt); + if ((int)yInt > currentSrcRow) { + currentSrcRow++; + // Copy line2 data to line1 and get next line2 data. + // If line2 already contains the last source row we don't touch it. + // This effectively adds an extra row of padding for interpolating the + // last source row with. + memcpy(lineBuf1, lineBuf2, scaledWidth * nComps); + if (srcAlpha) { + memcpy(alphaLineBuf1, alphaLineBuf2, scaledWidth); + } + if (currentSrcRow < srcHeight - 1) { + (*src)(srcData, srcBuf, alphaSrcBuf); + expandRow(srcBuf, lineBuf2, srcWidth, scaledWidth, nComps); + if (srcAlpha) { + expandRow(alphaSrcBuf, alphaLineBuf2, srcWidth, scaledWidth, 1); + } + } + } + + // write row y using linear interpolation on lineBuf1 and lineBuf2 + for (int x = 0; x < scaledWidth; ++x) { + // compute the final pixel + for (i = 0; i < nComps; ++i) { + pix[i] = static_cast(lineBuf1[x * nComps + i] * (1.0 - yFrac) + lineBuf2[x * nComps + i] * yFrac); + } + + // store the pixel + destPtr = destPtr0 + (y * scaledWidth + x) * nComps; + switch (srcMode) { + case splashModeMono1: // mono1 is not allowed + break; + case splashModeMono8: + *destPtr++ = (unsigned char)pix[0]; + break; + case splashModeRGB8: + *destPtr++ = (unsigned char)pix[0]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[2]; + break; + case splashModeXBGR8: + *destPtr++ = (unsigned char)pix[2]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[0]; + *destPtr++ = (unsigned char)255; + break; + case splashModeBGR8: + *destPtr++ = (unsigned char)pix[2]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[0]; + break; + case splashModeCMYK8: + *destPtr++ = (unsigned char)pix[0]; + *destPtr++ = (unsigned char)pix[1]; + *destPtr++ = (unsigned char)pix[2]; + *destPtr++ = (unsigned char)pix[3]; + break; + case splashModeDeviceN8: + for (unsigned int cp : pix) { + *destPtr++ = (unsigned char)cp; + } + break; + } + + // process alpha + if (srcAlpha) { + destAlphaPtr = destAlphaPtr0 + y * scaledWidth + x; + *destAlphaPtr = static_cast(alphaLineBuf1[x] * (1.0 - yFrac) + alphaLineBuf2[x] * yFrac); + } + } + + ySrc += yStep; + } + + gfree(alphaSrcBuf); + gfree(alphaLineBuf1); + gfree(alphaLineBuf2); + gfree(srcBuf); + gfree(lineBuf1); + gfree(lineBuf2); + + return true; +} + +void Splash::vertFlipImage(SplashBitmap *img, int width, int height, int nComps) +{ + unsigned char *lineBuf; + unsigned char *p0, *p1; + int w; + + if (unlikely(img->data == nullptr)) { + error(errInternal, -1, "img->data is NULL in Splash::vertFlipImage"); + return; + } + + w = width * nComps; + lineBuf = (unsigned char *)gmalloc(w); + for (p0 = img->data, p1 = img->data + (height - 1) * w; p0 < p1; p0 += w, p1 -= w) { + memcpy(lineBuf, p0, w); + memcpy(p0, p1, w); + memcpy(p1, lineBuf, w); + } + if (img->alpha) { + for (p0 = img->alpha, p1 = img->alpha + (height - 1) * width; p0 < p1; p0 += width, p1 -= width) { + memcpy(lineBuf, p0, width); + memcpy(p0, p1, width); + memcpy(p1, lineBuf, width); + } + } + gfree(lineBuf); +} + +void Splash::blitImage(SplashBitmap *src, bool srcAlpha, int xDest, int yDest) +{ + SplashClipResult clipRes = state->clip->testRect(xDest, yDest, xDest + src->getWidth() - 1, yDest + src->getHeight() - 1); + if (clipRes != splashClipAllOutside) { + blitImage(src, srcAlpha, xDest, yDest, clipRes); + } +} + +void Splash::blitImage(SplashBitmap *src, bool srcAlpha, int xDest, int yDest, SplashClipResult clipRes) +{ + SplashPipe pipe; + SplashColor pixel = {}; + unsigned char *ap; + int w, h, x0, y0, x1, y1, x, y; + + // split the image into clipped and unclipped regions + w = src->getWidth(); + h = src->getHeight(); + if (clipRes == splashClipAllInside) { + x0 = 0; + y0 = 0; + x1 = w; + y1 = h; + } else { + if (state->clip->getNumPaths()) { + x0 = x1 = w; + y0 = y1 = h; + } else { + if ((x0 = splashCeil(state->clip->getXMin()) - xDest) < 0) { + x0 = 0; + } + if ((y0 = splashCeil(state->clip->getYMin()) - yDest) < 0) { + y0 = 0; + } + if ((x1 = splashFloor(state->clip->getXMax()) - xDest) > w) { + x1 = w; + } + if (x1 < x0) { + x1 = x0; + } + if ((y1 = splashFloor(state->clip->getYMax()) - yDest) > h) { + y1 = h; + } + if (y1 < y0) { + y1 = y0; + } + } + } + + // draw the unclipped region + if (x0 < w && y0 < h && x0 < x1 && y0 < y1) { + pipeInit(&pipe, xDest + x0, yDest + y0, nullptr, pixel, (unsigned char)splashRound(state->fillAlpha * 255), srcAlpha, false); + if (srcAlpha) { + for (y = y0; y < y1; ++y) { + pipeSetXY(&pipe, xDest + x0, yDest + y); + ap = src->getAlphaPtr() + y * w + x0; + for (x = x0; x < x1; ++x) { + src->getPixel(x, y, pixel); + pipe.shape = *ap++; + (this->*pipe.run)(&pipe); + } + } + } else { + for (y = y0; y < y1; ++y) { + pipeSetXY(&pipe, xDest + x0, yDest + y); + for (x = x0; x < x1; ++x) { + src->getPixel(x, y, pixel); + (this->*pipe.run)(&pipe); + } + } + } + } + + // draw the clipped regions + if (y0 > 0) { + blitImageClipped(src, srcAlpha, 0, 0, xDest, yDest, w, y0); + } + if (y1 < h) { + blitImageClipped(src, srcAlpha, 0, y1, xDest, yDest + y1, w, h - y1); + } + if (x0 > 0 && y0 < y1) { + blitImageClipped(src, srcAlpha, 0, y0, xDest, yDest + y0, x0, y1 - y0); + } + if (x1 < w && y0 < y1) { + blitImageClipped(src, srcAlpha, x1, y0, xDest + x1, yDest + y0, w - x1, y1 - y0); + } +} + +void Splash::blitImageClipped(SplashBitmap *src, bool srcAlpha, int xSrc, int ySrc, int xDest, int yDest, int w, int h) +{ + SplashPipe pipe; + SplashColor pixel = {}; + unsigned char *ap; + int x, y; + + if (vectorAntialias) { + pipeInit(&pipe, xDest, yDest, nullptr, pixel, (unsigned char)splashRound(state->fillAlpha * 255), true, false); + drawAAPixelInit(); + if (srcAlpha) { + for (y = 0; y < h; ++y) { + ap = src->getAlphaPtr() + (ySrc + y) * src->getWidth() + xSrc; + for (x = 0; x < w; ++x) { + src->getPixel(xSrc + x, ySrc + y, pixel); + pipe.shape = *ap++; + drawAAPixel(&pipe, xDest + x, yDest + y); + } + } + } else { + for (y = 0; y < h; ++y) { + for (x = 0; x < w; ++x) { + src->getPixel(xSrc + x, ySrc + y, pixel); + pipe.shape = 255; + drawAAPixel(&pipe, xDest + x, yDest + y); + } + } + } + } else { + pipeInit(&pipe, xDest, yDest, nullptr, pixel, (unsigned char)splashRound(state->fillAlpha * 255), srcAlpha, false); + if (srcAlpha) { + for (y = 0; y < h; ++y) { + ap = src->getAlphaPtr() + (ySrc + y) * src->getWidth() + xSrc; + pipeSetXY(&pipe, xDest, yDest + y); + for (x = 0; x < w; ++x) { + if (state->clip->test(xDest + x, yDest + y)) { + src->getPixel(xSrc + x, ySrc + y, pixel); + pipe.shape = *ap++; + (this->*pipe.run)(&pipe); + } else { + pipeIncX(&pipe); + ++ap; + } + } + } + } else { + for (y = 0; y < h; ++y) { + pipeSetXY(&pipe, xDest, yDest + y); + for (x = 0; x < w; ++x) { + if (state->clip->test(xDest + x, yDest + y)) { + src->getPixel(xSrc + x, ySrc + y, pixel); + (this->*pipe.run)(&pipe); + } else { + pipeIncX(&pipe); + } + } + } + } + } +} + +SplashError Splash::composite(SplashBitmap *src, int xSrc, int ySrc, int xDest, int yDest, int w, int h, bool noClip, bool nonIsolated, bool knockout, SplashCoord knockoutOpacity) +{ + SplashPipe pipe; + SplashColor pixel; + unsigned char alpha; + unsigned char *ap; + int x, y; + + if (src->mode != bitmap->mode) { + return splashErrModeMismatch; + } + + if (unlikely(!bitmap->data)) { + return splashErrZeroImage; + } + + if (src->getSeparationList()->size() > bitmap->getSeparationList()->size()) { + for (x = bitmap->getSeparationList()->size(); x < (int)src->getSeparationList()->size(); x++) { + bitmap->getSeparationList()->push_back((GfxSeparationColorSpace *)((*src->getSeparationList())[x])->copy()); + } + } + if (src->alpha) { + pipeInit(&pipe, xDest, yDest, nullptr, pixel, (unsigned char)splashRound(state->fillAlpha * 255), true, nonIsolated, knockout, (unsigned char)splashRound(knockoutOpacity * 255)); + if (noClip) { + for (y = 0; y < h; ++y) { + pipeSetXY(&pipe, xDest, yDest + y); + ap = src->getAlphaPtr() + (ySrc + y) * src->getWidth() + xSrc; + for (x = 0; x < w; ++x) { + src->getPixel(xSrc + x, ySrc + y, pixel); + alpha = *ap++; + // this uses shape instead of alpha, which isn't technically + // correct, but works out the same + pipe.shape = alpha; + (this->*pipe.run)(&pipe); + } + } + } else { + for (y = 0; y < h; ++y) { + pipeSetXY(&pipe, xDest, yDest + y); + ap = src->getAlphaPtr() + (ySrc + y) * src->getWidth() + xSrc; + for (x = 0; x < w; ++x) { + src->getPixel(xSrc + x, ySrc + y, pixel); + alpha = *ap++; + if (state->clip->test(xDest + x, yDest + y)) { + // this uses shape instead of alpha, which isn't technically + // correct, but works out the same + pipe.shape = alpha; + (this->*pipe.run)(&pipe); + } else { + pipeIncX(&pipe); + } + } + } + } + } else { + pipeInit(&pipe, xDest, yDest, nullptr, pixel, (unsigned char)splashRound(state->fillAlpha * 255), false, nonIsolated); + if (noClip) { + for (y = 0; y < h; ++y) { + pipeSetXY(&pipe, xDest, yDest + y); + for (x = 0; x < w; ++x) { + src->getPixel(xSrc + x, ySrc + y, pixel); + (this->*pipe.run)(&pipe); + } + } + } else { + for (y = 0; y < h; ++y) { + pipeSetXY(&pipe, xDest, yDest + y); + for (x = 0; x < w; ++x) { + src->getPixel(xSrc + x, ySrc + y, pixel); + if (state->clip->test(xDest + x, yDest + y)) { + (this->*pipe.run)(&pipe); + } else { + pipeIncX(&pipe); + } + } + } + } + } + + return splashOk; +} + +void Splash::compositeBackground(SplashColorConstPtr color) +{ + SplashColorPtr p; + unsigned char *q; + unsigned char alpha, alpha1, c, color0, color1, color2; + unsigned char color3; + unsigned char colorsp[SPOT_NCOMPS + 4], cp; + int x, y, mask; + + if (unlikely(bitmap->alpha == nullptr)) { + error(errInternal, -1, "bitmap->alpha is NULL in Splash::compositeBackground"); + return; + } + + switch (bitmap->mode) { + case splashModeMono1: + color0 = color[0]; + for (y = 0; y < bitmap->height; ++y) { + p = &bitmap->data[y * bitmap->rowSize]; + q = &bitmap->alpha[y * bitmap->width]; + mask = 0x80; + for (x = 0; x < bitmap->width; ++x) { + alpha = *q++; + alpha1 = 255 - alpha; + c = (*p & mask) ? 0xff : 0x00; + c = div255(alpha1 * color0 + alpha * c); + if (c & 0x80) { + *p |= mask; + } else { + *p &= ~mask; + } + if (!(mask >>= 1)) { + mask = 0x80; + ++p; + } + } + } + break; + case splashModeMono8: + color0 = color[0]; + for (y = 0; y < bitmap->height; ++y) { + p = &bitmap->data[y * bitmap->rowSize]; + q = &bitmap->alpha[y * bitmap->width]; + for (x = 0; x < bitmap->width; ++x) { + alpha = *q++; + alpha1 = 255 - alpha; + p[0] = div255(alpha1 * color0 + alpha * p[0]); + ++p; + } + } + break; + case splashModeRGB8: + case splashModeBGR8: + color0 = color[0]; + color1 = color[1]; + color2 = color[2]; + for (y = 0; y < bitmap->height; ++y) { + p = &bitmap->data[y * bitmap->rowSize]; + q = &bitmap->alpha[y * bitmap->width]; + for (x = 0; x < bitmap->width; ++x) { + alpha = *q++; + if (alpha == 0) { + p[0] = color0; + p[1] = color1; + p[2] = color2; + } else if (alpha != 255) { + alpha1 = 255 - alpha; + p[0] = div255(alpha1 * color0 + alpha * p[0]); + p[1] = div255(alpha1 * color1 + alpha * p[1]); + p[2] = div255(alpha1 * color2 + alpha * p[2]); + } + p += 3; + } + } + break; + case splashModeXBGR8: + color0 = color[0]; + color1 = color[1]; + color2 = color[2]; + for (y = 0; y < bitmap->height; ++y) { + p = &bitmap->data[y * bitmap->rowSize]; + q = &bitmap->alpha[y * bitmap->width]; + for (x = 0; x < bitmap->width; ++x) { + alpha = *q++; + if (alpha == 0) { + p[0] = color0; + p[1] = color1; + p[2] = color2; + } else if (alpha != 255) { + alpha1 = 255 - alpha; + p[0] = div255(alpha1 * color0 + alpha * p[0]); + p[1] = div255(alpha1 * color1 + alpha * p[1]); + p[2] = div255(alpha1 * color2 + alpha * p[2]); + } + p[3] = 255; + p += 4; + } + } + break; + case splashModeCMYK8: + color0 = color[0]; + color1 = color[1]; + color2 = color[2]; + color3 = color[3]; + for (y = 0; y < bitmap->height; ++y) { + p = &bitmap->data[y * bitmap->rowSize]; + q = &bitmap->alpha[y * bitmap->width]; + for (x = 0; x < bitmap->width; ++x) { + alpha = *q++; + if (alpha == 0) { + p[0] = color0; + p[1] = color1; + p[2] = color2; + p[3] = color3; + } else if (alpha != 255) { + alpha1 = 255 - alpha; + p[0] = div255(alpha1 * color0 + alpha * p[0]); + p[1] = div255(alpha1 * color1 + alpha * p[1]); + p[2] = div255(alpha1 * color2 + alpha * p[2]); + p[3] = div255(alpha1 * color3 + alpha * p[3]); + } + p += 4; + } + } + break; + case splashModeDeviceN8: + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + colorsp[cp] = color[cp]; + } + for (y = 0; y < bitmap->height; ++y) { + p = &bitmap->data[y * bitmap->rowSize]; + q = &bitmap->alpha[y * bitmap->width]; + for (x = 0; x < bitmap->width; ++x) { + alpha = *q++; + if (alpha == 0) { + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + p[cp] = colorsp[cp]; + } + } else if (alpha != 255) { + alpha1 = 255 - alpha; + for (cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + p[cp] = div255(alpha1 * colorsp[cp] + alpha * p[cp]); + } + } + p += (SPOT_NCOMPS + 4); + } + } + break; + } + memset(bitmap->alpha, 255, bitmap->width * bitmap->height); +} + +bool Splash::gouraudTriangleShadedFill(SplashGouraudColor *shading) +{ + double xdbl[3] = { 0., 0., 0. }; + double ydbl[3] = { 0., 0., 0. }; + int x[3] = { 0, 0, 0 }; + int y[3] = { 0, 0, 0 }; + double xt = 0., xa = 0., yt = 0.; + + const int bitmapWidth = bitmap->getWidth(); + SplashClip *clip = getClip(); + SplashBitmap *blitTarget = bitmap; + SplashColorPtr bitmapData = bitmap->getDataPtr(); + const int bitmapOffLimit = bitmap->getHeight() * bitmap->getRowSize(); + SplashColorPtr bitmapAlpha = bitmap->getAlphaPtr(); + SplashCoord *userToCanvasMatrix = getMatrix(); + const SplashColorMode bitmapMode = bitmap->getMode(); + bool hasAlpha = (bitmapAlpha != nullptr); + const int rowSize = bitmap->getRowSize(); + const int colorComps = splashColorModeNComps[bitmapMode]; + + SplashPipe pipe; + SplashColor cSrcVal; + + pipeInit(&pipe, 0, 0, nullptr, cSrcVal, (unsigned char)splashRound(state->fillAlpha * 255), false, false); + + if (vectorAntialias) { + if (aaBuf == nullptr) { + return false; // fall back to old behaviour + } + drawAAPixelInit(); + } + + // idea: + // 1. If pipe->noTransparency && !state->blendFunc + // -> blit directly into the drawing surface! + // -> disable alpha manually. + // 2. Otherwise: + // - blit also directly, but into an intermediate surface. + // Afterwards, blit the intermediate surface using the drawing pipeline. + // This is necessary because triangle elements can be on top of each + // other, so the complete shading needs to be drawn before opacity is + // applied. + // - the final step, is performed using a SplashPipe: + // - assign the actual color into cSrcVal: pipe uses cSrcVal by reference + // - invoke drawPixel(&pipe,X,Y,bNoClip); + const bool bDirectBlit = vectorAntialias ? false : pipe.noTransparency && !state->blendFunc && !shading->isParameterized(); + if (!bDirectBlit) { + blitTarget = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(), bitmap->getRowPad(), bitmap->getMode(), true, bitmap->getRowSize() >= 0); + bitmapData = blitTarget->getDataPtr(); + bitmapAlpha = blitTarget->getAlphaPtr(); + + // initialisation seems to be necessary: + const int S = bitmap->getWidth() * bitmap->getHeight(); + for (int i = 0; i < S; ++i) { + bitmapAlpha[i] = 0; + } + hasAlpha = true; + } + + if (shading->isParameterized()) { + double color[3]; + double scanLimitMapL[2] = { 0., 0. }; + double scanLimitMapR[2] = { 0., 0. }; + double scanColorMapL[2] = { 0., 0. }; + double scanColorMapR[2] = { 0., 0. }; + int scanEdgeL[2] = { 0, 0 }; + int scanEdgeR[2] = { 0, 0 }; + + for (int i = 0; i < shading->getNTriangles(); ++i) { + shading->getParametrizedTriangle(i, xdbl + 0, ydbl + 0, color + 0, xdbl + 1, ydbl + 1, color + 1, xdbl + 2, ydbl + 2, color + 2); + for (int m = 0; m < 3; ++m) { + xt = xdbl[m] * (double)userToCanvasMatrix[0] + ydbl[m] * (double)userToCanvasMatrix[2] + (double)userToCanvasMatrix[4]; + yt = xdbl[m] * (double)userToCanvasMatrix[1] + ydbl[m] * (double)userToCanvasMatrix[3] + (double)userToCanvasMatrix[5]; + xdbl[m] = xt; + ydbl[m] = yt; + // we operate on scanlines which are integer offsets into the + // raster image. The double offsets are of no use here. + x[m] = splashRound(xt); + y[m] = splashRound(yt); + } + // sort according to y coordinate to simplify sweep through scanlines: + // INSERTION SORT. + if (y[0] > y[1]) { + Guswap(x[0], x[1]); + Guswap(y[0], y[1]); + Guswap(color[0], color[1]); + } + // first two are sorted. + assert(y[0] <= y[1]); + if (y[1] > y[2]) { + const int tmpX = x[2]; + const int tmpY = y[2]; + const double tmpC = color[2]; + x[2] = x[1]; + y[2] = y[1]; + color[2] = color[1]; + + if (y[0] > tmpY) { + x[1] = x[0]; + y[1] = y[0]; + color[1] = color[0]; + x[0] = tmpX; + y[0] = tmpY; + color[0] = tmpC; + } else { + x[1] = tmpX; + y[1] = tmpY; + color[1] = tmpC; + } + } + // first three are sorted + assert(y[0] <= y[1]); + assert(y[1] <= y[2]); + ///// + + // this here is det( T ) == 0 + // where T is the matrix to map to barycentric coordinates. + if ((x[0] - x[2]) * (y[1] - y[2]) - (x[1] - x[2]) * (y[0] - y[2]) == 0) { + continue; // degenerate triangle. + } + + // this here initialises the scanline generation. + // We start with low Y coordinates and sweep up to the large Y + // coordinates. + // + // scanEdgeL[m] in {0,1,2} m=0,1 + // scanEdgeR[m] in {0,1,2} m=0,1 + // + // are the two edges between which scanlines are (currently) + // sweeped. The values {0,1,2} are indices into 'x' and 'y'. + // scanEdgeL[0] = 0 means: the left scan edge has (x[0],y[0]) as vertex. + // + scanEdgeL[0] = 0; + scanEdgeR[0] = 0; + if (y[0] == y[1]) { + scanEdgeL[0] = 1; + scanEdgeL[1] = scanEdgeR[1] = 2; + + } else { + scanEdgeL[1] = 1; + scanEdgeR[1] = 2; + } + assert(y[scanEdgeL[0]] < y[scanEdgeL[1]]); + assert(y[scanEdgeR[0]] < y[scanEdgeR[1]]); + + // Ok. Now prepare the linear maps which map the y coordinate of + // the current scanline to the corresponding LEFT and RIGHT x + // coordinate (which define the scanline). + scanLimitMapL[0] = double(x[scanEdgeL[1]] - x[scanEdgeL[0]]) / (y[scanEdgeL[1]] - y[scanEdgeL[0]]); + scanLimitMapL[1] = x[scanEdgeL[0]] - y[scanEdgeL[0]] * scanLimitMapL[0]; + scanLimitMapR[0] = double(x[scanEdgeR[1]] - x[scanEdgeR[0]]) / (y[scanEdgeR[1]] - y[scanEdgeR[0]]); + scanLimitMapR[1] = x[scanEdgeR[0]] - y[scanEdgeR[0]] * scanLimitMapR[0]; + + xa = y[1] * scanLimitMapL[0] + scanLimitMapL[1]; + xt = y[1] * scanLimitMapR[0] + scanLimitMapR[1]; + if (xa > xt) { + // I have "left" is to the right of "right". + // Exchange sides! + Guswap(scanEdgeL[0], scanEdgeR[0]); + Guswap(scanEdgeL[1], scanEdgeR[1]); + Guswap(scanLimitMapL[0], scanLimitMapR[0]); + Guswap(scanLimitMapL[1], scanLimitMapR[1]); + // FIXME I'm sure there is a more efficient way to check this. + } + + // Same game: we can linearly interpolate the color based on the + // current y coordinate (that's correct for triangle + // interpolation due to linearity. We could also have done it in + // barycentric coordinates, but that's slightly more involved) + scanColorMapL[0] = (color[scanEdgeL[1]] - color[scanEdgeL[0]]) / (y[scanEdgeL[1]] - y[scanEdgeL[0]]); + scanColorMapL[1] = color[scanEdgeL[0]] - y[scanEdgeL[0]] * scanColorMapL[0]; + scanColorMapR[0] = (color[scanEdgeR[1]] - color[scanEdgeR[0]]) / (y[scanEdgeR[1]] - y[scanEdgeR[0]]); + scanColorMapR[1] = color[scanEdgeR[0]] - y[scanEdgeR[0]] * scanColorMapR[0]; + + bool hasFurtherSegment = (y[1] < y[2]); + int scanLineOff = y[0] * rowSize; + + for (int Y = y[0]; Y <= y[2]; ++Y, scanLineOff += rowSize) { + if (hasFurtherSegment && Y == y[1]) { + // SWEEP EVENT: we encountered the next segment. + // + // switch to next segment, either at left end or at right + // end: + if (scanEdgeL[1] == 1) { + scanEdgeL[0] = 1; + scanEdgeL[1] = 2; + scanLimitMapL[0] = double(x[scanEdgeL[1]] - x[scanEdgeL[0]]) / (y[scanEdgeL[1]] - y[scanEdgeL[0]]); + scanLimitMapL[1] = x[scanEdgeL[0]] - y[scanEdgeL[0]] * scanLimitMapL[0]; + + scanColorMapL[0] = (color[scanEdgeL[1]] - color[scanEdgeL[0]]) / (y[scanEdgeL[1]] - y[scanEdgeL[0]]); + scanColorMapL[1] = color[scanEdgeL[0]] - y[scanEdgeL[0]] * scanColorMapL[0]; + } else if (scanEdgeR[1] == 1) { + scanEdgeR[0] = 1; + scanEdgeR[1] = 2; + scanLimitMapR[0] = double(x[scanEdgeR[1]] - x[scanEdgeR[0]]) / (y[scanEdgeR[1]] - y[scanEdgeR[0]]); + scanLimitMapR[1] = x[scanEdgeR[0]] - y[scanEdgeR[0]] * scanLimitMapR[0]; + + scanColorMapR[0] = (color[scanEdgeR[1]] - color[scanEdgeR[0]]) / (y[scanEdgeR[1]] - y[scanEdgeR[0]]); + scanColorMapR[1] = color[scanEdgeR[0]] - y[scanEdgeR[0]] * scanColorMapR[0]; + } + assert(y[scanEdgeL[0]] < y[scanEdgeL[1]]); + assert(y[scanEdgeR[0]] < y[scanEdgeR[1]]); + hasFurtherSegment = false; + } + + yt = Y; + + xa = yt * scanLimitMapL[0] + scanLimitMapL[1]; + xt = yt * scanLimitMapR[0] + scanLimitMapR[1]; + + const double ca = yt * scanColorMapL[0] + scanColorMapL[1]; + const double ct = yt * scanColorMapR[0] + scanColorMapR[1]; + + const int scanLimitL = splashRound(xa); + const int scanLimitR = splashRound(xt); + + // Ok. Now: init the color interpolation depending on the X + // coordinate inside of the current scanline: + const double scanColorMap0 = (scanLimitR == scanLimitL) ? 0. : ((ct - ca) / (scanLimitR - scanLimitL)); + const double scanColorMap1 = ca - scanLimitL * scanColorMap0; + + // handled by clipping: + // assert( scanLimitL >= 0 && scanLimitR < bitmap->getWidth() ); + assert(scanLimitL <= scanLimitR || abs(scanLimitL - scanLimitR) <= 2); // allow rounding inaccuracies + assert(scanLineOff == Y * rowSize); + + double colorinterp = scanColorMap0 * scanLimitL + scanColorMap1; + + int bitmapOff = scanLineOff + scanLimitL * colorComps; + if (likely(bitmapOff >= 0)) { + for (int X = scanLimitL; X <= scanLimitR && bitmapOff + colorComps <= bitmapOffLimit; ++X, colorinterp += scanColorMap0, bitmapOff += colorComps) { + // FIXME : standard rectangular clipping can be done for a + // complete scanline which is faster + // --> see SplashClip and its methods + if (!clip->test(X, Y)) { + continue; + } + + assert(fabs(colorinterp - (scanColorMap0 * X + scanColorMap1)) < 1e-7); + assert(bitmapOff == Y * rowSize + colorComps * X && scanLineOff == Y * rowSize); + + shading->getParameterizedColor(colorinterp, bitmapMode, &bitmapData[bitmapOff]); + + // make the shading visible. + // Note that opacity is handled by the bDirectBlit stuff, see + // above for comments and below for implementation. + if (hasAlpha) { + bitmapAlpha[Y * bitmapWidth + X] = 255; + } + } + } + } + } + } else { + SplashColor color, auxColor1, auxColor2; + double scanLimitMapL[2] = { 0., 0. }; + double scanLimitMapR[2] = { 0., 0. }; + int scanEdgeL[2] = { 0, 0 }; + int scanEdgeR[2] = { 0, 0 }; + + for (int i = 0; i < shading->getNTriangles(); ++i) { + // Sadly this current algorithm only supports shadings where the three triangle vertices have the same color + shading->getNonParametrizedTriangle(i, bitmapMode, xdbl + 0, ydbl + 0, (SplashColorPtr)&color, xdbl + 1, ydbl + 1, (SplashColorPtr)&auxColor1, xdbl + 2, ydbl + 2, (SplashColorPtr)&auxColor2); + if (!splashColorEqual(color, auxColor1) || !splashColorEqual(color, auxColor2)) { + if (!bDirectBlit) { + delete blitTarget; + } + return false; + } + for (int m = 0; m < 3; ++m) { + xt = xdbl[m] * (double)userToCanvasMatrix[0] + ydbl[m] * (double)userToCanvasMatrix[2] + (double)userToCanvasMatrix[4]; + yt = xdbl[m] * (double)userToCanvasMatrix[1] + ydbl[m] * (double)userToCanvasMatrix[3] + (double)userToCanvasMatrix[5]; + xdbl[m] = xt; + ydbl[m] = yt; + // we operate on scanlines which are integer offsets into the + // raster image. The double offsets are of no use here. + x[m] = splashRound(xt); + y[m] = splashRound(yt); + } + // sort according to y coordinate to simplify sweep through scanlines: + // INSERTION SORT. + if (y[0] > y[1]) { + Guswap(x[0], x[1]); + Guswap(y[0], y[1]); + } + // first two are sorted. + assert(y[0] <= y[1]); + if (y[1] > y[2]) { + const int tmpX = x[2]; + const int tmpY = y[2]; + x[2] = x[1]; + y[2] = y[1]; + + if (y[0] > tmpY) { + x[1] = x[0]; + y[1] = y[0]; + x[0] = tmpX; + y[0] = tmpY; + } else { + x[1] = tmpX; + y[1] = tmpY; + } + } + // first three are sorted + assert(y[0] <= y[1]); + assert(y[1] <= y[2]); + ///// + + // this here is det( T ) == 0 + // where T is the matrix to map to barycentric coordinates. + if ((x[0] - x[2]) * (y[1] - y[2]) - (x[1] - x[2]) * (y[0] - y[2]) == 0) { + continue; // degenerate triangle. + } + + // this here initialises the scanline generation. + // We start with low Y coordinates and sweep up to the large Y + // coordinates. + // + // scanEdgeL[m] in {0,1,2} m=0,1 + // scanEdgeR[m] in {0,1,2} m=0,1 + // + // are the two edges between which scanlines are (currently) + // sweeped. The values {0,1,2} are indices into 'x' and 'y'. + // scanEdgeL[0] = 0 means: the left scan edge has (x[0],y[0]) as vertex. + // + scanEdgeL[0] = 0; + scanEdgeR[0] = 0; + if (y[0] == y[1]) { + scanEdgeL[0] = 1; + scanEdgeL[1] = scanEdgeR[1] = 2; + + } else { + scanEdgeL[1] = 1; + scanEdgeR[1] = 2; + } + assert(y[scanEdgeL[0]] < y[scanEdgeL[1]]); + assert(y[scanEdgeR[0]] < y[scanEdgeR[1]]); + + // Ok. Now prepare the linear maps which map the y coordinate of + // the current scanline to the corresponding LEFT and RIGHT x + // coordinate (which define the scanline). + scanLimitMapL[0] = double(x[scanEdgeL[1]] - x[scanEdgeL[0]]) / (y[scanEdgeL[1]] - y[scanEdgeL[0]]); + scanLimitMapL[1] = x[scanEdgeL[0]] - y[scanEdgeL[0]] * scanLimitMapL[0]; + scanLimitMapR[0] = double(x[scanEdgeR[1]] - x[scanEdgeR[0]]) / (y[scanEdgeR[1]] - y[scanEdgeR[0]]); + scanLimitMapR[1] = x[scanEdgeR[0]] - y[scanEdgeR[0]] * scanLimitMapR[0]; + + xa = y[1] * scanLimitMapL[0] + scanLimitMapL[1]; + xt = y[1] * scanLimitMapR[0] + scanLimitMapR[1]; + if (xa > xt) { + // I have "left" is to the right of "right". + // Exchange sides! + Guswap(scanEdgeL[0], scanEdgeR[0]); + Guswap(scanEdgeL[1], scanEdgeR[1]); + Guswap(scanLimitMapL[0], scanLimitMapR[0]); + Guswap(scanLimitMapL[1], scanLimitMapR[1]); + // FIXME I'm sure there is a more efficient way to check this. + } + + bool hasFurtherSegment = (y[1] < y[2]); + int scanLineOff = y[0] * rowSize; + + for (int Y = y[0]; Y <= y[2]; ++Y, scanLineOff += rowSize) { + if (hasFurtherSegment && Y == y[1]) { + // SWEEP EVENT: we encountered the next segment. + // + // switch to next segment, either at left end or at right + // end: + if (scanEdgeL[1] == 1) { + scanEdgeL[0] = 1; + scanEdgeL[1] = 2; + scanLimitMapL[0] = double(x[scanEdgeL[1]] - x[scanEdgeL[0]]) / (y[scanEdgeL[1]] - y[scanEdgeL[0]]); + scanLimitMapL[1] = x[scanEdgeL[0]] - y[scanEdgeL[0]] * scanLimitMapL[0]; + } else if (scanEdgeR[1] == 1) { + scanEdgeR[0] = 1; + scanEdgeR[1] = 2; + scanLimitMapR[0] = double(x[scanEdgeR[1]] - x[scanEdgeR[0]]) / (y[scanEdgeR[1]] - y[scanEdgeR[0]]); + scanLimitMapR[1] = x[scanEdgeR[0]] - y[scanEdgeR[0]] * scanLimitMapR[0]; + } + assert(y[scanEdgeL[0]] < y[scanEdgeL[1]]); + assert(y[scanEdgeR[0]] < y[scanEdgeR[1]]); + hasFurtherSegment = false; + } + + yt = Y; + + xa = yt * scanLimitMapL[0] + scanLimitMapL[1]; + xt = yt * scanLimitMapR[0] + scanLimitMapR[1]; + + const int scanLimitL = splashRound(xa); + const int scanLimitR = splashRound(xt); + + // handled by clipping: + // assert( scanLimitL >= 0 && scanLimitR < bitmap->getWidth() ); + assert(scanLimitL <= scanLimitR || abs(scanLimitL - scanLimitR) <= 2); // allow rounding inaccuracies + assert(scanLineOff == Y * rowSize); + + int bitmapOff = scanLineOff + scanLimitL * colorComps; + if (likely(bitmapOff >= 0)) { + for (int X = scanLimitL; X <= scanLimitR && bitmapOff + colorComps <= bitmapOffLimit; ++X, bitmapOff += colorComps) { + // FIXME : standard rectangular clipping can be done for a + // complete scanline which is faster + // --> see SplashClip and its methods + if (!clip->test(X, Y)) { + continue; + } + + assert(bitmapOff == Y * rowSize + colorComps * X && scanLineOff == Y * rowSize); + + for (int k = 0; k < colorComps; ++k) { + bitmapData[bitmapOff + k] = color[k]; + } + + // make the shading visible. + // Note that opacity is handled by the bDirectBlit stuff, see + // above for comments and below for implementation. + if (hasAlpha) { + bitmapAlpha[Y * bitmapWidth + X] = 255; + } + } + } + } + } + } + + if (!bDirectBlit) { + // ok. Finalize the stuff by blitting the shading into the final + // geometry, this time respecting the rendering pipe. + const int W = blitTarget->getWidth(); + const int H = blitTarget->getHeight(); + SplashColorPtr cur = cSrcVal; + + for (int X = 0; X < W; ++X) { + for (int Y = 0; Y < H; ++Y) { + if (!bitmapAlpha[Y * bitmapWidth + X]) { + continue; // draw only parts of the shading! + } + const int bitmapOff = Y * rowSize + colorComps * X; + + for (int m = 0; m < colorComps; ++m) { + cur[m] = bitmapData[bitmapOff + m]; + } + if (vectorAntialias) { + drawAAPixel(&pipe, X, Y); + } else { + drawPixel(&pipe, X, Y, true); // no clipping - has already been done. + } + } + } + + delete blitTarget; + blitTarget = nullptr; + } + + return true; +} + +SplashError Splash::blitTransparent(SplashBitmap *src, int xSrc, int ySrc, int xDest, int yDest, int w, int h) +{ + SplashColorPtr p, sp; + unsigned char *q; + int x, y, mask, srcMask, width = w, height = h; + + if (src->mode != bitmap->mode) { + return splashErrModeMismatch; + } + + if (unlikely(!bitmap->data)) { + return splashErrZeroImage; + } + + if (src->getWidth() - xSrc < width) { + width = src->getWidth() - xSrc; + } + + if (src->getHeight() - ySrc < height) { + height = src->getHeight() - ySrc; + } + + if (bitmap->getWidth() - xDest < width) { + width = bitmap->getWidth() - xDest; + } + + if (bitmap->getHeight() - yDest < height) { + height = bitmap->getHeight() - yDest; + } + + if (width < 0) { + width = 0; + } + + if (height < 0) { + height = 0; + } + + switch (bitmap->mode) { + case splashModeMono1: + for (y = 0; y < height; ++y) { + p = &bitmap->data[(yDest + y) * bitmap->rowSize + (xDest >> 3)]; + mask = 0x80 >> (xDest & 7); + sp = &src->data[(ySrc + y) * src->rowSize + (xSrc >> 3)]; + srcMask = 0x80 >> (xSrc & 7); + for (x = 0; x < width; ++x) { + if (*sp & srcMask) { + *p |= mask; + } else { + *p &= ~mask; + } + if (!(mask >>= 1)) { + mask = 0x80; + ++p; + } + if (!(srcMask >>= 1)) { + srcMask = 0x80; + ++sp; + } + } + } + break; + case splashModeMono8: + for (y = 0; y < height; ++y) { + p = &bitmap->data[(yDest + y) * bitmap->rowSize + xDest]; + sp = &src->data[(ySrc + y) * src->rowSize + xSrc]; + for (x = 0; x < width; ++x) { + *p++ = *sp++; + } + } + break; + case splashModeRGB8: + case splashModeBGR8: + for (y = 0; y < height; ++y) { + p = &bitmap->data[(yDest + y) * bitmap->rowSize + 3 * xDest]; + sp = &src->data[(ySrc + y) * src->rowSize + 3 * xSrc]; + for (x = 0; x < width; ++x) { + *p++ = *sp++; + *p++ = *sp++; + *p++ = *sp++; + } + } + break; + case splashModeXBGR8: + for (y = 0; y < height; ++y) { + p = &bitmap->data[(yDest + y) * bitmap->rowSize + 4 * xDest]; + sp = &src->data[(ySrc + y) * src->rowSize + 4 * xSrc]; + for (x = 0; x < width; ++x) { + *p++ = *sp++; + *p++ = *sp++; + *p++ = *sp++; + *p++ = 255; + sp++; + } + } + break; + case splashModeCMYK8: + for (y = 0; y < height; ++y) { + p = &bitmap->data[(yDest + y) * bitmap->rowSize + 4 * xDest]; + sp = &src->data[(ySrc + y) * src->rowSize + 4 * xSrc]; + for (x = 0; x < width; ++x) { + *p++ = *sp++; + *p++ = *sp++; + *p++ = *sp++; + *p++ = *sp++; + } + } + break; + case splashModeDeviceN8: + for (y = 0; y < height; ++y) { + p = &bitmap->data[(yDest + y) * bitmap->rowSize + (SPOT_NCOMPS + 4) * xDest]; + sp = &src->data[(ySrc + y) * src->rowSize + (SPOT_NCOMPS + 4) * xSrc]; + for (x = 0; x < width; ++x) { + for (int cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + *p++ = *sp++; + } + } + } + break; + } + + if (bitmap->alpha) { + for (y = 0; y < height; ++y) { + q = &bitmap->alpha[(yDest + y) * bitmap->width + xDest]; + memset(q, 0x00, width); + } + } + + return splashOk; +} + +SplashPath *Splash::makeStrokePath(SplashPath *path, SplashCoord w, bool flatten) +{ + SplashPath *pathIn, *dashPath, *pathOut; + SplashCoord d, dx, dy, wdx, wdy, dxNext, dyNext, wdxNext, wdyNext; + SplashCoord crossprod, dotprod, miter, m; + bool first, last, closed, hasangle; + int subpathStart0, subpathStart1, seg, i0, i1, j0, j1, k0, k1; + int left0, left1, left2, right0, right1, right2, join0, join1, join2; + int leftFirst, rightFirst, firstPt; + + pathOut = new SplashPath(); + + if (path->length == 0) { + return pathOut; + } + + if (flatten) { + pathIn = flattenPath(path, state->matrix, state->flatness); + if (!state->lineDash.empty()) { + dashPath = makeDashedPath(pathIn); + delete pathIn; + pathIn = dashPath; + if (pathIn->length == 0) { + delete pathIn; + return pathOut; + } + } + } else { + pathIn = path; + } + + subpathStart0 = subpathStart1 = 0; // make gcc happy + seg = 0; // make gcc happy + closed = false; // make gcc happy + left0 = left1 = right0 = right1 = join0 = join1 = 0; // make gcc happy + leftFirst = rightFirst = firstPt = 0; // make gcc happy + + i0 = 0; + for (i1 = i0; !(pathIn->flags[i1] & splashPathLast) && i1 + 1 < pathIn->length && pathIn->pts[i1 + 1].x == pathIn->pts[i1].x && pathIn->pts[i1 + 1].y == pathIn->pts[i1].y; ++i1) { + ; + } + + while (i1 < pathIn->length) { + if ((first = pathIn->flags[i0] & splashPathFirst)) { + subpathStart0 = i0; + subpathStart1 = i1; + seg = 0; + closed = pathIn->flags[i0] & splashPathClosed; + } + j0 = i1 + 1; + if (j0 < pathIn->length) { + for (j1 = j0; !(pathIn->flags[j1] & splashPathLast) && j1 + 1 < pathIn->length && pathIn->pts[j1 + 1].x == pathIn->pts[j1].x && pathIn->pts[j1 + 1].y == pathIn->pts[j1].y; ++j1) { + ; + } + } else { + j1 = j0; + } + if (pathIn->flags[i1] & splashPathLast) { + if (first && state->lineCap == splashLineCapRound) { + // special case: zero-length subpath with round line caps --> + // draw a circle + pathOut->moveTo(pathIn->pts[i0].x + (SplashCoord)0.5 * w, pathIn->pts[i0].y); + pathOut->curveTo(pathIn->pts[i0].x + (SplashCoord)0.5 * w, pathIn->pts[i0].y + bezierCircle2 * w, pathIn->pts[i0].x + bezierCircle2 * w, pathIn->pts[i0].y + (SplashCoord)0.5 * w, pathIn->pts[i0].x, + pathIn->pts[i0].y + (SplashCoord)0.5 * w); + pathOut->curveTo(pathIn->pts[i0].x - bezierCircle2 * w, pathIn->pts[i0].y + (SplashCoord)0.5 * w, pathIn->pts[i0].x - (SplashCoord)0.5 * w, pathIn->pts[i0].y + bezierCircle2 * w, pathIn->pts[i0].x - (SplashCoord)0.5 * w, + pathIn->pts[i0].y); + pathOut->curveTo(pathIn->pts[i0].x - (SplashCoord)0.5 * w, pathIn->pts[i0].y - bezierCircle2 * w, pathIn->pts[i0].x - bezierCircle2 * w, pathIn->pts[i0].y - (SplashCoord)0.5 * w, pathIn->pts[i0].x, + pathIn->pts[i0].y - (SplashCoord)0.5 * w); + pathOut->curveTo(pathIn->pts[i0].x + bezierCircle2 * w, pathIn->pts[i0].y - (SplashCoord)0.5 * w, pathIn->pts[i0].x + (SplashCoord)0.5 * w, pathIn->pts[i0].y - bezierCircle2 * w, pathIn->pts[i0].x + (SplashCoord)0.5 * w, + pathIn->pts[i0].y); + pathOut->close(); + } + i0 = j0; + i1 = j1; + continue; + } + last = pathIn->flags[j1] & splashPathLast; + if (last) { + k0 = subpathStart1 + 1; + } else { + k0 = j1 + 1; + } + for (k1 = k0; !(pathIn->flags[k1] & splashPathLast) && k1 + 1 < pathIn->length && pathIn->pts[k1 + 1].x == pathIn->pts[k1].x && pathIn->pts[k1 + 1].y == pathIn->pts[k1].y; ++k1) { + ; + } + + // compute the deltas for segment (i1, j0) + d = (SplashCoord)1 / splashDist(pathIn->pts[i1].x, pathIn->pts[i1].y, pathIn->pts[j0].x, pathIn->pts[j0].y); + dx = d * (pathIn->pts[j0].x - pathIn->pts[i1].x); + dy = d * (pathIn->pts[j0].y - pathIn->pts[i1].y); + wdx = (SplashCoord)0.5 * w * dx; + wdy = (SplashCoord)0.5 * w * dy; + + // draw the start cap + if (pathOut->moveTo(pathIn->pts[i0].x - wdy, pathIn->pts[i0].y + wdx) != splashOk) { + break; + } + if (i0 == subpathStart0) { + firstPt = pathOut->length - 1; + } + if (first && !closed) { + switch (state->lineCap) { + case splashLineCapButt: + pathOut->lineTo(pathIn->pts[i0].x + wdy, pathIn->pts[i0].y - wdx); + break; + case splashLineCapRound: + pathOut->curveTo(pathIn->pts[i0].x - wdy - bezierCircle * wdx, pathIn->pts[i0].y + wdx - bezierCircle * wdy, pathIn->pts[i0].x - wdx - bezierCircle * wdy, pathIn->pts[i0].y - wdy + bezierCircle * wdx, + pathIn->pts[i0].x - wdx, pathIn->pts[i0].y - wdy); + pathOut->curveTo(pathIn->pts[i0].x - wdx + bezierCircle * wdy, pathIn->pts[i0].y - wdy - bezierCircle * wdx, pathIn->pts[i0].x + wdy - bezierCircle * wdx, pathIn->pts[i0].y - wdx - bezierCircle * wdy, + pathIn->pts[i0].x + wdy, pathIn->pts[i0].y - wdx); + break; + case splashLineCapProjecting: + pathOut->lineTo(pathIn->pts[i0].x - wdx - wdy, pathIn->pts[i0].y + wdx - wdy); + pathOut->lineTo(pathIn->pts[i0].x - wdx + wdy, pathIn->pts[i0].y - wdx - wdy); + pathOut->lineTo(pathIn->pts[i0].x + wdy, pathIn->pts[i0].y - wdx); + break; + } + } else { + pathOut->lineTo(pathIn->pts[i0].x + wdy, pathIn->pts[i0].y - wdx); + } + + // draw the left side of the segment rectangle + left2 = pathOut->length - 1; + pathOut->lineTo(pathIn->pts[j0].x + wdy, pathIn->pts[j0].y - wdx); + + // draw the end cap + if (last && !closed) { + switch (state->lineCap) { + case splashLineCapButt: + pathOut->lineTo(pathIn->pts[j0].x - wdy, pathIn->pts[j0].y + wdx); + break; + case splashLineCapRound: + pathOut->curveTo(pathIn->pts[j0].x + wdy + bezierCircle * wdx, pathIn->pts[j0].y - wdx + bezierCircle * wdy, pathIn->pts[j0].x + wdx + bezierCircle * wdy, pathIn->pts[j0].y + wdy - bezierCircle * wdx, + pathIn->pts[j0].x + wdx, pathIn->pts[j0].y + wdy); + pathOut->curveTo(pathIn->pts[j0].x + wdx - bezierCircle * wdy, pathIn->pts[j0].y + wdy + bezierCircle * wdx, pathIn->pts[j0].x - wdy + bezierCircle * wdx, pathIn->pts[j0].y + wdx + bezierCircle * wdy, + pathIn->pts[j0].x - wdy, pathIn->pts[j0].y + wdx); + break; + case splashLineCapProjecting: + pathOut->lineTo(pathIn->pts[j0].x + wdy + wdx, pathIn->pts[j0].y - wdx + wdy); + pathOut->lineTo(pathIn->pts[j0].x - wdy + wdx, pathIn->pts[j0].y + wdx + wdy); + pathOut->lineTo(pathIn->pts[j0].x - wdy, pathIn->pts[j0].y + wdx); + break; + } + } else { + pathOut->lineTo(pathIn->pts[j0].x - wdy, pathIn->pts[j0].y + wdx); + } + + // draw the right side of the segment rectangle + // (NB: if stroke adjustment is enabled, the closepath operation MUST + // add a segment because this segment is used for a hint) + right2 = pathOut->length - 1; + pathOut->close(state->strokeAdjust); + + // draw the join + join2 = pathOut->length; + if (!last || closed) { + + // compute the deltas for segment (j1, k0) + d = (SplashCoord)1 / splashDist(pathIn->pts[j1].x, pathIn->pts[j1].y, pathIn->pts[k0].x, pathIn->pts[k0].y); + dxNext = d * (pathIn->pts[k0].x - pathIn->pts[j1].x); + dyNext = d * (pathIn->pts[k0].y - pathIn->pts[j1].y); + wdxNext = (SplashCoord)0.5 * w * dxNext; + wdyNext = (SplashCoord)0.5 * w * dyNext; + + // compute the join parameters + crossprod = dx * dyNext - dy * dxNext; + dotprod = -(dx * dxNext + dy * dyNext); + hasangle = crossprod != 0 || dx * dxNext < 0 || dy * dyNext < 0; + if (dotprod > 0.9999) { + // avoid a divide-by-zero -- set miter to something arbitrary + // such that sqrt(miter) will exceed miterLimit (and m is never + // used in that situation) + // (note: the comparison value (0.9999) has to be less than + // 1-epsilon, where epsilon is the smallest value + // representable in the fixed point format) + miter = (state->miterLimit + 1) * (state->miterLimit + 1); + m = 0; + } else { + miter = (SplashCoord)2 / ((SplashCoord)1 - dotprod); + if (miter < 1) { + // this can happen because of floating point inaccuracies + miter = 1; + } + m = splashSqrt(miter - 1); + } + + // hasangle == false means that the current and and the next segment + // are parallel. In that case no join needs to be drawn. + // round join + if (hasangle && state->lineJoin == splashLineJoinRound) { + // join angle < 180 + if (crossprod < 0) { + SplashCoord angle = atan2((double)dx, (double)-dy); + SplashCoord angleNext = atan2((double)dxNext, (double)-dyNext); + if (angle < angleNext) { + angle += 2 * M_PI; + } + SplashCoord dAngle = (angle - angleNext) / M_PI; + if (dAngle < 0.501) { + // span angle is <= 90 degrees -> draw a single arc + SplashCoord kappa = dAngle * bezierCircle * w; + SplashCoord cx1 = pathIn->pts[j0].x - wdy + kappa * dx; + SplashCoord cy1 = pathIn->pts[j0].y + wdx + kappa * dy; + SplashCoord cx2 = pathIn->pts[j0].x - wdyNext - kappa * dxNext; + SplashCoord cy2 = pathIn->pts[j0].y + wdxNext - kappa * dyNext; + pathOut->moveTo(pathIn->pts[j0].x, pathIn->pts[j0].y); + pathOut->lineTo(pathIn->pts[j0].x - wdyNext, pathIn->pts[j0].y + wdxNext); + pathOut->curveTo(cx2, cy2, cx1, cy1, pathIn->pts[j0].x - wdy, pathIn->pts[j0].y + wdx); + } else { + // span angle is > 90 degrees -> split into two arcs + SplashCoord dJoin = splashDist(-wdy, wdx, -wdyNext, wdxNext); + if (dJoin > 0) { + SplashCoord dxJoin = (-wdyNext + wdy) / dJoin; + SplashCoord dyJoin = (wdxNext - wdx) / dJoin; + SplashCoord xc = pathIn->pts[j0].x + (SplashCoord)0.5 * w * cos((double)((SplashCoord)0.5 * (angle + angleNext))); + SplashCoord yc = pathIn->pts[j0].y + (SplashCoord)0.5 * w * sin((double)((SplashCoord)0.5 * (angle + angleNext))); + SplashCoord kappa = dAngle * bezierCircle2 * w; + SplashCoord cx1 = pathIn->pts[j0].x - wdy + kappa * dx; + SplashCoord cy1 = pathIn->pts[j0].y + wdx + kappa * dy; + SplashCoord cx2 = xc - kappa * dxJoin; + SplashCoord cy2 = yc - kappa * dyJoin; + SplashCoord cx3 = xc + kappa * dxJoin; + SplashCoord cy3 = yc + kappa * dyJoin; + SplashCoord cx4 = pathIn->pts[j0].x - wdyNext - kappa * dxNext; + SplashCoord cy4 = pathIn->pts[j0].y + wdxNext - kappa * dyNext; + pathOut->moveTo(pathIn->pts[j0].x, pathIn->pts[j0].y); + pathOut->lineTo(pathIn->pts[j0].x - wdyNext, pathIn->pts[j0].y + wdxNext); + pathOut->curveTo(cx4, cy4, cx3, cy3, xc, yc); + pathOut->curveTo(cx2, cy2, cx1, cy1, pathIn->pts[j0].x - wdy, pathIn->pts[j0].y + wdx); + } + } + + // join angle >= 180 + } else { + SplashCoord angle = atan2((double)-dx, (double)dy); + SplashCoord angleNext = atan2((double)-dxNext, (double)dyNext); + if (angleNext < angle) { + angleNext += 2 * M_PI; + } + SplashCoord dAngle = (angleNext - angle) / M_PI; + if (dAngle < 0.501) { + // span angle is <= 90 degrees -> draw a single arc + SplashCoord kappa = dAngle * bezierCircle * w; + SplashCoord cx1 = pathIn->pts[j0].x + wdy + kappa * dx; + SplashCoord cy1 = pathIn->pts[j0].y - wdx + kappa * dy; + SplashCoord cx2 = pathIn->pts[j0].x + wdyNext - kappa * dxNext; + SplashCoord cy2 = pathIn->pts[j0].y - wdxNext - kappa * dyNext; + pathOut->moveTo(pathIn->pts[j0].x, pathIn->pts[j0].y); + pathOut->lineTo(pathIn->pts[j0].x + wdy, pathIn->pts[j0].y - wdx); + pathOut->curveTo(cx1, cy1, cx2, cy2, pathIn->pts[j0].x + wdyNext, pathIn->pts[j0].y - wdxNext); + } else { + // span angle is > 90 degrees -> split into two arcs + SplashCoord dJoin = splashDist(wdy, -wdx, wdyNext, -wdxNext); + if (dJoin > 0) { + SplashCoord dxJoin = (wdyNext - wdy) / dJoin; + SplashCoord dyJoin = (-wdxNext + wdx) / dJoin; + SplashCoord xc = pathIn->pts[j0].x + (SplashCoord)0.5 * w * cos((double)((SplashCoord)0.5 * (angle + angleNext))); + SplashCoord yc = pathIn->pts[j0].y + (SplashCoord)0.5 * w * sin((double)((SplashCoord)0.5 * (angle + angleNext))); + SplashCoord kappa = dAngle * bezierCircle2 * w; + SplashCoord cx1 = pathIn->pts[j0].x + wdy + kappa * dx; + SplashCoord cy1 = pathIn->pts[j0].y - wdx + kappa * dy; + SplashCoord cx2 = xc - kappa * dxJoin; + SplashCoord cy2 = yc - kappa * dyJoin; + SplashCoord cx3 = xc + kappa * dxJoin; + SplashCoord cy3 = yc + kappa * dyJoin; + SplashCoord cx4 = pathIn->pts[j0].x + wdyNext - kappa * dxNext; + SplashCoord cy4 = pathIn->pts[j0].y - wdxNext - kappa * dyNext; + pathOut->moveTo(pathIn->pts[j0].x, pathIn->pts[j0].y); + pathOut->lineTo(pathIn->pts[j0].x + wdy, pathIn->pts[j0].y - wdx); + pathOut->curveTo(cx1, cy1, cx2, cy2, xc, yc); + pathOut->curveTo(cx3, cy3, cx4, cy4, pathIn->pts[j0].x + wdyNext, pathIn->pts[j0].y - wdxNext); + } + } + } + + } else if (hasangle) { + pathOut->moveTo(pathIn->pts[j0].x, pathIn->pts[j0].y); + + // angle < 180 + if (crossprod < 0) { + pathOut->lineTo(pathIn->pts[j0].x - wdyNext, pathIn->pts[j0].y + wdxNext); + // miter join inside limit + if (state->lineJoin == splashLineJoinMiter && splashSqrt(miter) <= state->miterLimit) { + pathOut->lineTo(pathIn->pts[j0].x - wdy + wdx * m, pathIn->pts[j0].y + wdx + wdy * m); + pathOut->lineTo(pathIn->pts[j0].x - wdy, pathIn->pts[j0].y + wdx); + // bevel join or miter join outside limit + } else { + pathOut->lineTo(pathIn->pts[j0].x - wdy, pathIn->pts[j0].y + wdx); + } + + // angle >= 180 + } else { + pathOut->lineTo(pathIn->pts[j0].x + wdy, pathIn->pts[j0].y - wdx); + // miter join inside limit + if (state->lineJoin == splashLineJoinMiter && splashSqrt(miter) <= state->miterLimit) { + pathOut->lineTo(pathIn->pts[j0].x + wdy + wdx * m, pathIn->pts[j0].y - wdx + wdy * m); + pathOut->lineTo(pathIn->pts[j0].x + wdyNext, pathIn->pts[j0].y - wdxNext); + // bevel join or miter join outside limit + } else { + pathOut->lineTo(pathIn->pts[j0].x + wdyNext, pathIn->pts[j0].y - wdxNext); + } + } + } + + pathOut->close(); + } + + // add stroke adjustment hints + if (state->strokeAdjust) { + if (seg == 0 && !closed) { + if (state->lineCap == splashLineCapButt) { + pathOut->addStrokeAdjustHint(firstPt, left2 + 1, firstPt, firstPt + 1); + if (last) { + pathOut->addStrokeAdjustHint(firstPt, left2 + 1, left2 + 1, left2 + 2); + } + } else if (state->lineCap == splashLineCapProjecting) { + if (last) { + pathOut->addStrokeAdjustHint(firstPt + 1, left2 + 2, firstPt + 1, firstPt + 2); + pathOut->addStrokeAdjustHint(firstPt + 1, left2 + 2, left2 + 2, left2 + 3); + } else { + pathOut->addStrokeAdjustHint(firstPt + 1, left2 + 1, firstPt + 1, firstPt + 2); + } + } + } + if (seg >= 1) { + if (seg >= 2) { + pathOut->addStrokeAdjustHint(left1, right1, left0 + 1, right0); + pathOut->addStrokeAdjustHint(left1, right1, join0, left2); + } else { + pathOut->addStrokeAdjustHint(left1, right1, firstPt, left2); + } + pathOut->addStrokeAdjustHint(left1, right1, right2 + 1, right2 + 1); + } + left0 = left1; + left1 = left2; + right0 = right1; + right1 = right2; + join0 = join1; + join1 = join2; + if (seg == 0) { + leftFirst = left2; + rightFirst = right2; + } + if (last) { + if (seg >= 2) { + pathOut->addStrokeAdjustHint(left1, right1, left0 + 1, right0); + pathOut->addStrokeAdjustHint(left1, right1, join0, pathOut->length - 1); + } else { + pathOut->addStrokeAdjustHint(left1, right1, firstPt, pathOut->length - 1); + } + if (closed) { + pathOut->addStrokeAdjustHint(left1, right1, firstPt, leftFirst); + pathOut->addStrokeAdjustHint(left1, right1, rightFirst + 1, rightFirst + 1); + pathOut->addStrokeAdjustHint(leftFirst, rightFirst, left1 + 1, right1); + pathOut->addStrokeAdjustHint(leftFirst, rightFirst, join1, pathOut->length - 1); + } + if (!closed && seg > 0) { + if (state->lineCap == splashLineCapButt) { + pathOut->addStrokeAdjustHint(left1 - 1, left1 + 1, left1 + 1, left1 + 2); + } else if (state->lineCap == splashLineCapProjecting) { + pathOut->addStrokeAdjustHint(left1 - 1, left1 + 2, left1 + 2, left1 + 3); + } + } + } + } + + i0 = j0; + i1 = j1; + ++seg; + } + + if (pathIn != path) { + delete pathIn; + } + + return pathOut; +} + +void Splash::dumpPath(SplashPath *path) +{ + int i; + + for (i = 0; i < path->length; ++i) { + printf(" %3d: x=%8.2f y=%8.2f%s%s%s%s\n", i, (double)path->pts[i].x, (double)path->pts[i].y, (path->flags[i] & splashPathFirst) ? " first" : "", (path->flags[i] & splashPathLast) ? " last" : "", + (path->flags[i] & splashPathClosed) ? " closed" : "", (path->flags[i] & splashPathCurve) ? " curve" : ""); + } +} + +void Splash::dumpXPath(SplashXPath *path) +{ + int i; + + for (i = 0; i < path->length; ++i) { + printf(" %4d: x0=%8.2f y0=%8.2f x1=%8.2f y1=%8.2f %s%s%s\n", i, (double)path->segs[i].x0, (double)path->segs[i].y0, (double)path->segs[i].x1, (double)path->segs[i].y1, (path->segs[i].flags & splashXPathHoriz) ? "H" : " ", + (path->segs[i].flags & splashXPathVert) ? "V" : " ", (path->segs[i].flags & splashXPathFlip) ? "P" : " "); + } +} + +SplashError Splash::shadedFill(SplashPath *path, bool hasBBox, SplashPattern *pattern, bool clipToStrokePath) +{ + SplashPipe pipe; + int xMinI, yMinI, xMaxI, yMaxI, x0, x1, y; + SplashClipResult clipRes; + + if (vectorAntialias && aaBuf == nullptr) { // should not happen, but to be secure + return splashErrGeneric; + } + if (path->length == 0) { + return splashErrEmptyPath; + } + SplashXPath xPath(path, state->matrix, state->flatness, true); + if (vectorAntialias) { + xPath.aaScale(); + } + xPath.sort(); + yMinI = state->clip->getYMinI(); + yMaxI = state->clip->getYMaxI(); + if (vectorAntialias && !inShading) { + yMinI = yMinI * splashAASize; + yMaxI = (yMaxI + 1) * splashAASize - 1; + } + SplashXPathScanner scanner(xPath, false, yMinI, yMaxI); + + // get the min and max x and y values + if (vectorAntialias) { + scanner.getBBoxAA(&xMinI, &yMinI, &xMaxI, &yMaxI); + } else { + scanner.getBBox(&xMinI, &yMinI, &xMaxI, &yMaxI); + } + + // check clipping + if ((clipRes = state->clip->testRect(xMinI, yMinI, xMaxI, yMaxI)) != splashClipAllOutside) { + // limit the y range + if (yMinI < state->clip->getYMinI()) { + yMinI = state->clip->getYMinI(); + } + if (yMaxI > state->clip->getYMaxI()) { + yMaxI = state->clip->getYMaxI(); + } + + unsigned char alpha = splashRound((clipToStrokePath) ? state->strokeAlpha * 255 : state->fillAlpha * 255); + pipeInit(&pipe, 0, yMinI, pattern, nullptr, alpha, vectorAntialias && !hasBBox, false); + + // draw the spans + if (vectorAntialias) { + for (y = yMinI; y <= yMaxI; ++y) { + scanner.renderAALine(aaBuf, &x0, &x1, y); + if (clipRes != splashClipAllInside) { + state->clip->clipAALine(aaBuf, &x0, &x1, y); + } +#if splashAASize == 4 + if (!hasBBox && y > yMinI && y < yMaxI) { + // correct shape on left side if clip is + // vertical through the middle of shading: + unsigned char *p0, *p1, *p2, *p3; + unsigned char c1, c2, c3, c4; + p0 = aaBuf->getDataPtr() + (x0 >> 1); + p1 = p0 + aaBuf->getRowSize(); + p2 = p1 + aaBuf->getRowSize(); + p3 = p2 + aaBuf->getRowSize(); + if (x0 & 1) { + c1 = (*p0 & 0x0f); + c2 = (*p1 & 0x0f); + c3 = (*p2 & 0x0f); + c4 = (*p3 & 0x0f); + } else { + c1 = (*p0 >> 4); + c2 = (*p1 >> 4); + c3 = (*p2 >> 4); + c4 = (*p3 >> 4); + } + if ((c1 & 0x03) == 0x03 && (c2 & 0x03) == 0x03 && (c3 & 0x03) == 0x03 && (c4 & 0x03) == 0x03 && c1 == c2 && c2 == c3 && c3 == c4 && pattern->testPosition(x0 - 1, y)) { + unsigned char shapeCorrection = (x0 & 1) ? 0x0f : 0xf0; + *p0 |= shapeCorrection; + *p1 |= shapeCorrection; + *p2 |= shapeCorrection; + *p3 |= shapeCorrection; + } + // correct shape on right side if clip is + // through the middle of shading: + p0 = aaBuf->getDataPtr() + (x1 >> 1); + p1 = p0 + aaBuf->getRowSize(); + p2 = p1 + aaBuf->getRowSize(); + p3 = p2 + aaBuf->getRowSize(); + if (x1 & 1) { + c1 = (*p0 & 0x0f); + c2 = (*p1 & 0x0f); + c3 = (*p2 & 0x0f); + c4 = (*p3 & 0x0f); + } else { + c1 = (*p0 >> 4); + c2 = (*p1 >> 4); + c3 = (*p2 >> 4); + c4 = (*p3 >> 4); + } + + if ((c1 & 0xc) == 0x0c && (c2 & 0x0c) == 0x0c && (c3 & 0x0c) == 0x0c && (c4 & 0x0c) == 0x0c && c1 == c2 && c2 == c3 && c3 == c4 && pattern->testPosition(x1 + 1, y)) { + unsigned char shapeCorrection = (x1 & 1) ? 0x0f : 0xf0; + *p0 |= shapeCorrection; + *p1 |= shapeCorrection; + *p2 |= shapeCorrection; + *p3 |= shapeCorrection; + } + } +#endif + drawAALine(&pipe, x0, x1, y); + } + } else { + SplashClipResult clipRes2; + for (y = yMinI; y <= yMaxI; ++y) { + SplashXPathScanIterator iterator(scanner, y); + while (iterator.getNextSpan(&x0, &x1)) { + if (clipRes == splashClipAllInside) { + drawSpan(&pipe, x0, x1, y, true); + } else { + // limit the x range + if (x0 < state->clip->getXMinI()) { + x0 = state->clip->getXMinI(); + } + if (x1 > state->clip->getXMaxI()) { + x1 = state->clip->getXMaxI(); + } + clipRes2 = state->clip->testSpan(x0, x1, y); + drawSpan(&pipe, x0, x1, y, clipRes2 == splashClipAllInside); + } + } + } + } + } + opClipRes = clipRes; + + return splashOk; +} diff --git a/poppler-24.05.0/splash/Splash.h b/poppler-24.05.0/splash/Splash.h new file mode 100644 index 0000000000000000000000000000000000000000..e13be54c625f1e624a2c62fb33af6b3b0cd5935e --- /dev/null +++ b/poppler-24.05.0/splash/Splash.h @@ -0,0 +1,334 @@ +//======================================================================== +// +// Splash.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2005 Marco Pesenti Gritti +// Copyright (C) 2007, 2011, 2018, 2019, 2021, 2022 Albert Astals Cid +// Copyright (C) 2010-2013, 2015 Thomas Freitag +// Copyright (C) 2010 Christian Feuersänger +// Copyright (C) 2012, 2017 Adrian Johnson +// Copyright (C) 2020 Oliver Sander +// Copyright (C) 2020 Tobias Deiminger +// +// 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 +// +//======================================================================== + +#ifndef SPLASH_H +#define SPLASH_H + +#include +#include "SplashTypes.h" +#include "SplashClip.h" +#include "SplashPattern.h" +#include "poppler_private_export.h" + +class SplashBitmap; +struct SplashGlyphBitmap; +class SplashState; +class SplashScreen; +class SplashPath; +class SplashXPath; +class SplashFont; +struct SplashPipe; + +//------------------------------------------------------------------------ + +// Retrieves the next line of pixels in an image mask. Normally, +// fills in * and returns true. If the image stream is +// exhausted, returns false. +typedef bool (*SplashImageMaskSource)(void *data, SplashColorPtr pixel); + +// Retrieves the next line of pixels in an image. Normally, fills in +// * and returns true. If the image stream is exhausted, +// returns false. +typedef bool (*SplashImageSource)(void *data, SplashColorPtr colorLine, unsigned char *alphaLine); + +// Use ICCColorSpace to transform a bitmap +typedef void (*SplashICCTransform)(void *data, SplashBitmap *bitmap); + +//------------------------------------------------------------------------ + +enum SplashPipeResultColorCtrl +{ + splashPipeResultColorNoAlphaBlendCMYK, + splashPipeResultColorNoAlphaBlendDeviceN, + splashPipeResultColorNoAlphaBlendRGB, + splashPipeResultColorNoAlphaBlendMono, + splashPipeResultColorAlphaNoBlendMono, + splashPipeResultColorAlphaNoBlendRGB, + splashPipeResultColorAlphaNoBlendCMYK, + splashPipeResultColorAlphaNoBlendDeviceN, + splashPipeResultColorAlphaBlendMono, + splashPipeResultColorAlphaBlendRGB, + splashPipeResultColorAlphaBlendCMYK, + splashPipeResultColorAlphaBlendDeviceN +}; + +//------------------------------------------------------------------------ +// Splash +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT Splash +{ +public: + // Create a new rasterizer object. + Splash(SplashBitmap *bitmapA, bool vectorAntialiasA, SplashScreenParams *screenParams = nullptr); + Splash(SplashBitmap *bitmapA, bool vectorAntialiasA, SplashScreen *screenA); + + ~Splash(); + + Splash(const Splash &) = delete; + Splash &operator=(const Splash &) = delete; + + //----- state read + + SplashCoord *getMatrix(); + SplashPattern *getStrokePattern(); + SplashPattern *getFillPattern(); + SplashScreen *getScreen(); + SplashBlendFunc getBlendFunc(); + SplashCoord getStrokeAlpha(); + SplashCoord getFillAlpha(); + SplashCoord getLineWidth(); + int getLineCap(); + int getLineJoin(); + SplashCoord getMiterLimit(); + SplashCoord getFlatness(); + SplashCoord getLineDashPhase(); + bool getStrokeAdjust(); + SplashClip *getClip(); + SplashBitmap *getSoftMask(); + bool getInNonIsolatedGroup(); + + //----- state write + + void setMatrix(SplashCoord *matrix); + void setStrokePattern(SplashPattern *strokePattern); + void setFillPattern(SplashPattern *fillPattern); + void setScreen(SplashScreen *screen); + void setBlendFunc(SplashBlendFunc func); + void setStrokeAlpha(SplashCoord alpha); + void setFillAlpha(SplashCoord alpha); + void setPatternAlpha(SplashCoord strokeAlpha, SplashCoord fillAlpha); + void clearPatternAlpha(); + void setFillOverprint(bool fop); + void setStrokeOverprint(bool sop); + void setOverprintMode(int opm); + void setLineWidth(SplashCoord lineWidth); + void setLineCap(int lineCap); + void setLineJoin(int lineJoin); + void setMiterLimit(SplashCoord miterLimit); + void setFlatness(SplashCoord flatness); + // the array will be copied + void setLineDash(std::vector &&lineDash, SplashCoord lineDashPhase); + void setStrokeAdjust(bool strokeAdjust); + // NB: uses transformed coordinates. + void clipResetToRect(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1); + // NB: uses transformed coordinates. + SplashError clipToRect(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1); + // NB: uses untransformed coordinates. + SplashError clipToPath(SplashPath *path, bool eo); + void setSoftMask(SplashBitmap *softMask); + void setInNonIsolatedGroup(SplashBitmap *alpha0BitmapA, int alpha0XA, int alpha0YA); + void setTransfer(unsigned char *red, unsigned char *green, unsigned char *blue, unsigned char *gray); + void setOverprintMask(unsigned int overprintMask, bool additive); + + //----- state save/restore + + void saveState(); + SplashError restoreState(); + + //----- drawing operations + + // Fill the bitmap with . This is not subject to clipping. + void clear(SplashColorPtr color, unsigned char alpha = 0x00); + + // Stroke a path using the current stroke pattern. + SplashError stroke(SplashPath *path); + + // Fill a path using the current fill pattern. + SplashError fill(SplashPath *path, bool eo); + + // Fill a path, XORing with the current fill pattern. + SplashError xorFill(SplashPath *path, bool eo); + + // Draw a character, using the current fill pattern. + SplashError fillChar(SplashCoord x, SplashCoord y, int c, SplashFont *font); + + // Draw a glyph, using the current fill pattern. This function does + // not free any data, i.e., it ignores glyph->freeData. + void fillGlyph(SplashCoord x, SplashCoord y, SplashGlyphBitmap *glyph); + + // Draws an image mask using the fill color. This will read + // lines of pixels from , starting with the top line. "1" + // pixels will be drawn with the current fill color; "0" pixels are + // transparent. The matrix: + // [ mat[0] mat[1] 0 ] + // [ mat[2] mat[3] 0 ] + // [ mat[4] mat[5] 1 ] + // maps a unit square to the desired destination for the image, in + // PostScript style: + // [x' y' 1] = [x y 1] * mat + // Note that the Splash y axis points downward, and the image source + // is assumed to produce pixels in raster order, starting from the + // top line. + SplashError fillImageMask(SplashImageMaskSource src, void *srcData, int w, int h, SplashCoord *mat, bool glyphMode); + + // Draw an image. This will read lines of pixels from + // , starting with the top line. These pixels are assumed to + // be in the source mode, . If is true, the + // alpha values returned by are used; otherwise they are + // ignored. The following combinations of source and target modes + // are supported: + // source target + // ------ ------ + // Mono1 Mono1 + // Mono8 Mono1 -- with dithering + // Mono8 Mono8 + // RGB8 RGB8 + // BGR8 BGR8 + // CMYK8 CMYK8 + // The matrix behaves as for fillImageMask. + SplashError drawImage(SplashImageSource src, SplashICCTransform tf, void *srcData, SplashColorMode srcMode, bool srcAlpha, int w, int h, SplashCoord *mat, bool interpolate, bool tilingPattern = false); + + // Composite a rectangular region from onto this Splash + // object. + SplashError composite(SplashBitmap *src, int xSrc, int ySrc, int xDest, int yDest, int w, int h, bool noClip, bool nonIsolated, bool knockout = false, SplashCoord knockoutOpacity = 1.0); + + // Composite this Splash object onto a background color. The + // background alpha is assumed to be 1. + void compositeBackground(SplashColorConstPtr color); + + // Copy a rectangular region from onto the bitmap belonging to + // this Splash object. The destination alpha values are all set to + // zero. + SplashError blitTransparent(SplashBitmap *src, int xSrc, int ySrc, int xDest, int yDest, int w, int h); + void blitImage(SplashBitmap *src, bool srcAlpha, int xDest, int yDest); + + //----- misc + + // Construct a path for a stroke, given the path to be stroked and + // the line width . All other stroke parameters are taken from + // the current state. If is true, this function will + // first flatten the path and handle the linedash. + SplashPath *makeStrokePath(SplashPath *path, SplashCoord w, bool flatten = true); + + // Return the associated bitmap. + SplashBitmap *getBitmap() { return bitmap; } + + // Set the minimum line width. + void setMinLineWidth(SplashCoord w) { minLineWidth = w; } + + // Setter/Getter for thin line mode + void setThinLineMode(SplashThinLineMode thinLineModeA) { thinLineMode = thinLineModeA; } + SplashThinLineMode getThinLineMode() { return thinLineMode; } + + // Get clipping status for the last drawing operation subject to + // clipping. + SplashClipResult getClipRes() { return opClipRes; } + + // Toggle debug mode on or off. + void setDebugMode(bool debugModeA) { debugMode = debugModeA; } + +#if 1 //~tmp: turn off anti-aliasing temporarily + void setInShading(bool sh) { inShading = sh; } + bool getVectorAntialias() { return vectorAntialias; } + void setVectorAntialias(bool vaa) { vectorAntialias = vaa; } +#endif + + // Do shaded fills with dynamic patterns + // + // clipToStrokePath: Whether the current clip region is a stroke path. + // In that case, strokeAlpha is used rather than fillAlpha. + SplashError shadedFill(SplashPath *path, bool hasBBox, SplashPattern *pattern, bool clipToStrokePath); + // Draw a gouraud triangle shading. + bool gouraudTriangleShadedFill(SplashGouraudColor *shading); + +private: + void pipeInit(SplashPipe *pipe, int x, int y, SplashPattern *pattern, SplashColorPtr cSrc, unsigned char aInput, bool usesShape, bool nonIsolatedGroup, bool knockout = false, unsigned char knockoutOpacity = 255); + void pipeRun(SplashPipe *pipe); + void pipeRunSimpleMono1(SplashPipe *pipe); + void pipeRunSimpleMono8(SplashPipe *pipe); + void pipeRunSimpleRGB8(SplashPipe *pipe); + void pipeRunSimpleXBGR8(SplashPipe *pipe); + void pipeRunSimpleBGR8(SplashPipe *pipe); + void pipeRunSimpleCMYK8(SplashPipe *pipe); + void pipeRunSimpleDeviceN8(SplashPipe *pipe); + void pipeRunAAMono1(SplashPipe *pipe); + void pipeRunAAMono8(SplashPipe *pipe); + void pipeRunAARGB8(SplashPipe *pipe); + void pipeRunAAXBGR8(SplashPipe *pipe); + void pipeRunAABGR8(SplashPipe *pipe); + void pipeRunAACMYK8(SplashPipe *pipe); + void pipeRunAADeviceN8(SplashPipe *pipe); + void pipeSetXY(SplashPipe *pipe, int x, int y); + void pipeIncX(SplashPipe *pipe); + void drawPixel(SplashPipe *pipe, int x, int y, bool noClip); + void drawAAPixelInit(); + void drawAAPixel(SplashPipe *pipe, int x, int y); + void drawSpan(SplashPipe *pipe, int x0, int x1, int y, bool noClip); + void drawAALine(SplashPipe *pipe, int x0, int x1, int y, bool adjustLine = false, unsigned char lineOpacity = 0); + void transform(const SplashCoord *matrix, SplashCoord xi, SplashCoord yi, SplashCoord *xo, SplashCoord *yo); + void strokeNarrow(SplashPath *path); + void strokeWide(SplashPath *path, SplashCoord w); + SplashPath *flattenPath(SplashPath *path, SplashCoord *matrix, SplashCoord flatness); + void flattenCurve(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1, SplashCoord x2, SplashCoord y2, SplashCoord x3, SplashCoord y3, SplashCoord *matrix, SplashCoord flatness2, SplashPath *fPath); + SplashPath *makeDashedPath(SplashPath *xPath); + void getBBoxFP(SplashPath *path, SplashCoord *xMinA, SplashCoord *yMinA, SplashCoord *xMaxA, SplashCoord *yMaxA); + SplashError fillWithPattern(SplashPath *path, bool eo, SplashPattern *pattern, SplashCoord alpha); + bool pathAllOutside(SplashPath *path); + void fillGlyph2(int x0, int y0, SplashGlyphBitmap *glyph, bool noclip); + void arbitraryTransformMask(SplashImageMaskSource src, void *srcData, int srcWidth, int srcHeight, SplashCoord *mat, bool glyphMode); + SplashBitmap *scaleMask(SplashImageMaskSource src, void *srcData, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight); + void scaleMaskYdownXdown(SplashImageMaskSource src, void *srcData, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest); + void scaleMaskYdownXup(SplashImageMaskSource src, void *srcData, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest); + void scaleMaskYupXdown(SplashImageMaskSource src, void *srcData, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest); + void scaleMaskYupXup(SplashImageMaskSource src, void *srcData, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest); + void blitMask(SplashBitmap *src, int xDest, int yDest, SplashClipResult clipRes); + SplashError arbitraryTransformImage(SplashImageSource src, SplashICCTransform tf, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, SplashCoord *mat, bool interpolate, + bool tilingPattern = false); + SplashBitmap *scaleImage(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, bool interpolate, bool tilingPattern = false); + bool scaleImageYdownXdown(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest); + bool scaleImageYdownXup(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest); + bool scaleImageYupXdown(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest); + bool scaleImageYupXup(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest); + bool scaleImageYupXupBilinear(SplashImageSource src, void *srcData, SplashColorMode srcMode, int nComps, bool srcAlpha, int srcWidth, int srcHeight, int scaledWidth, int scaledHeight, SplashBitmap *dest); + void vertFlipImage(SplashBitmap *img, int width, int height, int nComps); + void blitImage(SplashBitmap *src, bool srcAlpha, int xDest, int yDest, SplashClipResult clipRes); + void blitImageClipped(SplashBitmap *src, bool srcAlpha, int xSrc, int ySrc, int xDest, int yDest, int w, int h); + void dumpPath(SplashPath *path); + void dumpXPath(SplashXPath *path); + + static SplashPipeResultColorCtrl pipeResultColorNoAlphaBlend[]; + static SplashPipeResultColorCtrl pipeResultColorAlphaNoBlend[]; + static SplashPipeResultColorCtrl pipeResultColorAlphaBlend[]; + static int pipeNonIsoGroupCorrection[]; + + SplashBitmap *bitmap; + SplashState *state; + SplashBitmap *aaBuf; + int aaBufY; + SplashBitmap *alpha0Bitmap; // for non-isolated groups, this is the + // bitmap containing the alpha0 values + int alpha0X, alpha0Y; // offset within alpha0Bitmap + SplashCoord aaGamma[splashAASize * splashAASize + 1]; + SplashCoord minLineWidth; + SplashThinLineMode thinLineMode; + SplashClipResult opClipRes; + bool vectorAntialias; + bool inShading; + bool debugMode; +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashBitmap.cc b/poppler-24.05.0/splash/SplashBitmap.cc new file mode 100644 index 0000000000000000000000000000000000000000..af4a6223c5de2d4eaff5b60fe610b6ad338e3441 --- /dev/null +++ b/poppler-24.05.0/splash/SplashBitmap.cc @@ -0,0 +1,854 @@ +//======================================================================== +// +// SplashBitmap.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2006, 2009, 2010, 2012, 2015, 2018, 2019, 2021, 2022 Albert Astals Cid +// Copyright (C) 2007 Ilmari Heikkinen +// Copyright (C) 2009 Shen Liang +// Copyright (C) 2009 Stefan Thomas +// Copyright (C) 2010, 2012, 2017 Adrian Johnson +// Copyright (C) 2010 Harry Roberts +// Copyright (C) 2010 Christian Feuersänger +// Copyright (C) 2010, 2015, 2019 William Bader +// Copyright (C) 2011-2013 Thomas Freitag +// Copyright (C) 2012 Anthony Wesley +// Copyright (C) 2015, 2018 Adam Reichold +// Copyright (C) 2016 Kenji Uno +// Copyright (C) 2018 Martin Packman +// Copyright (C) 2019 Christian Persch +// Copyright (C) 2019 Oliver Sander +// +// 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 + +#include +#include +#include +#include +#include "goo/gfile.h" +#include "goo/gmem.h" +#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" +#include "goo/ImgWriter.h" + +//------------------------------------------------------------------------ +// SplashBitmap +//------------------------------------------------------------------------ + +SplashBitmap::SplashBitmap(int widthA, int heightA, int rowPadA, SplashColorMode modeA, bool alphaA, bool topDown, const std::vector *separationListA) +{ + width = widthA; + height = heightA; + mode = modeA; + rowPad = rowPadA; + switch (mode) { + case splashModeMono1: + if (width > 0) { + rowSize = (width + 7) >> 3; + } else { + rowSize = -1; + } + break; + case splashModeMono8: + if (width > 0) { + rowSize = width; + } else { + rowSize = -1; + } + break; + case splashModeRGB8: + case splashModeBGR8: + if (width > 0 && width <= INT_MAX / 3) { + rowSize = width * 3; + } else { + rowSize = -1; + } + break; + case splashModeXBGR8: + if (width > 0 && width <= INT_MAX / 4) { + rowSize = width * 4; + } else { + rowSize = -1; + } + break; + case splashModeCMYK8: + if (width > 0 && width <= INT_MAX / 4) { + rowSize = width * 4; + } else { + rowSize = -1; + } + break; + case splashModeDeviceN8: + if (width > 0 && width <= static_cast(INT_MAX / splashMaxColorComps)) { + rowSize = width * splashMaxColorComps; + } else { + rowSize = -1; + } + break; + } + if (rowSize > 0) { + rowSize += rowPad - 1; + rowSize -= rowSize % rowPad; + } + data = (SplashColorPtr)gmallocn_checkoverflow(rowSize, height); + if (data != nullptr) { + if (!topDown) { + data += (height - 1) * rowSize; + rowSize = -rowSize; + } + if (alphaA) { + alpha = (unsigned char *)gmallocn_checkoverflow(width, height); + } else { + alpha = nullptr; + } + } else { + alpha = nullptr; + } + separationList = new std::vector(); + if (separationListA != nullptr) { + for (const GfxSeparationColorSpace *separation : *separationListA) { + separationList->push_back((GfxSeparationColorSpace *)separation->copy()); + } + } +} + +SplashBitmap *SplashBitmap::copy(const SplashBitmap *src) +{ + SplashBitmap *result = new SplashBitmap(src->getWidth(), src->getHeight(), src->getRowPad(), src->getMode(), src->getAlphaPtr() != nullptr, src->getRowSize() >= 0, src->getSeparationList()); + SplashColorConstPtr dataSource = src->getDataPtr(); + unsigned char *dataDest = result->getDataPtr(); + int amount = src->getRowSize(); + if (amount < 0) { + dataSource = dataSource + (src->getHeight() - 1) * amount; + dataDest = dataDest + (src->getHeight() - 1) * amount; + amount *= -src->getHeight(); + } else { + amount *= src->getHeight(); + } + memcpy(dataDest, dataSource, amount); + if (src->getAlphaPtr() != nullptr) { + memcpy(result->getAlphaPtr(), src->getAlphaPtr(), src->getWidth() * src->getHeight()); + } + return result; +} + +SplashBitmap::~SplashBitmap() +{ + if (data) { + if (rowSize < 0) { + gfree(data + (height - 1) * rowSize); + } else { + gfree(data); + } + } + gfree(alpha); + for (auto entry : *separationList) { + delete entry; + } + delete separationList; +} + +SplashError SplashBitmap::writePNMFile(char *fileName) +{ + FILE *f; + SplashError e; + + if (!(f = openFile(fileName, "wb"))) { + return splashErrOpenFile; + } + + e = this->writePNMFile(f); + + fclose(f); + return e; +} + +SplashError SplashBitmap::writePNMFile(FILE *f) +{ + SplashColorPtr row, p; + int x, y; + + switch (mode) { + + case splashModeMono1: + fprintf(f, "P4\n%d %d\n", width, height); + row = data; + for (y = 0; y < height; ++y) { + p = row; + for (x = 0; x < width; x += 8) { + fputc(*p ^ 0xff, f); + ++p; + } + row += rowSize; + } + break; + + case splashModeMono8: + fprintf(f, "P5\n%d %d\n255\n", width, height); + row = data; + for (y = 0; y < height; ++y) { + fwrite(row, 1, width, f); + row += rowSize; + } + break; + + case splashModeRGB8: + fprintf(f, "P6\n%d %d\n255\n", width, height); + row = data; + for (y = 0; y < height; ++y) { + fwrite(row, 1, 3 * width, f); + row += rowSize; + } + break; + + case splashModeXBGR8: + fprintf(f, "P6\n%d %d\n255\n", width, height); + row = data; + for (y = 0; y < height; ++y) { + p = row; + for (x = 0; x < width; ++x) { + fputc(splashBGR8R(p), f); + fputc(splashBGR8G(p), f); + fputc(splashBGR8B(p), f); + p += 4; + } + row += rowSize; + } + break; + + case splashModeBGR8: + fprintf(f, "P6\n%d %d\n255\n", width, height); + row = data; + for (y = 0; y < height; ++y) { + p = row; + for (x = 0; x < width; ++x) { + fputc(splashBGR8R(p), f); + fputc(splashBGR8G(p), f); + fputc(splashBGR8B(p), f); + p += 3; + } + row += rowSize; + } + break; + + case splashModeCMYK8: + case splashModeDeviceN8: + // PNM doesn't support CMYK + error(errInternal, -1, "unsupported SplashBitmap mode"); + return splashErrGeneric; + break; + } + return splashOk; +} + +SplashError SplashBitmap::writeAlphaPGMFile(char *fileName) +{ + FILE *f; + + if (!alpha) { + return splashErrModeMismatch; + } + if (!(f = openFile(fileName, "wb"))) { + return splashErrOpenFile; + } + fprintf(f, "P5\n%d %d\n255\n", width, height); + fwrite(alpha, 1, width * height, f); + fclose(f); + return splashOk; +} + +void SplashBitmap::getPixel(int x, int y, SplashColorPtr pixel) +{ + SplashColorPtr p; + + if (y < 0 || y >= height || x < 0 || x >= width || !data) { + return; + } + switch (mode) { + case splashModeMono1: + p = &data[y * rowSize + (x >> 3)]; + pixel[0] = (p[0] & (0x80 >> (x & 7))) ? 0xff : 0x00; + break; + case splashModeMono8: + p = &data[y * rowSize + x]; + pixel[0] = p[0]; + break; + case splashModeRGB8: + p = &data[y * rowSize + 3 * x]; + pixel[0] = p[0]; + pixel[1] = p[1]; + pixel[2] = p[2]; + break; + case splashModeXBGR8: + p = &data[y * rowSize + 4 * x]; + pixel[0] = p[2]; + pixel[1] = p[1]; + pixel[2] = p[0]; + pixel[3] = p[3]; + break; + case splashModeBGR8: + p = &data[y * rowSize + 3 * x]; + pixel[0] = p[2]; + pixel[1] = p[1]; + pixel[2] = p[0]; + break; + case splashModeCMYK8: + p = &data[y * rowSize + 4 * x]; + pixel[0] = p[0]; + pixel[1] = p[1]; + pixel[2] = p[2]; + pixel[3] = p[3]; + break; + case splashModeDeviceN8: + p = &data[y * rowSize + (SPOT_NCOMPS + 4) * x]; + for (int cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + pixel[cp] = p[cp]; + } + break; + } +} + +unsigned char SplashBitmap::getAlpha(int x, int y) +{ + return alpha[y * width + x]; +} + +SplashColorPtr SplashBitmap::takeData() +{ + SplashColorPtr data2; + + data2 = data; + data = nullptr; + return data2; +} + +SplashError SplashBitmap::writeImgFile(SplashImageFileFormat format, const char *fileName, double hDPI, double vDPI, WriteImgParams *params) +{ + FILE *f; + SplashError e; + + if (!(f = openFile(fileName, "wb"))) { + return splashErrOpenFile; + } + + e = writeImgFile(format, f, hDPI, vDPI, params); + + fclose(f); + return e; +} + +void SplashBitmap::setJpegParams(ImgWriter *writer, WriteImgParams *params) +{ +#ifdef ENABLE_LIBJPEG + if (params) { + static_cast(writer)->setProgressive(params->jpegProgressive); + static_cast(writer)->setOptimize(params->jpegOptimize); + if (params->jpegQuality >= 0) { + static_cast(writer)->setQuality(params->jpegQuality); + } + } +#endif +} + +SplashError SplashBitmap::writeImgFile(SplashImageFileFormat format, FILE *f, double hDPI, double vDPI, WriteImgParams *params) +{ + ImgWriter *writer; + SplashError e; + + SplashColorMode imageWriterFormat = splashModeRGB8; + + switch (format) { +#ifdef ENABLE_LIBPNG + case splashFormatPng: + writer = new PNGWriter(); + break; +#endif + +#ifdef ENABLE_LIBJPEG + case splashFormatJpegCMYK: + writer = new JpegWriter(JpegWriter::CMYK); + setJpegParams(writer, params); + break; + case splashFormatJpeg: + writer = new JpegWriter(); + setJpegParams(writer, params); + break; +#endif + +#ifdef ENABLE_LIBTIFF + case splashFormatTiff: + switch (mode) { + case splashModeMono1: + writer = new TiffWriter(TiffWriter::MONOCHROME); + imageWriterFormat = splashModeMono1; + break; + case splashModeMono8: + writer = new TiffWriter(TiffWriter::GRAY); + imageWriterFormat = splashModeMono8; + break; + case splashModeRGB8: + case splashModeBGR8: + writer = new TiffWriter(TiffWriter::RGB); + break; + case splashModeCMYK8: + case splashModeDeviceN8: + writer = new TiffWriter(TiffWriter::CMYK); + break; + default: + fprintf(stderr, "TiffWriter: Mode %d not supported\n", mode); + writer = new TiffWriter(); + } + if (writer && params) { + ((TiffWriter *)writer)->setCompressionString(params->tiffCompression.c_str()); + } + break; +#endif + + default: + // Not the greatest error message, but users of this function should + // have already checked whether their desired format is compiled in. + error(errInternal, -1, "Support for this image type not compiled in"); + return splashErrGeneric; + } + + e = writeImgFile(writer, f, hDPI, vDPI, imageWriterFormat); + delete writer; + return e; +} + +#include "poppler/GfxState_helpers.h" + +void SplashBitmap::getRGBLine(int yl, SplashColorPtr line) +{ + SplashColor col; + double c, m, y, k, c1, m1, y1, k1, r, g, b; + + for (int x = 0; x < width; x++) { + getPixel(x, yl, col); + c = byteToDbl(col[0]); + m = byteToDbl(col[1]); + y = byteToDbl(col[2]); + k = byteToDbl(col[3]); + if (separationList->size() > 0) { + for (std::size_t i = 0; i < separationList->size(); i++) { + if (col[i + 4] > 0) { + GfxCMYK cmyk; + GfxColor input; + input.c[0] = byteToCol(col[i + 4]); + GfxSeparationColorSpace *sepCS = (GfxSeparationColorSpace *)((*separationList)[i]); + sepCS->getCMYK(&input, &cmyk); + col[0] = colToByte(cmyk.c); + col[1] = colToByte(cmyk.m); + col[2] = colToByte(cmyk.y); + col[3] = colToByte(cmyk.k); + c += byteToDbl(col[0]); + m += byteToDbl(col[1]); + y += byteToDbl(col[2]); + k += byteToDbl(col[3]); + } + } + if (c > 1) { + c = 1; + } + if (m > 1) { + m = 1; + } + if (y > 1) { + y = 1; + } + if (k > 1) { + k = 1; + } + } + c1 = 1 - c; + m1 = 1 - m; + y1 = 1 - y; + k1 = 1 - k; + cmykToRGBMatrixMultiplication(c, m, y, k, c1, m1, y1, k1, r, g, b); + *line++ = dblToByte(clip01(r)); + *line++ = dblToByte(clip01(g)); + *line++ = dblToByte(clip01(b)); + } +} + +void SplashBitmap::getXBGRLine(int yl, SplashColorPtr line, ConversionMode conversionMode) +{ + SplashColor col; + double c, m, y, k, c1, m1, y1, k1, r, g, b; + + for (int x = 0; x < width; x++) { + getPixel(x, yl, col); + c = byteToDbl(col[0]); + m = byteToDbl(col[1]); + y = byteToDbl(col[2]); + k = byteToDbl(col[3]); + if (separationList->size() > 0) { + for (std::size_t i = 0; i < separationList->size(); i++) { + if (col[i + 4] > 0) { + GfxCMYK cmyk; + GfxColor input; + input.c[0] = byteToCol(col[i + 4]); + GfxSeparationColorSpace *sepCS = (GfxSeparationColorSpace *)((*separationList)[i]); + sepCS->getCMYK(&input, &cmyk); + col[0] = colToByte(cmyk.c); + col[1] = colToByte(cmyk.m); + col[2] = colToByte(cmyk.y); + col[3] = colToByte(cmyk.k); + c += byteToDbl(col[0]); + m += byteToDbl(col[1]); + y += byteToDbl(col[2]); + k += byteToDbl(col[3]); + } + } + if (c > 1) { + c = 1; + } + if (m > 1) { + m = 1; + } + if (y > 1) { + y = 1; + } + if (k > 1) { + k = 1; + } + } + c1 = 1 - c; + m1 = 1 - m; + y1 = 1 - y; + k1 = 1 - k; + cmykToRGBMatrixMultiplication(c, m, y, k, c1, m1, y1, k1, r, g, b); + + if (conversionMode == conversionAlphaPremultiplied) { + const double a = getAlpha(x, yl) / 255.0; + + *line++ = dblToByte(clip01(b * a)); + *line++ = dblToByte(clip01(g * a)); + *line++ = dblToByte(clip01(r * a)); + } else { + *line++ = dblToByte(clip01(b)); + *line++ = dblToByte(clip01(g)); + *line++ = dblToByte(clip01(r)); + } + + if (conversionMode != conversionOpaque) { + *line++ = getAlpha(x, yl); + } else { + *line++ = 255; + } + } +} + +static inline unsigned char div255(int x) +{ + return (unsigned char)((x + (x >> 8) + 0x80) >> 8); +} + +bool SplashBitmap::convertToXBGR(ConversionMode conversionMode) +{ + if (mode == splashModeXBGR8) { + if (conversionMode != conversionOpaque) { + // Copy the alpha channel into the fourth component so that XBGR becomes ABGR. + const SplashColorPtr dbegin = data; + const SplashColorPtr dend = data + rowSize * height; + + unsigned char *const abegin = alpha; + unsigned char *const aend = alpha + width * height; + + SplashColorPtr d = dbegin; + unsigned char *a = abegin; + + if (conversionMode == conversionAlphaPremultiplied) { + for (; d < dend && a < aend; d += 4, a += 1) { + d[0] = div255(d[0] * *a); + d[1] = div255(d[1] * *a); + d[2] = div255(d[2] * *a); + d[3] = *a; + } + } else { + for (d += 3; d < dend && a < aend; d += 4, a += 1) { + *d = *a; + } + } + } + + return true; + } + + int newrowSize = width * 4; + SplashColorPtr newdata = (SplashColorPtr)gmallocn_checkoverflow(newrowSize, height); + if (newdata != nullptr) { + for (int y = 0; y < height; y++) { + unsigned char *row = newdata + y * newrowSize; + getXBGRLine(y, row, conversionMode); + } + if (rowSize < 0) { + gfree(data + (height - 1) * rowSize); + } else { + gfree(data); + } + data = newdata; + rowSize = newrowSize; + mode = splashModeXBGR8; + } + return newdata != nullptr; +} + +void SplashBitmap::getCMYKLine(int yl, SplashColorPtr line) +{ + SplashColor col; + + for (int x = 0; x < width; x++) { + getPixel(x, yl, col); + if (separationList->size() > 0) { + double c, m, y, k; + c = byteToDbl(col[0]); + m = byteToDbl(col[1]); + y = byteToDbl(col[2]); + k = byteToDbl(col[3]); + for (std::size_t i = 0; i < separationList->size(); i++) { + if (col[i + 4] > 0) { + GfxCMYK cmyk; + GfxColor input; + input.c[0] = byteToCol(col[i + 4]); + GfxSeparationColorSpace *sepCS = (GfxSeparationColorSpace *)((*separationList)[i]); + sepCS->getCMYK(&input, &cmyk); + col[0] = colToByte(cmyk.c); + col[1] = colToByte(cmyk.m); + col[2] = colToByte(cmyk.y); + col[3] = colToByte(cmyk.k); + c += byteToDbl(col[0]); + m += byteToDbl(col[1]); + y += byteToDbl(col[2]); + k += byteToDbl(col[3]); + } + } + col[0] = dblToByte(clip01(c)); + col[1] = dblToByte(clip01(m)); + col[2] = dblToByte(clip01(y)); + col[3] = dblToByte(clip01(k)); + } + *line++ = col[0]; + *line++ = col[1]; + *line++ = col[2]; + *line++ = col[3]; + } +} + +SplashError SplashBitmap::writeImgFile(ImgWriter *writer, FILE *f, double hDPI, double vDPI, SplashColorMode imageWriterFormat) +{ + if (mode != splashModeRGB8 && mode != splashModeMono8 && mode != splashModeMono1 && mode != splashModeXBGR8 && mode != splashModeBGR8 && mode != splashModeCMYK8 && mode != splashModeDeviceN8) { + error(errInternal, -1, "unsupported SplashBitmap mode"); + return splashErrGeneric; + } + + if (!writer->init(f, width, height, hDPI, vDPI)) { + return splashErrGeneric; + } + + switch (mode) { + case splashModeCMYK8: + if (writer->supportCMYK()) { + SplashColorPtr row; + unsigned char **row_pointers = new unsigned char *[height]; + row = data; + + for (int y = 0; y < height; ++y) { + row_pointers[y] = row; + row += rowSize; + } + if (!writer->writePointers(row_pointers, height)) { + delete[] row_pointers; + return splashErrGeneric; + } + delete[] row_pointers; + } else { + unsigned char *row = new unsigned char[3 * width]; + for (int y = 0; y < height; y++) { + getRGBLine(y, row); + if (!writer->writeRow(&row)) { + delete[] row; + return splashErrGeneric; + } + } + delete[] row; + } + break; + case splashModeDeviceN8: + if (writer->supportCMYK()) { + unsigned char *row = new unsigned char[4 * width]; + for (int y = 0; y < height; y++) { + getCMYKLine(y, row); + if (!writer->writeRow(&row)) { + delete[] row; + return splashErrGeneric; + } + } + delete[] row; + } else { + unsigned char *row = new unsigned char[3 * width]; + for (int y = 0; y < height; y++) { + getRGBLine(y, row); + if (!writer->writeRow(&row)) { + delete[] row; + return splashErrGeneric; + } + } + delete[] row; + } + break; + case splashModeRGB8: { + SplashColorPtr row; + unsigned char **row_pointers = new unsigned char *[height]; + row = data; + + for (int y = 0; y < height; ++y) { + row_pointers[y] = row; + row += rowSize; + } + if (!writer->writePointers(row_pointers, height)) { + delete[] row_pointers; + return splashErrGeneric; + } + delete[] row_pointers; + } break; + + case splashModeBGR8: { + unsigned char *row = new unsigned char[3 * width]; + for (int y = 0; y < height; y++) { + // Convert into a PNG row + for (int x = 0; x < width; x++) { + row[3 * x] = data[y * rowSize + x * 3 + 2]; + row[3 * x + 1] = data[y * rowSize + x * 3 + 1]; + row[3 * x + 2] = data[y * rowSize + x * 3]; + } + + if (!writer->writeRow(&row)) { + delete[] row; + return splashErrGeneric; + } + } + delete[] row; + } break; + + case splashModeXBGR8: { + unsigned char *row = new unsigned char[3 * width]; + for (int y = 0; y < height; y++) { + // Convert into a PNG row + for (int x = 0; x < width; x++) { + row[3 * x] = data[y * rowSize + x * 4 + 2]; + row[3 * x + 1] = data[y * rowSize + x * 4 + 1]; + row[3 * x + 2] = data[y * rowSize + x * 4]; + } + + if (!writer->writeRow(&row)) { + delete[] row; + return splashErrGeneric; + } + } + delete[] row; + } break; + + case splashModeMono8: { + if (imageWriterFormat == splashModeMono8) { + SplashColorPtr row; + unsigned char **row_pointers = new unsigned char *[height]; + row = data; + + for (int y = 0; y < height; ++y) { + row_pointers[y] = row; + row += rowSize; + } + if (!writer->writePointers(row_pointers, height)) { + delete[] row_pointers; + return splashErrGeneric; + } + delete[] row_pointers; + } else if (imageWriterFormat == splashModeRGB8) { + unsigned char *row = new unsigned char[3 * width]; + for (int y = 0; y < height; y++) { + // Convert into a PNG row + for (int x = 0; x < width; x++) { + row[3 * x] = data[y * rowSize + x]; + row[3 * x + 1] = data[y * rowSize + x]; + row[3 * x + 2] = data[y * rowSize + x]; + } + + if (!writer->writeRow(&row)) { + delete[] row; + return splashErrGeneric; + } + } + delete[] row; + } else { + // only splashModeMono8 or splashModeRGB8 + return splashErrGeneric; + } + } break; + + case splashModeMono1: { + if (imageWriterFormat == splashModeMono1) { + SplashColorPtr row; + unsigned char **row_pointers = new unsigned char *[height]; + row = data; + + for (int y = 0; y < height; ++y) { + row_pointers[y] = row; + row += rowSize; + } + if (!writer->writePointers(row_pointers, height)) { + delete[] row_pointers; + return splashErrGeneric; + } + delete[] row_pointers; + } else if (imageWriterFormat == splashModeRGB8) { + unsigned char *row = new unsigned char[3 * width]; + for (int y = 0; y < height; y++) { + // Convert into a PNG row + for (int x = 0; x < width; x++) { + getPixel(x, y, &row[3 * x]); + row[3 * x + 1] = row[3 * x]; + row[3 * x + 2] = row[3 * x]; + } + + if (!writer->writeRow(&row)) { + delete[] row; + return splashErrGeneric; + } + } + delete[] row; + } else { + // only splashModeMono1 or splashModeRGB8 + return splashErrGeneric; + } + } break; + + default: + // can't happen + break; + } + + if (!writer->close()) { + return splashErrGeneric; + } + + return splashOk; +} diff --git a/poppler-24.05.0/splash/SplashBitmap.h b/poppler-24.05.0/splash/SplashBitmap.h new file mode 100644 index 0000000000000000000000000000000000000000..2d7cf413525e4ced4f90d222915ee493030f6792 --- /dev/null +++ b/poppler-24.05.0/splash/SplashBitmap.h @@ -0,0 +1,129 @@ +//======================================================================== +// +// SplashBitmap.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2007 Ilmari Heikkinen +// Copyright (C) 2009 Shen Liang +// Copyright (C) 2009, 2012, 2018, 2021, 2022 Albert Astals Cid +// Copyright (C) 2009 Stefan Thomas +// Copyright (C) 2010, 2017 Adrian Johnson +// Copyright (C) 2010 Harry Roberts +// Copyright (C) 2010 Christian Feuersänger +// Copyright (C) 2010 William Bader +// Copyright (C) 2012 Thomas Freitag +// Copyright (C) 2015 Adam Reichold +// Copyright (C) 2016 Kenji Uno +// Copyright (C) 2018 Martin Packman +// Copyright (C) 2019 Oliver Sander +// +// 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 +// +//======================================================================== + +#ifndef SPLASHBITMAP_H +#define SPLASHBITMAP_H + +#include "SplashTypes.h" +#include "poppler_private_export.h" +#include +#include +#include + +class ImgWriter; +class GfxSeparationColorSpace; + +//------------------------------------------------------------------------ +// SplashBitmap +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT SplashBitmap +{ +public: + // Create a new bitmap. It will have x pixels in + // color mode . Rows will be padded out to a multiple of + // bytes. If is false, the bitmap will be stored + // upside-down, i.e., with the last row first in memory. + SplashBitmap(int widthA, int heightA, int rowPad, SplashColorMode modeA, bool alphaA, bool topDown = true, const std::vector *separationList = nullptr); + static SplashBitmap *copy(const SplashBitmap *src); + + ~SplashBitmap(); + + SplashBitmap(const SplashBitmap &) = delete; + SplashBitmap &operator=(const SplashBitmap &) = delete; + + int getWidth() const { return width; } + int getHeight() const { return height; } + int getRowSize() const { return rowSize; } + int getAlphaRowSize() const { return width; } + int getRowPad() const { return rowPad; } + SplashColorMode getMode() const { return mode; } + SplashColorPtr getDataPtr() { return data; } + unsigned char *getAlphaPtr() { return alpha; } + std::vector *getSeparationList() { return separationList; } + SplashColorConstPtr getDataPtr() const { return data; } + const unsigned char *getAlphaPtr() const { return alpha; } + const std::vector *getSeparationList() const { return separationList; } + + SplashError writePNMFile(char *fileName); + SplashError writePNMFile(FILE *f); + SplashError writeAlphaPGMFile(char *fileName); + + struct WriteImgParams + { + int jpegQuality = -1; + bool jpegProgressive = false; + std::string tiffCompression; + bool jpegOptimize = false; + }; + + SplashError writeImgFile(SplashImageFileFormat format, const char *fileName, double hDPI, double vDPI, WriteImgParams *params = nullptr); + SplashError writeImgFile(SplashImageFileFormat format, FILE *f, double hDPI, double vDPI, WriteImgParams *params = nullptr); + SplashError writeImgFile(ImgWriter *writer, FILE *f, double hDPI, double vDPI, SplashColorMode imageWriterFormat); + + enum ConversionMode + { + conversionOpaque, + conversionAlpha, + conversionAlphaPremultiplied + }; + + bool convertToXBGR(ConversionMode conversionMode = conversionOpaque); + + void getPixel(int x, int y, SplashColorPtr pixel); + void getRGBLine(int y, SplashColorPtr line); + void getXBGRLine(int y, SplashColorPtr line, ConversionMode conversionMode = conversionOpaque); + void getCMYKLine(int y, SplashColorPtr line); + unsigned char getAlpha(int x, int y); + + // Caller takes ownership of the bitmap data. The SplashBitmap + // object is no longer valid -- the next call should be to the + // destructor. + SplashColorPtr takeData(); + +private: + int width, height; // size of bitmap + int rowPad; + int rowSize; // size of one row of data, in bytes + // - negative for bottom-up bitmaps + SplashColorMode mode; // color mode + SplashColorPtr data; // pointer to row zero of the color data + unsigned char *alpha; // pointer to row zero of the alpha data + // (always top-down) + std::vector *separationList; // list of spot colorants and their mapping functions + + friend class Splash; + + void setJpegParams(ImgWriter *writer, WriteImgParams *params); +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashClip.cc b/poppler-24.05.0/splash/SplashClip.cc new file mode 100644 index 0000000000000000000000000000000000000000..0620c2c079be0f00fee7ef1da8c0daca7893774d --- /dev/null +++ b/poppler-24.05.0/splash/SplashClip.cc @@ -0,0 +1,364 @@ +//======================================================================== +// +// SplashClip.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2010, 2021 Albert Astals Cid +// Copyright (C) 2013, 2021 Thomas Freitag +// Copyright (C) 2019 Stefan Brüns +// +// 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 + +#include +#include +#include "goo/gmem.h" +#include "SplashErrorCodes.h" +#include "SplashMath.h" +#include "SplashPath.h" +#include "SplashXPath.h" +#include "SplashXPathScanner.h" +#include "SplashBitmap.h" +#include "SplashClip.h" + +//------------------------------------------------------------------------ +// SplashClip.flags +//------------------------------------------------------------------------ + +#define splashClipEO 0x01 // use even-odd rule + +//------------------------------------------------------------------------ +// SplashClip +//------------------------------------------------------------------------ + +SplashClip::SplashClip(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1, bool antialiasA) +{ + antialias = antialiasA; + if (x0 < x1) { + xMin = x0; + xMax = x1; + } else { + xMin = x1; + xMax = x0; + } + if (y0 < y1) { + yMin = y0; + yMax = y1; + } else { + yMin = y1; + yMax = y0; + } + xMinI = splashFloor(xMin); + yMinI = splashFloor(yMin); + xMaxI = splashCeil(xMax) - 1; + yMaxI = splashCeil(yMax) - 1; + flags = nullptr; + length = size = 0; +} + +SplashClip::SplashClip(const SplashClip *clip) +{ + int i; + + antialias = clip->antialias; + xMin = clip->xMin; + yMin = clip->yMin; + xMax = clip->xMax; + yMax = clip->yMax; + xMinI = clip->xMinI; + yMinI = clip->yMinI; + xMaxI = clip->xMaxI; + yMaxI = clip->yMaxI; + length = clip->length; + size = clip->size; + flags = (unsigned char *)gmallocn(size, sizeof(unsigned char)); + scanners = clip->scanners; + for (i = 0; i < length; ++i) { + flags[i] = clip->flags[i]; + } +} + +SplashClip::~SplashClip() +{ + gfree(flags); +} + +void SplashClip::grow(int nPaths) +{ + if (length + nPaths > size) { + if (size == 0) { + size = 32; + } + while (size < length + nPaths) { + size *= 2; + } + flags = (unsigned char *)greallocn(flags, size, sizeof(unsigned char)); + } +} + +void SplashClip::resetToRect(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1) +{ + gfree(flags); + flags = nullptr; + scanners = {}; + length = size = 0; + + if (x0 < x1) { + xMin = x0; + xMax = x1; + } else { + xMin = x1; + xMax = x0; + } + if (y0 < y1) { + yMin = y0; + yMax = y1; + } else { + yMin = y1; + yMax = y0; + } + xMinI = splashFloor(xMin); + yMinI = splashFloor(yMin); + xMaxI = splashCeil(xMax) - 1; + yMaxI = splashCeil(yMax) - 1; +} + +SplashError SplashClip::clipToRect(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1) +{ + if (x0 < x1) { + if (x0 > xMin) { + xMin = x0; + xMinI = splashFloor(xMin); + } + if (x1 < xMax) { + xMax = x1; + xMaxI = splashCeil(xMax) - 1; + } + } else { + if (x1 > xMin) { + xMin = x1; + xMinI = splashFloor(xMin); + } + if (x0 < xMax) { + xMax = x0; + xMaxI = splashCeil(xMax) - 1; + } + } + if (y0 < y1) { + if (y0 > yMin) { + yMin = y0; + yMinI = splashFloor(yMin); + } + if (y1 < yMax) { + yMax = y1; + yMaxI = splashCeil(yMax) - 1; + } + } else { + if (y1 > yMin) { + yMin = y1; + yMinI = splashFloor(yMin); + } + if (y0 < yMax) { + yMax = y0; + yMaxI = splashCeil(yMax) - 1; + } + } + return splashOk; +} + +SplashError SplashClip::clipToPath(SplashPath *path, SplashCoord *matrix, SplashCoord flatness, bool eo) +{ + int yMinAA, yMaxAA; + + SplashXPath xPath(path, matrix, flatness, true); + + // check for an empty path + if (xPath.length == 0) { + xMax = xMin - 1; + yMax = yMin - 1; + xMaxI = splashCeil(xMax) - 1; + yMaxI = splashCeil(yMax) - 1; + + // check for a rectangle + } else if (xPath.length == 4 + && ((xPath.segs[0].x0 == xPath.segs[0].x1 && xPath.segs[0].x0 == xPath.segs[1].x0 && xPath.segs[0].x0 == xPath.segs[3].x1 && xPath.segs[2].x0 == xPath.segs[2].x1 && xPath.segs[2].x0 == xPath.segs[1].x1 + && xPath.segs[2].x0 == xPath.segs[3].x0 && xPath.segs[1].y0 == xPath.segs[1].y1 && xPath.segs[1].y0 == xPath.segs[0].y1 && xPath.segs[1].y0 == xPath.segs[2].y0 && xPath.segs[3].y0 == xPath.segs[3].y1 + && xPath.segs[3].y0 == xPath.segs[0].y0 && xPath.segs[3].y0 == xPath.segs[2].y1) + || (xPath.segs[0].y0 == xPath.segs[0].y1 && xPath.segs[0].y0 == xPath.segs[1].y0 && xPath.segs[0].y0 == xPath.segs[3].y1 && xPath.segs[2].y0 == xPath.segs[2].y1 && xPath.segs[2].y0 == xPath.segs[1].y1 + && xPath.segs[2].y0 == xPath.segs[3].y0 && xPath.segs[1].x0 == xPath.segs[1].x1 && xPath.segs[1].x0 == xPath.segs[0].x1 && xPath.segs[1].x0 == xPath.segs[2].x0 && xPath.segs[3].x0 == xPath.segs[3].x1 + && xPath.segs[3].x0 == xPath.segs[0].x0 && xPath.segs[3].x0 == xPath.segs[2].x1))) { + clipToRect(xPath.segs[0].x0, xPath.segs[0].y0, xPath.segs[2].x0, xPath.segs[2].y0); + + } else { + grow(1); + if (antialias) { + xPath.aaScale(); + } + xPath.sort(); + flags[length] = eo ? splashClipEO : 0; + if (antialias) { + yMinAA = yMinI * splashAASize; + yMaxAA = (yMaxI + 1) * splashAASize - 1; + } else { + yMinAA = yMinI; + yMaxAA = yMaxI; + } + scanners.emplace_back(std::make_shared(xPath, eo, yMinAA, yMaxAA)); + ++length; + } + + return splashOk; +} + +SplashClipResult SplashClip::testRect(int rectXMin, int rectYMin, int rectXMax, int rectYMax) +{ + // This tests the rectangle: + // x = [rectXMin, rectXMax + 1) (note: rect coords are ints) + // y = [rectYMin, rectYMax + 1) + // against the clipping region: + // x = [xMin, xMax) (note: clipping coords are fp) + // y = [yMin, yMax) + if ((SplashCoord)(rectXMax + 1) <= xMin || (SplashCoord)rectXMin >= xMax || (SplashCoord)(rectYMax + 1) <= yMin || (SplashCoord)rectYMin >= yMax) { + return splashClipAllOutside; + } + if ((SplashCoord)rectXMin >= xMin && (SplashCoord)(rectXMax + 1) <= xMax && (SplashCoord)rectYMin >= yMin && (SplashCoord)(rectYMax + 1) <= yMax && length == 0) { + return splashClipAllInside; + } + return splashClipPartial; +} + +SplashClipResult SplashClip::testSpan(int spanXMin, int spanXMax, int spanY) +{ + int i; + + // This tests the rectangle: + // x = [spanXMin, spanXMax + 1) (note: span coords are ints) + // y = [spanY, spanY + 1) + // against the clipping region: + // x = [xMin, xMax) (note: clipping coords are fp) + // y = [yMin, yMax) + if ((SplashCoord)(spanXMax + 1) <= xMin || (SplashCoord)spanXMin >= xMax || (SplashCoord)(spanY + 1) <= yMin || (SplashCoord)spanY >= yMax) { + return splashClipAllOutside; + } + if (!((SplashCoord)spanXMin >= xMin && (SplashCoord)(spanXMax + 1) <= xMax && (SplashCoord)spanY >= yMin && (SplashCoord)(spanY + 1) <= yMax)) { + return splashClipPartial; + } + if (antialias) { + for (i = 0; i < length; ++i) { + if (!scanners[i]->testSpan(spanXMin * splashAASize, spanXMax * splashAASize + (splashAASize - 1), spanY * splashAASize)) { + return splashClipPartial; + } + } + } else { + for (i = 0; i < length; ++i) { + if (!scanners[i]->testSpan(spanXMin, spanXMax, spanY)) { + return splashClipPartial; + } + } + } + return splashClipAllInside; +} + +void SplashClip::clipAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y, bool adjustVertLine) +{ + int xx0, xx1, xx, yy, i; + SplashColorPtr p; + + // zero out pixels with x < xMin + xx0 = *x0 * splashAASize; + xx1 = splashFloor(xMin * splashAASize); + if (xx1 > aaBuf->getWidth()) { + xx1 = aaBuf->getWidth(); + } + if (xx0 < xx1) { + xx0 &= ~7; + for (yy = 0; yy < splashAASize; ++yy) { + p = aaBuf->getDataPtr() + yy * aaBuf->getRowSize() + (xx0 >> 3); + for (xx = xx0; xx + 7 < xx1; xx += 8) { + *p++ = 0; + } + if (xx < xx1 && !adjustVertLine) { + *p &= 0xff >> (xx1 & 7); + } + } + *x0 = splashFloor(xMin); + } + + // zero out pixels with x > xMax + xx0 = splashFloor(xMax * splashAASize) + 1; + if (xx0 < 0) { + xx0 = 0; + } + xx1 = (*x1 + 1) * splashAASize; + if (xx0 < xx1 && !adjustVertLine) { + for (yy = 0; yy < splashAASize; ++yy) { + p = aaBuf->getDataPtr() + yy * aaBuf->getRowSize() + (xx0 >> 3); + xx = xx0; + if (xx & 7) { + *p &= 0xff00 >> (xx & 7); + xx = (xx & ~7) + 8; + ++p; + } + for (; xx < xx1; xx += 8) { + *p++ = 0; + } + } + *x1 = splashFloor(xMax); + } + + // check the paths + for (i = 0; i < length; ++i) { + scanners[i]->clipAALine(aaBuf, x0, x1, y); + } + if (*x0 > *x1) { + *x0 = *x1; + } + if (*x0 < 0) { + *x0 = 0; + } + if ((*x0 >> 1) >= aaBuf->getRowSize()) { + xx0 = *x0; + *x0 = (aaBuf->getRowSize() - 1) << 1; + if (xx0 & 1) { + *x0 = *x0 + 1; + } + } + if (*x1 < *x0) { + *x1 = *x0; + } + if ((*x1 >> 1) >= aaBuf->getRowSize()) { + xx0 = *x1; + *x1 = (aaBuf->getRowSize() - 1) << 1; + if (xx0 & 1) { + *x1 = *x1 + 1; + } + } +} + +bool SplashClip::testClipPaths(int x, int y) +{ + if (antialias) { + x *= splashAASize; + y *= splashAASize; + } + + for (int i = 0; i < length; ++i) { + if (!scanners[i]->test(x, y)) { + return false; + } + } + + return true; +} diff --git a/poppler-24.05.0/splash/SplashClip.h b/poppler-24.05.0/splash/SplashClip.h new file mode 100644 index 0000000000000000000000000000000000000000..0b7dd14943a506eddfd16224b0bca6f266076a16 --- /dev/null +++ b/poppler-24.05.0/splash/SplashClip.h @@ -0,0 +1,131 @@ +//======================================================================== +// +// SplashClip.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2010, 2018, 2021 Albert Astals Cid +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2019 Stefan Brüns +// +// 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 +// +//======================================================================== + +#ifndef SPLASHCLIP_H +#define SPLASHCLIP_H + +#include "SplashTypes.h" + +#include +#include + +class SplashPath; +class SplashXPath; +class SplashXPathScanner; +class SplashBitmap; + +//------------------------------------------------------------------------ + +enum SplashClipResult +{ + splashClipAllInside, + splashClipAllOutside, + splashClipPartial +}; + +//------------------------------------------------------------------------ +// SplashClip +//------------------------------------------------------------------------ + +class SplashClip +{ +public: + // Create a clip, for the given rectangle. + SplashClip(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1, bool antialiasA); + + // Copy a clip. + SplashClip *copy() const { return new SplashClip(this); } + + ~SplashClip(); + + SplashClip(const SplashClip &) = delete; + SplashClip &operator=(const SplashClip &) = delete; + + // Reset the clip to a rectangle. + void resetToRect(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1); + + // Intersect the clip with a rectangle. + SplashError clipToRect(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1); + + // Intersect the clip with . + SplashError clipToPath(SplashPath *path, SplashCoord *matrix, SplashCoord flatness, bool eo); + + // Returns true if (,) is inside the clip. + bool test(int x, int y) + { + // check the rectangle + if (x < xMinI || x > xMaxI || y < yMinI || y > yMaxI) { + return false; + } + + // check the paths + return testClipPaths(x, y); + } + + // Tests a rectangle against the clipping region. Returns one of: + // - splashClipAllInside if the entire rectangle is inside the + // clipping region, i.e., all pixels in the rectangle are + // visible + // - splashClipAllOutside if the entire rectangle is outside the + // clipping region, i.e., all the pixels in the rectangle are + // clipped + // - splashClipPartial if the rectangle is part inside and part + // outside the clipping region + SplashClipResult testRect(int rectXMin, int rectYMin, int rectXMax, int rectYMax); + + // Similar to testRect, but tests a horizontal span. + SplashClipResult testSpan(int spanXMin, int spanXMax, int spanY); + + // Clips an anti-aliased line by setting pixels to zero. On entry, + // all non-zero pixels are between and . This function + // will update and . + void clipAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y, bool adjustVertLine = false); + + // Get the rectangle part of the clip region. + SplashCoord getXMin() { return xMin; } + SplashCoord getXMax() { return xMax; } + SplashCoord getYMin() { return yMin; } + SplashCoord getYMax() { return yMax; } + + // Get the rectangle part of the clip region, in integer coordinates. + int getXMinI() { return xMinI; } + int getXMaxI() { return xMaxI; } + int getYMinI() { return yMinI; } + int getYMaxI() { return yMaxI; } + + // Get the number of arbitrary paths used by the clip region. + int getNumPaths() { return length; } + +protected: + explicit SplashClip(const SplashClip *clip); + void grow(int nPaths); + bool testClipPaths(int x, int y); + + bool antialias; + SplashCoord xMin, yMin, xMax, yMax; + int xMinI, yMinI, xMaxI, yMaxI; + unsigned char *flags; + std::vector> scanners; + int length, size; +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashErrorCodes.h b/poppler-24.05.0/splash/SplashErrorCodes.h new file mode 100644 index 0000000000000000000000000000000000000000..10efd6db72f5c615fd5540664a35b13ab83945bf --- /dev/null +++ b/poppler-24.05.0/splash/SplashErrorCodes.h @@ -0,0 +1,50 @@ +//======================================================================== +// +// SplashErrorCodes.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2006, 2009 Albert Astals Cid +// +// 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 +// +//======================================================================== + +#ifndef SPLASHERRORCODES_H +#define SPLASHERRORCODES_H + +//------------------------------------------------------------------------ + +#define splashOk 0 // no error + +#define splashErrNoCurPt 1 // no current point + +#define splashErrEmptyPath 2 // zero points in path + +#define splashErrBogusPath 3 // only one point in subpath + +#define splashErrNoSave 4 // state stack is empty + +#define splashErrOpenFile 5 // couldn't open file + +#define splashErrNoGlyph 6 // couldn't get the requested glyph + +#define splashErrModeMismatch 7 // invalid combination of color modes + +#define splashErrSingularMatrix 8 // matrix is singular + +#define splashErrBadArg 9 // bad argument + +#define splashErrZeroImage 254 // image of 0x0 + +#define splashErrGeneric 255 + +#endif diff --git a/poppler-24.05.0/splash/SplashFTFont.cc b/poppler-24.05.0/splash/SplashFTFont.cc new file mode 100644 index 0000000000000000000000000000000000000000..a366f7126fbc199ccf7d29155088a5f1856e122c --- /dev/null +++ b/poppler-24.05.0/splash/SplashFTFont.cc @@ -0,0 +1,433 @@ +//======================================================================== +// +// SplashFTFont.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2005, 2007-2011, 2014, 2018, 2020 Albert Astals Cid +// Copyright (C) 2006 Kristian Høgsberg +// Copyright (C) 2009 Petr Gajdos +// Copyright (C) 2010 Suzuki Toshiya +// Copyright (C) 2011 Andreas Hartmetz +// Copyright (C) 2012 Thomas Freitag +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018 Oliver Sander +// +// 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 + +#include +#include FT_OUTLINE_H +#include FT_SIZES_H +#include FT_GLYPH_H +#include "goo/gmem.h" +#include "SplashMath.h" +#include "SplashGlyphBitmap.h" +#include "SplashPath.h" +#include "SplashFTFontEngine.h" +#include "SplashFTFontFile.h" +#include "SplashFTFont.h" + +#include "goo/GooLikely.h" + +//------------------------------------------------------------------------ + +static int glyphPathMoveTo(const FT_Vector *pt, void *path); +static int glyphPathLineTo(const FT_Vector *pt, void *path); +static int glyphPathConicTo(const FT_Vector *ctrl, const FT_Vector *pt, void *path); +static int glyphPathCubicTo(const FT_Vector *ctrl1, const FT_Vector *ctrl2, const FT_Vector *pt, void *path); + +//------------------------------------------------------------------------ +// SplashFTFont +//------------------------------------------------------------------------ + +SplashFTFont::SplashFTFont(SplashFTFontFile *fontFileA, SplashCoord *matA, const SplashCoord *textMatA) + : SplashFont(fontFileA, matA, textMatA, fontFileA->engine->aa), textScale(0), enableFreeTypeHinting(fontFileA->engine->enableFreeTypeHinting), enableSlightHinting(fontFileA->engine->enableSlightHinting), isOk(false) +{ + FT_Face face; + int div; + int x, y; + + face = fontFileA->face; + if (FT_New_Size(face, &sizeObj)) { + return; + } + face->size = sizeObj; + size = splashRound(splashDist(0, 0, mat[2], mat[3])); + if (size < 1) { + size = 1; + } + if (FT_Set_Pixel_Sizes(face, 0, size)) { + return; + } + // if the textMat values are too small, FreeType's fixed point + // arithmetic doesn't work so well + textScale = splashDist(0, 0, textMat[2], textMat[3]) / size; + + if (unlikely(textScale == 0 || face->units_per_EM == 0)) { + return; + } + + div = face->bbox.xMax > 20000 ? 65536 : 1; + + // transform the four corners of the font bounding box -- the min + // and max values form the bounding box of the transformed font + x = (int)((mat[0] * face->bbox.xMin + mat[2] * face->bbox.yMin) / (div * face->units_per_EM)); + xMin = xMax = x; + y = (int)((mat[1] * face->bbox.xMin + mat[3] * face->bbox.yMin) / (div * face->units_per_EM)); + yMin = yMax = y; + x = (int)((mat[0] * face->bbox.xMin + mat[2] * face->bbox.yMax) / (div * face->units_per_EM)); + if (x < xMin) { + xMin = x; + } else if (x > xMax) { + xMax = x; + } + y = (int)((mat[1] * face->bbox.xMin + mat[3] * face->bbox.yMax) / (div * face->units_per_EM)); + if (y < yMin) { + yMin = y; + } else if (y > yMax) { + yMax = y; + } + x = (int)((mat[0] * face->bbox.xMax + mat[2] * face->bbox.yMin) / (div * face->units_per_EM)); + if (x < xMin) { + xMin = x; + } else if (x > xMax) { + xMax = x; + } + y = (int)((mat[1] * face->bbox.xMax + mat[3] * face->bbox.yMin) / (div * face->units_per_EM)); + if (y < yMin) { + yMin = y; + } else if (y > yMax) { + yMax = y; + } + x = (int)((mat[0] * face->bbox.xMax + mat[2] * face->bbox.yMax) / (div * face->units_per_EM)); + if (x < xMin) { + xMin = x; + } else if (x > xMax) { + xMax = x; + } + y = (int)((mat[1] * face->bbox.xMax + mat[3] * face->bbox.yMax) / (div * face->units_per_EM)); + if (y < yMin) { + yMin = y; + } else if (y > yMax) { + yMax = y; + } + // This is a kludge: some buggy PDF generators embed fonts with + // zero bounding boxes. + if (xMax == xMin) { + xMin = 0; + xMax = size; + } + if (yMax == yMin) { + yMin = 0; + yMax = (int)((SplashCoord)1.2 * size); + } + + // compute the transform matrix + matrix.xx = (FT_Fixed)((mat[0] / size) * 65536); + matrix.yx = (FT_Fixed)((mat[1] / size) * 65536); + matrix.xy = (FT_Fixed)((mat[2] / size) * 65536); + matrix.yy = (FT_Fixed)((mat[3] / size) * 65536); + textMatrix.xx = (FT_Fixed)((textMat[0] / (textScale * size)) * 65536); + textMatrix.yx = (FT_Fixed)((textMat[1] / (textScale * size)) * 65536); + textMatrix.xy = (FT_Fixed)((textMat[2] / (textScale * size)) * 65536); + textMatrix.yy = (FT_Fixed)((textMat[3] / (textScale * size)) * 65536); + + isOk = true; +} + +SplashFTFont::~SplashFTFont() { } + +bool SplashFTFont::getGlyph(int c, int xFrac, int yFrac, SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) +{ + return SplashFont::getGlyph(c, xFrac, 0, bitmap, x0, y0, clip, clipRes); +} + +static FT_Int32 getFTLoadFlags(bool type1, bool trueType, bool aa, bool enableFreeTypeHinting, bool enableSlightHinting) +{ + int ret = FT_LOAD_DEFAULT; + if (aa) { + ret |= FT_LOAD_NO_BITMAP; + } + + if (enableFreeTypeHinting) { + if (enableSlightHinting) { + ret |= FT_LOAD_TARGET_LIGHT; + } else { + if (trueType) { + // FT2's autohinting doesn't always work very well (especially with + // font subsets), so turn it off if anti-aliasing is enabled; if + // anti-aliasing is disabled, this seems to be a tossup - some fonts + // look better with hinting, some without, so leave hinting on + if (aa) { + ret |= FT_LOAD_NO_AUTOHINT; + } + } else if (type1) { + // Type 1 fonts seem to look better with 'light' hinting mode + ret |= FT_LOAD_TARGET_LIGHT; + } + } + } else { + ret |= FT_LOAD_NO_HINTING; + } + return ret; +} + +bool SplashFTFont::makeGlyph(int c, int xFrac, int yFrac, SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) +{ + SplashFTFontFile *ff; + FT_Vector offset; + FT_GlyphSlot slot; + FT_UInt gid; + int rowSize; + unsigned char *p, *q; + int i; + + if (unlikely(!isOk)) { + return false; + } + + ff = (SplashFTFontFile *)fontFile; + + ff->face->size = sizeObj; + offset.x = (FT_Pos)(int)((SplashCoord)xFrac * splashFontFractionMul * 64); + offset.y = 0; + FT_Set_Transform(ff->face, &matrix, &offset); + slot = ff->face->glyph; + + if (ff->codeToGID && c < ff->codeToGIDLen && c >= 0) { + gid = (FT_UInt)ff->codeToGID[c]; + } else { + gid = (FT_UInt)c; + } + + if (FT_Load_Glyph(ff->face, gid, getFTLoadFlags(ff->type1, ff->trueType, aa, enableFreeTypeHinting, enableSlightHinting))) { + return false; + } + + // prelimirary values based on FT_Outline_Get_CBox + // we add two pixels to each side to be in the safe side + FT_BBox cbox; + FT_Outline_Get_CBox(&ff->face->glyph->outline, &cbox); + bitmap->x = -(cbox.xMin / 64) + 2; + bitmap->y = (cbox.yMax / 64) + 2; + bitmap->w = ((cbox.xMax - cbox.xMin) / 64) + 4; + bitmap->h = ((cbox.yMax - cbox.yMin) / 64) + 4; + + *clipRes = clip->testRect(x0 - bitmap->x, y0 - bitmap->y, x0 - bitmap->x + bitmap->w, y0 - bitmap->y + bitmap->h); + if (*clipRes == splashClipAllOutside) { + bitmap->freeData = false; + return true; + } + + if (FT_Render_Glyph(slot, aa ? ft_render_mode_normal : ft_render_mode_mono)) { + return false; + } + + if (slot->bitmap.width == 0 || slot->bitmap.rows == 0) { + // this can happen if (a) the glyph is really tiny or (b) the + // metrics in the TrueType file are broken + return false; + } + + bitmap->x = -slot->bitmap_left; + bitmap->y = slot->bitmap_top; + bitmap->w = slot->bitmap.width; + bitmap->h = slot->bitmap.rows; + bitmap->aa = aa; + if (aa) { + rowSize = bitmap->w; + } else { + rowSize = (bitmap->w + 7) >> 3; + } + bitmap->data = (unsigned char *)gmallocn_checkoverflow(rowSize, bitmap->h); + if (!bitmap->data) { + return false; + } + bitmap->freeData = true; + for (i = 0, p = bitmap->data, q = slot->bitmap.buffer; i < bitmap->h; ++i, p += rowSize, q += slot->bitmap.pitch) { + memcpy(p, q, rowSize); + } + + return true; +} + +double SplashFTFont::getGlyphAdvance(int c) +{ + SplashFTFontFile *ff; + FT_Vector offset; + FT_UInt gid; + FT_Matrix identityMatrix; + + ff = (SplashFTFontFile *)fontFile; + + // init the matrix + identityMatrix.xx = 65536; // 1 in 16.16 format + identityMatrix.xy = 0; + identityMatrix.yx = 0; + identityMatrix.yy = 65536; // 1 in 16.16 format + + // init the offset + offset.x = 0; + offset.y = 0; + + ff->face->size = sizeObj; + FT_Set_Transform(ff->face, &identityMatrix, &offset); + + if (ff->codeToGID && c < ff->codeToGIDLen) { + gid = (FT_UInt)ff->codeToGID[c]; + } else { + gid = (FT_UInt)c; + } + + if (FT_Load_Glyph(ff->face, gid, getFTLoadFlags(ff->type1, ff->trueType, aa, enableFreeTypeHinting, enableSlightHinting))) { + return -1; + } + + // 64.0 is 1 in 26.6 format + return ff->face->glyph->metrics.horiAdvance / 64.0 / size; +} + +struct SplashFTFontPath +{ + SplashPath *path; + SplashCoord textScale; + bool needClose; +}; + +SplashPath *SplashFTFont::getGlyphPath(int c) +{ + static const FT_Outline_Funcs outlineFuncs = { +#if FREETYPE_MINOR <= 1 + (int (*)(FT_Vector *, void *)) & glyphPathMoveTo, + (int (*)(FT_Vector *, void *)) & glyphPathLineTo, + (int (*)(FT_Vector *, FT_Vector *, void *)) & glyphPathConicTo, + (int (*)(FT_Vector *, FT_Vector *, FT_Vector *, void *)) & glyphPathCubicTo, +#else + &glyphPathMoveTo, + &glyphPathLineTo, + &glyphPathConicTo, + &glyphPathCubicTo, +#endif + 0, + 0 + }; + SplashFTFontFile *ff; + SplashFTFontPath path; + FT_GlyphSlot slot; + FT_UInt gid; + FT_Glyph glyph; + + if (unlikely(textScale == 0)) { + return nullptr; + } + + ff = (SplashFTFontFile *)fontFile; + ff->face->size = sizeObj; + FT_Set_Transform(ff->face, &textMatrix, nullptr); + slot = ff->face->glyph; + if (ff->codeToGID && c < ff->codeToGIDLen && c >= 0) { + gid = ff->codeToGID[c]; + } else { + gid = (FT_UInt)c; + } + if (FT_Load_Glyph(ff->face, gid, getFTLoadFlags(ff->type1, ff->trueType, aa, enableFreeTypeHinting, enableSlightHinting))) { + return nullptr; + } + if (FT_Get_Glyph(slot, &glyph)) { + return nullptr; + } + if (FT_Outline_Check(&((FT_OutlineGlyph)glyph)->outline)) { + return nullptr; + } + path.path = new SplashPath(); + path.textScale = textScale; + path.needClose = false; + FT_Outline_Decompose(&((FT_OutlineGlyph)glyph)->outline, &outlineFuncs, &path); + if (path.needClose) { + path.path->close(); + } + FT_Done_Glyph(glyph); + return path.path; +} + +static int glyphPathMoveTo(const FT_Vector *pt, void *path) +{ + SplashFTFontPath *p = (SplashFTFontPath *)path; + + if (p->needClose) { + p->path->close(); + p->needClose = false; + } + p->path->moveTo((SplashCoord)pt->x * p->textScale / 64.0, (SplashCoord)pt->y * p->textScale / 64.0); + return 0; +} + +static int glyphPathLineTo(const FT_Vector *pt, void *path) +{ + SplashFTFontPath *p = (SplashFTFontPath *)path; + + p->path->lineTo((SplashCoord)pt->x * p->textScale / 64.0, (SplashCoord)pt->y * p->textScale / 64.0); + p->needClose = true; + return 0; +} + +static int glyphPathConicTo(const FT_Vector *ctrl, const FT_Vector *pt, void *path) +{ + SplashFTFontPath *p = (SplashFTFontPath *)path; + SplashCoord x0, y0, x1, y1, x2, y2, x3, y3, xc, yc; + + if (!p->path->getCurPt(&x0, &y0)) { + return 0; + } + xc = (SplashCoord)ctrl->x * p->textScale / 64.0; + yc = (SplashCoord)ctrl->y * p->textScale / 64.0; + x3 = (SplashCoord)pt->x * p->textScale / 64.0; + y3 = (SplashCoord)pt->y * p->textScale / 64.0; + + // A second-order Bezier curve is defined by two endpoints, p0 and + // p3, and one control point, pc: + // + // p(t) = (1-t)^2*p0 + t*(1-t)*pc + t^2*p3 + // + // A third-order Bezier curve is defined by the same two endpoints, + // p0 and p3, and two control points, p1 and p2: + // + // p(t) = (1-t)^3*p0 + 3t*(1-t)^2*p1 + 3t^2*(1-t)*p2 + t^3*p3 + // + // Applying some algebra, we can convert a second-order curve to a + // third-order curve: + // + // p1 = (1/3) * (p0 + 2pc) + // p2 = (1/3) * (2pc + p3) + + x1 = (SplashCoord)(1.0 / 3.0) * (x0 + (SplashCoord)2 * xc); + y1 = (SplashCoord)(1.0 / 3.0) * (y0 + (SplashCoord)2 * yc); + x2 = (SplashCoord)(1.0 / 3.0) * ((SplashCoord)2 * xc + x3); + y2 = (SplashCoord)(1.0 / 3.0) * ((SplashCoord)2 * yc + y3); + + p->path->curveTo(x1, y1, x2, y2, x3, y3); + p->needClose = true; + return 0; +} + +static int glyphPathCubicTo(const FT_Vector *ctrl1, const FT_Vector *ctrl2, const FT_Vector *pt, void *path) +{ + SplashFTFontPath *p = (SplashFTFontPath *)path; + + p->path->curveTo((SplashCoord)ctrl1->x * p->textScale / 64.0, (SplashCoord)ctrl1->y * p->textScale / 64.0, (SplashCoord)ctrl2->x * p->textScale / 64.0, (SplashCoord)ctrl2->y * p->textScale / 64.0, + (SplashCoord)pt->x * p->textScale / 64.0, (SplashCoord)pt->y * p->textScale / 64.0); + p->needClose = true; + return 0; +} diff --git a/poppler-24.05.0/splash/SplashFTFont.h b/poppler-24.05.0/splash/SplashFTFont.h new file mode 100644 index 0000000000000000000000000000000000000000..ae656b9cc523f1c8be8ad99a18f8f8654d1b5579 --- /dev/null +++ b/poppler-24.05.0/splash/SplashFTFont.h @@ -0,0 +1,71 @@ +//======================================================================== +// +// SplashFTFont.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2007-2009, 2011, 2018 Albert Astals Cid +// Copyright (C) 2009 Petr Gajdos +// Copyright (C) 2011 Andreas Hartmetz +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018 Oliver Sander +// +// 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 +// +//======================================================================== + +#ifndef SPLASHFTFONT_H +#define SPLASHFTFONT_H + +#include "poppler-config.h" + +#include +#include FT_FREETYPE_H +#include "SplashFont.h" + +class SplashFTFontFile; + +//------------------------------------------------------------------------ +// SplashFTFont +//------------------------------------------------------------------------ + +class SplashFTFont : public SplashFont +{ +public: + SplashFTFont(SplashFTFontFile *fontFileA, SplashCoord *matA, const SplashCoord *textMatA); + + ~SplashFTFont() override; + + // Munge xFrac and yFrac before calling SplashFont::getGlyph. + bool getGlyph(int c, int xFrac, int yFrac, SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) override; + + // Rasterize a glyph. The and values are the same + // as described for getGlyph. + bool makeGlyph(int c, int xFrac, int yFrac, SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) override; + + // Return the path for a glyph. + SplashPath *getGlyphPath(int c) override; + + // Return the advance of a glyph. (in 0..1 range) + double getGlyphAdvance(int c) override; + +private: + FT_Size sizeObj; + FT_Matrix matrix; + FT_Matrix textMatrix; + SplashCoord textScale; + int size; + bool enableFreeTypeHinting; + bool enableSlightHinting; + bool isOk; +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashFTFontEngine.cc b/poppler-24.05.0/splash/SplashFTFontEngine.cc new file mode 100644 index 0000000000000000000000000000000000000000..eceb969a2a0f15b6ba849e28374c5223c94c7130 --- /dev/null +++ b/poppler-24.05.0/splash/SplashFTFontEngine.cc @@ -0,0 +1,97 @@ +//======================================================================== +// +// SplashFTFontEngine.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Takashi Iwai +// Copyright (C) 2009, 2011, 2012, 2022 Albert Astals Cid +// Copyright (C) 2009 Petr Gajdos +// Copyright (C) 2011 Andreas Hartmetz +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2019 Christian Persch +// +// 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 + +#include +#ifdef HAVE_UNISTD_H +# include +#endif +#include "goo/gmem.h" +#include "goo/GooString.h" +#include "goo/gfile.h" +#include "fofi/FoFiTrueType.h" +#include "fofi/FoFiType1C.h" +#include "SplashFTFontFile.h" +#include "SplashFTFontEngine.h" + +//------------------------------------------------------------------------ +// SplashFTFontEngine +//------------------------------------------------------------------------ + +SplashFTFontEngine::SplashFTFontEngine(bool aaA, bool enableFreeTypeHintingA, bool enableSlightHintingA, FT_Library libA) +{ + aa = aaA; + enableFreeTypeHinting = enableFreeTypeHintingA; + enableSlightHinting = enableSlightHintingA; + lib = libA; +} + +SplashFTFontEngine *SplashFTFontEngine::init(bool aaA, bool enableFreeTypeHintingA, bool enableSlightHintingA) +{ + FT_Library libA; + + if (FT_Init_FreeType(&libA)) { + return nullptr; + } + return new SplashFTFontEngine(aaA, enableFreeTypeHintingA, enableSlightHintingA, libA); +} + +SplashFTFontEngine::~SplashFTFontEngine() +{ + FT_Done_FreeType(lib); +} + +SplashFontFile *SplashFTFontEngine::loadType1Font(SplashFontFileID *idA, SplashFontSrc *src, const char **enc) +{ + return SplashFTFontFile::loadType1Font(this, idA, src, enc); +} + +SplashFontFile *SplashFTFontEngine::loadType1CFont(SplashFontFileID *idA, SplashFontSrc *src, const char **enc) +{ + return SplashFTFontFile::loadType1Font(this, idA, src, enc); +} + +SplashFontFile *SplashFTFontEngine::loadOpenTypeT1CFont(SplashFontFileID *idA, SplashFontSrc *src, const char **enc) +{ + return SplashFTFontFile::loadType1Font(this, idA, src, enc); +} + +SplashFontFile *SplashFTFontEngine::loadCIDFont(SplashFontFileID *idA, SplashFontSrc *src) +{ + return SplashFTFontFile::loadCIDFont(this, idA, src, nullptr, 0); +} + +SplashFontFile *SplashFTFontEngine::loadOpenTypeCFFFont(SplashFontFileID *idA, SplashFontSrc *src, int *codeToGID, int codeToGIDLen) +{ + return SplashFTFontFile::loadCIDFont(this, idA, src, codeToGID ? codeToGID : nullptr, codeToGID ? codeToGIDLen : 0); +} + +SplashFontFile *SplashFTFontEngine::loadTrueTypeFont(SplashFontFileID *idA, SplashFontSrc *src, int *codeToGID, int codeToGIDLen, int faceIndex) +{ + SplashFontFile *ret; + ret = SplashFTFontFile::loadTrueTypeFont(this, idA, src, codeToGID, codeToGIDLen, faceIndex); + return ret; +} diff --git a/poppler-24.05.0/splash/SplashFTFontEngine.h b/poppler-24.05.0/splash/SplashFTFontEngine.h new file mode 100644 index 0000000000000000000000000000000000000000..607b2a6ac4e9e2807e3cfbe5b5cf994092e22d82 --- /dev/null +++ b/poppler-24.05.0/splash/SplashFTFontEngine.h @@ -0,0 +1,72 @@ +//======================================================================== +// +// SplashFTFontEngine.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Takashi Iwai +// Copyright (C) 2009 Petr Gajdos +// Copyright (C) 2009, 2018, 2022 Albert Astals Cid +// Copyright (C) 2011 Andreas Hartmetz +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2017 Adrian Johnson +// +// 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 +// +//======================================================================== + +#ifndef SPLASHFTFONTENGINE_H +#define SPLASHFTFONTENGINE_H + +#include +#include FT_FREETYPE_H + +class SplashFontFile; +class SplashFontFileID; +class SplashFontSrc; + +//------------------------------------------------------------------------ +// SplashFTFontEngine +//------------------------------------------------------------------------ + +class SplashFTFontEngine +{ +public: + static SplashFTFontEngine *init(bool aaA, bool enableFreeTypeHintingA, bool enableSlightHinting); + + ~SplashFTFontEngine(); + + SplashFTFontEngine(const SplashFTFontEngine &) = delete; + SplashFTFontEngine &operator=(const SplashFTFontEngine &) = delete; + + // Load fonts. + SplashFontFile *loadType1Font(SplashFontFileID *idA, SplashFontSrc *src, const char **enc); + SplashFontFile *loadType1CFont(SplashFontFileID *idA, SplashFontSrc *src, const char **enc); + SplashFontFile *loadOpenTypeT1CFont(SplashFontFileID *idA, SplashFontSrc *src, const char **enc); + SplashFontFile *loadCIDFont(SplashFontFileID *idA, SplashFontSrc *src); + SplashFontFile *loadOpenTypeCFFFont(SplashFontFileID *idA, SplashFontSrc *src, int *codeToGID, int codeToGIDLen); + SplashFontFile *loadTrueTypeFont(SplashFontFileID *idA, SplashFontSrc *src, int *codeToGID, int codeToGIDLen, int faceIndex = 0); + bool getAA() { return aa; } + void setAA(bool aaA) { aa = aaA; } + +private: + SplashFTFontEngine(bool aaA, bool enableFreeTypeHintingA, bool enableSlightHintingA, FT_Library libA); + + bool aa; + bool enableFreeTypeHinting; + bool enableSlightHinting; + FT_Library lib; + + friend class SplashFTFontFile; + friend class SplashFTFont; +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashFTFontFile.cc b/poppler-24.05.0/splash/SplashFTFontFile.cc new file mode 100644 index 0000000000000000000000000000000000000000..216b54e63a25be2ae26f9c63a189b81f758b7c2e --- /dev/null +++ b/poppler-24.05.0/splash/SplashFTFontFile.cc @@ -0,0 +1,132 @@ +//======================================================================== +// +// SplashFTFontFile.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Takashi Iwai +// Copyright (C) 2014, 2017, 2022 Adrian Johnson +// Copyright (C) 2017, 2018, 2022 Oliver Sander +// Copyright (C) 2018 Albert Astals Cid +// +// 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 + +#include "goo/ft_utils.h" +#include "goo/gmem.h" +#include "goo/GooString.h" +#include "poppler/GfxFont.h" +#include "SplashFTFontEngine.h" +#include "SplashFTFont.h" +#include "SplashFTFontFile.h" + +//------------------------------------------------------------------------ +// SplashFTFontFile +//------------------------------------------------------------------------ + +SplashFontFile *SplashFTFontFile::loadType1Font(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *src, const char **encA) +{ + FT_Face faceA; + int *codeToGIDA; + const char *name; + int i; + + if (src->isFile) { + if (ft_new_face_from_file(engineA->lib, src->fileName.c_str(), 0, &faceA)) { + return nullptr; + } + } else { + if (FT_New_Memory_Face(engineA->lib, (const FT_Byte *)src->buf.data(), src->buf.size(), 0, &faceA)) { + return nullptr; + } + } + codeToGIDA = (int *)gmallocn(256, sizeof(int)); + for (i = 0; i < 256; ++i) { + codeToGIDA[i] = 0; + if ((name = encA[i])) { + codeToGIDA[i] = (int)FT_Get_Name_Index(faceA, (char *)name); + if (codeToGIDA[i] == 0) { + name = GfxFont::getAlternateName(name); + if (name) { + codeToGIDA[i] = FT_Get_Name_Index(faceA, (char *)name); + } + } + } + } + + return new SplashFTFontFile(engineA, idA, src, faceA, codeToGIDA, 256, false, true); +} + +SplashFontFile *SplashFTFontFile::loadCIDFont(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *src, int *codeToGIDA, int codeToGIDLenA) +{ + FT_Face faceA; + + if (src->isFile) { + if (ft_new_face_from_file(engineA->lib, src->fileName.c_str(), 0, &faceA)) { + return nullptr; + } + } else { + if (FT_New_Memory_Face(engineA->lib, (const FT_Byte *)src->buf.data(), src->buf.size(), 0, &faceA)) { + return nullptr; + } + } + + return new SplashFTFontFile(engineA, idA, src, faceA, codeToGIDA, codeToGIDLenA, false, false); +} + +SplashFontFile *SplashFTFontFile::loadTrueTypeFont(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *src, int *codeToGIDA, int codeToGIDLenA, int faceIndexA) +{ + FT_Face faceA; + + if (src->isFile) { + if (ft_new_face_from_file(engineA->lib, src->fileName.c_str(), faceIndexA, &faceA)) { + return nullptr; + } + } else { + if (FT_New_Memory_Face(engineA->lib, (const FT_Byte *)src->buf.data(), src->buf.size(), faceIndexA, &faceA)) { + return nullptr; + } + } + + return new SplashFTFontFile(engineA, idA, src, faceA, codeToGIDA, codeToGIDLenA, true, false); +} + +SplashFTFontFile::SplashFTFontFile(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *srcA, FT_Face faceA, int *codeToGIDA, int codeToGIDLenA, bool trueTypeA, bool type1A) : SplashFontFile(idA, srcA) +{ + engine = engineA; + face = faceA; + codeToGID = codeToGIDA; + codeToGIDLen = codeToGIDLenA; + trueType = trueTypeA; + type1 = type1A; +} + +SplashFTFontFile::~SplashFTFontFile() +{ + if (face) { + FT_Done_Face(face); + } + if (codeToGID) { + gfree(codeToGID); + } +} + +SplashFont *SplashFTFontFile::makeFont(SplashCoord *mat, const SplashCoord *textMat) +{ + SplashFont *font; + + font = new SplashFTFont(this, mat, textMat); + font->initCache(); + return font; +} diff --git a/poppler-24.05.0/splash/SplashFTFontFile.h b/poppler-24.05.0/splash/SplashFTFontFile.h new file mode 100644 index 0000000000000000000000000000000000000000..3e52dd85fab69b148d1c7c955b7a8663b2e7dcb3 --- /dev/null +++ b/poppler-24.05.0/splash/SplashFTFontFile.h @@ -0,0 +1,64 @@ +//======================================================================== +// +// SplashFTFontFile.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Takashi Iwai +// Copyright (C) 2017, 2018 Oliver Sander +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2019 Albert Astals Cid +// +// 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 +// +//======================================================================== + +#ifndef SPLASHFTFONTFILE_H +#define SPLASHFTFONTFILE_H + +#include +#include FT_FREETYPE_H +#include "SplashFontFile.h" + +class SplashFontFileID; +class SplashFTFontEngine; + +//------------------------------------------------------------------------ +// SplashFTFontFile +//------------------------------------------------------------------------ + +class SplashFTFontFile : public SplashFontFile +{ +public: + static SplashFontFile *loadType1Font(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *src, const char **encA); + static SplashFontFile *loadCIDFont(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *src, int *codeToGIDA, int codeToGIDLenA); + static SplashFontFile *loadTrueTypeFont(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *src, int *codeToGIDA, int codeToGIDLenA, int faceIndexA = 0); + + ~SplashFTFontFile() override; + + // Create a new SplashFTFont, i.e., a scaled instance of this font + // file. + SplashFont *makeFont(SplashCoord *mat, const SplashCoord *textMat) override; + +private: + SplashFTFontFile(SplashFTFontEngine *engineA, SplashFontFileID *idA, SplashFontSrc *src, FT_Face faceA, int *codeToGIDA, int codeToGIDLenA, bool trueTypeA, bool type1A); + + SplashFTFontEngine *engine; + FT_Face face; + int *codeToGID; + int codeToGIDLen; + bool trueType; + bool type1; + + friend class SplashFTFont; +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashFont.cc b/poppler-24.05.0/splash/SplashFont.cc new file mode 100644 index 0000000000000000000000000000000000000000..4d82795eba33e001078e86babb011d5e125f0845 --- /dev/null +++ b/poppler-24.05.0/splash/SplashFont.cc @@ -0,0 +1,213 @@ +//======================================================================== +// +// SplashFont.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2007-2008, 2010, 2014, 2019 Albert Astals Cid +// Copyright (C) 2018 Oliver Sander +// +// 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 + +#include +#include +#include "goo/gmem.h" +#include "SplashMath.h" +#include "SplashGlyphBitmap.h" +#include "SplashFontFile.h" +#include "SplashFont.h" + +//------------------------------------------------------------------------ + +struct SplashFontCacheTag +{ + int c; + short xFrac, yFrac; // x and y fractions + int mru; // valid bit (0x80000000) and MRU index + int x, y, w, h; // offset and size of glyph +}; + +//------------------------------------------------------------------------ +// SplashFont +//------------------------------------------------------------------------ + +SplashFont::SplashFont(SplashFontFile *fontFileA, const SplashCoord *matA, const SplashCoord *textMatA, bool aaA) +{ + fontFile = fontFileA; + fontFile->incRefCnt(); + mat[0] = matA[0]; + mat[1] = matA[1]; + mat[2] = matA[2]; + mat[3] = matA[3]; + textMat[0] = textMatA[0]; + textMat[1] = textMatA[1]; + textMat[2] = textMatA[2]; + textMat[3] = textMatA[3]; + aa = aaA; + + cache = nullptr; + cacheTags = nullptr; + + xMin = yMin = xMax = yMax = 0; +} + +void SplashFont::initCache() +{ + int i; + + // this should be (max - min + 1), but we add some padding to + // deal with rounding errors + glyphW = xMax - xMin + 3; + glyphH = yMax - yMin + 3; + if (glyphW > INT_MAX / glyphH) { + glyphSize = -1; + } else { + if (aa) { + glyphSize = glyphW * glyphH; + } else { + glyphSize = ((glyphW + 7) >> 3) * glyphH; + } + } + + // set up the glyph pixmap cache + cacheAssoc = 8; + if (glyphSize <= 64) { + cacheSets = 32; + } else if (glyphSize <= 128) { + cacheSets = 16; + } else if (glyphSize <= 256) { + cacheSets = 8; + } else if (glyphSize <= 512) { + cacheSets = 4; + } else if (glyphSize <= 1024) { + cacheSets = 2; + } else { + cacheSets = 1; + } + cache = (unsigned char *)gmallocn_checkoverflow(cacheSets * cacheAssoc, glyphSize); + if (cache != nullptr) { + cacheTags = (SplashFontCacheTag *)gmallocn(cacheSets * cacheAssoc, sizeof(SplashFontCacheTag)); + for (i = 0; i < cacheSets * cacheAssoc; ++i) { + cacheTags[i].mru = i & (cacheAssoc - 1); + } + } else { + cacheAssoc = 0; + } +} + +SplashFont::~SplashFont() +{ + fontFile->decRefCnt(); + if (cache) { + gfree(cache); + } + if (cacheTags) { + gfree(cacheTags); + } +} + +bool SplashFont::getGlyph(int c, int xFrac, int yFrac, SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) +{ + SplashGlyphBitmap bitmap2; + int size; + unsigned char *p; + int i, j, k; + + // no fractional coordinates for large glyphs or non-anti-aliased + // glyphs + if (!aa || glyphH > 50) { + xFrac = yFrac = 0; + } + + // check the cache + i = (c & (cacheSets - 1)) * cacheAssoc; + for (j = 0; j < cacheAssoc; ++j) { + if ((cacheTags[i + j].mru & 0x80000000) && cacheTags[i + j].c == c && (int)cacheTags[i + j].xFrac == xFrac && (int)cacheTags[i + j].yFrac == yFrac) { + bitmap->x = cacheTags[i + j].x; + bitmap->y = cacheTags[i + j].y; + bitmap->w = cacheTags[i + j].w; + bitmap->h = cacheTags[i + j].h; + for (k = 0; k < cacheAssoc; ++k) { + if (k != j && (cacheTags[i + k].mru & 0x7fffffff) < (cacheTags[i + j].mru & 0x7fffffff)) { + ++cacheTags[i + k].mru; + } + } + cacheTags[i + j].mru = 0x80000000; + bitmap->aa = aa; + bitmap->data = cache + (i + j) * glyphSize; + bitmap->freeData = false; + + *clipRes = clip->testRect(x0 - bitmap->x, y0 - bitmap->y, x0 - bitmap->x + bitmap->w - 1, y0 - bitmap->y + bitmap->h - 1); + + return true; + } + } + + // generate the glyph bitmap + if (!makeGlyph(c, xFrac, yFrac, &bitmap2, x0, y0, clip, clipRes)) { + return false; + } + + if (*clipRes == splashClipAllOutside) { + bitmap->freeData = false; + if (bitmap2.freeData) { + gfree(bitmap2.data); + } + return true; + } + + // if the glyph doesn't fit in the bounding box, return a temporary + // uncached bitmap + if (bitmap2.w > glyphW || bitmap2.h > glyphH) { + *bitmap = bitmap2; + return true; + } + + // insert glyph pixmap in cache + if (aa) { + size = bitmap2.w * bitmap2.h; + } else { + size = ((bitmap2.w + 7) >> 3) * bitmap2.h; + } + p = nullptr; // make gcc happy + if (cacheAssoc == 0) { + // we had problems on the malloc of the cache, so ignore it + *bitmap = bitmap2; + } else { + for (j = 0; j < cacheAssoc; ++j) { + if ((cacheTags[i + j].mru & 0x7fffffff) == cacheAssoc - 1) { + cacheTags[i + j].mru = 0x80000000; + cacheTags[i + j].c = c; + cacheTags[i + j].xFrac = (short)xFrac; + cacheTags[i + j].yFrac = (short)yFrac; + cacheTags[i + j].x = bitmap2.x; + cacheTags[i + j].y = bitmap2.y; + cacheTags[i + j].w = bitmap2.w; + cacheTags[i + j].h = bitmap2.h; + p = cache + (i + j) * glyphSize; + memcpy(p, bitmap2.data, size); + } else { + ++cacheTags[i + j].mru; + } + } + *bitmap = bitmap2; + bitmap->data = p; + bitmap->freeData = false; + if (bitmap2.freeData) { + gfree(bitmap2.data); + } + } + return true; +} diff --git a/poppler-24.05.0/splash/SplashFont.h b/poppler-24.05.0/splash/SplashFont.h new file mode 100644 index 0000000000000000000000000000000000000000..8c54b08f24947749b31e545127410b329dbe66c8 --- /dev/null +++ b/poppler-24.05.0/splash/SplashFont.h @@ -0,0 +1,116 @@ +//======================================================================== +// +// SplashFont.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2007-2008, 2018, 2019 Albert Astals Cid +// Copyright (C) 2018 Oliver Sander +// +// 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 +// +//======================================================================== + +#ifndef SPLASHFONT_H +#define SPLASHFONT_H + +#include "SplashTypes.h" +#include "SplashClip.h" + +struct SplashGlyphBitmap; +struct SplashFontCacheTag; +class SplashFontFile; +class SplashPath; + +//------------------------------------------------------------------------ + +// Fractional positioning uses this many bits to the right of the +// decimal points. +#define splashFontFractionBits 2 +#define splashFontFraction (1 << splashFontFractionBits) +#define splashFontFractionMul ((SplashCoord)1 / (SplashCoord)splashFontFraction) + +//------------------------------------------------------------------------ +// SplashFont +//------------------------------------------------------------------------ + +class SplashFont +{ +public: + SplashFont(SplashFontFile *fontFileA, const SplashCoord *matA, const SplashCoord *textMatA, bool aaA); + + // This must be called after the constructor, so that the subclass + // constructor has a chance to compute the bbox. + void initCache(); + + virtual ~SplashFont(); + + SplashFont(const SplashFont &) = delete; + SplashFont &operator=(const SplashFont &) = delete; + + SplashFontFile *getFontFile() { return fontFile; } + + // Return true if matches the specified font file and matrix. + bool matches(SplashFontFile *fontFileA, const SplashCoord *matA, const SplashCoord *textMatA) const + { + return fontFileA == fontFile && matA[0] == mat[0] && matA[1] == mat[1] && matA[2] == mat[2] && matA[3] == mat[3] && textMatA[0] == textMat[0] && textMatA[1] == textMat[1] && textMatA[2] == textMat[2] && textMatA[3] == textMat[3]; + } + + // Get a glyph - this does a cache lookup first, and if not found, + // creates a new bitmap and adds it to the cache. The and + // values are splashFontFractionBits bits each, representing + // the numerators of fractions in [0, 1), where the denominator is + // splashFontFraction = 1 << splashFontFractionBits. Subclasses + // should override this to zero out xFrac and/or yFrac if they don't + // support fractional coordinates. + virtual bool getGlyph(int c, int xFrac, int yFrac, SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes); + + // Rasterize a glyph. The and values are the same + // as described for getGlyph. + virtual bool makeGlyph(int c, int xFrac, int yFrac, SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) = 0; + + // Return the path for a glyph. + virtual SplashPath *getGlyphPath(int c) = 0; + + // Return the advance of a glyph. (in 0..1 range) + // < 0 means not known + virtual double getGlyphAdvance(int c) { return -1; } + + // Return the font transform matrix. + SplashCoord *getMatrix() { return mat; } + + // Return the glyph bounding box. + void getBBox(int *xMinA, int *yMinA, int *xMaxA, int *yMaxA) + { + *xMinA = xMin; + *yMinA = yMin; + *xMaxA = xMax; + *yMaxA = yMax; + } + +protected: + SplashFontFile *fontFile; + SplashCoord mat[4]; // font transform matrix + // (text space -> device space) + SplashCoord textMat[4]; // text transform matrix + // (text space -> user space) + bool aa; // anti-aliasing + int xMin, yMin, xMax, yMax; // glyph bounding box + unsigned char *cache; // glyph bitmap cache + SplashFontCacheTag * // cache tags + cacheTags; + int glyphW, glyphH; // size of glyph bitmaps + int glyphSize; // size of glyph bitmaps, in bytes + int cacheSets; // number of sets in cache + int cacheAssoc; // cache associativity (glyphs per set) +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashFontEngine.cc b/poppler-24.05.0/splash/SplashFontEngine.cc new file mode 100644 index 0000000000000000000000000000000000000000..fb0d0a1490159626a01ed9bd975146c79733730e --- /dev/null +++ b/poppler-24.05.0/splash/SplashFontEngine.cc @@ -0,0 +1,251 @@ +//======================================================================== +// +// SplashFontEngine.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Takashi Iwai +// Copyright (C) 2009 Petr Gajdos +// Copyright (C) 2009 Kovid Goyal +// Copyright (C) 2009 Albert Astals Cid +// Copyright (C) 2011 Andreas Hartmetz +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2015 Dmytro Morgun +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018 Oliver Sander +// Copyright (C) 2019 Christian Persch +// +// 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 + +#include +#include +#ifdef HAVE_UNISTD_H +# include +#endif +#include + +#include "goo/gmem.h" +#include "goo/GooString.h" +#include "SplashMath.h" +#include "SplashFTFontEngine.h" +#include "SplashFontFile.h" +#include "SplashFontFileID.h" +#include "SplashFont.h" +#include "SplashFontEngine.h" + +//------------------------------------------------------------------------ +// SplashFontEngine +//------------------------------------------------------------------------ + +SplashFontEngine::SplashFontEngine(bool enableFreeType, bool enableFreeTypeHinting, bool enableSlightHinting, bool aa) +{ + std::fill(fontCache.begin(), fontCache.end(), nullptr); + + if (enableFreeType) { + ftEngine = SplashFTFontEngine::init(aa, enableFreeTypeHinting, enableSlightHinting); + } else { + ftEngine = nullptr; + } +} + +SplashFontEngine::~SplashFontEngine() +{ + for (auto font : fontCache) { + delete font; + } + + if (ftEngine) { + delete ftEngine; + } +} + +SplashFontFile *SplashFontEngine::getFontFile(SplashFontFileID *id) +{ + for (auto font : fontCache) { + if (font) { + SplashFontFile *fontFile = font->getFontFile(); + if (fontFile && fontFile->getID()->matches(id)) { + return fontFile; + } + } + } + return nullptr; +} + +SplashFontFile *SplashFontEngine::loadType1Font(SplashFontFileID *idA, SplashFontSrc *src, const char **enc) +{ + SplashFontFile *fontFile = nullptr; + + if (ftEngine) { + fontFile = ftEngine->loadType1Font(idA, src, enc); + } + + // delete the (temporary) font file -- with Unix hard link + // semantics, this will remove the last link; otherwise it will + // return an error, leaving the file to be deleted later (if + // loadXYZFont failed, the file will always be deleted) + if (src->isFile) { + src->unref(); + } + + return fontFile; +} + +SplashFontFile *SplashFontEngine::loadType1CFont(SplashFontFileID *idA, SplashFontSrc *src, const char **enc) +{ + SplashFontFile *fontFile = nullptr; + + if (ftEngine) { + fontFile = ftEngine->loadType1CFont(idA, src, enc); + } + + // delete the (temporary) font file -- with Unix hard link + // semantics, this will remove the last link; otherwise it will + // return an error, leaving the file to be deleted later (if + // loadXYZFont failed, the file will always be deleted) + if (src->isFile) { + src->unref(); + } + + return fontFile; +} + +SplashFontFile *SplashFontEngine::loadOpenTypeT1CFont(SplashFontFileID *idA, SplashFontSrc *src, const char **enc) +{ + SplashFontFile *fontFile = nullptr; + + if (ftEngine) { + fontFile = ftEngine->loadOpenTypeT1CFont(idA, src, enc); + } + + // delete the (temporary) font file -- with Unix hard link + // semantics, this will remove the last link; otherwise it will + // return an error, leaving the file to be deleted later (if + // loadXYZFont failed, the file will always be deleted) + if (src->isFile) { + src->unref(); + } + + return fontFile; +} + +SplashFontFile *SplashFontEngine::loadCIDFont(SplashFontFileID *idA, SplashFontSrc *src) +{ + SplashFontFile *fontFile = nullptr; + + if (ftEngine) { + fontFile = ftEngine->loadCIDFont(idA, src); + } + + // delete the (temporary) font file -- with Unix hard link + // semantics, this will remove the last link; otherwise it will + // return an error, leaving the file to be deleted later (if + // loadXYZFont failed, the file will always be deleted) + if (src->isFile) { + src->unref(); + } + + return fontFile; +} + +SplashFontFile *SplashFontEngine::loadOpenTypeCFFFont(SplashFontFileID *idA, SplashFontSrc *src, int *codeToGID, int codeToGIDLen) +{ + SplashFontFile *fontFile = nullptr; + + if (ftEngine) { + fontFile = ftEngine->loadOpenTypeCFFFont(idA, src, codeToGID, codeToGIDLen); + } + + // delete the (temporary) font file -- with Unix hard link + // semantics, this will remove the last link; otherwise it will + // return an error, leaving the file to be deleted later (if + // loadXYZFont failed, the file will always be deleted) + if (src->isFile) { + src->unref(); + } + + return fontFile; +} + +SplashFontFile *SplashFontEngine::loadTrueTypeFont(SplashFontFileID *idA, SplashFontSrc *src, int *codeToGID, int codeToGIDLen, int faceIndex) +{ + SplashFontFile *fontFile = nullptr; + + if (ftEngine) { + fontFile = ftEngine->loadTrueTypeFont(idA, src, codeToGID, codeToGIDLen, faceIndex); + } + + if (!fontFile) { + gfree(codeToGID); + } + + // delete the (temporary) font file -- with Unix hard link + // semantics, this will remove the last link; otherwise it will + // return an error, leaving the file to be deleted later (if + // loadXYZFont failed, the file will always be deleted) + if (src->isFile) { + src->unref(); + } + + return fontFile; +} + +bool SplashFontEngine::getAA() +{ + return (ftEngine == nullptr) ? false : ftEngine->getAA(); +} + +void SplashFontEngine::setAA(bool aa) +{ + if (ftEngine != nullptr) { + ftEngine->setAA(aa); + } +} + +SplashFont *SplashFontEngine::getFont(SplashFontFile *fontFile, const SplashCoord *textMat, const SplashCoord *ctm) +{ + SplashCoord mat[4]; + + mat[0] = textMat[0] * ctm[0] + textMat[1] * ctm[2]; + mat[1] = -(textMat[0] * ctm[1] + textMat[1] * ctm[3]); + mat[2] = textMat[2] * ctm[0] + textMat[3] * ctm[2]; + mat[3] = -(textMat[2] * ctm[1] + textMat[3] * ctm[3]); + if (!splashCheckDet(mat[0], mat[1], mat[2], mat[3], 0.01)) { + // avoid a singular (or close-to-singular) matrix + mat[0] = 0.01; + mat[1] = 0; + mat[2] = 0; + mat[3] = 0.01; + } + + // Try to find the font in the cache + auto fontIt = std::find_if(fontCache.begin(), fontCache.end(), [&](const SplashFont *font) { return font && font->matches(fontFile, mat, textMat); }); + + // The requested font has been found in the cache + if (fontIt != fontCache.end()) { + std::rotate(fontCache.begin(), fontIt, fontIt + 1); + return fontCache[0]; + } + + // The requested font has not been found in the cache + auto newFont = fontFile->makeFont(mat, textMat); + if (fontCache.back()) { + delete fontCache.back(); + } + std::rotate(fontCache.begin(), fontCache.end() - 1, fontCache.end()); + + fontCache[0] = newFont; + return fontCache[0]; +} diff --git a/poppler-24.05.0/splash/SplashFontEngine.h b/poppler-24.05.0/splash/SplashFontEngine.h new file mode 100644 index 0000000000000000000000000000000000000000..3e5458c09374658a65ce99a0e58dd6e3749ba2d3 --- /dev/null +++ b/poppler-24.05.0/splash/SplashFontEngine.h @@ -0,0 +1,89 @@ +//======================================================================== +// +// SplashFontEngine.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Takashi Iwai +// Copyright (C) 2009 Petr Gajdos +// Copyright (C) 2009, 2011, 2018 Albert Astals Cid +// Copyright (C) 2011 Andreas Hartmetz +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018 Oliver Sander +// +// 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 +// +//======================================================================== + +#ifndef SPLASHFONTENGINE_H +#define SPLASHFONTENGINE_H + +#include + +#include "SplashTypes.h" +#include "poppler_private_export.h" + +class SplashT1FontEngine; +class SplashFTFontEngine; +class SplashDTFontEngine; +class SplashDT4FontEngine; +class SplashFontFile; +class SplashFontFileID; +class SplashFont; +class SplashFontSrc; + +//------------------------------------------------------------------------ +// SplashFontEngine +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT SplashFontEngine +{ +public: + // Create a font engine. + SplashFontEngine(bool enableFreeType, bool enableFreeTypeHinting, bool enableSlightHinting, bool aa); + + ~SplashFontEngine(); + + SplashFontEngine(const SplashFontEngine &) = delete; + SplashFontEngine &operator=(const SplashFontEngine &) = delete; + + // Get a font file from the cache. Returns NULL if there is no + // matching entry in the cache. + SplashFontFile *getFontFile(SplashFontFileID *id); + + // Load fonts - these create new SplashFontFile objects. + SplashFontFile *loadType1Font(SplashFontFileID *idA, SplashFontSrc *src, const char **enc); + SplashFontFile *loadType1CFont(SplashFontFileID *idA, SplashFontSrc *src, const char **enc); + SplashFontFile *loadOpenTypeT1CFont(SplashFontFileID *idA, SplashFontSrc *src, const char **enc); + SplashFontFile *loadCIDFont(SplashFontFileID *idA, SplashFontSrc *src); + SplashFontFile *loadOpenTypeCFFFont(SplashFontFileID *idA, SplashFontSrc *src, int *codeToGID, int codeToGIDLen); + SplashFontFile *loadTrueTypeFont(SplashFontFileID *idA, SplashFontSrc *src, int *codeToGID, int codeToGIDLen, int faceIndex = 0); + + // Get a font - this does a cache lookup first, and if not found, + // creates a new SplashFont object and adds it to the cache. The + // matrix, mat = textMat * ctm: + // [ mat[0] mat[1] ] + // [ mat[2] mat[3] ] + // specifies the font transform in PostScript style: + // [x' y'] = [x y] * mat + // Note that the Splash y axis points downward. + SplashFont *getFont(SplashFontFile *fontFile, const SplashCoord *textMat, const SplashCoord *ctm); + bool getAA(); + void setAA(bool aa); + +private: + std::array fontCache; + + SplashFTFontEngine *ftEngine; +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashFontFile.cc b/poppler-24.05.0/splash/SplashFontFile.cc new file mode 100644 index 0000000000000000000000000000000000000000..c3eace4b7802703fbc6d73cd356e1bdf9ec52087 --- /dev/null +++ b/poppler-24.05.0/splash/SplashFontFile.cc @@ -0,0 +1,98 @@ +//======================================================================== +// +// SplashFontFile.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Takashi Iwai +// Copyright (C) 2008, 2022 Albert Astals Cid +// Copyright (C) 2019 Christian Persch +// Copyright (C) 2022 Oliver Sander +// +// 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 + +#include +#ifdef HAVE_UNISTD_H +# include +#endif +#include "goo/gmem.h" +#include "goo/GooString.h" +#include "SplashFontFile.h" +#include "SplashFontFileID.h" + +//------------------------------------------------------------------------ +// SplashFontFile +//------------------------------------------------------------------------ + +SplashFontFile::SplashFontFile(SplashFontFileID *idA, SplashFontSrc *srcA) +{ + id = idA; + src = srcA; + src->ref(); + refCnt = 0; + doAdjustMatrix = false; +} + +SplashFontFile::~SplashFontFile() +{ + src->unref(); + delete id; +} + +void SplashFontFile::incRefCnt() +{ + ++refCnt; +} + +void SplashFontFile::decRefCnt() +{ + if (!--refCnt) { + delete this; + } +} + +// + +SplashFontSrc::SplashFontSrc() +{ + isFile = false; + refcnt = 1; +} + +SplashFontSrc::~SplashFontSrc() = default; + +void SplashFontSrc::ref() +{ + refcnt++; +} + +void SplashFontSrc::unref() +{ + if (!--refcnt) { + delete this; + } +} + +void SplashFontSrc::setFile(const std::string &file) +{ + isFile = true; + fileName = file; +} + +void SplashFontSrc::setBuf(std::vector &&bufA) +{ + isFile = false; + buf = std::move(bufA); +} diff --git a/poppler-24.05.0/splash/SplashFontFile.h b/poppler-24.05.0/splash/SplashFontFile.h new file mode 100644 index 0000000000000000000000000000000000000000..7f55fdf01ad21c2376b7dc71d13db65cdd398d27 --- /dev/null +++ b/poppler-24.05.0/splash/SplashFontFile.h @@ -0,0 +1,98 @@ +//======================================================================== +// +// SplashFontFile.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Takashi Iwai +// Copyright (C) 2008, 2010, 2018 Albert Astals Cid +// Copyright (C) 2022 Oliver Sander +// +// 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 +// +//======================================================================== + +#ifndef SPLASHFONTFILE_H +#define SPLASHFONTFILE_H + +#include +#include + +#include "SplashTypes.h" +#include "poppler_private_export.h" + +class SplashFontEngine; +class SplashFont; +class SplashFontFileID; + +//------------------------------------------------------------------------ +// SplashFontFile +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT SplashFontSrc +{ +public: + SplashFontSrc(); + + SplashFontSrc(const SplashFontSrc &) = delete; + SplashFontSrc &operator=(const SplashFontSrc &) = delete; + + void setFile(const std::string &file); + void setBuf(char *bufA, int buflenA); + void setBuf(std::vector &&bufA); + + void ref(); + void unref(); + + bool isFile; + std::string fileName; + std::vector buf; + +private: + ~SplashFontSrc(); + int refcnt; +}; + +class SplashFontFile +{ +public: + virtual ~SplashFontFile(); + + SplashFontFile(const SplashFontFile &) = delete; + SplashFontFile &operator=(const SplashFontFile &) = delete; + + // Create a new SplashFont, i.e., a scaled instance of this font + // file. + virtual SplashFont *makeFont(SplashCoord *mat, const SplashCoord *textMat) = 0; + + // Get the font file ID. + SplashFontFileID *getID() { return id; } + + // Increment the reference count. + void incRefCnt(); + + // Decrement the reference count. If the new value is zero, delete + // the SplashFontFile object. + void decRefCnt(); + + bool doAdjustMatrix; + +protected: + SplashFontFile(SplashFontFileID *idA, SplashFontSrc *srcA); + + SplashFontFileID *id; + SplashFontSrc *src; + int refCnt; + + friend class SplashFontEngine; +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashFontFileID.cc b/poppler-24.05.0/splash/SplashFontFileID.cc new file mode 100644 index 0000000000000000000000000000000000000000..6eb296c45249e0d9583300a3b162b3216402b922 --- /dev/null +++ b/poppler-24.05.0/splash/SplashFontFileID.cc @@ -0,0 +1,17 @@ +//======================================================================== +// +// SplashFontFileID.cc +// +//======================================================================== + +#include + +#include "SplashFontFileID.h" + +//------------------------------------------------------------------------ +// SplashFontFileID +//------------------------------------------------------------------------ + +SplashFontFileID::SplashFontFileID() { } + +SplashFontFileID::~SplashFontFileID() { } diff --git a/poppler-24.05.0/splash/SplashFontFileID.h b/poppler-24.05.0/splash/SplashFontFileID.h new file mode 100644 index 0000000000000000000000000000000000000000..c127dd87f1d4a011c3a311518693ec292dea7dd4 --- /dev/null +++ b/poppler-24.05.0/splash/SplashFontFileID.h @@ -0,0 +1,40 @@ +//======================================================================== +// +// SplashFontFileID.h +// +//======================================================================== + +//======================================================================== +// +// 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 +// +// 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 +// +//======================================================================== + +#ifndef SPLASHFONTFILEID_H +#define SPLASHFONTFILEID_H + +#include "poppler_private_export.h" + +//------------------------------------------------------------------------ +// SplashFontFileID +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT SplashFontFileID +{ +public: + SplashFontFileID(); + virtual ~SplashFontFileID(); + SplashFontFileID(const SplashFontFileID &) = delete; + SplashFontFileID &operator=(const SplashFontFileID &) = delete; + virtual bool matches(SplashFontFileID *id) = 0; +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashGlyphBitmap.h b/poppler-24.05.0/splash/SplashGlyphBitmap.h new file mode 100644 index 0000000000000000000000000000000000000000..a091941206f0b62d0a59948c93cca8975e3b6eb4 --- /dev/null +++ b/poppler-24.05.0/splash/SplashGlyphBitmap.h @@ -0,0 +1,23 @@ +//======================================================================== +// +// SplashGlyphBitmap.h +// +//======================================================================== + +#ifndef SPLASHGLYPHBITMAP_H +#define SPLASHGLYPHBITMAP_H + +//------------------------------------------------------------------------ +// SplashGlyphBitmap +//------------------------------------------------------------------------ + +struct SplashGlyphBitmap +{ + int x, y, w, h; // offset and size of glyph + bool aa; // anti-aliased: true means 8-bit alpha + // bitmap; false means 1-bit + unsigned char *data; // bitmap data + bool freeData; // true if data memory should be freed +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashMath.h b/poppler-24.05.0/splash/SplashMath.h new file mode 100644 index 0000000000000000000000000000000000000000..5c076563327565fb43ab2b11a5b45215ffdb275e --- /dev/null +++ b/poppler-24.05.0/splash/SplashMath.h @@ -0,0 +1,215 @@ +//======================================================================== +// +// SplashMath.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2009-2011 Albert Astals Cid +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2020 Jean Ghali +// +// 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 +// +//======================================================================== + +#ifndef SPLASHMATH_H +#define SPLASHMATH_H + +#include "poppler-config.h" + +#include +#include "SplashTypes.h" + +static inline SplashCoord splashAbs(SplashCoord x) +{ +#if defined(USE_FLOAT) + return fabsf(x); +#else + return fabs(x); +#endif +} + +static inline int splashFloor(SplashCoord x) +{ +#if defined(USE_FLOAT) + return (int)floorf(x); +#elif defined(__GNUC__) && defined(__i386__) + // floor() and (int)() are implemented separately, which results + // in changing the FPCW multiple times - so we optimize it with + // some inline assembly + unsigned short oldCW, newCW, t; + int result; + + __asm__ volatile("fldl %4\n" + "fnstcw %0\n" + "movw %0, %3\n" + "andw $0xf3ff, %3\n" + "orw $0x0400, %3\n" + "movw %3, %1\n" // round down + "fldcw %1\n" + "fistpl %2\n" + "fldcw %0\n" + : "=m"(oldCW), "=m"(newCW), "=m"(result), "=r"(t) + : "m"(x)); + return result; +#elif defined(_WIN32) && defined(_M_IX86) + // floor() and (int)() are implemented separately, which results + // in changing the FPCW multiple times - so we optimize it with + // some inline assembly + unsigned short oldCW, newCW; + int result; + + __asm fld QWORD PTR x; + __asm fnstcw WORD PTR oldCW; + __asm mov ax, WORD PTR oldCW; + __asm and ax, 0xf3ff; + __asm or ax, 0x0400; + __asm mov WORD PTR newCW, ax; // round down + __asm fldcw WORD PTR newCW; + __asm fistp DWORD PTR result; + __asm fldcw WORD PTR oldCW; + return result; +#else + if (x > 0) { + return (int)x; + } else { + return (int)floor(x); + } +#endif +} + +static inline int splashCeil(SplashCoord x) +{ +#if defined(USE_FLOAT) + return (int)ceilf(x); +#elif defined(__GNUC__) && defined(__i386__) + // ceil() and (int)() are implemented separately, which results + // in changing the FPCW multiple times - so we optimize it with + // some inline assembly + unsigned short oldCW, newCW, t; + int result; + + __asm__ volatile("fldl %4\n" + "fnstcw %0\n" + "movw %0, %3\n" + "andw $0xf3ff, %3\n" + "orw $0x0800, %3\n" + "movw %3, %1\n" // round up + "fldcw %1\n" + "fistpl %2\n" + "fldcw %0\n" + : "=m"(oldCW), "=m"(newCW), "=m"(result), "=r"(t) + : "m"(x)); + return result; +#elif defined(_WIN32) && defined(_M_IX86) + // ceil() and (int)() are implemented separately, which results + // in changing the FPCW multiple times - so we optimize it with + // some inline assembly + unsigned short oldCW, newCW; + int result; + + __asm fld QWORD PTR x; + __asm fnstcw WORD PTR oldCW; + __asm mov ax, WORD PTR oldCW; + __asm and ax, 0xf3ff; + __asm or ax, 0x0800; + __asm mov WORD PTR newCW, ax; // round up + __asm fldcw WORD PTR newCW; + __asm fistp DWORD PTR result; + __asm fldcw WORD PTR oldCW; + return result; +#else + return (int)ceil(x); +#endif +} + +static inline int splashRound(SplashCoord x) +{ +#if defined(__GNUC__) && defined(__i386__) + // this could use round-to-nearest mode and avoid the "+0.5", + // but that produces slightly different results (because i+0.5 + // sometimes rounds up and sometimes down using the even rule) + unsigned short oldCW, newCW, t; + int result; + + x += 0.5; + __asm__ volatile("fldl %4\n" + "fnstcw %0\n" + "movw %0, %3\n" + "andw $0xf3ff, %3\n" + "orw $0x0400, %3\n" + "movw %3, %1\n" // round down + "fldcw %1\n" + "fistpl %2\n" + "fldcw %0\n" + : "=m"(oldCW), "=m"(newCW), "=m"(result), "=r"(t) + : "m"(x)); + return result; +#elif defined(_WIN32) && defined(_M_IX86) + // this could use round-to-nearest mode and avoid the "+0.5", + // but that produces slightly different results (because i+0.5 + // sometimes rounds up and sometimes down using the even rule) + unsigned short oldCW, newCW; + int result; + + x += 0.5; + __asm fld QWORD PTR x; + __asm fnstcw WORD PTR oldCW; + __asm mov ax, WORD PTR oldCW; + __asm and ax, 0xf3ff; + __asm or ax, 0x0400; + __asm mov WORD PTR newCW, ax; // round down + __asm fldcw WORD PTR newCW; + __asm fistp DWORD PTR result; + __asm fldcw WORD PTR oldCW; + return result; +#else + return (int)splashFloor(x + 0.5); +#endif +} + +static inline SplashCoord splashAvg(SplashCoord x, SplashCoord y) +{ + return 0.5 * (x + y); +} + +static inline SplashCoord splashSqrt(SplashCoord x) +{ +#if defined(USE_FLOAT) + return sqrtf(x); +#else + return sqrt(x); +#endif +} + +static inline SplashCoord splashPow(SplashCoord x, SplashCoord y) +{ +#if defined(USE_FLOAT) + return powf(x, y); +#else + return pow(x, y); +#endif +} + +static inline SplashCoord splashDist(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1) +{ + SplashCoord dx, dy; + dx = x1 - x0; + dy = y1 - y0; + return splashSqrt(dx * dx + dy * dy); +} + +static inline bool splashCheckDet(SplashCoord m11, SplashCoord m12, SplashCoord m21, SplashCoord m22, SplashCoord epsilon) +{ + return fabs(m11 * m22 - m12 * m21) >= epsilon; +} + +#endif diff --git a/poppler-24.05.0/splash/SplashPath.cc b/poppler-24.05.0/splash/SplashPath.cc new file mode 100644 index 0000000000000000000000000000000000000000..442b6d41f28f4075247efcf7540c89a876f9010f --- /dev/null +++ b/poppler-24.05.0/splash/SplashPath.cc @@ -0,0 +1,230 @@ +//======================================================================== +// +// SplashPath.cc +// +//======================================================================== + +//======================================================================== +// +// 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 Stefan Brüns +// Copyright (C) 2018-2021 Albert Astals Cid +// Copyright (C) 2018 Adam Reichold +// +// 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 + +#include +#include "goo/gmem.h" +#include "goo/GooLikely.h" +#include "SplashErrorCodes.h" +#include "SplashPath.h" + +//------------------------------------------------------------------------ +// SplashPath +//------------------------------------------------------------------------ + +// A path can be in three possible states: +// +// 1. no current point -- zero or more finished subpaths +// [curSubpath == length] +// +// 2. one point in subpath +// [curSubpath == length - 1] +// +// 3. open subpath with two or more points +// [curSubpath < length - 1] + +SplashPath::SplashPath() +{ + pts = nullptr; + flags = nullptr; + length = size = 0; + curSubpath = 0; + hints = nullptr; + hintsLength = hintsSize = 0; +} + +SplashPath::SplashPath(SplashPath &&path) noexcept +{ + length = path.length; + size = path.size; + pts = path.pts; + flags = path.flags; + curSubpath = path.curSubpath; + + hints = path.hints; + hintsLength = hintsSize = path.hintsLength; + + path.pts = nullptr; + path.flags = nullptr; + path.length = path.size = 0; + path.hints = nullptr; + path.hintsLength = path.hintsSize = 0; +} + +SplashPath::~SplashPath() +{ + gfree(pts); + gfree(flags); + gfree(hints); +} + +void SplashPath::reserve(int nPts) +{ + grow(nPts - size); +} + +// Add space for more points. +void SplashPath::grow(int nPts) +{ + if (length + nPts > size) { + if (size == 0) { + size = 32; + } + while (size < length + nPts) { + size *= 2; + } + pts = (SplashPathPoint *)greallocn_checkoverflow(pts, size, sizeof(SplashPathPoint)); + flags = (unsigned char *)greallocn_checkoverflow(flags, size, sizeof(unsigned char)); + if (unlikely(!pts || !flags)) { + length = size = curSubpath = 0; + } + } +} + +void SplashPath::append(SplashPath *path) +{ + int i; + + grow(path->length); + if (unlikely(size == 0)) { + return; + } + + curSubpath = length + path->curSubpath; + for (i = 0; i < path->length; ++i) { + pts[length] = path->pts[i]; + flags[length] = path->flags[i]; + ++length; + } +} + +SplashError SplashPath::moveTo(SplashCoord x, SplashCoord y) +{ + if (onePointSubpath()) { + return splashErrBogusPath; + } + grow(1); + if (unlikely(size == 0)) { + return splashErrBogusPath; + } + pts[length].x = x; + pts[length].y = y; + flags[length] = splashPathFirst | splashPathLast; + curSubpath = length++; + return splashOk; +} + +SplashError SplashPath::lineTo(SplashCoord x, SplashCoord y) +{ + if (noCurrentPoint()) { + return splashErrNoCurPt; + } + flags[length - 1] &= ~splashPathLast; + grow(1); + if (unlikely(size == 0)) { + return splashErrBogusPath; + } + pts[length].x = x; + pts[length].y = y; + flags[length] = splashPathLast; + ++length; + return splashOk; +} + +SplashError SplashPath::curveTo(SplashCoord x1, SplashCoord y1, SplashCoord x2, SplashCoord y2, SplashCoord x3, SplashCoord y3) +{ + if (noCurrentPoint()) { + return splashErrNoCurPt; + } + flags[length - 1] &= ~splashPathLast; + grow(3); + if (unlikely(size == 0)) { + return splashErrBogusPath; + } + pts[length].x = x1; + pts[length].y = y1; + flags[length] = splashPathCurve; + ++length; + pts[length].x = x2; + pts[length].y = y2; + flags[length] = splashPathCurve; + ++length; + pts[length].x = x3; + pts[length].y = y3; + flags[length] = splashPathLast; + ++length; + return splashOk; +} + +SplashError SplashPath::close(bool force) +{ + if (noCurrentPoint()) { + return splashErrNoCurPt; + } + if (force || curSubpath == length - 1 || pts[length - 1].x != pts[curSubpath].x || pts[length - 1].y != pts[curSubpath].y) { + const auto lineToStatus = lineTo(pts[curSubpath].x, pts[curSubpath].y); + if (lineToStatus != splashOk) { + return lineToStatus; + } + } + flags[curSubpath] |= splashPathClosed; + flags[length - 1] |= splashPathClosed; + curSubpath = length; + return splashOk; +} + +void SplashPath::addStrokeAdjustHint(int ctrl0, int ctrl1, int firstPt, int lastPt) +{ + if (hintsLength == hintsSize) { + hintsSize = hintsLength ? 2 * hintsLength : 8; + hints = (SplashPathHint *)greallocn_checkoverflow(hints, hintsSize, sizeof(SplashPathHint)); + } + if (unlikely(!hints)) { + return; + } + hints[hintsLength].ctrl0 = ctrl0; + hints[hintsLength].ctrl1 = ctrl1; + hints[hintsLength].firstPt = firstPt; + hints[hintsLength].lastPt = lastPt; + ++hintsLength; +} + +void SplashPath::offset(SplashCoord dx, SplashCoord dy) +{ + int i; + + for (i = 0; i < length; ++i) { + pts[i].x += dx; + pts[i].y += dy; + } +} + +bool SplashPath::getCurPt(SplashCoord *x, SplashCoord *y) +{ + if (noCurrentPoint()) { + return false; + } + *x = pts[length - 1].x; + *y = pts[length - 1].y; + return true; +} diff --git a/poppler-24.05.0/splash/SplashPath.h b/poppler-24.05.0/splash/SplashPath.h new file mode 100644 index 0000000000000000000000000000000000000000..815e48a73e802db957d50fd3abc9503a434cea56 --- /dev/null +++ b/poppler-24.05.0/splash/SplashPath.h @@ -0,0 +1,138 @@ +//======================================================================== +// +// SplashPath.h +// +//======================================================================== + +//======================================================================== +// +// 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, 2019, 2021 Albert Astals Cid +// Copyright (C) 2018 Stefan Brüns +// +// 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 +// +//======================================================================== + +#ifndef SPLASHPATH_H +#define SPLASHPATH_H + +#include "SplashTypes.h" +#include "poppler_private_export.h" + +//------------------------------------------------------------------------ +// SplashPathPoint +//------------------------------------------------------------------------ + +struct SplashPathPoint +{ + SplashCoord x, y; +}; + +//------------------------------------------------------------------------ +// SplashPath.flags +//------------------------------------------------------------------------ + +// first point on each subpath sets this flag +#define splashPathFirst 0x01 + +// last point on each subpath sets this flag +#define splashPathLast 0x02 + +// if the subpath is closed, its first and last points must be +// identical, and must set this flag +#define splashPathClosed 0x04 + +// curve control points set this flag +#define splashPathCurve 0x08 + +//------------------------------------------------------------------------ +// SplashPathHint +//------------------------------------------------------------------------ + +struct SplashPathHint +{ + int ctrl0, ctrl1; + int firstPt, lastPt; +}; + +//------------------------------------------------------------------------ +// SplashPath +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT SplashPath +{ +public: + // Create an empty path. + SplashPath(); + ~SplashPath(); + + SplashPath(const SplashPath &) = delete; + SplashPath &operator=(const SplashPath &) = delete; + SplashPath(SplashPath &&path) noexcept; + + // Append to . + void append(SplashPath *path); + + // Start a new subpath. + SplashError moveTo(SplashCoord x, SplashCoord y); + + // Add a line segment to the last subpath. + SplashError lineTo(SplashCoord x, SplashCoord y); + + // Add a third-order (cubic) Bezier curve segment to the last + // subpath. + SplashError curveTo(SplashCoord x1, SplashCoord y1, SplashCoord x2, SplashCoord y2, SplashCoord x3, SplashCoord y3); + + // Close the last subpath, adding a line segment if necessary. If + // is true, this adds a line segment even if the current + // point is equal to the first point in the subpath. + SplashError close(bool force = false); + + // Add a stroke adjustment hint. The controlling segments are + // and (where segments are identified by their first + // point), and the points to be adjusted are .. . + void addStrokeAdjustHint(int ctrl0, int ctrl1, int firstPt, int lastPt); + + // Add (, ) to every point on this path. + void offset(SplashCoord dx, SplashCoord dy); + + // Get the points on the path. + int getLength() { return length; } + void getPoint(int i, double *x, double *y, unsigned char *f) + { + *x = pts[i].x; + *y = pts[i].y; + *f = flags[i]; + } + + // Get the current point. + bool getCurPt(SplashCoord *x, SplashCoord *y); + + // Reserve space for at least n points + void reserve(int n); + +protected: + void grow(int nPts); + bool noCurrentPoint() { return curSubpath == length; } + bool onePointSubpath() { return curSubpath == length - 1; } + bool openSubpath() { return curSubpath < length - 1; } + + SplashPathPoint *pts; // array of points + unsigned char *flags; // array of flags + int length, size; // length/size of the pts and flags arrays + int curSubpath; // index of first point in last subpath + + SplashPathHint *hints; // list of hints + int hintsLength, hintsSize; + + friend class SplashXPath; + friend class Splash; +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashPattern.cc b/poppler-24.05.0/splash/SplashPattern.cc new file mode 100644 index 0000000000000000000000000000000000000000..0dae246867c4993dfdcfb17dbacb6f78a03c6b59 --- /dev/null +++ b/poppler-24.05.0/splash/SplashPattern.cc @@ -0,0 +1,57 @@ +//======================================================================== +// +// SplashPattern.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2010, 2011 Thomas Freitag +// Copyright (C) 2020, 2021 Albert Astals Cid +// +// 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 + +#include "SplashMath.h" +#include "SplashScreen.h" +#include "SplashPattern.h" + +//------------------------------------------------------------------------ +// SplashPattern +//------------------------------------------------------------------------ + +SplashPattern::SplashPattern() { } + +SplashPattern::~SplashPattern() { } + +//------------------------------------------------------------------------ +// SplashSolidColor +//------------------------------------------------------------------------ + +SplashSolidColor::SplashSolidColor(SplashColorConstPtr colorA) +{ + splashColorCopy(color, colorA); +} + +SplashSolidColor::~SplashSolidColor() { } + +bool SplashSolidColor::getColor(int x, int y, SplashColorPtr c) +{ + splashColorCopy(c, color); + return true; +} + +//------------------------------------------------------------------------ +// SplashGouraudColor +//------------------------------------------------------------------------ + +SplashGouraudColor::~SplashGouraudColor() = default; diff --git a/poppler-24.05.0/splash/SplashPattern.h b/poppler-24.05.0/splash/SplashPattern.h new file mode 100644 index 0000000000000000000000000000000000000000..2a50aa8249ce2f17ac2efe96175a24c1a2a0ccd4 --- /dev/null +++ b/poppler-24.05.0/splash/SplashPattern.h @@ -0,0 +1,107 @@ +//======================================================================== +// +// SplashPattern.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2010, 2011, 2014 Thomas Freitag +// Copyright (C) 2018, 2020, 2021 Albert Astals Cid +// +// 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 +// +//======================================================================== + +#ifndef SPLASHPATTERN_H +#define SPLASHPATTERN_H + +#include "SplashTypes.h" +#include "poppler_private_export.h" + +class SplashScreen; + +//------------------------------------------------------------------------ +// SplashPattern +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT SplashPattern +{ +public: + SplashPattern(); + + virtual SplashPattern *copy() const = 0; + + virtual ~SplashPattern(); + + SplashPattern(const SplashPattern &) = delete; + SplashPattern &operator=(const SplashPattern &) = delete; + + // Return the color value for a specific pixel. + virtual bool getColor(int x, int y, SplashColorPtr c) = 0; + + // Test if x,y-position is inside pattern. + virtual bool testPosition(int x, int y) = 0; + + // Returns true if this pattern object will return the same color + // value for all pixels. + virtual bool isStatic() = 0; + + // Returns true if this pattern colorspace is CMYK. + virtual bool isCMYK() = 0; + +private: +}; + +//------------------------------------------------------------------------ +// SplashSolidColor +//------------------------------------------------------------------------ + +class POPPLER_PRIVATE_EXPORT SplashSolidColor : public SplashPattern +{ +public: + explicit SplashSolidColor(SplashColorConstPtr colorA); + + SplashPattern *copy() const override { return new SplashSolidColor(color); } + + ~SplashSolidColor() override; + + bool getColor(int x, int y, SplashColorPtr c) override; + + bool testPosition(int x, int y) override { return false; } + + bool isStatic() override { return true; } + + bool isCMYK() override { return false; } + +private: + SplashColor color; +}; + +//------------------------------------------------------------------------ +// SplashGouraudColor (needed for gouraudTriangleShadedFill) +//------------------------------------------------------------------------ + +class SplashGouraudColor : public SplashPattern +{ +public: + ~SplashGouraudColor() override; + + virtual bool isParameterized() = 0; + + virtual int getNTriangles() = 0; + + virtual void getParametrizedTriangle(int i, double *x0, double *y0, double *color0, double *x1, double *y1, double *color1, double *x2, double *y2, double *color2) = 0; + + virtual void getNonParametrizedTriangle(int i, SplashColorMode mode, double *x0, double *y0, SplashColorPtr color0, double *x1, double *y1, SplashColorPtr color1, double *x2, double *y2, SplashColorPtr color2) = 0; + + virtual void getParameterizedColor(double t, SplashColorMode mode, SplashColorPtr c) = 0; +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashScreen.cc b/poppler-24.05.0/splash/SplashScreen.cc new file mode 100644 index 0000000000000000000000000000000000000000..a07126a4c0e5710efa77f4667a9905b1b340cf27 --- /dev/null +++ b/poppler-24.05.0/splash/SplashScreen.cc @@ -0,0 +1,386 @@ +//======================================================================== +// +// SplashScreen.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2009, 2016, 2018, 2020, 2021 Albert Astals Cid +// Copyright (C) 2012 Fabio D'Urso +// +// 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 + +#include +#include +#include +#include "goo/gmem.h" +#include "goo/grandom.h" +#include "goo/GooLikely.h" +#include "SplashMath.h" +#include "SplashScreen.h" + +static const SplashScreenParams defaultParams = { + splashScreenDispersed, // type + 2, // size + 2, // dotRadius + 1.0, // gamma + 0.0, // blackThreshold + 1.0 // whiteThreshold +}; + +//------------------------------------------------------------------------ + +struct SplashScreenPoint +{ + int x, y; + int dist; +}; + +struct cmpDistancesFunctor +{ + bool operator()(const SplashScreenPoint p0, const SplashScreenPoint p1) { return p0.dist < p1.dist; } +}; + +//------------------------------------------------------------------------ +// SplashScreen +//------------------------------------------------------------------------ + +// If is true, this generates a 45 degree screen using a +// circular dot spot function. DPI = resolution / ((size / 2) * +// sqrt(2)). If is false, this generates an optimal +// threshold matrix using recursive tesselation. Gamma correction +// (gamma = 1 / 1.33) is also computed here. +SplashScreen::SplashScreen(const SplashScreenParams *params) +{ + + if (!params) { + params = &defaultParams; + } + + screenParams = params; + mat = nullptr; + size = 0; + maxVal = 0; + minVal = 0; +} + +void SplashScreen::createMatrix() +{ + unsigned char u; + int black, white, i; + + const SplashScreenParams *params = screenParams; + + // size must be a power of 2, and at least 2 + for (size = 2, log2Size = 1; size < params->size; size <<= 1, ++log2Size) { + ; + } + + switch (params->type) { + + case splashScreenDispersed: + mat = (unsigned char *)gmallocn(size * size, sizeof(unsigned char)); + buildDispersedMatrix(size / 2, size / 2, 1, size / 2, 1); + break; + + case splashScreenClustered: + mat = (unsigned char *)gmallocn(size * size, sizeof(unsigned char)); + buildClusteredMatrix(); + break; + + case splashScreenStochasticClustered: + // size must be at least 2*r + while (size < (params->dotRadius << 1)) { + size <<= 1; + ++log2Size; + } + mat = (unsigned char *)gmallocn(size * size, sizeof(unsigned char)); + buildSCDMatrix(params->dotRadius); + break; + } + + sizeM1 = size - 1; + + // do gamma correction and compute minVal/maxVal + minVal = 255; + maxVal = 0; + black = splashRound((SplashCoord)255.0 * params->blackThreshold); + if (black < 1) { + black = 1; + } + int whiteAux = splashRound((SplashCoord)255.0 * params->whiteThreshold); + if (whiteAux > 255) { + white = 255; + } else { + white = whiteAux; + } + for (i = 0; i < size * size; ++i) { + u = splashRound((SplashCoord)255.0 * splashPow((SplashCoord)mat[i] / 255.0, params->gamma)); + if (u < black) { + u = (unsigned char)black; + } else if (u >= white) { + u = (unsigned char)white; + } + mat[i] = u; + if (u < minVal) { + minVal = u; + } else if (u > maxVal) { + maxVal = u; + } + } +} + +void SplashScreen::buildDispersedMatrix(int i, int j, int val, int delta, int offset) +{ + if (delta == 0) { + // map values in [1, size^2] --> [1, 255] + mat[(i << log2Size) + j] = 1 + (254 * (val - 1)) / (size * size - 1); + } else { + buildDispersedMatrix(i, j, val, delta / 2, 4 * offset); + buildDispersedMatrix((i + delta) % size, (j + delta) % size, val + offset, delta / 2, 4 * offset); + buildDispersedMatrix((i + delta) % size, j, val + 2 * offset, delta / 2, 4 * offset); + buildDispersedMatrix((i + 2 * delta) % size, (j + delta) % size, val + 3 * offset, delta / 2, 4 * offset); + } +} + +void SplashScreen::buildClusteredMatrix() +{ + SplashCoord *dist; + SplashCoord u, v, d; + unsigned char val; + int size2, x, y, x1, y1, i; + + size2 = size >> 1; + + // initialize the threshold matrix + for (y = 0; y < size; ++y) { + for (x = 0; x < size; ++x) { + mat[(y << log2Size) + x] = 0; + } + } + + // build the distance matrix + dist = (SplashCoord *)gmallocn(size * size2, sizeof(SplashCoord)); + for (y = 0; y < size2; ++y) { + for (x = 0; x < size2; ++x) { + if (x + y < size2 - 1) { + u = (SplashCoord)x + 0.5 - 0; + v = (SplashCoord)y + 0.5 - 0; + } else { + u = (SplashCoord)x + 0.5 - (SplashCoord)size2; + v = (SplashCoord)y + 0.5 - (SplashCoord)size2; + } + dist[y * size2 + x] = u * u + v * v; + } + } + for (y = 0; y < size2; ++y) { + for (x = 0; x < size2; ++x) { + if (x < y) { + u = (SplashCoord)x + 0.5 - 0; + v = (SplashCoord)y + 0.5 - (SplashCoord)size2; + } else { + u = (SplashCoord)x + 0.5 - (SplashCoord)size2; + v = (SplashCoord)y + 0.5 - 0; + } + dist[(size2 + y) * size2 + x] = u * u + v * v; + } + } + + // build the threshold matrix + x1 = y1 = 0; // make gcc happy + for (i = 0; i < size * size2; ++i) { + d = -1; + for (y = 0; y < size; ++y) { + for (x = 0; x < size2; ++x) { + if (mat[(y << log2Size) + x] == 0 && dist[y * size2 + x] > d) { + x1 = x; + y1 = y; + d = dist[y1 * size2 + x1]; + } + } + } + // map values in [0, 2*size*size2-1] --> [1, 255] + val = 1 + (254 * (2 * i)) / (2 * size * size2 - 1); + mat[(y1 << log2Size) + x1] = val; + val = 1 + (254 * (2 * i + 1)) / (2 * size * size2 - 1); + if (y1 < size2) { + mat[((y1 + size2) << log2Size) + x1 + size2] = val; + } else { + mat[((y1 - size2) << log2Size) + x1 + size2] = val; + } + } + + gfree(dist); +} + +// Compute the distance between two points on a toroid. +int SplashScreen::distance(int x0, int y0, int x1, int y1) +{ + int dx0, dx1, dx, dy0, dy1, dy; + + dx0 = abs(x0 - x1); + dx1 = size - dx0; + dx = dx0 < dx1 ? dx0 : dx1; + dy0 = abs(y0 - y1); + dy1 = size - dy0; + dy = dy0 < dy1 ? dy0 : dy1; + return dx * dx + dy * dy; +} + +// Algorithm taken from: +// Victor Ostromoukhov and Roger D. Hersch, "Stochastic Clustered-Dot +// Dithering" in Color Imaging: Device-Independent Color, Color +// Hardcopy, and Graphic Arts IV, SPIE Vol. 3648, pp. 496-505, 1999. +void SplashScreen::buildSCDMatrix(int r) +{ + SplashScreenPoint *dots, *pts; + int dotsLen, dotsSize; + char *tmpl; + char *grid; + int *region, *dist; + int x, y, xx, yy, x0, x1, y0, y1, i, j, d, iMin, dMin, n; + + // generate the random space-filling curve + pts = (SplashScreenPoint *)gmallocn(size * size, sizeof(SplashScreenPoint)); + i = 0; + for (y = 0; y < size; ++y) { + for (x = 0; x < size; ++x) { + pts[i].x = x; + pts[i].y = y; + ++i; + } + } + for (i = 0; i < size * size; ++i) { + j = i + (int)((double)(size * size - i) * grandom_double()); + x = pts[i].x; + y = pts[i].y; + pts[i].x = pts[j].x; + pts[i].y = pts[j].y; + pts[j].x = x; + pts[j].y = y; + } + + // construct the circle template + tmpl = (char *)gmallocn((r + 1) * (r + 1), sizeof(char)); + for (y = 0; y <= r; ++y) { + for (x = 0; x <= r; ++x) { + tmpl[y * (r + 1) + x] = (x * y <= r * r) ? 1 : 0; + } + } + + // mark all grid cells as free + grid = (char *)gmallocn(size * size, sizeof(char)); + for (y = 0; y < size; ++y) { + for (x = 0; x < size; ++x) { + grid[(y << log2Size) + x] = 0; + } + } + + // walk the space-filling curve, adding dots + dotsLen = 0; + dotsSize = 32; + dots = (SplashScreenPoint *)gmallocn(dotsSize, sizeof(SplashScreenPoint)); + for (i = 0; i < size * size; ++i) { + x = pts[i].x; + y = pts[i].y; + if (!grid[(y << log2Size) + x]) { + if (dotsLen == dotsSize) { + dotsSize *= 2; + dots = (SplashScreenPoint *)greallocn(dots, dotsSize, sizeof(SplashScreenPoint)); + } + dots[dotsLen++] = pts[i]; + for (yy = 0; yy <= r; ++yy) { + y0 = (y + yy) % size; + y1 = (y - yy + size) % size; + for (xx = 0; xx <= r; ++xx) { + if (tmpl[yy * (r + 1) + xx]) { + x0 = (x + xx) % size; + x1 = (x - xx + size) % size; + grid[(y0 << log2Size) + x0] = 1; + grid[(y0 << log2Size) + x1] = 1; + grid[(y1 << log2Size) + x0] = 1; + grid[(y1 << log2Size) + x1] = 1; + } + } + } + } + } + + gfree(tmpl); + gfree(grid); + + // assign each cell to a dot, compute distance to center of dot + region = (int *)gmallocn(size * size, sizeof(int)); + dist = (int *)gmallocn(size * size, sizeof(int)); + for (y = 0; y < size; ++y) { + for (x = 0; x < size; ++x) { + iMin = 0; + dMin = distance(dots[0].x, dots[0].y, x, y); + for (i = 1; i < dotsLen; ++i) { + d = distance(dots[i].x, dots[i].y, x, y); + if (d < dMin) { + iMin = i; + dMin = d; + } + } + region[(y << log2Size) + x] = iMin; + dist[(y << log2Size) + x] = dMin; + } + } + + // compute threshold values + for (i = 0; i < dotsLen; ++i) { + n = 0; + for (y = 0; y < size; ++y) { + for (x = 0; x < size; ++x) { + if (region[(y << log2Size) + x] == i) { + pts[n].x = x; + pts[n].y = y; + pts[n].dist = distance(dots[i].x, dots[i].y, x, y); + ++n; + } + } + } + std::sort(pts, pts + n, cmpDistancesFunctor()); + for (j = 0; j < n; ++j) { + // map values in [0 .. n-1] --> [255 .. 1] + mat[(pts[j].y << log2Size) + pts[j].x] = 255 - (254 * j) / (n - 1); + } + } + + gfree(pts); + gfree(region); + gfree(dist); + + gfree(dots); +} + +SplashScreen::SplashScreen(const SplashScreen *screen) +{ + screenParams = screen->screenParams; + size = screen->size; + sizeM1 = screen->sizeM1; + log2Size = screen->log2Size; + mat = (unsigned char *)gmallocn(size * size, sizeof(unsigned char)); + if (likely(mat != nullptr)) { + memcpy(mat, screen->mat, size * size * sizeof(unsigned char)); + } + minVal = screen->minVal; + maxVal = screen->maxVal; +} + +SplashScreen::~SplashScreen() +{ + gfree(mat); +} diff --git a/poppler-24.05.0/splash/SplashScreen.h b/poppler-24.05.0/splash/SplashScreen.h new file mode 100644 index 0000000000000000000000000000000000000000..d912ef02e24564ddab97ec732fa3fe7d4c8942f9 --- /dev/null +++ b/poppler-24.05.0/splash/SplashScreen.h @@ -0,0 +1,87 @@ +//======================================================================== +// +// SplashScreen.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2009, 2018, 2020, 2021 Albert Astals Cid +// +// 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 +// +//======================================================================== + +#ifndef SPLASHSCREEN_H +#define SPLASHSCREEN_H + +#include "SplashTypes.h" + +#include + +//------------------------------------------------------------------------ +// SplashScreen +//------------------------------------------------------------------------ + +class SplashScreen +{ +public: + explicit SplashScreen(const SplashScreenParams *params); + explicit SplashScreen(const SplashScreen *screen); + ~SplashScreen(); + + SplashScreen(const SplashScreen &) = delete; + SplashScreen &operator=(const SplashScreen &) = delete; + + SplashScreen *copy() const { return new SplashScreen(this); } + + // Return the computed pixel value (0=black, 1=white) for the gray + // level at (, ). + int test(int x, int y, unsigned char value) + { + int xx, yy; + if (mat == nullptr) { + createMatrix(); + } + xx = x & sizeM1; + yy = y & sizeM1; + return value < mat[(yy << log2Size) + xx] ? 0 : 1; + } + + // Returns true if value is above the white threshold or below the + // black threshold, i.e., if the corresponding halftone will be + // solid white or black. + bool isStatic(unsigned char value) + { + if (mat == nullptr) { + createMatrix(); + } + return value < minVal || value >= maxVal; + } + +private: + void createMatrix(); + + void buildDispersedMatrix(int i, int j, int val, int delta, int offset); + void buildClusteredMatrix(); + int distance(int x0, int y0, int x1, int y1); + void buildSCDMatrix(int r); + + const SplashScreenParams *screenParams; // params to create the other members + unsigned char *mat; // threshold matrix + int size; // size of the threshold matrix + int sizeM1; // size - 1 + int log2Size; // log2(size) + unsigned char minVal; // any pixel value below minVal generates + // solid black + unsigned char maxVal; // any pixel value above maxVal generates + // solid white +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashState.cc b/poppler-24.05.0/splash/SplashState.cc new file mode 100644 index 0000000000000000000000000000000000000000..39f3c53069ec7488633549997dff147719bd52fe --- /dev/null +++ b/poppler-24.05.0/splash/SplashState.cc @@ -0,0 +1,252 @@ +//======================================================================== +// +// SplashState.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2009, 2011, 2012, 2015 Thomas Freitag +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2019, 2021, 2022 Albert Astals Cid +// Copyright (C) 2020 Peter Wang +// +// 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 + +#include +#include "goo/gmem.h" +#include "SplashPattern.h" +#include "SplashScreen.h" +#include "SplashClip.h" +#include "SplashBitmap.h" +#include "SplashState.h" + +//------------------------------------------------------------------------ +// SplashState +//------------------------------------------------------------------------ + +// number of components in each color mode +int splashColorModeNComps[] = { 1, 1, 3, 3, 4, 4, 4 + SPOT_NCOMPS }; + +SplashState::SplashState(int width, int height, bool vectorAntialias, SplashScreenParams *screenParams) +{ + SplashColor color; + int i; + + matrix[0] = 1; + matrix[1] = 0; + matrix[2] = 0; + matrix[3] = 1; + matrix[4] = 0; + matrix[5] = 0; + memset(&color, 0, sizeof(SplashColor)); + strokePattern = new SplashSolidColor(color); + fillPattern = new SplashSolidColor(color); + screen = new SplashScreen(screenParams); + blendFunc = nullptr; + strokeAlpha = 1; + fillAlpha = 1; + multiplyPatternAlpha = false; + patternStrokeAlpha = 1; + patternFillAlpha = 1; + lineWidth = 1; + lineCap = splashLineCapButt; + lineJoin = splashLineJoinMiter; + miterLimit = 10; + flatness = 1; + lineDashPhase = 0; + strokeAdjust = false; + clip = new SplashClip(0, 0, width - 0.001, height - 0.001, vectorAntialias); + softMask = nullptr; + deleteSoftMask = false; + inNonIsolatedGroup = false; + fillOverprint = false; + strokeOverprint = false; + overprintMode = 0; + for (i = 0; i < 256; ++i) { + rgbTransferR[i] = (unsigned char)i; + rgbTransferG[i] = (unsigned char)i; + rgbTransferB[i] = (unsigned char)i; + grayTransfer[i] = (unsigned char)i; + cmykTransferC[i] = (unsigned char)i; + cmykTransferM[i] = (unsigned char)i; + cmykTransferY[i] = (unsigned char)i; + cmykTransferK[i] = (unsigned char)i; + for (auto &cp : deviceNTransfer) { + cp[i] = (unsigned char)i; + } + } + overprintMask = 0xffffffff; + overprintAdditive = false; + next = nullptr; +} + +SplashState::SplashState(int width, int height, bool vectorAntialias, SplashScreen *screenA) +{ + SplashColor color; + int i; + + matrix[0] = 1; + matrix[1] = 0; + matrix[2] = 0; + matrix[3] = 1; + matrix[4] = 0; + matrix[5] = 0; + memset(&color, 0, sizeof(SplashColor)); + strokePattern = new SplashSolidColor(color); + fillPattern = new SplashSolidColor(color); + screen = screenA->copy(); + blendFunc = nullptr; + strokeAlpha = 1; + fillAlpha = 1; + multiplyPatternAlpha = false; + patternStrokeAlpha = 1; + patternFillAlpha = 1; + lineWidth = 1; + lineCap = splashLineCapButt; + lineJoin = splashLineJoinMiter; + miterLimit = 10; + flatness = 1; + lineDashPhase = 0; + strokeAdjust = false; + clip = new SplashClip(0, 0, width - 0.001, height - 0.001, vectorAntialias); + softMask = nullptr; + deleteSoftMask = false; + inNonIsolatedGroup = false; + fillOverprint = false; + strokeOverprint = false; + overprintMode = 0; + for (i = 0; i < 256; ++i) { + rgbTransferR[i] = (unsigned char)i; + rgbTransferG[i] = (unsigned char)i; + rgbTransferB[i] = (unsigned char)i; + grayTransfer[i] = (unsigned char)i; + cmykTransferC[i] = (unsigned char)i; + cmykTransferM[i] = (unsigned char)i; + cmykTransferY[i] = (unsigned char)i; + cmykTransferK[i] = (unsigned char)i; + for (auto &cp : deviceNTransfer) { + cp[i] = (unsigned char)i; + } + } + overprintMask = 0xffffffff; + overprintAdditive = false; + next = nullptr; +} + +SplashState::SplashState(const SplashState *state) +{ + memcpy(matrix, state->matrix, 6 * sizeof(SplashCoord)); + strokePattern = state->strokePattern->copy(); + fillPattern = state->fillPattern->copy(); + screen = state->screen->copy(); + blendFunc = state->blendFunc; + strokeAlpha = state->strokeAlpha; + fillAlpha = state->fillAlpha; + multiplyPatternAlpha = state->multiplyPatternAlpha; + patternStrokeAlpha = state->patternStrokeAlpha; + patternFillAlpha = state->patternFillAlpha; + lineWidth = state->lineWidth; + lineCap = state->lineCap; + lineJoin = state->lineJoin; + miterLimit = state->miterLimit; + flatness = state->flatness; + lineDash = state->lineDash; + lineDashPhase = state->lineDashPhase; + strokeAdjust = state->strokeAdjust; + clip = state->clip->copy(); + softMask = state->softMask; + deleteSoftMask = false; + inNonIsolatedGroup = state->inNonIsolatedGroup; + fillOverprint = state->fillOverprint; + strokeOverprint = state->strokeOverprint; + overprintMode = state->overprintMode; + memcpy(rgbTransferR, state->rgbTransferR, 256); + memcpy(rgbTransferG, state->rgbTransferG, 256); + memcpy(rgbTransferB, state->rgbTransferB, 256); + memcpy(grayTransfer, state->grayTransfer, 256); + memcpy(cmykTransferC, state->cmykTransferC, 256); + memcpy(cmykTransferM, state->cmykTransferM, 256); + memcpy(cmykTransferY, state->cmykTransferY, 256); + memcpy(cmykTransferK, state->cmykTransferK, 256); + for (int cp = 0; cp < SPOT_NCOMPS + 4; cp++) { + memcpy(deviceNTransfer[cp], state->deviceNTransfer[cp], 256); + } + overprintMask = state->overprintMask; + overprintAdditive = state->overprintAdditive; + next = nullptr; +} + +SplashState::~SplashState() +{ + delete strokePattern; + delete fillPattern; + delete screen; + delete clip; + if (deleteSoftMask && softMask) { + delete softMask; + } +} + +void SplashState::setStrokePattern(SplashPattern *strokePatternA) +{ + delete strokePattern; + strokePattern = strokePatternA; +} + +void SplashState::setFillPattern(SplashPattern *fillPatternA) +{ + delete fillPattern; + fillPattern = fillPatternA; +} + +void SplashState::setScreen(SplashScreen *screenA) +{ + delete screen; + screen = screenA; +} + +void SplashState::setLineDash(std::vector &&lineDashA, SplashCoord lineDashPhaseA) +{ + lineDash = lineDashA; + lineDashPhase = lineDashPhaseA; +} + +void SplashState::setSoftMask(SplashBitmap *softMaskA) +{ + if (deleteSoftMask) { + delete softMask; + } + softMask = softMaskA; + deleteSoftMask = true; +} + +void SplashState::setTransfer(unsigned char *red, unsigned char *green, unsigned char *blue, unsigned char *gray) +{ + for (int i = 0; i < 256; ++i) { + cmykTransferC[i] = 255 - rgbTransferR[255 - i]; + cmykTransferM[i] = 255 - rgbTransferG[255 - i]; + cmykTransferY[i] = 255 - rgbTransferB[255 - i]; + cmykTransferK[i] = 255 - grayTransfer[255 - i]; + } + for (int i = 0; i < 256; ++i) { + deviceNTransfer[0][i] = 255 - rgbTransferR[255 - i]; + deviceNTransfer[1][i] = 255 - rgbTransferG[255 - i]; + deviceNTransfer[2][i] = 255 - rgbTransferB[255 - i]; + deviceNTransfer[3][i] = 255 - grayTransfer[255 - i]; + } + memcpy(rgbTransferR, red, 256); + memcpy(rgbTransferG, green, 256); + memcpy(rgbTransferB, blue, 256); + memcpy(grayTransfer, gray, 256); +} diff --git a/poppler-24.05.0/splash/SplashState.h b/poppler-24.05.0/splash/SplashState.h new file mode 100644 index 0000000000000000000000000000000000000000..009c1f14c4eb9ea2d9e74b2ed587aab0f4ff75d8 --- /dev/null +++ b/poppler-24.05.0/splash/SplashState.h @@ -0,0 +1,131 @@ +//======================================================================== +// +// SplashState.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2011, 2012, 2015 Thomas Freitag +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018, 2021, 2022 Albert Astals Cid +// +// 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 +// +//======================================================================== + +#ifndef SPLASHSTATE_H +#define SPLASHSTATE_H + +#include "SplashTypes.h" + +class SplashPattern; +class SplashScreen; +class SplashClip; +class SplashBitmap; + +//------------------------------------------------------------------------ +// line cap values +//------------------------------------------------------------------------ + +#define splashLineCapButt 0 +#define splashLineCapRound 1 +#define splashLineCapProjecting 2 + +//------------------------------------------------------------------------ +// line join values +//------------------------------------------------------------------------ + +#define splashLineJoinMiter 0 +#define splashLineJoinRound 1 +#define splashLineJoinBevel 2 + +//------------------------------------------------------------------------ +// SplashState +//------------------------------------------------------------------------ + +class SplashState +{ +public: + // Create a new state object, initialized with default settings. + SplashState(int width, int height, bool vectorAntialias, SplashScreenParams *screenParams); + SplashState(int width, int height, bool vectorAntialias, SplashScreen *screenA); + + // Copy a state object. + SplashState *copy() const { return new SplashState(this); } + + ~SplashState(); + + SplashState(const SplashState &) = delete; + SplashState &operator=(const SplashState &) = delete; + + // Set the stroke pattern. This does not copy . + void setStrokePattern(SplashPattern *strokePatternA); + + // Set the fill pattern. This does not copy . + void setFillPattern(SplashPattern *fillPatternA); + + // Set the screen. This does not copy . + void setScreen(SplashScreen *screenA); + + // Set the line dash pattern. + void setLineDash(std::vector &&lineDashA, SplashCoord lineDashPhaseA); + + // Set the soft mask bitmap. + void setSoftMask(SplashBitmap *softMaskA); + + // Set the overprint parametes. + void setFillOverprint(bool fillOverprintA) { fillOverprint = fillOverprintA; } + void setStrokeOverprint(bool strokeOverprintA) { strokeOverprint = strokeOverprintA; } + void setOverprintMode(int overprintModeA) { overprintMode = overprintModeA; } + + // Set the transfer function. + void setTransfer(unsigned char *red, unsigned char *green, unsigned char *blue, unsigned char *gray); + +private: + explicit SplashState(const SplashState *state); + + SplashCoord matrix[6]; + SplashPattern *strokePattern; + SplashPattern *fillPattern; + SplashScreen *screen; + SplashBlendFunc blendFunc; + SplashCoord strokeAlpha; + SplashCoord fillAlpha; + bool multiplyPatternAlpha; + SplashCoord patternStrokeAlpha; + SplashCoord patternFillAlpha; + SplashCoord lineWidth; + int lineCap; + int lineJoin; + SplashCoord miterLimit; + SplashCoord flatness; + std::vector lineDash; + SplashCoord lineDashPhase; + bool strokeAdjust; + SplashClip *clip; + SplashBitmap *softMask; + bool deleteSoftMask; + bool inNonIsolatedGroup; + bool fillOverprint; + bool strokeOverprint; + int overprintMode; + unsigned char rgbTransferR[256], rgbTransferG[256], rgbTransferB[256]; + unsigned char grayTransfer[256]; + unsigned char cmykTransferC[256], cmykTransferM[256], cmykTransferY[256], cmykTransferK[256]; + unsigned char deviceNTransfer[SPOT_NCOMPS + 4][256]; + unsigned int overprintMask; + bool overprintAdditive; + + SplashState *next; // used by Splash class + + friend class Splash; +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashTypes.h b/poppler-24.05.0/splash/SplashTypes.h new file mode 100644 index 0000000000000000000000000000000000000000..30a98cd0f34195ff026a4c1039e67c5458a7aaae --- /dev/null +++ b/poppler-24.05.0/splash/SplashTypes.h @@ -0,0 +1,248 @@ +//======================================================================== +// +// SplashTypes.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2006, 2010, 2019, 2020 Albert Astals Cid +// Copyright (C) 2008 Tomas Are Haavet +// Copyright (C) 2009, 2011-2013 Thomas Freitag +// Copyright (C) 2009 Stefan Thomas +// Copyright (C) 2010 William Bader +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018 Stefan Brüns +// +// 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 +// +//======================================================================== + +#ifndef SPLASHTYPES_H +#define SPLASHTYPES_H + +#include + +//------------------------------------------------------------------------ +// coordinates +//------------------------------------------------------------------------ + +#if defined(USE_FLOAT) +typedef float SplashCoord; +#else +typedef double SplashCoord; +#endif + +//------------------------------------------------------------------------ +// antialiasing +//------------------------------------------------------------------------ + +#define splashAASize 4 + +#ifndef SPOT_NCOMPS +# define SPOT_NCOMPS 4 +#endif + +//------------------------------------------------------------------------ +// colors +//------------------------------------------------------------------------ + +enum SplashColorMode +{ + splashModeMono1, // 1 bit per component, 8 pixels per byte, + // MSbit is on the left + splashModeMono8, // 1 byte per component, 1 byte per pixel + splashModeRGB8, // 1 byte per component, 3 bytes per pixel: + // RGBRGB... + splashModeBGR8, // 1 byte per component, 3 bytes per pixel: + // BGRBGR... + splashModeXBGR8, // 1 byte per component, 4 bytes per pixel: + // XBGRXBGR... + splashModeCMYK8, // 1 byte per component, 4 bytes per pixel: + // CMYKCMYK... + splashModeDeviceN8 // 1 byte per component, + // 4 bytes + n bytes spot colors per pixel: + // CMYKSSSSCMYKSSSS... +}; + +enum SplashThinLineMode +{ + splashThinLineDefault, // if SA on: draw solid if requested line width, transformed into + // device space, is less than half a pixel and a shaped line else + splashThinLineSolid, // draw line solid at least with 1 pixel + splashThinLineShape // draw line shaped at least with 1 pixel +}; +// number of components in each color mode +// (defined in SplashState.cc) +extern int splashColorModeNComps[]; + +// max number of components in any SplashColor +constexpr std::size_t splashMaxColorComps = SPOT_NCOMPS + 4; + +typedef unsigned char SplashColor[splashMaxColorComps]; +typedef unsigned char *SplashColorPtr; +typedef const unsigned char *SplashColorConstPtr; + +// RGB8 +static inline unsigned char splashRGB8R(SplashColorPtr rgb8) +{ + return rgb8[0]; +} +static inline unsigned char splashRGB8G(SplashColorPtr rgb8) +{ + return rgb8[1]; +} +static inline unsigned char splashRGB8B(SplashColorPtr rgb8) +{ + return rgb8[2]; +} + +// BGR8 +static inline unsigned char splashBGR8R(SplashColorPtr bgr8) +{ + return bgr8[2]; +} +static inline unsigned char splashBGR8G(SplashColorPtr bgr8) +{ + return bgr8[1]; +} +static inline unsigned char splashBGR8B(SplashColorPtr bgr8) +{ + return bgr8[0]; +} + +// CMYK8 +static inline unsigned char splashCMYK8C(SplashColorPtr cmyk8) +{ + return cmyk8[0]; +} +static inline unsigned char splashCMYK8M(SplashColorPtr cmyk8) +{ + return cmyk8[1]; +} +static inline unsigned char splashCMYK8Y(SplashColorPtr cmyk8) +{ + return cmyk8[2]; +} +static inline unsigned char splashCMYK8K(SplashColorPtr cmyk8) +{ + return cmyk8[3]; +} + +// DEVICEN8 +static inline unsigned char splashDeviceN8C(SplashColorPtr deviceN8) +{ + return deviceN8[0]; +} +static inline unsigned char splashDeviceN8M(SplashColorPtr deviceN8) +{ + return deviceN8[1]; +} +static inline unsigned char splashDeviceN8Y(SplashColorPtr deviceN8) +{ + return deviceN8[2]; +} +static inline unsigned char splashDeviceN8K(SplashColorPtr deviceN8) +{ + return deviceN8[3]; +} +static inline unsigned char splashDeviceN8S(SplashColorPtr deviceN8, int nSpot) +{ + return deviceN8[4 + nSpot]; +} + +static inline void splashClearColor(SplashColorPtr dest) +{ + dest[0] = 0; + dest[1] = 0; + dest[2] = 0; + dest[3] = 0; + for (int i = 4; i < SPOT_NCOMPS + 4; i++) { + dest[i] = 0; + } +} + +static inline void splashColorCopy(SplashColorPtr dest, SplashColorConstPtr src) +{ + dest[0] = src[0]; + dest[1] = src[1]; + dest[2] = src[2]; + dest[3] = src[3]; + for (int i = 4; i < SPOT_NCOMPS + 4; i++) { + dest[i] = src[i]; + } +} + +static inline bool splashColorEqual(SplashColorConstPtr dest, SplashColorConstPtr src) +{ + for (int i = 0; i < SPOT_NCOMPS + 4; i++) { + if (dest[i] != src[i]) { + return false; + } + } + return true; +} + +static inline void splashColorXor(SplashColorPtr dest, SplashColorConstPtr src) +{ + dest[0] ^= src[0]; + dest[1] ^= src[1]; + dest[2] ^= src[2]; + dest[3] ^= src[3]; + for (int i = 4; i < SPOT_NCOMPS + 4; i++) { + dest[i] ^= src[i]; + } +} + +//------------------------------------------------------------------------ +// blend functions +//------------------------------------------------------------------------ + +typedef void (*SplashBlendFunc)(SplashColorPtr src, SplashColorPtr dest, SplashColorPtr blend, SplashColorMode cm); + +//------------------------------------------------------------------------ +// screen parameters +//------------------------------------------------------------------------ + +enum SplashScreenType +{ + splashScreenDispersed, + splashScreenClustered, + splashScreenStochasticClustered +}; + +struct SplashScreenParams +{ + SplashScreenType type; + int size; + int dotRadius; + SplashCoord gamma; + SplashCoord blackThreshold; + SplashCoord whiteThreshold; +}; + +//------------------------------------------------------------------------ +// error results +//------------------------------------------------------------------------ + +typedef int SplashError; + +//------------------------------------------------------------------------ +// image file formats +//------------------------------------------------------------------------ + +enum SplashImageFileFormat +{ + splashFormatJpeg, + splashFormatPng, + splashFormatTiff, + splashFormatJpegCMYK +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashXPath.cc b/poppler-24.05.0/splash/SplashXPath.cc new file mode 100644 index 0000000000000000000000000000000000000000..d066915f0fabeac3877c2b91933493437c20657c --- /dev/null +++ b/poppler-24.05.0/splash/SplashXPath.cc @@ -0,0 +1,443 @@ +//======================================================================== +// +// SplashXPath.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2010 Paweł Wiejacha +// Copyright (C) 2010, 2011, 2018, 2019, 2021 Albert Astals Cid +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2017 Adrian Johnson +// +// 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 + +#include +#include +#include +#include "goo/gmem.h" +#include "goo/GooLikely.h" +#include "SplashMath.h" +#include "SplashPath.h" +#include "SplashXPath.h" + +//------------------------------------------------------------------------ + +struct SplashXPathPoint +{ + SplashCoord x, y; +}; + +struct SplashXPathAdjust +{ + int firstPt, lastPt; // range of points + bool vert; // vertical or horizontal hint + SplashCoord x0a, x0b, // hint boundaries + xma, xmb, x1a, x1b; + SplashCoord x0, x1, xm; // adjusted coordinates +}; + +//------------------------------------------------------------------------ + +// Transform a point from user space to device space. +inline void SplashXPath::transform(SplashCoord *matrix, SplashCoord xi, SplashCoord yi, SplashCoord *xo, SplashCoord *yo) +{ + // [ m[0] m[1] 0 ] + // [xo yo 1] = [xi yi 1] * [ m[2] m[3] 0 ] + // [ m[4] m[5] 1 ] + *xo = xi * matrix[0] + yi * matrix[2] + matrix[4]; + *yo = xi * matrix[1] + yi * matrix[3] + matrix[5]; +} + +//------------------------------------------------------------------------ +// SplashXPath +//------------------------------------------------------------------------ + +SplashXPath::SplashXPath(SplashPath *path, SplashCoord *matrix, SplashCoord flatness, bool closeSubpaths, bool adjustLines, int linePosI) +{ + SplashPathHint *hint; + SplashXPathPoint *pts; + SplashXPathAdjust *adjusts, *adjust; + SplashCoord x0, y0, x1, y1, x2, y2, x3, y3, xsp, ysp; + SplashCoord adj0, adj1; + int curSubpath, i, j; + + // transform the points + pts = (SplashXPathPoint *)gmallocn(path->length, sizeof(SplashXPathPoint)); + for (i = 0; i < path->length; ++i) { + transform(matrix, path->pts[i].x, path->pts[i].y, &pts[i].x, &pts[i].y); + } + + // set up the stroke adjustment hints + if (path->hints) { + adjusts = (SplashXPathAdjust *)gmallocn_checkoverflow(path->hintsLength, sizeof(SplashXPathAdjust)); + if (adjusts) { + for (i = 0; i < path->hintsLength; ++i) { + hint = &path->hints[i]; + if (hint->ctrl0 + 1 >= path->length || hint->ctrl1 + 1 >= path->length) { + gfree(adjusts); + adjusts = nullptr; + break; + } + x0 = pts[hint->ctrl0].x; + y0 = pts[hint->ctrl0].y; + x1 = pts[hint->ctrl0 + 1].x; + y1 = pts[hint->ctrl0 + 1].y; + x2 = pts[hint->ctrl1].x; + y2 = pts[hint->ctrl1].y; + x3 = pts[hint->ctrl1 + 1].x; + y3 = pts[hint->ctrl1 + 1].y; + if (x0 == x1 && x2 == x3) { + adjusts[i].vert = true; + adj0 = x0; + adj1 = x2; + } else if (y0 == y1 && y2 == y3) { + adjusts[i].vert = false; + adj0 = y0; + adj1 = y2; + } else { + gfree(adjusts); + adjusts = nullptr; + break; + } + if (adj0 > adj1) { + x0 = adj0; + adj0 = adj1; + adj1 = x0; + } + adjusts[i].x0a = adj0 - 0.01; + adjusts[i].x0b = adj0 + 0.01; + adjusts[i].xma = (SplashCoord)0.5 * (adj0 + adj1) - 0.01; + adjusts[i].xmb = (SplashCoord)0.5 * (adj0 + adj1) + 0.01; + adjusts[i].x1a = adj1 - 0.01; + adjusts[i].x1b = adj1 + 0.01; + // rounding both edge coordinates can result in lines of + // different widths (e.g., adj=10.1, adj1=11.3 --> x0=10, x1=11; + // adj0=10.4, adj1=11.6 --> x0=10, x1=12), but it has the + // benefit of making adjacent strokes/fills line up without any + // gaps between them + x0 = splashRound(adj0); + x1 = splashRound(adj1); + if (x1 == x0) { + if (adjustLines) { + // the adjustment moves thin lines (clip rectangle with + // empty width or height) out of clip area, here we need + // a special adjustment: + x0 = linePosI; + x1 = x0 + 1; + } else { + x1 = x1 + 1; + } + } + adjusts[i].x0 = (SplashCoord)x0; + adjusts[i].x1 = (SplashCoord)x1 - 0.01; + adjusts[i].xm = (SplashCoord)0.5 * (adjusts[i].x0 + adjusts[i].x1); + adjusts[i].firstPt = hint->firstPt; + adjusts[i].lastPt = hint->lastPt; + } + } + + } else { + adjusts = nullptr; + } + + // perform stroke adjustment + if (adjusts) { + for (i = 0, adjust = adjusts; i < path->hintsLength; ++i, ++adjust) { + for (j = adjust->firstPt; j <= adjust->lastPt; ++j) { + strokeAdjust(adjust, &pts[j].x, &pts[j].y); + } + } + gfree(adjusts); + } + + segs = nullptr; + length = size = 0; + + x0 = y0 = xsp = ysp = 0; // make gcc happy + adj0 = adj1 = 0; // make gcc happy + curSubpath = 0; + i = 0; + while (i < path->length) { + + // first point in subpath - skip it + if (path->flags[i] & splashPathFirst) { + x0 = pts[i].x; + y0 = pts[i].y; + xsp = x0; + ysp = y0; + curSubpath = i; + ++i; + + } else { + + // curve segment + if (path->flags[i] & splashPathCurve) { + x1 = pts[i].x; + y1 = pts[i].y; + x2 = pts[i + 1].x; + y2 = pts[i + 1].y; + x3 = pts[i + 2].x; + y3 = pts[i + 2].y; + addCurve(x0, y0, x1, y1, x2, y2, x3, y3, flatness, (path->flags[i - 1] & splashPathFirst), (path->flags[i + 2] & splashPathLast), + !closeSubpaths && (path->flags[i - 1] & splashPathFirst) && !(path->flags[i - 1] & splashPathClosed), !closeSubpaths && (path->flags[i + 2] & splashPathLast) && !(path->flags[i + 2] & splashPathClosed)); + x0 = x3; + y0 = y3; + i += 3; + + // line segment + } else { + x1 = pts[i].x; + y1 = pts[i].y; + addSegment(x0, y0, x1, y1); + x0 = x1; + y0 = y1; + ++i; + } + + // close a subpath + if (closeSubpaths && (path->flags[i - 1] & splashPathLast) && (pts[i - 1].x != pts[curSubpath].x || pts[i - 1].y != pts[curSubpath].y)) { + addSegment(x0, y0, xsp, ysp); + } + } + } + + gfree(pts); +} + +// Apply the stroke adjust hints to point : (*, *). +void SplashXPath::strokeAdjust(SplashXPathAdjust *adjust, SplashCoord *xp, SplashCoord *yp) +{ + SplashCoord x, y; + + if (adjust->vert) { + x = *xp; + if (x > adjust->x0a && x < adjust->x0b) { + *xp = adjust->x0; + } else if (x > adjust->xma && x < adjust->xmb) { + *xp = adjust->xm; + } else if (x > adjust->x1a && x < adjust->x1b) { + *xp = adjust->x1; + } + } else { + y = *yp; + if (y > adjust->x0a && y < adjust->x0b) { + *yp = adjust->x0; + } else if (y > adjust->xma && y < adjust->xmb) { + *yp = adjust->xm; + } else if (y > adjust->x1a && y < adjust->x1b) { + *yp = adjust->x1; + } + } +} + +SplashXPath::~SplashXPath() +{ + gfree(segs); +} + +// Add space for more segments +void SplashXPath::grow(int nSegs) +{ + if (length + nSegs > size) { + if (size == 0) { + size = 32; + } + while (size < length + nSegs) { + size *= 2; + } + segs = (SplashXPathSeg *)greallocn_checkoverflow(segs, size, sizeof(SplashXPathSeg)); + if (unlikely(!segs)) { + length = 0; + size = 0; + } + } +} + +void SplashXPath::addCurve(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1, SplashCoord x2, SplashCoord y2, SplashCoord x3, SplashCoord y3, SplashCoord flatness, bool first, bool last, bool end0, bool end1) +{ + SplashCoord *cx = new SplashCoord[(splashMaxCurveSplits + 1) * 3]; + SplashCoord *cy = new SplashCoord[(splashMaxCurveSplits + 1) * 3]; + int *cNext = new int[splashMaxCurveSplits + 1]; + SplashCoord xl0, xl1, xl2, xr0, xr1, xr2, xr3, xx1, xx2, xh; + SplashCoord yl0, yl1, yl2, yr0, yr1, yr2, yr3, yy1, yy2, yh; + SplashCoord dx, dy, mx, my, d1, d2, flatness2; + int p1, p2, p3; + + flatness2 = flatness * flatness; + + // initial segment + p1 = 0; + p2 = splashMaxCurveSplits; + + *(cx + p1 * 3 + 0) = x0; + *(cx + p1 * 3 + 1) = x1; + *(cx + p1 * 3 + 2) = x2; + *(cx + p2 * 3 + 0) = x3; + + *(cy + p1 * 3 + 0) = y0; + *(cy + p1 * 3 + 1) = y1; + *(cy + p1 * 3 + 2) = y2; + *(cy + p2 * 3 + 0) = y3; + + *(cNext + p1) = p2; + + while (p1 < splashMaxCurveSplits) { + + // get the next segment + xl0 = *(cx + p1 * 3 + 0); + xx1 = *(cx + p1 * 3 + 1); + xx2 = *(cx + p1 * 3 + 2); + + yl0 = *(cy + p1 * 3 + 0); + yy1 = *(cy + p1 * 3 + 1); + yy2 = *(cy + p1 * 3 + 2); + + p2 = *(cNext + p1); + + xr3 = *(cx + p2 * 3 + 0); + yr3 = *(cy + p2 * 3 + 0); + + // compute the distances from the control points to the + // midpoint of the straight line (this is a bit of a hack, but + // it's much faster than computing the actual distances to the + // line) + mx = (xl0 + xr3) * 0.5; + my = (yl0 + yr3) * 0.5; + dx = xx1 - mx; + dy = yy1 - my; + d1 = dx * dx + dy * dy; + dx = xx2 - mx; + dy = yy2 - my; + d2 = dx * dx + dy * dy; + + // if the curve is flat enough, or no more subdivisions are + // allowed, add the straight line segment + if (p2 - p1 == 1 || (d1 <= flatness2 && d2 <= flatness2)) { + addSegment(xl0, yl0, xr3, yr3); + p1 = p2; + + // otherwise, subdivide the curve + } else { + xl1 = (xl0 + xx1) * 0.5; + yl1 = (yl0 + yy1) * 0.5; + xh = (xx1 + xx2) * 0.5; + yh = (yy1 + yy2) * 0.5; + xl2 = (xl1 + xh) * 0.5; + yl2 = (yl1 + yh) * 0.5; + xr2 = (xx2 + xr3) * 0.5; + yr2 = (yy2 + yr3) * 0.5; + xr1 = (xh + xr2) * 0.5; + yr1 = (yh + yr2) * 0.5; + xr0 = (xl2 + xr1) * 0.5; + yr0 = (yl2 + yr1) * 0.5; + // add the new subdivision points + p3 = (p1 + p2) / 2; + + *(cx + p1 * 3 + 1) = xl1; + *(cx + p1 * 3 + 2) = xl2; + + *(cy + p1 * 3 + 1) = yl1; + *(cy + p1 * 3 + 2) = yl2; + + *(cNext + p1) = p3; + + *(cx + p3 * 3 + 0) = xr0; + *(cx + p3 * 3 + 1) = xr1; + *(cx + p3 * 3 + 2) = xr2; + + *(cy + p3 * 3 + 0) = yr0; + *(cy + p3 * 3 + 1) = yr1; + *(cy + p3 * 3 + 2) = yr2; + + *(cNext + p3) = p2; + } + } + + delete[] cx; + delete[] cy; + delete[] cNext; +} + +void SplashXPath::addSegment(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1) +{ + grow(1); + if (unlikely(!segs)) { + return; + } + segs[length].x0 = x0; + segs[length].y0 = y0; + segs[length].x1 = x1; + segs[length].y1 = y1; + segs[length].flags = 0; + if (y1 == y0) { + segs[length].dxdy = segs[length].dydx = 0; + segs[length].flags |= splashXPathHoriz; + if (x1 == x0) { + segs[length].flags |= splashXPathVert; + } + } else if (x1 == x0) { + segs[length].dxdy = segs[length].dydx = 0; + segs[length].flags |= splashXPathVert; + } else { + segs[length].dxdy = (x1 - x0) / (y1 - y0); + segs[length].dydx = (SplashCoord)1 / segs[length].dxdy; + } + if (y0 > y1) { + segs[length].flags |= splashXPathFlip; + } + ++length; +} + +struct cmpXPathSegsFunctor +{ + bool operator()(const SplashXPathSeg &seg0, const SplashXPathSeg &seg1) + { + SplashCoord x0, y0, x1, y1; + + if (seg0.flags & splashXPathFlip) { + x0 = seg0.x1; + y0 = seg0.y1; + } else { + x0 = seg0.x0; + y0 = seg0.y0; + } + if (seg1.flags & splashXPathFlip) { + x1 = seg1.x1; + y1 = seg1.y1; + } else { + x1 = seg1.x0; + y1 = seg1.y0; + } + return (y0 != y1) ? (y0 < y1) : (x0 < x1); + } +}; + +void SplashXPath::aaScale() +{ + SplashXPathSeg *seg; + int i; + + for (i = 0, seg = segs; i < length; ++i, ++seg) { + seg->x0 *= splashAASize; + seg->y0 *= splashAASize; + seg->x1 *= splashAASize; + seg->y1 *= splashAASize; + } +} + +void SplashXPath::sort() +{ + std::sort(segs, segs + length, cmpXPathSegsFunctor()); +} diff --git a/poppler-24.05.0/splash/SplashXPath.h b/poppler-24.05.0/splash/SplashXPath.h new file mode 100644 index 0000000000000000000000000000000000000000..e59649fa0abb11769633eebab056fec8431471dc --- /dev/null +++ b/poppler-24.05.0/splash/SplashXPath.h @@ -0,0 +1,95 @@ +//======================================================================== +// +// SplashXPath.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2013 Thomas Freitag +// Copyright (C) 2018, 2021 Albert Astals Cid +// +// 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 +// +//======================================================================== + +#ifndef SPLASHXPATH_H +#define SPLASHXPATH_H + +#include "SplashTypes.h" + +class SplashPath; +struct SplashXPathAdjust; + +//------------------------------------------------------------------------ + +#define splashMaxCurveSplits (1 << 10) + +//------------------------------------------------------------------------ +// SplashXPathSeg +//------------------------------------------------------------------------ + +struct SplashXPathSeg +{ + SplashCoord x0, y0; // first endpoint + SplashCoord x1, y1; // second endpoint + SplashCoord dxdy; // slope: delta-x / delta-y + SplashCoord dydx; // slope: delta-y / delta-x + unsigned int flags; +}; + +#define splashXPathHoriz \ + 0x01 // segment is vertical (y0 == y1) + // (dxdy is undef) +#define splashXPathVert \ + 0x02 // segment is horizontal (x0 == x1) + // (dydx is undef) +#define splashXPathFlip 0x04 // y0 > y1 + +//------------------------------------------------------------------------ +// SplashXPath +//------------------------------------------------------------------------ + +class SplashXPath +{ +public: + // Expands (converts to segments) and flattens (converts curves to + // lines) . Transforms all points from user space to device + // space, via . If is true, closes all open + // subpaths. + SplashXPath(SplashPath *path, SplashCoord *matrix, SplashCoord flatness, bool closeSubpaths, bool adjustLines = false, int linePosI = 0); + + ~SplashXPath(); + + SplashXPath(const SplashXPath &) = delete; + SplashXPath &operator=(const SplashXPath &) = delete; + + // Multiply all coordinates by splashAASize, in preparation for + // anti-aliased rendering. + void aaScale(); + + // Sort by upper coordinate (lower y), in y-major order. + void sort(); + +protected: + void transform(SplashCoord *matrix, SplashCoord xi, SplashCoord yi, SplashCoord *xo, SplashCoord *yo); + void strokeAdjust(SplashXPathAdjust *adjust, SplashCoord *xp, SplashCoord *yp); + void grow(int nSegs); + void addCurve(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1, SplashCoord x2, SplashCoord y2, SplashCoord x3, SplashCoord y3, SplashCoord flatness, bool first, bool last, bool end0, bool end1); + void addSegment(SplashCoord x0, SplashCoord y0, SplashCoord x1, SplashCoord y1); + + SplashXPathSeg *segs; + int length, size; // length and size of segs array + + friend class SplashXPathScanner; + friend class SplashClip; + friend class Splash; +}; + +#endif diff --git a/poppler-24.05.0/splash/SplashXPathScanner.cc b/poppler-24.05.0/splash/SplashXPathScanner.cc new file mode 100644 index 0000000000000000000000000000000000000000..cc5f8501ae14c1f778c612c20dfa56c967187f63 --- /dev/null +++ b/poppler-24.05.0/splash/SplashXPathScanner.cc @@ -0,0 +1,519 @@ +//======================================================================== +// +// SplashXPathScanner.cc +// +//======================================================================== + +//======================================================================== +// +// 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) 2008, 2010, 2014, 2018, 2019, 2021, 2022 Albert Astals Cid +// Copyright (C) 2010 Paweł Wiejacha +// Copyright (C) 2013, 2014, 2021 Thomas Freitag +// Copyright (C) 2018 Stefan Brüns +// +// 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 + +#include +#include +#include +#include "goo/gmem.h" +#include "goo/GooLikely.h" +#include "SplashMath.h" +#include "SplashXPath.h" +#include "SplashBitmap.h" +#include "SplashXPathScanner.h" + +//------------------------------------------------------------------------ + +//------------------------------------------------------------------------ +// SplashXPathScanner +//------------------------------------------------------------------------ + +SplashXPathScanner::SplashXPathScanner(const SplashXPath &xPath, bool eoA, int clipYMin, int clipYMax) +{ + const SplashXPathSeg *seg; + SplashCoord xMinFP, yMinFP, xMaxFP, yMaxFP; + int i; + + eo = eoA; + partialClip = false; + + // compute the bbox + xMin = yMin = 1; + xMax = yMax = 0; + if (xPath.length > 0) { + seg = &xPath.segs[0]; + if (unlikely(std::isnan(seg->x0) || std::isnan(seg->x1) || std::isnan(seg->y0) || std::isnan(seg->y1))) { + return; + } + if (seg->x0 <= seg->x1) { + xMinFP = seg->x0; + xMaxFP = seg->x1; + } else { + xMinFP = seg->x1; + xMaxFP = seg->x0; + } + if (seg->flags & splashXPathFlip) { + yMinFP = seg->y1; + yMaxFP = seg->y0; + } else { + yMinFP = seg->y0; + yMaxFP = seg->y1; + } + for (i = 1; i < xPath.length; ++i) { + seg = &xPath.segs[i]; + if (unlikely(std::isnan(seg->x0) || std::isnan(seg->x1) || std::isnan(seg->y0) || std::isnan(seg->y1))) { + return; + } + if (seg->x0 < xMinFP) { + xMinFP = seg->x0; + } else if (seg->x0 > xMaxFP) { + xMaxFP = seg->x0; + } + if (seg->x1 < xMinFP) { + xMinFP = seg->x1; + } else if (seg->x1 > xMaxFP) { + xMaxFP = seg->x1; + } + if (seg->flags & splashXPathFlip) { + if (seg->y0 > yMaxFP) { + yMaxFP = seg->y0; + } + } else { + if (seg->y1 > yMaxFP) { + yMaxFP = seg->y1; + } + } + } + xMin = splashFloor(xMinFP); + xMax = splashFloor(xMaxFP); + yMin = splashFloor(yMinFP); + yMax = splashFloor(yMaxFP); + if (clipYMin > yMin) { + yMin = clipYMin; + partialClip = true; + } + if (clipYMax < yMax) { + yMax = clipYMax; + partialClip = true; + } + } + + computeIntersections(xPath); +} + +SplashXPathScanner::~SplashXPathScanner() { } + +void SplashXPathScanner::getBBoxAA(int *xMinA, int *yMinA, int *xMaxA, int *yMaxA) const +{ + *xMinA = xMin / splashAASize; + *yMinA = yMin / splashAASize; + *xMaxA = xMax / splashAASize; + *yMaxA = yMax / splashAASize; +} + +void SplashXPathScanner::getSpanBounds(int y, int *spanXMin, int *spanXMax) const +{ + if (y < yMin || y > yMax) { + *spanXMin = xMax + 1; + *spanXMax = xMax; + return; + } + const auto &line = allIntersections[y - yMin]; + if (!line.empty()) { + *spanXMin = line[0].x0; + int xx = line[0].x1; + for (const SplashIntersect &intersect : line) { + if (intersect.x1 > xx) { + xx = intersect.x1; + } + } + *spanXMax = xx; + } else { + *spanXMin = xMax + 1; + *spanXMax = xMax; + } +} + +bool SplashXPathScanner::test(int x, int y) const +{ + if (y < yMin || y > yMax) { + return false; + } + const auto &line = allIntersections[y - yMin]; + int count = 0; + for (unsigned int i = 0; i < line.size() && line[i].x0 <= x; ++i) { + if (x <= line[i].x1) { + return true; + } + count += line[i].count; + } + return eo ? (count & 1) : (count != 0); +} + +bool SplashXPathScanner::testSpan(int x0, int x1, int y) const +{ + unsigned int i; + + if (y < yMin || y > yMax) { + return false; + } + const auto &line = allIntersections[y - yMin]; + int count = 0; + for (i = 0; i < line.size() && line[i].x1 < x0; ++i) { + count += line[i].count; + } + + // invariant: the subspan [x0,xx1] is inside the path + int xx1 = x0 - 1; + while (xx1 < x1) { + if (i >= line.size()) { + return false; + } + if (line[i].x0 > xx1 + 1 && !(eo ? (count & 1) : (count != 0))) { + return false; + } + if (line[i].x1 > xx1) { + xx1 = line[i].x1; + } + count += line[i].count; + ++i; + } + + return true; +} + +bool SplashXPathScanIterator::getNextSpan(int *x0, int *x1) +{ + int xx0, xx1; + + if (interIdx >= line.size()) { + return false; + } + xx0 = line[interIdx].x0; + xx1 = line[interIdx].x1; + interCount += line[interIdx].count; + ++interIdx; + while (interIdx < line.size() && (line[interIdx].x0 <= xx1 || (eo ? (interCount & 1) : (interCount != 0)))) { + if (line[interIdx].x1 > xx1) { + xx1 = line[interIdx].x1; + } + interCount += line[interIdx].count; + ++interIdx; + } + *x0 = xx0; + *x1 = xx1; + return true; +} + +SplashXPathScanIterator::SplashXPathScanIterator(const SplashXPathScanner &scanner, int y) + : line((y < scanner.yMin || y > scanner.yMax) ? scanner.allIntersections[0] : scanner.allIntersections[y - scanner.yMin]), interIdx(0), interCount(0), eo(scanner.eo) +{ + if (y < scanner.yMin || y > scanner.yMax) { + // set index to line end + interIdx = line.size(); + } +} + +void SplashXPathScanner::computeIntersections(const SplashXPath &xPath) +{ + const SplashXPathSeg *seg; + SplashCoord segXMin, segXMax, segYMin, segYMax, xx0, xx1; + int x, y, y0, y1, i; + + if (yMin > yMax) { + return; + } + + // build the list of all intersections + allIntersections.resize(yMax - yMin + 1); + + for (i = 0; i < xPath.length; ++i) { + seg = &xPath.segs[i]; + if (seg->flags & splashXPathFlip) { + segYMin = seg->y1; + segYMax = seg->y0; + } else { + segYMin = seg->y0; + segYMax = seg->y1; + } + if (seg->flags & splashXPathHoriz) { + y = splashFloor(seg->y0); + if (y >= yMin && y <= yMax) { + if (!addIntersection(segYMin, segYMax, y, splashFloor(seg->x0), splashFloor(seg->x1), 0)) { + break; + } + } + } else if (seg->flags & splashXPathVert) { + y0 = splashFloor(segYMin); + if (y0 < yMin) { + y0 = yMin; + } + y1 = splashFloor(segYMax); + if (y1 > yMax) { + y1 = yMax; + } + x = splashFloor(seg->x0); + int count = eo || (seg->flags & splashXPathFlip) ? 1 : -1; + for (y = y0; y <= y1; ++y) { + if (!addIntersection(segYMin, segYMax, y, x, x, count)) { + break; + } + } + } else { + if (seg->x0 < seg->x1) { + segXMin = seg->x0; + segXMax = seg->x1; + } else { + segXMin = seg->x1; + segXMax = seg->x0; + } + y0 = splashFloor(segYMin); + if (y0 < yMin) { + y0 = yMin; + } + y1 = splashFloor(segYMax); + if (y1 > yMax) { + y1 = yMax; + } + int count = eo || (seg->flags & splashXPathFlip) ? 1 : -1; + // Calculate the projected intersection of the segment with the + // X-Axis. + SplashCoord xbase = seg->x0 - (seg->y0 * seg->dxdy); + xx0 = xbase + ((SplashCoord)y0) * seg->dxdy; + // the segment may not actually extend to the top and/or bottom edges + if (xx0 < segXMin) { + xx0 = segXMin; + } else if (xx0 > segXMax) { + xx0 = segXMax; + } + int x0 = splashFloor(xx0); + + for (y = y0; y <= y1; ++y) { + xx1 = xbase + ((SplashCoord)(y + 1) * seg->dxdy); + + if (xx1 < segXMin) { + xx1 = segXMin; + } else if (xx1 > segXMax) { + xx1 = segXMax; + } + int x1 = splashFloor(xx1); + if (!addIntersection(segYMin, segYMax, y, x0, x1, count)) { + break; + } + + xx0 = xx1; + x0 = x1; + } + } + } + for (auto &line : allIntersections) { + std::sort(line.begin(), line.end(), [](const SplashIntersect i0, const SplashIntersect i1) { return i0.x0 < i1.x0; }); + } +} + +inline bool SplashXPathScanner::addIntersection(double segYMin, double segYMax, int y, int x0, int x1, int count) +{ + SplashIntersect intersect; + intersect.y = y; + if (x0 < x1) { + intersect.x0 = x0; + intersect.x1 = x1; + } else { + intersect.x0 = x1; + intersect.x1 = x0; + } + if (segYMin <= y && (SplashCoord)y < segYMax) { + intersect.count = count; + } else { + intersect.count = 0; + } + + auto &line = allIntersections[y - yMin]; +#ifndef USE_BOOST_HEADERS + if (line.empty()) { + line.reserve(4); + } +#endif + line.push_back(intersect); + + return true; +} + +void SplashXPathScanner::renderAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y, bool adjustVertLine) const +{ + int xx0, xx1, xx, xxMin, xxMax, yy, yyMax, interCount; + size_t interIdx; + unsigned char mask; + SplashColorPtr p; + + memset(aaBuf->getDataPtr(), 0, aaBuf->getRowSize() * aaBuf->getHeight()); + xxMin = aaBuf->getWidth(); + xxMax = -1; + if (yMin <= yMax) { + yy = 0; + yyMax = splashAASize - 1; + // clamp start and end position + if (yMin > splashAASize * y) { + yy = yMin - splashAASize * y; + } + if (yyMax + splashAASize * y > yMax) { + yyMax = yMax - splashAASize * y; + } + + for (; yy <= yyMax; ++yy) { + const auto &line = allIntersections[splashAASize * y + yy - yMin]; + interIdx = 0; + interCount = 0; + while (interIdx < line.size()) { + xx0 = line[interIdx].x0; + xx1 = line[interIdx].x1; + interCount += line[interIdx].count; + ++interIdx; + while (interIdx < line.size() && (line[interIdx].x0 <= xx1 || (eo ? (interCount & 1) : (interCount != 0)))) { + if (line[interIdx].x1 > xx1) { + xx1 = line[interIdx].x1; + } + interCount += line[interIdx].count; + ++interIdx; + } + if (xx0 < 0) { + xx0 = 0; + } + ++xx1; + if (xx1 > aaBuf->getWidth()) { + xx1 = aaBuf->getWidth(); + } + // set [xx0, xx1) to 1 + if (xx0 < xx1) { + xx = xx0; + p = aaBuf->getDataPtr() + yy * aaBuf->getRowSize() + (xx >> 3); + if (xx & 7) { + mask = adjustVertLine ? 0xff : 0xff >> (xx & 7); + if (!adjustVertLine && (xx & ~7) == (xx1 & ~7)) { + mask &= (unsigned char)(0xff00 >> (xx1 & 7)); + } + *p++ |= mask; + xx = (xx & ~7) + 8; + } + for (; xx + 7 < xx1; xx += 8) { + *p++ |= 0xff; + } + if (xx < xx1) { + *p |= adjustVertLine ? 0xff : (unsigned char)(0xff00 >> (xx1 & 7)); + } + } + if (xx0 < xxMin) { + xxMin = xx0; + } + if (xx1 > xxMax) { + xxMax = xx1; + } + } + } + } + if (xxMin > xxMax) { + xxMin = xxMax; + } + *x0 = xxMin / splashAASize; + *x1 = (xxMax - 1) / splashAASize; +} + +void SplashXPathScanner::clipAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y) const +{ + int xx0, xx1, xx, yy, yyMin, yyMax, interCount; + size_t interIdx; + unsigned char mask; + SplashColorPtr p; + + yyMin = 0; + yyMax = splashAASize - 1; + // clamp start and end position + if (yMin > splashAASize * y) { + yyMin = yMin - splashAASize * y; + } + if (yyMax + splashAASize * y > yMax) { + yyMax = yMax - splashAASize * y; + } + for (yy = 0; yy < splashAASize; ++yy) { + xx = *x0 * splashAASize; + if (yy >= yyMin && yy <= yyMax) { + const int intersectionIndex = splashAASize * y + yy - yMin; + if (unlikely(intersectionIndex < 0 || (unsigned)intersectionIndex >= allIntersections.size())) { + break; + } + const auto &line = allIntersections[intersectionIndex]; + interIdx = 0; + interCount = 0; + while (interIdx < line.size() && xx < (*x1 + 1) * splashAASize) { + xx0 = line[interIdx].x0; + xx1 = line[interIdx].x1; + interCount += line[interIdx].count; + ++interIdx; + while (interIdx < line.size() && (line[interIdx].x0 <= xx1 || (eo ? (interCount & 1) : (interCount != 0)))) { + if (line[interIdx].x1 > xx1) { + xx1 = line[interIdx].x1; + } + interCount += line[interIdx].count; + ++interIdx; + } + if (xx0 > aaBuf->getWidth()) { + xx0 = aaBuf->getWidth(); + } + // set [xx, xx0) to 0 + if (xx < xx0) { + p = aaBuf->getDataPtr() + yy * aaBuf->getRowSize() + (xx >> 3); + if (xx & 7) { + mask = (unsigned char)(0xff00 >> (xx & 7)); + if ((xx & ~7) == (xx0 & ~7)) { + mask |= 0xff >> (xx0 & 7); + } + *p++ &= mask; + xx = (xx & ~7) + 8; + } + for (; xx + 7 < xx0; xx += 8) { + *p++ = 0x00; + } + if (xx < xx0) { + *p &= 0xff >> (xx0 & 7); + } + } + if (xx1 >= xx) { + xx = xx1 + 1; + } + } + } + xx0 = (*x1 + 1) * splashAASize; + if (xx0 > aaBuf->getWidth()) { + xx0 = aaBuf->getWidth(); + } + // set [xx, xx0) to 0 + if (xx < xx0 && xx >= 0) { + p = aaBuf->getDataPtr() + yy * aaBuf->getRowSize() + (xx >> 3); + if (xx & 7) { + mask = (unsigned char)(0xff00 >> (xx & 7)); + if ((xx & ~7) == (xx0 & ~7)) { + mask &= 0xff >> (xx0 & 7); + } + *p++ &= mask; + xx = (xx & ~7) + 8; + } + for (; xx + 7 < xx0; xx += 8) { + *p++ = 0x00; + } + if (xx < xx0) { + *p &= 0xff >> (xx0 & 7); + } + } + } +} diff --git a/poppler-24.05.0/splash/SplashXPathScanner.h b/poppler-24.05.0/splash/SplashXPathScanner.h new file mode 100644 index 0000000000000000000000000000000000000000..476e98c92a3513d0bb8c8c720e67718f494aad93 --- /dev/null +++ b/poppler-24.05.0/splash/SplashXPathScanner.h @@ -0,0 +1,136 @@ +//======================================================================== +// +// SplashXPathScanner.h +// +//======================================================================== + +//======================================================================== +// +// 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) 2013, 2014, 2021 Thomas Freitag +// Copyright (C) 2018, 2021 Albert Astals Cid +// Copyright (C) 2018 Stefan Brüns +// +// 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 +// +//======================================================================== + +#ifndef SPLASHXPATHSCANNER_H +#define SPLASHXPATHSCANNER_H + +#include "SplashTypes.h" + +#include + +#ifdef USE_BOOST_HEADERS +# include +#endif + +#include + +class SplashXPath; +class SplashBitmap; + +struct SplashIntersect +{ + int y; + int x0, x1; // intersection of segment with [y, y+1) + int count; // EO/NZWN counter increment +}; + +//------------------------------------------------------------------------ +// SplashXPathScanner +//------------------------------------------------------------------------ + +class SplashXPathScanner +{ +public: + // Create a new SplashXPathScanner object. must be sorted. + SplashXPathScanner(const SplashXPath &xPath, bool eoA, int clipYMin, int clipYMax); + + ~SplashXPathScanner(); + + SplashXPathScanner(const SplashXPathScanner &) = delete; + SplashXPathScanner &operator=(const SplashXPathScanner &) = delete; + + // Return the path's bounding box. + void getBBox(int *xMinA, int *yMinA, int *xMaxA, int *yMaxA) const + { + *xMinA = xMin; + *yMinA = yMin; + *xMaxA = xMax; + *yMaxA = yMax; + } + + // Return the path's bounding box. + void getBBoxAA(int *xMinA, int *yMinA, int *xMaxA, int *yMaxA) const; + + // Returns true if at least part of the path was outside the + // clipYMin/clipYMax bounds passed to the constructor. + bool hasPartialClip() const { return partialClip; } + + // Return the min/max x values for the span at . + void getSpanBounds(int y, int *spanXMin, int *spanXMax) const; + + // Returns true if (,) is inside the path. + bool test(int x, int y) const; + + // Returns true if the entire span ([,], ) is inside the + // path. + bool testSpan(int x0, int x1, int y) const; + + // Renders one anti-aliased line into . Returns the min and + // max x coordinates with non-zero pixels in and . + void renderAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y, bool adjustVertLine = false) const; + + // Clips an anti-aliased line by setting pixels to zero. On entry, + // all non-zero pixels are between and . This function + // will update and . + void clipAALine(SplashBitmap *aaBuf, int *x0, int *x1, int y) const; + +private: + void computeIntersections(const SplashXPath &xPath); + bool addIntersection(double segYMin, double segYMax, int y, int x0, int x1, int count); + + bool eo; + int xMin, yMin, xMax, yMax; + bool partialClip; + +#ifdef USE_BOOST_HEADERS + typedef boost::container::small_vector IntersectionLine; +#else + typedef std::vector IntersectionLine; +#endif + std::vector allIntersections; + + friend class SplashXPathScanIterator; +}; + +class SplashXPathScanIterator +{ +public: + SplashXPathScanIterator(const SplashXPathScanner &scanner, int y); + + // Returns the next span inside the path at the current y position + // Returns false if there are no more spans. + bool getNextSpan(int *x0, int *x1); + +private: +#ifdef USE_BOOST_HEADERS + typedef boost::container::small_vector IntersectionLine; +#else + typedef std::vector IntersectionLine; +#endif + const IntersectionLine &line; + + size_t interIdx; // current index into + int interCount; // current EO/NZWN counter + const bool eo; +}; + +#endif diff --git a/poppler-24.05.0/test/CMakeLists.txt b/poppler-24.05.0/test/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..afa135292bd12d7cf826c15446bdd5f9c35a8663 --- /dev/null +++ b/poppler-24.05.0/test/CMakeLists.txt @@ -0,0 +1,155 @@ + +if (HAVE_NANOSLEEP OR LIB_RT_HAS_NANOSLEEP) + set (perf_test_SRCS + perf-test.cc + perf-test-preview-dummy.cc + ) + add_executable(perf-test ${perf_test_SRCS}) + target_link_libraries(perf-test poppler) + if (LIB_RT_HAS_NANOSLEEP) + target_link_libraries(perf-test rt) + endif () +endif () + +if (GTK_FOUND) + + include_directories( + ${CMAKE_SOURCE_DIR}/glib + ${CMAKE_BINARY_DIR}/glib + ) + + set (gtk_splash_test_SRCS + gtk-test.cc + ) + poppler_add_test(gtk-test BUILD_GTK_TESTS ${gtk_splash_test_SRCS}) + target_link_libraries(gtk-test ${CAIRO_LIBRARIES} poppler-glib PkgConfig::GTK3) + target_include_directories(gtk-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) + + if (HAVE_CAIRO) + + set (pdf_inspector_SRCS + pdf-inspector.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoFontEngine.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoOutputDev.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc + ) + poppler_add_test(pdf-inspector BUILD_GTK_TESTS ${pdf_inspector_SRCS}) + target_link_libraries(pdf-inspector ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs} PkgConfig::GTK3 poppler) + target_include_directories(pdf-inspector SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) + target_compile_definitions(pdf-inspector PRIVATE -DSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}") + endif () + +endif () + +if (HAVE_CAIRO) + include(CheckCXXSymbolExists) + set (CMAKE_REQUIRED_INCLUDES ${CAIRO_INCLUDE_DIRS}) + check_cxx_symbol_exists(CAIRO_HAS_PNG_FUNCTIONS "cairo.h" HAVE_CAIRO_PNG) + check_cxx_symbol_exists(CAIRO_HAS_PDF_SURFACE "cairo.h" HAVE_CAIRO_PDF) + check_cxx_symbol_exists(CAIRO_HAS_PS_SURFACE "cairo.h" HAVE_CAIRO_PS) + check_cxx_symbol_exists(CAIRO_HAS_SVG_SURFACE "cairo.h" HAVE_CAIRO_SVG) + + if (HAVE_CAIRO_PNG AND HAVE_CAIRO_PDF AND HAVE_CAIRO_PS AND HAVE_CAIRO_SVG) + find_package(Threads) + set(cairo_thread_test_SRCS + cairo-thread-test.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoFontEngine.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoOutputDev.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc + ) + add_executable(cairo-thread-test ${cairo_thread_test_SRCS}) + target_link_libraries(cairo-thread-test ${CAIRO_LIBRARIES} Freetype::Freetype Threads::Threads poppler) + target_include_directories(cairo-thread-test SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) + endif () +endif () + +set (pdf_fullrewrite_SRCS + pdf-fullrewrite.cc + ../utils/parseargs.cc +) +add_executable(pdf-fullrewrite ${pdf_fullrewrite_SRCS}) +target_link_libraries(pdf-fullrewrite poppler) + +# Tests for the image embedding API. +if(ENABLE_LIBPNG OR ENABLE_LIBJPEG) + set(image_embedding_SRCS + image-embedding.cc + ../utils/parseargs.cc + ) + add_executable(image-embedding ${image_embedding_SRCS}) + target_link_libraries(image-embedding poppler) + + set(INPUT_PDF ${TESTDATADIR}/unittestcases/xr01.pdf) + set(IMG_DIR ${TESTDATADIR}/unittestcases/images) + set(IMAGE_EMBEDDING_PATH ${EXECUTABLE_OUTPUT_PATH}/image-embedding) + + if (ENABLE_LIBPNG) + add_test( + NAME embed-png-g1 + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/png-g1.png -depth 8 -colorspace DeviceGray + ) + add_test( + NAME embed-png-g2 + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/png-g2.png -depth 8 -colorspace DeviceGray + ) + add_test( + NAME embed-png-g4 + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/png-g4.png -depth 8 -colorspace DeviceGray + ) + add_test( + NAME embed-png-g8 + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/png-g8.png -depth 8 -colorspace DeviceGray + ) + add_test( + NAME embed-png-g16 + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/png-g16.png -depth 16 -colorspace DeviceGray + ) + add_test( + NAME embed-png-ga8 + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/png-ga8.png -depth 8 -colorspace DeviceGray -smask + ) + add_test( + NAME embed-png-ga16 + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/png-ga16.png -depth 16 -colorspace DeviceGray -smask + ) + add_test( + NAME embed-png-palette + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/png-palette.png -depth 8 -colorspace DeviceRGB + ) + add_test( + NAME embed-png-rgb8 + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/png-rgb8.png -depth 8 -colorspace DeviceRGB + ) + add_test( + NAME embed-png-rgb16 + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/png-rgb16.png -depth 16 -colorspace DeviceRGB + ) + add_test( + NAME embed-png-rgba8 + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/png-rgba8.png -depth 8 -colorspace DeviceRGB -smask + ) + add_test( + NAME embed-png-rgba16 + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/png-rgba16.png -depth 16 -colorspace DeviceRGB -smask + ) + add_test( + NAME embed-malformed-png + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/malformed.png -fail + ) + endif() + + if(ENABLE_LIBJPEG) + add_test( + NAME embed-jpeg + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/jpeg.jpg -depth 8 -colorspace DeviceRGB -filter DCTDecode + ) + add_test( + NAME embed-malformed-jpeg + COMMAND ${IMAGE_EMBEDDING_PATH} ${INPUT_PDF} ${IMG_DIR}/malformed.jpg -fail + ) + endif() + + unset(IMAGE_EMBEDDING_PATH) + unset(IMG_DIR) + unset(INPUT_PDF) +endif() diff --git a/poppler-24.05.0/test/cairo-thread-test.cc b/poppler-24.05.0/test/cairo-thread-test.cc new file mode 100644 index 0000000000000000000000000000000000000000..922ed8130baf3c28b5d30fd1db62ad7ac33da843 --- /dev/null +++ b/poppler-24.05.0/test/cairo-thread-test.cc @@ -0,0 +1,561 @@ +//======================================================================== +// +// cairo-thread-test.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2022 Adrian Johnson +// +//======================================================================== + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include + +#include "goo/GooString.h" +#include "CairoOutputDev.h" +#include "CairoFontEngine.h" +#include "GlobalParams.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "../utils/numberofcharacters.h" + +#include +#include +#include +#include + +static const int renderResolution = 150; + +enum OutputType +{ + png, + pdf, + ps, + svg +}; + +// Lazy creation of PDFDoc +class Document +{ +public: + explicit Document(const std::string &filenameA) : filename(filenameA) { std::call_once(ftLibOnceFlag, FT_Init_FreeType, &ftLib); } + + std::shared_ptr getDoc() + { + std::call_once(docOnceFlag, &Document::openDocument, this); + return doc; + } + + const std::string &getFilename() { return filename; } + CairoFontEngine *getFontEngine() { return fontEngine.get(); } + +private: + void openDocument() + { + doc = PDFDocFactory().createPDFDoc(GooString(filename)); + if (!doc->isOk()) { + fprintf(stderr, "Error opening PDF file %s\n", filename.c_str()); + exit(1); + } + fontEngine = std::make_unique(ftLib); + } + + std::string filename; + std::shared_ptr doc; + std::once_flag docOnceFlag; + std::unique_ptr fontEngine; + + static FT_Library ftLib; + static std::once_flag ftLibOnceFlag; +}; + +FT_Library Document::ftLib; +std::once_flag Document::ftLibOnceFlag; + +struct Job +{ + Job(OutputType typeA, const std::shared_ptr &documentA, int pageNumA, const std::string &outputFileA) : type(typeA), document(documentA), pageNum(pageNumA), outputFile(outputFileA) { } + OutputType type; + std::shared_ptr document; + int pageNum; + std::string outputFile; +}; + +class JobQueue +{ +public: + JobQueue() : shutdownFlag(false) { } + + void pushJob(std::unique_ptr &job) + { + std::scoped_lock lock { mutex }; + queue.push_back(std::move(job)); + condition.notify_one(); + } + + // Wait for job. If shutdownFlag true, will return null if queue empty. + std::unique_ptr popJob() + { + std::unique_lock lock(mutex); + condition.wait(lock, [this] { return !queue.empty() || shutdownFlag; }); + std::unique_ptr job; + if (!queue.empty()) { + job = std::move(queue.front()); + queue.pop_front(); + } else { + condition.notify_all(); // notify waitUntilEmpty() + } + return job; + } + + // When called, popJob() will not block on an empty queue instead returning nullptr + void shutdown() + { + shutdownFlag = true; + condition.notify_all(); + } + + // wait until queue is empty + void waitUntilEmpty() + { + std::unique_lock lock(mutex); + condition.wait(lock, [this] { return queue.empty(); }); + } + +private: + std::deque> queue; + std::mutex mutex; + std::condition_variable condition; + bool shutdownFlag; +}; + +static cairo_status_t writeStream(void *closure, const unsigned char *data, unsigned int length) +{ + FILE *file = (FILE *)closure; + + if (fwrite(data, length, 1, file) == 1) { + return CAIRO_STATUS_SUCCESS; + } else { + return CAIRO_STATUS_WRITE_ERROR; + } +} + +// PDF/PS/SVG output +static void renderDocument(const Job &job) +{ + FILE *f = openFile(job.outputFile.c_str(), "wb"); + if (!f) { + fprintf(stderr, "Error opening output file %s\n", job.outputFile.c_str()); + exit(1); + } + + cairo_surface_t *surface = nullptr; + + switch (job.type) { + case OutputType::pdf: + surface = cairo_pdf_surface_create_for_stream(writeStream, f, 1, 1); + break; + case OutputType::ps: + surface = cairo_ps_surface_create_for_stream(writeStream, f, 1, 1); + break; + case OutputType::svg: + surface = cairo_svg_surface_create_for_stream(writeStream, f, 1, 1); + break; + case OutputType::png: + break; + } + + cairo_surface_set_fallback_resolution(surface, renderResolution, renderResolution); + + std::unique_ptr cairoOut = std::make_unique(); + + cairoOut->startDoc(job.document->getDoc().get(), job.document->getFontEngine()); + + cairo_status_t status; + for (int pageNum = 1; pageNum <= job.document->getDoc()->getNumPages(); pageNum++) { + double width = job.document->getDoc()->getPageMediaWidth(pageNum); + double height = job.document->getDoc()->getPageMediaHeight(pageNum); + + if (job.type == OutputType::pdf) { + cairo_pdf_surface_set_size(surface, width, height); + } else if (job.type == OutputType::ps) { + cairo_ps_surface_set_size(surface, width, height); + } + + cairo_t *cr = cairo_create(surface); + + cairoOut->setCairo(cr); + cairoOut->setPrinting(true); + + cairo_save(cr); + job.document->getDoc()->displayPageSlice(cairoOut.get(), pageNum, 72.0, 72.0, 0, /* rotate */ + true, /* useMediaBox */ + false, /* Crop */ + true /*printing*/, -1, -1, -1, -1); + cairo_restore(cr); + cairoOut->setCairo(nullptr); + + status = cairo_status(cr); + if (status) { + fprintf(stderr, "cairo error: %s\n", cairo_status_to_string(status)); + } + cairo_destroy(cr); + } + + cairo_surface_finish(surface); + status = cairo_surface_status(surface); + if (status) { + fprintf(stderr, "cairo error: %s\n", cairo_status_to_string(status)); + } + cairo_surface_destroy(surface); + fclose(f); +} + +// PNG page output +static void renderPage(const Job &job) +{ + double width = job.document->getDoc()->getPageMediaWidth(job.pageNum); + double height = job.document->getDoc()->getPageMediaHeight(job.pageNum); + + // convert from points to pixels + width *= renderResolution / 72.0; + height *= renderResolution / 72.0; + + cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, static_cast(ceil(width)), static_cast(ceil(height))); + + std::unique_ptr cairoOut = std::make_unique(); + + cairoOut->startDoc(job.document->getDoc().get(), job.document->getFontEngine()); + cairo_t *cr = cairo_create(surface); + cairo_status_t status; + + cairoOut->setCairo(cr); + cairoOut->setPrinting(false); + + cairo_save(cr); + cairo_scale(cr, renderResolution / 72.0, renderResolution / 72.0); + + job.document->getDoc()->displayPageSlice(cairoOut.get(), job.pageNum, 72.0, 72.0, 0, /* rotate */ + true, /* useMediaBox */ + false, /* Crop */ + false /*printing */, -1, -1, -1, -1); + cairo_restore(cr); + + cairoOut->setCairo(nullptr); + + // Blend onto white page + cairo_save(cr); + cairo_set_operator(cr, CAIRO_OPERATOR_DEST_OVER); + cairo_set_source_rgb(cr, 1, 1, 1); + cairo_paint(cr); + cairo_restore(cr); + + status = cairo_status(cr); + if (status) { + fprintf(stderr, "cairo error: %s\n", cairo_status_to_string(status)); + } + cairo_destroy(cr); + + FILE *f = openFile(job.outputFile.c_str(), "wb"); + if (!f) { + fprintf(stderr, "Error opening output file %s\n", job.outputFile.c_str()); + exit(1); + } + cairo_surface_write_to_png_stream(surface, writeStream, f); + fclose(f); + + cairo_surface_finish(surface); + status = cairo_surface_status(surface); + if (status) { + fprintf(stderr, "cairo error: %s\n", cairo_status_to_string(status)); + } + cairo_surface_destroy(surface); +} + +static void runThread(const std::shared_ptr &jobQueue) +{ + while (true) { + std::unique_ptr job = jobQueue->popJob(); + if (!job) { + break; + } + switch (job->type) { + case OutputType::png: + renderPage(*job); + break; + case OutputType::pdf: + case OutputType::ps: + case OutputType::svg: + renderDocument(*job); + break; + } + } +} + +static void printUsage() +{ + int default_threads = std::max(1, (int)std::thread::hardware_concurrency()); + printf("cairo-thread-test [-j jobs] [-p priority] [ ...]...\n"); + printf(" -j num number of concurrent threads (default %d)\n", default_threads); + printf(" -p priority is one of:\n"); + printf(" page one page at a time will be queued from each document in round-robin fashion (default).\n"); + printf(" document all pages in the first document will be queued before processing to the next document.\n"); + printf(" Note: documents with vector output will be handled in one job. They can not be parallelized.\n"); + printf(" is one of -png, -pdf, -ps, -svg\n"); + printf(" The output option will apply to all documents after the option until a different option is specified\n"); +} + +// Parse -j and -p options. These must appear before any other arguments +static bool getThreadsAndPriority(int &argc, char **&argv, int &numThreads, bool &documentPriority) +{ + numThreads = std::max(1, (int)std::thread::hardware_concurrency()); + documentPriority = false; + + while (argc > 0) { + std::string arg(*argv); + if (arg == "-j") { + argc--; + argv++; + if (argc == 0) { + return false; + } + numThreads = atoi(*argv); + if (numThreads == 0) { + return false; + } + argc--; + argv++; + } else if (arg == "-p") { + argc--; + argv++; + if (argc == 0) { + return false; + } + arg = *argv; + if (arg == "document") { + documentPriority = true; + } else if (arg == "page") { + documentPriority = false; + + } else { + return false; + } + argc--; + argv++; + } else { + // file or output option + break; + } + } + return true; +} + +// eg "-png doc1.pdf -ps doc2.pdf doc3.pdf -png doc4.pdf" +static bool getOutputTypeAndDocument(int &argc, char **&argv, OutputType &outputType, std::string &filename) +{ + static OutputType type; + static bool typeInitialized = false; + + while (argc > 0) { + std::string arg(*argv); + if (arg == "-png") { + argc--; + argv++; + type = OutputType::png; + typeInitialized = true; + } else if (arg == "-pdf") { + argc--; + argv++; + type = OutputType::pdf; + typeInitialized = true; + } else if (arg == "-ps") { + argc--; + argv++; + type = OutputType::ps; + typeInitialized = true; + } else if (arg == "-svg") { + argc--; + argv++; + type = OutputType::svg; + typeInitialized = true; + } else { + // filename + if (!typeInitialized) { + return false; + } + outputType = type; + filename = *argv; + argc--; + argv++; + return true; + } + } + return false; +} + +// "../a/b/foo.pdf" => "foo" +static std::string getBaseName(const std::string &filename) +{ + // strip everything up to last '/' + size_t slash_pos = filename.find_last_of('/'); + std::string basename; + if (slash_pos != std::string::npos) { + basename = filename.substr(slash_pos + 1, std::string::npos); + } else { + basename = filename; + } + + // remove .pdf extension + size_t dot_pos = basename.find_last_of('.'); + if (dot_pos != std::string::npos) { + if (basename.compare(dot_pos, std::string::npos, ".pdf") == 0) { + basename.erase(dot_pos); + } + } + return basename; +} + +// Represents an input file on the command line +struct InputFile +{ + InputFile(const std::string &filename, OutputType typeA) : type(typeA) + { + document = std::make_shared(filename); + basename = getBaseName(filename); + currentPage = 0; + numPages = 0; // filled in later + numDigits = 0; // filled in later + } + std::shared_ptr document; + OutputType type; + + // Used when creating jobs for this InputFile + int currentPage; + std::string basename; + int numPages; + int numDigits; +}; + +// eg "basename.out-123.png" or "basename.out.pdf" +static std::string getOutputName(const InputFile &input) +{ + std::string output; + char buf[30]; + switch (input.type) { + case OutputType::png: + std::snprintf(buf, sizeof(buf), ".out-%0*d.png", input.numDigits, input.currentPage); + output = input.basename + buf; + break; + case OutputType::pdf: + output = input.basename + ".out.pdf"; + break; + case OutputType::ps: + output = input.basename + ".out.ps"; + break; + case OutputType::svg: + output = input.basename + ".out.svg"; + break; + } + return output; +} + +int main(int argc, char *argv[]) +{ + if (argc < 3) { + printUsage(); + exit(1); + } + + // skip program name + argc--; + argv++; + + int numThreads; + bool documentPriority; + if (!getThreadsAndPriority(argc, argv, numThreads, documentPriority)) { + printUsage(); + exit(1); + } + + globalParams = std::make_unique(); + + std::shared_ptr jobQueue = std::make_shared(); + std::vector threads; + threads.reserve(4); + for (int i = 0; i < numThreads; i++) { + threads.emplace_back(runThread, jobQueue); + } + + std::vector inputFiles; + + while (argc > 0) { + std::string filename; + OutputType type; + if (!getOutputTypeAndDocument(argc, argv, type, filename)) { + printUsage(); + exit(1); + } + InputFile input(filename, type); + inputFiles.push_back(input); + } + + if (documentPriority) { + while (true) { + bool jobAdded = false; + for (auto &input : inputFiles) { + if (input.numPages == 0) { + // first time seen + if (input.type == OutputType::png) { + input.numPages = input.document->getDoc()->getNumPages(); + input.numDigits = numberOfCharacters(input.numPages); + } else { + input.numPages = 1; // Use 1 for vector output as there is only one output file + } + } + if (input.currentPage < input.numPages) { + input.currentPage++; + std::string output = getOutputName(input); + std::unique_ptr job = std::make_unique(input.type, input.document, input.currentPage, output); + jobQueue->pushJob(job); + jobAdded = true; + } + } + if (!jobAdded) { + break; + } + } + } else { + for (auto &input : inputFiles) { + if (input.type == OutputType::png) { + input.numPages = input.document->getDoc()->getNumPages(); + input.numDigits = numberOfCharacters(input.numPages); + for (int i = 1; i <= input.numPages; i++) { + input.currentPage = i; + std::string output = getOutputName(input); + std::unique_ptr job = std::make_unique(input.type, input.document, input.currentPage, output); + jobQueue->pushJob(job); + } + } else { + std::string output = getOutputName(input); + std::unique_ptr job = std::make_unique(input.type, input.document, 1, output); + jobQueue->pushJob(job); + } + } + } + + jobQueue->shutdown(); + jobQueue->waitUntilEmpty(); + + for (int i = 0; i < numThreads; i++) { + threads[i].join(); + } + + return 0; +} diff --git a/poppler-24.05.0/test/goostring-format-checker/README b/poppler-24.05.0/test/goostring-format-checker/README new file mode 100644 index 0000000000000000000000000000000000000000..3be801c8d6a25822bfdc40109cb33453785ea454 --- /dev/null +++ b/poppler-24.05.0/test/goostring-format-checker/README @@ -0,0 +1,16 @@ +== Clang++ compiler plugin that checks usage of GooString::format-like functions == + +1) Compile the plugin with: + clang++ -shared -o goostring-format-checker.so goostring-format-checker.cc -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS + +2) Compile poppler and pass the following options to the clang++ compiler: + -Xclang -load -Xclang goostring-format-checker.so -Xclang -plugin -Xclang goostring-format-check + +Example: +$ clang++ -fPIC -shared -o goostring-format-checker.so goostring-format-checker.cc -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS +$ export CXX=clang++ +$ export CXXFLAGS="-Xclang -load -Xclang $PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang goostring-format-checker" +$ mkdir build +$ cd build +$ cmake ../../.. +$ make diff --git a/poppler-24.05.0/test/goostring-format-checker/goostring-format-checker.cc b/poppler-24.05.0/test/goostring-format-checker/goostring-format-checker.cc new file mode 100644 index 0000000000000000000000000000000000000000..41098561e5259eb074bf39478127d2197ff49674 --- /dev/null +++ b/poppler-24.05.0/test/goostring-format-checker/goostring-format-checker.cc @@ -0,0 +1,361 @@ +/* + * goostring-format-checker.cc + * + * This file is licensed under the GPLv2 or later + * + * Clang++ compiler plugin that checks usage of GooString::format-like functions + * + * Copyright (C) 2014 Fabio D'Urso + * Copyright (C) 2021 Albert Astals Cid + */ + +#include + +#include +#include +#include +#include +#include +#include + +using namespace clang; + +namespace { + +class GooStringFormatCheckerVisitor : public RecursiveASTVisitor +{ +public: + explicit GooStringFormatCheckerVisitor(CompilerInstance *compInst); + + bool VisitFunctionDecl(FunctionDecl *funcDecl); + bool VisitCallExpr(CallExpr *callExpr); + +private: + /* Returns the index of the format argument, or -1 if the function must + * not be checked */ + int findFormatArgumentIndex(const FunctionDecl *funcDecl) const; + + /* Returns the SourceLocation of the n-th character */ + SourceLocation getLocationOfCharacter(const StringLiteral *strLiteral, unsigned n); + + /* Validates usage of a placeholder and returns the corresponding + * argument index, or -1 in case of errors */ + int verifyPlaceholder(const CallExpr *callExpr, const SourceLocation &placeholderLocation, std::string &placeholderText, int baseArgIdx) const; + + CompilerInstance *compInst; + DiagnosticsEngine *diag; + unsigned diag_badFuncZeroArgs; + unsigned diag_badFuncNonVariadic; + unsigned diag_badFuncLastArgInvalidType; + unsigned diag_notStringLiteral; + unsigned diag_notPlainASCII; + unsigned diag_wrongOrder; + unsigned diag_unescapedBracket; + unsigned diag_unterminatedPlaceholder; + unsigned diag_unconsumedArgs; + unsigned diag_missingColon; + unsigned diag_missingArgNumber; + unsigned diag_badArgNumber; + unsigned diag_argumentNotPresent; + unsigned diag_badPrecision; + unsigned diag_badType; + unsigned diag_wrongArgExprType; +}; + +GooStringFormatCheckerVisitor::GooStringFormatCheckerVisitor(CompilerInstance *compInst) : compInst(compInst) +{ + diag = &compInst->getDiagnostics(); + + diag_badFuncZeroArgs = diag->getCustomDiagID(DiagnosticsEngine::Error, "Cannot enforce format string checks on a function that takes no arguments"); + diag_badFuncNonVariadic = diag->getCustomDiagID(DiagnosticsEngine::Error, "Cannot enforce format string checks on a non-variadic function"); + diag_badFuncLastArgInvalidType = diag->getCustomDiagID(DiagnosticsEngine::Error, "Cannot enforce format string checks if the last non-variadic argument is not const char *"); + diag_notStringLiteral = diag->getCustomDiagID(DiagnosticsEngine::Warning, "Format string is not a string literal. Skipping format checks"); + diag_notPlainASCII = diag->getCustomDiagID(DiagnosticsEngine::Warning, "Format string contains non-ASCII or NUL characters. Skipping format checks"); + diag_wrongOrder = diag->getCustomDiagID(DiagnosticsEngine::Error, "Argument %0 must be consumed before argument %1"); + diag_unescapedBracket = diag->getCustomDiagID(DiagnosticsEngine::Error, "Unescaped '}' character"); + diag_unterminatedPlaceholder = diag->getCustomDiagID(DiagnosticsEngine::Error, "Unterminated placeholder"); + diag_unconsumedArgs = diag->getCustomDiagID(DiagnosticsEngine::Warning, "Unconsumed argument(s)"); + diag_missingColon = diag->getCustomDiagID(DiagnosticsEngine::Error, "Invalid placeholder '{%0}': missing colon character"); + diag_missingArgNumber = diag->getCustomDiagID(DiagnosticsEngine::Error, "Invalid placeholder '{%0}': missing number"); + diag_badArgNumber = diag->getCustomDiagID(DiagnosticsEngine::Error, "Invalid placeholder '{%0}': bad number"); + diag_argumentNotPresent = diag->getCustomDiagID(DiagnosticsEngine::Error, "Argument for placeholder '{%0}' is not present"); + diag_badPrecision = diag->getCustomDiagID(DiagnosticsEngine::Error, "Invalid placeholder '{%0}': bad value"); + diag_badType = diag->getCustomDiagID(DiagnosticsEngine::Error, "Invalid placeholder '{%0}': bad specifier"); + diag_wrongArgExprType = diag->getCustomDiagID(DiagnosticsEngine::Error, "Expected %0 for placeholder '{%1}', found %2"); +} + +bool GooStringFormatCheckerVisitor::VisitFunctionDecl(FunctionDecl *funcDecl) +{ + findFormatArgumentIndex(funcDecl); // Spot misuse of the "gooformat" annotation + return true; +} + +bool GooStringFormatCheckerVisitor::VisitCallExpr(CallExpr *callExpr) +{ + /*** Locate format argument or skip calls that needn't be checked ***/ + + const int formatArgIdx = findFormatArgumentIndex(callExpr->getDirectCallee()); + if (formatArgIdx == -1) + return true; + + /*** Obtain format string value ***/ + + const Expr *formatArgExpr = callExpr->getArg(formatArgIdx); + while (formatArgExpr->getStmtClass() == Stmt::ImplicitCastExprClass) { + formatArgExpr = static_cast(formatArgExpr)->getSubExpr(); + } + if (formatArgExpr->getStmtClass() != Stmt::StringLiteralClass) { + diag->Report(formatArgExpr->getExprLoc(), diag_notStringLiteral); + return true; + } + const StringLiteral *formatArgStrLiteral = static_cast(formatArgExpr); + if (formatArgStrLiteral->containsNonAsciiOrNull()) { + diag->Report(formatArgExpr->getExprLoc(), diag_notPlainASCII); + return true; + } + + /*** Parse format string and verify arguments ***/ + + const std::string format = formatArgStrLiteral->getString().str(); + + /* Keeps track of whether we are currently parsing a character contained + * within '{' ... '}'. If set, current_placeholder contains the contents + * parsed so far (without brackets) */ + bool in_placeholder = false; + std::string current_placeholder; + + // Source location of the current placeholder's opening bracket + SourceLocation placeholderLoc; + + /* Keeps track of the next expected argument number, to check that + * arguments are first consumed in order (eg {0:d}{2:d}{1:d} is wrong). + * Note that it's possible to "look back" at already consumed + * arguments (eg {0:d}{1:d}{0:d} is OK) */ + int nextExpectedArgNum = 0; + + for (unsigned i = 0; i < format.length(); i++) { + if (in_placeholder) { + // Have we reached the end of the placeholder? + if (format[i] == '}') { + in_placeholder = false; + + // Verifies the placeholder and returns the argument number + const int foundArgNum = verifyPlaceholder(callExpr, placeholderLoc, current_placeholder, formatArgIdx + 1); + + // If the placeholder wasn't valid, disable argument order checks + if (foundArgNum == -1) { + nextExpectedArgNum = -1; + } + + // If argument order checks are enabled, let's check! + if (nextExpectedArgNum != -1) { + if (foundArgNum == nextExpectedArgNum) { + nextExpectedArgNum++; + } else if (foundArgNum > nextExpectedArgNum) { + diag->Report(placeholderLoc, diag_wrongOrder) << nextExpectedArgNum << foundArgNum; + nextExpectedArgNum = -1; // disable further checks + } + } + } else { + current_placeholder += format[i]; + } + } else if (format[i] == '{') { + // If we find a '{' then a placeholder is starting... + in_placeholder = true; + current_placeholder = ""; + placeholderLoc = getLocationOfCharacter(formatArgStrLiteral, i); + + // ...unless it's followed by another '{' (escape sequence) + if (i + 1 < format.length() && format[i + 1] == '{') { + i++; // skip next '{' character + in_placeholder = false; + } + } else if (format[i] == '}') { + /* If we have found a '}' and we're not in a placeholder, + * then it *MUST* be followed by another '}' (escape sequence) */ + if (i + 1 >= format.length() || format[i + 1] != '}') { + diag->Report(getLocationOfCharacter(formatArgStrLiteral, i), diag_unescapedBracket); + } else { + i++; // skip next '}' character + } + } + } + + /* If we've reached the end of the format string and in_placeholder is + * still set, then the last placeholder wasn't terminated properly */ + if (in_placeholder) + diag->Report(placeholderLoc, diag_unterminatedPlaceholder); + + int unconsumedArgs = callExpr->getNumArgs() - (formatArgIdx + 1 + nextExpectedArgNum); + if (unconsumedArgs > 0) + diag->Report(callExpr->getArg(callExpr->getNumArgs() - unconsumedArgs)->getExprLoc(), diag_unconsumedArgs); + + return true; +} + +int GooStringFormatCheckerVisitor::findFormatArgumentIndex(const FunctionDecl *funcDecl) const +{ + if (!funcDecl) + return -1; + + AnnotateAttr *annotation = NULL; + for (specific_attr_iterator it = funcDecl->specific_attr_begin(); it != funcDecl->specific_attr_end() && !annotation; ++it) { + if (it->getAnnotation() == "gooformat") + annotation = *it; + } + + // If this function hasn't got the "gooformat" annotation on it + if (!annotation) + return -1; + + if (funcDecl->getNumParams() == 0) { + diag->Report(annotation->getLocation(), diag_badFuncZeroArgs); + return -1; + } + + if (!funcDecl->isVariadic()) { + diag->Report(annotation->getLocation(), diag_badFuncNonVariadic); + return -1; + } + + // Assume the last non-variadic argument is the format specifier + const int formatArgIdx = funcDecl->getNumParams() - 1; + const QualType formatArgType = funcDecl->getParamDecl(formatArgIdx)->getType(); + if (formatArgType.getAsString() != "const char *") { + diag->Report(annotation->getLocation(), diag_badFuncLastArgInvalidType); + return -1; + } + + return formatArgIdx; +} + +SourceLocation GooStringFormatCheckerVisitor::getLocationOfCharacter(const StringLiteral *strLiteral, unsigned n) +{ + return strLiteral->getLocationOfByte(n, compInst->getSourceManager(), compInst->getLangOpts(), compInst->getTarget()); +} + +int GooStringFormatCheckerVisitor::verifyPlaceholder(const CallExpr *callExpr, const SourceLocation &placeholderLocation, std::string &placeholderText, int baseArgIdx) const +{ + // Find the colon that separates the argument number and the format specifier + const size_t delim = placeholderText.find(':'); + if (delim == std::string::npos) { + diag->Report(placeholderLocation, diag_missingColon) << placeholderText; + return -1; + } + if (delim == 0) { + diag->Report(placeholderLocation, diag_missingArgNumber) << placeholderText; + return -1; + } + for (unsigned int i = 0; i < delim; i++) { + if (!isdigit(placeholderText[i])) { + diag->Report(placeholderLocation, diag_badArgNumber) << placeholderText; + return -1; + } + } + + // Extract argument number and its actual position in the call's argument list + const int argNum = atoi(placeholderText.substr(0, delim).c_str()); + const int argIdx = baseArgIdx + argNum; + if (argIdx >= callExpr->getNumArgs()) { + diag->Report(placeholderLocation, diag_argumentNotPresent) << placeholderText; + return argNum; + } + + // Check and strip width/precision specifiers + std::string format = placeholderText.substr(delim + 1); + bool dot_found = false; + while (isdigit(format[0]) || format[0] == '.') { + if (format[0] == '.') { + if (dot_found) { + diag->Report(placeholderLocation, diag_badPrecision) << placeholderText; + return argNum; + } + dot_found = true; + } + format = format.substr(1); + } + + const Expr *argExpr = callExpr->getArg(argIdx); + const QualType qualType = argExpr->getType(); + const Type *valueType = qualType->getUnqualifiedDesugaredType(); + + if (format == "d" || format == "x" || format == "X" || format == "o" || format == "b" || format == "w") { + if (!valueType->isSpecificBuiltinType(BuiltinType::Int)) { + diag->Report(argExpr->getExprLoc(), diag_wrongArgExprType) << "int" << placeholderText << qualType.getAsString(); + } + } else if (format == "ud" || format == "ux" || format == "uX" || format == "uo" || format == "ub") { + if (!valueType->isSpecificBuiltinType(BuiltinType::UInt)) { + diag->Report(argExpr->getExprLoc(), diag_wrongArgExprType) << "unsigned int" << placeholderText << qualType.getAsString(); + } + } else if (format == "ld" || format == "lx" || format == "lX" || format == "lo" || format == "lb") { + if (!valueType->isSpecificBuiltinType(BuiltinType::Long)) { + diag->Report(argExpr->getExprLoc(), diag_wrongArgExprType) << "long" << placeholderText << qualType.getAsString(); + } + } else if (format == "uld" || format == "ulx" || format == "ulX" || format == "ulo" || format == "ulb") { + if (!valueType->isSpecificBuiltinType(BuiltinType::ULong)) { + diag->Report(argExpr->getExprLoc(), diag_wrongArgExprType) << "unsigned long" << placeholderText << qualType.getAsString(); + } + } else if (format == "lld" || format == "llx" || format == "llX" || format == "llo" || format == "llb") { + if (!valueType->isSpecificBuiltinType(BuiltinType::LongLong)) { + diag->Report(argExpr->getExprLoc(), diag_wrongArgExprType) << "long long" << placeholderText << qualType.getAsString(); + } + } else if (format == "ulld" || format == "ullx" || format == "ullX" || format == "ullo" || format == "ullb") { + if (!valueType->isSpecificBuiltinType(BuiltinType::ULongLong)) { + diag->Report(argExpr->getExprLoc(), diag_wrongArgExprType) << "unsigned long long" << placeholderText << qualType.getAsString(); + } + } else if (format == "f" || format == "g" || format == "gs") { + if (!valueType->isSpecificBuiltinType(BuiltinType::Double)) { + diag->Report(argExpr->getExprLoc(), diag_wrongArgExprType) << "float or double" << placeholderText << qualType.getAsString(); + } + } else if (format == "c") { + if (!valueType->isSpecificBuiltinType(BuiltinType::UInt) && !valueType->isSpecificBuiltinType(BuiltinType::Int)) { + diag->Report(argExpr->getExprLoc(), diag_wrongArgExprType) << "char, short or int" << placeholderText << qualType.getAsString(); + } + } else if (format == "s") { + if (!valueType->isPointerType() || !valueType->getPointeeType()->getUnqualifiedDesugaredType()->isCharType()) { + diag->Report(argExpr->getExprLoc(), diag_wrongArgExprType) << "char *" << placeholderText << qualType.getAsString(); + } + } else if (format == "t") { + const CXXRecordDecl *pointeeType = valueType->isPointerType() ? valueType->getPointeeType()->getAsCXXRecordDecl() : 0; + if (pointeeType == 0 || pointeeType->getQualifiedNameAsString() != "GooString") { + diag->Report(argExpr->getExprLoc(), diag_wrongArgExprType) << "GooString *" << placeholderText << qualType.getAsString(); + } + } else { + diag->Report(placeholderLocation, diag_badType) << placeholderText; + return argNum; + } + + return argNum; +} + +class GooStringFormatCheckerConsumer : public clang::ASTConsumer +{ +public: + GooStringFormatCheckerConsumer(CompilerInstance *compInst) : visitor(compInst) { } + + virtual void HandleTranslationUnit(clang::ASTContext &ctx) { visitor.TraverseDecl(ctx.getTranslationUnitDecl()); } + +private: + GooStringFormatCheckerVisitor visitor; +}; + +class GooStringFormatCheckerAction : public PluginASTAction +{ +protected: + std::unique_ptr CreateASTConsumer(CompilerInstance &compInst, llvm::StringRef inFile) { return std::make_unique(&compInst); } + + bool ParseArgs(const CompilerInstance &compInst, const std::vector &args) + { + if (args.size() != 0) { + DiagnosticsEngine &D = compInst.getDiagnostics(); + D.Report(D.getCustomDiagID(DiagnosticsEngine::Error, "goostring-format-checker takes no arguments")); + return false; + } else { + return true; + } + } +}; + +} + +static FrontendPluginRegistry::Add X("goostring-format-checker", "Checks usage of GooString::format-like functions"); diff --git a/poppler-24.05.0/test/gtk-test.cc b/poppler-24.05.0/test/gtk-test.cc new file mode 100644 index 0000000000000000000000000000000000000000..1507b0e63010580702ebcd1339b59434bad07adb --- /dev/null +++ b/poppler-24.05.0/test/gtk-test.cc @@ -0,0 +1,399 @@ +#include + +#include +#include +#include +#include "Object.h" +#include "SplashOutputDev.h" +#include "GfxState.h" + +#include + +#include "PDFDoc.h" +#include "GlobalParams.h" +#include "ErrorCodes.h" +#include +#include +#include +#include +#include + +static int requested_page = 0; +static gboolean cairo_output = FALSE; +static gboolean splash_output = FALSE; +#ifndef G_OS_WIN32 +static gboolean args_are_fds = FALSE; +#endif +static const char **file_arguments = nullptr; +static const GOptionEntry options[] = { { "cairo", 'c', 0, G_OPTION_ARG_NONE, &cairo_output, "Cairo Output Device", nullptr }, + { "splash", 's', 0, G_OPTION_ARG_NONE, &splash_output, "Splash Output Device", nullptr }, + { "page", 'p', 0, G_OPTION_ARG_INT, &requested_page, "Page number", "PAGE" }, +#ifndef G_OS_WIN32 + { "fd", 'f', 0, G_OPTION_ARG_NONE, &args_are_fds, "File descriptors", nullptr }, +#endif + { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, nullptr, "PDF-FILES…" }, + {} }; + +static GList *view_list = nullptr; + +//------------------------------------------------------------------------ + +#define xOutMaxRGBCube 6 // max size of RGB color cube + +//------------------------------------------------------------------------ +// GDKSplashOutputDev +//------------------------------------------------------------------------ + +class GDKSplashOutputDev : public SplashOutputDev +{ +public: + GDKSplashOutputDev(GdkScreen *screen, void (*redrawCbkA)(void *data), void *redrawCbkDataA, SplashColor sc); + + ~GDKSplashOutputDev() override; + + //----- initialization and control + + // End a page. + void endPage() override; + + // Dump page contents to display. + void dump() override; + + //----- update text state + void updateFont(GfxState *state) override; + + //----- special access + + // Clear out the document (used when displaying an empty window). + void clear(); + + // Copy the rectangle (srcX, srcY, width, height) to (destX, destY) + // in destDC. + void redraw(int srcX, int srcY, cairo_t *cr, int destX, int destY, int width, int height); + +private: + int incrementalUpdate; + void (*redrawCbk)(void *data); + void *redrawCbkData; +}; + +typedef struct +{ + PopplerDocument *doc; + GtkWidget *drawing_area; + GtkWidget *spin_button; + cairo_surface_t *surface; + GDKSplashOutputDev *out; +} View; + +//------------------------------------------------------------------------ +// Constants and macros +//------------------------------------------------------------------------ + +#define xoutRound(x) ((int)(x + 0.5)) + +//------------------------------------------------------------------------ +// GDKSplashOutputDev +//------------------------------------------------------------------------ + +GDKSplashOutputDev::GDKSplashOutputDev(GdkScreen *screen, void (*redrawCbkA)(void *data), void *redrawCbkDataA, SplashColor sc) : SplashOutputDev(splashModeRGB8, 4, false, sc), incrementalUpdate(1) +{ + redrawCbk = redrawCbkA; + redrawCbkData = redrawCbkDataA; +} + +GDKSplashOutputDev::~GDKSplashOutputDev() { } + +void GDKSplashOutputDev::clear() +{ + startDoc(nullptr); + startPage(0, nullptr, nullptr); +} + +void GDKSplashOutputDev::endPage() +{ + SplashOutputDev::endPage(); + if (!incrementalUpdate) { + (*redrawCbk)(redrawCbkData); + } +} + +void GDKSplashOutputDev::dump() +{ + if (incrementalUpdate && redrawCbk) { + (*redrawCbk)(redrawCbkData); + } +} + +void GDKSplashOutputDev::updateFont(GfxState *state) +{ + SplashOutputDev::updateFont(state); +} + +void GDKSplashOutputDev::redraw(int srcX, int srcY, cairo_t *cr, int destX, int destY, int width, int height) +{ + GdkPixbuf *pixbuf; + int gdk_rowstride; + + gdk_rowstride = getBitmap()->getRowSize(); + pixbuf = gdk_pixbuf_new_from_data(getBitmap()->getDataPtr() + srcY * gdk_rowstride + srcX * 3, GDK_COLORSPACE_RGB, FALSE, 8, width, height, gdk_rowstride, nullptr, nullptr); + + gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0); + cairo_paint(cr); + + g_object_unref(pixbuf); +} + +static gboolean drawing_area_draw(GtkWidget *drawing_area, cairo_t *cr, View *view) +{ + GdkRectangle document; + GdkRectangle clip; + GdkRectangle draw; + + document.x = 0; + document.y = 0; + if (cairo_output) { + document.width = cairo_image_surface_get_width(view->surface); + document.height = cairo_image_surface_get_height(view->surface); + } else { + document.width = view->out->getBitmapWidth(); + document.height = view->out->getBitmapHeight(); + } + + if (!gdk_cairo_get_clip_rectangle(cr, &clip)) { + return FALSE; + } + + if (!gdk_rectangle_intersect(&document, &clip, &draw)) { + return FALSE; + } + + if (cairo_output) { + cairo_set_source_surface(cr, view->surface, 0, 0); + cairo_paint(cr); + } else { + view->out->redraw(draw.x, draw.y, cr, draw.x, draw.y, draw.width, draw.height); + } + + return TRUE; +} + +static void view_set_page(View *view, int page) +{ + int w, h; + + if (cairo_output) { + cairo_t *cr; + double width, height; + PopplerPage *poppler_page; + + poppler_page = poppler_document_get_page(view->doc, page); + poppler_page_get_size(poppler_page, &width, &height); + w = (int)ceil(width); + h = (int)ceil(height); + + if (view->surface) { + cairo_surface_destroy(view->surface); + } + view->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h); + + cr = cairo_create(view->surface); + poppler_page_render(poppler_page, cr); + + cairo_set_operator(cr, CAIRO_OPERATOR_DEST_OVER); + cairo_set_source_rgb(cr, 1., 1., 1.); + cairo_paint(cr); + + cairo_destroy(cr); + g_object_unref(poppler_page); + } else { + view->doc->doc->displayPage(view->out, page + 1, 72, 72, 0, false, true, true); + w = view->out->getBitmapWidth(); + h = view->out->getBitmapHeight(); + } + + gtk_widget_set_size_request(view->drawing_area, w, h); + gtk_widget_queue_draw(view->drawing_area); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(view->spin_button), page); +} + +static void redraw_callback(void *data) +{ + View *view = (View *)data; + + gtk_widget_queue_draw(view->drawing_area); +} + +static void view_free(View *view) +{ + if (G_UNLIKELY(!view)) { + return; + } + + g_object_unref(view->doc); + delete view->out; + cairo_surface_destroy(view->surface); + g_slice_free(View, view); +} + +static void destroy_window_callback(GtkWindow *window, View *view) +{ + view_list = g_list_remove(view_list, view); + view_free(view); + + if (!view_list) { + gtk_main_quit(); + } +} + +static void page_changed_callback(GtkSpinButton *button, View *view) +{ + int page; + + page = gtk_spin_button_get_value_as_int(button); + view_set_page(view, page); +} + +static View *view_new(PopplerDocument *doc) +{ + View *view; + GtkWidget *window; + GtkWidget *sw; + GtkWidget *vbox, *hbox; + guint n_pages; + PopplerPage *page; + + view = g_slice_new0(View); + + view->doc = doc; + + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + g_signal_connect(window, "destroy", G_CALLBACK(destroy_window_callback), view); + + page = poppler_document_get_page(doc, 0); + if (page) { + double width, height; + + poppler_page_get_size(page, &width, &height); + gtk_window_set_default_size(GTK_WINDOW(window), (gint)width, (gint)height); + g_object_unref(page); + } + + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5); + + view->drawing_area = gtk_drawing_area_new(); + sw = gtk_scrolled_window_new(nullptr, nullptr); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +#if GTK_CHECK_VERSION(3, 7, 8) + gtk_container_add(GTK_CONTAINER(sw), view->drawing_area); +#else + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), view->drawing_area); +#endif + gtk_widget_show(view->drawing_area); + + gtk_box_pack_end(GTK_BOX(vbox), sw, TRUE, TRUE, 0); + gtk_widget_show(sw); + + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5); + + n_pages = poppler_document_get_n_pages(doc); + view->spin_button = gtk_spin_button_new_with_range(0, n_pages - 1, 1); + g_signal_connect(view->spin_button, "value-changed", G_CALLBACK(page_changed_callback), view); + + gtk_box_pack_end(GTK_BOX(hbox), view->spin_button, FALSE, TRUE, 0); + gtk_widget_show(view->spin_button); + + gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_widget_show(hbox); + + gtk_container_add(GTK_CONTAINER(window), vbox); + gtk_widget_show(vbox); + + gtk_widget_show(window); + + if (!cairo_output) { + SplashColor sc = { 255, 255, 255 }; + + view->out = new GDKSplashOutputDev(gtk_widget_get_screen(window), redraw_callback, (void *)view, sc); + view->out->startDoc(view->doc->doc); + } + + g_signal_connect(view->drawing_area, "draw", G_CALLBACK(drawing_area_draw), view); + + return view; +} + +int main(int argc, char *argv[]) +{ + GOptionContext *ctx; + + if (argc == 1) { + char *basename = g_path_get_basename(argv[0]); + + g_printerr("usage: %s PDF-FILES…\n", basename); + g_free(basename); + + return -1; + } + + ctx = g_option_context_new(nullptr); + g_option_context_add_main_entries(ctx, options, "main"); + g_option_context_parse(ctx, &argc, &argv, nullptr); + g_option_context_free(ctx); + + gtk_init(&argc, &argv); + + globalParams = std::make_unique(); + + for (int i = 0; file_arguments[i]; i++) { + View *view; + GFile *file; + PopplerDocument *doc = nullptr; + GError *error = nullptr; + const char *arg; + + arg = file_arguments[i]; +#ifndef G_OS_WIN32 + if (args_are_fds) { + char *end; + gint64 v; + + errno = 0; + end = nullptr; + v = g_ascii_strtoll(arg, &end, 10); + if (errno || end == arg || v == -1 || v < G_MININT || v > G_MAXINT) { + g_set_error(&error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, "Failed to parse \"%s\" as file descriptor number", arg); + } else { + doc = poppler_document_new_from_fd(int(v), nullptr, &error); + } + } else +#endif /* !G_OS_WIN32 */ + { + file = g_file_new_for_commandline_arg(arg); + doc = poppler_document_new_from_gfile(file, nullptr, nullptr, &error); + if (!doc) { + gchar *uri; + + uri = g_file_get_uri(file); + g_prefix_error(&error, "%s: ", uri); + g_free(uri); + } + g_object_unref(file); + } + + if (doc) { + view = view_new(doc); + view_list = g_list_prepend(view_list, view); + view_set_page(view, CLAMP(requested_page, 0, poppler_document_get_n_pages(doc) - 1)); + } else { + g_printerr("Error opening document: %s\n", error->message); + g_error_free(error); + } + } + + if (view_list != nullptr) { + gtk_main(); + } + + return 0; +} diff --git a/poppler-24.05.0/test/image-embedding.cc b/poppler-24.05.0/test/image-embedding.cc new file mode 100644 index 0000000000000000000000000000000000000000..873b87d2059b48908b8fb6fdc8560b1d5cc45d5c --- /dev/null +++ b/poppler-24.05.0/test/image-embedding.cc @@ -0,0 +1,113 @@ +//======================================================================== +// +// image-embedding.cc +// A test util to check ImageEmbeddingUtils::embed(). +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2021 Georgiy Sgibnev . Work sponsored by lab50.net. +// Copyright (C) 2022 by Albert Astals Cid +// +//======================================================================== + +#include +#include +#include + +#include "utils/parseargs.h" +#include "goo/GooString.h" +#include "Object.h" +#include "Dict.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "ImageEmbeddingUtils.h" + +static int depth = 0; +static GooString colorSpace; +static GooString filter; +static bool smask = false; +static bool fail = false; +static bool printHelp = false; + +static const ArgDesc argDesc[] = { { "-depth", argInt, &depth, 0, "XObject's property 'BitsPerComponent'" }, + { "-colorspace", argGooString, &colorSpace, 0, "XObject's property 'ColorSpace'" }, + { "-filter", argGooString, &filter, 0, "XObject's property 'Filter'" }, + { "-smask", argFlag, &smask, 0, "SMask should exist" }, + { "-fail", argFlag, &fail, 0, "the image embedding API is expected to fail" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} }; + +int main(int argc, char *argv[]) +{ + // Parse args. + const bool ok = parseArgs(argDesc, &argc, argv); + if (!ok || (argc != 3) || printHelp) { + printUsage(argv[0], "PDF-FILE IMAGE-FILE", argDesc); + return (printHelp) ? 0 : 1; + } + const GooString docPath(argv[1]); + const GooString imagePath(argv[2]); + + auto doc = std::unique_ptr(PDFDocFactory().createPDFDoc(docPath)); + if (!doc->isOk()) { + fprintf(stderr, "Error opening input PDF file.\n"); + return 1; + } + + // Embed an image. + Ref baseImageRef = ImageEmbeddingUtils::embed(doc->getXRef(), imagePath.toStr()); + if (baseImageRef == Ref::INVALID()) { + if (fail) { + return 0; + } else { + fprintf(stderr, "ImageEmbeddingUtils::embed() failed.\n"); + return 1; + } + } + + // Save the updated PDF document. + // const GooString outputPathSuffix(".pdf"); + // const GooString outputPath = GooString(&imagePath, &outputPathSuffix); + // doc->saveAs(&outputPath, writeForceRewrite); + + // Check the base image. + Object baseImageObj = Object(baseImageRef).fetch(doc->getXRef()); + Dict *baseImageDict = baseImageObj.streamGetDict(); + if (std::string("XObject") != baseImageDict->lookup("Type").getName()) { + fprintf(stderr, "A problem with Type.\n"); + return 1; + } + if (std::string("Image") != baseImageDict->lookup("Subtype").getName()) { + fprintf(stderr, "A problem with Subtype.\n"); + return 1; + } + if (depth > 0) { + if (baseImageDict->lookup("BitsPerComponent").getInt() != depth) { + fprintf(stderr, "A problem with BitsPerComponent.\n"); + return 1; + } + } + if (!colorSpace.toStr().empty()) { + if (colorSpace.cmp(baseImageDict->lookup("ColorSpace").getName()) != 0) { + fprintf(stderr, "A problem with ColorSpace.\n"); + return 1; + } + } + if (!filter.toStr().empty()) { + if (filter.cmp(baseImageDict->lookup("Filter").getName()) != 0) { + fprintf(stderr, "A problem with Filter.\n"); + return 1; + } + } + if (smask) { + Object maskObj = baseImageDict->lookup("SMask"); + if (!maskObj.isStream()) { + fprintf(stderr, "A problem with SMask.\n"); + return 1; + } + } + return 0; +} diff --git a/poppler-24.05.0/test/pdf-fullrewrite.cc b/poppler-24.05.0/test/pdf-fullrewrite.cc new file mode 100644 index 0000000000000000000000000000000000000000..6739da4a0ee70f578c0758516b1c75a12c350921 --- /dev/null +++ b/poppler-24.05.0/test/pdf-fullrewrite.cc @@ -0,0 +1,326 @@ +//======================================================================== +// +// pdf-fullrewrite.cc +// +// Copyright 2007 Julien Rebetez +// Copyright 2012 Fabio D'Urso +// Copyright 2022 Albert Astals Cid +// +//======================================================================== + +#include "GlobalParams.h" +#include "Error.h" +#include "Object.h" +#include "PDFDoc.h" +#include "XRef.h" +#include "goo/GooString.h" +#include "utils/parseargs.h" + +static bool compareDocuments(PDFDoc *origDoc, PDFDoc *newDoc); +static bool compareObjects(const Object *objA, const Object *objB); + +static char ownerPassword[33] = "\001"; +static char userPassword[33] = "\001"; +static bool forceIncremental = false; +static bool checkOutput = false; +static bool printHelp = false; + +static const ArgDesc argDesc[] = { { "-opw", argString, ownerPassword, sizeof(ownerPassword), "owner password (for encrypted files)" }, + { "-upw", argString, userPassword, sizeof(userPassword), "user password (for encrypted files)" }, + { "-i", argFlag, &forceIncremental, 0, "incremental update mode" }, + { "-check", argFlag, &checkOutput, 0, "verify the generated document" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} }; + +int main(int argc, char *argv[]) +{ + PDFDoc *doc = nullptr; + PDFDoc *docOut = nullptr; + std::optional ownerPW; + std::optional userPW; + int res = 0; + + // parse args + bool ok = parseArgs(argDesc, &argc, argv); + if (!ok || (argc < 3) || printHelp) { + printUsage(argv[0], "INPUT-FILE OUTPUT-FILE", argDesc); + if (!printHelp) { + res = 1; + } + goto done; + } + + if (ownerPassword[0] != '\001') { + ownerPW = GooString(ownerPassword); + } + if (userPassword[0] != '\001') { + userPW = GooString(userPassword); + } + + // load input document + globalParams = std::make_unique(); + doc = new PDFDoc(std::make_unique(argv[1]), ownerPW, userPW); + if (!doc->isOk()) { + fprintf(stderr, "Error loading input document\n"); + res = 1; + goto done; + } + + // save it back (in rewrite or incremental update mode) + if (doc->saveAs(*doc->getFileName(), forceIncremental ? writeForceIncremental : writeForceRewrite) != 0) { + fprintf(stderr, "Error saving document\n"); + res = 1; + goto done; + } + + if (checkOutput) { + // open the generated document to verify it + docOut = new PDFDoc(std::make_unique(argv[2]), ownerPW, userPW); + if (!docOut->isOk()) { + fprintf(stderr, "Error loading generated document\n"); + res = 1; + } else if (!compareDocuments(doc, docOut)) { + fprintf(stderr, "Verification failed\n"); + res = 1; + } + } + +done: + delete docOut; + delete doc; + return res; +} + +static bool compareDictionaries(Dict *dictA, Dict *dictB) +{ + const int length = dictA->getLength(); + if (dictB->getLength() != length) { + return false; + } + + /* Check that every key in dictA is contained in dictB. + * Since keys are unique and we've already checked that dictA and dictB + * contain the same number of entries, we don't need to check that every key + * in dictB is also contained in dictA */ + for (int i = 0; i < length; ++i) { + const char *key = dictA->getKey(i); + const Object &valA = dictA->getValNF(i); + const Object &valB = dictB->lookupNF(key); + if (!compareObjects(&valA, &valB)) { + return false; + } + } + + return true; +} + +static bool compareObjects(const Object *objA, const Object *objB) +{ + switch (objA->getType()) { + case objBool: { + if (objB->getType() != objBool) { + return false; + } else { + return (objA->getBool() == objB->getBool()); + } + } + case objInt: + case objInt64: + case objReal: { + if (!objB->isNum()) { + return false; + } else { + // Fuzzy comparison + const double diff = objA->getNum() - objB->getNum(); + return (-0.01 < diff) && (diff < 0.01); + } + } + case objString: { + if (objB->getType() != objString) { + return false; + } else { + const GooString *strA = objA->getString(); + const GooString *strB = objB->getString(); + return (strA->cmp(strB) == 0); + } + } + case objName: { + if (objB->getType() != objName) { + return false; + } else { + GooString nameA(objA->getName()); + GooString nameB(objB->getName()); + return (nameA.cmp(&nameB) == 0); + } + } + case objNull: { + if (objB->getType() != objNull) { + return false; + } else { + return true; + } + } + case objArray: { + if (objB->getType() != objArray) { + return false; + } else { + Array *arrayA = objA->getArray(); + Array *arrayB = objB->getArray(); + const int length = arrayA->getLength(); + if (arrayB->getLength() != length) { + return false; + } else { + for (int i = 0; i < length; ++i) { + const Object &elemA = arrayA->getNF(i); + const Object &elemB = arrayB->getNF(i); + if (!compareObjects(&elemA, &elemB)) { + return false; + } + } + return true; + } + } + } + case objDict: { + if (objB->getType() != objDict) { + return false; + } else { + Dict *dictA = objA->getDict(); + Dict *dictB = objB->getDict(); + return compareDictionaries(dictA, dictB); + } + } + case objStream: { + if (objB->getType() != objStream) { + return false; + } else { + Stream *streamA = objA->getStream(); + Stream *streamB = objB->getStream(); + if (!compareDictionaries(streamA->getDict(), streamB->getDict())) { + return false; + } else { + int c; + streamA->reset(); + streamB->reset(); + do { + c = streamA->getChar(); + if (c != streamB->getChar()) { + return false; + } + } while (c != EOF); + return true; + } + } + return true; + } + case objRef: { + if (objB->getType() != objRef) { + return false; + } else { + const Ref refA = objA->getRef(); + const Ref refB = objB->getRef(); + return refA == refB; + } + } + default: { + fprintf(stderr, "compareObjects failed: unexpected object type %u\n", objA->getType()); + return false; + } + } +} + +static bool compareDocuments(PDFDoc *origDoc, PDFDoc *newDoc) +{ + bool result = true; + XRef *origXRef = origDoc->getXRef(); + XRef *newXRef = newDoc->getXRef(); + + // Make sure that special flags are set in both documents + origXRef->scanSpecialFlags(); + newXRef->scanSpecialFlags(); + + // Compare XRef tables' size + const int origNumObjects = origXRef->getNumObjects(); + const int newNumObjects = newXRef->getNumObjects(); + if (forceIncremental && origXRef->isXRefStream()) { + // In case of incremental update, expect a new entry to be appended to store the new XRef stream + if (origNumObjects + 1 != newNumObjects) { + fprintf(stderr, "XRef table: Unexpected number of entries (%d+1 != %d)\n", origNumObjects, newNumObjects); + result = false; + } + } else { + // In all other cases the number of entries must be the same + if (origNumObjects != newNumObjects) { + fprintf(stderr, "XRef table: Different number of entries (%d != %d)\n", origNumObjects, newNumObjects); + result = false; + } + } + + // Compare each XRef entry + const int numObjects = (origNumObjects < newNumObjects) ? origNumObjects : newNumObjects; + for (int i = 0; i < numObjects; ++i) { + XRefEntryType origType = origXRef->getEntry(i)->type; + XRefEntryType newType = newXRef->getEntry(i)->type; + const int origGenNum = (origType != xrefEntryCompressed) ? origXRef->getEntry(i)->gen : 0; + const int newGenNum = (newType != xrefEntryCompressed) ? newXRef->getEntry(i)->gen : 0; + + // Check that DontRewrite entries are freed in full rewrite mode + if (!forceIncremental && origXRef->getEntry(i)->getFlag(XRefEntry::DontRewrite)) { + if (newType != xrefEntryFree || origGenNum + 1 != newGenNum) { + fprintf(stderr, "XRef entry %u: DontRewrite entry was not freed correctly\n", i); + result = false; + } + continue; // There's nothing left to check for this entry + } + + // Compare generation numbers + // Object num 0 should always have gen 65535 according to specs, but some + // documents have it set to 0. We always write 65535 in output + if (i != 0) { + if (origGenNum != newGenNum) { + fprintf(stderr, "XRef entry %u: generation numbers differ (%d != %d)\n", i, origGenNum, newGenNum); + result = false; + continue; + } + } else { + if (newGenNum != 65535) { + fprintf(stderr, "XRef entry %u: generation number was expected to be 65535 (%d != 65535)\n", i, newGenNum); + result = false; + continue; + } + } + + // Compare object flags. A failure shows that there's some error in XRef::scanSpecialFlags() + if (origXRef->getEntry(i)->flags != newXRef->getEntry(i)->flags) { + fprintf(stderr, "XRef entry %u: flags detected by scanSpecialFlags differ (%d != %d)\n", i, origXRef->getEntry(i)->flags, newXRef->getEntry(i)->flags); + result = false; + } + + // Check that either both are free or both are in use + if ((origType == xrefEntryFree) != (newType == xrefEntryFree)) { + const char *origStatus = (origType == xrefEntryFree) ? "free" : "in use"; + const char *newStatus = (newType == xrefEntryFree) ? "free" : "in use"; + fprintf(stderr, "XRef entry %u: usage status differs (%s != %s)\n", i, origStatus, newStatus); + result = false; + continue; + } + + // Skip free entries + if (origType == xrefEntryFree) { + continue; + } + + // Compare contents + Object origObj = origXRef->fetch(i, origGenNum); + Object newObj = newXRef->fetch(i, newGenNum); + if (!compareObjects(&origObj, &newObj)) { + fprintf(stderr, "XRef entry %u: contents differ\n", i); + result = false; + } + } + + return result; +} diff --git a/poppler-24.05.0/test/pdf-inspector.cc b/poppler-24.05.0/test/pdf-inspector.cc new file mode 100644 index 0000000000000000000000000000000000000000..7fae242613d9106f5bd6e53f9e34bedf524c0762 --- /dev/null +++ b/poppler-24.05.0/test/pdf-inspector.cc @@ -0,0 +1,299 @@ +//======================================================================== +// +// pdf-inspector.cc +// +// Copyright 2005 Jonathan Blandford +// Copyright 2018 Adam Reichold +// Copyright 2019, 2022 Albert Astals Cid +// +//======================================================================== + +#include + +#include +#include +#include +#include +#include "Object.h" +#include "ProfileData.h" +#include "GfxState.h" + +#include +#include "CairoOutputDev.h" + +#include "PDFDoc.h" +#include "GlobalParams.h" +#include "ErrorCodes.h" +#include + +// Mapping +#include "pdf-operators.c" + +enum +{ + OP_STRING, + OP_COUNT, + OP_TOTAL, + OP_MIN, + OP_MAX, + N_COLUMNS +}; + +class PdfInspector +{ +public: + PdfInspector(); + + void set_file_name(const char *file_name); + void load(const char *file_name); + void run(); + void error_dialog(const char *error_message); + void analyze_page(int page); + +private: + static void on_file_activated(GtkWidget *widget, PdfInspector *inspector); + static void on_selection_changed(GtkTreeSelection *selection, PdfInspector *inspector); + static void on_analyze_clicked(GtkWidget *widget, PdfInspector *inspector); + + GtkBuilder *builder; + GtkTreeModel *model; + PDFDoc *doc; + CairoOutputDev *output; +}; + +PdfInspector::PdfInspector() +{ + GtkWidget *widget; + GError *error = nullptr; + + builder = gtk_builder_new(); + + if (!gtk_builder_add_from_file(builder, SRC_DIR "/pdf-inspector.ui", &error)) { + g_warning("Couldn't load builder file: %s", error->message); + g_error_free(error); + } + + widget = GTK_WIDGET(gtk_builder_get_object(builder, "pdf_file_chooser_button")); + g_signal_connect(widget, "selection-changed", G_CALLBACK(on_file_activated), this); + + widget = GTK_WIDGET(gtk_builder_get_object(builder, "analyze_button")); + g_signal_connect(widget, "clicked", G_CALLBACK(on_analyze_clicked), this); + + // setup the TreeView + widget = GTK_WIDGET(gtk_builder_get_object(builder, "pdf_tree_view")); + g_signal_connect(gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)), "changed", G_CALLBACK(on_selection_changed), this); + model = (GtkTreeModel *)gtk_list_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_DOUBLE); + gtk_tree_view_set_model(GTK_TREE_VIEW(widget), model); + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(widget), 0, "Operation", gtk_cell_renderer_text_new(), "text", OP_STRING, NULL); + + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(widget), 1, "Count", gtk_cell_renderer_text_new(), "text", OP_COUNT, NULL); + + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(widget), 2, "Elapsed", gtk_cell_renderer_text_new(), "text", OP_TOTAL, NULL); + + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(widget), 3, "Min", gtk_cell_renderer_text_new(), "text", OP_MIN, NULL); + + gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(widget), 4, "Max", gtk_cell_renderer_text_new(), "text", OP_MAX, NULL); + + for (int i = 0; i < N_COLUMNS; i++) { + GtkTreeViewColumn *column; + + column = gtk_tree_view_get_column(GTK_TREE_VIEW(widget), i); + gtk_tree_view_column_set_sort_column_id(column, i); + } + doc = nullptr; + output = new CairoOutputDev(); + output->setPrinting(false); + + // set up initial widgets + load(nullptr); +} + +void PdfInspector::set_file_name(const char *file_name) +{ + GtkWidget *widget; + + widget = GTK_WIDGET(gtk_builder_get_object(builder, "pdf_file_chooser_button")); + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(widget), file_name); +} + +void PdfInspector::on_file_activated(GtkWidget *widget, PdfInspector *inspector) +{ + gchar *file_name; + + file_name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)); + if (file_name) { + inspector->load(file_name); + } + + g_free(file_name); +} + +void PdfInspector::on_selection_changed(GtkTreeSelection *selection, PdfInspector *inspector) +{ + GtkWidget *label; + size_t i; + GtkTreeModel *model; + GtkTreeIter iter; + gchar *op = nullptr; + + label = GTK_WIDGET(gtk_builder_get_object(inspector->builder, "description_label")); + gtk_label_set_markup(GTK_LABEL(label), "No Description"); + + if (gtk_tree_selection_get_selected(selection, &model, &iter)) { + gtk_tree_model_get(model, &iter, OP_STRING, &op, -1); + } + + if (op == nullptr) { + return; + } + + for (i = 0; i < G_N_ELEMENTS(op_mapping); i++) { + + if (!strcmp(op, op_mapping[i].op)) { + gchar *text; + text = g_strdup_printf("%s", op_mapping[i].description); + gtk_label_set_markup(GTK_LABEL(label), text); + g_free(text); + break; + } + } + + g_free(op); +} + +void PdfInspector::on_analyze_clicked(GtkWidget *widget, PdfInspector *inspector) +{ + GtkWidget *spin; + int page; + + spin = GTK_WIDGET(gtk_builder_get_object(inspector->builder, "pdf_spin")); + + page = (int)gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin)); + + inspector->analyze_page(page); +} + +void PdfInspector::analyze_page(int page) +{ + GtkWidget *label; + char *text; + cairo_t *cr; + cairo_surface_t *surface; + + label = GTK_WIDGET(gtk_builder_get_object(builder, "pdf_total_label")); + + output->startProfile(); + gtk_list_store_clear(GTK_LIST_STORE(model)); + + GooTimer timer; + surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, doc->getPageCropWidth(page + 1), doc->getPageCropHeight(page + 1)); + cr = cairo_create(surface); + cairo_surface_destroy(surface); + output->setCairo(cr); + cairo_destroy(cr); + doc->displayPage(output, page + 1, 72, 72, 0, false, true, false); + output->setCairo(nullptr); + + // Total time; + text = g_strdup_printf("%g", timer.getElapsed()); + gtk_label_set_text(GTK_LABEL(label), text); + g_free(text); + + // Individual times; + auto hash = output->endProfile(); + for (const auto &kvp : *hash) { + GtkTreeIter tree_iter; + const auto *const data_p = &kvp.second; + + gtk_list_store_append(GTK_LIST_STORE(model), &tree_iter); + gtk_list_store_set(GTK_LIST_STORE(model), &tree_iter, OP_STRING, kvp.first.c_str(), OP_COUNT, data_p->getCount(), OP_TOTAL, data_p->getTotal(), OP_MIN, data_p->getMin(), OP_MAX, data_p->getMax(), -1); + } +} + +void PdfInspector::load(const char *file_name) +{ + GtkWidget *spin; + GtkWidget *button; + GtkWidget *label; + + // kill the old PDF file + if (doc != nullptr) { + delete doc; + doc = nullptr; + } + + // load the new file + if (file_name) { + doc = new PDFDoc(std::make_unique(file_name)); + } + + if (doc && !doc->isOk()) { + this->error_dialog("Failed to load file."); + delete doc; + doc = nullptr; + } + + spin = GTK_WIDGET(gtk_builder_get_object(builder, "pdf_spin")); + button = GTK_WIDGET(gtk_builder_get_object(builder, "analyze_button")); + label = GTK_WIDGET(gtk_builder_get_object(builder, "pdf_total_label")); + gtk_label_set_text(GTK_LABEL(label), ""); + + if (doc) { + gtk_widget_set_sensitive(spin, TRUE); + gtk_widget_set_sensitive(button, TRUE); + gtk_widget_set_sensitive(label, TRUE); + gtk_spin_button_set_range(GTK_SPIN_BUTTON(spin), 0, doc->getNumPages() - 1); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), 0); + + output->startDoc(doc); + } else { + gtk_widget_set_sensitive(spin, FALSE); + gtk_widget_set_sensitive(button, FALSE); + gtk_widget_set_sensitive(label, FALSE); + } +} + +void PdfInspector::error_dialog(const char *error_message) +{ + g_warning("%s", error_message); +} + +void PdfInspector::run() +{ + GtkWidget *dialog; + + dialog = GTK_WIDGET(gtk_builder_get_object(builder, "pdf_dialog")); + + gtk_dialog_run(GTK_DIALOG(dialog)); +} + +int main(int argc, char *argv[]) +{ + const char *file_name = nullptr; + PdfInspector *inspector; + + gtk_init(&argc, &argv); + + globalParams = std::make_unique(); + globalParams->setProfileCommands(true); + globalParams->setPrintCommands(true); + + if (argc == 2) { + file_name = argv[1]; + } else if (argc > 2) { + fprintf(stderr, "usage: %s [PDF-FILE]\n", argv[0]); + return -1; + } + + inspector = new PdfInspector(); + + if (file_name) { + inspector->set_file_name(file_name); + } + + inspector->run(); + + delete inspector; + + return 0; +} diff --git a/poppler-24.05.0/test/pdf-inspector.ui b/poppler-24.05.0/test/pdf-inspector.ui new file mode 100644 index 0000000000000000000000000000000000000000..0956aa9719afc17f84cfb3d56b9c6026e408263e --- /dev/null +++ b/poppler-24.05.0/test/pdf-inspector.ui @@ -0,0 +1,406 @@ + + + + + 100 + 0 + 10 + 1 + 10 + 1 + + + 6 + True + PDF Inspector + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 600 + 400 + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + + + True + False + 12 + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + True + GTK_PACK_END + + + + + 6 + True + False + 12 + + + True + 2 + 2 + False + 6 + 12 + + + True + _File: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + Page Number + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + True + Select A File + GTK_FILE_CHOOSER_ACTION_OPEN + True + False + -1 + + + 1 + 2 + 0 + 1 + fill + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + adjustment1 + + + 1 + 2 + 1 + 2 + + + + + + 0 + False + True + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + True + False + 6 + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + True + True + True + False + False + True + False + False + False + + + + + 0 + True + True + + + + + True + False + False + 6 + 12 + + + True + Total time elapsed: + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 0 + 1 + 1 + + + + + True + + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 1 + 1 + 2 + + + + + True + Description: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 0 + 0 + 1 + + + + + True + <i>No Description</i> + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 1 + 0 + 1 + + + + + True + 1 + 0 + 0.0 + 0.0 + 0 + 0 + 0 + 0 + True + + + True + True + _Analyze + True + GTK_RELIEF_NORMAL + True + + + + + 1 + 2 + 0 + 1 + + + + + 0 + False + True + + + + + + + + + True + <b>PDF Instructions</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + closebutton1 + + + diff --git a/poppler-24.05.0/test/pdf-operators.c b/poppler-24.05.0/test/pdf-operators.c new file mode 100644 index 0000000000000000000000000000000000000000..eea4e03978815c72797e3ab424cd02aa417b37b3 --- /dev/null +++ b/poppler-24.05.0/test/pdf-operators.c @@ -0,0 +1,81 @@ +typedef struct +{ + const char *op; + const char *description; +} OperatorMapping; + +OperatorMapping op_mapping[] = { + { "b", "Close, fill, and stroke path using nonzero winding number rule" }, + { "B", "Fill and stroke path using nonzero winding number rule" }, + { "b*", "Close, fill, and stroke path using even-odd rule" }, + { "B*", "Fill and stroke path using even-odd rule" }, + { "BDC", "(PDF 1.2) Begin marked-content sequence with property list" }, + { "BI", "Begin inline image object" }, + { "BMC", "(PDF 1.2) Begin marked-content sequence" }, + { "BT", "Begin text object" }, + { "BX", "(PDF 1.1) Begin compatibility section" }, + { "c", "Append curved segment to path (three control points)" }, + { "cm", "Concatenate matrix to current transformation matrix" }, + { "CS", "(PDF 1.1) Set color space for stroking operations" }, + { "cs", "(PDF 1.1) Set color space for nonstroking operations" }, + { "d", "Set line dash pattern" }, + { "d0", "Set glyph width in Type 3 font" }, + { "d1", "Set glyph width and bounding box in Type 3 font" }, + { "Do", "Invoke named XObject" }, + { "DP", "(PDF 1.2) Define marked-content point with property list" }, + { "EI", "End inline image object" }, + { "EMC", "(PDF 1.2) End marked-content sequence" }, + { "ET", "End text object" }, + { "EX", "(PDF 1.1) End compatibility section" }, + { "f", "Fill path using nonzero winding number rule" }, + { "F", "Fill path using nonzero winding number rule (obsolete)" }, + { "f*", "Fill path using even-odd rule" }, + { "G", "Set gray level for stroking operations" }, + { "g", "Set gray level for nonstroking operations" }, + { "gs", "(PDF 1.2) Set parameters from graphics state parameter dictionary" }, + { "h", "Close subpath" }, + { "i", "Set flatness tolerance" }, + { "ID", "Begin inline image data" }, + { "j", "Set line join style" }, + { "J", "Set line cap style" }, + { "K", "Set CMYK color for stroking operations" }, + { "k", "Set CMYK color for nonstroking operations" }, + { "l", "Append straight line segment to path" }, + { "m", "Begin new subpath" }, + { "M", "Set miter limit" }, + { "MP", "(PDF 1.2) Define marked-content point" }, + { "n", "End path without filling or stroking" }, + { "q", "Save graphics state" }, + { "Q", "Restore graphics state" }, + { "re", "Append rectangle to path" }, + { "RG", "Set RGB color for stroking operations" }, + { "rg", "Set RGB color for nonstroking operations" }, + { "ri", "Set color rendering intent" }, + { "s", "Close and stroke path" }, + { "S", "Stroke path" }, + { "SC", "(PDF 1.1) Set color for stroking operations" }, + { "sc", "(PDF 1.1) Set color for nonstroking operations" }, + { "SCN", "(PDF 1.2) Set color for stroking operations (ICCBased and special color spaces)" }, + { "scn", "(PDF 1.2) Set color for nonstroking operations (ICCBased and special color spaces)" }, + { "sh", "(PDF 1.3) Paint area defined by shading pattern" }, + { "T*", "Move to start of next text line" }, + { "Tc", "Set character spacing" }, + { "Td", "Move text position" }, + { "TD", "Move text position and set leading" }, + { "Tf", "Set text font and size" }, + { "Tj", "Show text" }, + { "TJ", "Show text, allowing individual glyph positioning" }, + { "TL", "Set text leading" }, + { "Tm", "Set text matrix and text line matrix" }, + { "Tr", "Set text rendering mode" }, + { "Ts", "Set text rise" }, + { "Tw", "Set word spacing" }, + { "Tz", "Set horizontal text scaling" }, + { "v", "Append curved segment to path (initial point replicated)" }, + { "w", "Set line width" }, + { "W", "Set clipping path using nonzero winding number rule" }, + { "W*", "Set clipping path using even-odd rule" }, + { "y", "Append curved segment to path (final point replicated)" }, + { "'", "Move to next line and show text" }, + { "\"", "Set word and character spacing, move to next line, and show text" }, +}; diff --git a/poppler-24.05.0/test/perf-test-preview-dummy.cc b/poppler-24.05.0/test/perf-test-preview-dummy.cc new file mode 100644 index 0000000000000000000000000000000000000000..cb096f32e092269fb2f10f2aad817fbd48a8c9da --- /dev/null +++ b/poppler-24.05.0/test/perf-test-preview-dummy.cc @@ -0,0 +1,19 @@ +/* Copyright Krzysztof Kowalczyk 2006-2007 + License: GPLv2 */ + +/* This is a no-op preview support for perf-test. +Using this perf-test still works for performance testing, you just don't +get any visual feedback during testing. +*/ + +#include "splash/SplashBitmap.h" + +void PreviewBitmapInit(); +void PreviewBitmapDestroy(); +void PreviewBitmapSplash(SplashBitmap *bmpSplash); + +void PreviewBitmapSplash(SplashBitmap *bmpSplash) { } + +void PreviewBitmapDestroy() { } + +void PreviewBitmapInit() { } diff --git a/poppler-24.05.0/test/perf-test-preview-win.cc b/poppler-24.05.0/test/perf-test-preview-win.cc new file mode 100644 index 0000000000000000000000000000000000000000..42c10b1494ce9f5ba6d78e6f6f3de686fd4b343e --- /dev/null +++ b/poppler-24.05.0/test/perf-test-preview-win.cc @@ -0,0 +1,261 @@ +/* Copyright Krzysztof Kowalczyk 2006-2007 + License: GPLv2 */ + +/* This is a preview support for perf-test for Windows */ + +#include +#include + +#include "SplashBitmap.h" + +#define WIN_CLASS_NAME "PDFTEST_PDF_WIN" +#define COL_WINDOW_BG RGB(0xff, 0xff, 0xff) + +static HWND gHwndSplash; +static HBRUSH gBrushBg; + +static SplashBitmap *gBmpSplash; + +int rect_dx(RECT *r) +{ + int dx = r->right - r->left; + assert(dx >= 0); + return dx; +} + +int rect_dy(RECT *r) +{ + int dy = r->bottom - r->top; + assert(dy >= 0); + return dy; +} + +static HBITMAP createDIBitmapCommon(SplashBitmap *bmp, HDC hdc) +{ + int bmpDx = bmp->getWidth(); + int bmpDy = bmp->getHeight(); + int bmpRowSize = bmp->getRowSize(); + + BITMAPINFOHEADER bmih; + bmih.biSize = sizeof(bmih); + bmih.biHeight = -bmpDy; + bmih.biWidth = bmpDx; + bmih.biPlanes = 1; + bmih.biBitCount = 24; + bmih.biCompression = BI_RGB; + bmih.biSizeImage = bmpDy * bmpRowSize; + ; + bmih.biXPelsPerMeter = bmih.biYPelsPerMeter = 0; + bmih.biClrUsed = bmih.biClrImportant = 0; + + unsigned char *bmpData = bmp->getDataPtr(); + HBITMAP hbmp = ::CreateDIBitmap(hdc, &bmih, CBM_INIT, bmpData, (BITMAPINFO *)&bmih, DIB_RGB_COLORS); + return hbmp; +} + +static void stretchDIBitsCommon(SplashBitmap *bmp, HDC hdc, int leftMargin, int topMargin, int pageDx, int pageDy) +{ + int bmpDx = bmp->getWidth(); + int bmpDy = bmp->getHeight(); + int bmpRowSize = bmp->getRowSize(); + + BITMAPINFOHEADER bmih; + bmih.biSize = sizeof(bmih); + bmih.biHeight = -bmpDy; + bmih.biWidth = bmpDx; + bmih.biPlanes = 1; + // we could create this dibsection in monochrome + // if the printer is monochrome, to reduce memory consumption + // but splash is currently setup to return a full colour bitmap + bmih.biBitCount = 24; + bmih.biCompression = BI_RGB; + bmih.biSizeImage = bmpDy * bmpRowSize; + ; + bmih.biXPelsPerMeter = bmih.biYPelsPerMeter = 0; + bmih.biClrUsed = bmih.biClrImportant = 0; + SplashColorPtr bmpData = bmp->getDataPtr(); + + ::StretchDIBits(hdc, + // destination rectangle + -leftMargin, -topMargin, pageDx, pageDy, + // source rectangle + 0, 0, bmpDx, bmpDy, bmpData, (BITMAPINFO *)&bmih, DIB_RGB_COLORS, SRCCOPY); +} + +/* Set the client area size of the window 'hwnd' to 'dx'/'dy'. */ +static void resizeClientArea(HWND hwnd, int x, int dx, int dy, int *dx_out) +{ + RECT rc; + GetClientRect(hwnd, &rc); + if ((rect_dx(&rc) == dx) && (rect_dy(&rc) == dy)) + return; + + RECT rw; + GetWindowRect(hwnd, &rw); + int win_dx = rect_dx(&rw) + (dx - rect_dx(&rc)); + int win_dy = rect_dy(&rw) + (dy - rect_dy(&rc)); + SetWindowPos(hwnd, NULL, x, 0, win_dx, win_dy, SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOZORDER); + if (dx_out) + *dx_out = win_dx; +} + +static void resizeClientAreaToRenderedBitmap(HWND hwnd, SplashBitmap *bmp, int x, int *dxOut) +{ + int dx = bmp->getWidth(); + int dy = bmp->getHeight(); + resizeClientArea(hwnd, x, dx, dy, dxOut); +} + +static void drawBitmap(HWND hwnd, SplashBitmap *bmp) +{ + PAINTSTRUCT ps; + + HDC hdc = BeginPaint(hwnd, &ps); + SetBkMode(hdc, TRANSPARENT); + FillRect(hdc, &ps.rcPaint, gBrushBg); + + HBITMAP hbmp = createDIBitmapCommon(bmp, hdc); + if (hbmp) { + HDC bmpDC = CreateCompatibleDC(hdc); + if (bmpDC) { + SelectObject(bmpDC, hbmp); + int xSrc = 0, ySrc = 0; + int xDest = 0, yDest = 0; + int bmpDx = bmp->getWidth(); + int bmpDy = bmp->getHeight(); + BitBlt(hdc, xDest, yDest, bmpDx, bmpDy, bmpDC, xSrc, ySrc, SRCCOPY); + DeleteDC(bmpDC); + bmpDC = NULL; + } + DeleteObject(hbmp); + hbmp = NULL; + } + EndPaint(hwnd, &ps); +} + +static void onPaint(HWND hwnd) +{ + if (hwnd == gHwndSplash) { + if (gBmpSplash) { + drawBitmap(hwnd, gBmpSplash); + } + } +} + +static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) { + case WM_CREATE: + // do nothing + break; + + case WM_ERASEBKGND: + return TRUE; + + case WM_PAINT: + /* it might happen that we get WM_PAINT after destroying a window */ + onPaint(hwnd); + break; + + case WM_DESTROY: + /* WM_DESTROY might be sent as a result of File\Close, in which case CloseWindow() has already been called */ + break; + + default: + return DefWindowProc(hwnd, message, wParam, lParam); + } + return 0; +} + +static BOOL registerWinClass(void) +{ + WNDCLASSEX wcex; + ATOM atom; + + wcex.cbSize = sizeof(WNDCLASSEX); + + wcex.style = CS_HREDRAW | CS_VREDRAW; + wcex.lpfnWndProc = WndProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = NULL; + wcex.hIcon = NULL; + wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hbrBackground = NULL; + wcex.lpszMenuName = NULL; + wcex.lpszClassName = WIN_CLASS_NAME; + wcex.hIconSm = NULL; + + atom = RegisterClassEx(&wcex); + if (atom) + return TRUE; + return FALSE; +} + +static bool initWinIfNecessary(void) +{ + if (gHwndSplash) + return true; + + if (!registerWinClass()) + return false; + + gBrushBg = CreateSolidBrush(COL_WINDOW_BG); + + gHwndSplash = CreateWindow(WIN_CLASS_NAME, "Splash", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, NULL, NULL); + + if (!gHwndSplash) + return false; + + ShowWindow(gHwndSplash, SW_HIDE); + return true; +} + +static void pumpMessages(void) +{ + BOOL isMessage; + MSG msg; + + for (;;) { + isMessage = PeekMessage(&msg, NULL, 0, 0, PM_REMOVE); + if (!isMessage) + return; + TranslateMessage(&msg); + DispatchMessage(&msg); + } +} + +void PreviewBitmapInit(void) +{ + /* no need to do anything */ +} + +void PreviewBitmapDestroy(void) +{ + PostQuitMessage(0); + pumpMessages(); + DeleteObject(gBrushBg); +} + +static void UpdateWindows(void) +{ + if (gBmpSplash) { + resizeClientAreaToRenderedBitmap(gHwndSplash, gBmpSplash, 0, NULL); + ShowWindow(gHwndSplash, SW_SHOW); + InvalidateRect(gHwndSplash, NULL, FALSE); + UpdateWindow(gHwndSplash); + } else { + ShowWindow(gHwndSplash, SW_HIDE); + } + + pumpMessages(); +} + +void PreviewBitmapSplash(SplashBitmap *bmpSplash) +{ + if (!initWinIfNecessary()) + return; + + gBmpSplash = bmpSplash; + UpdateWindows(); +} diff --git a/poppler-24.05.0/test/perf-test.cc b/poppler-24.05.0/test/perf-test.cc new file mode 100644 index 0000000000000000000000000000000000000000..dcecfd7abacb8aff20fe1ffe906b47a9957c948b --- /dev/null +++ b/poppler-24.05.0/test/perf-test.cc @@ -0,0 +1,954 @@ +/* Copyright Krzysztof Kowalczyk 2006-2007 + Copyright Hib Eris 2008, 2013 + Copyright 2018, 2020, 2022 Albert Astals Cid 2018 + Copyright 2019 Oliver Sander + Copyright 2020 Adam Reichold + License: GPLv2 */ +/* + A tool to stress-test poppler rendering and measure rendering times for + very simplistic performance measuring. + + TODO: + * make it work with cairo output as well + * print more info about document like e.g. enumerate images, + streams, compression, encryption, password-protection. Each should have + a command-line arguments to turn it on/off + * never over-write file given as -out argument (optionally, provide -force + option to force writing the -out file). It's way too easy too lose results + of a previous run. +*/ + +#ifdef _MSC_VER +// this sucks but I don't know any other way +# pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"") +#endif + +#include + +#ifdef _WIN32 +# include +#else +# include +#endif + +// Define COPY_FILE if you want the file to be copied to a local disk first +// before it's tested. This is desired if a file is on a slow drive. +// Currently copying only works on Windows. +// Not enabled by default. +// #define COPY_FILE 1 + +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef HAVE_DIRENT_H +# include +#endif + +#include "Error.h" +#include "ErrorCodes.h" +#include "goo/GooString.h" +#include "goo/GooTimer.h" +#include "GlobalParams.h" +#include "splash/SplashBitmap.h" +#include "Object.h" /* must be included before SplashOutputDev.h because of sloppiness in SplashOutputDev.h */ +#include "SplashOutputDev.h" +#include "TextOutputDev.h" +#include "PDFDoc.h" +#include "Link.h" + +#ifdef _MSC_VER +# define strdup _strdup +# define strcasecmp _stricmp +#endif + +#define dimof(X) (sizeof(X) / sizeof((X)[0])) + +#define INVALID_PAGE_NO -1 + +/* Those must be implemented in order to provide preview during execution. + They can be no-ops. An implementation for windows is in + perf-test-preview-win.cc +*/ +extern void PreviewBitmapInit(); +extern void PreviewBitmapDestroy(); +extern void PreviewBitmapSplash(SplashBitmap *bmpSplash); + +class PdfEnginePoppler +{ +public: + PdfEnginePoppler(); + ~PdfEnginePoppler(); + + PdfEnginePoppler(const PdfEnginePoppler &) = delete; + PdfEnginePoppler &operator=(const PdfEnginePoppler &) = delete; + + const char *fileName() const { return _fileName; }; + + void setFileName(const char *fileName) + { + assert(!_fileName); + _fileName = (char *)strdup(fileName); + } + + int pageCount() const { return _pageCount; } + + bool load(const char *fileName); + SplashBitmap *renderBitmap(int pageNo, double zoomReal, int rotation); + + SplashOutputDev *outputDevice(); + +private: + char *_fileName; + int _pageCount; + + PDFDoc *_pdfDoc; + SplashOutputDev *_outputDev; +}; + +typedef struct StrList +{ + struct StrList *next; + char *str; +} StrList; + +/* List of all command-line arguments that are not switches. + We assume those are: + - names of PDF files + - names of a file with a list of PDF files + - names of directories with PDF files +*/ +static StrList *gArgsListRoot = nullptr; + +/* Names of all command-line switches we recognize */ +#define TIMINGS_ARG "-timings" +#define RESOLUTION_ARG "-resolution" +#define RECURSIVE_ARG "-recursive" +#define OUT_ARG "-out" +#define PREVIEW_ARG "-preview" +#define SLOW_PREVIEW_ARG "-slowpreview" +#define LOAD_ONLY_ARG "-loadonly" +#define PAGE_ARG "-page" +#define TEXT_ARG "-text" + +/* Should we record timings? True if -timings command-line argument was given. */ +static bool gfTimings = false; + +/* If true, we use render each page at resolution 'gResolutionX'/'gResolutionY'. + If false, we render each page at its native resolution. + True if -resolution NxM command-line argument was given. */ +static bool gfForceResolution = false; +static int gResolutionX = 0; +static int gResolutionY = 0; +/* If NULL, we output the log info to stdout. If not NULL, should be a name + of the file to which we output log info. + Controlled by -out command-line argument. */ +static char *gOutFileName = nullptr; +/* FILE * corresponding to gOutFileName or stdout if gOutFileName is NULL or + was invalid name */ +static FILE *gOutFile = nullptr; +/* FILE * corresponding to gOutFileName or stderr if gOutFileName is NULL or + was invalid name */ +static FILE *gErrFile = nullptr; + +/* If True and a directory is given as a command-line argument, we'll process + pdf files in sub-directories as well. + Controlled by -recursive command-line argument */ +static bool gfRecursive = false; + +/* If true, preview rendered image. To make sure that they're being rendered correctly. */ +static bool gfPreview = false; + +/* 1 second (1000 milliseconds) */ +#define SLOW_PREVIEW_TIME 1000 + +/* If true, preview rendered image in a slow mode i.e. delay displaying for + SLOW_PREVIEW_TIME. This is so that a human has enough time to see if the + PDF renders ok. In release mode on fast processor pages take only ~100-200 ms + to render and they go away too quickly to be inspected by a human. */ +static bool gfSlowPreview = false; + +/* If true, we only dump the text, not render */ +static bool gfTextOnly = false; + +#define PAGE_NO_NOT_GIVEN -1 + +/* If equals PAGE_NO_NOT_GIVEN, we're in default mode where we render all pages. + If different, will only render this page */ +static int gPageNo = PAGE_NO_NOT_GIVEN; +/* If true, will only load the file, not render any pages. Mostly for + profiling load time */ +static bool gfLoadOnly = false; + +#define PDF_FILE_DPI 72 + +#define MAX_FILENAME_SIZE 1024 + +/* DOS is 0xd 0xa */ +#define DOS_NEWLINE "\x0d\x0a" +/* Mac is single 0xd */ +#define MAC_NEWLINE "\x0d" +/* Unix is single 0xa (10) */ +#define UNIX_NEWLINE "\x0a" +#define UNIX_NEWLINE_C 0xa + +static void memzero(void *data, size_t len) +{ + memset(data, 0, len); +} + +static void *zmalloc(size_t len) +{ + void *data = malloc(len); + if (data) { + memzero(data, len); + } + return data; +} + +/* Concatenate 4 strings. Any string can be NULL. + Caller needs to free() memory. */ +static char *str_cat4(const char *str1, const char *str2, const char *str3, const char *str4) +{ + char *str; + char *tmp; + size_t str1_len = 0; + size_t str2_len = 0; + size_t str3_len = 0; + size_t str4_len = 0; + + if (str1) { + str1_len = strlen(str1); + } + if (str2) { + str2_len = strlen(str2); + } + if (str3) { + str3_len = strlen(str3); + } + if (str4) { + str4_len = strlen(str4); + } + + str = (char *)zmalloc(str1_len + str2_len + str3_len + str4_len + 1); + if (!str) { + return nullptr; + } + + tmp = str; + if (str1) { + memcpy(tmp, str1, str1_len); + tmp += str1_len; + } + if (str2) { + memcpy(tmp, str2, str2_len); + tmp += str2_len; + } + if (str3) { + memcpy(tmp, str3, str3_len); + tmp += str3_len; + } + if (str4) { + memcpy(tmp, str4, str1_len); + } + return str; +} + +static char *str_dup(const char *str) +{ + return str_cat4(str, nullptr, nullptr, nullptr); +} + +static bool str_eq(const char *str1, const char *str2) +{ + if (!str1 && !str2) { + return true; + } + if (!str1 || !str2) { + return false; + } + if (0 == strcmp(str1, str2)) { + return true; + } + return false; +} + +static bool str_ieq(const char *str1, const char *str2) +{ + if (!str1 && !str2) { + return true; + } + if (!str1 || !str2) { + return false; + } + if (0 == strcasecmp(str1, str2)) { + return true; + } + return false; +} + +static bool str_endswith(const char *txt, const char *end) +{ + size_t end_len; + size_t txt_len; + + if (!txt || !end) { + return false; + } + + txt_len = strlen(txt); + end_len = strlen(end); + if (end_len > txt_len) { + return false; + } + if (str_eq(txt + txt_len - end_len, end)) { + return true; + } + return false; +} + +/* TODO: probably should move to some other file and change name to + sleep_milliseconds */ +static void sleep_milliseconds(int milliseconds) +{ +#ifdef _WIN32 + Sleep((DWORD)milliseconds); +#else + struct timespec tv; + int secs, nanosecs; + secs = milliseconds / 1000; + nanosecs = (milliseconds - (secs * 1000)) * 1000; + tv.tv_sec = (time_t)secs; + tv.tv_nsec = (long)nanosecs; + while (true) { + int rval = nanosleep(&tv, &tv); + if (rval == 0) { + /* Completed the entire sleep time; all done. */ + return; + } else if (errno == EINTR) { + /* Interrupted by a signal. Try again. */ + continue; + } else { + /* Some other error; bail out. */ + return; + } + } + return; +#endif +} + +static SplashColorMode gSplashColorMode = splashModeBGR8; + +static SplashColor splashColRed; +static SplashColor splashColGreen; +static SplashColor splashColBlue; +static SplashColor splashColWhite; +static SplashColor splashColBlack; + +#define SPLASH_COL_RED_PTR (SplashColorPtr) & (splashColRed[0]) +#define SPLASH_COL_GREEN_PTR (SplashColorPtr) & (splashColGreen[0]) +#define SPLASH_COL_BLUE_PTR (SplashColorPtr) & (splashColBlue[0]) +#define SPLASH_COL_WHITE_PTR (SplashColorPtr) & (splashColWhite[0]) +#define SPLASH_COL_BLACK_PTR (SplashColorPtr) & (splashColBlack[0]) + +static SplashColorPtr gBgColor = SPLASH_COL_WHITE_PTR; + +static void splashColorSet(SplashColorPtr col, unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha) +{ + switch (gSplashColorMode) { + case splashModeBGR8: + col[0] = blue; + col[1] = green; + col[2] = red; + break; + case splashModeRGB8: + col[0] = red; + col[1] = green; + col[2] = blue; + break; + default: + assert(0); + break; + } +} + +static void SplashColorsInit() +{ + splashColorSet(SPLASH_COL_RED_PTR, 0xff, 0, 0, 0); + splashColorSet(SPLASH_COL_GREEN_PTR, 0, 0xff, 0, 0); + splashColorSet(SPLASH_COL_BLUE_PTR, 0, 0, 0xff, 0); + splashColorSet(SPLASH_COL_BLACK_PTR, 0, 0, 0, 0); + splashColorSet(SPLASH_COL_WHITE_PTR, 0xff, 0xff, 0xff, 0); +} + +PdfEnginePoppler::PdfEnginePoppler() : _fileName(nullptr), _pageCount(INVALID_PAGE_NO), _pdfDoc(nullptr), _outputDev(nullptr) { } + +PdfEnginePoppler::~PdfEnginePoppler() +{ + free(_fileName); + delete _outputDev; + delete _pdfDoc; +} + +bool PdfEnginePoppler::load(const char *fileName) +{ + setFileName(fileName); + + _pdfDoc = new PDFDoc(std::make_unique(fileName)); + if (!_pdfDoc->isOk()) { + return false; + } + _pageCount = _pdfDoc->getNumPages(); + return true; +} + +SplashOutputDev *PdfEnginePoppler::outputDevice() +{ + if (!_outputDev) { + bool bitmapTopDown = true; + _outputDev = new SplashOutputDev(gSplashColorMode, 4, false, gBgColor, bitmapTopDown); + if (_outputDev) { + _outputDev->startDoc(_pdfDoc); + } + } + return _outputDev; +} + +SplashBitmap *PdfEnginePoppler::renderBitmap(int pageNo, double zoomReal, int rotation) +{ + assert(outputDevice()); + if (!outputDevice()) { + return nullptr; + } + + double hDPI = (double)PDF_FILE_DPI * zoomReal * 0.01; + double vDPI = (double)PDF_FILE_DPI * zoomReal * 0.01; + bool useMediaBox = false; + bool crop = true; + bool doLinks = true; + _pdfDoc->displayPage(_outputDev, pageNo, hDPI, vDPI, rotation, useMediaBox, crop, doLinks, nullptr, nullptr); + + SplashBitmap *bmp = _outputDev->takeBitmap(); + return bmp; +} + +static int StrList_Len(StrList **root) +{ + int len = 0; + StrList *cur; + assert(root); + if (!root) { + return 0; + } + cur = *root; + while (cur) { + ++len; + cur = cur->next; + } + return len; +} + +static int StrList_InsertAndOwn(StrList **root, char *txt) +{ + StrList *el; + assert(root && txt); + if (!root || !txt) { + return false; + } + + el = (StrList *)malloc(sizeof(StrList)); + if (!el) { + return false; + } + el->str = txt; + el->next = *root; + *root = el; + return true; +} + +static int StrList_Insert(StrList **root, char *txt) +{ + char *txtDup; + + assert(root && txt); + if (!root || !txt) { + return false; + } + txtDup = str_dup(txt); + if (!txtDup) { + return false; + } + + if (!StrList_InsertAndOwn(root, txtDup)) { + free((void *)txtDup); + return false; + } + return true; +} + +static void StrList_FreeElement(StrList *el) +{ + if (!el) { + return; + } + free((void *)el->str); + free((void *)el); +} + +static void StrList_Destroy(StrList **root) +{ + StrList *cur; + StrList *next; + + if (!root) { + return; + } + cur = *root; + while (cur) { + next = cur->next; + StrList_FreeElement(cur); + cur = next; + } + *root = nullptr; +} + +static void my_error(ErrorCategory, Goffset pos, const char *msg) +{ +#if 0 + char buf[4096], *p = buf; + + // NB: this can be called before the globalParams object is created + if (globalParams && globalParams->getErrQuiet()) { + return; + } + + if (pos >= 0) { + p += _snprintf(p, sizeof(buf)-1, "Error (%lld): ", (long long)pos); + *p = '\0'; + OutputDebugString(p); + } else { + OutputDebugString("Error: "); + } + + p = buf; + p += vsnprintf(p, sizeof(buf) - 1, msg, args); + while ( p > buf && isspace(p[-1]) ) + *--p = '\0'; + *p++ = '\r'; + *p++ = '\n'; + *p = '\0'; + OutputDebugString(buf); + + if (pos >= 0) { + p += _snprintf(p, sizeof(buf)-1, "Error (%lld): ", (long long)pos); + *p = '\0'; + OutputDebugString(buf); + if (gErrFile) + fprintf(gErrFile, buf); + } else { + OutputDebugString("Error: "); + if (gErrFile) + fprintf(gErrFile, "Error: "); + } +#endif +#if 0 + p = buf; + va_start(args, msg); + p += vsnprintf(p, sizeof(buf) - 3, msg, args); + while ( p > buf && isspace(p[-1]) ) + *--p = '\0'; + *p++ = '\r'; + *p++ = '\n'; + *p = '\0'; + OutputDebugString(buf); + if (gErrFile) + fprintf(gErrFile, buf); + va_end(args); +#endif +} + +static void LogInfo(const char *fmt, ...) GCC_PRINTF_FORMAT(1, 2); + +static void LogInfo(const char *fmt, ...) +{ + va_list args; + char buf[4096], *p = buf; + + p = buf; + va_start(args, fmt); + p += vsnprintf(p, sizeof(buf) - 1, fmt, args); + *p = '\0'; + fprintf(gOutFile, "%s", buf); + va_end(args); + fflush(gOutFile); +} + +static void PrintUsageAndExit(int argc, char **argv) +{ + printf("Usage: pdftest [-preview|-slowpreview] [-loadonly] [-timings] [-text] [-resolution NxM] [-recursive] [-page N] [-out out.txt] pdf-files-to-process\n"); + for (int i = 0; i < argc; i++) { + printf("i=%d, '%s'\n", i, argv[i]); + } + exit(0); +} + +static bool ShowPreview() +{ + if (gfPreview || gfSlowPreview) { + return true; + } + return false; +} + +static void RenderPdfAsText(const char *fileName) +{ + PDFDoc *pdfDoc = nullptr; + GooString *txt = nullptr; + int pageCount; + double timeInMs; + + assert(fileName); + if (!fileName) { + return; + } + + LogInfo("started: %s\n", fileName); + + TextOutputDev *textOut = new TextOutputDev(nullptr, true, 0, false, false); + if (!textOut->isOk()) { + delete textOut; + return; + } + + GooTimer msTimer; + pdfDoc = new PDFDoc(std::make_unique(fileName)); + if (!pdfDoc->isOk()) { + error(errIO, -1, "RenderPdfFile(): failed to open PDF file {0:s}\n", fileName); + goto Exit; + } + + msTimer.stop(); + timeInMs = msTimer.getElapsed(); + LogInfo("load: %.2f ms\n", timeInMs); + + pageCount = pdfDoc->getNumPages(); + LogInfo("page count: %d\n", pageCount); + + for (int curPage = 1; curPage <= pageCount; curPage++) { + if ((gPageNo != PAGE_NO_NOT_GIVEN) && (gPageNo != curPage)) { + continue; + } + + msTimer.start(); + int rotate = 0; + bool useMediaBox = false; + bool crop = true; + bool doLinks = false; + pdfDoc->displayPage(textOut, curPage, 72, 72, rotate, useMediaBox, crop, doLinks); + txt = textOut->getText(0.0, 0.0, 10000.0, 10000.0); + msTimer.stop(); + timeInMs = msTimer.getElapsed(); + if (gfTimings) { + LogInfo("page %d: %.2f ms\n", curPage, timeInMs); + } + printf("%s\n", txt->c_str()); + delete txt; + txt = nullptr; + } + +Exit: + LogInfo("finished: %s\n", fileName); + delete textOut; + delete pdfDoc; +} + +#ifdef _MSC_VER +# define POPPLER_TMP_NAME "c:\\poppler_tmp.pdf" +#else +# define POPPLER_TMP_NAME "/tmp/poppler_tmp.pdf" +#endif + +static void RenderPdf(const char *fileName) +{ + const char *fileNameSplash = nullptr; + PdfEnginePoppler *engineSplash = nullptr; + int pageCount; + double timeInMs; + +#ifdef COPY_FILE + // TODO: fails if file already exists and has read-only attribute + CopyFile(fileName, POPPLER_TMP_NAME, false); + fileNameSplash = POPPLER_TMP_NAME; +#else + fileNameSplash = fileName; +#endif + LogInfo("started: %s\n", fileName); + + engineSplash = new PdfEnginePoppler(); + + GooTimer msTimer; + if (!engineSplash->load(fileNameSplash)) { + LogInfo("failed to load splash\n"); + goto Error; + } + msTimer.stop(); + timeInMs = msTimer.getElapsed(); + LogInfo("load splash: %.2f ms\n", timeInMs); + pageCount = engineSplash->pageCount(); + + LogInfo("page count: %d\n", pageCount); + if (gfLoadOnly) { + goto Error; + } + + for (int curPage = 1; curPage <= pageCount; curPage++) { + if ((gPageNo != PAGE_NO_NOT_GIVEN) && (gPageNo != curPage)) { + continue; + } + + SplashBitmap *bmpSplash = nullptr; + + GooTimer msRenderTimer; + bmpSplash = engineSplash->renderBitmap(curPage, 100.0, 0); + msRenderTimer.stop(); + timeInMs = msRenderTimer.getElapsed(); + if (gfTimings) { + if (!bmpSplash) { + LogInfo("page splash %d: failed to render\n", curPage); + } else { + LogInfo("page splash %d (%dx%d): %.2f ms\n", curPage, bmpSplash->getWidth(), bmpSplash->getHeight(), timeInMs); + } + } + + if (ShowPreview()) { + PreviewBitmapSplash(bmpSplash); + if (gfSlowPreview) { + sleep_milliseconds(SLOW_PREVIEW_TIME); + } + } + delete bmpSplash; + } +Error: + delete engineSplash; + LogInfo("finished: %s\n", fileName); +} + +static void RenderFile(const char *fileName) +{ + if (gfTextOnly) { + RenderPdfAsText(fileName); + return; + } + + RenderPdf(fileName); +} + +static bool ParseInteger(const char *start, const char *end, int *intOut) +{ + char numBuf[16]; + int digitsCount; + const char *tmp; + + assert(start && end && intOut); + assert(end >= start); + if (!start || !end || !intOut || (start > end)) { + return false; + } + + digitsCount = 0; + tmp = start; + while (tmp <= end) { + if (isspace(*tmp)) { + /* do nothing, we allow whitespace */ + } else if (!isdigit(*tmp)) { + return false; + } + numBuf[digitsCount] = *tmp; + ++digitsCount; + if (digitsCount == dimof(numBuf) - 3) { /* -3 to be safe */ + return false; + } + ++tmp; + } + if (0 == digitsCount) { + return false; + } + numBuf[digitsCount] = 0; + *intOut = atoi(numBuf); + return true; +} + +/* Given 'resolutionString' in format NxM (e.g. "100x200"), parse the string and put N + into 'resolutionXOut' and M into 'resolutionYOut'. + Return false if there was an error (e.g. string is not in the right format */ +static bool ParseResolutionString(const char *resolutionString, int *resolutionXOut, int *resolutionYOut) +{ + const char *posOfX; + + assert(resolutionString); + assert(resolutionXOut); + assert(resolutionYOut); + if (!resolutionString || !resolutionXOut || !resolutionYOut) { + return false; + } + *resolutionXOut = 0; + *resolutionYOut = 0; + posOfX = strchr(resolutionString, 'X'); + if (!posOfX) { + posOfX = strchr(resolutionString, 'x'); + } + if (!posOfX) { + return false; + } + if (posOfX == resolutionString) { + return false; + } + if (!ParseInteger(resolutionString, posOfX - 1, resolutionXOut)) { + return false; + } + if (!ParseInteger(posOfX + 1, resolutionString + strlen(resolutionString) - 1, resolutionYOut)) { + return false; + } + return true; +} + +static void ParseCommandLine(int argc, char **argv) +{ + char *arg; + + if (argc < 2) { + PrintUsageAndExit(argc, argv); + } + + for (int i = 1; i < argc; i++) { + arg = argv[i]; + assert(arg); + if ('-' == arg[0]) { + if (str_ieq(arg, TIMINGS_ARG)) { + gfTimings = true; + } else if (str_ieq(arg, RESOLUTION_ARG)) { + ++i; + if (i == argc) { + PrintUsageAndExit(argc, argv); /* expect a file name after that */ + } + if (!ParseResolutionString(argv[i], &gResolutionX, &gResolutionY)) { + PrintUsageAndExit(argc, argv); + } + gfForceResolution = true; + } else if (str_ieq(arg, RECURSIVE_ARG)) { + gfRecursive = true; + } else if (str_ieq(arg, OUT_ARG)) { + /* expect a file name after that */ + ++i; + if (i == argc) { + PrintUsageAndExit(argc, argv); + } + gOutFileName = str_dup(argv[i]); + } else if (str_ieq(arg, PREVIEW_ARG)) { + gfPreview = true; + } else if (str_ieq(arg, TEXT_ARG)) { + gfTextOnly = true; + } else if (str_ieq(arg, SLOW_PREVIEW_ARG)) { + gfSlowPreview = true; + } else if (str_ieq(arg, LOAD_ONLY_ARG)) { + gfLoadOnly = true; + } else if (str_ieq(arg, PAGE_ARG)) { + /* expect an integer after that */ + ++i; + if (i == argc) { + PrintUsageAndExit(argc, argv); + } + gPageNo = atoi(argv[i]); + if (gPageNo < 1) { + PrintUsageAndExit(argc, argv); + } + } else { + /* unknown option */ + PrintUsageAndExit(argc, argv); + } + } else { + /* we assume that this is not an option hence it must be + a name of PDF/directory/file with PDF names */ + StrList_Insert(&gArgsListRoot, arg); + } + } +} + +static bool IsPdfFileName(char *path) +{ + if (str_endswith(path, ".pdf")) { + return true; + } + return false; +} + +/* Render 'cmdLineArg', which can be: + - name of PDF file +*/ +static void RenderCmdLineArg(char *cmdLineArg) +{ + assert(cmdLineArg); + if (!cmdLineArg) { + return; + } + if (IsPdfFileName(cmdLineArg)) { + RenderFile(cmdLineArg); + } else { + error(errCommandLine, -1, "unexpected argument '{0:s}'", cmdLineArg); + } +} + +int main(int argc, char **argv) +{ + setErrorCallback(my_error); + ParseCommandLine(argc, argv); + if (0 == StrList_Len(&gArgsListRoot)) { + PrintUsageAndExit(argc, argv); + } + assert(gArgsListRoot); + + SplashColorsInit(); + globalParams = std::make_unique(); + if (!globalParams) { + return 1; + } + globalParams->setErrQuiet(false); + + FILE *outFile = nullptr; + if (gOutFileName) { + outFile = fopen(gOutFileName, "wb"); + if (!outFile) { + printf("failed to open -out file %s\n", gOutFileName); + return 1; + } + gOutFile = outFile; + } else { + gOutFile = stdout; + } + + if (gOutFileName) { + gErrFile = outFile; + } else { + gErrFile = stderr; + } + + PreviewBitmapInit(); + + StrList *curr = gArgsListRoot; + while (curr) { + RenderCmdLineArg(curr->str); + curr = curr->next; + } + if (outFile) { + fclose(outFile); + } + PreviewBitmapDestroy(); + StrList_Destroy(&gArgsListRoot); + free(gOutFileName); + return 0; +} diff --git a/poppler-24.05.0/utils/CMakeLists.txt b/poppler-24.05.0/utils/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..3b566504d6ce956987be65a74260a36f450d36be --- /dev/null +++ b/poppler-24.05.0/utils/CMakeLists.txt @@ -0,0 +1,173 @@ +include(FindGettext) +include(FindIntl) + +set(common_srcs + parseargs.cc + Win32Console.cc +) +set(common_libs + poppler +) + +# pdftoppm +set(pdftoppm_SOURCES ${common_srcs} + pdftoppm.cc + sanitychecks.cc +) +add_executable(pdftoppm ${pdftoppm_SOURCES}) +target_link_libraries(pdftoppm ${common_libs}) +if(LCMS2_FOUND) + target_link_libraries(pdftoppm ${LCMS2_LIBRARIES}) + target_include_directories(pdftoppm SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) +endif() +install(TARGETS pdftoppm DESTINATION bin) +install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + +if (HAVE_CAIRO) + # pdftocairo + set(pdftocairo_SOURCES ${common_srcs} + pdftocairo.cc + pdftocairo-win32.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoFontEngine.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoOutputDev.cc + ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc + ) + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ) + add_definitions(${CAIRO_CFLAGS}) + add_executable(pdftocairo ${pdftocairo_SOURCES}) + target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs}) + target_include_directories(pdftocairo SYSTEM PRIVATE ${CAIRO_INCLUDE_DIRS}) + if(LCMS2_FOUND) + target_link_libraries(pdftocairo ${LCMS2_LIBRARIES}) + target_include_directories(pdftocairo SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) + endif() + install(TARGETS pdftocairo DESTINATION bin) + install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +endif () + +# pdfdetach +set(pdfdetach_SOURCES ${common_srcs} + pdfdetach.cc +) +add_executable(pdfdetach ${pdfdetach_SOURCES}) +target_link_libraries(pdfdetach ${common_libs}) +install(TARGETS pdfdetach DESTINATION bin) +install(FILES pdfdetach.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + +# pdfdetach +set(pdfattach_SOURCES ${common_srcs} + pdfattach.cc +) +add_executable(pdfattach ${pdfattach_SOURCES}) +target_link_libraries(pdfattach ${common_libs}) +install(TARGETS pdfattach DESTINATION bin) +install(FILES pdfattach.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + +# pdffonts +set(pdffonts_SOURCES ${common_srcs} + pdffonts.cc +) +add_executable(pdffonts ${pdffonts_SOURCES}) +target_link_libraries(pdffonts ${common_libs}) +install(TARGETS pdffonts DESTINATION bin) +install(FILES pdffonts.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + +# pdfimages +set(pdfimages_SOURCES ${common_srcs} + pdfimages.cc + ImageOutputDev.cc + ImageOutputDev.h +) +add_executable(pdfimages ${pdfimages_SOURCES}) +target_link_libraries(pdfimages ${common_libs}) +install(TARGETS pdfimages DESTINATION bin) +install(FILES pdfimages.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + +# pdfinfo +set(pdfinfo_SOURCES ${common_srcs} + pdfinfo.cc printencodings.cc +) +add_executable(pdfinfo ${pdfinfo_SOURCES}) +target_link_libraries(pdfinfo ${common_libs}) +install(TARGETS pdfinfo DESTINATION bin) +install(FILES pdfinfo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + +if (GETTEXT_FOUND AND Intl_FOUND AND ENABLE_SIGNATURES) + add_definitions(-DHAVE_GETTEXT) + add_definitions(-DCMAKE_INSTALL_LOCALEDIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}") + add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/po") +endif () + +if (ENABLE_SIGNATURES) + # pdfsig + set(pdfsig_SOURCES ${common_srcs} + pdfsig.cc + ) + add_executable(pdfsig ${pdfsig_SOURCES}) + target_link_libraries(pdfsig ${common_libs}) + if (ENABLE_NSS3) + target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if (Intl_FOUND) + target_link_libraries(pdfsig Intl::Intl) + endif () + install(TARGETS pdfsig DESTINATION bin) + install(FILES pdfsig.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +endif () + +# pdftops +set(pdftops_SOURCES ${common_srcs} + pdftops.cc + sanitychecks.cc +) +add_executable(pdftops ${pdftops_SOURCES}) +target_link_libraries(pdftops ${common_libs}) +if(LCMS2_FOUND) + target_link_libraries(pdftops ${LCMS2_LIBRARIES}) + target_include_directories(pdftops SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) +endif() +install(TARGETS pdftops DESTINATION bin) +install(FILES pdftops.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + +# pdftotext +set(pdftotext_SOURCES ${common_srcs} + pdftotext.cc printencodings.cc +) +add_executable(pdftotext ${pdftotext_SOURCES}) +target_link_libraries(pdftotext ${common_libs}) +install(TARGETS pdftotext DESTINATION bin) +install(FILES pdftotext.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + +# pdftohtml +set(pdftohtml_SOURCES ${common_srcs} + InMemoryFile.cc + pdftohtml.cc + HtmlFonts.cc + HtmlLinks.cc + HtmlOutputDev.cc +) +add_executable(pdftohtml ${pdftohtml_SOURCES}) +target_link_libraries(pdftohtml ${common_libs}) +install(TARGETS pdftohtml DESTINATION bin) +install(FILES pdftohtml.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + +# pdfseparate +set(pdfseparate_SOURCES ${common_srcs} + pdfseparate.cc +) +add_executable(pdfseparate ${pdfseparate_SOURCES}) +target_link_libraries(pdfseparate ${common_libs}) +install(TARGETS pdfseparate DESTINATION bin) +install(FILES pdfseparate.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + +# pdfunite +set(pdfunite_SOURCES ${common_srcs} + pdfunite.cc +) +add_executable(pdfunite ${pdfunite_SOURCES}) +target_link_libraries(pdfunite ${common_libs}) +install(TARGETS pdfunite DESTINATION bin) +install(FILES pdfunite.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) diff --git a/poppler-24.05.0/utils/HtmlFonts.cc b/poppler-24.05.0/utils/HtmlFonts.cc new file mode 100644 index 0000000000000000000000000000000000000000..022723e52d5773b6a5b9455ec42df2eca37eae01 --- /dev/null +++ b/poppler-24.05.0/utils/HtmlFonts.cc @@ -0,0 +1,371 @@ +//======================================================================== +// +// This file comes from pdftohtml project +// http://pdftohtml.sourceforge.net +// +// Copyright from: +// Gueorgui Ovtcharov +// Rainer Dorsch +// Mikhail Kruk +// +//======================================================================== + +//======================================================================== +// +// 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) 2007, 2010, 2012, 2018, 2020 Albert Astals Cid +// Copyright (C) 2008 Boris Toloknov +// Copyright (C) 2008 Tomas Are Haavet +// Copyright (C) 2010 OSSD CDAC Mumbai by Leena Chourey (leenac@cdacmumbai.in) and Onkar Potdar (onkar@cdacmumbai.in) +// Copyright (C) 2011 Joshua Richardson +// Copyright (C) 2011 Stephen Reichling +// Copyright (C) 2012 Igor Slepchin +// Copyright (C) 2012 Luis Parravicini +// Copyright (C) 2013 Julien Nabet +// Copyright (C) 2017 Jason Crain +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Steven Boswell +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019, 2022 Oliver Sander +// Copyright (C) 2020 Eddie Kohler +// Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// 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 "HtmlFonts.h" +#include "HtmlUtils.h" +#include "GlobalParams.h" +#include "UnicodeMap.h" +#include "GfxFont.h" +#include + +namespace { + +const char *const defaultFamilyName = "Times"; + +const char *const styleSuffixes[] = { + "-Regular", "-Bold", "-BoldOblique", "-BoldItalic", "-Oblique", "-Italic", "-Roman", +}; + +void removeStyleSuffix(std::string &familyName) +{ + for (const char *const styleSuffix : styleSuffixes) { + auto pos = familyName.rfind(styleSuffix); + if (pos != std::string::npos) { + familyName.resize(pos); + return; + } + } +} + +} + +#define xoutRound(x) ((int)(x + 0.5)) +extern bool xml; +extern bool fontFullName; + +HtmlFontColor::HtmlFontColor(GfxRGB rgb, double opacity_) +{ + r = static_cast(rgb.r / 65535.0 * 255.0); + g = static_cast(rgb.g / 65535.0 * 255.0); + b = static_cast(rgb.b / 65535.0 * 255.0); + opacity = static_cast(opacity_ * 255.999); + if (!(Ok(r) && Ok(b) && Ok(g) && Ok(opacity))) { + if (!globalParams->getErrQuiet()) { + fprintf(stderr, "Error : Bad color (%d,%d,%d,%d) reset to (0,0,0,255)\n", r, g, b, opacity); + } + r = 0; + g = 0; + b = 0; + opacity = 255; + } +} + +GooString *HtmlFontColor::convtoX(unsigned int xcol) const +{ + GooString *xret = new GooString(); + char tmp; + unsigned int k; + k = (xcol / 16); + if (k < 10) { + tmp = (char)('0' + k); + } else { + tmp = (char)('a' + k - 10); + } + xret->append(tmp); + k = (xcol % 16); + if (k < 10) { + tmp = (char)('0' + k); + } else { + tmp = (char)('a' + k - 10); + } + xret->append(tmp); + return xret; +} + +GooString *HtmlFontColor::toString() const +{ + GooString *tmp = new GooString("#"); + GooString *tmpr = convtoX(r); + GooString *tmpg = convtoX(g); + GooString *tmpb = convtoX(b); + tmp->append(tmpr); + tmp->append(tmpg); + tmp->append(tmpb); + delete tmpr; + delete tmpg; + delete tmpb; + return tmp; +} + +HtmlFont::HtmlFont(const GfxFont &font, int _size, GfxRGB rgb, double opacity) +{ + color = HtmlFontColor(rgb, opacity); + + lineSize = -1; + + size = _size; + italic = false; + bold = false; + rotOrSkewed = false; + + if (font.isBold() || font.getWeight() >= GfxFont::W700) { + bold = true; + } + if (font.isItalic()) { + italic = true; + } + + if (const std::optional &fontname = font.getName()) { + FontName = new GooString(*fontname); + + GooString fontnameLower(*fontname); + fontnameLower.lowerCase(); + + if (!bold && strstr(fontnameLower.c_str(), "bold")) { + bold = true; + } + + if (!italic && (strstr(fontnameLower.c_str(), "italic") || strstr(fontnameLower.c_str(), "oblique"))) { + italic = true; + } + + familyName = fontname->c_str(); + removeStyleSuffix(familyName); + } else { + FontName = new GooString(defaultFamilyName); + familyName = defaultFamilyName; + } + + rotSkewMat[0] = rotSkewMat[1] = rotSkewMat[2] = rotSkewMat[3] = 0; +} + +HtmlFont::HtmlFont(const HtmlFont &x) +{ + size = x.size; + lineSize = x.lineSize; + italic = x.italic; + bold = x.bold; + familyName = x.familyName; + color = x.color; + FontName = new GooString(x.FontName); + rotOrSkewed = x.rotOrSkewed; + memcpy(rotSkewMat, x.rotSkewMat, sizeof(rotSkewMat)); +} + +HtmlFont::~HtmlFont() +{ + delete FontName; +} + +HtmlFont &HtmlFont::operator=(const HtmlFont &x) +{ + if (this == &x) { + return *this; + } + size = x.size; + lineSize = x.lineSize; + italic = x.italic; + bold = x.bold; + familyName = x.familyName; + color = x.color; + delete FontName; + FontName = new GooString(x.FontName); + return *this; +} + +/* + This function is used to compare font uniquely for insertion into + the list of all encountered fonts +*/ +bool HtmlFont::isEqual(const HtmlFont &x) const +{ + return (size == x.size) && (lineSize == x.lineSize) && (FontName->cmp(x.FontName) == 0) && (bold == x.bold) && (italic == x.italic) && (color.isEqual(x.getColor())) && isRotOrSkewed() == x.isRotOrSkewed() + && (!isRotOrSkewed() || rot_matrices_equal(getRotMat(), x.getRotMat())); +} + +/* + This one is used to decide whether two pieces of text can be joined together + and therefore we don't care about bold/italics properties +*/ +bool HtmlFont::isEqualIgnoreBold(const HtmlFont &x) const +{ + return ((size == x.size) && (familyName == x.familyName) && (color.isEqual(x.getColor()))); +} + +GooString *HtmlFont::getFontName() +{ + return new GooString(familyName); +} + +GooString *HtmlFont::getFullName() +{ + return new GooString(FontName); +} + +// this method if plain wrong todo +std::unique_ptr HtmlFont::HtmlFilter(const Unicode *u, int uLen) +{ + auto tmp = std::make_unique(); + const UnicodeMap *uMap; + char buf[8]; + int n; + + // get the output encoding + if (!(uMap = globalParams->getTextEncoding())) { + return tmp; + } + + for (int i = 0; i < uLen; ++i) { + // skip control characters. W3C disallows them and they cause a warning + // with PHP. + if (u[i] <= 31 && u[i] != '\t') { + continue; + } + + switch (u[i]) { + case '"': + tmp->append("""); + break; + case '&': + tmp->append("&"); + break; + case '<': + tmp->append("<"); + break; + case '>': + tmp->append(">"); + break; + case ' ': + case '\t': + tmp->append(!xml && (i + 1 >= uLen || !tmp->getLength() || tmp->getChar(tmp->getLength() - 1) == ' ') ? " " : " "); + break; + default: { + // convert unicode to string + if ((n = uMap->mapUnicode(u[i], buf, sizeof(buf))) > 0) { + tmp->append(buf, n); + } + } + } + } + + return tmp; +} + +HtmlFontAccu::HtmlFontAccu() { } + +HtmlFontAccu::~HtmlFontAccu() { } + +int HtmlFontAccu::AddFont(const HtmlFont &font) +{ + std::vector::iterator i; + for (i = accu.begin(); i != accu.end(); ++i) { + if (font.isEqual(*i)) { + return (int)(i - (accu.begin())); + } + } + + accu.push_back(font); + return (accu.size() - 1); +} + +// get CSS font definition for font #i +GooString *HtmlFontAccu::CSStyle(int i, int j) +{ + GooString *tmp = new GooString(); + + std::vector::iterator g = accu.begin(); + g += i; + HtmlFont font = *g; + GooString *colorStr = font.getColor().toString(); + GooString *fontName = (fontFullName ? font.getFullName() : font.getFontName()); + + if (!xml) { + tmp->append(".ft"); + tmp->append(std::to_string(j)); + tmp->append(std::to_string(i)); + tmp->append("{font-size:"); + tmp->append(std::to_string(font.getSize())); + if (font.getLineSize() != -1 && font.getLineSize() != 0) { + tmp->append("px;line-height:"); + tmp->append(std::to_string(font.getLineSize())); + } + tmp->append("px;font-family:"); + tmp->append(fontName); // font.getFontName()); + tmp->append(";color:"); + tmp->append(colorStr); + if (font.getColor().getOpacity() != 1.0) { + tmp->append(";opacity:"); + tmp->append(std::to_string(font.getColor().getOpacity())); + } + // if there is rotation or skew, include the matrix + if (font.isRotOrSkewed()) { + const double *const text_mat = font.getRotMat(); + GooString matrix_str(" matrix("); + matrix_str.appendf("{0:10.10g}, {1:10.10g}, {2:10.10g}, {3:10.10g}, 0, 0)", text_mat[0], text_mat[1], text_mat[2], text_mat[3]); + tmp->append(";-moz-transform:"); + tmp->append(&matrix_str); + tmp->append(";-webkit-transform:"); + tmp->append(&matrix_str); + tmp->append(";-o-transform:"); + tmp->append(&matrix_str); + tmp->append(";-ms-transform:"); + tmp->append(&matrix_str); + // Todo: 75% is a wild guess that seems to work pretty well; + // We probably need to calculate the real percentage + // Based on the characteristic baseline and bounding box of current font + // PDF origin is at baseline + tmp->append(";-moz-transform-origin: left 75%"); + tmp->append(";-webkit-transform-origin: left 75%"); + tmp->append(";-o-transform-origin: left 75%"); + tmp->append(";-ms-transform-origin: left 75%"); + } + tmp->append(";}"); + } + if (xml) { + tmp->append("append(std::to_string(i)); + tmp->append("\" size=\""); + tmp->append(std::to_string(font.getSize())); + tmp->append("\" family=\""); + tmp->append(fontName); + tmp->append("\" color=\""); + tmp->append(colorStr); + if (font.getColor().getOpacity() != 1.0) { + tmp->append("\" opacity=\""); + tmp->append(std::to_string(font.getColor().getOpacity())); + } + tmp->append("\"/>"); + } + + delete fontName; + delete colorStr; + return tmp; +} diff --git a/poppler-24.05.0/utils/HtmlFonts.h b/poppler-24.05.0/utils/HtmlFonts.h new file mode 100644 index 0000000000000000000000000000000000000000..919e86449c19dc3a5e401a3cd7d48052cb3d151f --- /dev/null +++ b/poppler-24.05.0/utils/HtmlFonts.h @@ -0,0 +1,129 @@ +//======================================================================== +// +// This file comes from pdftohtml project +// http://pdftohtml.sourceforge.net +// +// Copyright from: +// Gueorgui Ovtcharov +// Rainer Dorsch +// Mikhail Kruk +// +//======================================================================== + +//======================================================================== +// +// 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) 2010 OSSD CDAC Mumbai by Leena Chourey (leenac@cdacmumbai.in) and Onkar Potdar (onkar@cdacmumbai.in) +// Copyright (C) 2010, 2012, 2017, 2018, 2020 Albert Astals Cid +// Copyright (C) 2011 Steven Murdoch +// Copyright (C) 2011 Joshua Richardson +// Copyright (C) 2012 Igor Slepchin +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2020 Eddie Kohler +// Copyright (C) 2022 Oliver Sander +// Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// 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 +// +//======================================================================== + +#ifndef _HTML_FONTS_H +#define _HTML_FONTS_H +#include "goo/GooString.h" +#include "GfxState.h" +#include "CharTypes.h" +#include + +class HtmlFontColor +{ +private: + unsigned int r; + unsigned int g; + unsigned int b; + unsigned int opacity; + bool Ok(unsigned int xcol) { return xcol <= 255; } + GooString *convtoX(unsigned int xcol) const; + +public: + HtmlFontColor() : r(0), g(0), b(0), opacity(255) { } + HtmlFontColor(GfxRGB rgb, double opacity); + HtmlFontColor(const HtmlFontColor &x) + { + r = x.r; + g = x.g; + b = x.b; + opacity = x.opacity; + } + HtmlFontColor &operator=(const HtmlFontColor &x) + { + r = x.r; + g = x.g; + b = x.b; + opacity = x.opacity; + return *this; + } + ~HtmlFontColor() {}; + GooString *toString() const; + double getOpacity() const { return opacity / 255.0; } + bool isEqual(const HtmlFontColor &col) const { return ((r == col.r) && (g == col.g) && (b == col.b) && (opacity == col.opacity)); } +}; + +class HtmlFont +{ +private: + int size; + int lineSize; + bool italic; + bool bold; + bool rotOrSkewed; + std::string familyName; + GooString *FontName; + HtmlFontColor color; + double rotSkewMat[4]; // only four values needed for rotation and skew +public: + HtmlFont(const GfxFont &font, int _size, GfxRGB rgb, double opacity); + HtmlFont(const HtmlFont &x); + HtmlFont &operator=(const HtmlFont &x); + HtmlFontColor getColor() const { return color; } + ~HtmlFont(); + GooString *getFullName(); + bool isItalic() const { return italic; } + bool isBold() const { return bold; } + bool isRotOrSkewed() const { return rotOrSkewed; } + int getSize() const { return size; } + int getLineSize() const { return lineSize; } + void setLineSize(int _lineSize) { lineSize = _lineSize; } + void setRotMat(const double *const mat) + { + rotOrSkewed = true; + memcpy(rotSkewMat, mat, sizeof(rotSkewMat)); + } + const double *getRotMat() const { return rotSkewMat; } + GooString *getFontName(); + static std::unique_ptr HtmlFilter(const Unicode *u, int uLen); // char* s); + bool isEqual(const HtmlFont &x) const; + bool isEqualIgnoreBold(const HtmlFont &x) const; + void print() const { printf("font: %s (%s) %d %s%s\n", FontName->c_str(), familyName.c_str(), size, bold ? "bold " : "", italic ? "italic " : ""); }; +}; + +class HtmlFontAccu +{ +private: + std::vector accu; + +public: + HtmlFontAccu(); + ~HtmlFontAccu(); + HtmlFontAccu(const HtmlFontAccu &) = delete; + HtmlFontAccu &operator=(const HtmlFontAccu &) = delete; + int AddFont(const HtmlFont &font); + const HtmlFont *Get(int i) const { return &accu[i]; } + GooString *CSStyle(int i, int j = 0); + int size() const { return accu.size(); } +}; +#endif diff --git a/poppler-24.05.0/utils/HtmlLinks.cc b/poppler-24.05.0/utils/HtmlLinks.cc new file mode 100644 index 0000000000000000000000000000000000000000..a28d23d697ce7e6ca7f77c6461c3f009a9e1789e --- /dev/null +++ b/poppler-24.05.0/utils/HtmlLinks.cc @@ -0,0 +1,158 @@ +//======================================================================== +// +// This file comes from pdftohtml project +// http://pdftohtml.sourceforge.net +// +// Copyright from: +// Gueorgui Ovtcharov +// Rainer Dorsch +// Mikhail Kruk +// +//======================================================================== + +//======================================================================== +// +// 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) 2008 Boris Toloknov +// Copyright (C) 2010, 2021, 2022 Albert Astals Cid +// Copyright (C) 2013 Julien Nabet +// +// 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 "HtmlLinks.h" + +extern bool xml; + +HtmlLink::HtmlLink(const HtmlLink &x) +{ + Xmin = x.Xmin; + Ymin = x.Ymin; + Xmax = x.Xmax; + Ymax = x.Ymax; + dest = new GooString(x.dest); +} + +HtmlLink::HtmlLink(double xmin, double ymin, double xmax, double ymax, GooString *_dest) +{ + if (xmin < xmax) { + Xmin = xmin; + Xmax = xmax; + } else { + Xmin = xmax; + Xmax = xmin; + } + if (ymin < ymax) { + Ymin = ymin; + Ymax = ymax; + } else { + Ymin = ymax; + Ymax = ymin; + } + dest = new GooString(_dest); +} + +HtmlLink::~HtmlLink() +{ + delete dest; +} + +bool HtmlLink::isEqualDest(const HtmlLink &x) const +{ + return (!strcmp(dest->c_str(), x.dest->c_str())); +} + +bool HtmlLink::inLink(double xmin, double ymin, double xmax, double ymax) const +{ + double y = (ymin + ymax) / 2; + if (y > Ymax) { + return false; + } + return (y > Ymin) && (xmin < Xmax) && (xmax > Xmin); +} + +static GooString *EscapeSpecialChars(GooString *s) +{ + GooString *tmp = nullptr; + for (int i = 0, j = 0; i < s->getLength(); i++, j++) { + const char *replace = nullptr; + switch (s->getChar(i)) { + case '"': + replace = """; + break; + case '&': + replace = "&"; + break; + case '<': + replace = "<"; + break; + case '>': + replace = ">"; + break; + default: + continue; + } + if (replace) { + if (!tmp) { + tmp = new GooString(s); + } + if (tmp) { + tmp->del(j, 1); + int l = strlen(replace); + tmp->insert(j, replace, l); + j += l - 1; + } + } + } + return tmp ? tmp : s; +} + +GooString *HtmlLink::getLinkStart() const +{ + GooString *res = new GooString("append(d); + if (d != dest) { + delete d; + } + res->append("\">"); + return res; +} + +/*GooString* HtmlLink::Link(GooString* content){ + //GooString* _dest=new GooString(dest); + GooString *tmp=new GooString("append(dest); + tmp->append("\">"); + tmp->append(content); + tmp->append(""); + //delete _dest; + return tmp; + }*/ + +HtmlLinks::HtmlLinks() { } + +HtmlLinks::~HtmlLinks() { } + +bool HtmlLinks::inLink(double xmin, double ymin, double xmax, double ymax, size_t &p) const +{ + + for (std::vector::const_iterator i = accu.begin(); i != accu.end(); ++i) { + if (i->inLink(xmin, ymin, xmax, ymax)) { + p = (i - accu.begin()); + return true; + } + } + return false; +} + +const HtmlLink *HtmlLinks::getLink(size_t i) const +{ + return &accu[i]; +} diff --git a/poppler-24.05.0/utils/HtmlLinks.h b/poppler-24.05.0/utils/HtmlLinks.h new file mode 100644 index 0000000000000000000000000000000000000000..0e62f56e46f6de7264bbe7d63a1b408ecbb8d76e --- /dev/null +++ b/poppler-24.05.0/utils/HtmlLinks.h @@ -0,0 +1,76 @@ +//======================================================================== +// +// This file comes from pdftohtml project +// http://pdftohtml.sourceforge.net +// +// Copyright from: +// Gueorgui Ovtcharov +// Rainer Dorsch +// Mikhail Kruk +// +//======================================================================== + +//======================================================================== +// +// 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) 2010, 2018, 2021, 2022 Albert Astals Cid +// +// 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 +// +//======================================================================== + +#ifndef _HTML_LINKS +#define _HTML_LINKS + +#include +#include +#include +#include "goo/GooString.h" + +class HtmlLink +{ + +private: + double Xmin; + double Ymin; + double Xmax; + double Ymax; + GooString *dest; + +public: + HtmlLink(const HtmlLink &x); + HtmlLink(double xmin, double ymin, double xmax, double ymax, GooString *_dest); + ~HtmlLink(); + HtmlLink &operator=(const HtmlLink &) = delete; + bool isEqualDest(const HtmlLink &x) const; + GooString *getDest() const { return new GooString(dest); } + double getX1() const { return Xmin; } + double getX2() const { return Xmax; } + double getY1() const { return Ymin; } + double getY2() const { return Ymax; } + bool inLink(double xmin, double ymin, double xmax, double ymax) const; + // GooString *Link(GooString *content); + GooString *getLinkStart() const; +}; + +class HtmlLinks +{ +private: + std::vector accu; + +public: + HtmlLinks(); + ~HtmlLinks(); + HtmlLinks(const HtmlLinks &) = delete; + HtmlLinks &operator=(const HtmlLinks &) = delete; + void AddLink(const HtmlLink &x) { accu.push_back(x); } + bool inLink(double xmin, double ymin, double xmax, double ymax, size_t &p) const; + const HtmlLink *getLink(size_t i) const; +}; + +#endif diff --git a/poppler-24.05.0/utils/HtmlOutputDev.cc b/poppler-24.05.0/utils/HtmlOutputDev.cc new file mode 100644 index 0000000000000000000000000000000000000000..36e9dc769c9c2d0916ff758ad78bc7b9f4af2268 --- /dev/null +++ b/poppler-24.05.0/utils/HtmlOutputDev.cc @@ -0,0 +1,1835 @@ +//======================================================================== +// +// HtmlOutputDev.cc +// +// Copyright 1997-2002 Glyph & Cog, LLC +// +// Changed 1999-2000 by G.Ovtcharov +// +// Changed 2002 by Mikhail Kruk +// +//======================================================================== + +//======================================================================== +// +// 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) 2005-2013, 2016-2022 Albert Astals Cid +// Copyright (C) 2008 Kjartan Maraas +// Copyright (C) 2008 Boris Toloknov +// Copyright (C) 2008 Haruyuki Kawabe +// Copyright (C) 2008 Tomas Are Haavet +// Copyright (C) 2009 Warren Toomey +// Copyright (C) 2009, 2011 Carlos Garcia Campos +// Copyright (C) 2009 Reece Dunn +// Copyright (C) 2010, 2012, 2013, 2022 Adrian Johnson +// Copyright (C) 2010 Hib Eris +// Copyright (C) 2010 OSSD CDAC Mumbai by Leena Chourey (leenac@cdacmumbai.in) and Onkar Potdar (onkar@cdacmumbai.in) +// Copyright (C) 2011 Joshua Richardson +// Copyright (C) 2011 Stephen Reichling +// Copyright (C) 2011, 2012 Igor Slepchin +// Copyright (C) 2012 Ihar Filipau +// Copyright (C) 2012 Gerald Schmidt +// Copyright (C) 2012 Pino Toscano +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2013 Julien Nabet +// Copyright (C) 2013 Johannes Brandstätter +// Copyright (C) 2014 Fabio D'Urso +// Copyright (C) 2016 Vincent Le Garrec +// Copyright (C) 2017 Caolán McNamara +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Thibaut Brard +// Copyright (C) 2018-2020 Adam Reichold +// Copyright (C) 2019, 2020, 2022, 2024 Oliver Sander +// Copyright (C) 2020 Eddie Kohler +// Copyright (C) 2021 Christopher Hasse +// Copyright (C) 2022 Brian Rosenfield +// Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// 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" +#include +#include +#include +#include +#include +#include +#include +#include "goo/GooString.h" +#include "goo/gbasename.h" +#include "goo/gbase64.h" +#include "goo/gbasename.h" +#include "UnicodeMap.h" +#include "goo/gmem.h" +#include "Error.h" +#include "GfxState.h" +#include "Page.h" +#include "Annot.h" +#include "PNGWriter.h" +#include "GlobalParams.h" +#include "HtmlOutputDev.h" +#include "HtmlFonts.h" +#include "HtmlUtils.h" +#include "InMemoryFile.h" +#include "Outline.h" +#include "PDFDoc.h" + +#define DEBUG __FILE__ << ": " << __LINE__ << ": DEBUG: " + +class HtmlImage +{ +public: + HtmlImage(std::unique_ptr &&_fName, GfxState *state) : fName(std::move(_fName)) + { + state->transform(0, 0, &xMin, &yMax); + state->transform(1, 1, &xMax, &yMin); + } + ~HtmlImage() = default; + HtmlImage(const HtmlImage &) = delete; + HtmlImage &operator=(const HtmlImage &) = delete; + + double xMin, xMax; // image x coordinates + double yMin, yMax; // image y coordinates + std::unique_ptr fName; // image file name +}; + +// returns true if x is closer to y than x is to z +static inline bool IS_CLOSER(double x, double y, double z) +{ + return std::fabs((x) - (y)) < std::fabs((x) - (z)); +} + +extern bool complexMode; +extern bool singleHtml; +extern bool dataUrls; +extern bool ignore; +extern bool printCommands; +extern bool printHtml; +extern bool noframes; +extern bool stout; +extern bool xml; +extern bool noRoundedCoordinates; +extern bool showHidden; +extern bool noMerge; + +extern double wordBreakThreshold; + +static bool debug = false; + +#if 0 +static GooString* Dirname(GooString* str){ + + char *p=str->c_str(); + int len=str->getLength(); + for (int i=len-1;i>=0;i--) + if (*(p+i)==SLASH) + return new GooString(p,i+1); + return new GooString(); +} +#endif + +static std::unique_ptr print_matrix(const double *mat) +{ + return GooString::format("[{0:g} {1:g} {2:g} {3:g} {4:g} {5:g}]", *mat, mat[1], mat[2], mat[3], mat[4], mat[5]); +} + +static std::unique_ptr print_uni_str(const Unicode *u, const unsigned uLen) +{ + if (!uLen) { + return std::make_unique(""); + } + std::unique_ptr gstr_buff0 = GooString::format("{0:c}", (*u < 0x7F ? *u & 0xFF : '?')); + for (unsigned i = 1; i < uLen; i++) { + if (u[i] < 0x7F) { + gstr_buff0->append(static_cast(u[i]) & 0xFF); + } + } + + return gstr_buff0; +} + +//------------------------------------------------------------------------ +// HtmlString +//------------------------------------------------------------------------ + +HtmlString::HtmlString(GfxState *state, double fontSize, HtmlFontAccu *_fonts) : fonts(_fonts) +{ + double x, y; + + state->transform(state->getCurX(), state->getCurY(), &x, &y); + if (std::shared_ptr font = state->getFont()) { + double ascent = font->getAscent(); + double descent = font->getDescent(); + if (ascent > 1.05) { + // printf( "ascent=%.15g is too high, descent=%.15g\n", ascent, descent ); + ascent = 1.05; + } + if (descent < -0.4) { + // printf( "descent %.15g is too low, ascent=%.15g\n", descent, ascent ); + descent = -0.4; + } + yMin = y - ascent * fontSize; + yMax = y - descent * fontSize; + GfxRGB rgb; + state->getFillRGB(&rgb); + HtmlFont hfont = HtmlFont(*font, std::lround(fontSize), rgb, state->getFillOpacity()); + if (isMatRotOrSkew(state->getTextMat())) { + double normalizedMatrix[4]; + memcpy(normalizedMatrix, state->getTextMat(), sizeof(normalizedMatrix)); + // browser rotates the opposite way + // so flip the sign of the angle -> sin() components change sign + if (debug) { + std::cerr << DEBUG << "before transform: " << print_matrix(normalizedMatrix)->c_str() << std::endl; + } + normalizedMatrix[1] *= -1; + normalizedMatrix[2] *= -1; + if (debug) { + std::cerr << DEBUG << "after reflecting angle: " << print_matrix(normalizedMatrix)->c_str() << std::endl; + } + normalizeRotMat(normalizedMatrix); + if (debug) { + std::cerr << DEBUG << "after norm: " << print_matrix(normalizedMatrix)->c_str() << std::endl; + } + hfont.setRotMat(normalizedMatrix); + } + fontpos = fonts->AddFont(hfont); + } else { + // this means that the PDF file draws text without a current font, + // which should never happen + yMin = y - 0.95 * fontSize; + yMax = y + 0.35 * fontSize; + fontpos = 0; + } + if (yMin == yMax) { + // this is a sanity check for a case that shouldn't happen -- but + // if it does happen, we want to avoid dividing by zero later + yMin = y; + yMax = y + 1; + } + col = 0; + text = nullptr; + xRight = nullptr; + link = nullptr; + len = size = 0; + yxNext = nullptr; + xyNext = nullptr; + htext = std::make_unique(); + dir = textDirUnknown; +} + +HtmlString::~HtmlString() +{ + gfree(text); + gfree(xRight); +} + +void HtmlString::addChar(GfxState *state, double x, double y, double dx, double dy, Unicode u) +{ + if (dir == textDirUnknown) { + // dir = UnicodeMap::getDirection(u); + dir = textDirLeftRight; + } + + if (len == size) { + size += 16; + text = (Unicode *)grealloc(text, size * sizeof(Unicode)); + xRight = (double *)grealloc(xRight, size * sizeof(double)); + } + text[len] = u; + if (len == 0) { + xMin = x; + } + xMax = xRight[len] = x + dx; + // printf("added char: %f %f xright = %f\n", x, dx, x+dx); + ++len; +} + +void HtmlString::endString() +{ + if (dir == textDirRightLeft && len > 1) { + // printf("will reverse!\n"); + for (int i = 0; i < len / 2; i++) { + Unicode ch = text[i]; + text[i] = text[len - i - 1]; + text[len - i - 1] = ch; + } + } +} + +//------------------------------------------------------------------------ +// HtmlPage +//------------------------------------------------------------------------ + +HtmlPage::HtmlPage(bool rawOrderA) +{ + rawOrder = rawOrderA; + curStr = nullptr; + yxStrings = nullptr; + xyStrings = nullptr; + yxCur1 = yxCur2 = nullptr; + fonts = new HtmlFontAccu(); + links = new HtmlLinks(); + pageWidth = 0; + pageHeight = 0; + fontsPageMarker = 0; + DocName = nullptr; + firstPage = -1; +} + +HtmlPage::~HtmlPage() +{ + clear(); + delete DocName; + delete fonts; + delete links; + for (auto entry : imgList) { + delete entry; + } +} + +void HtmlPage::updateFont(GfxState *state) +{ + const char *name; + int code; + double dimLength; + + // adjust the font size + fontSize = state->getTransformedFontSize(); + const GfxFont *const font = state->getFont().get(); + if (font && font->getType() == fontType3) { + // Grab the font size from the font bounding box if possible - remember to + // scale from the glyph coordinate system. + const double *fontBBox = font->getFontBBox(); + const double *fontMat = font->getFontMatrix(); + dimLength = (fontBBox[3] - fontBBox[1]) * fontMat[3]; + if (dimLength > 0) { + fontSize *= dimLength; + } else { + // This is a hack which makes it possible to deal with some Type 3 + // fonts. The problem is that it's impossible to know what the + // base coordinate system used in the font is without actually + // rendering the font. This code tries to guess by looking at the + // width of the character 'm' (which breaks if the font is a + // subset that doesn't contain 'm'). + for (code = 0; code < 256; ++code) { + if ((name = ((Gfx8BitFont *)font)->getCharName(code)) && name[0] == 'm' && name[1] == '\0') { + break; + } + } + if (code < 256) { + dimLength = ((Gfx8BitFont *)font)->getWidth(code); + if (dimLength != 0) { + // 600 is a generic average 'm' width -- yes, this is a hack + fontSize *= dimLength / 0.6; + } + } + if (fontMat[0] != 0) { + fontSize *= fabs(fontMat[3] / fontMat[0]); + } + } + } +} + +void HtmlPage::beginString(GfxState *state, const GooString *s) +{ + curStr = new HtmlString(state, fontSize, fonts); +} + +void HtmlPage::conv() +{ + for (HtmlString *tmp = yxStrings; tmp; tmp = tmp->yxNext) { + tmp->htext = HtmlFont::HtmlFilter(tmp->text, tmp->len); + + size_t linkIndex = 0; + if (links->inLink(tmp->xMin, tmp->yMin, tmp->xMax, tmp->yMax, linkIndex)) { + tmp->link = links->getLink(linkIndex); + } + } +} + +void HtmlPage::addChar(GfxState *state, double x, double y, double dx, double dy, double ox, double oy, const Unicode *u, int uLen) +{ + double x1, y1, w1, h1, dx2, dy2; + int n, i; + state->transform(x, y, &x1, &y1); + n = curStr->len; + + // check that new character is in the same direction as current string + // and is not too far away from it before adding + // if ((UnicodeMap::getDirection(u[0]) != curStr->dir) || + // XXX + if (debug) { + const double *text_mat = state->getTextMat(); + // rotation is (cos q, sin q, -sin q, cos q, 0, 0) + // sin q is zero iff there is no rotation, or 180 deg. rotation; + // for 180 rotation, cos q will be negative + if (text_mat[0] < 0 || !is_within(text_mat[1], .1, 0)) { + std::cerr << DEBUG << "rotation matrix for \"" << print_uni_str(u, uLen)->c_str() << '"' << std::endl; + std::cerr << "text " << print_matrix(state->getTextMat())->c_str(); + } + } + if (n > 0 && // don't start a new string, unless there is already a string + // TODO: the following line assumes that text is flowing left to + // right, which will not necessarily be the case, e.g. if rotated; + // It assesses whether or not two characters are close enough to + // be part of the same string + fabs(x1 - curStr->xRight[n - 1]) > wordBreakThreshold * (curStr->yMax - curStr->yMin) && + // rotation is (cos q, sin q, -sin q, cos q, 0, 0) + // sin q is zero iff there is no rotation, or 180 deg. rotation; + // for 180 rotation, cos q will be negative + !rot_matrices_equal(curStr->getFont().getRotMat(), state->getTextMat())) { + endString(); + beginString(state, nullptr); + } + state->textTransformDelta(state->getCharSpace() * state->getHorizScaling(), 0, &dx2, &dy2); + dx -= dx2; + dy -= dy2; + state->transformDelta(dx, dy, &w1, &h1); + if (uLen != 0) { + w1 /= uLen; + h1 /= uLen; + } + for (i = 0; i < uLen; ++i) { + curStr->addChar(state, x1 + i * w1, y1 + i * h1, w1, h1, u[i]); + } +} + +void HtmlPage::endString() +{ + HtmlString *p1, *p2; + double h, y1, y2; + + // throw away zero-length strings -- they don't have valid xMin/xMax + // values, and they're useless anyway + if (curStr->len == 0) { + delete curStr; + curStr = nullptr; + return; + } + + curStr->endString(); + +#if 0 //~tmp + if (curStr->yMax - curStr->yMin > 20) { + delete curStr; + curStr = NULL; + return; + } +#endif + + // insert string in y-major list + h = curStr->yMax - curStr->yMin; + y1 = curStr->yMin + 0.5 * h; + y2 = curStr->yMin + 0.8 * h; + if (rawOrder) { + p1 = yxCur1; + p2 = nullptr; + } else if ((!yxCur1 || (y1 >= yxCur1->yMin && (y2 >= yxCur1->yMax || curStr->xMax >= yxCur1->xMin))) && (!yxCur2 || (y1 < yxCur2->yMin || (y2 < yxCur2->yMax && curStr->xMax < yxCur2->xMin)))) { + p1 = yxCur1; + p2 = yxCur2; + } else { + for (p1 = nullptr, p2 = yxStrings; p2; p1 = p2, p2 = p2->yxNext) { + if (y1 < p2->yMin || (y2 < p2->yMax && curStr->xMax < p2->xMin)) { + break; + } + } + yxCur2 = p2; + } + yxCur1 = curStr; + if (p1) { + p1->yxNext = curStr; + } else { + yxStrings = curStr; + } + curStr->yxNext = p2; + curStr = nullptr; +} + +static const char *strrstr(const char *s, const char *ss) +{ + const char *p = strstr(s, ss); + for (const char *pp = p; pp != nullptr; pp = strstr(p + 1, ss)) { + p = pp; + } + return p; +} + +static void CloseTags(GooString *htext, bool &finish_a, bool &finish_italic, bool &finish_bold) +{ + const char *last_italic = finish_italic && (finish_bold || finish_a) ? strrstr(htext->c_str(), "") : nullptr; + const char *last_bold = finish_bold && (finish_italic || finish_a) ? strrstr(htext->c_str(), "") : nullptr; + const char *last_a = finish_a && (finish_italic || finish_bold) ? strrstr(htext->c_str(), " (last_italic > last_bold ? last_italic : last_bold)) { + htext->append("", 4); + finish_a = false; + } + if (finish_italic && finish_bold && last_italic > last_bold) { + htext->append("", 4); + finish_italic = false; + } + if (finish_bold) { + htext->append("", 4); + } + if (finish_italic) { + htext->append("", 4); + } + if (finish_a) { + htext->append(""); + } +} + +// Strings are lines of text; +// This function aims to combine strings into lines and paragraphs if !noMerge +// It may also strip out duplicate strings (if they are on top of each other); sometimes they are to create a font effect +void HtmlPage::coalesce() +{ + HtmlString *str1, *str2; + double space, horSpace, vertSpace, vertOverlap; + bool addSpace, addLineBreak; + int n, i; + double curX, curY; + +#if 0 //~ for debugging + for (str1 = yxStrings; str1; str1 = str1->yxNext) { + printf("x=%f..%f y=%f..%f size=%2d '", + str1->xMin, str1->xMax, str1->yMin, str1->yMax, + (int)(str1->yMax - str1->yMin)); + for (i = 0; i < str1->len; ++i) { + fputc(str1->text[i] & 0xff, stdout); + } + printf("'\n"); + } + printf("\n------------------------------------------------------------\n\n"); +#endif + str1 = yxStrings; + + if (!str1) { + return; + } + + //----- discard duplicated text (fake boldface, drop shadows) + if (!complexMode) { /* if not in complex mode get rid of duplicate strings */ + HtmlString *str3; + bool found; + while (str1) { + double size = str1->yMax - str1->yMin; + double xLimit = str1->xMin + size; + found = false; + for (str2 = str1, str3 = str1->yxNext; str3 && str3->xMin < xLimit; str2 = str3, str3 = str2->yxNext) { + if (str3->len == str1->len && !memcmp(str3->text, str1->text, str1->len * sizeof(Unicode)) && fabs(str3->yMin - str1->yMin) < size * 0.2 && fabs(str3->yMax - str1->yMax) < size * 0.2 + && fabs(str3->xMax - str1->xMax) < size * 0.1) { + found = true; + // printf("found duplicate!\n"); + break; + } + } + if (found) { + str2->xyNext = str3->xyNext; + str2->yxNext = str3->yxNext; + delete str3; + } else { + str1 = str1->yxNext; + } + } + } /*- !complexMode */ + + str1 = yxStrings; + + const HtmlFont *hfont1 = getFont(str1); + if (hfont1->isBold()) { + str1->htext->insert(0, "", 3); + } + if (hfont1->isItalic()) { + str1->htext->insert(0, "", 3); + } + if (str1->getLink() != nullptr) { + GooString *ls = str1->getLink()->getLinkStart(); + str1->htext->insert(0, ls); + delete ls; + } + curX = str1->xMin; + curY = str1->yMin; + + while (str1 && (str2 = str1->yxNext)) { + const HtmlFont *hfont2 = getFont(str2); + space = str1->yMax - str1->yMin; // the height of the font's bounding box + horSpace = str2->xMin - str1->xMax; + // if strings line up on left-hand side AND they are on subsequent lines, we need a line break + addLineBreak = !noMerge && (fabs(str1->xMin - str2->xMin) < 0.4) && IS_CLOSER(str2->yMax, str1->yMax + space, str1->yMax); + vertSpace = str2->yMin - str1->yMax; + + // printf("coalesce %d %d %f? ", str1->dir, str2->dir, d); + + if (str2->yMin >= str1->yMin && str2->yMin <= str1->yMax) { + vertOverlap = str1->yMax - str2->yMin; + } else if (str2->yMax >= str1->yMin && str2->yMax <= str1->yMax) { + vertOverlap = str2->yMax - str1->yMin; + } else { + vertOverlap = 0; + } + + // Combine strings if: + // They appear to be the same font (complex mode only) && going in the same direction AND at least one of the following: + // 1. They appear to be part of the same line of text + // 2. They appear to be subsequent lines of a paragraph + // We assume (1) or (2) above, respectively, based on: + // (1) strings overlap vertically AND + // horizontal space between end of str1 and start of str2 is consistent with a single space or less; + // when rawOrder, the strings have to overlap vertically by at least 50% + // (2) Strings flow down the page, but the space between them is not too great, and they are lined up on the left + if (((((rawOrder && vertOverlap > 0.5 * space) || (!rawOrder && str2->yMin < str1->yMax)) && (horSpace > -0.5 * space && horSpace < space)) || (vertSpace >= 0 && vertSpace < 0.5 * space && addLineBreak)) + && (!complexMode || (hfont1->isEqualIgnoreBold(*hfont2))) && // in complex mode fonts must be the same, in other modes fonts do not metter + str1->dir == str2->dir // text direction the same + ) { + // printf("yes\n"); + n = str1->len + str2->len; + if ((addSpace = horSpace > wordBreakThreshold * space)) { + ++n; + } + if (addLineBreak) { + ++n; + } + + str1->size = (n + 15) & ~15; + str1->text = (Unicode *)grealloc(str1->text, str1->size * sizeof(Unicode)); + str1->xRight = (double *)grealloc(str1->xRight, str1->size * sizeof(double)); + if (addSpace) { + str1->text[str1->len] = 0x20; + str1->htext->append(xml ? " " : " "); + str1->xRight[str1->len] = str2->xMin; + ++str1->len; + } + if (addLineBreak) { + str1->text[str1->len] = '\n'; + str1->htext->append("
"); + str1->xRight[str1->len] = str2->xMin; + ++str1->len; + str1->yMin = str2->yMin; + str1->yMax = str2->yMax; + str1->xMax = str2->xMax; + int fontLineSize = hfont1->getLineSize(); + int curLineSize = (int)(vertSpace + space); + if (curLineSize != fontLineSize) { + HtmlFont *newfnt = new HtmlFont(*hfont1); + newfnt->setLineSize(curLineSize); + str1->fontpos = fonts->AddFont(*newfnt); + delete newfnt; + hfont1 = getFont(str1); + // we have to reget hfont2 because it's location could have + // changed on resize + hfont2 = getFont(str2); + } + } + for (i = 0; i < str2->len; ++i) { + str1->text[str1->len] = str2->text[i]; + str1->xRight[str1->len] = str2->xRight[i]; + ++str1->len; + } + + /* fix , if str1 and str2 differ and handle switch of links */ + const HtmlLink *hlink1 = str1->getLink(); + const HtmlLink *hlink2 = str2->getLink(); + bool switch_links = !hlink1 || !hlink2 || !hlink1->isEqualDest(*hlink2); + bool finish_a = switch_links && hlink1 != nullptr; + bool finish_italic = hfont1->isItalic() && (!hfont2->isItalic() || finish_a); + bool finish_bold = hfont1->isBold() && (!hfont2->isBold() || finish_a || finish_italic); + CloseTags(str1->htext.get(), finish_a, finish_italic, finish_bold); + if (switch_links && hlink2 != nullptr) { + GooString *ls = hlink2->getLinkStart(); + str1->htext->append(ls); + delete ls; + } + if ((!hfont1->isItalic() || finish_italic) && hfont2->isItalic()) { + str1->htext->append("", 3); + } + if ((!hfont1->isBold() || finish_bold) && hfont2->isBold()) { + str1->htext->append("", 3); + } + + str1->htext->append(str2->htext.get()); + // str1 now contains href for link of str2 (if it is defined) + str1->link = str2->link; + hfont1 = hfont2; + if (str2->xMax > str1->xMax) { + str1->xMax = str2->xMax; + } + if (str2->yMax > str1->yMax) { + str1->yMax = str2->yMax; + } + str1->yxNext = str2->yxNext; + delete str2; + } else { // keep strings separate + // printf("no\n"); + bool finish_a = str1->getLink() != nullptr; + bool finish_bold = hfont1->isBold(); + bool finish_italic = hfont1->isItalic(); + CloseTags(str1->htext.get(), finish_a, finish_italic, finish_bold); + + str1->xMin = curX; + str1->yMin = curY; + str1 = str2; + curX = str1->xMin; + curY = str1->yMin; + hfont1 = hfont2; + if (hfont1->isBold()) { + str1->htext->insert(0, "", 3); + } + if (hfont1->isItalic()) { + str1->htext->insert(0, "", 3); + } + if (str1->getLink() != nullptr) { + GooString *ls = str1->getLink()->getLinkStart(); + str1->htext->insert(0, ls); + delete ls; + } + } + } + str1->xMin = curX; + str1->yMin = curY; + + bool finish_bold = hfont1->isBold(); + bool finish_italic = hfont1->isItalic(); + bool finish_a = str1->getLink() != nullptr; + CloseTags(str1->htext.get(), finish_a, finish_italic, finish_bold); + +#if 0 //~ for debugging + for (str1 = yxStrings; str1; str1 = str1->yxNext) { + printf("x=%3d..%3d y=%3d..%3d size=%2d ", + (int)str1->xMin, (int)str1->xMax, (int)str1->yMin, (int)str1->yMax, + (int)(str1->yMax - str1->yMin)); + printf("'%s'\n", str1->htext->c_str()); + } + printf("\n------------------------------------------------------------\n\n"); +#endif +} + +void HtmlPage::dumpAsXML(FILE *f, int page) +{ + fprintf(f, "\n", pageHeight, pageWidth); + + for (int i = fontsPageMarker; i < fonts->size(); i++) { + GooString *fontCSStyle = fonts->CSStyle(i); + fprintf(f, "\t%s\n", fontCSStyle->c_str()); + delete fontCSStyle; + } + + for (auto ptr : imgList) { + auto img = static_cast(ptr); + if (!noRoundedCoordinates) { + fprintf(f, "yMin), xoutRound(img->xMin)); + fprintf(f, "width=\"%d\" height=\"%d\" ", xoutRound(img->xMax - img->xMin), xoutRound(img->yMax - img->yMin)); + } else { + fprintf(f, "yMin, img->xMin); + fprintf(f, "width=\"%f\" height=\"%f\" ", img->xMax - img->xMin, img->yMax - img->yMin); + } + fprintf(f, "src=\"%s\"/>\n", img->fName->c_str()); + delete img; + } + imgList.clear(); + + for (HtmlString *tmp = yxStrings; tmp; tmp = tmp->yxNext) { + if (tmp->htext) { + if (!noRoundedCoordinates) { + fprintf(f, "yMin), xoutRound(tmp->xMin)); + fprintf(f, "width=\"%d\" height=\"%d\" ", xoutRound(tmp->xMax - tmp->xMin), xoutRound(tmp->yMax - tmp->yMin)); + } else { + fprintf(f, "yMin, tmp->xMin); + fprintf(f, "width=\"%f\" height=\"%f\" ", tmp->xMax - tmp->xMin, tmp->yMax - tmp->yMin); + } + fprintf(f, "font=\"%d\">", tmp->fontpos); + fputs(tmp->htext->c_str(), f); + fputs("\n", f); + } + } + fputs("\n", f); +} + +static void printCSS(FILE *f) +{ + // Image flip/flop CSS + // Source: + // http://stackoverflow.com/questions/1309055/cross-browser-way-to-flip-html-image-via-javascript-css + // tested in Chrome, Fx (Linux) and IE9 (W7) + static const char css[] = "" + "\n"; + + fwrite(css, sizeof(css) - 1, 1, f); +} + +int HtmlPage::dumpComplexHeaders(FILE *const file, FILE *&pageFile, int page) +{ + + if (!noframes) { + const std::string pgNum = std::to_string(page); + std::string pageFileName(DocName->toStr()); + if (!singleHtml) { + pageFileName += '-' + pgNum + ".html"; + pageFile = fopen(pageFileName.c_str(), "w"); + } else { + pageFileName += "-html.html"; + pageFile = fopen(pageFileName.c_str(), "a"); + } + + if (!pageFile) { + error(errIO, -1, "Couldn't open html file '{0:s}'", pageFileName.c_str()); + return 1; + } + + if (!singleHtml) { + fprintf(pageFile, "%s\n\n\nPage %d\n\n", DOCTYPE, page); + } else { + fprintf(pageFile, "%s\n\n\n%s\n\n", DOCTYPE, pageFileName.c_str()); + } + + const std::string htmlEncoding = HtmlOutputDev::mapEncodingToHtml(globalParams->getTextEncodingName()); + if (!singleHtml) { + fprintf(pageFile, "\n", htmlEncoding.c_str()); + } else { + fprintf(pageFile, "\n
\n", htmlEncoding.c_str()); + } + } else { + pageFile = file; + fprintf(pageFile, "\n", page); + fprintf(pageFile, "\n", page); + } + + return 0; +} + +void HtmlPage::dumpComplex(FILE *file, int page, const std::vector &backgroundImages) +{ + FILE *pageFile; + + if (firstPage == -1) { + firstPage = page; + } + + if (dumpComplexHeaders(file, pageFile, page)) { + error(errIO, -1, "Couldn't write headers."); + return; + } + + fputs("\n", pageFile); + + if (!noframes) { + fputs("\n\n", pageFile); + } + + fprintf(pageFile, "
\n", page, pageWidth, pageHeight); + + if (!ignore && (size_t)(page - firstPage) < backgroundImages.size()) { + fprintf(pageFile, "\"background\n", pageWidth, pageHeight, backgroundImages[page - firstPage].c_str()); + } + + for (HtmlString *tmp1 = yxStrings; tmp1; tmp1 = tmp1->yxNext) { + if (tmp1->htext) { + fprintf(pageFile, "

yMin), xoutRound(tmp1->xMin)); + if (!singleHtml) { + fputc('0', pageFile); + } else { + fprintf(pageFile, "%d", page); + } + fprintf(pageFile, "%d\">", tmp1->fontpos); + fputs(tmp1->htext->c_str(), pageFile); + fputs("

\n", pageFile); + } + } + + fputs("
\n", pageFile); + + if (!noframes) { + fputs("\n\n", pageFile); + fclose(pageFile); + } +} + +void HtmlPage::dump(FILE *f, int pageNum, const std::vector &backgroundImages) +{ + if (complexMode || singleHtml) { + if (xml) { + dumpAsXML(f, pageNum); + } + if (!xml) { + dumpComplex(f, pageNum, backgroundImages); + } + } else { + fprintf(f, "", pageNum); + // Loop over the list of image names on this page + for (auto ptr : imgList) { + auto img = static_cast(ptr); + + // see printCSS() for class names + const char *styles[4] = { "", " class=\"xflip\"", " class=\"yflip\"", " class=\"xyflip\"" }; + int style_index = 0; + if (img->xMin > img->xMax) { + style_index += 1; // xFlip + } + if (img->yMin > img->yMax) { + style_index += 2; // yFlip + } + + fprintf(f, "
\n", styles[style_index], img->fName->c_str()); + delete img; + } + imgList.clear(); + + for (HtmlString *tmp = yxStrings; tmp; tmp = tmp->yxNext) { + if (tmp->htext) { + fputs(tmp->htext->c_str(), f); + fputs("
\n", f); + } + } + fputs("
\n", f); + } +} + +void HtmlPage::clear() +{ + HtmlString *p1, *p2; + + if (curStr) { + delete curStr; + curStr = nullptr; + } + for (p1 = yxStrings; p1; p1 = p2) { + p2 = p1->yxNext; + delete p1; + } + yxStrings = nullptr; + xyStrings = nullptr; + yxCur1 = yxCur2 = nullptr; + + if (!noframes) { + delete fonts; + fonts = new HtmlFontAccu(); + fontsPageMarker = 0; + } else { + fontsPageMarker = fonts->size(); + } + + delete links; + links = new HtmlLinks(); +} + +void HtmlPage::setDocName(const char *fname) +{ + DocName = new GooString(fname); +} + +void HtmlPage::addImage(std::unique_ptr &&fname, GfxState *state) +{ + HtmlImage *img = new HtmlImage(std::move(fname), state); + imgList.push_back(img); +} + +//------------------------------------------------------------------------ +// HtmlMetaVar +//------------------------------------------------------------------------ + +HtmlMetaVar::HtmlMetaVar(const char *_name, const char *_content) +{ + name = new GooString(_name); + content = new GooString(_content); +} + +HtmlMetaVar::~HtmlMetaVar() +{ + delete name; + delete content; +} + +GooString *HtmlMetaVar::toString() const +{ + GooString *result = new GooString("append(name); + result->append("\" content=\""); + result->append(content); + result->append("\"/>"); + return result; +} + +//------------------------------------------------------------------------ +// HtmlOutputDev +//------------------------------------------------------------------------ + +static const char *HtmlEncodings[][2] = { { "Latin1", "ISO-8859-1" }, { nullptr, nullptr } }; + +std::string HtmlOutputDev::mapEncodingToHtml(const std::string &encoding) +{ + for (int i = 0; HtmlEncodings[i][0] != nullptr; i++) { + if (encoding == HtmlEncodings[i][0]) { + return HtmlEncodings[i][1]; + } + } + return encoding; +} + +void HtmlOutputDev::doFrame(int firstPage) +{ + GooString *fName = new GooString(Docname); + fName->append(".html"); + + if (!(fContentsFrame = fopen(fName->c_str(), "w"))) { + error(errIO, -1, "Couldn't open html file '{0:t}'", fName); + delete fName; + return; + } + + delete fName; + + const std::string baseName = gbasename(Docname->c_str()); + fputs(DOCTYPE, fContentsFrame); + fputs("\n", fContentsFrame); + fputs("\n", fContentsFrame); + fprintf(fContentsFrame, "\n%s", docTitle->c_str()); + const std::string htmlEncoding = mapEncodingToHtml(globalParams->getTextEncodingName()); + fprintf(fContentsFrame, "\n\n", htmlEncoding.c_str()); + dumpMetaVars(fContentsFrame); + fprintf(fContentsFrame, "\n"); + fputs("\n", fContentsFrame); + fprintf(fContentsFrame, "\n", baseName.c_str()); + fputs("\n\n\n", fContentsFrame); + + fclose(fContentsFrame); +} + +HtmlOutputDev::HtmlOutputDev(Catalog *catalogA, const char *fileName, const char *title, const char *author, const char *keywords, const char *subject, const char *date, bool rawOrderA, int firstPage, bool outline) +{ + catalog = catalogA; + fContentsFrame = nullptr; + page = nullptr; + docTitle = new GooString(title); + pages = nullptr; + dumpJPEG = true; + // write = true; + rawOrder = rawOrderA; + this->doOutline = outline; + ok = false; + // this->firstPage = firstPage; + // pageNum=firstPage; + // open file + needClose = false; + pages = new HtmlPage(rawOrder); + + glMetaVars.push_back(new HtmlMetaVar("generator", "pdftohtml 0.36")); + if (author) { + glMetaVars.push_back(new HtmlMetaVar("author", author)); + } + if (keywords) { + glMetaVars.push_back(new HtmlMetaVar("keywords", keywords)); + } + if (date) { + glMetaVars.push_back(new HtmlMetaVar("date", date)); + } + if (subject) { + glMetaVars.push_back(new HtmlMetaVar("subject", subject)); + } + + maxPageWidth = 0; + maxPageHeight = 0; + + pages->setDocName(fileName); + Docname = new GooString(fileName); + + // for non-xml output (complex or simple) with frames generate the left frame + if (!xml && !noframes) { + if (!singleHtml) { + GooString *left = new GooString(fileName); + left->append("_ind.html"); + + doFrame(firstPage); + + if (!(fContentsFrame = fopen(left->c_str(), "w"))) { + error(errIO, -1, "Couldn't open html file '{0:t}'", left); + delete left; + return; + } + delete left; + fputs(DOCTYPE, fContentsFrame); + fputs("\n\n\n\n\n", fContentsFrame); + + if (doOutline) { + fprintf(fContentsFrame, "Outline
", gbasename(Docname->c_str()).c_str(), complexMode ? "-outline.html" : "s.html#outline"); + } + } + if (!complexMode) { /* not in complex mode */ + + GooString *right = new GooString(fileName); + right->append("s.html"); + + if (!(page = fopen(right->c_str(), "w"))) { + error(errIO, -1, "Couldn't open html file '{0:t}'", right); + delete right; + return; + } + delete right; + fputs(DOCTYPE, page); + fputs("\n\n\n", page); + printCSS(page); + fputs("\n\n", page); + } + } + + if (noframes) { + if (stout) { + page = stdout; + } else { + GooString *right = new GooString(fileName); + if (!xml) { + right->append(".html"); + } + if (xml) { + right->append(".xml"); + } + if (!(page = fopen(right->c_str(), "w"))) { + error(errIO, -1, "Couldn't open html file '{0:t}'", right); + delete right; + return; + } + delete right; + } + + const std::string htmlEncoding = mapEncodingToHtml(globalParams->getTextEncodingName()); + if (xml) { + fprintf(page, "\n", htmlEncoding.c_str()); + fputs("\n\n", page); + fprintf(page, "\n", PACKAGE_NAME, PACKAGE_VERSION); + } else { + fprintf(page, "%s\n\n\n%s\n", DOCTYPE, docTitle->c_str()); + + fprintf(page, "\n", htmlEncoding.c_str()); + + dumpMetaVars(page); + printCSS(page); + fprintf(page, "\n"); + fprintf(page, "\n"); + } + } + ok = true; +} + +HtmlOutputDev::~HtmlOutputDev() +{ + delete Docname; + delete docTitle; + + for (auto entry : glMetaVars) { + delete entry; + } + + if (fContentsFrame) { + fputs("\n\n", fContentsFrame); + fclose(fContentsFrame); + } + if (page != nullptr) { + if (xml) { + fputs("\n", page); + fclose(page); + } else if (!complexMode || xml || noframes) { + fputs("\n\n", page); + fclose(page); + } + } + if (pages) { + delete pages; + } +} + +void HtmlOutputDev::startPage(int pageNumA, GfxState *state, XRef *xref) +{ +#if 0 + if (mode&&!xml){ + if (write){ + write=false; + GooString* fname=Dirname(Docname); + fname->append("image.log"); + if((tin=fopen(getFileNameFromPath(fname->c_str(),fname->getLength()),"w"))==NULL){ + printf("Error : can not open %s",fname); + exit(1); + } + delete fname; + // if(state->getRotation()!=0) + // fprintf(tin,"ROTATE=%d rotate %d neg %d neg translate\n",state->getRotation(),state->getX1(),-state->getY1()); + // else + fprintf(tin,"ROTATE=%d neg %d neg translate\n",state->getX1(),state->getY1()); + } + } +#endif + + pageNum = pageNumA; + const std::string str = gbasename(Docname->c_str()); + pages->clear(); + if (!noframes) { + if (fContentsFrame) { + if (complexMode) { + fprintf(fContentsFrame, "Page %d
\n", pageNum); + } + } + + pages->pageWidth = static_cast(state->getPageWidth()); + pages->pageHeight = static_cast(state->getPageHeight()); +} + +void HtmlOutputDev::endPage() +{ + std::unique_ptr linksList = docPage->getLinks(); + for (AnnotLink *link : linksList->getLinks()) { + doProcessLink(link); + } + + pages->conv(); + pages->coalesce(); + pages->dump(page, pageNum, backgroundImages); + + // I don't yet know what to do in the case when there are pages of different + // sizes and we want complex output: running ghostscript many times + // seems very inefficient. So for now I'll just use last page's size + maxPageWidth = pages->pageWidth; + maxPageHeight = pages->pageHeight; + + // if(!noframes&&!xml) fputs("
\n", fContentsFrame); + if (!stout && !globalParams->getErrQuiet()) { + printf("Page-%d\n", (pageNum)); + } +} + +void HtmlOutputDev::addBackgroundImage(const std::string &img) +{ + backgroundImages.push_back(img); +} + +void HtmlOutputDev::updateFont(GfxState *state) +{ + pages->updateFont(state); +} + +void HtmlOutputDev::beginString(GfxState *state, const GooString *s) +{ + pages->beginString(state, s); +} + +void HtmlOutputDev::endString(GfxState *state) +{ + pages->endString(); +} + +void HtmlOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int /*nBytes*/, const Unicode *u, int uLen) +{ + if (!showHidden && (state->getRender() & 3) == 3) { + return; + } + pages->addChar(state, x, y, dx, dy, originX, originY, u, uLen); +} + +void HtmlOutputDev::drawJpegImage(GfxState *state, Stream *str) +{ + InMemoryFile ims; + FILE *f1 = nullptr; + int c; + + // open the image file + std::unique_ptr fName = createImageFileName("jpg"); + f1 = dataUrls ? ims.open("wb") : fopen(fName->c_str(), "wb"); + if (!f1) { + error(errIO, -1, "Couldn't open image file '{0:t}'", fName.get()); + return; + } + + // initialize stream + str = str->getNextStream(); + str->reset(); + + // copy the stream + while ((c = str->getChar()) != EOF) { + fputc(c, f1); + } + + fclose(f1); + + if (dataUrls) { + fName = std::make_unique(std::string("data:image/jpeg;base64,") + gbase64Encode(ims.getBuffer())); + } + pages->addImage(std::move(fName), state); +} + +void HtmlOutputDev::drawPngImage(GfxState *state, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool isMask) +{ +#ifdef ENABLE_LIBPNG + FILE *f1; + InMemoryFile ims; + + if (!colorMap && !isMask) { + error(errInternal, -1, "Can't have color image without a color map"); + return; + } + + // open the image file + std::unique_ptr fName = createImageFileName("png"); + f1 = dataUrls ? ims.open("wb") : fopen(fName->c_str(), "wb"); + if (!f1) { + error(errIO, -1, "Couldn't open image file '{0:t}'", fName.get()); + return; + } + + PNGWriter *writer = new PNGWriter(isMask ? PNGWriter::MONOCHROME : PNGWriter::RGB); + // TODO can we calculate the resolution of the image? + if (!writer->init(f1, width, height, 72, 72)) { + error(errInternal, -1, "Can't init PNG for image '{0:t}'", fName.get()); + delete writer; + fclose(f1); + return; + } + + if (!isMask) { + unsigned char *p; + GfxRGB rgb; + unsigned char *row = (unsigned char *)gmalloc(3 * width); // 3 bytes/pixel: RGB + unsigned char **row_pointer = &row; + + // Initialize the image stream + ImageStream *imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); + + // For each line... + for (int y = 0; y < height; y++) { + + // Convert into a PNG row + p = imgStr->getLine(); + if (!p) { + error(errIO, -1, "Failed to read PNG. '{0:t}' will be incorrect", fName.get()); + gfree(row); + delete writer; + delete imgStr; + fclose(f1); + return; + } + for (int x = 0; x < width; x++) { + colorMap->getRGB(p, &rgb); + // Write the RGB pixels into the row + row[3 * x] = colToByte(rgb.r); + row[3 * x + 1] = colToByte(rgb.g); + row[3 * x + 2] = colToByte(rgb.b); + p += colorMap->getNumPixelComps(); + } + + if (!writer->writeRow(row_pointer)) { + error(errIO, -1, "Failed to write into PNG '{0:t}'", fName.get()); + delete writer; + delete imgStr; + fclose(f1); + return; + } + } + gfree(row); + imgStr->close(); + delete imgStr; + } else { // isMask == true + int size = (width + 7) / 8; + + // PDF masks use 0 = draw current color, 1 = leave unchanged. + // We invert this to provide the standard interpretation of alpha + // (0 = transparent, 1 = opaque). If the colorMap already inverts + // the mask we leave the data unchanged. + int invert_bits = 0xff; + if (colorMap) { + GfxGray gray; + unsigned char zero[gfxColorMaxComps]; + memset(zero, 0, sizeof(zero)); + colorMap->getGray(zero, &gray); + if (colToByte(gray) == 0) { + invert_bits = 0x00; + } + } + + str->reset(); + unsigned char *png_row = (unsigned char *)gmalloc(size); + + for (int ri = 0; ri < height; ++ri) { + for (int i = 0; i < size; i++) { + png_row[i] = str->getChar() ^ invert_bits; + } + + if (!writer->writeRow(&png_row)) { + error(errIO, -1, "Failed to write into PNG '{0:t}'", fName.get()); + delete writer; + fclose(f1); + gfree(png_row); + return; + } + } + str->close(); + gfree(png_row); + } + + str->close(); + + writer->close(); + delete writer; + fclose(f1); + + if (dataUrls) { + fName = std::make_unique(std::string("data:image/png;base64,") + gbase64Encode(ims.getBuffer())); + } + pages->addImage(std::move(fName), state); +#else + return; +#endif +} + +std::unique_ptr HtmlOutputDev::createImageFileName(const char *ext) +{ + return GooString::format("{0:s}-{1:d}_{2:d}.{3:s}", Docname->c_str(), pageNum, pages->getNumImages() + 1, ext); +} + +void HtmlOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) +{ + + if (ignore || (complexMode && !xml)) { + OutputDev::drawImageMask(state, ref, str, width, height, invert, interpolate, inlineImg); + return; + } + + // dump JPEG file + if (dumpJPEG && str->getKind() == strDCT) { + drawJpegImage(state, str); + } else { +#ifdef ENABLE_LIBPNG + drawPngImage(state, str, width, height, nullptr, true); +#else + OutputDev::drawImageMask(state, ref, str, width, height, invert, interpolate, inlineImg); +#endif + } +} + +void HtmlOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) +{ + + if (ignore || (complexMode && !xml)) { + OutputDev::drawImage(state, ref, str, width, height, colorMap, interpolate, maskColors, inlineImg); + return; + } + + /*if( !globalParams->getErrQuiet() ) + printf("image stream of kind %d\n", str->getKind());*/ + // dump JPEG file + if (dumpJPEG && str->getKind() == strDCT && (colorMap->getNumPixelComps() == 1 || colorMap->getNumPixelComps() == 3) && !inlineImg) { + drawJpegImage(state, str); + } else { +#ifdef ENABLE_LIBPNG + drawPngImage(state, str, width, height, colorMap); +#else + OutputDev::drawImage(state, ref, str, width, height, colorMap, interpolate, maskColors, inlineImg); +#endif + } +} + +void HtmlOutputDev::doProcessLink(AnnotLink *link) +{ + double _x1, _y1, _x2, _y2; + int x1, y1, x2, y2; + + link->getRect(&_x1, &_y1, &_x2, &_y2); + cvtUserToDev(_x1, _y1, &x1, &y1); + + cvtUserToDev(_x2, _y2, &x2, &y2); + + GooString *_dest = getLinkDest(link); + HtmlLink t((double)x1, (double)y2, (double)x2, (double)y1, _dest); + pages->AddLink(t); + delete _dest; +} + +GooString *HtmlOutputDev::getLinkDest(AnnotLink *link) +{ + if (!link->getAction()) { + return new GooString(); + } + switch (link->getAction()->getKind()) { + case actionGoTo: { + int destPage = 1; + LinkGoTo *ha = (LinkGoTo *)link->getAction(); + std::unique_ptr dest; + if (ha->getDest() != nullptr) { + dest = std::make_unique(*ha->getDest()); + } else if (ha->getNamedDest() != nullptr) { + dest = catalog->findDest(ha->getNamedDest()); + } + + if (dest) { + GooString *file = new GooString(gbasename(Docname->c_str())); + + if (dest->isPageRef()) { + const Ref pageref = dest->getPageRef(); + destPage = catalog->findPage(pageref); + } else { + destPage = dest->getPageNum(); + } + + /* complex simple + frames file-4.html files.html#4 + noframes file.html#4 file.html#4 + */ + if (noframes) { + file->append(".html#"); + file->append(std::to_string(destPage)); + } else { + if (complexMode) { + file->append("-"); + file->append(std::to_string(destPage)); + file->append(".html"); + } else { + file->append("s.html#"); + file->append(std::to_string(destPage)); + } + } + + if (printCommands) { + printf(" link to page %d ", destPage); + } + return file; + } else { + return new GooString(); + } + } + case actionGoToR: { + LinkGoToR *ha = (LinkGoToR *)link->getAction(); + LinkDest *dest = nullptr; + int destPage = 1; + GooString *file = new GooString(); + if (ha->getFileName()) { + delete file; + file = new GooString(ha->getFileName()->c_str()); + } + if (ha->getDest() != nullptr) { + dest = new LinkDest(*ha->getDest()); + } + if (dest && file) { + if (!(dest->isPageRef())) { + destPage = dest->getPageNum(); + } + delete dest; + + if (printCommands) { + printf(" link to page %d ", destPage); + } + if (printHtml) { + const char *p = file->c_str() + file->getLength() - 4; + if (!strcmp(p, ".pdf") || !strcmp(p, ".PDF")) { + file->del(file->getLength() - 4, 4); + file->append(".html"); + } + file->append('#'); + file->append(std::to_string(destPage)); + } + } + if (printCommands && file) { + printf("filename %s\n", file->c_str()); + } + return file; + } + case actionURI: { + LinkURI *ha = (LinkURI *)link->getAction(); + GooString *file = new GooString(ha->getURI()); + // printf("uri : %s\n",file->c_str()); + return file; + } + case actionLaunch: + if (printHtml) { + LinkLaunch *ha = (LinkLaunch *)link->getAction(); + GooString *file = new GooString(ha->getFileName()->c_str()); + const char *p = file->c_str() + file->getLength() - 4; + if (!strcmp(p, ".pdf") || !strcmp(p, ".PDF")) { + file->del(file->getLength() - 4, 4); + file->append(".html"); + } + if (printCommands) { + printf("filename %s", file->c_str()); + } + + return file; + } + // fallthrough + default: + return new GooString(); + } +} + +void HtmlOutputDev::dumpMetaVars(FILE *file) +{ + GooString *var; + + for (const HtmlMetaVar *t : glMetaVars) { + var = t->toString(); + fprintf(file, "%s\n", var->c_str()); + delete var; + } +} + +bool HtmlOutputDev::dumpDocOutline(PDFDoc *doc) +{ + FILE *output = nullptr; + bool bClose = false; + + if (!ok) { + return false; + } + + Outline *outline = doc->getOutline(); + if (!outline) { + return false; + } + + const std::vector *outlines = outline->getItems(); + if (!outlines) { + return false; + } + + if (!complexMode || xml) { + output = page; + } else if (complexMode && !xml) { + if (noframes) { + output = page; + fputs("
\n", output); + } else { + GooString *str = Docname->copy(); + str->append("-outline.html"); + output = fopen(str->c_str(), "w"); + delete str; + if (output == nullptr) { + return false; + } + bClose = true; + + const std::string htmlEncoding = HtmlOutputDev::mapEncodingToHtml(globalParams->getTextEncodingName()); + + fprintf(output, + "\n" + "\n" + "Document Outline\n" + "\n" + "\n\n", + htmlEncoding.c_str()); + } + } + + if (!xml) { + bool done = newHtmlOutlineLevel(output, outlines); + if (done && !complexMode) { + fputs("
\n", output); + } + + if (bClose) { + fputs("\n\n", output); + fclose(output); + } + } else { + newXmlOutlineLevel(output, outlines); + } + + return true; +} + +bool HtmlOutputDev::newHtmlOutlineLevel(FILE *output, const std::vector *outlines, int level) +{ + bool atLeastOne = false; + + if (level == 1) { + fputs("", output); + fputs("

Document Outline

\n", output); + } + fputs("
    \n", output); + + for (OutlineItem *item : *outlines) { + const auto &title = item->getTitle(); + std::unique_ptr titleStr = HtmlFont::HtmlFilter(title.data(), title.size()); + + GooString *linkName = nullptr; + + const int itemPage = getOutlinePageNum(item); + if (itemPage > 0) { + /* complex simple + frames file-4.html files.html#4 + noframes file.html#4 file.html#4 + */ + linkName = new GooString(gbasename(Docname->c_str())); + if (noframes) { + linkName->append(".html#"); + linkName->append(std::to_string(itemPage)); + } else { + if (complexMode) { + linkName->append("-"); + linkName->append(std::to_string(itemPage)); + linkName->append(".html"); + } else { + linkName->append("s.html#"); + linkName->append(std::to_string(itemPage)); + } + } + } + + fputs("
  • ", output); + if (linkName) { + fprintf(output, "", linkName->c_str()); + } + if (titleStr) { + fputs(titleStr->c_str(), output); + } + if (linkName) { + fputs("", output); + delete linkName; + } + atLeastOne = true; + + item->open(); + if (item->hasKids() && item->getKids()) { + fputs("\n", output); + newHtmlOutlineLevel(output, item->getKids(), level + 1); + } + fputs("
    • \n", output); + } + fputs("
\n", output); + + return atLeastOne; +} + +void HtmlOutputDev::newXmlOutlineLevel(FILE *output, const std::vector *outlines) +{ + fputs("\n", output); + + for (OutlineItem *item : *outlines) { + const std::vector &title = item->getTitle(); + auto titleStr = HtmlFont::HtmlFilter(title.data(), title.size()); + const int itemPage = getOutlinePageNum(item); + if (itemPage > 0) { + fprintf(output, "%s\n", itemPage, titleStr->c_str()); + } else { + fprintf(output, "%s\n", titleStr->c_str()); + } + + item->open(); + if (item->hasKids() && item->getKids()) { + newXmlOutlineLevel(output, item->getKids()); + } + } + + fputs("\n", output); +} + +int HtmlOutputDev::getOutlinePageNum(OutlineItem *item) +{ + const LinkAction *action = item->getAction(); + const LinkGoTo *link = nullptr; + std::unique_ptr linkdest; + int pagenum = -1; + + if (!action || action->getKind() != actionGoTo) { + return pagenum; + } + + link = static_cast(action); + + if (!link || !link->isOk()) { + return pagenum; + } + + if (link->getDest()) { + linkdest = std::make_unique(*link->getDest()); + } else if (link->getNamedDest()) { + linkdest = catalog->findDest(link->getNamedDest()); + } + + if (!linkdest) { + return pagenum; + } + + if (linkdest->isPageRef()) { + const Ref pageref = linkdest->getPageRef(); + pagenum = catalog->findPage(pageref); + } else { + pagenum = linkdest->getPageNum(); + } + + return pagenum; +} diff --git a/poppler-24.05.0/utils/HtmlOutputDev.h b/poppler-24.05.0/utils/HtmlOutputDev.h new file mode 100644 index 0000000000000000000000000000000000000000..cf846e1e9b5e1318f1ff86da4a8360dc5775b8c1 --- /dev/null +++ b/poppler-24.05.0/utils/HtmlOutputDev.h @@ -0,0 +1,322 @@ +//======================================================================== +// +// HtmlOutputDev.h +// +// Copyright 1997 Derek B. Noonburg +// +// Changed 1999 by G.Ovtcharov +//======================================================================== + +//======================================================================== +// +// 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) 2006, 2007, 2009, 2012, 2018-2022 Albert Astals Cid +// Copyright (C) 2008, 2009 Warren Toomey +// Copyright (C) 2009, 2011 Carlos Garcia Campos +// Copyright (C) 2009 Kovid Goyal +// Copyright (C) 2010 Hib Eris +// Copyright (C) 2011 Joshua Richardson +// Copyright (C) 2011 Stephen Reichling +// Copyright (C) 2012 Igor Slepchin +// Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2019 Oliver Sander +// Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// 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 +// +//======================================================================== + +#ifndef HTMLOUTPUTDEV_H +#define HTMLOUTPUTDEV_H + +#include +#include "goo/gbasename.h" +#include "GfxFont.h" +#include "OutputDev.h" +#include "HtmlLinks.h" +#include "HtmlFonts.h" +#include "Link.h" +#include "Catalog.h" +#include "UnicodeMap.h" + +#define xoutRound(x) ((int)(x + 0.5)) + +#define DOCTYPE "" + +class GfxState; +class GooString; +class HtmlImage; +class PDFDoc; +class OutlineItem; +//------------------------------------------------------------------------ +// HtmlString +//------------------------------------------------------------------------ + +enum UnicodeTextDirection +{ + textDirUnknown, + textDirLeftRight, + textDirRightLeft, + textDirTopBottom +}; + +class HtmlString +{ +public: + // Constructor. + HtmlString(GfxState *state, double fontSize, HtmlFontAccu *fonts); + + // Destructor. + ~HtmlString(); + + HtmlString(const HtmlString &) = delete; + HtmlString &operator=(const HtmlString &) = delete; + + // Add a character to the string. + void addChar(GfxState *state, double x, double y, double dx, double dy, Unicode u); + const HtmlLink *getLink() const { return link; } + const HtmlFont &getFont() const { return *fonts->Get(fontpos); } + void endString(); // postprocessing + +private: + // aender die text variable + const HtmlLink *link; + double xMin, xMax; // bounding box x coordinates + double yMin, yMax; // bounding box y coordinates + int col; // starting column + Unicode *text; // the text + double *xRight; // right-hand x coord of each char + HtmlString *yxNext; // next string in y-major order + HtmlString *xyNext; // next string in x-major order + int fontpos; + std::unique_ptr htext; + int len; // length of text and xRight + int size; // size of text and xRight arrays + UnicodeTextDirection dir; // direction (left to right/right to left) + HtmlFontAccu *fonts; + + friend class HtmlPage; +}; + +//------------------------------------------------------------------------ +// HtmlPage +//------------------------------------------------------------------------ + +class HtmlPage +{ +public: + // Constructor. + explicit HtmlPage(bool rawOrder); + + // Destructor. + ~HtmlPage(); + + HtmlPage(const HtmlPage &) = delete; + HtmlPage &operator=(const HtmlPage &) = delete; + + // Begin a new string. + void beginString(GfxState *state, const GooString *s); + + // Add a character to the current string. + void addChar(GfxState *state, double x, double y, double dx, double dy, double ox, double oy, const Unicode *u, int uLen); // unsigned char c); + + void updateFont(GfxState *state); + + // End the current string, sorting it into the list of strings. + void endString(); + + // Coalesce strings that look like parts of the same line. + void coalesce(); + + // Find a string. If is true, starts looking at top of page; + // otherwise starts looking at ,. If is true, + // stops looking at bottom of page; otherwise stops looking at + // ,. If found, sets the text bounding rectangle and + // returns true; otherwise returns false. + + // new functions + void AddLink(const HtmlLink &x) { links->AddLink(x); } + + // add an image to the current page + void addImage(std::unique_ptr &&fname, GfxState *state); + + // number of images on the current page + int getNumImages() { return imgList.size(); } + + void dump(FILE *f, int pageNum, const std::vector &backgroundImages); + + // Clear the page. + void clear(); + + void conv(); + +private: + const HtmlFont *getFont(HtmlString *hStr) const { return fonts->Get(hStr->fontpos); } + + double fontSize; // current font size + bool rawOrder; // keep strings in content stream order + + HtmlString *curStr; // currently active string + + HtmlString *yxStrings; // strings in y-major order + HtmlString *xyStrings; // strings in x-major order + HtmlString *yxCur1, *yxCur2; // cursors for yxStrings list + + void setDocName(const char *fname); + void dumpAsXML(FILE *f, int page); + void dumpComplex(FILE *f, int page, const std::vector &backgroundImages); + int dumpComplexHeaders(FILE *const file, FILE *&pageFile, int page); + + // marks the position of the fonts that belong to current page (for noframes) + int fontsPageMarker; + HtmlFontAccu *fonts; + HtmlLinks *links; + std::vector imgList; + + GooString *DocName; + int pageWidth; + int pageHeight; + int firstPage; // used to begin the numeration of pages + + friend class HtmlOutputDev; +}; + +//------------------------------------------------------------------------ +// HtmlMetaVar +//------------------------------------------------------------------------ +class HtmlMetaVar +{ +public: + HtmlMetaVar(const char *_name, const char *_content); + ~HtmlMetaVar(); + + HtmlMetaVar(const HtmlMetaVar &) = delete; + HtmlMetaVar &operator=(const HtmlMetaVar &) = delete; + + GooString *toString() const; + +private: + GooString *name; + GooString *content; +}; + +//------------------------------------------------------------------------ +// HtmlOutputDev +//------------------------------------------------------------------------ + +class HtmlOutputDev : public OutputDev +{ +public: + // Open a text output file. If is nullptr, no file is written + // (this is useful, e.g., for searching text). If is true, + // text is converted to 7-bit ASCII; otherwise, text is converted to + // 8-bit ISO Latin-1. should also be set for Japanese + // (EUC-JP) text. If is true, the text is kept in content + // stream order. + HtmlOutputDev(Catalog *catalogA, const char *fileName, const char *title, const char *author, const char *keywords, const char *subject, const char *date, bool rawOrder, int firstPage = 1, bool outline = false); + + // Destructor. + ~HtmlOutputDev() override; + + // Check if file was successfully created. + virtual bool isOk() { return ok; } + + //---- get info about output device + + // Does this device use upside-down coordinates? + // (Upside-down means (0,0) is the top left corner of the page.) + bool upsideDown() override { return true; } + + // Does this device use drawChar() or drawString()? + bool useDrawChar() override { return true; } + + // Does this device use beginType3Char/endType3Char? Otherwise, + // text in Type 3 fonts will be drawn with drawChar/drawString. + bool interpretType3Chars() override { return false; } + + // Does this device need non-text content? + bool needNonText() override { return true; } + + //----- initialization and control + + bool checkPageSlice(Page *p, double hDPI, double vDPI, int rotate, bool useMediaBox, bool crop, int sliceX, int sliceY, int sliceW, int sliceH, bool printing, bool (*abortCheckCbk)(void *data) = nullptr, + void *abortCheckCbkData = nullptr, bool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = nullptr, void *annotDisplayDecideCbkData = nullptr) override + { + docPage = p; + return true; + } + + // Start a page. + void startPage(int pageNum, GfxState *state, XRef *xref) override; + + // End a page. + void endPage() override; + + // add a background image to the list of background images, + // as this seems to be done outside other processing. takes ownership of img. + void addBackgroundImage(const std::string &img); + + //----- update text state + void updateFont(GfxState *state) override; + + //----- text drawing + void beginString(GfxState *state, const GooString *s) override; + void endString(GfxState *state) override; + void drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) override; + + void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) override; + void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) override; + + // new feature + virtual int DevType() { return 1234; } + + int getPageWidth() { return maxPageWidth; } + int getPageHeight() { return maxPageHeight; } + + bool dumpDocOutline(PDFDoc *doc); + +private: + // convert encoding into a HTML standard, or encoding->c_str if not + // recognized. + static std::string mapEncodingToHtml(const std::string &encoding); + void doProcessLink(AnnotLink *link); + GooString *getLinkDest(AnnotLink *link); + void dumpMetaVars(FILE *); + void doFrame(int firstPage); + bool newHtmlOutlineLevel(FILE *output, const std::vector *outlines, int level = 1); + void newXmlOutlineLevel(FILE *output, const std::vector *outlines); + int getOutlinePageNum(OutlineItem *item); + void drawJpegImage(GfxState *state, Stream *str); + void drawPngImage(GfxState *state, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool isMask = false); + std::unique_ptr createImageFileName(const char *ext); + + FILE *fContentsFrame; + FILE *page; // html file + // FILE *tin; // image log file + // bool write; + bool needClose; // need to close the file? + HtmlPage *pages; // text for the current page + bool rawOrder; // keep text in content stream order + bool doOutline; // output document outline + bool ok; // set up ok? + bool dumpJPEG; + int pageNum; + int maxPageWidth; + int maxPageHeight; + GooString *Docname; + GooString *docTitle; + std::vector glMetaVars; + Catalog *catalog; + Page *docPage; + std::vector backgroundImages; + friend class HtmlPage; +}; + +#endif diff --git a/poppler-24.05.0/utils/HtmlUtils.h b/poppler-24.05.0/utils/HtmlUtils.h new file mode 100644 index 0000000000000000000000000000000000000000..164d59a62ac07c9107ed83e90d7fb82c58ea5958 --- /dev/null +++ b/poppler-24.05.0/utils/HtmlUtils.h @@ -0,0 +1,57 @@ +// +// HtmlUtils.h +// +// Created on: Jun 8, 2011 +// Author: Joshua Richardson +// Copyright 2011 +// +// All changes made under the Poppler project to this file are licensed +// under GPL version 2 or later +// +// Copyright (C) 2011 Joshua Richardson +// +// 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 +// +//======================================================================== + +#ifndef HTMLUTILS_H_ +#define HTMLUTILS_H_ + +#include // fabs + +// Returns true iff the difference between a and b is less than the threshold +// We always use fuzzy math when comparing decimal numbers due to imprecision +inline bool is_within(double a, double thresh, double b) +{ + return fabs(a - b) < thresh; +} + +inline bool rot_matrices_equal(const double *const mat0, const double *const mat1) +{ + return is_within(mat0[0], .1, mat1[0]) && is_within(mat0[1], .1, mat1[1]) && is_within(mat0[2], .1, mat1[2]) && is_within(mat0[3], .1, mat1[3]); +} + +// rotation is (cos q, sin q, -sin q, cos q, 0, 0) +// sin q is zero iff there is no rotation, or 180 deg. rotation; +// for 180 rotation, cos q will be negative +inline bool isMatRotOrSkew(const double *const mat) +{ + return mat[0] < 0 || !is_within(mat[1], .1, 0); +} + +// Alters the matrix so that it does not scale a vector's x component; +// If the matrix does not skew, then that will also normalize the y +// component, keeping any rotation, but removing scaling. +inline void normalizeRotMat(double *mat) +{ + double scale = fabs(mat[0] + mat[1]); + if (!scale) { + return; + } + for (int i = 0; i < 4; i++) { + mat[i] /= scale; + } +} + +#endif /* HTMLUTILS_H_ */ diff --git a/poppler-24.05.0/utils/ImageOutputDev.cc b/poppler-24.05.0/utils/ImageOutputDev.cc new file mode 100644 index 0000000000000000000000000000000000000000..3af77555ddec5434354fab95d7298475a47dba09 --- /dev/null +++ b/poppler-24.05.0/utils/ImageOutputDev.cc @@ -0,0 +1,746 @@ +//======================================================================== +// +// ImageOutputDev.cc +// +// Copyright 1998-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2005, 2007, 2011, 2018, 2019, 2021, 2022 Albert Astals Cid +// Copyright (C) 2006 Rainer Keller +// Copyright (C) 2008 Timothy Lee +// Copyright (C) 2008 Vasile Gaburici +// Copyright (C) 2009 Carlos Garcia Campos +// Copyright (C) 2009 William Bader +// Copyright (C) 2010 Jakob Voss +// Copyright (C) 2012, 2013, 2017, 2018 Adrian Johnson +// Copyright (C) 2013 Thomas Fischer +// Copyright (C) 2013 Hib Eris +// Copyright (C) 2017 Caolán McNamara +// Copyright (C) 2018 Andreas Gruenbacher +// Copyright (C) 2020 mrbax <12640-mrbax@users.noreply.gitlab.freedesktop.org> +// Copyright (C) 2024 Fernando Herrera +// Copyright (C) 2024 Sebastian J. Bronner +// +// 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" +#include + +#include +#include +#include +#include +#include +#include "goo/gmem.h" +#include "goo/NetPBMWriter.h" +#include "goo/PNGWriter.h" +#include "goo/TiffWriter.h" +#include "Error.h" +#include "GfxState.h" +#include "Object.h" +#include "Stream.h" +#include "JBIG2Stream.h" +#include "ImageOutputDev.h" + +ImageOutputDev::ImageOutputDev(char *fileRootA, bool pageNamesA, bool listImagesA) +{ + listImages = listImagesA; + if (!listImages) { + fileRoot = copyString(fileRootA); + fileName = (char *)gmalloc(strlen(fileRoot) + 45); + } + outputPNG = false; + outputTiff = false; + dumpJPEG = false; + dumpJP2 = false; + dumpJBIG2 = false; + dumpCCITT = false; + pageNames = pageNamesA; + printFilenames = false; + imgNum = 0; + pageNum = 0; + errorCode = 0; + if (listImages) { + printf("page num type width height color comp bpc enc interp object ID x-ppi y-ppi size ratio\n"); + printf("--------------------------------------------------------------------------------------------\n"); + } +} + +ImageOutputDev::~ImageOutputDev() +{ + if (!listImages) { + gfree(fileName); + gfree(fileRoot); + } +} + +void ImageOutputDev::setFilename(const char *fileExt) +{ + if (pageNames) { + sprintf(fileName, "%s-%03d-%03d.%s", fileRoot, pageNum, imgNum, fileExt); + } else { + sprintf(fileName, "%s-%03d.%s", fileRoot, imgNum, fileExt); + } +} + +// Print a floating point number between 0 - 9999 using 4 characters +// eg '1.23', '12.3', ' 123', '1234' +// +// We need to be careful to handle the cases where rounding adds an +// extra digit before the decimal. eg printf("%4.2f", 9.99999) +// outputs "10.00" instead of "9.99". +static void printNumber(double d) +{ + char buf[10]; + + if (d < 10.0) { + sprintf(buf, "%4.2f", d); + buf[4] = 0; + printf("%s", buf); + } else if (d < 100.0) { + sprintf(buf, "%4.1f", d); + if (!isdigit(buf[3])) { + buf[3] = 0; + printf(" %s", buf); + } else { + printf("%s", buf); + } + } else { + printf("%4.0f", d); + } +} + +void ImageOutputDev::listImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, bool inlineImg, ImageType imageType) +{ + const char *type; + const char *colorspace; + const char *enc; + int components, bpc; + + printf("%4d %5d ", pageNum, imgNum); + type = ""; + switch (imageType) { + case imgImage: + type = "image"; + break; + case imgStencil: + type = "stencil"; + break; + case imgMask: + type = "mask"; + break; + case imgSmask: + type = "smask"; + break; + } + printf("%-7s %5d %5d ", type, width, height); + + colorspace = "-"; + /* masks and stencils default to ncomps = 1 and bpc = 1 */ + components = 1; + bpc = 1; + if (colorMap && colorMap->isOk()) { + switch (colorMap->getColorSpace()->getMode()) { + case csDeviceGray: + case csCalGray: + colorspace = "gray"; + break; + case csDeviceRGB: + case csCalRGB: + colorspace = "rgb"; + break; + case csDeviceCMYK: + colorspace = "cmyk"; + break; + case csLab: + colorspace = "lab"; + break; + case csICCBased: + colorspace = "icc"; + break; + case csIndexed: + colorspace = "index"; + break; + case csSeparation: + colorspace = "sep"; + break; + case csDeviceN: + colorspace = "devn"; + break; + case csPattern: + default: + colorspace = "-"; + break; + } + components = colorMap->getNumPixelComps(); + bpc = colorMap->getBits(); + } + printf("%-5s %2d %2d ", colorspace, components, bpc); + + switch (str->getKind()) { + case strCCITTFax: + enc = "ccitt"; + break; + case strDCT: + enc = "jpeg"; + break; + case strJPX: + enc = "jpx"; + break; + case strJBIG2: + enc = "jbig2"; + break; + case strFile: + case strFlate: + case strCachedFile: + case strASCIIHex: + case strASCII85: + case strLZW: + case strRunLength: + case strWeird: + default: + enc = "image"; + break; + } + printf("%-5s ", enc); + + printf("%-3s ", interpolate ? "yes" : "no"); + + if (inlineImg) { + printf("[inline] "); + } else if (ref->isRef()) { + const Ref imageRef = ref->getRef(); + if (imageRef.gen >= 100000) { + printf("[none] "); + } else { + printf(" %6d %2d ", imageRef.num, imageRef.gen); + } + } else { + printf("[none] "); + } + + const double *mat = state->getCTM(); + double width2 = sqrt(mat[0] * mat[0] + mat[1] * mat[1]); + double height2 = sqrt(mat[2] * mat[2] + mat[3] * mat[3]); + double xppi = fabs(width * 72.0 / width2); + double yppi = fabs(height * 72.0 / height2); + if (xppi < 1.0) { + printf("%5.3f ", xppi); + } else { + printf("%5.0f ", xppi); + } + if (yppi < 1.0) { + printf("%5.3f ", yppi); + } else { + printf("%5.0f ", yppi); + } + + Goffset embedSize = -1; + if (inlineImg) { + embedSize = getInlineImageLength(str, width, height, colorMap); + } else { + embedSize = str->getBaseStream()->getLength(); + } + + long long imageSize = 0; + if (colorMap && colorMap->isOk()) { + imageSize = ((long long)width * height * colorMap->getNumPixelComps() * colorMap->getBits()) / 8; + } else { + imageSize = (long long)width * height / 8; // mask + } + + double ratio = -1.0; + if (imageSize > 0) { + ratio = 100.0 * embedSize / imageSize; + } + + if (embedSize < 0) { + printf(" - "); + } else if (embedSize <= 9999) { + printf("%4lldB", embedSize); + } else { + double d = embedSize / 1024.0; + if (d <= 9999.0) { + printNumber(d); + putchar('K'); + } else { + d /= 1024.0; + if (d <= 9999.0) { + printNumber(d); + putchar('M'); + } else { + d /= 1024.0; + printNumber(d); + putchar('G'); + } + } + } + + if (ratio > 9.9) { + printf(" %3.0f%%\n", ratio); + } else if (ratio >= 0.0) { + printf(" %3.1f%%\n", ratio); + } else { + printf(" - \n"); + } + + ++imgNum; +} + +long ImageOutputDev::getInlineImageLength(Stream *str, int width, int height, GfxImageColorMap *colorMap) +{ + long len; + + if (colorMap) { + ImageStream *imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); + for (int y = 0; y < height; y++) { + imgStr->getLine(); + } + + imgStr->close(); + delete imgStr; + } else { + str->reset(); + for (int y = 0; y < height; y++) { + int size = (width + 7) / 8; + for (int x = 0; x < size; x++) { + str->getChar(); + } + } + } + + EmbedStream *embedStr = (EmbedStream *)(str->getBaseStream()); + embedStr->rewind(); + len = 0; + while (embedStr->getChar() != EOF) { + len++; + } + + embedStr->restore(); + + return len; +} + +void ImageOutputDev::writeRawImage(Stream *str, const char *ext) +{ + FILE *f; + int c; + + // open the image file + setFilename(ext); + ++imgNum; + if (!(f = fopen(fileName, "wb"))) { + error(errIO, -1, "Couldn't open image file '{0:s}'", fileName); + errorCode = 2; + return; + } + + // initialize stream + str = str->getNextStream(); + str->reset(); + + // copy the stream + while ((c = str->getChar()) != EOF) { + fputc(c, f); + } + + str->close(); + fclose(f); +} + +void ImageOutputDev::writeImageFile(ImgWriter *writer, ImageFormat format, const char *ext, Stream *str, int width, int height, GfxImageColorMap *colorMap) +{ + FILE *f = nullptr; /* squelch bogus compiler warning */ + ImageStream *imgStr = nullptr; + unsigned char *row; + unsigned char *rowp; + unsigned char *p; + GfxRGB rgb; + GfxCMYK cmyk; + GfxGray gray; + unsigned char zero[gfxColorMaxComps]; + int invert_bits; + + if (writer) { + setFilename(ext); + ++imgNum; + if (!(f = fopen(fileName, "wb"))) { + error(errIO, -1, "Couldn't open image file '{0:s}'", fileName); + errorCode = 2; + return; + } + + if (!writer->init(f, width, height, 72, 72)) { + error(errIO, -1, "Error writing '{0:s}'", fileName); + errorCode = 2; + return; + } + } + + int pixelSize = sizeof(unsigned int); + if (format == imgRGB48) { + pixelSize = 2 * sizeof(unsigned int); + } + + row = (unsigned char *)gmallocn_checkoverflow(width, pixelSize); + if (!row) { + error(errIO, -1, "Image data for '{0:s}' is too big. {1:d} width with {2:d} bytes per pixel", fileName, width, pixelSize); + errorCode = 99; + return; + } + + if (format != imgMonochrome) { + // initialize stream + imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); + } else { + // initialize stream + str->reset(); + } + + // PDF masks use 0 = draw current color, 1 = leave unchanged. + // We invert this to provide the standard interpretation of alpha + // (0 = transparent, 1 = opaque). If the colorMap already inverts + // the mask we leave the data unchanged. + invert_bits = 0xff; + if (colorMap) { + memset(zero, 0, sizeof(zero)); + colorMap->getGray(zero, &gray); + if (colToByte(gray) == 0) { + invert_bits = 0x00; + } + } + + // for each line... + for (int y = 0; y < height; y++) { + switch (format) { + case imgRGB: + p = imgStr->getLine(); + rowp = row; + for (int x = 0; x < width; ++x) { + if (p) { + colorMap->getRGB(p, &rgb); + *rowp++ = colToByte(rgb.r); + *rowp++ = colToByte(rgb.g); + *rowp++ = colToByte(rgb.b); + p += colorMap->getNumPixelComps(); + } else { + *rowp++ = 0; + *rowp++ = 0; + *rowp++ = 0; + } + } + if (writer) { + writer->writeRow(&row); + } + break; + + case imgRGB48: { + p = imgStr->getLine(); + unsigned short *rowp16 = reinterpret_cast(row); + for (int x = 0; x < width; ++x) { + if (p) { + colorMap->getRGB(p, &rgb); + *rowp16++ = colToShort(rgb.r); + *rowp16++ = colToShort(rgb.g); + *rowp16++ = colToShort(rgb.b); + p += colorMap->getNumPixelComps(); + } else { + *rowp16++ = 0; + *rowp16++ = 0; + *rowp16++ = 0; + } + } + if (writer) { + writer->writeRow(&row); + } + break; + } + + case imgCMYK: + p = imgStr->getLine(); + rowp = row; + for (int x = 0; x < width; ++x) { + if (p) { + colorMap->getCMYK(p, &cmyk); + *rowp++ = colToByte(cmyk.c); + *rowp++ = colToByte(cmyk.m); + *rowp++ = colToByte(cmyk.y); + *rowp++ = colToByte(cmyk.k); + p += colorMap->getNumPixelComps(); + } else { + *rowp++ = 0; + *rowp++ = 0; + *rowp++ = 0; + *rowp++ = 0; + } + } + if (writer) { + writer->writeRow(&row); + } + break; + + case imgGray: + p = imgStr->getLine(); + rowp = row; + for (int x = 0; x < width; ++x) { + if (p) { + colorMap->getGray(p, &gray); + *rowp++ = colToByte(gray); + p += colorMap->getNumPixelComps(); + } else { + *rowp++ = 0; + } + } + if (writer) { + writer->writeRow(&row); + } + break; + + case imgMonochrome: + int size = (width + 7) / 8; + for (int x = 0; x < size; x++) { + row[x] = str->getChar() ^ invert_bits; + } + if (writer) { + writer->writeRow(&row); + } + break; + } + } + + gfree(row); + if (format != imgMonochrome) { + imgStr->close(); + delete imgStr; + } + str->close(); + if (writer) { + writer->close(); + fclose(f); + } +} + +void ImageOutputDev::writeImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool inlineImg) +{ + ImageFormat format; + EmbedStream *embedStr; + + if (inlineImg) { + embedStr = (EmbedStream *)(str->getBaseStream()); + // Record the stream. This determines the size. + getInlineImageLength(str, width, height, colorMap); + // Reading the stream again will return EOF at end of recording. + embedStr->rewind(); + } + + if (dumpJPEG && str->getKind() == strDCT) { + // dump JPEG file + writeRawImage(str, "jpg"); + + } else if (dumpJP2 && str->getKind() == strJPX && !inlineImg) { + // dump JPEG2000 file + writeRawImage(str, "jp2"); + + } else if (dumpJBIG2 && str->getKind() == strJBIG2 && !inlineImg) { + // dump JBIG2 globals stream if available + JBIG2Stream *jb2Str = static_cast(str); + Object *globals = jb2Str->getGlobalsStream(); + if (globals->isStream()) { + FILE *f; + int c; + Stream *globalsStr = globals->getStream(); + + setFilename("jb2g"); + if (!(f = fopen(fileName, "wb"))) { + error(errIO, -1, "Couldn't open image file '{0:s}'", fileName); + errorCode = 2; + return; + } + globalsStr->reset(); + while ((c = globalsStr->getChar()) != EOF) { + fputc(c, f); + } + globalsStr->close(); + fclose(f); + } + + // dump JBIG2 embedded file + writeRawImage(str, "jb2e"); + + } else if (dumpCCITT && str->getKind() == strCCITTFax) { + // write CCITT parameters + CCITTFaxStream *ccittStr = static_cast(str); + FILE *f; + setFilename("params"); + if (!(f = fopen(fileName, "wb"))) { + error(errIO, -1, "Couldn't open image file '{0:s}'", fileName); + errorCode = 2; + return; + } + if (ccittStr->getEncoding() < 0) { + fprintf(f, "-4 "); + } else if (ccittStr->getEncoding() == 0) { + fprintf(f, "-1 "); + } else { + fprintf(f, "-2 "); + } + + if (ccittStr->getEndOfLine()) { + fprintf(f, "-A "); + } else { + fprintf(f, "-P "); + } + + fprintf(f, "-X %d ", ccittStr->getColumns()); + + if (ccittStr->getBlackIs1()) { + fprintf(f, "-W "); + } else { + fprintf(f, "-B "); + } + + fprintf(f, "-M\n"); // PDF uses MSB first + + fclose(f); + + // dump CCITT file + writeRawImage(str, "ccitt"); + + } else if (outputPNG && !(outputTiff && colorMap && (colorMap->getColorSpace()->getMode() == csDeviceCMYK || (colorMap->getColorSpace()->getMode() == csICCBased && colorMap->getNumPixelComps() == 4)))) { + // output in PNG format + +#ifdef ENABLE_LIBPNG + ImgWriter *writer; + + if (!colorMap || (colorMap->getNumPixelComps() == 1 && colorMap->getBits() == 1)) { + writer = new PNGWriter(PNGWriter::MONOCHROME); + format = imgMonochrome; + } else if (colorMap->getColorSpace()->getMode() == csDeviceGray || colorMap->getColorSpace()->getMode() == csCalGray) { + writer = new PNGWriter(PNGWriter::GRAY); + format = imgGray; + } else if ((colorMap->getColorSpace()->getMode() == csDeviceRGB || colorMap->getColorSpace()->getMode() == csCalRGB || (colorMap->getColorSpace()->getMode() == csICCBased && colorMap->getNumPixelComps() == 3)) + && colorMap->getBits() > 8) { + writer = new PNGWriter(PNGWriter::RGB48); + format = imgRGB48; + } else { + writer = new PNGWriter(PNGWriter::RGB); + format = imgRGB; + } + + writeImageFile(writer, format, "png", str, width, height, colorMap); + + delete writer; +#endif + } else if (outputTiff) { + // output in TIFF format + +#ifdef ENABLE_LIBTIFF + ImgWriter *writer; + + if (!colorMap || (colorMap->getNumPixelComps() == 1 && colorMap->getBits() == 1)) { + writer = new TiffWriter(TiffWriter::MONOCHROME); + format = imgMonochrome; + } else if (colorMap->getColorSpace()->getMode() == csDeviceGray || colorMap->getColorSpace()->getMode() == csCalGray) { + writer = new TiffWriter(TiffWriter::GRAY); + format = imgGray; + } else if (colorMap->getColorSpace()->getMode() == csDeviceCMYK || (colorMap->getColorSpace()->getMode() == csICCBased && colorMap->getNumPixelComps() == 4)) { + writer = new TiffWriter(TiffWriter::CMYK); + format = imgCMYK; + } else if ((colorMap->getColorSpace()->getMode() == csDeviceRGB || colorMap->getColorSpace()->getMode() == csCalRGB || (colorMap->getColorSpace()->getMode() == csICCBased && colorMap->getNumPixelComps() == 3)) + && colorMap->getBits() > 8) { + writer = new TiffWriter(TiffWriter::RGB48); + format = imgRGB48; + } else { + writer = new TiffWriter(TiffWriter::RGB); + format = imgRGB; + } + + writeImageFile(writer, format, "tif", str, width, height, colorMap); + + delete writer; +#endif + } else { + // output in PPM/PBM format + ImgWriter *writer; + + if (!colorMap || (colorMap->getNumPixelComps() == 1 && colorMap->getBits() == 1)) { + writer = new NetPBMWriter(NetPBMWriter::MONOCHROME); + format = imgMonochrome; + } else { + writer = new NetPBMWriter(NetPBMWriter::RGB); + format = imgRGB; + } + + writeImageFile(writer, format, format == imgRGB ? "ppm" : "pbm", str, width, height, colorMap); + + delete writer; + } + + if (inlineImg) { + embedStr->restore(); + } + + if (printFilenames) { + printf("%s\n", fileName); + } +} + +bool ImageOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) +{ + return true; + // do nothing -- this avoids the potentially slow loop in Gfx.cc +} + +void ImageOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) +{ + if (listImages) { + listImage(state, ref, str, width, height, nullptr, interpolate, inlineImg, imgStencil); + } else { + writeImage(state, ref, str, width, height, nullptr, inlineImg); + } +} + +void ImageOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) +{ + if (listImages) { + listImage(state, ref, str, width, height, colorMap, interpolate, inlineImg, imgImage); + } else { + writeImage(state, ref, str, width, height, colorMap, inlineImg); + } +} + +void ImageOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, bool maskInvert, bool maskInterpolate) +{ + if (listImages) { + listImage(state, ref, str, width, height, colorMap, interpolate, false, imgImage); + listImage(state, ref, maskStr, maskWidth, maskHeight, nullptr, maskInterpolate, false, imgMask); + } else { + writeImage(state, ref, str, width, height, colorMap, false); + writeImage(state, ref, maskStr, maskWidth, maskHeight, nullptr, false); + } +} + +void ImageOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap, + bool maskInterpolate) +{ + if (listImages) { + listImage(state, ref, str, width, height, colorMap, interpolate, false, imgImage); + listImage(state, ref, maskStr, maskWidth, maskHeight, maskColorMap, maskInterpolate, false, imgSmask); + } else { + writeImage(state, ref, str, width, height, colorMap, false); + writeImage(state, ref, maskStr, maskWidth, maskHeight, maskColorMap, false); + } +} diff --git a/poppler-24.05.0/utils/ImageOutputDev.h b/poppler-24.05.0/utils/ImageOutputDev.h new file mode 100644 index 0000000000000000000000000000000000000000..d0f6d30c1b1f70c00f66fb24077677f55177ec84 --- /dev/null +++ b/poppler-24.05.0/utils/ImageOutputDev.h @@ -0,0 +1,163 @@ +//======================================================================== +// +// ImageOutputDev.h +// +// Copyright 1998-2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Rainer Keller +// Copyright (C) 2008 Timothy Lee +// Copyright (C) 2009 Carlos Garcia Campos +// Copyright (C) 2010 Jakob Voss +// Copyright (C) 2012, 2013, 2017 Adrian Johnson +// Copyright (C) 2013 Thomas Freitag +// Copyright (C) 2018, 2019, 2021, 2024 Albert Astals Cid +// Copyright (C) 2024 Fernando Herrera +// Copyright (C) 2024 Sebastian J. Bronner +// +// 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 +// +//======================================================================== + +#ifndef IMAGEOUTPUTDEV_H +#define IMAGEOUTPUTDEV_H + +#include "poppler/poppler-config.h" + +#include +#include "goo/ImgWriter.h" +#include "OutputDev.h" + +class GfxState; + +//------------------------------------------------------------------------ +// ImageOutputDev +//------------------------------------------------------------------------ + +class ImageOutputDev : public OutputDev +{ +public: + enum ImageType + { + imgImage, + imgStencil, + imgMask, + imgSmask + }; + enum ImageFormat + { + imgRGB, + imgRGB48, + imgGray, + imgMonochrome, + imgCMYK + }; + + // Create an OutputDev which will write images to files named + // -NNN. or -PPP-NNN., if + // is set. Normally, all images are written as PBM + // (.pbm) or PPM (.ppm) files unless PNG or Tiff output is enabled + // (PNG is used if both are enabled). If Jpeg is enabled, JPEG images + // are written as JPEG (.jpg) files. + ImageOutputDev(char *fileRootA, bool pageNamesA, bool listImagesA); + + // Destructor. + ~ImageOutputDev() override; + + // Use PNG format for output + void enablePNG(bool png) { outputPNG = png; } + + // Use TIFF format for output + void enableTiff(bool tiff) { outputTiff = tiff; } + + // Use Jpeg format for Jpeg files + void enableJpeg(bool jpeg) { dumpJPEG = jpeg; } + + // Use Jpeg2000 format for Jpeg2000 files + void enableJpeg2000(bool jp2) { dumpJP2 = jp2; } + + // Use JBIG2 format for JBIG2 files + void enableJBig2(bool jbig2) { dumpJBIG2 = jbig2; } + + // Use CCITT format for CCITT files + void enableCCITT(bool ccitt) { dumpCCITT = ccitt; } + + // Print filenames to stdout after writing + void enablePrintFilenames(bool filenames) { printFilenames = filenames; } + + // Get the error code + // 0 = No error, 1 = Error opening a PDF file, 2 = Error opening an output file, 3 = Error related to PDF permissions, 99 = Other error. + int getErrorCode() const { return errorCode; } + + // Check if file was successfully created. + virtual bool isOk() { return errorCode == 0; } + + // Does this device use tilingPatternFill()? If this returns false, + // tiling pattern fills will be reduced to a series of other drawing + // operations. + bool useTilingPatternFill() override { return true; } + + // Does this device use beginType3Char/endType3Char? Otherwise, + // text in Type 3 fonts will be drawn with drawChar/drawString. + bool interpretType3Chars() override { return false; } + + // Does this device need non-text content? + bool needNonText() override { return true; } + + // Start a page + void startPage(int pageNumA, GfxState *state, XRef *xref) override { pageNum = pageNumA; } + + //---- get info about output device + + // Does this device use upside-down coordinates? + // (Upside-down means (0,0) is the top left corner of the page.) + bool upsideDown() override { return true; } + + // Does this device use drawChar() or drawString()? + bool useDrawChar() override { return false; } + + //----- path painting + bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override; + + //----- image drawing + void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) override; + void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, const int *maskColors, bool inlineImg) override; + void drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, bool maskInvert, bool maskInterpolate) override; + void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap, + bool maskInterpolate) override; + +private: + // Sets the output filename with a given file extension + void setFilename(const char *fileExt); + void listImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, bool inlineImg, ImageType imageType); + void writeImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool inlineImg); + void writeRawImage(Stream *str, const char *ext); + void writeImageFile(ImgWriter *writer, ImageFormat format, const char *ext, Stream *str, int width, int height, GfxImageColorMap *colorMap); + long getInlineImageLength(Stream *str, int width, int height, GfxImageColorMap *colorMap); + + char *fileRoot; // root of output file names + char *fileName; // buffer for output file names + bool listImages; // list images instead of dumping + bool dumpJPEG; // set to dump native JPEG files + bool dumpJP2; // set to dump native JPEG2000 files + bool dumpJBIG2; // set to dump native JBIG2 files + bool dumpCCITT; // set to dump native CCITT files + bool outputPNG; // set to output in PNG format + bool outputTiff; // set to output in TIFF format + bool pageNames; // set to include page number in file names + bool printFilenames; // set to print image filenames to stdout after writing + int pageNum; // current page number + int imgNum; // current image number + int errorCode; // code for any error creating the output files +}; + +#endif diff --git a/poppler-24.05.0/utils/InMemoryFile.cc b/poppler-24.05.0/utils/InMemoryFile.cc new file mode 100644 index 0000000000000000000000000000000000000000..d9afc970a1d4d1df9e0517a7891aadcdbfccf22a --- /dev/null +++ b/poppler-24.05.0/utils/InMemoryFile.cc @@ -0,0 +1,85 @@ +//======================================================================== +// +// InMemoryFile.cc +// +// Represents a file in-memory with GNU's stdio wrappers. +// NOTE as of this writing, open() depends on the glibc 'fopencookie' +// extension and is not supported on other platforms. The +// HAVE_IN_MEMORY_FILE macro is intended to reflect whether this class is +// usable. +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2018, 2019 Greg Knight +// Copyright (C) 2020 Albert Astals Cid +// +//======================================================================== + +#include "InMemoryFile.h" + +#include +#include + +InMemoryFile::InMemoryFile() = default; + +#ifdef HAVE_IN_MEMORY_FILE_FOPENCOOKIE +ssize_t InMemoryFile::_read(char *buf, size_t sz) +{ + auto toRead = std::min(data.size() - iohead, sz); + memcpy(&buf[0], &data[iohead], toRead); + iohead += toRead; + return toRead; +} + +ssize_t InMemoryFile::_write(const char *buf, size_t sz) +{ + if (iohead + sz > data.size()) { + data.resize(iohead + sz); + } + memcpy(&data[iohead], buf, sz); + iohead += sz; + return sz; +} + +int InMemoryFile::_seek(off64_t *offset, int whence) +{ + switch (whence) { + case SEEK_SET: + iohead = (*offset); + break; + case SEEK_CUR: + iohead += (*offset); + break; + case SEEK_END: + iohead -= (*offset); + break; + } + (*offset) = std::min(std::max(iohead, 0l), data.size()); + iohead = static_cast(*offset); + return 0; +} +#endif // def HAVE_IN_MEMORY_FILE_FOPENCOOKIE + +FILE *InMemoryFile::open(const char *mode) +{ +#ifdef HAVE_IN_MEMORY_FILE_FOPENCOOKIE + if (fptr != nullptr) { + fprintf(stderr, "InMemoryFile: BUG: Why is this opened more than once?"); + return nullptr; // maybe there's some legit reason for it, whoever comes up with one can remove this line + } + static const cookie_io_functions_t methods = { + /* .read = */ [](void *self, char *buf, size_t sz) { return ((InMemoryFile *)self)->_read(buf, sz); }, + /* .write = */ [](void *self, const char *buf, size_t sz) { return ((InMemoryFile *)self)->_write(buf, sz); }, + /* .seek = */ [](void *self, off64_t *offset, int whence) { return ((InMemoryFile *)self)->_seek(offset, whence); }, + /* .close = */ + [](void *self) { + ((InMemoryFile *)self)->fptr = nullptr; + return 0; + }, + }; + return fptr = fopencookie(this, mode, methods); +#else + fprintf(stderr, "If you can read this, your platform does not support the features necessary to achieve your goals."); + return nullptr; +#endif +} diff --git a/poppler-24.05.0/utils/InMemoryFile.h b/poppler-24.05.0/utils/InMemoryFile.h new file mode 100644 index 0000000000000000000000000000000000000000..a578f5243c8c37dc2144a95624260df949103749 --- /dev/null +++ b/poppler-24.05.0/utils/InMemoryFile.h @@ -0,0 +1,56 @@ +//======================================================================== +// +// InMemoryFile.h +// +// Represents a file in-memory with GNU's stdio wrappers. +// NOTE as of this writing, open() depends on the glibc 'fopencookie' +// extension and is not supported on other platforms. The +// HAVE_IN_MEMORY_FILE macro is intended to reflect whether this class is +// usable. +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2018, 2019 Greg Knight +// Copyright (C) 2022 Albert Astals Cid +// +//======================================================================== + +#ifndef IN_MEMORY_FILE_H +#define IN_MEMORY_FILE_H + +#include +#include +#include + +#if defined(__USE_GNU) && !defined(__ANDROID_API__) +# define HAVE_IN_MEMORY_FILE (1) +# define HAVE_IN_MEMORY_FILE_FOPENCOOKIE (1) // used internally +#endif + +class InMemoryFile +{ +private: +#ifdef HAVE_IN_MEMORY_FILE_FOPENCOOKIE + size_t iohead = 0; + FILE *fptr = nullptr; +#endif + std::vector data; + +#ifdef HAVE_IN_MEMORY_FILE_FOPENCOOKIE + ssize_t _read(char *buf, size_t sz); + ssize_t _write(const char *buf, size_t sz); + int _seek(off64_t *offset, int whence); +#endif + +public: + InMemoryFile(); + +public: + /* Returns a file handle for this file. This is scoped to this object + * and must be fclosed() by the caller before destruction. */ + FILE *open(const char *mode); + + const std::vector &getBuffer() const { return data; } +}; + +#endif // IN_MEMORY_FILE_H diff --git a/poppler-24.05.0/utils/Win32Console.cc b/poppler-24.05.0/utils/Win32Console.cc new file mode 100644 index 0000000000000000000000000000000000000000..ea46e17b6cdbf715e7161e384fabc102214d05eb --- /dev/null +++ b/poppler-24.05.0/utils/Win32Console.cc @@ -0,0 +1,164 @@ +//======================================================================== +// +// Win32Console.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2017 Adrian Johnson +// +// 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 +// +//======================================================================== + +#ifdef _WIN32 + +# include "goo/gmem.h" +# include "UTF.h" + +# define WIN32_CONSOLE_IMPL +# include "Win32Console.h" + +# include +# include + +static const int BUF_SIZE = 4096; +static int bufLen = 0; +static char buf[BUF_SIZE]; +static wchar_t wbuf[BUF_SIZE]; +static bool stdoutIsConsole = true; +static bool stderrIsConsole = true; +static HANDLE consoleHandle = nullptr; + +// If all = true, flush all characters to console. +// If all = false, flush up to and including last newline. +// Also flush all if buffer > half full to ensure space for future +// writes. +static void flush(bool all = false) +{ + int nchars = 0; + + if (all || bufLen > BUF_SIZE / 2) { + nchars = bufLen; + } else if (bufLen > 0) { + // find num chars up to and including last '\n' + for (nchars = bufLen; nchars > 0; --nchars) { + if (buf[nchars - 1] == '\n') + break; + } + } + + if (nchars > 0) { + DWORD wlen = utf8ToUtf16(buf, (uint16_t *)wbuf, BUF_SIZE, nchars); + WriteConsoleW(consoleHandle, wbuf, wlen, &wlen, nullptr); + if (nchars < bufLen) { + memmove(buf, buf + nchars, bufLen - nchars); + bufLen -= nchars; + } else { + bufLen = 0; + } + } +} + +static inline bool streamIsConsole(FILE *stream) +{ + return ((stream == stdout && stdoutIsConsole) || (stream == stderr && stderrIsConsole)); +} + +int win32_fprintf(FILE *stream, ...) +{ + va_list args; + int ret = 0; + + va_start(args, stream); + const char *format = va_arg(args, const char *); + if (streamIsConsole(stream)) { + ret = vsnprintf(buf + bufLen, BUF_SIZE - bufLen, format, args); + bufLen += ret; + if (ret >= BUF_SIZE - bufLen) { + // output was truncated + buf[BUF_SIZE - 1] = 0; + bufLen = BUF_SIZE - 1; + } + flush(); + } else { + vfprintf(stream, format, args); + } + va_end(args); + + return ret; +} + +size_t win32_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream) +{ + size_t ret = 0; + + if (streamIsConsole(stream)) { + int n = size * nmemb; + if (n > BUF_SIZE - bufLen - 1) + n = BUF_SIZE - bufLen - 1; + memcpy(buf + bufLen, ptr, n); + bufLen += n; + buf[bufLen] = 0; + flush(); + } else { + ret = fwrite(ptr, size, nmemb, stream); + } + + return ret; +} + +Win32Console::Win32Console(int *argc, char **argv[]) +{ + LPWSTR *wargv; + fpos_t pos; + + argList = nullptr; + privateArgList = nullptr; + wargv = CommandLineToArgvW(GetCommandLineW(), &numArgs); + if (wargv) { + argList = new char *[numArgs]; + privateArgList = new char *[numArgs]; + for (int i = 0; i < numArgs; i++) { + argList[i] = utf16ToUtf8((uint16_t *)(wargv[i])); + // parseArgs will rearrange the argv list so we keep our own copy + // to use for freeing all the strings + privateArgList[i] = argList[i]; + } + LocalFree(wargv); + *argc = numArgs; + *argv = argList; + } + + bufLen = 0; + buf[0] = 0; + wbuf[0] = 0; + + // check if stdout or stderr redirected + // GetFileType() returns CHAR for console and special devices COMx, PRN, CON, NUL etc + // fgetpos() succeeds on all CHAR devices except console and CON. + + stdoutIsConsole = (GetFileType(GetStdHandle(STD_OUTPUT_HANDLE)) == FILE_TYPE_CHAR) && (fgetpos(stdout, &pos) != 0); + + stderrIsConsole = (GetFileType(GetStdHandle(STD_ERROR_HANDLE)) == FILE_TYPE_CHAR) && (fgetpos(stderr, &pos) != 0); + + // Need a handle to the console. Doesn't matter if we use stdout or stderr as + // long as the handle output is to the console. + if (stdoutIsConsole) + consoleHandle = GetStdHandle(STD_OUTPUT_HANDLE); + else if (stderrIsConsole) + consoleHandle = GetStdHandle(STD_ERROR_HANDLE); +} + +Win32Console::~Win32Console() +{ + flush(true); + if (argList) { + for (int i = 0; i < numArgs; i++) + gfree(privateArgList[i]); + delete[] argList; + delete[] privateArgList; + } +} + +#endif // _WIN32 diff --git a/poppler-24.05.0/utils/Win32Console.h b/poppler-24.05.0/utils/Win32Console.h new file mode 100644 index 0000000000000000000000000000000000000000..a2d13924c93398bcc7a534856fcb9c95772dff71 --- /dev/null +++ b/poppler-24.05.0/utils/Win32Console.h @@ -0,0 +1,71 @@ +//======================================================================== +// +// Win32Console.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2019 Albert Astals Cid +// Copyright (C) 2019 Oliver Sander +// +// 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 +// +//======================================================================== + +#ifndef WIN32CONSOLE_H +#define WIN32CONSOLE_H + +// UTF-8 Support for win32 console +// +// Converts argc/argv to UTF-8. Supports UTF-8 stdout/stderr to win32 console. +// On other platforms this class is a no-op. + +#ifdef _WIN32 + +// Ensure stdio.h is included before redefining stdio functions. We need to provide +// our own declarations for the redefined functions because win32 stdio.h functions +// have DLL export decorations. +# include + +# ifndef WIN32_CONSOLE_IMPL // don't redefine in Win32Console.cc so we can call original functions +# define printf(...) win32_fprintf(stdout, __VA_ARGS__) +# define fprintf(stream, ...) win32_fprintf(stream, __VA_ARGS__) +# define puts(s) win32_fprintf(stdout, "%s\n", s) +# define fputs(s, stream) win32_fprintf(stream, "%s", s) +# define putc(c) win32_fprintf(stdout, "%c", c) +# define putchar(c) win32_fprintf(stdout, "%c", c) +# define fputc(c, stream) win32_fprintf(stream, "%c", c) +# define fwrite(ptr, size, nmemb, stream) win32_fwrite(ptr, size, nmemb, stream) +# endif + +extern "C" { +int win32_fprintf(FILE *stream, ...); +size_t win32_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream); +} + +class Win32Console +{ +public: + Win32Console(int *argc, char **argv[]); + ~Win32Console(); + +private: + int numArgs; + char **argList; + char **privateArgList; +}; + +#else + +// On other platforms this class is a no-op. + +class Win32Console +{ +public: + Win32Console(int *argc, char ***argv) { } +}; + +#endif // _WIN32 + +#endif diff --git a/poppler-24.05.0/utils/numberofcharacters.h b/poppler-24.05.0/utils/numberofcharacters.h new file mode 100644 index 0000000000000000000000000000000000000000..3915b0d89ddbf3e46c9a1afe91d89f3b91f7a1e0 --- /dev/null +++ b/poppler-24.05.0/utils/numberofcharacters.h @@ -0,0 +1,25 @@ +//======================================================================== +// +// pdfsig.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2010 Albert Astals Cid +// +//======================================================================== + +#ifndef NUMBEROFCHARACTERS_H +#define NUMBEROFCHARACTERS_H + +static int numberOfCharacters(unsigned int n) +{ + int charNum = 0; + while (n >= 10) { + n = n / 10; + charNum++; + } + charNum++; + return charNum; +} + +#endif diff --git a/poppler-24.05.0/utils/parseargs.cc b/poppler-24.05.0/utils/parseargs.cc new file mode 100644 index 0000000000000000000000000000000000000000..5b9b307ff37bb8c9e864e55bd8dba30f0c337f72 --- /dev/null +++ b/poppler-24.05.0/utils/parseargs.cc @@ -0,0 +1,241 @@ +/* + * parseargs.cc + * + * Command line argument parser. + * + * Copyright 1996-2003 Glyph & Cog, LLC + */ + +/*======================================================================== + + Modified under the Poppler project - http://poppler.freedesktop.org + + Poppler project changes to this file are under the GPLv2 or later license + + All changes made under the Poppler project to this file are licensed + under GPL version 2 or later + + Copyright (C) 2008, 2009, 2018 Albert Astals Cid + Copyright (C) 2011, 2012 Adrian Johnson + + 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 +#include +#include +#include +#include +#include "parseargs.h" + +#include "goo/gstrtod.h" +#include "goo/GooString.h" + +static const ArgDesc *findArg(const ArgDesc *args, char *arg); +static bool grabArg(const ArgDesc *arg, int i, int *argc, char *argv[]); + +bool parseArgs(const ArgDesc *args, int *argc, char *argv[]) +{ + const ArgDesc *arg; + int i, j; + bool ok; + + ok = true; + i = 1; + while (i < *argc) { + if (!strcmp(argv[i], "--")) { + --*argc; + for (j = i; j < *argc; ++j) { + argv[j] = argv[j + 1]; + } + break; + } else if ((arg = findArg(args, argv[i]))) { + if (!grabArg(arg, i, argc, argv)) { + ok = false; + } + } else { + ++i; + } + } + return ok; +} + +void printUsage(const char *program, const char *otherArgs, const ArgDesc *args) +{ + const ArgDesc *arg; + const char *typ; + int w, w1; + + w = 0; + for (arg = args; arg->arg; ++arg) { + if ((w1 = strlen(arg->arg)) > w) { + w = w1; + } + } + + fprintf(stderr, "Usage: %s [options]", program); + if (otherArgs) { + fprintf(stderr, " %s", otherArgs); + } + fprintf(stderr, "\n"); + + for (arg = args; arg->arg; ++arg) { + fprintf(stderr, " %s", arg->arg); + w1 = 9 + w - strlen(arg->arg); + switch (arg->kind) { + case argInt: + case argIntDummy: + typ = " "; + break; + case argFP: + case argFPDummy: + typ = " "; + break; + case argString: + case argStringDummy: + case argGooString: + typ = " "; + break; + case argFlag: + case argFlagDummy: + default: + typ = ""; + break; + } + fprintf(stderr, "%-*s", w1, typ); + if (arg->usage) { + fprintf(stderr, ": %s", arg->usage); + } + fprintf(stderr, "\n"); + } +} + +static const ArgDesc *findArg(const ArgDesc *args, char *arg) +{ + const ArgDesc *p; + + for (p = args; p->arg; ++p) { + if (p->kind < argFlagDummy && !strcmp(p->arg, arg)) { + return p; + } + } + return nullptr; +} + +static bool grabArg(const ArgDesc *arg, int i, int *argc, char *argv[]) +{ + int n; + int j; + bool ok; + + ok = true; + n = 0; + switch (arg->kind) { + case argFlag: + *(bool *)arg->val = true; + n = 1; + break; + case argInt: + if (i + 1 < *argc && isInt(argv[i + 1])) { + *(int *)arg->val = atoi(argv[i + 1]); + n = 2; + } else { + ok = false; + n = 1; + } + break; + case argFP: + if (i + 1 < *argc && isFP(argv[i + 1])) { + *(double *)arg->val = gatof(argv[i + 1]); + n = 2; + } else { + ok = false; + n = 1; + } + break; + case argString: + if (i + 1 < *argc) { + strncpy((char *)arg->val, argv[i + 1], arg->size - 1); + ((char *)arg->val)[arg->size - 1] = '\0'; + n = 2; + } else { + ok = false; + n = 1; + } + break; + case argGooString: + if (i + 1 < *argc) { + ((GooString *)arg->val)->Set(argv[i + 1]); + n = 2; + } else { + ok = false; + n = 1; + } + break; + default: + fprintf(stderr, "Internal error in arg table\n"); + n = 1; + break; + } + if (n > 0) { + *argc -= n; + for (j = i; j < *argc; ++j) { + argv[j] = argv[j + n]; + } + } + return ok; +} + +bool isInt(const char *s) +{ + if (*s == '-' || *s == '+') { + ++s; + } + while (isdigit(*s)) { + ++s; + } + if (*s) { + return false; + } + return true; +} + +bool isFP(const char *s) +{ + int n; + + if (*s == '-' || *s == '+') { + ++s; + } + n = 0; + while (isdigit(*s)) { + ++s; + ++n; + } + if (*s == '.') { + ++s; + } + while (isdigit(*s)) { + ++s; + ++n; + } + if (n > 0 && (*s == 'e' || *s == 'E')) { + ++s; + if (*s == '-' || *s == '+') { + ++s; + } + n = 0; + if (!isdigit(*s)) { + return false; + } + do { + ++s; + } while (isdigit(*s)); + } + if (*s) { + return false; + } + return true; +} diff --git a/poppler-24.05.0/utils/parseargs.h b/poppler-24.05.0/utils/parseargs.h new file mode 100644 index 0000000000000000000000000000000000000000..d927e56e36e2cb8c1a0d9a437ff44e2e0e3a4941 --- /dev/null +++ b/poppler-24.05.0/utils/parseargs.h @@ -0,0 +1,88 @@ +/* + * parseargs.h + * + * Command line argument parser. + * + * Copyright 1996-2003 Glyph & Cog, LLC + */ + +/*======================================================================== + + 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) 2008, 2018 Albert Astals Cid + Copyright (C) 2011 Adrian Johnson + + 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 + +========================================================================*/ + +#ifndef PARSEARGS_H +#define PARSEARGS_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * Argument kinds. + */ +typedef enum +{ + argFlag, /* flag (present / not-present) */ + /* [val: bool *] */ + argInt, /* integer arg */ + /* [val: int *] */ + argFP, /* floating point arg */ + /* [val: double *] */ + argString, /* string arg */ + /* [val: char *] */ + argGooString, /* string arg */ + /* [val: GooString *] */ + /* dummy entries -- these show up in the usage listing only; */ + /* useful for X args, for example */ + argFlagDummy, + argIntDummy, + argFPDummy, + argStringDummy +} ArgKind; + +/* + * Argument descriptor. + */ +typedef struct +{ + const char *arg; /* the command line switch */ + ArgKind kind; /* kind of arg */ + void *val; /* place to store value */ + int size; /* for argString: size of string */ + const char *usage; /* usage string */ +} ArgDesc; + +/* + * Parse command line. Removes all args which are found in the arg + * descriptor list . Stops parsing if "--" is found (and removes + * it). Returns false if there was an error. + */ +extern bool parseArgs(const ArgDesc *args, int *argc, char *argv[]); + +/* + * Print usage message, based on arg descriptor list. + */ +extern void printUsage(const char *program, const char *otherArgs, const ArgDesc *args); + +/* + * Check if a string is a valid integer or floating point number. + */ +extern bool isInt(const char *s); +extern bool isFP(const char *s); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/poppler-24.05.0/utils/pdf2xml.dtd b/poppler-24.05.0/utils/pdf2xml.dtd new file mode 100644 index 0000000000000000000000000000000000000000..bf7f14f6cd9b1729beaacadcdcd8eecb0be991fe --- /dev/null +++ b/poppler-24.05.0/utils/pdf2xml.dtd @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + diff --git a/poppler-24.05.0/utils/pdfattach.1 b/poppler-24.05.0/utils/pdfattach.1 new file mode 100644 index 0000000000000000000000000000000000000000..c9589a783eb9b33bf65bc218a8625b846991b4d3 --- /dev/null +++ b/poppler-24.05.0/utils/pdfattach.1 @@ -0,0 +1,60 @@ +.\" Copyright 2019 Albert Astals Cid +.TH pdfattach 1 "10 Febuary 2019" +.SH NAME +pdfattach \- Portable Document Format (PDF) document embedded file +creator (version 3.03) +.SH SYNOPSIS +.B pdfattach +[options] +.I input-PDF-file file-to-attach output-PDF-file +.SH DESCRIPTION +.B Pdfattach +adds a new embedded file (attachment) to an existing Portable +Document Format (PDF) file. +.SH OPTIONS +.TP +.B \-replace +Replace embedded file with same name (if it exists) +.TP +.B \-v +Print copyright and version information. +.TP +.B \-h +Print usage information. +.RB ( \-help +and +.B \-\-help +are equivalent.) +.SH EXIT CODES +.TP +0 +No error. +.TP +1 +Error opening input PDF file. +.TP +2 +Error opening file to attach. +.TP +3 +Output file already exists. +.TP +3 +There is already an attached file with that name. +.TP +5 +Error saving the output file. +.SH AUTHOR +The pdfattach software and documentation are copyright 2019 The Poppler developers +.SH "SEE ALSO" +.BR pdfdetach (1), +.BR pdfimages (1), +.BR pdfinfo (1), +.BR pdftocairo (1), +.BR pdftohtml (1), +.BR pdftoppm (1), +.BR pdftops (1), +.BR pdftotext (1) +.BR pdfseparate (1), +.BR pdfsig (1), +.BR pdfunite (1) diff --git a/poppler-24.05.0/utils/pdfattach.cc b/poppler-24.05.0/utils/pdfattach.cc new file mode 100644 index 0000000000000000000000000000000000000000..8c854e8d60bb30c82873ae7c766c883fe762e159 --- /dev/null +++ b/poppler-24.05.0/utils/pdfattach.cc @@ -0,0 +1,106 @@ +//======================================================================== +// +// pdfattach.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2019-2022 Albert Astals Cid +// Copyright (C) 2019, 2023 Oliver Sander +// +// 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" +#include +#include "gbasename.h" +#include "parseargs.h" +#include "GlobalParams.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "Error.h" +#include "ErrorCodes.h" +#include "UTF.h" +#include "Win32Console.h" + +static bool doReplace = false; +static bool printVersion = false; +static bool printHelp = false; + +static const ArgDesc argDesc[] = { { "-replace", argFlag, &doReplace, 0, "replace embedded file with same name (if it exists)" }, + { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} }; + +static bool fileExists(const char *filePath) +{ + FILE *f = openFile(filePath, "r"); + if (f != nullptr) { + fclose(f); + return true; + } + return false; +} + +int main(int argc, char *argv[]) +{ + Win32Console win32Console(&argc, &argv); + + // parse args + const bool ok = parseArgs(argDesc, &argc, argv); + if (!ok || argc != 4 || printVersion || printHelp) { + fprintf(stderr, "pdfattach version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", xpdfCopyright); + if (!printVersion) { + printUsage("pdfattach", " ", argDesc); + } + return 99; + } + const GooString pdfFileName(argv[1]); + const std::string attachFilePath(argv[2]); + + // init GlobalParams + globalParams = std::make_unique(); + + // open PDF file + std::unique_ptr doc(PDFDocFactory().createPDFDoc(pdfFileName, {}, {})); + + if (!doc->isOk()) { + fprintf(stderr, "Couldn't open %s\n", pdfFileName.c_str()); + return 1; + } + + std::unique_ptr attachFile(GooFile::open(attachFilePath)); + if (!attachFile) { + fprintf(stderr, "Couldn't open %s\n", attachFilePath.c_str()); + return 2; + } + + if (fileExists(argv[3])) { + fprintf(stderr, "File %s already exists.\n", argv[3]); + return 3; + } + + const std::string attachFileName = utf8ToUtf16WithBom(gbasename(attachFilePath.c_str())); + + if (!doReplace && doc->getCatalog()->hasEmbeddedFile(attachFileName)) { + fprintf(stderr, "There is already an embedded file named %s.\n", attachFileName.c_str()); + return 4; + } + + doc->getCatalog()->addEmbeddedFile(attachFile.get(), attachFileName); + + const GooString outputPdfFilePath(argv[3]); + const int saveResult = doc->saveAs(outputPdfFilePath); + if (saveResult != errNone) { + fprintf(stderr, "Couldn't save the file properly.\n"); + return 5; + } + + return 0; +} diff --git a/poppler-24.05.0/utils/pdfdetach.1 b/poppler-24.05.0/utils/pdfdetach.1 new file mode 100644 index 0000000000000000000000000000000000000000..0b8975dc620cbcb10bfdacc1dd33753f0145a5b8 --- /dev/null +++ b/poppler-24.05.0/utils/pdfdetach.1 @@ -0,0 +1,94 @@ +.\" Copyright 2011 Glyph & Cog, LLC +.TH pdfdetach 1 "15 August 2011" +.SH NAME +pdfdetach \- Portable Document Format (PDF) document embedded file +extractor (version 3.03) +.SH SYNOPSIS +.B pdfdetach +[options] +.RI [ PDF-file ] +.SH DESCRIPTION +.B Pdfdetach +lists or extracts embedded files (attachments) from a Portable +Document Format (PDF) file. +.SH OPTIONS +Some of the following options can be set with configuration file +commands. These are listed in square brackets with the description of +the corresponding command line option. +.TP +.B \-list +List all of the embedded files in the PDF file. File names are +converted to the text encoding specified by the "\-enc" switch. +.TP +.BI \-save " number" +Save the specified embedded file. By default, this uses the file name +associated with the embedded file (as printed by the "\-list" switch); +the file name can be changed with the "\-o" switch. +.TP +.BI \-savefile " filename" +Save the specified embedded file. By default, this uses the file name +associated with the embedded file (as printed by the "\-list" switch); +the file name can be changed with the "\-o" switch. +.TP +.BI \-saveall +Save all of the embedded files. This uses the file names associated +with the embedded files (as printed by the "\-list" switch). By +default, the files are saved in the current directory; this can be +changed with the "\-o" switch. +.TP +.BI \-o " path" +Set the file name used when saving an embedded file with the "\-save" +switch, or the directory used by "\-saveall". +.TP +.BI \-enc " encoding-name" +Sets the encoding to use for text output (embedded file names). +This defaults to "UTF-8". +.TP +.BI \-opw " password" +Specify the owner password for the PDF file. Providing this will +bypass all security restrictions. +.TP +.BI \-upw " password" +Specify the user password for the PDF file. +.TP +.B \-v +Print copyright and version information. +.TP +.B \-h +Print usage information. +.RB ( \-help +and +.B \-\-help +are equivalent.) +.SH EXIT CODES +The Xpdf tools use the following exit codes: +.TP +0 +No error. +.TP +1 +Error opening a PDF file. +.TP +2 +Error opening an output file. +.TP +3 +Error related to PDF permissions. +.TP +99 +Other error. +.SH AUTHOR +The pdfinfo software and documentation are copyright 1996-2011 Glyph & +Cog, LLC. +.SH "SEE ALSO" +.BR pdffonts (1), +.BR pdfimages (1), +.BR pdfinfo (1), +.BR pdftocairo (1), +.BR pdftohtml (1), +.BR pdftoppm (1), +.BR pdftops (1), +.BR pdftotext (1) +.BR pdfseparate (1), +.BR pdfsig (1), +.BR pdfunite (1) diff --git a/poppler-24.05.0/utils/pdfdetach.cc b/poppler-24.05.0/utils/pdfdetach.cc new file mode 100644 index 0000000000000000000000000000000000000000..aa530850e1e76dd469dede5eddbb973b0296cad4 --- /dev/null +++ b/poppler-24.05.0/utils/pdfdetach.cc @@ -0,0 +1,318 @@ +//======================================================================== +// +// pdfdetach.cc +// +// Copyright 2010 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2011 Carlos Garcia Campos +// Copyright (C) 2013 Yury G. Kudryashov +// Copyright (C) 2014, 2017 Adrian Johnson +// Copyright (C) 2018, 2020, 2022, 2024 Albert Astals Cid +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019, 2021, 2024 Oliver Sander +// Copyright (C) 2020 +// Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// 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" +#include +#include +#include "goo/gmem.h" +#include "parseargs.h" +#include "Annot.h" +#include "GlobalParams.h" +#include "Page.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "FileSpec.h" +#include "CharTypes.h" +#include "Catalog.h" +#include "UnicodeMap.h" +#include "PDFDocEncoding.h" +#include "Error.h" +#include "UTF.h" +#include "Win32Console.h" + +#include + +static bool doList = false; +static int saveNum = 0; +static char saveFile[128] = ""; +static bool saveAll = false; +static char savePath[1024] = ""; +static char textEncName[128] = ""; +static char ownerPassword[33] = "\001"; +static char userPassword[33] = "\001"; +static bool printVersion = false; +static bool printHelp = false; + +static const ArgDesc argDesc[] = { { "-list", argFlag, &doList, 0, "list all embedded files" }, + { "-save", argInt, &saveNum, 0, "save the specified embedded file (file number)" }, + { "-savefile", argString, &saveFile, sizeof(saveFile), "save the specified embedded file (file name)" }, + { "-saveall", argFlag, &saveAll, 0, "save all embedded files" }, + { "-o", argString, savePath, sizeof(savePath), "file name for the saved embedded file" }, + { "-enc", argString, textEncName, sizeof(textEncName), "output text encoding name" }, + { "-opw", argString, ownerPassword, sizeof(ownerPassword), "owner password (for encrypted files)" }, + { "-upw", argString, userPassword, sizeof(userPassword), "user password (for encrypted files)" }, + { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} }; + +int main(int argc, char *argv[]) +{ + std::unique_ptr doc; + GooString *fileName; + const UnicodeMap *uMap; + std::optional ownerPW, userPW; + char uBuf[8]; + bool ok; + bool hasSaveFile; + std::vector> embeddedFiles; + int nFiles, nPages, n, i, j; + Page *page; + Annots *annots; + const GooString *s1; + Unicode u; + bool isUnicode; + + Win32Console win32Console(&argc, &argv); + + // parse args + ok = parseArgs(argDesc, &argc, argv); + hasSaveFile = strlen(saveFile) > 0; + if ((doList ? 1 : 0) + ((saveNum != 0) ? 1 : 0) + ((hasSaveFile != 0) ? 1 : 0) + (saveAll ? 1 : 0) != 1) { + ok = false; + } + if (!ok || argc != 2 || printVersion || printHelp) { + fprintf(stderr, "pdfdetach version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", xpdfCopyright); + if (!printVersion) { + printUsage("pdfdetach", "", argDesc); + } + return 99; + } + fileName = new GooString(argv[1]); + + // read config file + globalParams = std::make_unique(); + if (textEncName[0]) { + globalParams->setTextEncoding(textEncName); + } + + // get mapping to output encoding + if (!(uMap = globalParams->getTextEncoding())) { + error(errConfig, -1, "Couldn't get text encoding"); + delete fileName; + return 99; + } + + // open PDF file + if (ownerPassword[0] != '\001') { + ownerPW = GooString(ownerPassword); + } + if (userPassword[0] != '\001') { + userPW = GooString(userPassword); + } + + doc = PDFDocFactory().createPDFDoc(*fileName, ownerPW, userPW); + + if (!doc->isOk()) { + return 1; + } + + for (i = 0; i < doc->getCatalog()->numEmbeddedFiles(); ++i) { + embeddedFiles.push_back(doc->getCatalog()->embeddedFile(i)); + } + + nPages = doc->getCatalog()->getNumPages(); + for (i = 0; i < nPages; ++i) { + page = doc->getCatalog()->getPage(i + 1); + if (!page) { + continue; + } + annots = page->getAnnots(); + if (!annots) { + break; + } + + for (Annot *annot : annots->getAnnots()) { + if (annot->getType() != Annot::typeFileAttachment) { + continue; + } + embeddedFiles.push_back(std::make_unique(static_cast(annot)->getFile())); + } + } + + nFiles = embeddedFiles.size(); + + // list embedded files + if (doList) { + printf("%d embedded files\n", nFiles); + for (i = 0; i < nFiles; ++i) { + const std::unique_ptr &fileSpec = embeddedFiles[i]; + printf("%d: ", i + 1); + s1 = fileSpec->getFileName(); + if (!s1) { + return 3; + } + if (hasUnicodeByteOrderMark(s1->toStr())) { + isUnicode = true; + j = 2; + } else { + isUnicode = false; + j = 0; + } + while (j < s1->getLength()) { + if (isUnicode) { + u = ((s1->getChar(j) & 0xff) << 8) | (s1->getChar(j + 1) & 0xff); + j += 2; + } else { + u = pdfDocEncoding[s1->getChar(j) & 0xff]; + ++j; + } + n = uMap->mapUnicode(u, uBuf, sizeof(uBuf)); + fwrite(uBuf, 1, n, stdout); + } + fputc('\n', stdout); + } + + // save all embedded files + } else if (saveAll) { + std::filesystem::path basePath = savePath; + if (basePath.empty()) { + basePath = std::filesystem::current_path(); + } + basePath = basePath.lexically_normal(); + + for (i = 0; i < nFiles; ++i) { + const std::unique_ptr &fileSpec = embeddedFiles[i]; + std::string filename; + + s1 = fileSpec->getFileName(); + if (!s1) { + return 3; + } + if (hasUnicodeByteOrderMark(s1->toStr())) { + isUnicode = true; + j = 2; + } else { + isUnicode = false; + j = 0; + } + while (j < s1->getLength()) { + if (isUnicode) { + u = ((s1->getChar(j) & 0xff) << 8) | (s1->getChar(j + 1) & 0xff); + j += 2; + } else { + u = pdfDocEncoding[s1->getChar(j) & 0xff]; + ++j; + } + n = uMap->mapUnicode(u, uBuf, sizeof(uBuf)); + filename.append(uBuf, n); + } + + if (filename.empty()) { + return 3; + } + std::filesystem::path filePath = basePath; + filePath = filePath.append(filename).lexically_normal(); + + if (!filePath.generic_string().starts_with(basePath.generic_string())) { + error(errIO, -1, "Preventing directory traversal"); + return 3; + } + + auto *embFile = fileSpec->getEmbeddedFile(); + if (!embFile || !embFile->isOk()) { + return 3; + } + if (!embFile->save(filePath.generic_string())) { + error(errIO, -1, "Error saving embedded file as '{0:s}'", filePath.c_str()); + return 2; + } + } + + // save an embedded file + } else { + if (hasSaveFile) { + for (i = 0; i < nFiles; ++i) { + const std::unique_ptr &fileSpec = embeddedFiles[i]; + s1 = fileSpec->getFileName(); + if (strcmp(s1->c_str(), saveFile) == 0) { + saveNum = i + 1; + break; + } + } + } + if (saveNum < 1 || saveNum > nFiles) { + error(errCommandLine, -1, hasSaveFile ? "Invalid file name" : "Invalid file number"); + return 99; + } + + const std::unique_ptr &fileSpec = embeddedFiles[saveNum - 1]; + std::string targetPath = savePath; + if (targetPath.empty()) { + // The user hasn't given a path to save, just use the filename specified in the pdf as name + s1 = fileSpec->getFileName(); + if (!s1) { + return 3; + } + if (hasUnicodeByteOrderMark(s1->toStr())) { + isUnicode = true; + j = 2; + } else { + isUnicode = false; + j = 0; + } + while (j < s1->getLength()) { + if (isUnicode) { + u = ((s1->getChar(j) & 0xff) << 8) | (s1->getChar(j + 1) & 0xff); + j += 2; + } else { + u = pdfDocEncoding[s1->getChar(j) & 0xff]; + ++j; + } + n = uMap->mapUnicode(u, uBuf, sizeof(uBuf)); + targetPath.append(uBuf, n); + } + + const std::filesystem::path basePath = std::filesystem::current_path().lexically_normal(); + std::filesystem::path filePath = basePath; + filePath = filePath.append(targetPath).lexically_normal(); + + if (!filePath.generic_string().starts_with(basePath.generic_string())) { + error(errIO, -1, "Preventing directory traversal"); + return 3; + } + targetPath = filePath.generic_string(); + } + + auto *embFile = fileSpec->getEmbeddedFile(); + if (!embFile || !embFile->isOk()) { + return 3; + } + if (!embFile->save(targetPath)) { + error(errIO, -1, "Error saving embedded file as '{0:s}'", targetPath.c_str()); + return 2; + } + } + + return 0; +} diff --git a/poppler-24.05.0/utils/pdffonts.1 b/poppler-24.05.0/utils/pdffonts.1 new file mode 100644 index 0000000000000000000000000000000000000000..1ec0db2722aa8bad093396c12148f8e4b2ce328e --- /dev/null +++ b/poppler-24.05.0/utils/pdffonts.1 @@ -0,0 +1,128 @@ +.\" Copyright 1999-2011 Glyph & Cog, LLC +.TH pdffonts 1 "15 August 2011" +.SH NAME +pdffonts \- Portable Document Format (PDF) font analyzer (version +3.03) +.SH SYNOPSIS +.B pdffonts +[options] +.RI [ PDF-file ] +.SH DESCRIPTION +.B Pdffonts +lists the fonts used in a Portable Document Format (PDF) file along +with various information for each font. +.PP +If +.I PDF-file +is \'-', it reads the PDF file from stdin. +.PP +The following information is listed for each font: +.TP +.B name +the font name, exactly as given in the PDF file (potentially including +a subset prefix) +.TP +.B type +the font type \(en see below for details +.TP +.B encoding +the font encoding +.TP +.B emb +"yes" if the font is embedded in the PDF file +.TP +.B sub +"yes" if the font is a subset +.TP +.B uni +"yes" if there is an explicit "ToUnicode" map in the PDF file (the +absence of a ToUnicode map doesn't necessarily mean that the text +can't be converted to Unicode) +.TP +.B object ID +the font dictionary object ID (number and generation) +.PP +PDF files can contain the following types of fonts: +.PP +.RS +Type 1 +.RE +.RS +Type 1C \(en aka Compact Font Format (CFF) +.RE +.RS +Type 3 +.RE +.RS +TrueType +.RE +.RS +CID Type 0 \(en 16-bit font with no specified type +.RE +.RS +CID Type 0C \(en 16-bit PostScript CFF font +.RE +.RS +CID TrueType \(en 16-bit TrueType font +.RE +.SH OPTIONS +.TP +.BI \-f " number" +Specifies the first page to analyze. +.TP +.BI \-l " number" +Specifies the last page to analyze. +.TP +.B \-subst +List the substitute fonts that poppler will use for non embedded fonts. +.TP +.BI \-opw " password" +Specify the owner password for the PDF file. Providing this will +bypass all security restrictions. +.TP +.BI \-upw " password" +Specify the user password for the PDF file. +.TP +.B \-v +Print copyright and version information. +.TP +.B \-h +Print usage information. +.RB ( \-help +and +.B \-\-help +are equivalent.) +.SH EXIT CODES +The Xpdf tools use the following exit codes: +.TP +0 +No error. +.TP +1 +Error opening a PDF file. +.TP +2 +Error opening an output file. +.TP +3 +Error related to PDF permissions. +.TP +99 +Other error. +.SH AUTHOR +The pdffonts software and documentation are copyright 1996\(en2011 Glyph +& Cog, LLC. +.SH "SEE ALSO" +.nh +.ad l +.BR pdfdetach (1), +.BR pdfimages (1), +.BR pdfinfo (1), +.BR pdftocairo (1), +.BR pdftohtml (1), +.BR pdftoppm (1), +.BR pdftops (1), +.BR pdftotext (1), +.BR pdfseparate (1), +.BR pdfsig (1), +.BR pdfunite (1) diff --git a/poppler-24.05.0/utils/pdffonts.cc b/poppler-24.05.0/utils/pdffonts.cc new file mode 100644 index 0000000000000000000000000000000000000000..ed45043db4a22a35d377c1d3c5ff44a5ae0c7f85 --- /dev/null +++ b/poppler-24.05.0/utils/pdffonts.cc @@ -0,0 +1,166 @@ +//======================================================================== +// +// pdffonts.cc +// +// Copyright 2001-2007 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Dominic Lachowicz +// Copyright (C) 2007-2008, 2010, 2018, 2022 Albert Astals Cid +// Copyright (C) 2010 Hib Eris +// Copyright (C) 2012, 2017 Adrian Johnson +// Copyright (C) 2013 Suzuki Toshiya +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019, 2021 Oliver Sander +// +// 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" +#include +#include +#include +#include +#include +#include +#include +#include "parseargs.h" +#include "goo/GooString.h" +#include "goo/gmem.h" +#include "GlobalParams.h" +#include "Object.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "FontInfo.h" +#include "Win32Console.h" + +static const char *fontTypeNames[] = { "unknown", "Type 1", "Type 1C", "Type 1C (OT)", "Type 3", "TrueType", "TrueType (OT)", "CID Type 0", "CID Type 0C", "CID Type 0C (OT)", "CID TrueType", "CID TrueType (OT)" }; + +static int firstPage = 1; +static int lastPage = 0; +static bool showSubst = false; +static char ownerPassword[33] = "\001"; +static char userPassword[33] = "\001"; +static bool printVersion = false; +static bool printHelp = false; + +static const ArgDesc argDesc[] = { { "-f", argInt, &firstPage, 0, "first page to examine" }, + { "-l", argInt, &lastPage, 0, "last page to examine" }, + { "-subst", argFlag, &showSubst, 0, "show font substitutions" }, + { "-opw", argString, ownerPassword, sizeof(ownerPassword), "owner password (for encrypted files)" }, + { "-upw", argString, userPassword, sizeof(userPassword), "user password (for encrypted files)" }, + { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} }; + +int main(int argc, char *argv[]) +{ + std::optional ownerPW, userPW; + bool ok; + + Win32Console win32Console(&argc, &argv); + + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (!ok || argc != 2 || printVersion || printHelp) { + fprintf(stderr, "pdffonts version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", xpdfCopyright); + if (!printVersion) { + printUsage("pdffonts", "", argDesc); + } + if (printVersion || printHelp) { + return 0; + } + return 99; + } + + std::string fileName(argv[1]); + if (fileName == "-") { + fileName = "fd://0"; + } + + // read config file + globalParams = std::make_unique(); + + // open PDF file + if (ownerPassword[0] != '\001') { + ownerPW = GooString(ownerPassword); + } + if (userPassword[0] != '\001') { + userPW = GooString(userPassword); + } + + auto doc = std::unique_ptr(PDFDocFactory().createPDFDoc(GooString(fileName), ownerPW, userPW)); + + if (!doc->isOk()) { + return 1; + } + + // get page range + if (firstPage < 1) { + firstPage = 1; + } + if (lastPage < 1 || lastPage > doc->getNumPages()) { + lastPage = doc->getNumPages(); + } + if (lastPage < firstPage) { + fprintf(stderr, "Wrong page range given: the first page (%d) can not be after the last page (%d).\n", firstPage, lastPage); + return 99; + } + + // get the fonts + { + FontInfoScanner scanner(doc.get(), firstPage - 1); + const std::vector fonts = scanner.scan(lastPage - firstPage + 1); + + if (showSubst) { + // print the font substitutions + printf("name object ID substitute font substitute font file\n"); + printf("------------------------------------ --------- ------------------------------------ ------------------------------------\n"); + for (const FontInfo *font : fonts) { + if (font->getFile()) { + printf("%-36s", font->getName() ? font->getName()->c_str() : "[none]"); + const Ref fontRef = font->getRef(); + if (fontRef.gen >= 100000) { + printf(" [none]"); + } else { + printf(" %6d %2d", fontRef.num, fontRef.gen); + } + printf(" %-36s %s\n", font->getSubstituteName() ? font->getSubstituteName()->c_str() : "[none]", font->getFile()->c_str()); + } + delete font; + } + } else { + // print the font info + printf("name type encoding emb sub uni object ID\n"); + printf("------------------------------------ ----------------- ---------------- --- --- --- ---------\n"); + for (const FontInfo *font : fonts) { + printf("%-36s %-17s %-16s %-3s %-3s %-3s", font->getName() ? font->getName()->c_str() : "[none]", fontTypeNames[font->getType()], font->getEncoding().c_str(), font->getEmbedded() ? "yes" : "no", + font->getSubset() ? "yes" : "no", font->getToUnicode() ? "yes" : "no"); + const Ref fontRef = font->getRef(); + if (fontRef.gen >= 100000) { + printf(" [none]\n"); + } else { + printf(" %6d %2d\n", fontRef.num, fontRef.gen); + } + delete font; + } + } + } + + return 0; +} diff --git a/poppler-24.05.0/utils/pdfimages.1 b/poppler-24.05.0/utils/pdfimages.1 new file mode 100644 index 0000000000000000000000000000000000000000..1a5386a032d9173193ae60e750ca07f5df238e83 --- /dev/null +++ b/poppler-24.05.0/utils/pdfimages.1 @@ -0,0 +1,268 @@ +.\" Copyright 1998-2011 Glyph & Cog, LLC +.TH pdfimages 1 "15 August 2011" +.SH NAME +pdfimages \- Portable Document Format (PDF) image extractor +(version 3.03) +.SH SYNOPSIS +.B pdfimages +[options] +.I PDF-file image-root +.SH DESCRIPTION +.B Pdfimages +saves images from a Portable Document Format (PDF) file as Portable +Pixmap (PPM), Portable Bitmap (PBM), Portable Network Graphics (PNG), +Tagged Image File Format (TIFF), JPEG, JPEG2000, or JBIG2 files. +.PP +Pdfimages reads the PDF file +.IR PDF-file , +scans one or more pages, and writes one file for each image, +.IR image-root - nnn . xxx , +where +.I nnn +is the image number and +.I xxx +is the image type (.ppm, .pbm, .png, .tif, .jpg, jp2, jb2e, or jb2g). If +.I PDF-file +is \'-', it reads the PDF file from stdin. +.PP +The default output format is PBM (for monochrome images) or PPM for +non-monochrome. The \-png or \-tiff options change to default output +to PNG or TIFF respectively. If both \-png and \-tiff are specified, +CMYK images will be written as TIFF and all other images will be +written as PNG. In addition the \-j, \-jp2, and \-jbig2 options will +cause JPEG, JPEG2000, and JBIG2, respectively, images in the PDF file +to be written in their native format. +.SH OPTIONS +.TP +.BI \-f " number" +Specifies the first page to scan. +.TP +.BI \-l " number" +Specifies the last page to scan. +.TP +.B \-png +Change the default output format to PNG. +.TP +.B \-tiff +Change the default output format to TIFF. +.TP +.B \-j +Write images in JPEG format as JPEG files instead of the default format. The JPEG file is identical to the JPEG data stored in the PDF. +.TP +.B \-jp2 +Write images in JPEG2000 format as JP2 files instead of the default format. The JP2 file is identical to the JPEG2000 data stored in the PDF. +.TP +.B \-jbig2 +Write images in JBIG2 format as JBIG2 files instead of the default format. JBIG2 data in PDF is of the embedded type. The embedded type of JBIG2 has an optional separate file containing global data. The embedded data is written with the extension .jb2e and the global data (if available) will be written to the same image number with the extension .jb2g. The content of both these files is identical to the JBIG2 data in the PDF. +.TP +.B \-ccitt +Write images in CCITT format as CCITT files instead of the default +format. The CCITT file is identical to the CCITT data stored in the +PDF. PDF files contain additional parameters specifying +how to decode the CCITT data. These parameters are translated to +fax2tiff input options and written to a .params file with the same image +number. The parameters are: +.RS +.TP +.B \-1 +1D Group 3 encoding +.TP +.B \-2 +2D Group 3 encoding +.TP +.B \-4 +Group 4 encoding +.TP +.B \-A +Beginning of line is aligned on a byte boundary +.TP +.B \-P +Beginning of line is not aligned on a byte boundary +.TP +.B \-X n +The image width in pixels +.TP +.B \-W +Encoding uses 1 for black and 0 for white +.TP +.B \-B +Encoding uses 0 for black and 1 for white +.TP +.B \-M +Input data fills from most significant bit to least significant bit. +.RE +.TP +.B \-all +Write JPEG, JPEG2000, JBIG2, and CCITT images in their native format. CMYK files are written as TIFF files. All other images are written as PNG files. +This is equivalent to specifying the options \-png \-tiff \-j \-jp2 \-jbig2 \-ccitt. +.TP +.B \-list +Instead of writing the images, list the images along with various information for each image. Do not specify an +.IR image-root +with this option. +.IP +The following information is listed for each image: +.RS +.TP +.B page +the page number containing the image +.TP +.B num +the image number +.TP +.B type +the image type: +.PP +.RS +image - an opaque image +.RE +.RS +mask - a monochrome mask image +.RE +.RS +smask - a soft-mask image +.RE +.RS +stencil - a monochrome mask image used for painting a color or pattern +.RE +.PP +Note: Tranparency in images is represented in PDF using a separate image for the image and the mask/smask. +The mask/smask used as part of a transparent image always immediately follows the image in the image list. +.TP +.B width +image width (in pixels) +.TP +.B height +image height (in pixels) +.PP +Note: the image width/height is the size of the embedded image, not the size the image will be rendered at. +.TP +.B color +image color space: +.PP +.RS +gray - Gray +.RE +.RS +rgb - RGB +.RE +.RS +cmyk - CMYK +.RE +.RS +lab - L*a*b +.RE +.RS +icc - ICC Based +.RE +.RS +index - Indexed Color +.RE +.RS +sep - Separation +.RE +.RS +devn - DeviceN +.RE +.TP +.B comp +number of color components +.TP +.B bpc +bits per component +.TP +.B enc +encoding: +.PP +.RS +image - raster image (may be Flate or LZW compressed but does not use an image encoding) +.RE +.RS +jpeg - Joint Photographic Experts Group +.RE +.RS +jp2 - JPEG2000 +.RE +.RS +jbig2 - Joint Bi-Level Image Experts Group +.RE +.RS +ccitt - CCITT Group 3 or Group 4 Fax +.RE +.TP +.B interp +"yes" if the interpolation is to be performed when scaling up the image +.TP +.B object ID +the image dictionary object ID (number and generation) +.TP +.B x\-ppi +The horizontal resolution of the image (in pixels per inch) when rendered on the pdf page. +.TP +.B y\-ppi +The vertical resolution of the image (in pixels per inch) when rendered on the pdf page. +.TP +.B size +The size of the embedded image in the pdf file. The following suffixes are used: 'B' bytes, 'K' kilobytes, 'M' megabytes, and 'G' gigabytes. +.TP +.B ratio +The compression ratio of the embedded image. +.RE +.TP +.BI \-opw " password" +Specify the owner password for the PDF file. Providing this will +bypass all security restrictions. +.TP +.BI \-upw " password" +Specify the user password for the PDF file. +.TP +.B \-p +Include page numbers in output file names. +.TP +.B \-print\-filenames +Print image filenames to stdout. +.TP +.B \-q +Don't print any messages or errors. +.TP +.B \-v +Print copyright and version information. +.TP +.B \-h +Print usage information. +.RB ( \-help +and +.B \-\-help +are equivalent.) +.SH EXIT CODES +The Xpdf tools use the following exit codes: +.TP +0 +No error. +.TP +1 +Error opening a PDF file. +.TP +2 +Error opening an output file. +.TP +3 +Error related to PDF permissions. +.TP +99 +Other error. +.SH AUTHOR +The pdfimages software and documentation are copyright 1998-2011 Glyph +& Cog, LLC. +.SH "SEE ALSO" +.BR pdfdetach (1), +.BR pdffonts (1), +.BR pdfinfo (1), +.BR pdftocairo (1), +.BR pdftohtml (1), +.BR pdftoppm (1), +.BR pdftops (1), +.BR pdftotext (1) +.BR pdfseparate (1), +.BR pdfsig (1), +.BR pdfunite (1) diff --git a/poppler-24.05.0/utils/pdfimages.cc b/poppler-24.05.0/utils/pdfimages.cc new file mode 100644 index 0000000000000000000000000000000000000000..f208377ce69c4bc08f604d3c17bb4b7953f73e13 --- /dev/null +++ b/poppler-24.05.0/utils/pdfimages.cc @@ -0,0 +1,200 @@ +//======================================================================== +// +// pdfimages.cc +// +// Copyright 1998-2003 Glyph & Cog, LLC +// +// Modified for Debian by Hamish Moffatt, 22 May 2002. +// +//======================================================================== + +//======================================================================== +// +// 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) 2007-2008, 2010, 2018, 2022, 2024 Albert Astals Cid +// Copyright (C) 2010 Hib Eris +// Copyright (C) 2010 Jakob Voss +// Copyright (C) 2012, 2013, 2017 Adrian Johnson +// Copyright (C) 2013 Suzuki Toshiya +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019, 2021 Oliver Sander +// Copyright (C) 2019 Hartmut Goebel +// Copyright (C) 2024 Fernando Herrera +// Copyright (C) 2024 Sebastian J. Bronner +// +// 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" +#include +#include +#include +#include +#include +#include "parseargs.h" +#include "goo/GooString.h" +#include "goo/gmem.h" +#include "GlobalParams.h" +#include "Object.h" +#include "Stream.h" +#include "Array.h" +#include "Dict.h" +#include "XRef.h" +#include "Catalog.h" +#include "Page.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "ImageOutputDev.h" +#include "Error.h" +#include "Win32Console.h" + +static int firstPage = 1; +static int lastPage = 0; +static bool listImages = false; +static bool enablePNG = false; +static bool enableTiff = false; +static bool dumpJPEG = false; +static bool dumpJP2 = false; +static bool dumpJBIG2 = false; +static bool dumpCCITT = false; +static bool allFormats = false; +static bool pageNames = false; +static bool printFilenames = false; +static char ownerPassword[33] = "\001"; +static char userPassword[33] = "\001"; +static bool quiet = false; +static bool printVersion = false; +static bool printHelp = false; + +static const ArgDesc argDesc[] = { { "-f", argInt, &firstPage, 0, "first page to convert" }, + { "-l", argInt, &lastPage, 0, "last page to convert" }, +#ifdef ENABLE_LIBPNG + { "-png", argFlag, &enablePNG, 0, "change the default output format to PNG" }, +#endif +#ifdef ENABLE_LIBTIFF + { "-tiff", argFlag, &enableTiff, 0, "change the default output format to TIFF" }, +#endif + { "-j", argFlag, &dumpJPEG, 0, "write JPEG images as JPEG files" }, + { "-jp2", argFlag, &dumpJP2, 0, "write JPEG2000 images as JP2 files" }, + { "-jbig2", argFlag, &dumpJBIG2, 0, "write JBIG2 images as JBIG2 files" }, + { "-ccitt", argFlag, &dumpCCITT, 0, "write CCITT images as CCITT files" }, + { "-all", argFlag, &allFormats, 0, "equivalent to -png -tiff -j -jp2 -jbig2 -ccitt" }, + { "-list", argFlag, &listImages, 0, "print list of images instead of saving" }, + { "-opw", argString, ownerPassword, sizeof(ownerPassword), "owner password (for encrypted files)" }, + { "-upw", argString, userPassword, sizeof(userPassword), "user password (for encrypted files)" }, + { "-p", argFlag, &pageNames, 0, "include page numbers in output file names" }, + { "-print-filenames", argFlag, &printFilenames, 0, "print image filenames to stdout" }, + { "-q", argFlag, &quiet, 0, "don't print any messages or errors" }, + { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} }; + +int main(int argc, char *argv[]) +{ + char *imgRoot = nullptr; + std::optional ownerPW, userPW; + + Win32Console win32Console(&argc, &argv); + + // parse args + const bool ok = parseArgs(argDesc, &argc, argv); + if (!ok || (listImages && argc != 2) || (!listImages && argc != 3) || printVersion || printHelp) { + fprintf(stderr, "pdfimages version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", xpdfCopyright); + if (!printVersion) { + printUsage("pdfimages", " ", argDesc); + } + if (printVersion || printHelp) { + return 0; + } + return 99; + } + GooString *fileName = new GooString(argv[1]); + if (!listImages) { + imgRoot = argv[2]; + } + + // read config file + globalParams = std::make_unique(); + if (quiet) { + globalParams->setErrQuiet(quiet); + } + + // open PDF file + if (ownerPassword[0] != '\001') { + ownerPW = GooString(ownerPassword); + } + if (userPassword[0] != '\001') { + userPW = GooString(userPassword); + } + if (fileName->cmp("-") == 0) { + delete fileName; + fileName = new GooString("fd://0"); + } + + std::unique_ptr doc = PDFDocFactory().createPDFDoc(*fileName, ownerPW, userPW); + delete fileName; + + if (!doc->isOk()) { + return 1; + } + + // check for copy permission +#ifdef ENFORCE_PERMISSIONS + if (!doc->okToCopy()) { + error(errNotAllowed, -1, "Copying of images from this document is not allowed."); + return 3; + } +#endif + + // get page range + if (firstPage < 1) { + firstPage = 1; + } + if (firstPage > doc->getNumPages()) { + error(errCommandLine, -1, "Wrong page range given: the first page ({0:d}) can not be larger then the number of pages in the document ({1:d}).", firstPage, doc->getNumPages()); + return 99; + } + if (lastPage < 1 || lastPage > doc->getNumPages()) { + lastPage = doc->getNumPages(); + } + if (lastPage < firstPage) { + error(errCommandLine, -1, "Wrong page range given: the first page ({0:d}) can not be after the last page ({1:d}).", firstPage, lastPage); + return 99; + } + + // write image files + ImageOutputDev *imgOut = new ImageOutputDev(imgRoot, pageNames, listImages); + if (imgOut->isOk()) { + if (allFormats) { + imgOut->enablePNG(true); + imgOut->enableTiff(true); + imgOut->enableJpeg(true); + imgOut->enableJpeg2000(true); + imgOut->enableJBig2(true); + imgOut->enableCCITT(true); + } else { + imgOut->enablePNG(enablePNG); + imgOut->enableTiff(enableTiff); + imgOut->enableJpeg(dumpJPEG); + imgOut->enableJpeg2000(dumpJP2); + imgOut->enableJBig2(dumpJBIG2); + imgOut->enableCCITT(dumpCCITT); + } + imgOut->enablePrintFilenames(printFilenames); + doc->displayPages(imgOut, firstPage, lastPage, 72, 72, 0, true, false, false); + } + const int exitCode = imgOut->isOk() ? 0 : imgOut->getErrorCode(); + delete imgOut; + return exitCode; +} diff --git a/poppler-24.05.0/utils/pdfinfo.1 b/poppler-24.05.0/utils/pdfinfo.1 new file mode 100644 index 0000000000000000000000000000000000000000..2a17bbd50524eea38fdf68d77dfb0d3ae3231201 --- /dev/null +++ b/poppler-24.05.0/utils/pdfinfo.1 @@ -0,0 +1,198 @@ +.\" Copyright 1999-2011 Glyph & Cog, LLC +.TH pdfinfo 1 "15 August 2011" +.SH NAME +pdfinfo \- Portable Document Format (PDF) document information +extractor (version 3.03) +.SH SYNOPSIS +.B pdfinfo +[options] +.RI [ PDF-file ] +.SH DESCRIPTION +.B Pdfinfo +prints the contents of the \'Info' dictionary (plus some other useful +information) from a Portable Document Format (PDF) file. +.PP +If +.I PDF-file +is \'-', it reads the PDF file from stdin. +.PP +The \'Info' dictionary contains the following values: +.PP +.RS +title +.RE +.RS +subject +.RE +.RS +keywords +.RE +.RS +author +.RE +.RS +creator +.RE +.RS +producer +.RE +.RS +creation date +.RE +.RS +modification date +.RE +.PP +In addition, the following information is printed: +.PP +.RS +custom metadata (yes/no) +.RE +.RS +metadata stream (yes/no) +.RE +.RS +tagged (yes/no) +.RE +.RS +userproperties (yes/no) +.RE +.RS +suspects (yes/no) +.RE +.RS +form (AcroForm / XFA / none) +.RE +.RS +javascript (yes/no) +.RE +.RS +page count +.RE +.RS +encrypted flag (yes/no) +.RE +.RS +print and copy permissions (if encrypted) +.RE +.RS +page size +.RE +.RS +file size +.RE +.RS +linearized (yes/no) +.RE +.RS +PDF version +.RE +.RS +metadata (only if requested) +.RE +.PP +The options \-listenc, \-meta, \-js, \-struct, and \-struct-text only print the requested information. The 'Info' dictionary and related data listed above is not printed. At most one of these five options may be used. +.SH OPTIONS +.TP +.BI \-f " number" +Specifies the first page to examine. If multiple pages are requested +using the "\-f" and "\-l" options, the size of each requested page (and, +optionally, the bounding boxes for each requested page) are printed. +Otherwise, only page one is examined. +.TP +.BI \-l " number" +Specifies the last page to examine. +.TP +.B \-box +Prints the page box bounding boxes: MediaBox, CropBox, BleedBox, +TrimBox, and ArtBox. +.TP +.B \-meta +Prints document-level metadata. (This is the "Metadata" stream from +the PDF file's Catalog object.) +.TP +.B \-custom +Prints custom and standard metadata. +.TP +.B \-js +Prints all JavaScript in the PDF. +.TP +.B \-struct +Prints the logical document structure of a Tagged-PDF file. +.TP +.B \-struct-text +Print the textual content along with the document structure of a Tagged-PDF +file. Note that extracting text this way might be slow for big PDF files. +(Implies +.BR \-struct .) +.TP +.B \-url +Print all URLs in the PDF. Only the URL types supported by Poppler are listed. +Currently, this is limited to Annotations. Note: only URLs referenced by the PDF objects +such as Link Annotations are listed. pdfinfo does not attempt to extract strings +matching http://... from the text content. +.TP +.B \-isodates +Prints dates in ISO-8601 format (including the time zone). +.TP +.B \-rawdates +Prints the raw (undecoded) date strings, directly from the PDF file. +.TP +.B \-dests +Print a list of all named destinations. If a page range is specified using "\-f" and "\-l", only +destinations in the page range are listed. +.TP +.BI \-enc " encoding-name" +Sets the encoding to use for text output. This defaults to "UTF-8". +.TP +.B \-listenc +Lits the available encodings +.TP +.BI \-opw " password" +Specify the owner password for the PDF file. Providing this will +bypass all security restrictions. +.TP +.BI \-upw " password" +Specify the user password for the PDF file. +.TP +.B \-v +Print copyright and version information. +.TP +.B \-h +Print usage information. +.RB ( \-help +and +.B \-\-help +are equivalent.) +.SH EXIT CODES +The Xpdf tools use the following exit codes: +.TP +0 +No error. +.TP +1 +Error opening a PDF file. +.TP +2 +Error opening an output file. +.TP +3 +Error related to PDF permissions. +.TP +99 +Other error. +.SH AUTHOR +The pdfinfo software and documentation are copyright 1996-2011 Glyph & +Cog, LLC. +.SH "SEE ALSO" +.BR pdfdetach (1), +.BR pdffonts (1), +.BR pdfimages (1), +.BR pdftocairo (1), +.BR pdftohtml (1), +.BR pdftoppm (1), +.BR pdftops (1), +.BR pdftotext (1) +.BR pdfseparate (1), +.BR pdfsig (1), +.BR pdfunite (1) diff --git a/poppler-24.05.0/utils/pdfinfo.cc b/poppler-24.05.0/utils/pdfinfo.cc new file mode 100644 index 0000000000000000000000000000000000000000..5d37ef64fa0c257a7a7201557fefa3e6e7714401 --- /dev/null +++ b/poppler-24.05.0/utils/pdfinfo.cc @@ -0,0 +1,1061 @@ +//======================================================================== +// +// pdfinfo.cc +// +// Copyright 1998-2003 Glyph & Cog, LLC +// Copyright 2013 Igalia S.L. +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Dom Lachowicz +// Copyright (C) 2007-2010, 2012, 2016-2022 Albert Astals Cid +// Copyright (C) 2010 Hib Eris +// Copyright (C) 2011 Vittal Aithal +// Copyright (C) 2012, 2013, 2016-2018, 2021 Adrian Johnson +// Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2013 Adrian Perez de Castro +// Copyright (C) 2013 Suzuki Toshiya +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2018 Evangelos Rigas +// Copyright (C) 2019 Christian Persch +// Copyright (C) 2019-2021 Oliver Sander +// Copyright (C) 2019 Thomas Fischer +// Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// 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" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "parseargs.h" +#include "printencodings.h" +#include "goo/GooString.h" +#include "goo/gfile.h" +#include "goo/glibc.h" +#include "goo/gmem.h" +#include "GlobalParams.h" +#include "Object.h" +#include "Stream.h" +#include "Array.h" +#include "Dict.h" +#include "XRef.h" +#include "Catalog.h" +#include "Page.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "CharTypes.h" +#include "UnicodeMap.h" +#include "UTF.h" +#include "Error.h" +#include "DateInfo.h" +#include "JSInfo.h" +#include "StructTreeRoot.h" +#include "StructElement.h" +#include "Win32Console.h" + +static int firstPage = 1; +static int lastPage = 0; +static bool printBoxes = false; +static bool printMetadata = false; +static bool printCustom = false; +static bool printJS = false; +static bool isoDates = false; +static bool rawDates = false; +static char textEncName[128] = ""; +static char ownerPassword[33] = "\001"; +static char userPassword[33] = "\001"; +static bool printVersion = false; +static bool printHelp = false; +static bool printEnc = false; +static bool printStructure = false; +static bool printStructureText = false; +static bool printDests = false; +static bool printUrls = false; + +static const ArgDesc argDesc[] = { { "-f", argInt, &firstPage, 0, "first page to convert" }, + { "-l", argInt, &lastPage, 0, "last page to convert" }, + { "-box", argFlag, &printBoxes, 0, "print the page bounding boxes" }, + { "-meta", argFlag, &printMetadata, 0, "print the document metadata (XML)" }, + { "-custom", argFlag, &printCustom, 0, "print both custom and standard metadata" }, + { "-js", argFlag, &printJS, 0, "print all JavaScript in the PDF" }, + { "-struct", argFlag, &printStructure, 0, "print the logical document structure (for tagged files)" }, + { "-struct-text", argFlag, &printStructureText, 0, "print text contents along with document structure (for tagged files)" }, + { "-isodates", argFlag, &isoDates, 0, "print the dates in ISO-8601 format" }, + { "-rawdates", argFlag, &rawDates, 0, "print the undecoded date strings directly from the PDF file" }, + { "-dests", argFlag, &printDests, 0, "print all named destinations in the PDF" }, + { "-url", argFlag, &printUrls, 0, "print all URLs inside PDF objects (does not scan text content)" }, + { "-enc", argString, textEncName, sizeof(textEncName), "output text encoding name" }, + { "-listenc", argFlag, &printEnc, 0, "list available encodings" }, + { "-opw", argString, ownerPassword, sizeof(ownerPassword), "owner password (for encrypted files)" }, + { "-upw", argString, userPassword, sizeof(userPassword), "user password (for encrypted files)" }, + { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} }; + +static void printTextString(const GooString *s, const UnicodeMap *uMap) +{ + char buf[8]; + std::vector u = TextStringToUCS4(s->toStr()); + for (const auto &c : u) { + int n = uMap->mapUnicode(c, buf, sizeof(buf)); + fwrite(buf, 1, n, stdout); + } +} + +static void printUCS4String(const Unicode *u, int len, const UnicodeMap *uMap) +{ + char buf[8]; + for (int i = 0; i < len; i++) { + int n = uMap->mapUnicode(u[i], buf, sizeof(buf)); + fwrite(buf, 1, n, stdout); + } +} + +static void printInfoString(Dict *infoDict, const char *key, const char *text, const UnicodeMap *uMap) +{ + const GooString *s1; + + Object obj = infoDict->lookup(key); + if (obj.isString()) { + fputs(text, stdout); + s1 = obj.getString(); + printTextString(s1, uMap); + fputc('\n', stdout); + } +} + +static void printInfoDate(Dict *infoDict, const char *key, const char *text, const UnicodeMap *uMap) +{ + int year, mon, day, hour, min, sec, tz_hour, tz_minute; + char tz; + struct tm tmStruct; + time_t time; + char buf[256]; + + Object obj = infoDict->lookup(key); + if (obj.isString()) { + fputs(text, stdout); + const GooString *s = obj.getString(); + // TODO do something with the timezone info + if (parseDateString(s, &year, &mon, &day, &hour, &min, &sec, &tz, &tz_hour, &tz_minute)) { + tmStruct.tm_year = year - 1900; + tmStruct.tm_mon = mon - 1; + tmStruct.tm_mday = day; + tmStruct.tm_hour = hour; + tmStruct.tm_min = min; + tmStruct.tm_sec = sec; + tmStruct.tm_wday = -1; + tmStruct.tm_yday = -1; + tmStruct.tm_isdst = -1; + // compute the tm_wday and tm_yday fields + time = timegm(&tmStruct); + if (time != (time_t)-1) { + int offset = (tz_hour * 60 + tz_minute) * 60; + if (tz == '-') { + offset *= -1; + } + time -= offset; + localtime_r(&time, &tmStruct); + strftime(buf, sizeof(buf), "%c %Z", &tmStruct); + fputs(buf, stdout); + } else { + printTextString(s, uMap); + } + } else { + printTextString(s, uMap); + } + fputc('\n', stdout); + } +} + +static void printISODate(Dict *infoDict, const char *key, const char *text, const UnicodeMap *uMap) +{ + int year, mon, day, hour, min, sec, tz_hour, tz_minute; + char tz; + + Object obj = infoDict->lookup(key); + if (obj.isString()) { + fputs(text, stdout); + const GooString *s = obj.getString(); + if (parseDateString(s, &year, &mon, &day, &hour, &min, &sec, &tz, &tz_hour, &tz_minute)) { + fprintf(stdout, "%04d-%02d-%02dT%02d:%02d:%02d", year, mon, day, hour, min, sec); + if (tz_hour == 0 && tz_minute == 0) { + fprintf(stdout, "Z"); + } else { + fprintf(stdout, "%c%02d", tz, tz_hour); + if (tz_minute) { + fprintf(stdout, ":%02d", tz_minute); + } + } + } else { + printTextString(obj.getString(), uMap); + } + fputc('\n', stdout); + } +} + +static void printBox(const char *text, const PDFRectangle *box) +{ + printf("%s%8.2f %8.2f %8.2f %8.2f\n", text, box->x1, box->y1, box->x2, box->y2); +} + +static void printIndent(unsigned indent) +{ + while (indent--) { + putchar(' '); + putchar(' '); + } +} + +static void printAttribute(const Attribute *attribute, unsigned indent) +{ + printIndent(indent); + printf(" /%s ", attribute->getTypeName()); + if (attribute->getType() == Attribute::UserProperty) { + std::unique_ptr name = attribute->getName(); + printf("(%s) ", name->c_str()); + } + attribute->getValue()->print(stdout); + if (attribute->getFormattedValue()) { + printf(" \"%s\"", attribute->getFormattedValue()); + } + if (attribute->isHidden()) { + printf(" [hidden]"); + } +} + +static void printStruct(const StructElement *element, unsigned indent) +{ + if (element->isObjectRef()) { + printIndent(indent); + printf("Object %i %i\n", element->getObjectRef().num, element->getObjectRef().gen); + return; + } + + if (printStructureText && element->isContent()) { + GooString *text = element->getText(false); + printIndent(indent); + if (text) { + printf("\"%s\"\n", text->c_str()); + } else { + printf("(No content?)\n"); + } + delete text; + } + + if (!element->isContent()) { + printIndent(indent); + printf("%s", element->getTypeName()); + if (element->getID()) { + printf(" <%s>", element->getID()->c_str()); + } + if (element->getTitle()) { + printf(" \"%s\"", element->getTitle()->c_str()); + } + if (element->getRevision() > 0) { + printf(" r%u", element->getRevision()); + } + if (element->isInline() || element->isBlock()) { + printf(" (%s)", element->isInline() ? "inline" : "block"); + } + if (element->getNumAttributes()) { + putchar(':'); + for (unsigned i = 0; i < element->getNumAttributes(); i++) { + putchar('\n'); + printAttribute(element->getAttribute(i), indent + 1); + } + } + + putchar('\n'); + for (unsigned i = 0; i < element->getNumChildren(); i++) { + printStruct(element->getChild(i), indent + 1); + } + } +} + +struct GooStringCompare +{ + bool operator()(GooString *lhs, GooString *rhs) const { return lhs->cmp(const_cast(rhs)) < 0; } +}; + +static void printLinkDest(const std::unique_ptr &dest) +{ + GooString s; + + switch (dest->getKind()) { + case destXYZ: + s.append("[ XYZ "); + if (dest->getChangeLeft()) { + s.appendf("{0:4.0g} ", dest->getLeft()); + } else { + s.append("null "); + } + if (dest->getChangeTop()) { + s.appendf("{0:4.0g} ", dest->getTop()); + } else { + s.append("null "); + } + if (dest->getChangeZoom()) { + s.appendf("{0:4.2f} ", dest->getZoom()); + } else { + s.append("null "); + } + break; + case destFit: + s.append("[ Fit "); + break; + case destFitH: + if (dest->getChangeTop()) { + s.appendf("[ FitH {0:4.0g} ", dest->getTop()); + } else { + s.append("[ FitH null "); + } + break; + case destFitV: + if (dest->getChangeLeft()) { + s.appendf("[ FitV {0:4.0g} ", dest->getLeft()); + } else { + s.append("[ FitV null "); + } + break; + case destFitR: + s.appendf("[ FitR {0:4.0g} {1:4.0g} {2:4.0g} {3:4.0g} ", dest->getLeft(), dest->getBottom(), dest->getRight(), dest->getTop()); + break; + case destFitB: + s.append("[ FitB "); + break; + case destFitBH: + if (dest->getChangeTop()) { + s.appendf("[ FitBH {0:4.0g} ", dest->getTop()); + } else { + s.append("[ FitBH null "); + } + break; + case destFitBV: + if (dest->getChangeLeft()) { + s.appendf("[ FitBV {0:4.0g} ", dest->getLeft()); + } else { + s.append("[ FitBV null "); + } + break; + } + + s.append(" "); + s.setChar(26, ']'); + s.setChar(27, '\0'); + printf("%s", s.c_str()); +} + +static void printDestinations(PDFDoc *doc, const UnicodeMap *uMap) +{ + std::map, GooStringCompare>> map; + + int numDests = doc->getCatalog()->numDestNameTree(); + for (int i = 0; i < numDests; i++) { + GooString *name = new GooString(doc->getCatalog()->getDestNameTreeName(i)); + std::unique_ptr dest = doc->getCatalog()->getDestNameTreeDest(i); + if (dest && dest->isPageRef()) { + Ref pageRef = dest->getPageRef(); + map[pageRef].insert(std::make_pair(name, std::move(dest))); + } else { + delete name; + } + } + + numDests = doc->getCatalog()->numDests(); + for (int i = 0; i < numDests; i++) { + GooString *name = new GooString(doc->getCatalog()->getDestsName(i)); + std::unique_ptr dest = doc->getCatalog()->getDestsDest(i); + if (dest && dest->isPageRef()) { + Ref pageRef = dest->getPageRef(); + map[pageRef].insert(std::make_pair(name, std::move(dest))); + } else { + delete name; + } + } + + printf("Page Destination Name\n"); + for (int i = firstPage; i <= lastPage; i++) { + Ref *ref = doc->getCatalog()->getPageRef(i); + if (ref) { + auto pageDests = map.find(*ref); + if (pageDests != map.end()) { + for (auto &it : pageDests->second) { + printf("%4d ", i); + printLinkDest(it.second); + printf(" \""); + printTextString(it.first, uMap); + printf("\"\n"); + delete it.first; + } + } + } + } +} + +static void printUrlList(PDFDoc *doc) +{ + printf("Page Type URL\n"); + for (int pg = firstPage; pg <= lastPage; pg++) { + Page *page = doc->getPage(pg); + if (page) { + std::unique_ptr links = page->getLinks(); + for (AnnotLink *annot : links->getLinks()) { + LinkAction *action = annot->getAction(); + if (action->getKind() == actionURI) { + LinkURI *linkUri = dynamic_cast(action); + std::string uri = linkUri->getURI(); + printf("%4d Annotation %s\n", pg, uri.c_str()); + } + } + } + } +} + +static void printPdfSubtype(PDFDoc *doc, const UnicodeMap *uMap) +{ + const Object info = doc->getDocInfo(); + if (info.isDict()) { + const PDFSubtype pdftype = doc->getPDFSubtype(); + + if ((pdftype == subtypeNull) | (pdftype == subtypeNone)) { + return; + } + + std::unique_ptr part; + std::unique_ptr abbr; + std::unique_ptr standard; + std::unique_ptr typeExp; + std::unique_ptr confExp; + + // Form title from PDFSubtype + switch (pdftype) { + case subtypePDFA: + printInfoString(info.getDict(), "GTS_PDFA1Version", "PDF subtype: ", uMap); + typeExp = std::make_unique("ISO 19005 - Electronic document file format for long-term preservation (PDF/A)"); + standard = std::make_unique("ISO 19005"); + abbr = std::make_unique("PDF/A"); + break; + case subtypePDFE: + printInfoString(info.getDict(), "GTS_PDFEVersion", "PDF subtype: ", uMap); + typeExp = std::make_unique("ISO 24517 - Engineering document format using PDF (PDF/E)"); + standard = std::make_unique("ISO 24517"); + abbr = std::make_unique("PDF/E"); + break; + case subtypePDFUA: + printInfoString(info.getDict(), "GTS_PDFUAVersion", "PDF subtype: ", uMap); + typeExp = std::make_unique("ISO 14289 - Electronic document file format enhancement for accessibility (PDF/UA)"); + standard = std::make_unique("ISO 14289"); + abbr = std::make_unique("PDF/UA"); + break; + case subtypePDFVT: + printInfoString(info.getDict(), "GTS_PDFVTVersion", "PDF subtype: ", uMap); + typeExp = std::make_unique("ISO 16612 - Electronic document file format for variable data exchange (PDF/VT)"); + standard = std::make_unique("ISO 16612"); + abbr = std::make_unique("PDF/VT"); + break; + case subtypePDFX: + printInfoString(info.getDict(), "GTS_PDFXVersion", "PDF subtype: ", uMap); + typeExp = std::make_unique("ISO 15930 - Electronic document file format for prepress digital data exchange (PDF/X)"); + standard = std::make_unique("ISO 15930"); + abbr = std::make_unique("PDF/X"); + break; + case subtypeNone: + case subtypeNull: + default: + return; + } + + // Form the abbreviation from PDFSubtypePart and PDFSubtype + const PDFSubtypePart subpart = doc->getPDFSubtypePart(); + switch (pdftype) { + case subtypePDFX: + switch (subpart) { + case subtypePart1: + abbr->append("-1:2001"); + break; + case subtypePart2: + abbr->append("-2"); + break; + case subtypePart3: + abbr->append("-3:2002"); + break; + case subtypePart4: + abbr->append("-1:2003"); + break; + case subtypePart5: + abbr->append("-2"); + break; + case subtypePart6: + abbr->append("-3:2003"); + break; + case subtypePart7: + abbr->append("-4"); + break; + case subtypePart8: + abbr->append("-5"); + break; + default: + break; + } + break; + case subtypeNone: + case subtypeNull: + break; + default: + abbr->appendf("-{0:d}", subpart); + break; + } + + // Form standard from PDFSubtypePart + switch (subpart) { + case subtypePartNone: + case subtypePartNull: + break; + default: + standard->appendf("-{0:d}", subpart); + break; + } + + // Form the subtitle from PDFSubtypePart and PDFSubtype + switch (pdftype) { + case subtypePDFA: + switch (subpart) { + case subtypePart1: + part = std::make_unique("Use of PDF 1.4"); + break; + case subtypePart2: + part = std::make_unique("Use of ISO 32000-1"); + break; + case subtypePart3: + part = std::make_unique("Use of ISO 32000-1 with support for embedded files"); + break; + default: + break; + } + break; + case subtypePDFE: + switch (subpart) { + case subtypePart1: + part = std::make_unique("Use of PDF 1.6"); + break; + default: + break; + } + break; + case subtypePDFUA: + switch (subpart) { + case subtypePart1: + part = std::make_unique("Use of ISO 32000-1"); + break; + case subtypePart2: + part = std::make_unique("Use of ISO 32000-2"); + break; + case subtypePart3: + part = std::make_unique("Use of ISO 32000-1 with support for embedded files"); + break; + default: + break; + } + break; + case subtypePDFVT: + switch (subpart) { + case subtypePart1: + part = std::make_unique("Using PPML 2.1 and PDF 1.4"); + break; + case subtypePart2: + part = std::make_unique("Using PDF/X-4 and PDF/X-5 (PDF/VT-1 and PDF/VT-2)"); + break; + case subtypePart3: + part = std::make_unique("Using PDF/X-6 (PDF/VT-3)"); + break; + default: + break; + } + break; + case subtypePDFX: + switch (subpart) { + case subtypePart1: + part = std::make_unique("Complete exchange using CMYK data (PDF/X-1 and PDF/X-1a)"); + break; + case subtypePart3: + part = std::make_unique("Complete exchange suitable for colour-managed workflows (PDF/X-3)"); + break; + case subtypePart4: + part = std::make_unique("Complete exchange of CMYK and spot colour printing data using PDF 1.4 (PDF/X-1a)"); + break; + case subtypePart5: + part = std::make_unique("Partial exchange of printing data using PDF 1.4 (PDF/X-2) [Withdrawn]"); + break; + case subtypePart6: + part = std::make_unique("Complete exchange of printing data suitable for colour-managed workflows using PDF 1.4 (PDF/X-3)"); + break; + case subtypePart7: + part = std::make_unique("Complete exchange of printing data (PDF/X-4) and partial exchange of printing data with external profile reference (PDF/X-4p) using PDF 1.6"); + break; + case subtypePart8: + part = std::make_unique("Partial exchange of printing data using PDF 1.6 (PDF/X-5)"); + break; + default: + break; + } + break; + default: + break; + } + + // Form Conformance explanation from PDFSubtypeConformance + switch (doc->getPDFSubtypeConformance()) { + case subtypeConfA: + confExp = std::make_unique("Level A, Accessible"); + break; + case subtypeConfB: + confExp = std::make_unique("Level B, Basic"); + break; + case subtypeConfG: + confExp = std::make_unique("Level G, External graphical content"); + break; + case subtypeConfN: + confExp = std::make_unique("Level N, External ICC profile"); + break; + case subtypeConfP: + confExp = std::make_unique("Level P, Embedded ICC profile"); + break; + case subtypeConfPG: + confExp = std::make_unique("Level PG, Embedded ICC profile and external graphical content"); + break; + case subtypeConfU: + confExp = std::make_unique("Level U, Unicode support"); + break; + case subtypeConfNone: + case subtypeConfNull: + default: + confExp.reset(); + break; + } + + printf(" Title: %s\n", typeExp->c_str()); + printf(" Abbreviation: %s\n", abbr->c_str()); + if (part.get()) { + printf(" Subtitle: Part %d: %s\n", subpart, part->c_str()); + } else { + printf(" Subtitle: Part %d\n", subpart); + } + printf(" Standard: %s-%d\n", typeExp->toStr().substr(0, 9).c_str(), subpart); + if (confExp.get()) { + printf(" Conformance: %s\n", confExp->c_str()); + } + } +} + +static void printCustomInfo(PDFDoc *doc, const UnicodeMap *uMap) +{ + Object info = doc->getDocInfo(); + if (info.isDict()) { + Dict *dict = info.getDict(); + + // Sort keys + std::set keys; + for (int i = 0; i < dict->getLength(); i++) { + std::string key(dict->getKey(i)); + if (key != "Trapped") { + keys.insert(key); + } + } + + for (const std::string &key : keys) { + if (key == "CreationDate") { + if (isoDates) { + printISODate(info.getDict(), "CreationDate", "CreationDate: ", uMap); + } else if (rawDates) { + printInfoString(info.getDict(), "CreationDate", "CreationDate: ", uMap); + } else { + printInfoDate(info.getDict(), "CreationDate", "CreationDate: ", uMap); + } + } else if (key == "ModDate") { + if (isoDates) { + printISODate(info.getDict(), "ModDate", "ModDate: ", uMap); + } else if (rawDates) { + printInfoString(info.getDict(), "ModDate", "ModDate: ", uMap); + } else { + printInfoDate(info.getDict(), "ModDate", "ModDate: ", uMap); + } + } else { + Object obj = dict->lookup(key.c_str()); + if (obj.isString()) { + // print key + Unicode *u; + int len = utf8ToUCS4(key.c_str(), &u); + printUCS4String(u, len, uMap); + fputs(":", stdout); + while (len < 16) { + fputs(" ", stdout); + len++; + } + gfree(u); + + // print value + GooString val_str(obj.getString()); + printTextString(&val_str, uMap); + fputc('\n', stdout); + } + } + } + } +} + +static void printInfo(PDFDoc *doc, const UnicodeMap *uMap, long long filesize, bool multiPage) +{ + Page *page; + char buf[256]; + double w, h, wISO, hISO, isoThreshold; + int pg, i; + int r; + + // print doc info + Object info = doc->getDocInfo(); + if (info.isDict()) { + printInfoString(info.getDict(), "Title", "Title: ", uMap); + printInfoString(info.getDict(), "Subject", "Subject: ", uMap); + printInfoString(info.getDict(), "Keywords", "Keywords: ", uMap); + printInfoString(info.getDict(), "Author", "Author: ", uMap); + printInfoString(info.getDict(), "Creator", "Creator: ", uMap); + printInfoString(info.getDict(), "Producer", "Producer: ", uMap); + if (isoDates) { + printISODate(info.getDict(), "CreationDate", "CreationDate: ", uMap); + printISODate(info.getDict(), "ModDate", "ModDate: ", uMap); + } else if (rawDates) { + printInfoString(info.getDict(), "CreationDate", "CreationDate: ", uMap); + printInfoString(info.getDict(), "ModDate", "ModDate: ", uMap); + } else { + printInfoDate(info.getDict(), "CreationDate", "CreationDate: ", uMap); + printInfoDate(info.getDict(), "ModDate", "ModDate: ", uMap); + } + } + + bool hasMetadata = false; + std::unique_ptr metadata = doc->readMetadata(); + if (metadata) { + hasMetadata = true; + } + + const std::set docInfoStandardKeys { "Title", "Author", "Subject", "Keywords", "Creator", "Producer", "CreationDate", "ModDate", "Trapped" }; + + bool hasCustom = false; + if (info.isDict()) { + Dict *dict = info.getDict(); + for (i = 0; i < dict->getLength(); i++) { + std::string key(dict->getKey(i)); + if (docInfoStandardKeys.find(key) == docInfoStandardKeys.end()) { + hasCustom = true; + break; + } + } + } + + // print metadata info + printf("Custom Metadata: %s\n", hasCustom ? "yes" : "no"); + printf("Metadata Stream: %s\n", hasMetadata ? "yes" : "no"); + + // print tagging info + printf("Tagged: %s\n", (doc->getCatalog()->getMarkInfo() & Catalog::markInfoMarked) ? "yes" : "no"); + printf("UserProperties: %s\n", (doc->getCatalog()->getMarkInfo() & Catalog::markInfoUserProperties) ? "yes" : "no"); + printf("Suspects: %s\n", (doc->getCatalog()->getMarkInfo() & Catalog::markInfoSuspects) ? "yes" : "no"); + + // print form info + switch (doc->getCatalog()->getFormType()) { + case Catalog::NoForm: + printf("Form: none\n"); + break; + case Catalog::AcroForm: + printf("Form: AcroForm\n"); + break; + case Catalog::XfaForm: + printf("Form: XFA\n"); + break; + } + + // print javascript info + { + JSInfo jsInfo(doc, firstPage - 1); + jsInfo.scanJS(lastPage - firstPage + 1); + printf("JavaScript: %s\n", jsInfo.containsJS() ? "yes" : "no"); + } + + // print page count + printf("Pages: %d\n", doc->getNumPages()); + + // print encryption info + printf("Encrypted: "); + if (doc->isEncrypted()) { + unsigned char *fileKey; + CryptAlgorithm encAlgorithm; + int keyLength; + doc->getXRef()->getEncryptionParameters(&fileKey, &encAlgorithm, &keyLength); + + const char *encAlgorithmName = "unknown"; + switch (encAlgorithm) { + case cryptRC4: + encAlgorithmName = "RC4"; + break; + case cryptAES: + encAlgorithmName = "AES"; + break; + case cryptAES256: + encAlgorithmName = "AES-256"; + break; + case cryptNone: + break; + } + + printf("yes (print:%s copy:%s change:%s addNotes:%s algorithm:%s)\n", doc->okToPrint(true) ? "yes" : "no", doc->okToCopy(true) ? "yes" : "no", doc->okToChange(true) ? "yes" : "no", doc->okToAddNotes(true) ? "yes" : "no", + encAlgorithmName); + } else { + printf("no\n"); + } + + // print page size + for (pg = firstPage; pg <= lastPage; ++pg) { + w = doc->getPageCropWidth(pg); + h = doc->getPageCropHeight(pg); + if (multiPage) { + printf("Page %4d size: %g x %g pts", pg, w, h); + } else { + printf("Page size: %g x %g pts", w, h); + } + if ((fabs(w - 612) < 1 && fabs(h - 792) < 1) || (fabs(w - 792) < 1 && fabs(h - 612) < 1)) { + printf(" (letter)"); + } else { + hISO = sqrt(sqrt(2.0)) * 7200 / 2.54; + wISO = hISO / sqrt(2.0); + isoThreshold = hISO * 0.003; ///< allow for 0.3% error when guessing conformance to ISO 216, A series + for (i = 0; i <= 6; ++i) { + if ((fabs(w - wISO) < isoThreshold && fabs(h - hISO) < isoThreshold) || (fabs(w - hISO) < isoThreshold && fabs(h - wISO) < isoThreshold)) { + printf(" (A%d)", i); + break; + } + hISO = wISO; + wISO /= sqrt(2.0); + isoThreshold /= sqrt(2.0); + } + } + printf("\n"); + r = doc->getPageRotate(pg); + if (multiPage) { + printf("Page %4d rot: %d\n", pg, r); + } else { + printf("Page rot: %d\n", r); + } + } + + // print the boxes + if (printBoxes) { + if (multiPage) { + for (pg = firstPage; pg <= lastPage; ++pg) { + page = doc->getPage(pg); + if (!page) { + error(errSyntaxError, -1, "Failed to print boxes for page {0:d}", pg); + continue; + } + sprintf(buf, "Page %4d MediaBox: ", pg); + printBox(buf, page->getMediaBox()); + sprintf(buf, "Page %4d CropBox: ", pg); + printBox(buf, page->getCropBox()); + sprintf(buf, "Page %4d BleedBox: ", pg); + printBox(buf, page->getBleedBox()); + sprintf(buf, "Page %4d TrimBox: ", pg); + printBox(buf, page->getTrimBox()); + sprintf(buf, "Page %4d ArtBox: ", pg); + printBox(buf, page->getArtBox()); + } + } else { + page = doc->getPage(firstPage); + if (!page) { + error(errSyntaxError, -1, "Failed to print boxes for page {0:d}", firstPage); + } else { + printBox("MediaBox: ", page->getMediaBox()); + printBox("CropBox: ", page->getCropBox()); + printBox("BleedBox: ", page->getBleedBox()); + printBox("TrimBox: ", page->getTrimBox()); + printBox("ArtBox: ", page->getArtBox()); + } + } + } + + // print file size + printf("File size: %lld bytes\n", filesize); + + // print linearization info + printf("Optimized: %s\n", doc->isLinearized() ? "yes" : "no"); + + // print PDF version + printf("PDF version: %d.%d\n", doc->getPDFMajorVersion(), doc->getPDFMinorVersion()); + + printPdfSubtype(doc, uMap); +} + +int main(int argc, char *argv[]) +{ + std::unique_ptr doc; + GooString *fileName; + std::optional ownerPW, userPW; + const UnicodeMap *uMap; + FILE *f; + bool ok; + int exitCode; + bool multiPage; + + exitCode = 99; + + // parse args + Win32Console win32console(&argc, &argv); + ok = parseArgs(argDesc, &argc, argv); + if (!ok || (argc != 2 && !printEnc) || printVersion || printHelp) { + fprintf(stderr, "pdfinfo version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", xpdfCopyright); + if (!printVersion) { + printUsage("pdfinfo", "", argDesc); + } + if (printVersion || printHelp) { + exitCode = 0; + } + goto err0; + } + + if (printStructureText) { + printStructure = true; + } + + // read config file + globalParams = std::make_unique(); + + if (printEnc) { + printEncodings(); + exitCode = 0; + goto err0; + } + + fileName = new GooString(argv[1]); + + if (textEncName[0]) { + globalParams->setTextEncoding(textEncName); + } + + // get mapping to output encoding + if (!(uMap = globalParams->getTextEncoding())) { + error(errCommandLine, -1, "Couldn't get text encoding"); + delete fileName; + goto err1; + } + + // open PDF file + if (ownerPassword[0] != '\001') { + ownerPW = GooString(ownerPassword); + } + if (userPassword[0] != '\001') { + userPW = GooString(userPassword); + } + + if (fileName->cmp("-") == 0) { + delete fileName; + fileName = new GooString("fd://0"); + } + + doc = PDFDocFactory().createPDFDoc(*fileName, ownerPW, userPW); + + if (!doc->isOk()) { + exitCode = 1; + goto err2; + } + + // get page range + if (firstPage < 1) { + firstPage = 1; + } + if (lastPage == 0) { + multiPage = false; + } else { + multiPage = true; + } + if (lastPage < 1 || lastPage > doc->getNumPages()) { + lastPage = doc->getNumPages(); + } + if (lastPage < firstPage) { + error(errCommandLine, -1, "Wrong page range given: the first page ({0:d}) can not be after the last page ({1:d}).", firstPage, lastPage); + goto err2; + } + + if (printMetadata) { + // print the metadata + const std::unique_ptr metadata = doc->readMetadata(); + if (metadata) { + fputs(metadata->c_str(), stdout); + fputc('\n', stdout); + } + } else if (printCustom) { + printCustomInfo(doc.get(), uMap); + } else if (printJS) { + // print javascript + JSInfo jsInfo(doc.get(), firstPage - 1); + jsInfo.scanJS(lastPage - firstPage + 1, stdout, uMap); + } else if (printStructure || printStructureText) { + // print structure + const StructTreeRoot *structTree = doc->getCatalog()->getStructTreeRoot(); + if (structTree) { + for (unsigned i = 0; i < structTree->getNumChildren(); i++) { + printStruct(structTree->getChild(i), 0); + } + } + } else if (printDests) { + printDestinations(doc.get(), uMap); + } else if (printUrls) { + printUrlList(doc.get()); + } else { + // print info + long long filesize = 0; + + f = fopen(fileName->c_str(), "rb"); + if (f) { + Gfseek(f, 0, SEEK_END); + filesize = Gftell(f); + fclose(f); + } + + if (multiPage == false) { + lastPage = 1; + } + + printInfo(doc.get(), uMap, filesize, multiPage); + } + exitCode = 0; + + // clean up +err2: + delete fileName; +err1: +err0: + + return exitCode; +} diff --git a/poppler-24.05.0/utils/pdfseparate.1 b/poppler-24.05.0/utils/pdfseparate.1 new file mode 100644 index 0000000000000000000000000000000000000000..132511a12c87ad5c071dca31002c5db4bd8f15d2 --- /dev/null +++ b/poppler-24.05.0/utils/pdfseparate.1 @@ -0,0 +1,60 @@ +.\" Copyright 2011 The Poppler Developers - http://poppler.freedesktop.org +.TH pdfseparate 1 "15 September 2011" +.SH NAME +pdfseparate \- Portable Document Format (PDF) page extractor +.SH SYNOPSIS +.B pdfseparate +[options] +.I PDF-file PDF-page-pattern +.SH DESCRIPTION +.B pdfseparate +extract single pages from a Portable Document Format (PDF). +.PP +pdfseparate reads the PDF file +.IR PDF-file , +extracts one or more pages, and writes one PDF file for each page to +.IR PDF-page-pattern. +.PP +PDF-page-pattern should contain +.BR %d +(or any variant respecting printf format), since %d is replaced by the page number. +.TP +The PDF-file should not be encrypted. +.SH OPTIONS +.TP +.BI \-f " number" +Specifies the first page to extract. If \-f is omitted, extraction starts with page 1. +.TP +.BI \-l " number" +Specifies the last page to extract. If \-l is omitted, extraction ends with the last page. +.TP +.B \-v +Print copyright and version information. +.TP +.B \-h +Print usage information. +.RB ( \-help +and +.B \-\-help +are equivalent.) +.SH EXAMPLE +pdfseparate sample.pdf sample-%d.pdf +.TP +extracts all pages from sample.pdf, if i.e. sample.pdf has 3 pages, it produces +.TP +sample-1.pdf, sample-2.pdf, sample-3.pdf +.SH AUTHOR +The pdfseparate software and documentation are copyright 1996-2004 Glyph +& Cog, LLC and copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org +.SH "SEE ALSO" +.BR pdfdetach (1), +.BR pdffonts (1), +.BR pdfimages (1), +.BR pdfinfo (1), +.BR pdftocairo (1), +.BR pdftohtml (1), +.BR pdftoppm (1), +.BR pdftops (1), +.BR pdftotext (1) +.BR pdfsig (1), +.BR pdfunite (1) diff --git a/poppler-24.05.0/utils/pdfseparate.cc b/poppler-24.05.0/utils/pdfseparate.cc new file mode 100644 index 0000000000000000000000000000000000000000..ade6c4a307fe623ab13be7e4c4b72519db7accc2 --- /dev/null +++ b/poppler-24.05.0/utils/pdfseparate.cc @@ -0,0 +1,158 @@ +//======================================================================== +// +// pdfseparate.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2011, 2012, 2015 Thomas Freitag +// Copyright (C) 2012-2014, 2017, 2018, 2021, 2022 Albert Astals Cid +// Copyright (C) 2013, 2016 Pino Toscano +// Copyright (C) 2013 Daniel Kahn Gillmor +// Copyright (C) 2013 Suzuki Toshiya +// Copyright (C) 2017 Léonard Michelet +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019 Oliver Sander +// +//======================================================================== +#include "config.h" +#include +#include +#include +#include +#include +#include "parseargs.h" +#include "goo/GooString.h" +#include "PDFDoc.h" +#include "ErrorCodes.h" +#include "GlobalParams.h" +#include "Win32Console.h" +#include + +static int firstPage = 0; +static int lastPage = 0; +static bool printVersion = false; +static bool printHelp = false; + +static const ArgDesc argDesc[] = { { "-f", argInt, &firstPage, 0, "first page to extract" }, + { "-l", argInt, &lastPage, 0, "last page to extract" }, + { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} }; + +static bool extractPages(const char *srcFileName, const char *destFileName) +{ + char pathName[4096]; + PDFDoc *doc = new PDFDoc(std::make_unique(srcFileName)); + + if (!doc->isOk()) { + error(errSyntaxError, -1, "Could not extract page(s) from damaged file ('{0:s}')", srcFileName); + delete doc; + return false; + } + + // destFileName can have multiple %% and one %d + // We use auxDestFileName to replace all the valid % appearances + // by 'A' (random char that is not %), if at the end of replacing + // any of the valid appearances there is still any % around, the + // pattern is wrong + if (firstPage == 0 && lastPage == 0) { + firstPage = 1; + lastPage = doc->getNumPages(); + } + if (lastPage == 0) { + lastPage = doc->getNumPages(); + } + if (firstPage == 0) { + firstPage = 1; + } + if (lastPage < firstPage) { + error(errCommandLine, -1, "Wrong page range given: the first page ({0:d}) can not be after the last page ({1:d}).", firstPage, lastPage); + delete doc; + return false; + } + bool foundmatch = false; + char *auxDestFileName = strdup(destFileName); + char *p = strstr(auxDestFileName, "%d"); + if (p != nullptr) { + foundmatch = true; + *p = 'A'; + } else { + char pattern[6]; + for (int i = 2; i < 10; i++) { + sprintf(pattern, "%%0%dd", i); + p = strstr(auxDestFileName, pattern); + if (p != nullptr) { + foundmatch = true; + *p = 'A'; + break; + } + } + } + if (!foundmatch && firstPage != lastPage) { + error(errSyntaxError, -1, "'{0:s}' must contain '%d' (or any variant respecting printf format) if more than one page should be extracted, in order to print the page number", destFileName); + free(auxDestFileName); + delete doc; + return false; + } + + // at this point auxDestFileName can only contain %% + p = strstr(auxDestFileName, "%%"); + while (p != nullptr) { + *p = 'A'; + *(p + 1) = 'A'; + p = strstr(p, "%%"); + } + + // at this point any other % is wrong + p = strstr(auxDestFileName, "%"); + if (p != nullptr) { + error(errSyntaxError, -1, "'{0:s}' can only contain one '%d' pattern", destFileName); + free(auxDestFileName); + delete doc; + return false; + } + free(auxDestFileName); + + for (int pageNo = firstPage; pageNo <= lastPage; pageNo++) { + snprintf(pathName, sizeof(pathName) - 1, destFileName, pageNo); + PDFDoc *pagedoc = new PDFDoc(std::make_unique(srcFileName)); + int errCode = pagedoc->savePageAs(GooString(pathName), pageNo); + if (errCode != errNone) { + delete doc; + delete pagedoc; + return false; + } + delete pagedoc; + } + delete doc; + return true; +} + +static constexpr int kOtherError = 99; + +int main(int argc, char *argv[]) +{ + // parse args + Win32Console win32console(&argc, &argv); + const bool parseOK = parseArgs(argDesc, &argc, argv); + if (!parseOK || argc != 3 || printVersion || printHelp) { + fprintf(stderr, "pdfseparate version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", xpdfCopyright); + if (!printVersion) { + printUsage("pdfseparate", " ", argDesc); + } + if (printVersion || printHelp) { + return 0; + } else { + return kOtherError; + } + } + globalParams = std::make_unique(); + const bool extractOK = extractPages(argv[1], argv[2]); + return extractOK ? 0 : kOtherError; +} diff --git a/poppler-24.05.0/utils/pdfsig.1 b/poppler-24.05.0/utils/pdfsig.1 new file mode 100644 index 0000000000000000000000000000000000000000..93bb5ea58f4fafaf0bd8c0fdbd569fa0601c2918 --- /dev/null +++ b/poppler-24.05.0/utils/pdfsig.1 @@ -0,0 +1,129 @@ +.\" Copyright 2011 The Poppler Developers - http://poppler.freedesktop.org +.TH pdfsig 1 "28 October 2015" +.SH NAME +pdfsig \- Portable Document Format (PDF) digital signatures tool +.SH SYNOPSIS +.B pdfsig +[options] +.RI [ PDF-file ] +.RI [ Output-file ] +.SH DESCRIPTION +.B pdfsig +verifies the digital signatures in a PDF document. +It also displays the identity of each signer +(commonName field and full distinguished name of the signer certificate), +the time and date of the signature, the hash algorithm used for signing, +the type of the signature as stated in the PDF and +the signed ranges with a statement wether the total document is signed. +It can also sign PDF documents (options -add-signature or -sign). +.PP +pdfsig uses the trusted certificates stored in the Network Security Services (NSS) Database. +.PP +pdfsig also uses the Online Certificate Status Protocol (OCSP) (refer to http://en.wikipedia.org/wiki/Online_Certificate_Status_Protocol) to look up the certificate online and check if it has been revoked (unless -no-ocsp has been specified). +.PP +The NSS Database is searched for in the following locations: +.IP \(bu +If the \-nssdir option is specified, the directory specified by this option. +.IP \(bu +The NSS Certificate database in the default Firefox profile. i.e. $HOME/.mozilla/firefox/*.default. +.IP \(bu +The NSS Certificate database in /etc/pki/nssdb. +.SH OPTIONS +.TP +.B \-nssdir "[prefix]directory" +Specify the database directory containing the certificate and key +database files. See certutil(1) -d option for details of the +prefix. If not specified the other search locations described in +.B DESCRIPTION +are used. +.TP +.B \-nss-pwd "password" +Specify the password needed to access the NSS database (if any). +.TP +.B \-nocert +Do not validate the certificate. +.TP +.B \-no-ocsp +Do not perform online OCSP certificate revocation check (local Certificate Revocation Lists (CRL) are still used). +.TP +.B \-no-appearance +Do not add appearance information when signing existing fields (signer name and date). +.TP +.B \-aia +Enable the use of Authority Information Access (AIA) extension to fetch missing certificates to build the certificate chain. +.TP +.B \-dump +Dump all signatures into current directory in their native format. Most likely it is either a unpadded or zero-padded CMS/PKCS7 bundle. +.TP +.B \-add-signature +Add a new signature to the document. +.TP +.B \-new-signature-field-name " name" +Specifies the field name to be used when adding a new signature. A random ID will be used by default. +.TP +.B \-sign " field" +Sign the document in the specified signature field present in the document (must be unsigned). Field can be specified by field name (string) or the n-th signature field in the document (integer). +.TP +.B \-nick " nickname" +Use the certificate with the given nickname for signing (NSS backend). If nickname starts with pkcs11:, it's treated as PKCS#11 URI (NSS backend). If the nickname is given as a fingerprint, it will be the certificate used (GPG backend) +.TP +.B \-backend " backend" +Use the specified backeng for cryptographic signatures +.TP +.B \-kpw " password" +Use the given password for the signing key +(this might be missing if the key isn't password protected). +.TP +.B \-digest " algorithm" +Use the given digest algorithm for signing (default: SHA256). +.TP +.B \-reason " reason" +Set the given reason string for the signature (default: no reason set). +.TP +.B \-etsi +Create a signature of type ETSI.CAdES.detached instead of adbe.pkcs7.detached. +.TP +.B \-list-nicks +List available nicknames in the NSS database. +.TP +.B \-list-backends +List available backends for cryptographic signatures +.TP +.B \-v +Print copyright and version information. +.TP +.B \-h +Print usage information. +.RB ( \-help +and +.B \-\-help +are equivalent.) +.SH EXAMPLES +.TP +pdfsig signed_file.pdf +Displays signature info for signed_file.pdf. +.TP +pdfsig input.pdf output.pdf -add-signature -nss-pwd password -nick my-cert -reason 'for fun!' +Creates a new pdf named output.pdf with the contents of input.pdf signed by the 'my-cert' certificate. +.TP +pdfsig input.pdf output.pdf -add-signature -nss-pwd password -nick 'pkcs11:token=smartcard0;object=Second%20certificate;type=cert' +Same, but uses a PKCS#11 URI as defined in IETF RFC 7512 to select the certificate to be used for signing. +.TP +pdfsig input.pdf output.pdf -sign 0 -nss-pwd password -nick my-cert -reason 'for fun!' +Creates a new pdf named output.pdf with the contents of input.pdf signed by the 'my-cert' certificate. input.pdf must have an already existing un-signed signature field. +.SH AUTHOR +The pdfsig software and documentation are copyright 1996-2004 Glyph & Cog, LLC +and copyright 2005-2015 The Poppler Developers - http://poppler.freedesktop.org +.SH "SEE ALSO" +.BR pdfdetach (1), +.BR pdffonts (1), +.BR pdfimages (1), +.BR pdfinfo (1), +.BR pdftocairo (1), +.BR pdftohtml (1), +.BR pdftoppm (1), +.BR pdftops (1), +.BR pdftotext (1) +.BR pdfseparate (1), +.BR pdfunite (1) +.BR certutil (1) diff --git a/poppler-24.05.0/utils/pdfsig.cc b/poppler-24.05.0/utils/pdfsig.cc new file mode 100644 index 0000000000000000000000000000000000000000..fe588f1043ccde1fa58a6696310be17276526d48 --- /dev/null +++ b/poppler-24.05.0/utils/pdfsig.cc @@ -0,0 +1,667 @@ +//======================================================================== +// +// pdfsig.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright 2015 André Guerreiro +// Copyright 2015 André Esser +// Copyright 2015, 2017-2023 Albert Astals Cid +// Copyright 2016 Markus Kilås +// Copyright 2017, 2019 Hans-Ulrich Jüttner +// Copyright 2017, 2019 Adrian Johnson +// Copyright 2018 Chinmoy Ranjan Pradhan +// Copyright 2019 Alexey Pavlov +// Copyright 2019. 2023 Oliver Sander +// Copyright 2019 Nelson Efrain A. Cruz +// Copyright 2021 Georgiy Sgibnev . Work sponsored by lab50.net. +// Copyright 2021 Theofilos Intzoglou +// Copyright 2022 Felix Jung +// Copyright 2022, 2024 Erich E. Hoover +// Copyright 2023, 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +//======================================================================== + +#include "config.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include "parseargs.h" +#include "Object.h" +#include "Array.h" +#include "goo/gbasename.h" +#include "Page.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "DateInfo.h" +#include "Error.h" +#include "GlobalParams.h" +#ifdef ENABLE_NSS3 +# include "NSSCryptoSignBackend.h" +#endif +#include "CryptoSignBackend.h" +#include "SignatureInfo.h" +#include "Win32Console.h" +#include "numberofcharacters.h" +#include "UTF.h" +#if __has_include() +# include +#endif + +#ifdef HAVE_GETTEXT +# include +# include +# define _(STRING) gettext(STRING) +#else +# define _(STRING) STRING +#endif + +static const char *getReadableSigState(SignatureValidationStatus sig_vs) +{ + switch (sig_vs) { + case SIGNATURE_VALID: + return "Signature is Valid."; + + case SIGNATURE_INVALID: + return "Signature is Invalid."; + + case SIGNATURE_DIGEST_MISMATCH: + return "Digest Mismatch."; + + case SIGNATURE_DECODING_ERROR: + return "Document isn't signed or corrupted data."; + + case SIGNATURE_NOT_VERIFIED: + return "Signature has not yet been verified."; + + default: + return "Unknown Validation Failure."; + } +} + +static const char *getReadableCertState(CertificateValidationStatus cert_vs) +{ + switch (cert_vs) { + case CERTIFICATE_TRUSTED: + return "Certificate is Trusted."; + + case CERTIFICATE_UNTRUSTED_ISSUER: + return "Certificate issuer isn't Trusted."; + + case CERTIFICATE_UNKNOWN_ISSUER: + return "Certificate issuer is unknown."; + + case CERTIFICATE_REVOKED: + return "Certificate has been Revoked."; + + case CERTIFICATE_EXPIRED: + return "Certificate has Expired"; + + case CERTIFICATE_NOT_VERIFIED: + return "Certificate has not yet been verified."; + + default: + return "Unknown issue with Certificate or corrupted data."; + } +} + +static char *getReadableTime(time_t unix_time) +{ + char *time_str = (char *)gmalloc(64); + strftime(time_str, 64, "%b %d %Y %H:%M:%S", localtime(&unix_time)); + return time_str; +} + +static bool dumpSignature(int sig_num, int sigCount, FormFieldSignature *s, const char *filename) +{ + const GooString *signature = s->getSignature(); + if (!signature) { + printf("Cannot dump signature #%d\n", sig_num); + return false; + } + + const int sigCountLength = numberOfCharacters(sigCount); + // We want format to be {0:s}.sig{1:Xd} where X is sigCountLength + // since { is the magic character to replace things we need to put it twice where + // we don't want it to be replaced + const std::unique_ptr format = GooString::format("{{0:s}}.sig{{1:{0:d}d}}", sigCountLength); + const std::unique_ptr path = GooString::format(format->c_str(), gbasename(filename).c_str(), sig_num); + printf("Signature #%d (%u bytes) => %s\n", sig_num, signature->getLength(), path->c_str()); + std::ofstream outfile(path->c_str(), std::ofstream::binary); + outfile.write(signature->c_str(), signature->getLength()); + outfile.close(); + + return true; +} + +static GooString nssDir; +static GooString nssPassword; +static char ownerPassword[33] = "\001"; +static char userPassword[33] = "\001"; +static bool printVersion = false; +static bool printHelp = false; +static bool printCryptoSignBackends = false; +static bool dontVerifyCert = false; +static bool noOCSPRevocationCheck = false; +static bool noAppearance = false; +static bool dumpSignatures = false; +static bool etsiCAdESdetached = false; +static char backendString[256] = ""; +static char signatureName[256] = ""; +static char certNickname[256] = ""; +static char password[256] = ""; +static char digestName[256] = "SHA256"; +static GooString reason; +static bool listNicknames = false; +static bool addNewSignature = false; +static bool useAIACertFetch = false; +static GooString newSignatureFieldName; + +static const ArgDesc argDesc[] = { { "-nssdir", argGooString, &nssDir, 0, "path to directory of libnss3 database" }, + { "-nss-pwd", argGooString, &nssPassword, 0, "password to access the NSS database (if any)" }, + { "-nocert", argFlag, &dontVerifyCert, 0, "don't perform certificate validation" }, + { "-no-ocsp", argFlag, &noOCSPRevocationCheck, 0, "don't perform online OCSP certificate revocation check" }, + { "-no-appearance", argFlag, &noAppearance, 0, "don't add appearance information when signing existing fields" }, + { "-aia", argFlag, &useAIACertFetch, 0, "use Authority Information Access (AIA) extension for certificate fetching" }, + { "-dump", argFlag, &dumpSignatures, 0, "dump all signatures into current directory" }, + { "-add-signature", argFlag, &addNewSignature, 0, "adds a new signature to the document" }, + { "-new-signature-field-name", argGooString, &newSignatureFieldName, 0, "field name used for the newly added signature. A random ID will be used if empty" }, + { "-sign", argString, &signatureName, 256, "sign the document in the given signature field (by name or number)" }, + { "-etsi", argFlag, &etsiCAdESdetached, 0, "create a signature of type ETSI.CAdES.detached instead of adbe.pkcs7.detached" }, + { "-backend", argString, &backendString, 256, "use given backend for signing/verification" }, + { "-nick", argString, &certNickname, 256, "use the certificate with the given nickname/fingerprint for signing" }, + { "-kpw", argString, &password, 256, "password for the signing key (might be missing if the key isn't password protected)" }, + { "-digest", argString, &digestName, 256, "name of the digest algorithm (default: SHA256)" }, + { "-reason", argGooString, &reason, 0, "reason for signing (default: no reason given)" }, + { "-list-nicks", argFlag, &listNicknames, 0, "list available nicknames in the NSS database" }, + { "-list-backends", argFlag, &printCryptoSignBackends, 0, "print cryptographic signature backends" }, + { "-opw", argString, ownerPassword, sizeof(ownerPassword), "owner password (for encrypted files)" }, + { "-upw", argString, userPassword, sizeof(userPassword), "user password (for encrypted files)" }, + { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} }; + +static void print_version_usage(bool usage) +{ + fprintf(stderr, "pdfsig version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", xpdfCopyright); + if (usage) { + printUsage("pdfsig", " []", argDesc); + } +} + +static void print_backends() +{ + fprintf(stderr, "pdfsig backends:\n"); + for (const auto &backend : CryptoSign::Factory::getAvailable()) { + switch (backend) { + case CryptoSign::Backend::Type::NSS3: + fprintf(stderr, "NSS"); + break; + case CryptoSign::Backend::Type::GPGME: + fprintf(stderr, "GPG"); + break; + } + if (backend == CryptoSign::Factory::getActive()) { + fprintf(stderr, " (active)\n"); + } else { + fprintf(stderr, "\n"); + } + } +} + +static std::vector> getAvailableSigningCertificates(bool *error) +{ +#ifdef ENABLE_NSS3 + bool wrongPassword = false; + bool passwordNeeded = false; + auto passwordCallback = [&passwordNeeded, &wrongPassword](const char *) -> char * { + static bool firstTime = true; + if (!firstTime) { + wrongPassword = true; + return nullptr; + } + firstTime = false; + if (nssPassword.getLength() > 0) { + return strdup(nssPassword.c_str()); + } else { + passwordNeeded = true; + return nullptr; + } + }; + NSSSignatureConfiguration::setNSSPasswordCallback(passwordCallback); +#endif + auto backend = CryptoSign::Factory::createActive(); + if (!backend) { + *error = true; + printf("No backends for cryptographic signatures available"); + return {}; + } + std::vector> vCerts = backend->getAvailableSigningCertificates(); +#ifdef ENABLE_NSS3 + NSSSignatureConfiguration::setNSSPasswordCallback({}); + if (passwordNeeded) { + *error = true; + printf("Password is needed to access the NSS database.\n"); + printf("\tPlease provide one with -nss-pwd.\n"); + return {}; + } + if (wrongPassword) { + *error = true; + printf("Password was not accepted to open the NSS database.\n"); + printf("\tPlease provide the correct one with -nss-pwd.\n"); + return {}; + } + +#endif + *error = false; + return vCerts; +} + +static std::string locationToString(KeyLocation location) +{ + switch (location) { + case KeyLocation::Unknown: + return {}; + case KeyLocation::Other: + return "(Other)"; + case KeyLocation::Computer: + return "(Computer)"; + case KeyLocation::HardwareToken: + return "(Hardware Token)"; + } + return {}; +} + +static std::string TextStringToUTF8(const std::string &str) +{ + const UnicodeMap *utf8Map = globalParams->getUtf8Map(); + + std::vector u = TextStringToUCS4(str); + + std::string convertedStr; + for (auto &c : u) { + char buf[8]; + const int n = utf8Map->mapUnicode(c, buf, sizeof(buf)); + convertedStr.append(buf, n); + } + + return convertedStr; +} + +int main(int argc, char *argv[]) +{ + char *time_str = nullptr; + globalParams = std::make_unique(); + + Win32Console win32Console(&argc, &argv); + + const bool ok = parseArgs(argDesc, &argc, argv); + + if (!ok) { + print_version_usage(true); + return 99; + } + + if (printVersion) { + print_version_usage(false); + return 0; + } + + if (printHelp) { + print_version_usage(true); + return 0; + } + + if (strlen(backendString) > 0) { + auto backend = CryptoSign::Factory::typeFromString(backendString); + if (backend) { + CryptoSign::Factory::setPreferredBackend(backend.value()); + } else { + fprintf(stderr, "Unsupported backend\n"); + return 98; + } + } + + if (printCryptoSignBackends) { + print_backends(); + return 0; + } + +#ifdef ENABLE_NSS3 + NSSSignatureConfiguration::setNSSDir(nssDir); +#endif + + if (listNicknames) { + bool getCertsError; + const std::vector> vCerts = getAvailableSigningCertificates(&getCertsError); + if (getCertsError) { + return 2; + } else { + if (vCerts.empty()) { + printf("There are no certificates available.\n"); + } else { + printf("Certificate nicknames available:\n"); + for (auto &cert : vCerts) { + const GooString &nick = cert->getNickName(); + const auto location = locationToString(cert->getKeyLocation()); + printf("%s %s\n", nick.c_str(), location.c_str()); + } + } + } + return 0; + } + + if (argc < 2) { + // no filename was given + print_version_usage(true); + return 99; + } + + std::unique_ptr fileName = std::make_unique(argv[1]); + + std::optional ownerPW, userPW; + if (ownerPassword[0] != '\001') { + ownerPW = GooString(ownerPassword); + } + if (userPassword[0] != '\001') { + userPW = GooString(userPassword); + } + // open PDF file + std::unique_ptr doc(PDFDocFactory().createPDFDoc(*fileName, ownerPW, userPW)); + + if (!doc->isOk()) { + return 1; + } + + int signatureNumber; + if (strlen(signatureName) > 0) { + signatureNumber = atoi(signatureName); + if (signatureNumber == 0) { + signatureNumber = -1; + } + } else { + signatureNumber = 0; + } + + if (addNewSignature && signatureNumber > 0) { + // incompatible options + print_version_usage(true); + return 99; + } + + if (addNewSignature) { + if (argc == 2) { + fprintf(stderr, "An output filename for the signed document must be given\n"); + return 2; + } + + if (strlen(certNickname) == 0) { + printf("A nickname of the signing certificate must be given\n"); + return 2; + } + + if (etsiCAdESdetached) { + printf("-etsi is not supported yet with -add-signature\n"); + printf("Please file a bug report if this is important for you\n"); + return 2; + } + + if (digestName != std::string("SHA256")) { + printf("Only digest SHA256 is supported at the moment with -add-signature\n"); + printf("Please file a bug report if this is important for you\n"); + return 2; + } + + if (doc->getPage(1) == nullptr) { + printf("Error getting first page of the document.\n"); + return 2; + } + + bool getCertsError; + // We need to call this otherwise NSS spins forever + getAvailableSigningCertificates(&getCertsError); + if (getCertsError) { + return 2; + } + + const auto rs = std::unique_ptr(reason.toStr().empty() ? nullptr : std::make_unique(utf8ToUtf16WithBom(reason.toStr()))); + + if (newSignatureFieldName.getLength() == 0) { + // Create a random field name, it could be anything but 32 hex numbers should + // hopefully give us something that is not already in the document + std::random_device rd; + std::mt19937 gen(rd()); + std::uniform_int_distribution<> distrib(1, 15); + for (int i = 0; i < 32; ++i) { + const int value = distrib(gen); + newSignatureFieldName.append(value < 10 ? 48 + value : 65 + (value - 10)); + } + } + + // We don't provide a way to customize the UI from pdfsig for now + const bool success = doc->sign(std::string { argv[2] }, std::string { certNickname }, std::string { password }, newSignatureFieldName.copy(), /*page*/ 1, + /*rect */ { 0, 0, 0, 0 }, /*signatureText*/ {}, /*signatureTextLeft*/ {}, /*fontSize */ 0, /*leftFontSize*/ 0, + /*fontColor*/ {}, /*borderWidth*/ 0, /*borderColor*/ {}, /*backgroundColor*/ {}, rs.get(), /* location */ nullptr, /* image path */ "", ownerPW, userPW); + return success ? 0 : 3; + } + + const std::vector signatures = doc->getSignatureFields(); + const unsigned int sigCount = signatures.size(); + + if (signatureNumber == -1) { + for (unsigned int i = 0; i < sigCount; i++) { + const GooString *goo = signatures.at(i)->getCreateWidget()->getField()->getFullyQualifiedName(); + if (!goo) { + continue; + } + + const std::string name = TextStringToUTF8(goo->toStr()); + if (name == signatureName) { + signatureNumber = i + 1; + break; + } + } + + if (signatureNumber == -1) { + fprintf(stderr, "Signature field not found by name\n"); + return 2; + } + } + + if (signatureNumber > 0) { + // We are signing an existing signature field + if (argc == 2) { + fprintf(stderr, "An output filename for the signed document must be given\n"); + return 2; + } + + if (signatureNumber > static_cast(sigCount)) { + printf("File '%s' does not contain a signature with number %d\n", fileName->c_str(), signatureNumber); + return 2; + } + + if (strlen(certNickname) == 0) { + printf("A nickname of the signing certificate must be given\n"); + return 2; + } + + if (digestName != std::string("SHA256")) { + printf("Only digest SHA256 is supported at the moment\n"); + printf("Please file a bug report if this is important for you\n"); + return 2; + } + + bool getCertsError; + // We need to call this otherwise NSS spins forever + getAvailableSigningCertificates(&getCertsError); + if (getCertsError) { + return 2; + } + + FormFieldSignature *ffs = signatures.at(signatureNumber - 1); + Goffset file_size = 0; + const std::optional sig = ffs->getCheckedSignature(&file_size); + if (sig) { + printf("Signature number %d is already signed\n", signatureNumber); + return 2; + } + if (etsiCAdESdetached) { + ffs->setSignatureType(ETSI_CAdES_detached); + } + const auto rs = std::unique_ptr(reason.toStr().empty() ? nullptr : std::make_unique(utf8ToUtf16WithBom(reason.toStr()))); + if (ffs->getNumWidgets() != 1) { + printf("Unexpected number of widgets for the signature: %d\n", ffs->getNumWidgets()); + return 2; + } +#ifdef HAVE_GETTEXT + if (!noAppearance) { + setlocale(LC_ALL, ""); + bindtextdomain("pdfsig", CMAKE_INSTALL_LOCALEDIR); + textdomain("pdfsig"); + } +#endif + FormWidgetSignature *fws = static_cast(ffs->getWidget(0)); + auto backend = CryptoSign::Factory::createActive(); + auto sigHandler = backend->createSigningHandler(certNickname, HashAlgorithm::Sha256); + std::unique_ptr certInfo = sigHandler->getCertificateInfo(); + if (!certInfo) { + fprintf(stderr, "signDocument: error getting signature info\n"); + return 2; + } + const std::string signerName = certInfo->getSubjectInfo().commonName; + const std::string timestamp = timeToStringWithFormat(nullptr, "%Y.%m.%d %H:%M:%S %z"); + const AnnotColor blackColor(0, 0, 0); + const std::string signatureText(GooString::format(_("Digitally signed by {0:s}"), signerName.c_str())->toStr() + "\n" + GooString::format(_("Date: {0:s}"), timestamp.c_str())->toStr()); + const auto gSignatureText = std::make_unique((signatureText.empty() || noAppearance) ? "" : utf8ToUtf16WithBom(signatureText)); + const auto gSignatureLeftText = std::make_unique((signerName.empty() || noAppearance) ? "" : utf8ToUtf16WithBom(signerName)); + const bool success = fws->signDocumentWithAppearance(argv[2], std::string { certNickname }, std::string { password }, rs.get(), nullptr, {}, {}, *gSignatureText, *gSignatureLeftText, 0, 0, std::make_unique(blackColor)); + return success ? 0 : 3; + } + + if (argc > 2) { + // We are not signing and more than 1 filename was given + print_version_usage(true); + return 99; + } + + if (sigCount >= 1) { + if (dumpSignatures) { + printf("Dumping Signatures: %u\n", sigCount); + for (unsigned int i = 0; i < sigCount; i++) { + const bool dumpingOk = dumpSignature(i, sigCount, signatures.at(i), fileName->c_str()); + if (!dumpingOk) { + // for now, do nothing. We have logged a message + // to the user before returning false in dumpSignature + // and it is possible to have "holes" in the signatures + continue; + } + } + return 0; + } else { + printf("Digital Signature Info of: %s\n", fileName->c_str()); + } + } else { + printf("File '%s' does not contain any signatures\n", fileName->c_str()); + return 2; + } + std::unordered_map signatureInfos; + for (unsigned int i = 0; i < sigCount; i++) { + // Let's start the signature check first for signatures. + // we can always wait for completion later + FormFieldSignature *ffs = signatures.at(i); + if (ffs->getSignatureType() == unsigned_signature_field) { + continue; + } + signatureInfos[i] = ffs->validateSignatureAsync(!dontVerifyCert, false, -1 /* now */, !noOCSPRevocationCheck, useAIACertFetch, {}); + } + + for (unsigned int i = 0; i < sigCount; i++) { + FormFieldSignature *ffs = signatures.at(i); + printf("Signature #%u:\n", i + 1); + const GooString *goo = ffs->getCreateWidget()->getField()->getFullyQualifiedName(); + if (goo) { + const std::string name = TextStringToUTF8(goo->toStr()); + printf(" - Signature Field Name: %s\n", name.c_str()); + } + + if (ffs->getSignatureType() == unsigned_signature_field) { + printf(" The signature form field is not signed.\n"); + continue; + } + + const SignatureInfo *sig_info = signatureInfos[i]; + CertificateValidationStatus certificateStatus = ffs->validateSignatureResult(); + printf(" - Signer Certificate Common Name: %s\n", sig_info->getSignerName().c_str()); + printf(" - Signer full Distinguished Name: %s\n", sig_info->getSubjectDN().c_str()); + printf(" - Signing Time: %s\n", time_str = getReadableTime(sig_info->getSigningTime())); + printf(" - Signing Hash Algorithm: "); + switch (sig_info->getHashAlgorithm()) { + case HashAlgorithm::Md2: + printf("MD2\n"); + break; + case HashAlgorithm::Md5: + printf("MD5\n"); + break; + case HashAlgorithm::Sha1: + printf("SHA1\n"); + break; + case HashAlgorithm::Sha256: + printf("SHA-256\n"); + break; + case HashAlgorithm::Sha384: + printf("SHA-384\n"); + break; + case HashAlgorithm::Sha512: + printf("SHA-512\n"); + break; + case HashAlgorithm::Sha224: + printf("SHA-224\n"); + break; + default: + printf("unknown\n"); + } + printf(" - Signature Type: "); + switch (ffs->getSignatureType()) { + case adbe_pkcs7_sha1: + printf("adbe.pkcs7.sha1\n"); + break; + case adbe_pkcs7_detached: + printf("adbe.pkcs7.detached\n"); + break; + case ETSI_CAdES_detached: + printf("ETSI.CAdES.detached\n"); + break; + default: + printf("unknown\n"); + } + const std::vector ranges = ffs->getSignedRangeBounds(); + if (ranges.size() == 4) { + printf(" - Signed Ranges: [%lld - %lld], [%lld - %lld]\n", ranges[0], ranges[1], ranges[2], ranges[3]); + Goffset checked_file_size; + const std::optional signature = signatures.at(i)->getCheckedSignature(&checked_file_size); + if (signature && checked_file_size == ranges[3]) { + printf(" - Total document signed\n"); + } else { + printf(" - Not total document signed\n"); + } + } + printf(" - Signature Validation: %s\n", getReadableSigState(sig_info->getSignatureValStatus())); + gfree(time_str); + if (sig_info->getSignatureValStatus() != SIGNATURE_VALID || dontVerifyCert) { + continue; + } + printf(" - Certificate Validation: %s\n", getReadableCertState(certificateStatus)); + } + + return 0; +} diff --git a/poppler-24.05.0/utils/pdftocairo-win32.cc b/poppler-24.05.0/utils/pdftocairo-win32.cc new file mode 100644 index 0000000000000000000000000000000000000000..013eeb5605ac85d2fbb62f56a84bf4637cc86a2b --- /dev/null +++ b/poppler-24.05.0/utils/pdftocairo-win32.cc @@ -0,0 +1,506 @@ +//======================================================================== +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2014 Rodrigo Rivas Costa +// Copyright (C) 2014, 2017 Adrian Johnson +// Copyright (C) 2017, 2018, 2022 Albert Astals Cid +// +// 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 +#ifdef CAIRO_HAS_WIN32_SURFACE + +# include + +# include "parseargs.h" +# include "pdftocairo-win32.h" +# include "Win32Console.h" + +# include +# include +# include +# include +# include + +static HDC hdc; +static HGLOBAL hDevmode = nullptr; +static HGLOBAL hDevnames = nullptr; +static DEVMODEA *devmode; +static char *printerName; + +struct Win32Option +{ + const char *name; + int value; +}; + +static const Win32Option win32PaperSource[] = { { "upper", DMBIN_UPPER }, { "onlyone", DMBIN_ONLYONE }, + { "lower", DMBIN_LOWER }, { "middle", DMBIN_MIDDLE }, + { "manual", DMBIN_MANUAL }, { "envelope", DMBIN_ENVELOPE }, + { "envmanual", DMBIN_ENVMANUAL }, { "auto", DMBIN_AUTO }, + { "tractor", DMBIN_TRACTOR }, { "smallfmt", DMBIN_SMALLFMT }, + { "largefmt", DMBIN_LARGEFMT }, { "largecapacity", DMBIN_LARGECAPACITY }, + { "formsource", DMBIN_FORMSOURCE }, { nullptr, 0 } }; + +static void parseSource(GooString *source) +{ + const Win32Option *option = win32PaperSource; + while (option->name) { + if (source->cmp(option->name) == 0) { + devmode->dmDefaultSource = option->value; + devmode->dmFields |= DM_DEFAULTSOURCE; + return; + } + option++; + } + fprintf(stderr, "Warning: Unknown paper source \"%s\"\n", source->c_str()); +} + +static const Win32Option win32DuplexMode[] = { { "off", DMDUP_SIMPLEX }, { "short", DMDUP_HORIZONTAL }, { "long", DMDUP_VERTICAL }, { nullptr, 0 } }; + +static void parseDuplex(GooString *mode) +{ + const Win32Option *option = win32DuplexMode; + while (option->name) { + if (mode->cmp(option->name) == 0) { + devmode->dmDuplex = option->value; + devmode->dmFields |= DM_DUPLEX; + return; + } + option++; + } + fprintf(stderr, "Warning: Unknown duplex mode \"%s\"\n", mode->c_str()); +} + +static void fillCommonPrinterOptions(bool duplex) +{ + if (duplex) { + devmode->dmDuplex = DMDUP_HORIZONTAL; + devmode->dmFields |= DM_DUPLEX; + } +} + +static void fillPagePrinterOptions(double w, double h) +{ + w *= 254.0 / 72.0; // units are 0.1mm + h *= 254.0 / 72.0; + if (w > h) { + devmode->dmOrientation = DMORIENT_LANDSCAPE; + devmode->dmPaperWidth = static_cast(h); + devmode->dmPaperLength = static_cast(w); + } else { + devmode->dmOrientation = DMORIENT_PORTRAIT; + devmode->dmPaperWidth = static_cast(w); + devmode->dmPaperLength = static_cast(h); + } + devmode->dmPaperSize = 0; + devmode->dmFields |= DM_ORIENTATION | DM_PAPERWIDTH | DM_PAPERLENGTH; +} + +static void fillPrinterOptions(bool duplex, GooString *printOpt) +{ + // printOpt format is: =,=,... + const char *nextOpt = printOpt->c_str(); + while (nextOpt && *nextOpt) { + const char *comma = strchr(nextOpt, ','); + GooString opt; + if (comma) { + opt.Set(nextOpt, static_cast(comma - nextOpt)); + nextOpt = comma + 1; + } else { + opt.Set(nextOpt); + nextOpt = NULL; + } + // here opt is "= " + const char *equal = strchr(opt.c_str(), '='); + if (!equal) { + fprintf(stderr, "Warning: unknown printer option \"%s\"\n", opt.c_str()); + continue; + } + const int iequal = static_cast(equal - opt.c_str()); + GooString value(&opt, iequal + 1, opt.getLength() - iequal - 1); + opt.del(iequal, opt.getLength() - iequal); + // here opt is "" and value is "" + + if (opt.cmp("source") == 0) { + parseSource(&value); + } else if (opt.cmp("duplex") == 0) { + if (duplex) + fprintf(stderr, "Warning: duplex mode is specified both as standalone and printer options\n"); + else + parseDuplex(&value); + } else { + fprintf(stderr, "Warning: unknown printer option \"%s\"\n", opt.c_str()); + } + } +} + +static void getLocalPos(HWND wind, HWND dlg, RECT *rect) +{ + GetClientRect(wind, rect); + MapWindowPoints(wind, dlg, (LPPOINT)rect, 2); +} + +static HWND createGroupBox(HWND parent, HINSTANCE hInstance, HMENU id, const char *label, RECT *rect) +{ + HWND hwnd = CreateWindowA(WC_BUTTONA, label, WS_CHILD | WS_VISIBLE | BS_GROUPBOX, rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top, parent, id, hInstance, NULL); + HFONT hFont = (HFONT)SendMessage(parent, WM_GETFONT, (WPARAM)0, (LPARAM)0); + if (hFont) + SendMessage(hwnd, WM_SETFONT, (WPARAM)hFont, (LPARAM)0); + return hwnd; +} + +static HWND createCheckBox(HWND parent, HINSTANCE hInstance, HMENU id, const char *label, RECT *rect) +{ + HWND hwnd = CreateWindowA(WC_BUTTONA, label, WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX | WS_TABSTOP, rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top, parent, id, hInstance, NULL); + HFONT hFont = (HFONT)SendMessage(parent, WM_GETFONT, (WPARAM)0, (LPARAM)0); + if (hFont) + SendMessage(hwnd, WM_SETFONT, (WPARAM)hFont, (LPARAM)0); + return hwnd; +} + +static HWND createStaticText(HWND parent, HINSTANCE hinstance, HMENU id, const char *text, RECT *rect) +{ + HWND hwnd = CreateWindowA(WC_STATICA, text, WS_CHILD | WS_VISIBLE | SS_LEFT, rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top, parent, id, hinstance, NULL); + HFONT hFont = (HFONT)SendMessage(parent, WM_GETFONT, (WPARAM)0, (LPARAM)0); + if (hFont) + SendMessage(hwnd, WM_SETFONT, (WPARAM)hFont, (LPARAM)0); + return hwnd; +} + +static HWND createPageScaleComboBox(HWND parent, HINSTANCE hinstance, HMENU id, RECT *rect) +{ + HWND hwnd = CreateWindowA(WC_COMBOBOX, "", WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP | CBS_DROPDOWNLIST, rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top, parent, id, hinstance, NULL); + HFONT hFont = (HFONT)SendMessage(parent, WM_GETFONT, (WPARAM)0, (LPARAM)0); + if (hFont) + SendMessage(hwnd, WM_SETFONT, (WPARAM)hFont, (LPARAM)0); + ComboBox_AddString(hwnd, "None"); + ComboBox_AddString(hwnd, "Shrink to Printable Area"); + ComboBox_AddString(hwnd, "Fit to Printable Area"); + return hwnd; +} + +enum PageScale +{ + NONE = 0, + SHRINK = 1, + FIT = 2 +}; + +// used to set/get option values in printDialogHookProc +static PageScale pageScale; +static bool centerPage; +static bool useOrigPageSize; + +// PrintDlg callback to customize the print dialog with additional controls. +static UINT_PTR CALLBACK printDialogHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) +{ + if (uiMsg == WM_INITDIALOG) { + // Get the extant controls. See dlgs.h and prnsetup.dlg for the PrintDlg control ids. + HWND printerGroupWind = GetDlgItem(hdlg, grp4); + HWND printerComboWind = GetDlgItem(hdlg, cmb4); + HWND nameLabelWind = GetDlgItem(hdlg, stc6); + HWND statusLabelWind = GetDlgItem(hdlg, stc8); + HWND printRangeGroupWind = GetDlgItem(hdlg, grp1); + HWND radio1Wind = GetDlgItem(hdlg, rad1); + HWND radio2Wind = GetDlgItem(hdlg, rad3); + HWND copiesGroupWind = GetDlgItem(hdlg, grp2); + HWND okWind = GetDlgItem(hdlg, IDOK); + HWND cancelWind = GetDlgItem(hdlg, IDCANCEL); + if (!printerGroupWind || !printerComboWind || !nameLabelWind || !statusLabelWind || !printRangeGroupWind || !radio1Wind || !radio2Wind || !copiesGroupWind || !okWind || !cancelWind) + return 0; + + // Get the size and position of the above controls relative to the + // print dialog window + RECT printerGroupRect; + RECT printerComboRect; + RECT nameLabelRect; + RECT statusLabelRect; + RECT printRangeGroupRect; + RECT radio1Rect, radio2Rect; + RECT copiesGroupRect; + RECT okRect, cancelRect; + getLocalPos(printerGroupWind, hdlg, &printerGroupRect); + getLocalPos(printerComboWind, hdlg, &printerComboRect); + getLocalPos(nameLabelWind, hdlg, &nameLabelRect); + getLocalPos(statusLabelWind, hdlg, &statusLabelRect); + getLocalPos(printRangeGroupWind, hdlg, &printRangeGroupRect); + getLocalPos(radio1Wind, hdlg, &radio1Rect); + getLocalPos(radio2Wind, hdlg, &radio2Rect); + getLocalPos(copiesGroupWind, hdlg, &copiesGroupRect); + getLocalPos(okWind, hdlg, &okRect); + getLocalPos(cancelWind, hdlg, &cancelRect); + + // Calc space required for new group + int interGroupSpace = printRangeGroupRect.top - printerGroupRect.bottom; + int groupHeight = statusLabelRect.top - printerGroupRect.top + printRangeGroupRect.bottom - radio1Rect.bottom; + + // Increase dialog size + RECT dlgRect; + GetWindowRect(hdlg, &dlgRect); + SetWindowPos(hdlg, nullptr, dlgRect.left, dlgRect.top, dlgRect.right - dlgRect.left, dlgRect.bottom - dlgRect.top + interGroupSpace + groupHeight, SWP_NOMOVE | SWP_NOREDRAW | SWP_NOZORDER); + + // Add new group and controls + HINSTANCE hinstance = (HINSTANCE)GetWindowLongPtr(hdlg, GWLP_HINSTANCE); + RECT pdfGroupBoxRect; + pdfGroupBoxRect.left = printRangeGroupRect.left; + pdfGroupBoxRect.right = copiesGroupRect.right; + pdfGroupBoxRect.top = printRangeGroupRect.bottom + interGroupSpace; + pdfGroupBoxRect.bottom = pdfGroupBoxRect.top + groupHeight; + createGroupBox(hdlg, hinstance, (HMENU)grp3, "PDF Print Options", &pdfGroupBoxRect); + + RECT textRect; + textRect.left = nameLabelRect.left; + textRect.right = static_cast(nameLabelRect.left + 1.8 * (printerComboRect.left - nameLabelRect.left)); + textRect.top = pdfGroupBoxRect.top + nameLabelRect.top - printerGroupRect.top; + textRect.bottom = textRect.top + nameLabelRect.bottom - nameLabelRect.top; + createStaticText(hdlg, hinstance, (HMENU)stc1, "Page Scaling:", &textRect); + + RECT comboBoxRect; + comboBoxRect.left = textRect.right; + comboBoxRect.right = comboBoxRect.left + printerComboRect.right - printerComboRect.left; + ; + comboBoxRect.top = pdfGroupBoxRect.top + printerComboRect.top - printerGroupRect.top; + comboBoxRect.bottom = textRect.top + 4 * (printerComboRect.bottom - printerComboRect.top); + HWND comboBoxWind = createPageScaleComboBox(hdlg, hinstance, (HMENU)cmb1, &comboBoxRect); + + RECT checkBox1Rect; + checkBox1Rect.left = radio1Rect.left; + checkBox1Rect.right = pdfGroupBoxRect.right - 10; + checkBox1Rect.top = pdfGroupBoxRect.top + statusLabelRect.top - printerGroupRect.top; + checkBox1Rect.bottom = checkBox1Rect.top + radio1Rect.bottom - radio1Rect.top; + HWND checkBox1Wind = createCheckBox(hdlg, hinstance, (HMENU)chx3, "Center", &checkBox1Rect); + + RECT checkBox2Rect; + checkBox2Rect.left = radio1Rect.left; + checkBox2Rect.right = pdfGroupBoxRect.right - 10; + checkBox2Rect.top = checkBox1Rect.top + radio2Rect.top - radio1Rect.top; + checkBox2Rect.bottom = checkBox2Rect.top + radio1Rect.bottom - radio1Rect.top; + HWND checkBox2Wind = createCheckBox(hdlg, hinstance, (HMENU)chx4, "Select page size using document page size", &checkBox2Rect); + + // Move OK and Cancel buttons down ensuring they are last in the Z order + // so that the tab order is correct. + SetWindowPos(okWind, HWND_BOTTOM, okRect.left, okRect.top + interGroupSpace + groupHeight, 0, 0, + SWP_NOSIZE); // keep current size + SetWindowPos(cancelWind, HWND_BOTTOM, cancelRect.left, cancelRect.top + interGroupSpace + groupHeight, 0, 0, + SWP_NOSIZE); // keep current size + + // Initialize control values + ComboBox_SetCurSel(comboBoxWind, pageScale); + Button_SetCheck(checkBox1Wind, centerPage ? BST_CHECKED : BST_UNCHECKED); + Button_SetCheck(checkBox2Wind, useOrigPageSize ? BST_CHECKED : BST_UNCHECKED); + + } else if (uiMsg == WM_COMMAND) { + // Save settings + UINT id = LOWORD(wParam); + if (id == cmb1) + pageScale = (PageScale)ComboBox_GetCurSel(GetDlgItem(hdlg, cmb1)); + if (id == chx3) + centerPage = IsDlgButtonChecked(hdlg, chx3); + if (id == chx4) + useOrigPageSize = IsDlgButtonChecked(hdlg, chx4); + } + return 0; +} + +void win32SetupPrinter(GooString *printer, GooString *printOpt, bool duplex, bool setupdlg) +{ + if (printer->c_str()[0] == 0) { + DWORD size = 0; + GetDefaultPrinterA(nullptr, &size); + printerName = (char *)gmalloc(size); + GetDefaultPrinterA(printerName, &size); + } else { + printerName = copyString(printer->c_str(), printer->getLength()); + } + + // Query the size of the DEVMODE struct + LONG szProp = DocumentPropertiesA(nullptr, nullptr, printerName, nullptr, nullptr, 0); + if (szProp < 0) { + fprintf(stderr, "Error: Printer \"%s\" not found\n", printerName); + exit(99); + } + devmode = (DEVMODEA *)gmalloc(szProp); + memset(devmode, 0, szProp); + devmode->dmSize = sizeof(DEVMODEA); + devmode->dmSpecVersion = DM_SPECVERSION; + // Load the current default configuration for the printer into devmode + if (DocumentPropertiesA(nullptr, nullptr, printerName, devmode, devmode, DM_OUT_BUFFER) < 0) { + fprintf(stderr, "Error: Printer \"%s\" not found\n", printerName); + exit(99); + } + + // Update devmode with selected print options + fillCommonPrinterOptions(duplex); + fillPrinterOptions(duplex, printOpt); + + // Call DocumentProperties again so the driver can update its private data + // with the modified print options. This will also display the printer + // properties dialog if setupdlg is true. + int ret; + DWORD mode = DM_IN_BUFFER | DM_OUT_BUFFER; + if (setupdlg) + mode |= DM_IN_PROMPT; + ret = DocumentPropertiesA(nullptr, nullptr, printerName, devmode, devmode, mode); + if (ret < 0) { + fprintf(stderr, "Error: Printer \"%s\" not found\n", printerName); + exit(99); + } + if (setupdlg && ret == IDCANCEL) + exit(0); + + hdc = CreateDCA(nullptr, printerName, nullptr, devmode); + if (!hdc) { + fprintf(stderr, "Error: Printer \"%s\" not found\n", printerName); + exit(99); + } +} + +void win32ShowPrintDialog(bool *expand, bool *noShrink, bool *noCenter, bool *usePDFPageSize, bool *allPages, int *firstPage, int *lastPage, int maxPages) +{ + PRINTDLG pd; + memset(&pd, 0, sizeof(PRINTDLG)); + pd.lStructSize = sizeof(PRINTDLG); + pd.Flags = PD_NOSELECTION | PD_ENABLEPRINTHOOK | PD_USEDEVMODECOPIESANDCOLLATE | PD_RETURNDC; + if (*allPages) { + pd.nFromPage = 1; + pd.nToPage = maxPages; + } else { + pd.Flags |= PD_PAGENUMS; + pd.nFromPage = *firstPage; + pd.nToPage = *lastPage; + } + pd.nCopies = 1; + pd.nMinPage = 1; + pd.nMaxPage = maxPages; + pd.lpfnPrintHook = printDialogHookProc; + if (!*expand && *noShrink) + pageScale = NONE; + else if (!*expand && !*noShrink) + pageScale = SHRINK; + else + pageScale = FIT; + centerPage = !*noCenter; + useOrigPageSize = *usePDFPageSize; + + if (PrintDlgA(&pd)) { + // Ok + hDevnames = pd.hDevNames; + DEVNAMES *devnames = (DEVNAMES *)GlobalLock(hDevnames); + printerName = (char *)devnames + devnames->wDeviceOffset; + hDevmode = pd.hDevMode; + devmode = (DEVMODEA *)GlobalLock(hDevmode); + hdc = pd.hDC; + if (pd.Flags & PD_PAGENUMS) { + *allPages = false; + *firstPage = pd.nFromPage; + *lastPage = pd.nToPage; + } else { + *allPages = true; + } + if (pageScale == NONE) { + *expand = false; + *noShrink = true; + } else if (pageScale == SHRINK) { + *expand = false; + *noShrink = false; + } else { + *expand = true; + *noShrink = false; + } + *noCenter = !centerPage; + *usePDFPageSize = useOrigPageSize; + } else { + // Cancel + exit(0); + } +} + +cairo_surface_t *win32BeginDocument(GooString *inputFileName, GooString *outputFileName) +{ + DOCINFOA docinfo; + memset(&docinfo, 0, sizeof(docinfo)); + docinfo.cbSize = sizeof(docinfo); + if (inputFileName->cmp("fd://0") == 0) + docinfo.lpszDocName = "pdftocairo "; + else + docinfo.lpszDocName = inputFileName->c_str(); + if (outputFileName) + docinfo.lpszOutput = outputFileName->c_str(); + if (StartDocA(hdc, &docinfo) <= 0) { + fprintf(stderr, "Error: StartDoc failed\n"); + exit(99); + } + + return cairo_win32_printing_surface_create(hdc); +} + +void win32BeginPage(double *w, double *h, bool changePageSize, bool useFullPage) +{ + if (changePageSize) + fillPagePrinterOptions(*w, *h); + if (DocumentPropertiesA(nullptr, nullptr, printerName, devmode, devmode, DM_IN_BUFFER | DM_OUT_BUFFER) < 0) { + fprintf(stderr, "Error: Printer \"%s\" not found\n", printerName); + exit(99); + } + ResetDCA(hdc, devmode); + + // Get actual paper size or if useFullPage is false the printable area. + // Transform the hdc scale to points to be consistent with other cairo backends + int x_dpi = GetDeviceCaps(hdc, LOGPIXELSX); + int y_dpi = GetDeviceCaps(hdc, LOGPIXELSY); + int x_off = GetDeviceCaps(hdc, PHYSICALOFFSETX); + int y_off = GetDeviceCaps(hdc, PHYSICALOFFSETY); + if (useFullPage) { + *w = GetDeviceCaps(hdc, PHYSICALWIDTH) * 72.0 / x_dpi; + *h = GetDeviceCaps(hdc, PHYSICALHEIGHT) * 72.0 / y_dpi; + } else { + *w = GetDeviceCaps(hdc, HORZRES) * 72.0 / x_dpi; + *h = GetDeviceCaps(hdc, VERTRES) * 72.0 / y_dpi; + } + XFORM xform; + xform.eM11 = x_dpi / 72.0f; + xform.eM12 = 0; + xform.eM21 = 0; + xform.eM22 = y_dpi / 72.0f; + if (useFullPage) { + xform.eDx = static_cast(-x_off); + xform.eDy = static_cast(-y_off); + } else { + xform.eDx = 0; + xform.eDy = 0; + } + SetGraphicsMode(hdc, GM_ADVANCED); + SetWorldTransform(hdc, &xform); + + StartPage(hdc); +} + +void win32EndPage(GooString *imageFileName) +{ + EndPage(hdc); +} + +void win32EndDocument() +{ + EndDoc(hdc); + DeleteDC(hdc); + if (hDevmode) { + GlobalUnlock(hDevmode); + GlobalFree(hDevmode); + } else { + gfree(devmode); + } + if (hDevnames) { + GlobalUnlock(hDevnames); + GlobalFree(hDevnames); + } else { + gfree(printerName); + } +} + +#endif // CAIRO_HAS_WIN32_SURFACE diff --git a/poppler-24.05.0/utils/pdftocairo-win32.h b/poppler-24.05.0/utils/pdftocairo-win32.h new file mode 100644 index 0000000000000000000000000000000000000000..b99bd40618094a3c5553e5e3ec4347d5488a9083 --- /dev/null +++ b/poppler-24.05.0/utils/pdftocairo-win32.h @@ -0,0 +1,29 @@ +//======================================================================== +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2014 Rodrigo Rivas Costa +// Copyright (C) 2014 Adrian Johnson +// +// 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 +#include +#include "goo/gmem.h" +#include "goo/GooString.h" + +#ifdef CAIRO_HAS_WIN32_SURFACE + +# include + +void win32SetupPrinter(GooString *printer, GooString *printOpt, bool duplex, bool setupdlg); +void win32ShowPrintDialog(bool *expand, bool *noShrink, bool *noCenter, bool *usePDFPageSize, bool *allPages, int *firstPage, int *lastPage, int maxPages); +cairo_surface_t *win32BeginDocument(GooString *inputFileName, GooString *outputFileName); +void win32BeginPage(double *w, double *h, bool changePageSize, bool useFullPage); +void win32EndPage(GooString *imageFileName); +void win32EndDocument(); + +#endif // CAIRO_HAS_WIN32_SURFACE diff --git a/poppler-24.05.0/utils/pdftocairo.1 b/poppler-24.05.0/utils/pdftocairo.1 new file mode 100644 index 0000000000000000000000000000000000000000..782f81fdaa694e48ce36178c6572bd7eff324da1 --- /dev/null +++ b/poppler-24.05.0/utils/pdftocairo.1 @@ -0,0 +1,350 @@ +.TH pdftocairo 1 +.SH NAME +pdftocairo \- Portable Document Format (PDF) to PNG/JPEG/TIFF/PDF/PS/EPS/SVG using cairo +.SH SYNOPSIS +.B pdftocairo +[options] +.IR PDF-file +.RI [ output-file ] +.SH DESCRIPTION +.B pdftocairo +converts Portable Document Format (PDF) files, using the cairo output device of the poppler PDF library, to any of the following output formats: +.IP \(bu +Portable Network Graphics (PNG) +.IP \(bu +JPEG Interchange Format (JPEG) +.IP \(bu +Tagged Image File Format (TIFF) +.IP \(bu +Portable Document Format (PDF) +.IP \(bu +PostScript (PS) +.IP \(bu +Encapsulated PostScript (EPS) +.IP \(bu +Scalable Vector Graphics (SVG) +.IP \(bu +Windows Printer +.PP +.B pdftocairo +reads the PDF file, +.IR PDF-file , +and writes to +.IR output-file . +The image formats (PNG, JPEG, and TIFF) generate one file per page with the page number and file type appended to +.IR output-file . +When \-singlefile is used with the image formats, the file type is appended to +.IR output-file . +When the output format is a vector format (PDF, PS, EPS, and SVG), +.IR output-file +is the full filename. + +If the +.IR PDF-file +is \*(lq\-\*(rq , the PDF is read from stdin. +If the +.IR output-file +is \*(lq\-\*(rq , the output file will be written to stdout. Using stdout is not valid with image formats unless \-singlefile is used. +If +.IR output-file +is not used, the output filename will be derived from the +.IR PDF-file +filename. +.PP +Not all options are valid with all output formats. One (and only one) of the output format options (\-png, \-jpeg, \-tiff, \-pdf, \-print, \-ps, \-eps, or \-svg) must be used. +.PP +The resolution options (\-r, \-rx, \-ry) set the resolution of the +image output formats. The image dimensions will depend on the PDF page +size and the resolution. For the vector outputs, regions of the page +that can not be represented natively in the output format (eg +translucency in PS) will be rasterized at the resolution specified by +the resolution options. +.PP +The \-scale-to options may be used to set a fixed image size. The +image resolution will vary with the page size. +.PP +The cropping options (\-x, \-y, \-W, and \-H) use units of pixels with +the image formats and PostScript points (1/72 inch) with the vector +formats. When cropping is used with vector output the cropped region is +centered unless \-nocenter is used in which case the cropped region is +at the top left (SVG) or bottom left (PDF, PS, EPS). +.PP +.SH OPTIONS +.TP +.BI \-png +Generates a PNG file(s) +.TP +.BI \-jpeg +Generates a JPEG file(s). See also \-jpegopt. +.TP +.BI \-tiff +Generates a TIFF file(s) +.TP +.BI \-pdf +Generates a PDF file +.TP +.BI \-ps +Generate a PS file +.TP +.BI \-eps +Generate an EPS file. An EPS file contains a single image, so if you +use this option with a multi-page PDF file, you must use \-f and \-l +to specify a single page. The page size options (\-origpagesizes, +\-paper, \-paperw, \-paperh) can not be used with this option. +.TP +.BI \-svg +Generate a SVG (Scalable Vector Graphics) file +.TP +.BI \-print +(Windows only) Prints to a system printer. See also \-printer and \-printeropt. + If an output file is not specified, the output will be sent to the printer. + The output file '-' can not be used with this option. +.TP +.BI \-printdlg +(Windows only) Prints to a system printer. Displays the print dialog to allow +the print options to be modified before printing. +.TP +.BI \-f " number" +Specifies the first page to convert. +.TP +.BI \-l " number" +Specifies the last page to convert. +.TP +.B \-o +Generates only the odd numbered pages. +.TP +.B \-e +Generates only the even numbered pages. +.TP +.BI \-singlefile +Writes only the first page and does not add digits. +.TP +.BI \-r " number" +Specifies the X and Y resolution, in pixels per inch of image files (or rasterized regions in vector output). The default is 150 PPI. +.TP +.BI \-rx " number" +Specifies the X resolution, in pixels per inch of image files (or rasterized regions in vector output). The default is 150 PPI. +.TP +.BI \-ry " number" +Specifies the Y resolution, in pixels per inch of image files (or rasterized regions in vector output). The default is 150 PPI. +.TP +.BI \-scale-to " number" +Scales the long side of each page (width for landscape pages, height +for portrait pages) to fit in scale-to pixels. The size of the short +side will be determined by the aspect ratio of the page (PNG/JPEG/TIFF only). +.TP +.BI \-scale-to-x " number" +Scales each page horizontally to fit in scale-to-x pixels. If +scale-to-y is set to -1, the vertical size will determined by the +aspect ratio of the page (PNG/JPEG/TIFF only). +.TP +.BI \-scale-to-y " number" +Scales each page vertically to fit in scale-to-y pixels. If scale-to-x +is set to -1, the horizontal size will determined by the aspect ratio +of the page (PNG/JPEG/TIFF only). +.TP +.BI \-x " number" +Specifies the x-coordinate of the crop area top left corner in pixels (image output) or points (vector output) +.TP +.BI \-y " number" +Specifies the y-coordinate of the crop area top left corner in pixels (image output) or points (vector output) +.TP +.BI \-W " number" +Specifies the width of crop area in pixels (image output) or points (vector output) (default is 0) +.TP +.BI \-H " number" +Specifies the height of crop area in pixels (image output) or points (vector output) (default is 0) +.TP +.BI \-sz " number" +Specifies the size of crop square in pixels (image output) or points (vector output) (sets \-W and \-H) +.TP +.B \-cropbox +Uses the crop box rather than media box when generating the files (PNG/JPEG/TIFF only) +.TP +.B \-mono +Generate a monochrome file (PNG and TIFF only). +.TP +.B \-gray +Generate a grayscale file (PNG, JPEG, and TIFF only). +.TP +.B \-antialias +Set the cairo antialias option used for text and drawing in image files (or rasterized regions in vector output). The options are: +.RS +.TP +.B default +Use the default antialiasing for the target device. This is the default setting if \-antialias is not used. +.TP +.B none +Antialiasing is disabled. +.TP +.B gray +Perform single-color antialiasing using shades of gray. +.TP +.B subpixel +Perform antialiasing by taking advantage of the order of subpixel elements on devices such as LCD. +.TP +.B fast +Hint that the backend should perform some antialiasing but prefer speed over quality. +.TP +.B good +The backend should balance quality against performance. +.TP +.B best +Hint that the backend should render at the highest quality, sacrificing speed if necessary. +.RE +.TP +.B \-transp +Use a transparent page color instead of white (PNG and TIFF only). +.TP +.BI \-icc " icc-file" +Use the specified ICC file as the output profile (PNG only). The profile will be embedded in the PNG file. +.TP +.BI \-jpegopt " jpeg-options" +When used with \-jpeg, takes a list of options to control the jpeg compression. See +.B JPEG OPTIONS +for the available options. +.TP +.B \-level2 +Generate Level 2 PostScript (PS only). +.TP +.B \-level3 +Generate Level 3 PostScript (PS only). This enables all Level 2 features plus +shading patterns and masked images. This is the default setting. +.TP +.B \-struct +If the input file contains structural information about the document's content, +write this information to the output file (PDF only). +.TP +.B \-origpagesizes +This option is the same as "\-paper match". +.TP +.BI \-paper " size" +Set the paper size to one of "letter", "legal", "A4", or "A3" +(PS,PDF,SVG only). This can also be set to "match", which will set +the paper size of each page to match the size specified in the PDF +file. If none the \-paper, \-paperw, or \-paperh options are +specified the default is to match the paper size. +.TP +.BI \-paperw " size" +Set the paper width, in points (PS,PDF,SVG only). +.TP +.BI \-paperh " size" +Set the paper height, in points (PS,PDF,SVG only). +.TP +.B \-nocrop +By default, printing output is cropped to the CropBox specified in the PDF +file. This option disables cropping (PS,PDF,SVG only). +.TP +.B \-expand +Expand PDF pages smaller than the paper to fill the paper (PS,PDF,SVG only). By +default, these pages are not scaled. +.TP +.B \-noshrink +Don't scale PDF pages which are larger than the paper (PS,PDF,SVG only). By default, +pages larger than the paper are shrunk to fit. +.TP +.B \-nocenter +By default, PDF pages smaller than the paper (after any scaling) are +centered on the paper. This option causes them to be aligned to the +lower-left corner of the paper instead (PS,PDF,SVG only). +.TP +.B \-duplex +Adds the %%IncludeFeature: *Duplex DuplexNoTumble DSC comment to the +PostScript file (PS only). This tells the print manager to enable duplexing. +.TP +.BI \-printer " printer-name" +(Windows only). When used with \-print, specifies the name of the printer to be used, instead of the system default. +.TP +.BI \-printopt " printer-options" +(Windows only). When used with \-print, takes a list of options to be used to configure the printer. See +.B WINDOWS PRINTER OPTIONS +for the available options. +.TP +.BI \-setupdlg +(Windows only). When used with \-print, the printer properties dialog is displayed +allowing the print settings to be modified before printing. The paper size selected +in the print properties dialog will be used except when -origpagesizes is specified. +.TP +.BI \-opw " password" +Specify the owner password for the PDF file. Providing this will +bypass all security restrictions. +.TP +.BI \-upw " password" +Specify the user password for the PDF file. +.TP +.B \-q +Don't print any messages or errors. +.TP +.B \-v +Print copyright and version information. +.TP +.B \-h +Print usage information. +.RB ( \-help +and +.B \-\-help +are equivalent.) +.SH EXIT CODES +The poppler tools use the following exit codes: +.TP +0 +No error. +.TP +1 +Error opening a PDF file. +.TP +2 +Error opening an output file. +.TP +3 +Error related to PDF permissions. +.TP +4 +Error related to ICC profile. +.TP +99 +Other error. +.SH JPEG OPTIONS +When JPEG output is specified, the \-jpegopt option can be used to control the JPEG compression parameters. +It takes a string of the form "=[,=]". Currently the available options are: +.TP +.BI quality +Selects the JPEG quality value. The value must be an integer between 0 and 100. +.TP +.BI progressive +Select progressive JPEG output. The possible values are "y", "n", +indicating progressive (yes) or non-progressive (no), respectively. +.TP +.BI optimize +Sets whether to compute optimal Huffman coding tables for the JPEG output, which +will create smaller files but make an extra pass over the data. The value must +be "y" or "n", with "y" performing optimization, otherwise the default Huffman +tables are used. +.SH WINDOWS PRINTER OPTIONS +In Windows, you can use the \-print option to print directly to a system printer. Additionally, you can use the \-printopt +option to configure the printer. It takes a string of the form "=[,=]". Currently the available options are: +.TP +.BI source +Selects the source paper tray to be used (bin). The possible values are "upper", "onlyone", "lower", "middle", "manual", "envelope", +"envmanual", "auto", "tractor", "smallfmt", "largefmt", "largecapacity", "formsource", or a numeric value to choose a driver specific source. +.TP +.BI duplex +Sets the duplex mode of the printer. The possible values are "off", "short" or "long", +indicating no duplexing, short-edge binding, or long-edge binding, respectively. +General option \-duplex is a synonym of "duplex=long". If both options are specified, +\-printopt has priority. +.SH AUTHOR +The pdftocairo software and documentation are copyright 1996-2004 Glyph +& Cog, LLC and copyright 2005-2011 The Poppler Developers. +.SH "SEE ALSO" +.BR pdfdetach (1), +.BR pdffonts (1), +.BR pdfimages (1), +.BR pdfinfo (1), +.BR pdftohtml (1), +.BR pdftoppm (1), +.BR pdftops (1), +.BR pdftotext (1) +.BR pdfseparate (1), +.BR pdfsig (1), +.BR pdfunite (1) diff --git a/poppler-24.05.0/utils/pdftocairo.cc b/poppler-24.05.0/utils/pdftocairo.cc new file mode 100644 index 0000000000000000000000000000000000000000..3b8ba7d237b0587a364d4d5ad1ee615f16929401 --- /dev/null +++ b/poppler-24.05.0/utils/pdftocairo.cc @@ -0,0 +1,1300 @@ +//======================================================================== +// +// pdftocairo.cc +// +// Copyright 2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2007 Ilmari Heikkinen +// Copyright (C) 2008 Richard Airlie +// Copyright (C) 2009 Michael K. Johnson +// Copyright (C) 2009 Shen Liang +// Copyright (C) 2009 Stefan Thomas +// Copyright (C) 2009, 2010, 2017-2020, 2022 Albert Astals Cid +// Copyright (C) 2010, 2011-2017, 2023 Adrian Johnson +// Copyright (C) 2010, 2014 Hib Eris +// Copyright (C) 2010 Jonathan Liu +// Copyright (C) 2010 William Bader +// Copyright (C) 2011 Thomas Freitag +// Copyright (C) 2011, 2015 Carlos Garcia Campos +// Copyright (C) 2012 Koji Otani +// Copyright (C) 2013 Lu Wang +// Copyright (C) 2013, 2017 Suzuki Toshiya +// Copyright (C) 2014 Rodrigo Rivas Costa +// Copyright (C) 2016 Jason Crain +// Copyright (C) 2018 Martin Packman +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019, 2020 Oliver Sander +// Copyright (C) 2019 Kris Jurka +// Copyright (C) 2020, 2021 Oliver Sander +// Copyright (C) 2020 Philipp Knechtges +// Copyright (C) 2020 Salvo Miosi +// Copyright (C) 2021 Peter Williams +// Copyright (C) 2021 Christian Persch +// Copyright (C) 2022 James Cloos +// Copyright (C) 2023 Anton Thomasson +// +// 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" +#include +#include +#include +#include +#include +#include +#if defined(_WIN32) || defined(__CYGWIN__) +# include // for _setmode +#endif +#include "parseargs.h" +#include "goo/gmem.h" +#include "goo/GooString.h" +#include "goo/ImgWriter.h" +#include "goo/JpegWriter.h" +#include "goo/PNGWriter.h" +#include "goo/TiffWriter.h" +#include "GlobalParams.h" +#include "Object.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "CairoOutputDev.h" +#include "Win32Console.h" +#include "numberofcharacters.h" +#ifdef USE_CMS +# include +#endif +#include +#ifdef CAIRO_HAS_PS_SURFACE +# include +#endif +#ifdef CAIRO_HAS_PDF_SURFACE +# include +#endif +#ifdef CAIRO_HAS_SVG_SURFACE +# include +#endif + +#include "pdftocairo-win32.h" + +static bool png = false; +static bool jpeg = false; +static bool ps = false; +static bool eps = false; +static bool pdf = false; +static bool printToWin32 = false; +static bool printdlg = false; +static bool svg = false; +static bool tiff = false; + +static int firstPage = 1; +static int lastPage = 0; +static bool printOnlyOdd = false; +static bool printOnlyEven = false; +static bool singleFile = false; +static double resolution = 0.0; +static double x_resolution = 150.0; +static double y_resolution = 150.0; +static int scaleTo = 0; +static int x_scaleTo = 0; +static int y_scaleTo = 0; +static int crop_x = 0; +static int crop_y = 0; +static int crop_w = 0; +static int crop_h = 0; +static int sz = 0; +static bool useCropBox = false; +static bool mono = false; +static bool gray = false; +static bool transp = false; +static GooString antialias; +static GooString icc; + +static bool level2 = false; +static bool level3 = false; +static bool origPageSizes = false; +static char paperSize[15] = ""; +static int paperWidth = -1; +static int paperHeight = -1; +static bool noCrop = false; +static bool expand = false; +static bool noShrink = false; +static bool noCenter = false; +static bool duplex = false; +static char tiffCompressionStr[16] = ""; +static bool docStruct = false; + +static char ownerPassword[33] = ""; +static char userPassword[33] = ""; +static bool quiet = false; +static bool printVersion = false; +static bool printHelp = false; + +static GooString jpegOpt; +static int jpegQuality = -1; +static bool jpegProgressive = false; +static bool jpegOptimize = false; + +static GooString printer; +static GooString printOpt; +#ifdef CAIRO_HAS_WIN32_SURFACE +static bool setupdlg = false; +#endif + +static const ArgDesc argDesc[] = { +#ifdef ENABLE_LIBPNG + { "-png", argFlag, &png, 0, "generate a PNG file" }, +#endif +#ifdef ENABLE_LIBJPEG + { "-jpeg", argFlag, &jpeg, 0, "generate a JPEG file" }, + { "-jpegopt", argGooString, &jpegOpt, 0, "jpeg options, with format =[,=]*" }, +#endif +#ifdef ENABLE_LIBTIFF + { "-tiff", argFlag, &tiff, 0, "generate a TIFF file" }, + { "-tiffcompression", argString, tiffCompressionStr, sizeof(tiffCompressionStr), "set TIFF compression: none, packbits, jpeg, lzw, deflate" }, +#endif +#ifdef CAIRO_HAS_PS_SURFACE + { "-ps", argFlag, &ps, 0, "generate PostScript file" }, + { "-eps", argFlag, &eps, 0, "generate Encapsulated PostScript (EPS)" }, +#endif +#ifdef CAIRO_HAS_PDF_SURFACE + { "-pdf", argFlag, &pdf, 0, "generate a PDF file" }, +#endif +#ifdef CAIRO_HAS_SVG_SURFACE + { "-svg", argFlag, &svg, 0, "generate a Scalable Vector Graphics (SVG) file" }, +#endif +#ifdef CAIRO_HAS_WIN32_SURFACE + { "-print", argFlag, &printToWin32, 0, "print to a Windows printer" }, + { "-printdlg", argFlag, &printdlg, 0, "show Windows print dialog and print" }, + { "-printer", argGooString, &printer, 0, "printer name or use default if this option is not specified" }, + { "-printopt", argGooString, &printOpt, 0, "printer options, with format =[,=]*" }, + { "-setupdlg", argFlag, &setupdlg, 0, "show printer setup dialog before printing" }, +#endif + + { "-f", argInt, &firstPage, 0, "first page to print" }, + { "-l", argInt, &lastPage, 0, "last page to print" }, + { "-o", argFlag, &printOnlyOdd, 0, "print only odd pages" }, + { "-e", argFlag, &printOnlyEven, 0, "print only even pages" }, + { "-singlefile", argFlag, &singleFile, 0, "write only the first page and do not add digits" }, + + { "-r", argFP, &resolution, 0, "resolution, in PPI (default is 150)" }, + { "-rx", argFP, &x_resolution, 0, "X resolution, in PPI (default is 150)" }, + { "-ry", argFP, &y_resolution, 0, "Y resolution, in PPI (default is 150)" }, + { "-scale-to", argInt, &scaleTo, 0, "scales each page to fit within scale-to*scale-to pixel box" }, + { "-scale-to-x", argInt, &x_scaleTo, 0, "scales each page horizontally to fit in scale-to-x pixels" }, + { "-scale-to-y", argInt, &y_scaleTo, 0, "scales each page vertically to fit in scale-to-y pixels" }, + + { "-x", argInt, &crop_x, 0, "x-coordinate of the crop area top left corner" }, + { "-y", argInt, &crop_y, 0, "y-coordinate of the crop area top left corner" }, + { "-W", argInt, &crop_w, 0, "width of crop area in pixels (default is 0)" }, + { "-H", argInt, &crop_h, 0, "height of crop area in pixels (default is 0)" }, + { "-sz", argInt, &sz, 0, "size of crop square in pixels (sets W and H)" }, + { "-cropbox", argFlag, &useCropBox, 0, "use the crop box rather than media box" }, + + { "-mono", argFlag, &mono, 0, "generate a monochrome image file (PNG, JPEG)" }, + { "-gray", argFlag, &gray, 0, "generate a grayscale image file (PNG, JPEG)" }, + { "-transp", argFlag, &transp, 0, "use a transparent background instead of white (PNG)" }, + { "-antialias", argGooString, &antialias, 0, "set cairo antialias option" }, +#ifdef USE_CMS + { "-icc", argGooString, &icc, 0, "ICC color profile to use" }, +#endif + + { "-level2", argFlag, &level2, 0, "generate Level 2 PostScript (PS, EPS)" }, + { "-level3", argFlag, &level3, 0, "generate Level 3 PostScript (PS, EPS)" }, + { "-origpagesizes", argFlag, &origPageSizes, 0, "conserve original page sizes (PS, PDF, SVG)" }, + { "-paper", argString, paperSize, sizeof(paperSize), "paper size (letter, legal, A4, A3, match)" }, + { "-paperw", argInt, &paperWidth, 0, "paper width, in points" }, + { "-paperh", argInt, &paperHeight, 0, "paper height, in points" }, + { "-nocrop", argFlag, &noCrop, 0, "don't crop pages to CropBox" }, + { "-expand", argFlag, &expand, 0, "expand pages smaller than the paper size" }, + { "-noshrink", argFlag, &noShrink, 0, "don't shrink pages larger than the paper size" }, + { "-nocenter", argFlag, &noCenter, 0, "don't center pages smaller than the paper size" }, + { "-duplex", argFlag, &duplex, 0, "enable duplex printing" }, + +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 18, 0) + { "-struct", argFlag, &docStruct, 0, "enable logical document structure" }, +#endif + + { "-opw", argString, ownerPassword, sizeof(ownerPassword), "owner password (for encrypted files)" }, + { "-upw", argString, userPassword, sizeof(userPassword), "user password (for encrypted files)" }, + + { "-q", argFlag, &quiet, 0, "don't print any messages or errors" }, + { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} +}; + +static cairo_surface_t *surface; +static bool printing; +static FILE *output_file; +static bool usePDFPageSize; +static cairo_antialias_t antialiasEnum = CAIRO_ANTIALIAS_DEFAULT; + +#ifdef USE_CMS +static unsigned char *icc_data; +static int icc_data_size; +static GfxLCMSProfilePtr profile; +#endif + +struct AntialiasOption +{ + const char *name; + cairo_antialias_t value; +}; + +static const AntialiasOption antialiasOptions[] = { + { "default", CAIRO_ANTIALIAS_DEFAULT }, { "none", CAIRO_ANTIALIAS_NONE }, { "gray", CAIRO_ANTIALIAS_GRAY }, { "subpixel", CAIRO_ANTIALIAS_SUBPIXEL }, + { "fast", CAIRO_ANTIALIAS_FAST }, { "good", CAIRO_ANTIALIAS_GOOD }, { "best", CAIRO_ANTIALIAS_BEST }, { nullptr, CAIRO_ANTIALIAS_DEFAULT }, +}; + +static bool parseAntialiasOption() +{ + const AntialiasOption *option = antialiasOptions; + while (option->name) { + if (antialias.cmp(option->name) == 0) { + antialiasEnum = option->value; + return true; + } + option++; + } + + fprintf(stderr, "Error: Invalid antialias option \"%s\"\n", antialias.c_str()); + fprintf(stderr, "Valid options are:\n"); + option = antialiasOptions; + while (option->name) { + fprintf(stderr, " %s\n", option->name); + option++; + } + return false; +} + +static bool parseJpegOptions() +{ + // jpegOpt format is: =,=,... + const char *nextOpt = jpegOpt.c_str(); + while (nextOpt && *nextOpt) { + const char *comma = strchr(nextOpt, ','); + GooString opt; + if (comma) { + opt.Set(nextOpt, static_cast(comma - nextOpt)); + nextOpt = comma + 1; + } else { + opt.Set(nextOpt); + nextOpt = nullptr; + } + // here opt is "= " + const char *equal = strchr(opt.c_str(), '='); + if (!equal) { + fprintf(stderr, "Unknown jpeg option \"%s\"\n", opt.c_str()); + return false; + } + const int iequal = static_cast(equal - opt.c_str()); + GooString value(&opt, iequal + 1, opt.getLength() - iequal - 1); + opt.del(iequal, opt.getLength() - iequal); + // here opt is "" and value is "" + + if (opt.cmp("quality") == 0) { + if (!isInt(value.c_str())) { + fprintf(stderr, "Invalid jpeg quality\n"); + return false; + } + jpegQuality = atoi(value.c_str()); + if (jpegQuality < 0 || jpegQuality > 100) { + fprintf(stderr, "jpeg quality must be between 0 and 100\n"); + return false; + } + } else if (opt.cmp("progressive") == 0) { + jpegProgressive = false; + if (value.cmp("y") == 0) { + jpegProgressive = true; + } else if (value.cmp("n") != 0) { + fprintf(stderr, "jpeg progressive option must be \"y\" or \"n\"\n"); + return false; + } + } else if (opt.cmp("optimize") == 0 || opt.cmp("optimise") == 0) { + jpegOptimize = false; + if (value.cmp("y") == 0) { + jpegOptimize = true; + } else if (value.cmp("n") != 0) { + fprintf(stderr, "jpeg optimize option must be \"y\" or \"n\"\n"); + return false; + } + } else { + fprintf(stderr, "Unknown jpeg option \"%s\"\n", opt.c_str()); + return false; + } + } + return true; +} + +static void writePageImage(GooString *filename) +{ + ImgWriter *writer = nullptr; + FILE *file; + int height, width, stride; + unsigned char *data; + + if (png) { +#ifdef ENABLE_LIBPNG + if (transp) { + writer = new PNGWriter(PNGWriter::RGBA); + } else if (gray) { + writer = new PNGWriter(PNGWriter::GRAY); + } else if (mono) { + writer = new PNGWriter(PNGWriter::MONOCHROME); + } else { + writer = new PNGWriter(PNGWriter::RGB); + } + +# ifdef USE_CMS + if (icc_data) { + cmsUInt8Number profileID[17]; + profileID[16] = '\0'; + + cmsGetHeaderProfileID(profile.get(), profileID); + static_cast(writer)->setICCProfile(reinterpret_cast(profileID), icc_data, icc_data_size); + } else { + static_cast(writer)->setSRGBProfile(); + } +# endif +#endif + + } else if (jpeg) { +#ifdef ENABLE_LIBJPEG + if (gray) { + writer = new JpegWriter(JpegWriter::GRAY); + } else { + writer = new JpegWriter(JpegWriter::RGB); + } + + static_cast(writer)->setOptimize(jpegOptimize); + static_cast(writer)->setProgressive(jpegProgressive); + if (jpegQuality >= 0) { + static_cast(writer)->setQuality(jpegQuality); + } +#endif + } else if (tiff) { +#ifdef ENABLE_LIBTIFF + if (transp) { + writer = new TiffWriter(TiffWriter::RGBA_PREMULTIPLIED); + } else if (gray) { + writer = new TiffWriter(TiffWriter::GRAY); + } else if (mono) { + writer = new TiffWriter(TiffWriter::MONOCHROME); + } else { + writer = new TiffWriter(TiffWriter::RGB); + } + static_cast(writer)->setCompressionString(tiffCompressionStr); +#endif + } + if (!writer) { + return; + } + + if (filename->cmp("fd://0") == 0) { +#if defined(_WIN32) || defined(__CYGWIN__) + _setmode(fileno(stdout), O_BINARY); +#endif + file = stdout; + } else { + file = fopen(filename->c_str(), "wb"); + } + + if (!file) { + fprintf(stderr, "Error opening output file %s\n", filename->c_str()); + exit(2); + } + + height = cairo_image_surface_get_height(surface); + width = cairo_image_surface_get_width(surface); + stride = cairo_image_surface_get_stride(surface); + cairo_surface_flush(surface); + data = cairo_image_surface_get_data(surface); + + if (!writer->init(file, width, height, x_resolution, y_resolution)) { + fprintf(stderr, "Error writing %s\n", filename->c_str()); + exit(2); + } + unsigned char *row = (unsigned char *)gmallocn(width, 4); + + for (int y = 0; y < height; y++) { + uint32_t *pixel = reinterpret_cast((data + y * stride)); + unsigned char *rowp = row; + int bit = 7; + for (int x = 0; x < width; x++, pixel++) { + if (transp) { + if (tiff) { + // RGBA premultipled format + *rowp++ = (*pixel & 0xff0000) >> 16; + *rowp++ = (*pixel & 0x00ff00) >> 8; + *rowp++ = (*pixel & 0x0000ff) >> 0; + *rowp++ = (*pixel & 0xff000000) >> 24; + } else { + // unpremultiply into RGBA format + uint8_t a; + a = (*pixel & 0xff000000) >> 24; + if (a == 0) { + *rowp++ = 0; + *rowp++ = 0; + *rowp++ = 0; + } else { + *rowp++ = (((*pixel & 0xff0000) >> 16) * 255 + a / 2) / a; + *rowp++ = (((*pixel & 0x00ff00) >> 8) * 255 + a / 2) / a; + *rowp++ = (((*pixel & 0x0000ff) >> 0) * 255 + a / 2) / a; + } + *rowp++ = a; + } + } else if (gray || mono) { + // convert to gray + // The PDF Reference specifies the DeviceRGB to DeviceGray conversion as + // gray = 0.3*red + 0.59*green + 0.11*blue + const int r = (*pixel & 0x00ff0000) >> 16; + const int g = (*pixel & 0x0000ff00) >> 8; + const int b = (*pixel & 0x000000ff) >> 0; + // an arbitrary integer approximation of .3*r + .59*g + .11*b + const int grayValue = (r * 19661 + g * 38666 + b * 7209 + 32829) >> 16; + if (mono) { + if (bit == 7) { + *rowp = 0; + } + if (grayValue > 127) { + *rowp |= (1 << bit); + } + bit--; + if (bit < 0) { + bit = 7; + rowp++; + } + } else { + *rowp++ = grayValue; + } + } else { + // copy into RGB format + *rowp++ = (*pixel & 0x00ff0000) >> 16; + *rowp++ = (*pixel & 0x0000ff00) >> 8; + *rowp++ = (*pixel & 0x000000ff) >> 0; + } + } + writer->writeRow(&row); + } + gfree(row); + writer->close(); + delete writer; + if (file == stdout) { + fflush(file); + } else { + fclose(file); + } +} + +static void getCropSize(double page_w, double page_h, double *width, double *height) +{ + int w = crop_w; + int h = crop_h; + + if (w == 0) { + w = (int)ceil(page_w); + } + + if (h == 0) { + h = (int)ceil(page_h); + } + + *width = (crop_x + w > page_w ? (int)ceil(page_w - crop_x) : w); + *height = (crop_y + h > page_h ? (int)ceil(page_h - crop_y) : h); +} + +static void getOutputSize(double page_w, double page_h, double *width, double *height) +{ + + if (printing) { + if (usePDFPageSize) { + *width = page_w; + *height = page_h; + } else { + if (page_w > page_h) { + *width = paperHeight; + *height = paperWidth; + } else { + *width = paperWidth; + *height = paperHeight; + } + } + } else { + getCropSize(page_w * x_resolution / 72.0, page_h * y_resolution / 72.0, width, height); + } +} + +static void getFitToPageTransform(double page_w, double page_h, double paper_w, double paper_h, cairo_matrix_t *m) +{ + double x_scale, y_scale, scale; + + x_scale = paper_w / page_w; + y_scale = paper_h / page_h; + if (x_scale < y_scale) { + scale = x_scale; + } else { + scale = y_scale; + } + + if (scale > 1.0 && !expand) { + scale = 1.0; + } + if (scale < 1.0 && noShrink) { + scale = 1.0; + } + + cairo_matrix_init_identity(m); + if (!noCenter) { + // centre page + cairo_matrix_translate(m, (paper_w - page_w * scale) / 2, (paper_h - page_h * scale) / 2); + } else if (!svg) { + // move to PostScript origin + cairo_matrix_translate(m, 0, (paper_h - page_h * scale)); + } + cairo_matrix_scale(m, scale, scale); +} + +static cairo_status_t writeStream(void *closure, const unsigned char *data, unsigned int length) +{ + FILE *file = (FILE *)closure; + + if (fwrite(data, length, 1, file) == 1) { + return CAIRO_STATUS_SUCCESS; + } else { + return CAIRO_STATUS_WRITE_ERROR; + } +} + +static void beginDocument(GooString *inputFileName, GooString *outputFileName, double w, double h) +{ + if (printing) { + if (printToWin32) { + output_file = nullptr; + } else { + if (outputFileName->cmp("fd://0") == 0) { +#if defined(_WIN32) || defined(__CYGWIN__) + _setmode(fileno(stdout), O_BINARY); +#endif + output_file = stdout; + } else { + output_file = fopen(outputFileName->c_str(), "wb"); + if (!output_file) { + fprintf(stderr, "Error opening output file %s\n", outputFileName->c_str()); + exit(2); + } + } + } + + if (ps || eps) { +#ifdef CAIRO_HAS_PS_SURFACE + surface = cairo_ps_surface_create_for_stream(writeStream, output_file, w, h); + if (level2) { + cairo_ps_surface_restrict_to_level(surface, CAIRO_PS_LEVEL_2); + } + if (eps) { + cairo_ps_surface_set_eps(surface, 1); + } + if (duplex) { + cairo_ps_surface_dsc_comment(surface, "%%Requirements: duplex"); + cairo_ps_surface_dsc_begin_setup(surface); + cairo_ps_surface_dsc_comment(surface, "%%IncludeFeature: *Duplex DuplexNoTumble"); + } + cairo_ps_surface_dsc_begin_page_setup(surface); +#endif + } else if (pdf) { +#ifdef CAIRO_HAS_PDF_SURFACE + surface = cairo_pdf_surface_create_for_stream(writeStream, output_file, w, h); +#endif + } else if (svg) { +#ifdef CAIRO_HAS_SVG_SURFACE + surface = cairo_svg_surface_create_for_stream(writeStream, output_file, w, h); + cairo_svg_surface_restrict_to_version(surface, CAIRO_SVG_VERSION_1_2); +#endif + } +#ifdef CAIRO_HAS_WIN32_SURFACE + if (printToWin32) + surface = win32BeginDocument(inputFileName, outputFileName); +#endif + } +} + +static void beginPage(double *w, double *h) +{ + if (printing) { + if (ps) { +#ifdef CAIRO_HAS_PS_SURFACE + if (*w > *h) { + cairo_ps_surface_dsc_comment(surface, "%%PageOrientation: Landscape"); + cairo_ps_surface_set_size(surface, *h, *w); + } else { + cairo_ps_surface_dsc_comment(surface, "%%PageOrientation: Portrait"); + cairo_ps_surface_set_size(surface, *w, *h); + } +#endif + } + +#ifdef CAIRO_HAS_PDF_SURFACE + if (pdf) { + cairo_pdf_surface_set_size(surface, *w, *h); + } +#endif + +#ifdef CAIRO_HAS_WIN32_SURFACE + if (printToWin32) { + bool changePageSize = true; + if (setupdlg && !origPageSizes) + changePageSize = false; + win32BeginPage(w, h, changePageSize, noShrink); // w,h will be changed to actual size used + } +#endif + + cairo_surface_set_fallback_resolution(surface, x_resolution, y_resolution); + + } else { + surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, static_cast(ceil(*w)), static_cast(ceil(*h))); + } +} + +static void renderPage(PDFDoc *doc, CairoOutputDev *cairoOut, int pg, double page_w, double page_h, double output_w, double output_h) +{ + cairo_t *cr; + cairo_status_t status; + cairo_matrix_t m; + cairo_font_options_t *font_options; + + cr = cairo_create(surface); + + cairo_set_antialias(cr, antialiasEnum); + + font_options = cairo_font_options_create(); + cairo_get_font_options(cr, font_options); + cairo_font_options_set_antialias(font_options, antialiasEnum); + cairo_set_font_options(cr, font_options); + cairo_font_options_destroy(font_options); + + cairoOut->setCairo(cr); + cairoOut->setPrinting(printing); + + cairo_save(cr); + if (ps && output_w > output_h) { + // rotate 90 deg for landscape + cairo_translate(cr, 0, output_w); + cairo_matrix_init(&m, 0, -1, 1, 0, 0, 0); + cairo_transform(cr, &m); + } + cairo_translate(cr, -crop_x, -crop_y); + if (printing) { + double cropped_w, cropped_h; + getCropSize(page_w, page_h, &cropped_w, &cropped_h); + getFitToPageTransform(cropped_w, cropped_h, output_w, output_h, &m); + cairo_transform(cr, &m); + cairo_rectangle(cr, crop_x, crop_y, cropped_w, cropped_h); + cairo_clip(cr); + } else { + cairo_scale(cr, x_resolution / 72.0, y_resolution / 72.0); + } + doc->displayPageSlice(cairoOut, pg, 72.0, 72.0, 0, /* rotate */ + !useCropBox, /* useMediaBox */ + false, /* Crop */ + printing, -1, -1, -1, -1); + cairo_restore(cr); + cairoOut->setCairo(nullptr); + + // Blend onto white page + if (!printing && !transp) { + cairo_save(cr); + cairo_set_operator(cr, CAIRO_OPERATOR_DEST_OVER); + cairo_set_source_rgb(cr, 1, 1, 1); + cairo_paint(cr); + cairo_restore(cr); + } + + status = cairo_status(cr); + if (status) { + fprintf(stderr, "cairo error: %s\n", cairo_status_to_string(status)); + } + cairo_destroy(cr); +} + +static void endPage(GooString *imageFileName, CairoOutputDev *cairoOut, bool isLastPage) +{ + cairo_status_t status; + cairo_t *cr; + + if (printing) { + if (isLastPage) { + cr = cairo_create(surface); + cairoOut->setCairo(cr); + cairoOut->setPrinting(printing); + cairoOut->emitStructTree(); + cairoOut->setCairo(nullptr); + status = cairo_status(cr); + if (status) { + fprintf(stderr, "cairo error: %s\n", cairo_status_to_string(status)); + } + cairo_destroy(cr); + } + + cairo_surface_show_page(surface); + +#ifdef CAIRO_HAS_WIN32_SURFACE + if (printToWin32) + win32EndPage(imageFileName); +#endif + + } else { + writePageImage(imageFileName); + cairo_surface_finish(surface); + status = cairo_surface_status(surface); + if (status) { + fprintf(stderr, "cairo error: %s\n", cairo_status_to_string(status)); + } + cairo_surface_destroy(surface); + } +} + +static void endDocument() +{ + cairo_status_t status; + + if (printing) { + cairo_surface_finish(surface); + status = cairo_surface_status(surface); + if (status) { + fprintf(stderr, "cairo error: %s\n", cairo_status_to_string(status)); + } + cairo_surface_destroy(surface); +#ifdef CAIRO_HAS_WIN32_SURFACE + if (printToWin32) + win32EndDocument(); +#endif + if (output_file) { + fclose(output_file); + } + } +} + +static bool setPSPaperSize(char *size, int &psPaperWidth, int &psPaperHeight) +{ + if (!strcmp(size, "match")) { + psPaperWidth = psPaperHeight = -1; + } else if (!strcmp(size, "letter")) { + psPaperWidth = 612; + psPaperHeight = 792; + } else if (!strcmp(size, "legal")) { + psPaperWidth = 612; + psPaperHeight = 1008; + } else if (!strcmp(size, "A4")) { + psPaperWidth = 595; + psPaperHeight = 842; + } else if (!strcmp(size, "A3")) { + psPaperWidth = 842; + psPaperHeight = 1190; + } else { + return false; + } + return true; +} + +static GooString *getImageFileName(GooString *outputFileName, int numDigits, int page) +{ + char buf[10]; + GooString *imageName = new GooString(outputFileName); + if (!singleFile) { + snprintf(buf, sizeof(buf), "-%0*d", numDigits, page); + imageName->append(buf); + } + if (outputFileName->cmp("fd://0") != 0) { + if (png) { + imageName->append(".png"); + } else if (jpeg) { + imageName->append(".jpg"); + } else if (tiff) { + imageName->append(".tif"); + } + } + + return imageName; +} + +// If (printing || singleFile) the output file name includes the +// extension. Otherwise it is the file name base. +static GooString *getOutputFileName(GooString *fileName, GooString *outputName) +{ + GooString *name; + + if (outputName) { + if (outputName->cmp("-") == 0) { + if (printToWin32 || (!printing && !singleFile)) { + fprintf(stderr, "Error: stdout may only be used with the ps, eps, pdf, svg output options or if -singlefile is used.\n"); + exit(99); + } + return new GooString("fd://0"); + } + return new GooString(outputName); + } + + if (printToWin32) { + return nullptr; // No output file means print to printer + } + + if (fileName->cmp("fd://0") == 0) { + fprintf(stderr, "Error: an output filename or '-' must be supplied when the PDF file is stdin.\n"); + exit(99); + } + + // be careful not to overwrite the input file when the output format is PDF + if (pdf && fileName->cmpN("http://", 7) != 0 && fileName->cmpN("https://", 8) != 0) { + fprintf(stderr, "Error: an output filename or '-' must be supplied when the output format is PDF and input PDF file is a local file.\n"); + exit(99); + } + + // strip everything up to last '/' + const char *s = fileName->c_str(); + const char *p = strrchr(s, '/'); + if (p) { + p++; + if (*p == 0) { + fprintf(stderr, "Error: invalid output filename.\n"); + exit(99); + } + name = new GooString(p); + } else { + name = new GooString(s); + } + + // remove .pdf extension + p = strrchr(name->c_str(), '.'); + if (p && strcasecmp(p, ".pdf") == 0) { + GooString *name2 = new GooString(name->c_str(), name->getLength() - 4); + delete name; + name = name2; + } + + // append new extension + if (ps) { + name->append(".ps"); + } else if (eps) { + name->append(".eps"); + } else if (pdf) { + name->append(".pdf"); + } else if (svg) { + name->append(".svg"); + } + + return name; +} + +static void checkInvalidPrintOption(bool option, const char *option_name) +{ + if (option) { + fprintf(stderr, "Error: %s may only be used with the -png, -jpeg, or -tiff output options.\n", option_name); + exit(99); + } +} + +static void checkInvalidImageOption(bool option, const char *option_name) +{ + if (option) { + fprintf(stderr, "Error: %s may only be used with the -ps, -eps, -pdf, or -svg output options.\n", option_name); + exit(99); + } +} + +int main(int argc, char *argv[]) +{ + GooString *fileName = nullptr; + GooString *outputName = nullptr; + GooString *outputFileName = nullptr; + GooString *imageFileName = nullptr; + std::optional ownerPW, userPW; + CairoOutputDev *cairoOut; + int pg, pg_num_len; + double pg_w, pg_h, tmp, output_w, output_h; + int num_outputs; + + // parse args + Win32Console win32Console(&argc, &argv); + if (!parseArgs(argDesc, &argc, argv)) { + printUsage("pdftocairo", nullptr, argDesc); + exit(99); + } + + if (resolution != 0.0 && (x_resolution == 150.0 || y_resolution == 150.0)) { + x_resolution = resolution; + y_resolution = resolution; + } + if (argc < 2 || argc > 3 || printVersion || printHelp) { + fprintf(stderr, "pdftocairo version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", xpdfCopyright); + if (!printVersion) { + printUsage("pdftocairo", " []", argDesc); + } + if (printVersion || printHelp) { + exit(0); + } else { + exit(99); + } + } + + num_outputs = (png ? 1 : 0) + (jpeg ? 1 : 0) + (tiff ? 1 : 0) + (ps ? 1 : 0) + (eps ? 1 : 0) + (pdf ? 1 : 0) + (printToWin32 ? 1 : 0) + (printdlg ? 1 : 0) + (svg ? 1 : 0); + if (num_outputs == 0) { + fprintf(stderr, "Error: one of the output format options (-png, -jpeg, -ps, -eps, -pdf, -print, -printdlg, -svg) must be used.\n"); + exit(99); + } + if (num_outputs > 1) { + fprintf(stderr, "Error: use only one of the output format options (-png, -jpeg, -ps, -eps, -pdf, -printdlg, -print, -svg).\n"); + exit(99); + } + if (png || jpeg || tiff) { + printing = false; + } else { + printing = true; + } + + if (printing) { + checkInvalidPrintOption(mono, "-mono"); + checkInvalidPrintOption(gray, "-gray"); + checkInvalidPrintOption(transp, "-transp"); + checkInvalidPrintOption(icc.c_str()[0], "-icc"); + checkInvalidPrintOption(singleFile, "-singlefile"); + checkInvalidPrintOption(useCropBox, "-cropbox"); + checkInvalidPrintOption(scaleTo != 0, "-scale-to"); + checkInvalidPrintOption(x_scaleTo != 0, "-scale-to-x"); + checkInvalidPrintOption(y_scaleTo != 0, "-scale-to-y"); + } else { + checkInvalidImageOption(level2, "-level2"); + checkInvalidImageOption(level3, "-level3"); + checkInvalidImageOption(origPageSizes, "-origpagesizes"); + checkInvalidImageOption(paperSize[0], "-paper"); + checkInvalidImageOption(paperWidth > 0, "-paperw"); + checkInvalidImageOption(paperHeight > 0, "-paperh"); + checkInvalidImageOption(noCrop, "-nocrop"); + checkInvalidImageOption(expand, "-expand"); + checkInvalidImageOption(noShrink, "-noshrink"); + checkInvalidImageOption(noCenter, "-nocenter"); + checkInvalidImageOption(duplex, "-duplex"); + } + + if (printing) { + useCropBox = !noCrop; + } + + if (icc.c_str()[0] && !png) { + fprintf(stderr, "Error: -icc may only be used with png output.\n"); + exit(99); + } + + if (antialias.getLength() > 0) { + if (!parseAntialiasOption()) { + exit(99); + } + } + + if (transp && !(png || tiff)) { + fprintf(stderr, "Error: -transp may only be used with png or tiff output.\n"); + exit(99); + } + + if (mono && gray) { + fprintf(stderr, "Error: -mono and -gray may not be used together.\n"); + exit(99); + } + + if (mono && !(png || tiff)) { + fprintf(stderr, "Error: -mono may only be used with png or tiff output.\n"); + exit(99); + } + + if (jpegOpt.getLength() > 0) { + if (!jpeg) { + fprintf(stderr, "Error: -jpegopt may only be used with jpeg output.\n"); + exit(99); + } + if (!parseJpegOptions()) { + exit(99); + } + } + + if (strlen(tiffCompressionStr) > 0 && !tiff) { + fprintf(stderr, "Error: -tiffcompression may only be used with tiff output.\n"); + exit(99); + } + + if (level2 && level3) { + fprintf(stderr, "Error: use only one of the 'level' options.\n"); + exit(99); + } + if (!level2 && !level3) { + level3 = true; + } + + if (docStruct && !pdf) { + fprintf(stderr, "Error: -struct may only be used with pdf or output.\n"); + exit(99); + } + if (eps && (origPageSizes || paperSize[0] || paperWidth > 0 || paperHeight > 0)) { + fprintf(stderr, "Error: page size options may not be used with eps output.\n"); + exit(99); + } + + if ((paperWidth > 0 && paperHeight <= 0) || (paperWidth <= 0 && paperHeight > 0)) { + fprintf(stderr, "Error: both -paperw and -paperh must be specified.\n"); + exit(99); + } + + if (paperSize[0]) { + if (origPageSizes) { + fprintf(stderr, "Error: -origpagesizes and -paper may not be used together.\n"); + exit(99); + } + if (!setPSPaperSize(paperSize, paperWidth, paperHeight)) { + fprintf(stderr, "Invalid paper size\n"); + exit(99); + } + } + if (origPageSizes || paperWidth < 0 || paperHeight < 0) { + usePDFPageSize = true; + } else { + usePDFPageSize = false; + } + + if (printdlg) { + printToWin32 = true; + } + + globalParams = std::make_unique(); + if (quiet) { + globalParams->setErrQuiet(quiet); + } + + // open PDF file + if (ownerPassword[0]) { + ownerPW = GooString(ownerPassword); + } + if (userPassword[0]) { + userPW = GooString(userPassword); + } + + fileName = new GooString(argv[1]); + if (fileName->cmp("-") == 0) { + delete fileName; + fileName = new GooString("fd://0"); + } + if (argc == 3) { + outputName = new GooString(argv[2]); + } else { + outputName = nullptr; + } + + outputFileName = getOutputFileName(fileName, outputName); + +#ifdef USE_CMS + icc_data = nullptr; + if (icc.c_str()[0]) { + FILE *file = fopen(icc.c_str(), "rb"); + if (!file) { + fprintf(stderr, "Error: unable to open icc profile %s\n", icc.c_str()); + exit(4); + } + fseek(file, 0, SEEK_END); + icc_data_size = ftell(file); + fseek(file, 0, SEEK_SET); + icc_data = (unsigned char *)gmalloc(icc_data_size); + if (fread(icc_data, icc_data_size, 1, file) != 1) { + fprintf(stderr, "Error: unable to read icc profile %s\n", icc.c_str()); + exit(4); + } + fclose(file); + profile = make_GfxLCMSProfilePtr(cmsOpenProfileFromMem(icc_data, icc_data_size)); + if (!profile) { + fprintf(stderr, "Error: lcms error opening profile\n"); + exit(4); + } + } else { + profile = make_GfxLCMSProfilePtr(cmsCreate_sRGBProfile()); + } +#endif + + std::unique_ptr doc = PDFDocFactory().createPDFDoc(*fileName, ownerPW, userPW); + if (!doc->isOk()) { + fprintf(stderr, "Error opening PDF file.\n"); + exit(1); + } + +#ifdef ENFORCE_PERMISSIONS + // check for print permission + if (printing && !doc->okToPrint()) { + fprintf(stderr, "Printing this document is not allowed.\n"); + exit(3); + } +#endif + + // get page range + if (firstPage < 1) { + firstPage = 1; + } + if (singleFile && lastPage < 1) { + lastPage = firstPage; + } + if (lastPage < 1 || lastPage > doc->getNumPages()) { + lastPage = doc->getNumPages(); + } + + if (lastPage < firstPage) { + fprintf(stderr, "Wrong page range given: the first page (%d) can not be after the last page (%d).\n", firstPage, lastPage); + exit(99); + } + if (eps && firstPage != lastPage) { + fprintf(stderr, "EPS files can only contain one page.\n"); + exit(99); + } + + // If our page range selection and document size indicate we're only + // outputting a single page, ensure that even/odd page selection doesn't + // filter out that single page. Also adjust first and last page so there are no pages + // skipped at the start or end of the for loop. + if ((printOnlyEven && firstPage % 2 == 1) || (printOnlyOdd && firstPage % 2 == 0)) { + firstPage++; + } + if ((printOnlyEven && lastPage % 2 == 1) || (printOnlyOdd && lastPage % 2 == 0)) { + lastPage--; + } + if (lastPage < firstPage) { + fprintf(stderr, "Invalid even/odd page selection, no pages match criteria.\n"); + exit(99); + } + + if (singleFile && firstPage < lastPage) { + if (!quiet) { + fprintf(stderr, "Warning: Single file will write only the first of the %d pages.\n", lastPage + 1 - firstPage); + } + lastPage = firstPage; + } + +#ifdef CAIRO_HAS_WIN32_SURFACE + if (printdlg) { + bool allPages = false; + if (firstPage == 1 && lastPage == doc->getNumPages()) + allPages = true; + win32ShowPrintDialog(&expand, &noShrink, &noCenter, &usePDFPageSize, &allPages, &firstPage, &lastPage, doc->getNumPages()); + if (allPages) { + firstPage = 1; + lastPage = doc->getNumPages(); + } + } else if (printToWin32) { + win32SetupPrinter(&printer, &printOpt, duplex, setupdlg); + } +#endif + + cairoOut = new CairoOutputDev(); + cairoOut->setLogicalStructure(docStruct); + +#ifdef USE_CMS + cairoOut->setDisplayProfile(profile); +#endif + cairoOut->startDoc(doc.get()); + if (sz != 0) { + crop_w = crop_h = sz; + } + pg_num_len = numberOfCharacters(doc->getNumPages()); + for (pg = firstPage; pg <= lastPage; ++pg) { + if (printOnlyEven && pg % 2 == 1) { + continue; + } + if (printOnlyOdd && pg % 2 == 0) { + continue; + } + if (useCropBox) { + pg_w = doc->getPageCropWidth(pg); + pg_h = doc->getPageCropHeight(pg); + } else { + pg_w = doc->getPageMediaWidth(pg); + pg_h = doc->getPageMediaHeight(pg); + } + + if (printing && pg == firstPage) { + if (paperWidth < 0 || paperHeight < 0) { + paperWidth = (int)ceil(pg_w); + paperHeight = (int)ceil(pg_h); + } + } + + if ((doc->getPageRotate(pg) == 90) || (doc->getPageRotate(pg) == 270)) { + tmp = pg_w; + pg_w = pg_h; + pg_h = tmp; + } + if (scaleTo != 0) { + resolution = (72.0 * scaleTo) / (pg_w > pg_h ? pg_w : pg_h); + x_resolution = y_resolution = resolution; + } else { + if (x_scaleTo > 0) { + x_resolution = (72.0 * x_scaleTo) / pg_w; + if (y_scaleTo == -1) { + y_resolution = x_resolution; + } + } + if (y_scaleTo > 0) { + y_resolution = (72.0 * y_scaleTo) / pg_h; + if (x_scaleTo == -1) { + x_resolution = y_resolution; + } + } + } + if (imageFileName) { + delete imageFileName; + imageFileName = nullptr; + } + if (!printing) { + imageFileName = getImageFileName(outputFileName, pg_num_len, pg); + } + getOutputSize(pg_w, pg_h, &output_w, &output_h); + + if (pg == firstPage) { + beginDocument(fileName, outputFileName, output_w, output_h); + } + beginPage(&output_w, &output_h); + renderPage(doc.get(), cairoOut, pg, pg_w, pg_h, output_w, output_h); + endPage(imageFileName, cairoOut, pg == lastPage); + } + endDocument(); + + // clean up + delete cairoOut; + if (fileName) { + delete fileName; + } + if (outputName) { + delete outputName; + } + if (outputFileName) { + delete outputFileName; + } + if (imageFileName) { + delete imageFileName; + } + +#ifdef USE_CMS + if (icc_data) { + gfree(icc_data); + } +#endif + + return 0; +} diff --git a/poppler-24.05.0/utils/pdftohtml.1 b/poppler-24.05.0/utils/pdftohtml.1 new file mode 100644 index 0000000000000000000000000000000000000000..e4e9da5c5b6dccd0ab55e4c78913150d83591311 --- /dev/null +++ b/poppler-24.05.0/utils/pdftohtml.1 @@ -0,0 +1,118 @@ +.TH PDFTOHTML 1 +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection +.\" other parms are allowed: see man(7), man(1) +.SH NAME +pdftohtml \- program to convert PDF files into HTML, XML and PNG images +.SH SYNOPSIS +.B pdftohtml +.I "[options] [ ]" +.SH "DESCRIPTION" +This manual page documents briefly the +.BR pdftohtml +command. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.B pdftohtml +is a program that converts PDF documents into HTML. It generates its output in +the current working directory. If +.I PDF-file +is \'-', it reads the PDF file from stdin. +.SH OPTIONS +A summary of options are included below. +.TP +.B \-h, \-help +Show summary of options. +.TP +.B \-f +first page to print +.TP +.B \-l +last page to print +.TP +.B \-q +do not print any messages or errors +.TP +.B \-v +print copyright and version info +.TP +.B \-p +exchange .pdf links with .html +.TP +.B \-c +generate complex output +.TP +.B \-s +generate single HTML that includes all pages +.TP +.B \-dataurls +use data URLs instead of external images in HTML. No available in all platforms +.TP +.B \-i +ignore images +.TP +.B \-noframes +generate no frames. Not supported in complex output mode. +.TP +.B \-stdout +use standard output +.TP +.B \-zoom +zoom the PDF document (default 1.5) (1 means 72 DPI) +.TP +.B \-xml +output for XML post-processing +.TP +.B \-noroundcoord +do not round coordinates (with XML output only) +.TP +.B \-enc +output text encoding name +.TP +.B \-opw +owner password (for encrypted files) +.TP +.B \-upw +user password (for encrypted files) +.TP +.B \-hidden +force hidden text extraction +.TP +.B \-fmt +image file format for Splash output (png or jpg). +If complex is selected, but \-fmt is not specified, +\-fmt png will be assumed +.TP +.B \-nomerge +do not merge paragraphs +.TP +.B \-nodrm +override document DRM settings +.TP +.B \-wbt +adjust the word break threshold percent. Default is 10. +Word break occurs when distance between two adjacent characters is +greater than this percent of character height. +.TP +.B \-fontfullname +outputs the font name without any substitutions. + +.SH AUTHOR + +Pdftohtml was developed by Gueorgui Ovtcharov and Rainer Dorsch. It is +based and benefits a lot from Derek Noonburg's xpdf package. + +This manual page was written by Søren Boll Overgaard , +for the Debian GNU/Linux system (but may be used by others). +.SH "SEE ALSO" +.BR pdfdetach (1), +.BR pdffonts (1), +.BR pdfimages (1), +.BR pdfinfo (1), +.BR pdftocairo (1), +.BR pdftoppm (1), +.BR pdftops (1), +.BR pdftotext (1) +.BR pdfseparate (1), +.BR pdfsig (1), +.BR pdfunite (1) diff --git a/poppler-24.05.0/utils/pdftohtml.cc b/poppler-24.05.0/utils/pdftohtml.cc new file mode 100644 index 0000000000000000000000000000000000000000..999ad00473dfbf1ab52655a9a8188e770137b858 --- /dev/null +++ b/poppler-24.05.0/utils/pdftohtml.cc @@ -0,0 +1,472 @@ +//======================================================================== +// +// pdftohtml.cc +// +// +// Copyright 1999-2000 G. Ovtcharov +//======================================================================== + +//======================================================================== +// +// 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) 2007-2008, 2010, 2012, 2015-2020, 2022 Albert Astals Cid +// Copyright (C) 2010 Hib Eris +// Copyright (C) 2010 Mike Slegeir +// Copyright (C) 2010, 2013 Suzuki Toshiya +// Copyright (C) 2010 OSSD CDAC Mumbai by Leena Chourey (leenac@cdacmumbai.in) and Onkar Potdar (onkar@cdacmumbai.in) +// Copyright (C) 2011 Steven Murdoch +// Copyright (C) 2012 Igor Slepchin +// Copyright (C) 2012 Ihar Filipau +// Copyright (C) 2012 Luis Parravicini +// Copyright (C) 2014 Pino Toscano +// Copyright (C) 2015 William Bader +// Copyright (C) 2017, 2021 Adrian Johnson +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Thibaut Brard +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019, 2021, 2024 Oliver Sander +// Copyright (C) 2021 Hubert Figuiere +// Copyright (C) 2024 g10 Code GmbH, Author: Sune Stolborg Vuorela +// +// 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" +#include +#include +#include +#include +#include +#ifdef HAVE_DIRENT_H +# include +#endif +#include +#include "parseargs.h" +#include "goo/GooString.h" +#include "goo/gbase64.h" +#include "goo/gbasename.h" +#include "goo/gmem.h" +#include "Object.h" +#include "Stream.h" +#include "Array.h" +#include "Dict.h" +#include "XRef.h" +#include "Catalog.h" +#include "Page.h" +#include "Outline.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "HtmlOutputDev.h" +#include "SplashOutputDev.h" +#include "splash/SplashBitmap.h" +#include "GlobalParams.h" +#include "PDFDocEncoding.h" +#include "Error.h" +#include "DateInfo.h" +#include "goo/gfile.h" +#include "Win32Console.h" +#include "InMemoryFile.h" +#include "UTF.h" + +static int firstPage = 1; +static int lastPage = 0; +static bool rawOrder = true; +bool printCommands = true; +static bool printHelp = false; +bool printHtml = false; +bool complexMode = false; +bool singleHtml = false; // singleHtml +bool dataUrls = false; +bool ignore = false; +static char extension[5] = "png"; +static double scale = 1.5; +bool noframes = false; +bool stout = false; +bool xml = false; +bool noRoundedCoordinates = false; +static bool errQuiet = false; +static bool noDrm = false; +double wordBreakThreshold = 10; // 10%, below converted into a coefficient - 0.1 + +bool showHidden = false; +bool noMerge = false; +bool fontFullName = false; +static char ownerPassword[33] = ""; +static char userPassword[33] = ""; +static bool printVersion = false; + +static std::unique_ptr getInfoString(Dict *infoDict, const char *key); +static GooString *getInfoDate(Dict *infoDict, const char *key); + +static char textEncName[128] = ""; + +static const ArgDesc argDesc[] = { { "-f", argInt, &firstPage, 0, "first page to convert" }, + { "-l", argInt, &lastPage, 0, "last page to convert" }, + /*{"-raw", argFlag, &rawOrder, 0, + "keep strings in content stream order"},*/ + { "-q", argFlag, &errQuiet, 0, "don't print any messages or errors" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-p", argFlag, &printHtml, 0, "exchange .pdf links by .html" }, + { "-c", argFlag, &complexMode, 0, "generate complex document" }, + { "-s", argFlag, &singleHtml, 0, "generate single document that includes all pages" }, +#ifdef HAVE_IN_MEMORY_FILE + { "-dataurls", argFlag, &dataUrls, 0, "use data URLs instead of external images in HTML" }, +#endif + { "-i", argFlag, &ignore, 0, "ignore images" }, + { "-noframes", argFlag, &noframes, 0, "generate no frames" }, + { "-stdout", argFlag, &stout, 0, "use standard output" }, + { "-zoom", argFP, &scale, 0, "zoom the pdf document (default 1.5)" }, + { "-xml", argFlag, &xml, 0, "output for XML post-processing" }, + { "-noroundcoord", argFlag, &noRoundedCoordinates, 0, "do not round coordinates (with XML output only)" }, + { "-hidden", argFlag, &showHidden, 0, "output hidden text" }, + { "-nomerge", argFlag, &noMerge, 0, "do not merge paragraphs" }, + { "-enc", argString, textEncName, sizeof(textEncName), "output text encoding name" }, + { "-fmt", argString, extension, sizeof(extension), "image file format for Splash output (png or jpg)" }, + { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, + { "-opw", argString, ownerPassword, sizeof(ownerPassword), "owner password (for encrypted files)" }, + { "-upw", argString, userPassword, sizeof(userPassword), "user password (for encrypted files)" }, + { "-nodrm", argFlag, &noDrm, 0, "override document DRM settings" }, + { "-wbt", argFP, &wordBreakThreshold, 0, "word break threshold (default 10 percent)" }, + { "-fontfullname", argFlag, &fontFullName, 0, "outputs font full name" }, + {} }; + +class SplashOutputDevNoText : public SplashOutputDev +{ +public: + SplashOutputDevNoText(SplashColorMode colorModeA, int bitmapRowPadA, bool reverseVideoA, SplashColorPtr paperColorA, bool bitmapTopDownA = true) + : SplashOutputDev(colorModeA, bitmapRowPadA, reverseVideoA, paperColorA, bitmapTopDownA) { } + ~SplashOutputDevNoText() override; + + void drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) override { } + bool beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, const Unicode *u, int uLen) override { return false; } + void endType3Char(GfxState *state) override { } + void beginTextObject(GfxState *state) override { } + void endTextObject(GfxState *state) override { } + bool interpretType3Chars() override { return false; } +}; + +SplashOutputDevNoText::~SplashOutputDevNoText() = default; + +int main(int argc, char *argv[]) +{ + std::unique_ptr doc; + GooString *fileName = nullptr; + std::unique_ptr docTitle; + std::unique_ptr author; + std::unique_ptr keywords; + std::unique_ptr subject; + GooString *date = nullptr; + GooString *htmlFileName = nullptr; + HtmlOutputDev *htmlOut = nullptr; + SplashOutputDev *splashOut = nullptr; + bool doOutline; + bool ok; + std::optional ownerPW, userPW; + Object info; + int exit_status = EXIT_FAILURE; + + Win32Console win32Console(&argc, &argv); + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (!ok || argc < 2 || argc > 3 || printHelp || printVersion) { + fprintf(stderr, "pdftohtml version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", "Copyright 1999-2003 Gueorgui Ovtcharov and Rainer Dorsch"); + fprintf(stderr, "%s\n\n", xpdfCopyright); + if (!printVersion) { + printUsage("pdftohtml", " [ ]", argDesc); + } + exit(printHelp || printVersion ? 0 : 1); + } + + // init error file + // errorInit(); + + // read config file + globalParams = std::make_unique(); + + if (errQuiet) { + globalParams->setErrQuiet(errQuiet); + printCommands = false; // I'm not 100% what is the difference between them + } + + if (textEncName[0]) { + globalParams->setTextEncoding(textEncName); + if (!globalParams->getTextEncoding()) { + goto error; + } + } + + // convert from user-friendly percents into a coefficient + wordBreakThreshold /= 100.0; + + // open PDF file + if (ownerPassword[0]) { + ownerPW = GooString(ownerPassword); + } + if (userPassword[0]) { + userPW = GooString(userPassword); + } + + fileName = new GooString(argv[1]); + + if (fileName->cmp("-") == 0) { + delete fileName; + fileName = new GooString("fd://0"); + } + + doc = PDFDocFactory().createPDFDoc(*fileName, ownerPW, userPW); + + if (!doc->isOk()) { + goto error; + } + + // check for copy permission + if (!doc->okToCopy()) { + if (!noDrm) { + error(errNotAllowed, -1, "Copying of text from this document is not allowed."); + goto error; + } + fprintf(stderr, "Document has copy-protection bit set.\n"); + } + + // construct text file name + if (argc == 3) { + GooString *tmp = new GooString(argv[2]); + if (!xml) { + if (tmp->getLength() >= 5) { + const char *p = tmp->c_str() + tmp->getLength() - 5; + if (!strcmp(p, ".html") || !strcmp(p, ".HTML")) { + htmlFileName = new GooString(tmp->c_str(), tmp->getLength() - 5); + } + } + } else { + if (tmp->getLength() >= 4) { + const char *p = tmp->c_str() + tmp->getLength() - 4; + if (!strcmp(p, ".xml") || !strcmp(p, ".XML")) { + htmlFileName = new GooString(tmp->c_str(), tmp->getLength() - 4); + } + } + } + if (!htmlFileName) { + htmlFileName = new GooString(tmp); + } + delete tmp; + } else if (fileName->cmp("fd://0") == 0) { + error(errCommandLine, -1, "You have to provide an output filename when reading from stdin."); + goto error; + } else { + const char *p = fileName->c_str() + fileName->getLength() - 4; + if (!strcmp(p, ".pdf") || !strcmp(p, ".PDF")) { + htmlFileName = new GooString(fileName->c_str(), fileName->getLength() - 4); + } else { + htmlFileName = fileName->copy(); + } + // htmlFileName->append(".html"); + } + + if (scale > 3.0) { + scale = 3.0; + } + if (scale < 0.5) { + scale = 0.5; + } + + if (complexMode) { + // noframes=false; + stout = false; + } + + if (stout) { + noframes = true; + complexMode = false; + } + + if (xml) { + complexMode = true; + singleHtml = false; + noframes = true; + noMerge = true; + } + + // get page range + if (firstPage < 1) { + firstPage = 1; + } + if (lastPage < 1 || lastPage > doc->getNumPages()) { + lastPage = doc->getNumPages(); + } + if (lastPage < firstPage) { + error(errCommandLine, -1, "Wrong page range given: the first page ({0:d}) can not be after the last page ({1:d}).", firstPage, lastPage); + goto error; + } + + info = doc->getDocInfo(); + if (info.isDict()) { + docTitle = getInfoString(info.getDict(), "Title"); + author = getInfoString(info.getDict(), "Author"); + keywords = getInfoString(info.getDict(), "Keywords"); + subject = getInfoString(info.getDict(), "Subject"); + date = getInfoDate(info.getDict(), "ModDate"); + if (!date) { + date = getInfoDate(info.getDict(), "CreationDate"); + } + } + if (!docTitle) { + docTitle = std::make_unique(htmlFileName); + } + + if (!singleHtml) { + rawOrder = complexMode; // todo: figure out what exactly rawOrder do :) + } else { + rawOrder = singleHtml; + } + + doOutline = doc->getOutline()->getItems() != nullptr; + // write text file + htmlOut = new HtmlOutputDev(doc->getCatalog(), htmlFileName->c_str(), docTitle->c_str(), author ? author->c_str() : nullptr, keywords ? keywords->c_str() : nullptr, subject ? subject->c_str() : nullptr, date ? date->c_str() : nullptr, + rawOrder, firstPage, doOutline); + if (date) { + delete date; + } + + if ((complexMode || singleHtml) && !xml && !ignore) { + // White paper color + SplashColor color; + color[0] = color[1] = color[2] = 255; + // If the user specified "jpg" use JPEG, otherwise PNG + SplashImageFileFormat format = strcmp(extension, "jpg") ? splashFormatPng : splashFormatJpeg; + + splashOut = new SplashOutputDevNoText(splashModeRGB8, 4, false, color); + splashOut->startDoc(doc.get()); + + for (int pg = firstPage; pg <= lastPage; ++pg) { + InMemoryFile imf; + doc->displayPage(splashOut, pg, 72 * scale, 72 * scale, 0, true, false, false); + SplashBitmap *bitmap = splashOut->getBitmap(); + + const std::unique_ptr imgFileName = GooString::format("{0:s}{1:03d}.{2:s}", htmlFileName->c_str(), pg, extension); + auto f1 = dataUrls ? imf.open("wb") : fopen(imgFileName->c_str(), "wb"); + if (!f1) { + fprintf(stderr, "Could not open %s\n", imgFileName->c_str()); + continue; + } + bitmap->writeImgFile(format, f1, 72 * scale, 72 * scale); + fclose(f1); + if (dataUrls) { + htmlOut->addBackgroundImage(std::string((format == splashFormatJpeg) ? "data:image/jpeg;base64," : "data:image/png;base64,") + gbase64Encode(imf.getBuffer())); + } else { + htmlOut->addBackgroundImage(gbasename(imgFileName->c_str())); + } + } + + delete splashOut; + } + + if (htmlOut->isOk()) { + doc->displayPages(htmlOut, firstPage, lastPage, 72 * scale, 72 * scale, 0, true, false, false); + htmlOut->dumpDocOutline(doc.get()); + } + + delete htmlOut; + + exit_status = EXIT_SUCCESS; + + // clean up +error: + delete fileName; + + if (htmlFileName) { + delete htmlFileName; + } + + return exit_status; +} + +static std::unique_ptr getInfoString(Dict *infoDict, const char *key) +{ + Object obj; + // Raw value as read from PDF (may be in pdfDocEncoding or UCS2) + const GooString *rawString; + // Value converted to unicode + Unicode *unicodeString; + int unicodeLength; + // Value HTML escaped and converted to desired encoding + std::unique_ptr encodedString; + // Is rawString UCS2 (as opposed to pdfDocEncoding) + bool isUnicode; + + obj = infoDict->lookup(key); + if (obj.isString()) { + rawString = obj.getString(); + + // Convert rawString to unicode + if (hasUnicodeByteOrderMark(rawString->toStr())) { + isUnicode = true; + unicodeLength = (obj.getString()->getLength() - 2) / 2; + } else { + isUnicode = false; + unicodeLength = obj.getString()->getLength(); + } + unicodeString = new Unicode[unicodeLength]; + + for (int i = 0; i < unicodeLength; i++) { + if (isUnicode) { + unicodeString[i] = ((rawString->getChar((i + 1) * 2) & 0xff) << 8) | (rawString->getChar(((i + 1) * 2) + 1) & 0xff); + } else { + unicodeString[i] = pdfDocEncoding[rawString->getChar(i) & 0xff]; + } + } + + // HTML escape and encode unicode + encodedString = HtmlFont::HtmlFilter(unicodeString, unicodeLength); + delete[] unicodeString; + } + + return encodedString; +} + +static GooString *getInfoDate(Dict *infoDict, const char *key) +{ + Object obj; + int year, mon, day, hour, min, sec, tz_hour, tz_minute; + char tz; + struct tm tmStruct; + GooString *result = nullptr; + char buf[256]; + + obj = infoDict->lookup(key); + if (obj.isString()) { + const GooString *s = obj.getString(); + // TODO do something with the timezone info + if (parseDateString(s, &year, &mon, &day, &hour, &min, &sec, &tz, &tz_hour, &tz_minute)) { + tmStruct.tm_year = year - 1900; + tmStruct.tm_mon = mon - 1; + tmStruct.tm_mday = day; + tmStruct.tm_hour = hour; + tmStruct.tm_min = min; + tmStruct.tm_sec = sec; + tmStruct.tm_wday = -1; + tmStruct.tm_yday = -1; + tmStruct.tm_isdst = -1; + mktime(&tmStruct); // compute the tm_wday and tm_yday fields + if (strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%S+00:00", &tmStruct)) { + result = new GooString(buf); + } else { + result = new GooString(s); + } + } else { + result = new GooString(s); + } + } + return result; +} diff --git a/poppler-24.05.0/utils/pdftoppm.1 b/poppler-24.05.0/utils/pdftoppm.1 new file mode 100644 index 0000000000000000000000000000000000000000..ddbe4d70172cf8bb030965612dc8e4c7b2388da9 --- /dev/null +++ b/poppler-24.05.0/utils/pdftoppm.1 @@ -0,0 +1,230 @@ +.\" Copyright 2005-2011 Glyph & Cog, LLC +.TH pdftoppm 1 "15 August 2011" +.SH NAME +pdftoppm \- Portable Document Format (PDF) to Portable Pixmap (PPM) +converter (version 3.03) +.SH SYNOPSIS +.B pdftoppm +[options] +.I PDF-file PPM-root +.SH DESCRIPTION +.B Pdftoppm +converts Portable Document Format (PDF) files to color image files in +Portable Pixmap (PPM) format, grayscale image files in Portable +Graymap (PGM) format, or monochrome image files in Portable Bitmap +(PBM) format. +.PP +Pdftoppm reads the PDF file, +.IR PDF-file , +and writes one PPM file for each page, +.IR PPM-root - number .ppm, +where +.I number +is the page number. If +.I PDF-file +is \'-', it reads the PDF file from stdin. +.SH OPTIONS +.TP +.BI \-f " number" +Specifies the first page to convert. +.TP +.BI \-l " number" +Specifies the last page to convert. +.TP +.B \-o +Generates only the odd numbered pages. +.TP +.B \-e +Generates only the even numbered pages. +.TP +.BI \-singlefile +Writes only the first page and does not add digits. +.TP +.BI \-r " number" +Specifies the X and Y resolution, in DPI. The default is 150 DPI. +.TP +.BI \-rx " number" +Specifies the X resolution, in DPI. The default is 150 DPI. +.TP +.BI \-ry " number" +Specifies the Y resolution, in DPI. The default is 150 DPI. +.TP +.BI \-scale-to " number" +Scales the long side of each page (width for landscape pages, height +for portrait pages) to fit in scale-to pixels. The size of the short +side will be determined by the aspect ratio of the page. +.TP +.BI \-scale-to-x " number" +Scales each page horizontally to fit in scale-to-x pixels. If +scale-to-y is set to -1, the vertical size will determined by the +aspect ratio of the page. +.TP +.BI \-scale-to-y " number" +Scales each page vertically to fit in scale-to-y pixels. If scale-to-x +is set to -1, the horizontal size will determined by the aspect ratio +of the page. +.TP +.B \-scale-dimension-before-rotation +Swaps horizontal and vertical size for a rotated (landscape) pdf before scaling instead of after. +.TP +.BI \-x " number" +Specifies the x-coordinate of the crop area top left corner +.TP +.BI \-y " number" +Specifies the y-coordinate of the crop area top left corner +.TP +.BI \-W " number" +Specifies the width of crop area in pixels (default is 0) +.TP +.BI \-H " number" +Specifies the height of crop area in pixels (default is 0) +.TP +.BI \-sz " number" +Specifies the size of crop square in pixels (sets W and H) +.TP +.B \-cropbox +Uses the crop box rather than media box when generating the files +.TP +.B \-hide-annotations +Do not show annotations +.TP +.B \-mono +Generate a monochrome PBM file (instead of a color PPM file). +.TP +.B \-gray +Generate a grayscale PGM file (instead of a color PPM file). +.TP +.BI \-displayprofile " displayprofilefile" +If poppler is compiled with colour management support, this option sets the display profile +to the ICC profile stored in displayprofilefile. +.TP +.BI \-defaultgrayprofile " defaultgrayprofilefile" +If poppler is compiled with colour management support, this option sets the DefaultGray color space +to the ICC profile stored in defaultgrayprofilefile. +.TP +.BI \-defaultrgbprofile " defaultrgbprofilefile" +If poppler is compiled with colour management support, this option sets the DefaultRGB color space +to the ICC profile stored in defaultrgbprofilefile. +.TP +.BI \-defaultcmykprofile " defaultcmykprofilefile" +If poppler is compiled with colour management support, this option sets the DefaultCMYK color space +to the ICC profile stored in defaultcmykprofilefile. +.TP +.B \-png +Generates a PNG file instead a PPM file. +.TP +.B \-jpeg +Generates a JPEG file instead a PPM file. +.TP +.BI \-jpegopt " jpeg-options" +When used with \-jpeg, takes a list of options to control the jpeg compression. See +.B JPEG OPTIONS +for the available options. +.TP +.B \-tiff +Generates a TIFF file instead a PPM file. +.TP +.BI \-tiffcompression " none | packbits | jpeg | lzw | deflate" +Specifies the TIFF compression type. This defaults to "none". +.TP +.BI \-freetype " yes | no" +Enable or disable FreeType (a TrueType / Type 1 font rasterizer). +This defaults to "yes". +.TP +.BI \-thinlinemode " none | solid | shape" +Specifies the thin line mode. This defaults to "none". +.TP +"solid": +adjust lines with a width less than one pixel to pixel boundary +and paint it with a width of one pixel. +.TP +"shape": +adjust lines with a width less than one pixel to pixel boundary +and paint it with a width of one pixel but with a shape in proportion +to its width. +.TP +.BI \-aa " yes | no" +Enable or disable font anti-aliasing. This defaults to "yes". +.TP +.BI \-aaVector " yes | no" +Enable or disable vector anti-aliasing. This defaults to "yes". +.TP +.BI \-opw " password" +Specify the owner password for the PDF file. Providing this will +bypass all security restrictions. +.TP +.BI \-upw " password" +Specify the user password for the PDF file. +.TP +.B \-q +Don't print any messages or errors. +.TP +.B \-progress +Print progress info as each page is generated. Three space-separated +fields are printed to STDERR: the number of the current page, the number +of the last page that will be generated, and the path to the file +written to. +.TP +.BI \-sep " char" +Specify single character separator between name and page number, default - . +.TP +.B \-forcenum +Force page number even if there is only one page. +.TP +.B \-v +Print copyright and version information. +.TP +.B \-h +Print usage information. +.RB ( \-help +and +.B \-\-help +are equivalent.) +.SH EXIT CODES +The Xpdf tools use the following exit codes: +.TP +0 +No error. +.TP +1 +Error opening a PDF file. +.TP +2 +Error opening an output file. +.TP +3 +Error related to PDF permissions. +.TP +99 +Other error. +.SH JPEG OPTIONS +When JPEG output is specified, the \-jpegopt option can be used to control the JPEG compression parameters. +It takes a string of the form "=[,=]". Currently the available options are: +.TP +.BI quality +Selects the JPEG quality value. The value must be an integer between 0 and 100. +.TP +.BI progressive +Select progressive JPEG output. The possible values are "y", "n", +indicating progressive (yes) or non-progressive (no), respectively. +.TP +.BI optimize +Sets whether to compute optimal Huffman coding tables for the JPEG output, which +will create smaller files but make an extra pass over the data. The value must +be "y" or "n", with "y" performing optimization, otherwise the default Huffman +tables are used. +.SH AUTHOR +The pdftoppm software and documentation are copyright 1996-2011 Glyph +& Cog, LLC. +.SH "SEE ALSO" +.BR pdfdetach (1), +.BR pdffonts (1), +.BR pdfimages (1), +.BR pdfinfo (1), +.BR pdftocairo (1), +.BR pdftohtml (1), +.BR pdftops (1), +.BR pdftotext (1) +.BR pdfseparate (1), +.BR pdfsig (1), +.BR pdfunite (1) diff --git a/poppler-24.05.0/utils/pdftoppm.cc b/poppler-24.05.0/utils/pdftoppm.cc new file mode 100644 index 0000000000000000000000000000000000000000..e95d9b37ec0a10f0f375dd6b8cc97272f5786804 --- /dev/null +++ b/poppler-24.05.0/utils/pdftoppm.cc @@ -0,0 +1,741 @@ +//======================================================================== +// +// pdftoppm.cc +// +// Copyright 2003 Glyph & Cog, LLC +// +//======================================================================== + +//======================================================================== +// +// 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) 2007 Ilmari Heikkinen +// Copyright (C) 2008 Richard Airlie +// Copyright (C) 2009 Michael K. Johnson +// Copyright (C) 2009 Shen Liang +// Copyright (C) 2009 Stefan Thomas +// Copyright (C) 2009-2011, 2015, 2018-2022 Albert Astals Cid +// Copyright (C) 2010, 2012, 2017 Adrian Johnson +// Copyright (C) 2010 Hib Eris +// Copyright (C) 2010 Jonathan Liu +// Copyright (C) 2010 William Bader +// Copyright (C) 2011-2013 Thomas Freitag +// Copyright (C) 2013, 2015, 2018 Adam Reichold +// Copyright (C) 2013 Suzuki Toshiya +// Copyright (C) 2015 William Bader +// Copyright (C) 2018 Martin Packman +// Copyright (C) 2019 Yves-Gaël Chény +// Copyright (C) 2019-2021 Oliver Sander +// Copyright (C) 2019 +// Copyright (C) 2019 Kris Jurka +// Copyright (C) 2019 Sébastien Berthier +// Copyright (C) 2020 Stéfan van der Walt +// Copyright (C) 2020 Philipp Knechtges +// Copyright (C) 2021 Diogo Kollross +// Copyright (C) 2021 Peter Williams +// Copyright (C) 2022 James Cloos +// +// 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" +#include +#if defined(_WIN32) || defined(__CYGWIN__) +# include // for O_BINARY +# include // for _setmode +#endif +#include +#include +#include "parseargs.h" +#include "goo/gmem.h" +#include "goo/GooString.h" +#include "GlobalParams.h" +#include "Object.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "splash/SplashBitmap.h" +#include "splash/Splash.h" +#include "splash/SplashErrorCodes.h" +#include "SplashOutputDev.h" +#include "Win32Console.h" +#include "numberofcharacters.h" +#include "sanitychecks.h" + +// Uncomment to build pdftoppm with pthreads +// You may also have to change the buildsystem to +// link pdftoppm to pthread library +// This is here for developer testing not user ready +// #define UTILS_USE_PTHREADS 1 + +#ifdef UTILS_USE_PTHREADS +# include +# include +# include +#endif // UTILS_USE_PTHREADS + +#ifdef USE_CMS +# include +#endif + +static int firstPage = 1; +static int lastPage = 0; +static bool printOnlyOdd = false; +static bool printOnlyEven = false; +static bool singleFile = false; +static bool scaleDimensionBeforeRotation = false; +static double resolution = 0.0; +static double x_resolution = 150.0; +static double y_resolution = 150.0; +static int scaleTo = 0; +static int x_scaleTo = 0; +static int y_scaleTo = 0; +static int param_x = 0; +static int param_y = 0; +static int param_w = 0; +static int param_h = 0; +static int sz = 0; +static bool hideAnnotations = false; +static bool useCropBox = false; +static bool mono = false; +static bool gray = false; +#ifdef USE_CMS +static GooString displayprofilename; +static GfxLCMSProfilePtr displayprofile; +static GooString defaultgrayprofilename; +static GfxLCMSProfilePtr defaultgrayprofile; +static GooString defaultrgbprofilename; +static GfxLCMSProfilePtr defaultrgbprofile; +static GooString defaultcmykprofilename; +static GfxLCMSProfilePtr defaultcmykprofile; +#endif +static char sep[2] = "-"; +static bool forceNum = false; +static bool png = false; +static bool jpeg = false; +static bool jpegcmyk = false; +static bool tiff = false; +static GooString jpegOpt; +static int jpegQuality = -1; +static bool jpegProgressive = false; +static bool jpegOptimize = false; +static bool overprint = false; +static bool splashOverprintPreview = false; +static char enableFreeTypeStr[16] = ""; +static bool enableFreeType = true; +static char antialiasStr[16] = ""; +static char vectorAntialiasStr[16] = ""; +static bool fontAntialias = true; +static bool vectorAntialias = true; +static char ownerPassword[33] = ""; +static char userPassword[33] = ""; +static char TiffCompressionStr[16] = ""; +static char thinLineModeStr[8] = ""; +static SplashThinLineMode thinLineMode = splashThinLineDefault; +#ifdef UTILS_USE_PTHREADS +static int numberOfJobs = 1; +#endif // UTILS_USE_PTHREADS +static bool quiet = false; +static bool progress = false; +static bool printVersion = false; +static bool printHelp = false; + +static const ArgDesc argDesc[] = { { "-f", argInt, &firstPage, 0, "first page to print" }, + { "-l", argInt, &lastPage, 0, "last page to print" }, + { "-o", argFlag, &printOnlyOdd, 0, "print only odd pages" }, + { "-e", argFlag, &printOnlyEven, 0, "print only even pages" }, + { "-singlefile", argFlag, &singleFile, 0, "write only the first page and do not add digits" }, + { "-scale-dimension-before-rotation", argFlag, &scaleDimensionBeforeRotation, 0, "for rotated pdf, resize dimensions before the rotation" }, + + { "-r", argFP, &resolution, 0, "resolution, in DPI (default is 150)" }, + { "-rx", argFP, &x_resolution, 0, "X resolution, in DPI (default is 150)" }, + { "-ry", argFP, &y_resolution, 0, "Y resolution, in DPI (default is 150)" }, + { "-scale-to", argInt, &scaleTo, 0, "scales each page to fit within scale-to*scale-to pixel box" }, + { "-scale-to-x", argInt, &x_scaleTo, 0, "scales each page horizontally to fit in scale-to-x pixels" }, + { "-scale-to-y", argInt, &y_scaleTo, 0, "scales each page vertically to fit in scale-to-y pixels" }, + + { "-x", argInt, ¶m_x, 0, "x-coordinate of the crop area top left corner" }, + { "-y", argInt, ¶m_y, 0, "y-coordinate of the crop area top left corner" }, + { "-W", argInt, ¶m_w, 0, "width of crop area in pixels (default is 0)" }, + { "-H", argInt, ¶m_h, 0, "height of crop area in pixels (default is 0)" }, + { "-sz", argInt, &sz, 0, "size of crop square in pixels (sets W and H)" }, + { "-cropbox", argFlag, &useCropBox, 0, "use the crop box rather than media box" }, + { "-hide-annotations", argFlag, &hideAnnotations, 0, "do not show annotations" }, + + { "-mono", argFlag, &mono, 0, "generate a monochrome PBM file" }, + { "-gray", argFlag, &gray, 0, "generate a grayscale PGM file" }, +#ifdef USE_CMS + { "-displayprofile", argGooString, &displayprofilename, 0, "ICC color profile to use as the display profile" }, + { "-defaultgrayprofile", argGooString, &defaultgrayprofilename, 0, "ICC color profile to use as the DefaultGray color space" }, + { "-defaultrgbprofile", argGooString, &defaultrgbprofilename, 0, "ICC color profile to use as the DefaultRGB color space" }, + { "-defaultcmykprofile", argGooString, &defaultcmykprofilename, 0, "ICC color profile to use as the DefaultCMYK color space" }, +#endif + { "-sep", argString, sep, sizeof(sep), "single character separator between name and page number, default - " }, + { "-forcenum", argFlag, &forceNum, 0, "force page number even if there is only one page " }, +#ifdef ENABLE_LIBPNG + { "-png", argFlag, &png, 0, "generate a PNG file" }, +#endif +#ifdef ENABLE_LIBJPEG + { "-jpeg", argFlag, &jpeg, 0, "generate a JPEG file" }, + { "-jpegcmyk", argFlag, &jpegcmyk, 0, "generate a CMYK JPEG file" }, + { "-jpegopt", argGooString, &jpegOpt, 0, "jpeg options, with format =[,=]*" }, +#endif + { "-overprint", argFlag, &overprint, 0, "enable overprint" }, +#ifdef ENABLE_LIBTIFF + { "-tiff", argFlag, &tiff, 0, "generate a TIFF file" }, + { "-tiffcompression", argString, TiffCompressionStr, sizeof(TiffCompressionStr), "set TIFF compression: none, packbits, jpeg, lzw, deflate" }, +#endif + { "-freetype", argString, enableFreeTypeStr, sizeof(enableFreeTypeStr), "enable FreeType font rasterizer: yes, no" }, + { "-thinlinemode", argString, thinLineModeStr, sizeof(thinLineModeStr), "set thin line mode: none, solid, shape. Default: none" }, + + { "-aa", argString, antialiasStr, sizeof(antialiasStr), "enable font anti-aliasing: yes, no" }, + { "-aaVector", argString, vectorAntialiasStr, sizeof(vectorAntialiasStr), "enable vector anti-aliasing: yes, no" }, + + { "-opw", argString, ownerPassword, sizeof(ownerPassword), "owner password (for encrypted files)" }, + { "-upw", argString, userPassword, sizeof(userPassword), "user password (for encrypted files)" }, + +#ifdef UTILS_USE_PTHREADS + { "-j", argInt, &numberOfJobs, 0, "number of jobs to run concurrently" }, +#endif // UTILS_USE_PTHREADS + + { "-q", argFlag, &quiet, 0, "don't print any messages or errors" }, + { "-progress", argFlag, &progress, 0, "print progress info" }, + { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} }; + +static constexpr int kOtherError = 99; + +static bool needToRotate(int angle) +{ + return (angle == 90) || (angle == 270); +} + +static bool parseJpegOptions() +{ + // jpegOpt format is: =,=,... + const char *nextOpt = jpegOpt.c_str(); + while (nextOpt && *nextOpt) { + const char *comma = strchr(nextOpt, ','); + GooString opt; + if (comma) { + opt.Set(nextOpt, static_cast(comma - nextOpt)); + nextOpt = comma + 1; + } else { + opt.Set(nextOpt); + nextOpt = nullptr; + } + // here opt is "= " + const char *equal = strchr(opt.c_str(), '='); + if (!equal) { + fprintf(stderr, "Unknown jpeg option \"%s\"\n", opt.c_str()); + return false; + } + const int iequal = static_cast(equal - opt.c_str()); + GooString value(&opt, iequal + 1, opt.getLength() - iequal - 1); + opt.del(iequal, opt.getLength() - iequal); + // here opt is "" and value is "" + + if (opt.cmp("quality") == 0) { + if (!isInt(value.c_str())) { + fprintf(stderr, "Invalid jpeg quality\n"); + return false; + } + jpegQuality = atoi(value.c_str()); + if (jpegQuality < 0 || jpegQuality > 100) { + fprintf(stderr, "jpeg quality must be between 0 and 100\n"); + return false; + } + } else if (opt.cmp("progressive") == 0) { + jpegProgressive = false; + if (value.cmp("y") == 0) { + jpegProgressive = true; + } else if (value.cmp("n") != 0) { + fprintf(stderr, "jpeg progressive option must be \"y\" or \"n\"\n"); + return false; + } + } else if (opt.cmp("optimize") == 0 || opt.cmp("optimise") == 0) { + jpegOptimize = false; + if (value.cmp("y") == 0) { + jpegOptimize = true; + } else if (value.cmp("n") != 0) { + fprintf(stderr, "jpeg optimize option must be \"y\" or \"n\"\n"); + return false; + } + } else { + fprintf(stderr, "Unknown jpeg option \"%s\"\n", opt.c_str()); + return false; + } + } + return true; +} + +static auto annotDisplayDecideCbk = [](Annot *annot, void *user_data) { return !hideAnnotations; }; + +static void savePageSlice(PDFDoc *doc, SplashOutputDev *splashOut, int pg, int x, int y, int w, int h, double pg_w, double pg_h, char *ppmFile) +{ + if (w == 0) { + w = (int)ceil(pg_w); + } + if (h == 0) { + h = (int)ceil(pg_h); + } + w = (x + w > pg_w ? (int)ceil(pg_w - x) : w); + h = (y + h > pg_h ? (int)ceil(pg_h - y) : h); + doc->displayPageSlice(splashOut, pg, x_resolution, y_resolution, 0, !useCropBox, false, false, x, y, w, h, nullptr, nullptr, annotDisplayDecideCbk, nullptr); + + SplashBitmap *bitmap = splashOut->getBitmap(); + + SplashBitmap::WriteImgParams params; + params.jpegQuality = jpegQuality; + params.jpegProgressive = jpegProgressive; + params.jpegOptimize = jpegOptimize; + params.tiffCompression = TiffCompressionStr; + + if (ppmFile != nullptr) { + SplashError e; + + if (png) { + e = bitmap->writeImgFile(splashFormatPng, ppmFile, x_resolution, y_resolution); + } else if (jpeg) { + e = bitmap->writeImgFile(splashFormatJpeg, ppmFile, x_resolution, y_resolution, ¶ms); + } else if (jpegcmyk) { + e = bitmap->writeImgFile(splashFormatJpegCMYK, ppmFile, x_resolution, y_resolution, ¶ms); + } else if (tiff) { + e = bitmap->writeImgFile(splashFormatTiff, ppmFile, x_resolution, y_resolution, ¶ms); + } else { + e = bitmap->writePNMFile(ppmFile); + } + if (e != splashOk) { + fprintf(stderr, "Could not write image to %s; exiting\n", ppmFile); + exit(EXIT_FAILURE); + } + } else { +#if defined(_WIN32) || defined(__CYGWIN__) + _setmode(fileno(stdout), O_BINARY); +#endif + + if (png) { + bitmap->writeImgFile(splashFormatPng, stdout, x_resolution, y_resolution); + } else if (jpeg) { + bitmap->writeImgFile(splashFormatJpeg, stdout, x_resolution, y_resolution, ¶ms); + } else if (tiff) { + bitmap->writeImgFile(splashFormatTiff, stdout, x_resolution, y_resolution, ¶ms); + } else { + bitmap->writePNMFile(stdout); + } + } + + if (progress) { + fprintf(stderr, "%d %d %s\n", pg, lastPage, ppmFile != nullptr ? ppmFile : ""); + } +} + +#ifdef UTILS_USE_PTHREADS + +struct PageJob +{ + PDFDoc *doc; + int pg; + + double pg_w, pg_h; + SplashColor *paperColor; + + char *ppmFile; +}; + +static std::deque pageJobQueue; +static pthread_mutex_t pageJobMutex = PTHREAD_MUTEX_INITIALIZER; + +static void processPageJobs() +{ + while (true) { + // pop the next job or exit if queue is empty + pthread_mutex_lock(&pageJobMutex); + + if (pageJobQueue.empty()) { + pthread_mutex_unlock(&pageJobMutex); + return; + } + + PageJob pageJob = pageJobQueue.front(); + pageJobQueue.pop_front(); + + pthread_mutex_unlock(&pageJobMutex); + + // process the job + SplashOutputDev *splashOut = new SplashOutputDev(mono ? splashModeMono1 + : gray ? splashModeMono8 + : (jpegcmyk || overprint) ? splashModeDeviceN8 + : splashModeRGB8, + 4, false, *pageJob.paperColor, true, thinLineMode, splashOverprintPreview); + splashOut->setFontAntialias(fontAntialias); + splashOut->setVectorAntialias(vectorAntialias); + splashOut->setEnableFreeType(enableFreeType); +# ifdef USE_CMS + splashOut->setDisplayProfile(displayprofile); + splashOut->setDefaultGrayProfile(defaultgrayprofile); + splashOut->setDefaultRGBProfile(defaultrgbprofile); + splashOut->setDefaultCMYKProfile(defaultcmykprofile); +# endif + splashOut->startDoc(pageJob.doc); + + savePageSlice(pageJob.doc, splashOut, pageJob.pg, param_x, param_y, param_w, param_h, pageJob.pg_w, pageJob.pg_h, pageJob.ppmFile); + + delete splashOut; + delete[] pageJob.ppmFile; + } +} + +#endif // UTILS_USE_PTHREADS + +int main(int argc, char *argv[]) +{ + GooString *fileName = nullptr; + char *ppmRoot = nullptr; + char *ppmFile; + std::optional ownerPW, userPW; + SplashColor paperColor; +#ifndef UTILS_USE_PTHREADS + SplashOutputDev *splashOut; +#else + pthread_t *jobs; +#endif // UTILS_USE_PTHREADS + bool ok; + int pg, pg_num_len; + double pg_w, pg_h; +#ifdef USE_CMS + cmsColorSpaceSignature profilecolorspace; +#endif + + Win32Console win32Console(&argc, &argv); + + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (mono && gray) { + ok = false; + } + if (resolution != 0.0 && (x_resolution == 150.0 || y_resolution == 150.0)) { + x_resolution = resolution; + y_resolution = resolution; + } + if (!ok || argc > 3 || printVersion || printHelp) { + fprintf(stderr, "pdftoppm version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", xpdfCopyright); + if (!printVersion) { + printUsage("pdftoppm", "[PDF-file [PPM-file-prefix]]", argDesc); + } + if (printVersion || printHelp) { + return 0; + } else { + return kOtherError; + } + } + if (argc > 1) { + fileName = new GooString(argv[1]); + } + if (argc == 3) { + ppmRoot = argv[2]; + } + + if (antialiasStr[0]) { + if (!GlobalParams::parseYesNo2(antialiasStr, &fontAntialias)) { + fprintf(stderr, "Bad '-aa' value on command line\n"); + } + } + if (vectorAntialiasStr[0]) { + if (!GlobalParams::parseYesNo2(vectorAntialiasStr, &vectorAntialias)) { + fprintf(stderr, "Bad '-aaVector' value on command line\n"); + } + } + + if (jpegOpt.getLength() > 0) { + if (!jpeg) { + fprintf(stderr, "Warning: -jpegopt only valid with jpeg output.\n"); + } + parseJpegOptions(); + } + + // read config file + globalParams = std::make_unique(); + if (enableFreeTypeStr[0]) { + if (!GlobalParams::parseYesNo2(enableFreeTypeStr, &enableFreeType)) { + fprintf(stderr, "Bad '-freetype' value on command line\n"); + } + } + if (thinLineModeStr[0]) { + if (strcmp(thinLineModeStr, "solid") == 0) { + thinLineMode = splashThinLineSolid; + } else if (strcmp(thinLineModeStr, "shape") == 0) { + thinLineMode = splashThinLineShape; + } else if (strcmp(thinLineModeStr, "none") != 0) { + fprintf(stderr, "Bad '-thinlinemode' value on command line\n"); + } + } + if (quiet) { + globalParams->setErrQuiet(quiet); + } + + // open PDF file + if (ownerPassword[0]) { + ownerPW = GooString(ownerPassword); + } + if (userPassword[0]) { + userPW = GooString(userPassword); + } + + if (fileName == nullptr) { + fileName = new GooString("fd://0"); + } + if (fileName->cmp("-") == 0) { + delete fileName; + fileName = new GooString("fd://0"); + } + std::unique_ptr doc(PDFDocFactory().createPDFDoc(*fileName, ownerPW, userPW)); + delete fileName; + if (!doc->isOk()) { + return 1; + } + + // get page range + if (firstPage < 1) { + firstPage = 1; + } + if (singleFile && lastPage < 1) { + lastPage = firstPage; + } + if (lastPage < 1 || lastPage > doc->getNumPages()) { + lastPage = doc->getNumPages(); + } + if (lastPage < firstPage) { + fprintf(stderr, "Wrong page range given: the first page (%d) can not be after the last page (%d).\n", firstPage, lastPage); + return kOtherError; + } + + // If our page range selection and document size indicate we're only + // outputting a single page, ensure that even/odd page selection doesn't + // filter out that single page. + if (firstPage == lastPage && ((printOnlyEven && firstPage % 2 == 1) || (printOnlyOdd && firstPage % 2 == 0))) { + fprintf(stderr, "Invalid even/odd page selection, no pages match criteria.\n"); + return kOtherError; + } + + if (singleFile && firstPage < lastPage) { + if (!quiet) { + fprintf(stderr, "Warning: Single file will write only the first of the %d pages.\n", lastPage + 1 - firstPage); + } + lastPage = firstPage; + } + + // write PPM files + if (jpegcmyk || overprint) { + splashOverprintPreview = true; + splashClearColor(paperColor); + } else { + paperColor[0] = 255; + paperColor[1] = 255; + paperColor[2] = 255; + } + +#ifdef USE_CMS + if (!displayprofilename.toStr().empty()) { + displayprofile = make_GfxLCMSProfilePtr(cmsOpenProfileFromFile(displayprofilename.c_str(), "r")); + if (!displayprofile) { + fprintf(stderr, "Could not open the ICC profile \"%s\".\n", displayprofilename.c_str()); + return kOtherError; + } + if (!cmsIsIntentSupported(displayprofile.get(), INTENT_RELATIVE_COLORIMETRIC, LCMS_USED_AS_OUTPUT) && !cmsIsIntentSupported(displayprofile.get(), INTENT_ABSOLUTE_COLORIMETRIC, LCMS_USED_AS_OUTPUT) + && !cmsIsIntentSupported(displayprofile.get(), INTENT_SATURATION, LCMS_USED_AS_OUTPUT) && !cmsIsIntentSupported(displayprofile.get(), INTENT_PERCEPTUAL, LCMS_USED_AS_OUTPUT)) { + fprintf(stderr, "ICC profile \"%s\" is not an output profile.\n", displayprofilename.c_str()); + return kOtherError; + } + profilecolorspace = cmsGetColorSpace(displayprofile.get()); + // Note: In contrast to pdftops we do not fail if a non-matching ICC profile is supplied. + // Doing so would be pretentious, since SplashOutputDev by default assumes sRGB, even for + // the CMYK and Mono cases. + if (jpegcmyk || overprint) { + if (profilecolorspace != cmsSigCmykData) { + fprintf(stderr, "Warning: Supplied ICC profile \"%s\" is not a CMYK profile.\n", displayprofilename.c_str()); + } + } else if (mono || gray) { + if (profilecolorspace != cmsSigGrayData) { + fprintf(stderr, "Warning: Supplied ICC profile \"%s\" is not a monochrome profile.\n", displayprofilename.c_str()); + } + } else { + if (profilecolorspace != cmsSigRgbData) { + fprintf(stderr, "Warning: Supplied ICC profile \"%s\" is not a RGB profile.\n", displayprofilename.c_str()); + } + } + } + if (!defaultgrayprofilename.toStr().empty()) { + defaultgrayprofile = make_GfxLCMSProfilePtr(cmsOpenProfileFromFile(defaultgrayprofilename.c_str(), "r")); + if (!checkICCProfile(defaultgrayprofile, defaultgrayprofilename.c_str(), LCMS_USED_AS_INPUT, cmsSigGrayData)) { + return kOtherError; + } + } + if (!defaultrgbprofilename.toStr().empty()) { + defaultrgbprofile = make_GfxLCMSProfilePtr(cmsOpenProfileFromFile(defaultrgbprofilename.c_str(), "r")); + if (!checkICCProfile(defaultrgbprofile, defaultrgbprofilename.c_str(), LCMS_USED_AS_INPUT, cmsSigRgbData)) { + return kOtherError; + } + } + if (!defaultcmykprofilename.toStr().empty()) { + defaultcmykprofile = make_GfxLCMSProfilePtr(cmsOpenProfileFromFile(defaultcmykprofilename.c_str(), "r")); + if (!checkICCProfile(defaultcmykprofile, defaultcmykprofilename.c_str(), LCMS_USED_AS_INPUT, cmsSigCmykData)) { + return kOtherError; + } + } +#endif + +#ifndef UTILS_USE_PTHREADS + + splashOut = new SplashOutputDev(mono ? splashModeMono1 : gray ? splashModeMono8 : (jpegcmyk || overprint) ? splashModeDeviceN8 : splashModeRGB8, 4, false, paperColor, true, thinLineMode, splashOverprintPreview); + + splashOut->setFontAntialias(fontAntialias); + splashOut->setVectorAntialias(vectorAntialias); + splashOut->setEnableFreeType(enableFreeType); +# ifdef USE_CMS + splashOut->setDisplayProfile(displayprofile); + splashOut->setDefaultGrayProfile(defaultgrayprofile); + splashOut->setDefaultRGBProfile(defaultrgbprofile); + splashOut->setDefaultCMYKProfile(defaultcmykprofile); +# endif + splashOut->startDoc(doc.get()); + +#endif // UTILS_USE_PTHREADS + + if (sz != 0) { + param_w = param_h = sz; + } + pg_num_len = numberOfCharacters(doc->getNumPages()); + for (pg = firstPage; pg <= lastPage; ++pg) { + if (printOnlyEven && pg % 2 == 1) { + continue; + } + if (printOnlyOdd && pg % 2 == 0) { + continue; + } + if (useCropBox) { + pg_w = doc->getPageCropWidth(pg); + pg_h = doc->getPageCropHeight(pg); + } else { + pg_w = doc->getPageMediaWidth(pg); + pg_h = doc->getPageMediaHeight(pg); + } + + if (scaleDimensionBeforeRotation && needToRotate(doc->getPageRotate(pg))) { + std::swap(pg_w, pg_h); + } + + // Handle requests for specific image size + if (scaleTo != 0) { + if (pg_w > pg_h) { + resolution = (72.0 * scaleTo) / pg_w; + pg_w = scaleTo; + pg_h = pg_h * (resolution / 72.0); + } else { + resolution = (72.0 * scaleTo) / pg_h; + pg_h = scaleTo; + pg_w = pg_w * (resolution / 72.0); + } + x_resolution = y_resolution = resolution; + } else { + if (x_scaleTo > 0) { + x_resolution = (72.0 * x_scaleTo) / pg_w; + pg_w = x_scaleTo; + if (y_scaleTo == -1) { + y_resolution = x_resolution; + } + } + + if (y_scaleTo > 0) { + y_resolution = (72.0 * y_scaleTo) / pg_h; + pg_h = y_scaleTo; + if (x_scaleTo == -1) { + x_resolution = y_resolution; + } + } + + // No specific image size requested---compute the size from the resolution + if (x_scaleTo <= 0) { + pg_w = pg_w * x_resolution / 72.0; + } + if (y_scaleTo <= 0) { + pg_h = pg_h * y_resolution / 72.0; + } + } + + if (!scaleDimensionBeforeRotation && needToRotate(doc->getPageRotate(pg))) { + std::swap(pg_w, pg_h); + } + + if (ppmRoot != nullptr) { + const char *ext = png ? "png" : (jpeg || jpegcmyk) ? "jpg" : tiff ? "tif" : mono ? "pbm" : gray ? "pgm" : "ppm"; + if (singleFile && !forceNum) { + ppmFile = new char[strlen(ppmRoot) + 1 + strlen(ext) + 1]; + sprintf(ppmFile, "%s.%s", ppmRoot, ext); + } else { + ppmFile = new char[strlen(ppmRoot) + 1 + pg_num_len + 1 + strlen(ext) + 1]; + sprintf(ppmFile, "%s%s%0*d.%s", ppmRoot, sep, pg_num_len, pg, ext); + } + } else { + ppmFile = nullptr; + } +#ifndef UTILS_USE_PTHREADS + // process job in main thread + savePageSlice(doc.get(), splashOut, pg, param_x, param_y, param_w, param_h, pg_w, pg_h, ppmFile); + + delete[] ppmFile; +#else + + // queue job for worker threads + PageJob pageJob = { .doc = doc.get(), + .pg = pg, + + .pg_w = pg_w, + .pg_h = pg_h, + + .paperColor = &paperColor, + + .ppmFile = ppmFile }; + + pageJobQueue.push_back(pageJob); + +#endif // UTILS_USE_PTHREADS + } +#ifndef UTILS_USE_PTHREADS + delete splashOut; +#else + + // spawn worker threads and wait on them + jobs = (pthread_t *)malloc(numberOfJobs * sizeof(pthread_t)); + + for (int i = 0; i < numberOfJobs; ++i) { + if (pthread_create(&jobs[i], NULL, (void *(*)(void *))processPageJobs, NULL) != 0) { + fprintf(stderr, "pthread_create() failed with errno: %d\n", errno); + exit(EXIT_FAILURE); + } + } + + for (int i = 0; i < numberOfJobs; ++i) { + if (pthread_join(jobs[i], NULL) != 0) { + fprintf(stderr, "pthread_join() failed with errno: %d\n", errno); + exit(EXIT_FAILURE); + } + } + + free(jobs); + +#endif // UTILS_USE_PTHREADS + + return 0; +} diff --git a/poppler-24.05.0/utils/pdftops.1 b/poppler-24.05.0/utils/pdftops.1 new file mode 100644 index 0000000000000000000000000000000000000000..0ab17cbbae5c0a138ad5b63830b248bd4a25b83c --- /dev/null +++ b/poppler-24.05.0/utils/pdftops.1 @@ -0,0 +1,267 @@ +.\" Copyright 1996-2011 Glyph & Cog, LLC +.TH pdftops 1 "15 August 2011" +.SH NAME +pdftops \- Portable Document Format (PDF) to PostScript converter +(version 3.03) +.SH SYNOPSIS +.B pdftops +[options] +.RI +.RI [] +.SH DESCRIPTION +.B Pdftops +converts Portable Document Format (PDF) files to PostScript so they +can be printed. +.PP +Pdftops reads the PDF file, +.IR PDF-file , +and writes a PostScript file, +.IR PS-file . +If +.I PS-file +is not specified, pdftops converts +.I file.pdf +to +.I file.ps +(or +.I file.eps +with the \-eps option). If +.I PS-file +is \'-', the PostScript is sent to stdout. If +.I PDF-file +is \'-', Pdftops reads the PDF file from stdin. +.SH OPTIONS +.TP +.BI \-f " number" +Specifies the first page to print. +.TP +.BI \-l " number" +Specifies the last page to print. +.TP +.B \-level1 +Generate Level 1 PostScript. The resulting PostScript files will be +significantly larger (if they contain images), but will print on Level +1 printers. This also converts all images to black and white. No +more than one of the PostScript level options (\-level1, \-level1sep, +\-level2, \-level2sep, \-level3, \-level3sep) may be given. +.TP +.B \-level1sep +Generate Level 1 separable PostScript. All colors are converted to +CMYK. Images are written with separate stream data for the four +components. +.TP +.B \-level2 +Generate Level 2 PostScript. Level 2 supports color images and image +compression. This is the default setting. +.TP +.B \-level2sep +Generate Level 2 separable PostScript. All colors are converted to +CMYK. The PostScript separation convention operators are used to +handle custom (spot) colors. +.TP +.B \-level3 +Generate Level 3 PostScript. This enables all Level 2 features plus +CID font embedding. +.TP +.B \-level3sep +Generate Level 3 separable PostScript. The separation handling is the +same as for \-level2sep. +.TP +.B \-eps +Generate an Encapsulated PostScript (EPS) file. An EPS file contains +a single image, so if you use this option with a multi-page PDF file, +you must use \-f and \-l to specify a single page. No more than one of +the mode options (\-eps, \-form) may be given. +.TP +.B \-form +Generate a PostScript form which can be imported by software that +understands forms. A form contains a single page, so if you use this +option with a multi-page PDF file, you must use \-f and \-l to specify a +single page. The \-level1 option cannot be used with \-form. No more +than one of the mode options (\-eps, \-form) may be +given. +.TP +.B \-opi +Generate OPI comments for all images and forms which have OPI +information. (This option is only available if pdftops was compiled +with OPI support.) +.TP +.B \-binary +Write binary data in Level 1 PostScript. By default, pdftops writes +hex-encoded data in Level 1 PostScript. Binary data is non-standard +in Level 1 PostScript but reduces the file size and can be useful +when Level 1 PostScript is required only for its restricted use +of PostScript operators. +.TP +.BI \-r " number" +Set the resolution in DPI when pdftops rasterizes images with +transparencies or, for Level 1 PostScript, when pdftops +rasterizes images with color masks. +By default, pdftops rasterizes images to 300 DPI. +.TP +.B \-noembt1 +By default, any Type 1 fonts which are embedded in the PDF file are +copied into the PostScript file. This option causes pdftops to +substitute base fonts instead. Embedded fonts make PostScript files +larger, but may be necessary for readable output. +.TP +.B \-noembtt +By default, any TrueType fonts which are embedded in the PDF file are +copied into the PostScript file. This option causes pdftops to +substitute base fonts instead. Embedded fonts make PostScript files +larger, but may be necessary for readable output. Also, some +PostScript interpreters do not have TrueType rasterizers. +.TP +.B \-noembcidps +By default, any CID PostScript fonts which are embedded in the PDF +file are copied into the PostScript file. This option disables that +embedding. No attempt is made to substitute for non-embedded CID +PostScript fonts. +.TP +.B \-noembcidtt +By default, any CID TrueType fonts which are embedded in the PDF file +are copied into the PostScript file. This option disables that +embedding. No attempt is made to substitute for non-embedded CID +TrueType fonts. +.TP +.B \-passfonts +By default, references to non-embedded 8-bit fonts in the PDF file are +substituted with the closest "Helvetica", "Times-Roman", or "Courier" font. +This option passes references to non-embedded fonts +through to the PostScript file. +.TP +.BI \-aaRaster " yes | no" +Enable or disable raster anti-aliasing. This defaults to "no". +pdftops may need to rasterize transparencies and pattern image masks in the PDF. +If the PostScript will be printed, leave \-aaRaster disabled and set \-r to the resolution of the printer. +If the PostScript will be viewed, enabling \-aaRaster may make rasterized text easier to read. +.TP +.BI \-rasterize " always | never | whenneeded" +By default, pdftops rasterizes pages as needed, for example, if they contain transparencies. +To force rasterization, set \-rasterize to "always". Use this to eliminate fonts. +To prevent rasterization, set \-rasterize to "never". This may produce files that display incorrectly. +.TP +.BI \-processcolorformat " MONO8 | CMYK8 | RGB8" +Sets the process color format as it is used during rasterization and transparency reduction. +The default depends on the other settings: For \-level1 the default is MONO8, for \-level{1,2,3}sep +or \-overprint the default is CMYK8, and in all other cases RGB8 is the default. If \-processcolorprofile +is given then \-processcolorformat is inferred from the specified ICC profile. +.TP +.BI \-processcolorprofile " filename" +Sets the ICC profile that is assumed during rasterization and transparency reduction. +.TP +.BI \-defaultgrayprofile " defaultgrayprofilefile" +If poppler is compiled with colour management support, this option sets the DefaultGray color space +to the ICC profile stored in defaultgrayprofilefile. +.TP +.BI \-defaultrgbprofile " defaultrgbprofilefile" +If poppler is compiled with colour management support, this option sets the DefaultRGB color space +to the ICC profile stored in defaultrgbprofilefile. +.TP +.BI \-defaultcmykprofile " defaultcmykprofilefile" +If poppler is compiled with colour management support, this option sets the DefaultCMYK color space +to the ICC profile stored in defaultcmykprofilefile. +.TP +.B \-optimizecolorspace +By default, bitmap images in the PDF pass through to the output PostScript +in their original color space, which produces predictable results. +This option converts RGB and CMYK images into Gray images +if every pixel of the image has equal components. +This can fix problems when doing color separations of PDFs +that contain embedded black and white images encoded as RGB. +.TP +.B \-preload +preload images and forms +.TP +.BI \-paper " size" +Set the paper size to one of "letter", "legal", "A4", or "A3". This +can also be set to "match", which will set the paper size of each page to match the +size specified in the PDF file. If none the \-paper, \-paperw, or \-paperh +options are specified the default is to match the paper size. +.TP +.BI \-paperw " size" +Set the paper width, in points. +.TP +.BI \-paperh " size" +Set the paper height, in points. +.TP +.B \-origpagesizes +This option is the same as "\-paper match". +.TP +.B \-nocrop +By default, output is cropped to the CropBox specified in the PDF +file. This option disables cropping. +.TP +.B \-expand +Expand PDF pages smaller than the paper to fill the paper. By +default, these pages are not scaled. +.TP +.B \-noshrink +Don't scale PDF pages which are larger than the paper. By default, +pages larger than the paper are shrunk to fit. +.TP +.B \-nocenter +By default, PDF pages smaller than the paper (after any scaling) are +centered on the paper. This option causes them to be aligned to the +lower-left corner of the paper instead. +.TP +.B \-duplex +Set the Duplex pagedevice entry in the PostScript file. This tells +duplex-capable printers to enable duplexing. +.TP +.BI \-opw " password" +Specify the owner password for the PDF file. Providing this will +bypass all security restrictions. +.TP +.BI \-upw " password" +Specify the user password for the PDF file. +.TP +.B \-overprint +Enable overprint emulation during rasterization. For \-processcolorformat being CMYK8 and the language level +being higher than 2, this option is set to true by default. Note: This option requires \-processcolorformat to +be CMYK8. +.TP +.B \-q +Don't print any messages or errors. +.TP +.B \-v +Print copyright and version information. +.TP +.B \-h +Print usage information. +.RB ( \-help +and +.B \-\-help +are equivalent.) +.SH EXIT CODES +The Xpdf tools use the following exit codes: +.TP +0 +No error. +.TP +1 +Error opening a PDF file. +.TP +2 +Error opening an output file. +.TP +3 +Error related to PDF permissions. +.TP +99 +Other error. +.SH AUTHOR +The pdftops software and documentation are copyright 1996-2011 Glyph & +Cog, LLC. +.SH "SEE ALSO" +.BR pdfdetach (1), +.BR pdffonts (1), +.BR pdfimages (1), +.BR pdfinfo (1), +.BR pdftocairo (1), +.BR pdftohtml (1), +.BR pdftoppm (1), +.BR pdftotext (1) +.BR pdfseparate (1), +.BR pdfsig (1), +.BR pdfunite (1) diff --git a/poppler-24.05.0/utils/pdftops.cc b/poppler-24.05.0/utils/pdftops.cc new file mode 100644 index 0000000000000000000000000000000000000000..d9f6692a42f4b22fa1694191cef0b889165997f3 --- /dev/null +++ b/poppler-24.05.0/utils/pdftops.cc @@ -0,0 +1,512 @@ +//======================================================================== +// +// pdftops.cc +// +// Copyright 1996-2003 Glyph & Cog, LLC +// +// Modified for Debian by Hamish Moffatt, 22 May 2002. +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Kristian Høgsberg +// Copyright (C) 2007-2008, 2010, 2015, 2017, 2018, 2020-2022 Albert Astals Cid +// Copyright (C) 2009 Till Kamppeter +// Copyright (C) 2009 Sanjoy Mahajan +// Copyright (C) 2009, 2011, 2012, 2014-2016, 2020 William Bader +// Copyright (C) 2010 Hib Eris +// Copyright (C) 2012 Thomas Freitag +// Copyright (C) 2013 Suzuki Toshiya +// Copyright (C) 2014, 2017 Adrian Johnson +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019, 2021, 2023 Oliver Sander +// Copyright (C) 2020 Philipp Knechtges +// Copyright (C) 2021 Hubert Figuiere +// +// 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" +#include +#include +#include +#include +#include +#include "parseargs.h" +#include "goo/GooString.h" +#include "goo/gmem.h" +#include "GlobalParams.h" +#include "Object.h" +#include "Stream.h" +#include "Array.h" +#include "Dict.h" +#include "XRef.h" +#include "Catalog.h" +#include "Page.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "PSOutputDev.h" +#include "Error.h" +#include "Win32Console.h" +#include "sanitychecks.h" + +#ifdef USE_CMS +# include +#endif + +static bool setPSPaperSize(char *size, int &psPaperWidth, int &psPaperHeight) +{ + if (!strcmp(size, "match")) { + psPaperWidth = psPaperHeight = -1; + } else if (!strcmp(size, "letter")) { + psPaperWidth = 612; + psPaperHeight = 792; + } else if (!strcmp(size, "legal")) { + psPaperWidth = 612; + psPaperHeight = 1008; + } else if (!strcmp(size, "A4")) { + psPaperWidth = 595; + psPaperHeight = 842; + } else if (!strcmp(size, "A3")) { + psPaperWidth = 842; + psPaperHeight = 1190; + } else { + return false; + } + return true; +} + +static int firstPage = 1; +static int lastPage = 0; +static bool level1 = false; +static bool level1Sep = false; +static bool level2 = false; +static bool level2Sep = false; +static bool level3 = false; +static bool level3Sep = false; +static bool origPageSizes = false; +static bool doEPS = false; +static bool doForm = false; +#ifdef OPI_SUPPORT +static bool doOPI = false; +#endif +static int splashResolution = 0; +static bool psBinary = false; +static bool noEmbedT1Fonts = false; +static bool noEmbedTTFonts = false; +static bool noEmbedCIDPSFonts = false; +static bool noEmbedCIDTTFonts = false; +static bool fontPassthrough = false; +static bool optimizeColorSpace = false; +static bool passLevel1CustomColor = false; +static char rasterAntialiasStr[16] = ""; +static char forceRasterizeStr[16] = ""; +static bool preload = false; +static char paperSize[15] = ""; +static int paperWidth = -1; +static int paperHeight = -1; +static bool noCrop = false; +static bool expand = false; +static bool noShrink = false; +static bool noCenter = false; +static bool duplex = false; +static char ownerPassword[33] = "\001"; +static char userPassword[33] = "\001"; +static bool quiet = false; +static bool printVersion = false; +static bool printHelp = false; +static bool overprint = false; +static GooString processcolorformatname; +static SplashColorMode processcolorformat; +static bool processcolorformatspecified = false; +#ifdef USE_CMS +static GooString processcolorprofilename; +static GfxLCMSProfilePtr processcolorprofile; +static GooString defaultgrayprofilename; +static GfxLCMSProfilePtr defaultgrayprofile; +static GooString defaultrgbprofilename; +static GfxLCMSProfilePtr defaultrgbprofile; +static GooString defaultcmykprofilename; +static GfxLCMSProfilePtr defaultcmykprofile; +#endif + +static const ArgDesc argDesc[] = { { "-f", argInt, &firstPage, 0, "first page to print" }, + { "-l", argInt, &lastPage, 0, "last page to print" }, + { "-level1", argFlag, &level1, 0, "generate Level 1 PostScript" }, + { "-level1sep", argFlag, &level1Sep, 0, "generate Level 1 separable PostScript" }, + { "-level2", argFlag, &level2, 0, "generate Level 2 PostScript" }, + { "-level2sep", argFlag, &level2Sep, 0, "generate Level 2 separable PostScript" }, + { "-level3", argFlag, &level3, 0, "generate Level 3 PostScript" }, + { "-level3sep", argFlag, &level3Sep, 0, "generate Level 3 separable PostScript" }, + { "-origpagesizes", argFlag, &origPageSizes, 0, "conserve original page sizes" }, + { "-eps", argFlag, &doEPS, 0, "generate Encapsulated PostScript (EPS)" }, + { "-form", argFlag, &doForm, 0, "generate a PostScript form" }, +#ifdef OPI_SUPPORT + { "-opi", argFlag, &doOPI, 0, "generate OPI comments" }, +#endif + { "-r", argInt, &splashResolution, 0, "resolution for rasterization, in DPI (default is 300)" }, + { "-binary", argFlag, &psBinary, 0, "write binary data in Level 1 PostScript" }, + { "-noembt1", argFlag, &noEmbedT1Fonts, 0, "don't embed Type 1 fonts" }, + { "-noembtt", argFlag, &noEmbedTTFonts, 0, "don't embed TrueType fonts" }, + { "-noembcidps", argFlag, &noEmbedCIDPSFonts, 0, "don't embed CID PostScript fonts" }, + { "-noembcidtt", argFlag, &noEmbedCIDTTFonts, 0, "don't embed CID TrueType fonts" }, + { "-passfonts", argFlag, &fontPassthrough, 0, "don't substitute missing fonts" }, + { "-aaRaster", argString, rasterAntialiasStr, sizeof(rasterAntialiasStr), "enable anti-aliasing on rasterization: yes, no" }, + { "-rasterize", argString, forceRasterizeStr, sizeof(forceRasterizeStr), "control rasterization: always, never, whenneeded" }, + { "-processcolorformat", argGooString, &processcolorformatname, 0, "color format that is used during rasterization and transparency reduction: MONO8, RGB8, CMYK8" }, +#ifdef USE_CMS + { "-processcolorprofile", argGooString, &processcolorprofilename, 0, "ICC color profile to use as the process color profile during rasterization and transparency reduction" }, + { "-defaultgrayprofile", argGooString, &defaultgrayprofilename, 0, "ICC color profile to use as the DefaultGray color space" }, + { "-defaultrgbprofile", argGooString, &defaultrgbprofilename, 0, "ICC color profile to use as the DefaultRGB color space" }, + { "-defaultcmykprofile", argGooString, &defaultcmykprofilename, 0, "ICC color profile to use as the DefaultCMYK color space" }, +#endif + { "-optimizecolorspace", argFlag, &optimizeColorSpace, 0, "convert gray RGB images to gray color space" }, + { "-passlevel1customcolor", argFlag, &passLevel1CustomColor, 0, "pass custom color in level1sep" }, + { "-preload", argFlag, &preload, 0, "preload images and forms" }, + { "-paper", argString, paperSize, sizeof(paperSize), "paper size (letter, legal, A4, A3, match)" }, + { "-paperw", argInt, &paperWidth, 0, "paper width, in points" }, + { "-paperh", argInt, &paperHeight, 0, "paper height, in points" }, + { "-nocrop", argFlag, &noCrop, 0, "don't crop pages to CropBox" }, + { "-expand", argFlag, &expand, 0, "expand pages smaller than the paper size" }, + { "-noshrink", argFlag, &noShrink, 0, "don't shrink pages larger than the paper size" }, + { "-nocenter", argFlag, &noCenter, 0, "don't center pages smaller than the paper size" }, + { "-duplex", argFlag, &duplex, 0, "enable duplex printing" }, + { "-opw", argString, ownerPassword, sizeof(ownerPassword), "owner password (for encrypted files)" }, + { "-upw", argString, userPassword, sizeof(userPassword), "user password (for encrypted files)" }, + { "-overprint", argFlag, &overprint, 0, "enable overprint emulation during rasterization" }, + { "-q", argFlag, &quiet, 0, "don't print any messages or errors" }, + { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} }; + +int main(int argc, char *argv[]) +{ + std::unique_ptr doc; + GooString *fileName; + std::string psFileName; + PSLevel level; + PSOutMode mode; + std::optional ownerPW, userPW; + PSOutputDev *psOut; + bool ok; + int exitCode; + bool rasterAntialias = false; + std::vector pages; +#ifdef USE_CMS + cmsColorSpaceSignature profilecolorspace; +#endif + + Win32Console win32Console(&argc, &argv); + exitCode = 99; + + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (!ok || argc < 2 || argc > 3 || printVersion || printHelp) { + fprintf(stderr, "pdftops version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", xpdfCopyright); + if (!printVersion) { + printUsage("pdftops", " []", argDesc); + } + if (printVersion || printHelp) { + exit(0); + } else { + exit(1); + } + } + if ((level1 ? 1 : 0) + (level1Sep ? 1 : 0) + (level2 ? 1 : 0) + (level2Sep ? 1 : 0) + (level3 ? 1 : 0) + (level3Sep ? 1 : 0) > 1) { + fprintf(stderr, "Error: use only one of the 'level' options.\n"); + exit(1); + } + if ((doEPS ? 1 : 0) + (doForm ? 1 : 0) > 1) { + fprintf(stderr, "Error: use only one of -eps, and -form\n"); + exit(1); + } + if (level1) { + level = psLevel1; + } else if (level1Sep) { + level = psLevel1Sep; + } else if (level2Sep) { + level = psLevel2Sep; + } else if (level3) { + level = psLevel3; + } else if (level3Sep) { + level = psLevel3Sep; + } else { + level = psLevel2; + } + if (doForm && level < psLevel2) { + fprintf(stderr, "Error: forms are only available with Level 2 output.\n"); + exit(1); + } + mode = doEPS ? psModeEPS : doForm ? psModeForm : psModePS; + fileName = new GooString(argv[1]); + + // read config file + globalParams = std::make_unique(); + if (origPageSizes) { + paperWidth = paperHeight = -1; + } + if (paperSize[0]) { + if (origPageSizes) { + fprintf(stderr, "Error: -origpagesizes and -paper may not be used together.\n"); + exit(1); + } + if (!setPSPaperSize(paperSize, paperWidth, paperHeight)) { + fprintf(stderr, "Invalid paper size\n"); + delete fileName; + goto err0; + } + } + if (quiet) { + globalParams->setErrQuiet(quiet); + } + + if (!processcolorformatname.toStr().empty()) { + if (processcolorformatname.toStr() == "MONO8") { + processcolorformat = splashModeMono8; + processcolorformatspecified = true; + } else if (processcolorformatname.toStr() == "CMYK8") { + processcolorformat = splashModeCMYK8; + processcolorformatspecified = true; + } else if (processcolorformatname.toStr() == "RGB8") { + processcolorformat = splashModeRGB8; + processcolorformatspecified = true; + } else { + fprintf(stderr, "Error: Unknown process color format \"%s\".\n", processcolorformatname.c_str()); + goto err1; + } + } + +#ifdef USE_CMS + if (!processcolorprofilename.toStr().empty()) { + processcolorprofile = make_GfxLCMSProfilePtr(cmsOpenProfileFromFile(processcolorprofilename.c_str(), "r")); + if (!processcolorprofile) { + fprintf(stderr, "Error: Could not open the ICC profile \"%s\".\n", processcolorprofilename.c_str()); + goto err1; + } + if (!cmsIsIntentSupported(processcolorprofile.get(), INTENT_RELATIVE_COLORIMETRIC, LCMS_USED_AS_OUTPUT) && !cmsIsIntentSupported(processcolorprofile.get(), INTENT_ABSOLUTE_COLORIMETRIC, LCMS_USED_AS_OUTPUT) + && !cmsIsIntentSupported(processcolorprofile.get(), INTENT_SATURATION, LCMS_USED_AS_OUTPUT) && !cmsIsIntentSupported(processcolorprofile.get(), INTENT_PERCEPTUAL, LCMS_USED_AS_OUTPUT)) { + fprintf(stderr, "Error: ICC profile \"%s\" is not an output profile.\n", processcolorprofilename.c_str()); + goto err1; + } + profilecolorspace = cmsGetColorSpace(processcolorprofile.get()); + if (profilecolorspace == cmsSigCmykData) { + if (!processcolorformatspecified) { + processcolorformat = splashModeCMYK8; + processcolorformatspecified = true; + } else if (processcolorformat != splashModeCMYK8) { + fprintf(stderr, "Error: Supplied ICC profile \"%s\" is a CMYK profile, but process color format is not CMYK8.\n", processcolorprofilename.c_str()); + goto err1; + } + } else if (profilecolorspace == cmsSigGrayData) { + if (!processcolorformatspecified) { + processcolorformat = splashModeMono8; + processcolorformatspecified = true; + } else if (processcolorformat != splashModeMono8) { + fprintf(stderr, "Error: Supplied ICC profile \"%s\" is a monochrome profile, but process color format is not monochrome.\n", processcolorprofilename.c_str()); + goto err1; + } + } else if (profilecolorspace == cmsSigRgbData) { + if (!processcolorformatspecified) { + processcolorformat = splashModeRGB8; + processcolorformatspecified = true; + } else if (processcolorformat != splashModeRGB8) { + fprintf(stderr, "Error: Supplied ICC profile \"%s\" is a RGB profile, but process color format is not RGB.\n", processcolorprofilename.c_str()); + goto err1; + } + } + } +#endif + + if (processcolorformatspecified) { + if (level1 && processcolorformat != splashModeMono8) { + fprintf(stderr, "Error: Setting -level1 requires -processcolorformat MONO8"); + goto err1; + } else if ((level1Sep || level2Sep || level3Sep || overprint) && processcolorformat != splashModeCMYK8) { + fprintf(stderr, "Error: Setting -level1sep/-level2sep/-level3sep/-overprint requires -processcolorformat CMYK8"); + goto err1; + } + } + +#ifdef USE_CMS + if (!defaultgrayprofilename.toStr().empty()) { + defaultgrayprofile = make_GfxLCMSProfilePtr(cmsOpenProfileFromFile(defaultgrayprofilename.c_str(), "r")); + if (!checkICCProfile(defaultgrayprofile, defaultgrayprofilename.c_str(), LCMS_USED_AS_INPUT, cmsSigGrayData)) { + goto err1; + } + } + if (!defaultrgbprofilename.toStr().empty()) { + defaultrgbprofile = make_GfxLCMSProfilePtr(cmsOpenProfileFromFile(defaultrgbprofilename.c_str(), "r")); + if (!checkICCProfile(defaultrgbprofile, defaultrgbprofilename.c_str(), LCMS_USED_AS_INPUT, cmsSigRgbData)) { + goto err1; + } + } + if (!defaultcmykprofilename.toStr().empty()) { + defaultcmykprofile = make_GfxLCMSProfilePtr(cmsOpenProfileFromFile(defaultcmykprofilename.c_str(), "r")); + if (!checkICCProfile(defaultcmykprofile, defaultcmykprofilename.c_str(), LCMS_USED_AS_INPUT, cmsSigCmykData)) { + goto err1; + } + } +#endif + + // open PDF file + if (ownerPassword[0] != '\001') { + ownerPW = GooString(ownerPassword); + } + if (userPassword[0] != '\001') { + userPW = GooString(userPassword); + } + if (fileName->cmp("-") == 0) { + delete fileName; + fileName = new GooString("fd://0"); + } + + doc = PDFDocFactory().createPDFDoc(*fileName, ownerPW, userPW); + + if (!doc->isOk()) { + exitCode = 1; + goto err1; + } + +#ifdef ENFORCE_PERMISSIONS + // check for print permission + if (!doc->okToPrint()) { + error(errNotAllowed, -1, "Printing this document is not allowed."); + exitCode = 3; + goto err1; + } +#endif + + // construct PostScript file name + if (argc == 3) { + psFileName = std::string(argv[2]); + } else if (fileName->cmp("fd://0") == 0) { + error(errCommandLine, -1, "You have to provide an output filename when reading from stdin."); + goto err1; + } else { + const char *p = fileName->c_str() + fileName->getLength() - 4; + if (!strcmp(p, ".pdf") || !strcmp(p, ".PDF")) { + psFileName = std::string(fileName->c_str(), fileName->getLength() - 4); + + } else { + psFileName = fileName->toStr(); + } + psFileName += (doEPS ? ".eps" : ".ps"); + } + + // get page range + if (firstPage < 1) { + firstPage = 1; + } + if (lastPage < 1 || lastPage > doc->getNumPages()) { + lastPage = doc->getNumPages(); + } + if (lastPage < firstPage) { + error(errCommandLine, -1, "Wrong page range given: the first page ({0:d}) can not be after the last page ({1:d}).", firstPage, lastPage); + goto err1; + } + + // check for multi-page EPS or form + if ((doEPS || doForm) && firstPage != lastPage) { + error(errCommandLine, -1, "EPS and form files can only contain one page."); + goto err1; + } + + for (int i = firstPage; i <= lastPage; ++i) { + pages.push_back(i); + } + + // write PostScript file + psOut = new PSOutputDev(psFileName.c_str(), doc.get(), nullptr, pages, mode, paperWidth, paperHeight, noCrop, duplex, /*imgLLXA*/ 0, /*imgLLYA*/ 0, + /*imgURXA*/ 0, /*imgURYA*/ 0, psRasterizeWhenNeeded, /*manualCtrlA*/ false, /*customCodeCbkA*/ nullptr, /*customCodeCbkDataA*/ nullptr, level); + if (noCenter) { + psOut->setPSCenter(false); + } + if (expand) { + psOut->setPSExpandSmaller(true); + } + if (noShrink) { + psOut->setPSShrinkLarger(false); + } + if (overprint) { + psOut->setOverprintPreview(true); + } + + if (rasterAntialiasStr[0]) { + if (!GlobalParams::parseYesNo2(rasterAntialiasStr, &rasterAntialias)) { + fprintf(stderr, "Bad '-aaRaster' value on command line\n"); + } + } + + if (forceRasterizeStr[0]) { + PSForceRasterize forceRasterize = psRasterizeWhenNeeded; + if (strcmp(forceRasterizeStr, "whenneeded") == 0) { + forceRasterize = psRasterizeWhenNeeded; + } else if (strcmp(forceRasterizeStr, "always") == 0) { + forceRasterize = psAlwaysRasterize; + } else if (strcmp(forceRasterizeStr, "never") == 0) { + forceRasterize = psNeverRasterize; + } else { + fprintf(stderr, "Bad '-rasterize' value on command line\n"); + } + psOut->setForceRasterize(forceRasterize); + } + + if (splashResolution > 0) { + psOut->setRasterResolution(splashResolution); + } + if (processcolorformatspecified) { + psOut->setProcessColorFormat(processcolorformat); + } +#ifdef USE_CMS + psOut->setDisplayProfile(processcolorprofile); + psOut->setDefaultGrayProfile(defaultgrayprofile); + psOut->setDefaultRGBProfile(defaultrgbprofile); + psOut->setDefaultCMYKProfile(defaultcmykprofile); +#endif + psOut->setEmbedType1(!noEmbedT1Fonts); + psOut->setEmbedTrueType(!noEmbedTTFonts); + psOut->setEmbedCIDPostScript(!noEmbedCIDPSFonts); + psOut->setEmbedCIDTrueType(!noEmbedCIDTTFonts); + psOut->setFontPassthrough(fontPassthrough); + psOut->setPreloadImagesForms(preload); + psOut->setOptimizeColorSpace(optimizeColorSpace); + psOut->setPassLevel1CustomColor(passLevel1CustomColor); +#ifdef OPI_SUPPORT + psOut->setGenerateOPI(doOPI); +#endif + psOut->setUseBinary(psBinary); + + psOut->setRasterAntialias(rasterAntialias); + if (psOut->isOk()) { + for (int i = firstPage; i <= lastPage; ++i) { + doc->displayPage(psOut, i, 72, 72, 0, noCrop, !noCrop, true); + } + } else { + delete psOut; + exitCode = 2; + goto err1; + } + delete psOut; + + exitCode = 0; + + // clean up +err1: + delete fileName; +err0: + + return exitCode; +} diff --git a/poppler-24.05.0/utils/pdftotext.1 b/poppler-24.05.0/utils/pdftotext.1 new file mode 100644 index 0000000000000000000000000000000000000000..c34c98a907f8f915e6decf09ca7fd6811f7728c7 --- /dev/null +++ b/poppler-24.05.0/utils/pdftotext.1 @@ -0,0 +1,161 @@ +.\" Copyright 1997-2011 Glyph & Cog, LLC +.TH pdftotext 1 "15 August 2011" +.SH NAME +pdftotext \- Portable Document Format (PDF) to text converter +(version 3.03) +.SH SYNOPSIS +.B pdftotext +[options] +.RI PDF-file +.RI [ text-file ] +.SH DESCRIPTION +.B Pdftotext +converts Portable Document Format (PDF) files to plain text. +.PP +Pdftotext reads the PDF file, +.IR PDF-file , +and writes a text file, +.IR text-file . +If +.I text-file +is not specified, pdftotext converts +.I file.pdf +to +.IR file.txt . +If +.I text-file +is \'-', the text is sent to stdout. If +.I PDF-file +is \'-', it reads the PDF file from stdin. +.SH OPTIONS +.TP +.BI \-f " number" +Specifies the first page to convert. +.TP +.BI \-l " number" +Specifies the last page to convert. +.TP +.BI \-r " number" +Specifies the resolution, in DPI. The default is 72 DPI. +.TP +.BI \-x " number" +Specifies the x-coordinate of the crop area top left corner +.TP +.BI \-y " number" +Specifies the y-coordinate of the crop area top left corner +.TP +.BI \-W " number" +Specifies the width of crop area in pixels (default is 0) +.TP +.BI \-H " number" +Specifies the height of crop area in pixels (default is 0) +.TP +.B \-layout +Maintain (as best as possible) the original physical layout of the +text. The default is to \'undo' physical layout (columns, +hyphenation, etc.) and output the text in reading order. +.TP +.BI \-fixed " number" +Assume fixed-pitch (or tabular) text, with the specified character +width (in points). This forces physical layout mode. +.TP +.B \-raw +Keep the text in content stream order. This is a hack which often +"undoes" column formatting, etc. Use of raw mode is no longer +recommended. +.TP +.B \-nodiag +Discard diagonal text (i.e., text that is not close to one of the +0, 90, 180, or 270 degree axes). This is useful for skipping +watermarks drawn on body text. +.TP +.B \-htmlmeta +Generate a simple HTML file, including the meta information. This +simply wraps the text in 
 and
and prepends the meta +headers. +.TP +.B \-bbox +Generate an XHTML file containing bounding box information for each +word in the file. +.TP +.B \-bbox-layout +Generate an XHTML file containing bounding box information for each +block, line, and word in the file. +.TP +.B \-tsv +Generate a TSV file containing the bounding box information for each +block, line, and word in the file. +.TP +.B \-cropbox +Use the crop box rather than the media box with \-bbox and \-bbox-layout. +.TP +.BI \-colspacing " number" +Specifies how much spacing we allow after a word before considering adjacent text to be a new column, measured as a fraction of the font size. Current default is 0.7, old releases had a 0.3 default. +.TP +.BI \-enc " encoding-name" +Sets the encoding to use for text output. This defaults to "UTF-8". +.TP +.B \-listenc +Lists the available encodings +.TP +.BI \-eol " unix | dos | mac" +Sets the end-of-line convention to use for text output. +.TP +.B \-nopgbrk +Don't insert page breaks (form feed characters) between pages. +.TP +.BI \-opw " password" +Specify the owner password for the PDF file. Providing this will +bypass all security restrictions. +.TP +.BI \-upw " password" +Specify the user password for the PDF file. +.TP +.B \-q +Don't print any messages or errors. +.TP +.B \-v +Print copyright and version information. +.TP +.B \-h +Print usage information. +.RB ( \-help +and +.B \-\-help +are equivalent.) +.SH BUGS +Some PDF files contain fonts whose encodings have been mangled beyond +recognition. There is no way (short of OCR) to extract text from +these files. +.SH EXIT CODES +The Xpdf tools use the following exit codes: +.TP +0 +No error. +.TP +1 +Error opening a PDF file. +.TP +2 +Error opening an output file. +.TP +3 +Error related to PDF permissions. +.TP +99 +Other error. +.SH AUTHOR +The pdftotext software and documentation are copyright 1996-2011 Glyph +& Cog, LLC. +.SH "SEE ALSO" +.BR pdfdetach (1), +.BR pdffonts (1), +.BR pdfimages (1), +.BR pdfinfo (1), +.BR pdftocairo (1), +.BR pdftohtml (1), +.BR pdftoppm (1), +.BR pdftops (1), +.BR pdfseparate (1), +.BR pdfsig (1), +.BR pdfunite (1) diff --git a/poppler-24.05.0/utils/pdftotext.cc b/poppler-24.05.0/utils/pdftotext.cc new file mode 100644 index 0000000000000000000000000000000000000000..c1d4bc8ff4e38e2656d5cf2438f48f4e22a592da --- /dev/null +++ b/poppler-24.05.0/utils/pdftotext.cc @@ -0,0 +1,642 @@ +//======================================================================== +// +// pdftotext.cc +// +// Copyright 1997-2003 Glyph & Cog, LLC +// +// Modified for Debian by Hamish Moffatt, 22 May 2002. +// +//======================================================================== + +//======================================================================== +// +// 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) 2006 Dominic Lachowicz +// Copyright (C) 2007-2008, 2010, 2011, 2017-2022 Albert Astals Cid +// Copyright (C) 2009 Jan Jockusch +// Copyright (C) 2010, 2013 Hib Eris +// Copyright (C) 2010 Kenneth Berland +// Copyright (C) 2011 Tom Gleason +// Copyright (C) 2011 Steven Murdoch +// Copyright (C) 2013 Yury G. Kudryashov +// Copyright (C) 2013 Suzuki Toshiya +// Copyright (C) 2015 Jeremy Echols +// Copyright (C) 2017 Adrian Johnson +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2018 Sanchit Anand +// Copyright (C) 2019 Dan Shea +// Copyright (C) 2019, 2021 Oliver Sander +// Copyright (C) 2021 William Bader +// Copyright (C) 2022 kVdNi +// +// 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" +#include +#include +#include +#include +#include +#include "parseargs.h" +#include "printencodings.h" +#include "goo/GooString.h" +#include "goo/gmem.h" +#include "GlobalParams.h" +#include "Object.h" +#include "Stream.h" +#include "Array.h" +#include "Dict.h" +#include "XRef.h" +#include "Catalog.h" +#include "Page.h" +#include "PDFDoc.h" +#include "PDFDocFactory.h" +#include "TextOutputDev.h" +#include "CharTypes.h" +#include "UnicodeMap.h" +#include "PDFDocEncoding.h" +#include "Error.h" +#include +#include +#include +#include "Win32Console.h" +#include "DateInfo.h" +#include + +static void printInfoString(FILE *f, Dict *infoDict, const char *key, const char *text1, const char *text2, const UnicodeMap *uMap); +static void printInfoDate(FILE *f, Dict *infoDict, const char *key, const char *text1, const char *text2); +void printDocBBox(FILE *f, PDFDoc *doc, TextOutputDev *textOut, int first, int last); +void printWordBBox(FILE *f, PDFDoc *doc, TextOutputDev *textOut, int first, int last); +void printTSVBBox(FILE *f, PDFDoc *doc, TextOutputDev *textOut, int first, int last); + +static int firstPage = 1; +static int lastPage = 0; +static double resolution = 72.0; +static int x = 0; +static int y = 0; +static int w = 0; +static int h = 0; +static bool bbox = false; +static bool bboxLayout = false; +static bool physLayout = false; +static bool useCropBox = false; +static double colspacing = TextOutputDev::minColSpacing1_default; +static double fixedPitch = 0; +static bool rawOrder = false; +static bool discardDiag = false; +static bool htmlMeta = false; +static char textEncName[128] = ""; +static char textEOLStr[16] = ""; +static bool noPageBreaks = false; +static char ownerPassword[33] = "\001"; +static char userPassword[33] = "\001"; +static bool quiet = false; +static bool printVersion = false; +static bool printHelp = false; +static bool printEnc = false; +static bool tsvMode = false; + +static const ArgDesc argDesc[] = { { "-f", argInt, &firstPage, 0, "first page to convert" }, + { "-l", argInt, &lastPage, 0, "last page to convert" }, + { "-r", argFP, &resolution, 0, "resolution, in DPI (default is 72)" }, + { "-x", argInt, &x, 0, "x-coordinate of the crop area top left corner" }, + { "-y", argInt, &y, 0, "y-coordinate of the crop area top left corner" }, + { "-W", argInt, &w, 0, "width of crop area in pixels (default is 0)" }, + { "-H", argInt, &h, 0, "height of crop area in pixels (default is 0)" }, + { "-layout", argFlag, &physLayout, 0, "maintain original physical layout" }, + { "-fixed", argFP, &fixedPitch, 0, "assume fixed-pitch (or tabular) text" }, + { "-raw", argFlag, &rawOrder, 0, "keep strings in content stream order" }, + { "-nodiag", argFlag, &discardDiag, 0, "discard diagonal text" }, + { "-htmlmeta", argFlag, &htmlMeta, 0, "generate a simple HTML file, including the meta information" }, + { "-tsv", argFlag, &tsvMode, 0, "generate a simple TSV file, including the meta information for bounding boxes" }, + { "-enc", argString, textEncName, sizeof(textEncName), "output text encoding name" }, + { "-listenc", argFlag, &printEnc, 0, "list available encodings" }, + { "-eol", argString, textEOLStr, sizeof(textEOLStr), "output end-of-line convention (unix, dos, or mac)" }, + { "-nopgbrk", argFlag, &noPageBreaks, 0, "don't insert page breaks between pages" }, + { "-bbox", argFlag, &bbox, 0, "output bounding box for each word and page size to html. Sets -htmlmeta" }, + { "-bbox-layout", argFlag, &bboxLayout, 0, "like -bbox but with extra layout bounding box data. Sets -htmlmeta" }, + { "-cropbox", argFlag, &useCropBox, 0, "use the crop box rather than media box" }, + { "-colspacing", argFP, &colspacing, 0, + "how much spacing we allow after a word before considering adjacent text to be a new column, as a fraction of the font size (default is 0.7, old releases had a 0.3 default)" }, + { "-opw", argString, ownerPassword, sizeof(ownerPassword), "owner password (for encrypted files)" }, + { "-upw", argString, userPassword, sizeof(userPassword), "user password (for encrypted files)" }, + { "-q", argFlag, &quiet, 0, "don't print any messages or errors" }, + { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, + { "-h", argFlag, &printHelp, 0, "print usage information" }, + { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, + { "-?", argFlag, &printHelp, 0, "print usage information" }, + {} }; + +static std::string myStringReplace(const std::string &inString, const std::string &oldToken, const std::string &newToken) +{ + std::string result = inString; + size_t foundLoc; + int advance = 0; + do { + foundLoc = result.find(oldToken, advance); + if (foundLoc != std::string::npos) { + result.replace(foundLoc, oldToken.length(), newToken); + advance = foundLoc + newToken.length(); + } + } while (foundLoc != std::string::npos); + return result; +} + +static std::string myXmlTokenReplace(const char *inString) +{ + std::string myString(inString); + myString = myStringReplace(myString, "&", "&"); + myString = myStringReplace(myString, "'", "'"); + myString = myStringReplace(myString, "\"", """); + myString = myStringReplace(myString, "<", "<"); + myString = myStringReplace(myString, ">", ">"); + return myString; +} + +int main(int argc, char *argv[]) +{ + std::unique_ptr doc; + std::unique_ptr textFileName; + std::optional ownerPW, userPW; + FILE *f; + const UnicodeMap *uMap; + Object info; + bool ok; + EndOfLineKind textEOL = TextOutputDev::defaultEndOfLine(); + + Win32Console win32Console(&argc, &argv); + + // parse args + ok = parseArgs(argDesc, &argc, argv); + if (bboxLayout) { + bbox = true; + } + if (bbox) { + htmlMeta = true; + } + if (colspacing <= 0 || colspacing > 10) { + error(errCommandLine, -1, "Bogus value provided for -colspacing"); + return 99; + } + if (!ok || (argc < 2 && !printEnc) || argc > 3 || printVersion || printHelp) { + fprintf(stderr, "pdftotext version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", xpdfCopyright); + if (!printVersion) { + printUsage("pdftotext", " []", argDesc); + } + if (printVersion || printHelp) { + return 0; + } + return 99; + } + + // read config file + globalParams = std::make_unique(); + + if (printEnc) { + printEncodings(); + return 0; + } + + GooString fileName(argv[1]); + if (fixedPitch) { + physLayout = true; + } + + if (textEncName[0]) { + globalParams->setTextEncoding(textEncName); + } + if (textEOLStr[0]) { + if (!strcmp(textEOLStr, "unix")) { + textEOL = eolUnix; + } else if (!strcmp(textEOLStr, "dos")) { + textEOL = eolDOS; + } else if (!strcmp(textEOLStr, "mac")) { + textEOL = eolMac; + } else { + fprintf(stderr, "Bad '-eol' value on command line\n"); + } + } + if (quiet) { + globalParams->setErrQuiet(quiet); + } + + // get mapping to output encoding + if (!(uMap = globalParams->getTextEncoding())) { + error(errCommandLine, -1, "Couldn't get text encoding"); + return 99; + } + + // open PDF file + if (ownerPassword[0] != '\001') { + ownerPW = GooString(ownerPassword); + } + if (userPassword[0] != '\001') { + userPW = GooString(userPassword); + } + + if (fileName.cmp("-") == 0) { + fileName = GooString("fd://0"); + } + + doc = PDFDocFactory().createPDFDoc(fileName, ownerPW, userPW); + + if (!doc->isOk()) { + return 1; + } + +#ifdef ENFORCE_PERMISSIONS + // check for copy permission + if (!doc->okToCopy()) { + error(errNotAllowed, -1, "Copying of text from this document is not allowed."); + return 3; + } +#endif + + // construct text file name + if (argc == 3) { + textFileName = std::make_unique(argv[2]); + } else if (fileName.cmp("fd://0") == 0) { + error(errCommandLine, -1, "You have to provide an output filename when reading from stdin."); + return 99; + } else { + const char *p = fileName.c_str() + fileName.getLength() - 4; + if (!strcmp(p, ".pdf") || !strcmp(p, ".PDF")) { + textFileName = std::make_unique(fileName.c_str(), fileName.getLength() - 4); + } else { + textFileName.reset(fileName.copy()); + } + textFileName->append(htmlMeta ? ".html" : ".txt"); + } + + // get page range + if (firstPage < 1) { + firstPage = 1; + } + if (lastPage < 1 || lastPage > doc->getNumPages()) { + lastPage = doc->getNumPages(); + } + if (lastPage < firstPage) { + error(errCommandLine, -1, "Wrong page range given: the first page ({0:d}) can not be after the last page ({1:d}).", firstPage, lastPage); + return 99; + } + + // write HTML header + if (htmlMeta) { + if (!textFileName->cmp("-")) { + f = stdout; + } else { + if (!(f = fopen(textFileName->c_str(), "wb"))) { + error(errIO, -1, "Couldn't open text file '{0:t}'", textFileName.get()); + return 2; + } + } + fputs("", f); + fputs("\n", f); + fputs("\n", f); + info = doc->getDocInfo(); + if (info.isDict()) { + Object obj = info.getDict()->lookup("Title"); + if (obj.isString()) { + printInfoString(f, info.getDict(), "Title", "", "\n", uMap); + } else { + fputs("\n", f); + } + printInfoString(f, info.getDict(), "Subject", "\n", uMap); + printInfoString(f, info.getDict(), "Keywords", "\n", uMap); + printInfoString(f, info.getDict(), "Author", "\n", uMap); + printInfoString(f, info.getDict(), "Creator", "\n", uMap); + printInfoString(f, info.getDict(), "Producer", "\n", uMap); + printInfoDate(f, info.getDict(), "CreationDate", "\n"); + printInfoDate(f, info.getDict(), "ModDate", "\n"); + } + fputs("\n", f); + fputs("\n", f); + if (!bbox) { + fputs("
\n", f);
+            if (f != stdout) {
+                fclose(f);
+            }
+        }
+    }
+
+    // write text file
+    if (htmlMeta && bbox) { // htmlMeta && is superfluous but makes gcc happier
+        TextOutputDev textOut(nullptr, physLayout, fixedPitch, rawOrder, htmlMeta, discardDiag);
+
+        if (textOut.isOk()) {
+            textOut.setTextEOL(textEOL);
+            textOut.setMinColSpacing1(colspacing);
+            if (noPageBreaks) {
+                textOut.setTextPageBreaks(false);
+            }
+            if (bboxLayout) {
+                printDocBBox(f, doc.get(), &textOut, firstPage, lastPage);
+            } else {
+                printWordBBox(f, doc.get(), &textOut, firstPage, lastPage);
+            }
+        }
+        if (f != stdout) {
+            fclose(f);
+        }
+    } else {
+
+        if (tsvMode) {
+            TextOutputDev textOut(nullptr, physLayout, fixedPitch, rawOrder, htmlMeta, discardDiag);
+            if (!textFileName->cmp("-")) {
+                f = stdout;
+            } else {
+                if (!(f = fopen(textFileName->c_str(), "wb"))) {
+                    error(errIO, -1, "Couldn't open text file '{0:t}'", textFileName.get());
+                    return 2;
+                }
+            }
+            printTSVBBox(f, doc.get(), &textOut, firstPage, lastPage);
+            if (f != stdout) {
+                fclose(f);
+            }
+        } else {
+            TextOutputDev textOut(textFileName->c_str(), physLayout, fixedPitch, rawOrder, htmlMeta, discardDiag);
+            if (textOut.isOk()) {
+                textOut.setTextEOL(textEOL);
+                textOut.setMinColSpacing1(colspacing);
+                if (noPageBreaks) {
+                    textOut.setTextPageBreaks(false);
+                }
+
+                if ((w == 0) && (h == 0) && (x == 0) && (y == 0)) {
+                    doc->displayPages(&textOut, firstPage, lastPage, resolution, resolution, 0, true, false, false);
+                } else {
+
+                    for (int page = firstPage; page <= lastPage; ++page) {
+                        doc->displayPageSlice(&textOut, page, resolution, resolution, 0, true, false, false, x, y, w, h);
+                    }
+                }
+
+            } else {
+                return 2;
+            }
+        }
+    }
+
+    // write end of HTML file
+    if (htmlMeta) {
+        if (!textFileName->cmp("-")) {
+            f = stdout;
+        } else {
+            if (!(f = fopen(textFileName->c_str(), "ab"))) {
+                error(errIO, -1, "Couldn't open text file '{0:t}'", textFileName.get());
+                return 2;
+            }
+        }
+        if (!bbox) {
+            fputs("
\n", f); + } + fputs("\n", f); + fputs("\n", f); + if (f != stdout) { + fclose(f); + } + } + + return 0; +} + +static void printInfoString(FILE *f, Dict *infoDict, const char *key, const char *text1, const char *text2, const UnicodeMap *uMap) +{ + const GooString *s1; + bool isUnicode; + Unicode u; + char buf[9]; + int i, n; + + Object obj = infoDict->lookup(key); + if (obj.isString()) { + fputs(text1, f); + s1 = obj.getString(); + if ((s1->getChar(0) & 0xff) == 0xfe && (s1->getChar(1) & 0xff) == 0xff) { + isUnicode = true; + i = 2; + } else { + isUnicode = false; + i = 0; + } + while (i < obj.getString()->getLength()) { + if (isUnicode) { + u = ((s1->getChar(i) & 0xff) << 8) | (s1->getChar(i + 1) & 0xff); + i += 2; + } else { + u = pdfDocEncoding[s1->getChar(i) & 0xff]; + ++i; + } + n = uMap->mapUnicode(u, buf, sizeof(buf)); + buf[n] = '\0'; + const std::string myString = myXmlTokenReplace(buf); + fputs(myString.c_str(), f); + } + fputs(text2, f); + } +} + +static void printInfoDate(FILE *f, Dict *infoDict, const char *key, const char *text1, const char *text2) +{ + int year, mon, day, hour, min, sec, tz_hour, tz_minute; + char tz; + + Object obj = infoDict->lookup(key); + if (obj.isString()) { + const GooString *s = obj.getString(); + if (parseDateString(s, &year, &mon, &day, &hour, &min, &sec, &tz, &tz_hour, &tz_minute)) { + fputs(text1, f); + fprintf(f, "%04d-%02d-%02dT%02d:%02d:%02d", year, mon, day, hour, min, sec); + if (tz_hour == 0 && tz_minute == 0) { + fprintf(f, "Z"); + } else { + fprintf(f, "%c%02d", tz, tz_hour); + if (tz_minute) { + fprintf(f, ":%02d", tz_minute); + } + } + fputs(text2, f); + } + } +} + +static void printLine(FILE *f, const TextLine *line) +{ + double xMin, yMin, xMax, yMax; + double lineXMin = 0, lineYMin = 0, lineXMax = 0, lineYMax = 0; + const TextWord *word; + std::stringstream wordXML; + wordXML << std::fixed << std::setprecision(6); + + for (word = line->getWords(); word; word = word->getNext()) { + word->getBBox(&xMin, &yMin, &xMax, &yMax); + + if (lineXMin == 0 || lineXMin > xMin) { + lineXMin = xMin; + } + if (lineYMin == 0 || lineYMin > yMin) { + lineYMin = yMin; + } + if (lineXMax < xMax) { + lineXMax = xMax; + } + if (lineYMax < yMax) { + lineYMax = yMax; + } + + GooString *wordText = word->getText(); + const std::string myString = myXmlTokenReplace(wordText->c_str()); + wordXML << " " << myString << "\n"; + delete wordText; + } + fprintf(f, " \n", lineXMin, lineYMin, lineXMax, lineYMax); + fputs(wordXML.str().c_str(), f); + fputs(" \n", f); +} + +void printDocBBox(FILE *f, PDFDoc *doc, TextOutputDev *textOut, int first, int last) +{ + double xMin, yMin, xMax, yMax; + const TextFlow *flow; + const TextBlock *blk; + const TextLine *line; + + fprintf(f, "\n"); + for (int page = first; page <= last; ++page) { + const double wid = useCropBox ? doc->getPageCropWidth(page) : doc->getPageMediaWidth(page); + const double hgt = useCropBox ? doc->getPageCropHeight(page) : doc->getPageMediaHeight(page); + fprintf(f, " \n", wid, hgt); + doc->displayPage(textOut, page, resolution, resolution, 0, !useCropBox, useCropBox, false); + for (flow = textOut->getFlows(); flow; flow = flow->getNext()) { + fprintf(f, " \n"); + for (blk = flow->getBlocks(); blk; blk = blk->getNext()) { + blk->getBBox(&xMin, &yMin, &xMax, &yMax); + fprintf(f, " \n", xMin, yMin, xMax, yMax); + for (line = blk->getLines(); line; line = line->getNext()) { + printLine(f, line); + } + fprintf(f, " \n"); + } + fprintf(f, " \n"); + } + fprintf(f, " \n"); + } + fprintf(f, "\n"); +} + +void printTSVBBox(FILE *f, PDFDoc *doc, TextOutputDev *textOut, int first, int last) +{ + double xMin = 0, yMin = 0, xMax = 0, yMax = 0; + const TextFlow *flow; + const TextBlock *blk; + const TextLine *line; + const TextWord *word; + int blockNum = 0; + int lineNum = 0; + int flowNum = 0; + int wordNum = 0; + const int pageLevel = 1; + const int blockLevel = 3; + const int lineLevel = 4; + const int wordLevel = 5; + const int metaConf = -1; + const int wordConf = 100; + + fputs("level\tpage_num\tpar_num\tblock_num\tline_num\tword_num\tleft\ttop\twidth\theight\tconf\ttext\n", f); + + for (int page = first; page <= last; ++page) { + const double wid = useCropBox ? doc->getPageCropWidth(page) : doc->getPageMediaWidth(page); + const double hgt = useCropBox ? doc->getPageCropHeight(page) : doc->getPageMediaHeight(page); + + fprintf(f, "%d\t%d\t%d\t%d\t%d\t%d\t%f\t%f\t%f\t%f\t%d\t###PAGE###\n", pageLevel, page, flowNum, blockNum, lineNum, wordNum, xMin, yMin, wid, hgt, metaConf); + doc->displayPage(textOut, page, resolution, resolution, 0, !useCropBox, useCropBox, false); + + for (flow = textOut->getFlows(); flow; flow = flow->getNext()) { + // flow->getBBox(&xMin, &yMin, &xMax, &yMax); + // fprintf(f, "%d\t%d\t%d\t%d\t%d\t%f\t%f\t%f\t%f\t\n", page,flowNum,blockNum,lineNum,wordNum,xMin,yMin,wid, hgt); + + for (blk = flow->getBlocks(); blk; blk = blk->getNext()) { + blk->getBBox(&xMin, &yMin, &xMax, &yMax); + fprintf(f, "%d\t%d\t%d\t%d\t%d\t%d\t%f\t%f\t%f\t%f\t%d\t###FLOW###\n", blockLevel, page, flowNum, blockNum, lineNum, wordNum, xMin, yMin, xMax - xMin, yMax - yMin, metaConf); + + for (line = blk->getLines(); line; line = line->getNext()) { + + double lxMin = 1E+37, lyMin = 1E+37; + double lxMax = 0, lyMax = 0; + GooString *lineWordsBuffer = new GooString(); + + for (word = line->getWords(); word; word = word->getNext()) { + word->getBBox(&xMin, &yMin, &xMax, &yMax); + if (lxMin > xMin) { + lxMin = xMin; + } + if (lxMax < xMax) { + lxMax = xMax; + } + if (lyMin > yMin) { + lyMin = yMin; + } + if (lyMax < yMax) { + lyMax = yMax; + } + + lineWordsBuffer->appendf("{0:d}\t{1:d}\t{2:d}\t{3:d}\t{4:d}\t{5:d}\t{6:.2f}\t{7:.2f}\t{8:.2f}\t{9:.2f}\t{10:d}\t{11:t}\n", wordLevel, page, flowNum, blockNum, lineNum, wordNum, xMin, yMin, xMax - xMin, yMax - yMin, + wordConf, word->getText()); + wordNum++; + } + + // Print Link Bounding Box info + fprintf(f, "%d\t%d\t%d\t%d\t%d\t%d\t%f\t%f\t%f\t%f\t%d\t###LINE###\n", lineLevel, page, flowNum, blockNum, lineNum, 0, lxMin, lyMin, lxMax - lxMin, lyMax - lyMin, metaConf); + fprintf(f, "%s", lineWordsBuffer->c_str()); + delete lineWordsBuffer; + wordNum = 0; + lineNum++; + } + lineNum = 0; + blockNum++; + } + blockNum = 0; + flowNum++; + } + flowNum = 0; + } +} + +void printWordBBox(FILE *f, PDFDoc *doc, TextOutputDev *textOut, int first, int last) +{ + fprintf(f, "\n"); + for (int page = first; page <= last; ++page) { + double wid = useCropBox ? doc->getPageCropWidth(page) : doc->getPageMediaWidth(page); + double hgt = useCropBox ? doc->getPageCropHeight(page) : doc->getPageMediaHeight(page); + fprintf(f, " \n", wid, hgt); + doc->displayPage(textOut, page, resolution, resolution, 0, !useCropBox, useCropBox, false); + std::unique_ptr wordlist = textOut->makeWordList(); + const int word_length = wordlist != nullptr ? wordlist->getLength() : 0; + TextWord *word; + double xMinA, yMinA, xMaxA, yMaxA; + if (word_length == 0) { + fprintf(stderr, "no word list\n"); + } + + for (int i = 0; i < word_length; ++i) { + word = wordlist->get(i); + word->getBBox(&xMinA, &yMinA, &xMaxA, &yMaxA); + const std::string myString = myXmlTokenReplace(word->getText()->c_str()); + fprintf(f, " %s\n", xMinA, yMinA, xMaxA, yMaxA, myString.c_str()); + } + fprintf(f, " \n"); + } + fprintf(f, "\n"); +} diff --git a/poppler-24.05.0/utils/pdfunite.1 b/poppler-24.05.0/utils/pdfunite.1 new file mode 100644 index 0000000000000000000000000000000000000000..4a1b4ea89bc114bb4b6f0f69d4d47b553389ee71 --- /dev/null +++ b/poppler-24.05.0/utils/pdfunite.1 @@ -0,0 +1,43 @@ +.\" Copyright 2011 The Poppler Developers - http://poppler.freedesktop.org +.TH pdfunite 1 "15 September 2011" +.SH NAME +pdfunite \- Portable Document Format (PDF) page merger +.SH SYNOPSIS +.B pdfunite +[options] +.I PDF-sourcefile1..PDF-sourcefilen PDF-destfile +.SH DESCRIPTION +.B pdfunite +merges several PDF (Portable Document Format) files in order of their occurrence on command line to one PDF result file. +.TP +Neither of the PDF-sourcefile1 to PDF-sourcefilen should be encrypted. +.SH OPTIONS +.TP +.B \-v +Print copyright and version information. +.TP +.B \-h +Print usage information. +.RB ( \-help +and +.B \-\-help +are equivalent.) +.SH EXAMPLE +pdfunite sample1.pdf sample2.pdf sample.pdf +.TP +merges all pages from sample1.pdf and sample2.pdf (in that order) and creates sample.pdf +.SH AUTHOR +The pdfunite software and documentation are copyright 1996-2004 Glyph & Cog, LLC +and copyright 2005-2011 The Poppler Developers - http://poppler.freedesktop.org +.SH "SEE ALSO" +.BR pdfdetach (1), +.BR pdffonts (1), +.BR pdfimages (1), +.BR pdfinfo (1), +.BR pdftocairo (1), +.BR pdftohtml (1), +.BR pdftoppm (1), +.BR pdftops (1), +.BR pdftotext (1) +.BR pdfseparate (1), +.BR pdfsig (1) diff --git a/poppler-24.05.0/utils/pdfunite.cc b/poppler-24.05.0/utils/pdfunite.cc new file mode 100644 index 0000000000000000000000000000000000000000..24525a9a4fa1e87ed7455b4787d66363aeee2ff9 --- /dev/null +++ b/poppler-24.05.0/utils/pdfunite.cc @@ -0,0 +1,431 @@ +//======================================================================== +// +// pdfunite.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2011-2015, 2017 Thomas Freitag +// Copyright (C) 2012 Arseny Solokha +// Copyright (C) 2012 Fabio D'Urso +// Copyright (C) 2012, 2014, 2017-2019, 2021, 2022 Albert Astals Cid +// Copyright (C) 2013 Adrian Johnson +// Copyright (C) 2013 Hib Eris +// Copyright (C) 2015 Arthur Stavisky +// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, . Work sponsored by the LiMux project of the city of Munich +// Copyright (C) 2018 Adam Reichold +// Copyright (C) 2019 Marek Kasik +// Copyright (C) 2019, 2023 Oliver Sander +// Copyright (C) 2022 crt +// +//======================================================================== + +#include +#include +#include "parseargs.h" +#include "config.h" +#include +#include + +static bool printVersion = false; +static bool printHelp = false; + +static const ArgDesc argDesc[] = { { "-v", argFlag, &printVersion, 0, "print copyright and version info" }, { "-h", argFlag, &printHelp, 0, "print usage information" }, { "-help", argFlag, &printHelp, 0, "print usage information" }, + { "--help", argFlag, &printHelp, 0, "print usage information" }, { "-?", argFlag, &printHelp, 0, "print usage information" }, {} }; + +static void doMergeNameTree(PDFDoc *doc, XRef *srcXRef, XRef *countRef, int oldRefNum, int newRefNum, Dict *srcNameTree, Dict *mergeNameTree, int numOffset) +{ + Object mergeNameArray = mergeNameTree->lookup("Names"); + Object srcNameArray = srcNameTree->lookup("Names"); + if (mergeNameArray.isArray() && srcNameArray.isArray()) { + Array *newNameArray = new Array(srcXRef); + int j = 0; + for (int i = 0; i < srcNameArray.arrayGetLength() - 1; i += 2) { + const Object &key = srcNameArray.arrayGetNF(i); + const Object &value = srcNameArray.arrayGetNF(i + 1); + if (key.isString() && value.isRef()) { + while (j < mergeNameArray.arrayGetLength() - 1) { + const Object &mkey = mergeNameArray.arrayGetNF(j); + const Object &mvalue = mergeNameArray.arrayGetNF(j + 1); + if (mkey.isString() && mvalue.isRef()) { + if (mkey.getString()->cmp(key.getString()) < 0) { + newNameArray->add(Object(new GooString(mkey.getString()->c_str()))); + newNameArray->add(Object(Ref { mvalue.getRef().num + numOffset, mvalue.getRef().gen })); + j += 2; + } else if (mkey.getString()->cmp(key.getString()) == 0) { + j += 2; + } else { + break; + } + } else { + j += 2; + } + } + newNameArray->add(Object(new GooString(key.getString()->c_str()))); + newNameArray->add(Object(value.getRef())); + } + } + while (j < mergeNameArray.arrayGetLength() - 1) { + const Object &mkey = mergeNameArray.arrayGetNF(j); + const Object &mvalue = mergeNameArray.arrayGetNF(j + 1); + if (mkey.isString() && mvalue.isRef()) { + newNameArray->add(Object(new GooString(mkey.getString()->c_str()))); + newNameArray->add(Object(Ref { mvalue.getRef().num + numOffset, mvalue.getRef().gen })); + } + j += 2; + } + srcNameTree->set("Names", Object(newNameArray)); + doc->markPageObjects(mergeNameTree, srcXRef, countRef, numOffset, oldRefNum, newRefNum); + } else if (srcNameArray.isNull() && mergeNameArray.isArray()) { + Array *newNameArray = new Array(srcXRef); + for (int i = 0; i < mergeNameArray.arrayGetLength() - 1; i += 2) { + const Object &key = mergeNameArray.arrayGetNF(i); + const Object &value = mergeNameArray.arrayGetNF(i + 1); + if (key.isString() && value.isRef()) { + newNameArray->add(Object(new GooString(key.getString()->c_str()))); + newNameArray->add(Object(Ref { value.getRef().num + numOffset, value.getRef().gen })); + } + } + srcNameTree->add("Names", Object(newNameArray)); + doc->markPageObjects(mergeNameTree, srcXRef, countRef, numOffset, oldRefNum, newRefNum); + } +} + +static void doMergeNameDict(PDFDoc *doc, XRef *srcXRef, XRef *countRef, int oldRefNum, int newRefNum, Dict *srcNameDict, Dict *mergeNameDict, int numOffset) +{ + for (int i = 0; i < mergeNameDict->getLength(); i++) { + const char *key = mergeNameDict->getKey(i); + Object mergeNameTree = mergeNameDict->lookup(key); + Object srcNameTree = srcNameDict->lookup(key); + if (srcNameTree.isDict() && mergeNameTree.isDict()) { + doMergeNameTree(doc, srcXRef, countRef, oldRefNum, newRefNum, srcNameTree.getDict(), mergeNameTree.getDict(), numOffset); + } else if (srcNameTree.isNull() && mergeNameTree.isDict()) { + Object newNameTree(new Dict(srcXRef)); + doMergeNameTree(doc, srcXRef, countRef, oldRefNum, newRefNum, newNameTree.getDict(), mergeNameTree.getDict(), numOffset); + srcNameDict->add(key, std::move(newNameTree)); + } + } +} + +static bool doMergeFormDict(Dict *srcFormDict, Dict *mergeFormDict, int numOffset) +{ + Object srcFields = srcFormDict->lookup("Fields"); + Object mergeFields = mergeFormDict->lookup("Fields"); + if (srcFields.isArray() && mergeFields.isArray()) { + for (int i = 0; i < mergeFields.arrayGetLength(); i++) { + const Object &value = mergeFields.arrayGetNF(i); + if (!value.isRef()) { + error(errSyntaxError, -1, "Fields object is not a Ref."); + return false; + } + srcFields.arrayAdd(Object(Ref { value.getRef().num + numOffset, value.getRef().gen })); + } + } + return true; +} + +/////////////////////////////////////////////////////////////////////////// +int main(int argc, char *argv[]) +/////////////////////////////////////////////////////////////////////////// +// Merge PDF files given by arguments 1 to argc-2 and write the result +// to the file specified by argument argc-1. +/////////////////////////////////////////////////////////////////////////// +{ + int objectsCount = 0; + unsigned int numOffset = 0; + std::vector pages; + std::vector offsets; + XRef *yRef, *countRef; + FILE *f; + OutStream *outStr; + int i; + int j, rootNum; + std::vector> docs; + int majorVersion = 0; + int minorVersion = 0; + char *fileName = argv[argc - 1]; + + const bool ok = parseArgs(argDesc, &argc, argv); + if (!ok || argc < 3 || printVersion || printHelp) { + fprintf(stderr, "pdfunite version %s\n", PACKAGE_VERSION); + fprintf(stderr, "%s\n", popplerCopyright); + fprintf(stderr, "%s\n", xpdfCopyright); + if (!printVersion) { + printUsage("pdfunite", ".. ", argDesc); + } + if (printVersion || printHelp) { + return 0; + } + return 99; + } + globalParams = std::make_unique(); + + for (i = 1; i < argc - 1; i++) { + std::unique_ptr doc = std::make_unique(std::make_unique(argv[i])); + if (doc->isOk() && !doc->isEncrypted() && doc->getXRef()->getCatalog().isDict()) { + if (doc->getPDFMajorVersion() > majorVersion) { + majorVersion = doc->getPDFMajorVersion(); + minorVersion = doc->getPDFMinorVersion(); + } else if (doc->getPDFMajorVersion() == majorVersion) { + if (doc->getPDFMinorVersion() > minorVersion) { + minorVersion = doc->getPDFMinorVersion(); + } + } + docs.push_back(std::move(doc)); + } else if (doc->isOk()) { + if (doc->isEncrypted()) { + error(errUnimplemented, -1, "Could not merge encrypted files ('{0:s}')", argv[i]); + return -1; + } else if (!doc->getXRef()->getCatalog().isDict()) { + error(errSyntaxError, -1, "XRef's Catalog is not a dictionary ('{0:s}')", argv[i]); + return -1; + } + } else { + error(errSyntaxError, -1, "Could not merge damaged documents ('{0:s}')", argv[i]); + return -1; + } + } + + if (!(f = fopen(fileName, "wb"))) { + error(errIO, -1, "Could not open file '{0:s}'", fileName); + return -1; + } + outStr = new FileOutStream(f, 0); + + yRef = new XRef(); + countRef = new XRef(); + yRef->add(0, 65535, 0, false); + PDFDoc::writeHeader(outStr, majorVersion, minorVersion); + + // handle OutputIntents, AcroForm, OCProperties & Names + Object intents; + Object names; + Object afObj; + Object ocObj; + if (docs.size() >= 1) { + Object catObj = docs[0]->getXRef()->getCatalog(); + if (!catObj.isDict()) { + fclose(f); + delete yRef; + delete countRef; + delete outStr; + error(errSyntaxError, -1, "XRef's Catalog is not a dictionary."); + return -1; + } + Dict *catDict = catObj.getDict(); + intents = catDict->lookup("OutputIntents"); + afObj = catDict->lookupNF("AcroForm").copy(); + Ref *refPage = docs[0]->getCatalog()->getPageRef(1); + if (!afObj.isNull() && refPage) { + docs[0]->markAcroForm(&afObj, yRef, countRef, 0, refPage->num, refPage->num); + } + ocObj = catDict->lookupNF("OCProperties").copy(); + if (!ocObj.isNull() && ocObj.isDict() && refPage) { + docs[0]->markPageObjects(ocObj.getDict(), yRef, countRef, 0, refPage->num, refPage->num); + } + names = catDict->lookup("Names"); + if (!names.isNull() && names.isDict() && refPage) { + docs[0]->markPageObjects(names.getDict(), yRef, countRef, 0, refPage->num, refPage->num); + } + if (intents.isArray() && intents.arrayGetLength() > 0) { + for (i = 1; i < (int)docs.size(); i++) { + Object pagecatObj = docs[i]->getXRef()->getCatalog(); + Dict *pagecatDict = pagecatObj.getDict(); + Object pageintents = pagecatDict->lookup("OutputIntents"); + if (pageintents.isArray() && pageintents.arrayGetLength() > 0) { + for (j = intents.arrayGetLength() - 1; j >= 0; j--) { + Object intent = intents.arrayGet(j, 0); + if (intent.isDict()) { + Object idf = intent.dictLookup("OutputConditionIdentifier"); + if (idf.isString()) { + const GooString *gidf = idf.getString(); + bool removeIntent = true; + for (int k = 0; k < pageintents.arrayGetLength(); k++) { + Object pgintent = pageintents.arrayGet(k, 0); + if (pgintent.isDict()) { + Object pgidf = pgintent.dictLookup("OutputConditionIdentifier"); + if (pgidf.isString()) { + const GooString *gpgidf = pgidf.getString(); + if (gpgidf->cmp(gidf) == 0) { + removeIntent = false; + break; + } + } + } + } + if (removeIntent) { + intents.arrayRemove(j); + error(errSyntaxWarning, -1, "Output intent {0:s} missing in pdf {1:s}, removed", gidf->c_str(), docs[i]->getFileName()->c_str()); + } + } else { + intents.arrayRemove(j); + error(errSyntaxWarning, -1, "Invalid output intent dict, missing required OutputConditionIdentifier"); + } + } else { + intents.arrayRemove(j); + } + } + } else { + error(errSyntaxWarning, -1, "Output intents differs, remove them all"); + break; + } + } + } + if (intents.isArray() && intents.arrayGetLength() > 0) { + for (j = intents.arrayGetLength() - 1; j >= 0; j--) { + Object intent = intents.arrayGet(j, 0); + if (intent.isDict()) { + docs[0]->markPageObjects(intent.getDict(), yRef, countRef, numOffset, 0, 0); + } else { + intents.arrayRemove(j); + } + } + } + } + + for (i = 0; i < (int)docs.size(); i++) { + for (j = 1; j <= docs[i]->getNumPages(); j++) { + if (!docs[i]->getCatalog()->getPage(j)) { + continue; + } + + const PDFRectangle *cropBox = nullptr; + if (docs[i]->getCatalog()->getPage(j)->isCropped()) { + cropBox = docs[i]->getCatalog()->getPage(j)->getCropBox(); + } + if (!docs[i]->replacePageDict(j, docs[i]->getCatalog()->getPage(j)->getRotate(), docs[i]->getCatalog()->getPage(j)->getMediaBox(), cropBox)) { + fclose(f); + delete yRef; + delete countRef; + delete outStr; + error(errSyntaxError, -1, "PDFDoc::replacePageDict failed."); + return -1; + } + Ref *refPage = docs[i]->getCatalog()->getPageRef(j); + Object page = docs[i]->getXRef()->fetch(*refPage); + Dict *pageDict = page.getDict(); + Object *resDict = docs[i]->getCatalog()->getPage(j)->getResourceDictObject(); + if (resDict->isDict()) { + pageDict->set("Resources", resDict->copy()); + } + pages.push_back(std::move(page)); + offsets.push_back(numOffset); + docs[i]->markPageObjects(pageDict, yRef, countRef, numOffset, refPage->num, refPage->num); + Object annotsObj = pageDict->lookupNF("Annots").copy(); + if (!annotsObj.isNull()) { + docs[i]->markAnnotations(&annotsObj, yRef, countRef, numOffset, refPage->num, refPage->num); + } + } + Object pageCatObj = docs[i]->getXRef()->getCatalog(); + if (!pageCatObj.isDict()) { + fclose(f); + delete yRef; + delete countRef; + delete outStr; + error(errSyntaxError, -1, "XRef's Catalog is not a dictionary."); + return -1; + } + Dict *pageCatDict = pageCatObj.getDict(); + Object pageNames = pageCatDict->lookup("Names"); + if (!pageNames.isNull() && pageNames.isDict()) { + if (!names.isDict()) { + names = Object(new Dict(yRef)); + } + doMergeNameDict(docs[i].get(), yRef, countRef, 0, 0, names.getDict(), pageNames.getDict(), numOffset); + } + Object pageForm = pageCatDict->lookup("AcroForm"); + if (i > 0 && !pageForm.isNull() && pageForm.isDict()) { + if (afObj.isNull()) { + afObj = pageCatDict->lookupNF("AcroForm").copy(); + } else if (afObj.isDict()) { + if (!doMergeFormDict(afObj.getDict(), pageForm.getDict(), numOffset)) { + fclose(f); + delete yRef; + delete countRef; + delete outStr; + return -1; + } + } + } + objectsCount += docs[i]->writePageObjects(outStr, yRef, numOffset, true); + numOffset = yRef->getNumObjects() + 1; + } + + rootNum = yRef->getNumObjects() + 1; + yRef->add(rootNum, 0, outStr->getPos(), true); + outStr->printf("%d 0 obj\n", rootNum); + outStr->printf("<< /Type /Catalog /Pages %d 0 R", rootNum + 1); + // insert OutputIntents + if (intents.isArray() && intents.arrayGetLength() > 0) { + outStr->printf(" /OutputIntents ["); + for (j = 0; j < intents.arrayGetLength(); j++) { + Object intent = intents.arrayGet(j, 0); + if (intent.isDict()) { + PDFDoc::writeObject(&intent, outStr, yRef, 0, nullptr, cryptRC4, 0, 0, 0); + } + } + outStr->printf("]"); + } + // insert AcroForm + if (!afObj.isNull()) { + outStr->printf(" /AcroForm "); + PDFDoc::writeObject(&afObj, outStr, yRef, 0, nullptr, cryptRC4, 0, 0, 0); + } + // insert OCProperties + if (!ocObj.isNull() && ocObj.isDict()) { + outStr->printf(" /OCProperties "); + PDFDoc::writeObject(&ocObj, outStr, yRef, 0, nullptr, cryptRC4, 0, 0, 0); + } + // insert Names + if (!names.isNull() && names.isDict()) { + outStr->printf(" /Names "); + PDFDoc::writeObject(&names, outStr, yRef, 0, nullptr, cryptRC4, 0, 0, 0); + } + outStr->printf(">>\nendobj\n"); + objectsCount++; + + yRef->add(rootNum + 1, 0, outStr->getPos(), true); + outStr->printf("%d 0 obj\n", rootNum + 1); + outStr->printf("<< /Type /Pages /Kids ["); + for (j = 0; j < (int)pages.size(); j++) { + outStr->printf(" %d 0 R", rootNum + j + 2); + } + outStr->printf(" ] /Count %zd >>\nendobj\n", pages.size()); + objectsCount++; + + for (i = 0; i < (int)pages.size(); i++) { + yRef->add(rootNum + i + 2, 0, outStr->getPos(), true); + outStr->printf("%d 0 obj\n", rootNum + i + 2); + outStr->printf("<< "); + Dict *pageDict = pages[i].getDict(); + for (j = 0; j < pageDict->getLength(); j++) { + if (j > 0) { + outStr->printf(" "); + } + const char *key = pageDict->getKey(j); + Object value = pageDict->getValNF(j).copy(); + if (strcmp(key, "Parent") == 0) { + outStr->printf("/Parent %d 0 R", rootNum + 1); + } else { + outStr->printf("/%s ", key); + PDFDoc::writeObject(&value, outStr, yRef, offsets[i], nullptr, cryptRC4, 0, 0, 0); + } + } + outStr->printf(" >>\nendobj\n"); + objectsCount++; + } + Goffset uxrefOffset = outStr->getPos(); + Ref ref; + ref.num = rootNum; + ref.gen = 0; + Object trailerDict = PDFDoc::createTrailerDict(objectsCount, false, 0, &ref, yRef, fileName, outStr->getPos()); + PDFDoc::writeXRefTableTrailer(std::move(trailerDict), yRef, true, // write all entries according to ISO 32000-1, 7.5.4 Cross-Reference Table: "For a file that has never been incrementally updated, the cross-reference section shall + // contain only one subsection, whose object numbering begins at 0." + uxrefOffset, outStr, yRef); + + outStr->close(); + delete outStr; + fclose(f); + delete yRef; + delete countRef; + return 0; +} diff --git a/poppler-24.05.0/utils/po/CMakeLists.txt b/poppler-24.05.0/utils/po/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..2eb7f0f099c1d060c03aa9af26c49c1ed071b0ff --- /dev/null +++ b/poppler-24.05.0/utils/po/CMakeLists.txt @@ -0,0 +1,28 @@ +file(GLOB _files "${CMAKE_CURRENT_SOURCE_DIR}/*") +foreach (_dir ${_files}) + if (IS_DIRECTORY "${_dir}" AND EXISTS "${_dir}/CMakeLists.txt") + add_subdirectory("${_dir}") + get_filename_component(_lang ${_dir} NAME) + list(APPEND _langs ${_lang}) + endif () +endforeach() + + +macro(UPDATE_POT_FILE input) + set(_potFile "${input}.pot") + foreach(_lang ${_langs}) + set(_poFile "${CMAKE_CURRENT_SOURCE_DIR}/${_lang}/${input}.po") + list(APPEND _commands + COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_poFile} "${CMAKE_CURRENT_SOURCE_DIR}/${_potFile}") + endforeach() + add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${_potFile} + COMMAND xgettext --keyword=_ --language=c++ --package-name=pdfsig --output-dir=po --output=${_potFile} ${input}.cc + ${_commands} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../${input}.cc + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..) + add_custom_target(update_pot_${input} + ALL + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_potFile}) +endmacro() + +UPDATE_POT_FILE(pdfsig) diff --git a/poppler-24.05.0/utils/po/ca/CMakeLists.txt b/poppler-24.05.0/utils/po/ca/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..3225131ce3726436946338a4e6f5632ab212719d --- /dev/null +++ b/poppler-24.05.0/utils/po/ca/CMakeLists.txt @@ -0,0 +1,4 @@ +get_filename_component(_lang ${CMAKE_CURRENT_SOURCE_DIR} NAME) +gettext_process_po_files(${_lang} ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES + pdfsig.po +) diff --git a/poppler-24.05.0/utils/po/ca/pdfsig.po b/poppler-24.05.0/utils/po/ca/pdfsig.po new file mode 100644 index 0000000000000000000000000000000000000000..fe6a14e7b07189098e1b491ff6020f722be40619 --- /dev/null +++ b/poppler-24.05.0/utils/po/ca/pdfsig.po @@ -0,0 +1,26 @@ +# Translation of pdfsig.po to Catalan +# Copyright (C) 2024, Josep M. Ferrer +# This file is distributed under the same license as the pdfsig package. +# +msgid "" +msgstr "" +"Project-Id-Version: pdfsig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-02-12 14:44-0700\n" +"PO-Revision-Date: 2024-03-04 23:01+0100\n" +"Last-Translator: Josep M. Ferrer \n" +"Language-Team: Catalan \n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 22.12.3\n" + +#: pdfsig.cc:544 +msgid "Digitally signed by {0:s}" +msgstr "Signat digitalment per {0:s}" + +#: pdfsig.cc:544 +msgid "Date: {0:s}" +msgstr "Data: {0:s}" diff --git a/poppler-24.05.0/utils/po/pdfsig.pot b/poppler-24.05.0/utils/po/pdfsig.pot new file mode 100644 index 0000000000000000000000000000000000000000..83095113c379ce61b0af9eca7adee0a249bb5534 --- /dev/null +++ b/poppler-24.05.0/utils/po/pdfsig.pot @@ -0,0 +1,26 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the pdfsig package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: pdfsig\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-02-12 14:44-0700\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: pdfsig.cc:544 +msgid "Digitally signed by {0:s}" +msgstr "" + +#: pdfsig.cc:544 +msgid "Date: {0:s}" +msgstr "" diff --git a/poppler-24.05.0/utils/printencodings.cc b/poppler-24.05.0/utils/printencodings.cc new file mode 100644 index 0000000000000000000000000000000000000000..3e727c7024016f8fc108b30a6a43c7187ef2b39e --- /dev/null +++ b/poppler-24.05.0/utils/printencodings.cc @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2008, 2019, 2021, Albert Astals Cid + * Copyright (C) 2017, Adrian Johnson + * Copyright (C) 2018, Adam Reichold + * Copyright (C) 2019, Oliver Sander + * + * 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 + +#include "printencodings.h" + +#include "GlobalParams.h" +#include "goo/GooString.h" + +void printEncodings() +{ + std::vector encNames = globalParams->getEncodingNames(); + + std::sort(encNames.begin(), encNames.end()); + + printf("Available encodings are:\n"); + for (const std::string &enc : encNames) { + printf("%s\n", enc.c_str()); + } +} diff --git a/poppler-24.05.0/utils/printencodings.h b/poppler-24.05.0/utils/printencodings.h new file mode 100644 index 0000000000000000000000000000000000000000..5be2819f2f11e0bdfc7de77bceb5705ec54bfd71 --- /dev/null +++ b/poppler-24.05.0/utils/printencodings.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2008, Albert Astals Cid + * + * 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. + */ + +#ifndef PRINTENCODINGS_H +#define PRINTENCODINGS_H + +void printEncodings(); + +#endif diff --git a/poppler-24.05.0/utils/sanitychecks.cc b/poppler-24.05.0/utils/sanitychecks.cc new file mode 100644 index 0000000000000000000000000000000000000000..1bcdeb727eed199af142b72bf82f386cac20f740 --- /dev/null +++ b/poppler-24.05.0/utils/sanitychecks.cc @@ -0,0 +1,52 @@ +//======================================================================== +// +// sanitychecks.cc +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2020 Philipp Knechtges +// +// 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 +#include +#include +#include +#include +#include "sanitychecks.h" + +#ifdef USE_CMS +bool checkICCProfile(const GfxLCMSProfilePtr &profile, const char *filename, cmsUInt32Number UsedDirection, cmsColorSpaceSignature expectedColorSpace) +{ + if (!profile) { + fprintf(stderr, "Could not open the ICC profile \"%s\".\n", filename); + return false; + } + if (!cmsIsIntentSupported(profile.get(), INTENT_RELATIVE_COLORIMETRIC, UsedDirection) && !cmsIsIntentSupported(profile.get(), INTENT_ABSOLUTE_COLORIMETRIC, UsedDirection) + && !cmsIsIntentSupported(profile.get(), INTENT_SATURATION, UsedDirection) && !cmsIsIntentSupported(profile.get(), INTENT_PERCEPTUAL, LCMS_USED_AS_OUTPUT)) { + if (UsedDirection == LCMS_USED_AS_OUTPUT) { + fprintf(stderr, "ICC profile \"%s\" is not an output profile.\n", filename); + } else if (UsedDirection == LCMS_USED_AS_INPUT) { + fprintf(stderr, "ICC profile \"%s\" is not an input profile.\n", filename); + } else { + fprintf(stderr, "ICC profile \"%s\" is not suitable.\n", filename); + } + return false; + } + auto profilecolorspace = cmsGetColorSpace(profile.get()); + if (profilecolorspace != expectedColorSpace) { + if (expectedColorSpace == cmsSigCmykData) { + fprintf(stderr, "Supplied ICC profile \"%s\" is not a CMYK profile.\n", filename); + } else if (expectedColorSpace == cmsSigGrayData) { + fprintf(stderr, "Supplied ICC profile \"%s\" is not a monochrome profile.\n", filename); + } else if (expectedColorSpace == cmsSigRgbData) { + fprintf(stderr, "Supplied ICC profile \"%s\" is not a RGB profile.\n", filename); + } + return false; + } + return true; +} +#endif diff --git a/poppler-24.05.0/utils/sanitychecks.h b/poppler-24.05.0/utils/sanitychecks.h new file mode 100644 index 0000000000000000000000000000000000000000..d1af23748ef7a6018085984073cd86728c4e08aa --- /dev/null +++ b/poppler-24.05.0/utils/sanitychecks.h @@ -0,0 +1,30 @@ +//======================================================================== +// +// sanitychecks.h +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2020 Philipp Knechtges +// +// 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 +// +//======================================================================== + +#ifndef SANITYCHECKS_H +#define SANITYCHECKS_H + +#include "config.h" + +#ifdef USE_CMS +# include +# include "GfxState.h" + +/* + * Check the supplied ICC profile for different criteria + */ +bool checkICCProfile(const GfxLCMSProfilePtr &profile, const char *filename, cmsUInt32Number UsedDirection, cmsColorSpaceSignature expectedColorSpace); + +#endif + +#endif